shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

July 5th TG sync (#1883)

Browse Source 
July 5th TG sync
This commit is contained in:
Poojawa
2017-07-05 22:14:19 -05:00
committed by GitHub
parent 454b9c3d68
commit b1b4826c0c
1264 changed files with 149689 additions and 570309 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/devices/radio/electropack.dm
+8 -8
View File
@@ -78,14 +78,14 @@
on = !( on )
icon_state = "electropack[on]"
if(!( master ))
if(istype(loc, /mob))
if(ismob(loc))
attack_self(loc)
else
for(var/mob/M in viewers(1, src))
if(M.client)
attack_self(M)
else
if(istype(master.loc, /mob))
if(ismob(master.loc))
attack_self(master.loc)
else
for(var/mob/M in viewers(1, master))
@@ -100,21 +100,21 @@
if(!signal || signal.encryption != code)
return
if(ismob(loc) && on)
if(isliving(loc) && on)
if(shock_cooldown != 0)
return
shock_cooldown = 1
spawn(100)
shock_cooldown = 0
var/mob/M = loc
step(M, pick(GLOB.cardinal))
var/mob/living/L = loc
step(L, pick(GLOB.cardinal))
to_chat(M, "<span class='danger'>You feel a sharp shock!</span>")
to_chat(L, "<span class='danger'>You feel a sharp shock!</span>")
var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread
s.set_up(3, 1, M)
s.set_up(3, 1, L)
s.start()
M.Weaken(5)
L.Knockdown(100)
if(master)
master.receive_signal()