From 4bf9c8cc8490bcc738236f06c8cebd8c484954ef Mon Sep 17 00:00:00 2001 From: Linzolle Date: Wed, 18 Sep 2019 23:15:05 -0500 Subject: [PATCH] citadel fixes --- code/modules/surgery/advanced/bioware/ligament_hook.dm | 8 ++++---- .../surgery/advanced/bioware/ligament_reinforcement.dm | 8 ++++---- code/modules/surgery/bodyparts/bodyparts.dm | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/code/modules/surgery/advanced/bioware/ligament_hook.dm b/code/modules/surgery/advanced/bioware/ligament_hook.dm index 9d46483598..ee59f0213c 100644 --- a/code/modules/surgery/advanced/bioware/ligament_hook.dm +++ b/code/modules/surgery/advanced/bioware/ligament_hook.dm @@ -32,10 +32,10 @@ /datum/bioware/hooked_ligaments/on_gain() ..() - owner.add_trait(TRAIT_LIMBATTACHMENT, "ligament_hook") - owner.add_trait(TRAIT_EASYDISMEMBER, "ligament_hook") + ADD_TRAIT(owner, TRAIT_LIMBATTACHMENT, "ligament_hook") + ADD_TRAIT(owner, TRAIT_EASYDISMEMBER, "ligament_hook") /datum/bioware/hooked_ligaments/on_lose() ..() - owner.remove_trait(TRAIT_LIMBATTACHMENT, "ligament_hook") - owner.remove_trait(TRAIT_EASYDISMEMBER, "ligament_hook") \ No newline at end of file + REMOVE_TRAIT(owner, TRAIT_LIMBATTACHMENT, "ligament_hook") + REMOVE_TRAIT(owner, TRAIT_EASYDISMEMBER, "ligament_hook") \ No newline at end of file diff --git a/code/modules/surgery/advanced/bioware/ligament_reinforcement.dm b/code/modules/surgery/advanced/bioware/ligament_reinforcement.dm index a5ab51e1ad..8ef3a56eba 100644 --- a/code/modules/surgery/advanced/bioware/ligament_reinforcement.dm +++ b/code/modules/surgery/advanced/bioware/ligament_reinforcement.dm @@ -32,10 +32,10 @@ /datum/bioware/reinforced_ligaments/on_gain() ..() - owner.add_trait(TRAIT_NODISMEMBER, "reinforced_ligaments") - owner.add_trait(TRAIT_EASYLIMBDISABLE, "reinforced_ligaments") + ADD_TRAIT(owner, TRAIT_NODISMEMBER, "reinforced_ligaments") + ADD_TRAIT(owner, TRAIT_EASYLIMBDISABLE, "reinforced_ligaments") /datum/bioware/reinforced_ligaments/on_lose() ..() - owner.remove_trait(TRAIT_NODISMEMBER, "reinforced_ligaments") - owner.remove_trait(TRAIT_EASYLIMBDISABLE, "reinforced_ligaments") \ No newline at end of file + REMOVE_TRAIT(owner, TRAIT_NODISMEMBER, "reinforced_ligaments") + REMOVE_TRAIT(owner, TRAIT_EASYLIMBDISABLE, "reinforced_ligaments") \ No newline at end of file diff --git a/code/modules/surgery/bodyparts/bodyparts.dm b/code/modules/surgery/bodyparts/bodyparts.dm index 7ed106dc18..dffb7bf355 100644 --- a/code/modules/surgery/bodyparts/bodyparts.dm +++ b/code/modules/surgery/bodyparts/bodyparts.dm @@ -231,7 +231,7 @@ return BODYPART_DISABLED_PARALYSIS if(can_dismember() && !HAS_TRAIT(owner, TRAIT_NODISMEMBER)) . = disabled //inertia, to avoid limbs healing 0.1 damage and being re-enabled - if((get_damage(TRUE) >= max_damage) || (owner.has_trait(TRAIT_EASYLIMBDISABLE) && (get_damage(TRUE) >= (max_damage * 0.6)))) //Easy limb disable disables the limb at 40% health instead of 0% + if((get_damage(TRUE) >= max_damage) || (HAS_TRAIT(owner, TRAIT_EASYLIMBDISABLE) && (get_damage(TRUE) >= (max_damage * 0.6)))) //Easy limb disable disables the limb at 40% health instead of 0% return BODYPART_DISABLED_DAMAGE if(disabled && (get_damage(TRUE) <= (max_damage * 0.5))) return BODYPART_NOT_DISABLED