diff --git a/maps/RandomZLevels/Academy.dm b/archive/maps/RandomZLevels/Academy.dm
similarity index 100%
rename from maps/RandomZLevels/Academy.dm
rename to archive/maps/RandomZLevels/Academy.dm
diff --git a/maps/RandomZLevels/Academy.dmm b/archive/maps/RandomZLevels/Academy.dmm
similarity index 100%
rename from maps/RandomZLevels/Academy.dmm
rename to archive/maps/RandomZLevels/Academy.dmm
diff --git a/maps/RandomZLevels/arcticwaste.dmm b/archive/maps/RandomZLevels/arcticwaste.dmm
similarity index 100%
rename from maps/RandomZLevels/arcticwaste.dmm
rename to archive/maps/RandomZLevels/arcticwaste.dmm
diff --git a/maps/RandomZLevels/blackmarketpackers.dmm b/archive/maps/RandomZLevels/blackmarketpackers.dmm
similarity index 100%
rename from maps/RandomZLevels/blackmarketpackers.dmm
rename to archive/maps/RandomZLevels/blackmarketpackers.dmm
diff --git a/maps/RandomZLevels/challenge.dm b/archive/maps/RandomZLevels/challenge.dm
similarity index 100%
rename from maps/RandomZLevels/challenge.dm
rename to archive/maps/RandomZLevels/challenge.dm
diff --git a/maps/RandomZLevels/challenge.dmm b/archive/maps/RandomZLevels/challenge.dmm
similarity index 100%
rename from maps/RandomZLevels/challenge.dmm
rename to archive/maps/RandomZLevels/challenge.dmm
diff --git a/maps/RandomZLevels/example.dmm b/archive/maps/RandomZLevels/example.dmm
similarity index 100%
rename from maps/RandomZLevels/example.dmm
rename to archive/maps/RandomZLevels/example.dmm
diff --git a/maps/RandomZLevels/listeningpost.dmm b/archive/maps/RandomZLevels/listeningpost.dmm
similarity index 100%
rename from maps/RandomZLevels/listeningpost.dmm
rename to archive/maps/RandomZLevels/listeningpost.dmm
diff --git a/maps/RandomZLevels/spacebattle.dmm b/archive/maps/RandomZLevels/spacebattle.dmm
similarity index 100%
rename from maps/RandomZLevels/spacebattle.dmm
rename to archive/maps/RandomZLevels/spacebattle.dmm
diff --git a/maps/RandomZLevels/stationCollision.dm b/archive/maps/RandomZLevels/stationCollision.dm
similarity index 100%
rename from maps/RandomZLevels/stationCollision.dm
rename to archive/maps/RandomZLevels/stationCollision.dm
diff --git a/maps/RandomZLevels/stationCollision.dmm b/archive/maps/RandomZLevels/stationCollision.dmm
similarity index 100%
rename from maps/RandomZLevels/stationCollision.dmm
rename to archive/maps/RandomZLevels/stationCollision.dmm
diff --git a/maps/cynosure/cynosure-1.dmm b/archive/maps/cynosure/cynosure-1.dmm
similarity index 100%
rename from maps/cynosure/cynosure-1.dmm
rename to archive/maps/cynosure/cynosure-1.dmm
diff --git a/maps/cynosure/cynosure-2.dmm b/archive/maps/cynosure/cynosure-2.dmm
similarity index 100%
rename from maps/cynosure/cynosure-2.dmm
rename to archive/maps/cynosure/cynosure-2.dmm
diff --git a/maps/cynosure/cynosure-3.dmm b/archive/maps/cynosure/cynosure-3.dmm
similarity index 100%
rename from maps/cynosure/cynosure-3.dmm
rename to archive/maps/cynosure/cynosure-3.dmm
diff --git a/maps/cynosure/cynosure-4.dmm b/archive/maps/cynosure/cynosure-4.dmm
similarity index 100%
rename from maps/cynosure/cynosure-4.dmm
rename to archive/maps/cynosure/cynosure-4.dmm
diff --git a/maps/cynosure/cynosure-6.dmm b/archive/maps/cynosure/cynosure-6.dmm
similarity index 100%
rename from maps/cynosure/cynosure-6.dmm
rename to archive/maps/cynosure/cynosure-6.dmm
diff --git a/maps/cynosure/cynosure-7.dmm b/archive/maps/cynosure/cynosure-7.dmm
similarity index 100%
rename from maps/cynosure/cynosure-7.dmm
rename to archive/maps/cynosure/cynosure-7.dmm
diff --git a/maps/cynosure/cynosure.dm b/archive/maps/cynosure/cynosure.dm
similarity index 100%
rename from maps/cynosure/cynosure.dm
rename to archive/maps/cynosure/cynosure.dm
diff --git a/maps/cynosure/cynosure_defines.dm b/archive/maps/cynosure/cynosure_defines.dm
similarity index 100%
rename from maps/cynosure/cynosure_defines.dm
rename to archive/maps/cynosure/cynosure_defines.dm
diff --git a/maps/cynosure/cynosure_jobs.dm b/archive/maps/cynosure/cynosure_jobs.dm
similarity index 100%
rename from maps/cynosure/cynosure_jobs.dm
rename to archive/maps/cynosure/cynosure_jobs.dm
diff --git a/maps/cynosure/cynosure_shuttles.dm b/archive/maps/cynosure/cynosure_shuttles.dm
similarity index 100%
rename from maps/cynosure/cynosure_shuttles.dm
rename to archive/maps/cynosure/cynosure_shuttles.dm
diff --git a/maps/cynosure/datums/random_map.dm b/archive/maps/cynosure/datums/random_map.dm
similarity index 100%
rename from maps/cynosure/datums/random_map.dm
rename to archive/maps/cynosure/datums/random_map.dm
diff --git a/maps/cynosure/overmap/sectors.dm b/archive/maps/cynosure/overmap/sectors.dm
similarity index 100%
rename from maps/cynosure/overmap/sectors.dm
rename to archive/maps/cynosure/overmap/sectors.dm
diff --git a/maps/cynosure/submaps/10x9/Shop.dmm b/archive/maps/cynosure/submaps/10x9/Shop.dmm
similarity index 100%
rename from maps/cynosure/submaps/10x9/Shop.dmm
rename to archive/maps/cynosure/submaps/10x9/Shop.dmm
diff --git a/maps/cynosure/submaps/10x9/TreasureHoard.dmm b/archive/maps/cynosure/submaps/10x9/TreasureHoard.dmm
similarity index 100%
rename from maps/cynosure/submaps/10x9/TreasureHoard.dmm
rename to archive/maps/cynosure/submaps/10x9/TreasureHoard.dmm
diff --git a/maps/cynosure/submaps/10x9/Warehouse1.dmm b/archive/maps/cynosure/submaps/10x9/Warehouse1.dmm
similarity index 100%
rename from maps/cynosure/submaps/10x9/Warehouse1.dmm
rename to archive/maps/cynosure/submaps/10x9/Warehouse1.dmm
diff --git a/maps/cynosure/submaps/10x9/Warehouse2.dmm b/archive/maps/cynosure/submaps/10x9/Warehouse2.dmm
similarity index 100%
rename from maps/cynosure/submaps/10x9/Warehouse2.dmm
rename to archive/maps/cynosure/submaps/10x9/Warehouse2.dmm
diff --git a/maps/cynosure/submaps/10x9/Warehouse3.dmm b/archive/maps/cynosure/submaps/10x9/Warehouse3.dmm
similarity index 100%
rename from maps/cynosure/submaps/10x9/Warehouse3.dmm
rename to archive/maps/cynosure/submaps/10x9/Warehouse3.dmm
diff --git a/maps/cynosure/submaps/16x11/LaserTag.dmm b/archive/maps/cynosure/submaps/16x11/LaserTag.dmm
similarity index 100%
rename from maps/cynosure/submaps/16x11/LaserTag.dmm
rename to archive/maps/cynosure/submaps/16x11/LaserTag.dmm
diff --git a/maps/cynosure/submaps/16x11/Nightclub.dmm b/archive/maps/cynosure/submaps/16x11/Nightclub.dmm
similarity index 100%
rename from maps/cynosure/submaps/16x11/Nightclub.dmm
rename to archive/maps/cynosure/submaps/16x11/Nightclub.dmm
diff --git a/maps/cynosure/submaps/16x11/OldDorms.dmm b/archive/maps/cynosure/submaps/16x11/OldDorms.dmm
similarity index 100%
rename from maps/cynosure/submaps/16x11/OldDorms.dmm
rename to archive/maps/cynosure/submaps/16x11/OldDorms.dmm
diff --git a/maps/cynosure/submaps/5x7/MedicalBreakRoom.dmm b/archive/maps/cynosure/submaps/5x7/MedicalBreakRoom.dmm
similarity index 100%
rename from maps/cynosure/submaps/5x7/MedicalBreakRoom.dmm
rename to archive/maps/cynosure/submaps/5x7/MedicalBreakRoom.dmm
diff --git a/maps/cynosure/submaps/5x7/MedicalWasteStorage.dmm b/archive/maps/cynosure/submaps/5x7/MedicalWasteStorage.dmm
similarity index 100%
rename from maps/cynosure/submaps/5x7/MedicalWasteStorage.dmm
rename to archive/maps/cynosure/submaps/5x7/MedicalWasteStorage.dmm
diff --git a/maps/cynosure/submaps/5x7/SurgeryTrainingRoom.dmm b/archive/maps/cynosure/submaps/5x7/SurgeryTrainingRoom.dmm
similarity index 100%
rename from maps/cynosure/submaps/5x7/SurgeryTrainingRoom.dmm
rename to archive/maps/cynosure/submaps/5x7/SurgeryTrainingRoom.dmm
diff --git a/maps/cynosure/submaps/7x7/FightClub.dmm b/archive/maps/cynosure/submaps/7x7/FightClub.dmm
similarity index 100%
rename from maps/cynosure/submaps/7x7/FightClub.dmm
rename to archive/maps/cynosure/submaps/7x7/FightClub.dmm
diff --git a/maps/cynosure/submaps/7x7/JanitorCloset.dmm b/archive/maps/cynosure/submaps/7x7/JanitorCloset.dmm
similarity index 100%
rename from maps/cynosure/submaps/7x7/JanitorCloset.dmm
rename to archive/maps/cynosure/submaps/7x7/JanitorCloset.dmm
diff --git a/maps/cynosure/submaps/7x7/PartyRoom.dmm b/archive/maps/cynosure/submaps/7x7/PartyRoom.dmm
similarity index 100%
rename from maps/cynosure/submaps/7x7/PartyRoom.dmm
rename to archive/maps/cynosure/submaps/7x7/PartyRoom.dmm
diff --git a/maps/cynosure/submaps/8x5/GrowersDen.dmm b/archive/maps/cynosure/submaps/8x5/GrowersDen.dmm
similarity index 100%
rename from maps/cynosure/submaps/8x5/GrowersDen.dmm
rename to archive/maps/cynosure/submaps/8x5/GrowersDen.dmm
diff --git a/maps/cynosure/submaps/8x5/HiddenBar.dmm b/archive/maps/cynosure/submaps/8x5/HiddenBar.dmm
similarity index 100%
rename from maps/cynosure/submaps/8x5/HiddenBar.dmm
rename to archive/maps/cynosure/submaps/8x5/HiddenBar.dmm
diff --git a/maps/cynosure/submaps/8x5/Restroom.dmm b/archive/maps/cynosure/submaps/8x5/Restroom.dmm
similarity index 100%
rename from maps/cynosure/submaps/8x5/Restroom.dmm
rename to archive/maps/cynosure/submaps/8x5/Restroom.dmm
diff --git a/maps/cynosure/submaps/8x5/SquattersDen.dmm b/archive/maps/cynosure/submaps/8x5/SquattersDen.dmm
similarity index 100%
rename from maps/cynosure/submaps/8x5/SquattersDen.dmm
rename to archive/maps/cynosure/submaps/8x5/SquattersDen.dmm
diff --git a/maps/cynosure/submaps/8x9/MeetingRoom.dmm b/archive/maps/cynosure/submaps/8x9/MeetingRoom.dmm
similarity index 100%
rename from maps/cynosure/submaps/8x9/MeetingRoom.dmm
rename to archive/maps/cynosure/submaps/8x9/MeetingRoom.dmm
diff --git a/maps/cynosure/submaps/8x9/MouseHouse.dmm b/archive/maps/cynosure/submaps/8x9/MouseHouse.dmm
similarity index 100%
rename from maps/cynosure/submaps/8x9/MouseHouse.dmm
rename to archive/maps/cynosure/submaps/8x9/MouseHouse.dmm
diff --git a/maps/cynosure/submaps/8x9/ReptileRoom.dmm b/archive/maps/cynosure/submaps/8x9/ReptileRoom.dmm
similarity index 100%
rename from maps/cynosure/submaps/8x9/ReptileRoom.dmm
rename to archive/maps/cynosure/submaps/8x9/ReptileRoom.dmm
diff --git a/maps/cynosure/submaps/8x9/RitualRoom.dmm b/archive/maps/cynosure/submaps/8x9/RitualRoom.dmm
similarity index 100%
rename from maps/cynosure/submaps/8x9/RitualRoom.dmm
rename to archive/maps/cynosure/submaps/8x9/RitualRoom.dmm
diff --git a/maps/cynosure/submaps/9x10/PressureChamber.dmm b/archive/maps/cynosure/submaps/9x10/PressureChamber.dmm
similarity index 100%
rename from maps/cynosure/submaps/9x10/PressureChamber.dmm
rename to archive/maps/cynosure/submaps/9x10/PressureChamber.dmm
diff --git a/maps/cynosure/submaps/9x10/Sauna.dmm b/archive/maps/cynosure/submaps/9x10/Sauna.dmm
similarity index 100%
rename from maps/cynosure/submaps/9x10/Sauna.dmm
rename to archive/maps/cynosure/submaps/9x10/Sauna.dmm
diff --git a/maps/cynosure/submaps/9x10/ShootingRange.dmm b/archive/maps/cynosure/submaps/9x10/ShootingRange.dmm
similarity index 100%
rename from maps/cynosure/submaps/9x10/ShootingRange.dmm
rename to archive/maps/cynosure/submaps/9x10/ShootingRange.dmm
diff --git a/maps/cynosure/submaps/9x10/Theater.dmm b/archive/maps/cynosure/submaps/9x10/Theater.dmm
similarity index 100%
rename from maps/cynosure/submaps/9x10/Theater.dmm
rename to archive/maps/cynosure/submaps/9x10/Theater.dmm
diff --git a/maps/cynosure/submaps/9x8/GamesRoom.dmm b/archive/maps/cynosure/submaps/9x8/GamesRoom.dmm
similarity index 100%
rename from maps/cynosure/submaps/9x8/GamesRoom.dmm
rename to archive/maps/cynosure/submaps/9x8/GamesRoom.dmm
diff --git a/maps/cynosure/submaps/9x8/HotTub.dmm b/archive/maps/cynosure/submaps/9x8/HotTub.dmm
similarity index 100%
rename from maps/cynosure/submaps/9x8/HotTub.dmm
rename to archive/maps/cynosure/submaps/9x8/HotTub.dmm
diff --git a/maps/cynosure/submaps/9x8/ServerRoom.dmm b/archive/maps/cynosure/submaps/9x8/ServerRoom.dmm
similarity index 100%
rename from maps/cynosure/submaps/9x8/ServerRoom.dmm
rename to archive/maps/cynosure/submaps/9x8/ServerRoom.dmm
diff --git a/maps/cynosure/turfs/outdoors.dm b/archive/maps/cynosure/turfs/outdoors.dm
similarity index 100%
rename from maps/cynosure/turfs/outdoors.dm
rename to archive/maps/cynosure/turfs/outdoors.dm
diff --git a/maps/example/example-1.dmm b/archive/maps/example/example-1.dmm
similarity index 100%
rename from maps/example/example-1.dmm
rename to archive/maps/example/example-1.dmm
diff --git a/maps/example/example-2.dmm b/archive/maps/example/example-2.dmm
similarity index 100%
rename from maps/example/example-2.dmm
rename to archive/maps/example/example-2.dmm
diff --git a/maps/example/example.dm b/archive/maps/example/example.dm
similarity index 100%
rename from maps/example/example.dm
rename to archive/maps/example/example.dm
diff --git a/maps/example/example_areas.dm b/archive/maps/example/example_areas.dm
similarity index 100%
rename from maps/example/example_areas.dm
rename to archive/maps/example/example_areas.dm
diff --git a/maps/example/example_defines.dm b/archive/maps/example/example_defines.dm
similarity index 100%
rename from maps/example/example_defines.dm
rename to archive/maps/example/example_defines.dm
diff --git a/maps/example/example_elevator.dm b/archive/maps/example/example_elevator.dm
similarity index 100%
rename from maps/example/example_elevator.dm
rename to archive/maps/example/example_elevator.dm
diff --git a/maps/gateway_archive_vr/Academy.dmm b/archive/maps/gateway_archive_vr/Academy.dmm
similarity index 100%
rename from maps/gateway_archive_vr/Academy.dmm
rename to archive/maps/gateway_archive_vr/Academy.dmm
diff --git a/maps/gateway_archive_vr/beach.dmm b/archive/maps/gateway_archive_vr/beach.dmm
similarity index 100%
rename from maps/gateway_archive_vr/beach.dmm
rename to archive/maps/gateway_archive_vr/beach.dmm
diff --git a/maps/gateway_archive_vr/blackmarketpackers.dm b/archive/maps/gateway_archive_vr/blackmarketpackers.dm
similarity index 100%
rename from maps/gateway_archive_vr/blackmarketpackers.dm
rename to archive/maps/gateway_archive_vr/blackmarketpackers.dm
diff --git a/maps/gateway_archive_vr/blackmarketpackers.dmm b/archive/maps/gateway_archive_vr/blackmarketpackers.dmm
similarity index 100%
rename from maps/gateway_archive_vr/blackmarketpackers.dmm
rename to archive/maps/gateway_archive_vr/blackmarketpackers.dmm
diff --git a/maps/gateway_archive_vr/carpfarm.dm b/archive/maps/gateway_archive_vr/carpfarm.dm
similarity index 100%
rename from maps/gateway_archive_vr/carpfarm.dm
rename to archive/maps/gateway_archive_vr/carpfarm.dm
diff --git a/maps/gateway_archive_vr/carpfarm.dmm b/archive/maps/gateway_archive_vr/carpfarm.dmm
similarity index 100%
rename from maps/gateway_archive_vr/carpfarm.dmm
rename to archive/maps/gateway_archive_vr/carpfarm.dmm
diff --git a/maps/gateway_archive_vr/challenge.dmm b/archive/maps/gateway_archive_vr/challenge.dmm
similarity index 100%
rename from maps/gateway_archive_vr/challenge.dmm
rename to archive/maps/gateway_archive_vr/challenge.dmm
diff --git a/maps/gateway_archive_vr/desertbase.dmm b/archive/maps/gateway_archive_vr/desertbase.dmm
similarity index 100%
rename from maps/gateway_archive_vr/desertbase.dmm
rename to archive/maps/gateway_archive_vr/desertbase.dmm
diff --git a/maps/gateway_archive_vr/example.dmm b/archive/maps/gateway_archive_vr/example.dmm
similarity index 100%
rename from maps/gateway_archive_vr/example.dmm
rename to archive/maps/gateway_archive_vr/example.dmm
diff --git a/maps/gateway_archive_vr/fileList.txt b/archive/maps/gateway_archive_vr/fileList.txt
similarity index 100%
rename from maps/gateway_archive_vr/fileList.txt
rename to archive/maps/gateway_archive_vr/fileList.txt
diff --git a/maps/gateway_archive_vr/jungle.dmm b/archive/maps/gateway_archive_vr/jungle.dmm
similarity index 100%
rename from maps/gateway_archive_vr/jungle.dmm
rename to archive/maps/gateway_archive_vr/jungle.dmm
diff --git a/maps/gateway_archive_vr/labyrinth.dm b/archive/maps/gateway_archive_vr/labyrinth.dm
similarity index 100%
rename from maps/gateway_archive_vr/labyrinth.dm
rename to archive/maps/gateway_archive_vr/labyrinth.dm
diff --git a/maps/gateway_archive_vr/labyrinth.dmm b/archive/maps/gateway_archive_vr/labyrinth.dmm
similarity index 100%
rename from maps/gateway_archive_vr/labyrinth.dmm
rename to archive/maps/gateway_archive_vr/labyrinth.dmm
diff --git a/maps/gateway_archive_vr/listeningpost.dm b/archive/maps/gateway_archive_vr/listeningpost.dm
similarity index 100%
rename from maps/gateway_archive_vr/listeningpost.dm
rename to archive/maps/gateway_archive_vr/listeningpost.dm
diff --git a/maps/gateway_archive_vr/listeningpost.dmm b/archive/maps/gateway_archive_vr/listeningpost.dmm
similarity index 100%
rename from maps/gateway_archive_vr/listeningpost.dmm
rename to archive/maps/gateway_archive_vr/listeningpost.dmm
diff --git a/maps/gateway_archive_vr/snow_outpost.dm b/archive/maps/gateway_archive_vr/snow_outpost.dm
similarity index 100%
rename from maps/gateway_archive_vr/snow_outpost.dm
rename to archive/maps/gateway_archive_vr/snow_outpost.dm
diff --git a/maps/gateway_archive_vr/snow_outpost.dmm b/archive/maps/gateway_archive_vr/snow_outpost.dmm
similarity index 100%
rename from maps/gateway_archive_vr/snow_outpost.dmm
rename to archive/maps/gateway_archive_vr/snow_outpost.dmm
diff --git a/maps/gateway_archive_vr/snowfield.dm b/archive/maps/gateway_archive_vr/snowfield.dm
similarity index 100%
rename from maps/gateway_archive_vr/snowfield.dm
rename to archive/maps/gateway_archive_vr/snowfield.dm
diff --git a/maps/gateway_archive_vr/snowfield.dmm b/archive/maps/gateway_archive_vr/snowfield.dmm
similarity index 100%
rename from maps/gateway_archive_vr/snowfield.dmm
rename to archive/maps/gateway_archive_vr/snowfield.dmm
diff --git a/maps/gateway_archive_vr/spacebattle.dmm b/archive/maps/gateway_archive_vr/spacebattle.dmm
similarity index 100%
rename from maps/gateway_archive_vr/spacebattle.dmm
rename to archive/maps/gateway_archive_vr/spacebattle.dmm
diff --git a/maps/gateway_archive_vr/stationCollision.dm b/archive/maps/gateway_archive_vr/stationCollision.dm
similarity index 100%
rename from maps/gateway_archive_vr/stationCollision.dm
rename to archive/maps/gateway_archive_vr/stationCollision.dm
diff --git a/maps/gateway_archive_vr/stationCollision.dmm b/archive/maps/gateway_archive_vr/stationCollision.dmm
similarity index 100%
rename from maps/gateway_archive_vr/stationCollision.dmm
rename to archive/maps/gateway_archive_vr/stationCollision.dmm
diff --git a/maps/gateway_archive_vr/wildwest.dm b/archive/maps/gateway_archive_vr/wildwest.dm
similarity index 100%
rename from maps/gateway_archive_vr/wildwest.dm
rename to archive/maps/gateway_archive_vr/wildwest.dm
diff --git a/maps/gateway_archive_vr/wildwest.dmm b/archive/maps/gateway_archive_vr/wildwest.dmm
similarity index 100%
rename from maps/gateway_archive_vr/wildwest.dmm
rename to archive/maps/gateway_archive_vr/wildwest.dmm
diff --git a/maps/gateway_archive_vr/zoo.dm b/archive/maps/gateway_archive_vr/zoo.dm
similarity index 100%
rename from maps/gateway_archive_vr/zoo.dm
rename to archive/maps/gateway_archive_vr/zoo.dm
diff --git a/maps/gateway_archive_vr/zoo.dmm b/archive/maps/gateway_archive_vr/zoo.dmm
similarity index 100%
rename from maps/gateway_archive_vr/zoo.dmm
rename to archive/maps/gateway_archive_vr/zoo.dmm
diff --git a/maps/gateway_archive_vr/zresearchlabs.dmm b/archive/maps/gateway_archive_vr/zresearchlabs.dmm
similarity index 100%
rename from maps/gateway_archive_vr/zresearchlabs.dmm
rename to archive/maps/gateway_archive_vr/zresearchlabs.dmm
diff --git a/maps/northern_star/job/outfits.dm b/archive/maps/northern_star/job/outfits.dm
similarity index 100%
rename from maps/northern_star/job/outfits.dm
rename to archive/maps/northern_star/job/outfits.dm
diff --git a/maps/northern_star/northern_star.dm b/archive/maps/northern_star/northern_star.dm
similarity index 100%
rename from maps/northern_star/northern_star.dm
rename to archive/maps/northern_star/northern_star.dm
diff --git a/maps/northern_star/northern_star_areas.dm b/archive/maps/northern_star/northern_star_areas.dm
similarity index 100%
rename from maps/northern_star/northern_star_areas.dm
rename to archive/maps/northern_star/northern_star_areas.dm
diff --git a/maps/northern_star/northern_star_defines.dm b/archive/maps/northern_star/northern_star_defines.dm
similarity index 100%
rename from maps/northern_star/northern_star_defines.dm
rename to archive/maps/northern_star/northern_star_defines.dm
diff --git a/maps/northern_star/northern_star_jobs.dm b/archive/maps/northern_star/northern_star_jobs.dm
similarity index 100%
rename from maps/northern_star/northern_star_jobs.dm
rename to archive/maps/northern_star/northern_star_jobs.dm
diff --git a/maps/northern_star/northern_star_shuttles.dm b/archive/maps/northern_star/northern_star_shuttles.dm
similarity index 100%
rename from maps/northern_star/northern_star_shuttles.dm
rename to archive/maps/northern_star/northern_star_shuttles.dm
diff --git a/maps/northern_star/polaris-1.dmm b/archive/maps/northern_star/polaris-1.dmm
similarity index 100%
rename from maps/northern_star/polaris-1.dmm
rename to archive/maps/northern_star/polaris-1.dmm
diff --git a/maps/northern_star/polaris-2.dmm b/archive/maps/northern_star/polaris-2.dmm
similarity index 100%
rename from maps/northern_star/polaris-2.dmm
rename to archive/maps/northern_star/polaris-2.dmm
diff --git a/maps/northern_star/polaris-3.dmm b/archive/maps/northern_star/polaris-3.dmm
similarity index 100%
rename from maps/northern_star/polaris-3.dmm
rename to archive/maps/northern_star/polaris-3.dmm
diff --git a/maps/northern_star/polaris-4.dmm b/archive/maps/northern_star/polaris-4.dmm
similarity index 100%
rename from maps/northern_star/polaris-4.dmm
rename to archive/maps/northern_star/polaris-4.dmm
diff --git a/maps/northern_star/polaris-5.dmm b/archive/maps/northern_star/polaris-5.dmm
similarity index 100%
rename from maps/northern_star/polaris-5.dmm
rename to archive/maps/northern_star/polaris-5.dmm
diff --git a/maps/southern_cross/datums/supplypacks/munitions.dm b/archive/maps/southern_cross/datums/supplypacks/munitions.dm
similarity index 100%
rename from maps/southern_cross/datums/supplypacks/munitions.dm
rename to archive/maps/southern_cross/datums/supplypacks/munitions.dm
diff --git a/maps/southern_cross/events/wildlife_encounter.dm b/archive/maps/southern_cross/events/wildlife_encounter.dm
similarity index 100%
rename from maps/southern_cross/events/wildlife_encounter.dm
rename to archive/maps/southern_cross/events/wildlife_encounter.dm
diff --git a/maps/southern_cross/items/encryptionkey_sc.dm b/archive/maps/southern_cross/items/encryptionkey_sc.dm
similarity index 100%
rename from maps/southern_cross/items/encryptionkey_sc.dm
rename to archive/maps/southern_cross/items/encryptionkey_sc.dm
diff --git a/maps/southern_cross/items/headset_sc.dm b/archive/maps/southern_cross/items/headset_sc.dm
similarity index 100%
rename from maps/southern_cross/items/headset_sc.dm
rename to archive/maps/southern_cross/items/headset_sc.dm
diff --git a/maps/southern_cross/job/outfits.dm b/archive/maps/southern_cross/job/outfits.dm
similarity index 100%
rename from maps/southern_cross/job/outfits.dm
rename to archive/maps/southern_cross/job/outfits.dm
diff --git a/maps/southern_cross/loadout/loadout_accessories.dm b/archive/maps/southern_cross/loadout/loadout_accessories.dm
similarity index 100%
rename from maps/southern_cross/loadout/loadout_accessories.dm
rename to archive/maps/southern_cross/loadout/loadout_accessories.dm
diff --git a/maps/southern_cross/loadout/loadout_head.dm b/archive/maps/southern_cross/loadout/loadout_head.dm
similarity index 100%
rename from maps/southern_cross/loadout/loadout_head.dm
rename to archive/maps/southern_cross/loadout/loadout_head.dm
diff --git a/maps/southern_cross/loadout/loadout_suit.dm b/archive/maps/southern_cross/loadout/loadout_suit.dm
similarity index 100%
rename from maps/southern_cross/loadout/loadout_suit.dm
rename to archive/maps/southern_cross/loadout/loadout_suit.dm
diff --git a/maps/southern_cross/loadout/loadout_uniform.dm b/archive/maps/southern_cross/loadout/loadout_uniform.dm
similarity index 100%
rename from maps/southern_cross/loadout/loadout_uniform.dm
rename to archive/maps/southern_cross/loadout/loadout_uniform.dm
diff --git a/maps/southern_cross/loadout/loadout_vr.dm b/archive/maps/southern_cross/loadout/loadout_vr.dm
similarity index 100%
rename from maps/southern_cross/loadout/loadout_vr.dm
rename to archive/maps/southern_cross/loadout/loadout_vr.dm
diff --git a/maps/southern_cross/overmap/sectors.dm b/archive/maps/southern_cross/overmap/sectors.dm
similarity index 100%
rename from maps/southern_cross/overmap/sectors.dm
rename to archive/maps/southern_cross/overmap/sectors.dm
diff --git a/maps/southern_cross/shuttles/crew_shuttles.dm b/archive/maps/southern_cross/shuttles/crew_shuttles.dm
similarity index 100%
rename from maps/southern_cross/shuttles/crew_shuttles.dm
rename to archive/maps/southern_cross/shuttles/crew_shuttles.dm
diff --git a/maps/southern_cross/shuttles/ert.dm b/archive/maps/southern_cross/shuttles/ert.dm
similarity index 100%
rename from maps/southern_cross/shuttles/ert.dm
rename to archive/maps/southern_cross/shuttles/ert.dm
diff --git a/maps/southern_cross/shuttles/heist.dm b/archive/maps/southern_cross/shuttles/heist.dm
similarity index 100%
rename from maps/southern_cross/shuttles/heist.dm
rename to archive/maps/southern_cross/shuttles/heist.dm
diff --git a/maps/southern_cross/shuttles/merc.dm b/archive/maps/southern_cross/shuttles/merc.dm
similarity index 100%
rename from maps/southern_cross/shuttles/merc.dm
rename to archive/maps/southern_cross/shuttles/merc.dm
diff --git a/maps/southern_cross/shuttles/ninja.dm b/archive/maps/southern_cross/shuttles/ninja.dm
similarity index 100%
rename from maps/southern_cross/shuttles/ninja.dm
rename to archive/maps/southern_cross/shuttles/ninja.dm
diff --git a/maps/southern_cross/southern_cross-1.dmm b/archive/maps/southern_cross/southern_cross-1.dmm
similarity index 100%
rename from maps/southern_cross/southern_cross-1.dmm
rename to archive/maps/southern_cross/southern_cross-1.dmm
diff --git a/maps/southern_cross/southern_cross-2.dmm b/archive/maps/southern_cross/southern_cross-2.dmm
similarity index 100%
rename from maps/southern_cross/southern_cross-2.dmm
rename to archive/maps/southern_cross/southern_cross-2.dmm
diff --git a/maps/southern_cross/southern_cross-3.dmm b/archive/maps/southern_cross/southern_cross-3.dmm
similarity index 100%
rename from maps/southern_cross/southern_cross-3.dmm
rename to archive/maps/southern_cross/southern_cross-3.dmm
diff --git a/maps/southern_cross/southern_cross-4.dmm b/archive/maps/southern_cross/southern_cross-4.dmm
similarity index 100%
rename from maps/southern_cross/southern_cross-4.dmm
rename to archive/maps/southern_cross/southern_cross-4.dmm
diff --git a/maps/southern_cross/southern_cross-5.dmm b/archive/maps/southern_cross/southern_cross-5.dmm
similarity index 100%
rename from maps/southern_cross/southern_cross-5.dmm
rename to archive/maps/southern_cross/southern_cross-5.dmm
diff --git a/maps/southern_cross/southern_cross-6.dmm b/archive/maps/southern_cross/southern_cross-6.dmm
similarity index 100%
rename from maps/southern_cross/southern_cross-6.dmm
rename to archive/maps/southern_cross/southern_cross-6.dmm
diff --git a/maps/southern_cross/southern_cross-7.dmm b/archive/maps/southern_cross/southern_cross-7.dmm
similarity index 100%
rename from maps/southern_cross/southern_cross-7.dmm
rename to archive/maps/southern_cross/southern_cross-7.dmm
diff --git a/maps/southern_cross/southern_cross-8.dmm b/archive/maps/southern_cross/southern_cross-8.dmm
similarity index 100%
rename from maps/southern_cross/southern_cross-8.dmm
rename to archive/maps/southern_cross/southern_cross-8.dmm
diff --git a/maps/southern_cross/southern_cross-9.dmm b/archive/maps/southern_cross/southern_cross-9.dmm
similarity index 100%
rename from maps/southern_cross/southern_cross-9.dmm
rename to archive/maps/southern_cross/southern_cross-9.dmm
diff --git a/maps/southern_cross/southern_cross.dm b/archive/maps/southern_cross/southern_cross.dm
similarity index 100%
rename from maps/southern_cross/southern_cross.dm
rename to archive/maps/southern_cross/southern_cross.dm
diff --git a/maps/southern_cross/southern_cross_areas.dm b/archive/maps/southern_cross/southern_cross_areas.dm
similarity index 100%
rename from maps/southern_cross/southern_cross_areas.dm
rename to archive/maps/southern_cross/southern_cross_areas.dm
diff --git a/maps/southern_cross/southern_cross_defines.dm b/archive/maps/southern_cross/southern_cross_defines.dm
similarity index 100%
rename from maps/southern_cross/southern_cross_defines.dm
rename to archive/maps/southern_cross/southern_cross_defines.dm
diff --git a/maps/southern_cross/southern_cross_elevator.dm b/archive/maps/southern_cross/southern_cross_elevator.dm
similarity index 100%
rename from maps/southern_cross/southern_cross_elevator.dm
rename to archive/maps/southern_cross/southern_cross_elevator.dm
diff --git a/maps/southern_cross/southern_cross_events.dm b/archive/maps/southern_cross/southern_cross_events.dm
similarity index 100%
rename from maps/southern_cross/southern_cross_events.dm
rename to archive/maps/southern_cross/southern_cross_events.dm
diff --git a/maps/southern_cross/southern_cross_jobs.dm b/archive/maps/southern_cross/southern_cross_jobs.dm
similarity index 100%
rename from maps/southern_cross/southern_cross_jobs.dm
rename to archive/maps/southern_cross/southern_cross_jobs.dm
diff --git a/maps/southern_cross/southern_cross_overrides.dm b/archive/maps/southern_cross/southern_cross_overrides.dm
similarity index 100%
rename from maps/southern_cross/southern_cross_overrides.dm
rename to archive/maps/southern_cross/southern_cross_overrides.dm
diff --git a/maps/southern_cross/southern_cross_presets.dm b/archive/maps/southern_cross/southern_cross_presets.dm
similarity index 100%
rename from maps/southern_cross/southern_cross_presets.dm
rename to archive/maps/southern_cross/southern_cross_presets.dm
diff --git a/maps/southern_cross/southern_cross_shuttles.dm b/archive/maps/southern_cross/southern_cross_shuttles.dm
similarity index 100%
rename from maps/southern_cross/southern_cross_shuttles.dm
rename to archive/maps/southern_cross/southern_cross_shuttles.dm
diff --git a/maps/southern_cross/structures/closets/engineering.dm b/archive/maps/southern_cross/structures/closets/engineering.dm
similarity index 100%
rename from maps/southern_cross/structures/closets/engineering.dm
rename to archive/maps/southern_cross/structures/closets/engineering.dm
diff --git a/maps/southern_cross/structures/closets/medical.dm b/archive/maps/southern_cross/structures/closets/medical.dm
similarity index 100%
rename from maps/southern_cross/structures/closets/medical.dm
rename to archive/maps/southern_cross/structures/closets/medical.dm
diff --git a/maps/southern_cross/structures/closets/misc.dm b/archive/maps/southern_cross/structures/closets/misc.dm
similarity index 100%
rename from maps/southern_cross/structures/closets/misc.dm
rename to archive/maps/southern_cross/structures/closets/misc.dm
diff --git a/maps/southern_cross/structures/closets/research.dm b/archive/maps/southern_cross/structures/closets/research.dm
similarity index 100%
rename from maps/southern_cross/structures/closets/research.dm
rename to archive/maps/southern_cross/structures/closets/research.dm
diff --git a/maps/southern_cross/structures/closets/security.dm b/archive/maps/southern_cross/structures/closets/security.dm
similarity index 100%
rename from maps/southern_cross/structures/closets/security.dm
rename to archive/maps/southern_cross/structures/closets/security.dm
diff --git a/maps/southern_cross/turfs/outdoors.dm b/archive/maps/southern_cross/turfs/outdoors.dm
similarity index 100%
rename from maps/southern_cross/turfs/outdoors.dm
rename to archive/maps/southern_cross/turfs/outdoors.dm
diff --git a/maps/submaps/depreciated_vr/_depreciated.dm b/archive/maps/submaps/depreciated_vr/_depreciated.dm
similarity index 100%
rename from maps/submaps/depreciated_vr/_depreciated.dm
rename to archive/maps/submaps/depreciated_vr/_depreciated.dm
diff --git a/maps/submaps/depreciated_vr/ert_base.dmm b/archive/maps/submaps/depreciated_vr/ert_base.dmm
similarity index 100%
rename from maps/submaps/depreciated_vr/ert_base.dmm
rename to archive/maps/submaps/depreciated_vr/ert_base.dmm
diff --git a/maps/submaps/depreciated_vr/mercbase.dmm b/archive/maps/submaps/depreciated_vr/mercbase.dmm
similarity index 100%
rename from maps/submaps/depreciated_vr/mercbase.dmm
rename to archive/maps/submaps/depreciated_vr/mercbase.dmm
diff --git a/maps/submaps/depreciated_vr/talon.dm b/archive/maps/submaps/depreciated_vr/talon.dm
similarity index 100%
rename from maps/submaps/depreciated_vr/talon.dm
rename to archive/maps/submaps/depreciated_vr/talon.dm
diff --git a/maps/submaps/depreciated_vr/talon1.dmm b/archive/maps/submaps/depreciated_vr/talon1.dmm
similarity index 100%
rename from maps/submaps/depreciated_vr/talon1.dmm
rename to archive/maps/submaps/depreciated_vr/talon1.dmm
diff --git a/maps/submaps/depreciated_vr/talon2.dmm b/archive/maps/submaps/depreciated_vr/talon2.dmm
similarity index 100%
rename from maps/submaps/depreciated_vr/talon2.dmm
rename to archive/maps/submaps/depreciated_vr/talon2.dmm
diff --git a/maps/submaps/depreciated_vr/talon_areas.dm b/archive/maps/submaps/depreciated_vr/talon_areas.dm
similarity index 100%
rename from maps/submaps/depreciated_vr/talon_areas.dm
rename to archive/maps/submaps/depreciated_vr/talon_areas.dm
diff --git a/maps/submaps/engine_submaps/southern_cross/_engine_submaps.dm b/archive/maps/submaps/engine_submaps/southern_cross/_engine_submaps.dm
similarity index 100%
rename from maps/submaps/engine_submaps/southern_cross/_engine_submaps.dm
rename to archive/maps/submaps/engine_submaps/southern_cross/_engine_submaps.dm
diff --git a/maps/submaps/engine_submaps/southern_cross/engine_rust.dmm b/archive/maps/submaps/engine_submaps/southern_cross/engine_rust.dmm
similarity index 100%
rename from maps/submaps/engine_submaps/southern_cross/engine_rust.dmm
rename to archive/maps/submaps/engine_submaps/southern_cross/engine_rust.dmm
diff --git a/maps/submaps/engine_submaps/southern_cross/engine_singulo.dmm b/archive/maps/submaps/engine_submaps/southern_cross/engine_singulo.dmm
similarity index 100%
rename from maps/submaps/engine_submaps/southern_cross/engine_singulo.dmm
rename to archive/maps/submaps/engine_submaps/southern_cross/engine_singulo.dmm
diff --git a/maps/submaps/engine_submaps/southern_cross/engine_sme.dmm b/archive/maps/submaps/engine_submaps/southern_cross/engine_sme.dmm
similarity index 100%
rename from maps/submaps/engine_submaps/southern_cross/engine_sme.dmm
rename to archive/maps/submaps/engine_submaps/southern_cross/engine_sme.dmm
diff --git a/maps/submaps/engine_submaps/southern_cross/engine_tesla.dmm b/archive/maps/submaps/engine_submaps/southern_cross/engine_tesla.dmm
similarity index 100%
rename from maps/submaps/engine_submaps/southern_cross/engine_tesla.dmm
rename to archive/maps/submaps/engine_submaps/southern_cross/engine_tesla.dmm
diff --git a/maps/offmap_vr/om_ships/aro2.dmm b/maps/offmap_vr/om_ships/aro2.dmm
index d39bc855e86..487a883ae50 100644
--- a/maps/offmap_vr/om_ships/aro2.dmm
+++ b/maps/offmap_vr/om_ships/aro2.dmm
@@ -1917,14 +1917,6 @@
 /area/aro2/airarea)
 "sB" = (
 /obj/structure/table/steel,
-/obj/item/magnetic_ammo/pistol/khi{
-	pixel_x = 5;
-	pixel_y = 2
-	},
-/obj/item/magnetic_ammo/pistol/khi{
-	pixel_x = -3;
-	pixel_y = 5
-	},
 /turf/simulated/floor/tiled/eris/techmaint_perforated,
 /area/aro2/surfluid)
 "sF" = (
diff --git a/maps/offmap_vr/om_ships/aro3.dmm b/maps/offmap_vr/om_ships/aro3.dmm
index db87ae36368..11b6741bf00 100644
--- a/maps/offmap_vr/om_ships/aro3.dmm
+++ b/maps/offmap_vr/om_ships/aro3.dmm
@@ -3069,14 +3069,6 @@
 	},
 /turf/simulated/floor/tiled/milspec,
 /area/aro3/hallway_starboard)
