From 9dd84554ded2c8d2186d171613d29bbae291190d Mon Sep 17 00:00:00 2001 From: "giacomand@gmail.com" Date: Sat, 27 Oct 2012 00:57:51 +0000 Subject: [PATCH] -Runtime fix for the "in_use" var. -Forgot to give membrane extra health. I'll be planning on adding health to resin doors soon. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4964 316c924e-a436-60f5-8080-3fe189b3f50e --- code/game/objects/effects/aliens.dm | 4 ++-- code/game/objects/objs.dm | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/game/objects/effects/aliens.dm b/code/game/objects/effects/aliens.dm index bc6d8c0c11b..2d266b31936 100644 --- a/code/game/objects/effects/aliens.dm +++ b/code/game/objects/effects/aliens.dm @@ -28,7 +28,7 @@ density = 1 opacity = 1 anchored = 1 - var/health = 170 + var/health = 200 //var/mob/living/affecting = null wall @@ -41,7 +41,7 @@ desc = "Purple slime just thin enough to let light pass through." icon_state = "resinmembrane" opacity = 0 - health = 20 + health = 120 /obj/effect/alien/resin/New() ..() diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm index 69b06f35028..ced037e422c 100644 --- a/code/game/objects/objs.dm +++ b/code/game/objects/objs.dm @@ -96,7 +96,7 @@ if(src.machine) unset_machine() src.machine = O - if(O) + if(istype(O)) O.in_use = 1 /obj/item/proc/updateSelfDialog()