Frontiersman Distillery Ruin

_maps/map_catalogue.txt

@@ -121,6 +121,26 @@ Find the key for using this catalogue in "map_catalogue_key.txt"
 		Size = (x = 42)(y = 41)(z = 1)
 		Tags = "Boss Combat Challenge", "Major Loot", Shelter", "Antag Gear", "Hazardous"
 
+		File Name = "_maps\RandomRuins\RockRuins\rockplanet_heirophant.dmm"
+		Size = (x = 23)(y = 23)(z = 1)
+		Tags = "Boss Combat Challenge", "Minor Loot", "Megafauna", "Inhospitable"
+
+		File Name = "_maps\RandomRuins\RockRuins\rockplanet_house.dmm"
+		Size = (x = 8)(y = 7)(z = 1)
+		Tags = "No Combat", "Medium Loot", "Shelter"
+
+		File Name = "_maps\RandomRuins\RockRuins\rockplanet_miningexpedition.dmm"
+		Size = (x = 30)(y = 22)(z = 1)
+		Tags = "Medium Combat Challenge", "Medium Loot", "Shelter"
+
+		File Name = "_maps\RandomRuins\RockRuins\rockplanet_pioneer.dmm"
+		Size = (x = 10)(y = 3)(z = 1)
+		Tags = "No Combat", "Minor Loot", "Inhospitable"
+
+		File Name = "_maps\RandomRuins\RockRuins\rockplanet_saloon.dmm"
+		Size = (x = 30)(y = 20)(z = 1)
+		Tags = "Medium combat Challenge", "Medium Loot", "Inhospitable"
+
 		File Name = "_maps\RandomRuins\RockRuins\rockplanet_shippingdock.dmm"
 		Size = (x = 85)(y = 73)(z = 1)
 		Tags = "Medium Combat Challenge", "Medium Loot", "Hazardous", "Shelter"
@@ -129,6 +149,10 @@ Find the key for using this catalogue in "map_catalogue_key.txt"
 		Size = (x = 58)(y = 48)(z = 1)
 		Tags = "Medium Combat Challenge", "Medium Loot", "Hazardous", "Hospitable"
 
+		File Name = "_maps\RandomRuins\RockRuins\rockplanet_distillery.dmm"
+		Size = (x = 44)(y = 45)(z = 1)
+		Tags = "Medium Combat Challenge", "Major Loot", "Hazardous", "Hospitable"
+
 
 	SandRuins:
 		File Name = "_maps\RandomRuins\Ruins\whitesands_surface_camp_saloon.dmm"

_maps/shuttles/subshuttles/Subshuttle Catalog.txt

@@ -13,6 +13,11 @@ Size = "12x7"
 Purpose = "A multi-role dropship used by almost every group faring space. Its ease of manufacture and high mobility makes it ideal for transport."
 File Path = "_maps\shuttles\subshuttles\indepenent_kunai.dmm"
 
+Name = "Tanto-class Drop Pod"
+Size = "6x5"
+Purpose = "A combat-ready drop pod designed for quick deployment in hectic battles. Its lack of holofields makes it unsuitable for environments without sufficient atmosphere, unless depressurised beforehand."
+File Path = "_maps\shuttles\subshuttles\indepenent_kunai.dmm"
+
 Name = "Haste-class Patient Recovery Ship"
 Size = "6x4"
 Purpose = "A small, nimble ship utilized as an ambulance by Inteq forces."

_maps/shuttles/subshuttles/independent_tanto.dmm

