diff --git a/_maps/map_files/AsteroidStation/AsteroidStation.dmm b/_maps/map_files/AsteroidStation/AsteroidStation.dmm
index 7ac0ab0170ba..26b70b9a5d60 100644
--- a/_maps/map_files/AsteroidStation/AsteroidStation.dmm
+++ b/_maps/map_files/AsteroidStation/AsteroidStation.dmm
@@ -69,9 +69,7 @@
 /turf/closed/wall,
 /area/quartermaster/qm)
 "aaD" = (
-/obj/machinery/airalarm/directional/south{
-	pixel_y = -24
-	},
+/obj/machinery/airalarm/directional/south,
 /obj/structure/table,
 /obj/item/reagent_containers/glass/bottle/ethanol{
 	pixel_x = -5;
@@ -183,9 +181,7 @@
 /turf/open/floor/carpet,
 /area/crew_quarters/cryopods)
 "abM" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 2
-	},
+/obj/effect/turf_decal/stripes/line,
 /turf/open/floor/plasteel,
 /area/hallway/secondary/exit)
 "abP" = (
@@ -2603,7 +2599,6 @@
 "axy" = (
 /obj/structure/chair/comfy{
 	dir = 4;
-	icon_state = "comfychair";
 	tag = ""
 	},
 /obj/machinery/light/broken{
@@ -5904,9 +5899,7 @@
 /turf/open/floor/plasteel,
 /area/engine/foyer)
 "bcH" = (
-/obj/effect/turf_decal/tile/red{
-	dir = 2
-	},
+/obj/effect/turf_decal/tile/red,
 /obj/effect/turf_decal/tile/red{
 	dir = 1
 	},
@@ -6865,7 +6858,7 @@
 	dir = 8
 	},
 /turf/open/floor/plasteel,
-/area/security/brig)
+/area/security/brig_cell)
 "btv" = (
 /obj/effect/turf_decal/bot,
 /obj/effect/decal/cleanable/dirt/dust,
@@ -8670,8 +8663,7 @@
 /area/medical/sleeper)
 "cah" = (
 /obj/machinery/camera{
-	c_tag = "Theatre Stage";
-	dir = 2
+	c_tag = "Theatre Stage"
 	},
 /obj/item/radio/intercom{
 	dir = 8;
@@ -9328,6 +9320,9 @@
 /obj/structure/sign/poster/official/space_cops{
 	pixel_y = -32
 	},
+/obj/machinery/computer/department_reward/security{
+	dir = 1
+	},
 /turf/open/floor/plasteel,
 /area/security/main)
 "cij" = (
@@ -11557,7 +11552,6 @@
 /obj/structure/cable,
 /obj/machinery/power/apc{
 	areastring = "/area/medical/storage";
-	dir = 2;
 	name = "Medbay Storage APC";
 	pixel_y = -23
 	},
@@ -12018,8 +12012,7 @@
 /obj/machinery/camera{
 	c_tag = "Medbay Treatment Center";
 	dir = 8;
-	network = list("ss13","medbay");
-	pixel_x = 0
+	network = list("ss13","medbay")
 	},
 /turf/open/floor/plasteel/dark,
 /area/medical/sleeper)
@@ -12436,9 +12429,7 @@
 /turf/open/floor/plasteel/dark,
 /area/crew_quarters/heads/hor)
 "dfv" = (
-/obj/machinery/atmospherics/components/unary/portables_connector/visible{
-	dir = 2
-	},
+/obj/machinery/atmospherics/components/unary/portables_connector/visible,
 /turf/open/floor/plasteel/dark,
 /area/science/mixing)
 "dfz" = (
@@ -15356,7 +15347,7 @@
 	dir = 4
 	},
 /turf/open/floor/plasteel,
-/area/security/brig)
+/area/security/brig_cell)
 "ebX" = (
 /obj/structure/extinguisher_cabinet{
 	pixel_y = 28
@@ -15976,7 +15967,6 @@
 "ekL" = (
 /obj/machinery/requests_console{
 	department = "Mining";
-	departmentType = 0;
 	name = "Mining RC";
 	pixel_x = 32;
 	pixel_y = 29
@@ -16814,7 +16804,6 @@
 "evS" = (
 /obj/machinery/light,
 /obj/structure/tank_dispenser/oxygen{
-	layer = 2.9;
 	pixel_x = -1;
 	pixel_y = 2
 	},
@@ -16982,7 +16971,7 @@
 	icon_state = "1-2"
 	},
 /turf/open/floor/plasteel,
-/area/security/brig)
+/area/security/brig_cell)
 "ezP" = (
 /obj/structure/chair/stool{
 	pixel_y = 8
@@ -17498,7 +17487,6 @@
 /obj/structure/cable,
 /obj/machinery/power/apc{
 	areastring = "/area/medical/storage/backroom";
-	dir = 2;
 	name = "Medical Backrooms APC";
 	pixel_y = -23
 	},
@@ -17877,9 +17865,7 @@
 	icon_state = "1-2";
 	tag = ""
 	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 2
-	},
+/obj/effect/turf_decal/stripes/line,
 /turf/open/floor/plasteel/dark,
 /area/medical/sleeper)
 "eNk" = (
@@ -18427,9 +18413,7 @@
 /turf/open/floor/plasteel,
 /area/hydroponics)
 "eUU" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
-	dir = 2
-	},
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
 /turf/open/floor/plasteel,
 /area/engine/atmos/distro)
 "eVg" = (
@@ -18650,9 +18634,7 @@
 	},
 /area/crew_quarters/bar)
 "eZj" = (
-/obj/machinery/atmospherics/components/unary/portables_connector/visible{
-	dir = 2
-	},
+/obj/machinery/atmospherics/components/unary/portables_connector/visible,
 /obj/effect/turf_decal/trimline/purple/filled/line/lower{
 	dir = 8
 	},
@@ -21712,9 +21694,6 @@
 /area/security/prison)
 "fYo" = (
 /obj/machinery/door/window/southleft{
-	base_state = "left";
-	dir = 2;
-	icon_state = "left";
 	name = "Kitchen Delivery";
 	req_access_txt = "28"
 	},
@@ -22591,9 +22570,6 @@
 /area/engine/atmos/distro)
 "gng" = (
 /obj/machinery/door/window/southleft{
-	base_state = "left";
-	dir = 2;
-	icon_state = "left";
 	name = "Bar Delivery";
 	req_access_txt = "25"
 	},
@@ -24233,9 +24209,7 @@
 /obj/structure/disposalpipe/segment{
 	dir = 10
 	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 2
-	},
+/obj/effect/turf_decal/stripes/line,
 /turf/open/floor/plating,
 /area/maintenance/starboard/fore)
 "gND" = (
@@ -27069,9 +27043,7 @@
 /area/science/xenobiology)
 "hGo" = (
 /obj/structure/table/wood,
-/obj/effect/turf_decal/tile/red{
-	dir = 2
-	},
+/obj/effect/turf_decal/tile/red,
 /obj/effect/turf_decal/tile/red{
 	dir = 1
 	},
@@ -27342,9 +27314,7 @@
 /turf/open/floor/plasteel,
 /area/engine/atmos/hfr)
 "hKm" = (
-/obj/structure/table/glass{
-	name = "glass table"
-	},
+/obj/structure/table/glass,
 /obj/machinery/cell_charger,
 /obj/effect/turf_decal/trimline/blue/filled/line/lower{
 	dir = 8
@@ -27628,9 +27598,7 @@
 /turf/open/floor/plasteel/white,
 /area/medical/genetics/cloning)
 "hOq" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 2
-	},
+/obj/effect/turf_decal/stripes/line,
 /turf/open/floor/plasteel,
 /area/crew_quarters/fitness)
 "hOL" = (
@@ -28653,9 +28621,7 @@
 /area/bridge/meeting_room)
 "ihh" = (
 /obj/structure/table/glass,
-/obj/machinery/airalarm/directional/south{
-	pixel_y = -24
-	},
+/obj/machinery/airalarm/directional/south,
 /obj/item/storage/firstaid/fire{
 	pixel_x = 3;
 	pixel_y = 3
@@ -28778,9 +28744,7 @@
 /turf/open/floor/plasteel/dark,
 /area/bridge)
 "ija" = (
-/obj/effect/turf_decal/tile/red{
-	dir = 2
-	},
+/obj/effect/turf_decal/tile/red,
 /obj/effect/turf_decal/tile/red{
 	dir = 1
 	},
@@ -29690,8 +29654,7 @@
 	dir = 8
 	},
 /obj/machinery/computer/atmos_sim{
-	dir = 8;
-	mode = 1
+	dir = 8
 	},
 /obj/effect/turf_decal/trimline/purple/filled/line/lower{
 	dir = 6
@@ -30966,17 +30929,9 @@
 /obj/effect/turf_decal/trimline/brown/filled/corner/lower,
 /turf/open/floor/plasteel/dark,
 /area/bridge)
-"iTl" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 2
-	},
-/turf/open/floor/plasteel,
-/area/crew_quarters/locker)
 "iTs" = (
 /obj/structure/table/wood,
-/obj/effect/turf_decal/tile/red{
-	dir = 2
-	},
+/obj/effect/turf_decal/tile/red,
 /obj/effect/turf_decal/tile/red{
 	dir = 1
 	},
@@ -31756,7 +31711,7 @@
 	dir = 5
 	},
 /turf/open/floor/plasteel,
-/area/security/brig)
+/area/security/brig_cell)
 "jdn" = (
 /obj/machinery/firealarm{
 	pixel_y = 26
@@ -32190,8 +32145,7 @@
 	dir = 8
 	},
 /obj/machinery/door/poddoor/preopen{
-	id = "executionfireblast";
-	name = "blast door"
+	id = "executionfireblast"
 	},
 /obj/machinery/door/airlock/security/glass{
 	name = "Transfer Chamber";
@@ -32348,7 +32302,6 @@
 /obj/machinery/requests_console{
 	department = "AI";
 	departmentType = 5;
-	pixel_x = 0;
 	pixel_y = -32
 	},
 /turf/open/floor/circuit/telecomms/server,
@@ -36340,9 +36293,7 @@
 /turf/open/floor/plasteel/dark,
 /area/ai_monitored/turret_protected/ai_upload_foyer)
 "kxB" = (
-/obj/machinery/atmospherics/components/unary/portables_connector/visible{
-	dir = 2
-	},
+/obj/machinery/atmospherics/components/unary/portables_connector/visible,
 /turf/open/floor/plasteel/white,
 /area/science/mixing)
 "kxL" = (
@@ -37177,7 +37128,7 @@
 	pixel_y = -7
 	},
 /turf/open/floor/plasteel,
-/area/security/brig)
+/area/security/brig_cell)
 "kOw" = (
 /obj/machinery/atmospherics/pipe/simple/general/visible{
 	dir = 4
@@ -37673,7 +37624,6 @@
 /area/medical/medbay/aft)
 "kXj" = (
 /obj/item/reagent_containers/food/snacks/fish/goldfish{
-	bitecount = 0;
 	length = 1;
 	weight = 2
 	},
@@ -39340,12 +39290,6 @@
 /obj/effect/turf_decal/trimline/green/warning/lower,
 /turf/open/floor/plasteel/white,
 /area/medical/medbay/aft)
-"lBg" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 2
-	},
-/turf/open/floor/plasteel,
-/area/engine/atmos/hfr)
 "lBP" = (
 /obj/machinery/conveyor{
 	id = "QMLoad"
@@ -40459,8 +40403,7 @@
 	icon_state = "0-2"
 	},
 /obj/machinery/door/poddoor/preopen{
-	id = "executionfireblast";
-	name = "blast door"
+	id = "executionfireblast"
 	},
 /obj/effect/spawner/structure/window,
 /turf/open/floor/plating,
@@ -40767,9 +40710,7 @@
 /area/maintenance/starboard/fore)
 "lYP" = (
 /obj/structure/table/wood,
-/obj/effect/turf_decal/tile/red{
-	dir = 2
-	},
+/obj/effect/turf_decal/tile/red,
 /obj/effect/turf_decal/tile/red{
 	dir = 1
 	},
@@ -41392,9 +41333,7 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 4
 	},
-/obj/machinery/atmospherics/components/unary/portables_connector/visible{
-	dir = 2
-	},
+/obj/machinery/atmospherics/components/unary/portables_connector/visible,
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
@@ -44065,7 +44004,7 @@
 	icon_state = "1-2"
 	},
 /turf/open/floor/plasteel,
-/area/security/brig)
+/area/security/brig_cell)
 "mWR" = (
 /obj/structure/chair/office{
 	dir = 4
@@ -44577,12 +44516,6 @@
 /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower,
 /turf/open/floor/plasteel,
 /area/hallway/primary/central)
-"nda" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 2
-	},
-/turf/open/floor/plasteel,
-/area/hallway/primary/central)
 "ndb" = (
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
@@ -44634,9 +44567,7 @@
 /turf/open/floor/plating/asteroid,
 /area/space/nearstation)
 "ndK" = (
-/obj/machinery/airalarm/directional/west{
-	pixel_x = -24
-	},
+/obj/machinery/airalarm/directional/west,
 /obj/effect/turf_decal/trimline/engiyellow/filled/line/lower{
 	dir = 8
 	},
@@ -47456,8 +47387,7 @@
 	dir = 4
 	},
 /obj/machinery/door/poddoor/preopen{
-	id = "cell3 blast";
-	name = "blast door"
+	id = "cell3 blast"
 	},
 /turf/open/floor/plasteel/dark,
 /area/security/prison)
@@ -48185,9 +48115,7 @@
 /turf/open/floor/plasteel,
 /area/hallway/primary/central)
 "okt" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 2
-	},
+/obj/effect/turf_decal/stripes/line,
 /turf/open/floor/plasteel/white,
 /area/medical/storage/backroom)
 "okv" = (
@@ -49083,8 +49011,7 @@
 "oyn" = (
 /obj/machinery/door/airlock{
 	name = "Hydroponics Maintenance";
-	req_access_txt = "35";
-	req_one_access_txt = "0"
+	req_access_txt = "35"
 	},
 /obj/machinery/door/firedoor/border_only{
 	dir = 1
@@ -49509,7 +49436,7 @@
 	pixel_y = -7
 	},
 /turf/open/floor/plasteel,
-/area/security/brig)
+/area/security/brig_cell)
 "oEN" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
@@ -50007,7 +49934,6 @@
 "oLK" = (
 /obj/structure/chair/comfy{
 	dir = 4;
-	icon_state = "comfychair";
 	tag = ""
 	},
 /obj/machinery/light/broken,
@@ -52211,8 +52137,7 @@
 /obj/effect/turf_decal/trimline/engiyellow/filled/line/lower,
 /obj/effect/turf_decal/trimline/atmos/warning/lower/nobottom,
 /obj/machinery/computer/atmos_sim{
-	dir = 1;
-	mode = 1
+	dir = 1
 	},
 /turf/open/floor/plasteel,
 /area/maintenance/disposal/incinerator)
@@ -52270,9 +52195,7 @@
 /obj/effect/turf_decal/trimline/blue/filled/line/lower{
 	dir = 8
 	},
-/obj/machinery/airalarm/directional/west{
-	pixel_x = -24
-	},
+/obj/machinery/airalarm/directional/west,
 /turf/open/floor/plasteel/white,
 /area/medical/sleeper)
 "puV" = (
@@ -54120,9 +54043,7 @@
 /area/security/brig)
 "pXG" = (
 /obj/structure/table/wood,
-/obj/effect/turf_decal/tile/red{
-	dir = 2
-	},
+/obj/effect/turf_decal/tile/red,
 /obj/effect/turf_decal/tile/red{
 	dir = 1
 	},
@@ -58733,8 +58654,7 @@
 	pixel_y = 1
 	},
 /obj/machinery/door/poddoor/preopen{
-	id = "executionfireblast";
-	name = "blast door"
+	id = "executionfireblast"
 	},
 /turf/open/floor/plating,
 /area/security/execution/transfer)
