From 8a1aaf822779c754869f8e9316efd030ee41c7d2 Mon Sep 17 00:00:00 2001
From: silicons <2003111+silicons@users.noreply.github.com>
Date: Wed, 11 Dec 2024 08:33:44 -0500
Subject: [PATCH 01/25] cyborg

---
 code/game/objects/items-inventory-old.dm           | 4 ++++
 code/modules/mining/tools/vertibore.dm             | 4 +---
 code/modules/mob/living/silicon/robot/inventory.dm | 4 ++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/code/game/objects/items-inventory-old.dm b/code/game/objects/items-inventory-old.dm
index 25ee42b2f0fb..2e272b5e03bb 100644
--- a/code/game/objects/items-inventory-old.dm
+++ b/code/game/objects/items-inventory-old.dm
@@ -33,6 +33,7 @@
 	if((slot != SLOT_ID_HANDS) && equip_sound)
 		playsound(src, equip_sound, 30, ignore_walls = FALSE)
 
+	// call the new hook instead
 	on_equipped(user, slot == SLOT_ID_HANDS? user.get_held_index(src) : slot, flags)
 
 
@@ -64,6 +65,9 @@
 	if(!(flags & INV_OP_DIRECTLY_DROPPING) && (slot != SLOT_ID_HANDS) && unequip_sound)
 		playsound(src, unequip_sound, 30, ignore_walls = FALSE)
 
+	// on_unequipped cannot be called here, as we don't know the inventory index exactly
+	// todo: kill unequipped()
+
 /**
  * called when a mob drops an item
  *
diff --git a/code/modules/mining/tools/vertibore.dm b/code/modules/mining/tools/vertibore.dm
index 180c3ffd05fc..eb2319b91713 100644
--- a/code/modules/mining/tools/vertibore.dm
+++ b/code/modules/mining/tools/vertibore.dm
@@ -1,4 +1,3 @@
-
 /obj/item/vertibore
 	name = "portable shaft excavation device"
 	desc = "A heavily modified shaft bore utilizing phorogenic blasts to tunnel vertically through rock. Much faster than a large industrial drill unit, but is very resource- and power-intensive."
@@ -8,7 +7,6 @@
 	icon_state = "vertibore"
 	item_state = "vertibore"
 
-
 	var/obj/item/cell/cell //loaded cell
 	var/power_cost = 1000 //10 shots off a highcap
 	var/load_type = /obj/item/stack/material
@@ -81,7 +79,7 @@
 	if(power_cost > cell.charge)
 		to_chat(user, "<span class='notice'>The [src] flashes a warning light, it doesn't have enough charge to dig.</span>")
 		return
-	if(cell.use(power_cost) && do_after(user, 2.5 SECONDS))
+	if(do_after(user, 2.5 SECONDS) && cell.use(power_cost))
 		var/turf/T = get_turf(user)
 		LEGACY_EX_ACT(T, 1, null)
 
diff --git a/code/modules/mob/living/silicon/robot/inventory.dm b/code/modules/mob/living/silicon/robot/inventory.dm
index abb3dd94c120..75e0e658cfd5 100644
--- a/code/modules/mob/living/silicon/robot/inventory.dm
+++ b/code/modules/mob/living/silicon/robot/inventory.dm
@@ -42,7 +42,7 @@
 			client.screen -= module_state_2
 		contents -= module_state_2
 		module_state_2.unequipped(src, SLOT_ID_HANDS, NONE)
-		module_state_1.on_unequipped(src, 2, NONE)
+		module_state_2.on_unequipped(src, 2, NONE)
 		module_active = null
 		module_state_2:loc = module
 		module_state_2 = null
@@ -54,7 +54,7 @@
 			client.screen -= module_state_3
 		contents -= module_state_3
 		module_state_3.unequipped(src, SLOT_ID_HANDS, NONE)
-		module_state_1.on_unequipped(src, 3, NONE)
+		module_state_3.on_unequipped(src, 3, NONE)
 		module_active = null
 		module_state_3:loc = module
 		module_state_3 = null

From 430fafe4cdae34676b2b64a77fad7138f7e4d117 Mon Sep 17 00:00:00 2001
From: silicons <2003111+silicons@users.noreply.github.com>
Date: Sun, 15 Dec 2024 23:25:43 -0500
Subject: [PATCH 02/25] preloader hooks

---
 code/controllers/subsystem/atoms.dm        | 25 ++++++++++++++++++-
 code/datums/recipe/stack_recipe.dm         | 28 ++++++++++++++++++++--
 code/game/atoms/_atom.dm                   |  4 ++++
 code/game/objects/items/storage/storage.dm |  5 ++--
 4 files changed, 57 insertions(+), 5 deletions(-)

diff --git a/code/controllers/subsystem/atoms.dm b/code/controllers/subsystem/atoms.dm
index 33e4e1156c9b..0f3b2138bda3 100644
--- a/code/controllers/subsystem/atoms.dm
+++ b/code/controllers/subsystem/atoms.dm
@@ -137,7 +137,30 @@ SUBSYSTEM_DEF(atoms)
 /datum/controller/subsystem/atoms/proc/instance_atom_immediate(path, mapload, atom/where, ...)
 	var/old_init_status = atom_init_status
 	atom_init_status = mapload? ATOM_INIT_IN_NEW_MAPLOAD : ATOM_INIT_IN_NEW_REGULAR
-	var/atom/created = new path(arglist(args.Copy()))
+	var/atom/created = new path(arglist(args.Copy(3)))
+	atom_init_status = old_init_status
+	return created
+
+/**
+ * immediately creates and inits an atom with a preloader callback.
+ *
+ * @params
+ * * path - typepath
+ * * mapload - treat as mapload?
+ * * preload_call - callback to invoke with (created) for the created atom. This is not allowed to sleep.
+ * * where - location to init at
+ * * ... - rest of args are passed to new() / Initialize().
+ */
+/datum/controller/subsystem/atoms/proc/instance_atom_immediate_with_preloader(path, mapload, datum/callback/preload_call, atom/where, ...)
+	var/old_init_status = atom_init_status
+	atom_init_status = ATOM_INIT_IN_SUBSYSTEM
+	var/atom/created = new path(arglist(args.Copy(4)))
+	preload_call.invoke_no_sleep(created)
+	atom_init_status = mapload? ATOM_INIT_IN_NEW_MAPLOAD : ATOM_INIT_IN_NEW_REGULAR
+	// this sets 'where' to if we should be mapload.
+	// this is acceptable because args[4] ('where') is not used again.
+	args[4] = mapload
+	InitAtom(created, FALSE, args)
 	atom_init_status = old_init_status
 	return created
 
diff --git a/code/datums/recipe/stack_recipe.dm b/code/datums/recipe/stack_recipe.dm
index 4f453f0e68d0..6eee81b75cd4 100644
--- a/code/datums/recipe/stack_recipe.dm
+++ b/code/datums/recipe/stack_recipe.dm
@@ -52,6 +52,17 @@
 	var/on_border = FALSE
 	// todo: material constraints
 
+	//* Product Descriptors *//
+
+	/// Automatically create empty storage / cells / containers / whatever
+	/// * Usually this is on, because usually stacks are not meant to create the insides of a container.
+	var/product_auto_create_empty = TRUE
+
+	//* Internal *//
+
+	/// preloader callback, do not touch
+	var/datum/callback/preloader_callback
+
 /datum/stack_recipe/New()
 	if(ispath(result_type, /obj/item/stack))
 		result_is_stack = TRUE
@@ -59,6 +70,12 @@
 	var/atom/casted = result_type
 	on_border = !!(initial(casted.atom_flags) & ATOM_BORDER)
 
+	preloader_callback = CALLBACK(src, make_preload_hook)
+
+/datum/stack_recipe/Destroy()
+	QDEL_NULL(preloader_callback)
+	return ..()
+
 /**
  * attepmt to craft
  *
@@ -131,6 +148,7 @@
  * * creating - (optional) list will be populated of objects created. supply a list so you can read it, or don't to ignore.
  */
 /datum/stack_recipe/proc/make(atom/where, amount, obj/item/stack/stack, mob/user, silent, use_dir, list/created = list())
+	#warn preload call for making sure stacks get made empty
 	if(result_is_stack)
 		var/obj/item/stack/casted = result_type
 		var/max_amount = initial(casted.max_amount)
@@ -139,16 +157,22 @@
 			if(!--safety)
 				CRASH("safety hit")
 			var/making_amount = min(amount, max_amount)
-			var/obj/item/stack/creating = new result_type(where, making_amount)
+			var/obj/item/stack/creating = Ssatoms.instance_atom_immediate_with_preloader(result_type, FALSE, preloader_callback, where, making_amount)
 			amount -= making_amount
 			created += creating
 	else
 		for(var/i in 1 to min(amount, 50))
-			var/atom/movable/creating = new result_type(where)
+			var/atom/movable/creating = Ssatoms.instance_atom_immediate_with_preloader(result_type, FALSE, preloader_callback, where)
 			creating.setDir(use_dir)
 			created += creating
 	return TRUE
 
+/**
+ * preloads an atom we make
+ */
+/datum/stack_recipe/proc/make_preload_hook(atom/product)
+	product.preload_from_stack_recipe(src)
+
 /**
  * tgui stack recipe data
  */
diff --git a/code/game/atoms/_atom.dm b/code/game/atoms/_atom.dm
index e0d07548e9e3..51d5ddf4d557 100644
--- a/code/game/atoms/_atom.dm
+++ b/code/game/atoms/_atom.dm
@@ -234,6 +234,8 @@
 
 /**
  * Called by the maploader if a dmm_context is set
+ *
+ * todo: rename to preload_from_mapload()
  */
 /atom/proc/preloading_instance(datum/dmm_context/context)
 	return
@@ -241,6 +243,8 @@
 /**
  * hook for abstract direction sets from the maploader
  *
+ * todo: this might need to be part of preloading_instance; investigate
+ *
  * return FALSE to override maploader automatic rotation
  */
 /atom/proc/preloading_dir(datum/dmm_context/context)
diff --git a/code/game/objects/items/storage/storage.dm b/code/game/objects/items/storage/storage.dm
index ab6f5c2c6c7a..bb36b731acc6 100644
--- a/code/game/objects/items/storage/storage.dm
+++ b/code/game/objects/items/storage/storage.dm
@@ -42,6 +42,7 @@
 	var/storage_datum_path = /datum/object_system/storage
 	/// Cleared after Initialize().
 	/// List of types associated to amounts.
+	//  todo: stack handling
 	var/list/starts_with
 	/// set to prevent us from spawning starts_with
 	var/empty = FALSE
@@ -49,7 +50,7 @@
 /obj/item/storage/Initialize(mapload, empty)
 	. = ..()
 	initialize_storage()
-	if(!empty)
+	if(!empty || src.empty)
 		spawn_contents()
 		legacy_spawn_contents()
 	else
@@ -59,7 +60,7 @@
  * Make sure to set [worth_dynamic] to TRUE if this does more than spawning what's in starts_with.
  */
 /obj/item/storage/proc/spawn_contents()
-	if(length(starts_with) && !empty)
+	if(length(starts_with))
 		// this is way too permissive already
 		var/safety = 256
 		var/atom/where_real_contents = obj_storage.real_contents_loc()

From e2d1afc734b46f12cd058d10efc2c804e0fbf69a Mon Sep 17 00:00:00 2001
From: silicons <2003111+silicons@users.noreply.github.com>
Date: Sun, 15 Dec 2024 23:29:21 -0500
Subject: [PATCH 03/25] i can't spell

---
 code/datums/recipe/stack_recipe.dm         | 6 +++---
 code/game/atoms/_atom.dm                   | 8 ++++++++
 code/game/objects/items/storage/storage.dm | 5 +++++
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/code/datums/recipe/stack_recipe.dm b/code/datums/recipe/stack_recipe.dm
index 6eee81b75cd4..01397aa9b3e1 100644
--- a/code/datums/recipe/stack_recipe.dm
+++ b/code/datums/recipe/stack_recipe.dm
@@ -70,7 +70,7 @@
 	var/atom/casted = result_type
 	on_border = !!(initial(casted.atom_flags) & ATOM_BORDER)
 
-	preloader_callback = CALLBACK(src, make_preload_hook)
+	preloader_callback = CALLBACK(PROC_REF(src, make_preload_hook))
 
 /datum/stack_recipe/Destroy()
 	QDEL_NULL(preloader_callback)
@@ -157,12 +157,12 @@
 			if(!--safety)
 				CRASH("safety hit")
 			var/making_amount = min(amount, max_amount)
-			var/obj/item/stack/creating = Ssatoms.instance_atom_immediate_with_preloader(result_type, FALSE, preloader_callback, where, making_amount)
+			var/obj/item/stack/creating = SSatoms.instance_atom_immediate_with_preloader(result_type, FALSE, preloader_callback, where, making_amount)
 			amount -= making_amount
 			created += creating
 	else
 		for(var/i in 1 to min(amount, 50))
-			var/atom/movable/creating = Ssatoms.instance_atom_immediate_with_preloader(result_type, FALSE, preloader_callback, where)
+			var/atom/movable/creating = SSatoms.instance_atom_immediate_with_preloader(result_type, FALSE, preloader_callback, where)
 			creating.setDir(use_dir)
 			created += creating
 	return TRUE
diff --git a/code/game/atoms/_atom.dm b/code/game/atoms/_atom.dm
index 51d5ddf4d557..1f1f3d523394 100644
--- a/code/game/atoms/_atom.dm
+++ b/code/game/atoms/_atom.dm
@@ -232,6 +232,8 @@
 
 	return ..()
 
+//* Preload Hooks *//
+
 /**
  * Called by the maploader if a dmm_context is set
  *
@@ -250,6 +252,12 @@
 /atom/proc/preloading_dir(datum/dmm_context/context)
 	return TRUE
 
+/**
+ * Preloads before Initialize(), invoked by init from a stack recipe.
+ */
+/atom/proc/preload_from_stack_recipe(datum/stack_recipe/recipe)
+	return
+
 /atom/proc/reveal_blood()
 	return
 
diff --git a/code/game/objects/items/storage/storage.dm b/code/game/objects/items/storage/storage.dm
index bb36b731acc6..3658f4937563 100644
--- a/code/game/objects/items/storage/storage.dm
+++ b/code/game/objects/items/storage/storage.dm
@@ -47,6 +47,11 @@
 	/// set to prevent us from spawning starts_with
 	var/empty = FALSE
 
+/obj/item/storage/preload_from_stack_recipe(datum/stack_recipe/recipe)
+	..()
+	if(recipe.product_auto_create_empty)
+		empty = TRUE
+
 /obj/item/storage/Initialize(mapload, empty)
 	. = ..()
 	initialize_storage()

From 3befc42942714ff1efc89627f227ca80b6d1f6ac Mon Sep 17 00:00:00 2001
From: silicons <2003111+silicons@users.noreply.github.com>
Date: Sun, 15 Dec 2024 23:32:04 -0500
Subject: [PATCH 04/25] i can't spell

---
 code/datums/recipe/stack_recipe.dm | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/code/datums/recipe/stack_recipe.dm b/code/datums/recipe/stack_recipe.dm
index 01397aa9b3e1..cb495ffd9cf5 100644
--- a/code/datums/recipe/stack_recipe.dm
+++ b/code/datums/recipe/stack_recipe.dm
@@ -70,7 +70,7 @@
 	var/atom/casted = result_type
 	on_border = !!(initial(casted.atom_flags) & ATOM_BORDER)
 
-	preloader_callback = CALLBACK(PROC_REF(src, make_preload_hook))
+	preloader_callback = CALLBACK(src, PROC_REF(src, make_preload_hook))
 
 /datum/stack_recipe/Destroy()
 	QDEL_NULL(preloader_callback)
@@ -148,7 +148,6 @@
  * * creating - (optional) list will be populated of objects created. supply a list so you can read it, or don't to ignore.
  */
 /datum/stack_recipe/proc/make(atom/where, amount, obj/item/stack/stack, mob/user, silent, use_dir, list/created = list())
-	#warn preload call for making sure stacks get made empty
 	if(result_is_stack)
 		var/obj/item/stack/casted = result_type
 		var/max_amount = initial(casted.max_amount)

From 136ed2e00de1219380de9ec406a287dce9b1592c Mon Sep 17 00:00:00 2001
From: silicons <2003111+silicons@users.noreply.github.com>
Date: Sun, 15 Dec 2024 23:40:15 -0500
Subject: [PATCH 05/25] i can't spell

---
 code/datums/recipe/stack_recipe.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/datums/recipe/stack_recipe.dm b/code/datums/recipe/stack_recipe.dm
index cb495ffd9cf5..72214195a417 100644
--- a/code/datums/recipe/stack_recipe.dm
+++ b/code/datums/recipe/stack_recipe.dm
@@ -70,7 +70,7 @@
 	var/atom/casted = result_type
 	on_border = !!(initial(casted.atom_flags) & ATOM_BORDER)
 
-	preloader_callback = CALLBACK(src, PROC_REF(src, make_preload_hook))
+	preloader_callback = CALLBACK(src, PROC_REF(make_preload_hook))
 
 /datum/stack_recipe/Destroy()
 	QDEL_NULL(preloader_callback)

From 9a6ed9235867c7ecb152119df74f4414cd022612 Mon Sep 17 00:00:00 2001
From: silicons <2003111+silicons@users.noreply.github.com>
Date: Mon, 16 Dec 2024 01:33:01 -0500
Subject: [PATCH 06/25] lol

---
 code/__DEFINES/materials/helpers.dm           |  35 +++++++++++++++++-
 code/controllers/subsystem/atoms.dm           |   2 +
 code/datums/callback.dm                       |  27 +++++++++++---
 code/datums/recipe/stack_recipe.dm            |   1 +
 code/game/objects/items/stacks/stack.dm       |   5 +++
 code/game/objects/items/storage/storage.dm    |   2 +-
 code/game/objects/items/weapons/RCD.dm        |   2 +-
 code/modules/examine/descriptions/stacks.dm   |   3 --
 .../materials/definitions/metals/steel.dm     |   9 ++++-
 code/modules/materials/material.dm            |  10 +++++
 code/modules/materials/material_sheets.dm     |  13 +++++++
 icons/README.md                               |   1 +
 icons/materials/metals/steel.dmi              | Bin 0 -> 1274 bytes
 13 files changed, 96 insertions(+), 14 deletions(-)
 create mode 100644 icons/materials/metals/steel.dmi

diff --git a/code/__DEFINES/materials/helpers.dm b/code/__DEFINES/materials/helpers.dm
index 70eafe784e50..793a43a26c31 100644
--- a/code/__DEFINES/materials/helpers.dm
+++ b/code/__DEFINES/materials/helpers.dm
@@ -1,14 +1,45 @@
 //* This file is explicitly licensed under the MIT license. *//
 //* Copyright (c) 2023 Citadel Station developers.          *//
 
-//* object checks
+//* /datum/prototype/material declaration helpers *//
+
+#define DECLARE_MATERIAL(PATH_FRAGMENT) \
+/datum/prototype/material##PATH_FRAGMENT
+
+/**
+ * Generates material stacks for a material.
+ *
+ * The material must have:
+ *
+ * * a defined `display_name`
+ * * a defined `sheet_singular_name`
+ * * a defined `sheet_plural_name`
+ * * a defined `icon`
+ * * a defined `icon_stack_count`
+ */
+#define GENERATE_MATERIAL_STACKS(PATH_FRAGMENT) \
+/obj/item/stack/material##PATH_FRAGMENT { \
+	name = /datum/prototype/material##PATH_FRAGMENT::name + " " + /datum/prototype/material##PATH_FRAGMENT::sheet_singular_name; \
+	icon = /datum/prototype/material##PATH_FRAGMENT::icon; \
+	icon_state = "stack-1"; \
+	material = /datum/prototype/material##PATH_FRAGMENT; \
+	no_variants = TRUE; \
+	amount = 1; \
+} \
+/obj/item/stack/material##PATH_FRAGMENT/full_stack { \
+	name = /datum/prototype/material##PATH_FRAGMENT::name + " " + /datum/prototype/material##PATH_FRAGMENT::sheet_plural_name; \
+	icon_state = "stack"; \
+	amount = 50; \
+}
+
+//* Material Traits - Checks *//
 
 /// We are ticking materials.
 #define IS_TICKING_MATERIALS(A) (A.atom_flags & ATOM_MATERIALS_TICKING)
 #define START_TICKING_MATERIALS(A) SSmaterials.add_ticked_object(src)
 #define STOP_TICKING_MATERIALS(A) SSmaterials.remove_ticked_object(src)
 
-//* /atom level invocation of traits
+//* Material Traits - /atom invocation *//
 
 /// Invocation of material traits
 /// A - the atom
diff --git a/code/controllers/subsystem/atoms.dm b/code/controllers/subsystem/atoms.dm
index 0f3b2138bda3..f098686ca566 100644
--- a/code/controllers/subsystem/atoms.dm
+++ b/code/controllers/subsystem/atoms.dm
@@ -135,6 +135,7 @@ SUBSYSTEM_DEF(atoms)
  * * ... - rest of args are passed to new() / Initialize().
  */
 /datum/controller/subsystem/atoms/proc/instance_atom_immediate(path, mapload, atom/where, ...)
+	SHOULD_NOT_SLEEP(TRUE)
 	var/old_init_status = atom_init_status
 	atom_init_status = mapload? ATOM_INIT_IN_NEW_MAPLOAD : ATOM_INIT_IN_NEW_REGULAR
 	var/atom/created = new path(arglist(args.Copy(3)))
@@ -152,6 +153,7 @@ SUBSYSTEM_DEF(atoms)
  * * ... - rest of args are passed to new() / Initialize().
  */
 /datum/controller/subsystem/atoms/proc/instance_atom_immediate_with_preloader(path, mapload, datum/callback/preload_call, atom/where, ...)
+	SHOULD_NOT_SLEEP(TRUE)
 	var/old_init_status = atom_init_status
 	atom_init_status = ATOM_INIT_IN_SUBSYSTEM
 	var/atom/created = new path(arglist(args.Copy(4)))
diff --git a/code/datums/callback.dm b/code/datums/callback.dm
index 2087fd6ef448..3918cf039a44 100644
--- a/code/datums/callback.dm
+++ b/code/datums/callback.dm
@@ -101,24 +101,39 @@
 		else
 			calling_arguments = args
 	if(datum_flags & DF_VAR_EDITED)
-		return WrapAdminProcCall(object, delegate, calling_arguments)
-	if(object == GLOBAL_PROC)
-		return call(delegate)(arglist(calling_arguments))
-	return call(object, delegate)(arglist(calling_arguments))
+		. = WrapAdminProcCall(object, delegate, calling_arguments)
+	else if(object == GLOBAL_PROC)
+		. = call(delegate)(arglist(calling_arguments))
+	else
+		. = call(object, delegate)(arglist(calling_arguments))
+	pass()
 
 /**
  * Invoke this callback and crash if it sleeps.
  *
  * * Use when a callback should never sleep, as call() cannot be verified by static analysis.
+ * * Do not use in performance critical code. This wraps calls more aggressively than InvokeAsync().
+ * * `null` is returned if the call sleeps.
+ *
+ * The specific use case here is an async call where:
+ *
+ * * It's always invalid behavior for a callback to sleep.
+ * * The caller should be protected (caller shouldn't be interrupted by the sleep).
+ *
+ * This allows enforcement of the above invariants by loudly runtiming and bringing attention to the issue,
+ * as opposed to the usual way of compile checking it (which we can't because this is a reflection-based call to an arbitrary proc).
  */
 /datum/callback/proc/invoke_no_sleep(...)
 	. = CALLBACK_SLEEP_SENTINEL
-	ASYNC
-		. = Invoke(arglist(args))
+	. = invoke_no_sleep_call(arglist(args))
 	if(. == CALLBACK_SLEEP_SENTINEL)
 		. = null
 		CRASH("Callback [src] slept on a no-sleeping invoke.")
 
+/datum/callback/proc/invoke_no_sleep_call(...)
+	set waitfor = FALSE
+	. = Invoke(arglist(args))
+
 /**
  * Invoke this callback async (waitfor=false)
  *
diff --git a/code/datums/recipe/stack_recipe.dm b/code/datums/recipe/stack_recipe.dm
index 72214195a417..6540cb6d6ca1 100644
--- a/code/datums/recipe/stack_recipe.dm
+++ b/code/datums/recipe/stack_recipe.dm
@@ -170,6 +170,7 @@
  * preloads an atom we make
  */
 /datum/stack_recipe/proc/make_preload_hook(atom/product)
+	SHOULD_NOT_SLEEP(TRUE)
 	product.preload_from_stack_recipe(src)
 
 /**
diff --git a/code/game/objects/items/stacks/stack.dm b/code/game/objects/items/stacks/stack.dm
index 750b1c97e7aa..4d4b4b511350 100644
--- a/code/game/objects/items/stacks/stack.dm
+++ b/code/game/objects/items/stacks/stack.dm
@@ -52,6 +52,9 @@
 	/// Determines whether the item should update it's sprites based on amount.
 	var/no_variants = TRUE
 
+	/// skip default / old update_icon() handling
+	var/skip_legacy_icon_update = FALSE
+
 	/// Will the item pass its own color var to the created item? Dyed cloth, wood, etc.
 	var/pass_color = FALSE
 	/// Will the stack merge with other stacks that are different colors? (Dyed cloth, wood, etc).
@@ -77,6 +80,8 @@
 	update_icon()
 
 /obj/item/stack/update_icon()
+	if(skip_legacy_icon_update)
+		return
 	if(no_variants)
 		icon_state = initial(icon_state)
 	else
diff --git a/code/game/objects/items/storage/storage.dm b/code/game/objects/items/storage/storage.dm
index 3658f4937563..5c48ddef49af 100644
--- a/code/game/objects/items/storage/storage.dm
+++ b/code/game/objects/items/storage/storage.dm
@@ -55,7 +55,7 @@
 /obj/item/storage/Initialize(mapload, empty)
 	. = ..()
 	initialize_storage()
-	if(!empty || src.empty)
+	if(!empty && !src.empty)
 		spawn_contents()
 		legacy_spawn_contents()
 	else
diff --git a/code/game/objects/items/weapons/RCD.dm b/code/game/objects/items/weapons/RCD.dm
index 6c997dd8d9f3..f1d8b52b6086 100644
--- a/code/game/objects/items/weapons/RCD.dm
+++ b/code/game/objects/items/weapons/RCD.dm
@@ -134,7 +134,7 @@
 			"Change Window Type" = image(icon = 'icons/mob/radial.dmi', icon_state = "windowtype")
 		)
 	*/
-	var/choice = show_radial_menu(user, src, choices, custom_check = CALLBACK(src, PROC_REF(check_menu), user), require_near = TRUE, tooltips = TRUE)
+	var/choice = show_radial_menu(user, user.is_holding(src) ? user : src, choices, custom_check = CALLBACK(src, PROC_REF(check_menu), user), require_near = TRUE, tooltips = TRUE)
 	if(!check_menu(user))
 		return
 	switch(choice)
diff --git a/code/modules/examine/descriptions/stacks.dm b/code/modules/examine/descriptions/stacks.dm
index ec7f8cc6f8cc..1f2b1085f229 100644
--- a/code/modules/examine/descriptions/stacks.dm
+++ b/code/modules/examine/descriptions/stacks.dm
@@ -19,6 +19,3 @@
 /obj/item/stack/material/cyborg/steel
 	description_info = "Use in your hand to bring up the recipe menu.  If you have enough sheets, click on something on the list to build it.<br>\
 	You can replenish your supply of metal as a synthetic by recharging."
-
-/obj/item/stack/material
-	description_info = "Use in your hand to bring up the recipe menu.  If you have enough sheets, click on something on the list to build it."
diff --git a/code/modules/materials/definitions/metals/steel.dm b/code/modules/materials/definitions/metals/steel.dm
index 5e2488fe04e7..da0d73625da7 100644
--- a/code/modules/materials/definitions/metals/steel.dm
+++ b/code/modules/materials/definitions/metals/steel.dm
@@ -1,6 +1,13 @@
-/datum/prototype/material/steel
+GENERATE_MATERIAL_STACKS(/steel)
+DECLARE_MATERIAL(/steel)
 	id = MAT_STEEL
 	name = MAT_STEEL
+
+	display_name = "steel"
+
+	icon = 'icons/materials/metals/steel.dmi'
+	icon_stack_count = 3
+
 	stack_type = /obj/item/stack/material/steel
 	icon_base = 'icons/turf/walls/solid_wall.dmi'
 	icon_reinf = 'icons/turf/walls/solid_wall_reinforced.dmi'
diff --git a/code/modules/materials/material.dm b/code/modules/materials/material.dm
index 248ed587c822..6c3450395419 100644
--- a/code/modules/materials/material.dm
+++ b/code/modules/materials/material.dm
@@ -132,6 +132,16 @@
 	/// material constraint flags - what we are considered
 	var/material_constraints = NONE
 
+	//* Icon *//
+	/// Icon file. This is used for many miscellaneous states defined here.
+	var/icon
+	/// Count, from 1 to N, of stack states.
+	/// * If 3, and there's a stack of 50, we'll be `stack-1` from 1 to around 17, `stack-2`
+	///   from 18 to around 35, and `stack-3` for the rest.
+	/// * If null, no stack states are provided.
+	/// * If provided, a raw `stack` state should always be provided for on-map and in-UI previews.
+	var/icon_stack_count
+
 	//* Traits
 	/// Material traits - set to list of paths to instance on New / register; associate them to their initial data.
 	var/list/material_traits
diff --git a/code/modules/materials/material_sheets.dm b/code/modules/materials/material_sheets.dm
index 4995dab8f054..0fe8f912b325 100644
--- a/code/modules/materials/material_sheets.dm
+++ b/code/modules/materials/material_sheets.dm
@@ -14,8 +14,12 @@
 		)
 	drop_sound = 'sound/items/drop/axe.ogg'
 	pickup_sound = 'sound/items/pickup/axe.ogg'
+	description_info = "Use in your hand to bring up the recipe menu.  If you have enough sheets, click on something on the list to build it."
 
 	material_parts = MATERIAL_DEFAULT_DISABLED
+
+	skip_legacy_icon_update = TRUE
+
 	/// material - direct ref because stack
 	var/datum/prototype/material/material
 
@@ -27,6 +31,10 @@
 	if(!isnull(material))
 		src.material = material
 	src.material = RSmaterials.fetch(src.material)
+
+	if(material.icon && icon != material.icon)
+		icon = material.icon
+
 	. = ..()
 
 	pixel_x = rand(0,4)-4
@@ -47,6 +55,11 @@
 /obj/item/stack/material/get_materials(respect_multiplier)
 	return list(material.id = (respect_multiplier? material_multiplier : 1) * SHEET_MATERIAL_AMOUNT)
 
+/obj/item/stack/material/update_icon()
+	if(material.icon_stack_count)
+		icon_state = "stack-[ceil(amount / max_amount) * material.icon_stack_count]"
+	return ..()
+
 /obj/item/stack/material/tgui_recipes()
 	var/list/assembled = ..()
 	for(var/datum/stack_recipe/recipe as anything in material.get_recipes())
diff --git a/icons/README.md b/icons/README.md
index 29507811d3e8..f12e24330b6c 100644
--- a/icons/README.md
+++ b/icons/README.md
@@ -28,6 +28,7 @@ Yes, this currently includes all turfs, mobs, objs, and misc things. Sorry. We'l
     - /helpers - mapping helpers like autopipe/autocable/baseturf replacers   go here
     - /landmarks - landmark icons
     - /spawners - things like window spawners
+  - /materials - material sprites
   - /mob - mob sprites
     - /bodysets - limbs and their corrosponding sprite accessories & markings & miscellaneous.
                   used in the abstraction of limb sprite from limb definition.
diff --git a/icons/materials/metals/steel.dmi b/icons/materials/metals/steel.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..a6d60b5e2a8f36e8022405e1463de80f5245c5f3
GIT binary patch
literal 1274
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+yeRz_>ZUC&cx@fdh7ScJ}u64h{~E
zj*iaG&Mq!4Ha0e<rlv+lMtXXB(UFmHv9Sqpaq)3+i3tfw2?@!GiHY&?aWOG5k&%%R
z5h20BnwpwUPEKhlDd}lxSs58QnVC7+**RHR*%=v`>FKE{DbZ0;5#ixFIyxC?X}Q_i
zMTLc>#l>YMCB;QWNr{P35fQGguGyKHc{w>H#l@8s6}2@r4YjrPwY9a?)s^MtDapw(
z(b0y6hHh?dDM?9rxw*xKh1HdnjdgX+O--#WE$u+m+FDdl;OXg^pO;r&TH4aw+|kz7
z)!EtE)>c<rn-CvwX=&-@<yDxUUr|=p*wE0?+S=XK)!Wn4+uhyM-Q8GU@8jcB1e7f=
zZ*FYt>*?w0=xAze%+JmB_4V!U?3~cs+t=G$T~X26)HJcLZ$e*Re@{<gUS4uilDD^a
zVL?GpS66Fub4_)%ySsZqUS4N=dunoWLtR}*dwWwuLuW^am6esXwRLPvjERX!RAgj9
zZf<EwNqJdWNl{TuR8(k4NP22&W=2MGLPBJCxVE;omX?-=hDLmBY;1J2ii(PXfq}8H
zvAVjtV!PB%U@S701o;IsI6S+N2IQ1hg+!FNq!uR^WfqiV=I1dmRLltuD<~@c{w28J
z<JTuz-nv@n&YTb45NdGI_`xHc^FEp<8H##(cUTw)8DBQ`Qke5-(ve9a3c;KwJkEtZ
zdgOCbM~m$f?@o)$T|&jdia8;nyV_h<87l?NHPkCT#kH<ZFX24{!`0o^QDG-ntzuwc
zD)Dr242fucJMDL{P@v3F{eGXG<;$8_c4@6Y#oj8ttx4ZWX{|zxmWY<OiuP$PZRKj|
zuxs=0%)M5(v-JJNS((d@y<cx#ZC8Enz#Qij|BI~lo=Y&1%P^4QGn+N5?(tvewC<~E
z<u_)p)oqWyed~Kq!K}6G_`VDFZ{O^_3FyUlk_)$cy|Z^RiKyA_@Pqkaz>ACn@2$(`
zuztDu+b}7?pyp9Ziig~n`CWX*{r=j@2UuN?JX)OmSa|Z{hb`ytoZy%fI0-1`;~JEH
z`DO9SmkY|D*(et{?&63Ea8aw)G++HpUEiPg#+RN0qAy?damNLS1kUh&{`~pXq?H9{
z6BAh0c^jT(HP`5x@H}q?w|V;I<f2Q7e_nDk&En1r5Gl+yTsv*L*3P3J-lm2<=qm{?
zKFHgp^du-yce?iXuy@B*)RjLtL|%<4XkNsz^NYd$4I!HAjtKXc^f=5vyn5#YHdn!!
z$AypXnYB9Y=@TRE2Xj7V>g{k0bTQax7FQeO>)USgZF$du&84njW8In_o`}-4o)Y;s
zBeA~oe0Ct%T`xZE@yHR0+vl}QcKyx&hd#`f0}E$_#pM6~JNJFe``zaD224x#Ed^V*
zcI%5>H$PqcvvS+bZ!<-IJZzE=sa?G{?)_b}TEkrP+P_DCTkE+vF8uw@Nkqg>M8rl$
z#7g4IzrVM?i+^jL(fFM?;lW=9i3)oLwtM^y5U#_Kw|(E41-Dz@<9E69uEJiRaQEZC
zL<ue^YyZu--TD^)hP&k(<sE?97;ekHW54q5_wUBy`wWNKnr!)%Ii~?L0E4HipUXO@
GgeCyw!8D5i

literal 0
HcmV?d00001


From b0f7d8947c23a02d684b624bf35956c0bce35013 Mon Sep 17 00:00:00 2001
From: silicons <2003111+silicons@users.noreply.github.com>
Date: Mon, 16 Dec 2024 01:33:33 -0500
Subject: [PATCH 07/25] replacements :trol:

---
 .../structures/crates_lockers/crates.dm       |  2 +-
 code/modules/materials/fifty_spawner_mats.dm  |  4 +-
 code/modules/materials/material_sheets.dm     |  6 ---
 code/modules/random_map/drop/drop_types.dm    |  8 ++--
 maps/away_missions/archive/Academy.dmm        |  4 +-
 maps/away_missions/archive/spacebattle.dmm    |  4 +-
 .../archive/stationCollision.dmm              |  4 +-
 maps/endeavour/levels/deck1.dmm               | 18 ++++----
 maps/endeavour/levels/deck2.dmm               |  6 +--
 maps/endeavour/levels/deck3.dmm               | 10 ++---
 maps/endeavour/levels/deck4.dmm               | 10 ++---
 maps/euthenia/levels/deck1.dmm                |  6 +--
 maps/euthenia/levels/deck2.dmm                | 42 +++++++++----------
 maps/euthenia/levels/deck3.dmm                |  4 +-
 maps/map_levels/140x140/talon/talon1.dmm      |  8 ++--
 maps/rift/levels/rift-02-underground2.dmm     | 12 +++---
 maps/rift/levels/rift-03-underground1.dmm     |  6 +--
 maps/rift/levels/rift-04-surface1.dmm         | 10 ++---
 maps/rift/levels/rift-05-surface2.dmm         | 16 +++----
 maps/rift/levels/rift-10-west_plains.dmm      |  2 +-
 maps/sectors/admin_planets_192/andromeda.dmm  | 30 ++++++-------
 maps/sectors/admin_planets_192/croatoan.dmm   |  4 +-
 maps/sectors/miaphus/levels/miaphus_beach.dmm |  2 +-
 .../levels/nebula_tradeport.dmm               | 10 ++---
 .../piratebase_192/levels/piratebase_192.dmm  |  6 +--
 .../level_specific/class_d/matdropD.dmm       |  6 +--
 maps/submaps/level_specific/virgo2/Lab1.dmm   |  2 +-
 .../caves/west_caves_buriedstructure_1.dmm    |  2 +-
 .../caves/west_caves_buriedstructure_2.dmm    |  2 +-
 maps/submaps/mountains/Rockb1.dmm             |  2 +-
 maps/submaps/wilderness/Lab1.dmm              |  2 +-
 maps/templates/admin/ert.dmm                  |  8 ++--
 maps/templates/admin/ert_base.dmm             |  8 ++--
 maps/templates/admin/shipcave.dmm             |  6 +--
 .../shuttles/overmaps/generic/bearcat.dmm     |  4 +-
 .../shuttles/overmaps/generic/cruiser.dmm     | 14 +++----
 .../shuttles/overmaps/generic/curashuttle.dmm |  2 +-
 .../overmaps/generic/generic_shuttle.dmm      |  2 +-
 .../shuttles/overmaps/generic/ghostship.dmm   |  2 +-
 .../shuttles/overmaps/generic/itglight.dmm    |  8 ++--
 .../shuttles/overmaps/generic/mercship.dmm    |  2 +-
 .../generic/overmap_ship_paperclipper.dmm     |  2 +-
 .../shuttles/overmaps/generic/shelter_6.dmm   | 16 +++----
 .../shuttles/overmaps/generic/vespa.dmm       |  2 +-
 maps/tether/levels/station1.dmm               | 14 +++----
 maps/tether/levels/station2.dmm               | 10 ++---
 maps/tether/levels/surface1.dmm               | 14 +++----
 maps/tether/levels/surface3.dmm               | 16 +++----
 maps/triumph/levels/deck1.dmm                 | 14 +++----
 maps/triumph/levels/deck2.dmm                 | 22 +++++-----
 maps/triumph/levels/deck3.dmm                 | 10 ++---
 maps/triumph/levels/deck4.dmm                 | 26 ++++++------
 52 files changed, 223 insertions(+), 229 deletions(-)

diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm
index e5eac07358da..fed77c914bf3 100644
--- a/code/game/objects/structures/crates_lockers/crates.dm
+++ b/code/game/objects/structures/crates_lockers/crates.dm
@@ -564,7 +564,7 @@
 
 	starts_with = list(
 		/obj/item/stack/material/plasteel = 10,
-		/obj/fiftyspawner/steel = 5,
+		/obj/item/stack/material/steel/full_stack = 5,
 		/obj/fiftyspawner/glass = 4,
 		/obj/item/cell/high = 4,
 		/obj/item/stack/cable_coil = 2,
diff --git a/code/modules/materials/fifty_spawner_mats.dm b/code/modules/materials/fifty_spawner_mats.dm
index 7215709619d5..e291dea1662e 100644
--- a/code/modules/materials/fifty_spawner_mats.dm
+++ b/code/modules/materials/fifty_spawner_mats.dm
@@ -52,11 +52,11 @@
 	name = "stack of osmium"
 	type_to_spawn = /obj/item/stack/material/osmium
 
-/obj/fiftyspawner/steel
+/obj/item/stack/material/steel/full_stack
 	name = "stack of steel"
 	type_to_spawn = /obj/item/stack/material/steel
 
-/obj/fiftyspawner/steel/hull
+/obj/item/stack/material/steel/full_stack/hull
 	name = "stack of steel hull"
 	type_to_spawn = /obj/item/stack/material/steel/hull
 
diff --git a/code/modules/materials/material_sheets.dm b/code/modules/materials/material_sheets.dm
index 0fe8f912b325..f0350c61fb98 100644
--- a/code/modules/materials/material_sheets.dm
+++ b/code/modules/materials/material_sheets.dm
@@ -224,12 +224,6 @@
 	apply_colour = 1
 	no_variants = FALSE
 
-/obj/item/stack/material/steel
-	name = MAT_STEEL
-	icon_state = "sheet-metal"
-	material = /datum/prototype/material/steel
-	no_variants = FALSE
-
 /obj/item/stack/material/steel/hull
 	name = MAT_STEELHULL
 	material = /datum/prototype/material/steel/hull
diff --git a/code/modules/random_map/drop/drop_types.dm b/code/modules/random_map/drop/drop_types.dm
index 802a54af3656..71562b900c41 100644
--- a/code/modules/random_map/drop/drop_types.dm
+++ b/code/modules/random_map/drop/drop_types.dm
@@ -267,9 +267,9 @@ var/global/list/datum/supply_drop_loot/supply_drop
 /datum/supply_drop_loot/materials/New()
 	..()
 	contents = list(
-		/obj/fiftyspawner/steel,
-		/obj/fiftyspawner/steel,
-		/obj/fiftyspawner/steel,
+		/obj/item/stack/material/steel/full_stack,
+		/obj/item/stack/material/steel/full_stack,
+		/obj/item/stack/material/steel/full_stack,
 		/obj/fiftyspawner/glass,
 		/obj/fiftyspawner/glass,
 		/obj/fiftyspawner/wood,
@@ -283,7 +283,7 @@ var/global/list/datum/supply_drop_loot/supply_drop
 /datum/supply_drop_loot/materials_advanced/New()
 	..()
 	contents = list(
-		/obj/fiftyspawner/steel,
+		/obj/item/stack/material/steel/full_stack,
 		/obj/fiftyspawner/glass,
 		/obj/fiftyspawner/wood,
 		/obj/fiftyspawner/plastic,
diff --git a/maps/away_missions/archive/Academy.dmm b/maps/away_missions/archive/Academy.dmm
index 19cfbe49825d..1347a2e798e7 100644
--- a/maps/away_missions/archive/Academy.dmm
+++ b/maps/away_missions/archive/Academy.dmm
@@ -673,7 +673,7 @@
 /turf/simulated/floor,
 /area/awaymission/academy/classrooms)
 "cG" = (
-/obj/fiftyspawner/steel,
+/obj/item/stack/material/steel/full_stack,
 /turf/simulated/floor/plating,
 /area/awaymission/academy/classrooms)
 "cJ" = (
@@ -2081,7 +2081,7 @@
 	dir = 8
 	},
 /obj/structure/table/rack,
-/obj/fiftyspawner/steel,
+/obj/item/stack/material/steel/full_stack,
 /turf/simulated/floor/tiled/old_tile/gray,
 /area/awaymission/academy/academyaft)
 "iy" = (
diff --git a/maps/away_missions/archive/spacebattle.dmm b/maps/away_missions/archive/spacebattle.dmm
index 1cfcb6179823..46842c3ff4d3 100644
--- a/maps/away_missions/archive/spacebattle.dmm
+++ b/maps/away_missions/archive/spacebattle.dmm
@@ -430,7 +430,7 @@
 /turf/simulated/floor,
 /area/awaymission/spacebattle/cruiser)
 "cz" = (
-/obj/fiftyspawner/steel,
+/obj/item/stack/material/steel/full_stack,
 /obj/item/ammo_casing/a10mm,
 /turf/simulated/floor,
 /area/awaymission/spacebattle/cruiser)
@@ -499,7 +499,7 @@
 /turf/simulated/floor,
 /area/awaymission/spacebattle/cruiser)
 "cS" = (
-/obj/fiftyspawner/steel,
+/obj/item/stack/material/steel/full_stack,
 /turf/simulated/floor,
 /area/awaymission/spacebattle/cruiser)
 "cT" = (
diff --git a/maps/away_missions/archive/stationCollision.dmm b/maps/away_missions/archive/stationCollision.dmm
index b7cec5d39d3a..91ab5b9d5263 100644
--- a/maps/away_missions/archive/stationCollision.dmm
+++ b/maps/away_missions/archive/stationCollision.dmm
@@ -72,8 +72,8 @@
 	dir = 8
 	},
 /obj/structure/table/standard,
-/obj/fiftyspawner/steel,
-/obj/fiftyspawner/steel,
+/obj/item/stack/material/steel/full_stack,
+/obj/item/stack/material/steel/full_stack,
 /obj/fiftyspawner/glass,
 /obj/fiftyspawner/plasteel,
 /turf/simulated/floor/airless,
diff --git a/maps/endeavour/levels/deck1.dmm b/maps/endeavour/levels/deck1.dmm
index e08e51229e09..f2923ec20da0 100644
--- a/maps/endeavour/levels/deck1.dmm
+++ b/maps/endeavour/levels/deck1.dmm
@@ -7581,8 +7581,8 @@
 /area/crew_quarters/coffee_shop)
 "fLD" = (
 /obj/structure/closet/crate,
-/obj/fiftyspawner/steel,
-/obj/fiftyspawner/steel,
+/obj/item/stack/material/steel/full_stack,
+/obj/item/stack/material/steel/full_stack,
 /obj/fiftyspawner/glass,
 /obj/fiftyspawner/glass,
 /turf/simulated/floor/plating,
@@ -9951,8 +9951,8 @@
 /area/maintenance/substation/dock)
 "hyL" = (
 /obj/structure/closet/crate,
-/obj/fiftyspawner/steel,
-/obj/fiftyspawner/steel,
+/obj/item/stack/material/steel/full_stack,
+/obj/item/stack/material/steel/full_stack,
 /obj/fiftyspawner/glass,
 /obj/fiftyspawner/glass,
 /turf/simulated/floor/plating,
@@ -18409,9 +18409,9 @@
 /area/rnd/research/testingrange)
 "nKb" = (
 /obj/structure/table/reinforced,
-/obj/fiftyspawner/steel,
-/obj/fiftyspawner/steel,
-/obj/fiftyspawner/steel,
+/obj/item/stack/material/steel/full_stack,
+/obj/item/stack/material/steel/full_stack,
+/obj/item/stack/material/steel/full_stack,
 /turf/simulated/floor/tiled,
 /area/maintenance/tool_storage)
 "nKg" = (
@@ -25250,8 +25250,8 @@
 /area/bridge)
 "tme" = (
 /obj/structure/closet/crate,
-/obj/fiftyspawner/steel,
-/obj/fiftyspawner/steel,
+/obj/item/stack/material/steel/full_stack,
+/obj/item/stack/material/steel/full_stack,
 /obj/fiftyspawner/glass,
 /obj/fiftyspawner/glass,
 /turf/simulated/floor/plating,
diff --git a/maps/endeavour/levels/deck2.dmm b/maps/endeavour/levels/deck2.dmm
index e718bceaa4d9..be650093f023 100644
--- a/maps/endeavour/levels/deck2.dmm
+++ b/maps/endeavour/levels/deck2.dmm
@@ -9427,7 +9427,7 @@
 	pixel_x = 3;
 	pixel_y = 3
 	},
-/obj/fiftyspawner/steel,
+/obj/item/stack/material/steel/full_stack,
 /obj/fiftyspawner/glass,
 /obj/structure/table/reinforced,
 /obj/effect/floor_decal/borderfloor,
@@ -11396,7 +11396,7 @@
 /turf/simulated/floor/tiled,
 /area/rnd/rdoffice)
 "hjM" = (
-/obj/fiftyspawner/steel,
+/obj/item/stack/material/steel/full_stack,
 /turf/simulated/floor/plating,
 /area/maintenance/medbay/aft)
 "hjR" = (
@@ -14713,7 +14713,7 @@
 /area/tether/station/public_meeting_room)
 "joM" = (
 /obj/structure/table/steel,
-/obj/fiftyspawner/steel,
+/obj/item/stack/material/steel/full_stack,
 /turf/simulated/floor/tiled/techfloor,
 /area/rnd/workshop)
 "joN" = (
diff --git a/maps/endeavour/levels/deck3.dmm b/maps/endeavour/levels/deck3.dmm
index f073b80a0f73..ff751315c59b 100644
--- a/maps/endeavour/levels/deck3.dmm
+++ b/maps/endeavour/levels/deck3.dmm
@@ -2275,7 +2275,7 @@
 /turf/simulated/wall/prepainted,
 /area/endeavour/hallway/d3fwdmaint)
 "bDh" = (
-/obj/fiftyspawner/steel,
+/obj/item/stack/material/steel/full_stack,
 /turf/simulated/floor/plating,
 /area/maintenance/dormitory)
 "bDw" = (
@@ -12418,7 +12418,7 @@
 	pixel_x = 7
 	},
 /obj/fiftyspawner/glass,
-/obj/fiftyspawner/steel,
+/obj/item/stack/material/steel/full_stack,
 /obj/effect/floor_decal/borderfloor,
 /obj/effect/floor_decal/corner/blue/border,
 /turf/simulated/floor/tiled,
@@ -13290,14 +13290,14 @@
 "juB" = (
 /obj/structure/closet/toolcloset,
 /obj/item/storage/toolbox/mechanical,
-/obj/fiftyspawner/steel,
+/obj/item/stack/material/steel/full_stack,
 /obj/fiftyspawner/glass,
 /obj/item/stack/cable_coil/random,
 /obj/fiftyspawner/wood,
 /obj/machinery/power/apc/west_mount{
 	cell_type = /obj/item/cell/super
 	},
-/obj/fiftyspawner/steel,
+/obj/item/stack/material/steel/full_stack,
 /obj/structure/cable/green{
 	icon_state = "0-4"
 	},
@@ -18031,7 +18031,7 @@
 /obj/structure/table/steel,
 /obj/fiftyspawner/glass,
 /obj/fiftyspawner/glass,
-/obj/fiftyspawner/steel,
+/obj/item/stack/material/steel/full_stack,
 /obj/effect/floor_decal/industrial/outline/blue,
 /obj/effect/floor_decal/corner/blue/full{
 	dir = 1
diff --git a/maps/endeavour/levels/deck4.dmm b/maps/endeavour/levels/deck4.dmm
index 0e69f753e8d3..05d38b150d77 100644
--- a/maps/endeavour/levels/deck4.dmm
+++ b/maps/endeavour/levels/deck4.dmm
@@ -18304,7 +18304,7 @@
 "wFy" = (
 /obj/structure/table/rack/shelf,
 /obj/fiftyspawner/glass,
-/obj/fiftyspawner/steel,
+/obj/item/stack/material/steel/full_stack,
 /obj/machinery/fire_alarm/west_mount,
 /turf/simulated/floor/tiled/techmaint,
 /area/rnd/robotics/smallcraft)
@@ -18354,10 +18354,10 @@
 	dir = 8;
 	layer = 2.6
 	},
-/obj/fiftyspawner/steel,
-/obj/fiftyspawner/steel,
-/obj/fiftyspawner/steel,
-/obj/fiftyspawner/steel,
+/obj/item/stack/material/steel/full_stack,
+/obj/item/stack/material/steel/full_stack,
+/obj/item/stack/material/steel/full_stack,
+/obj/item/stack/material/steel/full_stack,
 /turf/simulated/floor/tiled/techmaint,
 /area/engineering/storage)
 "wLT" = (
diff --git a/maps/euthenia/levels/deck1.dmm b/maps/euthenia/levels/deck1.dmm
index 9a0bd4237d4b..5403984c496f 100644
--- a/maps/euthenia/levels/deck1.dmm
+++ b/maps/euthenia/levels/deck1.dmm
@@ -1790,7 +1790,7 @@
 	pixel_x = 3;
 	pixel_y = 3
 	},
-/obj/fiftyspawner/steel,
+/obj/item/stack/material/steel/full_stack,
 /obj/fiftyspawner/glass,
 /obj/effect/floor_decal/techfloor{
 	dir = 6
@@ -12656,8 +12656,8 @@
 /obj/structure/table/steel,
 /obj/fiftyspawner/glass,
 /obj/fiftyspawner/glass,
-/obj/fiftyspawner/steel,
-/obj/fiftyspawner/steel,
+/obj/item/stack/material/steel/full_stack,
+/obj/item/stack/material/steel/full_stack,
 /obj/machinery/camera/network/security{
 	dir = 1
 	},
diff --git a/maps/euthenia/levels/deck2.dmm b/maps/euthenia/levels/deck2.dmm
index b9b9004fb1e2..03e0378dd867 100644
--- a/maps/euthenia/levels/deck2.dmm
+++ b/maps/euthenia/levels/deck2.dmm
@@ -12848,8 +12848,8 @@
 /area/main_map/maintenance/deck_two/aft)
 "jAm" = (
 /obj/structure/table/rack/shelf/steel,
-/obj/fiftyspawner/steel,
-/obj/fiftyspawner/steel,
+/obj/item/stack/material/steel/full_stack,
+/obj/item/stack/material/steel/full_stack,
 /obj/fiftyspawner/glass,
 /obj/fiftyspawner/glass,
 /turf/simulated/floor/reinforced,
@@ -14303,11 +14303,11 @@
 /obj/structure/closet{
 	name = "materials"
 	},
-/obj/fiftyspawner/steel,
-/obj/fiftyspawner/steel,
-/obj/fiftyspawner/steel,
-/obj/fiftyspawner/steel,
-/obj/fiftyspawner/steel,
+/obj/item/stack/material/steel/full_stack,
+/obj/item/stack/material/steel/full_stack,
+/obj/item/stack/material/steel/full_stack,
+/obj/item/stack/material/steel/full_stack,
+/obj/item/stack/material/steel/full_stack,
 /obj/fiftyspawner/glass,
 /obj/fiftyspawner/glass,
 /obj/fiftyspawner/glass,
@@ -17397,10 +17397,10 @@
 /area/main_map/maintenance/panic_bunker/two)
 "mQJ" = (
 /obj/structure/table/rack/shelf,
-/obj/fiftyspawner/steel,
+/obj/item/stack/material/steel/full_stack,
 /obj/fiftyspawner/glass,
 /obj/fiftyspawner/glass,
-/obj/fiftyspawner/steel,
+/obj/item/stack/material/steel/full_stack,
 /turf/simulated/floor/tiled/steel_grid,
 /area/rift/station/fighter_bay/hangar)
 "mQU" = (
@@ -20140,9 +20140,9 @@
 /area/medical/medbay2)
 "oOf" = (
 /obj/structure/table/reinforced,
-/obj/fiftyspawner/steel,
-/obj/fiftyspawner/steel,
-/obj/fiftyspawner/steel,
+/obj/item/stack/material/steel/full_stack,
+/obj/item/stack/material/steel/full_stack,
+/obj/item/stack/material/steel/full_stack,
 /turf/simulated/floor/tiled,
 /area/maintenance/tool_storage)
 "oOl" = (
@@ -20433,7 +20433,7 @@
 /obj/structure/table/rack/shelf,
 /obj/machinery/atmospherics/component/unary/vent_scrubber/on,
 /obj/fiftyspawner/glass,
-/obj/fiftyspawner/steel,
+/obj/item/stack/material/steel/full_stack,
 /obj/machinery/camera/network/civilian,
 /turf/simulated/floor/tiled/steel,
 /area/rift/station/fighter_bay/maintenance)
@@ -25440,10 +25440,10 @@
 	dir = 8;
 	layer = 2.6
 	},
-/obj/fiftyspawner/steel,
-/obj/fiftyspawner/steel,
-/obj/fiftyspawner/steel,
-/obj/fiftyspawner/steel,
+/obj/item/stack/material/steel/full_stack,
+/obj/item/stack/material/steel/full_stack,
+/obj/item/stack/material/steel/full_stack,
+/obj/item/stack/material/steel/full_stack,
 /turf/simulated/floor/tiled/techmaint,
 /area/engineering/storage)
 "sRz" = (
@@ -26969,8 +26969,8 @@
 /area/main_map/Hangar_bay/deck2)
 "tUD" = (
 /obj/structure/table/rack/shelf/steel,
-/obj/fiftyspawner/steel,
-/obj/fiftyspawner/steel,
+/obj/item/stack/material/steel/full_stack,
+/obj/item/stack/material/steel/full_stack,
 /obj/fiftyspawner/glass,
 /obj/fiftyspawner/glass,
 /turf/simulated/floor/reinforced,
@@ -31350,8 +31350,8 @@
 /area/engineering/atmos)
 "xbt" = (
 /obj/structure/table/reinforced,
-/obj/fiftyspawner/steel,
-/obj/fiftyspawner/steel,
+/obj/item/stack/material/steel/full_stack,
+/obj/item/stack/material/steel/full_stack,
 /obj/effect/floor_decal/industrial/danger{
 	dir = 1
 	},
diff --git a/maps/euthenia/levels/deck3.dmm b/maps/euthenia/levels/deck3.dmm
index 6d274c8ba8e5..a44cfb82eb7f 100644
--- a/maps/euthenia/levels/deck3.dmm
+++ b/maps/euthenia/levels/deck3.dmm
@@ -13554,7 +13554,7 @@
 /area/main_map/maintenance/deck_three)
 "mSL" = (
 /obj/structure/table/steel,
-/obj/fiftyspawner/steel,
+/obj/item/stack/material/steel/full_stack,
 /obj/effect/floor_decal/techfloor{
 	dir = 4
 	},
@@ -25701,7 +25701,7 @@
 	dir = 8
 	},
 /obj/structure/table/steel,
-/obj/fiftyspawner/steel,
+/obj/item/stack/material/steel/full_stack,
 /turf/simulated/floor/tiled/techfloor,
 /area/rnd/workshop)
 "ycj" = (
diff --git a/maps/map_levels/140x140/talon/talon1.dmm b/maps/map_levels/140x140/talon/talon1.dmm
index db6c2dc5a8af..18a455d8348f 100644
--- a/maps/map_levels/140x140/talon/talon1.dmm
+++ b/maps/map_levels/140x140/talon/talon1.dmm
@@ -929,7 +929,7 @@
 /obj/fiftyspawner/floor,
 /obj/fiftyspawner/glass,
 /obj/fiftyspawner/plastic,
-/obj/fiftyspawner/steel,
+/obj/item/stack/material/steel/full_stack,
 /obj/fiftyspawner/wood,
 /obj/item/stack/material/plasteel{
 	amount = 30
@@ -2062,9 +2062,9 @@
 /area/talon/deckone/brig)
 "rW" = (
 /obj/structure/table/standard,
-/obj/fiftyspawner/steel,
-/obj/fiftyspawner/steel,
-/obj/fiftyspawner/steel,
+/obj/item/stack/material/steel/full_stack,
+/obj/item/stack/material/steel/full_stack,
+/obj/item/stack/material/steel/full_stack,
 /turf/simulated/floor/tiled/eris/steel/gray_perforated,
 /area/talon/deckone/workroom)
 "rX" = (
diff --git a/maps/rift/levels/rift-02-underground2.dmm b/maps/rift/levels/rift-02-underground2.dmm
index c4e8d9711016..9eb51cefbfa6 100644
--- a/maps/rift/levels/rift-02-underground2.dmm
+++ b/maps/rift/levels/rift-02-underground2.dmm
@@ -6329,11 +6329,11 @@
 	dir = 8;
 	layer = 2.6
 	},
-/obj/fiftyspawner/steel,
-/obj/fiftyspawner/steel,
-/obj/fiftyspawner/steel,
-/obj/fiftyspawner/steel,
-/obj/fiftyspawner/steel,
+/obj/item/stack/material/steel/full_stack,
+/obj/item/stack/material/steel/full_stack,
+/obj/item/stack/material/steel/full_stack,
+/obj/item/stack/material/steel/full_stack,
+/obj/item/stack/material/steel/full_stack,
 /obj/structure/window/reinforced{
 	dir = 8
 	},
@@ -13318,7 +13318,7 @@
 /area/quartermaster/belterdock/refinery)
 "XS" = (
 /obj/structure/closet/crate,
-/obj/fiftyspawner/steel,
+/obj/item/stack/material/steel/full_stack,
 /turf/simulated/floor/plating,
 /area/maintenance/lower/mining)
 "XT" = (
diff --git a/maps/rift/levels/rift-03-underground1.dmm b/maps/rift/levels/rift-03-underground1.dmm
index 1f715a2f1001..26246faa9d9a 100644
--- a/maps/rift/levels/rift-03-underground1.dmm
+++ b/maps/rift/levels/rift-03-underground1.dmm
@@ -10309,7 +10309,7 @@
 "Gl" = (
 /obj/structure/table/rack/shelf,
 /obj/item/gun/launcher/crossbow,
-/obj/fiftyspawner/steel,
+/obj/item/stack/material/steel/full_stack,
 /turf/simulated/floor/plating,
 /area/maintenance/engineering)
 "Gm" = (
@@ -10663,7 +10663,7 @@
 "Ho" = (
 /obj/structure/table/rack,
 /obj/fiftyspawner/glass,
-/obj/fiftyspawner/steel,
+/obj/item/stack/material/steel/full_stack,
 /turf/simulated/floor/tiled/techmaint,
 /area/engineering/drone_fabrication)
 "Hp" = (
@@ -13825,7 +13825,7 @@
 /obj/structure/table/rack/shelf,
 /obj/machinery/atmospherics/component/unary/vent_scrubber/on,
 /obj/fiftyspawner/glass,
-/obj/fiftyspawner/steel,
+/obj/item/stack/material/steel/full_stack,
 /obj/machinery/camera/network/civilian,
 /turf/simulated/floor/tiled/steel,
 /area/rift/station/fighter_bay/maintenance)
diff --git a/maps/rift/levels/rift-04-surface1.dmm b/maps/rift/levels/rift-04-surface1.dmm
index 3b2ff86f9e8d..2cd427266afb 100644
--- a/maps/rift/levels/rift-04-surface1.dmm
+++ b/maps/rift/levels/rift-04-surface1.dmm
@@ -5880,7 +5880,7 @@
 /area/tether/surfacebase/entertainment)
 "dTO" = (
 /obj/structure/table/reinforced,
-/obj/fiftyspawner/steel,
+/obj/item/stack/material/steel/full_stack,
 /obj/fiftyspawner/glass,
 /obj/item/storage/briefcase/inflatable,
 /turf/simulated/floor/tiled/steel,
@@ -13800,7 +13800,7 @@
 /area/rnd/outpost/xenobiology/outpost_first_aid)
 "iMl" = (
 /obj/structure/table/rack/shelf/steel,
-/obj/fiftyspawner/steel,
+/obj/item/stack/material/steel/full_stack,
 /obj/fiftyspawner/glass,
 /turf/simulated/floor/tiled/steel_grid,
 /area/quartermaster/garage)
@@ -21600,7 +21600,7 @@
 	pixel_y = 32
 	},
 /obj/fiftyspawner/glass,
-/obj/fiftyspawner/steel,
+/obj/item/stack/material/steel/full_stack,
 /obj/item/hand_labeler,
 /turf/simulated/floor/tiled/steel,
 /area/quartermaster/office)
@@ -25636,7 +25636,7 @@
 "pKE" = (
 /obj/structure/table/rack/shelf,
 /obj/fiftyspawner/glass,
-/obj/fiftyspawner/steel,
+/obj/item/stack/material/steel/full_stack,
 /turf/simulated/floor/tiled/steel_dirty,
 /area/maintenance/maint_bar)
 "pKJ" = (
@@ -26923,7 +26923,7 @@
 "qwA" = (
 /obj/structure/table/rack,
 /obj/fiftyspawner/wood,
-/obj/fiftyspawner/steel,
+/obj/item/stack/material/steel/full_stack,
 /obj/fiftyspawner/hardwood,
 /obj/fiftyspawner/glass,
 /obj/item/storage/toolbox/mechanical,
diff --git a/maps/rift/levels/rift-05-surface2.dmm b/maps/rift/levels/rift-05-surface2.dmm
index c115095ab382..d840e273673e 100644
--- a/maps/rift/levels/rift-05-surface2.dmm
+++ b/maps/rift/levels/rift-05-surface2.dmm
@@ -4031,7 +4031,7 @@
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/hammerhead/general)
 "cqn" = (
-/obj/fiftyspawner/steel,
+/obj/item/stack/material/steel/full_stack,
 /turf/simulated/floor/tiled/techfloor,
 /area/maintenance/security/upper)
 "cqp" = (
@@ -8061,7 +8061,7 @@
 /obj/effect/floor_decal/corner/purple/border{
 	dir = 4
 	},
-/obj/fiftyspawner/steel,
+/obj/item/stack/material/steel/full_stack,
 /turf/simulated/floor/tiled/steel,
 /area/rnd/workshop)
 "fcE" = (
@@ -14836,7 +14836,7 @@
 "jpV" = (
 /obj/structure/table/steel,
 /obj/fiftyspawner/glass,
-/obj/fiftyspawner/steel,
+/obj/item/stack/material/steel/full_stack,
 /turf/simulated/floor/plating,
 /area/maintenance/asmaint2)
 "jqf" = (
@@ -23381,7 +23381,7 @@
 /obj/effect/floor_decal/corner/purple/border{
 	dir = 8
 	},
-/obj/fiftyspawner/steel,
+/obj/item/stack/material/steel/full_stack,
 /turf/simulated/floor/tiled/steel,
 /area/rnd/workshop)
 "otg" = (
@@ -34175,7 +34175,7 @@
 	dir = 4
 	},
 /obj/structure/table/reinforced,
-/obj/fiftyspawner/steel,
+/obj/item/stack/material/steel/full_stack,
 /obj/fiftyspawner/glass,
 /obj/machinery/requests_console{
 	department = "Research";
@@ -34220,8 +34220,8 @@
 /area/security/evastorage)
 "vrx" = (
 /obj/structure/table/steel,
-/obj/fiftyspawner/steel,
-/obj/fiftyspawner/steel,
+/obj/item/stack/material/steel/full_stack,
+/obj/item/stack/material/steel/full_stack,
 /obj/fiftyspawner/glass,
 /obj/fiftyspawner/glass,
 /obj/machinery/atmospherics/component/unary/vent_scrubber/on{
@@ -36697,7 +36697,7 @@
 /turf/simulated/floor/tiled/white,
 /area/crew_quarters/sleep/Dorm_5)
 "xdi" = (
-/obj/fiftyspawner/steel,
+/obj/item/stack/material/steel/full_stack,
 /obj/structure/table/rack,
 /obj/fiftyspawner/glass,
 /turf/simulated/floor/plating,
diff --git a/maps/rift/levels/rift-10-west_plains.dmm b/maps/rift/levels/rift-10-west_plains.dmm
index 7f531c74e37d..287261384cd1 100644
--- a/maps/rift/levels/rift-10-west_plains.dmm
+++ b/maps/rift/levels/rift-10-west_plains.dmm
@@ -5799,7 +5799,7 @@
 	dir = 10
 	},
 /obj/structure/table/standard,
-/obj/fiftyspawner/steel,
+/obj/item/stack/material/steel/full_stack,
 /turf/simulated/floor/tiled/white,
 /area/rnd/outpost/mixing)
 "At" = (
diff --git a/maps/sectors/admin_planets_192/andromeda.dmm b/maps/sectors/admin_planets_192/andromeda.dmm
index 17dcc5bf1efd..78f3959ab24d 100644
--- a/maps/sectors/admin_planets_192/andromeda.dmm
+++ b/maps/sectors/admin_planets_192/andromeda.dmm
@@ -3869,8 +3869,8 @@
 /obj/fiftyspawner/glass,
 /obj/fiftyspawner/glass,
 /obj/fiftyspawner/glass,
-/obj/fiftyspawner/steel,
-/obj/fiftyspawner/steel,
+/obj/item/stack/material/steel/full_stack,
+/obj/item/stack/material/steel/full_stack,
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
@@ -8781,8 +8781,8 @@
 /obj/machinery/lathe/medical/stocked{
 	pixel_x = 4
 	},
-/obj/fiftyspawner/steel,
-/obj/fiftyspawner/steel,
+/obj/item/stack/material/steel/full_stack,
+/obj/item/stack/material/steel/full_stack,
 /obj/fiftyspawner/glass,
 /obj/fiftyspawner/glass,
 /turf/simulated/floor/tiled/kafel_full/gray,
@@ -9276,7 +9276,7 @@
 "CM" = (
 /obj/structure/table/rack/shelf,
 /obj/fiftyspawner/cardboard,
-/obj/fiftyspawner/steel,
+/obj/item/stack/material/steel/full_stack,
 /obj/fiftyspawner/glass,
 /obj/effect/floor_decal/industrial/outline/grey,
 /turf/simulated/floor/tiled/steel,
@@ -9856,9 +9856,9 @@
 "EN" = (
 /obj/effect/floor_decal/industrial/outline/yellow,
 /obj/structure/closet/crate/science,
-/obj/fiftyspawner/steel,
-/obj/fiftyspawner/steel,
-/obj/fiftyspawner/steel,
+/obj/item/stack/material/steel/full_stack,
+/obj/item/stack/material/steel/full_stack,
+/obj/item/stack/material/steel/full_stack,
 /obj/fiftyspawner/glass,
 /obj/fiftyspawner/glass,
 /obj/fiftyspawner/glass,
@@ -13639,11 +13639,11 @@
 	dir = 8;
 	layer = 2.6
 	},
-/obj/fiftyspawner/steel,
-/obj/fiftyspawner/steel,
-/obj/fiftyspawner/steel,
-/obj/fiftyspawner/steel,
-/obj/fiftyspawner/steel,
+/obj/item/stack/material/steel/full_stack,
+/obj/item/stack/material/steel/full_stack,
+/obj/item/stack/material/steel/full_stack,
+/obj/item/stack/material/steel/full_stack,
+/obj/item/stack/material/steel/full_stack,
 /obj/structure/window/reinforced{
 	dir = 8
 	},
@@ -16293,8 +16293,8 @@
 /area/admin_planet/andromeda/rnd_rd_office)
 "YK" = (
 /obj/structure/table/reinforced,
-/obj/fiftyspawner/steel,
-/obj/fiftyspawner/steel,
+/obj/item/stack/material/steel/full_stack,
+/obj/item/stack/material/steel/full_stack,
 /turf/simulated/floor/tiled/kafel_full/gray,
 /area/admin_planet/andromeda/rnd_circuitry)
 "YL" = (
diff --git a/maps/sectors/admin_planets_192/croatoan.dmm b/maps/sectors/admin_planets_192/croatoan.dmm
index 33761393dfae..596dcb27c4ce 100644
--- a/maps/sectors/admin_planets_192/croatoan.dmm
+++ b/maps/sectors/admin_planets_192/croatoan.dmm
@@ -9075,7 +9075,7 @@
 /area/admin_planet/croatoan/sci_upper_checkpoint)
 "Ge" = (
 /obj/structure/table/reinforced,
-/obj/fiftyspawner/steel,
+/obj/item/stack/material/steel/full_stack,
 /turf/simulated/floor/tiled/techmaint,
 /area/admin_planet/croatoan/sci_circuitry_lab)
 "Gh" = (
@@ -13770,7 +13770,7 @@
 "Wh" = (
 /obj/structure/closet/crate/science,
 /obj/fiftyspawner/glass,
-/obj/fiftyspawner/steel,
+/obj/item/stack/material/steel/full_stack,
 /turf/simulated/floor/tiled/old_tile/white,
 /area/admin_planet/croatoan/sci_rnd_lab)
 "Wi" = (
diff --git a/maps/sectors/miaphus/levels/miaphus_beach.dmm b/maps/sectors/miaphus/levels/miaphus_beach.dmm
index f35e7bf8cfbc..a3d4c6dc17dc 100644
--- a/maps/sectors/miaphus/levels/miaphus_beach.dmm
+++ b/maps/sectors/miaphus/levels/miaphus_beach.dmm
@@ -2582,7 +2582,7 @@
 /area/sector/miaphus/beach/resort/canteen)
 "uk" = (
 /obj/structure/table/rack/shelf/steel,
-/obj/fiftyspawner/steel,
+/obj/item/stack/material/steel/full_stack,
 /turf/simulated/floor/tiled/asteroid_steel{
 	outdoors = 1
 	},
diff --git a/maps/sectors/nebula_tradeport/levels/nebula_tradeport.dmm b/maps/sectors/nebula_tradeport/levels/nebula_tradeport.dmm
index 3e42a9f5e23b..0d660e0c3670 100644
--- a/maps/sectors/nebula_tradeport/levels/nebula_tradeport.dmm
+++ b/maps/sectors/nebula_tradeport/levels/nebula_tradeport.dmm
@@ -4344,12 +4344,12 @@
 "alv" = (
 /obj/structure/table/steel_reinforced,
 /obj/fiftyspawner/glass,
-/obj/fiftyspawner/steel,
+/obj/item/stack/material/steel/full_stack,
 /obj/machinery/atmospherics/component/unary/vent_scrubber/on{
 	dir = 4
 	},
 /obj/fiftyspawner/glass,
-/obj/fiftyspawner/steel,
+/obj/item/stack/material/steel/full_stack,
 /obj/effect/floor_decal/rust,
 /turf/simulated/floor/plating,
 /area/tradeport/atmospherics)
@@ -13770,7 +13770,7 @@
 	},
 /obj/structure/table/steel_reinforced,
 /obj/fiftyspawner/glass,
-/obj/fiftyspawner/steel,
+/obj/item/stack/material/steel/full_stack,
 /obj/fiftyspawner/plastic,
 /turf/simulated/floor/tiled/dark,
 /area/tradeport/facility)
@@ -18415,8 +18415,8 @@
 	},
 /obj/fiftyspawner/glass,
 /obj/fiftyspawner/glass,
-/obj/fiftyspawner/steel,
-/obj/fiftyspawner/steel,
+/obj/item/stack/material/steel/full_stack,
+/obj/item/stack/material/steel/full_stack,
 /obj/structure/table/rack/steel,
 /obj/structure/window/reinforced{
 	dir = 8
diff --git a/maps/sectors/piratebase_192/levels/piratebase_192.dmm b/maps/sectors/piratebase_192/levels/piratebase_192.dmm
index 022055adef19..fa9b1b37681c 100644
--- a/maps/sectors/piratebase_192/levels/piratebase_192.dmm
+++ b/maps/sectors/piratebase_192/levels/piratebase_192.dmm
@@ -1186,7 +1186,7 @@
 "kX" = (
 /obj/structure/table/steel_reinforced,
 /obj/fiftyspawner/glass,
-/obj/fiftyspawner/steel,
+/obj/item/stack/material/steel/full_stack,
 /obj/machinery/atmospherics/component/unary/vent_pump/on{
 	dir = 1
 	},
@@ -4030,8 +4030,8 @@
 /obj/structure/table/steel_reinforced,
 /obj/fiftyspawner/glass,
 /obj/fiftyspawner/glass,
-/obj/fiftyspawner/steel,
-/obj/fiftyspawner/steel,
+/obj/item/stack/material/steel/full_stack,
+/obj/item/stack/material/steel/full_stack,
 /turf/simulated/floor/tiled/steel_dirty,
 /area/piratebase/sickbay)
 "JQ" = (
diff --git a/maps/submaps/level_specific/class_d/matdropD.dmm b/maps/submaps/level_specific/class_d/matdropD.dmm
index d84c56153736..f0f9302a379d 100644
--- a/maps/submaps/level_specific/class_d/matdropD.dmm
+++ b/maps/submaps/level_specific/class_d/matdropD.dmm
@@ -101,9 +101,9 @@
 /area/class_d/POIs/landing_pad)
 "B" = (
 /obj/structure/closet/crate,
-/obj/fiftyspawner/steel,
-/obj/fiftyspawner/steel,
-/obj/fiftyspawner/steel,
+/obj/item/stack/material/steel/full_stack,
+/obj/item/stack/material/steel/full_stack,
+/obj/item/stack/material/steel/full_stack,
 /turf/simulated/floor/tiled,
 /area/class_d/POIs/landing_pad)
 "D" = (
diff --git a/maps/submaps/level_specific/virgo2/Lab1.dmm b/maps/submaps/level_specific/virgo2/Lab1.dmm
index dda75b8bbdd6..365b2e050056 100644
--- a/maps/submaps/level_specific/virgo2/Lab1.dmm
+++ b/maps/submaps/level_specific/virgo2/Lab1.dmm
@@ -173,7 +173,7 @@
 /area/submap/virgo2/Lab1)
 "D" = (
 /obj/structure/table/standard,
-/obj/fiftyspawner/steel,
+/obj/item/stack/material/steel/full_stack,
 /obj/fiftyspawner/glass,
 /turf/simulated/floor/tiled/steel_dirty,
 /area/submap/virgo2/Lab1)
diff --git a/maps/submaps/lythios_rift/caves/west_caves_buriedstructure_1.dmm b/maps/submaps/lythios_rift/caves/west_caves_buriedstructure_1.dmm
index 74012cbd5a12..28e6bae99f51 100644
--- a/maps/submaps/lythios_rift/caves/west_caves_buriedstructure_1.dmm
+++ b/maps/submaps/lythios_rift/caves/west_caves_buriedstructure_1.dmm
@@ -293,7 +293,7 @@
 "KO" = (
 /obj/structure/table/rack,
 /obj/fiftyspawner/rods,
-/obj/fiftyspawner/steel,
+/obj/item/stack/material/steel/full_stack,
 /obj/fiftyspawner/glass,
 /turf/simulated/floor/tiled/lythios43c,
 /area/submap/lythios/west_caves/buried_structure)
diff --git a/maps/submaps/lythios_rift/caves/west_caves_buriedstructure_2.dmm b/maps/submaps/lythios_rift/caves/west_caves_buriedstructure_2.dmm
index 1480d0f9c3db..a18da0b5b5e7 100644
--- a/maps/submaps/lythios_rift/caves/west_caves_buriedstructure_2.dmm
+++ b/maps/submaps/lythios_rift/caves/west_caves_buriedstructure_2.dmm
@@ -9,7 +9,7 @@
 "g" = (
 /obj/structure/table/rack/shelf/steel,
 /obj/fiftyspawner/glass,
-/obj/fiftyspawner/steel,
+/obj/item/stack/material/steel/full_stack,
 /obj/fiftyspawner/rods,
 /turf/simulated/floor/lythios43c/indoors,
 /area/submap/lythios/west_caves/buried_structure)
diff --git a/maps/submaps/mountains/Rockb1.dmm b/maps/submaps/mountains/Rockb1.dmm
index 1022c3c82369..8684eaae3ade 100644
--- a/maps/submaps/mountains/Rockb1.dmm
+++ b/maps/submaps/mountains/Rockb1.dmm
@@ -195,7 +195,7 @@
 "L" = (
 /obj/structure/table/standard,
 /obj/fiftyspawner/glass,
-/obj/fiftyspawner/steel,
+/obj/item/stack/material/steel/full_stack,
 /turf/simulated/floor/tiled,
 /area/submap/Rockb1)
 "M" = (
diff --git a/maps/submaps/wilderness/Lab1.dmm b/maps/submaps/wilderness/Lab1.dmm
index 870939b8223c..376528df7244 100644
--- a/maps/submaps/wilderness/Lab1.dmm
+++ b/maps/submaps/wilderness/Lab1.dmm
@@ -176,7 +176,7 @@
 /area/submap/Lab1)
 "E" = (
 /obj/structure/table/standard,
-/obj/fiftyspawner/steel,
+/obj/item/stack/material/steel/full_stack,
 /obj/fiftyspawner/glass,
 /turf/simulated/floor/tiled/steel_dirty,
 /area/submap/Lab1)
diff --git a/maps/templates/admin/ert.dmm b/maps/templates/admin/ert.dmm
index 557e41dbcba6..cac325d782c8 100644
--- a/maps/templates/admin/ert.dmm
+++ b/maps/templates/admin/ert.dmm
@@ -3446,10 +3446,10 @@
 /obj/fiftyspawner/glass,
 /obj/fiftyspawner/glass,
 /obj/fiftyspawner/glass,
-/obj/fiftyspawner/steel,
-/obj/fiftyspawner/steel,
-/obj/fiftyspawner/steel,
-/obj/fiftyspawner/steel,
+/obj/item/stack/material/steel/full_stack,
+/obj/item/stack/material/steel/full_stack,
+/obj/item/stack/material/steel/full_stack,
+/obj/item/stack/material/steel/full_stack,
 /obj/fiftyspawner/plasteel,
 /obj/fiftyspawner/plasteel,
 /obj/fiftyspawner/plasteel,
diff --git a/maps/templates/admin/ert_base.dmm b/maps/templates/admin/ert_base.dmm
index b82c3d08903c..cfbc752d3575 100644
--- a/maps/templates/admin/ert_base.dmm
+++ b/maps/templates/admin/ert_base.dmm
@@ -1567,10 +1567,10 @@
 /obj/fiftyspawner/glass,
 /obj/fiftyspawner/glass,
 /obj/fiftyspawner/glass,
-/obj/fiftyspawner/steel,
-/obj/fiftyspawner/steel,
-/obj/fiftyspawner/steel,
-/obj/fiftyspawner/steel,
+/obj/item/stack/material/steel/full_stack,
+/obj/item/stack/material/steel/full_stack,
+/obj/item/stack/material/steel/full_stack,
+/obj/item/stack/material/steel/full_stack,
 /obj/fiftyspawner/plasteel,
 /obj/fiftyspawner/plasteel,
 /obj/fiftyspawner/plasteel,
diff --git a/maps/templates/admin/shipcave.dmm b/maps/templates/admin/shipcave.dmm
index 33d8093c8fc2..dbeaf6d5b21c 100644
--- a/maps/templates/admin/shipcave.dmm
+++ b/maps/templates/admin/shipcave.dmm
@@ -3470,9 +3470,9 @@
 /area/awaymission/shipcave/ship)
 "IU" = (
 /obj/structure/table/reinforced,
-/obj/fiftyspawner/steel,
-/obj/fiftyspawner/steel,
-/obj/fiftyspawner/steel,
+/obj/item/stack/material/steel/full_stack,
+/obj/item/stack/material/steel/full_stack,
+/obj/item/stack/material/steel/full_stack,
 /turf/simulated/floor/tiled/steel_dirty,
 /area/awaymission/shipcave)
 "IZ" = (
diff --git a/maps/templates/shuttles/overmaps/generic/bearcat.dmm b/maps/templates/shuttles/overmaps/generic/bearcat.dmm
index a33ea06dbd5f..b0c7003a8062 100644
--- a/maps/templates/shuttles/overmaps/generic/bearcat.dmm
+++ b/maps/templates/shuttles/overmaps/generic/bearcat.dmm
@@ -328,7 +328,7 @@
 	icon_state = "0-8"
 	},
 /obj/machinery/power/apc/alarms_hidden/east_mount{
-	
+
 	},
 /turf/simulated/floor/wood,
 /area/shuttle/bearcat/command_captain)
@@ -1927,7 +1927,7 @@
 	dir = 8
 	},
 /obj/structure/table/standard,
-/obj/fiftyspawner/steel,
+/obj/item/stack/material/steel/full_stack,
 /obj/fiftyspawner/rods,
 /obj/fiftyspawner/rglass,
 /obj/item/radio/intercom{
diff --git a/maps/templates/shuttles/overmaps/generic/cruiser.dmm b/maps/templates/shuttles/overmaps/generic/cruiser.dmm
index edee389cfccd..ffe331b7013a 100644
--- a/maps/templates/shuttles/overmaps/generic/cruiser.dmm
+++ b/maps/templates/shuttles/overmaps/generic/cruiser.dmm
@@ -1002,9 +1002,9 @@
 /area/mothership/eva)
 "cB" = (
 /obj/structure/table/steel_reinforced,
-/obj/fiftyspawner/steel,
-/obj/fiftyspawner/steel,
-/obj/fiftyspawner/steel,
+/obj/item/stack/material/steel/full_stack,
+/obj/item/stack/material/steel/full_stack,
+/obj/item/stack/material/steel/full_stack,
 /obj/machinery/air_alarm{
 	pixel_y = 22
 	},
@@ -5732,10 +5732,10 @@
 /obj/fiftyspawner/plastic,
 /obj/fiftyspawner/osmium,
 /obj/fiftyspawner/silver,
-/obj/fiftyspawner/steel,
-/obj/fiftyspawner/steel,
-/obj/fiftyspawner/steel,
-/obj/fiftyspawner/steel,
+/obj/item/stack/material/steel/full_stack,
+/obj/item/stack/material/steel/full_stack,
+/obj/item/stack/material/steel/full_stack,
+/obj/item/stack/material/steel/full_stack,
 /obj/fiftyspawner/uranium,
 /obj/fiftyspawner/glass,
 /obj/fiftyspawner/glass,
diff --git a/maps/templates/shuttles/overmaps/generic/curashuttle.dmm b/maps/templates/shuttles/overmaps/generic/curashuttle.dmm
index c24e478d98a0..7641a383e08e 100644
--- a/maps/templates/shuttles/overmaps/generic/curashuttle.dmm
+++ b/maps/templates/shuttles/overmaps/generic/curashuttle.dmm
@@ -484,7 +484,7 @@
 	dir = 6
 	},
 /obj/structure/table/standard,
-/obj/fiftyspawner/steel,
+/obj/item/stack/material/steel/full_stack,
 /obj/item/storage/toolbox/syndicate/powertools,
 /obj/item/stack/nanopaste/advanced,
 /obj/item/stack/cable_coil,
diff --git a/maps/templates/shuttles/overmaps/generic/generic_shuttle.dmm b/maps/templates/shuttles/overmaps/generic/generic_shuttle.dmm
index e8259afbd4f8..d9efdfecdfbd 100644
--- a/maps/templates/shuttles/overmaps/generic/generic_shuttle.dmm
+++ b/maps/templates/shuttles/overmaps/generic/generic_shuttle.dmm
@@ -672,7 +672,7 @@
 	},
 /obj/structure/table/standard,
 /obj/item/storage/toolbox/mechanical,
-/obj/fiftyspawner/steel,
+/obj/item/stack/material/steel/full_stack,
 /turf/simulated/floor/plating,
 /area/shuttle/generic_shuttle/eng)
 "bw" = (
diff --git a/maps/templates/shuttles/overmaps/generic/ghostship.dmm b/maps/templates/shuttles/overmaps/generic/ghostship.dmm
index 27d1147df9e6..13bd7dcfb562 100644
--- a/maps/templates/shuttles/overmaps/generic/ghostship.dmm
+++ b/maps/templates/shuttles/overmaps/generic/ghostship.dmm
@@ -6627,7 +6627,7 @@
 "pm" = (
 /obj/structure/table/steel_reinforced,
 /obj/fiftyspawner/glass,
-/obj/fiftyspawner/steel,
+/obj/item/stack/material/steel/full_stack,
 /obj/effect/floor_decal/borderfloorblack{
 	dir = 8
 	},
diff --git a/maps/templates/shuttles/overmaps/generic/itglight.dmm b/maps/templates/shuttles/overmaps/generic/itglight.dmm
index 1388889c0fa2..66537c113bd9 100644
--- a/maps/templates/shuttles/overmaps/generic/itglight.dmm
+++ b/maps/templates/shuttles/overmaps/generic/itglight.dmm
@@ -2426,10 +2426,10 @@
 /area/itglight/metingroom)
 "qR" = (
 /obj/structure/table/rack/shelf/steel,
-/obj/fiftyspawner/steel,
-/obj/fiftyspawner/steel,
-/obj/fiftyspawner/steel/hull,
-/obj/fiftyspawner/steel/hull,
+/obj/item/stack/material/steel/full_stack,
+/obj/item/stack/material/steel/full_stack,
+/obj/item/stack/material/steel/full_stack/hull,
+/obj/item/stack/material/steel/full_stack/hull,
 /obj/fiftyspawner/rglass,
 /obj/fiftyspawner/rglass,
 /obj/fiftyspawner/glass,
diff --git a/maps/templates/shuttles/overmaps/generic/mercship.dmm b/maps/templates/shuttles/overmaps/generic/mercship.dmm
index 8a7baa5bf378..741be1784323 100644
--- a/maps/templates/shuttles/overmaps/generic/mercship.dmm
+++ b/maps/templates/shuttles/overmaps/generic/mercship.dmm
@@ -1492,7 +1492,7 @@
 /area/ship/mercenary/engineeringcntrl)
 "dq" = (
 /obj/structure/table/reinforced,
-/obj/fiftyspawner/steel,
+/obj/item/stack/material/steel/full_stack,
 /obj/fiftyspawner/glass,
 /obj/effect/floor_decal/borderfloorblack{
 	dir = 1
diff --git a/maps/templates/shuttles/overmaps/generic/overmap_ship_paperclipper.dmm b/maps/templates/shuttles/overmaps/generic/overmap_ship_paperclipper.dmm
index faa824a293f2..04b1ec801de3 100644
--- a/maps/templates/shuttles/overmaps/generic/overmap_ship_paperclipper.dmm
+++ b/maps/templates/shuttles/overmaps/generic/overmap_ship_paperclipper.dmm
@@ -720,7 +720,7 @@
 /area/shuttle/paper_clipper)
 "Ft" = (
 /obj/structure/table/steel,
-/obj/fiftyspawner/steel,
+/obj/item/stack/material/steel/full_stack,
 /obj/fiftyspawner/glass,
 /turf/simulated/floor/tiled/techmaint,
 /area/shuttle/paper_clipper)
diff --git a/maps/templates/shuttles/overmaps/generic/shelter_6.dmm b/maps/templates/shuttles/overmaps/generic/shelter_6.dmm
index c215d0831b02..40cb6c14c683 100644
--- a/maps/templates/shuttles/overmaps/generic/shelter_6.dmm
+++ b/maps/templates/shuttles/overmaps/generic/shelter_6.dmm
@@ -612,14 +612,14 @@
 /obj/item/storage/toolbox/emergency,
 /obj/item/storage/toolbox/emergency,
 /obj/item/storage/toolbox/emergency,
-/obj/fiftyspawner/steel,
-/obj/fiftyspawner/steel,
-/obj/fiftyspawner/steel,
-/obj/fiftyspawner/steel,
-/obj/fiftyspawner/steel,
-/obj/fiftyspawner/steel,
-/obj/fiftyspawner/steel,
-/obj/fiftyspawner/steel,
+/obj/item/stack/material/steel/full_stack,
+/obj/item/stack/material/steel/full_stack,
+/obj/item/stack/material/steel/full_stack,
+/obj/item/stack/material/steel/full_stack,
+/obj/item/stack/material/steel/full_stack,
+/obj/item/stack/material/steel/full_stack,
+/obj/item/stack/material/steel/full_stack,
+/obj/item/stack/material/steel/full_stack,
 /obj/fiftyspawner/glass,
 /obj/fiftyspawner/glass,
 /obj/fiftyspawner/glass,
diff --git a/maps/templates/shuttles/overmaps/generic/vespa.dmm b/maps/templates/shuttles/overmaps/generic/vespa.dmm
index eaf4614559dd..cb51a8cbb778 100644
--- a/maps/templates/shuttles/overmaps/generic/vespa.dmm
+++ b/maps/templates/shuttles/overmaps/generic/vespa.dmm
@@ -7020,7 +7020,7 @@
 "pm" = (
 /obj/structure/table/steel_reinforced,
 /obj/fiftyspawner/glass,
-/obj/fiftyspawner/steel,
+/obj/item/stack/material/steel/full_stack,
 /obj/effect/floor_decal/borderfloorblack{
 	dir = 8
 	},
diff --git a/maps/tether/levels/station1.dmm b/maps/tether/levels/station1.dmm
index e487b1b391f6..93029eb14f0a 100644
--- a/maps/tether/levels/station1.dmm
+++ b/maps/tether/levels/station1.dmm
@@ -1921,7 +1921,7 @@
 	},
 /obj/fiftyspawner/plastic,
 /obj/fiftyspawner/plastic,
-/obj/fiftyspawner/steel,
+/obj/item/stack/material/steel/full_stack,
 /turf/simulated/floor/tiled,
 /area/engineering/workshop)
 "dL" = (
@@ -5370,7 +5370,7 @@
 /area/maintenance/station/eng_lower)
 "kU" = (
 /obj/structure/table/reinforced,
-/obj/fiftyspawner/steel,
+/obj/item/stack/material/steel/full_stack,
 /obj/fiftyspawner/glass,
 /turf/simulated/floor/tiled,
 /area/engineering/atmos/backup)
@@ -11004,11 +11004,11 @@
 /area/engineering/shield_gen)
 "wN" = (
 /obj/structure/table/reinforced,
-/obj/fiftyspawner/steel,
-/obj/fiftyspawner/steel,
-/obj/fiftyspawner/steel,
-/obj/fiftyspawner/steel,
-/obj/fiftyspawner/steel,
+/obj/item/stack/material/steel/full_stack,
+/obj/item/stack/material/steel/full_stack,
+/obj/item/stack/material/steel/full_stack,
+/obj/item/stack/material/steel/full_stack,
+/obj/item/stack/material/steel/full_stack,
 /obj/machinery/fire_alarm/south_mount{
 	pixel_y = -24
 	},
diff --git a/maps/tether/levels/station2.dmm b/maps/tether/levels/station2.dmm
index c704670d73c7..ecd732e0e023 100644
--- a/maps/tether/levels/station2.dmm
+++ b/maps/tether/levels/station2.dmm
@@ -12495,7 +12495,7 @@
 /obj/effect/floor_decal/industrial/warning{
 	dir = 4
 	},
-/obj/fiftyspawner/steel,
+/obj/item/stack/material/steel/full_stack,
 /turf/simulated/floor/tiled,
 /area/ai_monitored/storage/eva)
 "zi" = (
@@ -12953,7 +12953,7 @@
 "Ai" = (
 /obj/structure/table/standard,
 /obj/item/multitool,
-/obj/fiftyspawner/steel,
+/obj/item/stack/material/steel/full_stack,
 /obj/fiftyspawner/glass,
 /obj/effect/floor_decal/borderfloor{
 	dir = 4
@@ -17682,9 +17682,9 @@
 /obj/item/stack/material/plasteel{
 	amount = 10
 	},
-/obj/fiftyspawner/steel,
-/obj/fiftyspawner/steel,
-/obj/fiftyspawner/steel,
+/obj/item/stack/material/steel/full_stack,
+/obj/item/stack/material/steel/full_stack,
+/obj/item/stack/material/steel/full_stack,
 /obj/effect/floor_decal/industrial/warning{
 	dir = 4
 	},
diff --git a/maps/tether/levels/surface1.dmm b/maps/tether/levels/surface1.dmm
index 7d58b0621c09..2cc7e0bb589a 100644
--- a/maps/tether/levels/surface1.dmm
+++ b/maps/tether/levels/surface1.dmm
@@ -13265,8 +13265,8 @@
 	dir = 1
 	},
 /obj/structure/closet/crate/engineering,
-/obj/fiftyspawner/steel,
-/obj/fiftyspawner/steel,
+/obj/item/stack/material/steel/full_stack,
+/obj/item/stack/material/steel/full_stack,
 /obj/fiftyspawner/glass,
 /turf/simulated/floor/tiled/steel_dirty/virgo3b{
 	outdoors = 0
@@ -18362,7 +18362,7 @@
 	dir = 10
 	},
 /obj/structure/table/standard,
-/obj/fiftyspawner/steel,
+/obj/item/stack/material/steel/full_stack,
 /turf/simulated/floor/tiled/white,
 /area/rnd/outpost/mixing)
 "jKn" = (
@@ -22611,7 +22611,7 @@
 /obj/effect/floor_decal/corner/yellow/border{
 	dir = 5
 	},
-/obj/fiftyspawner/steel,
+/obj/item/stack/material/steel/full_stack,
 /turf/simulated/floor/tiled/techmaint,
 /area/engineering/atmos)
 "maD" = (
@@ -38721,8 +38721,8 @@
 	pixel_y = 30
 	},
 /obj/structure/table/standard,
-/obj/fiftyspawner/steel,
-/obj/fiftyspawner/steel,
+/obj/item/stack/material/steel/full_stack,
+/obj/item/stack/material/steel/full_stack,
 /obj/fiftyspawner/glass,
 /turf/simulated/floor/tiled,
 /area/engineering/atmos)
@@ -42992,7 +42992,7 @@
 /turf/simulated/floor/plating,
 /area/maintenance/lower/research)
 "xbO" = (
-/obj/fiftyspawner/steel,
+/obj/item/stack/material/steel/full_stack,
 /turf/simulated/floor/plating,
 /area/maintenance/lowmedbaymaint)
 "xbY" = (
diff --git a/maps/tether/levels/surface3.dmm b/maps/tether/levels/surface3.dmm
index c45bf84b371c..4ab2bb714e5f 100644
--- a/maps/tether/levels/surface3.dmm
+++ b/maps/tether/levels/surface3.dmm
@@ -1028,11 +1028,11 @@
 /obj/structure/closet{
 	name = "materials"
 	},
-/obj/fiftyspawner/steel,
-/obj/fiftyspawner/steel,
-/obj/fiftyspawner/steel,
-/obj/fiftyspawner/steel,
-/obj/fiftyspawner/steel,
+/obj/item/stack/material/steel/full_stack,
+/obj/item/stack/material/steel/full_stack,
+/obj/item/stack/material/steel/full_stack,
+/obj/item/stack/material/steel/full_stack,
+/obj/item/stack/material/steel/full_stack,
 /obj/fiftyspawner/glass,
 /obj/fiftyspawner/glass,
 /obj/fiftyspawner/glass,
@@ -21773,7 +21773,7 @@
 /area/tether/surfacebase/security/iaa)
 "nlp" = (
 /obj/structure/table/steel,
-/obj/fiftyspawner/steel,
+/obj/item/stack/material/steel/full_stack,
 /obj/effect/floor_decal/techfloor{
 	dir = 8
 	},
@@ -23557,7 +23557,7 @@
 	pixel_x = 3;
 	pixel_y = 3
 	},
-/obj/fiftyspawner/steel,
+/obj/item/stack/material/steel/full_stack,
 /obj/fiftyspawner/glass,
 /turf/simulated/floor/tiled,
 /area/rnd/research)
@@ -32568,7 +32568,7 @@
 /area/rnd/robotics/resleeving)
 "tyA" = (
 /obj/structure/table/steel,
-/obj/fiftyspawner/steel,
+/obj/item/stack/material/steel/full_stack,
 /obj/effect/floor_decal/techfloor{
 	dir = 4
 	},
diff --git a/maps/triumph/levels/deck1.dmm b/maps/triumph/levels/deck1.dmm
index ff1464050c5b..d4a9fb599b91 100644
--- a/maps/triumph/levels/deck1.dmm
+++ b/maps/triumph/levels/deck1.dmm
@@ -9372,10 +9372,10 @@
 /obj/machinery/light{
 	dir = 1
 	},
-/obj/fiftyspawner/steel,
-/obj/fiftyspawner/steel,
-/obj/fiftyspawner/steel,
-/obj/fiftyspawner/steel,
+/obj/item/stack/material/steel/full_stack,
+/obj/item/stack/material/steel/full_stack,
+/obj/item/stack/material/steel/full_stack,
+/obj/item/stack/material/steel/full_stack,
 /turf/simulated/floor/tiled/techmaint,
 /area/engineering/storage)
 "Fq" = (
@@ -13679,7 +13679,7 @@
 /area/engineering/atmos/storage)
 "TF" = (
 /obj/structure/table/rack,
-/obj/fiftyspawner/steel,
+/obj/item/stack/material/steel/full_stack,
 /obj/fiftyspawner/rods,
 /obj/structure/railing{
 	dir = 8
@@ -14974,8 +14974,8 @@
 /area/crew_quarters/heads/chief)
 "XR" = (
 /obj/structure/closet/crate,
-/obj/fiftyspawner/steel,
-/obj/fiftyspawner/steel,
+/obj/item/stack/material/steel/full_stack,
+/obj/item/stack/material/steel/full_stack,
 /obj/fiftyspawner/glass,
 /obj/fiftyspawner/glass,
 /turf/simulated/floor/plating,
diff --git a/maps/triumph/levels/deck2.dmm b/maps/triumph/levels/deck2.dmm
index 26a4e23c8a4a..999ac1fe8c08 100644
--- a/maps/triumph/levels/deck2.dmm
+++ b/maps/triumph/levels/deck2.dmm
@@ -2550,7 +2550,7 @@
 	pixel_x = 7
 	},
 /obj/fiftyspawner/glass,
-/obj/fiftyspawner/steel,
+/obj/item/stack/material/steel/full_stack,
 /turf/simulated/floor/tiled,
 /area/quartermaster/office)
 "hF" = (
@@ -4867,7 +4867,7 @@
 /area/crew_quarters/kitchen)
 "oY" = (
 /obj/structure/table/rack,
-/obj/fiftyspawner/steel,
+/obj/item/stack/material/steel/full_stack,
 /turf/simulated/floor/plating,
 /area/maintenance/dormitory)
 "pa" = (
@@ -5831,8 +5831,8 @@
 /area/station/stairs_two)
 "rK" = (
 /obj/structure/closet/crate,
-/obj/fiftyspawner/steel,
-/obj/fiftyspawner/steel,
+/obj/item/stack/material/steel/full_stack,
+/obj/item/stack/material/steel/full_stack,
 /obj/fiftyspawner/glass,
 /obj/fiftyspawner/glass,
 /turf/simulated/floor/plating,
@@ -6226,7 +6226,7 @@
 "sR" = (
 /obj/effect/floor_decal/industrial/outline/yellow,
 /obj/structure/closet/crate,
-/obj/fiftyspawner/steel,
+/obj/item/stack/material/steel/full_stack,
 /obj/fiftyspawner/rods,
 /obj/fiftyspawner/glass,
 /turf/simulated/floor/tiled,
@@ -6535,8 +6535,8 @@
 /area/crew_quarters/sleep/Dorm_3)
 "tI" = (
 /obj/structure/closet/crate,
-/obj/fiftyspawner/steel,
-/obj/fiftyspawner/steel,
+/obj/item/stack/material/steel/full_stack,
+/obj/item/stack/material/steel/full_stack,
 /obj/fiftyspawner/glass,
 /obj/fiftyspawner/glass,
 /turf/simulated/floor/plating,
@@ -12012,7 +12012,7 @@
 "Kp" = (
 /obj/structure/closet/toolcloset,
 /obj/item/storage/toolbox/mechanical,
-/obj/fiftyspawner/steel,
+/obj/item/stack/material/steel/full_stack,
 /obj/fiftyspawner/glass,
 /obj/item/stack/cable_coil/random,
 /obj/fiftyspawner/wood,
@@ -12022,7 +12022,7 @@
 /obj/machinery/power/apc/west_mount{
 	cell_type = /obj/item/cell/super
 	},
-/obj/fiftyspawner/steel,
+/obj/item/stack/material/steel/full_stack,
 /turf/simulated/floor/wood,
 /area/triumph/surfacebase/bar_backroom)
 "Kq" = (
@@ -14332,8 +14332,8 @@
 "Rv" = (
 /obj/effect/floor_decal/industrial/outline/yellow,
 /obj/structure/closet/crate,
-/obj/fiftyspawner/steel,
-/obj/fiftyspawner/steel,
+/obj/item/stack/material/steel/full_stack,
+/obj/item/stack/material/steel/full_stack,
 /turf/simulated/floor/tiled,
 /area/maintenance/cargo)
 "Rw" = (
diff --git a/maps/triumph/levels/deck3.dmm b/maps/triumph/levels/deck3.dmm
index fcb945ec6c11..7ae668a898bb 100644
--- a/maps/triumph/levels/deck3.dmm
+++ b/maps/triumph/levels/deck3.dmm
@@ -7106,7 +7106,7 @@
 	pixel_x = 3;
 	pixel_y = 3
 	},
-/obj/fiftyspawner/steel,
+/obj/item/stack/material/steel/full_stack,
 /obj/fiftyspawner/glass,
 /obj/structure/table/reinforced,
 /obj/effect/floor_decal/borderfloor,
@@ -10431,8 +10431,8 @@
 /area/medical/sleeper)
 "iBU" = (
 /obj/structure/table/steel,
-/obj/fiftyspawner/steel,
-/obj/fiftyspawner/steel,
+/obj/item/stack/material/steel/full_stack,
+/obj/item/stack/material/steel/full_stack,
 /turf/simulated/floor/tiled,
 /area/rnd/misc_lab)
 "iCr" = (
@@ -11531,7 +11531,7 @@
 /area/rnd/anomaly_lab/containment_two)
 "jvv" = (
 /obj/structure/table/steel,
-/obj/fiftyspawner/steel,
+/obj/item/stack/material/steel/full_stack,
 /obj/effect/floor_decal/techfloor{
 	dir = 4
 	},
@@ -12925,7 +12925,7 @@
 	dir = 8
 	},
 /obj/structure/table/steel,
-/obj/fiftyspawner/steel,
+/obj/item/stack/material/steel/full_stack,
 /turf/simulated/floor/tiled/techfloor,
 /area/rnd/workshop)
 "kFN" = (
diff --git a/maps/triumph/levels/deck4.dmm b/maps/triumph/levels/deck4.dmm
index 4815f6e361db..45dfe7bc3779 100644
--- a/maps/triumph/levels/deck4.dmm
+++ b/maps/triumph/levels/deck4.dmm
@@ -6828,7 +6828,7 @@
 "eFX" = (
 /obj/structure/table/rack,
 /obj/random/maintenance/security,
-/obj/fiftyspawner/steel,
+/obj/item/stack/material/steel/full_stack,
 /turf/simulated/floor/plating,
 /area/maintenance/security/starboard)
 "eGc" = (
@@ -12985,8 +12985,8 @@
 /obj/structure/table/steel,
 /obj/fiftyspawner/glass,
 /obj/fiftyspawner/glass,
-/obj/fiftyspawner/steel,
-/obj/fiftyspawner/steel,
+/obj/item/stack/material/steel/full_stack,
+/obj/item/stack/material/steel/full_stack,
 /obj/structure/cable/green{
 	icon_state = "2-8"
 	},
@@ -19869,9 +19869,9 @@
 /area/library)
 "nKb" = (
 /obj/structure/table/reinforced,
-/obj/fiftyspawner/steel,
-/obj/fiftyspawner/steel,
-/obj/fiftyspawner/steel,
+/obj/item/stack/material/steel/full_stack,
+/obj/item/stack/material/steel/full_stack,
+/obj/item/stack/material/steel/full_stack,
 /turf/simulated/floor/tiled,
 /area/maintenance/tool_storage)
 "nKg" = (
@@ -21185,8 +21185,8 @@
 /area/library)
 "oGE" = (
 /obj/structure/closet/crate,
-/obj/fiftyspawner/steel,
-/obj/fiftyspawner/steel,
+/obj/item/stack/material/steel/full_stack,
+/obj/item/stack/material/steel/full_stack,
 /obj/fiftyspawner/glass,
 /obj/fiftyspawner/glass,
 /turf/simulated/floor/plating,
@@ -21852,8 +21852,8 @@
 /area/exploration/excursion_dock)
 "pdK" = (
 /obj/structure/closet/crate,
-/obj/fiftyspawner/steel,
-/obj/fiftyspawner/steel,
+/obj/item/stack/material/steel/full_stack,
+/obj/item/stack/material/steel/full_stack,
 /obj/fiftyspawner/glass,
 /obj/fiftyspawner/glass,
 /turf/simulated/floor/plating,
@@ -28056,8 +28056,8 @@
 /area/security/interrogation)
 "tEj" = (
 /obj/structure/closet/crate,
-/obj/fiftyspawner/steel,
-/obj/fiftyspawner/steel,
+/obj/item/stack/material/steel/full_stack,
+/obj/item/stack/material/steel/full_stack,
 /obj/fiftyspawner/glass,
 /obj/fiftyspawner/glass,
 /turf/simulated/floor/plating,
@@ -28930,7 +28930,7 @@
 /turf/simulated/floor/plating,
 /area/shuttle/courser/general)
 "uhE" = (
-/obj/fiftyspawner/steel,
+/obj/item/stack/material/steel/full_stack,
 /obj/structure/table/rack,
 /turf/simulated/floor/plating,
 /area/maintenance/security/port)

From e4cd22ccd66e3a9badc63376d8c913eb3dd228f8 Mon Sep 17 00:00:00 2001
From: silicons <2003111+silicons@users.noreply.github.com>
Date: Mon, 16 Dec 2024 01:35:18 -0500
Subject: [PATCH 08/25] Fix

---
 code/modules/materials/fifty_spawner_mats.dm | 6 +-----
 code/modules/materials/material_sheets.dm    | 4 ++--
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/code/modules/materials/fifty_spawner_mats.dm b/code/modules/materials/fifty_spawner_mats.dm
index e291dea1662e..012a4b196adc 100644
--- a/code/modules/materials/fifty_spawner_mats.dm
+++ b/code/modules/materials/fifty_spawner_mats.dm
@@ -52,11 +52,7 @@
 	name = "stack of osmium"
 	type_to_spawn = /obj/item/stack/material/osmium
 
-/obj/item/stack/material/steel/full_stack
-	name = "stack of steel"
-	type_to_spawn = /obj/item/stack/material/steel
-
-/obj/item/stack/material/steel/full_stack/hull
+/obj/fiftyspawner/hull
 	name = "stack of steel hull"
 	type_to_spawn = /obj/item/stack/material/steel/hull
 
diff --git a/code/modules/materials/material_sheets.dm b/code/modules/materials/material_sheets.dm
index f0350c61fb98..e69df0a8e251 100644
--- a/code/modules/materials/material_sheets.dm
+++ b/code/modules/materials/material_sheets.dm
@@ -32,8 +32,8 @@
 		src.material = material
 	src.material = RSmaterials.fetch(src.material)
 
-	if(material.icon && icon != material.icon)
-		icon = material.icon
+	if(src.material.icon && icon != src.material.icon)
+		icon = src.material.icon
 
 	. = ..()
 

From bbadda2b05d028623083f6ff46e61e57f9e24db2 Mon Sep 17 00:00:00 2001
From: silicons <2003111+silicons@users.noreply.github.com>
Date: Mon, 16 Dec 2024 01:45:17 -0500
Subject: [PATCH 09/25] fine we'll replace those later

---
 code/modules/materials/fifty_spawner_mats.dm  |    6 +-
 maps/away_missions/archive/Academy.dmm        |    4 +-
 maps/away_missions/archive/spacebattle.dmm    |    4 +-
 .../archive/stationCollision.dmm              |    4 +-
 maps/endeavour/levels/deck1.dmm               | 4785 ++++++++++-------
 maps/endeavour/levels/deck2.dmm               | 1043 ++--
 maps/endeavour/levels/deck3.dmm               |  723 +--
 maps/endeavour/levels/deck4.dmm               |   65 +-
 maps/euthenia/levels/deck1.dmm                |    6 +-
 maps/euthenia/levels/deck2.dmm                |   42 +-
 maps/euthenia/levels/deck3.dmm                |    4 +-
 maps/map_levels/140x140/talon/talon1.dmm      |    8 +-
 maps/rift/levels/rift-02-underground2.dmm     |   12 +-
 maps/rift/levels/rift-03-underground1.dmm     |    6 +-
 maps/rift/levels/rift-04-surface1.dmm         |   10 +-
 maps/rift/levels/rift-05-surface2.dmm         |   16 +-
 maps/rift/levels/rift-10-west_plains.dmm      |    2 +-
 maps/sectors/admin_planets_192/andromeda.dmm  |   30 +-
 maps/sectors/admin_planets_192/croatoan.dmm   |    4 +-
 maps/sectors/miaphus/levels/miaphus_beach.dmm |    2 +-
 .../levels/nebula_tradeport.dmm               |  510 +-
 .../piratebase_192/levels/piratebase_192.dmm  |    6 +-
 .../level_specific/class_d/matdropD.dmm       |    6 +-
 maps/submaps/level_specific/virgo2/Lab1.dmm   |    2 +-
 .../caves/west_caves_buriedstructure_1.dmm    |    2 +-
 .../caves/west_caves_buriedstructure_2.dmm    |    2 +-
 maps/submaps/mountains/Rockb1.dmm             |    2 +-
 maps/submaps/wilderness/Lab1.dmm              |    2 +-
 maps/templates/admin/ert.dmm                  |    8 +-
 maps/templates/admin/ert_base.dmm             |    8 +-
 maps/templates/admin/shipcave.dmm             |    6 +-
 .../shuttles/overmaps/generic/bearcat.dmm     |    4 +-
 .../shuttles/overmaps/generic/cruiser.dmm     |   14 +-
 .../shuttles/overmaps/generic/curashuttle.dmm |    2 +-
 .../overmaps/generic/generic_shuttle.dmm      |    2 +-
 .../shuttles/overmaps/generic/ghostship.dmm   |    2 +-
 .../shuttles/overmaps/generic/itglight.dmm    |    8 +-
 .../shuttles/overmaps/generic/mercship.dmm    |    2 +-
 .../generic/overmap_ship_paperclipper.dmm     |    2 +-
 .../shuttles/overmaps/generic/shelter_6.dmm   |   16 +-
 .../shuttles/overmaps/generic/vespa.dmm       |    2 +-
 maps/tether/levels/station1.dmm               |   14 +-
 maps/tether/levels/station2.dmm               |   10 +-
 maps/tether/levels/surface1.dmm               |   14 +-
 maps/tether/levels/surface3.dmm               |   16 +-
 maps/triumph/levels/deck1.dmm                 |   14 +-
 maps/triumph/levels/deck2.dmm                 |   22 +-
 maps/triumph/levels/deck3.dmm                 |   10 +-
 maps/triumph/levels/deck4.dmm                 |   26 +-
 49 files changed, 4088 insertions(+), 3422 deletions(-)

diff --git a/code/modules/materials/fifty_spawner_mats.dm b/code/modules/materials/fifty_spawner_mats.dm
index 012a4b196adc..7215709619d5 100644
--- a/code/modules/materials/fifty_spawner_mats.dm
+++ b/code/modules/materials/fifty_spawner_mats.dm
@@ -52,7 +52,11 @@
 	name = "stack of osmium"
 	type_to_spawn = /obj/item/stack/material/osmium
 
-/obj/fiftyspawner/hull
+/obj/fiftyspawner/steel
+	name = "stack of steel"
+	type_to_spawn = /obj/item/stack/material/steel
+
+/obj/fiftyspawner/steel/hull
 	name = "stack of steel hull"
 	type_to_spawn = /obj/item/stack/material/steel/hull
 
diff --git a/maps/away_missions/archive/Academy.dmm b/maps/away_missions/archive/Academy.dmm
index 1347a2e798e7..19cfbe49825d 100644
--- a/maps/away_missions/archive/Academy.dmm
+++ b/maps/away_missions/archive/Academy.dmm
@@ -673,7 +673,7 @@
 /turf/simulated/floor,
 /area/awaymission/academy/classrooms)
 "cG" = (
-/obj/item/stack/material/steel/full_stack,
+/obj/fiftyspawner/steel,
 /turf/simulated/floor/plating,
 /area/awaymission/academy/classrooms)
 "cJ" = (
@@ -2081,7 +2081,7 @@
 	dir = 8
 	},
 /obj/structure/table/rack,
-/obj/item/stack/material/steel/full_stack,
+/obj/fiftyspawner/steel,
 /turf/simulated/floor/tiled/old_tile/gray,
 /area/awaymission/academy/academyaft)
 "iy" = (
diff --git a/maps/away_missions/archive/spacebattle.dmm b/maps/away_missions/archive/spacebattle.dmm
index 46842c3ff4d3..1cfcb6179823 100644
--- a/maps/away_missions/archive/spacebattle.dmm
+++ b/maps/away_missions/archive/spacebattle.dmm
@@ -430,7 +430,7 @@
 /turf/simulated/floor,
 /area/awaymission/spacebattle/cruiser)
 "cz" = (
-/obj/item/stack/material/steel/full_stack,
+/obj/fiftyspawner/steel,
 /obj/item/ammo_casing/a10mm,
 /turf/simulated/floor,
 /area/awaymission/spacebattle/cruiser)
@@ -499,7 +499,7 @@
 /turf/simulated/floor,
 /area/awaymission/spacebattle/cruiser)
 "cS" = (
-/obj/item/stack/material/steel/full_stack,
+/obj/fiftyspawner/steel,
 /turf/simulated/floor,
 /area/awaymission/spacebattle/cruiser)
 "cT" = (
diff --git a/maps/away_missions/archive/stationCollision.dmm b/maps/away_missions/archive/stationCollision.dmm
index 91ab5b9d5263..b7cec5d39d3a 100644
--- a/maps/away_missions/archive/stationCollision.dmm
+++ b/maps/away_missions/archive/stationCollision.dmm
@@ -72,8 +72,8 @@
 	dir = 8
 	},
 /obj/structure/table/standard,
-/obj/item/stack/material/steel/full_stack,
-/obj/item/stack/material/steel/full_stack,
+/obj/fiftyspawner/steel,
+/obj/fiftyspawner/steel,
 /obj/fiftyspawner/glass,
 /obj/fiftyspawner/plasteel,
 /turf/simulated/floor/airless,
diff --git a/maps/endeavour/levels/deck1.dmm b/maps/endeavour/levels/deck1.dmm
index f2923ec20da0..77198e76b44a 100644
--- a/maps/endeavour/levels/deck1.dmm
+++ b/maps/endeavour/levels/deck1.dmm
@@ -41,13 +41,17 @@
 /turf/simulated/floor/plating,
 /area/endeavour/hallway/d1fwdmaint)
 "abZ" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/disposalpipe/segment,
 /obj/structure/bed/chair/comfy/brown,
 /obj/structure/cable/green{
 	icon_state = "4-8"
 	},
+/obj/structure/disposalpipe/segment{
+	dir = 1;
+	icon_state = "pipe-c"
+	},
+/obj/effect/floor_decal/spline/fancy/wood{
+	dir = 5
+	},
 /turf/simulated/floor/wood,
 /area/library)
 "acr" = (
@@ -85,6 +89,7 @@
 /area/rnd/test_area)
 "aeg" = (
 /obj/structure/table/bench/wooden,
+/obj/machinery/air_alarm/east_mount,
 /turf/simulated/floor/tiled/dark,
 /area/chapel/main)
 "aej" = (
@@ -358,11 +363,16 @@
 /turf/simulated/wall/prepainted,
 /area/endeavour/hallway/d1fwdmaint)
 "aqI" = (
-/obj/effect/floor_decal/techfloor,
-/obj/effect/floor_decal/corner/red/border,
-/obj/landmark/spawnpoint/latejoin/station/arrivals_shuttle,
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/endeavour/hallway/d1afthall)
+/obj/structure/window/basic{
+	dir = 1
+	},
+/obj/effect/floor_decal/industrial/outline/blue,
+/obj/structure/closet/secure_closet/personal,
+/obj/machinery/light{
+	dir = 4
+	},
+/turf/simulated/floor/holofloor/tiled/dark,
+/area/crew_quarters/pool/changing_room)
 "aqP" = (
 /obj/structure/table/reinforced,
 /obj/fiftyspawner/glass,
@@ -376,6 +386,13 @@
 	},
 /turf/simulated/floor/tiled/old_tile/green,
 /area/shuttle/civvie/general)
+"arx" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 10
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/turf/simulated/floor/tiled/freezer,
+/area/crew_quarters/pool)
 "arI" = (
 /obj/effect/floor_decal/techfloor/orange{
 	dir = 10
@@ -603,7 +620,7 @@
 	name = "Chapel"
 	},
 /obj/structure/curtain/black,
-/turf/simulated/floor/carpet/sblucarpet,
+/turf/simulated/floor/carpet/bcarpet,
 /area/chapel/main)
 "aBr" = (
 /obj/structure/cable/orange{
@@ -612,24 +629,11 @@
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d1afthall)
 "aBC" = (
-/obj/effect/floor_decal/borderfloorblack{
-	dir = 8
-	},
-/obj/effect/floor_decal/corner/navblue/border{
-	dir = 8
-	},
-/obj/effect/floor_decal/borderfloorblack/corner2{
-	dir = 8
-	},
-/obj/effect/floor_decal/corner/navblue/bordercorner2{
-	dir = 8
-	},
-/obj/structure/sign/warning/evac{
-	pixel_x = -32
+/obj/machinery/light{
+	dir = 4
 	},
-/obj/structure/disposalpipe/segment,
-/turf/simulated/floor/tiled/steel,
-/area/endeavour/hallway/d1afthall)
+/turf/simulated/floor/tiled/freezer,
+/area/crew_quarters/pool)
 "aCq" = (
 /obj/structure/sign/warning/bomb_range{
 	name = "\improper LIVE ORDINANCE";
@@ -807,7 +811,7 @@
 	dir = 8
 	},
 /turf/simulated/floor/tiled/steel,
-/area/endeavour/hallway/d1starboardamidhall)
+/area/endeavour/hallway/d1starboardhall)
 "aGH" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -820,29 +824,13 @@
 /turf/simulated/wall/r_wall/prepainted/exploration,
 /area/exploration/courser_dock)
 "aGL" = (
-/obj/machinery/camera/network/exploration{
-	dir = 4
-	},
 /obj/effect/floor_decal/borderfloor{
-	dir = 9
+	dir = 1
 	},
 /obj/effect/floor_decal/corner/blue/border{
-	dir = 9
-	},
-/obj/effect/floor_decal/industrial/outline/blue,
-/obj/structure/window/reinforced{
 	dir = 1
 	},
-/obj/structure/closet/secure_closet/sar{
-	req_access = list(5);
-	req_one_access = list(5)
-	},
-/obj/item/storage/box/pillbottles,
-/obj/item/storage/box/syringes,
-/obj/item/tank/jetpack/oxygen,
-/obj/item/storage/backpack/parachute,
-/obj/item/clothing/accessory/permit/gun/planetside,
-/turf/simulated/floor/tiled/monotile,
+/turf/simulated/floor/tiled/white,
 /area/exploration/medical)
 "aHc" = (
 /obj/structure/bed/chair,
@@ -895,12 +883,17 @@
 	pixel_x = -1
 	},
 /obj/structure/curtain/open/shower,
+/obj/effect/floor_decal/steeldecal/steel_decals10{
+	dir = 6
+	},
+/obj/effect/floor_decal/steeldecal/steel_decals10{
+	dir = 5
+	},
 /turf/simulated/floor/tiled,
 /area/exploration/showers)
 "aIl" = (
 /obj/machinery/light{
-	dir = 4;
-	use_power = 0
+	dir = 4
 	},
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/hallway/secondary/docking_hallway)
@@ -1181,6 +1174,9 @@
 	name = "light switch ";
 	pixel_y = 26
 	},
+/obj/structure/disposalpipe/segment{
+	dir = 8
+	},
 /turf/simulated/floor/tiled/dark,
 /area/chapel/main)
 "aSm" = (
@@ -1207,6 +1203,12 @@
 	},
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d1portforhall)
+"aSH" = (
+/obj/machinery/atmospherics/component/unary/vent_pump/on{
+	dir = 1
+	},
+/turf/simulated/floor/tiled/freezer,
+/area/crew_quarters/pool/changing_room)
 "aUt" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
@@ -1250,13 +1252,36 @@
 	},
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d1portforhall)
+"aVc" = (
+/obj/machinery/camera/network/exploration{
+	dir = 4
+	},
+/obj/structure/closet/secure_closet/sar{
+	req_access = list(5);
+	req_one_access = list(5)
+	},
+/obj/item/storage/box/pillbottles,
+/obj/item/storage/box/syringes,
+/obj/item/tank/jetpack/oxygen,
+/obj/item/storage/backpack/parachute,
+/obj/item/clothing/accessory/permit/gun/planetside,
+/obj/effect/floor_decal/borderfloor{
+	dir = 9
+	},
+/obj/effect/floor_decal/corner/blue/border{
+	dir = 9
+	},
+/obj/effect/floor_decal/industrial/outline/blue,
+/turf/simulated/floor/tiled/monotile,
+/area/exploration/medical)
 "aVu" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/structure/bookcase{
 	name = "bookcase (Non-Fiction)"
 	},
 /obj/item/book/custom_library/nonfiction,
+/obj/effect/floor_decal/spline/fancy/wood{
+	dir = 8
+	},
 /turf/simulated/floor/wood,
 /area/library)
 "aVF" = (
@@ -1297,11 +1322,12 @@
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d1starboardforhall)
 "aWP" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+/obj/effect/floor_decal/spline/fancy/wood{
 	dir = 10
 	},
-/turf/simulated/floor/tiled/freezer,
-/area/crew_quarters/pool)
+/obj/structure/flora/pottedplant/orientaltree,
+/turf/simulated/floor/carpet/bcarpet,
+/area/tether/station/burial)
 "aWX" = (
 /obj/effect/floor_decal/chapel{
 	dir = 4
@@ -1315,6 +1341,9 @@
 /obj/structure/cable/green{
 	icon_state = "1-8"
 	},
+/obj/structure/cable/green{
+	icon_state = "1-4"
+	},
 /turf/simulated/floor/tiled/dark,
 /area/chapel/main)
 "aXa" = (
@@ -1364,8 +1393,7 @@
 "aYh" = (
 /obj/machinery/shipsensors,
 /obj/machinery/light{
-	dir = 8;
-	pixel_x = -10
+	dir = 8
 	},
 /turf/simulated/floor/plating,
 /area/shuttle/courser/general)
@@ -1588,6 +1616,11 @@
 /obj/effect/floor_decal/corner/mauve/border,
 /turf/simulated/floor/tiled,
 /area/endeavour/exploration/hallway_fore)
+"bha" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/turf/simulated/floor/tiled/steel,
+/area/endeavour/hallway/d1starboardhall)
 "bhz" = (
 /obj/machinery/atmospherics/component/unary/vent_scrubber/on{
 	dir = 8
@@ -1677,9 +1710,6 @@
 /obj/effect/floor_decal/borderfloor{
 	dir = 1
 	},
-/obj/effect/floor_decal/corner/blue/border{
-	dir = 1
-	},
 /obj/machinery/suit_cycler/medical,
 /obj/effect/floor_decal/steeldecal/steel_decals10{
 	dir = 9
@@ -1705,15 +1735,8 @@
 /turf/simulated/wall/r_wall/prepainted/exploration,
 /area/shuttle/excursion/cockpit)
 "bnw" = (
-/obj/machinery/camera/network/civilian{
-	dir = 1
-	},
-/obj/structure/bed/chair/comfy/brown{
-	dir = 1
-	},
-/obj/machinery/computer/ship/navigation/telescreen{
-	pixel_y = -37
-	},
+/obj/structure/table/woodentable,
+/obj/item/flashlight/lamp/green/on,
 /turf/simulated/floor/carpet/bcarpet,
 /area/library)
 "bnJ" = (
@@ -1835,6 +1858,11 @@
 	},
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d1portamidhall)
+"bwa" = (
+/obj/structure/table/woodentable,
+/obj/item/flame/candle/candelabra/everburn,
+/turf/simulated/floor/tiled/dark,
+/area/tether/station/burial)
 "bwl" = (
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply{
 	dir = 1
@@ -2008,6 +2036,14 @@
 /obj/machinery/light,
 /turf/simulated/floor/tiled,
 /area/endeavour/exploration/hallway_aft)
+"bCN" = (
+/obj/structure/table/standard,
+/obj/machinery/power/apc/north_mount,
+/obj/structure/cable/green{
+	icon_state = "0-8"
+	},
+/turf/simulated/floor/tiled/freezer,
+/area/crew_quarters/pool/changing_room)
 "bEg" = (
 /obj/structure/table/woodentable,
 /obj/item/flashlight/lamp/green,
@@ -2059,7 +2095,7 @@
 /turf/simulated/floor/carpet/bcarpet,
 /area/crew_quarters/captain)
 "bHg" = (
-/obj/machinery/vending/fitness,
+/obj/machinery/gear_painter,
 /turf/simulated/floor/tiled,
 /area/maintenance/tool_storage)
 "bHC" = (
@@ -2111,7 +2147,7 @@
 /obj/machinery/atmospherics/component/unary/vent_scrubber/on{
 	dir = 1
 	},
-/turf/simulated/floor/carpet/bcarpet,
+/turf/simulated/floor/wood,
 /area/library)
 "bIp" = (
 /obj/structure/bed/chair/comfy/black{
@@ -2141,7 +2177,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/tiled/steel,
-/area/endeavour/hallway/d1starboardamidhall)
+/area/endeavour/hallway/d1starboardhall)
 "bIF" = (
 /obj/machinery/air_alarm{
 	dir = 4;
@@ -2155,22 +2191,11 @@
 	},
 /area/hallway/secondary/docking_hallway2)
 "bJN" = (
-/obj/item/radio/intercom{
-	dir = 1;
-	name = "Station Intercom (General)";
-	pixel_y = 26
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+/obj/machinery/atmospherics/component/unary/vent_pump/on{
 	dir = 4
 	},
-/obj/structure/cable/green{
-	icon_state = "4-8"
-	},
-/obj/machinery/light{
-	dir = 1
-	},
-/turf/simulated/floor/tiled/freezer,
-/area/crew_quarters/pool)
+/turf/simulated/floor/wood,
+/area/library)
 "bKU" = (
 /obj/structure/cable/green{
 	icon_state = "1-2"
@@ -2221,12 +2246,13 @@
 /turf/simulated/wall/prepainted/exploration,
 /area/exploration)
 "bMt" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/structure/bookcase{
 	name = "bookcase (Religious)"
 	},
 /obj/item/book/custom_library/religious,
+/obj/effect/floor_decal/spline/fancy/wood{
+	dir = 8
+	},
 /turf/simulated/floor/wood,
 /area/library)
 "bNm" = (
@@ -2290,6 +2316,12 @@
 	},
 /turf/simulated/floor/carpet/bcarpet,
 /area/crew_quarters/lounge)
+"bPE" = (
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d1aftmaint)
 "bPG" = (
 /obj/structure/cable/green{
 	icon_state = "2-8"
@@ -2307,12 +2339,13 @@
 /turf/simulated/floor/wood,
 /area/endeavour/surfacebase/sauna)
 "bPV" = (
-/obj/machinery/light/small{
+/obj/effect/floor_decal/spline/fancy/wood{
 	dir = 8
 	},
-/obj/effect/floor_decal/rust,
-/turf/simulated/floor/plating,
-/area/maintenance/chapel)
+/obj/structure/table/woodentable,
+/obj/item/flame/candle/candelabra/everburn,
+/turf/simulated/floor/carpet/bcarpet,
+/area/tether/station/burial)
 "bQx" = (
 /obj/machinery/door/firedoor,
 /turf/simulated/floor/tiled,
@@ -2345,19 +2378,16 @@
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d1portforhall)
 "bSd" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 10
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 6
-	},
 /obj/machinery/light/small{
 	dir = 1
 	},
 /obj/structure/cable/green{
 	icon_state = "4-8"
 	},
-/turf/simulated/floor/carpet/bcarpet,
+/obj/effect/floor_decal/spline/fancy/wood{
+	dir = 8
+	},
+/turf/simulated/floor/wood,
 /area/library)
 "bSl" = (
 /obj/machinery/recharger/wallcharger{
@@ -2535,22 +2565,9 @@
 /turf/simulated/floor/carpet/arcadecarpet,
 /area/endeavour/hallway/d1aftmaint)
 "cdv" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/machinery/door/firedoor{
-	dir = 1
-	},
-/obj/structure/disposalpipe/segment{
-	dir = 4
-	},
-/obj/machinery/door/airlock/glass,
+/obj/effect/floor_decal/borderfloorblack,
+/obj/effect/floor_decal/corner/navgold/border,
+/obj/machinery/computer/timeclock/premade/south,
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d1starboardafthall)
 "cdx" = (
@@ -2573,8 +2590,7 @@
 	},
 /obj/machinery/door/firedoor,
 /obj/machinery/light{
-	dir = 4;
-	use_power = 0
+	dir = 4
 	},
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d1afthall)
@@ -2668,6 +2684,15 @@
 	},
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d1starboardafthall)
+"chY" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 10
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 10
+	},
+/turf/simulated/floor/tiled/steel,
+/area/endeavour/hallway/d1starboardhall)
 "cib" = (
 /obj/machinery/door/airlock{
 	name = "Public Heated Pool"
@@ -2727,13 +2752,9 @@
 /turf/simulated/floor/plating,
 /area/maintenance/chapel)
 "ckz" = (
-/obj/machinery/power/apc/north_mount,
-/obj/structure/cable/green{
-	icon_state = "0-2"
-	},
 /obj/effect/floor_decal/rust,
 /turf/simulated/floor/plating,
-/area/endeavour/hallway/d1aftmaint)
+/area/maintenance/asmaint)
 "clz" = (
 /obj/machinery/light/small{
 	dir = 1
@@ -2799,6 +2820,16 @@
 	},
 /turf/simulated/floor/carpet/purcarpet,
 /area/crew_quarters/coffee_shop)
+"cnZ" = (
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/maintenance/common,
+/obj/structure/catwalk,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/turf/simulated/floor/plating,
+/area/tether/station/burial)
 "coH" = (
 /obj/effect/floor_decal/corner_techfloor_grid{
 	dir = 5
@@ -2881,6 +2912,20 @@
 	},
 /turf/simulated/wall/r_wall/prepainted/civilian,
 /area/shuttle/civvie/general)
+"csD" = (
+/obj/machinery/door/window{
+	dir = 8;
+	name = "Mass Driver";
+	req_access = list(22)
+	},
+/obj/machinery/mass_driver{
+	id = "chapelgun"
+	},
+/obj/effect/floor_decal/industrial/warning{
+	dir = 8
+	},
+/turf/simulated/floor/plating,
+/area/tether/station/burial)
 "ctl" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
@@ -2940,11 +2985,11 @@
 /turf/simulated/floor/tiled/dark,
 /area/bridge)
 "cvv" = (
-/obj/machinery/door/firedoor,
 /obj/map_helper/access_helper/airlock/station/maintenance,
 /obj/machinery/door/airlock/maintenance/engi{
 	req_one_access = null
 	},
+/obj/machinery/door/firedoor,
 /turf/simulated/floor/plating,
 /area/maintenance/substation/command)
 "cvx" = (
@@ -3048,6 +3093,13 @@
 	},
 /turf/simulated/floor/tiled,
 /area/exploration)
+"cyC" = (
+/obj/machinery/camera/network/civilian{
+	dir = 4
+	},
+/obj/structure/bed/padded,
+/turf/simulated/floor/tiled/freezer,
+/area/crew_quarters/pool)
 "czv" = (
 /obj/machinery/camera/network/exploration{
 	dir = 1
@@ -3095,6 +3147,25 @@
 	},
 /turf/simulated/floor/wood,
 /area/bridge/meeting_room)
+"cAG" = (
+/obj/effect/floor_decal/borderfloorblack{
+	dir = 8
+	},
+/obj/effect/floor_decal/corner/navblue/border{
+	dir = 8
+	},
+/obj/structure/disposalpipe/segment,
+/obj/structure/sign/warning/evac{
+	pixel_x = -32
+	},
+/obj/effect/floor_decal/borderfloorblack/corner2{
+	dir = 8
+	},
+/obj/effect/floor_decal/corner/navblue/bordercorner2{
+	dir = 8
+	},
+/turf/simulated/floor/tiled/steel,
+/area/endeavour/hallway/d1afthall)
 "cBe" = (
 /obj/effect/floor_decal/borderfloorblack{
 	dir = 8
@@ -3375,9 +3446,16 @@
 /turf/simulated/floor/carpet/tealcarpet,
 /area/shuttle/civvie/general)
 "cLM" = (
-/obj/structure/bed/chair/sofa/black/left,
-/turf/simulated/floor/wood,
-/area/maintenance/chapel)
+/obj/effect/floor_decal/borderfloorblack,
+/obj/effect/floor_decal/corner/navgold/border,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/steel,
+/area/endeavour/hallway/d1starboardamidhall)
 "cLR" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 9
@@ -3444,9 +3522,9 @@
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d1portforhall)
 "cOc" = (
-/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/maintenance/chapel)
+/obj/structure/bed/chair,
+/turf/simulated/floor/carpet/bcarpet,
+/area/tether/station/burial)
 "cOe" = (
 /obj/effect/floor_decal/borderfloorblack,
 /obj/effect/floor_decal/corner/navgold/border,
@@ -3500,9 +3578,6 @@
 /turf/simulated/floor/wood,
 /area/crew_quarters/coffee_shop)
 "cPS" = (
-/obj/structure/cable/green{
-	icon_state = "1-4"
-	},
 /obj/structure/disposalpipe/segment,
 /obj/structure/cable/green{
 	icon_state = "1-2"
@@ -3549,23 +3624,14 @@
 /turf/simulated/floor/carpet/purcarpet,
 /area/exploration/meeting)
 "cRj" = (
-/obj/structure/cable/green{
-	icon_state = "1-2"
-	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
-	dir = 4
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 8
 	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
-/obj/structure/cable/green{
-	icon_state = "2-8"
-	},
-/obj/structure/cable/green{
-	icon_state = "1-8"
-	},
-/turf/simulated/floor/tiled/white,
-/area/crew_quarters/pool/changing_room)
+/turf/simulated/floor/tiled/freezer,
+/area/crew_quarters/pool)
 "cRT" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -3594,23 +3660,15 @@
 "cSU" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/light{
-	dir = 8
-	},
-/obj/structure/cable/green{
-	icon_state = "1-2"
-	},
-/turf/simulated/floor/tiled/white,
-/area/crew_quarters/pool/changing_room)
+/obj/structure/catwalk,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d1fwdmaint)
 "cSZ" = (
-/obj/machinery/power/apc/north_mount,
 /obj/structure/cable/green{
-	icon_state = "0-2"
+	icon_state = "4-8"
 	},
-/obj/structure/table/standard,
-/obj/item/inflatable_duck,
-/turf/simulated/floor/tiled/white,
-/area/crew_quarters/pool/changing_room)
+/turf/simulated/floor/tiled/steel,
+/area/endeavour/hallway/d1starboardamidhall)
 "cTj" = (
 /obj/structure/catwalk,
 /obj/structure/cable/green{
@@ -3618,6 +3676,16 @@
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/chapel)
+"cTq" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 10
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 10
+	},
+/obj/structure/catwalk,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d1fwdmaint)
 "cTV" = (
 /obj/effect/floor_decal/grass_edge,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -3696,6 +3764,17 @@
 	},
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d1starboardafthall)
+"cVz" = (
+/obj/machinery/door/airlock/maintenance/common,
+/obj/machinery/door/firedoor{
+	dir = 1
+	},
+/obj/structure/catwalk,
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
+/turf/simulated/floor/plating,
+/area/maintenance/chapel)
 "cVD" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -3735,7 +3814,7 @@
 /obj/structure/cable/green{
 	icon_state = "1-2"
 	},
-/turf/simulated/floor/tiled/steel,
+/turf/simulated/floor/carpet/bcarpet,
 /area/library)
 "cXD" = (
 /obj/machinery/atmospherics/component/unary/vent_scrubber/on{
@@ -3819,6 +3898,13 @@
 /obj/structure/flora/ausbushes/brflowers,
 /turf/simulated/floor/grass,
 /area/endeavour/exploration/hallway_aft)
+"cZw" = (
+/obj/machinery/portable_atmospherics/powered/scrubber,
+/obj/machinery/light/small{
+	dir = 8
+	},
+/turf/simulated/floor/plating,
+/area/maintenance/library)
 "cZC" = (
 /obj/structure/table/reinforced,
 /turf/simulated/floor/carpet/purcarpet,
@@ -3850,7 +3936,7 @@
 	dir = 5
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 5
+	dir = 4
 	},
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d1starboardafthall)
@@ -4016,6 +4102,10 @@
 	},
 /turf/simulated/wall/prepainted,
 /area/endeavour/hallway/d1fwdmaint)
+"dkl" = (
+/obj/machinery/air_alarm/north_mount,
+/turf/simulated/floor/tiled/dark,
+/area/tether/station/burial)
 "dkm" = (
 /obj/structure/table/rack/shelf/steel,
 /obj/item/stack/flag/red,
@@ -4063,11 +4153,15 @@
 /turf/simulated/floor/tiled/dark,
 /area/crew_quarters/heads/hop)
 "dmy" = (
-/obj/machinery/camera/network/civilian{
-	dir = 4
+/obj/structure/table/woodentable,
+/obj/effect/floor_decal/spline/fancy/wood/corner{
+	dir = 8
 	},
-/turf/simulated/floor/tiled/freezer,
-/area/crew_quarters/pool)
+/obj/item/flame/candle/candelabra/everburn{
+	pixel_y = 8
+	},
+/turf/simulated/floor/carpet/bcarpet,
+/area/tether/station/burial)
 "dmO" = (
 /obj/structure/flora/ausbushes/brflowers,
 /obj/effect/floor_decal/grass_edge,
@@ -4096,6 +4190,9 @@
 /obj/machinery/fire_alarm/east_mount,
 /turf/simulated/floor/tiled/steel,
 /area/station/stairs_one)
+"dor" = (
+/turf/simulated/wall/prepainted/civilian,
+/area/maintenance/substation/exploration)
 "dos" = (
 /obj/machinery/chem_master/condimaster,
 /obj/effect/floor_decal/corner/black{
@@ -4329,6 +4426,7 @@
 /obj/structure/cable/green{
 	icon_state = "2-8"
 	},
+/obj/structure/disposalpipe/segment,
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d1starboardamidhall)
 "dyH" = (
@@ -4365,6 +4463,10 @@
 /turf/simulated/floor/tiled,
 /area/exploration/pilot_prep)
 "dAK" = (
+/obj/structure/disposalpipe/segment,
+/obj/structure/sign/warning/evac{
+	pixel_x = -32
+	},
 /obj/effect/floor_decal/borderfloorblack{
 	dir = 8
 	},
@@ -4377,7 +4479,6 @@
 /obj/effect/floor_decal/corner/navblue/bordercorner2{
 	dir = 10
 	},
-/obj/structure/disposalpipe/segment,
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d1afthall)
 "dAR" = (
@@ -4421,8 +4522,7 @@
 	dir = 4
 	},
 /obj/machinery/light{
-	dir = 4;
-	use_power = 0
+	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -4503,6 +4603,18 @@
 /obj/effect/floor_decal/industrial/halfstair,
 /turf/simulated/floor/tiled/dark,
 /area/gateway)
+"dFa" = (
+/obj/machinery/atmospherics/component/unary/vent_pump/on{
+	dir = 8
+	},
+/obj/structure/cable/green{
+	icon_state = "1-8"
+	},
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
+/turf/simulated/floor/tiled/freezer,
+/area/crew_quarters/pool)
 "dFj" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 10
@@ -4510,6 +4622,9 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 10
 	},
+/obj/structure/disposalpipe/segment{
+	dir = 8
+	},
 /turf/simulated/floor/tiled/dark,
 /area/chapel/main)
 "dFF" = (
@@ -4566,13 +4681,13 @@
 /turf/simulated/floor/wood,
 /area/vacant/vacant_bar)
 "dIc" = (
-/obj/machinery/disposal,
-/turf/simulated/floor/tiled,
-/area/endeavour/surfacebase/tram)
+/obj/effect/floor_decal/techfloor,
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/endeavour/hallway/d1afthall)
 "dIm" = (
 /obj/structure/loot_pile/maint/trash,
 /turf/simulated/floor/plating,
-/area/maintenance/chapel)
+/area/maintenance/asmaint)
 "dIw" = (
 /turf/simulated/floor/water/deep/pool,
 /area/crew_quarters/pool)
@@ -4630,7 +4745,7 @@
 	dir = 5
 	},
 /turf/simulated/floor/tiled/steel,
-/area/endeavour/hallway/d1starboardamidhall)
+/area/endeavour/hallway/d1starboardhall)
 "dJV" = (
 /obj/effect/floor_decal/corner/yellow{
 	dir = 5
@@ -4641,6 +4756,7 @@
 /obj/structure/cable/green{
 	icon_state = "1-2"
 	},
+/obj/structure/disposalpipe/segment,
 /turf/simulated/floor/tiled,
 /area/chapel/main)
 "dKn" = (
@@ -4700,8 +4816,9 @@
 /obj/machinery/door/firedoor{
 	dir = 8
 	},
+/obj/machinery/door/airlock/glass,
 /turf/simulated/floor/tiled/steel,
-/area/endeavour/hallway/d1starboardamidhall)
+/area/endeavour/hallway/d1starboardhall)
 "dMB" = (
 /obj/structure/toilet{
 	dir = 4
@@ -4718,6 +4835,12 @@
 /obj/effect/floor_decal/corner/navgold/border,
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d1afthall)
+"dNy" = (
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
+/turf/simulated/floor/tiled/dark,
+/area/chapel/main)
 "dNZ" = (
 /obj/machinery/light/small,
 /turf/simulated/floor/plating,
@@ -4777,6 +4900,15 @@
 /obj/structure/ship_munition/disperser_charge/emp,
 /turf/simulated/floor/tiled/dark,
 /area/exploration/courser_dock)
+"dOJ" = (
+/obj/machinery/light{
+	dir = 8
+	},
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
+/turf/simulated/floor/tiled/dark,
+/area/tether/station/burial)
 "dOW" = (
 /obj/machinery/atmospherics/component/unary/vent_scrubber/on{
 	dir = 4
@@ -4999,10 +5131,6 @@
 /obj/effect/floor_decal/corner/mauve/border,
 /turf/simulated/floor/tiled,
 /area/endeavour/exploration/hallway_aft)
-"dYN" = (
-/obj/structure/sign/deck/first,
-/turf/simulated/wall/r_wall/prepainted/civilian,
-/area/station/stairs_one)
 "dYO" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -5236,12 +5364,10 @@
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/hallway/secondary/docking_hallway)
 "ehl" = (
-/obj/structure/catwalk,
-/obj/structure/cable/green{
-	icon_state = "2-8"
-	},
-/turf/simulated/floor/plating,
-/area/endeavour/hallway/d1aftmaint)
+/obj/effect/floor_decal/borderfloorblack,
+/obj/effect/floor_decal/corner/navgold/border,
+/turf/simulated/floor/tiled/steel,
+/area/endeavour/hallway/d1starboardhall)
 "ehq" = (
 /turf/simulated/floor/plating,
 /area/maintenance/station/exploration)
@@ -5473,7 +5599,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
-/turf/simulated/floor/tiled/steel,
+/turf/simulated/floor/carpet/bcarpet,
 /area/library)
 "ert" = (
 /turf/simulated/wall/r_wall/prepainted/civilian,
@@ -5498,6 +5624,14 @@
 	},
 /turf/simulated/floor/tiled,
 /area/chapel/main)
+"erZ" = (
+/obj/machinery/door/airlock/maintenance,
+/obj/machinery/door/firedoor/glass{
+	dir = 8
+	},
+/obj/structure/catwalk,
+/turf/simulated/floor/plating,
+/area/maintenance/library)
 "esl" = (
 /obj/structure/cable/green{
 	icon_state = "1-2"
@@ -5515,12 +5649,13 @@
 /turf/simulated/floor/tiled/old_tile/green,
 /area/shuttle/civvie/general)
 "esr" = (
-/obj/item/radio/intercom{
-	pixel_y = -24
+/obj/machinery/door/airlock/maintenance,
+/obj/machinery/door/firedoor/glass{
+	dir = 8
 	},
-/obj/effect/mist,
-/turf/simulated/floor/water/deep/pool,
-/area/endeavour/surfacebase/sauna)
+/obj/structure/catwalk,
+/turf/simulated/floor/plating,
+/area/library)
 "est" = (
 /obj/effect/floor_decal/borderfloorblack{
 	dir = 4
@@ -5533,8 +5668,7 @@
 	dir = 4
 	},
 /obj/machinery/light{
-	dir = 4;
-	use_power = 0
+	dir = 4
 	},
 /obj/structure/cable/green{
 	icon_state = "1-2"
@@ -5743,6 +5877,7 @@
 	icon_state = "4-8"
 	},
 /obj/spawner/window/reinforced/full,
+/obj/effect/paint/palebottlegreen,
 /turf/simulated/floor/plating,
 /area/maintenance/substation/exploration)
 "eAX" = (
@@ -5830,6 +5965,7 @@
 /obj/structure/cable/green{
 	icon_state = "1-2"
 	},
+/obj/structure/disposalpipe/segment,
 /turf/simulated/floor/tiled,
 /area/chapel/main)
 "eDR" = (
@@ -5975,11 +6111,14 @@
 /turf/simulated/wall/r_wall/prepainted/civilian,
 /area/shuttle/civvie/general)
 "eJs" = (
-/obj/machinery/status_display{
-	pixel_x = 32
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 9
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 9
 	},
 /turf/simulated/floor/tiled/dark,
-/area/chapel/main)
+/area/tether/station/burial)
 "eJW" = (
 /obj/machinery/bomb_tester,
 /obj/machinery/light,
@@ -6031,8 +6170,11 @@
 /area/endeavour/hallway/d1fwdmaint)
 "eNz" = (
 /obj/effect/floor_decal/techfloor,
-/obj/effect/floor_decal/corner/red/border,
-/obj/landmark/spawnpoint/overflow/station,
+/obj/landmark/spawnpoint/latejoin/station/arrivals_shuttle,
+/obj/machinery/computer/cryopod{
+	name = "asset retention console";
+	pixel_x = -32
+	},
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/endeavour/hallway/d1afthall)
 "eNB" = (
@@ -6061,8 +6203,8 @@
 /turf/simulated/floor/tiled/dark,
 /area/bridge)
 "eNY" = (
-/turf/simulated/floor/wood,
-/area/maintenance/chapel)
+/turf/simulated/wall/prepainted/civilian,
+/area/tether/station/burial)
 "eNZ" = (
 /obj/effect/floor_decal/borderfloorblack/corner{
 	dir = 1
@@ -6179,7 +6321,7 @@
 "eRi" = (
 /obj/random/cutout,
 /turf/simulated/floor/plating,
-/area/maintenance/chapel)
+/area/endeavour/hallway/d1fwdmaint)
 "eRC" = (
 /obj/structure/cable/green{
 	icon_state = "2-4"
@@ -6204,6 +6346,10 @@
 	},
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d1portamidhall)
+"eSM" = (
+/obj/machinery/floodlight,
+/turf/simulated/floor/plating,
+/area/maintenance/chapel)
 "eSO" = (
 /obj/machinery/computer/secure_data{
 	dir = 4
@@ -6224,15 +6370,16 @@
 /obj/structure/cable/green{
 	icon_state = "4-8"
 	},
-/obj/machinery/holoposter{
-	pixel_y = 32
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+/obj/machinery/door/firedoor{
 	dir = 1
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 10
 	},
+/obj/machinery/door/airlock/glass,
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d1starboardafthall)
 "eTc" = (
@@ -6264,6 +6411,7 @@
 /obj/structure/cable/green{
 	icon_state = "1-2"
 	},
+/obj/structure/disposalpipe/segment,
 /turf/simulated/floor/tiled,
 /area/chapel/main)
 "eTR" = (
@@ -6272,11 +6420,15 @@
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/exploration/excursion_dock)
 "eUo" = (
-/obj/structure/fireplace{
-	pixel_y = 23
+/obj/structure/table/woodentable,
+/obj/effect/floor_decal/spline/fancy/wood,
+/obj/structure/sign/goldenplaque{
+	desc = "This plaque is thankfully empty, but is dedicated to those that were killed in the line of duty protecting the NSV Endeavour, and Nanotrasen as a whole.";
+	name = "Memorial Plaque";
+	pixel_y = 32
 	},
-/turf/simulated/floor/plating,
-/area/maintenance/chapel)
+/turf/simulated/floor/carpet/bcarpet,
+/area/tether/station/burial)
 "eUz" = (
 /obj/structure/catwalk,
 /obj/structure/cable/orange{
@@ -6392,7 +6544,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/tiled/steel,
-/area/endeavour/hallway/d1starboardamidhall)
+/area/endeavour/hallway/d1starboardhall)
 "eWE" = (
 /obj/effect/floor_decal/industrial/warning,
 /obj/structure/fuel_port{
@@ -6482,6 +6634,13 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/tiled/dark,
 /area/maintenance/station/exploration)
+"faq" = (
+/obj/effect/floor_decal/spline/fancy/wood{
+	dir = 4
+	},
+/obj/machinery/holopad,
+/turf/simulated/floor/wood,
+/area/library)
 "fbe" = (
 /obj/structure/catwalk,
 /obj/machinery/light{
@@ -6567,7 +6726,7 @@
 /obj/structure/cable/green{
 	icon_state = "4-8"
 	},
-/turf/simulated/floor/carpet/sblucarpet,
+/turf/simulated/floor/carpet/bcarpet,
 /area/chapel/main)
 "fcG" = (
 /obj/effect/floor_decal/borderfloorblack,
@@ -6585,10 +6744,16 @@
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d1afthall)
 "fdP" = (
-/obj/effect/floor_decal/rust,
-/obj/machinery/portable_atmospherics/powered/scrubber,
-/turf/simulated/floor/plating,
-/area/maintenance/chapel)
+/obj/effect/floor_decal/borderfloorblack,
+/obj/effect/floor_decal/corner/navgold/border,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/steel,
+/area/endeavour/hallway/d1starboardhall)
 "fef" = (
 /obj/effect/floor_decal/borderfloorblack/corner{
 	dir = 8
@@ -6614,18 +6779,18 @@
 /turf/simulated/floor/tiled,
 /area/exploration/showers)
 "feB" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 10
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 10
-	},
 /obj/structure/bed/chair/comfy/brown{
 	dir = 4
 	},
 /obj/structure/cable/green{
 	icon_state = "4-8"
 	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+	dir = 4
+	},
 /turf/simulated/floor/wood,
 /area/library)
 "ffi" = (
@@ -6657,11 +6822,11 @@
 /turf/simulated/floor/plating,
 /area/exploration/pathfinder_office)
 "fge" = (
-/obj/structure/bed/chair/sofa/black/right{
-	dir = 1
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
 	},
-/turf/simulated/floor/wood,
-/area/maintenance/chapel)
+/turf/simulated/floor/tiled/dark,
+/area/tether/station/burial)
 "fgr" = (
 /obj/machinery/atmospherics/component/unary/vent_pump/on,
 /obj/structure/bed/chair/bay/comfy/black{
@@ -6757,8 +6922,8 @@
 /obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{
 	id = "chapel"
 	},
-/obj/structure/curtain/black,
 /obj/effect/paint/palebottlegreen,
+/obj/structure/curtain/black,
 /turf/simulated/floor/plating,
 /area/chapel/main)
 "fkF" = (
@@ -6795,7 +6960,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/tiled/steel,
-/area/endeavour/hallway/d1starboardamidhall)
+/area/endeavour/hallway/d1starboardhall)
 "flf" = (
 /obj/structure/cable/green{
 	icon_state = "4-8"
@@ -6846,14 +7011,11 @@
 /turf/simulated/floor/lino,
 /area/crew_quarters/coffee_shop)
 "fmb" = (
-/obj/effect/floor_decal/borderfloorblack{
-	dir = 1
-	},
-/obj/effect/floor_decal/corner/navgold/border{
-	dir = 1
+/obj/structure/disposalpipe/segment{
+	dir = 8
 	},
-/turf/simulated/floor/tiled,
-/area/hallway/secondary/docking_hallway)
+/turf/simulated/floor/tiled/dark,
+/area/chapel/main)
 "fmh" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply{
@@ -7064,16 +7226,25 @@
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d1portamidhall)
 "fsN" = (
-/obj/machinery/vending/coffee,
 /obj/machinery/light/small,
-/turf/simulated/floor/carpet/bcarpet,
+/turf/simulated/floor/wood,
 /area/library)
 "fsR" = (
 /obj/structure/disposalpipe/segment{
 	dir = 8
 	},
-/turf/simulated/floor/tiled,
-/area/hallway/secondary/docking_hallway)
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/structure/catwalk,
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d1aftmaint)
 "fsX" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 8
@@ -7164,6 +7335,13 @@
 	},
 /turf/simulated/open,
 /area/maintenance/substation/dock)
+"fuj" = (
+/obj/machinery/door/firedoor{
+	dir = 1
+	},
+/obj/machinery/door/airlock/maintenance/common,
+/turf/simulated/floor/plating,
+/area/maintenance/asmaint)
 "fuz" = (
 /obj/structure/cable/green{
 	icon_state = "4-8"
@@ -7297,8 +7475,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/light{
-	dir = 4;
-	use_power = 0
+	dir = 4
 	},
 /obj/structure/cable/green{
 	icon_state = "1-2"
@@ -7387,20 +7564,19 @@
 /turf/simulated/floor/tiled,
 /area/shuttle/excursion/general)
 "fDI" = (
+/obj/machinery/door/airlock/multi_tile/glass{
+	name = "Pool Room";
+	dir = 8
+	},
+/obj/machinery/door/firedoor/glass,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
+	dir = 8
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
-/obj/structure/disposalpipe/segment{
-	dir = 8
-	},
-/obj/structure/bed/chair/comfy/brown{
-	dir = 1
-	},
-/turf/simulated/floor/wood,
-/area/library)
+/turf/simulated/floor/tiled/freezer,
+/area/crew_quarters/pool)
 "fDJ" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -7580,13 +7756,11 @@
 /turf/simulated/floor/carpet/purcarpet,
 /area/crew_quarters/coffee_shop)
 "fLD" = (
-/obj/structure/closet/crate,
-/obj/item/stack/material/steel/full_stack,
-/obj/item/stack/material/steel/full_stack,
-/obj/fiftyspawner/glass,
-/obj/fiftyspawner/glass,
+/obj/machinery/light/small{
+	dir = 8
+	},
 /turf/simulated/floor/plating,
-/area/maintenance/chapel)
+/area/maintenance/library)
 "fLR" = (
 /obj/structure/cable/green{
 	icon_state = "4-8"
@@ -7724,19 +7898,12 @@
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d1afthall)
 "fOe" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 9
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 9
-	},
-/obj/structure/disposalpipe/segment{
-	dir = 8;
-	icon_state = "pipe-c"
-	},
 /obj/structure/bed/chair/comfy/brown{
 	dir = 1
 	},
+/obj/effect/floor_decal/spline/fancy/wood{
+	dir = 4
+	},
 /turf/simulated/floor/wood,
 /area/library)
 "fOo" = (
@@ -7892,8 +8059,7 @@
 	dir = 10
 	},
 /obj/machinery/light{
-	dir = 4;
-	use_power = 0
+	dir = 4
 	},
 /turf/simulated/floor/carpet,
 /area/crew_quarters/heads/hop)
@@ -7996,6 +8162,9 @@
 /obj/structure/cable/green{
 	icon_state = "4-8"
 	},
+/obj/structure/disposalpipe/segment{
+	dir = 8
+	},
 /turf/simulated/floor/carpet/bcarpet,
 /area/library)
 "fZu" = (
@@ -8007,6 +8176,11 @@
 "fZy" = (
 /turf/simulated/wall/prepainted/civilian,
 /area/crew_quarters/lounge/kitchen_freezer)
+"fZE" = (
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/obj/effect/paint/babyblue,
+/turf/simulated/floor/plating,
+/area/hallway/secondary/docking_hallway2)
 "fZY" = (
 /obj/machinery/door/firedoor{
 	dir = 8
@@ -8092,7 +8266,7 @@
 	icon_state = "1-2"
 	},
 /turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/library)
 "gcb" = (
 /obj/machinery/recharger/wallcharger{
 	pixel_x = -22
@@ -8112,6 +8286,15 @@
 	},
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/exploration/courser_dock)
+"gco" = (
+/obj/machinery/light{
+	dir = 8
+	},
+/obj/structure/cable/green{
+	icon_state = "1-4"
+	},
+/turf/simulated/floor/tiled/dark,
+/area/tether/station/burial)
 "gdd" = (
 /obj/effect/floor_decal/borderfloorblack{
 	dir = 8
@@ -8177,6 +8360,13 @@
 	},
 /turf/simulated/floor/tiled,
 /area/exploration/explorer_prep)
+"ggi" = (
+/obj/structure/table/woodentable,
+/obj/machinery/light{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/dark,
+/area/tether/station/burial)
 "ggp" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -8268,7 +8458,7 @@
 	dir = 8
 	},
 /turf/simulated/floor/tiled/steel,
-/area/endeavour/hallway/d1starboardamidhall)
+/area/endeavour/hallway/d1starboardhall)
 "gja" = (
 /obj/structure/table/reinforced,
 /obj/item/stamp/denied,
@@ -8624,7 +8814,7 @@
 "gvJ" = (
 /obj/structure/closet/emcloset,
 /turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/library)
 "gvL" = (
 /obj/structure/railing{
 	dir = 8
@@ -8718,8 +8908,6 @@
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d1portamidhall)
 "gBF" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/effect/floor_decal/steeldecal/steel_decals2{
 	dir = 8
 	},
@@ -8727,8 +8915,18 @@
 	dir = 8;
 	icon_state = "pipe-c"
 	},
-/turf/simulated/floor/tiled,
-/area/hallway/secondary/docking_hallway)
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 9
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 9
+	},
+/obj/structure/catwalk,
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d1aftmaint)
 "gBG" = (
 /obj/spawner/window/low_wall/reinforced/full/firelocks,
 /obj/effect/paint/violet,
@@ -8828,6 +9026,12 @@
 	},
 /turf/simulated/floor/lino,
 /area/chapel/office)
+"gEy" = (
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/maintenance/common,
+/obj/structure/catwalk,
+/turf/simulated/floor/plating,
+/area/tether/station/burial)
 "gED" = (
 /obj/machinery/door/airlock/maintenance,
 /obj/machinery/door/firedoor/glass{
@@ -8845,11 +9049,12 @@
 /turf/simulated/floor/tiled,
 /area/hallway/secondary/docking_hallway2)
 "gEQ" = (
+/obj/structure/catwalk,
 /obj/structure/cable/green{
-	icon_state = "1-4"
+	icon_state = "1-2"
 	},
 /turf/simulated/floor/plating,
-/area/endeavour/hallway/d1aftmaint)
+/area/maintenance/library)
 "gGl" = (
 /obj/machinery/power/terminal{
 	dir = 8
@@ -8896,6 +9101,15 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/station/stairs_one)
+"gIz" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+	dir = 1
+	},
+/turf/simulated/floor/tiled/freezer,
+/area/crew_quarters/pool/changing_room)
 "gIT" = (
 /obj/structure/window/reinforced,
 /turf/simulated/open,
@@ -9033,9 +9247,6 @@
 /turf/simulated/floor/reinforced/airless,
 /area/rnd/test_area)
 "gNs" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
@@ -9048,12 +9259,16 @@
 /obj/structure/cable/green{
 	icon_state = "1-2"
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 9
+	},
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d1starboardafthall)
 "gNY" = (
 /obj/machinery/sleeper{
 	dir = 8
 	},
+/obj/effect/floor_decal/industrial/outline,
 /turf/simulated/floor/tiled/white,
 /area/exploration/medical)
 "gOL" = (
@@ -9076,12 +9291,8 @@
 /turf/simulated/floor/tiled,
 /area/exploration/explorer_prep)
 "gOX" = (
-/obj/machinery/door/airlock/maintenance/common,
-/obj/machinery/door/firedoor{
-	dir = 1
-	},
-/turf/simulated/floor/plating,
-/area/hallway/secondary/docking_hallway)
+/turf/simulated/wall/prepainted,
+/area/maintenance/asmaint)
 "gPm" = (
 /obj/structure/disposalpipe/segment,
 /obj/effect/floor_decal/corner/black/full,
@@ -9237,19 +9448,17 @@
 /turf/simulated/floor/tiled/white,
 /area/crew_quarters/coffee_shop)
 "gWh" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/structure/cable/green{
-	icon_state = "4-8"
+/obj/structure/bed/chair,
+/obj/effect/floor_decal/spline/fancy/wood{
+	dir = 1
 	},
-/obj/effect/floor_decal/borderfloorblack,
-/obj/effect/floor_decal/corner/navgold/border,
-/turf/simulated/floor/tiled,
-/area/hallway/secondary/docking_hallway)
+/turf/simulated/floor/carpet/bcarpet,
+/area/tether/station/burial)
+"gWl" = (
+/obj/effect/floor_decal/techfloor,
+/obj/landmark/spawnpoint/overflow/station,
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/endeavour/hallway/d1afthall)
 "gWI" = (
 /obj/machinery/atmospherics/component/unary/heater{
 	dir = 1
@@ -9291,14 +9500,12 @@
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d1afthall)
 "gZb" = (
-/obj/structure/curtain/open/privacy,
-/obj/machinery/light_switch{
-	dir = 8;
-	pixel_x = -24;
-	pixel_y = 6
+/obj/machinery/door/firedoor{
+	dir = 8
 	},
-/turf/simulated/floor/tiled/white,
-/area/crew_quarters/pool/changing_room)
+/obj/machinery/door/airlock/glass,
+/turf/simulated/floor/tiled/steel,
+/area/endeavour/hallway/d1starboardhall)
 "gZf" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/vending/hydronutrients,
@@ -9445,7 +9652,7 @@
 	dir = 8;
 	id = "cap_office";
 	layer = 3.1;
-	name = "Colony Directo's Shutters"
+	name = "Colony Director's Shutters"
 	},
 /obj/machinery/door/blast/regular{
 	density = 0;
@@ -9510,12 +9717,8 @@
 /turf/simulated/floor/plating,
 /area/maintenance/substation/exploration)
 "hfR" = (
-/obj/machinery/light{
-	dir = 8
-	},
-/obj/effect/floor_decal/rust,
 /turf/simulated/floor/plating,
-/area/endeavour/hallway/d1aftmaint)
+/area/maintenance/library)
 "hfY" = (
 /turf/simulated/floor/airless/ceiling,
 /area/space)
@@ -9593,8 +9796,12 @@
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d1starboardafthall)
 "hik" = (
-/turf/simulated/floor/tiled/white,
-/area/crew_quarters/pool/changing_room)
+/obj/machinery/door/airlock/maintenance/common,
+/obj/machinery/door/firedoor{
+	dir = 1
+	},
+/turf/simulated/floor/plating,
+/area/maintenance/substation/dock)
 "hja" = (
 /obj/structure/closet/secure_closet/explorer,
 /obj/effect/floor_decal/industrial/outline/yellow,
@@ -9628,7 +9835,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/tiled/steel,
-/area/endeavour/hallway/d1starboardamidhall)
+/area/endeavour/hallway/d1starboardhall)
 "hjz" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/tiled,
@@ -9719,11 +9926,6 @@
 /turf/simulated/floor/tiled/dark,
 /area/hallway/secondary/docking_hallway2)
 "hpw" = (
-/obj/machinery/air_alarm{
-	frequency = 1441;
-	pixel_y = 22;
-	target_temperature = 275.15
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 10
 	},
@@ -9792,15 +9994,12 @@
 /turf/simulated/floor/tiled/dark,
 /area/crew_quarters/heads/hop)
 "hrr" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 6
-	},
-/obj/structure/cable/green{
-	icon_state = "2-4"
+/obj/machinery/light/small{
+	dir = 4
 	},
-/obj/machinery/atmospherics/component/unary/vent_pump/on,
-/turf/simulated/floor/tiled/white,
-/area/crew_quarters/pool/changing_room)
+/obj/structure/table/rack,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d1aftmaint)
 "hrs" = (
 /obj/machinery/shower{
 	pixel_y = 8
@@ -9820,12 +10019,13 @@
 /turf/simulated/floor/carpet/tealcarpet,
 /area/shuttle/civvie/general)
 "hrC" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 5
+/obj/structure/closet/firecloset/full,
+/obj/effect/floor_decal/spline/plain{
+	dir = 1
 	},
-/obj/machinery/light,
-/turf/simulated/floor/tiled/freezer,
-/area/crew_quarters/pool)
+/obj/effect/floor_decal/industrial/outline/red,
+/turf/simulated/floor/holofloor/tiled/dark,
+/area/endeavour/hallway/d1starboardhall)
 "hrH" = (
 /obj/structure/bed/chair/sofa/right{
 	dir = 4
@@ -9870,7 +10070,8 @@
 /obj/machinery/light/small{
 	dir = 4
 	},
-/turf/simulated/floor/carpet/bcarpet,
+/obj/effect/floor_decal/spline/fancy/wood,
+/turf/simulated/floor/wood,
 /area/library)
 "hub" = (
 /turf/simulated/wall/r_wall/prepainted/science,
@@ -9938,7 +10139,6 @@
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/exploration/excursion_dock)
 "hxi" = (
-/obj/effect/floor_decal/corner/red/border,
 /obj/landmark/spawnpoint/overflow/station,
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/endeavour/hallway/d1afthall)
@@ -9949,10 +10149,16 @@
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/substation/dock)
+"hyg" = (
+/obj/structure/cable/green{
+	icon_state = "1-8"
+	},
+/turf/simulated/floor/tiled/steel,
+/area/endeavour/hallway/d1starboardhall)
 "hyL" = (
 /obj/structure/closet/crate,
-/obj/item/stack/material/steel/full_stack,
-/obj/item/stack/material/steel/full_stack,
+/obj/fiftyspawner/steel,
+/obj/fiftyspawner/steel,
 /obj/fiftyspawner/glass,
 /obj/fiftyspawner/glass,
 /turf/simulated/floor/plating,
@@ -10116,6 +10322,13 @@
 /obj/structure/undies_wardrobe,
 /turf/simulated/floor/carpet/gaycarpet,
 /area/crew_quarters/clownoffice)
+"hIQ" = (
+/obj/machinery/power/apc/north_mount,
+/obj/structure/cable/green{
+	icon_state = "0-2"
+	},
+/turf/simulated/floor/plating,
+/area/maintenance/asmaint)
 "hIR" = (
 /turf/simulated/floor/tiled/monodark,
 /area/bridge)
@@ -10197,7 +10410,7 @@
 	icon_state = "1-2"
 	},
 /turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/library)
 "hMQ" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 4
@@ -10284,8 +10497,12 @@
 /turf/simulated/floor,
 /area/shuttle/civvie/general)
 "hPn" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 9
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 9
+	},
 /turf/simulated/floor/wood,
 /area/library)
 "hPu" = (
@@ -10692,6 +10909,7 @@
 /obj/structure/cable/green{
 	icon_state = "1-2"
 	},
+/obj/structure/disposalpipe/segment,
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d1starboardamidhall)
 "ibx" = (
@@ -10702,20 +10920,20 @@
 /turf/simulated/floor/plating,
 /area/endeavour/hallway/d1aftmaint)
 "ibD" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/obj/structure/cable/green{
-	icon_state = "4-8"
+	dir = 1
 	},
-/obj/machinery/door/airlock/glass/civilian{
-	name = "Pool Access"
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/catwalk,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d1fwdmaint)
+"ibS" = (
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/glass{
+	name = "Chapel"
 	},
-/turf/simulated/floor/tiled/white,
-/area/hallway/secondary/docking_hallway)
+/turf/simulated/floor/tiled/dark,
+/area/chapel/main)
 "ibU" = (
 /obj/structure/cable/green{
 	icon_state = "4-8"
@@ -11118,17 +11336,13 @@
 /turf/simulated/floor/plating,
 /area/endeavour/hallway/d1fwdmaint)
 "iqr" = (
-/obj/effect/floor_decal/borderfloorblack{
-	dir = 1
-	},
-/obj/effect/floor_decal/corner/navgold/border{
-	dir = 1
-	},
-/obj/machinery/holoposter{
-	pixel_y = 32
+/obj/structure/table/standard,
+/obj/item/inflatable_duck,
+/obj/machinery/light{
+	dir = 4
 	},
-/turf/simulated/floor/tiled,
-/area/hallway/secondary/docking_hallway)
+/turf/simulated/floor/tiled/freezer,
+/area/crew_quarters/pool/changing_room)
 "iqI" = (
 /obj/effect/floor_decal/corner/blue{
 	dir = 1
@@ -11136,11 +11350,15 @@
 /turf/simulated/floor/tiled/dark,
 /area/bridge)
 "irX" = (
+/obj/structure/catwalk,
+/obj/machinery/light/small{
+	dir = 8
+	},
 /obj/structure/cable/green{
-	icon_state = "2-8"
+	icon_state = "1-4"
 	},
 /turf/simulated/floor/plating,
-/area/endeavour/hallway/d1aftmaint)
+/area/maintenance/asmaint)
 "isf" = (
 /obj/effect/floor_decal/chapel{
 	dir = 8
@@ -11219,20 +11437,9 @@
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d1starboardafthall)
 "ivm" = (
-/obj/structure/table/glass,
-/obj/item/inflatable_duck,
-/obj/effect/floor_decal/spline/plain{
-	dir = 8
-	},
-/obj/machinery/air_alarm{
-	dir = 4;
-	pixel_x = -22
-	},
-/obj/structure/cable/green{
-	icon_state = "1-2"
-	},
-/turf/simulated/floor/tiled/freezer,
-/area/crew_quarters/pool)
+/obj/random/trash_pile,
+/turf/simulated/floor/plating,
+/area/maintenance/library)
 "ivC" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/plating,
@@ -11282,27 +11489,14 @@
 /turf/simulated/floor/tiled,
 /area/hallway/secondary/docking_hallway)
 "iwR" = (
-/obj/machinery/light{
-	dir = 8
-	},
 /obj/effect/floor_decal/borderfloor{
-	dir = 8
+	dir = 10
 	},
 /obj/effect/floor_decal/corner/blue/border{
-	dir = 8
-	},
-/obj/effect/floor_decal/industrial/outline/blue,
-/obj/structure/window/reinforced,
-/obj/structure/closet/secure_closet/sar{
-	req_access = list(5);
-	req_one_access = list(5)
+	dir = 10
 	},
-/obj/item/storage/box/pillbottles,
-/obj/item/storage/box/syringes,
-/obj/item/tank/jetpack/oxygen,
-/obj/item/storage/backpack/parachute,
-/obj/item/clothing/accessory/permit/gun/planetside,
-/turf/simulated/floor/tiled/monotile,
+/obj/machinery/portable_atmospherics/canister/oxygen,
+/turf/simulated/floor/tiled/white,
 /area/exploration/medical)
 "ixp" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -11523,15 +11717,11 @@
 /turf/simulated/floor/wood,
 /area/crew_quarters/coffee_shop)
 "iEX" = (
-/obj/machinery/door/firedoor{
-	dir = 1
-	},
-/obj/machinery/door/airlock/maintenance/common,
 /obj/structure/cable/green{
 	icon_state = "1-2"
 	},
-/turf/simulated/floor/plating,
-/area/library)
+/turf/simulated/floor/tiled/dark,
+/area/tether/station/burial)
 "iFe" = (
 /obj/machinery/atmospherics/pipe/simple/hidden{
 	dir = 8
@@ -11541,8 +11731,11 @@
 /turf/simulated/floor/tiled/dark,
 /area/hallway/secondary/docking_hallway2)
 "iFj" = (
-/turf/simulated/wall/r_wall/prepainted/engineering,
-/area/hallway/secondary/docking_hallway)
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
+/turf/simulated/floor/tiled/dark,
+/area/tether/station/burial)
 "iFq" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 10
@@ -11621,10 +11814,17 @@
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d1starboardafthall)
 "iKm" = (
-/obj/machinery/atmospherics/component/unary/vent_scrubber/on{
-	dir = 8
+/obj/structure/table/woodentable,
+/obj/effect/floor_decal/spline/fancy/wood{
+	dir = 4
 	},
-/turf/simulated/floor/carpet/bcarpet,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/turf/simulated/floor/wood,
 /area/library)
 "iKu" = (
 /obj/effect/floor_decal/industrial/outline/yellow,
@@ -11636,6 +11836,7 @@
 	name = "bookcase (Fiction)"
 	},
 /obj/item/book/manual/the_humanized_mice,
+/obj/effect/floor_decal/spline/fancy/wood,
 /turf/simulated/floor/wood,
 /area/library)
 "iLv" = (
@@ -11791,14 +11992,15 @@
 /turf/simulated/floor/plating,
 /area/chapel/office)
 "iRR" = (
-/obj/machinery/atmospherics/component/unary/vent_scrubber/on{
-	dir = 8
+/obj/machinery/power/apc/north_mount,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
 	},
 /obj/structure/cable/green{
-	icon_state = "1-8"
+	icon_state = "0-4"
 	},
-/turf/simulated/floor/tiled/white,
-/area/crew_quarters/pool/changing_room)
+/turf/simulated/floor/tiled/freezer,
+/area/crew_quarters/pool)
 "iSA" = (
 /turf/simulated/floor/carpet/arcadecarpet,
 /area/endeavour/hallway/d1aftmaint)
@@ -11844,7 +12046,7 @@
 "iUW" = (
 /obj/effect/floor_decal/steeldecal/steel_decals_central6,
 /turf/simulated/floor/tiled/steel,
-/area/endeavour/hallway/d1starboardamidhall)
+/area/endeavour/hallway/d1starboardhall)
 "iVd" = (
 /obj/effect/floor_decal/borderfloorblack,
 /obj/effect/floor_decal/corner/navblue/border,
@@ -12000,9 +12202,6 @@
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
 	dir = 1
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d1starboardafthall)
 "iZR" = (
@@ -12012,15 +12211,7 @@
 /turf/simulated/floor/tiled,
 /area/exploration/pilot_prep)
 "jag" = (
-/obj/structure/table/rack/shelf,
-/obj/item/tank/oxygen,
-/obj/item/suit_cooling_unit,
-/obj/effect/floor_decal/borderfloor{
-	dir = 8
-	},
-/obj/effect/floor_decal/corner/blue/border{
-	dir = 8
-	},
+/obj/landmark/spawnpoint/job/field_medic,
 /turf/simulated/floor/tiled/white,
 /area/exploration/medical)
 "jbd" = (
@@ -12197,8 +12388,8 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 6
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 6
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+	dir = 1
 	},
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d1starboardafthall)
@@ -12233,9 +12424,12 @@
 /turf/simulated/floor/tiled,
 /area/shuttle/excursion/general)
 "jkS" = (
-/obj/structure/bed/chair/sofa/black,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 5
+	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
 /turf/simulated/floor/wood,
-/area/maintenance/chapel)
+/area/library)
 "jlr" = (
 /obj/structure/flora/pottedplant/minitree,
 /turf/simulated/floor/wood,
@@ -12310,6 +12504,12 @@
 /obj/machinery/holopad,
 /turf/simulated/floor/tiled,
 /area/exploration)
+"jmI" = (
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
+/turf/simulated/floor/tiled/freezer,
+/area/crew_quarters/pool/changing_room)
 "jmM" = (
 /obj/effect/floor_decal/techfloor/orange{
 	dir = 1
@@ -12396,11 +12596,14 @@
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d1portforhall)
 "jpl" = (
-/obj/machinery/door/airlock/maintenance/common,
-/obj/item/barrier_tape_segment/engineering,
-/obj/machinery/door/firedoor,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/catwalk,
+/obj/machinery/air_alarm/east_mount,
 /turf/simulated/floor/plating,
-/area/maintenance/chapel)
+/area/endeavour/hallway/d1fwdmaint)
 "jpO" = (
 /obj/structure/fireaxecabinet,
 /turf/simulated/wall/r_wall/prepainted/command,
@@ -12512,9 +12715,10 @@
 /turf/simulated/floor/tiled,
 /area/exploration/explorer_prep)
 "jsH" = (
-/obj/item/radio/intercom/north_mount,
-/turf/simulated/floor/tiled/white,
-/area/crew_quarters/pool/changing_room)
+/obj/machinery/portable_atmospherics/powered/pump/filled,
+/obj/effect/floor_decal/rust,
+/turf/simulated/floor/plating,
+/area/maintenance/library)
 "jtj" = (
 /obj/machinery/door/airlock/multi_tile/glass{
 	dir = 1;
@@ -12671,9 +12875,9 @@
 /obj/effect/floor_decal/corner/blue/border{
 	dir = 1
 	},
-/obj/structure/table/standard,
-/obj/item/duct_tape_roll,
-/obj/item/hand_labeler,
+/obj/structure/table/rack/shelf,
+/obj/item/tank/oxygen,
+/obj/item/suit_cooling_unit,
 /turf/simulated/floor/tiled/white,
 /area/exploration/medical)
 "jxc" = (
@@ -12694,6 +12898,13 @@
 	},
 /turf/simulated/floor/carpet,
 /area/crew_quarters/heads/hop)
+"jxO" = (
+/obj/structure/bed/chair/comfy/brown,
+/obj/effect/floor_decal/spline/fancy/wood/corner{
+	dir = 1
+	},
+/turf/simulated/floor/wood,
+/area/library)
 "jyC" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
@@ -12748,7 +12959,7 @@
 /obj/structure/cable/green{
 	icon_state = "0-8"
 	},
-/turf/simulated/floor/carpet/bcarpet,
+/turf/simulated/floor/wood,
 /area/library)
 "jAG" = (
 /obj/structure/cable/green{
@@ -12783,12 +12994,20 @@
 /turf/simulated/floor/wood,
 /area/library)
 "jCV" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/carpet/bcarpet,
-/area/library)
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+	dir = 1
+	},
+/obj/structure/catwalk,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d1fwdmaint)
 "jDn" = (
-/obj/machinery/light/small{
+/obj/machinery/camera/network/civilian{
+	dir = 1
+	},
+/obj/structure/bed/chair/sofa/brown/left{
 	dir = 1
 	},
 /turf/simulated/floor/carpet/bcarpet,
@@ -12815,7 +13034,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/plating,
-/area/maintenance/chapel)
+/area/endeavour/hallway/d1fwdmaint)
 "jEM" = (
 /obj/structure/cable{
 	icon_state = "1-8"
@@ -12831,6 +13050,10 @@
 /obj/machinery/vending/phoronresearch,
 /turf/simulated/floor/tiled,
 /area/rnd/test_area)
+"jFd" = (
+/obj/machinery/atmospherics/component/unary/vent_pump/on,
+/turf/simulated/floor/tiled/steel,
+/area/endeavour/hallway/d1starboardhall)
 "jFy" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -12903,22 +13126,28 @@
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/exploration/excursion_dock)
 "jGC" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
-	dir = 8
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/effect/floor_decal/borderfloorblack{
+	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
-	dir = 8
+/obj/effect/floor_decal/corner/navgold/border{
+	dir = 4
 	},
-/obj/structure/cable/green{
-	icon_state = "4-8"
+/obj/effect/floor_decal/borderfloorblack/corner2{
+	dir = 6
+	},
+/obj/effect/floor_decal/corner/navgold/bordercorner2{
+	dir = 6
 	},
-/obj/effect/floor_decal/borderfloorblack/corner,
-/obj/effect/floor_decal/corner/navgold/bordercorner,
 /turf/simulated/floor/tiled,
 /area/hallway/secondary/docking_hallway)
 "jGM" = (
 /obj/machinery/light_switch{
-	pixel_x = 25
+	pixel_y = -23
+	},
+/obj/machinery/light_switch{
+	pixel_x = 27
 	},
 /turf/simulated/floor/carpet/bcarpet,
 /area/chapel/main)
@@ -12976,7 +13205,7 @@
 	dir = 9
 	},
 /turf/simulated/floor/tiled/steel,
-/area/endeavour/hallway/d1starboardamidhall)
+/area/endeavour/hallway/d1starboardhall)
 "jJL" = (
 /obj/machinery/power/apc/west_mount{
 	cell_type = /obj/item/cell/super
@@ -13074,12 +13303,17 @@
 /turf/space,
 /area/space)
 "jNp" = (
-/obj/machinery/fire_alarm/south_mount{
-	pixel_y = -24
+/obj/machinery/light_switch{
+	pixel_y = 32
 	},
-/obj/machinery/light/small,
-/turf/simulated/floor/carpet/bcarpet,
-/area/library)
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/component/unary/vent_scrubber/on{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/dark,
+/area/tether/station/burial)
 "jNC" = (
 /obj/machinery/computer/ship/navigation/telescreen{
 	pixel_x = 32
@@ -13137,8 +13371,7 @@
 /area/hallway/secondary/docking_hallway2)
 "jPj" = (
 /obj/machinery/light{
-	dir = 8;
-	pixel_x = -10
+	dir = 8
 	},
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/exploration/courser_dock)
@@ -13181,6 +13414,15 @@
 /obj/structure/table/bench/wooden,
 /turf/simulated/floor/tiled/dark,
 /area/chapel/main)
+"jQp" = (
+/obj/machinery/door/firedoor{
+	dir = 1
+	},
+/obj/machinery/door/airlock/multi_tile/glass{
+	name = "Library"
+	},
+/turf/simulated/floor/carpet/bcarpet,
+/area/library)
 "jQF" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -13246,10 +13488,11 @@
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d1starboardamidhall)
 "jTs" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/disposalpipe/segment,
-/turf/simulated/floor/carpet/bcarpet,
+/obj/structure/bookcase{
+	name = "bookcase (Fiction)"
+	},
+/obj/effect/floor_decal/spline/fancy/wood,
+/turf/simulated/floor/wood,
 /area/library)
 "jTI" = (
 /obj/machinery/atmospherics/portables_connector{
@@ -13273,7 +13516,9 @@
 	dir = 5
 	},
 /obj/machinery/fire_alarm/north_mount,
-/obj/machinery/suit_storage_unit/search_and_rescue,
+/obj/structure/table/standard,
+/obj/item/duct_tape_roll,
+/obj/item/hand_labeler,
 /turf/simulated/floor/tiled/white,
 /area/exploration/medical)
 "jTR" = (
@@ -13312,10 +13557,9 @@
 /obj/machinery/light{
 	dir = 1
 	},
-/obj/machinery/door/firedoor{
-	dir = 1
+/obj/machinery/holoposter{
+	pixel_y = 32
 	},
-/obj/machinery/door/airlock/glass,
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d1starboardafthall)
 "jUy" = (
@@ -13362,6 +13606,9 @@
 /obj/structure/cable/green{
 	icon_state = "2-8"
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 6
+	},
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d1starboardafthall)
 "jWo" = (
@@ -13446,7 +13693,7 @@
 	dir = 8
 	},
 /turf/simulated/floor/tiled/steel,
-/area/endeavour/hallway/d1starboardamidhall)
+/area/endeavour/hallway/d1starboardhall)
 "jXL" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -13476,6 +13723,15 @@
 "jYs" = (
 /turf/simulated/wall/prepainted/command,
 /area/crew_quarters/heads/blueshield)
+"jYC" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/freezer,
+/area/crew_quarters/pool/changing_room)
 "jYV" = (
 /obj/structure/catwalk,
 /obj/machinery/door/airlock/maintenance,
@@ -13590,6 +13846,12 @@
 	},
 /turf/simulated/floor/tiled,
 /area/rnd/test_area)
+"kcG" = (
+/obj/machinery/light/small{
+	dir = 4
+	},
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d1aftmaint)
 "kcJ" = (
 /obj/machinery/light,
 /obj/machinery/recharger/wallcharger{
@@ -13694,6 +13956,12 @@
 	},
 /turf/simulated/floor/carpet/bcarpet,
 /area/lawoffice)
+"khr" = (
+/obj/machinery/camera/network/civilian{
+	dir = 1
+	},
+/turf/simulated/floor/wood,
+/area/library)
 "khu" = (
 /obj/structure/table/bench/padded,
 /turf/simulated/floor/wood,
@@ -13710,6 +13978,10 @@
 	},
 /turf/simulated/floor/tiled,
 /area/endeavour/exploration/hallway_fore)
+"khE" = (
+/obj/machinery/atmospherics/component/unary/vent_scrubber/on,
+/turf/simulated/floor/wood,
+/area/library)
 "khS" = (
 /obj/machinery/door/firedoor{
 	dir = 8
@@ -13768,11 +14040,10 @@
 /turf/simulated/floor/water/deep/pool,
 /area/endeavour/surfacebase/sauna)
 "kiD" = (
-/obj/structure/bed/chair/sofa/black{
-	dir = 1
-	},
+/obj/structure/table/woodentable,
+/obj/structure/table/woodentable,
 /turf/simulated/floor/wood,
-/area/maintenance/chapel)
+/area/library)
 "kiK" = (
 /obj/effect/floor_decal/borderfloorblack/corner,
 /obj/effect/floor_decal/corner/navgold/bordercorner,
@@ -13799,13 +14070,20 @@
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d1portforhall)
 "kjq" = (
-/obj/structure/bed/chair/sofa/black/right,
-/turf/simulated/floor/wood,
-/area/maintenance/chapel)
+/turf/simulated/floor/tiled/dark,
+/area/tether/station/burial)
 "kjF" = (
-/obj/structure/bed/chair/comfy/brown,
-/turf/simulated/floor/carpet/bcarpet,
-/area/library)
+/obj/machinery/light{
+	dir = 1
+	},
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+	dir = 1
+	},
+/turf/simulated/floor/tiled/freezer,
+/area/crew_quarters/pool)
 "kkN" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
@@ -13841,6 +14119,11 @@
 /obj/item/storage/fancy/heartbox,
 /turf/simulated/floor/carpet,
 /area/endeavour/hallway/d1fwdmaint)
+"kmD" = (
+/obj/structure/table/rack,
+/obj/item/tool/wrench,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d1aftmaint)
 "kno" = (
 /obj/effect/floor_decal/borderfloorblack{
 	dir = 8
@@ -13857,12 +14140,15 @@
 /obj/machinery/camera/network/civilian{
 	dir = 4
 	},
-/obj/machinery/disposal,
-/obj/structure/disposalpipe/trunk{
-	dir = 4
-	},
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d1afthall)
+"kom" = (
+/obj/machinery/fire_alarm/north_mount,
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
+/turf/simulated/floor/tiled/freezer,
+/area/crew_quarters/pool/changing_room)
 "kos" = (
 /obj/effect/floor_decal/steeldecal/steel_decals_central7,
 /obj/structure/cable/green{
@@ -13895,6 +14181,13 @@
 	},
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d1starboardforhall)
+"kpq" = (
+/obj/structure/disposalpipe/segment{
+	dir = 8;
+	icon_state = "pipe-c"
+	},
+/turf/simulated/floor/tiled/steel,
+/area/endeavour/hallway/d1afthall)
 "kpN" = (
 /obj/machinery/air_alarm{
 	dir = 1;
@@ -13942,8 +14235,10 @@
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d1afthall)
 "krO" = (
-/turf/simulated/wall/prepainted,
-/area/maintenance/arrivals)
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/obj/effect/paint/palebottlegreen,
+/turf/simulated/floor/plating,
+/area/maintenance/chapel)
 "ksB" = (
 /obj/item/radio/intercom{
 	dir = 4;
@@ -13995,6 +14290,11 @@
 	},
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/exploration/courser_dock)
+"kvn" = (
+/obj/random/trash_pile,
+/obj/effect/floor_decal/rust,
+/turf/simulated/floor/plating,
+/area/maintenance/chapel)
 "kvI" = (
 /obj/structure/table/reinforced,
 /obj/item/paper_bin,
@@ -14049,9 +14349,15 @@
 /turf/simulated/floor/plating,
 /area/vacant/vacant_bar)
 "kxk" = (
-/obj/structure/sign/deck/fourth,
-/turf/simulated/wall/prepainted,
-/area/crew_quarters/clownoffice)
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/turf/simulated/floor/carpet/bcarpet,
+/area/library)
 "kxn" = (
 /obj/machinery/atmospherics/pipe/tank/air{
 	dir = 1
@@ -14097,11 +14403,11 @@
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/exploration/courser_dock)
 "kzG" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/disposalpipe/segment,
 /obj/structure/table/woodentable,
 /obj/item/paper_bin,
+/obj/effect/floor_decal/spline/fancy/wood{
+	dir = 4
+	},
 /turf/simulated/floor/wood,
 /area/library)
 "kAg" = (
@@ -14158,6 +14464,9 @@
 /area/chapel/office)
 "kCA" = (
 /obj/machinery/camera/network/civilian,
+/obj/effect/floor_decal/spline/fancy/wood{
+	dir = 4
+	},
 /turf/simulated/floor/wood,
 /area/library)
 "kCB" = (
@@ -14252,6 +14561,13 @@
 	},
 /turf/simulated/floor/wood,
 /area/lawoffice)
+"kEM" = (
+/obj/machinery/light/small,
+/obj/effect/floor_decal/spline/fancy/wood{
+	dir = 4
+	},
+/turf/simulated/floor/wood,
+/area/library)
 "kFe" = (
 /obj/structure/undies_wardrobe,
 /turf/simulated/floor/wood,
@@ -14359,17 +14675,12 @@
 /turf/simulated/floor/reinforced/airless,
 /area/rnd/test_area)
 "kJh" = (
-/obj/structure/window/basic{
-	dir = 1
-	},
-/obj/effect/floor_decal/industrial/outline/blue,
-/obj/effect/floor_decal/industrial/outline/blue,
-/obj/structure/closet/athletic_mixed,
-/obj/machinery/camera/network/civilian{
+/obj/structure/bed/chair/sofa/brown/right,
+/obj/machinery/light/small{
 	dir = 1
 	},
-/turf/simulated/floor/holofloor/tiled/dark,
-/area/crew_quarters/pool/changing_room)
+/turf/simulated/floor/carpet/bcarpet,
+/area/library)
 "kJp" = (
 /obj/machinery/light/small{
 	dir = 4
@@ -14519,7 +14830,7 @@
 	dir = 8
 	},
 /turf/simulated/floor/tiled/steel,
-/area/endeavour/hallway/d1starboardamidhall)
+/area/endeavour/hallway/d1starboardhall)
 "kNs" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/cyan{
 	dir = 6
@@ -14546,13 +14857,16 @@
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d1starboardafthall)
 "kNK" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+/obj/effect/floor_decal/spline/fancy/wood{
 	dir = 8
 	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
-	dir = 8
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
 	},
-/turf/simulated/floor/carpet/bcarpet,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/turf/simulated/floor/wood,
 /area/library)
 "kNR" = (
 /obj/machinery/light/small,
@@ -14577,13 +14891,13 @@
 /turf/simulated/floor/tiled/dark,
 /area/chapel/main)
 "kOz" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 10
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 10
 	},
-/turf/simulated/floor/carpet/bcarpet,
+/turf/simulated/floor/wood,
 /area/library)
 "kOG" = (
 /obj/effect/floor_decal/chapel{
@@ -14952,12 +15266,8 @@
 /turf/simulated/floor/tiled,
 /area/rnd/research/testingrange)
 "leq" = (
-/obj/machinery/door/airlock/maintenance,
-/obj/machinery/door/firedoor/glass{
-	dir = 8
-	},
-/turf/simulated/floor/plating,
-/area/maintenance/chapel)
+/turf/simulated/floor/tiled/steel,
+/area/endeavour/hallway/d1starboardhall)
 "leE" = (
 /obj/effect/floor_decal/borderfloorblack{
 	dir = 1
@@ -14984,7 +15294,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/plating,
-/area/maintenance/chapel)
+/area/maintenance/library)
 "lhS" = (
 /turf/simulated/wall/prepainted,
 /area/hallway/secondary/docking_hallway2)
@@ -15057,18 +15367,18 @@
 /turf/simulated/floor/tiled/dark,
 /area/station/stairs_one)
 "llV" = (
-/obj/effect/floor_decal/borderfloorblack{
-	dir = 8
-	},
-/obj/effect/floor_decal/corner/navgold/border{
-	dir = 8
-	},
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
 	dir = 8
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/effect/floor_decal/borderfloorblack/corner{
+	dir = 1
+	},
+/obj/effect/floor_decal/corner/navgold/bordercorner{
+	dir = 1
+	},
 /turf/simulated/floor/tiled/steel,
-/area/endeavour/hallway/d1starboardamidhall)
+/area/endeavour/hallway/d1starboardhall)
 "llY" = (
 /obj/machinery/door/firedoor,
 /obj/map_helper/access_helper/airlock/station/exploration/department,
@@ -15098,15 +15408,8 @@
 /turf/simulated/floor/plating,
 /area/maintenance/substation/command)
 "lmG" = (
-/obj/structure/catwalk,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/turf/simulated/floor/plating,
-/area/maintenance/chapel)
+/turf/simulated/wall/prepainted,
+/area/maintenance/library)
 "lno" = (
 /obj/machinery/conveyor_switch/oneway{
 	id = "courser_magazine_2";
@@ -15269,6 +15572,7 @@
 /obj/structure/sink{
 	pixel_y = 22
 	},
+/obj/landmark/spawnpoint/job/field_medic,
 /turf/simulated/floor/tiled/white,
 /area/exploration/medical)
 "lth" = (
@@ -15281,15 +15585,11 @@
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/hallway/secondary/docking_hallway)
 "ltO" = (
-/obj/machinery/disposal,
-/obj/machinery/camera/network/civilian{
-	dir = 9
-	},
-/obj/structure/disposalpipe/trunk{
-	dir = 1
-	},
-/turf/simulated/floor/carpet/bcarpet,
-/area/library)
+/obj/structure/table/bench/wooden,
+/obj/effect/mist,
+/obj/item/radio/intercom/north_mount,
+/turf/simulated/floor/wood,
+/area/endeavour/surfacebase/sauna)
 "lul" = (
 /obj/structure/flora/ausbushes/lavendergrass,
 /obj/structure/window/reinforced,
@@ -15314,6 +15614,11 @@
 /obj/structure/filingcabinet/chestdrawer,
 /turf/simulated/floor/wood,
 /area/lawoffice)
+"lvV" = (
+/obj/effect/floor_decal/spline/fancy/wood,
+/obj/structure/flora/pottedplant/orientaltree,
+/turf/simulated/floor/carpet/bcarpet,
+/area/tether/station/burial)
 "lwn" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 9
@@ -15334,6 +15639,15 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/exploration/courser_dock)
+"lwV" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 10
+	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+	dir = 4
+	},
+/turf/simulated/floor/wood,
+/area/library)
 "lxO" = (
 /obj/machinery/door/airlock/maintenance/engi{
 	req_one_access = null
@@ -15352,14 +15666,14 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 9
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 9
-	},
 /obj/structure/disposalpipe/sortjunction{
 	dir = 4;
 	name = "HoS Office";
 	sortType = "HoS Office"
 	},
+/obj/machinery/atmospherics/component/unary/vent_pump/on{
+	dir = 1
+	},
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d1starboardafthall)
 "lyH" = (
@@ -15383,7 +15697,7 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/tiled/steel,
-/area/endeavour/hallway/d1starboardamidhall)
+/area/endeavour/hallway/d1starboardhall)
 "lyX" = (
 /obj/map_helper/access_helper/airlock/station/exploration/department,
 /obj/structure/cable/green{
@@ -15511,15 +15825,12 @@
 /turf/simulated/floor/carpet/gaycarpet,
 /area/crew_quarters/clownoffice)
 "lCx" = (
-/obj/machinery/computer/ship/navigation/telescreen{
-	pixel_x = 32
-	},
-/obj/machinery/light/small{
-	dir = 4
-	},
 /obj/structure/cable/green{
 	icon_state = "2-8"
 	},
+/obj/structure/disposalpipe/segment{
+	dir = 8
+	},
 /turf/simulated/floor/carpet/bcarpet,
 /area/library)
 "lDc" = (
@@ -15622,7 +15933,7 @@
 	dir = 8;
 	pixel_y = -7
 	},
-/turf/simulated/wall/r_wall/prepainted/civilian,
+/turf/simulated/wall/r_wall/prepainted,
 /area/station/stairs_one)
 "lKq" = (
 /obj/machinery/camera/network/command{
@@ -15630,6 +15941,12 @@
 	},
 /turf/simulated/floor/wood,
 /area/bridge/meeting_room)
+"lKv" = (
+/obj/machinery/light/small{
+	dir = 1
+	},
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d1fwdmaint)
 "lKJ" = (
 /obj/effect/floor_decal/borderfloor{
 	dir = 1
@@ -15946,10 +16263,11 @@
 /turf/simulated/floor/carpet/bcarpet,
 /area/crew_quarters/mimeoffice)
 "lVu" = (
-/obj/structure/sign/goldenplaque{
-	desc = "This plaque is thankfully empty, but is dedicated to those that were killed in the line of duty protecting the NSV Endeavour, and Nanotrasen as a whole.";
-	name = "Memorial Plaque";
-	pixel_y = 32
+/obj/structure/extinguisher_cabinet{
+	pixel_y = 31
+	},
+/obj/structure/disposalpipe/segment{
+	dir = 8
 	},
 /turf/simulated/floor/tiled/dark,
 /area/chapel/main)
@@ -16018,9 +16336,12 @@
 /turf/simulated/floor/reinforced/airless,
 /area/rnd/test_area)
 "lZv" = (
-/obj/structure/sign/department/biblio,
-/turf/simulated/wall/prepainted,
-/area/maintenance/chapel)
+/obj/machinery/door/blast/regular{
+	id = "chapelgun";
+	name = "Chapel Launcher Door"
+	},
+/turf/simulated/floor/plating,
+/area/tether/station/burial)
 "maa" = (
 /turf/simulated/floor/plating,
 /area/endeavour/hallway/d1fwdmaint)
@@ -16061,6 +16382,14 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/chapel/main)
+"maY" = (
+/obj/structure/table/woodentable,
+/obj/structure/flora/pottedplant/flower,
+/obj/effect/floor_decal/spline/fancy/wood{
+	dir = 1
+	},
+/turf/simulated/floor/wood,
+/area/library)
 "maZ" = (
 /obj/structure/flora/pottedplant/stoutbush,
 /obj/structure/window/reinforced{
@@ -16234,7 +16563,6 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 10
 	},
-/obj/landmark/spawnpoint/job/field_medic,
 /turf/simulated/floor/tiled/white,
 /area/exploration/medical)
 "mgg" = (
@@ -16296,8 +16624,11 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/sign/department/biblio{
+	pixel_x = -32
+	},
 /turf/simulated/floor/tiled/steel,
-/area/endeavour/hallway/d1starboardamidhall)
+/area/endeavour/hallway/d1starboardhall)
 "mic" = (
 /obj/effect/floor_decal/chapel,
 /obj/effect/floor_decal/spline/fancy/wood{
@@ -16513,11 +16844,8 @@
 /turf/simulated/floor/wood,
 /area/endeavour/surfacebase/sauna)
 "mqa" = (
-/obj/machinery/light{
-	dir = 8
-	},
-/turf/simulated/floor/plating,
-/area/endeavour/hallway/d1aftmaint)
+/turf/simulated/wall/r_wall/prepainted,
+/area/maintenance/asmaint)
 "mrv" = (
 /obj/structure/sign/directions/science{
 	pixel_y = 3
@@ -16525,7 +16853,7 @@
 /obj/structure/sign/directions/cargo{
 	pixel_y = -4
 	},
-/turf/simulated/wall/r_wall/prepainted/civilian,
+/turf/simulated/wall/r_wall/prepainted,
 /area/station/stairs_one)
 "mrA" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -16689,16 +17017,28 @@
 	icon_state = "4-8"
 	},
 /turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/library)
 "mxK" = (
-/obj/machinery/suit_storage_unit/search_and_rescue,
+/obj/machinery/light{
+	dir = 8
+	},
+/obj/structure/closet/secure_closet/sar{
+	req_access = list(5);
+	req_one_access = list(5)
+	},
+/obj/item/storage/box/pillbottles,
+/obj/item/storage/box/syringes,
+/obj/item/tank/jetpack/oxygen,
+/obj/item/storage/backpack/parachute,
+/obj/item/clothing/accessory/permit/gun/planetside,
 /obj/effect/floor_decal/borderfloor{
-	dir = 1
+	dir = 8
 	},
 /obj/effect/floor_decal/corner/blue/border{
-	dir = 1
+	dir = 8
 	},
-/turf/simulated/floor/tiled/white,
+/obj/effect/floor_decal/industrial/outline/blue,
+/turf/simulated/floor/tiled/monotile,
 /area/exploration/medical)
 "myg" = (
 /obj/effect/floor_decal/spline/plain,
@@ -16986,6 +17326,12 @@
 	},
 /turf/simulated/floor/wood,
 /area/lawoffice)
+"mGW" = (
+/obj/machinery/air_alarm{
+	pixel_y = 22
+	},
+/turf/simulated/floor/plating,
+/area/maintenance/asmaint)
 "mHb" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/structure/cable/green{
@@ -17276,6 +17622,14 @@
 /obj/machinery/portable_atmospherics/powered/pump,
 /turf/simulated/floor/tiled,
 /area/rnd/misc_lab)
+"mSo" = (
+/obj/structure/table/woodentable,
+/obj/item/flashlight/lamp/green/on,
+/obj/effect/floor_decal/spline/fancy/wood{
+	dir = 4
+	},
+/turf/simulated/floor/wood,
+/area/library)
 "mSv" = (
 /obj/machinery/door/airlock/maintenance,
 /obj/machinery/door/firedoor/glass{
@@ -17293,6 +17647,23 @@
 /obj/map_helper/access_helper/airlock/station/external_airlock,
 /turf/simulated/floor/tiled/dark,
 /area/hallway/secondary/docking_hallway2)
+"mTv" = (
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
+/obj/effect/floor_decal/borderfloorblack,
+/obj/effect/floor_decal/corner/navgold/border,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/structure/cable/green{
+	icon_state = "1-4"
+	},
+/turf/simulated/floor/tiled/steel,
+/area/endeavour/hallway/d1starboardhall)
 "mTU" = (
 /obj/effect/floor_decal/borderfloorblack{
 	dir = 1
@@ -17366,6 +17737,15 @@
 /obj/structure/catwalk,
 /turf/simulated/floor/plating,
 /area/shuttle/courser/general)
+"mWh" = (
+/obj/structure/table/bench/wooden,
+/obj/effect/mist,
+/obj/machinery/air_alarm{
+	frequency = 1441;
+	pixel_y = 22
+	},
+/turf/simulated/floor/wood,
+/area/endeavour/surfacebase/sauna)
 "mWz" = (
 /obj/effect/floor_decal/borderfloorblack{
 	dir = 8
@@ -17472,7 +17852,7 @@
 /turf/simulated/floor/lino,
 /area/crew_quarters/coffee_shop)
 "mYb" = (
-/turf/simulated/wall/prepainted,
+/turf/simulated/wall/prepainted/civilian,
 /area/hydroponics/garden)
 "mYF" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -17482,7 +17862,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/tiled/steel,
-/area/endeavour/hallway/d1starboardamidhall)
+/area/endeavour/hallway/d1starboardhall)
 "mYH" = (
 /obj/spawner/window/low_wall/full/firelocks/nogrille,
 /obj/structure/curtain/black,
@@ -17520,9 +17900,8 @@
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d1starboardforhall)
 "mZV" = (
-/obj/machinery/air_alarm/north_mount,
 /obj/machinery/light{
-	dir = 4
+	dir = 1
 	},
 /turf/simulated/floor/tiled/dark,
 /area/chapel/main)
@@ -17561,6 +17940,21 @@
 "nct" = (
 /turf/simulated/floor/plating,
 /area/hallway/secondary/docking_hallway)
+"ncC" = (
+/obj/effect/floor_decal/borderfloorblack,
+/obj/effect/floor_decal/corner/navgold/border,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/machinery/power/apc/south_mount,
+/obj/structure/cable/green{
+	icon_state = "0-8"
+	},
+/turf/simulated/floor/tiled/steel,
+/area/endeavour/hallway/d1starboardhall)
 "ncX" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 6
@@ -17571,17 +17965,8 @@
 /turf/simulated/floor/wood,
 /area/library)
 "ndh" = (
-/obj/machinery/air_alarm{
-	pixel_y = 22
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/structure/cable/green{
-	icon_state = "4-8"
-	},
-/turf/simulated/floor/tiled/freezer,
-/area/crew_quarters/pool)
+/turf/simulated/wall/r_wall/prepainted/civilian,
+/area/tether/station/burial)
 "nei" = (
 /obj/structure/cable/green{
 	icon_state = "4-8"
@@ -17834,7 +18219,7 @@
 	dir = 8
 	},
 /turf/simulated/floor/plating,
-/area/endeavour/hallway/d1aftmaint)
+/area/maintenance/asmaint)
 "noZ" = (
 /obj/effect/floor_decal/spline/plain{
 	dir = 1
@@ -17930,6 +18315,22 @@
 	},
 /turf/simulated/floor/plating,
 /area/shuttle/excursion/cargo)
+"nry" = (
+/obj/structure/window/basic{
+	dir = 1
+	},
+/obj/structure/curtain/open/privacy,
+/obj/effect/floor_decal/steeldecal/steel_decals10{
+	dir = 5
+	},
+/obj/effect/floor_decal/steeldecal/steel_decals10{
+	dir = 6
+	},
+/obj/machinery/shower{
+	dir = 4
+	},
+/turf/simulated/floor/holofloor/tiled/dark,
+/area/crew_quarters/pool/changing_room)
 "nrF" = (
 /obj/structure/cable{
 	icon_state = "1-8"
@@ -18139,21 +18540,23 @@
 /obj/effect/paint/palebottlegreen,
 /turf/simulated/floor/plating,
 /area/hydroponics/garden)
+"nAj" = (
+/obj/structure/cable/green{
+	icon_state = "1-4"
+	},
+/turf/simulated/floor/tiled/freezer,
+/area/crew_quarters/pool)
 "nAm" = (
 /obj/structure/closet/lasertag/red,
 /turf/simulated/floor/tiled/old_tile/red,
 /area/endeavour/hallway/d1aftmaint)
 "nAn" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/door/firedoor/glass,
-/obj/structure/cable/green{
-	icon_state = "1-2"
-	},
-/obj/machinery/door/airlock/multi_tile/glass{
-	name = "Pool Room"
+/obj/structure/window/basic{
+	dir = 1
 	},
-/turf/simulated/floor/tiled/white,
+/obj/effect/floor_decal/industrial/outline/blue,
+/obj/structure/closet/secure_closet/personal,
+/turf/simulated/floor/holofloor/tiled/dark,
 /area/crew_quarters/pool/changing_room)
 "nAT" = (
 /obj/structure/table/marble,
@@ -18183,15 +18586,12 @@
 /turf/simulated/floor/tiled/white,
 /area/crew_quarters/coffee_shop)
 "nBz" = (
-/obj/structure/catwalk,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 5
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 5
+/obj/effect/floor_decal/spline/fancy/wood{
+	dir = 8
 	},
-/turf/simulated/floor/plating,
-/area/maintenance/chapel)
+/obj/structure/flora/pottedplant/orientaltree,
+/turf/simulated/floor/carpet/bcarpet,
+/area/tether/station/burial)
 "nBS" = (
 /obj/effect/floor_decal/borderfloor{
 	dir = 9
@@ -18235,6 +18635,10 @@
 /obj/structure/catwalk,
 /turf/simulated/floor/plating,
 /area/shuttle/excursion/cargo)
+"nCV" = (
+/obj/effect/floor_decal/spline/fancy/wood,
+/turf/simulated/floor/wood,
+/area/library)
 "nEa" = (
 /obj/machinery/light{
 	dir = 8
@@ -18271,6 +18675,9 @@
 /obj/machinery/atmospherics/component/unary/vent_scrubber/on{
 	dir = 1
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d1starboardafthall)
 "nFx" = (
@@ -18333,8 +18740,9 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/structure/disposalpipe/segment,
-/turf/simulated/floor/tiled,
-/area/hallway/secondary/docking_hallway)
+/obj/structure/catwalk,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d1aftmaint)
 "nHC" = (
 /obj/machinery/atmospherics/pipe/simple/heat_exchanging{
 	dir = 6
@@ -18386,21 +18794,9 @@
 /turf/simulated/floor/plating,
 /area/shuttle/courser/cockpit)
 "nJA" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/structure/disposalpipe/segment{
-	dir = 4;
-	icon_state = "pipe-c"
-	},
-/obj/structure/bed/chair/comfy/brown{
-	dir = 1
-	},
-/turf/simulated/floor/wood,
-/area/library)
+/obj/structure/catwalk,
+/turf/simulated/floor/plating,
+/area/maintenance/library)
 "nJD" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -18409,9 +18805,9 @@
 /area/rnd/research/testingrange)
 "nKb" = (
 /obj/structure/table/reinforced,
-/obj/item/stack/material/steel/full_stack,
-/obj/item/stack/material/steel/full_stack,
-/obj/item/stack/material/steel/full_stack,
+/obj/fiftyspawner/steel,
+/obj/fiftyspawner/steel,
+/obj/fiftyspawner/steel,
 /turf/simulated/floor/tiled,
 /area/maintenance/tool_storage)
 "nKg" = (
@@ -18615,9 +19011,9 @@
 /turf/simulated/floor/tiled,
 /area/endeavour/surfacebase/sauna)
 "nSy" = (
-/obj/machinery/portable_atmospherics/powered/pump/filled,
+/obj/machinery/shield_diffuser,
 /turf/simulated/floor/plating,
-/area/maintenance/chapel)
+/area/tether/station/burial)
 "nSH" = (
 /obj/structure/bed/chair/sofa/black{
 	dir = 4
@@ -18678,11 +19074,16 @@
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d1fwdmaint)
 "nUG" = (
+/obj/item/radio/intercom{
+	dir = 1;
+	name = "Station Intercom (General)";
+	pixel_y = 26
+	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
-/obj/structure/cable/green{
-	icon_state = "4-8"
+/obj/machinery/light{
+	dir = 1
 	},
 /turf/simulated/floor/tiled/freezer,
 /area/crew_quarters/pool)
@@ -18751,13 +19152,14 @@
 "nXJ" = (
 /obj/effect/floor_decal/borderfloorblack,
 /obj/effect/floor_decal/corner/navgold/border,
-/obj/machinery/camera/network/civilian{
-	dir = 1
-	},
 /obj/effect/floor_decal/borderfloorblack/corner2{
 	alpha = 255
 	},
 /obj/effect/floor_decal/corner/navgold/bordercorner2,
+/obj/machinery/door/firedoor{
+	dir = 1
+	},
+/obj/machinery/door/airlock/glass,
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d1starboardafthall)
 "nXR" = (
@@ -18997,7 +19399,7 @@
 /obj/effect/floor_decal/corner/navblue/border{
 	dir = 9
 	},
-/obj/machinery/vending/fitness,
+/obj/machinery/vending/snack,
 /turf/simulated/floor/tiled/steel_ridged,
 /area/endeavour/hallway/d1afthall)
 "oiv" = (
@@ -19321,6 +19723,7 @@
 /area/exploration/explorer_prep)
 "ovE" = (
 /obj/machinery/door/airlock/maintenance/common,
+/obj/map_helper/access_helper/airlock/station/exploration/department,
 /turf/simulated/floor/plating,
 /area/endeavour/exploration/hallway_fore)
 "owg" = (
@@ -19408,6 +19811,15 @@
 	},
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d1portforhall)
+"oxL" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+	dir = 1
+	},
+/turf/simulated/floor/tiled/freezer,
+/area/crew_quarters/pool/changing_room)
 "oxV" = (
 /obj/effect/floor_decal/borderfloorblack,
 /obj/effect/floor_decal/corner/navblue/border,
@@ -19448,6 +19860,21 @@
 	},
 /turf/simulated/floor/tiled/monodark,
 /area/crew_quarters/lounge)
+"oAj" = (
+/obj/effect/floor_decal/borderfloorblack{
+	dir = 8
+	},
+/obj/effect/floor_decal/corner/navgold/border{
+	dir = 8
+	},
+/obj/machinery/door/firedoor{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/door/airlock/glass,
+/turf/simulated/floor/tiled/steel,
+/area/endeavour/hallway/d1starboardhall)
 "oAD" = (
 /obj/machinery/light,
 /obj/structure/table/rack,
@@ -19582,11 +20009,10 @@
 /turf/simulated/floor/grass,
 /area/hydroponics/garden)
 "oGx" = (
-/obj/structure/table/woodentable,
-/obj/item/flashlight/lamp/green,
-/obj/machinery/light/small{
-	dir = 4
+/obj/machinery/computer/ship/navigation/telescreen{
+	pixel_y = 29
 	},
+/obj/structure/bed/chair/sofa/brown/left,
 /turf/simulated/floor/carpet/bcarpet,
 /area/library)
 "oHo" = (
@@ -19667,13 +20093,13 @@
 /turf/simulated/floor/tiled,
 /area/endeavour/surfacebase/sauna)
 "oKZ" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/cable/green{
-	icon_state = "1-4"
+/obj/structure/table/woodentable,
+/obj/effect/floor_decal/spline/fancy/wood,
+/obj/item/flame/candle/candelabra/everburn{
+	pixel_y = 8
 	},
-/turf/simulated/floor/tiled/freezer,
-/area/crew_quarters/pool)
+/turf/simulated/floor/carpet/bcarpet,
+/area/tether/station/burial)
 "oLF" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 10
@@ -19837,6 +20263,14 @@
 	},
 /turf/simulated/floor/wood,
 /area/endeavour/hallway/d1fwdmaint)
+"oTa" = (
+/obj/machinery/door/airlock/maintenance/common,
+/obj/machinery/door/firedoor{
+	dir = 1
+	},
+/obj/structure/catwalk,
+/turf/simulated/floor/plating,
+/area/crew_quarters/pool/changing_room)
 "oTA" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -19931,8 +20365,7 @@
 /turf/simulated/wall/r_wall/prepainted/exploration,
 /area/shuttle/excursion/cargo)
 "oWY" = (
-/obj/machinery/holopad,
-/turf/simulated/floor/tiled/white,
+/turf/simulated/floor/tiled/freezer,
 /area/crew_quarters/pool/changing_room)
 "oXb" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -20121,14 +20554,23 @@
 /area/maintenance/chapel)
 "pdw" = (
 /obj/machinery/light{
-	dir = 4;
-	use_power = 0
+	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 10
 	},
 /turf/simulated/floor/tiled,
 /area/hallway/secondary/docking_hallway2)
+"pdz" = (
+/obj/effect/floor_decal/borderfloorblack,
+/obj/effect/floor_decal/corner/navgold/border,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
+/obj/machinery/light,
+/turf/simulated/floor/tiled/steel,
+/area/endeavour/hallway/d1starboardhall)
 "pdK" = (
 /turf/simulated/floor/tiled,
 /area/gateway/prep_room)
@@ -20161,6 +20603,9 @@
 /obj/effect/floor_decal/corner/black/full{
 	dir = 1
 	},
+/obj/machinery/air_alarm{
+	pixel_y = 22
+	},
 /turf/simulated/floor/tiled/white,
 /area/crew_quarters/lounge/kitchen_freezer)
 "pfk" = (
@@ -20268,6 +20713,10 @@
 /turf/simulated/floor/grass,
 /area/hydroponics/garden)
 "pgL" = (
+/obj/effect/floor_decal/techfloor{
+	dir = 1
+	},
+/obj/landmark/spawnpoint/overflow/station,
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/endeavour/hallway/d1afthall)
 "phb" = (
@@ -20336,10 +20785,6 @@
 "pjL" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/cryopod/robot/door/shuttle,
-/obj/machinery/computer/cryopod{
-	name = "asset retention console";
-	pixel_y = -30
-	},
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/endeavour/hallway/d1afthall)
 "pkq" = (
@@ -20356,7 +20801,7 @@
 	dir = 8;
 	name = "Library"
 	},
-/turf/simulated/floor/tiled/steel,
+/turf/simulated/floor/carpet/bcarpet,
 /area/library)
 "plx" = (
 /obj/structure/bookcase/legal/combo,
@@ -20454,8 +20899,7 @@
 /area/shuttle/civvie/cockpit)
 "pnA" = (
 /obj/machinery/light{
-	dir = 4;
-	use_power = 0
+	dir = 4
 	},
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d1afthall)
@@ -20511,9 +20955,16 @@
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/endeavour/surfacebase/tram)
 "ppR" = (
-/obj/effect/floor_decal/rust,
-/turf/simulated/floor/plating,
-/area/hallway/secondary/docking_hallway)
+/obj/effect/floor_decal/borderfloorblack{
+	dir = 8
+	},
+/obj/effect/floor_decal/corner/navgold/border{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/turf/simulated/floor/tiled/steel,
+/area/endeavour/hallway/d1starboardhall)
 "pqe" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 5
@@ -20528,7 +20979,7 @@
 	dir = 8
 	},
 /turf/simulated/floor/tiled/steel,
-/area/endeavour/hallway/d1starboardamidhall)
+/area/endeavour/hallway/d1starboardhall)
 "pqr" = (
 /obj/structure/cable/green{
 	icon_state = "0-4"
@@ -20624,6 +21075,7 @@
 /obj/structure/cable/green{
 	icon_state = "0-2"
 	},
+/obj/effect/floor_decal/rust,
 /turf/simulated/floor/plating,
 /area/maintenance/chapel)
 "pvb" = (
@@ -20648,6 +21100,10 @@
 	},
 /turf/simulated/floor/wood,
 /area/endeavour/hallway/d1fwdmaint)
+"pvq" = (
+/obj/machinery/atmospherics/component/unary/vent_scrubber/on,
+/turf/simulated/floor/tiled/steel,
+/area/endeavour/hallway/d1starboardhall)
 "pvA" = (
 /obj/effect/floor_decal/borderfloorblack{
 	dir = 1
@@ -20738,6 +21194,7 @@
 /area/endeavour/surfacebase/sauna)
 "pAX" = (
 /obj/machinery/sleep_console,
+/obj/effect/floor_decal/industrial/outline,
 /turf/simulated/floor/tiled/white,
 /area/exploration/medical)
 "pBk" = (
@@ -20912,8 +21369,7 @@
 	dir = 4
 	},
 /obj/machinery/light{
-	dir = 4;
-	use_power = 0
+	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
@@ -20939,6 +21395,17 @@
 /obj/machinery/fire_alarm/north_mount,
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d1portforhall)
+"pKP" = (
+/obj/machinery/light/small,
+/obj/structure/disposalpipe/trunk{
+	dir = 8
+	},
+/obj/machinery/disposal,
+/obj/effect/floor_decal/spline/fancy/wood{
+	dir = 9
+	},
+/turf/simulated/floor/wood,
+/area/library)
 "pKV" = (
 /obj/effect/floor_decal/borderfloorblack,
 /obj/effect/floor_decal/corner/navblue/border,
@@ -21016,9 +21483,11 @@
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d1afthall)
 "pOh" = (
-/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/endeavour/hallway/d1fwdmaint)
+/obj/machinery/camera/network/civilian{
+	dir = 9
+	},
+/turf/simulated/floor/tiled/freezer,
+/area/crew_quarters/pool)
 "pOB" = (
 /obj/machinery/door/firedoor/glass{
 	dir = 8
@@ -21039,6 +21508,17 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/endeavour/surfacebase/sauna)
+"pOJ" = (
+/obj/effect/floor_decal/spline/plain{
+	dir = 8
+	},
+/obj/machinery/air_alarm{
+	dir = 4;
+	pixel_x = -22
+	},
+/obj/structure/bed/padded,
+/turf/simulated/floor/tiled/freezer,
+/area/crew_quarters/pool)
 "pPL" = (
 /turf/simulated/floor/plating,
 /area/maintenance/substation/civilian)
@@ -21129,6 +21609,13 @@
 	},
 /turf/simulated/floor/tiled,
 /area/shuttle/excursion/general)
+"pTh" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 5
+	},
+/obj/machinery/light,
+/turf/simulated/floor/tiled/freezer,
+/area/crew_quarters/pool)
 "pUQ" = (
 /obj/effect/floor_decal/borderfloorblack,
 /obj/effect/floor_decal/corner/navgold/border,
@@ -21159,6 +21646,19 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/exploration/medical)
+"pVF" = (
+/obj/effect/floor_decal/borderfloorblack{
+	dir = 1
+	},
+/obj/effect/floor_decal/corner/navgold/border{
+	dir = 1
+	},
+/obj/machinery/door/firedoor{
+	dir = 8
+	},
+/obj/machinery/door/airlock/glass,
+/turf/simulated/floor/tiled/steel,
+/area/endeavour/hallway/d1starboardhall)
 "pVQ" = (
 /obj/effect/floor_decal/borderfloorblack/corner,
 /obj/effect/floor_decal/corner/navblue/bordercorner,
@@ -21253,6 +21753,13 @@
 	},
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d1fwdhall)
+"qcD" = (
+/obj/structure/bed/chair,
+/obj/effect/floor_decal/spline/fancy/wood{
+	dir = 5
+	},
+/turf/simulated/floor/carpet/bcarpet,
+/area/tether/station/burial)
 "qcV" = (
 /obj/effect/floor_decal/borderfloorblack,
 /obj/effect/floor_decal/corner/navblue/border,
@@ -21280,7 +21787,7 @@
 /obj/structure/sign/directions/engineering{
 	pixel_y = 11
 	},
-/turf/simulated/wall/r_wall/prepainted/civilian,
+/turf/simulated/wall/r_wall/prepainted,
 /area/station/stairs_one)
 "qdM" = (
 /obj/machinery/door/firedoor,
@@ -21368,6 +21875,12 @@
 	},
 /turf/simulated/floor/tiled,
 /area/endeavour/exploration/hallway_fore)
+"qfR" = (
+/obj/structure/table/rack,
+/obj/item/tank/air,
+/obj/item/tank/air,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d1aftmaint)
 "qfY" = (
 /obj/machinery/air_alarm{
 	frequency = 1441;
@@ -21475,7 +21988,7 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/tiled/steel,
-/area/endeavour/hallway/d1starboardamidhall)
+/area/endeavour/hallway/d1starboardhall)
 "qku" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 9
@@ -21604,13 +22117,28 @@
 	},
 /turf/simulated/floor/tiled,
 /area/endeavour/surfacebase/sauna)
-"qqr" = (
-/obj/structure/catwalk,
-/obj/machinery/atmospherics/pipe/simple/hidden{
-	dir = 8
+"qqo" = (
+/obj/effect/floor_decal/borderfloorblack{
+	dir = 1
 	},
-/turf/simulated/floor/plating,
-/area/endeavour/hallway/d1aftmaint)
+/obj/effect/floor_decal/corner/navgold/border{
+	dir = 1
+	},
+/obj/effect/floor_decal/borderfloorblack/corner2{
+	dir = 4
+	},
+/obj/effect/floor_decal/corner/navgold/bordercorner2{
+	dir = 4
+	},
+/obj/structure/sign/department/biblio{
+	pixel_y = 32
+	},
+/turf/simulated/floor/tiled/steel,
+/area/endeavour/hallway/d1starboardhall)
+"qqr" = (
+/obj/structure/lattice,
+/turf/space/basic,
+/area/space)
 "qrz" = (
 /obj/structure/cable/green{
 	icon_state = "1-2"
@@ -21791,7 +22319,7 @@
 /area/endeavour/hallway/d1fwdhall)
 "qzb" = (
 /obj/structure/disposalpipe/segment{
-	dir = 2;
+	dir = 4;
 	icon_state = "pipe-c"
 	},
 /turf/simulated/floor/tiled/steel,
@@ -22029,6 +22557,9 @@
 	name = "Security Checkpoint";
 	sortType = "Security Checkpoint"
 	},
+/obj/structure/cable/green{
+	icon_state = "2-4"
+	},
 /turf/simulated/floor/tiled/steel,
 /area/hallway/secondary/docking_hallway)
 "qJE" = (
@@ -22105,17 +22636,12 @@
 /obj/effect/floor_decal/corner/navgold/border,
 /obj/effect/floor_decal/borderfloorblack,
 /obj/effect/floor_decal/corner/navgold/border,
-/obj/machinery/computer/timeclock/premade/south,
-/obj/machinery/door/firedoor{
-	dir = 1
-	},
 /obj/effect/floor_decal/borderfloorblack/corner2{
 	dir = 9
 	},
 /obj/effect/floor_decal/corner/navgold/bordercorner2{
 	dir = 9
 	},
-/obj/machinery/door/airlock/glass,
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d1starboardafthall)
 "qLL" = (
@@ -22172,29 +22698,28 @@
 "qMR" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/effect/floor_decal/borderfloorblack/corner{
-	dir = 4
-	},
-/obj/effect/floor_decal/corner/navgold/bordercorner{
-	dir = 4
-	},
-/turf/simulated/floor/tiled,
-/area/hallway/secondary/docking_hallway)
-"qNt" = (
 /obj/effect/floor_decal/borderfloorblack{
-	dir = 1
+	dir = 4
 	},
 /obj/effect/floor_decal/corner/navgold/border{
-	dir = 1
+	dir = 4
 	},
 /obj/effect/floor_decal/borderfloorblack/corner2{
-	dir = 1
+	dir = 5
 	},
 /obj/effect/floor_decal/corner/navgold/bordercorner2{
-	dir = 1
+	dir = 5
 	},
 /turf/simulated/floor/tiled,
 /area/hallway/secondary/docking_hallway)
+"qNt" = (
+/obj/machinery/button/remote/driver{
+	id = "chapelgun";
+	name = "Chapel Mass Driver";
+	pixel_x = 25
+	},
+/turf/simulated/floor/tiled/dark,
+/area/tether/station/burial)
 "qNJ" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
@@ -22311,9 +22836,10 @@
 /turf/simulated/floor/tiled,
 /area/hallway/secondary/docking_hallway2)
 "qQJ" = (
-/obj/machinery/light/small,
+/obj/structure/catwalk,
+/obj/effect/floor_decal/rust,
 /turf/simulated/floor/plating,
-/area/hallway/secondary/docking_hallway)
+/area/maintenance/chapel)
 "qQK" = (
 /obj/effect/floor_decal/chapel{
 	dir = 8
@@ -22394,13 +22920,10 @@
 "qUT" = (
 /obj/structure/catwalk,
 /obj/structure/cable/green{
-	icon_state = "1-2"
-	},
-/obj/structure/cable/green{
-	icon_state = "1-2"
+	icon_state = "4-8"
 	},
 /turf/simulated/floor/plating,
-/area/endeavour/hallway/d1aftmaint)
+/area/maintenance/asmaint)
 "qVN" = (
 /obj/structure/flora/pottedplant/subterranean,
 /turf/simulated/floor/carpet/bcarpet,
@@ -22417,6 +22940,10 @@
 /obj/machinery/meter,
 /turf/simulated/floor/tiled/dark,
 /area/hallway/secondary/docking_hallway2)
+"qWa" = (
+/obj/structure/reagent_dispensers/fueltank,
+/turf/simulated/floor/plating,
+/area/maintenance/chapel)
 "qWg" = (
 /obj/machinery/door/blast/regular{
 	density = 0;
@@ -22446,12 +22973,14 @@
 /turf/simulated/floor/carpet/purcarpet,
 /area/bridge)
 "qWP" = (
-/obj/machinery/light/small{
-	dir = 8
+/obj/effect/floor_decal/borderfloorblack{
+	dir = 1
 	},
-/obj/machinery/floodlight,
-/turf/simulated/floor/plating,
-/area/maintenance/chapel)
+/obj/effect/floor_decal/corner/navgold/border{
+	dir = 1
+	},
+/turf/simulated/floor/tiled/steel,
+/area/endeavour/hallway/d1starboardhall)
 "qWS" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 1
@@ -22543,6 +23072,13 @@
 	},
 /turf/simulated/floor/plating,
 /area/endeavour/hallway/d1fwdmaint)
+"qZX" = (
+/obj/machinery/vending/cola,
+/obj/effect/floor_decal/spline/fancy/wood{
+	dir = 1
+	},
+/turf/simulated/floor/wood,
+/area/library)
 "raV" = (
 /obj/structure/dogbed{
 	name = "pet bed"
@@ -22628,6 +23164,7 @@
 	},
 /obj/item/book/custom_library/fiction,
 /obj/item/book/custom_library/fiction,
+/obj/effect/floor_decal/spline/fancy/wood,
 /turf/simulated/floor/wood,
 /area/library)
 "rdn" = (
@@ -22846,14 +23383,11 @@
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d1afthall)
 "rln" = (
-/obj/machinery/air_alarm{
-	dir = 1;
-	pixel_y = -22;
-	target_temperature = 312.15
+/obj/structure/cable/green{
+	icon_state = "1-2"
 	},
-/obj/effect/mist,
-/turf/simulated/floor/water/pool,
-/area/endeavour/surfacebase/sauna)
+/turf/simulated/floor/plating,
+/area/maintenance/chapel)
 "rlA" = (
 /obj/machinery/door/firedoor{
 	dir = 8
@@ -22864,7 +23398,7 @@
 	req_access = list(25)
 	},
 /obj/machinery/door/blast/shutters{
-	dir = 2;
+	dir = 8;
 	id = "cafe";
 	layer = 3.1;
 	name = "Cafe Shutters"
@@ -22990,9 +23524,13 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/obj/machinery/atmospherics/component/unary/vent_pump/on{
+/obj/machinery/door/firedoor{
 	dir = 1
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 5
+	},
+/obj/machinery/door/airlock/glass,
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d1starboardafthall)
 "rqv" = (
@@ -23441,8 +23979,13 @@
 /turf/simulated/floor/carpet/tealcarpet,
 /area/shuttle/civvie/general)
 "rKP" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/landmark/spawnpoint/job/field_medic,
+/obj/effect/floor_decal/borderfloor{
+	dir = 8
+	},
+/obj/effect/floor_decal/corner/blue/border{
+	dir = 8
+	},
+/obj/machinery/suit_storage_unit/search_and_rescue,
 /turf/simulated/floor/tiled/white,
 /area/exploration/medical)
 "rLb" = (
@@ -23523,6 +24066,9 @@
 /obj/structure/cable/green{
 	icon_state = "4-8"
 	},
+/obj/effect/floor_decal/spline/fancy/wood{
+	dir = 4
+	},
 /turf/simulated/floor/wood,
 /area/library)
 "rRP" = (
@@ -23619,11 +24165,6 @@
 /obj/machinery/atmospherics/component/unary/vent_scrubber/on{
 	dir = 4
 	},
-/obj/machinery/button/windowtint{
-	dir = 4;
-	id = "sauna_tint";
-	pixel_x = -25
-	},
 /obj/structure/table/bench/wooden,
 /obj/effect/mist,
 /turf/simulated/floor/wood,
@@ -23645,16 +24186,12 @@
 /turf/simulated/wall/r_wall/prepainted/exploration,
 /area/gateway)
 "rVX" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+/obj/machinery/fire_alarm/north_mount,
+/obj/machinery/atmospherics/component/unary/vent_pump/on{
 	dir = 4
 	},
-/obj/machinery/holopad,
-/obj/structure/disposalpipe/segment,
-/turf/simulated/floor/carpet/bcarpet,
-/area/library)
+/turf/simulated/floor/tiled/dark,
+/area/tether/station/burial)
 "rWf" = (
 /obj/structure/flora/pottedplant/stoutbush{
 	pixel_y = 12
@@ -23669,8 +24206,12 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
-/turf/simulated/floor/carpet/bcarpet,
+/turf/simulated/floor/wood,
 /area/library)
+"rXt" = (
+/obj/structure/lattice,
+/turf/space/basic,
+/area/endeavour/command/turrets)
 "rXv" = (
 /obj/machinery/door/airlock{
 	name = "Internal Affairs"
@@ -23732,13 +24273,9 @@
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d1afthall)
 "saq" = (
+/obj/effect/floor_decal/borderfloor,
+/obj/effect/floor_decal/corner/blue/border,
 /obj/machinery/iv_drip,
-/obj/effect/floor_decal/borderfloor{
-	dir = 10
-	},
-/obj/effect/floor_decal/corner/blue/border{
-	dir = 10
-	},
 /turf/simulated/floor/tiled/white,
 /area/exploration/medical)
 "saB" = (
@@ -23855,6 +24392,7 @@
 /obj/structure/cable/green{
 	icon_state = "1-2"
 	},
+/obj/structure/disposalpipe/segment,
 /turf/simulated/floor/tiled,
 /area/chapel/main)
 "sfl" = (
@@ -23982,15 +24520,12 @@
 /turf/simulated/floor/tiled/dark,
 /area/chapel/main)
 "skF" = (
-/obj/machinery/camera/network/civilian,
-/obj/effect/floor_decal/borderfloorblack{
-	dir = 1
-	},
-/obj/effect/floor_decal/corner/navgold/border{
-	dir = 1
+/obj/machinery/door/firedoor/glass,
+/obj/structure/cable/green{
+	icon_state = "4-8"
 	},
-/turf/simulated/floor/tiled,
-/area/hallway/secondary/docking_hallway)
+/turf/simulated/floor/tiled/freezer,
+/area/crew_quarters/pool)
 "skI" = (
 /obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks,
 /obj/effect/paint/commandblue,
@@ -24034,26 +24569,21 @@
 	},
 /obj/effect/floor_decal/industrial/outline/yellow,
 /obj/machinery/light{
-	dir = 4;
-	use_power = 0
+	dir = 4
 	},
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d1afthall)
 "smS" = (
-/obj/structure/catwalk,
 /obj/structure/cable/green{
 	icon_state = "2-4"
 	},
-/turf/simulated/floor/plating,
-/area/maintenance/chapel)
+/turf/simulated/floor/tiled/steel,
+/area/endeavour/hallway/d1starboardhall)
 "snc" = (
-/obj/machinery/atmospherics/component/unary/vent_scrubber/on{
-	dir = 8
-	},
 /obj/structure/cable/green{
 	icon_state = "4-8"
 	},
-/turf/simulated/floor/carpet/bcarpet,
+/turf/simulated/floor/wood,
 /area/library)
 "sne" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -24078,6 +24608,15 @@
 	},
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/exploration/excursion_dock)
+"spU" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 6
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 6
+	},
+/turf/simulated/floor/wood,
+/area/library)
 "sqa" = (
 /obj/structure/bed/chair{
 	dir = 4
@@ -24120,6 +24659,10 @@
 /obj/machinery/recharge_station,
 /turf/simulated/floor/tiled/white,
 /area/endeavour/hallway/d1fwdmaint)
+"ssh" = (
+/obj/machinery/light/small,
+/turf/simulated/floor/plating,
+/area/maintenance/asmaint)
 "ssN" = (
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply,
@@ -24273,7 +24816,7 @@
 /turf/simulated/floor/plating,
 /area/hallway/secondary/docking_hallway)
 "syY" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
+/obj/structure/closet/athletic_mixed,
 /turf/simulated/floor/tiled/freezer,
 /area/crew_quarters/pool)
 "szl" = (
@@ -24327,7 +24870,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/tiled/steel,
-/area/endeavour/hallway/d1starboardamidhall)
+/area/endeavour/hallway/d1starboardhall)
 "sBk" = (
 /obj/structure/flora/pottedplant/orientaltree,
 /obj/machinery/atmospherics/component/unary/vent_pump/on,
@@ -24456,7 +24999,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/plating,
-/area/maintenance/chapel)
+/area/endeavour/hallway/d1fwdmaint)
 "sFu" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/structure/flora/ausbushes/ppflowers,
@@ -24472,8 +25015,8 @@
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/exploration/excursion_dock)
 "sFF" = (
-/obj/machinery/atmospherics/component/unary/vent_pump/on{
-	dir = 8
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
 	},
 /turf/simulated/floor/tiled/freezer,
 /area/crew_quarters/pool)
@@ -24490,7 +25033,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/plating,
-/area/maintenance/chapel)
+/area/endeavour/hallway/d1fwdmaint)
 "sGN" = (
 /obj/structure/table/woodentable,
 /obj/item/flashlight/lamp/green,
@@ -24535,6 +25078,15 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/endeavour/hallway/d1fwdmaint)
+"sIU" = (
+/obj/effect/floor_decal/borderfloorblack,
+/obj/effect/floor_decal/corner/navgold/border,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
+/turf/simulated/floor/tiled/steel,
+/area/endeavour/hallway/d1starboardhall)
 "sJl" = (
 /obj/effect/floor_decal/spline/plain{
 	dir = 9
@@ -24542,9 +25094,15 @@
 /turf/simulated/floor/carpet/purcarpet,
 /area/exploration/meeting)
 "sJt" = (
-/obj/machinery/holopad,
-/turf/simulated/floor/wood,
-/area/crew_quarters/coffee_shop)
+/obj/effect/floor_decal/borderfloorblack{
+	dir = 6
+	},
+/obj/effect/floor_decal/corner/navgold/border{
+	dir = 6
+	},
+/obj/item/radio/intercom/south_mount,
+/turf/simulated/floor/tiled/steel,
+/area/endeavour/hallway/d1starboardforhall)
 "sJw" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -24630,7 +25188,7 @@
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d1portamidhall)
 "sPy" = (
-/obj/machinery/vending/snack,
+/obj/machinery/vending/fitness,
 /turf/simulated/floor/wood,
 /area/hydroponics/garden)
 "sPS" = (
@@ -24777,11 +25335,12 @@
 /turf/simulated/floor/plating,
 /area/hydroponics/garden)
 "sSQ" = (
+/obj/structure/catwalk,
 /obj/structure/cable/green{
-	icon_state = "1-2"
+	icon_state = "2-4"
 	},
 /turf/simulated/floor/plating,
-/area/endeavour/hallway/d1aftmaint)
+/area/maintenance/asmaint)
 "sTF" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -24826,11 +25385,9 @@
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d1portforhall)
 "sUx" = (
-/obj/machinery/atmospherics/component/unary/vent_scrubber/on{
-	dir = 8
-	},
-/turf/simulated/floor/tiled/freezer,
-/area/crew_quarters/pool)
+/obj/structure/catwalk,
+/turf/simulated/floor/plating,
+/area/maintenance/asmaint)
 "sUA" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -25036,6 +25593,11 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d1afthall)
+"tdE" = (
+/obj/structure/closet/firecloset,
+/obj/effect/floor_decal/rust,
+/turf/simulated/floor/plating,
+/area/maintenance/library)
 "tdX" = (
 /obj/effect/floor_decal/borderfloorblack{
 	dir = 1
@@ -25144,9 +25706,12 @@
 /turf/simulated/floor/tiled,
 /area/hallway/secondary/docking_hallway2)
 "thM" = (
-/obj/structure/girder,
-/turf/simulated/floor/plating,
-/area/maintenance/chapel)
+/obj/effect/floor_decal/spline/fancy/wood{
+	dir = 8
+	},
+/obj/structure/flora/pottedplant/minitree,
+/turf/simulated/floor/carpet/bcarpet,
+/area/tether/station/burial)
 "thT" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -25177,6 +25742,9 @@
 /obj/structure/cable/green{
 	icon_state = "1-4"
 	},
+/obj/effect/floor_decal/spline/fancy/wood{
+	dir = 1
+	},
 /turf/simulated/floor/wood,
 /area/library)
 "tjQ" = (
@@ -25250,8 +25818,8 @@
 /area/bridge)
 "tme" = (
 /obj/structure/closet/crate,
-/obj/item/stack/material/steel/full_stack,
-/obj/item/stack/material/steel/full_stack,
+/obj/fiftyspawner/steel,
+/obj/fiftyspawner/steel,
 /obj/fiftyspawner/glass,
 /obj/fiftyspawner/glass,
 /turf/simulated/floor/plating,
@@ -25393,12 +25961,10 @@
 /turf/simulated/floor/plating,
 /area/endeavour/exploration/hallway_fore)
 "tsT" = (
-/obj/structure/extinguisher_cabinet{
-	pixel_y = -31
-	},
-/obj/machinery/light/small,
-/turf/simulated/floor/carpet/bcarpet,
-/area/library)
+/obj/structure/table/glass,
+/obj/item/inflatable_duck,
+/turf/simulated/floor/tiled/freezer,
+/area/crew_quarters/pool)
 "tsU" = (
 /obj/structure/cable/green{
 	icon_state = "4-8"
@@ -25418,15 +25984,20 @@
 /turf/simulated/floor/wood,
 /area/lawoffice)
 "ttt" = (
-/obj/machinery/power/apc/north_mount,
+/obj/machinery/air_alarm{
+	pixel_y = 22
+	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
-/obj/structure/cable/green{
-	icon_state = "0-8"
-	},
 /turf/simulated/floor/tiled/freezer,
 /area/crew_quarters/pool)
+"ttV" = (
+/obj/machinery/light{
+	dir = 8
+	},
+/turf/simulated/floor/plating,
+/area/maintenance/asmaint)
 "ttX" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -25445,6 +26016,12 @@
 	},
 /turf/simulated/floor/wood,
 /area/lawoffice)
+"tuq" = (
+/obj/machinery/atmospherics/component/unary/vent_scrubber/on{
+	dir = 1
+	},
+/turf/simulated/floor/tiled/freezer,
+/area/crew_quarters/pool/changing_room)
 "tuw" = (
 /obj/item/barrier_tape_roll/engineering,
 /obj/structure/table/reinforced,
@@ -25525,6 +26102,21 @@
 	},
 /turf/simulated/floor/tiled,
 /area/endeavour/exploration/hallway_fore)
+"tvv" = (
+/obj/effect/floor_decal/borderfloorblack,
+/obj/effect/floor_decal/corner/navgold/border,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/machinery/door/firedoor{
+	dir = 8
+	},
+/obj/machinery/door/airlock/glass,
+/turf/simulated/floor/tiled/steel,
+/area/endeavour/hallway/d1starboardhall)
 "tvy" = (
 /obj/machinery/atmospherics/component/unary/vent_pump/high_volume{
 	dir = 4;
@@ -25552,17 +26144,22 @@
 	icon_state = "1-2"
 	},
 /obj/structure/table/wooden_reinforced,
+/obj/item/material/ashtray/glass,
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d1afthall)
 "tvS" = (
-/obj/machinery/cryopod/robot/door/shuttle,
-/obj/machinery/door/firedoor,
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/endeavour/hallway/d1afthall)
-"twe" = (
-/obj/machinery/atmospherics/component/unary/vent_pump/on{
-	dir = 4
+/obj/effect/floor_decal/borderfloorblack{
+	dir = 1
+	},
+/obj/effect/floor_decal/corner/navgold/border{
+	dir = 1
+	},
+/obj/machinery/light{
+	dir = 1
 	},
+/turf/simulated/floor/tiled/steel,
+/area/endeavour/hallway/d1starboardhall)
+"twe" = (
 /obj/structure/disposalpipe/segment,
 /obj/structure/cable/green{
 	icon_state = "4-8"
@@ -25637,13 +26234,26 @@
 /turf/simulated/floor/plating,
 /area/maintenance/substation/command)
 "txV" = (
-/obj/structure/window/basic{
-	dir = 1
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 5
 	},
-/obj/effect/floor_decal/industrial/outline/blue,
-/obj/structure/closet/athletic_mixed,
-/turf/simulated/floor/holofloor/tiled/dark,
-/area/crew_quarters/pool/changing_room)
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 5
+	},
+/obj/effect/floor_decal/borderfloorblack{
+	dir = 10
+	},
+/obj/effect/floor_decal/corner/navgold/border{
+	dir = 10
+	},
+/obj/effect/floor_decal/borderfloorblack/corner2{
+	dir = 8
+	},
+/obj/effect/floor_decal/corner/navgold/bordercorner2{
+	dir = 8
+	},
+/turf/simulated/floor/tiled/steel,
+/area/endeavour/hallway/d1starboardhall)
 "tyc" = (
 /obj/item/paper_bin,
 /obj/structure/table/reinforced,
@@ -25705,11 +26315,27 @@
 	},
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d1afthall)
+"tBM" = (
+/obj/structure/catwalk,
+/obj/structure/cable/green{
+	icon_state = "1-8"
+	},
+/turf/simulated/floor/plating,
+/area/maintenance/asmaint)
 "tBO" = (
 /obj/structure/table/marble,
 /obj/item/flashlight/lamp/green,
 /turf/simulated/floor/wood,
 /area/bridge/office)
+"tBZ" = (
+/obj/machinery/door/firedoor{
+	dir = 1
+	},
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
+/turf/simulated/floor/carpet/bcarpet,
+/area/library)
 "tCb" = (
 /obj/effect/floor_decal/borderfloorblack{
 	dir = 4
@@ -25718,8 +26344,7 @@
 	dir = 4
 	},
 /obj/machinery/light{
-	dir = 4;
-	use_power = 0
+	dir = 4
 	},
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d1portamidhall)
@@ -25971,15 +26596,17 @@
 /turf/simulated/floor/plating,
 /area/maintenance/substation/civilian)
 "tLA" = (
-/obj/structure/cable/green{
-	icon_state = "4-8"
+/obj/machinery/air_alarm{
+	pixel_y = 22
 	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
-/obj/effect/floor_decal/borderfloorblack,
-/obj/effect/floor_decal/corner/navgold/border,
-/turf/simulated/floor/tiled,
-/area/hallway/secondary/docking_hallway)
+/obj/effect/floor_decal/borderfloorblack{
+	dir = 1
+	},
+/obj/effect/floor_decal/corner/navgold/border{
+	dir = 1
+	},
+/turf/simulated/floor/tiled/steel,
+/area/endeavour/hallway/d1starboardhall)
 "tLX" = (
 /obj/vehicle_old/train/engine{
 	dir = 8
@@ -26000,11 +26627,16 @@
 /turf/simulated/shuttle/plating/airless/carry,
 /area/shuttle/civvie/general)
 "tMO" = (
-/obj/machinery/camera/network/civilian{
-	dir = 9
+/obj/machinery/door/airlock/maintenance/common,
+/obj/machinery/door/firedoor{
+	dir = 1
 	},
-/turf/simulated/floor/tiled/freezer,
-/area/crew_quarters/pool)
+/obj/structure/catwalk,
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d1aftmaint)
 "tNi" = (
 /obj/effect/floor_decal/borderfloor{
 	dir = 1
@@ -26124,13 +26756,14 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/tiled/steel,
-/area/endeavour/hallway/d1starboardamidhall)
+/area/endeavour/hallway/d1starboardhall)
 "tQt" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/structure/cable/green{
 	icon_state = "1-2"
 	},
+/obj/structure/disposalpipe/segment,
 /turf/simulated/floor/tiled,
 /area/chapel/main)
 "tQu" = (
@@ -26170,6 +26803,9 @@
 /obj/structure/cable/green{
 	icon_state = "1-4"
 	},
+/obj/structure/cable/green{
+	icon_state = "1-8"
+	},
 /turf/simulated/floor/plating,
 /area/maintenance/chapel)
 "tTD" = (
@@ -26184,7 +26820,7 @@
 /obj/random/maintenance/security,
 /obj/structure/closet/crate,
 /turf/simulated/floor/plating,
-/area/maintenance/chapel)
+/area/endeavour/hallway/d1fwdmaint)
 "tUS" = (
 /obj/machinery/computer/communications,
 /obj/machinery/keycard_auth{
@@ -26249,7 +26885,7 @@
 	dir = 8
 	},
 /turf/simulated/floor/tiled,
-/area/endeavour/hallway/d1starboardamidhall)
+/area/endeavour/hallway/d1starboardhall)
 "tWE" = (
 /obj/effect/floor_decal/borderfloorblack{
 	dir = 4
@@ -26270,9 +26906,15 @@
 /turf/simulated/floor/tiled,
 /area/maintenance/tool_storage)
 "tXS" = (
-/obj/machinery/door/firedoor/glass,
-/turf/simulated/floor/tiled/white,
-/area/crew_quarters/pool/changing_room)
+/obj/item/radio/intercom{
+	pixel_y = -24
+	},
+/obj/machinery/vending/coffee,
+/obj/effect/floor_decal/spline/fancy/wood{
+	dir = 1
+	},
+/turf/simulated/floor/wood,
+/area/library)
 "tYZ" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -26385,7 +27027,7 @@
 	dir = 2;
 	id = "cap_office";
 	layer = 3.1;
-	name = "Colony Directo's Shutters"
+	name = "Colony Director's Shutters"
 	},
 /obj/spawner/window/low_wall/reinforced/full/firelocks,
 /obj/effect/paint/commandblue,
@@ -26456,16 +27098,12 @@
 /turf/simulated/wall/r_wall/prepainted,
 /area/maintenance/chapel)
 "uda" = (
-/obj/structure/window/basic{
-	dir = 1
-	},
-/obj/effect/floor_decal/industrial/outline/blue,
-/obj/structure/closet/athletic_mixed,
-/obj/machinery/light{
-	dir = 4
+/obj/machinery/power/apc/east_mount,
+/obj/structure/cable/green{
+	icon_state = "0-8"
 	},
-/turf/simulated/floor/holofloor/tiled/dark,
-/area/crew_quarters/pool/changing_room)
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d1aftmaint)
 "udj" = (
 /obj/effect/floor_decal/borderfloorblack{
 	dir = 8
@@ -26564,14 +27202,11 @@
 /turf/simulated/wall/r_wall/prepainted/command,
 /area/endeavour/hallway/d1fwdmaint)
 "ugs" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 9
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 9
-	},
 /obj/machinery/light/small,
-/turf/simulated/floor/carpet/bcarpet,
+/obj/effect/floor_decal/spline/fancy/wood{
+	dir = 8
+	},
+/turf/simulated/floor/wood,
 /area/library)
 "ugI" = (
 /obj/machinery/atmospherics/component/unary/heat_exchanger{
@@ -26688,6 +27323,10 @@
 /obj/structure/cable/green{
 	icon_state = "1-2"
 	},
+/obj/structure/disposalpipe/segment{
+	dir = 8;
+	icon_state = "pipe-c"
+	},
 /turf/simulated/floor/tiled/dark,
 /area/chapel/main)
 "ulm" = (
@@ -26754,26 +27393,16 @@
 /turf/simulated/floor/wood,
 /area/exploration/meeting)
 "umU" = (
-/obj/effect/floor_decal/borderfloorblack{
-	dir = 5
-	},
-/obj/effect/floor_decal/corner/navgold/border{
-	dir = 5
-	},
-/obj/effect/floor_decal/borderfloorblack/corner2{
-	dir = 4
-	},
-/obj/effect/floor_decal/corner/navgold/bordercorner2{
-	dir = 4
-	},
-/obj/effect/floor_decal/borderfloorblack/corner2{
-	dir = 5
+/obj/structure/table/woodentable,
+/obj/effect/floor_decal/spline/fancy/wood,
+/obj/item/flame/candle/candelabra/everburn{
+	pixel_y = 8
 	},
-/obj/effect/floor_decal/corner/navgold/bordercorner2{
-	dir = 5
+/obj/machinery/light{
+	dir = 8
 	},
-/turf/simulated/floor/tiled,
-/area/hallway/secondary/docking_hallway)
+/turf/simulated/floor/carpet/bcarpet,
+/area/tether/station/burial)
 "uni" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -26811,6 +27440,13 @@
 	},
 /turf/simulated/floor/tiled,
 /area/gateway/prep_room)
+"uoW" = (
+/obj/structure/bed/chair,
+/obj/effect/floor_decal/spline/fancy/wood{
+	dir = 4
+	},
+/turf/simulated/floor/carpet/bcarpet,
+/area/tether/station/burial)
 "upy" = (
 /obj/structure/cable/green{
 	icon_state = "4-8"
@@ -27008,6 +27644,7 @@
 /obj/structure/cable/green{
 	icon_state = "1-2"
 	},
+/obj/structure/disposalpipe/segment,
 /turf/simulated/floor/tiled,
 /area/chapel/main)
 "uvD" = (
@@ -27025,14 +27662,14 @@
 /area/vacant/vacant_bar)
 "uvU" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 6
+	dir = 5
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 6
+	dir = 5
 	},
-/obj/structure/disposalpipe/segment,
-/turf/simulated/floor/carpet/bcarpet,
-/area/library)
+/obj/structure/catwalk,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d1fwdmaint)
 "uvX" = (
 /obj/effect/floor_decal/borderfloorblack/corner{
 	dir = 1
@@ -27048,6 +27685,12 @@
 	pixel_y = 16
 	},
 /obj/structure/curtain/open/shower,
+/obj/effect/floor_decal/steeldecal/steel_decals10{
+	dir = 6
+	},
+/obj/effect/floor_decal/steeldecal/steel_decals10{
+	dir = 5
+	},
 /turf/simulated/floor/tiled,
 /area/exploration/showers)
 "uwu" = (
@@ -27110,6 +27753,9 @@
 	dir = 8
 	},
 /obj/machinery/disposal,
+/obj/structure/disposalpipe/trunk{
+	dir = 4
+	},
 /turf/simulated/floor/tiled/dark,
 /area/chapel/main)
 "uxM" = (
@@ -27146,11 +27792,15 @@
 /turf/simulated/floor/plating,
 /area/maintenance/chapel)
 "uzz" = (
-/obj/structure/bed/chair/sofa/black/left{
+/obj/structure/bed/chair,
+/obj/effect/floor_decal/spline/fancy/wood{
 	dir = 1
 	},
-/turf/simulated/floor/wood,
-/area/maintenance/chapel)
+/obj/machinery/light{
+	dir = 8
+	},
+/turf/simulated/floor/carpet/bcarpet,
+/area/tether/station/burial)
 "uzH" = (
 /obj/effect/floor_decal/borderfloorblack{
 	dir = 8
@@ -27223,22 +27873,19 @@
 /turf/simulated/floor/tiled/dark,
 /area/station/stairs_one)
 "uBN" = (
-/obj/structure/catwalk,
 /obj/machinery/atmospherics/pipe/simple/hidden{
 	dir = 10
 	},
-/obj/structure/cable/green{
-	icon_state = "1-4"
-	},
 /turf/simulated/floor/plating,
-/area/endeavour/hallway/d1aftmaint)
+/area/maintenance/asmaint)
 "uBR" = (
 /obj/structure/catwalk,
 /obj/structure/cable/green{
-	icon_state = "1-4"
+	icon_state = "4-8"
 	},
+/obj/effect/floor_decal/rust,
 /turf/simulated/floor/plating,
-/area/endeavour/hallway/d1aftmaint)
+/area/maintenance/chapel)
 "uCu" = (
 /obj/effect/floor_decal/techfloor/orange{
 	dir = 9
@@ -27306,6 +27953,13 @@
 /obj/structure/railing,
 /turf/simulated/floor/plating,
 /area/shuttle/courser/general)
+"uGX" = (
+/obj/machinery/door/airlock/maintenance/common,
+/obj/machinery/door/firedoor{
+	dir = 1
+	},
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d1aftmaint)
 "uHb" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -27415,10 +28069,8 @@
 /turf/simulated/floor/tiled,
 /area/crew_quarters/heads/hop)
 "uMJ" = (
-/obj/effect/floor_decal/rust,
-/obj/effect/floor_decal/rust,
-/turf/simulated/floor/plating,
-/area/hallway/secondary/docking_hallway)
+/turf/simulated/wall/prepainted,
+/area/crew_quarters/pool)
 "uMM" = (
 /obj/machinery/light/small{
 	dir = 8
@@ -27478,6 +28130,16 @@
 	},
 /turf/simulated/floor/tiled,
 /area/exploration/pilot_prep)
+"uOZ" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/structure/catwalk,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d1fwdmaint)
 "uPj" = (
 /obj/effect/floor_decal/spline/plain{
 	dir = 8
@@ -27544,17 +28206,11 @@
 /turf/simulated/wall/r_wall/prepainted/civilian,
 /area/shuttle/civvie/general)
 "uRN" = (
-/obj/structure/cable/green{
-	icon_state = "2-4"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 6
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 6
+/obj/machinery/atmospherics/component/unary/vent_scrubber/on{
+	dir = 8
 	},
-/turf/simulated/floor/tiled,
-/area/hallway/secondary/docking_hallway)
+/turf/simulated/floor/tiled/freezer,
+/area/crew_quarters/pool)
 "uSH" = (
 /obj/machinery/atmospherics/component/unary/vent_pump/on,
 /turf/simulated/floor/wood,
@@ -27570,7 +28226,7 @@
 	dir = 8
 	},
 /turf/simulated/floor/plating,
-/area/endeavour/hallway/d1aftmaint)
+/area/maintenance/asmaint)
 "uTr" = (
 /turf/simulated/wall/prepainted,
 /area/endeavour/hallway/d1fwdmaint)
@@ -27602,10 +28258,10 @@
 /turf/simulated/floor/wood,
 /area/exploration/meeting)
 "uUz" = (
-/obj/item/radio/intercom{
-	pixel_y = -24
+/obj/effect/floor_decal/spline/fancy/wood{
+	dir = 4
 	},
-/turf/simulated/floor/carpet/bcarpet,
+/turf/simulated/floor/wood,
 /area/library)
 "uUK" = (
 /turf/simulated/floor/tiled/techfloor/grid,
@@ -27637,8 +28293,10 @@
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d1starboardafthall)
 "uVf" = (
-/obj/machinery/vending/cola,
-/turf/simulated/floor/carpet/bcarpet,
+/obj/item/radio/intercom{
+	pixel_y = -24
+	},
+/turf/simulated/floor/wood,
 /area/library)
 "uVx" = (
 /obj/machinery/camera/network/civilian{
@@ -27790,11 +28448,10 @@
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d1starboardamidhall)
 "vaR" = (
-/obj/machinery/computer/ship/navigation/telescreen{
-	pixel_y = -37
-	},
-/turf/simulated/floor/carpet/bcarpet,
-/area/library)
+/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks,
+/obj/effect/paint/palebottlegreen,
+/turf/simulated/floor/plating,
+/area/tether/station/burial)
 "vaT" = (
 /obj/machinery/washing_machine,
 /obj/machinery/air_alarm{
@@ -27817,7 +28474,7 @@
 "vca" = (
 /obj/structure/closet/firecloset,
 /turf/simulated/floor/plating,
-/area/maintenance/chapel)
+/area/maintenance/asmaint)
 "vce" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -27902,7 +28559,7 @@
 /turf/simulated/floor/plating,
 /area/shuttle/courser/general)
 "vdF" = (
-/turf/simulated/wall/r_wall/prepainted/civilian,
+/turf/simulated/wall/r_wall/prepainted,
 /area/station/stairs_one)
 "vdU" = (
 /obj/structure/cable{
@@ -28010,6 +28667,13 @@
 "vgA" = (
 /turf/simulated/open,
 /area/endeavour/hallway/d1fwdhall)
+"vhq" = (
+/obj/machinery/power/apc/south_mount,
+/obj/structure/cable/green{
+	icon_state = "0-8"
+	},
+/turf/simulated/floor/tiled/dark,
+/area/tether/station/burial)
 "vhJ" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 6
@@ -28073,7 +28737,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/tiled/steel,
-/area/endeavour/hallway/d1starboardamidhall)
+/area/endeavour/hallway/d1starboardhall)
 "vkr" = (
 /obj/structure/cable/green{
 	icon_state = "4-8"
@@ -28162,13 +28826,14 @@
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d1starboardamidhall)
 "vnQ" = (
-/obj/machinery/vending/snack,
 /obj/effect/floor_decal/borderfloorblack{
 	dir = 1
 	},
 /obj/effect/floor_decal/corner/navblue/border{
 	dir = 1
 	},
+/obj/machinery/disposal,
+/obj/structure/disposalpipe/trunk,
 /turf/simulated/floor/tiled/steel_ridged,
 /area/endeavour/hallway/d1afthall)
 "voy" = (
@@ -28184,14 +28849,13 @@
 /turf/simulated/floor/tiled/dark,
 /area/teleporter)
 "voN" = (
-/obj/structure/bed/chair/comfy/brown{
+/obj/structure/closet/emcloset,
+/obj/effect/floor_decal/spline/plain{
 	dir = 1
 	},
-/obj/item/radio/intercom{
-	pixel_y = -24
-	},
-/turf/simulated/floor/carpet/bcarpet,
-/area/library)
+/obj/effect/floor_decal/industrial/outline/blue,
+/turf/simulated/floor/holofloor/tiled/dark,
+/area/endeavour/hallway/d1starboardhall)
 "voU" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -28210,6 +28874,10 @@
 	},
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d1starboardafthall)
+"vpD" = (
+/obj/machinery/light/small,
+/turf/simulated/floor/carpet/bcarpet,
+/area/library)
 "vpK" = (
 /obj/machinery/light/small{
 	dir = 8
@@ -28433,8 +29101,7 @@
 	dir = 4
 	},
 /obj/machinery/light{
-	dir = 4;
-	use_power = 0
+	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -28481,6 +29148,21 @@
 /obj/item/bedsheet/mimedouble,
 /turf/simulated/floor/wood,
 /area/crew_quarters/mimeoffice)
+"vxW" = (
+/obj/effect/floor_decal/borderfloorblack{
+	dir = 1
+	},
+/obj/effect/floor_decal/corner/navgold/border{
+	dir = 1
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/structure/disposalpipe/junction{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/steel,
+/area/endeavour/hallway/d1starboardamidhall)
 "vyI" = (
 /obj/machinery/turnstile{
 	dir = 1
@@ -28518,21 +29200,14 @@
 /obj/effect/floor_decal/corner/navgold/border{
 	dir = 9
 	},
-/obj/machinery/power/apc/west_mount{
-	cell_type = /obj/item/cell/super
-	},
 /obj/structure/cable/green{
 	icon_state = "0-4"
 	},
 /obj/machinery/light{
 	dir = 8
 	},
-/obj/item/radio/intercom{
-	dir = 1;
-	name = "Station Intercom (General)";
-	pixel_y = 26
-	},
 /obj/effect/floor_decal/steeldecal/steel_decals4,
+/obj/machinery/power/apc/north_mount,
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d1starboardforhall)
 "vBt" = (
@@ -28583,9 +29258,6 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 10
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 10
-	},
 /obj/structure/cable/green{
 	icon_state = "1-8"
 	},
@@ -28737,6 +29409,13 @@
 	},
 /turf/simulated/floor/carpet/bcarpet,
 /area/crew_quarters/captain)
+"vGt" = (
+/obj/structure/table/woodentable,
+/obj/effect/floor_decal/spline/fancy/wood{
+	dir = 4
+	},
+/turf/simulated/floor/wood,
+/area/library)
 "vGC" = (
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
 /obj/structure/cable/green{
@@ -28826,24 +29505,16 @@
 /turf/simulated/floor/plating,
 /area/shuttle/courser/cockpit)
 "vJi" = (
-/obj/effect/floor_decal/borderfloorblack{
+/obj/effect/floor_decal/borderfloorblack/corner{
 	dir = 8
 	},
-/obj/effect/floor_decal/corner/navgold/border{
+/obj/effect/floor_decal/corner/navgold/bordercorner{
 	dir = 8
 	},
-/obj/item/radio/intercom{
-	dir = 8;
-	pixel_x = -24
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 5
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 5
-	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
 /turf/simulated/floor/tiled/steel,
-/area/endeavour/hallway/d1starboardamidhall)
+/area/endeavour/hallway/d1starboardhall)
 "vJp" = (
 /obj/structure/table/reinforced,
 /obj/fiftyspawner/rods,
@@ -28911,6 +29582,10 @@
 	},
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/exploration/excursion_dock)
+"vLi" = (
+/obj/machinery/fire_alarm/south_mount,
+/turf/simulated/floor/carpet/bcarpet,
+/area/chapel/main)
 "vLn" = (
 /obj/effect/floor_decal/spline/fancy{
 	dir = 9
@@ -29265,8 +29940,7 @@
 	dir = 4
 	},
 /obj/machinery/light{
-	dir = 4;
-	use_power = 0
+	dir = 4
 	},
 /obj/structure/cable/green{
 	icon_state = "1-2"
@@ -29334,11 +30008,15 @@
 /turf/simulated/floor/tiled,
 /area/maintenance/tool_storage)
 "wha" = (
-/obj/structure/extinguisher_cabinet{
-	pixel_x = 27
+/obj/item/radio/intercom/east_mount,
+/obj/machinery/computer/ship/navigation/telescreen{
+	pixel_y = -37
 	},
-/turf/simulated/floor/tiled/dark,
-/area/chapel/main)
+/obj/structure/bed/chair/sofa/brown/right{
+	dir = 1
+	},
+/turf/simulated/floor/carpet/bcarpet,
+/area/library)
 "whp" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -29383,6 +30061,17 @@
 	},
 /turf/simulated/floor/carpet/blue,
 /area/crew_quarters/heads/blueshield)
+"wjE" = (
+/obj/structure/catwalk,
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
+/obj/machinery/door/firedoor{
+	dir = 1
+	},
+/obj/machinery/door/airlock/maintenance/common,
+/turf/simulated/floor/plating,
+/area/maintenance/chapel)
 "wjN" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -29597,6 +30286,9 @@
 /obj/machinery/photocopier/faxmachine{
 	department = "Library Conference Room"
 	},
+/obj/effect/floor_decal/spline/fancy/wood{
+	dir = 4
+	},
 /turf/simulated/floor/wood,
 /area/library)
 "wrE" = (
@@ -29639,6 +30331,12 @@
 	},
 /turf/simulated/floor/tiled,
 /area/endeavour/exploration/hallway_fore)
+"wtu" = (
+/obj/machinery/fire_alarm/south_mount{
+	pixel_y = -24
+	},
+/turf/simulated/floor/wood,
+/area/library)
 "wtI" = (
 /obj/machinery/light{
 	dir = 4
@@ -29776,7 +30474,7 @@
 "wxw" = (
 /obj/structure/sign/deck/first,
 /turf/simulated/wall/prepainted,
-/area/maintenance/asmaint)
+/area/maintenance/library)
 "wxJ" = (
 /obj/structure/table/borosilicate,
 /obj/structure/dancepole,
@@ -29918,14 +30616,20 @@
 /turf/simulated/floor/plating,
 /area/maintenance/substation/civilian)
 "wAB" = (
-/obj/machinery/atmospherics/component/unary/vent_pump/on{
-	dir = 4
+/obj/effect/floor_decal/borderfloorblack{
+	dir = 1
 	},
-/obj/structure/cable/green{
-	icon_state = "1-2"
+/obj/effect/floor_decal/corner/navgold/border{
+	dir = 1
 	},
-/turf/simulated/floor/carpet/bcarpet,
-/area/library)
+/obj/effect/floor_decal/borderfloorblack/corner2{
+	dir = 1
+	},
+/obj/effect/floor_decal/corner/navgold/bordercorner2{
+	dir = 1
+	},
+/turf/simulated/floor/tiled/steel,
+/area/endeavour/hallway/d1starboardhall)
 "wAI" = (
 /obj/item/radio/intercom{
 	pixel_y = -24
@@ -30085,9 +30789,9 @@
 /turf/simulated/floor/tiled,
 /area/shuttle/excursion/general)
 "wGj" = (
-/obj/machinery/door/airlock/maintenance/common,
-/obj/machinery/door/firedoor/glass{
-	dir = 8
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/glass{
+	name = "Chapel"
 	},
 /obj/structure/cable/green{
 	icon_state = "4-8"
@@ -30259,6 +30963,10 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/tiled,
 /area/gateway/prep_room)
+"wQj" = (
+/obj/structure/bed/chair,
+/turf/simulated/floor/plating,
+/area/maintenance/chapel)
 "wQI" = (
 /obj/machinery/atmospherics/pipe/vent/high_volume,
 /turf/simulated/floor/airless/ceiling,
@@ -30360,7 +31068,7 @@
 /area/endeavour/hallway/d1fwdhall)
 "wUJ" = (
 /turf/simulated/wall/prepainted/civilian,
-/area/maintenance/chapel)
+/area/maintenance/library)
 "wVs" = (
 /obj/machinery/atmospherics/pipe/manifold/hidden/cyan,
 /obj/spawner/window/low_wall/borosillicate/full,
@@ -30391,7 +31099,6 @@
 /area/station/stairs_one)
 "wWR" = (
 /obj/machinery/fire_alarm/north_mount,
-/obj/machinery/disposal,
 /turf/simulated/floor/tiled,
 /area/endeavour/surfacebase/tram)
 "wWT" = (
@@ -30458,6 +31165,12 @@
 	},
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d1starboardafthall)
+"wZm" = (
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
+/turf/simulated/floor/tiled/steel,
+/area/endeavour/hallway/d1starboardhall)
 "wZQ" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 9
@@ -30649,11 +31362,18 @@
 /turf/simulated/floor/tiled/dark,
 /area/bridge/hallway)
 "xiw" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/structure/disposalpipe/segment{
 	dir = 8
 	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+	dir = 8
+	},
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
 /turf/simulated/floor/tiled,
 /area/hallway/secondary/docking_hallway)
 "xjh" = (
@@ -30827,6 +31547,7 @@
 	dir = 1
 	},
 /obj/structure/disposalpipe/segment,
+/obj/structure/catwalk,
 /turf/simulated/floor/tiled,
 /area/maintenance/substation/dock)
 "xri" = (
@@ -30835,6 +31556,18 @@
 	},
 /turf/simulated/floor/lino,
 /area/chapel/office)
+"xrp" = (
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/turf/simulated/floor/carpet/bcarpet,
+/area/library)
 "xrv" = (
 /obj/effect/floor_decal/spline/plain{
 	dir = 1
@@ -30871,6 +31604,10 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d1portamidhall)
+"xsP" = (
+/obj/machinery/floodlight,
+/turf/simulated/floor/plating,
+/area/maintenance/library)
 "xtc" = (
 /obj/structure/closet,
 /obj/item/clothing/under/suit_jacket/red,
@@ -30911,7 +31648,7 @@
 	dir = 1
 	},
 /obj/structure/disposalpipe/segment,
-/turf/simulated/floor/tiled/steel,
+/turf/simulated/floor/carpet/bcarpet,
 /area/library)
 "xtP" = (
 /obj/machinery/computer/communications,
@@ -31100,34 +31837,24 @@
 	},
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/hallway/secondary/docking_hallway)
+"xyy" = (
+/obj/structure/bed/chair,
+/obj/effect/floor_decal/rust,
+/turf/simulated/floor/plating,
+/area/maintenance/chapel)
 "xyA" = (
-/obj/effect/floor_decal/borderfloorblack{
-	dir = 6
-	},
-/obj/effect/floor_decal/corner/navgold/border{
-	dir = 6
-	},
-/obj/effect/floor_decal/borderfloorblack/corner2{
-	dir = 6
-	},
-/obj/effect/floor_decal/corner/navgold/bordercorner2{
-	dir = 6
-	},
+/obj/structure/catwalk,
 /obj/structure/cable/green{
-	icon_state = "1-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 9
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 9
+	icon_state = "2-4"
 	},
-/turf/simulated/floor/tiled,
-/area/hallway/secondary/docking_hallway)
+/turf/simulated/floor/plating,
+/area/maintenance/chapel)
 "xyG" = (
-/obj/machinery/door/firedoor/glass,
-/turf/simulated/wall/prepainted,
-/area/hallway/secondary/docking_hallway)
+/obj/structure/cable/green{
+	icon_state = "2-8"
+	},
+/turf/simulated/floor/tiled/dark,
+/area/tether/station/burial)
 "xzk" = (
 /obj/structure/cable/green{
 	icon_state = "4-8"
@@ -31425,17 +32152,20 @@
 /turf/simulated/floor/plating,
 /area/endeavour/hallway/d1fwdmaint)
 "xKW" = (
-/obj/machinery/light{
-	dir = 1
+/obj/machinery/door/airlock/civilian{
+	name = "Pool Access"
 	},
-/obj/effect/floor_decal/borderfloorblack{
+/obj/machinery/door/firedoor{
 	dir = 1
 	},
-/obj/effect/floor_decal/corner/navgold/border{
-	dir = 1
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 8
 	},
-/turf/simulated/floor/tiled,
-/area/hallway/secondary/docking_hallway)
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/steel,
+/area/crew_quarters/pool/changing_room)
 "xLn" = (
 /obj/machinery/door/airlock/command{
 	name = "Head of Personnel";
@@ -31464,6 +32194,22 @@
 	},
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/exploration/excursion_dock)
+"xMR" = (
+/obj/effect/floor_decal/borderfloorblack{
+	dir = 9
+	},
+/obj/effect/floor_decal/corner/navgold/border{
+	dir = 9
+	},
+/obj/effect/floor_decal/borderfloorblack/corner2{
+	alpha = 255;
+	dir = 10
+	},
+/obj/effect/floor_decal/corner/navgold/bordercorner2{
+	dir = 10
+	},
+/turf/simulated/floor/tiled/steel,
+/area/endeavour/hallway/d1starboardhall)
 "xNu" = (
 /turf/simulated/wall/prepainted,
 /area/crew_quarters/pool/changing_room)
@@ -31495,6 +32241,9 @@
 /obj/structure/cable/green{
 	icon_state = "1-2"
 	},
+/obj/structure/disposalpipe/segment{
+	dir = 8
+	},
 /turf/simulated/floor/tiled/dark,
 /area/chapel/main)
 "xPf" = (
@@ -31686,7 +32435,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/tiled/steel,
-/area/endeavour/hallway/d1starboardamidhall)
+/area/endeavour/hallway/d1starboardhall)
 "xVw" = (
 /obj/machinery/atmospherics/pipe/simple/hidden{
 	dir = 4
@@ -31722,18 +32471,25 @@
 	pixel_x = 32
 	},
 /obj/machinery/light{
-	dir = 4;
-	use_power = 0
+	dir = 4
 	},
 /turf/simulated/floor/glass/reinforced,
 /area/endeavour/hallway/d1fwdhall)
 "xZn" = (
 /turf/simulated/wall/r_wall/prepainted/science,
 /area/space)
+"xZq" = (
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 5
+	},
+/turf/simulated/floor/tiled/freezer,
+/area/crew_quarters/pool)
 "xZx" = (
 /obj/machinery/light{
-	dir = 4;
-	use_power = 0
+	dir = 4
 	},
 /obj/effect/floor_decal/borderfloorblack{
 	dir = 4
@@ -31900,11 +32656,11 @@
 /turf/simulated/floor/plating,
 /area/shuttle/courser/general)
 "ydA" = (
+/obj/effect/floor_decal/borderfloor,
+/obj/effect/floor_decal/corner/blue/border,
 /obj/structure/table/standard,
 /obj/item/defib_kit/loaded,
 /obj/item/storage/firstaid/surgery,
-/obj/effect/floor_decal/borderfloor,
-/obj/effect/floor_decal/corner/blue/border,
 /turf/simulated/floor/tiled/white,
 /area/exploration/medical)
 "ydG" = (
@@ -32046,8 +32802,15 @@
 	dir = 1
 	},
 /obj/machinery/door/airlock/maintenance/common,
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
 /turf/simulated/floor/plating,
-/area/maintenance/chapel)
+/area/maintenance/asmaint)
+"ykh" = (
+/obj/machinery/air_alarm/south_mount,
+/turf/simulated/floor/tiled/freezer,
+/area/crew_quarters/pool/changing_room)
 "ykT" = (
 /obj/machinery/holopad,
 /turf/simulated/floor/wood,
@@ -36640,13 +37403,13 @@ xRj
 xRj
 dkX
 aHh
-aHh
-aHh
-aHh
-aHh
-aHh
-aHh
-euS
+aVc
+mxK
+rKP
+rKP
+quA
+iwR
+bkR
 euS
 euS
 euS
@@ -36835,10 +37598,10 @@ xRj
 ePJ
 aHh
 aGL
-iwR
-jag
+mEg
 jag
-quA
+mEg
+lNd
 saq
 bkR
 aIj
@@ -37027,7 +37790,7 @@ xRj
 xRj
 xRj
 xRj
-aHh
+dXL
 lta
 mEg
 mEg
@@ -37610,10 +38373,10 @@ xRj
 usG
 usY
 aHh
-mxK
+jwy
 mfS
 azC
-rKP
+azC
 sDP
 glY
 bkR
@@ -40551,15 +41314,15 @@ sti
 sti
 sti
 sti
-tvS
-eFW
+sti
 eFW
 pjL
+pjL
+pjL
 eFW
 cMJ
 rTZ
 rTZ
-rTZ
 ozV
 cMJ
 tAk
@@ -40744,16 +41507,16 @@ aNK
 sWz
 efK
 wim
+wim
 sti
 apf
 agD
-pgL
 agD
-aqI
+agD
+eNz
 cMJ
 rTZ
 rTZ
-rTZ
 ozV
 cMJ
 tAk
@@ -40938,14 +41701,14 @@ jLe
 jLe
 jLe
 jLe
+jLe
 fVV
-apf
-pgL
 pgL
-pgL
-eNz
+agD
+agD
+agD
+gWl
 cMJ
-dIc
 ito
 ito
 foK
@@ -41133,12 +41896,12 @@ sti
 sti
 sti
 sti
+sti
 amu
-pgL
-pgL
-pgL
 hxi
-cMJ
+hxi
+hxi
+dIc
 cMJ
 cMJ
 cMJ
@@ -41326,14 +42089,14 @@ xvH
 clV
 sJO
 vsP
+vsP
 dAK
 kKK
 kKK
 kKK
-kKK
 xgP
-aBC
-vsP
+kKK
+cAG
 jGP
 jPz
 vsP
@@ -41923,21 +42686,21 @@ dZr
 dZr
 dZr
 dZr
-fmb
-fsR
-gWh
+aNK
+tMO
+aNK
 fhK
 fhK
 loX
 fhK
 fhK
 fhK
-wBM
-wBM
-wBM
-wBM
-wBM
-ijU
+sti
+sti
+sti
+sti
+sti
+sti
 apc
 eGS
 ijU
@@ -42117,21 +42880,21 @@ bzz
 dKp
 xNI
 dZr
-iqr
+wim
 fsR
-gWh
+wim
 fhK
 tAw
 iAm
 skd
 oAD
 fhK
-nct
-nct
-nct
-cMf
-nct
-ijU
+wim
+wim
+aLP
+ejN
+wim
+sti
 wIX
 iGx
 gja
@@ -42311,21 +43074,21 @@ xNI
 xNI
 oiL
 dZr
-fmb
+wim
 fsR
-gWh
+wim
 fhK
 tAw
 kPw
 wge
 fhC
 fhK
-nct
-nct
-nct
-nct
-syO
-ijU
+aLP
+wim
+wim
+wim
+qfR
+sti
 qQG
 gEI
 tyc
@@ -42505,21 +43268,21 @@ xNI
 xNI
 dKp
 dZr
-fmb
+aLP
 fsR
-gWh
+wLB
 fhK
 sBI
 ebA
 tfD
 fhC
 fhK
-nct
-nct
-nct
-nct
-ddG
-ijU
+wim
+wim
+aLP
+wim
+kmD
+sti
 bfO
 gEI
 nMh
@@ -42699,21 +43462,21 @@ xNI
 xNI
 dnc
 dZr
-xKW
+aLP
 fsR
-gWh
+wim
 fhK
 ejb
 xGU
 tfD
 ber
 fhK
-nct
-nct
-nct
-nct
-nct
-ijU
+wim
+wim
+wim
+aLP
+wim
+sti
 wyc
 gEI
 cUt
@@ -42893,21 +43656,21 @@ mUN
 xNI
 vHP
 dZr
-fmb
+wim
 fsR
-gWh
+wim
 fhK
 eYG
 jvK
 tfD
 bVS
 fhK
-nct
-nct
-nct
-nct
-nct
-ijU
+wim
+wim
+wim
+aLP
+aLP
+sti
 wyc
 ePs
 kpN
@@ -43062,7 +43825,7 @@ cCy
 jWs
 cqc
 vnQ
-kHh
+kpq
 mEO
 rkY
 lEq
@@ -43087,21 +43850,21 @@ hvu
 cWc
 cWc
 cWc
-skF
+wim
 fsR
-gWh
+wim
 fhK
 awW
 mfn
 qBg
 dqb
 fhK
-ppR
-ppR
-ppR
-ppR
-qQJ
-ijU
+aLP
+aLP
+aLP
+aLP
+wim
+sti
 wyc
 hSU
 kvI
@@ -43281,21 +44044,21 @@ sNR
 xuM
 rRP
 cWc
-fmb
+wim
 fsR
-gWh
+wim
 fhK
 jUN
 wHY
 hbF
 gxC
 fhK
-ppR
-uMJ
-ppR
-ppR
-ppR
-ijU
+wim
+aLP
+aLP
+aLP
+aLP
+sti
 scr
 aVF
 joU
@@ -43475,21 +44238,21 @@ saT
 xNI
 xNI
 cWc
-qNt
+wim
 fsR
-gWh
-fhK
-fhK
-fhK
-fhK
+wim
 fhK
 fhK
 fhK
 fhK
 fhK
 fhK
-gOX
-lhS
+aLP
+aLP
+aNK
+aNK
+aNK
+aNK
 qfY
 vYM
 bnJ
@@ -43671,19 +44434,19 @@ fre
 xrg
 nHB
 gBF
-tLA
-fhK
-rGy
-bci
-bci
-dmy
-qXt
-qXt
-ivm
-qXt
-nFx
-diR
-lhS
+wim
+uGX
+wim
+wim
+wim
+wim
+aLP
+wim
+wim
+wim
+aLP
+wim
+aNK
 gEI
 vYM
 tVX
@@ -43863,21 +44626,21 @@ dfU
 shj
 ftZ
 cWc
-umU
-uRN
-xyA
-fhK
-pBk
-vhJ
-dPQ
-dPQ
-dPQ
-dPQ
-dPQ
-dPQ
-dPQ
-lze
-lhS
+wim
+bPE
+wim
+aNK
+aLP
+aLP
+aLP
+wim
+wim
+wim
+wim
+wim
+kcG
+aLP
+aNK
 kHM
 vYM
 kcJ
@@ -44057,21 +44820,21 @@ cWc
 cjq
 cWc
 cWc
-iFj
-ibD
-xyG
-fhK
-cfS
-oyz
-qTM
-qTM
-qTM
-qTM
-qTM
-qTM
-bci
-rvc
-lhS
+wim
+bPE
+aLP
+aNK
+aNK
+aNK
+aNK
+aNK
+aNK
+aNK
+aNK
+aNK
+aNK
+uGX
+aNK
 etm
 wUf
 etm
@@ -44249,22 +45012,22 @@ kdt
 dJa
 dJa
 jEM
-xNu
-gZb
+xNI
+dZr
 hrr
-cRj
-cSU
-nAn
-oKZ
+uda
+wim
+aNK
+rGy
 syY
-qTM
-qTM
-qTM
-qTM
-qTM
-qTM
-bci
-bci
+syY
+cyC
+qXt
+tsT
+pOJ
+qXt
+nFx
+diR
 lhS
 nui
 apg
@@ -44443,22 +45206,22 @@ xNI
 xNI
 dnc
 xNI
-xNu
-cSZ
-iRR
-oWY
+xNI
+dZr
+dZr
+dZr
 hik
-tXS
-nUG
-oyz
-qTM
-qTM
-qTM
-qTM
-qTM
-qTM
-bci
-bci
+dZr
+pBk
+vhJ
+dPQ
+dPQ
+dPQ
+dPQ
+dPQ
+dPQ
+dPQ
+lze
 lhS
 iLv
 kHn
@@ -44637,13 +45400,13 @@ dnc
 xNI
 xNI
 xNI
-xNu
-jsH
-hik
-hik
-hik
-krO
-nUG
+xNI
+xNI
+xNI
+xNI
+xNI
+dZr
+cfS
 oyz
 qTM
 qTM
@@ -44652,12 +45415,12 @@ qTM
 qTM
 qTM
 bci
-wAI
+rvc
 lhS
 suU
 jyC
 fnT
-xSt
+fZE
 wuD
 eQc
 fYz
@@ -44831,18 +45594,18 @@ xNI
 xNI
 xNI
 xNI
-xNu
-uda
-kJh
-txV
-kJh
-krO
-nUG
+xNI
+xNI
+xNI
+xNI
+xNI
+dZr
+sFF
 oyz
 qTM
 qTM
-fbG
-qUr
+qTM
+qTM
 qTM
 qTM
 bci
@@ -45030,17 +45793,17 @@ dJe
 dJe
 dJe
 dJe
-krO
-bJN
+dJe
+sFF
 oyz
 qTM
 qTM
-cvH
-sfl
+qTM
+qTM
 qTM
 qTM
 bci
-mve
+bci
 lhS
 iEj
 iEj
@@ -45217,6 +45980,7 @@ vpK
 oAT
 eYV
 eYV
+eYV
 rFT
 uvS
 hyL
@@ -45224,22 +45988,21 @@ eYV
 ojm
 ilO
 dJe
-krO
-nUG
+sFF
 oyz
-dIw
-dIw
-xEQ
-ciJ
-dIw
-dIw
-bci
+qTM
+qTM
+qTM
+qTM
+qTM
+qTM
 bci
-aNK
-aLP
+wAI
+gOX
+mqa
+mqa
+mqa
 mqa
-wim
-sti
 noW
 wBM
 wBM
@@ -45414,26 +46177,26 @@ eYV
 eYV
 eYV
 eYV
+eYV
 kxa
 kQS
 xaQ
 dJe
-krO
-ndh
+sFF
 oyz
-dIw
-dIw
-dIw
-dIw
-dIw
-dIw
+qTM
+qTM
+fbG
+qUr
+qTM
+qTM
 bci
 bci
-aNK
-aLP
-wim
-wim
-wim
+gOX
+ckz
+ttV
+otM
+otM
 uTl
 cMf
 nct
@@ -45606,28 +46369,28 @@ bxv
 geL
 geL
 geL
+geL
 pxb
 khu
 wJJ
 xaQ
 wJJ
 dJe
-krO
 nUG
 oyz
-dIw
-dIw
-dIw
-dIw
-dIw
-dIw
-bci
+qTM
+qTM
+cvH
+sfl
+qTM
+qTM
 bci
-aNK
-aLP
-wim
-wim
-wim
+mve
+gOX
+ckz
+otM
+otM
+otM
 uTl
 nct
 syO
@@ -45801,27 +46564,27 @@ pbT
 pxb
 esY
 geL
+geL
 kxa
 xaQ
 wxJ
 xaQ
 dJe
-krO
-nUG
+sFF
 oyz
 dIw
 dIw
-dIw
-dIw
+xEQ
+ciJ
 dIw
 dIw
 bci
 bci
-dDB
-jLe
-jLe
-jLe
-jLe
+gOX
+otM
+otM
+otM
+otM
 uTl
 nct
 ddG
@@ -45995,27 +46758,27 @@ geL
 geL
 geL
 geL
+geL
 pbT
 wJJ
 xaQ
 xaQ
 dJe
-krO
 ttt
 oyz
+dIw
+dIw
+dIw
+dIw
+dIw
+dIw
 bci
 bci
-bci
-bci
-bci
-bci
-bci
-bci
-aNK
+gOX
 ckz
-sSQ
-gEQ
-jLe
+otM
+otM
+otM
 uTl
 ovp
 kxn
@@ -46190,27 +46953,27 @@ pxb
 eYV
 eYV
 eYV
+eYV
 kxa
 kxa
 dHt
 dJe
-krO
-pBk
-aWP
-dPQ
-dPQ
-dPQ
-dPQ
-dPQ
-dPQ
-dPQ
-hrC
-aNK
-aLP
-aLP
-irX
-uBR
-qqr
+sFF
+oyz
+dIw
+dIw
+dIw
+dIw
+dIw
+dIw
+bci
+bci
+gOX
+ckz
+ckz
+otM
+otM
+uTl
 fHh
 xYB
 wBM
@@ -46381,6 +47144,7 @@ xdJ
 xdJ
 fMv
 jNC
+eYV
 jzT
 ufQ
 fnF
@@ -46388,22 +47152,21 @@ eYV
 kJp
 kxa
 dJe
-krO
 sFF
+oyz
+dIw
+dIw
+dIw
+dIw
+dIw
+dIw
 bci
 bci
-bci
-tMO
-bci
-bci
-bci
-bci
-sUx
-aNK
-aLP
-aLP
-wim
-ehl
+fuj
+ckz
+ckz
+otM
+otM
 uBN
 nuU
 oeU
@@ -46582,27 +47345,27 @@ dJe
 dJe
 dJe
 dJe
-aNK
-fVV
-aNK
-aNK
-aNK
-aNK
-aNK
-aNK
-aNK
-aNK
-aNK
-aNK
-aNK
-aNK
-aNK
-sti
-wHj
-aNK
-sti
-sti
-sti
+dJe
+iRR
+oyz
+bci
+bci
+bci
+bci
+bci
+bci
+bci
+bci
+gOX
+gOX
+gOX
+gOX
+mqa
+fuj
+gOX
+mqa
+mqa
+mqa
 xRj
 xRj
 xRj
@@ -46764,39 +47527,39 @@ cVp
 uUX
 wxw
 gvJ
-cZJ
-vDU
-otM
+ivm
+fLD
+hfR
 mwP
-otM
-cZJ
-otM
+hfR
+ivm
+hfR
+hfR
+hfR
+fLD
+ivm
+hfR
+lmG
+kjF
+arx
+xZq
+dPQ
+dPQ
+dPQ
+dPQ
+dPQ
+dPQ
+pTh
+gOX
 otM
 otM
-vDU
-cZJ
 otM
-aLP
-jLe
-aLP
-aLP
-aLP
-hfR
-ibx
-kov
-kov
-kov
-kov
-kov
-kov
-kov
 sSQ
-kov
-sjt
-jLe
-jLe
-ciZ
-sti
+piW
+piW
+piW
+irX
+mqa
 xRj
 xRj
 xRj
@@ -46957,40 +47720,40 @@ eNZ
 uNx
 lSg
 gbt
-piW
-piW
-piW
-piW
+gEQ
+gEQ
+gEQ
+gEQ
 hMP
-piW
-piW
-piW
-piW
-piW
-piW
-piW
-piW
+gEQ
+gEQ
+gEQ
+gEQ
+gEQ
+gEQ
+gEQ
+gEQ
+gbt
+dFa
+nAj
+cRj
+bci
+pOh
+aBC
+bci
+bci
+bci
+uRN
+gOX
+otM
+otM
+sSQ
+tBM
+otM
+otM
+otM
 qUT
-kov
-kov
-kov
-kov
-kov
-sjt
-wim
-wim
-wim
-wim
-wim
-wim
-jLe
-jLe
-jLe
-wim
-wim
-wim
-jLe
-sti
+mqa
 xRj
 xRj
 xRj
@@ -47164,27 +47927,27 @@ dsD
 dsD
 iHc
 dsD
-dsD
-dsD
-oxc
-oxc
-oxc
-oxc
-oxc
-oxc
-oxc
-oxc
-oxc
-oxc
-oxc
-oxc
+uMJ
+uMJ
+skF
+fDI
+uMJ
+uMJ
+uMJ
+uMJ
+uMJ
+uMJ
+uMJ
+gOX
+gOX
+gOX
 yjC
-oxc
-oxc
-oxc
-uze
-pdu
-ucD
+gOX
+gOX
+gOX
+otM
+qUT
+mqa
 xRj
 xRj
 xRj
@@ -47360,25 +48123,25 @@ eOl
 jBQ
 jBQ
 dsD
-uze
-uze
-uze
-lps
-pdu
-pdu
-pdu
-uze
-oxc
-uze
-lps
-uze
-pdu
-uze
-uze
-oxc
-uze
-pdu
-ucD
+jmI
+jYC
+nry
+nry
+nry
+nry
+nry
+xNu
+otM
+otM
+vDU
+otM
+qUT
+otM
+otM
+gOX
+otM
+qUT
+mqa
 nof
 xRj
 xRj
@@ -47552,27 +48315,27 @@ eOl
 eOl
 eOl
 eOl
-eOl
-iHc
-pdu
-pdu
-pdu
-pdu
-pdu
-uze
-pdu
-uze
-oxc
-uze
-uze
-pdu
-pdu
-uze
-fAe
-oxc
-nZR
-pdu
-ucD
+wtu
+dsD
+kom
+oxL
+aSH
+oWY
+oWY
+oWY
+ykh
+xNu
+otM
+otM
+otM
+sSQ
+tBM
+otM
+ssh
+gOX
+cZJ
+qUT
+mqa
 xRj
 xRj
 xRj
@@ -47732,7 +48495,7 @@ jod
 axR
 rgW
 arM
-baf
+saW
 pul
 xtc
 mew
@@ -47748,25 +48511,25 @@ gVv
 lEF
 cHX
 dsD
-uze
-uze
-uze
-uze
-uze
-uze
-pdu
-pdu
-yjC
-pdu
-pdu
-pdu
-uze
-uze
-uze
-oxc
-uze
-pdu
-ucD
+bCN
+jYC
+oWY
+oWY
+oWY
+oWY
+oWY
+oTa
+sSQ
+piW
+piW
+tBM
+otM
+otM
+otM
+gOX
+otM
+qUT
+mqa
 usG
 fOo
 xRj
@@ -47926,7 +48689,7 @@ pEr
 cHu
 vEK
 iuy
-saW
+baf
 pul
 pul
 pul
@@ -47939,28 +48702,28 @@ lEF
 cHX
 eOl
 gVv
-sfX
+kiD
 sLI
 dsD
-oxc
-oxc
-oxc
-oxc
-oxc
-oxc
-yjC
-oxc
-oxc
-oxc
+iqr
+gIz
+tuq
+nAn
+nAn
+aqI
+nAn
+xNu
+qUT
+gOX
 vca
 dIm
-uze
-nZR
-nZR
-oxc
-uze
-pdu
-ucD
+otM
+cZJ
+cZJ
+gOX
+hIQ
+tBM
+mqa
 usY
 usG
 xRj
@@ -48120,7 +48883,7 @@ lxO
 hnl
 aej
 iuy
-saW
+cdv
 dsD
 ikV
 jZL
@@ -48128,33 +48891,33 @@ uMM
 ixM
 eeY
 iao
-mJP
-mJP
+eOl
+eOl
 eOl
 uSH
 ncX
 bIn
 fsN
 dsD
-uze
-uze
-bPV
-uze
-uze
-uze
-pdu
-uze
-lps
+xNu
+xKW
+xNu
+xNu
+xNu
+xNu
+xNu
+xNu
+cVz
 wqi
 wqi
 wqi
 uVB
 wqi
 wqi
-oxc
-ckq
-pdu
-ucD
+gOX
+mGW
+sUx
+mqa
 usG
 fOo
 xRj
@@ -48318,37 +49081,37 @@ saW
 vLq
 eOl
 eOl
-eOl
+spU
 feB
 tCG
 rLV
-jCV
-jCV
+fDJ
+fDJ
 fDJ
 fDJ
 hPn
-mJP
+eOl
 uVf
 dsD
-uze
+xMR
+chY
+txV
+oxc
 uze
 syE
-uze
-uze
-uze
-pdu
-uze
-uze
-kxk
+xyA
+cTj
+tMg
+wqi
 hHd
 xZS
 fFJ
 eaB
 wqi
-oxc
-uze
-pdu
-ucD
+ckz
+otM
+sUx
+mqa
 xRj
 xRj
 xRj
@@ -48507,30 +49270,30 @@ pEr
 pEr
 pEr
 jTT
-cdv
+iuy
 qLH
-dsD
+oRd
 kCA
-lEF
-sfX
+mSo
+iKm
 rRJ
-sfX
+vGt
 wrh
-mJP
-mJP
-gVv
+uUz
+faq
+jxO
 apK
-nJA
-cfh
-ltO
-dsD
-uze
-uze
+cHX
+eOl
+eOl
+vLq
+qWP
+leq
+fdP
+oxc
 uze
 syE
-uze
-uze
-pdu
+hAO
 uze
 uze
 wqi
@@ -48539,10 +49302,10 @@ hHb
 fFJ
 qZu
 wqi
-oxc
-uze
-pdu
-ucD
+otM
+otM
+sUx
+mqa
 xRj
 xRj
 xRj
@@ -48706,37 +49469,37 @@ mKR
 cWg
 rAs
 esl
-esl
+xrp
 vIH
 esl
 esl
 esl
-wAB
+esl
 tjy
 lEF
-fDI
-tsT
-dsD
+cHX
+eOl
+khr
 dsD
-ckq
+tLA
+jFd
+pdz
+oxc
 uze
 uze
+hAO
 syE
 uze
-uze
-pdu
-uze
-uze
 wqi
 lCw
 dUh
 iYx
 thX
 wqi
-oxc
-nZR
-pdu
-ucD
+cZJ
+otM
+sUx
+mqa
 xRj
 xRj
 xRj
@@ -48900,25 +49663,25 @@ sxq
 xtJ
 twe
 cfh
+kxk
+cfh
+cfh
+cfh
 cfh
 cfh
-uvU
-jTs
-jTs
-rVX
 abZ
 kzG
 fOe
 uUz
+kEM
 dsD
+wAB
+pvq
+sIU
+oxc
 uze
 uze
-uze
-uze
-uze
-uze
-uze
-pdu
+hAO
 fAe
 kMv
 kMv
@@ -48927,10 +49690,10 @@ kMv
 kMv
 qbM
 wqi
-oxc
-uze
-pdu
-ucD
+ckz
+otM
+sUx
+mqa
 nof
 xRj
 xRj
@@ -49091,7 +49854,7 @@ pEr
 eTb
 rqe
 nXJ
-oRd
+dsD
 bSd
 bMt
 kNK
@@ -49099,17 +49862,17 @@ aVu
 ugs
 dsD
 mJP
-iKm
+mJP
 fYP
 mJP
 mJP
-jNp
-dsD
-uze
+mJP
+mJP
+jQp
 smS
-cTj
-cTj
-cTj
+wZm
+mTv
+wjE
 cTj
 cTj
 tSE
@@ -49121,10 +49884,10 @@ wne
 kMv
 xHd
 wqi
-oxc
-syE
-pdu
-ucD
+otM
+ckz
+sUx
+mqa
 xRj
 xRj
 xRj
@@ -49290,7 +50053,7 @@ snc
 lLD
 rXg
 rxS
-mJP
+eOl
 rdf
 mJP
 mJP
@@ -49298,12 +50061,12 @@ lCx
 esl
 esl
 esl
-iEX
-cTj
-tMg
-uze
-uze
-uze
+esl
+tBZ
+hyg
+leq
+ncC
+oxc
 uze
 uze
 hAO
@@ -49315,10 +50078,10 @@ fzZ
 kMv
 kMv
 kMv
-oxc
-uze
-pdu
-ucD
+otM
+otM
+sUx
+mqa
 xRj
 xRj
 xRj
@@ -49484,21 +50247,21 @@ jAq
 gIW
 rXg
 qFN
-mJP
+bJN
 iKG
 mJP
-jNp
+mJP
+pKP
 dsD
 vvP
 tbS
 vvP
 dsD
-uze
-uze
-uze
-uze
-syE
-syE
+qqo
+leq
+fdP
+oxc
+oxc
 uze
 hAO
 uze
@@ -49509,10 +50272,10 @@ uPB
 kvR
 lgr
 kMv
-oxc
-nZR
-pdu
-ucD
+cZJ
+otM
+sUx
+mqa
 xRj
 xRj
 xRj
@@ -49674,25 +50437,25 @@ ojo
 voU
 lVS
 dsD
-jDn
-mJP
+wCb
+eOl
 kOz
-jCV
-bVE
+fDJ
+jkS
+nCV
 mJP
 mJP
-vaR
+maY
 dsD
 mJP
 uau
-mJP
+vpD
 dsD
-uze
-uze
-uze
-uze
-uze
-syE
+tvS
+leq
+fdP
+hrC
+oxc
 uze
 hAO
 uze
@@ -49703,10 +50466,10 @@ bul
 kMv
 vxs
 kMv
-oxc
-uze
-pdu
-ucD
+ckz
+otM
+sUx
+mqa
 xRj
 xRj
 xRj
@@ -49855,7 +50618,7 @@ mYH
 veS
 kAE
 wNy
-dYN
+lDc
 wXu
 mrv
 ngd
@@ -49871,21 +50634,21 @@ dsD
 ucg
 vEj
 bsZ
-mJP
+eOl
 wvw
-scN
+jTs
 mJP
-uUz
+mJP
+tXS
 dsD
-kjF
-jnZ
+kJh
 bnw
+jDn
 dsD
-oxc
-oxc
-oxc
-oxc
-oxc
+qWP
+leq
+fdP
+voN
 oxc
 oxc
 lmy
@@ -49897,10 +50660,10 @@ kMv
 kMv
 kMv
 kMv
-oxc
-uze
-pdu
-ucD
+otM
+otM
+sUx
+mqa
 xRj
 xRj
 xRj
@@ -50041,7 +50804,7 @@ ahR
 xwz
 eaK
 eaK
-sJt
+eaK
 lDo
 eaK
 rzS
@@ -50062,39 +50825,39 @@ tsU
 iuy
 saW
 vLq
-mJP
-mJP
-mJP
-mJP
-kOz
+eOl
+eOl
+eOl
+khE
+lwV
 htT
 bVE
 mJP
+qZX
 dsD
-kjF
 oGx
-voN
+jnZ
+wha
 dsD
-uze
 qWP
-nSy
+leq
 fdP
-vca
-ucD
-lps
-hAO
 oxc
-uze
-nZR
-syE
-uze
-nZR
-uze
+oxc
 lps
-uze
-uze
-pdu
-ucD
+uBR
+oxc
+otM
+cZJ
+ckz
+otM
+cZJ
+otM
+vDU
+otM
+ckz
+sUx
+mqa
 usG
 fOo
 xRj
@@ -50269,26 +51032,26 @@ dsD
 dsD
 dsD
 dsD
-uze
-uze
-uze
-uze
-uze
-ucD
+dsD
+pVF
+gZb
+tvv
+oxc
+qWa
 uze
 hAO
 jYV
-pdu
-pdu
-pdu
-pdu
-pdu
-pdu
-pdu
-pdu
-pdu
-pdu
-ucD
+sUx
+sUx
+sUx
+sUx
+sUx
+sUx
+sUx
+sUx
+sUx
+sUx
+mqa
 usY
 usG
 xRj
@@ -50445,44 +51208,44 @@ wPz
 qOo
 qdt
 wXu
-dYN
+lDc
 xgB
 iuy
 baf
 wUJ
-oxc
-uze
-uze
-uze
-uze
+lmG
+hfR
+hfR
+hfR
+hfR
 dsD
 vqK
 mJP
 dsD
-wUJ
-wUJ
-uze
-uze
-uze
-syE
-uze
-uze
-uze
-ucD
+xsP
+jsH
+cZw
+tdE
+lmG
+qWP
+leq
+fdP
+oxc
 puK
+rln
 tMg
 ucD
-uze
-syE
-uze
-ucD
-ucD
-ucD
-ucD
-ucD
-ucD
-ucD
-ucD
+otM
+ckz
+otM
+mqa
+mqa
+mqa
+mqa
+mqa
+mqa
+mqa
+mqa
 usG
 fOo
 xRj
@@ -50644,31 +51407,31 @@ iNb
 iuy
 saW
 wUJ
-uze
-uze
-uze
+hfR
+hfR
+hfR
 lhd
-uze
+hfR
 dsD
 eaJ
 mJP
-iHc
-pdu
-pdu
-pdu
-pdu
-pdu
-pdu
-pdu
-uze
-uze
-ucD
-uze
+esr
+nJA
+nJA
+nJA
+nJA
+erZ
+qWP
+leq
+fdP
+oxc
+eSM
+syE
 pdu
 ucD
-syE
-uze
-uze
+ckz
+otM
+otM
 sQl
 sQl
 sQl
@@ -50847,22 +51610,22 @@ dsD
 erf
 pkW
 dsD
-oxc
-lZv
-oxc
-oxc
-oxc
-oxc
+lmG
+lmG
+lmG
+lmG
+lmG
+qWP
 leq
-oxc
+fdP
 oxc
 oxc
 nZR
 pdu
 ucD
-syE
-syE
-ucD
+ckz
+ckz
+mqa
 sQl
 sQl
 xRj
@@ -51032,30 +51795,30 @@ uaP
 lLu
 hdn
 mWz
-hjh
-mWz
+oAj
+ppR
 vkl
 bIB
-mWz
+ppR
 mhW
 fkZ
 tQg
 lyH
 hjh
-mWz
+ppR
 eWl
 bIB
 qks
 llV
-mWz
+bha
 vJi
 kNi
 oxc
 uze
 pdu
 ucD
-ucD
-ucD
+mqa
+mqa
 sQl
 sQl
 sQl
@@ -51226,24 +51989,24 @@ hYA
 uZh
 rCE
 qke
-jXs
-qke
-qke
-qke
-qke
-qke
-qke
+gZb
+leq
+leq
+leq
+leq
+leq
+leq
 aGG
 pql
 jXs
-qke
-qke
-qke
+leq
+leq
+leq
 pql
 aGG
 iUW
 sAT
-lSz
+ehl
 oxc
 ckq
 pdu
@@ -51632,12 +52395,12 @@ fkm
 eKd
 fcu
 aBi
-eKd
+sDi
 uze
 pdu
 ucD
 xRj
-xRj
+qqr
 xRj
 xRj
 xRj
@@ -51827,11 +52590,11 @@ xGd
 uni
 hWW
 sDi
-uze
-pdu
-ucD
-xRj
+syE
+qQJ
+krO
 xRj
+qqr
 xRj
 xRj
 xRj
@@ -52009,7 +52772,7 @@ mVc
 qzo
 qJO
 iRz
-gRB
+fmb
 kOk
 qQK
 dOW
@@ -52019,13 +52782,13 @@ nfJ
 kOk
 kOG
 uni
-hWW
+vLi
 sDi
 nZR
-pdu
+qQJ
 ucD
 xRj
-xRj
+qqr
 xRj
 xRj
 xRj
@@ -52216,10 +52979,10 @@ ueu
 oHy
 sDi
 uze
-pdu
+qQJ
 ucD
-xRj
-xRj
+qqr
+qqr
 xRj
 xRj
 xRj
@@ -52413,7 +53176,7 @@ uze
 pdu
 ucD
 xRj
-xRj
+qqr
 xRj
 xRj
 xRj
@@ -52571,16 +53334,16 @@ enD
 tOv
 atm
 mYb
-bjg
-bjg
-bjg
-bjg
+dor
+dor
+dor
+dor
 hfQ
 eAL
-bjg
-bjg
-bjg
-bjg
+dor
+dor
+dor
+dor
 yaO
 oPk
 nqO
@@ -52591,7 +53354,7 @@ vpO
 xri
 kBD
 iRz
-gRB
+fmb
 jcv
 bYy
 esm
@@ -52603,11 +53366,11 @@ hWW
 hWW
 hWW
 sDi
-uze
+wQj
 pdu
-ucD
-xRj
+krO
 xRj
+qqr
 xRj
 xRj
 xRj
@@ -52797,11 +53560,11 @@ dpE
 hWW
 bNN
 sDi
-uze
+xyy
 pdu
 ucD
 xRj
-xRj
+qqr
 xRj
 xRj
 xRj
@@ -52991,11 +53754,11 @@ bHQ
 hWW
 hWW
 sDi
-nZR
+kvn
 pdu
 ucD
-xRj
-xRj
+qqr
+qqr
 xRj
 xRj
 xRj
@@ -53163,7 +53926,7 @@ bLa
 sBk
 dmO
 nAf
-jLq
+vxW
 dwQ
 ibq
 eDy
@@ -53189,7 +53952,7 @@ uze
 pdu
 ucD
 nof
-xRj
+qqr
 xRj
 xRj
 xRj
@@ -53368,22 +54131,22 @@ erV
 aPj
 sDi
 mZV
-gRB
-wha
+dNy
 iwC
+gRB
 wtI
-eJs
+gRB
 aeg
-iwC
+gRB
 tDC
 jGM
 quB
 sDi
 uze
 pdu
-ucD
-xRj
+krO
 xRj
+qqr
 xRj
 xRj
 xRj
@@ -53561,23 +54324,23 @@ sDi
 sDi
 sDi
 sDi
-sDi
+ibS
 wGj
 sDi
+fkm
 sDi
+fkm
 sDi
+fkm
 sDi
 sDi
 sDi
 sDi
-sDi
-sDi
-sDi
-uze
-pdu
+syE
+qQJ
 ucD
 xRj
-xRj
+qqr
 xRj
 xRj
 xRj
@@ -53748,30 +54511,30 @@ nAf
 jLq
 jwq
 lSz
-oxc
-uze
-uze
-uze
-uze
-uze
-uze
-uze
-uze
-uze
-lps
-uze
-uze
-uze
-uze
-uze
-nZR
-uze
-lps
-nZR
+uTr
+maa
+maa
+maa
+maa
+eNY
+umU
+kjq
+xyG
+iEX
+iEX
+dOJ
+iEX
+iEX
+iEX
+gco
+gEy
 pdu
+lps
+kvn
+qQJ
 ucD
 usG
-fOo
+rXt
 xRj
 xRj
 xRj
@@ -53942,24 +54705,24 @@ nAf
 jLq
 sCh
 uXz
-oxc
-uze
-nZR
-uze
-uze
-uze
-uze
-uze
-uze
-pdu
-pdu
-pdu
-pdu
-pdu
-pdu
-pdu
-pdu
-pdu
+uTr
+maa
+bFR
+maa
+maa
+eNY
+lvV
+kjq
+kjq
+kjq
+kjq
+kjq
+kjq
+kjq
+kjq
+iFj
+eNY
+qQJ
 pdu
 pdu
 pdu
@@ -54140,21 +54903,21 @@ jEB
 sGq
 sGq
 sGq
-sGq
-sGq
-sGq
-sGq
-sGq
+uvU
+eNY
+dmy
+thM
+bPV
 nBz
-oxc
+bPV
 thM
-oxc
-oxc
-oxc
-oxc
-oxc
-ucD
-ucD
+bPV
+aWP
+kjq
+vhq
+eNY
+syE
+uze
 ucD
 ucD
 ucD
@@ -54330,25 +55093,25 @@ nAf
 gJc
 sCh
 cSo
-oxc
-oxc
-oxc
-oxc
-oxc
-oxc
-yjC
-oxc
-oxc
-lmG
-oxc
-uze
-uze
-uze
+uTr
+uTr
+uTr
+maa
+uOZ
 eNY
 eNY
 eNY
-ucD
-ucD
+eNY
+eNY
+eNY
+eNY
+eNY
+eNY
+rVX
+kjq
+eNY
+eNY
+ndh
 ucD
 ucD
 xRj
@@ -54524,25 +55287,25 @@ gAA
 jFy
 fVc
 hYM
-oxc
-uze
-uze
-uze
-uze
-uze
-uze
-uze
-uze
-lmG
-oxc
-fLD
-uze
-uze
-uzz
-kjq
+uTr
+qZT
+maa
+maa
+cTq
+cSU
+cSU
+cSU
+cSU
+uvU
+maa
+tme
 eNY
+oKZ
+fge
+kjq
+uzz
 cOc
-xRj
+vaR
 xRj
 xRj
 jNg
@@ -54718,25 +55481,25 @@ ixz
 uZh
 sCh
 ptG
-rCH
-rCH
-rCH
-rCH
-rCH
-rCH
-rCH
-rCH
-uze
-lmG
-oxc
-oxc
-oxc
-eUo
-kiD
-jkS
+uTr
+bFR
+maa
+maa
+maa
+maa
+maa
+maa
+maa
+oNa
+maa
+maa
 eNY
+eUo
+fge
+kjq
+gWh
 cOc
-xRj
+vaR
 xRj
 xRj
 jNg
@@ -54913,24 +55676,24 @@ sEj
 kos
 nkw
 rCH
-xch
-dRe
-aNE
-mPJ
-fkF
-wwB
 rCH
-eza
-lmG
-oxc
-ckq
-uze
-uze
-fge
-cLM
+rCH
+rCH
+rCH
+rCH
+rCH
+rCH
+lKv
+oNa
+maa
+maa
 eNY
+oKZ
+fge
+kjq
+gWh
 cOc
-xRj
+vaR
 xRj
 xRj
 jNg
@@ -55106,25 +55869,25 @@ nAf
 jLq
 mho
 hTf
-oeW
-mGw
-tsX
-aHc
-ebJ
-khl
-myg
 rCH
-uze
-lmG
-oxc
-eza
-uze
-uze
+xch
+dRe
+aNE
+mPJ
+fkF
+wwB
+rCH
+maa
+oNa
+maa
+maa
 eNY
 eNY
-cOc
-cOc
-xRj
+jNp
+kjq
+qcD
+uoW
+vaR
 xRj
 xRj
 jNg
@@ -55301,24 +56064,24 @@ jLq
 owF
 mjz
 oeW
-iVV
+mGw
 tsX
-rci
-cYG
-ftM
-sQe
+aHc
+ebJ
+khl
+myg
 rCH
-uze
-lmG
+maa
+jCV
 jpl
-pdu
-pdu
-pdu
-eNY
-cOc
-cOc
-jNg
-xRj
+ibD
+ibD
+cnZ
+eJs
+kjq
+kjq
+kjq
+vaR
 xRj
 xRj
 jNg
@@ -55492,30 +56255,30 @@ bNR
 cTV
 nAf
 jLq
-ubW
-cxt
+cSZ
+cLM
 oeW
-noZ
-tsX
-tsX
+iVV
 tsX
-kEB
-oIm
+rci
+cYG
+ftM
+sQe
 rCH
-uze
-lmG
-oxc
+maa
+oNa
+uTr
 eRi
 tUt
-uze
-ucD
-pOh
+eNY
+dkl
+kjq
+qNt
+kjq
+vaR
 xRj
 jNg
 jNg
-jNg
-jNg
-jNg
 xRj
 xRj
 xRj
@@ -55686,28 +56449,28 @@ hEF
 ctY
 nAf
 jLq
-fvo
-qrz
-rXv
-iXB
-wSw
-wSw
-rFk
-lHa
-ehT
+ubW
+cxt
+oeW
+noZ
+tsX
+tsX
+tsX
+kEB
+oIm
 rCH
-oxc
+uTr
 sEV
-oxc
-oxc
-oxc
-oxc
-ucD
-ris
-jNg
-jNg
-jNg
-jNg
+ogT
+ogT
+ogT
+eNY
+bwa
+ggi
+eNY
+csD
+lZv
+nSy
 jNg
 jNg
 xRj
@@ -55880,27 +56643,27 @@ pgF
 opC
 nAf
 jLq
-rCE
-ofq
-oeW
-vuK
-tsX
-tsX
-tsX
-kEB
-msB
+fvo
+qrz
+rXv
+iXB
+wSw
+wSw
+rFk
+lHa
+ehT
 rCH
 maa
 oNa
 maa
 qZT
 maa
-maa
-ris
-ris
-dYk
-jNg
-jNg
+ndh
+ndh
+ndh
+ndh
+ndh
+ndh
 jNg
 jNg
 jNg
@@ -56075,14 +56838,14 @@ wZQ
 nAf
 jLq
 xHM
-lSz
+ofq
 oeW
-tui
+vuK
 tsX
-maZ
-lNo
-xpQ
-dHq
+tsX
+tsX
+kEB
+msB
 rCH
 maa
 gTk
@@ -56092,10 +56855,10 @@ maa
 ris
 ris
 ris
-xRj
-xRj
-xRj
-xRj
+jNg
+jNg
+jvg
+jNg
 xRj
 xRj
 xRj
@@ -56245,7 +57008,7 @@ maa
 maa
 maa
 dIE
-pGO
+mWh
 job
 job
 job
@@ -56271,12 +57034,12 @@ jLq
 qkG
 lSz
 oeW
-luN
+tui
 tsX
-aHc
-emV
-mRT
-nbm
+maZ
+lNo
+xpQ
+dHq
 rCH
 teS
 abN
@@ -56444,7 +57207,7 @@ job
 job
 iQS
 iQS
-rln
+iQS
 dIE
 cEb
 hYO
@@ -56464,13 +57227,13 @@ nAf
 jLq
 xHM
 aEk
-rCH
-xxb
-byr
-hdt
-qzG
-tnA
-mnd
+oeW
+luN
+tsX
+aHc
+emV
+mRT
+nbm
 rCH
 maa
 abN
@@ -56644,27 +57407,27 @@ cEb
 sQg
 gBE
 acA
-uTr
-uTr
-uTr
-uTr
-uTr
-uTr
-uTr
-uTr
-uTr
-uTr
-uTr
+ogT
+ogT
+ogT
+ogT
+ogT
+ogT
+ogT
+ogT
+ogT
+ogT
+ogT
 ubV
 xSm
 aoR
-huP
-rCH
-rCH
-rCH
-rCH
-rCH
 rCH
+xxb
+byr
+hdt
+qzG
+tnA
+mnd
 rCH
 maa
 abN
@@ -56827,12 +57590,12 @@ byt
 maa
 maa
 dIE
-pGO
+ltO
 job
 job
 iQS
 iQS
-esr
+kim
 vdw
 cEb
 hAP
@@ -56852,14 +57615,14 @@ uTr
 gJc
 rCE
 ykX
-uTr
-maa
-maa
-maa
-liT
-maa
-maa
-maa
+huP
+rCH
+rCH
+rCH
+rCH
+rCH
+rCH
+rCH
 maa
 abN
 xAC
@@ -57050,7 +57813,7 @@ uTr
 maa
 maa
 maa
-maa
+liT
 maa
 byt
 byt
@@ -60729,7 +61492,7 @@ tuO
 uJk
 oWx
 tvd
-xpv
+sJt
 uTr
 uTr
 uTr
diff --git a/maps/endeavour/levels/deck2.dmm b/maps/endeavour/levels/deck2.dmm
index be650093f023..66ce3ffe8589 100644
--- a/maps/endeavour/levels/deck2.dmm
+++ b/maps/endeavour/levels/deck2.dmm
@@ -59,8 +59,7 @@
 	dir = 1
 	},
 /obj/machinery/light{
-	dir = 8;
-	pixel_x = -10
+	dir = 8
 	},
 /turf/simulated/floor/wood,
 /area/medical/medbay4)
@@ -647,6 +646,7 @@
 	opacity = 0
 	},
 /obj/spawner/window/low_wall/reinforced/full,
+/obj/effect/paint/purplegray,
 /turf/simulated/floor/reinforced,
 /area/rnd/xenobiology)
 "avE" = (
@@ -811,8 +811,7 @@
 /area/medical/psych_ward)
 "aBx" = (
 /obj/machinery/light{
-	dir = 8;
-	pixel_x = -10
+	dir = 8
 	},
 /obj/structure/catwalk,
 /turf/simulated/floor/plating,
@@ -858,6 +857,7 @@
 	opacity = 0
 	},
 /obj/spawner/window/low_wall/reinforced/full,
+/obj/effect/paint/purplegray,
 /turf/simulated/floor/reinforced,
 /area/rnd/xenobiology)
 "aDx" = (
@@ -884,6 +884,12 @@
 	},
 /turf/simulated/floor/tiled,
 /area/rnd/research/researchdivision)
+"aEp" = (
+/obj/machinery/light{
+	dir = 1
+	},
+/turf/simulated/floor/tiled/dark,
+/area/endeavour/hallway/d2portafthall)
 "aEO" = (
 /obj/machinery/door/window/brigdoor/northright{
 	name = "Containment Pen";
@@ -1102,8 +1108,7 @@
 /area/endeavour/hallway/d1starboardafthall)
 "aKy" = (
 /obj/machinery/light{
-	dir = 8;
-	pixel_x = -10
+	dir = 8
 	},
 /turf/simulated/floor/tiled/dark,
 /area/rnd/research/researchdivision)
@@ -1244,8 +1249,7 @@
 	},
 /obj/effect/floor_decal/corner/paleblue/diagonal,
 /obj/machinery/light{
-	dir = 8;
-	pixel_x = -10
+	dir = 8
 	},
 /turf/simulated/floor/tiled/white,
 /area/medical/patient_d)
@@ -1331,9 +1335,11 @@
 /area/rnd/workshop)
 "aUs" = (
 /obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks,
-/obj/map_helper/electrochromatic_linker{
-	id = "research-outer"
+/obj/machinery/door/blast/shutters{
+	id = "rndshutters";
+	name = "Research Shutters"
 	},
+/obj/effect/paint/purplegray,
 /turf/simulated/floor/plating,
 /area/rnd/reception_desk)
 "aUR" = (
@@ -1381,21 +1387,15 @@
 /turf/simulated/floor/tiled,
 /area/rnd/research/researchdivision)
 "aXe" = (
-/obj/effect/floor_decal/borderfloorblack{
-	dir = 1
-	},
-/obj/effect/floor_decal/corner/navblue/border{
-	dir = 1
-	},
-/obj/structure/cable/orange{
-	icon_state = "4-8"
+/obj/machinery/door/firedoor{
+	dir = 8
 	},
-/obj/structure/disposalpipe/segment{
-	dir = 4
+/obj/map_helper/access_helper/airlock/station/science/research_lab,
+/obj/machinery/door/airlock/research{
+	name = "Research Lab"
 	},
-/obj/machinery/computer/timeclock/premade/north,
 /turf/simulated/floor/tiled,
-/area/endeavour/hallway/d2portafthall)
+/area/rnd/reception_desk)
 "aXm" = (
 /obj/fiftyspawner/glass,
 /turf/simulated/floor/plating,
@@ -1436,8 +1436,7 @@
 	dir = 4
 	},
 /obj/machinery/light{
-	dir = 8;
-	pixel_x = -10
+	dir = 8
 	},
 /turf/simulated/floor/tiled/dark,
 /area/endeavour/hallway/d2afthall)
@@ -1879,8 +1878,7 @@
 /area/rnd/xenobiology/xenoflora)
 "bmb" = (
 /obj/machinery/light{
-	dir = 8;
-	pixel_x = -10
+	dir = 8
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 6
@@ -2012,6 +2010,7 @@
 "btU" = (
 /obj/machinery/door/firedoor,
 /obj/spawner/window/low_wall/reinforced/full,
+/obj/effect/paint/babyblue,
 /turf/simulated/floor/plating,
 /area/shuttle/emt/general)
 "buE" = (
@@ -2107,7 +2106,10 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 5
 	},
-/obj/structure/disposalpipe/segment,
+/obj/structure/disposalpipe/junction{
+	dir = 1;
+	icon_state = "pipe-j2"
+	},
 /turf/simulated/floor/tiled/dark,
 /area/rnd/research/researchdivision)
 "bzR" = (
@@ -2126,8 +2128,7 @@
 /area/holodeck_control)
 "bzV" = (
 /obj/machinery/light{
-	dir = 8;
-	pixel_x = -10
+	dir = 8
 	},
 /turf/simulated/floor/carpet/purcarpet,
 /area/rnd/breakroom)
@@ -2152,7 +2153,7 @@
 	icon_state = "4-8"
 	},
 /turf/simulated/floor/tiled/dark,
-/area/maintenance/medbay/aft)
+/area/medical/surgeryobs)
 "bAI" = (
 /obj/effect/floor_decal/corner/paleblue,
 /obj/effect/floor_decal/corner/paleblue/border{
@@ -2242,6 +2243,9 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 8
 	},
+/obj/structure/disposalpipe/segment{
+	dir = 8
+	},
 /turf/simulated/floor/tiled,
 /area/rnd/workshop)
 "bCK" = (
@@ -2442,6 +2446,9 @@
 /obj/effect/floor_decal/spline/fancy/wood,
 /turf/simulated/floor/wood,
 /area/medical/oncall_room)
+"bGv" = (
+/turf/simulated/wall/prepainted/medical,
+/area/medical/surgeryobs)
 "bGx" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -2727,6 +2734,9 @@
 /obj/effect/floor_decal/corner/navblue/border{
 	dir = 1
 	},
+/obj/structure/sign/department/robo{
+	pixel_y = 32
+	},
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d2portafthall)
 "bNQ" = (
@@ -2774,7 +2784,7 @@
 "bPx" = (
 /obj/structure/bed/chair,
 /turf/simulated/floor/tiled/dark,
-/area/maintenance/medbay/aft)
+/area/medical/surgeryobs)
 "bPE" = (
 /obj/structure/closet/hydrant{
 	pixel_y = 32
@@ -3456,9 +3466,9 @@
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d2portafthall)
 "cja" = (
-/obj/structure/sign/department/sci,
-/turf/simulated/wall/prepainted/science,
-/area/rnd/research/researchdivision)
+/obj/machinery/computer/timeclock/premade/north,
+/turf/simulated/floor/tiled/dark,
+/area/endeavour/hallway/d2portafthall)
 "cje" = (
 /obj/effect/floor_decal/borderfloorblack,
 /turf/simulated/floor/tiled/dark,
@@ -3571,8 +3581,7 @@
 /area/rnd/storage)
 "cmn" = (
 /obj/machinery/light{
-	dir = 8;
-	pixel_x = -10
+	dir = 8
 	},
 /obj/machinery/computer/timeclock/premade/north,
 /obj/effect/floor_decal/borderfloorblack{
@@ -3817,8 +3826,7 @@
 	},
 /obj/effect/floor_decal/corner/paleblue/diagonal,
 /obj/machinery/light{
-	dir = 8;
-	pixel_x = -10
+	dir = 8
 	},
 /turf/simulated/floor/tiled/white,
 /area/medical/patient_b)
@@ -3940,6 +3948,9 @@
 /obj/effect/floor_decal/corner/paleblue/bordercorner2{
 	dir = 9
 	},
+/obj/structure/sign/department/morgue{
+	pixel_y = -30
+	},
 /turf/simulated/floor/tiled/white,
 /area/medical/medbay3)
 "cwT" = (
@@ -3981,8 +3992,7 @@
 	},
 /obj/structure/bed/chair,
 /obj/machinery/light{
-	dir = 8;
-	pixel_x = -10
+	dir = 8
 	},
 /turf/simulated/floor/tiled/white,
 /area/medical/virology_fore_access)
@@ -4260,8 +4270,7 @@
 /area/medical/medbay4)
 "cGc" = (
 /obj/machinery/light{
-	dir = 8;
-	pixel_x = -10
+	dir = 8
 	},
 /turf/simulated/floor/tiled/techfloor,
 /area/medical/morgue)
@@ -4325,12 +4334,6 @@
 /obj/structure/cable/green{
 	icon_state = "4-8"
 	},
-/obj/effect/floor_decal/borderfloorblack/corner{
-	dir = 4
-	},
-/obj/effect/floor_decal/corner/navblue/bordercorner{
-	dir = 4
-	},
 /obj/structure/disposalpipe/segment,
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d2portafthall)
@@ -4352,11 +4355,10 @@
 	dir = 5
 	},
 /obj/machinery/light{
-	dir = 8;
-	pixel_x = -10
+	dir = 8
 	},
 /turf/simulated/floor/tiled/dark,
-/area/maintenance/medbay/aft)
+/area/medical/surgeryobs)
 "cKJ" = (
 /obj/machinery/fire_alarm/north_mount,
 /obj/machinery/atmospherics/component/unary/vent_scrubber/on{
@@ -4443,10 +4445,10 @@
 /turf/simulated/floor/tiled/white,
 /area/medical/exam_room/exam_1)
 "cNs" = (
-/obj/machinery/light{
-	dir = 1
+/obj/structure/table/reinforced,
+/obj/structure/flora/pottedplant/overgrown{
+	pixel_y = 13
 	},
-/obj/machinery/disposal,
 /turf/simulated/floor/tiled/dark,
 /area/rnd/research/researchdivision)
 "cNK" = (
@@ -4459,6 +4461,7 @@
 	opacity = 0
 	},
 /obj/spawner/window/low_wall/reinforced/full,
+/obj/effect/paint/purplegray,
 /turf/simulated/floor/reinforced,
 /area/rnd/xenobiology)
 "cNW" = (
@@ -4522,10 +4525,11 @@
 /area/medical/medbay4)
 "cPx" = (
 /obj/machinery/light{
-	dir = 8;
-	pixel_x = -10
+	dir = 8
+	},
+/obj/structure/bed/chair/sofa/purp/left{
+	dir = 4
 	},
-/obj/structure/table/rack/shelf,
 /turf/simulated/floor/tiled/dark,
 /area/rnd/research/researchdivision)
 "cQu" = (
@@ -4973,8 +4977,7 @@
 "dic" = (
 /obj/machinery/atmospherics/component/unary/vent_scrubber/on,
 /obj/machinery/light{
-	dir = 8;
-	pixel_x = -10
+	dir = 8
 	},
 /obj/structure/bed/padded,
 /obj/item/bedsheet/medical,
@@ -5052,6 +5055,7 @@
 	name = "Containment Blast Doors";
 	opacity = 0
 	},
+/obj/effect/paint/purplegray,
 /turf/simulated/floor/reinforced,
 /area/rnd/xenobiology)
 "dlw" = (
@@ -5088,6 +5092,7 @@
 	dir = 8
 	},
 /obj/spawner/window/low_wall/reinforced/full,
+/obj/effect/paint/purplegray,
 /turf/simulated/floor/plating,
 /area/rnd/xenobiology/xenoflora/lab_atmos)
 "dni" = (
@@ -5208,6 +5213,10 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
+/obj/structure/disposalpipe/segment{
+	dir = 4;
+	icon_state = "pipe-c"
+	},
 /turf/simulated/floor/tiled,
 /area/rnd/research/researchdivision)
 "dqJ" = (
@@ -5476,8 +5485,7 @@
 "dzg" = (
 /obj/structure/closet/crate/biohazard,
 /obj/machinery/light{
-	dir = 8;
-	pixel_x = -10
+	dir = 8
 	},
 /turf/simulated/floor/tiled,
 /area/medical/surgery)
@@ -6191,7 +6199,7 @@
 	dir = 9
 	},
 /turf/simulated/floor/tiled/dark,
-/area/maintenance/medbay/aft)
+/area/medical/surgeryobs)
 "dWP" = (
 /obj/structure/cable/green{
 	icon_state = "4-8"
@@ -6233,6 +6241,15 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 8
 	},
+/obj/effect/floor_decal/borderfloorblack/corner{
+	dir = 1
+	},
+/obj/effect/floor_decal/corner/navgold/bordercorner{
+	dir = 1
+	},
+/obj/structure/cable/green{
+	icon_state = "1-8"
+	},
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d1starboardafthall)
 "dXU" = (
@@ -6255,8 +6272,7 @@
 	dir = 4
 	},
 /obj/machinery/door/window/westleft{
-	name = "Chemistry Reception Desk";
-	req_one_access = list(5)
+	name = "Chemistry Reception Desk"
 	},
 /obj/machinery/door/blast/shutters{
 	dir = 8;
@@ -6285,8 +6301,7 @@
 /area/rnd/anomaly_lab)
 "dYQ" = (
 /obj/machinery/light{
-	dir = 8;
-	pixel_x = -10
+	dir = 8
 	},
 /obj/machinery/atmospherics/component/unary/vent_scrubber/on{
 	dir = 4
@@ -6382,8 +6397,7 @@
 /obj/item/reagent_containers/dropper,
 /obj/item/hand_labeler,
 /obj/machinery/light{
-	dir = 8;
-	pixel_x = -10
+	dir = 8
 	},
 /turf/simulated/floor/tiled,
 /area/rnd/xenobiology/xenoflora)
@@ -6543,9 +6557,15 @@
 /turf/simulated/floor/tiled,
 /area/rnd/xenobiology/xenoflora/lab_atmos)
 "efa" = (
-/obj/structure/sign/department/chem,
-/turf/simulated/wall/prepainted/medical,
-/area/medical/chemistry)
+/obj/machinery/light{
+	dir = 8
+	},
+/obj/machinery/disposal,
+/obj/structure/disposalpipe/trunk{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/dark,
+/area/rnd/research/researchdivision)
 "efb" = (
 /obj/effect/floor_decal/borderfloorblack{
 	dir = 4
@@ -6647,8 +6667,7 @@
 "egX" = (
 /obj/structure/table/woodentable,
 /obj/machinery/light{
-	dir = 8;
-	pixel_x = -10
+	dir = 8
 	},
 /turf/simulated/floor/wood,
 /area/crew_quarters/medbreak)
@@ -6664,8 +6683,7 @@
 	dir = 4
 	},
 /obj/machinery/light{
-	dir = 8;
-	pixel_x = -10
+	dir = 8
 	},
 /turf/simulated/floor/tiled/white,
 /area/medical/patient_wing)
@@ -6788,6 +6806,8 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/structure/disposalpipe/segment,
+/obj/effect/floor_decal/borderfloorblack,
+/obj/effect/floor_decal/corner/navgold/border,
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d1starboardafthall)
 "ejy" = (
@@ -7041,18 +7061,11 @@
 /turf/simulated/floor/plating,
 /area/maintenance/medbay/aft)
 "esy" = (
-/obj/effect/floor_decal/borderfloorblack{
-	dir = 9
-	},
-/obj/effect/floor_decal/corner/navblue/border{
-	dir = 9
-	},
-/obj/machinery/light{
-	dir = 8;
-	light_range = 12
+/obj/machinery/vending/nifsoft_shop{
+	dir = 4
 	},
-/turf/simulated/floor/tiled,
-/area/endeavour/hallway/d2portafthall)
+/turf/simulated/floor/tiled/dark,
+/area/rnd/research/researchdivision)
 "etB" = (
 /obj/machinery/atmospherics/component/unary/vent_scrubber/on,
 /obj/structure/disposalpipe/segment{
@@ -7071,16 +7084,6 @@
 /obj/structure/flora/pottedplant/stoutbush,
 /turf/simulated/floor/tiled/techfloor,
 /area/rnd/workshop)
-"eub" = (
-/obj/machinery/door/firedoor,
-/obj/effect/floor_decal/borderfloorblack{
-	dir = 4
-	},
-/obj/effect/floor_decal/corner/navblue/border{
-	dir = 4
-	},
-/turf/simulated/floor/tiled,
-/area/endeavour/hallway/d2afthall)
 "ewY" = (
 /obj/effect/floor_decal/corner/paleblue{
 	dir = 6
@@ -7334,6 +7337,7 @@
 	opacity = 0
 	},
 /obj/spawner/window/low_wall/reinforced/full,
+/obj/effect/paint/purplegray,
 /turf/simulated/floor/reinforced,
 /area/rnd/xenobiology)
 "eEX" = (
@@ -7594,8 +7598,7 @@
 "eOr" = (
 /obj/machinery/media/jukebox,
 /obj/machinery/light{
-	dir = 8;
-	pixel_x = -10
+	dir = 8
 	},
 /obj/effect/floor_decal/borderfloor{
 	dir = 10
@@ -8205,8 +8208,7 @@
 	req_one_access = list(30,35,47,77)
 	},
 /obj/machinery/light{
-	dir = 4;
-	pixel_x = 10
+	dir = 4
 	},
 /turf/simulated/floor/tiled,
 /area/rnd/xenobiology/xenoflora)
@@ -8445,6 +8447,7 @@
 	opacity = 0
 	},
 /obj/spawner/window/low_wall/reinforced/full,
+/obj/effect/paint/purplegray,
 /turf/simulated/floor/reinforced,
 /area/rnd/xenobiology)
 "fqm" = (
@@ -8525,10 +8528,6 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/assembly/robotics/surgery)
-"fsC" = (
-/obj/structure/sign/department/rnd,
-/turf/simulated/wall/prepainted/science,
-/area/rnd/reception_desk)
 "fsM" = (
 /obj/machinery/door/firedoor{
 	dir = 1
@@ -8687,6 +8686,7 @@
 	name = "Containment Blast Doors";
 	opacity = 0
 	},
+/obj/effect/paint/purplegray,
 /turf/simulated/floor/reinforced,
 /area/rnd/xenobiology)
 "fAD" = (
@@ -8969,6 +8969,9 @@
 /obj/effect/floor_decal/borderfloorblack,
 /obj/effect/floor_decal/corner/navgold/border,
 /obj/machinery/door/airlock/glass,
+/obj/structure/sign/greencross{
+	pixel_y = -30
+	},
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d1starboardafthall)
 "fIE" = (
@@ -9260,6 +9263,9 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 8
 	},
+/obj/structure/disposalpipe/segment{
+	dir = 8
+	},
 /turf/simulated/floor/tiled/techfloor,
 /area/rnd/workshop)
 "fOZ" = (
@@ -9359,8 +9365,7 @@
 	dir = 8
 	},
 /obj/machinery/light{
-	dir = 8;
-	pixel_x = -10
+	dir = 8
 	},
 /turf/simulated/floor/tiled/white,
 /area/medical/surgeryprep)
@@ -9427,7 +9432,7 @@
 	pixel_x = 3;
 	pixel_y = 3
 	},
-/obj/item/stack/material/steel/full_stack,
+/obj/fiftyspawner/steel,
 /obj/fiftyspawner/glass,
 /obj/structure/table/reinforced,
 /obj/effect/floor_decal/borderfloor,
@@ -10008,7 +10013,7 @@
 /area/rnd/xenobiology)
 "goI" = (
 /turf/simulated/floor/tiled/dark,
-/area/maintenance/medbay/aft)
+/area/medical/surgeryobs)
 "goZ" = (
 /obj/structure/cable/green{
 	icon_state = "4-8"
@@ -10028,24 +10033,6 @@
 /obj/machinery/door/firedoor,
 /turf/simulated/floor/tiled/white,
 /area/medical/medbay4)
-"gpS" = (
-/obj/structure/bed/chair/office/dark{
-	dir = 8
-	},
-/obj/effect/floor_decal/borderfloor{
-	dir = 8
-	},
-/obj/effect/floor_decal/corner/mauve/border{
-	dir = 8
-	},
-/obj/machinery/button/remote/blast_door{
-	id = "rndshutters";
-	name = "Research Shutter control";
-	pixel_y = -22;
-	pixel_x = -26
-	},
-/turf/simulated/floor/tiled/steel_grid,
-/area/rnd/research/researchdivision)
 "gqb" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 6
@@ -10155,7 +10142,7 @@
 	name = "Research Shutters"
 	},
 /turf/simulated/floor/tiled,
-/area/rnd/research/researchdivision)
+/area/rnd/reception_desk)
 "gtd" = (
 /obj/effect/floor_decal/borderfloorblack{
 	dir = 8
@@ -10238,8 +10225,7 @@
 /obj/item/storage/box/syringes,
 /obj/item/gun/launcher/syringe,
 /obj/machinery/light{
-	dir = 8;
-	pixel_x = -10
+	dir = 8
 	},
 /turf/simulated/floor/wood,
 /area/medical/medbay4)
@@ -10416,7 +10402,9 @@
 /turf/simulated/floor/tiled/white,
 /area/medical/medbay4)
 "gBH" = (
-/obj/structure/table/rack/shelf,
+/obj/structure/bed/chair/sofa/purp{
+	dir = 4
+	},
 /turf/simulated/floor/tiled/dark,
 /area/rnd/research/researchdivision)
 "gBJ" = (
@@ -10700,17 +10688,17 @@
 /area/crew_quarters/medbreak)
 "gKZ" = (
 /obj/machinery/light{
-	dir = 8;
-	pixel_x = -10
+	dir = 8
 	},
 /turf/simulated/floor/tiled/techfloor,
 /area/assembly/chargebay)
 "gLF" = (
-/obj/machinery/computer/ship/navigation/telescreen{
-	pixel_y = -37
+/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks,
+/obj/map_helper/electrochromatic_linker{
+	id = "research-inner"
 	},
-/obj/machinery/vending/coffee,
-/turf/simulated/floor/tiled/dark,
+/obj/effect/paint/purplegray,
+/turf/simulated/floor/plating,
 /area/rnd/research/researchdivision)
 "gLH" = (
 /obj/effect/floor_decal/corner_techfloor_grid{
@@ -10719,16 +10707,9 @@
 /turf/simulated/floor/tiled/techfloor,
 /area/endeavour/hallway/d2afthall)
 "gMk" = (
-/obj/machinery/door/firedoor/glass{
-	dir = 4
-	},
-/obj/machinery/door/airlock/research{
-	id_tag = "researchdoor";
-	name = "R&D Distribution Area"
-	},
-/obj/map_helper/access_helper/airlock/station/exploration/auxillerysci,
-/turf/simulated/floor/tiled/dark,
-/area/rnd/research/researchdivision)
+/obj/structure/disposalpipe/segment,
+/turf/simulated/floor/tiled/techfloor,
+/area/rnd/workshop)
 "gMn" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -10955,15 +10936,16 @@
 	},
 /area/rnd/rdoffice)
 "gSa" = (
-/obj/structure/cable/green{
-	icon_state = "1-8"
+/obj/effect/floor_decal/borderfloorblack{
+	dir = 8
 	},
-/obj/effect/floor_decal/borderfloorblack/corner{
-	dir = 1
+/obj/effect/floor_decal/corner/navgold/border{
+	dir = 8
 	},
-/obj/effect/floor_decal/corner/navgold/bordercorner{
-	dir = 1
+/obj/structure/cable/green{
+	icon_state = "1-2"
 	},
+/obj/machinery/door/firedoor,
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d1starboardafthall)
 "gSb" = (
@@ -11041,15 +11023,15 @@
 /turf/simulated/wall/prepainted/medical,
 /area/maintenance/research)
 "gWJ" = (
-/obj/structure/disposalpipe/segment{
-	dir = 4
-	},
 /obj/effect/floor_decal/borderfloorwhite/corner{
 	dir = 4
 	},
 /obj/effect/floor_decal/corner/paleblue/bordercorner{
 	dir = 4
 	},
+/obj/structure/disposalpipe/junction{
+	dir = 4
+	},
 /turf/simulated/floor/tiled/white,
 /area/medical/sleeper)
 "gWK" = (
@@ -11212,6 +11194,7 @@
 	opacity = 0
 	},
 /obj/spawner/window/low_wall/reinforced/full,
+/obj/effect/paint/purplegray,
 /turf/simulated/floor/reinforced,
 /area/rnd/xenobiology)
 "hdr" = (
@@ -11226,6 +11209,7 @@
 	dir = 8
 	},
 /obj/spawner/window/low_wall/reinforced/full,
+/obj/effect/paint/babyblue,
 /turf/simulated/floor/plating,
 /area/shuttle/emt/cockpit)
 "heh" = (
@@ -11396,7 +11380,7 @@
 /turf/simulated/floor/tiled,
 /area/rnd/rdoffice)
 "hjM" = (
-/obj/item/stack/material/steel/full_stack,
+/obj/fiftyspawner/steel,
 /turf/simulated/floor/plating,
 /area/maintenance/medbay/aft)
 "hjR" = (
@@ -11455,8 +11439,7 @@
 	dir = 8
 	},
 /obj/machinery/light{
-	dir = 8;
-	pixel_x = -10
+	dir = 8
 	},
 /obj/machinery/camera/network/research{
 	dir = 4;
@@ -11472,8 +11455,7 @@
 	dir = 8
 	},
 /obj/machinery/light{
-	dir = 8;
-	pixel_x = -10
+	dir = 8
 	},
 /turf/simulated/floor/tiled,
 /area/rnd/hallway)
@@ -11801,8 +11783,7 @@
 "hqs" = (
 /obj/machinery/camera/network/medbay,
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 20
+	dir = 1
 	},
 /obj/effect/floor_decal/spline/fancy/wood{
 	dir = 1
@@ -11824,14 +11805,6 @@
 	},
 /turf/simulated/floor/plating,
 /area/endeavour/hallway/d2aftmaint)
-"hqT" = (
-/obj/machinery/door/firedoor{
-	dir = 1
-	},
-/obj/machinery/door/airlock/maintenance/common,
-/obj/map_helper/access_helper/airlock/station/science/department,
-/turf/simulated/floor/plating,
-/area/maintenance/medbay/aft)
 "hrJ" = (
 /obj/structure/cable/green{
 	icon_state = "4-8"
@@ -11856,8 +11829,7 @@
 /area/medical/psych_ward)
 "hsu" = (
 /obj/machinery/light{
-	dir = 4;
-	pixel_x = 10
+	dir = 4
 	},
 /obj/effect/floor_decal/corner_techfloor_grid{
 	dir = 9
@@ -11866,12 +11838,6 @@
 /obj/machinery/door/airlock/glass,
 /turf/simulated/floor/tiled/techfloor,
 /area/crew_quarters/cafeteria)
-"hsE" = (
-/obj/map_helper/electrochromatic_linker{
-	id = "robotics-outer"
-	},
-/turf/space/basic,
-/area/space)
 "hui" = (
 /obj/machinery/atmospherics/pipe/manifold/visible/yellow{
 	dir = 1
@@ -12459,14 +12425,6 @@
 	},
 /turf/simulated/floor/tiled,
 /area/medical/virology)
-"hLz" = (
-/obj/machinery/button/windowtint{
-	id = "robotics-outer";
-	pixel_x = -22;
-	pixel_y = 32
-	},
-/turf/space/basic,
-/area/space)
 "hLV" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -13275,12 +13233,6 @@
 /obj/structure/cable/green{
 	icon_state = "1-4"
 	},
-/obj/effect/floor_decal/borderfloorblack{
-	dir = 8
-	},
-/obj/effect/floor_decal/corner/navblue/border{
-	dir = 8
-	},
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d2portafthall)
 "ioT" = (
@@ -13407,7 +13359,7 @@
 	pixel_y = 22
 	},
 /turf/simulated/floor/tiled/dark,
-/area/maintenance/medbay/aft)
+/area/medical/surgeryobs)
 "iuJ" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -13998,6 +13950,7 @@
 	name = "Containment Blast Doors";
 	opacity = 0
 	},
+/obj/effect/paint/purplegray,
 /turf/simulated/floor/reinforced,
 /area/rnd/xenobiology)
 "iNI" = (
@@ -14189,14 +14142,8 @@
 /obj/effect/floor_decal/borderfloor,
 /obj/effect/floor_decal/corner/mauve/border,
 /obj/structure/bed/chair/office/dark,
-/obj/machinery/button/remote/blast_door{
-	id = "rndhallshutters";
-	name = "Research Hall Shutters control";
-	pixel_y = -22;
-	pixel_x = -26
-	},
 /turf/simulated/floor/tiled/steel_grid,
-/area/endeavour/hallway/d2portafthall)
+/area/rnd/reception_desk)
 "iUD" = (
 /obj/structure/closet/secure_closet/RD,
 /obj/item/aicard,
@@ -14577,9 +14524,16 @@
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d2afthall)
 "jkz" = (
-/obj/structure/sign/greencross,
-/turf/simulated/wall/prepainted/medical,
-/area/medical/reception)
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/effect/floor_decal/borderfloorblack,
+/obj/effect/floor_decal/corner/navgold/border,
+/obj/structure/sign/department/chem{
+	pixel_y = -30
+	},
+/turf/simulated/floor/tiled,
+/area/endeavour/hallway/d1starboardafthall)
 "jkG" = (
 /obj/machinery/door/firedoor{
 	dir = 8
@@ -14713,7 +14667,7 @@
 /area/tether/station/public_meeting_room)
 "joM" = (
 /obj/structure/table/steel,
-/obj/item/stack/material/steel/full_stack,
+/obj/fiftyspawner/steel,
 /turf/simulated/floor/tiled/techfloor,
 /area/rnd/workshop)
 "joN" = (
@@ -14875,12 +14829,6 @@
 /turf/simulated/floor/tiled/white,
 /area/medical/reception)
 "jtH" = (
-/obj/effect/floor_decal/borderfloorblack/corner{
-	dir = 1
-	},
-/obj/effect/floor_decal/corner/navblue/bordercorner{
-	dir = 1
-	},
 /obj/structure/cable/orange{
 	icon_state = "4-8"
 	},
@@ -14889,6 +14837,7 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/holopad,
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d2portafthall)
 "jue" = (
@@ -15200,8 +15149,7 @@
 	dir = 8
 	},
 /obj/machinery/light{
-	dir = 8;
-	pixel_x = -10
+	dir = 8
 	},
 /obj/structure/cable/green{
 	icon_state = "1-2"
@@ -15281,12 +15229,6 @@
 /turf/simulated/floor/tiled,
 /area/rnd/research_foyer)
 "jGq" = (
-/obj/effect/floor_decal/borderfloorblack{
-	dir = 1
-	},
-/obj/effect/floor_decal/corner/navblue/border{
-	dir = 1
-	},
 /obj/effect/floor_decal/borderfloorblack{
 	dir = 8
 	},
@@ -15349,6 +15291,11 @@
 	dir = 9
 	},
 /obj/item/reagent_containers/glass/beaker,
+/obj/machinery/button/remote/blast_door{
+	id = "rndshutters";
+	name = "Research Shutter control";
+	pixel_y = 27
+	},
 /turf/simulated/floor/tiled/steel_grid,
 /area/rnd/reception_desk)
 "jHE" = (
@@ -15403,8 +15350,7 @@
 	},
 /obj/effect/floor_decal/corner/paleblue/diagonal,
 /obj/machinery/light{
-	dir = 8;
-	pixel_x = -10
+	dir = 8
 	},
 /turf/simulated/floor/tiled/white,
 /area/medical/patient_c)
@@ -15469,12 +15415,16 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
-/obj/effect/floor_decal/borderfloorblack/corner{
+/obj/effect/floor_decal/borderfloorblack{
 	dir = 1
 	},
-/obj/effect/floor_decal/corner/navgold/bordercorner{
+/obj/effect/floor_decal/corner/navgold/border{
 	dir = 1
 	},
+/obj/machinery/power/apc/north_mount,
+/obj/structure/cable/green{
+	icon_state = "0-4"
+	},
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d1starboardafthall)
 "jOJ" = (
@@ -15673,10 +15623,6 @@
 "jUZ" = (
 /turf/simulated/floor/wood,
 /area/endeavour/hallway/d2afthall)
-"jVj" = (
-/obj/machinery/computer/arcade,
-/turf/simulated/floor/carpet/bcarpet,
-/area/endeavour/hallway/d2afthall)
 "jVn" = (
 /obj/structure/cable/green{
 	icon_state = "4-8"
@@ -15792,7 +15738,7 @@
 /turf/simulated/wall/r_wall/prepainted/medical,
 /area/shuttle/emt/general)
 "jZz" = (
-/obj/structure/table/reinforced,
+/obj/machinery/mech_recharger,
 /turf/simulated/floor/tiled/dark,
 /area/rnd/research/researchdivision)
 "jZM" = (
@@ -15924,14 +15870,23 @@
 /turf/simulated/floor/plating,
 /area/medical/virologymaint)
 "keB" = (
-/obj/effect/floor_decal/borderfloorblack/corner,
-/obj/effect/floor_decal/corner/navblue/bordercorner,
-/turf/simulated/floor/tiled,
-/area/endeavour/hallway/d2portafthall)
+/obj/effect/floor_decal/borderfloorwhite{
+	dir = 4
+	},
+/obj/effect/floor_decal/corner/beige/border{
+	dir = 4
+	},
+/obj/structure/bed/chair{
+	dir = 8
+	},
+/obj/structure/sign/warning/nosmoking_1{
+	pixel_x = 28
+	},
+/turf/simulated/floor/tiled/white,
+/area/medical/medbay4)
 "keI" = (
 /obj/machinery/light{
-	dir = 8;
-	pixel_x = -10
+	dir = 8
 	},
 /obj/effect/floor_decal/borderfloor{
 	dir = 8
@@ -16018,7 +15973,6 @@
 "kgb" = (
 /obj/machinery/door/airlock/maintenance/common,
 /obj/structure/catwalk,
-/obj/map_helper/access_helper/airlock/station/science/department,
 /turf/simulated/floor/plating,
 /area/maintenance/medbay/aft)
 "kgh" = (
@@ -16106,6 +16060,7 @@
 /area/endeavour/hallway/d2portamidhall)
 "kjj" = (
 /obj/structure/table/standard,
+/obj/item/material/ashtray/glass,
 /turf/simulated/floor/tiled,
 /area/holodeck_control)
 "kjr" = (
@@ -16215,8 +16170,7 @@
 /area/rnd/anomaly_lab)
 "kmH" = (
 /obj/machinery/light{
-	dir = 4;
-	use_power = 0
+	dir = 4
 	},
 /obj/machinery/light_switch{
 	dir = 4;
@@ -16800,8 +16754,7 @@
 /area/endeavour/hallway/d1starboardforhall)
 "kKI" = (
 /obj/machinery/light{
-	dir = 8;
-	pixel_x = -10
+	dir = 8
 	},
 /turf/simulated/floor/tiled/techfloor,
 /area/medical/oncall_room)
@@ -16811,8 +16764,7 @@
 	},
 /obj/effect/floor_decal/industrial/outline/blue,
 /obj/machinery/light{
-	dir = 8;
-	pixel_x = -10
+	dir = 8
 	},
 /obj/structure/sign/greencross{
 	pixel_x = -32
@@ -16927,19 +16879,13 @@
 /turf/simulated/floor/tiled/white,
 /area/medical/reception)
 "kOr" = (
-/obj/machinery/power/apc/west_mount{
-	pixel_x = 0;
-	pixel_y = 22;
-	dir = 2
-	},
-/obj/structure/cable/green{
-	icon_state = "0-4"
-	},
-/obj/effect/floor_decal/borderfloorblack{
-	dir = 9
+/obj/structure/cable{
+	icon_state = "4-8"
 	},
-/obj/effect/floor_decal/corner/navgold/border{
-	dir = 9
+/obj/effect/floor_decal/borderfloorblack,
+/obj/effect/floor_decal/corner/navgold/border,
+/obj/structure/sign/greencross{
+	pixel_y = -30
 	},
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d1starboardafthall)
@@ -16961,8 +16907,7 @@
 "kOH" = (
 /obj/effect/floor_decal/corner_techfloor_grid/full,
 /obj/machinery/light{
-	dir = 8;
-	pixel_x = -10
+	dir = 8
 	},
 /turf/simulated/floor/tiled/techfloor,
 /area/endeavour/hallway/d2afthall)
@@ -16974,8 +16919,7 @@
 	dir = 8
 	},
 /obj/machinery/light{
-	dir = 8;
-	pixel_x = -10
+	dir = 8
 	},
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d2afthall)
@@ -17566,7 +17510,7 @@
 "lfu" = (
 /obj/structure/flora/pottedplant/stoutbush,
 /turf/simulated/floor/tiled/dark,
-/area/maintenance/medbay/aft)
+/area/medical/surgeryobs)
 "lfy" = (
 /obj/structure/table/steel_reinforced,
 /obj/item/reagent_containers/spray/cleaner{
@@ -17676,8 +17620,7 @@
 /area/medical/medbay4)
 "lkW" = (
 /obj/machinery/light{
-	dir = 8;
-	pixel_x = -10
+	dir = 8
 	},
 /turf/simulated/floor/plating,
 /area/medical/surgery_storage)
@@ -18236,10 +18179,6 @@
 /obj/machinery/atmospherics/component/unary/vent_pump/on{
 	dir = 4
 	},
-/obj/machinery/light{
-	dir = 8;
-	pixel_x = -10
-	},
 /turf/simulated/floor/tiled,
 /area/rnd/research_foyer)
 "lCS" = (
@@ -18830,8 +18769,7 @@
 /area/hallway/station/docks)
 "mcL" = (
 /obj/machinery/light{
-	dir = 4;
-	pixel_x = 10
+	dir = 4
 	},
 /obj/effect/floor_decal/corner_techfloor_grid{
 	dir = 9
@@ -18947,6 +18885,12 @@
 	dir = 1
 	},
 /obj/machinery/door/airlock/glass,
+/obj/effect/floor_decal/borderfloorblack/corner2{
+	dir = 4
+	},
+/obj/effect/floor_decal/corner/navblue/bordercorner2{
+	dir = 4
+	},
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d2portafthall)
 "mgH" = (
@@ -19208,8 +19152,7 @@
 	dir = 8
 	},
 /obj/machinery/light{
-	dir = 8;
-	pixel_x = -10
+	dir = 8
 	},
 /turf/simulated/floor/tiled,
 /area/rnd/xenobiology/xenoflora)
@@ -19417,8 +19360,7 @@
 "mxO" = (
 /obj/machinery/recharge_station,
 /obj/machinery/light{
-	dir = 8;
-	pixel_x = -10
+	dir = 8
 	},
 /turf/simulated/floor/tiled/white,
 /area/crew_quarters/medical_restroom)
@@ -19455,8 +19397,7 @@
 	pixel_x = -22
 	},
 /obj/machinery/light{
-	dir = 8;
-	pixel_x = -10
+	dir = 8
 	},
 /obj/effect/floor_decal/industrial/warning,
 /turf/simulated/floor/tiled/dark,
@@ -19535,6 +19476,7 @@
 /obj/map_helper/electrochromatic_linker{
 	id = "robotics-outer"
 	},
+/obj/effect/paint/purplegray,
 /turf/simulated/floor/plating,
 /area/assembly/robotics)
 "mBc" = (
@@ -19654,6 +19596,7 @@
 	opacity = 0
 	},
 /obj/spawner/window/low_wall/reinforced/full,
+/obj/effect/paint/purplegray,
 /turf/simulated/floor/reinforced,
 /area/rnd/xenobiology)
 "mFC" = (
@@ -19790,7 +19733,7 @@
 	},
 /obj/map_helper/access_helper/airlock/station/medical/department,
 /turf/simulated/floor/tiled/dark,
-/area/maintenance/medbay/aft)
+/area/medical/surgeryobs)
 "mJO" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/light_switch{
@@ -19842,8 +19785,7 @@
 /obj/effect/floor_decal/borderfloorwhite/corner2,
 /obj/effect/floor_decal/corner/lightorange/bordercorner2,
 /obj/machinery/light{
-	dir = 4;
-	pixel_x = 10
+	dir = 4
 	},
 /turf/simulated/floor/tiled/white,
 /area/medical/chemistry)
@@ -19854,8 +19796,7 @@
 /area/medical/patient_wing)
 "mLf" = (
 /obj/machinery/light{
-	dir = 8;
-	pixel_x = -10
+	dir = 8
 	},
 /obj/structure/toilet{
 	dir = 4
@@ -19964,8 +19905,7 @@
 	icon_state = "1-2"
 	},
 /obj/machinery/light{
-	dir = 8;
-	pixel_x = -10
+	dir = 8
 	},
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d2afthall)
@@ -20241,9 +20181,6 @@
 	},
 /obj/effect/floor_decal/borderfloorwhite,
 /obj/effect/floor_decal/corner/paleblue/border,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply,
 /obj/structure/cable/green{
@@ -20277,8 +20214,7 @@
 /area/medical/medbay4)
 "mZc" = (
 /obj/machinery/light{
-	dir = 8;
-	pixel_x = -10
+	dir = 8
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/medbay/aft)
@@ -20447,8 +20383,7 @@
 	dir = 4
 	},
 /obj/machinery/light{
-	dir = 4;
-	use_power = 0
+	dir = 4
 	},
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d2portamidhall)
@@ -20486,6 +20421,7 @@
 	opacity = 0
 	},
 /obj/spawner/window/low_wall/reinforced/full,
+/obj/effect/paint/purplegray,
 /turf/simulated/floor/reinforced,
 /area/rnd/xenobiology)
 "neQ" = (
@@ -20591,8 +20527,7 @@
 	dir = 8
 	},
 /obj/machinery/light{
-	dir = 8;
-	pixel_x = -10
+	dir = 8
 	},
 /turf/simulated/floor/tiled/techfloor,
 /area/endeavour/hallway/d2afthall)
@@ -20709,8 +20644,7 @@
 /area/endeavour/hallway/d1starboardamidhall)
 "nok" = (
 /obj/machinery/light{
-	dir = 8;
-	pixel_x = -10
+	dir = 8
 	},
 /obj/machinery/suit_cycler/medical,
 /obj/effect/floor_decal/corner/paleblue{
@@ -21029,8 +20963,7 @@
 /area/medical/psych_ward)
 "nzY" = (
 /obj/machinery/light{
-	dir = 4;
-	pixel_x = 10
+	dir = 4
 	},
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -21108,6 +21041,7 @@
 	dir = 8
 	},
 /obj/spawner/window/low_wall/reinforced/full,
+/obj/effect/paint/babyblue,
 /turf/simulated/floor/plating,
 /area/shuttle/emt/general)
 "nBC" = (
@@ -21135,15 +21069,9 @@
 /turf/simulated/floor/wood,
 /area/rnd/breakroom)
 "nBV" = (
-/obj/effect/floor_decal/borderfloorblack{
-	dir = 4
-	},
-/obj/effect/floor_decal/corner/navblue/border{
-	dir = 4
-	},
-/obj/effect/floor_decal/borderfloorblack,
-/turf/simulated/floor/tiled,
-/area/endeavour/hallway/d2portafthall)
+/obj/machinery/vending/coffee,
+/turf/simulated/floor/tiled/dark,
+/area/rnd/research/researchdivision)
 "nCo" = (
 /obj/effect/floor_decal/borderfloorblack/corner{
 	dir = 4
@@ -21356,7 +21284,7 @@
 	icon_state = "0-4"
 	},
 /turf/simulated/floor/tiled/dark,
-/area/maintenance/medbay/aft)
+/area/medical/surgeryobs)
 "nKm" = (
 /obj/structure/window/reinforced{
 	dir = 1
@@ -21626,7 +21554,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/tiled/dark,
-/area/maintenance/medbay/aft)
+/area/medical/surgeryobs)
 "nPr" = (
 /obj/machinery/door/firedoor/glass,
 /obj/map_helper/access_helper/airlock/station/medical/department,
@@ -21966,8 +21894,7 @@
 	},
 /obj/machinery/power/apc/north_mount,
 /obj/machinery/light{
-	dir = 8;
-	pixel_x = -10
+	dir = 8
 	},
 /turf/simulated/floor/tiled/techfloor,
 /area/assembly/chargebay)
@@ -22107,14 +22034,6 @@
 	},
 /turf/simulated/floor/tiled,
 /area/rnd/xenobiology)
-"ojU" = (
-/obj/machinery/button/windowtint{
-	id = "robotics-inner";
-	pixel_x = -22;
-	pixel_y = 24
-	},
-/turf/space/basic,
-/area/space)
 "ojY" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
@@ -22248,6 +22167,7 @@
 	name = "Containment Blast Doors";
 	opacity = 0
 	},
+/obj/effect/paint/purplegray,
 /turf/simulated/floor/reinforced,
 /area/rnd/xenobiology)
 "omt" = (
@@ -22500,9 +22420,12 @@
 /area/rnd/robotics/morgue)
 "owo" = (
 /obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks,
-/obj/map_helper/electrochromatic_linker{
-	id = "research-inner"
+/obj/machinery/door/blast/shutters{
+	dir = 8;
+	id = "rndshutters";
+	name = "Research Shutters"
 	},
+/obj/effect/paint/purplegray,
 /turf/simulated/floor/plating,
 /area/rnd/reception_desk)
 "owE" = (
@@ -22613,8 +22536,7 @@
 	dir = 8
 	},
 /obj/machinery/light{
-	dir = 8;
-	pixel_x = -10
+	dir = 8
 	},
 /obj/machinery/door/firedoor{
 	dir = 8
@@ -22716,8 +22638,7 @@
 /area/endeavour/hallway/d1starboardafthall)
 "oEw" = (
 /obj/machinery/light{
-	dir = 8;
-	pixel_x = -10
+	dir = 8
 	},
 /turf/simulated/floor/tiled/white,
 /area/crew_quarters/medical_restroom)
@@ -22745,16 +22666,15 @@
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/hallway/station/docks)
 "oFP" = (
-/obj/structure/cable/green{
-	icon_state = "1-2"
-	},
-/obj/machinery/door/firedoor,
 /obj/effect/floor_decal/borderfloorblack{
 	dir = 8
 	},
 /obj/effect/floor_decal/corner/navgold/border{
 	dir = 8
 	},
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d2afthall)
 "oFZ" = (
@@ -22889,8 +22809,7 @@
 	},
 /obj/effect/floor_decal/corner/paleblue/diagonal,
 /obj/machinery/light{
-	dir = 8;
-	pixel_x = -10
+	dir = 8
 	},
 /turf/simulated/floor/tiled/white,
 /area/medical/patient_a)
@@ -23272,8 +23191,7 @@
 /area/medical/resleeving)
 "oUf" = (
 /obj/machinery/light{
-	dir = 8;
-	pixel_x = -10
+	dir = 8
 	},
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -23351,6 +23269,11 @@
 /obj/effect/floor_decal/corner/mauve/border{
 	dir = 1
 	},
+/obj/item/paper_bin{
+	pixel_x = -1;
+	pixel_y = 4
+	},
+/obj/item/pen,
 /turf/simulated/floor/tiled/steel_grid,
 /area/rnd/reception_desk)
 "oXk" = (
@@ -23452,8 +23375,7 @@
 	},
 /obj/machinery/air_alarm/north_mount,
 /obj/machinery/light{
-	dir = 8;
-	pixel_x = -10
+	dir = 8
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/substation/medical_science)
@@ -23496,6 +23418,7 @@
 	name = "Containment Blast Doors";
 	opacity = 0
 	},
+/obj/effect/paint/purplegray,
 /turf/simulated/floor/reinforced,
 /area/rnd/xenobiology)
 "oZA" = (
@@ -23773,8 +23696,7 @@
 	dir = 8
 	},
 /obj/machinery/light{
-	dir = 8;
-	pixel_x = -10
+	dir = 8
 	},
 /turf/simulated/floor/tiled/white,
 /area/medical/virology_fore_access)
@@ -23999,7 +23921,7 @@
 /obj/item/paper_bin,
 /obj/item/pen,
 /turf/simulated/floor/tiled/dark,
-/area/maintenance/medbay/aft)
+/area/medical/surgeryobs)
 "plL" = (
 /obj/machinery/door/airlock/glass,
 /obj/machinery/door/firedoor,
@@ -24116,8 +24038,7 @@
 	dir = 4
 	},
 /obj/machinery/light{
-	dir = 8;
-	pixel_x = -10
+	dir = 8
 	},
 /turf/simulated/floor/tiled,
 /area/rnd/hallway)
@@ -24169,6 +24090,13 @@
 	},
 /turf/space,
 /area/space)
+"ppZ" = (
+/obj/structure/table/glass,
+/obj/machinery/photocopier/faxmachine{
+	department = "Research Break Room"
+	},
+/turf/simulated/floor/carpet/purcarpet,
+/area/rnd/breakroom)
 "pqy" = (
 /obj/effect/floor_decal/borderfloor/corner{
 	dir = 1
@@ -24394,7 +24322,7 @@
 	pixel_y = 28
 	},
 /turf/simulated/floor/tiled/dark,
-/area/maintenance/medbay/aft)
+/area/medical/surgeryobs)
 "pxV" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/red{
 	dir = 8
@@ -24413,6 +24341,9 @@
 	},
 /obj/effect/floor_decal/borderfloorblack,
 /obj/effect/floor_decal/corner/navgold/border,
+/obj/structure/sign/greencross{
+	pixel_y = -30
+	},
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d1starboardafthall)
 "pyK" = (
@@ -24577,6 +24508,7 @@
 /area/endeavour/hallway/d2portamidhall)
 "pCA" = (
 /obj/machinery/disposal,
+/obj/structure/disposalpipe/trunk,
 /turf/simulated/floor/tiled/techfloor,
 /area/rnd/workshop)
 "pCH" = (
@@ -24692,13 +24624,18 @@
 /turf/simulated/floor/wood,
 /area/medical/medbay4)
 "pFp" = (
-/obj/machinery/holopad,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 5
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 5
 	},
+/obj/effect/floor_decal/borderfloorblack/corner{
+	dir = 8
+	},
+/obj/effect/floor_decal/corner/navblue/bordercorner{
+	dir = 8
+	},
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d2portafthall)
 "pFq" = (
@@ -24824,8 +24761,11 @@
 /turf/simulated/floor/plating,
 /area/maintenance/substation/research)
 "pIz" = (
-/turf/simulated/floor/tiled,
-/area/endeavour/hallway/d2portafthall)
+/obj/structure/bed/chair/sofa/purp/right{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/dark,
+/area/rnd/research/researchdivision)
 "pIE" = (
 /obj/structure/sign/department/operational{
 	pixel_y = -30
@@ -24935,8 +24875,7 @@
 	network = list("Xenobiology")
 	},
 /obj/machinery/light{
-	dir = 8;
-	pixel_x = -10
+	dir = 8
 	},
 /obj/effect/floor_decal/borderfloor{
 	dir = 8
@@ -25073,8 +25012,7 @@
 	icon_state = "1-2"
 	},
 /obj/machinery/light{
-	dir = 8;
-	pixel_x = -10
+	dir = 8
 	},
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d2afthall)
@@ -25367,8 +25305,7 @@
 	dir = 5
 	},
 /obj/machinery/light{
-	dir = 4;
-	pixel_x = 10
+	dir = 4
 	},
 /turf/simulated/floor/tiled/white,
 /area/medical/chemistry)
@@ -25512,8 +25449,7 @@
 	network = list("Xenobiology")
 	},
 /obj/machinery/light{
-	dir = 8;
-	pixel_x = -10
+	dir = 8
 	},
 /turf/simulated/floor/tiled,
 /area/rnd/xenobiology/xenoflora/lab_atmos)
@@ -25717,6 +25653,9 @@
 /obj/structure/cable/green{
 	icon_state = "4-8"
 	},
+/obj/structure/disposalpipe/segment{
+	dir = 8
+	},
 /turf/simulated/floor/tiled/techfloor,
 /area/rnd/workshop)
 "qiy" = (
@@ -27220,6 +27159,7 @@
 	name = "Containment Blast Doors";
 	opacity = 0
 	},
+/obj/effect/paint/purplegray,
 /turf/simulated/floor/reinforced,
 /area/rnd/xenobiology)
 "rbh" = (
@@ -27278,16 +27218,6 @@
 /obj/effect/floor_decal/corner/mauve/border{
 	dir = 8
 	},
-/obj/machinery/button/windowtint{
-	id = "research-outer";
-	pixel_x = -22;
-	pixel_y = -32
-	},
-/obj/machinery/button/windowtint{
-	id = "research-inner";
-	pixel_x = -22;
-	pixel_y = -23
-	},
 /turf/simulated/floor/tiled/steel_grid,
 /area/rnd/reception_desk)
 "rbX" = (
@@ -27901,8 +27831,7 @@
 	pixel_y = 22
 	},
 /obj/machinery/light{
-	dir = 8;
-	pixel_x = -10
+	dir = 8
 	},
 /turf/simulated/floor/tiled,
 /area/holodeck_control)
@@ -28320,8 +28249,7 @@
 /area/medical/medbay4)
 "rMu" = (
 /obj/machinery/light{
-	dir = 8;
-	pixel_x = -10
+	dir = 8
 	},
 /turf/simulated/floor/tiled,
 /area/rnd/anomaly_lab)
@@ -28470,8 +28398,7 @@
 	dir = 8
 	},
 /obj/machinery/light{
-	dir = 8;
-	pixel_x = -10
+	dir = 8
 	},
 /obj/structure/disposalpipe/segment,
 /turf/simulated/floor/tiled/white,
@@ -28533,6 +28460,7 @@
 /obj/map_helper/electrochromatic_linker{
 	id = "robotics-inner"
 	},
+/obj/effect/paint/purplegray,
 /turf/simulated/floor/plating,
 /area/assembly/robotics)
 "rUa" = (
@@ -28812,6 +28740,7 @@
 /obj/map_helper/electrochromatic_linker{
 	id = "robotics-inner"
 	},
+/obj/effect/paint/purplegray,
 /turf/simulated/floor/plating,
 /area/assembly/robotics)
 "sdA" = (
@@ -28823,10 +28752,10 @@
 /obj/effect/floor_decal/corner/mauve/border{
 	dir = 10
 	},
+/obj/machinery/light,
 /obj/machinery/newscaster{
-	pixel_y = -31
+	pixel_x = -29
 	},
-/obj/machinery/light,
 /turf/simulated/floor/tiled/steel_grid,
 /area/rnd/reception_desk)
 "seE" = (
@@ -28905,7 +28834,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/tiled/dark,
-/area/maintenance/medbay/aft)
+/area/medical/surgeryobs)
 "sha" = (
 /obj/structure/disposalpipe/segment{
 	dir = 8
@@ -29040,23 +28969,13 @@
 	icon_state = "1-2"
 	},
 /obj/machinery/light{
-	dir = 4;
-	pixel_x = 10
+	dir = 4
 	},
 /obj/effect/floor_decal/corner_techfloor_grid{
 	dir = 9
 	},
 /turf/simulated/floor/tiled/techfloor,
 /area/crew_quarters/cafeteria)
-"sme" = (
-/obj/effect/floor_decal/borderfloorblack{
-	dir = 10
-	},
-/obj/effect/floor_decal/corner/navblue/border{
-	dir = 10
-	},
-/turf/simulated/floor/tiled,
-/area/endeavour/hallway/d2portafthall)
 "smf" = (
 /obj/machinery/atmospherics/component/unary/vent_pump/on{
 	dir = 1
@@ -29103,8 +29022,7 @@
 /obj/structure/table/standard,
 /obj/item/paicard,
 /obj/machinery/light{
-	dir = 8;
-	pixel_x = -10
+	dir = 8
 	},
 /turf/simulated/floor/tiled,
 /area/holodeck_control)
@@ -29115,8 +29033,7 @@
 	dir = 9
 	},
 /obj/machinery/light{
-	dir = 8;
-	pixel_x = -10
+	dir = 8
 	},
 /turf/simulated/floor/tiled/white,
 /area/medical/psych_ward)
@@ -29417,16 +29334,6 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/medical/sleeper)
-"szG" = (
-/obj/machinery/door/firedoor,
-/obj/effect/floor_decal/borderfloorblack{
-	dir = 4
-	},
-/obj/effect/floor_decal/corner/navgold/border{
-	dir = 4
-	},
-/turf/simulated/floor/tiled,
-/area/endeavour/hallway/d2afthall)
 "sAZ" = (
 /obj/structure/cable/green{
 	icon_state = "4-8"
@@ -29930,6 +29837,7 @@
 	opacity = 0
 	},
 /obj/spawner/window/low_wall/reinforced/full,
+/obj/effect/paint/purplegray,
 /turf/simulated/floor/reinforced,
 /area/rnd/xenobiology)
 "sRh" = (
@@ -29941,8 +29849,7 @@
 "sRp" = (
 /obj/machinery/camera/network/medbay,
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 20
+	dir = 1
 	},
 /obj/structure/bed/chair/sofa/teal/left,
 /obj/effect/floor_decal/spline/fancy/wood{
@@ -29957,6 +29864,7 @@
 /obj/effect/floor_decal/corner/navgold/border{
 	dir = 4
 	},
+/obj/machinery/door/firedoor,
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d1starboardafthall)
 "sTi" = (
@@ -30016,6 +29924,7 @@
 	opacity = 0
 	},
 /obj/spawner/window/low_wall/reinforced/full,
+/obj/effect/paint/purplegray,
 /turf/simulated/floor/reinforced,
 /area/rnd/xenobiology)
 "sUJ" = (
@@ -30133,8 +30042,7 @@
 "sXW" = (
 /obj/structure/morgue,
 /obj/machinery/light{
-	dir = 8;
-	pixel_x = -10
+	dir = 8
 	},
 /turf/simulated/floor/tiled/techfloor,
 /area/medical/morgue)
@@ -30562,13 +30470,13 @@
 /turf/simulated/floor/tiled/white,
 /area/medical/sleeper)
 "tov" = (
-/obj/machinery/door/firedoor,
 /obj/effect/floor_decal/borderfloorblack{
 	dir = 8
 	},
 /obj/effect/floor_decal/corner/navblue/border{
 	dir = 8
 	},
+/obj/machinery/fire_alarm/west_mount,
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d2afthall)
 "toD" = (
@@ -31170,6 +31078,7 @@
 	opacity = 0
 	},
 /obj/spawner/window/low_wall/reinforced/full,
+/obj/effect/paint/purplegray,
 /turf/simulated/floor/reinforced,
 /area/rnd/xenobiology)
 "tHr" = (
@@ -31301,11 +31210,9 @@
 /obj/structure/cable/green{
 	icon_state = "1-2"
 	},
-/obj/machinery/door/airlock/research{
-	id_tag = "researchdoor";
+/obj/machinery/door/airlock/glass/research{
 	name = "R&D Distribution Area"
 	},
-/obj/map_helper/access_helper/airlock/station/exploration/auxillerysci,
 /turf/simulated/floor/tiled,
 /area/rnd/research/researchdivision)
 "tLU" = (
@@ -31342,7 +31249,6 @@
 /obj/structure/window/reinforced/tinted/frosted{
 	dir = 4
 	},
-/obj/machinery/fire_alarm/north_mount,
 /turf/simulated/floor/tiled/techfloor,
 /area/endeavour/hallway/d2afthall)
 "tNe" = (
@@ -31413,6 +31319,7 @@
 	},
 /obj/structure/disposalpipe/segment,
 /obj/spawner/window/low_wall/reinforced/full/firelocks,
+/obj/effect/paint/purplegray,
 /turf/simulated/floor/reinforced,
 /area/rnd/testingroom)
 "tOP" = (
@@ -31477,8 +31384,7 @@
 	pixel_x = -32
 	},
 /obj/machinery/light{
-	dir = 8;
-	pixel_x = -10
+	dir = 8
 	},
 /turf/simulated/floor/tiled/white,
 /area/medical/virology_aft_access)
@@ -31778,8 +31684,7 @@
 /area/medical/surgery_storage)
 "uba" = (
 /obj/machinery/light{
-	dir = 8;
-	pixel_x = -10
+	dir = 8
 	},
 /turf/simulated/wall/prepainted/science,
 /area/maintenance/research)
@@ -31973,7 +31878,7 @@
 	dir = 5
 	},
 /turf/simulated/floor/tiled/dark,
-/area/maintenance/medbay/aft)
+/area/medical/surgeryobs)
 "uhS" = (
 /obj/machinery/holopad,
 /obj/structure/cable/green{
@@ -32048,6 +31953,9 @@
 /obj/effect/floor_decal/corner/navblue/border{
 	dir = 1
 	},
+/obj/structure/sign/department/rnd{
+	pixel_y = 32
+	},
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d2portafthall)
 "ukc" = (
@@ -32057,6 +31965,7 @@
 	name = "Testing Chamber Blast Door"
 	},
 /obj/spawner/window/low_wall/reinforced/full/firelocks,
+/obj/effect/paint/purplegray,
 /turf/simulated/floor/reinforced,
 /area/rnd/testingroom)
 "ukt" = (
@@ -32097,7 +32006,21 @@
 /turf/simulated/floor/tiled,
 /area/medical/virology)
 "ulr" = (
-/obj/effect/floor_decal/borderfloorblack,
+/obj/effect/floor_decal/borderfloorblack{
+	dir = 1
+	},
+/obj/effect/floor_decal/corner/navblue/border{
+	dir = 1
+	},
+/obj/structure/sign/department/sci{
+	pixel_y = 32
+	},
+/obj/effect/floor_decal/borderfloorblack/corner2{
+	dir = 1
+	},
+/obj/effect/floor_decal/corner/navblue/bordercorner2{
+	dir = 1
+	},
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d2portafthall)
 "umy" = (
@@ -32119,19 +32042,11 @@
 /area/medical/medbay_primary_storage)
 "unJ" = (
 /obj/effect/floor_decal/borderfloorblack{
-	dir = 1
-	},
-/obj/effect/floor_decal/corner/navblue/border{
-	dir = 1
-	},
-/obj/structure/cable/orange{
-	icon_state = "4-8"
-	},
-/obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/turf/simulated/floor/tiled,
-/area/endeavour/hallway/d2portafthall)
+/obj/structure/table/reinforced,
+/turf/simulated/floor/tiled/dark,
+/area/rnd/research/researchdivision)
 "unU" = (
 /obj/machinery/atmospherics/component/unary/vent_pump/on{
 	dir = 4
@@ -32404,6 +32319,7 @@
 	opacity = 0
 	},
 /obj/spawner/window/low_wall/reinforced/full,
+/obj/effect/paint/purplegray,
 /turf/simulated/floor/reinforced,
 /area/rnd/xenobiology)
 "uxB" = (
@@ -33146,18 +33062,15 @@
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d2portafthall)
 "uVS" = (
-/obj/item/paper_bin{
-	pixel_x = -1;
-	pixel_y = 4
-	},
-/obj/structure/table/reinforced,
-/obj/item/pen,
 /obj/effect/floor_decal/borderfloor{
 	dir = 8
 	},
 /obj/effect/floor_decal/corner/mauve/border{
 	dir = 8
 	},
+/obj/structure/bed/chair/office/dark{
+	dir = 8
+	},
 /turf/simulated/floor/tiled/steel_grid,
 /area/rnd/reception_desk)
 "uVY" = (
@@ -33287,15 +33200,12 @@
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d1starboardamidhall)
 "vbt" = (
-/obj/effect/floor_decal/borderfloorblack{
-	dir = 8
-	},
-/obj/effect/floor_decal/corner/navblue/border{
-	dir = 8
+/obj/machinery/door/firedoor{
+	dir = 1
 	},
-/obj/effect/floor_decal/borderfloorblack,
-/turf/simulated/floor/tiled,
-/area/endeavour/hallway/d2portafthall)
+/obj/machinery/door/airlock/maintenance/common,
+/turf/simulated/floor/plating,
+/area/maintenance/medbay/aft)
 "vbA" = (
 /obj/structure/cable/green{
 	icon_state = "4-8"
@@ -33473,19 +33383,6 @@
 /obj/machinery/portable_atmospherics/canister/carbon_dioxide,
 /turf/simulated/floor/tiled,
 /area/rnd/xenobiology)
-"viQ" = (
-/obj/machinery/light{
-	dir = 8;
-	pixel_x = -10
-	},
-/obj/effect/floor_decal/borderfloorblack{
-	dir = 8
-	},
-/obj/effect/floor_decal/corner/navblue/border{
-	dir = 8
-	},
-/turf/simulated/floor/tiled,
-/area/endeavour/hallway/d2portamidhall)
 "vjT" = (
 /obj/machinery/air_alarm{
 	dir = 1;
@@ -33573,8 +33470,7 @@
 	volume_rate = 700
 	},
 /obj/machinery/light{
-	dir = 8;
-	pixel_x = -10
+	dir = 8
 	},
 /turf/simulated/floor/reinforced,
 /area/rnd/xenobiology)
@@ -33825,11 +33721,20 @@
 /turf/simulated/floor/tiled,
 /area/rnd/hallway)
 "vwz" = (
-/obj/map_helper/electrochromatic_linker{
-	id = "robotics-inner"
+/obj/structure/cable/green{
+	icon_state = "4-8"
 	},
-/turf/space/basic,
-/area/space)
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/effect/floor_decal/borderfloorwhite,
+/obj/effect/floor_decal/corner/paleblue/border,
+/obj/structure/disposalpipe/segment,
+/turf/simulated/floor/tiled/white,
+/area/medical/sleeper)
 "vwR" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/research{
@@ -34006,12 +33911,13 @@
 /turf/simulated/wall/r_wall/prepainted/science,
 /area/rnd/research_foyer_auxiliary)
 "vFz" = (
-/obj/effect/floor_decal/borderfloorblack/corner{
+/obj/effect/floor_decal/borderfloorblack{
 	dir = 8
 	},
-/obj/effect/floor_decal/corner/navblue/bordercorner{
+/obj/effect/floor_decal/corner/navblue/border{
 	dir = 8
 	},
+/obj/machinery/door/firedoor,
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d2portafthall)
 "vFG" = (
@@ -34299,12 +34205,10 @@
 /obj/machinery/door/firedoor/glass{
 	dir = 4
 	},
-/obj/machinery/door/airlock/research{
-	id_tag = "researchdoor";
+/obj/structure/disposalpipe/segment,
+/obj/machinery/door/airlock/glass/research{
 	name = "R&D Distribution Area"
 	},
-/obj/structure/disposalpipe/segment,
-/obj/map_helper/access_helper/airlock/station/exploration/auxillerysci,
 /turf/simulated/floor/tiled,
 /area/rnd/research/researchdivision)
 "vQu" = (
@@ -34400,8 +34304,7 @@
 /area/medical/medbay_emt_bay)
 "vUI" = (
 /obj/machinery/light{
-	dir = 4;
-	pixel_x = 10
+	dir = 4
 	},
 /obj/structure/table/bench/steel,
 /obj/effect/floor_decal/borderfloorblack{
@@ -34663,8 +34566,7 @@
 	dir = 8
 	},
 /obj/machinery/light{
-	dir = 8;
-	pixel_x = -10
+	dir = 8
 	},
 /obj/structure/cable/green{
 	icon_state = "1-2"
@@ -35569,8 +35471,7 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/red,
 /obj/machinery/light{
-	dir = 8;
-	pixel_x = -10
+	dir = 8
 	},
 /obj/effect/floor_decal/corner/green/border{
 	dir = 8
@@ -35674,7 +35575,7 @@
 "wBY" = (
 /obj/machinery/fire_alarm/north_mount,
 /turf/simulated/floor/tiled/dark,
-/area/maintenance/medbay/aft)
+/area/medical/surgeryobs)
 "wCh" = (
 /obj/machinery/air_alarm{
 	dir = 8;
@@ -35771,6 +35672,7 @@
 /area/maintenance/research)
 "wDV" = (
 /obj/spawner/window/low_wall/reinforced/full/firelocks,
+/obj/effect/paint/purplegray,
 /turf/simulated/floor/plating,
 /area/rnd/xenobiology)
 "wEl" = (
@@ -35959,6 +35861,7 @@
 /obj/effect/floor_decal/corner/navblue/border{
 	dir = 4
 	},
+/obj/machinery/door/firedoor,
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d2portafthall)
 "wLE" = (
@@ -36365,11 +36268,17 @@
 /turf/simulated/floor/wood/sif/indoors,
 /area/medical/reception)
 "wWJ" = (
-/obj/structure/sign/warning/nosmoking_1{
-	pixel_x = 8
+/obj/effect/floor_decal/borderfloorblack{
+	dir = 1
 	},
-/turf/simulated/wall/prepainted/medical,
-/area/medical/psych/psych_2)
+/obj/effect/floor_decal/corner/navblue/border{
+	dir = 1
+	},
+/obj/effect/floor_decal/borderfloorblack{
+	dir = 8
+	},
+/turf/simulated/floor/tiled,
+/area/endeavour/hallway/d2portafthall)
 "wWO" = (
 /obj/machinery/camera/network/civilian{
 	dir = 8
@@ -36442,6 +36351,9 @@
 /obj/structure/cable/green{
 	icon_state = "4-8"
 	},
+/obj/structure/disposalpipe/segment{
+	dir = 8
+	},
 /turf/simulated/floor/tiled/techfloor,
 /area/rnd/workshop)
 "xaP" = (
@@ -36473,15 +36385,6 @@
 /obj/landmark/spawnpoint/job/medical_doctor,
 /turf/simulated/floor/tiled/white,
 /area/medical/chemistry)
-"xbt" = (
-/obj/effect/floor_decal/borderfloorblack{
-	dir = 8
-	},
-/obj/effect/floor_decal/corner/navblue/border{
-	dir = 8
-	},
-/turf/simulated/floor/tiled,
-/area/endeavour/hallway/d2portafthall)
 "xbz" = (
 /obj/structure/closet{
 	name = "spare clothes"
@@ -36531,11 +36434,11 @@
 	req_one_access = list(47)
 	},
 /obj/machinery/door/blast/shutters{
-	id = "rndhallshutters";
-	name = "Research Hall Shutters"
+	id = "rndshutters";
+	name = "Research Shutters"
 	},
 /turf/simulated/floor/tiled,
-/area/endeavour/hallway/d2portafthall)
+/area/rnd/reception_desk)
 "xcx" = (
 /obj/structure/closet/secure_closet/medical2,
 /obj/effect/floor_decal/corner/paleblue{
@@ -36605,8 +36508,7 @@
 	dir = 8
 	},
 /obj/machinery/light{
-	dir = 8;
-	pixel_x = -10
+	dir = 8
 	},
 /turf/simulated/floor/tiled/white,
 /area/medical/medbay3)
@@ -36631,8 +36533,7 @@
 /area/maintenance/research)
 "xfy" = (
 /obj/machinery/light{
-	dir = 8;
-	pixel_x = -10
+	dir = 8
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -36648,6 +36549,9 @@
 /obj/structure/cable/green{
 	icon_state = "4-8"
 	},
+/obj/structure/disposalpipe/segment{
+	dir = 8
+	},
 /turf/simulated/floor/tiled/techfloor,
 /area/rnd/workshop)
 "xgg" = (
@@ -36811,6 +36715,10 @@
 /obj/structure/cable/green{
 	icon_state = "2-8"
 	},
+/obj/structure/disposalpipe/segment{
+	dir = 8;
+	icon_state = "pipe-c"
+	},
 /turf/simulated/floor/tiled/techfloor,
 /area/rnd/workshop)
 "xlX" = (
@@ -37058,10 +36966,7 @@
 /obj/effect/floor_decal/corner/mauve/border{
 	dir = 4
 	},
-/obj/structure/disposalpipe/segment{
-	dir = 2;
-	icon_state = "pipe-c"
-	},
+/obj/structure/disposalpipe/junction,
 /turf/simulated/floor/tiled,
 /area/rnd/research/researchdivision)
 "xtv" = (
@@ -37071,6 +36976,7 @@
 	},
 /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,
 /obj/structure/table/woodentable,
+/obj/item/material/ashtray/glass,
 /turf/simulated/floor/wood,
 /area/tether/station/public_meeting_room)
 "xtD" = (
@@ -37165,10 +37071,6 @@
 /obj/effect/floor_decal/spline/fancy/wood,
 /turf/simulated/floor/tiled/monotile,
 /area/rnd/breakroom)
-"xwp" = (
-/obj/machinery/vending/fitness,
-/turf/simulated/floor/tiled/dark,
-/area/rnd/research/researchdivision)
 "xxn" = (
 /obj/structure/window/reinforced/tinted{
 	dir = 1
@@ -37292,7 +37194,7 @@
 	dir = 1
 	},
 /turf/simulated/floor/tiled/dark,
-/area/maintenance/medbay/aft)
+/area/medical/surgeryobs)
 "xCX" = (
 /turf/simulated/floor/tiled,
 /area/rnd/rdoffice)
@@ -37716,8 +37618,7 @@
 "xMp" = (
 /obj/machinery/vitals_monitor,
 /obj/machinery/light{
-	dir = 8;
-	pixel_x = -10
+	dir = 8
 	},
 /turf/simulated/floor/tiled,
 /area/medical/medbay_primary_storage)
@@ -37844,7 +37745,7 @@
 	dir = 6
 	},
 /turf/simulated/floor/tiled/dark,
-/area/maintenance/medbay/aft)
+/area/medical/surgeryobs)
 "xQT" = (
 /obj/structure/flora/pottedplant/large,
 /obj/effect/floor_decal/borderfloorblack{
@@ -44481,7 +44382,7 @@ pNX
 pNX
 pNX
 pNX
-wWJ
+pNX
 pNX
 gOV
 kBS
@@ -45429,7 +45330,7 @@ qiH
 cNW
 cNW
 ymb
-eZZ
+uwU
 xIf
 xIf
 huY
@@ -46026,7 +45927,7 @@ qpq
 qpq
 tvV
 oaU
-jVj
+sNK
 jbC
 xDZ
 jUZ
@@ -46620,7 +46521,7 @@ aHb
 iRW
 kGz
 eRt
-fUM
+keB
 fUM
 mTV
 tQp
@@ -47004,10 +46905,10 @@ gAf
 hTw
 bVW
 kxI
-mmI
-mmI
-mmI
-mmI
+bGv
+bGv
+bGv
+bGv
 nAR
 rUX
 tWY
@@ -47198,7 +47099,7 @@ jER
 kfV
 xIj
 kxI
-mmI
+bGv
 iuo
 cJg
 bPx
@@ -47392,7 +47293,7 @@ oaU
 tYf
 eHm
 kxI
-mmI
+bGv
 wBY
 uhO
 bPx
@@ -47586,7 +47487,7 @@ eBA
 pkG
 eHm
 kxI
-mmI
+bGv
 goI
 xCP
 xQM
@@ -47780,7 +47681,7 @@ pDc
 pDc
 whF
 vQx
-mmI
+bGv
 pwV
 goI
 lfu
@@ -47974,7 +47875,7 @@ jcO
 neX
 dxN
 jjo
-mmI
+bGv
 goI
 sgW
 dWk
@@ -48168,7 +48069,7 @@ qIz
 aKq
 exm
 nCR
-mmI
+bGv
 nJM
 uhO
 bPx
@@ -48341,11 +48242,11 @@ twU
 kCt
 hjM
 pfe
-iec
-iec
+qpq
+qpq
 iec
 xHD
-mSd
+aEp
 uJM
 mSd
 nYN
@@ -48362,7 +48263,7 @@ nYN
 efr
 wbG
 tJU
-mmI
+bGv
 bAe
 uhO
 bPx
@@ -48533,11 +48434,11 @@ oCO
 nZC
 uUl
 kCt
-iec
+qpq
 itd
-xHD
-xHD
-xHD
+qpq
+qpq
+iec
 xHD
 mSd
 uJM
@@ -48556,7 +48457,7 @@ fCb
 bHz
 wkU
 tJU
-mmI
+bGv
 bAe
 nPi
 plG
@@ -48721,17 +48622,17 @@ aUW
 lUe
 bxz
 jZz
-jZz
+ilh
 cje
 oCO
 xFT
 pVT
 kCt
+qpq
+iec
+iec
 iec
 iec
-xHD
-esy
-xbt
 vbt
 mSd
 wSf
@@ -48750,10 +48651,10 @@ sBd
 bHz
 jaG
 pIE
-mmI
+bGv
 mJc
-mmI
-mmI
+bGv
+bGv
 eEv
 eEv
 eEv
@@ -48923,10 +48824,10 @@ bOa
 olh
 iec
 iec
-hqT
-qjz
-pIz
-ulr
+qpq
+vUa
+qpq
+xHD
 mSd
 uJM
 mSd
@@ -49117,10 +49018,10 @@ bOa
 kCt
 qpq
 pJM
+vUa
+qpq
+vUa
 xHD
-qjz
-keB
-nBV
 mSd
 uJM
 mSd
@@ -49312,8 +49213,8 @@ kCt
 kCt
 kCt
 kCt
-gMk
-gMk
+kCt
+kCt
 kCt
 cja
 uJM
@@ -49497,7 +49398,7 @@ xIf
 xIf
 uPt
 cNs
-jZz
+efa
 cje
 oCO
 xFT
@@ -49505,11 +49406,11 @@ pVT
 oQC
 cPx
 gBH
-gBH
-ilh
-ilh
+pIz
+esy
+nBV
 gLF
-kCt
+wWJ
 jGq
 hPe
 yly
@@ -49702,9 +49603,9 @@ ilh
 ilh
 ilh
 ilh
-xwp
-kCt
-unJ
+gLF
+qjz
+qRh
 gUZ
 cva
 oaU
@@ -49892,15 +49793,15 @@ jVn
 bOa
 bSu
 efb
-efb
-efb
+unJ
+unJ
 jZR
 jZR
 kCt
-kCt
-aXe
-vFz
-sme
+ulr
+qRh
+gUZ
+qIV
 oaU
 tMG
 kTB
@@ -49910,7 +49811,7 @@ kxI
 xSl
 llq
 oaU
-kOr
+cBK
 jOk
 jPR
 elT
@@ -50289,7 +50190,7 @@ cIi
 dyM
 xDm
 wLf
-eub
+ggw
 ggw
 ggw
 ljq
@@ -50297,7 +50198,7 @@ hJq
 tkO
 jcO
 jcO
-szG
+jcO
 sSl
 nEU
 phe
@@ -50473,9 +50374,9 @@ bBQ
 ijZ
 whu
 owo
-owo
 gsB
 owo
+aXe
 owo
 whu
 whu
@@ -50496,7 +50397,7 @@ bmg
 kuE
 nwT
 fIx
-jkz
+juF
 ijd
 sNP
 fZx
@@ -50668,7 +50569,7 @@ uQR
 whu
 jHB
 uVS
-gpS
+nOJ
 nOJ
 rbQ
 sdA
@@ -51437,8 +51338,8 @@ ffI
 oWr
 nUG
 pCA
-mmt
-mmt
+gMk
+gMk
 xlI
 sQh
 whu
@@ -51465,8 +51366,8 @@ xUb
 bhT
 cMY
 qmF
-mdU
-jkz
+kOr
+juF
 ngz
 iGC
 qHA
@@ -51836,7 +51737,7 @@ whu
 owo
 owo
 whu
-fsC
+whu
 ujP
 nBm
 hGK
@@ -52436,7 +52337,7 @@ jQR
 oWl
 bJO
 pyk
-jkz
+juF
 jUt
 iGC
 tmX
@@ -52612,7 +52513,7 @@ aDx
 rTV
 scT
 aDx
-bIW
+aDx
 bNH
 nBm
 mOb
@@ -52958,7 +52859,7 @@ mDp
 mDp
 mDp
 pRW
-hsE
+pRW
 pRW
 pRW
 pRW
@@ -52978,9 +52879,9 @@ xIf
 xnR
 svR
 gZg
-xJb
+ppZ
 sxo
-aTQ
+xJb
 gZg
 xaR
 nBU
@@ -53028,7 +52929,7 @@ whZ
 dxA
 uVY
 gWJ
-ggO
+vwz
 jAX
 gdj
 iJo
@@ -53348,7 +53249,7 @@ mDp
 pRW
 pRW
 pRW
-hLz
+pRW
 pRW
 pRW
 pRW
@@ -53405,8 +53306,8 @@ cHC
 oDd
 jsQ
 kyy
-mdU
-jkz
+kOr
+juF
 ebW
 ehP
 iGC
@@ -53544,7 +53445,7 @@ pRW
 pRW
 pRW
 pRW
-ojU
+pRW
 pRW
 pRW
 pRW
@@ -53739,7 +53640,7 @@ pRW
 pRW
 pRW
 pRW
-vwz
+pRW
 pRW
 pRW
 qBd
@@ -53793,8 +53694,8 @@ cHC
 oDd
 mTD
 gij
-mdU
-efa
+jkz
+chv
 eUu
 jlY
 nDm
@@ -55723,7 +55624,7 @@ sFQ
 dde
 bxp
 dde
-viQ
+eDX
 xRk
 wmA
 fmL
diff --git a/maps/endeavour/levels/deck3.dmm b/maps/endeavour/levels/deck3.dmm
index ff751315c59b..ee560f0e0249 100644
--- a/maps/endeavour/levels/deck3.dmm
+++ b/maps/endeavour/levels/deck3.dmm
@@ -121,9 +121,17 @@
 /turf/simulated/floor/wood,
 /area/crew_quarters/bar)
 "aec" = (
-/obj/machinery/fire_alarm/east_mount,
-/turf/simulated/floor/tiled/dark,
-/area/endeavour/station/stairs_three)
+/obj/effect/floor_decal/borderfloorblack{
+	dir = 4
+	},
+/obj/effect/floor_decal/corner/navblue/border{
+	dir = 4
+	},
+/obj/machinery/light{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/monotile,
+/area/endeavour/hallway/d3afthall)
 "agG" = (
 /obj/machinery/atmospherics/component/unary/vent_pump/on{
 	dir = 4
@@ -199,9 +207,17 @@
 /turf/simulated/floor/tiled,
 /area/endeavour/station/stairs_three)
 "aiW" = (
-/obj/spawner/window/low_wall/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/security/hallway)
+/obj/effect/floor_decal/spline/fancy/wood{
+	dir = 1
+	},
+/obj/machinery/button/remote/airlock{
+	id = "DRAMATIC";
+	name = "Blast Door Control";
+	specialfunctions = 4;
+	pixel_y = 30
+	},
+/turf/simulated/floor/wood,
+/area/tether/surfacebase/entertainment)
 "ajk" = (
 /obj/structure/closet/secure_closet/detective,
 /turf/simulated/floor/carpet,
@@ -444,6 +460,7 @@
 /obj/structure/cable/green{
 	icon_state = "0-8"
 	},
+/obj/effect/paint/darkred,
 /turf/simulated/floor,
 /area/security/hallway)
 "auQ" = (
@@ -669,6 +686,9 @@
 /area/crew_quarters/toilet)
 "aAV" = (
 /obj/structure/closet/l3closet/janitor,
+/obj/machinery/light{
+	dir = 4
+	},
 /turf/simulated/floor/tiled/dark,
 /area/janitor)
 "aBl" = (
@@ -968,7 +988,7 @@
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d3starboardafthall)
 "aMQ" = (
-/turf/simulated/wall/prepainted/civilian,
+/turf/simulated/wall/prepainted,
 /area/crew_quarters/barrestroom)
 "aMW" = (
 /obj/structure/cable/green{
@@ -1029,7 +1049,7 @@
 	dir = 1
 	},
 /obj/machinery/fire_alarm/north_mount,
-/turf/simulated/floor/wood,
+/turf/simulated/floor/tiled/dark,
 /area/security/lobby)
 "aOy" = (
 /obj/structure/bed/chair/wood{
@@ -1446,6 +1466,7 @@
 	icon_state = "1-2"
 	},
 /obj/structure/cable/green,
+/obj/effect/paint/darkred,
 /turf/simulated/floor,
 /area/security/hallway)
 "bee" = (
@@ -2162,7 +2183,7 @@
 /turf/simulated/floor/wood,
 /area/crew_quarters/recreation_area_hallway)
 "bzE" = (
-/turf/simulated/wall/r_wall/prepainted/cargo,
+/turf/simulated/wall/r_wall/prepainted,
 /area/crew_quarters/bar/lounge)
 "bzQ" = (
 /obj/effect/floor_decal/spline/fancy/wood/corner{
@@ -2275,11 +2296,12 @@
 /turf/simulated/wall/prepainted,
 /area/endeavour/hallway/d3fwdmaint)
 "bDh" = (
-/obj/item/stack/material/steel/full_stack,
+/obj/fiftyspawner/steel,
 /turf/simulated/floor/plating,
 /area/maintenance/dormitory)
 "bDw" = (
 /obj/spawner/window/low_wall/reinforced/full/firelocks,
+/obj/effect/paint/darkred,
 /turf/simulated/floor/plating,
 /area/security/brig)
 "bDG" = (
@@ -2732,7 +2754,8 @@
 /area/endeavour/station/stairs_three)
 "bXD" = (
 /obj/spawner/window/low_wall/reinforced/full/firelocks,
-/obj/structure/curtain/black,
+/obj/effect/paint/palebottlegreen,
+/obj/structure/curtain/open/black,
 /turf/simulated/floor/plating,
 /area/endeavour/surfacebase/bar_backroom)
 "bXV" = (
@@ -3248,10 +3271,7 @@
 /obj/machinery/air_alarm{
 	pixel_y = 22
 	},
-/obj/effect/floor_decal/spline/fancy/wood{
-	dir = 8
-	},
-/turf/simulated/floor/wood,
+/turf/simulated/floor/tiled/dark,
 /area/security/lobby)
 "cxF" = (
 /obj/structure/cable{
@@ -3404,6 +3424,13 @@
 	},
 /turf/simulated/floor/tiled,
 /area/security/hanger)
+"cDv" = (
+/obj/machinery/station_map{
+	dir = 4;
+	pixel_x = -32
+	},
+/turf/simulated/floor/tiled,
+/area/quartermaster/foyer)
 "cEz" = (
 /obj/structure/cable/green{
 	icon_state = "4-8"
@@ -3431,7 +3458,7 @@
 /area/endeavour/hallway/d3aftmaint)
 "cFD" = (
 /obj/machinery/holopad,
-/turf/simulated/floor/tiled/monotile,
+/turf/simulated/floor/tiled/monodark,
 /area/prison/cell_block)
 "cFR" = (
 /obj/structure/bed/chair/sofa/right,
@@ -3520,7 +3547,7 @@
 /turf/simulated/floor/plating,
 /area/maintenance/substation/civilian)
 "cHy" = (
-/turf/simulated/wall/prepainted/cargo,
+/turf/simulated/wall/prepainted,
 /area/crew_quarters/game_room)
 "cHK" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -3897,7 +3924,7 @@
 /area/security/warden)
 "cVn" = (
 /obj/structure/reagent_dispensers/water_cooler/full,
-/turf/simulated/floor/tiled/monotile,
+/turf/simulated/floor/tiled/monodark,
 /area/prison/cell_block)
 "cVu" = (
 /obj/spawner/window/low_wall/reinforced/full/firelocks,
@@ -3907,6 +3934,7 @@
 /obj/structure/cable/green{
 	icon_state = "0-4"
 	},
+/obj/effect/paint/darkred,
 /turf/simulated/floor/plating,
 /area/security/warden)
 "cVy" = (
@@ -4882,10 +4910,10 @@
 /turf/simulated/floor/tiled/dark,
 /area/security/nuke_storage)
 "dBF" = (
-/obj/machinery/door/airlock/civilian{
-	name = "Reading Room 1"
-	},
 /obj/machinery/door/firedoor,
+/obj/machinery/door/airlock{
+	name = "Bar Lounge 1"
+	},
 /turf/simulated/floor/wood,
 /area/crew_quarters/bar/lounge)
 "dBL" = (
@@ -5041,8 +5069,7 @@
 /area/crew_quarters/kitchen)
 "dJV" = (
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 20
+	dir = 1
 	},
 /obj/structure/cable/green{
 	icon_state = "4-8"
@@ -5358,6 +5385,7 @@
 /obj/structure/cable/green{
 	icon_state = "4-8"
 	},
+/obj/effect/paint/darkred,
 /turf/simulated/floor,
 /area/security/hallway)
 "dSJ" = (
@@ -5703,6 +5731,7 @@
 /obj/structure/table/gamblingtable,
 /obj/effect/floor_decal/spline/fancy/wood,
 /obj/item/dice,
+/obj/item/material/ashtray/glass,
 /turf/simulated/floor/carpet/bcarpet,
 /area/crew_quarters/game_room)
 "ecO" = (
@@ -6323,29 +6352,14 @@
 /turf/simulated/floor/wood,
 /area/security/breakroom)
 "ewr" = (
-/obj/item/radio/intercom{
-	dir = 1;
-	name = "Station Intercom (General)";
-	pixel_y = 21
+/obj/machinery/light{
+	dir = 1
 	},
 /turf/simulated/floor/tiled/dark,
 /area/endeavour/hallway/d3afthall)
 "ewu" = (
 /turf/simulated/wall/r_wall/prepainted,
 /area/crew_quarters/recreation_area)
-"eww" = (
-/obj/machinery/light{
-	dir = 1;
-	pixel_y = 20
-	},
-/obj/effect/floor_decal/borderfloorblack{
-	dir = 1
-	},
-/obj/effect/floor_decal/corner/navblue/border{
-	dir = 1
-	},
-/turf/simulated/floor/tiled/steel,
-/area/endeavour/hallway/d3portforhall)
 "ewB" = (
 /obj/machinery/door/blast/regular{
 	density = 0;
@@ -6361,6 +6375,7 @@
 /obj/structure/cable/green{
 	icon_state = "0-8"
 	},
+/obj/effect/paint/darkred,
 /turf/simulated/floor,
 /area/security/hallway)
 "ewW" = (
@@ -6524,13 +6539,7 @@
 /turf/simulated/floor/tiled/steel_grid,
 /area/endeavour/surfacebase/mining_main/refinery)
 "eBO" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 6
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 6
-	},
-/turf/simulated/floor/wood,
+/turf/simulated/floor/tiled/dark,
 /area/security/lobby)
 "eCc" = (
 /obj/effect/floor_decal/industrial/outline/blue,
@@ -6726,13 +6735,10 @@
 "eFC" = (
 /obj/effect/floor_decal/techfloor/corner,
 /obj/structure/cable/green{
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 5
+	icon_state = "1-8"
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 5
+/obj/effect/floor_decal/spline/fancy/wood{
+	dir = 1
 	},
 /turf/simulated/floor/wood,
 /area/security/lobby)
@@ -6949,6 +6955,7 @@
 	icon_state = "1-8"
 	},
 /obj/structure/cable/green,
+/obj/effect/paint/darkred,
 /turf/simulated/floor,
 /area/security/hallway)
 "eMX" = (
@@ -7129,14 +7136,14 @@
 /area/endeavour/hallway/d3portamidhall)
 "eVd" = (
 /obj/machinery/door/firedoor,
-/obj/machinery/door/airlock{
-	name = "Kitchen"
-	},
 /obj/map_helper/access_helper/airlock/station/service/kitchen,
 /obj/structure/cable/green{
 	icon_state = "4-8"
 	},
 /obj/effect/floor_decal/corner_oldtile/white/diagonal,
+/obj/machinery/door/airlock/civilian{
+	name = "Kitchen"
+	},
 /turf/simulated/floor/tiled/dark,
 /area/crew_quarters/kitchen)
 "eVt" = (
@@ -7396,11 +7403,8 @@
 	id = "DRAMATIC";
 	name = "Dramatic Blast Door"
 	},
-/obj/machinery/door/blast/shutters{
-	id = "Druma";
-	name = "Entertainment Shutters"
-	},
 /obj/spawner/window/reinforced/full/firelocks,
+/obj/effect/paint/palebottlegreen,
 /turf/simulated/floor/plating,
 /area/tether/surfacebase/entertainment)
 "fdy" = (
@@ -7459,7 +7463,7 @@
 /turf/simulated/floor/wood,
 /area/crew_quarters/bar)
 "ffP" = (
-/obj/machinery/vending/fitness,
+/obj/machinery/vending/cola,
 /turf/simulated/floor/tiled,
 /area/quartermaster/foyer)
 "ffW" = (
@@ -7486,7 +7490,7 @@
 /obj/structure/cable/green{
 	icon_state = "1-4"
 	},
-/turf/simulated/floor/tiled/monotile,
+/turf/simulated/floor/tiled/dark,
 /area/security/lobby)
 "fgL" = (
 /obj/item/stool/padded,
@@ -7766,6 +7770,7 @@
 /area/endeavour/hallway/d3afthall)
 "fnF" = (
 /obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks,
+/obj/effect/paint/darkred,
 /turf/simulated/floor/plating,
 /area/prison/cell_block)
 "fop" = (
@@ -8473,6 +8478,7 @@
 /obj/structure/cable/green{
 	icon_state = "0-8"
 	},
+/obj/effect/paint/darkred,
 /turf/simulated/floor/plating,
 /area/security/armoury)
 "fOe" = (
@@ -8599,7 +8605,7 @@
 /obj/structure/cable/green{
 	icon_state = "1-2"
 	},
-/turf/simulated/floor/tiled/monotile,
+/turf/simulated/floor/tiled/dark,
 /area/security/lobby)
 "fRi" = (
 /obj/machinery/door/firedoor/glass,
@@ -8795,7 +8801,7 @@
 /obj/structure/bed/chair{
 	dir = 4
 	},
-/turf/simulated/floor/tiled/monotile,
+/turf/simulated/floor/tiled/monodark,
 /area/prison/cell_block)
 "fXd" = (
 /obj/machinery/door/firedoor,
@@ -8874,6 +8880,7 @@
 	dir = 8
 	},
 /obj/spawner/window/low_wall/reinforced/full,
+/obj/effect/paint/beastybrown,
 /turf/simulated/floor/plating,
 /area/endeavour/surfacebase/mining_main/uxstorage)
 "fYR" = (
@@ -8899,6 +8906,7 @@
 "gbe" = (
 /obj/spawner/window/low_wall/reinforced/full/firelocks,
 /obj/structure/cable/green,
+/obj/effect/paint/darkred,
 /turf/simulated/floor/plating,
 /area/security/armoury)
 "gbs" = (
@@ -9025,6 +9033,7 @@
 /obj/structure/curtain/open/bed{
 	name = "curtain"
 	},
+/obj/effect/paint/palebottlegreen,
 /turf/simulated/floor/plating,
 /area/crew_quarters/bar)
 "ghh" = (
@@ -9184,8 +9193,7 @@
 /area/endeavour/hallway/d3portforhall)
 "gmZ" = (
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 20
+	dir = 1
 	},
 /turf/simulated/floor/reinforced,
 /area/quartermaster/miningdock)
@@ -9253,7 +9261,7 @@
 /obj/structure/cable/green{
 	icon_state = "1-2"
 	},
-/turf/simulated/floor/tiled/monotile,
+/turf/simulated/floor/tiled/dark,
 /area/security/lobby)
 "gpB" = (
 /obj/structure/closet/bombclosetsecurity,
@@ -9398,6 +9406,7 @@
 	dir = 8
 	},
 /obj/spawner/window/low_wall/borosillicate/reinforced/full,
+/obj/effect/paint/darkred,
 /turf/simulated/floor,
 /area/security/hanger)
 "gtM" = (
@@ -9408,6 +9417,7 @@
 /area/space)
 "gtZ" = (
 /obj/spawner/window/low_wall/reinforced/full/firelocks,
+/obj/effect/paint/beastybrown,
 /turf/simulated/floor/plating,
 /area/quartermaster/office)
 "gug" = (
@@ -9776,9 +9786,7 @@
 /area/quartermaster/delivery)
 "gMc" = (
 /obj/spawner/window/reinforced/full/firelocks,
-/obj/structure/curtain/open/bed{
-	name = "curtain"
-	},
+/obj/structure/curtain/open/black,
 /turf/simulated/floor/plating,
 /area/crew_quarters/bar/lounge)
 "gMk" = (
@@ -9936,6 +9944,7 @@
 	dir = 1
 	},
 /obj/item/dice,
+/obj/item/material/ashtray/glass,
 /turf/simulated/floor/carpet/bcarpet,
 /area/crew_quarters/game_room)
 "gRy" = (
@@ -10604,10 +10613,6 @@
 /turf/simulated/wall/prepainted,
 /area/crew_quarters/showers)
 "hrc" = (
-/obj/machinery/station_map{
-	dir = 4;
-	pixel_x = -32
-	},
 /obj/machinery/computer/supplycomp{
 	dir = 4
 	},
@@ -10646,31 +10651,10 @@
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d3fwdhall)
 "hsu" = (
-/obj/machinery/door/firedoor/glass,
-/obj/structure/cable/green{
-	icon_state = "4-8"
-	},
-/obj/effect/floor_decal/borderfloorblack,
-/obj/machinery/door/blast/regular{
-	density = 0;
-	icon_state = "pdoor0";
-	id = "security_lockdown";
-	name = "Security Blast Doors";
-	opacity = 0
-	},
-/obj/machinery/door/airlock/glass/security{
-	layer = 2.8;
-	name = "Security";
-	req_one_access = null
-	},
-/obj/map_helper/access_helper/airlock/station/security/general,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/turf/simulated/floor/tiled/dark,
+/obj/structure/cable/green,
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/obj/effect/paint/darkred,
+/turf/simulated/floor/plating,
 /area/security/hallway)
 "hte" = (
 /obj/structure/cable{
@@ -10976,22 +10960,6 @@
 /obj/effect/floor_decal/corner_oldtile/white/diagonal,
 /turf/simulated/floor/tiled/dark,
 /area/crew_quarters/kitchen)
-"hEO" = (
-/obj/machinery/light{
-	dir = 1;
-	pixel_y = 20
-	},
-/obj/effect/floor_decal/borderfloorblack{
-	dir = 1
-	},
-/obj/effect/floor_decal/corner/navblue/border{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/turf/simulated/floor/tiled/steel,
-/area/endeavour/hallway/d3portforhall)
 "hFn" = (
 /obj/machinery/door/airlock/maintenance,
 /obj/machinery/door/firedoor,
@@ -11184,6 +11152,14 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/wood,
 /area/tether/surfacebase/entertainment)
+"hLw" = (
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
+/obj/effect/floor_decal/corner_oldtile/white/diagonal,
+/obj/machinery/light,
+/turf/simulated/floor/tiled/dark,
+/area/crew_quarters/kitchen)
 "hLN" = (
 /obj/machinery/camera/network/civilian{
 	dir = 1
@@ -11496,10 +11472,6 @@
 /turf/simulated/floor/wood,
 /area/crew_quarters/sleep/Dorm_6)
 "hYD" = (
-/obj/machinery/door/airlock{
-	name = "Kitchen";
-	req_one_access = list(28)
-	},
 /obj/machinery/door/firedoor,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -11512,6 +11484,9 @@
 	},
 /obj/map_helper/access_helper/airlock/station/service/kitchen,
 /obj/effect/floor_decal/corner_oldtile/white/diagonal,
+/obj/machinery/door/airlock/civilian{
+	name = "Kitchen"
+	},
 /turf/simulated/floor/tiled/dark,
 /area/crew_quarters/kitchen)
 "hYL" = (
@@ -11585,12 +11560,9 @@
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d3starboardforhall)
 "iaP" = (
-/turf/simulated/wall/prepainted/civilian,
+/turf/simulated/wall/prepainted,
 /area/maintenance/bar/catwalk)
 "ibm" = (
-/obj/effect/floor_decal/steeldecal/steel_decals10{
-	dir = 1
-	},
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
@@ -11797,6 +11769,7 @@
 /obj/structure/cable/green{
 	icon_state = "0-4"
 	},
+/obj/effect/paint/darkred,
 /turf/simulated/floor/plating,
 /area/security/warden)
 "ikN" = (
@@ -11857,8 +11830,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/structure/disposalpipe/segment,
-/obj/effect/floor_decal/steeldecal/steel_decals_central6,
-/turf/simulated/floor/tiled/monotile,
+/turf/simulated/floor/tiled/dark,
 /area/security/lobby)
 "inw" = (
 /obj/effect/floor_decal/industrial/outline/yellow,
@@ -12098,6 +12070,7 @@
 /obj/structure/cable/green{
 	icon_state = "2-8"
 	},
+/obj/effect/paint/darkred,
 /turf/simulated/floor/plating,
 /area/security/warden)
 "iyq" = (
@@ -12280,15 +12253,13 @@
 /area/maintenance/substation/civilian)
 "iFW" = (
 /obj/structure/cable/green{
-	icon_state = "4-8"
+	icon_state = "1-4"
 	},
-/obj/effect/floor_decal/borderfloorblack,
-/obj/effect/floor_decal/corner/red/border,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 9
+/obj/effect/floor_decal/borderfloorblack{
+	dir = 10
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 9
+/obj/effect/floor_decal/corner/red/border{
+	dir = 10
 	},
 /turf/simulated/floor/tiled/dark,
 /area/security/hallway)
@@ -12418,7 +12389,7 @@
 	pixel_x = 7
 	},
 /obj/fiftyspawner/glass,
-/obj/item/stack/material/steel/full_stack,
+/obj/fiftyspawner/steel,
 /obj/effect/floor_decal/borderfloor,
 /obj/effect/floor_decal/corner/blue/border,
 /turf/simulated/floor/tiled,
@@ -12960,27 +12931,14 @@
 "jiy" = (
 /turf/simulated/wall/prepainted,
 /area/crew_quarters/recreation_area_hallway)
-"jiN" = (
-/obj/machinery/light{
-	dir = 1;
-	pixel_y = 20
-	},
-/obj/effect/floor_decal/borderfloorblack{
-	dir = 1
-	},
-/obj/effect/floor_decal/corner/navblue/border{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/turf/simulated/floor/tiled,
-/area/endeavour/hallway/d3portforhall)
 "jjl" = (
 /obj/effect/floor_decal/corner/red{
 	dir = 10
 	},
 /obj/structure/table/steel_reinforced,
+/obj/machinery/camera/network/security{
+	dir = 1
+	},
 /turf/simulated/floor/tiled/dark,
 /area/security/warden)
 "jkm" = (
@@ -13290,14 +13248,14 @@
 "juB" = (
 /obj/structure/closet/toolcloset,
 /obj/item/storage/toolbox/mechanical,
-/obj/item/stack/material/steel/full_stack,
+/obj/fiftyspawner/steel,
 /obj/fiftyspawner/glass,
 /obj/item/stack/cable_coil/random,
 /obj/fiftyspawner/wood,
 /obj/machinery/power/apc/west_mount{
 	cell_type = /obj/item/cell/super
 	},
-/obj/item/stack/material/steel/full_stack,
+/obj/fiftyspawner/steel,
 /obj/structure/cable/green{
 	icon_state = "0-4"
 	},
@@ -13458,7 +13416,11 @@
 /turf/simulated/floor/tiled,
 /area/endeavour/surfacebase/mining_main/storage)
 "jAH" = (
-/turf/simulated/wall/prepainted/cargo,
+/obj/structure/poster{
+	pixel_x = 32
+	},
+/obj/machinery/light/small,
+/turf/simulated/floor/wood,
 /area/crew_quarters/bar/lounge)
 "jBe" = (
 /obj/machinery/suit_cycler/mining,
@@ -13600,23 +13562,6 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/security/hallway)
-"jGq" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/light{
-	dir = 8
-	},
-/obj/structure/cable/green{
-	icon_state = "1-2"
-	},
-/obj/effect/floor_decal/borderfloorblack{
-	dir = 8
-	},
-/obj/effect/floor_decal/corner/navblue/border{
-	dir = 8
-	},
-/turf/simulated/floor/tiled,
-/area/endeavour/hallway/d3afthall)
 "jGP" = (
 /obj/structure/bed/chair/wood{
 	dir = 4
@@ -13641,6 +13586,7 @@
 	dir = 8
 	},
 /obj/spawner/window/low_wall/borosillicate/reinforced/full,
+/obj/effect/paint/darkred,
 /turf/simulated/floor,
 /area/security/hanger)
 "jHr" = (
@@ -13879,6 +13825,7 @@
 	icon_state = "1-2"
 	},
 /obj/spawner/window/low_wall/reinforced/full/firelocks,
+/obj/effect/paint/darkred,
 /turf/simulated/floor/plating,
 /area/security/brig)
 "jRB" = (
@@ -14009,11 +13956,14 @@
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d3afthall)
 "jWI" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
-	dir = 8
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
-	dir = 8
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/structure/cable/green{
+	icon_state = "2-8"
 	},
 /turf/simulated/floor/tiled/dark,
 /area/security/hallway)
@@ -14059,9 +14009,6 @@
 /turf/simulated/floor/tiled/dark,
 /area/vacant/vacant_shop)
 "jZc" = (
-/obj/machinery/fire_alarm/south_mount{
-	pixel_y = -24
-	},
 /obj/machinery/light,
 /obj/effect/floor_decal/borderfloorblack,
 /obj/effect/floor_decal/corner/navgold/border,
@@ -14351,7 +14298,7 @@
 "kiR" = (
 /obj/structure/table/standard,
 /obj/item/storage/box/cups,
-/turf/simulated/floor/tiled/monotile,
+/turf/simulated/floor/tiled/monodark,
 /area/prison/cell_block)
 "kiY" = (
 /obj/structure/undies_wardrobe,
@@ -14381,6 +14328,7 @@
 /obj/structure/cable/green{
 	icon_state = "0-4"
 	},
+/obj/effect/paint/darkred,
 /turf/simulated/floor,
 /area/security/brig)
 "kkw" = (
@@ -14492,8 +14440,7 @@
 	dir = 8
 	},
 /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,
-/obj/effect/floor_decal/steeldecal/steel_decals_central6,
-/turf/simulated/floor/tiled/monotile,
+/turf/simulated/floor/tiled/dark,
 /area/security/lobby)
 "kqd" = (
 /obj/effect/floor_decal/spline/fancy/wood{
@@ -14536,13 +14483,8 @@
 /area/security/hallway)
 "ksT" = (
 /obj/machinery/disposal,
-/obj/effect/floor_decal/industrial/warning/full,
 /obj/structure/disposalpipe/trunk,
-/obj/machinery/light{
-	dir = 1
-	},
 /obj/effect/floor_decal/corner_oldtile/white/diagonal,
-/obj/item/barrier_tape_segment/engineering,
 /turf/simulated/floor/tiled/dark,
 /area/crew_quarters/kitchen)
 "ksW" = (
@@ -14726,6 +14668,7 @@
 /obj/structure/cable/green{
 	icon_state = "0-4"
 	},
+/obj/effect/paint/darkred,
 /turf/simulated/floor/plating,
 /area/security/warden)
 "kCb" = (
@@ -14931,8 +14874,7 @@
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d3starboardafthall)
 "kKF" = (
-/obj/structure/table/woodentable,
-/obj/item/flashlight/lamp/green,
+/obj/structure/bed/chair/sofa/brown/right,
 /turf/simulated/floor/carpet/bcarpet,
 /area/crew_quarters/bar/lounge)
 "kKL" = (
@@ -15233,18 +15175,6 @@
 	name = "Security Blast Doors";
 	opacity = 0
 	},
-/obj/machinery/door/airlock/glass/security{
-	layer = 2.8;
-	name = "Security";
-	req_one_access = null
-	},
-/obj/map_helper/access_helper/airlock/station/security/general,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
 /turf/simulated/floor/tiled/dark,
 /area/security/hallway)
 "kUM" = (
@@ -15610,9 +15540,6 @@
 /obj/machinery/light{
 	dir = 1
 	},
-/obj/machinery/station_map{
-	pixel_y = 32
-	},
 /obj/effect/floor_decal/borderfloorblack{
 	dir = 1
 	},
@@ -15850,7 +15777,6 @@
 /turf/simulated/floor/wood,
 /area/tether/surfacebase/entertainment)
 "lsC" = (
-/obj/machinery/camera/network/security,
 /obj/effect/floor_decal/corner/red{
 	dir = 5
 	},
@@ -15890,10 +15816,15 @@
 /turf/simulated/floor/tiled,
 /area/hydroponics)
 "lul" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/table/marble,
+/obj/machinery/door/blast/shutters{
+	dir = 8;
+	id = "bar";
+	name = "Bar Shutters"
+	},
+/obj/item/material/ashtray/glass,
 /turf/simulated/floor/wood,
-/area/security/lobby)
+/area/crew_quarters/bar)
 "luu" = (
 /obj/effect/floor_decal/borderfloorblack{
 	dir = 4
@@ -16244,7 +16175,7 @@
 /turf/simulated/floor/carpet,
 /area/crew_quarters/heads/hos)
 "lEK" = (
-/turf/simulated/wall/prepainted/civilian,
+/turf/simulated/wall/prepainted,
 /area/crew_quarters/bar/lounge)
 "lEM" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -16619,6 +16550,15 @@
 	},
 /turf/simulated/floor/plating,
 /area/endeavour/hallway/d3aftmaint)
+"lUK" = (
+/obj/structure/poster{
+	pixel_x = 32
+	},
+/obj/machinery/light/small{
+	dir = 1
+	},
+/turf/simulated/floor/wood,
+/area/crew_quarters/bar/lounge)
 "lVi" = (
 /obj/machinery/holopad,
 /turf/simulated/floor/carpet,
@@ -16755,6 +16695,7 @@
 /area/crew_quarters/sleep/Dorm_6)
 "lYO" = (
 /obj/spawner/window/low_wall/reinforced/full/firelocks,
+/obj/effect/paint/beastybrown,
 /turf/simulated/floor/tiled/steel/airless,
 /area/shuttle/belter)
 "lZO" = (
@@ -16918,10 +16859,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
-/obj/effect/floor_decal/spline/fancy/wood{
-	dir = 8
-	},
-/turf/simulated/floor/wood,
+/turf/simulated/floor/tiled/dark,
 /area/security/lobby)
 "mhH" = (
 /turf/simulated/floor/tiled,
@@ -18031,7 +17969,7 @@
 /obj/structure/table/steel,
 /obj/fiftyspawner/glass,
 /obj/fiftyspawner/glass,
-/obj/item/stack/material/steel/full_stack,
+/obj/fiftyspawner/steel,
 /obj/effect/floor_decal/industrial/outline/blue,
 /obj/effect/floor_decal/corner/blue/full{
 	dir = 1
@@ -18074,7 +18012,7 @@
 	name = "Security";
 	req_one_access = null
 	},
-/turf/simulated/floor/tiled/monotile,
+/turf/simulated/floor/tiled/dark,
 /area/prison/cell_block)
 "mZL" = (
 /obj/item/radio/intercom{
@@ -18399,14 +18337,11 @@
 /turf/simulated/floor/tiled/techfloor,
 /area/crew_quarters/sleep/cryo)
 "noi" = (
-/obj/structure/cable/green{
-	icon_state = "1-2"
-	},
 /obj/machinery/door/firedoor,
-/obj/machinery/door/airlock{
+/obj/map_helper/access_helper/airlock/station/service/kitchen,
+/obj/machinery/door/airlock/civilian{
 	name = "Kitchen"
 	},
-/obj/map_helper/access_helper/airlock/station/service/kitchen,
 /turf/simulated/floor/tiled/dark,
 /area/crew_quarters/kitchen)
 "noB" = (
@@ -19021,6 +18956,7 @@
 /obj/structure/cable/green{
 	icon_state = "4-8"
 	},
+/obj/effect/paint/darkred,
 /turf/simulated/floor/plating,
 /area/security/warden)
 "nLT" = (
@@ -19452,7 +19388,7 @@
 /obj/effect/floor_decal/corner/red/border{
 	dir = 4
 	},
-/turf/simulated/floor/tiled/monotile,
+/turf/simulated/floor/tiled/dark,
 /area/security/lobby)
 "nXq" = (
 /obj/structure/cable/yellow{
@@ -19985,6 +19921,9 @@
 /obj/item/packageWrap,
 /obj/machinery/camera/network/civilian,
 /obj/effect/floor_decal/corner_oldtile/white/diagonal,
+/obj/machinery/light{
+	dir = 1
+	},
 /turf/simulated/floor/tiled/dark,
 /area/crew_quarters/kitchen)
 "opZ" = (
@@ -20498,6 +20437,7 @@
 	name = "Bar Shutters"
 	},
 /obj/spawner/window/low_wall/full/nogrille/firelocks,
+/obj/effect/paint/palebottlegreen,
 /turf/simulated/floor/carpet/bcarpet,
 /area/crew_quarters/bar)
 "oFO" = (
@@ -20817,6 +20757,7 @@
 /obj/map_helper/electrochromatic_linker{
 	id = "vicDetOffice"
 	},
+/obj/effect/paint/darkred,
 /turf/simulated/floor/lino,
 /area/security/detectives_office)
 "oSY" = (
@@ -21735,13 +21676,13 @@
 	dir = 8;
 	icon_state = "pipe-c"
 	},
-/turf/simulated/floor/tiled/monotile,
+/turf/simulated/floor/tiled/dark,
 /area/security/lobby)
 "pwE" = (
 /obj/structure/bed/chair{
 	dir = 4
 	},
-/turf/simulated/floor/tiled/monotile,
+/turf/simulated/floor/tiled/monodark,
 /area/prison/cell_block)
 "pxt" = (
 /obj/structure/table/rack/steel,
@@ -21802,6 +21743,7 @@
 /obj/map_helper/electrochromatic_linker{
 	id = "vicDetOffice"
 	},
+/obj/effect/paint/darkred,
 /turf/simulated/floor/plating,
 /area/security/detectives_office)
 "pzs" = (
@@ -21969,6 +21911,9 @@
 	pixel_y = 16
 	},
 /obj/effect/floor_decal/corner_oldtile/white/diagonal,
+/obj/machinery/light{
+	dir = 1
+	},
 /turf/simulated/floor/tiled/dark,
 /area/crew_quarters/kitchen)
 "pFW" = (
@@ -22208,7 +22153,6 @@
 /obj/effect/floor_decal/corner/red/border{
 	dir = 1
 	},
-/obj/machinery/camera/network/security,
 /turf/simulated/floor/tiled/dark,
 /area/security/hallway)
 "pQh" = (
@@ -22257,6 +22201,7 @@
 /obj/structure/cable/green{
 	icon_state = "0-4"
 	},
+/obj/effect/paint/darkred,
 /turf/simulated/floor/plating,
 /area/security/brig)
 "pRW" = (
@@ -22636,6 +22581,7 @@
 	icon_state = "0-2"
 	},
 /obj/spawner/window/low_wall/reinforced/full/firelocks,
+/obj/effect/paint/darkred,
 /turf/simulated/floor/plating,
 /area/security/brig)
 "qdR" = (
@@ -22742,7 +22688,7 @@
 	icon_state = "4-8"
 	},
 /obj/effect/floor_decal/spline/fancy/wood{
-	dir = 8
+	dir = 9
 	},
 /turf/simulated/floor/wood,
 /area/security/lobby)
@@ -22790,9 +22736,8 @@
 /turf/simulated/floor/tiled/steel,
 /area/shuttle/belter)
 "qmi" = (
-/obj/machinery/light/small{
-	dir = 1
-	},
+/obj/structure/table/woodentable,
+/obj/machinery/light/small,
 /turf/simulated/floor/carpet/bcarpet,
 /area/crew_quarters/bar/lounge)
 "qmA" = (
@@ -23051,7 +22996,6 @@
 /obj/machinery/camera/network/civilian{
 	dir = 1
 	},
-/obj/machinery/computer/timeclock/premade/south,
 /obj/effect/floor_decal/borderfloorblack,
 /obj/effect/floor_decal/corner/navgold/border,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -23095,7 +23039,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/holopad,
-/turf/simulated/floor/tiled/monotile,
+/turf/simulated/floor/tiled/dark,
 /area/security/lobby)
 "qvo" = (
 /obj/machinery/door/firedoor/glass,
@@ -23237,7 +23181,7 @@
 "qyf" = (
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply,
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
-/turf/simulated/floor/wood,
+/turf/simulated/floor/tiled/dark,
 /area/security/lobby)
 "qyF" = (
 /obj/structure/cable/green{
@@ -23368,18 +23312,8 @@
 /turf/simulated/floor/wood,
 /area/endeavour/hallway/d3fwdhall)
 "qCs" = (
-/obj/machinery/door/blast/regular/open{
-	dir = 4;
-	id = "DRAMATIC";
-	name = "Dramatic Blast Door"
-	},
-/obj/machinery/door/blast/shutters{
-	id = "Druma";
-	name = "Entertainment Shutters"
-	},
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/tether/surfacebase/entertainment)
+/turf/simulated/wall/prepainted,
+/area/maintenance/bar/lower)
 "qCM" = (
 /obj/structure/table/rack/shelf/steel,
 /obj/machinery/camera/network/security,
@@ -23509,7 +23443,7 @@
 /turf/simulated/floor/tiled/dark,
 /area/security/hallway)
 "qIo" = (
-/obj/machinery/vending/fitness,
+/obj/machinery/vending/cola,
 /turf/simulated/floor/wood,
 /area/endeavour/surfacebase/mining_main/break_room)
 "qIr" = (
@@ -23558,9 +23492,6 @@
 "qJx" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/light{
-	dir = 8
-	},
 /obj/effect/floor_decal/borderfloorblack{
 	dir = 8
 	},
@@ -23611,6 +23542,7 @@
 	icon_state = "1-2"
 	},
 /obj/structure/cable/green,
+/obj/effect/paint/darkred,
 /turf/simulated/floor/plating,
 /area/security/warden)
 "qLH" = (
@@ -23758,6 +23690,9 @@
 /obj/structure/cable/green{
 	icon_state = "2-8"
 	},
+/obj/effect/floor_decal/spline/fancy/wood{
+	dir = 1
+	},
 /turf/simulated/floor/wood,
 /area/security/lobby)
 "qQz" = (
@@ -23859,7 +23794,7 @@
 	name = "Security";
 	req_one_access = null
 	},
-/turf/simulated/floor/tiled/monotile,
+/turf/simulated/floor/tiled/dark,
 /area/security/lobby)
 "qVJ" = (
 /obj/machinery/door/airlock/glass_external{
@@ -24000,6 +23935,7 @@
 /obj/structure/cable/green{
 	icon_state = "0-4"
 	},
+/obj/effect/paint/darkred,
 /turf/simulated/floor/plating,
 /area/security/brig)
 "rbG" = (
@@ -24065,6 +24001,7 @@
 /obj/map_helper/electrochromatic_linker{
 	id = "vicDetOffice"
 	},
+/obj/effect/paint/darkred,
 /turf/simulated/floor/plating,
 /area/security/detectives_office)
 "rfb" = (
@@ -24242,7 +24179,7 @@
 /area/endeavour/surfacebase/mining_main/storage)
 "rme" = (
 /obj/structure/table/woodentable,
-/obj/machinery/recharger,
+/obj/item/material/ashtray/glass,
 /turf/simulated/floor/carpet/turcarpet,
 /area/crew_quarters/recreation_area)
 "rmU" = (
@@ -24705,9 +24642,7 @@
 /area/shuttle/mining_ship/general)
 "rAG" = (
 /obj/spawner/window/low_wall/reinforced/full/firelocks,
-/obj/structure/curtain/open/bed{
-	name = "curtain"
-	},
+/obj/structure/curtain/open/black,
 /turf/simulated/floor/plating,
 /area/crew_quarters/bar/lounge)
 "rBG" = (
@@ -24922,8 +24857,18 @@
 /obj/structure/cable/green{
 	icon_state = "0-4"
 	},
+/obj/effect/paint/darkred,
 /turf/simulated/floor/plating,
 /area/security/brig)
+"rJH" = (
+/obj/effect/floor_decal/spline/fancy/wood{
+	dir = 4
+	},
+/obj/structure/bed/chair/sofa/brown/left{
+	dir = 8
+	},
+/turf/simulated/floor/carpet/bcarpet,
+/area/crew_quarters/bar/lounge)
 "rKm" = (
 /obj/effect/floor_decal/borderfloorblack,
 /obj/effect/floor_decal/corner/red/border,
@@ -24990,7 +24935,7 @@
 "rNH" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/tiled/monotile,
+/turf/simulated/floor/tiled/dark,
 /area/security/lobby)
 "rOn" = (
 /obj/structure/cable/green{
@@ -25302,11 +25247,17 @@
 /turf/simulated/floor/plating,
 /area/maintenance/substation/cargo)
 "rYo" = (
-/obj/structure/sign/directions/evac{
-	dir = 8
+/obj/effect/floor_decal/borderfloorblack{
+	dir = 1
 	},
-/turf/simulated/wall/prepainted/civilian,
-/area/crew_quarters/kitchen)
+/obj/effect/floor_decal/corner/navblue/border{
+	dir = 1
+	},
+/obj/machinery/station_map{
+	pixel_y = 32
+	},
+/turf/simulated/floor/tiled,
+/area/endeavour/hallway/d3afthall)
 "rYq" = (
 /obj/structure/cable/green{
 	icon_state = "1-4"
@@ -25368,6 +25319,7 @@
 /obj/structure/cable/green{
 	icon_state = "0-4"
 	},
+/obj/effect/paint/darkred,
 /turf/simulated/floor/plating,
 /area/security/warden)
 "saz" = (
@@ -25385,6 +25337,9 @@
 /obj/effect/floor_decal/corner/red/border{
 	dir = 8
 	},
+/obj/machinery/camera/network/security{
+	dir = 4
+	},
 /turf/simulated/floor/tiled/dark,
 /area/security/hallway)
 "saE" = (
@@ -25497,9 +25452,10 @@
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d3starboardamidhall)
 "seB" = (
-/obj/structure/bed/chair/comfy/beige{
-	dir = 8
+/obj/effect/floor_decal/spline/fancy/wood{
+	dir = 4
 	},
+/obj/structure/bed/chair/sofa/brown/corner,
 /turf/simulated/floor/carpet/bcarpet,
 /area/crew_quarters/bar/lounge)
 "seM" = (
@@ -25982,7 +25938,7 @@
 	dir = 8
 	},
 /obj/structure/disposalpipe/segment,
-/turf/simulated/floor/tiled/monotile,
+/turf/simulated/floor/tiled/dark,
 /area/security/lobby)
 "svs" = (
 /obj/machinery/light/small{
@@ -26367,17 +26323,43 @@
 /turf/simulated/floor/tiled/old_tile/gray,
 /area/security/range)
 "sFM" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/disposalpipe/segment,
-/turf/simulated/floor/tiled/monotile,
-/area/security/lobby)
+/obj/map_helper/access_helper/airlock/station/security/general,
+/obj/machinery/door/blast/regular{
+	density = 0;
+	icon_state = "pdoor0";
+	id = "security_lockdown";
+	name = "Security Blast Doors";
+	opacity = 0
+	},
+/obj/machinery/door/firedoor/glass,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/machinery/door/airlock/multi_tile/glass{
+	id_tag = "BrigFoyer";
+	name = "Security";
+	dir = 4
+	},
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
+/turf/simulated/floor/tiled/dark,
+/area/security/hallway)
 "sFQ" = (
 /obj/machinery/light/small{
 	dir = 1
 	},
 /turf/simulated/floor/water/deep/indoors,
 /area/crew_quarters/sleep/bedrooms)
+"sFW" = (
+/obj/machinery/light{
+	dir = 8
+	},
+/turf/simulated/floor/tiled/freezer,
+/area/crew_quarters/kitchen)
 "sFX" = (
 /obj/structure/cable/green{
 	icon_state = "2-8"
@@ -26482,6 +26464,7 @@
 /area/endeavour/hallway/d3starboardafthall)
 "sKL" = (
 /obj/spawner/window/low_wall/reinforced/full/firelocks,
+/obj/effect/paint/beastybrown,
 /turf/simulated/floor/tiled/steel/airless,
 /area/shuttle/mining_ship/general)
 "sKV" = (
@@ -26787,7 +26770,7 @@
 /turf/simulated/floor/tiled,
 /area/security/range)
 "sWJ" = (
-/turf/simulated/floor/tiled/monotile,
+/turf/simulated/floor/tiled/monodark,
 /area/prison/cell_block)
 "sXC" = (
 /obj/machinery/atmospherics/component/unary/vent_scrubber/on{
@@ -26832,6 +26815,7 @@
 	icon_state = "1-4"
 	},
 /obj/structure/cable/green,
+/obj/effect/paint/darkred,
 /turf/simulated/floor,
 /area/security/hallway)
 "sYK" = (
@@ -26874,7 +26858,7 @@
 /obj/machinery/light{
 	dir = 4
 	},
-/turf/simulated/floor/tiled/monotile,
+/turf/simulated/floor/tiled/dark,
 /area/security/lobby)
 "sZQ" = (
 /obj/effect/floor_decal/borderfloorblack/corner{
@@ -27544,7 +27528,7 @@
 /area/quartermaster/foyer)
 "tBs" = (
 /obj/spawner/window/low_wall/reinforced/full/firelocks,
-/obj/structure/curtain/black,
+/obj/structure/curtain/open/black,
 /turf/simulated/floor/plating,
 /area/crew_quarters/game_room)
 "tBN" = (
@@ -27874,11 +27858,11 @@
 	dir = 4
 	},
 /obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/freezer{
-	name = "Kitchen Cold Room"
-	},
 /obj/map_helper/access_helper/airlock/station/service/kitchen,
 /obj/effect/floor_decal/corner_oldtile/white/diagonal,
+/obj/machinery/door/airlock/civilian{
+	name = "Kitchen Cold Room"
+	},
 /turf/simulated/floor/tiled/dark,
 /area/crew_quarters/kitchen)
 "tNF" = (
@@ -27936,6 +27920,7 @@
 /obj/structure/cable/green{
 	icon_state = "1-8"
 	},
+/obj/effect/paint/darkred,
 /turf/simulated/floor/plating,
 /area/security/warden)
 "tQn" = (
@@ -28378,7 +28363,10 @@
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d3fwdhall)
 "ugs" = (
-/obj/machinery/light/small,
+/obj/structure/bed/chair/sofa/brown/right,
+/obj/machinery/light/small{
+	dir = 1
+	},
 /turf/simulated/floor/carpet/bcarpet,
 /area/crew_quarters/bar/lounge)
 "ugt" = (
@@ -29178,6 +29166,7 @@
 /obj/structure/cable/green{
 	icon_state = "0-4"
 	},
+/obj/effect/paint/darkred,
 /turf/simulated/floor/plating,
 /area/security/brig)
 "uHj" = (
@@ -29221,16 +29210,16 @@
 /turf/simulated/floor/carpet/turcarpet,
 /area/crew_quarters/recreation_area)
 "uIA" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
-/obj/machinery/vending/cola{
-	dir = 8
+/obj/structure/cable/green{
+	icon_state = "2-4"
 	},
-/turf/simulated/floor/wood,
+/turf/simulated/floor/tiled/dark,
 /area/security/lobby)
 "uIG" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -29296,6 +29285,7 @@
 /obj/effect/floor_decal/corner/navgold/bordercorner2{
 	dir = 4
 	},
+/obj/effect/floor_decal/steeldecal/steel_decals4,
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d3starboardafthall)
 "uJP" = (
@@ -29407,9 +29397,17 @@
 /turf/simulated/floor/plating,
 /area/endeavour/hallway/d3aftmaint)
 "uMs" = (
-/obj/machinery/light,
-/turf/simulated/wall/prepainted,
-/area/endeavour/station/stairs_three)
+/obj/effect/floor_decal/borderfloorblack{
+	dir = 4
+	},
+/obj/effect/floor_decal/corner/navgold/border{
+	dir = 4
+	},
+/obj/machinery/light{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/monotile,
+/area/endeavour/hallway/d3afthall)
 "uMD" = (
 /obj/structure/table/bench/steel,
 /obj/effect/floor_decal/borderfloorblack{
@@ -29456,10 +29454,10 @@
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d3fwdhall)
 "uOI" = (
-/obj/machinery/door/airlock/civilian{
-	name = "Reading Room 2"
-	},
 /obj/machinery/door/firedoor,
+/obj/machinery/door/airlock{
+	name = "Bar Lounge 2"
+	},
 /turf/simulated/floor/wood,
 /area/crew_quarters/bar/lounge)
 "uOQ" = (
@@ -29836,7 +29834,7 @@
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply,
-/turf/simulated/floor/wood,
+/turf/simulated/floor/tiled/dark,
 /area/security/lobby)
 "vew" = (
 /obj/structure/table/steel,
@@ -29998,15 +29996,14 @@
 /turf/simulated/floor/wood,
 /area/crew_quarters/sleep/Dorm_12)
 "viU" = (
-/obj/item/radio/intercom{
-	dir = 4;
-	pixel_x = 24
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 9
 	},
 /obj/effect/floor_decal/corner_oldtile/white/diagonal,
+/obj/machinery/light{
+	dir = 4
+	},
 /turf/simulated/floor/tiled/dark,
 /area/crew_quarters/kitchen)
 "vjb" = (
@@ -30114,6 +30111,7 @@
 /obj/structure/cable/green{
 	icon_state = "0-4"
 	},
+/obj/effect/paint/darkred,
 /turf/simulated/floor/plating,
 /area/security/brig)
 "vlO" = (
@@ -30837,6 +30835,7 @@
 /obj/structure/cable/green{
 	icon_state = "4-8"
 	},
+/obj/effect/paint/darkred,
 /turf/simulated/floor/plating,
 /area/security/armoury)
 "vEC" = (
@@ -30957,6 +30956,7 @@
 /area/crew_quarters/recreation_area_hallway)
 "vIs" = (
 /obj/spawner/window/low_wall/reinforced/full/firelocks,
+/obj/effect/paint/darkred,
 /turf/simulated/floor/plating,
 /area/prison/cell_block)
 "vIC" = (
@@ -31030,6 +31030,14 @@
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/cargo)
+"vKG" = (
+/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks,
+/obj/map_helper/electrochromatic_linker{
+	id = "vicDetOffice"
+	},
+/obj/effect/paint/darkred,
+/turf/simulated/floor/plating,
+/area/security/detectives_office)
 "vKH" = (
 /obj/machinery/atmospherics/component/unary/vent_scrubber/on{
 	dir = 1
@@ -31800,6 +31808,7 @@
 	id = "bar";
 	name = "Bar Shutters"
 	},
+/obj/effect/paint/palebottlegreen,
 /turf/simulated/floor/carpet/bcarpet,
 /area/crew_quarters/bar)
 "wma" = (
@@ -32098,6 +32107,7 @@
 /obj/structure/cable/green{
 	icon_state = "1-8"
 	},
+/obj/effect/paint/darkred,
 /turf/simulated/floor/plating,
 /area/security/warden)
 "wws" = (
@@ -32693,6 +32703,7 @@
 /area/security/lobby)
 "wWK" = (
 /obj/spawner/window/low_wall/reinforced/full/firelocks,
+/obj/effect/paint/palebottlegreen,
 /turf/simulated/floor/plating,
 /area/hydroponics)
 "wWQ" = (
@@ -33113,9 +33124,6 @@
 	pixel_x = -24;
 	pixel_y = -10
 	},
-/obj/machinery/light{
-	dir = 8
-	},
 /obj/effect/floor_decal/corner_oldtile/white/diagonal,
 /turf/simulated/floor/tiled/dark,
 /area/crew_quarters/kitchen)
@@ -33425,9 +33433,6 @@
 /obj/machinery/air_alarm{
 	pixel_y = 22
 	},
-/obj/effect/floor_decal/steeldecal/steel_decals10{
-	dir = 8
-	},
 /obj/effect/floor_decal/borderfloorblack{
 	dir = 1
 	},
@@ -33907,7 +33912,6 @@
 /obj/machinery/light/small{
 	dir = 4
 	},
-/obj/machinery/vending/fitness,
 /turf/simulated/floor/wood,
 /area/crew_quarters/recreation_area)
 "xQu" = (
@@ -34095,7 +34099,7 @@
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d3portamidhall)
 "xXg" = (
-/turf/simulated/wall/r_wall/prepainted/cargo,
+/turf/simulated/wall/r_wall/prepainted,
 /area/crew_quarters/game_room)
 "xXk" = (
 /obj/structure/cable/green{
@@ -34191,16 +34195,13 @@
 /area/tether/surfacebase/entertainment)
 "xZs" = (
 /obj/effect/floor_decal/borderfloorblack{
-	dir = 1
+	dir = 8
 	},
 /obj/effect/floor_decal/corner/red/border{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 10
+	dir = 8
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 10
+/obj/machinery/camera/network/security{
+	dir = 4
 	},
 /turf/simulated/floor/tiled/dark,
 /area/security/hallway)
@@ -34435,7 +34436,7 @@
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/security/lobby)
 "ykp" = (
-/obj/structure/closet/wardrobe/green,
+/obj/machinery/vending/fitness,
 /turf/simulated/floor/carpet/turcarpet,
 /area/crew_quarters/recreation_area)
 "ykx" = (
@@ -38505,7 +38506,7 @@ bzE
 bzE
 rAG
 rAG
-jAH
+bzE
 rAG
 rAG
 bzE
@@ -38697,10 +38698,10 @@ mDp
 bzE
 bzE
 bzE
-cnc
-kKF
-jAH
 kKF
+qmi
+lEK
+ugs
 cnc
 bzE
 bzE
@@ -38892,12 +38893,12 @@ bzE
 bzE
 bzE
 seB
-ugs
-jAH
-qmi
+rJH
+lEK
 seB
-jAH
-jAH
+rJH
+lEK
+lEK
 bzE
 pRW
 pRW
@@ -39085,13 +39086,13 @@ mDp
 nNX
 bzE
 bzE
+lUK
 uzm
+lEK
 uzm
 jAH
-uzm
-uzm
-jAH
-jAH
+lEK
+lEK
 bzE
 pRW
 pRW
@@ -39281,7 +39282,7 @@ bzE
 bzE
 bzE
 dBF
-jAH
+lEK
 uOI
 cHy
 cHy
@@ -39668,9 +39669,9 @@ jGe
 jYr
 bzE
 bzE
-kbt
 uzm
 uzm
+rlf
 cHy
 aOy
 hnK
@@ -39713,7 +39714,7 @@ udU
 rJC
 tjK
 knW
-uGl
+xZs
 vzu
 flS
 dPF
@@ -39862,9 +39863,9 @@ jYr
 aKn
 bzE
 bzE
+kbt
 uzm
-uzm
-jAH
+lEK
 cHy
 lNU
 ecM
@@ -40058,7 +40059,7 @@ bzE
 bzE
 cUe
 uzm
-jAH
+lEK
 cHy
 mCZ
 iAO
@@ -40252,7 +40253,7 @@ bzE
 bzE
 bwN
 uzm
-jAH
+lEK
 cHy
 bfd
 uvh
@@ -40446,7 +40447,7 @@ tUu
 bzE
 bwN
 rnj
-jAH
+lEK
 cHy
 cHy
 cHy
@@ -40844,7 +40845,7 @@ uzm
 uzm
 uzm
 uzm
-uzm
+rlf
 uzm
 uzm
 xLN
@@ -41047,7 +41048,7 @@ kEf
 szl
 vAZ
 dJX
-dJX
+lul
 vSO
 iYC
 jfm
@@ -41218,7 +41219,7 @@ pRW
 pRW
 pRW
 tUu
-rxD
+eAp
 bzE
 kbt
 uzm
@@ -41412,8 +41413,8 @@ pRW
 pRW
 pRW
 pRW
-rxD
-rxD
+eAp
+eAp
 ddU
 piG
 iaP
@@ -42008,8 +42009,8 @@ aMQ
 aMQ
 aMQ
 aMQ
-xbH
-xbH
+qCs
+qCs
 tIj
 pir
 sNC
@@ -42407,7 +42408,7 @@ mup
 mup
 mup
 mup
-hCa
+hLw
 pir
 piX
 tJl
@@ -43959,7 +43960,7 @@ dgB
 hOP
 aVW
 aVW
-aVW
+sFW
 pir
 fbH
 uhA
@@ -44538,9 +44539,9 @@ sRJ
 aHs
 kyF
 jfy
+aVW
 aHs
-aHs
-aHs
+aVW
 dhd
 pir
 lhR
@@ -44736,8 +44737,8 @@ pir
 pir
 pir
 pir
+pir
 rYo
-iSj
 rfb
 kGS
 glG
@@ -45900,11 +45901,11 @@ aUT
 bWK
 mmq
 mmq
-aec
+qHq
 tXo
 tXY
 hjP
-aec
+qHq
 mmq
 mmq
 bWK
@@ -46091,7 +46092,7 @@ pYt
 pYt
 pYt
 kEi
-uMs
+bWK
 xPB
 xPB
 bWK
@@ -46288,7 +46289,7 @@ boM
 mLk
 mLk
 mLk
-jGq
+mLk
 wTk
 prg
 cua
@@ -46673,7 +46674,7 @@ vEC
 eIC
 fub
 hHQ
-bYm
+aec
 pSd
 bYm
 ecr
@@ -46683,11 +46684,11 @@ bfD
 bfD
 srX
 mvQ
-bfD
+uMs
 uPx
 gFf
 kGS
-keU
+vKG
 ajk
 oux
 pdl
@@ -47252,7 +47253,7 @@ oms
 ukb
 lUi
 lMH
-eww
+cVy
 rqN
 cpz
 syH
@@ -47657,7 +47658,7 @@ syH
 awA
 wuH
 aWe
-keU
+vKG
 bnZ
 bnZ
 bnZ
@@ -47851,7 +47852,7 @@ fiy
 kEF
 wuH
 qmV
-keU
+vKG
 dfI
 bnZ
 voJ
@@ -48416,7 +48417,7 @@ lMH
 lMH
 lMH
 lMH
-hEO
+xtI
 rZg
 swv
 syH
@@ -49210,10 +49211,10 @@ ojU
 jqq
 aVb
 suB
-sFM
-sFM
-sFM
-sFM
+inp
+inp
+inp
+inp
 inp
 pwu
 kps
@@ -49774,7 +49775,7 @@ uiJ
 eNB
 eNB
 pwn
-jiN
+rub
 xiG
 avK
 syH
@@ -49958,7 +49959,7 @@ izO
 gal
 gal
 dyR
-gal
+cDv
 tVX
 vaA
 gal
@@ -49991,7 +49992,7 @@ eem
 wpe
 wpe
 eYt
-lul
+rNH
 qyf
 qQq
 uPY
@@ -50380,7 +50381,7 @@ chh
 wWx
 qHe
 kUz
-qHe
+sFM
 hsu
 qqU
 qqU
@@ -50573,7 +50574,7 @@ chh
 chh
 chh
 jet
-xZs
+dAT
 jWI
 iFW
 qqU
@@ -51542,7 +51543,7 @@ alB
 pGi
 vpi
 xkB
-aiW
+uxk
 xyL
 rkC
 vBk
@@ -51928,7 +51929,7 @@ uwo
 qHe
 qHe
 oit
-aiW
+uxk
 qHe
 qHe
 dAT
@@ -60047,7 +60048,7 @@ pRW
 pRW
 pRW
 pRW
-qCs
+fdp
 eQM
 hPt
 hPt
@@ -60241,7 +60242,7 @@ pRW
 pRW
 pRW
 pRW
-qCs
+fdp
 qmZ
 hPt
 hPt
@@ -60435,7 +60436,7 @@ pRW
 pRW
 pRW
 pRW
-qCs
+fdp
 hPt
 hPt
 hPt
@@ -60629,7 +60630,7 @@ pRW
 pRW
 pRW
 pRW
-qCs
+fdp
 lNv
 hPt
 hPt
@@ -61213,7 +61214,7 @@ pRW
 pRW
 pRW
 imb
-bcw
+aiW
 hEc
 hEc
 hEc
diff --git a/maps/endeavour/levels/deck4.dmm b/maps/endeavour/levels/deck4.dmm
index 05d38b150d77..bbbddcc91b77 100644
--- a/maps/endeavour/levels/deck4.dmm
+++ b/maps/endeavour/levels/deck4.dmm
@@ -1945,8 +1945,7 @@
 /area/endeavour/hallway/d4starboardamidhall)
 "ckl" = (
 /obj/machinery/light{
-	dir = 4;
-	pixel_x = 10
+	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/door/airlock/glass/research{
@@ -2318,8 +2317,7 @@
 /area/rnd/robotics/smallcraft)
 "cGm" = (
 /obj/machinery/light{
-	dir = 4;
-	pixel_x = 10
+	dir = 4
 	},
 /obj/machinery/computer/atmos_alert{
 	dir = 8
@@ -2893,6 +2891,7 @@
 /area/engineering/atmos)
 "dtj" = (
 /obj/spawner/window/low_wall/reinforced/full/firelocks,
+/obj/effect/paint/sun,
 /turf/simulated/floor/wood,
 /area/engineering/hallway/lower)
 "dtD" = (
@@ -3348,8 +3347,7 @@
 	dir = 8
 	},
 /obj/machinery/light{
-	dir = 8;
-	pixel_x = -10
+	dir = 8
 	},
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -3637,6 +3635,7 @@
 /obj/spawner/window/low_wall/reinforced/full/firelocks,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/effect/paint/sun,
 /turf/simulated/floor/wood,
 /area/engineering/hallway/lower)
 "euv" = (
@@ -4523,8 +4522,7 @@
 /area/endeavour/hallway/d4fwdmaint)
 "fwT" = (
 /obj/machinery/light{
-	dir = 4;
-	pixel_x = 10
+	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/door/airlock/glass/research{
@@ -5197,6 +5195,7 @@
 /area/endeavour/command/turrets)
 "gtb" = (
 /obj/spawner/window/low_wall/reinforced/full/firelocks,
+/obj/effect/paint/sun,
 /turf/simulated/floor/wood,
 /area/endeavour/station/stairs_four)
 "gtA" = (
@@ -6519,8 +6518,7 @@
 	dir = 4
 	},
 /obj/machinery/light{
-	dir = 4;
-	use_power = 0
+	dir = 4
 	},
 /obj/machinery/door/firedoor{
 	dir = 8
@@ -6654,8 +6652,7 @@
 	dir = 4
 	},
 /obj/machinery/light{
-	dir = 4;
-	use_power = 0
+	dir = 4
 	},
 /turf/simulated/floor/tiled/steel_grid,
 /area/endeavour/hallway/d4starboardamidhall)
@@ -6886,8 +6883,7 @@
 /area/endeavour/hallway/d4aftmaint)
 "ikC" = (
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 20
+	dir = 1
 	},
 /turf/simulated/floor/plating,
 /area/endeavour/hallway/d4aftmaint)
@@ -7061,6 +7057,7 @@
 /area/ai_upload_foyer)
 "ixU" = (
 /obj/spawner/window/low_wall/reinforced/full/firelocks,
+/obj/effect/paint/sun,
 /turf/simulated/floor/wood,
 /area/engineering/break_room)
 "iyC" = (
@@ -10081,8 +10078,7 @@
 /area/endeavour/hallway/d4porthall)
 "mel" = (
 /obj/machinery/light{
-	dir = 8;
-	pixel_x = -10
+	dir = 8
 	},
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d4fwdhall)
@@ -10477,8 +10473,7 @@
 	dir = 8
 	},
 /obj/machinery/light{
-	dir = 8;
-	pixel_x = -10
+	dir = 8
 	},
 /obj/machinery/camera/network/engineering{
 	dir = 4
@@ -12336,19 +12331,6 @@
 /obj/structure/disposalpipe/segment,
 /turf/simulated/floor/tiled/techmaint,
 /area/engineering/atmos)
-"oLT" = (
-/obj/effect/floor_decal/borderfloorblack{
-	dir = 4
-	},
-/obj/effect/floor_decal/corner/lightorange/border{
-	dir = 4
-	},
-/obj/machinery/light{
-	dir = 4;
-	use_power = 0
-	},
-/turf/simulated/floor/tiled/steel_ridged,
-/area/endeavour/hallway/d4portamidhall)
 "oNF" = (
 /obj/machinery/atmospherics/pipe/simple/heat_exchanging{
 	dir = 9
@@ -17726,8 +17708,7 @@
 	},
 /obj/structure/catwalk,
 /obj/machinery/light{
-	dir = 4;
-	use_power = 0
+	dir = 4
 	},
 /turf/simulated/floor/plating,
 /area/engineering/engine_smes)
@@ -18304,7 +18285,7 @@
 "wFy" = (
 /obj/structure/table/rack/shelf,
 /obj/fiftyspawner/glass,
-/obj/item/stack/material/steel/full_stack,
+/obj/fiftyspawner/steel,
 /obj/machinery/fire_alarm/west_mount,
 /turf/simulated/floor/tiled/techmaint,
 /area/rnd/robotics/smallcraft)
@@ -18354,10 +18335,10 @@
 	dir = 8;
 	layer = 2.6
 	},
-/obj/item/stack/material/steel/full_stack,
-/obj/item/stack/material/steel/full_stack,
-/obj/item/stack/material/steel/full_stack,
-/obj/item/stack/material/steel/full_stack,
+/obj/fiftyspawner/steel,
+/obj/fiftyspawner/steel,
+/obj/fiftyspawner/steel,
+/obj/fiftyspawner/steel,
 /turf/simulated/floor/tiled/techmaint,
 /area/engineering/storage)
 "wLT" = (
@@ -18496,8 +18477,7 @@
 /area/endeavour/command/turrets)
 "wSS" = (
 /obj/machinery/light{
-	dir = 4;
-	pixel_x = 10
+	dir = 4
 	},
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d4fwdhall)
@@ -18957,8 +18937,7 @@
 /area/engineering/drone_fabrication)
 "xwH" = (
 /obj/machinery/light{
-	dir = 4;
-	pixel_x = 10
+	dir = 4
 	},
 /obj/machinery/computer/rcon{
 	dir = 8
@@ -36646,7 +36625,7 @@ hOe
 rAC
 bSY
 rAC
-oLT
+kSz
 gPH
 xbS
 gPH
diff --git a/maps/euthenia/levels/deck1.dmm b/maps/euthenia/levels/deck1.dmm
index 5403984c496f..9a0bd4237d4b 100644
--- a/maps/euthenia/levels/deck1.dmm
+++ b/maps/euthenia/levels/deck1.dmm
@@ -1790,7 +1790,7 @@
 	pixel_x = 3;
 	pixel_y = 3
 	},
-/obj/item/stack/material/steel/full_stack,
+/obj/fiftyspawner/steel,
 /obj/fiftyspawner/glass,
 /obj/effect/floor_decal/techfloor{
 	dir = 6
@@ -12656,8 +12656,8 @@
 /obj/structure/table/steel,
 /obj/fiftyspawner/glass,
 /obj/fiftyspawner/glass,
-/obj/item/stack/material/steel/full_stack,
-/obj/item/stack/material/steel/full_stack,
+/obj/fiftyspawner/steel,
+/obj/fiftyspawner/steel,
 /obj/machinery/camera/network/security{
 	dir = 1
 	},
diff --git a/maps/euthenia/levels/deck2.dmm b/maps/euthenia/levels/deck2.dmm
index 03e0378dd867..b9b9004fb1e2 100644
--- a/maps/euthenia/levels/deck2.dmm
+++ b/maps/euthenia/levels/deck2.dmm
@@ -12848,8 +12848,8 @@
 /area/main_map/maintenance/deck_two/aft)
 "jAm" = (
 /obj/structure/table/rack/shelf/steel,
-/obj/item/stack/material/steel/full_stack,
-/obj/item/stack/material/steel/full_stack,
+/obj/fiftyspawner/steel,
+/obj/fiftyspawner/steel,
 /obj/fiftyspawner/glass,
 /obj/fiftyspawner/glass,
 /turf/simulated/floor/reinforced,
@@ -14303,11 +14303,11 @@
 /obj/structure/closet{
 	name = "materials"
 	},
-/obj/item/stack/material/steel/full_stack,
-/obj/item/stack/material/steel/full_stack,
-/obj/item/stack/material/steel/full_stack,
-/obj/item/stack/material/steel/full_stack,
-/obj/item/stack/material/steel/full_stack,
+/obj/fiftyspawner/steel,
+/obj/fiftyspawner/steel,
+/obj/fiftyspawner/steel,
+/obj/fiftyspawner/steel,
+/obj/fiftyspawner/steel,
 /obj/fiftyspawner/glass,
 /obj/fiftyspawner/glass,
 /obj/fiftyspawner/glass,
@@ -17397,10 +17397,10 @@
 /area/main_map/maintenance/panic_bunker/two)
 "mQJ" = (
 /obj/structure/table/rack/shelf,
-/obj/item/stack/material/steel/full_stack,
+/obj/fiftyspawner/steel,
 /obj/fiftyspawner/glass,
 /obj/fiftyspawner/glass,
-/obj/item/stack/material/steel/full_stack,
+/obj/fiftyspawner/steel,
 /turf/simulated/floor/tiled/steel_grid,
 /area/rift/station/fighter_bay/hangar)
 "mQU" = (
@@ -20140,9 +20140,9 @@
 /area/medical/medbay2)
 "oOf" = (
 /obj/structure/table/reinforced,
-/obj/item/stack/material/steel/full_stack,
-/obj/item/stack/material/steel/full_stack,
-/obj/item/stack/material/steel/full_stack,
+/obj/fiftyspawner/steel,
+/obj/fiftyspawner/steel,
+/obj/fiftyspawner/steel,
 /turf/simulated/floor/tiled,
 /area/maintenance/tool_storage)
 "oOl" = (
@@ -20433,7 +20433,7 @@
 /obj/structure/table/rack/shelf,
 /obj/machinery/atmospherics/component/unary/vent_scrubber/on,
 /obj/fiftyspawner/glass,
-/obj/item/stack/material/steel/full_stack,
+/obj/fiftyspawner/steel,
 /obj/machinery/camera/network/civilian,
 /turf/simulated/floor/tiled/steel,
 /area/rift/station/fighter_bay/maintenance)
@@ -25440,10 +25440,10 @@
 	dir = 8;
 	layer = 2.6
 	},
-/obj/item/stack/material/steel/full_stack,
-/obj/item/stack/material/steel/full_stack,
-/obj/item/stack/material/steel/full_stack,
-/obj/item/stack/material/steel/full_stack,
+/obj/fiftyspawner/steel,
+/obj/fiftyspawner/steel,
+/obj/fiftyspawner/steel,
+/obj/fiftyspawner/steel,
 /turf/simulated/floor/tiled/techmaint,
 /area/engineering/storage)
 "sRz" = (
@@ -26969,8 +26969,8 @@
 /area/main_map/Hangar_bay/deck2)
 "tUD" = (
 /obj/structure/table/rack/shelf/steel,
-/obj/item/stack/material/steel/full_stack,
-/obj/item/stack/material/steel/full_stack,
+/obj/fiftyspawner/steel,
+/obj/fiftyspawner/steel,
 /obj/fiftyspawner/glass,
 /obj/fiftyspawner/glass,
 /turf/simulated/floor/reinforced,
@@ -31350,8 +31350,8 @@
 /area/engineering/atmos)
 "xbt" = (
 /obj/structure/table/reinforced,
-/obj/item/stack/material/steel/full_stack,
-/obj/item/stack/material/steel/full_stack,
+/obj/fiftyspawner/steel,
+/obj/fiftyspawner/steel,
 /obj/effect/floor_decal/industrial/danger{
 	dir = 1
 	},
diff --git a/maps/euthenia/levels/deck3.dmm b/maps/euthenia/levels/deck3.dmm
index a44cfb82eb7f..6d274c8ba8e5 100644
--- a/maps/euthenia/levels/deck3.dmm
+++ b/maps/euthenia/levels/deck3.dmm
@@ -13554,7 +13554,7 @@
 /area/main_map/maintenance/deck_three)
 "mSL" = (
 /obj/structure/table/steel,
-/obj/item/stack/material/steel/full_stack,
+/obj/fiftyspawner/steel,
 /obj/effect/floor_decal/techfloor{
 	dir = 4
 	},
@@ -25701,7 +25701,7 @@
 	dir = 8
 	},
 /obj/structure/table/steel,
-/obj/item/stack/material/steel/full_stack,
+/obj/fiftyspawner/steel,
 /turf/simulated/floor/tiled/techfloor,
 /area/rnd/workshop)
 "ycj" = (
diff --git a/maps/map_levels/140x140/talon/talon1.dmm b/maps/map_levels/140x140/talon/talon1.dmm
index 18a455d8348f..db6c2dc5a8af 100644
--- a/maps/map_levels/140x140/talon/talon1.dmm
+++ b/maps/map_levels/140x140/talon/talon1.dmm
@@ -929,7 +929,7 @@
 /obj/fiftyspawner/floor,
 /obj/fiftyspawner/glass,
 /obj/fiftyspawner/plastic,
-/obj/item/stack/material/steel/full_stack,
+/obj/fiftyspawner/steel,
 /obj/fiftyspawner/wood,
 /obj/item/stack/material/plasteel{
 	amount = 30
@@ -2062,9 +2062,9 @@
 /area/talon/deckone/brig)
 "rW" = (
 /obj/structure/table/standard,
-/obj/item/stack/material/steel/full_stack,
-/obj/item/stack/material/steel/full_stack,
-/obj/item/stack/material/steel/full_stack,
+/obj/fiftyspawner/steel,
+/obj/fiftyspawner/steel,
+/obj/fiftyspawner/steel,
 /turf/simulated/floor/tiled/eris/steel/gray_perforated,
 /area/talon/deckone/workroom)
 "rX" = (
diff --git a/maps/rift/levels/rift-02-underground2.dmm b/maps/rift/levels/rift-02-underground2.dmm
index 9eb51cefbfa6..c4e8d9711016 100644
--- a/maps/rift/levels/rift-02-underground2.dmm
+++ b/maps/rift/levels/rift-02-underground2.dmm
@@ -6329,11 +6329,11 @@
 	dir = 8;
 	layer = 2.6
 	},
-/obj/item/stack/material/steel/full_stack,
-/obj/item/stack/material/steel/full_stack,
-/obj/item/stack/material/steel/full_stack,
-/obj/item/stack/material/steel/full_stack,
-/obj/item/stack/material/steel/full_stack,
+/obj/fiftyspawner/steel,
+/obj/fiftyspawner/steel,
+/obj/fiftyspawner/steel,
+/obj/fiftyspawner/steel,
+/obj/fiftyspawner/steel,
 /obj/structure/window/reinforced{
 	dir = 8
 	},
@@ -13318,7 +13318,7 @@
 /area/quartermaster/belterdock/refinery)
 "XS" = (
 /obj/structure/closet/crate,
-/obj/item/stack/material/steel/full_stack,
+/obj/fiftyspawner/steel,
 /turf/simulated/floor/plating,
 /area/maintenance/lower/mining)
 "XT" = (
diff --git a/maps/rift/levels/rift-03-underground1.dmm b/maps/rift/levels/rift-03-underground1.dmm
index 26246faa9d9a..1f715a2f1001 100644
--- a/maps/rift/levels/rift-03-underground1.dmm
+++ b/maps/rift/levels/rift-03-underground1.dmm
@@ -10309,7 +10309,7 @@
 "Gl" = (
 /obj/structure/table/rack/shelf,
 /obj/item/gun/launcher/crossbow,
-/obj/item/stack/material/steel/full_stack,
+/obj/fiftyspawner/steel,
 /turf/simulated/floor/plating,
 /area/maintenance/engineering)
 "Gm" = (
@@ -10663,7 +10663,7 @@
 "Ho" = (
 /obj/structure/table/rack,
 /obj/fiftyspawner/glass,
-/obj/item/stack/material/steel/full_stack,
+/obj/fiftyspawner/steel,
 /turf/simulated/floor/tiled/techmaint,
 /area/engineering/drone_fabrication)
 "Hp" = (
@@ -13825,7 +13825,7 @@
 /obj/structure/table/rack/shelf,
 /obj/machinery/atmospherics/component/unary/vent_scrubber/on,
 /obj/fiftyspawner/glass,
-/obj/item/stack/material/steel/full_stack,
+/obj/fiftyspawner/steel,
 /obj/machinery/camera/network/civilian,
 /turf/simulated/floor/tiled/steel,
 /area/rift/station/fighter_bay/maintenance)
diff --git a/maps/rift/levels/rift-04-surface1.dmm b/maps/rift/levels/rift-04-surface1.dmm
index 2cd427266afb..3b2ff86f9e8d 100644
--- a/maps/rift/levels/rift-04-surface1.dmm
+++ b/maps/rift/levels/rift-04-surface1.dmm
@@ -5880,7 +5880,7 @@
 /area/tether/surfacebase/entertainment)
 "dTO" = (
 /obj/structure/table/reinforced,
-/obj/item/stack/material/steel/full_stack,
+/obj/fiftyspawner/steel,
 /obj/fiftyspawner/glass,
 /obj/item/storage/briefcase/inflatable,
 /turf/simulated/floor/tiled/steel,
@@ -13800,7 +13800,7 @@
 /area/rnd/outpost/xenobiology/outpost_first_aid)
 "iMl" = (
 /obj/structure/table/rack/shelf/steel,
-/obj/item/stack/material/steel/full_stack,
+/obj/fiftyspawner/steel,
 /obj/fiftyspawner/glass,
 /turf/simulated/floor/tiled/steel_grid,
 /area/quartermaster/garage)
@@ -21600,7 +21600,7 @@
 	pixel_y = 32
 	},
 /obj/fiftyspawner/glass,
-/obj/item/stack/material/steel/full_stack,
+/obj/fiftyspawner/steel,
 /obj/item/hand_labeler,
 /turf/simulated/floor/tiled/steel,
 /area/quartermaster/office)
@@ -25636,7 +25636,7 @@
 "pKE" = (
 /obj/structure/table/rack/shelf,
 /obj/fiftyspawner/glass,
-/obj/item/stack/material/steel/full_stack,
+/obj/fiftyspawner/steel,
 /turf/simulated/floor/tiled/steel_dirty,
 /area/maintenance/maint_bar)
 "pKJ" = (
@@ -26923,7 +26923,7 @@
 "qwA" = (
 /obj/structure/table/rack,
 /obj/fiftyspawner/wood,
-/obj/item/stack/material/steel/full_stack,
+/obj/fiftyspawner/steel,
 /obj/fiftyspawner/hardwood,
 /obj/fiftyspawner/glass,
 /obj/item/storage/toolbox/mechanical,
diff --git a/maps/rift/levels/rift-05-surface2.dmm b/maps/rift/levels/rift-05-surface2.dmm
index d840e273673e..c115095ab382 100644
--- a/maps/rift/levels/rift-05-surface2.dmm
+++ b/maps/rift/levels/rift-05-surface2.dmm
@@ -4031,7 +4031,7 @@
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/hammerhead/general)
 "cqn" = (
-/obj/item/stack/material/steel/full_stack,
+/obj/fiftyspawner/steel,
 /turf/simulated/floor/tiled/techfloor,
 /area/maintenance/security/upper)
 "cqp" = (
@@ -8061,7 +8061,7 @@
 /obj/effect/floor_decal/corner/purple/border{
 	dir = 4
 	},
-/obj/item/stack/material/steel/full_stack,
+/obj/fiftyspawner/steel,
 /turf/simulated/floor/tiled/steel,
 /area/rnd/workshop)
 "fcE" = (
@@ -14836,7 +14836,7 @@
 "jpV" = (
 /obj/structure/table/steel,
 /obj/fiftyspawner/glass,
-/obj/item/stack/material/steel/full_stack,
+/obj/fiftyspawner/steel,
 /turf/simulated/floor/plating,
 /area/maintenance/asmaint2)
 "jqf" = (
@@ -23381,7 +23381,7 @@
 /obj/effect/floor_decal/corner/purple/border{
 	dir = 8
 	},
-/obj/item/stack/material/steel/full_stack,
+/obj/fiftyspawner/steel,
 /turf/simulated/floor/tiled/steel,
 /area/rnd/workshop)
 "otg" = (
@@ -34175,7 +34175,7 @@
 	dir = 4
 	},
 /obj/structure/table/reinforced,
-/obj/item/stack/material/steel/full_stack,
+/obj/fiftyspawner/steel,
 /obj/fiftyspawner/glass,
 /obj/machinery/requests_console{
 	department = "Research";
@@ -34220,8 +34220,8 @@
 /area/security/evastorage)
 "vrx" = (
 /obj/structure/table/steel,
-/obj/item/stack/material/steel/full_stack,
-/obj/item/stack/material/steel/full_stack,
+/obj/fiftyspawner/steel,
+/obj/fiftyspawner/steel,
 /obj/fiftyspawner/glass,
 /obj/fiftyspawner/glass,
 /obj/machinery/atmospherics/component/unary/vent_scrubber/on{
@@ -36697,7 +36697,7 @@
 /turf/simulated/floor/tiled/white,
 /area/crew_quarters/sleep/Dorm_5)
 "xdi" = (
-/obj/item/stack/material/steel/full_stack,
+/obj/fiftyspawner/steel,
 /obj/structure/table/rack,
 /obj/fiftyspawner/glass,
 /turf/simulated/floor/plating,
diff --git a/maps/rift/levels/rift-10-west_plains.dmm b/maps/rift/levels/rift-10-west_plains.dmm
index 287261384cd1..7f531c74e37d 100644
--- a/maps/rift/levels/rift-10-west_plains.dmm
+++ b/maps/rift/levels/rift-10-west_plains.dmm
@@ -5799,7 +5799,7 @@
 	dir = 10
 	},
 /obj/structure/table/standard,
-/obj/item/stack/material/steel/full_stack,
+/obj/fiftyspawner/steel,
 /turf/simulated/floor/tiled/white,
 /area/rnd/outpost/mixing)
 "At" = (
diff --git a/maps/sectors/admin_planets_192/andromeda.dmm b/maps/sectors/admin_planets_192/andromeda.dmm
index 78f3959ab24d..17dcc5bf1efd 100644
--- a/maps/sectors/admin_planets_192/andromeda.dmm
+++ b/maps/sectors/admin_planets_192/andromeda.dmm
@@ -3869,8 +3869,8 @@
 /obj/fiftyspawner/glass,
 /obj/fiftyspawner/glass,
 /obj/fiftyspawner/glass,
-/obj/item/stack/material/steel/full_stack,
-/obj/item/stack/material/steel/full_stack,
+/obj/fiftyspawner/steel,
+/obj/fiftyspawner/steel,
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
@@ -8781,8 +8781,8 @@
 /obj/machinery/lathe/medical/stocked{
 	pixel_x = 4
 	},
-/obj/item/stack/material/steel/full_stack,
-/obj/item/stack/material/steel/full_stack,
+/obj/fiftyspawner/steel,
+/obj/fiftyspawner/steel,
 /obj/fiftyspawner/glass,
 /obj/fiftyspawner/glass,
 /turf/simulated/floor/tiled/kafel_full/gray,
@@ -9276,7 +9276,7 @@
 "CM" = (
 /obj/structure/table/rack/shelf,
 /obj/fiftyspawner/cardboard,
-/obj/item/stack/material/steel/full_stack,
+/obj/fiftyspawner/steel,
 /obj/fiftyspawner/glass,
 /obj/effect/floor_decal/industrial/outline/grey,
 /turf/simulated/floor/tiled/steel,
@@ -9856,9 +9856,9 @@
 "EN" = (
 /obj/effect/floor_decal/industrial/outline/yellow,
 /obj/structure/closet/crate/science,
-/obj/item/stack/material/steel/full_stack,
-/obj/item/stack/material/steel/full_stack,
-/obj/item/stack/material/steel/full_stack,
+/obj/fiftyspawner/steel,
+/obj/fiftyspawner/steel,
+/obj/fiftyspawner/steel,
 /obj/fiftyspawner/glass,
 /obj/fiftyspawner/glass,
 /obj/fiftyspawner/glass,
@@ -13639,11 +13639,11 @@
 	dir = 8;
 	layer = 2.6
 	},
-/obj/item/stack/material/steel/full_stack,
-/obj/item/stack/material/steel/full_stack,
-/obj/item/stack/material/steel/full_stack,
-/obj/item/stack/material/steel/full_stack,
-/obj/item/stack/material/steel/full_stack,
+/obj/fiftyspawner/steel,
+/obj/fiftyspawner/steel,
+/obj/fiftyspawner/steel,
+/obj/fiftyspawner/steel,
+/obj/fiftyspawner/steel,
 /obj/structure/window/reinforced{
 	dir = 8
 	},
@@ -16293,8 +16293,8 @@
 /area/admin_planet/andromeda/rnd_rd_office)
 "YK" = (
 /obj/structure/table/reinforced,
-/obj/item/stack/material/steel/full_stack,
-/obj/item/stack/material/steel/full_stack,
+/obj/fiftyspawner/steel,
+/obj/fiftyspawner/steel,
 /turf/simulated/floor/tiled/kafel_full/gray,
 /area/admin_planet/andromeda/rnd_circuitry)
 "YL" = (
diff --git a/maps/sectors/admin_planets_192/croatoan.dmm b/maps/sectors/admin_planets_192/croatoan.dmm
index 596dcb27c4ce..33761393dfae 100644
--- a/maps/sectors/admin_planets_192/croatoan.dmm
+++ b/maps/sectors/admin_planets_192/croatoan.dmm
@@ -9075,7 +9075,7 @@
 /area/admin_planet/croatoan/sci_upper_checkpoint)
 "Ge" = (
 /obj/structure/table/reinforced,
-/obj/item/stack/material/steel/full_stack,
+/obj/fiftyspawner/steel,
 /turf/simulated/floor/tiled/techmaint,
 /area/admin_planet/croatoan/sci_circuitry_lab)
 "Gh" = (
@@ -13770,7 +13770,7 @@
 "Wh" = (
 /obj/structure/closet/crate/science,
 /obj/fiftyspawner/glass,
-/obj/item/stack/material/steel/full_stack,
+/obj/fiftyspawner/steel,
 /turf/simulated/floor/tiled/old_tile/white,
 /area/admin_planet/croatoan/sci_rnd_lab)
 "Wi" = (
diff --git a/maps/sectors/miaphus/levels/miaphus_beach.dmm b/maps/sectors/miaphus/levels/miaphus_beach.dmm
index a3d4c6dc17dc..f35e7bf8cfbc 100644
--- a/maps/sectors/miaphus/levels/miaphus_beach.dmm
+++ b/maps/sectors/miaphus/levels/miaphus_beach.dmm
@@ -2582,7 +2582,7 @@
 /area/sector/miaphus/beach/resort/canteen)
 "uk" = (
 /obj/structure/table/rack/shelf/steel,
-/obj/item/stack/material/steel/full_stack,
+/obj/fiftyspawner/steel,
 /turf/simulated/floor/tiled/asteroid_steel{
 	outdoors = 1
 	},
diff --git a/maps/sectors/nebula_tradeport/levels/nebula_tradeport.dmm b/maps/sectors/nebula_tradeport/levels/nebula_tradeport.dmm
index 0d660e0c3670..c16757b54c69 100644
--- a/maps/sectors/nebula_tradeport/levels/nebula_tradeport.dmm
+++ b/maps/sectors/nebula_tradeport/levels/nebula_tradeport.dmm
@@ -274,6 +274,9 @@
 /obj/effect/floor_decal/techfloor/orange/corner{
 	dir = 8
 	},
+/obj/structure/cable/orange{
+	icon_state = "4-8"
+	},
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/sector/nebula_tradeport/dock2)
 "aaR" = (
@@ -684,6 +687,9 @@
 /obj/structure/railing/grey{
 	dir = 1
 	},
+/obj/structure/cable/orange{
+	icon_state = "4-8"
+	},
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/sector/nebula_tradeport/dock2)
 "acd" = (
@@ -1040,13 +1046,13 @@
 /turf/simulated/floor/carpet/bcarpet,
 /area/shuttle/trade_ship/general)
 "adb" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
-	dir = 4
-	},
 /obj/machinery/air_alarm/alarms_hidden/north_mount,
 /obj/structure/window/reinforced/tinted{
 	dir = 4
 	},
+/obj/machinery/atmospherics/valve{
+	dir = 4
+	},
 /turf/simulated/floor/tiled/techfloor/monogrid,
 /area/shuttle/adventurer)
 "adc" = (
@@ -1090,10 +1096,10 @@
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/tradeport/spine)
 "adj" = (
+/obj/effect/floor_decal/corner/green/border,
 /obj/structure/cable/orange{
-	icon_state = "4-8"
+	icon_state = "1-2"
 	},
-/obj/effect/floor_decal/corner/green/border,
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/tradeport/commhall)
 "adk" = (
@@ -1482,6 +1488,9 @@
 /obj/effect/floor_decal/industrial/warning,
 /obj/effect/floor_decal/industrial/hatch/yellow,
 /obj/structure/marker_beacon/yellow,
+/obj/structure/cable/orange{
+	icon_state = "4-8"
+	},
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/sector/nebula_tradeport/dock2)
 "aei" = (
@@ -2108,24 +2117,6 @@
 /obj/machinery/biogenerator,
 /turf/simulated/floor/grass,
 /area/tradeport)
-"afM" = (
-/obj/structure/cable/yellow{
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 8
-	},
-/obj/structure/cable/orange{
-	icon_state = "4-10"
-	},
-/obj/effect/floor_decal/corner/green/border{
-	dir = 1
-	},
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/tradeport/commhall)
 "afP" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 8
@@ -3983,6 +3974,9 @@
 	icon_state = "4-8"
 	},
 /obj/structure/bed/chair/bay/chair/padded/red/smallnest,
+/obj/machinery/atmospherics/pipe/simple/hidden/green{
+	dir = 10
+	},
 /turf/simulated/floor/tiled/monotechmaint,
 /area/shuttle/runabout)
 "akv" = (
@@ -4174,13 +4168,6 @@
 	},
 /turf/simulated/floor/tiled/old_tile/purple,
 /area/tradeport/spine)
-"akY" = (
-/obj/structure/metal_edge,
-/obj/structure/cable/orange{
-	icon_state = "5-10"
-	},
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/sector/nebula_tradeport/dock2)
 "ala" = (
 /obj/machinery/holopad/ship,
 /obj/machinery/light{
@@ -4344,12 +4331,12 @@
 "alv" = (
 /obj/structure/table/steel_reinforced,
 /obj/fiftyspawner/glass,
-/obj/item/stack/material/steel/full_stack,
+/obj/fiftyspawner/steel,
 /obj/machinery/atmospherics/component/unary/vent_scrubber/on{
 	dir = 4
 	},
 /obj/fiftyspawner/glass,
-/obj/item/stack/material/steel/full_stack,
+/obj/fiftyspawner/steel,
 /obj/effect/floor_decal/rust,
 /turf/simulated/floor/plating,
 /area/tradeport/atmospherics)
@@ -4632,6 +4619,9 @@
 /obj/structure/table/rack/shelf/steel,
 /obj/item/clothing/suit/storage/hazardvest,
 /obj/item/clothing/suit/storage/hazardvest,
+/obj/item/clothing/suit/space/emergency,
+/obj/item/clothing/suit/space/emergency,
+/obj/item/clothing/head/helmet/space/emergency,
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/sector/nebula_tradeport/engineering)
 "aml" = (
@@ -5131,9 +5121,6 @@
 /turf/simulated/shuttle/floor/white,
 /area/tradeport/commons)
 "anF" = (
-/obj/structure/cable/green{
-	icon_state = "1-8"
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden{
 	dir = 6
 	},
@@ -5141,6 +5128,9 @@
 /obj/machinery/light/small{
 	dir = 4
 	},
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
 /turf/simulated/floor/carpet/patterened/brown,
 /area/shuttle/caravan)
 "anG" = (
@@ -5742,12 +5732,12 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 8
 	},
-/obj/structure/cable/orange{
-	icon_state = "1-2"
-	},
 /obj/effect/floor_decal/industrial/halfstair{
 	dir = 8
 	},
+/obj/structure/cable/orange{
+	icon_state = "1-4"
+	},
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/tradeport/commhall)
 "aps" = (
@@ -6858,9 +6848,6 @@
 /turf/simulated/floor/tiled/asteroid_steel/airless,
 /area/tradeport/pads)
 "ass" = (
-/obj/structure/cable/orange{
-	icon_state = "1-4"
-	},
 /obj/effect/floor_decal/industrial/halfstair{
 	dir = 8
 	},
@@ -7160,6 +7147,10 @@
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
 	dir = 4
 	},
+/obj/structure/cable/orange{
+	icon_state = "1-4";
+	dir = 4
+	},
 /turf/simulated/floor/tiled/techfloor/monogrid,
 /area/sector/nebula_tradeport/dock2)
 "atk" = (
@@ -7386,12 +7377,12 @@
 /turf/simulated/floor/tiled/freezer,
 /area/tradeport)
 "atJ" = (
-/obj/structure/cable/green{
-	icon_state = "1-8"
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden{
 	dir = 6
 	},
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
 /turf/simulated/wall/prepainted,
 /area/shuttle/adventurer)
 "atK" = (
@@ -7591,15 +7582,6 @@
 	},
 /turf/simulated/floor/wood,
 /area/tradeport/cyndi)
-"auk" = (
-/obj/structure/cable/green{
-	icon_state = "2-4"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
-	dir = 4
-	},
-/turf/simulated/wall/prepainted,
-/area/shuttle/adventurer)
 "aum" = (
 /obj/structure/cable/cyan{
 	icon_state = "4-8"
@@ -8718,6 +8700,9 @@
 /obj/effect/floor_decal/corner/green/border{
 	dir = 1
 	},
+/obj/structure/cable/orange{
+	icon_state = "4-8"
+	},
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/tradeport/commhall)
 "awP" = (
@@ -8888,6 +8873,7 @@
 /obj/machinery/computer/ship/sensors{
 	pixel_x = -27
 	},
+/obj/machinery/power/apc/alarms_hidden/north_mount,
 /turf/simulated/floor/tiled/monotechmaint,
 /area/shuttle/utilitymicro)
 "axo" = (
@@ -9811,6 +9797,13 @@
 /obj/effect/floor_decal/techfloor/orange/corner{
 	dir = 8
 	},
+/obj/structure/cable/orange{
+	icon_state = "1-4";
+	dir = 4
+	},
+/obj/structure/cable/orange{
+	icon_state = "1-4"
+	},
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/sector/nebula_tradeport/dock2)
 "azK" = (
@@ -9983,6 +9976,9 @@
 /obj/structure/railing/grey{
 	dir = 1
 	},
+/obj/structure/cable/orange{
+	icon_state = "4-8"
+	},
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/sector/nebula_tradeport/dock2)
 "aAj" = (
@@ -10057,9 +10053,6 @@
 /obj/structure/railing/grey{
 	dir = 1
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/green{
-	dir = 5
-	},
 /obj/structure/panic_button{
 	pixel_y = -28
 	},
@@ -10128,6 +10121,9 @@
 "aAA" = (
 /obj/effect/floor_decal/rust,
 /obj/structure/bed/chair/bay/chair/padded/red/smallnest,
+/obj/machinery/atmospherics/component/unary/vent_pump/on{
+	dir = 4
+	},
 /turf/simulated/floor/tiled/monotechmaint,
 /area/shuttle/runabout)
 "aAB" = (
@@ -11110,6 +11106,12 @@
 /obj/structure/window/reinforced{
 	dir = 4
 	},
+/obj/structure/cable/orange{
+	dir = 1
+	},
+/obj/machinery/power/terminal{
+	dir = 4
+	},
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/shuttle/utilitymicro)
 "aCZ" = (
@@ -11120,6 +11122,9 @@
 /obj/effect/floor_decal/corner/green/border{
 	dir = 1
 	},
+/obj/structure/cable/orange{
+	icon_state = "4-8"
+	},
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/tradeport/commhall)
 "aDa" = (
@@ -11209,10 +11214,6 @@
 /obj/machinery/light{
 	dir = 1
 	},
-/obj/item/paper{
-	info = "WELCOME TO THE NEBULA MOTEL \ TO BUY A PASS, SEEK M4RIA, AT BEHIND THE COUNTER. \ \ We have 9 rooms. \ Room 1 to 4 have a small kitchen, and washing room. \  Room 1 and 4 have 1 Double bed. \ 2 has 1 single bed \ 3 have 2 single beds. \ Those rooms are 30 Thrallers the 3 to 5 hours. \ \ Room 5 to 8 have no kitchen, and washing room. \ Room 6 and 8 have 1 Double bed. \ 5 has 1 single bed \ 7 have 2 single beds. \ Those rooms are 15 Thrallers the 3 to 5 hours. \ \  Room 9 is our VIP Suite. This suite has 2 bed rooms, 1 office, 1 fully equipped kitchen, 1 washroom, 1 laundry room, And its own shuttle call the Arrowhead, used by ex Tajaran racer Cheuk'Yager. the suite is 80 Thrallers the 3 to 5 hours. \ \ The Sauna is free to use. The public laundry machine and public bathroom are free to use. Guest pass are available if the rooms are shared.";
-	name = "Nebula Motel"
-	},
 /obj/machinery/computer/cryopod/gateway{
 	pixel_x = -31
 	},
@@ -11578,16 +11579,6 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/tiled/techfloor/monogrid,
 /area/sector/nebula_tradeport/dock2)
-"aEs" = (
-/obj/structure/cable/orange{
-	icon_state = "5-10"
-	},
-/obj/structure/cable/orange{
-	icon_state = "5-8"
-	},
-/obj/effect/floor_decal/corner/green/border,
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/tradeport/commhall)
 "aEt" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -12600,6 +12591,9 @@
 /area/tradeport/cyndishow)
 "aHa" = (
 /obj/effect/floor_decal/industrial/halfstair,
+/obj/structure/cable/orange{
+	icon_state = "4-8"
+	},
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/sector/nebula_tradeport/dock2)
 "aHb" = (
@@ -12613,6 +12607,10 @@
 /obj/structure/table/rack/shelf/steel,
 /obj/item/clothing/suit/storage/hazardvest,
 /obj/item/clothing/suit/storage/hazardvest,
+/obj/item/clothing/suit/space/emergency,
+/obj/item/clothing/suit/space/emergency,
+/obj/item/clothing/head/helmet/space/emergency,
+/obj/item/clothing/head/helmet/space/emergency,
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/sector/nebula_tradeport/engineering)
 "aHe" = (
@@ -13299,9 +13297,6 @@
 /turf/simulated/floor/carpet/patterened/red,
 /area/sector/nebula_tradeport/motel/vip)
 "aJa" = (
-/obj/structure/cable/green{
-	icon_state = "2-4"
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/cyan{
 	dir = 4
 	},
@@ -13357,6 +13352,9 @@
 /obj/effect/floor_decal/corner/green/border{
 	dir = 1
 	},
+/obj/structure/cable/orange{
+	icon_state = "4-8"
+	},
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/tradeport/commhall)
 "aJi" = (
@@ -13770,7 +13768,7 @@
 	},
 /obj/structure/table/steel_reinforced,
 /obj/fiftyspawner/glass,
-/obj/item/stack/material/steel/full_stack,
+/obj/fiftyspawner/steel,
 /obj/fiftyspawner/plastic,
 /turf/simulated/floor/tiled/dark,
 /area/tradeport/facility)
@@ -14182,6 +14180,10 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
+/obj/item/clothing/suit/space/emergency,
+/obj/item/clothing/suit/space/emergency,
+/obj/item/clothing/head/helmet/space/emergency,
+/obj/item/clothing/head/helmet/space/emergency,
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/sector/nebula_tradeport/engineering)
 "aLu" = (
@@ -14643,9 +14645,6 @@
 /obj/machinery/light{
 	light_range = 12
 	},
-/obj/structure/cable/orange{
-	icon_state = "5-10"
-	},
 /obj/effect/floor_decal/corner/green/border{
 	dir = 1
 	},
@@ -14807,6 +14806,9 @@
 /area/tradeport/cyndi)
 "aNh" = (
 /obj/effect/floor_decal/techfloor/orange,
+/obj/structure/cable/orange{
+	icon_state = "4-8"
+	},
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/sector/nebula_tradeport/dock2)
 "aNi" = (
@@ -14836,7 +14838,7 @@
 	dir = 1
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/green{
-	dir = 4
+	dir = 5
 	},
 /turf/simulated/floor/tiled/monodark,
 /area/shuttle/runabout)
@@ -15115,10 +15117,6 @@
 /turf/simulated/floor/tiled/old_tile/yellow,
 /area/tradeport/safari)
 "aNU" = (
-/obj/machinery/door/airlock/hatch{
-	name = "Tug Airtight Hatch";
-	req_one_access = list(173)
-	},
 /obj/machinery/door/blast/regular{
 	density = 0;
 	dir = 4;
@@ -15127,6 +15125,10 @@
 	name = "Tug hauler shuttle Airlock";
 	opacity = 0
 	},
+/obj/machinery/door/airlock/hatch{
+	name = "Tug Airtight Hatch";
+	req_one_access = null
+	},
 /turf/simulated/floor/tiled/monotechmaint,
 /area/shuttle/tug)
 "aNV" = (
@@ -15201,6 +15203,18 @@
 	dir = 8;
 	light_range = 12
 	},
+/obj/item/tank/jetpack/oxygen,
+/obj/item/tank/jetpack/oxygen,
+/obj/item/tank/jetpack/oxygen,
+/obj/item/tank/jetpack/oxygen,
+/obj/structure/table/rack/shelf/steel,
+/obj/item/tank/oxygen,
+/obj/item/tank/oxygen,
+/obj/item/tank/oxygen,
+/obj/item/tank/oxygen,
+/obj/item/tank/oxygen,
+/obj/item/tank/oxygen,
+/obj/item/tank/oxygen,
 /turf/simulated/floor/glass/reinforced,
 /area/sector/nebula_tradeport/engineering)
 "aOh" = (
@@ -15221,14 +15235,6 @@
 	},
 /turf/simulated/floor/tiled/red,
 /area/shuttle/trade_ship/general)
-"aOj" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/cable/orange{
-	icon_state = "4-8"
-	},
-/obj/effect/floor_decal/corner/green/border,
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/tradeport/commhall)
 "aOk" = (
 /obj/machinery/atmospherics/pipe/tank/air{
 	dir = 1
@@ -15498,11 +15504,11 @@
 	dir = 8
 	},
 /obj/structure/cable/orange{
-	icon_state = "1-4";
-	dir = 4
+	icon_state = "1-2"
 	},
 /obj/structure/cable/orange{
-	icon_state = "1-2"
+	icon_state = "1-4";
+	dir = 4
 	},
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/sector/nebula_tradeport/dock2)
@@ -15716,10 +15722,7 @@
 "aPK" = (
 /obj/spawner/window/low_wall/reinforced/full/firelocks,
 /obj/structure/cable/orange{
-	icon_state = "5-10"
-	},
-/obj/structure/cable/orange{
-	icon_state = "2-5"
+	icon_state = "1-2"
 	},
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/sector/nebula_tradeport/dock2)
@@ -16063,17 +16066,6 @@
 /obj/item/storage/box/glasses/meta,
 /turf/simulated/floor/tiled/old_tile/white,
 /area/shuttle/caravan)
-"aQL" = (
-/obj/effect/floor_decal/techfloor{
-	dir = 1
-	},
-/obj/effect/floor_decal/industrial/warning,
-/obj/structure/cable/orange{
-	icon_state = "5-8"
-	},
-/obj/effect/floor_decal/industrial/hatch/yellow,
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/sector/nebula_tradeport/dock2)
 "aQM" = (
 /obj/machinery/atmospherics/pipe/simple/hidden,
 /obj/structure/cable/yellow{
@@ -17600,11 +17592,10 @@
 /turf/simulated/floor/wood,
 /area/tradeport/commons)
 "aUE" = (
-/obj/structure/metal_edge,
 /obj/structure/railing/grey{
 	dir = 4
 	},
-/turf/simulated/floor/tiled/techfloor/monogrid,
+/turf/simulated/wall/r_wall,
 /area/sector/nebula_tradeport/dock2)
 "aUF" = (
 /obj/structure/cable/pink{
@@ -18415,8 +18406,8 @@
 	},
 /obj/fiftyspawner/glass,
 /obj/fiftyspawner/glass,
-/obj/item/stack/material/steel/full_stack,
-/obj/item/stack/material/steel/full_stack,
+/obj/fiftyspawner/steel,
+/obj/fiftyspawner/steel,
 /obj/structure/table/rack/steel,
 /obj/structure/window/reinforced{
 	dir = 8
@@ -18997,11 +18988,13 @@
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/tradeport/dock)
 "aYC" = (
-/obj/machinery/atmospherics/component/unary/vent_pump/on,
 /obj/structure/cable/green{
 	icon_state = "1-4"
 	},
 /obj/structure/bed/chair/bay/chair/padded/red/smallnest,
+/obj/machinery/atmospherics/valve{
+	dir = 4
+	},
 /turf/simulated/floor/tiled/monotechmaint,
 /area/shuttle/runabout)
 "aYD" = (
@@ -19581,7 +19574,7 @@
 	req_access = list(160)
 	},
 /turf/simulated/floor/tiled/techfloor,
-/area/shuttle/scoophead/main2)
+/area/shuttle/scoophead/main)
 "bcr" = (
 /obj/effect/floor_decal/corner/blue/border,
 /turf/simulated/floor/tiled/white,
@@ -19658,7 +19651,7 @@
 /area/sector/nebula_tradeport/motel)
 "bqy" = (
 /turf/simulated/wall/prepainted/exploration,
-/area/shuttle/scoophead/cockpit)
+/area/shuttle/scoophead/office)
 "bqF" = (
 /obj/effect/floor_decal/corner/red/border{
 	dir = 9
@@ -19670,7 +19663,7 @@
 	},
 /obj/item/material/knife/machete/armblade,
 /turf/simulated/floor/tiled/techfloor,
-/area/shuttle/scoophead/main2)
+/area/shuttle/scoophead/main)
 "brm" = (
 /obj/structure/table/marble,
 /obj/item/reagent_containers/food/snacks/crayonburger_rbw,
@@ -19727,7 +19720,7 @@
 	dir = 9
 	},
 /turf/simulated/floor/tiled/techfloor,
-/area/shuttle/scoophead/cockpit)
+/area/shuttle/scoophead/office)
 "btw" = (
 /obj/machinery/atmospherics/portables_connector{
 	dir = 1
@@ -19747,7 +19740,7 @@
 	icon_state = "4-8"
 	},
 /turf/simulated/floor/tiled/techfloor,
-/area/shuttle/scoophead/main2)
+/area/shuttle/scoophead/main)
 "bwj" = (
 /obj/structure/barricade,
 /turf/simulated/floor/wood,
@@ -19761,12 +19754,12 @@
 /area/sector/nebula_tradeport/motel/room2)
 "bAj" = (
 /obj/structure/railing/grey,
-/obj/machinery/atmospherics/pipe/simple/hidden/red{
-	dir = 4
-	},
 /obj/effect/floor_decal/techfloor{
 	dir = 1
 	},
+/obj/machinery/atmospherics/valve{
+	dir = 4
+	},
 /turf/simulated/floor/tiled/steel_dirty/dark,
 /area/shuttle/arrowhead)
 "bAO" = (
@@ -19869,7 +19862,7 @@
 	},
 /obj/machinery/light,
 /turf/simulated/floor/tiled/techfloor,
-/area/shuttle/scoophead/main2)
+/area/shuttle/scoophead/main)
 "bNF" = (
 /obj/effect/floor_decal/techfloor{
 	dir = 1
@@ -20236,7 +20229,7 @@
 	},
 /obj/structure/curtain/black,
 /turf/simulated/floor/tiled/techfloor,
-/area/shuttle/scoophead/main2)
+/area/shuttle/scoophead/main)
 "cQi" = (
 /obj/structure/bed/padded,
 /obj/structure/curtain/open/bed,
@@ -20437,7 +20430,7 @@
 	icon_state = "4-8"
 	},
 /turf/simulated/floor/plating,
-/area/shuttle/scoophead/main2)
+/area/shuttle/scoophead/main)
 "dqN" = (
 /obj/structure/reagent_dispensers/fueltank,
 /turf/simulated/floor/plating,
@@ -20492,7 +20485,7 @@
 	req_one_access = null
 	},
 /turf/simulated/floor/plating,
-/area/shuttle/scoophead/cockpit)
+/area/shuttle/scoophead/office)
 "dzE" = (
 /obj/structure/toilet{
 	dir = 4
@@ -20530,7 +20523,7 @@
 	id = "scoophead_room"
 	},
 /turf/simulated/floor/plating,
-/area/shuttle/scoophead/cockpit)
+/area/shuttle/scoophead/office)
 "dCd" = (
 /obj/effect/floor_decal/spline/fancy/wood{
 	dir = 9
@@ -20587,7 +20580,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/tiled/techfloor,
-/area/shuttle/scoophead/cockpit)
+/area/shuttle/scoophead/office)
 "dGF" = (
 /obj/spawner/window/low_wall/reinforced/full/firelocks,
 /obj/structure/curtain/black,
@@ -20676,6 +20669,18 @@
 /obj/effect/floor_decal/spline/fancy/wood,
 /turf/simulated/floor/wood,
 /area/sector/nebula_tradeport/motel/vip)
+"dRV" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 8
+	},
+/obj/effect/floor_decal/borderfloorblack{
+	dir = 8
+	},
+/obj/structure/cable/orange{
+	icon_state = "4-8"
+	},
+/turf/simulated/floor/tiled/techfloor/monogrid,
+/area/sector/nebula_tradeport/dock2)
 "dSv" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 8
@@ -20710,6 +20715,16 @@
 	},
 /turf/simulated/floor/tiled/steel_dirty/dark,
 /area/shuttle/arrowhead)
+"dWa" = (
+/obj/effect/floor_decal/techfloor,
+/obj/effect/floor_decal/corner/green/border{
+	dir = 1
+	},
+/obj/structure/cable/orange{
+	icon_state = "1-2"
+	},
+/turf/simulated/floor/tiled,
+/area/tradeport/commhall)
 "dXo" = (
 /obj/effect/floor_decal/spline/fancy/wood{
 	dir = 8
@@ -20992,7 +21007,7 @@
 	pixel_x = -32
 	},
 /turf/simulated/floor/carpet/patterened/blue,
-/area/shuttle/scoophead/cockpit)
+/area/shuttle/scoophead/office)
 "eEX" = (
 /obj/structure/simple_door/hardwood,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -21113,7 +21128,7 @@
 /obj/machinery/recharger,
 /obj/structure/curtain/black,
 /turf/simulated/floor/tiled/techfloor,
-/area/shuttle/scoophead/main2)
+/area/shuttle/scoophead/main)
 "eSp" = (
 /obj/structure/bed/chair/sofa/brown/right{
 	dir = 1
@@ -21307,7 +21322,7 @@
 	},
 /obj/machinery/power/apc/alarms_hidden/south_mount,
 /turf/simulated/floor/tiled/techfloor,
-/area/shuttle/scoophead/cockpit)
+/area/shuttle/scoophead/office)
 "fFF" = (
 /obj/structure/table/steel_reinforced,
 /obj/machinery/atmospherics/component/unary/vent_pump/on{
@@ -21358,6 +21373,25 @@
 /obj/machinery/shipsensors,
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/shuttle/arrowhead)
+"fNR" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 8
+	},
+/obj/effect/floor_decal/corner/green/border{
+	dir = 1
+	},
+/obj/structure/cable/orange{
+	icon_state = "4-8"
+	},
+/obj/structure/cable/orange{
+	icon_state = "1-4";
+	dir = 8
+	},
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/tradeport/commhall)
 "fOy" = (
 /obj/structure/table/bench/wooden,
 /turf/simulated/floor/carpet/patterened/blue,
@@ -21507,6 +21541,17 @@
 /obj/spawner/window/low_wall/reinforced/full/firelocks,
 /turf/simulated/floor/plating,
 /area/shuttle/scoophead/main)
+"gxH" = (
+/obj/structure/metal_edge,
+/obj/structure/railing/grey{
+	dir = 1
+	},
+/obj/effect/floor_decal/techfloor/orange,
+/obj/structure/cable/orange{
+	icon_state = "4-8"
+	},
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/sector/nebula_tradeport/dock2)
 "gzZ" = (
 /obj/structure/bed/chair/sofa/red{
 	dir = 4
@@ -22005,7 +22050,7 @@
 	icon_state = "4-8"
 	},
 /turf/simulated/floor/plating,
-/area/shuttle/scoophead/main2)
+/area/shuttle/scoophead/main)
 "hJt" = (
 /obj/effect/debris/cleanable/generic,
 /turf/simulated/floor/tiled/steel,
@@ -22046,7 +22091,7 @@
 	},
 /obj/machinery/suit_storage_unit/syndicate,
 /turf/simulated/floor/tiled/techfloor,
-/area/shuttle/scoophead/main2)
+/area/shuttle/scoophead/main)
 "hQo" = (
 /obj/effect/floor_decal/spline/fancy{
 	dir = 10
@@ -22097,7 +22142,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/tiled/techfloor,
-/area/shuttle/scoophead/main2)
+/area/shuttle/scoophead/main)
 "hTW" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -22131,7 +22176,7 @@
 	icon_state = "2-4"
 	},
 /turf/simulated/floor/tiled/techfloor,
-/area/shuttle/scoophead/main2)
+/area/shuttle/scoophead/main)
 "hZT" = (
 /obj/machinery/light{
 	dir = 1
@@ -22458,7 +22503,7 @@
 /obj/structure/curtain/open/shower,
 /obj/structure/simple_door/wood,
 /turf/simulated/floor/tiled/neutral,
-/area/shuttle/scoophead/cockpit)
+/area/shuttle/scoophead/office)
 "jdu" = (
 /obj/machinery/washing_machine,
 /obj/item/storage/laundry_basket{
@@ -22548,7 +22593,7 @@
 	},
 /obj/spawner/window/low_wall/reinforced/full/firelocks,
 /turf/simulated/floor/plating,
-/area/shuttle/scoophead/cockpit)
+/area/shuttle/scoophead/office)
 "juq" = (
 /obj/effect/debris/cleanable/dirt,
 /turf/simulated/floor/tiled/old_tile/blue,
@@ -22727,7 +22772,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/tiled/techfloor,
-/area/shuttle/scoophead/cockpit)
+/area/shuttle/scoophead/office)
 "jQe" = (
 /obj/machinery/computer/ship/helm{
 	dir = 1
@@ -22903,18 +22948,6 @@
 "kjD" = (
 /obj/structure/table/hardwoodtable,
 /obj/effect/floor_decal/spline/fancy/wood,
-/obj/item/paper{
-	info = "WELCOME TO THE NEBULA MOTEL \ TO BUY A PASS, SEEK M4RIA, AT BEHIND THE COUNTER. \ \ We have 9 rooms. \ Room 1 to 4 have a small kitchen, and washing room. \  Room 1 and 4 have 1 Double bed. \ 2 has 1 single bed \ 3 have 2 single beds. \ Those rooms are 30 Thrallers the 3 to 5 hours. \ \ Room 5 to 8 have no kitchen, and washing room. \ Room 6 and 8 have 1 Double bed. \ 5 has 1 single bed \ 7 have 2 single beds. \ Those rooms are 15 Thrallers the 3 to 5 hours. \ \  Room 9 is our VIP Suite. This suite has 2 bed rooms, 1 office, 1 fully equipped kitchen, 1 washroom, 1 laundry room, And its own shuttle call the Arrowhead, used by ex Tajaran racer Cheuk'Yager. the suite is 80 Thrallers the 3 to 5 hours. \ \ The Sauna is free to use. The public laundry machine and public bathroom are free to use. Guest pass are available if the rooms are shared.";
-	name = "Nebula Motel"
-	},
-/obj/item/paper{
-	info = "WELCOME TO THE NEBULA MOTEL \ TO BUY A PASS, SEEK M4RIA, AT BEHIND THE COUNTER. \ \ We have 9 rooms. \ Room 1 to 4 have a small kitchen, and washing room. \  Room 1 and 4 have 1 Double bed. \ 2 has 1 single bed \ 3 have 2 single beds. \ Those rooms are 30 Thrallers the 3 to 5 hours. \ \ Room 5 to 8 have no kitchen, and washing room. \ Room 6 and 8 have 1 Double bed. \ 5 has 1 single bed \ 7 have 2 single beds. \ Those rooms are 15 Thrallers the 3 to 5 hours. \ \  Room 9 is our VIP Suite. This suite has 2 bed rooms, 1 office, 1 fully equipped kitchen, 1 washroom, 1 laundry room, And its own shuttle call the Arrowhead, used by ex Tajaran racer Cheuk'Yager. the suite is 80 Thrallers the 3 to 5 hours. \ \ The Sauna is free to use. The public laundry machine and public bathroom are free to use. Guest pass are available if the rooms are shared.";
-	name = "Nebula Motel"
-	},
-/obj/item/paper{
-	info = "WELCOME TO THE NEBULA MOTEL \ TO BUY A PASS, SEEK M4RIA, AT BEHIND THE COUNTER. \ \ We have 9 rooms. \ Room 1 to 4 have a small kitchen, and washing room. \  Room 1 and 4 have 1 Double bed. \ 2 has 1 single bed \ 3 have 2 single beds. \ Those rooms are 30 Thrallers the 3 to 5 hours. \ \ Room 5 to 8 have no kitchen, and washing room. \ Room 6 and 8 have 1 Double bed. \ 5 has 1 single bed \ 7 have 2 single beds. \ Those rooms are 15 Thrallers the 3 to 5 hours. \ \  Room 9 is our VIP Suite. This suite has 2 bed rooms, 1 office, 1 fully equipped kitchen, 1 washroom, 1 laundry room, And its own shuttle call the Arrowhead, used by ex Tajaran racer Cheuk'Yager. the suite is 80 Thrallers the 3 to 5 hours. \ \ The Sauna is free to use. The public laundry machine and public bathroom are free to use. Guest pass are available if the rooms are shared.";
-	name = "Nebula Motel"
-	},
 /turf/simulated/floor/carpet/turcarpet,
 /area/sector/nebula_tradeport/motel)
 "koU" = (
@@ -23290,9 +23323,6 @@
 /obj/map_helper/access_helper/airlock/station/external_airlock,
 /turf/simulated/floor/tiled/dark,
 /area/tradeport/facility)
-"lmT" = (
-/turf/simulated/wall/prepainted/command,
-/area/shuttle/scoophead/main2)
 "lnx" = (
 /obj/structure/cable/yellow{
 	icon_state = "2-4"
@@ -23329,7 +23359,7 @@
 /area/sector/nebula_tradeport/motel)
 "luK" = (
 /turf/simulated/floor/wood,
-/area/shuttle/scoophead/cockpit)
+/area/shuttle/scoophead/office)
 "luQ" = (
 /obj/spawner/window/low_wall/reinforced/full/firelocks,
 /obj/structure/curtain/open/black,
@@ -23413,6 +23443,13 @@
 /obj/effect/floor_decal/rust,
 /turf/simulated/floor/plating,
 /area/tradeport/commons)
+"lHW" = (
+/obj/machinery/power/apc/alarms_hidden/north_mount,
+/obj/structure/cable/orange{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/techfloor/monogrid,
+/area/sector/nebula_tradeport/dock2)
 "lIN" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -23563,29 +23600,11 @@
 	},
 /turf/simulated/floor/tiled/old_tile/blue,
 /area/tradeport/cafeteria)
-"mcB" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden/cyan{
-	dir = 1
-	},
-/obj/structure/cable/pink{
-	icon_state = "4-8"
-	},
-/obj/structure/cable/pink{
-	icon_state = "2-4"
-	},
-/turf/simulated/floor/carpet/patterened/red,
-/area/shuttle/scoophead/office)
 "mdG" = (
 /obj/structure/bed/double/padded,
 /obj/item/bedsheet/captaindouble,
 /turf/simulated/floor/carpet/patterened/blue/alt,
 /area/sector/nebula_tradeport/motel/vip)
-"mdQ" = (
-/obj/structure/cable/pink{
-	icon_state = "4-8"
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/shuttle/scoophead/main2)
 "meD" = (
 /obj/machinery/computer/arcade/orion_trail,
 /obj/effect/floor_decal/spline/plain{
@@ -23788,7 +23807,7 @@
 	icon_state = "4-8"
 	},
 /turf/simulated/floor/tiled/techfloor,
-/area/shuttle/scoophead/main2)
+/area/shuttle/scoophead/main)
 "mCV" = (
 /obj/structure/table/glass,
 /obj/item/reagent_containers/food/snacks/cheesyfries,
@@ -23860,7 +23879,7 @@
 /area/shuttle/arrowhead)
 "mLx" = (
 /turf/simulated/wall/prepainted/command,
-/area/shuttle/scoophead/cockpit)
+/area/shuttle/scoophead/office)
 "mMt" = (
 /obj/effect/shuttle_landmark/triumph/trade/arrowhead,
 /obj/overmap/entity/visitable/ship/landable/trade/arrowhead,
@@ -24011,7 +24030,7 @@
 	icon_state = "4-8"
 	},
 /turf/simulated/floor/tiled/techfloor,
-/area/shuttle/scoophead/cockpit)
+/area/shuttle/scoophead/office)
 "nkf" = (
 /obj/machinery/atmospherics/pipe/tank/air{
 	dir = 8
@@ -24229,7 +24248,7 @@
 /obj/item/hand_labeler,
 /obj/structure/curtain/black,
 /turf/simulated/floor/tiled/techfloor,
-/area/shuttle/scoophead/main2)
+/area/shuttle/scoophead/main)
 "nZW" = (
 /obj/structure/table/bench/wooden,
 /obj/machinery/air_alarm/alarms_hidden{
@@ -24294,11 +24313,8 @@
 /obj/structure/cable/pink{
 	icon_state = "1-8"
 	},
-/obj/structure/cable/pink{
-	icon_state = "1-2"
-	},
 /turf/simulated/floor/tiled/techfloor,
-/area/shuttle/scoophead/main2)
+/area/shuttle/scoophead/main)
 "omb" = (
 /obj/machinery/door/firedoor/glass{
 	dir = 8
@@ -24564,7 +24580,7 @@
 	id = "scoophead_room"
 	},
 /turf/simulated/floor/wood,
-/area/shuttle/scoophead/cockpit)
+/area/shuttle/scoophead/office)
 "pfv" = (
 /obj/structure/cable/yellow{
 	icon_state = "0-8"
@@ -24757,10 +24773,6 @@
 /obj/structure/curtain/open/black,
 /turf/simulated/floor/carpet/patterened/blue/alt,
 /area/sector/nebula_tradeport/motel/vip)
-"pPt" = (
-/obj/spawner/window/low_wall/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/shuttle/scoophead/main2)
 "pRx" = (
 /obj/structure/closet/secure_closet/freezer/fridge,
 /obj/item/reagent_containers/food/snacks/meat,
@@ -24798,9 +24810,9 @@
 /obj/effect/floor_decal/techfloor{
 	dir = 5
 	},
-/obj/structure/closet/crate/mimic/safe,
 /obj/item/clothing/under/tajaran/pra_uniform,
 /obj/item/clothing/under/tajaran/nka_uniform/sailor,
+/obj/structure/closet/crate/plastic,
 /turf/simulated/floor/tiled/monotechmaint,
 /area/tradeport/spine)
 "qdi" = (
@@ -25222,7 +25234,7 @@
 /obj/structure/bed/pod,
 /obj/item/bedsheet/brown,
 /turf/simulated/floor/carpet/patterened/blue,
-/area/shuttle/scoophead/cockpit)
+/area/shuttle/scoophead/office)
 "rch" = (
 /obj/structure/closet/crate/bin{
 	anchored = 1
@@ -25274,10 +25286,8 @@
 /obj/effect/floor_decal/corner/red/border{
 	dir = 6
 	},
-/obj/machinery/power/apc/hyper/west_mount,
-/obj/structure/cable/pink,
 /turf/simulated/floor/tiled/techfloor,
-/area/shuttle/scoophead/main2)
+/area/shuttle/scoophead/main)
 "rpe" = (
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
@@ -25304,7 +25314,7 @@
 	},
 /obj/structure/curtain/black,
 /turf/simulated/floor/tiled/techfloor,
-/area/shuttle/scoophead/main2)
+/area/shuttle/scoophead/main)
 "rtl" = (
 /obj/structure/sign/directions/roomnum{
 	dir = 8
@@ -25448,7 +25458,7 @@
 	pixel_x = 24
 	},
 /turf/simulated/floor/tiled/techfloor,
-/area/shuttle/scoophead/main2)
+/area/shuttle/scoophead/main)
 "rRx" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/wood,
@@ -25498,7 +25508,7 @@
 	icon_state = "4-8"
 	},
 /turf/simulated/floor/plating,
-/area/shuttle/scoophead/cockpit)
+/area/shuttle/scoophead/office)
 "rYV" = (
 /obj/machinery/light,
 /obj/structure/flora/pottedplant/drooping,
@@ -25590,7 +25600,6 @@
 /turf/simulated/floor/wood,
 /area/sector/nebula_tradeport/motel/room3)
 "svz" = (
-/obj/structure/catwalk,
 /obj/machinery/atmospherics/pipe/simple/hidden/cyan{
 	dir = 4
 	},
@@ -25644,7 +25653,7 @@
 	dir = 1
 	},
 /turf/simulated/floor/tiled/techfloor,
-/area/shuttle/scoophead/main2)
+/area/shuttle/scoophead/main)
 "sDd" = (
 /obj/structure/inflatable,
 /turf/simulated/floor/tiled/old_tile/yellow,
@@ -25837,7 +25846,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/tiled/techfloor,
-/area/shuttle/scoophead/main2)
+/area/shuttle/scoophead/main)
 "tjw" = (
 /obj/machinery/door/firedoor{
 	req_one_access = list(160)
@@ -25960,7 +25969,7 @@
 /obj/item/storage/single_use/mre/random,
 /obj/item/storage/single_use/mre/random,
 /turf/simulated/floor/carpet/patterened/blue,
-/area/shuttle/scoophead/cockpit)
+/area/shuttle/scoophead/office)
 "tBI" = (
 /obj/structure/closet/secure_closet/personal,
 /obj/item/storage/box/glasses/meta,
@@ -26012,9 +26021,6 @@
 "tFV" = (
 /turf/simulated/wall/r_wall,
 /area/sector/nebula_tradeport/motel)
-"tHv" = (
-/turf/simulated/wall/prepainted/exploration,
-/area/shuttle/scoophead/main2)
 "tHJ" = (
 /obj/machinery/light/small,
 /obj/structure/cable/yellow{
@@ -26133,6 +26139,17 @@
 /obj/machinery/vending/coffee,
 /turf/simulated/floor/wood,
 /area/tradeport/commons)
+"ugx" = (
+/obj/structure/metal_edge,
+/obj/structure/railing/grey{
+	dir = 1
+	},
+/obj/effect/floor_decal/techfloor/orange,
+/obj/structure/cable/orange{
+	icon_state = "1-4"
+	},
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/sector/nebula_tradeport/dock2)
 "ugZ" = (
 /obj/item/stool/padded,
 /obj/structure/cable/yellow{
@@ -26177,7 +26194,7 @@
 	gps_tag = "SCOOP"
 	},
 /turf/simulated/floor/tiled/techfloor,
-/area/shuttle/scoophead/cockpit)
+/area/shuttle/scoophead/office)
 "umU" = (
 /obj/effect/floor_decal/spline/fancy/wood{
 	dir = 10
@@ -26220,7 +26237,7 @@
 	dir = 4
 	},
 /turf/simulated/wall/prepainted/command,
-/area/shuttle/scoophead/cockpit)
+/area/shuttle/scoophead/office)
 "uuk" = (
 /obj/structure/noticeboard{
 	pixel_y = 29
@@ -26422,7 +26439,7 @@
 	dir = 1
 	},
 /turf/simulated/floor/tiled/techfloor,
-/area/shuttle/scoophead/main2)
+/area/shuttle/scoophead/main)
 "uXV" = (
 /obj/effect/floor_decal/techfloor{
 	dir = 9
@@ -26458,7 +26475,7 @@
 	pixel_x = 32
 	},
 /turf/simulated/floor/wood,
-/area/shuttle/scoophead/cockpit)
+/area/shuttle/scoophead/office)
 "vff" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -26596,8 +26613,8 @@
 /obj/effect/floor_decal/techfloor{
 	dir = 1
 	},
-/obj/structure/closet/crate/secure/corporate/saare,
 /obj/item/clothing/head/helmet/tajaran,
+/obj/structure/closet/crate/secure,
 /turf/simulated/floor/tiled/monotechmaint,
 /area/tradeport/spine)
 "vDS" = (
@@ -26727,6 +26744,12 @@
 /obj/machinery/power/apc/alarms_hidden/north_mount,
 /turf/simulated/floor/airless,
 /area/sector/nebula_tradeport/motel)
+"weC" = (
+/obj/structure/cable/orange{
+	icon_state = "1-2"
+	},
+/turf/simulated/floor/reinforced,
+/area/sector/nebula_tradeport/dock2)
 "wgI" = (
 /obj/structure/cable/orange{
 	icon_state = "1-2"
@@ -26741,17 +26764,12 @@
 /obj/machinery/light{
 	dir = 4
 	},
-/obj/structure/cable/pink{
-	icon_state = "0-8";
-	dir = 8
-	},
-/obj/machinery/power/apc/alarms_hidden/east_mount,
 /turf/simulated/floor/carpet/patterened/red,
 /area/shuttle/scoophead/office)
 "wlu" = (
 /obj/machinery/shipsensors,
 /turf/simulated/floor/plating,
-/area/shuttle/scoophead/main2)
+/area/shuttle/scoophead/main)
 "wmD" = (
 /obj/structure/sink/kitchen{
 	dir = 4;
@@ -26799,7 +26817,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/tiled/neutral,
-/area/shuttle/scoophead/cockpit)
+/area/shuttle/scoophead/office)
 "wqt" = (
 /obj/structure/shuttle/engine/heater{
 	dir = 4
@@ -27009,7 +27027,7 @@
 "wSZ" = (
 /obj/spawner/window/low_wall/reinforced/full/firelocks,
 /turf/simulated/floor/plating,
-/area/shuttle/scoophead/cockpit)
+/area/shuttle/scoophead/office)
 "wUd" = (
 /obj/structure/bed/padded,
 /turf/simulated/floor/carpet/patterened/blue,
@@ -27224,13 +27242,13 @@
 	},
 /obj/machinery/computer/shuttle_control/explore/trade/scoophead,
 /turf/simulated/floor/tiled/techfloor,
-/area/shuttle/scoophead/cockpit)
+/area/shuttle/scoophead/office)
 "xvE" = (
 /obj/structure/bed/chair/shuttle{
 	dir = 8
 	},
 /turf/simulated/floor/tiled/techfloor,
-/area/shuttle/scoophead/cockpit)
+/area/shuttle/scoophead/office)
 "xwL" = (
 /obj/effect/floor_decal/spline/fancy/wood{
 	dir = 4
@@ -36460,7 +36478,7 @@ aAl
 aIG
 azA
 aNF
-auk
+aza
 atJ
 aXB
 arH
@@ -36836,11 +36854,11 @@ jlU
 abr
 aby
 awO
-adj
+aYp
 aVm
 aoN
 apv
-aQL
+aWO
 aPj
 aNB
 aIW
@@ -37030,10 +37048,10 @@ hGc
 abr
 awu
 aCZ
-aOj
+akM
 aWb
 aoN
-akY
+apv
 aeh
 aEd
 aEd
@@ -37223,9 +37241,9 @@ cXs
 koU
 aFw
 aDJ
-awO
+fNR
 adj
-aVm
+dWa
 aPK
 afA
 azJ
@@ -37418,11 +37436,11 @@ cWD
 aFw
 aCP
 awO
-adj
+aYp
 aMJ
 atf
 aUE
-azI
+lHW
 azI
 aHl
 ayN
@@ -37612,7 +37630,7 @@ bEl
 aIe
 aKB
 aJh
-aEs
+aYp
 aVm
 aoN
 aWH
@@ -37805,7 +37823,7 @@ wpW
 bnC
 aaB
 aby
-afM
+aCQ
 aYp
 aVm
 aoN
@@ -38008,7 +38026,7 @@ aHw
 aCo
 aHl
 aEd
-aHi
+aBm
 axn
 anT
 aBm
@@ -38788,8 +38806,8 @@ auK
 add
 aNu
 aCY
-aEd
-aHv
+weC
+ugx
 atV
 acr
 acr
@@ -39177,7 +39195,7 @@ aOt
 aEd
 aEd
 ayN
-aHv
+gxH
 atV
 aEd
 aak
@@ -40535,7 +40553,7 @@ atP
 arA
 afX
 aTi
-aTE
+dRV
 aOq
 aOq
 aOq
@@ -55387,7 +55405,7 @@ aDh
 aDh
 ygc
 brN
-mcB
+bEV
 whD
 joQ
 fhh
@@ -55579,11 +55597,11 @@ aDh
 aDh
 aDh
 wlu
-tHv
-lmT
+kJj
+yfg
 hIZ
-lmT
-lmT
+yfg
+yfg
 yfg
 kJj
 iRS
@@ -55772,8 +55790,8 @@ aDh
 aDh
 aDh
 aDh
-pPt
-pPt
+gsa
+gsa
 hVq
 olr
 rnU
@@ -55966,12 +55984,12 @@ aDh
 aDh
 aDh
 aDh
-tHv
+kJj
 bqF
 buw
 bJN
-lmT
-lmT
+yfg
+yfg
 hHX
 csb
 xAd
@@ -56160,9 +56178,9 @@ aDh
 aDh
 aDh
 aDh
-tHv
+kJj
 uWr
-mdQ
+nAQ
 tjk
 bcm
 eRa
@@ -56354,12 +56372,12 @@ aDh
 aDh
 aDh
 aDh
-tHv
+kJj
 hPk
 mBj
 sCj
 hTV
-lmT
+yfg
 svz
 gXc
 kJj
@@ -56548,8 +56566,8 @@ aDh
 aDh
 aDh
 aDh
-tHv
-lmT
+kJj
+yfg
 dpO
 cMr
 nZt
diff --git a/maps/sectors/piratebase_192/levels/piratebase_192.dmm b/maps/sectors/piratebase_192/levels/piratebase_192.dmm
index fa9b1b37681c..022055adef19 100644
--- a/maps/sectors/piratebase_192/levels/piratebase_192.dmm
+++ b/maps/sectors/piratebase_192/levels/piratebase_192.dmm
@@ -1186,7 +1186,7 @@
 "kX" = (
 /obj/structure/table/steel_reinforced,
 /obj/fiftyspawner/glass,
-/obj/item/stack/material/steel/full_stack,
+/obj/fiftyspawner/steel,
 /obj/machinery/atmospherics/component/unary/vent_pump/on{
 	dir = 1
 	},
@@ -4030,8 +4030,8 @@
 /obj/structure/table/steel_reinforced,
 /obj/fiftyspawner/glass,
 /obj/fiftyspawner/glass,
-/obj/item/stack/material/steel/full_stack,
-/obj/item/stack/material/steel/full_stack,
+/obj/fiftyspawner/steel,
+/obj/fiftyspawner/steel,
 /turf/simulated/floor/tiled/steel_dirty,
 /area/piratebase/sickbay)
 "JQ" = (
diff --git a/maps/submaps/level_specific/class_d/matdropD.dmm b/maps/submaps/level_specific/class_d/matdropD.dmm
index f0f9302a379d..d84c56153736 100644
--- a/maps/submaps/level_specific/class_d/matdropD.dmm
+++ b/maps/submaps/level_specific/class_d/matdropD.dmm
@@ -101,9 +101,9 @@
 /area/class_d/POIs/landing_pad)
 "B" = (
 /obj/structure/closet/crate,
-/obj/item/stack/material/steel/full_stack,
-/obj/item/stack/material/steel/full_stack,
-/obj/item/stack/material/steel/full_stack,
+/obj/fiftyspawner/steel,
+/obj/fiftyspawner/steel,
+/obj/fiftyspawner/steel,
 /turf/simulated/floor/tiled,
 /area/class_d/POIs/landing_pad)
 "D" = (
diff --git a/maps/submaps/level_specific/virgo2/Lab1.dmm b/maps/submaps/level_specific/virgo2/Lab1.dmm
index 365b2e050056..dda75b8bbdd6 100644
--- a/maps/submaps/level_specific/virgo2/Lab1.dmm
+++ b/maps/submaps/level_specific/virgo2/Lab1.dmm
@@ -173,7 +173,7 @@
 /area/submap/virgo2/Lab1)
 "D" = (
 /obj/structure/table/standard,
-/obj/item/stack/material/steel/full_stack,
+/obj/fiftyspawner/steel,
 /obj/fiftyspawner/glass,
 /turf/simulated/floor/tiled/steel_dirty,
 /area/submap/virgo2/Lab1)
diff --git a/maps/submaps/lythios_rift/caves/west_caves_buriedstructure_1.dmm b/maps/submaps/lythios_rift/caves/west_caves_buriedstructure_1.dmm
index 28e6bae99f51..74012cbd5a12 100644
--- a/maps/submaps/lythios_rift/caves/west_caves_buriedstructure_1.dmm
+++ b/maps/submaps/lythios_rift/caves/west_caves_buriedstructure_1.dmm
@@ -293,7 +293,7 @@
 "KO" = (
 /obj/structure/table/rack,
 /obj/fiftyspawner/rods,
-/obj/item/stack/material/steel/full_stack,
+/obj/fiftyspawner/steel,
 /obj/fiftyspawner/glass,
 /turf/simulated/floor/tiled/lythios43c,
 /area/submap/lythios/west_caves/buried_structure)
diff --git a/maps/submaps/lythios_rift/caves/west_caves_buriedstructure_2.dmm b/maps/submaps/lythios_rift/caves/west_caves_buriedstructure_2.dmm
index a18da0b5b5e7..1480d0f9c3db 100644
--- a/maps/submaps/lythios_rift/caves/west_caves_buriedstructure_2.dmm
+++ b/maps/submaps/lythios_rift/caves/west_caves_buriedstructure_2.dmm
@@ -9,7 +9,7 @@
 "g" = (
 /obj/structure/table/rack/shelf/steel,
 /obj/fiftyspawner/glass,
-/obj/item/stack/material/steel/full_stack,
+/obj/fiftyspawner/steel,
 /obj/fiftyspawner/rods,
 /turf/simulated/floor/lythios43c/indoors,
 /area/submap/lythios/west_caves/buried_structure)
diff --git a/maps/submaps/mountains/Rockb1.dmm b/maps/submaps/mountains/Rockb1.dmm
index 8684eaae3ade..1022c3c82369 100644
--- a/maps/submaps/mountains/Rockb1.dmm
+++ b/maps/submaps/mountains/Rockb1.dmm
@@ -195,7 +195,7 @@
 "L" = (
 /obj/structure/table/standard,
 /obj/fiftyspawner/glass,
-/obj/item/stack/material/steel/full_stack,
+/obj/fiftyspawner/steel,
 /turf/simulated/floor/tiled,
 /area/submap/Rockb1)
 "M" = (
diff --git a/maps/submaps/wilderness/Lab1.dmm b/maps/submaps/wilderness/Lab1.dmm
index 376528df7244..870939b8223c 100644
--- a/maps/submaps/wilderness/Lab1.dmm
+++ b/maps/submaps/wilderness/Lab1.dmm
@@ -176,7 +176,7 @@
 /area/submap/Lab1)
 "E" = (
 /obj/structure/table/standard,
-/obj/item/stack/material/steel/full_stack,
+/obj/fiftyspawner/steel,
 /obj/fiftyspawner/glass,
 /turf/simulated/floor/tiled/steel_dirty,
 /area/submap/Lab1)
diff --git a/maps/templates/admin/ert.dmm b/maps/templates/admin/ert.dmm
index cac325d782c8..557e41dbcba6 100644
--- a/maps/templates/admin/ert.dmm
+++ b/maps/templates/admin/ert.dmm
@@ -3446,10 +3446,10 @@
 /obj/fiftyspawner/glass,
 /obj/fiftyspawner/glass,
 /obj/fiftyspawner/glass,
-/obj/item/stack/material/steel/full_stack,
-/obj/item/stack/material/steel/full_stack,
-/obj/item/stack/material/steel/full_stack,
-/obj/item/stack/material/steel/full_stack,
+/obj/fiftyspawner/steel,
+/obj/fiftyspawner/steel,
+/obj/fiftyspawner/steel,
+/obj/fiftyspawner/steel,
 /obj/fiftyspawner/plasteel,
 /obj/fiftyspawner/plasteel,
 /obj/fiftyspawner/plasteel,
diff --git a/maps/templates/admin/ert_base.dmm b/maps/templates/admin/ert_base.dmm
index cfbc752d3575..b82c3d08903c 100644
--- a/maps/templates/admin/ert_base.dmm
+++ b/maps/templates/admin/ert_base.dmm
@@ -1567,10 +1567,10 @@
 /obj/fiftyspawner/glass,
 /obj/fiftyspawner/glass,
 /obj/fiftyspawner/glass,
-/obj/item/stack/material/steel/full_stack,
-/obj/item/stack/material/steel/full_stack,
-/obj/item/stack/material/steel/full_stack,
-/obj/item/stack/material/steel/full_stack,
+/obj/fiftyspawner/steel,
+/obj/fiftyspawner/steel,
+/obj/fiftyspawner/steel,
+/obj/fiftyspawner/steel,
 /obj/fiftyspawner/plasteel,
 /obj/fiftyspawner/plasteel,
 /obj/fiftyspawner/plasteel,
diff --git a/maps/templates/admin/shipcave.dmm b/maps/templates/admin/shipcave.dmm
index dbeaf6d5b21c..33d8093c8fc2 100644
--- a/maps/templates/admin/shipcave.dmm
+++ b/maps/templates/admin/shipcave.dmm
@@ -3470,9 +3470,9 @@
 /area/awaymission/shipcave/ship)
 "IU" = (
 /obj/structure/table/reinforced,
-/obj/item/stack/material/steel/full_stack,
-/obj/item/stack/material/steel/full_stack,
-/obj/item/stack/material/steel/full_stack,
+/obj/fiftyspawner/steel,
+/obj/fiftyspawner/steel,
+/obj/fiftyspawner/steel,
 /turf/simulated/floor/tiled/steel_dirty,
 /area/awaymission/shipcave)
 "IZ" = (
diff --git a/maps/templates/shuttles/overmaps/generic/bearcat.dmm b/maps/templates/shuttles/overmaps/generic/bearcat.dmm
index b0c7003a8062..a33ea06dbd5f 100644
--- a/maps/templates/shuttles/overmaps/generic/bearcat.dmm
+++ b/maps/templates/shuttles/overmaps/generic/bearcat.dmm
@@ -328,7 +328,7 @@
 	icon_state = "0-8"
 	},
 /obj/machinery/power/apc/alarms_hidden/east_mount{
-
+	
 	},
 /turf/simulated/floor/wood,
 /area/shuttle/bearcat/command_captain)
@@ -1927,7 +1927,7 @@
 	dir = 8
 	},
 /obj/structure/table/standard,
-/obj/item/stack/material/steel/full_stack,
+/obj/fiftyspawner/steel,
 /obj/fiftyspawner/rods,
 /obj/fiftyspawner/rglass,
 /obj/item/radio/intercom{
diff --git a/maps/templates/shuttles/overmaps/generic/cruiser.dmm b/maps/templates/shuttles/overmaps/generic/cruiser.dmm
index ffe331b7013a..edee389cfccd 100644
--- a/maps/templates/shuttles/overmaps/generic/cruiser.dmm
+++ b/maps/templates/shuttles/overmaps/generic/cruiser.dmm
@@ -1002,9 +1002,9 @@
 /area/mothership/eva)
 "cB" = (
 /obj/structure/table/steel_reinforced,
-/obj/item/stack/material/steel/full_stack,
-/obj/item/stack/material/steel/full_stack,
-/obj/item/stack/material/steel/full_stack,
+/obj/fiftyspawner/steel,
+/obj/fiftyspawner/steel,
+/obj/fiftyspawner/steel,
 /obj/machinery/air_alarm{
 	pixel_y = 22
 	},
@@ -5732,10 +5732,10 @@
 /obj/fiftyspawner/plastic,
 /obj/fiftyspawner/osmium,
 /obj/fiftyspawner/silver,
-/obj/item/stack/material/steel/full_stack,
-/obj/item/stack/material/steel/full_stack,
-/obj/item/stack/material/steel/full_stack,
-/obj/item/stack/material/steel/full_stack,
+/obj/fiftyspawner/steel,
+/obj/fiftyspawner/steel,
+/obj/fiftyspawner/steel,
+/obj/fiftyspawner/steel,
 /obj/fiftyspawner/uranium,
 /obj/fiftyspawner/glass,
 /obj/fiftyspawner/glass,
diff --git a/maps/templates/shuttles/overmaps/generic/curashuttle.dmm b/maps/templates/shuttles/overmaps/generic/curashuttle.dmm
index 7641a383e08e..c24e478d98a0 100644
--- a/maps/templates/shuttles/overmaps/generic/curashuttle.dmm
+++ b/maps/templates/shuttles/overmaps/generic/curashuttle.dmm
@@ -484,7 +484,7 @@
 	dir = 6
 	},
 /obj/structure/table/standard,
-/obj/item/stack/material/steel/full_stack,
+/obj/fiftyspawner/steel,
 /obj/item/storage/toolbox/syndicate/powertools,
 /obj/item/stack/nanopaste/advanced,
 /obj/item/stack/cable_coil,
diff --git a/maps/templates/shuttles/overmaps/generic/generic_shuttle.dmm b/maps/templates/shuttles/overmaps/generic/generic_shuttle.dmm
index d9efdfecdfbd..e8259afbd4f8 100644
--- a/maps/templates/shuttles/overmaps/generic/generic_shuttle.dmm
+++ b/maps/templates/shuttles/overmaps/generic/generic_shuttle.dmm
@@ -672,7 +672,7 @@
 	},
 /obj/structure/table/standard,
 /obj/item/storage/toolbox/mechanical,
-/obj/item/stack/material/steel/full_stack,
+/obj/fiftyspawner/steel,
 /turf/simulated/floor/plating,
 /area/shuttle/generic_shuttle/eng)
 "bw" = (
diff --git a/maps/templates/shuttles/overmaps/generic/ghostship.dmm b/maps/templates/shuttles/overmaps/generic/ghostship.dmm
index 13bd7dcfb562..27d1147df9e6 100644
--- a/maps/templates/shuttles/overmaps/generic/ghostship.dmm
+++ b/maps/templates/shuttles/overmaps/generic/ghostship.dmm
@@ -6627,7 +6627,7 @@
 "pm" = (
 /obj/structure/table/steel_reinforced,
 /obj/fiftyspawner/glass,
-/obj/item/stack/material/steel/full_stack,
+/obj/fiftyspawner/steel,
 /obj/effect/floor_decal/borderfloorblack{
 	dir = 8
 	},
diff --git a/maps/templates/shuttles/overmaps/generic/itglight.dmm b/maps/templates/shuttles/overmaps/generic/itglight.dmm
index 66537c113bd9..1388889c0fa2 100644
--- a/maps/templates/shuttles/overmaps/generic/itglight.dmm
+++ b/maps/templates/shuttles/overmaps/generic/itglight.dmm
@@ -2426,10 +2426,10 @@
 /area/itglight/metingroom)
 "qR" = (
 /obj/structure/table/rack/shelf/steel,
-/obj/item/stack/material/steel/full_stack,
-/obj/item/stack/material/steel/full_stack,
-/obj/item/stack/material/steel/full_stack/hull,
-/obj/item/stack/material/steel/full_stack/hull,
+/obj/fiftyspawner/steel,
+/obj/fiftyspawner/steel,
+/obj/fiftyspawner/steel/hull,
+/obj/fiftyspawner/steel/hull,
 /obj/fiftyspawner/rglass,
 /obj/fiftyspawner/rglass,
 /obj/fiftyspawner/glass,
diff --git a/maps/templates/shuttles/overmaps/generic/mercship.dmm b/maps/templates/shuttles/overmaps/generic/mercship.dmm
index 741be1784323..8a7baa5bf378 100644
--- a/maps/templates/shuttles/overmaps/generic/mercship.dmm
+++ b/maps/templates/shuttles/overmaps/generic/mercship.dmm
@@ -1492,7 +1492,7 @@
 /area/ship/mercenary/engineeringcntrl)
 "dq" = (
 /obj/structure/table/reinforced,
-/obj/item/stack/material/steel/full_stack,
+/obj/fiftyspawner/steel,
 /obj/fiftyspawner/glass,
 /obj/effect/floor_decal/borderfloorblack{
 	dir = 1
diff --git a/maps/templates/shuttles/overmaps/generic/overmap_ship_paperclipper.dmm b/maps/templates/shuttles/overmaps/generic/overmap_ship_paperclipper.dmm
index 04b1ec801de3..faa824a293f2 100644
--- a/maps/templates/shuttles/overmaps/generic/overmap_ship_paperclipper.dmm
+++ b/maps/templates/shuttles/overmaps/generic/overmap_ship_paperclipper.dmm
@@ -720,7 +720,7 @@
 /area/shuttle/paper_clipper)
 "Ft" = (
 /obj/structure/table/steel,
-/obj/item/stack/material/steel/full_stack,
+/obj/fiftyspawner/steel,
 /obj/fiftyspawner/glass,
 /turf/simulated/floor/tiled/techmaint,
 /area/shuttle/paper_clipper)
diff --git a/maps/templates/shuttles/overmaps/generic/shelter_6.dmm b/maps/templates/shuttles/overmaps/generic/shelter_6.dmm
index 40cb6c14c683..c215d0831b02 100644
--- a/maps/templates/shuttles/overmaps/generic/shelter_6.dmm
+++ b/maps/templates/shuttles/overmaps/generic/shelter_6.dmm
@@ -612,14 +612,14 @@
 /obj/item/storage/toolbox/emergency,
 /obj/item/storage/toolbox/emergency,
 /obj/item/storage/toolbox/emergency,
-/obj/item/stack/material/steel/full_stack,
-/obj/item/stack/material/steel/full_stack,
-/obj/item/stack/material/steel/full_stack,
-/obj/item/stack/material/steel/full_stack,
-/obj/item/stack/material/steel/full_stack,
-/obj/item/stack/material/steel/full_stack,
-/obj/item/stack/material/steel/full_stack,
-/obj/item/stack/material/steel/full_stack,
+/obj/fiftyspawner/steel,
+/obj/fiftyspawner/steel,
+/obj/fiftyspawner/steel,
+/obj/fiftyspawner/steel,
+/obj/fiftyspawner/steel,
+/obj/fiftyspawner/steel,
+/obj/fiftyspawner/steel,
+/obj/fiftyspawner/steel,
 /obj/fiftyspawner/glass,
 /obj/fiftyspawner/glass,
 /obj/fiftyspawner/glass,
diff --git a/maps/templates/shuttles/overmaps/generic/vespa.dmm b/maps/templates/shuttles/overmaps/generic/vespa.dmm
index cb51a8cbb778..eaf4614559dd 100644
--- a/maps/templates/shuttles/overmaps/generic/vespa.dmm
+++ b/maps/templates/shuttles/overmaps/generic/vespa.dmm
@@ -7020,7 +7020,7 @@
 "pm" = (
 /obj/structure/table/steel_reinforced,
 /obj/fiftyspawner/glass,
-/obj/item/stack/material/steel/full_stack,
+/obj/fiftyspawner/steel,
 /obj/effect/floor_decal/borderfloorblack{
 	dir = 8
 	},
diff --git a/maps/tether/levels/station1.dmm b/maps/tether/levels/station1.dmm
index 93029eb14f0a..e487b1b391f6 100644
--- a/maps/tether/levels/station1.dmm
+++ b/maps/tether/levels/station1.dmm
@@ -1921,7 +1921,7 @@
 	},
 /obj/fiftyspawner/plastic,
 /obj/fiftyspawner/plastic,
-/obj/item/stack/material/steel/full_stack,
+/obj/fiftyspawner/steel,
 /turf/simulated/floor/tiled,
 /area/engineering/workshop)
 "dL" = (
@@ -5370,7 +5370,7 @@
 /area/maintenance/station/eng_lower)
 "kU" = (
 /obj/structure/table/reinforced,
-/obj/item/stack/material/steel/full_stack,
+/obj/fiftyspawner/steel,
 /obj/fiftyspawner/glass,
 /turf/simulated/floor/tiled,
 /area/engineering/atmos/backup)
@@ -11004,11 +11004,11 @@
 /area/engineering/shield_gen)
 "wN" = (
 /obj/structure/table/reinforced,
-/obj/item/stack/material/steel/full_stack,
-/obj/item/stack/material/steel/full_stack,
-/obj/item/stack/material/steel/full_stack,
-/obj/item/stack/material/steel/full_stack,
-/obj/item/stack/material/steel/full_stack,
+/obj/fiftyspawner/steel,
+/obj/fiftyspawner/steel,
+/obj/fiftyspawner/steel,
+/obj/fiftyspawner/steel,
+/obj/fiftyspawner/steel,
 /obj/machinery/fire_alarm/south_mount{
 	pixel_y = -24
 	},
diff --git a/maps/tether/levels/station2.dmm b/maps/tether/levels/station2.dmm
index ecd732e0e023..c704670d73c7 100644
--- a/maps/tether/levels/station2.dmm
+++ b/maps/tether/levels/station2.dmm
@@ -12495,7 +12495,7 @@
 /obj/effect/floor_decal/industrial/warning{
 	dir = 4
 	},
-/obj/item/stack/material/steel/full_stack,
+/obj/fiftyspawner/steel,
 /turf/simulated/floor/tiled,
 /area/ai_monitored/storage/eva)
 "zi" = (
@@ -12953,7 +12953,7 @@
 "Ai" = (
 /obj/structure/table/standard,
 /obj/item/multitool,
-/obj/item/stack/material/steel/full_stack,
+/obj/fiftyspawner/steel,
 /obj/fiftyspawner/glass,
 /obj/effect/floor_decal/borderfloor{
 	dir = 4
@@ -17682,9 +17682,9 @@
 /obj/item/stack/material/plasteel{
 	amount = 10
 	},
-/obj/item/stack/material/steel/full_stack,
-/obj/item/stack/material/steel/full_stack,
-/obj/item/stack/material/steel/full_stack,
+/obj/fiftyspawner/steel,
+/obj/fiftyspawner/steel,
+/obj/fiftyspawner/steel,
 /obj/effect/floor_decal/industrial/warning{
 	dir = 4
 	},
diff --git a/maps/tether/levels/surface1.dmm b/maps/tether/levels/surface1.dmm
index 2cc7e0bb589a..7d58b0621c09 100644
--- a/maps/tether/levels/surface1.dmm
+++ b/maps/tether/levels/surface1.dmm
@@ -13265,8 +13265,8 @@
 	dir = 1
 	},
 /obj/structure/closet/crate/engineering,
-/obj/item/stack/material/steel/full_stack,
-/obj/item/stack/material/steel/full_stack,
+/obj/fiftyspawner/steel,
+/obj/fiftyspawner/steel,
 /obj/fiftyspawner/glass,
 /turf/simulated/floor/tiled/steel_dirty/virgo3b{
 	outdoors = 0
@@ -18362,7 +18362,7 @@
 	dir = 10
 	},
 /obj/structure/table/standard,
-/obj/item/stack/material/steel/full_stack,
+/obj/fiftyspawner/steel,
 /turf/simulated/floor/tiled/white,
 /area/rnd/outpost/mixing)
 "jKn" = (
@@ -22611,7 +22611,7 @@
 /obj/effect/floor_decal/corner/yellow/border{
 	dir = 5
 	},
-/obj/item/stack/material/steel/full_stack,
+/obj/fiftyspawner/steel,
 /turf/simulated/floor/tiled/techmaint,
 /area/engineering/atmos)
 "maD" = (
@@ -38721,8 +38721,8 @@
 	pixel_y = 30
 	},
 /obj/structure/table/standard,
-/obj/item/stack/material/steel/full_stack,
-/obj/item/stack/material/steel/full_stack,
+/obj/fiftyspawner/steel,
+/obj/fiftyspawner/steel,
 /obj/fiftyspawner/glass,
 /turf/simulated/floor/tiled,
 /area/engineering/atmos)
@@ -42992,7 +42992,7 @@
 /turf/simulated/floor/plating,
 /area/maintenance/lower/research)
 "xbO" = (
-/obj/item/stack/material/steel/full_stack,
+/obj/fiftyspawner/steel,
 /turf/simulated/floor/plating,
 /area/maintenance/lowmedbaymaint)
 "xbY" = (
diff --git a/maps/tether/levels/surface3.dmm b/maps/tether/levels/surface3.dmm
index 4ab2bb714e5f..c45bf84b371c 100644
--- a/maps/tether/levels/surface3.dmm
+++ b/maps/tether/levels/surface3.dmm
@@ -1028,11 +1028,11 @@
 /obj/structure/closet{
 	name = "materials"
 	},
-/obj/item/stack/material/steel/full_stack,
-/obj/item/stack/material/steel/full_stack,
-/obj/item/stack/material/steel/full_stack,
-/obj/item/stack/material/steel/full_stack,
-/obj/item/stack/material/steel/full_stack,
+/obj/fiftyspawner/steel,
+/obj/fiftyspawner/steel,
+/obj/fiftyspawner/steel,
+/obj/fiftyspawner/steel,
+/obj/fiftyspawner/steel,
 /obj/fiftyspawner/glass,
 /obj/fiftyspawner/glass,
 /obj/fiftyspawner/glass,
@@ -21773,7 +21773,7 @@
 /area/tether/surfacebase/security/iaa)
 "nlp" = (
 /obj/structure/table/steel,
-/obj/item/stack/material/steel/full_stack,
+/obj/fiftyspawner/steel,
 /obj/effect/floor_decal/techfloor{
 	dir = 8
 	},
@@ -23557,7 +23557,7 @@
 	pixel_x = 3;
 	pixel_y = 3
 	},
-/obj/item/stack/material/steel/full_stack,
+/obj/fiftyspawner/steel,
 /obj/fiftyspawner/glass,
 /turf/simulated/floor/tiled,
 /area/rnd/research)
@@ -32568,7 +32568,7 @@
 /area/rnd/robotics/resleeving)
 "tyA" = (
 /obj/structure/table/steel,
-/obj/item/stack/material/steel/full_stack,
+/obj/fiftyspawner/steel,
 /obj/effect/floor_decal/techfloor{
 	dir = 4
 	},
diff --git a/maps/triumph/levels/deck1.dmm b/maps/triumph/levels/deck1.dmm
index d4a9fb599b91..ff1464050c5b 100644
--- a/maps/triumph/levels/deck1.dmm
+++ b/maps/triumph/levels/deck1.dmm
@@ -9372,10 +9372,10 @@
 /obj/machinery/light{
 	dir = 1
 	},
-/obj/item/stack/material/steel/full_stack,
-/obj/item/stack/material/steel/full_stack,
-/obj/item/stack/material/steel/full_stack,
-/obj/item/stack/material/steel/full_stack,
+/obj/fiftyspawner/steel,
+/obj/fiftyspawner/steel,
+/obj/fiftyspawner/steel,
+/obj/fiftyspawner/steel,
 /turf/simulated/floor/tiled/techmaint,
 /area/engineering/storage)
 "Fq" = (
@@ -13679,7 +13679,7 @@
 /area/engineering/atmos/storage)
 "TF" = (
 /obj/structure/table/rack,
-/obj/item/stack/material/steel/full_stack,
+/obj/fiftyspawner/steel,
 /obj/fiftyspawner/rods,
 /obj/structure/railing{
 	dir = 8
@@ -14974,8 +14974,8 @@
 /area/crew_quarters/heads/chief)
 "XR" = (
 /obj/structure/closet/crate,
-/obj/item/stack/material/steel/full_stack,
-/obj/item/stack/material/steel/full_stack,
+/obj/fiftyspawner/steel,
+/obj/fiftyspawner/steel,
 /obj/fiftyspawner/glass,
 /obj/fiftyspawner/glass,
 /turf/simulated/floor/plating,
diff --git a/maps/triumph/levels/deck2.dmm b/maps/triumph/levels/deck2.dmm
index 999ac1fe8c08..26a4e23c8a4a 100644
--- a/maps/triumph/levels/deck2.dmm
+++ b/maps/triumph/levels/deck2.dmm
@@ -2550,7 +2550,7 @@
 	pixel_x = 7
 	},
 /obj/fiftyspawner/glass,
-/obj/item/stack/material/steel/full_stack,
+/obj/fiftyspawner/steel,
 /turf/simulated/floor/tiled,
 /area/quartermaster/office)
 "hF" = (
@@ -4867,7 +4867,7 @@
 /area/crew_quarters/kitchen)
 "oY" = (
 /obj/structure/table/rack,
-/obj/item/stack/material/steel/full_stack,
+/obj/fiftyspawner/steel,
 /turf/simulated/floor/plating,
 /area/maintenance/dormitory)
 "pa" = (
@@ -5831,8 +5831,8 @@
 /area/station/stairs_two)
 "rK" = (
 /obj/structure/closet/crate,
-/obj/item/stack/material/steel/full_stack,
-/obj/item/stack/material/steel/full_stack,
+/obj/fiftyspawner/steel,
+/obj/fiftyspawner/steel,
 /obj/fiftyspawner/glass,
 /obj/fiftyspawner/glass,
 /turf/simulated/floor/plating,
@@ -6226,7 +6226,7 @@
 "sR" = (
 /obj/effect/floor_decal/industrial/outline/yellow,
 /obj/structure/closet/crate,
-/obj/item/stack/material/steel/full_stack,
+/obj/fiftyspawner/steel,
 /obj/fiftyspawner/rods,
 /obj/fiftyspawner/glass,
 /turf/simulated/floor/tiled,
@@ -6535,8 +6535,8 @@
 /area/crew_quarters/sleep/Dorm_3)
 "tI" = (
 /obj/structure/closet/crate,
-/obj/item/stack/material/steel/full_stack,
-/obj/item/stack/material/steel/full_stack,
+/obj/fiftyspawner/steel,
+/obj/fiftyspawner/steel,
 /obj/fiftyspawner/glass,
 /obj/fiftyspawner/glass,
 /turf/simulated/floor/plating,
@@ -12012,7 +12012,7 @@
 "Kp" = (
 /obj/structure/closet/toolcloset,
 /obj/item/storage/toolbox/mechanical,
-/obj/item/stack/material/steel/full_stack,
+/obj/fiftyspawner/steel,
 /obj/fiftyspawner/glass,
 /obj/item/stack/cable_coil/random,
 /obj/fiftyspawner/wood,
@@ -12022,7 +12022,7 @@
 /obj/machinery/power/apc/west_mount{
 	cell_type = /obj/item/cell/super
 	},
-/obj/item/stack/material/steel/full_stack,
+/obj/fiftyspawner/steel,
 /turf/simulated/floor/wood,
 /area/triumph/surfacebase/bar_backroom)
 "Kq" = (
@@ -14332,8 +14332,8 @@
 "Rv" = (
 /obj/effect/floor_decal/industrial/outline/yellow,
 /obj/structure/closet/crate,
-/obj/item/stack/material/steel/full_stack,
-/obj/item/stack/material/steel/full_stack,
+/obj/fiftyspawner/steel,
+/obj/fiftyspawner/steel,
 /turf/simulated/floor/tiled,
 /area/maintenance/cargo)
 "Rw" = (
diff --git a/maps/triumph/levels/deck3.dmm b/maps/triumph/levels/deck3.dmm
index 7ae668a898bb..fcb945ec6c11 100644
--- a/maps/triumph/levels/deck3.dmm
+++ b/maps/triumph/levels/deck3.dmm
@@ -7106,7 +7106,7 @@
 	pixel_x = 3;
 	pixel_y = 3
 	},
-/obj/item/stack/material/steel/full_stack,
+/obj/fiftyspawner/steel,
 /obj/fiftyspawner/glass,
 /obj/structure/table/reinforced,
 /obj/effect/floor_decal/borderfloor,
@@ -10431,8 +10431,8 @@
 /area/medical/sleeper)
 "iBU" = (
 /obj/structure/table/steel,
-/obj/item/stack/material/steel/full_stack,
-/obj/item/stack/material/steel/full_stack,
+/obj/fiftyspawner/steel,
+/obj/fiftyspawner/steel,
 /turf/simulated/floor/tiled,
 /area/rnd/misc_lab)
 "iCr" = (
@@ -11531,7 +11531,7 @@
 /area/rnd/anomaly_lab/containment_two)
 "jvv" = (
 /obj/structure/table/steel,
-/obj/item/stack/material/steel/full_stack,
+/obj/fiftyspawner/steel,
 /obj/effect/floor_decal/techfloor{
 	dir = 4
 	},
@@ -12925,7 +12925,7 @@
 	dir = 8
 	},
 /obj/structure/table/steel,
-/obj/item/stack/material/steel/full_stack,
+/obj/fiftyspawner/steel,
 /turf/simulated/floor/tiled/techfloor,
 /area/rnd/workshop)
 "kFN" = (
diff --git a/maps/triumph/levels/deck4.dmm b/maps/triumph/levels/deck4.dmm
index 45dfe7bc3779..4815f6e361db 100644
--- a/maps/triumph/levels/deck4.dmm
+++ b/maps/triumph/levels/deck4.dmm
@@ -6828,7 +6828,7 @@
 "eFX" = (
 /obj/structure/table/rack,
 /obj/random/maintenance/security,
-/obj/item/stack/material/steel/full_stack,
+/obj/fiftyspawner/steel,
 /turf/simulated/floor/plating,
 /area/maintenance/security/starboard)
 "eGc" = (
@@ -12985,8 +12985,8 @@
 /obj/structure/table/steel,
 /obj/fiftyspawner/glass,
 /obj/fiftyspawner/glass,
-/obj/item/stack/material/steel/full_stack,
-/obj/item/stack/material/steel/full_stack,
+/obj/fiftyspawner/steel,
+/obj/fiftyspawner/steel,
 /obj/structure/cable/green{
 	icon_state = "2-8"
 	},
@@ -19869,9 +19869,9 @@
 /area/library)
 "nKb" = (
 /obj/structure/table/reinforced,
-/obj/item/stack/material/steel/full_stack,
-/obj/item/stack/material/steel/full_stack,
-/obj/item/stack/material/steel/full_stack,
+/obj/fiftyspawner/steel,
+/obj/fiftyspawner/steel,
+/obj/fiftyspawner/steel,
 /turf/simulated/floor/tiled,
 /area/maintenance/tool_storage)
 "nKg" = (
@@ -21185,8 +21185,8 @@
 /area/library)
 "oGE" = (
 /obj/structure/closet/crate,
-/obj/item/stack/material/steel/full_stack,
-/obj/item/stack/material/steel/full_stack,
+/obj/fiftyspawner/steel,
+/obj/fiftyspawner/steel,
 /obj/fiftyspawner/glass,
 /obj/fiftyspawner/glass,
 /turf/simulated/floor/plating,
@@ -21852,8 +21852,8 @@
 /area/exploration/excursion_dock)
 "pdK" = (
 /obj/structure/closet/crate,
-/obj/item/stack/material/steel/full_stack,
-/obj/item/stack/material/steel/full_stack,
+/obj/fiftyspawner/steel,
+/obj/fiftyspawner/steel,
 /obj/fiftyspawner/glass,
 /obj/fiftyspawner/glass,
 /turf/simulated/floor/plating,
@@ -28056,8 +28056,8 @@
 /area/security/interrogation)
 "tEj" = (
 /obj/structure/closet/crate,
-/obj/item/stack/material/steel/full_stack,
-/obj/item/stack/material/steel/full_stack,
+/obj/fiftyspawner/steel,
+/obj/fiftyspawner/steel,
 /obj/fiftyspawner/glass,
 /obj/fiftyspawner/glass,
 /turf/simulated/floor/plating,
@@ -28930,7 +28930,7 @@
 /turf/simulated/floor/plating,
 /area/shuttle/courser/general)
 "uhE" = (
-/obj/item/stack/material/steel/full_stack,
+/obj/fiftyspawner/steel,
 /obj/structure/table/rack,
 /turf/simulated/floor/plating,
 /area/maintenance/security/port)

From 55f2d99a1301f623e7995c9d328d897c696a6348 Mon Sep 17 00:00:00 2001
From: silicons <2003111+silicons@users.noreply.github.com>
Date: Mon, 16 Dec 2024 01:52:42 -0500
Subject: [PATCH 10/25] Fix and add wrapeprs

---
 citadel.dme                                   |  1 +
 .../modules/admin/verbs/SDQL2/wrappers/map.dm |  5 ++--
 .../admin/verbs/SDQL2/wrappers/math.dm        | 28 +++++++++++++++++++
 code/modules/materials/material_sheets.dm     |  2 +-
 4 files changed, 33 insertions(+), 3 deletions(-)
 create mode 100644 code/modules/admin/verbs/SDQL2/wrappers/math.dm

diff --git a/citadel.dme b/citadel.dme
index 8bfc4bba8e6d..ac8aff1592a0 100644
--- a/citadel.dme
+++ b/citadel.dme
@@ -2253,6 +2253,7 @@
 #include "code\modules\admin\verbs\SDQL2\SDQL_2_parser.dm"
 #include "code\modules\admin\verbs\SDQL2\SDQL_2_wrappers.dm"
 #include "code\modules\admin\verbs\SDQL2\wrappers\map.dm"
+#include "code\modules\admin\verbs\SDQL2\wrappers\math.dm"
 #include "code\modules\admin\verbs\server\admin_reboot.dm"
 #include "code\modules\admin\view_variables\admin_delete.dm"
 #include "code\modules\admin\view_variables\color_matrix_editor.dm"
diff --git a/code/modules/admin/verbs/SDQL2/wrappers/map.dm b/code/modules/admin/verbs/SDQL2/wrappers/map.dm
index 10eb86995ca1..ea7014d05c4f 100644
--- a/code/modules/admin/verbs/SDQL2/wrappers/map.dm
+++ b/code/modules/admin/verbs/SDQL2/wrappers/map.dm
@@ -1,5 +1,5 @@
 //* This file is explicitly licensed under the MIT license. *//
-//* Copyright (c) 2024 silicons                             *//
+//* Copyright (c) 2024 Citadel Station Developers           *//
 
 // * Mapping Functions * //
 
@@ -156,9 +156,10 @@
 			results = range(radius, A)
 			if(!length(results))
 				continue
+			. += results
 			if(length(.) > safety)
 				stack_trace("hit safety limit")
-				return
+				break
 	else
 		var/list/hashed = list()
 		for(var/atom/A in movables)
diff --git a/code/modules/admin/verbs/SDQL2/wrappers/math.dm b/code/modules/admin/verbs/SDQL2/wrappers/math.dm
new file mode 100644
index 000000000000..e147b1b29490
--- /dev/null
+++ b/code/modules/admin/verbs/SDQL2/wrappers/math.dm
@@ -0,0 +1,28 @@
+//* This file is explicitly licensed under the MIT license. *//
+//* Copyright (c) 2024 Citadel Station Developers           *//
+
+// * Math Functions * //
+
+/proc/sdql_sin(n)
+	return sin(n)
+
+/proc/sdql_cos(n)
+	return cos(n)
+
+/proc/sdql_tan(n)
+	return tan(n)
+
+/proc/sdql_arctan(a, b)
+	return arctan(a, b)
+
+/proc/sdql_max(...)
+	return max(arglist(args))
+
+/proc/sdql_min(...)
+	return min(arglist(args))
+
+/proc/sdql_clamp(a, b, c)
+	return clamp(a, b, c)
+
+/proc/sdql_turn(dir, angle)
+	return turn(dir, angle)
diff --git a/code/modules/materials/material_sheets.dm b/code/modules/materials/material_sheets.dm
index e69df0a8e251..908e8dff3476 100644
--- a/code/modules/materials/material_sheets.dm
+++ b/code/modules/materials/material_sheets.dm
@@ -57,7 +57,7 @@
 
 /obj/item/stack/material/update_icon()
 	if(material.icon_stack_count)
-		icon_state = "stack-[ceil(amount / max_amount) * material.icon_stack_count]"
+		icon_state = "stack-[min(ceil((amount / max_amount) * material.icon_stack_count), material.icon_stack_count)]"
 	return ..()
 
 /obj/item/stack/material/tgui_recipes()

From 9cc0c54aba18a636d07888f29f167e0c0273f3f3 Mon Sep 17 00:00:00 2001
From: silicons <2003111+silicons@users.noreply.github.com>
Date: Tue, 17 Dec 2024 02:30:07 -0500
Subject: [PATCH 11/25] survival boxes

---
 citadel.dme                                   |   1 +
 code/game/objects/items/storage/boxes.dm      |  17 +-
 .../objects/items/storage/misc/survival.dm    |   9 +
 code/game/objects/structures/loot_piles.dm    |   2 +-
 .../simple_mob/subtypes/vore/solarmoth.dm     |   7 +-
 code/modules/mob/mob-inventory.dm             |   4 +-
 code/modules/organs/subtypes/nano.dm          |   5 +
 code/modules/species/outsider/scori.dm        |   3 -
 code/modules/species/outsider/vox.dm          |  46 +++-
 code/modules/species/promethean/promethean.dm |  10 +-
 code/modules/species/protean/protean.dm       |  20 +-
 code/modules/species/species.dm               |  57 ++++-
 code/modules/species/station/adherent.dm      |   7 +-
 .../modules/species/station/custom_species.dm |  29 ---
 code/modules/species/station/diona.dm         |   6 -
 code/modules/species/station/phoronoids.dm    | 203 ++++++++++--------
 .../species/station/standard/tajaran.dm       |  12 +-
 .../species/station/standard/teshari.dm       |  13 +-
 .../species/station/standard/unathi.dm        |  12 +-
 .../species/station/standard/zaddat.dm        |  50 +++--
 maps/endeavour/levels/flagship.dmm            |  16 +-
 maps/rift/levels/rift-11-orbital.dmm          |  16 +-
 maps/templates/admin/dhael_centcom.dmm        |  12 +-
 maps/templates/admin/ert.dmm                  |   6 +-
 maps/templates/admin/ert_base.dmm             |   4 +-
 maps/templates/shelters/shelter_2.dmm         |   2 +-
 maps/templates/shelters/shelter_4.dmm         |  16 +-
 maps/templates/shelters/shelter_a.dmm         |   4 +-
 .../shuttles/overmaps/generic/cruiser.dmm     |  38 ++--
 .../generic/overmap_ship_paperclipper.dmm     |   8 +-
 .../shuttles/overmaps/generic/shelter_5.dmm   |   8 +-
 .../shuttles/overmaps/generic/shelter_6.dmm   |  28 +--
 maps/triumph/levels/flagship.dmm              |  16 +-
 33 files changed, 398 insertions(+), 289 deletions(-)
 create mode 100644 code/game/objects/items/storage/misc/survival.dm

diff --git a/citadel.dme b/citadel.dme
index ac8aff1592a0..dbcfaf4c49b6 100644
--- a/citadel.dme
+++ b/citadel.dme
@@ -1778,6 +1778,7 @@
 #include "code\game\objects\items\storage\wallets.dm"
 #include "code\game\objects\items\storage\medical\firstaid.dm"
 #include "code\game\objects\items\storage\medical\hypokit.dm"
+#include "code\game\objects\items\storage\misc\survival.dm"
 #include "code\game\objects\items\storage\misc_legacy\bible.dm"
 #include "code\game\objects\items\storage\misc_legacy\fancy.dm"
 #include "code\game\objects\items\storage\misc_legacy\laundry_basket.dm"
diff --git a/code/game/objects/items/storage/boxes.dm b/code/game/objects/items/storage/boxes.dm
index 415d4afd861c..4315f0701cd4 100644
--- a/code/game/objects/items/storage/boxes.dm
+++ b/code/game/objects/items/storage/boxes.dm
@@ -24,13 +24,14 @@
 	desc = "It's just an ordinary box."
 	icon_state = "box"
 	item_state = "syringe_kit"
-	var/foldable = /obj/item/stack/material/cardboard	// BubbleWrap - if set, can be folded (when empty) into a sheet of cardboard
 	max_single_weight_class = WEIGHT_CLASS_SMALL
 	max_combined_volume = STORAGE_VOLUME_BOX
 	drop_sound = 'sound/items/drop/cardboardbox.ogg'
 	pickup_sound = 'sound/items/pickup/cardboardbox.ogg'
 	worth_intrinsic = 25
 
+	var/foldable = /obj/item/stack/material/cardboard	// BubbleWrap - if set, can be folded (when empty) into a sheet of cardboard
+
 	/// dynamic state support
 	var/dynamic_state = TRUE
 	/// dynamic state overlay, if any
@@ -60,20 +61,20 @@
 	new foldable(get_turf(src))
 	qdel(src)
 
-/obj/item/storage/box/survival
+/obj/item/storage/box/legacy_survival
 	name = "emergency supply box"
 	desc = "A survival box issued to crew members for use in emergency situations."
 	starts_with = list(
 		/obj/item/clothing/mask/breath
 	)
 
-/obj/item/storage/box/survival/synth
+/obj/item/storage/box/legacy_survival/synth
 	name = "synthetic supply box"
 	desc = "A survival box issued to synthetic crew members for use in emergency situations."
 	starts_with = list(
 	)
 
-/obj/item/storage/box/survival/comp
+/obj/item/storage/box/legacy_survival/comp
 	name = "emergency supply box"
 	desc = "A comprehensive survival box issued to crew members for use in emergency situations. Contains additional supplies."
 	icon_state = "survival"
@@ -624,20 +625,20 @@
 	icon_state = "firingpins"
 	starts_with = list(/obj/item/firing_pin = 8)
 
-/obj/item/storage/box/survival
+/obj/item/storage/box/legacy_survival
 	starts_with = list(
 		/obj/item/tool/prybar/red,
 		/obj/item/clothing/glasses/goggles,
 		/obj/item/clothing/mask/breath
 	)
 
-/obj/item/storage/box/survival/synth
+/obj/item/storage/box/legacy_survival/synth
 	starts_with = list(
 		/obj/item/tool/prybar/red,
 		/obj/item/clothing/glasses/goggles
 	)
 
-/obj/item/storage/box/survival/comp
+/obj/item/storage/box/legacy_survival/comp
 	starts_with = list(
 		/obj/item/tool/prybar/red,
 		/obj/item/clothing/glasses/goggles,
@@ -667,7 +668,7 @@
 	desc = "A box full of service keys, for the HoP to give out as necessary."
 	starts_with = list(/obj/item/encryptionkey/headset_service = 7)
 
-/obj/item/storage/box/survival/space
+/obj/item/storage/box/legacy_survival/space
 	name = "boxed emergency suit and helmet"
 	icon_state = "survivaleng"
 	starts_with = list(
diff --git a/code/game/objects/items/storage/misc/survival.dm b/code/game/objects/items/storage/misc/survival.dm
new file mode 100644
index 000000000000..68b0df00e9e1
--- /dev/null
+++ b/code/game/objects/items/storage/misc/survival.dm
@@ -0,0 +1,9 @@
+
+/**
+ * Unfoldable. Special survival box handed to most people on spawn.
+ */
+/obj/item/storage/box/survival
+	name = "emergency supply box"
+	desc = "A survival box issued to crew members for use in emergency situations."
+	icon_state = "survival"
+	foldable = FALSE
diff --git a/code/game/objects/structures/loot_piles.dm b/code/game/objects/structures/loot_piles.dm
index 929746bae3fb..bde9d888de8f 100644
--- a/code/game/objects/structures/loot_piles.dm
+++ b/code/game/objects/structures/loot_piles.dm
@@ -313,7 +313,7 @@ Loot piles can be depleted, if loot_depleted is turned on.  Note that players wh
 		/obj/item/storage/box/ids,
 		/obj/item/storage/box/mousetraps,
 		/obj/item/storage/box/syringes,
-		/obj/item/storage/box/survival,
+		/obj/item/storage/box/legacy_survival,
 		/obj/item/storage/box/gloves,
 		/obj/item/storage/box/PDAs
 	)
diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/solarmoth.dm b/code/modules/mob/living/simple_mob/subtypes/vore/solarmoth.dm
index 0f07603df036..7a2d7ceb611f 100644
--- a/code/modules/mob/living/simple_mob/subtypes/vore/solarmoth.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/vore/solarmoth.dm
@@ -131,11 +131,10 @@
 	original_temp = heating_power //We remember our old goal, for use in non perpetual heating level increase
 
 /mob/living/simple_mob/vore/solarmoth/proc/explode()
-	src.anchored = 0
+	set_anchored(FALSE)
 	set_light(0)
 	if(empulse(src, emp_heavy, emp_med, emp_light, emp_long))
 		qdel(src)
-	return
 
 /mob/living/simple_mob/vore/solarmoth/death()
 	explode()
@@ -145,16 +144,12 @@
 	explode()
 	..()
 
-
 /mob/living/simple_mob/vore/solarmoth/handle_light()
 	. = ..()
 	if(. == 0 && !is_dead())
 		set_light(9.5, 1, mycolour) //9.5 makes the brightness range super huge.
 		return 1
 
-
-/mob/living/simple_mob/vore/solarmoth //active noms
-
 /mob/living/simple_mob/vore/solarmoth/lunarmoth
 	name = "Lunarmoth"
 	desc = "A peculiar adult variation of a solargrub. Don't stare for too long and start running."
diff --git a/code/modules/mob/mob-inventory.dm b/code/modules/mob/mob-inventory.dm
index fe69870ff7af..2207340baa24 100644
--- a/code/modules/mob/mob-inventory.dm
+++ b/code/modules/mob/mob-inventory.dm
@@ -408,7 +408,7 @@
  * semantically returns true if we transferred something from our inventory to newloc in the call
  *
  * if the item is null, this returns true
- * if an item is not in us, this crashes
+ * if an item is not in us, this returns FALSE
  */
 /mob/proc/transfer_item_to_loc(obj/item/I, newloc, flags, mob/user)
 	if(!I)
@@ -424,7 +424,7 @@
  * semantically returns true if we transferred something from our inventory to null in the call
  *
  * if the item is null, this returns true
- * if an item is not in us, this crashes
+ * if an item is not in us, this returns false
  */
 /mob/proc/transfer_item_to_nullspace(obj/item/I, flags, mob/user)
 	if(!I)
diff --git a/code/modules/organs/subtypes/nano.dm b/code/modules/organs/subtypes/nano.dm
index e466cc56a486..f2fd6d0842c9 100644
--- a/code/modules/organs/subtypes/nano.dm
+++ b/code/modules/organs/subtypes/nano.dm
@@ -146,6 +146,11 @@
 	//Failure
 	return 0
 
+/obj/item/organ/internal/nano/refactory/loaded
+	stored_materials = list(
+		MAT_STEEL = /obj/item/organ/internal/nano/refactory/loaded::max_storage,
+	)
+
 /obj/item/organ/internal/mmi_holder/posibrain/nano
 	name = "protean posibrain"
 	desc = "A more advanced version of the standard posibrain, typically found in protean bodies."
diff --git a/code/modules/species/outsider/scori.dm b/code/modules/species/outsider/scori.dm
index 960fdfc90800..34ba50ec16a4 100644
--- a/code/modules/species/outsider/scori.dm
+++ b/code/modules/species/outsider/scori.dm
@@ -66,6 +66,3 @@
 		/mob/living/carbon/human/proc/hide_wings,
 		/mob/living/carbon/human/proc/hide_tail
 		)
-
-/datum/species/scori/equip_survival_gear()
-	return
diff --git a/code/modules/species/outsider/vox.dm b/code/modules/species/outsider/vox.dm
index 847423b80fa6..593439488543 100644
--- a/code/modules/species/outsider/vox.dm
+++ b/code/modules/species/outsider/vox.dm
@@ -119,14 +119,40 @@
 	var/datum/prototype/language/species_language = RSlanguages.fetch(default_language)
 	return species_language.get_random_name(gender)
 
-/datum/species/vox/equip_survival_gear(mob/living/carbon/human/H, extendedtank = FALSE, comprehensive = FALSE)
-	. = ..()
-
-	H.equip_to_slot_or_del(new /obj/item/clothing/mask/breath(H), SLOT_ID_MASK, INV_OP_SILENT | INV_OP_FLUFFLESS)
-	if(H.backbag == 1)
-		H.equip_to_slot_or_del(new /obj/item/tank/vox(H), SLOT_ID_BACK, INV_OP_SILENT | INV_OP_FLUFFLESS)
+/datum/species/vox/apply_survival_gear(mob/living/carbon/for_target, list/into_box, list/into_inv)
+	// ensure they have a valid mask
+	var/mask_type = /obj/item/clothing/mask/breath
+	if(for_target)
+		var/obj/item/existing_mask = for_target.inventory.get_slot_single(/datum/inventory_slot/inventory/mask)
+		if(existing_mask?.clothing_flags & ALLOWINTERNALS)
+		else
+			if(for_target.temporarily_remove_from_inventory(existing_mask, INV_OP_FORCE | INV_OP_SILENT))
+				into_inv?.Add(existing_mask)
+				var/obj/item/creating_mask = new mask_type
+				if(for_target.inventory.equip_to_slot_if_possible(creating_mask, /datum/inventory_slot/inventory/mask, INV_OP_SILENT | INV_OP_FLUFFLESS))
+				else
+					into_inv?.Add(creating_mask)
+			else
+				into_inv?.Add(mask_type)
+	else
+		into_inv?.Add(mask_type)
+	// ensure they have a vox tank
+	var/tank_type = /obj/item/tank/vox
+	if(for_target)
+		var/obj/item/tank/equipping_tank = new tank_type
+		var/could_place = TRUE
+		if(for_target.inventory.equip_to_slot_if_possible(equipping_tank, /datum/inventory_slot/inventory/pocket/left))
+		else if(for_target.inventory.equip_to_slot_if_possible(equipping_tank, /datum/inventory_slot/inventory/pocket/right))
+		else if(for_target.inventory.put_in_hands(equipping_tank))
+		else
+			could_place = FALSE
+		if(could_place)
+			// todo: refactor this shit
+			for_target.internal = equipping_tank
+			for_target.internals.icon_state = "internal1"
+		else
+			into_inv?.Add(tank_type)
 	else
-		H.equip_to_slot_or_del(new /obj/item/tank/vox(H), /datum/inventory_slot/abstract/hand/right, INV_OP_SILENT | INV_OP_FLUFFLESS)
-	H.internal = locate(/obj/item/tank) in H.contents
-	if(istype(H.internal,/obj/item/tank) && H.internals)
-		H.internals.icon_state = "internal1"
+		into_inv?.Add(tank_type)
+
+	return ..()
diff --git a/code/modules/species/promethean/promethean.dm b/code/modules/species/promethean/promethean.dm
index 5f4f719f95a0..218cfd44d400 100644
--- a/code/modules/species/promethean/promethean.dm
+++ b/code/modules/species/promethean/promethean.dm
@@ -153,7 +153,9 @@ var/datum/species/shapeshifter/promethean/prometheans
 	..()
 	prometheans = src
 
-/datum/species/shapeshifter/promethean/equip_survival_gear(mob/living/carbon/human/H)
+/datum/species/shapeshifter/promethean/apply_survival_gear(mob/living/carbon/for_target, list/into_box, list/into_inv)
+	. = ..()
+
 	var/boxtype = pick(list(
 		/obj/item/storage/toolbox/lunchbox,
 		/obj/item/storage/toolbox/lunchbox/heart,
@@ -167,11 +169,7 @@ var/datum/species/shapeshifter/promethean/prometheans
 
 	var/obj/item/storage/toolbox/lunchbox/L = new boxtype(get_turf(H))
 	new /obj/item/reagent_containers/food/snacks/wrapped/proteinbar(L)
-	new /obj/item/tool/prybar/red(L)
-	if(H.backbag == 1)
-		H.equip_to_slot_or_del(L, /datum/inventory_slot/abstract/hand/right)
-	else
-		H.equip_to_slot_or_del(L, /datum/inventory_slot/abstract/put_in_backpack)
+	into_inv += L
 
 /datum/species/shapeshifter/promethean/hug(mob/living/carbon/human/H, mob/living/target)
 
diff --git a/code/modules/species/protean/protean.dm b/code/modules/species/protean/protean.dm
index b0840303649c..2df5c70af0db 100644
--- a/code/modules/species/protean/protean.dm
+++ b/code/modules/species/protean/protean.dm
@@ -69,9 +69,10 @@
 
 	has_organ = list(
 		O_BRAIN = /obj/item/organ/internal/mmi_holder/posibrain/nano,
-		O_ORCH = /obj/item/organ/internal/nano/orchestrator,
+		O_ORCH = /obj/item/organ/internal/nano/orchestrator/loaded,
 		O_FACT = /obj/item/organ/internal/nano/refactory
 		)
+
 	vision_organ = O_BRAIN
 	has_limbs = list(
 		BP_TORSO =  list("path" = /obj/item/organ/external/chest/unbreakable/nano),
@@ -173,18 +174,11 @@
 	var/obj/item/hardsuit/protean/prig = new /obj/item/hardsuit/protean(H)
 	prig.myprotean = H
 
-/datum/species/protean/equip_survival_gear(var/mob/living/carbon/human/H)
-	var/obj/item/storage/box/box = new /obj/item/storage/box/survival/synth(H)
-	var/obj/item/stack/material/steel/metal_stack = new(box)
-	metal_stack.amount = 3 // Less starting steel due to regen changes
-	new /obj/item/fbp_backup_cell(box)
-	var/obj/item/clothing/accessory/permit/nanotech/permit = new(box)
-	permit.set_name(H.real_name)
-
-	if(H.backbag == 1) //Somewhat misleading, 1 == no bag (not boolean)
-		H.equip_to_slot_or_del(box, /datum/inventory_slot/abstract/hand/left)
-	else
-		H.equip_to_slot_or_del(box, /datum/inventory_slot/abstract/put_in_backpack)
+/datum/species/protean/apply_racial_gear(mob/living/carbon/for_target, list/into_box, list/into_inv)
+	var/obj/item/clothing/accessory/permit/nanotech/permit = new
+	permit.set_name(for_target.real_name)
+	into_box += permit
+	return ..()
 
 /datum/species/protean/get_blood_colour(var/mob/living/carbon/human/H)
 	return rgb(80,80,80,230)
diff --git a/code/modules/species/species.dm b/code/modules/species/species.dm
index c94cfb4b646b..2a3f4d05c0a1 100644
--- a/code/modules/species/species.dm
+++ b/code/modules/species/species.dm
@@ -630,18 +630,67 @@ GLOBAL_LIST_INIT(species_oxygen_tank_by_gas, list(
 	GAS_ID_CARBON_DIOXIDE = /obj/item/tank/emergency/carbon_dioxide
 ))
 
+/**
+ * Injects spawn descriptors into `into_box` and `into_inv` lists. Both must be provided.
+ *
+ * Descriptors can be;
+ * * a typepath
+ * * an anonymous type
+ *
+ * Notes:
+ * * The `into_box` and `into_inv` lists should always be added to via `?.Add()`, incase they are null.
+ * * Returned lists **must** be handled. If you aren't equipping anything, properly qdel() any spawned items, or
+ *   a memory leak will result.
+ *
+ * @params
+ * * for_target - (optional) person who is getting survival gear. if this is not provided, default
+ *                survival gear that would go on them through inventory calls should be put into `into_inv`.
+ * * into_box - things to put into their survival kit. do not put anything large in here.
+ * * into_inv - things to make sure they have somewhere on, or near them. anything large can be put in here.
+ *              things will not necessarily be put in their backpack, as an example a wheelchair would be put under them.
+ */
+/datum/species/proc/apply_racial_gear(mob/living/carbon/for_target, list/into_box, list/into_inv)
+	return
+
+/**
+ * Injects spawn descriptors into `into_box` and `into_inv` lists. Both must be provided.
+ *
+ * Descriptors can be;
+ * * a typepath
+ * * an anonymous type
+ *
+ * Notes:
+ * * The `into_box` and `into_inv` lists should always be added to via `?.Add()`, incase they are null.
+ * * Returned lists **must** be handled. If you aren't equipping anything, properly qdel() any spawned items, or
+ *   a memory leak will result.
+ *
+ * @params
+ * * for_target - (optional) person who is getting survival gear. if this is not provided, default
+ *                survival gear that would go on them through inventory calls should be put into `into_inv`.
+ * * into_box - things to put into their survival kit. do not put anything large in here.
+ * * into_inv - things to make sure they have somewhere on, or near them. anything large can be put in here.
+ *              things will not necessarily be put in their backpack, as an example a wheelchair would be put under them.
+ */
+/datum/species/proc/apply_survival_gear(mob/living/carbon/for_target, list/into_box, list/into_inv)
+
+	new /obj/item/tool/prybar/red(L)
+	#warn give them a flare
+
+#warn below
+
 /datum/species/proc/equip_survival_gear(var/mob/living/carbon/human/H,var/extendedtank = 0,var/comprehensive = 0)
-	var/boxtype = /obj/item/storage/box/survival //Default survival box
+	var/boxtype = /obj/item/storage/box/legacy_survival //Default survival box
+
 
 	var/synth = H.isSynthetic()
 
 	//Empty box for synths
 	if(synth)
-		boxtype = /obj/item/storage/box/survival/synth
+		boxtype = /obj/item/storage/box/legacy_survival/synth
 
 	//Special box with extra equipment
 	else if(comprehensive)
-		boxtype = /obj/item/storage/box/survival/comp
+		boxtype = /obj/item/storage/box/legacy_survival/comp
 
 	//Create the box
 	var/obj/item/storage/box/box = new boxtype(H)
@@ -675,6 +724,8 @@ GLOBAL_LIST_INIT(species_oxygen_tank_by_gas, list(
 	else
 		H.equip_to_slot_or_del(box, /datum/inventory_slot/abstract/put_in_backpack, INV_OP_FORCE | INV_OP_SILENT)
 
+#warn above
+
 /**
  * called to ensure organs are consistent with our species's
  * this is a destructive operation and will erase old organs!
diff --git a/code/modules/species/station/adherent.dm b/code/modules/species/station/adherent.dm
index f55fd5a8f4ae..11a278e95e43 100644
--- a/code/modules/species/station/adherent.dm
+++ b/code/modules/species/station/adherent.dm
@@ -151,8 +151,11 @@
 		/datum/inventory_slot/inventory/id::id,
 	)
 
-/datum/species/adherent/equip_survival_gear(mob/living/carbon/human/H, extendedtank = FALSE, comprehensive = FALSE)
-	H.equip_to_slot_or_del(new /obj/item/storage/belt/utility/crystal, /datum/inventory_slot/abstract/put_in_backpack)
+/datum/species/adherent/apply_racial_gear(mob/living/carbon/for_target, list/into_box, list/into_inv)
+	var/obj/item/storage/belt/utility/crystal/give_them_the_toolbelt = new
+	if(!for_target?.inventory?.equip_to_slot_if_possible(give_them_the_toolbelt, /datum/inventory_slot/inventory/belt))
+		into_inv += give_them_the_toolbelt
+	return ..()
 
 /datum/species/adherent/New()
 	/*equip_adjust = list(
diff --git a/code/modules/species/station/custom_species.dm b/code/modules/species/station/custom_species.dm
index 2dfdcf2295d3..d4596f74d607 100644
--- a/code/modules/species/station/custom_species.dm
+++ b/code/modules/species/station/custom_species.dm
@@ -68,32 +68,3 @@
 	var/datum/species/real = SScharacters.resolve_species_name(base_species)
 	return real.real_race_key(H)
 
-// Stub species overrides for shoving trait abilities into
-
-//Called when face-down in the water or otherwise over their head.
-// Return: TRUE for able to breathe fine in water.
-/datum/species/custom/can_breathe_water()
-	return ..()
-
-//Called during handle_environment in Life() ticks.
-// Return: Not used.
-/datum/species/custom/handle_environment_special(mob/living/carbon/human/H, datum/gas_mixture/environment, dt)
-	return ..()
-
-//Called when spawning to equip them with special things.
-/datum/species/custom/equip_survival_gear(mob/living/carbon/human/H)
-	/* Example, from Vox:
-	H.equip_to_slot_or_del(new /obj/item/clothing/mask/breath(H), SLOT_ID_MASK)
-	if(H.backbag == 1)
-		H.equip_to_slot_or_del(new /obj/item/tank/vox(H), SLOT_ID_BACK)
-		H.equip_to_slot_or_del(new /obj/item/storage/box/vox(H), /datum/inventory_slot/abstract/hand/right)
-		H.internal = H.back
-	else
-		H.equip_to_slot_or_del(new /obj/item/tank/vox(H), /datum/inventory_slot/abstract/hand/right)
-		H.equip_to_slot_or_del(new /obj/item/storage/box/vox(H.back), /datum/inventory_slot/abstract/put_in_backpack)
-		H.internal = H.r_hand
-	H.internal = locate(/obj/item/tank) in H.contents
-	if(istype(H.internal,/obj/item/tank) && H.internals)
-		H.internals.icon_state = "internal1"
-	*/
-	return ..()
diff --git a/code/modules/species/station/diona.dm b/code/modules/species/station/diona.dm
index 18c736fc3852..52bcd43f3d3c 100644
--- a/code/modules/species/station/diona.dm
+++ b/code/modules/species/station/diona.dm
@@ -148,12 +148,6 @@
 		return TRUE
 	return FALSE
 
-/datum/species/diona/equip_survival_gear(mob/living/carbon/human/H)
-	if(H.backbag == 1)
-		H.equip_to_slot_or_del(new /obj/item/flashlight/flare(H), /datum/inventory_slot/abstract/hand/right)
-	else
-		H.equip_to_slot_or_del(new /obj/item/flashlight/flare(H.back), /datum/inventory_slot/abstract/put_in_backpack)
-
 /datum/species/diona/handle_death(mob/living/carbon/human/H)
 
 	var/mob/living/carbon/alien/diona/S = new(get_turf(H))
diff --git a/code/modules/species/station/phoronoids.dm b/code/modules/species/station/phoronoids.dm
index 3033d87f7d5c..c56d37cf5d3c 100644
--- a/code/modules/species/station/phoronoids.dm
+++ b/code/modules/species/station/phoronoids.dm
@@ -102,143 +102,174 @@
 			H.IgniteMob()
 	enviroment_bad = FALSE
 
-/datum/species/phoronoid/equip_survival_gear(mob/living/carbon/human/H, extendedtank = FALSE, comprehensive = FALSE)
-	. = ..()
-	var/suit = /obj/item/clothing/suit/space/plasman
-	var/helm = /obj/item/clothing/head/helmet/space/plasman
+/datum/species/phoronoid/apply_survival_gear(mob/living/carbon/for_target, list/into_box, list/into_inv)
+	// ensure they have a valid mask
+	var/mask_type = /obj/item/clothing/mask/breath
+	if(for_target)
+		var/obj/item/existing_mask = for_target.inventory.get_slot_single(/datum/inventory_slot/inventory/mask)
+		if(existing_mask?.clothing_flags & ALLOWINTERNALS)
+		else
+			into_inv?.Add(existing_mask)
+			for_target.temporarily_remove_from_inventory(existing_mask, INV_OP_FORCE)
+			for_target.equip_to_slot_or_del(new mask_type(for_target), /datum/inventory_slot/inventory/mask, INV_OP_SILENT | INV_OP_FLUFFLESS)
+	else
+		into_inv?.Add(mask_type)
 
-	H.equip_to_slot_or_del(new /obj/item/clothing/mask/breath(H), SLOT_ID_MASK)
+	var/suit_path = /obj/item/clothing/suit/space/plasman
+	var/helm_path = /obj/item/clothing/head/helmet/space/plasman
 
-	switch(H.mind?.assigned_role)
+	// todo: deal with this dumpster fire of a switch
+	switch(for_target.mind?.assigned_role)
 		if("Security Officer")
-			suit=/obj/item/clothing/suit/space/plasman/sec
-			helm=/obj/item/clothing/head/helmet/space/plasman/sec
+			suit_path = /obj/item/clothing/suit/space/plasman/sec
+			helm_path = /obj/item/clothing/head/helmet/space/plasman/sec
 
 		if("Detective")
-			suit=/obj/item/clothing/suit/space/plasman/sec/detective
-			helm=/obj/item/clothing/head/helmet/space/plasman/sec/detective
+			suit_path = /obj/item/clothing/suit/space/plasman/sec/detective
+			helm_path = /obj/item/clothing/head/helmet/space/plasman/sec/detective
 
 		if("Warden")
-			suit=/obj/item/clothing/suit/space/plasman/sec/warden
-			helm=/obj/item/clothing/head/helmet/space/plasman/sec
+			suit_path = /obj/item/clothing/suit/space/plasman/sec/warden
+			helm_path = /obj/item/clothing/head/helmet/space/plasman/sec
 
 		if("Head of Security")
-			suit=/obj/item/clothing/suit/space/plasman/sec/hos
-			helm=/obj/item/clothing/head/helmet/space/plasman/sec/hos
+			suit_path = /obj/item/clothing/suit/space/plasman/sec/hos
+			helm_path = /obj/item/clothing/head/helmet/space/plasman/sec/hos
 
 		if("Facility Director")
-			suit=/obj/item/clothing/suit/space/plasman/sec/captain
-			helm=/obj/item/clothing/head/helmet/space/plasman/sec/captain
+			suit_path = /obj/item/clothing/suit/space/plasman/sec/captain
+			helm_path = /obj/item/clothing/head/helmet/space/plasman/sec/captain
 
 		if("Head of Personnel")
-			suit=/obj/item/clothing/suit/space/plasman/sec/hop
-			helm=/obj/item/clothing/head/helmet/space/plasman/sec/hop
+			suit_path = /obj/item/clothing/suit/space/plasman/sec/hop
+			helm_path = /obj/item/clothing/head/helmet/space/plasman/sec/hop
 
 		if("Scientist","Roboticist","Xenobiologist")
-			suit=/obj/item/clothing/suit/space/plasman/science
-			helm=/obj/item/clothing/head/helmet/space/plasman/science
+			suit_path = /obj/item/clothing/suit/space/plasman/science
+			helm_path = /obj/item/clothing/head/helmet/space/plasman/science
 
 		if("Explorer","Pilot","Pathfinder")
-			suit=/obj/item/clothing/suit/space/plasman/science/explorer
-			helm=/obj/item/clothing/head/helmet/space/plasman/science/explorer
+			suit_path = /obj/item/clothing/suit/space/plasman/science/explorer
+			helm_path = /obj/item/clothing/head/helmet/space/plasman/science/explorer
 
 		if("Research Director")
-			suit=/obj/item/clothing/suit/space/plasman/science/rd
-			helm=/obj/item/clothing/head/helmet/space/plasman/science/rd
+			suit_path = /obj/item/clothing/suit/space/plasman/science/rd
+			helm_path = /obj/item/clothing/head/helmet/space/plasman/science/rd
 
 		if("Station Engineer")
-			suit=/obj/item/clothing/suit/space/plasman/engi/
-			helm=/obj/item/clothing/head/helmet/space/plasman/engi/
+			suit_path = /obj/item/clothing/suit/space/plasman/engi/
+			helm_path = /obj/item/clothing/head/helmet/space/plasman/engi/
 
 		if("Chief Engineer")
-			suit=/obj/item/clothing/suit/space/plasman/engi/ce
-			helm=/obj/item/clothing/head/helmet/space/plasman/engi/ce
+			suit_path = /obj/item/clothing/suit/space/plasman/engi/ce
+			helm_path = /obj/item/clothing/head/helmet/space/plasman/engi/ce
 
 		if("Atmospheric Technician")
-			suit=/obj/item/clothing/suit/space/plasman/engi/atmos
-			helm=/obj/item/clothing/head/helmet/space/plasman/engi/atmos
+			suit_path = /obj/item/clothing/suit/space/plasman/engi/atmos
+			helm_path = /obj/item/clothing/head/helmet/space/plasman/engi/atmos
 
 		if("Medical Doctor","Paramedic","Psychiatrist")
-			suit=/obj/item/clothing/suit/space/plasman/med
-			helm=/obj/item/clothing/head/helmet/space/plasman/med
+			suit_path = /obj/item/clothing/suit/space/plasman/med
+			helm_path = /obj/item/clothing/head/helmet/space/plasman/med
 
 		if("Field Medic")
-			suit=/obj/item/clothing/suit/space/plasman/med/rescue
-			helm=/obj/item/clothing/head/helmet/space/plasman/med/rescue
+			suit_path = /obj/item/clothing/suit/space/plasman/med/rescue
+			helm_path = /obj/item/clothing/head/helmet/space/plasman/med/rescue
 
 		if("Chemist")
-			suit=/obj/item/clothing/suit/space/plasman/med/chemist
-			helm=/obj/item/clothing/head/helmet/space/plasman/med/chemist
+			suit_path = /obj/item/clothing/suit/space/plasman/med/chemist
+			helm_path = /obj/item/clothing/head/helmet/space/plasman/med/chemist
 
 		if("Chief Medical Officer")
-			suit=/obj/item/clothing/suit/space/plasman/med/cmo
-			helm=/obj/item/clothing/head/helmet/space/plasman/med/cmo
+			suit_path = /obj/item/clothing/suit/space/plasman/med/cmo
+			helm_path = /obj/item/clothing/head/helmet/space/plasman/med/cmo
 
 		if("Bartender","Chef")
-			suit=/obj/item/clothing/suit/space/plasman/service
-			helm=/obj/item/clothing/head/helmet/space/plasman/service
+			suit_path = /obj/item/clothing/suit/space/plasman/service
+			helm_path = /obj/item/clothing/head/helmet/space/plasman/service
 
 		if("Cargo Technician","Quartermaster")
-			suit=/obj/item/clothing/suit/space/plasman/cargo
-			helm=/obj/item/clothing/head/helmet/space/plasman/cargo
+			suit_path = /obj/item/clothing/suit/space/plasman/cargo
+			helm_path = /obj/item/clothing/head/helmet/space/plasman/cargo
 
 		if("Shaft Miner")
-			suit=/obj/item/clothing/suit/space/plasman/cargo/miner
-			helm=/obj/item/clothing/head/helmet/space/plasman/cargo/miner
+			suit_path = /obj/item/clothing/suit/space/plasman/cargo/miner
+			helm_path = /obj/item/clothing/head/helmet/space/plasman/cargo/miner
 
 		if("Botanist")
-			suit=/obj/item/clothing/suit/space/plasman/botanist
-			helm=/obj/item/clothing/head/helmet/space/plasman/botanist
+			suit_path = /obj/item/clothing/suit/space/plasman/botanist
+			helm_path = /obj/item/clothing/head/helmet/space/plasman/botanist
 
 		if("Chaplain")
-			suit=/obj/item/clothing/suit/space/plasman/chaplain
-			helm=/obj/item/clothing/head/helmet/space/plasman/chaplain
+			suit_path = /obj/item/clothing/suit/space/plasman/chaplain
+			helm_path = /obj/item/clothing/head/helmet/space/plasman/chaplain
 
 		if("Janitor")
-			suit=/obj/item/clothing/suit/space/plasman/janitor
-			helm=/obj/item/clothing/head/helmet/space/plasman/janitor
+			suit_path = /obj/item/clothing/suit/space/plasman/janitor
+			helm_path = /obj/item/clothing/head/helmet/space/plasman/janitor
 
 		if("Internal Affairs Agent","Command Secretary")
-			suit=/obj/item/clothing/suit/space/plasman/fancy
-			helm=/obj/item/clothing/head/helmet/space/plasman/fancy
+			suit_path = /obj/item/clothing/suit/space/plasman/fancy
+			helm_path = /obj/item/clothing/head/helmet/space/plasman/fancy
 
 		if("Visitor")
-			suit=/obj/item/clothing/suit/space/plasman/assistant
-			helm=/obj/item/clothing/head/helmet/space/plasman/assistant
+			suit_path = /obj/item/clothing/suit/space/plasman/assistant
+			helm_path = /obj/item/clothing/head/helmet/space/plasman/assistant
 
 		if("Clown")
-			suit=/obj/item/clothing/suit/space/plasman/clown
-			helm=/obj/item/clothing/head/helmet/space/plasman/clown
+			suit_path = /obj/item/clothing/suit/space/plasman/clown
+			helm_path = /obj/item/clothing/head/helmet/space/plasman/clown
 
 		if("Mime")
-			suit=/obj/item/clothing/suit/space/plasman/mime
-			helm=/obj/item/clothing/head/helmet/space/plasman/mime
-	H.equip_to_slot_or_del(new suit(H), SLOT_ID_SUIT)
-	H.equip_to_slot_or_del(new helm(H), SLOT_ID_HEAD)
-	H.put_in_hands_or_del(new /obj/item/extinguisher/mini/plasman(H))
-
-	if(H.backbag == 1)
-		H.equip_to_slot_or_del(new /obj/item/tank/vox(H), SLOT_ID_BACK)
-		H.internal = H.back
+			suit_path = /obj/item/clothing/suit/space/plasman/mime
+			helm_path = /obj/item/clothing/head/helmet/space/plasman/mime
+
+	into_inv += /obj/item/extinguisher/mini/plasman
+
+	if(for_target)
+		var/obj/item/existing_head_slot = for_target.inventory.get_slot_single(/datum/inventory_slot/inventory/head)
+		var/obj/item/existing_suit_slot = for_target.inventory.get_slot_single(/datum/inventory_slot/inventory/suit)
+		var/obj/item/creating_head_slot = new helm_path
+		var/obj/item/creating_suit_slot = new suit_path
+		if(existing_head_slot)
+			if(for_target.temporarily_remove_from_inventory(existing_head_slot, INV_OP_FORCE | INV_OP_SILENT))
+				into_inv?.Add(existing_head_slot)
+				if(!for_target.inventory.equip_to_slot_if_possible(creating_head_slot, /datum/inventory_slot/inventory/head, INV_OP_FORCE | INV_OP_SILENT))
+					into_inv?.Add(creating_head_slot)
+			else
+				into_inv?.Add(creating_head_slot)
+		if(existing_suit_slot)
+			if(for_target.temporarily_remove_from_inventory(existing_suit_slot, INV_OP_FORCE | INV_OP_SILENT))
+				into_inv?.Add(existing_suit_slot)
+				if(!for_target.inventory.equip_to_slot_if_possible(creating_suit_slot, /datum/inventory_slot/inventory/suit, INV_OP_FORCE | INV_OP_SILENT))
+					into_inv?.Add(creating_suit_slot)
+			else
+				into_inv?.Add(creating_suit_slot)
+	else
+		into_inv?.Add(helm_path)
+		into_inv?.Add(suit_path)
+
+	//! legacy: just in case
+	for_target.ExtinguishMob()
+
+	// ensure they have a vox tank
+	var/tank_type = /obj/item/tank/vox
+	if(for_target)
+		var/obj/item/tank/equipping_tank = new tank_type
+		var/could_place = TRUE
+		if(for_target.inventory.equip_to_slot_if_possible(equipping_tank, /datum/inventory_slot/inventory/pocket/left))
+		else if(for_target.inventory.equip_to_slot_if_possible(equipping_tank, /datum/inventory_slot/inventory/pocket/right))
+		else if(for_target.inventory.equip_to_slot_if_possible(equipping_tank, /datum/inventory_slot/inventory/suit_storage))
+		else if(for_target.inventory.put_in_hands(equipping_tank))
+		else
+			could_place = FALSE
+		if(could_place)
+			// todo: refactor this shit
+			for_target.internal = equipping_tank
+			for_target.internals.icon_state = "internal1"
+		else
+			into_inv?.Add(tank_type)
 	else
-		H.equip_to_slot_or_del(new /obj/item/tank/vox(H), SLOT_ID_SUIT_STORAGE)
-		H.internal = H.s_store
-
-	H.internal = locate(/obj/item/tank) in H.contents
-	if(istype(H.internal,/obj/item/tank) && H.internals)
-		H.internals.icon_state = "internal1"
-
-	spawn(2)
-		if(H.head && !istype(H.head,/obj/item/clothing/head/helmet/space/plasman))
-			qdel(H.head)
-			H.equip_to_slot_or_del(new helm(H), SLOT_ID_HEAD)
-			if(H.on_fire)
-				H.ExtinguishMob()
-
-		if(H.wear_suit && !istype(H.wear_suit,/obj/item/clothing/suit/space/plasman))
-			qdel(H.wear_suit)
-			H.equip_to_slot_or_del(new suit(H), SLOT_ID_SUIT)
-			if(H.on_fire)
-				H.ExtinguishMob()
-			H.equip_to_slot_or_del(new /obj/item/tank/vox(H), SLOT_ID_SUIT_STORAGE)
-			H.internal = H.s_store
+		into_inv?.Add(tank_type)
+
+	return ..()
diff --git a/code/modules/species/station/standard/tajaran.dm b/code/modules/species/station/standard/tajaran.dm
index 1e8b8b3bb9cd..b459f8d92664 100644
--- a/code/modules/species/station/standard/tajaran.dm
+++ b/code/modules/species/station/standard/tajaran.dm
@@ -127,6 +127,12 @@
 		/mob/living/carbon/human/proc/hide_tail,
 	)
 
-/datum/species/tajaran/equip_survival_gear(mob/living/carbon/human/H)
-	. = ..()
-	H.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(H), SLOT_ID_SHOES)
+/datum/species/tajaran/apply_racial_gear(mob/living/carbon/for_target, list/into_box, list/into_inv)
+	var/footwear_type = /obj/item/clothing/shoes/sandal
+	if(for_target && !for_target.inventory?.get_slot_single(/datum/inventory_slot/inventory/shoes))
+		var/obj/item/footwear_instance = new footwear_type
+		if(!for_target.inventory.equip_to_slot_if_possible(footwear_instance, /datum/inventory_slot/inventory/shoes))
+			into_inv += footwear_instance
+	else
+		into_inv += footwear_type
+	return ..()
diff --git a/code/modules/species/station/standard/teshari.dm b/code/modules/species/station/standard/teshari.dm
index 2a387379d718..699ca60bd146 100644
--- a/code/modules/species/station/standard/teshari.dm
+++ b/code/modules/species/station/standard/teshari.dm
@@ -178,10 +178,15 @@
 		/obj/item/clothing/suit/straight_jacket,
 	)
 
-
-/datum/species/teshari/equip_survival_gear(mob/living/carbon/human/H)
-	..()
-	H.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(H),SLOT_ID_SHOES)
+/datum/species/teshari/apply_racial_gear(mob/living/carbon/for_target, list/into_box, list/into_inv)
+	var/footwear_type = /obj/item/clothing/shoes/sandal
+	if(for_target && !for_target.inventory?.get_slot_single(/datum/inventory_slot/inventory/shoes))
+		var/obj/item/footwear_instance = new footwear_type
+		if(!for_target.inventory.equip_to_slot_if_possible(footwear_instance, /datum/inventory_slot/inventory/shoes))
+			into_inv += footwear_instance
+	else
+		into_inv += footwear_type
+	return ..()
 
 /datum/species/teshari/handle_falling(mob/living/carbon/human/H, atom/hit_atom, damage_min, damage_max, silent, planetary)
 
diff --git a/code/modules/species/station/standard/unathi.dm b/code/modules/species/station/standard/unathi.dm
index fc7f8fcac053..c0831d4bf9f8 100644
--- a/code/modules/species/station/standard/unathi.dm
+++ b/code/modules/species/station/standard/unathi.dm
@@ -145,6 +145,12 @@
 		/mob/living/carbon/human/proc/hide_tail,
 	)
 
-/datum/species/unathi/equip_survival_gear(mob/living/carbon/human/H)
-	. = ..()
-	H.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(H), SLOT_ID_SHOES)
+/datum/species/unathi/apply_racial_gear(mob/living/carbon/for_target, list/into_box, list/into_inv)
+	var/footwear_type = /obj/item/clothing/shoes/sandal
+	if(for_target && !for_target.inventory?.get_slot_single(/datum/inventory_slot/inventory/shoes))
+		var/obj/item/footwear_instance = new footwear_type
+		if(!for_target.inventory.equip_to_slot_if_possible(footwear_instance, /datum/inventory_slot/inventory/shoes))
+			into_inv += footwear_instance
+	else
+		into_inv += footwear_type
+	return ..()
diff --git a/code/modules/species/station/standard/zaddat.dm b/code/modules/species/station/standard/zaddat.dm
index 911a4a28ec52..044723cb907e 100644
--- a/code/modules/species/station/standard/zaddat.dm
+++ b/code/modules/species/station/standard/zaddat.dm
@@ -96,30 +96,46 @@
 
 	descriptors = list()
 
-/datum/species/zaddat/equip_survival_gear(mob/living/carbon/human/H)
-	..()
-	if(H.wear_suit) //get rid of job labcoats so they don't stop us from equipping the Shroud
-		qdel(H.wear_suit) //if you know how to gently set it in like, their backpack or whatever, be my guest
-	if(H.wear_mask)
-		qdel(H.wear_mask)
-	if(H.head)
-		qdel(H.head)
-
-	H.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/zaddat/(H), SLOT_ID_MASK) // mask has to come first or Shroud helmet will get in the way
-	H.equip_to_slot_or_del(new /obj/item/clothing/suit/space/void/zaddat/(H), SLOT_ID_SUIT)
-
-	var/obj/item/storage/toolbox/lunchbox/survival/L = new(H)
+/datum/species/zaddat/apply_survival_gear(mob/living/carbon/for_target, list/into_box, list/into_inv)
+	// ensure they have a valid mask
+	var/mask_type = /obj/item/clothing/mask/gas/zaddat
+	if(for_target)
+		var/obj/item/existing_mask = for_target.inventory.get_slot_single(/datum/inventory_slot/inventory/mask)
+		if(for_target.temporarily_remove_from_inventory(existing_mask, INV_OP_FORCE | INV_OP_SILENT))
+			into_inv?.Add(existing_mask)
+			var/obj/item/creating_mask = new mask_type
+			if(for_target.inventory.equip_to_slot_if_possible(creating_mask, /datum/inventory_slot/inventory/mask, INV_OP_SILENT | INV_OP_FLUFFLESS))
+			else
+				into_inv?.Add(creating_mask)
+		else
+			into_inv?.Add(mask_type)
+	else
+		into_inv?.Add(mask_type)
+
+	var/suit_path = /obj/item/clothing/suit/space/void/zaddat
+	if(for_target)
+		var/obj/item/existing_suit_slot = for_target.inventory.get_slot_single(/datum/inventory_slot/inventory/suit)
+		var/obj/item/creating_suit_slot = new suit_path
+		if(existing_suit_slot)
+			if(for_target.temporarily_remove_from_inventory(existing_suit_slot, INV_OP_FORCE | INV_OP_SILENT))
+				into_inv?.Add(existing_suit_slot)
+				if(!for_target.inventory.equip_to_slot_if_possible(creating_suit_slot, /datum/inventory_slot/inventory/suit, INV_OP_FORCE | INV_OP_SILENT))
+					into_inv?.Add(creating_suit_slot)
+			else
+				into_inv?.Add(creating_suit_slot)
+	else
+		into_inv?.Add(suit_path)
+
+	var/obj/item/storage/toolbox/lunchbox/survival/L = new
 	new /obj/item/reagent_containers/hypospray/autoinjector/biginjector/glucose(L)
 	new /obj/item/reagent_containers/hypospray/autoinjector/biginjector/glucose(L)
 	new /obj/item/reagent_containers/hypospray/autoinjector/biginjector/glucose(L)
 	new /obj/item/reagent_containers/hypospray/autoinjector/biginjector/glucose(L)
 	new /obj/item/reagent_containers/hypospray/autoinjector/biginjector/glucose(L)
 	new /obj/item/reagent_containers/hypospray/autoinjector/biginjector/glucose(L)
+	into_inv += L
 
-	if(H.backbag == 1)
-		H.put_in_hands_or_del(L)
-	else
-		H.equip_to_slot_or_del(L, /datum/inventory_slot/abstract/put_in_backpack)
+	return ..()
 
 /datum/species/zaddat/handle_environment_special(mob/living/carbon/human/H, datum/gas_mixture/environment, dt)
 
diff --git a/maps/endeavour/levels/flagship.dmm b/maps/endeavour/levels/flagship.dmm
index 2b482e7554d8..fd734c7363ba 100644
--- a/maps/endeavour/levels/flagship.dmm
+++ b/maps/endeavour/levels/flagship.dmm
@@ -15084,14 +15084,14 @@
 /area/centcom/security)
 "Vj" = (
 /obj/structure/table/steel_reinforced,
-/obj/item/storage/box/survival/comp,
-/obj/item/storage/box/survival/comp,
-/obj/item/storage/box/survival/comp,
-/obj/item/storage/box/survival/comp,
-/obj/item/storage/box/survival/comp,
-/obj/item/storage/box/survival/comp,
-/obj/item/storage/box/survival/comp,
-/obj/item/storage/box/survival/comp,
+/obj/item/storage/box/legacy_survival/comp,
+/obj/item/storage/box/legacy_survival/comp,
+/obj/item/storage/box/legacy_survival/comp,
+/obj/item/storage/box/legacy_survival/comp,
+/obj/item/storage/box/legacy_survival/comp,
+/obj/item/storage/box/legacy_survival/comp,
+/obj/item/storage/box/legacy_survival/comp,
+/obj/item/storage/box/legacy_survival/comp,
 /turf/unsimulated/floor{
 	icon_state = "dark"
 	},
diff --git a/maps/rift/levels/rift-11-orbital.dmm b/maps/rift/levels/rift-11-orbital.dmm
index 64ee068034da..51a154262ab2 100644
--- a/maps/rift/levels/rift-11-orbital.dmm
+++ b/maps/rift/levels/rift-11-orbital.dmm
@@ -9573,14 +9573,14 @@
 /area/centcom/specops)
 "Vb" = (
 /obj/structure/table/steel_reinforced,
-/obj/item/storage/box/survival/comp,
-/obj/item/storage/box/survival/comp,
-/obj/item/storage/box/survival/comp,
-/obj/item/storage/box/survival/comp,
-/obj/item/storage/box/survival/comp,
-/obj/item/storage/box/survival/comp,
-/obj/item/storage/box/survival/comp,
-/obj/item/storage/box/survival/comp,
+/obj/item/storage/box/legacy_survival/comp,
+/obj/item/storage/box/legacy_survival/comp,
+/obj/item/storage/box/legacy_survival/comp,
+/obj/item/storage/box/legacy_survival/comp,
+/obj/item/storage/box/legacy_survival/comp,
+/obj/item/storage/box/legacy_survival/comp,
+/obj/item/storage/box/legacy_survival/comp,
+/obj/item/storage/box/legacy_survival/comp,
 /turf/unsimulated/floor/dark,
 /area/centcom/specops)
 "Vd" = (
diff --git a/maps/templates/admin/dhael_centcom.dmm b/maps/templates/admin/dhael_centcom.dmm
index 57ffc8028093..beea1612d512 100644
--- a/maps/templates/admin/dhael_centcom.dmm
+++ b/maps/templates/admin/dhael_centcom.dmm
@@ -10341,22 +10341,22 @@
 /area/centcom/security)
 "Fo" = (
 /obj/structure/table/reinforced,
-/obj/item/storage/box/survival/comp{
+/obj/item/storage/box/legacy_survival/comp{
 	starts_with = list(/obj/item/tool/prybar/red,/obj/item/clothing/glasses/goggles,/obj/item/reagent_containers/hypospray/autoinjector,/obj/item/stack/medical/bruise_pack,/obj/item/flashlight/glowstick,/obj/item/reagent_containers/food/snacks/wrapped/proteinbar,/obj/item/clothing/mask/breath,/obj/item/tank/emergency/oxygen/engi)
 	},
-/obj/item/storage/box/survival/comp{
+/obj/item/storage/box/legacy_survival/comp{
 	starts_with = list(/obj/item/tool/prybar/red,/obj/item/clothing/glasses/goggles,/obj/item/reagent_containers/hypospray/autoinjector,/obj/item/stack/medical/bruise_pack,/obj/item/flashlight/glowstick,/obj/item/reagent_containers/food/snacks/wrapped/proteinbar,/obj/item/clothing/mask/breath,/obj/item/tank/emergency/oxygen/engi)
 	},
-/obj/item/storage/box/survival/comp{
+/obj/item/storage/box/legacy_survival/comp{
 	starts_with = list(/obj/item/tool/prybar/red,/obj/item/clothing/glasses/goggles,/obj/item/reagent_containers/hypospray/autoinjector,/obj/item/stack/medical/bruise_pack,/obj/item/flashlight/glowstick,/obj/item/reagent_containers/food/snacks/wrapped/proteinbar,/obj/item/clothing/mask/breath,/obj/item/tank/emergency/oxygen/engi)
 	},
-/obj/item/storage/box/survival/comp{
+/obj/item/storage/box/legacy_survival/comp{
 	starts_with = list(/obj/item/tool/prybar/red,/obj/item/clothing/glasses/goggles,/obj/item/reagent_containers/hypospray/autoinjector,/obj/item/stack/medical/bruise_pack,/obj/item/flashlight/glowstick,/obj/item/reagent_containers/food/snacks/wrapped/proteinbar,/obj/item/clothing/mask/breath,/obj/item/tank/emergency/oxygen/engi)
 	},
-/obj/item/storage/box/survival/comp{
+/obj/item/storage/box/legacy_survival/comp{
 	starts_with = list(/obj/item/tool/prybar/red,/obj/item/clothing/glasses/goggles,/obj/item/reagent_containers/hypospray/autoinjector,/obj/item/stack/medical/bruise_pack,/obj/item/flashlight/glowstick,/obj/item/reagent_containers/food/snacks/wrapped/proteinbar,/obj/item/clothing/mask/breath,/obj/item/tank/emergency/oxygen/engi)
 	},
-/obj/item/storage/box/survival/comp{
+/obj/item/storage/box/legacy_survival/comp{
 	starts_with = list(/obj/item/tool/prybar/red,/obj/item/clothing/glasses/goggles,/obj/item/reagent_containers/hypospray/autoinjector,/obj/item/stack/medical/bruise_pack,/obj/item/flashlight/glowstick,/obj/item/reagent_containers/food/snacks/wrapped/proteinbar,/obj/item/clothing/mask/breath,/obj/item/tank/emergency/oxygen/engi)
 	},
 /turf/unsimulated/floor{
diff --git a/maps/templates/admin/ert.dmm b/maps/templates/admin/ert.dmm
index 557e41dbcba6..146cbac625b8 100644
--- a/maps/templates/admin/ert.dmm
+++ b/maps/templates/admin/ert.dmm
@@ -1285,7 +1285,7 @@
 "lv" = (
 /obj/structure/closet/wardrobe/ert,
 /obj/item/modular_computer/laptop,
-/obj/item/storage/box/survival/comp{
+/obj/item/storage/box/legacy_survival/comp{
 	starts_with = list(/obj/item/tool/prybar/red,/obj/item/clothing/glasses/goggles,/obj/item/reagent_containers/hypospray/autoinjector,/obj/item/stack/medical/bruise_pack,/obj/item/flashlight/glowstick,/obj/item/reagent_containers/food/snacks/wrapped/proteinbar,/obj/item/clothing/mask/breath,/obj/item/tank/emergency/oxygen/engi)
 	},
 /obj/effect/floor_decal/industrial/outline/grey,
@@ -2447,7 +2447,7 @@
 "sz" = (
 /obj/structure/closet/wardrobe/ert,
 /obj/item/modular_computer/laptop,
-/obj/item/storage/box/survival/comp{
+/obj/item/storage/box/legacy_survival/comp{
 	starts_with = list(/obj/item/tool/prybar/red,/obj/item/clothing/glasses/goggles,/obj/item/reagent_containers/hypospray/autoinjector,/obj/item/stack/medical/bruise_pack,/obj/item/flashlight/glowstick,/obj/item/reagent_containers/food/snacks/wrapped/proteinbar,/obj/item/clothing/mask/breath,/obj/item/tank/emergency/oxygen/engi)
 	},
 /obj/machinery/light,
@@ -4257,7 +4257,7 @@
 "Gw" = (
 /obj/structure/closet/wardrobe/ert,
 /obj/item/modular_computer/laptop,
-/obj/item/storage/box/survival/comp{
+/obj/item/storage/box/legacy_survival/comp{
 	starts_with = list(/obj/item/tool/prybar/red,/obj/item/clothing/glasses/goggles,/obj/item/reagent_containers/hypospray/autoinjector,/obj/item/stack/medical/bruise_pack,/obj/item/flashlight/glowstick,/obj/item/reagent_containers/food/snacks/wrapped/proteinbar,/obj/item/clothing/mask/breath,/obj/item/tank/emergency/oxygen/engi)
 	},
 /obj/machinery/light{
diff --git a/maps/templates/admin/ert_base.dmm b/maps/templates/admin/ert_base.dmm
index b82c3d08903c..4bca0261c364 100644
--- a/maps/templates/admin/ert_base.dmm
+++ b/maps/templates/admin/ert_base.dmm
@@ -211,7 +211,7 @@
 "az" = (
 /obj/structure/closet/wardrobe/ert,
 /obj/item/modular_computer/laptop/preset/custom_loadout/elite,
-/obj/item/storage/box/survival/comp{
+/obj/item/storage/box/legacy_survival/comp{
 	starts_with = list(/obj/item/tool/prybar/red,/obj/item/clothing/glasses/goggles,/obj/item/reagent_containers/hypospray/autoinjector,/obj/item/stack/medical/bruise_pack,/obj/item/flashlight/glowstick,/obj/item/reagent_containers/food/snacks/wrapped/proteinbar,/obj/item/clothing/mask/breath,/obj/item/tank/emergency/oxygen/engi)
 	},
 /turf/simulated/shuttle/floor/black,
@@ -222,7 +222,7 @@
 /obj/machinery/light{
 	dir = 1
 	},
-/obj/item/storage/box/survival/comp{
+/obj/item/storage/box/legacy_survival/comp{
 	starts_with = list(/obj/item/tool/prybar/red,/obj/item/clothing/glasses/goggles,/obj/item/reagent_containers/hypospray/autoinjector,/obj/item/stack/medical/bruise_pack,/obj/item/flashlight/glowstick,/obj/item/reagent_containers/food/snacks/wrapped/proteinbar,/obj/item/clothing/mask/breath,/obj/item/tank/emergency/oxygen/engi)
 	},
 /turf/simulated/shuttle/floor/black,
diff --git a/maps/templates/shelters/shelter_2.dmm b/maps/templates/shelters/shelter_2.dmm
index 90940ce2c552..23f6355c0e38 100644
--- a/maps/templates/shelters/shelter_2.dmm
+++ b/maps/templates/shelters/shelter_2.dmm
@@ -50,7 +50,7 @@
 /obj/item/fbp_backup_cell,
 /obj/item/fbp_backup_cell,
 /obj/item/storage/pill_bottle/antitox,
-/obj/item/storage/box/survival/space,
+/obj/item/storage/box/legacy_survival/space,
 /obj/item/healthanalyzer,
 /obj/item/storage/pill_bottle/dice_nerd,
 /turf/simulated/shuttle/floor/voidcraft,
diff --git a/maps/templates/shelters/shelter_4.dmm b/maps/templates/shelters/shelter_4.dmm
index 4995bc145b32..b7ef075b8aa4 100644
--- a/maps/templates/shelters/shelter_4.dmm
+++ b/maps/templates/shelters/shelter_4.dmm
@@ -60,15 +60,15 @@
 /obj/item/survivalcapsule,
 /obj/item/survivalcapsule,
 /obj/item/survivalcapsule,
-/obj/item/storage/box/survival/space,
-/obj/item/storage/box/survival/space,
-/obj/item/storage/box/survival/space,
-/obj/item/storage/box/survival/space,
+/obj/item/storage/box/legacy_survival/space,
+/obj/item/storage/box/legacy_survival/space,
+/obj/item/storage/box/legacy_survival/space,
+/obj/item/storage/box/legacy_survival/space,
 /obj/item/gun/energy/frontier/locked/holdout,
 /obj/item/gun/energy/frontier/locked/holdout,
 /obj/item/bluespace_radio/commerce,
-/obj/item/storage/box/survival/comp,
-/obj/item/storage/box/survival/comp,
+/obj/item/storage/box/legacy_survival/comp,
+/obj/item/storage/box/legacy_survival/comp,
 /obj/item/binoculars,
 /obj/item/perfect_tele,
 /obj/item/storage/pill_bottle/nutriment,
@@ -116,7 +116,7 @@
 /obj/item/gun/ballistic/pistol,
 /obj/item/clothing/accessory/storage/black_vest,
 /obj/item/material/knife/tacknife/survival,
-/obj/item/storage/box/survival/comp,
+/obj/item/storage/box/legacy_survival/comp,
 /turf/simulated/floor/carpet/bcarpet,
 /area/survivalpod)
 "k" = (
@@ -242,7 +242,7 @@
 /obj/item/gun/ballistic/pistol,
 /obj/item/clothing/accessory/storage/black_vest,
 /obj/item/material/knife/tacknife/survival,
-/obj/item/storage/box/survival/comp{
+/obj/item/storage/box/legacy_survival/comp{
 	starts_with = list(/obj/item/tool/prybar/red,/obj/item/clothing/glasses/goggles,/obj/item/reagent_containers/hypospray/autoinjector,/obj/item/stack/medical/bruise_pack,/obj/item/flashlight/glowstick,/obj/item/reagent_containers/food/snacks/wrapped/proteinbar,/obj/item/clothing/mask/breath,/obj/item/tank/emergency/oxygen/engi)
 	},
 /turf/simulated/floor/carpet/bcarpet,
diff --git a/maps/templates/shelters/shelter_a.dmm b/maps/templates/shelters/shelter_a.dmm
index b1df9619c991..0738467e6f0d 100644
--- a/maps/templates/shelters/shelter_a.dmm
+++ b/maps/templates/shelters/shelter_a.dmm
@@ -68,10 +68,10 @@
 /obj/item/storage/firstaid/adv,
 /obj/item/storage/firstaid/regular,
 /obj/item/modular_computer/laptop/preset/custom_loadout/rugged,
-/obj/item/storage/box/survival/comp{
+/obj/item/storage/box/legacy_survival/comp{
 	starts_with = list(/obj/item/tool/prybar/red,/obj/item/clothing/glasses/goggles,/obj/item/reagent_containers/hypospray/autoinjector,/obj/item/stack/medical/bruise_pack,/obj/item/flashlight/glowstick,/obj/item/reagent_containers/food/snacks/wrapped/proteinbar,/obj/item/clothing/mask/breath,/obj/item/tank/emergency/oxygen/engi)
 	},
-/obj/item/storage/box/survival/space,
+/obj/item/storage/box/legacy_survival/space,
 /obj/item/extinguisher/mini,
 /obj/item/radio{
 	icon_state = "walkietalkieOLD";
diff --git a/maps/templates/shuttles/overmaps/generic/cruiser.dmm b/maps/templates/shuttles/overmaps/generic/cruiser.dmm
index edee389cfccd..2a4525f28f68 100644
--- a/maps/templates/shuttles/overmaps/generic/cruiser.dmm
+++ b/maps/templates/shuttles/overmaps/generic/cruiser.dmm
@@ -1731,11 +1731,11 @@
 /area/mothership/dorm1)
 "eb" = (
 /obj/structure/closet/wardrobe/ert,
-/obj/item/storage/box/survival/comp{
+/obj/item/storage/box/legacy_survival/comp{
 	starts_with = list(/obj/item/tool/prybar/red,/obj/item/clothing/glasses/goggles,/obj/item/reagent_containers/hypospray/autoinjector,/obj/item/stack/medical/bruise_pack,/obj/item/flashlight/glowstick,/obj/item/reagent_containers/food/snacks/wrapped/proteinbar,/obj/item/clothing/mask/breath,/obj/item/tank/emergency/oxygen/engi)
 	},
 /obj/machinery/atmospherics/component/unary/vent_scrubber/on,
-/obj/item/storage/box/survival/space,
+/obj/item/storage/box/legacy_survival/space,
 /obj/item/storage/toolbox/emergency,
 /turf/simulated/floor/wood,
 /area/mothership/dorm1)
@@ -1782,11 +1782,11 @@
 /area/mothership/teleporter)
 "ei" = (
 /obj/structure/closet/wardrobe/ert,
-/obj/item/storage/box/survival/comp{
+/obj/item/storage/box/legacy_survival/comp{
 	starts_with = list(/obj/item/tool/prybar/red,/obj/item/clothing/glasses/goggles,/obj/item/reagent_containers/hypospray/autoinjector,/obj/item/stack/medical/bruise_pack,/obj/item/flashlight/glowstick,/obj/item/reagent_containers/food/snacks/wrapped/proteinbar,/obj/item/clothing/mask/breath,/obj/item/tank/emergency/oxygen/engi)
 	},
 /obj/machinery/atmospherics/component/unary/vent_scrubber/on,
-/obj/item/storage/box/survival/space,
+/obj/item/storage/box/legacy_survival/space,
 /obj/item/storage/toolbox/emergency,
 /turf/simulated/floor/wood,
 /area/mothership/dorm2)
@@ -3541,25 +3541,25 @@
 /area/mothership/dorm3)
 "ig" = (
 /obj/structure/closet/wardrobe/ert,
-/obj/item/storage/box/survival/comp{
+/obj/item/storage/box/legacy_survival/comp{
 	starts_with = list(/obj/item/tool/prybar/red,/obj/item/clothing/glasses/goggles,/obj/item/reagent_containers/hypospray/autoinjector,/obj/item/stack/medical/bruise_pack,/obj/item/flashlight/glowstick,/obj/item/reagent_containers/food/snacks/wrapped/proteinbar,/obj/item/clothing/mask/breath,/obj/item/tank/emergency/oxygen/engi)
 	},
 /obj/machinery/atmospherics/component/unary/vent_scrubber/on{
 	dir = 1
 	},
-/obj/item/storage/box/survival/space,
+/obj/item/storage/box/legacy_survival/space,
 /obj/item/storage/toolbox/emergency,
 /turf/simulated/floor/wood,
 /area/mothership/dorm3)
 "ih" = (
 /obj/structure/closet/wardrobe/ert,
-/obj/item/storage/box/survival/comp{
+/obj/item/storage/box/legacy_survival/comp{
 	starts_with = list(/obj/item/tool/prybar/red,/obj/item/clothing/glasses/goggles,/obj/item/reagent_containers/hypospray/autoinjector,/obj/item/stack/medical/bruise_pack,/obj/item/flashlight/glowstick,/obj/item/reagent_containers/food/snacks/wrapped/proteinbar,/obj/item/clothing/mask/breath,/obj/item/tank/emergency/oxygen/engi)
 	},
 /obj/machinery/atmospherics/component/unary/vent_scrubber/on{
 	dir = 1
 	},
-/obj/item/storage/box/survival/space,
+/obj/item/storage/box/legacy_survival/space,
 /obj/item/storage/toolbox/emergency,
 /turf/simulated/floor/wood,
 /area/mothership/dorm4)
@@ -4657,11 +4657,11 @@
 /area/mothership/dorm5)
 "kF" = (
 /obj/structure/closet/wardrobe/ert,
-/obj/item/storage/box/survival/comp{
+/obj/item/storage/box/legacy_survival/comp{
 	starts_with = list(/obj/item/tool/prybar/red,/obj/item/clothing/glasses/goggles,/obj/item/reagent_containers/hypospray/autoinjector,/obj/item/stack/medical/bruise_pack,/obj/item/flashlight/glowstick,/obj/item/reagent_containers/food/snacks/wrapped/proteinbar,/obj/item/clothing/mask/breath,/obj/item/tank/emergency/oxygen/engi)
 	},
 /obj/machinery/atmospherics/component/unary/vent_scrubber/on,
-/obj/item/storage/box/survival/space,
+/obj/item/storage/box/legacy_survival/space,
 /obj/item/storage/toolbox/emergency,
 /turf/simulated/floor/wood,
 /area/mothership/dorm5)
@@ -4673,11 +4673,11 @@
 /area/mothership/dorm6)
 "kI" = (
 /obj/structure/closet/wardrobe/ert,
-/obj/item/storage/box/survival/comp{
+/obj/item/storage/box/legacy_survival/comp{
 	starts_with = list(/obj/item/tool/prybar/red,/obj/item/clothing/glasses/goggles,/obj/item/reagent_containers/hypospray/autoinjector,/obj/item/stack/medical/bruise_pack,/obj/item/flashlight/glowstick,/obj/item/reagent_containers/food/snacks/wrapped/proteinbar,/obj/item/clothing/mask/breath,/obj/item/tank/emergency/oxygen/engi)
 	},
 /obj/machinery/atmospherics/component/unary/vent_scrubber/on,
-/obj/item/storage/box/survival/space,
+/obj/item/storage/box/legacy_survival/space,
 /obj/item/storage/toolbox/emergency,
 /turf/simulated/floor/wood,
 /area/mothership/dorm6)
@@ -6861,7 +6861,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 9
 	},
-/obj/item/storage/box/survival/space,
+/obj/item/storage/box/legacy_survival/space,
 /turf/simulated/floor/tiled/techfloor,
 /area/mothership/holodeck)
 "pe" = (
@@ -7609,12 +7609,12 @@
 	dir = 1
 	},
 /obj/structure/closet/emcloset/legacy,
-/obj/item/storage/box/survival/space,
-/obj/item/storage/box/survival/space,
-/obj/item/storage/box/survival/space,
-/obj/item/storage/box/survival/space,
-/obj/item/storage/box/survival/space,
-/obj/item/storage/box/survival/space,
+/obj/item/storage/box/legacy_survival/space,
+/obj/item/storage/box/legacy_survival/space,
+/obj/item/storage/box/legacy_survival/space,
+/obj/item/storage/box/legacy_survival/space,
+/obj/item/storage/box/legacy_survival/space,
+/obj/item/storage/box/legacy_survival/space,
 /obj/item/storage/box/syndie_kit/space,
 /obj/item/storage/box/syndie_kit/space,
 /turf/simulated/floor/tiled/steel_grid,
diff --git a/maps/templates/shuttles/overmaps/generic/overmap_ship_paperclipper.dmm b/maps/templates/shuttles/overmaps/generic/overmap_ship_paperclipper.dmm
index faa824a293f2..9f01169a2c8e 100644
--- a/maps/templates/shuttles/overmaps/generic/overmap_ship_paperclipper.dmm
+++ b/maps/templates/shuttles/overmaps/generic/overmap_ship_paperclipper.dmm
@@ -705,10 +705,10 @@
 /obj/effect/floor_decal/techfloor{
 	dir = 1
 	},
-/obj/item/storage/box/survival/space,
-/obj/item/storage/box/survival/space,
-/obj/item/storage/box/survival/space,
-/obj/item/storage/box/survival/space,
+/obj/item/storage/box/legacy_survival/space,
+/obj/item/storage/box/legacy_survival/space,
+/obj/item/storage/box/legacy_survival/space,
+/obj/item/storage/box/legacy_survival/space,
 /obj/item/gps,
 /obj/item/tank/emergency/oxygen/engi,
 /obj/item/tank/emergency/oxygen/engi,
diff --git a/maps/templates/shuttles/overmaps/generic/shelter_5.dmm b/maps/templates/shuttles/overmaps/generic/shelter_5.dmm
index 912e1e3267cf..a86910d30893 100644
--- a/maps/templates/shuttles/overmaps/generic/shelter_5.dmm
+++ b/maps/templates/shuttles/overmaps/generic/shelter_5.dmm
@@ -44,10 +44,10 @@
 /obj/effect/floor_decal/techfloor{
 	dir = 1
 	},
-/obj/item/storage/box/survival/space,
-/obj/item/storage/box/survival/space,
-/obj/item/storage/box/survival/space,
-/obj/item/storage/box/survival/space,
+/obj/item/storage/box/legacy_survival/space,
+/obj/item/storage/box/legacy_survival/space,
+/obj/item/storage/box/legacy_survival/space,
+/obj/item/storage/box/legacy_survival/space,
 /obj/item/gps,
 /obj/item/tank/emergency/oxygen/engi,
 /obj/item/tank/emergency/oxygen/engi,
diff --git a/maps/templates/shuttles/overmaps/generic/shelter_6.dmm b/maps/templates/shuttles/overmaps/generic/shelter_6.dmm
index c215d0831b02..51944373eb4e 100644
--- a/maps/templates/shuttles/overmaps/generic/shelter_6.dmm
+++ b/maps/templates/shuttles/overmaps/generic/shelter_6.dmm
@@ -600,14 +600,14 @@
 	name = "Internals Locker";
 	pixel_y = -32
 	},
-/obj/item/storage/box/survival/space,
-/obj/item/storage/box/survival/space,
-/obj/item/storage/box/survival/space,
-/obj/item/storage/box/survival/space,
-/obj/item/storage/box/survival/space,
-/obj/item/storage/box/survival/space,
-/obj/item/storage/box/survival/space,
-/obj/item/storage/box/survival/space,
+/obj/item/storage/box/legacy_survival/space,
+/obj/item/storage/box/legacy_survival/space,
+/obj/item/storage/box/legacy_survival/space,
+/obj/item/storage/box/legacy_survival/space,
+/obj/item/storage/box/legacy_survival/space,
+/obj/item/storage/box/legacy_survival/space,
+/obj/item/storage/box/legacy_survival/space,
+/obj/item/storage/box/legacy_survival/space,
 /obj/item/storage/toolbox/emergency,
 /obj/item/storage/toolbox/emergency,
 /obj/item/storage/toolbox/emergency,
@@ -693,22 +693,22 @@
 /obj/item/clothing/under/ert,
 /obj/item/clothing/under/ert,
 /obj/item/clothing/under/ert,
-/obj/item/storage/box/survival/comp{
+/obj/item/storage/box/legacy_survival/comp{
 	starts_with = list(/obj/item/tool/prybar/red,/obj/item/clothing/glasses/goggles,/obj/item/reagent_containers/hypospray/autoinjector,/obj/item/stack/medical/bruise_pack,/obj/item/flashlight/glowstick,/obj/item/reagent_containers/food/snacks/wrapped/proteinbar,/obj/item/clothing/mask/breath,/obj/item/tank/emergency/oxygen/engi)
 	},
-/obj/item/storage/box/survival/comp{
+/obj/item/storage/box/legacy_survival/comp{
 	starts_with = list(/obj/item/tool/prybar/red,/obj/item/clothing/glasses/goggles,/obj/item/reagent_containers/hypospray/autoinjector,/obj/item/stack/medical/bruise_pack,/obj/item/flashlight/glowstick,/obj/item/reagent_containers/food/snacks/wrapped/proteinbar,/obj/item/clothing/mask/breath,/obj/item/tank/emergency/oxygen/engi)
 	},
-/obj/item/storage/box/survival/comp{
+/obj/item/storage/box/legacy_survival/comp{
 	starts_with = list(/obj/item/tool/prybar/red,/obj/item/clothing/glasses/goggles,/obj/item/reagent_containers/hypospray/autoinjector,/obj/item/stack/medical/bruise_pack,/obj/item/flashlight/glowstick,/obj/item/reagent_containers/food/snacks/wrapped/proteinbar,/obj/item/clothing/mask/breath,/obj/item/tank/emergency/oxygen/engi)
 	},
-/obj/item/storage/box/survival/comp{
+/obj/item/storage/box/legacy_survival/comp{
 	starts_with = list(/obj/item/tool/prybar/red,/obj/item/clothing/glasses/goggles,/obj/item/reagent_containers/hypospray/autoinjector,/obj/item/stack/medical/bruise_pack,/obj/item/flashlight/glowstick,/obj/item/reagent_containers/food/snacks/wrapped/proteinbar,/obj/item/clothing/mask/breath,/obj/item/tank/emergency/oxygen/engi)
 	},
-/obj/item/storage/box/survival/comp{
+/obj/item/storage/box/legacy_survival/comp{
 	starts_with = list(/obj/item/tool/prybar/red,/obj/item/clothing/glasses/goggles,/obj/item/reagent_containers/hypospray/autoinjector,/obj/item/stack/medical/bruise_pack,/obj/item/flashlight/glowstick,/obj/item/reagent_containers/food/snacks/wrapped/proteinbar,/obj/item/clothing/mask/breath,/obj/item/tank/emergency/oxygen/engi)
 	},
-/obj/item/storage/box/survival/comp{
+/obj/item/storage/box/legacy_survival/comp{
 	starts_with = list(/obj/item/tool/prybar/red,/obj/item/clothing/glasses/goggles,/obj/item/reagent_containers/hypospray/autoinjector,/obj/item/stack/medical/bruise_pack,/obj/item/flashlight/glowstick,/obj/item/reagent_containers/food/snacks/wrapped/proteinbar,/obj/item/clothing/mask/breath,/obj/item/tank/emergency/oxygen/engi)
 	},
 /obj/item/perfect_tele,
diff --git a/maps/triumph/levels/flagship.dmm b/maps/triumph/levels/flagship.dmm
index b4be9d2061d9..5a692de119af 100644
--- a/maps/triumph/levels/flagship.dmm
+++ b/maps/triumph/levels/flagship.dmm
@@ -15084,14 +15084,14 @@
 /area/centcom/security)
 "Vj" = (
 /obj/structure/table/steel_reinforced,
-/obj/item/storage/box/survival/comp,
-/obj/item/storage/box/survival/comp,
-/obj/item/storage/box/survival/comp,
-/obj/item/storage/box/survival/comp,
-/obj/item/storage/box/survival/comp,
-/obj/item/storage/box/survival/comp,
-/obj/item/storage/box/survival/comp,
-/obj/item/storage/box/survival/comp,
+/obj/item/storage/box/legacy_survival/comp,
+/obj/item/storage/box/legacy_survival/comp,
+/obj/item/storage/box/legacy_survival/comp,
+/obj/item/storage/box/legacy_survival/comp,
+/obj/item/storage/box/legacy_survival/comp,
+/obj/item/storage/box/legacy_survival/comp,
+/obj/item/storage/box/legacy_survival/comp,
+/obj/item/storage/box/legacy_survival/comp,
 /turf/unsimulated/floor{
 	icon_state = "dark"
 	},

From 90dfcd3f87b6af116ac1e5f7e55003af5de88000 Mon Sep 17 00:00:00 2001
From: silicons <2003111+silicons@users.noreply.github.com>
Date: Tue, 17 Dec 2024 02:40:59 -0500
Subject: [PATCH 12/25] That

---
 code/datums/outfits/outfit.dm                 | 41 +++++++++-
 code/game/objects/items/devices/flashlight.dm |  3 +
 code/modules/ghostroles/instantiator.dm       |  1 -
 code/modules/species/species.dm               | 78 +++++++------------
 maps/endeavour/levels/flagship.dmm            | 16 ++--
 5 files changed, 78 insertions(+), 61 deletions(-)

diff --git a/code/datums/outfits/outfit.dm b/code/datums/outfits/outfit.dm
index 85823242f516..7c69d022692e 100644
--- a/code/datums/outfits/outfit.dm
+++ b/code/datums/outfits/outfit.dm
@@ -141,8 +141,45 @@
 		for(var/i=0,i<number,i++)
 			H.equip_to_slot_or_del(new path(H), /datum/inventory_slot/abstract/attach_as_accessory, INV_OP_FLUFFLESS | INV_OP_SILENT)
 
-	if(H.species)
-		H.species.equip_survival_gear(H, flags&OUTFIT_EXTENDED_SURVIVAL, flags&OUTFIT_COMPREHENSIVE_SURVIVAL)
+	// deal with racial & survival gear
+	var/list/to_inject_box = list()
+	var/list/to_inject_inv = list()
+	H.species.apply_survival_gear(H, to_inject_box, to_inject_inv)
+	H.species.apply_racial_gear(H, to_inject_box, to_inject_inv)
+
+	if(length(to_inject_box))
+		var/obj/item/box/survival/survival_box = new
+		for(var/descriptor in to_inject_box)
+			if(ispath(descriptor))
+				new descriptor(survival_box)
+			else if(IS_ANONYMOUS_TYPEPATH(descriptor))
+				new descriptor(survival_box)
+			else if(isitem(descriptor))
+				var/obj/item/moving = descriptor
+				moving.forceMove(survival_box)
+			else
+				stack_trace("invalid descriptor '[descriptor]' encountered")
+		survival_box.obj_storage.fit_to_contents(no_shrink = TRUE)
+		#warn put somewhere
+
+	if(length(to_inject_inv))
+		var/list/atom/movable/arbitrary_instantiated_gear = list()
+		for(var/descriptor in to_inject_inv)
+			if(ispath(descriptor))
+				arbitrary_instantiated_gear += new descriptor
+			else if(IS_ANONYMOUS_TYPEPATH(descriptor))
+				arbitrary_instantiated_gear += new descriptor
+			else if(ismovale(descriptor))
+				arbitrary_instantiated_gear += descriptor
+			else
+				stack_trace("invalid descriptor '[descriptor]' encountered")
+		for(var/atom/movable/gear as anything in arbitrary_instantiated_gear)
+			if(isitem(gear))
+				// try to put into inv, then hands, then nearby
+				var/obj/item/gear_item = gear
+			else
+				// put nearby
+			#warn handle
 
 /datum/outfit/proc/equip_id(mob/living/carbon/human/H, rank, assignment)
 	if(!id_slot || !id_type)
diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm
index 5e4f88d287b6..41c7f51d6e53 100644
--- a/code/game/objects/items/devices/flashlight.dm
+++ b/code/game/objects/items/devices/flashlight.dm
@@ -410,6 +410,9 @@
 	START_PROCESSING(SSobj, src)
 	return TRUE
 
+/obj/item/flashlight/flare/survival
+	// todo: make this last like 15 minutes
+
 //Glowsticks
 
 /obj/item/flashlight/glowstick
diff --git a/code/modules/ghostroles/instantiator.dm b/code/modules/ghostroles/instantiator.dm
index 2b532457ddf5..6f57de290f96 100644
--- a/code/modules/ghostroles/instantiator.dm
+++ b/code/modules/ghostroles/instantiator.dm
@@ -76,7 +76,6 @@
 		O = new O
 	O.equip(M)
 
-	H.species.equip_survival_gear(H, TRUE, TRUE)
 	// H.dna.species.after_equip_job(null, H)
 
 /**
diff --git a/code/modules/species/species.dm b/code/modules/species/species.dm
index 2a3f4d05c0a1..a94db7053bb6 100644
--- a/code/modules/species/species.dm
+++ b/code/modules/species/species.dm
@@ -672,59 +672,37 @@ GLOBAL_LIST_INIT(species_oxygen_tank_by_gas, list(
  *              things will not necessarily be put in their backpack, as an example a wheelchair would be put under them.
  */
 /datum/species/proc/apply_survival_gear(mob/living/carbon/for_target, list/into_box, list/into_inv)
+	into_box?.Add(/obj/item/tool/prybar/red)
 
-	new /obj/item/tool/prybar/red(L)
-	#warn give them a flare
+	// todo: crank flashlight + prybar combo?
+	into_box?.Add(/obj/item/flashlight/flare/survival)
 
-#warn below
-
-/datum/species/proc/equip_survival_gear(var/mob/living/carbon/human/H,var/extendedtank = 0,var/comprehensive = 0)
-	var/boxtype = /obj/item/storage/box/legacy_survival //Default survival box
-
-
-	var/synth = H.isSynthetic()
-
-	//Empty box for synths
-	if(synth)
-		boxtype = /obj/item/storage/box/legacy_survival/synth
-
-	//Special box with extra equipment
-	else if(comprehensive)
-		boxtype = /obj/item/storage/box/legacy_survival/comp
-
-	//Create the box
-	var/obj/item/storage/box/box = new boxtype(H)
-
-	//If not synth, they get an air tank (if they breathe)
-	if(!synth && breath_type)
-		//Create a tank (if such a thing exists for this species)
-		var/given_path = GLOB.species_oxygen_tank_by_gas[breath_type]
-		var/tankpath
-		if(extendedtank)
-			tankpath = text2path("[given_path]" + "/engi")
-			if(!tankpath) //Is it just that there's no /engi?
-				tankpath = text2path("[given_path]" + "/double")
-
-		if(!tankpath)
-			tankpath = given_path
-
-		if(tankpath)
-			new tankpath(box)
-		else
-			stack_trace("Could not find a tank path for breath type [breath_type], given path was [given_path].")
-
-	//If they are synth, they get a smol battery
-	else if(synth)
-		new /obj/item/fbp_backup_cell(box)
-
-	box.obj_storage.fit_to_contents(no_shrink = TRUE)
-
-	if(H.backbag == 1)
-		H.equip_to_slot_or_del(box, /datum/inventory_slot/abstract/hand/right, INV_OP_SILENT | INV_OP_FLUFFLESS)
+	if(for_target.isSynthetic())
+		into_box?.Add(/obj/item/fbp_backup_cell)
 	else
-		H.equip_to_slot_or_del(box, /datum/inventory_slot/abstract/put_in_backpack, INV_OP_FORCE | INV_OP_SILENT)
-
-#warn above
+		into_box?.Add(
+			/obj/item/clothing/mask/breath,
+			/obj/item/stack/medical/bruise_pack,
+			/obj/item/reagent_containers/hypospray/autoinjector,
+			/obj/item/reagent_containers/food/snacks/wrapped/proteinbar,
+			/obj/item/clothing/glasses/goggles,
+		)
+
+		if(breath_type)
+			var/given_path = GLOB.species_oxygen_tank_by_gas[breath_type]
+			var/tankpath
+			if(extendedtank)
+				tankpath = text2path("[given_path]" + "/engi")
+				if(!tankpath) //Is it just that there's no /engi?
+					tankpath = text2path("[given_path]" + "/double")
+
+			if(!tankpath)
+				tankpath = given_path
+
+			if(tankpath)
+				into_box?.Add(tankpath)
+			else
+				stack_trace("Could not find a tank path for breath type [breath_type], given path was [given_path].")
 
 /**
  * called to ensure organs are consistent with our species's
diff --git a/maps/endeavour/levels/flagship.dmm b/maps/endeavour/levels/flagship.dmm
index 2b482e7554d8..fd734c7363ba 100644
--- a/maps/endeavour/levels/flagship.dmm
+++ b/maps/endeavour/levels/flagship.dmm
@@ -15084,14 +15084,14 @@
 /area/centcom/security)
 "Vj" = (
 /obj/structure/table/steel_reinforced,
-/obj/item/storage/box/survival/comp,
-/obj/item/storage/box/survival/comp,
-/obj/item/storage/box/survival/comp,
-/obj/item/storage/box/survival/comp,
-/obj/item/storage/box/survival/comp,
-/obj/item/storage/box/survival/comp,
-/obj/item/storage/box/survival/comp,
-/obj/item/storage/box/survival/comp,
+/obj/item/storage/box/legacy_survival/comp,
+/obj/item/storage/box/legacy_survival/comp,
+/obj/item/storage/box/legacy_survival/comp,
+/obj/item/storage/box/legacy_survival/comp,
+/obj/item/storage/box/legacy_survival/comp,
+/obj/item/storage/box/legacy_survival/comp,
+/obj/item/storage/box/legacy_survival/comp,
+/obj/item/storage/box/legacy_survival/comp,
 /turf/unsimulated/floor{
 	icon_state = "dark"
 	},

From d99d384b4c28a144ace0c06f678841c2ba812c23 Mon Sep 17 00:00:00 2001
From: silicons <2003111+silicons@users.noreply.github.com>
Date: Tue, 17 Dec 2024 02:56:23 -0500
Subject: [PATCH 13/25] update

---
 code/datums/outfits/outfit.dm                 | 22 +++++++--
 .../mob/inventory/inventory-slot-equip.dm     | 46 +++++++++++++++----
 code/modules/species/promethean/promethean.dm |  2 +-
 code/modules/species/protean/protean.dm       |  4 +-
 code/modules/species/species.dm               |  4 +-
 5 files changed, 60 insertions(+), 18 deletions(-)

diff --git a/code/datums/outfits/outfit.dm b/code/datums/outfits/outfit.dm
index 7c69d022692e..c377c1e9964e 100644
--- a/code/datums/outfits/outfit.dm
+++ b/code/datums/outfits/outfit.dm
@@ -148,7 +148,7 @@
 	H.species.apply_racial_gear(H, to_inject_box, to_inject_inv)
 
 	if(length(to_inject_box))
-		var/obj/item/box/survival/survival_box = new
+		var/obj/item/survival_box = new /obj/item/storage/box/survival
 		for(var/descriptor in to_inject_box)
 			if(ispath(descriptor))
 				new descriptor(survival_box)
@@ -160,7 +160,10 @@
 			else
 				stack_trace("invalid descriptor '[descriptor]' encountered")
 		survival_box.obj_storage.fit_to_contents(no_shrink = TRUE)
-		#warn put somewhere
+
+		if(!H.inventory.equip_to_slot_if_possible(survival_box, /datum/inventory_slot/abstract/put_in_backpack))
+			if(!H.inventory.put_in_hands(survival_box))
+				survival_box.forceMove(H.drop_location())
 
 	if(length(to_inject_inv))
 		var/list/atom/movable/arbitrary_instantiated_gear = list()
@@ -169,7 +172,7 @@
 				arbitrary_instantiated_gear += new descriptor
 			else if(IS_ANONYMOUS_TYPEPATH(descriptor))
 				arbitrary_instantiated_gear += new descriptor
-			else if(ismovale(descriptor))
+			else if(ismovable(descriptor))
 				arbitrary_instantiated_gear += descriptor
 			else
 				stack_trace("invalid descriptor '[descriptor]' encountered")
@@ -177,9 +180,20 @@
 			if(isitem(gear))
 				// try to put into inv, then hands, then nearby
 				var/obj/item/gear_item = gear
+				if(!H.equip_to_slots_if_possible(
+					gear_item,
+					list(
+						/datum/inventory_slot/abstract/put_in_backpack,
+						/datum/inventory_slot/abstract/put_in_belt,
+						/datum/inventory_slot/abstract/put_in_hands,
+						/datum/inventory_slot/inventory/pocket/left,
+						/datum/inventory_slot/inventory/pocket/right,
+					),
+				))
+					gear_item.forceMove(H.drop_location())
 			else
 				// put nearby
-			#warn handle
+				gear.forceMove(H.drop_location())
 
 /datum/outfit/proc/equip_id(mob/living/carbon/human/H, rank, assignment)
 	if(!id_slot || !id_type)
diff --git a/code/modules/mob/inventory/inventory-slot-equip.dm b/code/modules/mob/inventory/inventory-slot-equip.dm
index 21cbe837e1e4..9d4c856d0c0a 100644
--- a/code/modules/mob/inventory/inventory-slot-equip.dm
+++ b/code/modules/mob/inventory/inventory-slot-equip.dm
@@ -5,10 +5,10 @@
  * Equips an item to a slot or deletes it.
  *
  * @params
- * * Entity - Item being equipped.
+ * * entity - Item being equipped.
  * * type_or_id - A typepath, or string ID.
  * * inv_op_flags - INV_OP_* bits.
- * * actors - Actor data of who did it.
+ * * actor - Actor data of who did it.
  *
  * @return TRUE / FALSE
  */
@@ -19,10 +19,10 @@
  * Equips an item to a slot or drops it beneath our owner.
  *
  * @params
- * * Entity - Item being equipped.
+ * * entity - Item being equipped.
  * * type_or_id - A typepath, or string ID.
  * * inv_op_flags - INV_OP_* bits.
- * * actors - Actor data of who did it.
+ * * actor - Actor data of who did it.
  *
  * @return TRUE / FALSE
  */
@@ -36,10 +36,10 @@
  * Equips an item to a slot if possible
  *
  * @params
- * * Entity - Item being equipped.
+ * * entity - Item being equipped.
  * * type_or_id - A typepath, or string ID.
  * * inv_op_flags - INV_OP_* bits.
- * * actors - Actor data of who did it.
+ * * actor - Actor data of who did it.
  *
  * @return TRUE / FALSE
  */
@@ -50,10 +50,10 @@
  * Equips an item to a slot forcefully, trampling anything in the way.
  *
  * @params
- * * Entity - Item being equipped.
+ * * entity - Item being equipped.
  * * type_or_id - A typepath, or string ID.
  * * inv_op_flags - INV_OP_* bits.
- * * actors - Actor data of who did it.
+ * * actor - Actor data of who did it.
  *
  * @return TRUE / FALSE
  */
@@ -64,12 +64,38 @@
  * Equips an item to a slot. This is the advanced version of the proc that returns an INV_RETURN_* result.
  *
  * @params
- * * Entity - Item being equipped.
+ * * entity - Item being equipped.
  * * type_or_id - A typepath, or string ID.
  * * inv_op_flags - INV_OP_* bits.
- * * actors - Actor data of who did it.
+ * * actor - Actor data of who did it.
  *
  * @return INV_RETURN_*
  */
 /datum/inventory/proc/equip_to_slot(obj/item/entity, datum/inventory_slot/type_or_id, inv_op_flags, datum/event_args/actor/actor)
 	return owner._equip_item(entity, inv_op_flags, type_or_id, actor?.performer) ? INV_RETURN_SUCCESS : INV_RETURN_FAILED
+
+/**
+ * Equips an item to an ordered list of slots. This is an advanced version of the proc that returns an INV_RETURN_* result
+ *
+ * @params
+ * * entity - item being equipped
+ * * slots - A list of: typepaths, or string ids
+ * * inv_op_flags - INV_OP_* bits
+ * * actor - actor data of who did it.
+ *
+ * @return INV_RETURN_*
+ */
+/datum/inventory/proc/equip_to_slots(obj/item/entity, list/datum/inventory_slot/slots, inv_op_flags, datum/event_args/actor/actor)
+	for(var/slot in slots)
+		switch((. = owner._equip_item(entity, inv_op_flags, slot, actor?.performer)))
+			if(INV_RETURN_DELETED)
+				return
+			if(INV_RETURN_FAILED)
+				continue
+			if(INV_RETURN_RELOCATED)
+				return
+			if(INV_RETURN_SUCCESS)
+				return
+			else
+				CRASH("unimplemented inv return: [.]")
+	return INV_RETURN_FAILED
diff --git a/code/modules/species/promethean/promethean.dm b/code/modules/species/promethean/promethean.dm
index 218cfd44d400..96917863c673 100644
--- a/code/modules/species/promethean/promethean.dm
+++ b/code/modules/species/promethean/promethean.dm
@@ -167,7 +167,7 @@ var/datum/species/shapeshifter/promethean/prometheans
 		/obj/item/storage/toolbox/lunchbox/syndicate
 	))	//Only pick the empty types
 
-	var/obj/item/storage/toolbox/lunchbox/L = new boxtype(get_turf(H))
+	var/obj/item/storage/toolbox/lunchbox/L = new boxtype
 	new /obj/item/reagent_containers/food/snacks/wrapped/proteinbar(L)
 	into_inv += L
 
diff --git a/code/modules/species/protean/protean.dm b/code/modules/species/protean/protean.dm
index 2df5c70af0db..4ec107b2fc55 100644
--- a/code/modules/species/protean/protean.dm
+++ b/code/modules/species/protean/protean.dm
@@ -69,8 +69,8 @@
 
 	has_organ = list(
 		O_BRAIN = /obj/item/organ/internal/mmi_holder/posibrain/nano,
-		O_ORCH = /obj/item/organ/internal/nano/orchestrator/loaded,
-		O_FACT = /obj/item/organ/internal/nano/refactory
+		O_ORCH = /obj/item/organ/internal/nano/orchestrator,
+		O_FACT = /obj/item/organ/internal/nano/refactory/loaded,
 		)
 
 	vision_organ = O_BRAIN
diff --git a/code/modules/species/species.dm b/code/modules/species/species.dm
index a94db7053bb6..077388b8b7e9 100644
--- a/code/modules/species/species.dm
+++ b/code/modules/species/species.dm
@@ -691,7 +691,9 @@ GLOBAL_LIST_INIT(species_oxygen_tank_by_gas, list(
 		if(breath_type)
 			var/given_path = GLOB.species_oxygen_tank_by_gas[breath_type]
 			var/tankpath
-			if(extendedtank)
+
+			// always extended now!
+			if(TRUE)
 				tankpath = text2path("[given_path]" + "/engi")
 				if(!tankpath) //Is it just that there's no /engi?
 					tankpath = text2path("[given_path]" + "/double")

From d92a18263787efb6a42f27651305ec65944c0a26 Mon Sep 17 00:00:00 2001
From: silicons <2003111+silicons@users.noreply.github.com>
Date: Tue, 17 Dec 2024 02:57:58 -0500
Subject: [PATCH 14/25] that

---
 code/modules/mob/inventory/inventory-slot-equip.dm | 8 ++++----
 code/modules/species/species.dm                    | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/code/modules/mob/inventory/inventory-slot-equip.dm b/code/modules/mob/inventory/inventory-slot-equip.dm
index 9d4c856d0c0a..62fddfeb99f1 100644
--- a/code/modules/mob/inventory/inventory-slot-equip.dm
+++ b/code/modules/mob/inventory/inventory-slot-equip.dm
@@ -87,15 +87,15 @@
  */
 /datum/inventory/proc/equip_to_slots(obj/item/entity, list/datum/inventory_slot/slots, inv_op_flags, datum/event_args/actor/actor)
 	for(var/slot in slots)
-		switch((. = owner._equip_item(entity, inv_op_flags, slot, actor?.performer)))
+		switch(owner._equip_item(entity, inv_op_flags, slot, actor?.performer))
 			if(INV_RETURN_DELETED)
-				return
+				return INV_RETURN_DELETED
 			if(INV_RETURN_FAILED)
 				continue
 			if(INV_RETURN_RELOCATED)
-				return
+				return INV_RETURN_RELOCATED
 			if(INV_RETURN_SUCCESS)
-				return
+				return INV_RETURN_SUCCESS
 			else
 				CRASH("unimplemented inv return: [.]")
 	return INV_RETURN_FAILED
diff --git a/code/modules/species/species.dm b/code/modules/species/species.dm
index 077388b8b7e9..17a6295a092c 100644
--- a/code/modules/species/species.dm
+++ b/code/modules/species/species.dm
@@ -693,10 +693,10 @@ GLOBAL_LIST_INIT(species_oxygen_tank_by_gas, list(
 			var/tankpath
 
 			// always extended now!
-			if(TRUE)
-				tankpath = text2path("[given_path]" + "/engi")
-				if(!tankpath) //Is it just that there's no /engi?
-					tankpath = text2path("[given_path]" + "/double")
+			// if(extendedtank)
+			tankpath = text2path("[given_path]" + "/engi")
+			if(!tankpath) //Is it just that there's no /engi?
+				tankpath = text2path("[given_path]" + "/double")
 
 			if(!tankpath)
 				tankpath = given_path

From 7cb71c476e8fa6fda6df56bfa237d6e15256d853 Mon Sep 17 00:00:00 2001
From: silicons <2003111+silicons@users.noreply.github.com>
Date: Tue, 17 Dec 2024 03:02:49 -0500
Subject: [PATCH 15/25] Fix

---
 code/modules/ghostroles/instantiator.dm | 2 --
 code/modules/organs/subtypes/nano.dm    | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/code/modules/ghostroles/instantiator.dm b/code/modules/ghostroles/instantiator.dm
index 6f57de290f96..604ce5902a7b 100644
--- a/code/modules/ghostroles/instantiator.dm
+++ b/code/modules/ghostroles/instantiator.dm
@@ -67,8 +67,6 @@
 	return H
 
 /datum/ghostrole_instantiator/human/Equip(client/C, mob/M, list/params)
-	var/mob/living/carbon/human/H = M
-
 	// H.dna.species.before_equip_job(null, H)
 
 	var/datum/outfit/O = GetOutfit(C, M, params)
diff --git a/code/modules/organs/subtypes/nano.dm b/code/modules/organs/subtypes/nano.dm
index f2fd6d0842c9..c6a60e47236a 100644
--- a/code/modules/organs/subtypes/nano.dm
+++ b/code/modules/organs/subtypes/nano.dm
@@ -148,7 +148,7 @@
 
 /obj/item/organ/internal/nano/refactory/loaded
 	stored_materials = list(
-		MAT_STEEL = /obj/item/organ/internal/nano/refactory/loaded::max_storage,
+		MAT_STEEL = /obj/item/organ/internal/nano/refactory::max_storage,
 	)
 
 /obj/item/organ/internal/mmi_holder/posibrain/nano

From 660bd016b21536dcfb6356bd948de32cb6beb794 Mon Sep 17 00:00:00 2001
From: silicons <2003111+silicons@users.noreply.github.com>
Date: Wed, 18 Dec 2024 00:45:40 -0500
Subject: [PATCH 16/25] storage reorg

---
 citadel.dme                                   |   4 +
 .../systems/storage/storage-filters.dm        |  29 ++
 .../systems/storage/storage-indirection.dm    |  30 ++
 .../storage/storage-indirection_holder.dm     |  46 ++
 .../objects/systems/storage/storage-limits.dm |  34 ++
 .../objects/systems/storage/storage-ui.dm     | 255 ++++++++++
 code/game/objects/systems/storage/storage.dm  | 456 ++----------------
 code/modules/mob/mob-inventory-internal.dm    |   8 +-
 code/modules/species/protean/protean.dm       |   2 +-
 code/modules/species/species.dm               |   4 +
 10 files changed, 449 insertions(+), 419 deletions(-)
 create mode 100644 code/game/objects/systems/storage/storage-filters.dm
 create mode 100644 code/game/objects/systems/storage/storage-indirection.dm
 create mode 100644 code/game/objects/systems/storage/storage-indirection_holder.dm
 create mode 100644 code/game/objects/systems/storage/storage-limits.dm

diff --git a/citadel.dme b/citadel.dme
index 66f6afdec4b6..db22928f9489 100644
--- a/citadel.dme
+++ b/citadel.dme
@@ -2027,6 +2027,10 @@
 #include "code\game\objects\structures\tables\update_triggers.dm"
 #include "code\game\objects\systems\_system.dm"
 #include "code\game\objects\systems\cell_slot.dm"
+#include "code\game\objects\systems\storage\storage-filters.dm"
+#include "code\game\objects\systems\storage\storage-indirection.dm"
+#include "code\game\objects\systems\storage\storage-indirection_holder.dm"
+#include "code\game\objects\systems\storage\storage-limits.dm"
 #include "code\game\objects\systems\storage\storage-screen_object.dm"
 #include "code\game\objects\systems\storage\storage-ui.dm"
 #include "code\game\objects\systems\storage\storage.dm"
diff --git a/code/game/objects/systems/storage/storage-filters.dm b/code/game/objects/systems/storage/storage-filters.dm
new file mode 100644
index 000000000000..57e1d2bc088b
--- /dev/null
+++ b/code/game/objects/systems/storage/storage-filters.dm
@@ -0,0 +1,29 @@
+//* This file is explicitly licensed under the MIT license. *//
+//* Copyright (c) 2024 Citadel Station Developers           *//
+
+/datum/object_system/storage/proc/check_insertion_filters(obj/item/candidate)
+	if(insertion_allow_typecache?[candidate.type])
+		return TRUE
+	if(!isnull(insertion_whitelist_typecache) && !insertion_whitelist_typecache?[candidate.type])
+		return FALSE
+	if(insertion_blacklist_typecache?[candidate.type])
+		return FALSE
+	return TRUE
+
+/datum/object_system/storage/proc/set_insertion_whitelist(list/types)
+	if(!length(types))
+		src.insertion_whitelist_typecache = null
+		return
+	src.insertion_whitelist_typecache = cached_typecacheof(types)
+
+/datum/object_system/storage/proc/set_insertion_blacklist(list/types)
+	if(!length(types))
+		src.insertion_blacklist_typecache = null
+		return
+	src.insertion_blacklist_typecache = cached_typecacheof(types)
+
+/datum/object_system/storage/proc/set_insertion_allow(list/types)
+	if(!length(types))
+		src.insertion_allow_typecache = null
+		return
+	src.insertion_allow_typecache = cached_typecacheof(types)
diff --git a/code/game/objects/systems/storage/storage-indirection.dm b/code/game/objects/systems/storage/storage-indirection.dm
new file mode 100644
index 000000000000..ab0652c02ee9
--- /dev/null
+++ b/code/game/objects/systems/storage/storage-indirection.dm
@@ -0,0 +1,30 @@
+//* This file is explicitly licensed under the MIT license. *//
+//* Copyright (c) 2024 Citadel Station Developers           *//
+
+/**
+ * **USE AT YOUR OWN PERIL**
+ */
+/datum/object_system/storage/proc/indirect(atom/where)
+	ASSERT(isnull(indirection))
+	indirection = new(where, src)
+
+/**
+ * remove indirection by obliterating contents
+ */
+/datum/object_system/storage/proc/destructively_remove_indirection()
+	QDEL_NULL(indirection)
+
+/**
+ * remove indirection by moving contents
+ */
+/datum/object_system/storage/proc/relocate_remove_indirection(atom/where_to)
+	ASSERT(!isnull(where_to) && where_to != indirection)
+	for(var/atom/movable/AM as anything in indirection)
+		AM.forceMove(where_to)
+	QDEL_NULL(indirection)
+
+/**
+ * move indirection somewhere else
+ */
+/datum/object_system/storage/proc/move_indirection_to(atom/where_to)
+	indirection.forceMove(where_to)
diff --git a/code/game/objects/systems/storage/storage-indirection_holder.dm b/code/game/objects/systems/storage/storage-indirection_holder.dm
new file mode 100644
index 000000000000..ba0c1738ea04
--- /dev/null
+++ b/code/game/objects/systems/storage/storage-indirection_holder.dm
@@ -0,0 +1,46 @@
+//* This file is explicitly licensed under the MIT license. *//
+//* Copyright (c) 2024 Citadel Station Developers           *//
+
+/atom/movable/storage_indirection
+	atom_flags = ATOM_ABSTRACT
+
+	/// owner
+	var/datum/object_system/storage/parent
+
+/atom/movable/storage_indirection/Initialize(mapload, datum/object_system/storage/parent)
+	src.parent = parent
+	return ..()
+
+/atom/movable/storage_indirection/Destroy()
+	if(src.parent.indirection == src)
+		src.parent.indirection = null
+	src.parent = null
+	return ..()
+
+/atom/movable/storage_indirection/CanReachIn(atom/movable/mover, atom/target, obj/item/tool, list/cache)
+	return TRUE
+
+/atom/movable/storage_indirection/CanReachOut(atom/movable/mover, atom/target, obj/item/tool, list/cache)
+	return TRUE
+
+/atom/movable/storage_indirection/Exited(atom/movable/AM, atom/newLoc)
+	. = ..()
+	if(isitem(AM))
+		parent.on_item_exited(AM)
+
+/atom/movable/storage_indirection/Entered(atom/movable/AM, atom/oldLoc)
+	. = ..()
+	if(isitem(AM))
+		parent.on_item_entered(AM)
+
+/atom/movable/storage_indirection/on_contents_weight_class_change(obj/item/item, old_weight_class, new_weight_class)
+	parent.on_contents_weight_class_change(item, old_weight_class, new_weight_class)
+
+/atom/movable/storage_indirection/on_contents_weight_volume_change(obj/item/item, old_weight_volume, new_weight_volume)
+	parent.on_contents_weight_volume_change(item, old_weight_volume, new_weight_volume)
+
+/atom/movable/storage_indirection/on_contents_weight_change(obj/item/item, old_weight, new_weight)
+	parent.on_contents_weight_change(item, old_weight, new_weight)
+
+/atom/movable/storage_indirection/on_contents_item_new(obj/item/item)
+	parent.on_contents_item_new(item)
diff --git a/code/game/objects/systems/storage/storage-limits.dm b/code/game/objects/systems/storage/storage-limits.dm
new file mode 100644
index 000000000000..798af8ca35d5
--- /dev/null
+++ b/code/game/objects/systems/storage/storage-limits.dm
@@ -0,0 +1,34 @@
+//* This file is explicitly licensed under the MIT license. *//
+//* Copyright (c) 2024 Citadel Station Developers           *//
+
+// todo: return a STORAGE_INSERTION_CHECK_RESULT_* or something to that accord, instead of having two procs
+
+/datum/object_system/storage/proc/check_insertion_limits(obj/item/candidate)
+	var/atom/movable/indirection = real_contents_loc()
+	if(!isnull(max_items) && length(indirection.contents) > max_items)
+		return FALSE
+	if(!isnull(max_combined_volume) && (cached_combined_volume + candidate.get_weight_volume() > max_combined_volume))
+		return FALSE
+	var/their_weight_class = candidate.get_weight_class()
+	if(!isnull(max_single_weight_class) && (their_weight_class > max_single_weight_class))
+		return FALSE
+	if(!isnull(max_combined_weight_class) && (cached_combined_weight_class + their_weight_class > max_combined_weight_class))
+		return FALSE
+	if(candidate.obj_storage && (candidate.w_class >= parent.w_class) && disallow_equal_weight_class_storage_nesting)
+		return FALSE
+	return TRUE
+
+/datum/object_system/storage/proc/why_failed_insertion_limits(obj/item/candidate)
+	var/atom/movable/indirection = real_contents_loc()
+	if(!isnull(max_items) && length(indirection.contents) > max_items)
+		return "too many items"
+	if(!isnull(max_combined_volume) && (cached_combined_volume + candidate.get_weight_volume() > max_combined_volume))
+		return "insufficient volume"
+	var/their_weight_class = candidate.get_weight_class()
+	if(!isnull(max_single_weight_class) && (their_weight_class > max_single_weight_class))
+		return "too large"
+	if(!isnull(max_combined_weight_class) && (cached_combined_weight_class + their_weight_class > max_combined_weight_class))
+		return "insufficient space"
+	if(candidate.obj_storage && (candidate.w_class >= parent.w_class) && disallow_equal_weight_class_storage_nesting)
+		return "can't nest storage"
+	return null
diff --git a/code/game/objects/systems/storage/storage-ui.dm b/code/game/objects/systems/storage/storage-ui.dm
index 76d987239ff9..a06a3a0dd64e 100644
--- a/code/game/objects/systems/storage/storage-ui.dm
+++ b/code/game/objects/systems/storage/storage-ui.dm
@@ -1,6 +1,13 @@
 //* This file is explicitly licensed under the MIT license. *//
 //* Copyright (c) 2024 Citadel Station Developers           *//
 
+//* Helper Datums *//
+
+/**
+ * Holds an object to render along with the amount.
+ *
+ * * This does hard-ref the rendered object for ease of use. Since UI is re-rendered on removals, this should be fine.
+ */
 /datum/storage_numerical_display
 	var/obj/item/rendered_object
 	var/amount
@@ -11,3 +18,251 @@
 
 /proc/cmp_storage_numerical_displays_name_asc(datum/storage_numerical_display/A, datum/storage_numerical_display/B)
 	return sorttext(B.rendered_object.name, A.rendered_object.name) || sorttext(B.rendered_object.type, A.rendered_object.type)
+
+//* UI Render Filters *//
+
+/**
+ * Do not modify the returned appearances; they might be real instances!
+ *
+ * @return list(/datum/storage_numerical_display instance, ...)
+ */
+/datum/object_system/storage/proc/render_numerical_display(list/obj/item/for_items)
+	RETURN_TYPE(/list)
+	. = list()
+	var/list/types = list()
+	for(var/obj/item/iterating in (for_items || real_contents_loc()))
+		var/datum/storage_numerical_display/collation
+		if(isnull(types[iterating.type]))
+			collation = new
+			collation.rendered_object = iterating
+			collation.amount = 0
+			. += collation
+			types[iterating.type] = collation
+		collation = types[iterating.type]
+		++collation.amount
+	tim_sort(., /proc/cmp_storage_numerical_displays_name_asc)
+
+//* UI Rendering *//
+
+// todo: refactor a bit? this is a little messy
+
+/datum/object_system/storage/proc/ui_queue_refresh()
+	if(ui_refresh_queued)
+		return
+	ui_refresh_queued = TRUE
+	addtimer(CALLBACK(src, PROC_REF(refresh)), 0)
+
+/datum/object_system/storage/proc/cleanup_ui(mob/user)
+	var/list/objects = ui_by_mob[user]
+	user.client?.screen -= objects
+	QDEL_LIST(objects)
+	ui_by_mob -= user
+
+/**
+ * we assume that the display style didn't change.
+ */
+/datum/object_system/storage/proc/refresh_ui(mob/user)
+	// for now, we just do a full redraw.
+	cleanup_ui(user)
+	create_ui(user)
+
+/datum/object_system/storage/proc/create_ui(mob/user)
+	var/uses_volumetric_ui = uses_volumetric_ui()
+	var/list/atom/movable/screen/storage/objects
+	if(uses_volumetric_ui)
+		objects += create_ui_volumetric_mode(user)
+	else
+		objects += create_ui_slot_mode(user)
+	LAZYINITLIST(ui_by_mob)
+	ui_by_mob[user] = objects
+	user.client?.screen += objects
+
+/**
+ * this should not rely on uses_numerical_ui()
+ */
+/datum/object_system/storage/proc/uses_volumetric_ui()
+	return max_combined_volume && !ui_numerical_mode && !ui_force_slot_mode
+
+/**
+ * this should not rely on uses_volumetric_ui()
+ */
+/datum/object_system/storage/proc/uses_numerical_ui()
+	return ui_numerical_mode
+
+/datum/object_system/storage/proc/create_ui_slot_mode(mob/user)
+	. = list()
+	var/atom/movable/screen/storage/closer/closer = new
+	. += closer
+	var/atom/movable/screen/storage/panel/slot/boxes/boxes = new
+	. += boxes
+	// todo: clientless support is awful here
+	var/list/decoded_view = decode_view_size(user.client?.view || world.view)
+	var/view_x = decoded_view[1]
+	// clamp to max items if needed
+	var/rendering_width = STORAGE_UI_TILES_FOR_SCREEN_VIEW_X(view_x)
+	if(max_items)
+		rendering_width = min(max_items, rendering_width)
+	// see if we need to process numerical display
+	var/list/datum/storage_numerical_display/numerical_rendered = uses_numerical_ui()? render_numerical_display() : null
+	// process indirection
+	var/atom/indirection = real_contents_loc()
+	// if we have expand when needed, only show 1 more than the actual amount.
+	if(ui_expand_when_needed)
+		rendering_width = min(rendering_width, (isnull(numerical_rendered)? length(indirection.contents) : length(numerical_rendered)) + 1)
+	// compute count and rows
+	var/item_count = isnull(numerical_rendered)? length(indirection.contents) : length(numerical_rendered)
+	var/rows_needed = ROUND_UP(item_count / rendering_width) || 1
+	// prepare iteration
+	var/current_row = 1
+	var/current_column = 1
+	// render boxes
+	boxes.screen_loc = "LEFT+[STORAGE_UI_START_TILE_X]:[STORAGE_UI_START_PIXEL_X],BOTTOM+[STORAGE_UI_START_TILE_Y]:[STORAGE_UI_START_PIXEL_Y] to \
+		LEFT+[STORAGE_UI_START_TILE_X + rendering_width - 1]:[STORAGE_UI_START_PIXEL_X],BOTTOM+[STORAGE_UI_START_TILE_Y + rows_needed - 1]:[STORAGE_UI_START_PIXEL_Y]"
+	// render closer
+	closer.screen_loc = "LEFT+[STORAGE_UI_START_TILE_X + rendering_width]:[STORAGE_UI_START_PIXEL_X],BOTTOM+[STORAGE_UI_START_TILE_Y]:[STORAGE_UI_START_PIXEL_Y]"
+	// render items
+	if(islist(numerical_rendered))
+		for(var/datum/storage_numerical_display/display as anything in numerical_rendered)
+			var/atom/movable/screen/storage/item/slot/renderer = new(null, display.rendered_object)
+			. += renderer
+			// render amount
+			display.rendered_object.maptext = MAPTEXT("[display.amount]")
+			// position
+			renderer.screen_loc = "LEFT+[STORAGE_UI_START_TILE_X + current_column - 1]:[STORAGE_UI_START_PIXEL_X],\
+				BOTTOM+[STORAGE_UI_START_TILE_Y + current_row - 1]:[STORAGE_UI_START_PIXEL_Y]"
+			// advance
+			++current_column
+			if(current_column > rendering_width)
+				current_column = 1
+				++current_row
+				if(current_row > STORAGE_UI_MAX_ROWS)
+					break
+	else
+		for(var/obj/item/item in indirection)
+			var/atom/movable/screen/storage/item/slot/renderer = new(null, item)
+			. += renderer
+			// position
+			renderer.screen_loc = "LEFT+[STORAGE_UI_START_TILE_X + current_column - 1]:[STORAGE_UI_START_PIXEL_X],\
+				BOTTOM+[STORAGE_UI_START_TILE_Y + current_row - 1]:[STORAGE_UI_START_PIXEL_Y]"
+			// advance
+			++current_column
+			if(current_column > rendering_width)
+				current_column = 1
+				++current_row
+				if(current_row > STORAGE_UI_MAX_ROWS)
+					break
+
+/datum/object_system/storage/proc/create_ui_volumetric_mode(mob/user)
+	// guard against divide-by-0's
+	if(!max_combined_volume)
+		return create_ui_slot_mode(user)
+	. = list()
+
+	//? resolve view and rendering
+	// todo: clientless support is awful here
+
+	// resolve view
+	var/list/decoded_view = decode_view_size(user.client?.view || world.view)
+	var/view_x = decoded_view[1]
+	// setup initial width
+	var/rendering_width = STORAGE_UI_TILES_FOR_SCREEN_VIEW_X(view_x)
+	var/rendering_width_in_pixels = rendering_width * 32
+	// effective max scales up if we're overrunning
+	var/effective_max_volume = max(max_combined_volume, cached_combined_volume)
+	// scale down width to volume
+	rendering_width_in_pixels = min(rendering_width_in_pixels, effective_max_volume * VOLUMETRIC_STORAGE_STANDARD_PIXEL_RATIO)
+
+	//? resolve items
+
+	// resolve indirection
+	var/atom/indirection = real_contents_loc()
+
+	//? prepare iteration
+
+	// max x used in all rows, including padding.
+	var/maximum_used_width = 0
+	// current consumed x of row
+	var/iteration_used_width = 0
+	// current consumed item padding of row
+	var/iteration_used_padding = 0
+	// current row
+	var/current_row = 1
+	// safety
+	var/safety = VOLUMETRIC_STORAGE_MAX_ITEMS
+	// iterate and render
+	for(var/obj/item/item in indirection)
+		// check safety
+		safety--
+		if(safety <= 0)
+			to_chat(user, SPAN_WARNING("Some items in this storage have been truncated for performance reasons."))
+			break
+
+		// check row
+		if(iteration_used_width >= rendering_width_in_pixels)
+			// check if we're out of rows
+			if(current_row >= STORAGE_UI_MAX_ROWS)
+				to_chat(user, SPAN_WARNING("Some items in this storage have been truncated for performance reasons."))
+				break
+			// make another row
+			current_row++
+			// register to maximum used width
+			// we add the edge padding for both edges, but remove the last item's padding.
+			maximum_used_width = max(maximum_used_width, iteration_used_width + iteration_used_padding + VOLUMETRIC_STORAGE_EDGE_PADDING * 2 - VOLUMETRIC_STORAGE_ITEM_PADDING)
+			// reset vars
+			iteration_used_padding = 0
+			iteration_used_width = 0
+
+		// render the item
+		var/atom/movable/screen/storage/item/volumetric/renderer = new(null, item)
+		// scale it as necessary, to nearest multiple of 2
+		var/used_pixels = max(VOLUMETRIC_STORAGE_MINIMUM_PIXELS_PER_ITEM, CEILING(rendering_width_in_pixels * (item.get_weight_volume() / effective_max_volume), 2))
+		// emit to renderer
+		renderer.set_pixel_width(used_pixels)
+		// set screen loc
+		renderer.screen_loc = "LEFT+[STORAGE_UI_START_TILE_X]:[STORAGE_UI_START_PIXEL_X + (iteration_used_width + iteration_used_padding + VOLUMETRIC_STORAGE_EDGE_PADDING) + (used_pixels - VOLUMETRIC_STORAGE_BOX_ICON_SIZE) * 0.5],\
+			BOTTOM+[STORAGE_UI_START_TILE_Y + current_row - 1]:[STORAGE_UI_START_PIXEL_Y]"
+		// add to emitted screen list
+		. += renderer
+		// add to iteration tracking
+		iteration_used_width += used_pixels
+		iteration_used_padding += VOLUMETRIC_STORAGE_ITEM_PADDING
+	// register to maximum used width
+	// we add the edge padding for both edges, but remove the last item's padding.
+	maximum_used_width = max(maximum_used_width, iteration_used_width + iteration_used_padding + VOLUMETRIC_STORAGE_EDGE_PADDING * 2 - VOLUMETRIC_STORAGE_ITEM_PADDING)
+
+	// now that everything's set up, we can render everything based on the solved sizes.
+	// middle size; we also keep in account padding so there's a smooth expansion instead of a sudden expansion at the end.
+	var/middle_width = max(maximum_used_width, rendering_width_in_pixels + iteration_used_padding)
+	// i hate byond i hate byond i hate byond i hate byond; this is because things break if we don't extend by 2 pixels
+	// at a time for left/right as we use a dumb transform matrix and screen loc to shift, instead of a scale and shift matrix
+	middle_width = CEILING(middle_width, 2)
+	// todo: instead of this crap we should instead have the translation matrix do the shift
+	var/middle_shift = round(middle_width * 0.5 - VOLUMETRIC_STORAGE_BOX_ICON_SIZE * 0.5)
+	// render left
+	var/atom/movable/screen/storage/panel/volumetric/left/p_left = new
+	. += p_left
+	p_left.screen_loc = "LEFT+[STORAGE_UI_START_TILE_X]:[STORAGE_UI_START_PIXEL_X - VOLUMETRIC_STORAGE_BOX_BORDER_SIZE],\
+		BOTTOM+[STORAGE_UI_START_TILE_Y]:[STORAGE_UI_START_PIXEL_Y] to \
+		LEFT+[STORAGE_UI_START_TILE_X]:[STORAGE_UI_START_PIXEL_X - VOLUMETRIC_STORAGE_BOX_BORDER_SIZE],\
+		BOTTOM+[STORAGE_UI_START_TILE_Y + current_row - 1]:[STORAGE_UI_START_PIXEL_Y]"
+	// render middle
+	var/atom/movable/screen/storage/panel/volumetric/middle/p_box = new
+	. += p_box
+	p_box.set_pixel_width(middle_width)
+	p_box.screen_loc = "LEFT+[STORAGE_UI_START_TILE_X]:[STORAGE_UI_START_PIXEL_X + middle_shift],\
+		BOTTOM+[STORAGE_UI_START_TILE_Y]:[STORAGE_UI_START_PIXEL_Y] to \
+		LEFT+[STORAGE_UI_START_TILE_X]:[STORAGE_UI_START_PIXEL_X + middle_shift],\
+		BOTTOM+[STORAGE_UI_START_TILE_Y + current_row - 1]:[STORAGE_UI_START_PIXEL_Y]"
+	// render closer on bottom
+	var/atom/movable/screen/storage/closer/closer = new
+	. += closer
+	closer.screen_loc = "LEFT+[STORAGE_UI_START_TILE_X]:[STORAGE_UI_START_PIXEL_X + middle_width],\
+		BOTTOM+[STORAGE_UI_START_TILE_Y]:[STORAGE_UI_START_PIXEL_Y]"
+	// render right sides above closer
+	if(current_row > 1)
+		var/atom/movable/screen/storage/panel/volumetric/right/p_right = new
+		. += p_right
+		p_right.screen_loc = "LEFT+[STORAGE_UI_START_TILE_X]:[STORAGE_UI_START_PIXEL_X + middle_width - WORLD_ICON_SIZE + VOLUMETRIC_STORAGE_BOX_BORDER_SIZE],\
+			BOTTOM+[STORAGE_UI_START_TILE_Y + 1]:[STORAGE_UI_START_PIXEL_Y] to \
+			LEFT+[STORAGE_UI_START_TILE_X]:[STORAGE_UI_START_PIXEL_X + middle_width - WORLD_ICON_SIZE + VOLUMETRIC_STORAGE_BOX_BORDER_SIZE],\
+			BOTTOM+[STORAGE_UI_START_TILE_Y + current_row - 1]:[STORAGE_UI_START_PIXEL_Y]"
diff --git a/code/game/objects/systems/storage/storage.dm b/code/game/objects/systems/storage/storage.dm
index b921ced493b1..32f9799907d3 100644
--- a/code/game/objects/systems/storage/storage.dm
+++ b/code/game/objects/systems/storage/storage.dm
@@ -8,7 +8,7 @@
  */
 /datum/object_system/storage
 
-	//* Access
+	//* Access *//
 
 	/// if set, limit allowable random access to first n items
 	var/limited_random_access_stack_amount
@@ -16,7 +16,7 @@
 	/// * top down is from end of contents list, bottom up is from start of contents list
 	var/limited_random_access_stack_bottom_first = FALSE
 
-	//* Actions
+	//* Actions *//
 
 	/// the action we have for mode switching gathering
 	var/datum/action/storage_gather_mode/action_mode_switch
@@ -362,6 +362,12 @@
 
 //* Hooks *//
 
+/**
+ * Hooked into obj/Moved().
+ */
+/datum/object_system/storage/proc/on_parent_moved(atom/old_loc, forced)
+	reconsider_mob_viewable()
+
 /datum/object_system/storage/proc/on_pickup(mob/user)
 	grant_buttons(user)
 
@@ -404,35 +410,6 @@
 	physically_insert_item(item, no_move = TRUE)
 	ui_queue_refresh()
 
-//* Filters *//
-
-/datum/object_system/storage/proc/check_insertion_filters(obj/item/candidate)
-	if(insertion_allow_typecache?[candidate.type])
-		return TRUE
-	if(!isnull(insertion_whitelist_typecache) && !insertion_whitelist_typecache?[candidate.type])
-		return FALSE
-	if(insertion_blacklist_typecache?[candidate.type])
-		return FALSE
-	return TRUE
-
-/datum/object_system/storage/proc/set_insertion_whitelist(list/types)
-	if(!length(types))
-		src.insertion_whitelist_typecache = null
-		return
-	src.insertion_whitelist_typecache = cached_typecacheof(types)
-
-/datum/object_system/storage/proc/set_insertion_blacklist(list/types)
-	if(!length(types))
-		src.insertion_blacklist_typecache = null
-		return
-	src.insertion_blacklist_typecache = cached_typecacheof(types)
-
-/datum/object_system/storage/proc/set_insertion_allow(list/types)
-	if(!length(types))
-		src.insertion_allow_typecache = null
-		return
-	src.insertion_allow_typecache = cached_typecacheof(types)
-
 //* Interaction *//
 
 /**
@@ -447,6 +424,8 @@
 //* Insertion & Removal *//
 
 /**
+ * todo: refactor?
+ *
  * @return TRUE / FALSE; if true, caller should stop clickchain.
  */
 /datum/object_system/storage/proc/auto_handle_interacted_insertion(obj/item/inserting, datum/event_args/actor/actor, silent, suppressed)
@@ -477,6 +456,38 @@
 		)
 	return TRUE
 
+/**
+ * Called by inventory procs; skips some checks of interacted insertion.
+ *
+ * todo: refactor?
+ *
+ * @return TRUE on success, FALSE on failure.
+ */
+/datum/object_system/storage/proc/auto_handle_inventory_insertion(obj/item/inserting, datum/event_args/actor/actor, silent, suppressed)
+	if(is_locked(actor.performer))
+		actor.chat_feedback(
+			msg = SPAN_WARNING("[parent] is locked."),
+			target = parent,
+		)
+		return TRUE
+	if(!actor.performer.Reachability(indirection || parent))
+		return TRUE
+	if(!try_insert(inserting, actor, silent, suppressed))
+		return TRUE
+	// sound
+	// todo: put this in interacted_insert()..?
+	if(!suppressed && !isnull(actor))
+		if(sfx_insert)
+			// todo: variable sound
+			playsound(actor.performer, sfx_insert, 50, 1, -5)
+		actor.visible_feedback(
+			target = parent,
+			range = MESSAGE_RANGE_INVENTORY_SOFT,
+			visible = "[actor.performer] puts [inserting] into [parent].",
+			visible_self = "You put [inserting] into [parent]",
+		)
+	return TRUE
+
 /datum/object_system/storage/proc/try_insert(obj/item/inserting, datum/event_args/actor/actor, silent, suppressed, no_update)
 	if(!can_be_inserted(inserting, actor, silent))
 		return FALSE
@@ -633,36 +644,6 @@
 
 //* Limits *//
 
-/datum/object_system/storage/proc/check_insertion_limits(obj/item/candidate)
-	var/atom/movable/indirection = real_contents_loc()
-	if(!isnull(max_items) && length(indirection.contents) > max_items)
-		return FALSE
-	if(!isnull(max_combined_volume) && (cached_combined_volume + candidate.get_weight_volume() > max_combined_volume))
-		return FALSE
-	var/their_weight_class = candidate.get_weight_class()
-	if(!isnull(max_single_weight_class) && (their_weight_class > max_single_weight_class))
-		return FALSE
-	if(!isnull(max_combined_weight_class) && (cached_combined_weight_class + their_weight_class > max_combined_weight_class))
-		return FALSE
-	if(candidate.obj_storage && (candidate.w_class >= parent.w_class) && disallow_equal_weight_class_storage_nesting)
-		return FALSE
-	return TRUE
-
-/datum/object_system/storage/proc/why_failed_insertion_limits(obj/item/candidate)
-	var/atom/movable/indirection = real_contents_loc()
-	if(!isnull(max_items) && length(indirection.contents) > max_items)
-		return "too many items"
-	if(!isnull(max_combined_volume) && (cached_combined_volume + candidate.get_weight_volume() > max_combined_volume))
-		return "insufficient volume"
-	var/their_weight_class = candidate.get_weight_class()
-	if(!isnull(max_single_weight_class) && (their_weight_class > max_single_weight_class))
-		return "too large"
-	if(!isnull(max_combined_weight_class) && (cached_combined_weight_class + their_weight_class > max_combined_weight_class))
-		return "insufficient space"
-	if(candidate.obj_storage && (candidate.w_class >= parent.w_class) && disallow_equal_weight_class_storage_nesting)
-		return "can't nest storage"
-	return null
-
 /**
  * generally a bad idea to call, tbh.
  *
@@ -713,34 +694,6 @@
 //* Quickdraw *//
 
 // todo: quickdraw
-/*
-/datum/component/storage/proc/on_alt_click(datum/source, mob/user)
-	if(!isliving(user) || !user.CanReach(parent))
-		return
-	if(check_locked(source, user, TRUE))
-		return TRUE
-
-	var/atom/A = parent
-	if(!quickdraw)
-		A.add_fingerprint(user)
-		user_show_to_mob(user, trigger_on_found = TRUE)
-		if(rustle_sound)
-			playsound(A, "rustle", 50, 1, -5)
-		return TRUE
-
-	if(user.can_hold_items() && !user.incapacitated())
-		var/obj/item/I = locate() in real_location()
-		if(!I)
-			return
-		A.add_fingerprint(user)
-		remove_from_storage(I, get_turf(user))
-		if(!user.put_in_hands(I))
-			user.visible_message("<span class='warning'>[user] fumbles with the [parent], letting [I] fall on the floor.</span>", \
-								"<span class='notice'>You fumble with [parent], letting [I] fall on the floor.</span>")
-			return TRUE
-		user.visible_message("<span class='warning'>[user] draws [I] from [parent]!</span>", "<span class='notice'>You draw [I] from [parent].</span>")
-		return TRUE
-*/
 
 //* Redirection *//
 
@@ -1169,12 +1122,6 @@
 
 	parent.object_storage_closed(viewer)
 
-/**
- * Hooked into obj/Moved().
- */
-/datum/object_system/storage/proc/on_parent_moved(atom/old_loc, forced)
-	reconsider_mob_viewable()
-
 /datum/object_system/storage/proc/refresh(mob/viewer)
 	ui_refresh_queued = FALSE
 	if(isnull(viewer))
@@ -1183,26 +1130,6 @@
 		return
 	refresh_ui(viewer)
 
-/**
- * Do not modify the returned appearances; they might be real instances!
- *
- * @return list(/datum/storage_numerical_display instance, ...)
- */
-/datum/object_system/storage/proc/render_numerical_display(list/obj/item/for_items)
-	RETURN_TYPE(/list)
-	. = list()
-	var/list/types = list()
-	for(var/obj/item/iterating in (for_items || real_contents_loc()))
-		var/datum/storage_numerical_display/collation
-		if(isnull(types[iterating.type]))
-			collation = new
-			collation.rendered_object = iterating
-			collation.amount = 0
-			. += collation
-			types[iterating.type] = collation
-		collation = types[iterating.type]
-		++collation.amount
-	tim_sort(., /proc/cmp_storage_numerical_displays_name_asc)
 
 /datum/object_system/storage/proc/reconsider_mob_viewable(mob/user)
 	if(isnull(user))
@@ -1213,259 +1140,6 @@
 		return
 	hide(user)
 
-/datum/object_system/storage/proc/ui_queue_refresh()
-	if(ui_refresh_queued)
-		return
-	ui_refresh_queued = TRUE
-	addtimer(CALLBACK(src, PROC_REF(refresh)), 0)
-
-/datum/object_system/storage/proc/cleanup_ui(mob/user)
-	var/list/objects = ui_by_mob[user]
-	user.client?.screen -= objects
-	QDEL_LIST(objects)
-	ui_by_mob -= user
-
-/**
- * we assume that the display style didn't change.
- */
-/datum/object_system/storage/proc/refresh_ui(mob/user)
-	// for now, we just do a full redraw.
-	cleanup_ui(user)
-	create_ui(user)
-
-/datum/object_system/storage/proc/create_ui(mob/user)
-	var/uses_volumetric_ui = uses_volumetric_ui()
-	var/list/atom/movable/screen/storage/objects
-	if(uses_volumetric_ui)
-		objects += create_ui_volumetric_mode(user)
-	else
-		objects += create_ui_slot_mode(user)
-	LAZYINITLIST(ui_by_mob)
-	ui_by_mob[user] = objects
-	user.client?.screen += objects
-
-/**
- * this should not rely on uses_numerical_ui()
- */
-/datum/object_system/storage/proc/uses_volumetric_ui()
-	return max_combined_volume && !ui_numerical_mode && !ui_force_slot_mode
-
-/**
- * this should not rely on uses_volumetric_ui()
- */
-/datum/object_system/storage/proc/uses_numerical_ui()
-	return ui_numerical_mode
-
-/datum/object_system/storage/proc/create_ui_slot_mode(mob/user)
-	. = list()
-	var/atom/movable/screen/storage/closer/closer = new
-	. += closer
-	var/atom/movable/screen/storage/panel/slot/boxes/boxes = new
-	. += boxes
-	// todo: clientless support is awful here
-	var/list/decoded_view = decode_view_size(user.client?.view || world.view)
-	var/view_x = decoded_view[1]
-	// clamp to max items if needed
-	var/rendering_width = STORAGE_UI_TILES_FOR_SCREEN_VIEW_X(view_x)
-	if(max_items)
-		rendering_width = min(max_items, rendering_width)
-	// see if we need to process numerical display
-	var/list/datum/storage_numerical_display/numerical_rendered = uses_numerical_ui()? render_numerical_display() : null
-	// process indirection
-	var/atom/indirection = real_contents_loc()
-	// if we have expand when needed, only show 1 more than the actual amount.
-	if(ui_expand_when_needed)
-		rendering_width = min(rendering_width, (isnull(numerical_rendered)? length(indirection.contents) : length(numerical_rendered)) + 1)
-	// compute count and rows
-	var/item_count = isnull(numerical_rendered)? length(indirection.contents) : length(numerical_rendered)
-	var/rows_needed = ROUND_UP(item_count / rendering_width) || 1
-	// prepare iteration
-	var/current_row = 1
-	var/current_column = 1
-	// render boxes
-	boxes.screen_loc = "LEFT+[STORAGE_UI_START_TILE_X]:[STORAGE_UI_START_PIXEL_X],BOTTOM+[STORAGE_UI_START_TILE_Y]:[STORAGE_UI_START_PIXEL_Y] to \
-		LEFT+[STORAGE_UI_START_TILE_X + rendering_width - 1]:[STORAGE_UI_START_PIXEL_X],BOTTOM+[STORAGE_UI_START_TILE_Y + rows_needed - 1]:[STORAGE_UI_START_PIXEL_Y]"
-	// render closer
-	closer.screen_loc = "LEFT+[STORAGE_UI_START_TILE_X + rendering_width]:[STORAGE_UI_START_PIXEL_X],BOTTOM+[STORAGE_UI_START_TILE_Y]:[STORAGE_UI_START_PIXEL_Y]"
-	// render items
-	if(islist(numerical_rendered))
-		for(var/datum/storage_numerical_display/display as anything in numerical_rendered)
-			var/atom/movable/screen/storage/item/slot/renderer = new(null, display.rendered_object)
-			. += renderer
-			// render amount
-			display.rendered_object.maptext = MAPTEXT("[display.amount]")
-			// position
-			renderer.screen_loc = "LEFT+[STORAGE_UI_START_TILE_X + current_column - 1]:[STORAGE_UI_START_PIXEL_X],\
-				BOTTOM+[STORAGE_UI_START_TILE_Y + current_row - 1]:[STORAGE_UI_START_PIXEL_Y]"
-			// advance
-			++current_column
-			if(current_column > rendering_width)
-				current_column = 1
-				++current_row
-				if(current_row > STORAGE_UI_MAX_ROWS)
-					break
-	else
-		for(var/obj/item/item in indirection)
-			var/atom/movable/screen/storage/item/slot/renderer = new(null, item)
-			. += renderer
-			// position
-			renderer.screen_loc = "LEFT+[STORAGE_UI_START_TILE_X + current_column - 1]:[STORAGE_UI_START_PIXEL_X],\
-				BOTTOM+[STORAGE_UI_START_TILE_Y + current_row - 1]:[STORAGE_UI_START_PIXEL_Y]"
-			// advance
-			++current_column
-			if(current_column > rendering_width)
-				current_column = 1
-				++current_row
-				if(current_row > STORAGE_UI_MAX_ROWS)
-					break
-
-/datum/object_system/storage/proc/create_ui_volumetric_mode(mob/user)
-	// guard against divide-by-0's
-	if(!max_combined_volume)
-		return create_ui_slot_mode(user)
-	. = list()
-
-	//? resolve view and rendering
-	// todo: clientless support is awful here
-
-	// resolve view
-	var/list/decoded_view = decode_view_size(user.client?.view || world.view)
-	var/view_x = decoded_view[1]
-	// setup initial width
-	var/rendering_width = STORAGE_UI_TILES_FOR_SCREEN_VIEW_X(view_x)
-	var/rendering_width_in_pixels = rendering_width * 32
-	// effective max scales up if we're overrunning
-	var/effective_max_volume = max(max_combined_volume, cached_combined_volume)
-	// scale down width to volume
-	rendering_width_in_pixels = min(rendering_width_in_pixels, effective_max_volume * VOLUMETRIC_STORAGE_STANDARD_PIXEL_RATIO)
-
-	//? resolve items
-
-	// resolve indirection
-	var/atom/indirection = real_contents_loc()
-
-	//? prepare iteration
-
-	// max x used in all rows, including padding.
-	var/maximum_used_width = 0
-	// current consumed x of row
-	var/iteration_used_width = 0
-	// current consumed item padding of row
-	var/iteration_used_padding = 0
-	// current row
-	var/current_row = 1
-	// safety
-	var/safety = VOLUMETRIC_STORAGE_MAX_ITEMS
-	// iterate and render
-	for(var/obj/item/item in indirection)
-		// check safety
-		safety--
-		if(safety <= 0)
-			to_chat(user, SPAN_WARNING("Some items in this storage have been truncated for performance reasons."))
-			break
-
-		// check row
-		if(iteration_used_width >= rendering_width_in_pixels)
-			// check if we're out of rows
-			if(current_row >= STORAGE_UI_MAX_ROWS)
-				to_chat(user, SPAN_WARNING("Some items in this storage have been truncated for performance reasons."))
-				break
-			// make another row
-			current_row++
-			// register to maximum used width
-			// we add the edge padding for both edges, but remove the last item's padding.
-			maximum_used_width = max(maximum_used_width, iteration_used_width + iteration_used_padding + VOLUMETRIC_STORAGE_EDGE_PADDING * 2 - VOLUMETRIC_STORAGE_ITEM_PADDING)
-			// reset vars
-			iteration_used_padding = 0
-			iteration_used_width = 0
-
-		// render the item
-		var/atom/movable/screen/storage/item/volumetric/renderer = new(null, item)
-		// scale it as necessary, to nearest multiple of 2
-		var/used_pixels = max(VOLUMETRIC_STORAGE_MINIMUM_PIXELS_PER_ITEM, CEILING(rendering_width_in_pixels * (item.get_weight_volume() / effective_max_volume), 2))
-		// emit to renderer
-		renderer.set_pixel_width(used_pixels)
-		// set screen loc
-		renderer.screen_loc = "LEFT+[STORAGE_UI_START_TILE_X]:[STORAGE_UI_START_PIXEL_X + (iteration_used_width + iteration_used_padding + VOLUMETRIC_STORAGE_EDGE_PADDING) + (used_pixels - VOLUMETRIC_STORAGE_BOX_ICON_SIZE) * 0.5],\
-			BOTTOM+[STORAGE_UI_START_TILE_Y + current_row - 1]:[STORAGE_UI_START_PIXEL_Y]"
-		// add to emitted screen list
-		. += renderer
-		// add to iteration tracking
-		iteration_used_width += used_pixels
-		iteration_used_padding += VOLUMETRIC_STORAGE_ITEM_PADDING
-	// register to maximum used width
-	// we add the edge padding for both edges, but remove the last item's padding.
-	maximum_used_width = max(maximum_used_width, iteration_used_width + iteration_used_padding + VOLUMETRIC_STORAGE_EDGE_PADDING * 2 - VOLUMETRIC_STORAGE_ITEM_PADDING)
-
-	// now that everything's set up, we can render everything based on the solved sizes.
-	// middle size; we also keep in account padding so there's a smooth expansion instead of a sudden expansion at the end.
-	var/middle_width = max(maximum_used_width, rendering_width_in_pixels + iteration_used_padding)
-	// i hate byond i hate byond i hate byond i hate byond; this is because things break if we don't extend by 2 pixels
-	// at a time for left/right as we use a dumb transform matrix and screen loc to shift, instead of a scale and shift matrix
-	middle_width = CEILING(middle_width, 2)
-	// todo: instead of this crap we should instead have the translation matrix do the shift
-	var/middle_shift = round(middle_width * 0.5 - VOLUMETRIC_STORAGE_BOX_ICON_SIZE * 0.5)
-	// render left
-	var/atom/movable/screen/storage/panel/volumetric/left/p_left = new
-	. += p_left
-	p_left.screen_loc = "LEFT+[STORAGE_UI_START_TILE_X]:[STORAGE_UI_START_PIXEL_X - VOLUMETRIC_STORAGE_BOX_BORDER_SIZE],\
-		BOTTOM+[STORAGE_UI_START_TILE_Y]:[STORAGE_UI_START_PIXEL_Y] to \
-		LEFT+[STORAGE_UI_START_TILE_X]:[STORAGE_UI_START_PIXEL_X - VOLUMETRIC_STORAGE_BOX_BORDER_SIZE],\
-		BOTTOM+[STORAGE_UI_START_TILE_Y + current_row - 1]:[STORAGE_UI_START_PIXEL_Y]"
-	// render middle
-	var/atom/movable/screen/storage/panel/volumetric/middle/p_box = new
-	. += p_box
-	p_box.set_pixel_width(middle_width)
-	p_box.screen_loc = "LEFT+[STORAGE_UI_START_TILE_X]:[STORAGE_UI_START_PIXEL_X + middle_shift],\
-		BOTTOM+[STORAGE_UI_START_TILE_Y]:[STORAGE_UI_START_PIXEL_Y] to \
-		LEFT+[STORAGE_UI_START_TILE_X]:[STORAGE_UI_START_PIXEL_X + middle_shift],\
-		BOTTOM+[STORAGE_UI_START_TILE_Y + current_row - 1]:[STORAGE_UI_START_PIXEL_Y]"
-	// render closer on bottom
-	var/atom/movable/screen/storage/closer/closer = new
-	. += closer
-	closer.screen_loc = "LEFT+[STORAGE_UI_START_TILE_X]:[STORAGE_UI_START_PIXEL_X + middle_width],\
-		BOTTOM+[STORAGE_UI_START_TILE_Y]:[STORAGE_UI_START_PIXEL_Y]"
-	// render right sides above closer
-	if(current_row > 1)
-		var/atom/movable/screen/storage/panel/volumetric/right/p_right = new
-		. += p_right
-		p_right.screen_loc = "LEFT+[STORAGE_UI_START_TILE_X]:[STORAGE_UI_START_PIXEL_X + middle_width - WORLD_ICON_SIZE + VOLUMETRIC_STORAGE_BOX_BORDER_SIZE],\
-			BOTTOM+[STORAGE_UI_START_TILE_Y + 1]:[STORAGE_UI_START_PIXEL_Y] to \
-			LEFT+[STORAGE_UI_START_TILE_X]:[STORAGE_UI_START_PIXEL_X + middle_width - WORLD_ICON_SIZE + VOLUMETRIC_STORAGE_BOX_BORDER_SIZE],\
-			BOTTOM+[STORAGE_UI_START_TILE_Y + current_row - 1]:[STORAGE_UI_START_PIXEL_Y]"
-
-//* Indirection *//
-
-/**
- * **USE AT YOUR OWN PERIL**
- */
-/datum/object_system/storage/proc/indirect(atom/where)
-	ASSERT(isnull(indirection))
-	indirection = new(where, src)
-
-/**
- * remove indirection by obliterating contents
- */
-/datum/object_system/storage/proc/destructively_remove_indirection()
-	QDEL_NULL(indirection)
-
-/**
- * remove indirection by moving contents
- */
-/datum/object_system/storage/proc/relocate_remove_indirection(atom/where_to)
-	ASSERT(!isnull(where_to) && where_to != indirection)
-	for(var/atom/movable/AM as anything in indirection)
-		AM.forceMove(where_to)
-	QDEL_NULL(indirection)
-
-/**
- * move indirection somewhere else
- */
-/datum/object_system/storage/proc/move_indirection_to(atom/where_to)
-	indirection.forceMove(where_to)
-
-//? Numerical Display Helper
-
 //? Action
 
 /datum/action/storage_gather_mode
@@ -1495,49 +1169,3 @@
 	else
 		obj_storage.indirect(src)
 	return obj_storage
-
-//? Indirection Holder
-
-/atom/movable/storage_indirection
-	atom_flags = ATOM_ABSTRACT
-
-	/// owner
-	var/datum/object_system/storage/parent
-
-/atom/movable/storage_indirection/Initialize(mapload, datum/object_system/storage/parent)
-	src.parent = parent
-	return ..()
-
-/atom/movable/storage_indirection/Destroy()
-	if(src.parent.indirection == src)
-		src.parent.indirection = null
-	src.parent = null
-	return ..()
-
-/atom/movable/storage_indirection/CanReachIn(atom/movable/mover, atom/target, obj/item/tool, list/cache)
-	return TRUE
-
-/atom/movable/storage_indirection/CanReachOut(atom/movable/mover, atom/target, obj/item/tool, list/cache)
-	return TRUE
-
-/atom/movable/storage_indirection/Exited(atom/movable/AM, atom/newLoc)
-	. = ..()
-	if(isitem(AM))
-		parent.on_item_exited(AM)
-
-/atom/movable/storage_indirection/Entered(atom/movable/AM, atom/oldLoc)
-	. = ..()
-	if(isitem(AM))
-		parent.on_item_entered(AM)
-
-/atom/movable/storage_indirection/on_contents_weight_class_change(obj/item/item, old_weight_class, new_weight_class)
-	parent.on_contents_weight_class_change(item, old_weight_class, new_weight_class)
-
-/atom/movable/storage_indirection/on_contents_weight_volume_change(obj/item/item, old_weight_volume, new_weight_volume)
-	parent.on_contents_weight_volume_change(item, old_weight_volume, new_weight_volume)
-
-/atom/movable/storage_indirection/on_contents_weight_change(obj/item/item, old_weight, new_weight)
-	parent.on_contents_weight_change(item, old_weight, new_weight)
-
-/atom/movable/storage_indirection/on_contents_item_new(obj/item/item)
-	parent.on_contents_item_new(item)
diff --git a/code/modules/mob/mob-inventory-internal.dm b/code/modules/mob/mob-inventory-internal.dm
index b080bc7ca19d..e267b69c5d92 100644
--- a/code/modules/mob/mob-inventory-internal.dm
+++ b/code/modules/mob/mob-inventory-internal.dm
@@ -33,12 +33,12 @@
 			var/obj/item/held = item_by_slot_id(SLOT_ID_BELT)
 			if(flags & INV_OP_FORCE)
 				return held?.obj_storage?.insert(I, new /datum/event_args/actor(src), flags & INV_OP_SUPPRESS_SOUND)
-			return held?.obj_storage?.auto_handle_interacted_insertion(I, new /datum/event_args/actor(src), flags & INV_OP_SUPPRESS_WARNING, flags & INV_OP_SUPPRESS_SOUND)
+			return held?.obj_storage?.auto_handle_inventory_insertion(I, new /datum/event_args/actor(src), flags & INV_OP_SUPPRESS_WARNING, flags & INV_OP_SUPPRESS_SOUND)
 		if(/datum/inventory_slot/abstract/put_in_backpack)
 			var/obj/item/held = item_by_slot_id(SLOT_ID_BACK)
 			if(flags & INV_OP_FORCE)
 				return held?.obj_storage?.insert(I, new /datum/event_args/actor(src), flags & INV_OP_SUPPRESS_SOUND)
-			return held?.obj_storage?.auto_handle_interacted_insertion(I, new /datum/event_args/actor(src), flags & INV_OP_SUPPRESS_WARNING, flags & INV_OP_SUPPRESS_SOUND)
+			return held?.obj_storage?.auto_handle_inventory_insertion(I, new /datum/event_args/actor(src), flags & INV_OP_SUPPRESS_WARNING, flags & INV_OP_SUPPRESS_SOUND)
 		if(/datum/inventory_slot/abstract/put_in_hands)
 			return put_in_hands(I, flags)
 		if(/datum/inventory_slot/abstract/put_in_storage, /datum/inventory_slot/abstract/put_in_storage_try_active)
@@ -48,7 +48,7 @@
 					if(active_storage?.insert(I, new /datum/event_args/actor(src), flags & INV_OP_SUPPRESS_WARNING))
 						return TRUE
 				else
-					if(active_storage?.auto_handle_interacted_insertion(I, new /datum/event_args/actor(src), flags & INV_OP_SUPPRESS_WARNING, flags & INV_OP_SUPPRESS_SOUND))
+					if(active_storage?.auto_handle_inventory_insertion(I, new /datum/event_args/actor(src), flags & INV_OP_SUPPRESS_WARNING, flags & INV_OP_SUPPRESS_SOUND))
 						return TRUE
 			for(var/obj/item/held in get_equipped_items_in_slots(list(
 				SLOT_ID_BELT,
@@ -62,7 +62,7 @@
 					continue
 				if(flags & INV_OP_FORCE)
 					return held.obj_storage.insert(I, new /datum/event_args/actor(src), flags & INV_OP_SUPPRESS_SOUND)
-				return held.obj_storage.auto_handle_interacted_insertion(I, new /datum/event_args/actor(src), flags & INV_OP_SUPPRESS_WARNING, flags & INV_OP_SUPPRESS_SOUND)
+				return held.obj_storage.auto_handle_inventory_insertion(I, new /datum/event_args/actor(src), flags & INV_OP_SUPPRESS_WARNING, flags & INV_OP_SUPPRESS_SOUND)
 			return FALSE
 		if(/datum/inventory_slot/abstract/attach_as_accessory)
 			for(var/obj/item/clothing/C in get_equipped_items())
diff --git a/code/modules/species/protean/protean.dm b/code/modules/species/protean/protean.dm
index 4ec107b2fc55..74a28eea0e29 100644
--- a/code/modules/species/protean/protean.dm
+++ b/code/modules/species/protean/protean.dm
@@ -177,7 +177,7 @@
 /datum/species/protean/apply_racial_gear(mob/living/carbon/for_target, list/into_box, list/into_inv)
 	var/obj/item/clothing/accessory/permit/nanotech/permit = new
 	permit.set_name(for_target.real_name)
-	into_box += permit
+	into_box?.Add(permit)
 	return ..()
 
 /datum/species/protean/get_blood_colour(var/mob/living/carbon/human/H)
diff --git a/code/modules/species/species.dm b/code/modules/species/species.dm
index 17a6295a092c..b7bbcbef64a2 100644
--- a/code/modules/species/species.dm
+++ b/code/modules/species/species.dm
@@ -512,6 +512,10 @@
 	//! LEGACY
 	is_subspecies = id != uid
 	superspecies_id = id
+	if(!id)
+		id = uid
+	if(!uid)
+		uid = id
 
 	if(hud_type)
 		hud = new hud_type()

From e5c9d78e9e1eb993d0083bd2b9f07860657e0b5e Mon Sep 17 00:00:00 2001
From: silicons <2003111+silicons@users.noreply.github.com>
Date: Wed, 18 Dec 2024 14:42:50 -0500
Subject: [PATCH 17/25] start without hypovials

---
 .../nanotrasen/nanotrasen-supply/medical.dm   |  6 +-
 code/game/machinery/vending/medical.dm        |  1 +
 .../objects/items/storage/medical/hypokit.dm  | 75 +++++++++++++------
 code/game/objects/items/storage/storage.dm    |  8 ++
 .../crates_lockers/closets/secure/medical.dm  |  2 +-
 maps/rift/levels/rift-05-surface2.dmm         | 12 +--
 maps/sectors/admin_planets_192/andromeda.dmm  | 12 +--
 maps/sectors/admin_planets_192/croatoan.dmm   | 22 +++---
 maps/sectors/admin_planets_192/fey_map.dmm    |  4 +-
 9 files changed, 89 insertions(+), 53 deletions(-)

diff --git a/code/game/content/factions/corporations/nanotrasen/nanotrasen-supply/medical.dm b/code/game/content/factions/corporations/nanotrasen/nanotrasen-supply/medical.dm
index 9e7848402f26..c0fae5eca26b 100644
--- a/code/game/content/factions/corporations/nanotrasen/nanotrasen-supply/medical.dm
+++ b/code/game/content/factions/corporations/nanotrasen/nanotrasen-supply/medical.dm
@@ -117,7 +117,7 @@
 		/obj/item/storage/belt/medical,
 		/obj/item/radio/headset/heads/cmo,
 		/obj/item/clothing/under/rank/chief_medical_officer,
-		/obj/item/storage/hypokit/advanced/cmo,
+		/obj/item/storage/hypokit/advanced/cmo/full/loaded,
 		/obj/item/clothing/accessory/stethoscope,
 		/obj/item/clothing/glasses/hud/health,
 		/obj/item/clothing/suit/storage/toggle/labcoat/cmo,
@@ -175,7 +175,7 @@
 		/obj/item/healthanalyzer,
 		/obj/item/storage/box/pillbottles,
 		/obj/item/storage/box/syringes,
-		/obj/item/storage/hypokit,
+		/obj/item/storage/hypokit/full/loaded,
 	)
 	worth = 450
 	container_type = /obj/structure/closet/crate/corporate/nanomed
@@ -201,7 +201,7 @@
 		/obj/item/cartridge/medical,
 		/obj/item/flashlight/pen,
 		/obj/item/clothing/accessory/storage/white_vest,
-		/obj/item/storage/hypokit,
+		/obj/item/storage/hypokit/full/loaded,
 	)
 	worth = 450
 	container_type = /obj/structure/closet/crate/secure/corporate/nanomed
diff --git a/code/game/machinery/vending/medical.dm b/code/game/machinery/vending/medical.dm
index 4cf792e7b35a..56ab1cdb70f8 100644
--- a/code/game/machinery/vending/medical.dm
+++ b/code/game/machinery/vending/medical.dm
@@ -30,6 +30,7 @@
 		/obj/item/storage/single_use/med_pouch/oxyloss = 3,
 		/obj/item/storage/single_use/med_pouch/burn = 3,
 		/obj/item/storage/single_use/med_pouch/trauma = 3,
+		/obj/item/hypospray = 6,
 		/obj/item/storage/hypokit = 6,
 	)
 	contraband = list(
diff --git a/code/game/objects/items/storage/medical/hypokit.dm b/code/game/objects/items/storage/medical/hypokit.dm
index 055f3d68c0a5..90dd1d6b389c 100644
--- a/code/game/objects/items/storage/medical/hypokit.dm
+++ b/code/game/objects/items/storage/medical/hypokit.dm
@@ -11,28 +11,58 @@
 		/obj/item/hypospray,
 	)
 
-	var/hypospray_path = /obj/item/hypospray
+	var/hypospray_path = null
 	var/vial_path = /obj/item/reagent_containers/glass/hypovial
 	var/vial_amount = 0
 
 /obj/item/storage/hypokit/legacy_spawn_contents()
 	. = ..()
-	new hypospray_path(src)
+	if(hypospray_path)
+		new hypospray_path(src)
 	spawn_hypovials()
 
 /obj/item/storage/hypokit/proc/spawn_hypovials()
+	if(!vial_path)
+		return
 	for(var/i in 1 to vial_amount)
 		new vial_path(src)
 
+/obj/item/storage/hypokit/full
+	hypospray_path = /obj/item/hypospray
+	vial_amount = 13
+
+/obj/item/storage/hypokit/full/loaded
+	hypospray_path = /obj/item/hypospray/loaded
+
+/obj/item/storage/hypokit/full/loaded/spawn_hypovials()
+	for(var/i in 1 to 2)
+		new /obj/item/reagent_containers/glass/hypovial/bicaridine(src)
+	for(var/i in 1 to 2)
+		new /obj/item/reagent_containers/glass/hypovial/dylovene(src)
+	for(var/i in 1 to 2)
+		new /obj/item/reagent_containers/glass/hypovial/kelotane(src)
+	for(var/i in 1 to 2)
+		new /obj/item/reagent_containers/glass/hypovial/dexalin(src)
+	for(var/i in 1 to 2)
+		new /obj/item/reagent_containers/glass/hypovial/tricordrazine(src)
+	for(var/i in 1 to 2)
+		new /obj/item/reagent_containers/glass/hypovial/inaprovaline(src)
+
 /obj/item/storage/hypokit/combat
 	name = "combat hypospray kit"
 	icon_state = "tactical"
-	hypospray_path = /obj/item/hypospray/combat/loaded
 	vial_path = /obj/item/reagent_containers/glass/hypovial/large
 	max_combined_volume = STORAGE_VOLUME_BOX * 2
 	weight_volume = WEIGHT_VOLUME_NORMAL * 1.5
 
-/obj/item/storage/hypokit/combat/loaded/spawn_hypovials()
+/obj/item/storage/hypokit/combat/full
+	hypospray_path = /obj/item/hypospray/combat
+	vial_amount = 13
+
+/obj/item/storage/hypokit/combat/full/loaded
+	hypospray_path = /obj/item/hypospray/combat/loaded
+
+/obj/item/storage/hypokit/combat/full/loaded/spawn_hypovials()
 	for(var/i in 1 to 2)
 		new /obj/item/reagent_containers/glass/hypovial/large/bicaridine(src)
 	for(var/i in 1 to 2)
@@ -52,13 +82,18 @@
 	icon = 'icons/items/storage/firstaid.dmi'
 	icon_state = "briefcase"
 	inhand_state = "normal"
-	hypospray_path = /obj/item/hypospray/advanced/loaded
 	vial_path = /obj/item/reagent_containers/glass/hypovial/large
-	vial_amount = 6
 	max_combined_volume = STORAGE_VOLUME_BOX * 2
 	weight_volume = WEIGHT_VOLUME_NORMAL * 1.5
 
-/obj/item/storage/hypokit/advanced/loaded/spawn_hypovials()
+/obj/item/storage/hypokit/advanced/full
+	hypospray_path = /obj/item/hypospray/advanced
+	vial_amount = 13
+
+/obj/item/storage/hypokit/advanced/full/loaded
+	hypospray_path = /obj/item/hypospray/advanced/loaded
+
+/obj/item/storage/hypokit/advanced/full/loaded/spawn_hypovials()
 	for(var/i in 1 to 2)
 		new /obj/item/reagent_containers/glass/hypovial/large/bicaridine(src)
 	for(var/i in 1 to 2)
@@ -74,9 +109,17 @@
 	new /obj/item/reagent_containers/glass/hypovial/large/spaceacillin(src)
 
 /obj/item/storage/hypokit/advanced/cmo
+	hypospray_path = null
+	vial_amount = 0
+
+/obj/item/storage/hypokit/advanced/cmo/full
+	hypospray_path = /obj/item/hypospray/advanced/cmo
+	vial_amount = 13
+
+/obj/item/storage/hypokit/advanced/cmo/full/loaded
 	hypospray_path = /obj/item/hypospray/advanced/cmo/loaded
 
-/obj/item/storage/hypokit/advanced/cmo/loaded/spawn_hypovials()
+/obj/item/storage/hypokit/advanced/cmo/full/loaded/spawn_hypovials()
 	for(var/i in 1 to 2)
 		new /obj/item/reagent_containers/glass/hypovial/large/bicaridine(src)
 	for(var/i in 1 to 2)
@@ -89,19 +132,3 @@
 	new /obj/item/reagent_containers/glass/hypovial/large/tramadol(src)
 	new /obj/item/reagent_containers/glass/hypovial/large/arithrazine(src)
 	new /obj/item/reagent_containers/glass/hypovial/large/spaceacillin(src)
-
-/obj/item/storage/hypokit/loaded
-
-/obj/item/storage/hypokit/loaded/spawn_hypovials()
-	for(var/i in 1 to 2)
-		new /obj/item/reagent_containers/glass/hypovial/bicaridine(src)
-	for(var/i in 1 to 2)
-		new /obj/item/reagent_containers/glass/hypovial/dylovene(src)
-	for(var/i in 1 to 2)
-		new /obj/item/reagent_containers/glass/hypovial/kelotane(src)
-	for(var/i in 1 to 2)
-		new /obj/item/reagent_containers/glass/hypovial/dexalin(src)
-	for(var/i in 1 to 2)
-		new /obj/item/reagent_containers/glass/hypovial/tricordrazine(src)
-	for(var/i in 1 to 2)
-		new /obj/item/reagent_containers/glass/hypovial/inaprovaline(src)
diff --git a/code/game/objects/items/storage/storage.dm b/code/game/objects/items/storage/storage.dm
index 5c48ddef49af..17a5ba3e52e7 100644
--- a/code/game/objects/items/storage/storage.dm
+++ b/code/game/objects/items/storage/storage.dm
@@ -1,3 +1,11 @@
+/**
+ * ## Paths
+ *
+ * For an example of `/obj/item/storage/box/gimmicks`,
+ * * /obj/item/storage/box/gimmicks should be empty
+ * * /obj/item/storage/box/gimmicks/full should have preloaded contents in starts_with / procs
+ * * /obj/item/storage/box/gimmicks/full/loaded should have filled containers, as an example, if it's a box of reagents or something.
+ */
 /obj/item/storage
 	name = "storage"
 	icon = 'icons/obj/storage.dmi'
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm
index 674f9ece5426..cdf9ffa818d5 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm
@@ -145,7 +145,7 @@
 		/obj/item/radio/headset/heads/cmo,
 		/obj/item/radio/headset/heads/cmo/alt,
 		/obj/item/flash,
-		/obj/item/storage/hypokit/advanced/cmo,
+		/obj/item/storage/hypokit/advanced/cmo/full/loaded,
 		/obj/item/clothing/suit/storage/hooded/wintercoat/medical/cmo,
 		/obj/item/clothing/shoes/boots/winter/medical,
 		/obj/item/storage/box/freezer,
diff --git a/maps/rift/levels/rift-05-surface2.dmm b/maps/rift/levels/rift-05-surface2.dmm
index c115095ab382..2c91b54b863b 100644
--- a/maps/rift/levels/rift-05-surface2.dmm
+++ b/maps/rift/levels/rift-05-surface2.dmm
@@ -9969,26 +9969,26 @@
 	desc = null;
 	pixel_y = 24
 	},
-/obj/item/storage/hypokit{
+/obj/item/storage/hypokit/full/loaded{
 	pixel_x = -8;
 	pixel_y = -8
 	},
-/obj/item/storage/hypokit{
+/obj/item/storage/hypokit/full/loaded{
 	pixel_x = -8
 	},
-/obj/item/storage/hypokit{
+/obj/item/storage/hypokit/full/loaded{
 	pixel_x = -8;
 	pixel_y = 8
 	},
-/obj/item/storage/hypokit{
+/obj/item/storage/hypokit/full/loaded{
 	pixel_x = 8;
 	pixel_y = 8
 	},
-/obj/item/storage/hypokit{
+/obj/item/storage/hypokit/full/loaded{
 	pixel_x = 8;
 	pixel_y = -8
 	},
-/obj/item/storage/hypokit{
+/obj/item/storage/hypokit/full/loaded{
 	pixel_x = 8
 	},
 /turf/simulated/floor/tiled/white,
diff --git a/maps/sectors/admin_planets_192/andromeda.dmm b/maps/sectors/admin_planets_192/andromeda.dmm
index 17dcc5bf1efd..21dce2c0dbd3 100644
--- a/maps/sectors/admin_planets_192/andromeda.dmm
+++ b/maps/sectors/admin_planets_192/andromeda.dmm
@@ -3500,25 +3500,25 @@
 /area/admin_planet/andromeda/sec_briefing)
 "kE" = (
 /obj/structure/table/rack/shelf,
-/obj/item/storage/hypokit{
+/obj/item/storage/hypokit/full/loaded{
 	pixel_x = -6;
 	pixel_y = 8
 	},
-/obj/item/storage/hypokit{
+/obj/item/storage/hypokit/full/loaded{
 	pixel_x = 8;
 	pixel_y = 8
 	},
-/obj/item/storage/hypokit{
+/obj/item/storage/hypokit/full/loaded{
 	pixel_x = 8;
 	pixel_y = -8
 	},
-/obj/item/storage/hypokit{
+/obj/item/storage/hypokit/full/loaded{
 	pixel_x = 8
 	},
-/obj/item/storage/hypokit{
+/obj/item/storage/hypokit/full/loaded{
 	pixel_x = -6
 	},
-/obj/item/storage/hypokit{
+/obj/item/storage/hypokit/full/loaded{
 	pixel_x = -6;
 	pixel_y = -8
 	},
diff --git a/maps/sectors/admin_planets_192/croatoan.dmm b/maps/sectors/admin_planets_192/croatoan.dmm
index 33761393dfae..5bd53c6c9b6d 100644
--- a/maps/sectors/admin_planets_192/croatoan.dmm
+++ b/maps/sectors/admin_planets_192/croatoan.dmm
@@ -5377,15 +5377,15 @@
 /area/admin_planet/croatoan/civ_bar_public)
 "sN" = (
 /obj/structure/table/reinforced,
-/obj/item/storage/hypokit,
-/obj/item/storage/hypokit{
+/obj/item/storage/hypokit/full/loaded,
+/obj/item/storage/hypokit/full/loaded{
 	pixel_x = -8;
 	pixel_y = -8
 	},
-/obj/item/storage/hypokit{
+/obj/item/storage/hypokit/full/loaded{
 	pixel_x = -8
 	},
-/obj/item/storage/hypokit{
+/obj/item/storage/hypokit/full/loaded{
 	pixel_x = -8;
 	pixel_y = 8
 	},
@@ -10471,27 +10471,27 @@
 /obj/structure/window/reinforced{
 	dir = 4
 	},
-/obj/item/storage/hypokit,
-/obj/item/storage/hypokit{
+/obj/item/storage/hypokit/full/loaded,
+/obj/item/storage/hypokit/full/loaded{
 	pixel_x = -8;
 	pixel_y = -8
 	},
-/obj/item/storage/hypokit{
+/obj/item/storage/hypokit/full/loaded{
 	pixel_x = -8
 	},
-/obj/item/storage/hypokit{
+/obj/item/storage/hypokit/full/loaded{
 	pixel_x = -8;
 	pixel_y = 8
 	},
-/obj/item/storage/hypokit{
+/obj/item/storage/hypokit/full/loaded{
 	pixel_x = 8;
 	pixel_y = 8
 	},
-/obj/item/storage/hypokit{
+/obj/item/storage/hypokit/full/loaded{
 	pixel_x = 8;
 	pixel_y = -8
 	},
-/obj/item/storage/hypokit{
+/obj/item/storage/hypokit/full/loaded{
 	pixel_x = 8
 	},
 /obj/effect/floor_decal/corner_techfloor_grid/diagonal,
diff --git a/maps/sectors/admin_planets_192/fey_map.dmm b/maps/sectors/admin_planets_192/fey_map.dmm
index 1373f97a056c..ce262d5a73e2 100644
--- a/maps/sectors/admin_planets_192/fey_map.dmm
+++ b/maps/sectors/admin_planets_192/fey_map.dmm
@@ -56,10 +56,10 @@
 /area/admin_planet/fey_forest/gateway_facility)
 "bS" = (
 /obj/structure/table/rack/shelf/steel,
-/obj/item/storage/hypokit/advanced/loaded{
+/obj/item/storage/hypokit/advanced/full/loaded/loaded{
 	pixel_y = -7
 	},
-/obj/item/storage/hypokit/advanced/loaded,
+/obj/item/storage/hypokit/advanced/full/loaded/loaded,
 /turf/simulated/floor/tiled/techfloor,
 /area/admin_planet/fey_forest/gateway_facility)
 "ca" = (

From a4b833d4eea4d4e290b0e037af2b8a2fd7bdc425 Mon Sep 17 00:00:00 2001
From: silicons <2003111+silicons@users.noreply.github.com>
Date: Wed, 18 Dec 2024 14:45:03 -0500
Subject: [PATCH 18/25] fix

---
 code/modules/mob/holder.dm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/code/modules/mob/holder.dm b/code/modules/mob/holder.dm
index f7971dab6c18..15112d12b63e 100644
--- a/code/modules/mob/holder.dm
+++ b/code/modules/mob/holder.dm
@@ -2,6 +2,8 @@
 /obj/item/holder
 	name = "holder"
 	desc = "You shouldn't ever see this."
+	icon = 'icons/system/blank_32x32.dmi'
+	icon_state = ""
 	SET_APPEARANCE_FLAGS(KEEP_TOGETHER | PIXEL_SCALE | TILE_BOUND)
 	slot_flags = SLOT_HEAD | SLOT_HOLSTER
 	show_messages = 1

From fc1e3c60b4680a89a689e74063f16243f2ffde50 Mon Sep 17 00:00:00 2001
From: silicons <2003111+silicons@users.noreply.github.com>
Date: Thu, 19 Dec 2024 12:21:12 -0500
Subject: [PATCH 19/25] fix

---
 code/controllers/subsystem/atoms.dm                  | 2 +-
 code/game/turfs/simulated/flooring/flooring_types.dm | 1 -
 code/modules/materials/material_sheets.dm            | 8 ++++++++
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/code/controllers/subsystem/atoms.dm b/code/controllers/subsystem/atoms.dm
index f098686ca566..ce03cc2859c0 100644
--- a/code/controllers/subsystem/atoms.dm
+++ b/code/controllers/subsystem/atoms.dm
@@ -162,7 +162,7 @@ SUBSYSTEM_DEF(atoms)
 	// this sets 'where' to if we should be mapload.
 	// this is acceptable because args[4] ('where') is not used again.
 	args[4] = mapload
-	InitAtom(created, FALSE, args)
+	InitAtom(created, FALSE, args.Copy(4))
 	atom_init_status = old_init_status
 	return created
 
diff --git a/code/game/turfs/simulated/flooring/flooring_types.dm b/code/game/turfs/simulated/flooring/flooring_types.dm
index 594a892aeecc..5fa2358958ed 100644
--- a/code/game/turfs/simulated/flooring/flooring_types.dm
+++ b/code/game/turfs/simulated/flooring/flooring_types.dm
@@ -161,7 +161,6 @@
 	icon_base = "orange"
 	build_type = /obj/item/stack/tile/carpet/patterned/orange
 
-
 /datum/prototype/flooring/tiling
 	name = "floor"
 	desc = "Scuffed from the passage of countless greyshirts."
diff --git a/code/modules/materials/material_sheets.dm b/code/modules/materials/material_sheets.dm
index fbe144cf9964..73db47972e1e 100644
--- a/code/modules/materials/material_sheets.dm
+++ b/code/modules/materials/material_sheets.dm
@@ -28,16 +28,24 @@
 	var/allow_window_autobuild = TRUE
 
 /obj/item/stack/material/Initialize(mapload, new_amount, merge = TRUE, material)
+	// allow material override if needed
 	if(!isnull(material))
 		src.material = material
 
+	// fetch material
 	src.material = RSmaterials.fetch_or_defer(src.material)
 	if(src.material == REPOSITORY_FETCH_DEFER)
 		stack_trace("material deferred on a material stack. this isn't supported.")
 
+	// ensure our icon is set properly
 	if(src.material.icon && icon != src.material.icon)
 		icon = src.material.icon
 
+	//! LEGACY: turn it back on if our material doesn't have the proper shit set
+	if(!material.icon_stack_count)
+		skip_legacy_icon_update = FALSE
+	//! END
+
 	. = ..()
 
 	pixel_x = rand(0,4)-4

From f10928306185fccb4f96e09369dc39e90f63c675 Mon Sep 17 00:00:00 2001
From: silicons <2003111+silicons@users.noreply.github.com>
Date: Thu, 19 Dec 2024 12:22:06 -0500
Subject: [PATCH 20/25] fix

---
 code/modules/materials/material_sheets.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/modules/materials/material_sheets.dm b/code/modules/materials/material_sheets.dm
index 73db47972e1e..8fea3c15a165 100644
--- a/code/modules/materials/material_sheets.dm
+++ b/code/modules/materials/material_sheets.dm
@@ -42,7 +42,7 @@
 		icon = src.material.icon
 
 	//! LEGACY: turn it back on if our material doesn't have the proper shit set
-	if(!material.icon_stack_count)
+	if(!src.material.icon_stack_count)
 		skip_legacy_icon_update = FALSE
 	//! END
 

From 91c04654de8ba92a04302b0f36b36893233ddf30 Mon Sep 17 00:00:00 2001
From: silicons <2003111+silicons@users.noreply.github.com>
Date: Thu, 19 Dec 2024 22:01:47 -0500
Subject: [PATCH 21/25] help

---
 code/__DEFINES/objects/objects.dm             | 23 +++++++---
 code/game/objects/obj.dm                      | 43 ++++++++++++-------
 code/game/turfs/turf.dm                       |  2 +-
 .../components/binary_devices/dp_vent_pump.dm |  4 +-
 .../machinery/components/component.dm         |  4 +-
 .../components/omni_devices/omni_base.dm      |  2 +-
 .../components/unary/heat_exchanger.dm        |  2 +-
 .../machinery/components/unary/vent_pump.dm   |  8 ++--
 .../components/unary/vent_scrubber.dm         |  4 +-
 .../atmospherics/machinery/machinery.dm       |  2 +-
 code/modules/atmospherics/machinery/meter.dm  |  2 +-
 .../atmospherics/machinery/pipes/pipe_base.dm |  4 +-
 .../atmospherics/machinery/pipes/universal.dm |  2 +-
 .../atmospherics/machinery/pipes/vent.dm      |  2 +-
 .../industry/disposals/disposal_frame.dm      |  2 +-
 .../industry/disposals/disposal_pipe.dm       |  2 +-
 code/modules/power/cable.dm                   |  2 +-
 code/modules/power/terminal.dm                |  4 +-
 18 files changed, 67 insertions(+), 47 deletions(-)

diff --git a/code/__DEFINES/objects/objects.dm b/code/__DEFINES/objects/objects.dm
index 65cdac7abb35..92cb1c25f747 100644
--- a/code/__DEFINES/objects/objects.dm
+++ b/code/__DEFINES/objects/objects.dm
@@ -1,16 +1,23 @@
 //* This file is explicitly licensed under the MIT license. *//
-//* Copyright (c) 2024 silicons                             *//
+//* Copyright (c) 2024 Citadel Station Developers           *//
 
 //* /obj/var/hides_underfloor
 
 /// do not change these willy-nilly, these are strings for the map editor.
 
 /// just Don't
-#define OBJ_UNDERFLOOR_DISABLED "disabled"
+/// * this is different from 'NEVER'
+#define OBJ_UNDERFLOOR_UNSUPPORTED "unsupported"
 /// never underfloor, even if floor isn't plating
 #define OBJ_UNDERFLOOR_NEVER "never"
-/// always underfloor, as long as floor isn't plating
-#define OBJ_UNDERFLOOR_ALWAYS "always"
+/// Should be underfloor, and is not currently underfloor.
+/// * Setting to this at runtime is equal to setting to [OBJ_UNDERFLOOR_ACTIVE].
+///   The atom will automatically hide under the floor if the floor is covered.
+#define OBJ_UNDERFLOOR_INACTIVE "inactive"
+/// Should be underfloor, and is currently underfloor.
+/// * Setting to this at runtime is equal to setting to [OBJ_UNDERFLOOR_INACTIVE].
+///   The atom will automatically hide under the floor if the floor is covered.
+#define OBJ_UNDERFLOOR_ACTIVE "active"
 /// automatic
 ///
 /// * gets set to UNDERFLOOR_NEVER if we were made while the floor is intact
@@ -18,6 +25,7 @@
 #define OBJ_UNDERFLOOR_IF_CREATED_UNCOVERED "initially-covered"
 /// automatic
 ///
+/// * This is what you usually want.
 /// * IF_CREATED_UNCOVERED, but always underfloor if made in mapload
 #define OBJ_UNDERFLOOR_UNLESS_PLACED_ONTOP "initially-underfloor"
 
@@ -26,9 +34,10 @@ DEFINE_ENUM("obj_hides_underfloor", list(
 		"hides_underfloor",
 	),
 ), list(
-	"Disabled" = OBJ_UNDERFLOOR_DISABLED,
-	"Never" = OBJ_UNDERFLOOR_NEVER,
-	"Always" = OBJ_UNDERFLOOR_ALWAYS,
+	"Unsupported" = OBJ_UNDERFLOOR_UNSUPPORTED,
+	"No" = OBJ_UNDERFLOOR_NEVER,
+	"Yes (Currently Uncovered)" = OBJ_UNDERFLOOR_INACTIVE,
+	"Yes (Currently Covered)" = OBJ_UNDERFLOOR_ACTIVE,
 	"If Created Uncovered (Init Only)" = OBJ_UNDERFLOOR_IF_CREATED_UNCOVERED,
 	"If Created Uncovered Or In Mapload (Init Only)" = OBJ_UNDERFLOOR_UNLESS_PLACED_ONTOP,
 ))
diff --git a/code/game/objects/obj.dm b/code/game/objects/obj.dm
index 33ebad602a1f..449dc9cbf3f4 100644
--- a/code/game/objects/obj.dm
+++ b/code/game/objects/obj.dm
@@ -174,7 +174,7 @@
 	/// * gets set_underfloor(is_underfloor = TRUE | FALSE) called on init or turf init
 	/// * we are assumed to not be underfloor when we are first made
 	/// * if you want a var to track this make one yourself; we don't have one for memory concerns.
-	var/hides_underfloor = OBJ_UNDERFLOOR_DISABLED
+	var/hides_underfloor = OBJ_UNDERFLOOR_UNSUPPORTED
 	/// call update icon after update_hiding_underfloor()
 	///
 	/// * update_icon() called regardless of [hides_underfloor_defaulting] if TRUE
@@ -248,7 +248,7 @@
 		// init material parts only if it wasn't initialized already
 		if(!(obj_flags & OBJ_MATERIAL_INITIALIZED))
 			init_material_parts()
-	if(hides_underfloor != OBJ_UNDERFLOOR_NEVER && isturf(loc))
+	if(hides_underfloor != OBJ_UNDERFLOOR_UNSUPPORTED && isturf(loc))
 		initialize_hiding_underfloor(mapload)
 	if (set_obj_flags)
 		var/flagslist = splittext(set_obj_flags,";")
@@ -1058,7 +1058,7 @@
 		if(OBJ_UNDERFLOOR_IF_CREATED_UNCOVERED, OBJ_UNDERFLOOR_UNLESS_PLACED_ONTOP)
 			var/turf/where_we_are = loc
 			if(istype(where_we_are) && where_we_are.hides_underfloor_objects())
-				new_value = OBJ_UNDERFLOOR_ALWAYS
+				new_value = OBJ_UNDERFLOOR_INACTIVE
 			else
 				new_value = OBJ_UNDERFLOOR_NEVER
 	hides_underfloor = new_value
@@ -1067,7 +1067,7 @@
 /**
  * called to inform us we should / shouldn't be underfloor
  *
- * * this must be idempotent. we can get called at will by reconsider_hiding_underfloor() as we do not track if we are currently underfloor.
+ * * this must be idempotent. we can get called at will by reconsider_hiding_underfloor().
  * * we are assumed to not be underfloor when we are first made
  * * that means this is called during Initialize() if and only if we need to be hiding underfloor
  */
@@ -1076,20 +1076,28 @@
 		invisibility = new_value? (hides_underfloor_invisibility_abstract? INVISIBILITY_ABSTRACT : INVISIBILITY_UNDERFLOOR) : 0
 	if(hides_underfloor_update_icon)
 		update_icon()
+	hides_underfloor = new_value ? OBJ_UNDERFLOOR_ACTIVE : OBJ_UNDERFLOOR_INACTIVE
 	return TRUE
 
 /**
- * **guesses** if we're hidden underfloor
- * this is not the actual state!
+ * Checks if we will hide underfloor if covered
+ *
+ * * Only valid after Initialize().
  */
-/obj/proc/is_probably_hidden_underfloor()
+/obj/proc/will_hide_underfloor()
 	switch(hides_underfloor)
-		if(OBJ_UNDERFLOOR_ALWAYS)
-			var/turf/where_we_are = loc
-			return where_we_are.hides_underfloor_objects()
-		if(OBJ_UNDERFLOOR_NEVER)
+		if(OBJ_UNDERFLOOR_ACTIVE, OBJ_UNDERFLOOR_INACTIVE)
+			return TRUE
+		if(OBJ_UNDERFLOOR_UNSUPPORTED, OBJ_UNDERFLOOR_NEVER)
 			return FALSE
-	return FALSE
+		else
+			CRASH("Proc will_hide_underfloor() called witohut a valid underfloor value. Are you calling it too early in init?")
+
+/**
+ * Checks if we're hiding underfloor
+ */
+/obj/proc/is_hidden_underfloor()
+	return hides_underfloor == OBJ_UNDERFLOOR_ACTIVE
 
 /**
  * called at init
@@ -1104,15 +1112,18 @@
 			var/hide_anyways = (hides_underfloor == OBJ_UNDERFLOOR_UNLESS_PLACED_ONTOP) && mapload
 			var/we_are_hidden = where_we_are?.hides_underfloor_objects()
 			if(istype(where_we_are) && (hide_anyways || !we_are_hidden))
-				hides_underfloor = OBJ_UNDERFLOOR_ALWAYS
 				if(!mapload && we_are_hidden)
 					update_hiding_underfloor(TRUE)
+				else
+					hides_underfloor = OBJ_UNDERFLOOR_INACTIVE
 			else
 				hides_underfloor = OBJ_UNDERFLOOR_NEVER
-		if(OBJ_UNDERFLOOR_ALWAYS)
+		if(OBJ_UNDERFLOOR_ACTIVE, OBJ_UNDERFLOOR_INACTIVE)
 			var/turf/where_we_are = loc
 			if(!mapload && istype(where_we_are) && where_we_are.hides_underfloor_objects())
 				update_hiding_underfloor(TRUE)
+			else
+				hides_underfloor = OBJ_UNDERFLOOR_INACTIVE
 
 /**
  * called to re-call update_hiding_underfloor
@@ -1121,13 +1132,13 @@
 	var/turf/where_we_are = loc
 	var/turf_will_cover = istype(where_we_are) && where_we_are.hides_underfloor_objects()
 	switch(hides_underfloor)
-		if(OBJ_UNDERFLOOR_ALWAYS)
+		if(OBJ_UNDERFLOOR_INACTIVE, OBJ_UNDERFLOOR_ACTIVE)
 			update_hiding_underfloor(turf_will_cover)
 		if(OBJ_UNDERFLOOR_NEVER)
 			update_hiding_underfloor(FALSE)
 		else
 			// we're way beyond initialize, so..
-			hides_underfloor = OBJ_UNDERFLOOR_DISABLED
+			hides_underfloor = OBJ_UNDERFLOOR_UNSUPPORTED
 
 //* VV hooks *//
 
diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm
index 93ceaf8ba586..b120752fee36 100644
--- a/code/game/turfs/turf.dm
+++ b/code/game/turfs/turf.dm
@@ -677,7 +677,7 @@
 /turf/proc/update_underfloor_objects()
 	var/we_should_cover = hides_underfloor_objects()
 	for(var/obj/thing in contents)
-		if(thing.hides_underfloor == OBJ_UNDERFLOOR_DISABLED)
+		if(thing.hides_underfloor == OBJ_UNDERFLOOR_UNSUPPORTED)
 			continue
 		thing.update_hiding_underfloor(
 			(thing.hides_underfloor != OBJ_UNDERFLOOR_NEVER) && we_should_cover,
diff --git a/code/modules/atmospherics/machinery/components/binary_devices/dp_vent_pump.dm b/code/modules/atmospherics/machinery/components/binary_devices/dp_vent_pump.dm
index 232a6bac8d05..52cda8da29f1 100644
--- a/code/modules/atmospherics/machinery/components/binary_devices/dp_vent_pump.dm
+++ b/code/modules/atmospherics/machinery/components/binary_devices/dp_vent_pump.dm
@@ -72,7 +72,7 @@
 	if(!istype(T))
 		return
 
-	if(T.hides_underfloor_objects() && istype(node1, /obj/machinery/atmospherics/pipe) && istype(node2, /obj/machinery/atmospherics/pipe) && node1.hides_underfloor == OBJ_UNDERFLOOR_ALWAYS && node2.hides_underfloor == OBJ_UNDERFLOOR_ALWAYS)
+	if(T.hides_underfloor_objects() && istype(node1, /obj/machinery/atmospherics/pipe) && istype(node2, /obj/machinery/atmospherics/pipe) && node1.will_hide_underfloor() && node2.will_hide_underfloor())
 		vent_icon += "h"
 
 	if(!powered())
@@ -88,7 +88,7 @@
 		var/turf/T = get_turf(src)
 		if(!istype(T))
 			return
-		if(T.hides_underfloor_objects() && istype(node1, /obj/machinery/atmospherics/pipe) && istype(node2, /obj/machinery/atmospherics/pipe) && node1.hides_underfloor == OBJ_UNDERFLOOR_ALWAYS && node2.hides_underfloor == OBJ_UNDERFLOOR_ALWAYS)
+		if(T.hides_underfloor_objects() && istype(node1, /obj/machinery/atmospherics/pipe) && istype(node2, /obj/machinery/atmospherics/pipe) && node1.will_hide_underfloor() && node2.will_hide_underfloor())
 			return
 		else
 			if (node1)
diff --git a/code/modules/atmospherics/machinery/components/component.dm b/code/modules/atmospherics/machinery/components/component.dm
index 2f7c380ab7d3..592ba9b5b9eb 100644
--- a/code/modules/atmospherics/machinery/components/component.dm
+++ b/code/modules/atmospherics/machinery/components/component.dm
@@ -118,7 +118,7 @@
 	if(!default_access_interface)
 		return FALSE
 	// todo: refactor silicon interaction
-	if(interface_require_exposed && is_probably_hidden_underfloor() && !issilicon(user))
+	if(interface_require_exposed && is_hidden_underfloor() && !issilicon(user))
 		return FALSE
 	return ..()
 
@@ -137,7 +137,7 @@
 		return
 	if(isnull(default_multitool_hijack))
 		return FALSE
-	if(hijack_require_exposed && is_probably_hidden_underfloor())
+	if(hijack_require_exposed && is_hidden_underfloor())
 		e_args.chat_feedback(SPAN_WARNING("You can't reach the controls of [src] while it's covered by flooring."), src)
 		return TRUE
 	e_args.visible_feedback(
diff --git a/code/modules/atmospherics/machinery/components/omni_devices/omni_base.dm b/code/modules/atmospherics/machinery/components/omni_devices/omni_base.dm
index ddfabc06cb6d..88d6a2837072 100644
--- a/code/modules/atmospherics/machinery/components/omni_devices/omni_base.dm
+++ b/code/modules/atmospherics/machinery/components/omni_devices/omni_base.dm
@@ -193,7 +193,7 @@
 		var/turf/T = get_turf(src)
 		if(!istype(T))
 			return
-		if(T.hides_underfloor_objects() && istype(P.node, /obj/machinery/atmospherics/pipe) && P.node.hides_underfloor == OBJ_UNDERFLOOR_ALWAYS)
+		if(T.hides_underfloor_objects() && istype(P.node, /obj/machinery/atmospherics/pipe) && P.node.will_hide_underfloor())
 			//pipe_state = icon_manager.get_atmos_icon("underlay_down", P.dir, color_cache_name(P.node))
 			pipe_state = icon_manager.get_atmos_icon("underlay", P.dir, color_cache_name(P.node), "down")
 		else
diff --git a/code/modules/atmospherics/machinery/components/unary/heat_exchanger.dm b/code/modules/atmospherics/machinery/components/unary/heat_exchanger.dm
index 421b61be1f82..53a7aaf9d022 100644
--- a/code/modules/atmospherics/machinery/components/unary/heat_exchanger.dm
+++ b/code/modules/atmospherics/machinery/components/unary/heat_exchanger.dm
@@ -49,7 +49,7 @@
 /obj/machinery/atmospherics/component/unary/heat_exchanger/attackby(var/obj/item/W as obj, var/mob/user as mob)
 	if (!W.is_wrench())
 		return ..()
-	if(is_probably_hidden_underfloor())
+	if(is_hidden_underfloor())
 		to_chat(user, "<span class='warning'>You must remove the plating first.</span>")
 		return 1
 	if(unsafe_pressure())
diff --git a/code/modules/atmospherics/machinery/components/unary/vent_pump.dm b/code/modules/atmospherics/machinery/components/unary/vent_pump.dm
index 9635f2fcafc8..2acade7a05d3 100644
--- a/code/modules/atmospherics/machinery/components/unary/vent_pump.dm
+++ b/code/modules/atmospherics/machinery/components/unary/vent_pump.dm
@@ -100,7 +100,7 @@
 	if(!istype(T))
 		return
 
-	if(is_probably_hidden_underfloor() && istype(node, /obj/machinery/atmospherics/pipe) && node.hides_underfloor == OBJ_UNDERFLOOR_ALWAYS)
+	if(is_hidden_underfloor() && istype(node, /obj/machinery/atmospherics/pipe) && node.will_hide_underfloor())
 		vent_icon += "h"
 
 	if(welded)
@@ -118,7 +118,7 @@
 		var/turf/T = get_turf(src)
 		if(!istype(T))
 			return
-		if(is_probably_hidden_underfloor() && istype(node, /obj/machinery/atmospherics/pipe) && node.hides_underfloor == OBJ_UNDERFLOOR_ALWAYS)
+		if(is_hidden_underfloor() && istype(node, /obj/machinery/atmospherics/pipe) && node.will_hide_underfloor())
 			return
 		else
 			if(node)
@@ -276,7 +276,7 @@
 	if (!(machine_stat & NOPOWER) && on)
 		to_chat(user, "<span class='warning'>You cannot unwrench \the [src], turn it off first.</span>")
 		return 1
-	if(is_probably_hidden_underfloor() && node?.hides_underfloor == OBJ_UNDERFLOOR_ALWAYS)
+	if(is_hidden_underfloor() && node?.will_hide_underfloor())
 		to_chat(user, "<span class='warning'>You must remove the plating first.</span>")
 		return 1
 	if(unsafe_pressure())
@@ -497,7 +497,7 @@
 	if(!istype(T))
 		return
 
-	if(T.hides_underfloor_objects() && istype(node, /obj/machinery/atmospherics/pipe) && node.hides_underfloor == OBJ_UNDERFLOOR_ALWAYS)
+	if(T.hides_underfloor_objects() && istype(node, /obj/machinery/atmospherics/pipe) && node.will_hide_underfloor())
 		vent_icon += "h"
 
 	if(welded)
diff --git a/code/modules/atmospherics/machinery/components/unary/vent_scrubber.dm b/code/modules/atmospherics/machinery/components/unary/vent_scrubber.dm
index a3551e56ae16..2aa0c4a19f58 100644
--- a/code/modules/atmospherics/machinery/components/unary/vent_scrubber.dm
+++ b/code/modules/atmospherics/machinery/components/unary/vent_scrubber.dm
@@ -131,7 +131,7 @@
 		var/turf/T = get_turf(src)
 		if(!istype(T))
 			return
-		if(T.hides_underfloor_objects() && istype(node, /obj/machinery/atmospherics/pipe) && node.hides_underfloor == OBJ_UNDERFLOOR_ALWAYS)
+		if(T.hides_underfloor_objects() && istype(node, /obj/machinery/atmospherics/pipe) && node.will_hide_underfloor())
 			return
 		else
 			if(node)
@@ -234,7 +234,7 @@
 		to_chat(user, "<span class='warning'>You cannot unwrench \the [src], turn it off first.</span>")
 		return 1
 	var/turf/T = src.loc
-	if(T?.hides_underfloor_objects() && node?.hides_underfloor == OBJ_UNDERFLOOR_ALWAYS)
+	if(T?.hides_underfloor_objects() && node?.will_hide_underfloor())
 		to_chat(user, "<span class='warning'>You must remove the plating first.</span>")
 		return 1
 	if(unsafe_pressure())
diff --git a/code/modules/atmospherics/machinery/machinery.dm b/code/modules/atmospherics/machinery/machinery.dm
index bd6d2287ce58..bce4d67312c9 100644
--- a/code/modules/atmospherics/machinery/machinery.dm
+++ b/code/modules/atmospherics/machinery/machinery.dm
@@ -104,7 +104,7 @@ Pipelines + Other Objects -> Pipe network
 
 /obj/machinery/atmospherics/proc/add_underlay(var/turf/T, var/obj/machinery/atmospherics/node, var/direction, var/icon_connect_type)
 	if(node)
-		if(istype(node, /obj/machinery/atmospherics/pipe) && (node.hides_underfloor == OBJ_UNDERFLOOR_ALWAYS) && T.hides_underfloor_objects())
+		if(istype(node, /obj/machinery/atmospherics/pipe) && (node.will_hide_underfloor()) && T.hides_underfloor_objects())
 			//underlays += icon_manager.get_atmos_icon("underlay_down", direction, color_cache_name(node))
 			underlays += icon_manager.get_atmos_icon("underlay", direction, color_cache_name(node), "down" + icon_connect_type)
 		else
diff --git a/code/modules/atmospherics/machinery/meter.dm b/code/modules/atmospherics/machinery/meter.dm
index 768aad460259..3119c92e4a95 100644
--- a/code/modules/atmospherics/machinery/meter.dm
+++ b/code/modules/atmospherics/machinery/meter.dm
@@ -25,7 +25,7 @@
 /obj/machinery/meter/proc/select_target()
 	var/obj/machinery/atmospherics/pipe/P
 	for(P in loc)
-		if(!P.is_probably_hidden_underfloor())
+		if(!P.is_hidden_underfloor())
 			break
 	if(!P)
 		P = locate(/obj/machinery/atmospherics/pipe) in loc
diff --git a/code/modules/atmospherics/machinery/pipes/pipe_base.dm b/code/modules/atmospherics/machinery/pipes/pipe_base.dm
index c62b9095879f..7f708cf89b95 100644
--- a/code/modules/atmospherics/machinery/pipes/pipe_base.dm
+++ b/code/modules/atmospherics/machinery/pipes/pipe_base.dm
@@ -27,7 +27,7 @@
 	// pipes are always underfloor if inside a wall
 	// we just check for loc.density 'cause speed lmao
 	if(loc?.density)
-		hides_underfloor = OBJ_UNDERFLOOR_ALWAYS
+		hides_underfloor = OBJ_UNDERFLOOR_ACTIVE
 	return ..()
 
 /obj/machinery/atmospherics/pipe/proc/pipeline_expansion()
@@ -91,7 +91,7 @@
 
 	if (!W.is_wrench())
 		return ..()
-	if (is_probably_hidden_underfloor())
+	if (is_hidden_underfloor())
 		to_chat(user, "<span class='warning'>You must remove the plating first.</span>")
 		return 1
 	if(unsafe_pressure())
diff --git a/code/modules/atmospherics/machinery/pipes/universal.dm b/code/modules/atmospherics/machinery/pipes/universal.dm
index ff049e78369c..20f8d9c6ce87 100644
--- a/code/modules/atmospherics/machinery/pipes/universal.dm
+++ b/code/modules/atmospherics/machinery/pipes/universal.dm
@@ -121,7 +121,7 @@
 
 /obj/machinery/atmospherics/proc/add_underlay_adapter(var/turf/T, var/obj/machinery/atmospherics/node, var/direction, var/icon_connect_type) //modified from add_underlay, does not make exposed underlays
 	if(node)
-		if(T.hides_underfloor_objects() && istype(node, /obj/machinery/atmospherics/pipe) && node.hides_underfloor == OBJ_UNDERFLOOR_ALWAYS)
+		if(T.hides_underfloor_objects() && istype(node, /obj/machinery/atmospherics/pipe) && node.will_hide_underfloor())
 			underlays += icon_manager.get_atmos_icon("underlay", direction, color_cache_name(node), "down" + icon_connect_type)
 		else
 			underlays += icon_manager.get_atmos_icon("underlay", direction, color_cache_name(node), "intact" + icon_connect_type)
diff --git a/code/modules/atmospherics/machinery/pipes/vent.dm b/code/modules/atmospherics/machinery/pipes/vent.dm
index cd43dbb8159a..3510ddfb3d45 100644
--- a/code/modules/atmospherics/machinery/pipes/vent.dm
+++ b/code/modules/atmospherics/machinery/pipes/vent.dm
@@ -41,7 +41,7 @@
 
 /obj/machinery/atmospherics/pipe/vent/update_icon()
 	if(node1)
-		if(is_probably_hidden_underfloor())
+		if(is_hidden_underfloor())
 			icon_state = "hintact"
 		else
 			icon_state = "intact"
diff --git a/code/modules/industry/disposals/disposal_frame.dm b/code/modules/industry/disposals/disposal_frame.dm
index 3a239b67f9c6..484473c2762b 100644
--- a/code/modules/industry/disposals/disposal_frame.dm
+++ b/code/modules/industry/disposals/disposal_frame.dm
@@ -282,7 +282,7 @@
 
 			anchored = 1
 			if(ispipe)
-				set_hides_underfloor(OBJ_UNDERFLOOR_ALWAYS)
+				set_hides_underfloor(OBJ_UNDERFLOOR_ACTIVE)
 				density = 0
 			else
 				density = 1 // We don't want disposal bins or outlets to go density 0
diff --git a/code/modules/industry/disposals/disposal_pipe.dm b/code/modules/industry/disposals/disposal_pipe.dm
index ec16874fdf64..c4fa1dbc1e19 100644
--- a/code/modules/industry/disposals/disposal_pipe.dm
+++ b/code/modules/industry/disposals/disposal_pipe.dm
@@ -6,7 +6,7 @@
 	desc = "An underfloor disposal pipe."
 	anchored = 1
 	density = 0
-	hides_underfloor = OBJ_UNDERFLOOR_ALWAYS
+	hides_underfloor = OBJ_UNDERFLOOR_ACTIVE
 	dir = 0 // dir will contain dominant direction for junction pipes
 	plane = TURF_PLANE
 	layer = DISPOSAL_LAYER // slightly lower than wires and other pipes.
diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm
index 623a90364a41..0a6fd8c9ffc7 100644
--- a/code/modules/power/cable.dm
+++ b/code/modules/power/cable.dm
@@ -53,7 +53,7 @@ GLOBAL_LIST_INIT(possible_cable_coil_colours, list(
 	layer = EXPOSED_WIRE_LAYER
 	color = COLOR_RED
 
-	hides_underfloor = OBJ_UNDERFLOOR_ALWAYS
+	hides_underfloor = OBJ_UNDERFLOOR_ACTIVE
 	anchored =1
 	rad_flags = RAD_BLOCK_CONTENTS | RAD_NO_CONTAMINATE
 
diff --git a/code/modules/power/terminal.dm b/code/modules/power/terminal.dm
index 969ed08f3b30..3f5035f058ae 100644
--- a/code/modules/power/terminal.dm
+++ b/code/modules/power/terminal.dm
@@ -11,7 +11,7 @@
 	anchored = 1
 	plane = TURF_PLANE
 	layer = EXPOSED_WIRE_TERMINAL_LAYER
-	hides_underfloor = OBJ_UNDERFLOOR_ALWAYS
+	hides_underfloor = OBJ_UNDERFLOOR_ACTIVE
 
 /obj/machinery/power/terminal/Destroy()
 	if(master)
@@ -24,7 +24,7 @@
 	update_icon()
 
 /obj/machinery/power/terminal/update_icon_state()
-	if(is_probably_hidden_underfloor())
+	if(is_hidden_underfloor())
 		icon_state = "term-f"
 	else
 		icon_state = "term"

From a89a56b4fd353ccd890621f755592ee534aca28b Mon Sep 17 00:00:00 2001
From: silicons <2003111+silicons@users.noreply.github.com>
Date: Thu, 19 Dec 2024 22:06:22 -0500
Subject: [PATCH 22/25] tray

---
 code/game/objects/items/devices/t_scanner.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/game/objects/items/devices/t_scanner.dm b/code/game/objects/items/devices/t_scanner.dm
index c424401e8159..275015610825 100644
--- a/code/game/objects/items/devices/t_scanner.dm
+++ b/code/game/objects/items/devices/t_scanner.dm
@@ -121,7 +121,7 @@
 			continue
 
 		for(var/obj/O in T.contents)
-			if(O.hides_underfloor == OBJ_UNDERFLOOR_NEVER)
+			if(!O.is_hidden_underfloor())
 				continue
 			if(!O.invisibility)
 				continue //if it's already visible don't need an overlay for it

From ba04c56f217fc23d82ccb606e7f88d8ba99ab904 Mon Sep 17 00:00:00 2001
From: silicons <2003111+silicons@users.noreply.github.com>
Date: Thu, 19 Dec 2024 23:29:26 -0500
Subject: [PATCH 23/25] fix strip menu crap

---
 code/game/objects/obj.dm                          | 3 ++-
 code/modules/mob/inventory/inventory-hands-put.dm | 3 +++
 code/modules/mob/mob-inventory-stripping.dm       | 8 ++++----
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/code/game/objects/obj.dm b/code/game/objects/obj.dm
index 449dc9cbf3f4..f7db5ed6c7d7 100644
--- a/code/game/objects/obj.dm
+++ b/code/game/objects/obj.dm
@@ -1076,7 +1076,8 @@
 		invisibility = new_value? (hides_underfloor_invisibility_abstract? INVISIBILITY_ABSTRACT : INVISIBILITY_UNDERFLOOR) : 0
 	if(hides_underfloor_update_icon)
 		update_icon()
-	hides_underfloor = new_value ? OBJ_UNDERFLOOR_ACTIVE : OBJ_UNDERFLOOR_INACTIVE
+	if(hides_underfloor != OBJ_UNDERFLOOR_NEVER)
+		hides_underfloor = new_value ? OBJ_UNDERFLOOR_ACTIVE : OBJ_UNDERFLOOR_INACTIVE
 	return TRUE
 
 /**
diff --git a/code/modules/mob/inventory/inventory-hands-put.dm b/code/modules/mob/inventory/inventory-hands-put.dm
index 2aabea67031d..36936afc1f1f 100644
--- a/code/modules/mob/inventory/inventory-hands-put.dm
+++ b/code/modules/mob/inventory/inventory-hands-put.dm
@@ -101,6 +101,9 @@
  */
 /mob/proc/put_in_hands_or_drop(obj/item/I, inv_op_flags, atom/drop_loc, specific_index)
 	// inventory null --> INV_RETURN_FAILED, as that's also #define'd to be null
+	if(!inventory)
+		I.forceMove(drop_loc || drop_location())
+		return INV_RETURN_FAILED
 	return inventory?.put_in_hands_or_drop(I, inv_op_flags, drop_loc, specific_index)
 
 /**
diff --git a/code/modules/mob/mob-inventory-stripping.dm b/code/modules/mob/mob-inventory-stripping.dm
index 7af49e06e983..c5602113261a 100644
--- a/code/modules/mob/mob-inventory-stripping.dm
+++ b/code/modules/mob/mob-inventory-stripping.dm
@@ -80,7 +80,7 @@
 
 	// now for hands
 	if(has_hands())
-		for(var/i in 1 to get_nominal_hand_count())
+		for(var/i in 1 to inventory.get_hand_count())
 			switch(i)
 				if(1)
 					. += "Left hand: "
@@ -88,7 +88,7 @@
 					. += "Right hand: "
 				else
 					. += "Hand [i]: "
-			var/obj/item/holding = get_held_index(i)
+			var/obj/item/holding = inventory.held_items[i]
 			. += "<a href='?src=[REF(src)];strip=hand;id=[i]'>[holding? holding.name : "nothing"]</a><br>"
 		. += "<hr>"
 
@@ -138,10 +138,10 @@
 	if(!strip_interaction_prechecks(user))
 		return FALSE
 
-	if((index < 1) || (index > get_nominal_hand_count()))
+	if((index < 1) || (index > inventory.get_hand_count()))
 		return FALSE
 
-	var/obj/item/ours = get_held_index(index)
+	var/obj/item/ours = inventory.get_hand_single(index)
 	var/obj/item/theirs = user.get_active_held_item()
 
 	if(!ours && !theirs)

From 2c8cce80ec993f393f48d3b1f2706d849584f27d Mon Sep 17 00:00:00 2001
From: silicons <2003111+silicons@users.noreply.github.com>
Date: Thu, 19 Dec 2024 23:31:26 -0500
Subject: [PATCH 24/25] document inventory

---
 code/modules/mob/inventory/inventory-hands-check.dm  | 2 ++
 code/modules/mob/inventory/inventory-hands-drop.dm   | 2 ++
 code/modules/mob/inventory/inventory-hands-get.dm    | 2 ++
 code/modules/mob/inventory/inventory-hands-legacy.dm | 2 ++
 code/modules/mob/inventory/inventory-hands-put.dm    | 2 ++
 code/modules/mob/inventory/inventory-hands.dm        | 2 --
 6 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/code/modules/mob/inventory/inventory-hands-check.dm b/code/modules/mob/inventory/inventory-hands-check.dm
index 6333f19c08a9..5274183f2143 100644
--- a/code/modules/mob/inventory/inventory-hands-check.dm
+++ b/code/modules/mob/inventory/inventory-hands-check.dm
@@ -1,6 +1,8 @@
 //* This file is explicitly licensed under the MIT license. *//
 //* Copyright (c) 2024 Citadel Station Developers           *//
 
+// todo: deal with below; new inventory-level api, don't just mirror from mob?
+
 //* Procs in this file are mirrored to the /mob level for ease of use.        *//
 //*                                                                           *//
 //* In the future, there should likely be a separation of concerns            *//
diff --git a/code/modules/mob/inventory/inventory-hands-drop.dm b/code/modules/mob/inventory/inventory-hands-drop.dm
index 8af8c926ddde..11fb852f9d4b 100644
--- a/code/modules/mob/inventory/inventory-hands-drop.dm
+++ b/code/modules/mob/inventory/inventory-hands-drop.dm
@@ -1,6 +1,8 @@
 //* This file is explicitly licensed under the MIT license. *//
 //* Copyright (c) 2024 Citadel Station Developers           *//
 
+// todo: deal with below; new inventory-level api, don't just mirror from mob?
+
 //* Procs in this file are mirrored to the /mob level for ease of use.        *//
 //*                                                                           *//
 //* In the future, there should likely be a separation of concerns            *//
diff --git a/code/modules/mob/inventory/inventory-hands-get.dm b/code/modules/mob/inventory/inventory-hands-get.dm
index 112ee8aa114c..467e5148f8d3 100644
--- a/code/modules/mob/inventory/inventory-hands-get.dm
+++ b/code/modules/mob/inventory/inventory-hands-get.dm
@@ -28,6 +28,8 @@
 		return
 	return held.inv_slot_attached()
 
+// todo: deal with below; new inventory-level api, don't just mirror from mob?
+
 /**
  * Gets items in given hand indices.
  *
diff --git a/code/modules/mob/inventory/inventory-hands-legacy.dm b/code/modules/mob/inventory/inventory-hands-legacy.dm
index 1dd8749bdf3c..7ae4b731e44f 100644
--- a/code/modules/mob/inventory/inventory-hands-legacy.dm
+++ b/code/modules/mob/inventory/inventory-hands-legacy.dm
@@ -1,6 +1,8 @@
 //* This file is explicitly licensed under the MIT license. *//
 //* Copyright (c) 2024 Citadel Station Developers           *//
 
+// todo: deal with below; new inventory-level api, don't just mirror from mob?
+
 /**
  * returns if we're holding something in inactive hand slots
  *
diff --git a/code/modules/mob/inventory/inventory-hands-put.dm b/code/modules/mob/inventory/inventory-hands-put.dm
index 36936afc1f1f..32857bfe0a26 100644
--- a/code/modules/mob/inventory/inventory-hands-put.dm
+++ b/code/modules/mob/inventory/inventory-hands-put.dm
@@ -1,6 +1,8 @@
 //* This file is explicitly licensed under the MIT license. *//
 //* Copyright (c) 2024 Citadel Station Developers           *//
 
+// todo: deal with below; new inventory-level api, don't just mirror from mob?
+
 //* Procs in this file are mirrored to the /mob level for ease of use.        *//
 //*                                                                           *//
 //* In the future, there should likely be a separation of concerns            *//
diff --git a/code/modules/mob/inventory/inventory-hands.dm b/code/modules/mob/inventory/inventory-hands.dm
index 9f196ff259dd..c1bebce9fe7f 100644
--- a/code/modules/mob/inventory/inventory-hands.dm
+++ b/code/modules/mob/inventory/inventory-hands.dm
@@ -13,5 +13,3 @@
 
 /datum/inventory/proc/get_hand_count()
 	return length(held_items)
-
-// todo: all inventory core procs go on the inventory, not the mob; mob is just a hook point!

From b94cb709d40977f71c81de7201090815a311b60a Mon Sep 17 00:00:00 2001
From: silicons <2003111+silicons@users.noreply.github.com>
Date: Thu, 19 Dec 2024 23:33:53 -0500
Subject: [PATCH 25/25] Fix

---
 maps/sectors/admin_planets_192/fey_map.dmm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/maps/sectors/admin_planets_192/fey_map.dmm b/maps/sectors/admin_planets_192/fey_map.dmm
index ce262d5a73e2..62c498d9398c 100644
--- a/maps/sectors/admin_planets_192/fey_map.dmm
+++ b/maps/sectors/admin_planets_192/fey_map.dmm
@@ -56,10 +56,10 @@
 /area/admin_planet/fey_forest/gateway_facility)
 "bS" = (
 /obj/structure/table/rack/shelf/steel,
-/obj/item/storage/hypokit/advanced/full/loaded/loaded{
+/obj/item/storage/hypokit/advanced/full/loaded{
 	pixel_y = -7
 	},
-/obj/item/storage/hypokit/advanced/full/loaded/loaded,
+/obj/item/storage/hypokit/advanced/full/loaded,
 /turf/simulated/floor/tiled/techfloor,
 /area/admin_planet/fey_forest/gateway_facility)
 "ca" = (