shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into upstream-merge-32183

Browse Source
This commit is contained in:
LetterJay
2017-11-15 10:22:40 -06:00
committed by GitHub
parent 14944d8711 9ea743f0cd
commit 1939e96bb6
248 changed files with 13139 additions and 3311 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/examine.dm
+10 -4
View File
@@ -44,24 +44,30 @@
msg += "<span class='warning'>"
var/temp = getBruteLoss()
if(temp)
if (temp < 30)
if (temp < 25)
msg += "[t_He] [t_has] minor bruising.\n"
else if (temp < 50)
msg += "[t_He] [t_has] <b>moderate</b> bruising!\n"
else
msg += "<B>[t_He] [t_has] severe bruising!</B>\n"
temp = getFireLoss()
if(temp)
if (temp < 30)
if (temp < 25)
msg += "[t_He] [t_has] minor burns.\n"
else if (temp < 50)
msg += "[t_He] [t_has] <b>moderate</b> burns!\n"
else
msg += "<B>[t_He] [t_has] severe burns!</B>\n"
temp = getCloneLoss()
if(temp)
if(getCloneLoss() < 30)
if(temp < 25)
msg += "[t_He] [t_is] slightly deformed.\n"
else if (temp < 50)
msg += "[t_He] [t_is] <b>moderately</b> deformed!\n"
else
msg += "<b>[t_He] [t_is] severely deformed.</b>\n"
msg += "<b>[t_He] [t_is] severely deformed!</b>\n"
if(getBrainLoss() > 60)
msg += "[t_He] seem[p_s()] to be clumsy and unable to think.\n"
code/modules/mob/living/carbon/human/examine.dm
+3
View File
@@ -341,6 +341,9 @@
msg += "<a href='?src=[REF(src)];hud=s;add_crime=1'>\[Add crime\]</a> "
msg += "<a href='?src=[REF(src)];hud=s;view_comment=1'>\[View comment log\]</a> "
msg += "<a href='?src=[REF(src)];hud=s;add_comment=1'>\[Add comment\]</a>\n"
if(print_flavor_text() && get_visible_name() != "Unknown")//Are we sure we know who this is? Don't show flavor text unless we can recognize them. Prevents certain metagaming with impersonation.
msg += "[print_flavor_text()]\n"
msg += "*---------*</span>"
to_chat(user, msg)