Merge remote-tracking branch 'upstream/master'

ATTRIBUTIONS.md

@@ -80,3 +80,9 @@
 **Creator:** VerySoft (https://github.com/TS-Rogue-Star/Rogue-Star/pull/435)<br>
 **URL:** [Website](https://rogue-star.net/)<br>
 **License:** Permission granting in writing for use by Virgo and Chomp with proper attribution
+<br>
+**File:** `icons/mob/turkey.dmi`
+**Title:** Turkey<br>
+**Creator:** VerySoft (https://github.com/TS-Rogue-Star/Rogue-Star/pull/669)<br>
+**URL:** [Website](https://rogue-star.net/)<br>
+**License:** Permission granted in writing for use by Virgo and Chomp with proper attribution

code/ATMOSPHERICS/components/unary/heat_exchanger.dm

@@ -36,11 +36,11 @@
 	if(!partner)
 		return 0
 
-	if(!air_master || air_master.current_cycle <= update_cycle)
+	if(!SSair || SSair.current_cycle <= update_cycle)
 		return 0
 
-	update_cycle = air_master.current_cycle
-	partner.update_cycle = air_master.current_cycle
+	update_cycle = SSair.current_cycle
+	partner.update_cycle = SSair.current_cycle
 
 	var/air_heat_capacity = air_contents.heat_capacity()
 	var/other_air_heat_capacity = partner.air_contents.heat_capacity()

code/ZAS/Atom.dm

@@ -36,11 +36,11 @@
 
 //Convenience function for atoms to update turfs they occupy
 /atom/movable/proc/update_nearby_tiles(need_rebuild)
-	if(!air_master)
+	if(!SSair)
 		return 0
 
 	for(var/turf/simulated/turf in locs)
-		air_master.mark_for_update(turf)
+		SSair.mark_for_update(turf)
 
 	return 1
 

code/ZAS/Connection.dm

@@ -5,7 +5,7 @@
 /*
 
 Overview:
-	Connections are made between turfs by air_master.connect(). They represent a single point where two zones converge.
+	Connections are made between turfs by SSair.connect(). They represent a single point where two zones converge.
 
 Class Vars:
 	A - Always a simulated turf.
@@ -60,19 +60,19 @@ Class Procs:
 
 /connection/New(turf/simulated/A, turf/simulated/B)
 	#ifdef ZASDBG
-	ASSERT(air_master.has_valid_zone(A))
-	//ASSERT(air_master.has_valid_zone(B))
+	ASSERT(HAS_VALID_ZONE(A))
+	//ASSERT(HAS_VALID_ZONE(B))
 	#endif
 	src.A = A
 	src.B = B
 	zoneA = A.zone
 	if(!istype(B))
 		mark_space()
-		edge = air_master.get_edge(A.zone,B)
+		edge = SSair.get_edge(A.zone,B)
 		edge.add_connection(src)
 	else
 		zoneB = B.zone
-		edge = air_master.get_edge(A.zone,B.zone)
+		edge = SSair.get_edge(A.zone,B.zone)
 		edge.add_connection(src)
 
 /connection/proc/mark_direct()
@@ -108,7 +108,7 @@ Class Procs:
 		erase()
 		return
 
-	var/block_status = air_master.air_blocked(A,B)
+	var/block_status = SSair.air_blocked(A,B)
 	if(block_status & AIR_BLOCKED)
 		//to_world("Blocked connection.")
 		erase()
@@ -133,7 +133,7 @@ Class Procs:
 				return
 			else
 				edge.remove_connection(src)
-				edge = air_master.get_edge(A.zone, B)
+				edge = SSair.get_edge(A.zone, B)
 				edge.add_connection(src)
 				zoneA = A.zone
 
@@ -155,7 +155,7 @@ Class Procs:
 		//to_world("Zones changed, \...")
 		if(A.zone && B.zone)
 			edge.remove_connection(src)
-			edge = air_master.get_edge(A.zone, B.zone)
+			edge = SSair.get_edge(A.zone, B.zone)
 			edge.add_connection(src)
 			zoneA = A.zone
 			zoneB = B.zone

code/ZAS/ConnectionGroup.dm

@@ -2,7 +2,7 @@
 
 Overview:
 	These are what handle gas transfers between zones and into space.
-	They are found in a zone's edges list and in air_master.edges.
+	They are found in a zone's edges list and in SSair.edges.
 	Each edge updates every air tick due to their role in gas transfer.
 	They come in two flavors, /connection_edge/zone and /connection_edge/unsimulated.
 	As the type names might suggest, they handle inter-zone and spacelike connections respectively.
@@ -82,7 +82,7 @@ Class Procs:
 /connection_edge/proc/contains_zone(zone/Z)
 
 /connection_edge/proc/erase()
-	air_master.remove_edge(src)
+	SSair.remove_edge(src)
 	//to_world("[type] Erased.")
 
 /connection_edge/proc/tick()
@@ -169,19 +169,19 @@ Class Procs:
 	if(equiv)
 		if(direct)
 			erase()
-			air_master.merge(A, B)
+			SSair.merge(A, B)
 			return
 		else
 			A.air.equalize(B.air)
-			air_master.mark_edge_sleeping(src)
+			SSair.mark_edge_sleeping(src)
 
-	air_master.mark_zone_update(A)
-	air_master.mark_zone_update(B)
+	SSair.mark_zone_update(A)
+	SSair.mark_zone_update(B)
 
 /connection_edge/zone/recheck()
 	// Edges with only one side being vacuum need processing no matter how close.
 	if(!A.air.compare(B.air, vacuum_exception = 1))
-		air_master.mark_edge_active(src)
+		SSair.mark_edge_active(src)
 
 //Helper proc to get connections for a zone.
 /connection_edge/zone/proc/get_connected_zone(zone/from)
@@ -233,16 +233,16 @@ Class Procs:
 
 	if(equiv)
 		A.air.copy_from(air)
-		air_master.mark_edge_sleeping(src)
+		SSair.mark_edge_sleeping(src)
 
-	air_master.mark_zone_update(A)
+	SSair.mark_zone_update(A)
 
 /connection_edge/unsimulated/recheck()
 	// Edges with only one side being vacuum need processing no matter how close.
 	// Note: This handles the glaring flaw of a room holding pressure while exposed to space, but
 	// does not specially handle the less common case of a simulated room exposed to an unsimulated pressurized turf.
 	if(!A.air.compare(air, vacuum_exception = 1))
-		air_master.mark_edge_active(src)
+		SSair.mark_edge_active(src)
 
 /proc/ShareHeat(datum/gas_mixture/A, datum/gas_mixture/B, connecting_tiles)
 	//This implements a simplistic version of the Stefan-Boltzmann law.

code/ZAS/ConnectionManager.dm

@@ -16,7 +16,7 @@ Class Procs:
 		Preferable to accessing the connection directly because it checks validity.
 
 	place(connection/c, d)
-		Called by air_master.connect(). Sets the connection in the specified direction to c.
+		Called by SSair.connect(). Sets the connection in the specified direction to c.
 
 	update_all()
 		Called after turf/update_air_properties(). Updates the validity of all connections on this turf.