@@ -60489,6 +60409,14 @@
 /obj/effect/turf_decal/trimline/blue/filled/line/lower,
 /turf/open/floor/plasteel,
 /area/hallway/primary/starboard)
+"rTV" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 9
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/turf/open/floor/plasteel,
+/area/security/brig_cell)
 "rTY" = (
 /obj/machinery/power/apc{
 	areastring = "/area/engine/foyer";
@@ -60704,7 +60632,7 @@
 	dir = 4
 	},
 /turf/open/floor/plasteel,
-/area/security/brig)
+/area/security/brig_cell)
 "rWP" = (
 /obj/effect/turf_decal/tile/red,
 /obj/effect/turf_decal/tile/red{
@@ -61925,9 +61853,7 @@
 /turf/open/floor/plasteel/white,
 /area/medical/medbay/aft)
 "sps" = (
-/obj/machinery/airalarm/directional/west{
-	pixel_x = -24
-	},
+/obj/machinery/airalarm/directional/west,
 /obj/effect/turf_decal/trimline/blue/filled/line/lower{
 	dir = 8
 	},
@@ -62101,9 +62027,7 @@
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 2
-	},
+/obj/effect/turf_decal/stripes/line,
 /turf/open/floor/plasteel,
 /area/hallway/primary/starboard)
 "srW" = (
@@ -62115,7 +62039,7 @@
 	dir = 4
 	},
 /turf/open/floor/plasteel,
-/area/security/brig)
+/area/security/brig_cell)
 "srY" = (
 /obj/machinery/light_switch{
 	pixel_x = -25
@@ -62187,9 +62111,7 @@
 /area/hallway/secondary/entry)
 "stF" = (
 /obj/structure/table/wood,
-/obj/effect/turf_decal/tile/red{
-	dir = 2
-	},
+/obj/effect/turf_decal/tile/red,
 /obj/effect/turf_decal/tile/red{
 	dir = 1
 	},
@@ -63135,7 +63057,6 @@
 	pixel_y = 3
 	},
 /obj/item/flashlight/lamp/green{
-	light_on = 0;
 	pixel_x = -6;
 	pixel_y = 11
 	},
@@ -67649,8 +67570,7 @@
 "tYo" = (
 /obj/structure/cable,
 /obj/machinery/door/poddoor/preopen{
-	id = "executionfireblast";
-	name = "blast door"
+	id = "executionfireblast"
 	},
 /obj/effect/spawner/structure/window,
 /turf/open/floor/plating,
@@ -68436,8 +68356,7 @@
 	icon_state = "1-2"
 	},
 /obj/machinery/door/poddoor/preopen{
-	id = "executionfireblast";
-	name = "blast door"
+	id = "executionfireblast"
 	},
 /turf/open/floor/plating,
 /area/security/execution/transfer)
@@ -69062,8 +68981,7 @@
 	dir = 4
 	},
 /obj/machinery/door/poddoor/preopen{
-	id = "cell2 blast";
-	name = "blast door"
+	id = "cell2 blast"
 	},
 /turf/open/floor/plasteel/dark,
 /area/security/prison)
@@ -69300,9 +69218,7 @@
 /area/security/execution/transfer)
 "uAH" = (
 /obj/structure/table/wood,
-/obj/effect/turf_decal/tile/red{
-	dir = 2
-	},
+/obj/effect/turf_decal/tile/red,
 /obj/effect/turf_decal/tile/red{
 	dir = 1
 	},
@@ -70740,7 +70656,6 @@
 	},
 /obj/machinery/vending/wallhypo{
 	dir = 1;
-	pixel_x = 0;
 	pixel_y = -28
 	},
 /obj/effect/turf_decal/trimline/blue/filled/line/lower,
@@ -70771,9 +70686,7 @@
 /obj/structure/chair/office/dark{
 	dir = 1
 	},
-/obj/effect/turf_decal/tile/red{
-	dir = 2
-	},
+/obj/effect/turf_decal/tile/red,
 /obj/effect/turf_decal/tile/red{
 	dir = 1
 	},
@@ -71352,9 +71265,7 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 9
 	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 2
-	},
+/obj/effect/turf_decal/stripes/line,
 /turf/open/floor/plating,
 /area/maintenance/port/fore)
 "vlg" = (
@@ -71431,7 +71342,7 @@
 	pixel_y = -7
 	},
 /turf/open/floor/plasteel,
-/area/security/brig)
+/area/security/brig_cell)
 "vmt" = (
 /obj/effect/turf_decal/stripes/corner{
 	dir = 4
@@ -72450,6 +72361,9 @@
 /obj/effect/turf_decal/trimline/atmos/warning/lower/nobottom,
 /turf/open/floor/plasteel,
 /area/engine/atmos/hfr)
+"vEn" = (
+/turf/closed/wall,
+/area/security/brig_cell)
 "vEv" = (
 /obj/structure/rack,
 /obj/effect/spawner/lootdrop/techstorage/medical,
@@ -75545,24 +75459,19 @@
 	icon_state = "0-4"
 	},
 /obj/item/radio/intercom{
-	anyai = 1;
 	freerange = 1;
 	listening = 0;
 	name = "Custom Channel";
 	pixel_y = -27
 	},
 /obj/item/radio/intercom{
-	anyai = 1;
-	broadcasting = 0;
 	freerange = 1;
 	frequency = 1447;
 	name = "Private Channel";
 	pixel_y = 20
 	},
 /obj/item/radio/intercom{
-	broadcasting = 0;
 	freerange = 1;
-	listening = 1;
 	name = "Common Channel";
 	pixel_y = -37
 	},
@@ -76623,8 +76532,7 @@
 	dir = 4
 	},
 /obj/machinery/door/poddoor/preopen{
-	id = "cell1 blast";
-	name = "blast door"
+	id = "cell1 blast"
 	},
 /turf/open/floor/plasteel/dark,
 /area/security/prison)
@@ -77010,7 +76918,6 @@
 	pixel_y = 5
 	},
 /obj/item/pen/red{
-	pixel_x = 0;
 	pixel_y = 5
 	},
 /turf/open/floor/carpet,
@@ -77490,13 +77397,6 @@
 /obj/structure/chair/stool/bar,
 /turf/open/floor/eighties,
 /area/maintenance/starboard/fore)
-"xdI" = (
-/obj/effect/turf_decal/box/corners{
-	dir = 1;
-	icon_state = "box_corners"
-	},
-/turf/open/floor/engine,
-/area/science/xenobiology)
 "xdL" = (
 /obj/structure/closet/firecloset,
 /turf/open/floor/plating,
@@ -77894,9 +77794,7 @@
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/general/visible,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
-	dir = 2
-	},
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
 /turf/open/floor/plasteel,
 /area/engine/atmos/pumproom)
 "xkS" = (
@@ -78378,7 +78276,6 @@
 	dir = 4
 	},
 /obj/item/radio/intercom{
-	anyai = 1;
 	broadcasting = 1;
 	frequency = 1423;
 	listening = 0;
@@ -78492,9 +78389,7 @@
 /obj/structure/disposalpipe/segment{
 	dir = 2
 	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 2
-	},
+/obj/effect/turf_decal/stripes/line,
 /turf/open/floor/plating,
 /area/maintenance/starboard/fore)
 "xvF" = (
@@ -79975,15 +79870,6 @@
 	},
 /turf/open/floor/plating,
 /area/maintenance/central)
-"xSH" = (
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 2
-	},
-/turf/open/floor/plating,
-/area/maintenance/starboard/fore)
 "xTc" = (
 /obj/structure/disposalpipe/segment{
 	dir = 8
@@ -80320,9 +80206,7 @@
 /turf/open/floor/plating,
 /area/maintenance/port)
 "xYM" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 2
-	},
+/obj/effect/turf_decal/stripes/line,
 /turf/open/floor/plating,
 /area/maintenance/central)
 "xYX" = (
@@ -98330,7 +98214,7 @@ aii
 aii
 aii
 aii
-iTl
+awU
 alR
 meo
 aoq
@@ -103760,7 +103644,7 @@ uxp
 fFP
 oIN
 nsk
-nda
+iNl
 oQP
 jsE
 aQo
@@ -110141,7 +110025,7 @@ gjq
 gjq
 gjq
 gjq
-xSH
+kPF
 ycw
 jbn
 aiZ
@@ -110365,7 +110249,7 @@ oJL
 eHc
 qQt
 ydt
-jrb
+rTV
 jdm
 jfT
 vob
@@ -110879,8 +110763,8 @@ dTn
 gbu
 jQA
 aDL
-aDL
-aDL
+vEn
+vEn
 aQv
 pEr
 aZW
@@ -111393,7 +111277,7 @@ cTq
 vQW
 qQt
 ggP
-jrb
+rTV
 jdm
 jzS
 lUQ
@@ -111907,8 +111791,8 @@ cTq
 gbu
 vPY
 aDL
-aDL
-aDL
+vEn
+vEn
 aQv
 bIM
 aZW
@@ -112421,7 +112305,7 @@ cTq
 eHc
 qQt
 pMD
-jrb
+rTV
 jdm
 jfT
 lUQ
@@ -112468,16 +112352,16 @@ okp
 vGq
 nFW
 adX
-xdI
+faj
 aFu
 xxt
-xdI
+faj
 aFu
 obD
-xdI
+faj
 aFu
 obD
-xdI
+faj
 aFu
 tdf
 aBD
@@ -130230,7 +130114,7 @@ qIN
 tEi
 odT
 tEi
-lBg
+eBw
 uzL
 nxO
 hVs
diff --git a/_maps/map_files/DonutStation/DonutStation.dmm b/_maps/map_files/DonutStation/DonutStation.dmm
index 5d41c0ff297b..5ecd581b693d 100644
--- a/_maps/map_files/DonutStation/DonutStation.dmm
+++ b/_maps/map_files/DonutStation/DonutStation.dmm
@@ -4,7 +4,6 @@
 	dir = 4
 	},
 /obj/effect/turf_decal/trimline/secred/warning/lower{
-	alpha = 220;
 	dir = 4
 	},
 /obj/machinery/door/firedoor/border_only{
@@ -209,13 +208,11 @@
 "aen" = (
 /obj/structure/sign/directions/medical{
 	dir = 8;
-	icon_state = "direction_med";
 	pixel_x = -31;
 	pixel_y = 32
 	},
 /obj/structure/sign/directions/science{
 	dir = 8;
-	icon_state = "direction_sci";
 	pixel_x = -31;
 	pixel_y = 24
 	},
@@ -529,8 +526,7 @@
 /area/maintenance/starboard)
 "alK" = (
 /obj/machinery/atmospherics/components/unary/thermomachine/heater{
-	dir = 4;
-	icon_state = "heater"
+	dir = 4
 	},
 /turf/open/floor/plasteel,
 /area/science/mixing)
@@ -1417,6 +1413,9 @@
 /obj/effect/spawner/structure/window/reinforced,
 /turf/open/floor/plating,
 /area/medical/virology)
+"aDe" = (
+/turf/closed/wall,
+/area/security/brig_cell)
 "aDi" = (
 /obj/structure/reagent_dispensers/water_cooler,
 /obj/machinery/firealarm{
@@ -1484,8 +1483,7 @@
 /area/chapel/office)
 "aFm" = (
 /obj/structure/particle_accelerator/power_box{
-	dir = 1;
-	icon_state = "power_box"
+	dir = 1
 	},
 /turf/open/floor/engine,
 /area/engine/engineering)
@@ -1739,9 +1737,7 @@
 	dir = 4
 	},
 /obj/effect/turf_decal/trimline/white/filled/line/lower,
-/obj/effect/turf_decal/trimline/secred/warning/lower{
-	alpha = 220
-	},
+/obj/effect/turf_decal/trimline/secred/warning/lower,
 /turf/open/floor/plasteel,
 /area/hallway/secondary/exit/departure_lounge)
 "aKB" = (
@@ -1770,8 +1766,7 @@
 "aLg" = (
 /obj/machinery/camera{
 	c_tag = "Civilian - Library Lounge";
-	dir = 8;
-	network = list("ss13")
+	dir = 8
 	},
 /turf/open/floor/wood,
 /area/library)
@@ -1982,7 +1977,6 @@
 "aQs" = (
 /obj/machinery/door/airlock/atmos{
 	name = "Atmospherics Foyer";
-	req_access_txt = "0";
 	req_one_access_txt = "24;10"
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
@@ -2126,11 +2120,9 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/camera{
 	c_tag = "Research - Toxins Storage";
-	dir = 2;
 	network = list("ss13","Research")
 	},
 /obj/machinery/airalarm{
-	dir = 2;
 	pixel_y = 24
 	},
 /obj/machinery/electrolyzer,
@@ -2155,8 +2147,7 @@
 /area/hallway/primary/central)
 "aUq" = (
 /obj/machinery/atmospherics/components/unary/thermomachine/freezer/on{
-	dir = 8;
-	icon_state = "freezer_1"
+	dir = 8
 	},
 /turf/open/floor/plasteel/dark,
 /area/science/server)
@@ -2182,8 +2173,7 @@
 /area/escapepodbay)
 "aUK" = (
 /obj/machinery/computer/station_alert{
-	dir = 4;
-	icon_state = "computer"
+	dir = 4
 	},
 /obj/machinery/light_switch{
 	pixel_x = -24
@@ -2200,7 +2190,7 @@
 	icon_state = "4-8"
 	},
 /turf/open/floor/plasteel,
-/area/security/brig)
+/area/security/brig_cell)
 "aVm" = (
 /obj/structure/table,
 /obj/item/book/manual/wiki/security_space_law,
@@ -2483,9 +2473,7 @@
 "bbd" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/door/airlock/maintenance{
-	req_one_access_txt = "0"
-	},
+/obj/machinery/door/airlock/maintenance,
 /obj/machinery/door/firedoor/border_only{
 	dir = 1
 	},
@@ -2573,9 +2561,7 @@
 /area/ai_monitored/secondarydatacore)
 "bcF" = (
 /obj/effect/turf_decal/trimline/engiyellow/filled/corner/lower,
-/obj/effect/turf_decal/trimline/atmos/warning/lower/corner/flip{
-	dir = 2
-	},
+/obj/effect/turf_decal/trimline/atmos/warning/lower/corner/flip,
 /turf/open/floor/plasteel,
 /area/hallway/primary/central)
 "bcM" = (
@@ -2740,7 +2726,6 @@
 /obj/structure/table/glass,
 /obj/machinery/power/apc{
 	areastring = "/area/medical/virology";
-	dir = 2;
 	name = "Virology APC";
 	pixel_y = -23
 	},
@@ -2867,12 +2852,11 @@
 /obj/structure/bed,
 /obj/machinery/camera{
 	c_tag = "Security - Cell 4";
-	dir = 2;
 	network = list("ss13","Security")
 	},
 /obj/item/bedsheet/prisoner,
 /turf/open/floor/plasteel,
-/area/security/brig)
+/area/security/brig_cell)
 "bhD" = (
 /obj/structure/chair/wood/wings,
 /obj/effect/landmark/start/chaplain,
@@ -2880,9 +2864,7 @@
 	pixel_y = 28
 	},
 /obj/machinery/camera{
-	c_tag = "Civilian - Chapel Office";
-	dir = 2;
-	network = list("ss13")
+	c_tag = "Civilian - Chapel Office"
 	},
 /turf/open/floor/plasteel/grimy,
 /area/chapel/office)
