From 506321d8352ec7903c1b2afab2fc8e86a7ddd9af Mon Sep 17 00:00:00 2001
From: TheFurryFeline <38586851+TheFurryFeline@users.noreply.github.com>
Date: Mon, 19 Apr 2021 15:45:03 -0400
Subject: [PATCH] Remove Brig Bathroom Locks

---
 maps/tether/tether-01-surface1.dmm |  8 ---
 maps/tether/tether-02-surface2.dmm | 26 ++++----
 maps/tether/tether-03-surface3.dmm | 38 ++++++------
 maps/tether/tether-05-station1.dmm | 20 +++----
 maps/tether/tether-06-station2.dmm | 12 +---
 maps/tether/tether-07-station3.dmm | 96 +++++++++++++++---------------
 6 files changed, 92 insertions(+), 108 deletions(-)

diff --git a/maps/tether/tether-01-surface1.dmm b/maps/tether/tether-01-surface1.dmm
index 8b485abfea9..3d0af89fe7b 100644
--- a/maps/tether/tether-01-surface1.dmm
+++ b/maps/tether/tether-01-surface1.dmm
@@ -12225,7 +12225,6 @@
 /area/tether/surfacebase/outside/outside1)
 "auJ" = (
 /obj/machinery/door/airlock{
-	id_tag = "bathroomlock8";
 	name = "Surface Brig Restroom"
 	},
 /obj/machinery/door/firedoor,
@@ -12355,13 +12354,6 @@
 /obj/machinery/light/small{
 	dir = 4
 	},
-/obj/machinery/button/remote/airlock{
-	id = "bathroomlock8";
-	name = "Surface Brig Bathroom Lock";
-	pixel_x = -20;
-	pixel_y = 10;
-	specialfunctions = 4
-	},
 /turf/simulated/floor/tiled/freezer,
 /area/tether/surfacebase/security/brig/bathroom)
 "auY" = (
diff --git a/maps/tether/tether-02-surface2.dmm b/maps/tether/tether-02-surface2.dmm
index 9f341e98a93..2fcfdb93229 100644
--- a/maps/tether/tether-02-surface2.dmm
+++ b/maps/tether/tether-02-surface2.dmm
@@ -5531,7 +5531,7 @@
 /area/maintenance/lower/public_garden_maintenence/upper)
 "aiF" = (
 /obj/machinery/door/airlock{
-	id_tag = "bathroomlock13";
+	id_tag = "bathroomlock12";
 	name = "Surface Recovery Toilet 1"
 	},
 /obj/machinery/door/firedoor/glass,
@@ -5590,7 +5590,7 @@
 	dir = 1
 	},
 /obj/machinery/button/remote/airlock{
-	id = "bathroomlock13";
+	id = "bathroomlock12";
 	name = "Surface Recovery Toilet 1 Lock";
 	pixel_x = -10;
 	pixel_y = 22;
@@ -6181,7 +6181,7 @@
 /area/tether/surfacebase/medical/recoveryward)
 "ajC" = (
 /obj/machinery/door/airlock{
-	id_tag = "bathroomlock14";
+	id_tag = "bathroomlock13";
 	name = "Surface Recovery Toilet 2"
 	},
 /obj/machinery/door/firedoor/glass,
@@ -6812,7 +6812,7 @@
 	dir = 1
 	},
 /obj/machinery/button/remote/airlock{
-	id = "bathroomlock14";
+	id = "bathroomlock13";
 	name = "Surface Recovery Toilet 2 Lock";
 	pixel_x = -10;
 	pixel_y = 22;
@@ -7604,7 +7604,7 @@
 /area/tether/surfacebase/medical/uppersouthstairwell)
 "alS" = (
 /obj/machinery/door/airlock{
-	id_tag = "bathroomlock11";
+	id_tag = "bathroomlock10";
 	name = "Surface Toilet 1"
 	},
 /obj/machinery/door/firedoor/glass,
@@ -7618,7 +7618,7 @@
 	dir = 4
 	},
 /obj/machinery/button/remote/airlock{
-	id = "bathroomlock11";
+	id = "bathroomlock10";
 	name = "Surface Medbay Toilet 1 Lock";
 	pixel_x = -10;
 	pixel_y = 22;
@@ -24828,7 +24828,7 @@
 /area/engineering/atmos/storage)
 "aSg" = (
 /obj/machinery/door/airlock{
-	id_tag = "bathroomlock12";
+	id_tag = "bathroomlock11";
 	name = "Surface Medbay Toilet 2"
 	},
 /obj/machinery/door/firedoor/glass,
@@ -24864,7 +24864,7 @@
 	dir = 4
 	},
 /obj/machinery/button/remote/airlock{
-	id = "bathroomlock12";
+	id = "bathroomlock11";
 	name = "Surface Medbay Toilet 2 Lock";
 	pixel_x = -10;
 	pixel_y = 22;
@@ -24960,7 +24960,7 @@
 	dir = 4
 	},
 /obj/machinery/button/remote/airlock{
-	id = "bathroomlock10";
+	id = "bathroomlock9";
 	name = "Surface Security Toilet Lock";
 	pixel_x = -20;
 	pixel_y = -10;
@@ -24995,7 +24995,7 @@
 /area/maintenance/asmaint2)
 "aSw" = (
 /obj/machinery/door/airlock/security{
-	id_tag = "bathroomlock10";
+	id_tag = "bathroomlock9";
 	name = "Surface Security Toilet";
 	req_one_access = list(1,38)
 	},
@@ -25004,14 +25004,14 @@
 /area/tether/surfacebase/security/brig/bathroom)
 "aSx" = (
 /obj/machinery/door/airlock{
-	id_tag = "bathroomlock19";
+	id_tag = "bathroomlock18";
 	name = "Bar Toilet 2"
 	},
 /turf/simulated/floor/tiled/white,
 /area/rnd/breakroom/bathroom)
 "aSy" = (
 /obj/machinery/door/airlock{
-	id_tag = "bathroomlock9";
+	id_tag = "bathroomlock8";
 	name = "Research Toilet"
 	},
 /turf/simulated/floor/tiled/white,
@@ -25245,7 +25245,7 @@
 	},
 /obj/machinery/light/small,
 /obj/machinery/button/remote/airlock{
-	id = "bathroomlock9";
+	id = "bathroomlock8";
 	name = "Research Toilet Lock";
 	pixel_x = -20;
 	pixel_y = 10;
diff --git a/maps/tether/tether-03-surface3.dmm b/maps/tether/tether-03-surface3.dmm
index 48d87eebc3d..40b1869e5c4 100644
--- a/maps/tether/tether-03-surface3.dmm
+++ b/maps/tether/tether-03-surface3.dmm
@@ -3979,7 +3979,7 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/button/remote/airlock{
-	id = "bathroomlock17";
+	id = "bathroomlock16";
 	name = "Bathroom Lock";
 	pixel_x = -20;
 	pixel_y = -20;
@@ -3992,7 +3992,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/door/firedoor/glass,
 /obj/machinery/door/airlock/command{
-	id_tag = "bathroomlock17";
+	id_tag = "bathroomlock16";
 	name = "Private Restroom"
 	},
 /turf/simulated/floor/tiled/white,
@@ -13546,7 +13546,7 @@
 /area/crew_quarters/captain)
 "awk" = (
 /obj/machinery/door/airlock{
-	id_tag = "bathroomlock15";
+	id_tag = "bathroomlock14";
 	name = "Recreation Toilet 1"
 	},
 /turf/simulated/floor/tiled/white,
@@ -13912,7 +13912,7 @@
 /area/crew_quarters/recreation_area_restroom)
 "awM" = (
 /obj/machinery/door/airlock{
-	id_tag = "bathroomlock16";
+	id_tag = "bathroomlock15";
 	name = "Recreation Toilet 2"
 	},
 /turf/simulated/floor/tiled/white,
@@ -14164,7 +14164,7 @@
 	dir = 1
 	},
 /obj/machinery/button/remote/airlock{
-	id = "bathroomlock15";
+	id = "bathroomlock14";
 	name = "Recreation Toilet 1 Lock";
 	pixel_x = -20;
 	pixel_y = 10;
@@ -29229,7 +29229,7 @@
 	dir = 1
 	},
 /obj/machinery/button/remote/airlock{
-	id = "bathroomlock16";
+	id = "bathroomlock15";
 	name = "Recreation Toilet 2 Lock";
 	pixel_x = -20;
 	pixel_y = 10;
@@ -29286,7 +29286,7 @@
 /area/hallway/lower/third_south)
 "aXN" = (
 /obj/machinery/door/airlock{
-	id_tag = "bathroomlock18";
+	id_tag = "bathroomlock17";
 	name = "Bar Toilet 1"
 	},
 /turf/simulated/floor/tiled/white,
@@ -29314,13 +29314,6 @@
 /turf/simulated/floor/plating,
 /area/rnd/research_storage)
 "aXQ" = (
-/obj/machinery/door/airlock{
-	id_tag = "bathroomlock19";
-	name = "Bar Toilet 2"
-	},
-/turf/simulated/floor/tiled/white,
-/area/crew_quarters/barrestroom)
-"aXR" = (
 /obj/structure/toilet{
 	dir = 8
 	},
@@ -29328,14 +29321,21 @@
 	dir = 1
 	},
 /obj/machinery/button/remote/airlock{
-	id = "bathroomlock19";
-	name = "Bar Toilet 2 Lock";
+	id = "bathroomlock17";
+	name = "Bar Toilet 1 Lock";
 	pixel_x = -10;
 	pixel_y = 22;
 	specialfunctions = 4
 	},
 /turf/simulated/floor/tiled/white,
 /area/crew_quarters/barrestroom)
