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

Mob fire temperature fix, tweaks

Browse Source 
Mob fires are now guaranteed to burn at least as hot as a cold flame -
no more merely warming mobs up slightly with low fire stacks.

Also made mob fires burn hotter overall and resisting slower.
This commit is contained in:
mwerezak
2015-06-10 23:16:40 -04:00
parent 8007d42783
commit ad24805eb8
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/modules/mob/living/carbon/resist.dm
View File

@@ -3,14 +3,14 @@
//drop && roll //drop && roll
if(on_fire) if(on_fire)
fire_stacks -= 2 //reduced fire_stacks -= 2
Weaken(3) Weaken(5)
spin(32,2) spin(52,2)
visible_message( visible_message(
"<span class='danger'>[src] rolls on the floor, trying to put themselves out!</span>", "<span class='danger'>[src] rolls on the floor, trying to put themselves out!</span>",
"<span class='notice'>You stop, drop, and roll!</span>" "<span class='notice'>You stop, drop, and roll!</span>"
) )
sleep(30) sleep(50)
if(fire_stacks <= 0) if(fire_stacks <= 0)
visible_message( visible_message(
"<span class='danger'>[src] has successfully extinguished themselves!</span>", "<span class='danger'>[src] has successfully extinguished themselves!</span>",

5
code/modules/mob/living/living_defense.dm
View File

@@ -236,7 +236,7 @@
location.hotspot_expose(fire_burn_temperature(), 50, 1) location.hotspot_expose(fire_burn_temperature(), 50, 1)
/mob/living/fire_act() /mob/living/fire_act()
adjust_fire_stacks(0.5) adjust_fire_stacks(2)
IgniteMob() IgniteMob()
//Finds the effective temperature that the mob is burning at. //Finds the effective temperature that the mob is burning at.
@@ -245,4 +245,5 @@
return 0 return 0
//Scale quadratically so that single digit numbers of fire stacks don't burn ridiculously hot. //Scale quadratically so that single digit numbers of fire stacks don't burn ridiculously hot.
return round(FIRESUIT_MAX_HEAT_PROTECTION_TEMPERATURE*(fire_stacks/FIRE_MAX_FIRESUIT_STACKS)**2) //lower limit of 700 K, same as matches and roughly the temperature of a cool flame.
return max(2.25*round(FIRESUIT_MAX_HEAT_PROTECTION_TEMPERATURE*(fire_stacks/FIRE_MAX_FIRESUIT_STACKS)**2), 700)