-"sX" = (
-/obj/structure/prop/tgmc_minirockets,
-/obj/effect/floor_decal/milspec/hatchmarks,
-/obj/effect/floor_decal/industrial/warning/dust{
-	dir = 6
-	},
-/turf/simulated/floor/tiled/techmaint/airless,
-/area/space)
 "td" = (
 /obj/effect/floor_decal/milspec_sterile/green/half{
 	dir = 4
@@ -5182,14 +5174,6 @@
 /obj/item/storage/firstaid/adv,
 /turf/simulated/floor/tiled/techmaint,
 /area/aro3/medical)
-"Hb" = (
-/obj/structure/prop/tgmc_minirockets,
-/obj/effect/floor_decal/milspec/hatchmarks,
-/obj/effect/floor_decal/industrial/warning/dust{
-	dir = 10
-	},
-/turf/simulated/floor/tiled/techmaint/airless,
-/area/space)
 "Hd" = (
 /turf/simulated/wall/tgmc/durawall,
 /area/aro3/hallway_starboard)
@@ -5324,7 +5308,6 @@
 /turf/simulated/floor/tiled/milspec,
 /area/aro3/atmos)
 "Im" = (
-/obj/structure/prop/tgmc_laser/loaded,
 /obj/effect/floor_decal/milspec/hatchmarks,
 /obj/effect/floor_decal/industrial/warning/dust{
 	dir = 6
@@ -6275,7 +6258,6 @@
 /turf/simulated/floor/plating/eris/under,
 /area/aro3/atmos)
 "OM" = (
-/obj/structure/prop/tgmc_laser/loaded,
 /obj/effect/floor_decal/milspec/hatchmarks,
 /obj/effect/floor_decal/industrial/warning/dust{
 	dir = 10
@@ -6474,11 +6456,6 @@
 	},
 /turf/simulated/floor/tiled/milspec,
 /area/aro3/power)
-"Qd" = (
-/obj/structure/prop/tgmc_minirockets,
-/obj/effect/floor_decal/milspec/hatchmarks,
-/turf/simulated/floor/tiled/techmaint/airless,
-/area/space)
 "Qe" = (
 /obj/effect/floor_decal/milspec/hatchmarks,
 /turf/simulated/floor/tiled/milspec,
@@ -11537,7 +11514,7 @@ Ua
 Ua
 Ua
 pO
-Qd
+pO
 tp
 Ua
 Ua
@@ -15636,7 +15613,7 @@ Ua
 Ua
 yn
 UL
-Hb
+OM
 hD
 hD
 hD
@@ -19754,7 +19731,7 @@ Ua
 Ua
 yn
 lJ
-sX
+Im
 hD
 hD
 hD
@@ -23891,7 +23868,7 @@ Ua
 Ua
 Ua
 pO
-Qd
+pO
 AA
 Ua
 Ua
diff --git a/maps/offmap_vr/om_ships/hybridshuttle.dmm b/maps/offmap_vr/om_ships/hybridshuttle.dmm
index 813f41d697a..325018b4588 100644
--- a/maps/offmap_vr/om_ships/hybridshuttle.dmm
+++ b/maps/offmap_vr/om_ships/hybridshuttle.dmm
@@ -63,7 +63,7 @@
 	pixel_y = 24
 	},
 /obj/structure/cable{
-	icon_state = "0-4";
+	icon_state = "0-4"
 	},
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/blue_fo)
diff --git a/maps/offmap_vr/om_ships/lunaship.dmm b/maps/offmap_vr/om_ships/lunaship.dmm
index c21ccbee426..f29c165feac 100644
--- a/maps/offmap_vr/om_ships/lunaship.dmm
+++ b/maps/offmap_vr/om_ships/lunaship.dmm
@@ -986,9 +986,6 @@
 /obj/structure/disposalpipe/trunk,
 /turf/simulated/floor/tiled/milspec,
 /area/lunaship/hallway_port)
