diff --git a/baystation12.dme b/baystation12.dme
index 5ab7609868a..ce69add117c 100644
--- a/baystation12.dme
+++ b/baystation12.dme
@@ -288,6 +288,7 @@
 #include "code\ATMOSPHERICS\he_pipes.dm"
 #include "code\ATMOSPHERICS\pipes.dm"
 #include "code\ATMOSPHERICS\components\portables_connector.dm"
+#include "code\ATMOSPHERICS\components\tvalve.dm"
 #include "code\ATMOSPHERICS\components\valve.dm"
 #include "code\ATMOSPHERICS\components\binary_devices\binary_atmos_base.dm"
 #include "code\ATMOSPHERICS\components\binary_devices\circulator.dm"
@@ -635,6 +636,7 @@
 #include "code\game\objects\explosion_recursive.dm"
 #include "code\game\objects\items.dm"
 #include "code\game\objects\objs.dm"
+#include "code\game\objects\sign_decals.dm"
 #include "code\game\objects\structures.dm"
 #include "code\game\objects\weapons.dm"
 #include "code\game\objects\closets\walllocker.dm"
@@ -1206,6 +1208,7 @@
 #include "code\modules\power\switch.dm"
 #include "code\modules\power\terminal.dm"
 #include "code\modules\power\tracker.dm"
+#include "code\modules\power\turbine.dm"
 #include "code\modules\power\antimatter\containment_jar.dm"
 #include "code\modules\power\antimatter\control.dm"
 #include "code\modules\power\antimatter\shielding.dm"
@@ -1338,6 +1341,7 @@
 #include "code\WorkInProgress\Cael_Aislinn\sculpture.dm"
 #include "code\WorkInProgress\Cael_Aislinn\shield_capacitor.dm"
 #include "code\WorkInProgress\Cael_Aislinn\shield_gen.dm"
+#include "code\WorkInProgress\Cael_Aislinn\Rust\areas.dm"
 #include "code\WorkInProgress\Cael_Aislinn\Rust\core_field.dm"
 #include "code\WorkInProgress\Cael_Aislinn\Rust\core_gen.dm"
 #include "code\WorkInProgress\Cael_Aislinn\Rust\core_monitor.dm"
diff --git a/code/ATMOSPHERICS/components/binary_devices/pump.dm b/code/ATMOSPHERICS/components/binary_devices/pump.dm
index 03c5ec3eee6..7746d238d22 100644
--- a/code/ATMOSPHERICS/components/binary_devices/pump.dm
+++ b/code/ATMOSPHERICS/components/binary_devices/pump.dm
@@ -26,6 +26,12 @@ obj/machinery/atmospherics/binary/pump
 	var/id = null
 	var/datum/radio_frequency/radio_connection
 
+	highcap
+		name = "High capacity gas pump"
+		desc = "A high capacity pump"
+
+		target_pressure = 15000000
+
 	on
 		on = 1
 		icon_state = "intact_on"
diff --git a/code/WorkInProgress/Cael_Aislinn/Rust/areas.dm b/code/WorkInProgress/Cael_Aislinn/Rust/areas.dm
index d59882ee9ab..a8822acb60b 100644
--- a/code/WorkInProgress/Cael_Aislinn/Rust/areas.dm
+++ b/code/WorkInProgress/Cael_Aislinn/Rust/areas.dm
@@ -1,14 +1,61 @@
 
-/area/engine/cooling
+//reactor areas
 
-/area/engine/port_gyro_bay
+/area/engine
+	fore
+		name = "\improper Fore"
 
-/area/engine/starboard_gyro_bay
+	construction_storage
+		name = "\improper Construction storage"
 
-/area/engine/generators
+	locker
+		name = "\improper Locker room"
 
-/area/engine/turbine_control
+	atmos_storage
+		name = "\improper Atmos storage"
 
-/area/engine/reactor_core
+	control
+		name = "\improper Control"
 
-/area/engine/aux_control
+	electrical_storage
+		name = "\improper Electrical storage"
+
+	reactor_core
+		name = "\improper Reactor Core"
+		icon_state = "engine_core"
+
+	reactor_gas
+		name = "Reactor Gas Storage"
+		icon_state = "engine_atmos"
+
+	aux_control
+		name = "Reactor Auxiliary Control"
+		icon_state = "engine_aux"
+
+	turbine_control
+		name = "Turbine Control"
+		icon_state = "engine_turbine"
+
+	reactor_airlock
+		name = "\improper Reactor Primary Entrance"
+		icon_state = "engine_airlock"
+
+	reactor_fuel_storage
+		name = "Reactor Fuel Storage"
+		icon_state = "engine_fuel"
+
+	reactor_fuel_ports
+		name = "\improper Reactor Fuel Ports"
+		icon_state = "engine_port"
+
+	generators
+		name = "\improper Generator Room"
+		icon_state = "engine_generators"
+
+	port_gyro_bay
+		name = "\improper Port Gyrotron Bay"
+		icon_state = "engine_starboardgyro"
+
+	starboard_gyro_bay
+		name = "\improper Starboard Gyrotron Bay"
+		icon_state = "engine_portgyro"
diff --git a/code/datums/organs/organ_external.dm b/code/datums/organs/organ_external.dm
index 4a89aecf382..d59c2a79315 100644
--- a/code/datums/organs/organ_external.dm
+++ b/code/datums/organs/organ_external.dm
@@ -214,6 +214,7 @@
 
 	proc/bandage()
 		var/rval = 0
+		src.status &= ~ORGAN_BLEEDING
 		for(var/datum/wound/W in wounds)
 			if(W.internal) continue
 			rval |= !W.bandaged
diff --git a/code/game/area/Space Station 13 areas.dm b/code/game/area/Space Station 13 areas.dm
index e3e081d772c..ad012b025a1 100755
--- a/code/game/area/Space Station 13 areas.dm	
+++ b/code/game/area/Space Station 13 areas.dm	
@@ -684,6 +684,26 @@ proc/process_ghost_teleport_locs()
 	name = "\improper Captain's Quarters"
 	icon_state = "captain"
 
+/area/crew_quarters/heads/hop
+	name = "\improper Head of Personnel's Quarters"
+	icon_state = "head_quarters"
+
+/area/crew_quarters/heads/hor
+	name = "\improper Research Director's Quarters"
+	icon_state = "head_quarters"
+
+/area/crew_quarters/heads/chief
+	name = "\improper Chief Engineer's Quarters"
+	icon_state = "head_quarters"
+
+/area/crew_quarters/heads/hos
+	name = "\improper Head of Security's Quarters"
+	icon_state = "head_quarters"
+
+/area/crew_quarters/heads/cmo
+	name = "\improper Chief Medical Officer's Quarters"
+	icon_state = "head_quarters"
+
 /area/crew_quarters/courtroom
 	name = "\improper Courtroom"
 	icon_state = "courtroom"
@@ -1001,6 +1021,10 @@ proc/process_ghost_teleport_locs()
 	name = "\improper Security Office"
 	icon_state = "security"
 
+/area/security/lobby
+	name = "\improper Security lobby"
+	icon_state = "security"
+
 /area/security/brig
 	name = "\improper Brig"
 	icon_state = "brig"
diff --git a/code/game/jobs/job/captain.dm b/code/game/jobs/job/captain.dm
index 3c81adadc97..7303cb0d4dd 100644
--- a/code/game/jobs/job/captain.dm
+++ b/code/game/jobs/job/captain.dm
@@ -21,7 +21,7 @@
 		var/obj/item/clothing/under/U = new /obj/item/clothing/under/rank/captain(H)
 		U.hastie = new /obj/item/clothing/tie/medal/gold/captain(U)
 		H.equip_to_slot_or_del(U, slot_w_uniform)
-		H.equip_to_slot_or_del(new /obj/item/device/pda/captain(H), slot_belt)
+		//H.equip_to_slot_or_del(new /obj/item/device/pda/captain(H), slot_belt)
 		H.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/captain(H), slot_wear_suit)
 		H.equip_to_slot_or_del(new /obj/item/clothing/shoes/brown(H), slot_shoes)
 		H.equip_to_slot_or_del(new /obj/item/clothing/head/caphat(H), slot_head)
diff --git a/code/game/objects/effects/signs.dm b/code/game/objects/effects/signs.dm
index bec0ba7d64f..64cbc125f1a 100644
--- a/code/game/objects/effects/signs.dm
+++ b/code/game/objects/effects/signs.dm
@@ -77,6 +77,15 @@
 	opacity = 0
 	density = 0
 
+/obj/effect/sign/movingparts
+	desc = "A warning sign which reads 'CAUTION: MOVING PARTS, machinery liable to stop and start at random'"
+	name = "CAUTION"
+	icon = 'decals.dmi'
+	icon_state = "securearea"
+	anchored = 1.0
+	opacity = 0
+	density = 0
+
 /obj/effect/sign/examroom
 	desc = "A guidance sign which reads 'EXAM ROOM'"
 	name = "EXAM"
diff --git a/code/game/objects/sign_decals.dm b/code/game/objects/sign_decals.dm
new file mode 100644
index 00000000000..10a08d81363
--- /dev/null
+++ b/code/game/objects/sign_decals.dm
@@ -0,0 +1,49 @@
+/obj/effect/sign/barsign
+	icon = 'barsigns.dmi'
+	icon_state = "empty"
+	anchored = 1
+	New()
+		ChangeSign(pick("pinkflamingo", "magmasea", "limbo", "rustyaxe", "armokbar", "brokendrum", "meadbay", "thedamnwall", "thecavern", "cindikate", "theorchard", "thesaucyclown", "theclownshead"))
+		return
+	proc/ChangeSign(var/Text)
+		src.icon_state = "[Text]"
+		//on = 0
+		//brightness_on = 4 //uncomment these when the lighting fixes get in
+		return
+
+/obj/effect/sign/securearea/ex_act(severity)
+	switch(severity)
+		if(1.0)
+			del(src)
+			return
+		if(2.0)
+			del(src)
+			return
+		if(3.0)
+			del(src)
+			return
+		else
+	return
+
+/obj/effect/sign/securearea/blob_act()
+	del(src)
+	return
+
+
+/obj/effect/sign/ex_act(severity)
+	switch(severity)
+		if(1.0)
+			del(src)
+			return
+		if(2.0)
+			del(src)
+			return
+		if(3.0)
+			del(src)
+			return
+		else
+	return
+
+/obj/effect/sign/blob_act()
+	del(src)
+	return
\ No newline at end of file
diff --git a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm
index 801befad0b4..fb0b72a8d4e 100644
--- a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm
+++ b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm
@@ -279,6 +279,26 @@
 	return
 
 
+/obj/structure/closet/wardrobe/medic_white
+	name = "medical wardrobe"
+	icon_state = "white"
+	icon_closed = "white"
+
+/obj/structure/closet/wardrobe/virology_white/New()
+	new /obj/item/clothing/under/rank/medical(src)
+	new /obj/item/clothing/under/rank/medical(src)
+	new /obj/item/clothing/under/rank/medical/blue(src)
+	new /obj/item/clothing/under/rank/medical/green(src)
+	new /obj/item/clothing/under/rank/medical/purple(src)
+	new /obj/item/clothing/shoes/white(src)
+	new /obj/item/clothing/shoes/white(src)
+	new /obj/item/clothing/suit/labcoat(src)
+	new /obj/item/clothing/suit/labcoat(src)
+	new /obj/item/clothing/mask/surgical(src)
+	new /obj/item/clothing/mask/surgical(src)
+	return
+
+
 /obj/structure/closet/wardrobe/grey
 	name = "grey wardrobe"
 	icon_state = "grey"
diff --git a/code/modules/clothing/spacesuits/rig.dm b/code/modules/clothing/spacesuits/rig.dm
index ab04e347fe8..9429e41cb31 100644
--- a/code/modules/clothing/spacesuits/rig.dm
+++ b/code/modules/clothing/spacesuits/rig.dm
@@ -4,7 +4,7 @@
 	desc = "A special helmet designed for work in a hazardous, low-pressure environment. Has radiation shielding."
 	icon_state = "rig0-engineering"
 	item_state = "eng_helm"
-	armor = list(melee = 40, bullet = 5, laser = 20,energy = 5, bomb = 35, bio = 100, rad = 60)
+	armor = list(melee = 40, bullet = 5, laser = 20,energy = 5, bomb = 35, bio = 100, rad = 100)
 	allowed = list(/obj/item/device/flashlight)
 	var/brightness_on = 4 //luminosity when on
 	var/on = 0
@@ -42,7 +42,7 @@
 	icon_state = "rig-engineering"
 	item_state = "eng_hardsuit"
 	slowdown = 2
-	armor = list(melee = 40, bullet = 5, laser = 20,energy = 5, bomb = 35, bio = 100, rad = 60)
+	armor = list(melee = 40, bullet = 5, laser = 20,energy = 5, bomb = 35, bio = 100, rad = 100)
 	allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/weapon/storage/satchel,/obj/item/device/t_scanner,/obj/item/weapon/pickaxe, /obj/item/weapon/rcd)
 	heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
 	max_heat_protection_temperature = SPACE_SUIT_MAX_HEAT_PROTECITON_TEMPERATURE
diff --git a/config/admins.txt b/config/admins.txt
index 4467f45452c..d50debf0e2e 100644
--- a/config/admins.txt
+++ b/config/admins.txt
@@ -3,6 +3,7 @@ arcalane - Game Admin
 asanadas - Game Admin
 bobbehluvspropane - Game Admin
 cacophony - Game Admin
+caelaislinn - Game Master
 cajoes - Game Admin
 cib - Retired Admin
 compactninja - Retired Admin
diff --git a/maps/Antiqua.dmm b/maps/Antiqua.dmm
index f58949a590d..74f26d466fe 100644
--- a/maps/Antiqua.dmm
+++ b/maps/Antiqua.dmm
@@ -137,9 +137,9 @@
 "acG" = (/obj/machinery/atmospherics/pipe/simple/general/visible{dir = 9},/turf/simulated/floor,/area/toxins/mixing)
 "acH" = (/obj/machinery/door/firedoor/border_only{dir = 8},/obj/structure/window/reinforced{dir = 5; health = 1e+007},/turf/simulated/floor/plating,/area/toxins/mixing)
 "acI" = (/obj/machinery/portable_atmospherics/canister/air,/turf/simulated/floor{icon_state = "delivery"; name = "floor"},/area/toxins/mixing)
-"acJ" = (/obj/machinery/portable_atmospherics/canister/air,/obj/effect/decal/warning_stripes{tag = "icon-E"; icon_state = "E"},/turf/simulated/floor{icon_state = "delivery"; name = "floor"},/area/toxins/mixing)
+"acJ" = (/obj/machinery/portable_atmospherics/canister/air,/turf/simulated/floor{icon_state = "delivery"; name = "floor"},/area/toxins/mixing)
 "acK" = (/obj/machinery/light/spot{tag = "icon-bulb1 (NORTH)"; icon_state = "bulb1"; dir = 1},/turf/simulated/floor,/area/toxins/mixing)
-"acL" = (/obj/effect/decal/warning_stripes{tag = "icon-W"; icon_state = "W"},/obj/machinery/portable_atmospherics/canister/sleeping_agent,/turf/simulated/floor{icon_state = "delivery"; name = "floor"},/area/toxins/mixing)
+"acL" = (/obj/machinery/portable_atmospherics/canister/sleeping_agent,/turf/simulated/floor{icon_state = "delivery"; name = "floor"},/area/toxins/mixing)
 "acM" = (/obj/effect/decal/cleanable/cobweb2,/obj/machinery/portable_atmospherics/canister/sleeping_agent,/turf/simulated/floor{icon_state = "delivery"; name = "floor"},/area/toxins/mixing)
 "acN" = (/obj/machinery/deployable/barrier,/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor{icon_state = "delivery"; name = "floor"},/area/security/armoury)
 "acO" = (/obj/machinery/deployable/barrier,/turf/simulated/floor{icon_state = "delivery"; name = "floor"},/area/security/armoury)
@@ -173,8 +173,8 @@
 "adq" = (/obj/machinery/atmospherics/binary/pump{dir = 1; name = "Tank Drain"; target_pressure = 202.6},/turf/simulated/floor,/area/toxins/mixing)
 "adr" = (/obj/machinery/light{dir = 4; icon_state = "tube1"},/turf/simulated/floor,/area/toxins/mixing)
 "ads" = (/obj/machinery/portable_atmospherics/canister/oxygen,/turf/simulated/floor{icon_state = "delivery"; name = "floor"},/area/toxins/mixing)
-"adt" = (/obj/machinery/portable_atmospherics/canister/oxygen,/obj/effect/decal/warning_stripes{tag = "icon-E"; icon_state = "E"},/turf/simulated/floor{icon_state = "delivery"; name = "floor"},/area/toxins/mixing)
-"adu" = (/obj/machinery/portable_atmospherics/canister/carbon_dioxide,/obj/effect/decal/warning_stripes{tag = "icon-W"; icon_state = "W"},/turf/simulated/floor{icon_state = "delivery"; name = "floor"},/area/toxins/mixing)
+"adt" = (/obj/machinery/portable_atmospherics/canister/oxygen,/turf/simulated/floor{icon_state = "delivery"; name = "floor"},/area/toxins/mixing)
+"adu" = (/obj/machinery/portable_atmospherics/canister/carbon_dioxide,/turf/simulated/floor{icon_state = "delivery"; name = "floor"},/area/toxins/mixing)
 "adv" = (/obj/machinery/portable_atmospherics/canister/carbon_dioxide,/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/turf/simulated/floor{icon_state = "delivery"; name = "floor"},/area/toxins/mixing)
 "adw" = (/obj/machinery/flasher/portable,/obj/structure/window/reinforced,/turf/simulated/floor{icon_state = "delivery"; name = "floor"},/area/security/armoury)
 "adx" = (/obj/structure/window/reinforced,/obj/item/weapon/wrench,/obj/machinery/flasher/portable,/turf/simulated/floor{icon_state = "delivery"; name = "floor"},/area/security/armoury)
@@ -197,13 +197,13 @@
 "adO" = (/obj/machinery/atmospherics/portables_connector{dir = 1},/turf/simulated/floor{icon_state = "bot"},/area/toxins/mixing)
 "adP" = (/obj/machinery/atmospherics/portables_connector{dir = 1},/obj/machinery/portable_atmospherics/canister/nitrogen,/turf/simulated/floor{icon_state = "bot"},/area/toxins/mixing)
 "adQ" = (/obj/machinery/door/firedoor/border_only{dir = 8},/obj/structure/window/reinforced{dir = 5; health = 1e+007},/obj/effect/sign/securearea{desc = "A warning sign which reads 'DANGER: FIRE'"; icon_state = "fire"; layer = 4; name = "DANGER: FIRE"},/turf/simulated/floor/plating,/area/toxins/mixing)
-"adR" = (/obj/machinery/portable_atmospherics/canister/oxygen,/obj/effect/decal/warning_stripes{tag = "icon-S"; icon_state = "S"},/turf/simulated/floor{icon_state = "delivery"; name = "floor"},/area/toxins/mixing)
-"adS" = (/obj/machinery/portable_atmospherics/canister/oxygen,/obj/effect/decal/warning_stripes{tag = "icon-NW-in"; icon_state = "NW-in"},/turf/simulated/floor{icon_state = "delivery"; name = "floor"},/area/toxins/mixing)
-"adT" = (/obj/effect/decal/warning_stripes{tag = "icon-NE-in"; icon_state = "NE-in"},/obj/machinery/portable_atmospherics/canister/nitrogen,/turf/simulated/floor{icon_state = "delivery"; name = "floor"},/area/toxins/mixing)
-"adU" = (/obj/effect/decal/warning_stripes{tag = "icon-S"; icon_state = "S"},/obj/effect/sign/securearea{desc = "A warning sign which reads 'DANGER: FIRE'"; icon_state = "fire"; name = "DANGER: FIRE"; pixel_x = 32},/obj/machinery/portable_atmospherics/canister/nitrogen,/turf/simulated/floor{icon_state = "delivery"; name = "floor"},/area/toxins/mixing)
+"adR" = (/obj/machinery/portable_atmospherics/canister/oxygen,/turf/simulated/floor{icon_state = "delivery"; name = "floor"},/area/toxins/mixing)
+"adS" = (/obj/machinery/portable_atmospherics/canister/oxygen,/turf/simulated/floor{icon_state = "delivery"; name = "floor"},/area/toxins/mixing)
+"adT" = (/obj/machinery/portable_atmospherics/canister/nitrogen,/turf/simulated/floor{icon_state = "delivery"; name = "floor"},/area/toxins/mixing)
+"adU" = (/obj/effect/sign/securearea{desc = "A warning sign which reads 'DANGER: FIRE'"; icon_state = "fire"; name = "DANGER: FIRE"; pixel_x = 32},/obj/machinery/portable_atmospherics/canister/nitrogen,/turf/simulated/floor{icon_state = "delivery"; name = "floor"},/area/toxins/mixing)
 "adV" = (/obj/machinery/deployable/barrier,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/machinery/light/spot{tag = "icon-bulb1 (WEST)"; icon_state = "bulb1"; dir = 8},/turf/simulated/floor{icon_state = "delivery"; name = "floor"},/area/security/armoury)
 "adW" = (/obj/machinery/deployable/barrier,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor{icon_state = "delivery"; name = "floor"},/area/security/armoury)
-"adX" = (/obj/structure/rack,/obj/item/weapon/gun/energy/taser,/obj/item/weapon/gun/energy/taser,/obj/item/weapon/gun/energy/taser,/obj/effect/decal/warning_stripes{tag = "icon-W-corner"; icon_state = "W-corner"},/turf/simulated/floor,/area/security/armoury)
+"adX" = (/obj/structure/rack,/obj/item/weapon/gun/energy/taser,/obj/item/weapon/gun/energy/taser,/obj/item/weapon/gun/energy/taser,/turf/simulated/floor,/area/security/armoury)
 "adY" = (/obj/structure/rack,/obj/item/weapon/melee/baton,/obj/item/weapon/melee/baton,/obj/item/weapon/storage/handcuff_kit,/turf/simulated/floor,/area/security/armoury)
 "adZ" = (/obj/structure/table/reinforced,/obj/item/weapon/reagent_containers/spray/pepper,/obj/item/weapon/reagent_containers/spray/pepper,/obj/item/weapon/reagent_containers/spray/pepper,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor,/area/security/armoury)
 "aea" = (/obj/structure/table/reinforced,/obj/item/ammo_casing/shotgun/beanbag,/obj/item/ammo_casing/shotgun/beanbag,/obj/item/ammo_casing/shotgun/beanbag,/obj/item/ammo_casing/shotgun/beanbag,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor,/area/security/armoury)
@@ -245,9 +245,9 @@
 "aeK" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating,/area/maintenance/fore)
 "aeL" = (/obj/effect/decal/cleanable/cobweb2,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating,/area/maintenance/fore)
 "aeM" = (/turf/simulated/wall,/area/security/armoury)
-"aeN" = (/obj/structure/reagent_dispensers/peppertank{pixel_x = -30},/obj/effect/decal/warning_stripes{tag = "icon-N-corner"; icon_state = "N-corner"},/turf/simulated/floor,/area/security/armoury)
-"aeO" = (/obj/effect/decal/warning_stripes{tag = "icon-N-corner"; icon_state = "N-corner"},/turf/simulated/floor,/area/security/armoury)
-"aeP" = (/obj/effect/decal/warning_stripes{tag = "icon-NW-out"; icon_state = "NW-out"},/turf/simulated/floor,/area/security/armoury)
+"aeN" = (/obj/structure/reagent_dispensers/peppertank{pixel_x = -30},/turf/simulated/floor,/area/security/armoury)
+"aeO" = (/turf/simulated/floor,/area/security/armoury)
+"aeP" = (/turf/simulated/floor,/area/security/armoury)
 "aeQ" = (/obj/effect/decal/cleanable/dirt,/obj/machinery/light/spot{tag = "icon-bulb1 (EAST)"; icon_state = "bulb1"; dir = 4},/turf/simulated/floor,/area/security/armoury)
 "aeR" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/maintenance/fore)
 "aeS" = (/obj/machinery/door/firedoor/border_only,/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/assembly/assembly_line)
@@ -266,10 +266,10 @@
 "aff" = (/obj/effect/sign/securearea{desc = "A warning sign which reads 'NO SMOKING'"; icon_state = "nosmoking2"; name = "NO SMOKING"; pixel_x = -29; pixel_y = 1},/turf/simulated/floor,/area/toxins/mixing)
 "afg" = (/obj/machinery/atmospherics/portables_connector{dir = 1; name = "Node 2"},/turf/simulated/floor{icon_state = "bot"},/area/toxins/mixing)
 "afh" = (/obj/machinery/door/firedoor/border_only{dir = 8},/obj/structure/window/reinforced{dir = 5; health = 1e+007},/obj/effect/sign/nosmoking_2{layer = 4},/turf/simulated/floor/plating,/area/toxins/mixing)
-"afi" = (/obj/machinery/portable_atmospherics/canister/toxins,/obj/effect/decal/warning_stripes{tag = "icon-N"; icon_state = "N"},/turf/simulated/floor{icon_state = "delivery"; name = "floor"},/area/toxins/mixing)
-"afj" = (/obj/machinery/portable_atmospherics/canister/toxins,/obj/effect/decal/warning_stripes{tag = "icon-SW-in"; icon_state = "SW-in"},/turf/simulated/floor{icon_state = "delivery"; name = "floor"},/area/toxins/mixing)
-"afk" = (/obj/machinery/portable_atmospherics/canister/toxins,/obj/effect/decal/warning_stripes{tag = "icon-SE-in"; icon_state = "SE-in"},/turf/simulated/floor{icon_state = "delivery"; name = "floor"},/area/toxins/mixing)
-"afl" = (/obj/machinery/portable_atmospherics/canister/toxins,/obj/effect/decal/warning_stripes{tag = "icon-N"; icon_state = "N"},/obj/effect/sign/securearea{desc = "A warning sign which reads 'NO SMOKING'"; icon_state = "nosmoking2"; name = "NO SMOKING"; pixel_x = 29; pixel_y = 1},/turf/simulated/floor{icon_state = "delivery"; name = "floor"},/area/toxins/mixing)
+"afi" = (/obj/machinery/portable_atmospherics/canister/toxins,/turf/simulated/floor{icon_state = "delivery"; name = "floor"},/area/toxins/mixing)
+"afj" = (/obj/machinery/portable_atmospherics/canister/toxins,/turf/simulated/floor{icon_state = "delivery"; name = "floor"},/area/toxins/mixing)
+"afk" = (/obj/machinery/portable_atmospherics/canister/toxins,/turf/simulated/floor{icon_state = "delivery"; name = "floor"},/area/toxins/mixing)
+"afl" = (/obj/machinery/portable_atmospherics/canister/toxins,/obj/effect/sign/securearea{desc = "A warning sign which reads 'NO SMOKING'"; icon_state = "nosmoking2"; name = "NO SMOKING"; pixel_x = 29; pixel_y = 1},/turf/simulated/floor{icon_state = "delivery"; name = "floor"},/area/toxins/mixing)
 "afm" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/effect/sign/securearea,/turf/simulated/floor/plating/airless,/area/toxins/test_area)
 "afn" = (/turf/simulated/floor/plating/airless,/area/toxins/test_area)
 "afo" = (/obj/machinery/light/small{dir = 1},/turf/simulated/floor/plating/airless,/area/toxins/test_area)
@@ -304,10 +304,10 @@
 "afR" = (/obj/structure/filingcabinet,/obj/machinery/camera{c_tag = "Research Director's Office"; dir = 8; network = "Research"},/turf/simulated/floor,/area/toxins/rdoffice)
 "afS" = (/obj/machinery/light,/turf/simulated/floor,/area/toxins/mixing)
 "afT" = (/obj/machinery/portable_atmospherics/canister/toxins,/turf/simulated/floor{icon_state = "delivery"; name = "floor"},/area/toxins/mixing)
-"afU" = (/obj/machinery/portable_atmospherics/canister/toxins,/obj/effect/decal/warning_stripes{tag = "icon-E"; icon_state = "E"},/turf/simulated/floor{icon_state = "delivery"; name = "floor"},/area/toxins/mixing)
-"afV" = (/obj/machinery/portable_atmospherics/canister/toxins,/obj/effect/decal/warning_stripes{tag = "icon-W"; icon_state = "W"},/turf/simulated/floor{icon_state = "delivery"; name = "floor"},/area/toxins/mixing)
+"afU" = (/obj/machinery/portable_atmospherics/canister/toxins,/turf/simulated/floor{icon_state = "delivery"; name = "floor"},/area/toxins/mixing)
+"afV" = (/obj/machinery/portable_atmospherics/canister/toxins,/turf/simulated/floor{icon_state = "delivery"; name = "floor"},/area/toxins/mixing)
 "afW" = (/obj/machinery/door/airlock/external,/turf/simulated/floor/plating/airless,/area/toxins/test_area)
-"afX" = (/obj/effect/decal/warning_stripes{tag = "icon-S"; icon_state = "S"},/turf/simulated/floor/plating/airless,/area/toxins/test_area)
+"afX" = (/turf/simulated/floor/plating/airless,/area/toxins/test_area)
 "afY" = (/obj/structure/closet/emcloset,/obj/effect/decal/cleanable/blood,/obj/effect/decal/remains/human,/turf/simulated/floor/plating/airless,/area/toxins/test_area)
 "afZ" = (/obj/machinery/camera{c_tag = "North"; network = "Bomb Testing"},/obj/machinery/light/spot{dir = 1},/turf/simulated/floor/airless,/area/toxins/test_area)
 "aga" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/generic,/turf/simulated/floor/plating,/area/maintenance/fore)
@@ -319,7 +319,7 @@
 "agg" = (/obj/machinery/door/firedoor/border_only,/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/assembly/assembly_line)
 "agh" = (/obj/structure/table,/obj/item/weapon/storage/belt/utility,/obj/item/clothing/head/welding,/obj/item/weapon/storage/belt/utility,/obj/item/clothing/head/welding,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor,/area/assembly/assembly_line)
 "agi" = (/obj/machinery/power/apc{dir = 1; name = "Assembly Line APC"; pixel_x = 1; pixel_y = 25},/turf/simulated/floor,/area/assembly/assembly_line)
-"agj" = (/obj/machinery/conveyor{dir = 4; id = "assemblyline1"},/obj/effect/decal/warning_stripes{tag = "icon-N"; icon_state = "N"},/turf/simulated/floor,/area/assembly/assembly_line)
+"agj" = (/obj/machinery/conveyor{dir = 4; id = "assemblyline1"},/turf/simulated/floor,/area/assembly/assembly_line)
 "agk" = (/obj/structure/table,/obj/item/stack/sheet/metal{amount = 50},/obj/item/stack/sheet/metal{amount = 50},/obj/item/stack/sheet/metal{amount = 50},/turf/simulated/floor,/area/assembly/assembly_line)
 "agl" = (/obj/structure/table/reinforced,/obj/item/weapon/stamp,/obj/structure/table,/obj/item/weapon/clipboard,/turf/simulated/floor,/area/assembly/assembly_line)
 "agm" = (/obj/machinery/door/firedoor/border_only{dir = 4},/obj/structure/window/reinforced{dir = 5; health = 1e+007},/turf/simulated/floor/plating,/area/assembly/assembly_line)
