Merge remote-tracking branch 'upstream/master' into ert

shiptest-ss13 · Nov 16, 2023 · 63a7cec · 63a7cec
2 parents f73483c + 043007c
commit 63a7cec
Show file tree

Hide file tree

Showing 8 changed files with 9,281 additions and 6,897 deletions.
diff --git a/_maps/outpost/elevator_indie.dmm b/_maps/outpost/elevator_indie.dmm
@@ -0,0 +1,47 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/obj/structure/elevator_platform,
+/obj/machinery/status_display/elevator{
+	pixel_x = -32
+	},
+/turf/template_noop,
+/area/template_noop)
+"e" = (
+/obj/structure/elevator_platform,
+/obj/machinery/light/small/directional/east,
+/turf/template_noop,
+/area/template_noop)
+"k" = (
+/obj/structure/elevator_platform,
+/obj/machinery/light/small/directional/west,
+/turf/template_noop,
+/area/template_noop)
+"A" = (
+/obj/structure/elevator_platform,
+/turf/template_noop,
+/area/template_noop)
+"S" = (
+/obj/structure/elevator_platform,
+/obj/machinery/elevator_floor_button{
+	pixel_y = 0;
+	dir = 8;
+	pixel_x = 24
+	},
+/turf/template_noop,
+/area/template_noop)
+
+(1,1,1) = {"
+k
+a
+k
+"}
+(2,1,1) = {"
+A
+A
+A
+"}
+(3,1,1) = {"
+e
+S
+e
+"}