Expedition Fixes

- Removes unnecessary stairs from Virgo 2's Surface
- Swaps many of Virgo 2's POI terrain to Virgo 2 subtype
- Shrinks Doom Patrol POI so that it actually can be picked
- Makes Doom Patrol more difficult, but also increases rewards
- Swaps water on Virgo 2's surface for lava
- Gives all new Virgo 2 POIs their own virgo 2 area so that base turf is set properly.
- Fixes base turf problems with Virgo 4's POIs
- Adds a new Syndicate Beacon subtype, it does not give you objectives.
- Removes spiders from Virgo 2 POIs, replaces with Virgo 2 spawners
- Virgo 2's mobs can actually survive in the atmosphere now

code/game/machinery/syndicatebeacon_vr.dm

@@ -0,0 +1,42 @@
+//  Virgo modified syndie beacon, does not give objectives
+
+/obj/machinery/syndicate_beacon/virgo/attack_hand(var/mob/user as mob)
+	usr.set_machine(src)
+	var/dat = "<font color=#005500><i>Scanning [pick("retina pattern", "voice print", "fingerprints", "dna sequence")]...<br>Identity confirmed,<br></i></font>"
+	if(istype(user, /mob/living/carbon/human) || istype(user, /mob/living/silicon/ai))
+		if(is_special_character(user))
+			dat += "<font color=#07700><i>Operative record found. Greetings, Agent [user.name].</i></font><br>"
+		else if(charges < 1)
+			dat += "<TT>Connection severed.</TT><BR>"
+		else
+			var/honorific = "Mr."
+			if(user.gender == FEMALE)
+				honorific = "Ms."
+			dat += "<font color=red><i>Identity not found in operative database. What can the Black Market do for you today, [honorific] [user.name]?</i></font><br>"
+			if(!selfdestructing)
+				dat += "<br><br><A href='?src=\ref[src];betraitor=1;traitormob=\ref[user]'>\"[pick("Send me some supplies!", "Transfer supplies.")]\"</A><BR>"
+	dat += temptext
+	user << browse(dat, "window=syndbeacon")
+	onclose(user, "syndbeacon")
+
+/obj/machinery/syndicate_beacon/virgo/Topic(href, href_list)
+	if(..())
+		return
+	if(href_list["betraitor"])
+		if(charges < 1)
+			updateUsrDialog()
+			return
+		var/mob/M = locate(href_list["traitormob"])
+		if(M.mind.special_role || jobban_isbanned(M, "Syndicate"))
+			temptext = "<i>We have no need for you at this time. Have a pleasant day.</i><br>"
+			updateUsrDialog()
+			return
+		charges -= 1
+		if(istype(M, /mob/living/carbon/human))
+			var/mob/living/carbon/human/N = M
+			to_chat(N, "<B>Access granted, here are the supplies!</B>")
+			traitors.equip(N)
+			message_admins("[N]/([N.ckey]) has recieved an uplink and telecrystals from the syndicate beacon.")
+
+	updateUsrDialog()
+	return

code/modules/mob/living/simple_mob/subtypes/animal/space/space_vr.dm

@@ -0,0 +1,3 @@
+// Fix for Virgo 2's Surface
+/mob/living/simple_mob/animal/space
+	maxbodytemp = 700

code/modules/mob/living/simple_mob/subtypes/mechanical/mechanical_vr.dm

@@ -0,0 +1,3 @@
+// Fix for Virgo 2's Surface
+/mob/living/simple_mob/mechanical
+	maxbodytemp = 700

maps/submaps/surface_submaps/mountains/mountains_areas_vr.dm

@@ -0,0 +1,2 @@
+/area/submap/cave
+	base_turf = /turf/simulated/mineral/floor/ignore_mapgen/cave

maps/tether/submaps/aerostat/submaps/CaveS.dmm

@@ -12,11 +12,6 @@
 "d" = (
 /turf/simulated/mineral/ignore_mapgen/virgo2,
 /area/submap/virgo2/CaveS)
-"e" = (
-/obj/item/ammo_casing/a45,
-/obj/item/weapon/reagent_containers/food/snacks/xenomeat/spidermeat,
-/turf/template_noop,
-/area/submap/virgo2/CaveS)
 "f" = (
 /obj/tether_away_spawner/aerostat_surface,
 /turf/simulated/mineral/floor/ignore_mapgen/virgo2,
@@ -30,10 +25,6 @@
 /obj/item/ammo_casing/a45,
 /turf/template_noop,
 /area/submap/virgo2/CaveS)
-"i" = (
-/obj/item/weapon/reagent_containers/food/snacks/xenomeat/spidermeat,
-/turf/template_noop,
-/area/submap/virgo2/CaveS)
 "j" = (
 /obj/item/clothing/accessory/storage/webbing,
 /obj/item/weapon/material/knife/tacknife/combatknife,
@@ -47,10 +38,6 @@
 /obj/effect/decal/cleanable/cobweb,
 /turf/simulated/mineral/floor/ignore_mapgen/virgo2,
 /area/submap/virgo2/CaveS)
-"m" = (
-/mob/living/simple_mob/animal/giant_spider/lurker,
-/turf/simulated/mineral/floor/ignore_mapgen/virgo2,
-/area/submap/virgo2/CaveS)
 "n" = (
 /obj/effect/decal/cleanable/cobweb2,
 /turf/simulated/mineral/floor/ignore_mapgen/virgo2,
@@ -59,11 +46,6 @@
 /obj/effect/mine,
 /turf/simulated/mineral/floor/ignore_mapgen/virgo2,
 /area/submap/virgo2/CaveS)
-"q" = (
-/obj/effect/decal/cleanable/cobweb2,
-/mob/living/simple_mob/animal/giant_spider/lurker,
-/turf/simulated/mineral/floor/ignore_mapgen/virgo2,
-/area/submap/virgo2/CaveS)
 "r" = (
 /turf/simulated/mineral/floor/ignore_mapgen/virgo2,
 /area/submap/virgo2/CaveS)
@@ -133,11 +115,6 @@
 /obj/item/weapon/material/star,
 /turf/simulated/floor,
 /area/submap/virgo2/CaveS)
-"D" = (
-/obj/effect/spider/stickyweb,
-/mob/living/simple_mob/animal/giant_spider/lurker,
-/turf/simulated/mineral/floor/ignore_mapgen/virgo2,
-/area/submap/virgo2/CaveS)
 "E" = (
 /obj/structure/cable{
 	d1 = 1;
@@ -685,7 +662,7 @@ d
 d
 g
 r
-m
+r
 d
 r
 r
@@ -699,7 +676,7 @@ d
 r
 r
 d
-m
+r
 d
 d
 d
@@ -861,7 +838,7 @@ r
 r
 d
 d
-m
+r
 r
 r
 r
@@ -911,8 +888,8 @@ d
 d
 d
 g
-D
-r
+g
+f
 d
 d
 d
@@ -985,7 +962,7 @@ d
 l
 r
 r
-m
+r
 d
 d
 r
@@ -1016,7 +993,7 @@ b
 b
 b
 b
-i
+b
 b
 d
 d
@@ -1140,7 +1117,7 @@ b
 c
 b
 b
-r
+f
 r
 g
 d
@@ -1180,7 +1157,7 @@ b
 b
 b
 c
-e
+c
 d
 g
 r
@@ -1292,7 +1269,7 @@ u
 u
 r
 r
-m
+r
 d
 d
 d
@@ -1320,7 +1297,7 @@ d
 d
 d
 d
-q
+n
 r
 r
 d
@@ -1333,7 +1310,7 @@ y
 B
 E
 u
-r
+f
 r
 d
 d
@@ -1366,7 +1343,7 @@ d
 r
 r
 d
-m
+r
 r
 u
 u
@@ -1539,7 +1516,7 @@ d
 r
 r
 r
-r
+f
 r
 d
 d

maps/tether/submaps/aerostat/submaps/DJOutpost1.dmm

@@ -4,7 +4,7 @@
 /area/template_noop)
 "b" = (
 /turf/simulated/wall/virgo2,
-/area/submap/DJOutpost1)
+/area/submap/virgo2/DJOutpost1)
 "c" = (
 /obj/structure/grille/broken,
 /obj/item/weapon/material/shard,
@@ -13,23 +13,23 @@
 	},
 /obj/item/stack/rods,
 /turf/simulated/floor,
