From 207feae5631fcf946d2ea9bfb9fa06acd238b4f8 Mon Sep 17 00:00:00 2001 From: Casey Date: Sat, 10 Sep 2022 16:41:20 -0400 Subject: [PATCH 1/2] Makes wounds take time to disappear again to fix bleeding surgery --- code/modules/organs/organ_external.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code/modules/organs/organ_external.dm b/code/modules/organs/organ_external.dm index 48604444bf..38c1ab260a 100644 --- a/code/modules/organs/organ_external.dm +++ b/code/modules/organs/organ_external.dm @@ -732,7 +732,11 @@ Note that amputating the affected organ does in fact remove the infection from t for(var/datum/wound/W in wounds) // wounds can disappear after 10 minutes at the earliest +<<<<<<< HEAD if(W.damage <= 0 && W.created + 10 * 10 * 60 <= world.time) +======= + if(W.damage <= 0 && W.created + 10 MINUTES <= world.time) +>>>>>>> e1ed0044bb... Merge pull request #13698 from Heroman3003/woundfix wounds -= W continue // let the GC handle the deletion of the wound From a993b670fe6daaeb36dec59317d42cc2e5d48277 Mon Sep 17 00:00:00 2001 From: Nadyr <41974248+Darlantanis@users.noreply.github.com> Date: Sat, 10 Sep 2022 22:02:24 -0400 Subject: [PATCH 2/2] powder that makes you say yes --- code/modules/organs/organ_external.dm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/code/modules/organs/organ_external.dm b/code/modules/organs/organ_external.dm index 38c1ab260a..39f1339d94 100644 --- a/code/modules/organs/organ_external.dm +++ b/code/modules/organs/organ_external.dm @@ -732,11 +732,7 @@ Note that amputating the affected organ does in fact remove the infection from t for(var/datum/wound/W in wounds) // wounds can disappear after 10 minutes at the earliest -<<<<<<< HEAD - if(W.damage <= 0 && W.created + 10 * 10 * 60 <= world.time) -======= if(W.damage <= 0 && W.created + 10 MINUTES <= world.time) ->>>>>>> e1ed0044bb... Merge pull request #13698 from Heroman3003/woundfix wounds -= W continue // let the GC handle the deletion of the wound