Merge pull request #2550

_maps/RandomZLevels/Cabin.dmm

@@ -975,6 +975,10 @@
 	},
 /turf/open/floor/plating,
 /area/awaymission/cabin)
+"dw" = (
+/obj/effect/mapping_helpers/planet_z,
+/turf/closed/indestructible/rock/snow,
+/area/space)
 
 (1,1,1) = {"
 aa
@@ -1231,7 +1235,7 @@ aa
 aa
 aa
 aa
-aa
+dw
 "}
 (2,1,1) = {"
 aa

_maps/RandomZLevels/caves.dmm

@@ -2973,6 +2973,10 @@
 	initial_gas_mix = "n2=23;o2=14"
 	},
 /area/awaymission/BMPship)
+"gW" = (
+/obj/effect/mapping_helpers/planet_z,
+/turf/closed/indestructible/rock,
+/area/space)
 
 (1,1,1) = {"
 aa
@@ -3229,7 +3233,7 @@ aa
 aa
 aa
 aa
-aa
+gW
 "}
 (2,1,1) = {"
 aa

_maps/RandomZLevels/snowdin.dmm

@@ -5278,6 +5278,10 @@
 	},
 /turf/open/floor/plating/asteroid/snow,
 /area/awaymission/snowdin)
+"nR" = (
+/obj/effect/mapping_helpers/planet_z,
+/turf/closed/indestructible/rock/snow,
+/area/awaymission/snowdin)
 
 (1,1,1) = {"
 aa
@@ -5534,7 +5538,7 @@ aa
 aa
 aa
 aa
-aa
+nR
 "}
 (2,1,1) = {"
 aa

_maps/RandomZLevels/spacebattle.dmm

@@ -3065,6 +3065,10 @@
 /obj/item/mecha_parts/mecha_equipment/weapon/energy/ion,
 /turf/open/floor/plating,
 /area/awaymission/spacebattle/cruiser)
+"kM" = (
+/obj/effect/mapping_helpers/planet_z,
+/turf/closed/mineral/random,
+/area/space)
 
 (1,1,1) = {"
 aa
@@ -3321,7 +3325,7 @@ aa
 aa
 aa
 aa
-aa
+kM
 "}
 (2,1,1) = {"
 aa
@@ -38141,17 +38145,17 @@ bT
 cd
 bT
 bT
-eF
-eQ
-eQ
-eQ
-eQ
-eQ
-eQ
-eQ
-eQ
-eQ
-eQ
+cY
+eb
+eb
+eb
+eb
+eb
+eb
+eb
+eb
+eb
+eb
 ha
 bT
 bT
@@ -48177,7 +48181,7 @@ jS
 jS
 bT
 kd
-ko
+ki
 ix
 ab
 ab
@@ -48691,7 +48695,7 @@ jS
 jS
 bT
 kd
-ko
+ki
 kr
 kx
 ab
@@ -49205,7 +49209,7 @@ jS
 jS
 bT
 kd
-ko
+ki
 kr
 kx
 ab
@@ -49719,7 +49723,7 @@ jS
 jS
 bT
 kd
-ko
+ki
 kr
 kz
 ab

_maps/RandomZLevels/undergroundoutpost45.dmm

@@ -17834,6 +17834,10 @@
 	power_light = 0;
 	poweralm = 0
 	})
+"zi" = (
+/obj/effect/mapping_helpers/planet_z,
+/turf/open/space,
+/area/space)
 
 (1,1,1) = {"
 aa
@@ -18090,7 +18094,7 @@ aa
 aa
 aa
 aa
-aa
+zi
 "}
 (2,1,1) = {"
 aa
@@ -36521,9 +36525,9 @@ ad
 ad
 ad
 ad
-ys
+yk
 yw
-yx
+yn
 ad
 ad
 ad
@@ -37036,7 +37040,7 @@ ad
 ad
 ad
 ad
-yx
+yn
 eJ
 yB
 ad
@@ -37298,8 +37302,8 @@ eJ
 eJ
 yr
 ad
-yF
-yG
+yA
+yj
 ad
 ad
 ad
@@ -37554,8 +37558,8 @@ ad
 ad
 yC
 eJ
-yE
-yv
+yw
+ym
 yH
 ad
 ad
@@ -37811,7 +37815,7 @@ ad
 ad
 ad
 eJ
-yx
+yn
 eJ
 yz
 ad
@@ -38320,7 +38324,7 @@ ad
 yl
 eJ
 yq
-yv
+ym
 ad
 ad
 yz
@@ -38578,7 +38582,7 @@ ad
 eJ
 eJ
 eJ
-yy
+yn
 ad
 yD
 eJ
@@ -38588,8 +38592,8 @@ ad
 ad
 ad
 ad
-yG
-yy
+yj
+yn
 ad
 ad
 ad
@@ -38835,17 +38839,17 @@ ad
 ad
 yr
 yn
-yy
 yn
-yx
+yn
+yn
 eJ
 eJ
 ad
 ad
 ad
 ad
-yI
-yv
+yp
+ym
 yA
 ad
 ad
@@ -39092,7 +39096,7 @@ ad
 ad
 ad
 ad
-yx
+yn
 eJ
 eJ
 eJ
@@ -39353,7 +39357,7 @@ yz
 eJ
 eJ
 eJ
-yy
+yn
 eJ
 eJ
 eJ
@@ -39609,12 +39613,12 @@ ad
 yp
 yq
 eJ
-yy
 yn
-yv
+yn
+ym
 eJ
-yy
-yy
+yn
+yn
 ad
 ad
 ad
@@ -39864,14 +39868,14 @@ ad
 ad
 ad
 yA
-yx
+yn
 eJ
 yn
 ad
 ad
 yw
-yG
-ys
+yj
+yk
 ad
 ad
 ad

_maps/map_files/Mining/Lavaland.dmm

@@ -3420,6 +3420,10 @@
 /obj/effect/baseturf_helper/lava_land/surface,
 /turf/open/floor/plasteel,
 /area/mine/production)
+"Wz" = (
+/obj/effect/mapping_helpers/planet_z,
+/turf/open/lava/smooth/lava_land_surface,
+/area/lavaland/surface/outdoors)
 
 (1,1,1) = {"
 aa
@@ -3676,7 +3680,7 @@ aj
 aj
 aj
 aj
-aj
+Wz
 "}
 (2,1,1) = {"
 aa

code/__HELPERS/unsorted.dm

@@ -1454,3 +1454,7 @@ GLOBAL_PROTECT(valid_HTTPSGet)
 	var/temp = bitfield - ((bitfield>>1)&46811) - ((bitfield>>2)&37449) //0133333 and 0111111 respectively
 	temp = ((temp + (temp>>3))&29127) % 63	//070707
 	return temp
+
+//checks if a turf is in the planet z list.
+/proc/turf_z_is_planet(turf/T)
+	return GLOB.z_is_planet["[T.z]"]

code/game/turfs/simulated/floor/plating/asteroid.dm

@@ -101,7 +101,9 @@
 	return
 
 /turf/open/floor/plating/asteroid/singularity_act()
-	return
+	if(turf_z_is_planet(src))
+		return ..()
+	ChangeTurf(/turf/open/space)
 
 /turf/open/floor/plating/asteroid/singularity_pull(S, current_size)
 	if(dug)

code/modules/mapping/mapping_helpers.dm

@@ -49,3 +49,21 @@
 /obj/effect/baseturf_helper/lava_land/surface
 	name = "lavaland baseturf editor"
 	baseturf = /turf/open/lava/smooth/lava_land_surface
+
+
+//Contains the list of planetary z-levels defined by the planet_z helper.
+GLOBAL_LIST_EMPTY(z_is_planet)
+
+/obj/effect/mapping_helpers/planet_z //adds the map it is on to the z_is_planet list
+	name = "planet z helper"
+	icon = 'icons/obj/items_and_weapons.dmi'
+	icon_state = "syndballoon"
+	layer = POINT_LAYER
+
+/obj/effect/mapping_helpers/planet_z/Initialize()
+	. = ..()
+	var/turf/T = get_turf(src)
+	if(!turf_z_is_planet(T))
+		GLOB.z_is_planet["[T.z]"] = list()
+	qdel(src)
+