Merge pull request #1973 from Markolie/intercom

Fix invincible spiderbots and cryo bags
This commit is contained in:
Fox-McCloud
2015-09-06 23:35:49 -04:00
2 changed files with 4 additions and 2 deletions
@@ -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)
@@ -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)