From 9c4b73be1e423ff146be4231f4297980a990bf98 Mon Sep 17 00:00:00 2001 From: hal9000PR <69320440+hal9000PR@users.noreply.github.com> Date: Sun, 16 May 2021 09:37:25 +0100 Subject: [PATCH] Fixes self surgery with beds (#16004) * fix * mochi's suggestion. added check for self surgery starting * line --- code/modules/mob/living/update_status.dm | 2 +- code/modules/surgery/helpers.dm | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/update_status.dm b/code/modules/mob/living/update_status.dm index 2c25e4d7613..b942b0cabe7 100644 --- a/code/modules/mob/living/update_status.dm +++ b/code/modules/mob/living/update_status.dm @@ -86,7 +86,7 @@ /mob/living/update_canmove(delay_action_updates = 0) var/fall_over = !can_stand() var/buckle_lying = !(buckled && !buckled.buckle_lying) - if(fall_over || resting || stunned) + if(fall_over || resting || stunned || (buckled && buckle_lying != 0)) drop_r_hand() drop_l_hand() else diff --git a/code/modules/surgery/helpers.dm b/code/modules/surgery/helpers.dm index 4c8001c9f76..bc579f5387c 100644 --- a/code/modules/surgery/helpers.dm +++ b/code/modules/surgery/helpers.dm @@ -11,6 +11,9 @@ /obj/item/weldingtool = 30 ) + if(M == user) + return // no self surgery + if(istype(M, /mob/living/carbon/human)) H = M affecting = H.get_organ(check_zone(selected_zone))