diff --git a/code/modules/mob/living/silicon/robot/drone/drone_vr.dm b/code/modules/mob/living/silicon/robot/drone/drone_vr.dm
deleted file mode 100644
index 77e2a4ed41..0000000000
--- a/code/modules/mob/living/silicon/robot/drone/drone_vr.dm
+++ /dev/null
@@ -1,9 +0,0 @@
-/mob/living/silicon/robot/drone
-	can_enter_vent_with = list(
-		/obj/item/device/radio/borg,
-		/obj/machinery/camera,
-		/obj/item/device/camera/siliconcam/drone_camera,
-		/obj/item/weapon/robot_module/drone,
-		/obj/item/weapon/cell,
-		/obj/screen/movable/ability_master,
-		/obj/item/weapon/card/id/synthetic)
diff --git a/maps/tether/submaps/aerostat/submaps/Rockybase.dmm b/maps/tether/submaps/aerostat/submaps/Rockybase.dmm
index fb2cb01a75..e7977a3af5 100644
--- a/maps/tether/submaps/aerostat/submaps/Rockybase.dmm
+++ b/maps/tether/submaps/aerostat/submaps/Rockybase.dmm
@@ -1,16 +1,17 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
 "aa" = (
 /mob/living/simple_animal/hostile/viscerator{
+	maxbodytemp = 900;
 	returns_home = 1
 	},
-/turf/template_noop,
+/turf/simulated/mineral/floor/ignore_mapgen/virgo2,
 /area/template_noop)
 "ab" = (
 /turf/template_noop,
 /area/template_noop)
 "ac" = (
 /obj/effect/decal/remains,
-/turf/template_noop,
+/turf/simulated/mineral/floor/ignore_mapgen/virgo2,
 /area/submap/virgo2/Rockybase)
 "ad" = (
 /turf/template_noop,
@@ -22,9 +23,11 @@
 "af" = (
 /mob/living/simple_animal/hostile/malf_drone{
 	desc = "An automated combat drone with an aged apperance.";
+	faction = "syndicate";
+	maxbodytemp = 900;
 	returns_home = 1
 	},
-/turf/template_noop,
+/turf/simulated/mineral/floor/ignore_mapgen/virgo2,
 /area/submap/virgo2/Rockybase)
 "ag" = (
 /turf/simulated/mineral/ignore_mapgen/virgo2,
@@ -356,6 +359,8 @@
 "bl" = (
 /mob/living/simple_animal/hostile/malf_drone{
 	desc = "An automated combat drone with an aged apperance.";
+	faction = "syndicate";
+	maxbodytemp = 900;
 	returns_home = 1
 	},
 /turf/simulated/floor/tiled/techfloor/virgo2,
@@ -575,7 +580,9 @@
 /turf/simulated/floor/tiled/techfloor/virgo2,
 /area/submap/virgo2/Rockybase)
 "bZ" = (
-/obj/machinery/drone_fabricator,
+/obj/machinery/drone_fabricator{
+	fabricator_tag = "Unknown Location"
+	},
 /turf/simulated/floor/tiled/techfloor/virgo2,
 /area/submap/virgo2/Rockybase)
 "ca" = (
@@ -657,7 +664,9 @@
 /turf/simulated/floor/tiled/techfloor/virgo2,
 /area/submap/virgo2/Rockybase)
 "co" = (
-/mob/living/simple_animal/hostile/mecha/malf_drone,
+/mob/living/simple_animal/hostile/mecha/malf_drone{
+	faction = "syndicate"
+	},
 /turf/simulated/floor/tiled/techfloor/virgo2,
 /area/submap/virgo2/Rockybase)
 "cp" = (
@@ -755,15 +764,6 @@
 /obj/structure/closet/secure_closet/medical3,
 /turf/simulated/floor/tiled/techfloor/virgo2,
 /area/submap/virgo2/Rockybase)
-"cz" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
-/mob/living/simple_animal/hostile/malf_drone{
-	desc = "An automated combat drone with an aged apperance.";
-	returns_home = 1
-	},
-/turf/simulated/floor/tiled/techfloor/virgo2,
-/area/submap/virgo2/Rockybase)
 "cA" = (
 /obj/structure/closet/secure_closet/hydroponics,
 /turf/simulated/floor/tiled/techfloor/virgo2,
@@ -833,11 +833,31 @@
 /area/submap/virgo2/Rockybase)
 "cT" = (
 /obj/effect/decal/remains,
-/turf/template_noop,
+/turf/simulated/mineral/floor/ignore_mapgen/virgo2,
 /area/template_noop)
 
 (1,1,1) = {"
 aa
+bz
+bz
+bz
+bz
+bz
+bz
+bz
+bz
+bz
+bz
+bz
+bz
+bz
+bz
+bz
+bz
+bz
+bz
+bz
+bz
 ab
 ab
 ab
@@ -845,38 +865,18 @@ ab
 ab
 ab
 ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
+bz
 aa
 "}
 (2,1,1) = {"
-ab
+bz
 ac
-ad
-ad
-ad
-ad
-ad
-ad
+cO
+cO
+cO
+cO
+cO
+cO
 ad
 ad
 ad
@@ -885,27 +885,27 @@ ag
 ag
 ag
 ag
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ab
+cO
+cO
+cO
+cO
+cO
+cO
+cO
+cO
+cO
+cO
+cO
+cO
+cO
+bz
 "}
 (3,1,1) = {"
-ab
-ad
-ad
-ad
-ad
+bz
+cO
+cO
+cO
+cO
 ad
 ad
 ag
@@ -928,16 +928,16 @@ ag
 ag
 ag
 ag
-ad
-ad
+cO
+cO
 cT
 "}
 (4,1,1) = {"
-ab
-ad
-ad
-ad
-ad
+bz
+cO
+cO
+cO
+cO
 ag
 ag
 ag
@@ -961,15 +961,15 @@ ag
 ag
 ag
 ag
-ad
-ab
+cO
+bz
 "}
 (5,1,1) = {"
-ab
-ad
-ad
-ad
-ad
+bz
+cO
+cO
+cO
+cO
 ag
 ag
 ag
@@ -993,15 +993,15 @@ al
 ag
 ag
 ag
-ad
+cO
 ab
 "}
 (6,1,1) = {"
-ab
-ad
-ad
-ad
-ad
+bz
+cO
+cO
+cO
+cO
 ag
 ag
 ag
@@ -1025,15 +1025,15 @@ al
 ag
 ag
 ag
-ad
+cO
 ab
 "}
 (7,1,1) = {"
-ab
-ad
-ad
-ad
-ad
+bz
+cO
+cO
+cO
+cO
 ag
 ag
 ag
@@ -1057,15 +1057,15 @@ al
 ag
 ag
 ag
-ad
+cO
 ab
 "}
 (8,1,1) = {"
-ab
-ad
-ad
-ad
-ad
+bz
+cO
+cO
+cO
+cO
 ag
 ag
 ag
@@ -1089,15 +1089,15 @@ al
 ag
 ag
 ag
-ad
-ab
+cO
+bz
 "}
 (9,1,1) = {"
-ab
-ad
-ad
-ad
-ad
+bz
+cO
+cO
+cO
+cO
 ad
 ag
 ag
@@ -1121,15 +1121,15 @@ al
 ag
 ag
 ag
-ad
-ab
+cO
+bz
 "}
 (10,1,1) = {"
-ab
-ad
-ad
-ad
-ad
+bz
+cO
+cO
+cO
+cO
 ad
 ad
 ag
@@ -1154,15 +1154,15 @@ ag
 ag
 ag
 ag
-ab
+bz
 "}
 (11,1,1) = {"
-ab
-ad
-ad
-ad
-ad
-ad
+bz
+cO
+cO
+cO
+cO
+cO
 ad
 ag
 ag
@@ -1186,15 +1186,15 @@ ag
 ag
 ag
 ag
-ab
+bz
 "}
 (12,1,1) = {"
 ab
-ad
-ad
-ad
+cO
+cO
+cO
 af
-ad
+cO
 ad
 ag
 ag
@@ -1218,15 +1218,15 @@ ag
 ag
 ag
 ag
-ab
+bz
 "}
 (13,1,1) = {"
 ab
-ad
-ad
-ad
-ad
-ad
+cO
+cO
+cO
+cO
+cO
 ad
 ag
 ag
@@ -1250,15 +1250,15 @@ ag
 ag
 ag
 ag
-ab
+bz
 "}
 (14,1,1) = {"
 ab
+cO
 ad
-ad
-ad
-ad
-ad
+cO
+cO
+cO
 ag
 ag
 ag
@@ -1282,15 +1282,15 @@ ag
 ag
 ag
 ag
-ab
+bz
 "}
 (15,1,1) = {"
 ab
+cO
 ad
-ad
-ad
-ad
-ad
+cO
+cO
+cO
 ag
 ag
 ag
@@ -1313,16 +1313,16 @@ al
 ag
 ag
 ag
-ad
-ab
+cO
+bz
 "}
 (16,1,1) = {"
 ab
+cO
 ad
-ad
-ad
-ad
-ad
+cO
+cO
+cO
 ag
 ag
 ag
@@ -1345,16 +1345,16 @@ al
 ag
 ag
 af
-ad
-ab
+cO
+bz
 "}
 (17,1,1) = {"
-ab
-ad
-ad
-ad
-ad
+bz
+cO
 ad
+cO
+cO
+cO
 ag
 ag
 ag
@@ -1376,17 +1376,17 @@ cB
 al
 ag
 ag
-ad
-ad
-ab
+cO
+cO
+bz
 "}
 (18,1,1) = {"
-ab
-ad
-ad
-ad
+bz
 ad
 ad
+cO
+cO
+cO
 ag
 ag
 ag
@@ -1408,17 +1408,17 @@ ao
 al
 ag
 ag
-ad
-ad
-ab
+cO
+cO
+bz
 "}
 (19,1,1) = {"
-ab
-ad
-ad
-ad
-ad
-ad
+bz
+cO
+cO
+cO
+cO
+cO
 ad
 ag
 ag
@@ -1440,17 +1440,17 @@ cB
 al
 ag
 ag
-ad
-ad
-ab
+cO
+cO
+bz
 "}
 (20,1,1) = {"
-ab
-ad
-ad
-ad
-ad
-ad
+bz
+cO
+cO
+cO
+cO
+cO
 ad
 ad
 ag
@@ -1473,16 +1473,16 @@ al
 ag
 ag
 ag
-ad
-ab
+cO
+bz
 "}
 (21,1,1) = {"
 aa
-ad
-ad
-ad
-ad
-ad
+cO
+cO
+cO
+cO
+cO
 cO
 cO
 ag
@@ -1505,11 +1505,11 @@ al
 ag
 ag
 ag
-ad
-ab
+cO
+bz
 "}
 (22,1,1) = {"
-ab
+bz
 ad
 ad
 ad
@@ -1537,7 +1537,7 @@ al
 ag
 ag
 ag
-ad
+cO
 aa
 "}
 (23,1,1) = {"
@@ -1569,8 +1569,8 @@ al
 ag
 ag
 ag
-ad
-ab
+cO
+bz
 "}
 (24,1,1) = {"
 bz
@@ -1601,8 +1601,8 @@ al
 ag
 ag
 ag
-ad
-ab
+cO
+bz
 "}
 (25,1,1) = {"
 an
@@ -1633,8 +1633,8 @@ al
 ag
 ag
 ag
-ad
-ab
+cO
+bz
 "}
 (26,1,1) = {"
 an
@@ -1664,8 +1664,8 @@ cF
 al
 ag
 ag
-ad
-ad
+cO
+cO
 ab
 "}
 (27,1,1) = {"
@@ -1696,8 +1696,8 @@ cG
 al
 ag
 ag
-ad
-ad
+cO
+cO
 ab
 "}
 (28,1,1) = {"
@@ -1728,8 +1728,8 @@ bq
 al
 ag
 ag
-ad
-ad
+cO
+cO
 ab
 "}
 (29,1,1) = {"
@@ -1760,8 +1760,8 @@ al
 al
 ag
 ag
-ad
-ad
+cO
+cO
 ab
 "}
 (30,1,1) = {"
@@ -1792,7 +1792,7 @@ cH
 al
 ag
 ag
-ad
+cO
 ad
 ab
 "}
@@ -1824,7 +1824,7 @@ ao
 al
 ag
 ag
-ad
+cO
 ad
 ab
 "}
@@ -1855,8 +1855,8 @@ ao
 cI
 al
 ag
-ad
-ad
+cO
+cO
 ad
 ab
 "}
@@ -1883,12 +1883,12 @@ bL
 bO
 ch
 ct
-cz
+ch
 ao
 al
 ag
 ag
-ad
+cO
 ad
 ab
 "}
@@ -1920,7 +1920,7 @@ ao
 al
 ag
 ag
-ad
+cO
 ad
 ab
 "}
@@ -1952,7 +1952,7 @@ cJ
 al
 ag
 ag
-ad
+cO
 ad
 ab
 "}
@@ -1983,8 +1983,8 @@ bU
 bW
 al
 ag
-ad
-ad
+cO
+cO
 ad
 ab
 "}
@@ -1992,8 +1992,8 @@ ab
 ab
 ad
 ad
-ad
-ad
+cO
+cO
 cO
 cO
 cO
@@ -2015,8 +2015,8 @@ bU
 cJ
 al
 ag
-ad
-ad
+cO
+cO
 ad
 ab
 "}
@@ -2024,9 +2024,9 @@ ab
 ab
 ad
 ad
-ad
-ad
-ad
+cO
+cO
+cO
 cO
 cO
 ag
@@ -2047,8 +2047,8 @@ bU
 cK
 al
 ag
-ad
-ad
+cO
+cO
 ad
 ab
 "}
@@ -2056,9 +2056,9 @@ ab
 ab
 ad
 ad
-ad
-ad
-ad
+cO
+cO
+cO
 ad
 ad
 ag
@@ -2080,7 +2080,7 @@ bO
 al
 ag
 ag
-ad
+cO
 ad
 ab
 "}
@@ -2088,9 +2088,9 @@ ab
 ab
 ad
 ad
-ad
-ad
-ad
+cO
+cO
+cO
 ad
 ag
 ag
@@ -2112,7 +2112,7 @@ cL
 al
 ag
 ag
-ad
+cO
 ad
 ab
 "}
@@ -2120,9 +2120,9 @@ ab
 ab
 ad
 ad
-ad
-ad
-ad
+cO
+cO
+cO
 ad
 ag
 ag
@@ -2144,17 +2144,17 @@ al
 al
 ag
 ag
-ad
+cO
 ad
 ab
 "}
 (42,1,1) = {"
 ab
-ad
-ad
-ad
-ad
-ad
+cO
+cO
+cO
+cO
+cO
 ag
 ag
 ag
@@ -2176,17 +2176,17 @@ cM
 al
 ag
 ag
-ad
+cO
 ad
 ab
 "}
 (43,1,1) = {"
 ab
-ad
-ad
-ad
-ad
-ad
+cO
+cO
+cO
+cO
+cO
 ag
 ag
 ag
@@ -2208,17 +2208,17 @@ cN
 al
 ag
 ag
-ad
+cO
 ad
 ab
 "}
 (44,1,1) = {"
 ab
 ac
-ad
-ad
-ad
-ad
+cO
+cO
+cO
+cO
 ag
 ag
 ag
@@ -2240,18 +2240,18 @@ al
 al
 ag
 ag
-ad
+cO
 ad
 ab
 "}
 (45,1,1) = {"
-ab
-ad
-ad
+bz
+cO
+cO
 af
-ad
-ad
-ad
+cO
+cO
+cO
 ag
 ag
 ag
@@ -2272,18 +2272,18 @@ al
 ag
 ag
 ag
-ad
+cO
 ad
 ab
 "}
 (46,1,1) = {"
-ab
-ad
-ad
-ad
-ad
-ad
-ad
+bz
+cO
+cO
+cO
+cO
+cO
+cO
 ag
 ag
 ag
@@ -2303,19 +2303,19 @@ ag
 ag
 ag
 ag
-ad
-ad
-ad
+cO
+cO
+cO
 cT
 "}
 (47,1,1) = {"
-ab
-ad
-ad
-ad
-ad
-ad
-ad
+bz
+cO
+cO
+cO
+cO
+cO
+cO
 ag
 ag
 ag
@@ -2331,23 +2331,23 @@ ag
 ag
 ag
 ag
-ad
+cO
 ag
-ad
-ad
-ad
-ad
-ad
-ab
+cO
+cO
+cO
+cO
+cO
+bz
 "}
 (48,1,1) = {"
-ab
-ad
-ad
-ad
-ad
-ad
-ad
+bz
+cO
+cO
+cO
+cO
+cO
+cO
 ag
 ag
 ag
@@ -2361,64 +2361,64 @@ ag
 ag
 ag
 ag
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ab
+cO
+cO
+cO
+cO
+cO
+cO
+cO
+cO
+cO
+bz
 "}
 (49,1,1) = {"
-ab
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
+bz
+cO
+cO
 ad
 ad
 ad
+cO
+cO
+cO
+cO
+cO
+cO
+cO
+cO
+cO
+cO
+cO
+cO
+cO
+cO
+cO
+cO
+cO
+cO
 af
-ad
-ad
+cO
+cO
 ad
 ad
 ab
 "}
 (50,1,1) = {"
 aa
+bz
+bz
 ab
 ab
 ab
 ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
+bz
+bz
+bz
+bz
+bz
+bz
+bz
 ab
 ab
 ab
diff --git a/maps/tether/tether-01-surface1.dmm b/maps/tether/tether-01-surface1.dmm
index a3c8db4fdd..fb3ff2aabc 100644
--- a/maps/tether/tether-01-surface1.dmm
+++ b/maps/tether/tether-01-surface1.dmm
@@ -150,8 +150,7 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/cyan{
 	dir = 10;
-	icon_state = "intact";
-
+	icon_state = "intact"
 	},
 /turf/simulated/floor/tiled,
 /area/tether/surfacebase/mining_main/airlock)
@@ -363,8 +362,7 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/cyan{
 	dir = 5;
-	icon_state = "intact";
-
+	icon_state = "intact"
 	},
 /obj/machinery/atmospherics/unary/vent_pump/high_volume{
 	dir = 4;
@@ -1499,8 +1497,7 @@
 "adl" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/cyan{
 	dir = 10;
-	icon_state = "intact";
-
+	icon_state = "intact"
 	},
 /obj/machinery/floodlight,
 /turf/simulated/floor/plating,
@@ -1508,8 +1505,7 @@
 "adm" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/cyan{
 	dir = 6;
-	icon_state = "intact";
-
+	icon_state = "intact"
 	},
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/alarm{
@@ -3875,8 +3871,7 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/cyan{
 	dir = 9;
-	icon_state = "intact";
-
+	icon_state = "intact"
 	},
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply{
 	dir = 4
@@ -5867,8 +5862,7 @@
 /obj/structure/extinguisher_cabinet{
 	dir = 8;
 	icon_state = "extinguisher_closed";
-	pixel_x = 30;
-
+	pixel_x = 30
 	},
 /obj/effect/floor_decal/borderfloor/corner2{
 	dir = 5
@@ -8583,8 +8577,7 @@
 /obj/machinery/meter,
 /obj/machinery/atmospherics/pipe/simple/hidden/cyan{
 	dir = 10;
-	icon_state = "intact";
-
+	icon_state = "intact"
 	},
 /obj/machinery/alarm{
 	dir = 8;
@@ -9013,8 +9006,7 @@
 "awy" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/cyan{
 	dir = 9;
-	icon_state = "intact";
-
+	icon_state = "intact"
 	},
 /obj/machinery/floodlight,
 /turf/simulated/floor/plating,
@@ -9491,8 +9483,7 @@
 /obj/machinery/computer/guestpass{
 	dir = 2;
 	icon_state = "guest";
-	pixel_y = 28;
-
+	pixel_y = 28
 	},
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -10814,8 +10805,7 @@
 	},
 /obj/machinery/camera/network/northern_star{
 	dir = 8;
-	icon_state = "camera";
-
+	icon_state = "camera"
 	},
 /obj/effect/floor_decal/corner/lightgrey/border{
 	dir = 4
@@ -10886,8 +10876,7 @@
 /obj/structure/extinguisher_cabinet{
 	dir = 1;
 	icon_state = "extinguisher_closed";
-	pixel_y = -32;
-
+	pixel_y = -32
 	},
 /turf/simulated/floor/tiled,
 /area/tether/surfacebase/north_stairs_one)
@@ -11639,26 +11628,22 @@
 /obj/structure/sign/directions/medical{
 	dir = 1;
 	icon_state = "direction_med";
-	pixel_y = 8;
-
+	pixel_y = 8
 	},
 /obj/structure/sign/directions/science{
 	dir = 1;
 	icon_state = "direction_sci";
-	pixel_y = 3;
-
+	pixel_y = 3
 	},
 /obj/structure/sign/directions/security{
 	dir = 1;
 	icon_state = "direction_sec";
-	pixel_y = -4;
-
+	pixel_y = -4
 	},
 /obj/structure/sign/directions/engineering{
 	dir = 1;
 	icon_state = "direction_eng";
-	pixel_y = -10;
-
+	pixel_y = -10
 	},
 /turf/simulated/wall,
 /area/tether/surfacebase/north_stairs_one)
@@ -11850,8 +11835,7 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden{
 	dir = 5;
-	icon_state = "intact";
-
+	icon_state = "intact"
 	},
 /turf/simulated/floor/tiled,
 /area/storage/surface_eva/external)
@@ -11930,8 +11914,7 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden{
 	dir = 9;
-	icon_state = "intact";
-
+	icon_state = "intact"
 	},
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply{
 	dir = 8
@@ -13419,8 +13402,7 @@
 	},
 /obj/machinery/camera/network/northern_star{
 	dir = 8;
-	icon_state = "camera";
-
+	icon_state = "camera"
 	},
 /obj/effect/floor_decal/borderfloor{
 	dir = 4
@@ -14295,7 +14277,9 @@
 /turf/simulated/floor/tiled/steel_dirty,
 /area/engineering/drone_fabrication)
 "aIa" = (
-/obj/machinery/drone_fabricator,
+/obj/machinery/drone_fabricator{
+	fabricator_tag = "Near Atmosia"
+	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
@@ -15329,8 +15313,7 @@
 /obj/structure/extinguisher_cabinet{
 	dir = 4;
 	icon_state = "extinguisher_closed";
-	pixel_x = -30;
-
+	pixel_x = -30
 	},
 /obj/effect/floor_decal/borderfloor{
 	dir = 8
@@ -15592,7 +15575,6 @@
 "aOF" = (
 /obj/effect/floor_decal/industrial/outline,
 /turf/simulated/floor/tiled{
-
 	icon_state = "techmaint"
 	},
 /area/security/checkpoint)
@@ -15808,14 +15790,12 @@
 	dir = 6
 	},
 /turf/simulated/floor/tiled{
-
 	icon_state = "monotile"
 	},
 /area/security/checkpoint)
 "aQM" = (
 /obj/effect/floor_decal/industrial/outline/yellow,
 /turf/simulated/floor/tiled{
-
 	icon_state = "techmaint"
 	},
 /area/security/checkpoint)
@@ -15991,8 +15971,7 @@
 	dir = 8;
 	icon_state = "phoron_map";
 	name = "Xenoflora Waste Buffer";
-	start_pressure = 0;
-
+	start_pressure = 0
 	},
 /turf/simulated/floor/tiled/techfloor,
 /area/maintenance/lower/xenoflora)
@@ -16014,8 +15993,7 @@
 /obj/structure/extinguisher_cabinet{
 	dir = 4;
 	icon_state = "extinguisher_closed";
-	pixel_x = -30;
-
+	pixel_x = -30
 	},
 /turf/simulated/floor/tiled,
 /area/tether/surfacebase/atrium_one)
@@ -16076,8 +16054,7 @@
 /obj/structure/extinguisher_cabinet{
 	dir = 4;
 	icon_state = "extinguisher_closed";
-	pixel_x = -30;
-
+	pixel_x = -30
 	},
 /turf/simulated/floor/tiled,
 /area/tether/surfacebase/atrium_one)
@@ -16307,8 +16284,7 @@
 	},
 /obj/machinery/camera/network/northern_star{
 	dir = 8;
-	icon_state = "camera";
-
+	icon_state = "camera"
 	},
 /turf/simulated/floor/tiled,
 /area/hallway/lower/first_west)
@@ -16444,8 +16420,7 @@
 /obj/structure/extinguisher_cabinet{
 	dir = 4;
 	icon_state = "extinguisher_closed";
-	pixel_x = -30;
-
+	pixel_x = -30
 	},
 /turf/simulated/floor/tiled,
 /area/tether/surfacebase/tram)
@@ -16736,7 +16711,6 @@
 	dir = 4
 	},
 /turf/simulated/floor/tiled{
-
 	icon_state = "monotile"
 	},
 /area/security/checkpoint)
@@ -19116,8 +19090,7 @@
 /obj/structure/extinguisher_cabinet{
 	dir = 8;
 	icon_state = "extinguisher_closed";
-	pixel_x = 30;
-
+	pixel_x = 30
 	},
 /obj/effect/floor_decal/borderfloor{
 	dir = 6
@@ -19137,8 +19110,7 @@
 /obj/effect/floor_decal/borderfloor/corner2{
 	dir = 10;
 	icon_state = "borderfloorcorner2";
-	pixel_x = 0;
-
+	pixel_x = 0
 	},
 /obj/effect/floor_decal/corner/lightgrey/bordercorner2{
 	dir = 10
@@ -19266,8 +19238,7 @@
 /obj/structure/extinguisher_cabinet{
 	dir = 8;
 	icon_state = "extinguisher_closed";
-	pixel_x = 30;
-
+	pixel_x = 30
 	},
 /turf/simulated/floor/tiled,
 /area/outpost/research/xenobiology)
@@ -19453,8 +19424,7 @@
 /obj/structure/extinguisher_cabinet{
 	dir = 4;
 	icon_state = "extinguisher_closed";
-	pixel_x = -30;
-
+	pixel_x = -30
 	},
 /turf/simulated/floor/tiled,
 /area/tether/surfacebase/tram)
@@ -21055,8 +21025,7 @@
 /area/tether/surfacebase/outside/outside1)
 "bys" = (
 /obj/structure/cable/heavyduty{
-	icon_state = "1-8";
-
+	icon_state = "1-8"
 	},
 /obj/structure/railing,
 /obj/structure/railing{
@@ -21155,8 +21124,7 @@
 /obj/machinery/computer/guestpass{
 	dir = 1;
 	icon_state = "guest";
-	pixel_y = -28;
-
+	pixel_y = -28
 	},
 /obj/effect/floor_decal/steeldecal/steel_decals7{
 	dir = 1
@@ -21579,8 +21547,7 @@
 "bEn" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/cyan{
 	dir = 10;
-	icon_state = "intact";
-
+	icon_state = "intact"
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/asmaint2)
@@ -21925,8 +21892,7 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden{
 	dir = 10;
-	icon_state = "intact";
-
+	icon_state = "intact"
 	},
 /obj/effect/floor_decal/industrial/warning,
 /turf/simulated/floor/plating,
@@ -22585,8 +22551,7 @@
 	},
 /obj/machinery/atmospherics/pipe/manifold/hidden{
 	dir = 8;
-	icon_state = "map";
-
+	icon_state = "map"
 	},
 /turf/simulated/floor/tiled,
 /area/rnd/external)
@@ -22836,8 +22801,7 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden{
 	dir = 5;
-	icon_state = "intact";
-
+	icon_state = "intact"
 	},
 /turf/simulated/floor/tiled,
 /area/rnd/external)
@@ -23669,7 +23633,6 @@
 /area/crew_quarters/sleep/Dorm_6)
 "bVx" = (
 /obj/machinery/atmospherics/pipe/simple/visible/red{
-
 	icon_state = "intact";
 	dir = 6
 	},
@@ -24044,7 +24007,6 @@
 /obj/machinery/atmospherics/unary/outlet_injector{
 	dir = 4;
 	icon_state = "map_injector";
-
 	use_power = 1;
 	volume_rate = 700
 	},
@@ -24082,8 +24044,7 @@
 	},
 /obj/machinery/atmospherics/valve/digital/open{
 	dir = 4;
-	icon_state = "map_valve1";
-
+	icon_state = "map_valve1"
 	},
 /turf/simulated/floor/tiled/techfloor,
 /area/engineering/atmos/processing)
@@ -24101,7 +24062,6 @@
 	dir = 8
 	},
 /obj/machinery/atmospherics/pipe/simple/visible/black{
-
 	icon_state = "intact";
 	dir = 6
 	},
@@ -24160,8 +24120,7 @@
 /obj/machinery/atmospherics/pipe/zpipe/up{
 	dir = 4;
 	icon_state = "up";
-	level = 2;
-
+	level = 2
 	},
 /turf/simulated/floor/tiled/techmaint,
 /area/engineering/atmos/processing)
@@ -24283,8 +24242,7 @@
 /obj/structure/extinguisher_cabinet{
 	dir = 4;
 	icon_state = "extinguisher_closed";
-	pixel_x = -30;
-
+	pixel_x = -30
 	},
 /obj/machinery/atmospherics/portables_connector,
 /turf/simulated/floor/tiled/techfloor,
@@ -24387,7 +24345,6 @@
 /area/crew_quarters/sleep/Dorm_4)
 "bZc" = (
 /obj/machinery/atmospherics/pipe/simple/visible/red{
-
 	icon_state = "intact";
 	dir = 5
 	},
@@ -24415,7 +24372,6 @@
 	dir = 1
 	},
 /obj/machinery/atmospherics/pipe/manifold/visible/red{
-
 	icon_state = "map";
 	dir = 1
 	},
@@ -24441,7 +24397,6 @@
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/visible/blue{
-
 	icon_state = "intact";
 	dir = 9
 	},
@@ -24598,7 +24553,6 @@
 /area/crew_quarters/sleep/Dorm_4)
 "cae" = (
 /obj/machinery/atmospherics/pipe/cap/visible{
-
 	icon_state = "cap";
 	dir = 8
 	},
@@ -24664,7 +24618,6 @@
 "caH" = (
 /obj/machinery/meter,
 /obj/machinery/atmospherics/pipe/manifold/visible/black{
-
 	icon_state = "map";
 	dir = 4
 	},
@@ -24695,8 +24648,7 @@
 /obj/structure/extinguisher_cabinet{
 	dir = 8;
 	icon_state = "extinguisher_closed";
-	pixel_x = 30;
-
+	pixel_x = 30
 	},
 /turf/simulated/floor/tiled/techfloor,
 /area/engineering/atmos/processing)
@@ -24851,7 +24803,6 @@
 /area/engineering/atmos/processing)
 "cbE" = (
 /obj/machinery/atmospherics/pipe/manifold/visible/black{
-
 	icon_state = "map";
 	dir = 4
 	},
@@ -24991,7 +24942,6 @@
 	dir = 5
 	},
 /obj/machinery/atmospherics/pipe/cap/visible{
-
 	icon_state = "cap";
 	dir = 8
 	},
@@ -25169,7 +25119,6 @@
 /area/crew_quarters/sleep/Dorm_2)
 "cdf" = (
 /obj/machinery/door/airlock/multi_tile/metal/mait{
-
 	name = "Atmospherics Maintenance";
 	icon_state = "door_closed";
 	dir = 2;
@@ -25180,7 +25129,6 @@
 /area/engineering/atmos/intake)
 "cdh" = (
 /obj/machinery/atmospherics/unary/vent_scrubber{
-
 	icon_state = "map_scrubber_off";
 	dir = 4
 	},
@@ -25188,7 +25136,6 @@
 /area/engineering/atmos/intake)
 "cdk" = (
 /obj/machinery/atmospherics/binary/pump/high_power/on{
-
 	icon_state = "map_on";
 	dir = 1
 	},
@@ -25242,7 +25189,6 @@
 /area/outpost/research/xenobiology)
 "cdu" = (
 /obj/machinery/atmospherics/binary/pump/high_power/on{
-
 	icon_state = "map_on";
 	dir = 1
 	},
@@ -25396,8 +25342,7 @@
 /obj/machinery/atmospherics/binary/pump/high_power/on{
 	dir = 4;
 	icon_state = "map_on";
-	name = "Waste to Filtering";
-
+	name = "Waste to Filtering"
 	},
 /turf/simulated/floor/tiled/techfloor,
 /area/engineering/atmos/processing)
@@ -25432,7 +25377,6 @@
 	pixel_y = -25
 	},
 /obj/machinery/atmospherics/pipe/simple/visible/black{
-
 	icon_state = "intact";
 	dir = 9
 	},
@@ -25506,8 +25450,7 @@
 /obj/effect/floor_decal/borderfloor{
 	dir = 1;
 	icon_state = "borderfloor";
-	pixel_y = 0;
-
+	pixel_y = 0
 	},
 /obj/effect/floor_decal/corner/grey/border{
 	icon_state = "bordercolor";
@@ -25520,8 +25463,7 @@
 /obj/effect/floor_decal/borderfloor{
 	dir = 1;
 	icon_state = "borderfloor";
-	pixel_y = 0;
-
+	pixel_y = 0
 	},
 /obj/effect/floor_decal/corner/grey/border{
 	icon_state = "bordercolor";
@@ -25534,8 +25476,7 @@
 /obj/effect/floor_decal/borderfloor{
 	dir = 1;
 	icon_state = "borderfloor";
-	pixel_y = 0;
-
+	pixel_y = 0
 	},
 /obj/effect/floor_decal/corner/grey/border{
 	icon_state = "bordercolor";
@@ -25548,8 +25489,7 @@
 /obj/effect/floor_decal/borderfloor{
 	dir = 1;
 	icon_state = "borderfloor";
-	pixel_y = 0;
-
+	pixel_y = 0
 	},
 /obj/effect/floor_decal/corner/grey/border{
 	icon_state = "bordercolor";
@@ -25562,8 +25502,7 @@
 /obj/effect/floor_decal/borderfloor{
 	dir = 1;
 	icon_state = "borderfloor";
-	pixel_y = 0;
-
+	pixel_y = 0
 	},
 /obj/effect/floor_decal/corner/grey/border{
 	icon_state = "bordercolor";
@@ -25576,8 +25515,7 @@
 /obj/effect/floor_decal/borderfloor{
 	dir = 1;
 	icon_state = "borderfloor";
-	pixel_y = 0;
-
+	pixel_y = 0
 	},
 /obj/effect/floor_decal/corner/grey/border{
 	icon_state = "bordercolor";
@@ -27457,8 +27395,7 @@
 /obj/effect/floor_decal/borderfloor{
 	dir = 1;
 	icon_state = "borderfloor";
-	pixel_y = 0;
-
+	pixel_y = 0
 	},
 /obj/effect/floor_decal/corner/lightgrey/border{
 	dir = 1
@@ -27540,8 +27477,7 @@
 /obj/effect/floor_decal/borderfloor{
 	dir = 1;
 	icon_state = "borderfloor";
-	pixel_y = 0;
-
+	pixel_y = 0
 	},
 /obj/effect/floor_decal/corner/lightgrey/border{
 	dir = 1
@@ -27808,8 +27744,7 @@
 /obj/effect/floor_decal/borderfloor{
 	dir = 1;
 	icon_state = "borderfloor";
-	pixel_y = 0;
-
+	pixel_y = 0
 	},
 /obj/effect/floor_decal/corner/lightgrey/border{
 	dir = 1
@@ -28179,8 +28114,7 @@
 /obj/effect/floor_decal/borderfloor{
 	dir = 1;
 	icon_state = "borderfloor";
-	pixel_y = 0;
-
+	pixel_y = 0
 	},
 /obj/effect/floor_decal/corner/lightgrey/border{
 	dir = 1
@@ -28223,8 +28157,7 @@
 /obj/structure/extinguisher_cabinet{
 	dir = 1;
 	icon_state = "extinguisher_closed";
-	pixel_y = -32;
-
+	pixel_y = -32
 	},
 /turf/simulated/floor/tiled,
 /area/hallway/lower/first_west)
@@ -28365,8 +28298,7 @@
 /obj/effect/floor_decal/borderfloor/corner2{
 	dir = 10;
 	icon_state = "borderfloorcorner2";
-	pixel_x = 0;
-
+	pixel_x = 0
 	},
 /obj/effect/floor_decal/corner/lightgrey/bordercorner2{
 	dir = 10
diff --git a/vorestation.dme b/vorestation.dme
index 2f781c10e7..36fc575903 100644
--- a/vorestation.dme
+++ b/vorestation.dme
@@ -2126,7 +2126,6 @@
 #include "code\modules\mob\living\silicon\robot\drone\drone_items.dm"
 #include "code\modules\mob\living\silicon\robot\drone\drone_manufacturer.dm"
 #include "code\modules\mob\living\silicon\robot\drone\drone_say.dm"
-#include "code\modules\mob\living\silicon\robot\drone\drone_vr.dm"
 #include "code\modules\mob\living\silicon\robot\robot_modules\event.dm"
 #include "code\modules\mob\living\silicon\robot\robot_modules\station.dm"
 #include "code\modules\mob\living\silicon\robot\robot_modules\station_vr.dm"