mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-01-05 23:11:52 +00:00
Stop spraying yourself (#7667)
Fixes #7666 Since you can spray people and objects, it would spray your coat (and therefore you) if you clicked on it. Added a check to make sure the thing you're spraying isn't on your person. Removed redundant safety checks for pepperspray.
This commit is contained in:
@@ -77,6 +77,8 @@
|
||||
return
|
||||
|
||||
/obj/item/reagent_containers/spray/proc/Spray_at(atom/A as mob|obj, mob/user as mob, proximity)
|
||||
if(istype(A, /obj) && A.loc == user)
|
||||
return
|
||||
if (A.density && proximity)
|
||||
A.visible_message("[user] sprays [A] with [src].")
|
||||
reagents.splash(A, amount_per_transfer_from_this)
|
||||
@@ -167,12 +169,6 @@
|
||||
to_chat(user, "<span class = 'notice'>You switch the safety [safety ? "on" : "off"].</span>")
|
||||
playsound(src.loc, 'sound/weapons/empty.ogg', 50, 1)
|
||||
|
||||
/obj/item/reagent_containers/spray/pepper/Spray_at(atom/A as mob|obj, mob/user)
|
||||
if(safety)
|
||||
to_chat(user, "<span class = 'warning'>The safety is on!</span>")
|
||||
return
|
||||
..()
|
||||
|
||||
/obj/item/reagent_containers/spray/waterflower
|
||||
name = "water flower"
|
||||
desc = "A seemingly innocent sunflower...with a twist."
|
||||
|
||||
Reference in New Issue
Block a user