From ecdfa5319f27860d00062b8c4b2a293494fe8b29 Mon Sep 17 00:00:00 2001 From: antlersss Date: Fri, 3 Jul 2026 01:53:58 -0400 Subject: [PATCH 1/3] Layerssss --- code/game/objects/structures/platforms.dm | 10 +- maps/map_files/USS_Runtime/USS_Runtime.dmm | 233 ++++++++++++++++----- 2 files changed, 185 insertions(+), 58 deletions(-) diff --git a/code/game/objects/structures/platforms.dm b/code/game/objects/structures/platforms.dm index abffee7abcfb..12a156762066 100644 --- a/code/game/objects/structures/platforms.dm +++ b/code/game/objects/structures/platforms.dm @@ -164,7 +164,11 @@ . = ..() switch(dir) if (NORTH) - layer = OBJ_LAYER+0.1 + layer = ABOVE_MOB_LAYER+0.1 + if (NORTHEAST) + layer = ABOVE_MOB_LAYER+0.1 + if (NORTHWEST) + layer = ABOVE_MOB_LAYER+0.1 if (SOUTH) layer = ABOVE_MOB_LAYER+0.1 if (SOUTHEAST) @@ -172,9 +176,9 @@ if (SOUTHWEST) layer = ABOVE_MOB_LAYER+0.1 if (EAST) - layer = MOB_LAYER+0.1 + layer = OBJ_LAYER+0.1 if (WEST) - layer = MOB_LAYER+0.1 + layer = OBJ_LAYER+0.1 /obj/structure/platform_decoration/initialize_pass_flags(datum/pass_flags_container/PF) ..() diff --git a/maps/map_files/USS_Runtime/USS_Runtime.dmm b/maps/map_files/USS_Runtime/USS_Runtime.dmm index b960c4834acc..a440a3b72756 100644 --- a/maps/map_files/USS_Runtime/USS_Runtime.dmm +++ b/maps/map_files/USS_Runtime/USS_Runtime.dmm @@ -1,4 +1,127 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"aa" = ( +/obj/structure/platform_decoration/metal/almayer_smooth/west, +/turf/open/floor/almayer/plating, +/area/event) +"ab" = ( +/obj/structure/platform/metal/almayer_smooth/north, +/turf/open/floor/almayer/plating, +/area/event) +"ac" = ( +/obj/structure/platform_decoration/metal/almayer_smooth/west, +/obj/structure/platform_decoration/metal/almayer_smooth/east, +/turf/open/floor/almayer/plating, +/area/event) +"ad" = ( +/obj/structure/platform_decoration/metal/almayer_smooth/east, +/turf/open/floor/almayer/plating, +/area/event) +"ae" = ( +/obj/structure/platform/metal/almayer_smooth/east, +/turf/open/floor/almayer/plating, +/area/event) +"af" = ( +/obj/structure/platform/metal/almayer_smooth/east, +/obj/structure/platform/metal/almayer_smooth/west, +/turf/open/floor/almayer/plating, +/area/event) +"ag" = ( +/obj/structure/platform/metal/almayer_smooth/west, +/turf/open/floor/almayer/plating, +/area/event) +"ah" = ( +/obj/structure/platform/metal/almayer_smooth/east, +/obj/structure/platform/metal/almayer_smooth/west, +/obj/structure/platform/metal/almayer_smooth/north, +/obj/structure/platform_decoration/metal/almayer_smooth/northwest, +/obj/structure/platform_decoration/metal/almayer_smooth/northeast, +/turf/open/floor/almayer/plating, +/area/event) +"ai" = ( +/obj/structure/platform_decoration/metal/almayer_smooth, +/turf/open/floor/almayer/plating, +/area/event) +"aj" = ( +/obj/structure/platform/metal/almayer_smooth, +/turf/open/floor/almayer/plating, +/area/event) +"ak" = ( +/obj/structure/platform_decoration/metal/almayer_smooth/north, +/turf/open/floor/almayer/plating, +/area/event) +"al" = ( +/obj/structure/platform_decoration/metal/almayer_smooth/west, +/turf/open_space, +/area/event/dynamic) +"am" = ( +/obj/structure/platform/metal/almayer_smooth/north, +/turf/open_space, +/area/event/dynamic) +"an" = ( +/obj/structure/platform_decoration/metal/almayer_smooth/east, +/turf/open_space, +/area/event/dynamic) +"ao" = ( +/obj/structure/platform/metal/almayer_smooth/east, +/obj/structure/roof/hybrisa/lattice_prop{ + icon_state = "lattice6" + }, +/turf/open_space, +/area/event/dynamic) +"ap" = ( +/turf/open/floor/almayer/mono, +/area/event/dynamic) +"aq" = ( +/obj/structure/platform/metal/almayer_smooth/west, +/turf/open_space, +/area/event/dynamic) +"ar" = ( +/obj/structure/platform/metal/almayer_smooth/east, +/turf/open_space, +/area/event/dynamic) +"as" = ( +/obj/structure/platform/metal/almayer_smooth, +/obj/structure/platform/metal/almayer_smooth/east, +/obj/structure/platform/metal/almayer_smooth/west, +/obj/structure/platform_decoration/metal/almayer_smooth/southeast, +/obj/structure/platform_decoration/metal/almayer_smooth/southwest, +/turf/open_space, +/area/event/dynamic) +"at" = ( +/obj/structure/platform/metal/almayer_smooth/west, +/obj/structure/platform/metal/almayer_smooth, +/obj/structure/platform/metal/almayer_smooth/north, +/obj/structure/platform_decoration/metal/almayer_smooth/northwest, +/obj/structure/platform_decoration/metal/almayer_smooth/southwest, +/turf/open_space, +/area/event/dynamic) +"au" = ( +/obj/structure/platform_decoration/metal/almayer_smooth/east, +/obj/structure/platform_decoration/metal/almayer_smooth/north, +/turf/open_space, +/area/event/dynamic) +"av" = ( +/obj/structure/platform/metal/almayer_smooth/east, +/obj/structure/platform/metal/almayer_smooth/west, +/turf/open_space, +/area/event/dynamic) +"aw" = ( +/obj/structure/platform_decoration/metal/almayer_smooth, +/turf/open_space, +/area/event/dynamic) +"ax" = ( +/obj/structure/platform/metal/almayer_smooth, +/turf/open_space, +/area/event/dynamic) +"ay" = ( +/obj/structure/platform_decoration/metal/almayer_smooth, +/obj/structure/platform_decoration/metal/almayer_smooth/north, +/turf/open_space, +/area/event/dynamic) +"az" = ( +/obj/structure/platform_decoration/metal/almayer_smooth/north, +/turf/open_space, +/area/event/dynamic) "bk" = ( /obj/structure/surface/table/almayer, /obj/structure/closet/secure_closet/surgical{ @@ -511,11 +634,11 @@ yP AN AN AN -AN -AN -AN -AN -AN +ai +ae +ae +ae +aa AN AN br @@ -530,11 +653,11 @@ SA AN AN AN -AN -AN -AN -AN -AN +aj +FW +FW +FW +ab AN AN br @@ -549,11 +672,11 @@ cI AN AN AN -AN -AN -AN -AN -AN +aj +FW +ah +af +ac AN AN br @@ -568,11 +691,11 @@ AN AN AN AN -AN -AN -AN -AN -AN +aj +FW +FW +FW +ab AN AN br @@ -587,11 +710,11 @@ AN AN AN AN -AN -AN -AN -AN -AN +ak +ag +ag +ag +ad AN AN br @@ -1004,11 +1127,11 @@ iD Ad Ad Ad -Ad -Ad -Ad -Ad -Ad +aw +ao +ar +ao +al Ad Ad SR @@ -1023,11 +1146,11 @@ iD Ad Ad Ad -Ad -Ad -Ad -Ad -Ad +ax +ap +ap +ap +am Ad Ad SR @@ -1042,11 +1165,11 @@ iD Ad Ad Ad -Ad -Ad -Ad -Ad -Ad +ay +av +as +ap +am Ad Ad SR @@ -1061,11 +1184,11 @@ iD Ad Ad Ad -Ad -Ad -Ad -Ad -Ad +ax +ap +ap +ap +am Ad Ad SR @@ -1080,11 +1203,11 @@ iD Ad Ad Ad -Ad -Ad -Ad -Ad -Ad +ax +ap +at +ap +am Ad Ad SR @@ -1099,11 +1222,11 @@ iD Ad Ad Ad -Ad -Ad -Ad -Ad -Ad +az +aq +au +aq +an Ad Ad SR From 1a00d2c52350aa776bddfc70047eb6af61c0fd58 Mon Sep 17 00:00:00 2001 From: antlersss Date: Fri, 3 Jul 2026 02:04:44 -0400 Subject: [PATCH 2/3] maptweak smile --- maps/map_files/USS_Runtime/USS_Runtime.dmm | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/maps/map_files/USS_Runtime/USS_Runtime.dmm b/maps/map_files/USS_Runtime/USS_Runtime.dmm index a440a3b72756..239bac1312ac 100644 --- a/maps/map_files/USS_Runtime/USS_Runtime.dmm +++ b/maps/map_files/USS_Runtime/USS_Runtime.dmm @@ -61,13 +61,6 @@ /obj/structure/platform_decoration/metal/almayer_smooth/east, /turf/open_space, /area/event/dynamic) -"ao" = ( -/obj/structure/platform/metal/almayer_smooth/east, -/obj/structure/roof/hybrisa/lattice_prop{ - icon_state = "lattice6" - }, -/turf/open_space, -/area/event/dynamic) "ap" = ( /turf/open/floor/almayer/mono, /area/event/dynamic) @@ -1112,7 +1105,7 @@ WS WS WS WS -BS +WS BS BS WS @@ -1128,9 +1121,9 @@ Ad Ad Ad aw -ao ar -ao +ar +ar al Ad Ad From 3fa39a28824d7e209e48f9a697fce0eb3a112057 Mon Sep 17 00:00:00 2001 From: antlersss Date: Fri, 3 Jul 2026 02:05:19 -0400 Subject: [PATCH 3/3] Fixup maps in TGM format 6fcc629167ea: maps/map_files/USS_Runtime/USS_Runtime.dmm Automatically commited by: tools\mapmerge2\fixup.py --- maps/map_files/USS_Runtime/USS_Runtime.dmm | 48 +++++++++++----------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/maps/map_files/USS_Runtime/USS_Runtime.dmm b/maps/map_files/USS_Runtime/USS_Runtime.dmm index 239bac1312ac..6dc27f155b95 100644 --- a/maps/map_files/USS_Runtime/USS_Runtime.dmm +++ b/maps/map_files/USS_Runtime/USS_Runtime.dmm @@ -61,6 +61,10 @@ /obj/structure/platform_decoration/metal/almayer_smooth/east, /turf/open_space, /area/event/dynamic) +"ao" = ( +/obj/structure/platform/metal/almayer_smooth/east, +/turf/open_space, +/area/event/dynamic) "ap" = ( /turf/open/floor/almayer/mono, /area/event/dynamic) @@ -69,10 +73,6 @@ /turf/open_space, /area/event/dynamic) "ar" = ( -/obj/structure/platform/metal/almayer_smooth/east, -/turf/open_space, -/area/event/dynamic) -"as" = ( /obj/structure/platform/metal/almayer_smooth, /obj/structure/platform/metal/almayer_smooth/east, /obj/structure/platform/metal/almayer_smooth/west, @@ -80,7 +80,7 @@ /obj/structure/platform_decoration/metal/almayer_smooth/southwest, /turf/open_space, /area/event/dynamic) -"at" = ( +"as" = ( /obj/structure/platform/metal/almayer_smooth/west, /obj/structure/platform/metal/almayer_smooth, /obj/structure/platform/metal/almayer_smooth/north, @@ -88,30 +88,30 @@ /obj/structure/platform_decoration/metal/almayer_smooth/southwest, /turf/open_space, /area/event/dynamic) -"au" = ( +"at" = ( /obj/structure/platform_decoration/metal/almayer_smooth/east, /obj/structure/platform_decoration/metal/almayer_smooth/north, /turf/open_space, /area/event/dynamic) -"av" = ( +"au" = ( /obj/structure/platform/metal/almayer_smooth/east, /obj/structure/platform/metal/almayer_smooth/west, /turf/open_space, /area/event/dynamic) -"aw" = ( +"av" = ( /obj/structure/platform_decoration/metal/almayer_smooth, /turf/open_space, /area/event/dynamic) -"ax" = ( +"aw" = ( /obj/structure/platform/metal/almayer_smooth, /turf/open_space, /area/event/dynamic) -"ay" = ( +"ax" = ( /obj/structure/platform_decoration/metal/almayer_smooth, /obj/structure/platform_decoration/metal/almayer_smooth/north, /turf/open_space, /area/event/dynamic) -"az" = ( +"ay" = ( /obj/structure/platform_decoration/metal/almayer_smooth/north, /turf/open_space, /area/event/dynamic) @@ -1120,10 +1120,10 @@ iD Ad Ad Ad -aw -ar -ar -ar +av +ao +ao +ao al Ad Ad @@ -1139,7 +1139,7 @@ iD Ad Ad Ad -ax +aw ap ap ap @@ -1158,9 +1158,9 @@ iD Ad Ad Ad -ay -av -as +ax +au +ar ap am Ad @@ -1177,7 +1177,7 @@ iD Ad Ad Ad -ax +aw ap ap ap @@ -1196,9 +1196,9 @@ iD Ad Ad Ad -ax +aw ap -at +as ap am Ad @@ -1215,9 +1215,9 @@ iD Ad Ad Ad -az +ay aq -au +at aq an Ad