Fixes shuttles killing AI camera eyes (#19280)

* this wasn't even my bug but because mso was an ass I fixed it for him

* spitefronds
This commit is contained in:
Joan Lung
2016-07-13 12:50:20 +12:00
committed by oranges
parent 8f67695a6c
commit 71da2aba13
+24 -23
View File
@@ -525,30 +525,31 @@
// The corresponding tile will not be changed, so no roadkill
for(var/atom/movable/AM in T1)
if(isliving(AM) && (!(AM in hurt_mobs)))
hurt_mobs |= AM
var/mob/living/M = AM
if(M.buckled)
M.buckled.unbuckle_mob(M, 1)
if(M.pulledby)
M.pulledby.stop_pulling()
M.stop_pulling()
M.visible_message("<span class='warning'>[M] is hit by \
a hyperspace ripple[M.anchored ? "":" and is thrown clear"]!</span>",
"<span class='userdanger'>You feel an immense \
crushing pressure as the space around you ripples.</span>")
if(M.anchored)
M.gib()
else
M.Paralyse(10)
M.ex_act(2)
step(M, dir)
continue
if(ismob(AM))
if(isliving(AM) && !(AM in hurt_mobs))
hurt_mobs |= AM
var/mob/living/M = AM
if(M.buckled)
M.buckled.unbuckle_mob(M, 1)
if(M.pulledby)
M.pulledby.stop_pulling()
M.stop_pulling()
M.visible_message("<span class='warning'>[M] is hit by \
a hyperspace ripple[M.anchored ? "":" and is thrown clear"]!</span>",
"<span class='userdanger'>You feel an immense \
crushing pressure as the space around you ripples.</span>")
if(M.anchored)
M.gib()
else
step(M, dir)
M.Paralyse(10)
M.ex_act(2)
if(!AM.anchored)
step(AM, dir)
else
qdel(AM)
else //non-living mobs shouldn't be affected by shuttles, which is why this is an else
if(!AM.anchored)
step(AM, dir)
else
qdel(AM)
//used by shuttle subsystem to check timers
/obj/docking_port/mobile/proc/check()