From 40001df1047d8758cdba84aa5217c1f054e3a735 Mon Sep 17 00:00:00 2001 From: HMBGERDO <61080616+HMBGERDO@users.noreply.github.com> Date: Thu, 6 Jun 2024 20:56:54 +0200 Subject: [PATCH] You no longer hit IPC on help intent if they are missing a limb (#25703) * dont hit IPC * cable coils too --- code/modules/mob/living/carbon/human/human_defense.dm | 3 +++ code/modules/power/cables/cable_coil.dm | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm index 455d8a2486a..a6725551147 100644 --- a/code/modules/mob/living/carbon/human/human_defense.dm +++ b/code/modules/mob/living/carbon/human/human_defense.dm @@ -93,6 +93,9 @@ emp_act return var/obj/item/organ/external/S = bodyparts_by_name[user.zone_selected] if(!S) + if(ismachineperson(src)) + to_chat(user, "[p_they(TRUE)] [p_are()] missing that limb!") + return TRUE return if(!S.is_robotic() || S.open == ORGAN_SYNTHETIC_OPEN) return diff --git a/code/modules/power/cables/cable_coil.dm b/code/modules/power/cables/cable_coil.dm index 74721e9e40a..0396b5075c4 100644 --- a/code/modules/power/cables/cable_coil.dm +++ b/code/modules/power/cables/cable_coil.dm @@ -83,6 +83,10 @@ GLOBAL_LIST_INIT(cable_coil_recipes, list (new/datum/stack_recipe/cable_restrain var/mob/living/carbon/human/H = M var/obj/item/organ/external/S = H.bodyparts_by_name[user.zone_selected] + if(!S && ismachineperson(M) && user.a_intent == INTENT_HELP) + to_chat(user, "[M.p_they(TRUE)] [M.p_are()] missing that limb!") + return + if(!S?.is_robotic() || user.a_intent != INTENT_HELP || S.open == ORGAN_SYNTHETIC_OPEN) return ..() if(S.burn_dam > ROBOLIMB_SELF_REPAIR_CAP)