Merge branch 'master' into outfit-sorting

shiptest-ss13 · Jan 5, 2024 · 6a46008 · 6a46008
2 parents 80f610d + 47372e8
commit 6a46008
Show file tree

Hide file tree

Showing 74 changed files with 43,076 additions and 268 deletions.
diff --git a/_maps/outpost/elevator_ice.dmm b/_maps/outpost/elevator_ice.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/light/small/directional/east{
+	pixel_y = 6
+	},
+/turf/template_noop,
+/area/template_noop)
+"e" = (
+/obj/structure/elevator_platform,
+/obj/machinery/light/small/directional/east{
+	pixel_y = -6
+	},
+/obj/machinery/elevator_floor_button{
+	pixel_y = 10;
+	dir = 8;
+	pixel_x = 24
+	},
+/turf/template_noop,
+/area/template_noop)
+"A" = (
+/obj/structure/elevator_platform,
+/turf/template_noop,
+/area/template_noop)
+"S" = (
+/obj/structure/elevator_platform,
+/obj/machinery/status_display/elevator{
+	pixel_x = 32
+	},
+/turf/template_noop,
+/area/template_noop)
+
+(1,1,1) = {"
+A
+A
+A
+"}
+(2,1,1) = {"
+A
+A
+A
+"}
+(3,1,1) = {"
+a
+S
+e
+"}