diff --git a/maps/tether/tether-03-station.dmm b/maps/tether/tether-03-station.dmm
index 1a901c5690c..437546b3bff 100644
--- a/maps/tether/tether-03-station.dmm
+++ b/maps/tether/tether-03-station.dmm
@@ -581,6 +581,7 @@
 "ali" = (/obj/effect/floor_decal/steeldecal/steel_decals4,/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 10},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/button/remote/airlock{id = "armory_blue"; name = "Armory Door Bolts"; pixel_x = 26; pixel_y = -26; specialfunctions = 4},/turf/simulated/floor/tiled/dark,/area/security/armory/blue)
 "alj" = (/obj/machinery/door/airlock/security{id_tag = "armory_blue"; name = "Armory Storage"; req_access = list(3)},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/door/firedoor/glass,/turf/simulated/floor/tiled/dark,/area/security/armory/blue)
 "alk" = (/obj/structure/table/steel,/obj/machinery/camera/network/security{c_tag = "SEC - Vault"; dir = 4},/obj/item/weapon/storage/box/shotgunshells{pixel_x = 6; pixel_y = -1},/turf/simulated/floor/reinforced,/area/security/armory/red)
+"all" = (/obj/structure/closet/secure_closet/detective,/obj/item/weapon/reagent_containers/spray/pepper,/obj/item/weapon/gun/energy/taser,/turf/simulated/floor/lino,/area/security/detectives_office)
 "alm" = (/obj/machinery/access_button{command = "cycle_exterior"; frequency = 1379; master_tag = "sec_fore_airlock"; name = "exterior access button"; pixel_x = -25; pixel_y = -25; req_one_access = list(1,2,18)},/turf/simulated/floor/airless,/area/maintenance/station/sec_upper)
 "aln" = (/obj/structure/table/reinforced,/obj/machinery/chemical_dispenser/bar_soft/full,/obj/effect/floor_decal/corner/white/diagonal,/obj/structure/extinguisher_cabinet{dir = 8; icon_state = "extinguisher_closed"; pixel_x = 30; tag = "icon-extinguisher_closed (WEST)"},/turf/simulated/floor/tiled,/area/engineering/break_room)
 "alo" = (/turf/simulated/wall/r_wall,/area/maintenance/station/sec_upper)
@@ -3657,7 +3658,6 @@
 "btO" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment,/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 4},/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 9},/turf/simulated/floor/tiled,/area/security/hallway)
 "btP" = (/obj/effect/floor_decal/borderfloor{dir = 5},/obj/effect/floor_decal/corner/red/border{dir = 5},/obj/effect/floor_decal/borderfloor/corner2{dir = 4},/obj/effect/floor_decal/corner/red/bordercorner2{dir = 4},/obj/machinery/camera/network/security,/turf/simulated/floor/tiled,/area/security/hallway)
 "btQ" = (/turf/simulated/wall/r_wall,/area/security/detectives_office)
-"btR" = (/obj/structure/closet/secure_closet/detective,/obj/item/weapon/reagent_containers/spray/pepper,/obj/item/weapon/gun/energy/taser,/obj/item/weapon/gun/projectile/revolver/detective,/turf/simulated/floor/lino,/area/security/detectives_office)
 "btS" = (/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/obj/machinery/power/apc{dir = 1; name = "north bump"; pixel_x = 0; pixel_y = 28},/turf/simulated/floor/lino,/area/security/detectives_office)
 "btT" = (/obj/item/weapon/storage/secure/safe{pixel_x = 6; pixel_y = 28},/turf/simulated/floor/lino,/area/security/detectives_office)
 "btU" = (/obj/machinery/light{dir = 1},/turf/simulated/floor/carpet,/area/security/detectives_office)
