Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33829

code/modules/mapping/mapping_helpers.dm

@@ -13,11 +13,15 @@
 	. = ..()
 	var/area/thearea = get_area(src)
 	for(var/turf/T in get_area_turfs(thearea, z))
-		if(T.baseturf != T.type) //Don't break indestructible walls and the like
-			T.baseturf = baseturf
+		if(T.baseturfs != T.type) //Don't break indestructible walls and the like
+			T.baseturfs = baseturf
 	return INITIALIZE_HINT_QDEL
 
 
+/obj/effect/baseturf_helper/space
+	name = "space baseturf editor"
+	baseturf = /turf/open/space
+
 /obj/effect/baseturf_helper/asteroid
 	name = "asteroid baseturf editor"
 	baseturf = /turf/open/floor/plating/asteroid

code/modules/mapping/reader.dm

@@ -339,7 +339,7 @@ GLOBAL_DATUM_INIT(_preloader, /dmm_suite/preloader, new)
 
 	if(crds)
 		if(!no_changeturf && ispath(path, /turf))
-			. = crds.ChangeTurf(path, FALSE, TRUE)
+			. = crds.ChangeTurf(path, null, CHANGETURF_DEFER_CHANGE)
 		else
 			. = create_atom(path, crds)//first preloader pass