From 8abdc809879d64a611d4b52dde8ac3ea33e80aa8 Mon Sep 17 00:00:00 2001 From: Markolie Date: Mon, 7 Sep 2015 04:49:55 +0200 Subject: [PATCH] Fix invincible spiderbots and cryo bags --- code/modules/mob/living/carbon/human/life.dm | 1 + code/modules/mob/living/simple_animal/friendly/spiderbot.dm | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index 82f09f0f489..875a3a85260 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -64,6 +64,7 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc life_tick++ var/datum/gas_mixture/environment = loc.return_air() + in_stasis = 0 if(istype(loc, /obj/structure/closet/body_bag/cryobag)) var/obj/structure/closet/body_bag/cryobag/loc_as_cryobag = loc if(!loc_as_cryobag.opened) diff --git a/code/modules/mob/living/simple_animal/friendly/spiderbot.dm b/code/modules/mob/living/simple_animal/friendly/spiderbot.dm index a09f843b118..80e715dc7d3 100644 --- a/code/modules/mob/living/simple_animal/friendly/spiderbot.dm +++ b/code/modules/mob/living/simple_animal/friendly/spiderbot.dm @@ -212,8 +212,9 @@ if(camera) camera.status = 0 - held_item.loc = src.loc - held_item = null + if(held_item) + held_item.forceMove(src.loc) + held_item = null robogibs(src.loc, viruses) qdel(src)