-"nN" = (
-/turf/simulated/floor/outdoors/grass/heavy/atoll,
-/area/lunaship/park)
 "nR" = (
 /obj/structure/lattice,
 /obj/structure/cable/cyan{
@@ -2069,7 +2066,9 @@
 /area/lunaship/park)
 "BM" = (
 /obj/structure/flora/ausbushes/ppflowers,
-/turf/simulated/floor/outdoors/grass/heavy/atoll,
+/turf/simulated/floor/outdoors/grass/heavy{
+	outdoors = 0
+	},
 /area/lunaship/park)
 "BO" = (
 /obj/structure/cable/cyan{
@@ -2361,7 +2360,9 @@
 	dir = 8
 	},
 /obj/structure/table/bench/wooden,
-/turf/simulated/floor/outdoors/grass/heavy/atoll,
+/turf/simulated/floor/outdoors/grass/heavy{
+	outdoors = 0
+	},
 /area/lunaship/park)
 "GT" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -3296,12 +3297,6 @@
 	opacity = 1
 	},
 /area/lunaship/bar)
-"Uy" = (
-/obj/structure/cable/cyan{
-	icon_state = "4-8"
-	},
-/turf/simulated/floor/outdoors/grass/heavy/atoll,
-/area/lunaship/park)
 "UK" = (
 /obj/structure/table/glass,
 /obj/item/healthanalyzer/advanced{
@@ -3547,10 +3542,6 @@
 	},
 /turf/simulated/floor/tiled/milspec,
 /area/lunaship/engineering)
