diff --git a/citadel.dme b/citadel.dme
index edb5171297dd..e935f35dd1d2 100644
--- a/citadel.dme
+++ b/citadel.dme
@@ -1783,6 +1783,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"
@@ -2026,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"
@@ -2259,6 +2264,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/__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/__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/controllers/configuration_old/configuration.dm b/code/controllers/configuration_old/configuration.dm
index d5f4efefc8fc..c67bb947d520 100644
--- a/code/controllers/configuration_old/configuration.dm
+++ b/code/controllers/configuration_old/configuration.dm
@@ -9,8 +9,6 @@
 
 	var/nudge_script_path = "nudge.py"  // where the nudge.py script is located
 
-	var/hub_visibility = FALSE				//CITADEL CHANGE - HUB CONFIG
-
 	var/log_ooc = 0						// log OOC channel
 	var/log_access = 0					// log login/logout
 	var/log_say = 0						// log client say
@@ -280,9 +278,6 @@
 				if ("ban_legacy_system")
 					config_legacy.ban_legacy_system = 1
 
-				if ("hub_visibility")					//CITADEL CHANGE - ADDS HUB CONFIG
-					config_legacy.hub_visibility = 1
-
 				if ("jobs_have_minimal_access")
 					config_legacy.jobs_have_minimal_access = 1
 
@@ -834,4 +829,3 @@
 			config_legacy.python_path = "/usr/bin/env python2"
 		else //probably windows, if not this should work anyway
 			config_legacy.python_path = "python"
-	world.update_hub_visibility(hub_visibility)			//CITADEL CHANGE - HUB CONFIG
diff --git a/code/controllers/subsystem/atoms.dm b/code/controllers/subsystem/atoms.dm
index 33e4e1156c9b..ce03cc2859c0 100644
--- a/code/controllers/subsystem/atoms.dm
+++ b/code/controllers/subsystem/atoms.dm
@@ -135,9 +135,34 @@ 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()))
+	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, ...)
+	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)))
+	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.Copy(4))
 	atom_init_status = old_init_status
 	return created
 
diff --git a/code/controllers/subsystem/server_maint.dm b/code/controllers/subsystem/server_maint.dm
index cb85bfb611f4..ac1f562087f3 100644
--- a/code/controllers/subsystem/server_maint.dm
+++ b/code/controllers/subsystem/server_maint.dm
@@ -16,7 +16,8 @@ SUBSYSTEM_DEF(server_maint)
 	var/cleanup_ticker = 0
 
 /datum/controller/subsystem/server_maint/PreInit()
-	world.hub_password = "" //quickly! before the hubbies see us.
+	// quickly! before the hubbies see us.
+	world.update_hub_visibility(FALSE)
 
 /datum/controller/subsystem/server_maint/Initialize()
 	if (fexists("tmp/"))
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/outfits/outfit.dm b/code/datums/outfits/outfit.dm
index 85823242f516..c377c1e9964e 100644
--- a/code/datums/outfits/outfit.dm
+++ b/code/datums/outfits/outfit.dm
@@ -141,8 +141,59 @@
 		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/survival_box = new /obj/item/storage/box/survival
+		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)
+
+		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()
+		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(ismovable(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
+				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
+				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/datums/recipe/stack_recipe.dm b/code/datums/recipe/stack_recipe.dm
index 4f453f0e68d0..6540cb6d6ca1 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, PROC_REF(make_preload_hook))
+
+/datum/stack_recipe/Destroy()
+	QDEL_NULL(preloader_callback)
+	return ..()
+
 /**
  * attepmt to craft
  *
@@ -139,16 +156,23 @@
 			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)
+	SHOULD_NOT_SLEEP(TRUE)
+	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 e4e9097fd3ed..0801c02d4625 100644
--- a/code/game/atoms/_atom.dm
+++ b/code/game/atoms/_atom.dm
@@ -232,8 +232,12 @@
 
 	return ..()
 
+//* Preload Hooks *//
+
 /**
  * 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,11 +245,19 @@
 /**
  * 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)
 	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/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-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/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm
index 5e4f88d287b6..0ae10d896e47 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
+	fuel = 15 MINUTES
+
 //Glowsticks
 
 /obj/item/flashlight/glowstick
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
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/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/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/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/items/storage/storage.dm b/code/game/objects/items/storage/storage.dm
index ab6f5c2c6c7a..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'
@@ -42,14 +50,20 @@
 	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
 
+/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()
-	if(!empty)
+	if(!empty && !src.empty)
 		spawn_contents()
 		legacy_spawn_contents()
 	else
@@ -59,7 +73,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()
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/game/objects/obj.dm b/code/game/objects/obj.dm
index 1d820365df08..b016c11a8af2 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,29 @@
 		invisibility = new_value? (hides_underfloor_invisibility_abstract? INVISIBILITY_ABSTRACT : INVISIBILITY_UNDERFLOOR) : 0
 	if(hides_underfloor_update_icon)
 		update_icon()
+	if(hides_underfloor != OBJ_UNDERFLOOR_NEVER)
+		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 +1113,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 +1133,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/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/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/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/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/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/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/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/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/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/ghostroles/instantiator.dm b/code/modules/ghostroles/instantiator.dm
index 2b532457ddf5..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)
@@ -76,7 +74,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/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/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 bfb65929f36c..8fea3c15a165 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
 
@@ -24,11 +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(!src.material.icon_stack_count)
+		skip_legacy_icon_update = FALSE
+	//! END
+
 	. = ..()
 
 	pixel_x = rand(0,4)-4
@@ -49,6 +66,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-[min(ceil((amount / max_amount) * material.icon_stack_count), 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())
@@ -213,12 +235,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/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/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
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 2aabea67031d..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            *//
@@ -101,6 +103,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/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!
diff --git a/code/modules/mob/inventory/inventory-slot-equip.dm b/code/modules/mob/inventory/inventory-slot-equip.dm
index 21cbe837e1e4..62fddfeb99f1 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 INV_RETURN_DELETED
+			if(INV_RETURN_FAILED)
+				continue
+			if(INV_RETURN_RELOCATED)
+				return INV_RETURN_RELOCATED
+			if(INV_RETURN_SUCCESS)
+				return INV_RETURN_SUCCESS
+			else
+				CRASH("unimplemented inv return: [.]")
+	return INV_RETURN_FAILED
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
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-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/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)
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..c6a60e47236a 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::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/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"
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/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..96917863c673 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,
@@ -165,13 +167,9 @@ 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)
-	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..74a28eea0e29 100644
--- a/code/modules/species/protean/protean.dm
+++ b/code/modules/species/protean/protean.dm
@@ -70,8 +70,9 @@
 	has_organ = list(
 		O_BRAIN = /obj/item/organ/internal/mmi_holder/posibrain/nano,
 		O_ORCH = /obj/item/organ/internal/nano/orchestrator,
-		O_FACT = /obj/item/organ/internal/nano/refactory
+		O_FACT = /obj/item/organ/internal/nano/refactory/loaded,
 		)
+
 	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?.Add(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..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()
@@ -630,50 +634,81 @@ GLOBAL_LIST_INIT(species_oxygen_tank_by_gas, list(
 	GAS_ID_CARBON_DIOXIDE = /obj/item/tank/emergency/carbon_dioxide
 ))
 
-/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/synth = H.isSynthetic()
-
-	//Empty box for synths
-	if(synth)
-		boxtype = /obj/item/storage/box/survival/synth
+/**
+ * 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
 
-	//Special box with extra equipment
-	else if(comprehensive)
-		boxtype = /obj/item/storage/box/survival/comp
+/**
+ * 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)
+	into_box?.Add(/obj/item/tool/prybar/red)
 
-	//Create the box
-	var/obj/item/storage/box/box = new boxtype(H)
+	// todo: crank flashlight + prybar combo?
+	into_box?.Add(/obj/item/flashlight/flare/survival)
 
-	//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)
+	if(for_target.isSynthetic())
+		into_box?.Add(/obj/item/fbp_backup_cell)
+	else
+		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
+
+			// always extended now!
+			// 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)
+				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)
-	else
-		H.equip_to_slot_or_del(box, /datum/inventory_slot/abstract/put_in_backpack, INV_OP_FORCE | INV_OP_SILENT)
+			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/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/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 000000000000..a6d60b5e2a8f
Binary files /dev/null and b/icons/materials/metals/steel.dmi differ
diff --git a/maps/endeavour/levels/deck1.dmm b/maps/endeavour/levels/deck1.dmm
index 1fd2e564ea5f..50fc90cbf45c 100644
--- a/maps/endeavour/levels/deck1.dmm
+++ b/maps/endeavour/levels/deck1.dmm
@@ -11,6 +11,13 @@
 	},
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d1portamidhall)
+"abs" = (
+/obj/structure/loot_pile/maint/technical,
+/obj/structure/railing{
+	dir = 4
+	},
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d1aftmaint)
 "abD" = (
 /obj/effect/floor_decal/borderfloorblack{
 	dir = 8
@@ -78,6 +85,10 @@
 /obj/machinery/door/airlock/glass,
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d1portamidhall)
+"acQ" = (
+/obj/random/maintenance,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d1aftmaint)
 "adZ" = (
 /obj/machinery/atmospherics/pipe/simple/visible/red{
 	dir = 5
@@ -156,6 +167,14 @@
 	},
 /turf/simulated/floor/tiled,
 /area/shuttle/excursion/general)
+"ahn" = (
+/obj/structure/railing{
+	dir = 8
+	},
+/obj/structure/table/steel,
+/obj/random/maintenance/clean,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d1aftmaint)
 "ahv" = (
 /obj/machinery/access_button{
 	command = "cycle_ext";
@@ -446,6 +465,10 @@
 	},
 /turf/simulated/floor/tiled,
 /area/endeavour/exploration/hallway_aft)
+"asp" = (
+/obj/random/cutout,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d1aftmaint)
 "asR" = (
 /obj/effect/floor_decal/borderfloorblack{
 	dir = 8
@@ -1209,6 +1232,11 @@
 	},
 /turf/simulated/floor/tiled/freezer,
 /area/crew_quarters/pool/changing_room)
+"aUq" = (
+/obj/structure/closet/crate,
+/obj/random/maintenance,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d1fwdmaint)
 "aUt" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
@@ -1375,6 +1403,11 @@
 	},
 /turf/simulated/floor/tiled,
 /area/shuttle/excursion/general)
+"aXE" = (
+/obj/effect/floor_decal/rust,
+/obj/item/handcuffs/cable/white,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d1aftmaint)
 "aXR" = (
 /obj/machinery/button/remote/airlock{
 	id = "gateway";
@@ -1429,6 +1462,10 @@
 	},
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d1starboardafthall)
+"bag" = (
+/obj/machinery/door/airlock/maintenance/common,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d1aftmaint)
 "bak" = (
 /obj/structure/cable/green{
 	icon_state = "4-8"
@@ -1461,6 +1498,10 @@
 /obj/structure/target_stake,
 /turf/simulated/floor/plating,
 /area/endeavour/exploration/hallway_fore)
+"bbQ" = (
+/obj/random/maintenance/clean,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d1fwdmaint)
 "bcg" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 6
@@ -1511,6 +1552,15 @@
 	},
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d1portforhall)
+"bdO" = (
+/obj/structure/railing{
+	dir = 8
+	},
+/obj/structure/railing,
+/obj/structure/table/steel,
+/obj/random/maintenance/clean,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d1aftmaint)
 "bdP" = (
 /obj/effect/floor_decal/borderfloorblack{
 	dir = 1
@@ -1703,6 +1753,15 @@
 "blR" = (
 /turf/simulated/wall/prepainted/command,
 /area/bridge/hallway)
+"blV" = (
+/obj/machinery/power/apc/north_mount,
+/obj/structure/cable/green{
+	icon_state = "0-2"
+	},
+/obj/structure/closet,
+/obj/random/maintenance/research,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d1fwdmaint)
 "bmD" = (
 /obj/machinery/air_alarm{
 	pixel_y = 22
@@ -2436,6 +2495,14 @@
 	},
 /turf/simulated/floor/tiled/monodark,
 /area/bridge)
+"bUQ" = (
+/obj/structure/closet/firecloset,
+/obj/effect/floor_decal/rust,
+/obj/structure/railing{
+	dir = 4
+	},
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d1aftmaint)
 "bVE" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 5
@@ -2749,6 +2816,7 @@
 /obj/machinery/air_alarm{
 	pixel_y = 22
 	},
+/obj/random/maintenance,
 /turf/simulated/floor/plating,
 /area/maintenance/chapel)
 "ckz" = (
@@ -2845,6 +2913,21 @@
 	},
 /turf/simulated/floor/tiled,
 /area/rnd/test_area)
+"coS" = (
+/obj/structure/sign/directions/security,
+/obj/structure/sign/directions/medical{
+	pixel_y = -6
+	},
+/obj/structure/sign/directions/elevator{
+	dir = 4;
+	pixel_y = 6
+	},
+/obj/structure/sign/directions/bridge{
+	dir = 4;
+	pixel_y = 12
+	},
+/turf/simulated/wall/prepainted,
+/area/station/stairs_one)
 "cpb" = (
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
 	dir = 1
@@ -3293,6 +3376,11 @@
 	},
 /turf/simulated/floor/lino,
 /area/crew_quarters/coffee_shop)
+"cER" = (
+/obj/random/maintenance/clean,
+/obj/structure/table/rack/shelf,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d1fwdmaint)
 "cEY" = (
 /obj/machinery/door/airlock{
 	name = "Restroom"
@@ -3370,16 +3458,18 @@
 "cIw" = (
 /obj/structure/table/wooden_reinforced,
 /obj/item/folder/blue{
-	pixel_x = 8;
+	pixel_x = 4;
 	pixel_y = 2
 	},
 /obj/item/flashlight/lamp/green{
 	pixel_x = -4;
 	pixel_y = 10
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/cable/green{
-	icon_state = "1-2"
+/obj/machinery/atmospherics/component/unary/vent_scrubber/on{
+	dir = 4
+	},
+/obj/machinery/camera/network/command{
+	dir = 1
 	},
 /turf/simulated/floor/carpet/blue,
 /area/crew_quarters/heads/blueshield)
@@ -4005,6 +4095,12 @@
 	},
 /turf/simulated/floor/carpet/bcarpet,
 /area/crew_quarters/lounge)
+"dgz" = (
+/obj/structure/sign/deck/first{
+	pixel_x = -4
+	},
+/turf/simulated/wall/r_wall/prepainted,
+/area/station/stairs_one)
 "dgF" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 6
@@ -4184,12 +4280,9 @@
 /turf/simulated/floor/wood,
 /area/hydroponics/garden)
 "dnA" = (
-/obj/machinery/door/firedoor{
-	dir = 8
-	},
-/obj/machinery/fire_alarm/east_mount,
-/turf/simulated/floor/tiled/steel,
-/area/station/stairs_one)
+/obj/structure/sign/deck/first,
+/turf/simulated/wall/prepainted,
+/area/endeavour/hallway/d1fwdhall)
 "dor" = (
 /turf/simulated/wall/prepainted/civilian,
 /area/maintenance/substation/exploration)
@@ -4767,6 +4860,10 @@
 /obj/effect/floor_decal/corner/navblue/border{
 	dir = 8
 	},
+/obj/machinery/door/airlock/multi_tile/glass{
+	dir = 1;
+	name = "Exploration Public Lobby"
+	},
 /turf/simulated/floor/tiled,
 /area/exploration)
 "dKp" = (
@@ -4841,6 +4938,13 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/chapel/main)
+"dNA" = (
+/obj/structure/table/rack,
+/obj/item/tool/wrench,
+/obj/item/tank/air,
+/obj/item/tank/air,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d1aftmaint)
 "dNZ" = (
 /obj/machinery/light/small,
 /turf/simulated/floor/plating,
@@ -5081,6 +5185,10 @@
 	},
 /turf/simulated/floor/tiled/monotile,
 /area/exploration/explorer_prep)
+"dUQ" = (
+/obj/effect/debris/cleanable/cobweb2,
+/turf/simulated/floor/wood,
+/area/endeavour/hallway/d1aftmaint)
 "dVP" = (
 /obj/structure/cable/green{
 	icon_state = "1-8"
@@ -5110,6 +5218,9 @@
 /obj/machinery/holoposter{
 	pixel_y = 32
 	},
+/obj/machinery/fire_alarm/west_mount{
+	pixel_x = -28
+	},
 /turf/simulated/floor/carpet/blue,
 /area/crew_quarters/heads/blueshield)
 "dXL" = (
@@ -5324,6 +5435,28 @@
 	},
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/endeavour/surfacebase/tram)
+"eex" = (
+/obj/structure/sign/directions/engineering{
+	pixel_y = -6;
+	dir = 1
+	},
+/obj/structure/sign/directions/cargo{
+	dir = 1
+	},
+/obj/structure/sign/directions/science{
+	pixel_y = 6;
+	dir = 1
+	},
+/obj/structure/sign/directions/cryo{
+	pixel_y = 13;
+	dir = 1
+	},
+/obj/structure/sign/directions/evac{
+	dir = 8;
+	pixel_y = -12
+	},
+/turf/simulated/wall/prepainted,
+/area/station/stairs_one)
 "eez" = (
 /obj/effect/floor_decal/borderfloorblack{
 	dir = 1
@@ -5428,6 +5561,7 @@
 /obj/machinery/light/small{
 	dir = 8
 	},
+/obj/structure/loot_pile/maint,
 /turf/simulated/floor/plating,
 /area/endeavour/hallway/d1aftmaint)
 "ejQ" = (
@@ -5589,6 +5723,15 @@
 /obj/structure/disposalpipe/segment,
 /turf/simulated/floor/tiled/dark,
 /area/bridge/hallway)
+"eqh" = (
+/obj/structure/table/rack,
+/obj/random/toy,
+/obj/random/maintenance/medical,
+/obj/random/medical/lite,
+/obj/random/maintenance/clean,
+/obj/random/maintenance/medical,
+/turf/simulated/floor/plating,
+/area/maintenance/asmaint)
 "erf" = (
 /obj/machinery/door/firedoor/glass{
 	dir = 8
@@ -5792,8 +5935,9 @@
 /turf/simulated/floor/tiled,
 /area/exploration/pathfinder_office)
 "exi" = (
-/turf/simulated/floor/wood,
-/area/crew_quarters/heads/blueshield)
+/obj/structure/bed/chair,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d1aftmaint)
 "eyc" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
@@ -6098,6 +6242,12 @@
 /obj/machinery/portable_atmospherics/hydroponics/soil,
 /turf/simulated/floor/grass,
 /area/hydroponics/garden)
+"eIq" = (
+/obj/structure/table,
+/obj/random/action_figure,
+/obj/random/cigarettes,
+/turf/simulated/floor/plating,
+/area/maintenance/asmaint)
 "eIv" = (
 /obj/machinery/gateway{
 	dir = 1
@@ -7881,12 +8031,13 @@
 /turf/simulated/floor/tiled,
 /area/shuttle/excursion/cockpit)
 "fND" = (
-/obj/structure/memorial{
-	name = "NSV Endeavour's Builder's Plate";
-	desc = "The Armstrong-Hawker Shipbuilding company would like to thank the following for the contributions to the design: Dáire van der Waals, M.D., Ph.D.; Ruminis Melro, A.P., Ph.D.; Hammond McGuire Sr., M.S.E.. Their work was essential in the design and manufacture of this vessel, and those of her class in the years to follow."
+/obj/machinery/door/firedoor{
+	dir = 8
 	},
-/turf/simulated/wall/prepainted/civilian,
-/area/station/stairs_one)
+/obj/machinery/door/airlock/maintenance/common,
+/obj/structure/catwalk,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d1fwdmaint)
 "fNJ" = (
 /obj/machinery/light,
 /turf/simulated/floor/tiled/dark,
@@ -7955,6 +8106,13 @@
 /obj/effect/floor_decal/industrial/warning/full,
 /turf/simulated/floor/tiled,
 /area/shuttle/excursion/general)
+"fQg" = (
+/obj/structure/memorial{
+	name = "NSV Endeavour's Builder's Plate";
+	desc = "The Armstrong-Hawker Shipbuilding company would like to thank the following for the contributions to the design: Dáire van der Waals, M.D., Ph.D.; Ruminis Melro, B.S.E; Jonathan A. Russel, Ph.D.; Hammond McGuire Sr., M.S.E.. Their work was essential in the design and manufacture of this vessel, and those of her class in the years to follow."
+	},
+/turf/simulated/wall/prepainted,
+/area/endeavour/hallway/d1fwdhall)
 "fRf" = (
 /obj/effect/floor_decal/borderfloorblack{
 	dir = 8
@@ -9068,6 +9226,12 @@
 /obj/structure/railing,
 /turf/simulated/floor/plating,
 /area/shuttle/courser/general)
+"gGN" = (
+/obj/structure/table/rack,
+/obj/effect/floor_decal/rust,
+/obj/item/toy/crossbow,
+/turf/simulated/floor/plating,
+/area/maintenance/asmaint)
 "gGO" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 10
@@ -9101,6 +9265,16 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/station/stairs_one)
+"gHB" = (
+/obj/structure/sign/directions/bridge{
+	dir = 4;
+	pixel_y = 7
+	},
+/obj/structure/sign/directions/elevator{
+	dir = 4
+	},
+/turf/simulated/wall/prepainted/civilian,
+/area/maintenance/library)
 "gIz" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 8
@@ -9998,6 +10172,7 @@
 	dir = 4
 	},
 /obj/structure/table/rack,
+/obj/random/maintenance,
 /turf/simulated/floor/plating,
 /area/endeavour/hallway/d1aftmaint)
 "hrs" = (
@@ -10163,6 +10338,20 @@
 /obj/fiftyspawner/glass,
 /turf/simulated/floor/plating,
 /area/vacant/vacant_bar)
+"hyQ" = (
+/obj/structure/sign/directions/elevator{
+	dir = 4
+	},
+/obj/structure/sign/directions/evac{
+	dir = 8;
+	pixel_y = -7
+	},
+/obj/structure/sign/directions/bridge{
+	dir = 4;
+	pixel_y = 7
+	},
+/turf/simulated/wall/prepainted,
+/area/endeavour/hallway/d1fwdmaint)
 "hzU" = (
 /obj/machinery/atmospherics/pipe/simple/hidden{
 	dir = 4
@@ -10480,6 +10669,9 @@
 	dir = 4;
 	pixel_y = 7
 	},
+/obj/structure/sign/directions/elevator{
+	dir = 4
+	},
 /turf/simulated/wall/prepainted/civilian,
 /area/crew_quarters/coffee_shop)
 "hOW" = (
@@ -10512,6 +10704,10 @@
 /obj/machinery/atmospherics/component/unary/vent_pump/on,
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d1afthall)
+"hPx" = (
+/obj/structure/loot_pile/maint/boxfort,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d1fwdmaint)
 "hPQ" = (
 /obj/effect/floor_decal/borderfloorblack{
 	dir = 1
@@ -10981,6 +11177,20 @@
 /obj/machinery/vending/cigarette,
 /turf/simulated/floor/wood,
 /area/exploration/meeting)
+"idq" = (
+/obj/structure/sign/directions/elevator{
+	dir = 4
+	},
+/obj/structure/sign/directions/evac{
+	dir = 8;
+	pixel_y = -7
+	},
+/obj/structure/sign/directions/bridge{
+	dir = 4;
+	pixel_y = 7
+	},
+/turf/simulated/wall/prepainted,
+/area/endeavour/hallway/d1aftmaint)
 "idu" = (
 /obj/machinery/appliance/cooker/grill/stand,
 /turf/simulated/floor/grass,
@@ -11062,6 +11272,14 @@
 /obj/structure/table/marble,
 /turf/simulated/floor/lino,
 /area/crew_quarters/coffee_shop)
+"igb" = (
+/obj/structure/closet,
+/obj/random/maintenance,
+/obj/random/maintenance,
+/obj/random/maintenance,
+/obj/random/maintenance,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d1fwdmaint)
 "igX" = (
 /obj/effect/floor_decal/borderfloor/corner{
 	dir = 8
@@ -11656,8 +11874,8 @@
 /turf/simulated/floor/tiled/steel,
 /area/hallway/secondary/docking_hallway)
 "iBH" = (
-/turf/simulated/wall/prepainted/command,
-/area/station/stairs_one)
+/turf/simulated/floor/wood,
+/area/endeavour/hallway/d1aftmaint)
 "iBS" = (
 /obj/machinery/atmospherics/component/unary/engine{
 	dir = 4
@@ -11792,6 +12010,11 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/bridge)
+"iIY" = (
+/obj/structure/railing,
+/obj/structure/icecream_cart,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d1aftmaint)
 "iJn" = (
 /obj/effect/floor_decal/borderfloor{
 	dir = 8
@@ -12174,6 +12397,11 @@
 	},
 /turf/simulated/floor/carpet/gaycarpet,
 /area/crew_quarters/clownoffice)
+"iYH" = (
+/obj/random/maintenance,
+/obj/structure/table/rack/shelf,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d1fwdmaint)
 "iZf" = (
 /obj/effect/floor_decal/borderfloorblack{
 	dir = 8
@@ -12624,6 +12852,11 @@
 /obj/effect/floor_decal/grass_edge,
 /turf/simulated/floor/grass,
 /area/hydroponics/garden)
+"jrC" = (
+/obj/effect/floor_decal/rust,
+/obj/structure/bed,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d1aftmaint)
 "jrK" = (
 /obj/effect/floor_decal/borderfloorblack{
 	dir = 4
@@ -12741,6 +12974,11 @@
 /obj/structure/disposalpipe/segment,
 /turf/simulated/floor/tiled,
 /area/exploration/meeting)
+"jtp" = (
+/obj/structure/catwalk,
+/obj/machinery/door/airlock/maintenance/common,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d1fwdmaint)
 "jty" = (
 /obj/structure/dispenser{
 	phorontanks = 0
@@ -12954,6 +13192,12 @@
 /obj/structure/displaycase,
 /turf/simulated/floor/wood,
 /area/crew_quarters/captain)
+"jAh" = (
+/obj/structure/bed/chair{
+	dir = 4
+	},
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d1aftmaint)
 "jAq" = (
 /obj/machinery/power/apc/north_mount,
 /obj/structure/cable/green{
@@ -13003,6 +13247,11 @@
 /obj/structure/catwalk,
 /turf/simulated/floor/plating,
 /area/endeavour/hallway/d1fwdmaint)
+"jDd" = (
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/obj/effect/paint/commandblue,
+/turf/simulated/floor/plating,
+/area/crew_quarters/heads/blueshield)
 "jDn" = (
 /obj/machinery/camera/network/civilian{
 	dir = 1
@@ -13012,6 +13261,10 @@
 	},
 /turf/simulated/floor/carpet/bcarpet,
 /area/library)
+"jDK" = (
+/obj/random/maintenance,
+/turf/simulated/floor/plating,
+/area/hallway/secondary/docking_hallway)
 "jEi" = (
 /obj/machinery/recharge_station,
 /obj/machinery/light/small{
@@ -13571,6 +13824,11 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/bridge)
+"jUA" = (
+/obj/effect/floor_decal/rust,
+/obj/structure/loot_pile/maint/boxfort,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d1aftmaint)
 "jUN" = (
 /obj/machinery/atmospherics/portables_connector,
 /obj/machinery/portable_atmospherics/canister/air/airlock,
@@ -13583,6 +13841,13 @@
 /obj/item/deck/cards,
 /turf/simulated/floor/carpet,
 /area/endeavour/hallway/d1fwdmaint)
+"jVc" = (
+/obj/structure/loot_pile/maint/junk,
+/obj/structure/railing{
+	dir = 4
+	},
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d1aftmaint)
 "jVj" = (
 /obj/structure/table/bench/wooden,
 /obj/item/reagent_containers/food/drinks/cans/waterbottle,
@@ -13629,6 +13894,11 @@
 	dir = 8;
 	pixel_x = -24
 	},
+/obj/machinery/light_switch{
+	dir = 4;
+	pixel_x = -28;
+	pixel_y = 17
+	},
 /turf/simulated/floor/carpet/blue,
 /area/crew_quarters/heads/blueshield)
 "jWs" = (
@@ -13781,6 +14051,14 @@
 	},
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d1portamidhall)
+"kat" = (
+/obj/structure/catwalk,
+/obj/machinery/door/airlock/maintenance/common,
+/obj/machinery/door/firedoor{
+	dir = 8
+	},
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d1fwdmaint)
 "kaL" = (
 /obj/effect/floor_decal/steeldecal/steel_decals_central7,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -13887,17 +14165,9 @@
 /turf/simulated/floor/plating,
 /area/maintenance/substation/dock)
 "kdX" = (
-/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"
-	},
-/turf/simulated/floor/wood,
-/area/crew_quarters/heads/blueshield)
+/obj/random/maintenance,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d1fwdmaint)
 "kef" = (
 /obj/effect/floor_decal/borderfloorblack/corner,
 /obj/effect/floor_decal/corner/navblue/bordercorner,
@@ -14120,8 +14390,10 @@
 /turf/simulated/floor/carpet,
 /area/endeavour/hallway/d1fwdmaint)
 "kmD" = (
-/obj/structure/table/rack,
-/obj/item/tool/wrench,
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
+/obj/structure/catwalk,
 /turf/simulated/floor/plating,
 /area/endeavour/hallway/d1aftmaint)
 "kno" = (
@@ -14142,6 +14414,13 @@
 	},
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d1afthall)
+"knH" = (
+/obj/machinery/floodlight,
+/obj/structure/railing{
+	dir = 4
+	},
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d1aftmaint)
 "kom" = (
 /obj/machinery/fire_alarm/north_mount,
 /obj/structure/cable/green{
@@ -14515,16 +14794,11 @@
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d1portamidhall)
 "kEl" = (
-/obj/machinery/atmospherics/component/unary/vent_scrubber/on{
-	dir = 4
-	},
-/obj/machinery/light_switch{
-	dir = 4;
-	pixel_x = -28;
-	pixel_y = -4
-	},
-/turf/simulated/floor/wood,
-/area/crew_quarters/heads/blueshield)
+/obj/effect/floor_decal/rust,
+/obj/random/maintenance,
+/obj/structure/table/rack/shelf,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d1fwdmaint)
 "kEq" = (
 /obj/structure/cable/green{
 	icon_state = "4-8"
@@ -14609,6 +14883,13 @@
 /obj/machinery/atmospherics/pipe/simple/hidden,
 /turf/simulated/floor/tiled/steel,
 /area/hallway/secondary/docking_hallway)
+"kGL" = (
+/obj/machinery/air_alarm{
+	pixel_y = 22
+	},
+/obj/random/maintenance,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d1fwdmaint)
 "kHh" = (
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d1afthall)
@@ -14807,18 +15088,9 @@
 /turf/simulated/floor/grass,
 /area/hydroponics/garden)
 "kME" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 10
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/bed/chair{
-	dir = 1
-	},
-/obj/structure/cable/green{
-	icon_state = "1-2"
-	},
-/turf/simulated/floor/wood,
-/area/crew_quarters/heads/blueshield)
+/obj/random/maintenance,
+/turf/simulated/floor/plating,
+/area/maintenance/chapel)
 "kNi" = (
 /obj/effect/floor_decal/borderfloorblack{
 	dir = 10
@@ -15305,14 +15577,9 @@
 /turf/simulated/floor/tiled,
 /area/maintenance/tool_storage)
 "liT" = (
-/obj/machinery/light{
-	dir = 8
-	},
-/obj/machinery/light/small{
-	dir = 8
-	},
+/obj/machinery/door/airlock/maintenance/common,
 /turf/simulated/floor/plating,
-/area/endeavour/hallway/d1fwdmaint)
+/area/maintenance/asmaint)
 "liZ" = (
 /obj/effect/floor_decal/borderfloorblack{
 	dir = 1
@@ -15361,7 +15628,7 @@
 	dir = 8
 	},
 /obj/machinery/vending/wallmed1{
-	pixel_x = 32
+	pixel_x = 36
 	},
 /obj/machinery/fire_alarm/east_mount,
 /turf/simulated/floor/tiled/dark,
@@ -16325,6 +16592,12 @@
 	},
 /turf/simulated/floor/plating,
 /area/shuttle/excursion/cargo)
+"lYt" = (
+/obj/structure/table/rack,
+/obj/item/toy/stickhorse,
+/obj/item/toy/katana,
+/turf/simulated/floor/plating,
+/area/maintenance/asmaint)
 "lYx" = (
 /obj/machinery/sparker{
 	id = "burn_chamber";
@@ -16773,6 +17046,10 @@
 	},
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d1portamidhall)
+"mmH" = (
+/obj/item/clothing/mask/muzzle,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d1aftmaint)
 "mmN" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -16847,11 +17124,20 @@
 /turf/simulated/wall/r_wall/prepainted,
 /area/maintenance/asmaint)
 "mrv" = (
-/obj/structure/sign/directions/science{
-	pixel_y = 3
+/obj/structure/sign/directions/engineering{
+	pixel_y = -6;
+	dir = 1
 	},
 /obj/structure/sign/directions/cargo{
-	pixel_y = -4
+	dir = 1
+	},
+/obj/structure/sign/directions/science{
+	pixel_y = 6;
+	dir = 1
+	},
+/obj/structure/sign/directions/cryo{
+	pixel_y = 13;
+	dir = 1
 	},
 /turf/simulated/wall/r_wall/prepainted,
 /area/station/stairs_one)
@@ -17469,16 +17755,24 @@
 /turf/simulated/floor/tiled,
 /area/gateway/prep_room)
 "mMw" = (
-/obj/structure/sign/directions/elevator{
-	dir = 4
-	},
-/obj/structure/sign/directions/bridge{
-	dir = 4;
-	pixel_y = 7
-	},
 /obj/structure/sign/directions/evac{
 	dir = 8;
-	pixel_y = -7
+	pixel_y = -6
+	},
+/obj/structure/sign/directions/engineering{
+	pixel_y = -12;
+	dir = 1
+	},
+/obj/structure/sign/directions/cargo{
+	dir = 1
+	},
+/obj/structure/sign/directions/science{
+	pixel_y = 6;
+	dir = 1
+	},
+/obj/structure/sign/directions/cryo{
+	pixel_y = 13;
+	dir = 1
 	},
 /turf/simulated/wall/prepainted,
 /area/station/stairs_one)
@@ -17504,6 +17798,12 @@
 	},
 /turf/simulated/floor/tiled,
 /area/maintenance/tool_storage)
+"mNC" = (
+/obj/effect/floor_decal/rust,
+/obj/structure/table/woodentable,
+/obj/item/gps/dataknife,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d1aftmaint)
 "mNK" = (
 /obj/effect/floor_decal/borderfloorblack{
 	dir = 8
@@ -18522,6 +18822,19 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/bridge)
+"nzo" = (
+/obj/structure/closet,
+/obj/item/reagent_containers/food/drinks/bottle/rum{
+	desc = "TASTE DEMOCRACY";
+	name = "Managed Democra-cider"
+	},
+/obj/random/cigarettes,
+/obj/random/contraband,
+/obj/random/maintenance/clean,
+/obj/random/maintenance/medical,
+/obj/random/maintenance/medical,
+/turf/simulated/floor/plating,
+/area/maintenance/asmaint)
 "nzy" = (
 /obj/machinery/atmospherics/pipe/simple/hidden{
 	dir = 10
@@ -18612,6 +18925,16 @@
 	},
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/exploration/courser_dock)
+"nCd" = (
+/obj/structure/closet/firecloset,
+/obj/structure/railing{
+	dir = 1
+	},
+/obj/structure/railing{
+	dir = 4
+	},
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d1aftmaint)
 "nCl" = (
 /obj/structure/symbol/sa,
 /turf/simulated/wall/prepainted,
@@ -18647,24 +18970,9 @@
 /turf/simulated/floor/tiled/dark,
 /area/chapel/main)
 "nFc" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 5
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 5
-	},
-/obj/machinery/holopad,
-/obj/machinery/camera/network/command{
-	dir = 1
-	},
-/obj/machinery/status_display{
-	pixel_y = -32
-	},
-/obj/structure/cable/green{
-	icon_state = "1-4"
-	},
-/turf/simulated/floor/wood,
-/area/crew_quarters/heads/blueshield)
+/obj/structure/loot_pile/maint,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d1fwdmaint)
 "nFp" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -19020,6 +19328,10 @@
 	},
 /turf/simulated/floor/carpet/purcarpet,
 /area/crew_quarters/coffee_shop)
+"nSV" = (
+/obj/random/maintenance/security,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d1fwdmaint)
 "nSW" = (
 /obj/machinery/door/airlock/glass_external{
 	name = "Exploration Hangar";
@@ -19846,6 +20158,14 @@
 	},
 /turf/simulated/floor/tiled/freezer,
 /area/crew_quarters/pool)
+"ozD" = (
+/obj/machinery/portable_atmospherics/powered/pump/filled,
+/obj/effect/floor_decal/rust,
+/obj/structure/railing{
+	dir = 4
+	},
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d1aftmaint)
 "ozV" = (
 /obj/structure/bed/chair,
 /turf/simulated/floor/tiled,
@@ -19927,6 +20247,10 @@
 	},
 /turf/simulated/floor/tiled,
 /area/endeavour/exploration/hallway_fore)
+"oCl" = (
+/obj/random/maintenance/research,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d1fwdmaint)
 "oCT" = (
 /obj/machinery/computer/shuttle_control/explore/civvie{
 	dir = 8
@@ -20001,6 +20325,13 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/hallway/secondary/docking_hallway2)
+"oFn" = (
+/obj/structure/closet/cabinet,
+/obj/random/maintenance/research,
+/obj/random/maintenance/security,
+/obj/random/maintenance/medical,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d1aftmaint)
 "oFO" = (
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply{
 	dir = 8
@@ -20954,6 +21285,11 @@
 	},
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/endeavour/surfacebase/tram)
+"ppi" = (
+/obj/item/tool/screwdriver,
+/obj/item/cigbutt,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d1aftmaint)
 "ppR" = (
 /obj/effect/floor_decal/borderfloorblack{
 	dir = 8
@@ -21209,6 +21545,12 @@
 "pBz" = (
 /turf/simulated/floor/carpet/bcarpet,
 /area/crew_quarters/lounge)
+"pBI" = (
+/obj/structure/table/rack,
+/obj/effect/floor_decal/rust,
+/obj/item/toy/bouquet,
+/turf/simulated/floor/plating,
+/area/maintenance/asmaint)
 "pBW" = (
 /obj/effect/floor_decal/borderfloorblack,
 /obj/effect/floor_decal/corner/navblue/border,
@@ -21267,6 +21609,10 @@
 	},
 /turf/simulated/floor/wood,
 /area/bridge/office)
+"pDT" = (
+/obj/random/toolbox,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d1aftmaint)
 "pEr" = (
 /turf/simulated/wall/prepainted,
 /area/maintenance/substation/civilian)
@@ -21776,13 +22122,13 @@
 /area/endeavour/hallway/d1fwdmaint)
 "qdt" = (
 /obj/structure/sign/directions/security{
-	pixel_y = -10
+	pixel_y = -7
 	},
 /obj/structure/sign/directions/medical{
-	pixel_y = 4
+	pixel_y = 5
 	},
 /obj/structure/sign/directions/cryo{
-	pixel_y = -3
+	pixel_y = -1
 	},
 /obj/structure/sign/directions/engineering{
 	pixel_y = 11
@@ -21876,11 +22222,13 @@
 /turf/simulated/floor/tiled,
 /area/endeavour/exploration/hallway_fore)
 "qfR" = (
-/obj/structure/table/rack,
-/obj/item/tank/air,
-/obj/item/tank/air,
+/obj/effect/floor_decal/rust,
+/obj/structure/closet/hydrant{
+	dir = 8;
+	pixel_x = 32
+	},
 /turf/simulated/floor/plating,
-/area/endeavour/hallway/d1aftmaint)
+/area/endeavour/hallway/d1fwdmaint)
 "qfY" = (
 /obj/machinery/air_alarm{
 	frequency = 1441;
@@ -21951,6 +22299,11 @@
 	},
 /turf/simulated/floor/tiled,
 /area/rnd/test_area)
+"qjI" = (
+/obj/effect/floor_decal/rust,
+/obj/random/maintenance,
+/turf/simulated/floor/plating,
+/area/maintenance/asmaint)
 "qjK" = (
 /obj/structure/window/reinforced/tinted/frosted{
 	dir = 8
@@ -22139,6 +22492,10 @@
 /obj/structure/lattice,
 /turf/space/basic,
 /area/space)
+"qqT" = (
+/obj/item/surgical/hemostat,
+/turf/simulated/floor/wood/broken,
+/area/endeavour/hallway/d1aftmaint)
 "qrz" = (
 /obj/structure/cable/green{
 	icon_state = "1-2"
@@ -22821,6 +23178,12 @@
 	},
 /turf/simulated/floor/tiled,
 /area/endeavour/exploration/hallway_aft)
+"qPJ" = (
+/obj/structure/closet,
+/obj/random/maintenance,
+/obj/random/maintenance,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d1fwdmaint)
 "qQg" = (
 /obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{
 	id = "pathfinder_office"
@@ -23059,6 +23422,9 @@
 /obj/machinery/power/apc/south_mount,
 /turf/simulated/floor/wood,
 /area/crew_quarters/clownoffice)
+"qZB" = (
+/turf/simulated/floor/wood/broken,
+/area/endeavour/hallway/d1aftmaint)
 "qZR" = (
 /obj/structure/bed/chair/comfy/brown,
 /obj/machinery/computer/ship/navigation/telescreen{
@@ -23138,6 +23504,12 @@
 /obj/machinery/recharger,
 /turf/simulated/floor/carpet/bcarpet,
 /area/crew_quarters/heads/hop)
+"rcs" = (
+/obj/structure/table/rack/shelf,
+/obj/random/maintenance/clean,
+/obj/random/maintenance/clean,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d1fwdmaint)
 "rcJ" = (
 /obj/machinery/light{
 	dir = 8
@@ -23168,13 +23540,11 @@
 /turf/simulated/floor/wood,
 /area/library)
 "rdn" = (
-/obj/machinery/air_alarm{
-	dir = 8;
-	pixel_x = 24
-	},
 /obj/machinery/light{
 	dir = 1
 	},
+/obj/machinery/air_alarm/north_mount,
+/obj/machinery/holopad,
 /turf/simulated/floor/carpet/blue,
 /area/crew_quarters/heads/blueshield)
 "rdz" = (
@@ -23388,6 +23758,10 @@
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/chapel)
+"rlp" = (
+/obj/random/maintenance,
+/turf/simulated/floor/plating,
+/area/maintenance/asmaint)
 "rlA" = (
 /obj/machinery/door/firedoor{
 	dir = 8
@@ -23566,6 +23940,16 @@
 /obj/machinery/computer/timeclock/premade/north,
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d1afthall)
+"rrt" = (
+/obj/machinery/portable_atmospherics/powered/scrubber,
+/obj/machinery/light/small{
+	dir = 8
+	},
+/obj/structure/railing{
+	dir = 4
+	},
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d1aftmaint)
 "rub" = (
 /obj/machinery/light_switch{
 	name = "light switch ";
@@ -23884,6 +24268,7 @@
 /obj/structure/cable/green{
 	icon_state = "4-8"
 	},
+/obj/structure/loot_pile/maint,
 /turf/simulated/floor/tiled,
 /area/gateway/prep_room)
 "rFT" = (
@@ -24026,6 +24411,27 @@
 	},
 /turf/simulated/wall/r_wall/prepainted/exploration,
 /area/shuttle/excursion/cargo)
+"rOy" = (
+/obj/machinery/door/airlock/command{
+	id_tag = "blueshielddoor";
+	name = "Blueshield";
+	req_one_access = null
+	},
+/obj/map_helper/access_helper/airlock/station/head_office/blueshield,
+/obj/machinery/door/firedoor{
+	dir = 8
+	},
+/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"
+	},
+/turf/simulated/floor/plating,
+/area/crew_quarters/heads/blueshield)
 "rOU" = (
 /obj/structure/flora/ausbushes/lavendergrass,
 /turf/simulated/floor/grass,
@@ -24169,6 +24575,13 @@
 /obj/effect/mist,
 /turf/simulated/floor/wood,
 /area/endeavour/surfacebase/sauna)
+"rVK" = (
+/obj/item/tool/wirecutters,
+/obj/machinery/light/small{
+	dir = 8
+	},
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d1aftmaint)
 "rVM" = (
 /obj/effect/floor_decal/borderfloorblack{
 	dir = 4
@@ -24412,6 +24825,12 @@
 /obj/effect/floor_decal/industrial/hatch/yellow,
 /turf/simulated/floor/tiled/dark,
 /area/gateway)
+"sgV" = (
+/obj/structure/table/rack/shelf/steel,
+/obj/item/clothing/suit/space/anomaly,
+/obj/item/clothing/head/helmet/space/anomaly,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d1aftmaint)
 "shj" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -24467,6 +24886,11 @@
 	},
 /turf/simulated/floor/tiled,
 /area/endeavour/surfacebase/tram)
+"sjD" = (
+/obj/structure/railing,
+/obj/structure/closet/crate,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d1aftmaint)
 "sjP" = (
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply{
 	dir = 1
@@ -24650,8 +25074,20 @@
 /turf/simulated/floor/plating,
 /area/shuttle/courser/cockpit)
 "srV" = (
+/obj/structure/railing{
+	dir = 4
+	},
+/obj/structure/railing{
+	dir = 1
+	},
+/obj/structure/railing{
+	dir = 4
+	},
+/obj/structure/railing{
+	dir = 8
+	},
 /turf/simulated/floor/plating,
-/area/station/stairs_one)
+/area/endeavour/hallway/d1aftmaint)
 "ssc" = (
 /obj/machinery/light/small{
 	dir = 1
@@ -25178,6 +25614,14 @@
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/substation/dock)
+"sOr" = (
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
+/obj/structure/catwalk,
+/obj/machinery/light/small,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d1aftmaint)
 "sOS" = (
 /obj/effect/floor_decal/borderfloorblack,
 /obj/effect/floor_decal/corner/navblue/border,
@@ -25400,6 +25844,10 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/crew_quarters/heads/hop)
+"sUJ" = (
+/obj/random/maintenance,
+/turf/simulated/floor/plating,
+/area/maintenance/substation/dock)
 "sVb" = (
 /obj/structure/railing{
 	dir = 1
@@ -25482,6 +25930,13 @@
 /obj/effect/floor_decal/corner/black/diagonal,
 /turf/simulated/floor/tiled/white,
 /area/crew_quarters/lounge/kitchen_freezer)
+"sYC" = (
+/obj/structure/closet/cabinet,
+/obj/random/maintenance/clean,
+/obj/random/maintenance/engineering,
+/obj/random/maintenance/cargo,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d1aftmaint)
 "sZj" = (
 /obj/structure/sign/nanotrasen,
 /turf/simulated/wall/r_wall,
@@ -25993,7 +26448,11 @@
 /turf/simulated/floor/tiled/freezer,
 /area/crew_quarters/pool)
 "ttV" = (
-/obj/machinery/light{
+/obj/structure/table/rack,
+/obj/item/toy/tennis/yellow,
+/obj/item/toy/tennis/green,
+/obj/item/toy/tennis/blue,
+/obj/machinery/light/small{
 	dir = 8
 	},
 /turf/simulated/floor/plating,
@@ -26083,9 +26542,11 @@
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d1starboardforhall)
 "tve" = (
-/obj/structure/closet,
-/obj/random/maintenance/clean,
-/obj/random/cigarettes,
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
+/obj/random/maintenance,
+/obj/structure/table/rack/shelf,
 /turf/simulated/floor/plating,
 /area/endeavour/hallway/d1fwdmaint)
 "tvn" = (
@@ -26259,6 +26720,12 @@
 /obj/structure/table/reinforced,
 /turf/simulated/floor/tiled,
 /area/hallway/secondary/docking_hallway2)
+"tyD" = (
+/obj/machinery/light/small,
+/obj/structure/closet/crate,
+/obj/random/maintenance,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d1fwdmaint)
 "tzn" = (
 /obj/machinery/shield_diffuser,
 /obj/map_helper/airlock/door/ext_door,
@@ -26432,7 +26899,9 @@
 /turf/simulated/floor/tiled,
 /area/rnd/test_area)
 "tDR" = (
-/obj/structure/loot_pile/maint/technical,
+/obj/structure/railing{
+	dir = 4
+	},
 /turf/simulated/floor/plating,
 /area/endeavour/hallway/d1aftmaint)
 "tFC" = (
@@ -26486,6 +26955,15 @@
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d1fwdhall)
 "tHm" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 6
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
 /turf/simulated/floor/carpet/blue,
 /area/crew_quarters/heads/blueshield)
 "tHB" = (
@@ -26504,6 +26982,13 @@
 	},
 /turf/simulated/floor/plating,
 /area/endeavour/hallway/d1fwdmaint)
+"tHZ" = (
+/obj/structure/catwalk,
+/obj/landmark{
+	name = "maint_pred"
+	},
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d1aftmaint)
 "tIH" = (
 /obj/machinery/light{
 	dir = 4
@@ -26637,6 +27122,14 @@
 	},
 /turf/simulated/floor/plating,
 /area/endeavour/hallway/d1aftmaint)
+"tNd" = (
+/obj/structure/catwalk,
+/obj/machinery/door/airlock/maintenance,
+/obj/machinery/door/firedoor{
+	dir = 8
+	},
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d1fwdmaint)
 "tNi" = (
 /obj/effect/floor_decal/borderfloor{
 	dir = 1
@@ -27728,26 +28221,8 @@
 /turf/simulated/floor/tiled/old_tile/green,
 /area/shuttle/civvie/general)
 "uxl" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/machinery/door/firedoor{
-	dir = 8
-	},
-/obj/machinery/door/airlock/command{
-	id_tag = "blueshielddoor";
-	name = "Blueshield";
-	req_one_access = null
-	},
-/obj/map_helper/access_helper/airlock/station/head_office/blueshield,
-/obj/structure/cable/green{
-	icon_state = "4-8"
-	},
-/turf/simulated/floor/wood,
-/area/crew_quarters/heads/blueshield)
+/turf/simulated/wall/prepainted/command,
+/area/endeavour/hallway/d1fwdmaint)
 "uxn" = (
 /obj/machinery/light{
 	dir = 8
@@ -28041,6 +28516,12 @@
 	},
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d1portforhall)
+"uKj" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 9
+	},
+/turf/simulated/floor/carpet/blue,
+/area/crew_quarters/heads/blueshield)
 "uKB" = (
 /obj/machinery/light,
 /turf/simulated/floor/tiled/techfloor/grid,
@@ -28068,6 +28549,11 @@
 	},
 /turf/simulated/floor/tiled,
 /area/crew_quarters/heads/hop)
+"uMH" = (
+/obj/structure/closet/emcloset,
+/obj/random/maintenance,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d1fwdmaint)
 "uMJ" = (
 /turf/simulated/wall/prepainted,
 /area/crew_quarters/pool)
@@ -28150,6 +28636,10 @@
 /obj/landmark/spawnpoint/job/mime,
 /turf/simulated/floor/carpet/bcarpet,
 /area/crew_quarters/mimeoffice)
+"uPG" = (
+/obj/structure/reagent_dispensers/fueltank,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d1fwdmaint)
 "uQm" = (
 /obj/machinery/computer/cryopod{
 	name = "asset retention console";
@@ -28257,6 +28747,12 @@
 /obj/machinery/air_alarm/north_mount,
 /turf/simulated/floor/wood,
 /area/exploration/meeting)
+"uUe" = (
+/obj/structure/closet,
+/obj/random/cigarettes,
+/obj/random/maintenance/clean,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d1fwdmaint)
 "uUz" = (
 /obj/effect/floor_decal/spline/fancy/wood{
 	dir = 4
@@ -28685,6 +29181,7 @@
 /obj/machinery/light{
 	dir = 8
 	},
+/obj/random/maintenance,
 /turf/simulated/floor/plating,
 /area/endeavour/hallway/d1fwdmaint)
 "viz" = (
@@ -28874,6 +29371,13 @@
 	},
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d1starboardafthall)
+"vpk" = (
+/obj/structure/railing{
+	dir = 4
+	},
+/obj/structure/closet/emcloset,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d1aftmaint)
 "vpD" = (
 /obj/machinery/light/small,
 /turf/simulated/floor/carpet/bcarpet,
@@ -28946,6 +29450,15 @@
 	},
 /turf/simulated/floor/tiled,
 /area/shuttle/excursion/general)
+"vqN" = (
+/obj/structure/railing{
+	dir = 1
+	},
+/obj/structure/closet,
+/obj/random/maintenance/clean,
+/obj/random/maintenance/clean,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d1aftmaint)
 "vqV" = (
 /obj/machinery/door/airlock/maintenance/rnd,
 /obj/map_helper/access_helper/airlock/station/exploration/department,
@@ -29249,8 +29762,9 @@
 /area/maintenance/substation/civilian)
 "vBK" = (
 /obj/effect/floor_decal/rust,
+/obj/structure/catwalk,
 /turf/simulated/floor/plating,
-/area/station/stairs_one)
+/area/endeavour/hallway/d1fwdmaint)
 "vBM" = (
 /obj/structure/cable/green{
 	icon_state = "4-8"
@@ -29743,11 +30257,13 @@
 /turf/simulated/floor/tiled,
 /area/endeavour/exploration/hallway_aft)
 "vVa" = (
-/obj/structure/catwalk,
-/obj/structure/cable/green{
-	icon_state = "1-8"
+/obj/structure/table/steel,
+/obj/item/deck/cards{
+	pixel_y = 7;
+	pixel_x = 5
 	},
-/obj/machinery/light/small,
+/obj/item/flame/candle,
+/obj/item/storage/box/matches,
 /turf/simulated/floor/plating,
 /area/endeavour/hallway/d1aftmaint)
 "vVE" = (
@@ -29756,6 +30272,13 @@
 	},
 /turf/simulated/floor/plating,
 /area/shuttle/courser/general)
+"vVK" = (
+/obj/random/trash_pile,
+/obj/structure/railing{
+	dir = 4
+	},
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d1aftmaint)
 "vVS" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -29948,6 +30471,15 @@
 /obj/machinery/atmospherics/pipe/simple/hidden,
 /turf/simulated/floor/tiled/steel,
 /area/hallway/secondary/docking_hallway)
+"weR" = (
+/obj/structure/railing,
+/obj/structure/closet/firecloset,
+/obj/effect/floor_decal/industrial/outline/grey,
+/obj/structure/railing{
+	dir = 4
+	},
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d1aftmaint)
 "wfp" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -30055,9 +30587,11 @@
 "wjo" = (
 /obj/structure/bed/chair/bay/comfy/black,
 /obj/landmark/spawnpoint/job/blueshield,
-/obj/machinery/atmospherics/component/unary/vent_pump/on,
+/obj/machinery/atmospherics/component/unary/vent_pump/on{
+	dir = 4
+	},
 /obj/structure/cable/green{
-	icon_state = "1-2"
+	icon_state = "1-4"
 	},
 /turf/simulated/floor/carpet/blue,
 /area/crew_quarters/heads/blueshield)
@@ -30207,6 +30741,17 @@
 "woe" = (
 /turf/simulated/floor/carpet/bcarpet,
 /area/crew_quarters/heads/hop)
+"won" = (
+/obj/structure/catwalk,
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
+/obj/machinery/door/airlock/maintenance/common,
+/obj/machinery/door/firedoor{
+	dir = 1
+	},
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d1aftmaint)
 "woM" = (
 /obj/effect/floor_decal/borderfloorblack,
 /obj/effect/floor_decal/corner/navgold/border,
@@ -30558,9 +31103,6 @@
 /turf/simulated/floor/carpet/bcarpet,
 /area/library/study)
 "wyY" = (
-/obj/machinery/computer/ship/navigation/telescreen{
-	pixel_y = 27
-	},
 /obj/machinery/camera/network/civilian,
 /turf/simulated/floor/glass/reinforced,
 /area/endeavour/hallway/d1fwdhall)
@@ -31095,8 +31637,16 @@
 /turf/simulated/floor/tiled/dark,
 /area/hallway/secondary/docking_hallway2)
 "wWq" = (
-/turf/simulated/wall/prepainted/civilian,
-/area/station/stairs_one)
+/obj/machinery/light/small,
+/obj/structure/railing{
+	dir = 4
+	},
+/obj/structure/railing{
+	dir = 1
+	},
+/obj/random/trash_pile,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d1aftmaint)
 "wWR" = (
 /obj/machinery/fire_alarm/north_mount,
 /turf/simulated/floor/tiled,
@@ -31248,6 +31798,18 @@
 	},
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d1portforhall)
+"xec" = (
+/obj/structure/railing{
+	dir = 8
+	},
+/obj/structure/railing{
+	dir = 1
+	},
+/obj/structure/closet/crate,
+/obj/random/maintenance/clean,
+/obj/random/maintenance/engineering,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d1aftmaint)
 "xef" = (
 /obj/machinery/camera/network/exploration{
 	dir = 4
@@ -31393,12 +31955,17 @@
 /obj/structure/sign/warning/caution,
 /turf/simulated/wall/r_wall/prepainted/science,
 /area/rnd/test_area)
+"xkl" = (
+/obj/effect/floor_decal/rust,
+/obj/random/maintenance,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d1aftmaint)
 "xkO" = (
-/obj/machinery/fire_alarm/west_mount{
-	pixel_x = -28
+/obj/structure/railing{
+	dir = 1
 	},
-/turf/simulated/floor/wood,
-/area/crew_quarters/heads/blueshield)
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d1aftmaint)
 "xln" = (
 /obj/effect/floor_decal/borderfloorblack{
 	dir = 5
@@ -32473,6 +33040,9 @@
 /obj/machinery/light{
 	dir = 4
 	},
+/obj/machinery/computer/ship/navigation/telescreen{
+	pixel_y = -35
+	},
 /turf/simulated/floor/glass/reinforced,
 /area/endeavour/hallway/d1fwdhall)
 "xZn" = (
@@ -32829,6 +33399,14 @@
 /obj/effect/floor_decal/corner/mauve/border,
 /turf/simulated/floor/tiled,
 /area/exploration/showers)
+"ylt" = (
+/obj/effect/floor_decal/rust,
+/obj/structure/table/woodentable,
+/obj/item/tank/anesthetic,
+/obj/item/clothing/mask/breath/anesthetic,
+/obj/item/clothing/glasses/sunglasses/blindfold,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d1aftmaint)
 "ylz" = (
 /obj/effect/floor_decal/borderfloorblack{
 	dir = 1
@@ -42666,7 +43244,7 @@ jLe
 aEU
 aEU
 aEU
-lDc
+dgz
 iAO
 oiv
 fcG
@@ -42860,7 +43438,7 @@ jLe
 aEU
 iDg
 iDg
-lOm
+fVP
 kHh
 wfp
 kHh
@@ -42889,11 +43467,11 @@ iAm
 skd
 oAD
 fhK
-wim
-wim
-aLP
-ejN
-wim
+ylt
+rVK
+mNC
+aNK
+asp
 sti
 wIX
 iGx
@@ -43054,7 +43632,7 @@ jLe
 aEU
 iDg
 iDg
-dnA
+lOm
 ueA
 brQ
 xuO
@@ -43065,7 +43643,7 @@ aEU
 dZr
 dZr
 xNI
-xNI
+sUJ
 xNI
 xNI
 xNI
@@ -43083,11 +43661,11 @@ kPw
 wge
 fhC
 fhK
-aLP
-wim
-wim
+jrC
+aXE
+qqT
+aNK
 wim
-qfR
 sti
 qQG
 gEI
@@ -43252,15 +43830,15 @@ mMw
 cUW
 rAN
 gKk
-vRx
+coS
 wXu
-aEU
+vRx
 aEU
 nCl
 dZr
 xao
 xNI
-xNI
+sUJ
 xNI
 tLX
 xNI
@@ -43277,11 +43855,11 @@ ebA
 tfD
 fhC
 fhK
-wim
-wim
+aNK
 aLP
+ppi
+aNK
 wim
-kmD
 sti
 bfO
 gEI
@@ -43471,11 +44049,11 @@ xGU
 tfD
 ber
 fhK
-wim
-wim
-wim
 aLP
-wim
+qZB
+iBH
+aNK
+wLB
 sti
 wyc
 gEI
@@ -43665,10 +44243,10 @@ jvK
 tfD
 bVS
 fhK
+qZB
 wim
-wim
-wim
-aLP
+iBH
+aNK
 aLP
 sti
 wyc
@@ -43859,10 +44437,10 @@ mfn
 qBg
 dqb
 fhK
-aLP
-aLP
-aLP
-aLP
+mmH
+iBH
+qZB
+aNK
 wim
 sti
 wyc
@@ -44053,10 +44631,10 @@ wHY
 hbF
 gxC
 fhK
+dUQ
 wim
-aLP
-aLP
-aLP
+iBH
+aNK
 aLP
 sti
 scr
@@ -44247,12 +44825,12 @@ fhK
 fhK
 fhK
 fhK
-aLP
-aLP
 aNK
 aNK
 aNK
 aNK
+wim
+aNK
 qfY
 vYM
 bnJ
@@ -44436,15 +45014,15 @@ nHB
 gBF
 wim
 uGX
-wim
-wim
-wim
-wim
-aLP
-wim
-wim
-wim
-aLP
+jLe
+jLe
+jLe
+jLe
+aYc
+jLe
+jLe
+jLe
+aYc
 wim
 aNK
 gEI
@@ -44632,12 +45210,12 @@ wim
 aNK
 aLP
 aLP
-aLP
-wim
+xkl
 wim
 wim
 wim
 wim
+dNA
 kcG
 aLP
 aNK
@@ -45202,8 +45780,8 @@ oHu
 xNI
 xNI
 xNI
-xNI
-xNI
+sUJ
+sUJ
 dnc
 xNI
 xNI
@@ -45402,7 +45980,7 @@ xNI
 xNI
 xNI
 xNI
-xNI
+sUJ
 xNI
 xNI
 dZr
@@ -45568,7 +46146,7 @@ qTj
 qTj
 qTj
 gPV
-wim
+tHZ
 aNK
 ojQ
 fnJ
@@ -45593,7 +46171,7 @@ xNI
 xNI
 xNI
 xNI
-xNI
+sUJ
 xNI
 xNI
 xNI
@@ -45762,7 +46340,7 @@ ipC
 wim
 wim
 gPV
-wim
+xec
 aNK
 pvA
 dkB
@@ -45956,7 +46534,7 @@ ipC
 wim
 ibx
 sjt
-wim
+vqN
 aNK
 uqH
 dth
@@ -46150,7 +46728,7 @@ ipC
 wim
 gPV
 wim
-wim
+wWq
 aNK
 qXN
 dth
@@ -46193,9 +46771,9 @@ qTM
 bci
 bci
 gOX
-ckz
+pBI
 ttV
-otM
+gOX
 otM
 uTl
 cMf
@@ -46343,8 +46921,8 @@ yfy
 vqV
 wim
 gPV
+xkO
 wim
-aLP
 aNK
 bRG
 pDa
@@ -46387,9 +46965,9 @@ qTM
 bci
 mve
 gOX
-ckz
-otM
+lYt
 otM
+gOX
 otM
 uTl
 nct
@@ -46537,7 +47115,7 @@ nRP
 ipC
 wim
 gPV
-wim
+xkO
 wim
 aNK
 xdS
@@ -46581,12 +47159,12 @@ dIw
 bci
 bci
 gOX
+gGN
 otM
-otM
-otM
+gOX
 otM
 uTl
-nct
+jDK
 ddG
 wBM
 usG
@@ -46731,7 +47309,7 @@ rVV
 rVV
 wim
 gPV
-wim
+xkO
 wim
 aNK
 ojQ
@@ -46775,9 +47353,9 @@ dIw
 bci
 bci
 gOX
-ckz
-otM
-otM
+gOX
+liT
+gOX
 otM
 uTl
 ovp
@@ -46925,7 +47503,7 @@ ozZ
 rVV
 wim
 gPV
-wim
+xkO
 wim
 aNK
 fFk
@@ -47117,9 +47695,9 @@ ipN
 bBN
 pzJ
 rVV
-wim
+wqg
 gPV
-wim
+xkO
 wim
 aNK
 ojQ
@@ -47131,7 +47709,7 @@ ciZ
 jLe
 jLe
 wim
-wim
+acQ
 wim
 aNK
 cHu
@@ -47320,7 +47898,7 @@ vEN
 mlQ
 qMB
 aNK
-wim
+acQ
 wim
 wim
 jLe
@@ -47507,7 +48085,7 @@ sgr
 rVV
 etS
 gPV
-iMr
+xkO
 wim
 aNK
 trx
@@ -47551,7 +48129,7 @@ dPQ
 dPQ
 pTh
 gOX
-otM
+cZJ
 otM
 otM
 sSQ
@@ -47701,8 +48279,8 @@ ozZ
 aka
 etS
 gPV
-wim
-wim
+xkO
+iMr
 ruI
 ojQ
 mlQ
@@ -47745,13 +48323,13 @@ bci
 bci
 uRN
 gOX
-otM
+cZJ
 otM
 sSQ
 tBM
 otM
 otM
-otM
+cZJ
 qUT
 mqa
 xRj
@@ -47895,7 +48473,7 @@ ozZ
 aka
 etS
 gPV
-wim
+xkO
 wim
 aNK
 phl
@@ -48089,7 +48667,7 @@ ozZ
 aka
 etS
 cpU
-wim
+xkO
 wLB
 aNK
 nuG
@@ -48283,10 +48861,10 @@ rVV
 rVV
 etS
 cpU
-wim
+xkO
 wim
 aNK
-aNK
+idq
 vEN
 vHL
 bdJ
@@ -48468,16 +49046,16 @@ wim
 wim
 kPR
 kPR
-wim
-wqg
-wim
-wim
-aLP
-wim
+aNK
+jVc
+knH
+ozD
+rrt
+bUQ
 wim
 vjS
 qzh
-wim
+xkO
 wim
 wim
 aNK
@@ -48662,17 +49240,17 @@ vmX
 wim
 wim
 wim
+aNK
 wim
-wim
-wim
-wim
-wim
-wim
+jLe
+jLe
+jLe
+jLe
 wim
 gPV
-wim
-wim
-wim
+srV
+tDR
+tDR
 wim
 aNK
 fFk
@@ -48855,19 +49433,19 @@ aGI
 kPR
 wim
 wim
-wim
-wim
-wim
-wim
-wim
 ibx
+won
+kov
+kov
+kov
+kmD
 kov
 kov
 sjt
 jLe
 jLe
 jLe
-eca
+nCd
 aNK
 phl
 vHL
@@ -49049,16 +49627,16 @@ aGI
 qii
 wim
 wim
-ibx
-kov
-kov
-kov
-kov
-vVa
+sOr
+aNK
+aNK
+aNK
+aNK
+aNK
+aNK
 aNK
 aNK
 aNK
-wim
 wim
 jLe
 jLe
@@ -49097,7 +49675,7 @@ xMR
 chY
 txV
 oxc
-uze
+kME
 syE
 xyA
 cTj
@@ -49246,13 +49824,13 @@ jLe
 gPV
 wim
 wqg
-wim
-wim
-wim
+akq
+sYC
+akq
 aNK
 ctt
 hVk
-wim
+aNK
 wim
 wim
 efK
@@ -49446,7 +50024,7 @@ wim
 aNK
 jeQ
 wim
-wim
+bag
 wim
 wim
 wim
@@ -49485,11 +50063,11 @@ tLA
 jFd
 pdz
 oxc
-uze
+nZR
 uze
 hAO
 syE
-uze
+nZR
 wqi
 lCw
 dUh
@@ -49633,14 +50211,14 @@ ayL
 gjG
 sjt
 wim
-aLP
-wim
+jUA
 wim
 wim
+jAh
 aNK
 lIc
 wim
-wim
+aNK
 wim
 wim
 wim
@@ -49827,17 +50405,17 @@ ayL
 wim
 jLe
 wim
+oFn
 wim
-wim
-wim
-wim
+exi
+vVa
 aNK
 dkm
 nAm
+aNK
+wqg
 wim
-wim
-wim
-wim
+wqg
 aNK
 sYx
 sXO
@@ -49885,7 +50463,7 @@ kMv
 xHd
 wqi
 otM
-ckz
+qjI
 sUx
 mqa
 xRj
@@ -50021,9 +50599,9 @@ ayL
 wim
 jLe
 wim
+akq
 wim
-wim
-wim
+pDT
 aFa
 aFa
 aFa
@@ -50264,7 +50842,7 @@ oxc
 oxc
 uze
 hAO
-uze
+nZR
 kMv
 lVq
 fOT
@@ -50660,7 +51238,7 @@ kMv
 kMv
 kMv
 kMv
-otM
+rlp
 otM
 sUx
 mqa
@@ -50791,9 +51369,9 @@ bdl
 sti
 sti
 sti
-wim
-wim
-wim
+sgV
+sWz
+vVK
 wim
 jLe
 aFa
@@ -51212,7 +51790,7 @@ lDc
 xgB
 iuy
 baf
-wUJ
+gHB
 lmG
 hfR
 hfR
@@ -51429,9 +52007,9 @@ eSM
 syE
 pdu
 ucD
-ckz
-otM
+eIq
 otM
+nzo
 sQl
 sQl
 sQl
@@ -51623,7 +52201,7 @@ oxc
 nZR
 pdu
 ucD
-ckz
+eqh
 ckz
 mqa
 sQl
@@ -51960,10 +52538,10 @@ jLe
 wim
 wim
 jLe
-wim
-wim
 tDR
-wim
+tDR
+tDR
+abs
 aFa
 vtb
 flK
@@ -52737,7 +53315,7 @@ rzM
 obT
 hub
 wim
-wim
+sjD
 jLe
 wim
 fZy
@@ -52930,8 +53508,8 @@ aIM
 aIM
 uwY
 hub
-wim
-wim
+vpk
+weR
 jLe
 wim
 fZy
@@ -53318,8 +53896,8 @@ aIM
 hub
 hub
 hub
-wim
-wim
+ahn
+bdO
 kQd
 wim
 fZy
@@ -53513,7 +54091,7 @@ hub
 ejN
 wim
 wim
-wim
+iIY
 kQd
 wim
 fZy
@@ -54511,11 +55089,11 @@ nAf
 jLq
 jwq
 lSz
-uTr
-maa
-maa
-maa
+hyQ
+bFR
 maa
+nSV
+nSV
 eNY
 umU
 kjq
@@ -54674,8 +55252,8 @@ fuE
 ssZ
 aIM
 hub
-maa
-maa
+nFc
+bbQ
 byt
 maa
 sIg
@@ -54707,9 +55285,9 @@ sCh
 uXz
 uTr
 maa
-bFR
 maa
 maa
+nSV
 eNY
 lvV
 kjq
@@ -55062,7 +55640,7 @@ gXr
 tlK
 wSU
 oYa
-maa
+bbQ
 maa
 byt
 maa
@@ -55454,7 +56032,7 @@ maa
 byt
 byt
 byt
-maa
+aUq
 cEb
 vWs
 sbD
@@ -55488,10 +56066,10 @@ maa
 maa
 maa
 maa
-maa
+bFR
 maa
 oNa
-maa
+nSV
 maa
 eNY
 eUo
@@ -55838,11 +56416,11 @@ wPl
 gOL
 oqw
 oYa
-maa
+aUq
 byt
 kfn
 maa
-dNZ
+tyD
 cEb
 bsl
 eLu
@@ -56226,7 +56804,7 @@ jnB
 arP
 qeV
 oYa
-maa
+aUq
 byt
 maa
 maa
@@ -56420,11 +56998,11 @@ kTQ
 kTQ
 tCc
 oYa
-maa
-byt
-maa
-maa
-maa
+uTr
+tNd
+uTr
+uTr
+uTr
 cEb
 cEb
 cEb
@@ -56812,7 +57390,7 @@ maa
 byt
 maa
 maa
-maa
+aUq
 dIE
 ubG
 pGO
@@ -56850,8 +57428,8 @@ rCH
 maa
 gTk
 vKb
-kZn
 maa
+kZn
 ris
 ris
 ris
@@ -57045,7 +57623,7 @@ teS
 abN
 xAC
 maa
-maa
+rcs
 ris
 ris
 ris
@@ -57199,7 +57777,7 @@ unB
 maa
 byt
 kfn
-maa
+aUq
 maa
 dIE
 pGO
@@ -57432,7 +58010,7 @@ rCH
 maa
 abN
 xAC
-maa
+cER
 ris
 sQl
 xRj
@@ -57811,10 +58389,10 @@ rCE
 lSz
 uTr
 maa
+bFR
 maa
-maa
-liT
-maa
+qZT
+bFR
 byt
 byt
 byt
@@ -57999,7 +58577,7 @@ tjQ
 oiK
 uTr
 uTr
-apW
+hyQ
 eez
 rCE
 lSz
@@ -58172,7 +58750,7 @@ byt
 uTr
 maa
 maa
-maa
+nFc
 maa
 maa
 maa
@@ -58368,10 +58946,10 @@ byt
 byt
 kfn
 maa
-maa
+nFc
 byt
 byt
-maa
+nFc
 kfn
 uTr
 hYO
@@ -58392,11 +58970,11 @@ xeT
 cxE
 cVc
 uTr
-pQQ
-maa
+uPG
 maa
 maa
 maa
+bFR
 fta
 maa
 uTr
@@ -58586,7 +59164,7 @@ hYj
 fmw
 xpv
 uTr
-maa
+pQQ
 maa
 kfn
 kZn
@@ -58784,7 +59362,7 @@ uTr
 uTr
 uTr
 uTr
-maa
+cER
 fta
 maa
 uTr
@@ -58942,7 +59520,7 @@ xRj
 ePJ
 ris
 ris
-teS
+kGL
 byt
 qZT
 maa
@@ -59174,7 +59752,7 @@ lAI
 uTr
 maa
 fta
-maa
+bFR
 uTr
 aMl
 aMl
@@ -59756,7 +60334,7 @@ aMl
 uTr
 maa
 fta
-maa
+bFR
 ris
 qtn
 xrv
@@ -59914,7 +60492,7 @@ xRj
 xRj
 xRj
 ris
-maa
+kdX
 byt
 oVo
 maa
@@ -60145,7 +60723,7 @@ uTr
 maa
 fta
 maa
-maa
+igb
 ris
 xrv
 nio
@@ -60318,28 +60896,28 @@ snQ
 eCz
 nYu
 uJC
-uTr
+hyQ
 ssc
 eFE
 uTr
 dMB
 uTr
 rgG
-uTr
+hyQ
 gQH
 kDV
 uXy
 uTr
 maa
+bFR
+oCl
 maa
-maa
-maa
-maa
+bFR
 qZT
 maa
 fta
 maa
-sIg
+uMH
 ris
 suQ
 kwn
@@ -60500,7 +61078,7 @@ maa
 byt
 byt
 fvr
-maa
+kdX
 maa
 eFG
 rXC
@@ -60695,7 +61273,7 @@ ris
 iLP
 tKM
 kfn
-maa
+kdX
 hMD
 wgE
 okH
@@ -60723,7 +61301,7 @@ maa
 maa
 maa
 kfn
-maa
+hPx
 maa
 fta
 uTr
@@ -60912,12 +61490,12 @@ oWx
 bAu
 itm
 uTr
-iLP
-tlI
-tlI
+blV
 tlI
+tve
+tve
 pod
-maa
+cER
 maa
 fta
 uTr
@@ -61106,9 +61684,9 @@ oxe
 gaI
 aJX
 uTr
+bFR
 maa
-maa
-maa
+hPx
 maa
 wSl
 tHJ
@@ -61283,7 +61861,7 @@ qJU
 qJU
 qJU
 byt
-maa
+kdX
 uTr
 rAx
 vHL
@@ -61301,12 +61879,12 @@ fcc
 vsG
 uTr
 maa
-kZn
-kfn
-maa
+qPJ
+qfR
+hPx
 fta
 maa
-maa
+kZn
 sIg
 uTr
 maa
@@ -61693,9 +62271,9 @@ bFR
 maa
 maa
 fta
-maa
+iYH
 qZT
-kfn
+kEl
 maa
 maa
 byt
@@ -62059,7 +62637,7 @@ emW
 aek
 qJU
 byt
-maa
+kdX
 pQQ
 uTr
 mJc
@@ -62270,7 +62848,7 @@ mHc
 wVF
 uTr
 pQQ
-maa
+qZT
 maa
 byt
 uTr
@@ -62446,14 +63024,14 @@ qJU
 wOH
 djr
 qJU
-byt
+jtp
 uTr
 uTr
 uTr
 xGj
 cDX
 pQg
-lUh
+fQg
 lUh
 tuO
 qyL
@@ -62463,7 +63041,7 @@ uJk
 oWx
 kta
 uTr
-maa
+kdX
 kfn
 maa
 byt
@@ -62649,7 +63227,7 @@ xwO
 pQg
 lUh
 lUh
-lUh
+dnA
 lUh
 lUh
 lUh
@@ -63048,7 +63626,7 @@ uTr
 byt
 byt
 kfn
-maa
+kdX
 uTr
 uYH
 hGU
@@ -63229,8 +63807,8 @@ uTr
 uTr
 aEU
 aEU
-aEU
 vRx
+eex
 vmD
 qcd
 jlB
@@ -63419,8 +63997,8 @@ blR
 byt
 byt
 byt
-maa
-maa
+byt
+byt
 aEU
 iDg
 iDg
@@ -63434,7 +64012,7 @@ iDg
 aEU
 maa
 byt
-fvr
+byt
 byt
 cYi
 hrs
@@ -63614,8 +64192,8 @@ jYs
 jYs
 jYs
 jYs
-jYs
-iBH
+byt
+aEU
 iDg
 iDg
 llA
@@ -63626,8 +64204,8 @@ uBH
 iDg
 iDg
 aEU
-maa
-maa
+kdX
+byt
 maa
 maa
 cYi
@@ -63807,21 +64385,21 @@ jYs
 dXG
 eSO
 jWo
-kEl
-xkO
-iBH
+jYs
+byt
+aEU
 aEU
 aEU
 aEU
 eDl
 uhG
 eDl
-vRx
 aEU
+vRx
 aEU
 aEU
 teS
-kfn
+vBK
 maa
 kfn
 cYi
@@ -64001,23 +64579,23 @@ jYs
 ldn
 wjo
 cIw
-kME
-nFc
-iBH
-srV
+jYs
+byt
+byt
+byt
 vBK
-aEU
+kat
 wyY
 uhG
 eDl
 fND
-srV
-srV
-aEU
-maa
-sIg
-maa
-maa
+byt
+byt
+byt
+byt
+byt
+uUe
+uMH
 cYi
 cYi
 cYi
@@ -64194,22 +64772,22 @@ wOi
 jYs
 rdn
 tHm
-tHm
-exi
+uKj
+jYs
 kdX
-iBH
-srV
-srV
-aEU
+byt
+maa
+maa
+uTr
 hBB
 uhG
 xYV
-wWq
-srV
-vBK
-aEU
-tve
-ugo
+uTr
+maa
+kfn
+maa
+maa
+maa
 ugo
 ugo
 cYi
@@ -64386,22 +64964,22 @@ iif
 bak
 dAp
 jYs
-jYs
-ctB
-ctB
+jDd
+rOy
 ctB
+jYs
+uxl
+uxl
+uxl
+uxl
 uxl
-iBH
-iBH
-iBH
-iBH
 oOB
 mzp
 gJD
-iBH
-iBH
-iBH
-iBH
+blR
+blR
+blR
+blR
 blR
 iif
 iif
diff --git a/maps/endeavour/levels/deck2.dmm b/maps/endeavour/levels/deck2.dmm
index fd1f2ead76bb..d47245737820 100644
--- a/maps/endeavour/levels/deck2.dmm
+++ b/maps/endeavour/levels/deck2.dmm
@@ -12,6 +12,15 @@
 /obj/structure/lattice,
 /turf/simulated/floor/airless/ceiling,
 /area/tether/station/public_meeting_room)
+"aaL" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 10
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 10
+	},
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/hallway/station/docks)
 "aaU" = (
 /obj/structure/cable/green{
 	icon_state = "1-2"
@@ -21,6 +30,14 @@
 "abm" = (
 /turf/simulated/wall/prepainted/medical,
 /area/medical/medbay3)
+"abv" = (
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
+/obj/structure/catwalk,
+/obj/machinery/fire_alarm/north_mount,
+/turf/simulated/floor/plating,
+/area/maintenance/medbay/aft)
 "abL" = (
 /obj/machinery/door/window/brigdoor/northright{
 	name = "Containment Pen";
@@ -172,6 +189,10 @@
 /obj/machinery/light,
 /turf/simulated/floor/tiled/techfloor,
 /area/medical/morgue)
+"agb" = (
+/obj/machinery/air_alarm/east_mount,
+/turf/simulated/floor/plating,
+/area/medical/virologymaint)
 "agL" = (
 /obj/effect/floor_decal/techfloor/orange,
 /obj/machinery/atmospherics/component/unary/vent_pump/on,
@@ -501,6 +522,12 @@
 	},
 /turf/simulated/floor/tiled,
 /area/rnd/anomaly_lab)
+"ara" = (
+/obj/structure/table/rack,
+/obj/random/maintenance/engineering,
+/obj/random/maintenance/clean,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d2fwdmaint)
 "arr" = (
 /obj/machinery/camera/network/civilian{
 	dir = 1
@@ -565,6 +592,10 @@
 	},
 /turf/simulated/floor/tiled/techfloor,
 /area/assembly/robotics)
+"asd" = (
+/obj/machinery/air_alarm/north_mount,
+/turf/simulated/floor/plating,
+/area/maintenance/research)
 "asv" = (
 /obj/machinery/atmospherics/component/unary/vent_scrubber/on,
 /obj/structure/disposalpipe/segment{
@@ -602,6 +633,10 @@
 	},
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d1starboardforhall)
+"auj" = (
+/obj/machinery/fire_alarm/east_mount,
+/turf/simulated/floor/plating,
+/area/maintenance/research)
 "auq" = (
 /obj/machinery/door/firedoor/glass{
 	dir = 4
@@ -702,12 +737,19 @@
 /turf/simulated/floor/tiled/white,
 /area/medical/medbay3)
 "axp" = (
-/obj/effect/floor_decal/corner/green{
-	dir = 10
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/structure/disposalpipe/segment,
+/obj/effect/floor_decal/borderfloorwhite{
+	dir = 4
+	},
+/obj/effect/floor_decal/corner/green/border{
+	dir = 4
+	},
+/obj/machinery/air_alarm{
+	dir = 8;
+	pixel_x = 25
+	},
 /turf/simulated/floor/tiled/white,
 /area/medical/virology_fore_access)
 "axP" = (
@@ -716,6 +758,19 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/medical/surgeryprep)
+"axW" = (
+/obj/machinery/light/small{
+	dir = 1
+	},
+/obj/machinery/air_alarm{
+	dir = 8;
+	pixel_x = 25
+	},
+/turf/simulated/floor/plating,
+/area/maintenance/fpmaint2)
+"ayx" = (
+/turf/simulated/floor/tiled/techmaint,
+/area/tether/surfacebase/shuttle_pad)
 "ayB" = (
 /obj/structure/shuttle/engine/heater{
 	dir = 8
@@ -925,6 +980,24 @@
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply,
 /turf/simulated/floor/tiled/dark,
 /area/rnd/research/testingrange)
+"aFn" = (
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
+/obj/machinery/air_alarm{
+	pixel_y = 22
+	},
+/obj/effect/floor_decal/spline/fancy/wood{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 10
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/turf/simulated/floor/wood,
+/area/tether/surfacebase/shuttle_pad)
 "aFv" = (
 /obj/effect/floor_decal/borderfloor{
 	dir = 5
@@ -1286,6 +1359,12 @@
 	},
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d1starboardforhall)
+"aQK" = (
+/obj/structure/catwalk,
+/obj/machinery/door/airlock/maintenance/common,
+/obj/machinery/door/firedoor,
+/turf/simulated/floor/plating,
+/area/maintenance/research)
 "aRl" = (
 /obj/effect/paint/babyblue,
 /obj/structure/window/reinforced/polarized/full{
@@ -1398,6 +1477,14 @@
 /area/rnd/reception_desk)
 "aXm" = (
 /obj/fiftyspawner/glass,
+/obj/structure/table/rack,
+/turf/simulated/floor/plating,
+/area/maintenance/medbay/aft)
+"aXp" = (
+/obj/machinery/air_alarm{
+	frequency = 1441;
+	pixel_y = 22
+	},
 /turf/simulated/floor/plating,
 /area/maintenance/medbay/aft)
 "aXF" = (
@@ -1416,9 +1503,6 @@
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d1starboardforhall)
 "aYU" = (
-/obj/effect/floor_decal/corner/green{
-	dir = 10
-	},
 /obj/structure/disposalpipe/segment,
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply{
 	dir = 4
@@ -1426,6 +1510,15 @@
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
 	dir = 4
 	},
+/obj/effect/floor_decal/borderfloorwhite{
+	dir = 4
+	},
+/obj/effect/floor_decal/corner/green/border{
+	dir = 4
+	},
+/obj/machinery/light{
+	dir = 4
+	},
 /turf/simulated/floor/tiled/white,
 /area/medical/virology_fore_access)
 "aYX" = (
@@ -1584,6 +1677,7 @@
 	dir = 8;
 	icon_state = "pipe-c"
 	},
+/obj/machinery/air_alarm/east_mount,
 /turf/simulated/floor/plating,
 /area/maintenance/substation/medical_science)
 "bfx" = (
@@ -1705,7 +1799,7 @@
 "biu" = (
 /obj/structure/sign/deck/second,
 /turf/simulated/wall/r_wall/prepainted,
-/area/endeavour/hallway/d2fwdmaint)
+/area/tether/surfacebase/shuttle_pad)
 "bix" = (
 /obj/effect/floor_decal/borderfloorwhite{
 	dir = 1
@@ -1876,6 +1970,10 @@
 /obj/machinery/seed_storage/xenobotany,
 /turf/simulated/floor/tiled,
 /area/rnd/xenobiology/xenoflora)
+"blQ" = (
+/obj/random/trash_pile,
+/turf/simulated/floor/plating,
+/area/maintenance/fpmaint2)
 "bmb" = (
 /obj/machinery/light{
 	dir = 8
@@ -1945,6 +2043,10 @@
 	},
 /turf/simulated/floor/tiled,
 /area/rnd/xenobiology)
+"bpx" = (
+/obj/structure/closet/crate/trashcart,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d2fwdmaint)
 "bpS" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 5
@@ -1960,6 +2062,12 @@
 	},
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d2portamidhall)
+"bqq" = (
+/obj/structure/closet,
+/obj/random/maintenance/cargo,
+/obj/random/maintenance/clean,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d2fwdmaint)
 "bqS" = (
 /obj/effect/floor_decal/borderfloor{
 	dir = 1
@@ -2047,6 +2155,11 @@
 /obj/machinery/iv_drip,
 /turf/simulated/floor/tiled,
 /area/medical/surgery2)
+"bwN" = (
+/obj/structure/catwalk,
+/obj/machinery/air_alarm/east_mount,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d2fwdmaint)
 "bxp" = (
 /obj/machinery/door/firedoor{
 	dir = 8
@@ -2059,6 +2172,13 @@
 	},
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d2portamidhall)
+"bxy" = (
+/obj/machinery/air_alarm{
+	frequency = 1441;
+	pixel_y = 22
+	},
+/turf/simulated/floor/plating,
+/area/medical/medbay_primary_storage)
 "bxz" = (
 /turf/simulated/wall/r_wall/prepainted/science,
 /area/rnd/testingroom)
@@ -2369,14 +2489,11 @@
 /area/medical/patient_wing)
 "bFe" = (
 /obj/machinery/light,
-/obj/effect/floor_decal/borderfloorblack{
-	dir = 6
-	},
-/obj/effect/floor_decal/corner/navgold/border{
-	dir = 6
-	},
+/obj/effect/floor_decal/borderfloorblack,
+/obj/effect/floor_decal/corner/navgold/border,
 /obj/effect/floor_decal/borderfloorblack/corner2,
 /obj/effect/floor_decal/corner/navgold/bordercorner2,
+/obj/machinery/computer/timeclock/premade/south,
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d1starboardamidhall)
 "bFy" = (
@@ -2638,6 +2755,22 @@
 	},
 /turf/simulated/floor/tiled/techfloor,
 /area/crew_quarters/cafeteria)
+"bKt" = (
+/obj/effect/floor_decal/spline/fancy{
+	dir = 9
+	},
+/obj/structure/filingcabinet/chestdrawer,
+/turf/simulated/floor/wood,
+/area/exploration/pilot_Office)
+"bKz" = (
+/obj/structure/table/rack/shelf/steel,
+/obj/random/maintenance/engineering,
+/obj/random/maintenance/clean,
+/obj/machinery/light/small{
+	dir = 4
+	},
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d2fwdmaint)
 "bKE" = (
 /obj/machinery/light{
 	dir = 1
@@ -2740,17 +2873,29 @@
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d2portafthall)
 "bNQ" = (
-/obj/effect/floor_decal/corner/green{
-	dir = 10
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/structure/disposalpipe/segment,
 /obj/structure/cable/green{
 	icon_state = "1-8"
 	},
+/obj/effect/floor_decal/borderfloorwhite{
+	dir = 4
+	},
+/obj/effect/floor_decal/corner/green/border{
+	dir = 4
+	},
 /turf/simulated/floor/tiled/white,
 /area/medical/virology_fore_access)
+"bNY" = (
+/obj/machinery/air_alarm{
+	dir = 4;
+	pixel_x = -22
+	},
+/obj/structure/table/rack,
+/obj/random/maintenance/clean,
+/turf/simulated/floor,
+/area/maintenance/research)
 "bOa" = (
 /obj/effect/floor_decal/borderfloor,
 /obj/effect/floor_decal/corner/mauve/border,
@@ -3039,6 +3184,12 @@
 /obj/machinery/light,
 /turf/simulated/floor/tiled,
 /area/rnd/hallway)
+"bXB" = (
+/obj/structure/frame{
+	anchored = 1
+	},
+/turf/simulated/floor/tiled/techfloor,
+/area/maintenance/research)
 "bXJ" = (
 /obj/machinery/vending/cola,
 /obj/effect/floor_decal/corner/beige{
@@ -3298,10 +3449,8 @@
 /turf/simulated/floor/tiled,
 /area/maintenance/research)
 "cda" = (
-/obj/machinery/light{
-	dir = 1
-	},
-/turf/simulated/floor/tiled,
+/obj/structure/catwalk,
+/turf/simulated/floor/plating,
 /area/rnd/research/researchdivision)
 "cdg" = (
 /obj/machinery/air_alarm{
@@ -3433,12 +3582,15 @@
 /turf/simulated/wall/prepainted,
 /area/maintenance/substation/medical)
 "chF" = (
-/obj/effect/floor_decal/corner/green{
-	dir = 10
-	},
 /obj/structure/disposalpipe/segment,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/effect/floor_decal/borderfloorwhite{
+	dir = 4
+	},
+/obj/effect/floor_decal/corner/green/border{
+	dir = 4
+	},
 /turf/simulated/floor/tiled/white,
 /area/medical/virology_fore_access)
 "chQ" = (
@@ -3455,6 +3607,20 @@
 	},
 /turf/simulated/floor/tiled,
 /area/rnd/hallway)
+"ciU" = (
+/obj/machinery/door/firedoor/glass{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/black{
+	dir = 4
+	},
+/obj/machinery/door/airlock/medical{
+	name = "Virology Labs";
+	req_one_access = null
+	},
+/obj/map_helper/access_helper/airlock/station/medical/department,
+/turf/simulated/floor/tiled/white,
+/area/hallway/station/docks)
 "ciZ" = (
 /obj/effect/floor_decal/steeldecal/steel_decals_central7,
 /obj/structure/cable/orange{
@@ -3489,6 +3655,19 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/medical/sleeper)
+"cjl" = (
+/obj/machinery/light/small{
+	dir = 4
+	},
+/obj/random/maintenance/medical,
+/obj/random/maintenance/security,
+/obj/structure/table/rack,
+/turf/simulated/floor/plating,
+/area/maintenance/research)
+"cjm" = (
+/obj/structure/bed/chair/comfy/blue,
+/turf/simulated/floor/plating,
+/area/maintenance/fpmaint2)
 "cjM" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -3809,6 +3988,12 @@
 	},
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d1starboardafthall)
+"css" = (
+/obj/structure/closet,
+/obj/random/maintenance/security,
+/obj/random/maintenance/medical,
+/turf/simulated/floor/plating,
+/area/maintenance/research)
 "csx" = (
 /obj/item/storage/excavation,
 /obj/item/pickaxe,
@@ -3980,6 +4165,12 @@
 	},
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d1starboardafthall)
+"cxF" = (
+/obj/machinery/atmospherics/component/unary/vent_pump/on{
+	dir = 1
+	},
+/turf/simulated/floor/tiled/techmaint,
+/area/tether/surfacebase/shuttle_pad)
 "cxJ" = (
 /turf/simulated/floor/plating,
 /area/maintenance/substation/medical_science)
@@ -4107,9 +4298,23 @@
 /obj/machinery/door/firedoor,
 /turf/simulated/floor/tiled/dark,
 /area/endeavour/hallway/d2portafthall)
+"cBo" = (
+/obj/machinery/light/small{
+	dir = 1
+	},
+/obj/effect/floor_decal/rust,
+/turf/simulated/floor/plating,
+/area/maintenance/research)
 "cBK" = (
 /turf/simulated/wall/prepainted,
 /area/endeavour/hallway/d1starboardafthall)
+"cCs" = (
+/obj/structure/table/rack/shelf/steel,
+/obj/item/tank/emergency/oxygen/engi,
+/obj/item/tank/emergency/oxygen/engi,
+/obj/item/tank/emergency/oxygen/double,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d2fwdmaint)
 "cCF" = (
 /obj/machinery/door/firedoor,
 /obj/effect/floor_decal/borderfloorblack{
@@ -4242,6 +4447,7 @@
 /area/rnd/anomaly_lab/containment_two)
 "cFB" = (
 /obj/machinery/light/small,
+/obj/structure/catwalk,
 /turf/simulated/floor/plating,
 /area/maintenance/substation/research)
 "cFG" = (
@@ -4285,6 +4491,13 @@
 /obj/effect/floor_decal/corner/paleblue/diagonal,
 /turf/simulated/floor/tiled/white,
 /area/medical/patient_d)
+"cGM" = (
+/obj/effect/floor_decal/spline/fancy,
+/obj/item/modular_computer/console/preset/civilian{
+	dir = 1
+	},
+/turf/simulated/floor/wood,
+/area/exploration/pilot_Office)
 "cGO" = (
 /obj/machinery/door/firedoor{
 	dir = 8
@@ -4359,6 +4572,13 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/medical/surgeryobs)
+"cKf" = (
+/obj/machinery/light/small{
+	dir = 1
+	},
+/obj/structure/table/rack,
+/turf/simulated/floor/airless/ceiling,
+/area/maintenance/research)
 "cKJ" = (
 /obj/machinery/fire_alarm/north_mount,
 /obj/machinery/atmospherics/component/unary/vent_scrubber/on{
@@ -4413,6 +4633,14 @@
 /obj/effect/floor_decal/industrial/outline/blue,
 /turf/simulated/floor/tiled/white,
 /area/medical/patient_wing)
+"cLY" = (
+/obj/effect/floor_decal/rust,
+/obj/machinery/air_alarm{
+	dir = 8;
+	pixel_x = 25
+	},
+/turf/simulated/floor/plating,
+/area/maintenance/fpmaint2)
 "cMM" = (
 /obj/effect/floor_decal/spline/fancy/wood{
 	dir = 1
@@ -4577,6 +4805,10 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/medical/morgue)
+"cRR" = (
+/obj/machinery/fire_alarm/west_mount,
+/turf/simulated/floor/plating,
+/area/maintenance/research)
 "cRX" = (
 /obj/structure/cable/green{
 	icon_state = "1-2"
@@ -4651,9 +4883,16 @@
 /area/endeavour/hallway/d2fwdmaint)
 "cTz" = (
 /obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/maintenance/common,
+/obj/machinery/door/airlock/maintenance/common{
+	name = "Flight Ops Support"
+	},
+/obj/map_helper/access_helper/airlock/station/exploration/pilot,
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/tiled,
-/area/endeavour/hallway/d2fwdmaint)
+/area/tether/surfacebase/shuttle_pad)
 "cTK" = (
 /obj/structure/cable/green{
 	icon_state = "4-8"
@@ -4790,6 +5029,11 @@
 /obj/machinery/door/window/southleft,
 /turf/simulated/floor/tiled,
 /area/medical/virology_aft_access)
+"dba" = (
+/obj/structure/table/glass,
+/obj/item/clothing/mask/muzzle,
+/turf/simulated/floor/plating,
+/area/rnd/research/researchdivision)
 "dbh" = (
 /obj/machinery/computer/security/mining{
 	dir = 8;
@@ -4831,6 +5075,11 @@
 /obj/effect/paint/babyblue,
 /turf/simulated/floor/plating,
 /area/medical/psych/psych_1)
+"dco" = (
+/obj/structure/catwalk,
+/obj/machinery/door/firedoor,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d2fwdmaint)
 "dde" = (
 /obj/effect/floor_decal/borderfloorblack{
 	dir = 8
@@ -4840,6 +5089,10 @@
 	},
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d2portamidhall)
+"ddj" = (
+/obj/structure/bed,
+/turf/simulated/floor/plating,
+/area/rnd/research/researchdivision)
 "ddn" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/black{
 	dir = 4
@@ -5000,6 +5253,15 @@
 /obj/machinery/light,
 /turf/simulated/floor/plating,
 /area/maintenance/substation/medical_science)
+"djx" = (
+/obj/machinery/air_alarm{
+	dir = 8;
+	pixel_x = 25
+	},
+/obj/structure/table/rack,
+/obj/item/clothing/head/hardhat/red,
+/turf/simulated/floor/plating,
+/area/maintenance/research)
 "djF" = (
 /obj/structure/sign/warning/nosmoking_2,
 /turf/simulated/wall/r_wall/prepainted/science,
@@ -5187,6 +5449,14 @@
 	},
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d2portafthall)
+"dpV" = (
+/obj/structure/closet,
+/obj/random/maintenance/clean,
+/obj/random/maintenance/clean,
+/obj/random/maintenance/engineering,
+/obj/random/maintenance/engineering,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d2fwdmaint)
 "dqm" = (
 /obj/machinery/holopad,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -5288,6 +5558,17 @@
 	},
 /turf/simulated/floor/wood,
 /area/tether/station/public_meeting_room)
+"dtv" = (
+/obj/machinery/door/airlock/maintenance/common,
+/obj/machinery/door/firedoor{
+	dir = 1
+	},
+/turf/simulated/floor/plating,
+/area/maintenance/research)
+"dtG" = (
+/obj/structure/closet/firecloset,
+/turf/simulated/floor/tiled,
+/area/maintenance/research)
 "dtW" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
@@ -5350,6 +5631,11 @@
 	},
 /turf/simulated/floor/tiled,
 /area/medical/medbay_emt_bay)
+"duq" = (
+/obj/structure/table/rack,
+/obj/item/clothing/head/hardhat/red,
+/turf/simulated/floor/plating,
+/area/maintenance/medbay/aft)
 "dvx" = (
 /obj/structure/sink{
 	pixel_y = 19
@@ -5517,6 +5803,15 @@
 /obj/machinery/holopad,
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d1starboardamidhall)
+"dzu" = (
+/obj/structure/cable/orange{
+	icon_state = "4-8"
+	},
+/obj/structure/catwalk,
+/obj/machinery/door/airlock/maintenance/common,
+/obj/machinery/door/firedoor,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d2aftmaint)
 "dzH" = (
 /obj/effect/floor_decal/spline/fancy/wood{
 	dir = 9
@@ -5778,14 +6073,9 @@
 /turf/simulated/floor/tiled/white,
 /area/medical/surgeryprep)
 "dIS" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 10
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 10
-	},
-/turf/simulated/floor/tiled,
-/area/rnd/research/researchdivision)
+/obj/structure/poster/preset/baystation/bay_7,
+/turf/simulated/wall/r_wall/prepainted,
+/area/maintenance/fpmaint2)
 "dIV" = (
 /obj/effect/floor_decal/borderfloorwhite{
 	dir = 1
@@ -5848,6 +6138,13 @@
 	},
 /turf/simulated/floor/airless/ceiling,
 /area/maintenance/research)
+"dMJ" = (
+/obj/machinery/light/small{
+	dir = 8
+	},
+/obj/effect/floor_decal/rust,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d2fwdmaint)
 "dMM" = (
 /obj/structure/sink{
 	dir = 8;
@@ -6027,6 +6324,18 @@
 	},
 /turf/simulated/floor/wood,
 /area/medical/psych/psych_2)
+"dQO" = (
+/obj/machinery/light/small{
+	dir = 8
+	},
+/obj/structure/reagent_dispensers/fueltank,
+/turf/simulated/floor/plating,
+/area/maintenance/fpmaint2)
+"dRf" = (
+/obj/structure/closet/crate,
+/obj/random/plushie,
+/turf/simulated/floor/plating,
+/area/maintenance/research)
 "dSa" = (
 /obj/effect/floor_decal/borderfloorwhite{
 	dir = 4
@@ -6300,14 +6609,12 @@
 /turf/simulated/floor/tiled,
 /area/rnd/anomaly_lab)
 "dYQ" = (
-/obj/machinery/light{
-	dir = 8
-	},
-/obj/machinery/atmospherics/component/unary/vent_scrubber/on{
-	dir = 4
+/obj/machinery/shield_diffuser,
+/obj/machinery/camera/network/outside{
+	dir = 5
 	},
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/hallway/station/docks)
+/turf/simulated/floor/airless/ceiling,
+/area/endeavour/command/turrets)
 "dYX" = (
 /obj/machinery/atm{
 	pixel_x = -32
@@ -6428,6 +6735,11 @@
 	},
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d2portafthall)
+"ebu" = (
+/obj/structure/closet/crate,
+/obj/fiftyspawner/steel,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d2fwdmaint)
 "ebF" = (
 /obj/machinery/light/small{
 	dir = 4
@@ -6468,6 +6780,21 @@
 	},
 /turf/simulated/floor/tiled,
 /area/rnd/anomaly_lab)
+"ece" = (
+/obj/structure/closet,
+/obj/random/maintenance/clean,
+/obj/random/maintenance/clean,
+/obj/random/coin,
+/turf/simulated/floor/plating,
+/area/maintenance/medbay/aft)
+"ecg" = (
+/obj/structure/table/wooden_reinforced,
+/obj/effect/floor_decal/spline/fancy/wood,
+/obj/machinery/atmospherics/component/unary/vent_pump/on{
+	dir = 1
+	},
+/turf/simulated/floor/wood,
+/area/tether/surfacebase/shuttle_pad)
 "ecE" = (
 /turf/simulated/floor/tiled,
 /area/rnd/xenobiology/xenoflora)
@@ -6854,6 +7181,10 @@
 "ejI" = (
 /turf/simulated/wall/prepainted,
 /area/maintenance/medbay/aft)
+"eki" = (
+/obj/machinery/air_alarm/east_mount,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d2fwdmaint)
 "ekq" = (
 /obj/machinery/atmospherics/component/unary/vent_pump/on{
 	dir = 4
@@ -6954,6 +7285,24 @@
 /obj/machinery/shower,
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/crew_quarters/medical_restroom)
+"enA" = (
+/obj/structure/catwalk,
+/obj/machinery/air_alarm{
+	dir = 8;
+	pixel_x = 25
+	},
+/turf/simulated/floor/plating,
+/area/maintenance/research)
+"enO" = (
+/obj/structure/table/rack/shelf,
+/obj/random/tool,
+/obj/random/toolbox,
+/turf/simulated/floor/plating,
+/area/maintenance/research)
+"eop" = (
+/obj/structure/reagent_dispensers/fueltank,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d2fwdmaint)
 "eow" = (
 /obj/machinery/atmospherics/pipe/manifold/hidden{
 	dir = 4
@@ -6978,6 +7327,14 @@
 /obj/effect/floor_decal/industrial/outline/grey,
 /turf/simulated/floor/tiled/white,
 /area/medical/virology_aft_access)
+"eoQ" = (
+/obj/machinery/power/apc/east_mount,
+/obj/effect/floor_decal/spline/fancy{
+	dir = 6
+	},
+/obj/structure/cable/green,
+/turf/simulated/floor/wood,
+/area/exploration/pilot_Office)
 "eoT" = (
 /obj/structure/disposalpipe/segment{
 	dir = 2;
@@ -7066,6 +7423,14 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/rnd/research/researchdivision)
+"etu" = (
+/obj/structure/catwalk,
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
+/obj/machinery/air_alarm/east_mount,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d2aftmaint)
 "etB" = (
 /obj/machinery/atmospherics/component/unary/vent_scrubber/on,
 /obj/structure/disposalpipe/segment{
@@ -7245,6 +7610,11 @@
 	},
 /turf/simulated/floor/tiled,
 /area/rnd/hallway)
+"eBu" = (
+/obj/machinery/fire_alarm/north_mount,
+/obj/effect/floor_decal/rust,
+/turf/simulated/floor/plating,
+/area/maintenance/research)
 "eBA" = (
 /obj/effect/floor_decal/borderfloorblack{
 	dir = 8
@@ -7265,6 +7635,10 @@
 	},
 /turf/simulated/floor/wood,
 /area/tether/station/public_meeting_room)
+"eCi" = (
+/obj/effect/floor_decal/rust,
+/turf/simulated/floor/plating,
+/area/maintenance/fpmaint2)
 "eCw" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/structure/cable/green{
@@ -7298,11 +7672,14 @@
 /turf/simulated/floor/tiled,
 /area/rnd/anomaly_lab)
 "eDF" = (
+/obj/machinery/holoplant,
 /obj/effect/floor_decal/borderfloorwhite,
 /obj/effect/floor_decal/corner/green/border,
-/obj/machinery/holoplant,
-/obj/structure/disposalpipe/segment{
-	dir = 8
+/obj/effect/floor_decal/borderfloorwhite/corner2{
+	dir = 9
+	},
+/obj/effect/floor_decal/corner/green/bordercorner2{
+	dir = 9
 	},
 /turf/simulated/floor/tiled/white,
 /area/medical/virology_fore_access)
@@ -7321,9 +7698,23 @@
 "eEv" = (
 /turf/simulated/wall/prepainted/medical,
 /area/medical/surgery)
+"eEw" = (
+/obj/effect/floor_decal/spline/fancy{
+	dir = 8
+	},
+/obj/structure/bed/chair/bay/comfy/black,
+/obj/machinery/camera/network/civilian{
+	dir = 4
+	},
+/turf/simulated/floor/wood,
+/area/exploration/pilot_Office)
 "eEE" = (
 /turf/simulated/wall/prepainted,
 /area/maintenance/substation/medical_science)
+"eEN" = (
+/obj/effect/floor_decal/rust,
+/turf/simulated/floor/plating,
+/area/maintenance/research)
 "eEO" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/tiled/steel_grid,
@@ -7502,6 +7893,11 @@
 /obj/landmark/spawnpoint/job/scientist,
 /turf/simulated/floor/carpet/purcarpet,
 /area/rnd/breakroom)
+"eKl" = (
+/obj/fiftyspawner/steel,
+/obj/fiftyspawner/steel,
+/turf/simulated/floor/tiled/techmaint,
+/area/tether/surfacebase/shuttle_pad)
 "eKJ" = (
 /obj/machinery/door/firedoor/glass{
 	dir = 4
@@ -7666,6 +8062,9 @@
 /obj/structure/cable{
 	icon_state = "1-8"
 	},
+/obj/machinery/light/small{
+	dir = 4
+	},
 /turf/simulated/floor/plating,
 /area/endeavour/hallway/d2fwdmaint)
 "eRt" = (
@@ -7726,6 +8125,10 @@
 /obj/item/barrier_tape_segment/engineering,
 /turf/simulated/floor/tiled,
 /area/rnd/anomaly_lab)
+"eTf" = (
+/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks,
+/turf/simulated/floor/plating,
+/area/tether/surfacebase/shuttle_pad)
 "eTk" = (
 /obj/structure/cable/green{
 	icon_state = "4-8"
@@ -7960,6 +8363,9 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 8
 	},
+/obj/structure/disposalpipe/segment{
+	dir = 8
+	},
 /turf/simulated/floor/tiled/white,
 /area/medical/virology_fore_access)
 "eYX" = (
@@ -8083,6 +8489,12 @@
 	},
 /turf/simulated/floor/tiled,
 /area/rnd/xenobiology)
+"fcG" = (
+/obj/structure/bed/chair/comfy/blue{
+	dir = 4
+	},
+/turf/simulated/floor/plating,
+/area/maintenance/fpmaint2)
 "fcH" = (
 /obj/machinery/door/firedoor{
 	dir = 8
@@ -8383,6 +8795,23 @@
 /obj/effect/floor_decal/corner/paleblue/diagonal,
 /turf/simulated/floor/tiled/white,
 /area/medical/patient_d)
+"fnA" = (
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
+/obj/machinery/door/airlock/maintenance/common{
+	name = "Flight Ops Support"
+	},
+/obj/map_helper/access_helper/airlock/station/exploration/pilot,
+/obj/machinery/door/firedoor,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/techmaint,
+/area/tether/surfacebase/shuttle_pad)
 "fnS" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 10
@@ -8412,6 +8841,12 @@
 	},
 /turf/simulated/floor/tiled,
 /area/rnd/hallway)
+"fpp" = (
+/obj/machinery/atmospherics/component/unary/vent_scrubber/on{
+	dir = 1
+	},
+/turf/simulated/floor/tiled/techmaint,
+/area/tether/surfacebase/shuttle_pad)
 "fpq" = (
 /obj/effect/floor_decal/steeldecal/steel_decals_central7,
 /obj/structure/cable/green{
@@ -8574,6 +9009,12 @@
 /obj/machinery/fire_alarm/east_mount,
 /turf/simulated/floor/tiled/dark,
 /area/station/stairs_two)
+"fwk" = (
+/obj/structure/bed/chair/sofa/black/right{
+	dir = 1
+	},
+/turf/simulated/floor/plating,
+/area/maintenance/research)
 "fwo" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/glass,
@@ -8676,6 +9117,14 @@
 	},
 /turf/simulated/floor/tiled,
 /area/rnd/xenobiology)
+"fyu" = (
+/obj/machinery/door/firedoor{
+	dir = 1
+	},
+/obj/machinery/door/airlock/maintenance/common,
+/obj/machinery/door/firedoor,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d2aftmaint)
 "fzt" = (
 /obj/spawner/window/low_wall/reinforced/full,
 /obj/structure/disposalpipe/segment,
@@ -8706,6 +9155,11 @@
 	},
 /turf/simulated/floor/plating,
 /area/medical/patient_c)
+"fBl" = (
+/obj/machinery/door/airlock/maintenance/common,
+/obj/machinery/door/firedoor,
+/turf/simulated/floor/plating,
+/area/maintenance/research)
 "fBx" = (
 /obj/effect/floor_decal/spline/fancy/wood{
 	dir = 9
@@ -9149,6 +9603,9 @@
 /obj/structure/cable/green{
 	icon_state = "0-2"
 	},
+/obj/structure/railing{
+	dir = 4
+	},
 /turf/simulated/floor/plating,
 /area/endeavour/hallway/d2fwdmaint)
 "fNB" = (
@@ -9598,8 +10055,9 @@
 /area/tether/station/public_meeting_room)
 "fXo" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 10
+	dir = 9
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/tiled,
 /area/medical/virology_fore_access)
 "fYZ" = (
@@ -9651,6 +10109,10 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/medical/surgeryprep)
+"fZH" = (
+/obj/structure/catwalk,
+/turf/simulated/floor/plating,
+/area/maintenance/substation/research)
 "gao" = (
 /obj/machinery/light,
 /obj/structure/cable{
@@ -9683,6 +10145,10 @@
 /obj/structure/disposalpipe/segment,
 /turf/simulated/floor/tiled/white,
 /area/medical/surgeryprep)
+"gbg" = (
+/obj/machinery/door/airlock/maintenance/common,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d2aftmaint)
 "gbN" = (
 /obj/effect/floor_decal/borderfloorblack/corner{
 	dir = 4
@@ -9739,6 +10205,10 @@
 	},
 /turf/simulated/floor/tiled/steel_grid,
 /area/rnd/xenobiology)
+"gdh" = (
+/obj/structure/closet/emcloset,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d2fwdmaint)
 "gdj" = (
 /obj/machinery/camera/network/medbay{
 	dir = 8
@@ -9827,6 +10297,12 @@
 /obj/effect/floor_decal/corner/paleblue/border,
 /turf/simulated/floor/tiled/white,
 /area/medical/sleeper)
+"ggW" = (
+/obj/machinery/light/small{
+	dir = 4
+	},
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d2aftmaint)
 "ghc" = (
 /obj/machinery/camera/network/civilian,
 /turf/simulated/floor/tiled/dark,
@@ -9881,6 +10357,10 @@
 	},
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d2portamidhall)
+"gjf" = (
+/obj/structure/table/rack,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d2aftmaint)
 "gjp" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -9901,6 +10381,10 @@
 /obj/structure/cable/green{
 	icon_state = "1-2"
 	},
+/obj/structure/railing{
+	dir = 4
+	},
+/obj/structure/railing,
 /turf/simulated/floor/plating,
 /area/endeavour/hallway/d2fwdmaint)
 "gkX" = (
@@ -10114,6 +10598,12 @@
 /obj/effect/floor_decal/industrial/warning/corner,
 /turf/simulated/floor/reinforced,
 /area/rnd/testingroom)
+"gsr" = (
+/obj/machinery/light/small{
+	dir = 1
+	},
+/turf/simulated/floor/plating,
+/area/medical/virologymaint)
 "gsA" = (
 /obj/machinery/door/firedoor,
 /obj/structure/cable{
@@ -10275,6 +10765,12 @@
 "gwT" = (
 /turf/simulated/floor/tiled/white,
 /area/medical/chemistry)
+"gxk" = (
+/obj/structure/bed/chair/sofa/black/left{
+	dir = 1
+	},
+/turf/simulated/floor/plating,
+/area/maintenance/research)
 "gxR" = (
 /obj/structure/cable/orange{
 	icon_state = "1-2"
@@ -10324,6 +10820,19 @@
 	},
 /turf/simulated/floor/tiled,
 /area/rnd/hallway)
+"gzF" = (
+/obj/structure/table/woodentable,
+/obj/item/paper_bin,
+/obj/item/pen,
+/obj/machinery/light{
+	dir = 8
+	},
+/obj/machinery/atmospherics/component/unary/vent_pump/on,
+/obj/effect/floor_decal/spline/fancy{
+	dir = 8
+	},
+/turf/simulated/floor/wood,
+/area/exploration/pilot_Office)
 "gzO" = (
 /obj/machinery/light,
 /obj/structure/bed/roller,
@@ -10512,6 +11021,15 @@
 	},
 /turf/simulated/floor/wood,
 /area/tether/station/public_meeting_room)
+"gFn" = (
+/obj/machinery/air_alarm{
+	frequency = 1441;
+	pixel_y = 22
+	},
+/obj/item/clothing/head/hardhat/red,
+/obj/structure/table/rack,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d2fwdmaint)
 "gFG" = (
 /obj/machinery/atmospherics/component/unary/vent_scrubber/on{
 	dir = 1
@@ -10567,6 +11085,7 @@
 /obj/structure/cable/green{
 	icon_state = "4-8"
 	},
+/obj/machinery/holopad,
 /turf/simulated/floor/tiled,
 /area/medical/medbay_emt_bay)
 "gHf" = (
@@ -10792,6 +11311,10 @@
 /obj/structure/disposalpipe/segment,
 /turf/simulated/floor/tiled,
 /area/rnd/research/researchdivision)
+"gNW" = (
+/obj/structure/table/rack,
+/turf/simulated/floor/plating,
+/area/maintenance/fpmaint2)
 "gOT" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 10
@@ -10840,6 +11363,14 @@
 	},
 /turf/simulated/floor/tiled,
 /area/rnd/research/researchdivision)
+"gPJ" = (
+/obj/structure/cable/orange{
+	icon_state = "1-2"
+	},
+/obj/structure/catwalk,
+/obj/machinery/fire_alarm/west_mount,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d2aftmaint)
 "gPQ" = (
 /obj/machinery/atmospherics/pipe/simple/visible/yellow,
 /obj/machinery/door/firedoor,
@@ -10991,20 +11522,14 @@
 /obj/machinery/door/airlock/glass,
 /turf/simulated/floor/tiled/techfloor,
 /area/crew_quarters/cafeteria)
+"gTW" = (
+/obj/machinery/space_heater,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d2fwdmaint)
 "gUD" = (
-/obj/machinery/door/firedoor/glass{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/black{
-	dir = 4
-	},
-/obj/machinery/door/airlock/medical{
-	name = "Virology Labs";
-	req_one_access = null
-	},
-/obj/map_helper/access_helper/airlock/station/medical/department,
-/turf/simulated/floor/tiled/white,
-/area/medical/virology_fore_access)
+/obj/random/trash_pile,
+/turf/simulated/floor/plating,
+/area/maintenance/research)
 "gUZ" = (
 /obj/effect/floor_decal/borderfloorblack,
 /obj/effect/floor_decal/corner/navblue/border,
@@ -11161,6 +11686,13 @@
 /obj/machinery/atmospherics/component/unary/vent_pump/on,
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d2portamidhall)
+"hbR" = (
+/obj/machinery/ion_engine,
+/obj/machinery/light/small{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/techmaint,
+/area/tether/surfacebase/shuttle_pad)
 "hbZ" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 9
@@ -11246,11 +11778,6 @@
 	},
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d1starboardamidhall)
-"hff" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/turf/simulated/floor/tiled,
-/area/medical/virology_fore_access)
 "hfm" = (
 /obj/structure/catwalk,
 /obj/structure/cable/green{
@@ -11299,6 +11826,12 @@
 /obj/structure/filingcabinet/chestdrawer,
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/medical/reception)
+"hhg" = (
+/obj/structure/closet,
+/obj/random/maintenance/clean,
+/obj/random/maintenance/engineering,
+/turf/simulated/floor/plating,
+/area/rnd/research/researchdivision)
 "hhp" = (
 /obj/spawner/window/low_wall/reinforced/full/firelocks,
 /obj/effect/paint/babyblue,
@@ -11381,6 +11914,7 @@
 /area/rnd/rdoffice)
 "hjM" = (
 /obj/fiftyspawner/steel,
+/obj/structure/table/rack,
 /turf/simulated/floor/plating,
 /area/maintenance/medbay/aft)
 "hjR" = (
@@ -11697,6 +12231,10 @@
 	},
 /turf/simulated/floor/wood,
 /area/crew_quarters/medbreak)
+"how" = (
+/obj/structure/poster/preset/baystation/bay_9,
+/turf/simulated/wall/r_wall/prepainted,
+/area/maintenance/fpmaint2)
 "hoX" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -11732,6 +12270,14 @@
 	},
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d1starboardamidhall)
+"hpD" = (
+/obj/structure/bed/chair/sofa/black/left,
+/obj/machinery/air_alarm{
+	frequency = 1441;
+	pixel_y = 22
+	},
+/turf/simulated/floor/plating,
+/area/maintenance/research)
 "hpE" = (
 /obj/machinery/atmospherics/pipe/simple/visible/purple{
 	dir = 8
@@ -12319,6 +12865,20 @@
 	},
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d2portamidhall)
+"hGE" = (
+/obj/structure/railing{
+	dir = 1
+	},
+/obj/structure/closet,
+/obj/random/maintenance/clean,
+/obj/random/maintenance/clean,
+/obj/random/maintenance,
+/obj/structure/railing{
+	dir = 8
+	},
+/obj/machinery/light/small,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d2fwdmaint)
 "hGF" = (
 /obj/effect/floor_decal/borderfloorblack/corner{
 	dir = 4
@@ -12363,6 +12923,10 @@
 /obj/structure/catwalk,
 /turf/simulated/floor/plating,
 /area/endeavour/hallway/d2aftmaint)
+"hJk" = (
+/obj/structure/closet/largecardboard,
+/turf/simulated/floor/tiled,
+/area/maintenance/research)
 "hJq" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
@@ -12419,6 +12983,12 @@
 /obj/effect/floor_decal/corner/navgold/border,
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d1starboardafthall)
+"hKY" = (
+/obj/structure/table/rack/shelf/steel,
+/obj/item/storage/toolbox/emergency,
+/obj/item/storage/toolbox/emergency,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d2fwdmaint)
 "hLb" = (
 /obj/structure/bed/chair/office/dark{
 	dir = 1
@@ -12436,6 +13006,11 @@
 /obj/structure/disposalpipe/segment,
 /turf/simulated/floor/tiled/white,
 /area/medical/chemistry)
+"hMj" = (
+/obj/structure/table/rack/shelf/steel,
+/obj/item/storage/briefcase/inflatable,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d2fwdmaint)
 "hMz" = (
 /obj/machinery/power/breakerbox{
 	RCon_tag = "MAIN - DECK 2 FORE"
@@ -12611,6 +13186,37 @@
 /obj/effect/floor_decal/corner/paleblue/border,
 /turf/simulated/floor/tiled/white,
 /area/medical/patient_wing)
+"hSn" = (
+/obj/item/reagent_containers/food/drinks/drinkingglass{
+	pixel_x = -5;
+	pixel_y = 10
+	},
+/obj/item/reagent_containers/food/drinks/drinkingglass{
+	pixel_x = -5;
+	pixel_y = 5
+	},
+/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
+	pixel_x = 5;
+	pixel_y = 10
+	},
+/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
+	pixel_x = 5;
+	pixel_y = 4
+	},
+/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
+	pixel_x = 13;
+	pixel_y = 10
+	},
+/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
+	pixel_x = 13;
+	pixel_y = 4
+	},
+/obj/structure/table/wooden_reinforced,
+/obj/effect/floor_decal/spline/fancy/wood{
+	dir = 10
+	},
+/turf/simulated/floor/wood,
+/area/tether/surfacebase/shuttle_pad)
 "hSv" = (
 /obj/item/storage/firstaid/surgery,
 /obj/item/robotanalyzer,
@@ -12678,6 +13284,12 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/medical/reception)
+"hVC" = (
+/obj/structure/closet,
+/obj/random/maintenance/engineering,
+/obj/random/maintenance/clean,
+/turf/simulated/floor/plating,
+/area/maintenance/research)
 "hVK" = (
 /obj/machinery/door/airlock{
 	name = "Restroom"
@@ -12695,6 +13307,13 @@
 	},
 /turf/simulated/floor/tiled,
 /area/medical/virology)
+"hWn" = (
+/obj/structure/table/steel,
+/obj/random/maintenance,
+/obj/random/maintenance,
+/obj/random/maintenance/cargo,
+/turf/simulated/floor/plating,
+/area/maintenance/research)
 "hXy" = (
 /obj/effect/floor_decal/borderfloorwhite,
 /obj/effect/floor_decal/corner/paleblue/border,
@@ -12798,6 +13417,10 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/tiled/techfloor,
 /area/assembly/robotics)
+"icg" = (
+/obj/structure/loot_pile/maint/technical,
+/turf/simulated/floor/plating,
+/area/maintenance/research)
 "icA" = (
 /obj/item/radio/beacon/anchored,
 /turf/simulated/floor/wood/sif/indoors,
@@ -13004,6 +13627,11 @@
 	},
 /turf/simulated/floor/grass/indoors,
 /area/tether/station/public_meeting_room)
+"ihO" = (
+/obj/structure/table/rack,
+/obj/item/clothing/head/hardhat/red,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d2aftmaint)
 "iiq" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
@@ -13270,6 +13898,10 @@
 /obj/machinery/portable_atmospherics/canister/air,
 /turf/simulated/floor/plating,
 /area/maintenance/medbay/aft)
+"iqF" = (
+/obj/machinery/fire_alarm/east_mount,
+/turf/simulated/floor/plating,
+/area/maintenance/fpmaint2)
 "irg" = (
 /obj/machinery/light_switch{
 	pixel_x = -26;
@@ -13360,6 +13992,20 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/medical/surgeryobs)
+"iur" = (
+/obj/machinery/power/apc/east_mount,
+/obj/structure/cable/green{
+	icon_state = "0-8"
+	},
+/obj/structure/closet/secure_closet/pilot,
+/obj/effect/floor_decal/spline/fancy/wood/cee{
+	dir = 4
+	},
+/obj/machinery/atmospherics/component/unary/vent_scrubber/on{
+	dir = 8
+	},
+/turf/simulated/floor/wood,
+/area/tether/surfacebase/shuttle_pad)
 "iuJ" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -13416,6 +14062,11 @@
 	},
 /turf/simulated/floor/tiled,
 /area/rnd/anomaly_lab)
+"iwg" = (
+/obj/item/clothing/head/hardhat/red,
+/obj/structure/table/rack,
+/turf/simulated/floor/plating,
+/area/maintenance/medbay/aft)
 "iwJ" = (
 /obj/effect/floor_decal/borderfloorblack{
 	dir = 1
@@ -13623,6 +14274,23 @@
 	},
 /turf/simulated/floor/carpet/sblucarpet,
 /area/medical/psych/psych_1)
+"iAd" = (
+/obj/machinery/door/airlock/maintenance/common{
+	name = "Flight Ops Support"
+	},
+/obj/map_helper/access_helper/airlock/station/exploration/pilot,
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
+/obj/machinery/door/firedoor,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/techmaint,
+/area/tether/surfacebase/shuttle_pad)
 "iAl" = (
 /obj/structure/table/glass,
 /obj/machinery/door/window/westleft{
@@ -13715,6 +14383,10 @@
 	},
 /turf/simulated/floor/plating,
 /area/endeavour/hallway/d2fwdmaint)
+"iDS" = (
+/obj/machinery/fire_alarm/north_mount,
+/turf/simulated/floor/airless/ceiling,
+/area/maintenance/research)
 "iEr" = (
 /obj/effect/floor_decal/corner/green{
 	dir = 5
@@ -13731,15 +14403,18 @@
 /turf/simulated/floor/tiled/white,
 /area/medical/morgue)
 "iET" = (
-/obj/effect/floor_decal/corner/green{
-	dir = 10
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/structure/disposalpipe/segment,
 /obj/structure/cable/green{
 	icon_state = "1-2"
 	},
+/obj/effect/floor_decal/borderfloorwhite{
+	dir = 4
+	},
+/obj/effect/floor_decal/corner/green/border{
+	dir = 4
+	},
 /turf/simulated/floor/tiled/white,
 /area/medical/virology_fore_access)
 "iFi" = (
@@ -13788,6 +14463,11 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/medical/surgeryprep)
+"iGp" = (
+/obj/item/clothing/head/hardhat/red,
+/obj/structure/table/rack,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d2fwdmaint)
 "iGC" = (
 /turf/simulated/floor/wood/sif/indoors,
 /area/medical/reception)
@@ -13828,7 +14508,6 @@
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d1starboardamidhall)
 "iIb" = (
-/mob/living/simple_mob/animal/passive/cat/runtime,
 /obj/effect/floor_decal/borderfloor{
 	dir = 1
 	},
@@ -13930,6 +14609,10 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/shuttle/emt/general)
+"iLr" = (
+/obj/structure/table/glass,
+/turf/simulated/floor/plating,
+/area/rnd/research/researchdivision)
 "iMe" = (
 /obj/machinery/portable_atmospherics/hydroponics,
 /obj/machinery/atmospherics/portables_connector,
@@ -14123,10 +14806,7 @@
 /area/rnd/breakroom)
 "iTB" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 5
+	dir = 9
 	},
 /turf/simulated/floor/tiled,
 /area/medical/virology_fore_access)
@@ -14180,6 +14860,10 @@
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
 /turf/simulated/floor/tiled,
 /area/medical/virology_aft_access)
+"iVM" = (
+/obj/effect/floor_decal/spline/fancy/wood/corner,
+/turf/simulated/floor/wood,
+/area/tether/surfacebase/shuttle_pad)
 "iVW" = (
 /obj/structure/table/reinforced,
 /obj/item/storage/box/donkpockets,
@@ -14223,6 +14907,11 @@
 	},
 /turf/simulated/floor/tiled,
 /area/rnd/rdoffice)
+"iXg" = (
+/obj/effect/floor_decal/rust,
+/obj/machinery/fire_alarm/north_mount,
+/turf/simulated/floor/plating,
+/area/maintenance/research)
 "iXx" = (
 /turf/simulated/floor/reinforced,
 /area/rnd/testingroom)
@@ -14245,6 +14934,11 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/crew_quarters/heads/cmo)
+"iYl" = (
+/obj/random/maintenance/security,
+/obj/structure/closet/crate,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d2fwdmaint)
 "iYO" = (
 /obj/effect/floor_decal/borderfloor{
 	dir = 1
@@ -14482,6 +15176,9 @@
 	},
 /turf/simulated/floor/tiled,
 /area/rnd/xenobiology/xenoflora)
+"jhB" = (
+/turf/simulated/wall/prepainted/medical,
+/area/hallway/station/docks)
 "jhM" = (
 /obj/spawner/window/low_wall/reinforced/full/firelocks,
 /obj/effect/paint/babyblue,
@@ -14493,6 +15190,16 @@
 	},
 /turf/simulated/floor/plating,
 /area/medical/virology)
+"jii" = (
+/obj/structure/catwalk,
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
+/obj/machinery/light/small{
+	dir = 4
+	},
+/turf/simulated/floor/plating,
+/area/maintenance/research)
 "jin" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -14523,6 +15230,11 @@
 	},
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d2afthall)
+"jjR" = (
+/obj/structure/table/rack,
+/obj/random/maintenance/clean,
+/turf/simulated/floor/plating,
+/area/maintenance/research)
 "jkz" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -14711,6 +15423,16 @@
 	},
 /turf/simulated/floor/plating,
 /area/medical/chemistry)
+"jqP" = (
+/obj/machinery/air_alarm{
+	dir = 8;
+	pixel_x = 25
+	},
+/obj/machinery/light/small{
+	dir = 4
+	},
+/turf/simulated/floor/plating,
+/area/maintenance/research)
 "jrk" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -14773,6 +15495,16 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/medical/virology_aft_access)
+"jsJ" = (
+/obj/effect/floor_decal/rust,
+/obj/structure/railing{
+	dir = 4
+	},
+/obj/machinery/light/small{
+	dir = 1
+	},
+/turf/simulated/floor/plating,
+/area/maintenance/research)
 "jsK" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
@@ -15007,12 +15739,12 @@
 /obj/effect/floor_decal/corner/paleblue{
 	dir = 9
 	},
+/obj/structure/table/steel_reinforced,
+/obj/item/storage/firstaid/adv,
 /obj/item/storage/firstaid/adv{
 	pixel_x = 5;
 	pixel_y = 5
 	},
-/obj/item/storage/firstaid/adv,
-/obj/structure/table/steel_reinforced,
 /turf/simulated/floor/tiled/steel_ridged,
 /area/medical/medbay_emt_bay)
 "jzz" = (
@@ -15355,9 +16087,8 @@
 /turf/simulated/floor/tiled/white,
 /area/medical/patient_c)
 "jLs" = (
-/obj/machinery/holopad,
-/turf/simulated/floor/tiled,
-/area/medical/medbay_emt_bay)
+/turf/simulated/floor/tiled/techfloor,
+/area/maintenance/research)
 "jLE" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 8
@@ -15496,6 +16227,14 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/tiled,
 /area/assembly/robotics/surgery)
+"jQc" = (
+/obj/structure/cable/orange{
+	icon_state = "2-8"
+	},
+/obj/structure/catwalk,
+/obj/machinery/air_alarm/east_mount,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d2aftmaint)
 "jQD" = (
 /obj/structure/window/reinforced,
 /obj/machinery/disposal,
@@ -15620,6 +16359,10 @@
 /obj/machinery/media/jukebox,
 /turf/simulated/floor/wood/sif/indoors,
 /area/medical/reception)
+"jUR" = (
+/obj/structure/closet/crate/mimic/closet/safe,
+/turf/simulated/floor/plating,
+/area/maintenance/research)
 "jUZ" = (
 /turf/simulated/floor/wood,
 /area/endeavour/hallway/d2afthall)
@@ -15737,6 +16480,15 @@
 	},
 /turf/simulated/wall/r_wall/prepainted/medical,
 /area/shuttle/emt/general)
+"jYQ" = (
+/obj/structure/railing{
+	dir = 1
+	},
+/obj/structure/railing{
+	dir = 4
+	},
+/turf/simulated/floor/plating,
+/area/maintenance/fpmaint2)
 "jZz" = (
 /obj/machinery/mech_recharger,
 /turf/simulated/floor/tiled/dark,
@@ -15773,6 +16525,12 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/rnd/research/researchdivision)
+"jZT" = (
+/obj/structure/table/glass,
+/obj/item/surgical/scalpel,
+/obj/item/reagent_containers/syringe/drugs,
+/turf/simulated/floor/plating,
+/area/rnd/research/researchdivision)
 "jZX" = (
 /obj/machinery/light{
 	dir = 1
@@ -16009,6 +16767,11 @@
 	},
 /turf/simulated/floor/tiled/steel,
 /area/rnd/testingroom)
+"khm" = (
+/obj/machinery/door/airlock/maintenance/common,
+/obj/machinery/door/firedoor,
+/turf/simulated/floor/plating,
+/area/maintenance/fpmaint2)
 "khE" = (
 /obj/effect/floor_decal/borderfloorwhite,
 /obj/effect/floor_decal/corner/green/border,
@@ -16016,8 +16779,18 @@
 /obj/structure/disposalpipe/segment{
 	dir = 8
 	},
+/obj/structure/sign/biohazard{
+	pixel_y = -32
+	},
 /turf/simulated/floor/tiled/white,
 /area/medical/virology_fore_access)
+"khI" = (
+/obj/machinery/light/small{
+	dir = 8
+	},
+/obj/structure/closet/emcloset,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d2fwdmaint)
 "khL" = (
 /obj/effect/floor_decal/borderfloor{
 	dir = 6
@@ -16411,6 +17184,10 @@
 	},
 /turf/simulated/floor/tiled,
 /area/rnd/research_foyer)
+"kuV" = (
+/obj/random/trash_pile,
+/turf/simulated/floor/plating,
+/area/rnd/research/researchdivision)
 "kvb" = (
 /obj/machinery/atmospherics/component/unary/vent_scrubber/on{
 	dir = 1
@@ -16464,6 +17241,12 @@
 "kxi" = (
 /turf/simulated/wall/r_wall/prepainted/science,
 /area/rnd/anomaly_lab/containment_two)
+"kxs" = (
+/obj/structure/closet/crate,
+/obj/random/maintenance,
+/obj/random/maintenance,
+/turf/simulated/floor/plating,
+/area/maintenance/research)
 "kxG" = (
 /obj/machinery/air_alarm{
 	dir = 8;
@@ -16543,6 +17326,34 @@
 	},
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d2portforhall)
+"kBm" = (
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 9
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 9
+	},
+/obj/structure/closet/medical_wall{
+	pixel_x = 30
+	},
+/obj/effect/floor_decal/spline/fancy{
+	dir = 4
+	},
+/obj/item/storage/single_use/med_pouch/trauma,
+/obj/item/storage/single_use/med_pouch/radiation,
+/obj/item/storage/firstaid/regular,
+/obj/item/storage/firstaid/o2,
+/obj/item/storage/firstaid/fire,
+/obj/item/storage/firstaid/toxin,
+/obj/item/storage/single_use/med_pouch/toxin,
+/obj/item/storage/single_use/med_pouch/oxyloss,
+/obj/item/storage/single_use/med_pouch/overdose,
+/obj/item/storage/single_use/med_pouch/burn,
+/turf/simulated/floor/wood,
+/area/exploration/pilot_Office)
 "kBG" = (
 /obj/machinery/artifact_harvester,
 /obj/structure/window/reinforced{
@@ -16574,6 +17385,13 @@
 	},
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d2portamidhall)
+"kCh" = (
+/obj/structure/reagent_dispensers/fueltank,
+/obj/machinery/light/small{
+	dir = 8
+	},
+/turf/simulated/floor/tiled/techmaint,
+/area/tether/surfacebase/shuttle_pad)
 "kCt" = (
 /turf/simulated/wall/prepainted/science,
 /area/rnd/research/researchdivision)
@@ -16662,6 +17480,15 @@
 /obj/structure/catwalk,
 /turf/simulated/floor/plating,
 /area/endeavour/hallway/d2aftmaint)
+"kER" = (
+/obj/structure/catwalk,
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
+/obj/machinery/door/airlock/maintenance/common,
+/obj/machinery/door/firedoor,
+/turf/simulated/floor/plating,
+/area/maintenance/research)
 "kFN" = (
 /obj/structure/cable/orange{
 	icon_state = "4-8"
@@ -16752,6 +17579,10 @@
 	},
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d1starboardforhall)
+"kKk" = (
+/obj/machinery/atmospherics/component/unary/engine,
+/turf/simulated/floor/tiled/techmaint,
+/area/tether/surfacebase/shuttle_pad)
 "kKI" = (
 /obj/machinery/light{
 	dir = 8
@@ -16788,6 +17619,13 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/crew_quarters/medical_restroom)
+"kLp" = (
+/obj/structure/catwalk,
+/obj/machinery/light/small{
+	dir = 4
+	},
+/turf/simulated/floor/plating,
+/area/maintenance/research)
 "kMg" = (
 /obj/effect/floor_decal/borderfloorwhite/corner,
 /obj/effect/floor_decal/corner/beige/bordercorner,
@@ -16852,6 +17690,18 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/medical/medbay3)
+"kNG" = (
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/techmaint,
+/area/tether/surfacebase/shuttle_pad)
 "kNW" = (
 /obj/machinery/light{
 	dir = 1
@@ -16911,6 +17761,13 @@
 	},
 /turf/simulated/floor/tiled/techfloor,
 /area/endeavour/hallway/d2afthall)
+"kPA" = (
+/obj/machinery/door/airlock/maintenance/common{
+	name = "Flight Ops Support"
+	},
+/obj/map_helper/access_helper/airlock/station/exploration/pilot,
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/exploration/pilot_Office)
 "kPG" = (
 /obj/effect/floor_decal/borderfloorblack{
 	dir = 8
@@ -16956,6 +17813,12 @@
 "kQU" = (
 /turf/simulated/wall/r_wall/prepainted/science,
 /area/rnd/xenobiology/xenoflora_storage)
+"kRI" = (
+/obj/structure/table/rack/shelf,
+/obj/random/alcohol,
+/obj/random/tool,
+/turf/simulated/floor/plating,
+/area/maintenance/research)
 "kRS" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 9
@@ -16974,6 +17837,10 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/medical/medbay4)
+"kRX" = (
+/obj/machinery/fire_alarm/north_mount,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d2fwdmaint)
 "kSk" = (
 /obj/structure/cable/green{
 	icon_state = "1-2"
@@ -16989,11 +17856,10 @@
 /turf/simulated/floor/tiled,
 /area/tether/station/public_meeting_room)
 "kTq" = (
-/obj/machinery/atmospherics/component/unary/vent_pump/on{
-	dir = 4
-	},
-/turf/simulated/floor/tiled,
-/area/rnd/research/researchdivision)
+/obj/structure/closet,
+/obj/random/maintenance/clean,
+/turf/simulated/floor,
+/area/maintenance/research)
 "kTr" = (
 /obj/machinery/computer/crew{
 	dir = 4
@@ -17007,11 +17873,8 @@
 /turf/simulated/floor/tiled/white,
 /area/medical/medbay4)
 "kTz" = (
-/obj/structure/closet/secure_closet/medical3,
-/obj/item/storage/belt/medical,
-/obj/item/soap/nanotrasen,
-/obj/effect/floor_decal/industrial/outline/blue,
-/turf/simulated/floor/tiled/white,
+/obj/structure/catwalk,
+/turf/simulated/floor/plating,
 /area/medical/medbay_primary_storage)
 "kTB" = (
 /obj/effect/floor_decal/corner_techfloor_grid/full{
@@ -17245,6 +18108,19 @@
 	},
 /turf/simulated/floor/plating,
 /area/endeavour/hallway/d2aftmaint)
+"kYT" = (
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
+/obj/structure/cable/green{
+	icon_state = "2-4"
+	},
+/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+	dir = 8
+	},
+/turf/simulated/floor/tiled/techmaint,
+/area/tether/surfacebase/shuttle_pad)
 "kYY" = (
 /obj/structure/sink{
 	dir = 4;
@@ -17371,6 +18247,10 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/tether/station/public_meeting_room)
+"lbn" = (
+/obj/machinery/light/small,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d2fwdmaint)
 "lbt" = (
 /obj/machinery/door/firedoor{
 	dir = 1
@@ -17595,6 +18475,10 @@
 /obj/map_helper/access_helper/airlock/station/science/department,
 /turf/simulated/floor/tiled,
 /area/rnd/research/researchdivision)
+"ljm" = (
+/obj/item/handcuffs/cable,
+/turf/simulated/floor/plating,
+/area/rnd/research/researchdivision)
 "ljq" = (
 /obj/effect/floor_decal/borderfloorblack/corner{
 	dir = 4
@@ -17803,6 +18687,11 @@
 	},
 /turf/simulated/floor/tiled/techfloor,
 /area/crew_quarters/cafeteria)
+"lqV" = (
+/obj/effect/floor_decal/rust,
+/obj/machinery/fire_alarm/west_mount,
+/turf/simulated/floor/plating,
+/area/maintenance/research)
 "lrJ" = (
 /obj/machinery/door/firedoor/glass,
 /obj/machinery/door/airlock/voidcraft/vertical{
@@ -17880,6 +18769,19 @@
 	},
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d2portafthall)
+"ltG" = (
+/obj/structure/bed/chair/bay/comfy/black{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+	dir = 8
+	},
+/obj/landmark/spawnpoint/job/pilot,
+/turf/simulated/floor/wood,
+/area/exploration/pilot_Office)
 "ltM" = (
 /obj/machinery/door/firedoor,
 /obj/effect/floor_decal/borderfloorblack{
@@ -17957,6 +18859,17 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/tiled/white,
 /area/medical/sleeper)
+"luU" = (
+/obj/machinery/door/airlock/multi_tile{
+	name = "Spares Bay"
+	},
+/obj/machinery/door/firedoor/glass,
+/obj/map_helper/access_helper/airlock/station/exploration/pilot,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 6
+	},
+/turf/simulated/floor/plating,
+/area/tether/surfacebase/shuttle_pad)
 "lwb" = (
 /obj/machinery/disposal,
 /obj/structure/disposalpipe/trunk,
@@ -18061,6 +18974,14 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/medical/exam_room/exam_1)
+"lzN" = (
+/obj/machinery/light/small{
+	dir = 4
+	},
+/obj/item/clothing/head/hardhat/red,
+/obj/structure/table/rack,
+/turf/simulated/floor/plating,
+/area/maintenance/research)
 "lzQ" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/black{
 	dir = 4
@@ -18182,17 +19103,10 @@
 /turf/simulated/floor/tiled,
 /area/rnd/research_foyer)
 "lCS" = (
-/obj/machinery/light{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
-	dir = 1
-	},
-/turf/simulated/floor/tiled,
-/area/rnd/research/researchdivision)
+/obj/structure/catwalk,
+/obj/structure/catwalk,
+/turf/simulated/floor/plating,
+/area/maintenance/research)
 "lDf" = (
 /obj/machinery/air_alarm{
 	dir = 8;
@@ -18513,6 +19427,22 @@
 	},
 /turf/simulated/floor/tiled/techfloor,
 /area/assembly/robotics)
+"lQG" = (
+/obj/structure/closet,
+/obj/random/maintenance/engineering,
+/obj/random/maintenance/clean,
+/obj/random/maintenance/clean,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d2fwdmaint)
+"lQV" = (
+/obj/effect/floor_decal/spline/fancy{
+	dir = 10
+	},
+/obj/machinery/computer/ship/sensors/planet{
+	dir = 1
+	},
+/turf/simulated/floor/wood,
+/area/exploration/pilot_Office)
 "lRu" = (
 /obj/effect/floor_decal/corner/paleblue/diagonal,
 /turf/simulated/floor/tiled/white,
@@ -18649,6 +19579,19 @@
 /obj/machinery/atmospherics/component/unary/vent_scrubber/on,
 /turf/simulated/floor/tiled/white,
 /area/medical/medbay3)
+"lTS" = (
+/obj/structure/table/gamblingtable,
+/obj/item/toy/character/lich{
+	pixel_x = -5;
+	pixel_y = 10
+	},
+/obj/item/toy/character/voidone{
+	pixel_y = 9;
+	pixel_x = 12
+	},
+/obj/item/storage/pill_bottle/dice_nerd,
+/turf/simulated/floor/plating,
+/area/maintenance/fpmaint2)
 "lUe" = (
 /obj/machinery/light,
 /turf/simulated/floor/reinforced,
@@ -18701,13 +19644,11 @@
 /turf/simulated/floor/tiled/white,
 /area/medical/medbay3)
 "lYK" = (
-/obj/machinery/camera/network/medbay{
+/obj/machinery/atmospherics/component/unary/vent_pump/on{
 	dir = 8
 	},
-/obj/structure/closet/l3closet/virology,
-/obj/effect/floor_decal/industrial/outline/yellow,
-/turf/simulated/floor/tiled,
-/area/medical/virology_fore_access)
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/hallway/station/docks)
 "lYU" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -18727,6 +19668,15 @@
 	},
 /turf/simulated/floor/wood/sif/indoors,
 /area/medical/reception)
+"lZA" = (
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
+/obj/structure/catwalk,
+/obj/machinery/door/airlock/maintenance/common,
+/obj/machinery/door/firedoor,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d2aftmaint)
 "lZR" = (
 /obj/structure/catwalk,
 /obj/structure/cable{
@@ -18873,6 +19823,15 @@
 	},
 /turf/simulated/floor/wood,
 /area/medical/psych/psych_2)
+"mfH" = (
+/obj/effect/floor_decal/corner_techfloor_grid{
+	dir = 9
+	},
+/obj/effect/floor_decal/corner_techfloor_grid{
+	dir = 6
+	},
+/turf/simulated/floor/tiled/techfloor,
+/area/maintenance/research)
 "mgw" = (
 /obj/machinery/door/firedoor,
 /obj/structure/cable/green{
@@ -18941,6 +19900,16 @@
 	},
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d1starboardforhall)
+"miz" = (
+/obj/structure/cable/green{
+	icon_state = "1-8"
+	},
+/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/techmaint,
+/area/tether/surfacebase/shuttle_pad)
 "miA" = (
 /obj/machinery/air_alarm/monitor/isolation{
 	alarm_id = "isolation_one";
@@ -19026,10 +19995,10 @@
 /turf/simulated/shuttle/wall/voidcraft/blue,
 /area/endeavour/hallway/d1starboardforhall)
 "mnx" = (
-/obj/machinery/light{
+/obj/machinery/light/small{
 	dir = 1
 	},
-/turf/simulated/floor/tiled/white,
+/turf/simulated/floor/plating,
 /area/medical/medbay_primary_storage)
 "mnH" = (
 /obj/machinery/computer/arcade/clawmachine,
@@ -19097,6 +20066,15 @@
 	},
 /turf/simulated/floor/wood,
 /area/medical/psych/psych_1)
+"mpL" = (
+/obj/effect/floor_decal/spline/fancy/wood{
+	dir = 8
+	},
+/obj/machinery/light/small{
+	dir = 8
+	},
+/turf/simulated/floor/wood,
+/area/tether/surfacebase/shuttle_pad)
 "mpP" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/black{
 	dir = 5
@@ -19121,6 +20099,10 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/medical/surgeryprep)
+"mqi" = (
+/obj/structure/reagent_dispensers/fueltank,
+/turf/simulated/floor/plating,
+/area/maintenance/research)
 "mqr" = (
 /obj/machinery/door/firedoor,
 /obj/structure/disposalpipe/segment,
@@ -19314,6 +20296,21 @@
 /obj/machinery/portable_atmospherics/canister/carbon_dioxide,
 /turf/simulated/floor/tiled/monotile,
 /area/rnd/xenobiology/xenoflora/lab_atmos)
+"mwB" = (
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
+/obj/machinery/air_alarm{
+	pixel_y = 22
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/techmaint,
+/area/tether/surfacebase/shuttle_pad)
 "mwF" = (
 /obj/machinery/light{
 	dir = 4
@@ -19378,6 +20375,12 @@
 	},
 /turf/simulated/floor/tiled,
 /area/rnd/xenobiology/xenoflora)
+"myR" = (
+/obj/structure/railing{
+	dir = 4
+	},
+/turf/simulated/floor/plating,
+/area/maintenance/fpmaint2)
 "mza" = (
 /obj/machinery/atmospherics/component/unary/vent_scrubber/on{
 	dir = 8
@@ -19511,6 +20514,11 @@
 	},
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d2afthall)
+"mDj" = (
+/obj/machinery/air_alarm/east_mount,
+/obj/structure/table/rack,
+/turf/simulated/floor/plating,
+/area/maintenance/research)
 "mDp" = (
 /turf/space,
 /area/space)
@@ -19630,6 +20638,9 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 8
 	},
+/obj/structure/disposalpipe/segment{
+	dir = 8
+	},
 /turf/simulated/floor/tiled/white,
 /area/medical/virology_fore_access)
 "mGl" = (
@@ -19928,13 +20939,12 @@
 /turf/simulated/floor/tiled/techfloor,
 /area/crew_quarters/cafeteria)
 "mQh" = (
-/obj/machinery/light{
-	dir = 1
-	},
 /obj/structure/cable/green{
 	icon_state = "4-8"
 	},
 /obj/structure/catwalk,
+/obj/machinery/door/airlock/maintenance/common,
+/obj/machinery/door/firedoor,
 /turf/simulated/floor/plating,
 /area/maintenance/medbay/aft)
 "mQm" = (
@@ -20099,6 +21109,10 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/medical/medbay3)
+"mVo" = (
+/obj/random/trash_pile,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d2aftmaint)
 "mVt" = (
 /obj/machinery/door/airlock{
 	name = "Restroom"
@@ -20225,6 +21239,13 @@
 	},
 /turf/simulated/floor/tiled,
 /area/rnd/hallway)
+"naZ" = (
+/obj/machinery/light/small{
+	dir = 1
+	},
+/obj/structure/closet/emcloset,
+/turf/simulated/floor/tiled/techmaint,
+/area/tether/surfacebase/shuttle_pad)
 "nbe" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
@@ -20434,6 +21455,13 @@
 /obj/structure/closet/firecloset/full,
 /turf/simulated/floor/tiled,
 /area/rnd/xenobiology)
+"nfQ" = (
+/obj/random/cutout,
+/obj/machinery/light/small{
+	dir = 4
+	},
+/turf/simulated/floor/plating,
+/area/maintenance/fpmaint2)
 "nfS" = (
 /obj/machinery/door/firedoor/glass,
 /obj/map_helper/access_helper/airlock/station/medical/department,
@@ -20506,7 +21534,7 @@
 /area/crew_quarters/medbreak)
 "nhq" = (
 /turf/simulated/wall/r_wall/prepainted,
-/area/endeavour/hallway/d2fwdmaint)
+/area/tether/surfacebase/shuttle_pad)
 "nhX" = (
 /obj/effect/floor_decal/corner_techfloor_grid/full{
 	dir = 8
@@ -20627,6 +21655,10 @@
 	},
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d1starboardamidhall)
+"nod" = (
+/obj/random/maintenance/medical,
+/turf/simulated/floor/plating,
+/area/rnd/research/researchdivision)
 "nok" = (
 /obj/machinery/light{
 	dir = 8
@@ -20722,6 +21754,11 @@
 	},
 /turf/simulated/floor/tiled,
 /area/medical/medbay4)
+"ntI" = (
+/obj/structure/catwalk,
+/obj/effect/floor_decal/rust,
+/turf/simulated/floor/plating,
+/area/maintenance/research)
 "nuw" = (
 /obj/machinery/light/small{
 	dir = 1
@@ -20837,8 +21874,8 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
-	dir = 1
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 10
 	},
 /turf/simulated/floor/tiled,
 /area/rnd/research/researchdivision)
@@ -20851,6 +21888,12 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/medical/surgeryprep)
+"nwK" = (
+/obj/effect/floor_decal/spline/fancy{
+	dir = 1
+	},
+/turf/simulated/floor/wood,
+/area/exploration/pilot_Office)
 "nwT" = (
 /obj/machinery/door/firedoor{
 	dir = 1
@@ -20931,6 +21974,10 @@
 "nzx" = (
 /turf/simulated/open,
 /area/station/stairs_two)
+"nzA" = (
+/obj/machinery/fire_alarm/north_mount,
+/turf/simulated/floor/plating,
+/area/maintenance/medbay/aft)
 "nzW" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 6
@@ -20974,6 +22021,10 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d2portamidhall)
+"nAM" = (
+/obj/effect/floor_decal/rust,
+/turf/simulated/floor/tiled,
+/area/rnd/rdoffice)
 "nAQ" = (
 /obj/structure/table/bench/steel,
 /turf/simulated/floor/glass/reinforced,
@@ -21077,6 +22128,10 @@
 	},
 /turf/simulated/floor/tiled,
 /area/rnd/xenobiology/xenoflora/lab_atmos)
+"nCx" = (
+/obj/machinery/fire_alarm/north_mount,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d2aftmaint)
 "nCR" = (
 /obj/machinery/door/firedoor,
 /obj/structure/cable/orange{
@@ -21223,6 +22278,10 @@
 	},
 /turf/simulated/floor/tiled,
 /area/rnd/rdoffice)
+"nHX" = (
+/obj/machinery/floodlight,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d2fwdmaint)
 "nIk" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/effect/floor_decal/borderfloorblack/corner{
@@ -21245,6 +22304,11 @@
 	},
 /turf/simulated/floor/tiled,
 /area/rnd/hallway)
+"nJf" = (
+/obj/machinery/door/airlock/maintenance/common,
+/obj/machinery/door/firedoor,
+/turf/simulated/floor/plating,
+/area/maintenance/medbay/aft)
 "nJj" = (
 /obj/structure/closet/secure_closet/medical2,
 /obj/effect/floor_decal/corner/paleblue{
@@ -21486,6 +22550,10 @@
 	},
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d2fwdhall)
+"nNV" = (
+/obj/item/newspaper,
+/turf/simulated/floor,
+/area/maintenance/research)
 "nOm" = (
 /obj/structure/table/standard,
 /obj/item/storage/box/beakers{
@@ -21619,6 +22687,12 @@
 /obj/structure/disposalpipe/segment,
 /turf/simulated/floor/tiled/white,
 /area/medical/reception)
+"nRM" = (
+/obj/effect/floor_decal/spline/fancy{
+	dir = 8
+	},
+/turf/simulated/floor/wood,
+/area/exploration/pilot_Office)
 "nSz" = (
 /obj/machinery/chem_master,
 /obj/effect/floor_decal/borderfloor{
@@ -21802,7 +22876,10 @@
 /obj/structure/cable/green{
 	icon_state = "4-8"
 	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
+/obj/structure/cable/green{
+	icon_state = "2-4"
+	},
+/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d1starboardforhall)
 "oaQ" = (
@@ -21913,6 +22990,13 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/holodeck_control)
+"ofA" = (
+/obj/structure/catwalk,
+/obj/machinery/light/small{
+	dir = 4
+	},
+/turf/simulated/floor/plating,
+/area/maintenance/medbay/aft)
 "ofU" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -21981,6 +23065,11 @@
 	},
 /turf/simulated/floor/plating,
 /area/medical/virologymaint)
+"ohX" = (
+/obj/effect/floor_decal/rust,
+/obj/random/trash_pile,
+/turf/simulated/floor/plating,
+/area/maintenance/medbay/aft)
 "ojq" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -21991,6 +23080,10 @@
 /obj/machinery/fire_alarm/east_mount,
 /turf/simulated/floor/tiled/techfloor,
 /area/crew_quarters/cafeteria)
+"ojx" = (
+/obj/machinery/air_alarm/east_mount,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d2aftmaint)
 "ojL" = (
 /obj/structure/table/standard,
 /obj/item/storage/box/monkeycubes{
@@ -22025,6 +23118,10 @@
 /obj/structure/closet/l3closet/scientist/double,
 /turf/simulated/floor/tiled,
 /area/rnd/xenobiology/xenoflora)
+"oko" = (
+/obj/structure/poster/preset/baystation/bay_47,
+/turf/simulated/wall/r_wall/prepainted,
+/area/maintenance/fpmaint2)
 "okq" = (
 /obj/machinery/holopad,
 /turf/simulated/floor/tiled,
@@ -22097,10 +23194,10 @@
 /area/rnd/xenobiology/xenoflora)
 "okS" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
+	dir = 10
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 8
+/obj/machinery/light{
+	dir = 1
 	},
 /turf/simulated/floor/tiled,
 /area/rnd/research/researchdivision)
@@ -22117,6 +23214,16 @@
 /obj/machinery/door/airlock/maintenance/common,
 /turf/simulated/floor/plating,
 /area/rnd/research/researchdivision)
+"oli" = (
+/obj/machinery/light/small{
+	dir = 4
+	},
+/obj/structure/closet/secure_closet/pilot,
+/obj/effect/floor_decal/spline/fancy/wood{
+	dir = 6
+	},
+/turf/simulated/floor/wood,
+/area/tether/surfacebase/shuttle_pad)
 "olB" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -22160,6 +23267,9 @@
 	},
 /turf/simulated/floor/wood,
 /area/medical/medbay4)
+"omO" = (
+/turf/simulated/floor/wood,
+/area/exploration/pilot_Office)
 "omZ" = (
 /obj/structure/disposalpipe/segment{
 	dir = 1
@@ -22191,6 +23301,11 @@
 	},
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d1starboardamidhall)
+"onF" = (
+/obj/fiftyspawner/phoronrglass,
+/obj/machinery/light/small,
+/turf/simulated/floor/tiled/techmaint,
+/area/tether/surfacebase/shuttle_pad)
 "onN" = (
 /obj/effect/floor_decal/borderfloor{
 	dir = 1
@@ -22462,6 +23577,25 @@
 	},
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d1starboardamidhall)
+"ozJ" = (
+/obj/structure/railing{
+	dir = 8
+	},
+/obj/structure/railing,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d2fwdmaint)
+"ozQ" = (
+/obj/machinery/fire_alarm/east_mount,
+/obj/effect/floor_decal/spline/fancy{
+	dir = 4
+	},
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/turf/simulated/floor/wood,
+/area/exploration/pilot_Office)
 "ozS" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -22516,6 +23650,13 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/medical/patient_wing)
+"oBH" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 5
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/hallway/station/docks)
 "oBJ" = (
 /obj/effect/floor_decal/corner_techfloor_grid{
 	dir = 10
@@ -22996,6 +24137,17 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/medical/virology)
+"oOJ" = (
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
+/obj/structure/catwalk,
+/obj/machinery/air_alarm{
+	frequency = 1441;
+	pixel_y = 22
+	},
+/turf/simulated/floor/plating,
+/area/maintenance/medbay/aft)
 "oOO" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 9
@@ -23008,6 +24160,10 @@
 /obj/effect/floor_decal/spline/fancy/wood,
 /turf/simulated/floor/wood,
 /area/rnd/breakroom)
+"oOZ" = (
+/obj/structure/reagent_dispensers/watertank,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d2fwdmaint)
 "oPc" = (
 /obj/effect/floor_decal/borderfloor,
 /obj/effect/floor_decal/corner/mauve/border,
@@ -23020,6 +24176,12 @@
 	},
 /turf/simulated/floor/tiled,
 /area/rnd/hallway)
+"oPM" = (
+/obj/structure/railing{
+	dir = 8
+	},
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d2fwdmaint)
 "oQx" = (
 /obj/structure/closet/hydrant{
 	pixel_x = -32
@@ -23141,6 +24303,16 @@
 /obj/machinery/portable_atmospherics/canister/nitrogen,
 /turf/simulated/floor/tiled/monotile,
 /area/rnd/xenobiology/xenoflora/lab_atmos)
+"oSZ" = (
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
+/obj/structure/catwalk,
+/obj/machinery/light/small{
+	dir = 1
+	},
+/turf/simulated/floor/plating,
+/area/maintenance/medbay/aft)
 "oTe" = (
 /obj/machinery/atmospherics/component/unary/vent_pump/on{
 	dir = 8
@@ -23606,6 +24778,13 @@
 /obj/map_helper/access_helper/airlock/station/medical/department,
 /turf/simulated/floor/tiled/white,
 /area/shuttle/emt/general)
+"peZ" = (
+/obj/structure/catwalk,
+/obj/machinery/fire_alarm/south_mount{
+	pixel_y = -24
+	},
+/turf/simulated/floor/plating,
+/area/medical/medbay_primary_storage)
 "pfe" = (
 /obj/structure/railing,
 /obj/structure/railing{
@@ -23798,6 +24977,9 @@
 /obj/structure/table/steel_reinforced,
 /turf/simulated/floor/tiled,
 /area/medical/medbay_emt_bay)
+"pix" = (
+/turf/simulated/wall/r_wall/prepainted/medical,
+/area/exploration/pilot_Office)
 "piH" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -23813,6 +24995,12 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/medical/surgeryprep)
+"piI" = (
+/obj/structure/bed/chair/comfy/blue{
+	dir = 8
+	},
+/turf/simulated/floor/plating,
+/area/maintenance/fpmaint2)
 "piJ" = (
 /obj/structure/cable/green{
 	icon_state = "1-4"
@@ -23850,6 +25038,13 @@
 /obj/effect/floor_decal/industrial/outline/blue,
 /turf/simulated/floor/tiled/dark,
 /area/endeavour/hallway/d2portamidhall)
+"pkp" = (
+/obj/machinery/light/small{
+	dir = 4
+	},
+/obj/machinery/air_alarm/east_mount,
+/turf/simulated/floor/plating,
+/area/maintenance/medbay/aft)
 "pky" = (
 /obj/machinery/door/firedoor/glass,
 /obj/effect/floor_decal/borderfloor{
@@ -23905,6 +25100,18 @@
 	},
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d2fwdhall)
+"pmu" = (
+/obj/machinery/holopad,
+/obj/effect/floor_decal/spline/fancy{
+	dir = 4
+	},
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/turf/simulated/floor/wood,
+/area/exploration/pilot_Office)
 "pmG" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
@@ -23996,6 +25203,13 @@
 	},
 /turf/simulated/floor/tiled/steel,
 /area/rnd/chemistry_lab)
+"ppr" = (
+/obj/structure/catwalk,
+/obj/machinery/light/small{
+	dir = 1
+	},
+/turf/simulated/floor/airless/ceiling,
+/area/endeavour/hallway/d2aftmaint)
 "pps" = (
 /obj/machinery/computer/guestpass{
 	dir = 4;
@@ -24057,6 +25271,12 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/rnd/chemistry_lab)
+"ppH" = (
+/obj/landmark{
+	name = "maint_pred"
+	},
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d2fwdmaint)
 "ppR" = (
 /obj/machinery/camera/network/outside{
 	dir = 1
@@ -24148,15 +25368,24 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/medical/medbay4)
-"psO" = (
-/obj/effect/floor_decal/corner/paleblue{
-	dir = 9
+"psn" = (
+/obj/machinery/light/small{
+	dir = 8
 	},
+/obj/structure/table/rack/shelf,
+/obj/random/tool,
+/obj/random/toolbox,
+/turf/simulated/floor/plating,
+/area/maintenance/research)
+"psO" = (
+/obj/machinery/vending/medical,
 /obj/effect/floor_decal/corner/paleblue{
 	dir = 6
 	},
 /obj/effect/floor_decal/industrial/outline/blue,
-/obj/machinery/vending/medical,
+/obj/effect/floor_decal/corner/paleblue{
+	dir = 9
+	},
 /turf/simulated/floor/tiled/steel_ridged,
 /area/medical/medbay_emt_bay)
 "pta" = (
@@ -24302,6 +25531,19 @@
 	},
 /turf/simulated/wall/r_wall/prepainted/medical,
 /area/medical/virology_aft_access)
+"pyb" = (
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
+/obj/effect/floor_decal/spline/fancy/wood{
+	dir = 1
+	},
+/obj/effect/floor_decal/spline/fancy/wood/corner,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/turf/simulated/floor/wood,
+/area/tether/surfacebase/shuttle_pad)
 "pyk" = (
 /obj/structure/cable{
 	icon_state = "1-8"
@@ -24517,6 +25759,15 @@
 	},
 /turf/simulated/floor,
 /area/shuttle/emt/general)
+"pDi" = (
+/obj/structure/closet/crate,
+/obj/random/maintenance/engineering,
+/obj/random/maintenance,
+/obj/structure/railing{
+	dir = 8
+	},
+/turf/simulated/floor/plating,
+/area/maintenance/research)
 "pDl" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 9
@@ -25084,6 +26335,7 @@
 /area/maintenance/medbay/aft)
 "pTX" = (
 /obj/machinery/portable_atmospherics/powered/scrubber,
+/obj/machinery/fire_alarm/east_mount,
 /turf/simulated/floor/plating,
 /area/maintenance/medbay/aft)
 "pUb" = (
@@ -25511,6 +26763,15 @@
 	},
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d2fwdhall)
+"qbw" = (
+/obj/effect/floor_decal/spline/fancy{
+	dir = 5
+	},
+/obj/machinery/light{
+	dir = 4
+	},
+/turf/simulated/floor/wood,
+/area/exploration/pilot_Office)
 "qbE" = (
 /obj/machinery/door/firedoor,
 /turf/simulated/floor/tiled,
@@ -25941,21 +27202,11 @@
 /turf/simulated/floor/tiled/white,
 /area/medical/virology)
 "qrO" = (
-/obj/machinery/air_alarm{
-	dir = 8;
-	pixel_x = 25
-	},
-/obj/machinery/light{
-	dir = 4
-	},
-/obj/effect/floor_decal/borderfloorwhite{
-	dir = 4
-	},
-/obj/effect/floor_decal/corner/green/border{
-	dir = 4
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 5
 	},
-/turf/simulated/floor/tiled/white,
-/area/medical/virology_fore_access)
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/hallway/station/docks)
 "qsB" = (
 /obj/structure/cable/green{
 	icon_state = "4-8"
@@ -26130,6 +27381,10 @@
 /obj/effect/paint/babyblue,
 /turf/simulated/floor/plating,
 /area/medical/surgeryprep)
+"qxd" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/turf/simulated/floor/tiled/techmaint,
+/area/tether/surfacebase/shuttle_pad)
 "qxs" = (
 /obj/structure/cable/green{
 	icon_state = "4-8"
@@ -26238,6 +27493,12 @@
 /obj/map_helper/access_helper/airlock/station/science/department,
 /turf/simulated/floor/tiled/steel,
 /area/rnd/testingroom)
+"qzK" = (
+/obj/structure/closet/crate,
+/obj/random/tool,
+/obj/random/tool,
+/turf/simulated/floor/tiled,
+/area/maintenance/research)
 "qzR" = (
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply,
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
@@ -26353,6 +27614,8 @@
 	tag_interior_door = "virology_airlock_fore_interior";
 	pixel_y = -24
 	},
+/obj/effect/floor_decal/industrial/outline/yellow,
+/obj/structure/closet/l3closet/virology,
 /turf/simulated/floor/tiled,
 /area/medical/virology_fore_access)
 "qDK" = (
@@ -26374,6 +27637,12 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/medical/medbay4)
+"qDU" = (
+/obj/structure/table/rack,
+/obj/random/maintenance/engineering,
+/obj/random/maintenance/engineering,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d2fwdmaint)
 "qDX" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 6
@@ -26458,12 +27727,12 @@
 /turf/simulated/floor/wood,
 /area/medical/medbay4)
 "qFD" = (
-/obj/structure/closet/secure_closet/medical3,
-/obj/item/storage/belt/medical,
-/obj/item/soap/nanotrasen,
-/obj/effect/floor_decal/industrial/outline/blue,
 /obj/structure/window/reinforced/tinted,
-/turf/simulated/floor/tiled/white,
+/obj/machinery/shower{
+	dir = 8
+	},
+/obj/structure/curtain/open/shower/medical,
+/turf/simulated/floor/tiled/techfloor/grid,
 /area/medical/medbay_primary_storage)
 "qFO" = (
 /obj/machinery/atmospherics/component/unary/vent_pump/on{
@@ -26566,6 +27835,12 @@
 "qIV" = (
 /turf/simulated/wall/prepainted,
 /area/endeavour/hallway/d2portafthall)
+"qIW" = (
+/obj/machinery/light/small{
+	dir = 4
+	},
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d2fwdmaint)
 "qJz" = (
 /turf/simulated/wall/r_wall/prepainted/medical,
 /area/medical/sleeper)
@@ -26647,14 +27922,11 @@
 /turf/simulated/floor/tiled/white,
 /area/shuttle/emt/cockpit)
 "qLf" = (
-/obj/effect/floor_decal/borderfloorwhite{
-	dir = 4
-	},
-/obj/effect/floor_decal/corner/green/border{
-	dir = 4
+/obj/structure/railing{
+	dir = 1
 	},
-/turf/simulated/floor/tiled/white,
-/area/medical/virology_fore_access)
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d2fwdmaint)
 "qLp" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -26698,6 +27970,10 @@
 	},
 /turf/simulated/floor/plating,
 /area/endeavour/hallway/d2fwdmaint)
+"qLF" = (
+/obj/structure/table/rack,
+/turf/simulated/floor/plating,
+/area/maintenance/research)
 "qLY" = (
 /obj/effect/floor_decal/corner/green,
 /turf/simulated/floor/tiled/white,
@@ -26923,11 +28199,20 @@
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d1starboardforhall)
 "qUP" = (
-/obj/machinery/light/small{
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
+/obj/effect/floor_decal/spline/fancy/wood{
+	dir = 9
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
-/turf/simulated/floor/plating,
-/area/endeavour/hallway/d2fwdmaint)
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/turf/simulated/floor/wood,
+/area/tether/surfacebase/shuttle_pad)
 "qVs" = (
 /obj/structure/curtain/medical,
 /obj/structure/cable/green{
@@ -26947,6 +28232,10 @@
 	},
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d2afthall)
+"qWb" = (
+/obj/machinery/floodlight,
+/turf/simulated/floor/plating,
+/area/rnd/research/researchdivision)
 "qWY" = (
 /obj/effect/floor_decal/borderfloorblack{
 	dir = 1
@@ -27092,10 +28381,8 @@
 /turf/simulated/floor/tiled/techfloor,
 /area/assembly/robotics)
 "qZb" = (
-/obj/machinery/atmospherics/component/unary/vent_scrubber/on{
-	dir = 4
-	},
-/turf/simulated/floor/tiled,
+/obj/item/material/shard,
+/turf/simulated/floor/plating,
 /area/rnd/research/researchdivision)
 "qZA" = (
 /obj/effect/paint/babyblue,
@@ -27248,6 +28535,12 @@
 /obj/map_helper/access_helper/airlock/station/science/xenoarcheology,
 /turf/simulated/floor/tiled,
 /area/rnd/anomaly_lab/containment_two)
+"rdi" = (
+/obj/machinery/fire_alarm/west_mount{
+	pixel_x = -24
+	},
+/turf/simulated/floor/tiled/techmaint,
+/area/tether/surfacebase/shuttle_pad)
 "rdl" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -27433,12 +28726,39 @@
 	},
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d2fwdhall)
+"rif" = (
+/obj/structure/table/steel,
+/obj/random/tech_supply,
+/obj/random/tool,
+/turf/simulated/floor/tiled/techmaint,
+/area/tether/surfacebase/shuttle_pad)
 "rig" = (
 /obj/machinery/atmospherics/pipe/manifold/hidden/black{
 	dir = 4
 	},
 /turf/simulated/floor/tiled/white,
 /area/medical/virology)
+"riq" = (
+/obj/machinery/atmospherics/component/unary/vent_scrubber/on{
+	dir = 8
+	},
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/hallway/station/docks)
+"rjm" = (
+/obj/effect/floor_decal/spline/fancy{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 6
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 6
+	},
+/obj/structure/cable/green{
+	icon_state = "2-4"
+	},
+/turf/simulated/floor/wood,
+/area/exploration/pilot_Office)
 "rjy" = (
 /obj/item/clothing/gloves/boxing,
 /obj/item/clothing/gloves/boxing/yellow{
@@ -27725,12 +29045,11 @@
 /turf/simulated/wall/prepainted,
 /area/teleporter/departing)
 "ruq" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 9
+/obj/effect/floor_decal/corner_techfloor_grid{
+	dir = 5
 	},
-/turf/simulated/floor/tiled,
-/area/rnd/research/researchdivision)
+/turf/simulated/floor/tiled/techfloor,
+/area/maintenance/research)
 "rut" = (
 /obj/effect/floor_decal/corner/paleblue/full{
 	dir = 4
@@ -27909,6 +29228,10 @@
 /area/tether/station/public_meeting_room)
 "ryO" = (
 /obj/machinery/light,
+/obj/structure/closet/secure_closet/medical3,
+/obj/item/soap/nanotrasen,
+/obj/item/storage/belt/medical,
+/obj/effect/floor_decal/industrial/outline/blue,
 /turf/simulated/floor/tiled,
 /area/medical/medbay_primary_storage)
 "rzi" = (
@@ -27927,14 +29250,14 @@
 /obj/machinery/light_switch{
 	pixel_x = 25
 	},
-/obj/effect/floor_decal/industrial/outline/blue,
-/obj/machinery/recharge_station,
 /obj/effect/floor_decal/corner/paleblue{
-	dir = 6
+	dir = 9
 	},
 /obj/effect/floor_decal/corner/paleblue{
-	dir = 9
+	dir = 6
 	},
+/obj/effect/floor_decal/industrial/outline/blue,
+/obj/machinery/recharge_station,
 /turf/simulated/floor/tiled/steel_ridged,
 /area/medical/medbay_emt_bay)
 "rAk" = (
@@ -28014,6 +29337,13 @@
 /obj/effect/floor_decal/corner/paleblue/bordercorner,
 /turf/simulated/floor/tiled/white,
 /area/medical/surgeryprep)
+"rDQ" = (
+/obj/machinery/light/small{
+	dir = 1
+	},
+/obj/structure/catwalk,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d2aftmaint)
 "rEu" = (
 /obj/effect/floor_decal/corner/paleblue{
 	dir = 10
@@ -28052,6 +29382,12 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/medical/virology)
+"rFw" = (
+/obj/machinery/door/airlock/maintenance/common,
+/obj/map_helper/access_helper/airlock/station/medical/department,
+/obj/machinery/door/firedoor,
+/turf/simulated/floor/plating,
+/area/medical/medbay_primary_storage)
 "rFW" = (
 /obj/machinery/atmospherics/pipe/simple/visible{
 	dir = 4
@@ -28068,6 +29404,10 @@
 	},
 /turf/simulated/floor/tiled,
 /area/rnd/hallway)
+"rHP" = (
+/obj/spawner/window/borosillicate/reinforced/full/firelocks,
+/turf/simulated/floor/plating,
+/area/maintenance/fpmaint2)
 "rHQ" = (
 /obj/machinery/computer/centrifuge,
 /turf/simulated/floor/tiled,
@@ -28392,6 +29732,9 @@
 	},
 /turf/simulated/floor/tiled/techfloor,
 /area/medical/morgue)
+"rRr" = (
+/turf/simulated/floor,
+/area/maintenance/research)
 "rRw" = (
 /obj/structure/table/steel_reinforced,
 /obj/item/clothing/under/rank/medical/scrubs/black,
@@ -28425,6 +29768,12 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/medical/reception)
+"rTI" = (
+/obj/machinery/light/small{
+	dir = 8
+	},
+/turf/simulated/floor/plating,
+/area/rnd/research/researchdivision)
 "rTV" = (
 /obj/machinery/door/firedoor/glass{
 	dir = 4
@@ -28539,6 +29888,16 @@
 /obj/effect/floor_decal/corner/paleblue/diagonal,
 /turf/simulated/floor/tiled/white,
 /area/medical/patient_a)
+"rWl" = (
+/obj/machinery/light/small{
+	dir = 4
+	},
+/obj/machinery/air_alarm{
+	frequency = 1441;
+	pixel_y = 22
+	},
+/turf/simulated/floor/plating,
+/area/maintenance/research)
 "rWG" = (
 /obj/structure/toilet{
 	dir = 1
@@ -28602,6 +29961,11 @@
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/substation/medical_science)
+"rYl" = (
+/obj/machinery/holopad,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/turf/simulated/floor/wood,
+/area/tether/surfacebase/shuttle_pad)
 "rYp" = (
 /obj/structure/bed/roller,
 /obj/effect/floor_decal/borderfloorwhite{
@@ -28670,6 +30034,17 @@
 /obj/structure/disposalpipe/segment,
 /turf/simulated/floor/plating,
 /area/maintenance/substation/medical_science)
+"scw" = (
+/obj/structure/table/wooden_reinforced,
+/obj/item/storage/fancy/cigar/cohiba{
+	pixel_x = -3;
+	pixel_y = 5
+	},
+/obj/effect/floor_decal/spline/fancy/wood{
+	dir = 6
+	},
+/turf/simulated/floor/wood,
+/area/tether/surfacebase/shuttle_pad)
 "scE" = (
 /obj/structure/cable/green{
 	icon_state = "4-8"
@@ -28694,6 +30069,7 @@
 	icon_state = "0-4"
 	},
 /obj/structure/catwalk,
+/obj/machinery/door/airlock/maintenance/common,
 /turf/simulated/floor/plating,
 /area/endeavour/hallway/d2aftmaint)
 "scP" = (
@@ -28716,6 +30092,9 @@
 /obj/effect/paint/purplegray,
 /turf/simulated/floor/plating,
 /area/assembly/robotics)
+"scX" = (
+/turf/simulated/wall/r_wall/prepainted,
+/area/exploration/pilot_Office)
 "sdA" = (
 /obj/structure/table/reinforced,
 /obj/machinery/cell_charger,
@@ -28814,6 +30193,19 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/medical/sleeper)
+"shb" = (
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+	dir = 8
+	},
+/obj/machinery/air_alarm/west_mount,
+/obj/effect/floor_decal/spline/fancy{
+	dir = 8
+	},
+/obj/structure/bed/chair/bay/comfy/black{
+	dir = 1
+	},
+/turf/simulated/floor/wood,
+/area/exploration/pilot_Office)
 "she" = (
 /obj/effect/floor_decal/borderfloorwhite,
 /obj/effect/floor_decal/corner/lightorange/border,
@@ -28873,6 +30265,10 @@
 "sjz" = (
 /turf/simulated/wall/r_wall/prepainted/science,
 /area/rnd/xenobiology/xenoflora)
+"sjJ" = (
+/obj/item/clothing/glasses/sunglasses/blindfold/tape,
+/turf/simulated/floor/plating,
+/area/rnd/research/researchdivision)
 "sjN" = (
 /obj/machinery/computer/ship/engines,
 /obj/structure/sign/warning/nosmoking_1{
@@ -29102,12 +30498,25 @@
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/medical/patient_c)
 "sqh" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/structure/disposalpipe/segment{
 	dir = 8;
 	icon_state = "pipe-c"
 	},
+/obj/effect/floor_decal/borderfloorwhite{
+	dir = 6
+	},
+/obj/effect/floor_decal/corner/green/border{
+	dir = 6
+	},
+/obj/machinery/fire_alarm/east_mount,
+/obj/effect/floor_decal/borderfloorwhite/corner2,
+/obj/effect/floor_decal/corner/green/bordercorner2,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 9
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 9
+	},
 /turf/simulated/floor/tiled/white,
 /area/medical/virology_fore_access)
 "sqk" = (
@@ -29200,6 +30609,12 @@
 /obj/machinery/portable_atmospherics/canister/nitrogen,
 /turf/simulated/floor/tiled,
 /area/rnd/storage)
+"svm" = (
+/obj/structure/catwalk,
+/obj/machinery/door/airlock/maintenance/common,
+/obj/machinery/door/firedoor,
+/turf/simulated/floor/airless/ceiling,
+/area/maintenance/fpmaint2)
 "svr" = (
 /obj/effect/floor_decal/borderfloorwhite{
 	dir = 8
@@ -29218,6 +30633,14 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/medical/virology_aft_access)
+"svB" = (
+/obj/structure/catwalk,
+/obj/machinery/door/airlock/maintenance/common,
+/obj/machinery/door/firedoor{
+	dir = 1
+	},
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d2fwdmaint)
 "svR" = (
 /turf/simulated/wall/prepainted/science,
 /area/rnd/breakroom)
@@ -29294,6 +30717,13 @@
 /obj/structure/catwalk,
 /turf/simulated/floor/airless/ceiling,
 /area/endeavour/hallway/d2aftmaint)
+"szk" = (
+/obj/structure/closet/secure_closet/medical3,
+/obj/item/soap/nanotrasen,
+/obj/item/storage/belt/medical,
+/obj/effect/floor_decal/industrial/outline/blue,
+/turf/simulated/floor/tiled,
+/area/medical/medbay_primary_storage)
 "szz" = (
 /obj/structure/window/reinforced,
 /obj/structure/bed/chair{
@@ -29440,6 +30870,13 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/rnd/research/testingrange)
+"sFl" = (
+/obj/structure/bed/chair/sofa/black/right,
+/obj/machinery/light/small{
+	dir = 1
+	},
+/turf/simulated/floor/plating,
+/area/maintenance/research)
 "sFu" = (
 /obj/effect/paint/babyblue,
 /obj/structure/window/reinforced/polarized/full{
@@ -29486,6 +30923,13 @@
 	},
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d2portamidhall)
+"sFS" = (
+/obj/machinery/fire_alarm/west_mount{
+	pixel_x = -24
+	},
+/obj/structure/closet/firecloset,
+/turf/simulated/floor/tiled/techmaint,
+/area/tether/surfacebase/shuttle_pad)
 "sFY" = (
 /obj/effect/floor_decal/borderfloorblack{
 	dir = 8
@@ -29525,6 +30969,10 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/crew_quarters/medical_restroom)
+"sHf" = (
+/obj/machinery/fire_alarm/west_mount,
+/turf/simulated/floor/plating,
+/area/maintenance/substation/medical_science)
 "sHs" = (
 /obj/structure/cable/green{
 	icon_state = "4-8"
@@ -29794,6 +31242,16 @@
 /obj/structure/disposalpipe/segment,
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d2fwdhall)
+"sQG" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/structure/catwalk,
+/obj/machinery/light/small{
+	dir = 1
+	},
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d2aftmaint)
 "sQI" = (
 /obj/machinery/atmospherics/component/unary/vent_pump/on{
 	dir = 8
@@ -29856,6 +31314,22 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/medical/sleeper)
+"sTu" = (
+/obj/structure/table/gamblingtable,
+/obj/item/toy/character/wizard{
+	pixel_y = 6;
+	pixel_x = -7
+	},
+/obj/item/toy/character/warrior{
+	pixel_y = 6;
+	pixel_x = 9
+	},
+/obj/item/toy/character/thief,
+/obj/item/toy/character/cleric{
+	pixel_y = 14
+	},
+/turf/simulated/floor/plating,
+/area/maintenance/fpmaint2)
 "sTI" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/yellow{
 	dir = 10
@@ -29920,6 +31394,13 @@
 /obj/effect/floor_decal/industrial/outline/blue,
 /turf/simulated/floor/tiled/white,
 /area/medical/medbay3)
+"sVo" = (
+/obj/structure/railing{
+	dir = 1
+	},
+/obj/random/trash_pile,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d2fwdmaint)
 "sVt" = (
 /obj/machinery/smartfridge/drying_rack,
 /obj/machinery/camera/network/research{
@@ -29944,6 +31425,13 @@
 /obj/machinery/vending/snack,
 /turf/simulated/floor/wood,
 /area/crew_quarters/medbreak)
+"sVM" = (
+/obj/structure/table/rack/shelf/steel,
+/obj/random/maintenance/engineering,
+/obj/random/maintenance/cargo,
+/obj/random/maintenance/clean,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d2fwdmaint)
 "sVZ" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -29991,6 +31479,13 @@
 	},
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d2afthall)
+"sXw" = (
+/obj/machinery/light/small{
+	dir = 4
+	},
+/obj/effect/floor_decal/rust,
+/turf/simulated/floor/plating,
+/area/rnd/research/researchdivision)
 "sXx" = (
 /obj/machinery/door/firedoor/glass{
 	dir = 4
@@ -30055,6 +31550,10 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/medical/patient_wing)
+"sZg" = (
+/obj/structure/railing,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d2fwdmaint)
 "sZj" = (
 /turf/simulated/floor/wood,
 /area/tether/station/public_meeting_room)
@@ -30199,6 +31698,7 @@
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d1starboardamidhall)
 "teE" = (
+/obj/random/trash_pile,
 /turf/simulated/floor/airless/ceiling,
 /area/maintenance/fpmaint2)
 "teL" = (
@@ -30259,6 +31759,13 @@
 /obj/item/slime_extract/grey,
 /turf/simulated/floor/reinforced,
 /area/rnd/xenobiology)
+"tgP" = (
+/obj/effect/floor_decal/rust,
+/obj/machinery/light/small{
+	dir = 4
+	},
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d2fwdmaint)
 "thc" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/structure/cable/green{
@@ -30348,6 +31855,11 @@
 	},
 /turf/simulated/floor/tiled,
 /area/rnd/research/researchdivision)
+"tie" = (
+/obj/structure/table/steel,
+/obj/item/flame/candle,
+/turf/simulated/floor/plating,
+/area/maintenance/research)
 "tij" = (
 /obj/spawner/window/low_wall/reinforced/full/firelocks,
 /obj/effect/paint/purplegray,
@@ -30360,6 +31872,12 @@
 	},
 /turf/simulated/floor/carpet/sblucarpet,
 /area/medical/psych/psych_1)
+"tiW" = (
+/obj/structure/table/rack,
+/obj/random/maintenance/clean,
+/obj/random/maintenance,
+/turf/simulated/floor/plating,
+/area/maintenance/research)
 "tjU" = (
 /obj/machinery/atmospherics/component/unary/vent_pump/on,
 /turf/simulated/floor/tiled,
@@ -30382,6 +31900,12 @@
 /obj/effect/floor_decal/corner/navgold/bordercorner,
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d2afthall)
+"tkZ" = (
+/obj/structure/frame{
+	anchored = 1
+	},
+/turf/simulated/floor,
+/area/maintenance/research)
 "tlU" = (
 /obj/effect/floor_decal/borderfloorblack{
 	dir = 1
@@ -30549,6 +32073,10 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/medical/medbay3)
+"tqJ" = (
+/obj/effect/floor_decal/rust,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d2fwdmaint)
 "tqN" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/door/airlock{
@@ -30712,8 +32240,11 @@
 /turf/simulated/floor/tiled/white,
 /area/medical/virology_aft_access)
 "tvV" = (
+/obj/item/clothing/head/hardhat/red,
+/obj/item/clothing/head/hardhat/red,
+/obj/structure/table/rack,
 /turf/simulated/floor/plating,
-/area/endeavour/hallway/d2afthall)
+/area/maintenance/medbay/aft)
 "twc" = (
 /obj/effect/paint/babyblue,
 /obj/structure/window/reinforced/polarized/full{
@@ -30841,6 +32372,13 @@
 /obj/spawner/window/reinforced/full,
 /turf/simulated/floor/plating,
 /area/maintenance/substation/medical_science)
+"tzN" = (
+/obj/machinery/air_alarm{
+	dir = 8;
+	pixel_x = 25
+	},
+/turf/simulated/floor/plating,
+/area/maintenance/research)
 "tAf" = (
 /obj/effect/floor_decal/corner/paleblue{
 	dir = 10
@@ -31125,6 +32663,15 @@
 /obj/effect/floor_decal/industrial/hatch,
 /turf/simulated/floor/tiled,
 /area/medical/surgeryprep)
+"tJj" = (
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
+/obj/structure/railing{
+	dir = 4
+	},
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d2fwdmaint)
 "tJk" = (
 /obj/effect/floor_decal/borderfloorblack{
 	dir = 6
@@ -31148,6 +32695,10 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/endeavour/hallway/d1starboardafthall)
+"tKc" = (
+/obj/structure/table/rack,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d2fwdmaint)
 "tKG" = (
 /obj/machinery/optable,
 /obj/machinery/oxygen_pump/anesthetic{
@@ -31244,6 +32795,10 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/medical/sleeper)
+"tNI" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/turf/simulated/floor/wood,
+/area/tether/surfacebase/shuttle_pad)
 "tNZ" = (
 /obj/effect/floor_decal/borderfloorwhite,
 /obj/effect/floor_decal/corner/paleblue/border,
@@ -31441,6 +32996,14 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/medical/virologyisolation)
+"tRA" = (
+/obj/structure/catwalk,
+/obj/machinery/door/airlock/maintenance/common,
+/obj/machinery/door/firedoor{
+	dir = 1
+	},
+/turf/simulated/floor/plating,
+/area/maintenance/research)
 "tSj" = (
 /obj/landmark/spawnpoint/overflow/station,
 /turf/simulated/floor/tiled/techfloor,
@@ -31506,6 +33069,11 @@
 /obj/effect/floor_decal/corner/navblue/border,
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d2portforhall)
+"tUS" = (
+/obj/machinery/door/airlock/maintenance/common,
+/obj/machinery/door/firedoor,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d2fwdmaint)
 "tVm" = (
 /obj/spawner/window/low_wall/reinforced/full/firelocks,
 /obj/effect/paint/purplegray,
@@ -31845,6 +33413,25 @@
 	},
 /turf/simulated/floor/tiled,
 /area/rnd/hallway)
+"uhG" = (
+/obj/structure/railing{
+	dir = 1
+	},
+/obj/structure/table/rack,
+/obj/random/maintenance/clean,
+/obj/random/maintenance/cargo,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d2fwdmaint)
+"uhK" = (
+/obj/structure/cable/orange{
+	icon_state = "4-8"
+	},
+/obj/structure/catwalk,
+/obj/machinery/light/small{
+	dir = 1
+	},
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d2aftmaint)
 "uhO" = (
 /obj/structure/bed/chair,
 /obj/effect/floor_decal/corner/paleblue{
@@ -31953,6 +33540,12 @@
 /obj/effect/floor_decal/corner/paleblue/border,
 /turf/simulated/floor/tiled/white,
 /area/medical/medbay3)
+"ukx" = (
+/obj/machinery/floodlight,
+/obj/effect/floor_decal/industrial/outline/yellow,
+/obj/effect/floor_decal/rust,
+/turf/simulated/floor/plating,
+/area/maintenance/research)
 "ukC" = (
 /obj/structure/cable/green{
 	icon_state = "4-8"
@@ -31996,6 +33589,10 @@
 	},
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d2portafthall)
+"ulT" = (
+/obj/machinery/fire_alarm/north_mount,
+/turf/simulated/floor/plating,
+/area/maintenance/research)
 "umy" = (
 /obj/machinery/door/firedoor/glass{
 	dir = 4
@@ -32066,12 +33663,11 @@
 /turf/simulated/floor/tiled,
 /area/medical/resleeving)
 "upS" = (
-/obj/machinery/computer/timeclock/premade/south,
-/obj/effect/floor_decal/borderfloorblack,
-/obj/effect/floor_decal/corner/navgold/border,
 /obj/structure/disposalpipe/segment{
 	dir = 8
 	},
+/obj/effect/floor_decal/borderfloorblack/corner,
+/obj/effect/floor_decal/corner/navgold/bordercorner,
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d1starboardamidhall)
 "urd" = (
@@ -32689,6 +34285,15 @@
 /obj/structure/table/bench/wooden,
 /turf/simulated/floor/tiled/dark,
 /area/endeavour/hallway/d1starboardamidhall)
+"uMq" = (
+/obj/machinery/air_alarm{
+	frequency = 1441;
+	pixel_y = 22
+	},
+/obj/item/clothing/head/hardhat/red,
+/obj/structure/table/rack,
+/turf/simulated/floor/plating,
+/area/maintenance/medbay/aft)
 "uMx" = (
 /obj/effect/floor_decal/borderfloorblack{
 	dir = 4
@@ -32988,6 +34593,10 @@
 	},
 /turf/simulated/floor/tiled,
 /area/rnd/research/researchdivision)
+"uUq" = (
+/obj/item/melee/baton/cattleprod,
+/turf/simulated/floor/plating,
+/area/rnd/research/researchdivision)
 "uVj" = (
 /obj/machinery/power/apc/west_mount{
 	cell_type = /obj/item/cell/super;
@@ -33199,11 +34808,11 @@
 /turf/simulated/floor/tiled/techfloor,
 /area/assembly/chargebay)
 "vcl" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 8
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
+	dir = 5
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 5
 	},
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/hallway/station/docks)
@@ -33356,6 +34965,14 @@
 /obj/machinery/portable_atmospherics/canister/carbon_dioxide,
 /turf/simulated/floor/tiled,
 /area/rnd/xenobiology)
+"viH" = (
+/obj/structure/closet,
+/turf/simulated/floor/plating,
+/area/maintenance/research)
+"vjn" = (
+/obj/item/clothing/shoes/black,
+/turf/simulated/floor/plating,
+/area/rnd/research/researchdivision)
 "vjT" = (
 /obj/machinery/air_alarm{
 	dir = 1;
@@ -33451,6 +35068,10 @@
 /obj/structure/disposalpipe/segment{
 	dir = 8
 	},
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d1starboardforhall)
 "vnZ" = (
@@ -33544,8 +35165,6 @@
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d1starboardforhall)
 "vqS" = (
-/obj/effect/floor_decal/borderfloorblack/corner,
-/obj/effect/floor_decal/corner/navgold/bordercorner,
 /obj/structure/disposalpipe/segment{
 	dir = 8
 	},
@@ -33620,9 +35239,15 @@
 /turf/simulated/floor/carpet/purcarpet,
 /area/rnd/breakroom)
 "vtx" = (
+/obj/structure/table/steel,
+/obj/random/maintenance/engineering,
+/obj/random/maintenance/engineering,
+/obj/random/tech_supply,
+/obj/item/stack/cable_coil/random,
+/obj/item/tank/phoron,
 /obj/machinery/light/small,
-/turf/simulated/floor/plating,
-/area/endeavour/hallway/d2fwdmaint)
+/turf/simulated/floor/tiled/techmaint,
+/area/tether/surfacebase/shuttle_pad)
 "vtM" = (
 /obj/structure/cable/green{
 	icon_state = "1-2"
@@ -33664,17 +35289,14 @@
 /turf/simulated/floor/tiled/white,
 /area/medical/virology)
 "vvK" = (
-/obj/effect/floor_decal/borderfloorwhite{
+/obj/effect/floor_decal/borderfloorblack{
 	dir = 6
 	},
-/obj/effect/floor_decal/corner/green/border{
+/obj/effect/floor_decal/corner/navgold/border{
 	dir = 6
 	},
-/obj/machinery/fire_alarm/east_mount,
-/obj/effect/floor_decal/borderfloorwhite/corner2,
-/obj/effect/floor_decal/corner/green/bordercorner2,
-/turf/simulated/floor/tiled/white,
-/area/medical/virology_fore_access)
+/turf/simulated/floor/tiled,
+/area/endeavour/hallway/d1starboardamidhall)
 "vws" = (
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply{
@@ -33729,6 +35351,11 @@
 "vya" = (
 /turf/simulated/floor/tiled/white,
 /area/medical/psych_ward)
+"vyf" = (
+/obj/random/maintenance/security,
+/obj/structure/table/rack,
+/turf/simulated/floor/plating,
+/area/maintenance/research)
 "vze" = (
 /obj/structure/disposalpipe/segment{
 	dir = 1
@@ -33773,6 +35400,13 @@
 	},
 /turf/simulated/floor/tiled/techfloor,
 /area/rnd/robotics/morgue)
+"vBe" = (
+/obj/machinery/air_alarm{
+	frequency = 1441;
+	pixel_y = 22
+	},
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d2fwdmaint)
 "vBs" = (
 /obj/machinery/atmospherics/pipe/manifold/hidden/purple{
 	dir = 8
@@ -33840,6 +35474,12 @@
 	},
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d1starboardamidhall)
+"vEK" = (
+/obj/item/weldingtool,
+/obj/item/clothing/glasses/welding,
+/obj/structure/table/steel,
+/turf/simulated/floor/plating,
+/area/rnd/research/researchdivision)
 "vEU" = (
 /obj/structure/cable/green{
 	icon_state = "4-8"
@@ -33927,6 +35567,10 @@
 	},
 /turf/simulated/floor/carpet/sblucarpet,
 /area/medical/psych/psych_1)
+"vGX" = (
+/obj/structure/loot_pile/maint/trash,
+/turf/simulated/floor/plating,
+/area/maintenance/research)
 "vHc" = (
 /obj/machinery/atmospherics/component/unary/vent_pump/on,
 /obj/structure/table/reinforced,
@@ -34005,6 +35649,10 @@
 /obj/structure/closet/secure_closet/medical2,
 /turf/simulated/floor/tiled,
 /area/medical/surgery2)
+"vJE" = (
+/obj/random/trash_pile,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d2fwdmaint)
 "vKc" = (
 /obj/structure/closet/l3closet/virology,
 /obj/effect/floor_decal/industrial/outline/yellow,
@@ -34099,6 +35747,13 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/medical/psych_ward)
+"vMh" = (
+/obj/machinery/air_alarm{
+	pixel_y = 22
+	},
+/obj/structure/closet/firecloset,
+/turf/simulated/floor/tiled/techmaint,
+/area/tether/surfacebase/shuttle_pad)
 "vMn" = (
 /obj/machinery/camera/network/research{
 	dir = 1
@@ -34174,6 +35829,13 @@
 	},
 /turf/simulated/floor/tiled,
 /area/medical/surgery2)
+"vPe" = (
+/obj/structure/railing{
+	dir = 8
+	},
+/obj/machinery/portable_atmospherics/powered/scrubber,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d2fwdmaint)
 "vPR" = (
 /obj/machinery/door/firedoor/glass{
 	dir = 4
@@ -34288,6 +35950,13 @@
 	},
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d1starboardforhall)
+"vUJ" = (
+/obj/effect/floor_decal/spline/fancy/wood{
+	dir = 8
+	},
+/mob/living/simple_mob/animal/passive/cat/runtime,
+/turf/simulated/floor/carpet/blucarpet,
+/area/crew_quarters/medbreak)
 "vUK" = (
 /obj/machinery/holopad,
 /obj/effect/floor_decal/corner/green{
@@ -34573,6 +36242,10 @@
 /obj/effect/floor_decal/corner/paleblue/diagonal,
 /turf/simulated/floor/tiled/white,
 /area/medical/patient_d)
+"waY" = (
+/obj/random/trash_pile,
+/turf/simulated/floor/plating,
+/area/maintenance/medbay/aft)
 "wbt" = (
 /obj/machinery/atmospherics/tvalve/bypass{
 	dir = 1;
@@ -34963,11 +36636,8 @@
 /turf/simulated/floor/tiled/dark,
 /area/endeavour/hallway/d1starboardafthall)
 "wlg" = (
-/obj/machinery/shower{
-	dir = 4
-	},
-/obj/structure/curtain/open/shower/medical,
-/turf/simulated/floor/tiled/techfloor/grid,
+/obj/random/trash_pile,
+/turf/simulated/floor/plating,
 /area/medical/medbay_primary_storage)
 "wlm" = (
 /obj/effect/floor_decal/borderfloor{
@@ -34999,10 +36669,14 @@
 /obj/machinery/shower{
 	dir = 4
 	},
-/obj/structure/curtain/open/shower/medical,
 /obj/structure/window/reinforced/tinted,
+/obj/structure/curtain/open/shower/medical,
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/medical/medbay_primary_storage)
+"wme" = (
+/obj/landmark/spawnpoint/job/pilot,
+/turf/space/basic,
+/area/space)
 "wmp" = (
 /obj/effect/floor_decal/techfloor/orange{
 	dir = 1
@@ -35013,6 +36687,13 @@
 	},
 /turf/simulated/floor/tiled/techfloor,
 /area/teleporter/departing)
+"wmt" = (
+/obj/structure/railing{
+	dir = 1
+	},
+/obj/structure/closet/firecloset,
+/turf/simulated/floor/plating,
+/area/maintenance/fpmaint2)
 "wmA" = (
 /obj/structure/cable/green{
 	icon_state = "4-8"
@@ -35288,6 +36969,11 @@
 	},
 /turf/simulated/floor/tiled,
 /area/rnd/research_foyer_auxiliary)
+"wtJ" = (
+/obj/machinery/air_alarm/east_mount,
+/obj/machinery/fire_alarm/north_mount,
+/turf/simulated/floor,
+/area/maintenance/research)
 "wtL" = (
 /obj/spawner/window/low_wall/reinforced/full/firelocks,
 /obj/effect/paint/babyblue,
@@ -35377,6 +37063,17 @@
 	},
 /turf/simulated/floor/tiled/monowhite,
 /area/rnd/chemistry_lab)
+"wvk" = (
+/obj/machinery/air_alarm{
+	dir = 1;
+	pixel_y = -22
+	},
+/obj/structure/table/steel,
+/obj/random/maintenance/engineering,
+/obj/item/clothing/glasses/welding,
+/obj/item/weldingtool,
+/turf/simulated/floor/tiled/techmaint,
+/area/tether/surfacebase/shuttle_pad)
 "wvW" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
@@ -35427,6 +37124,11 @@
 	},
 /turf/simulated/floor/tiled,
 /area/rnd/xenobiology)
+"wyD" = (
+/obj/structure/table/woodentable,
+/obj/machinery/atmospherics/component/unary/vent_scrubber/on,
+/turf/simulated/floor/wood,
+/area/exploration/pilot_Office)
 "wzb" = (
 /obj/effect/floor_decal/industrial/warning/cee{
 	dir = 1
@@ -35503,6 +37205,15 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/medical/virology_fore_access)
+"wzT" = (
+/obj/structure/bed/chair/comfy/brown{
+	dir = 8
+	},
+/obj/effect/floor_decal/spline/fancy/wood{
+	dir = 4
+	},
+/turf/simulated/floor/wood,
+/area/tether/surfacebase/shuttle_pad)
 "wAn" = (
 /obj/structure/cable/green{
 	icon_state = "4-8"
@@ -35526,6 +37237,18 @@
 /obj/effect/floor_decal/industrial/outline/blue,
 /turf/simulated/floor/tiled,
 /area/medical/resleeving)
+"wAN" = (
+/obj/machinery/fire_alarm/west_mount{
+	pixel_x = -24
+	},
+/obj/structure/bed/chair/comfy/brown{
+	dir = 4
+	},
+/obj/effect/floor_decal/spline/fancy/wood{
+	dir = 8
+	},
+/turf/simulated/floor/wood,
+/area/tether/surfacebase/shuttle_pad)
 "wBq" = (
 /obj/machinery/power/apc/north_mount,
 /obj/structure/cable/green{
@@ -35682,6 +37405,16 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/medical/reception)
+"wFI" = (
+/obj/machinery/atmospherics/component/unary/vent_scrubber/on{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/techmaint,
+/area/tether/surfacebase/shuttle_pad)
+"wGq" = (
+/obj/machinery/fire_alarm/west_mount,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d2aftmaint)
 "wGQ" = (
 /obj/structure/bed/chair/sofa/black/left{
 	dir = 4
@@ -35817,6 +37550,12 @@
 /obj/effect/floor_decal/industrial/outline/blue,
 /turf/simulated/floor/tiled/white,
 /area/medical/patient_wing)
+"wKx" = (
+/obj/machinery/fire_alarm/south_mount{
+	pixel_y = -24
+	},
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d2fwdmaint)
 "wKT" = (
 /obj/structure/table/bench/steel,
 /obj/effect/floor_decal/borderfloorblack{
@@ -36142,6 +37881,14 @@
 "wSM" = (
 /turf/simulated/wall/prepainted/science,
 /area/rnd/xenobiology)
+"wTK" = (
+/obj/machinery/door/firedoor/glass,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 9
+	},
+/turf/simulated/floor/plating,
+/area/tether/surfacebase/shuttle_pad)
 "wTM" = (
 /obj/machinery/floodlight,
 /turf/simulated/floor/airless/ceiling,
@@ -36302,6 +38049,11 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/medical/medbay4)
+"wZP" = (
+/obj/structure/table/rack,
+/obj/random/maintenance/security,
+/turf/simulated/floor/plating,
+/area/maintenance/research)
 "xav" = (
 /obj/structure/table/standard,
 /obj/item/folder/blue{
@@ -36428,6 +38180,13 @@
 	},
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d1starboardforhall)
+"xcU" = (
+/obj/machinery/air_alarm{
+	frequency = 1441;
+	pixel_y = 22
+	},
+/turf/simulated/floor/plating,
+/area/maintenance/research)
 "xda" = (
 /turf/simulated/floor/plating,
 /area/maintenance/substation/medical)
@@ -36534,11 +38293,10 @@
 /turf/simulated/floor/plating,
 /area/endeavour/hallway/d2aftmaint)
 "xgi" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 9
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 9
+/obj/effect/floor_decal/industrial/outline/yellow,
+/obj/structure/closet/l3closet/virology,
+/obj/machinery/camera/network/medbay{
+	dir = 8
 	},
 /turf/simulated/floor/tiled,
 /area/medical/virology_fore_access)
@@ -36888,6 +38646,14 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/medical/medbay3)
+"xrI" = (
+/obj/machinery/door/airlock/maintenance/common,
+/obj/machinery/door/firedoor{
+	dir = 1
+	},
+/obj/map_helper/access_helper/airlock/station/science/department,
+/turf/simulated/floor/plating,
+/area/rnd/breakroom)
 "xrU" = (
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply{
 	dir = 1
@@ -36958,6 +38724,21 @@
 	},
 /turf/simulated/floor/tiled,
 /area/rnd/hallway)
+"xuc" = (
+/obj/machinery/light/small{
+	dir = 1
+	},
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
+/obj/effect/floor_decal/spline/fancy/wood{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/turf/simulated/floor/wood,
+/area/tether/surfacebase/shuttle_pad)
 "xug" = (
 /obj/structure/cable/green{
 	icon_state = "2-4"
@@ -37220,6 +39001,10 @@
 	},
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d2portafthall)
+"xDG" = (
+/obj/machinery/light/small,
+/turf/simulated/floor/plating,
+/area/maintenance/research)
 "xDH" = (
 /obj/structure/noticeboard{
 	pixel_y = 32
@@ -37472,6 +39257,11 @@
 /obj/machinery/atmospherics/pipe/manifold/hidden/black,
 /turf/simulated/floor/tiled,
 /area/medical/virology_aft_access)
+"xJt" = (
+/turf/simulated/wall/prepainted/science{
+	can_open = 1
+	},
+/area/rnd/research/researchdivision)
 "xJB" = (
 /obj/structure/closet/secure_closet/CMO,
 /obj/item/cmo_disk_holder,
@@ -37558,6 +39348,10 @@
 "xKC" = (
 /turf/simulated/floor/tiled/white,
 /area/medical/surgeryprep)
+"xLo" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/turf/simulated/floor/tiled/techmaint,
+/area/tether/surfacebase/shuttle_pad)
 "xLu" = (
 /obj/structure/bed/chair/sofa/beige{
 	dir = 8
@@ -37568,6 +39362,12 @@
 	},
 /turf/simulated/floor/carpet/blucarpet,
 /area/crew_quarters/medbreak)
+"xLC" = (
+/obj/structure/closet,
+/obj/random/maintenance/clean,
+/obj/random/maintenance/engineering,
+/turf/simulated/floor/plating,
+/area/maintenance/research)
 "xLH" = (
 /obj/machinery/disease2/incubator,
 /obj/effect/floor_decal/borderfloor{
@@ -37629,6 +39429,12 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/medical/medbay4)
+"xOh" = (
+/obj/machinery/atmospherics/component/unary/vent_pump/on{
+	dir = 8
+	},
+/turf/simulated/floor/tiled/techmaint,
+/area/tether/surfacebase/shuttle_pad)
 "xOt" = (
 /obj/machinery/camera/network/medbay{
 	dir = 1;
@@ -37955,6 +39761,10 @@
 	},
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d1starboardforhall)
+"ybE" = (
+/obj/structure/frame/computer,
+/turf/simulated/floor,
+/area/maintenance/research)
 "ybL" = (
 /obj/machinery/door/firedoor{
 	dir = 1
@@ -37983,6 +39793,11 @@
 	},
 /turf/simulated/floor/wood,
 /area/rnd/breakroom)
+"ycv" = (
+/obj/structure/closet/crate,
+/obj/random/maintenance/engineering,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d2fwdmaint)
 "yde" = (
 /obj/spawner/window/low_wall/reinforced/full/firelocks,
 /obj/effect/paint/babyblue,
@@ -37999,10 +39814,7 @@
 /turf/simulated/floor/tiled/dark,
 /area/endeavour/hallway/d2portamidhall)
 "ydL" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 9
-	},
-/turf/simulated/floor/tiled,
+/turf/simulated/floor/plating,
 /area/rnd/research/researchdivision)
 "ydY" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -38148,19 +39960,11 @@
 /turf/simulated/floor/tiled/white,
 /area/medical/surgeryprep)
 "yhT" = (
-/obj/effect/floor_decal/borderfloorwhite,
-/obj/effect/floor_decal/corner/green/border,
-/obj/structure/sign/biohazard{
-	pixel_y = -32
-	},
-/obj/effect/floor_decal/borderfloorwhite/corner2{
-	dir = 9
-	},
-/obj/effect/floor_decal/corner/green/bordercorner2{
-	dir = 9
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 6
 	},
-/obj/structure/disposalpipe/segment{
-	dir = 8
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 6
 	},
 /turf/simulated/floor/tiled/white,
 /area/medical/virology_fore_access)
@@ -38226,6 +40030,14 @@
 /obj/effect/floor_decal/industrial/outline/blue,
 /turf/simulated/floor/tiled/dark,
 /area/endeavour/hallway/d2portafthall)
+"ylH" = (
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
+/obj/structure/catwalk,
+/obj/machinery/air_alarm/east_mount,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d2aftmaint)
 "ymb" = (
 /obj/machinery/light,
 /obj/machinery/atmospherics/component/unary/outlet_injector{
@@ -42007,7 +43819,7 @@ xVe
 xVe
 fgw
 fgw
-fgw
+xVe
 xVe
 xVe
 xVe
@@ -42198,23 +44010,23 @@ jRE
 pRW
 pRW
 xVe
-ppB
-xIf
-xIf
-xIf
-xIf
+sFl
+tie
+gxk
+xVe
+vGX
 dgT
 ppB
 xIf
-xIf
-xIf
+tiW
+xVe
 gVZ
 hqd
 qpq
 qpq
 qpq
 teN
-qpq
+fPz
 arx
 gDW
 ppx
@@ -42392,11 +44204,11 @@ qBd
 pRW
 pRW
 xVe
-xIf
-xIf
-xIf
-xIf
-xIf
+hpD
+hWn
+fwk
+xVe
+kxs
 jdA
 xIf
 xIf
@@ -42586,10 +44398,10 @@ fHl
 vBs
 fHl
 fGD
-kim
-xIf
-xIf
+ulT
 xIf
+xDG
+xVe
 xIf
 tCF
 bzY
@@ -42600,7 +44412,7 @@ tFT
 piJ
 qpq
 qpq
-qpq
+vUa
 qpq
 qpq
 qpq
@@ -42780,23 +44592,23 @@ wbK
 vmZ
 uHK
 eZZ
+xVe
+fBl
+xVe
+xVe
+xcU
 xIf
-xIf
-xIf
-xIf
-xIf
-xIf
-xIf
-xIf
-xIf
+mUB
+auj
+gUD
 xIf
 gVZ
-pTU
-qpq
-qpq
+abv
 qpq
+vUa
 qpq
 qpq
+vUa
 qpq
 gDW
 iKc
@@ -42974,19 +44786,19 @@ cNW
 cNW
 opc
 eZZ
+css
 xIf
 xIf
+xVe
 xIf
 xIf
-xIf
-xIf
-xIf
-xIf
-xIf
-xIf
+xVe
+xVe
+xVe
+xVe
 gVZ
 mba
-qpq
+duq
 hqd
 qpq
 teN
@@ -43171,20 +44983,20 @@ eZZ
 kim
 xIf
 xIf
+xVe
+xVe
+dtv
+xVe
+gUD
 xIf
-xIf
-xIf
-xIf
-xIf
-xIf
-xIf
+mqi
 xVe
 mdc
 ejI
 ejI
 ejI
 ejI
-qpq
+pkp
 qpq
 gDW
 hPg
@@ -43366,7 +45178,7 @@ xIf
 xIf
 xIf
 xIf
-xIf
+fBl
 xIf
 xIf
 xIf
@@ -43376,7 +45188,7 @@ xVe
 dmp
 sWU
 wTS
-qpq
+waY
 ejI
 ejI
 qpq
@@ -43556,12 +45368,12 @@ bEz
 xnM
 hlM
 eZZ
+xcU
 xIf
 xIf
 xIf
-xIf
-xIf
-mUB
+xVe
+rWl
 xIf
 xVe
 xVe
@@ -43760,12 +45572,12 @@ xVe
 xVe
 ybi
 qpq
-qpq
-pTU
-qpq
+ejI
+abv
 qpq
 qpq
 qpq
+waY
 fPz
 qpq
 pNX
@@ -43944,8 +45756,8 @@ kmH
 rXQ
 jMj
 eZZ
-xIf
-xIf
+gUD
+auj
 mUB
 xIf
 xVe
@@ -43954,14 +45766,14 @@ bHB
 vZE
 qpq
 qpq
-qpq
+ejI
 pTU
 qpq
+pJM
 qpq
 qpq
 qpq
-qpq
-qpq
+waY
 pNX
 xmL
 uRJ
@@ -44141,14 +45953,14 @@ kUv
 fHl
 fGD
 xVe
-xVe
+fBl
 xVe
 hZY
 vUa
 qpq
 qpq
 qpq
-qpq
+nJf
 pTU
 qpq
 rup
@@ -44337,13 +46149,13 @@ eZZ
 xIf
 xIf
 tcy
+uMq
 qpq
 qpq
 qpq
 qpq
-qpq
-qpq
-pTU
+ejI
+oOJ
 qpq
 rup
 mmy
@@ -44535,8 +46347,8 @@ iUp
 yhA
 pTX
 rRe
-qpq
-qpq
+waY
+ejI
 pTU
 qpq
 rup
@@ -44722,7 +46534,7 @@ srS
 srS
 oGQ
 eZZ
-xIf
+xcU
 xIf
 huY
 huY
@@ -44925,8 +46737,8 @@ lja
 xRM
 xvK
 huY
-pTU
-qpq
+mQh
+ejI
 rup
 wmp
 tSj
@@ -45111,7 +46923,7 @@ cNW
 vMn
 eZZ
 xIf
-xIf
+gUD
 huY
 lja
 jwd
@@ -45305,7 +47117,7 @@ cNW
 ymb
 uwU
 xIf
-xIf
+vyf
 huY
 lja
 uQX
@@ -45313,7 +47125,7 @@ lja
 uQX
 aSW
 huY
-mQh
+pTU
 qpq
 rup
 rup
@@ -45498,8 +47310,8 @@ srS
 srS
 xER
 eZZ
-xIf
-xIf
+cjl
+wZP
 huY
 lja
 hwg
@@ -45507,10 +47319,10 @@ xYr
 uTa
 aFj
 huY
-pTU
+oSZ
 qpq
 qpq
-tvV
+waY
 oaU
 kDq
 oXr
@@ -45701,10 +47513,10 @@ lja
 uQX
 rsU
 huY
-pTU
+abv
+qpq
 qpq
 qpq
-tvV
 oaU
 mcO
 jbC
@@ -45896,7 +47708,7 @@ lja
 aSW
 huY
 pTU
-qpq
+waY
 qpq
 tvV
 oaU
@@ -46092,7 +47904,7 @@ huY
 pTU
 qpq
 qpq
-tvV
+qpq
 oaU
 sNK
 jbC
@@ -46283,10 +48095,10 @@ jCw
 jCw
 rpN
 huY
-pTU
+oOJ
 qpq
+waY
 qpq
-tvV
 oaU
 jak
 jbC
@@ -46478,9 +48290,9 @@ bfi
 uiz
 huY
 pTU
+pJM
 qpq
-qpq
-tvV
+ece
 oaU
 mnH
 ebF
@@ -46674,7 +48486,7 @@ huY
 pTU
 ejI
 ejI
-oaU
+ejI
 oaU
 oaU
 oaU
@@ -46859,8 +48671,8 @@ xdh
 nMp
 pnt
 xHD
-qpq
-qpq
+fPz
+waY
 qpq
 qpq
 qpq
@@ -47057,7 +48869,7 @@ iec
 iec
 iec
 iec
-iec
+ofA
 iec
 erm
 fqP
@@ -47828,7 +49640,7 @@ wSM
 aXm
 dyL
 aXm
-qpq
+fPz
 nJI
 xHD
 ctj
@@ -48407,7 +50219,7 @@ oCO
 nZC
 uUl
 kCt
-qpq
+aXp
 itd
 qpq
 qpq
@@ -48601,7 +50413,7 @@ oCO
 xFT
 pVT
 kCt
-qpq
+nzA
 iec
 iec
 iec
@@ -48991,9 +50803,9 @@ bOa
 kCt
 qpq
 pJM
-vUa
-qpq
-vUa
+ohX
+iwg
+ohX
 xHD
 mSd
 uJM
@@ -49361,13 +51173,13 @@ koS
 koS
 sIr
 ppB
-xIf
+xLC
 dgT
 uQe
 xIf
-xIf
+cRR
 ppB
-xIf
+xLC
 xIf
 uPt
 cNs
@@ -49405,7 +51217,7 @@ eqi
 hKr
 seE
 seE
-cxJ
+sHf
 bOb
 gmM
 igd
@@ -50515,12 +52327,12 @@ pRW
 pRW
 pRW
 uPt
-xIf
-xIf
-xIf
-xIf
-xIf
-xIf
+dtG
+hJk
+ppB
+neh
+neh
+neh
 kCt
 lBS
 stX
@@ -50709,11 +52521,11 @@ pRW
 pRW
 pRW
 uPt
+qzK
+dRf
 xIf
-xIf
-xIf
-xIf
-xIf
+neh
+tzN
 kCt
 kCt
 lBS
@@ -50905,8 +52717,8 @@ qBd
 uPt
 xIf
 xIf
-xIf
-xIf
+gUD
+neh
 kCt
 kCt
 lBS
@@ -50914,7 +52726,7 @@ lBS
 aEl
 ffI
 sWB
-xCX
+nAM
 kUS
 xHh
 ahE
@@ -51100,7 +52912,7 @@ uPt
 xIf
 xIf
 xIf
-xIf
+neh
 kCt
 tsk
 kuq
@@ -51292,9 +53104,9 @@ jRE
 qBd
 uPt
 mrz
-xIf
-xIf
-xIf
+eEN
+neh
+neh
 xpI
 nww
 bbQ
@@ -51485,19 +53297,19 @@ pRW
 pRW
 pRW
 uPt
+icg
 xIf
-xIf
-xIf
-xIf
+neh
+xDG
 kCt
 okS
+ttq
 lBS
-lBS
-lBS
-lBS
-lBS
-lBS
-lBS
+ors
+nTZ
+vEK
+dba
+iLr
 ffI
 wQh
 xXp
@@ -51681,17 +53493,17 @@ pRW
 uPt
 xIf
 xIf
-xIf
+neh
 xIf
 kCt
-lCS
-ttq
-lBS
-lBS
-kTq
+kCt
+kCt
+kCt
+kCt
+kCt
 qZb
-lBS
-ors
+ljm
+vjn
 ffI
 tTu
 mEE
@@ -51873,19 +53685,19 @@ pRW
 pRW
 pRW
 uPt
-xIf
-xIf
-xIf
+ulT
+gUD
+neh
 xIf
 kCt
-dIS
-kuq
-kuq
-kuq
-ruq
+kuV
+rTI
 ydL
-lBS
-lBS
+hhg
+kCt
+sjJ
+uUq
+ddj
 ffI
 oks
 orZ
@@ -52067,19 +53879,19 @@ pRW
 pRW
 gCJ
 uPt
+icg
 xIf
-xIf
-xIf
-xIf
-kCt
-kCt
-kCt
+neh
+eEN
 kCt
+ydL
 cda
-lBS
-lBS
-lBS
-lBS
+cda
+cda
+xJt
+ydL
+nod
+jZT
 ffI
 vWo
 eYr
@@ -52265,15 +54077,15 @@ mdP
 yfn
 yfn
 yfn
-yfn
+kER
 yfn
 gBJ
+kuV
+sXw
 kCt
-lBS
-lBS
-lBS
-lBS
-lBS
+ydL
+ydL
+qWb
 ffI
 ffI
 ffI
@@ -52459,7 +54271,7 @@ kim
 xIf
 xIf
 xIf
-xIf
+vgs
 xIf
 xnR
 svR
@@ -52467,7 +54279,7 @@ jQJ
 jQJ
 jQJ
 jQJ
-jQJ
+xrI
 jQJ
 jQJ
 jQJ
@@ -52649,11 +54461,11 @@ pRW
 pRW
 pRW
 uPt
-xIf
-xIf
-xIf
-xIf
-xIf
+kRI
+kRI
+psn
+enO
+vgs
 xIf
 xnR
 svR
@@ -52690,7 +54502,7 @@ fOF
 cHC
 qgo
 cHC
-cHC
+oDd
 cHC
 fOF
 cHC
@@ -52847,7 +54659,7 @@ uow
 uow
 uow
 uow
-xIf
+vgs
 xIf
 xnR
 svR
@@ -52879,12 +54691,12 @@ qjz
 ciZ
 wgp
 oDd
-cHC
+nCx
 cHC
 cHC
 qgo
 cHC
-cHC
+oDd
 cHC
 cHC
 cHC
@@ -53074,12 +54886,12 @@ nGv
 tWJ
 oDd
 wnU
-cHC
+ojx
 cHC
 qgo
 cHC
-cHC
-cHC
+oDd
+nCx
 cHC
 cHC
 oDd
@@ -53235,7 +55047,7 @@ arH
 wfD
 cmc
 uow
-xIf
+gUD
 xIf
 xnR
 svR
@@ -53267,12 +55079,12 @@ tJE
 qRh
 gvw
 oDd
-cHC
-cHC
+gbg
+oDd
 cHC
 qgo
 cHC
-cHC
+tqR
 cHC
 cHC
 cHC
@@ -53430,7 +55242,7 @@ kiy
 cmc
 uow
 xIf
-xIf
+eEN
 xnR
 svR
 wBq
@@ -53462,14 +55274,14 @@ gbY
 uKJ
 oDd
 cHC
-cHC
+oDd
 iyy
 sMF
 cHC
+oDd
 cHC
 cHC
-cHC
-cHC
+ihO
 oDd
 csf
 cTm
@@ -53623,7 +55435,7 @@ arH
 kiy
 nsd
 uow
-xIf
+jsJ
 xIf
 xnR
 svR
@@ -53656,13 +55468,13 @@ rpD
 lTs
 tfp
 wMn
-cHC
-qgo
-cHC
-cHC
+oDd
+sQG
 cHC
 cHC
+oDd
 cHC
+ojx
 cHC
 oDd
 mTD
@@ -53817,7 +55629,7 @@ arH
 kiy
 cmc
 uow
-xIf
+ukx
 xIf
 xnR
 svR
@@ -53857,7 +55669,7 @@ eEE
 eEE
 eEE
 eEE
-cHC
+tqR
 oDd
 csf
 cTm
@@ -54011,7 +55823,7 @@ slc
 kiy
 cmc
 uow
-xIf
+jjR
 xIf
 xfb
 pyQ
@@ -54043,7 +55855,7 @@ eXh
 qRh
 wgp
 oDd
-ePI
+uhK
 eEE
 uFa
 bYT
@@ -54205,7 +56017,7 @@ uzv
 kiy
 xiT
 uow
-xIf
+xLC
 xIf
 xnR
 svR
@@ -54399,7 +56211,7 @@ uzv
 kiy
 kHF
 uow
-xIf
+pDi
 xIf
 xnR
 svR
@@ -54593,7 +56405,7 @@ wgC
 kiy
 kHF
 uow
-xIf
+gUD
 xIf
 xnR
 svR
@@ -54625,7 +56437,7 @@ qjz
 nGv
 tWJ
 oDd
-ePI
+dzu
 eEE
 eEE
 eEE
@@ -54822,7 +56634,7 @@ oDd
 mfl
 qGR
 qGR
-qGR
+gPJ
 qGR
 hqy
 gtR
@@ -54982,7 +56794,7 @@ jFD
 xEA
 uow
 xIf
-xIf
+eEN
 xnR
 dKQ
 bqS
@@ -55014,7 +56826,7 @@ pVB
 lFr
 oDd
 wnU
-cHC
+mVo
 cHC
 cHC
 mFI
@@ -55175,7 +56987,7 @@ hEJ
 vqh
 dNv
 uow
-xIf
+gUD
 xIf
 tHT
 fBT
@@ -55209,13 +57021,13 @@ rVF
 oDd
 oDd
 mAe
-kEQ
+ylH
 kEQ
 hHI
-cHC
-cHC
-cHC
-cHC
+ojx
+mVo
+ggW
+gjf
 oDd
 uPR
 gij
@@ -55223,7 +57035,7 @@ mdU
 jZY
 hor
 vpm
-hRR
+vUJ
 hRR
 wEl
 lwt
@@ -55369,7 +57181,7 @@ tOP
 oZD
 fqJ
 uow
-xIf
+iXg
 xIf
 pfz
 oLT
@@ -55757,8 +57569,8 @@ djF
 wcQ
 dEU
 uow
-xIf
-xIf
+viH
+eEN
 pfz
 oLT
 dNU
@@ -55947,7 +57759,7 @@ pRW
 qBd
 lmG
 uPt
-xIf
+kim
 hfm
 xIf
 uPt
@@ -56141,7 +57953,7 @@ pRW
 jRE
 qBd
 uPt
-xIf
+asd
 dwZ
 wQj
 ybL
@@ -56336,7 +58148,7 @@ pRW
 pRW
 uPt
 uPt
-xIf
+eBu
 xIf
 uPt
 xIf
@@ -56398,17 +58210,17 @@ ppj
 cKJ
 gHd
 wdD
-jLs
+fNZ
 xiN
 fNZ
 bzR
 bNp
 bNp
-bNp
+rFw
 bNp
 bNp
 ujt
-ujt
+szk
 xFH
 xFH
 xFH
@@ -56530,20 +58342,20 @@ pRW
 pRW
 pRW
 uPt
-xIf
-xIf
+viH
+jqP
 uPt
 kim
 xIf
 neh
 xIf
-xIf
-xIf
+vgs
+ulT
 ppB
 xIf
 xIf
-xIf
-xIf
+gUD
+qLF
 hgr
 ndE
 qxs
@@ -56598,8 +58410,8 @@ fNZ
 wuC
 bNp
 wlg
-wlg
-wlg
+kTz
+bNp
 wlZ
 ujt
 ryO
@@ -56731,7 +58543,7 @@ xIf
 xIf
 neh
 neh
-neh
+tRA
 neh
 neh
 neh
@@ -56792,11 +58604,11 @@ fNZ
 rVo
 bNp
 mnx
-rpi
-rpi
+kTz
+bNp
 rpi
 ujt
-ujt
+szk
 xFH
 qBd
 jRE
@@ -56922,16 +58734,16 @@ gCJ
 uPt
 uPt
 uPt
-xIf
-xIf
+tzN
+icg
 mUB
+vgs
+gUD
 xIf
-xIf
-xIf
-xIf
-xIf
+viH
+jqP
 neh
-xIf
+eEN
 hgr
 bqS
 mIF
@@ -56985,12 +58797,12 @@ rzv
 fNZ
 wuC
 xFH
-kTz
-kTz
-kTz
+bxy
+peZ
+bNp
 qFD
-ujt
 hQy
+szk
 vTa
 pRW
 pRW
@@ -57176,11 +58988,11 @@ eoz
 uhe
 vUs
 vUs
-nic
-nic
-xFH
-xFH
+vUs
+vUs
 xFH
+kTz
+kTz
 xFH
 xFH
 xFH
@@ -57313,19 +59125,19 @@ pRW
 pRW
 pRW
 uPt
-xIf
-xIf
-xIf
-xIf
+ybE
+bNY
+ruq
+bXB
 uPt
 neh
-xIf
+icg
 hgr
 ndE
 tjU
 eyM
 uPt
-xIf
+gUD
 neh
 sjz
 qSj
@@ -57342,7 +59154,7 @@ gSJ
 wzx
 pjB
 oDd
-cHC
+mVo
 cHC
 cQB
 cHC
@@ -57369,14 +59181,14 @@ dvL
 hjX
 uhe
 vUs
-fik
-fik
-fik
-pRW
-pRW
-pRW
-bfE
-qBd
+tKc
+dMJ
+tqJ
+iro
+svB
+iro
+aUR
+dYQ
 lmG
 qBd
 pRW
@@ -57507,10 +59319,10 @@ pRW
 pRW
 pRW
 qFa
-xIf
-xIf
-xIf
-xIf
+ybE
+nNV
+ruq
+bXB
 uPt
 lqv
 xIf
@@ -57519,7 +59331,7 @@ bqS
 mIF
 iRy
 uPt
-xIf
+eEN
 neh
 sjz
 mxu
@@ -57536,13 +59348,13 @@ pBC
 ftU
 ijz
 oDd
-cHC
+nCx
 cHC
 qgo
 cHC
 cHC
 cHC
-cHC
+mVo
 oDd
 mQp
 bZX
@@ -57563,13 +59375,13 @@ dvL
 hjX
 uhe
 vUs
-brS
-fik
-pRW
-pRW
-pRW
-pRW
-pRW
+iDd
+tqJ
+pkD
+pkD
+nMP
+hGE
+aUR
 jRE
 qBd
 jRE
@@ -57701,10 +59513,10 @@ pRW
 pRW
 pRW
 qFa
-xIf
-xIf
-xIf
-xIf
+mfH
+mfH
+jLs
+kTq
 uPt
 neh
 xIf
@@ -57713,7 +59525,7 @@ wMd
 xGI
 bXr
 uPt
-xIf
+gUD
 neh
 sjz
 dPT
@@ -57730,11 +59542,11 @@ hGm
 nvK
 oDd
 oDd
-cHC
-cHC
+gbg
+oDd
 qgo
 cHC
-cHC
+ojx
 cHC
 cHC
 oDd
@@ -57747,7 +59559,7 @@ nJk
 gYD
 mNp
 kzb
-kzb
+agb
 kzb
 aia
 aia
@@ -57757,13 +59569,13 @@ dvL
 hjX
 uhe
 vUs
-fik
-fik
-pRW
-pRW
-pRW
-pRW
-pRW
+pkD
+nMP
+nMP
+nMP
+nMP
+sVo
+aUR
 pRW
 pRW
 pRW
@@ -57895,10 +59707,10 @@ pRW
 pRW
 pRW
 uPt
-kim
-xIf
-xIf
-xIf
+tkZ
+tkZ
+ruq
+bXB
 uPt
 neh
 neh
@@ -57907,7 +59719,7 @@ bqS
 xGI
 xtD
 uPt
-xIf
+ulT
 neh
 sjz
 rfV
@@ -57951,14 +59763,14 @@ dvL
 qgp
 uhe
 vUs
-fik
-fik
-pRW
-pRW
-pRW
-pRW
-pRW
-pRW
+pkD
+nMP
+bpx
+aUR
+aUR
+aUR
+aUR
+lIp
 pRW
 pRW
 pRW
@@ -58089,10 +59901,10 @@ pRW
 jRE
 qBd
 uPt
-xIf
-xIf
-xIf
-xIf
+wtJ
+rRr
+ruq
+bXB
 uPt
 xIf
 neh
@@ -58101,7 +59913,7 @@ rGZ
 xGI
 pnF
 uPt
-mUB
+lzN
 neh
 sjz
 oLd
@@ -58144,11 +59956,11 @@ uhe
 rME
 uhe
 uhe
-fik
-fik
-fik
-pRW
-pRW
+gTW
+pkD
+nMP
+ebu
+aUR
 pRW
 pRW
 pRW
@@ -58338,11 +60150,11 @@ xht
 iVj
 sCy
 uhe
-fik
-fik
-fik
-pRW
-pRW
+hKY
+pkD
+nMP
+uhG
+aUR
 pRW
 pRW
 pRW
@@ -58477,19 +60289,19 @@ pRW
 jRE
 qBd
 uPt
-xIf
+jUR
 neh
 xIf
-xIf
-xIf
+viH
+lqV
 xIf
 neh
+ppB
 xIf
-xIf
-xIf
-xIf
+viH
+gUD
 uPt
-xIf
+kim
 neh
 sjz
 nvB
@@ -58532,13 +60344,13 @@ ePT
 cSS
 aOb
 uhe
+cCs
+pkD
+nMP
+bqq
+aUR
 qBd
 grq
-fik
-pRW
-pRW
-pRW
-pRW
 pRW
 pRW
 pRW
@@ -58671,19 +60483,19 @@ pRW
 pRW
 pRW
 uPt
-xIf
+gUD
 neh
 neh
 wfP
-neh
-neh
+ntI
+enA
 neh
 neh
 neh
 neh
 uPt
 uPt
-xIf
+gUD
 neh
 sjz
 okM
@@ -58726,13 +60538,13 @@ fQL
 dar
 ohg
 uhe
+hMj
+pkD
+nMP
+pkD
+aUR
 lmG
 qBd
-fik
-pRW
-pRW
-pRW
-pRW
 pRW
 pRW
 pRW
@@ -58892,8 +60704,8 @@ mYS
 hbH
 kjZ
 oDd
-cHC
-mfl
+nCx
+jQc
 qGR
 qGR
 qGR
@@ -58920,13 +60732,13 @@ vrY
 fUf
 fIp
 uhe
+gdh
+pkD
+nMP
+lbn
+aUR
 qBd
 grq
-fik
-pRW
-pRW
-pRW
-pRW
 pRW
 pRW
 pRW
@@ -59089,7 +60901,7 @@ oDd
 oDd
 oDd
 oDd
-cHC
+tqR
 oDd
 cHC
 cHC
@@ -59114,11 +60926,11 @@ dAF
 bMe
 xJh
 uhe
-brS
-fik
-fik
-pRW
-pRW
+oOZ
+vJE
+nMP
+pkD
+aUR
 pRW
 pRW
 pRW
@@ -59264,7 +61076,7 @@ pRW
 pRW
 pRW
 uPt
-xIf
+ulT
 xIf
 neh
 uLo
@@ -59281,11 +61093,11 @@ wum
 edP
 oDd
 cHC
+mVo
 cHC
-cHC
-cHC
+qQK
 oDd
-cHC
+mVo
 cHC
 sAZ
 qQK
@@ -59294,7 +61106,7 @@ bPE
 uOw
 lDm
 vYN
-kzb
+gsr
 vYN
 dic
 tGx
@@ -59308,11 +61120,11 @@ fRk
 bxO
 jzJ
 uhe
-fik
-fik
-fik
-pRW
-pRW
+pkD
+pkD
+nMP
+wKx
+aUR
 pRW
 pRW
 pRW
@@ -59458,7 +61270,7 @@ pRW
 pRW
 pRW
 uPt
-xIf
+eEN
 xIf
 neh
 uLo
@@ -59474,15 +61286,15 @@ dGt
 vRa
 cki
 oDd
-wnU
-cHC
-cHC
-cHC
+rDQ
+qQK
+qQK
+qQK
 oDd
 oDd
 oDd
-sAZ
-qQK
+lZA
+oDd
 oDd
 xFn
 ueR
@@ -59502,11 +61314,11 @@ pxV
 xqg
 uhe
 uhe
-fik
-fik
-fik
-pRW
-pRW
+vBe
+tqJ
+nMP
+tKc
+aUR
 pRW
 pRW
 pRW
@@ -59652,7 +61464,7 @@ pRW
 pRW
 pRW
 uPt
-xIf
+gUD
 xIf
 neh
 uLo
@@ -59669,12 +61481,12 @@ qNj
 edP
 oDd
 scN
-cHC
-cHC
-cHC
 oDd
-cHC
-cHC
+oDd
+oDd
+oDd
+mVo
+fOF
 sAZ
 qQK
 oDd
@@ -59695,13 +61507,13 @@ wlz
 hnK
 sqk
 bWr
-rNS
-fik
-fik
-fik
-pRW
-pRW
-pRW
+wlz
+iDd
+pkD
+nMP
+vJE
+aUR
+lIp
 pRW
 pRW
 pRW
@@ -59846,7 +61658,7 @@ pRW
 pRW
 pRW
 uPt
-xIf
+tzN
 mUB
 neh
 uLo
@@ -59865,8 +61677,8 @@ lbt
 mDv
 qQK
 qQK
+wGq
 cHC
-oDd
 cHC
 cHC
 sAZ
@@ -59889,12 +61701,12 @@ wlz
 oGx
 waz
 xke
-rNS
-fik
-fik
-fik
-pRW
-pRW
+wlz
+pkD
+pkD
+nMP
+pkD
+aUR
 pRW
 pRW
 pRW
@@ -60058,11 +61870,11 @@ edP
 oDd
 rjD
 eZz
-eZz
-kEQ
+etu
 kEQ
 kEQ
 kEQ
+ylH
 bYF
 kEQ
 yhI
@@ -60083,12 +61895,12 @@ wlz
 jBK
 waz
 xke
-rNS
-fik
-fik
-fik
-pRW
-pRW
+wlz
+vJE
+pkD
+nMP
+lbn
+aUR
 pRW
 pRW
 pRW
@@ -60234,7 +62046,7 @@ pRW
 qBd
 lmG
 uPt
-xIf
+kim
 xIf
 neh
 uLo
@@ -60254,7 +62066,7 @@ cHC
 oDd
 oDd
 oDd
-bHC
+fyu
 oDd
 oDd
 oDd
@@ -60277,12 +62089,12 @@ cDC
 xow
 mri
 qrz
-rNS
-fik
-fik
-fik
-pRW
-pRW
+wlz
+iro
+iro
+svB
+iro
+aUR
 pRW
 pRW
 pRW
@@ -60446,7 +62258,7 @@ arL
 oDd
 oDd
 oDd
-cHC
+mVo
 cHC
 qQK
 cHC
@@ -60471,12 +62283,12 @@ otT
 dSa
 edn
 lyO
-rNS
-fik
-fik
-fik
-pRW
-pRW
+wlz
+pkD
+nMP
+nMP
+pkD
+aUR
 pRW
 pRW
 pRW
@@ -60622,7 +62434,7 @@ pRW
 pRW
 pRW
 uPt
-xIf
+xLC
 xIf
 neh
 uLo
@@ -60666,11 +62478,11 @@ fOS
 xHr
 sox
 rdA
-brS
-fik
-fik
-pRW
-pRW
+tqJ
+nMP
+qLf
+lQG
+aUR
 pRW
 pRW
 pRW
@@ -60860,12 +62672,12 @@ tpt
 wNb
 gtH
 rdA
-fik
-fik
-fik
-pRW
-pRW
-pRW
+tqJ
+nMP
+qLf
+ara
+aUR
+lIp
 pRW
 pRW
 pRW
@@ -61010,7 +62822,7 @@ pRW
 pRW
 pRW
 uPt
-xIf
+hVC
 xIf
 neh
 uLo
@@ -61054,11 +62866,11 @@ tCw
 xrU
 bJH
 rdA
-fik
-fik
-fik
-pRW
-pRW
+iDd
+nMP
+qLf
+qDU
+aUR
 pRW
 pRW
 pRW
@@ -61204,8 +63016,8 @@ pRW
 pRW
 pRW
 uPt
-xIf
-xIf
+cBo
+eEN
 neh
 kQU
 rrz
@@ -61214,7 +63026,7 @@ fWy
 gIy
 qks
 kQU
-wUs
+cKf
 wUs
 tcy
 xKb
@@ -61223,11 +63035,11 @@ hlC
 wgF
 oDd
 oDd
-szh
+ppr
 qQK
+ojx
 cHC
-cHC
-cHC
+ggW
 qBi
 oDd
 bFI
@@ -61248,11 +63060,11 @@ lAn
 eqL
 txt
 rdA
-fik
-fik
-fik
-pRW
-pRW
+kRX
+nMP
+qLf
+vJE
+aUR
 pRW
 pRW
 pRW
@@ -61398,8 +63210,8 @@ pRW
 pRW
 gCJ
 uPt
-xIf
-xIf
+eEN
+eEN
 neh
 kQU
 lza
@@ -61442,13 +63254,13 @@ dPs
 lBC
 erj
 rdA
+gFn
+nMP
+qLf
+ycv
+aUR
 qBd
 grq
-fik
-pRW
-pRW
-pRW
-pRW
 pRW
 pRW
 pRW
@@ -61592,7 +63404,7 @@ pRW
 pRW
 pRW
 uPt
-kim
+gUD
 xIf
 neh
 kQU
@@ -61602,7 +63414,7 @@ xUq
 sBg
 bsC
 kQU
-wUs
+iDS
 tem
 tcy
 tcy
@@ -61636,13 +63448,13 @@ cuS
 wqG
 obu
 rdA
+nMP
+nMP
+qLf
+dpV
+aUR
 lmG
 qBd
-fik
-pRW
-pRW
-pRW
-pRW
 pRW
 pRW
 pRW
@@ -61786,7 +63598,7 @@ pRW
 pRW
 pRW
 uPt
-xIf
+ulT
 xIf
 neh
 kQU
@@ -61798,7 +63610,7 @@ coH
 kQU
 wUs
 xnR
-xIf
+xLC
 tcy
 wzN
 fLZ
@@ -61825,18 +63637,18 @@ uNt
 won
 eYM
 yhT
-rdA
+auq
 fXo
 iTB
 rMR
 rdA
+nMP
+sVM
+qLf
+ppH
+aUR
 qBd
 grq
-fik
-pRW
-pRW
-pRW
-pRW
 pRW
 pRW
 pRW
@@ -61981,18 +63793,18 @@ jRE
 qBd
 uPt
 xIf
-xIf
+eEN
 neh
 ieR
 neh
 neh
 neh
-neh
+kLp
 cET
 yfn
-yfn
+jii
 ogd
-xIf
+mDj
 tcy
 lay
 nCo
@@ -62019,16 +63831,16 @@ chF
 axp
 aYU
 sqh
-auq
-hff
+rdA
+vKc
 xgi
 qDJ
 rdA
-fik
-fik
-fik
-pRW
-pRW
+nMP
+bKz
+aUR
+aUR
+aUR
 pRW
 pRW
 pRW
@@ -62174,7 +63986,7 @@ pRW
 qBd
 lmG
 uPt
-xIf
+gUD
 xIf
 neh
 tcy
@@ -62206,21 +64018,21 @@ qpl
 vqS
 bFe
 guJ
-qLf
-qLf
-qLf
-qLf
-qLf
-qrO
-vvK
+guJ
+guJ
+guJ
+guJ
+guJ
+guJ
+guJ
 rdA
-vKc
-lYK
-vKc
 rdA
-fik
-fik
-fik
+rdA
+rdA
+rdA
+nMP
+iro
+aUR
 pRW
 pRW
 pRW
@@ -62368,8 +64180,8 @@ pRW
 jRE
 qBd
 uPt
-xIf
-xIf
+kim
+djx
 neh
 tcy
 rvw
@@ -62398,23 +64210,23 @@ dzs
 wCF
 ruD
 upS
-hOG
-guJ
-gUD
-gUD
-guJ
-guJ
-guJ
-guJ
-guJ
-rdA
-rdA
-rdA
-rdA
-rdA
+vvK
+tUS
+nMP
+nMP
+nMP
+nMP
+bwN
+nMP
+nMP
+nMP
+nMP
+nMP
+nMP
+dco
+nMP
+iro
 brS
-fik
-fik
 pRW
 pRW
 pRW
@@ -62562,9 +64374,9 @@ pRW
 pRW
 pRW
 uPt
-xIf
-xIf
-neh
+uPt
+uPt
+aQK
 tcy
 nnJ
 nnJ
@@ -62592,22 +64404,22 @@ wCF
 bZt
 qpl
 rXl
-fOZ
-bmb
-hDv
-hDv
-hDv
-hDv
-hDv
-xfy
-hDv
-hDv
-egt
-pgD
-dYQ
-dyS
-fik
-fik
+hOG
+jhB
+ciU
+ciU
+jhB
+jhB
+jhB
+jhB
+jhB
+mbs
+mbs
+mbs
+mbs
+mbs
+aUR
+aUR
 fik
 pRW
 mDp
@@ -62756,8 +64568,8 @@ pRW
 pRW
 pRW
 uPt
-xIf
-xIf
+qLF
+gUD
 neh
 pyK
 nnJ
@@ -62787,18 +64599,18 @@ hDn
 tWO
 fLw
 fOZ
-oFh
-oku
-weg
-weg
-oku
-weg
-weg
-weg
-oku
-nmL
-dpF
-kYG
+bmb
+hDv
+hDv
+hDv
+hDv
+hDv
+xfy
+hDv
+hDv
+hDv
+oBH
+qrO
 dyS
 fik
 fik
@@ -62983,16 +64795,16 @@ ozA
 fOZ
 oFh
 oku
-qww
-mob
-hce
-ayB
-mob
-mob
-jGS
 weg
-bYo
-bYo
+weg
+oku
+weg
+weg
+weg
+oku
+weg
+riq
+lYK
 dyS
 fik
 fik
@@ -63177,13 +64989,13 @@ aYt
 mbs
 hzW
 oku
-lta
-kzf
-lyv
-eow
-wLE
-rVa
-uuw
+qww
+mob
+hce
+ayB
+mob
+mob
+jGS
 aeW
 weg
 bYo
@@ -63339,7 +65151,7 @@ pRW
 gCJ
 uPt
 xVe
-xIf
+qLF
 neh
 tcy
 npO
@@ -63357,7 +65169,7 @@ ppu
 gJm
 rtj
 tUb
-pkD
+vJE
 pkD
 nMP
 nMP
@@ -63371,13 +65183,13 @@ xcG
 mbs
 oFh
 oku
-eQr
-aJg
-oku
-sjN
-pkR
-spv
-oku
+lta
+kzf
+lyv
+eow
+wLE
+rVa
+uuw
 uuw
 aeW
 weg
@@ -63533,7 +65345,7 @@ pRW
 pRW
 pRW
 xVe
-xIf
+qLF
 neh
 tcy
 ryc
@@ -63565,13 +65377,13 @@ oYE
 mbs
 oFh
 oku
-tNu
-pDh
+eQr
+aJg
 oku
+sjN
+pkR
+spv
 oku
-pbD
-ecT
-kkL
 kkL
 uPy
 bzj
@@ -63750,8 +65562,8 @@ nMP
 nMP
 pkD
 dAa
-pkD
-pkD
+tqJ
+tqJ
 tUb
 sgw
 vWh
@@ -63759,12 +65571,12 @@ oYE
 mbs
 oFh
 oku
+tNu
+pDh
 oku
-jYD
 oku
-itb
-iLk
-nXk
+pbD
+ecT
 kkL
 eaq
 dTF
@@ -63921,7 +65733,7 @@ pRW
 pRW
 pRW
 xVe
-kim
+cBo
 neh
 tcy
 bKE
@@ -63945,21 +65757,21 @@ ejr
 ejr
 eRd
 pkD
-pkD
+tKc
 tUb
 dhy
 eXR
 ybr
 mbs
 xnE
-lrJ
-xGB
-tso
-peR
-gIr
-pho
-jye
-qtW
+oku
+oku
+jYD
+oku
+itb
+iLk
+nXk
+kkL
 vFG
 xhP
 kkL
@@ -64115,7 +65927,7 @@ pRW
 pRW
 pRW
 xVe
-xIf
+iXg
 neh
 tcy
 jRK
@@ -64146,14 +65958,14 @@ vWh
 oYE
 mbs
 gzk
-mzy
-kZh
-tOc
-mQm
-ktt
-rnw
-dKK
-kkL
+lrJ
+xGB
+tso
+peR
+gIr
+pho
+jye
+qtW
 qKR
 cEs
 kkL
@@ -64309,7 +66121,7 @@ pRW
 pRW
 pRW
 xVe
-xIf
+eEN
 neh
 tcy
 jRK
@@ -64340,13 +66152,13 @@ oJk
 oYE
 mbs
 sgy
-oku
-oku
-oku
-oku
-kJt
+mzy
+kZh
+tOc
+mQm
+ktt
 rnw
-kwz
+dKK
 kkL
 muS
 pZN
@@ -64503,7 +66315,7 @@ pRW
 jRE
 qBd
 xVe
-xIf
+xLC
 neh
 tcy
 jRK
@@ -64534,13 +66346,13 @@ vWh
 oYE
 mbs
 hog
-bYo
 oku
 oku
 oku
-xYz
+oku
+kJt
 rnw
-kDA
+kwz
 kkL
 hdR
 hdR
@@ -64728,14 +66540,14 @@ ioD
 xcG
 mbs
 hDD
-hDv
-egt
-bFy
+vcl
+oku
 oku
-nOY
-rnw
-acD
 oku
+xYz
+rnw
+kDA
+kkL
 bYo
 bYo
 bYo
@@ -64891,7 +66703,7 @@ pRW
 jRE
 qBd
 xVe
-xIf
+gUD
 neh
 tcy
 jRK
@@ -64915,21 +66727,21 @@ rpj
 waa
 fIK
 rpj
-pUI
+fZH
 tUb
 aua
 sNd
 nRt
 aPI
 roU
-bYo
+aaL
 vcl
-bYo
-btU
-fIs
+bFy
+oku
+nOY
 rnw
-gzO
-btU
+acD
+oku
 bYo
 bYo
 bYo
@@ -65103,13 +66915,13 @@ sKw
 kzS
 xqb
 tUb
-pkD
-pkD
+iYl
+nHX
 pkD
 jyg
 jGa
 rpj
-pUI
+fZH
 gyu
 vVV
 fYZ
@@ -65120,9 +66932,9 @@ hDv
 joN
 bYo
 btU
-qNR
-lbw
-oXk
+fIs
+rnw
+gzO
 btU
 bYo
 bYo
@@ -65297,9 +67109,9 @@ oGt
 mFT
 uXO
 tUb
+eop
 pkD
-pkD
-pkD
+sZg
 jyg
 jGa
 rpj
@@ -65313,11 +67125,11 @@ bYo
 bYo
 nmL
 egt
-oku
-oku
-bJp
-oku
-oku
+btU
+qNR
+lbw
+oXk
+btU
 bYo
 bYo
 bYo
@@ -65492,12 +67304,12 @@ mFT
 ruu
 tUb
 fNy
-gkx
+tJj
 gkx
 qLC
 jGa
 pkD
-hlS
+khI
 tUb
 vqH
 sqA
@@ -65509,7 +67321,7 @@ oJH
 qJU
 oku
 oku
-nBs
+bJp
 oku
 oku
 bYo
@@ -65667,7 +67479,7 @@ pRW
 pRW
 pRW
 xVe
-xIf
+qLF
 neh
 tcy
 bKE
@@ -65690,8 +67502,8 @@ ejD
 ejD
 tVO
 ruN
-pkD
-pkD
+vJE
+cCs
 tUb
 aua
 sqA
@@ -65880,20 +67692,20 @@ gJm
 nDt
 tUb
 nMP
-pkD
-pkD
+vJE
+vJE
 jyg
 nMP
 nMP
-pkD
+hMj
 tUb
 xDb
 kJL
 dUT
 mbs
 bYo
-bFP
 bYo
+bFP
 nmL
 hDv
 ndI
@@ -66055,9 +67867,9 @@ pRW
 pRW
 pRW
 xVe
-xIf
-xIf
-xIf
+tzN
+neh
+gUD
 tcy
 wMp
 nnJ
@@ -66077,21 +67889,21 @@ gAp
 nMP
 nMP
 jyg
-ruN
+nMP
 nMP
 tUb
 tUb
 sgw
 uhS
 xcG
-iro
-iro
-iro
-iro
-iro
-iro
-iro
-iro
+pix
+pix
+kPA
+pix
+pix
+pix
+pix
+pix
 nGk
 nGk
 nGk
@@ -66250,9 +68062,9 @@ pRW
 pRW
 xVe
 xVe
+neh
 xIf
-xIf
-xIf
+xLC
 tcy
 wMp
 wMp
@@ -66267,9 +68079,9 @@ aJe
 gJm
 nDt
 tUb
-pkD
-pkD
-pkD
+vPe
+oPM
+ozJ
 wOZ
 cTu
 cTu
@@ -66278,14 +68090,14 @@ aQB
 kUg
 cmT
 oYE
-nhq
-hlS
-pkD
-pkD
-pkD
-hlS
-pkD
-iro
+scX
+bKt
+nRM
+eEw
+gzF
+shb
+lQV
+pix
 nGk
 nGk
 mbs
@@ -66444,11 +68256,11 @@ pRW
 pRW
 pRW
 xVe
-xVe
-xVe
-xIf
+lCS
+neh
 xIf
 xIf
+xVe
 eYK
 eYK
 eYK
@@ -66461,25 +68273,25 @@ vLg
 gJm
 nDt
 tUb
-pkD
-pkD
-pkD
-pkD
-pkD
-pkD
+oOZ
+iGp
+tgP
+tqJ
+eki
+qIW
 tUb
 tcX
 fRp
 mih
 bZw
-nhq
-pkD
-pkD
-pkD
-pkD
-pkD
-pkD
-iro
+scX
+nwK
+omO
+omO
+wyD
+ltG
+cGM
+pix
 nGk
 mbs
 mbs
@@ -66637,17 +68449,17 @@ pRW
 pRW
 pRW
 pRW
-pRW
-pRW
 xVe
-xIf
-xIf
-teE
-gfA
-gfA
-gfA
-gfA
-gfA
+gUD
+lCS
+neh
+neh
+svm
+sHP
+sHP
+wmt
+gNW
+dQO
 teE
 eYK
 eYK
@@ -66666,14 +68478,14 @@ jpu
 vWh
 bgF
 oYE
-nhq
-pkD
-pkD
-pkD
-pkD
-pkD
-pkD
-iro
+scX
+qbw
+rjm
+ozQ
+pmu
+kBm
+eoQ
+pix
 mbs
 mbs
 pRW
@@ -66831,16 +68643,16 @@ pRW
 pRW
 pRW
 pRW
-pRW
-pRW
 xVe
 xVe
 xVe
-teE
+xVe
+xVe
+mNh
 gfA
 sHP
-gfA
-gfA
+jYQ
+myR
 gfA
 eYK
 eYK
@@ -66861,12 +68673,12 @@ vWh
 bgF
 fDK
 nhq
-pkD
-pkD
-pkD
-pkD
-pkD
-pkD
+nhq
+iAd
+nhq
+nhq
+nhq
+nhq
 nhq
 lmG
 qBd
@@ -67055,12 +68867,12 @@ tUG
 bEj
 oYE
 biu
-pkD
-pkD
-pkD
-pkD
-pkD
-pkD
+sFS
+kNG
+nhq
+kCh
+rdi
+rif
 nhq
 qBd
 jRE
@@ -67226,10 +69038,10 @@ pRW
 gCJ
 mNh
 hDu
-gfA
-gfA
-gfA
-gfA
+blQ
+iqF
+eCi
+cLY
 mNh
 aLB
 byX
@@ -67249,11 +69061,11 @@ vWh
 fKA
 xcG
 nhq
-iDd
-pkD
-pkD
-pkD
-pkD
+naZ
+kNG
+nhq
+vMh
+ayx
 vtx
 nhq
 pRW
@@ -67419,11 +69231,11 @@ pRW
 jRE
 qBd
 mNh
-gfA
-gfA
-gfA
-gfA
-gfA
+mNh
+mNh
+mNh
+khm
+mNh
 eYK
 eah
 gHJ
@@ -67443,12 +69255,12 @@ vWh
 pXE
 ana
 nhq
-pkD
-pkD
-pkD
-pkD
-pkD
-pkD
+wFI
+kNG
+luU
+qxd
+cxF
+eKl
 nhq
 pRW
 pRW
@@ -67613,9 +69425,9 @@ pRW
 qBd
 lmG
 mNh
-gfA
-gfA
-gfA
+hDu
+fcG
+fcG
 gfA
 gfA
 mNh
@@ -67637,12 +69449,12 @@ fWJ
 oaJ
 vnb
 cTz
-pkD
-pkD
-pkD
-pkD
-pkD
-pkD
+kYT
+miz
+wTK
+xLo
+fpp
+wvk
 nhq
 pRW
 pRW
@@ -67806,10 +69618,10 @@ pRW
 pRW
 jRE
 qBd
-mNh
-gfA
-gfA
-gfA
+how
+cjm
+lTS
+sTu
 gfA
 gfA
 mNh
@@ -67831,12 +69643,12 @@ cwT
 bgF
 vsM
 nhq
-pkD
-pkD
-pkD
-pkD
-pkD
-pkD
+mwB
+xOh
+nhq
+hbR
+kKk
+onF
 nhq
 pRW
 pRW
@@ -68000,10 +69812,10 @@ pRW
 pRW
 pRW
 pRW
-mNh
-gfA
-gfA
+rHP
 gfA
+piI
+piI
 gfA
 gfA
 mNh
@@ -68025,12 +69837,12 @@ hkf
 bkX
 plL
 nhq
-pkD
-pkD
-pkD
-pkD
-pkD
-qUP
+fnA
+nhq
+nhq
+nhq
+nhq
+nhq
 nhq
 lIp
 pRW
@@ -68194,10 +70006,10 @@ pRW
 pRW
 pRW
 pRW
-mNh
-mNh
-mNh
-hDu
+rHP
+rHP
+oko
+axW
 gfA
 gfA
 mNh
@@ -68219,10 +70031,10 @@ nrD
 lbX
 fCt
 nhq
-pkD
-pkD
-pkD
 qUP
+mpL
+wAN
+hSn
 nhq
 nhq
 nhq
@@ -68392,8 +70204,8 @@ pRW
 pRW
 mNh
 mNh
-mNh
-gfA
+dIS
+khm
 mNh
 uro
 gzw
@@ -68413,10 +70225,10 @@ hGF
 wDK
 qaO
 nhq
-pkD
-pkD
-pkD
-nhq
+aFn
+tNI
+rYl
+ecg
 nhq
 pRW
 pRW
@@ -68607,10 +70419,10 @@ fOr
 wqT
 qEo
 nhq
-pkD
-pkD
-pkD
-nhq
+xuc
+iVM
+wzT
+scw
 nhq
 lIp
 pRW
@@ -68801,11 +70613,11 @@ pic
 oCg
 oIp
 nhq
-pkD
-qUP
-nhq
-nhq
-nhq
+pyb
+oli
+eTf
+eTf
+eTf
 pRW
 pRW
 pRW
@@ -68975,7 +70787,7 @@ pRW
 pRW
 gCJ
 mNh
-gfA
+nfQ
 mNh
 bbD
 vhp
@@ -68995,12 +70807,12 @@ pic
 oCg
 oIp
 nhq
-pkD
-nhq
+iur
 nhq
+eTf
 pRW
 pRW
-pRW
+wme
 pRW
 pRW
 mDp
diff --git a/maps/endeavour/levels/deck3.dmm b/maps/endeavour/levels/deck3.dmm
index 647c0eb28ed3..07b3cab005df 100644
--- a/maps/endeavour/levels/deck3.dmm
+++ b/maps/endeavour/levels/deck3.dmm
@@ -31,11 +31,10 @@
 /turf/simulated/floor/wood,
 /area/endeavour/surfacebase/bar_backroom)
 "aaY" = (
-/obj/effect/floor_decal/industrial/warning{
-	dir = 8
-	},
-/turf/simulated/floor/tiled/monodark,
-/area/quartermaster/delivery)
+/obj/machinery/mineral/mint,
+/obj/structure/window/reinforced,
+/turf/simulated/floor/tiled/techmaint,
+/area/quartermaster/warehouse)
 "acd" = (
 /obj/machinery/light_switch{
 	pixel_y = 26
@@ -64,31 +63,30 @@
 	},
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d3starboardforhall)
+"acO" = (
+/obj/random/trash_pile,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d3aftmaint)
 "acT" = (
 /obj/machinery/atmospherics/component/unary/vent_pump/on,
 /obj/structure/table/woodentable,
 /turf/simulated/floor/wood,
 /area/endeavour/hallway/d3fwdhall)
 "acY" = (
-/obj/effect/floor_decal/corner/brown/diagonal,
-/obj/item/stack/flag/yellow{
-	pixel_x = 42;
-	pixel_y = 1
-	},
-/obj/item/stack/flag/yellow{
-	pixel_x = 42;
-	pixel_y = 2
-	},
-/obj/structure/cable/green{
-	icon_state = "1-2"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/tiled/white,
-/area/quartermaster/belterdock/gear)
+/obj/structure/table/reinforced,
+/obj/item/clothing/glasses/welding,
+/obj/item/weldingtool/largetank,
+/obj/random/coin,
+/turf/simulated/floor/plating,
+/area/maintenance/cargo)
 "adf" = (
 /turf/simulated/wall/r_wall/prepainted/security,
 /area/security/hallwayaux)
+"adi" = (
+/obj/machinery/floodlight,
+/obj/structure/railing,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d3aftmaint)
 "adB" = (
 /obj/structure/cable/green{
 	icon_state = "1-2"
@@ -158,6 +156,10 @@
 /obj/machinery/camera/network/cargo{
 	dir = 8
 	},
+/obj/machinery/power/apc/east_mount,
+/obj/structure/cable/green{
+	icon_state = "0-8"
+	},
 /turf/simulated/floor/tiled/dark,
 /area/quartermaster/foyer)
 "agU" = (
@@ -235,6 +237,15 @@
 /obj/structure/adherent_bath,
 /turf/simulated/floor/crystal,
 /area/endeavour/hallway/d3fwdhall)
+"akl" = (
+/obj/machinery/button/remote/blast_door{
+	id = "salvage_launch";
+	name = "Salvager Bay Doors";
+	pixel_y = -5;
+	req_access = list(19)
+	},
+/turf/simulated/wall/r_wall/prepainted/cargo,
+/area/quartermaster/miningdock)
 "akA" = (
 /obj/structure/bed/chair{
 	dir = 4
@@ -290,11 +301,36 @@
 	},
 /turf/simulated/floor/tiled,
 /area/security/lobby)
+"amY" = (
+/obj/effect/floor_decal/borderfloorblack/corner{
+	dir = 1
+	},
+/obj/effect/floor_decal/corner/brown/bordercorner{
+	dir = 1
+	},
+/obj/structure/cable/green{
+	icon_state = "2-4"
+	},
+/turf/simulated/floor/tiled/dark,
+/area/quartermaster/foyer)
 "anL" = (
 /obj/machinery/atmospherics/component/unary/vent_pump/on,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/tiled/monotile,
 /area/security/hallway)
+"anU" = (
+/obj/effect/floor_decal/techfloor{
+	dir = 8
+	},
+/obj/effect/floor_decal/techfloor/hole{
+	dir = 8
+	},
+/obj/machinery/recharge_station,
+/obj/machinery/light/small{
+	dir = 8
+	},
+/turf/simulated/floor/tiled/techfloor,
+/area/maintenance/bar/catwalk)
 "aoe" = (
 /obj/effect/floor_decal/borderfloorblack{
 	dir = 4
@@ -372,15 +408,18 @@
 /turf/simulated/floor/tiled/old_cargo/gray,
 /area/security/evidence_storage)
 "aqN" = (
-/obj/machinery/power/apc/west_mount{
-	cell_type = /obj/item/cell/super
+/obj/effect/floor_decal/borderfloorblack{
+	dir = 8
 	},
-/obj/structure/cable/green{
-	icon_state = "0-2"
+/obj/effect/floor_decal/corner/brown/border{
+	dir = 8
 	},
-/obj/effect/floor_decal/spline/plain,
-/turf/simulated/floor/carpet/turcarpet,
-/area/crew_quarters/recreation_area)
+/obj/machinery/door/airlock/multi_tile/glass{
+	name = "Warehouse"
+	},
+/obj/map_helper/access_helper/airlock/station/supply/department,
+/turf/simulated/floor/tiled/dark,
+/area/quartermaster/warehouse)
 "aqY" = (
 /obj/structure/table/woodentable,
 /obj/machinery/microwave,
@@ -447,6 +486,18 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/tiled/monodark,
 /area/quartermaster/foyer)
+"atS" = (
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 1
+	},
+/obj/structure/cable/green{
+	icon_state = "1-8"
+	},
+/turf/simulated/floor/tiled,
+/area/endeavour/hallway/d3portforhall)
 "atT" = (
 /obj/structure/cable/green{
 	icon_state = "4-8"
@@ -454,10 +505,19 @@
 /obj/structure/cable/green{
 	icon_state = "1-4"
 	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
 /turf/simulated/floor/tiled/dark,
 /area/quartermaster/warehouse)
+"atU" = (
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/turf/simulated/floor/plating,
+/area/quartermaster/foyer)
 "aup" = (
 /obj/machinery/computer/guestpass{
 	dir = 1;
@@ -526,14 +586,14 @@
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d3portforhall)
 "avQ" = (
-/obj/machinery/light,
-/obj/structure/cable/green{
-	icon_state = "1-8"
+/obj/machinery/conveyor{
+	dir = 8;
+	id = "mining_interior"
 	},
-/obj/structure/ore_box,
-/obj/effect/floor_decal/industrial/outline/yellow,
-/turf/simulated/floor/reinforced,
-/area/quartermaster/miningdock)
+/obj/machinery/mineral/output,
+/obj/machinery/light,
+/turf/simulated/floor/tiled/monodark,
+/area/quartermaster/belterdock/refinery)
 "avW" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -639,11 +699,9 @@
 /turf/simulated/floor/tiled/old_cargo/gray,
 /area/security/evidence_storage)
 "ays" = (
-/obj/structure/table/standard,
-/obj/item/hand_labeler,
-/obj/item/hand_labeler,
-/turf/simulated/floor/tiled/monodark,
-/area/quartermaster/delivery)
+/obj/structure/salvageable/autolathe,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d3aftmaint)
 "ayC" = (
 /obj/structure/toilet{
 	dir = 8
@@ -679,6 +737,13 @@
 	},
 /turf/simulated/floor/wood,
 /area/security/lobby)
+"aAy" = (
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/obj/structure/catwalk,
+/turf/simulated/floor/plating,
+/area/quartermaster/foyer)
 "aAA" = (
 /obj/machinery/camera/network/civilian{
 	dir = 1
@@ -724,16 +789,15 @@
 /turf/simulated/floor/tiled/dark,
 /area/janitor)
 "aBc" = (
-/obj/effect/floor_decal/borderfloor{
-	dir = 9
-	},
-/obj/effect/floor_decal/corner/brown/border{
+/obj/effect/floor_decal/spline/fancy/wood{
 	dir = 9
 	},
-/obj/structure/bed/chair/sofa/black/corner{
-	dir = 1
+/obj/structure/table/wooden_reinforced,
+/obj/machinery/recharger{
+	pixel_x = -6;
+	pixel_y = 2
 	},
-/turf/simulated/floor/tiled,
+/turf/simulated/floor/wood,
 /area/endeavour/surfacebase/mining_main/break_room)
 "aBl" = (
 /obj/structure/closet/wardrobe,
@@ -753,6 +817,11 @@
 /obj/structure/disposalpipe/segment,
 /turf/simulated/floor/tiled,
 /area/quartermaster/belterdock)
+"aCg" = (
+/obj/structure/closet/emcloset,
+/obj/machinery/light/small,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d3aftmaint)
 "aCi" = (
 /obj/machinery/door/firedoor{
 	dir = 8
@@ -789,32 +858,20 @@
 /turf/space,
 /area/space)
 "aDs" = (
-/obj/structure/cable/green{
-	icon_state = "1-2"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/turf/simulated/floor/tiled/dark,
-/area/quartermaster/foyer)
-"aDw" = (
-/obj/machinery/conveyor_switch/oneway{
-	id = "mining_interior";
-	name = "refining conveyor";
-	pixel_y = 2;
-	pixel_x = -11
+/obj/structure/cable/green{
+	icon_state = "1-4"
 	},
-/obj/effect/floor_decal/industrial/warning/dust{
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
 	dir = 1
 	},
-/turf/simulated/floor/tiled/monodark,
-/area/quartermaster/belterdock/refinery)
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+	dir = 1
+	},
+/turf/simulated/floor/tiled/dark,
+/area/quartermaster/foyer)
 "aDU" = (
 /turf/simulated/wall/r_wall/prepainted/cargo,
 /area/quartermaster/belterdock/refinery)
@@ -827,12 +884,6 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/security/security_equiptment_storage)
-"aFt" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 6
-	},
-/turf/simulated/floor/reinforced,
-/area/quartermaster/miningdock)
 "aFF" = (
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply,
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
@@ -849,7 +900,7 @@
 /obj/effect/floor_decal/borderfloor,
 /obj/effect/floor_decal/corner/brown/border,
 /turf/simulated/floor/tiled,
-/area/endeavour/surfacebase/mining_main/break_room)
+/area/quartermaster/cargo_shelter_dock)
 "aGh" = (
 /obj/effect/floor_decal/corner/blue{
 	dir = 4
@@ -896,17 +947,11 @@
 /turf/simulated/floor/tiled,
 /area/security/lobby)
 "aGE" = (
-/obj/effect/floor_decal/borderfloor{
-	dir = 1
-	},
-/obj/effect/floor_decal/corner/brown/border{
-	dir = 1
-	},
 /obj/machinery/air_alarm{
 	pixel_y = 22
 	},
-/turf/simulated/floor/tiled,
-/area/endeavour/surfacebase/mining_main/break_room)
+/turf/simulated/wall/prepainted/cargo,
+/area/quartermaster/cargo_shelter_dock)
 "aGV" = (
 /obj/effect/floor_decal/borderfloor{
 	dir = 8
@@ -965,7 +1010,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/tiled,
-/area/endeavour/surfacebase/mining_main/break_room)
+/area/quartermaster/cargo_shelter_dock)
 "aHR" = (
 /obj/effect/floor_decal/corner/green{
 	dir = 9
@@ -1024,8 +1069,11 @@
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d3portforhall)
 "aIZ" = (
-/turf/simulated/floor/tiled/monodark,
-/area/quartermaster/delivery)
+/obj/machinery/light/small{
+	dir = 4
+	},
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d3aftmaint)
 "aKg" = (
 /obj/machinery/washing_machine,
 /turf/simulated/floor/tiled/white,
@@ -1214,6 +1262,15 @@
 /obj/machinery/door/firedoor,
 /turf/simulated/floor/tiled/dark,
 /area/endeavour/station/stairs_three)
+"aTk" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/dark,
+/area/quartermaster/warehouse)
 "aTm" = (
 /obj/structure/cable/green{
 	icon_state = "4-8"
@@ -1231,7 +1288,6 @@
 	dir = 8
 	},
 /obj/machinery/door/airlock/maintenance,
-/obj/map_helper/access_helper/airlock/station/maintenance,
 /obj/structure/catwalk,
 /turf/simulated/floor/plating,
 /area/maintenance/bar/catwalk)
@@ -1458,7 +1514,7 @@
 	use_power = 0
 	},
 /turf/simulated/floor/tiled,
-/area/endeavour/surfacebase/mining_main/break_room)
+/area/quartermaster/cargo_shelter_dock)
 "aZS" = (
 /obj/structure/cable/orange{
 	icon_state = "4-8"
@@ -1760,6 +1816,7 @@
 /area/security/evidence_storage)
 "bhw" = (
 /obj/structure/table/hardwoodtable,
+/obj/item/orion_ship,
 /turf/simulated/floor/carpet/bcarpet,
 /area/quartermaster/qm)
 "bhC" = (
@@ -1789,11 +1846,11 @@
 /turf/simulated/floor,
 /area/security/brig)
 "bhP" = (
-/obj/effect/floor_decal/spline/plain{
-	dir = 1
-	},
-/obj/structure/flora/grass/event/generic_bush1,
-/turf/simulated/floor/grass,
+/obj/structure/table/steel_reinforced,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/fiftyspawner/steel,
+/obj/fiftyspawner/steel,
+/turf/simulated/floor/tiled/techmaint,
 /area/quartermaster/warehouse)
 "bhQ" = (
 /obj/effect/floor_decal/borderfloorblack{
@@ -1818,16 +1875,10 @@
 /turf/simulated/floor/plating,
 /area/maintenance/substation/cargo)
 "biZ" = (
-/obj/machinery/mineral/processing_unit_console{
-	density = 0;
-	pixel_y = -33;
-	pixel_x = 0
-	},
-/obj/effect/floor_decal/industrial/warning/dust{
-	dir = 1
-	},
-/turf/simulated/floor/tiled/monodark,
-/area/quartermaster/belterdock/refinery)
+/obj/structure/table/steel_reinforced,
+/obj/item/storage/box/lights/mixed,
+/turf/simulated/floor/reinforced,
+/area/quartermaster/miningdock)
 "bje" = (
 /obj/machinery/recharge_station,
 /obj/machinery/light/small{
@@ -1888,15 +1939,10 @@
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d3portamidhall)
 "blB" = (
-/obj/effect/floor_decal/corner/brown/diagonal,
-/obj/structure/closet/secure_closet/miner,
-/obj/item/binoculars,
-/obj/machinery/light{
-	dir = 1;
-	pixel_y = 20
-	},
-/turf/simulated/floor/tiled/white,
-/area/quartermaster/belterdock/gear)
+/obj/structure/mopbucket,
+/obj/item/mop,
+/turf/simulated/floor/plating,
+/area/quartermaster/storage)
 "blM" = (
 /obj/effect/floor_decal/spline/fancy/wood,
 /obj/machinery/atmospherics/component/unary/vent_pump/on{
@@ -1957,14 +2003,9 @@
 /turf/simulated/floor/plating,
 /area/endeavour/hallway/d3aftmaint)
 "bol" = (
-/obj/effect/floor_decal/spline/fancy/wood{
-	dir = 1
-	},
-/obj/structure/bed/chair{
-	dir = 8
-	},
-/turf/simulated/floor/wood,
-/area/endeavour/surfacebase/mining_main/break_room)
+/obj/machinery/vending/snack,
+/turf/simulated/floor/tiled/dark,
+/area/quartermaster/cargo_shelter_dock)
 "box" = (
 /obj/effect/floor_decal/borderfloorblack{
 	dir = 4
@@ -1981,10 +2022,14 @@
 /turf/simulated/floor/tiled/dark,
 /area/security/hallway)
 "boI" = (
-/obj/effect/floor_decal/borderfloorblack,
-/obj/effect/floor_decal/corner/brown/border,
-/obj/machinery/air_alarm/south_mount,
-/turf/simulated/floor/tiled/monodark,
+/obj/machinery/door/firedoor{
+	dir = 8
+	},
+/obj/machinery/door/airlock/maintenance,
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/turf/simulated/floor/plating,
 /area/quartermaster/foyer)
 "boM" = (
 /obj/structure/cable/green{
@@ -2020,18 +2065,16 @@
 /turf/simulated/floor/tiled,
 /area/security/brig)
 "bpu" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 6
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
 /obj/structure/disposalpipe/segment,
 /obj/structure/cable/green{
 	icon_state = "2-4"
 	},
-/turf/simulated/floor/tiled/monotile,
-/area/quartermaster/belterdock/refinery)
+/obj/structure/catwalk,
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d3aftmaint)
 "bqn" = (
 /obj/structure/sign/directions/cryo{
 	dir = 4;
@@ -2055,18 +2098,13 @@
 /turf/simulated/floor/tiled/monotile,
 /area/endeavour/hallway/d3afthall)
 "bqs" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/obj/structure/disposalpipe/segment{
-	dir = 4;
-	icon_state = "pipe-c"
+/obj/effect/floor_decal/corner/brown/diagonal,
+/obj/structure/disposalpipe/segment,
+/obj/structure/cable/green{
+	icon_state = "1-4"
 	},
-/turf/simulated/floor/tiled/techmaint,
-/area/quartermaster/warehouse)
+/turf/simulated/floor/tiled/white,
+/area/quartermaster/belterdock/gear)
 "brs" = (
 /obj/machinery/power/terminal,
 /obj/structure/cable{
@@ -2109,13 +2147,14 @@
 	},
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d3starboardafthall)
+"bsN" = (
+/obj/structure/railing,
+/turf/simulated/floor/plating,
+/area/maintenance/bar/catwalk)
 "bsV" = (
 /obj/spawner/window/borosillicate/reinforced/full/firelocks,
 /turf/simulated/floor/plating,
 /area/endeavour/hallway/d3fwdhall)
-"bta" = (
-/turf/simulated/floor/reinforced,
-/area/maintenance/bar/catwalk)
 "btf" = (
 /obj/machinery/atmospherics/component/unary/vent_scrubber/on,
 /obj/effect/floor_decal/borderfloorblack{
@@ -2161,6 +2200,16 @@
 	},
 /turf/simulated/floor/tiled,
 /area/hydroponics)
+"bug" = (
+/obj/structure/catwalk,
+/obj/structure/railing{
+	dir = 8
+	},
+/obj/structure/cable/green{
+	icon_state = "2-4"
+	},
+/turf/simulated/floor/plating,
+/area/maintenance/bar/catwalk)
 "buq" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -2227,17 +2276,18 @@
 /turf/simulated/floor/tiled/dark,
 /area/quartermaster/warehouse)
 "buX" = (
-/obj/structure/disposalpipe/segment{
+/obj/random/trash_pile,
+/obj/structure/railing{
 	dir = 8
 	},
-/obj/machinery/light{
-	dir = 1
+/obj/structure/railing{
+	dir = 4
 	},
-/obj/structure/cable/green{
-	icon_state = "4-8"
+/obj/structure/railing{
+	dir = 1
 	},
-/turf/simulated/floor/tiled,
-/area/maintenance/bar/lower)
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d3aftmaint)
 "bvs" = (
 /obj/machinery/air_alarm{
 	dir = 4;
@@ -2246,15 +2296,28 @@
 /turf/simulated/floor/tiled/old_cargo/gray,
 /area/security/security_processing)
 "bvE" = (
-/obj/structure/window/reinforced{
-	dir = 4
+/obj/structure/table/reinforced,
+/obj/machinery/door/window{
+	dir = 8;
+	req_one_access = list(31)
 	},
-/obj/structure/window/reinforced{
+/obj/item/paper_bin{
+	pixel_x = -1;
+	pixel_y = 4
+	},
+/obj/item/folder/white,
+/obj/item/pen,
+/obj/machinery/door/firedoor{
 	dir = 8
 	},
-/obj/structure/flora/grass/event/yellow_flowers1,
-/turf/simulated/floor/grass,
-/area/quartermaster/foyer)
+/obj/effect/floor_decal/borderfloorblack{
+	dir = 4
+	},
+/obj/effect/floor_decal/corner/brown/border{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/monodark,
+/area/quartermaster/delivery)
 "bvI" = (
 /obj/machinery/light/small{
 	dir = 8
@@ -2290,6 +2353,9 @@
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply,
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
 /turf/simulated/floor/reinforced,
 /area/quartermaster/miningdock)
 "byF" = (
@@ -2369,9 +2435,7 @@
 /obj/effect/floor_decal/corner/navblue/border,
 /obj/effect/floor_decal/borderfloorblack/corner2,
 /obj/effect/floor_decal/corner/navblue/bordercorner2,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d3portforhall)
 "bBc" = (
@@ -2385,10 +2449,6 @@
 /turf/space,
 /area/space)
 "bBM" = (
-/obj/machinery/mech_recharger,
-/obj/effect/floor_decal/industrial/warning{
-	dir = 6
-	},
 /obj/machinery/fire_alarm/north_mount,
 /turf/simulated/floor/tiled/steel_grid,
 /area/quartermaster/belterdock)
@@ -2545,14 +2605,16 @@
 /turf/simulated/floor/plating,
 /area/endeavour/command/turrets)
 "bHV" = (
+/obj/machinery/light{
+	dir = 1
+	},
 /obj/effect/floor_decal/borderfloorblack{
 	dir = 1
 	},
 /obj/effect/floor_decal/corner/brown/border{
 	dir = 1
 	},
-/obj/structure/bed/chair/sofa/black,
-/turf/simulated/floor/tiled/dark,
+/turf/simulated/floor/tiled/techmaint,
 /area/quartermaster/warehouse)
 "bIs" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -2572,6 +2634,22 @@
 	},
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d3starboardafthall)
+"bJh" = (
+/obj/machinery/door/firedoor/glass,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 1
+	},
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
+/obj/map_helper/access_helper/airlock/station/supply/cargo_bay,
+/obj/machinery/door/airlock/glass/mining{
+	name = "Magmatic Rift Leap Pad";
+	req_one_access = null
+	},
+/turf/simulated/floor/tiled/monodark,
+/area/quartermaster/delivery)
 "bJy" = (
 /obj/machinery/door/airlock/maintenance,
 /obj/map_helper/access_helper/airlock/station/engineering/department,
@@ -2626,6 +2704,8 @@
 /obj/structure/disposalpipe/junction/flipped{
 	dir = 4
 	},
+/obj/effect/floor_decal/borderfloorblack,
+/obj/effect/floor_decal/corner/brown/border,
 /turf/simulated/floor/tiled/monodark,
 /area/quartermaster/foyer)
 "bLl" = (
@@ -2714,9 +2794,17 @@
 /turf/simulated/floor/wood,
 /area/quartermaster/qm)
 "bPg" = (
-/obj/landmark/spawnpoint/job/cargo_technician,
-/turf/simulated/floor/tiled/dark,
-/area/quartermaster/warehouse)
+/obj/machinery/light/small{
+	dir = 4
+	},
+/obj/machinery/air_alarm{
+	dir = 8;
+	pixel_x = 25
+	},
+/obj/structure/table/wooden_reinforced,
+/obj/random/coin,
+/turf/simulated/floor/wood,
+/area/maintenance/cargo)
 "bPr" = (
 /turf/simulated/wall/r_wall/prepainted/security,
 /area/security/security_lockerroom)
@@ -2725,14 +2813,11 @@
 /turf/simulated/floor/wood,
 /area/tether/surfacebase/entertainment)
 "bQe" = (
-/obj/effect/floor_decal/borderfloor/corner{
-	dir = 1
-	},
-/obj/effect/floor_decal/corner/brown/bordercorner{
-	dir = 1
-	},
+/obj/map_helper/access_helper/airlock/station/supply/mining,
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/multi_tile/metal/mait,
 /turf/simulated/floor/tiled/monotile,
-/area/quartermaster/belterdock/refinery)
+/area/endeavour/hallway/d3aftmaint)
 "bQp" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -2795,6 +2880,14 @@
 	},
 /turf/simulated/floor/carpet/oracarpet,
 /area/crew_quarters/sleep/Dorm_6)
+"bTd" = (
+/obj/machinery/door/airlock/glass/mining{
+	name = "Magmatic Rift Leap Pad";
+	req_one_access = null
+	},
+/obj/machinery/door/firedoor,
+/turf/simulated/floor/tiled/dark,
+/area/quartermaster/foyer)
 "bTj" = (
 /obj/machinery/computer/security/wooden_tv,
 /turf/simulated/floor/carpet,
@@ -2939,13 +3032,24 @@
 /turf/simulated/floor/tiled/old_cargo/gray,
 /area/prison/cell_block)
 "bWp" = (
-/obj/effect/floor_decal/corner/brown/diagonal,
-/obj/machinery/suit_cycler/mining,
-/turf/simulated/floor/tiled/white,
-/area/quartermaster/belterdock/gear)
+/obj/machinery/light/small{
+	dir = 1
+	},
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
+/turf/simulated/floor/plating,
+/area/quartermaster/storage)
 "bWK" = (
 /turf/simulated/wall/prepainted,
 /area/endeavour/station/stairs_three)
+"bWR" = (
+/obj/random/trash_pile,
+/obj/structure/railing{
+	dir = 1
+	},
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d3aftmaint)
 "bXD" = (
 /obj/spawner/window/low_wall/reinforced/full/firelocks,
 /obj/effect/paint/palebottlegreen,
@@ -3050,14 +3154,17 @@
 /turf/simulated/floor/tiled/dark,
 /area/quartermaster/warehouse)
 "cdn" = (
-/obj/machinery/conveyor{
-	dir = 8;
-	id = "mining_interior"
+/obj/effect/floor_decal/borderfloorblack{
+	dir = 4
 	},
-/obj/machinery/mineral/output,
-/obj/machinery/light,
-/turf/simulated/floor/tiled/monodark,
-/area/quartermaster/belterdock/refinery)
+/obj/effect/floor_decal/corner/brown/border{
+	dir = 4
+	},
+/obj/machinery/door/firedoor{
+	dir = 8
+	},
+/turf/simulated/floor/tiled/dark,
+/area/quartermaster/foyer)
 "cdy" = (
 /obj/machinery/atmospherics/component/unary/vent_scrubber/on{
 	dir = 4
@@ -3144,7 +3251,7 @@
 	desc = "Heavy duty, airtight, plastic flaps."
 	},
 /turf/simulated/floor/plating,
-/area/quartermaster/delivery)
+/area/endeavour/hallway/d3aftmaint)
 "chh" = (
 /turf/simulated/floor/tiled/techfloor,
 /area/security/lobby)
@@ -3219,6 +3326,15 @@
 	},
 /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,
 /obj/structure/disposalpipe/junction,
+/obj/effect/floor_decal/borderfloorblack/corner{
+	dir = 8
+	},
+/obj/effect/floor_decal/corner/brown/bordercorner{
+	dir = 8
+	},
+/obj/structure/cable/green{
+	icon_state = "1-4"
+	},
 /turf/simulated/floor/tiled/dark,
 /area/quartermaster/foyer)
 "cmw" = (
@@ -3233,8 +3349,17 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 10
 	},
-/obj/structure/disposalpipe/segment{
-	dir = 4
+/obj/structure/disposalpipe/junction/flipped{
+	dir = 8
+	},
+/obj/structure/cable/green{
+	icon_state = "2-8"
+	},
+/obj/structure/cable/green{
+	icon_state = "2-4"
+	},
+/obj/machinery/door/firedoor{
+	dir = 1
 	},
 /turf/simulated/floor/tiled/dark,
 /area/quartermaster/foyer)
@@ -3246,6 +3371,19 @@
 	},
 /turf/simulated/floor/tiled/steel,
 /area/shuttle/mining_ship/general)
+"cna" = (
+/obj/structure/sign/warning/moving_parts{
+	pixel_y = 32
+	},
+/obj/machinery/conveyor_switch/oneway{
+	tag = "mailroom";
+	id = "DLBelt"
+	},
+/obj/effect/floor_decal/industrial/warning{
+	dir = 8
+	},
+/turf/simulated/floor/tiled/monodark,
+/area/quartermaster/delivery)
 "cnc" = (
 /obj/structure/table/woodentable,
 /turf/simulated/floor/carpet/bcarpet,
@@ -3369,9 +3507,9 @@
 /turf/simulated/floor/wood,
 /area/crew_quarters/sleep/Dorm_13)
 "crM" = (
-/obj/machinery/air_alarm/north_mount,
-/turf/simulated/floor/carpet/blue,
-/area/crew_quarters/sleep/Dorm_11)
+/obj/structure/bed/chair/comfy/brown,
+/turf/simulated/floor/wood,
+/area/maintenance/cargo)
 "csb" = (
 /turf/simulated/floor/airless/ceiling,
 /area/space)
@@ -3521,8 +3659,7 @@
 /area/quartermaster/warehouse)
 "cyG" = (
 /obj/machinery/status_display/supply_display{
-	pixel_x = -32;
-	pixel_y = 0
+	pixel_x = -32
 	},
 /turf/simulated/floor/wood,
 /area/quartermaster/qm)
@@ -3566,6 +3703,10 @@
 /obj/machinery/vending/loadout/loadout_misc,
 /turf/simulated/floor/tiled/dark,
 /area/vacant/vacant_shop)
+"cBK" = (
+/obj/effect/floor_decal/industrial/outline/blue,
+/turf/simulated/floor/tiled/dark,
+/area/quartermaster/warehouse)
 "cBR" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -3655,25 +3796,28 @@
 /turf/simulated/floor/tiled,
 /area/security/hanger)
 "cDv" = (
-/obj/effect/floor_decal/borderfloorblack/corner{
-	dir = 8
+/obj/machinery/mineral/processing_unit_console{
+	density = 0;
+	pixel_y = -33
 	},
-/obj/effect/floor_decal/corner/brown/bordercorner{
-	dir = 8
+/obj/effect/floor_decal/industrial/warning/dust{
+	dir = 1
 	},
-/turf/simulated/floor/tiled/dark,
-/area/quartermaster/foyer)
+/turf/simulated/floor/tiled/monodark,
+/area/quartermaster/belterdock/refinery)
+"cDY" = (
+/obj/random/trash_pile,
+/obj/structure/railing,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d3aftmaint)
 "cEd" = (
-/obj/effect/floor_decal/borderfloor{
-	dir = 8
-	},
-/obj/effect/floor_decal/corner/brown/border{
+/obj/effect/floor_decal/spline/fancy/wood{
 	dir = 8
 	},
-/obj/structure/bed/chair/sofa/black{
-	dir = 4
+/obj/structure/cable/green{
+	icon_state = "2-8"
 	},
-/turf/simulated/floor/tiled,
+/turf/simulated/floor/wood,
 /area/endeavour/surfacebase/mining_main/break_room)
 "cEz" = (
 /obj/structure/cable/green{
@@ -3844,7 +3988,7 @@
 /turf/simulated/wall/prepainted,
 /area/crew_quarters/sleep/Dorm_1)
 "cJJ" = (
-/turf/simulated/wall/r_wall/prepainted/cargo,
+/turf/simulated/wall/r_wall/prepainted,
 /area/vacant/vacant_shop)
 "cKe" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -3894,6 +4038,12 @@
 	},
 /turf/simulated/floor/tiled/old_cargo/gray,
 /area/prison/cell_block)
+"cLq" = (
+/obj/machinery/atmospherics/component/unary/vent_pump/on{
+	dir = 1
+	},
+/turf/simulated/floor/reinforced,
+/area/quartermaster/miningdock)
 "cLH" = (
 /obj/machinery/status_display{
 	pixel_y = 32
@@ -3961,12 +4111,42 @@
 /turf/simulated/floor/tiled/dark,
 /area/security/armoury)
 "cNA" = (
-/obj/structure/flora/pottedplant/thinbush{
-	pixel_x = 0;
-	pixel_y = 3
+/obj/effect/floor_decal/corner/brown/diagonal,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 5
 	},
-/turf/simulated/floor/tiled,
-/area/quartermaster/belterdock)
+/turf/simulated/floor/tiled/white,
+/area/quartermaster/belterdock/gear)
+"cPy" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
+/obj/machinery/door/firedoor{
+	dir = 1
+	},
+/turf/simulated/floor/tiled/dark,
+/area/quartermaster/foyer)
+"cPz" = (
+/obj/structure/table/standard,
+/obj/item/packageWrap,
+/obj/item/packageWrap,
+/obj/item/packageWrap,
+/obj/item/destTagger,
+/obj/machinery/air_alarm{
+	dir = 1;
+	pixel_y = -24
+	},
+/obj/machinery/camera/network/cargo{
+	dir = 4
+	},
+/obj/machinery/light{
+	dir = 8
+	},
+/turf/simulated/floor/tiled/monodark,
+/area/quartermaster/delivery)
 "cPE" = (
 /obj/effect/floor_decal/borderfloorblack{
 	dir = 4
@@ -3977,9 +4157,6 @@
 /obj/structure/disposalpipe/segment,
 /turf/simulated/floor/tiled/dark,
 /area/security/hallway)
-"cPI" = (
-/turf/simulated/wall/r_wall/prepainted,
-/area/security/nuke_storage)
 "cPN" = (
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply{
 	dir = 8
@@ -4016,17 +4193,22 @@
 /turf/simulated/floor/tiled,
 /area/hydroponics)
 "cQm" = (
-/obj/structure/cable/green{
-	icon_state = "4-8"
+/obj/effect/floor_decal/industrial/warning{
+	dir = 8
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+/obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
-/obj/structure/disposalpipe/segment{
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
-/turf/simulated/floor/tiled,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
+/turf/simulated/floor/tiled/techmaint,
 /area/quartermaster/belterdock)
 "cQn" = (
 /obj/machinery/air_alarm{
@@ -4192,8 +4374,22 @@
 /obj/effect/floor_decal/corner/navblue/border{
 	dir = 1
 	},
+/obj/machinery/power/apc/north_mount,
+/obj/structure/cable/green{
+	icon_state = "0-2"
+	},
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d3portforhall)
+"cWd" = (
+/obj/machinery/light/small{
+	dir = 1
+	},
+/obj/structure/closet/crate,
+/obj/random/maintenance/clean,
+/obj/random/maintenance/cargo,
+/obj/random/maintenance/research,
+/turf/simulated/floor/plating,
+/area/maintenance/bar/catwalk)
 "cWp" = (
 /obj/structure/flora/ausbushes/fullgrass,
 /obj/effect/floor_decal/spline/plain{
@@ -4239,9 +4435,6 @@
 /obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/maintenance,
 /obj/structure/catwalk,
-/obj/structure/cable/green{
-	icon_state = "4-8"
-	},
 /obj/map_helper/access_helper/airlock/station/maintenance,
 /turf/simulated/floor/plating,
 /area/crew_quarters/bar/lounge)
@@ -4311,12 +4504,10 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
 /turf/simulated/floor/tiled,
 /area/quartermaster/belterdock)
 "cZm" = (
@@ -4353,21 +4544,6 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/prison/cell_block)
-"daE" = (
-/obj/structure/cable/green{
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/obj/structure/disposalpipe/segment{
-	dir = 4
-	},
-/turf/simulated/floor/tiled/dark,
-/area/quartermaster/foyer)
 "daO" = (
 /turf/simulated/wall/prepainted,
 /area/crew_quarters/sleep/Dorm_4)
@@ -4426,23 +4602,14 @@
 /turf/simulated/floor/tiled,
 /area/hydroponics)
 "dcu" = (
-/obj/effect/floor_decal/borderfloor{
-	dir = 6
-	},
-/obj/effect/floor_decal/corner/brown/border{
-	dir = 6
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 9
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 9
+/obj/effect/floor_decal/borderfloorblack/corner{
+	dir = 8
 	},
-/obj/structure/cable/green{
-	icon_state = "1-8"
+/obj/effect/floor_decal/corner/brown/bordercorner{
+	dir = 8
 	},
-/turf/simulated/floor/tiled/monotile,
-/area/quartermaster/belterdock/refinery)
+/turf/simulated/floor/tiled/dark,
+/area/quartermaster/foyer)
 "dcx" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -4505,9 +4672,6 @@
 "des" = (
 /obj/effect/floor_decal/borderfloorblack,
 /obj/effect/floor_decal/corner/brown/border,
-/obj/structure/cable/green{
-	icon_state = "4-8"
-	},
 /obj/structure/extinguisher_cabinet{
 	pixel_y = -31
 	},
@@ -4710,12 +4874,6 @@
 /obj/effect/floor_decal/corner_oldtile/white/diagonal,
 /turf/simulated/floor/tiled/dark,
 /area/crew_quarters/kitchen)
-"dip" = (
-/obj/effect/floor_decal/borderfloorblack,
-/obj/effect/floor_decal/corner/brown/border,
-/obj/structure/flora/pottedplant/large,
-/turf/simulated/floor/tiled/dark,
-/area/quartermaster/foyer)
 "diG" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -4764,34 +4922,36 @@
 /turf/simulated/floor/wood,
 /area/crew_quarters/sleep/bedrooms)
 "dky" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/obj/effect/floor_decal/steeldecal/steel_decals_central6,
-/obj/structure/disposalpipe/segment{
-	dir = 8
-	},
-/turf/simulated/floor/wood,
-/area/crew_quarters/recreation_area_hallway)
+/obj/structure/reagent_dispensers/watertank,
+/turf/simulated/floor/plating,
+/area/maintenance/cargo)
 "dkE" = (
 /turf/simulated/floor/tiled/white,
 /area/crew_quarters/toilet)
 "dkO" = (
 /obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/glass/mining{
+	name = "Magmatic Rift Leap Pad";
+	req_one_access = null
+	},
 /turf/simulated/floor/tiled/dark,
 /area/quartermaster/foyer)
 "dld" = (
-/obj/machinery/fire_alarm/south_mount{
-	pixel_y = -24
+/obj/effect/floor_decal/borderfloorblack,
+/obj/effect/floor_decal/corner/brown/border,
+/obj/structure/bed/chair/sofa/black{
+	dir = 1
 	},
-/obj/machinery/atmospherics/component/unary/vent_pump/on{
-	dir = 8
+/obj/machinery/status_display/supply_display{
+	pixel_y = -32
 	},
-/turf/simulated/floor/wood,
-/area/crew_quarters/recreation_area_hallway)
+/turf/simulated/floor/tiled/dark,
+/area/quartermaster/foyer)
+"dlE" = (
+/obj/structure/lattice,
+/obj/structure/grille,
+/turf/space/basic,
+/area/space)
 "dlG" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -4828,12 +4988,15 @@
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d3starboardafthall)
 "dmA" = (
-/obj/structure/cable/green{
-	icon_state = "1-2"
+/obj/effect/floor_decal/corner/brown/diagonal,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 5
 	},
-/obj/structure/catwalk,
-/turf/simulated/floor/plating,
-/area/maintenance/bar/catwalk)
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 8
+	},
+/turf/simulated/floor/tiled/white,
+/area/quartermaster/belterdock/gear)
 "dmR" = (
 /obj/machinery/light_switch{
 	pixel_y = -23
@@ -4855,10 +5018,11 @@
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d3starboardafthall)
 "dns" = (
-/obj/structure/disposalpipe/segment,
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 1
+/obj/structure/sign/department/mail{
+	pixel_y = 32
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
 	},
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d3portforhall)
@@ -4926,6 +5090,13 @@
 "dqd" = (
 /turf/simulated/floor/tiled/dark,
 /area/security/range)
+"dqn" = (
+/obj/structure/catwalk,
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
+/turf/simulated/floor/plating,
+/area/maintenance/bar/catwalk)
 "dqu" = (
 /obj/effect/floor_decal/industrial/hatch/yellow,
 /obj/structure/lattice,
@@ -4935,13 +5106,13 @@
 /turf/simulated/open,
 /area/endeavour/hallway/d3aftmaint)
 "dqA" = (
-/obj/effect/floor_decal/borderfloor/corner{
-	dir = 8
+/obj/structure/bed/chair/sofa/black{
+	dir = 1
 	},
-/obj/effect/floor_decal/corner/brown/bordercorner{
-	dir = 8
+/obj/machinery/atmospherics/component/unary/vent_pump/on{
+	dir = 4
 	},
-/turf/simulated/floor/tiled,
+/turf/simulated/floor/wood,
 /area/endeavour/surfacebase/mining_main/break_room)
 "dqN" = (
 /obj/machinery/recharger/wallcharger{
@@ -4982,15 +5153,6 @@
 	},
 /turf/simulated/wall/r_wall/prepainted/cargo,
 /area/shuttle/mining_ship/general)
-"drV" = (
-/obj/effect/floor_decal/borderfloor{
-	dir = 4
-	},
-/obj/effect/floor_decal/corner/brown/border{
-	dir = 4
-	},
-/turf/simulated/floor/tiled/monotile,
-/area/quartermaster/belterdock/refinery)
 "dsm" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
@@ -5086,9 +5248,15 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 5
 	},
-/obj/structure/disposalpipe/segment{
-	dir = 1;
-	icon_state = "pipe-c"
+/obj/effect/floor_decal/borderfloorblack{
+	dir = 8
+	},
+/obj/effect/floor_decal/corner/brown/border{
+	dir = 8
+	},
+/obj/structure/disposalpipe/junction{
+	dir = 2;
+	icon_state = "pipe-j2"
 	},
 /turf/simulated/floor/tiled/dark,
 /area/quartermaster/foyer)
@@ -5164,15 +5332,10 @@
 /turf/simulated/floor/carpet/sblucarpet,
 /area/crew_quarters/sleep/Dorm_7)
 "dAP" = (
-/obj/structure/window/reinforced{
-	dir = 4
-	},
-/obj/structure/window/reinforced{
-	dir = 8
-	},
-/obj/structure/flora/grass/event/sparse_grass2,
-/turf/simulated/floor/grass/indoors,
-/area/quartermaster/foyer)
+/obj/effect/floor_decal/corner/brown/diagonal,
+/obj/structure/closet/secure_closet/miner,
+/turf/simulated/floor/tiled/white,
+/area/quartermaster/belterdock/gear)
 "dAT" = (
 /obj/effect/floor_decal/borderfloorblack{
 	dir = 1
@@ -5306,12 +5469,17 @@
 /turf/simulated/floor/carpet,
 /area/crew_quarters/sleep/Dorm_10)
 "dGV" = (
-/obj/structure/cable/green{
-	icon_state = "1-8"
+/obj/effect/floor_decal/industrial/warning{
+	dir = 4
 	},
-/obj/structure/catwalk,
-/turf/simulated/floor/plating,
-/area/maintenance/bar/catwalk)
+/obj/machinery/atmospheric_field_generator/perma,
+/obj/machinery/shield_diffuser,
+/obj/machinery/door/blast/regular{
+	name = "Salvager Launch Blast Door";
+	id = "salvage_launch"
+	},
+/turf/simulated/floor/reinforced,
+/area/quartermaster/miningdock)
 "dHD" = (
 /obj/structure/disposalpipe/segment{
 	dir = 8
@@ -5336,13 +5504,6 @@
 	},
 /turf/simulated/floor/wood,
 /area/endeavour/hallway/d3fwdhall)
-"dHW" = (
-/obj/effect/floor_decal/spline/plain{
-	dir = 9
-	},
-/obj/structure/flora/grass/event/generic_bush1,
-/turf/simulated/floor/grass,
-/area/quartermaster/warehouse)
 "dHX" = (
 /obj/structure/cable/green{
 	icon_state = "2-8"
@@ -5353,12 +5514,20 @@
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d3fwdhall)
 "dIt" = (
-/obj/effect/floor_decal/borderfloorblack{
-	dir = 10
+/obj/structure/cable/green{
+	icon_state = "4-8"
 	},
-/obj/effect/floor_decal/corner/brown/border{
-	dir = 10
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/obj/effect/floor_decal/borderfloorblack,
+/obj/effect/floor_decal/corner/brown/border,
 /turf/simulated/floor/tiled/dark,
 /area/quartermaster/foyer)
 "dIB" = (
@@ -5397,16 +5566,43 @@
 /obj/effect/floor_decal/corner_oldtile/white/diagonal,
 /turf/simulated/floor/tiled/dark,
 /area/crew_quarters/kitchen)
-"dJV" = (
-/obj/machinery/light{
-	dir = 1;
-	pixel_y = 20
-	},
+"dJc" = (
 /obj/structure/cable/green{
 	icon_state = "4-8"
 	},
-/turf/simulated/floor/reinforced,
-/area/quartermaster/miningdock)
+/turf/simulated/floor/tiled/dark,
+/area/quartermaster/warehouse)
+"dJG" = (
+/obj/structure/sign/directions/cargo{
+	dir = 8;
+	pixel_y = 32
+	},
+/obj/structure/sign/directions/cryo{
+	dir = 4;
+	pixel_y = 25
+	},
+/obj/structure/sign/directions/engineering{
+	dir = 4;
+	pixel_y = 38
+	},
+/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/d3portamidhall)
+"dJV" = (
+/obj/structure/catwalk,
+/obj/structure/cable/green{
+	icon_state = "1-8"
+	},
+/turf/simulated/floor/plating,
+/area/maintenance/cargo)
 "dJX" = (
 /obj/structure/table/marble,
 /obj/machinery/door/blast/shutters{
@@ -5440,15 +5636,18 @@
 /turf/simulated/floor/carpet/sblucarpet,
 /area/crew_quarters/sleep/Dorm_12)
 "dLj" = (
-/obj/structure/cable/green{
-	icon_state = "1-2"
-	},
 /obj/structure/cable/green{
 	icon_state = "2-8"
 	},
 /obj/machinery/atmospherics/component/unary/vent_scrubber/on{
 	dir = 8
 	},
+/obj/effect/floor_decal/borderfloorblack/corner{
+	dir = 4
+	},
+/obj/effect/floor_decal/corner/brown/bordercorner{
+	dir = 4
+	},
 /turf/simulated/floor/tiled/dark,
 /area/quartermaster/foyer)
 "dMA" = (
@@ -5476,6 +5675,13 @@
 	},
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d3afthall)
+"dMH" = (
+/obj/structure/catwalk,
+/obj/structure/cable/green{
+	icon_state = "1-4"
+	},
+/turf/simulated/floor/plating,
+/area/maintenance/cargo)
 "dMY" = (
 /obj/structure/cable/green{
 	icon_state = "4-8"
@@ -5602,7 +5808,7 @@
 	id = "DLBelt"
 	},
 /turf/simulated/floor/plating,
-/area/quartermaster/delivery)
+/area/endeavour/hallway/d3aftmaint)
 "dPb" = (
 /obj/machinery/door/firedoor/glass,
 /obj/machinery/door/airlock/glass/security{
@@ -5616,9 +5822,9 @@
 /area/security/security_lockerroom)
 "dPi" = (
 /obj/structure/table/woodentable,
-/obj/item/instrument/glockenspiel,
-/turf/simulated/floor/wood,
-/area/crew_quarters/sleep/Dorm_11)
+/obj/machinery/microwave,
+/turf/simulated/floor/plating,
+/area/maintenance/cargo)
 "dPj" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -5759,18 +5965,8 @@
 /turf/simulated/floor/tiled/monotile,
 /area/crew_quarters/kitchen)
 "dTQ" = (
-/obj/map_helper/access_helper/airlock/station/supply/mining,
-/obj/effect/floor_decal/borderfloor{
-	dir = 8
-	},
-/obj/effect/floor_decal/corner/brown/border{
-	dir = 8
-	},
-/obj/machinery/door/airlock/multi_tile/glass{
-	name = "Refinery"
-	},
-/obj/machinery/door/firedoor,
-/turf/simulated/floor/tiled/monotile,
+/obj/effect/floor_decal/spline/fancy/wood,
+/turf/simulated/floor/wood,
 /area/endeavour/surfacebase/mining_main/break_room)
 "dTT" = (
 /obj/effect/floor_decal/borderfloorblack{
@@ -5788,6 +5984,18 @@
 	},
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d3fwdhall)
+"dTZ" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 8
+	},
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
+/turf/simulated/floor/tiled/dark,
+/area/quartermaster/foyer)
 "dUd" = (
 /obj/structure/cable/orange{
 	icon_state = "2-8"
@@ -5860,17 +6068,19 @@
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d3fwdhall)
 "dVA" = (
-/obj/effect/floor_decal/borderfloor{
-	dir = 1
+/obj/machinery/light_switch{
+	pixel_y = 24
 	},
-/obj/effect/floor_decal/corner/brown/border{
+/obj/effect/floor_decal/spline/fancy/wood{
 	dir = 1
 	},
-/obj/structure/bed/chair/sofa/black,
-/obj/machinery/light_switch{
-	pixel_y = 24
+/obj/structure/table/wooden_reinforced,
+/obj/machinery/chemical_dispenser/catering/bar_soft,
+/obj/item/storage/box/glasses/square{
+	pixel_x = -25;
+	pixel_y = 6
 	},
-/turf/simulated/floor/tiled,
+/turf/simulated/floor/wood,
 /area/endeavour/surfacebase/mining_main/break_room)
 "dVD" = (
 /obj/machinery/atmospherics/component/unary/vent_pump/on,
@@ -6014,18 +6224,17 @@
 /turf/simulated/floor/wood,
 /area/crew_quarters/sleep/Dorm_2)
 "dZb" = (
-/obj/machinery/atmospherics/component/unary/vent_scrubber/on{
-	dir = 8
+/obj/structure/cable/green{
+	icon_state = "4-8"
 	},
 /turf/simulated/floor/tiled/monodark,
 /area/quartermaster/delivery)
 "dZs" = (
-/obj/machinery/atmospherics/component/unary/vent_pump/on,
 /obj/structure/cable/green{
 	icon_state = "1-2"
 	},
 /turf/simulated/floor/tiled,
-/area/endeavour/surfacebase/mining_main/break_room)
+/area/quartermaster/cargo_shelter_dock)
 "eau" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/effect/floor_decal/borderfloorblack,
@@ -6045,13 +6254,6 @@
 /obj/effect/floor_decal/spline/fancy/wood,
 /turf/simulated/floor/wood,
 /area/endeavour/hallway/d3fwdhall)
-"ebz" = (
-/obj/machinery/power/apc/south_mount,
-/obj/structure/cable/green{
-	icon_state = "0-8"
-	},
-/turf/simulated/floor/wood,
-/area/crew_quarters/sleep/Dorm_11)
 "ebL" = (
 /obj/structure/sink{
 	dir = 8;
@@ -6222,11 +6424,11 @@
 /turf/simulated/floor/wood,
 /area/maintenance/dormitory)
 "egp" = (
-/obj/structure/window/reinforced/survival_pod{
-	dir = 4
+/obj/machinery/door/firedoor{
+	dir = 8
 	},
-/turf/simulated/floor/tiled/techmaint,
-/area/quartermaster/warehouse)
+/turf/simulated/floor/tiled/dark,
+/area/quartermaster/foyer)
 "egw" = (
 /turf/simulated/floor/carpet/blue,
 /area/crew_quarters/sleep/Dorm_3)
@@ -6306,6 +6508,7 @@
 /obj/structure/cable/green{
 	icon_state = "1-2"
 	},
+/obj/structure/disposalpipe/segment,
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d3portforhall)
 "ejd" = (
@@ -6319,17 +6522,17 @@
 /turf/simulated/floor/tiled/techfloor,
 /area/crew_quarters/sleep/cryo)
 "ejk" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 5
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 5
-	},
-/obj/structure/cable/green{
-	icon_state = "4-8"
+/obj/machinery/camera/network/cargo{
+	dir = 8
 	},
-/turf/simulated/floor/wood,
-/area/quartermaster/qm)
+/obj/structure/table/reinforced,
+/obj/item/tank/jetpack/oxygen,
+/obj/item/tank/jetpack/oxygen,
+/obj/item/tank/jetpack/oxygen,
+/obj/item/tank/jetpack/oxygen,
+/obj/item/tank/jetpack/oxygen,
+/turf/simulated/floor/reinforced,
+/area/quartermaster/miningdock)
 "ekc" = (
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply{
 	dir = 4
@@ -6339,10 +6542,6 @@
 	},
 /turf/simulated/floor/wood,
 /area/crew_quarters/recreation_area)
-"ekD" = (
-/obj/structure/table/gamblingtable,
-/turf/simulated/floor/tiled,
-/area/endeavour/surfacebase/mining_main/break_room)
 "ekH" = (
 /turf/simulated/wall/prepainted,
 /area/crew_quarters/sleep/Dorm_9)
@@ -6382,19 +6581,16 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/quartermaster/warehouse)
-"elQ" = (
-/obj/structure/undies_wardrobe,
-/turf/simulated/floor/carpet/blue,
-/area/crew_quarters/sleep/Dorm_11)
 "emK" = (
-/obj/structure/cable/green{
-	icon_state = "4-8"
+/obj/item/radio/intercom{
+	pixel_y = -24
 	},
-/obj/structure/cable/green{
-	icon_state = "1-4"
+/obj/structure/disposalpipe/segment{
+	dir = 8;
+	icon_state = "pipe-c"
 	},
-/turf/simulated/floor/tiled,
-/area/endeavour/hallway/d3portforhall)
+/turf/simulated/floor/wood,
+/area/crew_quarters/recreation_area_hallway)
 "emZ" = (
 /obj/structure/table/rack/shelf/steel,
 /obj/item/clothing/mask/gas{
@@ -6587,7 +6783,7 @@
 	icon_state = "4-8"
 	},
 /obj/structure/disposalpipe/segment{
-	dir = 2;
+	dir = 4;
 	icon_state = "pipe-c"
 	},
 /turf/simulated/floor/tiled,
@@ -6607,8 +6803,15 @@
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d3starboardforhall)
 "esB" = (
-/turf/simulated/wall/prepainted/cargo,
-/area/maintenance/lower/trash_pit)
+/obj/effect/floor_decal/techfloor{
+	dir = 8
+	},
+/obj/structure/closet,
+/obj/random/maintenance/clean,
+/obj/random/maintenance/clean,
+/obj/item/duct_tape_roll,
+/turf/simulated/floor/tiled/techfloor,
+/area/maintenance/bar/catwalk)
 "esO" = (
 /obj/structure/bed/chair/comfy/teal,
 /obj/machinery/light_switch{
@@ -6651,9 +6854,13 @@
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d3afthall)
 "etR" = (
-/obj/machinery/vending/cola,
-/turf/simulated/floor/tiled/techmaint,
-/area/quartermaster/warehouse)
+/obj/machinery/suit_storage_unit/mining,
+/obj/effect/floor_decal/corner/brown/diagonal,
+/obj/machinery/air_alarm{
+	pixel_y = 22
+	},
+/turf/simulated/floor/tiled/white,
+/area/quartermaster/belterdock/gear)
 "etU" = (
 /obj/machinery/light/small{
 	dir = 4
@@ -6674,11 +6881,13 @@
 /turf/simulated/floor/tiled,
 /area/hydroponics)
 "etZ" = (
-/obj/machinery/atmospherics/component/unary/vent_scrubber/on{
-	dir = 1
+/obj/effect/floor_decal/corner/brown/diagonal,
+/obj/machinery/power/apc/east_mount,
+/obj/structure/cable/green{
+	icon_state = "0-8"
 	},
-/turf/simulated/floor/tiled/techmaint,
-/area/quartermaster/warehouse)
+/turf/simulated/floor/tiled/white,
+/area/quartermaster/belterdock/gear)
 "eum" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -6695,11 +6904,12 @@
 /turf/simulated/floor/airless,
 /area/shuttle/mining_ship/general)
 "evc" = (
-/obj/machinery/light{
-	dir = 1
+/obj/machinery/conveyor{
+	dir = 5;
+	id = "mining_interior"
 	},
-/turf/simulated/floor/tiled/techmaint,
-/area/quartermaster/warehouse)
+/turf/simulated/floor/tiled/monodark,
+/area/quartermaster/belterdock/refinery)
 "evi" = (
 /obj/item/bedsheet/browndouble,
 /obj/structure/bed/double/padded,
@@ -6720,7 +6930,7 @@
 	name = "Station Intercom (General)";
 	pixel_y = 26
 	},
-/obj/machinery/vending/loadout/clothing,
+/obj/machinery/vending/loadout/costume,
 /turf/simulated/floor/tiled/dark,
 /area/vacant/vacant_shop)
 "evH" = (
@@ -6822,19 +7032,18 @@
 /turf/simulated/floor/tiled/dark,
 /area/security/hallway)
 "eyn" = (
-/obj/machinery/door/blast/shutters{
-	density = 0;
-	dir = 2;
-	icon_state = "shutter0";
-	id = "cargo_line_shutter";
-	name = "Cargo Line shutter";
-	opacity = 0
+/obj/structure/railing{
+	dir = 1
 	},
-/obj/spawner/window/low_wall/reinforced/full/firelocks,
-/obj/structure/disposalpipe/segment,
-/obj/effect/paint/beastybrown,
+/obj/structure/railing{
+	dir = 8
+	},
+/obj/structure/railing{
+	dir = 4
+	},
+/obj/structure/closet/crate,
 /turf/simulated/floor/plating,
-/area/quartermaster/delivery)
+/area/maintenance/cargo)
 "eyy" = (
 /obj/machinery/camera/network/civilian{
 	dir = 1
@@ -6917,20 +7126,6 @@
 /obj/effect/floor_decal/corner/navblue/border,
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d3fwdhall)
-"eBl" = (
-/obj/effect/floor_decal/borderfloorblack{
-	dir = 8
-	},
-/obj/effect/floor_decal/corner/brown/border{
-	dir = 8
-	},
-/obj/map_helper/access_helper/airlock/station/supply/department,
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/multi_tile/glass{
-	name = "Warehouse"
-	},
-/turf/simulated/floor/tiled/dark,
-/area/quartermaster/warehouse)
 "eBs" = (
 /obj/effect/floor_decal/borderfloorblack{
 	dir = 9
@@ -6943,22 +7138,27 @@
 	},
 /obj/machinery/disposal,
 /obj/structure/disposalpipe/trunk,
-/turf/simulated/floor/tiled/dark,
+/turf/simulated/floor/tiled/techmaint,
 /area/quartermaster/warehouse)
 "eBy" = (
-/obj/structure/cable/green{
-	icon_state = "4-8"
+/obj/machinery/hyperpad/centre{
+	map_pad_id = "lavaland_station";
+	map_pad_link_id = "lavaland_away";
+	newcolor = "#fcba03"
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+/obj/structure/disposalpipe/segment{
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
-/obj/structure/disposalpipe/segment{
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
-/turf/simulated/floor/tiled,
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
+/turf/simulated/floor/tiled/techmaint,
 /area/quartermaster/belterdock)
 "eBO" = (
 /turf/simulated/floor/tiled/dark,
@@ -7137,12 +7337,6 @@
 	},
 /turf/simulated/floor/wood,
 /area/endeavour/hallway/d3fwdhall)
-"eEO" = (
-/obj/effect/floor_decal/industrial/warning{
-	dir = 8
-	},
-/turf/simulated/floor/tiled/techmaint,
-/area/quartermaster/belterdock)
 "eFf" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
@@ -7150,6 +7344,9 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
 /turf/simulated/floor/reinforced,
 /area/quartermaster/miningdock)
 "eFA" = (
@@ -7211,14 +7408,21 @@
 /turf/simulated/floor/tiled/dark,
 /area/security/warden)
 "eHs" = (
+/obj/machinery/atmospherics/component/unary/vent_pump/on,
 /turf/simulated/floor/tiled,
-/area/endeavour/surfacebase/mining_main/break_room)
+/area/quartermaster/cargo_shelter_dock)
 "eHQ" = (
-/obj/machinery/computer/ship/navigation/telescreen{
-	pixel_x = -32
+/obj/machinery/sheet_silo_loader{
+	dir = 1
 	},
-/turf/simulated/floor/carpet/turcarpet,
-/area/crew_quarters/recreation_area)
+/obj/structure/window/reinforced{
+	dir = 8
+	},
+/obj/effect/floor_decal/industrial/warning/dust{
+	dir = 8
+	},
+/turf/simulated/floor/tiled/monodark,
+/area/quartermaster/belterdock/refinery)
 "eHT" = (
 /obj/effect/floor_decal/spline/plain{
 	dir = 8
@@ -7235,10 +7439,6 @@
 	},
 /turf/simulated/floor/tiled/steel,
 /area/shuttle/mining_ship/general)
-"eIB" = (
-/obj/machinery/recharge_station,
-/turf/simulated/floor/tiled/techmaint,
-/area/quartermaster/warehouse)
 "eIC" = (
 /obj/effect/floor_decal/borderfloorblack{
 	dir = 1
@@ -7428,14 +7628,12 @@
 /turf/simulated/floor/tiled/dark,
 /area/janitor)
 "ePx" = (
-/obj/effect/floor_decal/corner/brown/diagonal,
-/obj/landmark/spawnpoint/job/shaft_miner,
-/obj/item/stool/padded{
-	pixel_x = 0;
-	pixel_y = 13
+/obj/effect/floor_decal/spline/fancy/wood{
+	dir = 4
 	},
-/turf/simulated/floor/tiled/white,
-/area/quartermaster/belterdock/gear)
+/obj/machinery/fire_alarm/east_mount,
+/turf/simulated/floor/wood,
+/area/endeavour/surfacebase/mining_main/break_room)
 "ePB" = (
 /obj/machinery/computer/card{
 	dir = 4
@@ -7560,6 +7758,9 @@
 	},
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d3portamidhall)
+"eVb" = (
+/turf/simulated/floor/tiled/techfloor,
+/area/maintenance/bar/catwalk)
 "eVd" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/door/airlock{
@@ -7657,6 +7858,14 @@
 	},
 /turf/simulated/floor/tiled/old_cargo/red,
 /area/security/security_processing)
+"eXx" = (
+/obj/structure/closet/crate/trashcart,
+/obj/machinery/power/apc/north_mount,
+/obj/structure/cable/green{
+	icon_state = "0-2"
+	},
+/turf/simulated/floor,
+/area/maintenance/bar/catwalk)
 "eXS" = (
 /obj/structure/cable/green{
 	icon_state = "0-8"
@@ -7840,15 +8049,37 @@
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d3portamidhall)
 "feq" = (
-/obj/machinery/mineral/mint,
-/turf/simulated/floor/tiled/techmaint,
-/area/quartermaster/warehouse)
+/obj/effect/floor_decal/corner/brown/border{
+	dir = 1
+	},
+/obj/machinery/computer/supplycomp,
+/obj/effect/floor_decal/borderfloorblack{
+	dir = 1
+	},
+/obj/machinery/light{
+	dir = 1
+	},
+/obj/effect/floor_decal/corner/brown/border{
+	dir = 1
+	},
+/turf/simulated/floor/tiled/dark,
+/area/quartermaster/foyer)
 "feE" = (
-/obj/structure/cable/green{
-	icon_state = "4-8"
+/obj/structure/window/reinforced{
+	dir = 1
 	},
-/obj/machinery/atmospherics/component/unary/vent_scrubber/on,
-/turf/simulated/floor/reinforced,
+/obj/effect/floor_decal/industrial/hatch/yellow,
+/obj/machinery/door/window{
+	req_one_access = list(31)
+	},
+/obj/structure/window/reinforced{
+	dir = 8
+	},
+/obj/structure/window/reinforced{
+	dir = 4
+	},
+/obj/machinery/portable_atmospherics/canister/oxygen,
+/turf/simulated/floor/tiled/monotechmaint,
 /area/quartermaster/miningdock)
 "feQ" = (
 /obj/structure/cable{
@@ -7882,9 +8113,30 @@
 /turf/simulated/floor/wood,
 /area/quartermaster/office)
 "ffW" = (
-/obj/structure/filingcabinet/chestdrawer,
-/turf/simulated/floor/tiled/techmaint,
-/area/quartermaster/warehouse)
+/obj/item/storage/box/nifsofts_mining{
+	pixel_x = -3
+	},
+/obj/item/suit_cooling_unit{
+	pixel_x = -4
+	},
+/obj/item/suit_cooling_unit{
+	pixel_x = -4
+	},
+/obj/item/duct_tape_roll{
+	pixel_x = -4
+	},
+/obj/structure/table/reinforced,
+/obj/effect/floor_decal/corner/brown/diagonal,
+/obj/item/stack/flag/green{
+	pixel_x = 7;
+	pixel_y = 1
+	},
+/obj/item/stack/flag/green{
+	pixel_x = 7;
+	pixel_y = 2
+	},
+/turf/simulated/floor/tiled/white,
+/area/quartermaster/belterdock/gear)
 "fgj" = (
 /obj/machinery/camera/network/civilian{
 	dir = 1
@@ -7900,15 +8152,8 @@
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d3portforhall)
 "fgA" = (
-/obj/structure/window/reinforced/survival_pod{
-	dir = 4
-	},
-/obj/machinery/disposal,
-/obj/structure/disposalpipe/trunk{
-	dir = 1
-	},
-/turf/simulated/floor/tiled/techmaint,
-/area/quartermaster/warehouse)
+/turf/simulated/wall/prepainted/cargo,
+/area/quartermaster/cargo_shelter_dock)
 "fgJ" = (
 /obj/structure/cable/green{
 	icon_state = "1-2"
@@ -7978,11 +8223,20 @@
 /turf/simulated/floor/tiled/dark,
 /area/quartermaster/warehouse)
 "fip" = (
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
 /obj/structure/cable/green{
-	icon_state = "2-8"
+	icon_state = "4-8"
 	},
-/turf/simulated/floor/reinforced,
-/area/quartermaster/miningdock)
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/dark,
+/area/quartermaster/foyer)
 "fiy" = (
 /obj/machinery/door/airlock/maintenance/common,
 /obj/machinery/door/firedoor{
@@ -8065,8 +8319,8 @@
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d3starboardamidhall)
 "fjp" = (
-/obj/structure/closet/secure_closet/quartermaster,
 /obj/item/clothing/accessory/poncho/roles/cloak/qm,
+/obj/structure/closet/secure_closet/quartermaster,
 /turf/simulated/floor/wood,
 /area/quartermaster/qm)
 "fju" = (
@@ -8085,9 +8339,6 @@
 /turf/simulated/floor/wood,
 /area/endeavour/hallway/d3fwdhall)
 "fko" = (
-/obj/machinery/air_alarm{
-	pixel_y = 22
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
@@ -8159,13 +8410,15 @@
 /turf/simulated/floor/tiled/white,
 /area/crew_quarters/toilet)
 "flt" = (
-/obj/machinery/door/firedoor,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/door/airlock/multi_tile/glass{
-	name = "Foyer"
+/obj/structure/cable/green{
+	icon_state = "1-2"
 	},
-/turf/simulated/floor/tiled/dark,
+/obj/structure/disposalpipe/segment,
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/obj/effect/paint/beastybrown,
+/turf/simulated/floor/plating,
 /area/quartermaster/foyer)
 "flS" = (
 /obj/effect/floor_decal/borderfloorblack{
@@ -8177,11 +8430,10 @@
 /obj/machinery/door/firedoor,
 /turf/simulated/floor/tiled/dark,
 /area/security/hallway)
-"fmj" = (
-/obj/spawner/window/low_wall/reinforced/full/firelocks,
-/obj/effect/paint/beastybrown,
-/turf/simulated/floor/plating,
-/area/endeavour/surfacebase/mining_main/break_room)
+"fml" = (
+/obj/effect/floor_decal/industrial/hatch/yellow,
+/turf/simulated/floor/tiled/dark,
+/area/quartermaster/warehouse)
 "fmB" = (
 /obj/machinery/air_alarm{
 	dir = 1;
@@ -8320,7 +8572,7 @@
 "fsa" = (
 /obj/structure/catwalk,
 /turf/simulated/floor/plating,
-/area/maintenance/lower/trash_pit)
+/area/maintenance/trash_pit)
 "fsu" = (
 /obj/structure/cable/green{
 	icon_state = "4-8"
@@ -8337,16 +8589,11 @@
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d3afthall)
 "fsN" = (
-/obj/effect/floor_decal/spline/fancy/wood{
-	dir = 10
-	},
-/obj/structure/table/wooden_reinforced,
-/obj/machinery/recharger{
-	pixel_x = -6;
-	pixel_y = 2
+/obj/effect/floor_decal/industrial/warning{
+	dir = 4
 	},
-/turf/simulated/floor/wood,
-/area/endeavour/surfacebase/mining_main/break_room)
+/turf/simulated/floor/reinforced,
+/area/quartermaster/miningdock)
 "fta" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/crystal,
@@ -8367,14 +8614,8 @@
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d3afthall)
 "fva" = (
-/obj/structure/cable/green{
-	icon_state = "1-2"
-	},
-/obj/machinery/atmospherics/component/unary/vent_pump/on{
-	dir = 4
-	},
-/turf/simulated/floor/tiled/dark,
-/area/quartermaster/foyer)
+/turf/simulated/wall/r_wall/prepainted/cargo,
+/area/maintenance/cargo)
 "fvb" = (
 /obj/structure/table/hardwoodtable,
 /obj/item/paper_bin{
@@ -8438,6 +8679,16 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/security/interrogation)
+"fzr" = (
+/obj/effect/floor_decal/techfloor{
+	dir = 6
+	},
+/obj/random/cutout,
+/obj/landmark{
+	name = "morphspawn"
+	},
+/turf/simulated/floor/tiled/techfloor,
+/area/maintenance/bar/catwalk)
 "fzD" = (
 /obj/structure/cable/green{
 	icon_state = "4-8"
@@ -8481,16 +8732,11 @@
 /turf/simulated/floor/tiled/dark,
 /area/security/hallway)
 "fBG" = (
-/obj/structure/bed/padded,
-/obj/machinery/newscaster{
-	pixel_y = 32
-	},
-/obj/machinery/light{
-	dir = 1
+/obj/machinery/light/small{
+	dir = 8
 	},
-/obj/random/bedsheet,
-/turf/simulated/floor/carpet/blue,
-/area/crew_quarters/sleep/Dorm_11)
+/turf/simulated/floor/wood,
+/area/maintenance/cargo)
 "fBZ" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -8600,11 +8846,14 @@
 /turf/simulated/floor/tiled/monotile,
 /area/security/brig)
 "fGh" = (
-/obj/effect/floor_decal/industrial/warning{
+/obj/structure/table/reinforced,
+/obj/item/storage/toolbox/syndicate,
+/obj/item/pickaxe/drill,
+/obj/machinery/light/small{
 	dir = 4
 	},
-/turf/simulated/floor/tiled/techmaint,
-/area/quartermaster/belterdock)
+/turf/simulated/floor/plating,
+/area/maintenance/cargo)
 "fGL" = (
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d3starboardamidhall)
@@ -8636,17 +8885,10 @@
 /turf/simulated/floor/tiled/dark,
 /area/maintenance/starboardsolar)
 "fJl" = (
-/obj/structure/table/steel_reinforced,
-/obj/item/storage/firstaid/o2{
-	pixel_x = 0;
-	pixel_y = 7
-	},
-/obj/item/storage/firstaid/toxin{
-	pixel_x = 0;
-	pixel_y = 3
-	},
-/turf/simulated/floor/tiled/techmaint,
-/area/quartermaster/warehouse)
+/obj/effect/floor_decal/corner/brown/diagonal,
+/obj/machinery/atmospherics/component/unary/vent_scrubber/on,
+/turf/simulated/floor/tiled/white,
+/area/quartermaster/belterdock/gear)
 "fJn" = (
 /obj/machinery/light{
 	dir = 1
@@ -8678,6 +8920,13 @@
 /obj/effect/floor_decal/spline/fancy/wood,
 /turf/simulated/floor/wood,
 /area/endeavour/hallway/d3fwdhall)
+"fLp" = (
+/obj/structure/closet/largecardboard,
+/obj/structure/railing{
+	dir = 4
+	},
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d3aftmaint)
 "fLu" = (
 /obj/structure/cable/orange{
 	icon_state = "1-2"
@@ -8798,9 +9047,6 @@
 /obj/structure/cable/green{
 	icon_state = "2-8"
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 10
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 10
 	},
@@ -8808,6 +9054,9 @@
 	dir = 2;
 	icon_state = "pipe-c"
 	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+	dir = 4
+	},
 /turf/simulated/floor/tiled,
 /area/quartermaster/belterdock)
 "fMA" = (
@@ -8868,6 +9117,13 @@
 /turf/simulated/floor/crystal,
 /area/endeavour/hallway/d3fwdhall)
 "fNj" = (
+/obj/structure/table/reinforced,
+/obj/item/storage/firstaid/regular{
+	pixel_y = 8
+	},
+/obj/item/storage/firstaid/fire{
+	pixel_y = 3
+	},
 /obj/machinery/light{
 	dir = 8;
 	light_range = 12
@@ -8966,8 +9222,9 @@
 /turf/simulated/floor/plating,
 /area/security/armoury)
 "fOe" = (
-/turf/simulated/wall/prepainted,
-/area/crew_quarters/sleep/Dorm_11)
+/obj/structure/closet/wardrobe,
+/turf/simulated/floor/wood,
+/area/maintenance/cargo)
 "fOS" = (
 /obj/structure/undies_wardrobe,
 /turf/simulated/floor/wood,
@@ -9124,25 +9381,30 @@
 /turf/simulated/floor/tiled,
 /area/security/brig)
 "fRJ" = (
-/obj/structure/cable/green{
-	icon_state = "4-8"
+/obj/effect/floor_decal/industrial/warning{
+	dir = 4
+	},
+/obj/structure/disposalpipe/segment{
+	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
-/obj/structure/disposalpipe/segment{
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
-/turf/simulated/floor/tiled,
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
+/turf/simulated/floor/tiled/techmaint,
 /area/quartermaster/belterdock)
 "fRP" = (
-/obj/effect/floor_decal/corner/brown/diagonal,
-/obj/structure/table/reinforced,
-/obj/machinery/recharger,
-/obj/machinery/light,
-/turf/simulated/floor/tiled/white,
-/area/quartermaster/belterdock/gear)
+/obj/structure/table/borosilicate,
+/obj/machinery/floor_light/changing/prebuilt{
+	on = 1
+	},
+/turf/simulated/floor/plating,
+/area/quartermaster/storage)
 "fSo" = (
 /obj/machinery/door/airlock{
 	id_tag = "dorm2";
@@ -9160,12 +9422,15 @@
 /turf/simulated/floor/wood,
 /area/crew_quarters/sleep/Dorm_2)
 "fSr" = (
-/obj/machinery/power/apc/east_mount,
-/obj/structure/cable/green{
-	icon_state = "0-8"
+/obj/machinery/mineral/unloading_machine,
+/obj/structure/window/reinforced{
+	dir = 1
 	},
-/turf/simulated/floor/reinforced,
-/area/quartermaster/miningdock)
+/obj/effect/floor_decal/industrial/warning/dust{
+	dir = 1
+	},
+/turf/simulated/floor/tiled/monodark,
+/area/quartermaster/belterdock/refinery)
 "fSt" = (
 /obj/machinery/light/small{
 	dir = 1
@@ -9205,6 +9470,10 @@
 "fTy" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply,
+/obj/structure/disposalpipe/segment,
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d3portforhall)
 "fTB" = (
@@ -9233,9 +9502,6 @@
 	},
 /turf/simulated/floor/carpet/bcarpet,
 /area/crew_quarters/bar)
-"fUB" = (
-/turf/simulated/floor/carpet/turcarpet,
-/area/crew_quarters/recreation_area)
 "fUR" = (
 /obj/machinery/camera/network/civilian{
 	dir = 8
@@ -9416,12 +9682,8 @@
 /obj/structure/cable/green{
 	icon_state = "4-8"
 	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
-	dir = 1
-	},
+/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,
+/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,
 /turf/simulated/floor/tiled/dark,
 /area/quartermaster/warehouse)
 "fYR" = (
@@ -9759,14 +10021,14 @@
 /turf/simulated/floor/plating,
 /area/endeavour/hallway/d3aftmaint)
 "gnO" = (
-/obj/effect/floor_decal/corner/brown/diagonal,
-/obj/item/stool/padded,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 8
+/obj/machinery/status_display/supply_display{
+	mode = 99;
+	pixel_y = 32
 	},
-/obj/landmark/spawnpoint/job/shaft_miner,
-/turf/simulated/floor/tiled/white,
-/area/quartermaster/belterdock/gear)
+/obj/structure/table/wooden_reinforced,
+/obj/machinery/atmospherics/component/unary/vent_pump/on,
+/turf/simulated/floor/wood,
+/area/quartermaster/office)
 "goa" = (
 /obj/landmark/spawnpoint/latejoin/station/cyborg,
 /turf/simulated/floor/tiled/techfloor,
@@ -9862,15 +10124,6 @@
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/substation/civilian)
-"gqw" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/obj/machinery/atmospherics/component/unary/vent_pump/on{
-	dir = 8
-	},
-/turf/simulated/floor/tiled/dark,
-/area/quartermaster/warehouse)
 "gqN" = (
 /obj/machinery/space_heater,
 /turf/simulated/floor/plating,
@@ -9880,13 +10133,15 @@
 /obj/machinery/door/firedoor{
 	dir = 8
 	},
-/obj/map_helper/access_helper/airlock/station/supply/mining,
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
 /obj/structure/catwalk,
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
 /turf/simulated/floor/plating,
-/area/quartermaster/belterdock/refinery)
+/area/endeavour/hallway/d3aftmaint)
 "gqT" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -9968,11 +10223,11 @@
 /turf/space,
 /area/space)
 "gtZ" = (
-/obj/machinery/atmospherics/component/unary/vent_pump/on{
-	dir = 1
-	},
-/turf/simulated/floor/tiled/techmaint,
-/area/quartermaster/warehouse)
+/obj/effect/floor_decal/corner/brown/diagonal,
+/obj/item/stool/padded,
+/obj/landmark/spawnpoint/job/shaft_miner,
+/turf/simulated/floor/tiled/white,
+/area/quartermaster/belterdock/gear)
 "gug" = (
 /obj/machinery/light/small{
 	dir = 8
@@ -9990,14 +10245,14 @@
 /obj/structure/cable/green{
 	icon_state = "4-8"
 	},
-/obj/structure/cable/green{
-	icon_state = "1-4"
-	},
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply,
 /obj/structure/disposalpipe/junction/yjunction{
 	dir = 8
 	},
+/obj/structure/cable/green{
+	icon_state = "1-4"
+	},
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d3portforhall)
 "guu" = (
@@ -10170,6 +10425,9 @@
 	},
 /turf/simulated/floor/tiled/techmaint,
 /area/quartermaster/belterdock)
+"gDV" = (
+/turf/simulated/floor/reinforced,
+/area/quartermaster/belterdock/refinery)
 "gDZ" = (
 /obj/structure/dogbed,
 /turf/simulated/floor/plating,
@@ -10190,6 +10448,13 @@
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/starboardsolar)
+"gFc" = (
+/obj/effect/floor_decal/industrial/warning{
+	dir = 8
+	},
+/obj/item/stool,
+/turf/simulated/floor/tiled/monodark,
+/area/quartermaster/delivery)
 "gFf" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -10288,14 +10553,27 @@
 /turf/simulated/floor/plating,
 /area/maintenance/substation/security)
 "gKi" = (
-/obj/item/radio/intercom{
-	pixel_y = -24
+/obj/effect/floor_decal/borderfloorblack{
+	dir = 1
 	},
-/obj/structure/cable/green{
-	icon_state = "4-8"
+/obj/effect/floor_decal/corner/navblue/border{
+	dir = 1
 	},
-/turf/simulated/floor/wood,
-/area/crew_quarters/sleep/Dorm_11)
+/obj/effect/floor_decal/borderfloorblack/corner2{
+	dir = 4
+	},
+/obj/effect/floor_decal/corner/navblue/bordercorner2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/light{
+	dir = 1;
+	pixel_y = 20
+	},
+/turf/simulated/floor/tiled,
+/area/endeavour/hallway/d3portforhall)
 "gKQ" = (
 /obj/machinery/light/small{
 	dir = 8
@@ -10320,9 +10598,20 @@
 /turf/simulated/floor/tiled,
 /area/security/range)
 "gLK" = (
-/obj/machinery/vending/coffee,
-/turf/simulated/floor/tiled/techmaint,
-/area/quartermaster/warehouse)
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 8
+	},
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
+/turf/simulated/floor/tiled/dark,
+/area/quartermaster/foyer)
 "gLQ" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -10333,24 +10622,11 @@
 /obj/structure/cable/green{
 	icon_state = "4-8"
 	},
-/obj/structure/cable/green{
-	icon_state = "1-4"
-	},
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d3portforhall)
 "gLU" = (
 /turf/simulated/floor/wood,
 /area/endeavour/surfacebase/bar_backroom)
-"gLZ" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 1
-	},
-/obj/structure/cable/green{
-	icon_state = "1-2"
-	},
-/turf/simulated/floor/tiled/monodark,
-/area/quartermaster/delivery)
 "gMc" = (
 /obj/spawner/window/reinforced/full/firelocks,
 /obj/structure/curtain/open/black,
@@ -10474,11 +10750,14 @@
 /obj/structure/cable/green{
 	icon_state = "1-2"
 	},
-/obj/effect/floor_decal/borderfloor/corner,
-/obj/effect/floor_decal/corner/brown/bordercorner,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+	dir = 4
+	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/tiled,
+/obj/structure/bed/chair/sofa/black/right{
+	dir = 1
+	},
+/turf/simulated/floor/wood,
 /area/endeavour/surfacebase/mining_main/break_room)
 "gRa" = (
 /obj/machinery/disposal,
@@ -10617,10 +10896,10 @@
 /area/endeavour/hallway/d3starboardamidhall)
 "gUu" = (
 /obj/structure/cable/green{
-	icon_state = "1-2"
+	icon_state = "1-8"
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 5
+/obj/machinery/atmospherics/component/unary/vent_scrubber/on{
+	dir = 1
 	},
 /turf/simulated/floor/reinforced,
 /area/quartermaster/miningdock)
@@ -10691,12 +10970,6 @@
 /turf/simulated/floor/wood,
 /area/crew_quarters/sleep/bedrooms)
 "gXm" = (
-/obj/effect/floor_decal/borderfloorblack{
-	dir = 8
-	},
-/obj/effect/floor_decal/corner/brown/border{
-	dir = 8
-	},
 /obj/structure/cable/green{
 	icon_state = "4-8"
 	},
@@ -10709,6 +10982,13 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
+/obj/effect/floor_decal/borderfloorblack{
+	dir = 10
+	},
+/obj/effect/floor_decal/corner/brown/border{
+	dir = 10
+	},
+/obj/structure/flora/pottedplant/large,
 /turf/simulated/floor/tiled/dark,
 /area/quartermaster/foyer)
 "gXN" = (
@@ -10784,6 +11064,15 @@
 "haF" = (
 /turf/simulated/wall/r_wall/prepainted/engineering,
 /area/maintenance/starboardsolar)
+"haN" = (
+/obj/effect/floor_decal/industrial/outline/yellow,
+/obj/structure/ore_box,
+/obj/machinery/power/apc/south_mount,
+/obj/structure/cable/green{
+	icon_state = "0-8"
+	},
+/turf/simulated/floor/reinforced,
+/area/quartermaster/belterdock/refinery)
 "hbD" = (
 /obj/machinery/computer/timeclock/premade/south,
 /obj/effect/floor_decal/borderfloorblack,
@@ -10937,15 +11226,17 @@
 	},
 /turf/simulated/floor/tiled/techmaint,
 /area/quartermaster/belterdock)
-"hgm" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
-/obj/item/radio/intercom{
-	pixel_y = -24
-	},
-/obj/structure/disposalpipe/junction{
+"hfw" = (
+/obj/effect/floor_decal/borderfloorblack,
+/obj/effect/floor_decal/corner/brown/border,
+/obj/machinery/light,
+/obj/machinery/door/firedoor{
 	dir = 8
 	},
+/turf/simulated/floor/tiled/dark,
+/area/quartermaster/warehouse)
+"hgm" = (
+/obj/machinery/light/small,
 /turf/simulated/floor/wood,
 /area/crew_quarters/recreation_area_hallway)
 "hhE" = (
@@ -11015,13 +11306,8 @@
 /turf/simulated/floor/tiled/dark,
 /area/security/hallway)
 "hkm" = (
-/obj/structure/cable/green{
-	icon_state = "1-2"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/tiled/dark,
-/area/quartermaster/warehouse)
+/turf/simulated/wall/prepainted/cargo,
+/area/quartermaster/storage)
 "hky" = (
 /obj/structure/window/reinforced{
 	dir = 8
@@ -11039,16 +11325,13 @@
 /turf/simulated/floor/tiled/dark,
 /area/vacant/vacant_shop)
 "hkN" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/cable/green{
-	icon_state = "2-4"
-	},
-/obj/structure/cable/green{
-	icon_state = "1-2"
+/obj/machinery/light{
+	dir = 1;
+	pixel_y = 20
 	},
-/turf/simulated/floor/wood,
-/area/crew_quarters/bar/lounge)
+/obj/machinery/atmospherics/component/unary/vent_scrubber/on,
+/turf/simulated/floor/reinforced,
+/area/quartermaster/miningdock)
 "hkY" = (
 /obj/structure/sign/directions/evac{
 	dir = 4
@@ -11056,13 +11339,9 @@
 /turf/simulated/wall/prepainted/civilian,
 /area/endeavour/hallway/d3aftmaint)
 "hlc" = (
-/obj/machinery/mineral/output,
-/obj/effect/floor_decal/industrial/loading{
-	dir = 4
-	},
-/obj/effect/floor_decal/industrial/outline/yellow,
-/turf/simulated/floor/tiled/techmaint,
-/area/quartermaster/warehouse)
+/obj/effect/floor_decal/corner/brown/diagonal,
+/turf/simulated/floor/tiled/white,
+/area/quartermaster/belterdock/gear)
 "hlx" = (
 /obj/machinery/disposal,
 /obj/structure/disposalpipe/trunk{
@@ -11091,11 +11370,13 @@
 /turf/simulated/floor/tiled,
 /area/security/lobby)
 "hmk" = (
-/obj/effect/floor_decal/borderfloorblack,
-/obj/effect/floor_decal/corner/brown/border,
-/obj/machinery/light,
-/turf/simulated/floor/tiled/monodark,
-/area/quartermaster/foyer)
+/obj/structure/disposalpipe/segment,
+/obj/machinery/light/small{
+	dir = 4
+	},
+/obj/machinery/atmospherics/component/unary/vent_scrubber/on,
+/turf/simulated/floor/wood,
+/area/crew_quarters/recreation_area)
 "hmF" = (
 /obj/structure/disposalpipe/segment{
 	dir = 8;
@@ -11201,6 +11482,12 @@
 /obj/structure/closet/crate,
 /turf/simulated/floor/tiled/steel,
 /area/shuttle/belter)
+"hpG" = (
+/obj/machinery/light/small{
+	dir = 8
+	},
+/turf/simulated/floor/plating,
+/area/maintenance/bar/catwalk)
 "hqP" = (
 /turf/simulated/wall/prepainted,
 /area/crew_quarters/showers)
@@ -11211,21 +11498,20 @@
 /obj/effect/floor_decal/corner/brown/border{
 	dir = 8
 	},
-/obj/map_helper/access_helper/airlock/station/supply/department,
 /obj/machinery/door/firedoor,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/door/airlock/multi_tile/glass{
-	name = "Warehouse"
-	},
 /obj/structure/disposalpipe/segment,
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/tiled/dark,
 /area/quartermaster/warehouse)
 "hrS" = (
 /obj/spawner/window/low_wall/reinforced/full/firelocks,
 /obj/effect/paint/beastybrown,
 /turf/simulated/floor/plating,
-/area/quartermaster/foyer)
+/area/quartermaster/delivery)
 "hrV" = (
 /obj/effect/floor_decal/steeldecal/steel_decals5{
 	dir = 4
@@ -11262,22 +11548,12 @@
 /obj/effect/floor_decal/corner/navgold/border,
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply,
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
+/obj/structure/sign/directions/cryo{
+	dir = 1;
+	pixel_y = -25
+	},
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d3starboardafthall)
-"htn" = (
-/obj/machinery/door/firedoor,
-/obj/structure/cable/green{
-	icon_state = "1-2"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/disposalpipe/segment,
-/obj/machinery/door/airlock{
-	id_tag = "dorm13";
-	name = "Dorm 13"
-	},
-/turf/simulated/floor/wood,
-/area/crew_quarters/sleep/Dorm_11)
 "hup" = (
 /obj/machinery/power/smes/buildable{
 	RCon_tag = "Deck 3 Aft Grid"
@@ -11351,7 +11627,7 @@
 	id = "DLBelt"
 	},
 /turf/simulated/floor/plating,
-/area/quartermaster/delivery)
+/area/endeavour/hallway/d3aftmaint)
 "hvn" = (
 /obj/structure/table/rack/shelf/steel,
 /obj/effect/floor_decal/industrial/outline/red,
@@ -11414,18 +11690,22 @@
 "hwN" = (
 /obj/machinery/atmospherics/component/unary/vent_scrubber/on,
 /turf/simulated/floor/tiled,
-/area/endeavour/surfacebase/mining_main/break_room)
+/area/quartermaster/cargo_shelter_dock)
 "hwP" = (
 /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
 	},
-/turf/simulated/floor/tiled,
+/obj/structure/table/gamblingtable,
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+	dir = 1
+	},
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
+/turf/simulated/floor/wood,
 /area/endeavour/surfacebase/mining_main/break_room)
 "hxO" = (
 /obj/machinery/door/airlock/glass_external{
@@ -11469,10 +11749,11 @@
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d3fwdhall)
 "hzi" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/tiled/dark,
-/area/quartermaster/foyer)
+/obj/machinery/atmospherics/component/unary/vent_pump/on{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/monodark,
+/area/quartermaster/delivery)
 "hzs" = (
 /obj/machinery/computer/secure_data,
 /obj/machinery/light{
@@ -11481,12 +11762,9 @@
 /turf/simulated/floor/tiled/old_cargo/red,
 /area/security/security_processing)
 "hzu" = (
-/obj/effect/floor_decal/borderfloorblack,
-/obj/effect/floor_decal/corner/brown/border,
-/obj/effect/floor_decal/borderfloorblack/corner2,
-/obj/effect/floor_decal/corner/brown/bordercorner2,
-/turf/simulated/floor/tiled/dark,
-/area/quartermaster/foyer)
+/obj/machinery/air_alarm/north_mount,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d3aftmaint)
 "hBC" = (
 /obj/structure/disposalpipe/segment{
 	dir = 8;
@@ -11548,24 +11826,36 @@
 /turf/simulated/floor/carpet/bcarpet,
 /area/crew_quarters/sleep/Dorm_9)
 "hDl" = (
-/obj/effect/floor_decal/spline/plain{
-	dir = 1
+/obj/structure/table/steel_reinforced,
+/obj/item/duct_tape_roll{
+	pixel_x = -8;
+	pixel_y = -4
 	},
-/obj/structure/flora/grass/event/bright_flowers1,
-/turf/simulated/floor/grass,
+/obj/item/duct_tape_roll{
+	pixel_x = -8;
+	pixel_y = 5
+	},
+/obj/item/stamp/cargo{
+	pixel_x = 7;
+	pixel_y = 8
+	},
+/obj/item/stamp/denied{
+	pixel_x = 7;
+	pixel_y = -1
+	},
+/turf/simulated/floor/tiled/techmaint,
 /area/quartermaster/warehouse)
 "hDH" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/maintenance,
-/obj/map_helper/access_helper/airlock/station/supply/mining,
 /obj/structure/cable/green{
 	icon_state = "1-2"
 	},
 /obj/structure/disposalpipe/segment{
 	dir = 1
 	},
-/turf/simulated/floor/tiled/monotile,
-/area/quartermaster/belterdock/refinery)
+/obj/machinery/door/airlock/maintenance,
+/obj/machinery/door/firedoor,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d3aftmaint)
 "hEc" = (
 /turf/simulated/floor/wood,
 /area/tether/surfacebase/entertainment)
@@ -11585,14 +11875,11 @@
 /turf/simulated/floor/plating,
 /area/endeavour/hallway/d3portamidhall)
 "hFO" = (
-/obj/structure/cable/green{
-	icon_state = "1-8"
+/obj/machinery/computer/ship/navigation/telescreen{
+	pixel_x = -32
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/disposalpipe/segment,
-/turf/simulated/floor/wood,
-/area/crew_quarters/recreation_area_hallway)
+/turf/simulated/wall/r_wall/prepainted,
+/area/crew_quarters/sleep/Dorm_13)
 "hGe" = (
 /obj/machinery/door/airlock/glass{
 	desc = "A room dedicated for the repairs and recharging of adherent.";
@@ -11763,18 +12050,11 @@
 /turf/simulated/floor/wood,
 /area/tether/surfacebase/entertainment)
 "hLw" = (
-/obj/structure/cable/green{
-	icon_state = "1-2"
-	},
-/obj/effect/floor_decal/borderfloorblack{
-	dir = 4
-	},
-/obj/effect/floor_decal/corner/brown/border{
+/obj/structure/bed/chair/comfy/brown{
 	dir = 4
 	},
-/obj/machinery/door/firedoor,
-/turf/simulated/floor/tiled/dark,
-/area/quartermaster/warehouse)
+/turf/simulated/floor/plating,
+/area/maintenance/cargo)
 "hLN" = (
 /obj/machinery/camera/network/civilian{
 	dir = 1
@@ -11860,14 +12140,19 @@
 /turf/simulated/floor/tiled/dark,
 /area/security/riot_control)
 "hOq" = (
-/obj/structure/cable/green{
-	icon_state = "1-2"
-	},
-/obj/structure/cable/green{
-	icon_state = "2-4"
+/obj/machinery/door/blast/shutters{
+	density = 0;
+	dir = 2;
+	icon_state = "shutter0";
+	id = "cargo_line_shutter";
+	name = "Cargo Line shutter";
+	opacity = 0
 	},
-/turf/simulated/floor/tiled/dark,
-/area/quartermaster/warehouse)
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/obj/effect/paint/beastybrown,
+/obj/structure/disposalpipe/segment,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d3aftmaint)
 "hOu" = (
 /obj/effect/floor_decal/borderfloorblack/corner,
 /obj/effect/floor_decal/corner/red/bordercorner,
@@ -11963,6 +12248,13 @@
 /obj/structure/ore_box,
 /turf/simulated/floor/tiled/steel,
 /area/shuttle/belter)
+"hSq" = (
+/obj/effect/floor_decal/industrial/warning/cee{
+	dir = 4
+	},
+/obj/machinery/recharge_station,
+/turf/simulated/floor/reinforced,
+/area/quartermaster/qm)
 "hTz" = (
 /turf/simulated/wall/r_wall/prepainted,
 /area/crew_quarters/sleep/Dorm_6)
@@ -11973,6 +12265,19 @@
 /obj/machinery/power/apc/south_mount,
 /turf/simulated/floor/wood,
 /area/crew_quarters/sleep/Dorm_6)
+"hUc" = (
+/obj/effect/floor_decal/borderfloorblack{
+	dir = 1
+	},
+/obj/effect/floor_decal/corner/brown/border{
+	dir = 1
+	},
+/obj/machinery/computer/supplycomp,
+/obj/machinery/light{
+	dir = 1
+	},
+/turf/simulated/floor/tiled/dark,
+/area/quartermaster/foyer)
 "hUg" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -12051,13 +12356,25 @@
 /turf/simulated/floor/wood,
 /area/endeavour/hallway/d3fwdhall)
 "hWB" = (
-/obj/effect/floor_decal/spline/fancy/wood,
-/obj/structure/table/wooden_reinforced,
-/obj/machinery/chemical_dispenser/catering/bar_coffee{
-	dir = 1
+/obj/effect/floor_decal/borderfloorblack{
+	dir = 10
 	},
-/turf/simulated/floor/wood,
-/area/endeavour/surfacebase/mining_main/break_room)
+/obj/effect/floor_decal/corner/brown/border{
+	dir = 10
+	},
+/obj/machinery/air_alarm/south_mount,
+/obj/structure/disposalpipe/segment{
+	dir = 8;
+	icon_state = "pipe-c"
+	},
+/obj/effect/floor_decal/borderfloorblack/corner2{
+	dir = 9
+	},
+/obj/effect/floor_decal/corner/brown/bordercorner2{
+	dir = 9
+	},
+/turf/simulated/floor/tiled/dark,
+/area/quartermaster/foyer)
 "hWG" = (
 /obj/structure/table/marble,
 /obj/machinery/door/blast/shutters{
@@ -12082,11 +12399,36 @@
 /turf/simulated/floor/plating,
 /area/maintenance/bar/lower)
 "hXO" = (
-/obj/effect/floor_decal/borderfloorblack,
-/obj/effect/floor_decal/corner/brown/border,
-/obj/structure/flora/pottedplant/minitree,
-/turf/simulated/floor/tiled/dark,
-/area/quartermaster/foyer)
+/obj/effect/floor_decal/borderfloor{
+	dir = 1
+	},
+/obj/effect/floor_decal/corner/brown/border{
+	dir = 1
+	},
+/obj/item/clothing/accessory/permit/gun/planetside,
+/obj/item/clothing/accessory/permit/gun/planetside,
+/obj/item/clothing/accessory/permit/gun/planetside,
+/obj/item/clothing/accessory/permit/gun/planetside,
+/obj/structure/table/reinforced,
+/obj/machinery/door/window/southright{
+	req_one_access = list(48)
+	},
+/obj/structure/window/reinforced{
+	dir = 4
+	},
+/obj/structure/window/reinforced{
+	dir = 8
+	},
+/obj/structure/window/reinforced{
+	dir = 1
+	},
+/obj/item/gun/energy/kinetic_accelerator,
+/obj/item/gun/energy/kinetic_accelerator,
+/obj/item/gun/energy/kinetic_accelerator,
+/obj/item/gun/energy/kinetic_accelerator,
+/obj/effect/floor_decal/corner/brown/diagonal,
+/turf/simulated/floor/tiled/white,
+/area/quartermaster/belterdock/gear)
 "hXW" = (
 /obj/structure/table/steel,
 /obj/machinery/recharger,
@@ -12244,12 +12586,13 @@
 /turf/simulated/wall/r_wall/prepainted,
 /area/tether/surfacebase/entertainment)
 "ibL" = (
-/obj/structure/closet/wardrobe/mixed,
-/obj/machinery/light/small{
+/obj/machinery/atmospherics/component/unary/vent_pump/on{
 	dir = 1
 	},
-/turf/simulated/floor/carpet/turcarpet,
-/area/crew_quarters/recreation_area)
+/obj/structure/window/reinforced,
+/obj/structure/table/steel_reinforced,
+/turf/simulated/floor/tiled/techmaint,
+/area/quartermaster/warehouse)
 "ibT" = (
 /obj/structure/undies_wardrobe,
 /turf/simulated/floor/wood,
@@ -12304,20 +12647,23 @@
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d3starboardamidhall)
 "ieQ" = (
-/obj/effect/floor_decal/borderfloorblack{
-	dir = 6
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 1
 	},
-/obj/effect/floor_decal/corner/brown/border{
-	dir = 6
+/obj/structure/cable/green{
+	icon_state = "1-2"
 	},
-/obj/effect/floor_decal/borderfloorblack/corner2,
-/obj/effect/floor_decal/corner/brown/bordercorner2,
-/turf/simulated/floor/tiled/dark,
-/area/quartermaster/foyer)
+/turf/simulated/floor/tiled/monodark,
+/area/quartermaster/delivery)
 "ifE" = (
-/obj/effect/floor_decal/spline/plain,
-/obj/structure/flora/grass/event/full_grass1,
-/turf/simulated/floor/grass,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 10
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 9
+	},
+/turf/simulated/floor/tiled/techmaint,
 /area/quartermaster/warehouse)
 "ifT" = (
 /obj/structure/cable{
@@ -12445,13 +12791,11 @@
 /turf/simulated/floor/plating,
 /area/quartermaster/miningdock)
 "ili" = (
-/obj/machinery/disposal,
-/obj/structure/disposalpipe/trunk,
-/obj/machinery/camera/network/civilian{
+/obj/structure/window/reinforced{
 	dir = 8
 	},
-/turf/simulated/floor/wood,
-/area/crew_quarters/recreation_area)
+/turf/simulated/floor/tiled/dark,
+/area/quartermaster/warehouse)
 "ilD" = (
 /obj/machinery/door/airlock/glass/civilian{
 	name = "Crew Cryo Bay"
@@ -12477,10 +12821,14 @@
 /turf/simulated/floor/plating,
 /area/security/hallway)
 "imI" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/structure/disposalpipe/segment{
-	dir = 8
+	dir = 1;
+	icon_state = "pipe-c"
+	},
+/obj/structure/cable/green{
+	icon_state = "1-8"
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d3portforhall)
 "imX" = (
@@ -12500,7 +12848,7 @@
 	dir = 8
 	},
 /obj/structure/disposalpipe/segment,
-/turf/simulated/floor/tiled/dark,
+/turf/simulated/floor/tiled/techmaint,
 /area/quartermaster/warehouse)
 "inx" = (
 /turf/simulated/wall/prepainted,
@@ -12686,9 +13034,17 @@
 /turf/simulated/floor/tiled/old_cargo/gray,
 /area/security/security_processing)
 "iwp" = (
-/obj/effect/floor_decal/techfloor/corner,
+/obj/effect/floor_decal/borderfloorblack{
+	dir = 8
+	},
+/obj/effect/floor_decal/corner/brown/border{
+	dir = 8
+	},
+/obj/machinery/door/firedoor{
+	dir = 8
+	},
 /turf/simulated/floor/tiled/dark,
-/area/vacant/vacant_shop)
+/area/quartermaster/foyer)
 "iwD" = (
 /obj/effect/floor_decal/spline/plain,
 /turf/simulated/floor/tiled/dark,
@@ -12757,27 +13113,31 @@
 /turf/simulated/wall/prepainted/security,
 /area/security/breakroom)
 "izr" = (
-/obj/machinery/light{
-	dir = 1
-	},
-/obj/effect/floor_decal/borderfloor{
-	dir = 1
-	},
-/obj/effect/floor_decal/corner/brown/border{
-	dir = 1
+/obj/structure/window/reinforced,
+/obj/machinery/lathe/autolathe,
+/turf/simulated/floor/tiled/techmaint,
+/area/quartermaster/warehouse)
+"izs" = (
+/obj/structure/catwalk,
+/obj/structure/cable/green{
+	icon_state = "4-8"
 	},
-/turf/simulated/floor/tiled/monotile,
-/area/quartermaster/belterdock/refinery)
+/obj/machinery/air_alarm/north_mount,
+/turf/simulated/floor/plating,
+/area/maintenance/cargo)
 "izO" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
 /obj/effect/floor_decal/borderfloorblack/corner{
-	dir = 1
+	dir = 4
 	},
 /obj/effect/floor_decal/corner/brown/bordercorner{
-	dir = 1
+	dir = 4
+	},
+/obj/structure/cable/green{
+	icon_state = "1-2"
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/disposalpipe/segment,
 /turf/simulated/floor/tiled/dark,
 /area/quartermaster/foyer)
 "iAo" = (
@@ -12857,18 +13217,15 @@
 /turf/simulated/floor/grass,
 /area/security/brig)
 "iDE" = (
-/obj/machinery/door/blast/shutters{
-	density = 0;
-	dir = 2;
-	icon_state = "shutter0";
-	id = "cargo_line_shutter";
-	name = "Cargo Line shutter";
-	opacity = 0
+/obj/machinery/button/remote/airlock{
+	id = "dormx";
+	name = "Room 1 Lock";
+	pixel_x = -26;
+	pixel_y = -7;
+	specialfunctions = 4
 	},
-/obj/spawner/window/low_wall/reinforced/full/firelocks,
-/obj/effect/paint/beastybrown,
-/turf/simulated/floor/plating,
-/area/quartermaster/delivery)
+/turf/simulated/floor/wood,
+/area/maintenance/cargo)
 "iDZ" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 5
@@ -12970,8 +13327,11 @@
 /obj/structure/disposalpipe/segment{
 	dir = 1
 	},
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/plating,
-/area/maintenance/lower/trash_pit)
+/area/maintenance/trash_pit)
 "iIs" = (
 /obj/effect/floor_decal/industrial/danger{
 	dir = 6
@@ -13012,7 +13372,7 @@
 /obj/structure/cable/green{
 	icon_state = "1-2"
 	},
-/turf/simulated/floor/tiled,
+/turf/simulated/floor/plating,
 /area/maintenance/bar/lower)
 "iIU" = (
 /obj/machinery/camera/network/civilian{
@@ -13064,7 +13424,7 @@
 /turf/simulated/wall/prepainted,
 /area/endeavour/station/stairs_three)
 "iJR" = (
-/obj/structure/plasticflaps,
+/obj/structure/plasticflaps/mining,
 /obj/structure/disposalpipe/trunk{
 	dir = 4
 	},
@@ -13072,7 +13432,7 @@
 	dir = 8
 	},
 /turf/simulated/floor/plating,
-/area/maintenance/lower/trash_pit)
+/area/maintenance/trash_pit)
 "iKe" = (
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply{
 	dir = 1
@@ -13151,7 +13511,7 @@
 /obj/structure/noticeboard{
 	pixel_y = 32
 	},
-/obj/machinery/vending/loadout,
+/obj/machinery/vending/loadout/accessory,
 /turf/simulated/floor/tiled/dark,
 /area/vacant/vacant_shop)
 "iPK" = (
@@ -13234,26 +13594,43 @@
 /turf/simulated/floor/plating,
 /area/endeavour/hallway/d3aftmaint)
 "iSL" = (
-/obj/structure/window/reinforced{
-	dir = 4
+/obj/item/folder/white,
+/obj/structure/table/reinforced,
+/obj/machinery/door/window{
+	dir = 8;
+	req_one_access = list(31)
 	},
-/obj/structure/window/reinforced{
+/obj/item/paper_bin{
+	pixel_x = -1;
+	pixel_y = 4
+	},
+/obj/item/pen,
+/obj/machinery/door/firedoor{
 	dir = 8
 	},
-/obj/structure/flora/grass/event/sunny_bush1,
-/turf/simulated/floor/grass/indoors,
-/area/quartermaster/foyer)
+/obj/effect/floor_decal/borderfloorblack{
+	dir = 4
+	},
+/obj/effect/floor_decal/corner/brown/border{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/monodark,
+/area/quartermaster/delivery)
 "iSP" = (
 /obj/machinery/computer/supplycomp/control{
 	dir = 4
 	},
 /turf/simulated/floor/wood,
 /area/quartermaster/office)
+"iTk" = (
+/turf/simulated/floor/wood,
+/area/endeavour/hallway/d3aftmaint)
 "iTn" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/turf/simulated/floor/carpet/bcarpet,
-/area/quartermaster/qm)
+/obj/effect/floor_decal/industrial/warning{
+	dir = 6
+	},
+/turf/simulated/floor/reinforced,
+/area/quartermaster/miningdock)
 "iTp" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -13319,6 +13696,12 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/prison/cell_block)
+"iWE" = (
+/obj/effect/floor_decal/industrial/warning{
+	dir = 8
+	},
+/turf/simulated/floor/reinforced,
+/area/quartermaster/miningdock)
 "iWF" = (
 /obj/structure/table/steel,
 /obj/structure/bedsheetbin,
@@ -13388,14 +13771,20 @@
 	},
 /turf/simulated/floor/crystal,
 /area/endeavour/hallway/d3fwdhall)
+"iZj" = (
+/obj/machinery/atmospherics/component/unary/vent_scrubber/on{
+	dir = 8
+	},
+/turf/simulated/floor/tiled/monodark,
+/area/quartermaster/delivery)
 "jag" = (
-/obj/effect/floor_decal/corner/brown/diagonal,
-/obj/machinery/power/apc/east_mount,
-/obj/structure/cable/green{
-	icon_state = "0-8"
+/obj/machinery/atmospherics/component/unary/vent_scrubber/on{
+	dir = 1
 	},
-/turf/simulated/floor/tiled/white,
-/area/quartermaster/belterdock/gear)
+/obj/structure/window/reinforced,
+/obj/structure/filingcabinet/chestdrawer,
+/turf/simulated/floor/tiled/techmaint,
+/area/quartermaster/warehouse)
 "jaT" = (
 /obj/machinery/holopad,
 /obj/structure/cable/green{
@@ -13426,14 +13815,18 @@
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d3starboardforhall)
 "jbh" = (
-/obj/machinery/sheet_silo{
-	obj_persist_static_id = "sheet-silo-mining"
-	},
-/obj/effect/floor_decal/industrial/warning/dust{
-	dir = 9
+/obj/effect/floor_decal/industrial/outline/yellow,
+/obj/structure/cable/green{
+	icon_state = "4-8"
 	},
 /turf/simulated/floor/tiled/monodark,
-/area/quartermaster/belterdock/refinery)
+/area/quartermaster/foyer)
+"jbC" = (
+/obj/machinery/light/small{
+	dir = 1
+	},
+/turf/simulated/floor/plating,
+/area/maintenance/cargo)
 "jbI" = (
 /obj/machinery/light,
 /obj/structure/cable/orange{
@@ -13462,17 +13855,35 @@
 /turf/simulated/floor/tiled/monotile,
 /area/security/hallway)
 "jcl" = (
+/obj/structure/cable/green{
+	icon_state = "0-2"
+	},
+/obj/machinery/power/apc/north_mount,
 /obj/structure/closet,
 /obj/item/storage/backpack/dufflebag,
 /turf/simulated/floor/wood,
 /area/quartermaster/qm)
 "jdF" = (
-/obj/structure/cable/green{
-	icon_state = "4-8"
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/tiled/dark,
+/obj/structure/disposalpipe/segment,
+/obj/structure/window/reinforced{
+	dir = 8
+	},
+/obj/structure/window/reinforced{
+	dir = 1
+	},
+/obj/structure/window/reinforced{
+	dir = 4
+	},
+/obj/structure/flora/ausbushes/stalkybush,
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
+/obj/machinery/door/firedoor{
+	dir = 1
+	},
+/turf/simulated/floor/grass,
 /area/quartermaster/foyer)
 "jdI" = (
 /obj/machinery/camera/network/civilian{
@@ -13564,11 +13975,20 @@
 	},
 /turf/simulated/floor/wood,
 /area/security/lobby)
+"jgF" = (
+/obj/machinery/door/airlock/maintenance,
+/obj/machinery/door/firedoor{
+	dir = 8
+	},
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d3aftmaint)
 "jhH" = (
+/obj/effect/floor_decal/industrial/outline/yellow,
+/obj/structure/disposalpipe/segment,
 /obj/structure/cable/green{
-	icon_state = "1-2"
+	icon_state = "4-8"
 	},
-/turf/simulated/floor/tiled/dark,
+/turf/simulated/floor/tiled/monodark,
 /area/quartermaster/foyer)
 "jhI" = (
 /obj/effect/floor_decal/spline/fancy/wood{
@@ -13850,6 +14270,12 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/crew_quarters/toilet)
+"joO" = (
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
+/turf/simulated/floor/plating,
+/area/maintenance/bar/catwalk)
 "jpo" = (
 /obj/machinery/conveyor{
 	dir = 8;
@@ -13924,39 +14350,34 @@
 /obj/structure/disposalpipe/segment,
 /turf/simulated/floor/tiled/dark,
 /area/security/hallway)
-"jtk" = (
-/obj/effect/floor_decal/borderfloor{
-	dir = 10
-	},
-/obj/effect/floor_decal/corner/brown/border{
-	dir = 10
+"jst" = (
+/obj/machinery/door/firedoor{
+	dir = 8
 	},
+/turf/simulated/floor/tiled/dark,
+/area/quartermaster/warehouse)
+"jtk" = (
 /obj/machinery/requests_console/preset/cargo{
 	pixel_x = -31;
 	pixel_y = -1
 	},
-/turf/simulated/floor/tiled,
-/area/endeavour/surfacebase/mining_main/break_room)
-"jtn" = (
-/obj/structure/table/rack/steel,
-/obj/item/cartridge/quartermaster{
-	pixel_x = 6;
-	pixel_y = 2
-	},
-/obj/item/cartridge/quartermaster{
-	pixel_x = -3;
-	pixel_y = 2
-	},
-/obj/item/cartridge/quartermaster{
-	pixel_x = -3;
-	pixel_y = -5
+/obj/effect/floor_decal/spline/fancy/wood{
+	dir = 8
 	},
-/obj/item/cartridge/quartermaster{
-	pixel_x = 6;
-	pixel_y = -5
+/obj/structure/bed/chair/sofa/black/corner{
+	dir = 4
 	},
 /turf/simulated/floor/wood,
-/area/quartermaster/qm)
+/area/endeavour/surfacebase/mining_main/break_room)
+"jtn" = (
+/obj/structure/railing,
+/obj/structure/table/rack{
+	dir = 8;
+	layer = 2.9
+	},
+/obj/random/maintenance/medical,
+/turf/simulated/floor/plating,
+/area/maintenance/cargo)
 "jtu" = (
 /obj/structure/window/basic{
 	dir = 1
@@ -13969,6 +14390,10 @@
 	},
 /turf/simulated/floor/carpet/bcarpet,
 /area/crew_quarters/bar)
+"jtW" = (
+/obj/structure/salvageable/server,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d3aftmaint)
 "jua" = (
 /turf/simulated/floor/carpet/purcarpet,
 /area/maintenance/dormitory)
@@ -14032,31 +14457,26 @@
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d3portamidhall)
 "jwr" = (
-/obj/effect/floor_decal/spline/fancy/wood{
-	dir = 8
-	},
-/obj/structure/table/wooden_reinforced,
-/obj/machinery/microwave,
-/turf/simulated/floor/wood,
-/area/endeavour/surfacebase/mining_main/break_room)
+/obj/structure/closet,
+/obj/random/maintenance/medical,
+/obj/random/maintenance/clean,
+/obj/item/reagent_containers/food/drinks/bottle/rum{
+	desc = "TASTE DEMOCRACY";
+	name = "Managed Democra-cider"
+	},
+/obj/random/contraband,
+/obj/random/cigarettes,
+/obj/random/maintenance/security,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d3aftmaint)
 "jwx" = (
-/obj/effect/floor_decal/corner/brown/diagonal,
-/obj/machinery/holopad,
-/obj/structure/cable/green{
-	icon_state = "2-4"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 10
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 10
-	},
-/turf/simulated/floor/tiled/white,
-/area/quartermaster/belterdock/gear)
+/obj/effect/paint/beastybrown,
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/turf/simulated/floor/plating,
+/area/quartermaster/warehouse)
 "jwQ" = (
 /obj/structure/table/rack/shelf,
 /obj/item/radio{
-	pixel_x = 0;
 	pixel_y = 7
 	},
 /obj/item/radio{
@@ -14068,7 +14488,6 @@
 	pixel_y = 7
 	},
 /obj/random/toolbox{
-	pixel_x = 0;
 	pixel_y = -5
 	},
 /turf/simulated/floor/tiled,
@@ -14152,13 +14571,11 @@
 /turf/simulated/floor/carpet,
 /area/security/detectives_office)
 "jAA" = (
-/obj/effect/floor_decal/corner/brown/diagonal,
-/obj/machinery/camera/network/cargo{
-	dir = 8
+/obj/structure/cable/green{
+	icon_state = "4-8"
 	},
-/obj/machinery/fire_alarm/east_mount,
-/turf/simulated/floor/tiled/white,
-/area/quartermaster/belterdock/gear)
+/turf/simulated/floor/plating,
+/area/quartermaster/storage)
 "jAH" = (
 /obj/structure/poster{
 	pixel_x = 32
@@ -14167,15 +14584,11 @@
 /turf/simulated/floor/wood,
 /area/crew_quarters/bar/lounge)
 "jBe" = (
-/obj/effect/floor_decal/corner/brown/diagonal,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 5
-	},
-/turf/simulated/floor/tiled/white,
-/area/quartermaster/belterdock/gear)
+/obj/item/tool/wrench,
+/obj/structure/table/reinforced,
+/obj/item/tool/wirecutters,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d3aftmaint)
 "jBD" = (
 /obj/structure/table/marble,
 /obj/machinery/atmospherics/component/unary/vent_pump/on{
@@ -14191,15 +14604,17 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
 /obj/structure/cable/green{
 	icon_state = "1-4"
 	},
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
 /turf/simulated/floor/tiled,
-/area/endeavour/surfacebase/mining_main/break_room)
+/area/quartermaster/cargo_shelter_dock)
 "jCV" = (
 /obj/structure/window/basic{
 	dir = 1
@@ -14248,16 +14663,11 @@
 /turf/simulated/floor/tiled/dark,
 /area/security/hallway)
 "jDP" = (
-/turf/simulated/wall/prepainted,
-/area/security/nuke_storage)
-"jEc" = (
-/obj/effect/floor_decal/borderfloorblack,
-/obj/effect/floor_decal/corner/brown/border,
-/obj/structure/bed/chair/comfy/black{
-	dir = 1
-	},
-/turf/simulated/floor/tiled/monodark,
-/area/quartermaster/foyer)
+/obj/structure/bed/double/padded,
+/obj/item/bedsheet/browndouble,
+/obj/structure/curtain/open/bed,
+/turf/simulated/floor/plating,
+/area/maintenance/cargo)
 "jEn" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
@@ -14265,12 +14675,11 @@
 /turf/simulated/floor/tiled,
 /area/hydroponics)
 "jEN" = (
-/obj/effect/floor_decal/corner/brown/diagonal,
-/obj/machinery/air_alarm{
-	pixel_y = 22
+/obj/structure/poster/preset/tgstation/tg_9{
+	pixel_y = 32
 	},
-/turf/simulated/floor/tiled/white,
-/area/quartermaster/belterdock/gear)
+/turf/simulated/floor/plating,
+/area/quartermaster/storage)
 "jFV" = (
 /obj/machinery/computer/guestpass{
 	dir = 1;
@@ -14290,19 +14699,6 @@
 	},
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d3portforhall)
-"jGc" = (
-/obj/effect/floor_decal/borderfloor{
-	dir = 9
-	},
-/obj/effect/floor_decal/corner/brown/border{
-	dir = 9
-	},
-/obj/structure/disposalpipe/segment{
-	dir = 4
-	},
-/obj/machinery/fire_alarm/north_mount,
-/turf/simulated/floor/tiled/monotile,
-/area/quartermaster/belterdock/refinery)
 "jGe" = (
 /turf/space/basic,
 /area/endeavour/command/turrets)
@@ -14426,6 +14822,14 @@
 /obj/effect/floor_decal/corner/navblue/border,
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d3fwdhall)
+"jKP" = (
+/obj/structure/catwalk,
+/obj/machinery/light/small,
+/obj/structure/cable/green{
+	icon_state = "1-4"
+	},
+/turf/simulated/floor/plating,
+/area/maintenance/bar/catwalk)
 "jKX" = (
 /obj/item/radio/intercom{
 	dir = 4;
@@ -14443,30 +14847,28 @@
 /turf/simulated/floor/wood,
 /area/crew_quarters/sleep/Dorm_4)
 "jLH" = (
-/obj/map_helper/access_helper/airlock/station/supply/maintenance,
 /obj/structure/catwalk,
 /obj/machinery/door/airlock/maintenance,
 /obj/structure/disposalpipe/segment{
 	dir = 1
 	},
-/turf/simulated/floor/plating,
-/area/maintenance/lower/trash_pit)
-"jLP" = (
-/obj/machinery/door/firedoor/glass,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 1
+/obj/machinery/door/airlock/maintenance,
+/obj/machinery/door/firedoor{
+	dir = 8
 	},
 /obj/structure/cable/green{
 	icon_state = "1-2"
 	},
-/obj/machinery/door/airlock/mining{
-	name = "Cargo Airlock";
-	req_one_access = null
+/turf/simulated/floor/plating,
+/area/maintenance/trash_pit)
+"jLP" = (
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 10
 	},
-/obj/map_helper/access_helper/airlock/station/supply/cargo_bay,
-/turf/simulated/floor/tiled/monodark,
-/area/quartermaster/delivery)
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/turf/simulated/floor/wood,
+/area/crew_quarters/recreation_area)
 "jMc" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
@@ -14552,17 +14954,15 @@
 /turf/simulated/floor/tiled/dark,
 /area/quartermaster/foyer)
 "jPs" = (
-/obj/effect/floor_decal/borderfloor{
-	dir = 1
-	},
-/obj/effect/floor_decal/corner/brown/border{
-	dir = 1
-	},
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/turf/simulated/floor/tiled/monotile,
-/area/quartermaster/belterdock/refinery)
+/obj/structure/catwalk,
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d3aftmaint)
 "jQE" = (
 /obj/machinery/atmospherics/component/unary/vent_pump/on{
 	dir = 4
@@ -14578,6 +14978,13 @@
 /obj/map_helper/access_helper/airlock/station/security/general,
 /turf/simulated/floor/tiled/dark,
 /area/security/interrogation)
+"jRe" = (
+/obj/machinery/camera/network/outside{
+	dir = 1
+	},
+/obj/structure/lattice,
+/turf/space/basic,
+/area/space)
 "jRg" = (
 /obj/structure/cable/green{
 	icon_state = "0-2"
@@ -14617,11 +15024,11 @@
 /turf/simulated/floor/wood,
 /area/crew_quarters/recreation_area)
 "jSX" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 5
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 5
+	dir = 6
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 6
 	},
 /turf/simulated/floor/tiled/techmaint,
 /area/quartermaster/warehouse)
@@ -14692,6 +15099,16 @@
 /obj/machinery/door/airlock/glass,
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d3afthall)
+"jVx" = (
+/obj/effect/floor_decal/techfloor{
+	dir = 10
+	},
+/obj/machinery/space_heater,
+/obj/landmark{
+	name = "blobstart"
+	},
+/turf/simulated/floor/tiled/techfloor,
+/area/maintenance/bar/catwalk)
 "jWp" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -14785,8 +15202,15 @@
 /turf/simulated/wall/prepainted/civilian,
 /area/crew_quarters/game_room)
 "kad" = (
-/obj/machinery/air_alarm/west_mount,
-/turf/simulated/floor/tiled,
+/obj/machinery/door/airlock/glass/mining{
+	name = "Magmatic Rift Leap Pad";
+	req_one_access = null
+	},
+/obj/map_helper/access_helper/airlock/station/mining_operations,
+/obj/machinery/door/firedoor{
+	dir = 8
+	},
+/turf/simulated/floor/plating,
 /area/quartermaster/belterdock)
 "kam" = (
 /obj/machinery/atmospherics/component/unary/vent_pump/on,
@@ -14891,6 +15315,10 @@
 /obj/machinery/media/jukebox,
 /turf/simulated/floor/wood,
 /area/security/breakroom)
+"kdG" = (
+/obj/machinery/air_alarm/north_mount,
+/turf/simulated/floor/plating,
+/area/maintenance/cargo)
 "kdS" = (
 /obj/machinery/door/airlock/command{
 	id_tag = "HoSdoor";
@@ -14925,8 +15353,10 @@
 /turf/simulated/floor/tiled,
 /area/hydroponics)
 "kdZ" = (
-/turf/simulated/floor/carpet/blue,
-/area/crew_quarters/sleep/Dorm_11)
+/obj/structure/table/wooden_reinforced,
+/obj/item/storage/box/donkpockets,
+/turf/simulated/floor/wood,
+/area/maintenance/cargo)
 "keU" = (
 /obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks,
 /obj/map_helper/electrochromatic_linker{
@@ -15011,7 +15441,7 @@
 /turf/simulated/floor/wood,
 /area/crew_quarters/sleep/Dorm_10)
 "kgM" = (
-/turf/simulated/wall/prepainted/cargo,
+/turf/simulated/wall/r_wall/prepainted,
 /area/maintenance/bar/lower)
 "khP" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -15062,14 +15492,6 @@
 "kiu" = (
 /turf/simulated/wall/r_wall/prepainted/security,
 /area/security/breakroom)
-"kiP" = (
-/obj/effect/floor_decal/borderfloorblack,
-/obj/effect/floor_decal/corner/brown/border,
-/obj/structure/bed/chair/comfy/brown{
-	dir = 1
-	},
-/turf/simulated/floor/tiled/monodark,
-/area/quartermaster/foyer)
 "kiR" = (
 /obj/structure/table/standard,
 /obj/item/storage/box/cups,
@@ -15115,6 +15537,12 @@
 	},
 /turf/simulated/floor/carpet,
 /area/security/detectives_office)
+"kkx" = (
+/obj/effect/floor_decal/techfloor{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/techfloor,
+/area/maintenance/bar/catwalk)
 "klc" = (
 /obj/structure/cable/green{
 	icon_state = "2-8"
@@ -15181,12 +15609,9 @@
 /turf/simulated/floor/tiled,
 /area/crew_quarters/fitness)
 "kow" = (
-/obj/machinery/mineral/input,
-/obj/effect/floor_decal/industrial/warning/dust{
-	dir = 1
-	},
-/turf/simulated/floor/tiled/monodark,
-/area/quartermaster/belterdock/refinery)
+/obj/machinery/light/small,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d3aftmaint)
 "koL" = (
 /obj/structure/cable/green{
 	icon_state = "4-8"
@@ -15298,10 +15723,23 @@
 /turf/simulated/floor/plating,
 /area/endeavour/hallway/d3aftmaint)
 "kur" = (
-/obj/effect/floor_decal/spline/plain,
-/obj/structure/flora/grass/event/purple_flowers1,
-/turf/simulated/floor/grass,
-/area/quartermaster/warehouse)
+/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"
+	},
+/obj/structure/cable/green{
+	icon_state = "1-4"
+	},
+/obj/structure/disposalpipe/segment{
+	dir = 8
+	},
+/turf/simulated/floor/wood,
+/area/crew_quarters/sleep/Dorm_13)
 "kuG" = (
 /obj/landmark/spawnpoint/latejoin/station/cryogenics,
 /obj/machinery/atmospherics/component/unary/vent_pump/on{
@@ -15336,29 +15774,6 @@
 /obj/machinery/camera/network/civilian,
 /turf/simulated/floor/carpet/bcarpet,
 /area/crew_quarters/bar)
-"kwo" = (
-/obj/structure/table/reinforced,
-/obj/machinery/door/window{
-	dir = 8;
-	req_one_access = list(31)
-	},
-/obj/item/paper_bin{
-	pixel_x = -1;
-	pixel_y = 4
-	},
-/obj/item/folder/white,
-/obj/item/pen,
-/obj/machinery/door/firedoor{
-	dir = 8
-	},
-/obj/effect/floor_decal/borderfloorblack{
-	dir = 4
-	},
-/obj/effect/floor_decal/corner/brown/border{
-	dir = 4
-	},
-/turf/simulated/floor/tiled/monodark,
-/area/quartermaster/delivery)
 "kwF" = (
 /obj/structure/stairs/spawner/north{
 	dir = 2;
@@ -15427,10 +15842,10 @@
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d3starboardforhall)
 "kBv" = (
-/obj/effect/floor_decal/industrial/outline/yellow,
-/obj/structure/ore_box,
-/turf/simulated/floor/tiled/monotile,
-/area/quartermaster/belterdock/refinery)
+/obj/effect/floor_decal/corner/brown/diagonal,
+/obj/machinery/atmospherics/component/unary/vent_pump/on,
+/turf/simulated/floor/tiled/white,
+/area/quartermaster/belterdock/gear)
 "kBD" = (
 /obj/structure/disposalpipe/segment{
 	dir = 2;
@@ -15505,6 +15920,16 @@
 	},
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d3starboardforhall)
+"kCu" = (
+/obj/structure/catwalk,
+/obj/structure/railing{
+	dir = 8
+	},
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
+/turf/simulated/floor/plating,
+/area/maintenance/bar/catwalk)
 "kCG" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -15550,12 +15975,10 @@
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d3starboardforhall)
 "kDo" = (
-/obj/machinery/vending/nifsoft_shop,
-/obj/machinery/camera/network/cargo{
-	dir = 4
-	},
-/turf/simulated/floor/tiled/techmaint,
-/area/quartermaster/warehouse)
+/obj/effect/floor_decal/corner/brown/diagonal,
+/obj/machinery/suit_storage_unit/mining,
+/turf/simulated/floor/tiled/white,
+/area/quartermaster/belterdock/gear)
 "kDu" = (
 /obj/structure/disposalpipe/segment{
 	dir = 8
@@ -15580,14 +16003,15 @@
 /obj/structure/railing{
 	dir = 4
 	},
+/obj/random/junk,
 /turf/simulated/floor/plating,
-/area/maintenance/lower/trash_pit)
+/area/maintenance/trash_pit)
 "kDM" = (
-/obj/effect/floor_decal/spline/plain{
-	dir = 10
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+	dir = 1
 	},
-/obj/structure/flora/grass/event/sparse_grass2,
-/turf/simulated/floor/grass,
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
+/turf/simulated/floor/tiled/techmaint,
 /area/quartermaster/warehouse)
 "kEf" = (
 /obj/effect/floor_decal/spline/fancy/wood{
@@ -15632,6 +16056,21 @@
 	},
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d3starboardafthall)
+"kFu" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 8
+	},
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/dark,
+/area/quartermaster/foyer)
 "kGf" = (
 /obj/effect/floor_decal/borderfloorblack{
 	dir = 1
@@ -15661,6 +16100,13 @@
 	},
 /turf/simulated/floor/tiled/old_cargo/gray,
 /area/prison/cell_block)
+"kIg" = (
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
+/obj/effect/floor_decal/industrial/outline/blue,
+/turf/simulated/floor/tiled/dark,
+/area/quartermaster/warehouse)
 "kIm" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -15726,13 +16172,9 @@
 /turf/simulated/floor/tiled/dark,
 /area/crew_quarters/kitchen)
 "kKO" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/cable/green{
-	icon_state = "1-2"
-	},
-/turf/simulated/floor/tiled/dark,
-/area/quartermaster/foyer)
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/turf/simulated/floor/plating,
+/area/maintenance/cargo)
 "kKQ" = (
 /obj/machinery/door/firedoor{
 	dir = 8
@@ -15795,9 +16237,6 @@
 /turf/simulated/floor/carpet/sblucarpet,
 /area/crew_quarters/sleep/Dorm_7)
 "kMk" = (
-/obj/structure/disposalpipe/segment{
-	dir = 8
-	},
 /obj/machinery/atmospherics/component/unary/vent_scrubber/on,
 /obj/structure/cable/green{
 	icon_state = "4-8"
@@ -15811,12 +16250,8 @@
 /turf/simulated/floor/tiled,
 /area/security/lobby)
 "kNT" = (
-/obj/vehicle/sealed/mecha/combat/fighter/cludge{
-	dir = 4;
-	name = "\improper Titan Class Fighter"
-	},
-/turf/simulated/floor/reinforced,
-/area/maintenance/bar/catwalk)
+/turf/simulated/floor/tiled/steel_grid,
+/area/quartermaster/belterdock)
 "kOc" = (
 /obj/structure/cable/green{
 	icon_state = "1-8"
@@ -15826,31 +16261,29 @@
 /turf/simulated/floor/wood,
 /area/maintenance/dormitory)
 "kOw" = (
-/obj/structure/table/steel_reinforced,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
+/obj/effect/floor_decal/corner/brown/diagonal,
+/obj/machinery/door/airlock/glass/mining{
+	name = "Mining Prep Room";
+	req_one_access = null
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
+/obj/map_helper/access_helper/airlock/station/supply/mining,
+/obj/machinery/door/firedoor{
+	dir = 8
 	},
-/obj/item/hand_labeler{
-	pixel_x = 0;
-	pixel_y = 8
+/obj/structure/disposalpipe/segment{
+	dir = 4
 	},
-/obj/item/hand_labeler{
-	pixel_x = 0;
-	pixel_y = 5
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 8
 	},
-/obj/item/hand_labeler{
-	pixel_x = 0;
-	pixel_y = 2
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
 	},
-/obj/item/hand_labeler{
-	pixel_x = 0;
-	pixel_y = -1
+/obj/structure/cable/green{
+	icon_state = "4-8"
 	},
-/turf/simulated/floor/tiled/techmaint,
-/area/quartermaster/warehouse)
+/turf/simulated/floor/tiled/white,
+/area/quartermaster/belterdock/gear)
 "kPK" = (
 /obj/machinery/door/blast/regular{
 	name = "Fighter Hanger Blast Door";
@@ -15893,9 +16326,14 @@
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d3fwdhall)
 "kQS" = (
-/obj/effect/floor_decal/spline/plain,
-/turf/simulated/floor/grass,
-/area/quartermaster/warehouse)
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
+/turf/simulated/floor/tiled/dark,
+/area/quartermaster/foyer)
 "kRb" = (
 /obj/machinery/door/firedoor/glass,
 /obj/structure/cable/green{
@@ -15921,11 +16359,16 @@
 /turf/simulated/floor/airless,
 /area/shuttle/mining_ship/general)
 "kRu" = (
-/obj/effect/floor_decal/corner/brown/diagonal,
-/obj/structure/closet/secure_closet/miner,
-/obj/item/binoculars,
-/turf/simulated/floor/tiled/white,
-/area/quartermaster/belterdock/gear)
+/obj/structure/poster/preset/baystation/bay_50{
+	pixel_y = -32
+	},
+/obj/structure/table,
+/obj/structure/dancepole,
+/obj/machinery/floor_light/changing/prebuilt{
+	on = 1
+	},
+/turf/simulated/floor/tiled/dark,
+/area/quartermaster/storage)
 "kRM" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -15978,15 +16421,15 @@
 /turf/simulated/floor/plating,
 /area/endeavour/hallway/d3aftmaint)
 "kSN" = (
-/obj/structure/disposalpipe/segment{
-	dir = 8
-	},
 /obj/machinery/atmospherics/component/unary/vent_pump/on{
 	dir = 1
 	},
 /obj/structure/cable/green{
 	icon_state = "2-8"
 	},
+/obj/structure/cable/green{
+	icon_state = "2-4"
+	},
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d3portforhall)
 "kTd" = (
@@ -16074,16 +16517,6 @@
 /obj/machinery/holopad,
 /turf/simulated/floor/tiled/dark,
 /area/security/hallway)
-"kXD" = (
-/obj/structure/window/reinforced{
-	dir = 4
-	},
-/obj/structure/window/reinforced{
-	dir = 8
-	},
-/obj/structure/flora/grass/event/sparse_grass2,
-/turf/simulated/floor/grass,
-/area/quartermaster/foyer)
 "kXK" = (
 /obj/structure/cable/green{
 	icon_state = "4-8"
@@ -16133,11 +16566,14 @@
 /turf/simulated/floor/wood,
 /area/crew_quarters/game_room)
 "kZu" = (
-/obj/effect/floor_decal/borderfloor,
-/obj/effect/floor_decal/corner/brown/border,
-/obj/machinery/light,
-/turf/simulated/floor/tiled,
-/area/endeavour/surfacebase/mining_main/break_room)
+/obj/structure/bed/chair/comfy/beige{
+	dir = 4
+	},
+/obj/machinery/light/small{
+	dir = 8
+	},
+/turf/simulated/floor/carpet/turcarpet,
+/area/crew_quarters/sleep/Dorm_13)
 "kZA" = (
 /obj/effect/floor_decal/corner/green/full{
 	dir = 1
@@ -16165,22 +16601,13 @@
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d3starboardafthall)
 "lag" = (
-/obj/machinery/embedded_controller/radio/simple_docking_controller{
-	frequency = 1380;
-	id_tag = "belter_docking";
-	name = "Belting Dock Controller";
-	pixel_x = 1;
-	pixel_y = -24;
-	req_one_access = list(13,31)
+/obj/machinery/conveyor{
+	dir = 8;
+	id = "mining_interior"
 	},
-/obj/structure/table/reinforced,
-/obj/item/tank/jetpack/oxygen,
-/obj/item/tank/jetpack/oxygen,
-/obj/item/tank/jetpack/oxygen,
-/obj/item/tank/jetpack/oxygen,
-/obj/item/tank/jetpack/oxygen,
-/turf/simulated/floor/reinforced,
-/area/quartermaster/miningdock)
+/obj/machinery/mineral/input,
+/turf/simulated/floor/tiled/monodark,
+/area/quartermaster/belterdock/refinery)
 "laD" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -16198,9 +16625,6 @@
 "laQ" = (
 /obj/effect/floor_decal/borderfloorblack,
 /obj/effect/floor_decal/corner/brown/border,
-/obj/structure/cable/green{
-	icon_state = "4-8"
-	},
 /obj/item/radio/intercom{
 	name = "Station Intercom (General)";
 	pixel_y = -26
@@ -16260,13 +16684,13 @@
 /obj/structure/cable/green{
 	icon_state = "2-8"
 	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+/obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
-/obj/structure/disposalpipe/segment{
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
 /turf/simulated/floor/tiled/dark,
@@ -16279,6 +16703,16 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/quartermaster/warehouse)
+"lea" = (
+/obj/effect/floor_decal/borderfloorblack{
+	dir = 1
+	},
+/obj/effect/floor_decal/corner/brown/border{
+	dir = 1
+	},
+/obj/machinery/fire_alarm/north_mount,
+/turf/simulated/floor/tiled/dark,
+/area/quartermaster/warehouse)
 "len" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/structure/cable/green{
@@ -16293,14 +16727,6 @@
 	},
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d3portamidhall)
-"leF" = (
-/obj/machinery/air_alarm/east_mount,
-/obj/machinery/disposal,
-/obj/structure/disposalpipe/trunk{
-	dir = 1
-	},
-/turf/simulated/floor/wood,
-/area/quartermaster/qm)
 "leL" = (
 /obj/structure/disposalpipe/segment{
 	dir = 8
@@ -16327,14 +16753,6 @@
 /obj/machinery/light,
 /turf/simulated/floor/tiled/old_cargo/white,
 /area/security/forensics)
-"lfJ" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/disposalpipe/segment,
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
-	dir = 4
-	},
-/turf/simulated/floor/tiled/dark,
-/area/quartermaster/foyer)
 "lfS" = (
 /obj/machinery/light{
 	dir = 1
@@ -16367,21 +16785,9 @@
 /turf/simulated/floor/tiled/dark,
 /area/security/nuke_storage)
 "lgM" = (
-/obj/machinery/portable_atmospherics/canister/oxygen,
-/obj/structure/window/reinforced{
-	dir = 1
-	},
-/obj/effect/floor_decal/industrial/hatch/yellow,
-/obj/structure/window/reinforced,
-/obj/machinery/door/window{
-	dir = 4;
-	req_one_access = list(31)
-	},
-/obj/structure/window/reinforced{
-	dir = 8
-	},
-/turf/simulated/floor/tiled/monotechmaint,
-/area/quartermaster/belterdock/refinery)
+/obj/structure/reagent_dispensers/fueltank,
+/turf/simulated/floor/plating,
+/area/maintenance/cargo)
 "lgT" = (
 /obj/structure/table/marble,
 /obj/machinery/door/blast/shutters{
@@ -16436,15 +16842,10 @@
 /turf/simulated/floor/tiled/monotile,
 /area/endeavour/hallway/d3afthall)
 "lif" = (
+/obj/random/junk,
+/obj/random/maintenance,
 /turf/simulated/floor/plating,
-/area/maintenance/lower/trash_pit)
-"lin" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/disposalpipe/segment,
-/obj/machinery/computer/timeclock/premade/east,
-/turf/simulated/floor/wood,
-/area/crew_quarters/recreation_area)
+/area/maintenance/trash_pit)
 "liu" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -16476,13 +16877,9 @@
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d3portforhall)
 "lkP" = (
-/obj/structure/cable/green{
-	icon_state = "1-2"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/tiled/monodark,
-/area/quartermaster/delivery)
+/obj/structure/salvageable/machine,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d3aftmaint)
 "lly" = (
 /obj/spawner/window/low_wall/reinforced/full/firelocks,
 /obj/effect/paint/darkred,
@@ -16501,17 +16898,10 @@
 /turf/simulated/floor/plating,
 /area/endeavour/hallway/d3fwdmaint)
 "lmr" = (
-/obj/structure/table/reinforced,
-/obj/item/storage/firstaid/regular{
-	pixel_x = 0;
-	pixel_y = 8
-	},
-/obj/item/storage/firstaid/fire{
-	pixel_x = 0;
-	pixel_y = 3
-	},
-/turf/simulated/floor/tiled,
-/area/quartermaster/belterdock)
+/obj/structure/railing,
+/obj/random/mouseremains,
+/turf/simulated/floor/plating,
+/area/maintenance/cargo)
 "lmD" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
@@ -16528,12 +16918,6 @@
 	},
 /turf/simulated/floor/tiled/techfloor,
 /area/security/lobby)
-"lnj" = (
-/obj/effect/floor_decal/borderfloorblack,
-/obj/effect/floor_decal/corner/brown/border,
-/obj/structure/window/reinforced/survival_pod,
-/turf/simulated/floor/tiled/dark,
-/area/quartermaster/warehouse)
 "lnp" = (
 /obj/structure/cable{
 	icon_state = "1-4"
@@ -16862,21 +17246,9 @@
 /turf/simulated/floor/wood,
 /area/tether/surfacebase/entertainment)
 "lye" = (
-/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
-	},
-/obj/machinery/light{
-	dir = 1;
-	pixel_y = 20
-	},
-/turf/simulated/floor/tiled,
-/area/endeavour/hallway/d3portforhall)
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/turf/simulated/floor/tiled/dark,
+/area/quartermaster/foyer)
 "lyz" = (
 /obj/structure/table/rack{
 	dir = 8;
@@ -16921,11 +17293,8 @@
 /turf/simulated/floor/tiled,
 /area/crew_quarters/fitness)
 "lAm" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/disposalpipe/segment,
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
-	dir = 4
-	},
+/obj/effect/floor_decal/borderfloorblack,
+/obj/effect/floor_decal/corner/brown/border,
 /turf/simulated/floor/tiled/dark,
 /area/quartermaster/foyer)
 "lAo" = (
@@ -16938,15 +17307,15 @@
 /turf/simulated/floor/tiled/dark,
 /area/security/hallway)
 "lAL" = (
-/obj/structure/cable/green{
-	icon_state = "4-8"
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 1
 	},
-/obj/machinery/light{
-	dir = 1;
-	pixel_y = 20
+/obj/structure/cable/green{
+	icon_state = "1-2"
 	},
-/turf/simulated/floor/reinforced,
-/area/quartermaster/miningdock)
+/turf/simulated/floor/tiled,
+/area/endeavour/hallway/d3portforhall)
 "lCj" = (
 /obj/structure/table/woodentable,
 /obj/machinery/chemical_dispenser/catering/bar_soft{
@@ -16994,6 +17363,9 @@
 /obj/effect/floor_decal/rust,
 /turf/simulated/floor/plating,
 /area/endeavour/hallway/d3aftmaint)
+"lDd" = (
+/turf/simulated/floor/tiled/monodark,
+/area/quartermaster/delivery)
 "lDq" = (
 /obj/effect/floor_decal/borderfloorblack{
 	dir = 8
@@ -17090,18 +17462,9 @@
 /turf/simulated/wall/r_wall/prepainted/engineering,
 /area/endeavour/hallway/d3aftmaint)
 "lGM" = (
-/obj/structure/window/reinforced{
-	dir = 4
-	},
-/obj/structure/window/reinforced{
-	dir = 8
-	},
-/obj/structure/window/reinforced{
-	dir = 1
-	},
-/obj/structure/flora/grass/event/generic_bush1,
-/turf/simulated/floor/grass,
-/area/quartermaster/foyer)
+/obj/machinery/vending/fitness,
+/turf/simulated/floor/wood,
+/area/crew_quarters/recreation_area)
 "lGQ" = (
 /turf/simulated/floor/tiled/techmaint,
 /area/security/brig)
@@ -17203,14 +17566,14 @@
 /turf/simulated/wall/r_wall/prepainted/engineering,
 /area/security/forensics)
 "lKH" = (
+/obj/structure/closet/secure_closet/cargotech,
 /obj/effect/floor_decal/borderfloorblack{
 	dir = 1
 	},
 /obj/effect/floor_decal/corner/brown/border{
 	dir = 1
 	},
-/obj/structure/bed/chair/sofa/black/left,
-/turf/simulated/floor/tiled/dark,
+/turf/simulated/floor/tiled/techmaint,
 /area/quartermaster/warehouse)
 "lKR" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -17249,14 +17612,6 @@
 /obj/landmark/spawnpoint/job/entertainer,
 /turf/simulated/floor/carpet/bcarpet,
 /area/tether/surfacebase/entertainment)
-"lNT" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/cable/green{
-	icon_state = "1-2"
-	},
-/turf/simulated/floor/tiled/monotile,
-/area/quartermaster/belterdock/refinery)
 "lNU" = (
 /obj/structure/table/gamblingtable,
 /obj/item/deck/cards,
@@ -17317,6 +17672,7 @@
 /obj/effect/floor_decal/corner/brown/border,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/light,
 /turf/simulated/floor/tiled/dark,
 /area/quartermaster/warehouse)
 "lQs" = (
@@ -17332,24 +17688,17 @@
 /turf/simulated/floor/plating,
 /area/endeavour/hallway/d3aftmaint)
 "lRw" = (
-/obj/machinery/atmospherics/component/unary/vent_pump/on{
-	dir = 8
-	},
+/obj/structure/table/steel_reinforced,
+/obj/machinery/recharger,
 /turf/simulated/floor/reinforced,
 /area/quartermaster/miningdock)
 "lRx" = (
-/obj/structure/sign/warning/moving_parts{
-	pixel_y = 32
-	},
-/obj/machinery/conveyor_switch/oneway{
-	tag = "mailroom";
-	id = "DLBelt"
-	},
-/obj/effect/floor_decal/industrial/warning{
-	dir = 8
+/obj/machinery/mineral/input,
+/obj/effect/floor_decal/industrial/warning/dust{
+	dir = 1
 	},
 /turf/simulated/floor/tiled/monodark,
-/area/quartermaster/delivery)
+/area/quartermaster/belterdock/refinery)
 "lRP" = (
 /obj/structure/cable/green{
 	icon_state = "4-8"
@@ -17456,17 +17805,12 @@
 /turf/simulated/floor/tiled/dark,
 /area/security/hallway)
 "lUu" = (
-/obj/effect/floor_decal/borderfloorblack{
-	dir = 6
-	},
-/obj/effect/floor_decal/corner/brown/border{
-	dir = 6
-	},
-/obj/structure/bed/chair/sofa/black/corner{
-	dir = 8
+/obj/structure/catwalk,
+/obj/structure/cable/green{
+	icon_state = "4-8"
 	},
-/turf/simulated/floor/tiled/dark,
-/area/quartermaster/foyer)
+/turf/simulated/floor/plating,
+/area/maintenance/cargo)
 "lUH" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -17608,6 +17952,8 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
+/obj/effect/floor_decal/borderfloorblack,
+/obj/effect/floor_decal/corner/brown/border,
 /turf/simulated/floor/tiled/monodark,
 /area/quartermaster/foyer)
 "lYm" = (
@@ -17673,12 +18019,20 @@
 /turf/simulated/floor/wood,
 /area/crew_quarters/sleep/Dorm_5)
 "mbv" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
+/obj/effect/floor_decal/borderfloorblack{
 	dir = 4
 	},
-/obj/landmark/spawnpoint/job/shaft_miner,
-/turf/simulated/floor/tiled/monotile,
-/area/quartermaster/belterdock/refinery)
+/obj/effect/floor_decal/corner/brown/border{
+	dir = 4
+	},
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
+/turf/simulated/floor/tiled/dark,
+/area/quartermaster/warehouse)
 "mbJ" = (
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply{
 	dir = 4
@@ -17733,17 +18087,12 @@
 /turf/simulated/floor/tiled,
 /area/security/lobby)
 "mff" = (
-/obj/machinery/light{
+/obj/effect/floor_decal/corner/brown/diagonal,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 8
 	},
-/obj/effect/floor_decal/borderfloor{
-	dir = 10
-	},
-/obj/effect/floor_decal/corner/brown/border{
-	dir = 10
-	},
-/turf/simulated/floor/tiled/monotile,
-/area/quartermaster/belterdock/refinery)
+/turf/simulated/floor/tiled/white,
+/area/quartermaster/belterdock/gear)
 "mfm" = (
 /obj/structure/disposalpipe/segment,
 /turf/simulated/floor/tiled/dark,
@@ -17797,9 +18146,10 @@
 /turf/simulated/floor/tiled/dark,
 /area/security/hallwayaux)
 "mhO" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/disposalpipe/segment,
+/obj/effect/floor_decal/borderfloorblack,
+/obj/effect/floor_decal/corner/brown/border,
+/obj/effect/floor_decal/borderfloorblack/corner2,
+/obj/effect/floor_decal/corner/brown/bordercorner2,
 /turf/simulated/floor/tiled/dark,
 /area/quartermaster/foyer)
 "mhY" = (
@@ -17816,18 +18166,15 @@
 /obj/structure/cable/green{
 	icon_state = "4-8"
 	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
-	dir = 1
-	},
-/obj/structure/cable/green{
-	icon_state = "2-4"
-	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
+/obj/effect/floor_decal/borderfloorblack,
+/obj/effect/floor_decal/corner/brown/border,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
 /turf/simulated/floor/tiled/monodark,
 /area/quartermaster/foyer)
 "miu" = (
@@ -17868,28 +18215,10 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/security/brig)
-"miH" = (
-/obj/machinery/light_switch{
-	dir = 1;
-	pixel_x = -5;
-	pixel_y = -28
-	},
-/obj/machinery/disposal,
-/obj/structure/disposalpipe/trunk{
-	dir = 4
-	},
-/obj/machinery/button/remote/airlock{
-	id = "dorm12";
-	name = "Room 12 Lock";
-	pixel_x = 5;
-	pixel_y = -27;
-	specialfunctions = 4
-	},
-/obj/machinery/light/small{
-	dir = 8
-	},
-/turf/simulated/floor/wood,
-/area/crew_quarters/sleep/Dorm_11)
+"mjy" = (
+/obj/structure/closet/firecloset,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d3aftmaint)
 "mjB" = (
 /obj/effect/floor_decal/borderfloorblack{
 	dir = 5
@@ -17963,16 +18292,20 @@
 /turf/simulated/floor/tiled/dark,
 /area/security/hallway)
 "mlk" = (
-/obj/structure/cable/green{
-	icon_state = "2-8"
+/obj/effect/floor_decal/borderfloor{
+	dir = 10
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/cable/green{
-	icon_state = "1-2"
+/obj/effect/floor_decal/corner/brown/border{
+	dir = 10
 	},
-/turf/simulated/floor/tiled/monodark,
-/area/quartermaster/delivery)
+/obj/effect/floor_decal/borderfloor/corner2{
+	dir = 8
+	},
+/obj/effect/floor_decal/corner/brown/bordercorner2{
+	dir = 8
+	},
+/turf/simulated/floor/tiled,
+/area/quartermaster/cargo_shelter_dock)
 "mll" = (
 /obj/machinery/light{
 	dir = 1
@@ -18096,11 +18429,8 @@
 /obj/effect/floor_decal/corner/brown/border{
 	dir = 1
 	},
-/obj/structure/bed/chair/sofa/black/right,
-/obj/machinery/newscaster{
-	pixel_y = 32
-	},
-/turf/simulated/floor/tiled/dark,
+/obj/machinery/vending/cola,
+/turf/simulated/floor/tiled/techmaint,
 /area/quartermaster/warehouse)
 "moE" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -18123,9 +18453,7 @@
 /obj/effect/floor_decal/borderfloorblack,
 /obj/effect/floor_decal/corner/brown/border,
 /obj/machinery/power/apc/south_mount,
-/obj/structure/cable/green{
-	icon_state = "0-8"
-	},
+/obj/structure/cable/green,
 /turf/simulated/floor/tiled/dark,
 /area/quartermaster/warehouse)
 "mpy" = (
@@ -18217,6 +18545,12 @@
 	},
 /turf/simulated/floor/tiled/old_cargo/gray,
 /area/prison/cell_block)
+"mrn" = (
+/obj/machinery/floor_light/changing/prebuilt{
+	on = 1
+	},
+/turf/simulated/floor/plating,
+/area/quartermaster/storage)
 "mrw" = (
 /obj/structure/flora/pottedplant/orientaltree,
 /obj/machinery/camera/network/civilian{
@@ -18257,11 +18591,17 @@
 /turf/simulated/floor/plating,
 /area/endeavour/hallway/d3aftmaint)
 "mti" = (
-/obj/structure/cable/green{
-	icon_state = "4-8"
+/obj/effect/floor_decal/spline/fancy/wood{
+	dir = 10
+	},
+/obj/machinery/light,
+/obj/machinery/vending/wallmed1{
+	dir = 4;
+	pixel_x = -24;
+	pixel_y = 2
 	},
 /turf/simulated/floor/wood,
-/area/crew_quarters/recreation_area_hallway)
+/area/endeavour/surfacebase/mining_main/break_room)
 "mty" = (
 /turf/simulated/floor/tiled/old_cargo/white,
 /area/security/forensics)
@@ -18301,34 +18641,10 @@
 /turf/simulated/floor/tiled/monotile,
 /area/endeavour/hallway/d3afthall)
 "mwk" = (
-/obj/item/storage/box/nifsofts_mining{
-	pixel_x = -3;
-	pixel_y = 0
-	},
-/obj/item/suit_cooling_unit{
-	pixel_x = -4;
-	pixel_y = 0
-	},
-/obj/item/suit_cooling_unit{
-	pixel_x = -4;
-	pixel_y = 0
-	},
-/obj/item/duct_tape_roll{
-	pixel_x = -4;
-	pixel_y = 0
-	},
-/obj/structure/table/reinforced,
-/obj/effect/floor_decal/corner/brown/diagonal,
-/obj/item/stack/flag/green{
-	pixel_x = 7;
-	pixel_y = 1
-	},
-/obj/item/stack/flag/green{
-	pixel_x = 7;
-	pixel_y = 2
-	},
-/turf/simulated/floor/tiled/white,
-/area/quartermaster/belterdock/gear)
+/obj/item/banner/cargo,
+/obj/machinery/light/small,
+/turf/simulated/floor/plating,
+/area/quartermaster/storage)
 "mwA" = (
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply,
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
@@ -18402,9 +18718,6 @@
 	},
 /turf/simulated/floor/wood,
 /area/endeavour/surfacebase/bar_backroom)
-"mzJ" = (
-/turf/simulated/floor/tiled,
-/area/maintenance/bar/lower)
 "mAl" = (
 /obj/effect/floor_decal/borderfloorblack{
 	dir = 4
@@ -18431,6 +18744,10 @@
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/substation/civilian)
+"mBo" = (
+/obj/structure/disposalpipe/segment,
+/turf/simulated/floor/tiled/dark,
+/area/quartermaster/warehouse)
 "mBA" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -18491,32 +18808,40 @@
 /turf/simulated/floor/tiled/dark,
 /area/security/hallway)
 "mEb" = (
-/obj/machinery/mineral/equipment_vendor,
-/obj/effect/floor_decal/corner/brown/diagonal,
-/turf/simulated/floor/tiled/white,
-/area/quartermaster/belterdock/gear)
+/obj/structure/poster/preset/baystation/bay_8{
+	pixel_y = 32
+	},
+/obj/structure/cable/green{
+	icon_state = "2-8"
+	},
+/turf/simulated/floor/plating,
+/area/quartermaster/storage)
 "mEG" = (
 /obj/structure/bed/chair/office/dark{
 	dir = 8
 	},
 /turf/simulated/floor/carpet,
 /area/security/detectives_office)
+"mFc" = (
+/obj/structure/cable/green{
+	icon_state = "1-4"
+	},
+/turf/simulated/floor/plating,
+/area/quartermaster/storage)
 "mFW" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply{
 	dir = 8
 	},
+/obj/structure/disposalpipe/segment,
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
+/obj/structure/cable/green{
+	icon_state = "2-4"
+	},
 /turf/simulated/floor/tiled/dark,
 /area/quartermaster/foyer)
-"mGq" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
-/obj/structure/disposalpipe/segment{
-	dir = 8;
-	icon_state = "pipe-c"
-	},
-/turf/simulated/floor/wood,
-/area/crew_quarters/recreation_area_hallway)
 "mGv" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -18582,15 +18907,17 @@
 /obj/structure/catwalk,
 /turf/simulated/floor/plating,
 /area/maintenance/cargo)
+"mIG" = (
+/obj/structure/closet/largecardboard,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d3aftmaint)
 "mIN" = (
-/obj/effect/floor_decal/spline/fancy/wood{
-	dir = 1
-	},
-/obj/structure/bed/chair{
-	dir = 4
+/obj/machinery/door/airlock/maintenance,
+/obj/structure/cable/green{
+	icon_state = "4-8"
 	},
-/turf/simulated/floor/wood,
-/area/endeavour/surfacebase/mining_main/break_room)
+/turf/simulated/floor/plating,
+/area/maintenance/cargo)
 "mIP" = (
 /obj/spawner/window/low_wall/reinforced/full/firelocks,
 /obj/effect/paint/beastybrown,
@@ -18617,6 +18944,12 @@
 	},
 /turf/simulated/floor/tiled/techmaint,
 /area/quartermaster/belterdock)
+"mJQ" = (
+/obj/effect/floor_decal/techfloor,
+/obj/effect/floor_decal/techfloor/hole,
+/obj/machinery/space_heater,
+/turf/simulated/floor/tiled/techfloor,
+/area/maintenance/bar/catwalk)
 "mKJ" = (
 /obj/machinery/atmospherics/component/unary/vent_pump/on{
 	dir = 8
@@ -18712,6 +19045,11 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/security/brig)
+"mNI" = (
+/obj/structure/catwalk,
+/obj/machinery/air_alarm/north_mount,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d3aftmaint)
 "mNL" = (
 /obj/structure/cable/green{
 	icon_state = "4-8"
@@ -18808,6 +19146,12 @@
 	dir = 4;
 	icon_state = "pipe-c"
 	},
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
+/obj/structure/cable/green{
+	icon_state = "2-4"
+	},
 /turf/simulated/floor/plating,
 /area/maintenance/bar/catwalk)
 "mVA" = (
@@ -18926,18 +19270,10 @@
 /turf/simulated/floor/tiled/dark,
 /area/security/tactical)
 "mXi" = (
-/obj/structure/disposalpipe/segment,
-/obj/effect/floor_decal/borderfloorblack{
-	dir = 1
-	},
-/obj/effect/floor_decal/corner/navblue/border{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
-	dir = 1
-	},
-/turf/simulated/floor/tiled/steel,
-/area/endeavour/hallway/d3portforhall)
+/obj/machinery/mineral/equipment_vendor,
+/obj/effect/floor_decal/corner/brown/diagonal,
+/turf/simulated/floor/tiled/white,
+/area/quartermaster/belterdock/gear)
 "mXn" = (
 /obj/structure/table/steel,
 /obj/item/flashlight/lamp,
@@ -19040,6 +19376,14 @@
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d3portforhall)
+"nay" = (
+/obj/random/maintenance,
+/obj/structure/closet/largecardboard,
+/obj/structure/railing{
+	dir = 4
+	},
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d3aftmaint)
 "naA" = (
 /obj/effect/floor_decal/industrial/danger{
 	dir = 9
@@ -19058,8 +19402,9 @@
 /obj/structure/railing{
 	dir = 4
 	},
+/obj/random/junk,
 /turf/simulated/floor/plating,
-/area/maintenance/lower/trash_pit)
+/area/maintenance/trash_pit)
 "nbL" = (
 /turf/simulated/floor/airless,
 /area/space)
@@ -19140,10 +19485,6 @@
 /obj/structure/cable/green{
 	icon_state = "4-8"
 	},
-/obj/structure/disposalpipe/segment{
-	dir = 1;
-	icon_state = "pipe-c"
-	},
 /obj/machinery/atmospherics/component/unary/vent_pump/on{
 	dir = 1
 	},
@@ -19190,23 +19531,25 @@
 /obj/machinery/status_display/supply_display{
 	pixel_y = 32
 	},
-/obj/machinery/vending/loadout/accessory,
 /obj/machinery/light{
 	dir = 1
 	},
+/obj/machinery/vending/loadout/clothing,
 /turf/simulated/floor/tiled/dark,
 /area/vacant/vacant_shop)
 "nfA" = (
 /obj/structure/cable/green{
 	icon_state = "4-8"
 	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
-	dir = 1
-	},
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
+/obj/effect/floor_decal/borderfloorblack,
+/obj/effect/floor_decal/corner/brown/border,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
 /turf/simulated/floor/tiled/monodark,
 /area/quartermaster/foyer)
 "nfG" = (
@@ -19273,24 +19616,12 @@
 /area/crew_quarters/sleep/Dorm_4)
 "nin" = (
 /obj/machinery/power/apc/north_mount,
-/obj/effect/floor_decal/borderfloor{
-	dir = 1
-	},
-/obj/effect/floor_decal/corner/brown/border{
-	dir = 1
-	},
-/obj/effect/floor_decal/borderfloor/corner2{
-	dir = 4
-	},
-/obj/effect/floor_decal/corner/brown/bordercorner2{
-	dir = 4
-	},
 /obj/structure/cable/green{
 	icon_state = "0-2"
 	},
-/obj/machinery/camera/network/cargo,
-/turf/simulated/floor/tiled/monotile,
-/area/quartermaster/belterdock/refinery)
+/obj/structure/catwalk,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d3aftmaint)
 "niA" = (
 /obj/structure/cable/green{
 	icon_state = "0-8"
@@ -19306,6 +19637,18 @@
 /obj/effect/floor_decal/industrial/outline/red,
 /turf/simulated/floor/tiled/dark,
 /area/endeavour/hallway/d3fwdhall)
+"njM" = (
+/obj/effect/floor_decal/techfloor{
+	dir = 1
+	},
+/obj/effect/floor_decal/techfloor/hole/right{
+	dir = 1
+	},
+/obj/structure/table/steel,
+/obj/machinery/recharger,
+/obj/random/coin,
+/turf/simulated/floor/tiled/techfloor,
+/area/maintenance/bar/catwalk)
 "njT" = (
 /obj/structure/table/marble,
 /obj/machinery/door/blast/shutters{
@@ -19376,15 +19719,22 @@
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d3portamidhall)
 "nme" = (
-/obj/structure/cable/green{
-	icon_state = "1-2"
+/obj/structure/dispenser/oxygen,
+/obj/effect/floor_decal/borderfloorblack{
+	dir = 1
 	},
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/multi_tile/glass{
-	name = "Foyer"
+/obj/effect/floor_decal/corner/brown/border{
+	dir = 1
 	},
-/turf/simulated/floor/tiled/dark,
-/area/quartermaster/foyer)
+/turf/simulated/floor/tiled/techmaint,
+/area/quartermaster/warehouse)
+"nms" = (
+/obj/structure/catwalk,
+/obj/machinery/light/small{
+	dir = 1
+	},
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d3aftmaint)
 "nmv" = (
 /obj/structure/cable/green{
 	icon_state = "1-2"
@@ -19402,6 +19752,14 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/tiled,
 /area/hydroponics)
+"nnu" = (
+/obj/effect/floor_decal/corner/brown/diagonal,
+/obj/machinery/holopad,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 8
+	},
+/turf/simulated/floor/tiled/white,
+/area/quartermaster/belterdock/gear)
 "nnI" = (
 /obj/structure/cable/green{
 	icon_state = "1-2"
@@ -19513,6 +19871,7 @@
 /obj/machinery/light{
 	dir = 4
 	},
+/obj/machinery/atmospherics/component/unary/vent_pump/on,
 /turf/simulated/floor/tiled,
 /area/quartermaster/belterdock)
 "nqm" = (
@@ -19532,51 +19891,33 @@
 /turf/simulated/floor/plating,
 /area/endeavour/hallway/d3aftmaint)
 "nqP" = (
-/obj/machinery/computer/security/telescreen{
-	pixel_y = 32
-	},
-/obj/machinery/vending/loadout/gadget,
-/obj/effect/floor_decal/techfloor/corner{
-	dir = 4
+/obj/effect/floor_decal/borderfloorblack{
+	dir = 8
 	},
-/turf/simulated/floor/tiled/dark,
-/area/vacant/vacant_shop)
-"nrZ" = (
-/obj/structure/table/steel_reinforced,
-/obj/item/duct_tape_roll{
-	pixel_x = -8;
-	pixel_y = 5
+/obj/effect/floor_decal/corner/brown/border{
+	dir = 8
 	},
-/obj/item/stamp/cargo{
-	pixel_x = 7;
-	pixel_y = 8
+/obj/structure/disposalpipe/segment{
+	dir = 4
 	},
-/obj/item/stamp/denied{
-	pixel_x = 7;
-	pixel_y = -1
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 8
 	},
-/obj/item/duct_tape_roll{
-	pixel_x = -8;
-	pixel_y = -4
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
-	dir = 1
+/obj/structure/cable/green{
+	icon_state = "4-8"
 	},
-/turf/simulated/floor/tiled/techmaint,
+/turf/simulated/floor/tiled/dark,
 /area/quartermaster/warehouse)
 "nsH" = (
-/obj/structure/cable/green{
-	icon_state = "1-2"
-	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+/obj/structure/table/wooden_reinforced,
+/obj/machinery/light/small{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
-	dir = 8
-	},
-/turf/simulated/floor/tiled/monodark,
-/area/quartermaster/delivery)
+/turf/simulated/floor/plating,
+/area/maintenance/cargo)
 "nta" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -19678,8 +20019,8 @@
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d3starboardafthall)
 "nxz" = (
-/turf/simulated/wall/r_wall/prepainted/cargo,
-/area/maintenance/lower/trash_pit)
+/turf/simulated/wall/r_wall/prepainted,
+/area/maintenance/trash_pit)
 "nxT" = (
 /obj/machinery/camera/network/civilian{
 	dir = 4
@@ -19794,7 +20135,7 @@
 	},
 /obj/structure/disposaloutlet,
 /turf/simulated/floor/plating,
-/area/quartermaster/delivery)
+/area/endeavour/hallway/d3aftmaint)
 "nCZ" = (
 /obj/structure/table/marble,
 /obj/machinery/door/firedoor{
@@ -19833,7 +20174,10 @@
 /area/endeavour/hallway/d3starboardamidhall)
 "nDz" = (
 /obj/structure/disposalpipe/segment,
-/turf/simulated/floor/tiled,
+/obj/effect/floor_decal/spline/fancy/wood{
+	dir = 4
+	},
+/turf/simulated/floor/wood,
 /area/endeavour/surfacebase/mining_main/break_room)
 "nEe" = (
 /obj/machinery/light/small,
@@ -19892,6 +20236,10 @@
 	},
 /turf/simulated/floor/tiled,
 /area/security/security_lockerroom)
+"nHC" = (
+/obj/structure/lattice,
+/turf/simulated/floor/plating,
+/area/space)
 "nIf" = (
 /obj/structure/bed/chair/sofa/right,
 /turf/simulated/floor/carpet/bcarpet,
@@ -19972,23 +20320,23 @@
 	dir = 4
 	},
 /obj/machinery/fire_alarm/north_mount,
+/obj/machinery/light{
+	dir = 1;
+	pixel_y = 20
+	},
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d3portforhall)
 "nJE" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
+/obj/machinery/air_alarm{
+	dir = 8;
+	pixel_x = 25
 	},
-/obj/structure/disposalpipe/segment{
-	dir = 8
+/obj/item/paper/crumpled{
+	name = "Hastily crumpled schematics";
+	info = "Right - the equipment's all set and ready to go - as long as you can keep the ship in the drydock for another few days, we can get in, get out, and be gone before we're missed. Map's attached. Burn this if you think you're about to get pinched-"
 	},
-/obj/machinery/door/firedoor{
-	dir = 8
-	},
-/turf/simulated/floor/wood,
-/area/crew_quarters/recreation_area_hallway)
+/turf/simulated/floor/plating,
+/area/maintenance/cargo)
 "nJF" = (
 /obj/machinery/computer/supplycomp/control,
 /obj/machinery/light{
@@ -20001,18 +20349,13 @@
 /turf/simulated/floor/wood,
 /area/crew_quarters/heads/hos)
 "nKd" = (
-/obj/machinery/computer/supplycomp,
-/obj/effect/floor_decal/borderfloorblack{
-	dir = 1
-	},
-/obj/effect/floor_decal/corner/brown/border{
-	dir = 1
-	},
-/obj/machinery/light{
+/obj/machinery/camera/network/outside{
 	dir = 1
 	},
-/turf/simulated/floor/tiled/dark,
-/area/quartermaster/foyer)
+/obj/structure/lattice,
+/obj/structure/grille,
+/turf/space/basic,
+/area/space)
 "nKw" = (
 /obj/structure/extinguisher_cabinet{
 	pixel_y = -31
@@ -20138,8 +20481,10 @@
 /turf/simulated/floor/carpet,
 /area/security/detectives_office)
 "nNn" = (
-/turf/simulated/floor/wood,
-/area/quartermaster/qm)
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/turf/simulated/floor/tiled/dark,
+/area/quartermaster/foyer)
 "nND" = (
 /obj/structure/flora/ausbushes/fullgrass,
 /obj/effect/floor_decal/spline/plain{
@@ -20216,9 +20561,6 @@
 /obj/machinery/door/firedoor{
 	dir = 8
 	},
-/obj/structure/disposalpipe/segment{
-	dir = 8
-	},
 /obj/structure/cable/green{
 	icon_state = "4-8"
 	},
@@ -20466,13 +20808,16 @@
 /turf/simulated/floor/tiled/white,
 /area/crew_quarters/toilet)
 "nVC" = (
-/obj/structure/cable/green{
-	icon_state = "1-2"
+/obj/machinery/mineral/output,
+/obj/machinery/light{
+	dir = 4;
+	use_power = 0
 	},
-/obj/effect/floor_decal/borderfloorblack/corner,
-/obj/effect/floor_decal/corner/brown/bordercorner,
-/turf/simulated/floor/tiled/dark,
-/area/quartermaster/warehouse)
+/obj/machinery/conveyor{
+	id = "mining_interior"
+	},
+/turf/simulated/floor/tiled/monodark,
+/area/quartermaster/belterdock/refinery)
 "nVP" = (
 /obj/effect/floor_decal/spline/plain{
 	dir = 8
@@ -20481,18 +20826,15 @@
 /turf/simulated/floor/tiled/dark,
 /area/crew_quarters/recreation_area)
 "nWc" = (
-/obj/effect/floor_decal/corner/brown/diagonal,
-/obj/item/stool/padded{
-	pixel_x = 0;
-	pixel_y = 13
-	},
-/turf/simulated/floor/tiled/white,
-/area/quartermaster/belterdock/gear)
+/turf/simulated/floor/tiled/dark,
+/area/quartermaster/storage)
 "nWj" = (
 /obj/machinery/computer/roguezones{
-	dir = 1
+	dir = 8
+	},
+/obj/effect/floor_decal/industrial/warning/cee{
+	dir = 8
 	},
-/obj/effect/floor_decal/industrial/warning/cee,
 /turf/simulated/floor/reinforced,
 /area/quartermaster/miningdock)
 "nWz" = (
@@ -20527,15 +20869,10 @@
 /turf/simulated/floor/carpet/bcarpet,
 /area/crew_quarters/sleep/Dorm_9)
 "nYH" = (
-/obj/machinery/mineral/unloading_machine,
-/obj/structure/window/reinforced{
-	dir = 1
-	},
-/obj/effect/floor_decal/industrial/warning/dust{
-	dir = 1
-	},
-/turf/simulated/floor/tiled/monodark,
-/area/quartermaster/belterdock/refinery)
+/obj/machinery/portable_atmospherics/canister/oxygen,
+/obj/effect/floor_decal/industrial/outline/blue,
+/turf/simulated/floor/reinforced,
+/area/quartermaster/miningdock)
 "nYR" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 10
@@ -20789,6 +21126,10 @@
 	},
 /turf/simulated/floor/tiled/old_tile/gray,
 /area/security/range)
+"ogP" = (
+/obj/effect/floor_decal/industrial/outline/yellow,
+/turf/simulated/floor/tiled/dark,
+/area/quartermaster/warehouse)
 "ogR" = (
 /obj/machinery/atmospherics/component/unary/vent_scrubber/on{
 	dir = 4
@@ -21131,13 +21472,13 @@
 /turf/simulated/wall/prepainted/security,
 /area/security/brig)
 "osx" = (
-/obj/machinery/conveyor{
-	dir = 8;
-	id = "mining_interior"
+/obj/machinery/door/airlock/mining,
+/obj/map_helper/access_helper/airlock/station/supply/mining,
+/obj/structure/cable/green{
+	icon_state = "4-8"
 	},
-/obj/machinery/mineral/input,
-/turf/simulated/floor/tiled/monodark,
-/area/quartermaster/belterdock/refinery)
+/turf/simulated/floor/plating,
+/area/endeavour/surfacebase/mining_main/break_room)
 "osL" = (
 /obj/effect/floor_decal/borderfloorblack{
 	dir = 1
@@ -21169,8 +21510,13 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
+/obj/machinery/door/airlock/multi_tile/glass{
+	name = "Refinery";
+	dir = 8
+	},
+/obj/map_helper/access_helper/airlock/station/supply/mining,
 /turf/simulated/floor/tiled,
-/area/endeavour/surfacebase/mining_main/break_room)
+/area/quartermaster/cargo_shelter_dock)
 "otM" = (
 /obj/structure/flora/ausbushes/fullgrass,
 /obj/effect/floor_decal/spline/plain,
@@ -21437,11 +21783,8 @@
 /obj/structure/cable/green{
 	icon_state = "1-2"
 	},
-/obj/structure/disposalpipe/segment{
-	dir = 4;
-	icon_state = "pipe-c"
-	},
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply,
+/obj/structure/disposalpipe/segment,
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d3portamidhall)
 "oBE" = (
@@ -21754,6 +22097,10 @@
 "oMq" = (
 /turf/simulated/floor/carpet/bcarpet,
 /area/quartermaster/qm)
+"oNa" = (
+/obj/structure/frame,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d3aftmaint)
 "oNp" = (
 /obj/machinery/newscaster{
 	pixel_y = 32
@@ -21848,10 +22195,9 @@
 /turf/simulated/floor/tiled/dark,
 /area/security/brig)
 "oOy" = (
-/obj/structure/dispenser/oxygen,
-/obj/effect/floor_decal/industrial/warning/cee,
-/turf/simulated/floor/tiled/monotechmaint,
-/area/quartermaster/belterdock/refinery)
+/obj/landmark/spawnpoint/job/cargo_technician,
+/turf/simulated/floor/tiled/monodark,
+/area/quartermaster/delivery)
 "oOG" = (
 /obj/machinery/power/apc/west_mount,
 /obj/structure/cable/green{
@@ -21939,18 +22285,11 @@
 /turf/simulated/floor/wood,
 /area/crew_quarters/sleep/Dorm_4)
 "oUd" = (
-/obj/effect/floor_decal/borderfloor{
-	dir = 6
-	},
-/obj/effect/floor_decal/corner/brown/border{
-	dir = 6
-	},
-/obj/effect/floor_decal/borderfloor/corner2,
-/obj/effect/floor_decal/borderfloor/corner2,
-/obj/effect/floor_decal/corner/brown/bordercorner2,
-/obj/structure/flora/pottedplant/minitree,
-/turf/simulated/floor/tiled/monotile,
-/area/quartermaster/belterdock/refinery)
+/obj/structure/table/standard,
+/obj/item/hand_labeler,
+/obj/item/hand_labeler,
+/turf/simulated/floor/tiled/monodark,
+/area/quartermaster/delivery)
 "oUr" = (
 /obj/machinery/power/sensor{
 	name = "Powernet Sensor - Solar Farm Input";
@@ -22018,9 +22357,17 @@
 /turf/simulated/floor/tiled,
 /area/security/hanger)
 "oXi" = (
-/obj/machinery/mineral/processing_unit,
-/turf/simulated/floor/tiled/monodark,
-/area/quartermaster/belterdock/refinery)
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 8
+	},
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
+/turf/simulated/floor/tiled/dark,
+/area/quartermaster/warehouse)
 "oXu" = (
 /obj/structure/cable/orange{
 	icon_state = "1-2"
@@ -22059,7 +22406,24 @@
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
 	dir = 8
 	},
-/turf/simulated/floor/tiled/dark,
+/obj/structure/disposalpipe/segment,
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
+/obj/structure/window/reinforced{
+	dir = 8
+	},
+/obj/structure/window/reinforced{
+	dir = 4
+	},
+/obj/structure/flora/ausbushes/ppflowers,
+/obj/machinery/door/firedoor{
+	dir = 1
+	},
+/obj/structure/window/reinforced{
+	dir = 1
+	},
+/turf/simulated/floor/grass,
 /area/quartermaster/foyer)
 "oYK" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -22171,31 +22535,18 @@
 /turf/simulated/floor/carpet,
 /area/security/detectives_office)
 "pdF" = (
-/obj/structure/sign/department/mail{
-	pixel_x = -32
-	},
-/obj/structure/table/standard,
-/obj/item/packageWrap,
-/obj/item/packageWrap,
-/obj/item/packageWrap,
-/obj/item/destTagger,
-/obj/machinery/air_alarm{
-	dir = 1;
-	pixel_y = -24
-	},
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/obj/effect/paint/beastybrown,
+/turf/simulated/floor/plating,
+/area/quartermaster/belterdock/gear)
+"pdT" = (
+/obj/effect/floor_decal/corner/brown/diagonal,
 /obj/machinery/camera/network/cargo{
-	dir = 4
-	},
-/obj/machinery/light{
 	dir = 8
 	},
-/turf/simulated/floor/tiled/monodark,
-/area/quartermaster/delivery)
-"pdT" = (
-/obj/structure/table/steel_reinforced,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/turf/simulated/floor/tiled/techmaint,
-/area/quartermaster/warehouse)
+/obj/machinery/fire_alarm/east_mount,
+/turf/simulated/floor/tiled/white,
+/area/quartermaster/belterdock/gear)
 "ped" = (
 /obj/landmark/observer_spawn,
 /obj/effect/floor_decal/spline/fancy/wood,
@@ -22227,11 +22578,9 @@
 "pfu" = (
 /obj/structure/table/steel_reinforced,
 /obj/item/storage/firstaid/regular{
-	pixel_x = 0;
 	pixel_y = 7
 	},
 /obj/item/storage/firstaid/fire{
-	pixel_x = 0;
 	pixel_y = 3
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -22326,15 +22675,15 @@
 /turf/simulated/floor/tiled/dark,
 /area/security/hallway)
 "phB" = (
-/obj/structure/cable/green{
-	icon_state = "1-2"
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 10
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 10
 	},
+/obj/structure/cable/green{
+	icon_state = "2-8"
+	},
 /turf/simulated/floor/reinforced,
 /area/quartermaster/miningdock)
 "phI" = (
@@ -22398,10 +22747,6 @@
 	},
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d3afthall)
-"pjE" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/turf/simulated/floor/tiled/monodark,
-/area/quartermaster/foyer)
 "pjF" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply{
@@ -22481,23 +22826,18 @@
 /turf/simulated/wall/prepainted/civilian,
 /area/crew_quarters/kitchen)
 "pkW" = (
-/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"
+/obj/structure/closet/firecloset,
+/obj/machinery/light{
+	dir = 1
 	},
-/obj/structure/cable/green{
-	icon_state = "1-4"
+/obj/effect/floor_decal/borderfloorblack{
+	dir = 1
 	},
-/obj/structure/disposalpipe/segment{
-	dir = 8
+/obj/effect/floor_decal/corner/brown/border{
+	dir = 1
 	},
-/turf/simulated/floor/wood,
-/area/crew_quarters/recreation_area)
+/turf/simulated/floor/tiled/techmaint,
+/area/quartermaster/warehouse)
 "plt" = (
 /obj/structure/cable/green{
 	icon_state = "4-8"
@@ -22645,17 +22985,11 @@
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d3starboardforhall)
 "pqk" = (
-/obj/effect/floor_decal/spline/fancy/wood,
-/obj/structure/table/wooden_reinforced,
-/obj/machinery/chemical_dispenser/catering/bar_soft{
-	dir = 1
-	},
-/obj/item/storage/box/glasses/square{
-	pixel_x = -25;
-	pixel_y = 6
-	},
-/turf/simulated/floor/wood,
-/area/endeavour/surfacebase/mining_main/break_room)
+/obj/structure/lattice,
+/obj/structure/lattice,
+/obj/structure/grille,
+/turf/space/basic,
+/area/space)
 "pqE" = (
 /obj/machinery/vending/hydroseeds,
 /obj/effect/floor_decal/corner/green{
@@ -22664,12 +22998,9 @@
 /turf/simulated/floor/tiled/dark,
 /area/security/brig)
 "pqO" = (
-/obj/structure/bed/chair/comfy/teal,
-/obj/machinery/light/small{
-	dir = 1
-	},
+/obj/structure/undies_wardrobe,
 /turf/simulated/floor/wood,
-/area/crew_quarters/sleep/Dorm_11)
+/area/maintenance/cargo)
 "pqT" = (
 /obj/effect/floor_decal/corner/red{
 	dir = 6
@@ -22748,22 +23079,10 @@
 	dir = 4
 	},
 /obj/structure/sign/department/cargo{
-	pixel_x = 0;
 	pixel_y = 32
 	},
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d3portforhall)
-"prw" = (
-/obj/machinery/mineral/output,
-/obj/machinery/light{
-	dir = 4;
-	use_power = 0
-	},
-/obj/machinery/conveyor{
-	id = "mining_interior"
-	},
-/turf/simulated/floor/tiled/monodark,
-/area/quartermaster/belterdock/refinery)
 "prZ" = (
 /obj/structure/cable/green{
 	icon_state = "1-2"
@@ -22812,7 +23131,7 @@
 /obj/structure/disposalpipe/segment{
 	dir = 8
 	},
-/turf/simulated/floor/tiled,
+/turf/simulated/floor/plating,
 /area/maintenance/bar/lower)
 "puT" = (
 /obj/machinery/door/firedoor/glass,
@@ -22833,16 +23152,20 @@
 /turf/simulated/floor/tiled/monotile,
 /area/security/brig)
 "pvB" = (
-/obj/effect/floor_decal/borderfloor{
-	dir = 8
-	},
-/obj/effect/floor_decal/corner/brown/border{
+/obj/effect/floor_decal/spline/fancy/wood{
 	dir = 8
 	},
-/obj/structure/bed/chair/sofa/black/right{
+/obj/structure/bed/chair/sofa/black/left{
 	dir = 4
 	},
-/turf/simulated/floor/tiled,
+/obj/machinery/power/apc/west_mount,
+/obj/structure/cable/green{
+	icon_state = "0-4"
+	},
+/obj/structure/cable/green{
+	icon_state = "1-4"
+	},
+/turf/simulated/floor/wood,
 /area/endeavour/surfacebase/mining_main/break_room)
 "pvX" = (
 /obj/effect/floor_decal/corner/green{
@@ -22856,8 +23179,9 @@
 /turf/simulated/floor/tiled/dark,
 /area/security/hallway)
 "pwn" = (
-/turf/simulated/wall/prepainted/cargo,
-/area/quartermaster/delivery)
+/obj/spawner/window/low_wall/full/firelocks/nogrille,
+/turf/simulated/floor/plating,
+/area/crew_quarters/sleep/Dorm_13)
 "pwo" = (
 /turf/simulated/wall/r_wall/prepainted/civilian,
 /area/crew_quarters/game_room)
@@ -22898,31 +23222,18 @@
 "pxU" = (
 /turf/simulated/floor/carpet/purcarpet,
 /area/crew_quarters/heads/hos)
-"pyb" = (
-/obj/structure/table/steel_reinforced,
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
-/obj/fiftyspawner/tritium,
-/obj/fiftyspawner/tritium,
-/obj/fiftyspawner/tritium,
-/obj/fiftyspawner/tritium,
-/obj/fiftyspawner/tritium,
-/turf/simulated/floor/tiled/techmaint,
-/area/quartermaster/warehouse)
 "pyh" = (
-/obj/effect/floor_decal/borderfloorblack{
-	dir = 4
+/obj/structure/cable/green{
+	icon_state = "1-2"
 	},
-/obj/effect/floor_decal/corner/brown/border{
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
 	dir = 4
 	},
-/obj/structure/bed/chair/comfy/brown{
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
 	dir = 8
 	},
-/turf/simulated/floor/tiled/dark,
-/area/quartermaster/foyer)
+/turf/simulated/floor/tiled/monodark,
+/area/quartermaster/delivery)
 "pyZ" = (
 /obj/structure/cable/green{
 	icon_state = "2-4"
@@ -22981,42 +23292,21 @@
 "pCQ" = (
 /turf/simulated/wall/r_wall/prepainted,
 /area/maintenance/dormitory)
-"pDb" = (
-/obj/structure/cable/green{
-	icon_state = "1-2"
-	},
-/obj/effect/floor_decal/borderfloorblack{
-	dir = 4
-	},
-/obj/effect/floor_decal/corner/brown/border{
-	dir = 4
-	},
-/turf/simulated/floor/tiled/dark,
-/area/quartermaster/warehouse)
 "pDe" = (
 /turf/simulated/wall/r_wall/prepainted/security,
 /area/security/riot_control)
 "pDn" = (
-/obj/effect/floor_decal/spline/fancy/wood{
-	dir = 5
-	},
 /obj/machinery/vending/coffee,
-/turf/simulated/floor/wood,
-/area/endeavour/surfacebase/mining_main/break_room)
+/turf/simulated/floor/tiled/dark,
+/area/quartermaster/cargo_shelter_dock)
 "pDx" = (
 /obj/structure/cable/green{
 	icon_state = "1-2"
 	},
-/obj/effect/floor_decal/borderfloor{
-	dir = 4
-	},
-/obj/effect/floor_decal/corner/brown/border{
-	dir = 4
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/door/firedoor,
-/turf/simulated/floor/tiled/monotile,
+/obj/effect/floor_decal/spline/fancy/wood,
+/turf/simulated/floor/wood,
 /area/endeavour/surfacebase/mining_main/break_room)
 "pDN" = (
 /obj/machinery/door/firedoor/glass,
@@ -23160,9 +23450,12 @@
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d3fwdhall)
 "pHB" = (
-/obj/structure/table/steel_reinforced,
-/turf/simulated/floor/tiled/techmaint,
-/area/quartermaster/warehouse)
+/obj/effect/floor_decal/corner/brown/diagonal,
+/obj/structure/table/reinforced,
+/obj/machinery/recharger,
+/obj/machinery/light,
+/turf/simulated/floor/tiled/white,
+/area/quartermaster/belterdock/gear)
 "pIT" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -23224,12 +23517,6 @@
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d3starboardamidhall)
 "pJR" = (
-/obj/effect/floor_decal/borderfloorblack{
-	dir = 8
-	},
-/obj/effect/floor_decal/corner/brown/border{
-	dir = 8
-	},
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
 	dir = 8
 	},
@@ -23240,6 +23527,18 @@
 	dir = 2;
 	icon_state = "pipe-j2"
 	},
+/obj/effect/floor_decal/borderfloorblack{
+	dir = 4
+	},
+/obj/effect/floor_decal/corner/brown/border{
+	dir = 4
+	},
+/obj/structure/cable/green{
+	icon_state = "2-4"
+	},
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/tiled/dark,
 /area/quartermaster/warehouse)
 "pKe" = (
@@ -23255,9 +23554,15 @@
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d3starboardforhall)
 "pMS" = (
-/obj/structure/closet/wardrobe,
-/turf/simulated/floor/carpet/blue,
-/area/crew_quarters/sleep/Dorm_11)
+/obj/machinery/power/apc/west_mount{
+	cell_type = /obj/item/cell/super
+	},
+/obj/structure/cable/green{
+	icon_state = "0-2"
+	},
+/obj/effect/floor_decal/spline/plain,
+/turf/simulated/floor/carpet/turcarpet,
+/area/crew_quarters/sleep/Dorm_13)
 "pNn" = (
 /obj/effect/floor_decal/industrial/hatch/yellow,
 /obj/machinery/light/small{
@@ -23338,10 +23643,14 @@
 /turf/simulated/floor/tiled/old_cargo/gray,
 /area/security/security_processing)
 "pOK" = (
-/obj/effect/floor_decal/corner/brown/diagonal,
-/obj/machinery/atmospherics/component/unary/vent_scrubber/on,
-/turf/simulated/floor/tiled/white,
-/area/quartermaster/belterdock/gear)
+/obj/item/skub,
+/obj/item/material/twohanded/baseballbat{
+	pixel_x = -6;
+	pixel_y = 9
+	},
+/obj/structure/table/fancyblack,
+/turf/simulated/floor/plating,
+/area/quartermaster/storage)
 "pON" = (
 /obj/machinery/floodlight,
 /turf/simulated/floor/plating,
@@ -23375,6 +23684,9 @@
 /area/security/hallway)
 "pQh" = (
 /obj/machinery/atmospherics/component/unary/vent_pump/on,
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
 /turf/simulated/floor/tiled/dark,
 /area/quartermaster/foyer)
 "pQv" = (
@@ -23495,20 +23807,13 @@
 /turf/simulated/floor/plating,
 /area/maintenance/substation/civilian)
 "pUj" = (
-/obj/effect/floor_decal/borderfloorblack{
-	dir = 4
-	},
-/obj/effect/floor_decal/corner/brown/border{
-	dir = 4
-	},
-/obj/machinery/light{
-	dir = 4
-	},
-/obj/structure/bed/chair/comfy/black{
-	dir = 8
+/obj/structure/cable/green{
+	icon_state = "1-2"
 	},
-/turf/simulated/floor/tiled/dark,
-/area/quartermaster/foyer)
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/turf/simulated/floor/tiled/monodark,
+/area/quartermaster/delivery)
 "pUu" = (
 /obj/machinery/light{
 	dir = 4
@@ -23539,15 +23844,6 @@
 	},
 /turf/simulated/floor/wood,
 /area/crew_quarters/bar)
-"pVz" = (
-/obj/structure/cable/green{
-	icon_state = "1-2"
-	},
-/obj/structure/cable/green{
-	icon_state = "2-4"
-	},
-/turf/simulated/floor/tiled/dark,
-/area/quartermaster/foyer)
 "pWD" = (
 /obj/structure/table/rack,
 /obj/effect/floor_decal/industrial/outline/yellow,
@@ -23587,7 +23883,10 @@
 /obj/structure/cable/green{
 	icon_state = "2-8"
 	},
-/turf/simulated/floor/tiled,
+/obj/machinery/light/small{
+	dir = 1
+	},
+/turf/simulated/floor/plating,
 /area/maintenance/bar/lower)
 "pXE" = (
 /obj/effect/floor_decal/borderfloorblack{
@@ -23635,10 +23934,36 @@
 /turf/simulated/floor/tiled/dark,
 /area/security/hallway)
 "pZg" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/disposalpipe/segment,
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
 /turf/simulated/floor/tiled/dark,
+/area/quartermaster/warehouse)
+"pZR" = (
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/obj/effect/floor_decal/borderfloorblack,
+/obj/effect/floor_decal/corner/brown/border,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/monodark,
 /area/quartermaster/foyer)
 "qaT" = (
 /obj/structure/cable/green{
@@ -23829,24 +24154,30 @@
 /turf/simulated/floor/plating,
 /area/maintenance/cargo)
 "qek" = (
+/obj/machinery/power/apc/north_mount,
+/obj/structure/cable/green{
+	icon_state = "0-4"
+	},
 /obj/effect/floor_decal/borderfloor{
-	dir = 1
+	dir = 9
 	},
 /obj/effect/floor_decal/corner/brown/border{
-	dir = 1
+	dir = 9
 	},
 /obj/effect/floor_decal/borderfloor/corner2{
 	dir = 1
 	},
+/obj/effect/floor_decal/borderfloor/corner2{
+	dir = 10
+	},
 /obj/effect/floor_decal/corner/brown/bordercorner2{
-	dir = 1
+	dir = 10
 	},
-/obj/machinery/power/apc/north_mount,
-/obj/structure/cable/green{
-	icon_state = "0-4"
+/obj/effect/floor_decal/corner/brown/bordercorner2{
+	dir = 1
 	},
 /turf/simulated/floor/tiled,
-/area/endeavour/surfacebase/mining_main/break_room)
+/area/quartermaster/cargo_shelter_dock)
 "qeD" = (
 /obj/machinery/power/port_gen/pacman/mrs{
 	anchored = 1
@@ -23916,13 +24247,12 @@
 /turf/simulated/floor/carpet/bcarpet,
 /area/quartermaster/qm)
 "qiz" = (
-/obj/effect/floor_decal/corner/brown/diagonal,
-/obj/item/stool/padded,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 8
+/obj/structure/table/borosilicate,
+/obj/machinery/floor_light/changing/prebuilt{
+	on = 1
 	},
-/turf/simulated/floor/tiled/white,
-/area/quartermaster/belterdock/gear)
+/turf/simulated/floor/tiled/dark,
+/area/quartermaster/storage)
 "qjv" = (
 /obj/effect/floor_decal/industrial/warning/full,
 /obj/machinery/atmospherics/pipe/zpipe/down/scrubbers{
@@ -23993,6 +24323,9 @@
 	},
 /turf/simulated/floor/wood,
 /area/quartermaster/office)
+"qlx" = (
+/turf/simulated/wall/prepainted/cargo,
+/area/quartermaster/delivery)
 "qlP" = (
 /obj/machinery/fitness/heavy/lifter,
 /obj/effect/floor_decal/corner_steel_grid{
@@ -24026,14 +24359,10 @@
 /turf/simulated/floor/tiled/old_tile/gray,
 /area/security/range)
 "qmQ" = (
-/obj/effect/floor_decal/borderfloorblack{
-	dir = 4
-	},
-/obj/effect/floor_decal/corner/brown/border{
-	dir = 4
-	},
 /obj/machinery/door/firedoor,
-/turf/simulated/floor/tiled/dark,
+/obj/effect/paint/beastybrown,
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/turf/simulated/floor/plating,
 /area/quartermaster/warehouse)
 "qmV" = (
 /obj/structure/cable{
@@ -24044,9 +24373,9 @@
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d3starboardafthall)
 "qmY" = (
-/obj/structure/disposalpipe/segment,
-/turf/simulated/floor/tiled/dark,
-/area/quartermaster/warehouse)
+/obj/random/trash_pile,
+/turf/simulated/floor/plating,
+/area/maintenance/cargo)
 "qmZ" = (
 /obj/item/stool/padded,
 /obj/landmark/spawnpoint/job/entertainer,
@@ -24147,10 +24476,15 @@
 /turf/simulated/floor/wood,
 /area/crew_quarters/sleep/bedrooms)
 "qoU" = (
-/obj/spawner/window/low_wall/reinforced/full/firelocks,
-/obj/effect/paint/beastybrown,
-/turf/simulated/floor/plating,
-/area/quartermaster/belterdock/refinery)
+/obj/structure/table/gamblingtable,
+/obj/machinery/atmospherics/component/unary/vent_scrubber/on{
+	dir = 4
+	},
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
+/turf/simulated/floor/wood,
+/area/endeavour/surfacebase/mining_main/break_room)
 "qoW" = (
 /obj/structure/table/woodentable,
 /obj/machinery/microwave,
@@ -24174,24 +24508,13 @@
 /turf/simulated/floor/tiled/dark,
 /area/security/hallway)
 "qpd" = (
-/obj/machinery/camera/network/civilian{
-	dir = 8
-	},
-/obj/machinery/newscaster{
-	pixel_x = 30
-	},
-/obj/structure/flora/pottedplant/fern,
-/turf/simulated/floor/wood,
-/area/crew_quarters/recreation_area_hallway)
+/obj/structure/disposalpipe/segment,
+/turf/simulated/wall/r_wall/prepainted/cargo,
+/area/endeavour/hallway/d3aftmaint)
 "qpi" = (
-/obj/structure/bed/chair/comfy/beige{
-	dir = 4
-	},
-/obj/machinery/light/small{
-	dir = 8
-	},
-/turf/simulated/floor/carpet/turcarpet,
-/area/crew_quarters/recreation_area)
+/obj/machinery/fire_alarm/north_mount,
+/turf/simulated/floor/reinforced,
+/area/quartermaster/miningdock)
 "qpE" = (
 /obj/structure/table/steel_reinforced,
 /obj/machinery/cell_charger,
@@ -24289,26 +24612,12 @@
 	},
 /turf/simulated/floor/wood,
 /area/tether/surfacebase/entertainment)
-"qup" = (
-/obj/machinery/door/airlock/maintenance,
-/obj/item/barrier_tape_segment/engineering,
-/obj/map_helper/access_helper/airlock/station/supply/maintenance,
-/turf/simulated/floor/reinforced,
-/area/maintenance/bar/catwalk)
 "quZ" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/holopad,
 /turf/simulated/floor/tiled/dark,
 /area/security/lobby)
-"qvo" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/cable/green{
-	icon_state = "1-2"
-	},
-/turf/simulated/floor/tiled/monodark,
-/area/quartermaster/foyer)
 "qvz" = (
 /obj/item/stool/padded,
 /obj/effect/floor_decal/spline/fancy/wood{
@@ -24352,10 +24661,6 @@
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d3portforhall)
 "qwg" = (
-/obj/machinery/power/apc/north_mount,
-/obj/structure/cable/green{
-	icon_state = "0-2"
-	},
 /obj/effect/floor_decal/borderfloorblack{
 	dir = 1
 	},
@@ -24457,17 +24762,10 @@
 /turf/simulated/floor/wood,
 /area/crew_quarters/sleep/Dorm_5)
 "qAh" = (
-/obj/structure/cable/green{
-	icon_state = "1-2"
-	},
-/obj/effect/floor_decal/borderfloorblack/corner{
-	dir = 4
-	},
-/obj/effect/floor_decal/corner/brown/bordercorner{
-	dir = 4
-	},
-/turf/simulated/floor/tiled/dark,
-/area/quartermaster/foyer)
+/obj/structure/closet/firecloset/full/double,
+/obj/structure/catwalk,
+/turf/simulated/floor/plating,
+/area/maintenance/cargo)
 "qAl" = (
 /obj/machinery/conveyor{
 	dir = 4;
@@ -24570,47 +24868,19 @@
 /turf/simulated/floor/tiled,
 /area/security/lobby)
 "qDe" = (
-/obj/structure/table/steel_reinforced,
-/obj/item/storage/toolbox/electrical{
-	pixel_x = 0;
-	pixel_y = 1
+/obj/machinery/door/airlock{
+	id_tag = "dormx";
+	name = "Maintenance Access"
 	},
-/turf/simulated/floor/tiled/techmaint,
-/area/quartermaster/warehouse)
+/turf/simulated/floor/plating,
+/area/maintenance/cargo)
 "qDH" = (
 /turf/simulated/wall/r_wall,
 /area/space)
 "qDS" = (
-/obj/effect/floor_decal/borderfloor{
-	dir = 1
-	},
-/obj/effect/floor_decal/corner/brown/border{
-	dir = 1
-	},
-/obj/item/clothing/accessory/permit/gun/planetside,
-/obj/item/clothing/accessory/permit/gun/planetside,
-/obj/item/clothing/accessory/permit/gun/planetside,
-/obj/item/clothing/accessory/permit/gun/planetside,
-/obj/structure/table/reinforced,
-/obj/machinery/door/window/southright{
-	req_one_access = list(48)
-	},
-/obj/structure/window/reinforced{
-	dir = 4
-	},
-/obj/structure/window/reinforced{
-	dir = 8
-	},
-/obj/structure/window/reinforced{
-	dir = 1
-	},
-/obj/item/gun/energy/kinetic_accelerator,
-/obj/item/gun/energy/kinetic_accelerator,
-/obj/item/gun/energy/kinetic_accelerator,
-/obj/item/gun/energy/kinetic_accelerator,
-/obj/effect/floor_decal/corner/brown/diagonal,
-/turf/simulated/floor/tiled/white,
-/area/quartermaster/belterdock/gear)
+/obj/item/banner/cargo,
+/turf/simulated/floor/tiled/dark,
+/area/quartermaster/storage)
 "qEf" = (
 /turf/simulated/wall/prepainted,
 /area/crew_quarters/sleep/Dorm_2)
@@ -24681,6 +24951,13 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/crew_quarters/barrestroom)
+"qHt" = (
+/obj/machinery/power/apc/north_mount,
+/obj/structure/cable/green{
+	icon_state = "0-4"
+	},
+/turf/simulated/floor/tiled/monodark,
+/area/quartermaster/delivery)
 "qHy" = (
 /obj/structure/table/steel,
 /obj/item/storage/firstaid/regular,
@@ -24708,12 +24985,6 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/security/hallway)
-"qIo" = (
-/obj/machinery/atmospherics/component/unary/vent_scrubber/on{
-	dir = 8
-	},
-/turf/simulated/floor/reinforced,
-/area/quartermaster/miningdock)
 "qIr" = (
 /obj/effect/floor_decal/borderfloorblack,
 /obj/effect/floor_decal/corner/brown/border,
@@ -24774,7 +25045,7 @@
 /area/endeavour/hallway/d3afthall)
 "qJB" = (
 /turf/simulated/wall/prepainted/cargo,
-/area/quartermaster/belterdock/refinery)
+/area/endeavour/hallway/d3aftmaint)
 "qJM" = (
 /turf/simulated/wall/r_wall/prepainted,
 /area/endeavour/hallway/d3fwdhall)
@@ -24792,16 +25063,6 @@
 /obj/effect/paint/beastybrown,
 /turf/simulated/floor/plating,
 /area/quartermaster/qm)
-"qLx" = (
-/obj/machinery/status_display/supply_display{
-	mode = 99;
-	pixel_y = 32
-	},
-/obj/structure/table/wooden_reinforced,
-/obj/machinery/atmospherics/component/unary/vent_pump/on,
-/obj/fiftyspawner/steel,
-/turf/simulated/floor/wood,
-/area/quartermaster/office)
 "qLB" = (
 /obj/spawner/window/low_wall/reinforced/full/firelocks,
 /obj/structure/cable/green{
@@ -24846,17 +25107,10 @@
 /turf/simulated/floor/carpet,
 /area/security/detectives_office)
 "qMz" = (
-/obj/effect/floor_decal/borderfloor{
-	dir = 1
-	},
-/obj/effect/floor_decal/corner/brown/border{
-	dir = 1
-	},
-/obj/machinery/air_alarm{
-	pixel_y = 22
-	},
-/turf/simulated/floor/tiled/monotile,
-/area/quartermaster/belterdock/refinery)
+/obj/machinery/suit_storage_unit/mining,
+/obj/effect/floor_decal/corner/brown/diagonal,
+/turf/simulated/floor/tiled/white,
+/area/quartermaster/belterdock/gear)
 "qMN" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -24877,28 +25131,21 @@
 /turf/simulated/floor/tiled/dark,
 /area/prison/cell_block)
 "qMP" = (
-/obj/structure/disposalpipe/segment,
-/turf/simulated/floor/tiled/techmaint,
-/area/quartermaster/warehouse)
-"qNE" = (
-/obj/effect/floor_decal/spline/fancy/wood{
-	dir = 6
-	},
-/obj/machinery/vending/snack,
-/turf/simulated/floor/wood,
-/area/endeavour/surfacebase/mining_main/break_room)
-"qNM" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
-	dir = 1
+/obj/structure/extinguisher_cabinet{
+	pixel_x = 27
 	},
-/obj/structure/disposalpipe/segment{
+/obj/structure/disposalpipe/trunk,
+/obj/machinery/disposal,
+/obj/machinery/camera/network/civilian{
 	dir = 8
 	},
 /turf/simulated/floor/wood,
-/area/crew_quarters/recreation_area_hallway)
+/area/crew_quarters/recreation_area)
+"qNM" = (
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/obj/effect/paint/beastybrown,
+/turf/simulated/floor/plating,
+/area/quartermaster/belterdock/refinery)
 "qOp" = (
 /obj/structure/table/reinforced,
 /obj/item/mass_spectrometer/adv,
@@ -24923,20 +25170,12 @@
 /turf/simulated/floor/tiled,
 /area/crew_quarters/recreation_area)
 "qPi" = (
-/obj/structure/cable/green{
-	icon_state = "1-2"
-	},
-/obj/effect/floor_decal/borderfloorblack{
-	dir = 4
-	},
-/obj/effect/floor_decal/corner/brown/border{
-	dir = 4
-	},
-/obj/machinery/light{
-	dir = 4
+/obj/structure/lattice,
+/obj/machinery/camera/network/outside{
+	dir = 1
 	},
-/turf/simulated/floor/tiled/dark,
-/area/quartermaster/warehouse)
+/turf/simulated/floor/airless/ceiling,
+/area/space)
 "qPw" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -24945,13 +25184,6 @@
 	},
 /turf/simulated/floor/wood,
 /area/endeavour/hallway/d3fwdhall)
-"qPD" = (
-/obj/machinery/button/remote/blast_door{
-	id = "cludge_hanger";
-	pixel_y = 32
-	},
-/turf/simulated/floor/reinforced,
-/area/maintenance/bar/catwalk)
 "qQb" = (
 /obj/structure/closet/firecloset,
 /obj/effect/floor_decal/industrial/outline/red,
@@ -25067,17 +25299,12 @@
 /turf/simulated/floor/tiled/dark,
 /area/security/lobby)
 "qVI" = (
-/obj/structure/disposalpipe/segment{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 9
-	},
 /obj/structure/cable/green{
 	icon_state = "1-2"
 	},
-/turf/simulated/floor/tiled/monotile,
-/area/quartermaster/belterdock/refinery)
+/obj/structure/catwalk,
+/turf/simulated/floor/plating,
+/area/maintenance/cargo)
 "qVJ" = (
 /obj/machinery/door/airlock/glass_external{
 	frequency = 1379;
@@ -25094,11 +25321,12 @@
 /turf/simulated/wall/r_wall/prepainted/engineering,
 /area/security/hallway)
 "qWd" = (
-/obj/machinery/atmospherics/component/unary/vent_pump/on{
-	dir = 4
+/obj/structure/catwalk,
+/obj/structure/cable/green{
+	icon_state = "2-4"
 	},
-/turf/simulated/floor/tiled/monodark,
-/area/quartermaster/delivery)
+/turf/simulated/floor/plating,
+/area/maintenance/cargo)
 "qXh" = (
 /obj/machinery/light/small{
 	dir = 8
@@ -25257,8 +25485,7 @@
 /area/security/range)
 "rdb" = (
 /obj/structure/filingcabinet{
-	pixel_x = 11;
-	pixel_y = 0
+	pixel_x = 11
 	},
 /obj/machinery/keycard_auth{
 	pixel_y = -28
@@ -25399,6 +25626,12 @@
 	},
 /turf/simulated/floor/wood,
 /area/crew_quarters/sleep/Dorm_7)
+"rjO" = (
+/obj/machinery/light/small{
+	dir = 8
+	},
+/turf/simulated/floor/reinforced,
+/area/quartermaster/miningdock)
 "rjY" = (
 /obj/effect/floor_decal/borderfloorblack/corner{
 	dir = 8
@@ -25417,6 +25650,12 @@
 	},
 /turf/simulated/floor/wood,
 /area/crew_quarters/recreation_area)
+"rku" = (
+/obj/machinery/light/small{
+	dir = 1
+	},
+/turf/simulated/floor/plating,
+/area/maintenance/bar/catwalk)
 "rkz" = (
 /obj/machinery/atmospherics/pipe/simple/visible{
 	dir = 9
@@ -25458,14 +25697,6 @@
 	},
 /turf/simulated/floor/airless,
 /area/space)
-"rlz" = (
-/obj/effect/floor_decal/borderfloorblack/corner,
-/obj/effect/floor_decal/corner/brown/bordercorner,
-/obj/structure/cable/green{
-	icon_state = "4-8"
-	},
-/turf/simulated/floor/tiled/dark,
-/area/quartermaster/warehouse)
 "rlJ" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/glass{
@@ -25476,13 +25707,11 @@
 /area/endeavour/hallway/d3fwdhall)
 "rmb" = (
 /obj/structure/catwalk,
-/obj/machinery/door/airlock/maintenance,
-/obj/map_helper/access_helper/airlock/station/supply/maintenance,
-/obj/machinery/door/firedoor{
-	dir = 8
+/obj/structure/cable/green{
+	icon_state = "1-2"
 	},
 /turf/simulated/floor/plating,
-/area/quartermaster/foyer)
+/area/maintenance/bar/catwalk)
 "rme" = (
 /obj/structure/table/woodentable,
 /obj/machinery/recharger,
@@ -25541,7 +25770,7 @@
 	icon_state = "1-2"
 	},
 /turf/simulated/floor/tiled,
-/area/endeavour/surfacebase/mining_main/break_room)
+/area/quartermaster/cargo_shelter_dock)
 "rpK" = (
 /turf/simulated/floor/wood,
 /area/maintenance/dormitory)
@@ -25584,12 +25813,6 @@
 	},
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d3portforhall)
-"rra" = (
-/obj/vehicle/sealed/mecha/combat/fighter/cludge{
-	dir = 4
-	},
-/turf/simulated/floor/reinforced,
-/area/maintenance/bar/catwalk)
 "rrf" = (
 /obj/machinery/power/apc/south_mount,
 /obj/structure/cable/green,
@@ -25762,11 +25985,13 @@
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d3starboardamidhall)
 "rvC" = (
-/obj/machinery/atmospherics/component/unary/vent_scrubber/on{
-	dir = 4
+/obj/structure/cable/green{
+	icon_state = "2-8"
 	},
-/turf/simulated/floor/tiled/monotile,
-/area/quartermaster/belterdock/refinery)
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/turf/simulated/floor/tiled/monodark,
+/area/quartermaster/delivery)
 "rvT" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -25793,17 +26018,17 @@
 /turf/simulated/floor/tiled/dark,
 /area/security/nuke_storage)
 "rwh" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+/obj/effect/floor_decal/industrial/warning{
 	dir = 8
 	},
-/obj/structure/disposalpipe/segment{
-	dir = 4
+/obj/machinery/atmospheric_field_generator/perma,
+/obj/machinery/shield_diffuser,
+/obj/machinery/door/blast/regular{
+	name = "Salvager Launch Blast Door";
+	id = "salvage_launch"
 	},
-/turf/simulated/floor/tiled/dark,
-/area/quartermaster/foyer)
+/turf/simulated/floor/reinforced,
+/area/quartermaster/miningdock)
 "rwx" = (
 /obj/effect/floor_decal/spline/fancy/wood{
 	dir = 10
@@ -25850,6 +26075,12 @@
 	},
 /turf/simulated/floor/tiled,
 /area/quartermaster/office)
+"ryd" = (
+/obj/effect/floor_decal/industrial/warning{
+	dir = 8
+	},
+/turf/simulated/floor/tiled/monodark,
+/area/quartermaster/delivery)
 "ryu" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -25964,8 +26195,19 @@
 /turf/simulated/wall/prepainted,
 /area/maintenance/cargo)
 "rBZ" = (
-/turf/simulated/wall/r_wall/prepainted,
-/area/crew_quarters/sleep/Dorm_11)
+/obj/structure/bed/chair/comfy/brown,
+/obj/effect/floor_decal/borderfloorblack/corner{
+	dir = 1
+	},
+/obj/effect/floor_decal/corner/brown/bordercorner{
+	dir = 1
+	},
+/turf/simulated/floor/tiled/dark,
+/area/quartermaster/foyer)
+"rCg" = (
+/obj/random/maintenance,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d3aftmaint)
 "rCI" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
@@ -26041,11 +26283,12 @@
 /turf/simulated/floor/tiled/dark,
 /area/security/hallway)
 "rDV" = (
-/obj/machinery/atmospherics/component/unary/vent_scrubber/on{
-	dir = 8
+/obj/structure/bed/chair/comfy/brown{
+	dir = 4
 	},
-/turf/simulated/floor/carpet/blue,
-/area/crew_quarters/sleep/Dorm_11)
+/obj/machinery/air_alarm/west_mount,
+/turf/simulated/floor/wood,
+/area/maintenance/cargo)
 "rEa" = (
 /obj/structure/cable/green{
 	icon_state = "2-8"
@@ -26075,20 +26318,8 @@
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d3starboardforhall)
 "rEk" = (
-/turf/simulated/wall/r_wall,
+/turf/simulated/wall/r_wall/prepainted,
 /area/maintenance/bar/catwalk)
-"rEu" = (
-/obj/machinery/sheet_silo_loader{
-	dir = 1
-	},
-/obj/structure/window/reinforced{
-	dir = 8
-	},
-/obj/effect/floor_decal/industrial/warning/dust{
-	dir = 8
-	},
-/turf/simulated/floor/tiled/monodark,
-/area/quartermaster/belterdock/refinery)
 "rEv" = (
 /obj/structure/cable/green{
 	icon_state = "0-8"
@@ -26157,6 +26388,18 @@
 	},
 /turf/simulated/floor/wood,
 /area/endeavour/hallway/d3fwdhall)
+"rHI" = (
+/obj/effect/floor_decal/borderfloorblack{
+	dir = 1
+	},
+/obj/effect/floor_decal/corner/brown/border{
+	dir = 1
+	},
+/obj/machinery/door/firedoor{
+	dir = 1
+	},
+/turf/simulated/floor/tiled/dark,
+/area/quartermaster/foyer)
 "rIA" = (
 /obj/structure/table/rack,
 /turf/simulated/floor/plating,
@@ -26214,12 +26457,14 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
-/obj/landmark/spawnpoint/job/shaft_miner,
 /obj/structure/disposalpipe/segment{
 	dir = 1;
 	icon_state = "pipe-c"
 	},
-/turf/simulated/floor/tiled,
+/obj/effect/floor_decal/spline/fancy/wood{
+	dir = 4
+	},
+/turf/simulated/floor/wood,
 /area/endeavour/surfacebase/mining_main/break_room)
 "rLt" = (
 /obj/structure/closet/secure_closet/brig{
@@ -26277,21 +26522,25 @@
 /turf/simulated/floor/wood,
 /area/tether/surfacebase/entertainment)
 "rMY" = (
-/obj/structure/disposalpipe/segment,
-/obj/structure/closet/crate/large,
-/turf/simulated/floor/tiled/dark,
-/area/quartermaster/warehouse)
+/obj/structure/table/fancyblack,
+/obj/item/kit/paint/ripley/arnold,
+/obj/item/kit/paint/ripley/flames_red,
+/obj/item/kit/paint/ripley/flames_blue,
+/obj/item/kit/paint/ripley/dreadnought,
+/turf/simulated/floor/plating,
+/area/quartermaster/storage)
 "rNH" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/tiled/dark,
 /area/security/lobby)
 "rOn" = (
+/obj/structure/catwalk,
 /obj/structure/cable/green{
-	icon_state = "1-4"
+	icon_state = "2-8"
 	},
-/turf/simulated/floor/reinforced,
-/area/quartermaster/miningdock)
+/turf/simulated/floor/plating,
+/area/maintenance/cargo)
 "rOs" = (
 /obj/machinery/camera/network/civilian{
 	dir = 1
@@ -26353,7 +26602,9 @@
 /obj/effect/floor_decal/corner/brown/bordercorner2{
 	dir = 8
 	},
-/obj/structure/window/reinforced/survival_pod,
+/obj/structure/poster/preset/baystation/bay_58{
+	pixel_x = -31
+	},
 /turf/simulated/floor/tiled/dark,
 /area/quartermaster/warehouse)
 "rOR" = (
@@ -26367,22 +26618,11 @@
 /turf/simulated/floor/tiled/dark,
 /area/maintenance/starboardsolar)
 "rOW" = (
-/obj/effect/floor_decal/borderfloor,
-/obj/effect/floor_decal/corner/brown/border,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+/obj/machinery/camera/network/civilian{
 	dir = 4
 	},
-/obj/structure/cable/green{
-	icon_state = "4-8"
-	},
-/obj/structure/cable/green{
-	icon_state = "1-4"
-	},
-/turf/simulated/floor/tiled/monotile,
-/area/quartermaster/belterdock/refinery)
+/turf/simulated/floor/wood,
+/area/crew_quarters/sleep/Dorm_13)
 "rPa" = (
 /obj/effect/floor_decal/borderfloorblack,
 /obj/effect/floor_decal/corner/navblue/border,
@@ -26396,10 +26636,9 @@
 /turf/simulated/floor/tiled/old_cargo/gray,
 /area/security/security_processing)
 "rPE" = (
-/obj/machinery/suit_storage_unit/mining,
-/obj/effect/floor_decal/corner/brown/diagonal,
-/turf/simulated/floor/tiled/white,
-/area/quartermaster/belterdock/gear)
+/obj/machinery/vending/sovietsoda,
+/turf/simulated/floor/plating,
+/area/quartermaster/storage)
 "rPF" = (
 /obj/structure/cable/orange{
 	icon_state = "4-8"
@@ -26431,8 +26670,9 @@
 /obj/structure/cable/green{
 	icon_state = "1-2"
 	},
-/turf/simulated/floor/tiled/monotile,
-/area/quartermaster/belterdock/refinery)
+/obj/structure/catwalk,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d3aftmaint)
 "rQE" = (
 /obj/structure/table/woodentable,
 /obj/item/tape_recorder{
@@ -26452,12 +26692,6 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/endeavour/station/stairs_three)
-"rQL" = (
-/obj/machinery/atmospherics/component/unary/vent_scrubber/on{
-	dir = 1
-	},
-/turf/simulated/floor/reinforced,
-/area/quartermaster/miningdock)
 "rQZ" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -26509,6 +26743,12 @@
 	},
 /turf/simulated/floor/wood,
 /area/crew_quarters/sleep/Dorm_3)
+"rSZ" = (
+/obj/machinery/light/small{
+	dir = 1
+	},
+/turf/simulated/floor/wood,
+/area/endeavour/hallway/d3aftmaint)
 "rTm" = (
 /obj/structure/cable/green{
 	icon_state = "0-2"
@@ -26530,14 +26770,10 @@
 /turf/simulated/floor/tiled/white,
 /area/crew_quarters/barrestroom)
 "rTD" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 10
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 6
-	},
-/turf/simulated/floor/carpet/blue,
-/area/crew_quarters/sleep/Dorm_11)
+/obj/effect/floor_decal/corner/brown/diagonal,
+/obj/item/stool/padded,
+/turf/simulated/floor/tiled/white,
+/area/quartermaster/belterdock/gear)
 "rTM" = (
 /obj/machinery/light/small,
 /turf/simulated/floor/tiled/white,
@@ -26619,6 +26855,11 @@
 	dir = 1
 	},
 /obj/structure/table/steel_reinforced,
+/obj/machinery/atmospherics/component/unary/vent_pump/on,
+/obj/machinery/status_display/supply_display{
+	mode = 99;
+	pixel_y = 32
+	},
 /turf/simulated/floor/tiled/monodark,
 /area/quartermaster/foyer)
 "rXe" = (
@@ -26655,6 +26896,9 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
 /turf/simulated/floor/reinforced,
 /area/quartermaster/miningdock)
 "rYD" = (
@@ -26769,17 +27013,23 @@
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d3afthall)
 "sbx" = (
-/obj/structure/table/steel_reinforced,
-/obj/fiftyspawner/steel,
-/obj/fiftyspawner/steel,
+/obj/effect/floor_decal/corner/brown/diagonal,
+/obj/landmark/spawnpoint/job/shaft_miner,
+/obj/structure/disposalpipe/segment{
+	dir = 4;
+	icon_state = "pipe-c"
+	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
+	dir = 8
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
-/turf/simulated/floor/tiled/techmaint,
-/area/quartermaster/warehouse)
+/obj/structure/cable/green{
+	icon_state = "2-4"
+	},
+/turf/simulated/floor/tiled/white,
+/area/quartermaster/belterdock/gear)
 "scb" = (
 /obj/structure/table/woodentable,
 /turf/simulated/floor/wood,
@@ -26896,17 +27146,8 @@
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/security/lobby)
 "shF" = (
-/obj/structure/cable/green{
-	icon_state = "1-2"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 8
-	},
-/turf/simulated/floor/tiled/dark,
-/area/quartermaster/warehouse)
+/turf/simulated/wall/r_wall/prepainted/cargo,
+/area/quartermaster/storage)
 "shG" = (
 /obj/machinery/holopad,
 /obj/structure/cable/green{
@@ -26966,9 +27207,7 @@
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d3starboardforhall)
 "sij" = (
-/obj/machinery/atmospherics/component/unary/vent_pump/on{
-	dir = 1
-	},
+/obj/machinery/atmospherics/component/unary/vent_scrubber/on,
 /turf/simulated/floor/reinforced,
 /area/quartermaster/miningdock)
 "sil" = (
@@ -27026,11 +27265,16 @@
 /turf/simulated/floor/tiled/old_cargo/gray,
 /area/security/evidence_storage)
 "sjO" = (
-/obj/structure/closet/firecloset,
-/obj/machinery/light{
+/obj/effect/floor_decal/borderfloorblack{
 	dir = 1
 	},
-/turf/simulated/floor/tiled/techmaint,
+/obj/effect/floor_decal/corner/brown/border{
+	dir = 1
+	},
+/obj/structure/window/reinforced{
+	dir = 8
+	},
+/turf/simulated/floor/tiled/dark,
 /area/quartermaster/warehouse)
 "sky" = (
 /obj/structure/table/woodentable,
@@ -27049,7 +27293,7 @@
 /obj/machinery/air_alarm{
 	pixel_y = 22
 	},
-/obj/machinery/vending/loadout/costume,
+/obj/machinery/vending/loadout/gadget,
 /turf/simulated/floor/tiled/dark,
 /area/vacant/vacant_shop)
 "slv" = (
@@ -27117,8 +27361,10 @@
 /turf/simulated/floor/tiled,
 /area/security/hanger)
 "sms" = (
-/obj/structure/closet/wardrobe/black,
-/turf/simulated/floor/carpet/turcarpet,
+/obj/machinery/light/small{
+	dir = 1
+	},
+/turf/simulated/wall/r_wall/prepainted,
 /area/crew_quarters/recreation_area)
 "smC" = (
 /obj/structure/cable/green{
@@ -27184,6 +27430,21 @@
 /obj/map_helper/access_helper/airlock/station/supply/maintenance,
 /turf/simulated/floor/plating,
 /area/crew_quarters/recreation_area)
+"soE" = (
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/obj/machinery/door/firedoor{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/dark,
+/area/quartermaster/warehouse)
 "soV" = (
 /obj/structure/cable/green{
 	icon_state = "1-2"
@@ -27524,11 +27785,18 @@
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d3starboardamidhall)
 "sxc" = (
-/obj/effect/floor_decal/industrial/warning/cee{
-	dir = 1
+/obj/machinery/conveyor{
+	dir = 6;
+	id = "mining_interior"
 	},
-/obj/machinery/recharge_station,
-/turf/simulated/floor/tiled/monotechmaint,
+/obj/structure/plasticflaps/mining,
+/obj/structure/window/reinforced{
+	dir = 8
+	},
+/obj/effect/floor_decal/industrial/warning/dust{
+	dir = 8
+	},
+/turf/simulated/floor/tiled/monodark,
 /area/quartermaster/belterdock/refinery)
 "sxq" = (
 /obj/structure/cable/green{
@@ -27603,11 +27871,7 @@
 /turf/simulated/floor/carpet/bcarpet,
 /area/quartermaster/qm)
 "sAp" = (
-/obj/machinery/power/apc/north_mount,
-/obj/structure/cable/green{
-	icon_state = "0-2"
-	},
-/obj/structure/catwalk,
+/obj/machinery/air_alarm/north_mount,
 /turf/simulated/floor/plating,
 /area/maintenance/bar/catwalk)
 "sAz" = (
@@ -27650,21 +27914,20 @@
 /area/endeavour/hallway/d3portamidhall)
 "sBr" = (
 /obj/machinery/mech_recharger,
-/obj/effect/floor_decal/industrial/warning,
+/obj/effect/floor_decal/industrial/warning{
+	dir = 6
+	},
+/obj/machinery/air_alarm/west_mount,
 /turf/simulated/floor/tiled/steel_grid,
 /area/quartermaster/belterdock)
 "sCx" = (
 /turf/space/basic,
 /area/security/range)
 "sDb" = (
-/obj/effect/floor_decal/borderfloor{
-	dir = 8
-	},
-/obj/effect/floor_decal/corner/brown/border{
-	dir = 8
-	},
-/turf/simulated/floor/tiled/monotile,
-/area/quartermaster/belterdock/refinery)
+/obj/structure/catwalk,
+/obj/machinery/door/airlock/maintenance,
+/turf/simulated/floor/plating,
+/area/maintenance/cargo)
 "sDc" = (
 /obj/structure/table/wooden_reinforced,
 /obj/machinery/atmospherics/component/unary/vent_scrubber/on,
@@ -27682,10 +27945,6 @@
 /obj/structure/stairs/spawner/east,
 /turf/simulated/floor/plating,
 /area/maintenance/bar/lower)
-"sDX" = (
-/obj/machinery/atmospherics/component/unary/vent_pump/on,
-/turf/simulated/floor/tiled,
-/area/quartermaster/belterdock)
 "sEi" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -27767,19 +28026,14 @@
 /turf/simulated/floor/wood,
 /area/quartermaster/office)
 "sFX" = (
-/obj/effect/floor_decal/borderfloor{
-	dir = 4
-	},
-/obj/effect/floor_decal/corner/brown/border{
-	dir = 4
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/structure/cable/green{
 	icon_state = "1-2"
 	},
+/obj/machinery/door/firedoor,
 /turf/simulated/floor/tiled/monotile,
-/area/quartermaster/belterdock/refinery)
+/area/endeavour/hallway/d3aftmaint)
 "sFZ" = (
 /obj/effect/floor_decal/industrial/outline/yellow,
 /obj/random/cutout,
@@ -27809,6 +28063,12 @@
 	},
 /turf/simulated/floor/carpet,
 /area/crew_quarters/heads/hos)
+"sGw" = (
+/obj/structure/table,
+/obj/random/tetheraid,
+/obj/random/maintenance/security,
+/turf/simulated/floor/wood,
+/area/endeavour/hallway/d3aftmaint)
 "sGz" = (
 /obj/effect/floor_decal/spline/fancy/wood{
 	dir = 9
@@ -27816,14 +28076,17 @@
 /turf/simulated/floor/carpet/bcarpet,
 /area/crew_quarters/bar)
 "sGH" = (
-/obj/structure/cable/green{
-	icon_state = "1-4"
+/obj/machinery/conveyor_switch/oneway{
+	id = "mining_interior";
+	name = "refining conveyor";
+	pixel_y = 2;
+	pixel_x = -11
 	},
-/obj/structure/cable/green{
-	icon_state = "1-2"
+/obj/effect/floor_decal/industrial/warning/dust{
+	dir = 1
 	},
-/turf/simulated/floor/reinforced,
-/area/quartermaster/miningdock)
+/turf/simulated/floor/tiled/monodark,
+/area/quartermaster/belterdock/refinery)
 "sHr" = (
 /obj/machinery/light{
 	dir = 1
@@ -27848,6 +28111,16 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/security/hallwayaux)
+"sIY" = (
+/obj/effect/floor_decal/industrial/outline{
+	color = "#D6DBDB"
+	},
+/obj/structure/closet/crate/large,
+/obj/machinery/door/firedoor{
+	dir = 8
+	},
+/turf/simulated/floor/tiled/monodark,
+/area/quartermaster/warehouse)
 "sJu" = (
 /obj/structure/lattice,
 /turf/space,
@@ -27919,15 +28192,9 @@
 /turf/simulated/floor/tiled/dark,
 /area/maintenance/starboardsolar)
 "sMN" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/cable/green{
-	icon_state = "1-2"
-	},
-/turf/simulated/floor/tiled/monodark,
-/area/quartermaster/delivery)
+/obj/structure/salvageable/computer,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d3aftmaint)
 "sNh" = (
 /obj/structure/disposalpipe/segment,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -27968,13 +28235,8 @@
 /turf/simulated/floor/tiled/dark,
 /area/crew_quarters/kitchen)
 "sOt" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 6
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 6
-	},
-/turf/simulated/floor/tiled/dark,
+/obj/structure/window/reinforced,
+/turf/simulated/floor/tiled/techmaint,
 /area/quartermaster/warehouse)
 "sOD" = (
 /obj/item/stool/padded,
@@ -28072,12 +28334,6 @@
 /turf/space,
 /area/space)
 "sTs" = (
-/obj/effect/floor_decal/borderfloorblack{
-	dir = 8
-	},
-/obj/effect/floor_decal/corner/brown/border{
-	dir = 8
-	},
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
 	dir = 4
 	},
@@ -28085,6 +28341,15 @@
 	dir = 4
 	},
 /obj/structure/disposalpipe/junction,
+/obj/effect/floor_decal/borderfloorblack{
+	dir = 4
+	},
+/obj/effect/floor_decal/corner/brown/border{
+	dir = 4
+	},
+/obj/structure/cable/green{
+	icon_state = "2-8"
+	},
 /turf/simulated/floor/tiled/dark,
 /area/quartermaster/warehouse)
 "sTR" = (
@@ -28133,18 +28398,16 @@
 /turf/simulated/floor/carpet/bcarpet,
 /area/crew_quarters/bar)
 "sVr" = (
-/obj/effect/floor_decal/borderfloor{
-	dir = 1
-	},
-/obj/effect/floor_decal/corner/brown/border{
-	dir = 1
-	},
-/obj/structure/bed/chair/sofa/black/left,
 /obj/machinery/light{
 	dir = 1;
 	pixel_y = 20
 	},
-/turf/simulated/floor/tiled,
+/obj/effect/floor_decal/spline/fancy/wood{
+	dir = 1
+	},
+/obj/structure/table/wooden_reinforced,
+/obj/machinery/microwave,
+/turf/simulated/floor/wood,
 /area/endeavour/surfacebase/mining_main/break_room)
 "sVD" = (
 /obj/effect/floor_decal/borderfloorblack{
@@ -28158,6 +28421,9 @@
 	},
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d3portamidhall)
+"sVH" = (
+/turf/simulated/wall/r_wall/prepainted/cargo,
+/area/crew_quarters/sleep/Dorm_13)
 "sWa" = (
 /obj/structure/cable/green{
 	icon_state = "4-8"
@@ -28326,10 +28592,6 @@
 /obj/effect/floor_decal/corner/navblue/bordercorner2{
 	dir = 1
 	},
-/obj/structure/sign/department/cargo{
-	pixel_x = 0;
-	pixel_y = 32
-	},
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d3portforhall)
 "taa" = (
@@ -28403,11 +28665,11 @@
 /turf/simulated/floor/tiled/dark,
 /area/quartermaster/warehouse)
 "tcb" = (
-/obj/structure/window/reinforced/survival_pod{
-	dir = 4
+/obj/effect/floor_decal/industrial/outline{
+	color = "#D6DBDB"
 	},
-/obj/structure/dispenser/oxygen,
-/turf/simulated/floor/tiled/techmaint,
+/obj/structure/reagent_dispensers/watertank,
+/turf/simulated/floor/tiled/monodark,
 /area/quartermaster/warehouse)
 "tcl" = (
 /obj/structure/closet/wardrobe,
@@ -28416,31 +28678,16 @@
 /obj/machinery/power/apc/south_mount,
 /turf/simulated/floor/wood,
 /area/crew_quarters/sleep/Dorm_10)
-"tdf" = (
-/obj/effect/floor_decal/borderfloorblack,
-/obj/effect/floor_decal/corner/brown/border,
-/obj/machinery/status_display/supply_display{
-	pixel_x = 0;
-	pixel_y = -32
-	},
-/obj/structure/bed/chair/sofa/black{
-	dir = 1
-	},
-/turf/simulated/floor/tiled/dark,
-/area/quartermaster/foyer)
 "tdj" = (
 /obj/machinery/atmospherics/component/unary/vent_pump/on{
 	dir = 8
 	},
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
 /turf/simulated/floor/tiled/dark,
 /area/quartermaster/foyer)
 "tdk" = (
-/obj/effect/floor_decal/borderfloorblack{
-	dir = 8
-	},
-/obj/effect/floor_decal/corner/brown/border{
-	dir = 8
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/structure/disposalpipe/segment,
@@ -28458,20 +28705,11 @@
 /turf/simulated/floor/wood,
 /area/quartermaster/office)
 "tds" = (
-/obj/effect/floor_decal/corner/brown/diagonal,
-/obj/machinery/door/airlock/glass/mining{
-	name = "Mining Prep Room";
-	req_one_access = null
-	},
-/obj/map_helper/access_helper/airlock/station/supply/mining,
-/obj/structure/cable/green{
-	icon_state = "1-2"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/door/firedoor,
-/turf/simulated/floor/tiled/white,
-/area/quartermaster/belterdock/refinery)
+/obj/machinery/door/airlock/mining,
+/obj/map_helper/access_helper/airlock/station/supply/mining,
+/turf/simulated/floor/plating,
+/area/quartermaster/storage)
 "tdG" = (
 /turf/simulated/wall/r_wall/prepainted/cargo,
 /area/shuttle/mining_ship/general)
@@ -28481,6 +28719,22 @@
 	},
 /turf/simulated/floor/tiled,
 /area/security/hanger)
+"teD" = (
+/obj/effect/floor_decal/techfloor{
+	dir = 4
+	},
+/obj/effect/floor_decal/techfloor/hole{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/techfloor,
+/area/maintenance/bar/catwalk)
+"teG" = (
+/obj/structure/sign/directions/cryo{
+	dir = 8;
+	pixel_y = 10
+	},
+/turf/simulated/wall/prepainted,
+/area/crew_quarters/sleep/cryo)
 "tfn" = (
 /turf/simulated/wall/r_wall/prepainted/security,
 /area/security/detectives_office)
@@ -28514,14 +28768,15 @@
 /turf/simulated/floor/tiled,
 /area/security/hanger)
 "tgP" = (
-/obj/effect/floor_decal/borderfloor{
+/obj/effect/floor_decal/spline/fancy/wood{
 	dir = 1
 	},
-/obj/effect/floor_decal/corner/brown/border{
-	dir = 1
+/obj/structure/table/wooden_reinforced,
+/obj/machinery/chemical_dispenser/catering/bar_coffee,
+/obj/machinery/air_alarm{
+	pixel_y = 22
 	},
-/obj/structure/bed/chair/sofa/black,
-/turf/simulated/floor/tiled,
+/turf/simulated/floor/wood,
 /area/endeavour/surfacebase/mining_main/break_room)
 "thy" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -28570,11 +28825,10 @@
 /turf/simulated/floor/tiled/dark,
 /area/security/nuke_storage)
 "til" = (
-/obj/structure/cable/green{
-	icon_state = "4-8"
-	},
-/turf/simulated/floor/tiled/monodark,
-/area/quartermaster/delivery)
+/obj/effect/floor_decal/corner/brown/diagonal,
+/obj/machinery/suit_cycler/mining,
+/turf/simulated/floor/tiled/white,
+/area/quartermaster/belterdock/gear)
 "tix" = (
 /obj/structure/filingcabinet/security{
 	name = "Security Records"
@@ -28656,21 +28910,16 @@
 /turf/simulated/floor/carpet/turcarpet,
 /area/crew_quarters/recreation_area)
 "tkT" = (
-/obj/effect/floor_decal/borderfloorblack{
-	dir = 4
-	},
-/obj/effect/floor_decal/corner/brown/border{
-	dir = 4
-	},
-/obj/machinery/power/apc/east_mount,
-/obj/structure/cable/green{
-	icon_state = "0-8"
+/obj/item/stack/cable_coil,
+/obj/item/stack/cable_coil{
+	pixel_y = 4
 	},
-/obj/structure/bed/chair/sofa/black/right{
-	dir = 8
+/obj/item/stack/cable_coil{
+	pixel_y = -5
 	},
-/turf/simulated/floor/tiled/dark,
-/area/quartermaster/foyer)
+/obj/structure/table/reinforced,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d3aftmaint)
 "tle" = (
 /obj/effect/floor_decal/spline/fancy/wood,
 /obj/structure/table/woodentable,
@@ -28697,12 +28946,12 @@
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d3portforhall)
 "tmi" = (
-/obj/machinery/conveyor{
-	dir = 5;
-	id = "mining_interior"
+/obj/machinery/light_switch{
+	pixel_x = -26;
+	pixel_y = 4
 	},
-/turf/simulated/floor/tiled/monodark,
-/area/quartermaster/belterdock/refinery)
+/turf/simulated/floor/wood,
+/area/maintenance/cargo)
 "tne" = (
 /obj/machinery/door/firedoor{
 	dir = 1
@@ -28732,7 +28981,7 @@
 /obj/structure/cable/green{
 	icon_state = "4-8"
 	},
-/turf/simulated/floor/tiled,
+/turf/simulated/floor/plating,
 /area/maintenance/bar/lower)
 "tos" = (
 /obj/machinery/ai_status_display{
@@ -28767,6 +29016,12 @@
 	},
 /turf/simulated/floor/airless,
 /area/space)
+"toS" = (
+/obj/machinery/floor_light/changing/prebuilt{
+	on = 1
+	},
+/turf/simulated/floor/tiled/dark,
+/area/quartermaster/storage)
 "tpm" = (
 /obj/machinery/camera/network/civilian,
 /obj/effect/floor_decal/borderfloorblack{
@@ -28840,6 +29095,8 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
+/obj/effect/floor_decal/borderfloorblack,
+/obj/effect/floor_decal/corner/brown/border,
 /turf/simulated/floor/tiled/monodark,
 /area/quartermaster/foyer)
 "tqX" = (
@@ -28937,25 +29194,33 @@
 	color = "#D6DBDB"
 	},
 /obj/structure/closet/crate/science,
+/obj/machinery/door/firedoor{
+	dir = 8
+	},
 /turf/simulated/floor/tiled/monodark,
 /area/quartermaster/warehouse)
 "twA" = (
-/obj/structure/table/standard,
-/obj/item/paper_bin,
-/obj/effect/floor_decal/borderfloor/corner2{
-	dir = 10
-	},
-/obj/effect/floor_decal/corner/brown/bordercorner2{
-	dir = 10
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
 	},
-/obj/machinery/camera/network/cargo{
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
-/obj/machinery/light{
+/obj/structure/disposalpipe/segment{
 	dir = 8
 	},
-/turf/simulated/floor/tiled/monodark,
-/area/quartermaster/delivery)
+/obj/machinery/door/firedoor{
+	dir = 8
+	},
+/turf/simulated/floor/wood,
+/area/crew_quarters/recreation_area)
+"twO" = (
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
+/obj/structure/catwalk,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d3aftmaint)
 "twR" = (
 /turf/simulated/wall/r_wall/prepainted/cargo,
 /area/quartermaster/qm)
@@ -28997,16 +29262,25 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/crew_quarters/toilet)
-"tyv" = (
-/obj/effect/floor_decal/borderfloorblack,
-/obj/effect/floor_decal/corner/brown/border,
-/obj/effect/floor_decal/borderfloorblack/corner2{
-	dir = 9
+"tyl" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
+/obj/structure/cable/green{
+	icon_state = "1-2"
 	},
-/obj/effect/floor_decal/corner/brown/bordercorner2{
-	dir = 9
+/obj/structure/window/reinforced{
+	dir = 8
 	},
-/turf/simulated/floor/tiled/dark,
+/obj/structure/window/reinforced{
+	dir = 4
+	},
+/obj/structure/flora/ausbushes/ywflowers,
+/obj/machinery/door/firedoor{
+	dir = 1
+	},
+/obj/structure/window/reinforced,
+/turf/simulated/floor/grass,
 /area/quartermaster/foyer)
 "tzm" = (
 /obj/structure/disposalpipe/junction{
@@ -29051,13 +29325,23 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
-/turf/simulated/floor/tiled,
+/obj/structure/bed/chair/comfy{
+	dir = 8
+	},
+/turf/simulated/floor/wood,
 /area/endeavour/surfacebase/mining_main/break_room)
 "tBs" = (
 /obj/spawner/window/low_wall/reinforced/full/firelocks,
 /obj/structure/curtain/open/black,
 /turf/simulated/floor/plating,
 /area/crew_quarters/game_room)
+"tBG" = (
+/obj/structure/catwalk,
+/obj/machinery/light/small{
+	dir = 8
+	},
+/turf/simulated/floor/plating,
+/area/maintenance/cargo)
 "tBN" = (
 /obj/structure/cable/green,
 /obj/machinery/power/apc/west_mount,
@@ -29065,7 +29349,7 @@
 /area/quartermaster/belterdock)
 "tBY" = (
 /obj/structure/sign/directions/cargo{
-	dir = 1;
+	dir = 4;
 	pixel_y = 32
 	},
 /obj/structure/sign/directions/cryo{
@@ -29152,28 +29436,25 @@
 /turf/simulated/floor/tiled/old_cargo/white,
 /area/security/forensics)
 "tEQ" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/disposalpipe/segment,
-/obj/machinery/door/firedoor,
-/turf/simulated/floor/tiled/dark,
-/area/quartermaster/foyer)
-"tES" = (
-/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/door/blast/shutters{
+	density = 0;
+	dir = 2;
+	icon_state = "shutter0";
+	id = "cargo_line_shutter";
+	name = "Cargo Line shutter";
+	opacity = 0
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/obj/effect/paint/beastybrown,
+/turf/simulated/floor/plating,
+/area/quartermaster/delivery)
+"tES" = (
+/obj/structure/catwalk,
+/obj/structure/cable/green{
+	icon_state = "1-2"
 	},
-/turf/simulated/floor/tiled,
-/area/endeavour/hallway/d3portforhall)
+/turf/simulated/floor/plating,
+/area/maintenance/cargo)
 "tGi" = (
 /obj/structure/table/woodentable,
 /obj/item/handcuffs/legcuffs/fuzzy,
@@ -29219,10 +29500,6 @@
 	},
 /turf/simulated/floor/tiled/techfloor,
 /area/crew_quarters/sleep/cryo)
-"tHq" = (
-/obj/landmark/spawnpoint/job/cargo_technician,
-/turf/simulated/floor/tiled/techmaint,
-/area/quartermaster/warehouse)
 "tHC" = (
 /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,
 /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,
@@ -29347,6 +29624,21 @@
 /obj/effect/floor_decal/industrial/outline/yellow,
 /turf/simulated/floor/airless,
 /area/shuttle/mining_ship/general)
+"tMd" = (
+/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
+	},
+/obj/structure/sign/directions/cryo{
+	pixel_y = 25
+	},
+/turf/simulated/floor/tiled/steel,
+/area/endeavour/hallway/d3portforhall)
 "tMx" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 6
@@ -29623,18 +29915,26 @@
 	},
 /turf/simulated/floor/carpet/bcarpet,
 /area/crew_quarters/bar)
-"tVX" = (
-/obj/effect/floor_decal/borderfloorblack{
-	dir = 8
-	},
-/obj/effect/floor_decal/corner/brown/border{
+"tVF" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 8
 	},
-/obj/machinery/camera/network/cargo{
+/obj/structure/disposalpipe/segment{
 	dir = 4
 	},
+/obj/structure/cable/green{
+	icon_state = "1-8"
+	},
 /turf/simulated/floor/tiled/dark,
 /area/quartermaster/foyer)
+"tVX" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
+/obj/effect/floor_decal/borderfloorblack/corner,
+/obj/effect/floor_decal/corner/brown/bordercorner,
+/turf/simulated/floor/tiled/dark,
+/area/quartermaster/warehouse)
 "tWm" = (
 /obj/structure/closet/l3closet/security,
 /obj/machinery/air_alarm{
@@ -29658,12 +29958,14 @@
 /turf/simulated/floor/wood,
 /area/crew_quarters/recreation_area)
 "tXh" = (
-/obj/structure/cable/green{
-	icon_state = "4-8"
+/obj/structure/railing{
+	dir = 8
+	},
+/obj/machinery/light/small{
+	dir = 1
 	},
-/obj/structure/catwalk,
 /turf/simulated/floor/plating,
-/area/maintenance/bar/catwalk)
+/area/endeavour/hallway/d3aftmaint)
 "tXo" = (
 /obj/machinery/atmospherics/component/unary/vent_scrubber/on,
 /turf/simulated/floor/tiled/dark,
@@ -29738,19 +30040,12 @@
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d3portamidhall)
 "tZV" = (
-/obj/item/radio/intercom{
-	pixel_x = 0;
-	req_access = list();
-	pixel_y = -26
-	},
-/obj/effect/floor_decal/borderfloor{
-	dir = 10
-	},
-/obj/effect/floor_decal/corner/brown/border{
-	dir = 10
-	},
-/turf/simulated/floor/tiled/monotile,
-/area/quartermaster/belterdock/refinery)
+/obj/structure/table/steel,
+/obj/random/cigarettes,
+/obj/random/maintenance/security,
+/obj/random/coin,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d3aftmaint)
 "tZY" = (
 /obj/machinery/computer/security{
 	dir = 4
@@ -29794,6 +30089,13 @@
 /obj/effect/floor_decal/corner_oldtile/white/diagonal,
 /turf/simulated/floor/tiled/dark,
 /area/crew_quarters/kitchen)
+"ubc" = (
+/obj/machinery/air_alarm/north_mount,
+/obj/machinery/light/small{
+	dir = 4
+	},
+/turf/simulated/floor/plating,
+/area/maintenance/cargo)
 "ubg" = (
 /obj/structure/closet/walllocker{
 	pixel_y = 32
@@ -29963,12 +30265,6 @@
 	},
 /turf/simulated/floor/tiled/techfloor,
 /area/crew_quarters/sleep/cryo)
-"uhj" = (
-/obj/effect/decal/mecha_wreckage/cludge{
-	dir = 1
-	},
-/turf/simulated/floor/reinforced,
-/area/maintenance/bar/catwalk)
 "uhv" = (
 /obj/structure/cable/green{
 	icon_state = "1-2"
@@ -29994,9 +30290,10 @@
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d3afthall)
 "uhE" = (
-/obj/landmark/spawnpoint/job/cargo_technician,
-/turf/simulated/floor/tiled/monodark,
-/area/quartermaster/delivery)
+/obj/effect/floor_decal/industrial/outline/yellow,
+/obj/structure/ore_box,
+/turf/simulated/floor/reinforced,
+/area/quartermaster/belterdock/refinery)
 "uhW" = (
 /obj/item/bedsheet/purpledouble,
 /obj/structure/bed/double/padded,
@@ -30038,32 +30335,20 @@
 /turf/simulated/floor/plating,
 /area/endeavour/hallway/d3aftmaint)
 "uiJ" = (
-/obj/spawner/window/low_wall/reinforced/full/firelocks,
-/obj/effect/paint/beastybrown,
+/obj/random/trash_pile,
 /turf/simulated/floor/plating,
-/area/quartermaster/delivery)
+/area/maintenance/bar/catwalk)
 "uiK" = (
-/obj/effect/floor_decal/borderfloor{
-	dir = 1
-	},
-/obj/effect/floor_decal/corner/brown/border{
-	dir = 1
-	},
-/obj/effect/floor_decal/borderfloor/corner2{
-	dir = 1
-	},
-/obj/effect/floor_decal/corner/brown/bordercorner2{
-	dir = 1
-	},
-/obj/machinery/light{
-	dir = 1
-	},
 /obj/structure/disposalpipe/segment{
 	dir = 2;
 	icon_state = "pipe-c"
 	},
-/turf/simulated/floor/tiled/monotile,
-/area/quartermaster/belterdock/refinery)
+/obj/structure/catwalk,
+/obj/structure/cable/green{
+	icon_state = "2-8"
+	},
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d3aftmaint)
 "uiN" = (
 /obj/structure/cable/green{
 	icon_state = "4-8"
@@ -30130,14 +30415,18 @@
 /turf/simulated/floor/tiled/dark,
 /area/vacant/vacant_shop)
 "ukf" = (
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
-/obj/structure/cable/green{
-	icon_state = "1-2"
+/obj/structure/disposalpipe/segment{
+	dir = 4
 	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
 /turf/simulated/floor/tiled,
-/area/endeavour/hallway/d3portforhall)
+/area/quartermaster/cargo_shelter_dock)
 "ukT" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -30165,18 +30454,12 @@
 /turf/simulated/floor/crystal,
 /area/endeavour/hallway/d3fwdhall)
 "ulx" = (
-/obj/effect/floor_decal/borderfloor,
-/obj/effect/floor_decal/corner/brown/border,
-/obj/effect/floor_decal/borderfloor/corner2{
-	dir = 9
-	},
-/obj/effect/floor_decal/corner/brown/bordercorner2{
-	dir = 9
+/obj/effect/floor_decal/corner/brown/diagonal,
+/obj/item/stool/padded{
+	pixel_y = 13
 	},
-/obj/structure/table/steel_reinforced,
-/obj/item/storage/box/lights/mixed,
-/turf/simulated/floor/tiled/monotile,
-/area/quartermaster/belterdock/refinery)
+/turf/simulated/floor/tiled/white,
+/area/quartermaster/belterdock/gear)
 "ulH" = (
 /obj/structure/disposalpipe/segment,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -30195,6 +30478,13 @@
 /obj/structure/table/rack,
 /turf/simulated/floor/tiled/dark,
 /area/security/nuke_storage)
+"umo" = (
+/obj/structure/cable/green{
+	icon_state = "1-8"
+	},
+/obj/structure/catwalk,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d3aftmaint)
 "umw" = (
 /obj/effect/floor_decal/corner_techfloor_grid{
 	dir = 5
@@ -30210,10 +30500,21 @@
 /turf/simulated/floor/tiled/dark,
 /area/security/armoury)
 "umx" = (
-/obj/machinery/lathe/autolathe,
-/obj/machinery/light,
-/turf/simulated/floor/tiled/techmaint,
-/area/quartermaster/warehouse)
+/obj/effect/floor_decal/corner/brown/diagonal,
+/obj/item/stack/flag/yellow{
+	pixel_x = 42;
+	pixel_y = 1
+	},
+/obj/item/stack/flag/yellow{
+	pixel_x = 42;
+	pixel_y = 2
+	},
+/obj/structure/disposalpipe/trunk{
+	dir = 1
+	},
+/obj/machinery/disposal,
+/turf/simulated/floor/tiled/white,
+/area/quartermaster/belterdock/gear)
 "umX" = (
 /obj/machinery/fire_alarm/east_mount,
 /turf/simulated/floor/tiled/dark,
@@ -30259,13 +30560,12 @@
 /turf/simulated/floor/tiled/old_cargo/gray,
 /area/security/evidence_storage)
 "upo" = (
-/obj/structure/extinguisher_cabinet{
-	pixel_x = 27
+/obj/structure/catwalk,
+/obj/structure/cable/green{
+	icon_state = "1-8"
 	},
-/obj/machinery/atmospherics/component/unary/vent_scrubber/on,
-/obj/structure/disposalpipe/segment,
-/turf/simulated/floor/wood,
-/area/crew_quarters/recreation_area)
+/turf/simulated/floor/plating,
+/area/maintenance/bar/catwalk)
 "upw" = (
 /obj/structure/disposalpipe/segment{
 	dir = 8
@@ -30302,29 +30602,10 @@
 /turf/simulated/floor/carpet,
 /area/security/detectives_office)
 "uqr" = (
-/obj/structure/cable/green{
-	icon_state = "1-2"
-	},
-/obj/effect/floor_decal/borderfloorblack{
-	dir = 4
-	},
-/obj/effect/floor_decal/corner/brown/border{
-	dir = 4
-	},
-/obj/structure/cable/green{
-	icon_state = "2-4"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/obj/structure/disposalpipe/segment{
-	dir = 4
-	},
-/turf/simulated/floor/tiled/dark,
-/area/quartermaster/warehouse)
+/obj/structure/closet/emcloset,
+/obj/structure/catwalk,
+/turf/simulated/floor/plating,
+/area/maintenance/cargo)
 "url" = (
 /obj/machinery/door/airlock/maintenance,
 /obj/machinery/door/firedoor{
@@ -30444,6 +30725,17 @@
 	},
 /turf/simulated/floor/tiled/monotile,
 /area/security/hallway)
+"uuE" = (
+/obj/random/trash_pile,
+/obj/structure/railing,
+/obj/structure/railing{
+	dir = 4
+	},
+/obj/structure/railing{
+	dir = 8
+	},
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d3aftmaint)
 "uvh" = (
 /obj/machinery/fire_alarm/east_mount,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -30512,15 +30804,6 @@
 	},
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d3starboardafthall)
-"uwI" = (
-/obj/machinery/atmospherics/component/unary/vent_pump/on{
-	dir = 4
-	},
-/obj/machinery/fire_alarm/west_mount{
-	pixel_x = -24
-	},
-/turf/simulated/floor/carpet/blue,
-/area/crew_quarters/sleep/Dorm_11)
 "uwR" = (
 /obj/structure/cable/orange{
 	icon_state = "1-2"
@@ -30536,13 +30819,10 @@
 /turf/simulated/floor/plating,
 /area/security/hallway)
 "uxX" = (
-/obj/machinery/atmospherics/component/unary/vent_scrubber/on,
-/obj/structure/sign/directions/roomnum{
-	dir = 4;
-	pixel_y = 24
-	},
-/turf/simulated/floor/wood,
-/area/crew_quarters/recreation_area_hallway)
+/obj/structure/window/reinforced,
+/obj/landmark/spawnpoint/job/cargo_technician,
+/turf/simulated/floor/tiled/techmaint,
+/area/quartermaster/warehouse)
 "uxZ" = (
 /obj/structure/table/bench/steel,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -30588,18 +30868,15 @@
 /turf/simulated/floor/tiled/dark,
 /area/vacant/vacant_shop)
 "uzS" = (
+/obj/machinery/recharge_station,
 /obj/effect/floor_decal/borderfloorblack{
 	dir = 1
 	},
 /obj/effect/floor_decal/corner/brown/border{
 	dir = 1
 	},
-/obj/structure/bed/chair/sofa/black/left,
-/obj/machinery/status_display/supply_display{
-	mode = 99;
-	pixel_y = 32
-	},
-/turf/simulated/floor/tiled/dark,
+/obj/machinery/fire_alarm/north_mount,
+/turf/simulated/floor/tiled/techmaint,
 /area/quartermaster/warehouse)
 "uAl" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -30631,12 +30908,16 @@
 /turf/simulated/floor/carpet,
 /area/security/detectives_office)
 "uAU" = (
-/obj/effect/floor_decal/borderfloor,
-/obj/effect/floor_decal/corner/brown/border,
-/obj/structure/table/steel_reinforced,
-/obj/machinery/recharger,
-/turf/simulated/floor/tiled/monotile,
-/area/quartermaster/belterdock/refinery)
+/obj/random/junk,
+/turf/simulated/floor/plating,
+/area/maintenance/trash_pit)
+"uAV" = (
+/obj/structure/railing{
+	dir = 1
+	},
+/obj/random/trash_pile,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d3aftmaint)
 "uBK" = (
 /obj/structure/cable/green{
 	icon_state = "4-8"
@@ -30833,9 +31114,8 @@
 /turf/simulated/floor,
 /area/security/brig)
 "uJr" = (
-/obj/machinery/fire_alarm/west_mount,
-/turf/simulated/floor/tiled/techmaint,
-/area/quartermaster/warehouse)
+/turf/simulated/floor/wood,
+/area/maintenance/cargo)
 "uJv" = (
 /obj/machinery/holopad,
 /turf/simulated/floor/tiled,
@@ -30845,7 +31125,7 @@
 	dir = 8
 	},
 /turf/simulated/floor/tiled,
-/area/endeavour/surfacebase/mining_main/break_room)
+/area/quartermaster/cargo_shelter_dock)
 "uJM" = (
 /obj/effect/floor_decal/borderfloorblack{
 	dir = 1
@@ -30902,7 +31182,10 @@
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 6
+	dir = 5
+	},
+/obj/structure/cable/green{
+	icon_state = "2-4"
 	},
 /turf/simulated/floor/reinforced,
 /area/quartermaster/miningdock)
@@ -30991,6 +31274,10 @@
 	dir = 1;
 	icon_state = "pipe-c"
 	},
+/obj/structure/table/reinforced,
+/obj/structure/flora/pottedplant/small{
+	pixel_y = 11
+	},
 /turf/simulated/floor/tiled,
 /area/quartermaster/belterdock)
 "uMD" = (
@@ -31039,16 +31326,13 @@
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d3fwdhall)
 "uNM" = (
-/obj/effect/floor_decal/borderfloor{
-	dir = 1
-	},
-/obj/effect/floor_decal/corner/brown/border{
-	dir = 1
-	},
 /obj/machinery/camera/network/cargo,
 /obj/machinery/disposal,
 /obj/structure/disposalpipe/trunk,
-/turf/simulated/floor/tiled,
+/obj/effect/floor_decal/spline/fancy/wood{
+	dir = 5
+	},
+/turf/simulated/floor/wood,
 /area/endeavour/surfacebase/mining_main/break_room)
 "uOI" = (
 /obj/machinery/door/firedoor,
@@ -31104,6 +31388,15 @@
 /obj/machinery/computer/arcade/battle,
 /turf/simulated/floor/carpet/bcarpet,
 /area/crew_quarters/bar)
+"uPG" = (
+/obj/item/tool/crowbar/red,
+/obj/structure/table/reinforced,
+/obj/item/tool/screwdriver,
+/obj/machinery/light/small{
+	dir = 8
+	},
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d3aftmaint)
 "uPY" = (
 /obj/item/material/ashtray/bronze,
 /obj/structure/cable/green{
@@ -31132,16 +31425,20 @@
 /turf/simulated/floor/tiled/dark,
 /area/endeavour/hallway/d3aftmaint)
 "uRz" = (
-/obj/effect/floor_decal/corner/brown/diagonal,
-/turf/simulated/floor/tiled/white,
-/area/quartermaster/belterdock/gear)
+/obj/machinery/light/small,
+/turf/simulated/floor/plating,
+/area/quartermaster/storage)
 "uRN" = (
-/obj/machinery/power/apc/north_mount,
-/obj/structure/cable/green{
-	icon_state = "0-4"
+/obj/effect/floor_decal/industrial/warning{
+	dir = 10
 	},
-/turf/simulated/floor/tiled/monodark,
-/area/quartermaster/delivery)
+/obj/vehicle/sealed/mecha/combat/fighter/pinnace{
+	dir = 1;
+	desc = "A cramped ship's boat, capable of atmospheric and space flight. Not capable of mounting traditional weapons. Capable of fitting one pilot and one passenger. Hastily scrawled along the portside cockpit entrance using big, blocky script (in what appears to be crayon?) is the name 'NLS LEGAL SALVAGE'.";
+	name = "\improper NLS Legal Salvage"
+	},
+/turf/simulated/floor/reinforced,
+/area/quartermaster/miningdock)
 "uSv" = (
 /obj/structure/table/woodentable,
 /obj/machinery/microwave,
@@ -31204,14 +31501,6 @@
 	},
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/security/lobby)
-"uUR" = (
-/obj/machinery/hyperpad/centre{
-	map_pad_id = "lavaland_station";
-	map_pad_link_id = "lavaland_away";
-	newcolor = "#fcba03"
-	},
-/turf/simulated/floor/tiled/techmaint,
-/area/quartermaster/belterdock)
 "uVc" = (
 /obj/structure/fitness/punchingbag,
 /obj/structure/cable/green{
@@ -31411,19 +31700,12 @@
 /turf/simulated/floor/plating,
 /area/crew_quarters/recreation_area)
 "vaA" = (
-/obj/effect/floor_decal/borderfloor,
-/obj/effect/floor_decal/corner/brown/border,
-/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"
+/obj/machinery/air_alarm{
+	pixel_y = 22
 	},
-/turf/simulated/floor/tiled/monotile,
-/area/quartermaster/belterdock/refinery)
+/obj/random/trash_pile,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d3aftmaint)
 "vaR" = (
 /obj/structure/sign/securearea{
 	desc = "A warning sign which reads 'EXTERNAL AIRLOCK'";
@@ -31435,6 +31717,10 @@
 /obj/effect/paint/beastybrown,
 /turf/simulated/floor/plating,
 /area/quartermaster/warehouse)
+"vbg" = (
+/obj/machinery/door/airlock/maintenance,
+/turf/simulated/floor/plating,
+/area/maintenance/bar/catwalk)
 "vbj" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -31484,16 +31770,9 @@
 /turf/simulated/floor/tiled/dark,
 /area/security/warden)
 "veW" = (
-/obj/effect/floor_decal/spline/fancy/wood{
-	dir = 1
-	},
-/obj/structure/table/woodentable,
-/obj/structure/flora/pottedplant/smallcactus{
-	pixel_x = 0;
-	pixel_y = 12
-	},
-/turf/simulated/floor/wood,
-/area/endeavour/surfacebase/mining_main/break_room)
+/obj/machinery/vending/fitness,
+/turf/simulated/floor/tiled/dark,
+/area/quartermaster/cargo_shelter_dock)
 "vfa" = (
 /turf/simulated/floor/carpet/purcarpet,
 /area/crew_quarters/sleep/Dorm_13)
@@ -31696,7 +31975,7 @@
 /area/security/hallway)
 "vkn" = (
 /turf/simulated/wall/r_wall/prepainted/cargo,
-/area/endeavour/surfacebase/mining_main/break_room)
+/area/quartermaster/cargo_shelter_dock)
 "vkR" = (
 /obj/structure/catwalk,
 /obj/machinery/light/small{
@@ -31730,6 +32009,13 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/crew_quarters/bar)
+"vlq" = (
+/obj/structure/closet/crate/solar,
+/obj/machinery/light/small{
+	dir = 4
+	},
+/turf/simulated/floor/plating,
+/area/maintenance/bar/catwalk)
 "vlu" = (
 /obj/structure/window/reinforced{
 	dir = 4
@@ -31752,15 +32038,8 @@
 /turf/simulated/floor/plating,
 /area/security/brig)
 "vlO" = (
+/obj/structure/window/reinforced,
 /obj/structure/table/steel_reinforced,
-/obj/fiftyspawner/glass,
-/obj/fiftyspawner/glass,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
 /turf/simulated/floor/tiled/techmaint,
 /area/quartermaster/warehouse)
 "vmT" = (
@@ -31787,20 +32066,15 @@
 /turf/simulated/floor/tiled/dark,
 /area/security/tactical)
 "vng" = (
-/obj/effect/floor_decal/borderfloorblack{
-	dir = 4
-	},
-/obj/effect/floor_decal/corner/brown/border{
-	dir = 4
-	},
-/obj/machinery/light{
-	dir = 4
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 1
 	},
-/obj/structure/bed/chair/comfy/brown{
-	dir = 8
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/cable/green{
+	icon_state = "1-2"
 	},
-/turf/simulated/floor/tiled/dark,
-/area/quartermaster/foyer)
+/turf/simulated/floor/tiled/monodark,
+/area/quartermaster/delivery)
 "vnn" = (
 /turf/simulated/wall/r_wall/prepainted/security,
 /area/crew_quarters/heads/hos)
@@ -31898,6 +32172,16 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/security/hallway)
+"voE" = (
+/obj/effect/floor_decal/techfloor{
+	dir = 5
+	},
+/obj/effect/floor_decal/techfloor/hole{
+	dir = 4
+	},
+/obj/structure/reagent_dispensers/watertank,
+/turf/simulated/floor/tiled/techfloor,
+/area/maintenance/bar/catwalk)
 "voJ" = (
 /obj/structure/table/woodentable,
 /obj/machinery/recharger,
@@ -32138,14 +32422,16 @@
 /obj/machinery/air_alarm{
 	pixel_y = 22
 	},
-/obj/machinery/vending/nifsoft_shop,
+/obj/machinery/vending/loadout,
 /turf/simulated/floor/tiled/dark,
 /area/vacant/vacant_shop)
 "vxE" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/light{
 	dir = 4
 	},
-/turf/simulated/floor/wood,
+/turf/simulated/floor/carpet/bcarpet,
 /area/quartermaster/qm)
 "vxL" = (
 /obj/structure/closet/crate/secure,
@@ -32164,10 +32450,8 @@
 /turf/simulated/floor/tiled/dark,
 /area/security/warden)
 "vyv" = (
-/obj/effect/floor_decal/spline/fancy/wood,
-/obj/machinery/light,
-/turf/simulated/floor/wood,
-/area/endeavour/surfacebase/mining_main/break_room)
+/turf/simulated/floor/plating,
+/area/quartermaster/cargo_shelter_dock)
 "vyR" = (
 /obj/machinery/atmospherics/component/unary/vent_scrubber/on{
 	dir = 8
@@ -32283,14 +32567,12 @@
 /turf/simulated/floor/carpet/bcarpet,
 /area/crew_quarters/bar)
 "vAk" = (
-/obj/structure/extinguisher_cabinet{
-	pixel_y = 32
-	},
-/obj/structure/cable/green{
-	icon_state = "4-8"
+/obj/effect/floor_decal/industrial/outline{
+	color = "#D6DBDB"
 	},
-/turf/simulated/floor/wood,
-/area/crew_quarters/recreation_area_hallway)
+/obj/structure/reagent_dispensers/fueltank,
+/turf/simulated/floor/tiled/monodark,
+/area/quartermaster/warehouse)
 "vAp" = (
 /obj/structure/window/basic{
 	dir = 1
@@ -32408,14 +32690,17 @@
 /area/crew_quarters/sleep/bedrooms)
 "vCC" = (
 /obj/effect/floor_decal/borderfloorblack{
-	dir = 1
+	dir = 6
 	},
 /obj/effect/floor_decal/corner/brown/border{
-	dir = 1
+	dir = 6
 	},
-/obj/structure/bed/chair/sofa/black/right,
+/obj/structure/bed/chair/sofa/black/corner{
+	dir = 8
+	},
+/obj/machinery/fire_alarm/east_mount,
 /turf/simulated/floor/tiled/dark,
-/area/quartermaster/warehouse)
+/area/quartermaster/foyer)
 "vCG" = (
 /obj/structure/cable/green{
 	icon_state = "4-8"
@@ -32426,6 +32711,10 @@
 /obj/structure/cable/green{
 	icon_state = "1-4"
 	},
+/obj/structure/disposalpipe/segment{
+	dir = 8;
+	icon_state = "pipe-c"
+	},
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d3portforhall)
 "vDg" = (
@@ -32589,12 +32878,6 @@
 /obj/item/reagent_containers/glass/bucket,
 /turf/simulated/floor/tiled/dark,
 /area/janitor)
-"vGd" = (
-/obj/machinery/atmospherics/component/unary/vent_pump/on{
-	dir = 4
-	},
-/turf/simulated/floor/tiled/monotile,
-/area/quartermaster/belterdock/refinery)
 "vGl" = (
 /obj/machinery/chem_master,
 /turf/simulated/floor/tiled/old_cargo/white,
@@ -32623,9 +32906,6 @@
 	},
 /turf/simulated/floor/tiled/old_cargo/white,
 /area/security/forensics)
-"vIe" = (
-/turf/simulated/floor/wood,
-/area/crew_quarters/recreation_area_hallway)
 "vIs" = (
 /obj/spawner/window/low_wall/reinforced/full/firelocks,
 /obj/effect/paint/darkred,
@@ -32782,10 +33062,6 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/security/tactical)
-"vMr" = (
-/obj/structure/closet/secure_closet/cargotech,
-/turf/simulated/floor/tiled/techmaint,
-/area/quartermaster/warehouse)
 "vMB" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -32980,11 +33256,10 @@
 	sortType = "Trash";
 	dir = 8
 	},
-/obj/machinery/light,
 /obj/structure/cable/green{
 	icon_state = "1-4"
 	},
-/turf/simulated/floor/tiled,
+/turf/simulated/floor/plating,
 /area/maintenance/bar/lower)
 "vSl" = (
 /turf/simulated/wall/r_wall/prepainted/cargo,
@@ -33185,6 +33460,18 @@
 /obj/structure/undies_wardrobe,
 /turf/simulated/floor/carpet/sblucarpet,
 /area/crew_quarters/sleep/Dorm_12)
+"vXN" = (
+/obj/effect/floor_decal/corner/brown/diagonal,
+/obj/machinery/door/airlock/glass/mining{
+	name = "Mining Prep Room";
+	req_one_access = null
+	},
+/obj/map_helper/access_helper/airlock/station/supply/mining,
+/obj/machinery/door/firedoor{
+	dir = 8
+	},
+/turf/simulated/floor/tiled/white,
+/area/quartermaster/belterdock/gear)
 "vYG" = (
 /obj/structure/table/woodentable,
 /obj/item/storage/box/donkpockets,
@@ -33231,18 +33518,12 @@
 /turf/simulated/floor/tiled/dark,
 /area/quartermaster/foyer)
 "vZG" = (
-/obj/effect/floor_decal/borderfloorblack{
-	dir = 1
-	},
-/obj/effect/floor_decal/corner/brown/border{
-	dir = 1
-	},
-/obj/machinery/status_display/supply_display{
-	mode = 99;
-	pixel_y = 32
+/obj/structure/cable/green{
+	icon_state = "4-8"
 	},
-/turf/simulated/floor/tiled/monodark,
-/area/quartermaster/foyer)
+/obj/machinery/computer/timeclock/premade/north,
+/turf/simulated/floor/wood,
+/area/crew_quarters/recreation_area_hallway)
 "vZR" = (
 /obj/effect/floor_decal/steeldecal/steel_decals_central6{
 	dir = 4
@@ -33340,11 +33621,14 @@
 /turf/simulated/floor/tiled/dark,
 /area/security/hallway)
 "wcT" = (
-/obj/structure/disposalpipe/segment{
-	dir = 4
+/obj/structure/cable/green{
+	icon_state = "1-8"
 	},
-/turf/simulated/floor/tiled/dark,
-/area/vacant/vacant_shop)
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
+/turf/simulated/floor/reinforced,
+/area/quartermaster/miningdock)
 "wdk" = (
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply{
 	dir = 4
@@ -33391,11 +33675,8 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/cable/green{
-	icon_state = "1-2"
-	},
 /turf/simulated/floor/tiled/monodark,
-/area/quartermaster/foyer)
+/area/quartermaster/delivery)
 "wgN" = (
 /obj/structure/disposalpipe/trunk,
 /obj/machinery/conveyor{
@@ -33406,7 +33687,7 @@
 	dir = 1
 	},
 /turf/simulated/floor/plating,
-/area/quartermaster/delivery)
+/area/endeavour/hallway/d3aftmaint)
 "wiJ" = (
 /obj/effect/floor_decal/borderfloorblack{
 	dir = 1
@@ -33472,21 +33753,28 @@
 /turf/simulated/floor/plating,
 /area/maintenance/dormitory)
 "wki" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
-	dir = 1
+/obj/structure/disposalpipe/segment{
+	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
-	dir = 1
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 8
 	},
-/obj/structure/disposalpipe/junction/yjunction,
 /turf/simulated/floor/tiled/dark,
 /area/quartermaster/foyer)
 "wku" = (
-/obj/machinery/light/small{
-	dir = 1
+/obj/effect/floor_decal/corner/brown/diagonal,
+/obj/landmark/spawnpoint/job/shaft_miner,
+/obj/item/stool/padded{
+	pixel_y = 13
 	},
-/turf/simulated/floor/plating,
-/area/maintenance/bar/catwalk)
+/turf/simulated/floor/tiled/white,
+/area/quartermaster/belterdock/gear)
 "wkw" = (
 /obj/structure/table/marble,
 /obj/machinery/cash_register/civilian{
@@ -33502,7 +33790,9 @@
 /obj/effect/floor_decal/corner/brown/border{
 	dir = 4
 	},
-/obj/machinery/fire_alarm/east_mount,
+/obj/structure/bed/chair/sofa/black/right{
+	dir = 8
+	},
 /turf/simulated/floor/tiled/dark,
 /area/quartermaster/foyer)
 "wkY" = (
@@ -33549,6 +33839,19 @@
 /obj/effect/paint/palebottlegreen,
 /turf/simulated/floor/carpet/bcarpet,
 /area/crew_quarters/bar)
+"wlM" = (
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/obj/structure/catwalk,
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
+/obj/machinery/light/small{
+	dir = 1
+	},
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d3aftmaint)
 "wma" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -33566,11 +33869,10 @@
 /turf/simulated/floor/carpet/bcarpet,
 /area/crew_quarters/bar)
 "wmU" = (
-/obj/effect/floor_decal/spline/plain{
-	dir = 5
-	},
-/obj/structure/flora/grass/event/purple_flowers1,
-/turf/simulated/floor/grass,
+/obj/structure/table/steel_reinforced,
+/obj/fiftyspawner/glass,
+/obj/fiftyspawner/glass,
+/turf/simulated/floor/tiled/techmaint,
 /area/quartermaster/warehouse)
 "wns" = (
 /obj/effect/floor_decal/spline/fancy/wood{
@@ -33606,10 +33908,6 @@
 /turf/simulated/floor/wood,
 /area/crew_quarters/sleep/Dorm_3)
 "woK" = (
-/obj/structure/disposalpipe/segment{
-	dir = 8;
-	icon_state = "pipe-c"
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
@@ -33721,12 +34019,15 @@
 /turf/simulated/floor/carpet/purcarpet,
 /area/maintenance/dormitory)
 "wrG" = (
-/obj/effect/floor_decal/corner/brown/diagonal,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 5
+/obj/machinery/vending/coffee,
+/obj/effect/floor_decal/borderfloorblack{
+	dir = 1
 	},
-/turf/simulated/floor/tiled/white,
-/area/quartermaster/belterdock/gear)
+/obj/effect/floor_decal/corner/brown/border{
+	dir = 1
+	},
+/turf/simulated/floor/tiled/techmaint,
+/area/quartermaster/warehouse)
 "wrN" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4;
@@ -33740,6 +34041,16 @@
 /obj/structure/flora/pottedplant/orientaltree,
 /turf/simulated/floor/carpet/bcarpet,
 /area/crew_quarters/bar)
+"wss" = (
+/obj/structure/catwalk,
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
+/obj/machinery/light/small{
+	dir = 8
+	},
+/turf/simulated/floor/plating,
+/area/maintenance/cargo)
 "wsz" = (
 /turf/simulated/wall/prepainted/security,
 /area/security/interrogation)
@@ -33909,14 +34220,9 @@
 /turf/simulated/floor/tiled/dark,
 /area/security/hallway)
 "wxp" = (
-/obj/effect/floor_decal/borderfloor/corner{
-	dir = 8
-	},
-/obj/effect/floor_decal/corner/brown/bordercorner{
-	dir = 8
-	},
-/turf/simulated/floor/tiled/monotile,
-/area/quartermaster/belterdock/refinery)
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/turf/simulated/floor/plating,
+/area/space)
 "wxK" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -33945,39 +34251,39 @@
 /turf/simulated/floor/tiled/dark,
 /area/security/tactical)
 "wzB" = (
-/obj/machinery/conveyor{
-	dir = 6;
-	id = "mining_interior"
+/obj/structure/cable/green{
+	icon_state = "4-8"
 	},
-/obj/structure/plasticflaps/mining,
-/obj/structure/window/reinforced{
-	dir = 8
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
 	},
-/obj/effect/floor_decal/industrial/warning/dust{
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/machinery/door/firedoor{
 	dir = 8
 	},
-/turf/simulated/floor/tiled/monodark,
-/area/quartermaster/belterdock/refinery)
+/turf/simulated/floor/tiled/dark,
+/area/quartermaster/warehouse)
 "wzV" = (
 /turf/simulated/wall/r_wall/prepainted/cargo,
 /area/quartermaster/belterdock)
 "wAe" = (
 /obj/effect/floor_decal/borderfloorblack,
 /obj/effect/floor_decal/corner/brown/border,
-/obj/structure/cable/green{
-	icon_state = "4-8"
-	},
 /obj/machinery/camera/network/cargo{
 	dir = 1
 	},
 /turf/simulated/floor/tiled/dark,
 /area/quartermaster/warehouse)
 "wAQ" = (
-/obj/machinery/camera/network/civilian{
-	dir = 4
+/obj/item/storage/box/monkeycubes,
+/obj/machinery/power/apc/north_mount,
+/obj/structure/cable/green{
+	icon_state = "0-4"
 	},
-/turf/simulated/floor/wood,
-/area/crew_quarters/recreation_area)
+/turf/simulated/floor/plating,
+/area/quartermaster/storage)
 "wAR" = (
 /obj/item/radio/intercom{
 	pixel_y = -24
@@ -34027,10 +34333,6 @@
 /obj/structure/cable/green{
 	icon_state = "4-8"
 	},
-/obj/structure/sign/department/miner_dock{
-	pixel_x = 0;
-	pixel_y = 32
-	},
 /turf/simulated/floor/reinforced,
 /area/quartermaster/miningdock)
 "wCJ" = (
@@ -34067,15 +34369,42 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/tiled/dark,
 /area/security/hallway)
+"wDp" = (
+/obj/structure/table/standard,
+/obj/item/paper_bin,
+/obj/effect/floor_decal/borderfloor/corner2{
+	dir = 10
+	},
+/obj/effect/floor_decal/corner/brown/bordercorner2{
+	dir = 10
+	},
+/obj/machinery/camera/network/cargo{
+	dir = 4
+	},
+/obj/machinery/light{
+	dir = 8
+	},
+/turf/simulated/floor/tiled/monodark,
+/area/quartermaster/delivery)
 "wEv" = (
 /obj/machinery/gibber,
 /turf/simulated/floor/tiled/freezer,
 /area/crew_quarters/kitchen)
 "wEw" = (
-/obj/effect/floor_decal/spline/plain{
-	dir = 1
+/obj/structure/table/steel_reinforced,
+/obj/item/hand_labeler{
+	pixel_y = -1
 	},
-/turf/simulated/floor/grass,
+/obj/item/hand_labeler{
+	pixel_y = 2
+	},
+/obj/item/hand_labeler{
+	pixel_y = 5
+	},
+/obj/item/hand_labeler{
+	pixel_y = 8
+	},
+/turf/simulated/floor/tiled/techmaint,
 /area/quartermaster/warehouse)
 "wEW" = (
 /obj/structure/bed/double,
@@ -34180,7 +34509,7 @@
 /obj/structure/flora/pottedplant/stoutbush,
 /obj/machinery/fire_alarm/north_mount,
 /turf/simulated/floor/tiled,
-/area/endeavour/surfacebase/mining_main/break_room)
+/area/quartermaster/cargo_shelter_dock)
 "wHm" = (
 /obj/structure/reagent_dispensers/water_cooler,
 /obj/item/reagent_containers/glass/cooler_bottle,
@@ -34202,10 +34531,13 @@
 /turf/simulated/floor/tiled/dark,
 /area/janitor)
 "wHG" = (
-/obj/machinery/atmospherics/component/unary/vent_scrubber/on{
+/obj/machinery/mineral/output,
+/obj/effect/floor_decal/industrial/loading{
 	dir = 8
 	},
-/turf/simulated/floor/tiled/dark,
+/obj/effect/floor_decal/industrial/outline/yellow,
+/obj/structure/window/reinforced,
+/turf/simulated/floor/tiled/techmaint,
 /area/quartermaster/warehouse)
 "wIy" = (
 /obj/map_helper/airlock/door/simple,
@@ -34234,17 +34566,15 @@
 /turf/simulated/floor/carpet/blue,
 /area/crew_quarters/sleep/Dorm_3)
 "wIT" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/cable/green{
-	icon_state = "2-4"
+/obj/structure/railing{
+	dir = 1
 	},
-/obj/structure/disposalpipe/segment{
-	dir = 2;
-	icon_state = "pipe-c"
+/obj/structure/railing{
+	dir = 4
 	},
-/turf/simulated/floor/wood,
-/area/crew_quarters/sleep/Dorm_11)
+/obj/effect/floor_decal/rust,
+/turf/simulated/floor/plating,
+/area/maintenance/cargo)
 "wJO" = (
 /obj/structure/table/woodentable,
 /obj/item/storage/box/donkpockets,
@@ -34253,6 +34583,26 @@
 	},
 /turf/simulated/floor/wood,
 /area/crew_quarters/sleep/Dorm_3)
+"wKr" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
+/obj/structure/window/reinforced{
+	dir = 8
+	},
+/obj/structure/window/reinforced{
+	dir = 4
+	},
+/obj/structure/flora/ausbushes/grassybush,
+/obj/machinery/door/firedoor{
+	dir = 1
+	},
+/obj/structure/window/reinforced,
+/turf/simulated/floor/grass,
+/area/quartermaster/foyer)
 "wKM" = (
 /obj/structure/cable/yellow{
 	icon_state = "1-8"
@@ -34338,15 +34688,14 @@
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d3portamidhall)
 "wOA" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 9
+/obj/structure/cable/green{
+	icon_state = "4-8"
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
+/obj/machinery/door/firedoor{
+	dir = 8
 	},
-/obj/machinery/light/small,
 /turf/simulated/floor/wood,
-/area/crew_quarters/recreation_area_hallway)
+/area/crew_quarters/recreation_area)
 "wQt" = (
 /obj/structure/table/woodentable,
 /obj/item/clothing/accessory/permit/gun,
@@ -34448,15 +34797,18 @@
 /turf/simulated/floor/tiled,
 /area/crew_quarters/fitness)
 "wRS" = (
-/obj/effect/floor_decal/borderfloorblack,
-/obj/effect/floor_decal/corner/brown/border,
-/obj/structure/window/reinforced/survival_pod,
-/obj/machinery/light{
-	pixel_x = 0;
-	pixel_y = 7
+/obj/machinery/door/airlock/multi_tile/glass{
+	name = "Warehouse"
 	},
+/obj/map_helper/access_helper/airlock/station/supply/department,
 /turf/simulated/floor/tiled/dark,
 /area/quartermaster/warehouse)
+"wTc" = (
+/obj/structure/railing{
+	dir = 8
+	},
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d3aftmaint)
 "wTk" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -34615,13 +34967,14 @@
 /obj/effect/floor_decal/corner/brown/bordercorner2{
 	dir = 10
 	},
+/obj/structure/disposalpipe/segment,
+/obj/structure/window/reinforced,
+/obj/machinery/vending/nifsoft_shop,
 /obj/machinery/status_display/supply_display{
 	mode = 99;
-	pixel_y = 0;
 	pixel_x = -32
 	},
-/obj/structure/disposalpipe/segment,
-/turf/simulated/floor/tiled/dark,
+/turf/simulated/floor/tiled/techmaint,
 /area/quartermaster/warehouse)
 "wYW" = (
 /obj/structure/railing/grey{
@@ -34739,28 +35092,17 @@
 /turf/simulated/floor/plating,
 /area/security/hallway)
 "xcE" = (
-/obj/item/folder/white,
-/obj/structure/table/reinforced,
-/obj/machinery/door/window{
-	dir = 8;
-	req_one_access = list(31)
-	},
-/obj/item/paper_bin{
-	pixel_x = -1;
-	pixel_y = 4
-	},
-/obj/item/pen,
-/obj/machinery/door/firedoor{
-	dir = 8
-	},
 /obj/effect/floor_decal/borderfloorblack{
 	dir = 4
 	},
 /obj/effect/floor_decal/corner/brown/border{
 	dir = 4
 	},
-/turf/simulated/floor/tiled/monodark,
-/area/quartermaster/delivery)
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
+/turf/simulated/floor/tiled/dark,
+/area/quartermaster/foyer)
 "xdM" = (
 /turf/simulated/wall/prepainted,
 /area/crew_quarters/sleep/Dorm_3)
@@ -34882,11 +35224,12 @@
 /turf/simulated/floor/tiled/dark,
 /area/vacant/vacant_shop)
 "xgT" = (
-/obj/structure/bed/chair/comfy/teal{
-	dir = 1
+/obj/effect/floor_decal/industrial/warning/cee{
+	dir = 8
 	},
-/turf/simulated/floor/wood,
-/area/crew_quarters/sleep/Dorm_11)
+/obj/structure/dispenser/oxygen,
+/turf/simulated/floor/reinforced,
+/area/quartermaster/miningdock)
 "xhD" = (
 /obj/machinery/air_alarm{
 	dir = 4;
@@ -34894,6 +35237,9 @@
 	},
 /turf/simulated/floor/carpet/purcarpet,
 /area/crew_quarters/sleep/Dorm_13)
+"xhN" = (
+/turf/simulated/wall/r_wall/prepainted,
+/area/endeavour/hallway/d3aftmaint)
 "xiG" = (
 /obj/structure/cable/green{
 	icon_state = "4-8"
@@ -34928,17 +35274,15 @@
 /obj/structure/cable/green{
 	icon_state = "4-8"
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
 /turf/simulated/floor/tiled,
-/area/endeavour/surfacebase/mining_main/break_room)
+/area/quartermaster/cargo_shelter_dock)
 "xkB" = (
 /obj/structure/bed/chair/office/dark{
 	dir = 1
@@ -34952,18 +35296,8 @@
 /turf/simulated/floor/tiled,
 /area/security/lobby)
 "xlf" = (
-/obj/structure/disposalpipe/segment{
-	dir = 1;
-	icon_state = "pipe-c"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 1
-	},
-/obj/structure/cable/green{
-	icon_state = "4-8"
-	},
-/turf/simulated/floor/tiled,
-/area/endeavour/hallway/d3portforhall)
+/turf/simulated/floor/plating,
+/area/quartermaster/storage)
 "xlg" = (
 /turf/simulated/floor/tiled/monodark,
 /area/quartermaster/foyer)
@@ -34993,28 +35327,24 @@
 /obj/effect/floor_decal/corner_oldtile/white/diagonal,
 /turf/simulated/floor/tiled/dark,
 /area/crew_quarters/kitchen)
-"xlv" = (
-/obj/effect/floor_decal/borderfloorblack,
-/obj/effect/floor_decal/corner/brown/border,
-/obj/structure/table/steel_reinforced,
-/obj/machinery/atmospherics/component/unary/vent_pump/on{
-	dir = 1
+"xlC" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
 	},
-/obj/machinery/status_display/supply_display{
-	pixel_x = 0;
-	pixel_y = -32
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
 	},
-/turf/simulated/floor/tiled/dark,
-/area/quartermaster/foyer)
-"xlC" = (
 /obj/structure/cable/green{
-	icon_state = "1-2"
+	icon_state = "4-8"
 	},
-/obj/machinery/atmospherics/component/unary/vent_scrubber/on{
-	dir = 4
+/obj/structure/disposalpipe/segment{
+	dir = 8
 	},
-/turf/simulated/floor/tiled/dark,
-/area/quartermaster/foyer)
+/obj/structure/cable/green{
+	icon_state = "1-4"
+	},
+/turf/simulated/floor/tiled,
+/area/endeavour/hallway/d3portforhall)
 "xlR" = (
 /obj/machinery/power/apc/south_mount,
 /obj/structure/cable/green{
@@ -35045,9 +35375,8 @@
 /obj/structure/cable/green{
 	icon_state = "4-8"
 	},
-/obj/structure/table/wooden_reinforced,
-/turf/simulated/floor/tiled/dark,
-/area/quartermaster/foyer)
+/turf/simulated/wall/r_wall/prepainted/cargo,
+/area/maintenance/cargo)
 "xnF" = (
 /obj/structure/window/reinforced{
 	dir = 8
@@ -35139,12 +35468,15 @@
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d3portforhall)
 "xue" = (
-/obj/effect/floor_decal/spline/fancy/wood{
-	dir = 4
+/obj/machinery/door/firedoor,
+/obj/effect/floor_decal/corner/brown/diagonal,
+/obj/machinery/door/airlock/glass/mining{
+	name = "Mining Prep Room";
+	req_one_access = null
 	},
-/obj/machinery/vending/fitness,
-/turf/simulated/floor/wood,
-/area/endeavour/surfacebase/mining_main/break_room)
+/obj/map_helper/access_helper/airlock/station/supply/mining,
+/turf/simulated/floor/tiled/white,
+/area/quartermaster/belterdock)
 "xus" = (
 /obj/machinery/light/small{
 	dir = 8
@@ -35179,12 +35511,10 @@
 /turf/simulated/floor/plating,
 /area/security/range)
 "xuV" = (
-/obj/structure/cable/green{
-	icon_state = "0-2"
-	},
-/obj/machinery/power/apc/north_mount,
-/turf/simulated/floor/wood,
-/area/quartermaster/qm)
+/obj/structure/lattice,
+/obj/machinery/shield_diffuser,
+/turf/simulated/floor/plating,
+/area/space)
 "xvZ" = (
 /obj/machinery/computer/ship/navigation/telescreen{
 	pixel_y = -37
@@ -35243,11 +35573,11 @@
 /area/crew_quarters/heads/hos)
 "xxb" = (
 /obj/structure/sign/directions/cargo{
-	dir = 1;
+	dir = 8;
 	pixel_y = 32
 	},
 /obj/structure/sign/directions/cryo{
-	dir = 4;
+	dir = 8;
 	pixel_y = 25
 	},
 /obj/structure/sign/directions/engineering{
@@ -35284,6 +35614,15 @@
 	},
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d3starboardamidhall)
+"xyh" = (
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/obj/machinery/door/firedoor{
+	dir = 8
+	},
+/turf/simulated/floor/tiled/dark,
+/area/quartermaster/warehouse)
 "xyl" = (
 /obj/machinery/atmospherics/component/unary/vent_pump/on{
 	dir = 1
@@ -35345,18 +35684,18 @@
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d3starboardafthall)
 "xyJ" = (
-/obj/structure/cable/green{
-	icon_state = "4-8"
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 5
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
+	dir = 5
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
+/obj/structure/cable/green{
+	icon_state = "4-8"
 	},
-/obj/structure/disposalpipe/segment{
-	dir = 4;
-	icon_state = "pipe-c"
+/obj/machinery/disposal,
+/obj/structure/disposalpipe/trunk{
+	dir = 4
 	},
 /turf/simulated/floor/wood,
 /area/quartermaster/qm)
@@ -35377,7 +35716,7 @@
 /obj/structure/cable/green{
 	icon_state = "4-8"
 	},
-/turf/simulated/floor/tiled,
+/turf/simulated/floor/plating,
 /area/maintenance/bar/lower)
 "xzh" = (
 /obj/machinery/door/airlock/maintenance/engi{
@@ -35437,15 +35776,11 @@
 	dir = 8;
 	icon_state = "pipe-c"
 	},
+/obj/machinery/power/apc/east_mount,
+/obj/structure/cable/green,
 /turf/simulated/floor/plating,
-/area/maintenance/lower/trash_pit)
+/area/maintenance/trash_pit)
 "xCV" = (
-/obj/effect/floor_decal/borderfloorblack/corner{
-	dir = 8
-	},
-/obj/effect/floor_decal/corner/brown/bordercorner{
-	dir = 8
-	},
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
 	dir = 8
 	},
@@ -35483,18 +35818,6 @@
 /obj/machinery/smartfridge,
 /turf/simulated/floor/tiled/monotile,
 /area/crew_quarters/kitchen)
-"xDr" = (
-/obj/structure/cable/green{
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/disposalpipe/segment,
-/turf/simulated/floor/tiled/dark,
-/area/quartermaster/foyer)
-"xDs" = (
-/turf/simulated/floor/tiled/monotile,
-/area/quartermaster/belterdock/refinery)
 "xDS" = (
 /obj/machinery/newscaster{
 	pixel_y = 32
@@ -35527,6 +35850,16 @@
 	},
 /turf/simulated/floor/carpet/bcarpet,
 /area/crew_quarters/bar)
+"xEQ" = (
+/obj/effect/floor_decal/techfloor{
+	dir = 9
+	},
+/obj/structure/table/steel,
+/obj/item/storage/toolbox/mechanical,
+/obj/item/stack/cable_coil,
+/obj/random/drinkbottle,
+/turf/simulated/floor/tiled/techfloor,
+/area/maintenance/bar/catwalk)
 "xFB" = (
 /obj/effect/floor_decal/corner/red{
 	dir = 6
@@ -35561,6 +35894,10 @@
 	},
 /turf/simulated/floor/carpet/bcarpet,
 /area/crew_quarters/bar)
+"xHO" = (
+/obj/structure/salvageable/bliss,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d3aftmaint)
 "xHY" = (
 /obj/effect/floor_decal/borderfloor,
 /obj/effect/floor_decal/corner/lime/border,
@@ -35604,20 +35941,16 @@
 "xIP" = (
 /turf/simulated/floor/crystal,
 /area/endeavour/hallway/d3fwdhall)
-"xIS" = (
-/obj/structure/table/reinforced,
-/obj/structure/flora/pottedplant/small{
-	pixel_x = 0;
-	pixel_y = 11
-	},
-/turf/simulated/floor/tiled,
-/area/quartermaster/belterdock)
 "xJa" = (
 /obj/structure/dogbed,
 /mob/living/simple_mob/animal/sif/fluffy,
 /obj/structure/cable/green{
 	icon_state = "1-4"
 	},
+/obj/machinery/air_alarm{
+	dir = 4;
+	pixel_x = -23
+	},
 /turf/simulated/floor/wood,
 /area/quartermaster/qm)
 "xJv" = (
@@ -35638,6 +35971,10 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
+/obj/structure/sign/department/miner_dock{
+	pixel_y = 32;
+	pixel_x = -4
+	},
 /turf/simulated/floor/reinforced,
 /area/quartermaster/miningdock)
 "xJx" = (
@@ -35709,35 +36046,28 @@
 /obj/machinery/light/small{
 	dir = 1
 	},
+/obj/random/junk,
 /turf/simulated/floor/plating,
-/area/maintenance/lower/trash_pit)
+/area/maintenance/trash_pit)
 "xLN" = (
 /obj/machinery/door/firedoor,
 /turf/simulated/floor/wood,
 /area/crew_quarters/bar/lounge)
 "xMb" = (
-/obj/machinery/camera/network/cargo{
-	dir = 8
-	},
-/obj/structure/cable/green{
-	icon_state = "1-2"
-	},
-/turf/simulated/floor/reinforced,
-/area/quartermaster/miningdock)
+/obj/random/junk,
+/obj/random/maintenance,
+/obj/machinery/air_alarm/north_mount,
+/turf/simulated/floor/plating,
+/area/maintenance/trash_pit)
 "xMc" = (
-/obj/effect/floor_decal/borderfloorblack{
-	dir = 1
-	},
-/obj/effect/floor_decal/corner/brown/border{
-	dir = 1
-	},
-/obj/item/radio/intercom{
+/obj/effect/floor_decal/corner/brown/diagonal,
+/obj/structure/closet/secure_closet/miner,
+/obj/machinery/light{
 	dir = 1;
-	name = "Station Intercom (General)";
-	pixel_y = 26
+	pixel_y = 20
 	},
-/turf/simulated/floor/tiled/dark,
-/area/quartermaster/warehouse)
+/turf/simulated/floor/tiled/white,
+/area/quartermaster/belterdock/gear)
 "xMm" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 5
@@ -35819,6 +36149,10 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/security/brig)
+"xNI" = (
+/obj/random/toy,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d3aftmaint)
 "xPj" = (
 /obj/effect/floor_decal/borderfloorblack{
 	dir = 4
@@ -35842,13 +36176,9 @@
 /area/crew_quarters/bar)
 "xPu" = (
 /obj/effect/floor_decal/spline/fancy/wood{
-	dir = 9
-	},
-/obj/machinery/vending/wallmed1{
-	dir = 4;
-	pixel_x = -24;
-	pixel_y = 2
+	dir = 6
 	},
+/obj/structure/flora/pottedplant/minitree,
 /turf/simulated/floor/wood,
 /area/endeavour/surfacebase/mining_main/break_room)
 "xPB" = (
@@ -35862,17 +36192,20 @@
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d3starboardamidhall)
 "xPU" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 10
-	},
-/obj/structure/disposalpipe/segment,
-/obj/machinery/light/small{
-	dir = 4
-	},
-/obj/machinery/vending/fitness,
-/turf/simulated/floor/wood,
-/area/crew_quarters/recreation_area)
+/obj/structure/closet/toolcloset,
+/obj/random/tool,
+/obj/random/tool,
+/obj/random/tool,
+/obj/random/tool,
+/obj/random/tool,
+/obj/random/tool,
+/obj/item/stack/cable_coil/random,
+/obj/item/stack/cable_coil/random,
+/obj/item/stack/cable_coil/random,
+/obj/item/stack/cable_coil/random,
+/obj/random/coin,
+/turf/simulated/floor,
+/area/maintenance/bar/catwalk)
 "xQu" = (
 /obj/machinery/recharger/wallcharger{
 	pixel_x = 32;
@@ -35925,15 +36258,6 @@
 	},
 /turf/simulated/floor/carpet/bcarpet,
 /area/crew_quarters/bar)
-"xSu" = (
-/obj/structure/cable/green{
-	icon_state = "4-8"
-	},
-/obj/machinery/door/firedoor{
-	dir = 8
-	},
-/turf/simulated/floor/wood,
-/area/crew_quarters/recreation_area_hallway)
 "xSF" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -35967,13 +36291,9 @@
 /turf/simulated/floor/wood,
 /area/crew_quarters/sleep/Dorm_1)
 "xTv" = (
-/obj/machinery/camera/network/cargo{
-	dir = 1
-	},
-/obj/machinery/portable_atmospherics/canister/oxygen,
-/obj/effect/floor_decal/industrial/outline/blue,
-/turf/simulated/floor/reinforced,
-/area/quartermaster/miningdock)
+/obj/machinery/mineral/processing_unit,
+/turf/simulated/floor/tiled/monodark,
+/area/quartermaster/belterdock/refinery)
 "xTD" = (
 /obj/machinery/camera/network/security,
 /turf/simulated/floor/tiled,
@@ -36151,14 +36471,6 @@
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d3fwdhall)
 "xYM" = (
-/obj/machinery/door/firedoor{
-	dir = 8
-	},
-/obj/map_helper/access_helper/airlock/station/mining_operations,
-/obj/machinery/door/airlock/glass/mining{
-	name = "Magmatic Rift Leap Pad";
-	req_one_access = null
-	},
 /obj/structure/cable/green{
 	icon_state = "4-8"
 	},
@@ -36174,7 +36486,9 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/turf/simulated/floor/tiled,
+/obj/effect/paint/beastybrown,
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/turf/simulated/floor/plating,
 /area/quartermaster/belterdock)
 "xZp" = (
 /obj/structure/bed/chair/wood{
@@ -36298,10 +36612,19 @@
 /turf/simulated/wall/prepainted/security,
 /area/crew_quarters/heads/hos)
 "yfx" = (
-/obj/effect/floor_decal/corner/brown/diagonal,
-/obj/machinery/atmospherics/component/unary/vent_pump/on,
-/turf/simulated/floor/tiled/white,
-/area/quartermaster/belterdock/gear)
+/obj/structure/railing,
+/obj/structure/railing{
+	dir = 4
+	},
+/obj/structure/table/rack{
+	dir = 8;
+	layer = 2.9
+	},
+/obj/machinery/light/small{
+	dir = 1
+	},
+/turf/simulated/floor/plating,
+/area/maintenance/cargo)
 "yfy" = (
 /obj/structure/bed/chair/comfy/purp{
 	dir = 8
@@ -36313,18 +36636,9 @@
 /turf/simulated/floor/tiled/dark,
 /area/security/brig)
 "yfX" = (
-/obj/effect/floor_decal/borderfloor/corner,
-/obj/effect/floor_decal/corner/brown/bordercorner,
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
-/obj/structure/cable/green{
-	icon_state = "1-4"
-	},
-/obj/structure/cable/green{
-	icon_state = "4-8"
-	},
-/turf/simulated/floor/tiled/monotile,
-/area/quartermaster/belterdock/refinery)
+/obj/machinery/vending/nifsoft_shop,
+/turf/simulated/floor/tiled/dark,
+/area/vacant/vacant_shop)
 "ygd" = (
 /obj/effect/floor_decal/corner_steel_grid{
 	dir = 1
@@ -36372,12 +36686,14 @@
 /turf/simulated/floor/tiled/steel,
 /area/shuttle/mining_ship/general)
 "yhp" = (
-/obj/effect/floor_decal/industrial/warning{
-	dir = 8
+/obj/machinery/sheet_silo{
+	obj_persist_static_id = "sheet-silo-mining"
+	},
+/obj/effect/floor_decal/industrial/warning/dust{
+	dir = 9
 	},
-/obj/item/stool,
 /turf/simulated/floor/tiled/monodark,
-/area/quartermaster/delivery)
+/area/quartermaster/belterdock/refinery)
 "yhH" = (
 /obj/structure/cable/green{
 	icon_state = "1-2"
@@ -36391,15 +36707,13 @@
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d3starboardamidhall)
 "yhJ" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/disposalpipe/segment{
-	dir = 1
-	},
-/obj/structure/cable/green{
-	icon_state = "1-2"
+/obj/structure/extinguisher_cabinet{
+	pixel_y = 32
 	},
-/turf/simulated/floor/tiled/monotile,
-/area/quartermaster/belterdock/refinery)
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/maintenance,
+/turf/simulated/floor/plating,
+/area/crew_quarters/recreation_area_hallway)
 "yil" = (
 /obj/effect/floor_decal/corner_techfloor_grid{
 	dir = 6
@@ -36433,6 +36747,10 @@
 	},
 /turf/simulated/floor/wood,
 /area/endeavour/hallway/d3fwdhall)
+"yiZ" = (
+/obj/machinery/light/small,
+/turf/simulated/floor/plating,
+/area/maintenance/cargo)
 "yjd" = (
 /obj/machinery/light{
 	dir = 1
@@ -36455,9 +36773,21 @@
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/security/lobby)
 "ykp" = (
-/obj/structure/closet/wardrobe/green,
-/turf/simulated/floor/carpet/turcarpet,
-/area/crew_quarters/recreation_area)
+/obj/effect/floor_decal/corner/brown/diagonal,
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
+/turf/simulated/floor/tiled/white,
+/area/quartermaster/belterdock/gear)
 "ykx" = (
 /obj/structure/table/rack/shelf/steel,
 /obj/effect/floor_decal/industrial/outline/blue,
@@ -36514,14 +36844,6 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/security/armoury)
-"ykN" = (
-/obj/machinery/door/blast/regular{
-	dir = 2;
-	id = "cludge_hanger"
-	},
-/obj/machinery/atmospheric_field_generator/perma,
-/turf/simulated/floor/reinforced,
-/area/maintenance/bar/catwalk)
 "yls" = (
 /obj/structure/table/steel,
 /obj/item/tape_recorder,
@@ -36548,12 +36870,14 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/security/security_lockerroom)
-"ymc" = (
-/obj/effect/floor_decal/spline/plain{
-	dir = 6
+"ymb" = (
+/obj/machinery/power/apc/north_mount,
+/obj/structure/cable/green{
+	icon_state = "0-2"
 	},
-/turf/simulated/floor/grass,
-/area/quartermaster/warehouse)
+/obj/structure/catwalk,
+/turf/simulated/floor/plating,
+/area/maintenance/cargo)
 "ymh" = (
 /obj/structure/cable/green{
 	icon_state = "4-8"
@@ -42661,7 +42985,7 @@ xEe
 hKd
 xEe
 xEe
-hkN
+xEe
 eWz
 xEe
 fxn
@@ -42855,7 +43179,7 @@ uzm
 tab
 uzm
 rlf
-bwN
+uzm
 uzm
 uzm
 uzm
@@ -43240,10 +43564,10 @@ gNV
 kbt
 uzm
 iaP
+rku
 qLS
 qLS
-qLS
-tXh
+eZz
 gDZ
 qCs
 qCs
@@ -43435,9 +43759,9 @@ ddU
 piG
 iaP
 sAp
-dmA
-dmA
-dGV
+qLS
+qLS
+eZz
 gDZ
 qCs
 nUf
@@ -43818,15 +44142,15 @@ pRW
 jYr
 aKn
 rEk
-bta
-kNT
-bta
-rra
-bta
-bta
+xEQ
+anU
+esB
+jVx
 rEk
+cWd
+bsN
 eZz
-qLS
+uiJ
 qCs
 bje
 rTq
@@ -44012,13 +44336,13 @@ pRW
 jGe
 jYr
 rEk
-bta
-bta
-bta
-bta
-bta
-bta
+njM
+eVb
+eVb
+mJQ
 rEk
+uiJ
+bsN
 eZz
 eZz
 qCs
@@ -44206,19 +44530,19 @@ pRW
 pRW
 pRW
 rEk
-qPD
-bta
-bta
-bta
-bta
-bta
-qup
+voE
+kkx
+teD
+fzr
+rEk
+qLS
+qLS
 qLS
 eZz
-esB
+nxz
 xLD
-lif
-lif
+uAU
+uAU
 nxz
 xZH
 leL
@@ -44399,19 +44723,19 @@ pRW
 pRW
 pRW
 pRW
-ykN
-bta
-bta
-bta
-bta
-bta
-bta
 rEk
+rEk
+rEk
+vbg
+rEk
+rEk
+sAp
+qLS
 qLS
 eZz
-esB
-lif
+nxz
 lif
+uAU
 lif
 nxz
 xZH
@@ -44593,20 +44917,20 @@ pRW
 pRW
 pRW
 pRW
-ykN
-bta
-bta
-bta
-bta
-bta
-bta
 rEk
+xPU
 qLS
 eZz
-esB
-lif
-lif
-lif
+hpG
+qLS
+bug
+kCu
+rmb
+jKP
+nxz
+xMb
+uAU
+uAU
 nxz
 xZH
 leL
@@ -44787,17 +45111,17 @@ pRW
 pRW
 pRW
 pRW
-ykN
-bta
-bta
-bta
-bta
-bta
-uhj
 rEk
-wku
-eZz
-esB
+eXx
+joO
+rmb
+rmb
+rmb
+upo
+qLS
+qLS
+dqn
+nxz
 naI
 iJR
 kDx
@@ -44981,14 +45305,14 @@ pRW
 pRW
 pRW
 pRW
-ykN
-bta
-bta
-bta
-bta
-bta
-bta
 rEk
+vlq
+qLS
+qLS
+qLS
+uiJ
+qLS
+qLS
 qLS
 mVn
 jLH
@@ -45179,17 +45503,17 @@ wuh
 wuh
 wuh
 wuh
-tOv
-tOv
-tOv
-tOv
-aDU
+shF
+shF
+shF
+shF
+shF
 gqQ
-aDU
-aDU
-aDU
-aDU
-aDU
+xhN
+xhN
+xhN
+xhN
+xhN
 xZH
 leL
 pir
@@ -45369,21 +45693,21 @@ iXY
 iXY
 iXY
 iXY
-iXY
+rjO
 iXY
 iXY
 wuh
+rMY
+pOK
+xlf
 rPE
-rPE
-rPE
-rPE
-qJB
-jGc
-mff
-sxc
-oOy
-lgM
-aDU
+hkm
+jPs
+xhN
+sGw
+xNI
+jwr
+xhN
 gwe
 leL
 pir
@@ -45553,31 +45877,31 @@ iUL
 fDw
 wuh
 iXY
+vSl
+lYO
+lYO
+lYO
+vSl
+iXY
+iXY
 tdG
 sKL
 sKL
 sKL
 tdG
-iXY
-iXY
-iXY
-iXY
-iXY
-iXY
-iXY
 ehr
 wuh
 jEN
-yfx
-wrG
+xlf
+xlf
 uRz
-qoU
-jPs
-wxp
-sDb
-sDb
+hkm
+wlM
+xhN
+rSZ
+iTk
 tZV
-aDU
+xhN
 bbL
 leL
 uvj
@@ -45747,31 +46071,31 @@ vjg
 tUu
 wuh
 gmZ
+vSl
+oaN
+ctb
+wGx
+vSl
+iXY
+iXY
 tdG
 jAa
 qAH
 uWE
 tdG
 iXY
-iXY
-iXY
-iXY
-iXY
-iXY
-iXY
-iXY
 wuh
 blB
-ePx
+mrn
 qiz
-kRu
-qoU
+fRP
+hkm
 jPs
-rvC
-kBv
-xDs
-uAU
-aDU
+xhN
+xhN
+jgF
+xhN
+xhN
 kgM
 fPG
 pir
@@ -45941,32 +46265,32 @@ vjg
 pRW
 wuh
 iXY
+vSl
+tYv
+dym
+qmc
+vSl
+rXr
+xMm
 tdG
 ubg
 lwX
 gpG
 tdG
 iXY
-aFt
-sij
-iXY
-iXY
-iXY
-iXY
-iXY
 wuh
+wAQ
+toS
+qiz
 kRu
-nWc
-gnO
-kRu
-qoU
+hkm
 jPs
-mbv
-kBv
-vGd
-ulx
-qoU
-mzJ
+bWR
+fLp
+cZa
+nay
+xhN
+xZH
 puP
 pir
 cUi
@@ -46135,29 +46459,29 @@ fDw
 pRW
 wuh
 ptj
+vSl
+aKj
+qIH
+qIH
+vSl
+iXY
+wAS
 tdG
 ygR
 muW
 jhZ
 tdG
-iXY
-wAS
-iXY
-iXY
-iXY
-iXY
-iXY
 mcn
 wuh
 bWp
-pOK
-jBe
+toS
 fRP
-qJB
+fRP
+hkm
 uiK
 bpu
-yhJ
-qVI
+rQs
+rQs
 rQs
 hDH
 iIN
@@ -46328,33 +46652,33 @@ pRW
 fDw
 pRW
 wuh
-mLl
+iXY
+vSl
+hRx
+qIH
+hpq
+vSl
+sij
+uKF
 mne
 ceU
 tpp
 kxI
 tdG
 iXY
-uKF
-rQL
-iXY
-iXY
-iXY
-iXY
-iXY
 wuh
 mEb
-uRz
-jwx
-acY
+mFc
+xlf
+xlf
 tds
-lNT
-yfX
-drV
-drV
-oUd
-qoU
-mzJ
+cZa
+twO
+kSn
+cZa
+kSn
+xhN
+fSt
 xzc
 pir
 sRJ
@@ -46522,32 +46846,32 @@ pRW
 xeo
 jYr
 wuh
-ufN
+iXY
+xXl
+fTI
+qIH
+iVL
+vSl
+iXY
+eFf
 tdG
 gOb
 iRB
 jeT
 tdG
-iXY
-eFf
-iXY
-iXY
-iXY
-iXY
-iXY
 ehr
 wuh
 qDS
 jAA
-jag
+nWc
 mwk
-qJB
+hkm
 nin
-rOW
-jbh
-rEu
-wzB
-aDU
+umo
+kSn
+cZa
+acO
+xhN
 xZH
 tol
 pir
@@ -46716,32 +47040,32 @@ pRW
 jYr
 aKn
 wuh
-ufN
+iXY
+vSl
+aKK
+qIH
+agW
+vSl
+iXY
+eFf
 tdG
 sHr
 ifT
 eIe
 tdG
 iXY
-eFf
-iXY
-iXY
-iXY
-iXY
-iXY
-iXY
 wuh
 dPs
+osx
 dPs
 dPs
 dPs
-dPs
-izr
+qJB
 vaA
-aDw
-qoU
-cdn
-aDU
+rCg
+cZa
+kow
+xhN
 sDq
 tol
 pir
@@ -46910,34 +47234,34 @@ pRW
 xeo
 jYr
 wuh
-ufN
+iXY
+vSl
+ufL
+qIH
+agW
+vSl
+iXY
+eFf
 tdG
 cmR
 ifT
 eIe
 tdG
-iXY
-eFf
-vSl
-lYO
-lYO
-lYO
-vSl
 oDU
 wuh
 aBc
 cEd
 pvB
 jtk
-dPs
-qMz
-vaA
-biZ
-aDU
-oXi
-aDU
+mti
+qJB
+tXh
+wTc
+cZa
+kSn
+xhN
 kgM
-buX
+xzc
 xbH
 xZH
 qXh
@@ -47101,35 +47425,35 @@ pRW
 pRW
 pRW
 pRW
-fDw
+dlE
 pRW
 wuh
-ufN
+iXY
+vSl
+vSl
+vSl
+vSl
+vSl
+iXY
+eFf
 tdG
 tdG
 eum
 ofW
 tdG
 iXY
-eFf
-vSl
-oaN
-ctb
-wGx
-vSl
-iXY
 wuh
 dVA
-ekD
-eHs
+qcx
+qoU
 dqA
 dTQ
 bQe
-vaA
-kow
-qoU
-osx
-aDU
+cZa
+cZa
+cZa
+rCg
+acO
 kgM
 pXt
 fTU
@@ -47295,35 +47619,35 @@ pRW
 pRW
 pRW
 pRW
-vjg
+pqk
 pRW
 wuh
-dJV
+gmZ
+iXY
+tqt
+kLg
+tqt
+iXY
+iXY
+eFf
 tdG
 kRn
 bgM
 tMa
 tdG
 iXY
-eFf
-vSl
-tYv
-dym
-qmc
-vSl
-iXY
 wuh
 tgP
-ekD
+qcx
 hwP
 gQF
 pDx
 sFX
-dcu
-nYH
-prw
-tmi
-aDU
+cZa
+cEH
+kSn
+kSn
+aCg
 kgM
 pYt
 pYt
@@ -47489,35 +47813,35 @@ pRW
 pRW
 pRW
 pRW
-vjg
-tUu
-wuh
-ufN
+xuV
+nKd
+akl
+iXY
+iXY
+iXY
+iXY
+iXY
+iXY
+iXY
+eFf
 tdG
 tdG
 xJx
 cRB
 tdG
 iXY
-eFf
-vSl
-aKj
-qIH
-qIH
-vSl
-iXY
 wuh
 sVr
-eHs
+qcx
 tBn
-kZu
-dPs
-fmj
-fmj
+qcx
+dTQ
 dPs
-aDU
-aDU
-aDU
+cZa
+cEH
+kSn
+mIG
+mjy
 kgM
 pYt
 wHF
@@ -47683,35 +48007,35 @@ pRW
 pRW
 pRW
 pRW
-vjg
 pRW
-wuh
-ufN
+pRW
+rwh
+iWE
+uRN
+iXY
+iXY
+iXY
+iXY
+rXr
+bxW
 gCW
 buL
 qSx
 drT
 tdG
-rXr
-bxW
-vSl
-hRx
-qIH
-hpq
-vSl
 iXY
 wuh
 uNM
 nDz
 rLo
-aFS
+ePx
 xPu
-jwr
-fsN
 dPs
-lMH
-lMH
-lMH
+cZa
+kSn
+cJJ
+cJJ
+cJJ
 lMH
 pYt
 sKV
@@ -47877,33 +48201,33 @@ pRW
 pRW
 pRW
 pRW
-fDw
 pRW
-wuh
-ufN
+pRW
+dGV
+fsN
+iTn
+iXY
+iXY
+iXY
+iXY
+iXY
+eFf
 iXY
 rAq
 rAq
 rAq
 iXY
-iXY
-eFf
-xXl
-fTI
-qIH
-iVL
-vSl
 mcn
 wuh
 aGE
-hwN
+vyv
 otl
-aFS
-mIN
-qcx
-pqk
-dPs
-lMH
+fgA
+fgA
+fgA
+oRw
+xhN
+cJJ
 gic
 qBI
 lMH
@@ -48071,32 +48395,32 @@ pRW
 pRW
 mDp
 mDp
-vjg
-lIp
+xuV
+aDe
 wuh
-fip
-nmv
-nmv
-nmv
-nmv
-xMb
-rOn
+iXY
+iXY
+iXY
+iXY
+iXY
+iXY
+iXY
 eFf
-vSl
-aKK
-qIH
-agW
-vSl
+iXY
+iXY
+iXY
+iXY
+iXY
 iXY
 wuh
 qek
-eHs
-xkg
-aFS
+hwN
+ukf
+mlk
 veW
-qcx
-hWB
-dPs
+fgA
+cZa
+cZa
 lMH
 hMP
 evn
@@ -48267,20 +48591,20 @@ mDp
 mDp
 vjg
 mDp
-twR
-twR
-twR
-twR
-twR
-twR
-twR
-lAL
+wuh
+iXY
+iXY
+iXY
+nYH
+ejk
+nWj
+iXY
 eFf
-vSl
-ufL
-qIH
-agW
-vSl
+iXY
+iXY
+iXY
+iXY
+iXY
 mLl
 uWL
 rpH
@@ -48288,9 +48612,9 @@ dZs
 jCu
 aFS
 bol
-qcx
-vyv
-dPs
+fgA
+uuE
+cZa
 lMH
 lMH
 lCU
@@ -48462,29 +48786,29 @@ mDp
 vjg
 mDp
 twR
-bOW
-cyG
-fvb
-jrK
-ePB
 twR
-feE
+twR
+twR
+twR
+twR
+twR
+hkN
 rYq
-vSl
-vSl
-vSl
-vSl
-vSl
-ufN
+iXY
+iXY
+mLl
+nmv
+nmv
+wcT
 wuh
 wHf
 eHs
 xkg
 aZK
 pDn
-xue
-qNE
-dPs
+fgA
+cZa
+cZa
 lMH
 vIC
 vmT
@@ -48656,29 +48980,29 @@ mDp
 lIp
 mDp
 twR
-nJF
-oMq
-uDB
-hUh
-lIA
+bOW
+cyG
+fvb
+jrK
+ePB
 twR
-ufN
+feE
 eFf
 iXY
-tqt
-kLg
-tqt
 iXY
 ufN
-wuh
+gDV
+uhE
+haN
+aDU
 vkn
 uJx
 aHA
 vkn
 vkn
 vkn
-vkn
-vkn
+nms
+buX
 lMH
 cgt
 fCZ
@@ -48850,31 +49174,31 @@ pRW
 xeo
 jYr
 twR
-oWf
-oMq
+nJF
 oMq
-qia
-rdb
+uDB
+hUh
+lIA
 twR
-fip
+xgT
 phB
 uOU
 iXY
-iXY
-iXY
-iXY
 ufN
-wuh
+yhp
+eHQ
+sxc
+aDU
 sBr
-oNw
+mLm
 cZe
 tBN
 fNj
-kad
-cNA
 wzV
+cZa
+cZa
 lMH
-ukb
+yfX
 ukb
 vOS
 pYt
@@ -49044,29 +49368,29 @@ pRW
 jYr
 aKn
 twR
-wqT
+oWf
 oMq
-tGp
-jAe
-bhw
-twR
-twR
+oMq
+qia
+rdb
 twR
+hSq
+iXY
 vMB
 gqj
 gUu
 sGH
-nmv
+qNM
 avQ
-wuh
+aDU
 bBM
-mLm
-cQm
 gDP
-eEO
+cQm
 vdN
 ipL
 wzV
+cDY
+cZa
 lMH
 vxy
 ukb
@@ -49238,29 +49562,29 @@ pRW
 xeo
 jYr
 twR
-xuV
-heJ
-heJ
-lCC
-heJ
-xJa
-jtn
+wqT
+oMq
+tGp
+jAe
+bhw
+twR
 twR
+ptj
 fko
 iXY
-qIo
-ufN
 iXY
+cDv
+aDU
 xTv
-wuh
+aDU
 jwQ
-oNw
-eBy
 mJK
-uUR
+eBy
 bTA
 mmw
 wzV
+cEH
+cZa
 lMH
 iON
 ukb
@@ -49433,28 +49757,28 @@ fDw
 pRW
 twR
 jcl
-djB
-szw
-qbG
-iTn
-ejk
-nNn
+heJ
+heJ
+lCC
+heJ
+xJa
 twR
+iXY
 wCE
 pmy
-xMm
-ufN
-iXY
+cLq
+lRx
+qNM
 lag
-wuh
-dVh
-sDX
-fRJ
+aDU
+kNT
 fTB
-fGh
+fRJ
 heO
 oNw
 wzV
+adi
+cZa
 lMH
 new
 ukb
@@ -49464,7 +49788,7 @@ mlz
 xgS
 lMH
 cVy
-rqN
+xlC
 cpz
 syH
 nKI
@@ -49627,28 +49951,28 @@ jON
 tUu
 twR
 fjp
-nNn
-nNn
-nNn
+djB
+szw
+qbG
 vxE
 xyJ
-leF
 twR
+qpi
 sTR
-iXY
+biZ
 lRw
 fSr
-iXY
-nWj
-wuh
-sBr
+nVC
+evc
+aDU
+dVh
 npS
 fLU
 aBU
 uMs
-lmr
-xIS
 wzV
+kSn
+cZa
 lMH
 evB
 ukb
@@ -49827,22 +50151,22 @@ qKQ
 twR
 mYS
 twR
-twR
-xJv
-wuh
-wuh
-wuh
 wuh
+xJv
 wuh
 wuh
+aDU
+aDU
+aDU
+aDU
+xue
 wzV
-wzV
-mIP
 mIP
+kad
 xYM
-mIP
-mIP
 wzV
+acO
+cZa
 lMH
 skT
 ukb
@@ -50024,27 +50348,27 @@ vRv
 tbF
 pJe
 rOM
-gLK
+tOv
 etR
 kDo
-uJr
-juy
-feq
-mSw
+kDo
+qMz
+hlc
+tOv
 ekJ
 xLm
 gXm
-xLm
-dIt
 hdh
+bUP
+cZa
 lMH
-nqP
-ukb
-wcT
-ukb
+cBD
 ukb
-iwp
-lMH
+ghV
+jYY
+kff
+fUR
+hkE
 qwg
 gLQ
 aAA
@@ -50208,37 +50532,37 @@ pRW
 jON
 pRW
 mSw
-bgH
-txc
-txc
-bPg
+wrG
+rER
+pOu
+rER
 sOt
 ldo
-hkm
-hkm
+uhv
+uhv
 atT
 itn
-rER
-rER
-pOu
-rER
-rER
+vXN
 hlc
-jon
+kBv
+cNA
+hlc
+hlc
+pdF
 gNj
 wnA
 tqv
-wnA
-jEc
 hdh
-lMH
-cBD
-ukb
-ghV
-jYY
-kff
-fUR
-hkE
+cZa
+cZa
+cJJ
+cJJ
+cJJ
+cJJ
+cJJ
+cJJ
+cJJ
+cJJ
 cnt
 lRP
 tlS
@@ -50403,36 +50727,36 @@ fDw
 pRW
 mSw
 moz
-txc
-txc
-txc
-gqw
-vsY
-txc
-txc
-fYP
-lQq
-gdU
-gdU
-gdU
-jSX
 rER
 rER
-jon
+jSX
+gdU
+soE
+lEM
+lEM
+fYP
+lQq
+tOv
+xMc
+wku
+mff
+rTD
+dAP
+pdF
 aHh
 atw
 nfA
-pjE
-xlv
 hdh
-cJJ
-cJJ
-cJJ
-cJJ
-cJJ
-cJJ
-cJJ
-cJJ
+mNI
+kSn
+xhN
+xHO
+jtW
+oNa
+tkT
+jBe
+uPG
+xhN
 xtI
 rZg
 swv
@@ -50596,38 +50920,38 @@ pRW
 jON
 pRW
 jon
-bHV
-txc
-dHW
+pkW
+vDo
+pfu
 kDM
-ccA
+ibL
 vsY
 sxY
 sWe
 pJe
-wRS
-sjO
-vDo
-pfu
-pyb
+itn
+tOv
+dAP
+ulx
+nnu
 gtZ
-pHB
-jon
+dAP
+pdF
 wjW
 wnA
-lXM
-wnA
-kiP
+pZR
 hdh
-nCY
-che
-dOT
-hvh
-dOT
-che
-wgN
-eyn
-mXi
+cZa
+kSn
+xhN
+hzu
+kSn
+kSn
+kSn
+kSn
+kSn
+xhN
+txu
 ndp
 sid
 syH
@@ -50791,38 +51115,38 @@ kYu
 fDw
 jon
 lKH
-txc
+rER
 wEw
-kur
-ccA
+ptR
+vlO
 vsY
 uUl
 uUl
 pJe
-lnj
-vMr
-rER
+itn
+tOv
+til
 fJl
-vlO
-rER
+dmA
+hlc
 pHB
-mSw
+tOv
 oGT
 xlg
-daE
-xlg
-dip
+dIt
 hdh
-pwn
-pwn
-lRx
-yhp
-aaY
-pwn
-pwn
-eNB
+cZa
+mnn
+jgF
+kSn
+kSn
+kSn
+kSn
+kSn
+ays
+xhN
 rcz
-kXK
+xiG
 avK
 syH
 kSn
@@ -50984,37 +51308,37 @@ pRW
 jON
 pRW
 mSw
-xMc
-txc
+lKH
+rER
 hDl
-kQS
-ccA
+ptR
+izr
 vsY
 qzI
 qzI
 pJe
-lnj
-vMr
-rER
-qDe
+itn
+tOv
+mXi
+hlc
 sbx
-rER
+bqs
 umx
-mSw
+tOv
 noW
 pzs
 bLd
-wnA
-hmk
 hdh
-uRN
-twA
-aIZ
-uhE
-aIZ
+nms
+uAV
+xhN
+bUP
+lkP
+kSn
+sMN
 aIZ
-pdF
-eNB
+oNa
+xhN
 uZv
 esx
 qBG
@@ -51178,39 +51502,39 @@ pRW
 jON
 pRW
 jon
-vCC
-txc
+lKH
+nVg
 bhP
 ifE
-ccA
+jag
 vsY
 lKt
 uUl
 pJe
-lnj
-vMr
-nVg
+itn
+tOv
+hXO
 pdT
-nrZ
+ykp
 etZ
 ffW
-jon
+pdF
 waA
 xlg
-daE
-xlg
-tyv
-hrS
-til
-aIZ
-aIZ
-qWd
-aIZ
-aIZ
-ays
-iDE
+dIt
+hdh
+cZa
+xhN
+xhN
+xhN
+xhN
+xhN
+xhN
+xhN
+xhN
+xhN
 tBY
-xiG
+kXK
 jbI
 syH
 kSn
@@ -51373,36 +51697,36 @@ fDw
 pRW
 jon
 bHV
-txc
+rER
 wmU
-ymc
-ccA
-vsY
-uUl
-tvT
-pJe
-wRS
-evc
 rER
-pHB
+uxX
+xyh
+sIY
+tvT
+wzB
+hfw
+tOv
+tOv
+tOv
 kOw
-rER
-rER
-jon
+tOv
+tOv
+tOv
 rXa
-wnA
+lye
 mii
-kKO
-qvo
-wfZ
-mlk
-lkP
-lkP
-nsH
-sMN
-sMN
-gLZ
-jLP
+hdh
+fvQ
+qpd
+nCY
+che
+dOT
+hvh
+dOT
+che
+wgN
+hOq
 eja
 vCG
 swv
@@ -51567,37 +51891,37 @@ xeo
 jYr
 mSw
 uzS
-txc
-txc
-txc
+rER
+rER
+rER
 wHG
 vsY
 txc
 txc
 pJe
-lnj
-eIB
-rER
-rER
-ptR
-tHq
-rER
+rjY
+sUL
+sUL
+sUL
+nqP
+sUL
+sUL
 jon
-waA
-xlg
-daE
+rBZ
 xlg
-hzu
-hrS
-aIZ
-aIZ
-aIZ
-dZb
-aIZ
-aIZ
-aIZ
-iDE
-ujU
+dIt
+hdh
+aAy
+eNB
+qlx
+qlx
+cna
+gFc
+ryd
+qlx
+qlx
+eNB
+gKi
 xiG
 hLN
 syH
@@ -51760,38 +52084,38 @@ pRW
 jYr
 aKn
 mSw
-bgH
+nme
+rER
+rER
+juy
+aaY
+vsY
 txc
 txc
+pJe
 txc
 txc
-vsY
 txc
 txc
-pJe
-lnj
-tcb
-egp
-egp
-bqs
-qMP
-fgA
-mSw
-vZG
+pZg
+txc
+txc
+wRS
+xlg
 wnA
 lXM
-wnA
-boI
 hdh
+boI
 eNB
+qHt
+wDp
+lDd
+oOy
+lDd
+lDd
+cPz
 eNB
-uiJ
-kwo
-uiJ
-xcE
-uiJ
-eNB
-tES
+qxm
 xiG
 avK
 syH
@@ -51954,37 +52278,37 @@ pRW
 xeo
 jYr
 mSw
-mJv
-txc
-txc
-txc
-txc
+sjO
+ili
+jst
+ili
+ili
 rZY
-rMY
-qmY
+mBo
+mBo
 shT
 xCV
 tdk
 tdk
-tdk
+tVX
 sTs
 pJR
-tdk
+mbv
 hrc
 izO
-pZg
+kQS
 cmi
 dyR
-cDv
-tVX
-vKr
-vKr
-vKr
-vKr
-apt
-vKr
-gal
-hdh
+hWB
+hrS
+dZb
+lDd
+lDd
+hzi
+lDd
+lDd
+oUd
+tEQ
 sZQ
 xiG
 vzm
@@ -52148,39 +52472,39 @@ pRW
 fDw
 pRW
 mSw
-gSF
-eWe
-uUl
-uUl
+mJv
 txc
-scZ
 txc
 txc
-sEz
-shF
-uhv
-hOq
-nVC
-qPi
-uqr
-pDb
-hLw
-qAh
-jhH
+txc
+txc
+txc
+txc
+dJc
+aTk
+txc
+aec
+sSl
+ldm
+uKk
+ldm
+ldm
+mjB
+hUF
 dLj
 aDs
-jhH
-pVz
-jhH
-xlC
-jhH
-jhH
-fva
-jhH
-jhH
-nme
-ukf
-emK
+nNn
+wfZ
+rvC
+pUj
+pUj
+pyh
+vng
+vng
+ieQ
+bJh
+lAL
+atS
 bAI
 syH
 kSn
@@ -52339,43 +52663,43 @@ pRW
 pRW
 pRW
 pRW
-jON
-tUu
+vjg
+pRW
 mSw
-bgH
+lea
+uUl
 uUl
 uUl
-uVS
-txc
-scZ
-txc
 txc
 txc
-poa
 txc
-rlz
-sSl
+cBK
+kIg
+aTk
+cBK
+wAe
 ldm
-uKk
 ldm
+oXV
+hJm
 ldm
-mjB
-hUF
-qwK
+cmw
+cmw
+hUc
 wki
 mhO
-xDr
-mhO
-lAm
-pZg
-pZg
-lfJ
-pZg
-pZg
-tEQ
+eNB
+lDd
+lDd
+lDd
+iZj
+lDd
+lDd
+lDd
+eNB
 dns
-xlf
-swv
+xiG
+sid
 syH
 kSn
 syH
@@ -52533,40 +52857,40 @@ pRW
 pRW
 pRW
 pRW
-jON
+vjg
 pRW
 mSw
-lwA
-txc
+mJv
+uUl
+uUl
+uUl
 txc
 txc
-vVA
-scZ
 txc
-ubA
-ubA
-poa
-ubA
-wAe
-ldm
-ldm
-oXV
-hJm
+cBK
+kIg
+aTk
+cBK
+des
 ldm
-cmw
-cmw
-nKd
-rwh
-wnA
-nkT
-trd
-hUF
-pUj
-pyh
-hUF
-vng
-ieQ
-hdh
+sDc
+orm
+nFa
+nzA
+omy
+rxO
+bJS
+fip
+lAm
+eNB
+eNB
+eNB
+hrS
+bvE
+hrS
+iSL
+hrS
+eNB
 nJu
 nQm
 wtj
@@ -52727,41 +53051,41 @@ pRW
 pRW
 pRW
 pRW
-kYu
-fDw
+nHC
+pRW
 mSw
-mJv
-uUl
-uUl
-uUl
-ccA
+gSF
+txc
+txc
+txc
+txc
 scZ
 txc
-kxv
-kxv
-poa
-kxv
-des
+cBK
+kIg
+aTk
+cBK
+laQ
 ldm
-sDc
-orm
-nFa
+eDd
+eKq
 nzA
-omy
-rxO
+qlg
+ffP
+cmw
 bJS
-rwh
-wnA
-nkT
-hXO
-lGM
-kXD
-bvE
-dAP
-iSL
-bvE
-hdh
-lye
+kFu
+dcu
+iwp
+vKr
+vKr
+apt
+vKr
+vKr
+apt
+gal
+atU
+qxm
 kMk
 kYx
 syH
@@ -52921,40 +53245,40 @@ pRW
 pRW
 pRW
 pRW
-jON
-pRW
+vjg
+jRe
 mSw
 bgH
-oOV
+eWe
 uUl
 uUl
-kpn
-dgn
-czr
-lEM
-lEM
-ldK
-kTN
-laQ
+txc
+scZ
+txc
+txc
+sEz
+oXi
+uhv
+mpt
 ldm
-eDd
+sFW
 eKq
 nzA
-qlg
-ffP
+ate
+iSP
 cmw
 bJS
-rwh
+gLK
 wnA
-nkT
-cDv
-vKr
-apt
-vKr
-vKr
-apt
-gal
-hdh
+egp
+wnA
+wnA
+wnA
+wnA
+wnA
+wnA
+wnA
+bTd
 kGf
 kSN
 prZ
@@ -53115,39 +53439,39 @@ pRW
 pRW
 pRW
 pRW
-jON
+vjg
 pRW
 mSw
-ncP
-txc
-txc
-txc
-tbT
+lwA
+uUl
+uUl
+uVS
+vVA
 scZ
 txc
-tbK
-tbK
-ccA
-tbK
-mpt
+ubA
+ubA
+poa
+ubA
+qIr
 ldm
-sFW
-eKq
+gnO
+xTf
+nFa
 nzA
-ate
-iSP
-cmw
-bJS
+omy
+rxO
+rHI
 cmE
-hzi
+cPy
 jdF
-hzi
+wKr
 mFW
-hzi
-hzi
+kQS
+kQS
 oYC
-hzi
-hzi
+tyl
+kQS
 flt
 fTy
 imI
@@ -53309,32 +53633,32 @@ pRW
 pRW
 pRW
 pRW
-fDw
+nHC
 pRW
 jon
 mJv
-lKt
-oOV
-uUl
-tbT
-scZ
 txc
-tbK
-tbK
+txc
+txc
 ccA
-tbK
-qIr
+scZ
+txc
+kxv
+kxv
+poa
+kxv
+elJ
 ldm
-qLx
-xTf
-nFa
-nzA
-omy
-rxO
-bJS
-jPe
+ldm
+lqE
+sXC
+ldm
+cmw
+cmw
+feq
+dTZ
 wnA
-nkT
+egp
 wnA
 tdj
 wnA
@@ -53503,34 +53827,34 @@ pRW
 pRW
 pRW
 pRW
-fDw
+nHC
 pRW
 jon
-edk
-uUl
+bgH
+vAk
+tcb
 uUl
-lKt
-tbT
-scZ
-txc
-aOG
-aOG
-ccA
-aOG
-elJ
+kpn
+dgn
+czr
+lEM
+lEM
+ldK
+kTN
+rjY
+xai
 ldm
+tdr
 ldm
-lqE
-sXC
 ldm
-cmw
-cmw
-nKd
-jPe
-wnA
-nkT
+oOI
+vKr
+amY
+tVF
 trd
+cdn
 hUF
+xcE
 fDt
 vZr
 fhx
@@ -53700,37 +54024,37 @@ pRW
 kYu
 lIp
 jon
-xKi
-txc
-txc
-txc
-mKJ
+ncP
+oOV
+uUl
+uUl
+tbT
 scZ
 txc
+tbK
+tbK
+ccA
+tbK
 txc
-txc
-aUM
-xGr
 rjY
-xai
-ldm
-tdr
-ldm
-ldm
-oOI
-vKr
+cyr
+sUL
+sUL
+aqN
 oyU
-jPe
 wnA
 nkT
+jPe
 jYU
-hdh
-hdh
-hdh
-hdh
-hdh
-hdh
-hdh
+fva
+fva
+mIN
+sVH
+sVH
+sVH
+sVH
+sVH
+sVH
 hVB
 bBc
 bxI
@@ -53894,36 +54218,36 @@ pRW
 jON
 pRW
 mSw
-tXt
+mJv
 txc
 txc
-aec
-fil
-jzp
-rlm
 txc
+tbT
+scZ
 txc
-ouS
+tbK
+tbK
+ccA
+tbK
 txc
 txc
-rjY
-cyr
-sUL
-sUL
-eBl
-oyU
+ogP
+ogP
+txc
+txc
+wnA
 wnA
 pQh
 nyi
-wnA
-xng
 kPT
-hdh
-rMi
-rMi
-rMi
-rMi
+fva
+fju
+lUu
 rMi
+ovN
+qVv
+xhD
+xvZ
 rMi
 wqp
 eTr
@@ -54088,36 +54412,36 @@ pRW
 jON
 tUu
 mSw
-neg
-nbW
-qGu
-buN
-mSw
-hus
-xPj
-kcR
-xPj
-rrZ
-dSm
-rrZ
-rrZ
-rrZ
-rrZ
-xPj
+edk
+lKt
+oOV
+uUl
+tbT
+scZ
+txc
+aOG
+aOG
+ccA
+aOG
+txc
+txc
+ogP
+ogP
+txc
 qmQ
 qwK
 qSv
-qSv
+jbh
 nAS
-wnA
-xng
 qBU
-hdh
+fva
+qmY
+lUu
 rMi
-ovN
-qVv
-xhD
-xvZ
+nBf
+vfa
+vfa
+vfa
 rMi
 jMM
 oxG
@@ -54282,36 +54606,36 @@ pRW
 jON
 pRW
 mSw
-mSw
-mSw
-jon
-jon
-mSw
-wIy
-nRo
-jon
-hcH
-wQu
-oFO
-oFO
-oFO
-oFO
-vZR
-oFO
+xKi
+uUl
+uUl
+lKt
+mKJ
+scZ
+txc
+txc
+txc
+aUM
+xGr
+txc
+txc
+fml
+fml
+txc
 mSw
 rdv
 pWS
-pWS
+jhH
 kWu
-wnA
+dld
 xng
-tdf
-hdh
+jbC
+lUu
 rMi
-nBf
-vfa
-vfa
-vfa
+edb
+adB
+bno
+kaW
 rMi
 bCv
 aCi
@@ -54319,7 +54643,7 @@ mdJ
 cGV
 cGV
 cGV
-cGV
+teG
 ilD
 tMF
 kKQ
@@ -54475,37 +54799,37 @@ pRW
 pRW
 jON
 mDp
-csb
-aaK
-csb
-aaK
-csb
-jon
-qAl
-rJy
-jon
-rJy
-jpo
-oFO
-csb
-aaK
-csb
-aaK
-csb
 mSw
+tXt
+txc
+txc
+aec
+fil
+jzp
+rlm
+txc
+txc
+ouS
+txc
+txc
+txc
+txc
+txc
+txc
+jwx
 vvO
 ciU
 agT
 wkI
-hUF
-tkT
-lUu
-hdh
+vCC
+fva
+qWd
+dJV
 rMi
-edb
-adB
-bno
-kaW
+kke
+qsL
+crj
+qwY
 rMi
 nEQ
 bBc
@@ -54669,39 +54993,39 @@ pRW
 pRW
 fDw
 fDw
-aaK
-aaK
-aaK
-aaK
-aaK
-vaR
-bMN
-epe
-vaR
-epe
-wZh
-vaR
-aaK
-aaK
-aaK
-aaK
-aaK
 mSw
-hrS
-hdh
+neg
+nbW
+qGu
+buN
+mSw
+hus
+xPj
+kcR
+xPj
+rrZ
+dSm
+rrZ
+rrZ
+rrZ
+xPj
+xPj
+mSw
 hdh
 hdh
-rmb
 hdh
 hdh
 hdh
+fva
+lUu
+fju
+iID
+iID
 rMi
-kke
-qsL
-crj
-qwY
+gTq
 rMi
-sTd
+rMi
+tMd
 bBc
 trg
 wXO
@@ -54863,38 +55187,38 @@ pRW
 pRW
 pRW
 pRW
-csb
-csb
-csb
-csb
-csb
-csb
-csb
-csb
-csb
-csb
-csb
-csb
-csb
-csb
-csb
-csb
-csb
-csb
-cih
-eAp
-fju
+mSw
+mSw
+mSw
+jon
+jon
+mSw
+wIy
+nRo
+jon
+hcH
+wQu
+oFO
+oFO
+oFO
+oFO
+vZR
+oFO
+kKO
 fju
+tBG
 mIk
+sDb
+qWd
+wss
+dJV
 fju
-yab
-yab
-iID
-iID
-rMi
-gTq
-rMi
-rMi
+hFO
+kZu
+pMS
+kur
+rOW
+pwn
 sTd
 bBc
 sid
@@ -55057,37 +55381,37 @@ pRW
 pRW
 pRW
 pRW
-qDH
-mDp
-mDp
-aDe
-csb
-csb
-csb
-csb
-csb
-csb
-csb
-csb
-csb
 csb
+aaK
 csb
+aaK
 csb
+jon
+qAl
+rJy
+jon
+rJy
+jpo
+oFO
 csb
+aaK
 csb
+aaK
 csb
-eAp
+kKO
 fju
 fju
-mIk
 fju
+yab
+lUu
+fju
+fju
+qmY
 ewu
-ykp
-eHQ
-qpi
-aqN
-pkW
-wAQ
+uIh
+oyF
+jvb
+rks
 vaf
 sTd
 bBc
@@ -55251,37 +55575,37 @@ pRW
 pRW
 pRW
 pRW
-lIp
-mDp
-mDp
-aDe
-csb
-csb
-csb
-csb
-csb
-csb
-csb
-csb
-csb
-csb
-csb
-csb
-csb
-csb
-csb
-eAp
+aaK
+aaK
+aaK
+aaK
+aaK
+vaR
+bMN
+epe
+vaR
+epe
+wZh
+vaR
+aaK
+aaK
+aaK
+aaK
+qPi
+kKO
 fju
 fju
-mIk
+fju
+yab
+izs
 fju
 ewu
 sms
-fUB
-uIh
+ewu
+rme
 oyF
-jvb
-rks
+mkn
+jHr
 vaf
 sTd
 oxG
@@ -55445,10 +55769,6 @@ pRW
 pRW
 pRW
 pRW
-lIp
-mDp
-mDp
-aDe
 csb
 csb
 csb
@@ -55459,21 +55779,25 @@ csb
 csb
 csb
 csb
-poe
 csb
 csb
 csb
 csb
-eAp
-fju
+csb
+csb
+csb
+fva
+kdG
 fju
-mIk
+lgM
+yab
+lUu
 fju
-ewu
-ibL
-fUB
-rme
-oyF
+soz
+lfy
+lfy
+tkJ
+cBe
 mkn
 jHr
 vaf
@@ -55640,8 +55964,8 @@ pRW
 pRW
 pRW
 qDH
-lIp
-lIp
+mDp
+mDp
 aDe
 csb
 csb
@@ -55656,21 +55980,21 @@ csb
 csb
 csb
 csb
-csb
-csb
-eAp
-fju
-fju
-mIk
-mIk
-soz
-lfy
-lfy
-tkJ
-cBe
+fva
+nJE
+fGh
+acY
+yab
+rOn
+dMH
+ewu
+pgJ
+syZ
+syZ
+rEX
 mkn
 jHr
-vaf
+pwq
 sTd
 bBc
 sid
@@ -55836,9 +56160,7 @@ pRW
 lIp
 mDp
 mDp
-lIp
-csb
-csb
+aDe
 csb
 csb
 csb
@@ -55852,19 +56174,21 @@ csb
 csb
 csb
 csb
-eAp
-fju
-fju
-fju
+fva
+fva
+yab
+yab
+yab
 fju
+lUu
 ewu
-pgJ
-syZ
-syZ
+tQn
 syZ
-mkn
-jHr
-pwq
+lGM
+eGx
+eTv
+cLn
+qQD
 sXK
 bBc
 sid
@@ -56030,8 +56354,7 @@ pRW
 lIp
 mDp
 mDp
-lIp
-csb
+aDe
 csb
 csb
 csb
@@ -56042,23 +56365,24 @@ csb
 csb
 csb
 csb
+poe
 csb
 csb
 csb
 csb
 eAp
-eAp
-eAp
-eAp
-eAp
+lmr
+fju
+fju
+lUu
 ewu
-tQn
 syZ
-eGx
-rEX
-eTv
-cLn
-qQD
+qMP
+hmk
+jLP
+nvp
+mwA
+sQO
 oBe
 qBQ
 xXa
@@ -56222,19 +56546,6 @@ mDp
 pRW
 pRW
 qDH
-mDp
-mDp
-lIp
-aDe
-aDe
-aDe
-lIp
-aDe
-aDe
-aDe
-aDe
-aDe
-aDe
 lIp
 lIp
 aDe
@@ -56244,15 +56555,28 @@ csb
 csb
 csb
 csb
-cih
+csb
+csb
+csb
+csb
+csb
+csb
+csb
+csb
+csb
+eAp
+jtn
+fju
+fju
+lUu
 ewu
-ili
-upo
-xPU
-lin
-nvp
-mwA
-sQO
+eVN
+eVN
+eVN
+eVN
+wOA
+twA
+eVN
 woK
 nTO
 thA
@@ -56419,19 +56743,6 @@ lIp
 mDp
 mDp
 lIp
-mDp
-mDp
-lIp
-mDp
-mDp
-mDp
-mDp
-mDp
-lIp
-mDp
-mDp
-mDp
-aDe
 csb
 csb
 csb
@@ -56439,13 +56750,26 @@ csb
 csb
 csb
 csb
+csb
+csb
+csb
+csb
+csb
+csb
+csb
+cih
+eAp
+yfx
+fju
+fju
+lUu
 mfy
+viP
+miE
+lpl
 qbT
-qbT
-qbT
-qbT
-xSu
-nJE
+bzu
+iPO
 jiy
 eUA
 pAU
@@ -56610,22 +56934,9 @@ mDp
 pRW
 pRW
 lIp
+mDp
+mDp
 lIp
-lIp
-qDH
-lIp
-lIp
-qDH
-lIp
-lIp
-qDH
-lIp
-lIp
-qDH
-lIp
-lIp
-qDH
-aDe
 csb
 csb
 csb
@@ -56633,13 +56944,26 @@ csb
 csb
 csb
 csb
+csb
+csb
+csb
+csb
+csb
+csb
+csb
+csb
+eAp
+ymb
+qVI
+tES
+dJV
 mfy
-viP
-miE
-lpl
+shN
+shN
+wZP
 qbT
-bzu
-iPO
+vZG
+pPi
 jiy
 fpw
 nkY
@@ -56803,36 +57127,36 @@ pRW
 mDp
 mDp
 mDp
+qDH
 mDp
 mDp
-mDp
-mDp
-mDp
-mDp
-mDp
-mDp
-mDp
-pRW
-pRW
-pRW
-pRW
-pRW
-pRW
-pRW
-pRW
-csb
-csb
-csb
-csb
-csb
+lIp
+aDe
+aDe
+aDe
+lIp
+aDe
+aDe
+aDe
+aDe
+aDe
+aDe
+lIp
+lIp
+aDe
 csb
 csb
+eAp
+lgM
+fju
+mIk
+eyn
 mfy
-shN
-shN
-wZP
+cjp
+agG
+edp
 qbT
-mti
+jUs
 pPi
 jiy
 tMK
@@ -56997,37 +57321,37 @@ pRW
 mDp
 mDp
 mDp
+lIp
 mDp
 mDp
+lIp
 mDp
 mDp
+lIp
 mDp
-gtM
 mDp
 mDp
 mDp
 mDp
+lIp
 mDp
-pRW
-pRW
-pRW
-pRW
-pRW
-pRW
-csb
-csb
-csb
-csb
-csb
+mDp
+mDp
+aDe
 csb
 csb
+eAp
+fju
+fju
+mIk
+qAh
 mfy
-cjp
-agG
-edp
-qbT
-jUs
-pPi
+vXB
+uAl
+rEa
+stc
+xut
+emK
 jiy
 xxb
 nTO
@@ -57191,36 +57515,36 @@ pRW
 mDp
 mDp
 mDp
-mDp
-mDp
-mDp
-mDp
-mDp
-mDp
-mDp
-mDp
-mDp
-mDp
-mDp
-mDp
-mDp
-mDp
-mDp
-pRW
-pRW
-csb
-csb
-csb
-csb
-csb
+lIp
+lIp
+lIp
+qDH
+lIp
+lIp
+qDH
+lIp
+lIp
+qDH
+lIp
+lIp
+qDH
+lIp
+lIp
+qDH
+aDe
 csb
 csb
+eAp
+qmY
+fju
+mIk
+uqr
 mfy
-vXB
-uAl
-rEa
-stc
-xut
+dKV
+hHX
+qaZ
+qbT
+hoH
 hgm
 jiy
 tMK
@@ -57404,18 +57728,18 @@ pRW
 pRW
 csb
 csb
-csb
-csb
-csb
-csb
-csb
+eAp
+fju
+fju
+mIk
+wIT
 mfy
-dKV
-hHX
-qaZ
 qbT
-hoH
-iPO
+qbT
+qbT
+qbT
+yhJ
+jiy
 jiy
 luz
 nTO
@@ -57598,19 +57922,19 @@ pRW
 pRW
 csb
 csb
-csb
-csb
-csb
-csb
-csb
-rBZ
-fOe
-fOe
-fOe
-fOe
-vAk
+eAp
+jbC
+fju
+mIk
+mIk
+mIk
+mIk
+tBG
+mIk
+mIk
+fju
 dky
-jiy
+rBG
 sBa
 oxV
 rCX
@@ -57790,185 +58114,182 @@ mDp
 mDp
 pRW
 pRW
+jGe
+jYr
+eAp
+qmY
+fju
+fju
+fju
+fju
+fju
+fju
+fju
+mIk
+mIk
+fju
+rBG
+tMK
+nTO
+nRf
+ddk
+ddk
+ddk
+ddk
+fLu
+ddk
+bzp
+bzp
+bzp
+bzp
+bzp
+aPr
+rSp
+eSJ
+hqP
+puw
+mYK
+wjt
+mYK
+xIc
+hqP
+tOV
+tOV
+hLd
+pCQ
+tOV
+tOV
+hLd
+pCQ
 pRW
 pRW
 pRW
-jGe
-jYr
-csb
-cPI
-fOe
-pMS
-uwI
-miH
-fOe
-mti
-qNM
-jiy
-tMK
-nTO
-nRf
-ddk
-ddk
-ddk
-ddk
-fLu
-ddk
-bzp
-bzp
-bzp
-bzp
-bzp
-aPr
-rSp
-eSJ
-hqP
-puw
-mYK
-wjt
-mYK
-xIc
-hqP
-tOV
-tOV
-hLd
-pCQ
-tOV
-tOV
-hLd
-pCQ
-pRW
-pRW
-pRW
-mDp
-rlr
-toI
-juL
-mDp
-rlr
-toI
-juL
-mDp
-rlr
-toI
-juL
-mDp
-rlr
-toI
-juL
-lIp
-lIp
-pRW
-pRW
-pRW
-pRW
-pRW
-pRW
-pRW
-pRW
-pRW
-pRW
-pRW
-pRW
-pRW
-pRW
-pRW
-pRW
-pRW
-pRW
-pRW
-pRW
-pRW
-pRW
-pRW
-pRW
-pRW
-pRW
-pRW
-pRW
-pRW
-pRW
-pRW
-pRW
-pRW
-pRW
-pRW
-pRW
-pRW
-pRW
-pRW
-pRW
-mDp
-mDp
-mDp
-mDp
-mDp
-mDp
-mDp
-mDp
-mDp
-mDp
-mDp
-"}
-(111,1,1) = {"
-mDp
-mDp
-mDp
-mDp
-mDp
-mDp
-mDp
-mDp
-mDp
-mDp
-mDp
-mDp
-mDp
-mDp
-mDp
-mDp
-mDp
-mDp
-mDp
-mDp
-mDp
-mDp
-mDp
-mDp
-mDp
-mDp
-mDp
-mDp
-mDp
-mDp
-mDp
-mDp
-mDp
-mDp
-mDp
-mDp
-mDp
-mDp
-mDp
-mDp
-mDp
-mDp
-mDp
-mDp
-mDp
-mDp
-mDp
-mDp
-mDp
-mDp
-mDp
-mDp
-mDp
-pRW
-pRW
-pRW
-pRW
-pRW
+mDp
+rlr
+toI
+juL
+mDp
+rlr
+toI
+juL
+mDp
+rlr
+toI
+juL
+mDp
+rlr
+toI
+juL
+lIp
+lIp
+pRW
+pRW
+pRW
+pRW
+pRW
+pRW
+pRW
+pRW
+pRW
+pRW
+pRW
+pRW
+pRW
+pRW
+pRW
+pRW
+pRW
+pRW
+pRW
+pRW
+pRW
+pRW
+pRW
+pRW
+pRW
+pRW
+pRW
+pRW
+pRW
+pRW
+pRW
+pRW
+pRW
+pRW
+pRW
+pRW
+pRW
+pRW
+pRW
+pRW
+mDp
+mDp
+mDp
+mDp
+mDp
+mDp
+mDp
+mDp
+mDp
+mDp
+mDp
+"}
+(111,1,1) = {"
+mDp
+mDp
+mDp
+mDp
+mDp
+mDp
+mDp
+mDp
+mDp
+mDp
+mDp
+mDp
+mDp
+mDp
+mDp
+mDp
+mDp
+mDp
+mDp
+mDp
+mDp
+mDp
+mDp
+mDp
+mDp
+mDp
+mDp
+mDp
+mDp
+mDp
+mDp
+mDp
+mDp
+mDp
+mDp
+mDp
+mDp
+mDp
+mDp
+mDp
+mDp
+mDp
+mDp
+mDp
+mDp
+mDp
+mDp
+mDp
+mDp
+mDp
+mDp
+mDp
+mDp
+pRW
+pRW
 pRW
 pRW
 pRW
@@ -57989,16 +58310,19 @@ pRW
 pRW
 jYr
 aKn
-cPI
-jDP
-fOe
-elQ
-rTD
-wIT
-htn
-hFO
-mGq
-jiy
+eAp
+rBG
+rBG
+rBG
+qDe
+rBG
+rBG
+rBG
+rBG
+fju
+mIk
+fju
+rBG
 spd
 nTO
 eNl
@@ -58180,19 +58504,19 @@ pRW
 pRW
 pRW
 pRW
-pRW
-pRW
-cPI
-cPI
-jDP
-fOe
+wxp
+hLw
+fju
+iDE
+fju
+tmi
 fBG
 rDV
-gKi
-fOe
-uxX
-wOA
-jiy
+rBG
+kdG
+mIk
+qmY
+rBG
 saE
 bLl
 vEs
@@ -58374,19 +58698,19 @@ pRW
 pRW
 pRW
 pRW
-pRW
-cPI
-cPI
-jDP
-jDP
-fOe
+wxp
+fju
+uJr
+fju
+fju
+uJr
 crM
 kdZ
-ebz
-fOe
-vIe
-dld
-jiy
+rBG
+qmY
+mIk
+fju
+rBG
 dfD
 nkY
 xIv
@@ -58568,19 +58892,19 @@ pRW
 pRW
 pRW
 pRW
-cPI
-cPI
-jDP
-jDP
+wxp
+nsH
 jDP
+fju
+bPg
 fOe
 pqO
 dPi
-xgT
-fOe
-vIe
-qpd
-jiy
+rBG
+fju
+mIk
+fju
+rBG
 fqc
 pAU
 iIc
@@ -58767,13 +59091,13 @@ vRl
 vRl
 vRl
 vRl
-cPI
-cPI
-cPI
-cPI
-rBG
-qdW
+vRl
+vRl
+vRl
+vRl
 rBG
+mIk
+qmY
 rBG
 uOQ
 nTO
@@ -59549,7 +59873,7 @@ wLe
 vRl
 vRl
 mIk
-fju
+qmY
 rBG
 lDx
 nTO
@@ -59743,7 +60067,7 @@ gYF
 vRl
 vRl
 mIk
-fju
+yiZ
 rBG
 fqc
 pAU
@@ -60327,7 +60651,7 @@ ncY
 fju
 mIk
 rBG
-xxb
+dJG
 nTO
 szv
 sJA
@@ -60518,7 +60842,7 @@ vRl
 vRl
 vRl
 vRl
-fju
+ubc
 mIk
 rBG
 tMK
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-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/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/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..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/loaded{
+/obj/item/storage/hypokit/advanced/full/loaded{
 	pixel_y = -7
 	},
-/obj/item/storage/hypokit/advanced/loaded,
+/obj/item/storage/hypokit/advanced/full/loaded,
 /turf/simulated/floor/tiled/techfloor,
 /area/admin_planet/fey_forest/gateway_facility)
 "ca" = (
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"
 	},
diff --git a/sql_old/database_changelog.md b/sql_old/database_changelog.md
deleted file mode 100644
index 12b3f4cbad87..000000000000
--- a/sql_old/database_changelog.md
+++ /dev/null
@@ -1,29 +0,0 @@
-# Changelog
-
-This covers the **game** database. The unified database has no unified schema + changelog yet.
-
-## Schema Versioning
-
-Any time you make a change to the schema files, remember to increment the database schema version. Generally increment the minor number, major should be reserved for significant changes to the schema. Both values go up to 255.
-
-The latest database version is 5.12; The query to update the schema revision table is:
-
-INSERT INTO `schema_revision` (`major`, `minor`) VALUES (5, 12);
-or
-INSERT INTO `SS13_schema_revision` (`major`, `minor`) VALUES (5, 12);
-
-In any query remember to add a prefix to the table names if you use one.
-
-## Changelog
-
-### 6/16/22 - 1.1 - silicons
-
-Database migrated to DBCore. Schema will start at MAJOR 1, MINOR 1.
-
-### 11/21/22 - 1.2 - silicons
-
-`persist_keyed_strings` added.
-
-### 2/4/23 - 1.3 - silicons
-
-`character` table added.