Fix conflict with merge upstream

_maps/map_files220/generic/Admin_Zone.dmm

@@ -4139,10 +4139,9 @@
 	},
 /area/shuttle/vox)
 "ou" = (
-/obj/machinery/computer/rdservercontrol{
-	badmin = 1;
-	name = "Master R&D Server Controller";
-	dir = 1
+/obj/machinery/computer/account_database{
+	name = "Admin Accounts Database";
+	dir = 8
 	},
 /turf/simulated/floor/wood/oak,
 /area/admin)
@@ -6635,12 +6634,6 @@
 /obj/structure/flora/tree/jungle/small,
 /turf/simulated/floor/grass,
 /area/ghost_bar/outdoor)
-"wZ" = (
-/obj/machinery/computer/card/centcom{
-	dir = 1
-	},
-/turf/simulated/floor/wood/oak,
-/area/admin)
 "xa" = (
 /obj/item/kirbyplants,
 /turf/simulated/floor/plasteel{
@@ -7844,9 +7837,8 @@
 /turf/simulated/floor/wood/oak,
 /area/admin)
 "AW" = (
-/obj/machinery/computer/account_database{
-	name = "Admin Accounts Database";
-	dir = 1
+/obj/machinery/computer/card/centcom{
+	dir = 8
 	},
 /turf/simulated/floor/wood/oak,
 /area/admin)
@@ -12946,10 +12938,6 @@
 	nitrogen = 103.984
 	},
 /area/vox_base)
-"Sy" = (
-/obj/machinery/r_n_d/server/centcom,
-/turf/simulated/floor/wood/oak,
-/area/admin)
 "Sz" = (
 /obj/machinery/washing_machine,
 /obj/effect/turf_decal/tile/blue/opposingcorners,
@@ -23953,7 +23941,7 @@ UO
 UO
 UO
 UO
-ou
+cQ
 Up
 yX
 UO
@@ -24210,7 +24198,7 @@ UO
 UO
 UO
 UO
-wZ
+Ky
 Up
 MF
 UO
@@ -24467,7 +24455,7 @@ UO
 UO
 UO
 UO
-AW
+UO
 Up
 Fi
 UO
@@ -24720,11 +24708,11 @@ dn
 yM
 Up
 Up
-Sy
+UO
 Mj
 Xa
-cQ
-Ky
+AW
+ou
 Up
 SK
 Py