shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

citadel fixes

Browse Source
This commit is contained in:
Linzolle
2019-09-18 23:15:05 -05:00
parent 023428f6a4
commit 4bf9c8cc84
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/surgery/advanced/bioware/ligament_hook.dm
+4 -4
View File
@@ -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")
REMOVE_TRAIT(owner, TRAIT_LIMBATTACHMENT, "ligament_hook")
REMOVE_TRAIT(owner, TRAIT_EASYDISMEMBER, "ligament_hook")
code/modules/surgery/advanced/bioware/ligament_reinforcement.dm
+4 -4
View File
@@ -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")
REMOVE_TRAIT(owner, TRAIT_NODISMEMBER, "reinforced_ligaments")
REMOVE_TRAIT(owner, TRAIT_EASYLIMBDISABLE, "reinforced_ligaments")
code/modules/surgery/bodyparts/bodyparts.dm
+1 -1
View File
@@ -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