From f74bf6d94e1df276df31ae2753f875bddcd394cd Mon Sep 17 00:00:00 2001 From: DeltaFire Date: Wed, 4 Nov 2020 05:05:23 +0100 Subject: [PATCH] no more accidental slapping I said! Makes initiate() always return true if you do not finish the doafter, preventing certain issues (you walking away and therefore slapping them / starting to forcefeed a organ, etc) --- code/modules/surgery/surgery_step.dm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/code/modules/surgery/surgery_step.dm b/code/modules/surgery/surgery_step.dm index e287b38ca1..54134d5a47 100644 --- a/code/modules/surgery/surgery_step.dm +++ b/code/modules/surgery/surgery_step.dm @@ -81,8 +81,12 @@ surgery.status++ if(surgery.status > surgery.steps.len) surgery.complete() - surgery.step_in_progress = FALSE - return advance + surgery.step_in_progress = FALSE + return advance + else + surgery.step_in_progress = FALSE + return TRUE //Stop the attack chain! + /datum/surgery_step/proc/preop(mob/user, mob/living/target, target_zone, obj/item/tool, datum/surgery/surgery) display_results(user, target, "You begin to perform surgery on [target]...",