From 000f874abe59d98115435b337a979d8db6dbb68f Mon Sep 17 00:00:00 2001 From: lm40 Date: Mon, 8 Aug 2022 14:11:40 -0400 Subject: [PATCH 1/2] Update organ_external.dm --- code/modules/organs/organ_external.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/modules/organs/organ_external.dm b/code/modules/organs/organ_external.dm index 8f5d5bc9a08..34718559aa7 100644 --- a/code/modules/organs/organ_external.dm +++ b/code/modules/organs/organ_external.dm @@ -594,6 +594,8 @@ This function completely restores a damaged organ to perfect condition. return 1 else last_dam = brute_dam + burn_dam + if (number_wounds != 0) + return 1 if(germ_level) return 1 return 0 From b342952a64168b432e4a868db80988b7fd870d7e Mon Sep 17 00:00:00 2001 From: lm40 Date: Mon, 8 Aug 2022 22:06:21 -0400 Subject: [PATCH 2/2] Remove wound removal timer --- code/modules/organs/organ_external.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/organs/organ_external.dm b/code/modules/organs/organ_external.dm index 34718559aa7..9ef9460c60d 100644 --- a/code/modules/organs/organ_external.dm +++ b/code/modules/organs/organ_external.dm @@ -732,8 +732,8 @@ Note that amputating the affected organ does in fact remove the infection from t return for(var/datum/wound/W in wounds) - // wounds can disappear after 10 minutes at the earliest - if(W.damage <= 0 && W.created + 10 * 10 * 60 <= world.time) + // wounds used to be able to disappear after 10 minutes at the earliest, for now just remove them as soon as there is no damage + if(W.damage <= 0) wounds -= W continue // let the GC handle the deletion of the wound