This commit is contained in:
Zuhayr
2015-05-31 02:56:54 +09:30
parent 27d1dfcc67
commit bf1733640a
6 changed files with 13 additions and 7 deletions
+4 -2
View File
@@ -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("<span class='notice'>[M] shakes [src] trying to wake [t_him] up!</span>", \
"<span class='notice'>You shake [src], but they do not respond... Maybe they have S.S.D?</span>")
else if(lying || src.sleeping)
@@ -259,7 +262,6 @@
M.visible_message("<span class='notice'>[M] shakes [src] trying to wake [t_him] up!", \
"<span class='notice'>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
@@ -244,9 +244,9 @@
if(species.show_ssd && (!species.has_organ["brain"] || has_brain()) && stat != DEAD)
if(!key)
msg += "<span class='deadsay'>[t_He] [t_is] fast asleep. It doesn't look like they are waking up anytime soon.</span>\n"
msg += "<span class='deadsay'>[t_He] [t_is] [species.show_ssd]. It doesn't look like they are waking up anytime soon.</span>\n"
else if(!client)
msg += "<span class='deadsay'>[t_He] [t_is] fast asleep.</span>\n"
msg += "<span class='deadsay'>[t_He] [t_is] [species.show_ssd].</span>\n"
var/list/wound_flavor_text = list()
var/list/is_destroyed = list()
+1 -1
View File
@@ -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
@@ -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.
@@ -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"
@@ -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