-"Xw" = (
-/obj/structure/table/bench/wooden,
-/turf/simulated/floor/outdoors/grass/heavy/atoll,
-/area/lunaship/park)
 "Xx" = (
 /obj/effect/floor_decal/techfloor{
 	dir = 6
@@ -5405,7 +5396,7 @@ Ag
 Ag
 gZ
 gC
-Uy
+ku
 ad
 bP
 hr
@@ -5466,7 +5457,7 @@ BB
 EG
 GQ
 gC
-nN
+gC
 ku
 ad
 bP
@@ -5524,11 +5515,11 @@ bj
 bp
 BB
 EG
-nN
+gC
 BM
 gC
 gC
-nN
+gC
 ku
 ad
 bP
@@ -5584,14 +5575,14 @@ ad
 sh
 bj
 BB
-nN
+gC
 sa
 gC
 gC
-nN
-nN
 gC
-Uy
+gC
+gC
+ku
 ad
 bP
 Ww
@@ -5649,7 +5640,7 @@ BB
 BB
 EG
 gC
-nN
+gC
 gC
 gC
 Hv
@@ -5711,11 +5702,11 @@ il
 BB
 BB
 BB
-Xw
+EG
 Rf
 ru
-nN
-Uy
+gC
+ku
 ad
 bP
 Ar
diff --git a/maps/offmap_vr/om_ships/vespa.dmm b/maps/offmap_vr/om_ships/vespa.dmm
index 4c6b5928905..effdaf1dece 100644
--- a/maps/offmap_vr/om_ships/vespa.dmm
+++ b/maps/offmap_vr/om_ships/vespa.dmm
@@ -920,9 +920,6 @@
 	},
 /turf/simulated/floor/tiled/techfloor,
 /area/ship/expe/southairlock)
