Merge pull request #4975 from phil235/CloneMessages

Replacing clone damage descriptions with "cellular damage".
This commit is contained in:
Cheridan
2014-09-30 12:21:42 -05:00
6 changed files with 12 additions and 6 deletions
+1 -1
View File
@@ -182,7 +182,7 @@
dat += "<HR><div class='line'><div class='statusLabel'>Paralysis Summary:</div><div class='statusValue'>[round(occupant.paralysis)]% [occupant.paralysis ? "([round(occupant.paralysis / 4)] seconds left)" : ""]</div></div>"
if(occupant.getCloneLoss())
dat += "<div class='line'><span class='average'>Subject appears to have been imperfectly cloned.</span></div>"
dat += "<div class='line'><span class='average'>Subject appears to have cellular damage.</span></div>"
if(occupant.getBrainLoss())
dat += "<div class='line'><span class='average'>Significant brain damage detected.</span></div>"
if(occupant.reagents.reagent_list.len)
@@ -169,7 +169,7 @@
<font color="[occupant.getOxyLoss() < 60 ? "blue" : "red"]"><b>Respiratory Damage:</b> [occupant.getOxyLoss()]%</font><br />
<font color="[occupant.getToxLoss() < 60 ? "blue" : "red"]"><b>Toxin Content:</b> [occupant.getToxLoss()]%</font><br />
<font color="[occupant.getFireLoss() < 60 ? "blue" : "red"]"><b>Burn Severity:</b> [occupant.getFireLoss()]%</font><br />
<font color="red">[occupant.getCloneLoss() ? "Subject appears to have been imperfectly cloned." : ""]</font><br />
<font color="red">[occupant.getCloneLoss() ? "Subject appears to have cellular damage." : ""]</font><br />
<font color="red">[occupant.getBrainLoss() ? "Significant brain damage detected." : ""]</font><br />
"}
+1 -1
View File
@@ -145,7 +145,7 @@ MASS SPECTROMETER
user.show_message("<span class='info'>Subject appears to be suffering from fatigue.</span>", 1)
if (M.getCloneLoss())
user.show_message("<span class='warning'>Subject appears to have been imperfectly cloned.</span>", 1)
user.show_message("<span class='warning'>Subject appears to have [M.getCloneLoss() > 30 ? "severe" : "minor"] cellular damage.</span>", 1)
for(var/datum/disease/D in M.viruses)
if(!D.hidden[SCANNER])
@@ -220,9 +220,9 @@
temp = getCloneLoss()
if(temp)
if(temp < 30)
msg += "[t_He] [t_has] minor genetic deformities.\n"
msg += "[t_He] [t_has] minor cellular damage.\n"
else
msg += "<B>[t_He] [t_has] severe genetic deformities.</B>\n"
msg += "<B>[t_He] [t_has] severe cellular damage.</B>\n"
if(fire_stacks > 0)
msg += "[t_He] [t_is] covered in something flammable.\n"
+1 -1
View File
@@ -1168,7 +1168,7 @@ datum/reagent/clonexadone/on_mob_life(var/mob/living/M as mob)
datum/reagent/rezadone
name = "Rezadone"
id = "rezadone"
description = "A powder derived from fish toxin, this substance can effectively treat genetic damage in humanoids, though excessive consumption has side effects."
description = "A powder derived from fish toxin, this substance can effectively treat cellular damage in humanoids, though excessive consumption has side effects."
reagent_state = SOLID
color = "#669900" // rgb: 102, 153, 0
+6
View File
@@ -0,0 +1,6 @@
author: phil235
delete-after: True
changes:
- experiment: Changed all clone damage descriptions to use the term cellular damage to avoid confusion with genetics mutations.