From b84e1bbad674948aac6d293d58c0715085987305 Mon Sep 17 00:00:00 2001 From: WilliamNelson37 Date: Mon, 3 Jul 2023 21:32:28 -0500 Subject: [PATCH 1/4] Fixes Nanopaste --- code/global.dm | 2 ++ code/modules/surgery/robotics.dm | 29 ++++++++++++++++++++++++++++- 2 files changed, 30 insertions(+), 1 deletion(-) diff --git a/code/global.dm b/code/global.dm index 72f4d34e20b..9f85be4486a 100644 --- a/code/global.dm +++ b/code/global.dm @@ -1,5 +1,7 @@ //#define TESTING +//#define SURGERYDEBUG 1 + // Items that ask to be called every cycle. var/global/datum/datacore/data_core = null var/global/list/machines = list() // ALL Machines, whether processing or not. diff --git a/code/modules/surgery/robotics.dm b/code/modules/surgery/robotics.dm index a5ec13d6053..b90a547887e 100644 --- a/code/modules/surgery/robotics.dm +++ b/code/modules/surgery/robotics.dm @@ -8,17 +8,35 @@ /datum/surgery_step/robotics/can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) if (isslime(target)) + #ifdef SURGERYDEBUG + log_debug("surgery_step/robotics/can_use Surgery step returned 0; target is slime") + #endif return 0 if (target_zone == O_EYES) //there are specific steps for eye surgery + #ifdef SURGERYDEBUG + log_debug("surgery_step/robotics/can_use Surgery step returned 0; target zone is eyes") + #endif return 0 if (!hasorgans(target)) + #ifdef SURGERYDEBUG + log_debug("surgery_step/robotics/can_use Surgery step returned 0; target has no organs") + #endif return 0 var/obj/item/organ/external/affected = target.get_organ(target_zone) if (affected == null) + #ifdef SURGERYDEBUG + log_debug("surgery_step/robotics/can_use Surgery step returned 0; external organ returned null") + #endif return 0 if (affected.status & ORGAN_DESTROYED) + #ifdef SURGERYDEBUG + log_debug("surgery_step/robotics/can_use Surgery step returned 0; external organ returned null") + #endif return 0 if (!(affected.robotic >= ORGAN_ROBOT)) + #ifdef SURGERYDEBUG + log_debug("surgery_step/robotics/can_use Surgery step returned 0; External organ was deemed to be not robotic") + #endif return 0 if(coverage_check(user, target, affected, tool)) return 0 @@ -243,6 +261,9 @@ max_duration = 90 /datum/surgery_step/robotics/fix_organ_robotic/can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) + #ifdef SURGERYDEBUG + log_debug("Began robotics/fix_organ_robotic/can_use for [user] on [target_zone]") + #endif if (!hasorgans(target)) return var/obj/item/organ/external/affected = target.get_organ(target_zone) @@ -252,14 +273,20 @@ if(I.damage > 0 && (I.robotic >= ORGAN_ROBOT)) is_organ_damaged = 1 break - return affected.open == 3 && is_organ_damaged + return (affected.open == 3 || (affected.open >= 2 && target_zone == BP_GROIN)) && is_organ_damaged /datum/surgery_step/robotics/fix_organ_robotic/begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool) + #ifdef SURGERYDEBUG + log_debug("Began fix_organ_robotic/begin_step for [user] on [target_zone]") + #endif if (!hasorgans(target)) return var/obj/item/organ/external/affected = target.get_organ(target_zone) for(var/obj/item/organ/I in affected.internal_organs) + #ifdef SURGERYDEBUG + log_debug("robotics/fix_organ_robotic/begin_step- processing [I] in [user]") + #endif if(I && I.damage > 0) if(I.robotic >= ORGAN_ROBOT) user.visible_message("[user] starts mending the damage to [target]'s [I.name]'s mechanisms.", \ From 8765af49cd8100734411355fc7d2b2a33c3521c8 Mon Sep 17 00:00:00 2001 From: WilliamNelson37 Date: Mon, 3 Jul 2023 21:47:04 -0500 Subject: [PATCH 2/4] ok --- code/modules/surgery/robotics.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/surgery/robotics.dm b/code/modules/surgery/robotics.dm index b90a547887e..53721adebe5 100644 --- a/code/modules/surgery/robotics.dm +++ b/code/modules/surgery/robotics.dm @@ -273,7 +273,7 @@ if(I.damage > 0 && (I.robotic >= ORGAN_ROBOT)) is_organ_damaged = 1 break - return (affected.open == 3 || (affected.open >= 2 && target_zone == BP_GROIN)) && is_organ_damaged + return affected.open == (affected.encased ? 3 : 2)) && is_organ_damaged /datum/surgery_step/robotics/fix_organ_robotic/begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool) #ifdef SURGERYDEBUG From 9bbc2ae7465b6462221ea3139f7901a5c57d78a5 Mon Sep 17 00:00:00 2001 From: WilliamNelson37 Date: Mon, 3 Jul 2023 21:48:07 -0500 Subject: [PATCH 3/4] paren fix --- code/modules/surgery/robotics.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/surgery/robotics.dm b/code/modules/surgery/robotics.dm index 53721adebe5..2c030890471 100644 --- a/code/modules/surgery/robotics.dm +++ b/code/modules/surgery/robotics.dm @@ -273,7 +273,7 @@ if(I.damage > 0 && (I.robotic >= ORGAN_ROBOT)) is_organ_damaged = 1 break - return affected.open == (affected.encased ? 3 : 2)) && is_organ_damaged + return affected.open == (affected.encased ? 3 : 2) && is_organ_damaged /datum/surgery_step/robotics/fix_organ_robotic/begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool) #ifdef SURGERYDEBUG From d8c0370c56b6b2dcbc9227a23581c4c0261de8de Mon Sep 17 00:00:00 2001 From: WilliamNelson37 Date: Wed, 12 Jul 2023 12:14:44 -0500 Subject: [PATCH 4/4] debugging removed --- code/global.dm | 2 -- code/modules/surgery/robotics.dm | 27 --------------------------- 2 files changed, 29 deletions(-) diff --git a/code/global.dm b/code/global.dm index 9f85be4486a..72f4d34e20b 100644 --- a/code/global.dm +++ b/code/global.dm @@ -1,7 +1,5 @@ //#define TESTING -//#define SURGERYDEBUG 1 - // Items that ask to be called every cycle. var/global/datum/datacore/data_core = null var/global/list/machines = list() // ALL Machines, whether processing or not. diff --git a/code/modules/surgery/robotics.dm b/code/modules/surgery/robotics.dm index 2c030890471..6541bd86ca0 100644 --- a/code/modules/surgery/robotics.dm +++ b/code/modules/surgery/robotics.dm @@ -8,35 +8,17 @@ /datum/surgery_step/robotics/can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) if (isslime(target)) - #ifdef SURGERYDEBUG - log_debug("surgery_step/robotics/can_use Surgery step returned 0; target is slime") - #endif return 0 if (target_zone == O_EYES) //there are specific steps for eye surgery - #ifdef SURGERYDEBUG - log_debug("surgery_step/robotics/can_use Surgery step returned 0; target zone is eyes") - #endif return 0 if (!hasorgans(target)) - #ifdef SURGERYDEBUG - log_debug("surgery_step/robotics/can_use Surgery step returned 0; target has no organs") - #endif return 0 var/obj/item/organ/external/affected = target.get_organ(target_zone) if (affected == null) - #ifdef SURGERYDEBUG - log_debug("surgery_step/robotics/can_use Surgery step returned 0; external organ returned null") - #endif return 0 if (affected.status & ORGAN_DESTROYED) - #ifdef SURGERYDEBUG - log_debug("surgery_step/robotics/can_use Surgery step returned 0; external organ returned null") - #endif return 0 if (!(affected.robotic >= ORGAN_ROBOT)) - #ifdef SURGERYDEBUG - log_debug("surgery_step/robotics/can_use Surgery step returned 0; External organ was deemed to be not robotic") - #endif return 0 if(coverage_check(user, target, affected, tool)) return 0 @@ -261,9 +243,6 @@ max_duration = 90 /datum/surgery_step/robotics/fix_organ_robotic/can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - #ifdef SURGERYDEBUG - log_debug("Began robotics/fix_organ_robotic/can_use for [user] on [target_zone]") - #endif if (!hasorgans(target)) return var/obj/item/organ/external/affected = target.get_organ(target_zone) @@ -276,17 +255,11 @@ return affected.open == (affected.encased ? 3 : 2) && is_organ_damaged /datum/surgery_step/robotics/fix_organ_robotic/begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - #ifdef SURGERYDEBUG - log_debug("Began fix_organ_robotic/begin_step for [user] on [target_zone]") - #endif if (!hasorgans(target)) return var/obj/item/organ/external/affected = target.get_organ(target_zone) for(var/obj/item/organ/I in affected.internal_organs) - #ifdef SURGERYDEBUG - log_debug("robotics/fix_organ_robotic/begin_step- processing [I] in [user]") - #endif if(I && I.damage > 0) if(I.robotic >= ORGAN_ROBOT) user.visible_message("[user] starts mending the damage to [target]'s [I.name]'s mechanisms.", \