@@ -3850,7 +3832,6 @@
 /area/engine/engineering)
 "bBN" = (
 /obj/docking_port/stationary{
-	dir = 1;
 	dwidth = 1;
 	height = 4;
 	name = "escape pod four loader";
@@ -3962,9 +3943,7 @@
 /turf/open/floor/plasteel/white,
 /area/science/research)
 "bEV" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 2
-	},
+/obj/effect/turf_decal/stripes/line,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
@@ -4011,7 +3990,6 @@
 /area/crew_quarters/kitchen)
 "bFx" = (
 /obj/machinery/requests_console{
-	announcementConsole = 0;
 	department = "Medbay";
 	departmentType = 1;
 	name = "Medbay RC";
@@ -4307,7 +4285,6 @@
 	dir = 9
 	},
 /obj/effect/turf_decal/trimline/secred/warning/lower{
-	alpha = 220;
 	dir = 9
 	},
 /turf/open/floor/plasteel,
@@ -4710,7 +4687,6 @@
 	dir = 4
 	},
 /obj/effect/turf_decal/trimline/secred/warning/lower{
-	alpha = 220;
 	dir = 4
 	},
 /obj/machinery/camera{
@@ -4972,7 +4948,6 @@
 "bYZ" = (
 /obj/machinery/mecha_part_fabricator,
 /obj/machinery/button/door{
-	dir = 2;
 	id = "robotics2";
 	name = "Shutters Control Button";
 	pixel_y = 24;
@@ -5279,7 +5254,6 @@
 	},
 /obj/machinery/camera{
 	c_tag = "Medical - Genetics";
-	dir = 2;
 	network = list("ss13","Medical")
 	},
 /obj/effect/turf_decal/trimline/purple/filled/line/lower{
@@ -5894,8 +5868,7 @@
 	},
 /obj/machinery/camera{
 	c_tag = "Cargo - Main 2";
-	dir = 8;
-	network = list("ss13")
+	dir = 8
 	},
 /obj/structure/extinguisher_cabinet{
 	pixel_x = 28
@@ -6081,12 +6054,11 @@
 /obj/structure/bed,
 /obj/machinery/camera{
 	c_tag = "Security - Cell 3";
-	dir = 2;
 	network = list("ss13","Security")
 	},
 /obj/item/bedsheet/prisoner,
 /turf/open/floor/plasteel,
-/area/security/brig)
+/area/security/brig_cell)
 "cuV" = (
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{
 	dir = 4
@@ -6203,9 +6175,7 @@
 /area/medical/storage)
 "cwM" = (
 /obj/machinery/camera{
-	c_tag = "Civilian - Chapel Main 2";
-	dir = 2;
-	network = list("ss13")
+	c_tag = "Civilian - Chapel Main 2"
 	},
 /obj/machinery/light_switch{
 	pixel_y = 24
@@ -6290,8 +6260,7 @@
 /area/crew_quarters/kitchen)
 "cyk" = (
 /obj/machinery/computer/rdconsole/core{
-	dir = 8;
-	icon_state = "computer"
+	dir = 8
 	},
 /obj/effect/turf_decal/trimline/purple/filled/line/lower,
 /turf/open/floor/plasteel,
@@ -6335,8 +6304,7 @@
 /obj/item/screwdriver,
 /obj/machinery/camera{
 	c_tag = "Cargo - Main 1";
-	dir = 4;
-	network = list("ss13")
+	dir = 4
 	},
 /obj/machinery/power/apc{
 	areastring = "/area/quartermaster/office";
@@ -6659,8 +6627,7 @@
 	req_access_txt = "20"
 	},
 /obj/machinery/camera{
-	c_tag = "Bridge - Captain's Office";
-	dir = 2
+	c_tag = "Bridge - Captain's Office"
 	},
 /turf/open/floor/wood,
 /area/crew_quarters/heads/captain)
@@ -6866,7 +6833,6 @@
 "cIU" = (
 /obj/machinery/camera{
 	c_tag = "Security - Main Hall 3";
-	dir = 2;
 	network = list("ss13","Security")
 	},
 /obj/structure/disposalpipe/segment{
@@ -6897,7 +6863,6 @@
 "cKp" = (
 /obj/machinery/camera{
 	c_tag = "Research - Main 4";
-	dir = 2;
 	network = list("ss13","Research")
 	},
 /obj/effect/turf_decal/trimline/purple/filled/line/lower{
@@ -7296,7 +7261,6 @@
 	},
 /obj/machinery/camera{
 	c_tag = "Medical - Treatment Centre";
-	dir = 2;
 	network = list("ss13","Medical")
 	},
 /turf/open/floor/plasteel/white,
@@ -7335,9 +7299,7 @@
 	dir = 1
 	},
 /obj/effect/turf_decal/trimline/white/filled/line/lower,
-/obj/effect/turf_decal/trimline/secred/warning/lower{
-	alpha = 220
-	},
+/obj/effect/turf_decal/trimline/secred/warning/lower,
 /turf/open/floor/plasteel,
 /area/hallway/secondary/exit/departure_lounge)
 "cTq" = (
@@ -7567,7 +7529,6 @@
 	dir = 8
 	},
 /obj/effect/turf_decal/trimline/secred/warning/lower{
-	alpha = 220;
 	dir = 8
 	},
 /turf/open/floor/plasteel,
@@ -7703,8 +7664,7 @@
 /area/science/xenobiology)
 "daq" = (
 /obj/machinery/computer/prisoner{
-	dir = 8;
-	icon_state = "computer"
+	dir = 8
 	},
 /obj/machinery/light{
 	dir = 4
@@ -7927,9 +7887,7 @@
 	icon_state = "4-8"
 	},
 /obj/effect/turf_decal/trimline/white/filled/line/lower,
-/obj/effect/turf_decal/trimline/secred/warning/lower{
-	alpha = 220
-	},
+/obj/effect/turf_decal/trimline/secred/warning/lower,
 /turf/open/floor/plasteel,
 /area/hallway/secondary/exit/departure_lounge)
 "deM" = (
@@ -8614,8 +8572,7 @@
 "dvH" = (
 /obj/machinery/camera{
 	c_tag = "Civilian - Chapel Main 1";
-	dir = 4;
-	network = list("ss13")
+	dir = 4
 	},
 /turf/open/floor/wood,
 /area/hallway/primary/central)
@@ -8776,8 +8733,7 @@
 	},
 /obj/machinery/camera{
 	c_tag = "Cargo - Docking Bay South";
-	dir = 1;
-	network = list("ss13")
+	dir = 1
 	},
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -8936,8 +8892,7 @@
 /area/maintenance/port/aft)
 "dDI" = (
 /obj/machinery/camera{
-	c_tag = "Bridge - AI Upload 1";
-	dir = 2
+	c_tag = "Bridge - AI Upload 1"
 	},
 /turf/open/floor/circuit,
 /area/ai_monitored/turret_protected/ai_upload)
@@ -9211,7 +9166,6 @@
 "dIw" = (
 /obj/machinery/power/apc{
 	areastring = "/area/security/checkpoint/science";
-	dir = 2;
 	name = "Science Checkpoint APC";
 	pixel_y = -23
 	},
@@ -9280,8 +9234,7 @@
 /area/security/brig)
 "dKr" = (
 /obj/machinery/atmospherics/components/unary/thermomachine/freezer{
-	dir = 4;
-	icon_state = "freezer"
+	dir = 4
 	},
 /obj/machinery/light{
 	dir = 8
@@ -9636,6 +9589,7 @@
 /obj/machinery/airalarm{
 	pixel_y = 24
 	},
+/obj/structure/filingcabinet,
 /turf/open/floor/plasteel,
 /area/security/main)
 "dQk" = (
@@ -9674,7 +9628,6 @@
 	dir = 8
 	},
 /obj/effect/turf_decal/trimline/secred/warning/lower{
-	alpha = 220;
 	dir = 8
 	},
 /obj/item/kirbyplants/random,
@@ -9986,7 +9939,6 @@
 	},
 /obj/machinery/camera{
 	c_tag = "Medical - Virology Backroom";
-	dir = 2;
 	network = list("ss13","Medical")
 	},
 /obj/effect/turf_decal/trimline/green/filled/line/lower{
@@ -10518,7 +10470,6 @@
 	icon_state = "4-8"
 	},
 /obj/machinery/airalarm{
-	dir = 2;
 	pixel_y = 24
 	},
 /turf/open/floor/plasteel/showroomfloor,
@@ -10626,7 +10577,6 @@
 /area/medical/virology)
 "emS" = (
 /obj/docking_port/stationary{
-	dir = 1;
 	dwidth = 5;
 	height = 7;
 	name = "Cargo Bay";
@@ -10689,7 +10639,6 @@
 	dir = 1
 	},
 /obj/effect/turf_decal/trimline/secred/warning/lower{
-	alpha = 220;
 	dir = 1
 	},
 /turf/open/floor/plasteel,
@@ -10935,8 +10884,7 @@
 "etK" = (
 /obj/machinery/camera{
 	c_tag = "Civilian - Dorm Main 1";
-	dir = 4;
-	network = list("ss13")
+	dir = 4
 	},
 /obj/machinery/vending/coffee,
 /turf/open/floor/plasteel,
@@ -11424,7 +11372,6 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/item/radio/intercom{
 	desc = "Talk through this. It looks like it has been modified to not broadcast.";
-	dir = 2;
 	name = "Prison Intercom (General)";
 	pixel_y = 24;
 	prison_radio = 1
@@ -11686,15 +11633,13 @@
 /area/crew_quarters/heads/hor)
 "eKV" = (
 /obj/machinery/computer/aifixer{
-	dir = 4;
-	icon_state = "computer"
+	dir = 4
 	},
 /obj/structure/window/reinforced{
 	dir = 8
 	},
 /obj/machinery/camera{
 	c_tag = "Research - Research Director's Office";
-	dir = 2;
 	network = list("ss13","Research")
 	},
 /turf/open/floor/carpet/purple,
@@ -11909,8 +11854,7 @@
 	pixel_y = 24
 	},
 /obj/machinery/camera{
-	c_tag = "Hallway - Central West 2";
-	dir = 2
+	c_tag = "Hallway - Central West 2"
 	},
 /obj/effect/turf_decal/trimline/engiyellow/filled/line/lower{
 	dir = 1
@@ -12012,8 +11956,7 @@
 	req_access_txt = "5"
 	},
 /obj/effect/mapping_helpers/airlock/unres{
-	dir = 8;
-	icon_state = "airlock_unres_helper"
+	dir = 8
 	},
 /obj/machinery/door/firedoor/border_only{
 	dir = 4
@@ -12195,9 +12138,7 @@
 	dir = 5
 	},
 /obj/effect/turf_decal/trimline/engiyellow/filled/corner/lower,
-/obj/effect/turf_decal/trimline/atmos/warning/lower/corner/flip{
-	dir = 2
-	},
+/obj/effect/turf_decal/trimline/atmos/warning/lower/corner/flip,
 /turf/open/floor/plasteel,
 /area/engine/atmos)
 "eUs" = (
@@ -12265,7 +12206,6 @@
 /obj/structure/table/reinforced,
 /obj/machinery/computer/security/telescreen{
 	dir = 4;
-	icon_state = "telescreen";
 	name = "Test Chamber Monitor";
 	network = list("xeno");
 	pixel_y = 2
@@ -12291,7 +12231,6 @@
 	icon_state = "4-8"
 	},
 /obj/machinery/airalarm{
-	dir = 2;
 	pixel_y = 24
 	},
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
@@ -12399,16 +12338,14 @@
 "eXI" = (
 /obj/structure/frame/computer{
 	anchored = 1;
-	dir = 8;
-	icon_state = "0"
+	dir = 8
 	},
 /obj/item/stack/cable_coil/cut,
 /turf/open/floor/wood,
 /area/quartermaster/warehouse)
 "eXN" = (
 /obj/machinery/computer/apc_control{
-	dir = 4;
-	icon_state = "computer"
+	dir = 4
 	},
 /obj/item/radio/intercom{
 	pixel_x = -28
@@ -13211,8 +13148,7 @@
 /area/engine/atmos)
 "fra" = (
 /obj/machinery/atmospherics/components/unary/thermomachine/freezer/on{
-	dir = 8;
-	icon_state = "freezer_1"
+	dir = 8
 	},
 /turf/open/floor/plasteel/white,
 /area/science/xenobiology)
@@ -13349,7 +13285,6 @@
 /area/security/brig)
 "fsv" = (
 /obj/machinery/conveyor{
-	dir = 2;
 	id = "NTMSLoad2";
 	name = "on ramp"
 	},
@@ -13378,9 +13313,7 @@
 "ftc" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/visible,
 /obj/effect/turf_decal/trimline/engiyellow/filled/corner/lower,
-/obj/effect/turf_decal/trimline/atmos/warning/lower/corner/flip{
-	dir = 2
-	},
+/obj/effect/turf_decal/trimline/atmos/warning/lower/corner/flip,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /turf/open/floor/plasteel,
 /area/engine/atmos)
@@ -13399,7 +13332,6 @@
 "ftr" = (
 /obj/machinery/camera{
 	c_tag = "Atmospherics - Nitrous Oxide Tank";
-	dir = 2;
 	network = list("ss13","Atmospherics")
 	},
 /turf/open/floor/engine/n2o{
@@ -13533,24 +13465,19 @@
 	icon_state = "0-4"
 	},
 /obj/item/radio/intercom{
-	anyai = 1;
 	freerange = 1;
 	listening = 0;
 	name = "Custom Channel";
 	pixel_y = -27
 	},
 /obj/item/radio/intercom{
-	anyai = 1;
-	broadcasting = 0;
 	freerange = 1;
 	frequency = 1447;
 	name = "Private Channel";
 	pixel_y = 20
 	},
 /obj/item/radio/intercom{
-	broadcasting = 0;
 	freerange = 1;
-	listening = 1;
 	name = "Common Channel";
 	pixel_y = -37
 	},
@@ -13603,9 +13530,7 @@
 /obj/effect/turf_decal/trimline/atmos/warning/lower/corner/flip{
 	dir = 8
 	},
-/obj/effect/turf_decal/trimline/atmos/warning/lower/corner/flip{
-	dir = 2
-	},
+/obj/effect/turf_decal/trimline/atmos/warning/lower/corner/flip,
 /turf/open/floor/plasteel,
 /area/hallway/primary/central)
 "fvS" = (
@@ -14395,7 +14320,6 @@
 	c_tag = "Holodeck"
 	},
 /obj/machinery/airalarm{
-	dir = 2;
 	pixel_y = 24
 	},
 /turf/open/floor/plasteel,
@@ -14486,10 +14410,10 @@
 /turf/open/floor/plating/airless,
 /area/space/nearstation)
 "fOg" = (
-/obj/structure/filingcabinet,
 /obj/effect/turf_decal/trimline/secred/filled/line/lower{
 	dir = 1
 	},
+/obj/machinery/computer/department_reward/security,
 /turf/open/floor/plasteel,
 /area/security/main)
 "fOr" = (
@@ -14505,8 +14429,7 @@
 /area/crew_quarters/theatre)
 "fOJ" = (
 /obj/machinery/computer/rdservercontrol{
-	dir = 4;
-	icon_state = "computer"
+	dir = 4
 	},
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
 	dir = 4
@@ -15177,8 +15100,7 @@
 "geq" = (
 /obj/structure/frame/computer{
 	anchored = 1;
-	dir = 4;
-	icon_state = "0"
+	dir = 4
 	},
 /obj/effect/turf_decal/bot,
 /obj/effect/turf_decal/stripes/line{
@@ -15730,14 +15652,13 @@
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
 /obj/item/radio/intercom{
 	desc = "Talk through this. It looks like it has been modified to not broadcast.";
-	dir = 2;
 	name = "Prison Intercom (General)";
 	pixel_x = -2;
 	pixel_y = 25;
 	prison_radio = 1
 	},
 /turf/open/floor/plasteel,
-/area/security/brig)
+/area/security/brig_cell)
 "grj" = (
 /obj/effect/landmark/event_spawn,
 /turf/open/floor/engine,
@@ -15761,7 +15682,7 @@
 	icon_state = "4-8"
 	},
 /turf/open/floor/plasteel,
-/area/security/brig)
+/area/security/brig_cell)
 "grP" = (
 /obj/machinery/door/airlock/public/glass{
 	name = "Dorms"
@@ -15975,9 +15896,7 @@
 /obj/machinery/newscaster/security_unit{
 	pixel_x = -32
 	},
-/obj/machinery/computer/communications{
-	dir = 2
-	},
+/obj/machinery/computer/communications,
 /obj/structure/sign/plaques/golden/captain{
 	pixel_y = 32
 	},
@@ -16032,9 +15951,7 @@
 /area/ai_monitored/secondarydatacore)
 "gxo" = (
 /obj/effect/turf_decal/trimline/white/filled/line/lower,
-/obj/effect/turf_decal/trimline/secred/warning/lower{
-	alpha = 220
-	},
+/obj/effect/turf_decal/trimline/secred/warning/lower,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
 	},
@@ -16358,8 +16275,7 @@
 	dir = 4
 	},
 /obj/machinery/camera{
-	c_tag = "Bridge - Entrance";
-	dir = 2
+	c_tag = "Bridge - Entrance"
 	},
 /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{
 	dir = 1
@@ -17682,7 +17598,6 @@
 	dir = 4
 	},
 /obj/item/radio/intercom{
-	dir = 2;
 	pixel_y = -28
 	},
 /obj/structure/cable{
@@ -17760,7 +17675,6 @@
 /obj/machinery/ntnet_relay,
 /obj/machinery/power/apc{
 	areastring = "/area/tcommsat/server";
-	dir = 2;
 	name = "Telecomms Servers APC";
 	pixel_y = -23
 	},
@@ -18350,8 +18264,7 @@
 "hBm" = (
 /obj/structure/table,
 /obj/machinery/chem_dispenser/drinks/beer{
-	dir = 4;
-	icon_state = "booze_dispenser"
+	dir = 4
 	},
 /obj/structure/sign/poster/official/high_class_martini{
 	pixel_x = -32
@@ -18408,8 +18321,7 @@
 	},
 /obj/machinery/camera{
 	c_tag = "Telecomms - Hallway North";
-	dir = 4;
-	network = list("ss13")
+	dir = 4
 	},
 /obj/machinery/light/small{
 	dir = 8
@@ -18811,8 +18723,7 @@
 /area/chapel/office)
 "hJO" = (
 /obj/machinery/computer/shuttle/labor{
-	dir = 1;
-	icon_state = "computer"
+	dir = 1
 	},
 /obj/machinery/airalarm{
 	dir = 1;
@@ -18870,9 +18781,7 @@
 "hLG" = (
 /obj/machinery/washing_machine,
 /obj/machinery/camera{
-	c_tag = "Civilian - Dorm Laundry Room";
-	dir = 2;
-	network = list("ss13")
+	c_tag = "Civilian - Dorm Laundry Room"
 	},
 /turf/open/floor/plasteel/cafeteria,
 /area/crew_quarters/dorms)
@@ -19008,7 +18917,6 @@
 /obj/item/clothing/mask/breath,
 /obj/machinery/power/apc{
 	areastring = "/area/medical/genetics/cloning";
-	dir = 2;
 	name = "Cloning Lab APC";
 	pixel_y = -23
 	},
@@ -19243,8 +19151,7 @@
 	},
 /obj/machinery/camera{
 	c_tag = "Civilian - Library Main 1";
-	dir = 8;
-	network = list("ss13")
+	dir = 8
 	},
 /obj/machinery/light_switch{
 	pixel_x = 24
@@ -19579,7 +19486,6 @@
 	dir = 8
 	},
 /obj/effect/turf_decal/trimline/secred/warning/lower{
-	alpha = 220;
 	dir = 8
 	},
 /turf/open/floor/plasteel,
@@ -19699,8 +19605,7 @@
 /area/maintenance/aft)
 "igP" = (
 /obj/machinery/computer/security/labor{
-	dir = 4;
-	icon_state = "computer"
+	dir = 4
 	},
 /obj/effect/turf_decal/trimline/secred/filled/line/lower{
 	dir = 8
@@ -19913,7 +19818,6 @@
 /obj/machinery/button/door{
 	id = "podescape";
 	name = "Pod Bay Control";
-	normaldoorcontrol = 0;
 	pixel_x = 8;
 	pixel_y = 24
 	},
@@ -19998,7 +19902,6 @@
 	dir = 1
 	},
 /obj/effect/turf_decal/trimline/secred/warning/lower{
-	alpha = 220;
 	dir = 1
 	},
 /turf/open/floor/plasteel,
@@ -20183,7 +20086,6 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/item/radio/intercom{
 	desc = "Talk through this. It looks like it has been modified to not broadcast.";
-	dir = 2;
 	name = "Prison Intercom (General)";
 	pixel_y = 24;
 	prison_radio = 1
@@ -20367,7 +20269,6 @@
 	pixel_y = 7
 	},
 /obj/item/flashlight/lamp/green{
-	light_on = 0;
 	pixel_x = 6;
 	pixel_y = 6
 	},
@@ -21122,9 +21023,7 @@
 	},
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
 /obj/effect/turf_decal/trimline/white/filled/line/lower,
-/obj/effect/turf_decal/trimline/secred/warning/lower{
-	alpha = 220
-	},
+/obj/effect/turf_decal/trimline/secred/warning/lower,
 /turf/open/floor/plasteel,
 /area/hallway/secondary/exit/departure_lounge)
 "iQu" = (
@@ -21185,8 +21084,7 @@
 	},
 /obj/machinery/camera{
 	c_tag = "Cargo - Quartermaster's Office";
-	dir = 4;
-	network = list("ss13")
+	dir = 4
 	},
 /obj/effect/turf_decal/trimline/brown/filled/line/lower{
 	dir = 9
@@ -21365,9 +21263,7 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/machinery/door/airlock/maintenance{
-	req_one_access_txt = "0"
-	},
+/obj/machinery/door/airlock/maintenance,
 /obj/machinery/door/firedoor/border_only{
 	dir = 4
 	},
@@ -21471,8 +21367,7 @@
 /area/maintenance/port/fore)
 "iXv" = (
 /obj/machinery/computer/atmos_sim{
-	dir = 8;
-	mode = 1
+	dir = 8
 	},
 /obj/machinery/light{
 	dir = 4
@@ -21604,7 +21499,6 @@
 	dir = 1
 	},
 /obj/machinery/button/door{
-	dir = 2;
 	id = "QMLoaddoor";
 	layer = 4;
 	name = "Loading Doors";
@@ -21612,8 +21506,7 @@
 	pixel_y = 24
 	},
 /obj/machinery/camera{
-	c_tag = "Cargo - Docking Bay North";
-	network = list("ss13")
+	c_tag = "Cargo - Docking Bay North"
 	},
 /turf/open/floor/plasteel,
 /area/quartermaster/storage)
@@ -22410,7 +22303,6 @@
 /obj/structure/closet/secure_closet/engineering_chief,
 /obj/machinery/power/apc{
 	areastring = "/area/crew_quarters/heads/chief";
-	dir = 2;
 	name = "Chief Engineer's Office APC";
 	pixel_y = -23
 	},
@@ -22565,9 +22457,7 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/structure/disposalpipe/segment,
 /obj/effect/turf_decal/trimline/engiyellow/filled/corner/lower,
-/obj/effect/turf_decal/trimline/atmos/warning/lower/corner/flip{
-	dir = 2
-	},
+/obj/effect/turf_decal/trimline/atmos/warning/lower/corner/flip,
 /turf/open/floor/plasteel,
 /area/engine/atmos)
 "jvg" = (
@@ -22947,7 +22837,6 @@
 "jCt" = (
 /obj/machinery/camera{
 	c_tag = "Research - Server Room";
-	dir = 2;
 	network = list("ss13","Research")
 	},
 /obj/machinery/airalarm/server{
@@ -23017,7 +22906,6 @@
 	dir = 4
 	},
 /obj/effect/turf_decal/trimline/secred/warning/lower{
-	alpha = 220;
 	dir = 4
 	},
 /obj/machinery/door/firedoor/border_only,
@@ -23103,9 +22991,7 @@
 /area/library)
 "jEs" = (
 /obj/effect/turf_decal/trimline/engiyellow/filled/corner/lower,
-/obj/effect/turf_decal/trimline/atmos/warning/lower/corner/flip{
-	dir = 2
-	},
+/obj/effect/turf_decal/trimline/atmos/warning/lower/corner/flip,
 /obj/effect/turf_decal/trimline/green/filled/corner/lower{
 	dir = 1
 	},
@@ -23172,8 +23058,7 @@
 /area/quartermaster/storage)
 "jFz" = (
 /obj/structure/particle_accelerator/fuel_chamber{
-	dir = 1;
-	icon_state = "fuel_chamber"
+	dir = 1
 	},
 /turf/open/floor/engine,
 /area/engine/engineering)
@@ -23632,7 +23517,6 @@
 /obj/structure/closet/radiation,
 /obj/machinery/camera{
 	c_tag = "Atmospherics - Main 4";
-	dir = 2;
 	network = list("ss13","Atmospherics")
 	},
 /turf/open/floor/plasteel,
@@ -24002,7 +23886,6 @@
 "jWo" = (
 /obj/machinery/camera{
 	c_tag = "Research - Xenobiology Cell 3";
-	dir = 2;
 	network = list("ss13","Research","Xenobiology")
 	},
 /turf/open/floor/engine,
@@ -24183,7 +24066,6 @@
 /obj/machinery/requests_console{
 	department = "AI";
 	departmentType = 5;
-	pixel_x = 0;
 	pixel_y = -32
 	},
 /turf/open/floor/circuit/telecomms/server,
@@ -25095,7 +24977,6 @@
 "kvv" = (
 /obj/machinery/power/apc{
 	areastring = "/area/crew_quarters/heads/cmo";
-	dir = 2;
 	name = "CMO's Office APC";
 	pixel_y = -23
 	},
@@ -25145,7 +25026,6 @@
 /obj/structure/lattice,
 /obj/machinery/camera/motion{
 	c_tag = "Secure - External Telecomm Sat South";
-	dir = 2;
 	network = list("Telecom")
 	},
 /turf/open/space/basic,
@@ -25156,7 +25036,6 @@
 /area/library)
 "kxJ" = (
 /obj/machinery/conveyor{
-	dir = 2;
 	id = "NTMSLoad2";
 	name = "on ramp"
 	},
@@ -25201,8 +25080,7 @@
 "kyZ" = (
 /obj/machinery/modular_computer/console/preset/engineering,
 /obj/machinery/camera{
-	c_tag = "Bridge - Main 3";
-	dir = 2
+	c_tag = "Bridge - Main 3"
 	},
 /obj/effect/turf_decal/trimline/engiyellow/filled/line/lower{
 	dir = 1
@@ -25508,9 +25386,7 @@
 /turf/open/floor/plating,
 /area/ai_monitored/storage/satellite)
 "kJE" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 2
-	},
+/obj/effect/turf_decal/stripes/line,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /turf/open/floor/wood,
@@ -25565,7 +25441,6 @@
 	dir = 5
 	},
 /obj/effect/turf_decal/trimline/secred/warning/lower{
-	alpha = 220;
 	dir = 5
 	},
 /obj/structure/disposalpipe/segment{
@@ -25669,7 +25544,6 @@
 "kNH" = (
 /obj/machinery/camera{
 	c_tag = "Research - Experimentor Bay";
-	dir = 2;
 	network = list("ss13","Research")
 	},
 /turf/open/floor/engine,
@@ -25731,9 +25605,7 @@
 	dir = 4
 	},
 /obj/effect/turf_decal/trimline/white/filled/line/lower,
-/obj/effect/turf_decal/trimline/secred/warning/lower{
-	alpha = 220
-	},
+/obj/effect/turf_decal/trimline/secred/warning/lower,
 /turf/open/floor/plasteel,
 /area/hallway/secondary/exit/departure_lounge)
 "kPh" = (
@@ -25825,8 +25697,7 @@
 /area/maintenance/aft)
 "kQo" = (
 /obj/machinery/camera{
-	c_tag = "Bridge - AI Upload 2";
-	dir = 2
+	c_tag = "Bridge - AI Upload 2"
 	},
 /turf/open/floor/circuit,
 /area/ai_monitored/turret_protected/ai_upload)
@@ -25999,7 +25870,6 @@
 "kUg" = (
 /obj/machinery/power/apc{
 	areastring = "/area/escapepodbay";
-	dir = 2;
 	name = "Podbay APC";
 	pixel_y = -23
 	},
@@ -26193,9 +26063,7 @@
 	dir = 4
 	},
 /obj/effect/turf_decal/trimline/white/filled/line/lower,
-/obj/effect/turf_decal/trimline/secred/warning/lower{
-	alpha = 220
-	},
+/obj/effect/turf_decal/trimline/secred/warning/lower,
 /turf/open/floor/plasteel,
 /area/hallway/secondary/exit/departure_lounge)
 "kYn" = (
@@ -26661,9 +26529,7 @@
 /obj/effect/turf_decal/trimline/atmos/warning/lower/corner/flip{
 	dir = 8
 	},
-/obj/effect/turf_decal/trimline/atmos/warning/lower/corner/flip{
-	dir = 2
-	},
+/obj/effect/turf_decal/trimline/atmos/warning/lower/corner/flip,
 /turf/open/floor/plasteel,
 /area/engine/atmos)
 "liC" = (
@@ -27332,7 +27198,6 @@
 	},
 /obj/machinery/camera{
 	c_tag = "Medical - Front Lobby";
-	dir = 2;
 	network = list("ss13","Medical")
 	},
 /turf/open/floor/plasteel/white,
@@ -27381,7 +27246,6 @@
 	dir = 8
 	},
 /obj/effect/turf_decal/trimline/secred/warning/lower{
-	alpha = 220;
 	dir = 8
 	},
 /turf/open/floor/plasteel,
@@ -27441,8 +27305,7 @@
 /area/hallway/secondary/exit/departure_lounge)
 "lBI" = (
 /obj/structure/bodycontainer/morgue{
-	dir = 1;
-	icon_state = "morgue1"
+	dir = 1
 	},
 /obj/effect/turf_decal/trimline/blue/filled/line/lower{
 	dir = 6
@@ -27790,7 +27653,6 @@
 	dir = 1
 	},
 /obj/effect/turf_decal/trimline/secred/warning/lower{
-	alpha = 220;
 	dir = 1
 	},
 /obj/structure/disposalpipe/segment{
@@ -28750,7 +28612,6 @@
 	},
 /obj/machinery/camera{
 	c_tag = "Medical - Main";
-	dir = 2;
 	network = list("ss13","Medical")
 	},
 /turf/open/floor/plasteel/white,
@@ -28799,9 +28660,7 @@
 	dir = 1
 	},
 /obj/effect/turf_decal/trimline/white/filled/line/lower,
