Merge pull request #3128 from aztectornado/hollow-bones

Adds hollow bones trait
This commit is contained in:
Aronai Sieyes
2018-03-09 14:34:07 -05:00
committed by GitHub
3 changed files with 15 additions and 3 deletions
+3 -2
View File
@@ -400,7 +400,7 @@
user << "<span class='notice'>Nothing to fix!</span>"
return 0
if(damage_amount >= ROBOLIMB_REPAIR_CAP)
if(damage_amount >= min_broken_damage) //VOREStation Edit - Makes robotic limb damage scalable
user << "<span class='danger'>The damage is far too severe to patch over externally.</span>"
return 0
@@ -1085,6 +1085,7 @@ Note that amputating the affected organ does in fact remove the infection from t
dislocated = -1
cannot_break = 1
min_broken_damage = ROBOLIMB_REPAIR_CAP //VOREStation Addition - Makes robotic limb damage scalable
remove_splint()
get_icon()
unmutate()
@@ -1133,7 +1134,7 @@ Note that amputating the affected organ does in fact remove the infection from t
return !(status & (ORGAN_MUTATED|ORGAN_DEAD))
/obj/item/organ/external/proc/is_malfunctioning()
return ((robotic >= ORGAN_ROBOT) && (brute_dam + burn_dam) >= 25 && prob(brute_dam + burn_dam))
return ((robotic >= ORGAN_ROBOT) && (brute_dam + burn_dam) >= min_broken_damage*0.83 && prob(brute_dam + burn_dam)) //VOREStation Edit - Makes robotic limb damage scalable
/obj/item/organ/external/proc/embed(var/obj/item/weapon/W, var/silent = 0)
if(!owner || loc != owner)