From 7a181b826926dac651d57d99ace7b9b377bbd4ce Mon Sep 17 00:00:00 2001 From: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com> Date: Fri, 19 Jul 2024 14:52:42 -0400 Subject: [PATCH] unfortunately 75 + 75 = 150 (#26260) --- code/modules/surgery/organs/organ_external.dm | 4 +++- code/modules/surgery/organs/subtypes/standard_organs.dm | 5 +++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/code/modules/surgery/organs/organ_external.dm b/code/modules/surgery/organs/organ_external.dm index e9313788a4a..6420b83c138 100644 --- a/code/modules/surgery/organs/organ_external.dm +++ b/code/modules/surgery/organs/organ_external.dm @@ -62,6 +62,8 @@ var/can_stand var/splinted_count = 0 //Time when this organ was last splinted + ///If this organ's max HP is reduced by the IPC magnetic joints implant + var/fragile = FALSE /obj/item/organ/external/necrotize(update_sprite=TRUE, ignore_vital_death = FALSE) if(status & (ORGAN_ROBOT|ORGAN_DEAD)) @@ -222,7 +224,7 @@ /obj/item/organ/external/receive_damage(brute, burn, sharp, used_weapon = null, list/forbidden_limbs = list(), ignore_resists = FALSE, updating_health = TRUE) var/max_limb_damage = max_damage - if(owner) + if(owner && fragile) max_limb_damage -= (HAS_TRAIT(owner, TRAIT_IPC_JOINTS_MAG) ? max_damage * 0.25 : 0) if(tough && !ignore_resists) brute = max(0, brute - 5) diff --git a/code/modules/surgery/organs/subtypes/standard_organs.dm b/code/modules/surgery/organs/subtypes/standard_organs.dm index 89f7dfeff78..d4f54450758 100644 --- a/code/modules/surgery/organs/subtypes/standard_organs.dm +++ b/code/modules/surgery/organs/subtypes/standard_organs.dm @@ -53,6 +53,7 @@ amputation_point = "left shoulder" can_grasp = 1 convertable_children = list(/obj/item/organ/external/hand) + fragile = TRUE /obj/item/organ/external/arm/emp_act(severity) ..() @@ -85,6 +86,7 @@ amputation_point = "left hip" can_stand = 1 convertable_children = list(/obj/item/organ/external/foot) + fragile = TRUE /obj/item/organ/external/leg/emp_act(severity) ..() @@ -123,6 +125,7 @@ parent_organ = "l_leg" amputation_point = "left ankle" can_stand = 1 + fragile = TRUE /obj/item/organ/external/foot/emp_act(severity) ..() @@ -164,6 +167,7 @@ parent_organ = "l_arm" amputation_point = "left wrist" can_grasp = 1 + fragile = TRUE /obj/item/organ/external/hand/emp_act(severity) ..() @@ -229,6 +233,7 @@ amputation_point = "neck" gendered_icon = TRUE encased = "skull" + fragile = TRUE var/can_intake_reagents = 1 var/alt_head = "None"