@@ -346,8 +346,8 @@
 "agH" = (/obj/machinery/magnetic_controller{autolink = 1; code = 712; density = 0; name = "Target Control Console"; path = "SNNSSNNSSN"; pixel_x = 0; pixel_y = 0},/obj/structure/table,/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor,/area/security/range)
 "agI" = (/turf/simulated/floor{icon_state = "floorgrime"},/area/security/range)
 "agJ" = (/turf/simulated/floor,/area/security/range)
-"agK" = (/obj/effect/decal/warning_stripes{tag = "icon-SE-in"; icon_state = "SE-in"},/turf/simulated/floor,/area/security/range)
-"agL" = (/obj/effect/decal/warning_stripes{tag = "icon-SW-in"; icon_state = "SW-in"},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor,/area/security/range)
+"agK" = (/turf/simulated/floor,/area/security/range)
+"agL" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor,/area/security/range)
 "agM" = (/obj/effect/decal/cleanable/cobweb,/obj/effect/decal/cleanable/dirt,/obj/machinery/light/spot{tag = "icon-bulb1 (NORTH)"; icon_state = "bulb1"; dir = 1},/turf/simulated/floor/plating,/area/security/range)
 "agN" = (/obj/structure/table,/obj/item/weapon/storage/firstaid/regular{empty = 1; name = "First-Aid (empty)"},/obj/item/weapon/storage/firstaid/regular{empty = 1; name = "First-Aid (empty)"},/obj/item/weapon/storage/firstaid/regular{empty = 1; name = "First-Aid (empty)"},/obj/item/device/healthanalyzer,/obj/item/device/healthanalyzer,/obj/item/device/healthanalyzer,/turf/simulated/floor,/area/assembly/assembly_line)
 "agO" = (/obj/machinery/computer/rdconsole{id = 2; name = "Robotics R&D Console"; req_access = null; req_access_txt = "29"},/turf/simulated/floor,/area/assembly/assembly_line)
@@ -363,18 +363,18 @@
 "agY" = (/turf/simulated/floor{icon_state = "white"; dir = 8},/area/toxins/lab)
 "agZ" = (/obj/structure/closet/secure_closet/scientist,/turf/simulated/floor{icon_state = "white"},/area/toxins/lab)
 "aha" = (/obj/machinery/portable_atmospherics/pump,/turf/simulated/floor,/area/toxins/lab)
-"ahb" = (/obj/effect/decal/warning_stripes{tag = "icon-SE-out"; icon_state = "SE-out"},/obj/machinery/portable_atmospherics/scrubber,/obj/machinery/light/spot{tag = "icon-bulb1 (NORTH)"; icon_state = "bulb1"; dir = 1},/turf/simulated/floor,/area/toxins/lab)
-"ahc" = (/obj/effect/decal/warning_stripes{tag = "icon-S"; icon_state = "S"},/obj/machinery/portable_atmospherics/canister,/turf/simulated/floor,/area/toxins/lab)
-"ahd" = (/obj/machinery/vending/plasmaresearch,/obj/effect/decal/warning_stripes{tag = "icon-S"; icon_state = "S"},/turf/simulated/floor,/area/toxins/lab)
-"ahe" = (/obj/structure/dispenser,/obj/effect/decal/warning_stripes{tag = "icon-NW-in"; icon_state = "NW-in"},/turf/simulated/floor,/area/toxins/lab)
+"ahb" = (/obj/machinery/portable_atmospherics/scrubber,/obj/machinery/light/spot{tag = "icon-bulb1 (NORTH)"; icon_state = "bulb1"; dir = 1},/turf/simulated/floor,/area/toxins/lab)
+"ahc" = (/obj/machinery/portable_atmospherics/canister,/turf/simulated/floor,/area/toxins/lab)
+"ahd" = (/obj/machinery/vending/plasmaresearch,/turf/simulated/floor,/area/toxins/lab)
+"ahe" = (/obj/structure/dispenser,/turf/simulated/floor,/area/toxins/lab)
 "ahf" = (/obj/machinery/firealarm{layer = 3.7; pixel_y = 27},/turf/simulated/floor{icon_state = "white"},/area/toxins/lab)
 "ahg" = (/turf/simulated/floor{icon_state = "white"},/area/toxins/lab)
 "ahh" = (/obj/machinery/light{dir = 1},/turf/simulated/floor{icon_state = "white"},/area/toxins/lab)
 "ahi" = (/obj/machinery/alarm{frequency = 1437; layer = 3.7; pixel_y = 23},/turf/simulated/floor{icon_state = "white"},/area/toxins/lab)
 "ahj" = (/obj/structure/stool/bed/chair{dir = 4},/obj/machinery/computer/security/telescreen{department = ""; desc = "Used for watching the explosives testing area."; layer = 4; name = "Test Chamber Telescreen"; network = "Bomb Testing"; pixel_x = 32; pixel_y = 0},/obj/machinery/light{dir = 1},/turf/simulated/floor{icon_state = "white"},/area/toxins/lab)
 "ahk" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/toxins/lab)
-"ahl" = (/obj/effect/decal/warning_stripes{tag = "icon-SE-in"; icon_state = "SE-in"},/turf/simulated/floor/airless,/area/toxins/test_area)
-"ahm" = (/obj/effect/decal/warning_stripes{tag = "icon-N"; icon_state = "N"},/turf/simulated/floor/airless,/area/toxins/test_area)
+"ahl" = (/turf/simulated/floor/airless,/area/toxins/test_area)
+"ahm" = (/turf/simulated/floor/airless,/area/toxins/test_area)
 "ahn" = (/obj/structure/table,/turf/simulated/floor{icon_state = "showroomfloor"},/area/security/main)
 "aho" = (/obj/structure/stool/bed,/turf/simulated/floor{icon_state = "showroomfloor"},/area/security/main)
 "ahp" = (/obj/machinery/door/firedoor/border_only{dir = 4},/obj/machinery/door/airlock/security{name = "Execution"; req_access = null; req_access_txt = "19; 1"},/turf/simulated/floor{icon_state = "showroomfloor"},/area/security/main)
@@ -382,7 +382,7 @@
 "ahr" = (/obj/machinery/disposal,/obj/machinery/alarm{frequency = 1437; pixel_y = 23},/obj/structure/disposalpipe/trunk{dir = 4},/turf/simulated/floor,/area/security/main)
 "ahs" = (/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/turf/simulated/floor,/area/security/main)
 "aht" = (/obj/machinery/door/firedoor/border_only,/obj/structure/window/basic{dir = 5},/turf/simulated/floor/plating,/area/security/main)
-"ahu" = (/obj/effect/decal/warning_stripes{tag = "icon-U-W"; icon_state = "U-W"},/turf/simulated/floor,/area/security/range)
+"ahu" = (/turf/simulated/floor,/area/security/range)
 "ahv" = (/obj/structure/target_stake,/obj/machinery/magnetic_module{code = 712; magnetic_field = 2; max_dist = 5; on = 1},/turf/simulated/floor{icon_state = "floorgrime"},/area/security/range)
 "ahw" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor{icon_state = "floorgrime"},/area/security/range)
 "ahx" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating,/area/security/range)
@@ -396,21 +396,21 @@
 "ahF" = (/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22},/obj/structure/closet/l3closet/scientist,/turf/simulated/floor{icon_state = "white"; dir = 8},/area/toxins/lab)
 "ahG" = (/turf/simulated/floor{icon_state = "white"; dir = 8},/area/toxins/lab)
 "ahH" = (/obj/structure/closet/l3closet/scientist,/turf/simulated/floor{icon_state = "white"},/area/toxins/lab)
-"ahI" = (/obj/machinery/portable_atmospherics/pump,/obj/effect/decal/warning_stripes{tag = "icon-S"; icon_state = "S"},/obj/machinery/requests_console{department = "Toxins Lab"; departmentType = 2; name = "Tox lab Requests Console"; pixel_x = -30; pixel_y = -3},/turf/simulated/floor,/area/toxins/lab)
-"ahJ" = (/obj/effect/decal/warning_stripes{tag = "icon-NW-in"; icon_state = "NW-in"},/obj/machinery/portable_atmospherics/scrubber,/turf/simulated/floor,/area/toxins/lab)
+"ahI" = (/obj/machinery/portable_atmospherics/pump,/obj/machinery/requests_console{department = "Toxins Lab"; departmentType = 2; name = "Tox lab Requests Console"; pixel_x = -30; pixel_y = -3},/turf/simulated/floor,/area/toxins/lab)
+"ahJ" = (/obj/machinery/portable_atmospherics/scrubber,/turf/simulated/floor,/area/toxins/lab)
 "ahK" = (/obj/structure/stool/bed/chair{dir = 4},/obj/machinery/computer/security/telescreen{department = ""; desc = "Used for watching the explosives testing area."; layer = 4; name = "Test Chamber Telescreen"; network = "Bomb Testing"; pixel_x = 32; pixel_y = 0},/turf/simulated/floor{icon_state = "white"},/area/toxins/lab)
 "ahL" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/toxins/lab)
-"ahM" = (/obj/effect/decal/warning_stripes{tag = "icon-W"; icon_state = "W"},/turf/simulated/floor/airless,/area/toxins/test_area)
-"ahN" = (/obj/effect/decal/warning_stripes{tag = "icon-SE-out"; icon_state = "SE-out"},/turf/simulated/floor/airless,/area/toxins/test_area)
+"ahM" = (/turf/simulated/floor/airless,/area/toxins/test_area)
+"ahN" = (/turf/simulated/floor/airless,/area/toxins/test_area)
 "ahO" = (/obj/structure/table,/obj/item/weapon/reagent_containers/ld50_syringe/choral{pixel_x = 3; pixel_y = 10},/obj/item/weapon/reagent_containers/ld50_syringe/choral{pixel_x = 3; pixel_y = 6},/obj/item/weapon/reagent_containers/ld50_syringe/choral{pixel_x = 3; pixel_y = 2},/turf/simulated/floor{icon_state = "showroomfloor"},/area/security/main)
 "ahP" = (/obj/machinery/camera{c_tag = "Interrogation"; dir = 8; network = "Security"},/turf/simulated/floor{icon_state = "showroomfloor"},/area/security/main)
 "ahQ" = (/obj/structure/disposalpipe/segment,/turf/simulated/floor,/area/security/main)
 "ahR" = (/obj/machinery/door/firedoor/border_only,/turf/simulated/floor,/area/security/main)
 "ahS" = (/obj/machinery/door/firedoor/border_only,/turf/simulated/floor,/area/security/range)
 "ahT" = (/obj/machinery/recharger,/obj/structure/table,/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor,/area/security/range)
-"ahU" = (/obj/effect/decal/warning_stripes{tag = "icon-NE-in"; icon_state = "NE-in"},/turf/simulated/floor{icon_state = "floorgrime"},/area/security/range)
+"ahU" = (/turf/simulated/floor{icon_state = "floorgrime"},/area/security/range)
 "ahV" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor,/area/security/range)
-"ahW" = (/obj/effect/decal/warning_stripes{tag = "icon-NW-in"; icon_state = "NW-in"},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor,/area/security/range)
+"ahW" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor,/area/security/range)
 "ahX" = (/obj/effect/sign/vacuum,/turf/simulated/wall/r_wall,/area/ai_monitored/storage/eva)
 "ahY" = (/obj/machinery/door/airlock/external{name = "E.V.A."; req_access_txt = "18"},/turf/simulated/floor/plating,/area/ai_monitored/storage/eva)
 "ahZ" = (/turf/simulated/wall/r_wall,/area/ai_monitored/storage/eva)
@@ -419,27 +419,27 @@
 "aic" = (/obj/structure/table,/obj/item/device/multitool,/obj/item/weapon/crowbar,/obj/item/device/multitool,/turf/simulated/floor,/area/assembly/assembly_line)
 "aid" = (/obj/machinery/camera{c_tag = "Robotics Port"; dir = 1; network = "Research"},/obj/machinery/alarm{dir = 1; pixel_y = -22},/turf/simulated/floor,/area/assembly/assembly_line)
 "aie" = (/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_y = -29},/obj/machinery/light,/turf/simulated/floor,/area/assembly/assembly_line)
-"aif" = (/obj/machinery/conveyor{dir = 4; id = "assemblyline2"},/obj/effect/decal/warning_stripes{tag = "icon-N"; icon_state = "N"},/turf/simulated/floor,/area/assembly/assembly_line)
+"aif" = (/obj/machinery/conveyor{dir = 4; id = "assemblyline2"},/turf/simulated/floor,/area/assembly/assembly_line)
 "aig" = (/obj/structure/table/reinforced,/obj/item/weapon/paper_bin,/obj/item/weapon/pen{pixel_x = 4; pixel_y = 4},/obj/structure/table,/turf/simulated/floor,/area/assembly/assembly_line)
 "aih" = (/turf/simulated/floor{tag = "icon-whitehall (SOUTHWEST)"; icon_state = "whitehall"; dir = 10},/area/toxins/hallway)
 "aii" = (/turf/simulated/floor{dir = 8; icon_state = "whitecorner"},/area/toxins/hallway)
 "aij" = (/obj/effect/sign/nosmoking_2,/turf/simulated/wall/r_wall,/area/toxins/lab)
 "aik" = (/obj/machinery/light{dir = 8},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/toxins/lab)
 "ail" = (/obj/effect/sign/securearea{desc = "A warning sign which reads 'DANGER: FIRE'"; icon_state = "fire"; name = "DANGER: FIRE"},/turf/simulated/wall/r_wall,/area/toxins/lab)
-"aim" = (/obj/machinery/atmospherics/pipe/simple{dir = 6; icon_state = "intact"; initialize_directions = 6; level = 2},/obj/effect/decal/warning_stripes{tag = "icon-SE-in"; icon_state = "SE-in"},/turf/simulated/floor,/area/toxins/lab)
+"aim" = (/obj/machinery/atmospherics/pipe/simple{dir = 6; icon_state = "intact"; initialize_directions = 6; level = 2},/turf/simulated/floor,/area/toxins/lab)
 "ain" = (/obj/machinery/atmospherics/pipe/manifold{dir = 1; icon_state = "manifold"; level = 2},/obj/machinery/meter,/turf/simulated/floor,/area/toxins/lab)
-"aio" = (/obj/machinery/atmospherics/pipe/simple{icon_state = "intact"; dir = 10; pixel_x = 0; level = 2; initialize_directions = 10},/obj/effect/decal/warning_stripes{tag = "icon-SW-in"; icon_state = "SW-in"},/turf/simulated/floor,/area/toxins/lab)
+"aio" = (/obj/machinery/atmospherics/pipe/simple{icon_state = "intact"; dir = 10; pixel_x = 0; level = 2; initialize_directions = 10},/turf/simulated/floor,/area/toxins/lab)
 "aip" = (/obj/machinery/firealarm{dir = 1; pixel_y = -24},/turf/simulated/floor{icon_state = "white"},/area/toxins/lab)
 "aiq" = (/obj/machinery/driver_button{dir = 2; id = "toxinsdriver"; pixel_x = 24; pixel_y = -24},/obj/machinery/computer/security/telescreen{department = ""; desc = "Used for watching the explosives testing area."; layer = 4; name = "Test Chamber Telescreen"; network = "Bomb Testing"; pixel_x = 32; pixel_y = 0},/obj/structure/stool/bed/chair{dir = 4},/turf/simulated/floor{icon_state = "white"},/area/toxins/lab)
 "air" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/toxins/lab)
-"ais" = (/obj/effect/decal/warning_stripes{tag = "icon-E"; icon_state = "E"},/turf/simulated/floor/airless,/area/toxins/test_area)
-"ait" = (/obj/effect/decal/warning_stripes{tag = "icon-SW-out"; icon_state = "SW-out"},/turf/simulated/floor/airless,/area/toxins/test_area)
+"ais" = (/turf/simulated/floor/airless,/area/toxins/test_area)
+"ait" = (/turf/simulated/floor/airless,/area/toxins/test_area)
 "aiu" = (/obj/machinery/light/small{dir = 4},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating,/area/maintenance/fore)
 "aiv" = (/obj/machinery/door/poddoor/shutters{id = "Execution"},/obj/machinery/door/firedoor/border_only,/obj/structure/window/reinforced{dir = 5; health = 1e+007},/turf/simulated/floor/plating,/area/security/main)
 "aiw" = (/obj/machinery/light{dir = 4},/turf/simulated/floor,/area/security/main)
 "aix" = (/obj/item/device/radio/intercom{freerange = 1; frequency = 1459; name = "Station Intercom (General)"; pixel_x = 30},/turf/simulated/floor,/area/security/range)
 "aiy" = (/obj/structure/table,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/turf/simulated/floor,/area/security/range)
-"aiz" = (/obj/effect/decal/warning_stripes{tag = "icon-S"; icon_state = "S"},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating,/area/security/range)
+"aiz" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating,/area/security/range)
 "aiA" = (/obj/effect/decal/cleanable/dirt,/obj/machinery/light/spot{tag = "icon-bulb1 (WEST)"; icon_state = "bulb1"; dir = 8},/turf/simulated/floor{tag = "icon-vault (NORTHEAST)"; icon_state = "vault"; dir = 5},/area/ai_monitored/storage/eva)
 "aiB" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating,/area/ai_monitored/storage/eva)
 "aiC" = (/obj/item/stack/sheet/metal{amount = 50},/turf/simulated/floor/plating/airless,/area)
@@ -463,11 +463,11 @@
 "aiU" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/firedoor/border_only{dir = 1},/turf/simulated/floor/plating,/area/toxins/lab)
 "aiV" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/machinery/door/firedoor/border_only{dir = 1},/turf/simulated/floor/plating,/area/toxins/lab)
 "aiW" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor/border_only{dir = 1},/turf/simulated/floor/plating,/area/toxins/lab)
-"aiX" = (/obj/effect/decal/warning_stripes{tag = "icon-S"; icon_state = "S"},/obj/machinery/light/spot{dir = 8; layer = 2.8},/turf/simulated/floor/airless,/area/toxins/test_area)
-"aiY" = (/obj/effect/decal/warning_stripes{tag = "icon-S"; icon_state = "S"},/obj/structure/window/reinforced{dir = 5; health = 1e+007},/turf/simulated/floor/airless,/area/toxins/test_area)
-"aiZ" = (/obj/effect/decal/warning_stripes{tag = "icon-S"; icon_state = "S"},/turf/simulated/floor/airless,/area/toxins/test_area)
-"aja" = (/obj/effect/decal/warning_stripes{tag = "icon-NW-in"; icon_state = "NW-in"},/turf/simulated/floor/airless,/area/toxins/test_area)
-"ajb" = (/obj/effect/decal/warning_stripes{tag = "icon-NE-in"; icon_state = "NE-in"},/turf/simulated/floor/airless,/area/toxins/test_area)
+"aiX" = (/obj/machinery/light/spot{dir = 8; layer = 2.8},/turf/simulated/floor/airless,/area/toxins/test_area)
+"aiY" = (/obj/structure/window/reinforced{dir = 5; health = 1e+007},/turf/simulated/floor/airless,/area/toxins/test_area)
+"aiZ" = (/turf/simulated/floor/airless,/area/toxins/test_area)
+"aja" = (/turf/simulated/floor/airless,/area/toxins/test_area)
+"ajb" = (/turf/simulated/floor/airless,/area/toxins/test_area)
 "ajc" = (/obj/structure/table{pixel_y = 0},/obj/machinery/door_control{id = "Execution"; name = "Shutter Control"; pixel_x = -25; pixel_y = 6},/turf/simulated/floor,/area/security/main)
 "ajd" = (/obj/structure/stool/bed/chair{dir = 1},/turf/simulated/floor,/area/security/main)
 "aje" = (/obj/structure/stool/bed/chair{dir = 1},/obj/item/device/radio/intercom{freerange = 1; frequency = 1443; name = "AI Private Channel"; pixel_x = 30},/turf/simulated/floor,/area/security/main)
@@ -520,11 +520,11 @@
 "ajZ" = (/obj/machinery/light{dir = 1},/obj/machinery/alarm{frequency = 1437; pixel_y = 23},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor,/area/assembly/chargebay)
 "aka" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/mecha_wreckage/durand,/turf/simulated/floor,/area/assembly/chargebay)
 "akb" = (/turf/simulated/wall,/area/assembly/chargebay)
-"akc" = (/obj/machinery/light/spot{dir = 8; layer = 2.8},/obj/effect/decal/warning_stripes{tag = "icon-N"; icon_state = "N"},/turf/simulated/floor/airless,/area/toxins/test_area)
-"akd" = (/obj/structure/window/reinforced{dir = 5; health = 1e+007},/obj/effect/decal/warning_stripes{tag = "icon-N"; icon_state = "N"},/turf/simulated/floor/airless,/area/toxins/test_area)
-"ake" = (/obj/machinery/camera{c_tag = "West"; dir = 4; network = "Bomb Testing"},/obj/effect/decal/warning_stripes{tag = "icon-N"; icon_state = "N"},/turf/simulated/floor/airless,/area/toxins/test_area)
-"akf" = (/obj/effect/decal/warning_stripes{tag = "icon-SW-in"; icon_state = "SW-in"},/turf/simulated/floor/airless,/area/toxins/test_area)
-"akg" = (/obj/effect/decal/warning_stripes{tag = "icon-NW-out"; icon_state = "NW-out"},/turf/simulated/floor/airless,/area/toxins/test_area)
+"akc" = (/obj/machinery/light/spot{dir = 8; layer = 2.8},/turf/simulated/floor/airless,/area/toxins/test_area)
+"akd" = (/obj/structure/window/reinforced{dir = 5; health = 1e+007},/turf/simulated/floor/airless,/area/toxins/test_area)
+"ake" = (/obj/machinery/camera{c_tag = "West"; dir = 4; network = "Bomb Testing"},/turf/simulated/floor/airless,/area/toxins/test_area)
+"akf" = (/turf/simulated/floor/airless,/area/toxins/test_area)
+"akg" = (/turf/simulated/floor/airless,/area/toxins/test_area)
 "akh" = (/obj/machinery/firealarm{dir = 8; pixel_x = -24},/obj/machinery/computer/secure_data,/turf/simulated/floor,/area/security/main)
 "aki" = (/obj/structure/stool/bed/chair,/obj/machinery/computer/security/telescreen{desc = "Used for observing Interrogation."; layer = 4; network = "Interrogation"; pixel_y = -30},/turf/simulated/floor,/area/security/main)
 "akj" = (/obj/structure/stool/bed/chair,/turf/simulated/floor,/area/security/main)
@@ -547,7 +547,7 @@
 "akA" = (/obj/structure/rack{dir = 8; layer = 2.9},/obj/item/weapon/tank/jetpack,/turf/simulated/floor{icon_state = "dark"},/area/ai_monitored/storage/eva)
 "akB" = (/obj/machinery/alarm{pixel_y = 23},/obj/structure/rack{dir = 8; layer = 2.9},/obj/item/weapon/tank/jetpack,/turf/simulated/floor{tag = "icon-vault (SOUTHEAST)"; icon_state = "vault"; dir = 6},/area/ai_monitored/storage/eva)
 "akC" = (/obj/item/device/radio,/obj/item/device/assembly/timer,/turf/simulated/floor{tag = "icon-vault (NORTHEAST)"; icon_state = "vault"; dir = 5},/area/ai_monitored/storage/eva)
-"akD" = (/obj/effect/decal/warning_stripes{tag = "icon-N"; icon_state = "N"},/obj/effect/decal/cleanable/dirt,/obj/machinery/light/spot{tag = "icon-bulb1 (EAST)"; icon_state = "bulb1"; dir = 4},/turf/simulated/floor{tag = "icon-vault (NORTHEAST)"; icon_state = "vault"; dir = 5},/area/ai_monitored/storage/eva)
+"akD" = (/obj/effect/decal/cleanable/dirt,/obj/machinery/light/spot{tag = "icon-bulb1 (EAST)"; icon_state = "bulb1"; dir = 4},/turf/simulated/floor{tag = "icon-vault (NORTHEAST)"; icon_state = "vault"; dir = 5},/area/ai_monitored/storage/eva)
 "akE" = (/obj/item/weapon/cable_coil,/obj/item/weapon/cable_coil,/obj/item/weapon/cable_coil,/obj/item/weapon/wirecutters,/turf/simulated/floor/plating/airless,/area)
 "akF" = (/obj/item/weapon/screwdriver{pixel_y = 16},/turf/simulated/floor/plating/airless,/area)
 "akG" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/obj/machinery/photocopier,/turf/simulated/floor,/area/assembly/assembly_line)
@@ -587,7 +587,7 @@
 "alo" = (/obj/machinery/door/window/eastright{name = "Research Division Delivery"; req_access_txt = "34"},/obj/machinery/navbeacon{codes_txt = "delivery;dir=8"; freq = 1400; location = "Research Division"},/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor{icon_state = "bot"},/area/maintenance/starboard)
 "alp" = (/obj/machinery/light/small,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating,/area/maintenance/starboard)
 "alq" = (/obj/machinery/light/small,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating,/area/maintenance/starboard)
-"alr" = (/obj/effect/decal/warning_stripes{tag = "icon-NE-out"; icon_state = "NE-out"},/turf/simulated/floor/airless,/area/toxins/test_area)
+"alr" = (/turf/simulated/floor/airless,/area/toxins/test_area)
 "als" = (/turf/simulated/floor{icon_state = "dark"},/area/security/main)
 "alt" = (/obj/machinery/firealarm{dir = 4; layer = 4; pixel_x = 24},/turf/simulated/floor{icon_state = "dark"},/area/security/main)
 "alu" = (/obj/machinery/firealarm{dir = 1; pixel_y = 25},/turf/simulated/floor,/area/security/main)
@@ -704,7 +704,7 @@
 "anB" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0; tag = "Streight"},/obj/machinery/light/spot{tag = "icon-bulb1 (NORTH)"; icon_state = "bulb1"; dir = 1},/turf/simulated/floor/plating/airless,/area)
 "anC" = (/obj/machinery/door/airlock/external,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0; tag = "Streight"},/turf/simulated/floor/plating/airless,/area/toxins/test_area)
 "anD" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0; tag = "Streight"},/turf/simulated/floor/plating/airless,/area/toxins/test_area)
-"anE" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0; tag = "Streight"},/obj/effect/decal/warning_stripes{tag = "icon-N"; icon_state = "N"},/turf/simulated/floor/plating/airless,/area/toxins/test_area)
+"anE" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0; tag = "Streight"},/turf/simulated/floor/plating/airless,/area/toxins/test_area)
 "anF" = (/obj/machinery/power/apc{dir = 4; name = "Explosives Testing APC"; pixel_x = 25},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/plating/airless,/area/toxins/test_area)
 "anG" = (/obj/machinery/camera{c_tag = "South"; dir = 1; network = "Bomb Testing"},/obj/machinery/light/spot,/turf/simulated/floor/airless,/area/toxins/test_area)
 "anH" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/security{name = "Locker Room"; req_access = null; req_access_txt = "1"},/turf/simulated/floor{icon_state = "dark"},/area/security/main)
@@ -763,7 +763,7 @@
 "aoI" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/security{name = "Locker Room"; req_access = null; req_access_txt = "1"},/turf/simulated/floor,/area/security/main)
 "aoJ" = (/turf/simulated/wall,/area/security/detectives_office)
 "aoK" = (/obj/machinery/door/firedoor/border_only,/obj/structure/window/reinforced{dir = 5; health = 1e+007},/turf/simulated/floor/plating,/area/security/detectives_office)
-"aoL" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/glass/glass_security{name = "\improper Detective's Office"; req_access_txt = "4"},/obj/structure/disposalpipe/segment{dir = 1},/turf/simulated/floor,/area/security/detectives_office)
+"aoL" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/glass_security{name = "\improper Detective's Office"; req_access_txt = "4"},/obj/structure/disposalpipe/segment{dir = 1},/turf/simulated/floor,/area/security/detectives_office)
 "aoM" = (/turf/simulated/floor{icon_state = "red"; dir = 8},/area/hallway/primary/fore)
 "aoN" = (/turf/simulated/floor,/area/hallway/primary/fore)
 "aoO" = (/obj/machinery/light{dir = 1},/turf/simulated/floor,/area/hallway/primary/fore)
@@ -771,7 +771,7 @@
 "aoQ" = (/obj/machinery/firealarm{dir = 1; pixel_y = 25},/turf/simulated/floor,/area/hallway/primary/fore)
 "aoR" = (/obj/machinery/alarm{frequency = 1437; pixel_y = 23},/turf/simulated/floor,/area/hallway/primary/fore)
 "aoS" = (/obj/item/weapon/caution{desc = "Caution! Construction area!"; name = "construction area sign"},/turf/simulated/floor,/area/hallway/primary/fore)
-"aoT" = (/obj/effect/decal/warning_stripes{tag = "icon-N"; icon_state = "N"},/turf/simulated/floor,/area/hallway/primary/fore)
+"aoT" = (/turf/simulated/floor,/area/hallway/primary/fore)
 "aoU" = (/obj/structure/cable,/turf/simulated/floor/plating,/area/hallway/primary/fore)
 "aoV" = (/obj/machinery/light{dir = 1},/obj/item/weapon/caution{desc = "Caution! Construction area!"; name = "construction area sign"},/turf/simulated/floor,/area/hallway/primary/fore)
 "aoW" = (/obj/machinery/atmospherics/pipe/simple/general/visible,/turf/simulated/floor,/area/hallway/primary/fore)
@@ -786,11 +786,11 @@
 "apf" = (/obj/structure/closet/l3closet/scientist,/turf/simulated/floor{icon_state = "white"; dir = 8},/area/toxins/xenobiology)
 "apg" = (/obj/structure/closet/secure_closet/scientist,/turf/simulated/floor{icon_state = "white"; dir = 8},/area/toxins/xenobiology)
 "aph" = (/obj/machinery/disposal,/turf/simulated/floor{icon_state = "white"; dir = 8},/area/toxins/xenobiology)
-"api" = (/obj/machinery/atmospherics/portables_connector{dir = 4},/obj/effect/decal/warning_stripes{tag = "icon-NE-in"; icon_state = "NE-in"},/obj/machinery/light{dir = 1},/turf/simulated/floor,/area/toxins/xenobiology)
-"apj" = (/obj/effect/decal/warning_stripes{tag = "icon-S"; icon_state = "S"},/obj/machinery/atmospherics/valve/digital{color = "yellow"; dir = 4; name = "Xeno Containment"},/obj/machinery/alarm{frequency = 1437; pixel_y = 23},/turf/simulated/floor,/area/toxins/xenobiology)
-"apk" = (/obj/effect/decal/warning_stripes{tag = "icon-NW-in"; icon_state = "NW-in"},/obj/machinery/meter,/obj/machinery/atmospherics/pipe/simple/general/visible{tag = "icon-intact (EAST)"; icon_state = "intact"; dir = 4},/turf/simulated/floor,/area/toxins/xenobiology)
+"api" = (/obj/machinery/atmospherics/portables_connector{dir = 4},/obj/machinery/light{dir = 1},/turf/simulated/floor,/area/toxins/xenobiology)
+"apj" = (/obj/machinery/atmospherics/valve/digital{color = "yellow"; dir = 4; name = "Xeno Containment"},/obj/machinery/alarm{frequency = 1437; pixel_y = 23},/turf/simulated/floor,/area/toxins/xenobiology)
+"apk" = (/obj/machinery/meter,/obj/machinery/atmospherics/pipe/simple/general/visible{tag = "icon-intact (EAST)"; icon_state = "intact"; dir = 4},/turf/simulated/floor,/area/toxins/xenobiology)
 "apl" = (/obj/machinery/atmospherics/pipe/simple/general/hidden{dir = 4},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/toxins/xenobiology)
