Merge pull request #5150 from Novacat/nova-heterochromia

POI Generation Fixes/Updates
2025-12-10 02:09:41 +00:00 · 2019-04-28 22:56:10 -04:00
parent 30a6e8c2db a1bb30ddf8
commit fe4185735b
20 changed files with 21794 additions and 9910 deletions
--- a/maps/tether/submaps/_tether_submaps.dm
+++ b/maps/tether/submaps/_tether_submaps.dm
@@ -92,8 +92,8 @@

 /datum/map_template/tether_lateload/away_beach_cave/on_map_loaded(z)
 	. = ..()
-	seed_submaps(list(Z_LEVEL_BEACH_CAVE), 60, /area/tether_away/cave/unexplored/normal, /datum/map_template/surface/mountains/normal)
-	seed_submaps(list(Z_LEVEL_BEACH_CAVE), 60, /area/tether_away/cave/unexplored/normal, /datum/map_template/surface/mountains/deep)
+	seed_submaps(list(Z_LEVEL_BEACH_CAVE), 70, /area/tether_away/cave/unexplored/normal, /datum/map_template/surface/mountains/normal)
+	seed_submaps(list(Z_LEVEL_BEACH_CAVE), 70, /area/tether_away/cave/unexplored/normal, /datum/map_template/surface/mountains/deep)

 	// Now for the tunnels.
 	new /datum/random_map/automata/cave_system/no_cracks(null, 3, 3, Z_LEVEL_BEACH_CAVE, world.maxx - 4, world.maxy - 4)
@@ -138,7 +138,7 @@

 /datum/map_template/tether_lateload/away_aerostat_surface/on_map_loaded(z)
 	. = ..()
-	seed_submaps(list(Z_LEVEL_AEROSTAT_SURFACE), 70, /area/tether_away/aerostat/surface/unexplored, /datum/map_template/virgo2)
+	seed_submaps(list(Z_LEVEL_AEROSTAT_SURFACE), 120, /area/tether_away/aerostat/surface/unexplored, /datum/map_template/virgo2)
 	new /datum/random_map/automata/cave_system/no_cracks(null, 3, 3, Z_LEVEL_AEROSTAT_SURFACE, world.maxx - 4, world.maxy - 4)
 	new /datum/random_map/noise/ore/virgo2(null, 1, 1, Z_LEVEL_AEROSTAT_SURFACE, 64, 64)

--- a/maps/tether/submaps/aerostat/submaps/Blackshuttledown.dmm
+++ b/maps/tether/submaps/aerostat/submaps/Blackshuttledown.dmm
@@ -241,14 +241,6 @@
 /obj/item/weapon/material/knife,
 /turf/simulated/floor/tiled/steel,
 /area/submap/virgo2/Blackshuttledown)
