Merge pull request #4265 from SkyMarshal/heatfix

Heatfix

code/ZAS/Debug.dm

@@ -134,6 +134,7 @@ zone/proc/DebugDisplay(client/client)
 
 
 client/proc/TestZASRebuild()
+	set category = "Debug"
 //	var/turf/turf = get_turf(mob)
 	var/zone/current_zone = mob.loc:zone
 	if(!current_zone)
@@ -155,7 +156,7 @@ client/proc/TestZASRebuild()
 
 		for(var/direction in cardinal)
 			var/turf/simulated/adjacent = get_step(current, direction)
-			if(!current.ZAirPass(adjacent))
+			if(!current.ZCanPass(adjacent))
 				continue
 			if(turfs.Find(adjacent))
 				current_adjacents += adjacent
@@ -210,4 +211,9 @@ client/proc/TestZASRebuild()
 	for(var/turf/current in turfs)
 		current.overlays -= overlays
 
-	return final_arrangement
+	return final_arrangement
+
+/client/proc/ZASSettings()
+	set category = "Debug"
+
+	vsc.SetDefault(mob)

code/ZAS/Variable Settings.dm

@@ -67,7 +67,7 @@ var/global/vs_control/vsc = new
 
 	var/connection_insulation = 1
 	var/connection_insulation_NAME = "Connections - Insulation"
-	var/connection_insulation_DESC = "How insulative a connection is, in terms of heat transfer.  1 is perfectly insulative, and 0 is perfectly conductive."
+	var/connection_insulation_DESC = "Boolean, should doors forbid heat transfer?"
 
 	var/connection_temperature_delta = 10
 	var/connection_temperature_delta_NAME = "Connections - Temperature Difference"
@@ -288,6 +288,7 @@ var/global/vs_control/vsc = new
 			airflow_speed_decay = 1
 			airflow_delay = 20
 			airflow_mob_slowdown = 3
+			connection_insulation = 0
 
 
 	world << "\blue <b>[key_name(user)] changed the global plasma/ZAS settings to \"[def]\"</b>"

code/ZAS/ZAS_Zones.dm

@@ -114,12 +114,17 @@ var/list/CounterDoorDirections = list(SOUTH,EAST) //Which directions doors turfs
 	//Removing zone connections and scheduling connection cleanup
 	for(var/zone/Z in connected_zones)
 		Z.connected_zones.Remove(src)
-		Z.closed_connection_zones.Remove(src)
+		if(!Z.connected_zones.len)
+			Z.connected_zones = null
+
+		if(Z.closed_connection_zones)
+			Z.closed_connection_zones.Remove(src)
+			if(!Z.closed_connection_zones.len)
+				Z.closed_connection_zones = null
 
 	connected_zones = null
 	closed_connection_zones = null
 
-
 	return 1
 
 
@@ -356,25 +361,26 @@ var/list/CounterDoorDirections = list(SOUTH,EAST) //Which directions doors turfs
 					Z.interactions_with_neighbors++
 					interactions_with_neighbors++
 
-		for(var/zone/Z in closed_connection_zones)
-			//If that zone has already processed, skip it.
-			if(Z.last_update > last_update)
-				continue
-
-			var/handle_temperature = abs(air.temperature - Z.air.temperature) > vsc.connection_temperature_delta
-
-			if(Z.status == ZONE_SLEEPING)
-				if (handle_temperature)
-					Z.SetStatus(ZONE_ACTIVE)
-				else
+		if(!vsc.connection_insulation)
+			for(var/zone/Z in closed_connection_zones)
+				//If that zone has already processed, skip it.
+				if(Z.last_update > last_update || !Z.air)
 					continue
 
-			if(air && Z.air)
-				if( handle_temperature )
-					ShareHeat(air, Z.air, closed_connection_zones[Z])
+				var/handle_temperature = abs(air.temperature - Z.air.temperature) > vsc.connection_temperature_delta
 
-					Z.interactions_with_neighbors++
-					interactions_with_neighbors++
+				if(Z.status == ZONE_SLEEPING)
+					if (handle_temperature)
+						Z.SetStatus(ZONE_ACTIVE)
+					else
+						continue
+
+				if(air && Z.air)
+					if( handle_temperature )
+						ShareHeat(air, Z.air, closed_connection_zones[Z])
+
+						Z.interactions_with_neighbors++
+						interactions_with_neighbors++
 
 	if(!interactions_with_neighbors && !interactions_with_unsim)
 		SetStatus(ZONE_SLEEPING)
@@ -649,6 +655,18 @@ proc/ShareSpace(datum/gas_mixture/A, list/unsimulated_tiles, dbg_output)
 
 
 proc/ShareHeat(datum/gas_mixture/A, datum/gas_mixture/B, connecting_tiles)
+	//This implements a simplistic version of the Stefan-Boltzmann law.
+	var/energy_delta = ((A.temperature - B.temperature) ** 4) * 5.6704e-8 * connecting_tiles * 2.5
+	var/maximum_energy_delta = max(0, min(A.temperature * A.heat_capacity() * A.group_multiplier, B.temperature * B.heat_capacity() * B.group_multiplier))
+	if(maximum_energy_delta > abs(energy_delta))
+		if(energy_delta < 0)
+			maximum_energy_delta *= -1
+		energy_delta = maximum_energy_delta
+
+	A.temperature -= energy_delta / (A.heat_capacity() * A.group_multiplier)
+	B.temperature += energy_delta / (B.heat_capacity() * B.group_multiplier)
+
+	/* This was bad an I feel bad.
 	//Shares a specific ratio of gas between mixtures using simple weighted averages.
 	var
 		//WOOT WOOT TOUCH THIS AND YOU ARE A RETARD
@@ -671,7 +689,7 @@ proc/ShareHeat(datum/gas_mixture/A, datum/gas_mixture/B, connecting_tiles)
 
 	A.temperature = max(0, (A.temperature - temp_avg) * (1- (ratio / max(1,A.group_multiplier)) ) + temp_avg )
 	B.temperature = max(0, (B.temperature - temp_avg) * (1- (ratio / max(1,B.group_multiplier)) ) + temp_avg )
-
+	*/
 
   ///////////////////
  //Zone Rebuilding//

code/modules/admin/admin_verbs.dm

@@ -129,6 +129,7 @@ var/list/admin_verbs_debug = list(
 	/client/proc/cmd_admin_list_open_jobs,
 	/client/proc/Debug2,
 	/client/proc/kill_air,
+	/client/proc/ZASSettings,
 	/client/proc/cmd_debug_make_powernets,
 	/client/proc/kill_airgroup,
 	/client/proc/debug_controller,