-"apm" = (/obj/effect/decal/warning_stripes{tag = "icon-W"; icon_state = "W"},/obj/machinery/atmospherics/binary/pump{dir = 4},/turf/simulated/floor,/area/toxins/xenobiology)
+"apm" = (/obj/machinery/atmospherics/binary/pump{dir = 4},/turf/simulated/floor,/area/toxins/xenobiology)
 "apn" = (/obj/machinery/door/firedoor/border_only{dir = 8},/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id = "xenobio"; name = "Containment Shutter"; opacity = 0},/obj/machinery/atmospherics/pipe/simple/general/visible{tag = "icon-intact (EAST)"; icon_state = "intact"; dir = 4},/turf/simulated/floor/plating,/area/toxins/xenobiology)
 "apo" = (/obj/machinery/atmospherics/pipe/simple/general/hidden{dir = 4},/turf/simulated/floor{icon_state = "dark"},/area/toxins/xenobiology)
 "app" = (/obj/machinery/atmospherics/unary/outlet_injector{dir = 8; frequency = 1441; icon_state = "on"; id = "n2o_in"; on = 1; pixel_y = 1},/turf/simulated/floor{icon_state = "dark"},/area/toxins/xenobiology)
@@ -805,7 +805,7 @@
 "apy" = (/obj/machinery/light{dir = 4; icon_state = "tube1"},/turf/simulated/floor{icon_state = "whitehall"; dir = 4},/area/hallway/primary/fore)
 "apz" = (/obj/machinery/door/firedoor/border_only{dir = 8},/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id = "xeno"; name = "Containment Shutter"; opacity = 0},/obj/machinery/door/airlock/glass_medical{name = "Xenobiology"; req_access_txt = "55"},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/toxins/xenobiology)
 "apA" = (/turf/simulated/floor{icon_state = "white"; dir = 8},/area/toxins/xenobiology)
-"apB" = (/obj/machinery/disposal,/obj/effect/decal/warning_stripes{tag = "icon-W"; icon_state = "W"},/obj/structure/disposalpipe/trunk{dir = 4},/turf/simulated/floor,/area/toxins/xenobiology)
+"apB" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk{dir = 4},/turf/simulated/floor,/area/toxins/xenobiology)
 "apC" = (/obj/machinery/door/firedoor/border_only{dir = 8},/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id = "xenobio"; name = "Containment Shutter"; opacity = 0},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plating,/area/toxins/xenobiology)
 "apD" = (/obj/structure/disposaloutlet{dir = 4},/obj/structure/disposalpipe/trunk{dir = 8},/turf/simulated/floor{icon_state = "dark"},/area/toxins/xenobiology)
 "apE" = (/obj/machinery/alarm{dir = 1; pixel_y = -22},/turf/simulated/floor{icon_state = "dark"},/area/toxins/xenobiology)
@@ -830,7 +830,7 @@
 "apX" = (/turf/simulated/floor{icon_state = "whitehall"; dir = 4},/area/hallway/primary/fore)
 "apY" = (/obj/machinery/door/firedoor/border_only{dir = 8},/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id = "xeno"; name = "Containment Shutter"; opacity = 0},/obj/structure/window/reinforced{dir = 5; health = 1e+007},/turf/simulated/floor/plating,/area/toxins/xenobiology)
 "apZ" = (/obj/effect/landmark/start{name = "Scientist"},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/toxins/xenobiology)
-"aqa" = (/obj/structure/table,/obj/machinery/door_control{id = "xenobio"; name = "Emergency Containment Seal"; pixel_x = -1; pixel_y = 7},/obj/effect/decal/warning_stripes{tag = "icon-W"; icon_state = "W"},/turf/simulated/floor,/area/toxins/xenobiology)
+"aqa" = (/obj/structure/table,/obj/machinery/door_control{id = "xenobio"; name = "Emergency Containment Seal"; pixel_x = -1; pixel_y = 7},/turf/simulated/floor,/area/toxins/xenobiology)
 "aqb" = (/obj/machinery/door/firedoor/border_only{dir = 8},/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id = "xenobio"; name = "Containment Shutter"; opacity = 0},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/toxins/xenobiology)
 "aqc" = (/turf/simulated/wall/r_wall,/area/security/main)
 "aqd" = (/obj/machinery/power/apc{dir = 4; name = "Security APC"; pixel_x = 25; pixel_y = 0},/obj/structure/disposalpipe/segment{dir = 1},/turf/simulated/floor,/area/security/main)
@@ -848,8 +848,8 @@
 "aqp" = (/obj/structure/table,/turf/simulated/floor{icon_state = "white"; dir = 8},/area/toxins/xenobiology)
 "aqq" = (/obj/structure/stool/bed/chair,/turf/simulated/floor{icon_state = "white"; dir = 8},/area/toxins/xenobiology)
 "aqr" = (/obj/machinery/optable{name = "Xenobiology Operating Table"},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/toxins/xenobiology)
-"aqs" = (/obj/effect/decal/warning_stripes{tag = "icon-NE-in"; icon_state = "NE-in"},/turf/simulated/floor,/area/toxins/xenobiology)
-"aqt" = (/obj/effect/decal/warning_stripes{tag = "icon-S"; icon_state = "S"},/obj/machinery/shieldwallgen{req_access = list(55)},/turf/simulated/floor{icon_state = "bot"},/area/toxins/xenobiology)
+"aqs" = (/turf/simulated/floor,/area/toxins/xenobiology)
+"aqt" = (/obj/machinery/shieldwallgen{req_access = list(55)},/turf/simulated/floor{icon_state = "bot"},/area/toxins/xenobiology)
 "aqu" = (/obj/machinery/door/firedoor/border_only{dir = 8},/obj/structure/window/reinforced{dir = 5; health = 1e+007},/turf/simulated/floor/plating,/area/toxins/xenobiology)
 "aqv" = (/obj/machinery/light{dir = 1},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/toxins/xenobiology)
 "aqw" = (/obj/machinery/alarm{frequency = 1437; pixel_y = 23},/mob/living/carbon/monkey,/turf/simulated/floor{icon_state = "white"; dir = 8},/area/toxins/xenobiology)
@@ -862,7 +862,7 @@
 "aqD" = (/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor{dir = 8; icon_state = "carpetside"},/area/security/detectives_office)
 "aqE" = (/obj/structure/table/woodentable,/obj/item/device/flashlight/lamp/green,/obj/item/weapon/paper_bin{pixel_x = -3; pixel_y = 7},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor{icon_state = "carpet"},/area/security/detectives_office)
 "aqF" = (/obj/structure/table/woodentable,/obj/item/weapon/pen,/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/turf/simulated/floor{icon_state = "carpet"},/area/security/detectives_office)
-"aqG" = (/obj/structure/table/woodentable,/obj/item/clothing/gloves/detective,/obj/item/device/taperecorder,/obj/item/device/detective_scanner,/obj/machinery/light{dir = 4},/turf/simulated/floor{dir = 4; icon_state = "carpetside"},/area/security/detectives_office)
+"aqG" = (/obj/structure/table/woodentable,/obj/item/device/taperecorder,/obj/item/device/detective_scanner,/obj/machinery/light{dir = 4},/turf/simulated/floor{dir = 4; icon_state = "carpetside"},/area/security/detectives_office)
 "aqH" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/simulated/floor{icon_state = "red"; dir = 8},/area/hallway/primary/port)
 "aqI" = (/obj/machinery/light{dir = 4; icon_state = "tube1"},/obj/structure/disposalpipe/segment,/turf/simulated/floor,/area/hallway/primary/port)
 "aqJ" = (/turf/simulated/floor/plating,/area/hallway/primary/port)
@@ -931,7 +931,7 @@
 "arU" = (/turf/simulated/wall,/area/toxins/lab)
 "arV" = (/obj/structure/rack{dir = 1},/obj/item/stack/sheet/metal{amount = 50; pixel_x = 3; pixel_y = 3},/obj/item/stack/sheet/metal{amount = 50},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/toxins/lab)
 "arW" = (/obj/structure/rack{dir = 1},/obj/item/stack/sheet/glass{amount = 50; pixel_x = 3; pixel_y = 3},/obj/item/stack/sheet/glass{amount = 50; pixel_x = 0; pixel_y = 0},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/toxins/lab)
-"arX" = (/obj/effect/decal/warning_stripes{tag = "icon-W"; icon_state = "W"},/turf/simulated/floor,/area/toxins/lab)
+"arX" = (/turf/simulated/floor,/area/toxins/lab)
 "arY" = (/obj/machinery/r_n_d/circuit_imprinter,/turf/simulated/floor,/area/toxins/lab)
 "arZ" = (/obj/structure/table,/obj/item/stack/sheet/metal{amount = 50},/obj/item/stack/sheet/metal{amount = 50; pixel_x = 3; pixel_y = 3},/turf/simulated/floor,/area/toxins/lab)
 "asa" = (/obj/machinery/r_n_d/protolathe,/turf/simulated/floor,/area/toxins/lab)
@@ -1015,7 +1015,7 @@
 "atA" = (/obj/structure/disposalpipe/sortjunction{backsort = 1; backType = list("Research Director","Robotics"); icon_state = "pipe-j2s"; sortType = list("Research Division")},/turf/simulated/floor,/area/toxins/hallway)
 "atB" = (/obj/machinery/door/firedoor/border_only{dir = 8},/obj/machinery/door/airlock/glass_medical{name = "Technological Research Laboratory"; req_access_txt = "7"},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/toxins/lab)
 "atC" = (/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/toxins/lab)
-"atD" = (/obj/effect/decal/warning_stripes{tag = "icon-W"; icon_state = "W"},/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/turf/simulated/floor,/area/toxins/lab)
+"atD" = (/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/turf/simulated/floor,/area/toxins/lab)
 "atE" = (/obj/machinery/r_n_d/destructive_analyzer,/turf/simulated/floor,/area/toxins/lab)
 "atF" = (/obj/structure/stool/bed/chair{dir = 4},/turf/simulated/floor,/area/toxins/lab)
 "atG" = (/obj/machinery/computer/rdconsole{id = 1; name = "Core R&D Console"},/turf/simulated/floor,/area/toxins/lab)
@@ -1031,7 +1031,7 @@
 "atQ" = (/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/captain)
 "atR" = (/obj/machinery/shower{dir = 2},/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/captain)
 "atS" = (/obj/structure/rack{dir = 8; layer = 2.9},/obj/item/clothing/shoes/magboots,/obj/item/clothing/suit/space/rig,/obj/item/clothing/head/helmet/space/rig,/obj/item/clothing/mask/breath,/obj/item/weapon/tank/oxygen/yellow,/obj/machinery/light/small,/turf/simulated/floor/plating{tag = "icon-warnplate (EAST)"; icon_state = "warnplate"; dir = 4},/area/engine/fore)
-"atT" = (/obj/machinery/door/airlock/glass/glass_engineering{name = "Engineering"; req_access_txt = "10"},/turf/simulated/floor,/area/engine/construction_storage)
+"atT" = (/obj/machinery/door/airlock/glass_engineering{name = "Engineering"; req_access_txt = "10"},/turf/simulated/floor,/area/engine/construction_storage)
 "atU" = (/obj/effect/sign/securearea{desc = "A warning sign which reads 'Nuclear Warhead'"; icon_state = "radiation"; name = "Nuclear Warhead"; pixel_x = -32; pixel_y = 0},/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/machinery/light/spot,/turf/simulated/floor{icon_state = "dark"},/area/security/nuke_storage)
 "atV" = (/obj/structure/closet/crate,/obj/item/stack/sheet/gold{pixel_x = 1; pixel_y = -2},/obj/item/stack/sheet/gold{pixel_x = 1; pixel_y = -2},/turf/simulated/floor{tag = "icon-vault (EAST)"; icon_state = "vault"; dir = 4},/area/security/nuke_storage)
 "atW" = (/turf/simulated/floor{tag = "icon-vault (EAST)"; icon_state = "vault"; dir = 4},/area/security/nuke_storage)
@@ -1041,9 +1041,9 @@
 "aua" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor/border_only{dir = 1},/turf/simulated/floor/plating,/area)
 "aub" = (/obj/machinery/door/firedoor/border_only{dir = 8},/obj/machinery/door/airlock/glass_medical{name = "Research Division"; req_access_txt = "47"},/turf/simulated/floor,/area/toxins/hallway)
 "auc" = (/obj/machinery/door/firedoor/border_only{dir = 8},/obj/structure/window/reinforced{dir = 5; health = 1e+007},/turf/simulated/floor/plating,/area/toxins/lab)
-"aud" = (/obj/effect/decal/warning_stripes{tag = "icon-NE-in"; icon_state = "NE-in"},/obj/structure/disposalpipe/segment{dir = 1},/turf/simulated/floor,/area/toxins/lab)
-"aue" = (/obj/effect/decal/warning_stripes{tag = "icon-S"; icon_state = "S"},/turf/simulated/floor,/area/toxins/lab)
-"auf" = (/obj/structure/table,/obj/effect/decal/warning_stripes{tag = "icon-S"; icon_state = "S"},/obj/item/device/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 31},/turf/simulated/floor,/area/toxins/lab)
+"aud" = (/obj/structure/disposalpipe/segment{dir = 1},/turf/simulated/floor,/area/toxins/lab)
+"aue" = (/turf/simulated/floor,/area/toxins/lab)
+"auf" = (/obj/structure/table,/obj/item/device/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 31},/turf/simulated/floor,/area/toxins/lab)
 "aug" = (/obj/machinery/door/firedoor/border_only{dir = 8},/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/maintenance/fore)
 "auh" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/maintenance/fore)
 "aui" = (/obj/structure/table/reinforced,/turf/simulated/floor{icon_state = "showroomfloor"},/area/security/brig)
@@ -1133,7 +1133,7 @@
 "avO" = (/obj/structure/table,/obj/item/weapon/stock_parts/scanning_module,/obj/item/weapon/stock_parts/scanning_module,/obj/item/weapon/reagent_containers/glass/beaker,/obj/item/weapon/reagent_containers/glass/beaker,/turf/simulated/floor{icon_state = "white"},/area/toxins/lab)
 "avP" = (/obj/item/weapon/stock_parts/console_screen,/obj/structure/table,/obj/item/weapon/stock_parts/console_screen,/obj/item/weapon/stock_parts/console_screen,/obj/item/weapon/stock_parts/matter_bin,/obj/item/weapon/stock_parts/matter_bin,/obj/machinery/light{dir = 4},/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; layer = 4; pixel_x = 24},/turf/simulated/floor{icon_state = "white"},/area/toxins/lab)
 "avQ" = (/obj/machinery/light/small{dir = 4},/turf/simulated/floor/plating,/area/maintenance/fore)
-"avR" = (/obj/structure/closet/wardrobe/warden,/obj/machinery/requests_console{department = "Security"; departmentType = 5; pixel_x = -30; pixel_y = 0},/turf/simulated/floor,/area/security/warden)
+"avR" = (/obj/structure/closet/secure_closet/warden,/obj/machinery/requests_console{department = "Security"; departmentType = 5; pixel_x = -30; pixel_y = 0},/turf/simulated/floor,/area/security/warden)
 "avS" = (/obj/structure/closet/secure_closet/warden,/turf/simulated/floor,/area/security/warden)
 "avT" = (/obj/structure/filingcabinet,/obj/machinery/camera{c_tag = "Wardens Office"; network = "Security"; pixel_x = 22},/turf/simulated/floor,/area/security/warden)
 "avU" = (/obj/structure/table{pixel_y = 0},/obj/item/weapon/book/manual/security_space_law,/turf/simulated/floor,/area/security/warden)
@@ -1242,11 +1242,11 @@
 "axT" = (/obj/structure/table,/obj/machinery/light{dir = 1},/turf/simulated/floor{icon_state = "yellow"; dir = 10},/area/engine/turbine_control)
 "axU" = (/obj/machinery/computer/turbine_computer{vent_network = "Vent Seal"},/turf/simulated/floor{icon_state = "yellow"},/area/engine/turbine_control)
 "axV" = (/obj/structure/table,/turf/simulated/floor{icon_state = "yellow"},/area/engine/turbine_control)
-"axW" = (/obj/machinery/door/firedoor/border_only{dir = 8},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/turf/simulated/wall/heatshield,/area/engine/reactor_core)
+"axW" = (/obj/machinery/door/firedoor/border_only{dir = 8},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/area/engine/reactor_core)
 "axX" = (/turf/simulated/floor/engine,/area/engine/reactor_core)
 "axY" = (/obj/machinery/atmospherics/unary/vent_pump/high_volume{dir = 4; external_pressure_bound = 0; frequency = 1443; icon_state = "in"; id_tag = "air_out"; internal_pressure_bound = 2000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/engine,/area/engine/reactor_core)
 "axZ" = (/obj/machinery/atmospherics/pipe/simple/general/visible{tag = "icon-intact (EAST)"; icon_state = "intact"; dir = 4},/turf/simulated/floor/engine,/area/engine/reactor_core)
-"aya" = (/obj/machinery/door/firedoor/border_only{dir = 8},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/machinery/atmospherics/pipe/simple/general/visible{tag = "icon-intact (EAST)"; icon_state = "intact"; dir = 4},/obj/structure/window/reinforced{dir = 1},/turf/simulated/wall/heatshield,/area/engine/reactor_core)
+"aya" = (/obj/machinery/door/firedoor/border_only{dir = 8},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/machinery/atmospherics/pipe/simple/general/visible{tag = "icon-intact (EAST)"; icon_state = "intact"; dir = 4},/obj/structure/window/reinforced{dir = 1},/area/engine/reactor_core)
 "ayb" = (/obj/machinery/atmospherics/pipe/simple/general/visible{tag = "icon-intact (EAST)"; icon_state = "intact"; dir = 4},/obj/machinery/atmospherics/pipe/simple/general/visible,/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"; tag = "90Curve"},/turf/simulated/floor/plating,/area/engine/aux_control)
 "ayc" = (/obj/machinery/atmospherics/pipe/simple/general/visible{tag = "icon-intact (SOUTHWEST)"; icon_state = "intact"; dir = 10},/obj/machinery/light{dir = 1},/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"; pixel_y = 0; tag = "Streight"},/turf/simulated/floor/plating,/area/engine/aux_control)
 "ayd" = (/obj/structure/table,/turf/simulated/floor{icon_state = "yellow"; dir = 10},/area/engine/aux_control)
@@ -1262,7 +1262,7 @@
 "ayn" = (/obj/structure/closet/secure_closet/brig{name = "Secure Holding Locker 1"; req_access_txt = "2"},/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22},/turf/simulated/floor,/area/security/warden)
 "ayo" = (/obj/machinery/light{dir = 1},/turf/simulated/floor,/area/security/warden)
 "ayp" = (/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/turf/simulated/floor,/area/security/warden)
-"ayq" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/glass/glass_security{name = "Warden's Office"; req_access_txt = "2"},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor,/area/security/warden)
+"ayq" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/glass_security{name = "Warden's Office"; req_access_txt = "2"},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor,/area/security/warden)
 "ayr" = (/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor,/area/security/brig)
 "ays" = (/obj/structure/disposalpipe/sortjunction/nonsorting/NW,/turf/simulated/floor,/area/security/brig)
 "ayt" = (/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id = "brig"; name = "Security Shutters"; opacity = 0},/obj/machinery/door/window/brigdoor{dir = 4; icon_state = "left"; id = "Cell 4"; name = "Cell 4"; req_access_txt = "1"; tag = "icon-left (EAST)"},/turf/simulated/floor{icon_state = "showroomfloor"},/area/security/brig)
@@ -1285,10 +1285,10 @@
 "ayK" = (/obj/structure/cable{tag = "Streight"; icon_state = "4-8"; pixel_x = 1; d1 = 4; d2 = 8},/turf/simulated/floor{dir = 1; icon_state = "yellow"},/area/engine/turbine_control)
 "ayL" = (/obj/structure/stool/bed/chair{dir = 1},/obj/structure/cable{tag = "Streight"; icon_state = "4-8"; pixel_x = 1; d1 = 4; d2 = 8},/turf/simulated/floor{dir = 1; icon_state = "yellow"},/area/engine/turbine_control)
 "ayM" = (/obj/structure/cable{tag = "Streight"; icon_state = "4-8"; pixel_x = 1; d1 = 4; d2 = 8},/turf/simulated/floor{dir = 5; icon_state = "yellow"},/area/engine/turbine_control)
-"ayN" = (/obj/machinery/door/firedoor/border_only{dir = 8},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/cable{tag = "Streight"; icon_state = "4-8"; pixel_x = 1; d1 = 4; d2 = 8},/turf/simulated/wall/heatshield,/area/engine/reactor_core)
-"ayO" = (/obj/machinery/power/turbine{dir = 1},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/turf/simulated/wall/heatshield,/area/engine/reactor_core)
-"ayP" = (/obj/machinery/power/turbine{dir = 1},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/turf/simulated/wall/heatshield,/area/engine/reactor_core)
-"ayQ" = (/obj/machinery/door/firedoor/border_only{dir = 8},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/turf/simulated/wall/heatshield,/area/engine/reactor_core)
+"ayN" = (/obj/machinery/door/firedoor/border_only{dir = 8},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/cable{tag = "Streight"; icon_state = "4-8"; pixel_x = 1; d1 = 4; d2 = 8},/area/engine/reactor_core)
+"ayO" = (/obj/machinery/power/turbine{dir = 1},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/area/engine/reactor_core)
+"ayP" = (/obj/machinery/power/turbine{dir = 1},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/area/engine/reactor_core)
+"ayQ" = (/obj/machinery/door/firedoor/border_only{dir = 8},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/area/engine/reactor_core)
 "ayR" = (/obj/machinery/atmospherics/valve/digital,/turf/simulated/floor/plating,/area/engine/aux_control)
 "ayS" = (/obj/machinery/atmospherics/pipe/simple/general/visible,/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"; tag = "90Curve"},/turf/simulated/floor/plating,/area/engine/aux_control)
 "ayT" = (/obj/structure/cable{tag = "Streight"; icon_state = "4-8"; pixel_x = 1; d1 = 4; d2 = 8},/turf/simulated/floor{dir = 1; icon_state = "yellow"},/area/engine/aux_control)
@@ -1328,9 +1328,9 @@
 "azB" = (/obj/machinery/atmospherics/pipe/simple/general/visible,/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22},/turf/simulated/floor,/area/engine/turbine_control)
 "azC" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/turf/simulated/floor,/area/engine/turbine_control)
 "azD" = (/turf/simulated/floor,/area/engine/turbine_control)
-"azE" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor/border_only{dir = 8},/turf/simulated/wall/heatshield,/area/engine/reactor_core)
-"azF" = (/obj/machinery/compressor{comp_id = "turbine_gens"; dir = 2},/turf/simulated/wall/heatshield,/area/engine/reactor_core)
-"azG" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/firedoor/border_only{dir = 8},/turf/simulated/wall/heatshield,/area/engine/reactor_core)
+"azE" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor/border_only{dir = 8},/area/engine/reactor_core)
+"azF" = (/obj/machinery/compressor{comp_id = "turbine_gens"; dir = 2},/area/engine/reactor_core)
+"azG" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/firedoor/border_only{dir = 8},/area/engine/reactor_core)
 "azH" = (/obj/machinery/atmospherics/pipe/simple/general/visible,/turf/simulated/floor/plating,/area/engine/aux_control)
 "azI" = (/obj/machinery/atmospherics/pipe/simple/general/visible{tag = "icon-intact (NORTHEAST)"; icon_state = "intact"; dir = 5},/obj/machinery/meter,/turf/simulated/floor/plating,/area/engine/aux_control)
 "azJ" = (/obj/machinery/atmospherics/pipe/simple/general/visible{tag = "icon-intact (EAST)"; icon_state = "intact"; dir = 4},/turf/simulated/floor/plating,/area/engine/aux_control)
@@ -1351,14 +1351,14 @@
 "azY" = (/turf/simulated/shuttle/wall{tag = "icon-swall7"; icon_state = "swall7"; dir = 2},/area/shuttle/arrival/station)
 "azZ" = (/obj/structure/shuttle/engine/propulsion{tag = "icon-burst_r (WEST)"; icon_state = "burst_r"; dir = 8},/turf/space,/area/shuttle/arrival/station)
 "aAa" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/machinery/door/firedoor/border_only,/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id = "pbrig"; name = "Security Shutter"; opacity = 0},/turf/simulated/floor/plating,/area/security/warden)
-"aAb" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id = "pbrig"; name = "Security Shutter"; opacity = 0},/obj/machinery/door/airlock/glass/glass_security{name = "Secure Holding Cell  2"; req_access_txt = "2"},/turf/simulated/floor{icon_state = "showroomfloor"},/area/security/warden)
-"aAc" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id = "pbrig"; name = "Security Shutter"; opacity = 0},/obj/machinery/door/airlock/glass/glass_security{name = "Secure Holding Cell 1"; req_access_txt = "2"},/turf/simulated/floor{icon_state = "showroomfloor"},/area/security/warden)
+"aAb" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id = "pbrig"; name = "Security Shutter"; opacity = 0},/obj/machinery/door/airlock/glass_security{name = "Secure Holding Cell  2"; req_access_txt = "2"},/turf/simulated/floor{icon_state = "showroomfloor"},/area/security/warden)
+"aAc" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id = "pbrig"; name = "Security Shutter"; opacity = 0},/obj/machinery/door/airlock/glass_security{name = "Secure Holding Cell 1"; req_access_txt = "2"},/turf/simulated/floor{icon_state = "showroomfloor"},/area/security/warden)
 "aAd" = (/obj/effect/sign/securearea{desc = "A warning sign which reads 'For EMERGENCY use'"; name = "EMERGENCY"},/turf/simulated/wall,/area/security/warden)
 "aAe" = (/obj/effect/landmark{name = "emcloset"},/turf/simulated/floor,/area/security/warden)
 "aAf" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/machinery/door/firedoor/border_only,/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/security/warden)
 "aAg" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/security/brig)
-"aAh" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/glass/glass_security{name = "Security"; req_access_txt = "1"},/turf/simulated/floor,/area/security/brig)
-"aAi" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/glass/glass_security{name = "Security"; req_access_txt = "1"},/obj/structure/disposalpipe/segment{dir = 1},/turf/simulated/floor,/area/security/brig)
+"aAh" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/glass_security{name = "Security"; req_access_txt = "1"},/turf/simulated/floor,/area/security/brig)
+"aAi" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/glass_security{name = "Security"; req_access_txt = "1"},/obj/structure/disposalpipe/segment{dir = 1},/turf/simulated/floor,/area/security/brig)
 "aAj" = (/obj/machinery/light{dir = 4; icon_state = "tube1"},/obj/structure/disposalpipe/segment,/turf/simulated/floor{icon_state = "blue"; dir = 4},/area/hallway/primary/port)
 "aAk" = (/turf/simulated/wall/r_wall,/area/bridge)
 "aAl" = (/obj/machinery/door/firedoor/border_only,/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/bridge)
@@ -1411,7 +1411,7 @@
 "aBg" = (/obj/machinery/light{dir = 1},/turf/simulated/floor,/area/security/lobby)
 "aBh" = (/obj/machinery/firealarm{dir = 2; layer = 4; pixel_x = 0; pixel_y = 25},/obj/machinery/camera{c_tag = "Security Lobby"; dir = 2; network = "Security"},/turf/simulated/floor,/area/security/lobby)
 "aBi" = (/obj/machinery/alarm{frequency = 1437; pixel_y = 23},/turf/simulated/floor,/area/security/lobby)
-"aBj" = (/obj/machinery/door/firedoor/border_only{dir = 8},/obj/machinery/door/airlock/glass/glass_security{name = "Security"; req_access_txt = "0"},/turf/simulated/floor,/area/security/lobby)
+"aBj" = (/obj/machinery/door/firedoor/border_only{dir = 8},/obj/machinery/door/airlock/glass_security{name = "Security"; req_access_txt = "0"},/turf/simulated/floor,/area/security/lobby)
 "aBk" = (/obj/machinery/door/firedoor/border_only{dir = 8},/obj/machinery/door/airlock/command{name = "Bridge"; req_access = null; req_access_txt = "19"},/turf/simulated/floor,/area/bridge)
 "aBl" = (/turf/simulated/floor,/area/bridge)
 "aBm" = (/obj/machinery/firealarm{dir = 1; pixel_y = 25},/turf/simulated/floor,/area/bridge)
@@ -1550,13 +1550,13 @@
 "aDP" = (/obj/machinery/atmospherics/pipe/simple/general/visible{dir = 6; icon_state = "intact"; tag = "icon-intact (NORTHEAST)"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/turf/simulated/floor/plating,/area/engine/port_gyro_bay)
 "aDQ" = (/obj/machinery/atmospherics/pipe/simple/general/visible{tag = "icon-intact (EAST)"; icon_state = "intact"; dir = 4},/obj/machinery/meter,/turf/simulated/floor/plating,/area/engine/port_gyro_bay)
 "aDR" = (/obj/machinery/atmospherics/pipe/simple/general/visible{tag = "icon-intact (EAST)"; icon_state = "intact"; dir = 4},/obj/machinery/rust/gyrotron{dir = 4},/turf/simulated/floor/plating,/area/engine/port_gyro_bay)
-"aDS" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/firedoor/border_only,/obj/machinery/atmospherics/pipe/simple/general/visible{tag = "icon-intact (EAST)"; icon_state = "intact"; dir = 4},/obj/machinery/door/poddoor/shutters{density = 0; dir = 4; icon_state = "shutter0"; network = "Core Shutters"},/turf/simulated/wall/heatshield,/area/engine/port_gyro_bay)
+"aDS" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/firedoor/border_only,/obj/machinery/atmospherics/pipe/simple/general/visible{tag = "icon-intact (EAST)"; icon_state = "intact"; dir = 4},/obj/machinery/door/poddoor/shutters{density = 0; dir = 4; icon_state = "shutter0"; network = "Core Shutters"},/area/engine/port_gyro_bay)
 "aDT" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging,/obj/machinery/atmospherics/unary/vent_pump/high_volume{dir = 8; external_pressure_bound = 0; frequency = 1443; icon_state = "in"; id_tag = "air_out"; internal_pressure_bound = 2000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/engine,/area/engine/reactor_core)
 "aDU" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging,/turf/simulated/floor/engine,/area/engine/reactor_core)
 "aDV" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging{tag = "icon-intact (NORTHEAST)"; icon_state = "intact"; dir = 5},/turf/simulated/floor/engine,/area/engine/reactor_core)
 "aDW" = (/obj/machinery/rust/core,/obj/machinery/atmospherics/pipe/simple/heat_exchanging{tag = "icon-intact (EAST)"; icon_state = "intact"; dir = 4},/turf/simulated/floor/engine,/area/engine/reactor_core)
 "aDX" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging{tag = "icon-intact (NORTHWEST)"; icon_state = "intact"; dir = 9},/turf/simulated/floor/engine,/area/engine/reactor_core)
