From 647298e5500fb8e3fb834d051fafa3e450cf7e33 Mon Sep 17 00:00:00 2001 From: PsiOmega Date: Sun, 10 May 2015 10:50:54 +0200 Subject: [PATCH] Fixes #9169. Drones can now survive entering chargers and being picked up. --- code/modules/mob/living/silicon/robot/drone/drone.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/silicon/robot/drone/drone.dm b/code/modules/mob/living/silicon/robot/drone/drone.dm index 77bb2b466d..ddda239723 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone.dm @@ -188,8 +188,8 @@ //Standard robots use config for crit, which is somewhat excessive for these guys. //Drones killed by damage will gib. /mob/living/silicon/robot/drone/handle_regular_status_updates() - - if((health <= -35 || (master_fabricator && src.z != master_fabricator.z)) && src.stat != 2) + var/turf/T = get_turf(src) + if((!T || health <= -35 || (master_fabricator && T.z != master_fabricator.z)) && src.stat != DEAD) timeofdeath = world.time death() //Possibly redundant, having trouble making death() cooperate. gib()