-"cw" = (
-/turf/simulated/floor/tiled/techfloor,
-/area/ship/expe/hangarcontrol)
 "cx" = (
 /obj/machinery/door/airlock/glass_medical{
 	req_one_access = newlist()
@@ -4341,7 +4338,6 @@
 	dir = 1;
 	icon_state = "bordercolor"
 	},
-/obj/item/clothing/under/hephaestus,
 /obj/item/clothing/suit/armor/vest,
 /obj/item/clothing/shoes/boots/duty,
 /obj/item/clothing/head/beret,
@@ -12250,7 +12246,6 @@
 	dir = 1;
 	icon_state = "bordercolor"
 	},
-/obj/item/clothing/under/hephaestus,
 /obj/item/clothing/suit/armor/vest,
 /obj/item/clothing/shoes/boots/duty,
 /obj/item/clothing/head/beret,
@@ -16319,14 +16314,14 @@ af
 bi
 fP
 bX
-cw
+jV
 dq
 bX
-cw
+jV
 fY
 bX
 qf
-cw
+jV
 jV
 bX
 mh
@@ -16461,14 +16456,14 @@ ba
 bj
 bu
 bX
-cw
+jV
 dq
 bX
-cw
+jV
 fZ
 bX
 hz
-cw
+jV
 jW
 bX
 mi
