stuff

code/__defines/misc.dm

@@ -494,3 +494,4 @@ Define for getting a bitfield of adjacent turfs that meet a condition.
 #define TEMPLATE_FLAG_NO_RADS          16// Removes all radiation from the template after spawning.
 
 
+#define LANDING_ZONE_RADIUS 15 // Used for autoplacing landmarks on exoplanets

code/modules/maps/planet_types/barren.dm

@@ -61,12 +61,9 @@
 	desc = "A phoron rich asteroid."
 	map_generators = list(/datum/random_map/noise/exoplanet/barren/asteroid, /datum/random_map/noise/ore/rich/phoron)
 
-/area/exoplanet/barren/asteroid
-	base_turf = /turf/unsimulated/floor/asteroid/ash
-
 /datum/random_map/noise/exoplanet/barren/asteroid
 	descriptor = "asteroid exoplanet"
 	smoothing_iterations = 4
-	land_type = /turf/unsimulated/floor/asteroid/ash
 	fauna_prob = 1
-	fauna_types = list(/mob/living/simple_animal/carp, /mob/living/simple_animal/hostile/retaliate/cavern_dweller)
+	fauna_types = list(/mob/living/simple_animal/carp, /mob/living/simple_animal/hostile/retaliate/cavern_dweller)
+

code/modules/overmap/exoplanets/exoplanet.dm

@@ -300,7 +300,7 @@
 
 	while(num)
 		attempts--
-		var/turf/T = locate(rand(lm_min_x, lm_max_x), rand(lm_min_y, lm_max_y),map_z[map_z.len])
+		var/turf/T = locate(rand(TRANSITIONEDGE + LANDING_ZONE_RADIUS, maxx - TRANSITIONEDGE - LANDING_ZONE_RADIUS), rand(TRANSITIONEDGE + LANDING_ZONE_RADIUS, maxy - TRANSITIONEDGE - LANDING_ZONE_RADIUS),map_z[map_z.len])
 		if(!T || (T in places)) // Two landmarks on one turf is forbidden as the landmark code doesn't work with it.
 			continue
 		if(attempts >= 0) // While we have the patience, try to find better spawn points. If out of patience, put them down wherever, so long as there are no repeats.

code/modules/shuttles/landmarks.dm

@@ -103,7 +103,7 @@
 
 //Subtype that calls explosion on init to clear space for shuttles
 /obj/effect/shuttle_landmark/automatic/clearing
-	var/radius = 10
+	var/radius = LANDING_ZONE_RADIUS
 
 /obj/effect/shuttle_landmark/automatic/clearing/Initialize()
 	..()

maps/sccv_horizon/placeholder-1_deck_1.dmm

@@ -308,7 +308,7 @@
 "cIY" = (/obj/structure/table/reinforced,/obj/item/storage/box/testpins{pixel_x = 1; pixel_y = 3},/obj/effect/floor_decal/corner_wide/purple{dir = 9},/obj/effect/floor_decal/corner_wide/purple/diagonal,/obj/machinery/light{dir = 8},/turf/simulated/floor/tiled/white,/area/rnd/test_range)
 "cJz" = (/turf/simulated/wall/shuttle/scc_space_ship/cardinal,/area/hallway/engineering)
 "cJJ" = (/obj/structure/railing/mapped{dir = 8},/obj/machinery/light/spot/weak{dir = 4},/obj/effect/floor_decal/corner/black{dir = 9},/turf/simulated/floor/tiled/dark,/area/hangar/auxiliary)
-"cLh" = (/obj/machinery/atmospherics/portables_connector{dir = 1},/obj/machinery/portable_atmospherics/canister/hydrogen,/turf/simulated/floor/tiled/dark,/area/engineering/atmos/propulsion)
+"cLh" = (/obj/machinery/atmospherics/pipe/simple/visible{dir = 5},/obj/machinery/meter,/turf/simulated/floor/tiled/dark,/area/engineering/atmos/propulsion)
 "cLn" = (/obj/effect/floor_decal/corner_wide/purple{dir = 8},/obj/machinery/atmospherics/valve/digital/open{dir = 4},/obj/effect/floor_decal/corner_wide/purple{dir = 6},/obj/effect/floor_decal/industrial/warning{dir = 4},/obj/structure/cable/green{icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/button/remote/blast_door{id = "iso_c_purge"; name = "PURGE Atmosphere"; pixel_x = 25; pixel_y = -38; req_access = list(7)},/obj/machinery/button/remote/blast_door{id = "iso_c"; name = "Blast Door Control"; pixel_x = 25; pixel_y = -30; req_access = list(7)},/obj/machinery/button/remote/airlock{id = "riso3"; name = "Door Bolt Control"; pixel_x = 25; pixel_y = -22; specialfunctions = 4},/turf/simulated/floor/tiled/white,/area/rnd/xenoarch_atrium)
 "cLv" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/effect/floor_decal/corner/paleblue{dir = 4},/turf/simulated/floor/tiled/dark,/area/storage/eva)
 "cLC" = (/obj/machinery/space_heater,/turf/simulated/floor/tiled/dark,/area/rnd/xenoarch_atrium)
