From 71db96fb2b223c38b3453fa9706127962b8e5f7f Mon Sep 17 00:00:00 2001 From: Iajret Creature <122297233+Steals-The-PRs@users.noreply.github.com> Date: Wed, 27 Mar 2024 20:37:34 +0300 Subject: [PATCH] [MIRROR] Fixes starting self surgery (#1659) (#2580) * Fixes starting self surgery (#82255) ## About The Pull Request Fixes being unable to start self-surgery while laying down. Closes https://github.com/tgstation/tgstation/issues/82034 ## Changelog :cl: LT3 fix: Fixed being unable to start self surgery /:cl: * Fixes starting self surgery --------- Co-authored-by: NovaBot <154629622+NovaBot13@users.noreply.github.com> Co-authored-by: lessthanthree <83487515+lessthnthree@users.noreply.github.com> --- code/datums/components/surgery_initiator.dm | 2 ++ code/modules/surgery/tools.dm | 1 + 2 files changed, 3 insertions(+) diff --git a/code/datums/components/surgery_initiator.dm b/code/datums/components/surgery_initiator.dm index 150e2e7113a..ec69eaaeeac 100644 --- a/code/datums/components/surgery_initiator.dm +++ b/code/datums/components/surgery_initiator.dm @@ -88,6 +88,8 @@ continue if(!is_type_in_list(target, surgery.target_mobtypes)) continue + if(user == target && !(surgery.surgery_flags & SURGERY_SELF_OPERABLE)) + continue if(isnull(affecting)) if(surgery.surgery_flags & SURGERY_REQUIRE_LIMB) diff --git a/code/modules/surgery/tools.dm b/code/modules/surgery/tools.dm index cddcdd7fc5a..d24b1a59271 100644 --- a/code/modules/surgery/tools.dm +++ b/code/modules/surgery/tools.dm @@ -293,6 +293,7 @@ w_class = WEIGHT_CLASS_TINY attack_verb_continuous = list("slaps") attack_verb_simple = list("slap") + interaction_flags_atom = parent_type::interaction_flags_atom | INTERACT_ATOM_IGNORE_MOBILITY /obj/item/surgical_drapes/Initialize(mapload) . = ..()