Merge pull request #4929 from Anewbe/splints

Splints no longer perfectly prevent negative effects from broken bones
This commit is contained in:
Atermonera
2018-02-24 22:52:25 -08:00
committed by GitHub
4 changed files with 42 additions and 5 deletions
+1 -1
View File
@@ -543,7 +543,7 @@ This function completely restores a damaged organ to perfect condition.
//external organs handle brokenness a bit differently when it comes to damage. Instead brute_dam is checked inside process()
//this also ensures that an external organ cannot be "broken" without broken_description being set.
/obj/item/organ/external/is_broken()
return ((status & ORGAN_CUT_AWAY) || ((status & ORGAN_BROKEN) && !(splinted)))
return ((status & ORGAN_CUT_AWAY) || (status & ORGAN_BROKEN) && (!splinted || (splinted && splinted in src.contents && prob(30))))
//Determines if we even need to process this organ.
/obj/item/organ/external/proc/need_process()