TGS Test Merge (#13515)

_maps/shuttles/minidropship_combat_tad.dmm

@@ -0,0 +1,144 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/obj/structure/barricade/plasteel{
+	dir = 8
+	},
+/obj/structure/barricade/plasteel,
+/turf/open/floor/mainship/mono,
+/area/shuttle/minidropship)
+"b" = (
+/obj/structure/barricade/plasteel{
+	dir = 4
+	},
+/turf/open/floor/mainship/mono,
+/area/shuttle/minidropship)
+"c" = (
+/obj/docking_port/mobile/marine_dropship/minidropship,
+/obj/structure/bed/chair/dropship/pilot{
+	dir = 1
+	},
+/turf/open/floor/plating/plating_catwalk,
+/area/shuttle/minidropship)
+"f" = (
+/obj/structure/barricade/plasteel{
+	dir = 8
+	},
+/obj/machinery/light{
+	dir = 1
+	},
+/turf/open/floor/mainship/mono,
+/area/shuttle/minidropship)
+"h" = (
+/obj/machinery/computer/camera_advanced/shuttle_docker/minidropship,
+/obj/machinery/camera/autoname/mainship,
+/turf/open/floor/mainship/mono,
+/area/shuttle/minidropship)
+"k" = (
+/obj/structure/barricade/plasteel{
+	dir = 8
+	},
+/obj/structure/barricade/plasteel{
+	dir = 1
+	},
+/turf/open/floor/mainship/mono,
+/area/shuttle/minidropship)
+"m" = (
+/obj/structure/barricade/plasteel{
+	dir = 8
+	},
+/turf/open/floor/mainship/mono,
+/area/shuttle/minidropship)
+"n" = (
+/obj/structure/barricade/plasteel{
+	dir = 4
+	},
+/obj/structure/barricade/plasteel{
+	dir = 1
+	},
+/turf/open/floor/mainship/mono,
+/area/shuttle/minidropship)
+"s" = (
+/obj/machinery/light,
+/turf/open/floor/plating/plating_catwalk,
+/area/shuttle/minidropship)
+"u" = (
+/obj/machinery/light,
+/obj/machinery/telecomms/relay/preset/telecomms/onboard/nondense,
+/turf/open/floor/plating/plating_catwalk,
+/area/shuttle/minidropship)
+"v" = (
+/obj/structure/barricade/plasteel{
+	dir = 4
+	},
+/turf/open/floor/plating/plating_catwalk,
+/area/shuttle/minidropship)
+"y" = (
+/obj/structure/barricade/plasteel{
+	dir = 8
+	},
+/turf/open/floor/plating/plating_catwalk,
+/area/shuttle/minidropship)
+"A" = (
+/obj/structure/barricade/plasteel,
+/turf/open/floor/plating/plating_catwalk,
+/area/shuttle/minidropship)
+"P" = (
+/obj/structure/barricade/plasteel{
+	dir = 1
+	},
+/turf/open/floor/plating/plating_catwalk,
+/area/shuttle/minidropship)
+"W" = (
+/obj/structure/barricade/plasteel,
+/obj/structure/barricade/plasteel{
+	dir = 4
+	},
+/turf/open/floor/mainship/mono,
+/area/shuttle/minidropship)
+"X" = (
+/obj/effect/attach_point/crew_weapon/minidropship,
+/turf/open/floor/mainship/mono,
+/area/shuttle/minidropship)
+"Y" = (
+/obj/structure/barricade/plasteel{
+	dir = 4
+	},
+/obj/machinery/light{
+	dir = 1
+	},
+/turf/open/floor/mainship/mono,
+/area/shuttle/minidropship)
+
+(1,1,1) = {"
+k
+y
+f
+y
+m
+y
+m
+y
+a
+"}
+(2,1,1) = {"
+P
+X
+s
+h
+c
+X
+u
+X
+A
+"}
+(3,1,1) = {"
+n
+v
+Y
+v
+b
+v
+b
+v
+W
+"}

_maps/shuttles/minidropship_food.dmm

@@ -1,13 +1,16 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
 "a" = (
-/obj/machinery/griddle,
 /obj/item/reagent_containers/glass/rag,
 /obj/effect/spawner/random/food_or_drink/kitchenknife,
+/obj/machinery/grill,
 /turf/open/floor/iron/white/textured,
 /area/shuttle/minidropship)
 "c" = (
 /obj/machinery/computer/camera_advanced/shuttle_docker/minidropship,
 /obj/machinery/camera/autoname/mainship,
+/obj/structure/barricade/metal{
+	dir = 1
+	},
 /turf/open/floor/iron/white/textured_half,
 /area/shuttle/minidropship)
 "d" = (
@@ -35,18 +38,24 @@
 "f" = (
 /turf/closed/wall/mainship/outer/canterbury,
 /area/shuttle/minidropship)
+"g" = (
+/obj/structure/barricade/metal{
+	dir = 4
+	},
+/turf/open/floor/iron/white/textured_half{
+	dir = 8
+	},
+/area/shuttle/minidropship)
 "l" = (
 /obj/machinery/door/poddoor/mainship/open{
 	id = "minidropship_podlock"
 	},
 /obj/machinery/door/poddoor/shutters/transit/nonsmoothing,
 /obj/structure/table/reinforced,
-/turf/open/floor/mainship/white{
-	dir = 8
+/obj/structure/barricade/metal{
+	dir = 4
 	},
-/area/shuttle/minidropship)
-"m" = (
-/turf/open/floor/iron/white/textured_half{
+/turf/open/floor/mainship/white{
 	dir = 8
 	},
 /area/shuttle/minidropship)
@@ -63,6 +72,9 @@
 /obj/machinery/door/poddoor/shutters/transit/nonsmoothing,
 /obj/structure/table/reinforced,
 /obj/item/book/manual/chef_recipes,
+/obj/structure/barricade/metal{
+	dir = 8
+	},
 /turf/open/floor/mainship/white{
 	dir = 4
 	},
@@ -72,6 +84,9 @@
 /turf/open/floor/iron/white/textured_half,
 /area/shuttle/minidropship)
 "q" = (
+/obj/structure/barricade/plasteel{
+	dir = 4
+	},
 /turf/open/floor/iron/white/textured_corner{
 	dir = 1
 	},
@@ -92,6 +107,9 @@
 /obj/machinery/vending/nanomed/tadpolemed{
 	dir = 4
 	},
+/obj/structure/barricade/metal{
+	dir = 1
+	},
 /turf/open/floor/iron/white/textured_corner,
 /area/shuttle/minidropship)
 "x" = (
@@ -125,6 +143,9 @@
 /obj/machinery/door/poddoor/shutters/transit/nonsmoothing,
 /obj/structure/table/reinforced,
 /obj/machinery/microwave,
+/obj/structure/barricade/metal{
+	dir = 8
+	},
 /turf/open/floor/mainship/white{
 	dir = 4
 	},
@@ -152,6 +173,9 @@
 /turf/open/floor/iron/white/textured,
 /area/shuttle/minidropship)
 "E" = (
+/obj/structure/barricade/plasteel{
+	dir = 8
+	},
 /turf/open/floor/iron/white/textured_corner{
 	dir = 4
 	},
@@ -189,6 +213,9 @@
 /obj/structure/extinguisher_cabinet{
 	dir = 8
 	},
+/obj/structure/barricade/metal{
+	dir = 1
+	},
 /turf/open/floor/iron/white/textured_corner{
 	dir = 8
 	},
@@ -202,6 +229,9 @@
 /obj/machinery/reagentgrinder{
 	pixel_y = 5
 	},
+/obj/structure/barricade/metal{
+	dir = 4
+	},
 /turf/open/floor/mainship/white{
 	dir = 8
 	},
@@ -223,6 +253,14 @@
 /obj/machinery/telecomms/relay/preset/telecomms/onboard,
 /turf/template_noop,
 /area/shuttle/minidropship)
+"U" = (
+/obj/structure/barricade/metal{
+	dir = 8
+	},
+/turf/open/floor/iron/white/textured_half{
+	dir = 8
+	},
+/area/shuttle/minidropship)
 "V" = (
 /obj/structure/dropship_piece/tadpole/engine{
 	dir = 1;
@@ -235,6 +273,9 @@
 	},
 /obj/machinery/door/poddoor/shutters/transit/nonsmoothing,
 /obj/structure/table/reinforced,
+/obj/structure/barricade/metal{
+	dir = 4
+	},
 /turf/open/floor/mainship/white{
 	dir = 8
 	},
@@ -245,6 +286,9 @@
 	},
 /obj/machinery/door/poddoor/shutters/transit/nonsmoothing,
 /obj/structure/table/reinforced,
+/obj/structure/barricade/metal{
+	dir = 8
+	},
 /turf/open/floor/mainship/white{
 	dir = 4
 	},
@@ -300,8 +344,8 @@ J
 x
 v
 P
-m
-m
+U
+U
 E
 s
 "}
@@ -322,8 +366,8 @@ J
 x
 L
 d
-m
-m
+g
+g
 q
 y
 "}