-/area/submap/DJOutpost1)
+/area/submap/virgo2/DJOutpost1)
 "d" = (
 /obj/structure/grille,
 /obj/structure/window/reinforced/full,
 /turf/simulated/floor,
-/area/submap/DJOutpost1)
+/area/submap/virgo2/DJOutpost1)
 "e" = (
 /turf/simulated/floor/wood,
-/area/submap/DJOutpost1)
+/area/submap/virgo2/DJOutpost1)
 "f" = (
 /obj/machinery/telecomms/relay/preset/ruskie,
 /turf/simulated/floor/wood,
-/area/submap/DJOutpost1)
+/area/submap/virgo2/DJOutpost1)
 "g" = (
 /obj/structure/loot_pile/maint/technical,
 /turf/simulated/floor/wood,
-/area/submap/DJOutpost1)
+/area/submap/virgo2/DJOutpost1)
 "h" = (
 /obj/structure/sign/goldenplaque{
 	desc = "An award given to Sif Free Radio for media excellency. It looks fake.";
@@ -37,11 +37,7 @@
 	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)
+/area/submap/virgo2/DJOutpost1)
 "j" = (
 /obj/effect/decal/remains,
 /obj/effect/decal/cleanable/blood,
@@ -49,11 +45,11 @@
 /obj/item/weapon/material/knife/tacknife/combatknife,
 /obj/random_multi/single_item/sfr_headset,
 /turf/simulated/floor/wood,
-/area/submap/DJOutpost1)
+/area/submap/virgo2/DJOutpost1)
 "k" = (
 /obj/machinery/door/airlock/glass,
 /turf/simulated/floor/wood,
-/area/submap/DJOutpost1)
+/area/submap/virgo2/DJOutpost1)
 "l" = (
 /obj/structure/table/steel_reinforced,
 /obj/item/device/radio/intercom{
@@ -61,7 +57,7 @@
 	dir = 8
 	},
 /turf/simulated/floor/wood,
-/area/submap/DJOutpost1)
+/area/submap/virgo2/DJOutpost1)
 "m" = (
 /obj/machinery/computer/message_monitor,
 /obj/item/weapon/paper/monitorkey,
@@ -71,7 +67,7 @@
 	icon_state = "2-4"
 	},
 /turf/simulated/floor/wood,
-/area/submap/DJOutpost1)
+/area/submap/virgo2/DJOutpost1)
 "n" = (
 /obj/structure/grille,
 /obj/structure/window/reinforced/full,
@@ -82,7 +78,7 @@
 	pixel_x = 0
 	},
 /turf/simulated/floor,
-/area/submap/DJOutpost1)
+/area/submap/virgo2/DJOutpost1)
 "o" = (
 /obj/effect/overlay/snow/floor,
 /obj/structure/cable/yellow{
@@ -93,29 +89,25 @@
 /turf/simulated/floor{
 	outdoors = 1
 	},
-/area/submap/DJOutpost1)
+/area/submap/virgo2/DJOutpost1)
 "p" = (
 /obj/structure/bed/chair/wood,
 /turf/simulated/floor/wood,
-/area/submap/DJOutpost1)
+/area/submap/virgo2/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)
+/area/submap/virgo2/DJOutpost1)
 "s" = (
 /obj/structure/bed/chair/office/dark{
 	icon_state = "officechair_dark";
 	dir = 8
 	},
 /turf/simulated/floor/wood,
-/area/submap/DJOutpost1)
+/area/submap/virgo2/DJOutpost1)
 "t" = (
 /obj/machinery/light{
 	dir = 4;
@@ -131,7 +123,7 @@
 	icon_state = "1-2"
 	},
 /turf/simulated/floor/wood,
-/area/submap/DJOutpost1)
+/area/submap/virgo2/DJOutpost1)
 "u" = (
 /obj/effect/overlay/snow/floor,
 /obj/structure/cable/yellow{
@@ -146,19 +138,19 @@
 /turf/simulated/floor{
 	outdoors = 1
 	},
-/area/submap/DJOutpost1)
+/area/submap/virgo2/DJOutpost1)
 "v" = (
 /obj/structure/table/woodentable,
 /obj/item/trash/candle,
 /turf/simulated/floor/wood,
-/area/submap/DJOutpost1)
+/area/submap/virgo2/DJOutpost1)
 "w" = (
 /obj/structure/bed/chair/wood{
 	icon_state = "wooden_chair";
 	dir = 8
 	},
 /turf/simulated/floor/wood,
-/area/submap/DJOutpost1)
+/area/submap/virgo2/DJOutpost1)
 "x" = (
 /obj/structure/bookcase,
 /obj/item/weapon/book/codex/lore/vir,
@@ -166,17 +158,17 @@
 /obj/item/weapon/book/manual/engineering_construction,
 /obj/item/weapon/storage/bible,
 /turf/simulated/floor/wood,
-/area/submap/DJOutpost1)
+/area/submap/virgo2/DJOutpost1)
 "y" = (
 /obj/item/weapon/storage/toolbox/mechanical,
 /turf/simulated/floor/wood,
-/area/submap/DJOutpost1)
+/area/submap/virgo2/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)
+/area/submap/virgo2/DJOutpost1)
 "A" = (
 /obj/structure/table/steel_reinforced,
 /obj/item/device/radio/intercom/syndicate{
@@ -185,7 +177,7 @@
 	},
 /obj/item/device/multitool,
 /turf/simulated/floor/wood,
-/area/submap/DJOutpost1)
+/area/submap/virgo2/DJOutpost1)
 "B" = (
 /obj/structure/table/steel_reinforced,
 /obj/item/device/radio,
@@ -202,7 +194,7 @@
 	},
 /obj/structure/cable/yellow,
 /turf/simulated/floor/wood,
-/area/submap/DJOutpost1)
+/area/submap/virgo2/DJOutpost1)
 "C" = (
 /obj/effect/overlay/snow/floor,
 /obj/machinery/power/port_gen/pacman,
@@ -210,16 +202,16 @@
 /turf/simulated/floor{
 	outdoors = 1
 	},
-/area/submap/DJOutpost1)
+/area/submap/virgo2/DJOutpost1)
 "D" = (
 /obj/machinery/door/airlock/glass,
 /obj/item/device/gps/internal/poi,
 /turf/simulated/floor/wood,
-/area/submap/DJOutpost1)
+/area/submap/virgo2/DJOutpost1)
 "E" = (
 /obj/machinery/biogenerator,
 /turf/simulated/floor/wood,
-/area/submap/DJOutpost1)
+/area/submap/virgo2/DJOutpost1)
 "F" = (
 /obj/structure/table/woodentable,
 /obj/item/weapon/reagent_containers/food/snacks/unajerky,
@@ -229,7 +221,7 @@
 	},
 /obj/random_multi/single_item/sfr_headset,
 /turf/simulated/floor/wood,
-/area/submap/DJOutpost1)
+/area/submap/virgo2/DJOutpost1)
 "G" = (
 /obj/machinery/light{
 	dir = 4;
@@ -238,18 +230,18 @@
 	},
 /obj/machinery/seed_extractor,
 /turf/simulated/floor/wood,
-/area/submap/DJOutpost1)
+/area/submap/virgo2/DJOutpost1)
 "H" = (
 /obj/structure/bed/chair/wood{
 	icon_state = "wooden_chair";
 	dir = 1
 	},
 /turf/simulated/floor/wood,
-/area/submap/DJOutpost1)
+/area/submap/virgo2/DJOutpost1)
 "I" = (
 /obj/machinery/door/airlock/external,
 /turf/simulated/floor/wood,
-/area/submap/DJOutpost1)
+/area/submap/virgo2/DJOutpost1)
 "J" = (
 /obj/structure/table/woodentable,
 /obj/item/weapon/material/knife/machete/hatchet,
@@ -258,22 +250,22 @@
 /obj/item/device/analyzer/plant_analyzer,
 /obj/random_multi/single_item/sfr_headset,
 /turf/simulated/floor/wood,
-/area/submap/DJOutpost1)
+/area/submap/virgo2/DJOutpost1)
 "K" = (
 /obj/structure/undies_wardrobe,
 /turf/simulated/floor/wood,
-/area/submap/DJOutpost1)
+/area/submap/virgo2/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)
+/area/submap/virgo2/DJOutpost1)
 "M" = (
 /obj/machinery/light/flamp,
 /turf/simulated/floor/wood,
-/area/submap/DJOutpost1)
+/area/submap/virgo2/DJOutpost1)
 "N" = (
 /obj/structure/sink{
 	dir = 4;
@@ -281,18 +273,18 @@
 	pixel_x = 15
 	},
 /turf/simulated/floor/wood,
-/area/submap/DJOutpost1)
+/area/submap/virgo2/DJOutpost1)
 "O" = (
 /obj/structure/bed/padded,
 /obj/item/weapon/bedsheet/clown,
 /turf/simulated/floor/wood,
-/area/submap/DJOutpost1)
+/area/submap/virgo2/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)
+/area/submap/virgo2/DJOutpost1)
 "Q" = (
 /obj/structure/table/rack,
 /obj/item/device/flashlight/lantern,
@@ -300,11 +292,15 @@
 	gps_tag = "Sif Free Radio"
 	},
 /turf/simulated/floor/wood,
