Merge pull request #8424 from phil235/SiliconWeldProtFix

Fixes silicons being flashed when welding.
This commit is contained in:
Swag McYolosteinen
2015-03-20 17:46:16 +01:00
4 changed files with 11 additions and 5 deletions
+3 -3
View File
@@ -81,9 +81,9 @@
else if(issilicon(M))
add_logs(user, M, "flashed", object="[src.name]")
if(M.flash_eyes())
M.Weaken(rand(5,10))
user.visible_message("<span class='disarm'>[user] overloads [M]'s sensors with the flash!</span>")
flick("e_flash", M.flash)
M.Weaken(rand(5,10))
user.visible_message("<span class='disarm'>[user] overloads [M]'s sensors with the flash!</span>")
return 1
user.visible_message("<span class='notice'>[user] fails to blind [M] with the flash!</span>")
@@ -117,7 +117,7 @@
var/mob/living/silicon/S = target
//20% chance to actually hit the sensors
if(prob(effectchance * diode.rating))
S.flash_eyes()
flick("e_flash", S.flash)
S.Weaken(rand(5,10))
S << "<span class='warning'>Your sensors were overloaded by a laser!</span>"
outmsg = "<span class='notice'>You overload [S] by shining [src] at their sensors.</span>"