diff --git a/code/modules/reagents/Chemistry-Reagents.dm b/code/modules/reagents/Chemistry-Reagents.dm
index 7c2e01457be..0388dd0a9e6 100644
--- a/code/modules/reagents/Chemistry-Reagents.dm
+++ b/code/modules/reagents/Chemistry-Reagents.dm
@@ -233,7 +233,18 @@ datum
 				var/hotspot = (locate(/obj/fire) in T)
 				if(hotspot && !istype(T, /turf/space))
 					var/datum/gas_mixture/lowertemp = T.remove_air( T:air:total_moles() )
-					lowertemp.temperature = max( min(lowertemp.temperature-2000,lowertemp.temperature / 2) ,0)
+					var/excess_temp = lowertemp.temperature - WATER_BOIL_TEMP
+					if(excess_temp > 0)
+						while(T.wet > 0)
+							T.wet -= 0
+							excess_temp /= 2
+						if(T.wet_overlay)
+							if(prob(10))
+								T.visible_message("\icon[T.wet_overlay] You hear something [pick("hissing","sizzling")]!", "", "\icon[T.wet_overlay] You hear something [pick("hissing","sizzling")]!")
+							T.overlays -= T.wet_overlay
+							T.wet_overlay = null
+						lowertemp.temperature = WATER_BOIL_TEMP + excess_temp
+					//lowertemp.temperature = max( min(lowertemp.temperature-2000,lowertemp.temperature / 2) ,0)
 					lowertemp.react()
 					T.assume_air(lowertemp)
 					del(hotspot)
diff --git a/code/setup.dm b/code/setup.dm
index f5120a6fcdd..934074dec2c 100644
--- a/code/setup.dm
+++ b/code/setup.dm
@@ -98,6 +98,8 @@
 #define FIRE_PLASMA_ENERGY_RELEASED	 3000000 //Amount of heat released per mole of burnt plasma into the tile
 #define FIRE_GROWTH_RATE			40000 //For small fires
 
+#define WATER_BOIL_TEMP 393
+
 // Fire Damage
 #define CARBON_LIFEFORM_FIRE_RESISTANCE 200+T0C
 #define CARBON_LIFEFORM_FIRE_DAMAGE		4