@@ -16610,7 +16605,7 @@ fc
 dr
 bX
 hy
-cw
+jV
 jX
 bY
 mj
@@ -16748,11 +16743,11 @@ bX
 cy
 ds
 ej
-cw
+jV
 ga
 gN
-cw
-cw
+jV
+jV
 jY
 lk
 mk
@@ -16887,7 +16882,7 @@ aS
 bh
 bw
 bY
-cw
+jV
 dt
 ek
 fd
@@ -17171,12 +17166,12 @@ aS
 bi
 bw
 bX
-cw
+jV
 du
 bX
 pM
 bX
-cw
+jV
 hB
 bX
 kb
@@ -17313,12 +17308,12 @@ aS
 bm
 bx
 bX
-cw
+jV
 du
 bX
 ff
 bX
-cw
+jV
 hC
 bX
 kc
diff --git a/maps/submaps/admin_use_vr/avii_eventMapv2.dmm b/maps/submaps/admin_use_vr/avii_eventMapv2.dmm
index b395d37962a..1a217688cc7 100644
--- a/maps/submaps/admin_use_vr/avii_eventMapv2.dmm
+++ b/maps/submaps/admin_use_vr/avii_eventMapv2.dmm
@@ -5194,7 +5194,6 @@
 /area/engineering/engine_monitoring)
 "yw" = (
 /obj/structure/table/steel_reinforced,
-/obj/item/book/manual/sd_guide,
 /obj/effect/floor_decal/milspec/color/blue/half{
 	dir = 6
 	},
diff --git a/maps/submaps/admin_use_vr/dhael_centcom.dmm b/maps/submaps/admin_use_vr/dhael_centcom.dmm
index 23a0e2a93f6..8ed19216e74 100644
--- a/maps/submaps/admin_use_vr/dhael_centcom.dmm
+++ b/maps/submaps/admin_use_vr/dhael_centcom.dmm
@@ -2247,16 +2247,6 @@
 	dir = 2
 	},
 /area/centcom/control)
