Merge pull request #2335 from Yoshax/lungfix

Actually fixes lung rupturing and does so with less runtimes
This commit is contained in:
Neerti
2016-08-16 15:06:15 -04:00
committed by GitHub
6 changed files with 65 additions and 6 deletions
+9 -3
View File
@@ -18,9 +18,15 @@
owner.emote("cough") //respitory tract infection
if(is_bruised())
if(prob(2))
if(prob(4))
spawn owner.emote("me", 1, "coughs up blood!")
owner.drip(10)
if(prob(4))
if(prob(8))
spawn owner.emote("me", 1, "gasps for air!")
owner.losebreath += 15
owner.losebreath += 15
/obj/item/organ/internal/lungs/proc/rupture()
var/obj/item/organ/external/parent = owner.get_organ(parent_organ)
if(istype(parent))
owner.custom_pain("You feel a stabbing pain in your [parent.name]!", 1)
bruise()
+3
View File
@@ -247,6 +247,9 @@ var/list/organ_cache = list()
if(parent && !silent)
owner.custom_pain("Something inside your [parent.name] hurts a lot.", 1)
/obj/item/organ/proc/bruise()
damage = max(damage, min_bruised_damage)
/obj/item/organ/proc/robotize() //Being used to make robutt hearts, etc
robotic = ORGAN_ROBOT
src.status &= ~ORGAN_BROKEN