From e2141228ae61472ba9a59a7d1dd99b0d8d314a46 Mon Sep 17 00:00:00 2001
From: Vasily2013 <43328793+Vasily2013@users.noreply.github.com>
Date: Mon, 30 Nov 2020 17:42:42 -0500
Subject: [PATCH] Fixing active turfs on CC z level (#1108)

* Should yeet some active turfs

* Defo cleared some active turfs

* Map merger

* But really now, map merger.
---
 _maps/map_files/generic/CentCom.dmm | 97 +++++++++++++++++------------
 1 file changed, 58 insertions(+), 39 deletions(-)

diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm
index b36d7e5be85..356f8a5d47a 100644
--- a/_maps/map_files/generic/CentCom.dmm
+++ b/_maps/map_files/generic/CentCom.dmm
@@ -2516,7 +2516,7 @@
 /area/ctf)
 "hE" = (
 /obj/item/twohanded/ctf/blue,
-/turf/open/floor/circuit/green/anim,
+/turf/open/floor/circuit/green,
 /area/ctf)
 "hF" = (
 /obj/item/twohanded/ctf/red,
@@ -4145,6 +4145,11 @@
 	},
 /turf/open/floor/plating/abductor,
 /area/abductor_ship)
+"lG" = (
+/obj/structure/table/abductor,
+/obj/machinery/recharger,
+/turf/open/floor/plating/abductor,
+/area/abductor_ship)
 "lH" = (
 /turf/closed/indestructible/abductor{
 	icon_state = "alien13"
@@ -8614,6 +8619,9 @@
 	},
 /turf/open/floor/engine/cult,
 /area/wizard_station)
+"ua" = (
+/turf/open/floor/circuit/green,
+/area/ctf)
 "ud" = (
 /obj/machinery/door/poddoor/shutters{
 	id = "nukeop_ready";
@@ -14617,7 +14625,7 @@
 /area/tdome/tdomeobserve)
 "Hz" = (
 /obj/structure/barricade/security/ctf,
-/turf/open/floor/circuit/telecomms,
+/turf/open/floor/circuit,
 /area/ctf)
 "HA" = (
 /obj/structure/sink{
@@ -15323,6 +15331,12 @@
 	},
 /turf/open/floor/plasteel,
 /area/tdome/arena)
+"IO" = (
+/obj/machinery/power/emitter/ctf{
+	dir = 8
+	},
+/turf/open/floor/circuit,
+/area/ctf)
 "IP" = (
 /obj/structure/rack,
 /obj/item/clothing/under/color/green,
@@ -16741,11 +16755,6 @@
 "Mm" = (
 /turf/open/floor/grass,
 /area/centcom/holding)
-"Mp" = (
-/obj/structure/closet/abductor,
-/obj/item/storage/box/alienhandcuffs,
-/turf/open/floor/plating/abductor,
-/area/abductor_ship)
 "Ms" = (
 /obj/item/twohanded/required/kirbyplants{
 	icon_state = "plant-10"
@@ -17302,6 +17311,9 @@
 	},
 /turf/open/floor/wood,
 /area/centcom/holding)
+"PR" = (
+/turf/open/floor/circuit,
+/area/ctf)
 "PS" = (
 /obj/effect/turf_decal/tile/red{
 	dir = 8
@@ -17394,6 +17406,7 @@
 "Qj" = (
 /obj/structure/table/wood,
 /obj/item/reagent_containers/food/drinks/bottle/sake,
+/obj/item/reagent_containers/food/drinks/bottle/sake,
 /turf/open/floor/wood,
 /area/centcom/holding)
 "Qk" = (
@@ -18305,11 +18318,6 @@
 	},
 /turf/open/floor/plasteel,
 /area/centcom/supplypod/loading/four)
-"WB" = (
-/obj/structure/table/abductor,
-/obj/machinery/recharger,
-/turf/open/floor/plating/abductor,
-/area/abductor_ship)
 "WJ" = (
 /obj/machinery/door/airlock/centcom{
 	name = "Thunderdome Administration";
@@ -18474,6 +18482,12 @@
 	},
 /turf/open/floor/wood,
 /area/centcom/holding)
+"XS" = (
+/obj/machinery/power/emitter/ctf{
+	dir = 4
+	},
+/turf/open/floor/circuit,
+/area/ctf)
 "XT" = (
 /obj/effect/spawner/structure/window/reinforced,
 /turf/open/space/basic,
@@ -18561,6 +18575,11 @@
 	},
 /turf/open/floor/plasteel/dark,
 /area/centcom/supplypod)
+"YC" = (
+/obj/structure/closet/abductor,
+/obj/item/storage/box/alienhandcuffs,
+/turf/open/floor/plating/abductor,
+/area/abductor_ship)
 "YE" = (
 /obj/effect/turf_decal/tile/red,
 /obj/effect/turf_decal/tile/red{
@@ -20772,8 +20791,8 @@ aa
 ks
 kP
 lj
-WB
-Mp
+lG
+YC
 mw
 nf
 aa
@@ -20799,8 +20818,8 @@ aa
 ks
 kP
 lj
-WB
-Mp
+lG
+YC
 mw
 nf
 aa
@@ -20829,8 +20848,8 @@ aa
 ks
 kP
 lj
-WB
-Mp
+lG
+YC
 mw
 nf
 aa
@@ -20856,8 +20875,8 @@ aa
 ks
 kP
 lj
-WB
-Mp
+lG
+YC
 mw
 nf
 aa
@@ -64677,7 +64696,7 @@ Xu
 Xu
 fZ
 fZ
-Og
+XS
 fZ
 aa
 aa
@@ -65447,9 +65466,9 @@ YR
 Xu
 Xu
 fZ
-Og
+XS
 hC
-Og
+XS
 fZ
 aa
 aa
@@ -68004,7 +68023,7 @@ Xu
 Xu
 Xu
 Xu
-Wi
+PR
 Xu
 Xu
 Xu
@@ -68016,7 +68035,7 @@ gM
 Xu
 Xu
 Xu
-Wi
+PR
 YF
 gh
 gh
@@ -68261,19 +68280,19 @@ Xu
 Xu
 Xu
 Xu
-Wi
+PR
 Xu
 Xu
 Xu
 gw
 Hz
-hC
+ua
 Hz
 gb
 Xu
 Xu
 Xu
-Wi
+PR
 gh
 YF
 gh
@@ -68518,19 +68537,19 @@ Xu
 Xu
 Xu
 Xu
-Wi
+PR
 Xu
 Xu
 Xu
 gw
-hC
+ua
 hE
-hC
+ua
 gb
 Xu
 Xu
 Xu
-Wi
+PR
 gh
 gh
 YF
@@ -68781,7 +68800,7 @@ Xu
 Xu
 gw
 Hz
-hC
+ua
 Hz
 gb
 Xu
@@ -83180,9 +83199,9 @@ gA
 gR
 gR
 fZ
-Qd
-hC
-Qd
+IO
+ua
+IO
 fZ
 aa
 aa
@@ -83438,7 +83457,7 @@ gR
 gR
 fZ
 fZ
-hC
+ua
 fZ
 fZ
 aa
@@ -83695,7 +83714,7 @@ gR
 gR
 fZ
 fZ
-hC
+ua
 fZ
 aa
 aa
@@ -83952,7 +83971,7 @@ gR
 gR
 fZ
 fZ
-Qd
+IO
 fZ
 aa
 aa