From 59646ea3767c42e522df82cecfcb5bbdbc79c507 Mon Sep 17 00:00:00 2001 From: CHOMPStation2StaffMirrorBot <94713762+CHOMPStation2StaffMirrorBot@users.noreply.github.com> Date: Thu, 28 Nov 2024 02:31:36 -0700 Subject: [PATCH] [MIRROR] Fix Two active edges (#9560) Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com> --- .../pois_vr/debris_field/foodstand.dmm | 18 +-- .../debris_field/ship_tanker_betrayed.dmm | 133 +++--------------- .../surface_submaps/plains/oldhotel.dmm | 20 +-- 3 files changed, 34 insertions(+), 137 deletions(-) diff --git a/maps/submaps/pois_vr/debris_field/foodstand.dmm b/maps/submaps/pois_vr/debris_field/foodstand.dmm index 56891bbe75..1cd9b2041e 100644 --- a/maps/submaps/pois_vr/debris_field/foodstand.dmm +++ b/maps/submaps/pois_vr/debris_field/foodstand.dmm @@ -16,7 +16,7 @@ /obj/item/reagent_containers/food/snacks/carpmeat, /obj/item/reagent_containers/food/snacks/carpmeat, /obj/item/reagent_containers/food/snacks/carpmeat, -/turf/simulated/floor/wood, +/turf/simulated/floor/wood/airless, /area/submap/debrisfield/foodstand) "f" = ( /obj/structure/table/woodentable, @@ -24,19 +24,19 @@ /obj/item/reagent_containers/food/condiment/ketchup, /obj/item/reagent_containers/food/condiment/hotsauce, /obj/item/reagent_containers/food/condiment/soysauce, -/turf/simulated/floor/wood, +/turf/simulated/floor/wood/airless, /area/submap/debrisfield/foodstand) "g" = ( /obj/structure/table/woodentable, /obj/machinery/microwave, -/turf/simulated/floor/wood, +/turf/simulated/floor/wood/airless, /area/submap/debrisfield/foodstand) "h" = ( /obj/structure/simple_door/wood, -/turf/simulated/floor/wood, +/turf/simulated/floor/wood/airless, /area/submap/debrisfield/foodstand) "i" = ( -/turf/simulated/floor/wood, +/turf/simulated/floor/wood/airless, /area/submap/debrisfield/foodstand) "j" = ( /obj/structure/closet/crate/freezer, @@ -47,23 +47,23 @@ /obj/item/reagent_containers/food/snacks/hotdog, /obj/item/reagent_containers/food/snacks/cheeseburrito, /obj/item/reagent_containers/food/snacks/cheeseburrito, -/turf/simulated/floor/wood, +/turf/simulated/floor/wood/airless, /area/submap/debrisfield/foodstand) "k" = ( /obj/structure/table/woodentable, /obj/machinery/cash_register{ dir = 1 }, -/turf/simulated/floor/wood, +/turf/simulated/floor/wood/airless, /area/submap/debrisfield/foodstand) "l" = ( /obj/structure/table/woodentable, /obj/item/reagent_containers/food/snacks/taco, -/turf/simulated/floor/wood, +/turf/simulated/floor/wood/airless, /area/submap/debrisfield/foodstand) "m" = ( /obj/structure/table/woodentable, -/turf/simulated/floor/wood, +/turf/simulated/floor/wood/airless, /area/submap/debrisfield/foodstand) (1,1,1) = {" diff --git a/maps/submaps/pois_vr/debris_field/ship_tanker_betrayed.dmm b/maps/submaps/pois_vr/debris_field/ship_tanker_betrayed.dmm index 701ce36123..e8d723c519 100644 --- a/maps/submaps/pois_vr/debris_field/ship_tanker_betrayed.dmm +++ b/maps/submaps/pois_vr/debris_field/ship_tanker_betrayed.dmm @@ -10,11 +10,7 @@ /obj/machinery/atmospherics/pipe/simple/visible{ dir = 6 }, -/turf/simulated/floor/plating/external{ - nitrogen = 0; - oxygen = 0; - temperature = 2.7 - }, +/turf/simulated/floor/airless, /area/submap/debrisfield/phoron_tanker) "ar" = ( /obj/structure/window/reinforced{ @@ -29,11 +25,7 @@ /area/space) "aF" = ( /mob/living/simple_mob/humanoid/merc/melee/sword/drone/tanker_escort, -/turf/simulated/floor/plating/external{ - nitrogen = 0; - oxygen = 0; - temperature = 2.7 - }, +/turf/simulated/floor/airless, /area/submap/debrisfield/phoron_tanker) "ck" = ( /obj/machinery/atmospherics/pipe/simple/visible, @@ -93,12 +85,7 @@ "ht" = ( /obj/item/stack/cable_coil, /mob/living/simple_mob/humanoid/merc/melee/drone/tanker_escort, -/turf/simulated/mineral/floor/ignore_mapgen/cave{ - name = "asteroid"; - nitrogen = 0; - oxygen = 0; - temperature = 2.7 - }, +/turf/simulated/mineral/floor/vacuum, /area/submap/debrisfield/phoron_tanker) "hx" = ( /obj/effect/decal/cleanable/blood/oil, @@ -108,21 +95,13 @@ /area/submap/debrisfield/phoron_tanker) "ik" = ( /obj/structure/meteorite, -/turf/simulated/floor/plating/external{ - nitrogen = 0; - oxygen = 0; - temperature = 2.7 - }, +/turf/simulated/floor/airless, /area/submap/debrisfield/phoron_tanker) "iD" = ( /obj/machinery/atmospherics/pipe/simple/visible{ dir = 10 }, -/turf/simulated/floor/plating/external{ - nitrogen = 0; - oxygen = 0; - temperature = 2.7 - }, +/turf/simulated/floor/airless, /area/submap/debrisfield/phoron_tanker) "jx" = ( /turf/simulated/floor/tiled/techfloor, @@ -175,11 +154,7 @@ /obj/machinery/atmospherics/pipe/tank/phoron/full{ dir = 4 }, -/turf/simulated/floor/plating/external{ - nitrogen = 0; - oxygen = 0; - temperature = 2.7 - }, +/turf/simulated/floor/airless, /area/submap/debrisfield/phoron_tanker) "mP" = ( /obj/item/card/id/event/altcard/centcom, @@ -204,12 +179,7 @@ /turf/space, /area/space) "ou" = ( -/turf/simulated/mineral/floor/ignore_mapgen/cave{ - name = "asteroid"; - nitrogen = 0; - oxygen = 0; - temperature = 2.7 - }, +/turf/simulated/mineral/floor/vacuum, /area/submap/debrisfield/phoron_tanker) "ox" = ( /obj/machinery/door/window{ @@ -249,11 +219,7 @@ /obj/machinery/light/small/emergency/flicker{ dir = 8 }, -/turf/simulated/floor/plating/external{ - nitrogen = 0; - oxygen = 0; - temperature = 2.7 - }, +/turf/simulated/floor/airless, /area/submap/debrisfield/phoron_tanker) "rt" = ( /obj/structure/lattice, @@ -262,20 +228,11 @@ /area/submap/debrisfield/phoron_tanker) "sU" = ( /obj/item/broken_device, -/turf/simulated/floor/plating/external{ - nitrogen = 0; - oxygen = 0; - temperature = 2.7 - }, +/turf/simulated/floor/airless, /area/submap/debrisfield/phoron_tanker) "sY" = ( /obj/item/reagent_containers/food/snacks/meat, -/turf/simulated/mineral/floor/ignore_mapgen/cave{ - name = "asteroid"; - nitrogen = 0; - oxygen = 0; - temperature = 2.7 - }, +/turf/simulated/mineral/floor/vacuum, /area/submap/debrisfield/phoron_tanker) "ta" = ( /obj/structure/meteorite, @@ -290,11 +247,7 @@ /area/submap/debrisfield/phoron_tanker) "tw" = ( /obj/machinery/atmospherics/pipe/simple/visible, -/turf/simulated/floor/plating/external{ - nitrogen = 0; - oxygen = 0; - temperature = 2.7 - }, +/turf/simulated/floor/airless, /area/submap/debrisfield/phoron_tanker) "uo" = ( /obj/structure/lattice, @@ -303,12 +256,7 @@ /area/submap/debrisfield/phoron_tanker) "uF" = ( /obj/effect/decal/cleanable/blood/oil, -/turf/simulated/mineral/floor/ignore_mapgen/cave{ - name = "asteroid"; - nitrogen = 0; - oxygen = 0; - temperature = 2.7 - }, +/turf/simulated/mineral/floor/vacuum, /area/submap/debrisfield/phoron_tanker) "uL" = ( /obj/tether_away_spawner/debrisfield/carp, @@ -318,11 +266,7 @@ /obj/machinery/atmospherics/pipe/manifold/visible{ dir = 8 }, -/turf/simulated/floor/plating/external{ - nitrogen = 0; - oxygen = 0; - temperature = 2.7 - }, +/turf/simulated/floor/airless, /area/submap/debrisfield/phoron_tanker) "vs" = ( /obj/machinery/atmospherics/pipe/simple/visible{ @@ -376,11 +320,7 @@ /obj/machinery/atmospherics/pipe/manifold/visible{ dir = 4 }, -/turf/simulated/floor/plating/external{ - nitrogen = 0; - oxygen = 0; - temperature = 2.7 - }, +/turf/simulated/floor/airless, /area/submap/debrisfield/phoron_tanker) "zZ" = ( /obj/structure/curtain/black, @@ -426,11 +366,7 @@ /obj/machinery/atmospherics/pipe/manifold/visible{ dir = 8 }, -/turf/simulated/floor/plating/external{ - nitrogen = 0; - oxygen = 0; - temperature = 2.7 - }, +/turf/simulated/floor/airless, /area/submap/debrisfield/phoron_tanker) "Ex" = ( /obj/machinery/atmospherics/pipe/simple/visible{ @@ -452,11 +388,7 @@ /turf/simulated/floor/tiled/techfloor, /area/submap/debrisfield/phoron_tanker) "Fl" = ( -/turf/simulated/floor/plating/external{ - nitrogen = 0; - oxygen = 0; - temperature = 2.7 - }, +/turf/simulated/floor/airless, /area/submap/debrisfield/phoron_tanker) "Fv" = ( /obj/structure/lattice, @@ -484,11 +416,7 @@ /obj/machinery/light/small/emergency/flicker{ dir = 4 }, -/turf/simulated/floor/plating/external{ - nitrogen = 0; - oxygen = 0; - temperature = 2.7 - }, +/turf/simulated/floor/airless, /area/submap/debrisfield/phoron_tanker) "Hk" = ( /obj/structure/toilet{ @@ -515,12 +443,7 @@ /area/submap/debrisfield/phoron_tanker) "JD" = ( /obj/effect/map_effect/perma_light, -/turf/simulated/mineral/floor/ignore_mapgen/cave{ - name = "asteroid"; - nitrogen = 0; - oxygen = 0; - temperature = 2.7 - }, +/turf/simulated/mineral/floor/vacuum, /area/submap/debrisfield/phoron_tanker) "JG" = ( /obj/machinery/computer/shuttle, @@ -606,22 +529,13 @@ /area/submap/debrisfield/phoron_tanker) "TL" = ( /obj/effect/decal/cleanable/blood/oil/streak, -/turf/simulated/mineral/floor/ignore_mapgen/cave{ - name = "asteroid"; - nitrogen = 0; - oxygen = 0; - temperature = 2.7 - }, +/turf/simulated/mineral/floor/vacuum, /area/submap/debrisfield/phoron_tanker) "Uh" = ( /obj/machinery/atmospherics/pipe/tank/phoron/full{ dir = 8 }, -/turf/simulated/floor/plating/external{ - nitrogen = 0; - oxygen = 0; - temperature = 2.7 - }, +/turf/simulated/floor/airless, /area/submap/debrisfield/phoron_tanker) "Vl" = ( /obj/effect/map_effect/perma_light, @@ -647,12 +561,7 @@ /area/submap/debrisfield/phoron_tanker) "XW" = ( /obj/item/stack/material/steel, -/turf/simulated/mineral/floor/ignore_mapgen/cave{ - name = "asteroid"; - nitrogen = 0; - oxygen = 0; - temperature = 2.7 - }, +/turf/simulated/mineral/floor/vacuum, /area/submap/debrisfield/phoron_tanker) "Yp" = ( /obj/effect/decal/cleanable/blood/oil/streak, diff --git a/maps/submaps/surface_submaps/plains/oldhotel.dmm b/maps/submaps/surface_submaps/plains/oldhotel.dmm index f195022b43..4d0a583af9 100644 --- a/maps/submaps/surface_submaps/plains/oldhotel.dmm +++ b/maps/submaps/surface_submaps/plains/oldhotel.dmm @@ -1,8 +1,4 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"ai" = ( -/obj/random/trash, -/turf/simulated/floor/carpet/purcarpet, -/area/submap/oldhotel) "aJ" = ( /obj/item/towel/random, /obj/item/towel/random, @@ -104,11 +100,6 @@ /obj/item/trash/tray, /turf/simulated/floor/wood/virgo3b, /area/submap/oldhotel) -"ja" = ( -/obj/effect/decal/cleanable/dirt, -/obj/random/junk, -/turf/simulated/floor/carpet/purcarpet, -/area/submap/oldhotel) "je" = ( /obj/structure/closet/cabinet, /obj/item/binoculars/spyglass, @@ -342,7 +333,7 @@ /area/submap/oldhotel) "yM" = ( /obj/item/stack/cable_coil, -/turf/simulated/floor/carpet/purcarpet, +/turf/simulated/floor/carpet/sblucarpet/virgo3b, /area/submap/oldhotel) "zs" = ( /obj/effect/decal/cleanable/dirt, @@ -579,9 +570,6 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/old_tile/white/virgo3b, /area/submap/oldhotel) -"SG" = ( -/turf/simulated/floor/carpet/purcarpet, -/area/submap/oldhotel) "SL" = ( /obj/item/material/shard, /obj/item/material/shard, @@ -846,8 +834,8 @@ Vj SZ hQ RM -ai -ja +ES +cZ TU hQ RM @@ -873,7 +861,7 @@ cZ SZ hQ TU -SG +Vj yM Wy ZG