From 0f4754e17b8bc92453f9d32902fee05b55a43e33 Mon Sep 17 00:00:00 2001 From: Luc <89928798+lewcc@users.noreply.github.com> Date: Tue, 25 Apr 2023 15:14:00 -0400 Subject: [PATCH] turns out this was easier than I thought (#20909) --- code/datums/components/surgery_initiator.dm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/code/datums/components/surgery_initiator.dm b/code/datums/components/surgery_initiator.dm index f32547d4e70..c6aefce9bf8 100644 --- a/code/datums/components/surgery_initiator.dm +++ b/code/datums/components/surgery_initiator.dm @@ -219,13 +219,15 @@ to_chat(user, "You need a [is_robotic ? "prying": "cauterizing"] tool in your inactive hand to stop the surgery!") return TRUE - if(skip_surgery || chosen_close_step.try_op(user, patient, selected_zone, close_tool, the_surgery)) + if(skip_surgery || chosen_close_step.try_op(user, patient, selected_zone, close_tool, the_surgery) == SURGERY_INITIATE_SUCCESS) // logging in case people wonder why they're cut up inside log_attack(user, patient, "Prematurely finished \a [the_surgery] surgery.") qdel(chosen_close_step) patient.surgeries -= the_surgery qdel(the_surgery) - return TRUE + + // always return TRUE here so we don't continue the surgery chain and try to start a new surgery with our tool. + return TRUE /datum/component/surgery_initiator/proc/can_start_surgery(mob/user, mob/living/target) if(!user.Adjacent(target))