@@ -5849,8 +5849,8 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacaacaacaacaacaacaacaacaacaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacaacaacaacaacaacaacaacaacaacaacbqObsCbsDbsEbsFbsGbrobrZbrZbrZbrZbrZbrZbrZbrZbrZbrZbrZbrZbrZbsabrpbrpbrpbrpbsbaJqceebsJbsKbsLbsMbsNbsObsPbsQbsRbqYbqZbpoaacbsSbsTbsUbsVbsWbsUbsXbsYbsSaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacaacaacaacaacaacaacaacaacaacaacbqObsZbtabtbbtcbtdbrobrpbtebtebtebtebtebtebtebtebtfbrZbrZbrZbsabrpbrpbrpbrJbqXbsccefbthbtibtjbtkbqYbtlbtlbtlbtlbqYbqZbpoaacbsSbtmbtnbtnbtobtnbtnbtpbsSaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacaacaacaacaacaacaacaacaacbqObtqbtrbtsbttbtubrobrpbtvbrpbrpbrpbrpbrpbrpbtvbtwbrZbrZbrZbsabrpbrpbrpbrpbqXaGYaHbbqXbqXbqXbqXbqYbqYbqYbqYbqYbqYbtzbpoaacbsSbtAbtnbtBbtCbtBbtnbtDbsSaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaaaaaaaaabtEbtEbtEbtEbtEaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacaacaacaacbubbubbubbubbubbqObqObqObtFbtGbtHbtIbtJbtJbtJbtKbtKbtKbtKbtKbtJbtLbtKbtMbtKbtLbtKbtKbtKbtJbtJbtNbtObtPbtQbtRbtSbtTbtUbtVbtWbtXbtQbqZbpoaacbsSbtmbtYbtnbtZbtnbuabtpbsSaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaaaaaaaaabtEbtEbtEbtEbtEaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacaacaacbubbubbubbubbubbubbubanAbucbudbuebufbugbuhbuibujbukbujbulbumbunbumbuobupbuqburbusbusbutbumbuobuubuvbuwbtQbtRbuxbuybuzbuAbuBbuCbtQbqZbpoaacbsSbuDbuEbuFbuGbuHbuIbuJbsSaacaacaacaacaacaacaacaacaacaacaacaacaacaacaaaaaaaaaaaabtEbtEbtEbtEbtEaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacaacaacaacbubbubbubbubbubbqObqObqObtFbtGbtHbtIbtJbtJbtJbtKbtKbtKbtKbtKbtJbtLbtKbtMbtKbtLbtKbtKbtKbtJbtJbtNbtObtPbtQallbtSbtTbtUbtVbtWbtXbtQbqZbpoaacbsSbtmbtYbtnbtZbtnbuabtpbsSaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaaaaaaaaabtEbtEbtEbtEbtEaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacaacaacbubbubbubbubbubbubbubanAbucbudbuebufbugbuhbuibujbukbujbulbumbunbumbuobupbuqburbusbusbutbumbuobuubuvbuwbtQallbuxbuybuzbuAbuBbuCbtQbqZbpoaacbsSbuDbuEbuFbuGbuHbuIbuJbsSaacaacaacaacaacaacaacaacaacaacaacaacaacaacaaaaaaaaaaaabtEbtEbtEbtEbtEaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacaacaacbubbubbubbubbubbubbubbubbuKbuLbuMbuNbuObuNbuPbuQbuRbuSbuTbuNbuNbuNbuNbuUbuVbuQbuWbuXbuYbuZbuNbvabvbbvcbvdbvebvfbvgbvhbviauLavlbtQbqZbpoaacbsSbsSbsSbsSbsSbsSbsSbsSbsSaacaacaacaacaacaacaacaacaacaacaacaacaacaacaaaaaaaaaaaabtEbtEbtEbtEbtEaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacaacaacbubbvlbvmbvlbvmbvlbvnbubayhbvpbvqbvrbvsbvtbvubvtbvtbvvbvtbvtbvtbvtbvwbvxbvybvzbvAbvBbvCbvxbvDbvtbvEbvFbvGbvHbuybvIbvJbuAbuBbuCbtQbqZbpoaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaaaaaaaaaaaabtEbtEbtEbtEbtEaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacaacbubbvmbvmbvmbvmbvmbvmbubbvKbuubvLbvMbvMbvMbvMbvNbvNbvNbvNbvNbvMbvMbvMbvObvMbvPbvPbvQbvRbvSbvRbvTbvPbvPbvUbvUbvVbvWbvXbvXbvYbtXbtQbvZbwabwabwabwabwabwaaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaaaaaaaaabtEbtEbtEbtEbtEaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa