From cf3f0f3b451469d0d15ae398d9a74590944b9057 Mon Sep 17 00:00:00 2001
From: SabreML <57483089+SabreML@users.noreply.github.com>
Date: Sun, 22 Nov 2020 21:41:03 +0000
Subject: [PATCH] Adds a new examination message for damage severity (#14922)
* Moderate damage
* Little bit of cleaning
---
.../mob/living/carbon/human/examine.dm | 26 +++++++++----------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm
index 4e3bbfcabfd..78489251ca1 100644
--- a/code/modules/mob/living/carbon/human/examine.dm
+++ b/code/modules/mob/living/carbon/human/examine.dm
@@ -254,26 +254,26 @@
if(wound_flavor_text["r_foot"]&& (is_destroyed["right foot"] || (!shoes && !skipshoes)))
msg += wound_flavor_text["r_foot"]
- var/temp = getBruteLoss() //no need to calculate each of these twice
+ var/damage = getBruteLoss() //no need to calculate each of these twice
- if(temp)
+ if(damage)
var/brute_message = !ismachineperson(src) ? "bruising" : "denting"
- if(temp < 30)
- msg += "[p_they(TRUE)] [p_have()] minor [brute_message ].\n"
+ if(damage < 60)
+ msg += "[p_they(TRUE)] [p_have()] [damage < 30 ? "minor" : "moderate"] [brute_message].\n"
else
- msg += "[p_they(TRUE)] [p_have()] severe [brute_message ]!\n"
+ msg += "[p_they(TRUE)] [p_have()] severe [brute_message]!\n"
- temp = getFireLoss()
- if(temp)
- if(temp < 30)
- msg += "[p_they(TRUE)] [p_have()] minor burns.\n"
+ damage = getFireLoss()
+ if(damage)
+ if(damage < 60)
+ msg += "[p_they(TRUE)] [p_have()] [damage < 30 ? "minor" : "moderate"] burns.\n"
else
msg += "[p_they(TRUE)] [p_have()] severe burns!\n"
- temp = getCloneLoss()
- if(temp)
- if(temp < 30)
- msg += "[p_they(TRUE)] [p_have()] minor cellular damage.\n"
+ damage = getCloneLoss()
+ if(damage)
+ if(damage < 60)
+ msg += "[p_they(TRUE)] [p_have()] [damage < 30 ? "minor" : "moderate"] cellular damage.\n"
else
msg += "[p_they(TRUE)] [p_have()] severe cellular damage.\n"