Actually fixes lung rupturing and does so with less runtimes

This commit is contained in:
Yoshax
2016-08-16 17:55:08 +01:00
parent 8e2edd03f7
commit dd0bea114a
2 changed files with 13 additions and 10 deletions
+10 -6
View File
@@ -332,12 +332,6 @@
adjustOxyLoss(-5)
return
if(should_have_organ(O_LUNGS))
var/obj/item/organ/internal/lungs/L = internal_organs_by_name[O_LUNGS]
if(breath.total_moles < BREATH_MOLES / 5 || breath.total_moles > BREATH_MOLES * 5)
if(!L.is_bruised() && prob(5))
rupture_lung()
if(!breath || (breath.total_moles == 0) || suiciding)
failed_last_breath = 1
if(suiciding)
@@ -349,12 +343,22 @@
else
adjustOxyLoss(HUMAN_CRIT_MAX_OXYLOSS)
if(should_have_organ(O_LUNGS))
var/obj/item/organ/internal/lungs/L = internal_organs_by_name[O_LUNGS]
if(!L.is_bruised() && prob(5))
if(breath.total_moles)
if(breath.total_moles < BREATH_MOLES / 5 || breath.total_moles > BREATH_MOLES * 5)
rupture_lung()
else
rupture_lung()
oxygen_alert = max(oxygen_alert, 1)
return 0
var/safe_pressure_min = 16 // Minimum safe partial pressure of breathable gas in kPa
// Lung damage increases the minimum safe pressure.
if(should_have_organ(O_LUNGS))
var/obj/item/organ/internal/lungs/L = internal_organs_by_name[O_LUNGS]
+3 -4
View File
@@ -18,16 +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
/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)
parent.bruise()
bruise()