-/area/submap/DJOutpost1)
+/area/submap/virgo2/DJOutpost1)
 "R" = (
 /obj/machinery/portable_atmospherics/hydroponics,
 /turf/simulated/floor/wood,
-/area/submap/DJOutpost1)
+/area/submap/virgo2/DJOutpost1)
+"Z" = (
+/obj/tether_away_spawner/aerostat_inside,
+/turf/simulated/floor/wood,
+/area/submap/virgo2/DJOutpost1)
 
 (1,1,1) = {"
 a
@@ -362,11 +358,11 @@ a
 b
 b
 e
-i
 e
+Z
 w
 b
-r
+e
 e
 e
 K
@@ -417,7 +413,7 @@ k
 b
 b
 b
-e
+Z
 e
 b
 L
@@ -437,8 +433,8 @@ D
 e
 e
 I
-r
 e
+Z
 I
 a
 "}
@@ -447,8 +443,8 @@ a
 b
 g
 e
+Z
 e
-r
 e
 b
 e

maps/tether/submaps/aerostat/submaps/DJOutpost2.dmm

@@ -4,7 +4,7 @@
 /area/template_noop)
 "b" = (
 /turf/simulated/wall/virgo2,
-/area/submap/DJOutpost1)
+/area/submap/virgo2/DJOutpost1)
 "c" = (
 /obj/structure/grille/broken,
 /obj/item/weapon/material/shard,
@@ -13,19 +13,19 @@
 	},
 /obj/item/stack/rods,
 /turf/simulated/floor,
-/area/submap/DJOutpost1)
+/area/submap/virgo2/DJOutpost1)
 "d" = (
 /obj/structure/grille/broken,
 /obj/item/weapon/material/shard,
 /turf/simulated/floor,
-/area/submap/DJOutpost1)
+/area/submap/virgo2/DJOutpost1)
 "e" = (
 /turf/simulated/floor/wood/broken,
-/area/submap/DJOutpost1)
+/area/submap/virgo2/DJOutpost1)
 "f" = (
 /obj/structure/loot_pile/maint/technical,
 /turf/simulated/floor/wood/broken,
-/area/submap/DJOutpost1)
+/area/submap/virgo2/DJOutpost1)
 "g" = (
 /obj/structure/sign/goldenplaque{
 	desc = "An award given to Sif Free Radio for media excellency. It looks fake.";
@@ -33,7 +33,7 @@
 	pixel_y = 30
 	},
 /turf/simulated/floor/wood/broken,
-/area/submap/DJOutpost1)
+/area/submap/virgo2/DJOutpost1)
 "h" = (
 /obj/structure/cable/yellow{
 	d1 = 2;
@@ -42,15 +42,15 @@
 	},
 /obj/structure/loot_pile/maint/technical,
 /turf/simulated/floor/wood/broken,
-/area/submap/DJOutpost1)
+/area/submap/virgo2/DJOutpost1)
 "i" = (
 /obj/structure/loot_pile/surface/bones,
 /turf/simulated/floor/wood/broken,
-/area/submap/DJOutpost1)
+/area/submap/virgo2/DJOutpost1)
 "k" = (
 /obj/structure/girder,
 /turf/simulated/floor,
-/area/submap/DJOutpost1)
+/area/submap/virgo2/DJOutpost1)
 "l" = (
 /obj/structure/bed/chair/office/dark{
 	dir = 1
@@ -61,53 +61,53 @@
 	icon_state = "1-2"
 	},
 /turf/simulated/floor/wood/broken,
-/area/submap/DJOutpost1)
+/area/submap/virgo2/DJOutpost1)
 "m" = (
 /obj/structure/table/steel_reinforced,
 /obj/item/device/radio/phone,
 /turf/simulated/floor/outdoors/dirt,
-/area/submap/DJOutpost1)
+/area/submap/virgo2/DJOutpost1)
 "n" = (
 /obj/item/stack/rods,
 /turf/template_noop,
 /area/template_noop)
 "o" = (
 /turf/simulated/floor/outdoors/dirt,
-/area/submap/DJOutpost1)
+/area/submap/virgo2/DJOutpost1)
 "p" = (
 /obj/structure/loot_pile/surface/bones,
 /turf/simulated/floor/outdoors/dirt,
-/area/submap/DJOutpost1)
+/area/submap/virgo2/DJOutpost1)
 "q" = (
 /obj/structure/table/steel_reinforced,
 /obj/item/device/radio,
 /obj/structure/cable/yellow,
 /turf/simulated/floor/wood/broken,
-/area/submap/DJOutpost1)
+/area/submap/virgo2/DJOutpost1)
 "r" = (
 /turf/simulated/floor/outdoors/rocks,
-/area/submap/DJOutpost1)
+/area/submap/virgo2/DJOutpost1)
 "s" = (
 /obj/effect/overlay/snow/floor,
 /turf/simulated/floor{
 	outdoors = 1
 	},
-/area/submap/DJOutpost1)
+/area/submap/virgo2/DJOutpost1)
 "u" = (
 /obj/effect/decal/cleanable/ash,
 /turf/simulated/floor/outdoors/dirt,
-/area/submap/DJOutpost1)
+/area/submap/virgo2/DJOutpost1)
 "w" = (
 /obj/structure/grille/broken,
 /obj/item/weapon/material/shard{
 	 icon_state = "shardmedium"
 	},
 /turf/simulated/floor,
-/area/submap/DJOutpost1)
+/area/submap/virgo2/DJOutpost1)
 "x" = (
 /obj/structure/girder,
 /turf/simulated/floor/outdoors/rocks,
-/area/submap/DJOutpost1)
+/area/submap/virgo2/DJOutpost1)
 "y" = (
 /obj/structure/table/steel_reinforced,
 /obj/item/device/radio/intercom/syndicate{
@@ -115,15 +115,15 @@
 	name = "station intercom (General)"
 	},
 /turf/simulated/floor/outdoors/dirt,
-/area/submap/DJOutpost1)
+/area/submap/virgo2/DJOutpost1)
 "A" = (
 /obj/item/stack/rods,
 /turf/simulated/floor/outdoors/dirt,
-/area/submap/DJOutpost1)
+/area/submap/virgo2/DJOutpost1)
 "B" = (
 /obj/structure/door_assembly/door_assembly_ext,
 /turf/simulated/floor/outdoors/rocks,
-/area/submap/DJOutpost1)
+/area/submap/virgo2/DJOutpost1)
 "C" = (
 /obj/structure/grille/broken,
 /obj/item/weapon/material/shard{
@@ -135,7 +135,7 @@
 	icon_state = "4-8"
 	},
 /turf/simulated/floor,
-/area/submap/DJOutpost1)
+/area/submap/virgo2/DJOutpost1)
 "D" = (
 /obj/item/weapon/material/shard{
 	 icon_state = "shardmedium"
@@ -145,14 +145,14 @@
 "F" = (
 /obj/item/device/transfer_valve,
 /turf/simulated/floor/outdoors/rocks,
-/area/submap/DJOutpost1)
+/area/submap/virgo2/DJOutpost1)
 "G" = (
 /obj/structure/grille/broken,
 /obj/item/weapon/material/shard{
 	icon_state = "medium"
 	},
 /turf/simulated/floor,
-/area/submap/DJOutpost1)
+/area/submap/virgo2/DJOutpost1)
 "H" = (
 /obj/item/weapon/material/shard{
 	icon_state = "medium"
@@ -162,7 +162,7 @@
 "I" = (
 /obj/machinery/door/airlock/external,
 /turf/simulated/floor/wood/broken,
-/area/submap/DJOutpost1)
+/area/submap/virgo2/DJOutpost1)
 "J" = (
 /obj/item/weapon/material/shard,
 /turf/template_noop,
@@ -174,11 +174,11 @@
 	pixel_x = 15
 	},
 /turf/simulated/floor/wood/broken,
-/area/submap/DJOutpost1)
+/area/submap/virgo2/DJOutpost1)
 "L" = (
 /obj/item/weapon/storage/toolbox/mechanical,
 /turf/simulated/floor/outdoors/rocks,
-/area/submap/DJOutpost1)
+/area/submap/virgo2/DJOutpost1)
 "M" = (
 /obj/structure/grille/broken,
 /obj/item/weapon/material/shard{
@@ -186,24 +186,24 @@
 	},
 /obj/item/stack/rods,
 /turf/simulated/floor,
-/area/submap/DJOutpost1)
+/area/submap/virgo2/DJOutpost1)
 "N" = (
 /obj/structure/grille/broken,
 /obj/item/stack/rods,
 /turf/simulated/floor,
-/area/submap/DJOutpost1)
+/area/submap/virgo2/DJOutpost1)
 "O" = (
 /obj/structure/lattice,
 /turf/simulated/floor/outdoors/dirt,
-/area/submap/DJOutpost1)
+/area/submap/virgo2/DJOutpost1)
 "P" = (
 /obj/effect/decal/cleanable/ash,
 /turf/simulated/floor/wood/broken,
-/area/submap/DJOutpost1)
+/area/submap/virgo2/DJOutpost1)
 "S" = (
 /obj/structure/girder,
 /turf/simulated/floor/outdoors/dirt,
-/area/submap/DJOutpost1)
+/area/submap/virgo2/DJOutpost1)
 
 (1,1,1) = {"
 a

maps/tether/submaps/aerostat/submaps/DecoupledEngine.dmm

@@ -50,10 +50,7 @@
 /turf/template_noop,
 /area/submap/virgo2/DecoupledEngine)
 "an" = (
-/turf/simulated/floor/water{
-	color = "#ddaa77";
-	name = "shallow water(?)"
-	},
+/turf/simulated/floor/lava,
 /area/submap/virgo2/DecoupledEngine)
 "ao" = (
 /obj/structure/lattice,
@@ -222,10 +219,7 @@
 	icon_state = "propulsion_r";
 	dir = 4
 	},
