From a7617f5c8a16cfbabcf424ffe9562598400f6f16 Mon Sep 17 00:00:00 2001 From: Tastyfish Date: Tue, 14 May 2013 18:23:08 -0400 Subject: [PATCH] revert out lazybots commit --- code/modules/mob/living/silicon/login.dm | 4 ---- code/modules/mob/living/silicon/robot/life.dm | 8 +++++++- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/code/modules/mob/living/silicon/login.dm b/code/modules/mob/living/silicon/login.dm index 719ee0728ea..32e0c8d3460 100644 --- a/code/modules/mob/living/silicon/login.dm +++ b/code/modules/mob/living/silicon/login.dm @@ -2,8 +2,4 @@ if(mind && ticker && ticker.mode) ticker.mode.remove_cultist(mind, 1) ticker.mode.remove_revolutionary(mind, 1) - - verbs -= /mob/living/verb/lay_down - verbs -= /mob/living/verb/mob_sleep - ..() \ No newline at end of file diff --git a/code/modules/mob/living/silicon/robot/life.dm b/code/modules/mob/living/silicon/robot/life.dm index e54265107cf..e25a987aadb 100644 --- a/code/modules/mob/living/silicon/robot/life.dm +++ b/code/modules/mob/living/silicon/robot/life.dm @@ -30,7 +30,6 @@ SetParalysis(min(paralysis, 30)) // SetWeakened(min(weakened, 20)) sleeping = 0 - resting = 0 adjustBruteLoss(0) adjustToxLoss(0) adjustOxyLoss(0) @@ -72,6 +71,13 @@ if(getOxyLoss() > 50) Paralyse(3) + if(src.sleeping) + Paralyse(3) + src.sleeping-- + + if(src.resting) + Weaken(5) + if(health < config.health_threshold_dead && src.stat != 2) //die only once death()