Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

Commit 58a5dcf

Browse files
authored
Update hypospray.dm (#22610)
1 parent 35b731a commit 58a5dcf

File tree

1 file changed

+4
-10
lines changed

1 file changed

+4
-10
lines changed

code/modules/reagents/reagent_containers/hypospray.dm

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -279,8 +279,8 @@
279279
// Wait Time Vars //
280280
var/inject_wait = 2 SECONDS
281281
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
284284

285285
// Misc Vars //
286286
var/upgrade_flags = NONE
@@ -292,9 +292,9 @@
292292
/// The sound that plays when you eject a vial from the hypospray
293293
var/eject_sound = 'sound/weapons/empty.ogg'
294294
/// 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')
296296
/// 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')
298298
/// The sound that plays when you draw from someone with the hypospray
299299
var/draw_sound = 'sound/items/autoinjector.ogg'
300300

@@ -560,8 +560,6 @@
560560
possible_transfer_amounts = list(1, 5)
561561
inject_wait = 0 SECONDS
562562
inject_self = 0 SECONDS
563-
spray_wait = 0.5 SECONDS
564-
spray_self = 0.5 SECONDS
565563

566564
/obj/item/hypospray/deluxe/cmo
567565
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF
@@ -574,8 +572,6 @@
574572
container = /obj/item/reagent_containers/glass/bottle/adminordrazine
575573
upgrade_flags = PIERCING
576574
possible_transfer_amounts = list(0.1, 1, 5, 10, 15, 20, 30, 50, 100)
577-
spray_wait = 0 SECONDS
578-
spray_self = 0 SECONDS
579575

580576
/obj/item/hypospray/combat
581577
name = "combat hypospray"
@@ -585,8 +581,6 @@
585581
container = /obj/item/reagent_containers/glass/bottle/vial/combat
586582
inject_wait = 0 SECONDS
587583
inject_self = 0 SECONDS
588-
spray_wait = 0 SECONDS
589-
spray_self = 0 SECONDS
590584
upgrade_flags = PIERCING
591585

592586
/obj/item/hypospray/qmc

0 commit comments

Comments
 (0)