@@ -0,0 +1,333 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/turf/template_noop,
+/area/template_noop)
+"e" = (
+/obj/effect/turf_decal/siding/white,
+/obj/effect/turf_decal/siding/white{
+	dir = 1
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/effect/landmark/ert_shuttle_spawn,
+/turf/open/floor/pod,
+/area/ship/storage)
+"f" = (
+/obj/effect/turf_decal/industrial/traffic{
+	dir = 4
+	},
+/obj/effect/turf_decal/industrial/traffic{
+	dir = 8
+	},
+/obj/machinery/door/poddoor{
+	dir = 4;
+	id = "pod_aft"
+	},
+/obj/structure/cable{
+	icon_state = "0-4"
+	},
+/obj/docking_port/mobile{
+	dir = 4;
+	name = "tanto pod";
+	port_direction = 2;
+	preferred_direction = 4
+	},
+/turf/open/floor/engine/hull/reinforced/interior,
+/area/ship/storage)
+"l" = (
+/obj/structure/chair/comfy/shuttle{
+	dir = 4;
+	layer = 3.3
+	},
+/obj/effect/turf_decal/techfloor{
+	dir = 1
+	},
+/obj/effect/turf_decal/industrial/traffic,
+/obj/machinery/button/door{
+	dir = 4;
+	pixel_y = -6;
+	pixel_x = -22;
+	name = "Aft Door";
+	id = "pod_aft"
+	},
+/obj/machinery/button/door{
+	dir = 4;
+	pixel_x = -32;
+	name = "Window Shutters";
+	id = "pod_window"
+	},
+/obj/machinery/door/window/brigdoor/northleft,
+/obj/machinery/button/door{
+	dir = 4;
+	pixel_y = 6;
+	pixel_x = -22;
+	name = "Fore Door";
+	id = "pod_fore"
+	},
+/obj/effect/landmark/ert_shuttle_spawn,
+/turf/open/floor/plasteel/patterned/brushed,
+/area/ship/storage)
+"n" = (
+/obj/effect/turf_decal/siding/white,
+/obj/effect/turf_decal/siding/white{
+	dir = 1
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/power/apc/auto_name/directional/north,
+/obj/structure/cable{
+	icon_state = "0-8"
+	},
+/obj/item/radio/intercom/directional/south,
+/obj/effect/landmark/ert_shuttle_brief_spawn,
+/turf/open/floor/pod,
+/area/ship/storage)
+"p" = (
+/obj/structure/grille,
+/obj/structure/window/reinforced,
+/obj/structure/cable/yellow,
+/obj/machinery/door/poddoor/shutters/preopen{
+	id = "pod_window"
+	},
+/obj/machinery/power/terminal{
+	dir = 8
+	},
+/turf/open/floor/engine/hull/reinforced,
+/area/ship/storage)
+"s" = (
+/obj/effect/turf_decal/siding/white,
+/obj/effect/turf_decal/siding/white{
+	dir = 1
+	},
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/open/floor/pod,
+/area/ship/storage)
+"w" = (
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/ship/storage)
+"x" = (
+/obj/effect/turf_decal/industrial/traffic{
+	dir = 1
+	},
+/obj/structure/railing{
+	dir = 8
+	},
+/obj/structure/cable,
+/obj/structure/cable/yellow{
+	icon_state = "0-4"
+	},
+/obj/effect/turf_decal/techfloor,
+/obj/machinery/power/port_gen/pacman,
+/obj/item/stack/sheet/mineral/plasma/twenty,
+/obj/item/stack/sheet/mineral/plasma/five,
+/obj/item/stack/sheet/mineral/plasma/five,
+/obj/item/wrench,
+/obj/machinery/door/window/brigdoor/southleft,
+/obj/structure/closet/wall/red/directional/west{
+	secure = 1;
+	locked = 1
+	},
+/obj/item/pickaxe/mini,
+/obj/item/flashlight/flare{
+	pixel_y = 3
+	},
+/obj/item/flashlight/flare,
+/obj/item/flashlight/flare{
+	pixel_y = -3
+	},
+/obj/item/storage/toolbox/emergency/shuttle/electric,
+/obj/item/tank/internals/emergency_oxygen/double,
+/obj/item/clothing/mask/gas,
+/obj/item/tank/internals/emergency_oxygen/double,
+/obj/item/clothing/mask/gas,
+/obj/item/tank/internals/emergency_oxygen/double,
+/obj/item/clothing/mask/gas,
+/turf/open/floor/plasteel/patterned/brushed,
+/area/ship/storage)
+"z" = (
+/obj/structure/window/reinforced{
+	dir = 1
+	},
+/obj/machinery/computer/helm{
+	dir = 8;
+	layer = 3.3
+	},
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/obj/effect/turf_decal/techfloor{
+	dir = 1
+	},
+/obj/effect/turf_decal/industrial/traffic,
+/turf/open/floor/plasteel/patterned/brushed,
+/area/ship/storage)
+"C" = (
+/obj/structure/window/reinforced{
+	dir = 8
+	},
+/obj/structure/window/reinforced{
+	dir = 1
+	},
+/obj/machinery/power/smes/shuttle/micro/precharged{
+	dir = 4
+	},
+/obj/machinery/door/poddoor/shutters/preopen{
+	id = "pod_window"
+	},
+/obj/structure/cable/yellow{
+	icon_state = "0-8"
+	},
+/turf/open/floor/engine/hull/reinforced,
+/area/ship/storage)
+"E" = (
+/obj/structure/grille,
+/obj/structure/window/reinforced{
+	dir = 1
+	},
+/obj/structure/cable/yellow{
+	icon_state = "0-2"
+	},
+/obj/machinery/door/poddoor/shutters/preopen{
+	id = "pod_window"
+	},
+/obj/machinery/power/terminal{
+	dir = 8
+	},
+/turf/open/floor/engine/hull/reinforced,
+/area/ship/storage)
+"J" = (
+/obj/structure/window/reinforced,
+/obj/structure/chair/comfy/shuttle{
+	dir = 1
+	},
+/obj/effect/turf_decal/industrial/traffic{
+	dir = 1
+	},
+/obj/structure/railing{
+	dir = 4
+	},
+/obj/structure/cable/yellow{
+	icon_state = "2-8"
+	},
+/obj/structure/cable/yellow{
+	icon_state = "1-8"
+	},
+/obj/machinery/light/small/directional/east{
+	pixel_y = -6
+	},
+/obj/machinery/light_switch{
+	dir = 8
+	},
+/obj/effect/turf_decal/techfloor,
+/obj/machinery/light_switch{
+	pixel_x = 22;
+	pixel_y = 5;
+	dir = 8
+	},
+/obj/effect/landmark/ert_shuttle_spawn,
+/turf/open/floor/plasteel/patterned/brushed,
+/area/ship/storage)
+"K" = (
+/obj/effect/turf_decal/siding/white,
+/obj/effect/turf_decal/siding/white{
+	dir = 1
+	},
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
+/obj/structure/cable{
+	icon_state = "2-4"
+	},
+/turf/open/floor/pod,
+/area/ship/storage)
+"L" = (
+/obj/effect/turf_decal/industrial/traffic{
+	dir = 4
+	},
+/obj/effect/turf_decal/industrial/traffic{
+	dir = 8
+	},
+/obj/machinery/door/poddoor{
+	dir = 4;
+	id = "pod_fore"
+	},
+/obj/structure/cable{
+	icon_state = "0-8"
+	},
+/turf/open/floor/engine/hull/reinforced/interior,
+/area/ship/storage)
+"S" = (
+/obj/structure/window/reinforced,
+/obj/structure/window/reinforced{
+	dir = 8
+	},
+/obj/machinery/power/smes/shuttle/micro/precharged{
+	dir = 4
+	},
+/obj/machinery/door/poddoor/shutters/preopen{
+	id = "pod_window"
+	},
+/obj/structure/cable/yellow{
+	icon_state = "0-8"
+	},
+/turf/open/floor/engine/hull/reinforced,
+/area/ship/storage)
+"Y" = (
+/obj/machinery/power/shuttle/engine/electric{
+	dir = 4
+	},
+/obj/structure/cable/yellow{
+	icon_state = "0-4"
+	},
+/turf/open/floor/engine/hull/reinforced,
+/area/ship/storage)
+
+(1,1,1) = {"
+a
+w
+f
+w
+a
+"}
+(2,1,1) = {"
+Y
+w
+e
+w
+Y
+"}
+(3,1,1) = {"
+C
+l
+K
+x
+S
+"}
+(4,1,1) = {"
+E
+z
+s
+J
+p
+"}
+(5,1,1) = {"
+w
+w
+n
+w
+w
+"}
+(6,1,1) = {"
+a
+w
+L
+w
+a
+"}

code/datums/ruins/rockplanet.dm

@@ -29,3 +29,8 @@
 	id = "rockplanet_nomadcrash"
 	suffix = "rockplanet_nomadcrash.dmm"
 
+/datum/map_template/ruin/rockplanet/distillery
+	name = "Frontiersman Distillery"
+	description = "A former pre-ICW era Nanotrasen outpost converted into a moonshine distillery by Frontiersman bootleggers."
+	id = "rockplanet_distillery"
+	suffix = "rockplanet_distillery.dmm"