From a74bb8a710f69ea681b7dcdfe6bb422565f75c81 Mon Sep 17 00:00:00 2001
From: Fox-McCloud <Fox_P_McCloud@hotmail.com>
Date: Thu, 5 Mar 2015 20:30:18 -0500
Subject: [PATCH] Fire Fixes

---
 code/ZAS/Fire.dm                          | 2 +-
 code/modules/mob/living/carbon/species.dm | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/code/ZAS/Fire.dm b/code/ZAS/Fire.dm
index dfc78987eb3..6af57fc4870 100644
--- a/code/ZAS/Fire.dm
+++ b/code/ZAS/Fire.dm
@@ -153,7 +153,7 @@ turf/simulated/hotspot_expose(exposed_temperature, exposed_volume, soh)
 
 	//im not sure how to implement a version that works for every creature so for now monkeys are firesafe
 	for(var/mob/living/carbon/human/M in loc)
-		M.FireBurn(firelevel, air_contents.temperature, air_contents.return_pressure() ) //Burn the humans!
+//		M.FireBurn(firelevel, air_contents.temperature, air_contents.return_pressure() ) //Burn the humans!
 
 	loc.fire_act(air_contents, air_contents.temperature, air_contents.return_volume())
 	for(var/atom/A in loc)
diff --git a/code/modules/mob/living/carbon/species.dm b/code/modules/mob/living/carbon/species.dm
index c7dd21ab74d..2990c210f48 100644
--- a/code/modules/mob/living/carbon/species.dm
+++ b/code/modules/mob/living/carbon/species.dm
@@ -655,9 +655,9 @@
 	cold_level_3 = -1
 
 	heat_level_1 = 500		//gives them about 25 seconds in space before taking damage
-	heat_level_2 = 1000
-	heat_level_3 = 2000
-	heat_level_3_breathe = 2000
+	heat_level_2 = 540
+	heat_level_3 = 600
+	heat_level_3_breathe = 600
 
 	synth_temp_gain = 10 //this should cause IPCs to stabilize at ~80 C in a 20 C environment.