Merge pull request #4491 from IK3I/Sleeper-death-fix

Makes occupied machines not delete you when destroyed
This commit is contained in:
Fox McCloud
2016-05-24 18:33:17 -04:00
4 changed files with 97 additions and 26 deletions
@@ -299,7 +299,7 @@
return
/mob/living/simple_animal/hostile/proc/FindHidden()
if(istype(target.loc, /obj/structure/closet) || istype(target.loc, /obj/machinery/disposal) || istype(target.loc, /obj/machinery/sleeper))
if(istype(target.loc, /obj/structure/closet) || istype(target.loc, /obj/machinery/disposal) || istype(target.loc, /obj/machinery/sleeper) || istype(target.loc, /obj/machinery/bodyscanner) || istype(target.loc, /obj/machinery/recharge_station))
var/atom/A = target.loc
Goto(A,move_to_delay,minimum_distance)
if(A.Adjacent(src))