-/obj/effect/turf_decal/trimline/secred/warning/lower{
-	alpha = 220
-	},
+/obj/effect/turf_decal/trimline/secred/warning/lower,
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
 /turf/open/floor/plasteel,
@@ -28899,7 +28758,6 @@
 "mgV" = (
 /obj/machinery/camera{
 	c_tag = "Atmospherics - Distro Loop";
-	dir = 2;
 	network = list("ss13","Atmospherics")
 	},
 /obj/effect/turf_decal/trimline/engiyellow/filled/line/lower{
@@ -29029,7 +28887,6 @@
 "mki" = (
 /obj/machinery/door/airlock/mining/glass{
 	name = "Cargo Bay";
-	req_access_txt = "0";
 	req_one_access_txt = "31;48"
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
@@ -29678,8 +29535,7 @@
 /area/library)
 "mwX" = (
 /obj/machinery/computer/telecomms/server{
-	dir = 8;
-	icon_state = "computer"
+	dir = 8
 	},
 /turf/open/floor/plasteel/grimy,
 /area/tcommsat/computer)
@@ -29797,7 +29653,7 @@
 	pixel_y = 28
 	},
 /turf/open/floor/plasteel,
-/area/security/brig)
+/area/security/brig_cell)
 "mzt" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 4
@@ -29858,9 +29714,7 @@
 "mBf" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/visible,
 /obj/effect/turf_decal/trimline/engiyellow/filled/corner/lower,