-/turf/simulated/floor/water{
-	color = "#ddaa77";
-	name = "shallow water(?)"
-	},
+/turf/simulated/floor/lava,
 /area/submap/virgo2/DecoupledEngine)
 "aP" = (
 /obj/effect/floor_decal/rust,
@@ -302,10 +296,7 @@
 /obj/structure/shuttle/engine/propulsion{
 	dir = 4
 	},
-/turf/simulated/floor/water{
-	color = "#ddaa77";
-	name = "shallow water(?)"
-	},
+/turf/simulated/floor/lava,
 /area/submap/virgo2/DecoupledEngine)
 "aZ" = (
 /obj/item/stack/material/steel,

maps/tether/submaps/aerostat/submaps/Drugden.dmm

@@ -4,118 +4,116 @@
 /area/template_noop)
 "b" = (
 /turf/template_noop,
-/area/submap/Drugd)
+/area/submap/virgo2/Drugd)
 "c" = (
-/turf/simulated/mineral/ignore_mapgen,
-/area/submap/Drugd)
-"d" = (
-/turf/simulated/wall,
-/area/submap/Drugd)
+/turf/simulated/mineral/ignore_mapgen/virgo2,
+/area/submap/virgo2/Drugd)
 "e" = (
 /obj/machinery/door/airlock,
 /turf/simulated/floor,
-/area/submap/Drugd)
+/area/submap/virgo2/Drugd)
 "f" = (
 /turf/simulated/floor/tiled,
-/area/submap/Drugd)
+/area/submap/virgo2/Drugd)
 "g" = (
 /obj/effect/floor_decal/rust,
 /turf/simulated/floor/tiled,
-/area/submap/Drugd)
+/area/submap/virgo2/Drugd)
 "h" = (
 /obj/random/trash,
 /turf/simulated/floor,
-/area/submap/Drugd)
+/area/submap/virgo2/Drugd)
 "i" = (
 /obj/structure/closet/cabinet,
 /obj/item/weapon/lipstick/random,
 /turf/simulated/floor/carpet,
-/area/submap/Drugd)
+/area/submap/virgo2/Drugd)
 "j" = (
 /obj/structure/bed,
 /obj/item/weapon/bedsheet,
 /obj/structure/curtain/open/bed,
 /turf/simulated/floor/carpet,
-/area/submap/Drugd)
+/area/submap/virgo2/Drugd)
 "k" = (
 /obj/structure/table/woodentable,
 /obj/item/weapon/reagent_containers/pill/happy{
 	name = "pill"
 	},
 /turf/simulated/floor/carpet,
-/area/submap/Drugd)
+/area/submap/virgo2/Drugd)
 "l" = (
+/obj/tether_away_spawner/aerostat_inside,
 /turf/simulated/floor,
-/area/submap/Drugd)
+/area/submap/virgo2/Drugd)
 "m" = (
 /obj/structure/curtain/black,
 /turf/simulated/floor,
-/area/submap/Drugd)
+/area/submap/virgo2/Drugd)
 "n" = (
 /obj/random/trash,
 /turf/simulated/floor/carpet,
-/area/submap/Drugd)
+/area/submap/virgo2/Drugd)
 "o" = (
 /turf/simulated/floor/carpet,
-/area/submap/Drugd)
+/area/submap/virgo2/Drugd)
 "p" = (
 /obj/effect/decal/remains/mouse,
 /turf/simulated/floor,
-/area/submap/Drugd)
+/area/submap/virgo2/Drugd)
 "q" = (
 /obj/structure/closet/cabinet,
 /turf/simulated/floor/carpet,
-/area/submap/Drugd)
+/area/submap/virgo2/Drugd)
 "r" = (
 /obj/structure/table/woodentable,
 /obj/item/weapon/reagent_containers/pill/methylphenidate{
 	name = "pill"
 	},
 /turf/simulated/floor/carpet,
-/area/submap/Drugd)
+/area/submap/virgo2/Drugd)
 "s" = (
 /obj/structure/bed/chair/comfy/beige{
 	icon_state = "armchair_preview";
 	dir = 1
 	},
 /turf/simulated/floor/carpet,
-/area/submap/Drugd)
+/area/submap/virgo2/Drugd)
 "t" = (
 /obj/item/weapon/reagent_containers/pill/citalopram{
 	name = "pill"
 	},
 /turf/simulated/floor/carpet,
-/area/submap/Drugd)
+/area/submap/virgo2/Drugd)
 "u" = (
 /obj/random/junk,
 /turf/simulated/floor,
-/area/submap/Drugd)
+/area/submap/virgo2/Drugd)
 "v" = (
 /obj/structure/closet/cabinet,
 /obj/item/weapon/contraband/poster,
 /turf/simulated/floor/carpet,
-/area/submap/Drugd)
+/area/submap/virgo2/Drugd)
 "w" = (
 /obj/structure/bed/chair/comfy/beige,
 /turf/simulated/floor/carpet,
-/area/submap/Drugd)
+/area/submap/virgo2/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)
+/area/submap/virgo2/Drugd)
 "y" = (
 /obj/structure/bed/chair/comfy/beige,
 /obj/item/weapon/reagent_containers/pill/citalopram{
 	name = "pill"
 	},
 /turf/simulated/floor/carpet,
-/area/submap/Drugd)
+/area/submap/virgo2/Drugd)
 "z" = (
 /obj/structure/loot_pile/maint/junk,
 /turf/simulated/floor,
-/area/submap/Drugd)
+/area/submap/virgo2/Drugd)
 "A" = (
 /obj/item/weapon/reagent_containers/pill/citalopram{
 	name = "pill"
@@ -124,111 +122,117 @@
 	name = "pill"
 	},
 /turf/simulated/floor/carpet,
-/area/submap/Drugd)
+/area/submap/virgo2/Drugd)
 "B" = (
 /obj/structure/table/standard,
 /obj/item/weapon/storage/pill_bottle/happy,
 /turf/simulated/floor/tiled,
-/area/submap/Drugd)
+/area/submap/virgo2/Drugd)
 "C" = (
 /obj/structure/table/standard,
 /obj/item/stack/medical/splint,
 /turf/simulated/floor/tiled,
-/area/submap/Drugd)
+/area/submap/virgo2/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)
+/area/submap/virgo2/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)
+/area/submap/virgo2/Drugd)
 "F" = (
 /obj/structure/closet/cabinet,
 /obj/item/clothing/accessory/jacket,
 /obj/item/weapon/material/butterfly/switchblade,
 /turf/simulated/floor/carpet,
-/area/submap/Drugd)
+/area/submap/virgo2/Drugd)
 "G" = (
 /obj/item/weapon/reagent_containers/pill/zoom{
 	name = "pill"
 	},
 /obj/random/trash,
 /turf/simulated/floor/carpet,
-/area/submap/Drugd)
+/area/submap/virgo2/Drugd)
 "H" = (
 /obj/item/weapon/reagent_containers/pill/zoom{
 	name = "pill"
 	},
 /turf/simulated/floor/carpet,
-/area/submap/Drugd)
+/area/submap/virgo2/Drugd)
 "I" = (
 /obj/structure/loot_pile/maint/boxfort,
 /turf/simulated/floor/carpet,
-/area/submap/Drugd)
+/area/submap/virgo2/Drugd)
 "J" = (
 /obj/structure/table/standard,
 /obj/item/weapon/surgical/scalpel,
 /turf/simulated/floor/tiled,
-/area/submap/Drugd)
+/area/submap/virgo2/Drugd)
 "K" = (
 /obj/item/wheelchair,
 /turf/simulated/floor/tiled,
-/area/submap/Drugd)
+/area/submap/virgo2/Drugd)
 "L" = (
 /obj/structure/table/standard,
 /obj/random/firstaid,
 /turf/simulated/floor,
-/area/submap/Drugd)
+/area/submap/virgo2/Drugd)
 "M" = (
 /obj/structure/loot_pile/maint/junk,
 /turf/simulated/floor/tiled,
-/area/submap/Drugd)
+/area/submap/virgo2/Drugd)
 "N" = (
 /obj/effect/floor_decal/rust,
 /obj/structure/table/standard,
 /obj/item/device/survivalcapsule,
 /turf/simulated/floor/tiled,
-/area/submap/Drugd)
+/area/submap/virgo2/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)
+/area/submap/virgo2/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)
+/area/submap/virgo2/Drugd)
 "R" = (
 /obj/structure/girder,
 /turf/simulated/floor,
-/area/submap/Drugd)
+/area/submap/virgo2/Drugd)
 "S" = (
 /obj/item/weapon/material/shard,
 /turf/simulated/floor,
-/area/submap/Drugd)
+/area/submap/virgo2/Drugd)
 "T" = (
 /obj/structure/table/woodentable,
 /obj/item/device/flashlight/lamp,
 /turf/simulated/floor/carpet,
-/area/submap/Drugd)
+/area/submap/virgo2/Drugd)
 "U" = (
 /obj/structure/table/woodentable,
 /obj/item/weapon/reagent_containers/syringe/drugs,
 /turf/simulated/floor/carpet,
-/area/submap/Drugd)
+/area/submap/virgo2/Drugd)
+"V" = (
+/turf/simulated/floor,
+/area/submap/virgo2/Drugd)
+"W" = (
+/turf/simulated/wall/virgo2,
+/area/submap/virgo2/Drugd)
+"X" = (
+/obj/machinery/door/airlock/external,
+/turf/simulated/floor,
+/area/submap/virgo2/Drugd)
 
 (1,1,1) = {"
 a
@@ -407,13 +411,13 @@ c
 c
 c
 c
-d
-d
-d
-d
-d
-d
-d
+W
+W
+W
+W
+W
+W
+W
 c
 c
 c
@@ -434,13 +438,13 @@ c
 c
 c
 c
-d
+W
 B
 J
 N
-l
+V
 R
-d
+W
 c
 c
 c
@@ -461,13 +465,13 @@ c
 c
 c
 c
-d
+W
 C
 K
-l
-Q
-l
-d
+V
+V
+V
+W
 c
 c
 c
@@ -488,13 +492,13 @@ c
 c
 c
 c
-d
+W
 D
 g
 l
-l
+V
 S
-d
+W
 c
 c
 c
@@ -515,13 +519,13 @@ c
 c
 c
 c
-d
+W
 E
 L
 O
-l
-l
-d
+V
+V
+W
 c
 c
 b
@@ -535,20 +539,20 @@ b
 b
 b
 b
-d
-d
-d
-d
-d
-d
-d
-d
-d
-d
-d
+W
+W
+W
+W
+W
+W
+W
+W
+W
+W
+W
 e
-d
-d
+W
+W
 c
 c
 b
@@ -560,22 +564,22 @@ b
 b
 b
 b
-b
-b
-d
+W
+W
+W
 f
 g
 g
 p
 u
-l
+V
 z
-l
-l
+V
+V
 h
-l
-l
-l
+V
+V
+V
 c
 c
 b
@@ -587,21 +591,21 @@ b
 b
 b
 b
-b
-b
-e
+X
+V
+X
 f
 g
+V
+V
+V
 l
-l
-l
-l
-l
-l
+V
+V
 f
-l
-l
-l
+V
+V
+V
 u
 c
 c
@@ -614,22 +618,22 @@ b
 b
 b
 b
-b
-b
-d
+W
+W
+W
 f
 h
-l
-l
+V
+V
 h
-l
+V
 g
 f
 M
 g
-l
+V
 h
-d
+W
 c
 c
 b
@@ -643,20 +647,20 @@ b
 b
 b
 b
-d
-d
-d
+W
+W
+W
 m
-d
-d
-d
+W
+W
+W
 m
-d
-d
-d
+W
+W
+W
 m
-d
-d
+W
+W
 c
 c
 c
@@ -671,19 +675,19 @@ b
 b
 c
 c
-d
+W
 i
 n
 q
-d
+W
 v
 o
 F
-d
+W
 q
 o
 q
-d
+W
 c
 c
 c
@@ -698,19 +702,19 @@ b
 c
 c
 c
-d
+W
 j
 o
 r
-d
+W
 w
 o
 G
-d
+W
 P
 o
 T
-d
+W
 c
 c
 c
@@ -725,19 +729,19 @@ b
 c
 c
 c
-d
+W
 k
 o
 s
-d
+W
 x
 o
 H
-d
+W
 w
 o
 U
-d
+W
 c
 c
 c
@@ -752,19 +756,19 @@ b
 c
 c
 c
-d
+W
 j
 o
 t
-d
+W
 y
 A
 I
-d
+W
 w
 o
 n
-d
+W
 c
 c
 b
@@ -779,19 +783,19 @@ b
 c
 c
 c
-d
-d
-d
-d
-d
-d
-d
-d
-d
-d
-d
-d
-d
+W
+W
+W
+W
+W
+W
+W
+W
+W
+W
+W
+W
+W
 c
 c
 c

maps/tether/submaps/aerostat/submaps/Epod3.dmm

@@ -4,25 +4,25 @@
 /area/template_noop)
 "b" = (
 /turf/template_noop,
-/area/submap/Epod3)
+/area/submap/virgo2/Epod3)
 "c" = (
 /turf/simulated/floor/outdoors/dirt,
-/area/submap/Epod3)
+/area/submap/virgo2/Epod3)
 "d" = (
 /obj/tether_away_spawner/aerostat_surface,
 /turf/template_noop,
-/area/submap/Epod3)
+/area/submap/virgo2/Epod3)
 "e" = (
 /turf/simulated/shuttle/wall,
-/area/submap/Epod3)
+/area/submap/virgo2/Epod3)
 "f" = (
 /obj/tether_away_spawner/aerostat_surface,
 /turf/simulated/floor/outdoors/dirt,
-/area/submap/Epod3)
+/area/submap/virgo2/Epod3)
 "g" = (
 /obj/effect/spider/stickyweb,
 /turf/template_noop,
-/area/submap/Epod3)
+/area/submap/virgo2/Epod3)
 "h" = (
 /obj/structure/bed/chair{
 	dir = 4
@@ -34,7 +34,7 @@
 	pixel_y = -26
 	},
 /turf/simulated/shuttle/floor,
-/area/submap/Epod3)
+/area/submap/virgo2/Epod3)
 "i" = (
 /obj/structure/bed/chair{
 	dir = 4
@@ -46,7 +46,7 @@
 /obj/machinery/light,
 /obj/item/weapon/weldingtool/largetank,
 /turf/simulated/shuttle/floor,
-/area/submap/Epod3)
+/area/submap/virgo2/Epod3)
 "j" = (
 /obj/machinery/status_display{
 	density = 0;
@@ -65,40 +65,37 @@
 /obj/item/clothing/shoes/dress,
 /obj/item/clothing/glasses/sunglasses,
 /obj/random/multiple/gun/projectile/handgun,
+/obj/effect/spider/eggcluster/small/frost,
 /turf/simulated/shuttle/floor,
-/area/submap/Epod3)
+/area/submap/virgo2/Epod3)
 "k" = (
 /obj/structure/shuttle/engine/propulsion/burst{
 	icon_state = "propulsion";
 	dir = 8
 	},
 /turf/simulated/shuttle/wall,
-/area/submap/Epod3)
+/area/submap/virgo2/Epod3)
 "l" = (
 /obj/effect/spider/stickyweb,
 /turf/simulated/floor/outdoors/dirt,
-/area/submap/Epod3)
+/area/submap/virgo2/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)
+/area/submap/virgo2/Epod3)
 "p" = (
 /obj/effect/spider/stickyweb,
 /obj/effect/spider/stickyweb,
 /turf/template_noop,
-/area/submap/Epod3)
+/area/submap/virgo2/Epod3)
 "r" = (
 /obj/structure/shuttle/window,
 /obj/structure/grille,
 /turf/simulated/shuttle/plating,
-/area/submap/Epod3)
+/area/submap/virgo2/Epod3)
 
 (1,1,1) = {"
 a
@@ -225,7 +222,7 @@ a
 b
 l
 c
-n
+c
 l
 l
 f

maps/tether/submaps/aerostat/submaps/Epod4.dmm

@@ -4,21 +4,18 @@
 /area/template_noop)
 "b" = (
 /turf/template_noop,
-/area/submap/Epod4)
+/area/submap/virgo2/Epod4)
 "c" = (
-/turf/simulated/floor/outdoors/dirt,
-/area/submap/Epod4)
-"f" = (
-/turf/simulated/floor/water,
-/area/submap/Epod4)
+/turf/simulated/mineral/floor/ignore_mapgen/virgo2,
+/area/submap/virgo2/Epod4)
 "h" = (
 /turf/simulated/shuttle/wall,
-/area/submap/Epod4)
+/area/submap/virgo2/Epod4)
 "i" = (
 /obj/structure/shuttle/window,
 /obj/structure/grille,
 /turf/simulated/shuttle/plating,
-/area/submap/Epod4)
+/area/submap/virgo2/Epod4)
 "k" = (
 /obj/structure/bed/chair{
 	icon_state = "chair_preview";
@@ -31,11 +28,8 @@
 	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)
+/turf/simulated/mineral/floor/ignore_mapgen/virgo2,
+/area/submap/virgo2/Epod4)
 "m" = (
 /obj/structure/bed/chair{
 	icon_state = "chair_preview";
@@ -56,8 +50,8 @@
 /obj/item/clothing/shoes/brown,
 /obj/item/clothing/under/mbill,
 /obj/item/clothing/head/soft/mbill,
-/turf/simulated/floor/water,
-/area/submap/Epod4)
+/turf/simulated/mineral/floor/ignore_mapgen/virgo2,
+/area/submap/virgo2/Epod4)
 "n" = (
 /obj/structure/bed/chair{
 	icon_state = "chair_preview";
@@ -74,18 +68,21 @@
 	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)
+/turf/simulated/mineral/floor/ignore_mapgen/virgo2,
+/area/submap/virgo2/Epod4)
 "o" = (
 /obj/structure/shuttle/engine/propulsion/burst,
 /turf/simulated/shuttle/wall,
-/area/submap/Epod4)
+/area/submap/virgo2/Epod4)
 "p" = (
 /obj/structure/door_assembly/door_assembly_ext{
 	anchored = 1
 	},
-/turf/simulated/floor/water,
-/area/submap/Epod4)
+/turf/simulated/mineral/floor/ignore_mapgen/virgo2,
+/area/submap/virgo2/Epod4)
+"Y" = (
+/turf/simulated/floor/outdoors/dirt,
+/area/submap/virgo2/Epod4)
 
 (1,1,1) = {"
 a
@@ -128,10 +125,10 @@ c
 c
 c
 c
-f
-f
-f
-f
+c
+c
+c
+c
 c
 c
 c
@@ -144,13 +141,13 @@ b
 c
 c
 c
-f
-f
-l
-l
-l
-f
-f
+c
+c
+c
+c
+c
+c
+c
 c
 c
 a
@@ -160,15 +157,15 @@ a
 b
 c
 c
-f
+c
 h
 h
 h
 h
 o
-l
-l
-f
+c
+c
+c
 c
 a
 "}
@@ -177,22 +174,22 @@ a
 b
 c
 c
-f
+c
 i
 k
 m
 n
 p
-l
-l
-f
+c
+c
+c
 c
 a
 "}
 (7,1,1) = {"
 a
 b
-c
+Y
 c
 c
 h
@@ -200,9 +197,9 @@ h
 h
 h
 o
-l
-f
-f
+c
+c
+c
 c
 a
 "}
@@ -214,10 +211,10 @@ c
 c
 c
 c
-f
-f
-f
-f
+c
+c
+c
+c
 c
 c
 c

maps/tether/submaps/aerostat/submaps/Flake.dmm

@@ -4,19 +4,27 @@
 /area/template_noop)
 "b" = (
 /turf/template_noop,
-/area/submap/Lake1)
+/area/submap/virgo2/Lake1)
+"d" = (
+/obj/machinery/crystal/lava,
+/turf/simulated/floor/outdoors/rocks,
+/area/submap/virgo2/Lake1)
 "f" = (
 /turf/simulated/floor/outdoors/rocks,
-/area/submap/Lake1)
+/area/submap/virgo2/Lake1)
 "h" = (
-/turf/simulated/floor/water,
-/area/submap/Lake1)
+/turf/simulated/floor/lava,
+/area/submap/virgo2/Lake1)
 "i" = (
-/turf/simulated/floor/outdoors/dirt,
-/area/submap/Lake1)
+/turf/simulated/mineral/floor/ignore_mapgen/virgo2,
+/area/submap/virgo2/Lake1)
 "j" = (
-/turf/simulated/mineral,
-/area/submap/Lake1)
+/turf/simulated/mineral/ignore_mapgen/virgo2,
+/area/submap/virgo2/Lake1)
+"R" = (
+/obj/machinery/crystal/lava,
+/turf/simulated/mineral/floor/ignore_mapgen/virgo2,
+/area/submap/virgo2/Lake1)
 
 (1,1,1) = {"
 a
@@ -69,7 +77,7 @@ a
 a
 b
 b
-f
+d
 f
 f
 f
@@ -166,7 +174,7 @@ h
 h
 h
 h
-f
+d
 f
 b
 b
@@ -287,7 +295,7 @@ a
 b
 b
 b
-f
+d
 h
 h
 h
@@ -513,12 +521,12 @@ b
 b
 b
 i
+R
 i
 i
 i
 i
-i
-i
+R
 b
 b
 a
@@ -578,7 +586,7 @@ b
 b
 b
 b
-i
+R
 j
 j
 j
@@ -626,7 +634,7 @@ b
 b
 i
 i
-i
+R
 b
 b
 b

maps/tether/submaps/aerostat/submaps/GovPatrol.dmm

@@ -29,7 +29,7 @@
 /turf/simulated/mineral/floor/ignore_mapgen/virgo2,
 /area/submap/virgo2/GovPatrol)
 "i" = (
-/obj/item/clothing/under/utility/sifguard,
+/obj/item/clothing/under/solgov/utility/sifguard,
 /obj/item/clothing/shoes/boots/jackboots,
 /obj/effect/decal/remains,
 /turf/simulated/mineral/floor/ignore_mapgen/virgo2,

maps/tether/submaps/aerostat/submaps/MHR.dmm

@@ -62,12 +62,6 @@
 	outdoors = 0
 	},
 /area/submap/virgo2/MHR)
