cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-29 16:10:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

October Bugfix Bonanza (#3767)

Browse Source 
Fixes #3742 - someone unfucked the fix again.
Resolves #3740 and resolves #3739.
Fixes #1558 - a 10 month long meme is dead.
Resolves #3720 by making robo-eyes immune only to the eye stinging effects of pepperspray. Let there be equality amongst the synths.
Fixes #3676 - tested, shouldn't break. It was double-calling set_death_timer.
Fixes #3672 and fixes #3658 - that was my bad on not noticing the diff around hologram.icon = icon vs add_overlay(icon).
Fixes #3762 - I'm surprised this didn't fuck over more.
This commit is contained in:
Erki
2017-10-29 19:03:24 +02:00
committed by GitHub
parent 2d52377ad8
commit 7b1bcdc8f3
14 changed files with 102 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/reagent_containers/spray.dm
+4 -4
View File
@@ -73,7 +73,7 @@
/obj/item/weapon/reagent_containers/spray/proc/Spray_at(atom/A as mob|obj, mob/user as mob, proximity)
if (A.density && proximity)
A.visible_message("[usr] sprays [A] with [src].")
A.visible_message("[user] sprays [A] with [src].")
reagents.splash(A, amount_per_transfer_from_this)
else
spawn(0)
@@ -157,12 +157,12 @@
/obj/item/weapon/reagent_containers/spray/pepper/attack_self(var/mob/user)
safety = !safety
usr << "<span class = 'notice'>You switch the safety [safety ? "on" : "off"].</span>"
user << "<span class = 'notice'>You switch the safety [safety ? "on" : "off"].</span>"
playsound(src.loc, 'sound/weapons/empty.ogg', 50, 1)
/obj/item/weapon/reagent_containers/spray/pepper/Spray_at(atom/A as mob|obj)
/obj/item/weapon/reagent_containers/spray/pepper/Spray_at(atom/A as mob|obj, mob/user)
if(safety)
usr << "<span class = 'warning'>The safety is on!</span>"
user << "<span class = 'warning'>The safety is on!</span>"
return
..()