TGS Test Merge (#22090)

Author: Yogbot-13

_maps/map_files/AsteroidStation/AsteroidStation.dmm

@@ -2513,7 +2513,7 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plasteel,
-/area/security/brig)
+/area/security/brig_cell)
 "aMq" = (
 /obj/machinery/door/poddoor/shutters{
 	id = "Skynet_launch";
@@ -11987,7 +11987,7 @@
 	dir = 5
 	},
 /turf/open/floor/plasteel,
-/area/security/brig)
+/area/security/brig_cell)
 "dzV" = (
 /obj/structure/table,
 /obj/item/storage/firstaid/regular{
@@ -12156,7 +12156,7 @@
 	dir = 4
 	},
 /turf/open/floor/plasteel,
-/area/security/brig)
+/area/security/brig_cell)
 "dCG" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 6
@@ -13443,9 +13443,7 @@
 /obj/structure/cable/yellow{
 	icon_state = "0-2"
 	},
-/obj/machinery/power/apc/auto_name/west{
-	pixel_x = -25
-	},
+/obj/machinery/power/apc/auto_name/west,
 /turf/open/floor/plasteel,
 /area/engine/engine_smes)
 "dWi" = (
@@ -13834,7 +13832,7 @@
 	dir = 4
 	},
 /turf/open/floor/plasteel,
-/area/security/brig)
+/area/security/brig_cell)
 "eco" = (
 /turf/open/floor/circuit/green,
 /area/science/robotics/mechbay)
@@ -20228,7 +20226,7 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/item/bedsheet/prisoner,
 /turf/open/floor/plasteel,
-/area/security/brig)
+/area/security/brig_cell)
 "fYg" = (
 /obj/machinery/requests_console{
 	announcementConsole = 1;
@@ -21105,7 +21103,7 @@
 	dir = 8
 	},
 /turf/open/floor/plasteel,
-/area/security/brig)
+/area/security/brig_cell)
 "gjH" = (
 /obj/structure/table,
 /obj/item/toner,
@@ -21446,7 +21444,7 @@
 	dir = 4
 	},
 /turf/open/floor/plasteel,
-/area/security/brig)
+/area/security/brig_cell)
 "gov" = (
 /obj/structure/sign/warning/vacuum/external{
 	pixel_y = -32
@@ -23473,8 +23471,7 @@
 	},
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
 /obj/machinery/computer/atmos_sim{
-	dir = 4;
-	mode = 1
+	dir = 4
 	},
 /turf/open/floor/plasteel,
 /area/science/mixing)
@@ -32397,6 +32394,7 @@
 /obj/effect/turf_decal/trimline/secred/filled/line/lower{
 	dir = 8
 	},
+/obj/machinery/computer/department_reward/security,
 /turf/open/floor/plasteel,
 /area/security/main)
 "jvl" = (
@@ -33804,7 +33802,7 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plasteel,
-/area/security/brig)
+/area/security/brig_cell)
 "jPB" = (
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
@@ -34210,7 +34208,7 @@
 	dir = 5
 	},
 /turf/open/floor/plasteel,
-/area/security/brig)
+/area/security/brig_cell)
 "jWr" = (
 /obj/machinery/door/airlock/maintenance_hatch{
 	name = "Cargo Bay Bridge Access"
@@ -51599,8 +51597,7 @@
 "oPd" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/computer/atmos_sim{
-	dir = 4;
-	mode = 1
+	dir = 4
 	},
 /turf/open/floor/plasteel,
 /area/maintenance/disposal/incinerator)
@@ -58073,6 +58070,9 @@
 	},
 /turf/open/floor/carpet/royalblue,
 /area/crew_quarters/heads/cmo)
+"qHR" = (
+/turf/closed/wall,
+/area/security/brig_cell)
 "qHT" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -61366,7 +61366,7 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plasteel,
-/area/security/brig)
+/area/security/brig_cell)
 "rJq" = (
 /obj/structure/window/reinforced,
 /obj/structure/table,
@@ -62666,9 +62666,7 @@
 /turf/open/floor/plasteel/white,
 /area/medical/sleeper)
 "san" = (
-/obj/machinery/airalarm/directional/west{
-	pixel_x = -24
-	},
+/obj/machinery/airalarm/directional/west,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
@@ -75761,7 +75759,7 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plasteel,
-/area/security/brig)
+/area/security/brig_cell)
 "vGd" = (
 /obj/structure/cable/yellow{
 	icon_state = "1-2"
@@ -82094,7 +82092,7 @@
 	dir = 9
 	},
 /turf/open/floor/plasteel,
-/area/security/brig)
+/area/security/brig_cell)
 "xti" = (
 /obj/machinery/atmospherics/pipe/manifold/yellow/visible{
 	dir = 4
@@ -242195,8 +242193,8 @@ suD
 aoc
 mdB
 ulr
-ulr
-ulr
+qHR
+qHR
 qin
 aqS
 cMp
@@ -243223,8 +243221,8 @@ suD
 aoc
 cyq
 ulr
-ulr
-ulr
+qHR
+qHR
 qin
 gQX
 qcv