diff --git a/code/modules/mob/living/carbon/brain/life.dm b/code/modules/mob/living/carbon/brain/life.dm
index bf216dc67e0..89f8ad88694 100644
--- a/code/modules/mob/living/carbon/brain/life.dm
+++ b/code/modules/mob/living/carbon/brain/life.dm
@@ -116,9 +116,19 @@
 
 		handle_temperature_damage(body_part, exposed_temperature, exposed_intensity)
 			if(nodamage) return
-			var/discomfort = min( abs(exposed_temperature - bodytemperature)*(exposed_intensity)/2000000, 1.0)
-			//adjustFireLoss(2.5*discomfort)
-			adjustFireLoss(5.0*discomfort)
+
+			if(exposed_temperature > bodytemperature)
+				var/discomfort = min( abs(exposed_temperature - bodytemperature)*(exposed_intensity)/2000000, 1.0)
+				//adjustFireLoss(2.5*discomfort)
+				//adjustFireLoss(5.0*discomfort)
+				adjustFireLoss(20.0*discomfort)
+
+			else
+				var/discomfort = min( abs(exposed_temperature - bodytemperature)*(exposed_intensity)/2000000, 1.0)
+				//adjustFireLoss(2.5*discomfort)
+				adjustFireLoss(5.0*discomfort)
+
+
 
 		handle_chemicals_in_body()
 
diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm
index 2b4e9a9caeb..18562bad8af 100644
--- a/code/modules/mob/living/carbon/human/life.dm
+++ b/code/modules/mob/living/carbon/human/life.dm
@@ -572,8 +572,12 @@
 		handle_temperature_damage(body_part, exposed_temperature, exposed_intensity)
 			if(nodamage)
 				return
+
 			var/discomfort = min(abs(exposed_temperature - bodytemperature)*(exposed_intensity)/2000000, 1.0)
 
+			if(exposed_temperature > bodytemperature)
+				discomfort *= 4
+
 			if(mutantrace == "plant")
 				discomfort *= 3 //I don't like magic numbers. I'll make mutantraces a datum with vars sometime later. -- Urist
 			else
diff --git a/code/modules/mob/living/carbon/monkey/life.dm b/code/modules/mob/living/carbon/monkey/life.dm
index 15d5235eb8b..5176b918f53 100644
--- a/code/modules/mob/living/carbon/monkey/life.dm
+++ b/code/modules/mob/living/carbon/monkey/life.dm
@@ -371,7 +371,12 @@
 			if(src.nodamage) return
 			var/discomfort = min( abs(exposed_temperature - bodytemperature)*(exposed_intensity)/2000000, 1.0)
 			//adjustFireLoss(2.5*discomfort)
-			adjustFireLoss(5.0*discomfort)
+
+			if(exposed_temperature > bodytemperature)
+				adjustFireLoss(20.0*discomfort)
+
+			else
+				adjustFireLoss(5.0*discomfort)
 
 		handle_chemicals_in_body()
 
diff --git a/html/changelog.html b/html/changelog.html
index b53394d1a19..ce578c09ab8 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -68,6 +68,13 @@ should be listed in the changelog upon commit tho. Thanks. -->
 	<li>Escaping alone in a pod does not count towards the escape alone objective, it counts towards the escape alive objective tho. Escape alone only requires you to escape alone on the emergency shuttle, it doesn't require you to ensure all pods are empty. Cult members that escape on the pods do not ocunt towards the cult escaping acolyte number objective. Escaping on a pod is a valid way to survive meteor.</li>
   </ul>
   </li>
+  <li><b>Polymorph updated:</b>
+  <ul>
+	<li> Fire is now actually dangerous.  Do not touch fire. </li>
+  </ul>
+  </li>
+  
+  
 </ul>
 
 <b><font color='blue'>8 December 2011</font><b>