cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 03:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1995 from CIB/master

Browse Source 
Fixes and stuff
This commit is contained in:
Mloc
2012-11-21 13:30:32 -08:00
parent a49d3e036c 966f78f1ab
commit 2f3b3f84c3
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
code/modules/mob/living/carbon/human/life.dm
View File

@@ -187,6 +187,7 @@
var/word = pick("dizzy","woosey","faint") var/word = pick("dizzy","woosey","faint")
src << "\red You feel extremely [word]" src << "\red You feel extremely [word]"
if(0 to 122) if(0 to 122)
toxloss += 200
death() death()
@@ -528,7 +529,7 @@
if(!breath) if(!breath)
if(isobj(loc)) if(isobj(loc))
var/obj/location_as_object = loc var/obj/location_as_object = loc
breath = location_as_object.handle_internal_lifeform(src, BREATH_VOLUME) breath = location_as_object.handle_internal_lifeform(src, BREATH_MOLES)
else if(isturf(loc)) else if(isturf(loc))
var/breath_moles = 0 var/breath_moles = 0
/*if(environment.return_pressure() > ONE_ATMOSPHERE) /*if(environment.return_pressure() > ONE_ATMOSPHERE)
@@ -539,6 +540,13 @@
breath_moles = environment.total_moles()*BREATH_PERCENTAGE breath_moles = environment.total_moles()*BREATH_PERCENTAGE
breath = loc.remove_air(breath_moles) breath = loc.remove_air(breath_moles)
if(!lung_ruptured)
if(!breath || breath.total_moles < BREATH_MOLES / 5 || breath.total_moles > BREATH_MOLES * 5)
if(prob(5))
rupture_lung()
// Handle chem smoke effect -- Doohl // Handle chem smoke effect -- Doohl
var/block = 0 var/block = 0
if(wear_mask) if(wear_mask)
@@ -566,12 +574,6 @@
var/obj/location_as_object = loc var/obj/location_as_object = loc
location_as_object.handle_internal_lifeform(src, 0) location_as_object.handle_internal_lifeform(src, 0)
if(!lung_ruptured && breath)
if(breath.total_moles < BREATH_MOLES / 5 || breath.total_moles > BREATH_MOLES * 5)
if(prob(5))
rupture_lung()
handle_breath(breath) handle_breath(breath)
if(breath) if(breath)