From ee4df4f8622954b2e80e15eae129e8a9a977494e Mon Sep 17 00:00:00 2001 From: Mechoid Date: Sun, 15 Oct 2017 11:01:20 -0700 Subject: [PATCH 1/2] Fixes roboheads being crammed onto flesh-bodies. --- code/modules/surgery/limb_reattach.dm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/code/modules/surgery/limb_reattach.dm b/code/modules/surgery/limb_reattach.dm index 3310ffe6a5..7f1dbce282 100644 --- a/code/modules/surgery/limb_reattach.dm +++ b/code/modules/surgery/limb_reattach.dm @@ -27,13 +27,16 @@ var/obj/item/organ/external/P = target.organs_by_name[E.parent_organ] var/obj/item/organ/external/affected = target.get_organ(target_zone) if (affected) - user << "Something is in the way! You can't attach [E] here!" + to_chat(user, "Something is in the way! You can't attach [E] here!") return 0 if(!P) - user << "There's nothing to attach [E] to!" + to_chat(user, "There's nothing to attach [E] to!" return 0 else if((P.robotic >= ORGAN_ROBOT) && (E.robotic < ORGAN_ROBOT)) - user << "Attaching [E] to [P] wouldn't work well." + to_chat(user, "Attaching [E] to [P] wouldn't work well." + return 0 + else if(istype(E, /obj/item/organ/external/head) && E.robotic >= ORGAN_ROBOT && P.robotic < ORGAN_ROBOT) + to_chat(user, "Attaching [E] to [P] might break [E].") return 0 else return 1 From e21b65ec8517d1af8ca3dc1b2b96313a7c9d936f Mon Sep 17 00:00:00 2001 From: Mechoid Date: Sun, 15 Oct 2017 11:13:46 -0700 Subject: [PATCH 2/2] Nails the Parentheses back on. --- code/modules/surgery/limb_reattach.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/surgery/limb_reattach.dm b/code/modules/surgery/limb_reattach.dm index 7f1dbce282..99fa33d1cb 100644 --- a/code/modules/surgery/limb_reattach.dm +++ b/code/modules/surgery/limb_reattach.dm @@ -30,10 +30,10 @@ to_chat(user, "Something is in the way! You can't attach [E] here!") return 0 if(!P) - to_chat(user, "There's nothing to attach [E] to!" + to_chat(user, "There's nothing to attach [E] to!") return 0 else if((P.robotic >= ORGAN_ROBOT) && (E.robotic < ORGAN_ROBOT)) - to_chat(user, "Attaching [E] to [P] wouldn't work well." + to_chat(user, "Attaching [E] to [P] wouldn't work well.") return 0 else if(istype(E, /obj/item/organ/external/head) && E.robotic >= ORGAN_ROBOT && P.robotic < ORGAN_ROBOT) to_chat(user, "Attaching [E] to [P] might break [E].")