-/obj/effect/turf_decal/trimline/atmos/warning/lower/corner/flip{
-	dir = 2
-	},
+/obj/effect/turf_decal/trimline/atmos/warning/lower/corner/flip,
 /turf/open/floor/plasteel,
 /area/engine/atmos)
 "mBt" = (
@@ -30314,8 +30168,7 @@
 /area/quartermaster/storage)
 "mLX" = (
 /obj/machinery/computer/cargo/request{
-	dir = 8;
-	icon_state = "computer"
+	dir = 8
 	},
 /obj/effect/turf_decal/trimline/brown/filled/line/lower{
 	dir = 5
@@ -30486,7 +30339,6 @@
 	dir = 5
 	},
 /obj/effect/turf_decal/trimline/secred/warning/lower{
-	alpha = 220;
 	dir = 5
 	},
 /obj/machinery/light{
@@ -30699,8 +30551,7 @@
 "mTO" = (
 /obj/machinery/camera{
 	c_tag = "Psychiatrist Office";
-	dir = 4;
-	network = list("ss13")
+	dir = 4
 	},
 /obj/machinery/light_switch{
 	pixel_x = -23;
@@ -31129,9 +30980,7 @@
 /turf/open/floor/plasteel,
 /area/engine/engineering)
 "naO" = (
-/obj/machinery/light/small/built{
-	dir = 2
-	},
+/obj/machinery/light/small/built,
 /turf/open/floor/wood,
 /area/maintenance/port/fore)
 "naS" = (
@@ -31273,7 +31122,6 @@
 	dir = 4
 	},
 /obj/effect/turf_decal/trimline/secred/warning/lower{
-	alpha = 220;
 	dir = 4
 	},
 /obj/structure/closet/emcloset,
@@ -31437,7 +31285,6 @@
 "nhR" = (
 /obj/machinery/requests_console{
 	department = "Tool Storage";
-	departmentType = 0;
 	pixel_x = -30
 	},
 /turf/open/floor/plasteel,
@@ -31728,7 +31575,6 @@
 	},
 /obj/structure/sign/directions/supply{
 	dir = 1;
-	icon_state = "direction_supply";
 	pixel_y = 42
 	},
 /obj/structure/sign/directions/command{
@@ -31973,7 +31819,6 @@
 	dir = 8
 	},
 /obj/effect/turf_decal/trimline/secred/warning/lower{
-	alpha = 220;
 	dir = 8
 	},
 /turf/open/floor/plasteel,
@@ -32073,8 +31918,7 @@
 /obj/machinery/power/solar_control{
 	dir = 8;
 	id = "aftstarboard";
-	name = "Starboard Quarter Solar Control";
-	track = 0
+	name = "Starboard Quarter Solar Control"
 	},
 /obj/structure/cable{
 	icon_state = "0-2"
@@ -33036,9 +32880,7 @@
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 2
-	},
+/obj/effect/turf_decal/stripes/line,
 /turf/open/floor/plating,
 /area/maintenance/aft)
 "nMU" = (
@@ -33369,9 +33211,7 @@
 	icon_state = "4-8"
 	},
 /obj/effect/turf_decal/trimline/white/filled/line/lower,
-/obj/effect/turf_decal/trimline/secred/warning/lower{
-	alpha = 220
-	},
+/obj/effect/turf_decal/trimline/secred/warning/lower,
 /turf/open/floor/plasteel,
 /area/hallway/secondary/exit/departure_lounge)
 "nVx" = (
@@ -33580,7 +33420,6 @@
 	dir = 4
 	},
 /obj/effect/turf_decal/trimline/secred/warning/lower{
-	alpha = 220;
 	dir = 4
 	},
 /obj/machinery/door/firedoor/border_only{
@@ -33719,7 +33558,6 @@
 	dir = 8
 	},
 /obj/machinery/button/door{
-	dir = 2;
 	id = "Skynet_launch";
 	name = "Mech Bay Door Control";
 	pixel_x = 24;
@@ -33833,9 +33671,7 @@
 	dir = 4
 	},
 /obj/effect/turf_decal/trimline/engiyellow/filled/corner/lower,
-/obj/effect/turf_decal/trimline/atmos/warning/lower/corner/flip{
-	dir = 2
-	},
+/obj/effect/turf_decal/trimline/atmos/warning/lower/corner/flip,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /turf/open/floor/plasteel,
@@ -33936,9 +33772,7 @@
 /turf/open/floor/plasteel,
 /area/crew_quarters/fitness)
 "ofy" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 2
-	},
+/obj/effect/turf_decal/stripes/line,
 /turf/open/floor/wood,
 /area/library)
 "ofN" = (
@@ -34182,7 +34016,6 @@
 	dir = 4
 	},
 /obj/effect/turf_decal/trimline/secred/warning/lower{
-	alpha = 220;
 	dir = 4
 	},
 /obj/structure/closet/emcloset,
@@ -34391,7 +34224,6 @@
 	},
 /obj/machinery/camera{
 	c_tag = "Atmospherics - Incinerator Main 1";
-	dir = 2;
 	network = list("ss13","Atmospherics")
 	},
 /turf/open/floor/plasteel,
@@ -34553,7 +34385,6 @@
 	},
 /obj/machinery/camera{
 	c_tag = "Atmospherics - Incinerator Access Hall";
-	dir = 2;
 	network = list("ss13","Atmospherics")
 	},
 /obj/machinery/airalarm{
@@ -34611,8 +34442,7 @@
 	dir = 1
 	},
 /obj/effect/mapping_helpers/airlock/unres{
-	dir = 8;
-	icon_state = "airlock_unres_helper"
+	dir = 8
 	},
 /turf/open/floor/plasteel/white,
 /area/medical/medbay/central)
@@ -34851,9 +34681,7 @@
 	icon_state = "4-8"
 	},
 /obj/effect/turf_decal/trimline/white/filled/line/lower,
-/obj/effect/turf_decal/trimline/secred/warning/lower{
-	alpha = 220
-	},
+/obj/effect/turf_decal/trimline/secred/warning/lower,
 /turf/open/floor/plasteel,
 /area/hallway/secondary/exit/departure_lounge)
 "oCS" = (
@@ -34901,7 +34729,6 @@
 "oDF" = (
 /obj/machinery/space_heater,
 /obj/machinery/firealarm{
-	dir = 2;
 	pixel_y = 24
 	},
 /obj/effect/turf_decal/trimline/engiyellow/filled/line/lower{
@@ -35003,9 +34830,7 @@
 /obj/structure/cable{
 	icon_state = "0-2"
 	},
-/obj/machinery/power/apc/auto_name/north{
-	pixel_y = 23
-	},
+/obj/machinery/power/apc/auto_name/north,
 /turf/open/floor/plasteel,
 /area/engine/engine_smes)
 "oGB" = (
@@ -35020,7 +34845,6 @@
 /area/engine/atmos)
 "oGK" = (
 /obj/machinery/door/window/westleft{
-	dir = 8;
 	name = "Monkey Pen";
 	req_access_txt = "9"
 	},
@@ -35070,8 +34894,7 @@
 	icon_state = "4-8"
 	},
 /obj/effect/mapping_helpers/airlock/unres{
-	dir = 8;
-	icon_state = "airlock_unres_helper"
+	dir = 8
 	},
 /turf/open/floor/plasteel/white,
 /area/medical/medbay/central)
@@ -35085,7 +34908,6 @@
 	},
 /obj/machinery/camera{
 	c_tag = "Atmospherics - Main 3";
-	dir = 2;
 	network = list("ss13","Atmospherics")
 	},
 /obj/effect/turf_decal/trimline/engiyellow/filled/line/lower{
@@ -35698,7 +35520,6 @@
 /area/security/courtroom)
 "oWP" = (
 /obj/docking_port/stationary/random{
-	dir = 1;
 	name = "lavaland";
 	shuttle_id = "pod_lavaland2"
 	},
@@ -35826,7 +35647,7 @@
 	icon_state = "4-8"
 	},
 /turf/open/floor/plasteel,
-/area/security/brig)
+/area/security/brig_cell)
 "paM" = (
 /obj/structure/chair/office/dark{
 	dir = 8
@@ -36057,7 +35878,6 @@
 	dir = 8
 	},
 /obj/effect/turf_decal/trimline/secred/warning/lower{
-	alpha = 220;
 	dir = 8
 	},
 /obj/machinery/camera{
@@ -36126,8 +35946,7 @@
 /area/maintenance/disposal/incinerator)
 "pjJ" = (
 /obj/machinery/computer/med_data{
-	dir = 8;
-	icon_state = "computer"
+	dir = 8
 	},
 /turf/open/floor/carpet,
 /area/security/detectives_office)
@@ -36245,8 +36064,7 @@
 /obj/machinery/lapvend,
 /obj/machinery/camera{
 	c_tag = "Cargo - Front Lobby";
-	dir = 4;
-	network = list("ss13")
+	dir = 4
 	},
 /turf/open/floor/plasteel,
 /area/quartermaster/office)
@@ -36402,7 +36220,6 @@
 	dir = 1
 	},
 /obj/effect/turf_decal/trimline/secred/warning/lower{
-	alpha = 220;
 	dir = 1
 	},
 /obj/structure/disposalpipe/segment{
@@ -36476,7 +36293,7 @@
 	icon_state = "4-8"
 	},
 /turf/open/floor/plasteel,
-/area/security/brig)
+/area/security/brig_cell)
 "prf" = (
 /obj/effect/landmark/event_spawn,
 /turf/open/floor/plasteel,
@@ -36645,9 +36462,7 @@
 /obj/effect/turf_decal/trimline/atmos/warning/lower/corner/flip{
 	dir = 4
 	},
-/obj/effect/turf_decal/trimline/atmos/warning/lower/corner/flip{
-	dir = 2
-	},
+/obj/effect/turf_decal/trimline/atmos/warning/lower/corner/flip,
 /turf/open/floor/plasteel,
 /area/engine/atmos)
 "ptj" = (
@@ -36890,8 +36705,7 @@
 /area/engine/engineering)
 "pze" = (
 /obj/machinery/computer/atmos_alert{
-	dir = 4;
-	icon_state = "computer"
+	dir = 4
 	},
 /obj/effect/turf_decal/trimline/engiyellow/filled/line/lower{
 	dir = 8
@@ -36951,8 +36765,7 @@
 	},
 /obj/machinery/camera{
 	c_tag = "Civilian - Tool Storage";
-	dir = 4;
-	network = list("ss13")
+	dir = 4
 	},
 /obj/structure/cable{
 	icon_state = "1-4"
@@ -37583,7 +37396,6 @@
 	dir = 1
 	},
 /obj/machinery/airalarm{
-	dir = 2;
 	pixel_y = 24
 	},
 /turf/open/floor/plasteel/white,
@@ -37653,7 +37465,6 @@
 /area/science/research)
 "pOV" = (
 /obj/machinery/door/airlock/maintenance{
-	req_access_txt = "0";
 	req_one_access_txt = "6;12;50"
 	},
 /obj/structure/cable{
@@ -38030,9 +37841,7 @@
 	icon_state = "4-8"
 	},
 /obj/effect/turf_decal/trimline/white/filled/line/lower,
-/obj/effect/turf_decal/trimline/secred/warning/lower{
-	alpha = 220
-	},
+/obj/effect/turf_decal/trimline/secred/warning/lower,
 /turf/open/floor/plasteel,
 /area/hallway/secondary/exit/departure_lounge)
 "pXj" = (
@@ -38110,8 +37919,7 @@
 /area/crew_quarters/fitness)
 "pYL" = (
 /obj/machinery/modular_computer/console/preset/command{
-	dir = 8;
-	icon_state = "console"
+	dir = 8
 	},
 /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{
 	dir = 6
@@ -38217,7 +38025,6 @@
 	dir = 1
 	},
 /obj/effect/turf_decal/trimline/secred/warning/lower{
-	alpha = 220;
 	dir = 1
 	},
 /obj/structure/disposalpipe/segment{
@@ -38425,8 +38232,7 @@
 	req_access_txt = "5"
 	},
 /obj/effect/mapping_helpers/airlock/unres{
-	dir = 8;
-	icon_state = "airlock_unres_helper"
+	dir = 8
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 4
@@ -38842,8 +38648,7 @@
 "qoh" = (
 /obj/structure/table,
 /obj/machinery/chem_dispenser/drinks{
-	dir = 4;
-	icon_state = "soda_dispenser"
+	dir = 4
 	},
 /obj/machinery/camera{
 	c_tag = "Service - Bar Counter";
@@ -39093,9 +38898,7 @@
 	icon_state = "4-8"
 	},
 /obj/effect/turf_decal/trimline/white/filled/line/lower,
-/obj/effect/turf_decal/trimline/secred/warning/lower{
-	alpha = 220
-	},
+/obj/effect/turf_decal/trimline/secred/warning/lower,
 /turf/open/floor/plasteel,
 /area/hallway/secondary/exit/departure_lounge)
 "qsT" = (
@@ -39250,7 +39053,6 @@
 	},
 /obj/machinery/camera{
 	c_tag = "Engineering - Starboard Aux Solars Access";
-	dir = 2;
 	network = list("ss13","Engineering")
 	},
 /turf/open/floor/plating,
@@ -39318,7 +39120,6 @@
 "qxv" = (
 /obj/machinery/door/airlock/mining/glass{
 	name = "Cargo Bay";
-	req_access_txt = "0";
 	req_one_access_txt = "31;48"
 	},
 /obj/effect/turf_decal/trimline/brown/filled/line/lower{
@@ -39468,9 +39269,7 @@
 /obj/effect/turf_decal/trimline/engiyellow/filled/corner/lower{
 	dir = 4
 	},
-/obj/effect/turf_decal/trimline/atmos/warning/lower/corner/flip{
-	dir = 2
-	},
+/obj/effect/turf_decal/trimline/atmos/warning/lower/corner/flip,
 /obj/effect/turf_decal/trimline/atmos/warning/lower/corner/flip{
 	dir = 4
 	},
@@ -39478,7 +39277,6 @@
 /area/engine/atmos)
 "qAF" = (
 /obj/machinery/mineral/stacking_machine{
-	input_dir = 4;
 	output_dir = 4;
 	stack_amt = 10
 	},
@@ -39699,8 +39497,7 @@
 /area/maintenance/disposal/incinerator)
 "qHn" = (
 /obj/machinery/computer/mech_bay_power_console{
-	dir = 1;
-	icon_state = "computer"
+	dir = 1
 	},
 /obj/structure/cable{
 	icon_state = "0-8"
@@ -39722,8 +39519,7 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/machinery/door/airlock/maintenance{
-	req_access_txt = "63";
-	req_one_access_txt = "0"
+	req_access_txt = "63"
 	},
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/door/firedoor/border_only,
@@ -40234,13 +40030,11 @@
 	icon_state = "0-4"
 	},
 /obj/machinery/airalarm{
-	dir = 2;
 	pixel_y = 24
 	},
 /obj/machinery/camera{
 	c_tag = "Civilian - Garden Main 1";
-	dir = 4;
-	network = list("ss13")
+	dir = 4
 	},
 /obj/effect/turf_decal/siding/wideplating,
 /turf/open/floor/grass,
@@ -40319,7 +40113,6 @@
 	dir = 4
 	},
 /obj/effect/turf_decal/trimline/secred/warning/lower{
-	alpha = 220;
 	dir = 4
 	},
 /obj/structure/closet/firecloset,
@@ -40544,7 +40337,7 @@
 	pixel_y = 28
 	},
 /turf/open/floor/plasteel,
-/area/security/brig)
+/area/security/brig_cell)
 "qZx" = (
 /obj/effect/spawner/structure/window/reinforced,
 /turf/open/floor/plating,
@@ -40629,8 +40422,7 @@
 /area/quartermaster/warehouse)
 "rcJ" = (
 /obj/structure/particle_accelerator/particle_emitter/center{
-	dir = 1;
-	icon_state = "emitter_center"
+	dir = 1
 	},
 /turf/open/floor/engine,
 /area/engine/engineering)