-"ey" = (
-/obj/structure/device/piano{
-	dir = 4
-	},
-/obj/effect/floor_decal/corner/yellow/diagonal,
-/obj/effect/floor_decal/corner/blue/diagonal{
-	dir = 4
-	},
-/turf/unsimulated/floor/steel,
-/area/centcom/control)
 "ez" = (
 /obj/machinery/computer/rdconsole/core{
 	dir = 4
@@ -3937,15 +3927,6 @@
 /area/centcom/security)
 "im" = (
 /obj/structure/table/rack,
-/obj/item/storage/box/empshells/large,
-/obj/item/storage/box/empshells/large,
-/obj/item/storage/box/empshells/large,
-/obj/item/storage/box/empshells/large,
-/obj/item/storage/box/empshells/large,
-/obj/item/storage/box/empshells/large,
-/obj/item/storage/box/empshells/large,
-/obj/item/storage/box/empshells/large,
-/obj/item/storage/box/empshells/large,
 /obj/effect/floor_decal/industrial/outline/yellow,
 /obj/machinery/camera/network/crescent,
 /turf/unsimulated/floor{
@@ -4671,33 +4652,7 @@
 	icon_state = "white"
 	},
 /area/centcom/medical)
-"jV" = (
-/obj/machinery/disease2/diseaseanalyser,
-/obj/effect/floor_decal/borderfloorwhite{
-	dir = 1
-	},
-/obj/effect/floor_decal/corner/green/border{
-	dir = 1
-	},
-/turf/unsimulated/floor/steel{
-	icon_state = "white"
-	},
-/area/centcom/medical)
-"jW" = (
-/obj/machinery/computer/diseasesplicer,
-/obj/effect/floor_decal/borderfloorwhite{
-	dir = 1
-	},
-/obj/effect/floor_decal/corner/green/border{
-	dir = 1
-	},
-/obj/machinery/camera/network/crescent,
-/turf/unsimulated/floor/steel{
-	icon_state = "white"
-	},
-/area/centcom/medical)
 "jX" = (
-/obj/machinery/disease2/incubator,
 /obj/effect/floor_decal/borderfloorwhite{
 	dir = 1
 	},
@@ -4731,7 +4686,6 @@
 	},
 /area/centcom/medical)
 "jZ" = (
-/obj/machinery/disease2/isolator,
 /obj/effect/floor_decal/borderfloorwhite{
 	dir = 5
 	},
@@ -5433,7 +5387,6 @@
 /obj/effect/floor_decal/corner/green/bordercorner2{
 	dir = 8
 	},
-/obj/machinery/computer/centrifuge,
 /turf/unsimulated/floor/steel{
 	icon_state = "white"
 	},
@@ -11404,14 +11357,14 @@
 "wI" = (
 /turf/unsimulated/floor/steel{
 	icon = 'icons/turf/outdoors.dmi';
-	icon_state = "grass"
+	icon_state = "grass-dark0"
 	},
 /area/centcom/main_hall)
 "wJ" = (
 /obj/structure/table/bench/wooden,
 /turf/unsimulated/floor/steel{
 	icon = 'icons/turf/outdoors.dmi';
-	icon_state = "grass"
+	icon_state = "grass-dark0"
 	},
 /area/centcom/main_hall)
 "wK" = (
@@ -11692,14 +11645,14 @@
 /obj/machinery/light/flamp/noshade,
 /turf/unsimulated/floor/steel{
 	icon = 'icons/turf/outdoors.dmi';
-	icon_state = "grass"
+	icon_state = "grass-dark0"
 	},
 /area/centcom/main_hall)
 "xh" = (
 /obj/structure/flora/ausbushes/brflowers,
 /turf/unsimulated/floor/steel{
 	icon = 'icons/turf/outdoors.dmi';
-	icon_state = "grass"
+	icon_state = "grass-dark0"
 	},
 /area/centcom/main_hall)
 "xi" = (
@@ -12049,7 +12002,7 @@
 /obj/structure/flora/ausbushes/ppflowers,
 /turf/unsimulated/floor/steel{
 	icon = 'icons/turf/outdoors.dmi';
-	icon_state = "grass"
+	icon_state = "grass-dark0"
 	},
 /area/centcom/main_hall)
 "xJ" = (
@@ -13047,7 +13000,7 @@
 /obj/structure/flora/ausbushes/ywflowers,
 /turf/unsimulated/floor/steel{
 	icon = 'icons/turf/outdoors.dmi';
-	icon_state = "grass"
+	icon_state = "grass-dark0"
 	},
 /area/centcom/main_hall)
 "zf" = (
@@ -22534,7 +22487,7 @@ ei
 ac
 ac
 jK
-jV
+jX
 kv
 kv
 kv
@@ -22676,7 +22629,7 @@ ei
 ac
 ac
 jK
-jW
+jQ
 kz
 kR
 kR
@@ -29616,7 +29569,7 @@ dm
 dG
 dV
 dV
-ey
+dV
 dV
 dV
 fA
diff --git a/maps/submaps/admin_use_vr/lucky_7.dmm b/maps/submaps/admin_use_vr/lucky_7.dmm
index cd398712583..ba0e0c1b9e8 100644
--- a/maps/submaps/admin_use_vr/lucky_7.dmm
+++ b/maps/submaps/admin_use_vr/lucky_7.dmm
@@ -1751,8 +1751,6 @@
 /obj/item/radio/headset/casino,
 /obj/item/radio/headset/casino,
 /obj/item/radio/headset/casino,
-/obj/item/radio/headset/casino/bowman,
-/obj/item/radio/headset/casino/bowman,
 /turf/simulated/floor/tiled,
 /area/submap/casino_event)
 "eL" = (
@@ -2225,9 +2223,6 @@
 /obj/item/radio/headset/casino,
 /obj/item/radio/headset/casino,
 /obj/item/radio/headset/casino,
-/obj/item/radio/headset/casino/bowman,
-/obj/item/radio/headset/casino/bowman,
-/obj/item/radio/headset/casino/bowman,
 /turf/simulated/floor/tiled/dark,
 /area/submap/casino_event)
 "fH" = (
diff --git a/maps/submaps/admin_use_vr/tradeship.dmm b/maps/submaps/admin_use_vr/tradeship.dmm
index 5882284d08b..17fbf6acdd4 100644
--- a/maps/submaps/admin_use_vr/tradeship.dmm
+++ b/maps/submaps/admin_use_vr/tradeship.dmm
@@ -1516,7 +1516,6 @@
 /obj/item/clothing/head/collectable/pirate,
 /obj/item/clothing/head/collectable/wizard,
 /obj/item/clothing/head/collectable/xenom,
-/obj/item/clothing/head/cowboy_hat,
 /obj/item/clothing/head/pin/flower/violet,
 /obj/item/clothing/head/pin/flower/blue,
 /obj/item/clothing/head/pin/flower/orange,
diff --git a/maps/submaps/admin_use_vr/wizard.dmm b/maps/submaps/admin_use_vr/wizard.dmm
index 805e7753cb5..54c2d7c8c2d 100644
--- a/maps/submaps/admin_use_vr/wizard.dmm
+++ b/maps/submaps/admin_use_vr/wizard.dmm
@@ -284,9 +284,6 @@
 	icon_state = "dark"
 	},
 /area/wizard_station)
