Merge branch 'master' into upstream-merge-32311

2017-12-29 18:38:50 -06:00
parent 269208f687 48e0c47410
commit a3ebaa5de8
302 changed files with 4918 additions and 20468 deletions
@@ -88,7 +88,7 @@
 /turf/open/indestructible/clock_spawn_room/proc/port_servants()
 	. = FALSE
 	for(var/mob/living/L in src)
-		if(is_servant_of_ratvar(L))
+		if(is_servant_of_ratvar(L) && L.stat != DEAD)
 			. = TRUE
 			L.forceMove(get_turf(pick(GLOB.servant_spawns)))
 			visible_message("<span class='warning'>[L] vanishes in a flash of red!</span>")