cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 19:52:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes pepperspray making sounds even when the safety is on

Browse Source
This commit is contained in:
mwerezak
2016-07-08 17:29:36 -04:00
committed by Yoshax
parent 8db42aaca9
commit 108a748d1f
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/modules/reagents/reagent_containers/spray.dm
View File

@@ -38,8 +38,6 @@
Spray_at(A, user, proximity) Spray_at(A, user, proximity)
playsound(src.loc, 'sound/effects/spray2.ogg', 50, 1, -6)
user.setClickCooldown(4) user.setClickCooldown(4)
if(reagents.has_reagent("sacid")) if(reagents.has_reagent("sacid"))
@@ -54,6 +52,7 @@
return return
/obj/item/weapon/reagent_containers/spray/proc/Spray_at(atom/A as mob|obj, mob/user as mob, proximity) /obj/item/weapon/reagent_containers/spray/proc/Spray_at(atom/A as mob|obj, mob/user as mob, proximity)
playsound(src.loc, 'sound/effects/spray2.ogg', 50, 1, -6)
if (A.density && proximity) if (A.density && proximity)
A.visible_message("[usr] sprays [A] with [src].") A.visible_message("[usr] sprays [A] with [src].")
reagents.splash(A, amount_per_transfer_from_this) reagents.splash(A, amount_per_transfer_from_this)