@@ -628,7 +628,7 @@
 "fuU" = (/obj/machinery/bodyscanner{dir = 4},/obj/effect/floor_decal/corner_wide/purple{dir = 9},/obj/effect/floor_decal/corner_wide/purple/diagonal,/turf/simulated/floor/tiled/white,/area/rnd/test_range)
 "fvn" = (/obj/effect/floor_decal/industrial/outline/yellow,/obj/structure/closet/crate,/turf/simulated/floor/tiled,/area/quartermaster/storage)
 "fvq" = (/obj/effect/floor_decal/corner/black{dir = 9},/obj/effect/floor_decal/industrial/warning/corner{dir = 1},/turf/simulated/floor/tiled,/area/hallway/primary/aft)
-"fvy" = (/obj/effect/floor_decal/industrial/warning{dir = 5},/obj/machinery/atmospherics/portables_connector,/obj/machinery/portable_atmospherics/canister/hydrogen,/turf/simulated/floor/tiled/dark,/area/engineering/atmos/propulsion/starboard)
+"fvy" = (/obj/effect/floor_decal/industrial/warning{dir = 5},/obj/machinery/atmospherics/portables_connector,/obj/machinery/portable_atmospherics/canister/phoron,/turf/simulated/floor/tiled/dark,/area/engineering/atmos/propulsion/starboard)
 "fwA" = (/obj/structure/cable/green{icon_state = "4-8"},/turf/simulated/floor/plating,/area/maintenance/substation/engineering/lower)
 "fxh" = (/obj/machinery/door/window/eastleft,/turf/simulated/floor/plating,/area/maintenance/hangar/port)
 "fxy" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/effect/floor_decal/corner/black{dir = 6},/turf/simulated/floor/tiled,/area/hallway/primary/aft)
@@ -679,7 +679,7 @@
 "fQZ" = (/obj/effect/floor_decal/industrial/warning{dir = 1},/obj/structure/tank_wall/carbon_dioxide{icon_state = "co2-3"},/obj/machinery/atmospherics/pipe/simple/visible/black,/turf/simulated/floor/airless,/area/engineering/atmos)
 "fRj" = (/obj/structure/lattice/catwalk/indoor/grate,/obj/structure/cable/green{icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/purple{dir = 4},/turf/simulated/floor/plating,/area/maintenance/engineering)
 "fRu" = (/obj/structure/tank_wall{icon_state = "m-13"},/obj/effect/floor_decal/industrial/warning{dir = 4},/obj/machinery/atmospherics/pipe/simple/visible/yellow{dir = 4},/turf/simulated/floor/plating,/area/engineering/atmos)
-"fSl" = (/obj/structure/railing/mapped{dir = 4},/turf/simulated/wall/shuttle/scc,/area/shuttle/mining)
+"fSl" = (/obj/structure/railing/mapped{dir = 4},/turf/simulated/wall/shuttle/scc/cardinal,/area/shuttle/mining)
 "fTb" = (/obj/structure/shuttle_part{icon = 'icons/turf/shuttles_unique/scc_shuttle_pieces.dmi'; icon_state = "me1"},/obj/machinery/atmospherics/pipe/manifold/visible/black{dir = 8},/turf/simulated/floor/reinforced{blocks_air = 1; density = 1; name = "thruster mount"},/area/shuttle/intrepid)
 "fTm" = (/obj/effect/floor_decal/industrial/warning{dir = 4},/obj/machinery/atmospherics/pipe/simple/visible{dir = 9},/obj/machinery/meter,/turf/simulated/floor/tiled/dark,/area/engineering/atmos/propulsion/starboard)
 "fTy" = (/obj/effect/floor_decal/corner/grey/diagonal,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled,/area/maintenance/research_port)
@@ -2308,7 +2308,7 @@
 "umg" = (/obj/effect/floor_decal/corner/blue{dir = 9},/obj/effect/floor_decal/industrial/warning{dir = 8},/obj/machinery/atmospherics/pipe/simple/hidden{dir = 9},/turf/simulated/floor/tiled/dark,/area/shuttle/intrepid)
 "umt" = (/obj/structure/table/steel,/obj/machinery/light,/obj/effect/floor_decal/industrial/outline,/obj/item/paper_bin{pixel_x = -3},/obj/item/pen,/obj/item/pen/red,/obj/item/stack/packageWrap,/turf/simulated/floor/tiled,/area/outpost/mining_main/refinery)
 "umB" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 8},/turf/simulated/floor/tiled/dark,/area/outpost/mining_main/eva)
-"uni" = (/obj/machinery/camera/network/engineering{c_tag = "Engineering - Port Propulsion"; dir = 1},/turf/simulated/floor/tiled/dark,/area/engineering/atmos/propulsion)
+"uni" = (/obj/machinery/camera/network/engineering{c_tag = "Engineering - Port Propulsion"; dir = 1},/obj/machinery/atmospherics/portables_connector{dir = 8; layer = 2.8},/obj/machinery/portable_atmospherics/canister/phoron,/turf/simulated/floor/tiled/dark,/area/engineering/atmos/propulsion)
 "unm" = (/obj/machinery/atmospherics/pipe/manifold/visible/cyan,/obj/structure/tank_wall/oxygen{density = 0; icon_state = "o2-12"; layer = 10.1; opacity = 0},/turf/simulated/floor/reinforced/oxygen,/area/engineering/atmos/air)
 "unD" = (/obj/effect/floor_decal/corner/blue{dir = 10},/obj/effect/shuttle_landmark/intrepid/hangar,/turf/simulated/floor/tiled/dark,/area/shuttle/intrepid)
 "unZ" = (/obj/structure/cable/green{icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/light/spot/weak{dir = 8},/turf/simulated/floor/tiled,/area/hangar/cargo)