-"aT" = (
-/mob/living/simple_mob/humanoid/merc/ranged{
-	name = "Unknown Individual";
-	desc = "Dosen't look friendly in the slightest.";
-	say_list_type = /datum/say_list/merc/unknown_ind
-	},
-/turf/simulated/floor/tiled/steel,
-/area/submap/virgo2/Blackshuttledown)
 "aU" = (
 /obj/structure/table/steel,
 /obj/random/toolbox,
@@ -795,7 +787,7 @@ aq
 aq
 aq
 aq
-aT
+aD
 bk
 aF
 aj
--- a/maps/tether/submaps/aerostat/submaps/CaveS.dmm
+++ b/maps/tether/submaps/aerostat/submaps/CaveS.dmm
@@ -84,6 +84,7 @@
 /area/submap/virgo2/CaveS)
 "x" = (
 /obj/structure/table/woodentable,
+/obj/item/device/survivalcapsule,
 /turf/simulated/floor,
 /area/submap/virgo2/CaveS)
 "y" = (
@@ -107,6 +108,7 @@
 /obj/item/weapon/reagent_containers/pill/antitox,
 /obj/item/weapon/reagent_containers/pill/paracetamol,
 /obj/random/firstaid,
+/obj/item/weapon/storage/firstaid/combat,
 /turf/simulated/floor,
 /area/submap/virgo2/CaveS)
 "B" = (
--- a/maps/tether/submaps/aerostat/submaps/DJOutpost1.dmm
+++ b/maps/tether/submaps/aerostat/submaps/DJOutpost1.dmm
@@ -0,0 +1,580 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/turf/template_noop,
+/area/template_noop)
+"b" = (
+/turf/simulated/wall/virgo2,
+/area/submap/DJOutpost1)
+"c" = (
+/obj/structure/grille/broken,
+/obj/item/weapon/material/shard,
+/obj/item/weapon/material/shard{
+	 icon_state = "shardmedium"
+	},
+/obj/item/stack/rods,
+/turf/simulated/floor,
+/area/submap/DJOutpost1)
+"d" = (
+/obj/structure/grille,
+/obj/structure/window/reinforced/full,
+/turf/simulated/floor,
+/area/submap/DJOutpost1)
+"e" = (
+/turf/simulated/floor/wood,
+/area/submap/DJOutpost1)
+"f" = (
+/obj/machinery/telecomms/relay/preset/ruskie,
+/turf/simulated/floor/wood,
+/area/submap/DJOutpost1)
+"g" = (
+/obj/structure/loot_pile/maint/technical,
+/turf/simulated/floor/wood,
+/area/submap/DJOutpost1)
+"h" = (
+/obj/structure/sign/goldenplaque{
+	desc = "An award given to Sif Free Radio for media excellency. It looks fake.";
+	name = "Best Radio Station 2558";
+	pixel_y = 30
+	},
+/turf/simulated/floor/wood,
+/area/submap/DJOutpost1)
+"i" = (
+/mob/living/simple_mob/animal/giant_spider/frost,
+/turf/simulated/floor/wood,
+/area/submap/DJOutpost1)
+"j" = (
+/obj/effect/decal/remains,
+/obj/effect/decal/cleanable/blood,
+/obj/item/clothing/under/frontier,
+/obj/item/weapon/material/knife/tacknife/combatknife,
+/obj/random_multi/single_item/sfr_headset,
+/turf/simulated/floor/wood,
+/area/submap/DJOutpost1)
+"k" = (
+/obj/machinery/door/airlock/glass,
+/turf/simulated/floor/wood,
+/area/submap/DJOutpost1)
+"l" = (
+/obj/structure/table/steel_reinforced,
+/obj/item/device/radio/intercom{
+	 icon_state = "intercom";
+	dir = 8
+	},
+/turf/simulated/floor/wood,
+/area/submap/DJOutpost1)
+"m" = (
+/obj/machinery/computer/message_monitor,
+/obj/item/weapon/paper/monitorkey,
+/obj/structure/cable/yellow{
+	d1 = 2;
+	d2 = 4;
+	icon_state = "2-4"
+	},
+/turf/simulated/floor/wood,
+/area/submap/DJOutpost1)
+"n" = (
+/obj/structure/grille,
+/obj/structure/window/reinforced/full,
+/obj/structure/cable{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8";
+	pixel_x = 0
+	},
+/turf/simulated/floor,
+/area/submap/DJOutpost1)
+"o" = (
+/obj/effect/overlay/snow/floor,
+/obj/structure/cable/yellow{
+	d1 = 2;
+	d2 = 8;
+	icon_state = "2-8"
+	},
+/turf/simulated/floor{
+	outdoors = 1
+	},
+/area/submap/DJOutpost1)
+"p" = (
+/obj/structure/bed/chair/wood,
+/turf/simulated/floor/wood,
+/area/submap/DJOutpost1)
+"q" = (
+/obj/effect/decal/remains,
+/obj/item/clothing/under/dress/blacktango,
+/obj/effect/decal/cleanable/blood,
+/obj/item/device/universal_translator/ear,
+/turf/simulated/floor/wood,
+/area/submap/DJOutpost1)
+"r" = (
+/obj/random/mob/spider/mutant,
+/turf/simulated/floor/wood,
+/area/submap/DJOutpost1)
+"s" = (
+/obj/structure/bed/chair/office/dark{
+	 icon_state = "officechair_dark";
+	dir = 8
+	},
+/turf/simulated/floor/wood,
+/area/submap/DJOutpost1)
+"t" = (
+/obj/machinery/light{
+	dir = 4;
+	icon_state = "tube1";
+	pixel_x = 0
+	},
+/obj/structure/bed/chair/office/dark{
+	dir = 1
+	},
+/obj/structure/cable/yellow{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
+/turf/simulated/floor/wood,
+/area/submap/DJOutpost1)
+"u" = (
+/obj/effect/overlay/snow/floor,
+/obj/structure/cable/yellow{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
+/obj/structure/closet/crate,
+/obj/item/stack/material/phoron{
+	amount = 25
+	},
+/turf/simulated/floor{
+	outdoors = 1
+	},
+/area/submap/DJOutpost1)
+"v" = (
+/obj/structure/table/woodentable,
+/obj/item/trash/candle,
+/turf/simulated/floor/wood,
+/area/submap/DJOutpost1)
+"w" = (
+/obj/structure/bed/chair/wood{
+	 icon_state = "wooden_chair";
+	dir = 8
+	},
+/turf/simulated/floor/wood,
+/area/submap/DJOutpost1)
+"x" = (
+/obj/structure/bookcase,
+/obj/item/weapon/book/codex/lore/vir,
+/obj/item/weapon/book/manual/excavation,
+/obj/item/weapon/book/manual/engineering_construction,
+/obj/item/weapon/storage/bible,
+/turf/simulated/floor/wood,
+/area/submap/DJOutpost1)
+"y" = (
+/obj/item/weapon/storage/toolbox/mechanical,
+/turf/simulated/floor/wood,
+/area/submap/DJOutpost1)
+"z" = (
+/obj/structure/table/steel_reinforced,
+/obj/item/device/radio/phone,
+/obj/random_multi/single_item/sfr_headset,
+/turf/simulated/floor/wood,
+/area/submap/DJOutpost1)
+"A" = (
+/obj/structure/table/steel_reinforced,
+/obj/item/device/radio/intercom/syndicate{
+	desc = "Talk through this.";
+	name = "station intercom (General)"
+	},
+/obj/item/device/multitool,
+/turf/simulated/floor/wood,
+/area/submap/DJOutpost1)
+"B" = (
+/obj/structure/table/steel_reinforced,
+/obj/item/device/radio,
+/obj/machinery/power/apc{
+	cell_type = /obj/item/weapon/cell/hyper;
+	dir = 4;
+	environ = 1;
+	equipment = 1;
+	lighting = 1;
+	locked = 0;
+	name = "Sif Free Radio APC";
+	operating = 0;
+	pixel_x = 24
+	},
+/obj/structure/cable/yellow,
+/turf/simulated/floor/wood,
+/area/submap/DJOutpost1)
+"C" = (
+/obj/effect/overlay/snow/floor,
+/obj/machinery/power/port_gen/pacman,
+/obj/structure/cable/yellow,
+/turf/simulated/floor{
+	outdoors = 1
+	},
+/area/submap/DJOutpost1)
+"D" = (
+/obj/machinery/door/airlock/glass,
+/obj/item/device/gps/internal/poi,
+/turf/simulated/floor/wood,
+/area/submap/DJOutpost1)
+"E" = (
+/obj/machinery/biogenerator,
+/turf/simulated/floor/wood,
+/area/submap/DJOutpost1)
+"F" = (
+/obj/structure/table/woodentable,
+/obj/item/weapon/reagent_containers/food/snacks/unajerky,
+/obj/machinery/light{
+	icon_state = "tube1";
+	dir = 8
+	},
+/obj/random_multi/single_item/sfr_headset,
+/turf/simulated/floor/wood,
+/area/submap/DJOutpost1)
+"G" = (
+/obj/machinery/light{
+	dir = 4;
+	icon_state = "tube1";
+	pixel_x = 0
+	},
+/obj/machinery/seed_extractor,
+/turf/simulated/floor/wood,
+/area/submap/DJOutpost1)
+"H" = (
+/obj/structure/bed/chair/wood{
+	 icon_state = "wooden_chair";
+	dir = 1
+	},
+/turf/simulated/floor/wood,
+/area/submap/DJOutpost1)
+"I" = (
+/obj/machinery/door/airlock/external,
+/turf/simulated/floor/wood,
+/area/submap/DJOutpost1)
+"J" = (
+/obj/structure/table/woodentable,
+/obj/item/weapon/material/knife/machete/hatchet,
+/obj/item/weapon/reagent_containers/glass/bucket,
+/obj/item/weapon/material/minihoe,
+/obj/item/device/analyzer/plant_analyzer,
+/obj/random_multi/single_item/sfr_headset,
+/turf/simulated/floor/wood,
+/area/submap/DJOutpost1)
+"K" = (
+/obj/structure/undies_wardrobe,
+/turf/simulated/floor/wood,
+/area/submap/DJOutpost1)
+"L" = (
+/obj/structure/table/rack,
+/obj/item/clothing/shoes/boots/winter,
+/obj/item/clothing/suit/storage/hooded/wintercoat,
+/obj/random_multi/single_item/sfr_headset,
+/turf/simulated/floor/wood,
+/area/submap/DJOutpost1)
+"M" = (
+/obj/machinery/light/flamp,
+/turf/simulated/floor/wood,
+/area/submap/DJOutpost1)
+"N" = (
+/obj/structure/sink{
+	dir = 4;
+	icon_state = "sink";
+	pixel_x = 15
+	},
+/turf/simulated/floor/wood,
+/area/submap/DJOutpost1)
+"O" = (
+/obj/structure/bed/padded,
+/obj/item/weapon/bedsheet/clown,
+/turf/simulated/floor/wood,
+/area/submap/DJOutpost1)
+"P" = (
+/obj/structure/table/rack,
+/obj/item/ammo_magazine/clip/c762/hunter,
+/obj/item/weapon/gun/projectile/shotgun/pump/rifle,
+/turf/simulated/floor/wood,
+/area/submap/DJOutpost1)
+"Q" = (
+/obj/structure/table/rack,
+/obj/item/device/flashlight/lantern,
+/obj/item/device/gps{
+	gps_tag = "Sif Free Radio"
+	},
+/turf/simulated/floor/wood,
+/area/submap/DJOutpost1)
+"R" = (
+/obj/machinery/portable_atmospherics/hydroponics,
+/turf/simulated/floor/wood,
+/area/submap/DJOutpost1)
+
+(1,1,1) = {"
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+"}
+(2,1,1) = {"
+a
+a
+a
+b
+d
+b
+b
+b
+b
+b
+d
+b
+a
+a
+a
+"}
+(3,1,1) = {"
+a
+a
+b
+b
+e
+p
+v
+b
+p
+F
+H
+b
+b
+a
+a
+"}
+(4,1,1) = {"
+a
+b
+b
+e
+i
+e
+w
+b
+r
+e
+e
+K
+b
+b
+a
+"}
+(5,1,1) = {"
+a
+c
+e
+e
+j
+e
+e
+b
+e
+e
+e
+e
+O
+d
+a
+"}
+(6,1,1) = {"
+a
+b
+e
+e
+e
+q
+x
+b
+e
+e
+b
+b
+b
+b
+a
+"}
+(7,1,1) = {"
+a
+b
+b
+b
+k
+b
+b
+b
+e
+e
+b
+L
+P
+b
+a
+"}
+(8,1,1) = {"
+a
+b
+f
+e
+e
+e
+e
+D
+e
+e
+I
+r
+e
+I
+a
+"}
+(9,1,1) = {"
+a
+b
+g
+e
+e
+r
+e
+b
+e
+e
+b
+M
+Q
+b
+a
+"}
+(10,1,1) = {"
+a
+b
+f
+e
+e
+e
+y
+b
+e
+e
+b
+b
+b
+b
+a
+"}
+(11,1,1) = {"
+a
+d
+g
+e
+l
+l
+z
+b
+e
+e
+e
+e
+R
+d
+a
+"}
+(12,1,1) = {"
+a
+b
+b
+h
+e
+s
+A
+b
+e
+e
+e
+N
+b
+b
+a
+"}
+(13,1,1) = {"
+a
+a
+b
+b
+m
+t
+B
+b
+E
+G
+J
+b
+b
+a
+a
+"}
+(14,1,1) = {"
+a
+a
+a
+b
+n
+b
+b
+b
+b
+b
+d
+b
+a
+a
+a
+"}
+(15,1,1) = {"
+a
+a
+a
+a
+o
+u
+C
+a
+a
+a
+a
+a
+a
+a
+a
+"}
+(16,1,1) = {"
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+"}
--- a/maps/tether/submaps/aerostat/submaps/DJOutpost2.dmm
+++ b/maps/tether/submaps/aerostat/submaps/DJOutpost2.dmm
@@ -0,0 +1,513 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/turf/template_noop,
+/area/template_noop)
+"b" = (
+/turf/simulated/wall/virgo2,
+/area/submap/DJOutpost1)
+"c" = (
+/obj/structure/grille/broken,
+/obj/item/weapon/material/shard,
+/obj/item/weapon/material/shard{
+	 icon_state = "shardmedium"
+	},
+/obj/item/stack/rods,
+/turf/simulated/floor,
+/area/submap/DJOutpost1)
+"d" = (
+/obj/structure/grille/broken,
+/obj/item/weapon/material/shard,
+/turf/simulated/floor,
+/area/submap/DJOutpost1)
+"e" = (
+/turf/simulated/floor/wood/broken,
+/area/submap/DJOutpost1)
+"f" = (
+/obj/structure/loot_pile/maint/technical,
+/turf/simulated/floor/wood/broken,
+/area/submap/DJOutpost1)
+"g" = (
+/obj/structure/sign/goldenplaque{
+	desc = "An award given to Sif Free Radio for media excellency. It looks fake.";
+	name = "Best Radio Station 2558";
+	pixel_y = 30
+	},
+/turf/simulated/floor/wood/broken,
+/area/submap/DJOutpost1)
+"h" = (
+/obj/structure/cable/yellow{
+	d1 = 2;
+	d2 = 4;
+	icon_state = "2-4"
+	},
+/obj/structure/loot_pile/maint/technical,
+/turf/simulated/floor/wood/broken,
+/area/submap/DJOutpost1)
+"i" = (
+/obj/structure/loot_pile/surface/bones,
+/turf/simulated/floor/wood/broken,
+/area/submap/DJOutpost1)
+"k" = (
+/obj/structure/girder,
+/turf/simulated/floor,
+/area/submap/DJOutpost1)
+"l" = (
+/obj/structure/bed/chair/office/dark{
+	dir = 1
+	},
+/obj/structure/cable/yellow{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
+/turf/simulated/floor/wood/broken,
+/area/submap/DJOutpost1)
+"m" = (
+/obj/structure/table/steel_reinforced,
+/obj/item/device/radio/phone,
+/turf/simulated/floor/outdoors/dirt,
+/area/submap/DJOutpost1)
+"n" = (
+/obj/item/stack/rods,
+/turf/template_noop,
+/area/template_noop)
+"o" = (
+/turf/simulated/floor/outdoors/dirt,
+/area/submap/DJOutpost1)
+"p" = (
+/obj/structure/loot_pile/surface/bones,
+/turf/simulated/floor/outdoors/dirt,
+/area/submap/DJOutpost1)
+"q" = (
+/obj/structure/table/steel_reinforced,
+/obj/item/device/radio,
+/obj/structure/cable/yellow,
+/turf/simulated/floor/wood/broken,
+/area/submap/DJOutpost1)
+"r" = (
+/turf/simulated/floor/outdoors/rocks,
+/area/submap/DJOutpost1)
+"s" = (
+/obj/effect/overlay/snow/floor,
+/turf/simulated/floor{
+	outdoors = 1
+	},
+/area/submap/DJOutpost1)
+"u" = (
+/obj/effect/decal/cleanable/ash,
+/turf/simulated/floor/outdoors/dirt,
+/area/submap/DJOutpost1)
+"w" = (
+/obj/structure/grille/broken,
+/obj/item/weapon/material/shard{
+	 icon_state = "shardmedium"
+	},
+/turf/simulated/floor,
+/area/submap/DJOutpost1)
+"x" = (
+/obj/structure/girder,
+/turf/simulated/floor/outdoors/rocks,
+/area/submap/DJOutpost1)
+"y" = (
+/obj/structure/table/steel_reinforced,
+/obj/item/device/radio/intercom/syndicate{
+	desc = "Talk through this.";
+	name = "station intercom (General)"
+	},
+/turf/simulated/floor/outdoors/dirt,
+/area/submap/DJOutpost1)
+"A" = (
+/obj/item/stack/rods,
+/turf/simulated/floor/outdoors/dirt,
+/area/submap/DJOutpost1)
+"B" = (
+/obj/structure/door_assembly/door_assembly_ext,
+/turf/simulated/floor/outdoors/rocks,
+/area/submap/DJOutpost1)
+"C" = (
+/obj/structure/grille/broken,
+/obj/item/weapon/material/shard{
+	icon_state = "medium"
+	},
+/obj/structure/cable/yellow{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
+/turf/simulated/floor,
+/area/submap/DJOutpost1)
+"D" = (
+/obj/item/weapon/material/shard{
+	 icon_state = "shardmedium"
+	},
+/turf/template_noop,
+/area/template_noop)
+"F" = (
+/obj/item/device/transfer_valve,
+/turf/simulated/floor/outdoors/rocks,
+/area/submap/DJOutpost1)
+"G" = (
+/obj/structure/grille/broken,
+/obj/item/weapon/material/shard{
+	icon_state = "medium"
+	},
+/turf/simulated/floor,
+/area/submap/DJOutpost1)
+"H" = (
+/obj/item/weapon/material/shard{
+	icon_state = "medium"
+	},
+/turf/template_noop,
+/area/template_noop)
+"I" = (
+/obj/machinery/door/airlock/external,
+/turf/simulated/floor/wood/broken,
+/area/submap/DJOutpost1)
+"J" = (
+/obj/item/weapon/material/shard,
+/turf/template_noop,
+/area/template_noop)
+"K" = (
+/obj/structure/sink{
+	dir = 4;
+	icon_state = "sink";
+	pixel_x = 15
+	},
+/turf/simulated/floor/wood/broken,
+/area/submap/DJOutpost1)
+"L" = (
+/obj/item/weapon/storage/toolbox/mechanical,
+/turf/simulated/floor/outdoors/rocks,
+/area/submap/DJOutpost1)
+"M" = (
+/obj/structure/grille/broken,
+/obj/item/weapon/material/shard{
+	icon_state = "medium"
+	},
+/obj/item/stack/rods,
+/turf/simulated/floor,
+/area/submap/DJOutpost1)
+"N" = (
+/obj/structure/grille/broken,
+/obj/item/stack/rods,
+/turf/simulated/floor,
+/area/submap/DJOutpost1)
+"O" = (
+/obj/structure/lattice,
+/turf/simulated/floor/outdoors/dirt,
+/area/submap/DJOutpost1)
+"P" = (
+/obj/effect/decal/cleanable/ash,
+/turf/simulated/floor/wood/broken,
+/area/submap/DJOutpost1)
+"S" = (
+/obj/structure/girder,
+/turf/simulated/floor/outdoors/dirt,
+/area/submap/DJOutpost1)
+
+(1,1,1) = {"
+a
+a
+a
+a
+n
+D
+a
+a
+a
+a
+n
+a
+a
+a
+a
+"}
+(2,1,1) = {"
+a
+a
+a
+b
+w
+b
+b
+b
+b
+b
+d
+b
+a
+a
+a
+"}
+(3,1,1) = {"
+a
+a
+b
+b
+e
+e
+e
+b
+P
+e
+e
+b
+b
+a
+a
+"}
+(4,1,1) = {"
+a
+b
+b
+e
+e
+p
+O
+k
+o
+O
+O
+e
+b
+b
+a
+"}
+(5,1,1) = {"
+a
+c
+e
+P
+O
+o
+r
+x
+r
+o
+o
+O
+O
+N
+J
+"}
+(6,1,1) = {"
+a
+b
+e
+O
+o
+r
+r
+r
+r
+r
+k
+k
+b
+b
+a
+"}
+(7,1,1) = {"
+a
+b
+k
+S
+o
+x
+r
+r
+r
+r
+x
+O
+e
+b
+a
+"}
+(8,1,1) = {"
+a
+b
+f
+o
+r
+r
+r
+F
+r
+r
+B
+o
+P
+I
+a
+"}
+(9,1,1) = {"
+a
+b
+f
+O
+o
+r
+r
+r
+r
+r
+x
+O
+e
+b
+a
+"}
+(10,1,1) = {"
+a
+b
+e
+e
+O
+o
+L
+r
+r
+o
+k
+k
+b
+b
+a
+"}
+(11,1,1) = {"
+a
+d
+f
+e
+i
+o
+m
+x
+o
+p
+O
+e
+f
+G
+a
+"}
+(12,1,1) = {"
+a
+b
+b
+g
+P
+O
+y
+b
+O
+e
+P
+K
+b
+b
+a
+"}
+(13,1,1) = {"
+a
+a
+b
+b
+h
+l
+q
+b
+f
+e
+f
+b
+b
+a
+a
+"}
+(14,1,1) = {"
+a
+a
+a
+b
+C
+S
+x
+k
+b
+b
+M
+b
+a
+a
+a
+"}
+(15,1,1) = {"
+a
+a
+a
+a
+s
+r
+r
+r
+o
+o
+H
+a
+a
+a
+a
+"}
+(16,1,1) = {"
+a
+a
+a
+a
+o
+u
+r
+A
+u
+a
+a
+a
+a
+a
+a
+"}
+(17,1,1) = {"
+a
+a
+a
+a
+a
+o
+o
+o
+a
+a
+a
+a
+a
+a
+a
+"}
+(18,1,1) = {"
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+"}
--- a/maps/tether/submaps/aerostat/submaps/DoomP.dmm
+++ b/maps/tether/submaps/aerostat/submaps/DoomP.dmm
--- a/maps/tether/submaps/aerostat/submaps/Drugden.dmm
+++ b/maps/tether/submaps/aerostat/submaps/Drugden.dmm
@@ -0,0 +1,907 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/turf/template_noop,
+/area/template_noop)
+"b" = (
+/turf/template_noop,
+/area/submap/Drugd)
+"c" = (
+/turf/simulated/mineral/ignore_mapgen,
+/area/submap/Drugd)
+"d" = (
+/turf/simulated/wall,
+/area/submap/Drugd)
+"e" = (
+/obj/machinery/door/airlock,
+/turf/simulated/floor,
+/area/submap/Drugd)
+"f" = (
+/turf/simulated/floor/tiled,
+/area/submap/Drugd)
+"g" = (
+/obj/effect/floor_decal/rust,
+/turf/simulated/floor/tiled,
+/area/submap/Drugd)
+"h" = (
+/obj/random/trash,
+/turf/simulated/floor,
+/area/submap/Drugd)
+"i" = (
+/obj/structure/closet/cabinet,
+/obj/item/weapon/lipstick/random,
+/turf/simulated/floor/carpet,
+/area/submap/Drugd)
+"j" = (
+/obj/structure/bed,
+/obj/item/weapon/bedsheet,
+/obj/structure/curtain/open/bed,
+/turf/simulated/floor/carpet,
+/area/submap/Drugd)
+"k" = (
+/obj/structure/table/woodentable,
+/obj/item/weapon/reagent_containers/pill/happy{
+	name = "pill"
+	},
+/turf/simulated/floor/carpet,
+/area/submap/Drugd)
+"l" = (
+/turf/simulated/floor,
+/area/submap/Drugd)
+"m" = (
+/obj/structure/curtain/black,
+/turf/simulated/floor,
+/area/submap/Drugd)
+"n" = (
+/obj/random/trash,
+/turf/simulated/floor/carpet,
+/area/submap/Drugd)
+"o" = (
+/turf/simulated/floor/carpet,
+/area/submap/Drugd)
+"p" = (
+/obj/effect/decal/remains/mouse,
+/turf/simulated/floor,
+/area/submap/Drugd)
+"q" = (
+/obj/structure/closet/cabinet,
+/turf/simulated/floor/carpet,
+/area/submap/Drugd)
+"r" = (
+/obj/structure/table/woodentable,
+/obj/item/weapon/reagent_containers/pill/methylphenidate{
+	name = "pill"
+	},
+/turf/simulated/floor/carpet,
+/area/submap/Drugd)
+"s" = (
+/obj/structure/bed/chair/comfy/beige{
+	icon_state = "armchair_preview";
+	dir = 1
+	},
+/turf/simulated/floor/carpet,
+/area/submap/Drugd)
+"t" = (
+/obj/item/weapon/reagent_containers/pill/citalopram{
+	name = "pill"
+	},
+/turf/simulated/floor/carpet,
+/area/submap/Drugd)
+"u" = (
+/obj/random/junk,
+/turf/simulated/floor,
+/area/submap/Drugd)
+"v" = (
+/obj/structure/closet/cabinet,
+/obj/item/weapon/contraband/poster,
+/turf/simulated/floor/carpet,
+/area/submap/Drugd)
+"w" = (
+/obj/structure/bed/chair/comfy/beige,
+/turf/simulated/floor/carpet,
+/area/submap/Drugd)
+"x" = (
+/obj/structure/table/woodentable,
+/obj/item/device/flashlight/lamp,
+/obj/item/weapon/reagent_containers/syringe/drugs,
+/turf/simulated/floor/carpet,
+/area/submap/Drugd)
+"y" = (
+/obj/structure/bed/chair/comfy/beige,
+/obj/item/weapon/reagent_containers/pill/citalopram{
+	name = "pill"
+	},
+/turf/simulated/floor/carpet,
+/area/submap/Drugd)
+"z" = (
+/obj/structure/loot_pile/maint/junk,
+/turf/simulated/floor,
+/area/submap/Drugd)
+"A" = (
+/obj/item/weapon/reagent_containers/pill/citalopram{
+	name = "pill"
+	},
+/obj/item/weapon/reagent_containers/pill/citalopram{
+	name = "pill"
+	},
+/turf/simulated/floor/carpet,
+/area/submap/Drugd)
+"B" = (
+/obj/structure/table/standard,
+/obj/item/weapon/storage/pill_bottle/happy,
+/turf/simulated/floor/tiled,
+/area/submap/Drugd)
+"C" = (
+/obj/structure/table/standard,
+/obj/item/stack/medical/splint,
+/turf/simulated/floor/tiled,
+/area/submap/Drugd)
+"D" = (
+/obj/structure/table/standard,
+/obj/item/weapon/reagent_containers/pill/citalopram,
+/obj/item/weapon/reagent_containers/pill/citalopram,
+/turf/simulated/floor/tiled,
+/area/submap/Drugd)
+"E" = (
+/obj/structure/table/standard,
+/obj/item/weapon/reagent_containers/pill/tramadol,
+/obj/item/weapon/reagent_containers/pill/tramadol,
+/turf/simulated/floor/tiled,
+/area/submap/Drugd)
+"F" = (
+/obj/structure/closet/cabinet,
+/obj/item/clothing/accessory/jacket,
+/obj/item/weapon/material/butterfly/switchblade,
+/turf/simulated/floor/carpet,
+/area/submap/Drugd)
+"G" = (
+/obj/item/weapon/reagent_containers/pill/zoom{
+	name = "pill"
+	},
+/obj/random/trash,
+/turf/simulated/floor/carpet,
+/area/submap/Drugd)
+"H" = (
+/obj/item/weapon/reagent_containers/pill/zoom{
+	name = "pill"
+	},
+/turf/simulated/floor/carpet,
+/area/submap/Drugd)
+"I" = (
+/obj/structure/loot_pile/maint/boxfort,
+/turf/simulated/floor/carpet,
+/area/submap/Drugd)
+"J" = (
+/obj/structure/table/standard,
+/obj/item/weapon/surgical/scalpel,
+/turf/simulated/floor/tiled,
+/area/submap/Drugd)
+"K" = (
+/obj/item/wheelchair,
+/turf/simulated/floor/tiled,
+/area/submap/Drugd)
+"L" = (
+/obj/structure/table/standard,
+/obj/random/firstaid,
+/turf/simulated/floor,
+/area/submap/Drugd)
+"M" = (
+/obj/structure/loot_pile/maint/junk,
+/turf/simulated/floor/tiled,
+/area/submap/Drugd)
+"N" = (
+/obj/effect/floor_decal/rust,
+/obj/structure/table/standard,
+/obj/item/device/survivalcapsule,
+/turf/simulated/floor/tiled,
+/area/submap/Drugd)
+"O" = (
+/obj/structure/table/standard,
+/obj/item/weapon/reagent_containers/pill/zoom,
+/obj/item/weapon/reagent_containers/pill/zoom,
+/turf/simulated/floor,
+/area/submap/Drugd)
+"P" = (
+/obj/structure/table/woodentable,
+/obj/item/weapon/reagent_containers/pill/tramadol{
+	name = "pill"
+	},
+/turf/simulated/floor/carpet,
+/area/submap/Drugd)
+"Q" = (
+/mob/living/simple_mob/mechanical/hivebot/ranged_damage/strong/guard,
+/turf/simulated/floor,
+/area/submap/Drugd)
+"R" = (
+/obj/structure/girder,
+/turf/simulated/floor,
+/area/submap/Drugd)
+"S" = (
+/obj/item/weapon/material/shard,
+/turf/simulated/floor,
+/area/submap/Drugd)
+"T" = (
+/obj/structure/table/woodentable,
+/obj/item/device/flashlight/lamp,
+/turf/simulated/floor/carpet,
+/area/submap/Drugd)
+"U" = (
+/obj/structure/table/woodentable,
+/obj/item/weapon/reagent_containers/syringe/drugs,
+/turf/simulated/floor/carpet,
+/area/submap/Drugd)
+
+(1,1,1) = {"
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+"}
+(2,1,1) = {"
+a
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+c
+c
+c
+b
+b
+b
+b
+b
+b
+b
+a
+"}
+(3,1,1) = {"
+a
+b
+b
+b
+b
+b
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+b
+b
+b
+b
+b
+b
+a
+"}
+(4,1,1) = {"
+a
+b
+b
+b
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+b
+b
+a
+"}
+(5,1,1) = {"
+a
+b
+b
+b
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+b
+a
+"}
+(6,1,1) = {"
+a
+b
+b
+b
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+a
+"}
+(7,1,1) = {"
+a
+b
+b
+b
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+d
+d
+d
+d
+d
+d
+d
+c
+c
+c
+a
+"}
+(8,1,1) = {"
+a
+b
+b
+b
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+d
+B
+J
+N
+l
+R
+d
+c
+c
+c
+a
+"}
+(9,1,1) = {"
+a
+b
+b
+b
+b
+c
+c
+c
+c
+c
+c
+c
+c
+c
+d
+C
+K
+l
+Q
+l
+d
+c
+c
+c
+a
+"}
+(10,1,1) = {"
+a
+b
+b
+b
+b
+b
+c
+c
+c
+c
+c
+c
+c
+c
+d
+D
+g
+l
+l
+S
+d
+c
+c
+c
+a
+"}
+(11,1,1) = {"
+a
+b
+b
+b
+b
+b
+c
+c
+c
+c
+c
+c
+c
+c
+d
+E
+L
+O
+l
+l
+d
+c
+c
+b
+a
+"}
+(12,1,1) = {"
+a
+b
+b
+b
+b
+b
+b
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+e
+d
+d
+c
+c
+b
+a
+"}
+(13,1,1) = {"
+a
+b
+b
+b
+b
+b
+b
+d
+f
+g
+g
+p
+u
+l
+z
+l
+l
+h
+l
+l
+l
+c
+c
+b
+a
+"}
+(14,1,1) = {"
+a
+b
+b
+b
+b
+b
+b
+e
+f
+g
+l
+l
+l
+l
+l
+l
+f
+l
+l
+l
+u
+c
+c
+b
+a
+"}
+(15,1,1) = {"
+a
+b
+b
+b
+b
+b
+b
+d
+f
+h
+l
+l
+h
+l
+g
+f
+M
+g
+l
+h
+d
+c
+c
+b
+a
+"}
+(16,1,1) = {"
+a
+b
+b
+b
+b
+b
+b
+d
+d
+d
+m
+d
+d
+d
+m
+d
+d
+d
+m
+d
+d
+c
+c
+c
+a
+"}
+(17,1,1) = {"
+a
+b
+b
+b
+b
+b
+c
+c
+d
+i
+n
+q
+d
+v
+o
+F
+d
+q
+o
+q
+d
+c
+c
+c
+a
+"}
+(18,1,1) = {"
+a
+b
+b
+b
+b
+c
+c
+c
+d
+j
+o
+r
+d
+w
+o
+G
+d
+P
+o
+T
+d
+c
+c
+c
+a
+"}
+(19,1,1) = {"
+a
+b
+b
+b
+b
+c
+c
+c
+d
+k
+o
+s
+d
+x
+o
+H
+d
+w
+o
+U
+d
+c
+c
+c
+a
+"}
+(20,1,1) = {"
+a
+b
+b
+b
+b
+c
+c
+c
+d
+j
+o
+t
+d
+y
+A
+I
+d
+w
+o
+n
+d
+c
+c
+b
+a
+"}
+(21,1,1) = {"
+a
+b
+b
+b
+b
+c
+c
+c
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+c
+c
+c
+a
+"}
+(22,1,1) = {"
+a
+b
+b
+b
+b
+b
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+a
+"}
+(23,1,1) = {"
+a
+b
+b
+b
+b
+b
+b
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+b
+a
+"}
+(24,1,1) = {"
+a
+b
+b
+b
+b
+b
+b
+b
+b
+c
+c
+c
+c
+b
+b
+b
+b
+c
+c
+c
+c
+b
+b
+b
+a
+"}
+(25,1,1) = {"
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+"}
--- a/maps/tether/submaps/aerostat/submaps/Epod3.dmm
+++ b/maps/tether/submaps/aerostat/submaps/Epod3.dmm
@@ -0,0 +1,282 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/turf/template_noop,
+/area/template_noop)
+"b" = (
+/turf/template_noop,
+/area/submap/Epod3)
+"c" = (
+/turf/simulated/floor/outdoors/dirt,
+/area/submap/Epod3)
+"d" = (
+/obj/tether_away_spawner/aerostat_surface,
+/turf/template_noop,
+/area/submap/Epod3)
+"e" = (
+/turf/simulated/shuttle/wall,
+/area/submap/Epod3)
+"f" = (
+/obj/tether_away_spawner/aerostat_surface,
+/turf/simulated/floor/outdoors/dirt,
+/area/submap/Epod3)
+"g" = (
+/obj/effect/spider/stickyweb,
+/turf/template_noop,
+/area/submap/Epod3)
+"h" = (
+/obj/structure/bed/chair{
+	dir = 4
+	},
+/obj/structure/closet/walllocker/emerglocker{
+	pixel_y = 28
+	},
+/obj/item/device/radio/intercom{
+	pixel_y = -26
+	},
+/turf/simulated/shuttle/floor,
+/area/submap/Epod3)
+"i" = (
+/obj/structure/bed/chair{
+	dir = 4
+	},
+/obj/machinery/vending/wallmed1{
+	name = "Emergency NanoMed";
+	pixel_y = 28
+	},
+/obj/machinery/light,
+/obj/item/weapon/weldingtool/largetank,
+/turf/simulated/shuttle/floor,
+/area/submap/Epod3)
+"j" = (
+/obj/machinery/status_display{
+	density = 0;
+	layer = 4;
+	pixel_x = 0;
+	pixel_y = -32
+	},
+/obj/structure/bed/chair{
+	icon_state = "chair_preview";
+	dir = 8
+	},
+/obj/effect/decal/remains,
+/obj/effect/decal/cleanable/blood/splatter,
+/obj/item/ammo_casing/spent,
+/obj/item/clothing/under/suit_jacket/really_black,
+/obj/item/clothing/shoes/dress,
+/obj/item/clothing/glasses/sunglasses,
+/obj/random/multiple/gun/projectile/handgun,
+/turf/simulated/shuttle/floor,
+/area/submap/Epod3)
+"k" = (
+/obj/structure/shuttle/engine/propulsion/burst{
+	icon_state = "propulsion";
+	dir = 8
+	},
+/turf/simulated/shuttle/wall,
+/area/submap/Epod3)
+"l" = (
+/obj/effect/spider/stickyweb,
+/turf/simulated/floor/outdoors/dirt,
+/area/submap/Epod3)
+"m" = (
+/obj/machinery/door/airlock/external{
+	name = "Escape Pod Hatch";
+	welded = 1
+	},
+/turf/simulated/shuttle/floor,
+/area/submap/Epod3)
+"n" = (
+/obj/effect/spider/eggcluster/small/frost,
+/turf/simulated/floor/outdoors/dirt,
+/area/submap/Epod3)
+"p" = (
+/obj/effect/spider/stickyweb,
+/obj/effect/spider/stickyweb,
+/turf/template_noop,
+/area/submap/Epod3)
+"r" = (
+/obj/structure/shuttle/window,
+/obj/structure/grille,
+/turf/simulated/shuttle/plating,
+/area/submap/Epod3)
+
+(1,1,1) = {"
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+"}
+(2,1,1) = {"
+a
+b
+b
+b
+b
+b
+b
+b
+b
+a
+"}
+(3,1,1) = {"
+a
+b
+b
+b
+g
+b
+b
+b
+b
+a
+"}
+(4,1,1) = {"
+a
+b
+b
+g
+g
+g
+p
+b
+b
+a
+"}
+(5,1,1) = {"
+a
+g
+g
+g
+b
+d
+g
+g
+b
+a
+"}
+(6,1,1) = {"
+a
+g
+b
+k
+m
+k
+c
+g
+b
+a
+"}
+(7,1,1) = {"
+a
+g
+g
+e
+h
+e
+c
+g
+b
+a
+"}
+(8,1,1) = {"
+a
+c
+l
+e
+i
+e
+l
+g
+b
+a
+"}
+(9,1,1) = {"
+a
+c
+l
+e
+j
+e
+l
+c
+b
+a
+"}
+(10,1,1) = {"
+a
+c
+l
+e
+r
+e
+l
+c
+b
+a
+"}
+(11,1,1) = {"
+a
+b
+l
+c
+n
+l
+l
+f
+b
+a
+"}
+(12,1,1) = {"
+a
+b
+b
+g
+g
+l
+c
+b
+b
+a
+"}
+(13,1,1) = {"
+a
+b
+b
+b
+b
+g
+g
+b
+b
+a
+"}
+(14,1,1) = {"
+a
+b
+b
+b
+b
+b
+b
+b
+b
+a
+"}
+(15,1,1) = {"
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+"}
--- a/maps/tether/submaps/aerostat/submaps/Epod4.dmm
+++ b/maps/tether/submaps/aerostat/submaps/Epod4.dmm
@@ -0,0 +1,259 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/turf/template_noop,
+/area/template_noop)
+"b" = (
+/turf/template_noop,
+/area/submap/Epod4)
+"c" = (
+/turf/simulated/floor/outdoors/dirt,
+/area/submap/Epod4)
+"f" = (
+/turf/simulated/floor/water,
+/area/submap/Epod4)
+"h" = (
+/turf/simulated/shuttle/wall,
+/area/submap/Epod4)
+"i" = (
+/obj/structure/shuttle/window,
+/obj/structure/grille,
+/turf/simulated/shuttle/plating,
+/area/submap/Epod4)
+"k" = (
+/obj/structure/bed/chair{
+	icon_state = "chair_preview";
+	dir = 1
+	},
+/obj/machinery/status_display{
+	density = 0;
+	layer = 4;
+	pixel_x = -32;
+	pixel_y = 0
+	},
+/obj/structure/loot_pile/maint/junk,
+/turf/simulated/floor/water,
+/area/submap/Epod4)
+"l" = (
+/turf/simulated/floor/water/deep,
+/area/submap/Epod4)
+"m" = (
+/obj/structure/bed/chair{
+	icon_state = "chair_preview";
+	dir = 1
+	},
+/obj/effect/decal/remains/posi,
+/obj/machinery/light{
+	dir = 8;
+	icon_state = "tube1";
+	pixel_y = 0
+	},
+/obj/machinery/vending/wallmed1{
+	layer = 3.3;
+	name = "Emergency NanoMed";
+	pixel_x = 28;
+	pixel_y = 0
+	},
+/obj/item/clothing/shoes/brown,
+/obj/item/clothing/under/mbill,
+/obj/item/clothing/head/soft/mbill,
+/turf/simulated/floor/water,
+/area/submap/Epod4)
+"n" = (
+/obj/structure/bed/chair{
+	icon_state = "chair_preview";
+	dir = 1
+	},
+/obj/structure/closet/walllocker/emerglocker/east,
+/obj/item/device/radio/intercom{
+	dir = 8;
+	name = "Station Intercom (General)";
+	pixel_x = -28
+	},
+/obj/structure/closet/crate/hydroponics{
+	desc = "All you need to destroy that pesky planet.";
+	name = "exotic seeds crate";
+	starts_with = list(/obj/item/seeds/random = 6, /obj/item/seeds/replicapod = 2, /obj/item/seeds/ambrosiavulgarisseed = 2, /obj/item/seeds/kudzuseed, /obj/item/seeds/libertymycelium, /obj/item/seeds/reishimycelium)
+	},
+/turf/simulated/floor/water,
+/area/submap/Epod4)
+"o" = (
+/obj/structure/shuttle/engine/propulsion/burst,
+/turf/simulated/shuttle/wall,
+/area/submap/Epod4)
+"p" = (
+/obj/structure/door_assembly/door_assembly_ext{
+	anchored = 1
+	},
+/turf/simulated/floor/water,
+/area/submap/Epod4)
+
+(1,1,1) = {"
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+"}
+(2,1,1) = {"
+a
+b
+b
+c
+c
+c
+c
+c
+c
+c
+c
+b
+c
+b
+a
+"}
+(3,1,1) = {"
+a
+b
+c
+c
+c
+c
+f
+f
+f
+f
+c
+c
+c
+c
+a
+"}
+(4,1,1) = {"
+a
+b
+c
+c
+c
+f
+f
+l
+l
+l
+f
+f
+c
+c
+a
+"}
+(5,1,1) = {"
+a
+b
+c
+c
+f
+h
+h
+h
+h
+o
+l
+l
+f
+c
+a
+"}
+(6,1,1) = {"
+a
+b
+c
+c
+f
+i
+k
+m
+n
+p
+l
+l
+f
+c
+a
+"}
+(7,1,1) = {"
+a
+b
+c
+c
+c
+h
+h
+h
+h
+o
+l
+f
+f
+c
+a
+"}
+(8,1,1) = {"
+a
+b
+b
+c
+c
+c
+c
+f
+f
+f
+f
+c
+c
+c
+a
+"}
+(9,1,1) = {"
+a
+b
+b
+b
+b
+c
+c
+c
+c
+c
+c
+c
+c
+b
+a
+"}
+(10,1,1) = {"
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+"}
--- a/maps/tether/submaps/aerostat/submaps/Flake.dmm
+++ b/maps/tether/submaps/aerostat/submaps/Flake.dmm
@@ -0,0 +1,680 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/turf/template_noop,
+/area/template_noop)
+"b" = (
+/turf/template_noop,
+/area/submap/Lake1)
+"f" = (
+/turf/simulated/floor/outdoors/rocks,
+/area/submap/Lake1)
+"h" = (
+/turf/simulated/floor/water,
+/area/submap/Lake1)
+"i" = (
+/turf/simulated/floor/outdoors/dirt,
+/area/submap/Lake1)
+"j" = (
+/turf/simulated/mineral,
+/area/submap/Lake1)
+
+(1,1,1) = {"
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+"}
+(2,1,1) = {"
+a
+a
+a
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+a
+a
+a
+a
+"}
+(3,1,1) = {"
+a
+a
+a
+a
+b
+b
+f
+f
+f
+f
+f
+f
+f
+f
+b
+b
+b
+a
+a
+a
+"}
+(4,1,1) = {"
+a
+a
+a
+a
+b
+f
+f
+h
+h
+h
+h
+h
+h
+f
+f
+f
+b
+b
+a
+a
+"}
+(5,1,1) = {"
+a
+a
+a
+b
+b
+f
+h
+h
+h
+h
+h
+h
+h
+h
+h
+f
+b
+b
+b
+a
+"}
+(6,1,1) = {"
+a
+a
+a
+b
+b
+f
+h
+h
+h
+h
+h
+h
+h
+h
+h
+f
+b
+b
+b
+a
+"}
+(7,1,1) = {"
+a
+a
+a
+b
+b
+f
+h
+h
+h
+h
+h
+h
+h
+h
+h
+f
+f
+b
+b
+a
+"}
+(8,1,1) = {"
+a
+a
+b
+b
+f
+f
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+f
+b
+b
+a
+"}
+(9,1,1) = {"
+a
+b
+b
+b
+f
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+f
+b
+b
+a
+"}
+(10,1,1) = {"
+a
+b
+b
+b
+f
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+f
+b
+b
+a
+"}
+(11,1,1) = {"
+a
+b
+b
+b
+f
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+f
+b
+a
+a
+"}
+(12,1,1) = {"
+a
+b
+b
+b
+f
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+f
+a
+a
+a
+"}
+(13,1,1) = {"
+a
+b
+b
+b
+f
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+f
+a
+a
+a
+"}
+(14,1,1) = {"
+a
+b
+b
+b
+f
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+f
+a
+a
+a
+"}
+(15,1,1) = {"
+a
+b
+b
+f
+f
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+f
+b
+a
+a
+"}
+(16,1,1) = {"
+a
+b
+b
+f
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+f
+b
+b
+a
+"}
+(17,1,1) = {"
+a
+b
+b
+f
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+f
+f
+b
+b
+a
+"}
+(18,1,1) = {"
+a
+b
+b
+f
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+f
+b
+b
+b
+a
+"}
+(19,1,1) = {"
+a
+b
+b
+f
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+f
+b
+b
+b
+a
+"}
+(20,1,1) = {"
+a
+b
+b
+f
+f
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+f
+b
+b
+b
+a
+"}
+(21,1,1) = {"
+a
+b
+b
+b
+f
+f
+f
+h
+h
+h
+h
+h
+h
+f
+f
+f
+b
+b
+b
+a
+"}
+(22,1,1) = {"
+a
+b
+b
+b
+b
+b
+f
+f
+f
+f
+f
+f
+f
+f
+i
+i
+b
+b
+a
+a
+"}
+(23,1,1) = {"
+a
+b
+b
+b
+b
+b
+b
+b
+b
+i
+i
+i
+i
+i
+i
+i
+b
+b
+a
+a
+"}
+(24,1,1) = {"
+a
+a
+b
+b
+b
+b
+b
+b
+b
+i
+i
+i
+i
+j
+i
+i
+b
+a
+a
+a
+"}
+(25,1,1) = {"
+a
+a
+a
+b
+b
+b
+b
+b
+b
+i
+i
+j
+j
+j
+i
+b
+b
+a
+a
+a
+"}
+(26,1,1) = {"
+a
+a
+a
+b
+b
+b
+b
+b
+b
+i
+j
+j
+j
+j
+i
+b
+b
+a
+a
+a
+"}
+(27,1,1) = {"
+a
+a
+b
+b
+b
+a
+a
+b
+b
+b
+i
+j
+j
+i
+i
+b
+b
+a
+a
+a
+"}
+(28,1,1) = {"
+a
+a
+b
+a
+a
+a
+a
+a
+b
+b
+b
+i
+i
+i
+b
+b
+b
+a
+a
+a
+"}
+(29,1,1) = {"
+a
+a
+a
+a
+a
+a
+a
+a
+b
+b
+b
+b
+b
+b
+b
+b
+a
+a
+a
+a
+"}
+(30,1,1) = {"
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+"}
--- a/maps/tether/submaps/aerostat/submaps/GovPatrol.dmm
+++ b/maps/tether/submaps/aerostat/submaps/GovPatrol.dmm
@@ -34,10 +34,6 @@
 /obj/effect/decal/remains,
 /turf/simulated/mineral/floor/ignore_mapgen/virgo2,
 /area/submap/virgo2/GovPatrol)
-"j" = (
-/obj/item/stack/material/wood/sif,
-/turf/simulated/mineral/floor/ignore_mapgen/virgo2,
-/area/submap/virgo2/GovPatrol)
 "k" = (
 /obj/item/weapon/gun/projectile/shotgun/pump/rifle/lever,
 /turf/simulated/mineral/floor/ignore_mapgen/virgo2,
@@ -46,6 +42,10 @@
 /obj/effect/decal/remains,
 /turf/simulated/mineral/floor/ignore_mapgen/virgo2,
 /area/submap/virgo2/GovPatrol)
+"v" = (
+/obj/random/multiple/voidsuit,
+/turf/simulated/mineral/floor/ignore_mapgen/virgo2,
+/area/submap/virgo2/GovPatrol)

 (1,1,1) = {"
 a
@@ -102,7 +102,7 @@ d
 d
 d
 h
-j
+d
 d
 g
 a
@@ -130,7 +130,7 @@ d
 d
 d
 e
-d
+v
 i
 d
 d
--- a/maps/tether/submaps/aerostat/submaps/MCamp1.dmm
+++ b/maps/tether/submaps/aerostat/submaps/MCamp1.dmm
@@ -8,10 +8,6 @@
 "c" = (
 /turf/simulated/mineral/floor/ignore_mapgen/virgo2,
 /area/submap/virgo2/MilitaryCamp1)
-"d" = (
-/obj/structure/flora/bush,
-/turf/simulated/mineral/floor/ignore_mapgen/virgo2,
-/area/submap/virgo2/MilitaryCamp1)
 "e" = (
 /obj/effect/decal/cleanable/blood,
 /turf/simulated/mineral/floor/ignore_mapgen/virgo2,
@@ -196,7 +192,7 @@ c
 c
 c
 c
-d
+c
 c
 c
 c
@@ -222,7 +218,7 @@ c
 c
 c
 k
-d
+c
 a
 "}
 (6,1,1) = {"
@@ -271,7 +267,7 @@ a
 "}
 (8,1,1) = {"
 a
-d
+c
 c
 c
 j
@@ -496,7 +492,7 @@ b
 c
 c
 c
-d
+c
 c
 k
 c
--- a/maps/tether/submaps/aerostat/submaps/Manor1.dmm
+++ b/maps/tether/submaps/aerostat/submaps/Manor1.dmm
--- a/maps/tether/submaps/aerostat/submaps/Musk.dmm
+++ b/maps/tether/submaps/aerostat/submaps/Musk.dmm
@@ -0,0 +1,52 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/turf/template_noop,
+/area/template_noop)
+"b" = (
+/obj/item/mecha_parts/mecha_equipment/tesla_energy_relay,
+/turf/template_noop,
+/area/template_noop)
+"c" = (
+/obj/effect/decal/mecha_wreckage/gygax,
+/turf/template_noop,
+/area/template_noop)
+"d" = (
+/obj/item/mecha_parts/mecha_equipment/shocker,
+/turf/template_noop,
+/area/template_noop)
+
+(1,1,1) = {"
+a
+a
+a
+a
+a
+"}
+(2,1,1) = {"
+a
+a
+a
+a
+a
+"}
+(3,1,1) = {"
+a
+a
+b
+a
+a
+"}
+(4,1,1) = {"
+a
+a
+c
+d
+a
+"}
+(5,1,1) = {"
+a
+a
+a
+a
+a
+"}
--- a/maps/tether/submaps/aerostat/submaps/Rocky1.dmm
+++ b/maps/tether/submaps/aerostat/submaps/Rocky1.dmm
@@ -0,0 +1,699 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/turf/template_noop,
+/area/template_noop)
+"b" = (
+/turf/template_noop,
+/area/submap/Rocky1)
+"c" = (
+/turf/simulated/floor/outdoors/dirt,
+/area/submap/Rocky1)
+"d" = (
+/obj/structure/boulder,
+/turf/simulated/floor/outdoors/dirt,
+/area/submap/Rocky1)
+"e" = (
+/turf/simulated/mineral,
+/area/submap/Rocky1)
+"g" = (
+/obj/random/handgun/sec,
+/obj/effect/decal/remains/human,
+/obj/item/weapon/spacecash/c200,
+/turf/simulated/floor/outdoors/dirt,
+/area/submap/Rocky1)
+
+(1,1,1) = {"
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+"}
+(2,1,1) = {"
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+"}
+(3,1,1) = {"
+a
+a
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+a
+a
+"}
+(4,1,1) = {"
+a
+a
+b
+b
+c
+c
+b
+b
+b
+b
+b
+b
+b
+b
+b
+c
+c
+c
+b
+b
+b
+b
+b
+a
+a
+"}
+(5,1,1) = {"
+a
+a
+b
+c
+c
+c
+c
+c
+b
+b
+b
+b
+b
+b
+c
+c
+e
+e
+c
+b
+b
+b
+b
+a
+a
+"}
+(6,1,1) = {"
+a
+a
+b
+c
+e
+e
+e
+c
+c
+b
+b
+c
+c
+c
+c
+e
+e
+e
+c
+c
+b
+b
+b
+a
+a
+"}
+(7,1,1) = {"
+a
+a
+b
+d
+e
+e
+e
+c
+b
+b
+b
+b
+c
+e
+e
+e
+e
+e
+e
+c
+b
+b
+b
+a
+a
+"}
+(8,1,1) = {"
+a
+a
+b
+e
+e
+e
+e
+c
+b
+c
+c
+b
+c
+e
+e
+e
+c
+c
+c
+c
+b
+b
+b
+a
+a
+"}
+(9,1,1) = {"
+a
+a
+b
+b
+c
+c
+d
+c
+c
+c
+c
+c
+c
+e
+e
+c
+c
+b
+b
+c
+b
+b
+b
+a
+a
+"}
+(10,1,1) = {"
+a
+a
+b
+b
+b
+c
+c
+c
+c
+c
+c
+c
+c
+e
+e
+c
+b
+b
+b
+b
+b
+b
+b
+a
+a
+"}
+(11,1,1) = {"
+a
+a
+b
+b
+b
+b
+c
+c
+b
+c
+c
+c
+e
+e
+e
+b
+b
+b
+b
+b
+b
+b
+b
+a
+a
+"}
+(12,1,1) = {"
+a
+a
+b
+b
+b
+b
+b
+b
+b
+b
+c
+c
+e
+e
+e
+b
+b
+b
+b
+b
+b
+b
+b
+a
+a
+"}
+(13,1,1) = {"
+a
+a
+b
+b
+b
+b
+b
+b
+b
+b
+b
+c
+e
+e
+e
+e
+b
+b
+b
+b
+b
+b
+b
+a
+a
+"}
+(14,1,1) = {"
+a
+a
+b
+b
+b
+b
+b
+b
+b
+b
+b
+c
+e
+e
+e
+e
+b
+b
+b
+b
+b
+b
+b
+a
+a
+"}
+(15,1,1) = {"
+a
+a
+b
+b
+b
+b
+b
+c
+c
+c
+b
+c
+e
+e
+e
+e
+b
+b
+b
+b
+b
+b
+b
+a
+a
+"}
+(16,1,1) = {"
+a
+a
+b
+b
+b
+b
+c
+c
+c
+c
+c
+c
+e
+e
+e
+b
+b
+b
+b
+b
+b
+b
+b
+a
+a
+"}
+(17,1,1) = {"
+a
+a
+b
+b
+b
+c
+c
+c
+c
+c
+c
+c
+c
+e
+e
+b
+b
+b
+b
+b
+b
+b
+b
+a
+a
+"}
+(18,1,1) = {"
+a
+a
+b
+b
+e
+c
+c
+c
+c
+c
+c
+c
+d
+e
+b
+b
+b
+b
+b
+b
+b
+b
+b
+a
+a
+"}
+(19,1,1) = {"
+a
+a
+b
+e
+e
+d
+c
+c
+c
+c
+d
+e
+e
+e
+b
+b
+b
+b
+b
+b
+b
+b
+b
+a
+a
+"}
+(20,1,1) = {"
+a
+a
+b
+e
+e
+e
+c
+g
+c
+e
+e
+e
+e
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+a
+a
+"}
+(21,1,1) = {"
+a
+a
+b
+e
+e
+e
+e
+e
+e
+e
+e
+e
+e
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+a
+a
+"}
+(22,1,1) = {"
+a
+a
+b
+e
+e
+e
+e
+e
+e
+e
+e
+e
+e
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+a
+a
+"}
+(23,1,1) = {"
+a
+a
+b
+b
+b
+e
+e
+e
+e
+e
+e
+e
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+a
+a
+"}
+(24,1,1) = {"
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+"}
+(25,1,1) = {"
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+"}
--- a/maps/tether/submaps/aerostat/submaps/Rocky4.dmm
+++ b/maps/tether/submaps/aerostat/submaps/Rocky4.dmm
@@ -0,0 +1,357 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/turf/template_noop,
+/area/template_noop)
+"b" = (
+/turf/template_noop,
+/area/submap/Rocky4)
+"c" = (
+/turf/simulated/mineral/ignore_mapgen,
+/area/submap/Rocky4)
+"e" = (
+/turf/simulated/floor/outdoors/rocks,
+/area/submap/Rocky4)
+"f" = (
+/turf/simulated/floor/water,
+/area/submap/Rocky4)
+
+(1,1,1) = {"
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+"}
+(2,1,1) = {"
+a
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+a
+"}
+(3,1,1) = {"
+a
+b
+b
+b
+b
+b
+b
+b
+b
+b
+c
+c
+c
+b
+a
+"}
+(4,1,1) = {"
+a
+b
+b
+b
+b
+b
+b
+b
+b
+e
+e
+c
+c
+c
+a
+"}
+(5,1,1) = {"
+a
+b
+b
+b
+b
+b
+b
+e
+e
+e
+e
+c
+c
+c
+a
+"}
+(6,1,1) = {"
+a
+b
+c
+c
+b
+b
+e
+e
+f
+f
+f
+e
+c
+c
+a
+"}
+(7,1,1) = {"
+a
+b
+c
+c
+b
+b
+e
+f
+f
+f
+f
+e
+b
+b
+a
+"}
+(8,1,1) = {"
+a
+c
+c
+c
+c
+b
+e
+e
+f
+f
+f
+e
+b
+b
+a
+"}
+(9,1,1) = {"
+a
+c
+c
+c
+c
+b
+b
+e
+f
+f
+f
+e
+b
+b
+a
+"}
+(10,1,1) = {"
+a
+b
+c
+c
+c
+b
+b
+e
+f
+f
+e
+e
+b
+b
+a
+"}
+(11,1,1) = {"
+a
+b
+b
+c
+c
+b
+b
+e
+e
+f
+e
+b
+b
+b
+a
+"}
+(12,1,1) = {"
+a
+b
+b
+c
+c
+b
+b
+e
+e
+e
+e
+b
+b
+b
+a
+"}
+(13,1,1) = {"
+a
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+a
+"}
+(14,1,1) = {"
+a
+b
+b
+b
+b
+b
+b
+b
+b
+c
+c
+b
+b
+b
+a
+"}
+(15,1,1) = {"
+a
+b
+b
+b
+b
+b
+b
+b
+c
+c
+c
+c
+c
+b
+a
+"}
+(16,1,1) = {"
+a
+b
+b
+b
+b
+b
+c
+c
+c
+c
+c
+c
+c
+b
+a
+"}
+(17,1,1) = {"
+a
+b
+b
+b
+b
+b
+c
+c
+c
+c
+c
+c
+b
+b
+a
+"}
+(18,1,1) = {"
+a
+b
+b
+b
+b
+b
+b
+b
+c
+c
+c
+b
+b
+b
+a
+"}
+(19,1,1) = {"
+a
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+a
+"}
+(20,1,1) = {"
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+"}
--- a/maps/tether/submaps/aerostat/submaps/Shack1.dmm
+++ b/maps/tether/submaps/aerostat/submaps/Shack1.dmm
@@ -3,7 +3,7 @@
 /turf/template_noop,
 /area/template_noop)
 "b" = (
-/turf/simulated/wall/log_sif,
+/turf/simulated/wall/virgo2,
 /area/submap/virgo2/Shack1)
 "c" = (
 /turf/template_noop,
@@ -46,7 +46,7 @@
 	},
 /area/submap/virgo2/Shack1)
 "m" = (
-/obj/structure/simple_door/wood,
+/obj/machinery/door/airlock/external,
 /turf/simulated/floor/wood,
 /area/submap/virgo2/Shack1)
 "n" = (
@@ -88,6 +88,11 @@
 "v" = (
 /turf/simulated/mineral/floor/ignore_mapgen/virgo2,
 /area/template_noop)
+"O" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/random/multiple/voidsuit,
+/turf/simulated/floor/wood,
+/area/submap/virgo2/Shack1)

 (1,1,1) = {"
 a
@@ -152,7 +157,7 @@ a
 (6,1,1) = {"
 a
 b
-h
+O
 h
 i
 i
@@ -164,7 +169,7 @@ a
 (7,1,1) = {"
 a
 b
-h
+O
 k
 i
 i
--- a/maps/tether/submaps/aerostat/submaps/butchershack.dmm
+++ b/maps/tether/submaps/aerostat/submaps/butchershack.dmm
@@ -0,0 +1,236 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/turf/template_noop,
+/area/template_noop)
+"b" = (
+/turf/simulated/wall/log_sif,
+/area/submap/ButcherShack)
+"c" = (
+/turf/simulated/floor/wood/sif,
+/area/submap/ButcherShack)
+"d" = (
+/obj/structure/closet,
+/obj/effect/decal/cleanable/cobweb,
+/obj/item/weapon/beartrap,
+/obj/item/weapon/beartrap,
+/obj/item/weapon/packageWrap,
+/obj/item/weapon/material/knife/hook,
+/turf/simulated/floor/wood/sif,
+/area/submap/ButcherShack)
+"e" = (
+/obj/structure/closet/secure_closet/freezer/meat,
+/turf/simulated/floor/wood/sif,
+/area/submap/ButcherShack)
+"f" = (
+/obj/structure/closet/crate/freezer,
+/obj/effect/decal/cleanable/blood/gibs,
+/obj/random/meat,
+/obj/random/meat,
+/obj/random/meat,
+/obj/random/meat,
+/obj/random/meat,
+/obj/random/meat,
+/obj/random/meat,
+/obj/random/meat,
+/obj/random/meat,
+/obj/random/meat,
+/turf/simulated/floor/wood/sif/broken,
+/area/submap/ButcherShack)
+"g" = (
+/obj/machinery/gibber/autogibber,
+/turf/simulated/floor/wood/sif,
+/area/submap/ButcherShack)
+"h" = (
+/turf/simulated/floor/wood/sif/broken,
+/area/submap/ButcherShack)
+"i" = (
+/obj/structure/window/basic,
+/obj/structure/curtain,
+/turf/simulated/floor/wood/sif/broken,
+/area/submap/ButcherShack)
+"j" = (
+/turf/template_noop,
+/area/submap/ButcherShack)
+"k" = (
+/obj/structure/simple_door/sifwood,
+/turf/simulated/floor/wood/sif,
+/area/submap/ButcherShack)
+"l" = (
+/obj/structure/loot_pile/maint/trash,
+/turf/simulated/floor/outdoors/dirt,
+/area/submap/ButcherShack)
+"m" = (
+/obj/structure/kitchenspike,
+/obj/effect/decal/cleanable/blood,
+/turf/simulated/floor/wood/sif,
+/area/submap/ButcherShack)
+"n" = (
+/obj/structure/kitchenspike,
+/obj/effect/decal/cleanable/blood/drip,
+/turf/simulated/floor/wood/sif,
+/area/submap/ButcherShack)
+"o" = (
+/obj/effect/decal/cleanable/blood,
+/turf/simulated/floor/wood/sif,
+/area/submap/ButcherShack)
+"p" = (
+/obj/structure/table/standard,
+/obj/item/clothing/suit/chef/classic,
+/turf/simulated/floor/wood/sif,
+/area/submap/ButcherShack)
+"q" = (
+/obj/structure/table/standard,
+/obj/effect/decal/cleanable/blood,
+/obj/item/weapon/material/knife/butch,
+/turf/simulated/floor/wood/sif/broken,
+/area/submap/ButcherShack)
+"r" = (
+/obj/structure/table/standard,
+/obj/item/weapon/reagent_containers/food/snacks/cutlet,
+/obj/item/weapon/reagent_containers/food/snacks/cutlet,
+/obj/item/weapon/reagent_containers/food/snacks/cutlet,
+/obj/item/weapon/reagent_containers/food/snacks/sausage,
+/turf/simulated/floor/wood/sif,
+/area/submap/ButcherShack)
+"s" = (
+/obj/structure/coatrack,
+/turf/simulated/floor/wood/sif,
+/area/submap/ButcherShack)
+"t" = (
+/obj/structure/bed/padded,
+/obj/item/weapon/bedsheet/brown,
+/turf/simulated/floor/wood/sif,
+/area/submap/ButcherShack)
+"u" = (
+/obj/effect/decal/cleanable/blood/drip,
+/turf/simulated/floor/wood/sif/broken,
+/area/submap/ButcherShack)
+"v" = (
+/turf/simulated/floor/outdoors/dirt,
+/area/submap/ButcherShack)
+"w" = (
+/obj/structure/window/basic,
+/obj/structure/curtain,
+/turf/simulated/floor/wood/sif,
+/area/submap/ButcherShack)
+
+(1,1,1) = {"
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+"}
+(2,1,1) = {"
+a
+b
+b
+b
+b
+b
+b
+j
+j
+a
+"}
+(3,1,1) = {"
+a
+b
+d
+h
+c
+s
+b
+b
+v
+a
+"}
+(4,1,1) = {"
+a
+b
+m
+c
+p
+o
+u
+k
+v
+a
+"}
+(5,1,1) = {"
+a
+b
+n
+c
+q
+c
+b
+b
+v
+a
+"}
+(6,1,1) = {"
+a
+b
+e
+c
+r
+c
+i
+l
+v
+a
+"}
+(7,1,1) = {"
+a
+b
+f
+o
+c
+h
+w
+l
+v
+a
+"}
+(8,1,1) = {"
+a
+b
+g
+c
+c
+t
+b
+v
+j
+a
+"}
+(9,1,1) = {"
+a
+b
+b
+b
+b
+b
+b
+j
+j
+a
+"}
+(10,1,1) = {"
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+"}
--- a/maps/tether/submaps/aerostat/submaps/virgo2.dm
+++ b/maps/tether/submaps/aerostat/submaps/virgo2.dm
@@ -1,103 +1,187 @@
 #include "virgo2_submap_areas.dm"

 #if MAP_TEST
-#include "Blackshuttledown.dmm"
-#include "Boombase.dmm"
-#include "CaveS.dmm"
-#include "DecoupledEngine.dmm"
-#include "GovPatrol.dmm"
-#include "Lab1.dmm"
+#include "Flake.dmm"
 #include "MCamp1.dmm"
-#include "MHR.dmm"
-#include "Mudpit.dmm"
-#include "Rockybase.dmm"
+#include "Rocky1.dmm"
 #include "Shack1.dmm"
 #include "Smol1.dmm"
+#include "Mudpit.dmm"
 #include "Snowrock1.dmm"
+#include "Boombase.dmm"
+#include "Blackshuttledown.dmm"
+#include "Lab1.dmm"
+#include "Rocky4.dmm"
+#include "DJOutpost1.dmm"
+#include "DJOutpost2.dmm"
+#include "Rockybase.dmm"
+#include "MHR.dmm"
+#include "GovPatrol.dmm"
+#include "DecoupledEngine.dmm"
+#include "DoomP.dmm"
+#include "CaveS.dmm"
+#include "Drugden.dmm"
+#include "Musk.dmm"
+#include "Manor1.dmm"
+#include "Epod3.dmm"
+#include "Epod4.dmm"
+#include "ButcherShack.dmm"
 #endif

 /datum/map_template/virgo2
 	name = "Surface Content - Virgo 2"
 	desc = "For seeding submaps on Virgo 2"
-	allow_duplicates = TRUE
-
-/datum/map_template/virgo2/Blackshuttledown
-	name = "V2 - Black Shuttle Down"
-	desc = "You REALLY shouldn't be near this."
-	mappath = 'Blackshuttledown.dmm'
-	cost = 30
 	allow_duplicates = FALSE

-/datum/map_template/virgo2/Boombase
-	name = "V2 - Boombase"
-	desc = "What happens when you don't follow SOP."
-	mappath = 'Boombase.dmm'
-	cost = 5
-
-/datum/map_template/virgo2/CaveS
-	name = "V2 - CaveS"
-	desc = "Chitter chitter!"
-	mappath = 'CaveS.dmm'
-	cost = 20
-	allow_duplicates = FALSE
-
-/datum/map_template/virgo2/DecoupledEngine
-	name = "V2 - Decoupled Engine"
-	desc = "A damaged fission engine jettisoned from a starship long ago."
-	mappath = 'DecoupledEngine.dmm'
-	cost = 15
-
-/datum/map_template/virgo2/GovPatrol
-	name = "V2 - Government Patrol"
-	desc = "A long lost SifGuard ground survey patrol. Now they have you guys!"
-	mappath = 'GovPatrol.dmm'
-	cost = 5
-
-/datum/map_template/virgo2/Lab1
-	name = "V2 - Lab1"
-	desc = "An isolated small robotics lab."
-	mappath = 'Lab1.dmm'
-	cost = 5
+/datum/map_template/virgo2/Flake
+	name = "Forest Lake"
+	desc = "A serene lake sitting amidst the surface."
+	mappath = 'Flake.dmm'
+	cost = 10

 /datum/map_template/virgo2/Mcamp1
-	name = "V2 - Military Camp 1"
+	name = "Military Camp 1"
 	desc = "A derelict military camp host to some unsavory dangers"
 	mappath = 'MCamp1.dmm'
-	cost = 15
-
-/datum/map_template/virgo2/MHR
-	name = "V2 - Manhack Rock"
-	desc = "A rock filled with nasty Synthetics."
-	mappath = 'MHR.dmm'
-	cost = 15
+	cost = 5

 /datum/map_template/virgo2/Mudpit
-	name = "V2 - Mudpit"
+	name = "Mudpit"
 	desc = "What happens when someone is a bit too careless with gas.."
 	mappath = 'Mudpit.dmm'
-	cost = 15
+	cost = 5

-/datum/map_template/virgo2/Rockybase
-	name = "V2 - Rocky Base"
-	desc = "A guide to upsetting Icarus and the EIO"
-	mappath = 'Rockybase.dmm'
-	cost = 35
-	allow_duplicates = FALSE
+/datum/map_template/virgo2/Rocky1
+	name = "Rocky1"
+	desc = "DununanununanununuNAnana"
+	mappath = 'Rocky1.dmm'
+	allow_duplicates = TRUE
+	cost = 5

 /datum/map_template/virgo2/Shack1
-	name = "V2 - Shack1"
+	name = "Shack1"
 	desc = "A small shack in the middle of nowhere, Your halloween murder happens here"
 	mappath = 'Shack1.dmm'
 	cost = 5

 /datum/map_template/virgo2/Smol1
-	name = "V2 - Smol1"
+	name = "Smol1"
 	desc = "A tiny grove of trees, The Nemesis of thicc"
 	mappath = 'Smol1.dmm'
 	cost = 5

 /datum/map_template/virgo2/Snowrock1
-	name = "V2 - Snowrock1"
+	name = "Snowrock1"
 	desc = "A rocky snow covered area"
 	mappath = 'Snowrock1.dmm'
 	cost = 5
+
+/datum/map_template/virgo2/Lab1
+	name = "Lab1"
+	desc = "An isolated small robotics lab."
+	mappath = 'Lab1.dmm'
+	cost = 5
+
+/datum/map_template/virgo2/Rocky4
+	name = "Rocky4"
+	desc = "An interesting geographic formation."
+	mappath = 'Rocky4.dmm'
+	cost = 5
+
+/datum/map_template/virgo2/DJOutpost1
+	name = "DJOutpost1"
+	desc = "Home of Sif Free Radio, the best - and only - radio station for miles around."
+	mappath = 'DJOutpost1.dmm'
+	template_group = "Sif Free Radio"
+	cost = 5
+
+/datum/map_template/virgo2/DJOutpost2
+	name = "DJOutpost2"
+	desc = "The cratered remains of Sif Free Radio, the best - and only - radio station for miles around."
+	mappath = 'DJOutpost2.dmm'
+	template_group = "Sif Free Radio"
+	cost = 5
+
+/datum/map_template/virgo2/Boombase
+	name = "Boombase"
+	desc = "What happens when you don't follow SOP."
+	mappath = 'Boombase.dmm'
+	cost = 5
+
+/datum/map_template/virgo2/BSD
+	name = "Black Shuttle Down"
+	desc = "You REALLY shouldn't be near this."
+	mappath = 'Blackshuttledown.dmm'
+	cost = 30
+
+/datum/map_template/virgo2/Rockybase
+	name = "Rocky Base"
+	desc = "A guide to upsetting Icarus and the EIO"
+	mappath = 'Rockybase.dmm'
+	cost = 35
+
+/datum/map_template/virgo2/MHR
+	name = "Manhack Rock"
+	desc = "A rock filled with nasty Synthetics."
+	mappath = 'MHR.dmm'
+	cost = 15
+
+/datum/map_template/virgo2/GovPatrol
+	name = "Government Patrol"
+	desc = "A long lost SifGuard ground survey patrol. Now they have you guys!"
+	mappath = 'GovPatrol.dmm'
+	cost = 5
+
+/datum/map_template/virgo2/DecoupledEngine
+	name = "Decoupled Engine"
+	desc = "A damaged fission engine jettisoned from a starship long ago."
+	mappath = 'DecoupledEngine.dmm'
+	cost = 15
+
+/datum/map_template/virgo2/DoomP
+	name = "DoomP"
+	desc = "Witty description here."
+	mappath = 'DoomP.dmm'
+	cost = 30
+
+/datum/map_template/virgo2/Cave
+	name = "CaveS"
+	desc = "Chitter chitter!"
+	mappath = 'CaveS.dmm'
+	cost = 20
+
+/datum/map_template/virgo2/Drugden
+	name = "Drugden"
+	desc = "The remains of ill thought out whims."
+	mappath = 'Drugden.dmm'
+	cost = 20
+
+/datum/map_template/virgo2/Musk
+	name = "Musk"
+	desc = "0 to 60 in 1.9 seconds."
+	mappath = 'Musk.dmm'
+	cost = 10
+
+/datum/map_template/virgo2/Manor1
+	name = "Manor1"
+	desc = "Whodunit"
+	mappath = 'Manor1.dmm'
+	cost = 20
+
+/datum/map_template/virgo2/Epod3
+	name = "Emergency Pod 3"
+	desc = "A webbed Emergency pod in the middle of nowhere."
+	mappath = 'Epod3.dmm'
+	cost = 5
+
+/datum/map_template/virgo2/Epod4
+	name = "Emergency Pod 4"
+	desc = "A flooded Emergency pod in the middle of nowhere."
+	mappath = 'Epod4.dmm'
+	cost = 5
+
+/datum/map_template/virgo2/ButcherShack
+	name = "Butcher Shack"
+	desc = "An old, bloody butcher's shack. Get your meat here!"
+	mappath = 'butchershack.dmm'
+	cost = 5
--- a/maps/tether/submaps/beach/cave.dmm
+++ b/maps/tether/submaps/beach/cave.dmm