cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 11:43:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8137 from mwerezak/lexorin

Browse Source 
Lexorin cleanup
This commit is contained in:
Chinsky
2015-02-17 11:58:34 +03:00
parent bee187d5bc d75379d6af
commit e596d45013
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -326,7 +326,6 @@
if(istype(O)) O.add_autopsy_data("Radiation Poisoning", damage) if(istype(O)) O.add_autopsy_data("Radiation Poisoning", damage)
proc/breathe() proc/breathe()
if(reagents.has_reagent("lexorin")) return
if(istype(loc, /obj/machinery/atmospherics/unary/cryo_cell)) return if(istype(loc, /obj/machinery/atmospherics/unary/cryo_cell)) return
if(species && (species.flags & NO_BREATHE || species.flags & IS_SYNTHETIC)) return if(species && (species.flags & NO_BREATHE || species.flags & IS_SYNTHETIC)) return
@@ -439,17 +438,15 @@
return return
if(!breath || (breath.total_moles == 0) || suiciding) if(!breath || (breath.total_moles == 0) || suiciding)
failed_last_breath = 1
if(suiciding) if(suiciding)
adjustOxyLoss(2)//If you are suiciding, you should die a little bit faster adjustOxyLoss(2)//If you are suiciding, you should die a little bit faster
failed_last_breath = 1
oxygen_alert = max(oxygen_alert, 1) oxygen_alert = max(oxygen_alert, 1)
return 0 return 0
if(health > config.health_threshold_crit) if(health > config.health_threshold_crit)
adjustOxyLoss(HUMAN_MAX_OXYLOSS) adjustOxyLoss(HUMAN_MAX_OXYLOSS)
failed_last_breath = 1
else else
adjustOxyLoss(HUMAN_CRIT_MAX_OXYLOSS) adjustOxyLoss(HUMAN_CRIT_MAX_OXYLOSS)
failed_last_breath = 1
oxygen_alert = max(oxygen_alert, 1) oxygen_alert = max(oxygen_alert, 1)

4
code/modules/reagents/Chemistry-Reagents.dm
View File

@@ -1702,8 +1702,8 @@ datum
if(!M) M = holder.my_atom if(!M) M = holder.my_atom
if(prob(33)) if(prob(33))
M.take_organ_damage(1*REM, 0) M.take_organ_damage(1*REM, 0)
M.adjustOxyLoss(3) if(M.losebreath < 15)
if(prob(20)) M.emote("gasp") M.losebreath++
..() ..()
return return