@@ -40669,7 +40461,6 @@
 "rdK" = (
 /obj/machinery/power/apc{
 	areastring = "/area/security/brig";
-	dir = 2;
 	name = "Brig APC";
 	pixel_y = -23
 	},
@@ -40794,7 +40585,6 @@
 "rgs" = (
 /obj/structure/sign/directions/command{
 	dir = 4;
-	icon_state = "direction_bridge";
 	pixel_x = 32;
 	pixel_y = 24
 	},
@@ -40804,7 +40594,6 @@
 	},
 /obj/structure/sign/directions/security{
 	dir = 4;
-	icon_state = "direction_sec";
 	pixel_x = 32;
 	pixel_y = 32
 	},
@@ -41614,7 +41403,6 @@
 /obj/structure/bed,
 /obj/machinery/camera{
 	c_tag = "Medical - Virology Isolation A";
-	dir = 2;
 	network = list("ss13","Medical","Virology")
 	},
 /obj/item/bedsheet/medical/virology,
@@ -41626,8 +41414,7 @@
 /area/maintenance/disposal/incinerator)
 "rAA" = (
 /obj/machinery/camera{
-	c_tag = "Telecomms - Observatory";
-	dir = 2
+	c_tag = "Telecomms - Observatory"
 	},
 /turf/open/floor/wood,
 /area/tcommsat/computer)
@@ -41937,7 +41724,6 @@
 /obj/structure/table,
 /obj/machinery/camera{
 	c_tag = "Medical - Virology Isolation B";
-	dir = 2;
 	network = list("ss13","Medical","Virology")
 	},
 /turf/open/floor/plasteel/white,
@@ -42150,7 +41936,6 @@
 	dir = 1
 	},
 /obj/effect/turf_decal/trimline/secred/warning/lower{
-	alpha = 220;
 	dir = 1
 	},
 /obj/structure/disposalpipe/segment{
@@ -42840,8 +42625,7 @@
 /obj/effect/turf_decal/siding/wood,
 /obj/machinery/camera{
 	c_tag = "Civilian - Library Main 2";
-	dir = 8;
-	network = list("ss13")
+	dir = 8
 	},
 /turf/open/floor/wood,
 /area/library)
@@ -43016,7 +42800,6 @@
 	dir = 1
 	},
 /obj/effect/turf_decal/trimline/secred/warning/lower{
-	alpha = 220;
 	dir = 1
 	},
 /turf/open/floor/plasteel,
@@ -43605,8 +43388,7 @@
 /area/hallway/primary/central)
 "sve" = (
 /obj/machinery/computer/station_alert{
-	dir = 4;
-	icon_state = "computer"
+	dir = 4
 	},
 /obj/machinery/requests_console{
 	department = "Atmospherics";
@@ -43980,7 +43762,6 @@
 "sAQ" = (
 /obj/machinery/camera{
 	c_tag = "Security - Cell 1";
-	dir = 2;
 	network = list("ss13","Security")
 	},
 /obj/machinery/computer/secure_data,
@@ -44223,9 +44004,7 @@
 /area/crew_quarters/kitchen)
 "sEq" = (
 /obj/structure/table,
-/obj/item/clothing/head/that{
-	throwforce = 1
-	},
+/obj/item/clothing/head/that,
 /obj/item/toy/figure/bartender,
 /obj/structure/sign/plaques/deempisi{
 	pixel_y = 24
@@ -44308,7 +44087,6 @@
 /obj/structure/cable,
 /obj/machinery/power/apc/highcap/ten_k{
 	areastring = "/area/engine/engineering";
-	dir = 2;
 	name = "Engine Room APC";
 	pixel_y = -23
 	},
@@ -44586,9 +44364,7 @@
 /obj/structure/cable{
 	icon_state = "0-4"
 	},
-/obj/machinery/power/apc/auto_name/north{
-	pixel_y = 23
-	},
+/obj/machinery/power/apc/auto_name/north,
 /turf/open/floor/plasteel,
 /area/maintenance/disposal/incinerator)
 "sMI" = (
@@ -44810,7 +44586,6 @@
 	dir = 4
 	},
 /obj/machinery/airalarm{
-	dir = 2;
 	pixel_y = 24
 	},
 /turf/open/floor/plasteel,
@@ -44962,7 +44737,6 @@
 /obj/machinery/reagentgrinder,
 /obj/structure/table/wood,
 /obj/machinery/airalarm{
-	dir = 2;
 	pixel_y = 24
 	},
 /turf/open/floor/wood,
@@ -45544,8 +45318,7 @@
 /area/tcommsat/server)
 "tiq" = (
 /obj/machinery/camera{
-	c_tag = "Hallway - Central Southeast 1";
-	dir = 2
+	c_tag = "Hallway - Central Southeast 1"
 	},
 /turf/open/floor/plasteel,
 /area/hallway/primary/central)
@@ -46282,8 +46055,7 @@
 /area/science/robotics/lab)
 "tyd" = (
 /obj/machinery/computer/robotics{
-	dir = 4;
-	icon_state = "computer"
+	dir = 4
 	},
 /obj/structure/window/reinforced{
 	dir = 8
@@ -46652,7 +46424,6 @@
 	dir = 1
 	},
 /obj/effect/turf_decal/trimline/secred/warning/lower{
-	alpha = 220;
 	dir = 1
 	},
 /obj/structure/disposalpipe/segment{
@@ -46740,7 +46511,6 @@
 	dir = 4
 	},
 /obj/effect/turf_decal/trimline/secred/warning/lower{
-	alpha = 220;
 	dir = 4
 	},
 /obj/structure/disposalpipe/segment,
@@ -47210,7 +46980,6 @@
 /obj/structure/closet/l3closet,
 /obj/machinery/camera{
 	c_tag = "Medical - Virology Airlock";
-	dir = 2;
 	network = list("ss13","Medical")
 	},
 /obj/effect/turf_decal/stripes/line{
@@ -47250,7 +47019,6 @@
 "tSn" = (
 /obj/machinery/power/apc{
 	areastring = "/area/science/research";
-	dir = 2;
 	name = "Science Main APC";
 	pixel_y = -23
 	},
@@ -47506,8 +47274,7 @@
 /obj/machinery/light,
 /obj/machinery/camera{
 	c_tag = "Civilian - Garden Main 2";
-	dir = 1;
-	network = list("ss13")
+	dir = 1
 	},
 /turf/open/floor/grass,
 /area/hydroponics/garden)
@@ -47674,8 +47441,7 @@
 /area/medical/virology)
 "ubf" = (
 /obj/machinery/computer/rdconsole/robotics{
-	dir = 4;
-	icon_state = "computer"
+	dir = 4
 	},
 /obj/machinery/light{
 	dir = 8
@@ -47701,8 +47467,7 @@
 	},
 /obj/machinery/camera{
 	c_tag = "Cargo - Disposals Office";
-	dir = 8;
-	network = list("ss13")
+	dir = 8
 	},
 /turf/open/floor/plasteel,
 /area/quartermaster/sorting)
@@ -47921,8 +47686,7 @@
 /area/engine/engineering)
 "ufk" = (
 /obj/structure/particle_accelerator/particle_emitter/right{
-	dir = 1;
-	icon_state = "emitter_right"
+	dir = 1
 	},
 /turf/open/floor/engine,
 /area/engine/engineering)
@@ -48380,7 +48144,6 @@
 /area/solar/starboard/fore)
 "uqn" = (
 /obj/machinery/airalarm{
-	dir = 2;
 	pixel_y = 24
 	},
 /turf/open/floor/carpet,
@@ -48453,9 +48216,7 @@
 	icon_state = "1-4"
 	},
 /obj/effect/turf_decal/trimline/white/filled/line/lower,
-/obj/effect/turf_decal/trimline/secred/warning/lower{
-	alpha = 220
-	},
+/obj/effect/turf_decal/trimline/secred/warning/lower,
 /turf/open/floor/plasteel,
 /area/hallway/secondary/exit/departure_lounge)
 "urW" = (
@@ -48468,7 +48229,6 @@
 /obj/item/clothing/head/wig/random,
 /obj/machinery/power/apc{
 	areastring = "/area/crew_quarters/theatre";
-	dir = 2;
 	name = "Theatre APC";
 	pixel_y = -23
 	},
@@ -48785,7 +48545,6 @@
 	icon_state = "2-8"
 	},
 /obj/machinery/requests_console{
-	announcementConsole = 0;
 	department = "Engineering";
 	departmentType = 4;
 	name = "Engineering RC";
@@ -48946,7 +48705,6 @@
 	icon_state = "1-8"
 	},
 /obj/item/radio/intercom{
-	dir = 2;
 	pixel_y = -28
 	},
 /obj/machinery/camera{
@@ -49398,7 +49156,6 @@
 	dir = 1
 	},
 /obj/effect/turf_decal/trimline/secred/warning/lower{
-	alpha = 220;
 	dir = 1
 	},
 /obj/structure/disposalpipe/segment{
@@ -49526,8 +49283,7 @@
 /area/medical/psych)
 "uQm" = (
 /obj/machinery/computer/mecha{
-	dir = 4;
-	icon_state = "computer"
+	dir = 4
 	},
 /obj/structure/window/reinforced{
 	dir = 8
@@ -49751,8 +49507,7 @@
 /area/engine/atmos)
 "uUo" = (
 /obj/machinery/computer/message_monitor{
-	dir = 4;
-	icon_state = "computer"
+	dir = 4
 	},
 /obj/machinery/light{
 	dir = 8
@@ -50044,8 +49799,7 @@
 	dir = 1
 	},
 /obj/machinery/power/terminal{
-	dir = 8;
-	icon_state = "term"
+	dir = 8
 	},
 /obj/structure/cable{
 	icon_state = "0-4"
@@ -51136,9 +50890,7 @@
 /obj/machinery/light{
 	dir = 4
 	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 2
-	},
+/obj/effect/turf_decal/stripes/line,
 /turf/open/floor/plasteel,
 /area/maintenance/disposal/incinerator)
 "vAs" = (
@@ -51582,8 +51334,7 @@
 	},
 /obj/machinery/camera{
 	c_tag = "Civilian - Commissary";
-	dir = 1;
-	network = list("ss13")
+	dir = 1
 	},
 /turf/open/floor/plasteel,
 /area/vacant_room/commissary)
@@ -51905,8 +51656,7 @@
 	pixel_y = 24
 	},
 /obj/machinery/camera{
-	c_tag = "Bridge - Breakroom";
-	dir = 2
+	c_tag = "Bridge - Breakroom"
 	},
 /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{
 	dir = 1
@@ -52432,7 +52182,6 @@
 "wcK" = (
 /obj/structure/plasticflaps,
 /obj/machinery/conveyor{
-	dir = 2;
 	id = "NTMSLoad2";
 	name = "on ramp"
 	},
@@ -52697,8 +52446,7 @@
 	},
 /obj/machinery/door/airlock/maintenance{
 	name = "Security Maintenance";
-	req_access_txt = "63";
-	req_one_access_txt = "0"
+	req_access_txt = "63"
 	},
 /obj/machinery/door/firedoor/border_only,
 /obj/machinery/door/firedoor/border_only{
@@ -52709,7 +52457,6 @@
 "wjm" = (
 /obj/machinery/camera{
 	c_tag = "Research - Xenobiology Cell 2";
-	dir = 2;
 	network = list("ss13","Research","Xenobiology")
 	},
 /turf/open/floor/engine,
@@ -52877,7 +52624,6 @@
 /obj/machinery/atmospherics/components/unary/vent_pump/on,
 /obj/machinery/camera{
 	c_tag = "Research - Xenobiology Northen Kill Chamber";
-	dir = 2;
 	network = list("ss13","Research","Xenobiology")
 	},
 /turf/open/floor/circuit/telecomms,
@@ -52922,7 +52668,6 @@
 "wpc" = (
 /obj/structure/table,
 /obj/machinery/button/massdriver{
-	dir = 2;
 	id = "toxinsdriver";
 	pixel_x = 5
 	},
@@ -52998,8 +52743,7 @@
 /area/bridge)
 "wqF" = (
 /obj/structure/particle_accelerator/end_cap{
-	dir = 1;
-	icon_state = "end_cap"
+	dir = 1
 	},
 /turf/open/floor/engine,
 /area/engine/engineering)
@@ -53046,8 +52790,7 @@
 /area/bridge)
 "wsx" = (
 /obj/machinery/computer/cargo{
-	dir = 8;
-	icon_state = "computer"
+	dir = 8
 	},
 /obj/effect/turf_decal/trimline/brown/filled/line/lower{
 	dir = 6
@@ -53336,8 +53079,7 @@
 "wwP" = (
 /obj/structure/frame/computer{
 	anchored = 1;
-	dir = 8;
-	icon_state = "0"
+	dir = 8
 	},
 /obj/effect/decal/cleanable/blood/old,
 /obj/effect/decal/cleanable/dirt,
@@ -53708,7 +53450,6 @@
 /area/science/research)
 "wDU" = (
 /obj/machinery/button/door{
-	dir = 2;
 	id = "engsm";
 	name = "Radiation Shutters Control";
 	pixel_y = 24;
@@ -54116,7 +53857,6 @@
 	dir = 8
 	},
 /obj/effect/turf_decal/trimline/secred/warning/lower{
-	alpha = 220;
 	dir = 8
 	},
 /obj/machinery/door/firedoor/border_only,
@@ -54429,7 +54169,6 @@
 	dir = 4
 	},
 /obj/effect/turf_decal/trimline/secred/warning/lower{
-	alpha = 220;
 	dir = 4
 	},
 /obj/item/kirbyplants/random,
@@ -54555,7 +54294,6 @@
 "wVz" = (
 /obj/machinery/camera{
 	c_tag = "Research - Xenobiology Cell 1";
-	dir = 2;
 	network = list("ss13","Research","Xenobiology")
 	},
 /turf/open/floor/engine,
@@ -54710,8 +54448,7 @@
 	dir = 6
 	},
 /obj/machinery/camera{
-	c_tag = "Bridge - Captain's Private Quarters";
-	dir = 2
+	c_tag = "Bridge - Captain's Private Quarters"
 	},
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
 	dir = 1
@@ -54883,9 +54620,7 @@
 /area/maintenance/port/aft)
 "xcY" = (
 /obj/machinery/camera{
-	c_tag = "Civilian - Crematorium";
-	dir = 2;
-	network = list("ss13")
+	c_tag = "Civilian - Crematorium"
 	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
@@ -55017,7 +54752,6 @@
 /area/storage/primary)
 "xgb" = (
 /obj/docking_port/stationary{
-	dir = 1;
 	dwidth = 3;
 	height = 5;
 	name = "mining shuttle bay";
@@ -55462,7 +55196,6 @@
 /area/security/detectives_office)
 "xno" = (
 /obj/machinery/requests_console{
-	announcementConsole = 0;
 	department = "Medbay";
 	departmentType = 1;
 	name = "Medbay RC";
@@ -55549,7 +55282,6 @@
 	},
 /obj/machinery/requests_console{
 	department = "Mining";
-	departmentType = 0;
 	pixel_y = 30
 	},
 /obj/effect/turf_decal/trimline/brown/filled/line/lower{
@@ -55638,7 +55370,6 @@
 "xrd" = (
 /obj/structure/table/reinforced,
 /obj/machinery/door/window/northleft{
-	dir = 1;
 	name = "Engineering Desk";
 	req_one_access_txt = "32;19"
 	},
@@ -55730,11 +55461,10 @@
 	icon_state = "4-8"
 	},
 /turf/open/floor/plasteel,
-/area/security/brig)
+/area/security/brig_cell)
 "xsb" = (
 /obj/machinery/camera{
-	c_tag = "Hallway - Central West 1";
-	dir = 2
+	c_tag = "Hallway - Central West 1"
 	},
 /obj/structure/sign/directions/medical{
 	dir = 8;
@@ -55746,7 +55476,6 @@
 	},
 /obj/structure/sign/directions/evac{
 	dir = 8;
-	icon_state = "direction_evac";
 	pixel_y = 42
 	},
 /obj/effect/turf_decal/trimline/engiyellow/filled/line/lower{
@@ -56414,8 +56143,7 @@
 /obj/structure/closet/wardrobe/green,
 /obj/machinery/camera{
 	c_tag = "Civilian - Dorm Main 2";
-	dir = 4;
-	network = list("ss13")
+	dir = 4
 	},
 /turf/open/floor/plasteel,
 /area/crew_quarters/dorms)
@@ -56448,8 +56176,7 @@
 /area/security/brig)
 "xIF" = (
 /obj/structure/particle_accelerator/particle_emitter/left{
-	dir = 1;
-	icon_state = "emitter_left"
+	dir = 1
 	},
 /turf/open/floor/engine,
 /area/engine/engineering)
@@ -57339,12 +57066,11 @@
 	},
 /obj/machinery/camera{
 	c_tag = "Security - Cell 2";
-	dir = 2;
 	network = list("ss13","Security")
 	},
 /obj/item/bedsheet/prisoner,
 /turf/open/floor/plasteel,
-/area/security/brig)
+/area/security/brig_cell)
 "xZI" = (
 /obj/structure/disposalpipe/segment{
 	dir = 6
@@ -57502,7 +57228,6 @@
 "ycE" = (
 /obj/machinery/camera{
 	c_tag = "Research - Toxins Main 2";
-	dir = 2;
 	network = list("ss13","Research")
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
@@ -57529,7 +57254,6 @@
 "ycU" = (
 /obj/machinery/power/apc{
 	areastring = "/area/medical/chemistry";
-	dir = 2;
 	name = "Chemistry APC";
 	pixel_y = -23
 	},
@@ -57728,7 +57452,6 @@
 	dir = 8
 	},
 /obj/effect/turf_decal/trimline/secred/warning/lower{
-	alpha = 220;
 	dir = 8
 	},
 /obj/machinery/door/firedoor/border_only{
@@ -57745,7 +57468,6 @@
 	dir = 4
 	},
 /obj/effect/turf_decal/trimline/secred/warning/lower{
-	alpha = 220;
 	dir = 4
 	},
 /turf/open/floor/plasteel,
@@ -102334,7 +102056,7 @@ wNb
 jzR
 cuQ
 pqT
-vra
+aDe
 qZs
 aVd
 gUR
@@ -102588,10 +102310,10 @@ tub
 jzR
 xcE
 grK
-vra
+aDe
 mzd
 aVd
-vra
+aDe
 gri
 pas
 gUR
@@ -102845,7 +102567,7 @@ lsL
 vra
 xYV
 aVd
-vra
+aDe
 gri
 pas
 vra
diff --git a/_maps/map_files/GaxStation/GaxStation.dmm b/_maps/map_files/GaxStation/GaxStation.dmm
index f7c043db5747..ffaa524b753c 100644
--- a/_maps/map_files/GaxStation/GaxStation.dmm
+++ b/_maps/map_files/GaxStation/GaxStation.dmm
@@ -29920,6 +29920,9 @@
 /obj/structure/cable{
 	icon_state = "0-8"
 	},
+/obj/machinery/computer/department_reward/security{
+	dir = 8
+	},
 /turf/open/floor/plasteel,
 /area/security/main)
 "ozt" = (
diff --git a/_maps/map_files/IceMeta/IceMeta.dmm b/_maps/map_files/IceMeta/IceMeta.dmm
index 9ab7ad2aa006..f97eb90019a8 100644
--- a/_maps/map_files/IceMeta/IceMeta.dmm
+++ b/_maps/map_files/IceMeta/IceMeta.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
diff --git a/_maps/map_files/YogStation/YogStation.dmm b/_maps/map_files/YogStation/YogStation.dmm
index 069daf583dd9..dda141ab1255 100644
--- a/_maps/map_files/YogStation/YogStation.dmm
+++ b/_maps/map_files/YogStation/YogStation.dmm
@@ -397,7 +397,6 @@
 	},
 /obj/structure/table/wood,
 /obj/item/flashlight/lamp/green{
-	light_on = 0;
 	pixel_x = 6;
 	pixel_y = 4
 	},
@@ -721,7 +720,7 @@
 	name = "Cell 1 Locker"
 	},
 /turf/open/floor/plasteel,
-/area/security/brig)
+/area/security/brig_cell)
 "aeB" = (
 /obj/machinery/power/tracker,
 /obj/structure/cable/yellow{
@@ -840,7 +839,7 @@
 	dir = 4
 	},
 /turf/open/floor/plasteel,
-/area/security/brig)
+/area/security/brig_cell)
 "afN" = (
 /obj/structure/lattice/catwalk,
 /obj/structure/cable/yellow{
@@ -1576,7 +1575,7 @@
 	icon_state = "1-2"
 	},
 /turf/open/floor/plasteel,
-/area/security/brig)
+/area/security/brig_cell)
 "aly" = (
 /obj/effect/turf_decal/bot_white,
 /obj/machinery/flasher/portable,
@@ -1772,7 +1771,7 @@
 	icon_state = "1-2"
 	},
 /turf/open/floor/plasteel,