-"aDY" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/firedoor/border_only,/obj/machinery/door/poddoor/shutters{density = 0; dir = 8; icon_state = "shutter0"; network = "Core Shutters"},/turf/simulated/wall/heatshield,/area/engine/starboard_gyro_bay)
+"aDY" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/firedoor/border_only,/obj/machinery/door/poddoor/shutters{density = 0; dir = 8; icon_state = "shutter0"; network = "Core Shutters"},/area/engine/starboard_gyro_bay)
 "aDZ" = (/obj/machinery/rust/gyrotron{dir = 8},/turf/simulated/floor/plating,/area/engine/starboard_gyro_bay)
 "aEa" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/turf/simulated/floor/plating,/area/engine/starboard_gyro_bay)
 "aEb" = (/obj/machinery/atmospherics/pipe/simple/general/visible,/turf/simulated/wall/r_wall,/area/maintenance/starboard)
@@ -1590,10 +1590,10 @@
 "aED" = (/obj/structure/table,/obj/item/device/aicard,/turf/simulated/floor,/area/bridge)
 "aEE" = (/obj/machinery/atmospherics/pipe/simple/general/visible,/obj/machinery/power/apc{dir = 8; name = "Reactor Port Gyrotron Bay"; pixel_x = -24; pixel_y = 0; pixel_z = 0},/obj/structure/cable{icon_state = "0-2"; pixel_y = 1; d2 = 2},/obj/structure/cable,/turf/simulated/floor/plating{dir = 2; icon_state = "warnplate"; tag = "icon-warnplate (SOUTHWEST)"},/area/engine/port_gyro_bay)
 "aEF" = (/obj/machinery/rust/fuel_injector{dir = 4; stage = "SCRAM"},/turf/simulated/floor/plating,/area/engine/port_gyro_bay)
-"aEG" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/machinery/door/firedoor/border_only,/obj/machinery/door/poddoor/shutters{density = 0; dir = 4; icon_state = "shutter0"; network = "Core Shutters"},/turf/simulated/wall/heatshield,/area/engine/port_gyro_bay)
+"aEG" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/machinery/door/firedoor/border_only,/obj/machinery/door/poddoor/shutters{density = 0; dir = 4; icon_state = "shutter0"; network = "Core Shutters"},/area/engine/port_gyro_bay)
 "aEH" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging{tag = "icon-intact (SOUTHWEST)"; icon_state = "intact"; dir = 10},/obj/machinery/atmospherics/pipe/simple/heat_exchanging{tag = "icon-intact (NORTHEAST)"; icon_state = "intact"; dir = 5},/turf/simulated/floor/engine,/area/engine/reactor_core)
 "aEI" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging{tag = "icon-intact (SOUTHEAST)"; icon_state = "intact"; dir = 6},/obj/machinery/atmospherics/pipe/simple/heat_exchanging{tag = "icon-intact (NORTHWEST)"; icon_state = "intact"; dir = 9},/turf/simulated/floor/engine,/area/engine/reactor_core)
-"aEJ" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/machinery/door/firedoor/border_only,/obj/machinery/door/poddoor/shutters{density = 0; dir = 8; icon_state = "shutter0"; network = "Core Shutters"},/turf/simulated/wall/heatshield,/area/engine/starboard_gyro_bay)
+"aEJ" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/machinery/door/firedoor/border_only,/obj/machinery/door/poddoor/shutters{density = 0; dir = 8; icon_state = "shutter0"; network = "Core Shutters"},/area/engine/starboard_gyro_bay)
 "aEK" = (/obj/machinery/rust/fuel_injector{dir = 8; stage = "SCRAM"},/turf/simulated/floor/plating,/area/engine/starboard_gyro_bay)
 "aEL" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; layer = 4; pixel_x = 24},/turf/simulated/floor/plating{dir = 2; icon_state = "warnplate"; tag = "icon-warnplate (SOUTHWEST)"},/area/engine/starboard_gyro_bay)
 "aEM" = (/obj/machinery/light/small{dir = 4},/turf/simulated/floor/plating,/area/maintenance/starboard)
@@ -1606,8 +1606,8 @@
 "aET" = (/obj/machinery/atmospherics/pipe/manifold{dir = 1; icon_state = "manifold"; level = 2},/obj/machinery/meter,/turf/simulated/floor/plating,/area)
 "aEU" = (/obj/machinery/atmospherics/binary/pump/highcap{dir = 4},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/turf/simulated/floor/plating{tag = "icon-warnplate (EAST)"; icon_state = "warnplate"; dir = 4},/area)
 "aEV" = (/obj/machinery/atmospherics/pipe/simple/general/visible{tag = "icon-intact (EAST)"; icon_state = "intact"; dir = 4},/obj/machinery/door/poddoor{id = "Starboard aft shell access"; name = "Blast Door"},/turf/simulated/floor/plating,/area)
-"aEW" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/hallway/secondary/docking)
-"aEX" = (/obj/machinery/door/airlock/external{name = "Arrival Dock Airlock"},/turf/simulated/floor/plating,/area/hallway/secondary/docking)
+"aEW" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/hallway/secondary/entry)
+"aEX" = (/obj/machinery/door/airlock/external{name = "Arrival Dock Airlock"},/turf/simulated/floor/plating,/area/hallway/secondary/entry)
 "aEY" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/maintenance_hatch{req_access_txt = "12"},/turf/simulated/floor/plating,/area/maintenance/port)
 "aEZ" = (/obj/machinery/vending/cigarette,/turf/simulated/floor,/area/security/lobby)
 "aFa" = (/obj/machinery/vending/snack,/turf/simulated/floor,/area/security/lobby)
@@ -1619,29 +1619,29 @@
 "aFg" = (/obj/machinery/door/poddoor{id = "Fuel storage / Port auxiliary injection"; name = "Blast Door"; network = "Reactor core"},/obj/machinery/atmospherics/pipe/simple/general/visible,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/turf/simulated/floor/plating,/area/engine/port_gyro_bay)
 "aFh" = (/obj/machinery/door/poddoor{id = "Starboard auxiliary injection / Plasma storage"; name = "Blast Door"; network = "Reactor core"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/turf/simulated/floor/plating,/area/engine/starboard_gyro_bay)
 "aFi" = (/obj/machinery/camera{c_tag = "AI Core Port"; dir = 4; network = "Command"},/obj/machinery/telecomms/allinone{frequency = 144.7},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor,/area/turret_protected/ai)
-"aFj" = (/obj/effect/decal/warning_stripes{tag = "icon-SE-in"; icon_state = "SE-in"},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor{icon_state = "dark"},/area/turret_protected/ai)
-"aFk" = (/obj/effect/decal/warning_stripes{tag = "icon-N"; icon_state = "N"},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor{icon_state = "dark"},/area/turret_protected/ai)
-"aFl" = (/obj/effect/decal/warning_stripes{tag = "icon-SW-in"; icon_state = "SW-in"},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor{icon_state = "dark"},/area/turret_protected/ai)
+"aFj" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor{icon_state = "dark"},/area/turret_protected/ai)
+"aFk" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor{icon_state = "dark"},/area/turret_protected/ai)
+"aFl" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor{icon_state = "dark"},/area/turret_protected/ai)
 "aFm" = (/obj/machinery/camera{c_tag = "AI Core Starboard"; dir = 8; network = "Command"},/obj/machinery/power/smes{charge = 5e+006},/obj/effect/decal/cleanable/dirt,/obj/structure/cable,/turf/simulated/floor,/area/turret_protected/ai)
 "aFn" = (/obj/machinery/rust/fuel_compressor{pixel_x = -24},/turf/simulated/floor/plating,/area)
 "aFo" = (/obj/machinery/atmospherics/tvalve/mirrored/digital{icon_state = "tvalvem1"; state = 1},/turf/simulated/floor/plating,/area)
 "aFp" = (/obj/machinery/atmospherics/pipe/simple/general/visible,/obj/machinery/atmospherics/pipe/simple/general/visible{tag = "icon-intact (EAST)"; icon_state = "intact"; dir = 4},/turf/simulated/floor/plating,/area)
 "aFq" = (/obj/machinery/atmospherics/pipe/simple/general/visible{dir = 9; icon_state = "intact"; tag = "icon-intact (NORTHEAST)"},/turf/simulated/floor/plating,/area)
 "aFr" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; layer = 4; pixel_x = 24},/turf/simulated/floor/plating,/area)
-"aFs" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/hallway/secondary/docking)
-"aFt" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/hallway/secondary/docking)
-"aFu" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/effect/sign/securearea{name = "EXTERNAL AIRLOCK"; desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; pixel_x = -1},/obj/structure/window/reinforced,/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/hallway/secondary/docking)
-"aFv" = (/turf/simulated/floor,/area/hallway/secondary/docking)
-"aFw" = (/obj/structure/grille,/obj/effect/sign/securearea{name = "EXTERNAL AIRLOCK"; desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; pixel_x = -1},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/hallway/secondary/docking)
-"aFx" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/machinery/door/firedoor/border_only,/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/hallway/secondary/docking)
-"aFy" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/hallway/secondary/docking)
-"aFz" = (/turf/simulated/wall/r_wall,/area/hallway/secondary/docking)
-"aFA" = (/obj/structure/stool/bed/chair,/obj/machinery/power/apc{cell_type = 5000; dir = 1; name = "Docking Arm APC"; pixel_x = 0; pixel_y = 25},/turf/simulated/floor,/area/hallway/secondary/docking)
-"aFB" = (/obj/structure/stool/bed/chair,/turf/simulated/floor,/area/hallway/secondary/docking)
-"aFC" = (/obj/structure/stool/bed/chair,/obj/machinery/alarm{frequency = 1437; pixel_y = 23},/turf/simulated/floor,/area/hallway/secondary/docking)
-"aFD" = (/obj/structure/stool/bed/chair,/obj/machinery/firealarm{dir = 1; pixel_y = 25},/turf/simulated/floor,/area/hallway/secondary/docking)
-"aFE" = (/obj/structure/stool/bed/chair,/obj/machinery/camera{c_tag = "Arrivals Checkpoint"; network = "Command"; pixel_x = 22},/obj/machinery/light{dir = 1},/turf/simulated/floor,/area/hallway/secondary/docking)
-"aFF" = (/obj/machinery/scanner{dir = 1},/turf/simulated/floor,/area/hallway/secondary/docking)
+"aFs" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/hallway/secondary/entry)
+"aFt" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/hallway/secondary/entry)
+"aFu" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/effect/sign/securearea{name = "EXTERNAL AIRLOCK"; desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; pixel_x = -1},/obj/structure/window/reinforced,/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/hallway/secondary/entry)
+"aFv" = (/turf/simulated/floor,/area/hallway/secondary/entry)
+"aFw" = (/obj/structure/grille,/obj/effect/sign/securearea{name = "EXTERNAL AIRLOCK"; desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; pixel_x = -1},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/hallway/secondary/entry)
+"aFx" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/machinery/door/firedoor/border_only,/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/hallway/secondary/entry)
+"aFy" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/hallway/secondary/entry)
+"aFz" = (/turf/simulated/wall/r_wall,/area/hallway/secondary/entry)
+"aFA" = (/obj/structure/stool/bed/chair,/obj/machinery/power/apc{cell_type = 5000; dir = 1; name = "Docking Arm APC"; pixel_x = 0; pixel_y = 25},/turf/simulated/floor,/area/hallway/secondary/entry)
+"aFB" = (/obj/structure/stool/bed/chair,/turf/simulated/floor,/area/hallway/secondary/entry)
+"aFC" = (/obj/structure/stool/bed/chair,/obj/machinery/alarm{frequency = 1437; pixel_y = 23},/turf/simulated/floor,/area/hallway/secondary/entry)
+"aFD" = (/obj/structure/stool/bed/chair,/obj/machinery/firealarm{dir = 1; pixel_y = 25},/turf/simulated/floor,/area/hallway/secondary/entry)
+"aFE" = (/obj/structure/stool/bed/chair,/obj/machinery/camera{c_tag = "Arrivals Checkpoint"; network = "Command"; pixel_x = 22},/obj/machinery/light{dir = 1},/turf/simulated/floor,/area/hallway/secondary/entry)
+"aFF" = (/obj/machinery/dna_scannernew{dir = 1},/turf/simulated/floor,/area/hallway/secondary/entry)
 "aFG" = (/obj/structure/table/reinforced,/obj/structure/window/reinforced,/obj/item/device/flash,/turf/simulated/floor{icon_state = "red"; dir = 10},/area/bridge)
 "aFH" = (/obj/structure/window/reinforced,/obj/structure/table/reinforced,/obj/machinery/recharger,/turf/simulated/floor{icon_state = "red"},/area/bridge)
 "aFI" = (/obj/structure/closet/fireaxecabinet{pixel_x = 32; pixel_y = 0},/obj/machinery/camera{c_tag = "Bridge (North)"; dir = 8; network = "Command"},/obj/machinery/light{dir = 4},/turf/simulated/floor,/area/bridge)
@@ -1656,41 +1656,41 @@
 "aFR" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/turf/simulated/floor/plating{tag = "icon-warnplate (NORTH)"; icon_state = "warnplate"; dir = 1},/area/engine/reactor_gas)
 "aFS" = (/turf/simulated/wall/r_wall,/area/engine/reactor_gas)
 "aFT" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/item/device/radio/intercom{broadcasting = 1; frequency = 1447; name = "Private AI Channel"; pixel_x = -28; pixel_y = 0},/turf/simulated/floor,/area/turret_protected/ai)
-"aFU" = (/obj/effect/decal/warning_stripes{tag = "icon-W-corner"; icon_state = "W-corner"},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor{icon_state = "dark"},/area/turret_protected/ai)
+"aFU" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor{icon_state = "dark"},/area/turret_protected/ai)
 "aFV" = (/obj/machinery/ai_slipper,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor{icon_state = "dark"},/area/turret_protected/ai)
-"aFW" = (/obj/effect/decal/warning_stripes{tag = "icon-E-corner"; icon_state = "E-corner"},/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor{icon_state = "dark"},/area/turret_protected/ai)
+"aFW" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor{icon_state = "dark"},/area/turret_protected/ai)
 "aFX" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/machinery/power/terminal{icon_state = "term"; dir = 1},/turf/simulated/floor,/area/turret_protected/ai)
-"aFY" = (/turf/simulated/wall,/area/construction/under_construction_small)
-"aFZ" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/cobweb,/turf/simulated/floor,/area/construction/under_construction_small)
-"aGa" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor,/area/construction/under_construction_small)
-"aGb" = (/obj/machinery/light/spot{tag = "icon-bulb1 (NORTH)"; icon_state = "bulb1"; dir = 1},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor,/area/construction/under_construction_small)
-"aGc" = (/turf/simulated/floor,/area/construction/under_construction_small)
-"aGd" = (/turf/simulated/floor/plating,/area/construction/under_construction_small)
-"aGe" = (/obj/item/stack/tile/plasteel,/obj/machinery/light/spot{tag = "icon-bulb1 (NORTH)"; icon_state = "bulb1"; dir = 1},/turf/simulated/floor/plating,/area/construction/under_construction_small)
-"aGf" = (/obj/item/stack/tile/plasteel,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating,/area/construction/under_construction_small)
-"aGg" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating,/area/construction/under_construction_small)
+"aFY" = (/turf/simulated/wall,/area/security/vacantoffice)
+"aFZ" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/cobweb,/turf/simulated/floor,/area/security/vacantoffice)
+"aGa" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor,/area/security/vacantoffice)
+"aGb" = (/obj/machinery/light/spot{tag = "icon-bulb1 (NORTH)"; icon_state = "bulb1"; dir = 1},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor,/area/security/vacantoffice)
+"aGc" = (/turf/simulated/floor,/area/security/vacantoffice)
+"aGd" = (/turf/simulated/floor/plating,/area/security/vacantoffice)
+"aGe" = (/obj/item/stack/tile/plasteel,/obj/machinery/light/spot{tag = "icon-bulb1 (NORTH)"; icon_state = "bulb1"; dir = 1},/turf/simulated/floor/plating,/area/security/vacantoffice)
+"aGf" = (/obj/item/stack/tile/plasteel,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating,/area/security/vacantoffice)
+"aGg" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating,/area/security/vacantoffice)
 "aGh" = (/obj/structure/closet/crate,/obj/item/weapon/rcd_ammo,/obj/item/weapon/rcd_ammo,/obj/item/weapon/rcd_ammo,/obj/item/weapon/rcd_ammo,/obj/item/weapon/rcd_ammo,/turf/simulated/floor/plating,/area)
 "aGi" = (/obj/machinery/atmospherics/pipe/simple/insulated{dir = 5},/obj/machinery/atmospherics/pipe/simple/general/visible{tag = "icon-intact (NORTHEAST)"; icon_state = "intact"; dir = 5},/turf/simulated/floor/plating,/area)
 "aGj" = (/obj/machinery/atmospherics/pipe/manifold{dir = 2; icon_state = "manifold"; level = 2},/obj/machinery/meter,/turf/simulated/floor/plating,/area)
 "aGk" = (/obj/machinery/atmospherics/pipe/simple/general/visible{tag = "icon-intact (SOUTHWEST)"; icon_state = "intact"; dir = 10},/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/plating{dir = 2; icon_state = "warnplate"; tag = "icon-warnplate (SOUTHWEST)"},/area)
 "aGl" = (/obj/machinery/light/small,/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"; tag = "90Curve"},/turf/simulated/floor/plating,/area)
-"aGm" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/hallway/secondary/docking)
-"aGn" = (/obj/effect/decal/cleanable/dirt,/obj/structure/closet/emcloset,/turf/simulated/floor,/area/hallway/secondary/docking)
-"aGo" = (/obj/effect/decal/cleanable/dirt,/obj/machinery/camera{c_tag = "Docking Arm Port"; network = "SS13"; pixel_x = 22},/turf/simulated/floor,/area/hallway/secondary/docking)
-"aGp" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor,/area/hallway/secondary/docking)
-"aGq" = (/obj/machinery/light{dir = 1},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor,/area/hallway/secondary/docking)
-"aGr" = (/obj/machinery/light{dir = 1},/turf/simulated/floor,/area/hallway/secondary/docking)
-"aGs" = (/obj/machinery/door/firedoor/border_only,/turf/simulated/floor,/area/hallway/secondary/docking)
-"aGt" = (/obj/structure/closet/emcloset,/turf/simulated/floor,/area/hallway/secondary/docking)
-"aGu" = (/obj/effect/landmark{name = "emcloset"},/turf/simulated/floor,/area/hallway/secondary/docking)
-"aGv" = (/obj/machinery/camera{c_tag = "Docking Arm Central"; network = "SS13"; pixel_x = 22},/turf/simulated/floor,/area/hallway/secondary/docking)
-"aGw" = (/obj/machinery/firealarm{dir = 1; pixel_y = 30},/turf/simulated/floor,/area/hallway/secondary/docking)
-"aGx" = (/obj/machinery/alarm{frequency = 1437; pixel_y = 23},/turf/simulated/floor,/area/hallway/secondary/docking)
-"aGy" = (/obj/machinery/camera{c_tag = "Docking Arm Starboard"; network = "SS13"; pixel_x = 22},/turf/simulated/floor,/area/hallway/secondary/docking)
-"aGz" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/glass,/turf/simulated/floor,/area/hallway/secondary/docking)
+"aGm" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/hallway/secondary/entry)
+"aGn" = (/obj/effect/decal/cleanable/dirt,/obj/structure/closet/emcloset,/turf/simulated/floor,/area/hallway/secondary/entry)
+"aGo" = (/obj/effect/decal/cleanable/dirt,/obj/machinery/camera{c_tag = "Docking Arm Port"; network = "SS13"; pixel_x = 22},/turf/simulated/floor,/area/hallway/secondary/entry)
+"aGp" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor,/area/hallway/secondary/entry)
+"aGq" = (/obj/machinery/light{dir = 1},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor,/area/hallway/secondary/entry)
+"aGr" = (/obj/machinery/light{dir = 1},/turf/simulated/floor,/area/hallway/secondary/entry)
+"aGs" = (/obj/machinery/door/firedoor/border_only,/turf/simulated/floor,/area/hallway/secondary/entry)
+"aGt" = (/obj/structure/closet/emcloset,/turf/simulated/floor,/area/hallway/secondary/entry)
+"aGu" = (/obj/effect/landmark{name = "emcloset"},/turf/simulated/floor,/area/hallway/secondary/entry)
+"aGv" = (/obj/machinery/camera{c_tag = "Docking Arm Central"; network = "SS13"; pixel_x = 22},/turf/simulated/floor,/area/hallway/secondary/entry)
+"aGw" = (/obj/machinery/firealarm{dir = 1; pixel_y = 30},/turf/simulated/floor,/area/hallway/secondary/entry)
+"aGx" = (/obj/machinery/alarm{frequency = 1437; pixel_y = 23},/turf/simulated/floor,/area/hallway/secondary/entry)
+"aGy" = (/obj/machinery/camera{c_tag = "Docking Arm Starboard"; network = "SS13"; pixel_x = 22},/turf/simulated/floor,/area/hallway/secondary/entry)
+"aGz" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/glass,/turf/simulated/floor,/area/hallway/secondary/entry)
 "aGA" = (/obj/machinery/door/firedoor/border_only{dir = 8},/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced/tinted{dir = 4; icon_state = "twindow"; tag = ""},/turf/simulated/floor/plating,/area/bridge)
 "aGB" = (/obj/structure/window/reinforced/tinted{dir = 5},/turf/simulated/floor{dir = 9; icon_state = "blue"},/area/bridge)
-"aGC" = (/obj/structure/table/reinforced,/obj/item/weapon/storage/recordsbox,/turf/simulated/floor{dir = 1; icon_state = "blue"},/area/bridge)
+"aGC" = (/obj/structure/table/reinforced,/turf/simulated/floor{dir = 1; icon_state = "blue"},/area/bridge)
 "aGD" = (/obj/item/device/radio/intercom{freerange = 1; frequency = 1459; name = "Station Intercom (General)"; pixel_x = 30},/turf/simulated/floor,/area/bridge)
 "aGE" = (/obj/machinery/light{icon_state = "tube1"; dir = 4},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/turf/simulated/floor,/area/engine/generators)
 "aGF" = (/obj/machinery/rust/fuel_compressor{pixel_x = -24},/obj/machinery/atmospherics/pipe/simple/general/visible{tag = "icon-intact (NORTHEAST)"; icon_state = "intact"; dir = 5},/turf/simulated/floor/plating,/area/engine/reactor_fuel_storage)
@@ -1698,10 +1698,10 @@
 "aGH" = (/obj/machinery/atmospherics/trinary/filter{dir = 4},/turf/simulated/floor/plating,/area/engine/reactor_fuel_storage)
 "aGI" = (/obj/machinery/atmospherics/tvalve/digital{dir = 4; layer = 2.4},/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"; tag = "90Curve"},/turf/simulated/floor/plating,/area/engine/reactor_fuel_storage)
 "aGJ" = (/obj/machinery/power/apc{dir = 4; name = "Reactor Fuel Storage APC"; pixel_x = 24; pixel_y = 0; pixel_z = 0},/obj/machinery/atmospherics/pipe/simple/general/visible{tag = "icon-intact (SOUTHWEST)"; icon_state = "intact"; dir = 10},/obj/structure/cable{d2 = 2; icon_state = "0-2"; pixel_y = 0},/obj/structure/cable{d2 = 8; icon_state = "0-8"; pixel_y = 0},/turf/simulated/floor/plating,/area/engine/reactor_fuel_storage)
-"aGK" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/firedoor/border_only,/obj/machinery/door/poddoor/shutters{density = 0; dir = 1; icon_state = "shutter0"; network = "Core Shutters"},/turf/simulated/wall/heatshield,/area/engine/reactor_core)
-"aGL" = (/obj/machinery/door/firedoor/border_only,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/machinery/door/poddoor/shutters{density = 0; dir = 1; icon_state = "shutter0"; network = "Core Shutters"},/turf/simulated/wall/heatshield,/area/engine/reactor_core)
-"aGM" = (/obj/machinery/door/firedoor/border_only,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/machinery/door/poddoor/shutters{density = 0; dir = 1; icon_state = "shutter0"; network = "Core Shutters"},/obj/machinery/atmospherics/pipe/simple/general/visible,/turf/simulated/wall/heatshield,/area/engine/reactor_core)
-"aGN" = (/obj/machinery/door/firedoor/border_only,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/poddoor/shutters{density = 0; dir = 1; icon_state = "shutter0"; network = "Core Shutters"},/turf/simulated/wall/heatshield,/area/engine/reactor_core)
+"aGK" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/firedoor/border_only,/obj/machinery/door/poddoor/shutters{density = 0; dir = 1; icon_state = "shutter0"; network = "Core Shutters"},/area/engine/reactor_core)
+"aGL" = (/obj/machinery/door/firedoor/border_only,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/machinery/door/poddoor/shutters{density = 0; dir = 1; icon_state = "shutter0"; network = "Core Shutters"},/area/engine/reactor_core)
+"aGM" = (/obj/machinery/door/firedoor/border_only,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/machinery/door/poddoor/shutters{density = 0; dir = 1; icon_state = "shutter0"; network = "Core Shutters"},/obj/machinery/atmospherics/pipe/simple/general/visible,/area/engine/reactor_core)
+"aGN" = (/obj/machinery/door/firedoor/border_only,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/poddoor/shutters{density = 0; dir = 1; icon_state = "shutter0"; network = "Core Shutters"},/area/engine/reactor_core)
 "aGO" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/plating,/area/engine/reactor_gas)
 "aGP" = (/obj/machinery/atmospherics/binary/pump/highcap,/obj/structure/cable{tag = "Streight"; icon_state = "4-8"; pixel_x = 1; d1 = 4; d2 = 8},/turf/simulated/floor/plating,/area/engine/reactor_gas)
 "aGQ" = (/obj/structure/cable{tag = "Streight"; icon_state = "4-8"; pixel_x = 1; d1 = 4; d2 = 8},/turf/simulated/floor/plating,/area/engine/reactor_gas)
@@ -1711,7 +1711,7 @@
 "aGU" = (/obj/machinery/turret{desc = "aicore"; dir = 4},/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor,/area/turret_protected/ai)
 "aGV" = (/obj/machinery/turret{dir = 8; id = "aicore"},/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor,/area/turret_protected/ai)
 "aGW" = (/obj/machinery/door/poddoor{id = "Port aft shell access"; name = "Blast Door"},/obj/machinery/atmospherics/pipe/simple/general/visible,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/turf/simulated/floor/plating,/area)
-"aGX" = (/obj/item/device/radio/beacon,/turf/simulated/floor,/area/hallway/secondary/docking)
+"aGX" = (/obj/item/device/radio/beacon,/turf/simulated/floor,/area/hallway/secondary/entry)
 "aGY" = (/obj/machinery/computer/communications,/turf/simulated/floor{icon_state = "blue"; dir = 8},/area/bridge)
 "aGZ" = (/obj/machinery/hologram/holopad,/obj/structure/disposalpipe/segment{dir = 1},/turf/simulated/floor,/area/bridge)
 "aHa" = (/obj/machinery/computer/card,/turf/simulated/floor,/area/bridge)
@@ -1736,14 +1736,14 @@
 "aHt" = (/obj/machinery/atmospherics/pipe/simple/general/visible{tag = "icon-intact (SOUTHWEST)"; icon_state = "intact"; dir = 10},/turf/simulated/floor/plating,/area/maintenance/starboard)
 "aHu" = (/obj/machinery/door/firedoor/border_only{dir = 8},/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/machinery/atmospherics/pipe/simple/general/visible,/turf/simulated/floor/plating,/area/maintenance/starboard)
 "aHv" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/machinery/light/spot,/turf/simulated/floor,/area/turret_protected/ai)
-"aHw" = (/obj/effect/decal/warning_stripes{tag = "icon-W-corner"; icon_state = "W-corner"},/obj/effect/decal/cleanable/dirt,/obj/machinery/ai_status_display{pixel_x = 0; pixel_y = -32},/turf/simulated/floor{icon_state = "dark"},/area/turret_protected/ai)
-"aHx" = (/obj/effect/decal/warning_stripes{tag = "icon-E-corner"; icon_state = "E-corner"},/obj/effect/decal/cleanable/dirt,/obj/machinery/status_display{density = 0; layer = 4; pixel_x = 0; pixel_y = -32},/turf/simulated/floor{icon_state = "dark"},/area/turret_protected/ai)
+"aHw" = (/obj/effect/decal/cleanable/dirt,/obj/machinery/ai_status_display{pixel_x = 0; pixel_y = -32},/turf/simulated/floor{icon_state = "dark"},/area/turret_protected/ai)
+"aHx" = (/obj/effect/decal/cleanable/dirt,/obj/machinery/status_display{density = 0; layer = 4; pixel_x = 0; pixel_y = -32},/turf/simulated/floor{icon_state = "dark"},/area/turret_protected/ai)
 "aHy" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/machinery/alarm{dir = 1; layer = 4; pixel_y = -22},/turf/simulated/floor,/area/turret_protected/ai)
 "aHz" = (/obj/machinery/light{dir = 4; icon_state = "tube1"},/turf/simulated/floor,/area/hallway/primary/starboard)
-"aHA" = (/obj/item/stack/tile/plasteel,/turf/simulated/floor/plating,/area/construction/under_construction_small)
-"aHB" = (/obj/item/stack/sheet/metal{amount = 50},/obj/item/stack/sheet/metal{amount = 50},/turf/simulated/floor/plating,/area/construction/under_construction_small)
+"aHA" = (/obj/item/stack/tile/plasteel,/turf/simulated/floor/plating,/area/security/vacantoffice)
+"aHB" = (/obj/item/stack/sheet/metal{amount = 50},/obj/item/stack/sheet/metal{amount = 50},/turf/simulated/floor/plating,/area/security/vacantoffice)
 "aHC" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating,/area/maintenance/starboard)
-"aHD" = (/obj/machinery/light,/turf/simulated/floor,/area/hallway/secondary/docking)
+"aHD" = (/obj/machinery/light,/turf/simulated/floor,/area/hallway/secondary/entry)
 "aHE" = (/obj/structure/window/reinforced/tinted{dir = 5},/turf/simulated/floor{icon_state = "blue"; dir = 10},/area/bridge)
 "aHF" = (/obj/machinery/computer/station_alert,/turf/simulated/floor{dir = 0; icon_state = "blue"},/area/bridge)
 "aHG" = (/obj/structure/table,/obj/item/weapon/storage/PDAbox,/obj/item/device/assembly/signaler,/obj/item/device/assembly/signaler,/turf/simulated/floor,/area/bridge)