-"aH" = (
-/turf/template_noop,
-/area/wizard_station)
 "aI" = (
 /obj/structure/bed/chair/wood/wings{
 	icon_state = "wooden_chair_wings";
@@ -333,10 +330,6 @@
 	icon_state = "dark"
 	},
 /area/wizard_station)
-"aO" = (
-/obj/effect/wingrille_spawn/reinforced/crescent,
-/turf/template_noop,
-/area/wizard_station)
 "aP" = (
 /obj/structure/table/woodentable,
 /obj/machinery/librarycomp{
@@ -504,24 +497,6 @@
 	icon_state = "dark"
 	},
 /area/wizard_station)
-"bj" = (
-/obj/structure/sign/double/map/left{
-	pixel_y = 32
-	},
-/turf/unsimulated/floor{
-	icon_state = "vault";
-	dir = 5
-	},
-/area/wizard_station)
-"bk" = (
-/obj/structure/sign/double/map/right{
-	pixel_y = 32
-	},
-/turf/unsimulated/floor{
-	icon_state = "vault";
-	dir = 5
-	},
-/area/wizard_station)
 "bl" = (
 /obj/machinery/computer/message_monitor,
 /turf/unsimulated/floor{
@@ -1300,8 +1275,8 @@ aa
 aa
 aa
 aa
-aH
-aO
+ab
+ac
 ab
 ay
 bi
@@ -1368,7 +1343,7 @@ ao
 ao
 aV
 ab
-bj
+be
 bu
 be
 ab
@@ -1400,7 +1375,7 @@ aI
 ao
 aW
 ab
-bk
+be
 ay
 be
 ab
diff --git a/maps/submaps/surface_submaps/plains/Diner.dmm b/maps/submaps/surface_submaps/plains/Diner.dmm
index 289235346b6..714c6f61cfc 100644
--- a/maps/submaps/surface_submaps/plains/Diner.dmm
+++ b/maps/submaps/surface_submaps/plains/Diner.dmm
@@ -458,7 +458,6 @@
 /area/submap/Diner)
 "bA" = (
 /obj/structure/table/standard,
-/obj/random/soap/anom,
 /turf/simulated/floor/tiled/hydro,
 /area/submap/Diner)
 
diff --git a/vorestation.dme b/vorestation.dme
index 1b49deafd34..cd19e141416 100644
--- a/vorestation.dme
+++ b/vorestation.dme
@@ -4467,7 +4467,6 @@
 #include "maps\expedition_vr\beach\submaps\mountains.dm"
 #include "maps\expedition_vr\beach\submaps\mountains_areas.dm"
 #include "maps\expedition_vr\virgo5\v5_features.dm"
-#include "maps\gateway_archive_vr\blackmarketpackers.dm"
 #include "maps\redgate\facility_items.dm"
 #include "maps\redgate\fantasy_items.dm"
 #include "maps\redgate\falls\atoll_decals.dm"