-/area/security/brig)
+/area/security/brig_cell)
 "amw" = (
 /obj/effect/spawner/structure/window/reinforced/shutter,
 /turf/open/floor/plating,
@@ -2278,7 +2277,7 @@
 	dir = 8
 	},
 /turf/open/floor/plasteel,
-/area/security/brig)
+/area/security/brig_cell)
 "aqo" = (
 /obj/structure/dresser,
 /turf/open/floor/wood,
@@ -4104,7 +4103,7 @@
 	icon_state = "1-2"
 	},
 /turf/open/floor/plasteel,
-/area/security/brig)
+/area/security/brig_cell)
 "aDG" = (
 /obj/machinery/button/door{
 	id = "briggate";
@@ -13545,6 +13544,7 @@
 	pixel_y = -32
 	},
 /obj/effect/turf_decal/trimline/secred/filled/line/lower,
+/obj/structure/filingcabinet,
 /turf/open/floor/plasteel,
 /area/security/main)
 "clf" = (
@@ -14965,9 +14965,7 @@
 /area/engine/atmos/distro)
 "cCl" = (
 /obj/effect/decal/cleanable/cobweb,
-/obj/machinery/computer/atmos_sim{
-	mode = 1
-	},
+/obj/machinery/computer/atmos_sim,
 /turf/open/floor/plasteel,
 /area/maintenance/disposal/incinerator)
 "cCD" = (
@@ -16017,7 +16015,7 @@
 	name = "Cell 3 Locker"
 	},
 /turf/open/floor/plasteel,
-/area/security/brig)
+/area/security/brig_cell)
 "cRZ" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
@@ -23536,8 +23534,10 @@
 /turf/open/floor/plating,
 /area/maintenance/starboard/fore)
 "fyS" = (
-/obj/structure/filingcabinet,
 /obj/effect/turf_decal/trimline/secred/filled/line/lower,
+/obj/machinery/computer/department_reward/security{
+	dir = 1
+	},
 /turf/open/floor/plasteel,
 /area/security/main)
 "fza" = (
@@ -28226,7 +28226,6 @@
 	dir = 4
 	},
 /obj/effect/turf_decal/trimline/secred/warning/lower{
-	alpha = 220;
 	dir = 4
 	},
 /turf/open/floor/plasteel,
@@ -32486,7 +32485,6 @@
 	dir = 4
 	},
 /obj/effect/turf_decal/trimline/secred/warning/lower{
-	alpha = 220;
 	dir = 4
 	},
 /turf/open/floor/plasteel,
@@ -38157,7 +38155,6 @@
 	dir = 1
 	},
 /obj/effect/turf_decal/trimline/secred/warning/lower{
-	alpha = 220;
 	dir = 1
 	},
 /obj/effect/turf_decal/trimline/white/filled/corner/lower,
@@ -38835,7 +38832,6 @@
 	dir = 4
 	},
 /obj/effect/turf_decal/trimline/secred/warning/lower{
-	alpha = 220;
 	dir = 4
 	},
 /turf/open/floor/plasteel,
@@ -38849,7 +38845,6 @@
 	dir = 1
 	},
 /obj/effect/turf_decal/trimline/secred/warning/lower{
-	alpha = 220;
 	dir = 1
 	},
 /turf/open/floor/plasteel,
@@ -49707,9 +49702,7 @@
 /area/quartermaster/miningdock)
 "oYF" = (
 /obj/effect/turf_decal/trimline/white/filled/line/lower,
-/obj/effect/turf_decal/trimline/secred/warning/lower{
-	alpha = 220
-	},
+/obj/effect/turf_decal/trimline/secred/warning/lower,
 /turf/open/floor/plasteel,
 /area/hallway/secondary/exit)
 "oYU" = (
@@ -50811,9 +50804,7 @@
 "psO" = (
 /obj/structure/closet/emcloset,
 /obj/effect/turf_decal/trimline/white/filled/line/lower,
-/obj/effect/turf_decal/trimline/secred/warning/lower{
-	alpha = 220
-	},
+/obj/effect/turf_decal/trimline/secred/warning/lower,
 /turf/open/floor/plasteel,
 /area/hallway/secondary/exit)
 "pth" = (
@@ -51856,24 +51847,19 @@
 	icon_state = "0-4"
 	},
 /obj/item/radio/intercom{
-	anyai = 1;
 	freerange = 1;
 	listening = 0;
 	name = "Custom Channel";
 	pixel_y = -27
 	},
 /obj/item/radio/intercom{
-	anyai = 1;
-	broadcasting = 0;
 	freerange = 1;
 	frequency = 1447;
 	name = "Private Channel";
 	pixel_y = 20
 	},
 /obj/item/radio/intercom{
-	broadcasting = 0;
 	freerange = 1;
-	listening = 1;
 	name = "Common Channel";
 	pixel_y = -37
 	},
@@ -56611,7 +56597,7 @@
 /obj/structure/bed,
 /obj/item/bedsheet/prisoner,
 /turf/open/floor/plasteel,
-/area/security/brig)
+/area/security/brig_cell)
 "rxG" = (
 /obj/machinery/space_heater,
 /obj/effect/turf_decal/trimline/engiyellow/filled/line/lower{
@@ -63804,8 +63790,7 @@
 /area/bridge)
 "ucR" = (
 /obj/machinery/computer/atmos_sim{
-	dir = 4;
-	mode = 1
+	dir = 4
 	},
 /obj/effect/turf_decal/trimline/purple/filled/line/lower,
 /turf/open/floor/plasteel/white,
@@ -66035,7 +66020,7 @@
 	name = "Cell 2 Locker"
 	},
 /turf/open/floor/plasteel,
-/area/security/brig)
+/area/security/brig_cell)
 "uWS" = (
 /obj/item/crowbar,
 /obj/item/wrench,
@@ -66864,7 +66849,6 @@
 	dir = 4
 	},
 /obj/effect/turf_decal/trimline/secred/warning/lower{
-	alpha = 220;
 	dir = 4
 	},
 /turf/open/floor/plasteel,
@@ -70367,7 +70351,6 @@
 /obj/machinery/requests_console{
 	department = "AI";
 	departmentType = 5;
-	pixel_x = 0;
 	pixel_y = -32
 	},
 /turf/open/floor/circuit/telecomms/server,
@@ -73781,7 +73764,6 @@
 	dir = 6
 	},
 /obj/effect/turf_decal/trimline/secred/warning/lower{
-	alpha = 220;
 	dir = 6
 	},
 /turf/open/floor/plasteel,
@@ -74127,6 +74109,9 @@
 /obj/structure/fans/tiny,
 /turf/open/floor/plating,
 /area/security/main)
+"xUS" = (
+/turf/closed/wall,
+/area/security/brig_cell)
 "xUX" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
@@ -102820,8 +102805,8 @@ agj
 mKD
 qhW
 agj
-agj
-agj
+xUS
+xUS
 aiX
 tRq
 aKE
@@ -103848,8 +103833,8 @@ lIb
 lLO
 wYv
 agj
-agj
-agj
+xUS
+xUS
 aiX
 tEI
 jmL
diff --git a/code/controllers/subsystem/research.dm b/code/controllers/subsystem/research.dm
index 21f998f831de..79170038b970 100644
--- a/code/controllers/subsystem/research.dm
+++ b/code/controllers/subsystem/research.dm
@@ -51,6 +51,7 @@ SUBSYSTEM_DEF(research)
 	point_types = TECHWEB_POINT_TYPE_LIST_ASSOCIATIVE_NAMES
 	initialize_all_techweb_designs()
 	initialize_all_techweb_nodes()
+	cache_department_designs()
 	science_tech = new /datum/techweb/science
 	ruin_tech = new /datum/techweb/ruin
 	admin_tech = new /datum/techweb/admin
@@ -282,3 +283,23 @@ SUBSYSTEM_DEF(research)
 			else
 				techweb_boost_items[path] = list(node.id = node.boost_item_paths[path])
 		CHECK_TICK
+
+/datum/controller/subsystem/research/proc/cache_department_designs()
+	for(var/node_id in techweb_nodes)
+		var/datum/techweb_node/node = techweb_node_by_id(node_id)
+		for(var/des_id in node.design_ids)
+			var/datum/design/design = techweb_design_by_id(des_id)
+			if(design.departmental_flags != ALL)
+				if(design.departmental_flags & (DEPARTMENTAL_FLAG_SECURITY | DEPARTMENTAL_FLAG_ARMORY))
+					GLOB.security_nodes[node.id] = TRUE
+				if(design.departmental_flags & DEPARTMENTAL_FLAG_MEDICAL)
+					GLOB.medical_nodes[node.id] = TRUE
+				if(design.departmental_flags & DEPARTMENTAL_FLAG_CARGO)
+					GLOB.cargo_nodes[node.id] = TRUE
+				if(design.departmental_flags & DEPARTMENTAL_FLAG_SERVICE)
+					GLOB.service_nodes[node.id] = TRUE
+				if(design.departmental_flags & DEPARTMENTAL_FLAG_SCIENCE)
+					GLOB.science_nodes[node.id] = TRUE
+				if(design.departmental_flags & DEPARTMENTAL_FLAG_ENGINEERING)
+					GLOB.engineering_nodes[node.id] = TRUE
+		CHECK_TICK
diff --git a/code/game/area/Space_Station_13_areas.dm b/code/game/area/Space_Station_13_areas.dm
index 557472601dc3..6bae12bc08dd 100644
--- a/code/game/area/Space_Station_13_areas.dm
+++ b/code/game/area/Space_Station_13_areas.dm
@@ -918,6 +918,20 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 	minimap_color = "#530505"
 	lights_always_start_on = TRUE
 
+/area/security/prison/New()
+	. = ..()
+	GLOB.perma_prison_areas |= src
+
+/area/security/brig_cell
+	name = "Brig Cell"
+	icon_state = "sec_prison"
+	minimap_color = "#530505"
+	lights_always_start_on = TRUE
+
+/area/security/brig_cell/New()
+	. = ..()
+	GLOB.brig_cell_areas |= src
+
 /area/security/prison/hallway
 	name = "Prison Wing Hallway"
 
@@ -1289,7 +1303,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 	ambience_index = AMBIENCE_DANGER
 	minimap_color = "#4f4e3a"
 	airlock_wires = /datum/wires/airlock/ai
- 
+
 /area/ai_monitored/secondarydatacore
 	name = "AI Secondary Datacore Monitoring"
 	icon_state =  "ai"
diff --git a/code/game/machinery/doors/brigdoors.dm b/code/game/machinery/doors/brigdoors.dm
index fe12396a1ff7..ce5d18068abc 100644
--- a/code/game/machinery/doors/brigdoors.dm
+++ b/code/game/machinery/doors/brigdoors.dm
@@ -81,12 +81,8 @@
 
 /obj/machinery/door_timer/Initialize(mapload)
 	. = ..()