@@ -1764,13 +1764,13 @@
 "aHV" = (/obj/machinery/door/airlock/highsecurity{name = "AI Core"; req_access_txt = "16"},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor{icon_state = "dark"},/area/turret_protected/ai)
 "aHW" = (/obj/machinery/camera{c_tag = "Starboard Hallway - Construction"; dir = 4; network = "SS13"},/obj/structure/disposalpipe/segment{dir = 1},/turf/simulated/floor,/area/hallway/primary/starboard)
 "aHX" = (/obj/item/weapon/caution{desc = "Caution! Construction area!"; name = "construction area sign"},/turf/simulated/floor,/area/hallway/primary/starboard)
-"aHY" = (/obj/machinery/door/airlock/maintenance{name = "Construction Area"; req_access_txt = "10"},/turf/simulated/floor/plating,/area/construction/under_construction_small)
-"aHZ" = (/obj/structure/table,/obj/machinery/light/spot{tag = "icon-bulb1 (EAST)"; icon_state = "bulb1"; dir = 4},/turf/simulated/floor/plating,/area/construction/under_construction_small)
-"aIa" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/hallway/secondary/docking)
-"aIb" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/firedoor/border_only,/obj/effect/sign/redcross{name = "Emergency Shuttle"},/turf/simulated/floor/plating,/area/hallway/secondary/docking)
-"aIc" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/firedoor/border_only,/obj/structure/window/reinforced{dir = 4},/obj/effect/sign/securearea{name = "EXTERNAL AIRLOCK"; desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; pixel_x = -1},/turf/simulated/floor/plating,/area/hallway/secondary/docking)
-"aId" = (/obj/machinery/door/airlock/external{name = "Evacuation Dock Airlock"},/turf/simulated/floor/plating,/area/hallway/secondary/docking)
-"aIe" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/firedoor/border_only,/obj/structure/window/reinforced{dir = 8},/obj/effect/sign/securearea{name = "EXTERNAL AIRLOCK"; desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; pixel_x = -1},/turf/simulated/floor/plating,/area/hallway/secondary/docking)
+"aHY" = (/obj/machinery/door/airlock/maintenance{name = "Construction Area"; req_access_txt = "10"},/turf/simulated/floor/plating,/area/security/vacantoffice)
+"aHZ" = (/obj/structure/table,/obj/machinery/light/spot{tag = "icon-bulb1 (EAST)"; icon_state = "bulb1"; dir = 4},/turf/simulated/floor/plating,/area/security/vacantoffice)
+"aIa" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/hallway/secondary/entry)
+"aIb" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/firedoor/border_only,/obj/effect/sign/redcross{name = "Emergency Shuttle"},/turf/simulated/floor/plating,/area/hallway/secondary/entry)
+"aIc" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/firedoor/border_only,/obj/structure/window/reinforced{dir = 4},/obj/effect/sign/securearea{name = "EXTERNAL AIRLOCK"; desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; pixel_x = -1},/turf/simulated/floor/plating,/area/hallway/secondary/entry)
+"aId" = (/obj/machinery/door/airlock/external{name = "Evacuation Dock Airlock"},/turf/simulated/floor/plating,/area/hallway/secondary/entry)
+"aIe" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/firedoor/border_only,/obj/structure/window/reinforced{dir = 8},/obj/effect/sign/securearea{name = "EXTERNAL AIRLOCK"; desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; pixel_x = -1},/turf/simulated/floor/plating,/area/hallway/secondary/entry)
 "aIf" = (/turf/simulated/wall,/area/security/checkpoint)
 "aIg" = (/obj/item/weapon/pen,/obj/structure/table/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/firedoor/border_only,/obj/item/weapon/stamp/hop,/turf/simulated/floor,/area/security/checkpoint)
 "aIh" = (/obj/structure/table/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/item/weapon/paper_bin{pixel_x = -3; pixel_y = 7},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor,/area/security/checkpoint)
@@ -1800,8 +1800,8 @@
 "aIF" = (/obj/machinery/atmospherics/pipe/tank/toxins{dir = 1},/turf/simulated/floor/plating,/area/engine/reactor_gas)
 "aIG" = (/obj/machinery/door/firedoor/border_only{dir = 8},/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/machinery/atmospherics/pipe/simple/general/visible,/turf/simulated/floor/plating,/area/maintenance/starboard)
 "aIH" = (/obj/machinery/turretid{id = "upload"; pixel_x = -24; pixel_y = -7},/obj/machinery/turretid{id = "aicore"; pixel_x = -24; pixel_y = 7},/obj/effect/decal/cleanable/dirt,/obj/effect/sign/electricshock{desc = "A warning sign which reads 'SENTRY GUNS'"; name = "WARNING: SENTRY GUNS"; pixel_x = 32; pixel_y = 0},/obj/machinery/camera{c_tag = "AI Core Access"; dir = 8; network = "Command"},/turf/simulated/floor{icon_state = "dark"},/area/turret_protected/ai)
-"aII" = (/obj/item/weapon/crowbar,/turf/simulated/floor,/area/construction/under_construction_small)
-"aIJ" = (/obj/structure/table,/obj/item/weapon/cable_coil,/turf/simulated/floor/plating,/area/construction/under_construction_small)
+"aII" = (/obj/item/weapon/crowbar,/turf/simulated/floor,/area/security/vacantoffice)
+"aIJ" = (/obj/structure/table,/obj/item/weapon/cable_coil,/turf/simulated/floor/plating,/area/security/vacantoffice)
 "aIK" = (/turf/space,/area/shuttle/escape/station)
 "aIL" = (/obj/structure/filingcabinet,/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/simulated/floor,/area/security/checkpoint)
 "aIM" = (/obj/structure/stool/bed/chair{dir = 1},/turf/simulated/floor,/area/security/checkpoint)
@@ -1818,10 +1818,10 @@
 "aIX" = (/obj/machinery/door/poddoor{id = "Assembly room / Primary injection"; name = "Blast Door"; network = "Reactor core"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/turf/simulated/floor/plating,/area/engine/reactor_core)
 "aIY" = (/obj/machinery/door/poddoor{id = "Assembly room / Plasma Storage"; name = "Blast Door"; network = "Reactor core"},/obj/machinery/atmospherics/pipe/simple/general/visible{tag = "icon-intact (EAST)"; icon_state = "intact"; dir = 4},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/turf/simulated/floor/plating,/area/engine/reactor_gas)
 "aIZ" = (/turf/simulated/wall/r_wall,/area/turret_protected/ai_upload)
-"aJa" = (/obj/machinery/door/airlock/highsecurity{name = "AI Core"; req_access_txt = "16"},/obj/effect/decal/warning_stripes{tag = "icon-E-corner"; icon_state = "E-corner"},/obj/effect/decal/warning_stripes{tag = "icon-W-corner"; icon_state = "W-corner"},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor{icon_state = "dark"},/area/turret_protected/ai_upload)
-"aJb" = (/obj/machinery/light/spot,/turf/simulated/floor,/area/construction/under_construction_small)
-"aJc" = (/obj/item/stack/rods{amount = 50},/turf/simulated/floor/plating,/area/construction/under_construction_small)
-"aJd" = (/obj/structure/table,/obj/item/weapon/storage/toolbox/mechanical,/turf/simulated/floor/plating,/area/construction/under_construction_small)
+"aJa" = (/obj/machinery/door/airlock/highsecurity{name = "AI Core"; req_access_txt = "16"},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor{icon_state = "dark"},/area/turret_protected/ai_upload)
+"aJb" = (/obj/machinery/light/spot,/turf/simulated/floor,/area/security/vacantoffice)
+"aJc" = (/obj/item/stack/rods{amount = 50},/turf/simulated/floor/plating,/area/security/vacantoffice)
+"aJd" = (/obj/structure/table,/obj/item/weapon/storage/toolbox/mechanical,/turf/simulated/floor/plating,/area/security/vacantoffice)
 "aJe" = (/obj/machinery/disposal,/obj/machinery/firealarm{dir = 8; pixel_x = -24},/obj/structure/disposalpipe/trunk{dir = 4},/turf/simulated/floor,/area/security/checkpoint)
 "aJf" = (/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor,/area/security/checkpoint)
 "aJg" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/glass_command{name = "\improper Arrivals Checkpoint"; req_access_txt = "19; 15"},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor,/area/security/checkpoint)
@@ -1849,15 +1849,15 @@
 "aJC" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"; tag = "90Curve"},/turf/simulated/floor/plating{tag = "icon-warnplate (NORTH)"; icon_state = "warnplate"; dir = 1},/area/engine/reactor_fuel_ports)
 "aJD" = (/turf/simulated/wall/r_wall,/area/engine/reactor_fuel_ports)
 "aJE" = (/obj/machinery/turret{dir = 4; id = "upload"},/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/cobweb,/obj/machinery/light/spot{tag = "icon-bulb1 (NORTH)"; icon_state = "bulb1"; dir = 1},/turf/simulated/floor,/area/turret_protected/ai_upload)
-"aJF" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/machinery/computer/aistatus{pixel_y = 32},/turf/simulated/floor,/area/turret_protected/ai_upload)
-"aJG" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/machinery/computer/borgupload/mainframe{pixel_y = 32},/turf/simulated/floor,/area/turret_protected/ai_upload)
+"aJF" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor,/area/turret_protected/ai_upload)
+"aJG" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/machinery/computer/borgupload{pixel_y = 32},/turf/simulated/floor,/area/turret_protected/ai_upload)
 "aJH" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor{icon_state = "dark"},/area/turret_protected/ai_upload)
-"aJI" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/machinery/computer/aiupload/mainframe{pixel_y = 32},/turf/simulated/floor,/area/turret_protected/ai_upload)
-"aJJ" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/structure/aiuploadcloset{pixel_y = 32},/turf/simulated/floor,/area/turret_protected/ai_upload)
+"aJI" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/machinery/computer/aiupload,/turf/simulated/floor,/area/turret_protected/ai_upload)
+"aJJ" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor,/area/turret_protected/ai_upload)
 "aJK" = (/obj/machinery/turret{dir = 8; id = "upload"},/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/machinery/light/spot{tag = "icon-bulb1 (NORTH)"; icon_state = "bulb1"; dir = 1},/turf/simulated/floor,/area/turret_protected/ai_upload)
 "aJL" = (/turf/simulated/wall,/area/quartermaster/sorting)
-"aJM" = (/obj/machinery/light/spot,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating,/area/construction/under_construction_small)
-"aJN" = (/obj/structure/table,/obj/item/weapon/storage/toolbox/electrical,/turf/simulated/floor/plating,/area/construction/under_construction_small)
+"aJM" = (/obj/machinery/light/spot,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating,/area/security/vacantoffice)
+"aJN" = (/obj/structure/table,/obj/item/weapon/storage/toolbox/electrical,/turf/simulated/floor/plating,/area/security/vacantoffice)
 "aJO" = (/obj/machinery/photocopier,/obj/machinery/camera{c_tag = "Arrivals Office"; dir = 4; network = "Command"},/turf/simulated/floor,/area/security/checkpoint)
 "aJP" = (/mob/living/simple_animal/corgi/Ian,/turf/simulated/floor,/area/security/checkpoint)
 "aJQ" = (/obj/machinery/vending/cart,/turf/simulated/floor,/area/security/checkpoint)
@@ -1927,7 +1927,7 @@
 "aLc" = (/turf/simulated/floor/plating,/area/quartermaster/sorting)
 "aLd" = (/obj/machinery/conveyor{dir = 2; id = "MailRoom"},/turf/simulated/floor/plating,/area/quartermaster/sorting)
 "aLe" = (/obj/machinery/requests_console{announcementConsole = 1; department = "Cargo Bay"; departmentType = 6; name = "Cargo Bay Requests Console"; pixel_y = 24},/turf/simulated/floor,/area/quartermaster/sorting)
-"aLf" = (/obj/structure/closet/secure_closet/cargo_tech_personal,/turf/simulated/floor,/area/quartermaster/sorting)
+"aLf" = (/turf/simulated/floor,/area/quartermaster/sorting)
 "aLg" = (/obj/machinery/door/firedoor/border_only{dir = 8},/obj/structure/window/basic{dir = 5},/turf/simulated/floor/plating,/area/quartermaster/sorting)
 "aLh" = (/obj/structure/table,/obj/item/weapon/crowbar,/obj/item/device/radio,/turf/simulated/floor,/area/quartermaster/storage)
 "aLi" = (/obj/machinery/autolathe,/obj/machinery/light{dir = 1},/turf/simulated/floor,/area/quartermaster/storage)
@@ -1972,7 +1972,7 @@
 "aLV" = (/obj/structure/window/basic{dir = 1},/obj/structure/closet/crate,/turf/simulated/floor,/area/quartermaster/sorting)
 "aLW" = (/obj/structure/window/basic{dir = 1},/obj/structure/closet/crate,/turf/simulated/floor/plating,/area/quartermaster/sorting)
 "aLX" = (/turf/simulated/floor,/area/quartermaster/sorting)
-"aLY" = (/obj/structure/closet/secure_closet/cargo_tech_personal,/turf/simulated/floor/plating,/area/quartermaster/sorting)
+"aLY" = (/turf/simulated/floor/plating,/area/quartermaster/sorting)
 "aLZ" = (/obj/structure/table/reinforced,/obj/item/weapon/packageWrap,/obj/item/device/destTagger{pixel_x = 4; pixel_y = 3},/turf/simulated/floor,/area/quartermaster/storage)
 "aMa" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/effect/sign/securearea{name = "EXTERNAL AIRLOCK"; desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; pixel_x = -1},/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/firedoor/border_only{dir = 8},/turf/simulated/floor/plating,/area/quartermaster/storage)
 "aMb" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/quartermaster/storage)
@@ -2063,8 +2063,8 @@
 "aNI" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor/border_only{dir = 1},/obj/structure/cable{d2 = 8; icon_state = "0-8"; pixel_y = 0},/obj/machinery/door/poddoor/shutters{density = 0; icon_state = "shutter0"; network = "Observation Shutters"; opacity = 0},/turf/simulated/floor/plating,/area/engine/control)
 "aNJ" = (/obj/machinery/power/monitor{name = "Generator Power Output"},/turf/simulated/floor,/area/engine/control)
 "aNK" = (/obj/structure/table,/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor,/area/engine/control)
-"aNL" = (/obj/machinery/computer/security/engineering,/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor,/area/engine/control)
-"aNM" = (/obj/machinery/computer/lockdown{department = "Engineering"; name = "Engineering Lockdown Control"},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor,/area/engine/control)
+"aNL" = (/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor,/area/engine/control)
+"aNM" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor,/area/engine/control)
 "aNN" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk{dir = 4},/turf/simulated/floor,/area/engine/control)
 "aNO" = (/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/turf/simulated/floor,/area/engine/control)
 "aNP" = (/obj/machinery/computer/general_air_control{frequency = 1450; name = "Core Atmospherics Monitoring"; sensors = list("reactor_sensor" = "Reactor Core")},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor,/area/engine/control)
@@ -2156,8 +2156,8 @@
 "aPx" = (/obj/item/weapon/paper_bin,/obj/item/weapon/pen,/obj/structure/table,/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/turf/simulated/floor,/area/quartermaster/qm)
 "aPy" = (/obj/structure/table,/obj/item/weapon/clipboard{pixel_y = 4},/obj/machinery/requests_console{announcementConsole = 1; department = "Quartermaster"; departmentType = 6; name = "Quartermaster's Requests Console"; pixel_x = 0; pixel_y = 30},/turf/simulated/floor,/area/quartermaster/qm)
 "aPz" = (/obj/machinery/computer/supplycomp,/turf/simulated/floor,/area/quartermaster/qm)
-"aPA" = (/obj/machinery/computer/security/cargo,/obj/machinery/firealarm{pixel_y = 27},/turf/simulated/floor,/area/quartermaster/qm)
-"aPB" = (/obj/structure/closet/wardrobe/qm_yellow,/turf/simulated/floor,/area/quartermaster/qm)
+"aPA" = (/obj/machinery/firealarm{pixel_y = 27},/turf/simulated/floor,/area/quartermaster/qm)
+"aPB" = (/turf/simulated/floor,/area/quartermaster/qm)
 "aPC" = (/obj/machinery/door/firedoor/border_only{dir = 8},/obj/structure/window/reinforced{dir = 5; health = 1e+007},/turf/simulated/floor/plating,/area/quartermaster/qm)
 "aPD" = (/obj/structure/table,/obj/machinery/cell_charger,/obj/item/weapon/cell{maxcharge = 2000},/obj/machinery/light/spot{tag = "icon-bulb1 (NORTH)"; icon_state = "bulb1"; dir = 1},/turf/simulated/floor,/area/quartermaster/storage)
 "aPE" = (/obj/structure/table,/obj/item/weapon/hand_labeler,/turf/simulated/floor,/area/quartermaster/storage)
@@ -2168,16 +2168,16 @@
 "aPJ" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor/border_only{dir = 8},/turf/simulated/floor/plating,/area/quartermaster/storage)
 "aPK" = (/obj/structure/table{pixel_y = 0},/obj/item/weapon/storage/body_bag_box,/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/cryo{name = "Emergency Room"})
 "aPL" = (/obj/structure/table{pixel_y = 0},/obj/item/weapon/wrench,/obj/machinery/power/apc{cell_type = 5000; dir = 1; name = "Emergency Room APC"; pixel_x = 0; pixel_y = 25},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/cryo{name = "Emergency Room"})
-"aPM" = (/obj/machinery/atmospherics/portables_connector{dir = 2; name = "Gas Input"},/obj/machinery/portable_atmospherics/canister/oxygen,/obj/structure/window/reinforced/tinted/frosted{dir = 8},/obj/effect/decal/warning_stripes{tag = "icon-W"; icon_state = "W"},/obj/machinery/camera{c_tag = "Medbay Emergency Room Port"; dir = 2; network = "Medbay"},/turf/simulated/floor,/area/medical/cryo{name = "Emergency Room"})
+"aPM" = (/obj/machinery/atmospherics/portables_connector{dir = 2; name = "Gas Input"},/obj/machinery/portable_atmospherics/canister/oxygen,/obj/structure/window/reinforced/tinted/frosted{dir = 8},/obj/machinery/camera{c_tag = "Medbay Emergency Room Port"; dir = 2; network = "Medbay"},/turf/simulated/floor,/area/medical/cryo{name = "Emergency Room"})
 "aPN" = (/obj/machinery/atmospherics/unary/cold_sink/freezer,/obj/machinery/light{dir = 1},/obj/effect/sign/nosmoking_1{pixel_y = 32},/turf/simulated/floor,/area/medical/cryo{name = "Emergency Room"})
 "aPO" = (/obj/machinery/atmospherics/portables_connector{dir = 2; name = "Gas Input"},/obj/machinery/portable_atmospherics/canister/oxygen,/obj/structure/window/reinforced/tinted/frosted{tag = "icon-fwindow (EAST)"; icon_state = "fwindow"; dir = 4},/turf/simulated/floor,/area/medical/cryo{name = "Emergency Room"})
 "aPP" = (/obj/machinery/atmospherics/unary/cryo_cell,/turf/simulated/floor,/area/medical/cryo{name = "Emergency Room"})
-"aPQ" = (/obj/machinery/atmospherics/unary/cryo_cell,/obj/effect/decal/warning_stripes{tag = "icon-E"; icon_state = "E"},/turf/simulated/floor,/area/medical/cryo{name = "Emergency Room"})
+"aPQ" = (/obj/machinery/atmospherics/unary/cryo_cell,/turf/simulated/floor,/area/medical/cryo{name = "Emergency Room"})
 "aPR" = (/obj/item/device/radio/intercom{broadcasting = 0; name = "Station Intercom (General)"; pixel_y = 20},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/cryo{name = "Emergency Room"})
 "aPS" = (/obj/machinery/vending/medical,/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/cryo{name = "Emergency Room"})
-"aPT" = (/obj/structure/closet/secure_closet/medicine,/obj/machinery/light{dir = 1},/obj/effect/sign/nosmoking_1{pixel_y = 32},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/cryo{name = "Emergency Room"})
+"aPT" = (/obj/structure/closet/secure_closet/medical1,/obj/machinery/light{dir = 1},/obj/effect/sign/nosmoking_1{pixel_y = 32},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/cryo{name = "Emergency Room"})
 "aPU" = (/obj/structure/table{pixel_y = 0},/obj/item/weapon/storage/firstaid/fire{pixel_y = 6},/obj/item/weapon/storage/firstaid/toxin,/obj/item/weapon/storage/firstaid/regular{pixel_x = 4; pixel_y = 3},/obj/machinery/camera{c_tag = "Emergency Room Starboard"; network = "Medbay"; pixel_x = 22},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/cryo{name = "Emergency Room"})
-"aPV" = (/obj/structure/closet/secure_closet/doctor_personal,/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/cryo{name = "Emergency Room"})
+"aPV" = (/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/cryo{name = "Emergency Room"})
 "aPW" = (/turf/simulated/floor{tag = "icon-whitehall (WEST)"; icon_state = "whitehall"; dir = 8},/area/hallway/primary/port)
 "aPX" = (/obj/structure/stool/bed/chair{dir = 4},/obj/effect/landmark/start{name = "Head of Security"},/turf/simulated/floor,/area/bridge/meeting_room)
 "aPY" = (/obj/machinery/hologram/holopad,/turf/simulated/floor,/area/bridge/meeting_room)
@@ -2210,11 +2210,11 @@
 "aQz" = (/obj/machinery/door/firedoor/border_only,/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/medical/cmo)
 "aQA" = (/obj/structure/closet/secure_closet/personal/patient,/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/cryo{name = "Emergency Room"})
 "aQB" = (/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/cryo{name = "Emergency Room"})
-"aQC" = (/obj/machinery/atmospherics/pipe/simple/general/visible{tag = "icon-intact (NORTHEAST)"; icon_state = "intact"; dir = 5},/obj/structure/window/reinforced/tinted/frosted{dir = 8},/obj/structure/window/reinforced/tinted/frosted,/obj/effect/decal/warning_stripes{tag = "icon-NE-in"; icon_state = "NE-in"},/turf/simulated/floor,/area/medical/cryo{name = "Emergency Room"})
-"aQD" = (/obj/machinery/atmospherics/pipe/manifold{icon_state = "manifold"; level = 2},/obj/machinery/door/window/eastright{dir = 2; icon_state = "leftdeny"; req_access_txt = "5"; tag = "Cryo Control"},/obj/effect/decal/warning_stripes{tag = "icon-S"; icon_state = "S"},/turf/simulated/floor,/area/medical/cryo{name = "Emergency Room"})
-"aQE" = (/obj/machinery/atmospherics/pipe/manifold{icon_state = "manifold"; level = 2},/obj/structure/window/reinforced/tinted/frosted{tag = "icon-fwindow (EAST)"; icon_state = "fwindow"; dir = 4},/obj/structure/window/reinforced/tinted/frosted,/obj/effect/decal/warning_stripes{tag = "icon-S"; icon_state = "S"},/turf/simulated/floor,/area/medical/cryo{name = "Emergency Room"})
-"aQF" = (/obj/machinery/atmospherics/pipe/simple/general/visible{dir = 9},/obj/machinery/atmospherics/pipe/manifold{icon_state = "manifold"; level = 2},/obj/effect/decal/warning_stripes{tag = "icon-S"; icon_state = "S"},/turf/simulated/floor,/area/medical/cryo{name = "Emergency Room"})
-"aQG" = (/obj/machinery/atmospherics/pipe/simple/general/visible{dir = 9},/obj/effect/decal/warning_stripes{tag = "icon-NW-in"; icon_state = "NW-in"},/turf/simulated/floor,/area/medical/cryo{name = "Emergency Room"})
+"aQC" = (/obj/machinery/atmospherics/pipe/simple/general/visible{tag = "icon-intact (NORTHEAST)"; icon_state = "intact"; dir = 5},/obj/structure/window/reinforced/tinted/frosted{dir = 8},/obj/structure/window/reinforced/tinted/frosted,/turf/simulated/floor,/area/medical/cryo{name = "Emergency Room"})
+"aQD" = (/obj/machinery/atmospherics/pipe/manifold{icon_state = "manifold"; level = 2},/obj/machinery/door/window/eastright{dir = 2; icon_state = "leftdeny"; req_access_txt = "5"; tag = "Cryo Control"},/turf/simulated/floor,/area/medical/cryo{name = "Emergency Room"})
+"aQE" = (/obj/machinery/atmospherics/pipe/manifold{icon_state = "manifold"; level = 2},/obj/structure/window/reinforced/tinted/frosted{tag = "icon-fwindow (EAST)"; icon_state = "fwindow"; dir = 4},/obj/structure/window/reinforced/tinted/frosted,/turf/simulated/floor,/area/medical/cryo{name = "Emergency Room"})
+"aQF" = (/obj/machinery/atmospherics/pipe/simple/general/visible{dir = 9},/obj/machinery/atmospherics/pipe/manifold{icon_state = "manifold"; level = 2},/turf/simulated/floor,/area/medical/cryo{name = "Emergency Room"})
+"aQG" = (/obj/machinery/atmospherics/pipe/simple/general/visible{dir = 9},/turf/simulated/floor,/area/medical/cryo{name = "Emergency Room"})
 "aQH" = (/obj/structure/table{pixel_y = 0},/obj/item/weapon/storage/syringes,/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; layer = 4; pixel_x = 24},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/cryo{name = "Emergency Room"})
 "aQI" = (/obj/structure/grille,/obj/machinery/door/firedoor/border_only{dir = 1},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/maintenance/aft)
 "aQJ" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor/border_only{dir = 1},/turf/simulated/floor/plating,/area/maintenance/aft)
@@ -2222,18 +2222,18 @@
 "aQL" = (/obj/structure/grille,/obj/machinery/door/firedoor/border_only{dir = 1},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/storage/autolathe)
 "aQM" = (/obj/machinery/door/firedoor/border_only,/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/storage/autolathe)
 "aQN" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor/border_only{dir = 1},/turf/simulated/floor/plating,/area/engine/control)
-"aQO" = (/obj/machinery/door/airlock/glass/glass_engineering{name = "Engineering"; req_access_txt = "10"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/turf/simulated/floor,/area/engine/control)
+"aQO" = (/obj/machinery/door/airlock/glass_engineering{name = "Engineering"; req_access_txt = "10"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/turf/simulated/floor,/area/engine/control)
 "aQP" = (/obj/structure/grille,/obj/machinery/door/firedoor/border_only{dir = 1},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/engine/control)
 "aQQ" = (/obj/machinery/door/firedoor/border_only{dir = 8},/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/engine/control)
-"aQR" = (/obj/machinery/vending/coffee,/turf/simulated/floor,/area/engine/engineering_break_room)
-"aQS" = (/obj/machinery/vending/cola,/turf/simulated/floor,/area/engine/engineering_break_room)
-"aQT" = (/obj/machinery/vending/snack,/turf/simulated/floor,/area/engine/engineering_break_room)
-"aQU" = (/obj/machinery/vending/cigarette,/turf/simulated/floor,/area/engine/engineering_break_room)
-"aQV" = (/obj/machinery/light{dir = 1},/turf/simulated/floor,/area/engine/engineering_break_room)
-"aQW" = (/turf/simulated/floor,/area/engine/engineering_break_room)
-"aQX" = (/obj/machinery/hologram/holopad,/turf/simulated/floor,/area/engine/engineering_break_room)
-"aQY" = (/obj/machinery/disposal,/turf/simulated/floor,/area/engine/engineering_break_room)
-"aQZ" = (/turf/simulated/wall/r_wall,/area/engine/engineering_break_room)
+"aQR" = (/obj/machinery/vending/coffee,/turf/simulated/floor,/area/engine/break_room)
+"aQS" = (/obj/machinery/vending/cola,/turf/simulated/floor,/area/engine/break_room)
+"aQT" = (/obj/machinery/vending/snack,/turf/simulated/floor,/area/engine/break_room)
+"aQU" = (/obj/machinery/vending/cigarette,/turf/simulated/floor,/area/engine/break_room)
+"aQV" = (/obj/machinery/light{dir = 1},/turf/simulated/floor,/area/engine/break_room)
+"aQW" = (/turf/simulated/floor,/area/engine/break_room)
+"aQX" = (/obj/machinery/hologram/holopad,/turf/simulated/floor,/area/engine/break_room)
+"aQY" = (/obj/machinery/disposal,/turf/simulated/floor,/area/engine/break_room)
+"aQZ" = (/turf/simulated/wall/r_wall,/area/engine/break_room)
 "aRa" = (/obj/machinery/door/firedoor/border_only{dir = 8},/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/turf/simulated/floor/plating,/area/engine/control)
 "aRb" = (/obj/effect/decal/cleanable/dirt,/obj/machinery/light/small{dir = 4},/turf/simulated/floor/plating,/area/maintenance/starboard)
 "aRc" = (/turf/simulated/wall/r_wall,/area/tcommsat/chamber{name = "Telecommunications Compartment"})
@@ -2258,8 +2258,8 @@
 "aRv" = (/obj/machinery/firealarm{dir = 1; pixel_y = 25},/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/turf/simulated/floor{tag = "icon-barber"; icon_state = "barber"; dir = 2},/area/medical/cmo)
 "aRw" = (/obj/effect/landmark{name = "emcloset"},/obj/machinery/power/apc{dir = 1; name = "CMOs Office APC"; pixel_x = 0; pixel_y = 25},/turf/simulated/floor{tag = "icon-barber"; icon_state = "barber"; dir = 2},/area/medical/cmo)
 "aRx" = (/obj/structure/table{pixel_y = 0},/obj/item/weapon/storage/stma_kit{pixel_x = 6; pixel_y = 6},/obj/item/weapon/storage/lglo_kit,/obj/machinery/firealarm{dir = 4; layer = 4; pixel_x = 24},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/cryo{name = "Emergency Room"})
-"aRy" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/obj/effect/decal/warning_stripes{tag = "icon-N"; icon_state = "N"},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/hallway/primary/port)
-"aRz" = (/obj/effect/decal/warning_stripes{tag = "icon-SW-in"; icon_state = "SW-in"},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/hallway/primary/port)
+"aRy" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/hallway/primary/port)
+"aRz" = (/turf/simulated/floor{icon_state = "white"; dir = 8},/area/hallway/primary/port)
 "aRA" = (/obj/machinery/light{dir = 4},/obj/structure/disposalpipe/segment{dir = 1},/turf/simulated/floor{icon_state = "blue"; dir = 4},/area/hallway/primary/port)
 "aRB" = (/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22},/turf/simulated/floor,/area/bridge/meeting_room)
 "aRC" = (/obj/structure/stool/bed/chair{dir = 1},/obj/effect/landmark/start{name = "Chief Medical Officer"},/turf/simulated/floor,/area/bridge/meeting_room)
