From e2d4d5029b61689e581f66f359ea7cc801aa79c4 Mon Sep 17 00:00:00 2001 From: "n3ophyt3@gmail.com" Date: Tue, 11 Jan 2011 18:28:06 +0000 Subject: [PATCH] Carded AIs no longer lose power when brought into powerless areas. AIs no longer get bugged to being fully healthy but dead if a living carded AI is stuck into a dead empty core. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@826 316c924e-a436-60f5-8080-3fe189b3f50e --- code/game/objects/devices/aicard.dm | 2 ++ code/modules/mob/living/silicon/ai/life.dm | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/code/game/objects/devices/aicard.dm b/code/game/objects/devices/aicard.dm index 3d3b8a547c4..2f33d2918e9 100644 --- a/code/game/objects/devices/aicard.dm +++ b/code/game/objects/devices/aicard.dm @@ -35,6 +35,8 @@ M.fireloss = A.fireloss M.bruteloss = A.bruteloss M.toxloss = A.toxloss + if (!A.stat) + M.stat = A.stat M.updatehealth() M << "You have been uploaded to a stationary terminal. Remote device connection restored." user << "Transfer succesful: [M.name] ([rand(1000,9999)].exe) installed and executed succesfully. Local copy has been removed." diff --git a/code/modules/mob/living/silicon/ai/life.dm b/code/modules/mob/living/silicon/ai/life.dm index 42962ab9b92..188bc20c8f4 100644 --- a/code/modules/mob/living/silicon/ai/life.dm +++ b/code/modules/mob/living/silicon/ai/life.dm @@ -56,7 +56,7 @@ loc = T.loc if (istype(loc, /area)) //stage = 4 - if (!loc.master.power_equip) + if (!loc.master.power_equip && isturf(src.loc)) //stage = 5 blind = 1 @@ -100,7 +100,7 @@ src.see_in_dark = 0 src.see_invisible = 0 - if ((!loc.master.power_equip) || istype(T, /turf/space)) + if (((!loc.master.power_equip) || istype(T, /turf/space)) && isturf(src.loc)) if (src:aiRestorePowerRoutine==0) src:aiRestorePowerRoutine = 1