From 9deea854ec930a6c16b1dfe3f6275dd12a4e3470 Mon Sep 17 00:00:00 2001 From: MrMelbert <51863163+MrMelbert@users.noreply.github.com> Date: Sun, 26 Jan 2025 13:04:09 -0600 Subject: [PATCH] Fix regen mesh (#89223) ## About The Pull Request Fixes #89007 The conditionals were messed up - Burn wound sanitation / flesh healing heals the wound over time so it's not like these would reasonably drop to zero while meshing them. ## Changelog :cl: Melbert fix: Regen meshes stop when they've done all they can again /:cl: --- code/datums/wounds/burns.dm | 4 ++-- code/game/objects/items/stacks/medical.dm | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/datums/wounds/burns.dm b/code/datums/wounds/burns.dm index b3d04c21485..05a74ff2dbe 100644 --- a/code/datums/wounds/burns.dm +++ b/code/datums/wounds/burns.dm @@ -225,9 +225,9 @@ /// Checks if the wound is in a state that ointment or flesh will help /datum/wound/burn/flesh/proc/can_be_ointmented_or_meshed() - if(infestation > 0 || sanitization < infestation) + if(infestation > 0 && sanitization < infestation) return TRUE - if(flesh_damage > 0 || flesh_healing <= flesh_damage) + if(flesh_damage > 0 && flesh_healing <= flesh_damage) return TRUE return FALSE diff --git a/code/game/objects/items/stacks/medical.dm b/code/game/objects/items/stacks/medical.dm index e5514380bf8..36203ff57f7 100644 --- a/code/game/objects/items/stacks/medical.dm +++ b/code/game/objects/items/stacks/medical.dm @@ -270,7 +270,7 @@ if(!brute_to_heal && stop_bleeding) // no brute, no bleeding carbon_patient.balloon_alert(user, "[affecting.plaintext_zone] is not bleeding or bruised!") else if(!burn_to_heal && (flesh_regeneration || sanitization) && any_burn_wound) // no burns, existing burn wounds are treated - carbon_patient.balloon_alert(user, "[affecting.plaintext_zone] has been fully treated!") + carbon_patient.balloon_alert(user, "[affecting.plaintext_zone] is fully treated, give it time!") else if(!affecting.brute_dam && !affecting.burn_dam) // not hurt at all carbon_patient.balloon_alert(user, "[affecting.plaintext_zone] is not hurt!") else // probably hurt in some way but we are not the right item for this