cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-12 07:33:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Removing some references and replacing with the god procs. oxyloss mostly this time.

Browse Source 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2823 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
rockdtben
2011-12-26 17:56:22 +00:00
parent d93567dee2
commit 406d2eed23
14 changed files with 33 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/chemical/Chemistry-Reagents.dm
+2 -2
View File
@@ -422,7 +422,7 @@ datum
M:drowsyness = max(M:drowsyness, 20)
if(25 to INFINITY)
M.sleeping = 1
M.oxyloss = 0
M.adjustOxyLoss(-M.getOxyLoss())
M.SetWeakened(0)
M.SetStunned(0)
M.SetParalysis(0)
@@ -1206,7 +1206,7 @@ datum
if(M.stat == 2.0)
return
if(!M) M = holder.my_atom
M:oxyloss = 0
M.adjustOxyLoss(-M.getOxyLoss())
if(holder.has_reagent("lexorin"))
holder.remove_reagent("lexorin", 2)
..()
code/modules/mob/living/carbon/alien/humanoid/caste/hunter.dm
+1 -1
View File
@@ -92,7 +92,7 @@
if(src.health <= 20 && prob(1)) spawn(0) emote("gasp")
//if(!src.rejuv) src.oxyloss++
if(!src.reagents.has_reagent("inaprovaline")) src.oxyloss++
if(!src.reagents.has_reagent("inaprovaline")) src.adjustOxyLoss(1)
if(src.stat != 2) src.stat = 1
Paralyse(5)
code/modules/mob/living/carbon/alien/humanoid/caste/sentinel.dm
+1 -1
View File
@@ -93,7 +93,7 @@
if(src.health <= 20 && prob(1)) spawn(0) emote("gasp")
//if(!src.rejuv) src.oxyloss++
if(!src.reagents.has_reagent("inaprovaline")) src.oxyloss++
if(!src.reagents.has_reagent("inaprovaline")) src.adjustOxyLoss(1)
if(src.stat != 2) src.stat = 1
Paralyse(5)
code/modules/mob/living/carbon/alien/humanoid/life.dm
+1 -1
View File
@@ -412,7 +412,7 @@
if(src.health <= 20 && prob(1)) spawn(0) emote("gasp")
//if(!src.rejuv) src.oxyloss++
if(!src.reagents.has_reagent("inaprovaline")) src.oxyloss++
if(!src.reagents.has_reagent("inaprovaline")) src.adjustOxyLoss(1)
if(src.stat != 2) src.stat = 1
Paralyse(5)
code/modules/mob/living/carbon/alien/humanoid/queen.dm
+1 -1
View File
@@ -94,7 +94,7 @@
if(src.health <= 20 && prob(1)) spawn(0) emote("gasp")
//if(!src.rejuv) src.oxyloss++
if(!src.reagents.has_reagent("inaprovaline")) src.oxyloss++
if(!src.reagents.has_reagent("inaprovaline")) src.adjustOxyLoss(1)
if(src.stat != 2) src.stat = 1
Paralyse(5)
code/modules/mob/living/carbon/alien/larva/life.dm
+1 -1
View File
@@ -337,7 +337,7 @@
if(health <= 20 && prob(1)) spawn(0) emote("gasp")
//if(!rejuv) oxyloss++
if(!reagents.has_reagent("inaprovaline")) oxyloss++
if(!reagents.has_reagent("inaprovaline")) adjustOxyLoss(1)
if(stat != 2) stat = 1
Paralyse(5)
code/modules/mob/living/carbon/brain/life.dm
+1 -1
View File
@@ -171,7 +171,7 @@
if(health <= 20 && prob(1)) spawn(0) emote("gasp")
//if(!rejuv) oxyloss++
if(!reagents.has_reagent("inaprovaline")) oxyloss++
if(!reagents.has_reagent("inaprovaline")) adjustOxyLoss(1)
if(stat != 2) stat = 1
Paralyse(5)
code/modules/mob/living/carbon/human/human.dm
+1 -1
View File
@@ -1886,7 +1886,7 @@ It can still be worn/put on as normal.
if ((target.health >= -99.0 && target.health < 0))
target.cpr_time = world.time
var/suff = min(target.getOxyLoss(), 7)
target.oxyloss -= suff
target.adjustOxyLoss(-suff)
target.updatehealth()
for(var/mob/O in viewers(source, null))
O.show_message(text("\red [] performs CPR on []!", source, target), 1)
code/modules/mob/living/carbon/human/life.dm
+9 -14
View File
@@ -305,7 +305,7 @@
if(!breath || (breath.total_moles() == 0))
if(reagents.has_reagent("inaprovaline"))
return
oxyloss += HUMAN_MAX_OXYLOSS
adjustOxyLoss(HUMAN_MAX_OXYLOSS)
oxygen_alert = max(oxygen_alert, 1)
@@ -333,10 +333,10 @@
spawn(0) emote("gasp")
if(O2_pp > 0)
var/ratio = safe_oxygen_min/O2_pp
oxyloss += min(5*ratio, HUMAN_MAX_OXYLOSS) // Don't fuck them up too fast (space only does HUMAN_MAX_OXYLOSS after all!)
adjustOxyLoss(min(5*ratio, HUMAN_MAX_OXYLOSS)) // Don't fuck them up too fast (space only does HUMAN_MAX_OXYLOSS after all!)
oxygen_used = breath.oxygen*ratio/6
else
oxyloss += HUMAN_MAX_OXYLOSS
adjustOxyLoss(HUMAN_MAX_OXYLOSS)
oxygen_alert = max(oxygen_alert, 1)
/*else if (O2_pp > safe_oxygen_max) // Too much oxygen (commented this out for now, I'll deal with pressure damage elsewhere I suppose)
spawn(0) emote("cough")
@@ -345,7 +345,7 @@
oxygen_used = breath.oxygen*ratio/6
oxygen_alert = max(oxygen_alert, 1)*/
else // We're in safe limits
oxyloss = max(getOxyLoss()-5, 0)
adjustOxyLoss(max(getOxyLoss()-5, 0))
oxygen_used = breath.oxygen/6
oxygen_alert = 0
@@ -357,9 +357,9 @@
co2overloadtime = world.time
else if(world.time - co2overloadtime > 120)
Paralyse(3)
oxyloss += 3 // Lets hurt em a little, let them know we mean business
adjustOxyLoss(3) // Lets hurt em a little, let them know we mean business
if(world.time - co2overloadtime > 300) // They've been in here 30s now, lets start to kill them for their own good!
oxyloss += 8
adjustOxyLoss(8)
if(prob(20)) // Lets give them some chance to know somethings not right though I guess.
spawn(0) emote("cough")
@@ -604,14 +604,9 @@
if(nutrition < 500) //so they can't store nutrition to survive without light forever
nutrition += light_amount
if(light_amount > 0) //if there's enough light, heal
if(getFireLoss())
heal_overall_damage(0,1)
if(getBruteLoss())
heal_overall_damage(1,0)
heal_overall_damage(1,1)
adjustToxLoss(-1)
if(getOxyLoss())
oxyloss--
adjustOxyLoss(-1)
if(overeatduration > 500 && !(mutations & FAT))
src << "\red You suddenly feel blubbery!"
@@ -677,7 +672,7 @@
if(health <= 20 && prob(1)) spawn(0) emote("gasp")
//if(!rejuv) oxyloss++
if(!reagents.has_reagent("inaprovaline")) oxyloss++
if(!reagents.has_reagent("inaprovaline")) adjustOxyLoss(1)
if(stat != 2) stat = 1
Paralyse(5)
code/modules/mob/living/carbon/metroid/life.dm
+1 -1
View File
@@ -409,7 +409,7 @@
// if(src.health <= 20 && prob(1)) spawn(0) emote("gasp")
//if(!src.rejuv) src.oxyloss++
if(!src.reagents.has_reagent("inaprovaline")) src.oxyloss+=10
if(!src.reagents.has_reagent("inaprovaline")) src.adjustOxyLoss(10)
if(src.stat != DEAD) src.stat = UNCONSCIOUS
code/modules/mob/living/carbon/monkey/life.dm
+6 -6
View File
@@ -254,7 +254,7 @@
return
if(!breath || (breath.total_moles() == 0))
oxyloss += 7
adjustOxyLoss(7)
oxygen_alert = max(oxygen_alert, 1)
@@ -282,7 +282,7 @@
if (O2_pp == 0)
O2_pp = 0.01
var/ratio = safe_oxygen_min/O2_pp
oxyloss += min(5*ratio, 7) // Don't fuck them up too fast (space only does 7 after all!)
adjustOxyLoss(min(5*ratio, 7)) // Don't fuck them up too fast (space only does 7 after all!)
oxygen_used = breath.oxygen*ratio/6
oxygen_alert = max(oxygen_alert, 1)
/*else if (O2_pp > safe_oxygen_max) // Too much oxygen (commented this out for now, I'll deal with pressure damage elsewhere I suppose)
@@ -292,7 +292,7 @@
oxygen_used = breath.oxygen*ratio/6
oxygen_alert = max(oxygen_alert, 1)*/
else // We're in safe limits
oxyloss = max(getOxyLoss()-5, 0)
adjustOxyLoss(-5)
oxygen_used = breath.oxygen/6
oxygen_alert = 0
@@ -304,9 +304,9 @@
co2overloadtime = world.time
else if(world.time - co2overloadtime > 120)
Paralyse(3)
oxyloss += 3 // Lets hurt em a little, let them know we mean business
adjustOxyLoss(3) // Lets hurt em a little, let them know we mean business
if(world.time - co2overloadtime > 300) // They've been in here 30s now, lets start to kill them for their own good!
oxyloss += 8
adjustOxyLoss(8)
if(prob(20)) // Lets give them some chance to know somethings not right though I guess.
spawn(0) emote("cough")
@@ -418,7 +418,7 @@
if(src.health <= 20 && prob(1)) spawn(0) emote("gasp")
//if(!src.rejuv) src.oxyloss++
if(!src.reagents.has_reagent("inaprovaline")) src.oxyloss++
if(!src.reagents.has_reagent("inaprovaline")) src.adjustOxyLoss(1)
if(src.stat != 2) src.stat = 1
Paralyse(5)
code/modules/mob/living/living.dm
+1 -1
View File
@@ -1,7 +1,7 @@
/mob/living/verb/succumb()
set hidden = 1
if ((src.health < 0 && src.health > -95.0))
src.oxyloss += src.health + 200
src.adjustOxyLoss(src.health + 200)
src.health = 100 - src.getOxyLoss() - src.getToxLoss() - src.getFireLoss() - src.getBruteLoss()
src << "\blue You have given up life and succumbed to death."