@@ -2274,7 +2274,7 @@
 "aRL" = (/obj/structure/table,/turf/simulated/floor,/area/storage/autolathe)
 "aRM" = (/obj/machinery/door/firedoor/border_only{dir = 8},/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/storage/autolathe)
 "aRN" = (/obj/machinery/door/firedoor/border_only{dir = 8},/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/cable{icon_state = "0-2"; pixel_y = 1; d2 = 2},/obj/machinery/door/poddoor/shutters{density = 0; dir = 8; icon_state = "shutter0"; network = "Breakroom Shutters"; opacity = 0},/turf/simulated/floor/plating,/area)
-"aRO" = (/obj/structure/table,/obj/item/weapon/storage/fancy/donut_box,/turf/simulated/floor,/area/engine/engineering_break_room)
+"aRO" = (/obj/structure/table,/obj/item/weapon/storage/fancy/donut_box,/turf/simulated/floor,/area/engine/break_room)
 "aRP" = (/obj/machinery/telecomms/server/presets/science,/turf/simulated/floor{icon_state = "dark"},/area/tcommsat/chamber{name = "Telecommunications Compartment"})
 "aRQ" = (/obj/machinery/atmospherics/unary/outlet_injector{dir = 1; frequency = 1441; icon_state = "on"; id = "o2_in"; on = 1},/turf/simulated/floor{icon_state = "dark"},/area/tcommsat/chamber{name = "Telecommunications Compartment"})
 "aRR" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 5},/turf/simulated/floor{icon_state = "dark"},/area/tcommsat/chamber{name = "Telecommunications Compartment"})
@@ -2286,7 +2286,7 @@
 "aRX" = (/obj/machinery/telecomms/server/presets/command,/turf/simulated/floor{icon_state = "dark"},/area/tcommsat/chamber{name = "Telecommunications Compartment"})
 "aRY" = (/obj/machinery/door/firedoor/border_only,/obj/structure/disposalpipe/segment,/turf/simulated/floor,/area/hallway/primary/starboard)
 "aRZ" = (/obj/machinery/door/firedoor/border_only,/turf/simulated/floor,/area/hallway/primary/starboard)
-"aSa" = (/obj/structure/closet/secure_closet/qm_personal,/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22},/turf/simulated/floor,/area/quartermaster/qm)
+"aSa" = (/obj/structure/closet/secure_closet/quartermaster,/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22},/turf/simulated/floor,/area/quartermaster/qm)
 "aSb" = (/obj/machinery/photocopier,/obj/machinery/light/spot,/turf/simulated/floor,/area/quartermaster/qm)
 "aSc" = (/obj/structure/stool/bed/chair,/obj/effect/landmark/start{name = "Quartermaster"},/turf/simulated/floor,/area/quartermaster/qm)
 "aSd" = (/obj/item/weapon/stamp{name = "Quartermaster's stamp"; pixel_x = -3; pixel_y = 3},/obj/item/weapon/stamp/denied,/obj/structure/table,/obj/machinery/camera{c_tag = "Quartermaster's Office"; dir = 1; network = "Cargo"},/turf/simulated/floor,/area/quartermaster/qm)
@@ -2297,12 +2297,12 @@
 "aSi" = (/obj/machinery/conveyor_switch{id = "QMshuttle"},/turf/simulated/floor,/area/quartermaster/storage)
 "aSj" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/effect/sign/movingparts,/obj/machinery/door/firedoor/border_only{dir = 8},/turf/simulated/floor/plating,/area/quartermaster/storage)
 "aSk" = (/turf/simulated/wall,/area/medical/patients_rooms)
-"aSl" = (/obj/machinery/computer/lockdown{department = "Medbay"; name = "Medbay Lockdown Control"},/obj/item/device/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -28},/turf/simulated/floor{dir = 8; icon_state = "barber"},/area/medical/cmo)
+"aSl" = (/obj/item/device/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -28},/turf/simulated/floor{dir = 8; icon_state = "barber"},/area/medical/cmo)
 "aSm" = (/turf/simulated/floor{tag = "icon-barber"; icon_state = "barber"; dir = 2},/area/medical/cmo)
 "aSn" = (/obj/structure/table,/obj/item/clothing/glasses/hud/health,/obj/item/weapon/reagent_containers/hypospray,/turf/simulated/floor{dir = 8; icon_state = "barber"},/area/medical/cmo)
 "aSo" = (/obj/machinery/hologram/holopad,/turf/simulated/floor{tag = "icon-barber"; icon_state = "barber"; dir = 2},/area/medical/cmo)
 "aSp" = (/obj/structure/disposalpipe/segment{dir = 1},/turf/simulated/floor{tag = "icon-barber"; icon_state = "barber"; dir = 2},/area/medical/cmo)
-"aSq" = (/obj/structure/closet/wardrobe/cmo,/obj/machinery/camera{c_tag = "CMO's Office"; dir = 8; network = "Medbay"},/turf/simulated/floor{tag = "icon-barber"; icon_state = "barber"; dir = 2},/area/medical/cmo)
+"aSq" = (/obj/machinery/camera{c_tag = "CMO's Office"; dir = 8; network = "Medbay"},/turf/simulated/floor{tag = "icon-barber"; icon_state = "barber"; dir = 2},/area/medical/cmo)
 "aSr" = (/obj/machinery/sleep_console{icon_state = "sleeperconsole-r"; orient = "RIGHT"},/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/cryo{name = "Emergency Room"})
 "aSs" = (/obj/machinery/sleeper{icon_state = "sleeper_0-r"; orient = "RIGHT"},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/cryo{name = "Emergency Room"})
 "aSt" = (/obj/machinery/bodyscanner,/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/cryo{name = "Emergency Room"})
@@ -2310,15 +2310,15 @@
 "aSv" = (/obj/structure/window/reinforced{dir = 5; health = 1e+007},/obj/effect/sign/securearea{desc = "A warning sign which reads 'For EMERGENCY use'"; layer = 4; name = "EMERGENCY"},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/cryo{name = "Emergency Room"})
 "aSw" = (/obj/effect/sign/redcross,/turf/simulated/wall,/area/medical/cryo{name = "Emergency Room"})
 "aSx" = (/turf/simulated/floor{icon_state = "white"; dir = 8},/area/hallway/primary/port)
-"aSy" = (/obj/effect/decal/warning_stripes{tag = "icon-E"; icon_state = "E"},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/hallway/primary/port)
+"aSy" = (/turf/simulated/floor{icon_state = "white"; dir = 8},/area/hallway/primary/port)
 "aSz" = (/obj/structure/table,/obj/item/weapon/book/manual/security_space_law,/turf/simulated/floor,/area/bridge/meeting_room)
 "aSA" = (/obj/effect/landmark{name = "plant"},/turf/simulated/floor,/area/bridge/meeting_room)
 "aSB" = (/obj/machinery/door/airlock/maintenance_hatch{req_access_txt = "19"},/turf/simulated/floor,/area/storage/autolathe)
 "aSC" = (/turf/simulated/floor,/area/storage/autolathe)
 "aSD" = (/obj/structure/table,/obj/item/weapon/hand_labeler,/obj/machinery/light{dir = 4; icon_state = "tube1"},/turf/simulated/floor,/area/storage/autolathe)
 "aSE" = (/obj/machinery/door/firedoor/border_only{dir = 8},/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/turf/simulated/floor/plating,/area)
-"aSF" = (/obj/structure/stool/bed/chair,/turf/simulated/floor,/area/engine/engineering_break_room)
-"aSG" = (/obj/structure/table,/obj/item/weapon/storage/donkpocket_kit,/obj/machinery/light/small{dir = 4},/turf/simulated/floor,/area/engine/engineering_break_room)
+"aSF" = (/obj/structure/stool/bed/chair,/turf/simulated/floor,/area/engine/break_room)
+"aSG" = (/obj/structure/table,/obj/item/weapon/storage/donkpocket_kit,/obj/machinery/light/small{dir = 4},/turf/simulated/floor,/area/engine/break_room)
 "aSH" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/machinery/door/firedoor/border_only,/obj/structure/grille,/obj/structure/cable,/turf/simulated/floor/plating,/area/engine/control)
 "aSI" = (/obj/machinery/telecomms/server/presets/medical,/turf/simulated/floor{icon_state = "dark"},/area/tcommsat/chamber{name = "Telecommunications Compartment"})
 "aSJ" = (/turf/simulated/floor{icon_state = "dark"},/area/tcommsat/chamber{name = "Telecommunications Compartment"})
@@ -2331,7 +2331,7 @@
 "aSQ" = (/obj/structure/closet/crate/internals,/turf/simulated/floor{icon_state = "delivery"; name = "floor"},/area/quartermaster/storage)
 "aSR" = (/obj/structure/closet/crate,/turf/simulated/floor{icon_state = "delivery"; name = "floor"},/area/quartermaster/storage)
 "aSS" = (/obj/structure/closet/crate/medical,/turf/simulated/floor{icon_state = "delivery"; name = "floor"},/area/quartermaster/storage)
-"aST" = (/obj/machinery/conveyor{backwards = 4; dir = 5; forwards = 2; id = "QMshuttle"; reverseSpriteMoveDir = 1},/obj/effect/decal/warning_stripes{tag = "icon-SE-in"; icon_state = "SE-in"},/turf/simulated/floor/plating,/area/quartermaster/storage)
+"aST" = (/obj/machinery/conveyor{backwards = 4; dir = 5; forwards = 2; id = "QMshuttle"; reverseSpriteMoveDir = 1},/turf/simulated/floor/plating,/area/quartermaster/storage)
 "aSU" = (/obj/structure/plasticflaps,/obj/machinery/conveyor{dir = 8; id = "QMshuttle"},/obj/machinery/door/firedoor/border_only{dir = 8},/turf/simulated/floor,/area/quartermaster/storage)
 "aSV" = (/obj/machinery/conveyor{dir = 8; id = "QMshuttle"},/turf/simulated/floor/plating,/area/quartermaster/storage)
 "aSW" = (/obj/machinery/conveyor{dir = 8; id = "QMshuttle"},/obj/machinery/door/poddoor{density = 1; icon_state = "pdoor1"; id = "QMLoaddoor"; layer = 3.7; name = "Supply Dock Loading Door"; opacity = 1},/turf/simulated/floor/plating,/area/quartermaster/storage)
@@ -2358,20 +2358,20 @@
 "aTr" = (/obj/machinery/disposal,/turf/simulated/floor,/area/storage/autolathe)
 "aTs" = (/obj/machinery/door/firedoor/border_only{dir = 8},/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/storage/autolathe)
 "aTt" = (/obj/machinery/door/firedoor/border_only{dir = 8},/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"; tag = "90Curve"},/obj/machinery/door/poddoor/shutters{density = 0; dir = 8; icon_state = "shutter0"; network = "Breakroom Shutters"; opacity = 0},/turf/simulated/floor/plating,/area)
-"aTu" = (/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"; pixel_y = 0; tag = "Streight"},/turf/simulated/floor,/area/engine/engineering_break_room)
-"aTv" = (/obj/structure/stool/bed/chair{dir = 4},/turf/simulated/floor,/area/engine/engineering_break_room)
-"aTw" = (/obj/structure/table,/turf/simulated/floor,/area/engine/engineering_break_room)
-"aTx" = (/obj/structure/table,/obj/machinery/microwave,/turf/simulated/floor,/area/engine/engineering_break_room)
+"aTu" = (/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"; pixel_y = 0; tag = "Streight"},/turf/simulated/floor,/area/engine/break_room)
+"aTv" = (/obj/structure/stool/bed/chair{dir = 4},/turf/simulated/floor,/area/engine/break_room)
+"aTw" = (/obj/structure/table,/turf/simulated/floor,/area/engine/break_room)
+"aTx" = (/obj/structure/table,/obj/machinery/microwave,/turf/simulated/floor,/area/engine/break_room)
 "aTy" = (/obj/machinery/door/firedoor/border_only,/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/cable{icon_state = "0-2"; pixel_y = 1; d2 = 2},/turf/simulated/floor/plating,/area/engine/control)
 "aTz" = (/turf/simulated/wall/r_wall,/area/engine/locker)
 "aTA" = (/obj/structure/grille,/obj/machinery/door/firedoor/border_only{dir = 1},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/machinery/door/poddoor/shutters{density = 0; dir = 1; icon_state = "shutter0"; network = "Locker Room Shutters"; opacity = 0},/turf/simulated/floor/plating,/area/engine/locker)
 "aTB" = (/obj/machinery/door/firedoor/border_only,/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/cable{tag = "Streight"; icon_state = "4-8"; pixel_x = 1; d1 = 4; d2 = 8},/obj/machinery/door/poddoor/shutters{density = 0; dir = 1; icon_state = "shutter0"; network = "Locker Room Shutters"; opacity = 0},/turf/simulated/floor/plating,/area/engine/locker)
 "aTC" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor/border_only{dir = 1},/obj/structure/cable{d2 = 8; icon_state = "0-8"; pixel_y = 0},/obj/machinery/door/poddoor/shutters{density = 0; dir = 1; icon_state = "shutter0"; network = "Locker Room Shutters"; opacity = 0},/turf/simulated/floor/plating,/area/engine/locker)
 "aTD" = (/obj/machinery/telecomms/server/presets/cargo,/turf/simulated/floor{icon_state = "dark"},/area/tcommsat/chamber{name = "Telecommunications Compartment"})
-"aTE" = (/obj/machinery/telecomms/bus/antiqua_one,/turf/simulated/floor{icon_state = "dark"},/area/tcommsat/chamber{name = "Telecommunications Compartment"})
-"aTF" = (/obj/machinery/telecomms/receiver/antiqua_left,/turf/simulated/floor{icon_state = "dark"},/area/tcommsat/chamber{name = "Telecommunications Compartment"})
-"aTG" = (/obj/machinery/telecomms/receiver/antiqua_right,/turf/simulated/floor{icon_state = "dark"},/area/tcommsat/chamber{name = "Telecommunications Compartment"})
-"aTH" = (/obj/machinery/telecomms/bus/antiqua_two,/turf/simulated/floor{icon_state = "dark"},/area/tcommsat/chamber{name = "Telecommunications Compartment"})
+"aTE" = (/obj/machinery/telecomms/bus/preset_one,/turf/simulated/floor{icon_state = "dark"},/area/tcommsat/chamber{name = "Telecommunications Compartment"})
+"aTF" = (/obj/machinery/telecomms/receiver/preset_left,/turf/simulated/floor{icon_state = "dark"},/area/tcommsat/chamber{name = "Telecommunications Compartment"})
+"aTG" = (/obj/machinery/telecomms/receiver/preset_right,/turf/simulated/floor{icon_state = "dark"},/area/tcommsat/chamber{name = "Telecommunications Compartment"})
+"aTH" = (/obj/machinery/telecomms/bus/preset_two,/turf/simulated/floor{icon_state = "dark"},/area/tcommsat/chamber{name = "Telecommunications Compartment"})
 "aTI" = (/obj/machinery/telecomms/server/presets/security,/turf/simulated/floor{icon_state = "dark"},/area/tcommsat/chamber{name = "Telecommunications Compartment"})
 "aTJ" = (/obj/structure/disposalpipe/sortjunction{icon_state = "pipe-j2s"; mailsort = 0; sortType = list("Cargo Bay","QM Office")},/turf/simulated/floor,/area/hallway/primary/starboard)
 "aTK" = (/obj/structure/disposalpipe/segment,/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor,/area/hallway/primary/starboard)
@@ -2381,7 +2381,7 @@
 "aTO" = (/turf/simulated/floor,/area/quartermaster/office)
 "aTP" = (/obj/structure/table/reinforced,/obj/item/weapon/paper_bin,/obj/item/weapon/pen,/turf/simulated/floor,/area/quartermaster/office)
 "aTQ" = (/obj/machinery/door/firedoor/border_only{dir = 8},/obj/structure/window/reinforced{dir = 5; health = 1e+007},/turf/simulated/floor/plating,/area/quartermaster/storage)
-"aTR" = (/obj/machinery/conveyor{dir = 2; id = "QMshuttle"},/obj/effect/decal/warning_stripes{tag = "icon-W"; icon_state = "W"},/turf/simulated/floor/plating,/area/quartermaster/storage)
+"aTR" = (/obj/machinery/conveyor{dir = 2; id = "QMshuttle"},/turf/simulated/floor/plating,/area/quartermaster/storage)
 "aTS" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/effect/sign/movingparts,/obj/machinery/door/firedoor/border_only{dir = 8},/turf/simulated/floor/plating,/area/quartermaster/storage)
 "aTT" = (/obj/machinery/alarm{dir = 4; pixel_x = -23; pixel_y = 0},/turf/simulated/floor{icon_state = "white"},/area/medical/patients_rooms)
 "aTU" = (/turf/simulated/floor{icon_state = "white"},/area/medical/patients_rooms)
@@ -2398,8 +2398,8 @@
 "aUf" = (/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor,/area/storage/autolathe)
 "aUg" = (/obj/machinery/power/apc{dir = 2; name = "Autolathe Storage APC"; pixel_x = 0; pixel_y = -24; pixel_z = 0},/obj/structure/cable,/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"; tag = "90Curve"},/turf/simulated/floor,/area/storage/autolathe)
 "aUh" = (/turf/simulated/wall/r_wall,/area/maintenance/aft)
-"aUi" = (/obj/machinery/light{dir = 8},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/turf/simulated/floor,/area/engine/engineering_break_room)
-"aUj" = (/obj/effect/landmark{name = "plant"},/turf/simulated/floor,/area/engine/engineering_break_room)
+"aUi" = (/obj/machinery/light{dir = 8},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/turf/simulated/floor,/area/engine/break_room)
+"aUj" = (/obj/effect/landmark{name = "plant"},/turf/simulated/floor,/area/engine/break_room)
 "aUk" = (/obj/machinery/light/small{dir = 8},/turf/simulated/floor,/area/atmos)
 "aUl" = (/turf/simulated/floor,/area/atmos)
 "aUm" = (/obj/effect/landmark{name = "plant"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/turf/simulated/floor,/area/atmos)
@@ -2421,7 +2421,7 @@
 "aUC" = (/obj/machinery/computer/ordercomp,/obj/machinery/light/spot{tag = "icon-bulb1 (EAST)"; icon_state = "bulb1"; dir = 4},/turf/simulated/floor,/area/quartermaster/office)
 "aUD" = (/obj/machinery/light/spot{tag = "icon-bulb1 (WEST)"; icon_state = "bulb1"; dir = 8},/turf/simulated/floor,/area/quartermaster/storage)
 "aUE" = (/turf/simulated/floor{icon_state = "delivery"; name = "floor"},/area/quartermaster/storage)
-"aUF" = (/obj/machinery/conveyor{dir = 2; id = "QMshuttle"},/obj/effect/decal/warning_stripes{tag = "icon-W"; icon_state = "W"},/obj/machinery/light/spot{tag = "icon-bulb1 (EAST)"; icon_state = "bulb1"; dir = 4},/turf/simulated/floor/plating,/area/quartermaster/storage)
+"aUF" = (/obj/machinery/conveyor{dir = 2; id = "QMshuttle"},/obj/machinery/light/spot{tag = "icon-bulb1 (EAST)"; icon_state = "bulb1"; dir = 4},/turf/simulated/floor/plating,/area/quartermaster/storage)
 "aUG" = (/obj/machinery/sleeper,/turf/simulated/floor{icon_state = "white"},/area/medical/patients_rooms)
 "aUH" = (/obj/machinery/sleep_console,/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/patients_rooms)
 "aUI" = (/obj/machinery/camera{c_tag = "Patient Treatment Room 1"; dir = 1; network = "Medbay"; pixel_x = 22},/turf/simulated/floor{icon_state = "white"},/area/medical/patients_rooms)
@@ -2441,9 +2441,9 @@
 "aUW" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor/border_only{dir = 1},/turf/simulated/floor/plating,/area/storage/autolathe)
 "aUX" = (/obj/machinery/door/airlock/maintenance_hatch{req_access_txt = "19"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/turf/simulated/floor,/area/storage/autolathe)
 "aUY" = (/obj/machinery/door/airlock/maintenance_hatch{req_access_txt = "12"},/turf/simulated/floor,/area/maintenance/aft)
-"aUZ" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/turf/simulated/floor,/area/engine/engineering_break_room)
-"aVa" = (/obj/structure/stool/bed/chair{dir = 1},/turf/simulated/floor,/area/engine/engineering_break_room)
-"aVb" = (/obj/machinery/door/airlock/glass/glass_engineering{name = "Engineering"; req_access_txt = "10"},/turf/simulated/floor,/area/engine/engineering_break_room)
+"aUZ" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/turf/simulated/floor,/area/engine/break_room)
+"aVa" = (/obj/structure/stool/bed/chair{dir = 1},/turf/simulated/floor,/area/engine/break_room)
+"aVb" = (/obj/machinery/door/airlock/glass_engineering{name = "Engineering"; req_access_txt = "10"},/turf/simulated/floor,/area/engine/break_room)
 "aVc" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/turf/simulated/floor,/area/atmos)
 "aVd" = (/obj/machinery/door/airlock/engineering,/turf/simulated/floor,/area/engine/locker)
 "aVe" = (/obj/machinery/door/airlock/maintenance_hatch{req_access_txt = "12"},/turf/simulated/floor,/area/engine/locker)
@@ -2451,8 +2451,8 @@
 "aVg" = (/obj/machinery/disposal,/obj/machinery/firealarm{dir = 8; pixel_x = -24},/obj/machinery/light/spot{tag = "icon-bulb1 (WEST)"; icon_state = "bulb1"; dir = 8},/obj/structure/disposalpipe/trunk{dir = 1},/turf/simulated/floor,/area/quartermaster/office)
 "aVh" = (/obj/machinery/door/firedoor/border_only{dir = 8},/obj/machinery/door/airlock/glass{name = "QM Warehouse"; req_access_txt = "31"},/turf/simulated/floor,/area/quartermaster/storage)
 "aVi" = (/turf/simulated/floor{icon_state = "bot"; dir = 1},/area/quartermaster/storage)
-"aVj" = (/obj/machinery/conveyor{dir = 8; id = "QMshuttle"},/obj/effect/decal/warning_stripes{tag = "icon-N"; icon_state = "N"},/turf/simulated/floor/plating,/area/quartermaster/storage)
-"aVk" = (/obj/machinery/conveyor{backwards = 1; dir = 10; forwards = 8; id = "QMshuttle"},/obj/effect/decal/warning_stripes{tag = "icon-NW-out"; icon_state = "NW-out"},/turf/simulated/floor/plating,/area/quartermaster/storage)
+"aVj" = (/obj/machinery/conveyor{dir = 8; id = "QMshuttle"},/turf/simulated/floor/plating,/area/quartermaster/storage)
+"aVk" = (/obj/machinery/conveyor{backwards = 1; dir = 10; forwards = 8; id = "QMshuttle"},/turf/simulated/floor/plating,/area/quartermaster/storage)
 "aVl" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/patients_rooms)
 "aVm" = (/obj/effect/sign/nosmoking_1{pixel_y = 32},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/patients_rooms)
 "aVn" = (/obj/machinery/firealarm{dir = 1; pixel_y = 25},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/patients_rooms)
@@ -2465,25 +2465,25 @@
 "aVu" = (/obj/machinery/door/poddoor/shutters{density = 0; icon_state = "shutter0"; id = "sshutters"; name = "Surgery Shutters"},/obj/machinery/door/firedoor/border_only,/obj/structure/window/reinforced{dir = 5; health = 1e+007},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/surgery)
 "aVv" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/glass_medical{name = "Surgery"; req_access = null; req_access_txt = "45"},/turf/simulated/floor{dir = 2; icon_state = "warnwhite"; tag = "icon-warnwhite (NORTH)"},/area/medical/surgery)
 "aVw" = (/turf/simulated/wall,/area/medical/surgery)
