From 715067d5e93e7756e3cc2e26d92c4d86425ccff9 Mon Sep 17 00:00:00 2001 From: Matt Atlas Date: Thu, 29 Jun 2023 16:21:35 +0200 Subject: [PATCH] Fix exoplanet ut testing (#16595) Co-authored-by: Matt Atlas --- .../crashed_pod/crashed_pod_unique.dmm | 39 ++++++---- .../crashed_shuttle/crashed_shuttle_01.dmm | 78 +++++++++---------- 2 files changed, 62 insertions(+), 55 deletions(-) diff --git a/maps/random_ruins/exoplanets/asteroid/crashed_pod/crashed_pod_unique.dmm b/maps/random_ruins/exoplanets/asteroid/crashed_pod/crashed_pod_unique.dmm index 9147066c6fd..5747c522243 100644 --- a/maps/random_ruins/exoplanets/asteroid/crashed_pod/crashed_pod_unique.dmm +++ b/maps/random_ruins/exoplanets/asteroid/crashed_pod/crashed_pod_unique.dmm @@ -9,7 +9,9 @@ /turf/simulated/floor/shuttle/dark_blue/airless, /area/template_noop) "c" = ( -/turf/unsimulated/floor/asteroid/ash/rocky, +/obj/effect/landmark/clear, +/obj/effect/landmark/clear, +/turf/template_noop, /area/template_noop) "d" = ( /obj/effect/decal/cleanable/blood/drip, @@ -57,7 +59,8 @@ icon_state = "small" }, /obj/effect/decal/cleanable/blood/drip, -/turf/unsimulated/floor/asteroid/ash/rocky, +/obj/effect/landmark/clear, +/turf/template_noop, /area/template_noop) "n" = ( /obj/structure/grille, @@ -70,7 +73,8 @@ /area/template_noop) "o" = ( /obj/effect/decal/cleanable/blood/drip, -/turf/unsimulated/floor/asteroid/ash/rocky, +/obj/effect/landmark/clear, +/turf/template_noop, /area/template_noop) "p" = ( /obj/structure/grille, @@ -131,7 +135,8 @@ /mob/living/simple_animal/hostile/carp{ wander = 0 }, -/turf/unsimulated/floor/asteroid/ash/rocky, +/obj/effect/landmark/clear, +/turf/template_noop, /area/template_noop) "B" = ( /obj/effect/landmark/clear, @@ -172,14 +177,16 @@ /area/template_noop) "H" = ( /obj/random/loot, -/turf/unsimulated/floor/asteroid/ash/rocky, +/obj/effect/landmark/clear, +/turf/template_noop, /area/template_noop) "I" = ( /turf/template_noop, /area/template_noop) "K" = ( /obj/item/arrow/rod, -/turf/unsimulated/floor/asteroid/ash/rocky, +/obj/effect/landmark/clear, +/turf/template_noop, /area/template_noop) (1,1,1) = {" @@ -196,7 +203,7 @@ a "} (2,1,1) = {" A -B +c B B a @@ -207,8 +214,8 @@ a a "} (3,1,1) = {" -c -c +B +B B B t @@ -219,7 +226,7 @@ a a "} (4,1,1) = {" -c +B H t t @@ -231,8 +238,8 @@ a a "} (5,1,1) = {" -c -c +B +B y j G @@ -244,7 +251,7 @@ a "} (6,1,1) = {" K -c +B z d D @@ -268,7 +275,7 @@ a "} (8,1,1) = {" o -c +B t t t @@ -279,7 +286,7 @@ t a "} (9,1,1) = {" -c +B o B B @@ -291,7 +298,7 @@ t a "} (10,1,1) = {" -c +B o B B diff --git a/maps/random_ruins/exoplanets/asteroid/crashed_shuttle/crashed_shuttle_01.dmm b/maps/random_ruins/exoplanets/asteroid/crashed_shuttle/crashed_shuttle_01.dmm index 68142449e66..4a224b50a4f 100644 --- a/maps/random_ruins/exoplanets/asteroid/crashed_shuttle/crashed_shuttle_01.dmm +++ b/maps/random_ruins/exoplanets/asteroid/crashed_shuttle/crashed_shuttle_01.dmm @@ -12,7 +12,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /obj/item/weldingtool/hugetank, -/turf/unsimulated/floor/asteroid/ash/rocky, +/turf/template_noop, /area/template_noop) "ck" = ( /obj/effect/decal/cleanable/dirt, @@ -42,23 +42,23 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /obj/item/material/shard{ - pixel_y = -10; - pixel_x = 10 + pixel_x = 10; + pixel_y = -10 }, /obj/item/material/shard{ icon_state = "small" }, -/turf/unsimulated/floor/asteroid/ash/rocky, +/turf/template_noop, /area/template_noop) "dQ" = ( /obj/item/material/shard, /obj/effect/decal/cleanable/dirt, -/turf/unsimulated/floor/asteroid/ash/rocky, +/turf/template_noop, /area/template_noop) "fE" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/turf/unsimulated/floor/asteroid/ash/rocky, +/turf/template_noop, /area/template_noop) "gb" = ( /obj/effect/decal/cleanable/dirt, @@ -72,7 +72,7 @@ /area/template_noop) "gj" = ( /obj/item/spacecash/c10, -/turf/unsimulated/floor/asteroid/ash/rocky, +/turf/template_noop, /area/template_noop) "gu" = ( /obj/structure/railing/mapped{ @@ -80,7 +80,7 @@ }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/turf/unsimulated/floor/asteroid/ash/rocky, +/turf/template_noop, /area/template_noop) "hw" = ( /obj/effect/decal/cleanable/dirt, @@ -89,8 +89,8 @@ /obj/structure/grille/broken, /obj/structure/grille/diagonal, /obj/item/material/shard{ - pixel_y = -7; - pixel_x = 9 + pixel_x = 9; + pixel_y = -7 }, /obj/item/material/shard{ icon_state = "small" @@ -104,7 +104,7 @@ /obj/machinery/atmospherics/unary/engine{ dir = 4 }, -/turf/unsimulated/floor/asteroid/ash/rocky, +/turf/template_noop, /area/template_noop) "la" = ( /obj/effect/decal/cleanable/dirt, @@ -126,7 +126,7 @@ icon_state = "small" }, /obj/effect/decal/cleanable/dirt, -/turf/unsimulated/floor/asteroid/ash/rocky, +/turf/template_noop, /area/template_noop) "lR" = ( /obj/effect/decal/cleanable/dirt, @@ -135,7 +135,7 @@ }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/turf/unsimulated/floor/asteroid/ash/rocky, +/turf/template_noop, /area/template_noop) "nM" = ( /turf/simulated/wall/shuttle/raider, @@ -161,12 +161,12 @@ /area/template_noop) "rK" = ( /obj/item/pocketwatch, -/turf/unsimulated/floor/asteroid/ash/rocky, +/turf/template_noop, /area/template_noop) "rY" = ( /obj/effect/decal/cleanable/dirt, /obj/random/junk, -/turf/unsimulated/floor/asteroid/ash/rocky, +/turf/template_noop, /area/template_noop) "sW" = ( /turf/simulated/mineral/random/high_chance, @@ -193,15 +193,15 @@ /area/template_noop) "vS" = ( /mob/living/simple_animal/hostile/gnat, -/turf/unsimulated/floor/asteroid/ash/rocky, +/turf/template_noop, /area/template_noop) "xK" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/manifold/visible{ - pixel_y = 3; - pixel_x = 8 + pixel_x = 8; + pixel_y = 3 }, /obj/item/ammo_magazine/c45m{ pixel_x = -9; @@ -214,10 +214,10 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /obj/item/material/shard{ - pixel_y = 4; - pixel_x = 18 + pixel_x = 18; + pixel_y = 4 }, -/turf/unsimulated/floor/asteroid/ash/rocky, +/turf/template_noop, /area/template_noop) "xX" = ( /obj/effect/decal/cleanable/dirt, @@ -242,7 +242,7 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/railing/mapped, /obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/white/airless, +/turf/template_noop, /area/template_noop) "Du" = ( /obj/effect/decal/cleanable/dirt, @@ -268,7 +268,7 @@ /area/template_noop) "Dz" = ( /obj/item/material/shard, -/turf/unsimulated/floor/asteroid/ash/rocky, +/turf/template_noop, /area/template_noop) "DH" = ( /obj/effect/decal/cleanable/dirt, @@ -296,9 +296,9 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/portables_connector{ - pixel_y = -4; + dir = 8; pixel_x = 16; - dir = 8 + pixel_y = -4 }, /obj/item/storage/field_ration, /turf/simulated/floor/tiled/white/airless, @@ -335,18 +335,18 @@ pixel_y = 23 }, /obj/structure/grille/diagonal{ - pixel_y = 9; - dir = 4 + dir = 4; + pixel_y = 9 }, /obj/structure/grille/broken, /obj/item/material/shard{ - pixel_y = -3; - pixel_x = 16 + pixel_x = 16; + pixel_y = -3 }, /obj/item/material/shard{ icon_state = "small"; - pixel_y = -10; - pixel_x = -14 + pixel_x = -14; + pixel_y = -10 }, /obj/item/material/shard{ icon_state = "small"; @@ -379,10 +379,10 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /obj/item/wrench, -/turf/unsimulated/floor/asteroid/ash/rocky, +/turf/template_noop, /area/template_noop) "MT" = ( -/turf/unsimulated/floor/asteroid/ash/rocky, +/turf/template_noop, /area/template_noop) "MX" = ( /obj/effect/decal/cleanable/dirt, @@ -392,7 +392,7 @@ /area/template_noop) "OW" = ( /obj/item/spacecash/c1, -/turf/unsimulated/floor/asteroid/ash/rocky, +/turf/template_noop, /area/template_noop) "Qr" = ( /obj/effect/decal/cleanable/dirt, @@ -438,13 +438,13 @@ /area/template_noop) "SP" = ( /obj/item/clothing/head/helmet/space/santahat, -/turf/unsimulated/floor/asteroid/ash/rocky, +/turf/template_noop, /area/template_noop) "Tr" = ( /obj/machinery/atmospherics/portables_connector{ - pixel_y = -4; + dir = 8; pixel_x = 16; - dir = 8 + pixel_y = -4 }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -453,7 +453,7 @@ /area/template_noop) "TG" = ( /obj/effect/decal/cleanable/dirt, -/turf/unsimulated/floor/asteroid/ash/rocky, +/turf/template_noop, /area/template_noop) "VD" = ( /obj/effect/decal/cleanable/dirt, @@ -481,7 +481,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/turf/unsimulated/floor/asteroid/ash/rocky, +/turf/template_noop, /area/template_noop) "Zf" = ( /obj/effect/map_effect/window_spawner/full/reinforced/grille,