From e5fcb91fb066d296fc2c6295af255ffd224e37e8 Mon Sep 17 00:00:00 2001 From: Erthilo Date: Wed, 13 Feb 2013 10:35:09 +0000 Subject: [PATCH] Fixes SSD not being prolonged. Signed-off-by: Erthilo --- code/modules/mob/living/carbon/human/life.dm | 2 +- code/modules/mob/living/logout.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index d0cb78eba13..f48a7be0df3 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -1106,7 +1106,7 @@ var/const/BLOOD_VOLUME_SURVIVE = 122 handle_dreams() adjustHalLoss(-5) if (mind) - if(mind.active || immune_to_ssd) + if((mind.active && client != null) || immune_to_ssd) //This also checks whether a client is connected, if not, sleep is not reduced. sleeping = max(sleeping-1, 0) blinded = 1 stat = UNCONSCIOUS diff --git a/code/modules/mob/living/logout.dm b/code/modules/mob/living/logout.dm index 7c272660503..8fdcdb0ec46 100644 --- a/code/modules/mob/living/logout.dm +++ b/code/modules/mob/living/logout.dm @@ -4,4 +4,4 @@ if(!key) //key and mind have become seperated. mind.active = 0 //This is to stop say, a mind.transfer_to call on a corpse causing a ghost to re-enter its body. if(!immune_to_ssd && sleeping < 2 && mind.active) - sleeping = 2 + sleeping = 2 //This causes instant sleep, but does not prolong it. See life.dm for furthering SSD.