-"aVx" = (/obj/effect/decal/warning_stripes{tag = "icon-S"; icon_state = "S"},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/hallway/primary/port)
-"aVy" = (/obj/effect/decal/warning_stripes{tag = "icon-NW-in"; icon_state = "NW-in"},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/hallway/primary/port)
+"aVx" = (/turf/simulated/floor{icon_state = "white"; dir = 8},/area/hallway/primary/port)
+"aVy" = (/turf/simulated/floor{icon_state = "white"; dir = 8},/area/hallway/primary/port)
 "aVz" = (/obj/machinery/door/airlock/highsecurity{name = "Teleport Access"; req_access_txt = "17"},/turf/simulated/floor/plating,/area/teleporter)
 "aVA" = (/obj/effect/decal/cleanable/dirt,/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"; tag = "90Curve"},/turf/simulated/floor/plating,/area/maintenance/aft)
 "aVB" = (/obj/machinery/light/small{dir = 1},/obj/structure/cable{tag = "Streight"; icon_state = "4-8"; pixel_x = 1; d1 = 4; d2 = 8},/turf/simulated/floor/plating,/area/maintenance/aft)
 "aVC" = (/obj/effect/decal/cleanable/dirt,/obj/structure/cable{tag = "Streight"; icon_state = "4-8"; pixel_x = 1; d1 = 4; d2 = 8},/turf/simulated/floor/plating,/area/maintenance/aft)
 "aVD" = (/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"; pixel_y = 0; tag = "Streight"},/turf/simulated/floor/plating,/area/maintenance/aft)
-"aVE" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"; tag = "90Curve"},/turf/simulated/floor,/area/engine/engineering_break_room)
-"aVF" = (/obj/machinery/power/apc{dir = 2; name = "Construction Storage APC"; pixel_x = 0; pixel_y = -24; pixel_z = 0},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/structure/cable{d2 = 8; icon_state = "0-8"; pixel_y = 0},/turf/simulated/floor,/area/engine/engineering_break_room)
-"aVG" = (/obj/structure/cable{tag = "Streight"; icon_state = "4-8"; pixel_x = 1; d1 = 4; d2 = 8},/turf/simulated/floor,/area/engine/engineering_break_room)
-"aVH" = (/obj/structure/cable{tag = "Streight"; icon_state = "4-8"; pixel_x = 1; d1 = 4; d2 = 8},/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor,/area/engine/engineering_break_room)
-"aVI" = (/obj/machinery/door/airlock/glass/glass_engineering{name = "Engineering"; req_access_txt = "10"},/obj/structure/cable{tag = "Streight"; icon_state = "4-8"; pixel_x = 1; d1 = 4; d2 = 8},/turf/simulated/floor,/area/engine/engineering_break_room)
+"aVE" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"; tag = "90Curve"},/turf/simulated/floor,/area/engine/break_room)
+"aVF" = (/obj/machinery/power/apc{dir = 2; name = "Construction Storage APC"; pixel_x = 0; pixel_y = -24; pixel_z = 0},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/structure/cable{d2 = 8; icon_state = "0-8"; pixel_y = 0},/turf/simulated/floor,/area/engine/break_room)
+"aVG" = (/obj/structure/cable{tag = "Streight"; icon_state = "4-8"; pixel_x = 1; d1 = 4; d2 = 8},/turf/simulated/floor,/area/engine/break_room)
+"aVH" = (/obj/structure/cable{tag = "Streight"; icon_state = "4-8"; pixel_x = 1; d1 = 4; d2 = 8},/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor,/area/engine/break_room)
+"aVI" = (/obj/machinery/door/airlock/glass_engineering{name = "Engineering"; req_access_txt = "10"},/obj/structure/cable{tag = "Streight"; icon_state = "4-8"; pixel_x = 1; d1 = 4; d2 = 8},/turf/simulated/floor,/area/engine/break_room)
 "aVJ" = (/obj/structure/cable{tag = "Streight"; icon_state = "4-8"; pixel_x = 1; d1 = 4; d2 = 8},/turf/simulated/floor,/area/atmos)
 "aVK" = (/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"; pixel_y = 0; tag = "Streight"},/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor,/area/atmos)
 "aVL" = (/obj/structure/cable{tag = "Streight"; icon_state = "4-8"; pixel_x = 1; d1 = 4; d2 = 8},/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"; tag = "90Curve"},/turf/simulated/floor,/area/atmos)
 "aVM" = (/obj/machinery/door/airlock/engineering,/obj/structure/cable{tag = "Streight"; icon_state = "4-8"; pixel_x = 1; d1 = 4; d2 = 8},/turf/simulated/floor,/area/engine/locker)
 "aVN" = (/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"; pixel_y = 0; tag = "Streight"},/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"; tag = "90Curve"},/turf/simulated/floor,/area/engine/locker)
 "aVO" = (/obj/structure/closet/firecloset,/turf/simulated/floor,/area/engine/locker)
-"aVP" = (/obj/structure/closet/secure_closet/atmos_personal,/turf/simulated/floor,/area/engine/locker)
+"aVP" = (/turf/simulated/floor,/area/engine/locker)
 "aVQ" = (/obj/structure/disposalpipe/segment,/turf/simulated/floor{dir = 8; icon_state = "loadingarea"; tag = "loading"},/area/hallway/primary/starboard)
 "aVR" = (/obj/structure/plasticflaps,/obj/machinery/door/firedoor/border_only{dir = 8},/turf/simulated/floor/plating,/area/quartermaster/office)
 "aVS" = (/turf/simulated/floor{dir = 4; icon_state = "loadingarea"; tag = "loading"},/area/quartermaster/office)
@@ -2492,14 +2492,14 @@
 "aVV" = (/obj/machinery/camera{c_tag = "Warehouse Aft"; dir = 8; network = "Cargo"},/obj/machinery/firealarm{dir = 4; layer = 4; pixel_x = 24},/turf/simulated/floor,/area/quartermaster/storage)
 "aVW" = (/obj/machinery/camera{c_tag = "Patient Treatment"; dir = 4; network = "Medbay"},/obj/machinery/alarm{dir = 4; pixel_x = -23; pixel_y = 0},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/patients_rooms)
 "aVX" = (/obj/machinery/door/firedoor/border_only{dir = 4},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/patients_rooms)
-"aVY" = (/obj/effect/decal/warning_stripes{tag = "icon-N"; icon_state = "N"},/obj/structure/disposalpipe/segment{dir = 1},/turf/simulated/floor{tag = "icon-whitehall (NORTHWEST)"; icon_state = "whitehall"; dir = 9},/area/medical/medbay)
-"aVZ" = (/obj/effect/decal/warning_stripes{tag = "icon-N"; icon_state = "N"},/turf/simulated/floor{icon_state = "whitehall"; dir = 1},/area/medical/medbay)
-"aWa" = (/obj/effect/decal/warning_stripes{tag = "icon-N"; icon_state = "N"},/turf/simulated/floor{dir = 5; icon_state = "whitehall"},/area/medical/medbay)
+"aVY" = (/obj/structure/disposalpipe/segment{dir = 1},/turf/simulated/floor{tag = "icon-whitehall (NORTHWEST)"; icon_state = "whitehall"; dir = 9},/area/medical/medbay)
+"aVZ" = (/turf/simulated/floor{icon_state = "whitehall"; dir = 1},/area/medical/medbay)
+"aWa" = (/turf/simulated/floor{dir = 5; icon_state = "whitehall"},/area/medical/medbay)
 "aWb" = (/obj/structure/stool/bed/chair{dir = 4},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/medbay)
-"aWc" = (/obj/structure/table{pixel_y = 0},/obj/item/weapon/cleaner,/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/surgery)
+"aWc" = (/obj/structure/table{pixel_y = 0},/obj/item/weapon/reagent_containers/spray/cleaner,/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/surgery)
 "aWd" = (/obj/structure/table{pixel_y = 0},/obj/item/weapon/storage/stma_kit{pixel_x = 6; pixel_y = 6},/obj/item/weapon/storage/lglo_kit,/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/surgery)
 "aWe" = (/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/surgery)
-"aWf" = (/obj/structure/closet/secure_closet/anaesthetic,/obj/machinery/power/apc{dir = 4; name = "Surgery APC"; pixel_x = 25; pixel_y = 0},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/surgery)
+"aWf" = (/obj/structure/closet/secure_closet/medical2,/obj/machinery/power/apc{dir = 4; name = "Surgery APC"; pixel_x = 25; pixel_y = 0},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/surgery)
 "aWg" = (/obj/structure/table,/obj/effect/decal/cleanable/cobweb,/turf/simulated/floor{tag = "icon-vault (NORTHEAST)"; icon_state = "vault"; dir = 5},/area/teleporter)
 "aWh" = (/obj/structure/table,/obj/item/weapon/hand_tele,/turf/simulated/floor{tag = "icon-vault (NORTHEAST)"; icon_state = "vault"; dir = 5},/area/teleporter)
 "aWi" = (/obj/structure/table,/turf/simulated/floor{tag = "icon-vault (NORTHEAST)"; icon_state = "vault"; dir = 5},/area/teleporter)
@@ -2509,9 +2509,9 @@
 "aWm" = (/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/turf/simulated/floor/plating,/area/teleporter)
 "aWn" = (/obj/machinery/door/airlock/maintenance_hatch{req_access_txt = "19"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/turf/simulated/floor,/area/crew_quarters/heads)
 "aWo" = (/turf/simulated/wall/r_wall,/area/crew_quarters/chief)
-"aWp" = (/obj/structure/grille,/obj/machinery/door/firedoor/border_only{dir = 1},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/machinery/door/poddoor/shutters{density = 0; dir = 2; icon_state = "shutter0"; network = "Breakroom Shutters"; opacity = 0},/turf/simulated/floor/plating,/area/engine/engineering_break_room)
-"aWq" = (/obj/machinery/door/firedoor/border_only,/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/cable{tag = "Streight"; icon_state = "4-8"; pixel_x = 1; d1 = 4; d2 = 8},/obj/machinery/door/poddoor/shutters{density = 0; dir = 2; icon_state = "shutter0"; network = "Breakroom Shutters"; opacity = 0},/turf/simulated/floor/plating,/area/engine/engineering_break_room)
-"aWr" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor/border_only{dir = 1},/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"; tag = "90Curve"},/obj/machinery/door/poddoor/shutters{density = 0; dir = 2; icon_state = "shutter0"; network = "Breakroom Shutters"; opacity = 0},/turf/simulated/floor/plating,/area/engine/engineering_break_room)
+"aWp" = (/obj/structure/grille,/obj/machinery/door/firedoor/border_only{dir = 1},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/machinery/door/poddoor/shutters{density = 0; dir = 2; icon_state = "shutter0"; network = "Breakroom Shutters"; opacity = 0},/turf/simulated/floor/plating,/area/engine/break_room)
+"aWq" = (/obj/machinery/door/firedoor/border_only,/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/cable{tag = "Streight"; icon_state = "4-8"; pixel_x = 1; d1 = 4; d2 = 8},/obj/machinery/door/poddoor/shutters{density = 0; dir = 2; icon_state = "shutter0"; network = "Breakroom Shutters"; opacity = 0},/turf/simulated/floor/plating,/area/engine/break_room)
+"aWr" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor/border_only{dir = 1},/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"; tag = "90Curve"},/obj/machinery/door/poddoor/shutters{density = 0; dir = 2; icon_state = "shutter0"; network = "Breakroom Shutters"; opacity = 0},/turf/simulated/floor/plating,/area/engine/break_room)
 "aWs" = (/obj/machinery/light{dir = 4; icon_state = "tube1"},/turf/simulated/floor,/area/atmos)
 "aWt" = (/obj/machinery/light{dir = 8},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/turf/simulated/floor,/area/engine/locker)
 "aWu" = (/obj/structure/closet/secure_closet/engineering_personal,/turf/simulated/floor,/area/engine/locker)
@@ -2519,9 +2519,9 @@
 "aWw" = (/obj/machinery/camera{c_tag = "Starboard Hallway - Quartermasters"; dir = 4; network = "SS13"},/obj/structure/disposalpipe/segment,/turf/simulated/floor,/area/hallway/primary/starboard)
 "aWx" = (/obj/machinery/navbeacon{codes_txt = "delivery;dir=4"; dir = 2; freq = 1400; location = "QM #2"},/turf/simulated/floor{icon_state = "bot"},/area/quartermaster/office)
 "aWy" = (/obj/machinery/conveyor_switch{id = "qmout"},/turf/simulated/floor,/area/quartermaster/storage)
-"aWz" = (/obj/machinery/conveyor{backwards = 4; dir = 5; forwards = 2; id = "qmout"; reverseSpriteMoveDir = 1},/obj/effect/decal/warning_stripes{tag = "icon-SE-in"; icon_state = "SE-in"},/turf/simulated/floor/plating,/area/quartermaster/storage)
-"aWA" = (/obj/effect/decal/warning_stripes{tag = "icon-N"; icon_state = "N"},/obj/machinery/conveyor{dir = 8; id = "qmout"},/turf/simulated/floor/plating,/area/quartermaster/storage)
-"aWB" = (/obj/machinery/conveyor{dir = 8; id = "qmout"},/obj/effect/decal/warning_stripes{tag = "icon-N"; icon_state = "N"},/turf/simulated/floor/plating,/area/quartermaster/storage)
+"aWz" = (/obj/machinery/conveyor{backwards = 4; dir = 5; forwards = 2; id = "qmout"; reverseSpriteMoveDir = 1},/turf/simulated/floor/plating,/area/quartermaster/storage)
+"aWA" = (/obj/machinery/conveyor{dir = 8; id = "qmout"},/turf/simulated/floor/plating,/area/quartermaster/storage)
+"aWB" = (/obj/machinery/conveyor{dir = 8; id = "qmout"},/turf/simulated/floor/plating,/area/quartermaster/storage)
 "aWC" = (/obj/item/device/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 31},/turf/simulated/floor,/area/quartermaster/storage)
 "aWD" = (/obj/machinery/light/small{dir = 8},/turf/simulated/floor/plating,/area/maintenance/port)
 "aWE" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/glass_medical{name = "Patient Room 2"},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/patients_rooms)
@@ -2544,10 +2544,10 @@
 "aWV" = (/obj/structure/table/reinforced,/obj/item/weapon/packageWrap,/obj/item/device/destTagger{pixel_x = 4; pixel_y = 3},/obj/machinery/power/apc{desc = "Hehehe, it says Head Quarters."; dir = 1; name = "Head Quarters APC"; pixel_y = 25},/turf/simulated/floor,/area/crew_quarters/heads)
 "aWW" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/turf/simulated/floor,/area/crew_quarters/heads)
 "aWX" = (/turf/simulated/wall,/area/crew_quarters/chief)
-"aWY" = (/obj/structure/table,/obj/item/wardrobe/chief_engineer,/turf/simulated/floor,/area/crew_quarters/chief)
+"aWY" = (/obj/structure/table,/turf/simulated/floor,/area/crew_quarters/chief)
 "aWZ" = (/obj/effect/landmark{name = "plant"},/obj/machinery/power/apc{dir = 1; name = "CE Quarters APC"; pixel_y = 25},/obj/structure/cable{icon_state = "0-2"; pixel_y = 1; d2 = 2},/turf/simulated/floor,/area/crew_quarters/chief)
 "aXa" = (/obj/structure/bookcase/manuals/engineering,/turf/simulated/floor,/area/crew_quarters/chief)
-"aXb" = (/obj/machinery/computer/security/engineering,/turf/simulated/floor,/area/crew_quarters/chief)
+"aXb" = (/turf/simulated/floor,/area/crew_quarters/chief)
 "aXc" = (/obj/structure/table,/turf/simulated/floor,/area/crew_quarters/chief)
 "aXd" = (/turf/simulated/wall/r_wall,/area/atmos)
 "aXe" = (/obj/effect/landmark{name = "plant"},/turf/simulated/floor,/area/atmos)
@@ -2559,13 +2559,13 @@
 "aXk" = (/obj/machinery/power/apc{dir = 2; name = "Cargo Foyer APC"; pixel_x = 1; pixel_y = -24},/turf/simulated/floor,/area/quartermaster/office)
 "aXl" = (/obj/machinery/camera{c_tag = "Public Lobby"; dir = 1; network = "Cargo"},/turf/simulated/floor,/area/quartermaster/office)
 "aXm" = (/obj/machinery/light/spot,/turf/simulated/floor{icon_state = "bot"; dir = 1},/area/quartermaster/office)
-"aXn" = (/obj/machinery/conveyor{dir = 8; id = "qmout"},/obj/effect/decal/warning_stripes{tag = "icon-N"; icon_state = "N"},/turf/simulated/floor/plating,/area/quartermaster/office)
-"aXo" = (/obj/machinery/door/firedoor/border_only{dir = 8},/obj/structure/plasticflaps,/obj/machinery/conveyor{dir = 8; id = "qmout"},/obj/effect/decal/warning_stripes{tag = "icon-N"; icon_state = "N"},/turf/simulated/floor/plating,/area/quartermaster/storage)
-"aXp" = (/obj/machinery/conveyor{backwards = 1; dir = 10; forwards = 8; id = "qmout"},/obj/effect/decal/warning_stripes{tag = "icon-NW-out"; icon_state = "NW-out"},/turf/simulated/floor/plating,/area/quartermaster/storage)
-"aXq" = (/obj/machinery/conveyor{backwards = 2; dir = 5; forwards = 4; id = "refiner"; reverseSpriteMoveDir = 1},/obj/effect/decal/warning_stripes{tag = "icon-SE-in"; icon_state = "SE-in"},/turf/simulated/floor/plating,/area/quartermaster/storage)
-"aXr" = (/obj/machinery/conveyor{dir = 4; id = "refiner"},/obj/effect/decal/warning_stripes{tag = "icon-N"; icon_state = "N"},/obj/machinery/light/small,/turf/simulated/floor/plating,/area/quartermaster/storage)
-"aXs" = (/obj/machinery/conveyor{dir = 4; id = "refiner"},/obj/effect/decal/warning_stripes{tag = "icon-N"; icon_state = "N"},/turf/simulated/floor/plating,/area/quartermaster/storage)
-"aXt" = (/obj/machinery/conveyor{backwards = 8; dir = 10; forwards = 1; id = "refiner"},/obj/effect/decal/warning_stripes{tag = "icon-E"; icon_state = "E"},/turf/simulated/floor/plating,/area/quartermaster/storage)
+"aXn" = (/obj/machinery/conveyor{dir = 8; id = "qmout"},/turf/simulated/floor/plating,/area/quartermaster/office)
+"aXo" = (/obj/machinery/door/firedoor/border_only{dir = 8},/obj/structure/plasticflaps,/obj/machinery/conveyor{dir = 8; id = "qmout"},/turf/simulated/floor/plating,/area/quartermaster/storage)
+"aXp" = (/obj/machinery/conveyor{backwards = 1; dir = 10; forwards = 8; id = "qmout"},/turf/simulated/floor/plating,/area/quartermaster/storage)
+"aXq" = (/obj/machinery/conveyor{backwards = 2; dir = 5; forwards = 4; id = "refiner"; reverseSpriteMoveDir = 1},/turf/simulated/floor/plating,/area/quartermaster/storage)
+"aXr" = (/obj/machinery/conveyor{dir = 4; id = "refiner"},/obj/machinery/light/small,/turf/simulated/floor/plating,/area/quartermaster/storage)
+"aXs" = (/obj/machinery/conveyor{dir = 4; id = "refiner"},/turf/simulated/floor/plating,/area/quartermaster/storage)
+"aXt" = (/obj/machinery/conveyor{backwards = 8; dir = 10; forwards = 1; id = "refiner"},/turf/simulated/floor/plating,/area/quartermaster/storage)
 "aXu" = (/turf/simulated/shuttle/wall{tag = "icon-swall_s6"; icon_state = "swall_s6"; dir = 2},/area/shuttle/mining/station)
 "aXv" = (/turf/simulated/shuttle/wall{tag = "icon-swall12"; icon_state = "swall12"; dir = 2},/area/shuttle/mining/station)
 "aXw" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/shuttle/mining/station)
@@ -2618,7 +2618,7 @@
 "aYr" = (/obj/structure/closet/emcloset,/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/medbay)
 "aYs" = (/obj/structure/closet/crate/freezer,/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/surgery)
 "aYt" = (/obj/structure/table{pixel_y = 0},/obj/item/weapon/hemostat,/obj/machinery/light,/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/surgery)
-"aYu" = (/obj/structure/table{pixel_y = 0},/obj/item/weapon/surgical_tool/bonesetter,/obj/item/weapon/surgical_tool/bonegel,/obj/machinery/camera{c_tag = "Surgery"; dir = 1; network = "Medbay"},/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_y = -29},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/surgery)
+"aYu" = (/obj/structure/table{pixel_y = 0},/obj/item/weapon/bonesetter,/obj/item/weapon/bonegel,/obj/machinery/camera{c_tag = "Surgery"; dir = 1; network = "Medbay"},/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_y = -29},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/surgery)
 "aYv" = (/obj/structure/table{pixel_y = 0},/obj/item/weapon/scalpel,/obj/machinery/door_control{id = "sshutters"; name = "Privacy Shutters"; pixel_y = -25},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/surgery)
 "aYw" = (/obj/structure/table{pixel_y = 0},/obj/item/weapon/surgicaldrill,/obj/machinery/alarm{dir = 1; pixel_y = -22},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/surgery)
 "aYx" = (/obj/structure/table{pixel_y = 0},/obj/item/clothing/glasses/hud/health,/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/surgery)
@@ -2669,9 +2669,9 @@
 "aZq" = (/obj/structure/closet/crate,/turf/simulated/floor{tag = "icon-vault (NORTHEAST)"; icon_state = "vault"; dir = 5},/area/teleporter)
 "aZr" = (/obj/machinery/shieldwallgen,/turf/simulated/floor{tag = "icon-vault (NORTHEAST)"; icon_state = "vault"; dir = 5},/area/teleporter)
 "aZs" = (/obj/machinery/shieldwallgen,/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor{tag = "icon-vault (NORTHEAST)"; icon_state = "vault"; dir = 5},/area/teleporter)
-"aZt" = (/obj/effect/decal/warning_stripes{tag = "icon-NE-in"; icon_state = "NE-in"},/turf/simulated/floor{tag = "icon-vault (NORTHEAST)"; icon_state = "vault"; dir = 5},/area/teleporter)
-"aZu" = (/obj/effect/decal/warning_stripes{tag = "icon-S"; icon_state = "S"},/turf/simulated/floor{tag = "icon-vault (NORTHEAST)"; icon_state = "vault"; dir = 5},/area/teleporter)
-"aZv" = (/obj/machinery/power/apc{dir = 4; name = "Teleporter APC"; pixel_x = 25; pixel_y = 0},/obj/effect/decal/warning_stripes{tag = "icon-NW-in"; icon_state = "NW-in"},/turf/simulated/floor{tag = "icon-vault (NORTHEAST)"; icon_state = "vault"; dir = 5},/area/teleporter)
+"aZt" = (/turf/simulated/floor{tag = "icon-vault (NORTHEAST)"; icon_state = "vault"; dir = 5},/area/teleporter)
+"aZu" = (/turf/simulated/floor{tag = "icon-vault (NORTHEAST)"; icon_state = "vault"; dir = 5},/area/teleporter)
+"aZv" = (/obj/machinery/power/apc{dir = 4; name = "Teleporter APC"; pixel_x = 25; pixel_y = 0},/turf/simulated/floor{tag = "icon-vault (NORTHEAST)"; icon_state = "vault"; dir = 5},/area/teleporter)
 "aZw" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/simulated/floor,/area/crew_quarters/hor)
 "aZx" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"; tag = "90Curve"},/turf/simulated/floor,/area/crew_quarters/hor)
 "aZy" = (/obj/structure/cable{tag = "Streight"; icon_state = "4-8"; pixel_x = 1; d1 = 4; d2 = 8},/turf/simulated/floor,/area/crew_quarters/hor)
@@ -2720,12 +2720,12 @@
 "bap" = (/obj/structure/rack{dir = 8; layer = 2.9},/obj/item/clothing/shoes/magboots,/obj/item/clothing/suit/space/rig/elite,/obj/item/clothing/mask/breath,/obj/item/clothing/head/helmet/space/rig/elite,/obj/machinery/firealarm{dir = 8; pixel_x = -24},/turf/simulated/floor,/area/crew_quarters/chief)
 "baq" = (/obj/structure/closet/secure_closet/engineering_chief,/turf/simulated/floor,/area/crew_quarters/chief)
 "bar" = (/obj/machinery/power/monitor{name = "Engineering Power Monitor"},/turf/simulated/floor,/area/crew_quarters/chief)
-"bas" = (/obj/machinery/computer/lockdown{department = "Engineering"; name = "Engineering Lockdown Control"},/turf/simulated/floor,/area/crew_quarters/chief)
+"bas" = (/turf/simulated/floor,/area/crew_quarters/chief)
 "bat" = (/obj/effect/sign/fire{desc = "A warning sign which reads 'INFLAMMABLE'"; name = "INFLAMMABLE"},/turf/simulated/wall/r_wall,/area/atmos)
 "bau" = (/obj/machinery/atmospherics/portables_connector{dir = 4},/obj/machinery/portable_atmospherics/pump,/obj/machinery/light/small{dir = 8},/turf/simulated/floor,/area/atmos)
 "bav" = (/obj/machinery/camera{c_tag = "Refilling Station"; dir = 8; network = "Atmospherics"},/obj/machinery/firealarm{dir = 4; layer = 4; pixel_x = 24},/obj/structure/disposalpipe/segment,/turf/simulated/floor,/area/atmos)
 "baw" = (/obj/structure/table,/obj/item/weapon/reagent_containers/food/drinks/cola{volume = 5},/turf/simulated/floor,/area/quartermaster/miningdock)
-"bax" = (/obj/structure/table,/obj/item/weapon/cigpacket,/obj/item/weapon/matchbox,/turf/simulated/floor,/area/quartermaster/miningdock)
+"bax" = (/obj/structure/table,/obj/item/weapon/cigpacket,/turf/simulated/floor,/area/quartermaster/miningdock)
 "bay" = (/turf/simulated/floor,/area/quartermaster/miningdock)
 "baz" = (/obj/machinery/mineral/processing_unit_console{id = "furnace"; name = "Production machine console"; pixel_x = 0},/turf/simulated/wall,/area/quartermaster/miningdock)
 "baA" = (/obj/machinery/mineral/processing_unit{id = "furnace"},/turf/simulated/floor/plating,/area/quartermaster/miningdock)
@@ -2777,7 +2777,7 @@
 "bbu" = (/turf/simulated/wall,/area/maintenance/aft)
 "bbv" = (/obj/machinery/light/small{dir = 1},/turf/simulated/floor/plating,/area/maintenance/aft)
 "bbw" = (/obj/machinery/light/small{dir = 4},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating,/area/maintenance/aft)
-"bbx" = (/obj/structure/walllocker/emerglocker/west,/obj/structure/disposalpipe/segment,/turf/simulated/floor,/area/crew_quarters/heads)
+"bbx" = (/obj/structure/disposalpipe/segment,/turf/simulated/floor,/area/crew_quarters/heads)
 "bby" = (/obj/machinery/camera{c_tag = "Head's Quarters Hallway"; dir = 8; network = "Command"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/turf/simulated/floor,/area/crew_quarters/heads)
 "bbz" = (/obj/effect/landmark{name = "plant"},/turf/simulated/floor,/area/crew_quarters/heads/hop)
 "bbA" = (/obj/structure/bookcase{category = "Fiction"; name = "bookcase (Fiction)"},/turf/simulated/floor,/area/crew_quarters/heads/hop)
@@ -2862,8 +2862,8 @@
 "bdb" = (/obj/structure/table,/obj/item/weapon/storage/mousetraps,/obj/machinery/requests_console{department = "Janitorial"; departmentType = 1; pixel_y = 29},/turf/simulated/floor,/area/janitor)
 "bdc" = (/obj/structure/table,/obj/item/weapon/storage/lightbox/bulbs,/obj/item/weapon/storage/lightbox/tubes,/obj/machinery/light/spot{tag = "icon-bulb1 (NORTH)"; icon_state = "bulb1"; dir = 1},/turf/simulated/floor,/area/janitor)
 "bdd" = (/obj/structure/closet/l3closet/janitor,/turf/simulated/floor,/area/janitor)
-"bde" = (/obj/structure/closet/secure_closet/janitor_personal,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor,/area/janitor)
-"bdf" = (/obj/structure/closet/jcloset2,/obj/effect/decal/cleanable/cobweb2,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor,/area/janitor)
+"bde" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor,/area/janitor)
+"bdf" = (/obj/effect/decal/cleanable/cobweb2,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor,/area/janitor)
 "bdg" = (/obj/machinery/computer/med_data,/obj/machinery/light{icon_state = "tube1"; dir = 8},/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22},/turf/simulated/floor,/area/crew_quarters/heads/cmo)
 "bdh" = (/turf/simulated/floor,/area/crew_quarters/heads/cmo)
 "bdi" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"; tag = "90Curve"},/turf/simulated/floor,/area/crew_quarters/heads/cmo)
@@ -2879,8 +2879,8 @@
 "bds" = (/obj/machinery/power/apc{dir = 8; name = "Mining Dock APC"; pixel_x = -27; pixel_y = 2},/turf/simulated/floor,/area/quartermaster/miningdock)
 "bdt" = (/obj/structure/disposalpipe/segment{dir = 1},/turf/simulated/floor,/area/quartermaster/miningdock)
 "bdu" = (/obj/structure/closet/secure_closet/miner,/obj/effect/decal/cleanable/dirt,/obj/machinery/light/spot{tag = "icon-bulb1 (EAST)"; icon_state = "bulb1"; dir = 4},/turf/simulated/floor,/area/quartermaster/miningdock)
-"bdv" = (/obj/structure/closet/secure_closet/chemist_personal,/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/chemistry)
-"bdw" = (/obj/structure/closet/secure_closet/chemist_personal,/obj/machinery/light{dir = 1},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/chemistry)
+"bdv" = (/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/chemistry)
+"bdw" = (/obj/machinery/light{dir = 1},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/chemistry)
 "bdx" = (/obj/structure/closet/wardrobe/chemistry_white,/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/chemistry)
 "bdy" = (/obj/machinery/disposal,/obj/machinery/alarm{frequency = 1437; pixel_y = 23},/obj/structure/disposalpipe/trunk,/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/chemistry)
 "bdz" = (/obj/structure/closet/secure_closet/chemical,/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/chemistry)
@@ -2932,7 +2932,7 @@
 "bet" = (/obj/machinery/door/firedoor/border_only{dir = 4},/obj/structure/window/reinforced{dir = 5; health = 1e+007},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/chemistry)
 "beu" = (/obj/effect/landmark{name = "emcloset"},/turf/simulated/floor{icon_state = "whitehall"; dir = 4},/area/medical/medbay)
 "bev" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/obj/structure/filingcabinet,/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/medbay)
-"bew" = (/obj/structure/closet/secure_closet/medicine,/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/medbay)
+"bew" = (/obj/structure/closet/secure_closet/medical1,/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/medbay)
 "bex" = (/obj/item/weapon/paper_bin,/obj/item/weapon/pen,/obj/structure/table/reinforced,/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/medbay)
 "bey" = (/obj/structure/disposalpipe/segment{dir = 1},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/medbay)
 "bez" = (/obj/structure/reagent_dispensers/watertank,/obj/machinery/atmospherics/unary/vent_pump{dir = 4; layer = 2.4; on = 1},/turf/simulated/floor,/area/janitor)
@@ -2945,10 +2945,10 @@
 "beG" = (/obj/structure/table,/turf/simulated/floor,/area/crew_quarters/heads/cmo)
 "beH" = (/obj/structure/stool/bed,/obj/item/weapon/bedsheet/green,/turf/simulated/floor,/area/crew_quarters/heads/cmo)
 "beI" = (/obj/structure/closet/secure_closet/CMO,/turf/simulated/floor,/area/crew_quarters/heads/cmo)
-"beJ" = (/obj/structure/closet/wardrobe/cmo,/turf/simulated/floor,/area/crew_quarters/heads/cmo)
+"beJ" = (/turf/simulated/floor,/area/crew_quarters/heads/cmo)
 "beK" = (/obj/structure/table,/obj/machinery/recharger,/turf/simulated/floor,/area/crew_quarters/heads/hop)
 "beL" = (/obj/structure/closet/secure_closet/hop,/obj/machinery/light,/obj/machinery/alarm{dir = 1; layer = 4; pixel_y = -22},/turf/simulated/floor,/area/crew_quarters/heads/hop)
-"beM" = (/obj/structure/closet/wardrobe/hop,/turf/simulated/floor,/area/crew_quarters/heads/hop)
+"beM" = (/turf/simulated/floor,/area/crew_quarters/heads/hop)
 "beN" = (/obj/machinery/vending/coffee,/turf/simulated/floor,/area/hallway/primary/aft)
 "beO" = (/obj/machinery/power/apc{dir = 1; name = "Hallway Aft APC"; pixel_y = 25},/obj/structure/cable{icon_state = "0-2"; pixel_y = 1; d2 = 2},/turf/simulated/floor,/area/hallway/primary/aft)
 "beP" = (/obj/machinery/disposal,/obj/machinery/light/spot{tag = "icon-bulb1 (EAST)"; icon_state = "bulb1"; dir = 4},/obj/structure/disposalpipe/trunk,/turf/simulated/floor,/area/hallway/primary/aft)
@@ -2956,10 +2956,10 @@
 "beR" = (/obj/machinery/portable_atmospherics/canister/toxins,/turf/simulated/floor/plating{tag = "icon-warnplate (EAST)"; icon_state = "warnplate"; dir = 4},/area/engine/atmos_storage)
 "beS" = (/obj/machinery/light/small,/turf/simulated/floor/plating,/area/engine/atmos_storage)
 "beT" = (/obj/machinery/door/firedoor/border_only{dir = 8},/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/medical/chemistry)
-"beU" = (/obj/structure/table,/obj/item/weapon/storage/beakerbox{pixel_x = 2; pixel_y = 2},/obj/item/weapon/reagent_containers/glass/large,/obj/item/weapon/reagent_containers/dropper,/obj/item/weapon/storage/pill_bottle/inaprovaline{pixel_x = 5; pixel_y = -2},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/chemistry)
+"beU" = (/obj/structure/table,/obj/item/weapon/storage/beakerbox{pixel_x = 2; pixel_y = 2},/obj/item/weapon/reagent_containers/glass,/obj/item/weapon/reagent_containers/dropper,/obj/item/weapon/storage/pill_bottle/inaprovaline{pixel_x = 5; pixel_y = -2},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/chemistry)
 "beV" = (/obj/effect/landmark/start{name = "Chemist"},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/chemistry)
 "beW" = (/obj/structure/table,/obj/item/clothing/glasses/science,/obj/item/clothing/glasses/science{pixel_x = 4; pixel_y = 4},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/chemistry)
-"beX" = (/obj/structure/table,/obj/item/device/assembly/igniter{pixel_x = -4; pixel_y = -4},/obj/item/device/assembly/igniter{pixel_x = -4; pixel_y = 4},/obj/item/device/assembly/igniter,/obj/item/weapon/chem_grenade{pixel_x = 4; pixel_y = 4},/obj/item/weapon/chem_grenade{pixel_x = 8; pixel_y = 0},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/chemistry)
+"beX" = (/obj/structure/table,/obj/item/device/assembly/igniter{pixel_x = -4; pixel_y = -4},/obj/item/device/assembly/igniter{pixel_x = -4; pixel_y = 4},/obj/item/device/assembly/igniter,/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/chemistry)
 "beY" = (/obj/structure/disposalpipe/segment{dir = 1},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/chemistry)
 "beZ" = (/obj/machinery/door/firedoor/border_only,/obj/structure/table/reinforced{layer = 2.6},/obj/machinery/door/window/westright{dir = 4; icon_state = "right"; name = "Chemistry Desk"; req_access_txt = "5"; tag = "icon-right (EAST)"},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/chemistry)
 "bfa" = (/obj/machinery/photocopier,/turf/simulated/floor{icon_state = "whitehall"; dir = 4},/area/medical/medbay)
@@ -2970,8 +2970,8 @@
 "bff" = (/obj/machinery/vending/snack,/turf/simulated/floor,/area/hallway/primary/aft)
 "bfg" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/turf/simulated/floor,/area/hallway/primary/aft)
 "bfh" = (/obj/structure/table/reinforced,/obj/item/weapon/packageWrap,/obj/item/device/destTagger{pixel_x = 4; pixel_y = 3},/obj/item/device/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 31},/obj/structure/disposalpipe/segment,/turf/simulated/floor,/area/hallway/primary/aft)
-"bfi" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/glass/glass_engineering{name = "Engineering Access, Refilling Station"; req_access_txt = "0"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/turf/simulated/floor,/area/atmos)
-"bfj" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/glass/glass_engineering{name = "Engineering Access, Refilling Station"; req_access_txt = "0"},/obj/structure/disposalpipe/segment,/turf/simulated/floor,/area/atmos)
+"bfi" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/glass_engineering{name = "Engineering Access, Refilling Station"; req_access_txt = "0"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/turf/simulated/floor,/area/atmos)
+"bfj" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/glass_engineering{name = "Engineering Access, Refilling Station"; req_access_txt = "0"},/obj/structure/disposalpipe/segment,/turf/simulated/floor,/area/atmos)
 "bfk" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/glass,/obj/structure/disposalpipe/segment,/turf/simulated/floor,/area/hallway/primary/starboard)
 "bfl" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/glass,/obj/structure/disposalpipe/segment{dir = 1; icon_state = "pipe-c"},/turf/simulated/floor,/area/hallway/primary/starboard)
 "bfm" = (/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/wall,/area/maintenance/disposal)
@@ -2985,7 +2985,7 @@
 "bfu" = (/obj/machinery/chem_master,/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/chemistry)
 "bfv" = (/obj/structure/stool/bed/chair{dir = 1},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/chemistry)
 "bfw" = (/obj/structure/table,/obj/item/stack/sheet/plasma,/obj/item/stack/sheet/plasma{pixel_x = -6; pixel_y = 0},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/chemistry)
