cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-27 10:32:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into dev-freeze

Browse Source 
Conflicts:
	code/modules/mob/living/carbon/human/life.dm
This commit is contained in:
PsiOmegaDelta
2015-11-03 17:37:46 +01:00
parent 4854529813 6f27f4fd35
commit 1fa73c0c18
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -344,7 +344,7 @@
//exposure to extreme pressures can rupture lungs
var/check_pressure = breath.return_pressure()
if(check_pressure < ONE_ATMOSPHERE / 5 || check_pressure > ONE_ATMOSPHERE * 5)
if(is_lung_ruptured() && prob(5))
if(!is_lung_ruptured() && prob(5))
rupture_lung()
return breath