cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-23 05:00:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes singularity not applying its tox damage to mobs. Adjusted its radiation and toxdamage values.

Browse Source 
Fixes simple animals that needs to breath not taking damage from lack of gas to breath on space turfs.
Fixes revenant not being spaceworthy.
Fixes simple_animal accumulating radiation indefinitely because they are unaffected by it.
This commit is contained in:
phil235
2015-06-22 16:10:24 +02:00
parent 3f57259c69
commit 1accee1c36
4 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/life.dm
+1
View File
@@ -62,6 +62,7 @@
return
/mob/living/proc/handle_mutations_and_radiation()
radiation = 0 //so radiation don't accumulate in simple animals
return
/mob/living/proc/handle_chemicals_in_body()
code/modules/mob/living/simple_animal/revenant/revenant.dm
+1
View File
@@ -18,6 +18,7 @@
response_help = "passes through"
response_disarm = "swings at"
response_harm = "punches"
atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
minbodytemp = 0
maxbodytemp = INFINITY
harm_intent_damage = 5
code/modules/mob/living/simple_animal/simple_animal.dm
+4
View File
@@ -201,6 +201,10 @@
if(!atmos_suitable)
adjustBruteLoss(unsuitable_atmos_damage)
else
if(atmos_requirements["min_oxy"] || atmos_requirements["min_tox"] || atmos_requirements["min_n2"] || atmos_requirements["min_co2"])
adjustBruteLoss(unsuitable_atmos_damage)
handle_temperature_damage()
/mob/living/simple_animal/proc/handle_temperature_damage()
code/modules/power/singularity/singularity.dm
+5 -5
View File
@@ -361,14 +361,14 @@
var/toxdamage = 4
var/radiation = 15
var/radiationmin = 3
if (src.energy>200)
toxdamage = round(((src.energy-150)/50)*4,1)
radiation = round(((src.energy-150)/50)*5,1)
radiationmin = round((radiation/5),1)//
if (energy>200)
toxdamage += round((energy-150)/30,1)
radiation += round((energy-150)/10,1)
radiationmin = round((radiation/5),1)
for(var/mob/living/M in view(toxrange, src.loc))
M.irradiate(rand(radiationmin,radiation))
toxdamage = (toxdamage - (toxdamage*M.getarmor(null, "rad")))
M.apply_effect(toxdamage, TOX)
M.apply_damage(toxdamage, TOX)
return