From bf1733640a57f01bb9b2314f70bc5c06212a3ec9 Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Sun, 31 May 2015 02:56:54 +0930 Subject: [PATCH] Fixes #9586 --- code/modules/mob/living/carbon/carbon.dm | 6 ++++-- code/modules/mob/living/carbon/human/examine.dm | 4 ++-- code/modules/mob/living/carbon/human/life.dm | 2 +- code/modules/mob/living/carbon/human/species/species.dm | 2 +- .../mob/living/carbon/human/species/station/monkey.dm | 3 ++- .../mob/living/carbon/human/species/station/station.dm | 3 +++ 6 files changed, 13 insertions(+), 7 deletions(-) diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index 2162e3488ac..ad191db2570 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -249,7 +249,10 @@ var/mob/living/carbon/human/H = src H.w_uniform.add_fingerprint(M) - if(!client || !key || player_logged) + var/show_ssd + var/mob/living/carbon/human/H = src + if(istype(H)) show_ssd = H.species.show_ssd + if(show_ssd && (!client || !key || player_logged)) M.visible_message("[M] shakes [src] trying to wake [t_him] up!", \ "You shake [src], but they do not respond... Maybe they have S.S.D?") else if(lying || src.sleeping) @@ -259,7 +262,6 @@ M.visible_message("[M] shakes [src] trying to wake [t_him] up!", \ "You shake [src] trying to wake [t_him] up!") else - var/mob/living/carbon/human/H = M if(istype(H)) H.species.hug(H,src) else diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index 3e04dbe023f..078e4568dbc 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -244,9 +244,9 @@ if(species.show_ssd && (!species.has_organ["brain"] || has_brain()) && stat != DEAD) if(!key) - msg += "[t_He] [t_is] fast asleep. It doesn't look like they are waking up anytime soon.\n" + msg += "[t_He] [t_is] [species.show_ssd]. It doesn't look like they are waking up anytime soon.\n" else if(!client) - msg += "[t_He] [t_is] fast asleep.\n" + msg += "[t_He] [t_is] [species.show_ssd].\n" var/list/wound_flavor_text = list() var/list/is_destroyed = list() diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index a38c6e6b9ac..709ab2bfb85 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -942,7 +942,7 @@ if(status_flags & GODMODE) return 0 //SSD check, if a logged player is awake put them back to sleep! - if((!client || !key || player_logged) && sleeping < 2) + if(sleeping < 2 && species.show_ssd && (!client || !key || player_logged)) sleeping = 2 if(stat == DEAD) //DEAD. BROWN BREAD. SWIMMING WITH THE SPESS CARP diff --git a/code/modules/mob/living/carbon/human/species/species.dm b/code/modules/mob/living/carbon/human/species/species.dm index 1bc6ca880a5..82d12d08ba9 100644 --- a/code/modules/mob/living/carbon/human/species/species.dm +++ b/code/modules/mob/living/carbon/human/species/species.dm @@ -28,7 +28,7 @@ var/race_key = 0 // Used for mob icon cache string. var/icon/icon_template // Used for mob icon generation for non-32x32 species. var/is_small - var/show_ssd = 1 + var/show_ssd = "fast asleep" // Language/culture vars. var/default_language = "Galactic Common" // Default language is used when 'say' is used without modifiers. diff --git a/code/modules/mob/living/carbon/human/species/station/monkey.dm b/code/modules/mob/living/carbon/human/species/station/monkey.dm index 64e12eadfa1..6ae24db2f63 100644 --- a/code/modules/mob/living/carbon/human/species/station/monkey.dm +++ b/code/modules/mob/living/carbon/human/species/station/monkey.dm @@ -13,7 +13,8 @@ greater_form = "Human" is_small = 1 has_fine_manipulation = 0 - show_ssd = 0 + show_ssd = null + eyes = "blank_eyes" gibbed_anim = "gibbed-m" diff --git a/code/modules/mob/living/carbon/human/species/station/station.dm b/code/modules/mob/living/carbon/human/species/station/station.dm index 985a5dac097..e9da37c2c9d 100644 --- a/code/modules/mob/living/carbon/human/species/station/station.dm +++ b/code/modules/mob/living/carbon/human/species/station/station.dm @@ -146,6 +146,8 @@ hud_type = /datum/hud_data/diona siemens_coefficient = 0.3 eyes = "blank_eyes" + show_ssd = "completely quiescent" + blurb = "Commonly referred to (erroneously) as 'plant people', the Dionaea are a strange space-dwelling collective \ species hailing from Epsilon Ursae Minoris. Each 'diona' is a cluster of numerous cat-sized organisms called nymphs; \ @@ -246,6 +248,7 @@ eyes = "blank_eyes" brute_mod = 0.5 burn_mod = 1 + show_ssd = "flashing a 'system offline' glyph on their monitor" warning_low_pressure = 50 hazard_low_pressure = 0