-
 	Radio = new/obj/item/radio(src)
 	Radio.listening = 0
-
-/obj/machinery/door_timer/Initialize(mapload)
-	. = ..()
 	if(id != null)
 		for(var/obj/machinery/door/window/brigdoor/M in urange(20, src))
 			if (M.id == id)
@@ -104,6 +100,11 @@
 		atom_break()
 	update_appearance(UPDATE_ICON)
 
+/obj/machinery/door_timer/Destroy(force)
+	. = ..()
+	if(timing)
+		timer_end(forced = TRUE)
+
 /obj/machinery/door_timer/attackby(obj/item/W, mob/user, params)
 	var/obj/item/card/id/card = W.GetID()
 	if (card)
@@ -132,6 +133,7 @@
 
 	activation_time = world.time
 	timing = TRUE
+	GLOB.active_door_timers |= src
 
 	for(var/obj/machinery/door/window/brigdoor/door in targets)
 		if(door.density)
@@ -157,7 +159,7 @@
 			playsound(loc, 'sound/machines/ping.ogg', 50, 1)
 		else if(!desired_name)
 			say("No prisoner name inputted, security record not updated.")
-			
+
 	return 1
 
 
@@ -170,6 +172,7 @@
 		Radio.talk_into(src, "Timer has expired. Releasing prisoner.", FREQ_SECURITY)
 
 	timing = FALSE
+	GLOB.active_door_timers -= src
 	activation_time = null
 	set_timer(0)
 	update_appearance(UPDATE_ICON)
diff --git a/code/game/objects/items/circuitboards/computer_circuitboards.dm b/code/game/objects/items/circuitboards/computer_circuitboards.dm
index 3f1f019a59f9..362e4a31e1c3 100644
--- a/code/game/objects/items/circuitboards/computer_circuitboards.dm
+++ b/code/game/objects/items/circuitboards/computer_circuitboards.dm
@@ -176,6 +176,16 @@
 
 //Generic
 
+/obj/item/circuitboard/computer/department_reward
+	name = "Departmental Research Console (Computer Board)"
+	greyscale_colors = CIRCUIT_COLOR_GENERIC
+	build_path = /obj/machinery/computer/department_reward
+
+/obj/item/circuitboard/computer/department_reward/security
+	name = "Departmental Research Console (Security) (Computer Board)"
+	greyscale_colors = CIRCUIT_COLOR_SECURITY
+	build_path = /obj/machinery/computer/department_reward/security
+
 /obj/item/circuitboard/computer/arcade/amputation
 	name = "Mediborg's Amputation Adventure (Computer Board)"
 	greyscale_colors = CIRCUIT_COLOR_GENERIC
@@ -354,7 +364,7 @@
 /obj/item/circuitboard/computer/rdconsole/production
 	name = "R&D Console Production Only (Computer Board)"
 	build_path = /obj/machinery/computer/rdconsole/production
-	
+
 /obj/item/circuitboard/computer/rdconsole/multitool_act(mob/living/user, obj/item/I)
 	. = ..()
 	user.visible_message(span_notice("[user] fiddles with [src]."), span_notice( "You fiddle with [src]."))
@@ -397,8 +407,8 @@
 		return TRUE
 	if(I.use_tool(src, user, 2 SECONDS, volume = 75))
 		unlocked = FALSE
-		to_chat(user, span_notice("You melt the solder back into place, restoring the connections in the traces."))	
-	
+		to_chat(user, span_notice("You melt the solder back into place, restoring the connections in the traces."))
+
 
 /obj/item/circuitboard/computer/rdservercontrol
 	name = "R&D Server Control (Computer Board)"
@@ -423,7 +433,7 @@
 /obj/item/circuitboard/computer/xenobiology/syndicateicemoon
 	name = "Syndicate Xenobiology Console (Computer Board)"
 	build_path = /obj/machinery/computer/camera_advanced/xenobio/syndicateicemoon
-	
+
 /obj/item/circuitboard/computer/shuttle/flight_control
 	name = "Shuttle Flight Control (Computer Board)"
 	build_path = /obj/machinery/computer/custom_shuttle
@@ -520,7 +530,7 @@
 	obj_flags |= EMAGGED
 	to_chat(user, span_notice("You adjust [src]'s routing and receiver spectrum, unlocking special supplies and contraband."))
 	return TRUE
-	
+
 /obj/item/circuitboard/computer/cargo/express
 	name = "Express Supply Console (Computer Board)"
 	build_path = /obj/machinery/computer/cargo/express
diff --git a/code/modules/research/reward_system/_reward_system.dm b/code/modules/research/reward_system/_reward_system.dm
new file mode 100644
index 000000000000..1cfb918ef54f
--- /dev/null
+++ b/code/modules/research/reward_system/_reward_system.dm
@@ -0,0 +1,106 @@
+// Filled out in code/modules/research/techweb/_techweb_node.dm Initialize()
+// Lists of IDs (strings) which can be accessed via SSresearch.techweb_node_by_id(id)
+// Assoc list, id = TRUE
+GLOBAL_LIST_EMPTY(security_nodes)
+GLOBAL_LIST_EMPTY(medical_nodes)
+GLOBAL_LIST_EMPTY(cargo_nodes)
+GLOBAL_LIST_EMPTY(service_nodes)
+GLOBAL_LIST_EMPTY(science_nodes)
+GLOBAL_LIST_EMPTY(engineering_nodes)
+// A reward system framework for crew: By doing their jobs, they get to progress towards research nodes for their department
+// Must be implemented very carefully to avoid exploitation, it should be very boring or annoying to try and exploit it at least
+/obj/machinery/computer/department_reward
+	name = "departmental research console (ERROR)"
+	desc = "A primitive version of the famous R&D console used to unlock department-relevant research."
+	icon_screen = "rdcomp"
+	icon_keyboard = "rd_key"
+	circuit = /obj/item/circuitboard/computer/department_reward
+	light_color = LIGHT_COLOR_BLUE
+	var/datum/techweb/linked_techweb
+	var/list/nodes_available = null // pass by reference, not .Copy()
+	var/points = 0
+	var/department_display = "ERROR"
+
+/obj/machinery/computer/department_reward/Initialize(mapload)
+	. = ..()
+	linked_techweb = SSresearch.science_tech
+
+/obj/machinery/computer/department_reward/proc/check_reward(delta_time)
+	return 0
+
+/obj/machinery/computer/department_reward/process(delta_time)
+	if(!is_operational())
+		return
+	points += check_reward(delta_time)
+
+/obj/machinery/computer/department_reward/ui_interact(mob/user, datum/tgui/ui)
+	if(!is_operational())
+		return FALSE
+	ui = SStgui.try_update_ui(user, src, ui)
+	if(!ui)
+		ui = new(user, src, "DepartmentReward", name)
+		ui.open()
+
+/obj/machinery/computer/department_reward/ui_assets(mob/user)
+	return list(
+		get_asset_datum(/datum/asset/spritesheet/research_designs),
+	)
+
+/obj/machinery/computer/department_reward/ui_data(mob/user)
+	var/list/data = list()
+	data["points"] = points
+	data["department"] = department_display
+	data["nodes"] = list()
+	if(nodes_available)
+		for(var/node_id in nodes_available)
+			if(!nodes_available[node_id])
+				continue
+			if(linked_techweb.researched_nodes[node_id])
+				continue
+			if(!linked_techweb.available_nodes[node_id])
+				continue
+			var/datum/techweb_node/node = SSresearch.techweb_node_by_id(node_id)
+			var/node_price = node.get_price(linked_techweb)[TECHWEB_POINT_TYPE_GENERIC]
+			if(!node_price)
+				continue
+			var/node_entry = list()
+			node_entry["name"] = node.display_name
+			node_entry["id"] = node_id
+			node_entry["purchasable"] = node_price <= points
+			node_entry["price"] = node_price
+			node_entry["designs"] = list()
+			var/design_count = 0
+			for(var/design_id in node.design_ids)
+				design_count++
+				if(design_count <= 14)
+					node_entry["designs"] |= design_id
+			data["nodes"] += list(node_entry)
+	return data
+
+/obj/machinery/computer/department_reward/ui_act(action, params)
+	if(..())
+		return
+
+	if(!is_operational())
+		return
+
+	switch(action)
+		if("purchase")
+			var/node_id = params["node_id"]
+			if(!(nodes_available[node_id]))
+				return
+			if(linked_techweb.researched_nodes[node_id])
+				return
+			if(!linked_techweb.available_nodes[node_id])
+				return
+			var/datum/techweb_node/node = SSresearch.techweb_node_by_id(node_id)
+			var/node_price = node.get_price(linked_techweb)[TECHWEB_POINT_TYPE_GENERIC]
+			if(!node_price)
+				return
+			if(node_price > points)
+				return
+			if(!linked_techweb.research_node_id(node_id, TRUE, FALSE))
+				return
+			points -= node_price
+			say("Researched [node.display_name]!")
+			return TRUE
diff --git a/code/modules/research/reward_system/security.dm b/code/modules/research/reward_system/security.dm
new file mode 100644
index 000000000000..740aa2691944
--- /dev/null
+++ b/code/modules/research/reward_system/security.dm
@@ -0,0 +1,46 @@
+GLOBAL_LIST_EMPTY(active_door_timers)
+GLOBAL_LIST_EMPTY(brig_cell_areas)
+GLOBAL_LIST_EMPTY(perma_prison_areas)
+
+/obj/machinery/computer/department_reward/security
+	name = "departmental research console (Security)"
+	desc = "A primitive version of the famous R&D console used to unlock department-relevant research. This one is powered by incarcerated criminals."
+	department_display = "Security"
+	circuit = /obj/item/circuitboard/computer/department_reward/security
+
+/obj/machinery/computer/department_reward/security/Initialize(mapload)
+	nodes_available = GLOB.security_nodes
+	. = ..()
+
+/obj/machinery/computer/department_reward/security/check_reward(delta_time)
+	. = 0
+
+	// Criminals in brig cells with an active timer
+	var/list/criminal_names = list()
+	for(var/obj/machinery/door_timer/timer in GLOB.active_door_timers)
+		if(!timer.desired_name)
+			continue
+		criminal_names += timer.desired_name
+
+	for(var/area/security/brig_cell/cell_area in GLOB.brig_cell_areas)
+		for(var/mob/living/carbon/human/guy in cell_area)
+			if(!(guy.real_name in criminal_names))
+				continue
+			if(guy.stat != CONSCIOUS)
+				continue
+			if(!guy.mind || !(guy.mind.assigned_role in GLOB.crew_positions))
+				continue
+			criminal_names -= guy.real_name
+			. += delta_time * 2.1 // 126 points per minute of captured criminal
+		CHECK_TICK
+
+	// Perma prisoners with no access
+	for(var/area/security/prison/perma in GLOB.perma_prison_areas)
+		var/list/permad_humans = perma.get_all_contents_type(/mob/living/carbon/human)
+		for(var/mob/living/carbon/human/guy as anything in permad_humans)
+			var/obj/item/idcard = guy.get_idcard()
+			var/access = idcard?.GetAccess()
+			if(access == null || length(access) == 0 && guy.stat == CONSCIOUS && (guy.mind?.assigned_role in GLOB.crew_positions))
+				. += delta_time * 2.1 // 126 points per minute of captured criminal
+			CHECK_TICK
+
diff --git a/code/modules/research/techweb/_techweb_node.dm b/code/modules/research/techweb/_techweb_node.dm
index 5bf1cff4a57c..8b528fc12114 100644
--- a/code/modules/research/techweb/_techweb_node.dm
+++ b/code/modules/research/techweb/_techweb_node.dm
@@ -1,4 +1,3 @@
-
 //Techweb nodes are GLOBAL, there should only be one instance of them in the game. Persistant changes should never be made to them in-game.
 //USE SSRESEARCH PROCS TO OBTAIN REFERENCES. DO NOT REFERENCE OUTSIDE OF SSRESEARCH OR YOU WILL FUCK UP GC.
 
@@ -25,12 +24,12 @@
 
 /datum/techweb_node/proc/Initialize()
 	//Make lists associative for lookup
-	for(var/id in prereq_ids)
-		prereq_ids[id] = TRUE
-	for(var/id in design_ids)
-		design_ids[id] = TRUE
-	for(var/id in unlock_ids)
-		unlock_ids[id] = TRUE
+	for(var/pre_id in prereq_ids)
+		prereq_ids[pre_id] = TRUE
+	for(var/des_id in design_ids)
+		design_ids[des_id] = TRUE
+	for(var/unl_id in unlock_ids)
+		unlock_ids[unl_id] = TRUE
 
 /datum/techweb_node/Destroy()
 	SSresearch.techweb_nodes -= id
diff --git a/tgui/packages/tgui/interfaces/DepartmentReward.tsx b/tgui/packages/tgui/interfaces/DepartmentReward.tsx
new file mode 100644
index 000000000000..55c318437dff
--- /dev/null
+++ b/tgui/packages/tgui/interfaces/DepartmentReward.tsx
@@ -0,0 +1,74 @@
+import { useBackend } from '../backend';
+import { Button, Box, Icon, Stack, Section } from '../components';
+import { Window } from '../layouts';
+import { classes } from '../../common/react';
+
+type ResearchNode = {
+  name: string;
+  id: string;
+  purchasable: boolean;
+  price: number;
+  designs: string[];
+}
+
+type DepartmentRewardData = {
+  points: number;
+  department: string;
+  nodes: ResearchNode[];
+};
+
+export const DepartmentReward = (props, context) => {
+  const { data } = useBackend<DepartmentRewardData>(context);
+  const {
+    points,
+    department,
+    nodes = [],
+  } = data;
+  const { act } = useBackend(context);
+  return (
+    <Window width={500} height={485}>
+      <Window.Content scrollable>
+        <Section title={department+' Research Console | '+points+' points'}>
+          <Stack vertical>
+            {nodes.map((node, index) =>
+              (<Stack.Item
+                fontSize={1}
+                height={7}
+                fill
+                backgroundColor='grey'
+                key={'node'+index}>
+                <Stack fill vertical>
+                  <Stack.Item>
+                    <Box px={0.4} fill bold>
+                      {node.name}
+                    </Box>
+                  </Stack.Item>
+                  <Stack.Item grow align='center'>
+                    {node.designs.map((design, mindex) =>
+                        (<span
+                          key={'design'+mindex}
+                          className={classes(['design32x32', design])}
+                          style={{
+                            'vertical-align': 'middle',
+                          }} />)
+                      )}
+                  </Stack.Item>
+                  <Stack.Item align='end'>
+                    <Box px={0.6} fill textAlign='right'>
+                    <Button
+                      content={"Purchase ["+node.price+"]"}
+                      disabled={!node.purchasable}
+                      onClick={() => act('purchase', {
+                        node_id: node.id,
+                      })} />
+                    </Box>
+                  </Stack.Item>
+                </Stack>
+               </Stack.Item>)
+            )}
+          </Stack>
+        </Section>
+      </Window.Content>
+    </Window>
+  );
+};
diff --git a/yogstation.dme b/yogstation.dme
index 5e5f401d1c98..48600b7cedcc 100644
--- a/yogstation.dme
+++ b/yogstation.dme
@@ -3639,6 +3639,8 @@
 #include "code\modules\research\nanites\nanite_programs\suppression.dm"
 #include "code\modules\research\nanites\nanite_programs\utility.dm"
 #include "code\modules\research\nanites\nanite_programs\weapon.dm"
+#include "code\modules\research\reward_system\_reward_system.dm"
+#include "code\modules\research\reward_system\security.dm"
 #include "code\modules\research\techweb\__techweb_helpers.dm"
 #include "code\modules\research\techweb\_techweb.dm"
 #include "code\modules\research\techweb\_techweb_node.dm"