Skip to content

Commit

Permalink
Merge pull request #4166 from out-of-phaze/fix/wooden-pain
Browse files Browse the repository at this point in the history
Fix wooden prostheses giving pain messages when checking for injuries
  • Loading branch information
MistakeNot4892 committed Jul 7, 2024
2 parents cc929bb + f1a896d commit 069cc01
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions code/modules/mob/living/human/human_attackhand.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand All @@ -77,16 +77,16 @@
status += "<b>bleeding</b>"
if(org.is_dislocated())
status += "dislocated"
if(org.status & ORGAN_BROKEN)
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"

Expand Down

0 comments on commit 069cc01

Please sign in to comment.