-"m" = (
-/obj/item/weapon/reagent_containers/food/snacks/xenomeat/spidermeat,
-/turf/simulated/mineral/floor/ignore_mapgen/virgo2{
-	outdoors = 0
-	},
-/area/submap/virgo2/MHR)
 "n" = (
 /obj/effect/decal/cleanable/spiderling_remains,
 /obj/tether_away_spawner/aerostat_surface,
@@ -102,13 +96,6 @@
 	outdoors = 0
 	},
 /area/submap/virgo2/MHR)
-"s" = (
-/obj/item/weapon/reagent_containers/food/snacks/xenomeat/spidermeat,
-/obj/item/weapon/reagent_containers/food/snacks/xenomeat/spidermeat,
-/turf/simulated/mineral/floor/ignore_mapgen/virgo2{
-	outdoors = 0
-	},
-/area/submap/virgo2/MHR)
 
 (1,1,1) = {"
 a
@@ -296,7 +283,7 @@ e
 e
 e
 e
-m
+d
 d
 d
 n
@@ -323,7 +310,7 @@ d
 d
 d
 d
-s
+d
 e
 e
 e
@@ -366,7 +353,7 @@ e
 f
 d
 d
-s
+d
 d
 e
 e

maps/tether/submaps/aerostat/submaps/Rocky1.dmm

@@ -4,23 +4,23 @@
 /area/template_noop)
 "b" = (
 /turf/template_noop,
-/area/submap/Rocky1)
+/area/submap/virgo2/Rocky1)
 "c" = (
-/turf/simulated/floor/outdoors/dirt,
-/area/submap/Rocky1)
+/turf/simulated/mineral/floor/ignore_mapgen/virgo2,
+/area/submap/virgo2/Rocky1)
 "d" = (
 /obj/structure/boulder,
-/turf/simulated/floor/outdoors/dirt,
-/area/submap/Rocky1)
+/turf/simulated/mineral/floor/ignore_mapgen/virgo2,
+/area/submap/virgo2/Rocky1)
 "e" = (
-/turf/simulated/mineral,
-/area/submap/Rocky1)
+/turf/simulated/mineral/ignore_mapgen/virgo2,
+/area/submap/virgo2/Rocky1)
 "g" = (
 /obj/random/handgun/sec,
 /obj/effect/decal/remains/human,
-/obj/item/weapon/spacecash/c200,
-/turf/simulated/floor/outdoors/dirt,
-/area/submap/Rocky1)
+/obj/item/weapon/storage/secure/briefcase/money,
+/turf/simulated/mineral/floor/ignore_mapgen/virgo2,
+/area/submap/virgo2/Rocky1)
 
 (1,1,1) = {"
 a

maps/tether/submaps/aerostat/submaps/Rocky4.dmm

@@ -4,16 +4,20 @@
 /area/template_noop)
 "b" = (
 /turf/template_noop,
-/area/submap/Rocky4)
+/area/submap/virgo2/Rocky4)
 "c" = (
-/turf/simulated/mineral/ignore_mapgen,
-/area/submap/Rocky4)
+/turf/simulated/mineral/ignore_mapgen/virgo2,
+/area/submap/virgo2/Rocky4)
 "e" = (
 /turf/simulated/floor/outdoors/rocks,
-/area/submap/Rocky4)
+/area/submap/virgo2/Rocky4)
 "f" = (
-/turf/simulated/floor/water,
-/area/submap/Rocky4)
+/turf/simulated/floor/lava,
+/area/submap/virgo2/Rocky4)
+"Y" = (
+/obj/machinery/crystal/lava,
+/turf/simulated/floor/outdoors/rocks,
+/area/submap/virgo2/Rocky4)
 
 (1,1,1) = {"
 a
@@ -210,7 +214,7 @@ c
 c
 b
 b
-e
+Y
 e
 e
 e

maps/tether/submaps/aerostat/submaps/butchershack.dmm

@@ -3,11 +3,8 @@
 /turf/template_noop,
 /area/template_noop)
 "b" = (
-/turf/simulated/wall/log_sif,
-/area/submap/ButcherShack)
-"c" = (
-/turf/simulated/floor/wood/sif,
-/area/submap/ButcherShack)
+/turf/simulated/wall/virgo2,
+/area/submap/virgo2/ButcherShack)
 "d" = (
 /obj/structure/closet,
 /obj/effect/decal/cleanable/cobweb,
@@ -15,12 +12,12 @@
 /obj/item/weapon/beartrap,
 /obj/item/weapon/packageWrap,
 /obj/item/weapon/material/knife/hook,
-/turf/simulated/floor/wood/sif,
-/area/submap/ButcherShack)
+/turf/simulated/floor/tiled,
+/area/submap/virgo2/ButcherShack)
 "e" = (
 /obj/structure/closet/secure_closet/freezer/meat,
-/turf/simulated/floor/wood/sif,
-/area/submap/ButcherShack)
+/turf/simulated/floor/tiled,
+/area/submap/virgo2/ButcherShack)
 "f" = (
 /obj/structure/closet/crate/freezer,
 /obj/effect/decal/cleanable/blood/gibs,
@@ -34,85 +31,86 @@
 /obj/random/meat,
 /obj/random/meat,
 /obj/random/meat,
-/turf/simulated/floor/wood/sif/broken,
-/area/submap/ButcherShack)
+/turf/simulated/floor/tiled,
+/area/submap/virgo2/ButcherShack)
 "g" = (
 /obj/machinery/gibber/autogibber,
-/turf/simulated/floor/wood/sif,
-/area/submap/ButcherShack)
+/turf/simulated/floor/tiled,
+/area/submap/virgo2/ButcherShack)
 "h" = (
-/turf/simulated/floor/wood/sif/broken,
-/area/submap/ButcherShack)
+/turf/simulated/floor/tiled,
+/area/submap/virgo2/ButcherShack)
 "i" = (
 /obj/structure/window/basic,
 /obj/structure/curtain,
 /turf/simulated/floor/wood/sif/broken,
-/area/submap/ButcherShack)
+/area/submap/virgo2/ButcherShack)
 "j" = (
 /turf/template_noop,
-/area/submap/ButcherShack)
-"k" = (
-/obj/structure/simple_door/sifwood,
-/turf/simulated/floor/wood/sif,
-/area/submap/ButcherShack)
+/area/submap/virgo2/ButcherShack)
 "l" = (
 /obj/structure/loot_pile/maint/trash,
-/turf/simulated/floor/outdoors/dirt,
-/area/submap/ButcherShack)
+/turf/simulated/mineral/floor/virgo2,
+/area/submap/virgo2/ButcherShack)
 "m" = (
 /obj/structure/kitchenspike,
 /obj/effect/decal/cleanable/blood,
-/turf/simulated/floor/wood/sif,
-/area/submap/ButcherShack)
+/turf/simulated/floor/tiled,
+/area/submap/virgo2/ButcherShack)
 "n" = (
 /obj/structure/kitchenspike,
 /obj/effect/decal/cleanable/blood/drip,
-/turf/simulated/floor/wood/sif,
-/area/submap/ButcherShack)
+/turf/simulated/floor/tiled,
+/area/submap/virgo2/ButcherShack)
 "o" = (
 /obj/effect/decal/cleanable/blood,
-/turf/simulated/floor/wood/sif,
-/area/submap/ButcherShack)
+/turf/simulated/floor/tiled,
+/area/submap/virgo2/ButcherShack)
 "p" = (
 /obj/structure/table/standard,
 /obj/item/clothing/suit/chef/classic,
-/turf/simulated/floor/wood/sif,
-/area/submap/ButcherShack)
+/turf/simulated/floor/tiled,
+/area/submap/virgo2/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)
+/turf/simulated/floor/tiled,
+/area/submap/virgo2/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)
+/turf/simulated/floor/tiled,
+/area/submap/virgo2/ButcherShack)
 "s" = (
 /obj/structure/coatrack,
-/turf/simulated/floor/wood/sif,
-/area/submap/ButcherShack)
+/turf/simulated/floor/tiled,
+/area/submap/virgo2/ButcherShack)
 "t" = (
 /obj/structure/bed/padded,
 /obj/item/weapon/bedsheet/brown,
-/turf/simulated/floor/wood/sif,
-/area/submap/ButcherShack)
+/turf/simulated/floor/tiled,
+/area/submap/virgo2/ButcherShack)
 "u" = (
 /obj/effect/decal/cleanable/blood/drip,
-/turf/simulated/floor/wood/sif/broken,
-/area/submap/ButcherShack)
+/obj/machinery/door/airlock/external,
+/turf/simulated/floor/tiled,
+/area/submap/virgo2/ButcherShack)
 "v" = (
-/turf/simulated/floor/outdoors/dirt,
-/area/submap/ButcherShack)
+/turf/simulated/mineral/floor/virgo2,
+/area/submap/virgo2/ButcherShack)
 "w" = (
 /obj/structure/window/basic,
 /obj/structure/curtain,
 /turf/simulated/floor/wood/sif,
-/area/submap/ButcherShack)
+/area/submap/virgo2/ButcherShack)
+"x" = (
+/obj/machinery/door/airlock/external,
+/turf/simulated/floor/tiled,
+/area/submap/virgo2/ButcherShack)
 
 (1,1,1) = {"
 a
@@ -143,44 +141,44 @@ a
 b
 d
 h
-c
+h
 s
 b
 b
-v
+b
 a
 "}
 (4,1,1) = {"
 a
 b
 m
-c
+h
 p
 o
 u
-k
-v
+h
+x
 a
 "}
 (5,1,1) = {"
 a
 b
 n
-c
+h
 q
-c
+h
+b
 b
 b
-v
 a
 "}
 (6,1,1) = {"
 a
 b
 e
-c
+h
 r
-c
+h
 i
 l
 v
@@ -191,7 +189,7 @@ a
 b
 f
 o
-c
+h
 h
 w
 l
@@ -202,8 +200,8 @@ a
 a
 b
 g
-c
-c
+h
+h
 t
 b
 v

maps/tether/submaps/aerostat/submaps/virgo2_submap_areas.dm

@@ -5,50 +5,80 @@
 	base_turf = /turf/simulated/mineral/floor/ignore_mapgen/virgo2
 
 /area/submap/virgo2/spider1
-	name = "spider nest"
+	name = "POI - spider nest"
 
 /area/submap/virgo2/Field1
-	name = "Field 1"
+	name = "POI - Field 1"
 
 /area/submap/virgo2/Lake1
-	name = "Lake 1"
+	name = "POI - Lake 1"
 
 /area/submap/virgo2/MilitaryCamp1
-	name = "Military Camp 1"
+	name = "POI - Military Camp 1"
 
 /area/submap/virgo2/Mudpit
-	name = "Mudpit"
+	name = "POI - Mudpit"
 
 /area/submap/virgo2/Shack1
-	name = "Shack1"
+	name = "POI - Shack1"
 
 /area/submap/virgo2/Small1
-	name = "Small1"
+	name = "POI - Small1"
 
 /area/submap/virgo2/SnowR1
-	name = "SnowR1"
+	name = "POI - SnowR1"
 
 /area/submap/virgo2/BoomBase
-	name = "Boom1"
+	name = "POI - Boom1"
 
 /area/submap/virgo2/Blackshuttledown
-	name = "BSD"
+	name = "POI - BSD"
 	requires_power = FALSE
 
 /area/submap/virgo2/Lab1
-	name = "Lab1"
+	name = "POI - Lab1"
 
 /area/submap/virgo2/MHR
-	name = "Manhack Rock"
+	name = "POI - Manhack Rock"
 
 /area/submap/virgo2/Rockybase
-	name = "Rockybase"
+	name = "POI - Rockybase"
 
 /area/submap/virgo2/GovPatrol
-	name = "GovPatrol"
+	name = "POI - GovPatrol"
 
 /area/submap/virgo2/DecoupledEngine
-	name = "DecoupledEngine"
+	name = "POI - DecoupledEngine"
 
 /area/submap/virgo2/CaveS
-	name = "CaveS"
+	name = "POI - CaveS"
+
+/area/submap/virgo2/ButcherShack
+	name = "POI - CaveS"
+
+/area/submap/virgo2/DJOutpost1
+	name = "POI - DJOutpost1"
+
+/area/submap/virgo2/DoomP
+	name = "POI - DoomP"
+
+/area/submap/virgo2/Drugd
+	name = "POI - Drugd"
+
+/area/submap/virgo2/Epod3
+	name = "POI - Epod3"
+
+/area/submap/virgo2/Epod4
+	name = "POI - Epod4"
+
+/area/submap/virgo2/Lake1
+	name = "POI - Lake1"
+
+/area/submap/virgo2/Manor1
+	name = "POI - Manor1"
+
+/area/submap/virgo2/Rocky1
+	name = "POI - Rocky1"
+
+/area/submap/virgo2/Rocky4
+	name = "POI - Rocky4"

maps/tether/submaps/aerostat/surface.dmm

@@ -22,8 +22,7 @@
 /turf/simulated/mineral/floor/ignore_mapgen/virgo2,
 /area/tether_away/aerostat/surface/explored)
 "s" = (
-/obj/structure/stairs/east,
-/turf/simulated/mineral/floor/ignore_mapgen/virgo2,
+/turf/simulated/floor/plating/virgo2,
 /area/tether_away/aerostat/surface/explored)
 "A" = (
 /obj/structure/railing{
@@ -57,10 +56,6 @@
 	},
 /turf/simulated/mineral/floor/ignore_mapgen/virgo2,
 /area/tether_away/aerostat/surface/explored)
-"Z" = (
-/obj/structure/stairs/west,
-/turf/simulated/mineral/floor/ignore_mapgen/virgo2,
-/area/tether_away/aerostat/surface/explored)
 
 (1,1,1) = {"
 b
@@ -10780,8 +10775,8 @@ A
 A
 A
 A
-Z
-Z
+s
+s
 A
 A
 A

vorestation.dme

@@ -763,6 +763,7 @@
 #include "code\game\machinery\supply_display.dm"
 #include "code\game\machinery\supplybeacon.dm"
 #include "code\game\machinery\syndicatebeacon.dm"
+#include "code\game\machinery\syndicatebeacon_vr.dm"
 #include "code\game\machinery\teleporter.dm"
 #include "code\game\machinery\transportpod.dm"
 #include "code\game\machinery\turret_control.dm"
@@ -2446,6 +2447,7 @@
 #include "code\modules\mob\living\simple_mob\subtypes\animal\space\goose_vr.dm"
 #include "code\modules\mob\living\simple_mob\subtypes\animal\space\snake_vr.dm"
 #include "code\modules\mob\living\simple_mob\subtypes\animal\space\space.dm"
+#include "code\modules\mob\living\simple_mob\subtypes\animal\space\space_vr.dm"
 #include "code\modules\mob\living\simple_mob\subtypes\animal\space\worm.dm"
 #include "code\modules\mob\living\simple_mob\subtypes\blob\blob.dm"
 #include "code\modules\mob\living\simple_mob\subtypes\blob\spore.dm"
@@ -2474,6 +2476,7 @@
 #include "code\modules\mob\living\simple_mob\subtypes\mechanical\golem.dm"
 #include "code\modules\mob\living\simple_mob\subtypes\mechanical\golem_vr.dm"
 #include "code\modules\mob\living\simple_mob\subtypes\mechanical\mechanical.dm"
+#include "code\modules\mob\living\simple_mob\subtypes\mechanical\mechanical_vr.dm"
 #include "code\modules\mob\living\simple_mob\subtypes\mechanical\viscerator.dm"
 #include "code\modules\mob\living\simple_mob\subtypes\mechanical\hivebot\hivebot.dm"
 #include "code\modules\mob\living\simple_mob\subtypes\mechanical\hivebot\hivebot_vr.dm"
@@ -3323,6 +3326,7 @@
 #include "maps\submaps\space_submaps\debrisfield\debrisfield.dm"
 #include "maps\submaps\surface_submaps\mountains\mountains.dm"
 #include "maps\submaps\surface_submaps\mountains\mountains_areas.dm"
+#include "maps\submaps\surface_submaps\mountains\mountains_areas_vr.dm"
 #include "maps\submaps\surface_submaps\plains\plains.dm"
 #include "maps\submaps\surface_submaps\plains\plains_areas.dm"
 #include "maps\submaps\surface_submaps\wilderness\wilderness.dm"