hell with it let's see

shiptest-ss13 · Dec 19, 2024 · 25ee637 · 25ee637
1 parent f451c21
commit 25ee637
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 11 deletions.
diff --git a/code/controllers/subsystem/air.dm b/code/controllers/subsystem/air.dm
@@ -249,15 +249,9 @@ BACKGROUND_SUBSYSTEM_DEF(air)
 		return
 	machine.atmos_processing = TRUE
 	if(machine.interacts_with_air)
-		if(mapload)
-			deferred_atmos_air_machinery += machine
-		else
-			atmos_air_machinery += machine
+		atmos_air_machinery += machine
 	else
-		if(mapload)
-			deferred_atmos_machinery += machine
-		else
-			atmos_machinery += machine
+		atmos_machinery += machine
 
 /**
  * Removes a given machine to the processing system for SSAIR_ATMOSMACHINERY processing.

diff --git a/code/modules/admin/verbs/atmosdebug.dm b/code/modules/admin/verbs/atmosdebug.dm
@@ -1,4 +1,4 @@
-#define ANNOTATE_OBJECT(object) testing ? "[object.loc.loc.name] (estimated location: [json_encode(object.get_relative_location())])" : ADMIN_VERBOSEJMP(object)
+#define ANNOTATE_OBJECT(object) testing ? "[object.loc.loc.name] (estimated location: [json_encode(object.check_shuttle_offset() || object.get_relative_location())])" : ADMIN_VERBOSEJMP(object)
 
 /atom/proc/check_shuttle_offset()
 	if(!SSshuttle.initialized)

diff --git a/code/modules/atmospherics/machinery/datum_pipeline.dm b/code/modules/atmospherics/machinery/datum_pipeline.dm
@@ -89,8 +89,8 @@
 					continue
 
 				if(item.parent)
-					log_mapping("Possible doubled atmosmachine found at [AREACOORD(item)] with other contents: [json_encode(item.loc.contents)]")
-					item.stack_trace("Possible doubled atmosmachine found")
+					possible_expansions += item.parent.members
+					merge(item.parent)
 					continue
 
 				members += item