diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm
index 8a019035b3a..5ddef4b8fb1 100644
--- a/_maps/map_files/Deltastation/DeltaStation2.dmm
+++ b/_maps/map_files/Deltastation/DeltaStation2.dmm
@@ -10325,14 +10325,14 @@
 /turf/open/floor/plasteel,
 /area/engine/atmospherics_engine)
 "axv" = (
-/obj/machinery/door/poddoor/shutters/preopen{
-	id = "engsm";
-	name = "Radiation Chamber Shutters"
-	},
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/obj/machinery/door/poddoor/shutters/radiation/preopen{
+	id = "engsm";
+	name = "Radiation Chamber Shutters"
+	},
 /turf/open/floor/plating,
 /area/engine/supermatter)
 "axw" = (
@@ -10384,13 +10384,13 @@
 /turf/open/floor/engine,
 /area/engine/supermatter)
 "axD" = (
-/obj/machinery/door/poddoor/shutters/preopen{
-	id = "engsm";
-	name = "Radiation Chamber Shutters"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/obj/machinery/door/poddoor/shutters/radiation/preopen{
+	id = "engsm";
+	name = "Radiation Chamber Shutters"
+	},
 /turf/open/floor/plating,
 /area/engine/supermatter)
 "axF" = (
@@ -11056,15 +11056,15 @@
 /turf/open/floor/engine,
 /area/engine/supermatter)
 "ayM" = (
-/obj/machinery/door/poddoor/shutters/preopen{
-	id = "engsm";
-	name = "Radiation Chamber Shutters"
-	},
 /obj/effect/decal/cleanable/oil,
 /obj/structure/cable,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/obj/machinery/door/poddoor/shutters/radiation/preopen{
+	id = "engsm";
+	name = "Radiation Chamber Shutters"
+	},
 /turf/open/floor/plating,
 /area/engine/supermatter)
 "ayO" = (
@@ -11586,13 +11586,13 @@
 /turf/open/floor/plasteel,
 /area/engine/atmospherics_engine)
 "azS" = (
-/obj/machinery/door/poddoor/shutters/preopen{
-	id = "engsm";
-	name = "Radiation Chamber Shutters"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/obj/machinery/door/poddoor/shutters/radiation/preopen{
+	id = "engsm";
+	name = "Radiation Chamber Shutters"
+	},
 /turf/open/floor/plating,
 /area/engine/supermatter)
 "azT" = (
@@ -111427,15 +111427,15 @@
 	},
 /area/security/prison)
 "nZm" = (
-/obj/machinery/door/poddoor/shutters/preopen{
-	id = "engsm";
-	name = "Radiation Chamber Shutters"
-	},
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/obj/machinery/door/poddoor/shutters/radiation/preopen{
+	id = "engsm";
+	name = "Radiation Chamber Shutters"
+	},
 /turf/open/floor/plating,
 /area/engine/supermatter)
 "oaQ" = (
diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm
index bef506edb28..9cbdff83c9c 100644
--- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm
+++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm
@@ -5132,13 +5132,13 @@
 /turf/open/floor/plasteel,
 /area/security/prison)
 "akQ" = (
-/obj/machinery/door/poddoor/shutters/preopen{
-	id = "engsm";
-	name = "Radiation Chamber Shutters"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/obj/machinery/door/poddoor/shutters/radiation/preopen{
+	id = "engsm";
+	name = "Radiation Chamber Shutters"
+	},
 /turf/open/floor/plating,
 /area/engine/supermatter)
 "akR" = (
@@ -32142,7 +32142,6 @@
 "bxi" = (
 /obj/machinery/portable_atmospherics/canister/oxygen,
 /obj/item/radio/intercom{
-	pixel_x = 0;
 	pixel_y = 29
 	},
 /obj/effect/turf_decal/bot,
@@ -48390,14 +48389,14 @@
 /turf/open/floor/engine,
 /area/engine/engineering)
 "cEt" = (
-/obj/machinery/door/poddoor/shutters/preopen{
-	id = "engsm";
-	name = "Radiation Chamber Shutters"
-	},
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/obj/machinery/door/poddoor/shutters/radiation/preopen{
+	id = "engsm";
+	name = "Radiation Chamber Shutters"
+	},
 /turf/open/floor/plating,
 /area/engine/supermatter)
 "cEu" = (
@@ -48447,14 +48446,14 @@
 /turf/open/floor/engine,
 /area/engine/supermatter)
 "cEA" = (
-/obj/machinery/door/poddoor/shutters/preopen{
-	id = "engsm";
-	name = "Radiation Chamber Shutters"
-	},
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/obj/machinery/door/poddoor/shutters/radiation/preopen{
+	id = "engsm";
+	name = "Radiation Chamber Shutters"
+	},
 /turf/open/floor/plating,
 /area/engine/supermatter)
 "cEB" = (
@@ -48487,29 +48486,29 @@
 /turf/open/floor/engine,
 /area/engine/engineering)
 "cEM" = (
-/obj/machinery/door/poddoor/shutters/preopen{
-	id = "engsm";
-	name = "Radiation Chamber Shutters"
-	},
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
 /obj/item/tank/internals/plasma,
 /obj/structure/cable,
-/turf/open/floor/plating,
-/area/engine/supermatter)
-"cET" = (
-/obj/machinery/door/poddoor/shutters/preopen{
+/obj/machinery/door/poddoor/shutters/radiation/preopen{
 	id = "engsm";
 	name = "Radiation Chamber Shutters"
 	},
+/turf/open/floor/plating,
+/area/engine/supermatter)
+"cET" = (
 /obj/effect/decal/cleanable/oil,
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
 /obj/structure/cable,
+/obj/machinery/door/poddoor/shutters/radiation/preopen{
+	id = "engsm";
+	name = "Radiation Chamber Shutters"
+	},
 /turf/open/floor/plating,
 /area/engine/supermatter)
 "cEW" = (
@@ -48570,13 +48569,13 @@
 	},
 /area/science/research)
 "cFj" = (
-/obj/machinery/door/poddoor/shutters/preopen{
-	id = "engsm";
-	name = "Radiation Chamber Shutters"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/obj/machinery/door/poddoor/shutters/radiation/preopen{
+	id = "engsm";
+	name = "Radiation Chamber Shutters"
+	},
 /turf/open/floor/plating,
 /area/engine/supermatter)
 "cFk" = (
@@ -51717,8 +51716,6 @@
 /area/science/genetics)
 "jzb" = (
 /obj/structure/extinguisher_cabinet{
-	dir = 2;
-	pixel_x = 0;
 	pixel_y = -28
 	},
 /obj/machinery/portable_atmospherics/canister/carbon_dioxide,
@@ -53060,7 +53057,6 @@
 	areastring = "/area/crew_quarters/heads/hor";
 	dir = 1;
 	name = "RD Office APC";
-	pixel_x = 0;
 	pixel_y = 25
 	},
 /obj/structure/cable,
diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm
index 3f1e005e516..0c75608aef5 100644
--- a/_maps/map_files/MetaStation/MetaStation.dmm
+++ b/_maps/map_files/MetaStation/MetaStation.dmm
@@ -3769,7 +3769,6 @@
 /obj/structure/chair/stool,
 /obj/machinery/camera{
 	c_tag = "Prison Visitation";
-	dir = 2;
 	network = list("ss13","prison")
 	},
 /obj/effect/turf_decal/trimline/red/warning{
@@ -7923,10 +7922,6 @@
 /turf/open/floor/plasteel,
 /area/security/brig)
 "arb" = (
-/obj/machinery/door/poddoor/shutters{
-	id = "armory";
-	name = "armory shutters"
-	},
 /obj/effect/turf_decal/tile/neutral{
 	dir = 1
 	},
@@ -7937,6 +7932,10 @@
 /obj/effect/turf_decal/tile/neutral{
 	dir = 8
 	},
+/obj/machinery/door/poddoor/shutters/window{
+	id = "armory";
+	name = "armory shutters"
+	},
 /turf/open/floor/plasteel/dark,
 /area/ai_monitored/security/armory)
 "arf" = (
@@ -63400,7 +63399,7 @@
 /turf/open/space,
 /area/science/xenobiology)
 "djt" = (
-/obj/machinery/door/poddoor/shutters/preopen{
+/obj/machinery/door/poddoor/shutters/radiation/preopen{
 	id = "engsm";
 	name = "Radiation Chamber Shutters"
 	},
@@ -63408,11 +63407,11 @@
 /area/engine/supermatter)
 "djx" = (
 /obj/item/crowbar,
-/obj/machinery/door/poddoor/shutters/preopen{
+/obj/structure/cable,
+/obj/machinery/door/poddoor/shutters/radiation/preopen{
 	id = "engsm";
 	name = "Radiation Chamber Shutters"
 	},
-/obj/structure/cable,
 /turf/open/floor/plating,
 /area/engine/supermatter)
 "djz" = (
@@ -68036,11 +68035,11 @@
 /turf/open/floor/plasteel,
 /area/hydroponics)
 "hWp" = (
-/obj/machinery/door/poddoor/shutters/preopen{
+/obj/structure/cable,
+/obj/machinery/door/poddoor/shutters/radiation/preopen{
 	id = "engsm";
 	name = "Radiation Chamber Shutters"
 	},
-/obj/structure/cable,
 /turf/open/floor/plating,
 /area/engine/supermatter)
 "hWR" = (
@@ -69881,7 +69880,6 @@
 /obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/engineering/glass{
 	name = "Supermatter Engine Room";
-	req_access_txt = "0";
 	req_one_access_txt = "10;24"
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm
index 3bd4edd9eb8..5abae440de7 100644
--- a/_maps/map_files/PubbyStation/PubbyStation.dmm
+++ b/_maps/map_files/PubbyStation/PubbyStation.dmm
@@ -14672,7 +14672,6 @@
 "aMd" = (
 /obj/structure/table,
 /obj/machinery/microwave{
-	pixel_x = 0;
 	pixel_y = 6
 	},
 /obj/machinery/light{
@@ -51932,12 +51931,12 @@
 /turf/open/floor/plasteel/white,
 /area/science/explab)
 "lBJ" = (
-/obj/machinery/door/poddoor/shutters/preopen{
-	id = "Supermatter";
-	name = "supermatter shielding"
-	},
 /obj/item/wrench,
 /obj/structure/cable,
+/obj/machinery/door/poddoor/shutters/radiation/preopen{
+	id = "supermatter";
+	name = "supermatter shielding"
+	},
 /turf/open/floor/plating,
 /area/engine/supermatter)
 "lBP" = (
@@ -52837,11 +52836,11 @@
 /turf/open/floor/plating,
 /area/maintenance/disposal)
 "nmp" = (
-/obj/machinery/door/poddoor/shutters/preopen{
-	id = "Supermatter";
+/obj/structure/cable,
+/obj/machinery/door/poddoor/shutters/radiation/preopen{
+	id = "supermatter";
 	name = "supermatter shielding"
 	},
-/obj/structure/cable,
 /turf/open/floor/plating,
 /area/engine/supermatter)
 "nnf" = (
@@ -53812,11 +53811,11 @@
 	},
 /area/maintenance/department/science)
 "oEN" = (
-/obj/machinery/door/poddoor/shutters/preopen{
-	id = "Supermatter";
+/obj/effect/landmark/event_spawn,
+/obj/machinery/door/poddoor/shutters/radiation/preopen{
+	id = "supermatter";
 	name = "supermatter shielding"
 	},
-/obj/effect/landmark/event_spawn,
 /turf/open/floor/plating,
 /area/engine/supermatter)
 "oEW" = (
@@ -54931,9 +54930,7 @@
 /turf/open/floor/plating,
 /area/maintenance/department/science)
 "qJB" = (
-/obj/machinery/atmospherics/components/unary/thermomachine/heater{
-	dir = 2
-	},
+/obj/machinery/atmospherics/components/unary/thermomachine/heater,
 /turf/open/floor/plating{
 	icon_state = "panelscorched"
 	},
@@ -56249,8 +56246,8 @@
 /turf/open/floor/plasteel,
 /area/science/xenobiology)
 "tbC" = (
-/obj/machinery/door/poddoor/shutters/preopen{
-	id = "Supermatter";
+/obj/machinery/door/poddoor/shutters/radiation/preopen{
+	id = "supermatter";
 	name = "supermatter shielding"
 	},
 /turf/open/floor/plating,
diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm
index 7ee63458cb8..8576c7a3fe4 100644
--- a/_maps/map_files/generic/CentCom.dmm
+++ b/_maps/map_files/generic/CentCom.dmm
@@ -1162,9 +1162,6 @@
 "dm" = (
 /turf/open/floor/holofloor/plating,
 /area/holodeck/rec_center/refuel)
-"dn" = (
-/turf/open/floor/holofloor/plating,
-/area/holodeck/rec_center/spacechess)
 "do" = (
 /obj/effect/turf_decal/tile/green,
 /obj/effect/turf_decal/tile/green{
@@ -1313,19 +1310,11 @@
 /turf/open/floor/holofloor/plating,
 /area/holodeck/rec_center/refuel)
 "dH" = (
-/obj/item/cardboard_cutout/adaptive{
-	color = "#9999BB";
-	icon_state = "cutout_viva";
-	name = "Black Rook"
-	},
+/obj/structure/chess/whiterook,
 /turf/open/floor/holofloor/dark,
 /area/holodeck/rec_center/spacechess)
 "dK" = (
-/obj/item/cardboard_cutout/adaptive{
-	color = "#9999BB";
-	icon_state = "cutout_ian";
-	name = "Black Knight"
-	},
+/obj/structure/chess/whiteknight,
 /turf/open/floor/holofloor{
 	icon_state = "white"
 	},
@@ -1439,21 +1428,13 @@
 	},
 /area/holodeck/rec_center/firingrange)
 "ed" = (
-/obj/item/cardboard_cutout/adaptive{
-	color = "#9999BB";
-	icon_state = "cutout_greytide";
-	name = "Black Pawn"
-	},
+/obj/structure/chess/whitepawn,
 /turf/open/floor/holofloor{
 	icon_state = "white"
 	},
 /area/holodeck/rec_center/spacechess)
 "ee" = (
-/obj/item/cardboard_cutout/adaptive{
-	color = "#9999BB";
-	icon_state = "cutout_greytide";
-	name = "Black Pawn"
-	},
+/obj/structure/chess/whitepawn,
 /turf/open/floor/holofloor/dark,
 /area/holodeck/rec_center/spacechess)
 "ef" = (
@@ -1697,17 +1678,11 @@
 /turf/open/floor/holofloor/plating,
 /area/holodeck/rec_center/kobayashi)
 "eW" = (
-/obj/item/cardboard_cutout/adaptive{
-	icon_state = "cutout_greytide";
-	name = "White Pawn"
-	},
+/obj/structure/chess/blackpawn,
 /turf/open/floor/holofloor/dark,
 /area/holodeck/rec_center/spacechess)
 "eX" = (
-/obj/item/cardboard_cutout/adaptive{
-	icon_state = "cutout_greytide";
-	name = "White Pawn"
-	},
+/obj/structure/chess/blackpawn,
 /turf/open/floor/holofloor{
 	icon_state = "white"
 	},
@@ -1824,19 +1799,13 @@
 /turf/open/floor/holofloor,
 /area/holodeck/rec_center/firingrange)
 "fj" = (
-/obj/item/cardboard_cutout/adaptive{
-	icon_state = "cutout_viva";
-	name = "White Rook"
-	},
+/obj/structure/chess/blackrook,
 /turf/open/floor/holofloor{
 	icon_state = "white"
 	},
 /area/holodeck/rec_center/spacechess)
 "fm" = (
-/obj/item/cardboard_cutout/adaptive{
-	icon_state = "cutout_ian";
-	name = "White Knight"
-	},
+/obj/structure/chess/blackknight,
 /turf/open/floor/holofloor/dark,
 /area/holodeck/rec_center/spacechess)
 "fn" = (
@@ -9526,10 +9495,7 @@
 /turf/open/floor/holofloor,
 /area/holodeck/rec_center/basketball)
 "vp" = (
-/obj/item/cardboard_cutout/adaptive{
-	icon_state = "cutout_ntsec";
-	name = "White Bishop"
-	},
+/obj/structure/chess/blackbishop,
 /turf/open/floor/holofloor{
 	icon_state = "white"
 	},
@@ -13145,11 +13111,7 @@
 	},
 /area/holodeck/rec_center/medical)
 "Dk" = (
-/obj/item/cardboard_cutout/adaptive{
-	color = "#9999BB";
-	icon_state = "cutout_ntsec";
-	name = "Black Bishop"
-	},
+/obj/structure/chess/whitebishop,
 /turf/open/floor/holofloor{
 	icon_state = "white"
 	},
@@ -14935,11 +14897,7 @@
 /turf/open/floor/plasteel/white,
 /area/tdome/tdomeobserve)
 "Hk" = (
-/obj/item/cardboard_cutout/adaptive{
-	color = "#9999BB";
-	icon_state = "cutout_viva";
-	name = "Black Rook"
-	},
+/obj/structure/chess/whiterook,
 /turf/open/floor/holofloor{
 	icon_state = "white"
 	},
@@ -17616,11 +17574,7 @@
 /turf/open/floor/plasteel,
 /area/centcom/control)
 "Oo" = (
-/obj/item/cardboard_cutout/adaptive{
-	color = "#9999BB";
-	icon_state = "cutout_ntsec";
-	name = "Black Bishop"
-	},
+/obj/structure/chess/whitebishop,
 /turf/open/floor/holofloor/dark,
 /area/holodeck/rec_center/spacechess)
 "Op" = (
@@ -17647,11 +17601,7 @@
 /turf/open/floor/plasteel,
 /area/centcom/supplypod/loading/two)
 "Ou" = (
-/obj/item/cardboard_cutout/adaptive{
-	color = "#9999BB";
-	icon_state = "cutout_ian";
-	name = "Black Knight"
-	},
+/obj/structure/chess/whiteknight,
 /turf/open/floor/holofloor/dark,
 /area/holodeck/rec_center/spacechess)
 "OA" = (
@@ -18344,10 +18294,7 @@
 /turf/open/floor/plating/abductor,
 /area/abductor_ship)
 "RR" = (
-/obj/item/cardboard_cutout/adaptive{
-	icon_state = "cutout_ntsec";
-	name = "White Bishop"
-	},
+/obj/structure/chess/blackbishop,
 /turf/open/floor/holofloor/dark,
 /area/holodeck/rec_center/spacechess)
 "RS" = (
@@ -18375,8 +18322,7 @@
 /area/holodeck/rec_center/spacecheckers)
 "Sb" = (
 /obj/vehicle/ridden/scooter/skateboard/pro/holodeck{
-	dir = 8;
-	icon_state = "skateboard2"
+	dir = 8
 	},
 /turf/open/floor/holofloor/plating,
 /area/holodeck/rec_center/skatepark)
@@ -18648,11 +18594,7 @@
 /turf/open/floor/holofloor/carpet,
 /area/holodeck/rec_center/lounge)
 "TM" = (
-/obj/item/cardboard_cutout/adaptive{
-	color = "#9999BB";
-	icon_state = "cutout_clown";
-	name = "Black King"
-	},
+/obj/structure/chess/whitequeen,
 /turf/open/floor/holofloor{
 	icon_state = "white"
 	},
@@ -18675,10 +18617,7 @@
 	},
 /area/holodeck/rec_center/medical)
 "TP" = (
-/obj/item/cardboard_cutout/adaptive{
-	icon_state = "cutout_mime";
-	name = "White Queen"
-	},
+/obj/structure/chess/blackking,
 /turf/open/floor/holofloor{
 	icon_state = "white"
 	},
@@ -18825,10 +18764,7 @@
 	},
 /area/holodeck/rec_center/medical)
 "Ul" = (
-/obj/item/cardboard_cutout/adaptive{
-	icon_state = "cutout_viva";
-	name = "White Rook"
-	},
+/obj/structure/chess/blackrook,
 /turf/open/floor/holofloor/dark,
 /area/holodeck/rec_center/spacechess)
 "Um" = (
@@ -19031,11 +18967,7 @@
 /turf/open/floor/holofloor/carpet,
 /area/holodeck/rec_center/lounge)
 "VK" = (
-/obj/item/cardboard_cutout/adaptive{
-	color = "#9999BB";
-	icon_state = "cutout_mime";
-	name = "Black Queen"
-	},
+/obj/structure/chess/whiteking,
 /turf/open/floor/holofloor/dark,
 /area/holodeck/rec_center/spacechess)
 "VP" = (
@@ -19132,10 +19064,7 @@
 /turf/open/floor/plasteel,
 /area/centcom/supplypod/loading/four)
 "Wu" = (
-/obj/item/cardboard_cutout/adaptive{
-	icon_state = "cutout_clown";
-	name = "White King"
-	},
+/obj/structure/chess/blackqueen,
 /turf/open/floor/holofloor/dark,
 /area/holodeck/rec_center/spacechess)
 "Wy" = (
@@ -19407,10 +19336,7 @@
 /turf/open/floor/wood,
 /area/centcom/holding)
 "Yi" = (
-/obj/item/cardboard_cutout/adaptive{
-	icon_state = "cutout_ian";
-	name = "White Knight"
-	},
+/obj/structure/chess/blackknight,
 /turf/open/floor/holofloor{
 	icon_state = "white"
 	},
@@ -19683,34 +19609,6 @@
 	},
 /turf/open/floor/wood,
 /area/centcom/holding)
-"Zt" = (
-/obj/item/cardboard_cutout/adaptive{
-	color = "#9999BB";
-	icon_state = "cutout_mime";
-	name = "Black Queen"
-	},
-/obj/item/cardboard_cutout/adaptive{
-	color = "#9999BB";
-	icon_state = "cutout_mime";
-	name = "Black Queen"
-	},
-/obj/item/cardboard_cutout/adaptive{
-	color = "#9999BB";
-	icon_state = "cutout_mime";
-	name = "Black Queen"
-	},
-/obj/item/cardboard_cutout/adaptive{
-	color = "#9999BB";
-	icon_state = "cutout_mime";
-	name = "Black Queen"
-	},
-/obj/item/cardboard_cutout/adaptive{
-	color = "#9999BB";
-	icon_state = "cutout_mime";
-	name = "Black Queen"
-	},
-/turf/open/floor/holofloor/plating,
-/area/holodeck/rec_center/spacechess)
 "Zu" = (
 /obj/structure/fluff/drake_statue,
 /turf/open/floor/plasteel/dark,
@@ -19775,27 +19673,7 @@
 /turf/open/floor/plasteel,
 /area/centcom/evac)
 "ZK" = (
-/obj/item/cardboard_cutout/adaptive{
-	icon_state = "cutout_mime";
-	name = "White Queen"
-	},
-/obj/item/cardboard_cutout/adaptive{
-	icon_state = "cutout_mime";
-	name = "White Queen"
-	},
-/obj/item/cardboard_cutout/adaptive{
-	icon_state = "cutout_mime";
-	name = "White Queen"
-	},
-/obj/item/cardboard_cutout/adaptive{
-	icon_state = "cutout_mime";
-	name = "White Queen"
-	},
-/obj/item/cardboard_cutout/adaptive{
-	icon_state = "cutout_mime";
-	name = "White Queen"
-	},
-/turf/open/floor/holofloor/plating,
+/turf/open/floor/holofloor/carpet,
 /area/holodeck/rec_center/spacechess)
 "ZN" = (
 /obj/structure/table/wood,
@@ -82828,16 +82706,16 @@ aa
 "}
 (246,1,1) = {"
 fx
-dn
-dn
-dn
-dn
-dn
-dn
-dn
-dn
-dn
-dn
+ZK
+ZK
+ZK
+ZK
+ZK
+ZK
+ZK
+ZK
+ZK
+ZK
 bj
 dm
 dm
@@ -83085,7 +82963,7 @@ aa
 "}
 (247,1,1) = {"
 fx
-dn
+ZK
 Hk
 ee
 ew
@@ -83094,7 +82972,7 @@ ew
 ev
 eX
 Ul
-dn
+ZK
 bj
 dm
 dm
@@ -83342,7 +83220,7 @@ aa
 "}
 (248,1,1) = {"
 fx
-dn
+ZK
 Ou
 ed
 ev
@@ -83351,7 +83229,7 @@ ev
 ew
 eW
 Yi
-dn
+ZK
 bj
 dm
 dm
@@ -83599,7 +83477,7 @@ aa
 "}
 (249,1,1) = {"
 fx
-dn
+ZK
 Dk
 ee
 ew
@@ -83608,7 +83486,7 @@ ew
 ev
 eX
 RR
-dn
+ZK
 bj
 dm
 dG
@@ -83856,7 +83734,7 @@ aa
 "}
 (250,1,1) = {"
 fx
-dn
+ZK
 VK
 ed
 ev
@@ -83865,7 +83743,7 @@ ev
 ew
 eW
 TP
-dn
+ZK
 bj
 dm
 dG
@@ -84113,7 +83991,7 @@ aa
 "}
 (251,1,1) = {"
 fx
-dn
+ZK
 TM
 ee
 ew
@@ -84122,7 +84000,7 @@ ew
 ev
 eX
 Wu
-dn
+ZK
 bj
 dm
 dG
@@ -84370,7 +84248,7 @@ aa
 "}
 (252,1,1) = {"
 fx
-dn
+ZK
 Oo
 ed
 ev
@@ -84379,7 +84257,7 @@ ev
 ew
 eW
 vp
-dn
+ZK
 bj
 dm
 dm
@@ -84627,7 +84505,7 @@ aa
 "}
 (253,1,1) = {"
 fx
-dn
+ZK
 dK
 ee
 ew
@@ -84636,7 +84514,7 @@ ew
 ev
 eX
 fm
-dn
+ZK
 bj
 dm
 dm
@@ -84884,7 +84762,7 @@ aa
 "}
 (254,1,1) = {"
 fx
-Zt
+ZK
 dH
 ed
 ev
diff --git a/code/game/machinery/doors/shutters.dm b/code/game/machinery/doors/shutters.dm
index 3948de91a1a..72d38710e1b 100644
--- a/code/game/machinery/doors/shutters.dm
+++ b/code/game/machinery/doors/shutters.dm
@@ -1,11 +1,13 @@
 /obj/machinery/door/poddoor/shutters
 	gender = PLURAL
 	name = "shutters"
-	desc = "Heavy duty metal shutters that open mechanically."
+	desc = "Heavy duty mechanical shutters with an atmospheric seal that keeps them airtight once closed."
 	icon = 'icons/obj/doors/shutters.dmi'
 	layer = SHUTTER_LAYER
 	closingLayer = SHUTTER_LAYER
 	damage_deflection = 20
+	armor = list("melee" = 20, "bullet" = 20, "laser" = 20, "energy" = 75, "bomb" = 25, "bio" = 100, "rad" = 100, "fire" = 100, "acid" = 70)
+	max_integrity = 100
 
 /obj/machinery/door/poddoor/shutters/preopen
 	icon_state = "open"
@@ -15,3 +17,36 @@
 /obj/machinery/door/poddoor/shutters/indestructible
 	name = "hardened shutters"
 	resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
+
+/obj/machinery/door/poddoor/shutters/radiation
+	name = "radiation shutters"
+	desc = "Lead-lined shutters with a radiation hazard symbol. Whilst this won't stop you getting irradiated, especially by a supermatter crystal, it will stop radiation travelling as far."
+	icon = 'icons/obj/doors/shutters_radiation.dmi'
+	icon_state = "closed"
+	rad_insulation = RAD_EXTREME_INSULATION
+
+/obj/machinery/door/poddoor/shutters/radiation/preopen
+	icon_state = "open"
+	density = FALSE
+	opacity = FALSE
+	rad_insulation = RAD_NO_INSULATION
+
+/obj/machinery/door/poddoor/shutters/radiation/open()
+	. = ..()
+	rad_insulation = RAD_NO_INSULATION
+
+/obj/machinery/door/poddoor/shutters/radiation/close()
+	. = ..()
+	rad_insulation = RAD_EXTREME_INSULATION
+
+/obj/machinery/door/poddoor/shutters/window
+	name = "windowed shutters"
+	desc = "A shutter with a thick see-through polycarbonate window."
+	icon = 'icons/obj/doors/shutters_window.dmi'
+	icon_state = "closed"
+	opacity = FALSE
+	glass = TRUE
+
+/obj/machinery/door/poddoor/shutters/window/preopen
+	icon_state = "open"
+	density = FALSE
diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm
index f3519270e58..6faa5b97aca 100644
--- a/code/game/objects/items/stacks/sheets/sheet_types.dm
+++ b/code/game/objects/items/stacks/sheets/sheet_types.dm
@@ -35,7 +35,27 @@ GLOBAL_LIST_INIT(metal_recipes, list ( \
 		new /datum/stack_recipe("sofa (left)", /obj/structure/chair/sofa/left, 1, one_per_turf = TRUE, on_floor = TRUE),
 		new /datum/stack_recipe("sofa (right)", /obj/structure/chair/sofa/right, 1, one_per_turf = TRUE, on_floor = TRUE),
 		new /datum/stack_recipe("sofa (corner)", /obj/structure/chair/sofa/corner, 1, one_per_turf = TRUE, on_floor = TRUE)
-		)),
+		)), \
+	new/datum/stack_recipe_list("corporate sofas", list( \
+		new /datum/stack_recipe("sofa (middle)", /obj/structure/chair/sofa/corp, one_per_turf = TRUE, on_floor = TRUE), \
+		new /datum/stack_recipe("sofa (left)", /obj/structure/chair/sofa/corp/left, one_per_turf = TRUE, on_floor = TRUE), \
+		new /datum/stack_recipe("sofa (right)", /obj/structure/chair/sofa/corp/right, one_per_turf = TRUE, on_floor = TRUE), \
+		new /datum/stack_recipe("sofa (corner)", /obj/structure/chair/sofa/corp/corner, one_per_turf = TRUE, on_floor = TRUE), \
+		)), \
+	new /datum/stack_recipe_list("chess pieces", list( \
+		new /datum/stack_recipe("White Pawn", /obj/structure/chess/whitepawn, 2, time = 1 SECONDS, one_per_turf = TRUE, on_floor = TRUE), \
+		new /datum/stack_recipe("White Rook", /obj/structure/chess/whiterook, 2, time = 1 SECONDS, one_per_turf = TRUE, on_floor = TRUE), \
+		new /datum/stack_recipe("White Knight", /obj/structure/chess/whiteknight, 2, time = 1 SECONDS, one_per_turf = TRUE, on_floor = TRUE), \
+		new /datum/stack_recipe("White Bishop", /obj/structure/chess/whitebishop, 2, time = 1 SECONDS, one_per_turf = TRUE, on_floor = TRUE), \
+		new /datum/stack_recipe("White Queen", /obj/structure/chess/whitequeen, 2, time = 1 SECONDS, one_per_turf = TRUE, on_floor = TRUE), \
+		new /datum/stack_recipe("White King", /obj/structure/chess/whiteking, 2, time = 1 SECONDS, one_per_turf = TRUE, on_floor = TRUE), \
+		new /datum/stack_recipe("Black Pawn", /obj/structure/chess/blackpawn, 2, time = 1 SECONDS, one_per_turf = TRUE, on_floor = TRUE), \
+		new /datum/stack_recipe("Black Rook", /obj/structure/chess/blackrook, 2, time = 1 SECONDS, one_per_turf = TRUE, on_floor = TRUE), \
+		new /datum/stack_recipe("Black Knight", /obj/structure/chess/blackknight, 2, time = 1 SECONDS, one_per_turf = TRUE, on_floor = TRUE), \
+		new /datum/stack_recipe("Black Bishop", /obj/structure/chess/blackbishop, 2, time = 1 SECONDS, one_per_turf = TRUE, on_floor = TRUE), \
+		new /datum/stack_recipe("Black Queen", /obj/structure/chess/blackqueen, 2, time = 1 SECONDS, one_per_turf = TRUE, on_floor = TRUE), \
+		new /datum/stack_recipe("Black King", /obj/structure/chess/blackking, 2, time = 1 SECONDS, one_per_turf = TRUE, on_floor = TRUE), \
+	)),
 	null, \
 	new/datum/stack_recipe("rack parts", /obj/item/rack_parts), \
 	new/datum/stack_recipe("closet", /obj/structure/closet, 2, time = 15, one_per_turf = TRUE, on_floor = TRUE), \
diff --git a/code/game/objects/structures/beds_chairs/sofa.dm b/code/game/objects/structures/beds_chairs/sofa.dm
index c811ceafcd2..4a0b1e2b32e 100644
--- a/code/game/objects/structures/beds_chairs/sofa.dm
+++ b/code/game/objects/structures/beds_chairs/sofa.dm
@@ -4,6 +4,28 @@
 	icon = 'icons/obj/sofa.dmi'
 	buildstackamount = 1
 	item_chair = null
+	var/mutable_appearance/armrest
+
+/obj/structure/chair/sofa/Initialize()
+	armrest = mutable_appearance(icon, "[icon_state]_armrest", ABOVE_MOB_LAYER)
+	return ..()
+
+/obj/structure/chair/sofa/post_buckle_mob(mob/living/M)
+	. = ..()
+	update_armrest()
+
+/obj/structure/chair/sofa/proc/update_armrest()
+	if(has_buckled_mobs())
+		add_overlay(armrest)
+	else
+		cut_overlay(armrest)
+
+/obj/structure/chair/sofa/post_unbuckle_mob()
+	. = ..()
+	update_armrest()
+
+/obj/structure/chair/sofa/corner/handle_layer() //only the armrest/back of this chair should cover the mob.
+	return
 
 /obj/structure/chair/sofa/left
 	icon_state = "sofaend_left"
@@ -13,3 +35,18 @@
 
 /obj/structure/chair/sofa/corner
 	icon_state = "sofacorner"
+
+// Original icon ported from Eris(?) and updated to work here.
+/obj/structure/chair/sofa/corp
+	name = "sofa"
+	desc = "Soft and cushy."
+	icon_state = "corp_sofamiddle"
+
+/obj/structure/chair/sofa/corp/left
+	icon_state = "corp_sofaend_left"
+
+/obj/structure/chair/sofa/corp/right
+	icon_state = "corp_sofaend_right"
+
+/obj/structure/chair/sofa/corp/corner
+	icon_state = "corp_sofacorner"
diff --git a/code/game/objects/structures/chess.dm b/code/game/objects/structures/chess.dm
new file mode 100644
index 00000000000..9044dafd73e
--- /dev/null
+++ b/code/game/objects/structures/chess.dm
@@ -0,0 +1,78 @@
+/obj/structure/chess
+	anchored = FALSE
+	density = FALSE
+	icon = 'icons/obj/chess.dmi'
+	icon_state = "white_pawn"
+	name = "\improper Probably a White Pawn"
+	desc = "This is weird. Please inform adminstration on how you managed to get the parent chess piece. Thanks!"
+	max_integrity = 100
+
+/obj/structure/chess/wrench_act(mob/user, obj/item/tool)
+	to_chat(user, "<span class='notice'>You start to take apart the chess piece.</span>")
+	if(!do_after(user, 0.5 SECONDS, target = src))
+		return TRUE
+	var/obj/item/stack/sheet/metal/metal_sheets = new (drop_location(), 2)
+	metal_sheets.add_fingerprint(user)
+	tool.play_tool_sound(src)
+	qdel(src)
+	return TRUE
+
+/obj/structure/chess/whitepawn
+	name = "\improper White Pawn"
+	desc = "A white pawn chess piece. Get accused of cheating when executing a sick En Passant."
+	icon_state = "white_pawn"
+
+/obj/structure/chess/whiterook
+	name = "\improper White Rook"
+	desc = "A white rook chess piece. Also known as a castle. Can move any number of tiles in a straight line. It has a special move called castling."
+	icon_state = "white_rook"
+
+/obj/structure/chess/whiteknight
+	name = "\improper White Knight"
+	desc = "A white knight chess piece. It can hop over other pieces, moving in L shapes. A white kni- oh. Hah!"
+	icon_state = "white_knight"
+
+/obj/structure/chess/whitebishop
+	name = "\improper White Bishop"
+	desc = "A white bishop chess piece. It can move any number of tiles in a diagonal line."
+	icon_state = "white_bishop"
+
+/obj/structure/chess/whitequeen
+	name = "\improper White Queen"
+	desc = "A white queen chess piece. It can move any number of tiles in diagonal and straight lines."
+	icon_state = "white_queen"
+
+/obj/structure/chess/whiteking
+	name = "\improper White King"
+	desc = "A white king chess piece. It can move any tile in one direction."
+	icon_state = "white_king"
+
+/obj/structure/chess/blackpawn
+	name = "\improper Black Pawn"
+	desc = "A black pawn chess piece. Get accused of cheating when executing a sick En Passant."
+	icon_state = "black_pawn"
+
+/obj/structure/chess/blackrook
+	name = "\improper Black Rook"
+	desc = "A black rook chess piece. Also known as a castle. Can move any number of tiles in a straight line. It has a special move called castling."
+	icon_state = "black_rook"
+
+/obj/structure/chess/blackknight
+	name = "\improper Black Knight"
+	desc = "A black knight chess piece. It can hop over other pieces, moving in L shapes."
+	icon_state = "black_knight"
+
+/obj/structure/chess/blackbishop
+	name = "\improper Black Bishop"
+	desc = "A black bishop chess piece. It can move any number of tiles in a diagonal line."
+	icon_state = "black_bishop"
+
+/obj/structure/chess/blackqueen
+	name = "\improper Black Queen"
+	desc = "A black queen chess piece. It can move any number of tiles in diagonal and straight lines."
+	icon_state = "black_queen"
+
+/obj/structure/chess/blackking
+	name = "\improper Black King"
+	desc = "A black king chess piece. It can move one tile in any direction."
+	icon_state = "black_king"
diff --git a/icons/obj/chess.dmi b/icons/obj/chess.dmi
new file mode 100644
index 00000000000..407df324b4d
Binary files /dev/null and b/icons/obj/chess.dmi differ
diff --git a/icons/obj/doors/shutters.dmi b/icons/obj/doors/shutters.dmi
index a79e9889c9a..82740a28773 100644
Binary files a/icons/obj/doors/shutters.dmi and b/icons/obj/doors/shutters.dmi differ
diff --git a/icons/obj/doors/shutters_radiation.dmi b/icons/obj/doors/shutters_radiation.dmi
new file mode 100644
index 00000000000..657b613b0cc
Binary files /dev/null and b/icons/obj/doors/shutters_radiation.dmi differ
diff --git a/icons/obj/doors/shutters_window.dmi b/icons/obj/doors/shutters_window.dmi
new file mode 100644
index 00000000000..550e01f9878
Binary files /dev/null and b/icons/obj/doors/shutters_window.dmi differ
diff --git a/icons/obj/sofa.dmi b/icons/obj/sofa.dmi
index 1ec3101c027..a5591021d68 100644
Binary files a/icons/obj/sofa.dmi and b/icons/obj/sofa.dmi differ
diff --git a/tgstation.dme b/tgstation.dme
index 46d0fae8f72..abdc05236a2 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -1182,6 +1182,7 @@
 #include "code\game\objects\structures\artstuff.dm"
 #include "code\game\objects\structures\barsigns.dm"
 #include "code\game\objects\structures\bedsheet_bin.dm"
+#include "code\game\objects\structures\chess.dm"
 #include "code\game\objects\structures\destructible_structures.dm"
 #include "code\game\objects\structures\displaycase.dm"
 #include "code\game\objects\structures\divine.dm"