+"aXR" = (
+/obj/machinery/door/airlock{
+	id_tag = "bathroomlock18";
+	name = "Bar Toilet 2"
+	},
+/turf/simulated/floor/tiled/white,
+/area/crew_quarters/barrestroom)
 "aXS" = (
 /obj/structure/bed/chair/comfy,
 /obj/machinery/camera/network/civilian,
@@ -59800,7 +59800,7 @@ aTE
 aGK
 aXN
 aGK
-aXQ
+aXR
 aGK
 bfM
 aGK
@@ -59940,9 +59940,9 @@ aJt
 aQf
 aTE
 aGK
-aXO
+aXQ
 aGK
-aXR
+aXO
 aGK
 bfN
 aGK
diff --git a/maps/tether/tether-05-station1.dmm b/maps/tether/tether-05-station1.dmm
index 027f7d379ee..a4e98b17b44 100644
--- a/maps/tether/tether-05-station1.dmm
+++ b/maps/tether/tether-05-station1.dmm
@@ -7872,7 +7872,7 @@
 	pixel_x = -1
 	},
 /obj/machinery/button/remote/airlock{
-	id = "bathroomlock20";
+	id = "bathroomlock19";
 	name = "Engineering Washroom Toilet 1 Lock";
 	pixel_x = 10;
 	pixel_y = 22;
@@ -7890,7 +7890,7 @@
 /area/maintenance/abandonedlibrary)
 "aoS" = (
 /obj/machinery/door/airlock{
-	id_tag = "bathroomlock20";
+	id_tag = "bathroomlock19";
 	name = "Engineering Washroom Toilet 1"
 	},
 /obj/machinery/door/firedoor/glass,
@@ -7938,7 +7938,7 @@
 	dir = 8
 	},
 /obj/machinery/button/remote/airlock{
-	id = "bathroomlock21";
+	id = "bathroomlock20";
 	name = "Engineering Washroom Toilet 2 Lock";
 	pixel_x = 10;
 	pixel_y = 22;
@@ -7948,7 +7948,7 @@
 /area/crew_quarters/sleep/engi_wash)
 "aoZ" = (
 /obj/machinery/door/airlock{
-	id_tag = "bathroomlock21";
+	id_tag = "bathroomlock20";
 	name = "Engineering Washroom Toilet 2"
 	},
 /obj/machinery/door/firedoor/glass,
@@ -7966,7 +7966,7 @@
 	pixel_x = -1
 	},
 /obj/machinery/button/remote/airlock{
-	id = "bathroomlock22";
+	id = "bathroomlock21";
 	name = "Engineering Washroom Toilet 3 Lock";
 	pixel_x = 10;
 	pixel_y = 22;
@@ -7976,7 +7976,7 @@
 /area/crew_quarters/sleep/engi_wash)
 "apb" = (
 /obj/machinery/door/airlock{
-	id_tag = "bathroomlock22";
+	id_tag = "bathroomlock21";
 	name = "Engineering Washroom Toilet 3"
 	},
 /obj/machinery/door/firedoor/glass,
@@ -8007,7 +8007,7 @@
 	dir = 1
 	},
 /obj/machinery/button/remote/airlock{
-	id = "bathroomlock23";
+	id = "bathroomlock22";
 	name = "Unit 1 Lock";
 	pixel_x = 10;
 	pixel_y = 22;
@@ -8017,7 +8017,7 @@
 /area/crew_quarters/toilet)
 "apf" = (
 /obj/machinery/door/airlock{
-	id_tag = "bathroomlock23";
+	id_tag = "bathroomlock22";
 	name = "Unit 1"
 	},
 /turf/simulated/floor/tiled/white,
@@ -8036,7 +8036,7 @@
 	dir = 1
 	},
 /obj/machinery/button/remote/airlock{
-	id = "bathroomlock24";
+	id = "bathroomlock23";
 	name = "Unit 2 Lock";
 	pixel_x = 10;
 	pixel_y = 22;
@@ -8046,7 +8046,7 @@
 /area/crew_quarters/toilet)
 "api" = (
 /obj/machinery/door/airlock{
-	id_tag = "bathroomlock24";
+	id_tag = "bathroomlock23";
 	name = "Unit 2"
 	},
 /turf/simulated/floor/tiled/white,
diff --git a/maps/tether/tether-06-station2.dmm b/maps/tether/tether-06-station2.dmm
index 7ad169cb458..7b23d5ff7c6 100644
--- a/maps/tether/tether-06-station2.dmm
+++ b/maps/tether/tether-06-station2.dmm
@@ -402,7 +402,6 @@
 "aQ" = (
 /obj/machinery/door/firedoor/glass,
 /obj/machinery/door/airlock{
-	id_tag = "bathroomlock25";
 	name = "Brig Restroom"
 	},
 /turf/simulated/floor/tiled/freezer,
@@ -635,13 +634,6 @@
 /obj/machinery/light/small{
 	dir = 4
 	},
-/obj/machinery/button/remote/airlock{
-	id = "bathroomlock25";
-	name = "Bathroom Lock";
-	pixel_x = -20;
-	pixel_y = 10;
-	specialfunctions = 4
-	},
 /turf/simulated/floor/tiled/freezer,
 /area/security/brig/bathroom)
 "bi" = (
@@ -9606,7 +9598,7 @@
 	dir = 1
 	},
 /obj/machinery/button/remote/airlock{
-	id = "bathroomlock26";
+	id = "bathroomlock24";
 	name = "Bathroom Lock";
 	pixel_x = -20;
 	pixel_y = -10;
@@ -9616,7 +9608,7 @@
 /area/medical/recoveryrestroom)
 "oF" = (
 /obj/machinery/door/airlock/medical{
-	id_tag = "bathroomlock26";
+	id_tag = "bathroomlock24";
 	name = "Rest Room";
 	req_one_access = list()
 	},
diff --git a/maps/tether/tether-07-station3.dmm b/maps/tether/tether-07-station3.dmm
index c6cc55dbd8f..3617d739dae 100644
--- a/maps/tether/tether-07-station3.dmm
+++ b/maps/tether/tether-07-station3.dmm
@@ -1566,12 +1566,19 @@
 /turf/simulated/floor/tiled/monotile,
 /area/tether/exploration)
 "add" = (
-/obj/machinery/atmospherics/unary/engine{
+/obj/structure/toilet,
+/obj/machinery/light/small{
 	dir = 1
 	},
-/turf/space,
-/turf/simulated/shuttle/plating/airless/carry,
-/area/shuttle/excursion/general)
+/obj/machinery/button/remote/airlock{
+	id = "bathroomlock25";
+	name = "Security Toilet Lock";
+	pixel_x = -20;
+	pixel_y = -10;
+	specialfunctions = 4
+	},
+/turf/simulated/floor/tiled/white,
+/area/security/security_bathroom)
 "ade" = (
 /obj/machinery/door/airlock/glass_security{
 	name = "Break Room";
@@ -3488,48 +3495,26 @@
 /turf/simulated/floor/tiled/techmaint,
 /area/shuttle/excursion/general)
 "agq" = (
-/obj/structure/shuttle/engine/propulsion{
-	dir = 8;
-	icon_state = "propulsion_l"
-	},
-/turf/simulated/floor/tiled/asteroid_steel/airless,
-/turf/simulated/shuttle/plating/airless/carry,
-/area/shuttle/mining_outpost/shuttle)
-"agr" = (
-/obj/structure/toilet,
-/obj/machinery/light/small{
-	dir = 1
-	},
-/obj/machinery/button/remote/airlock{
-	id = "bathroomlock27";
-	name = "Security Toilet Lock";
-	pixel_x = -20;
-	pixel_y = -10;
-	specialfunctions = 4
-	},
-/turf/simulated/floor/tiled/white,
-/area/security/security_bathroom)
-"ags" = (
 /obj/machinery/door/airlock/security{
-	id_tag = "bathroomlock27";
+	id_tag = "bathroomlock25";
 	name = "Security Restroom";
 	req_one_access = list(1,38)
 	},
 /turf/simulated/floor/tiled/white,
 /area/security/security_bathroom)
-"agt" = (
-/obj/structure/shuttle/engine/propulsion{
-	dir = 8
+"agr" = (
+/obj/machinery/atmospherics/unary/engine{
+	dir = 1
 	},
-/turf/simulated/floor/tiled/asteroid_steel/airless,
+/turf/space,
 /turf/simulated/shuttle/plating/airless/carry,
-/area/shuttle/mining_outpost/shuttle)
-"agu" = (
+/area/shuttle/excursion/general)
+"ags" = (
 /obj/machinery/light/small{
 	dir = 8
 	},
 /obj/machinery/button/remote/airlock{
-	id = "bathroomlock28";
+	id = "bathroomlock26";
 	name = "Medical Toilet Lock";
 	pixel_x = -20;
 	pixel_y = -10;
@@ -3537,13 +3522,28 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/crew_quarters/medical_restroom)
-"agv" = (
+"agt" = (
 /obj/machinery/door/airlock/medical{
-	id_tag = "bathroomlock28";
+	id_tag = "bathroomlock26";
 	name = "Rest Room"
 	},
 /turf/simulated/floor/tiled/white,
 /area/crew_quarters/medical_restroom)
+"agu" = (
+/obj/structure/shuttle/engine/propulsion{
+	dir = 8;
+	icon_state = "propulsion_l"
+	},
+/turf/simulated/floor/tiled/asteroid_steel/airless,
+/turf/simulated/shuttle/plating/airless/carry,
+/area/shuttle/mining_outpost/shuttle)
+"agv" = (
+/obj/structure/shuttle/engine/propulsion{
+	dir = 8
+	},
+/turf/simulated/floor/tiled/asteroid_steel/airless,
+/turf/simulated/shuttle/plating/airless/carry,
+/area/shuttle/mining_outpost/shuttle)
 "agw" = (
 /obj/structure/shuttle/engine/propulsion{
 	dir = 8;
@@ -31382,8 +31382,8 @@ aab
 aab
 aKE
 aQf
-agu
-agv
+ags
+agt
 aZu
 aTf
 aKE
@@ -34597,8 +34597,8 @@ abz
 abw
 aaB
 adS
-agr
-ags
+add
+agq
 aST
 aew
 aUT
@@ -36165,7 +36165,7 @@ aUJ
 aXb
 afT
 aez
-add
+agr
 ams
 aXq
 abe
@@ -36307,7 +36307,7 @@ wRt
 eug
 afT
 aeG
-add
+agr
 ams
 aXq
 abe
@@ -37443,7 +37443,7 @@ ikk
 efQ
 wPF
 aeG
-add
+agr
 ams
 aSx
 krj
@@ -37585,7 +37585,7 @@ iEV
 tEV
 xiw
 aeH
-add
+agr
 ams
 eAm
 abe
@@ -39622,10 +39622,10 @@ avt
 avt
 adD
 aZS
-agq
-agt
-agt
-agt
+agu
+agv
+agv
+agv
 agw
 baB
 adD