From 17d66a6f89016cad5dda54119f58f6491f8fc239 Mon Sep 17 00:00:00 2001 From: Penelope Haze Date: Fri, 5 Jul 2024 19:12:51 -0400 Subject: [PATCH 1/2] Fix wooden prostheses giving pain messages when checking for injuries --- code/modules/mob/living/human/human_attackhand.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/mob/living/human/human_attackhand.dm b/code/modules/mob/living/human/human_attackhand.dm index fa6c52768a8..869664e881a 100644 --- a/code/modules/mob/living/human/human_attackhand.dm +++ b/code/modules/mob/living/human/human_attackhand.dm @@ -51,7 +51,7 @@ var/list/status = list() var/feels = 1 + round(org.pain/100, 0.1) - var/feels_brute = (org.brute_dam * feels) + var/feels_brute = org.can_feel_pain() ? (org.brute_dam * feels) : 0 if(feels_brute > 0) switch(feels_brute / org.max_damage) if(0 to 0.35) @@ -61,7 +61,7 @@ if(0.65 to INFINITY) status += "throbbing with agony" - var/feels_burn = (org.burn_dam * feels) + var/feels_burn = org.can_feel_pain() ? (org.burn_dam * feels) : 0 if(feels_burn > 0) switch(feels_burn / org.max_damage) if(0 to 0.35) @@ -77,7 +77,7 @@ status += "bleeding" if(org.is_dislocated()) status += "dislocated" - if(org.status & ORGAN_BROKEN) + if(org.status & ORGAN_BROKEN & org.can_feel_pain()) status += "hurts when touched" if(org.status & ORGAN_DEAD) From f1a896da2a4dd3aba756aa4bdf505397836dc747 Mon Sep 17 00:00:00 2001 From: Penelope Haze Date: Fri, 5 Jul 2024 19:13:01 -0400 Subject: [PATCH 2/2] Fix ungrammatical limb status messages --- code/modules/mob/living/human/human_attackhand.dm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/code/modules/mob/living/human/human_attackhand.dm b/code/modules/mob/living/human/human_attackhand.dm index 869664e881a..643030ca0fa 100644 --- a/code/modules/mob/living/human/human_attackhand.dm +++ b/code/modules/mob/living/human/human_attackhand.dm @@ -77,16 +77,16 @@ status += "bleeding" if(org.is_dislocated()) status += "dislocated" - if(org.status & ORGAN_BROKEN & org.can_feel_pain()) - status += "hurts when touched" + if(org.status & ORGAN_BROKEN && org.can_feel_pain()) + status += "painful to the touch" if(org.status & ORGAN_DEAD) if(BP_IS_PROSTHETIC(org) || BP_IS_CRYSTAL(org)) - status += "is irrecoverably damaged" + status += "irrecoverably damaged" else - status += "is grey and necrotic" + status += "grey and necrotic" else if(org.damage >= org.max_damage && org.germ_level >= INFECTION_LEVEL_TWO) - status += "is likely beyond saving, and has begun to decay" + status += "likely beyond saving and decay has set in" if(!org.is_usable() || org.is_dislocated()) status += "dangling uselessly"