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

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2536 316c924e-a436-60f5-8080-3fe189b3f50e

Browse Source
This commit is contained in:
rockdtben
2011-11-20 15:53:23 +00:00
parent f733c08847
commit 84888d5ec3
57 changed files with 222 additions and 245 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/chemical/Chemistry-Reagents.dm
+4 -4
View File
@@ -1201,7 +1201,7 @@ datum
if(!M) M = holder.my_atom
if(M:getOxyLoss() && prob(40)) M:oxyloss--
if(M:getBruteLoss() && prob(40)) M:heal_organ_damage(1,0)
if(M:fireloss && prob(40)) M:heal_organ_damage(0,1)
if(M:getFireLoss() && prob(40)) M:heal_organ_damage(0,1)
if(M:getToxLoss() && prob(40)) M:adjustToxLoss(-1)
..()
return
@@ -1694,7 +1694,7 @@ datum
if(prob(40))
M.take_organ_damage(0, 1)
if(prob(80) && istype(M, /mob/living/carbon/metroid))
M.fireloss += rand(5,20)
M.adjustFireLoss(rand(5,20))
M << "\red You feel a terrible chill inside your body!"
..()
return
@@ -1944,7 +1944,7 @@ datum
on_mob_life(var/mob/living/M as mob)
M:nutrition += nutriment_factor
if(!M) M = holder.my_atom
if(M:fireloss && prob(20)) M:heal_organ_damage(0,1)
if(M:getFireLoss() && prob(20)) M:heal_organ_damage(0,1)
M:nutrition++
..()
return
@@ -3032,7 +3032,7 @@ datum
if(!M) M = holder.my_atom
if(M:getOxyLoss() && prob(50)) M:oxyloss -= 2
if(M:getBruteLoss() && prob(60)) M:heal_organ_damage(2,0)
if(M:fireloss && prob(50)) M:heal_organ_damage(0,2)
if(M:getFireLoss() && prob(50)) M:heal_organ_damage(0,2)
if(M:getToxLoss() && prob(50)) M:adjustToxLoss(-2)
if(M.dizziness !=0) M.dizziness = max(0,M.dizziness-15)
if(M.confused !=0) M.confused = max(0,M.confused - 5)
code/modules/mob/living/blob/blob.dm
+2 -2
View File
@@ -43,14 +43,14 @@
bruteloss = max(getBruteLoss(), 0)
toxloss = max(getToxLoss(), 0)
oxyloss = max(getOxyLoss(), 0)
fireloss = max(fireloss, 0)
fireloss = max(getFireLoss(), 0)
if(stat)
stat = 0
return
proc/UpdateDamage()
health = 60 - (getOxyLoss() + getToxLoss() + fireloss + getBruteLoss() + cloneloss)
health = 60 - (getOxyLoss() + getToxLoss() + getFireLoss() + getBruteLoss() + cloneloss)
return
code/modules/mob/living/carbon/alien/humanoid/caste/hunter.dm
+4 -4
View File
@@ -20,7 +20,7 @@
if (src.nodamage == 0)
//oxyloss is only used for suicide
//toxloss isn't used for aliens, its actually used as alien powers!!
src.health = 150 - src.getOxyLoss() - src.fireloss - src.getBruteLoss()
src.health = 150 - src.getOxyLoss() - src.getFireLoss() - src.getBruteLoss()
else
src.health = 150
src.stat = 0
@@ -71,12 +71,12 @@
toxloss = max_plasma
else
bruteloss -= 5
fireloss -= 5
adjustBruteLoss(-5)
adjustFireLoss(-5)
handle_regular_status_updates()
health = 150 - (getOxyLoss() + fireloss + getBruteLoss() + cloneloss)
health = 150 - (getOxyLoss() + getFireLoss() + getBruteLoss() + getCloneLoss())
if(getOxyLoss() > 50) paralysis = max(paralysis, 3)
code/modules/mob/living/carbon/alien/humanoid/caste/sentinel.dm
+4 -4
View File
@@ -20,7 +20,7 @@
if (src.nodamage == 0)
//oxyloss is only used for suicide
//toxloss isn't used for aliens, its actually used as alien powers!!
src.health = 125 - src.getOxyLoss() - src.fireloss - src.getBruteLoss()
src.health = 125 - src.getOxyLoss() - src.getFireLoss() - src.getBruteLoss()
else
src.health = 125
src.stat = 0
@@ -71,13 +71,13 @@
toxloss = max_plasma
else
bruteloss -= 10
fireloss -= 10
adjustBruteLoss(-10)
adjustFireLoss(-10)
handle_regular_status_updates()
health = 150 - (getOxyLoss() + fireloss + getBruteLoss() + cloneloss)
health = 150 - (getOxyLoss() + getFireLoss() + getBruteLoss() + getCloneLoss())
if(getOxyLoss() > 50) paralysis = max(paralysis, 3)
code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
+5 -5
View File
@@ -122,7 +122,7 @@
ear_deaf += 60
bruteloss += b_loss
fireloss += f_loss
adjustFireLoss(f_loss)
updatehealth()
@@ -140,7 +140,7 @@
show_message("\red The blob attacks!")
fireloss += damage
adjustFireLoss(damage)
return
@@ -225,7 +225,7 @@
M.show_message(text("\red [] has been hit by []", src, O), 1)
if (health > 0)
bruteloss += (istype(O, /obj/effect/meteor/small) ? 10 : 25)
fireloss += 30
adjustFireLoss(30)
updatehealth()
return
@@ -553,7 +553,7 @@
s.start()
if (prob(stunprob) && M.powerlevel >= 8)
fireloss += M.powerlevel * rand(6,10)
adjustFireLoss(M.powerlevel * rand(6,10))
updatehealth()
@@ -755,7 +755,7 @@ In all, this is a lot like the monkey code. /N
if (nodamage == 0)
//oxyloss is only used for suicide
//toxloss isn't used for aliens, its actually used as alien powers!!
health = 100 - getOxyLoss() - fireloss - getBruteLoss()
health = 100 - getOxyLoss() - getFireLoss() - getBruteLoss()
else
health = 100
stat = 0
code/modules/mob/living/carbon/alien/humanoid/life.dm
+11 -11
View File
@@ -84,10 +84,10 @@
paralysis = max(min(paralysis, 20), 0)
weakened = max(min(weakened, 20), 0)
sleeping = max(min(sleeping, 20), 0)
bruteloss = max(getBruteLoss(), 0)
toxloss = max(getToxLoss(), 0)
oxyloss = max(getOxyLoss(), 0)
fireloss = max(fireloss, 0)
adjustBruteLoss(0)
adjustToxLoss(0)
adjustOxyLoss(0)
adjustFireLoss(0)
handle_disabilities()
@@ -121,13 +121,13 @@
handle_mutations_and_radiation()
if(src.fireloss)
if(src.getFireLoss())
if(src.mutations & COLD_RESISTANCE || prob(50))
switch(src.fireloss)
switch(src.getFireLoss())
if(1 to 50)
src.fireloss--
src.adjustFireLoss(-1)
if(51 to 100)
src.fireloss -= 5
src.adjustFireLoss(-5)
if (src.mutations & HULK && src.health <= 25)
src.mutations &= ~HULK
@@ -300,8 +300,8 @@
toxloss = max_plasma
else
bruteloss -= 15
fireloss -= 15
adjustBruteLoss(-15)
adjustFireLoss(-15)
@@ -396,7 +396,7 @@
handle_regular_status_updates()
health = 100 - (getOxyLoss() + fireloss + getBruteLoss() + cloneloss)
health = 100 - (getOxyLoss() + getFireLoss() + getBruteLoss() + getCloneLoss())
if(getOxyLoss() > 50) paralysis = max(paralysis, 3)
code/modules/mob/living/carbon/alien/humanoid/queen.dm
+3 -3
View File
@@ -23,7 +23,7 @@
if (src.nodamage == 0)
//oxyloss is only used for suicide
//toxloss isn't used for aliens, its actually used as alien powers!!
src.health = 250 - src.getOxyLoss() - src.fireloss - src.getBruteLoss()
src.health = 250 - src.getOxyLoss() - src.getFireLoss() - src.getBruteLoss()
else
src.health = 250
src.stat = 0
@@ -74,11 +74,11 @@
toxloss = max_plasma
else
bruteloss -= 5
fireloss -= 5
adjustFireLoss(-5)
handle_regular_status_updates()
health = 250 - (getOxyLoss() + fireloss + getBruteLoss() + cloneloss)
health = 250 - (getOxyLoss() + getFireLoss() + getBruteLoss() + getCloneLoss())
if(getOxyLoss() > 50) paralysis = max(paralysis, 3)
code/modules/mob/living/carbon/alien/larva/larva.dm
+4 -4
View File
@@ -110,7 +110,7 @@
ear_deaf += 60
bruteloss += b_loss
fireloss += f_loss
adjustFireLoss(f_loss)
updatehealth()
@@ -132,7 +132,7 @@
show_message("\red The blob attacks you!")
fireloss += damage
adjustFireLoss(damage)
updatehealth()
return
@@ -151,7 +151,7 @@
M.show_message(text("\red [] has been hit by []", src, O), 1)
if (health > 0)
bruteloss += (istype(O, /obj/effect/meteor/small) ? 10 : 25)
fireloss += 30
adjustFireLoss(30)
updatehealth()
return
@@ -503,7 +503,7 @@
if (nodamage == 0)
//oxyloss is only used for suicide
//toxloss isn't used for aliens, its actually used as alien powers!!
health = 25 - getOxyLoss() - fireloss - getBruteLoss()
health = 25 - getOxyLoss() - getFireLoss() - getBruteLoss()
else
health = 25
stat = 0
code/modules/mob/living/carbon/alien/larva/life.dm
+3 -3
View File
@@ -85,7 +85,7 @@
bruteloss = max(getBruteLoss(), 0)
toxloss = max(getToxLoss(), 0)
oxyloss = max(getOxyLoss(), 0)
fireloss = max(fireloss, 0)
adjustFireLoss(0)
handle_mutations_and_radiation()
@@ -279,7 +279,7 @@
adjustToxLoss(5)
else
bruteloss -= 5
fireloss -= 5
adjustFireLoss(-5)
return
@@ -323,7 +323,7 @@
handle_regular_status_updates()
health = 25 - (getOxyLoss() + fireloss + getBruteLoss() + cloneloss)
health = 25 - (getOxyLoss() + getFireLoss() + getBruteLoss() + getCloneLoss())
if(getOxyLoss() > 50) paralysis = max(paralysis, 3)
code/modules/mob/living/carbon/alien/special/chryssalid.dm
+2 -2
View File
@@ -20,7 +20,7 @@
handle_regular_status_updates()
health = 200 - (getOxyLoss() + fireloss + getBruteLoss())
health = 200 - (getOxyLoss() + getFireLoss() + getBruteLoss())
weakened = 0
stunned = 0
@@ -43,7 +43,7 @@
return 1
updatehealth()
src.health = 200 - src.getOxyLoss() - src.fireloss - src.getBruteLoss()
src.health = 200 - src.getOxyLoss() - src.getFireLoss() - src.getBruteLoss()
xcom_attack(mob/living/carbon/human/target as mob)
if(!ishuman(target))
code/modules/mob/living/carbon/brain/life.dm
+7 -7
View File
@@ -45,10 +45,10 @@
stunned = max(stunned,0)
paralysis = max(paralysis, 0)
weakened = max(weakened, 0)
bruteloss = max(getBruteLoss(), 0)
fireloss = max(fireloss, 0)
oxyloss = max(getOxyLoss(), 0)
toxloss = max(getToxLoss(), 0)
adjustBruteLoss(0)
adjustFireLoss(0)
adjustOxyLoss(0)
adjustToxLoss(0)
handle_mutations_and_radiation()
@@ -117,8 +117,8 @@
handle_temperature_damage(body_part, exposed_temperature, exposed_intensity)
if(nodamage) return
var/discomfort = min( abs(exposed_temperature - bodytemperature)*(exposed_intensity)/2000000, 1.0)
//fireloss += 2.5*discomfort
fireloss += 5.0*discomfort
//adjustFireLoss(2.5*discomfort)
adjustFireLoss(5.0*discomfort)
handle_chemicals_in_body()
@@ -144,7 +144,7 @@
handle_regular_status_updates()
health = 100 - (getOxyLoss() + getToxLoss() + fireloss + getBruteLoss() + cloneloss)
health = 100 - (getOxyLoss() + getToxLoss() + getFireLoss() + getBruteLoss() + getCloneLoss())
if(getOxyLoss() > 25) paralysis = max(paralysis, 3)
code/modules/mob/living/carbon/carbon.dm
+1 -1
View File
@@ -126,7 +126,7 @@
return 0
src.take_overall_damage(0,shock_damage)
//src.burn_skin(shock_damage)
//src.fireloss += shock_damage //burn_skin will do this for us
//src.adjustFireLoss(shock_damage) //burn_skin will do this for us
//src.updatehealth()
src.visible_message(
"\red [src] was shocked by the [source]!", \
code/modules/mob/living/carbon/human/examine.dm
+2 -2
View File
@@ -127,8 +127,8 @@
else
usr << "\red <B>[src.name] looks very... unfinished?</B>"
if (src.fireloss)
if (src.fireloss < 30)
if (src.getFireLoss())
if (src.getFireLoss() < 30)
usr << "\red [src.name] looks slightly burned!"
else
usr << "\red <B>[src.name] looks severely burned!</B>"
code/modules/mob/living/carbon/human/human.dm
+6 -6
View File
@@ -1165,7 +1165,7 @@
s.start()
if (prob(stunprob) && M.powerlevel >= 8)
fireloss += M.powerlevel * rand(6,10)
adjustFireLoss(M.powerlevel * rand(6,10))
updatehealth()
@@ -2190,12 +2190,12 @@ It can still be worn/put on as normal.
src.health = 100
src.stat = 0
return
bruteloss = 0
fireloss = 0
adjustBruteLoss(-getBruteLoss())
adjustFireLoss(-getFireLoss())
for(var/datum/organ/external/O in organs)
src.bruteloss += O.brute_dam
src.fireloss += O.burn_dam
src.health = 100 - src.getOxyLoss() - src.getToxLoss() - src.fireloss - src.getBruteLoss() - src.cloneloss
src.adjustBruteLoss(O.brute_dam)
src.adjustFireLoss(O.burn_dam)
src.health = 100 - src.getOxyLoss() - src.getToxLoss() - src.getFireLoss() - src.getBruteLoss() - src.getCloneLoss()
/mob/living/carbon/human/abiotic(var/full_body = 0)
code/modules/mob/living/carbon/human/human_damage.dm
+3 -3
View File
@@ -11,12 +11,12 @@
/mob/living/carbon/human/proc/UpdateDamage()
bruteloss = 0
fireloss = 0
adjustBruteLoss(-getBruteLoss())
adjustFireLoss(-getFireLoss())
for(var/datum/organ/external/O in organs)
if(istype(O, /datum/organ/external))
bruteloss += O.brute_dam
fireloss += O.burn_dam
adjustFireLoss(O.burn_dam)
return
// new damage icon system
code/modules/mob/living/carbon/human/life.dm
+10 -10
View File
@@ -102,10 +102,10 @@
paralysis = max(min(paralysis, 20), 0)
weakened = max(min(weakened, 20), 0)
sleeping = max(min(sleeping, 20), 0)
bruteloss = max(getBruteLoss(), 0)
toxloss = max(getToxLoss(), 0)
oxyloss = max(getOxyLoss(), 0)
fireloss = max(fireloss, 0)
adjustBruteLoss(0)
adjustToxLoss(0)
adjustOxyLoss(0)
adjustFireLoss(0)
update_mind()
@@ -166,7 +166,7 @@
handle_mutations_and_radiation()
if(fireloss)
if(getFireLoss())
if(mutations & COLD_RESISTANCE || (prob(1) && prob(75)))
heal_organ_damage(0,1)
@@ -414,7 +414,7 @@
var/thermal_protection = get_thermal_protection()
//world << "Loc temp: [loc_temp] - Body temp: [bodytemperature] - Fireloss: [fireloss] - Thermal protection: [get_thermal_protection()] - Fire protection: [thermal_protection + add_fire_protection(loc_temp)]"
//world << "Loc temp: [loc_temp] - Body temp: [bodytemperature] - Fireloss: [getFireLoss()] - Thermal protection: [get_thermal_protection()] - Fire protection: [thermal_protection + add_fire_protection(loc_temp)]"
if(stat != 2 && abs(bodytemperature - 310.15) < 50)
bodytemperature += adjust_body_temperature(bodytemperature, 310.15, thermal_protection)
@@ -601,7 +601,7 @@
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(fireloss)
if(getFireLoss())
heal_overall_damage(0,1)
if(getBruteLoss())
heal_overall_damage(1,0)
@@ -656,7 +656,7 @@
handle_regular_status_updates()
// health = 100 - (getOxyLoss() + getToxLoss() + fireloss + bruteloss + cloneloss)
// health = 100 - (getOxyLoss() + getToxLoss() + getFireLoss() + getBruteLoss() + getCloneLoss())
if(getOxyLoss() > 50) paralysis = max(paralysis, 3)
@@ -1069,7 +1069,7 @@ snippets
if(bodytemperature < 282.591 && (!firemut))
if(bodytemperature < 250)
fireloss += 4
adjustFireLoss(4)
updatehealth()
if(paralysis <= 2) paralysis += 2
else if(prob(1) && !paralysis)
@@ -1080,7 +1080,7 @@ snippets
if(bodytemperature > 345.444)
if(!eye_blurry) src << "\red The heat blurs your vision!"
eye_blurry = max(4, eye_blurry)
if(prob(3)) fireloss += rand(1,2)
if(prob(3)) adjustFireLoss(rand(1,2))
else if(prob(3) && !paralysis)
paralysis += 2
emote("collapse")
code/modules/mob/living/carbon/metroid/life.dm
+5 -5
View File
@@ -314,7 +314,7 @@
handle_environment(datum/gas_mixture/environment)
if(!environment)
fireloss += rand(10,20)
adjustFireLoss(rand(10,20))
return
//var/environment_heat_capacity = environment.heat_capacity()
@@ -356,7 +356,7 @@
Tempstun = 1
if(bodytemperature <= (T0C - 50)) // hurt temperature
fireloss += round(sqrt(bodytemperature)) * 2
adjustFireLoss(round(sqrt(bodytemperature)) * 2)
else
Tempstun = 0
@@ -396,9 +396,9 @@
handle_regular_status_updates()
if(istype(src, /mob/living/carbon/metroid/adult))
health = 200 - (getOxyLoss() + getToxLoss() + fireloss + getBruteLoss() + cloneloss)
health = 200 - (getOxyLoss() + getToxLoss() + getFireLoss() + getBruteLoss() + getCloneLoss())
else
health = 150 - (getOxyLoss() + getToxLoss() + fireloss + getBruteLoss() + cloneloss)
health = 150 - (getOxyLoss() + getToxLoss() + getFireLoss() + getBruteLoss() + getCloneLoss())
@@ -418,7 +418,7 @@
if(prob(30))
if(getOxyLoss()>0) oxyloss = max(getOxyLoss()-1, 0)
if(getToxLoss()>0) adjustToxLoss(-1)
if(fireloss>0) fireloss = max(fireloss-1,0)
if(getFireLoss()>0) adjustFireLoss(-1)
if(cloneloss>0) cloneloss = max(cloneloss-1,0)
if(getBruteLoss()>0) bruteloss = max(getBruteLoss()-1,0)
code/modules/mob/living/carbon/metroid/metroid.dm
+5 -5
View File
@@ -175,7 +175,7 @@
b_loss += 30
bruteloss += b_loss
fireloss += f_loss
adjustFireLoss(f_loss)
updatehealth()
@@ -196,7 +196,7 @@
show_message("\red The blob attacks you!")
fireloss += damage
adjustFireLoss(damage)
updatehealth()
return
@@ -215,7 +215,7 @@
M.show_message(text("\red [] has been hit by []", src, O), 1)
if (health > 0)
bruteloss += (istype(O, /obj/effect/meteor/small) ? 10 : 25)
fireloss += 30
adjustFireLoss(30)
updatehealth()
return
@@ -648,9 +648,9 @@ mob/living/carbon/metroid/var/temperature_resistance = T0C+75
if (nodamage == 0)
// metroids can't suffocate unless they suicide. They are also not harmed by fire
if(istype(src, /mob/living/carbon/metroid/adult))
health = 200 - (getOxyLoss() + getToxLoss() + fireloss + getBruteLoss() + cloneloss)
health = 200 - (getOxyLoss() + getToxLoss() + getFireLoss() + getBruteLoss() + getCloneLoss())
else
health = 150 - (getOxyLoss() + getToxLoss() + fireloss + getBruteLoss() + cloneloss)
health = 150 - (getOxyLoss() + getToxLoss() + getFireLoss() + getBruteLoss() + getCloneLoss())
else
if(istype(src, /mob/living/carbon/metroid/adult))
health = 200
code/modules/mob/living/carbon/metroid/powers.dm
+9 -9
View File
@@ -85,22 +85,22 @@
if(getBruteLoss() > 0)
bruteloss = max(0, getBruteLoss()-10)
if(fireloss > 0)
fireloss = max(0, fireloss-10)
if(getFireLoss() > 0)
adjustFireLoss(-10)
if(cloneloss > 0)
cloneloss = max(0, cloneloss-10)
if(getCloneLoss() > 0)
adjustCloneLoss(-10)
if(Victim)
for(var/mob/living/carbon/metroid/Metroid in view(1,M))
if(Metroid.Victim == M && Metroid != src)
Metroid.Feedstop()
if(getToxLoss()<0) toxloss = 0
if(getOxyLoss()<0) oxyloss = 0
if(getBruteLoss()<0) bruteloss = 0
if(fireloss<0) fireloss = 0
if(cloneloss<0) cloneloss = 0
if(getToxLoss()<0) adjustToxLoss(0)
if(getOxyLoss()<0) adjustOxyLoss(0)
if(getBruteLoss()<0) adjustBruteLoss(0)
if(getFireLoss()<0) adjustFireLoss(0)
if(getCloneLoss()<0) adjustCloneLoss(0)
nutrition += rand(10,25)
if(nutrition >= lastnut + 50)
code/modules/mob/living/carbon/monkey/examine.dm
+2 -2
View File
@@ -21,8 +21,8 @@
usr << text("\red [] looks slightly bruised!", src.name)
else
usr << text("\red <B>[] looks severely bruised!</B>", src.name)
if (src.fireloss)
if (src.fireloss < 30)
if (src.getFireLoss())
if (src.getFireLoss() < 30)
usr << text("\red [] looks slightly burnt!", src.name)
else
usr << text("\red <B>[] looks severely burnt!</B>", src.name)
code/modules/mob/living/carbon/monkey/life.dm
+7 -7
View File
@@ -124,13 +124,13 @@
handle_mutations_and_radiation()
if(src.fireloss)
if(src.getFireLoss())
if(src.mutations & COLD_RESISTANCE || prob(50))
switch(src.fireloss)
switch(src.getFireLoss())
if(1 to 50)
src.fireloss--
src.adjustFireLoss(-1)
if(51 to 100)
src.fireloss -= 5
src.adjustFireLoss(-5)
if (src.mutations & HULK && src.health <= 25)
src.mutations &= ~HULK
@@ -370,8 +370,8 @@
handle_temperature_damage(body_part, exposed_temperature, exposed_intensity)
if(src.nodamage) return
var/discomfort = min( abs(exposed_temperature - bodytemperature)*(exposed_intensity)/2000000, 1.0)
//fireloss += 2.5*discomfort
fireloss += 5.0*discomfort
//adjustFireLoss(2.5*discomfort)
adjustFireLoss(5.0*discomfort)
handle_chemicals_in_body()
@@ -397,7 +397,7 @@
handle_regular_status_updates()
health = 100 - (getOxyLoss() + getToxLoss() + fireloss + getBruteLoss() + cloneloss)
health = 100 - (getOxyLoss() + getToxLoss() + getFireLoss() + getBruteLoss() + getCloneLoss())
if(getOxyLoss() > 25) paralysis = max(paralysis, 3)
code/modules/mob/living/carbon/monkey/monkey.dm
+12 -12
View File
@@ -102,8 +102,8 @@
var/shielded = 0
bruteloss += 30
if ((O.icon_state == "flaming" && !( shielded )))
fireloss += 40
health = 100 - getOxyLoss() - getToxLoss() - fireloss - getBruteLoss()
adjustFireLoss(40)
health = 100 - getOxyLoss() - getToxLoss() - getFireLoss() - getBruteLoss()
return
//mob/living/carbon/monkey/bullet_act(var/obj/item/projectile/Proj)taken care of in living
@@ -139,7 +139,7 @@
O.show_message("\red <B>[M.name] has bit [name]!</B>", 1)
var/damage = rand(1, 5)
bruteloss += damage
health = 100 - getOxyLoss() - getToxLoss() - fireloss - getBruteLoss()
health = 100 - getOxyLoss() - getToxLoss() - getFireLoss() - getBruteLoss()
for(var/datum/disease/D in M.viruses)
if(istype(D, /datum/disease/jungle_fever))
contract_disease(D,1,0)
@@ -371,7 +371,7 @@
s.start()
if (prob(stunprob) && M.powerlevel >= 8)
fireloss += M.powerlevel * rand(6,10)
adjustFireLoss(M.powerlevel * rand(6,10))
updatehealth()
@@ -535,17 +535,17 @@
switch(severity)
if(1.0)
if (stat != 2)
bruteloss += 200
health = 100 - getOxyLoss() - getToxLoss() - fireloss - getBruteLoss()
adjustBruteLoss(200)
health = 100 - getOxyLoss() - getToxLoss() - getFireLoss() - getBruteLoss()
if(2.0)
if (stat != 2)
bruteloss += 60
fireloss += 60
health = 100 - getOxyLoss() - getToxLoss() - fireloss - getBruteLoss()
adjustFireLoss(60)
health = 100 - getOxyLoss() - getToxLoss() - getFireLoss() - getBruteLoss()
if(3.0)
if (stat != 2)
bruteloss += 30
health = 100 - getOxyLoss() - getToxLoss() - fireloss - getBruteLoss()
adjustBruteLoss(30)
health = 100 - getOxyLoss() - getToxLoss() - getFireLoss() - getBruteLoss()
if (prob(50))
paralysis += 10
else
@@ -553,8 +553,8 @@
/mob/living/carbon/monkey/blob_act()
if (stat != 2)
fireloss += 60
health = 100 - getOxyLoss() - getToxLoss() - fireloss - getBruteLoss()
adjustFireLoss(60)
health = 100 - getOxyLoss() - getToxLoss() - getFireLoss() - getBruteLoss()
if (prob(50))
paralysis += 10
code/modules/mob/living/damage_procs.dm
+1 -1
View File
@@ -15,7 +15,7 @@
bruteloss += (damage/(blocked+1))
if(BURN)
if(mutations & COLD_RESISTANCE) damage = 0
fireloss += (damage/(blocked+1))
adjustFireLoss(damage/(blocked+1))
if(TOX)
adjustToxLoss(damage/(blocked+1))
if(OXY)
code/modules/mob/living/living.dm
+7 -7
View File
@@ -2,13 +2,13 @@
set hidden = 1
if ((src.health < 0 && src.health > -95.0))
src.oxyloss += src.health + 200
src.health = 100 - src.getOxyLoss() - src.getToxLoss() - src.fireloss - src.getBruteLoss()
src.health = 100 - src.getOxyLoss() - src.getToxLoss() - src.getFireLoss() - src.getBruteLoss()
src << "\blue You have given up life and succumbed to death."
/mob/living/proc/updatehealth()
if(!src.nodamage)
src.health = 100 - src.getOxyLoss() - src.getToxLoss() - src.fireloss - src.getBruteLoss() - src.cloneloss
src.health = 100 - src.getOxyLoss() - src.getToxLoss() - src.getFireLoss() - src.getBruteLoss() - src.cloneloss
else
src.health = 100
src.stat = 0
@@ -36,7 +36,7 @@
if (src.mutations & COLD_RESISTANCE) //fireproof
return 0
var/mob/living/carbon/monkey/M = src
M.fireloss += burn_amount
M.adjustFireLoss(burn_amount)
M.updatehealth()
return 1
else if(istype(src, /mob/living/silicon/ai))
@@ -112,25 +112,25 @@
// heal ONE external organ, organ gets randomly selected from damaged ones.
/mob/living/proc/heal_organ_damage(var/brute, var/burn)
bruteloss = max(0, getBruteLoss()-brute)
fireloss = max(0, fireloss-burn)
adjustFireLoss(-burn)
src.updatehealth()
// damage ONE external organ, organ gets randomly selected from damaged ones.
/mob/living/proc/take_organ_damage(var/brute, var/burn)
bruteloss += brute
fireloss += burn
adjustFireLoss(burn)
src.updatehealth()
// heal MANY external organs, in random order
/mob/living/proc/heal_overall_damage(var/brute, var/burn)
bruteloss = max(0, getBruteLoss()-brute)
fireloss = max(0, fireloss-burn)
adjustFireLoss(-burn)
src.updatehealth()
// damage MANY external organs, in random order
/mob/living/proc/take_overall_damage(var/brute, var/burn)
bruteloss += brute
fireloss += burn
adjustFireLoss(burn)
src.updatehealth()
/mob/living/proc/revive()
code/modules/mob/living/silicon/ai/ai.dm
+7 -10
View File
@@ -210,22 +210,19 @@
/mob/living/silicon/ai/ex_act(severity)
flick("flash", flash)
var/b_loss = getBruteLoss()
var/f_loss = fireloss
switch(severity)
if(1.0)
if (stat != 2)
b_loss += 100
f_loss += 100
adjustBruteLoss(100)
adjustFireLoss(100)
if(2.0)
if (stat != 2)
b_loss += 60
f_loss += 60
adjustBruteLoss(60)
adjustFireLoss(60)
if(3.0)
if (stat != 2)
b_loss += 30
bruteloss = b_loss
fireloss = f_loss
adjustBruteLoss(30)
updatehealth()
@@ -271,7 +268,7 @@
if (health > 0)
bruteloss += 30
if ((O.icon_state == "flaming"))
fireloss += 40
adjustFireLoss(40)
updatehealth()
return
code/modules/mob/living/silicon/ai/examine.dm
+2 -2
View File
@@ -11,8 +11,8 @@
usr << text("\red [] looks slightly dented", src.name)
else
usr << text("\red <B>[] looks severely dented!</B>", src.name)
if (src.fireloss)
if (src.fireloss < 30)
if (src.getFireLoss())
if (src.getFireLoss() < 30)
usr << text("\red [] looks slightly burnt!", src.name)
else
usr << text("\red <B>[] looks severely burnt!</B>", src.name)
code/modules/mob/living/silicon/ai/life.dm
+2 -2
View File
@@ -20,7 +20,7 @@
/*if (istype(T, /turf))
var/ficheck = src.firecheck(T)
if (ficheck)
src.fireloss += ficheck * 10
src.adjustFireLoss(ficheck * 10)
src.updatehealth()
if (src.fire)
src.fire.icon_state = "fire1"
@@ -241,7 +241,7 @@
if(src.fire_res_on_core)
src.health = 100 - src.getOxyLoss() - src.getToxLoss() - src.getBruteLoss()
else
src.health = 100 - src.getOxyLoss() - src.getToxLoss() - src.fireloss - src.getBruteLoss()
src.health = 100 - src.getOxyLoss() - src.getToxLoss() - src.getFireLoss() - src.getBruteLoss()
else
src.health = 100
src.stat = 0
code/modules/mob/living/silicon/decoy/life.dm
+1 -1
View File
@@ -9,7 +9,7 @@
/mob/living/silicon/decoy/updatehealth()
if (src.nodamage == 0)
src.health = 100 - src.getOxyLoss() - src.getToxLoss() - src.fireloss - src.getBruteLoss()
src.health = 100 - src.getOxyLoss() - src.getToxLoss() - src.getFireLoss() - src.getBruteLoss()
else
src.health = 100
src.stat = 0
code/modules/mob/living/silicon/pai/examine.dm
+2 -2
View File
@@ -11,8 +11,8 @@
usr << text("\red [] looks slightly dented", src.name)
else
usr << text("\red <B>[]'s casing appears cracked and broken!</B>", src.name)
if (src.fireloss)
if (src.fireloss < 30)
if (src.getFireLoss())
if (src.getFireLoss() < 30)
usr << text("\red [] looks slightly charred!", src.name)
else
usr << text("\red <B>[]'s casing is melted and heat-warped!</B>", src.name)
code/modules/mob/living/silicon/pai/life.dm
+1 -1
View File
@@ -23,4 +23,4 @@
src.health = 100
src.stat = 0
else
src.health = 100 - src.getBruteLoss() - src.fireloss
src.health = 100 - src.getBruteLoss() - src.getFireLoss()
code/modules/mob/living/silicon/pai/pai.dm
+8 -11
View File
@@ -83,22 +83,19 @@
/mob/living/silicon/pai/ex_act(severity)
flick("flash", src.flash)
var/b_loss = src.getBruteLoss()
var/f_loss = src.fireloss
switch(severity)
if(1.0)
if (src.stat != 2)
b_loss += 100
f_loss += 100
adjustBruteLoss(100)
adjustFireLoss(100)
if(2.0)
if (src.stat != 2)
b_loss += 60
f_loss += 60
adjustBruteLoss(60)
adjustFireLoss(60)
if(3.0)
if (src.stat != 2)
b_loss += 30
src.bruteloss = b_loss
src.fireloss = f_loss
adjustBruteLoss(30)
src.updatehealth()
@@ -108,9 +105,9 @@
for(var/mob/M in viewers(src, null))
M.show_message(text("\red [] has been hit by []", src, O), 1)
if (src.health > 0)
src.bruteloss += 30
src.adjustBruteLoss(30)
if ((O.icon_state == "flaming"))
src.fireloss += 40
src.adjustFireLoss(40)
src.updatehealth()
return
code/modules/mob/living/silicon/pai/software.dm
+1 -1
View File
@@ -471,7 +471,7 @@
Scan Breakdown: <br>
Respiratory: [M.getOxyLoss() > 50 ? "<font color=#FF5555>" : "<font color=#55FF55>"][M.getOxyLoss()]</font><br>
Toxicology: [M.getToxLoss() > 50 ? "<font color=#FF5555>" : "<font color=#55FF55>"][M.getToxLoss()]</font><br>
Burns: [M.fireloss > 50 ? "<font color=#FF5555>" : "<font color=#55FF55>"][M.fireloss]</font><br>
Burns: [M.getFireLoss() > 50 ? "<font color=#FF5555>" : "<font color=#55FF55>"][M.getFireLoss()]</font><br>
Structural Integrity: [M.getBruteLoss() > 50 ? "<font color=#FF5555>" : "<font color=#55FF55>"][M.getBruteLoss()]</font><br>
Body Temperature: [M.bodytemperature-T0C]&deg;C ([M.bodytemperature*1.8-459.67]&deg;F)<br>
"}
code/modules/mob/living/silicon/robot/examine.dm
+2 -2
View File
@@ -10,8 +10,8 @@
usr << text("\red [src.name] looks slightly dented")
else
usr << text("\red <B>[src.name] looks severely dented!</B>")
if (src.fireloss)
if (src.fireloss < 75)
if (src.getFireLoss())
if (src.getFireLoss() < 75)
usr << text("\red [src.name] looks slightly burnt!")
else
usr << text("\red <B>[src.name] looks severely burnt!</B>")
code/modules/mob/living/silicon/robot/life.dm
+5 -5
View File
@@ -34,10 +34,10 @@
paralysis = max(min(paralysis, 30), 0)
weakened = max(min(weakened, 20), 0)
sleeping = 0
bruteloss = max(getBruteLoss(), 0)
toxloss = max(getToxLoss(), 0)
oxyloss = max(getOxyLoss(), 0)
fireloss = max(fireloss, 0)
adjustBruteLoss(0)
adjustToxLoss(0)
adjustOxyLoss(0)
adjustFireLoss(0)
use_power()
@@ -87,7 +87,7 @@
if(src.stat)
src.camera.status = 0
health = 200 - (getOxyLoss() + fireloss + getBruteLoss())
health = 200 - (getOxyLoss() + getFireLoss() + getBruteLoss())
if(getOxyLoss() > 50) paralysis = max(paralysis, 3)
code/modules/mob/living/silicon/robot/robot.dm
+9 -12
View File
@@ -196,24 +196,21 @@
del(src)
return
var/b_loss = getBruteLoss()
var/f_loss = fireloss
switch(severity)
if(1.0)
if (stat != 2)
b_loss += 100
f_loss += 100
adjustBruteLoss(100)
adjustFireLoss(100)
gib(1)
return
if(2.0)
if (stat != 2)
b_loss += 60
f_loss += 60
adjustBruteLoss(60)
adjustFireLoss(60)
if(3.0)
if (stat != 2)
b_loss += 30
bruteloss = b_loss
fireloss = f_loss
adjustBruteLoss(30)
updatehealth()
@@ -224,7 +221,7 @@
if (health > 0)
bruteloss += 30
if ((O.icon_state == "flaming"))
fireloss += 40
adjustFireLoss(40)
updatehealth()
return
@@ -328,8 +325,8 @@
else if(istype(W, /obj/item/weapon/cable_coil) && wiresexposed)
var/obj/item/weapon/cable_coil/coil = W
fireloss -= 30
if(fireloss < 0) fireloss = 0
adjustFireLoss(-30)
if(getFireLoss() < 0) adjustFireLoss(0)
updatehealth()
coil.use(1)
for(var/mob/O in viewers(user, null))