-"bfx" = (/obj/structure/table,/obj/item/weapon/chem_grenade{pixel_x = 8; pixel_y = 8},/obj/item/weapon/chem_grenade{pixel_x = 8},/obj/item/device/assembly/timer{pixel_x = -4; pixel_y = -4},/obj/item/device/assembly/timer{pixel_x = -4; pixel_y = 4},/obj/item/device/assembly/timer,/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/chemistry)
+"bfx" = (/obj/structure/table,/obj/item/device/assembly/timer{pixel_x = -4; pixel_y = -4},/obj/item/device/assembly/timer{pixel_x = -4; pixel_y = 4},/obj/item/device/assembly/timer,/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/chemistry)
 "bfy" = (/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/turf/simulated/floor,/area/medical/medbay)
 "bfz" = (/obj/structure/disposalpipe/sortjunction{backsort = 1; backType = list("Chemistry","CMO"); dir = 4; icon_state = "pipe-j1s"; sortType = list("Morgue","Genetics")},/turf/simulated/floor{icon_state = "whitehall"; dir = 4},/area/medical/medbay)
 "bfA" = (/obj/machinery/door/firedoor/border_only{dir = 4},/obj/machinery/door/airlock/glass_medical{name = "Medbay"; req_access = null; req_access_txt = "5"},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/medbay)
@@ -3106,7 +3106,7 @@
 "bhL" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/glass{name = "Dormitory"},/turf/simulated/floor{icon_state = "neutral"; dir = 8},/area/crew_quarters)
 "bhM" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/glass{name = "Dormitory"},/obj/structure/disposalpipe/segment{dir = 1},/turf/simulated/floor{icon_state = "neutralcorner"; dir = 4},/area/crew_quarters)
 "bhN" = (/turf/simulated/wall/r_wall,/area/crew_quarters)
-"bhO" = (/obj/structure/closet/secure_closet/genetics_personal,/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/genetics)
+"bhO" = (/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/genetics)
 "bhP" = (/obj/structure/table,/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/genetics)
 "bhQ" = (/obj/machinery/computer/cloning{wantspod = 1; wantsscan = 0},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/genetics)
 "bhR" = (/obj/machinery/clonepod,/obj/machinery/camera{c_tag = "Genetical Research"; dir = 2; network = "Medbay"},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/genetics)
@@ -3119,8 +3119,8 @@
 "bhY" = (/turf/simulated/wall,/area/medical/genetics)
 "bhZ" = (/obj/item/device/radio/intercom{dir = 0; name = "Station Intercom (General)"; pixel_x = -27},/turf/simulated/floor{tag = "icon-whitehall (WEST)"; icon_state = "whitehall"; dir = 8},/area/medical/medbay)
 "bia" = (/obj/machinery/vending/medical,/obj/machinery/light_switch{dir = 8; pixel_x = -24},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/medbay)
-"bib" = (/obj/structure/table,/obj/item/weapon/cleaner{pixel_x = 8; pixel_y = 3},/obj/item/weapon/hand_labeler,/obj/item/clothing/glasses/hud/health,/obj/item/clothing/glasses/hud/health,/obj/item/clothing/glasses/hud/health,/obj/machinery/light{dir = 1},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/medbay)
-"bic" = (/obj/structure/table,/obj/item/weapon/storage/backpack/medic/full,/obj/item/weapon/storage/backpack/medic/full,/obj/item/weapon/storage/backpack/medic/full,/obj/item/weapon/storage/belt/medical,/obj/item/weapon/storage/belt/medical,/obj/machinery/firealarm{dir = 1; pixel_y = 25},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/medbay)
+"bib" = (/obj/structure/table,/obj/item/weapon/reagent_containers/spray/cleaner{pixel_x = 8; pixel_y = 3},/obj/item/weapon/hand_labeler,/obj/item/clothing/glasses/hud/health,/obj/item/clothing/glasses/hud/health,/obj/item/clothing/glasses/hud/health,/obj/machinery/light{dir = 1},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/medbay)
+"bic" = (/obj/structure/table,/obj/item/weapon/storage/belt/medical,/obj/item/weapon/storage/belt/medical,/obj/machinery/firealarm{dir = 1; pixel_y = 25},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/medbay)
 "bid" = (/obj/structure/table,/obj/item/weapon/storage/gl_kit{pixel_x = 4; pixel_y = 3},/obj/item/weapon/storage/syringes,/obj/machinery/alarm{frequency = 1437; pixel_y = 23},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/medbay)
 "bie" = (/obj/structure/bookcase/manuals/medical,/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/medbay)
 "bif" = (/obj/item/device/radio/intercom{broadcasting = 0; name = "Station Intercom (General)"; pixel_y = 20},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/medbay)
@@ -3141,10 +3141,10 @@
 "biu" = (/obj/structure/table,/obj/machinery/door_control{dir = 1; id = "barshutter"; name = "Bar Shutters"; pixel_x = 0; pixel_y = 24},/turf/simulated/floor{icon_state = "bar"},/area/crew_quarters/bar)
 "biv" = (/obj/machinery/vending/boozeomat,/turf/simulated/floor{icon_state = "bar"},/area/crew_quarters/bar)
 "biw" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk,/turf/simulated/floor{icon_state = "bar"},/area/crew_quarters/bar)
-"bix" = (/obj/structure/closet/secure_closet/barman_personal,/turf/simulated/floor{icon_state = "bar"},/area/crew_quarters/bar)
+"bix" = (/turf/simulated/floor{icon_state = "bar"},/area/crew_quarters/bar)
 "biy" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk,/turf/simulated/floor{icon_state = "white"},/area/crew_quarters/bar)
 "biz" = (/obj/structure/sink/kitchen,/obj/machinery/light/spot{tag = "icon-bulb1 (NORTH)"; icon_state = "bulb1"; dir = 1},/turf/simulated/floor{icon_state = "white"},/area/crew_quarters/bar)
-"biA" = (/obj/structure/closet/secure_closet/fridge,/turf/simulated/floor{icon_state = "white"},/area/crew_quarters/bar)
+"biA" = (/obj/structure/closet/secure_closet/freezer/kitchen,/turf/simulated/floor{icon_state = "white"},/area/crew_quarters/bar)
 "biB" = (/obj/structure/reagent_dispensers/beerkeg,/turf/simulated/floor{icon_state = "white"},/area/crew_quarters/bar)
 "biC" = (/obj/structure/table,/turf/simulated/floor{icon_state = "hydrofloor"},/area/hydroponics)
 "biD" = (/obj/structure/closet/crate/hydroponics/prespawned,/turf/simulated/floor{icon_state = "hydrofloor"},/area/hydroponics)
@@ -3166,7 +3166,7 @@
 "biT" = (/obj/effect/landmark{name = "plant"},/turf/simulated/floor{dir = 1; icon_state = "carpetside"},/area/chapel/office)
 "biU" = (/obj/structure/bookcase{category = "Religion"; name = "bookcase (Religious)"},/turf/simulated/floor{dir = 1; icon_state = "carpetside"},/area/chapel/office)
 "biV" = (/obj/structure/bookcase{category = "Non-Fiction"; name = "bookcase (Non-Fiction)"},/turf/simulated/floor{dir = 1; icon_state = "carpetside"},/area/chapel/office)
-"biW" = (/obj/structure/closet/secure_closet/counselor_personal,/turf/simulated/floor{dir = 5; icon_state = "carpetside"},/area/chapel/office)
+"biW" = (/turf/simulated/floor{dir = 5; icon_state = "carpetside"},/area/chapel/office)
 "biX" = (/turf/simulated/floor{icon_state = "neutral"; dir = 8},/area/crew_quarters)
 "biY" = (/obj/structure/disposalpipe/segment{dir = 1},/turf/simulated/floor{icon_state = "neutral"; dir = 4},/area/crew_quarters)
 "biZ" = (/obj/machinery/disposal,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/cobweb,/obj/structure/disposalpipe/trunk,/turf/simulated/floor{icon_state = "neutral"; dir = 9},/area/crew_quarters)
@@ -3244,10 +3244,10 @@
 "bkt" = (/obj/structure/disposalpipe/segment,/turf/simulated/floor{icon_state = "bar"},/area/crew_quarters/bar)
 "bku" = (/obj/structure/table,/obj/item/weapon/book/manual/barman_recipes,/obj/machinery/power/apc{dir = 4; name = "Bar APC"; pixel_x = 25; pixel_y = 0},/turf/simulated/floor{icon_state = "bar"},/area/crew_quarters/bar)
 "bkv" = (/obj/machinery/camera{c_tag = "Bar Freezer"; dir = 4; network = "SS13"},/turf/simulated/floor{icon_state = "white"},/area/crew_quarters/bar)
-"bkw" = (/obj/structure/closet/secure_closet/hydro_personal,/turf/simulated/floor{icon_state = "hydrofloor"},/area/hydroponics)
+"bkw" = (/obj/structure/closet/secure_closet/hydroponics,/turf/simulated/floor{icon_state = "hydrofloor"},/area/hydroponics)
 "bkx" = (/obj/machinery/light/spot,/turf/simulated/floor{icon_state = "hydrofloor"},/area/hydroponics)
 "bky" = (/obj/machinery/camera{c_tag = "Hydrophonics Back Room"; dir = 1; network = "SS13"},/obj/machinery/alarm{dir = 1; layer = 4; pixel_y = -22},/turf/simulated/floor{icon_state = "hydrofloor"},/area/hydroponics)
-"bkz" = (/obj/structure/closet/wardrobe/hydro_green,/turf/simulated/floor{icon_state = "hydrofloor"},/area/hydroponics)
+"bkz" = (/turf/simulated/floor{icon_state = "hydrofloor"},/area/hydroponics)
 "bkA" = (/obj/effect/landmark{name = "plant"},/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/turf/simulated/floor,/area/hydroponics)
 "bkB" = (/obj/machinery/light/spot{tag = "icon-bulb1 (WEST)"; icon_state = "bulb1"; dir = 8},/turf/simulated/floor{icon_state = "dark"},/area/chapel/main)
 "bkC" = (/turf/simulated/floor{dir = 1; icon_state = "chapel"},/area/chapel/main)
@@ -3281,7 +3281,7 @@
 "ble" = (/obj/structure/table,/obj/item/weapon/storage/firstaid/fire{pixel_x = 4; pixel_y = 3},/obj/item/weapon/storage/firstaid/fire,/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/medbay)
 "blf" = (/obj/structure/table,/obj/item/weapon/gun/syringe{pixel_y = 4},/obj/item/weapon/gun/syringe,/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/medbay)
 "blg" = (/obj/structure/closet/wardrobe/medic_white,/obj/machinery/camera{c_tag = "Medbay Storage"; dir = 1; network = "Medbay"},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/medbay)
-"blh" = (/obj/structure/closet/secure_closet/anaesthetic,/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/medbay)
+"blh" = (/obj/structure/closet/secure_closet/medical2,/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/medbay)
 "bli" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/simulated/floor{icon_state = "bar"},/area/crew_quarters/cafeteria)
 "blj" = (/obj/structure/table,/turf/simulated/floor{icon_state = "bar"},/area/crew_quarters/cafeteria)
 "blk" = (/obj/structure/disposalpipe/segment{dir = 1; icon_state = "pipe-c"},/turf/simulated/floor{icon_state = "bar"},/area/crew_quarters/cafeteria)
@@ -3351,7 +3351,7 @@
 "bmw" = (/obj/machinery/door/firedoor/border_only{dir = 8},/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/medical/genetics)
 "bmx" = (/obj/structure/table,/obj/item/weapon/storage/syringes{pixel_x = 6; pixel_y = 6},/obj/item/weapon/storage/lglo_kit,/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/genetics)
 "bmy" = (/obj/structure/stool/bed/chair{dir = 4},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/genetics)
-"bmz" = (/obj/machinery/scan_consolenew,/obj/machinery/light{dir = 4},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/genetics)
+"bmz" = (/obj/machinery/computer/scan_consolenew,/obj/machinery/light{dir = 4},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/genetics)
 "bmA" = (/obj/structure/morgue,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor{icon_state = "dark"},/area/medical/morgue)
 "bmB" = (/obj/structure/disposalpipe/segment{dir = 1; icon_state = "pipe-c"},/turf/simulated/floor{icon_state = "dark"},/area/medical/morgue)
 "bmC" = (/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor{icon_state = "dark"},/area/medical/morgue)
@@ -3444,11 +3444,11 @@
 "bol" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/glass,/turf/simulated/floor{icon_state = "whitehall"; dir = 4},/area/medical/medbay)
 "bom" = (/turf/simulated/wall/r_wall,/area/medical/medbay)
 "bon" = (/obj/structure/table,/obj/item/weapon/storage/fancy/donut_box,/obj/machinery/door/poddoor/shutters{desc = "A type of shutter"; dir = 8; id = "kitchenshutter"; layer = 3.3; name = "Kitchen Shutters"; id = "Kitchen Shutters"},/obj/machinery/door/firedoor/border_only{dir = 8},/turf/simulated/floor{icon_state = "cafeteria"},/area/crew_quarters/kitchen)
-"boo" = (/obj/structure/table,/obj/item/weapon/monkeycube_box,/turf/simulated/floor{icon_state = "cafeteria"},/area/crew_quarters/kitchen)
+"boo" = (/obj/structure/table,/obj/item/weapon/storage/monkeycube_box,/turf/simulated/floor{icon_state = "cafeteria"},/area/crew_quarters/kitchen)
 "bop" = (/obj/structure/disposalpipe/segment,/turf/simulated/floor{icon_state = "cafeteria"},/area/crew_quarters/kitchen)
 "boq" = (/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; layer = 4; pixel_x = 24},/turf/simulated/floor{icon_state = "cafeteria"},/area/crew_quarters/kitchen)
-"bor" = (/obj/structure/closet/secure_closet/meat,/turf/simulated/floor{icon_state = "white"},/area/crew_quarters/kitchen)
-"bos" = (/obj/structure/closet/secure_closet/fridge,/turf/simulated/floor{icon_state = "white"},/area/crew_quarters/kitchen)
+"bor" = (/turf/simulated/floor{icon_state = "white"},/area/crew_quarters/kitchen)
+"bos" = (/obj/structure/closet/secure_closet/freezer/kitchen,/turf/simulated/floor{icon_state = "white"},/area/crew_quarters/kitchen)
 "bot" = (/obj/structure/disposalpipe/segment{dir = 1; icon_state = "pipe-c"},/turf/simulated/floor{icon_state = "white"},/area/crew_quarters/kitchen)
 "bou" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk{dir = 8},/turf/simulated/floor{icon_state = "white"},/area/crew_quarters/kitchen)
 "bov" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock{name = "Chapel Storage"; req_access_txt = "22"},/turf/simulated/floor,/area/chapel/main)
@@ -3489,7 +3489,7 @@
 "bpe" = (/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; layer = 4; pixel_x = 25},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating,/area/maintenance/aft)
 "bpf" = (/obj/machinery/alarm{dir = 1; pixel_y = -22},/mob/living/carbon/monkey,/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/genetics)
 "bpg" = (/obj/machinery/camera{c_tag = "Genetical Research Monkey Pen"; dir = 1; network = "Medbay"},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/genetics)
-"bph" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/ash,/obj/machinery/crema_switch{desc = "Descretly disposing the bodies of past employees since anno domine"; id = "crematorium"; pixel_x = -25; req_access = null; req_access_txt = "40"},/turf/simulated/floor{icon_state = "dark"},/area/medical/morgue)
+"bph" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/ash,/obj/machinery/crema_switch{desc = "Descretly disposing the bodies of past employees since anno domine"; id = "crematorium"; pixel_x = -25; req_access = null; req_access_txt = "40"},/turf/simulated/floor{icon_state = "dark"},/area/medical/morgue)
 "bpi" = (/obj/effect/decal/cleanable/dirt,/obj/machinery/light/spot,/turf/simulated/floor{icon_state = "dark"},/area/medical/morgue)
 "bpj" = (/obj/structure/closet/crate,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor{icon_state = "dark"},/area/medical/morgue)
 "bpk" = (/obj/structure/morgue,/obj/machinery/camera{c_tag = "Morgue"; dir = 1; network = "Medbay"},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor{icon_state = "dark"},/area/medical/morgue)
@@ -3539,12 +3539,12 @@
 "bqc" = (/obj/effect/landmark{name = "plant"},/turf/simulated/floor{icon_state = "bar"},/area/crew_quarters/cafeteria)
 "bqd" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/firedoor/border_only{dir = 8},/obj/machinery/door/poddoor/shutters{desc = "A type of shutter"; dir = 8; id = "kitchenshutter"; layer = 3.3; name = "Kitchen Shutters"; id = "Kitchen Shutters"},/turf/simulated/floor/plating,/area/crew_quarters/kitchen)
 "bqe" = (/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/window/westleft{dir = 1; name = "Kitchen Delivery"; req_access_txt = "28"},/turf/simulated/floor{icon_state = "delivery"},/area/crew_quarters/kitchen)
-"bqf" = (/obj/structure/table,/obj/machinery/blender,/turf/simulated/floor{icon_state = "cafeteria"},/area/crew_quarters/kitchen)
+"bqf" = (/obj/structure/table,/obj/machinery/reagentgrinder,/turf/simulated/floor{icon_state = "cafeteria"},/area/crew_quarters/kitchen)
 "bqg" = (/obj/structure/table,/obj/machinery/juicer,/turf/simulated/floor{icon_state = "cafeteria"},/area/crew_quarters/kitchen)
 "bqh" = (/obj/structure/table,/obj/machinery/processor,/turf/simulated/floor{icon_state = "cafeteria"},/area/crew_quarters/kitchen)
 "bqi" = (/obj/structure/table,/obj/item/weapon/book/manual/chef_recipes,/turf/simulated/floor{icon_state = "cafeteria"},/area/crew_quarters/kitchen)
 "bqj" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk{dir = 1},/turf/simulated/floor{icon_state = "cafeteria"},/area/crew_quarters/kitchen)
-"bqk" = (/obj/structure/closet/secure_closet/kitchen,/obj/machinery/power/apc{dir = 4; name = "Kitchen APC"; pixel_x = 25; pixel_y = 0},/turf/simulated/floor{icon_state = "cafeteria"},/area/crew_quarters/kitchen)
+"bqk" = (/obj/machinery/power/apc{dir = 4; name = "Kitchen APC"; pixel_x = 25; pixel_y = 0},/turf/simulated/floor{icon_state = "cafeteria"},/area/crew_quarters/kitchen)
 "bql" = (/obj/effect/landmark{name = "plant"},/turf/simulated/floor{icon_state = "green"; dir = 10},/area/hydroponics)
 "bqm" = (/obj/machinery/alarm{dir = 1; layer = 4; pixel_y = -22},/turf/simulated/floor{icon_state = "green"},/area/hydroponics)
 "bqn" = (/obj/machinery/camera{c_tag = "Hydrophonics Kitchen Access"; dir = 1; network = "SS13"},/turf/simulated/floor{icon_state = "green"},/area/hydroponics)
@@ -3636,7 +3636,7 @@
 "brV" = (/obj/structure/table/woodentable,/turf/simulated/floor{dir = 4; icon_state = "carpetside"},/area/chapel/main)
 "brW" = (/obj/structure/table,/obj/item/device/radio/intercom{pixel_x = 0; pixel_y = 0},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor{icon_state = "dark"},/area/chapel/main)
 "brX" = (/obj/structure/closet/wardrobe/virology_white,/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/virology)
-"brY" = (/obj/structure/closet/secure_closet/viro_personal,/obj/machinery/firealarm{dir = 1; pixel_y = 25},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/virology)
+"brY" = (/obj/machinery/firealarm{dir = 1; pixel_y = 25},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/virology)
 "brZ" = (/obj/machinery/atmospherics/pipe/tank/air,/obj/machinery/camera{c_tag = "Virology Back Room"; network = "Medbay"},/obj/structure/disposalpipe/segment,/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/virology)
 "bsa" = (/obj/machinery/door/firedoor/border_only,/obj/structure/window/reinforced{dir = 5; health = 1e+007},/turf/simulated/floor/plating,/area/medical/virology)
 "bsb" = (/obj/structure/table,/obj/machinery/light{dir = 1},/obj/machinery/firealarm{dir = 1; pixel_y = 25},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/virology)
@@ -3696,14 +3696,14 @@
 "btd" = (/obj/machinery/light,/obj/machinery/firealarm{dir = 2; layer = 4; pixel_x = 0; pixel_y = 25},/obj/structure/closet/l3closet/virology,/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/virology)
 "bte" = (/obj/structure/table,/obj/item/clothing/gloves/latex,/obj/item/clothing/glasses/hud/health,/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/virology)
 "btf" = (/obj/structure/table,/obj/item/weapon/storage/syringes{pixel_x = 6; pixel_y = 6},/obj/item/weapon/storage/beakerbox,/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/virology)
-"btg" = (/obj/structure/table,/obj/item/weapon/cleaner,/obj/item/weapon/reagent_containers/syringe/antiviral,/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/virology)
+"btg" = (/obj/structure/table,/obj/item/weapon/reagent_containers/spray/cleaner,/obj/item/weapon/reagent_containers/syringe/antiviral,/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/virology)
 "bth" = (/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/virology)
 "bti" = (/obj/machinery/camera{c_tag = "Virology"; dir = 1; network = "Medbay"},/obj/machinery/light,/obj/machinery/alarm{dir = 1; layer = 4; pixel_y = -22},/obj/machinery/disposal,/obj/structure/disposalpipe/trunk{dir = 8},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/virology)
 "btj" = (/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/virology)
 "btk" = (/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/virology)
 "btl" = (/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/virology)
 "btm" = (/obj/machinery/light,/obj/machinery/firealarm{dir = 4; layer = 4; pixel_x = 24},/obj/structure/table,/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/virology)
-"btn" = (/obj/machinery/door/poddoor/four_tile_hor,/turf/space,/area)
+"btn" = (/obj/machinery/door/poddoor,/turf/space,/area)
 "bto" = (/turf/space,/area/start)
 "btp" = (/obj/effect/landmark/start,/turf/space,/area/start)
 "btq" = (/turf/unsimulated/wall{icon = 'icons/misc/fullscreen.dmi'; icon_state = "title"; name = "Baystation 13"},/area/start)
@@ -3713,13 +3713,13 @@
 "btu" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/supply/dock)
 "btv" = (/turf/simulated/shuttle/wall{tag = "icon-swall_s10"; icon_state = "swall_s10"; dir = 2},/area/supply/dock)
 "btw" = (/turf/simulated/shuttle/floor,/turf/simulated/shuttle/wall{tag = "icon-swall_f9"; icon_state = "swall_f9"; dir = 2},/area/supply/dock)
-"btx" = (/obj/effect/marker/supplymarker,/turf/simulated/shuttle/floor,/area/supply/dock)
+"btx" = (/turf/simulated/shuttle/floor,/area/supply/dock)
 "bty" = (/turf/simulated/shuttle/floor,/turf/simulated/shuttle/wall{dir = 2; icon_state = "swall_f5"; tag = "icon-swall_f10"},/area/supply/dock)
 "btz" = (/turf/simulated/shuttle/wall{tag = "icon-swall3"; icon_state = "swall3"; dir = 2},/area/supply/dock)
-"btA" = (/obj/effect/sign/securearea{desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; name = "EXTERNAL AIRLOCK"; pixel_x = -32},/obj/effect/marker/supplymarker,/turf/simulated/shuttle/floor,/area/supply/dock)
+"btA" = (/obj/effect/sign/securearea{desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; name = "EXTERNAL AIRLOCK"; pixel_x = -32},/turf/simulated/shuttle/floor,/area/supply/dock)
 "btB" = (/obj/machinery/door/airlock/external{name = "Supply Dock Airlock"},/turf/simulated/shuttle/floor,/area/supply/dock)
 "btC" = (/turf/simulated/shuttle/floor,/area/supply/dock)
-"btD" = (/obj/effect/sign/movingparts{pixel_x = -32},/obj/effect/marker/supplymarker,/turf/simulated/shuttle/floor,/area/supply/dock)
+"btD" = (/obj/effect/sign/movingparts{pixel_x = -32},/turf/simulated/shuttle/floor,/area/supply/dock)
 "btE" = (/turf/space,/area/shuttle/escape/centcom)
 "btF" = (/turf/simulated/shuttle/wall{tag = "icon-swall_s6"; icon_state = "swall_s6"; dir = 2},/area/shuttle/escape/centcom)
 "btG" = (/turf/simulated/shuttle/wall{tag = "icon-swall12"; icon_state = "swall12"; dir = 2},/area/shuttle/escape/centcom)
@@ -3758,13 +3758,13 @@
 "bun" = (/obj/structure/stool/bed/chair{dir = 4},/turf/simulated/shuttle/floor{icon_state = "floor3"},/area/shuttle/escape/centcom)
 "buo" = (/obj/structure/stool/bed/chair{dir = 1},/turf/simulated/shuttle/floor{icon_state = "floor3"},/area/shuttle/escape/centcom)
 "bup" = (/obj/structure/stool/bed/chair{dir = 8},/turf/simulated/shuttle/floor{icon_state = "floor3"},/area/shuttle/escape/centcom)
-"buq" = (/obj/structure/closet/secure_closet/medicine,/turf/simulated/shuttle/floor{icon_state = "floor3"},/area/shuttle/escape/centcom)
+"buq" = (/obj/structure/closet/secure_closet/medical1,/turf/simulated/shuttle/floor{icon_state = "floor3"},/area/shuttle/escape/centcom)
 "bur" = (/obj/machinery/computer/communications,/turf/simulated/shuttle/floor,/area/shuttle/escape/centcom)
 "bus" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/shuttle/escape/centcom)
 "but" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/shuttle/escape/centcom)
 "buu" = (/obj/structure/table,/obj/item/weapon/crowbar,/obj/item/weapon/storage/firstaid/fire,/turf/simulated/shuttle/floor{icon_state = "floor3"},/area/shuttle/escape/centcom)
 "buv" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/shuttle/escape/centcom)
-"buw" = (/obj/machinery/door/airlock/glass/glass_security{name = "Secure Transport"; req_access_txt = "1"},/turf/simulated/shuttle/floor,/area/shuttle/escape/centcom)
+"buw" = (/obj/machinery/door/airlock/glass_security{name = "Secure Transport"; req_access_txt = "1"},/turf/simulated/shuttle/floor,/area/shuttle/escape/centcom)
 "bux" = (/turf/simulated/shuttle/floor4,/area/shuttle/escape/centcom)
 "buy" = (/obj/item/weapon/handcuffs,/turf/simulated/shuttle/floor4,/area/shuttle/escape/centcom)
 "buz" = (/obj/machinery/conveyor{dir = 2; id = "QMshuttle"},/obj/effect/sign/movingparts{pixel_x = -32},/turf/simulated/shuttle/floor,/area/supply/dock)
@@ -3792,7 +3792,7 @@
 "buV" = (/obj/structure/rack,/turf/unsimulated/floor{icon_state = "grimy"},/area)
 "buW" = (/turf/unsimulated/floor{icon_state = "grimy"},/area)
 "buX" = (/obj/structure/stool/bed,/turf/unsimulated/floor{icon_state = "grimy"},/area)
-"buY" = (/obj/structure/table/reinforced,/obj/item/weapon/surgicaldrill,/obj/item/weapon/storage/briefcase/surgery,/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor3"},/area)
+"buY" = (/obj/structure/table/reinforced,/obj/item/weapon/surgicaldrill,/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor3"},/area)
 "buZ" = (/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor3"},/area)
 "bva" = (/obj/effect/decal/cleanable/dirt,/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor3"},/area)
 "bvb" = (/obj/structure/grille,/obj/machinery/door/firedoor/border_only{dir = 1},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area)
@@ -3846,7 +3846,7 @@
 "bvX" = (/obj/item/stack/tile/plasteel,/turf/unsimulated/floor,/area)
 "bvY" = (/obj/structure/device/piano,/turf/unsimulated/floor{icon_state = "whiteshiny"},/area)
 "bvZ" = (/obj/structure/table/reinforced,/obj/item/weapon/storage/dice,/turf/unsimulated/floor{icon_state = "whiteshiny"},/area)
-"bwa" = (/obj/structure/table/reinforced,/obj/item/weapon/cigpacket,/obj/item/weapon/matchbox,/turf/unsimulated/floor{icon_state = "whiteshiny"},/area)
+"bwa" = (/obj/structure/table/reinforced,/obj/item/weapon/cigpacket,/turf/unsimulated/floor{icon_state = "whiteshiny"},/area)
 "bwb" = (/obj/structure/rack,/turf/unsimulated/floor{tag = "icon-floorscorched1"; icon_state = "floorscorched1"},/area)
 "bwc" = (/turf/unsimulated/floor{icon_state = "floor"},/area)
 "bwd" = (/obj/structure/noticeboard{pixel_x = 32; pixel_y = 32},/turf/unsimulated/floor{icon_state = "floor"},/area)
@@ -3854,7 +3854,7 @@
 "bwf" = (/obj/item/weapon/caution/cone,/turf/unsimulated/floor{icon_state = "whiteshiny"},/area)
 "bwg" = (/turf/unsimulated/floor{icon_state = "bar"; dir = 2},/area)
 "bwh" = (/obj/structure/table/reinforced,/obj/item/weapon/storage/fancy/donut_box,/turf/unsimulated/floor{icon_state = "bar"; dir = 2},/area)
-"bwi" = (/obj/structure/rack,/obj/structure/walllocker{pixel_x = -24},/turf/unsimulated/floor{icon_state = "floor"},/area)
+"bwi" = (/turf/unsimulated/floor{icon_state = "floor"},/area)
 "bwj" = (/obj/effect/decal/cleanable/dirt,/turf/unsimulated/floor{icon_state = "floor"},/area)
 "bwk" = (/obj/item/weapon/storage/crayonbox,/turf/unsimulated/floor{icon_state = "dark"},/area)
 "bwl" = (/obj/item/weapon/book/manual/chef_recipes,/turf/unsimulated/floor{icon_state = "bar"; dir = 2},/area)
@@ -3872,7 +3872,7 @@
 "bwx" = (/obj/item/weapon/paper_bin{pixel_x = 1; pixel_y = 9},/obj/structure/table/reinforced,/obj/item/weapon/pen/blue,/turf/simulated/floor{icon_state = "white"},/area)
 "bwy" = (/obj/structure/filingcabinet,/turf/unsimulated/floor{icon_state = "whiteshiny"},/area)
 "bwz" = (/obj/item/weapon/book/manual/barman_recipes,/turf/unsimulated/floor{icon_state = "bar"; dir = 2},/area)
-"bwA" = (/obj/structure/table/reinforced,/obj/item/weapon/cleaner,/turf/unsimulated/floor{icon_state = "bar"; dir = 2},/area)
+"bwA" = (/obj/structure/table/reinforced,/obj/item/weapon/reagent_containers/spray/cleaner,/turf/unsimulated/floor{icon_state = "bar"; dir = 2},/area)
 "bwB" = (/obj/structure/closet/wardrobe/chaplain_black,/turf/unsimulated/floor{icon_state = "floor"},/area)
 "bwC" = (/turf/unsimulated/floor{icon_state = "floor"},/area)
 "bwD" = (/obj/structure/closet/gmcloset,/turf/unsimulated/floor{icon_state = "floor"},/area)