|
279 | 279 | // Wait Time Vars // |
280 | 280 | var/inject_wait = 2 SECONDS |
281 | 281 | var/inject_self = 1 SECONDS |
282 | | - var/spray_wait = 2 SECONDS |
283 | | - var/spray_self = 1 SECONDS |
| 282 | + var/spray_wait = 0 SECONDS //spraying is instant because it's significantly weaker than injecting |
| 283 | + var/spray_self = 0 SECONDS |
284 | 284 |
|
285 | 285 | // Misc Vars // |
286 | 286 | var/upgrade_flags = NONE |
|
292 | 292 | /// The sound that plays when you eject a vial from the hypospray |
293 | 293 | var/eject_sound = 'sound/weapons/empty.ogg' |
294 | 294 | /// The sound that plays when you someone with the hypospray |
295 | | - var/inject_sound = 'sound/items/hypospray.ogg' |
| 295 | + var/list/inject_sound = list('sound/items/hypospray.ogg', 'sound/items/hypospray2.ogg') |
296 | 296 | /// The sound that plays when you spray someone with the hypospray |
297 | | - var/spray_sound = 'sound/effects/spray2.ogg' |
| 297 | + var/list/spray_sound = list('sound/effects/spray2.ogg', 'sound/effects/spray3.ogg') |
298 | 298 | /// The sound that plays when you draw from someone with the hypospray |
299 | 299 | var/draw_sound = 'sound/items/autoinjector.ogg' |
300 | 300 |
|
|
560 | 560 | possible_transfer_amounts = list(1, 5) |
561 | 561 | inject_wait = 0 SECONDS |
562 | 562 | inject_self = 0 SECONDS |
563 | | - spray_wait = 0.5 SECONDS |
564 | | - spray_self = 0.5 SECONDS |
565 | 563 |
|
566 | 564 | /obj/item/hypospray/deluxe/cmo |
567 | 565 | resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF |
|
574 | 572 | container = /obj/item/reagent_containers/glass/bottle/adminordrazine |
575 | 573 | upgrade_flags = PIERCING |
576 | 574 | possible_transfer_amounts = list(0.1, 1, 5, 10, 15, 20, 30, 50, 100) |
577 | | - spray_wait = 0 SECONDS |
578 | | - spray_self = 0 SECONDS |
579 | 575 |
|
580 | 576 | /obj/item/hypospray/combat |
581 | 577 | name = "combat hypospray" |
|
585 | 581 | container = /obj/item/reagent_containers/glass/bottle/vial/combat |
586 | 582 | inject_wait = 0 SECONDS |
587 | 583 | inject_self = 0 SECONDS |
588 | | - spray_wait = 0 SECONDS |
589 | | - spray_self = 0 SECONDS |
590 | 584 | upgrade_flags = PIERCING |
591 | 585 |
|
592 | 586 | /obj/item/hypospray/qmc |
|
0 commit comments