From 560a24ee833d42c68fb1ac14d7abbfb77fc93fc3 Mon Sep 17 00:00:00 2001 From: Atermonera Date: Sat, 25 Jan 2020 19:12:39 -0800 Subject: [PATCH] Merge pull request #6637 from Mechoid/AugmentsRespectBeds Augments Respect Beds, Robotic --- code/modules/organs/internal/augment.dm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/code/modules/organs/internal/augment.dm b/code/modules/organs/internal/augment.dm index 0c168d16794..d134ad12ca0 100644 --- a/code/modules/organs/internal/augment.dm +++ b/code/modules/organs/internal/augment.dm @@ -7,6 +7,7 @@ icon_state = "cell_bay" + robotic = ORGAN_ROBOT parent_organ = BP_TORSO organ_verbs = list(/mob/living/carbon/human/proc/augment_menu) // Verbs added by the organ when present in the body. @@ -145,6 +146,12 @@ var/mob/living/carbon/human/M = src + if(buckled) + var/obj/Ob = buckled + if(Ob.buckle_lying) + to_chat(M, "You cannot use your augments when restrained.") + return 0 + if((slot == slot_l_hand && l_hand) || (slot == slot_r_hand && r_hand)) to_chat(M,"Your hand is full. Drop something first.") return 0