diff --git a/code/modules/mob/living/carbon/resist.dm b/code/modules/mob/living/carbon/resist.dm
index 9a511504f32..c99a8bd599f 100644
--- a/code/modules/mob/living/carbon/resist.dm
+++ b/code/modules/mob/living/carbon/resist.dm
@@ -3,14 +3,14 @@
//drop && roll
if(on_fire)
- fire_stacks -= 2 //reduced
- Weaken(3)
- spin(32,2)
+ fire_stacks -= 2
+ Weaken(5)
+ spin(52,2)
visible_message(
"[src] rolls on the floor, trying to put themselves out!",
"You stop, drop, and roll!"
)
- sleep(30)
+ sleep(50)
if(fire_stacks <= 0)
visible_message(
"[src] has successfully extinguished themselves!",
diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm
index 9dd399a8041..ab39b502c50 100644
--- a/code/modules/mob/living/living_defense.dm
+++ b/code/modules/mob/living/living_defense.dm
@@ -236,7 +236,7 @@
location.hotspot_expose(fire_burn_temperature(), 50, 1)
/mob/living/fire_act()
- adjust_fire_stacks(0.5)
+ adjust_fire_stacks(2)
IgniteMob()
//Finds the effective temperature that the mob is burning at.
@@ -245,4 +245,5 @@
return 0
//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)