From 0c02e7bede8350922a3a7225ae56d957c623a8e8 Mon Sep 17 00:00:00 2001
From: forest2001 <41653574+realforest2001@users.noreply.github.com>
Date: Tue, 28 Nov 2023 19:18:38 +0000
Subject: [PATCH 01/58] Whiskey Outpost can no longer roll pred rounds. (#5035)

# About the pull request
As title says.
<!-- Remove this text and explain what the purpose of your PR is.

Mention if you have tested your changes. If you changed a map, make sure
you used the mapmerge tool.
If this is an Issue Correction, you can type "Fixes Issue #169420" to
link the PR to the corresponding Issue number #169420.

Remember: something that is self-evident to you might not be to others.
Explain your rationale fully, even if you feel it goes without saying.
-->

# Explain why it's good for the game
# Testing Photographs and Procedure
<details>
<summary>Screenshots & Videos</summary>

Put screenshots and videos here with an empty line between the
screenshots and the `<details>` tags.

</details>


# Changelog
:cl:
del: Whiskey Outpost no longer rolls pred rounds naturally.
/:cl:
---
 code/game/jobs/role_authority.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/game/jobs/role_authority.dm b/code/game/jobs/role_authority.dm
index 8829bf983c25..8deadbeba32e 100644
--- a/code/game/jobs/role_authority.dm
+++ b/code/game/jobs/role_authority.dm
@@ -262,7 +262,7 @@ I hope it's easier to tell what the heck this proc is even doing, unlike previou
 	if(istype(CO_surv_job))
 		CO_surv_job.set_spawn_positions(GLOB.players_preassigned)
 
-	if(SSnightmare.get_scenario_value("predator_round"))
+	if(SSnightmare.get_scenario_value("predator_round") && !Check_WO())
 		SSticker.mode.flags_round_type |= MODE_PREDATOR
 		// Set predators starting amount based on marines assigned
 		var/datum/job/PJ = temp_roles_for_mode[JOB_PREDATOR]

From c8d3a20fe67ebc51ae5dc591f4dad690f51be44d Mon Sep 17 00:00:00 2001
From: cm13-github <128137806+cm13-github@users.noreply.github.com>
Date: Tue, 28 Nov 2023 19:26:49 +0000
Subject: [PATCH 02/58] Automatic changelog for PR #5035 [ci skip]

---
 html/changelogs/AutoChangeLog-pr-5035.yml | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 html/changelogs/AutoChangeLog-pr-5035.yml

diff --git a/html/changelogs/AutoChangeLog-pr-5035.yml b/html/changelogs/AutoChangeLog-pr-5035.yml
new file mode 100644
index 000000000000..abc93c822ad3
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-5035.yml
@@ -0,0 +1,4 @@
+author: "realforest2001"
+delete-after: True
+changes:
+  - rscdel: "Whiskey Outpost no longer rolls pred rounds naturally."
\ No newline at end of file

From f86e4737dbd9a1958ce80964b1c13dbe1a1efe97 Mon Sep 17 00:00:00 2001
From: Zonespace <41448081+Zonespace27@users.noreply.github.com>
Date: Tue, 28 Nov 2023 15:32:26 -0800
Subject: [PATCH 03/58] Fix nullspaced closet runtime (#4964)

# About the pull request

![image](https://github.com/cmss13-devs/cmss13/assets/41448081/a87707be-a80e-4e72-b6ea-d98d4172de79)
---
 code/game/objects/structures/crates_lockers/closets.dm | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm
index d6148b23b7f0..2efd8e4e81e9 100644
--- a/code/game/objects/structures/crates_lockers/closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets.dm
@@ -158,10 +158,15 @@
 
 
 /obj/structure/closet/proc/take_damage(damage)
+	if(health <= 0)
+		return
+
 	health = max(health - damage, 0)
 	if(health <= 0)
-		for(var/atom/movable/A as anything in src)
-			A.forceMove(src.loc)
+		for(var/atom/movable/movable as anything in src)
+			if(!loc)
+				break
+			movable.forceMove(loc)
 		playsound(loc, 'sound/effects/meteorimpact.ogg', 25, 1)
 		qdel(src)
 

From a454a4f3f40384bbb091e9f46db48eb13883fa3a Mon Sep 17 00:00:00 2001
From: Changelogs <action@github.com>
Date: Wed, 29 Nov 2023 01:12:33 +0000
Subject: [PATCH 04/58] Automatic changelog compile [ci skip]

---
 html/changelogs/AutoChangeLog-pr-5035.yml | 4 ----
 html/changelogs/archive/2023-11.yml       | 3 +++
 2 files changed, 3 insertions(+), 4 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-5035.yml

diff --git a/html/changelogs/AutoChangeLog-pr-5035.yml b/html/changelogs/AutoChangeLog-pr-5035.yml
deleted file mode 100644
index abc93c822ad3..000000000000
--- a/html/changelogs/AutoChangeLog-pr-5035.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "realforest2001"
-delete-after: True
-changes:
-  - rscdel: "Whiskey Outpost no longer rolls pred rounds naturally."
\ No newline at end of file
diff --git a/html/changelogs/archive/2023-11.yml b/html/changelogs/archive/2023-11.yml
index 6bd90cf1578e..7b16c3526888 100644
--- a/html/changelogs/archive/2023-11.yml
+++ b/html/changelogs/archive/2023-11.yml
@@ -402,3 +402,6 @@
       than if lying down.
   stalkerino:
   - rscadd: readds skull facepaint and skull balaclava (blue and black)
+2023-11-29:
+  realforest2001:
+  - rscdel: Whiskey Outpost no longer rolls pred rounds naturally.

From cce7ad268ba545ae90dce03dedddf4bc6f247da1 Mon Sep 17 00:00:00 2001
From: Kozmos <31109792+HeresKozmos@users.noreply.github.com>
Date: Wed, 29 Nov 2023 13:30:40 +0000
Subject: [PATCH 05/58] Kutjevo - South Caves Spring (#5039)

# About the pull request

Adds a small underground spring to the far south caves of Kutjevo and
slightly expands the existing cave system.

# Explain why it's good for the game

Kutjevo is a good map, but there's a lot of unused cave real estate
especially on the NE and SE corners of the map; so I thought this could
be a nice little addition which I plan to pair alongside other small
cave extensions in the future to hopefully just give it a bit more
personality and hopefully chip away at the unused space.

To help reduce the chances that it'll become some kind of meta hive spot
(somehow... even when it's right next to power plant...) I added a bunch
of large rocks ontop of the already proportionally large body of water
to reduce proper walling ability.

# Testing Photographs and Procedure

With Spring:

![image](https://github.com/cmss13-devs/cmss13/assets/31109792/59c3a316-39ac-4d52-8f18-823347eb2a6e)

Without Spring:

![image](https://github.com/cmss13-devs/cmss13/assets/31109792/d018d3b6-da45-499f-8980-3696f4143979)

Spring Close-Up:

![image](https://github.com/cmss13-devs/cmss13/assets/31109792/ed70d237-5b92-4ccd-8ca7-55c07864163b)

Short Video:

https://cdn.discordapp.com/attachments/746325498896056329/1178118032103587850/Kutjevo_Spring_Demo_720P.mp4?ex=6574faeb&is=656285eb&hm=9f1e047ab62ef4e99f9cabb682e6bd42599c1348c4cda0db4417de9a766b9ea7&
_(It will download if you click the link*)_

# Changelog
:cl:
mapadd: added a new spring area to kutjevo's south caves
/:cl:
---
 code/game/area/kutjevo.dm          |    4 +
 maps/map_files/Kutjevo/Kutjevo.dmm | 1465 ++++++++++++++++++----------
 2 files changed, 938 insertions(+), 531 deletions(-)

diff --git a/code/game/area/kutjevo.dm b/code/game/area/kutjevo.dm
index 422017c0a46b..a5a12cd5b999 100644
--- a/code/game/area/kutjevo.dm
+++ b/code/game/area/kutjevo.dm
@@ -67,6 +67,10 @@
 	name = "Kutjevo - Power Station River"
 	icon_state = "lz_river"
 
+/area/kutjevo/exterior/spring
+	name = "Kutjevo - Southern Spring"
+	icon_state = "lz_river"
+
 /area/kutjevo/exterior/scrubland
 	name = "Kutjevo - Scrubland"
 	icon_state = "scrubland"
diff --git a/maps/map_files/Kutjevo/Kutjevo.dmm b/maps/map_files/Kutjevo/Kutjevo.dmm
index 676bd49576f0..4eb4d6fd77e9 100644
--- a/maps/map_files/Kutjevo/Kutjevo.dmm
+++ b/maps/map_files/Kutjevo/Kutjevo.dmm
@@ -62,6 +62,10 @@
 "adD" = (
 /turf/open/floor/almayer/research/containment/floor1,
 /area/kutjevo/exterior/lz_dunes)
+"adG" = (
+/obj/effect/landmark/structure_spawner/setup/distress/xeno_door,
+/turf/open/auto_turf/sand/layer0,
+/area/kutjevo/interior/colony_South)
 "adX" = (
 /obj/item/stack/sheet/wood,
 /obj/structure/machinery/light,
@@ -362,6 +366,15 @@
 	dir = 4
 	},
 /area/kutjevo/interior/complex/Northwest_Dorms)
+"axi" = (
+/obj/structure/flora/bush/ausbushes/grassybush{
+	pixel_x = -4;
+	pixel_y = 10
+	},
+/turf/open/gm/river/desert/shallow_edge{
+	dir = 9
+	},
+/area/kutjevo/exterior/spring)
 "axK" = (
 /obj/item/trash/cigbutt/bcigbutt,
 /obj/structure/stairs/perspective/kutjevo{
@@ -679,6 +692,13 @@
 	icon = 'icons/turf/floors/desert_water_toxic.dmi'
 	},
 /area/kutjevo/interior/oob)
+"aXU" = (
+/obj/structure/barricade/wooden{
+	dir = 1;
+	pixel_y = 13
+	},
+/turf/open/desert/desert_shore/shore_edge1,
+/area/kutjevo/exterior/spring)
 "aXV" = (
 /obj/structure/machinery/colony_floodlight_switch,
 /turf/closed/wall/kutjevo/colony/reinforced,
@@ -1958,6 +1978,14 @@
 	},
 /turf/open/asphalt/cement_sunbleached,
 /area/kutjevo/interior/power)
+"cKY" = (
+/obj/structure/prop/brazier/frame/full/campfire,
+/obj/item/tool/match/paper{
+	pixel_y = -2;
+	pixel_x = -11
+	},
+/turf/open/auto_turf/sand/layer1,
+/area/kutjevo/exterior/spring)
 "cLn" = (
 /obj/structure/stairs/perspective/kutjevo{
 	dir = 1;
@@ -2286,6 +2314,11 @@
 	},
 /turf/open/floor/plating/kutjevo,
 /area/kutjevo/interior/complex/botany)
+"dcC" = (
+/turf/open/desert/desert_shore/shore_edge1{
+	dir = 1
+	},
+/area/kutjevo/exterior/spring)
 "ddi" = (
 /obj/structure/platform/kutjevo,
 /obj/structure/blocker/invisible_wall,
@@ -2418,6 +2451,11 @@
 	dir = 10
 	},
 /area/kutjevo/interior/colony_South/power2)
+"dnd" = (
+/turf/open/gm/river/desert/shallow_edge{
+	dir = 8
+	},
+/area/kutjevo/exterior/spring)
 "dnl" = (
 /obj/structure/platform/kutjevo/rock,
 /turf/open/auto_turf/sand/layer1,
@@ -2676,6 +2714,15 @@
 	dir = 8
 	},
 /area/kutjevo/exterior/runoff_river)
+"dBt" = (
+/obj/structure/flora/bush/ausbushes/grassybush{
+	pixel_x = -8;
+	pixel_y = 10
+	},
+/turf/open/gm/river/desert/shallow_edge{
+	dir = 5
+	},
+/area/kutjevo/exterior/spring)
 "dBO" = (
 /obj/structure/ladder,
 /obj/structure/blocker/invisible_wall,
@@ -2744,6 +2791,12 @@
 	},
 /turf/open/auto_turf/sand/layer0,
 /area/kutjevo/interior/colony_South)
+"dGi" = (
+/obj/structure/flora/grass/tallgrass/desert/corner{
+	dir = 1
+	},
+/turf/open/auto_turf/sand/layer1,
+/area/kutjevo/exterior/spring)
 "dGx" = (
 /obj/structure/window/framed/kutjevo,
 /turf/open/floor/kutjevo/tan,
@@ -2867,6 +2920,11 @@
 /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
 /turf/open/auto_turf/sand/layer0,
 /area/kutjevo/interior/colony_north)
+"dOj" = (
+/turf/open/gm/river/desert/shallow_corner{
+	dir = 1
+	},
+/area/kutjevo/exterior/spring)
 "dOJ" = (
 /obj/structure/barricade/deployable,
 /turf/open/floor/kutjevo/colors/purple/edge,
@@ -2957,6 +3015,10 @@
 	},
 /turf/open/gm/river/desert/shallow,
 /area/kutjevo/exterior/runoff_river)
+"dUc" = (
+/obj/structure/flora/grass/tallgrass/desert,
+/turf/open/auto_turf/sand/layer2,
+/area/kutjevo/exterior/spring)
 "dUy" = (
 /obj/structure/platform/kutjevo/smooth,
 /turf/open/floor/kutjevo/multi_tiles{
@@ -3046,6 +3108,15 @@
 /obj/structure/blocker/invisible_wall,
 /turf/open/floor/plating/kutjevo,
 /area/kutjevo/exterior/runoff_dunes)
+"eaT" = (
+/obj/effect/landmark/structure_spawner/setup/distress/xeno_door,
+/turf/open/auto_turf/sand/layer1,
+/area/kutjevo/interior/colony_South)
+"ebv" = (
+/turf/open/desert/desert_shore/shore_corner2{
+	dir = 8
+	},
+/area/kutjevo/exterior/spring)
 "ebB" = (
 /turf/open/auto_turf/sand/layer1,
 /area/kutjevo/interior/colony_S_East)
@@ -3427,6 +3498,9 @@
 "evZ" = (
 /turf/open/floor/almayer/research/containment/floor2,
 /area/kutjevo/interior/power)
+"ewl" = (
+/turf/open/desert/desert_shore/desert_shore1,
+/area/kutjevo/exterior/spring)
 "ewF" = (
 /obj/item/phone{
 	pixel_x = 1;
@@ -3548,6 +3622,20 @@
 	},
 /turf/open/floor/kutjevo/grey/plate,
 /area/kutjevo/interior/construction)
+"eCE" = (
+/obj/item/clipboard{
+	pixel_y = 4;
+	pixel_x = -4
+	},
+/obj/item/tool/pen{
+	name = "stained pen";
+	desc = "It's a seemingly normal pen... aside from the faint red fingerprints on the side...";
+	pixel_x = 2;
+	pixel_y = 10
+	},
+/obj/item/paper/crumpled/bloody,
+/turf/open/auto_turf/sand/layer1,
+/area/kutjevo/exterior/spring)
 "eCY" = (
 /obj/structure/machinery/cryo_cell,
 /turf/open/floor/kutjevo/grey/plate,
@@ -3604,6 +3692,10 @@
 "eHX" = (
 /turf/open/auto_turf/sand/layer0,
 /area/kutjevo/exterior/telecomm/lz1_south)
+"eIq" = (
+/obj/item/tool/hatchet,
+/turf/open/auto_turf/sand/layer1,
+/area/kutjevo/exterior/spring)
 "eIL" = (
 /turf/open/floor/kutjevo/colors/cyan/edge{
 	dir = 4
@@ -3859,6 +3951,9 @@
 	dir = 4
 	},
 /area/kutjevo/interior/colony_South/power2)
+"eVR" = (
+/turf/open/gm/river/desert/deep,
+/area/kutjevo/exterior/spring)
 "eWP" = (
 /obj/effect/landmark/corpsespawner/colonist/kutjevo,
 /turf/open/floor/kutjevo/multi_tiles,
@@ -3943,6 +4038,10 @@
 	icon = 'icons/turf/floors/desert_water_toxic.dmi'
 	},
 /area/kutjevo/interior/power)
+"fdH" = (
+/obj/effect/decal/cleanable/blood/splatter,
+/turf/open/auto_turf/sand/layer0,
+/area/kutjevo/exterior/spring)
 "fdS" = (
 /obj/effect/decal/cleanable/blood/xeno{
 	icon_state = "xgib1"
@@ -4114,6 +4213,10 @@
 	dir = 4
 	},
 /area/kutjevo/interior/construction)
+"fne" = (
+/obj/item/trash/barcardine,
+/turf/open/auto_turf/sand/layer1,
+/area/kutjevo/exterior/spring)
 "foE" = (
 /obj/structure/surface/table/reinforced/prison,
 /obj/structure/barricade/handrail/kutjevo{
@@ -4411,6 +4514,12 @@
 	},
 /turf/open/floor/plating/kutjevo,
 /area/kutjevo/interior/colony_South/power2)
+"fMB" = (
+/obj/structure/flora/grass/tallgrass/desert/corner{
+	dir = 5
+	},
+/turf/open/auto_turf/sand/layer1,
+/area/kutjevo/exterior/spring)
 "fNc" = (
 /obj/structure/platform/kutjevo{
 	dir = 4
@@ -4589,6 +4698,14 @@
 /obj/structure/prop/dam/gravestone,
 /turf/open/auto_turf/sand/layer0,
 /area/kutjevo/interior/colony_N_East)
+"fYr" = (
+/obj/structure/barricade/wooden{
+	desc = "This barricade is heavily reinforced. Nothing short of blasting it open seems like it'll do the trick, that or melting the breams supporting it...";
+	dir = 8;
+	health = 25000
+	},
+/turf/open/auto_turf/sand/layer1,
+/area/kutjevo/exterior/spring)
 "fYE" = (
 /obj/structure/surface/table/almayer,
 /obj/structure/machinery/computer/shuttle/dropship/flight/lz2,
@@ -4711,6 +4828,10 @@
 	dir = 8
 	},
 /area/kutjevo/interior/power/comms)
+"giY" = (
+/obj/item/device/flashlight/lamp/tripod/grey,
+/turf/open/auto_turf/sand/layer1,
+/area/kutjevo/exterior/spring)
 "giZ" = (
 /obj/structure/machinery/cm_vending/sorted/medical/wall_med/limited{
 	pixel_y = 28
@@ -4782,6 +4903,13 @@
 	dir = 10
 	},
 /area/kutjevo/exterior/runoff_dunes)
+"gok" = (
+/obj/structure/flora/bush/desert{
+	icon_state = "tree_2";
+	pixel_y = 14
+	},
+/turf/open/desert/desert_shore/desert_shore1,
+/area/kutjevo/exterior/spring)
 "goT" = (
 /turf/closed/wall/kutjevo/rock,
 /area/kutjevo/exterior/runoff_dunes)
@@ -4813,6 +4941,15 @@
 /obj/item/clipboard,
 /turf/open/floor/kutjevo/colors/green,
 /area/kutjevo/interior/complex/botany)
+"gsn" = (
+/obj/structure/flora/bush/desert{
+	icon_state = "tree_2";
+	pixel_y = 14
+	},
+/turf/open/desert/desert_shore/desert_shore1{
+	dir = 1
+	},
+/area/kutjevo/exterior/spring)
 "gsq" = (
 /obj/structure/filingcabinet,
 /obj/structure/window/reinforced/tinted{
@@ -4956,6 +5093,13 @@
 "gBl" = (
 /turf/open/auto_turf/sand/layer0,
 /area/kutjevo/interior/oob)
+"gBu" = (
+/obj/structure/barricade/wooden{
+	dir = 4;
+	pixel_y = 4
+	},
+/turf/open/auto_turf/sand/layer2,
+/area/kutjevo/exterior/spring)
 "gBI" = (
 /obj/effect/decal/cleanable/blood/oil,
 /obj/structure/machinery/door/poddoor/shutters/almayer/open{
@@ -5053,6 +5197,9 @@
 	dir = 8
 	},
 /area/kutjevo/interior/complex/Northwest_Flight_Control)
+"gFA" = (
+/turf/open/desert/desert_shore/shore_edge1,
+/area/kutjevo/exterior/spring)
 "gHh" = (
 /obj/structure/flora/grass/desert/lightgrass_9,
 /turf/open/auto_turf/sand/layer0,
@@ -5072,6 +5219,15 @@
 /obj/effect/landmark/objective_landmark/close,
 /turf/open/floor/kutjevo/grey/plate,
 /area/kutjevo/interior/foremans_office)
+"gHV" = (
+/obj/effect/decal/cleanable/blood/splatter,
+/turf/open/auto_turf/sand/layer1,
+/area/kutjevo/exterior/spring)
+"gJx" = (
+/turf/open/gm/river/desert/shallow_corner{
+	dir = 4
+	},
+/area/kutjevo/exterior/spring)
 "gJB" = (
 /obj/structure/stairs/perspective/kutjevo{
 	dir = 8;
@@ -5720,6 +5876,11 @@
 	},
 /turf/open/floor/kutjevo/plate,
 /area/kutjevo/interior/colony_central)
+"hET" = (
+/turf/open/gm/river/desert/shallow_edge{
+	dir = 10
+	},
+/area/kutjevo/exterior/spring)
 "hFi" = (
 /obj/structure/barricade/wooden{
 	dir = 1;
@@ -5848,6 +6009,10 @@
 	icon_state = "platingdmg3"
 	},
 /area/kutjevo/interior/complex/Northwest_Dorms)
+"hRG" = (
+/obj/structure/prop/dam/boulder/boulder2,
+/turf/open/auto_turf/sand/layer1,
+/area/kutjevo/exterior/spring)
 "hSo" = (
 /obj/structure/flora/grass/tallgrass/desert/corner{
 	dir = 10
@@ -5961,6 +6126,11 @@
 	},
 /turf/open/floor/plating/kutjevo,
 /area/kutjevo/exterior/construction)
+"hZx" = (
+/obj/structure/flora/grass/tallgrass/desert,
+/obj/structure/flora/grass/tallgrass/desert,
+/turf/open/auto_turf/sand/layer1,
+/area/kutjevo/exterior/spring)
 "iaj" = (
 /turf/closed/wall/kutjevo/rock,
 /area/kutjevo/exterior/lz_river)
@@ -6108,6 +6278,12 @@
 	},
 /turf/open/floor/plating/kutjevo,
 /area/kutjevo/interior/complex/med/triage)
+"irb" = (
+/obj/structure/flora/grass/tallgrass/desert/corner{
+	dir = 8
+	},
+/turf/open/auto_turf/sand/layer1,
+/area/kutjevo/exterior/spring)
 "ird" = (
 /obj/structure/blocker/invisible_wall,
 /obj/structure/platform/kutjevo{
@@ -6381,6 +6557,9 @@
 /obj/item/storage/box/trackimp,
 /turf/open/floor/kutjevo/tan,
 /area/kutjevo/interior/complex/botany/east_tech)
+"iNI" = (
+/turf/open/auto_turf/sand/layer0,
+/area/kutjevo/exterior/spring)
 "iNY" = (
 /obj/structure/barricade/wooden{
 	dir = 8
@@ -6541,6 +6720,13 @@
 	},
 /turf/open/auto_turf/sand/layer0,
 /area/kutjevo/exterior/complex_border/med_rec)
+"jac" = (
+/obj/item/device/radio{
+	name = "damp shortwave radio";
+	desc = "A regular shortwave radio, this one has experienced minor water damage but is still functional."
+	},
+/turf/open/desert/desert_shore/shore_corner2,
+/area/kutjevo/exterior/spring)
 "jav" = (
 /obj/structure/closet/secure_closet/engineering_welding,
 /obj/item/ammo_box/magazine/nailgun,
@@ -6712,6 +6898,16 @@
 /obj/item/stack/sheet/wood,
 /turf/open/floor/kutjevo/colors,
 /area/kutjevo/interior/power/comms)
+"jnD" = (
+/obj/structure/barricade/wooden{
+	dir = 4
+	},
+/obj/structure/barricade/wooden{
+	dir = 1;
+	pixel_y = 13
+	},
+/turf/open/auto_turf/sand/layer1,
+/area/kutjevo/exterior/spring)
 "jnS" = (
 /obj/structure/window/framed/kutjevo,
 /turf/open/floor/plating/kutjevo,
@@ -7282,6 +7478,10 @@
 /obj/structure/platform/kutjevo,
 /turf/open/floor/kutjevo/tan,
 /area/kutjevo/interior/colony_north)
+"kgx" = (
+/obj/structure/flora/grass/tallgrass/desert,
+/turf/open/auto_turf/sand/layer1,
+/area/kutjevo/exterior/spring)
 "khI" = (
 /obj/structure/window/framed/kutjevo/reinforced/hull,
 /turf/open/floor/kutjevo/grey/plate,
@@ -7668,6 +7868,9 @@
 "kDS" = (
 /turf/open/floor/kutjevo/tan,
 /area/kutjevo/interior/complex/botany)
+"kEh" = (
+/turf/open/gm/river/desert/shallow_edge,
+/area/kutjevo/exterior/spring)
 "kEG" = (
 /obj/structure/sign/poster{
 	pixel_y = -32
@@ -7724,6 +7927,10 @@
 "kIn" = (
 /turf/open/auto_turf/sand/layer2,
 /area/kutjevo/exterior/scrubland)
+"kIQ" = (
+/obj/structure/prop/dam/large_boulder/boulder2,
+/turf/open/auto_turf/sand/layer1,
+/area/kutjevo/exterior/spring)
 "kKb" = (
 /obj/structure/barricade/wooden{
 	dir = 8
@@ -7837,10 +8044,20 @@
 	},
 /turf/open/floor/plating/kutjevo,
 /area/kutjevo/interior/colony_South/power2)
+"kQa" = (
+/obj/structure/bed/bedroll,
+/obj/effect/decal/cleanable/blood/splatter,
+/turf/open/auto_turf/sand/layer1,
+/area/kutjevo/exterior/spring)
 "kQo" = (
 /obj/structure/girder,
 /turf/open/auto_turf/sand/layer1,
 /area/kutjevo/interior/construction)
+"kQD" = (
+/turf/open/desert/desert_shore/desert_shore1{
+	dir = 8
+	},
+/area/kutjevo/exterior/spring)
 "kQU" = (
 /obj/structure/platform/kutjevo{
 	dir = 8
@@ -8361,6 +8578,11 @@
 /obj/item/stack/sheet/wood,
 /turf/open/floor/kutjevo/colors/purple,
 /area/kutjevo/interior/complex/med/locks)
+"lEf" = (
+/turf/open/gm/river/desert/shallow_edge{
+	dir = 6
+	},
+/area/kutjevo/exterior/spring)
 "lEA" = (
 /turf/closed/wall/kutjevo/colony/reinforced,
 /area/kutjevo/interior/colony_central)
@@ -8682,6 +8904,11 @@
 "mbS" = (
 /turf/closed/wall/kutjevo/colony,
 /area/kutjevo/interior/complex/botany)
+"mct" = (
+/turf/open/gm/river/desert/shallow_corner{
+	dir = 8
+	},
+/area/kutjevo/exterior/spring)
 "mcv" = (
 /obj/structure/window/framed/kutjevo/reinforced/hull,
 /obj/structure/blocker/invisible_wall,
@@ -8977,6 +9204,10 @@
 	dir = 6
 	},
 /area/kutjevo/interior/complex/med/locks)
+"mvX" = (
+/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
+/turf/open/auto_turf/sand/layer1,
+/area/kutjevo/exterior/spring)
 "mwh" = (
 /obj/structure/window/framed/kutjevo/reinforced,
 /turf/open/floor/kutjevo/colors/green/tile,
@@ -8996,6 +9227,11 @@
 /obj/item/frame/rack,
 /turf/open/floor/kutjevo/tan/multi_tiles,
 /area/kutjevo/interior/complex/botany/east_tech)
+"myk" = (
+/turf/open/gm/river/desert/shallow_edge{
+	dir = 4
+	},
+/area/kutjevo/exterior/spring)
 "mzn" = (
 /obj/structure/platform/kutjevo{
 	dir = 1
@@ -9015,6 +9251,18 @@
 /obj/item/storage/pill_bottle/dexalin/skillless,
 /turf/open/floor/kutjevo/grey/plate,
 /area/kutjevo/interior/complex/med)
+"mAD" = (
+/obj/structure/barricade/wooden{
+	dir = 1;
+	pixel_y = 13
+	},
+/obj/structure/barricade/wooden{
+	desc = "This barricade is heavily reinforced. Nothing short of blasting it open seems like it'll do the trick, that or melting the breams supporting it...";
+	dir = 8;
+	health = 25000
+	},
+/turf/open/auto_turf/sand/layer1,
+/area/kutjevo/exterior/spring)
 "mAH" = (
 /obj/effect/decal/cleanable/blood,
 /obj/effect/decal/kutjevo_decals/catwalk,
@@ -9308,6 +9556,11 @@
 	color = "#990000"
 	},
 /area/kutjevo/interior/oob)
+"mNv" = (
+/turf/open/gm/river/desert/shallow_edge{
+	dir = 5
+	},
+/area/kutjevo/exterior/spring)
 "mNM" = (
 /turf/closed/wall/kutjevo/colony,
 /area/kutjevo/exterior/runoff_bridge)
@@ -10083,6 +10336,12 @@
 /obj/structure/platform/kutjevo/rock,
 /turf/open/auto_turf/sand/layer0,
 /area/kutjevo/interior/colony_central)
+"nPq" = (
+/obj/structure/flora/grass/tallgrass/desert/corner{
+	dir = 6
+	},
+/turf/open/auto_turf/sand/layer1,
+/area/kutjevo/exterior/spring)
 "nPs" = (
 /obj/structure/blocker/invisible_wall,
 /turf/open/auto_turf/sand/layer1,
@@ -10096,6 +10355,11 @@
 /obj/structure/machinery/iv_drip,
 /turf/open/floor/kutjevo/colors/cyan,
 /area/kutjevo/interior/complex/med/triage)
+"nPX" = (
+/turf/open/gm/river/desert/shallow_edge{
+	dir = 9
+	},
+/area/kutjevo/exterior/spring)
 "nQc" = (
 /obj/structure/platform_decoration/kutjevo/rock,
 /obj/structure/platform_decoration/kutjevo/rock{
@@ -10234,6 +10498,12 @@
 /obj/effect/decal/cleanable/blood/splatter,
 /turf/open/floor/kutjevo/tan,
 /area/kutjevo/interior/complex/med/operating)
+"nZC" = (
+/obj/structure/bed/bedroll,
+/obj/effect/landmark/corpsespawner/colonist/kutjevo,
+/obj/effect/decal/cleanable/blood/splatter,
+/turf/open/auto_turf/sand/layer0,
+/area/kutjevo/exterior/spring)
 "nZK" = (
 /turf/open/floor/kutjevo/tan,
 /area/kutjevo/interior/complex/Northwest_Flight_Control)
@@ -10251,6 +10521,12 @@
 	},
 /turf/open/floor/kutjevo/tan/alt_inner_edge,
 /area/kutjevo/interior/complex/Northwest_Flight_Control)
+"obv" = (
+/obj/structure/flora/grass/tallgrass/desert/corner{
+	dir = 10
+	},
+/turf/open/auto_turf/sand/layer1,
+/area/kutjevo/exterior/spring)
 "oca" = (
 /obj/structure/surface/table/almayer,
 /obj/item/device/flashlight/lamp,
@@ -10787,6 +11063,10 @@
 /obj/structure/filingcabinet/chestdrawer,
 /turf/open/floor/carpet,
 /area/kutjevo/interior/oob)
+"oQb" = (
+/obj/structure/flora/grass/tallgrass/desert/corner,
+/turf/open/auto_turf/sand/layer1,
+/area/kutjevo/exterior/spring)
 "oQc" = (
 /turf/closed/wall/kutjevo/colony,
 /area/kutjevo/interior/power_pt2_electric_boogaloo)
@@ -10990,6 +11270,13 @@
 	icon_state = "0,5"
 	},
 /area/kutjevo/interior/construction)
+"pfK" = (
+/obj/structure/barricade/wooden{
+	dir = 1;
+	pixel_y = 13
+	},
+/turf/open/auto_turf/sand/layer1,
+/area/kutjevo/exterior/spring)
 "pfR" = (
 /obj/structure/platform/kutjevo/rock{
 	dir = 4
@@ -11116,6 +11403,15 @@
 "pmv" = (
 /turf/closed/wall/kutjevo/colony/reinforced,
 /area/kutjevo/exterior/complex_border/med_rec)
+"pmD" = (
+/obj/structure/flora/bush/ausbushes/grassybush{
+	pixel_x = -6;
+	pixel_y = 10
+	},
+/turf/open/gm/river/desert/shallow_edge{
+	dir = 6
+	},
+/area/kutjevo/exterior/spring)
 "pmR" = (
 /obj/structure/largecrate/supply/supplies/flares,
 /turf/open/auto_turf/sand/layer1,
@@ -11733,6 +12029,11 @@
 	dir = 4
 	},
 /area/kutjevo/interior/complex/botany/east_tech)
+"qaU" = (
+/turf/open/desert/desert_shore/shore_corner2{
+	dir = 1
+	},
+/area/kutjevo/exterior/spring)
 "qaY" = (
 /obj/structure/blocker/invisible_wall,
 /turf/open/desert/desert_shore/shore_corner2{
@@ -12102,6 +12403,12 @@
 /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
 /turf/open/auto_turf/sand/layer0,
 /area/kutjevo/interior/colony_S_East)
+"qFh" = (
+/obj/structure/flora/grass/tallgrass/desert/corner{
+	dir = 4
+	},
+/turf/open/auto_turf/sand/layer1,
+/area/kutjevo/exterior/spring)
 "qFU" = (
 /turf/open/desert/desert_shore/shore_corner2{
 	dir = 8
@@ -12493,6 +12800,10 @@
 /obj/structure/surface/table/reinforced/prison,
 /turf/open/floor/kutjevo/colors/red,
 /area/kutjevo/interior/complex/botany)
+"riT" = (
+/obj/item/stack/sheet/wood/small_stack,
+/turf/open/auto_turf/sand/layer1,
+/area/kutjevo/exterior/spring)
 "rjS" = (
 /obj/structure/blocker/invisible_wall,
 /obj/structure/platform/kutjevo{
@@ -12661,6 +12972,10 @@
 /obj/structure/window/framed/kutjevo/reinforced/hull,
 /turf/open/floor/plating/kutjevo,
 /area/kutjevo/interior/power)
+"rwC" = (
+/obj/effect/landmark/structure_spawner/setup/distress/xeno_door,
+/turf/open/auto_turf/sand/layer2,
+/area/kutjevo/interior/colony_South)
 "rwL" = (
 /obj/item/frame/table/almayer,
 /turf/open/floor/kutjevo/tan,
@@ -12739,6 +13054,10 @@
 "rCp" = (
 /turf/open/desert/desert_shore/desert_shore1,
 /area/kutjevo/exterior/runoff_bridge)
+"rDe" = (
+/obj/structure/prop/dam/boulder/boulder2,
+/turf/open/auto_turf/sand/layer0,
+/area/kutjevo/exterior/spring)
 "rDO" = (
 /obj/effect/decal/medical_decals{
 	icon_state = "triagedecalbottomright"
@@ -12998,6 +13317,13 @@
 	},
 /turf/open/auto_turf/sand/layer0,
 /area/kutjevo/exterior/complex_border/botany_medical_cave)
+"rUE" = (
+/obj/structure/barricade/wooden{
+	dir = 4;
+	pixel_y = 4
+	},
+/turf/open/auto_turf/sand/layer1,
+/area/kutjevo/exterior/spring)
 "rUM" = (
 /obj/structure/blocker/forcefield/multitile_vehicles,
 /obj/structure/girder,
@@ -13212,6 +13538,9 @@
 /obj/effect/spawner/random/tool,
 /turf/open/auto_turf/sand/layer0,
 /area/kutjevo/interior/construction)
+"skx" = (
+/turf/open/auto_turf/sand/layer1,
+/area/kutjevo/exterior/spring)
 "slb" = (
 /obj/structure/machinery/light{
 	dir = 4
@@ -13299,6 +13628,10 @@
 	},
 /turf/open/auto_turf/sand/layer1,
 /area/kutjevo/exterior/scrubland)
+"soL" = (
+/obj/item/stack/sheet/wood/small_stack,
+/turf/open/auto_turf/sand/layer0,
+/area/kutjevo/exterior/spring)
 "soP" = (
 /obj/structure/platform/kutjevo/smooth{
 	dir = 1
@@ -13544,6 +13877,11 @@
 	},
 /turf/open/floor/kutjevo/colors,
 /area/kutjevo/interior/complex/botany)
+"sGS" = (
+/turf/open/desert/desert_shore/shore_edge1{
+	dir = 8
+	},
+/area/kutjevo/exterior/spring)
 "sHg" = (
 /obj/structure/bed/chair{
 	dir = 4
@@ -13859,6 +14197,12 @@
 "tax" = (
 /turf/open/gm/river/desert/shallow_edge,
 /area/kutjevo/exterior/runoff_dunes)
+"tbx" = (
+/obj/structure/flora/grass/tallgrass/desert/corner{
+	dir = 9
+	},
+/turf/open/auto_turf/sand/layer1,
+/area/kutjevo/exterior/spring)
 "tdC" = (
 /obj/structure/bed/chair{
 	dir = 4
@@ -14531,6 +14875,11 @@
 /obj/structure/blocker/invisible_wall,
 /turf/open/gm/river/desert/deep,
 /area/kutjevo/interior/oob)
+"uaz" = (
+/turf/open/desert/desert_shore/desert_shore1{
+	dir = 1
+	},
+/area/kutjevo/exterior/spring)
 "ubm" = (
 /obj/structure/machinery/light{
 	dir = 8
@@ -14558,6 +14907,11 @@
 /obj/structure/platform/kutjevo/rock,
 /turf/open/auto_turf/sand/layer0,
 /area/kutjevo/interior/colony_N_East)
+"ueM" = (
+/turf/open/desert/desert_shore/shore_corner2{
+	dir = 4
+	},
+/area/kutjevo/exterior/spring)
 "ueO" = (
 /obj/structure/prop/dam/boulder/boulder1,
 /turf/open/auto_turf/sand/layer0,
@@ -14899,6 +15253,9 @@
 	},
 /turf/open/auto_turf/sand/layer0,
 /area/kutjevo/exterior/complex_border/med_rec)
+"uzJ" = (
+/turf/open/auto_turf/sand/layer2,
+/area/kutjevo/exterior/spring)
 "uAh" = (
 /obj/structure/platform/kutjevo/smooth,
 /turf/open/floor/kutjevo/multi_tiles,
@@ -15150,6 +15507,10 @@
 	icon = 'icons/turf/floors/desert_water_toxic.dmi'
 	},
 /area/kutjevo/interior/oob)
+"uNW" = (
+/obj/structure/prop/dam/boulder/boulder2,
+/turf/open/auto_turf/sand/layer0,
+/area/kutjevo/interior/colony_South)
 "uNZ" = (
 /obj/structure/machinery/colony_floodlight,
 /obj/structure/platform/kutjevo/smooth{
@@ -15424,6 +15785,10 @@
 /obj/structure/machinery/vending/snack,
 /turf/open/floor/kutjevo/colors/red,
 /area/kutjevo/interior/complex/botany)
+"vdK" = (
+/obj/item/stack/sheet/wood/small_stack,
+/turf/open/desert/desert_shore/desert_shore1,
+/area/kutjevo/exterior/spring)
 "vdV" = (
 /obj/structure/blocker/invisible_wall,
 /obj/structure/filtration/machine_96x96/indestructible{
@@ -15498,6 +15863,10 @@
 /obj/effect/landmark/objective_landmark/medium,
 /turf/open/floor/kutjevo/colors/green,
 /area/kutjevo/interior/complex/botany)
+"vhC" = (
+/obj/structure/flora/grass/desert/lightgrass_11,
+/turf/open/auto_turf/sand/layer1,
+/area/kutjevo/exterior/spring)
 "vhQ" = (
 /obj/structure/platform_decoration/kutjevo/rock{
 	dir = 8
@@ -16316,6 +16685,16 @@
 	},
 /turf/open/floor/kutjevo/multi_tiles,
 /area/kutjevo/exterior/Northwest_Colony)
+"wrO" = (
+/turf/open/gm/river/desert/shallow_edge{
+	dir = 1
+	},
+/area/kutjevo/exterior/spring)
+"wrV" = (
+/turf/open/desert/desert_shore/desert_shore1{
+	dir = 4
+	},
+/area/kutjevo/exterior/spring)
 "wsf" = (
 /obj/structure/platform_decoration/kutjevo/rock{
 	dir = 8
@@ -16343,6 +16722,13 @@
 	dir = 1
 	},
 /area/kutjevo/interior/foremans_office)
+"wtk" = (
+/obj/structure/barricade/wooden{
+	dir = 4;
+	pixel_y = 4
+	},
+/turf/open/auto_turf/sand/layer0,
+/area/kutjevo/exterior/spring)
 "wtu" = (
 /obj/structure/platform_decoration/kutjevo{
 	dir = 4
@@ -17014,6 +17400,11 @@
 	dir = 8
 	},
 /area/kutjevo/interior/complex/med/operating)
+"xuN" = (
+/turf/open/desert/desert_shore/shore_edge1{
+	dir = 4
+	},
+/area/kutjevo/exterior/spring)
 "xuY" = (
 /obj/structure/barricade/wooden,
 /turf/open/floor/kutjevo/multi_tiles{
@@ -17034,6 +17425,9 @@
 /obj/structure/window/framed/kutjevo/reinforced,
 /turf/open/floor/plating/kutjevo,
 /area/kutjevo/interior/complex/med/pano)
+"xxf" = (
+/turf/open/gm/river/desert/shallow_corner,
+/area/kutjevo/exterior/spring)
 "xxz" = (
 /obj/structure/prop/dam/gravestone{
 	icon_state = "gravestone3"
@@ -17487,6 +17881,15 @@
 /obj/effect/landmark/objective_landmark/close,
 /turf/open/floor/kutjevo/tan/alt_inner_edge,
 /area/kutjevo/interior/complex/Northwest_Flight_Control)
+"yic" = (
+/obj/structure/flora/bush/desert{
+	icon_state = "tree_2";
+	pixel_y = 14
+	},
+/turf/open/desert/desert_shore/desert_shore1{
+	dir = 4
+	},
+/area/kutjevo/exterior/spring)
 "yir" = (
 /turf/open/floor/kutjevo/colors/orange,
 /area/kutjevo/interior/complex/botany/east)
@@ -43246,11 +43649,11 @@ bpj
 bpj
 bpj
 bpj
-dxF
-dxF
-dxF
-dxF
-dxF
+bpj
+bpj
+uzJ
+skx
+hRG
 dxF
 dxF
 dxF
@@ -43413,12 +43816,12 @@ bpj
 bpj
 bpj
 bpj
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
+bpj
+bpj
+skx
+skx
+skx
+skx
 dxF
 dxF
 dxF
@@ -43580,14 +43983,14 @@ bpj
 bpj
 oXH
 bpj
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
+bpj
+bpj
+skx
+skx
+skx
+skx
+iNI
+iNI
 dxF
 dxF
 dxF
@@ -43748,14 +44151,14 @@ npL
 bpj
 bpj
 bpj
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
+bpj
+skx
+skx
+skx
+uzJ
+skx
+skx
+iNI
 dxF
 dxF
 dxF
@@ -43915,16 +44318,16 @@ npL
 bpj
 bpj
 bpj
+bpj
 dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
+skx
+skx
+skx
+skx
+skx
+skx
+skx
+iNI
 dxF
 dxF
 dxF
@@ -44086,13 +44489,13 @@ dxF
 dxF
 dxF
 dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
+hRG
+skx
+mvX
+uzJ
+skx
+skx
+hRG
 dxF
 dxF
 dxF
@@ -44254,14 +44657,14 @@ dxF
 dxF
 dxF
 dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
+skx
+skx
+skx
+skx
+skx
+skx
+skx
+iNI
 dxF
 dxF
 dxF
@@ -44421,15 +44824,15 @@ dxF
 dxF
 dxF
 dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
+iNI
+skx
+skx
+skx
+skx
+skx
+skx
+skx
+skx
 dxF
 dxF
 dxF
@@ -44589,15 +44992,15 @@ dxF
 dxF
 dxF
 dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
+iNI
+skx
+skx
+uzJ
+skx
+skx
+skx
+skx
+iNI
 dxF
 dxF
 dxF
@@ -44757,14 +45160,14 @@ dxF
 dxF
 dxF
 dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
+skx
+skx
+skx
+skx
+skx
+uzJ
+uzJ
+skx
 dxF
 dxF
 dxF
@@ -44926,13 +45329,13 @@ dxF
 dxF
 dxF
 dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
+iNI
+skx
+skx
+skx
+mvX
+skx
+iNI
 dxF
 dxF
 dxF
@@ -45095,12 +45498,12 @@ dxF
 dxF
 dxF
 dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
+rDe
+skx
+skx
+skx
+skx
+iNI
 dxF
 dxF
 dxF
@@ -45263,12 +45666,12 @@ dxF
 dxF
 dxF
 dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
+iNI
+skx
+uzJ
+skx
+skx
+iNI
 dxF
 dxF
 dxF
@@ -45430,12 +45833,12 @@ dxF
 dxF
 dxF
 dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
+iNI
+skx
+uzJ
+uzJ
+skx
+skx
 dxF
 dxF
 dxF
@@ -45598,15 +46001,15 @@ dxF
 dxF
 dxF
 dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
+skx
+mAD
+fYr
+riT
+fYr
+skx
+skx
+skx
+pfK
 dxF
 dxF
 dxF
@@ -45766,16 +46169,16 @@ dxF
 dxF
 dxF
 dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
+skx
+eIq
+skx
+gHV
+skx
+uzJ
+kIQ
+skx
+skx
+skx
 dxF
 dxF
 dxF
@@ -45933,17 +46336,17 @@ dxF
 dxF
 dxF
 dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
+giY
+skx
+skx
+skx
+mvX
+skx
+skx
+skx
+skx
+kQa
+vhC
 dxF
 dxF
 dxF
@@ -46099,19 +46502,19 @@ dxF
 dxF
 dxF
 dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
+skx
+uzJ
+skx
+skx
+iNI
+iNI
+fdH
+iNI
+soL
+uzJ
+cKY
+mvX
+hRG
 dxF
 dxF
 dxF
@@ -46265,21 +46668,21 @@ dxF
 dxF
 dxF
 dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
+hRG
+skx
+skx
+skx
+iNI
+dcC
+kQD
+kQD
+kQD
+aXU
+nZC
+gHV
+eCE
+skx
+fne
 dxF
 dxF
 dxF
@@ -46432,21 +46835,21 @@ dxF
 dxF
 dxF
 dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
+skx
+uzJ
+skx
+iNI
+dcC
+qaU
+axi
+dnd
+hET
+vdK
+wtk
+riT
+rUE
+gBu
+rUE
 dxF
 dxF
 dxF
@@ -46599,21 +47002,21 @@ dxF
 dxF
 dxF
 dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
+fMB
+mvX
+iNI
+dcC
+qaU
+nPX
+dOj
+eVR
+kEh
+jac
+gFA
+iNI
+skx
+nPq
+qFh
 dxF
 dxF
 dxF
@@ -46765,23 +47168,23 @@ dxF
 dxF
 dxF
 dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
+kgx
+dGi
+uzJ
+iNI
+gsn
+nPX
+dOj
+eVR
+eVR
+mct
+hET
+ewl
+iNI
+skx
+oQb
+kgx
+dUc
 dxF
 dxF
 dxF
@@ -46932,23 +47335,23 @@ dxF
 dxF
 dxF
 dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
+kgx
+dGi
+skx
+iNI
+uaz
+wrO
+eVR
+eVR
+eVR
+eVR
+kEh
+gok
+iNI
+giY
+oQb
+kgx
+kgx
 dxF
 dxF
 dxF
@@ -47099,23 +47502,23 @@ dxF
 dxF
 dxF
 dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
+irb
+tbx
+skx
+iNI
+uaz
+wrO
+eVR
+eVR
+eVR
+eVR
+kEh
+ewl
+iNI
+skx
+oQb
+kgx
+kgx
 dxF
 dxF
 dxF
@@ -47266,23 +47669,23 @@ dxF
 dxF
 dxF
 dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
+skx
+skx
+skx
+iNI
+uaz
+dBt
+xxf
+eVR
+eVR
+gJx
+pmD
+ewl
+iNI
+skx
+obv
+dUc
+kgx
 dxF
 dxF
 dxF
@@ -47433,22 +47836,22 @@ dxF
 dxF
 dxF
 dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
+vhC
+uzJ
+skx
+iNI
+xuN
+ebv
+mNv
+myk
+myk
+lEf
+ueM
+sGS
+iNI
+kIQ
+skx
+obv
 dxF
 dxF
 dxF
@@ -47601,21 +48004,21 @@ dxF
 dxF
 dxF
 dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
+skx
+skx
+skx
+iNI
+xuN
+wrV
+wrV
+yic
+wrV
+sGS
+iNI
+skx
+skx
+skx
+skx
 dxF
 dxF
 dxF
@@ -47768,21 +48171,21 @@ dxF
 dxF
 dxF
 dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
+skx
+skx
+skx
+mvX
+iNI
+iNI
+iNI
+iNI
+iNI
+iNI
+skx
+uzJ
+skx
+skx
+uzJ
 dxF
 dxF
 dxF
@@ -47921,24 +48324,8 @@ npL
 bpj
 bpj
 bpj
-mMH
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
+bpj
+gBl
 dxF
 dxF
 dxF
@@ -47949,6 +48336,22 @@ dxF
 dxF
 dxF
 dxF
+iNI
+iNI
+jnD
+skx
+skx
+uzJ
+skx
+kIQ
+skx
+skx
+skx
+skx
+skx
+mvX
+skx
+hRG
 dxF
 dxF
 dxF
@@ -48088,6 +48491,8 @@ tCm
 bpj
 bpj
 bpj
+bpj
+bpj
 dxF
 dxF
 dxF
@@ -48097,24 +48502,22 @@ dxF
 dxF
 dxF
 dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
+rDe
+iNI
+uzJ
+skx
+riT
+skx
+giY
+skx
+skx
+skx
+nPq
+qFh
+qFh
+fMB
+uzJ
+vhC
 dxF
 dxF
 dxF
@@ -48254,26 +48657,10 @@ mMH
 bpj
 bpj
 bpj
-mMH
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
+bpj
+bpj
+bpj
+bpj
 dxF
 dxF
 dxF
@@ -48281,6 +48668,22 @@ dxF
 dxF
 dxF
 dxF
+iNI
+skx
+skx
+skx
+skx
+jnD
+skx
+skx
+skx
+skx
+uzJ
+oQb
+dUc
+kgx
+dGi
+skx
 dxF
 dxF
 dxF
@@ -48421,31 +48824,31 @@ wXd
 npL
 bpj
 bpj
+bpj
+bpj
+bpj
+bpj
+mMH
 mMH
 dxF
 dxF
 dxF
 dxF
+iNI
+skx
+mvX
+skx
+skx
+iNI
+iNI
 dxF
 dxF
 dxF
 dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
+skx
+oQb
+kgx
+hZx
 dxF
 dxF
 dxF
@@ -48588,21 +48991,21 @@ wXd
 bpj
 npL
 bpj
-qOP
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
+oXH
+bpj
+bpj
+bpj
+bpj
+bpj
+mMH
 dxF
 dxF
+skx
+skx
+uzJ
+skx
+iNI
+iNI
 dxF
 dxF
 dxF
@@ -48757,18 +49160,18 @@ bpj
 bpj
 mMH
 dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
+mMH
+bpj
+npL
+bpj
+bpj
+mMH
+bpj
+bpj
+skx
+skx
+skx
+iNI
 dxF
 dxF
 dxF
@@ -48925,16 +49328,16 @@ bpj
 dxF
 dxF
 dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
+bpj
+bpj
+bpj
+oXH
+bpj
+bpj
+bpj
+uzJ
+skx
+iNI
 dxF
 dxF
 dxF
@@ -49093,14 +49496,14 @@ dxF
 dxF
 dxF
 dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
+bpj
+bpj
+bpj
+bpj
+bpj
+bpj
+skx
+skx
 dxF
 dxF
 dxF
@@ -49260,12 +49663,12 @@ dxF
 dxF
 dxF
 dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
+mMH
+bpj
+bpj
+npL
+bpj
+mMH
 dxF
 dxF
 dxF
@@ -49429,10 +49832,10 @@ dxF
 dxF
 dxF
 dxF
-dxF
-dxF
-dxF
-dxF
+mMH
+bpj
+bpj
+mMH
 dxF
 dxF
 dxF
@@ -49596,11 +49999,11 @@ dxF
 dxF
 dxF
 dxF
-dxF
-dxF
-dxF
-dxF
-dxF
+mMH
+bpj
+bpj
+bpj
+mMH
 dxF
 dxF
 dxF
@@ -49763,11 +50166,11 @@ dxF
 dxF
 dxF
 dxF
-dxF
-dxF
-dxF
-dxF
-dxF
+uNW
+bpj
+bpj
+bpj
+mMH
 dxF
 dxF
 dxF
@@ -49931,10 +50334,10 @@ dxF
 dxF
 dxF
 dxF
-dxF
-dxF
-dxF
-dxF
+adG
+eaT
+rwC
+eaT
 dxF
 dxF
 dxF
@@ -50098,10 +50501,10 @@ dxF
 dxF
 dxF
 dxF
-dxF
-dxF
-dxF
-dxF
+mMH
+oXH
+bpj
+bpj
 dxF
 dxF
 dxF
@@ -50265,10 +50668,10 @@ dxF
 dxF
 dxF
 dxF
-dxF
-dxF
-dxF
-dxF
+mMH
+bpj
+bpj
+bpj
 dxF
 dxF
 dxF
@@ -50431,11 +50834,11 @@ dxF
 dxF
 dxF
 dxF
-dxF
-dxF
-dxF
-dxF
-dxF
+mMH
+bpj
+bpj
+bpj
+mMH
 dxF
 dxF
 dxF
@@ -50597,12 +51000,12 @@ dxF
 dxF
 dxF
 dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
+bpj
+bpj
+bpj
+npL
+bpj
+mMH
 dxF
 dxF
 dxF
@@ -50762,13 +51165,13 @@ dxF
 dxF
 dxF
 dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
+mMH
+bpj
+bpj
+bpj
+bpj
+bpj
+mMH
 dxF
 dxF
 dxF
@@ -50929,13 +51332,13 @@ dxF
 dxF
 dxF
 dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
+mMH
+bpj
+npL
+bpj
+bpj
+bpj
+mMH
 dxF
 dxF
 dxF
@@ -51095,13 +51498,13 @@ dxF
 dxF
 dxF
 dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
+bpj
+bpj
+bpj
+bpj
+bpj
+bpj
+npL
 dxF
 dxF
 dxF
@@ -51262,12 +51665,12 @@ dxF
 dxF
 dxF
 dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
+bpj
+bpj
+oXH
+bpj
+bpj
+bpj
 dxF
 dxF
 dxF
@@ -51428,13 +51831,13 @@ dxF
 dxF
 dxF
 dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
+mMH
+bpj
+npL
+bpj
+bpj
+bpj
+bpj
 dxF
 dxF
 dxF
@@ -51595,12 +51998,12 @@ dxF
 dxF
 dxF
 dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
+mMH
+bpj
+bpj
+bpj
+bpj
+mMH
 dxF
 dxF
 dxF
@@ -51760,13 +52163,13 @@ bpj
 bpj
 dxF
 dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
+bpj
+bpj
+bpj
+bpj
+npL
+bpj
+mMH
 dxF
 dxF
 dxF
@@ -51926,13 +52329,13 @@ bpj
 bpj
 bpj
 mMH
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
+bpj
+npL
+bpj
+bpj
+bpj
+bpj
+bpj
 dxF
 dxF
 dxF
@@ -52093,13 +52496,13 @@ bpj
 oXH
 bpj
 bpj
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
+bpj
+bpj
+oXH
+bpj
+bpj
+mMH
+mMH
 dxF
 dxF
 dxF
@@ -52260,11 +52663,11 @@ bpj
 bpj
 bpj
 bpj
-dxF
-dxF
-dxF
-dxF
-dxF
+bpj
+bpj
+bpj
+npL
+mMH
 dxF
 dxF
 dxF
@@ -52428,9 +52831,9 @@ bpj
 bpj
 bpj
 mMH
-dxF
-dxF
-dxF
+bpj
+bpj
+bpj
 dxF
 dxF
 dxF

From 95d92c107d784d6bbee683e62fb921670f2951fb Mon Sep 17 00:00:00 2001
From: cm13-github <128137806+cm13-github@users.noreply.github.com>
Date: Wed, 29 Nov 2023 13:45:31 +0000
Subject: [PATCH 06/58] Automatic changelog for PR #5039 [ci skip]

---
 html/changelogs/AutoChangeLog-pr-5039.yml | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 html/changelogs/AutoChangeLog-pr-5039.yml

diff --git a/html/changelogs/AutoChangeLog-pr-5039.yml b/html/changelogs/AutoChangeLog-pr-5039.yml
new file mode 100644
index 000000000000..c16d44141a92
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-5039.yml
@@ -0,0 +1,4 @@
+author: "HeresKozmos"
+delete-after: True
+changes:
+  - mapadd: "added a new spring area to kutjevo's south caves"
\ No newline at end of file

From 26ae7065b6912ba792ae93b0310610d080747931 Mon Sep 17 00:00:00 2001
From: SabreML <57483089+SabreML@users.noreply.github.com>
Date: Wed, 29 Nov 2023 14:22:45 +0000
Subject: [PATCH 07/58] Fixes Kutjevo space tiles (#5050)

# About the pull request

Fixes #5013 by replacing a couple of space tiles under a window with
plating.
(They were in a 'Nightmare' submap, so I didn't need to touch the main
map file.)

I also checked the other maps for any more hidden space tiles, and found
a few out of bounds in Whiskey Outpost, so I figured I'd add those too.

# Explain why it's good for the game
They don't actually seem to do anything bad, but either way spess tiles
shouldn't be visible on a ground map.
# Testing Photographs and Procedure
<details>
<summary>Screenshots</summary>

**Before:**

![scrnshot1](https://github.com/cmss13-devs/cmss13/assets/57483089/24b104bd-73bf-4de4-86d7-496db8bb9fef)

**After:**

![scrnshot2](https://github.com/cmss13-devs/cmss13/assets/57483089/f99538a2-e16b-4aaf-927c-38a0abfc22ed)

</details>


# Changelog
:cl:
fix: Fixed a few space tiles under a window in Kutjevo Refinery.
/:cl:
---
 maps/map_files/Kutjevo/sprinkles/35.communications.dmm   | 8 ++------
 maps/map_files/Whiskey_Outpost_v2/Whiskey_Outpost_v2.dmm | 9 +++------
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/maps/map_files/Kutjevo/sprinkles/35.communications.dmm b/maps/map_files/Kutjevo/sprinkles/35.communications.dmm
index 235f370b4321..bc89cfab0105 100644
--- a/maps/map_files/Kutjevo/sprinkles/35.communications.dmm
+++ b/maps/map_files/Kutjevo/sprinkles/35.communications.dmm
@@ -108,10 +108,6 @@
 	dir = 1
 	},
 /area/template_noop)
-"qI" = (
-/obj/structure/window/framed/kutjevo,
-/turf/open/space/basic,
-/area/template_noop)
 "qM" = (
 /obj/structure/machinery/light,
 /obj/effect/decal/cleanable/blood/oil,
@@ -492,7 +488,7 @@ Re
 EK
 "}
 (5,1,1) = {"
-qI
+EK
 wC
 rG
 LO
@@ -506,7 +502,7 @@ cm
 YO
 "}
 (6,1,1) = {"
-qI
+EK
 rm
 lZ
 nn
diff --git a/maps/map_files/Whiskey_Outpost_v2/Whiskey_Outpost_v2.dmm b/maps/map_files/Whiskey_Outpost_v2/Whiskey_Outpost_v2.dmm
index 36c8e9abe717..917759783a2a 100644
--- a/maps/map_files/Whiskey_Outpost_v2/Whiskey_Outpost_v2.dmm
+++ b/maps/map_files/Whiskey_Outpost_v2/Whiskey_Outpost_v2.dmm
@@ -2220,9 +2220,6 @@
 	icon_state = "floor_plate"
 	},
 /area/whiskey_outpost/inside/living)
-"hP" = (
-/turf/open/space/basic,
-/area/whiskey_outpost/inside/caves)
 "hQ" = (
 /turf/open/floor/prison{
 	icon_state = "floor_plate"
@@ -22778,7 +22775,7 @@ mT
 mT
 mT
 mT
-hP
+mT
 mT
 mT
 dl
@@ -23177,12 +23174,12 @@ mT
 mT
 mT
 mT
-hP
 mT
 mT
 mT
 mT
-hP
+mT
+mT
 mT
 mT
 qz

From 5cbdba92131fd33973b1e684838ffb8f1feecac2 Mon Sep 17 00:00:00 2001
From: cm13-github <128137806+cm13-github@users.noreply.github.com>
Date: Wed, 29 Nov 2023 14:31:20 +0000
Subject: [PATCH 08/58] Automatic changelog for PR #5050 [ci skip]

---
 html/changelogs/AutoChangeLog-pr-5050.yml | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 html/changelogs/AutoChangeLog-pr-5050.yml

diff --git a/html/changelogs/AutoChangeLog-pr-5050.yml b/html/changelogs/AutoChangeLog-pr-5050.yml
new file mode 100644
index 000000000000..c78f4bdeb197
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-5050.yml
@@ -0,0 +1,4 @@
+author: "SabreML"
+delete-after: True
+changes:
+  - bugfix: "Fixed a few space tiles under a window in Kutjevo Refinery."
\ No newline at end of file

From c86715c4577c3bb1744a99910e77c96f52307cfa Mon Sep 17 00:00:00 2001
From: Birdtalon <birdtalon@gmail.com>
Date: Wed, 29 Nov 2023 21:20:08 +0000
Subject: [PATCH 09/58] Refactors Xenomorph initialize (#4991)

<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->

# About the pull request

Refactors /mob/living/carbon/xenomorph/Initialize() removes a few
duplicate proc calls, generate_name() called twice,
recalculate_actions() called twice etc.

# Explain why it's good for the game

<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding, and may discourage maintainers from reviewing or merging
your PR. This section is not strictly required for (non-controversial)
fix PRs or backend PRs. -->


# Testing Photographs and Procedure
<!-- Include any screenshots/videos/debugging steps of the modified code
functioning successfully, ideally including edge cases. -->
<details>
<summary>Screenshots & Videos</summary>

Put screenshots and videos here with an empty line between the
screenshots and the `<details>` tags.

</details>


# Changelog

<!-- If your PR modifies aspects of the game that can be concretely
observed by players or admins you should add a changelog. If your change
does NOT meet this description, remove this section. Be sure to properly
label your changes in the changelog. Please note that maintainers freely
reserve the right to remove and add tags should they deem it
appropriate. You can attempt to finagle the system all you want, but
it's best to shoot for clear communication right off the bat. -->
<!-- If you add a name after the ':cl', that name will be used in the
changelog. You must add your CKEY after the CL if your GitHub name
doesn't match. Maintainers freely reserve the right to remove and add
tags should they deem it appropriate. -->

:cl:
code: Refactiors xenomorph initialize & removes some duplicate proc
calls
/:cl:

<!-- Both :cl:'s are required for the changelog to work! -->
---
 .../mob/living/carbon/xenomorph/Xenomorph.dm  | 201 +++++++++---------
 .../living/carbon/xenomorph/castes/Queen.dm   |   1 +
 2 files changed, 102 insertions(+), 100 deletions(-)

diff --git a/code/modules/mob/living/carbon/xenomorph/Xenomorph.dm b/code/modules/mob/living/carbon/xenomorph/Xenomorph.dm
index cf3be6de9086..645ade04ea4f 100644
--- a/code/modules/mob/living/carbon/xenomorph/Xenomorph.dm
+++ b/code/modules/mob/living/carbon/xenomorph/Xenomorph.dm
@@ -347,157 +347,158 @@
 	var/atom/movable/vis_obj/xeno_wounds/wound_icon_holder
 	var/atom/movable/vis_obj/xeno_pack/backpack_icon_holder
 
-/mob/living/carbon/xenomorph/Initialize(mapload, mob/living/carbon/xenomorph/oldXeno, h_number)
-	var/area/A = get_area(src)
-	if(A && A.statistic_exempt)
-		statistic_exempt = TRUE
+/mob/living/carbon/xenomorph/Initialize(mapload, mob/living/carbon/xenomorph/old_xeno, hivenumber)
+
+	if(old_xeno && old_xeno.hivenumber)
+		src.hivenumber = old_xeno.hivenumber
+	else if(hivenumber)
+		src.hivenumber = hivenumber
+
+	var/datum/hive_status/hive = GLOB.hive_datum[src.hivenumber]
+
+	if(hive)
+		hive.add_xeno(src)
 
 	wound_icon_holder = new(null, src)
 	vis_contents += wound_icon_holder
 
-	if(oldXeno)
-		set_movement_intent(oldXeno.m_intent)
-		hivenumber = oldXeno.hivenumber
-		nicknumber = oldXeno.nicknumber
-		life_kills_total = oldXeno.life_kills_total
-		life_damage_taken_total = oldXeno.life_damage_taken_total
-		evolution_stored = oldXeno.evolution_stored
-		if(oldXeno.iff_tag)
-			iff_tag = oldXeno.iff_tag
-			iff_tag.forceMove(src)
-			oldXeno.iff_tag = null
-	else if (h_number)
-		hivenumber = h_number
-
 	set_languages(list(LANGUAGE_XENOMORPH, LANGUAGE_HIVEMIND))
-	if(oldXeno)
-		for(var/datum/language/L in oldXeno.languages)
-			add_language(L.name)//Make sure to keep languages (mostly for event Queens that know English)
 
-	// Well, not yet, technically
-	var/datum/hive_status/in_hive = GLOB.hive_datum[hivenumber]
-	if(in_hive)
-		in_hive.add_xeno(src)
-		// But now we are!
+	///Handle transferring things from the old Xeno if we have one in the case of evolve, devolve etc.
+	if(old_xeno)
+		src.nicknumber = old_xeno.nicknumber
+		src.life_kills_total = old_xeno.life_kills_total
+		src.life_damage_taken_total = old_xeno.life_damage_taken_total
+		src.evolution_stored = old_xeno.evolution_stored
 
-	for(var/T in in_hive.hive_inherant_traits)
-		ADD_TRAIT(src, T, TRAIT_SOURCE_HIVE)
+		for(var/datum/language/language as anything in old_xeno.languages)
+			add_language(language.name)//Make sure to keep languages (mostly for event Queens that know English)
+
+		//Carry over intents & targeted limb to the new Xeno
+		set_movement_intent(old_xeno.m_intent)
+		a_intent_change(old_xeno.a_intent)
+
+		//We are hiding, let's keep hiding if we can!
+		if(old_xeno.layer == XENO_HIDING_LAYER)
+			for(var/datum/action/xeno_action/onclick/xenohide/hide in actions)
+				layer = XENO_HIDING_LAYER
+				hide.button.icon_state = "template_active"
+
+		//If we're holding things drop them
+		for(var/obj/item/item in old_xeno.contents) //Drop stuff
+			old_xeno.drop_inv_item_on_ground(item)
+		old_xeno.empty_gut()
+
+		if(old_xeno.iff_tag)
+			iff_tag = old_xeno.iff_tag
+			iff_tag.forceMove(src)
+			old_xeno.iff_tag = null
+
+	if(hive)
+		for(var/trait in hive.hive_inherant_traits)
+			ADD_TRAIT(src, trait, TRAIT_SOURCE_HIVE)
 
 	mutators.xeno = src
 
+	//Set caste stuff
 	if(caste_type && GLOB.xeno_datum_list[caste_type])
 		caste = GLOB.xeno_datum_list[caste_type]
-	else
-		to_world("something went very wrong")
-		return
 
-	update_icon_source()
+		//Fire immunity signals
+		if (caste.fire_immunity != FIRE_IMMUNITY_NONE)
+			if(caste.fire_immunity & FIRE_IMMUNITY_NO_IGNITE)
+				RegisterSignal(src, COMSIG_LIVING_PREIGNITION, PROC_REF(fire_immune))
 
-	acid_splash_cooldown = caste.acid_splash_cooldown
+			RegisterSignal(src, list(COMSIG_LIVING_FLAMER_CROSSED, COMSIG_LIVING_FLAMER_FLAMED), PROC_REF(flamer_crossed_immune))
+		else
+			UnregisterSignal(src, list(
+				COMSIG_LIVING_PREIGNITION,
+				COMSIG_LIVING_FLAMER_CROSSED,
+				COMSIG_LIVING_FLAMER_FLAMED
+			))
 
-	if (caste.fire_immunity != FIRE_IMMUNITY_NONE)
-		if(caste.fire_immunity & FIRE_IMMUNITY_NO_IGNITE)
-			RegisterSignal(src, COMSIG_LIVING_PREIGNITION, PROC_REF(fire_immune))
-		RegisterSignal(src, list(
-			COMSIG_LIVING_FLAMER_CROSSED,
-			COMSIG_LIVING_FLAMER_FLAMED,
-		), PROC_REF(flamer_crossed_immune))
-	else
-		UnregisterSignal(src, list(
-			COMSIG_LIVING_PREIGNITION,
-			COMSIG_LIVING_FLAMER_CROSSED,
-			COMSIG_LIVING_FLAMER_FLAMED,
-		))
+		if(caste.spit_types && length(caste.spit_types))
+			ammo = GLOB.ammo_list[caste.spit_types[1]]
 
-	recalculate_everything()
+		acid_splash_cooldown = caste.acid_splash_cooldown
+
+		if(caste.adjust_size_x != 1)
+			var/matrix/matrix = matrix()
+			matrix.Scale(caste.adjust_size_x, caste.adjust_size_y)
+			apply_transform(matrix)
+
+		behavior_delegate = new caste.behavior_delegate_type()
+		behavior_delegate.bound_xeno = src
+		behavior_delegate.add_to_xeno()
+		resin_build_order = caste.resin_build_order
+
+		job = caste.caste_type // Used for tracking the caste playtime
+
+	else
+		CRASH("Attempted to create a new xenomorph [src] without caste datum.")
 
 	if(mob_size < MOB_SIZE_BIG)
 		mob_flags |= SQUEEZE_UNDER_VEHICLES
 
+	// More setup stuff for names, abilities etc
+	update_icon_source()
 	generate_name()
+	add_inherent_verbs()
+	add_abilities()
+	create_reagents(100)
+	regenerate_icons()
 
-	if(isqueen(src))
-		SStracking.set_leader("hive_[hivenumber]", src)
-	SStracking.start_tracking("hive_[hivenumber]", src)
+	toggle_xeno_hostilehud()
+	recalculate_everything()
+	toggle_xeno_mobhud() //This is a verb, but fuck it, it just werks
 
 	. = ..()
+
+					//Set leader to the new mob
+	if(old_xeno && hive && IS_XENO_LEADER(old_xeno))
+		hive.replace_hive_leader(old_xeno, src)
+
+	//Begin SStracking
+	SStracking.start_tracking("hive_[src.hivenumber]", src)
+
+	GLOB.living_xeno_list += src
+	GLOB.xeno_mob_list += src
+
 	//WO GAMEMODE
 	if(SSticker?.mode?.hardcore)
 		hardcore = 1 //Prevents healing and queen evolution
 	time_of_birth = world.time
 
-	add_inherent_verbs()
-	add_abilities()
-	recalculate_actions()
-
+	//Minimap
 	if(z)
 		INVOKE_NEXT_TICK(src, PROC_REF(add_minimap_marker))
 
+	//Sight
 	sight |= SEE_MOBS
 	see_invisible = SEE_INVISIBLE_LIVING
 	see_in_dark = 12
+
 	if(client)
 		set_lighting_alpha_from_prefs(client)
 	else
 		lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE
 
-	if(caste && caste.spit_types && caste.spit_types.len)
-		ammo = GLOB.ammo_list[caste.spit_types[1]]
-
-	create_reagents(100)
-
-	GLOB.living_xeno_list += src
-	GLOB.xeno_mob_list += src
-
-	if(caste && caste.adjust_size_x != 1)
-		var/matrix/M = matrix()
-		M.Scale(caste.adjust_size_x, caste.adjust_size_y)
-		apply_transform(M)
-
-	if(caste)
-		behavior_delegate = new caste.behavior_delegate_type()
-		behavior_delegate.bound_xeno = src
-		behavior_delegate.add_to_xeno()
-		resin_build_order = caste.resin_build_order
-	else
-		CRASH("Xenomorph [src] has no caste datum! Tell the devs!")
-
-	regenerate_icons()
-	toggle_xeno_mobhud() //This is a verb, but fuck it, it just werks
-	toggle_xeno_hostilehud()
-
-	if(oldXeno)
-		a_intent_change(oldXeno.a_intent)//Keep intent
-
-		if(oldXeno.layer == XENO_HIDING_LAYER)
-			//We are hiding, let's keep hiding if we can!
-			for(var/datum/action/xeno_action/onclick/xenohide/hide in actions)
-				if(istype(hide))
-					layer = XENO_HIDING_LAYER
-					hide.button.icon_state = "template_active"
-
-		for(var/obj/item/W in oldXeno.contents) //Drop stuff
-			oldXeno.drop_inv_item_on_ground(W)
-
-		oldXeno.empty_gut()
-
-		if(IS_XENO_LEADER(oldXeno))
-			hive.replace_hive_leader(oldXeno, src)
-
 	// Only handle free slots if the xeno is not in tdome
-	if(!is_admin_level(z))
+	if(hive && !is_admin_level(z))
 		var/selected_caste = GLOB.xeno_datum_list[caste_type]?.type
 		hive.used_slots[selected_caste]++
 
+	//Statistics
+	var/area/current_area = get_area(src)
+	if(current_area && current_area.statistic_exempt)
+		statistic_exempt = TRUE
 	if(GLOB.round_statistics && !statistic_exempt)
 		GLOB.round_statistics.track_new_participant(faction, 1)
-	generate_name()
 
 	// This can happen if a xeno gets made before the game starts
 	if (hive && hive.hive_ui)
 		hive.hive_ui.update_all_xeno_data()
 
-	job = caste.caste_type // Used for tracking the caste playtime
 	Decorate()
 
 	RegisterSignal(src, COMSIG_MOB_SCREECH_ACT, PROC_REF(handle_screech_act))
diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Queen.dm b/code/modules/mob/living/carbon/xenomorph/castes/Queen.dm
index e6f4dfae8a44..ceedff03f2aa 100644
--- a/code/modules/mob/living/carbon/xenomorph/castes/Queen.dm
+++ b/code/modules/mob/living/carbon/xenomorph/castes/Queen.dm
@@ -389,6 +389,7 @@
 
 /mob/living/carbon/xenomorph/queen/Initialize()
 	. = ..()
+	SStracking.set_leader("hive_[hivenumber]", src)
 	if(!is_admin_level(z))//so admins can safely spawn Queens in Thunderdome for tests.
 		xeno_message(SPAN_XENOANNOUNCE("A new Queen has risen to lead the Hive! Rejoice!"),3,hivenumber)
 		notify_ghosts(header = "New Queen", message = "A new Queen has risen.", source = src, action = NOTIFY_ORBIT)

From 5e3e04edebd5800cab216b71118ee532780007ca Mon Sep 17 00:00:00 2001
From: cm13-github <128137806+cm13-github@users.noreply.github.com>
Date: Wed, 29 Nov 2023 21:30:53 +0000
Subject: [PATCH 10/58] Automatic changelog for PR #4991 [ci skip]

---
 html/changelogs/AutoChangeLog-pr-4991.yml | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 html/changelogs/AutoChangeLog-pr-4991.yml

diff --git a/html/changelogs/AutoChangeLog-pr-4991.yml b/html/changelogs/AutoChangeLog-pr-4991.yml
new file mode 100644
index 000000000000..857c9c0894d2
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-4991.yml
@@ -0,0 +1,4 @@
+author: "Birdtalon"
+delete-after: True
+changes:
+  - code_imp: "Refactiors xenomorph initialize & removes some duplicate proc calls"
\ No newline at end of file

From ddc6c67c1d53eb203e0590592a060f48e44fcdb2 Mon Sep 17 00:00:00 2001
From: harryob <me@harryob.live>
Date: Wed, 29 Nov 2023 21:51:14 +0000
Subject: [PATCH 11/58] fixes orbit menu for 0 health and admins refreshing
 (#5032)

closes #5031

:cl:
fix: the health indicator in the tooltip and colorbox is still present
when a POI has 0 health
fix: admins can refresh the orbit menu without runtimes
/:cl:
---
 code/modules/mob/dead/observer/orbit.dm        |  2 +-
 tgui/packages/tgui/interfaces/Orbit/helpers.ts |  4 +++-
 tgui/packages/tgui/interfaces/Orbit/index.tsx  | 14 +++++++++-----
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/code/modules/mob/dead/observer/orbit.dm b/code/modules/mob/dead/observer/orbit.dm
index 06e404a43555..5fe27c5e5167 100644
--- a/code/modules/mob/dead/observer/orbit.dm
+++ b/code/modules/mob/dead/observer/orbit.dm
@@ -65,7 +65,7 @@
 
 	var/is_admin = FALSE
 	if(user && user.client)
-		is_admin = check_other_rights(user.client, R_ADMIN, FALSE)
+		is_admin = check_client_rights(user.client, R_ADMIN, FALSE)
 	var/list/pois = getpois(skip_mindless = !is_admin, specify_dead_role = FALSE)
 	for(var/name in pois)
 		var/list/serialized = list()
diff --git a/tgui/packages/tgui/interfaces/Orbit/helpers.ts b/tgui/packages/tgui/interfaces/Orbit/helpers.ts
index a43aaf1ff0b0..9facaf339b29 100644
--- a/tgui/packages/tgui/interfaces/Orbit/helpers.ts
+++ b/tgui/packages/tgui/interfaces/Orbit/helpers.ts
@@ -31,7 +31,9 @@ export const getDisplayName = (full_name: string, nickname?: string) => {
 };
 
 /** Returns the display color for certain health percentages */
-export const getHealthColor = (health: number) => {
+export const getHealthColor = (health?: number) => {
+  if (!health) return 'bad';
+
   switch (true) {
     case health > HEALTH.Good:
       return 'good';
diff --git a/tgui/packages/tgui/interfaces/Orbit/index.tsx b/tgui/packages/tgui/interfaces/Orbit/index.tsx
index e9e345995271..83dfe3b361b2 100644
--- a/tgui/packages/tgui/interfaces/Orbit/index.tsx
+++ b/tgui/packages/tgui/interfaces/Orbit/index.tsx
@@ -215,6 +215,8 @@ const ObservableItem = (
 
   const [autoObserve] = useLocalState<boolean>(context, 'autoObserve', false);
 
+  const displayHealth = typeof health === 'number';
+
   return (
     <Button
       color={'transparent'}
@@ -225,9 +227,9 @@ const ObservableItem = (
         'color': color ? 'white' : 'grey',
       }}
       onClick={() => act('orbit', { ref: ref })}
-      tooltip={!!health && <ObservableTooltip item={item} />}
+      tooltip={displayHealth && <ObservableTooltip item={item} />}
       tooltipPosition="bottom-start">
-      {!!health && (
+      {displayHealth && (
         <ColorBox
           color={getHealthColor(health)}
           style={{ 'margin-right': '0.5em' }}
@@ -250,7 +252,9 @@ const ObservableTooltip = (props: { item: Observable }) => {
   const {
     item: { caste, health, job, full_name, icon, background_color },
   } = props;
-  const displayHealth = !!health && health >= 0 ? `${health}%` : 'Critical';
+
+  const displayHealth = typeof health === 'number';
+  const healthText = !!health && health >= 0 ? `${health}%` : 'Critical';
 
   return (
     <LabeledList>
@@ -273,8 +277,8 @@ const ObservableTooltip = (props: { item: Observable }) => {
           {job}
         </LabeledList.Item>
       )}
-      {!!health && (
-        <LabeledList.Item label="Health">{displayHealth}</LabeledList.Item>
+      {displayHealth && (
+        <LabeledList.Item label="Health">{healthText}</LabeledList.Item>
       )}
     </LabeledList>
   );

From 2f48db40ff09db0806863e22eed5641f1d39072a Mon Sep 17 00:00:00 2001
From: cm13-github <128137806+cm13-github@users.noreply.github.com>
Date: Wed, 29 Nov 2023 21:59:43 +0000
Subject: [PATCH 12/58] Automatic changelog for PR #5032 [ci skip]

---
 html/changelogs/AutoChangeLog-pr-5032.yml | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 html/changelogs/AutoChangeLog-pr-5032.yml

diff --git a/html/changelogs/AutoChangeLog-pr-5032.yml b/html/changelogs/AutoChangeLog-pr-5032.yml
new file mode 100644
index 000000000000..c355c467a42b
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-5032.yml
@@ -0,0 +1,5 @@
+author: "harryob"
+delete-after: True
+changes:
+  - bugfix: "the health indicator in the tooltip and colorbox is still present when a POI has 0 health"
+  - bugfix: "admins can refresh the orbit menu without runtimes"
\ No newline at end of file

From 3f79ad3c7a8f1896d97a891dfc7627d0508d414b Mon Sep 17 00:00:00 2001
From: Julian56 <117036822+Huffie56@users.noreply.github.com>
Date: Wed, 29 Nov 2023 23:13:29 +0100
Subject: [PATCH 13/58] added a file to handle the fridges in kitchen on
 almayer and added a bunch of food boxes. (#4586)

# About the pull request
i wanted to make it more clear code wise and separating the fridge used
on colony and other places from main kitchen.
the food boxes are there to help make stock version having less item
into them and make it cleaner.
made two version of each fridge on that hold less for the front kitchen
and one for the stock in the back room that hold way more.
remove a bunch of food crate that are duplicate with the vendor.
add a vendor that sell boxes of ingredients.
<!-- Remove this text and explain what the purpose of your PR is.

Mention if you have tested your changes. If you changed a map, make sure
you used the mapmerge tool.
If this is an Issue Correction, you can type "Fixes Issue #169420" to
link the PR to the corresponding Issue number #169420.

Remember: something that is self-evident to you might not be to others.
Explain your rationale fully, even if you feel it goes without saying.
-->

# Explain why it's good for the game
better organization for kitchen and separation from other fridge allow
to not add item on top of fridge if you want to give him more...
cook will now be able to buy directly will hydroponic will stay viable
and they are still able to order or receive supply from req..

# Testing Photographs and Procedure
<details>
<summary>Screenshots & Videos</summary>

Put screenshots and videos here with an empty line between the
screenshots and the `<details>` tags.

</details>


# Changelog
:cl:
add: Added a lot's of food boxes for that hold the basic ingredients for
cooking.
add: Added a file to handle the fridges in almayer kitchen.
add: Added a vendor in the kitchen that sell boxes of ingredients.
add: Added a a food crate called surplus boxes ingredient containing
random boxes of ingredients.
add: Added a version of this crate that will be freely given via the ASR
system.
/:cl:

---------

Co-authored-by: Julien <jverger.ingx@gmail.com>
---
 code/datums/ASRS.dm                           |    5 +
 code/datums/supply_packs/food.dm              |  204 +-
 code/game/machinery/vending/vending_types.dm  |   66 +
 code/game/objects/items/storage/boxes.dm      |  208 +
 .../crates_lockers/closets/secure/kitchen.dm  |  143 +
 colonialmarines.dme                           |    1 +
 maps/map_files/USS_Almayer/USS_Almayer.dmm    | 6277 +++++++++--------
 7 files changed, 3602 insertions(+), 3302 deletions(-)
 create mode 100644 code/game/objects/structures/crates_lockers/closets/secure/kitchen.dm

diff --git a/code/datums/ASRS.dm b/code/datums/ASRS.dm
index 86a7363f07ea..73b0f4e1c6a9 100644
--- a/code/datums/ASRS.dm
+++ b/code/datums/ASRS.dm
@@ -132,3 +132,8 @@
 	buyable = 0
 	group = "ASRS"
 	cost = ASRS_VERY_LOW_WEIGHT
+
+/datum/supply_packs/ingredient/asrs
+	buyable = 0
+	group = "ASRS"
+	cost = ASRS_LOW_WEIGHT
diff --git a/code/datums/supply_packs/food.dm b/code/datums/supply_packs/food.dm
index 9e0527aed6cf..f74567c78a89 100644
--- a/code/datums/supply_packs/food.dm
+++ b/code/datums/supply_packs/food.dm
@@ -1,144 +1,47 @@
 //Food.Regrouping all the ASRS crate related to food here.
-
-//All the ingredients that you can grown.
-
-/datum/supply_packs/potato
-	name = "Potatoes(x20)"
-	contains = list(
-		/obj/item/reagent_container/food/snacks/grown/potato,
-		/obj/item/reagent_container/food/snacks/grown/potato,
-		/obj/item/reagent_container/food/snacks/grown/potato,
-		/obj/item/reagent_container/food/snacks/grown/potato,
-		/obj/item/reagent_container/food/snacks/grown/potato,
-		/obj/item/reagent_container/food/snacks/grown/potato,
-		/obj/item/reagent_container/food/snacks/grown/potato,
-		/obj/item/reagent_container/food/snacks/grown/potato,
-		/obj/item/reagent_container/food/snacks/grown/potato,
-		/obj/item/reagent_container/food/snacks/grown/potato,
-		/obj/item/reagent_container/food/snacks/grown/potato,
-		/obj/item/reagent_container/food/snacks/grown/potato,
-		/obj/item/reagent_container/food/snacks/grown/potato,
-		/obj/item/reagent_container/food/snacks/grown/potato,
-		/obj/item/reagent_container/food/snacks/grown/potato,
-		/obj/item/reagent_container/food/snacks/grown/potato,
-		/obj/item/reagent_container/food/snacks/grown/potato,
-		/obj/item/reagent_container/food/snacks/grown/potato,
-		/obj/item/reagent_container/food/snacks/grown/potato,
-		/obj/item/reagent_container/food/snacks/grown/potato,
-	)
-	cost = 10
-	containertype = /obj/structure/closet/crate/freezer
-	containername = "\improper Potato crate"
-	group = "Food"
-
-/datum/supply_packs/tomato
-	name = "tomato (x20)"
-	contains = list(
-		/obj/item/reagent_container/food/snacks/grown/tomato,
-		/obj/item/reagent_container/food/snacks/grown/tomato,
-		/obj/item/reagent_container/food/snacks/grown/tomato,
-		/obj/item/reagent_container/food/snacks/grown/tomato,
-		/obj/item/reagent_container/food/snacks/grown/tomato,
-		/obj/item/reagent_container/food/snacks/grown/tomato,
-		/obj/item/reagent_container/food/snacks/grown/tomato,
-		/obj/item/reagent_container/food/snacks/grown/tomato,
-		/obj/item/reagent_container/food/snacks/grown/tomato,
-		/obj/item/reagent_container/food/snacks/grown/tomato,
-		/obj/item/reagent_container/food/snacks/grown/tomato,
-		/obj/item/reagent_container/food/snacks/grown/tomato,
-		/obj/item/reagent_container/food/snacks/grown/tomato,
-		/obj/item/reagent_container/food/snacks/grown/tomato,
-		/obj/item/reagent_container/food/snacks/grown/tomato,
-		/obj/item/reagent_container/food/snacks/grown/tomato,
-		/obj/item/reagent_container/food/snacks/grown/tomato,
-		/obj/item/reagent_container/food/snacks/grown/tomato,
-		/obj/item/reagent_container/food/snacks/grown/tomato,
-		/obj/item/reagent_container/food/snacks/grown/tomato,
-	)
-	cost = 10
-	containertype = /obj/structure/closet/crate/freezer
-	containername = "\improper Tomato crate"
-	group = "Food"
-
-/datum/supply_packs/wheat
-	name = "wheat (x20)"
-	contains = list(
-		/obj/item/reagent_container/food/snacks/grown/wheat,
-		/obj/item/reagent_container/food/snacks/grown/wheat,
-		/obj/item/reagent_container/food/snacks/grown/wheat,
-		/obj/item/reagent_container/food/snacks/grown/wheat,
-		/obj/item/reagent_container/food/snacks/grown/wheat,
-		/obj/item/reagent_container/food/snacks/grown/wheat,
-		/obj/item/reagent_container/food/snacks/grown/wheat,
-		/obj/item/reagent_container/food/snacks/grown/wheat,
-		/obj/item/reagent_container/food/snacks/grown/wheat,
-		/obj/item/reagent_container/food/snacks/grown/wheat,
-		/obj/item/reagent_container/food/snacks/grown/wheat,
-		/obj/item/reagent_container/food/snacks/grown/wheat,
-		/obj/item/reagent_container/food/snacks/grown/wheat,
-		/obj/item/reagent_container/food/snacks/grown/wheat,
-		/obj/item/reagent_container/food/snacks/grown/wheat,
-		/obj/item/reagent_container/food/snacks/grown/wheat,
-		/obj/item/reagent_container/food/snacks/grown/wheat,
-		/obj/item/reagent_container/food/snacks/grown/wheat,
-		/obj/item/reagent_container/food/snacks/grown/wheat,
-		/obj/item/reagent_container/food/snacks/grown/wheat,
-	)
-	cost = 10
-	containertype = /obj/structure/closet/crate/freezer
-	containername = "\improper Wheat crate"
-	group = "Food"
-
-//All the meats
-
-/datum/supply_packs/meat
-	name = "meat(x5)"
-	contains = list(
-		/obj/item/reagent_container/food/snacks/meat,
-		/obj/item/reagent_container/food/snacks/meat,
-		/obj/item/reagent_container/food/snacks/meat,
-		/obj/item/reagent_container/food/snacks/meat,
-		/obj/item/reagent_container/food/snacks/meat,
-	)
-	cost = 10
-	containertype = /obj/structure/closet/crate/freezer
-	containername = "\improper meat crate"
-	group = "Food"
-
-/datum/supply_packs/carp_fillet
-	name = "carp fillet (x5)"
-	contains = list(
-		/obj/item/reagent_container/food/snacks/carpmeat,
-		/obj/item/reagent_container/food/snacks/carpmeat,
-		/obj/item/reagent_container/food/snacks/carpmeat,
-		/obj/item/reagent_container/food/snacks/carpmeat,
-		/obj/item/reagent_container/food/snacks/carpmeat,
-	)
-	cost = 10
-	containertype = /obj/structure/closet/crate/freezer
-	containername = "\improper carp filet crate"
-	group = "Food"
-
-//all the condiment type items
-
-/datum/supply_packs/condiment
-	name = "crate of condiments"
+// crate of random ingredient that you can buy in vendor in kitchen
+/datum/supply_packs/ingredient
+	name = "surplus boxes of ingredients(x6 boxes)"
+	randomised_num_contained = 6
 	contains = list(
-		/obj/item/reagent_container/food/condiment/enzyme,
-		/obj/item/reagent_container/food/condiment/sugar,
-		/obj/item/reagent_container/food/condiment/saltshaker,
-		/obj/item/reagent_container/food/condiment/peppermill,
+		/obj/item/storage/fancy/egg_box,
+		/obj/item/storage/box/fish,
+		/obj/item/storage/box/meat,
+		/obj/item/storage/box/milk,
+		/obj/item/storage/box/soymilk,
+		/obj/item/storage/box/enzyme,
+		/obj/item/storage/box/flour,
+		/obj/item/storage/box/sugar,
+		/obj/item/storage/box/apple,
+		/obj/item/storage/box/banana,
+		/obj/item/storage/box/chanterelle,
+		/obj/item/storage/box/cherries,
+		/obj/item/storage/box/chili,
+		/obj/item/storage/box/cabbage,
+		/obj/item/storage/box/carrot,
+		/obj/item/storage/box/corn,
+		/obj/item/storage/box/eggplant,
+		/obj/item/storage/box/lemon,
+		/obj/item/storage/box/lime,
+		/obj/item/storage/box/orange,
+		/obj/item/storage/box/potato,
+		/obj/item/storage/box/tomato,
+		/obj/item/storage/box/whitebeet,
 		/obj/item/reagent_container/food/condiment/hotsauce/cholula,
 		/obj/item/reagent_container/food/condiment/hotsauce/franks,
 		/obj/item/reagent_container/food/condiment/hotsauce/sriracha,
 		/obj/item/reagent_container/food/condiment/hotsauce/tabasco,
+		/obj/item/reagent_container/food/drinks/bottle/whiskey,
+		/obj/item/reagent_container/food/drinks/bottle/tequila,
+		/obj/item/reagent_container/food/drinks/bottle/rum,
+		/obj/item/reagent_container/food/drinks/bottle/wine,
 	)
 	cost = 10
 	containertype = /obj/structure/closet/crate/freezer
-	containername = "\improper crate of condiment"
+	containername = "\improper surplus of ingredients crate"
 	group = "Food"
 
-	//all the finish snacks.
+//all the finish snacks.
 
 /datum/supply_packs/donuts
 	name = "box of donuts (x5)"
@@ -165,47 +68,6 @@
 	containername = "\improper USCM MRE crate(x2)"
 	group = "Food"
 
-/datum/supply_packs/funfood
-	name = "special ingredients crate (x6)"
-	randomised_num_contained = 6
-	contains = list(
-		/obj/item/reagent_container/food/condiment/enzyme,
-		/obj/item/reagent_container/food/condiment/saltshaker,
-		/obj/item/reagent_container/food/condiment/saltshaker,
-		/obj/item/reagent_container/food/condiment/saltshaker,
-		/obj/item/reagent_container/food/condiment/peppermill,
-		/obj/item/reagent_container/food/condiment/peppermill,
-		/obj/item/reagent_container/food/condiment/peppermill,
-		/obj/item/reagent_container/food/condiment/sugar,
-		/obj/item/reagent_container/food/condiment/sugar,
-		/obj/item/reagent_container/food/snacks/grown/potato,
-		/obj/item/reagent_container/food/snacks/grown/potato,
-		/obj/item/reagent_container/food/snacks/grown/potato,
-		/obj/item/reagent_container/food/snacks/grown/potato,
-		/obj/item/reagent_container/food/snacks/grown/potato,
-		/obj/item/reagent_container/food/snacks/mint,
-		/obj/item/reagent_container/food/snacks/grown/tomato,
-		/obj/item/reagent_container/food/snacks/grown/tomato,
-		/obj/item/reagent_container/food/snacks/grown/carrot,
-		/obj/item/reagent_container/food/snacks/grown/carrot,
-		/obj/item/reagent_container/food/snacks/grown/lemon,
-		/obj/item/reagent_container/food/snacks/grown/lemon,
-		/obj/item/reagent_container/food/snacks/grown/orange,
-		/obj/item/reagent_container/food/snacks/grown/orange,
-		/obj/item/reagent_container/food/snacks/grown/lime,
-		/obj/item/reagent_container/food/snacks/grown/lime,
-		/obj/item/reagent_container/food/drinks/bottle/whiskey,
-		/obj/item/reagent_container/food/drinks/bottle/tequila,
-		/obj/item/reagent_container/food/drinks/bottle/rum,
-		/obj/item/reagent_container/food/drinks/bottle/wine,
-		/obj/item/reagent_container/food/drinks/bottle/wine,
-		/obj/item/reagent_container/food/drinks/bottle/wine,
-	)
-	cost = 10
-	containertype = /obj/structure/closet/crate/freezer
-	containername = "\improper Special ingredients crate"
-	group = "Food"
-
 /datum/supply_packs/pizzas
 	name = "pizza ready-to-eat (x3)"
 	contains = list(
diff --git a/code/game/machinery/vending/vending_types.dm b/code/game/machinery/vending/vending_types.dm
index a57bbfe7d29f..36b0b6e44df6 100644
--- a/code/game/machinery/vending/vending_types.dm
+++ b/code/game/machinery/vending/vending_types.dm
@@ -447,3 +447,69 @@
 		/obj/item/tool/pen/fountain = 30,
 	)
 	product_type = VENDOR_PRODUCT_TYPE_RECREATIONAL
+
+//vendor of ingredients for kitchen
+/obj/structure/machinery/vending/ingredients
+	name = "\improper Galley Auxiliary Storage Requisition System"
+	desc = "A vending machine meant to be use for cooks."
+	product_ads = "If your out of ingredients i am here for you;all my organic produce are fresh;don't let my potatoes go stale time for you to cook some fries"
+	icon_state = "snack"
+	hacking_safety = TRUE
+	products = list(
+		/obj/item/storage/fancy/egg_box = 12,
+		/obj/item/storage/box/fish = 12,
+		/obj/item/storage/box/meat = 12,
+		/obj/item/storage/box/milk = 12,
+		/obj/item/storage/box/soymilk = 12,
+		/obj/item/storage/box/enzyme = 12,
+		/obj/item/storage/box/flour = 12,
+		/obj/item/storage/box/sugar = 12,
+		/obj/item/storage/box/saltshaker = 12,
+		/obj/item/storage/box/peppermill = 12,
+		/obj/item/storage/box/mint = 12,
+		/obj/item/storage/box/apple = 12,
+		/obj/item/storage/box/banana = 12,
+		/obj/item/storage/box/chanterelle = 12,
+		/obj/item/storage/box/cherries = 12,
+		/obj/item/storage/box/chili = 12,
+		/obj/item/storage/box/cabbage = 12,
+		/obj/item/storage/box/carrot = 12,
+		/obj/item/storage/box/corn = 12,
+		/obj/item/storage/box/eggplant = 12,
+		/obj/item/storage/box/lemon = 12,
+		/obj/item/storage/box/lime = 12,
+		/obj/item/storage/box/orange = 12,
+		/obj/item/storage/box/potato = 12,
+		/obj/item/storage/box/tomato = 12,
+		/obj/item/storage/box/whitebeet = 12,
+	)
+
+	prices = list(
+		/obj/item/storage/fancy/egg_box = 1,
+		/obj/item/storage/box/fish = 1,
+		/obj/item/storage/box/meat = 1,
+		/obj/item/storage/box/milk =1,
+		/obj/item/storage/box/soymilk = 1,
+		/obj/item/storage/box/enzyme = 1,
+		/obj/item/storage/box/flour = 1,
+		/obj/item/storage/box/sugar = 1,
+		/obj/item/storage/box/saltshaker = 1,
+		/obj/item/storage/box/peppermill = 1,
+		/obj/item/storage/box/mint = 1,
+		/obj/item/storage/box/apple = 1,
+		/obj/item/storage/box/banana = 2,
+		/obj/item/storage/box/chanterelle = 2,
+		/obj/item/storage/box/cherries = 2,
+		/obj/item/storage/box/chili = 2,
+		/obj/item/storage/box/cabbage = 2,
+		/obj/item/storage/box/carrot = 2,
+		/obj/item/storage/box/corn = 2,
+		/obj/item/storage/box/eggplant = 2,
+		/obj/item/storage/box/lemon = 2,
+		/obj/item/storage/box/lime = 2,
+		/obj/item/storage/box/orange = 2,
+		/obj/item/storage/box/potato = 2,
+		/obj/item/storage/box/tomato = 2,
+		/obj/item/storage/box/whitebeet = 2,
+	)
+	product_type = VENDOR_PRODUCT_TYPE_FOOD
diff --git a/code/game/objects/items/storage/boxes.dm b/code/game/objects/items/storage/boxes.dm
index 4a3afa00f368..8e4ffb90d2bd 100644
--- a/code/game/objects/items/storage/boxes.dm
+++ b/code/game/objects/items/storage/boxes.dm
@@ -761,3 +761,211 @@
 	else if(!isopened)
 		isopened = 1
 		icon_state = "mealpackopened"
+
+//food boxes for storage in bulk
+
+//meat
+/obj/item/storage/box/meat
+	name = "box of meat"
+
+/obj/item/storage/box/meat/fill_preset_inventory()
+	for(var/i in 1 to 7)
+		new /obj/item/reagent_container/food/snacks/meat/monkey(src)
+
+//fish
+/obj/item/storage/box/fish
+	name = "box of fish"
+
+/obj/item/storage/box/fish/fill_preset_inventory()
+	for(var/i in 1 to 7)
+		new /obj/item/reagent_container/food/snacks/carpmeat(src)
+
+//grocery
+
+//milk
+/obj/item/storage/box/milk
+	name = "box of milk"
+
+/obj/item/storage/box/milk/fill_preset_inventory()
+	for(var/i in 1 to 7)
+		new /obj/item/reagent_container/food/drinks/milk(src)
+
+//soymilk
+/obj/item/storage/box/soymilk
+	name = "box of soymilk"
+
+/obj/item/storage/box/soymilk/fill_preset_inventory()
+	for(var/i in 1 to 7)
+		new /obj/item/reagent_container/food/drinks/soymilk(src)
+
+//enzyme
+/obj/item/storage/box/enzyme
+	name = "box of enzyme"
+
+/obj/item/storage/box/enzyme/fill_preset_inventory()
+	for(var/i in 1 to 7)
+		new /obj/item/reagent_container/food/condiment/enzyme(src)
+
+//dry storage
+
+//flour
+/obj/item/storage/box/flour
+	name = "box of flour"
+
+/obj/item/storage/box/flour/fill_preset_inventory()
+	for(var/i in 1 to 7)
+		new /obj/item/reagent_container/food/snacks/flour(src)
+
+//sugar
+/obj/item/storage/box/sugar
+	name = "box of sugar"
+
+/obj/item/storage/box/sugar/fill_preset_inventory()
+	for(var/i in 1 to 7)
+		new /obj/item/reagent_container/food/condiment/sugar(src)
+
+//saltshaker
+/obj/item/storage/box/saltshaker
+	name = "box of saltshakers"
+
+/obj/item/storage/box/saltshaker/fill_preset_inventory()
+	for(var/i in 1 to 7)
+		new /obj/item/reagent_container/food/condiment/saltshaker(src)
+
+//peppermill
+/obj/item/storage/box/peppermill
+	name = "box of peppermills"
+
+/obj/item/storage/box/peppermill/fill_preset_inventory()
+	for(var/i in 1 to 7)
+		new /obj/item/reagent_container/food/condiment/peppermill(src)
+
+//mint
+/obj/item/storage/box/mint
+	name = "box of mints"
+
+/obj/item/storage/box/mint/fill_preset_inventory()
+	for(var/i in 1 to 7)
+		new /obj/item/reagent_container/food/snacks/mint(src)
+
+// ORGANICS
+
+//apple
+/obj/item/storage/box/apple
+	name = "box of apples"
+
+/obj/item/storage/box/apple/fill_preset_inventory()
+	for(var/i in 1 to 7)
+		new /obj/item/reagent_container/food/snacks/grown/apple(src)
+
+//banana
+/obj/item/storage/box/banana
+	name = "box of bananas"
+
+/obj/item/storage/box/banana/fill_preset_inventory()
+	for(var/i in 1 to 7)
+		new /obj/item/reagent_container/food/snacks/grown/banana(src)
+
+//chanterelle
+/obj/item/storage/box/chanterelles
+	name = "box of chanterelle"
+
+/obj/item/storage/box/chanterelle/fill_preset_inventory()
+	for(var/i in 1 to 7)
+		new /obj/item/reagent_container/food/snacks/grown/mushroom/chanterelle(src)
+
+//cherries
+/obj/item/storage/box/cherries
+	name = "box of cherries"
+
+/obj/item/storage/box/cherries/fill_preset_inventory()
+	for(var/i in 1 to 7)
+		new /obj/item/reagent_container/food/snacks/grown/cherries(src)
+
+//chili
+/obj/item/storage/box/chili
+	name = "box of chili"
+
+/obj/item/storage/box/chili/fill_preset_inventory()
+	for(var/i in 1 to 7)
+		new /obj/item/reagent_container/food/snacks/grown/chili(src)
+
+//cabbage
+/obj/item/storage/box/cabbage
+	name = "box of cabbages"
+
+/obj/item/storage/box/cabbage/fill_preset_inventory()
+	for(var/i in 1 to 7)
+		new /obj/item/reagent_container/food/snacks/grown/cabbage(src)
+
+//carrot
+/obj/item/storage/box/carrot
+	name = "box of carrots"
+
+/obj/item/storage/box/carrot/fill_preset_inventory()
+	for(var/i in 1 to 7)
+		new /obj/item/reagent_container/food/snacks/grown/carrot(src)
+
+//corn
+/obj/item/storage/box/corn
+	name = "box of corn"
+
+/obj/item/storage/box/corn/fill_preset_inventory()
+	for(var/i in 1 to 7)
+		new /obj/item/reagent_container/food/snacks/grown/corn(src)
+
+//eggplant
+/obj/item/storage/box/eggplant
+	name = "box of eggplants"
+
+/obj/item/storage/box/eggplant/fill_preset_inventory()
+	for(var/i in 1 to 7)
+		new /obj/item/reagent_container/food/snacks/grown/eggplant(src)
+
+//lemon
+/obj/item/storage/box/lemon
+	name = "box of lemons"
+
+/obj/item/storage/box/lemon/fill_preset_inventory()
+	for(var/i in 1 to 7)
+		new /obj/item/reagent_container/food/snacks/grown/lemon(src)
+
+//lime
+/obj/item/storage/box/lime
+	name = "box of limes"
+
+/obj/item/storage/box/lime/fill_preset_inventory()
+	for(var/i in 1 to 7)
+		new /obj/item/reagent_container/food/snacks/grown/lime(src)
+
+//orange
+/obj/item/storage/box/orange
+	name = "box of oranges"
+
+/obj/item/storage/box/orange/fill_preset_inventory()
+	for(var/i in 1 to 7)
+		new /obj/item/reagent_container/food/snacks/grown/orange(src)
+
+//potato
+/obj/item/storage/box/potato
+	name = "box of potatoes"
+
+/obj/item/storage/box/potato/fill_preset_inventory()
+	for(var/i in 1 to 7)
+		new /obj/item/reagent_container/food/snacks/grown/potato(src)
+
+//tomato
+/obj/item/storage/box/tomato
+	name = "box of tomatoes"
+
+/obj/item/storage/box/tomato/fill_preset_inventory()
+	for(var/i in 1 to 7)
+		new /obj/item/reagent_container/food/snacks/grown/tomato(src)
+
+//whitebeet
+/obj/item/storage/box/whitebeet
+	name = "box of whitebeet"
+
+/obj/item/storage/box/whitebeet/fill_preset_inventory()
+	for(var/i in 1 to 7)
+		new /obj/item/reagent_container/food/snacks/grown/whitebeet(src)
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/kitchen.dm b/code/game/objects/structures/crates_lockers/closets/secure/kitchen.dm
new file mode 100644
index 000000000000..d8b0c984d4b1
--- /dev/null
+++ b/code/game/objects/structures/crates_lockers/closets/secure/kitchen.dm
@@ -0,0 +1,143 @@
+//standart fridge
+
+/obj/structure/closet/secure_closet/fridge
+	name = "Refrigerator"
+	icon = 'icons/obj/structures/machinery/kitchen.dmi'
+	icon_state = "fridge1"
+	icon_closed = "fridge"
+	icon_locked = "fridge1"
+	icon_opened = "fridgeopen"
+	icon_broken = "fridgebroken"
+	icon_off = "fridge1"
+	storage_capacity = 60 //give extra storage capacity so that everything can fit.
+
+/obj/structure/closet/secure_closet/fridge/update_icon()
+	if(broken)
+		icon_state = icon_broken
+	else
+		if(!opened)
+			if(locked)
+				icon_state = icon_locked
+			else
+				icon_state = icon_closed
+		else
+			icon_state = icon_opened
+
+// for almayer.
+
+// Kitchen preparation room small quantity out of boxes...
+
+//standart organic storage.
+
+/obj/structure/closet/secure_closet/fridge/organic
+	name = "Organic"
+
+/obj/structure/closet/secure_closet/fridge/organic/Initialize()
+	. = ..()
+	for(var/i in 1 to 2)
+		new /obj/item/reagent_container/food/snacks/grown/apple(src)
+		new /obj/item/reagent_container/food/snacks/grown/cabbage(src)
+		new /obj/item/reagent_container/food/snacks/grown/carrot(src)
+		new /obj/item/reagent_container/food/snacks/grown/mushroom/chanterelle(src)
+		new /obj/item/reagent_container/food/snacks/grown/chili(src)
+		new /obj/item/reagent_container/food/snacks/grown/corn(src)
+		new /obj/item/reagent_container/food/snacks/grown/eggplant(src)
+		new /obj/item/reagent_container/food/snacks/grown/potato(src)
+		new /obj/item/reagent_container/food/snacks/grown/tomato(src)
+		new /obj/item/reagent_container/food/snacks/grown/whitebeet(src)
+		new /obj/item/reagent_container/food/snacks/grown/cherries(src)
+		new /obj/item/reagent_container/food/snacks/grown/lime(src)
+		new /obj/item/reagent_container/food/snacks/grown/lemon(src)
+		new /obj/item/reagent_container/food/snacks/grown/orange(src)
+		new /obj/item/reagent_container/food/snacks/grown/banana(src)
+
+//DRy
+
+/obj/structure/closet/secure_closet/fridge/dry
+	name = "dry"
+
+/obj/structure/closet/secure_closet/fridge/dry/Initialize()
+	. = ..()
+	for(var/i in 1 to 6)
+		new /obj/item/reagent_container/food/snacks/flour(src)
+	for(var/i in 1 to 2)
+		new /obj/item/reagent_container/food/condiment/sugar(src)
+
+//grocery
+
+/obj/structure/closet/secure_closet/fridge/groceries
+	name = "Groceries"
+
+/obj/structure/closet/secure_closet/fridge/groceries/Initialize()
+	. = ..()
+	for(var/i in 1 to 2)
+		new /obj/item/reagent_container/food/drinks/milk(src)
+		new /obj/item/reagent_container/food/drinks/soymilk(src)
+	new /obj/item/storage/fancy/egg_box(src)
+	new /obj/item/reagent_container/food/condiment/enzyme(src)
+
+// Kitchen Reserve big quantity stored in boxes
+
+//meat surplus
+/obj/structure/closet/secure_closet/fridge/meat/stock
+	name = "meat"
+
+/obj/structure/closet/secure_closet/fridge/meat/stock/Initialize()
+	. = ..()
+	for(var/i in 1 to 2)
+		new /obj/item/storage/box/meat(src)
+
+//fish surplus
+/obj/structure/closet/secure_closet/fridge/fish/stock
+	name = "fish"
+
+/obj/structure/closet/secure_closet/fridge/fish/stock/Initialize()
+	. = ..()
+	for(var/i in 1 to 2)
+		new /obj/item/storage/box/fish(src)
+
+//groceries to hold milk in bulk
+/obj/structure/closet/secure_closet/fridge/groceries/stock
+	name = "Groceries"
+
+/obj/structure/closet/secure_closet/fridge/groceries/stock/Initialize()
+	. = ..()
+	for(var/i in 1 to 2)
+		new /obj/item/storage/box/milk(src)
+		new /obj/item/storage/box/soymilk(src)
+	for(var/i in 1 to 7)
+		new /obj/item/storage/fancy/egg_box(src)
+	new /obj/item/storage/box/enzyme(src)
+
+//dry storage for dry food only... not a fridge
+/obj/structure/closet/secure_closet/fridge/dry/stock
+	name = "dry"
+
+/obj/structure/closet/secure_closet/fridge/dry/stock/Initialize()
+	. = ..()
+	for(var/i in 1 to 4)
+		new /obj/item/storage/box/flour(src)
+	new /obj/item/storage/box/sugar(src)
+
+// organic storage in bulk
+
+/obj/structure/closet/secure_closet/fridge/organic/stock
+	name = "Organic"
+
+/obj/structure/closet/secure_closet/fridge/organic/stock/Initialize()
+	. = ..()
+	new /obj/item/storage/box/apple(src)
+	new /obj/item/storage/box/banana(src)
+	new /obj/item/storage/box/chanterelle(src)
+	new /obj/item/storage/box/cherries(src)
+	new /obj/item/storage/box/chili(src)
+	new /obj/item/storage/box/cabbage(src)
+	new /obj/item/storage/box/carrot(src)
+	new /obj/item/storage/box/corn(src)
+	new /obj/item/storage/box/eggplant(src)
+	new /obj/item/storage/box/lemon(src)
+	new /obj/item/storage/box/lime(src)
+	new /obj/item/storage/box/orange(src)
+	new /obj/item/storage/box/potato(src)
+	new /obj/item/storage/box/tomato(src)
+	new /obj/item/storage/box/whitebeet(src)
diff --git a/colonialmarines.dme b/colonialmarines.dme
index d632d6bd4998..6728b6849445 100644
--- a/colonialmarines.dme
+++ b/colonialmarines.dme
@@ -1289,6 +1289,7 @@
 #include "code\game\objects\structures\crates_lockers\closets\secure\engineering.dm"
 #include "code\game\objects\structures\crates_lockers\closets\secure\freezer.dm"
 #include "code\game\objects\structures\crates_lockers\closets\secure\hydroponics.dm"
+#include "code\game\objects\structures\crates_lockers\closets\secure\kitchen.dm"
 #include "code\game\objects\structures\crates_lockers\closets\secure\medical.dm"
 #include "code\game\objects\structures\crates_lockers\closets\secure\personal.dm"
 #include "code\game\objects\structures\crates_lockers\closets\secure\scientist.dm"
diff --git a/maps/map_files/USS_Almayer/USS_Almayer.dmm b/maps/map_files/USS_Almayer/USS_Almayer.dmm
index 42e343e1b713..25926395d624 100644
--- a/maps/map_files/USS_Almayer/USS_Almayer.dmm
+++ b/maps/map_files/USS_Almayer/USS_Almayer.dmm
@@ -529,17 +529,6 @@
 	icon_state = "red"
 	},
 /area/almayer/hallways/aft_hallway)
-"abQ" = (
-/obj/item/device/radio/intercom{
-	freerange = 1;
-	name = "General Listening Channel";
-	pixel_y = 28
-	},
-/obj/structure/machinery/cm_vending/clothing/staff_officer_armory,
-/turf/open/floor/almayer{
-	icon_state = "redfull"
-	},
-/area/almayer/command/cic)
 "abR" = (
 /obj/item/tank/phoron,
 /turf/open/floor/almayer{
@@ -798,6 +787,12 @@
 	icon_state = "plate"
 	},
 /area/almayer/hull/upper_hull/u_m_s)
+"acE" = (
+/obj/structure/closet/emcloset,
+/turf/open/floor/almayer{
+	icon_state = "cargo"
+	},
+/area/almayer/lifeboat_pumps/north2)
 "acF" = (
 /obj/structure/machinery/light{
 	dir = 1
@@ -920,20 +915,12 @@
 	icon_state = "red"
 	},
 /area/almayer/hallways/aft_hallway)
-"acS" = (
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 4
-	},
-/obj/structure/disposalpipe/segment{
-	dir = 4
-	},
-/obj/structure/machinery/cm_vending/sorted/medical/wall_med{
-	pixel_y = -29
-	},
+"acT" = (
+/obj/structure/closet/firecloset,
 /turf/open/floor/almayer{
-	icon_state = "silver"
+	icon_state = "cargo"
 	},
-/area/almayer/command/cichallway)
+/area/almayer/lifeboat_pumps/north2)
 "acU" = (
 /obj/structure/closet/basketball,
 /turf/open/floor/almayer{
@@ -1183,6 +1170,15 @@
 	icon_state = "mono"
 	},
 /area/almayer/lifeboat_pumps/north1)
+"adQ" = (
+/obj/effect/decal/warning_stripes{
+	icon_state = "NE-out";
+	pixel_y = 1
+	},
+/turf/open/floor/almayer{
+	icon_state = "mono"
+	},
+/area/almayer/lifeboat_pumps/north2)
 "adR" = (
 /obj/structure/machinery/door/airlock/almayer/generic{
 	access_modified = 1;
@@ -1211,6 +1207,13 @@
 	icon_state = "red"
 	},
 /area/almayer/hallways/aft_hallway)
+"adZ" = (
+/obj/effect/decal/warning_stripes{
+	icon_state = "N";
+	pixel_y = 1
+	},
+/turf/open/floor/almayer,
+/area/almayer/lifeboat_pumps/north2)
 "aea" = (
 /obj/structure/machinery/light{
 	dir = 1
@@ -1560,6 +1563,17 @@
 	icon_state = "redfull"
 	},
 /area/almayer/shipboard/starboard_missiles)
+"afc" = (
+/obj/structure/reagent_dispensers/water_cooler/stacks{
+	density = 0;
+	pixel_y = 17
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "W";
+	pixel_x = -1
+	},
+/turf/open/floor/almayer,
+/area/almayer/hull/upper_hull/u_f_s)
 "afd" = (
 /obj/structure/largecrate/random/barrel/white,
 /obj/structure/sign/safety/bulkhead_door{
@@ -2559,14 +2573,6 @@
 	icon_state = "red"
 	},
 /area/almayer/living/starboard_garden)
-"aiQ" = (
-/obj/structure/machinery/faxmachine,
-/obj/structure/surface/table/almayer,
-/obj/structure/machinery/light/small,
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/almayer/command/combat_correspondent)
 "aiR" = (
 /obj/structure/stairs{
 	dir = 8;
@@ -2614,16 +2620,6 @@
 	icon_state = "plate"
 	},
 /area/almayer/hull/upper_hull/u_f_s)
-"aiW" = (
-/obj/structure/disposalpipe/segment{
-	dir = 2;
-	icon_state = "pipe-c"
-	},
-/obj/structure/pipes/standard/manifold/hidden/supply{
-	dir = 1
-	},
-/turf/open/floor/carpet,
-/area/almayer/living/commandbunks)
 "aiX" = (
 /turf/closed/wall/almayer,
 /area/almayer/living/pilotbunks)
@@ -2667,12 +2663,6 @@
 "ajl" = (
 /turf/closed/wall/almayer/white,
 /area/almayer/medical/upper_medical)
-"ajm" = (
-/obj/structure/closet/secure_closet/securecom,
-/turf/open/floor/almayer{
-	icon_state = "redfull"
-	},
-/area/almayer/command/cic)
 "ajp" = (
 /obj/structure/surface/table/almayer,
 /obj/structure/dropship_equipment/fuel/cooling_system{
@@ -2973,14 +2963,12 @@
 	icon_state = "redcorner"
 	},
 /area/almayer/shipboard/weapon_room)
-"ako" = (
+"akr" = (
 /obj/structure/disposalpipe/segment{
-	dir = 4
-	},
-/obj/structure/pipes/standard/manifold/hidden/supply{
-	dir = 1
+	dir = 8;
+	icon_state = "pipe-c"
 	},
-/turf/open/floor/carpet,
+/turf/open/floor/wood/ship,
 /area/almayer/living/commandbunks)
 "akt" = (
 /obj/structure/cable/heavyduty{
@@ -3516,15 +3504,6 @@
 	icon_state = "blue"
 	},
 /area/almayer/hallways/aft_hallway)
-"amE" = (
-/obj/item/clothing/suit/storage/marine/light/vest,
-/obj/item/clothing/suit/storage/marine/light/vest,
-/obj/item/clothing/suit/storage/marine/light/vest,
-/obj/structure/surface/rack,
-/turf/open/floor/almayer{
-	icon_state = "redfull"
-	},
-/area/almayer/engineering/upper_engineering)
 "amF" = (
 /obj/structure/pipes/standard/simple/hidden/supply,
 /turf/open/floor/plating/plating_catwalk,
@@ -3727,6 +3706,12 @@
 	},
 /turf/open/floor/almayer,
 /area/almayer/hallways/aft_hallway)
+"anl" = (
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 5
+	},
+/turf/open/floor/plating/plating_catwalk,
+/area/almayer/hull/upper_hull/u_f_s)
 "anm" = (
 /obj/structure/stairs{
 	icon_state = "ramptop"
@@ -3747,47 +3732,6 @@
 	},
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/hull/upper_hull/u_a_s)
-"anp" = (
-/obj/structure/sign/safety/hazard{
-	pixel_x = 15;
-	pixel_y = 32
-	},
-/obj/structure/closet/secure_closet/guncabinet/red/armory_m4a3_pistol,
-/turf/open/floor/almayer{
-	icon_state = "redfull"
-	},
-/area/almayer/medical/upper_medical)
-"anq" = (
-/obj/item/device/radio/intercom{
-	freerange = 1;
-	name = "General Listening Channel";
-	pixel_y = 28
-	},
-/obj/item/clothing/suit/storage/marine/light/vest,
-/obj/item/clothing/suit/storage/marine/light/vest,
-/obj/item/clothing/suit/storage/marine/light/vest,
-/obj/item/clothing/suit/storage/marine/light/vest,
-/obj/item/clothing/suit/storage/marine/light/vest,
-/obj/item/clothing/suit/storage/marine/light/vest,
-/obj/structure/surface/rack,
-/obj/item/clothing/suit/storage/marine/light/vest,
-/obj/item/clothing/suit/storage/marine/light/vest,
-/obj/item/clothing/suit/storage/marine/light/vest,
-/obj/item/clothing/suit/storage/marine/light/vest,
-/turf/open/floor/almayer{
-	icon_state = "redfull"
-	},
-/area/almayer/medical/upper_medical)
-"anr" = (
-/obj/structure/sign/safety/intercom{
-	pixel_x = 8;
-	pixel_y = 32
-	},
-/obj/structure/closet/secure_closet/guncabinet/red/armory_m39_submachinegun,
-/turf/open/floor/almayer{
-	icon_state = "redfull"
-	},
-/area/almayer/medical/upper_medical)
 "ans" = (
 /turf/open/floor/almayer{
 	dir = 8;
@@ -5410,16 +5354,6 @@
 /obj/structure/surface/table/almayer,
 /turf/open/floor/almayer,
 /area/almayer/engineering/engineering_workshop/hangar)
-"asu" = (
-/obj/structure/sign/safety/hazard{
-	pixel_x = 32;
-	pixel_y = -8
-	},
-/obj/structure/closet/secure_closet/guncabinet/red/armory_shotgun,
-/turf/open/floor/almayer{
-	icon_state = "redfull"
-	},
-/area/almayer/medical/upper_medical)
 "asv" = (
 /obj/effect/decal/cleanable/blood/oil,
 /obj/structure/machinery/light{
@@ -5837,12 +5771,6 @@
 /obj/structure/pipes/standard/simple/hidden/supply,
 /turf/open/floor/almayer,
 /area/almayer/engineering/engineering_workshop/hangar)
-"atx" = (
-/obj/structure/closet/secure_closet/guncabinet/red/cic_armory_shotgun,
-/turf/open/floor/almayer{
-	icon_state = "redfull"
-	},
-/area/almayer/command/cic)
 "aty" = (
 /obj/structure/reagent_dispensers/fueltank,
 /turf/open/floor/almayer{
@@ -6018,6 +5946,14 @@
 	icon_state = "blue"
 	},
 /area/almayer/hallways/aft_hallway)
+"atY" = (
+/obj/structure/closet/emcloset,
+/obj/item/clothing/mask/gas,
+/obj/item/clothing/mask/gas,
+/turf/open/floor/almayer{
+	icon_state = "cargo"
+	},
+/area/almayer/command/lifeboat)
 "atZ" = (
 /obj/structure/machinery/door_control{
 	id = "OTStore";
@@ -7339,16 +7275,6 @@
 	icon_state = "plate"
 	},
 /area/almayer/engineering/upper_engineering)
-"axR" = (
-/obj/structure/machinery/shower,
-/obj/structure/window/reinforced/tinted{
-	dir = 8
-	},
-/obj/structure/machinery/door/window/tinted{
-	dir = 2
-	},
-/turf/open/floor/plating/plating_catwalk,
-/area/almayer/engineering/upper_engineering/port)
 "axV" = (
 /obj/structure/machinery/telecomms/server/presets/command,
 /turf/open/floor/almayer{
@@ -7795,33 +7721,6 @@
 	icon_state = "bluecorner"
 	},
 /area/almayer/living/offices/flight)
-"azm" = (
-/obj/structure/surface/table/woodentable/fancy,
-/obj/item/paper_bin/uscm{
-	pixel_y = 7;
-	pixel_x = -17
-	},
-/obj/item/tool/pen/clicky{
-	pixel_x = -13;
-	pixel_y = -1
-	},
-/obj/item/tool/pen/clicky{
-	pixel_y = 5;
-	pixel_x = -13
-	},
-/obj/structure/machinery/door_control{
-	id = "CO-Office";
-	name = "Door Control";
-	normaldoorcontrol = 1;
-	req_access_txt = "31";
-	pixel_y = 7
-	},
-/obj/item/ashtray/bronze{
-	pixel_y = 1;
-	pixel_x = 12
-	},
-/turf/open/floor/carpet,
-/area/almayer/living/commandbunks)
 "azn" = (
 /obj/structure/machinery/door/firedoor/border_only/almayer,
 /turf/open/floor/almayer{
@@ -7837,12 +7736,6 @@
 	icon_state = "plating"
 	},
 /area/almayer/engineering/upper_engineering)
-"azp" = (
-/obj/structure/closet/secure_closet/guncabinet/red/armory_shotgun,
-/turf/open/floor/almayer{
-	icon_state = "redfull"
-	},
-/area/almayer/engineering/upper_engineering)
 "azq" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "SE-out";
@@ -8853,6 +8746,14 @@
 	icon_state = "orangecorner"
 	},
 /area/almayer/command/telecomms)
+"aDc" = (
+/obj/effect/decal/warning_stripes{
+	icon_state = "S"
+	},
+/turf/open/floor/almayer{
+	icon_state = "red"
+	},
+/area/almayer/command/lifeboat)
 "aDe" = (
 /obj/structure/machinery/light{
 	dir = 8
@@ -9646,6 +9547,12 @@
 	icon_state = "sterile_green_side"
 	},
 /area/almayer/medical/operating_room_four)
+"aGi" = (
+/obj/structure/closet/secure_closet/guncabinet/red/cic_armory_mk1_rifle_ap,
+/turf/open/floor/almayer{
+	icon_state = "redfull"
+	},
+/area/almayer/command/cic)
 "aGj" = (
 /obj/structure/machinery/door/poddoor/almayer/open{
 	dir = 2;
@@ -9824,6 +9731,24 @@
 "aHe" = (
 /turf/closed/wall/almayer,
 /area/almayer/command/lifeboat)
+"aHk" = (
+/obj/structure/machinery/light{
+	dir = 8
+	},
+/obj/structure/sink{
+	pixel_y = 16
+	},
+/obj/structure/mirror{
+	pixel_y = 21
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "E";
+	pixel_x = 1
+	},
+/turf/open/floor/almayer{
+	icon_state = "dark_sterile"
+	},
+/area/almayer/living/numbertwobunks)
 "aHl" = (
 /obj/structure/machinery/portable_atmospherics/canister/air,
 /turf/open/floor/engine,
@@ -9978,6 +9903,12 @@
 	},
 /turf/open/floor/engine,
 /area/almayer/engineering/airmix)
+"aHT" = (
+/obj/structure/bed/chair/wood/normal,
+/obj/item/bedsheet/brown,
+/obj/item/toy/plush/farwa,
+/turf/open/floor/wood/ship,
+/area/almayer/shipboard/brig/cells)
 "aHU" = (
 /obj/structure/platform{
 	dir = 1
@@ -10204,12 +10135,6 @@
 	icon_state = "orange"
 	},
 /area/almayer/engineering/upper_engineering)
-"aIV" = (
-/obj/structure/closet/secure_closet/guncabinet/red/armory_m39_submachinegun,
-/turf/open/floor/almayer{
-	icon_state = "redfull"
-	},
-/area/almayer/engineering/upper_engineering)
 "aIX" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "E";
@@ -10472,11 +10397,6 @@
 	icon_state = "silver"
 	},
 /area/almayer/command/cichallway)
-"aKk" = (
-/obj/structure/disposalpipe/segment,
-/obj/structure/pipes/standard/simple/hidden/supply,
-/turf/open/floor/wood/ship,
-/area/almayer/living/commandbunks)
 "aKn" = (
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 4
@@ -10768,6 +10688,16 @@
 	icon_state = "dark_sterile"
 	},
 /area/almayer/living/numbertwobunks)
+"aLt" = (
+/obj/structure/surface/rack,
+/obj/effect/decal/warning_stripes{
+	icon_state = "N";
+	pixel_y = 1
+	},
+/turf/open/floor/almayer{
+	icon_state = "dark_sterile"
+	},
+/area/almayer/living/numbertwobunks)
 "aLB" = (
 /turf/closed/wall/almayer,
 /area/almayer/hallways/starboard_hallway)
@@ -11109,6 +11039,14 @@
 	icon_state = "red"
 	},
 /area/almayer/squads/alpha)
+"aNe" = (
+/obj/structure/closet/firecloset,
+/obj/item/clothing/mask/gas,
+/obj/item/clothing/mask/gas,
+/turf/open/floor/almayer{
+	icon_state = "cargo"
+	},
+/area/almayer/command/lifeboat)
 "aNi" = (
 /turf/closed/wall/almayer,
 /area/almayer/living/chapel)
@@ -11264,18 +11202,6 @@
 /obj/effect/landmark/start/nurse,
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/living/offices)
-"aOj" = (
-/obj/structure/machinery/door/airlock/almayer/generic{
-	name = "\improper Bathroom";
-	dir = 2
-	},
-/obj/structure/machinery/door/firedoor/border_only/almayer{
-	dir = 1
-	},
-/turf/open/floor/almayer{
-	icon_state = "test_floor4"
-	},
-/area/almayer/living/commandbunks)
 "aOq" = (
 /obj/structure/surface/table/almayer,
 /obj/item/tool/extinguisher,
@@ -12352,11 +12278,6 @@
 	},
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/command/cichallway)
-"aTl" = (
-/obj/structure/disposalpipe/segment,
-/obj/structure/pipes/standard/simple/hidden/supply,
-/turf/open/floor/almayer,
-/area/almayer/command/cichallway)
 "aTm" = (
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/lifeboat_pumps/north1)
@@ -12530,6 +12451,12 @@
 	},
 /turf/open/floor/wood/ship,
 /area/almayer/living/basketball)
+"aTV" = (
+/obj/structure/toilet{
+	dir = 4
+	},
+/turf/open/floor/plating/plating_catwalk,
+/area/almayer/shipboard/brig/cells)
 "aTW" = (
 /obj/structure/bed/chair{
 	dir = 8
@@ -12714,6 +12641,12 @@
 	icon_state = "green"
 	},
 /area/almayer/living/offices)
+"aUP" = (
+/obj/structure/bed/chair/office/dark{
+	dir = 8
+	},
+/turf/open/floor/carpet,
+/area/almayer/living/commandbunks)
 "aUY" = (
 /obj/structure/machinery/light{
 	dir = 4
@@ -13053,6 +12986,23 @@
 	icon_state = "test_floor4"
 	},
 /area/almayer/lifeboat_pumps/south1)
+"aWA" = (
+/obj/structure/toilet{
+	pixel_y = 13
+	},
+/obj/item/paper_bin/uscm{
+	pixel_x = 9;
+	pixel_y = -3
+	},
+/obj/structure/machinery/light/small{
+	dir = 4
+	},
+/obj/item/prop/magazine/dirty{
+	pixel_x = -6;
+	pixel_y = -10
+	},
+/turf/open/floor/plating/plating_catwalk,
+/area/almayer/living/captain_mess)
 "aWD" = (
 /obj/structure/window/framed/almayer,
 /obj/structure/machinery/door/firedoor/border_only/almayer{
@@ -14653,6 +14603,16 @@
 	},
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/hull/lower_hull/l_m_p)
+"bfe" = (
+/obj/effect/decal/warning_stripes{
+	icon_state = "N";
+	pixel_y = 1
+	},
+/turf/open/floor/almayer{
+	dir = 1;
+	icon_state = "orange"
+	},
+/area/almayer/engineering/upper_engineering/port)
 "bfl" = (
 /turf/open/floor/almayer{
 	dir = 5;
@@ -15172,10 +15132,6 @@
 	icon_state = "bluefull"
 	},
 /area/almayer/living/bridgebunks)
-"bhM" = (
-/obj/structure/safe/cl_office,
-/turf/open/floor/wood/ship,
-/area/almayer/command/corporateliason)
 "bhT" = (
 /obj/structure/cargo_container/lockmart/mid{
 	layer = 3.1;
@@ -15270,22 +15226,6 @@
 	icon_state = "sterile_green_corner"
 	},
 /area/almayer/medical/lower_medical_medbay)
-"biJ" = (
-/obj/structure/flora/pottedplant{
-	icon_state = "pottedplant_22"
-	},
-/obj/structure/machinery/camera/autoname/almayer{
-	dir = 1;
-	name = "ship-grade camera"
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "SW-out";
-	pixel_x = -1
-	},
-/turf/open/floor/almayer{
-	icon_state = "red"
-	},
-/area/almayer/command/lifeboat)
 "biL" = (
 /obj/structure/platform{
 	dir = 4
@@ -15449,13 +15389,6 @@
 	icon_state = "plate"
 	},
 /area/almayer/hallways/starboard_umbilical)
-"bjQ" = (
-/obj/structure/machinery/shower{
-	dir = 8
-	},
-/obj/structure/window/reinforced,
-/turf/open/floor/plating/plating_catwalk,
-/area/almayer/shipboard/brig/cells)
 "bjR" = (
 /obj/structure/cargo_container/arious/right,
 /turf/open/floor/almayer,
@@ -16276,16 +16209,6 @@
 	icon_state = "plate"
 	},
 /area/almayer/hull/lower_hull/l_a_p)
-"boc" = (
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 10
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "E";
-	pixel_x = 2
-	},
-/turf/open/floor/almayer,
-/area/almayer/hull/upper_hull/u_f_p)
 "bof" = (
 /obj/structure/pipes/vents/scrubber{
 	dir = 4
@@ -16541,15 +16464,6 @@
 	icon_state = "plate"
 	},
 /area/almayer/living/briefing)
-"bpw" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "SW-out";
-	pixel_x = -1
-	},
-/turf/open/floor/almayer{
-	icon_state = "mono"
-	},
-/area/almayer/lifeboat_pumps/south1)
 "bpz" = (
 /obj/structure/disposalpipe/segment,
 /obj/structure/pipes/standard/simple/hidden/supply,
@@ -17986,16 +17900,6 @@
 	icon_state = "test_floor4"
 	},
 /area/almayer/hallways/starboard_hallway)
-"bxA" = (
-/obj/structure/machinery/power/apc/almayer/hardened,
-/obj/effect/decal/warning_stripes{
-	icon_state = "SW-out";
-	pixel_x = -1
-	},
-/turf/open/floor/almayer{
-	icon_state = "mono"
-	},
-/area/almayer/lifeboat_pumps/south2)
 "bxB" = (
 /obj/structure/disposalpipe/segment{
 	dir = 2;
@@ -19957,16 +19861,6 @@
 	icon_state = "green"
 	},
 /area/almayer/squads/req)
-"bGz" = (
-/obj/structure/window/framed/almayer,
-/obj/structure/machinery/door/firedoor/border_only/almayer{
-	dir = 1
-	},
-/turf/open/floor/almayer{
-	dir = 9;
-	icon_state = "green"
-	},
-/area/almayer/squads/req)
 "bGF" = (
 /obj/structure/machinery/landinglight/ds2{
 	dir = 1
@@ -20438,6 +20332,25 @@
 	},
 /turf/closed/wall/almayer/reinforced,
 /area/almayer/shipboard/navigation)
+"bIA" = (
+/obj/structure/sink{
+	dir = 4;
+	pixel_x = 11
+	},
+/obj/structure/mirror{
+	pixel_x = 29
+	},
+/obj/structure/machinery/light{
+	unacidable = 1;
+	unslashable = 1
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "W"
+	},
+/turf/open/floor/almayer{
+	icon_state = "dark_sterile"
+	},
+/area/almayer/living/auxiliary_officer_office)
 "bII" = (
 /obj/structure/sign/safety/distribution_pipes{
 	pixel_x = 8;
@@ -22323,23 +22236,6 @@
 	icon_state = "tcomms"
 	},
 /area/almayer/engineering/engine_core)
-"bQl" = (
-/obj/structure/machinery/light/small{
-	dir = 8
-	},
-/obj/item/prop/magazine/boots/n160{
-	pixel_y = -8;
-	pixel_x = 4;
-	layer = 2.8
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "E";
-	pixel_x = 1
-	},
-/turf/open/floor/almayer{
-	icon_state = "dark_sterile"
-	},
-/area/almayer/living/commandbunks)
 "bQm" = (
 /obj/structure/reagent_dispensers/fueltank,
 /turf/open/floor/almayer{
@@ -22442,12 +22338,6 @@
 	},
 /turf/closed/wall/almayer,
 /area/almayer/squads/req)
-"bQS" = (
-/obj/structure/machinery/cm_vending/sorted/cargo_ammo/cargo/blend,
-/turf/open/floor/almayer{
-	icon_state = "green"
-	},
-/area/almayer/squads/req)
 "bQU" = (
 /obj/structure/pipes/standard/manifold/hidden/supply{
 	dir = 8
@@ -22541,6 +22431,14 @@
 	icon_state = "red"
 	},
 /area/almayer/shipboard/brig/lobby)
+"bRo" = (
+/obj/effect/landmark/late_join/working_joe,
+/obj/effect/landmark/start/working_joe,
+/obj/structure/machinery/light{
+	dir = 8
+	},
+/turf/open/floor/plating/plating_catwalk,
+/area/almayer/command/airoom)
 "bRr" = (
 /obj/structure/machinery/fuelcell_recycler,
 /turf/open/floor/almayer{
@@ -23207,19 +23105,6 @@
 	icon_state = "blue"
 	},
 /area/almayer/squads/charlie_delta_shared)
-"bUo" = (
-/obj/structure/sign/safety/ammunition{
-	pixel_x = 15;
-	pixel_y = -32
-	},
-/obj/structure/sign/safety/hazard{
-	pixel_y = -32
-	},
-/obj/structure/closet/secure_closet/guncabinet/red/armory_shotgun,
-/turf/open/floor/almayer{
-	icon_state = "redfull"
-	},
-/area/almayer/squads/req)
 "bUp" = (
 /obj/structure/surface/table/almayer,
 /obj/structure/pipes/standard/simple/hidden/supply{
@@ -23432,6 +23317,13 @@
 	},
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/medical/medical_science)
+"bVg" = (
+/obj/structure/machinery/status_display{
+	pixel_x = 32;
+	pixel_y = 16
+	},
+/turf/open/floor/wood/ship,
+/area/almayer/living/commandbunks)
 "bVi" = (
 /obj/structure/disposalpipe/segment{
 	dir = 8;
@@ -23465,12 +23357,6 @@
 	icon_state = "blue"
 	},
 /area/almayer/squads/delta)
-"bVs" = (
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 4
-	},
-/turf/open/floor/wood/ship,
-/area/almayer/living/commandbunks)
 "bVw" = (
 /turf/open/floor/almayer{
 	dir = 4;
@@ -24036,13 +23922,6 @@
 /obj/structure/machinery/light,
 /turf/open/floor/almayer,
 /area/almayer/hallways/vehiclehangar)
-"bYa" = (
-/obj/structure/machinery/cm_vending/sorted/cargo_guns/cargo/blend,
-/turf/open/floor/almayer{
-	dir = 10;
-	icon_state = "green"
-	},
-/area/almayer/squads/req)
 "bYc" = (
 /obj/structure/pipes/standard/simple/hidden/supply,
 /turf/open/floor/plating/plating_catwalk,
@@ -24997,6 +24876,15 @@
 	icon_state = "ai_floors"
 	},
 /area/almayer/command/airoom)
+"ccm" = (
+/obj/structure/machinery/light{
+	dir = 8
+	},
+/obj/structure/closet/secure_closet/fridge/organic,
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/living/grunt_rnr)
 "ccq" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "W"
@@ -25359,13 +25247,6 @@
 /obj/structure/window/framed/almayer,
 /turf/open/floor/plating,
 /area/almayer/hallways/hangar)
-"cdB" = (
-/obj/structure/disposalpipe/segment{
-	dir = 8;
-	icon_state = "pipe-c"
-	},
-/turf/open/floor/wood/ship,
-/area/almayer/living/commandbunks)
 "cdE" = (
 /obj/structure/surface/table/almayer,
 /obj/item/reagent_container/food/drinks/cans/waterbottle{
@@ -26016,6 +25897,12 @@
 	icon_state = "cargo_arrow"
 	},
 /area/almayer/squads/alpha)
+"cij" = (
+/obj/structure/closet/secure_closet/guncabinet/red/armory_m39_submachinegun,
+/turf/open/floor/almayer{
+	icon_state = "redfull"
+	},
+/area/almayer/engineering/upper_engineering)
 "cil" = (
 /obj/structure/machinery/light,
 /obj/structure/sign/safety/waterhazard{
@@ -26402,6 +26289,15 @@
 	icon_state = "test_floor4"
 	},
 /area/almayer/hull/upper_hull/u_a_s)
+"ckE" = (
+/obj/effect/decal/warning_stripes{
+	icon_state = "NW-out";
+	pixel_y = 1
+	},
+/turf/open/floor/almayer{
+	icon_state = "mono"
+	},
+/area/almayer/lifeboat_pumps/north1)
 "ckI" = (
 /obj/structure/disposalpipe/segment,
 /obj/item/device/radio/intercom{
@@ -26881,16 +26777,6 @@
 	icon_state = "plating"
 	},
 /area/almayer/shipboard/port_point_defense)
-"cmo" = (
-/obj/structure/surface/table/almayer,
-/obj/effect/spawner/random/powercell,
-/obj/effect/spawner/random/tool,
-/obj/item/packageWrap,
-/turf/open/floor/almayer{
-	dir = 8;
-	icon_state = "green"
-	},
-/area/almayer/squads/req)
 "cmp" = (
 /turf/closed/wall/almayer,
 /area/almayer/engineering/engineering_workshop/hangar)
@@ -27219,10 +27105,6 @@
 	icon_state = "blue"
 	},
 /area/almayer/squads/delta)
-"com" = (
-/obj/structure/largecrate/supply/weapons/pistols,
-/turf/open/floor/plating/plating_catwalk,
-/area/almayer/hull/upper_hull/u_m_s)
 "cop" = (
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/living/tankerbunks)
@@ -27244,14 +27126,6 @@
 	icon_state = "plate"
 	},
 /area/almayer/squads/alpha_bravo_shared)
-"coD" = (
-/obj/structure/surface/table/woodentable/fancy,
-/obj/structure/flora/pottedplant{
-	icon_state = "pottedplant_18";
-	pixel_y = 12
-	},
-/turf/open/floor/carpet,
-/area/almayer/living/commandbunks)
 "coG" = (
 /obj/effect/decal/cleanable/blood/oil,
 /turf/open/floor/almayer{
@@ -27437,21 +27311,6 @@
 	icon_state = "red"
 	},
 /area/almayer/lifeboat_pumps/south1)
-"crw" = (
-/obj/structure/bed/bedroll{
-	name = "cat bed";
-	desc = "A bed of cotton fabric, purposely made for a cat to comfortably sleep on.";
-	pixel_y = 0
-	},
-/mob/living/simple_animal/cat/Jones{
-	dir = 8
-	},
-/obj/structure/machinery/firealarm{
-	pixel_y = 28;
-	pixel_x = -1
-	},
-/turf/open/floor/wood/ship,
-/area/almayer/living/commandbunks)
 "crD" = (
 /obj/structure/disposalpipe/segment,
 /turf/open/floor/almayer{
@@ -27778,6 +27637,12 @@
 	icon_state = "redcorner"
 	},
 /area/almayer/shipboard/brig/execution)
+"czG" = (
+/obj/structure/machinery/recharge_station,
+/turf/open/floor/almayer{
+	icon_state = "cargo"
+	},
+/area/almayer/command/airoom)
 "czJ" = (
 /obj/structure/sign/safety/restrictedarea{
 	pixel_x = 8;
@@ -28202,6 +28067,17 @@
 "cHu" = (
 /turf/closed/wall/almayer/research/containment/wall/south,
 /area/almayer/medical/containment/cell/cl)
+"cHA" = (
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 4
+	},
+/turf/open/floor/almayer{
+	icon_state = "silver"
+	},
+/area/almayer/command/cichallway)
 "cHE" = (
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 4
@@ -28529,15 +28405,6 @@
 	icon_state = "test_floor4"
 	},
 /area/almayer/medical/containment/cell/cl)
-"cNK" = (
-/obj/structure/pipes/vents/pump{
-	dir = 1
-	},
-/obj/structure/machinery/light/small,
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/almayer/command/combat_correspondent)
 "cNX" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -28625,6 +28492,23 @@
 "cQv" = (
 /turf/closed/wall/almayer/reinforced,
 /area/almayer/shipboard/brig/general_equipment)
+"cQD" = (
+/obj/structure/sink{
+	dir = 8;
+	pixel_x = -12;
+	pixel_y = 2
+	},
+/obj/structure/mirror{
+	pixel_x = -29
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "E";
+	pixel_x = 1
+	},
+/turf/open/floor/almayer{
+	icon_state = "dark_sterile"
+	},
+/area/almayer/living/commandbunks)
 "cQF" = (
 /obj/structure/largecrate/random/barrel/red,
 /turf/open/floor/almayer{
@@ -28663,6 +28547,16 @@
 	icon_state = "plate"
 	},
 /area/almayer/hull/upper_hull/u_f_s)
+"cRg" = (
+/obj/item/tool/weldpack{
+	pixel_y = 15
+	},
+/obj/structure/surface/table/almayer,
+/obj/item/clothing/head/welding,
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/hull/upper_hull/u_m_s)
 "cRi" = (
 /turf/open/floor/almayer{
 	icon_state = "mono"
@@ -28785,12 +28679,6 @@
 	icon_state = "test_floor4"
 	},
 /area/almayer/hull/upper_hull/u_f_p)
-"cVb" = (
-/obj/structure/machinery/sentry_holder/almayer,
-/turf/open/floor/almayer{
-	icon_state = "mono"
-	},
-/area/almayer/lifeboat_pumps/north2)
 "cVs" = (
 /obj/structure/platform_decoration{
 	dir = 8
@@ -28900,16 +28788,6 @@
 /obj/structure/largecrate/random/barrel/red,
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/hull/upper_hull/u_m_s)
-"cWE" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "NW-out";
-	pixel_y = 1
-	},
-/turf/open/floor/almayer{
-	dir = 5;
-	icon_state = "orange"
-	},
-/area/almayer/engineering/upper_engineering/port)
 "cWI" = (
 /obj/structure/prop/invuln/overhead_pipe{
 	pixel_x = 12
@@ -29270,6 +29148,12 @@
 	icon_state = "plating"
 	},
 /area/almayer/engineering/engine_core)
+"ddN" = (
+/obj/structure/closet/secure_closet/guncabinet/red/armory_m39_submachinegun,
+/turf/open/floor/almayer{
+	icon_state = "redfull"
+	},
+/area/almayer/squads/req)
 "deb" = (
 /obj/structure/bed,
 /obj/structure/machinery/flasher{
@@ -29375,6 +29259,17 @@
 	icon_state = "dark_sterile"
 	},
 /area/almayer/shipboard/brig/surgery)
+"dfP" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/closet/secure_closet/guncabinet,
+/obj/item/weapon/gun/rifle/l42a,
+/obj/item/weapon/gun/rifle/l42a{
+	pixel_y = 6
+	},
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/hull/upper_hull/u_m_s)
 "dgg" = (
 /obj/structure/machinery/camera/autoname/almayer{
 	dir = 4;
@@ -29415,11 +29310,6 @@
 	icon_state = "plate"
 	},
 /area/almayer/hull/lower_hull/l_m_s)
-"dha" = (
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/almayer/command/combat_correspondent)
 "dhQ" = (
 /obj/structure/sign/safety/terminal{
 	pixel_x = -17
@@ -29513,6 +29403,14 @@
 	icon_state = "cargo_arrow"
 	},
 /area/almayer/squads/alpha_bravo_shared)
+"diM" = (
+/obj/structure/bed/chair{
+	dir = 8
+	},
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/command/combat_correspondent)
 "djm" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "E";
@@ -29567,6 +29465,14 @@
 	icon_state = "orange"
 	},
 /area/almayer/engineering/engineering_workshop/hangar)
+"djN" = (
+/obj/effect/decal/warning_stripes{
+	icon_state = "S"
+	},
+/turf/open/floor/almayer{
+	icon_state = "dark_sterile"
+	},
+/area/almayer/engineering/upper_engineering/port)
 "djQ" = (
 /obj/item/device/radio/intercom{
 	freerange = 1;
@@ -29604,6 +29510,25 @@
 	icon_state = "redfull"
 	},
 /area/almayer/living/offices/flight)
+"dkn" = (
+/obj/structure/machinery/cm_vending/clothing/dress{
+	density = 0;
+	pixel_y = 16
+	},
+/obj/structure/machinery/light{
+	dir = 8
+	},
+/obj/structure/machinery/door_control{
+	id = "bot_uniforms";
+	name = "Uniform Vendor Lockdown";
+	pixel_x = -24;
+	pixel_y = 18;
+	req_access_txt = "31"
+	},
+/turf/open/floor/almayer{
+	icon_state = "cargo"
+	},
+/area/almayer/command/cic)
 "dkq" = (
 /obj/structure/machinery/door_control{
 	id = "hangarentrancenorth";
@@ -29646,6 +29571,17 @@
 	allow_construction = 0
 	},
 /area/almayer/stair_clone/upper)
+"dkS" = (
+/obj/structure/machinery/shower,
+/obj/structure/window/reinforced/tinted{
+	dir = 8
+	},
+/obj/structure/machinery/door/window/tinted{
+	dir = 2
+	},
+/obj/item/clothing/mask/cigarette/weed,
+/turf/open/floor/plating/plating_catwalk,
+/area/almayer/engineering/upper_engineering/port)
 "dll" = (
 /obj/structure/surface/table/almayer,
 /turf/open/floor/almayer{
@@ -29667,6 +29603,15 @@
 	icon_state = "dark_sterile"
 	},
 /area/almayer/shipboard/brig/surgery)
+"dlN" = (
+/obj/structure/pipes/standard/simple/hidden/supply,
+/obj/structure/machinery/door/firedoor/border_only/almayer{
+	dir = 2
+	},
+/turf/open/floor/almayer{
+	icon_state = "test_floor4"
+	},
+/area/almayer/lifeboat_pumps/north1)
 "dmg" = (
 /obj/structure/machinery/vending/coffee,
 /obj/structure/sign/safety/coffee{
@@ -29762,6 +29707,22 @@
 	icon_state = "mono"
 	},
 /area/almayer/engineering/upper_engineering/starboard)
+"dnJ" = (
+/obj/structure/flora/pottedplant{
+	icon_state = "pottedplant_22"
+	},
+/obj/structure/machinery/camera/autoname/almayer{
+	name = "ship-grade camera"
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "NW-out";
+	pixel_y = 1
+	},
+/turf/open/floor/almayer{
+	dir = 1;
+	icon_state = "red"
+	},
+/area/almayer/command/lifeboat)
 "dnS" = (
 /obj/structure/safe,
 /turf/open/floor/almayer{
@@ -29825,28 +29786,6 @@
 	icon_state = "cargo"
 	},
 /area/almayer/squads/req)
-"doU" = (
-/obj/structure/surface/rack,
-/turf/open/floor/plating/plating_catwalk,
-/area/almayer/engineering/upper_engineering/port)
-"dpn" = (
-/obj/structure/closet/secure_closet/freezer/fridge/full,
-/obj/structure/machinery/light{
-	dir = 1
-	},
-/obj/item/reagent_container/food/condiment/enzyme,
-/obj/item/reagent_container/food/condiment/enzyme,
-/obj/structure/transmitter{
-	name = "Kitchen Telephone";
-	phone_category = "Almayer";
-	phone_id = "Kitchen";
-	pixel_x = -8;
-	pixel_y = 29
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/almayer/living/grunt_rnr)
 "dpo" = (
 /obj/structure/machinery/light{
 	dir = 1
@@ -29959,6 +29898,12 @@
 	icon_state = "green"
 	},
 /area/almayer/hallways/aft_hallway)
+"dqQ" = (
+/obj/structure/closet/secure_closet/fridge/groceries,
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/living/grunt_rnr)
 "dqV" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -30001,6 +29946,18 @@
 	icon_state = "silver"
 	},
 /area/almayer/engineering/port_atmos)
+"drp" = (
+/obj/structure/toilet{
+	dir = 8;
+	pixel_y = 8;
+	layer = 2.9
+	},
+/obj/structure/window{
+	pixel_y = -2;
+	layer = 2.95
+	},
+/turf/open/floor/plating/plating_catwalk,
+/area/almayer/living/commandbunks)
 "drt" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4;
@@ -30058,6 +30015,12 @@
 	icon_state = "plate"
 	},
 /area/almayer/shipboard/brig/cryo)
+"dtv" = (
+/obj/effect/decal/warning_stripes{
+	icon_state = "SE-out"
+	},
+/turf/open/floor/almayer,
+/area/almayer/command/lifeboat)
 "dtH" = (
 /obj/structure/bed/chair/comfy{
 	dir = 8
@@ -30141,15 +30104,6 @@
 	icon_state = "mono"
 	},
 /area/almayer/living/starboard_garden)
-"duz" = (
-/obj/structure/mirror{
-	pixel_y = 32
-	},
-/obj/structure/sink{
-	pixel_y = 24
-	},
-/turf/open/floor/plating/plating_catwalk,
-/area/almayer/engineering/upper_engineering/port)
 "duF" = (
 /obj/structure/closet/secure_closet/personal,
 /turf/open/floor/almayer{
@@ -30344,15 +30298,6 @@
 	icon_state = "plate"
 	},
 /area/almayer/living/briefing)
-"dyj" = (
-/obj/structure/closet/secure_closet/commander,
-/obj/item/clothing/suit/storage/marine/light/vest,
-/obj/item/device/whistle,
-/obj/item/device/megaphone,
-/obj/item/device/radio,
-/obj/item/clothing/shoes/laceup,
-/turf/open/floor/wood/ship,
-/area/almayer/living/commandbunks)
 "dyp" = (
 /obj/structure/machinery/ares/cpu,
 /turf/open/floor/almayer/no_build{
@@ -30418,6 +30363,17 @@
 	icon_state = "plate"
 	},
 /area/almayer/hull/upper_hull/u_f_p)
+"dAi" = (
+/obj/structure/sign/nosmoking_2{
+	pixel_x = 32
+	},
+/obj/structure/machinery/door/firedoor/border_only/almayer{
+	dir = 2
+	},
+/turf/open/floor/almayer{
+	icon_state = "test_floor4"
+	},
+/area/almayer/lifeboat_pumps/north1)
 "dAq" = (
 /obj/structure/machinery/door/firedoor/border_only/almayer,
 /obj/structure/disposalpipe/segment{
@@ -30685,12 +30641,6 @@
 	icon_state = "greencorner"
 	},
 /area/almayer/hallways/starboard_hallway)
-"dEJ" = (
-/obj/structure/closet/firecloset,
-/turf/open/floor/almayer{
-	icon_state = "cargo"
-	},
-/area/almayer/lifeboat_pumps/north2)
 "dEQ" = (
 /obj/structure/surface/table/almayer,
 /obj/item/reagent_container/food/condiment/hotsauce/tabasco,
@@ -30705,24 +30655,6 @@
 /obj/structure/machinery/light,
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/hull/upper_hull/u_f_p)
-"dFb" = (
-/obj/structure/surface/table/woodentable/fancy,
-/obj/item/storage/bible{
-	desc = "As the legendary US Army chaplain once said, 'There are no Athiests in fancy offices'.";
-	name = "Holy Bible";
-	pixel_x = -3;
-	pixel_y = 9
-	},
-/obj/item/prop/helmetgarb/rosary{
-	pixel_y = 5;
-	pixel_x = -4
-	},
-/obj/item/device/flashlight/lamp{
-	pixel_y = 1;
-	pixel_x = 3
-	},
-/turf/open/floor/wood/ship,
-/area/almayer/living/commandbunks)
 "dFk" = (
 /turf/open/floor/almayer{
 	dir = 8;
@@ -30938,16 +30870,6 @@
 	icon_state = "ai_floors"
 	},
 /area/almayer/command/airoom)
-"dID" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "N";
-	pixel_y = 1
-	},
-/turf/open/floor/almayer{
-	dir = 1;
-	icon_state = "red"
-	},
-/area/almayer/command/lifeboat)
 "dII" = (
 /obj/structure/machinery/door/airlock/multi_tile/almayer/marine/shared/alpha_bravo,
 /obj/effect/decal/warning_stripes{
@@ -30970,12 +30892,6 @@
 	icon_state = "cargo"
 	},
 /area/almayer/hull/lower_hull/l_m_s)
-"dKa" = (
-/obj/structure/closet/firecloset,
-/turf/open/floor/almayer{
-	icon_state = "cargo"
-	},
-/area/almayer/hull/upper_hull/u_f_s)
 "dKm" = (
 /obj/structure/machinery/power/apc/almayer{
 	dir = 4
@@ -31018,16 +30934,6 @@
 	icon_state = "plate"
 	},
 /area/almayer/command/lifeboat)
-"dLe" = (
-/obj/structure/pipes/standard/manifold/hidden/supply,
-/obj/structure/disposalpipe/junction{
-	dir = 4;
-	icon_state = "pipe-j2"
-	},
-/turf/open/floor/almayer{
-	icon_state = "silver"
-	},
-/area/almayer/command/cichallway)
 "dLt" = (
 /obj/structure/sign/safety/hazard{
 	pixel_x = -17;
@@ -31052,20 +30958,6 @@
 	icon_state = "silver"
 	},
 /area/almayer/hallways/aft_hallway)
-"dMf" = (
-/obj/structure/surface/table/almayer,
-/obj/item/storage/photo_album{
-	pixel_x = -4;
-	pixel_y = 5
-	},
-/obj/item/folder/black{
-	pixel_x = 7;
-	pixel_y = -3
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/almayer/command/combat_correspondent)
 "dMB" = (
 /turf/open/floor/almayer{
 	dir = 8;
@@ -31195,25 +31087,6 @@
 	icon_state = "silver"
 	},
 /area/almayer/command/airoom)
-"dQp" = (
-/obj/structure/pipes/standard/simple/hidden/supply,
-/obj/effect/decal/warning_stripes{
-	icon_state = "NW-out";
-	pixel_y = 1
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "NE-out";
-	pixel_x = 1;
-	pixel_y = 1
-	},
-/obj/structure/machinery/door/airlock/almayer/generic{
-	dir = 1;
-	name = "Bathroom"
-	},
-/turf/open/floor/almayer{
-	icon_state = "test_floor4"
-	},
-/area/almayer/shipboard/brig/cells)
 "dQs" = (
 /obj/structure/pipes/standard/manifold/hidden/supply{
 	dir = 1
@@ -31257,12 +31130,6 @@
 	},
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/medical/hydroponics)
-"dRs" = (
-/obj/structure/closet/emcloset,
-/turf/open/floor/almayer{
-	icon_state = "cargo"
-	},
-/area/almayer/engineering/upper_engineering/port)
 "dRv" = (
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 4
@@ -31326,6 +31193,19 @@
 	icon_state = "test_floor4"
 	},
 /area/almayer/shipboard/brig/main_office)
+"dSn" = (
+/obj/structure/pipes/standard/simple/hidden/supply,
+/obj/effect/decal/warning_stripes{
+	icon_state = "W"
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "E";
+	pixel_x = 1
+	},
+/turf/open/floor/almayer{
+	icon_state = "dark_sterile"
+	},
+/area/almayer/shipboard/brig/cells)
 "dSp" = (
 /obj/structure/machinery/camera/autoname/almayer{
 	name = "ship-grade camera"
@@ -31573,13 +31453,6 @@
 	icon_state = "dark_sterile"
 	},
 /area/almayer/engineering/laundry)
-"dXo" = (
-/obj/structure/surface/table/almayer,
-/obj/item/device/taperecorder,
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/almayer/command/combat_correspondent)
 "dXr" = (
 /obj/structure/bed/chair{
 	dir = 8;
@@ -31732,6 +31605,12 @@
 	icon_state = "plate"
 	},
 /area/almayer/shipboard/port_point_defense)
+"eaX" = (
+/obj/structure/closet/firecloset,
+/turf/open/floor/almayer{
+	icon_state = "cargo"
+	},
+/area/almayer/engineering/upper_engineering/starboard)
 "ebd" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating/plating_catwalk,
@@ -31745,6 +31624,26 @@
 	icon_state = "plate"
 	},
 /area/almayer/command/lifeboat)
+"ebt" = (
+/obj/effect/decal/warning_stripes{
+	icon_state = "S"
+	},
+/obj/structure/machinery/camera/autoname/almayer{
+	name = "ship-grade camera"
+	},
+/obj/structure/closet/secure_closet/guncabinet/blue/riot_control,
+/turf/open/floor/plating/almayer,
+/area/almayer/shipboard/brig/armory)
+"ebz" = (
+/obj/effect/decal/warning_stripes{
+	icon_state = "S"
+	},
+/obj/structure/machinery/light/small{
+	dir = 1
+	},
+/obj/structure/closet/secure_closet/guncabinet/blue/riot_control,
+/turf/open/floor/plating/almayer,
+/area/almayer/shipboard/brig/armory)
 "ebD" = (
 /obj/structure/machinery/light/small{
 	dir = 1
@@ -31874,6 +31773,26 @@
 	icon_state = "sterile_green"
 	},
 /area/almayer/medical/medical_science)
+"edx" = (
+/obj/structure/machinery/door/firedoor/border_only/almayer,
+/obj/structure/sign/safety/maint{
+	pixel_x = 8;
+	pixel_y = -32
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "SW-out";
+	pixel_x = -1
+	},
+/turf/open/floor/almayer{
+	icon_state = "test_floor4"
+	},
+/area/almayer/command/lifeboat)
+"edM" = (
+/obj/structure/closet/firecloset,
+/turf/open/floor/almayer{
+	icon_state = "cargo"
+	},
+/area/almayer/hallways/vehiclehangar)
 "eed" = (
 /turf/open/floor/almayer{
 	icon_state = "mono"
@@ -32163,6 +32082,15 @@
 	dir = 1
 	},
 /area/almayer/medical/containment/cell)
+"eiH" = (
+/obj/structure/machinery/light{
+	dir = 8
+	},
+/obj/structure/toilet{
+	dir = 4
+	},
+/turf/open/floor/plating/plating_catwalk,
+/area/almayer/shipboard/brig/cells)
 "eiK" = (
 /obj/structure/bed/chair{
 	dir = 4
@@ -32323,15 +32251,6 @@
 	icon_state = "dark_sterile"
 	},
 /area/almayer/medical/operating_room_one)
-"elM" = (
-/obj/structure/bed/chair{
-	dir = 8;
-	pixel_y = 3
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/almayer/hull/upper_hull/u_m_s)
 "elR" = (
 /turf/closed/wall/almayer/research/containment/wall/corner{
 	dir = 1
@@ -32513,6 +32432,18 @@
 	icon_state = "plate"
 	},
 /area/almayer/hull/lower_hull/l_a_s)
+"epK" = (
+/obj/structure/closet/secure_closet/guncabinet,
+/obj/item/weapon/gun/smg/m39{
+	pixel_y = 6
+	},
+/obj/item/weapon/gun/smg/m39{
+	pixel_y = -6
+	},
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/hull/upper_hull/u_m_s)
 "eqb" = (
 /obj/structure/surface/table/almayer,
 /obj/item/tool/stamp/denied{
@@ -32635,6 +32566,14 @@
 	icon_state = "plate"
 	},
 /area/almayer/shipboard/brig/cryo)
+"erz" = (
+/obj/structure/closet/crate,
+/obj/item/ammo_box/magazine/l42a,
+/obj/item/ammo_box/magazine/l42a,
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/hull/upper_hull/u_m_s)
 "erG" = (
 /obj/structure/disposalpipe/junction{
 	dir = 2;
@@ -32678,23 +32617,20 @@
 	icon_state = "plate"
 	},
 /area/almayer/hallways/starboard_hallway)
-"esC" = (
-/obj/structure/toilet{
-	pixel_y = 13
-	},
-/obj/item/paper_bin/uscm{
-	pixel_x = 9;
-	pixel_y = -3
+"esy" = (
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 4
 	},
-/obj/structure/machinery/light/small{
+/obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/obj/item/prop/magazine/dirty{
-	pixel_x = -6;
-	pixel_y = -10
+/obj/structure/machinery/cm_vending/sorted/medical/wall_med{
+	pixel_y = -29
 	},
-/turf/open/floor/plating/plating_catwalk,
-/area/almayer/living/captain_mess)
+/turf/open/floor/almayer{
+	icon_state = "silver"
+	},
+/area/almayer/command/cichallway)
 "esF" = (
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 1
@@ -32728,14 +32664,6 @@
 	icon_state = "plating_striped"
 	},
 /area/almayer/command/lifeboat)
-"etn" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "S"
-	},
-/turf/open/floor/almayer{
-	icon_state = "red"
-	},
-/area/almayer/command/lifeboat)
 "ets" = (
 /obj/structure/machinery/power/apc/almayer{
 	dir = 4
@@ -32791,6 +32719,33 @@
 	icon_state = "test_floor4"
 	},
 /area/almayer/living/officer_study)
+"euM" = (
+/obj/structure/surface/table/woodentable/fancy,
+/obj/item/paper_bin/uscm{
+	pixel_y = 7;
+	pixel_x = -17
+	},
+/obj/item/tool/pen/clicky{
+	pixel_x = -13;
+	pixel_y = -1
+	},
+/obj/item/tool/pen/clicky{
+	pixel_y = 5;
+	pixel_x = -13
+	},
+/obj/structure/machinery/door_control{
+	id = "CO-Office";
+	name = "Door Control";
+	normaldoorcontrol = 1;
+	req_access_txt = "31";
+	pixel_y = 7
+	},
+/obj/item/ashtray/bronze{
+	pixel_y = 1;
+	pixel_x = 12
+	},
+/turf/open/floor/carpet,
+/area/almayer/living/commandbunks)
 "euN" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "SE-out"
@@ -32822,6 +32777,12 @@
 	icon_state = "logo_c"
 	},
 /area/almayer/command/cic)
+"euY" = (
+/obj/structure/closet/firecloset,
+/turf/open/floor/almayer{
+	icon_state = "cargo"
+	},
+/area/almayer/engineering/upper_engineering/port)
 "eva" = (
 /obj/structure/sign/safety/distribution_pipes{
 	pixel_x = 32
@@ -32964,6 +32925,12 @@
 	icon_state = "cargo"
 	},
 /area/almayer/shipboard/brig/cryo)
+"eyv" = (
+/obj/structure/machinery/sentry_holder/almayer,
+/turf/open/floor/almayer{
+	icon_state = "mono"
+	},
+/area/almayer/lifeboat_pumps/south1)
 "eyG" = (
 /obj/structure/platform,
 /turf/open/floor/almayer{
@@ -33112,12 +33079,6 @@
 	},
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/hallways/starboard_umbilical)
-"eBE" = (
-/obj/structure/machinery/photocopier{
-	anchored = 0
-	},
-/turf/open/floor/wood/ship,
-/area/almayer/living/commandbunks)
 "eBO" = (
 /obj/structure/bed,
 /turf/open/floor/almayer{
@@ -33286,17 +33247,6 @@
 	icon_state = "plate"
 	},
 /area/almayer/hull/lower_hull/l_f_p)
-"eFG" = (
-/obj/structure/machinery/light{
-	dir = 1
-	},
-/obj/structure/surface/table/almayer,
-/obj/item/tool/hand_labeler,
-/turf/open/floor/almayer{
-	dir = 1;
-	icon_state = "sterile_green_side"
-	},
-/area/almayer/medical/chemistry)
 "eFH" = (
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/hull/lower_hull/l_a_s)
@@ -33774,6 +33724,19 @@
 	icon_state = "plate"
 	},
 /area/almayer/hull/upper_hull/u_a_p)
+"eRt" = (
+/obj/structure/sign/safety/ammunition{
+	pixel_x = 15;
+	pixel_y = 32
+	},
+/obj/structure/sign/safety/hazard{
+	pixel_y = 32
+	},
+/obj/structure/closet/secure_closet/guncabinet/red/armory_m39_submachinegun,
+/turf/open/floor/almayer{
+	icon_state = "redfull"
+	},
+/area/almayer/hull/lower_hull/l_f_s)
 "eRu" = (
 /obj/structure/machinery/door/firedoor/border_only/almayer{
 	dir = 2
@@ -33841,6 +33804,27 @@
 /obj/effect/landmark/crap_item,
 /turf/open/floor/almayer,
 /area/almayer/living/briefing)
+"eTh" = (
+/obj/item/device/radio/intercom{
+	freerange = 1;
+	name = "General Listening Channel";
+	pixel_y = 28
+	},
+/obj/item/clothing/suit/storage/marine/light/vest,
+/obj/item/clothing/suit/storage/marine/light/vest,
+/obj/item/clothing/suit/storage/marine/light/vest,
+/obj/item/clothing/suit/storage/marine/light/vest,
+/obj/item/clothing/suit/storage/marine/light/vest,
+/obj/item/clothing/suit/storage/marine/light/vest,
+/obj/structure/surface/rack,
+/obj/item/clothing/suit/storage/marine/light/vest,
+/obj/item/clothing/suit/storage/marine/light/vest,
+/obj/item/clothing/suit/storage/marine/light/vest,
+/obj/item/clothing/suit/storage/marine/light/vest,
+/turf/open/floor/almayer{
+	icon_state = "redfull"
+	},
+/area/almayer/medical/upper_medical)
 "eTo" = (
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 4
@@ -33854,6 +33838,13 @@
 	},
 /turf/open/floor/almayer,
 /area/almayer/shipboard/brig/cells)
+"eTx" = (
+/obj/effect/decal/warning_stripes{
+	icon_state = "S"
+	},
+/obj/structure/closet/secure_closet/guncabinet/red/mp_armory_shotgun,
+/turf/open/floor/plating/almayer,
+/area/almayer/shipboard/brig/armory)
 "eTO" = (
 /obj/structure/sign/safety/maint{
 	pixel_x = -17
@@ -34015,14 +34006,6 @@
 	icon_state = "sterile_green_side"
 	},
 /area/almayer/medical/lower_medical_medbay)
-"eXk" = (
-/obj/effect/landmark/late_join/working_joe,
-/obj/effect/landmark/start/working_joe,
-/obj/structure/machinery/light{
-	dir = 8
-	},
-/turf/open/floor/plating/plating_catwalk,
-/area/almayer/command/airoom)
 "eXo" = (
 /obj/structure/machinery/light/small,
 /turf/open/floor/plating/plating_catwalk,
@@ -34034,17 +34017,15 @@
 /obj/structure/pipes/vents/pump,
 /turf/open/floor/almayer,
 /area/almayer/living/offices)
-"eXS" = (
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 1
+"eXU" = (
+/obj/structure/bed/chair{
+	dir = 8;
+	pixel_y = 3
 	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "NE-out";
-	pixel_x = 2;
-	pixel_y = 2
+/turf/open/floor/almayer{
+	icon_state = "plate"
 	},
-/turf/open/floor/plating/plating_catwalk,
-/area/almayer/hull/upper_hull/u_f_p)
+/area/almayer/hull/upper_hull/u_m_s)
 "eYr" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "S"
@@ -34177,25 +34158,6 @@
 	},
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/hallways/starboard_hallway)
-"faE" = (
-/obj/structure/bookcase{
-	icon_state = "book-5";
-	name = "law and engineering manuals bookcase";
-	opacity = 0
-	},
-/obj/item/book/manual/marine_law,
-/obj/item/book/manual/detective,
-/obj/item/book/manual/security_space_law,
-/obj/item/book/manual/engineering_guide,
-/obj/item/book/manual/engineering_construction,
-/obj/item/book/manual/orbital_cannon_manual,
-/obj/item/book/manual/ripley_build_and_repair,
-/obj/item/book/manual/engineering_hacking,
-/obj/structure/machinery/light{
-	dir = 8
-	},
-/turf/open/floor/wood/ship,
-/area/almayer/living/commandbunks)
 "faO" = (
 /obj/item/stack/cable_coil,
 /turf/open/floor/plating/plating_catwalk,
@@ -34580,14 +34542,6 @@
 	icon_state = "mono"
 	},
 /area/almayer/engineering/upper_engineering/starboard)
-"fhQ" = (
-/obj/structure/closet/secure_closet/freezer/fridge/full,
-/obj/structure/machinery/light,
-/obj/item/reagent_container/food/condiment/sugar,
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/almayer/living/grunt_rnr)
 "fiq" = (
 /turf/closed/wall/almayer,
 /area/almayer/hull/lower_hull/l_m_p)
@@ -34602,6 +34556,27 @@
 	icon_state = "orange"
 	},
 /area/almayer/engineering/engine_core)
+"fiP" = (
+/obj/structure/surface/table/woodentable/fancy,
+/obj/item/storage/fancy/cigar{
+	pixel_y = 2;
+	layer = 3.04;
+	pixel_x = -2
+	},
+/obj/item/reagent_container/food/drinks/bottle/sake{
+	pixel_x = -11;
+	pixel_y = 16
+	},
+/obj/item/reagent_container/food/drinks/bottle/sake{
+	pixel_y = 16;
+	pixel_x = -2
+	},
+/obj/item/reagent_container/food/drinks/bottle/sake{
+	pixel_x = 7;
+	pixel_y = 16
+	},
+/turf/open/floor/wood/ship,
+/area/almayer/living/commandbunks)
 "fjO" = (
 /obj/item/tool/wet_sign,
 /obj/effect/decal/cleanable/blood,
@@ -34706,12 +34681,6 @@
 	icon_state = "redcorner"
 	},
 /area/almayer/shipboard/brig/execution)
-"fnv" = (
-/obj/structure/machinery/light{
-	dir = 4
-	},
-/turf/open/floor/wood/ship,
-/area/almayer/living/commandbunks)
 "fnx" = (
 /obj/structure/surface/table/reinforced/almayer_B,
 /obj/structure/machinery/door/window/eastright{
@@ -34753,6 +34722,18 @@
 	icon_state = "test_floor4"
 	},
 /area/almayer/squads/req)
+"fnQ" = (
+/obj/structure/toilet{
+	dir = 1
+	},
+/obj/structure/window/reinforced/tinted{
+	dir = 8
+	},
+/obj/structure/machinery/door/window/tinted{
+	dir = 1
+	},
+/turf/open/floor/plating/plating_catwalk,
+/area/almayer/engineering/upper_engineering/port)
 "fnZ" = (
 /obj/structure/machinery/portable_atmospherics/canister/air,
 /obj/structure/machinery/light/small{
@@ -34873,6 +34854,12 @@
 	},
 /turf/open/floor/wood/ship,
 /area/almayer/command/corporateliason)
+"fqg" = (
+/obj/effect/decal/warning_stripes{
+	icon_state = "S"
+	},
+/turf/open/floor/almayer,
+/area/almayer/lifeboat_pumps/south2)
 "fqu" = (
 /obj/structure/largecrate/random/barrel/red,
 /turf/open/floor/almayer,
@@ -34929,20 +34916,6 @@
 	icon_state = "red"
 	},
 /area/almayer/shipboard/starboard_missiles)
-"frJ" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "S"
-	},
-/obj/structure/sign/safety/ammunition{
-	pixel_x = 15;
-	pixel_y = 32
-	},
-/obj/structure/sign/safety/hazard{
-	pixel_y = 32
-	},
-/obj/structure/closet/secure_closet/guncabinet/red/mp_armory_shotgun,
-/turf/open/floor/plating/almayer,
-/area/almayer/shipboard/brig/armory)
 "frM" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "S";
@@ -34956,19 +34929,6 @@
 	icon_state = "tcomms"
 	},
 /area/almayer/command/airoom)
-"frY" = (
-/obj/structure/closet/secure_closet/guncabinet,
-/obj/item/weapon/gun/rifle/l42a{
-	pixel_y = 6
-	},
-/obj/item/weapon/gun/rifle/l42a,
-/obj/item/weapon/gun/rifle/l42a{
-	pixel_y = -6
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/almayer/hull/upper_hull/u_m_s)
 "fsd" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "S"
@@ -35105,6 +35065,21 @@
 /obj/structure/largecrate/random/barrel/green,
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/hull/upper_hull/u_f_s)
+"fuR" = (
+/obj/structure/bed/bedroll{
+	name = "cat bed";
+	desc = "A bed of cotton fabric, purposely made for a cat to comfortably sleep on.";
+	pixel_y = 0
+	},
+/mob/living/simple_animal/cat/Jones{
+	dir = 8
+	},
+/obj/structure/machinery/firealarm{
+	pixel_y = 28;
+	pixel_x = -1
+	},
+/turf/open/floor/wood/ship,
+/area/almayer/living/commandbunks)
 "fuS" = (
 /obj/structure/disposalpipe/segment,
 /obj/structure/pipes/standard/simple/hidden/supply,
@@ -35556,6 +35531,16 @@
 	icon_state = "sterile_green_side"
 	},
 /area/almayer/medical/morgue)
+"fFq" = (
+/obj/structure/machinery/light/small{
+	dir = 8
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "S"
+	},
+/obj/structure/closet/secure_closet/guncabinet/red/mp_armory_shotgun,
+/turf/open/floor/plating/almayer,
+/area/almayer/shipboard/brig/armory)
 "fFD" = (
 /obj/structure/window/reinforced{
 	dir = 4;
@@ -35591,16 +35576,6 @@
 	icon_state = "plate"
 	},
 /area/almayer/medical/morgue)
-"fGa" = (
-/obj/structure/surface/rack,
-/obj/effect/decal/warning_stripes{
-	icon_state = "N";
-	pixel_y = 1
-	},
-/turf/open/floor/almayer{
-	icon_state = "dark_sterile"
-	},
-/area/almayer/living/numbertwobunks)
 "fGg" = (
 /obj/effect/decal/cleanable/blood/oil/streak,
 /turf/open/floor/almayer,
@@ -36011,21 +35986,19 @@
 	},
 /turf/open/floor/almayer,
 /area/almayer/hallways/aft_hallway)
+"fOh" = (
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 4;
+	icon_state = "exposed01-supply"
+	},
+/turf/open/floor/plating/plating_catwalk,
+/area/almayer/command/combat_correspondent)
 "fOk" = (
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 9
 	},
 /turf/open/floor/almayer,
 /area/almayer/living/briefing)
-"fOv" = (
-/obj/structure/disposalpipe/segment{
-	dir = 4
-	},
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 4
-	},
-/turf/open/floor/carpet,
-/area/almayer/living/commandbunks)
 "fOz" = (
 /obj/structure/target{
 	name = "punching bag"
@@ -36131,20 +36104,6 @@
 /obj/effect/step_trigger/clone_cleaner,
 /turf/closed/wall/almayer,
 /area/almayer/hull/upper_hull/u_m_p)
-"fQY" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/largecrate/supply/weapons/m39{
-	pixel_x = 2
-	},
-/obj/structure/largecrate/supply/weapons/m41a{
-	layer = 3.1;
-	pixel_x = 6;
-	pixel_y = 17
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/almayer/hull/upper_hull/u_m_s)
 "fRr" = (
 /obj/structure/machinery/light{
 	dir = 1
@@ -36271,18 +36230,6 @@
 	icon_state = "dark_sterile"
 	},
 /area/almayer/medical/chemistry)
-"fWi" = (
-/obj/structure/toilet{
-	dir = 1
-	},
-/obj/structure/window/reinforced/tinted{
-	dir = 8
-	},
-/obj/structure/machinery/door/window/tinted{
-	dir = 1
-	},
-/turf/open/floor/plating/plating_catwalk,
-/area/almayer/engineering/upper_engineering/port)
 "fWT" = (
 /obj/structure/machinery/door/airlock/almayer/engineering{
 	dir = 2;
@@ -36311,6 +36258,16 @@
 	},
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/medical/morgue)
+"fXt" = (
+/obj/structure/window/framed/almayer,
+/obj/structure/machinery/door/firedoor/border_only/almayer{
+	dir = 1
+	},
+/turf/open/floor/almayer{
+	dir = 5;
+	icon_state = "green"
+	},
+/area/almayer/squads/req)
 "fXx" = (
 /obj/structure/surface/rack,
 /turf/open/floor/almayer{
@@ -36331,33 +36288,17 @@
 /obj/structure/disposalpipe/segment,
 /turf/open/floor/almayer,
 /area/almayer/hallways/aft_hallway)
-"fXE" = (
-/obj/structure/surface/table/almayer,
-/obj/structure/machinery/computer/emails{
-	pixel_x = 2;
-	pixel_y = 5
-	},
-/obj/structure/machinery/light/small{
-	dir = 1
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
+"fXM" = (
+/obj/effect/decal/warning_stripes{
+	icon_state = "S"
 	},
-/area/almayer/command/combat_correspondent)
+/turf/open/floor/almayer,
+/area/almayer/command/lifeboat)
 "fXN" = (
 /obj/effect/landmark/start/marine/delta,
 /obj/effect/landmark/late_join/delta,
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/squads/delta)
-"fXP" = (
-/obj/structure/machinery/camera/autoname/almayer{
-	name = "ship-grade camera"
-	},
-/turf/open/floor/almayer{
-	dir = 1;
-	icon_state = "silver"
-	},
-/area/almayer/command/cichallway)
 "fYb" = (
 /turf/open/floor/almayer{
 	dir = 8;
@@ -36752,6 +36693,10 @@
 /obj/structure/machinery/recharge_station,
 /turf/open/floor/plating,
 /area/almayer/command/airoom)
+"gfK" = (
+/obj/structure/bed/chair/comfy/blue,
+/turf/open/floor/carpet,
+/area/almayer/living/commandbunks)
 "gfS" = (
 /obj/structure/sign/safety/cryo{
 	pixel_y = -26
@@ -36816,6 +36761,14 @@
 /obj/effect/landmark/start/liaison,
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/hull/upper_hull/u_m_p)
+"ghX" = (
+/obj/structure/machinery/shower{
+	dir = 8
+	},
+/obj/item/toy/inflatable_duck,
+/obj/structure/window/reinforced,
+/turf/open/floor/plating/plating_catwalk,
+/area/almayer/shipboard/brig/cells)
 "gio" = (
 /obj/structure/closet/emcloset,
 /obj/structure/sign/safety/restrictedarea{
@@ -36952,12 +36905,6 @@
 	icon_state = "plate"
 	},
 /area/almayer/hull/lower_hull/l_a_s)
-"gka" = (
-/obj/structure/closet/secure_closet/guncabinet/red/armory_shotgun,
-/turf/open/floor/almayer{
-	icon_state = "redfull"
-	},
-/area/almayer/hull/lower_hull/l_f_s)
 "gks" = (
 /obj/structure/largecrate/random/secure,
 /turf/open/floor/plating,
@@ -37173,6 +37120,15 @@
 	icon_state = "plate"
 	},
 /area/almayer/hull/upper_hull/u_f_s)
+"gqF" = (
+/obj/structure/machinery/photocopier,
+/obj/structure/machinery/light/small{
+	dir = 1
+	},
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/command/combat_correspondent)
 "gqK" = (
 /obj/structure/machinery/light/small{
 	dir = 1
@@ -37392,12 +37348,6 @@
 	icon_state = "green"
 	},
 /area/almayer/squads/req)
-"gvW" = (
-/obj/structure/closet/firecloset,
-/turf/open/floor/almayer{
-	icon_state = "cargo"
-	},
-/area/almayer/hull/upper_hull/u_f_p)
 "gwm" = (
 /obj/structure/largecrate/random/case/small,
 /obj/item/device/taperecorder{
@@ -37424,6 +37374,15 @@
 	icon_state = "bluecorner"
 	},
 /area/almayer/living/basketball)
+"gwu" = (
+/obj/structure/machinery/light,
+/obj/effect/decal/warning_stripes{
+	icon_state = "SE-out"
+	},
+/turf/open/floor/almayer{
+	icon_state = "red"
+	},
+/area/almayer/command/lifeboat)
 "gww" = (
 /obj/structure/bed/chair,
 /obj/structure/machinery/light{
@@ -37564,6 +37523,12 @@
 	icon_state = "silver"
 	},
 /area/almayer/shipboard/brig/cic_hallway)
+"gye" = (
+/obj/structure/machinery/door/poddoor/shutters/almayer/uniform_vendors,
+/turf/open/floor/almayer{
+	icon_state = "test_floor4"
+	},
+/area/almayer/command/cic)
 "gyt" = (
 /obj/item/storage/firstaid/regular,
 /obj/structure/surface/rack,
@@ -37623,13 +37588,6 @@
 	icon_state = "orange"
 	},
 /area/almayer/engineering/ce_room)
-"gyU" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "N";
-	pixel_y = 1
-	},
-/turf/open/floor/almayer,
-/area/almayer/lifeboat_pumps/north2)
 "gzn" = (
 /obj/structure/machinery/landinglight/ds2/delaytwo{
 	dir = 8
@@ -37823,19 +37781,6 @@
 	},
 /turf/open/floor/almayer,
 /area/almayer/hallways/hangar)
-"gCB" = (
-/obj/structure/machinery/power/apc/almayer/hardened{
-	cell_type = /obj/item/cell/hyper;
-	dir = 1
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "NW-out";
-	pixel_y = 1
-	},
-/turf/open/floor/almayer{
-	icon_state = "mono"
-	},
-/area/almayer/lifeboat_pumps/north2)
 "gCI" = (
 /obj/structure/machinery/light{
 	dir = 4
@@ -37855,14 +37800,16 @@
 	icon_state = "plate"
 	},
 /area/almayer/living/bridgebunks)
-"gDP" = (
-/obj/structure/closet/crate,
-/obj/item/ammo_box/magazine/l42a,
-/obj/item/ammo_box/magazine/l42a,
-/turf/open/floor/almayer{
-	icon_state = "plate"
+"gDq" = (
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 10
 	},
-/area/almayer/hull/upper_hull/u_m_s)
+/obj/effect/decal/warning_stripes{
+	icon_state = "E";
+	pixel_x = 2
+	},
+/turf/open/floor/almayer,
+/area/almayer/hull/upper_hull/u_f_p)
 "gDW" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -37896,6 +37843,36 @@
 	icon_state = "plate"
 	},
 /area/almayer/engineering/upper_engineering/port)
+"gEI" = (
+/obj/item/device/flashlight/lamp/green{
+	pixel_x = 5;
+	pixel_y = 3
+	},
+/obj/structure/machinery/door_control{
+	id = "cl_shutters";
+	name = "Privacy Shutters";
+	pixel_x = -5;
+	pixel_y = 8;
+	req_access_txt = "200"
+	},
+/obj/structure/machinery/door_control{
+	id = "RoomDivider";
+	name = "Room Divider";
+	pixel_x = -5;
+	pixel_y = -4;
+	req_access_txt = "200"
+	},
+/obj/structure/surface/table/woodentable/fancy,
+/obj/structure/machinery/door_control{
+	id = "cl_evac";
+	name = "Evac Pod Door Control";
+	normaldoorcontrol = 1;
+	pixel_x = -5;
+	pixel_y = 2;
+	req_access_txt = "200"
+	},
+/turf/open/floor/carpet,
+/area/almayer/command/corporateliason)
 "gEK" = (
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 4
@@ -37943,22 +37920,31 @@
 	icon_state = "plate"
 	},
 /area/almayer/squads/delta)
-"gGp" = (
+"gGl" = (
 /obj/structure/surface/table/almayer,
-/obj/item/clothing/mask/cigarette/pipe{
-	pixel_x = 8
+/obj/item/device/taperecorder,
+/turf/open/floor/almayer{
+	icon_state = "plate"
 	},
-/obj/structure/transmitter/rotary{
-	name = "Reporter Telephone";
-	phone_category = "Almayer";
-	phone_id = "Reporter";
-	pixel_x = -4;
-	pixel_y = 6
+/area/almayer/command/combat_correspondent)
+"gGo" = (
+/obj/structure/surface/table/almayer,
+/obj/effect/landmark/map_item{
+	pixel_x = -8
+	},
+/obj/item/toy/plush/therapy/red{
+	desc = "A USCM approved plush doll. It's not soft and hardly comforting!";
+	force = 15;
+	layer = 4.1;
+	name = "Sergeant Huggs";
+	pixel_x = 7;
+	pixel_y = -1;
+	throwforce = 15
 	},
 /turf/open/floor/almayer{
 	icon_state = "plate"
 	},
-/area/almayer/command/combat_correspondent)
+/area/almayer/living/briefing)
 "gGr" = (
 /obj/structure/machinery/vending/cigarette,
 /turf/open/floor/almayer{
@@ -38091,6 +38077,12 @@
 	icon_state = "orange"
 	},
 /area/almayer/engineering/lower_engineering)
+"gJs" = (
+/obj/structure/machinery/cm_vending/sorted/cargo_ammo/cargo/blend,
+/turf/open/floor/almayer{
+	icon_state = "green"
+	},
+/area/almayer/squads/req)
 "gJP" = (
 /obj/structure/machinery/light,
 /obj/structure/disposalpipe/segment{
@@ -38546,6 +38538,14 @@
 	icon_state = "green"
 	},
 /area/almayer/living/grunt_rnr)
+"gUr" = (
+/obj/item/stack/folding_barricade/three,
+/obj/item/stack/folding_barricade/three,
+/obj/structure/surface/rack,
+/turf/open/floor/almayer{
+	icon_state = "redfull"
+	},
+/area/almayer/hull/lower_hull/l_f_s)
 "gUv" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "W"
@@ -38605,18 +38605,6 @@
 /obj/structure/pipes/standard/manifold/hidden/supply,
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/lifeboat_pumps/north2)
-"gVd" = (
-/obj/structure/surface/table/woodentable/fancy,
-/obj/item/folder/black{
-	pixel_y = 8
-	},
-/obj/item/folder/yellow,
-/obj/item/device/flashlight/lamp/green{
-	pixel_y = 8;
-	pixel_x = -16
-	},
-/turf/open/floor/carpet,
-/area/almayer/living/commandbunks)
 "gVq" = (
 /obj/structure/machinery/light,
 /obj/effect/decal/warning_stripes{
@@ -38898,16 +38886,6 @@
 	icon_state = "silver"
 	},
 /area/almayer/living/auxiliary_officer_office)
-"hbI" = (
-/obj/structure/sign/safety/ammunition{
-	pixel_x = 32;
-	pixel_y = 7
-	},
-/obj/structure/closet/secure_closet/guncabinet/red/armory_shotgun,
-/turf/open/floor/almayer{
-	icon_state = "redfull"
-	},
-/area/almayer/medical/upper_medical)
 "hbZ" = (
 /obj/structure/surface/table/almayer,
 /obj/structure/sign/safety/terminal{
@@ -38993,16 +38971,6 @@
 "hcZ" = (
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/living/offices)
-"hdb" = (
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 4
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "N";
-	pixel_y = 2
-	},
-/turf/open/floor/plating/plating_catwalk,
-/area/almayer/hull/upper_hull/u_f_s)
 "hdd" = (
 /turf/open/floor/almayer{
 	dir = 9;
@@ -39083,6 +39051,13 @@
 	icon_state = "plate"
 	},
 /area/almayer/engineering/engine_core)
+"hey" = (
+/obj/effect/decal/cleanable/blood/oil/streak,
+/obj/structure/machinery/sentry_holder/almayer,
+/turf/open/floor/almayer{
+	icon_state = "mono"
+	},
+/area/almayer/lifeboat_pumps/south1)
 "heK" = (
 /obj/structure/machinery/door/airlock/almayer/maint{
 	dir = 1;
@@ -39138,6 +39113,22 @@
 	icon_state = "plate"
 	},
 /area/almayer/hull/lower_hull/l_m_s)
+"hfw" = (
+/obj/structure/flora/pottedplant{
+	icon_state = "pottedplant_22"
+	},
+/obj/structure/machinery/camera/autoname/almayer{
+	dir = 1;
+	name = "ship-grade camera"
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "SW-out";
+	pixel_x = -1
+	},
+/turf/open/floor/almayer{
+	icon_state = "red"
+	},
+/area/almayer/command/lifeboat)
 "hfy" = (
 /obj/structure/machinery/light,
 /turf/open/floor/plating/plating_catwalk,
@@ -39283,14 +39274,6 @@
 	},
 /turf/open/floor/plating,
 /area/almayer/hull/lower_hull/l_f_p)
-"hiy" = (
-/obj/structure/machinery/door/firedoor/border_only/almayer{
-	dir = 2
-	},
-/turf/open/floor/almayer{
-	icon_state = "test_floor4"
-	},
-/area/almayer/lifeboat_pumps/north1)
 "hiB" = (
 /obj/structure/pipes/vents/pump{
 	dir = 1
@@ -39304,6 +39287,13 @@
 	},
 /turf/open/floor/almayer,
 /area/almayer/shipboard/brig/cic_hallway)
+"hiN" = (
+/obj/effect/decal/warning_stripes{
+	icon_state = "N";
+	pixel_y = 1
+	},
+/turf/open/floor/almayer,
+/area/almayer/command/lifeboat)
 "hiQ" = (
 /obj/structure/pipes/standard/manifold/hidden/supply{
 	dir = 8
@@ -39526,19 +39516,6 @@
 	icon_state = "sterile_green"
 	},
 /area/almayer/medical/hydroponics)
-"hnI" = (
-/obj/structure/machinery/door/firedoor/border_only/almayer{
-	dir = 2
-	},
-/obj/structure/machinery/door/airlock/multi_tile/almayer/generic2{
-	access_modified = 1;
-	name = "\improper Flight Crew Quarters";
-	req_one_access_txt = "19;22"
-	},
-/turf/open/floor/almayer{
-	icon_state = "test_floor4"
-	},
-/area/almayer/living/pilotbunks)
 "hnV" = (
 /obj/structure/machinery/light,
 /turf/open/floor/almayer,
@@ -39729,18 +39706,6 @@
 	icon_state = "test_floor4"
 	},
 /area/almayer/engineering/upper_engineering/starboard)
-"htG" = (
-/obj/item/tool/soap,
-/obj/structure/machinery/light/small{
-	dir = 8
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "S"
-	},
-/turf/open/floor/almayer{
-	icon_state = "dark_sterile"
-	},
-/area/almayer/engineering/upper_engineering/port)
 "htI" = (
 /obj/structure/platform_decoration{
 	dir = 1
@@ -39772,6 +39737,18 @@
 	icon_state = "silver"
 	},
 /area/almayer/command/computerlab)
+"huR" = (
+/obj/structure/sign/prop1{
+	pixel_y = 32
+	},
+/obj/structure/filingcabinet/security{
+	pixel_x = -8
+	},
+/obj/structure/filingcabinet/medical{
+	pixel_x = 8
+	},
+/turf/open/floor/wood/ship,
+/area/almayer/living/commandbunks)
 "huU" = (
 /obj/structure/machinery/door/airlock/almayer/security{
 	access_modified = 1;
@@ -39982,13 +39959,6 @@
 "hyQ" = (
 /turf/closed/wall/almayer,
 /area/almayer/living/synthcloset)
-"hzb" = (
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 4;
-	icon_state = "exposed01-supply"
-	},
-/turf/open/floor/plating/plating_catwalk,
-/area/almayer/command/combat_correspondent)
 "hzc" = (
 /turf/closed/wall/almayer/outer,
 /area/almayer/engineering/upper_engineering/notunnel)
@@ -40156,12 +40126,6 @@
 /obj/structure/pipes/standard/manifold/hidden/supply,
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/hallways/hangar)
-"hBL" = (
-/obj/structure/closet/emcloset,
-/turf/open/floor/almayer{
-	icon_state = "cargo"
-	},
-/area/almayer/command/lifeboat)
 "hBU" = (
 /obj/structure/largecrate/random/secure,
 /obj/effect/decal/warning_stripes{
@@ -40171,6 +40135,25 @@
 	icon_state = "plate"
 	},
 /area/almayer/hull/lower_hull/l_a_p)
+"hBW" = (
+/obj/structure/surface/table/woodentable/fancy,
+/obj/item/device/flashlight/lamp/green{
+	pixel_y = 20;
+	pixel_x = -7
+	},
+/obj/item/ashtray/bronze{
+	pixel_y = 19;
+	pixel_x = 4
+	},
+/obj/structure/machinery/light{
+	dir = 8
+	},
+/obj/effect/landmark/map_item{
+	pixel_y = 3;
+	pixel_x = -1
+	},
+/turf/open/floor/wood/ship,
+/area/almayer/living/commandbunks)
 "hCo" = (
 /obj/structure/surface/table/almayer,
 /obj/structure/flora/pottedplant{
@@ -40309,14 +40292,14 @@
 /obj/structure/largecrate/random/barrel/red,
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/hull/upper_hull/u_f_p)
-"hGB" = (
-/obj/structure/machinery/light,
-/obj/structure/flora/pottedplant{
-	pixel_y = 3;
-	pixel_x = -1
+"hGa" = (
+/obj/effect/decal/warning_stripes{
+	icon_state = "N";
+	pixel_y = 2
 	},
-/turf/open/floor/wood/ship,
-/area/almayer/living/commandbunks)
+/obj/structure/closet/secure_closet/guncabinet/red/mp_armory_m39_submachinegun,
+/turf/open/floor/plating/almayer,
+/area/almayer/shipboard/brig/armory)
 "hGD" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "W"
@@ -40438,6 +40421,19 @@
 	icon_state = "plate"
 	},
 /area/almayer/hull/lower_hull/l_a_s)
+"hJh" = (
+/obj/structure/surface/table/almayer,
+/obj/structure/machinery/computer/emails{
+	pixel_x = 2;
+	pixel_y = 5
+	},
+/obj/structure/machinery/light/small{
+	dir = 1
+	},
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/command/combat_correspondent)
 "hJk" = (
 /obj/structure/stairs/perspective{
 	dir = 4;
@@ -40511,61 +40507,6 @@
 	icon_state = "cargo_arrow"
 	},
 /area/almayer/engineering/engineering_workshop/hangar)
-"hLB" = (
-/obj/structure/machinery/light/small{
-	dir = 1
-	},
-/obj/structure/closet/crate,
-/obj/item/ammo_magazine/rifle/l42a/ap{
-	current_rounds = 0
-	},
-/obj/item/ammo_magazine/rifle/l42a/ap{
-	current_rounds = 0
-	},
-/obj/item/ammo_magazine/rifle/l42a/ap{
-	current_rounds = 0
-	},
-/obj/item/ammo_magazine/rifle/l42a/ap{
-	current_rounds = 0
-	},
-/obj/item/ammo_magazine/rifle/l42a/ap{
-	current_rounds = 0
-	},
-/obj/item/ammo_magazine/rifle/l42a/ap{
-	current_rounds = 0
-	},
-/obj/item/ammo_magazine/rifle/l42a/ap{
-	current_rounds = 0
-	},
-/obj/item/ammo_magazine/rifle/l42a/ap{
-	current_rounds = 0
-	},
-/obj/item/ammo_magazine/rifle/l42a/ap{
-	current_rounds = 0
-	},
-/obj/item/ammo_magazine/rifle/l42a/ap{
-	current_rounds = 0
-	},
-/obj/item/ammo_magazine/rifle/l42a/ap{
-	current_rounds = 0
-	},
-/obj/item/ammo_magazine/rifle/l42a/ap{
-	current_rounds = 0
-	},
-/obj/item/ammo_magazine/rifle/l42a/ap{
-	current_rounds = 0
-	},
-/obj/item/ammo_magazine/rifle/l42a/ap{
-	current_rounds = 0
-	},
-/obj/item/ammo_magazine/rifle/l42a/ap{
-	current_rounds = 0
-	},
-/obj/item/ammo_magazine/rifle/l42a/ap{
-	current_rounds = 0
-	},
-/turf/open/floor/plating/plating_catwalk,
-/area/almayer/hull/upper_hull/u_m_s)
 "hLC" = (
 /obj/structure/surface/table/almayer,
 /turf/open/floor/almayer{
@@ -40752,6 +40693,13 @@
 	icon_state = "cargo_arrow"
 	},
 /area/almayer/squads/charlie_delta_shared)
+"hQh" = (
+/obj/structure/machinery/light,
+/obj/structure/closet/secure_closet/fridge/groceries/stock,
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/living/grunt_rnr)
 "hQU" = (
 /obj/structure/machinery/disposal,
 /obj/structure/disposalpipe/trunk{
@@ -41114,12 +41062,24 @@
 	icon_state = "blue"
 	},
 /area/almayer/command/cichallway)
+"hWS" = (
+/obj/structure/closet/secure_closet/fridge/organic/stock,
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/living/grunt_rnr)
 "hWU" = (
 /obj/structure/largecrate/random/barrel/blue,
 /turf/open/floor/almayer{
 	icon_state = "plate"
 	},
 /area/almayer/hull/upper_hull/u_a_s)
+"hWX" = (
+/obj/structure/closet/firecloset,
+/turf/open/floor/almayer{
+	icon_state = "cargo"
+	},
+/area/almayer/hull/upper_hull/u_f_p)
 "hXb" = (
 /turf/open/floor/almayer{
 	dir = 1;
@@ -41157,18 +41117,15 @@
 /obj/structure/disposalpipe/segment,
 /turf/open/floor/almayer,
 /area/almayer/shipboard/brig/cic_hallway)
-"hXG" = (
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 4
-	},
+"hXD" = (
 /obj/effect/decal/warning_stripes{
-	icon_state = "N";
-	pixel_y = 2
+	icon_state = "SW-out";
+	pixel_x = -1
 	},
 /turf/open/floor/almayer{
-	icon_state = "dark_sterile"
+	icon_state = "mono"
 	},
-/area/almayer/engineering/upper_engineering/port)
+/area/almayer/lifeboat_pumps/south1)
 "hXS" = (
 /obj/structure/sign/safety/water{
 	pixel_x = 8;
@@ -41259,12 +41216,6 @@
 	icon_state = "red"
 	},
 /area/almayer/shipboard/brig/main_office)
-"iaa" = (
-/obj/structure/closet/secure_closet/guncabinet/red/cic_armory_mk1_rifle_ap,
-/turf/open/floor/almayer{
-	icon_state = "redfull"
-	},
-/area/almayer/command/cic)
 "iag" = (
 /obj/structure/surface/table/almayer,
 /obj/item/tool/hand_labeler,
@@ -41315,6 +41266,12 @@
 	},
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/engineering/upper_engineering/port)
+"iaE" = (
+/obj/structure/bed/chair{
+	dir = 4
+	},
+/turf/open/floor/plating/plating_catwalk,
+/area/almayer/hull/upper_hull/u_m_s)
 "iaF" = (
 /obj/structure/pipes/standard/manifold/hidden/supply{
 	dir = 4
@@ -41502,6 +41459,15 @@
 	icon_state = "red"
 	},
 /area/almayer/lifeboat_pumps/north1)
+"ift" = (
+/obj/item/clothing/suit/storage/marine/light/vest,
+/obj/item/clothing/suit/storage/marine/light/vest,
+/obj/item/clothing/suit/storage/marine/light/vest,
+/obj/structure/surface/rack,
+/turf/open/floor/almayer{
+	icon_state = "redfull"
+	},
+/area/almayer/engineering/upper_engineering)
 "ifR" = (
 /obj/structure/sign/safety/hvac_old{
 	pixel_x = 8;
@@ -41517,6 +41483,12 @@
 	icon_state = "plate"
 	},
 /area/almayer/hull/upper_hull/u_a_s)
+"ign" = (
+/obj/structure/closet/secure_closet/fridge/fish/stock,
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/living/grunt_rnr)
 "igp" = (
 /obj/structure/surface/table/almayer,
 /obj/item/device/flashlight/lamp{
@@ -41604,6 +41576,19 @@
 	icon_state = "test_floor4"
 	},
 /area/almayer/hull/upper_hull/u_m_p)
+"iii" = (
+/obj/structure/sign/safety/ammunition{
+	pixel_x = 15;
+	pixel_y = -32
+	},
+/obj/structure/sign/safety/hazard{
+	pixel_y = -32
+	},
+/obj/structure/closet/secure_closet/guncabinet/red/armory_shotgun,
+/turf/open/floor/almayer{
+	icon_state = "redfull"
+	},
+/area/almayer/squads/req)
 "iit" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "W";
@@ -41808,13 +41793,14 @@
 /obj/structure/pipes/standard/simple/hidden/supply,
 /turf/open/floor/almayer,
 /area/almayer/living/offices/flight)
-"imJ" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "N";
-	pixel_y = 2
+"imW" = (
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 10
 	},
-/turf/open/floor/almayer,
-/area/almayer/hull/upper_hull/u_f_p)
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/command/combat_correspondent)
 "ina" = (
 /obj/structure/surface/table/almayer,
 /obj/structure/machinery/computer/emails{
@@ -42066,6 +42052,18 @@
 	icon_state = "sterile_green_side"
 	},
 /area/almayer/medical/medical_science)
+"isu" = (
+/obj/structure/machinery/light{
+	dir = 4
+	},
+/obj/item/bedsheet/hop{
+	pixel_y = 0
+	},
+/obj/structure/bed{
+	pixel_y = 0
+	},
+/turf/open/floor/wood/ship,
+/area/almayer/living/commandbunks)
 "isC" = (
 /obj/effect/projector{
 	name = "Almayer_AresDown";
@@ -42093,17 +42091,6 @@
 	icon_state = "red"
 	},
 /area/almayer/shipboard/brig/general_equipment)
-"isI" = (
-/obj/structure/sign/nosmoking_2{
-	pixel_x = 32
-	},
-/obj/structure/machinery/door/firedoor/border_only/almayer{
-	dir = 2
-	},
-/turf/open/floor/almayer{
-	icon_state = "test_floor4"
-	},
-/area/almayer/lifeboat_pumps/north1)
 "isN" = (
 /obj/structure/sink{
 	dir = 8;
@@ -42115,6 +42102,17 @@
 	icon_state = "sterile_green_side"
 	},
 /area/almayer/medical/morgue)
+"isS" = (
+/obj/item/stack/sheet/cardboard{
+	amount = 50
+	},
+/obj/structure/surface/rack,
+/obj/item/packageWrap,
+/turf/open/floor/almayer{
+	dir = 4;
+	icon_state = "green"
+	},
+/area/almayer/squads/req)
 "isW" = (
 /obj/structure/machinery/cm_vending/sorted/medical/wall_med{
 	pixel_y = 25
@@ -42204,6 +42202,16 @@
 	},
 /turf/open/floor/plating,
 /area/almayer/hull/lower_hull/l_f_p)
+"iuw" = (
+/obj/effect/decal/warning_stripes{
+	icon_state = "N";
+	pixel_y = 1
+	},
+/turf/open/floor/almayer{
+	dir = 9;
+	icon_state = "orange"
+	},
+/area/almayer/engineering/upper_engineering/port)
 "iuz" = (
 /obj/structure/surface/rack,
 /obj/effect/spawner/random/warhead,
@@ -42221,6 +42229,16 @@
 	icon_state = "silver"
 	},
 /area/almayer/shipboard/brig/cic_hallway)
+"iuT" = (
+/obj/structure/closet/emcloset,
+/obj/structure/machinery/camera/autoname/almayer{
+	dir = 4;
+	name = "ship-grade camera"
+	},
+/turf/open/floor/almayer{
+	icon_state = "cargo"
+	},
+/area/almayer/hull/upper_hull/u_f_s)
 "ivf" = (
 /obj/structure/surface/table/reinforced/almayer_B,
 /obj/item/device/camera,
@@ -42313,15 +42331,6 @@
 /obj/structure/bed/chair/comfy/beige,
 /turf/open/floor/carpet,
 /area/almayer/command/cichallway)
-"iwZ" = (
-/obj/structure/surface/table/almayer,
-/obj/item/storage/fancy/cigarettes/lucky_strikes,
-/obj/item/packageWrap,
-/turf/open/floor/almayer{
-	dir = 9;
-	icon_state = "green"
-	},
-/area/almayer/squads/req)
 "ixj" = (
 /obj/structure/surface/table/reinforced/prison,
 /obj/structure/machinery/computer/crew/alt,
@@ -42657,12 +42666,12 @@
 	icon_state = "test_floor4"
 	},
 /area/almayer/hull/upper_hull/u_a_p)
-"iEz" = (
-/obj/structure/machinery/light,
-/obj/structure/flora/pottedplant{
-	icon_state = "pottedplant_21";
-	pixel_y = 3
+"iET" = (
+/obj/structure/machinery/light{
+	dir = 1
 	},
+/obj/structure/machinery/disposal,
+/obj/structure/disposalpipe/trunk,
 /turf/open/floor/wood/ship,
 /area/almayer/living/commandbunks)
 "iFc" = (
@@ -42799,6 +42808,18 @@
 	icon_state = "kitchen"
 	},
 /area/almayer/living/grunt_rnr)
+"iIm" = (
+/obj/structure/machinery/door/airlock/almayer/generic{
+	name = "\improper Bathroom";
+	dir = 2
+	},
+/obj/structure/machinery/door/firedoor/border_only/almayer{
+	dir = 1
+	},
+/turf/open/floor/almayer{
+	icon_state = "test_floor4"
+	},
+/area/almayer/living/commandbunks)
 "iIP" = (
 /obj/structure/toilet{
 	pixel_y = 16
@@ -43009,13 +43030,6 @@
 	icon_state = "sterile_green_side"
 	},
 /area/almayer/medical/lower_medical_medbay)
-"iNY" = (
-/obj/structure/machinery/status_display{
-	pixel_x = 32;
-	pixel_y = 16
-	},
-/turf/open/floor/wood/ship,
-/area/almayer/living/commandbunks)
 "iNZ" = (
 /obj/structure/machinery/light{
 	dir = 8
@@ -43040,18 +43054,6 @@
 	},
 /turf/open/floor/almayer,
 /area/almayer/shipboard/brig/cells)
-"iPu" = (
-/obj/structure/machinery/light{
-	dir = 4
-	},
-/obj/item/bedsheet/hop{
-	pixel_y = 0
-	},
-/obj/structure/bed{
-	pixel_y = 0
-	},
-/turf/open/floor/wood/ship,
-/area/almayer/living/commandbunks)
 "iPv" = (
 /obj/structure/bed/chair/comfy,
 /obj/structure/window/reinforced/ultra,
@@ -43251,25 +43253,6 @@
 /obj/item/facepaint/black,
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/squads/alpha)
-"iTd" = (
-/obj/structure/machinery/sentry_holder/almayer,
-/turf/open/floor/almayer{
-	icon_state = "mono"
-	},
-/area/almayer/lifeboat_pumps/south2)
-"iTe" = (
-/obj/structure/machinery/light{
-	dir = 1
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "NE-out";
-	pixel_y = 1
-	},
-/turf/open/floor/almayer{
-	dir = 1;
-	icon_state = "red"
-	},
-/area/almayer/command/lifeboat)
 "iTf" = (
 /obj/structure/closet/crate/trashcart,
 /obj/item/clothing/gloves/yellow,
@@ -43366,6 +43349,14 @@
 	icon_state = "mono"
 	},
 /area/almayer/medical/hydroponics)
+"iUC" = (
+/obj/structure/machinery/faxmachine,
+/obj/structure/surface/table/almayer,
+/obj/structure/machinery/light/small,
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/command/combat_correspondent)
 "iUW" = (
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 4
@@ -43414,6 +43405,16 @@
 	icon_state = "plate"
 	},
 /area/almayer/hull/lower_hull/l_f_p)
+"iWb" = (
+/obj/structure/sign/safety/hazard{
+	pixel_x = 32;
+	pixel_y = -8
+	},
+/obj/structure/closet/secure_closet/guncabinet/red/armory_shotgun,
+/turf/open/floor/almayer{
+	icon_state = "redfull"
+	},
+/area/almayer/medical/upper_medical)
 "iWc" = (
 /obj/structure/surface/table/almayer,
 /obj/structure/pipes/standard/simple/hidden/supply{
@@ -43577,6 +43578,15 @@
 	icon_state = "plate"
 	},
 /area/almayer/living/gym)
+"iYR" = (
+/obj/structure/closet/secure_closet/bar{
+	name = "Success Cabinet";
+	req_access_txt = "1"
+	},
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/living/captain_mess)
 "iZg" = (
 /obj/structure/bed/chair/comfy{
 	dir = 8
@@ -43672,15 +43682,6 @@
 	icon_state = "plating"
 	},
 /area/almayer/command/airoom)
-"jaK" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "W";
-	pixel_x = -1
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/almayer/hallways/vehiclehangar)
 "jaP" = (
 /obj/structure/surface/table/almayer,
 /obj/structure/machinery/computer/cameras/almayer_network{
@@ -43798,6 +43799,19 @@
 	icon_state = "plating_striped"
 	},
 /area/almayer/engineering/upper_engineering/starboard)
+"jcZ" = (
+/obj/structure/machinery/light{
+	dir = 8
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "N";
+	pixel_y = 1
+	},
+/turf/open/floor/almayer{
+	dir = 9;
+	icon_state = "red"
+	},
+/area/almayer/command/lifeboat)
 "jdk" = (
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 6
@@ -44026,28 +44040,22 @@
 	icon_state = "test_floor4"
 	},
 /area/almayer/living/auxiliary_officer_office)
-"jgr" = (
-/obj/structure/surface/table/almayer,
-/obj/item/device/camera{
-	pixel_x = -8;
-	pixel_y = 12
-	},
-/obj/item/paper_bin/uscm{
-	pixel_x = 6;
-	pixel_y = 6
+"jgu" = (
+/obj/structure/sink{
+	dir = 4;
+	pixel_x = 11
 	},
-/obj/item/tool/pen{
-	pixel_x = 4;
-	pixel_y = -4
+/obj/structure/mirror{
+	pixel_x = 29
 	},
-/obj/item/storage/box/donkpockets{
-	pixel_x = -8;
-	pixel_y = -1
+/obj/effect/decal/warning_stripes{
+	icon_state = "N";
+	pixel_y = 1
 	},
 /turf/open/floor/almayer{
-	icon_state = "plate"
+	icon_state = "dark_sterile"
 	},
-/area/almayer/command/combat_correspondent)
+/area/almayer/living/captain_mess)
 "jgw" = (
 /obj/structure/sign/safety/nonpress_0g{
 	pixel_x = 32
@@ -44130,21 +44138,6 @@
 	icon_state = "plate"
 	},
 /area/almayer/hull/lower_hull/l_f_p)
-"jhB" = (
-/obj/structure/bookcase{
-	icon_state = "book-5";
-	name = "medical manuals bookcase";
-	opacity = 0
-	},
-/obj/item/book/manual/surgery,
-/obj/item/book/manual/research_and_development,
-/obj/item/book/manual/medical_diagnostics_manual,
-/obj/item/book/manual/medical_cloning,
-/obj/structure/machinery/light{
-	dir = 4
-	},
-/turf/open/floor/wood/ship,
-/area/almayer/living/commandbunks)
 "jhD" = (
 /obj/structure/machinery/firealarm{
 	pixel_y = -28
@@ -44314,6 +44307,11 @@
 	icon_state = "plate"
 	},
 /area/almayer/living/briefing)
+"jkL" = (
+/obj/structure/surface/table/almayer,
+/obj/item/tool/weldingtool,
+/turf/open/floor/plating/plating_catwalk,
+/area/almayer/hull/upper_hull/u_m_s)
 "jkS" = (
 /obj/structure/window/framed/almayer/hull/hijack_bustable,
 /obj/structure/machinery/door/poddoor/shutters/almayer/open{
@@ -44498,12 +44496,36 @@
 /obj/structure/machinery/door/firedoor/border_only/almayer,
 /turf/open/floor/plating,
 /area/almayer/command/cic)
+"jog" = (
+/obj/structure/surface/table/almayer,
+/obj/item/storage/photo_album{
+	pixel_x = -4;
+	pixel_y = 5
+	},
+/obj/item/folder/black{
+	pixel_x = 7;
+	pixel_y = -3
+	},
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/command/combat_correspondent)
 "jox" = (
 /obj/structure/machinery/brig_cell/cell_3{
 	pixel_x = -32
 	},
 /turf/open/floor/almayer,
 /area/almayer/shipboard/brig/processing)
+"joE" = (
+/obj/structure/pipes/standard/manifold/hidden/supply,
+/obj/structure/disposalpipe/junction{
+	dir = 4;
+	icon_state = "pipe-j2"
+	},
+/turf/open/floor/almayer{
+	icon_state = "silver"
+	},
+/area/almayer/command/cichallway)
 "joG" = (
 /obj/structure/machinery/washing_machine,
 /obj/structure/sign/poster{
@@ -44613,6 +44635,16 @@
 	icon_state = "sterile_green_side"
 	},
 /area/almayer/medical/medical_science)
+"jrV" = (
+/obj/structure/surface/table/almayer,
+/obj/item/weapon/gun/rifle/l42a{
+	pixel_y = 6
+	},
+/obj/item/weapon/gun/rifle/l42a,
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/hull/upper_hull/u_m_s)
 "jss" = (
 /obj/structure/bed/chair/comfy{
 	dir = 8
@@ -44662,6 +44694,12 @@
 	icon_state = "greencorner"
 	},
 /area/almayer/hallways/starboard_hallway)
+"juf" = (
+/obj/structure/machinery/sentry_holder/almayer,
+/turf/open/floor/almayer{
+	icon_state = "mono"
+	},
+/area/almayer/lifeboat_pumps/north1)
 "jup" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "NW-out";
@@ -44827,13 +44865,6 @@
 	icon_state = "red"
 	},
 /area/almayer/shipboard/brig/processing)
-"jxP" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "W";
-	pixel_x = -1
-	},
-/turf/open/floor/plating/plating_catwalk,
-/area/almayer/hallways/vehiclehangar)
 "jyi" = (
 /obj/structure/machinery/power/port_gen/pacman,
 /turf/open/floor/almayer{
@@ -44861,15 +44892,6 @@
 	icon_state = "test_floor4"
 	},
 /area/almayer/engineering/upper_engineering/notunnel)
-"jzE" = (
-/obj/structure/closet/secure_closet/bar{
-	name = "Success Cabinet";
-	req_access_txt = "1"
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/almayer/living/captain_mess)
 "jzZ" = (
 /obj/structure/platform_decoration,
 /turf/open/floor/almayer{
@@ -44964,6 +44986,36 @@
 	icon_state = "test_floor4"
 	},
 /area/almayer/command/lifeboat)
+"jBY" = (
+/obj/structure/surface/rack,
+/obj/item/ammo_magazine/rifle/l42a/ap{
+	current_rounds = 0;
+	pixel_x = -6;
+	pixel_y = 7
+	},
+/obj/item/ammo_magazine/rifle/l42a/ap{
+	current_rounds = 0;
+	pixel_x = -6;
+	pixel_y = -3
+	},
+/obj/item/ammo_magazine/rifle/l42a/ap{
+	current_rounds = 0;
+	pixel_x = 5;
+	pixel_y = 9
+	},
+/obj/item/ammo_magazine/rifle/l42a/ap{
+	current_rounds = 0;
+	pixel_x = 5;
+	pixel_y = -3
+	},
+/obj/structure/noticeboard{
+	desc = "The note is haphazardly attached to the cork board by what looks like a bent firing pin. 'The order has come in to perform end of life service checks on all L42A service rifles, any that are defective are to be dis-assembled and packed into a crate and sent to to the cargo hold. L42A service rifles that are in working order after servicing, are to be locked in secure cabinets ready to be off-loaded at Chinook. Scheduled end of life service for the L42A -  Complete'";
+	pixel_y = 29
+	},
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/hull/upper_hull/u_m_s)
 "jCa" = (
 /obj/structure/machinery/disposal,
 /obj/structure/disposalpipe/trunk,
@@ -44972,6 +45024,15 @@
 	icon_state = "red"
 	},
 /area/almayer/shipboard/brig/main_office)
+"jCn" = (
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/obj/structure/pipes/standard/manifold/hidden/supply{
+	dir = 1
+	},
+/turf/open/floor/carpet,
+/area/almayer/living/commandbunks)
 "jCK" = (
 /obj/effect/decal/medical_decals{
 	icon_state = "triagedecalbottomleft";
@@ -45017,6 +45078,18 @@
 	},
 /turf/open/floor/plating,
 /area/almayer/hull/lower_hull/l_f_p)
+"jEX" = (
+/obj/structure/surface/table/woodentable/fancy,
+/obj/item/folder/black{
+	pixel_y = 8
+	},
+/obj/item/folder/yellow,
+/obj/item/device/flashlight/lamp/green{
+	pixel_y = 8;
+	pixel_x = -16
+	},
+/turf/open/floor/carpet,
+/area/almayer/living/commandbunks)
 "jFe" = (
 /obj/structure/prop/holidays/string_lights{
 	pixel_y = 27
@@ -45074,12 +45147,6 @@
 	icon_state = "test_floor4"
 	},
 /area/almayer/hull/upper_hull/u_a_s)
-"jFY" = (
-/obj/structure/closet/firecloset,
-/turf/open/floor/almayer{
-	icon_state = "cargo"
-	},
-/area/almayer/engineering/upper_engineering/port)
 "jGn" = (
 /obj/structure/machinery/light{
 	dir = 1
@@ -45372,16 +45439,6 @@
 	},
 /turf/open/floor/almayer,
 /area/almayer/hull/upper_hull/u_f_s)
-"jMx" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "SW-out"
-	},
-/obj/structure/sign/safety/bathunisex{
-	pixel_x = 11;
-	pixel_y = -26
-	},
-/turf/open/floor/wood/ship,
-/area/almayer/living/commandbunks)
 "jMG" = (
 /obj/structure/largecrate/random/case/small,
 /obj/structure/largecrate/random/mini/wooden{
@@ -45465,12 +45522,13 @@
 	icon_state = "plate"
 	},
 /area/almayer/hull/lower_hull/l_f_s)
-"jND" = (
-/obj/structure/disposalpipe/segment,
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 10
+"jNY" = (
+/obj/structure/surface/table/woodentable/fancy,
+/obj/structure/flora/pottedplant{
+	icon_state = "pottedplant_18";
+	pixel_y = 12
 	},
-/turf/open/floor/wood/ship,
+/turf/open/floor/carpet,
 /area/almayer/living/commandbunks)
 "jOi" = (
 /obj/structure/pipes/standard/simple/hidden/supply{
@@ -45559,6 +45617,12 @@
 	},
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/hull/lower_hull/l_a_s)
+"jPn" = (
+/obj/structure/machinery/photocopier{
+	anchored = 0
+	},
+/turf/open/floor/wood/ship,
+/area/almayer/living/commandbunks)
 "jPq" = (
 /obj/structure/reagent_dispensers/watertank,
 /turf/open/floor/almayer{
@@ -45610,6 +45674,15 @@
 	icon_state = "plate"
 	},
 /area/almayer/hallways/hangar)
+"jRZ" = (
+/obj/structure/machinery/light{
+	dir = 8
+	},
+/obj/structure/closet/secure_closet/guncabinet/red/armory_m4a3_pistol,
+/turf/open/floor/almayer{
+	icon_state = "redfull"
+	},
+/area/almayer/engineering/upper_engineering)
 "jSo" = (
 /obj/item/tool/warning_cone,
 /turf/open/floor/almayer{
@@ -45871,6 +45944,29 @@
 	icon_state = "plate"
 	},
 /area/almayer/living/offices)
+"jWC" = (
+/obj/effect/decal/warning_stripes{
+	icon_state = "N";
+	pixel_y = 1
+	},
+/turf/open/floor/almayer{
+	dir = 1;
+	icon_state = "red"
+	},
+/area/almayer/command/lifeboat)
+"jWH" = (
+/obj/structure/machinery/power/apc/almayer/hardened{
+	cell_type = /obj/item/cell/hyper;
+	dir = 1
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "NE-out";
+	pixel_y = 1
+	},
+/turf/open/floor/almayer{
+	icon_state = "mono"
+	},
+/area/almayer/lifeboat_pumps/north1)
 "jWU" = (
 /obj/effect/step_trigger/clone_cleaner,
 /obj/structure/blocker/forcefield/multitile_vehicles,
@@ -45899,54 +45995,18 @@
 	icon_state = "plating"
 	},
 /area/almayer/hallways/vehiclehangar)
+"jXW" = (
+/obj/structure/closet/firecloset,
+/turf/open/floor/almayer{
+	icon_state = "cargo"
+	},
+/area/almayer/command/lifeboat)
 "jXY" = (
 /obj/structure/largecrate/random/case/double,
 /turf/open/floor/almayer{
 	icon_state = "plate"
 	},
 /area/almayer/hull/upper_hull/u_a_s)
-"jYc" = (
-/obj/item/bedsheet/blue{
-	layer = 3.2
-	},
-/obj/item/bedsheet/blue{
-	pixel_y = 13
-	},
-/obj/item/toy/plush/therapy/red{
-	desc = "A USCM approved plush doll. It's not soft and hardly comforting!";
-	force = 15;
-	layer = 4.1;
-	name = "Sergeant Huggs";
-	pixel_y = 15;
-	throwforce = 15
-	},
-/obj/item/clothing/head/cmcap{
-	layer = 4.1;
-	pixel_x = -1;
-	pixel_y = 22
-	},
-/obj/structure/window/reinforced{
-	dir = 4;
-	pixel_x = -2;
-	pixel_y = 4
-	},
-/obj/structure/window/reinforced{
-	dir = 8;
-	layer = 3.3;
-	pixel_y = 4
-	},
-/obj/structure/bed{
-	can_buckle = 0
-	},
-/obj/structure/bed{
-	buckling_y = 13;
-	layer = 3.5;
-	pixel_y = 13
-	},
-/turf/open/floor/almayer{
-	icon_state = "blue"
-	},
-/area/almayer/living/port_emb)
 "jYd" = (
 /obj/structure/machinery/gear{
 	id = "vehicle_elevator_gears"
@@ -46131,20 +46191,20 @@
 	icon_state = "bluefull"
 	},
 /area/almayer/squads/charlie_delta_shared)
+"kaJ" = (
+/obj/structure/bed/chair{
+	dir = 4
+	},
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/command/combat_correspondent)
 "kaN" = (
 /obj/structure/platform{
 	dir = 1
 	},
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/hull/upper_hull/u_a_p)
-"kaS" = (
-/obj/structure/bed/chair/office/dark{
-	dir = 8
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/almayer/command/combat_correspondent)
 "kbc" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "N";
@@ -46257,14 +46317,6 @@
 	icon_state = "plate"
 	},
 /area/almayer/hull/lower_hull/l_f_s)
-"kdv" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "S"
-	},
-/turf/open/floor/almayer{
-	icon_state = "orange"
-	},
-/area/almayer/engineering/upper_engineering/starboard)
 "kdB" = (
 /obj/structure/disposalpipe/segment,
 /obj/structure/pipes/standard/simple/hidden/supply,
@@ -46276,27 +46328,6 @@
 /obj/structure/pipes/standard/simple/hidden/supply,
 /turf/open/floor/almayer,
 /area/almayer/engineering/upper_engineering/starboard)
-"keT" = (
-/obj/structure/surface/table/woodentable/fancy,
-/obj/item/storage/fancy/cigar{
-	pixel_y = 2;
-	layer = 3.04;
-	pixel_x = -2
-	},
-/obj/item/reagent_container/food/drinks/bottle/sake{
-	pixel_x = -11;
-	pixel_y = 16
-	},
-/obj/item/reagent_container/food/drinks/bottle/sake{
-	pixel_y = 16;
-	pixel_x = -2
-	},
-/obj/item/reagent_container/food/drinks/bottle/sake{
-	pixel_x = 7;
-	pixel_y = 16
-	},
-/turf/open/floor/wood/ship,
-/area/almayer/living/commandbunks)
 "kff" = (
 /obj/structure/machinery/light,
 /turf/open/floor/almayer{
@@ -46336,17 +46367,6 @@
 	},
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/hallways/starboard_hallway)
-"kfR" = (
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 4
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "NW-out";
-	pixel_x = -1;
-	pixel_y = 2
-	},
-/turf/open/floor/plating/plating_catwalk,
-/area/almayer/hull/upper_hull/u_f_s)
 "kfU" = (
 /turf/open/floor/plating,
 /area/almayer/powered/agent)
@@ -46448,6 +46468,12 @@
 	icon_state = "plate"
 	},
 /area/almayer/hull/lower_hull/l_f_s)
+"khX" = (
+/obj/structure/closet/secure_closet/fridge/dry/stock,
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/living/grunt_rnr)
 "kif" = (
 /turf/open/floor/almayer{
 	icon_state = "plate"
@@ -46552,6 +46578,15 @@
 	icon_state = "plating"
 	},
 /area/almayer/engineering/engine_core)
+"klG" = (
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 4
+	},
+/turf/open/floor/carpet,
+/area/almayer/living/commandbunks)
 "klH" = (
 /obj/structure/pipes/standard/manifold/hidden/supply{
 	dir = 4
@@ -46569,12 +46604,6 @@
 	},
 /turf/open/floor/almayer,
 /area/almayer/shipboard/brig/cells)
-"kmk" = (
-/obj/structure/closet/firecloset,
-/turf/open/floor/almayer{
-	icon_state = "cargo"
-	},
-/area/almayer/hallways/vehiclehangar)
 "kmp" = (
 /obj/structure/machinery/disposal,
 /obj/structure/disposalpipe/trunk{
@@ -46627,6 +46656,12 @@
 	},
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/hull/lower_hull/l_f_s)
+"kmY" = (
+/obj/structure/pipes/vents/pump{
+	dir = 4
+	},
+/turf/open/floor/wood/ship,
+/area/almayer/living/commandbunks)
 "kng" = (
 /obj/structure/machinery/light/small{
 	dir = 8
@@ -46651,12 +46686,10 @@
 /obj/structure/machinery/light,
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/living/grunt_rnr)
-"knL" = (
-/obj/structure/closet/emcloset,
-/turf/open/floor/almayer{
-	icon_state = "cargo"
-	},
-/area/almayer/lifeboat_pumps/south2)
+"knT" = (
+/obj/structure/safe/cl_office,
+/turf/open/floor/wood/ship,
+/area/almayer/command/corporateliason)
 "koc" = (
 /obj/structure/machinery/status_display{
 	pixel_y = -30
@@ -46910,15 +46943,12 @@
 	icon_state = "cargo"
 	},
 /area/almayer/squads/bravo)
-"ksA" = (
-/obj/structure/closet/secure_closet/freezer/fridge/groceries,
-/obj/structure/machinery/light{
-	dir = 8
-	},
+"ksv" = (
+/obj/structure/closet/secure_closet/securecom,
 /turf/open/floor/almayer{
-	icon_state = "plate"
+	icon_state = "redfull"
 	},
-/area/almayer/living/grunt_rnr)
+/area/almayer/command/cic)
 "ksN" = (
 /turf/open/floor/almayer/uscm/directional{
 	dir = 6
@@ -46955,17 +46985,12 @@
 	icon_state = "red"
 	},
 /area/almayer/shipboard/brig/evidence_storage)
-"ktn" = (
+"ktc" = (
 /obj/effect/decal/warning_stripes{
-	icon_state = "N";
-	pixel_y = 2
-	},
-/obj/structure/closet/secure_closet/guncabinet/red/mp_armory_m4ra_rifle,
-/turf/open/floor/almayer{
-	dir = 5;
-	icon_state = "plating"
+	icon_state = "S"
 	},
-/area/almayer/shipboard/brig/armory)
+/turf/open/floor/wood/ship,
+/area/almayer/living/commandbunks)
 "ktB" = (
 /obj/structure/largecrate/random/barrel/white,
 /turf/open/floor/almayer{
@@ -47422,10 +47447,6 @@
 	icon_state = "red"
 	},
 /area/almayer/shipboard/brig/processing)
-"kDK" = (
-/obj/structure/pipes/vents/scrubber,
-/turf/open/floor/wood/ship,
-/area/almayer/living/commandbunks)
 "kDR" = (
 /obj/structure/disposalpipe/junction{
 	dir = 1;
@@ -47645,12 +47666,6 @@
 	icon_state = "plate"
 	},
 /area/almayer/squads/alpha)
-"kJm" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "S"
-	},
-/turf/open/floor/wood/ship,
-/area/almayer/living/commandbunks)
 "kJC" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4;
@@ -47692,19 +47707,6 @@
 	icon_state = "green"
 	},
 /area/almayer/hallways/port_hallway)
-"kJW" = (
-/obj/structure/machinery/door/window/westright,
-/obj/structure/machinery/shower{
-	dir = 8;
-	layer = 3.10;
-	plane = -4
-	},
-/obj/item/tool/soap{
-	pixel_x = 2;
-	pixel_y = 7
-	},
-/turf/open/floor/plating/plating_catwalk,
-/area/almayer/living/commandbunks)
 "kKb" = (
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 4
@@ -47873,18 +47875,6 @@
 	},
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/living/briefing)
-"kNq" = (
-/obj/structure/surface/table/woodentable/fancy,
-/obj/structure/machinery/faxmachine/uscm/command/capt{
-	name = "Commanding Officer's Fax Machine";
-	pixel_y = 3;
-	pixel_x = -4
-	},
-/obj/structure/machinery/light{
-	dir = 1
-	},
-/turf/open/floor/wood/ship,
-/area/almayer/living/commandbunks)
 "kNx" = (
 /obj/structure/sign/safety/ref_bio_storage{
 	pixel_x = -17;
@@ -48035,12 +48025,6 @@
 	icon_state = "orange"
 	},
 /area/almayer/engineering/upper_engineering/starboard)
-"kPH" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "S"
-	},
-/turf/open/floor/almayer,
-/area/almayer/lifeboat_pumps/south2)
 "kPJ" = (
 /obj/structure/machinery/cryopod/right{
 	pixel_y = 6
@@ -48109,12 +48093,6 @@
 	icon_state = "sterile_green_side"
 	},
 /area/almayer/medical/operating_room_three)
-"kRg" = (
-/obj/structure/closet/firecloset,
-/turf/open/floor/almayer{
-	icon_state = "cargo"
-	},
-/area/almayer/command/lifeboat)
 "kRu" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -48166,18 +48144,6 @@
 	icon_state = "tcomms"
 	},
 /area/almayer/command/airoom)
-"kSH" = (
-/obj/structure/sign/prop1{
-	pixel_y = 32
-	},
-/obj/structure/filingcabinet/security{
-	pixel_x = -8
-	},
-/obj/structure/filingcabinet/medical{
-	pixel_x = 8
-	},
-/turf/open/floor/wood/ship,
-/area/almayer/living/commandbunks)
 "kSJ" = (
 /obj/structure/disposalpipe/junction{
 	dir = 4;
@@ -48207,16 +48173,6 @@
 	icon_state = "plating"
 	},
 /area/almayer/squads/req)
-"kTc" = (
-/obj/structure/machinery/light/small{
-	dir = 8
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "S"
-	},
-/obj/structure/closet/secure_closet/guncabinet/red/mp_armory_shotgun,
-/turf/open/floor/plating/almayer,
-/area/almayer/shipboard/brig/armory)
 "kTq" = (
 /obj/structure/largecrate/supply/supplies/mre,
 /turf/open/floor/almayer{
@@ -48272,18 +48228,23 @@
 	},
 /turf/open/floor/almayer,
 /area/almayer/hallways/hangar)
-"kUh" = (
-/obj/structure/machinery/door/firedoor/border_only/almayer,
-/obj/structure/machinery/door/airlock/multi_tile/almayer/generic2{
-	access_modified = 1;
-	dir = 1;
-	name = "\improper Flight Crew Quarters";
-	req_one_access_txt = "19;22"
-	},
+"kUb" = (
+/obj/structure/closet/secure_closet,
+/obj/item/device/camera_film,
+/obj/item/device/camera_film,
+/obj/item/device/camera_film,
+/obj/item/storage/box/tapes,
+/obj/item/clothing/head/fedora,
+/obj/item/clothing/suit/storage/marine/light/reporter,
+/obj/item/clothing/head/helmet/marine/reporter,
+/obj/item/clothing/head/cmcap/reporter,
+/obj/item/device/flashlight,
+/obj/item/device/toner,
+/obj/item/device/toner,
 /turf/open/floor/almayer{
-	icon_state = "test_floor4"
+	icon_state = "plate"
 	},
-/area/almayer/living/pilotbunks)
+/area/almayer/command/combat_correspondent)
 "kUt" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4;
@@ -48328,27 +48289,6 @@
 	icon_state = "mono"
 	},
 /area/almayer/lifeboat_pumps/south2)
-"kVT" = (
-/obj/structure/surface/table/woodentable/fancy,
-/obj/item/tool/stamp/hop{
-	name = "Commanding Officer's rubber stamp";
-	pixel_x = -5;
-	pixel_y = 9
-	},
-/obj/item/paper_bin/uscm{
-	pixel_y = 6;
-	pixel_x = 7
-	},
-/obj/item/tool/pen/red/clicky{
-	pixel_x = -6;
-	pixel_y = 3
-	},
-/obj/item/tool/pen/blue/clicky{
-	pixel_x = -6;
-	pixel_y = -3
-	},
-/turf/open/floor/wood/ship,
-/area/almayer/living/commandbunks)
 "kVX" = (
 /obj/structure/window/framed/almayer,
 /obj/structure/machinery/door/poddoor/shutters/almayer{
@@ -48528,12 +48468,6 @@
 	icon_state = "orange"
 	},
 /area/almayer/hallways/port_umbilical)
-"kZH" = (
-/obj/structure/bed/chair{
-	dir = 4
-	},
-/turf/open/floor/plating/plating_catwalk,
-/area/almayer/hull/upper_hull/u_m_s)
 "kZN" = (
 /obj/structure/surface/table/almayer,
 /obj/structure/machinery/prop/almayer/computer/PC{
@@ -48584,6 +48518,15 @@
 	},
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/hull/upper_hull/u_m_p)
+"laG" = (
+/obj/structure/safe/co_office,
+/obj/item/weapon/pole/fancy_cane,
+/obj/item/tool/lighter/zippo/gold{
+	pixel_y = 3;
+	layer = 3.05
+	},
+/turf/open/floor/wood/ship,
+/area/almayer/living/commandbunks)
 "laO" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -48627,16 +48570,6 @@
 	},
 /turf/open/floor/plating,
 /area/almayer/command/cic)
-"laY" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/item/storage/toolbox/mechanical{
-	pixel_x = 4;
-	pixel_y = -3
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/almayer/hull/upper_hull/u_m_s)
 "lbb" = (
 /obj/structure/surface/table/almayer,
 /obj/item/organ/heart/prosthetic{
@@ -48846,6 +48779,14 @@
 	icon_state = "plating"
 	},
 /area/almayer/engineering/engine_core)
+"lfT" = (
+/obj/structure/surface/table/woodentable/fancy,
+/obj/structure/machinery/computer/card{
+	dir = 4;
+	pixel_x = 2
+	},
+/turf/open/floor/carpet,
+/area/almayer/living/commandbunks)
 "lfW" = (
 /obj/structure/sign/safety/high_voltage{
 	pixel_y = -32
@@ -49083,12 +49024,6 @@
 	icon_state = "red"
 	},
 /area/almayer/living/offices/flight)
-"lkm" = (
-/obj/structure/closet/emcloset,
-/turf/open/floor/almayer{
-	icon_state = "cargo"
-	},
-/area/almayer/engineering/upper_engineering/starboard)
 "lkM" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "S"
@@ -49113,6 +49048,22 @@
 	icon_state = "sterile_green_side"
 	},
 /area/almayer/medical/lower_medical_medbay)
+"llt" = (
+/obj/structure/machinery/conveyor{
+	id = "req_belt"
+	},
+/obj/structure/plasticflaps,
+/obj/structure/machinery/door/firedoor/border_only/almayer{
+	dir = 1
+	},
+/turf/open/floor/almayer,
+/area/almayer/squads/req)
+"llD" = (
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 5
+	},
+/turf/open/floor/plating/plating_catwalk,
+/area/almayer/command/combat_correspondent)
 "llM" = (
 /obj/structure/pipes/vents/scrubber,
 /turf/open/floor/almayer,
@@ -49209,6 +49160,11 @@
 	icon_state = "ai_floors"
 	},
 /area/almayer/command/airoom)
+"lnZ" = (
+/obj/structure/disposalpipe/segment,
+/obj/structure/pipes/standard/simple/hidden/supply,
+/turf/open/floor/wood/ship,
+/area/almayer/living/commandbunks)
 "lok" = (
 /obj/structure/machinery/cm_vending/clothing/marine/charlie{
 	density = 0;
@@ -49496,11 +49452,6 @@
 	icon_state = "plating_striped"
 	},
 /area/almayer/squads/req)
-"ltc" = (
-/obj/effect/landmark/late_join/working_joe,
-/obj/effect/landmark/start/working_joe,
-/turf/open/floor/plating/plating_catwalk,
-/area/almayer/command/airoom)
 "lto" = (
 /obj/structure/machinery/iv_drip,
 /turf/open/floor/almayer{
@@ -49527,14 +49478,6 @@
 	},
 /turf/open/floor/plating,
 /area/almayer/hull/upper_hull/u_m_p)
-"ltU" = (
-/obj/structure/bed/chair{
-	dir = 8
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/almayer/command/combat_correspondent)
 "ltX" = (
 /obj/structure/disposalpipe/segment,
 /obj/structure/pipes/standard/simple/hidden/supply,
@@ -49550,17 +49493,6 @@
 	icon_state = "plate"
 	},
 /area/almayer/hull/lower_hull/l_a_p)
-"lul" = (
-/obj/structure/machinery/door/firedoor/border_only/almayer,
-/obj/structure/machinery/door/airlock/almayer/command/reinforced{
-	name = "\improper Commanding Officer's Quarters";
-	req_access = null;
-	req_access_txt = "31"
-	},
-/turf/open/floor/almayer{
-	icon_state = "test_floor4"
-	},
-/area/almayer/living/commandbunks)
 "lut" = (
 /obj/structure/machinery/computer/crew,
 /turf/open/floor/almayer{
@@ -49853,6 +49785,61 @@
 	icon_state = "red"
 	},
 /area/almayer/hallways/aft_hallway)
+"lAj" = (
+/obj/structure/machinery/light/small{
+	dir = 1
+	},
+/obj/structure/closet/crate,
+/obj/item/ammo_magazine/rifle/l42a/ap{
+	current_rounds = 0
+	},
+/obj/item/ammo_magazine/rifle/l42a/ap{
+	current_rounds = 0
+	},
+/obj/item/ammo_magazine/rifle/l42a/ap{
+	current_rounds = 0
+	},
+/obj/item/ammo_magazine/rifle/l42a/ap{
+	current_rounds = 0
+	},
+/obj/item/ammo_magazine/rifle/l42a/ap{
+	current_rounds = 0
+	},
+/obj/item/ammo_magazine/rifle/l42a/ap{
+	current_rounds = 0
+	},
+/obj/item/ammo_magazine/rifle/l42a/ap{
+	current_rounds = 0
+	},
+/obj/item/ammo_magazine/rifle/l42a/ap{
+	current_rounds = 0
+	},
+/obj/item/ammo_magazine/rifle/l42a/ap{
+	current_rounds = 0
+	},
+/obj/item/ammo_magazine/rifle/l42a/ap{
+	current_rounds = 0
+	},
+/obj/item/ammo_magazine/rifle/l42a/ap{
+	current_rounds = 0
+	},
+/obj/item/ammo_magazine/rifle/l42a/ap{
+	current_rounds = 0
+	},
+/obj/item/ammo_magazine/rifle/l42a/ap{
+	current_rounds = 0
+	},
+/obj/item/ammo_magazine/rifle/l42a/ap{
+	current_rounds = 0
+	},
+/obj/item/ammo_magazine/rifle/l42a/ap{
+	current_rounds = 0
+	},
+/obj/item/ammo_magazine/rifle/l42a/ap{
+	current_rounds = 0
+	},
+/turf/open/floor/plating/plating_catwalk,
+/area/almayer/hull/upper_hull/u_m_s)
 "lAl" = (
 /turf/open/floor/almayer{
 	dir = 4;
@@ -49975,6 +49962,20 @@
 	icon_state = "plate"
 	},
 /area/almayer/engineering/engineering_workshop/hangar)
+"lCn" = (
+/obj/effect/decal/warning_stripes{
+	icon_state = "S"
+	},
+/obj/structure/sign/safety/ammunition{
+	pixel_x = 15;
+	pixel_y = 32
+	},
+/obj/structure/sign/safety/hazard{
+	pixel_y = 32
+	},
+/obj/structure/closet/secure_closet/guncabinet/red/mp_armory_shotgun,
+/turf/open/floor/plating/almayer,
+/area/almayer/shipboard/brig/armory)
 "lCt" = (
 /turf/open/floor/almayer{
 	dir = 10;
@@ -50027,22 +50028,13 @@
 	icon_state = "test_floor4"
 	},
 /area/almayer/hallways/starboard_hallway)
-"lDn" = (
+"lDj" = (
 /obj/effect/decal/warning_stripes{
-	icon_state = "NE-out";
-	pixel_y = 1
+	icon_state = "NW-out";
+	pixel_y = 2
 	},
 /turf/open/floor/almayer,
-/area/almayer/command/lifeboat)
-"lDD" = (
-/obj/structure/safe/co_office,
-/obj/item/weapon/pole/fancy_cane,
-/obj/item/tool/lighter/zippo/gold{
-	pixel_y = 3;
-	layer = 3.05
-	},
-/turf/open/floor/wood/ship,
-/area/almayer/living/commandbunks)
+/area/almayer/hull/upper_hull/u_f_p)
 "lDJ" = (
 /obj/structure/sign/safety/distribution_pipes{
 	pixel_x = -17
@@ -50052,6 +50044,20 @@
 	icon_state = "orange"
 	},
 /area/almayer/hallways/starboard_hallway)
+"lDK" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/largecrate/supply/weapons/m39{
+	pixel_x = 2
+	},
+/obj/structure/largecrate/supply/weapons/m41a{
+	layer = 3.1;
+	pixel_x = 6;
+	pixel_y = 17
+	},
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/hull/upper_hull/u_m_s)
 "lDL" = (
 /obj/structure/machinery/light{
 	dir = 4
@@ -50323,15 +50329,6 @@
 	},
 /turf/open/floor/almayer,
 /area/almayer/hull/upper_hull/u_f_s)
-"lIl" = (
-/obj/structure/machinery/door/airlock/almayer/secure/reinforced{
-	name = "\improper Armourer's Workshop";
-	req_access = null
-	},
-/turf/open/floor/almayer{
-	icon_state = "test_floor4"
-	},
-/area/almayer/hull/upper_hull/u_m_s)
 "lIp" = (
 /obj/structure/bed/chair/comfy/beige{
 	dir = 1
@@ -50424,19 +50421,6 @@
 	icon_state = "cargo"
 	},
 /area/almayer/living/offices)
-"lJL" = (
-/obj/structure/pipes/standard/simple/hidden/supply,
-/obj/effect/decal/warning_stripes{
-	icon_state = "W"
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "E";
-	pixel_x = 1
-	},
-/turf/open/floor/almayer{
-	icon_state = "dark_sterile"
-	},
-/area/almayer/shipboard/brig/cells)
 "lJO" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -50485,6 +50469,20 @@
 /obj/structure/surface/table/almayer,
 /turf/open/floor/almayer,
 /area/almayer/squads/charlie)
+"lLN" = (
+/obj/effect/decal/warning_stripes{
+	icon_state = "N";
+	pixel_y = 2
+	},
+/obj/structure/reagent_dispensers/peppertank{
+	pixel_y = -30
+	},
+/obj/structure/closet/secure_closet/guncabinet/red/mp_armory_m4ra_rifle,
+/turf/open/floor/almayer{
+	dir = 5;
+	icon_state = "plating"
+	},
+/area/almayer/shipboard/brig/armory)
 "lLS" = (
 /obj/structure/sign/safety/galley{
 	pixel_x = 32
@@ -50525,12 +50523,6 @@
 	icon_state = "plating_striped"
 	},
 /area/almayer/squads/req)
-"lMx" = (
-/obj/structure/closet/firecloset,
-/turf/open/floor/almayer{
-	icon_state = "cargo"
-	},
-/area/almayer/engineering/upper_engineering/starboard)
 "lMM" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "NW-out";
@@ -50680,6 +50672,15 @@
 	},
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/shipboard/brig/cic_hallway)
+"lPG" = (
+/obj/structure/machinery/camera/autoname/almayer{
+	name = "ship-grade camera"
+	},
+/turf/open/floor/almayer{
+	dir = 1;
+	icon_state = "silver"
+	},
+/area/almayer/command/cichallway)
 "lPO" = (
 /obj/structure/surface/rack,
 /turf/open/floor/almayer{
@@ -50687,14 +50688,6 @@
 	icon_state = "silver"
 	},
 /area/almayer/command/securestorage)
-"lQi" = (
-/obj/structure/machinery/cm_vending/clothing/commanding_officer{
-	pixel_y = 0
-	},
-/turf/open/floor/almayer{
-	icon_state = "cargo"
-	},
-/area/almayer/living/commandbunks)
 "lQj" = (
 /obj/structure/machinery/door_control{
 	id = "InnerShutter";
@@ -50836,16 +50829,20 @@
 /obj/structure/closet/firecloset,
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/hull/upper_hull/u_f_p)
-"lUA" = (
-/obj/structure/surface/table/almayer,
-/obj/item/weapon/gun/rifle/l42a{
-	pixel_y = 6
-	},
-/obj/item/weapon/gun/rifle/l42a,
+"lUv" = (
+/obj/structure/closet/secure_closet/guncabinet/red/armory_shotgun,
 /turf/open/floor/almayer{
-	icon_state = "plate"
+	icon_state = "redfull"
 	},
-/area/almayer/hull/upper_hull/u_m_s)
+/area/almayer/hull/lower_hull/l_f_s)
+"lUw" = (
+/obj/structure/machinery/light,
+/obj/structure/flora/pottedplant{
+	icon_state = "pottedplant_21";
+	pixel_y = 3
+	},
+/turf/open/floor/wood/ship,
+/area/almayer/living/commandbunks)
 "lVl" = (
 /obj/structure/machinery/cm_vending/sorted/tech/electronics_storage,
 /turf/open/floor/almayer,
@@ -50898,6 +50895,16 @@
 	icon_state = "red"
 	},
 /area/almayer/lifeboat_pumps/south1)
+"lWD" = (
+/obj/effect/decal/warning_stripes{
+	icon_state = "SW-out"
+	},
+/obj/structure/sign/safety/bathunisex{
+	pixel_x = 11;
+	pixel_y = -26
+	},
+/turf/open/floor/wood/ship,
+/area/almayer/living/commandbunks)
 "lXg" = (
 /obj/structure/surface/table/almayer,
 /obj/structure/machinery/recharger,
@@ -51093,6 +51100,25 @@
 	icon_state = "greencorner"
 	},
 /area/almayer/hallways/aft_hallway)
+"mcl" = (
+/obj/structure/sign/safety/ladder{
+	pixel_x = -16
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "N";
+	pixel_y = 2
+	},
+/turf/open/floor/almayer,
+/area/almayer/hallways/vehiclehangar)
+"mcK" = (
+/obj/structure/closet/secure_closet/commander,
+/obj/item/clothing/suit/storage/marine/light/vest,
+/obj/item/device/whistle,
+/obj/item/device/megaphone,
+/obj/item/device/radio,
+/obj/item/clothing/shoes/laceup,
+/turf/open/floor/wood/ship,
+/area/almayer/living/commandbunks)
 "mcL" = (
 /obj/structure/machinery/vending/snack,
 /obj/structure/sign/safety/maint{
@@ -51352,13 +51378,6 @@
 	},
 /turf/open/floor/almayer,
 /area/almayer/squads/charlie_delta_shared)
-"mje" = (
-/obj/structure/machinery/light,
-/obj/structure/closet/secure_closet/guncabinet/red/cic_armory_mk1_rifle_ap,
-/turf/open/floor/almayer{
-	icon_state = "redfull"
-	},
-/area/almayer/command/cic)
 "mji" = (
 /obj/structure/pipes/standard/manifold/fourway/hidden/supply,
 /turf/open/floor/plating/plating_catwalk,
@@ -51439,16 +51458,6 @@
 	allow_construction = 0
 	},
 /area/almayer/shipboard/brig/lobby)
-"mko" = (
-/obj/item/tool/weldpack{
-	pixel_y = 15
-	},
-/obj/structure/surface/table/almayer,
-/obj/item/clothing/head/welding,
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/almayer/hull/upper_hull/u_m_s)
 "mkx" = (
 /obj/structure/machinery/door_control{
 	id = "cl_shutters 2";
@@ -51673,12 +51682,6 @@
 /obj/structure/disposalpipe/segment,
 /turf/closed/wall/almayer,
 /area/almayer/squads/req)
-"mqb" = (
-/obj/structure/pipes/standard/manifold/hidden/supply{
-	dir = 8
-	},
-/turf/open/floor/wood/ship,
-/area/almayer/living/commandbunks)
 "mqg" = (
 /obj/structure/bed/chair{
 	dir = 4
@@ -51864,17 +51867,6 @@
 	icon_state = "orange"
 	},
 /area/almayer/squads/bravo)
-"mts" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/closet/secure_closet/guncabinet,
-/obj/item/weapon/gun/rifle/l42a,
-/obj/item/weapon/gun/rifle/l42a{
-	pixel_y = 6
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/almayer/hull/upper_hull/u_m_s)
 "mtD" = (
 /obj/structure/machinery/status_display{
 	pixel_x = 16;
@@ -51919,6 +51911,48 @@
 	},
 /turf/open/floor/almayer,
 /area/almayer/lifeboat_pumps/north1)
+"mus" = (
+/obj/item/bedsheet/blue{
+	layer = 3.2
+	},
+/obj/item/bedsheet/blue{
+	pixel_y = 13
+	},
+/obj/item/toy/plush/therapy/red{
+	desc = "A USCM approved plush doll. It's not soft and hardly comforting!";
+	force = 15;
+	layer = 4.1;
+	name = "Sergeant Huggs";
+	pixel_y = 15;
+	throwforce = 15
+	},
+/obj/item/clothing/head/cmcap{
+	layer = 4.1;
+	pixel_x = -1;
+	pixel_y = 22
+	},
+/obj/structure/window/reinforced{
+	dir = 4;
+	pixel_x = -2;
+	pixel_y = 4
+	},
+/obj/structure/window/reinforced{
+	dir = 8;
+	layer = 3.3;
+	pixel_y = 4
+	},
+/obj/structure/bed{
+	can_buckle = 0
+	},
+/obj/structure/bed{
+	buckling_y = 13;
+	layer = 3.5;
+	pixel_y = 13
+	},
+/turf/open/floor/almayer{
+	icon_state = "blue"
+	},
+/area/almayer/living/port_emb)
 "mux" = (
 /obj/structure/pipes/standard/simple/hidden/supply,
 /obj/structure/disposalpipe/segment,
@@ -51938,6 +51972,18 @@
 	icon_state = "plate"
 	},
 /area/almayer/squads/alpha)
+"muQ" = (
+/obj/structure/machinery/cm_vending/clothing/dress{
+	density = 0;
+	pixel_y = 16
+	},
+/obj/structure/machinery/light{
+	dir = 4
+	},
+/turf/open/floor/almayer{
+	icon_state = "cargo"
+	},
+/area/almayer/command/cic)
 "mvl" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -51951,6 +51997,15 @@
 	icon_state = "bluecorner"
 	},
 /area/almayer/squads/delta)
+"mvH" = (
+/obj/effect/decal/warning_stripes{
+	icon_state = "SE-out";
+	pixel_x = 1
+	},
+/turf/open/floor/almayer{
+	icon_state = "mono"
+	},
+/area/almayer/lifeboat_pumps/south2)
 "mvI" = (
 /obj/structure/machinery/camera/autoname/almayer{
 	dir = 4;
@@ -52025,19 +52080,6 @@
 	},
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/hull/lower_hull/l_f_p)
-"myl" = (
-/obj/structure/machinery/power/apc/almayer/hardened{
-	cell_type = /obj/item/cell/hyper;
-	dir = 1
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "NE-out";
-	pixel_y = 1
-	},
-/turf/open/floor/almayer{
-	icon_state = "mono"
-	},
-/area/almayer/lifeboat_pumps/north1)
 "myn" = (
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 4
@@ -52124,6 +52166,25 @@
 /obj/effect/decal/cleanable/blood/oil,
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/lifeboat_pumps/south2)
+"mzG" = (
+/obj/structure/bookcase{
+	icon_state = "book-5";
+	name = "law and engineering manuals bookcase";
+	opacity = 0
+	},
+/obj/item/book/manual/marine_law,
+/obj/item/book/manual/detective,
+/obj/item/book/manual/security_space_law,
+/obj/item/book/manual/engineering_guide,
+/obj/item/book/manual/engineering_construction,
+/obj/item/book/manual/orbital_cannon_manual,
+/obj/item/book/manual/ripley_build_and_repair,
+/obj/item/book/manual/engineering_hacking,
+/obj/structure/machinery/light{
+	dir = 8
+	},
+/turf/open/floor/wood/ship,
+/area/almayer/living/commandbunks)
 "mzO" = (
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 10
@@ -52151,13 +52212,6 @@
 /obj/effect/spawner/random/tool,
 /turf/open/floor/almayer,
 /area/almayer/lifeboat_pumps/south1)
-"mAr" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "S"
-	},
-/obj/structure/closet/secure_closet/guncabinet/blue/riot_control,
-/turf/open/floor/plating/almayer,
-/area/almayer/shipboard/brig/armory)
 "mAT" = (
 /obj/structure/machinery/door/poddoor/shutters/almayer{
 	dir = 8;
@@ -52302,23 +52356,6 @@
 	icon_state = "emerald"
 	},
 /area/almayer/living/briefing)
-"mDX" = (
-/obj/structure/pipes/standard/simple/hidden/supply,
-/obj/structure/machinery/door/firedoor/border_only/almayer{
-	dir = 2
-	},
-/obj/structure/disposalpipe/segment,
-/obj/structure/machinery/door/airlock/almayer/command/reinforced{
-	dir = 1;
-	id_tag = "CO-Office";
-	name = "\improper Commanding Officer's Office";
-	req_access = null;
-	req_access_txt = "31"
-	},
-/turf/open/floor/almayer{
-	icon_state = "test_floor4"
-	},
-/area/almayer/living/commandbunks)
 "mEb" = (
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 4
@@ -52346,6 +52383,10 @@
 	},
 /turf/open/floor/almayer,
 /area/almayer/living/briefing)
+"mES" = (
+/obj/structure/pipes/vents/scrubber,
+/turf/open/floor/wood/ship,
+/area/almayer/living/commandbunks)
 "mFq" = (
 /obj/structure/machinery/door_control{
 	dir = 1;
@@ -52499,6 +52540,12 @@
 	icon_state = "plate"
 	},
 /area/almayer/hallways/hangar)
+"mIA" = (
+/obj/structure/closet/firecloset,
+/turf/open/floor/almayer{
+	icon_state = "cargo"
+	},
+/area/almayer/lifeboat_pumps/south2)
 "mIB" = (
 /obj/structure/machinery/cm_vending/sorted/medical/marinemed,
 /obj/structure/sign/safety/medical{
@@ -52509,26 +52556,6 @@
 	icon_state = "plate"
 	},
 /area/almayer/hull/lower_hull/l_f_s)
-"mIJ" = (
-/obj/structure/sign/safety/ladder{
-	pixel_x = -16
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "N";
-	pixel_y = 2
-	},
-/turf/open/floor/almayer,
-/area/almayer/hallways/vehiclehangar)
-"mIP" = (
-/obj/structure/pipes/vents/pump,
-/obj/effect/decal/warning_stripes{
-	icon_state = "N";
-	pixel_y = 2
-	},
-/turf/open/floor/almayer{
-	icon_state = "dark_sterile"
-	},
-/area/almayer/engineering/upper_engineering/port)
 "mIW" = (
 /obj/structure/machinery/light,
 /turf/open/floor/almayer{
@@ -52658,15 +52685,6 @@
 	icon_state = "mono"
 	},
 /area/almayer/medical/hydroponics)
-"mKy" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "N";
-	pixel_y = 1
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/almayer/command/lifeboat)
 "mKJ" = (
 /obj/structure/machinery/firealarm{
 	pixel_y = 28
@@ -53021,33 +53039,6 @@
 	icon_state = "test_floor4"
 	},
 /area/almayer/command/airoom)
-"mRp" = (
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 4
-	},
-/obj/item/device/radio/intercom{
-	freerange = 1;
-	name = "General Listening Channel";
-	pixel_y = -28
-	},
-/turf/open/floor/almayer,
-/area/almayer/hull/upper_hull/u_f_s)
-"mRQ" = (
-/obj/structure/flora/pottedplant{
-	icon_state = "pottedplant_22"
-	},
-/obj/structure/machinery/camera/autoname/almayer{
-	name = "ship-grade camera"
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "NW-out";
-	pixel_y = 1
-	},
-/turf/open/floor/almayer{
-	dir = 1;
-	icon_state = "red"
-	},
-/area/almayer/command/lifeboat)
 "mRS" = (
 /obj/structure/pipes/standard/simple/hidden/supply,
 /obj/structure/machinery/door/firedoor/border_only/almayer{
@@ -53058,6 +53049,13 @@
 	icon_state = "test_floor4"
 	},
 /area/almayer/hallways/starboard_hallway)
+"mRU" = (
+/obj/effect/decal/warning_stripes{
+	icon_state = "N";
+	pixel_y = 2
+	},
+/turf/open/floor/almayer,
+/area/almayer/hull/upper_hull/u_f_p)
 "mRW" = (
 /turf/open/floor/almayer/research/containment/corner1,
 /area/almayer/medical/containment/cell/cl)
@@ -53123,14 +53121,6 @@
 	icon_state = "green"
 	},
 /area/almayer/hallways/aft_hallway)
-"mTc" = (
-/obj/structure/surface/table/woodentable/fancy,
-/obj/structure/machinery/computer/emails{
-	dir = 4;
-	pixel_y = 2
-	},
-/turf/open/floor/wood/ship,
-/area/almayer/living/commandbunks)
 "mTd" = (
 /obj/structure/machinery/smartfridge/chemistry{
 	pixel_x = -3;
@@ -53353,6 +53343,19 @@
 	dir = 1
 	},
 /area/almayer/medical/containment/cell)
+"mXa" = (
+/obj/structure/closet/secure_closet/guncabinet,
+/obj/item/weapon/gun/rifle/l42a{
+	pixel_y = 6
+	},
+/obj/item/weapon/gun/rifle/l42a,
+/obj/item/weapon/gun/rifle/l42a{
+	pixel_y = -6
+	},
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/hull/upper_hull/u_m_s)
 "mXj" = (
 /turf/closed/wall/almayer,
 /area/almayer/living/commandbunks)
@@ -53390,6 +53393,17 @@
 	icon_state = "blue"
 	},
 /area/almayer/hallways/port_hallway)
+"mYX" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/closet/secure_closet/guncabinet,
+/obj/item/weapon/gun/rifle/m41a{
+	pixel_y = 6
+	},
+/obj/item/weapon/gun/rifle/m41a,
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/hull/upper_hull/u_m_s)
 "mYY" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "SW-out"
@@ -53477,6 +53491,17 @@
 "naB" = (
 /turf/closed/wall/almayer/reinforced,
 /area/almayer/shipboard/brig/perma)
+"naQ" = (
+/obj/structure/machinery/light/small{
+	dir = 4
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "S"
+	},
+/turf/open/floor/almayer{
+	icon_state = "dark_sterile"
+	},
+/area/almayer/engineering/upper_engineering/port)
 "naR" = (
 /obj/structure/machinery/iv_drip,
 /obj/effect/decal/warning_stripes{
@@ -53504,12 +53529,15 @@
 	icon_state = "test_floor4"
 	},
 /area/almayer/living/gym)
-"nbB" = (
-/obj/structure/closet/secure_closet/freezer/fridge/full,
+"nbr" = (
+/obj/structure/machinery/light{
+	dir = 1
+	},
+/obj/structure/closet/secure_closet/guncabinet/red/cic_armory_shotgun,
 /turf/open/floor/almayer{
-	icon_state = "plate"
+	icon_state = "redfull"
 	},
-/area/almayer/living/grunt_rnr)
+/area/almayer/command/cic)
 "ncp" = (
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 9
@@ -53616,15 +53644,22 @@
 	},
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/hallways/hangar)
-"neG" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "S"
+"neF" = (
+/obj/structure/machinery/light{
+	dir = 1
+	},
+/obj/structure/transmitter{
+	name = "Kitchen Telephone";
+	phone_category = "Almayer";
+	phone_id = "Kitchen";
+	pixel_x = -8;
+	pixel_y = 29
 	},
+/obj/structure/machinery/vending/ingredients,
 /turf/open/floor/almayer{
-	dir = 6;
-	icon_state = "red"
+	icon_state = "plate"
 	},
-/area/almayer/command/lifeboat)
+/area/almayer/living/grunt_rnr)
 "neO" = (
 /obj/structure/machinery/power/apc/almayer{
 	dir = 1
@@ -54038,6 +54073,12 @@
 	icon_state = "silver"
 	},
 /area/almayer/command/securestorage)
+"nna" = (
+/obj/structure/closet/firecloset,
+/turf/open/floor/almayer{
+	icon_state = "cargo"
+	},
+/area/almayer/hull/upper_hull/u_f_s)
 "nnc" = (
 /obj/structure/largecrate/random/case/double,
 /turf/open/floor/almayer{
@@ -54103,12 +54144,16 @@
 /obj/structure/largecrate/random/barrel/white,
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/hull/upper_hull/u_f_s)
-"nnX" = (
-/obj/structure/machinery/sentry_holder/almayer,
-/turf/open/floor/almayer{
-	icon_state = "mono"
+"nnG" = (
+/obj/structure/disposalpipe/segment{
+	dir = 2;
+	icon_state = "pipe-c"
 	},
-/area/almayer/lifeboat_pumps/south1)
+/obj/structure/pipes/standard/manifold/hidden/supply{
+	dir = 1
+	},
+/turf/open/floor/carpet,
+/area/almayer/living/commandbunks)
 "noj" = (
 /obj/structure/largecrate,
 /obj/structure/prop/server_equipment/laptop{
@@ -54171,6 +54216,21 @@
 	icon_state = "dark_sterile"
 	},
 /area/almayer/medical/containment)
+"npB" = (
+/obj/effect/decal/warning_stripes{
+	icon_state = "W";
+	pixel_x = -1
+	},
+/turf/open/floor/almayer,
+/area/almayer/hull/upper_hull/u_f_s)
+"npK" = (
+/obj/structure/surface/table/woodentable/fancy,
+/obj/structure/machinery/computer/emails{
+	dir = 4;
+	pixel_y = 2
+	},
+/turf/open/floor/wood/ship,
+/area/almayer/living/commandbunks)
 "nqx" = (
 /obj/structure/pipes/standard/manifold/hidden/supply,
 /turf/open/floor/plating/plating_catwalk,
@@ -54283,22 +54343,6 @@
 	icon_state = "test_floor4"
 	},
 /area/almayer/hull/lower_hull/l_f_s)
-"nsQ" = (
-/obj/structure/sink{
-	dir = 4;
-	pixel_x = 11
-	},
-/obj/structure/mirror{
-	pixel_x = 29
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "N";
-	pixel_y = 1
-	},
-/turf/open/floor/almayer{
-	icon_state = "dark_sterile"
-	},
-/area/almayer/living/captain_mess)
 "nsY" = (
 /turf/closed/wall/almayer,
 /area/almayer/living/port_emb)
@@ -54421,6 +54465,17 @@
 	},
 /turf/open/floor/almayer,
 /area/almayer/squads/alpha)
+"nuI" = (
+/obj/structure/machinery/light{
+	dir = 1
+	},
+/obj/structure/surface/table/almayer,
+/obj/item/tool/hand_labeler,
+/turf/open/floor/almayer{
+	dir = 1;
+	icon_state = "sterile_green_side"
+	},
+/area/almayer/medical/chemistry)
 "nuK" = (
 /obj/structure/surface/table/almayer,
 /obj/item/reagent_container/food/condiment/hotsauce/franks{
@@ -54442,24 +54497,6 @@
 	icon_state = "plate"
 	},
 /area/almayer/hull/upper_hull/u_m_s)
-"nvG" = (
-/obj/structure/machinery/light{
-	dir = 8
-	},
-/obj/structure/sink{
-	pixel_y = 16
-	},
-/obj/structure/mirror{
-	pixel_y = 21
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "E";
-	pixel_x = 1
-	},
-/turf/open/floor/almayer{
-	icon_state = "dark_sterile"
-	},
-/area/almayer/living/numbertwobunks)
 "nvM" = (
 /obj/structure/window/framed/almayer/white,
 /obj/structure/machinery/door/firedoor/border_only/almayer{
@@ -54507,6 +54544,17 @@
 	icon_state = "plate"
 	},
 /area/almayer/hull/upper_hull/u_a_s)
+"nww" = (
+/obj/item/device/radio/intercom{
+	freerange = 1;
+	name = "General Listening Channel";
+	pixel_y = 28
+	},
+/obj/structure/machinery/cm_vending/clothing/staff_officer_armory,
+/turf/open/floor/almayer{
+	icon_state = "redfull"
+	},
+/area/almayer/command/cic)
 "nwx" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/almayer{
@@ -54670,6 +54718,18 @@
 	icon_state = "blue"
 	},
 /area/almayer/hallways/aft_hallway)
+"nzI" = (
+/obj/structure/machinery/light{
+	dir = 8
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "S"
+	},
+/turf/open/floor/almayer{
+	dir = 10;
+	icon_state = "red"
+	},
+/area/almayer/command/lifeboat)
 "nzO" = (
 /obj/effect/decal/cleanable/blood/oil,
 /obj/effect/decal/warning_stripes{
@@ -54771,46 +54831,6 @@
 	icon_state = "orange"
 	},
 /area/almayer/squads/bravo)
-"nCx" = (
-/obj/structure/surface/table/woodentable/fancy,
-/obj/item/reagent_container/food/drinks/bottle/whiskey{
-	pixel_x = -5;
-	pixel_y = 16
-	},
-/obj/item/reagent_container/food/drinks/bottle/whiskey{
-	desc = "A premium double-malt whiskey, this bottle was gifted to the Captain of the USS Almayer after the completion of the ship's space trials by the VADM. himself.";
-	pixel_x = 3;
-	pixel_y = 16
-	},
-/obj/item/reagent_container/food/drinks/bottle/whiskey{
-	pixel_x = 11;
-	pixel_y = 16
-	},
-/obj/item/storage/box/drinkingglasses{
-	pixel_x = -1;
-	pixel_y = 2
-	},
-/turf/open/floor/wood/ship,
-/area/almayer/living/commandbunks)
-"nCR" = (
-/obj/structure/sink{
-	dir = 4;
-	pixel_x = 11
-	},
-/obj/structure/mirror{
-	pixel_x = 29
-	},
-/obj/structure/machinery/light{
-	unacidable = 1;
-	unslashable = 1
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "W"
-	},
-/turf/open/floor/almayer{
-	icon_state = "dark_sterile"
-	},
-/area/almayer/living/auxiliary_officer_office)
 "nCT" = (
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 10
@@ -54819,33 +54839,6 @@
 	icon_state = "plate"
 	},
 /area/almayer/command/lifeboat)
-"nCU" = (
-/obj/structure/disposalpipe/segment{
-	dir = 1;
-	icon_state = "pipe-c"
-	},
-/obj/structure/coatrack{
-	pixel_y = 1;
-	pixel_x = -5
-	},
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 5
-	},
-/turf/open/floor/wood/ship,
-/area/almayer/living/commandbunks)
-"nDd" = (
-/obj/structure/sign/safety/ammunition{
-	pixel_x = 15;
-	pixel_y = 32
-	},
-/obj/structure/sign/safety/hazard{
-	pixel_y = 32
-	},
-/obj/structure/closet/secure_closet/guncabinet/red/armory_m39_submachinegun,
-/turf/open/floor/almayer{
-	icon_state = "redfull"
-	},
-/area/almayer/hull/lower_hull/l_f_s)
 "nDh" = (
 /obj/structure/transmitter/rotary{
 	name = "CL Office Telephone";
@@ -54885,6 +54878,11 @@
 /obj/structure/disposalpipe/segment,
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/squads/req)
+"nDV" = (
+/obj/structure/disposalpipe/segment,
+/obj/structure/pipes/standard/simple/hidden/supply,
+/turf/open/floor/almayer,
+/area/almayer/command/cichallway)
 "nEo" = (
 /obj/structure/surface/table/almayer,
 /obj/item/storage/donut_box{
@@ -55051,12 +55049,6 @@
 	icon_state = "plate"
 	},
 /area/almayer/shipboard/port_point_defense)
-"nGY" = (
-/obj/structure/closet/emcloset,
-/turf/open/floor/almayer{
-	icon_state = "cargo"
-	},
-/area/almayer/lifeboat_pumps/north2)
 "nHg" = (
 /obj/structure/machinery/disposal,
 /obj/structure/disposalpipe/trunk{
@@ -55202,6 +55194,15 @@
 	icon_state = "red"
 	},
 /area/almayer/command/lifeboat)
+"nKs" = (
+/obj/structure/machinery/cm_vending/clothing/dress{
+	req_access = list(1);
+	pixel_y = 0
+	},
+/turf/open/floor/almayer{
+	icon_state = "cargo"
+	},
+/area/almayer/living/commandbunks)
 "nLa" = (
 /obj/structure/bed/chair{
 	dir = 4
@@ -55324,6 +55325,16 @@
 	icon_state = "plate"
 	},
 /area/almayer/hull/lower_hull/l_m_s)
+"nMM" = (
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 4
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "NE-out";
+	pixel_y = 2
+	},
+/turf/open/floor/plating/plating_catwalk,
+/area/almayer/hull/upper_hull/u_f_s)
 "nMV" = (
 /obj/structure/machinery/cm_vending/sorted/medical/wall_med{
 	pixel_y = 25
@@ -55501,18 +55512,6 @@
 	icon_state = "plate"
 	},
 /area/almayer/squads/req)
-"nPY" = (
-/obj/structure/machinery/light{
-	dir = 8
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "S"
-	},
-/turf/open/floor/almayer{
-	dir = 10;
-	icon_state = "red"
-	},
-/area/almayer/command/lifeboat)
 "nQg" = (
 /obj/structure/sink{
 	pixel_y = 24
@@ -55532,6 +55531,13 @@
 /obj/structure/machinery/light,
 /turf/open/floor/almayer,
 /area/almayer/hallways/aft_hallway)
+"nQH" = (
+/obj/structure/disposalpipe/segment,
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 10
+	},
+/turf/open/floor/wood/ship,
+/area/almayer/living/commandbunks)
 "nRq" = (
 /obj/effect/decal/cleanable/blood/oil/streak,
 /obj/structure/pipes/standard/simple/hidden/supply{
@@ -55547,6 +55553,17 @@
 	icon_state = "silver"
 	},
 /area/almayer/shipboard/brig/cic_hallway)
+"nRQ" = (
+/obj/structure/machinery/door/firedoor/border_only/almayer,
+/obj/structure/machinery/door/airlock/almayer/command/reinforced{
+	name = "\improper Commanding Officer's Quarters";
+	req_access = null;
+	req_access_txt = "31"
+	},
+/turf/open/floor/almayer{
+	icon_state = "test_floor4"
+	},
+/area/almayer/living/commandbunks)
 "nRR" = (
 /turf/open/floor/almayer{
 	dir = 1;
@@ -55557,6 +55574,13 @@
 /obj/structure/pipes/standard/simple/hidden/supply,
 /turf/open/floor/almayer,
 /area/almayer/engineering/upper_engineering)
+"nSj" = (
+/obj/structure/machinery/cm_vending/sorted/cargo_guns/cargo/blend,
+/turf/open/floor/almayer{
+	dir = 10;
+	icon_state = "green"
+	},
+/area/almayer/squads/req)
 "nSG" = (
 /obj/structure/machinery/door_control{
 	id = "tcomms";
@@ -55613,10 +55637,6 @@
 	},
 /turf/open/floor/almayer,
 /area/almayer/command/computerlab)
-"nTA" = (
-/obj/structure/bed/chair/comfy/blue,
-/turf/open/floor/carpet,
-/area/almayer/living/commandbunks)
 "nTH" = (
 /obj/structure/sign/safety/storage{
 	pixel_x = 8;
@@ -56041,6 +56061,23 @@
 	icon_state = "cargo_arrow"
 	},
 /area/almayer/squads/bravo)
+"odC" = (
+/obj/structure/machinery/light/small{
+	dir = 8
+	},
+/obj/item/prop/magazine/boots/n160{
+	pixel_y = -8;
+	pixel_x = 4;
+	layer = 2.8
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "E";
+	pixel_x = 1
+	},
+/turf/open/floor/almayer{
+	icon_state = "dark_sterile"
+	},
+/area/almayer/living/commandbunks)
 "odD" = (
 /obj/structure/machinery/camera/autoname/almayer{
 	dir = 8;
@@ -56160,6 +56197,16 @@
 	icon_state = "cargo"
 	},
 /area/almayer/squads/charlie)
+"ohl" = (
+/obj/structure/window/framed/almayer,
+/obj/structure/machinery/door/firedoor/border_only/almayer{
+	dir = 1
+	},
+/turf/open/floor/almayer{
+	dir = 9;
+	icon_state = "green"
+	},
+/area/almayer/squads/req)
 "ohA" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "W"
@@ -56207,18 +56254,6 @@
 	},
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/lifeboat_pumps/north2)
-"ohS" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "NE-out";
-	pixel_y = 1
-	},
-/obj/structure/machinery/door/airlock/almayer/generic{
-	name = "\improper Bathroom"
-	},
-/turf/open/floor/almayer{
-	icon_state = "test_floor4"
-	},
-/area/almayer/living/captain_mess)
 "oih" = (
 /obj/structure/bed{
 	icon_state = "abed"
@@ -56409,6 +56444,21 @@
 	icon_state = "test_floor4"
 	},
 /area/almayer/shipboard/brig/execution)
+"olk" = (
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 4
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "NE-out";
+	pixel_y = 2
+	},
+/obj/structure/machinery/door/airlock/almayer/generic{
+	name = "\improper Bathroom"
+	},
+/turf/open/floor/almayer{
+	icon_state = "test_floor4"
+	},
+/area/almayer/engineering/upper_engineering/port)
 "olv" = (
 /obj/structure/surface/table/almayer,
 /obj/item/tool/hand_labeler{
@@ -56478,13 +56528,6 @@
 /obj/structure/pipes/standard/simple/hidden/supply,
 /turf/open/floor/wood/ship,
 /area/almayer/shipboard/brig/cells)
-"omu" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "S"
-	},
-/obj/structure/closet/secure_closet/guncabinet/red/mp_armory_shotgun,
-/turf/open/floor/plating/almayer,
-/area/almayer/shipboard/brig/armory)
 "omy" = (
 /obj/structure/disposalpipe/segment{
 	dir = 1;
@@ -56558,17 +56601,6 @@
 	},
 /turf/open/floor/almayer,
 /area/almayer/hallways/hangar)
-"ooo" = (
-/obj/structure/reagent_dispensers/water_cooler/stacks{
-	density = 0;
-	pixel_y = 17
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "W";
-	pixel_x = -1
-	},
-/turf/open/floor/almayer,
-/area/almayer/hull/upper_hull/u_f_s)
 "oos" = (
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/living/grunt_rnr)
@@ -56606,6 +56638,16 @@
 	icon_state = "test_floor4"
 	},
 /area/almayer/shipboard/brig/perma)
+"opj" = (
+/obj/structure/surface/table/almayer,
+/obj/effect/spawner/random/powercell,
+/obj/effect/spawner/random/tool,
+/obj/item/packageWrap,
+/turf/open/floor/almayer{
+	dir = 8;
+	icon_state = "green"
+	},
+/area/almayer/squads/req)
 "opC" = (
 /obj/structure/machinery/door/airlock/almayer/command/reinforced{
 	name = "\improper Combat Information Center"
@@ -56617,23 +56659,6 @@
 "opD" = (
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/living/gym)
-"opI" = (
-/obj/structure/closet/secure_closet,
-/obj/item/device/camera_film,
-/obj/item/device/camera_film,
-/obj/item/device/camera_film,
-/obj/item/storage/box/tapes,
-/obj/item/clothing/head/fedora,
-/obj/item/clothing/suit/storage/marine/light/reporter,
-/obj/item/clothing/head/helmet/marine/reporter,
-/obj/item/clothing/head/cmcap/reporter,
-/obj/item/device/flashlight,
-/obj/item/device/toner,
-/obj/item/device/toner,
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/almayer/command/combat_correspondent)
 "opJ" = (
 /obj/docking_port/stationary/emergency_response/external/port4,
 /turf/open/space/basic,
@@ -56710,16 +56735,6 @@
 	},
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/living/port_emb)
-"oqY" = (
-/obj/structure/machinery/conveyor{
-	id = "req_belt"
-	},
-/obj/structure/plasticflaps,
-/obj/structure/machinery/door/firedoor/border_only/almayer{
-	dir = 1
-	},
-/turf/open/floor/almayer,
-/area/almayer/squads/req)
 "oqZ" = (
 /obj/structure/surface/table/almayer,
 /obj/structure/machinery/microwave{
@@ -56870,6 +56885,18 @@
 "otu" = (
 /turf/closed/wall/almayer/research/containment/wall/connect_w,
 /area/almayer/medical/containment/cell)
+"otK" = (
+/obj/structure/machinery/door/firedoor/border_only/almayer,
+/obj/structure/machinery/door/airlock/multi_tile/almayer/generic2{
+	access_modified = 1;
+	dir = 1;
+	name = "\improper Flight Crew Quarters";
+	req_one_access_txt = "19;22"
+	},
+/turf/open/floor/almayer{
+	icon_state = "test_floor4"
+	},
+/area/almayer/living/pilotbunks)
 "otX" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "W"
@@ -56928,6 +56955,23 @@
 	icon_state = "red"
 	},
 /area/almayer/lifeboat_pumps/south1)
+"ouT" = (
+/obj/item/trash/plate{
+	pixel_x = 9;
+	pixel_y = 11
+	},
+/obj/item/reagent_container/food/snacks/carpmeat{
+	layer = 3.3;
+	pixel_y = 11;
+	pixel_x = 8
+	},
+/obj/item/reagent_container/food/snacks/carpmeat{
+	layer = 3.3;
+	pixel_y = 11;
+	pixel_x = 8
+	},
+/turf/open/floor/carpet,
+/area/almayer/living/commandbunks)
 "ouV" = (
 /obj/structure/sign/safety/cryo{
 	pixel_x = 1;
@@ -57069,6 +57113,23 @@
 	icon_state = "orangecorner"
 	},
 /area/almayer/hull/upper_hull/u_a_s)
+"oys" = (
+/obj/structure/pipes/standard/simple/hidden/supply,
+/obj/structure/machinery/door/firedoor/border_only/almayer{
+	dir = 2
+	},
+/obj/structure/disposalpipe/segment,
+/obj/structure/machinery/door/airlock/almayer/command/reinforced{
+	dir = 1;
+	id_tag = "CO-Office";
+	name = "\improper Commanding Officer's Office";
+	req_access = null;
+	req_access_txt = "31"
+	},
+/turf/open/floor/almayer{
+	icon_state = "test_floor4"
+	},
+/area/almayer/living/commandbunks)
 "oyw" = (
 /obj/structure/platform_decoration{
 	dir = 8
@@ -57223,6 +57284,24 @@
 	icon_state = "silver"
 	},
 /area/almayer/command/cichallway)
+"oBW" = (
+/obj/structure/surface/table/woodentable/fancy,
+/obj/item/storage/bible{
+	desc = "As the legendary US Army chaplain once said, 'There are no Athiests in fancy offices'.";
+	name = "Holy Bible";
+	pixel_x = -3;
+	pixel_y = 9
+	},
+/obj/item/prop/helmetgarb/rosary{
+	pixel_y = 5;
+	pixel_x = -4
+	},
+/obj/item/device/flashlight/lamp{
+	pixel_y = 1;
+	pixel_x = 3
+	},
+/turf/open/floor/wood/ship,
+/area/almayer/living/commandbunks)
 "oCf" = (
 /obj/structure/machinery/light{
 	unacidable = 1;
@@ -57315,6 +57394,12 @@
 	icon_state = "mono"
 	},
 /area/almayer/medical/medical_science)
+"oDO" = (
+/obj/structure/machinery/sentry_holder/almayer,
+/turf/open/floor/almayer{
+	icon_state = "mono"
+	},
+/area/almayer/lifeboat_pumps/south2)
 "oDR" = (
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 9
@@ -57536,15 +57621,18 @@
 	icon_state = "test_floor4"
 	},
 /area/almayer/medical/medical_science)
-"oIt" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "S"
-	},
-/turf/open/floor/almayer,
-/area/almayer/command/lifeboat)
 "oIB" = (
 /turf/closed/wall/almayer,
 /area/almayer/command/combat_correspondent)
+"oIY" = (
+/obj/structure/machinery/cryopod/right{
+	layer = 3.1;
+	pixel_y = 13
+	},
+/turf/open/floor/almayer{
+	icon_state = "cargo"
+	},
+/area/almayer/command/airoom)
 "oJp" = (
 /obj/structure/pipes/standard/manifold/hidden/supply{
 	dir = 1
@@ -57683,12 +57771,6 @@
 	icon_state = "sterile_green_side"
 	},
 /area/almayer/medical/hydroponics)
-"oMd" = (
-/obj/structure/closet/secure_closet/freezer/meat,
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/almayer/living/grunt_rnr)
 "oMe" = (
 /obj/structure/machinery/light{
 	dir = 8
@@ -57739,14 +57821,6 @@
 	icon_state = "mono"
 	},
 /area/almayer/engineering/ce_room)
-"oNf" = (
-/obj/item/stack/folding_barricade/three,
-/obj/item/stack/folding_barricade/three,
-/obj/structure/surface/rack,
-/turf/open/floor/almayer{
-	icon_state = "redfull"
-	},
-/area/almayer/hull/lower_hull/l_f_s)
 "oNj" = (
 /obj/structure/sign/prop1{
 	pixel_x = -32;
@@ -58060,40 +58134,6 @@
 	icon_state = "cargo"
 	},
 /area/almayer/squads/alpha)
-"oTM" = (
-/obj/structure/surface/table/woodentable/fancy,
-/obj/structure/machinery/light{
-	dir = 8
-	},
-/obj/item/clothing/mask/cigarette/pipe{
-	pixel_y = -7;
-	layer = 2.8
-	},
-/obj/item/reagent_container/spray/cleaner{
-	pixel_x = -4;
-	pixel_y = 7;
-	layer = 3.04
-	},
-/obj/structure/machinery/door_control/brbutton{
-	pixel_y = 26;
-	pixel_x = -12;
-	id = "Brig Lockdown Shutters";
-	name = "Brig Lockdown"
-	},
-/obj/structure/machinery/door_control/brbutton{
-	pixel_y = 26;
-	id = "ARES StairsLock";
-	name = "ARES Exterior Lockdown Override";
-	pixel_x = -2
-	},
-/obj/structure/machinery/door_control/brbutton{
-	pixel_y = 26;
-	pixel_x = 8;
-	name = "ARES Emergency Lockdown Override";
-	id = "ARES Emergency"
-	},
-/turf/open/floor/wood/ship,
-/area/almayer/living/commandbunks)
 "oUG" = (
 /obj/structure/machinery/light{
 	dir = 8
@@ -58300,6 +58340,15 @@
 	icon_state = "red"
 	},
 /area/almayer/shipboard/brig/main_office)
+"pbl" = (
+/obj/structure/bed,
+/obj/item/toy/plush/farwa{
+	pixel_x = 5
+	},
+/obj/item/clothing/under/redpyjamas,
+/obj/item/bedsheet/orange,
+/turf/open/floor/wood/ship,
+/area/almayer/command/corporateliason)
 "pbp" = (
 /obj/structure/disposalpipe/segment,
 /turf/open/floor/almayer{
@@ -58433,12 +58482,6 @@
 	icon_state = "test_floor4"
 	},
 /area/almayer/hull/lower_hull/l_f_p)
-"pdt" = (
-/obj/structure/closet/secure_closet/freezer/fridge/groceries,
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/almayer/living/grunt_rnr)
 "pdG" = (
 /obj/structure/machinery/door/airlock/almayer/security{
 	dir = 2;
@@ -58516,6 +58559,18 @@
 	allow_construction = 0
 	},
 /area/almayer/stair_clone)
+"pfA" = (
+/obj/item/tool/soap,
+/obj/structure/machinery/light/small{
+	dir = 8
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "S"
+	},
+/turf/open/floor/almayer{
+	icon_state = "dark_sterile"
+	},
+/area/almayer/engineering/upper_engineering/port)
 "pfH" = (
 /obj/structure/platform_decoration,
 /turf/open/floor/almayer{
@@ -58544,15 +58599,6 @@
 	icon_state = "orange"
 	},
 /area/almayer/hull/lower_hull/l_m_s)
-"pgw" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "N";
-	pixel_y = 2
-	},
-/turf/open/floor/almayer{
-	icon_state = "dark_sterile"
-	},
-/area/almayer/engineering/upper_engineering/port)
 "pgD" = (
 /turf/closed/wall/almayer,
 /area/almayer/lifeboat_pumps/south1)
@@ -58588,15 +58634,6 @@
 	icon_state = "plate"
 	},
 /area/almayer/living/briefing)
-"phj" = (
-/obj/structure/machinery/photocopier,
-/obj/structure/machinery/light/small{
-	dir = 1
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/almayer/command/combat_correspondent)
 "piO" = (
 /obj/structure/surface/rack,
 /obj/item/tool/weldingtool,
@@ -58672,16 +58709,6 @@
 	},
 /turf/open/floor/almayer,
 /area/almayer/engineering/engineering_workshop/hangar)
-"pjR" = (
-/obj/structure/disposalpipe/segment{
-	dir = 4;
-	icon_state = "pipe-c"
-	},
-/obj/structure/machinery/light{
-	dir = 8
-	},
-/turf/open/floor/wood/ship,
-/area/almayer/living/commandbunks)
 "pky" = (
 /obj/structure/largecrate/random/secure,
 /turf/open/floor/almayer{
@@ -58768,16 +58795,6 @@
 	icon_state = "plate"
 	},
 /area/almayer/living/briefing)
-"pmI" = (
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 4
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "NE-out";
-	pixel_y = 2
-	},
-/turf/open/floor/plating/plating_catwalk,
-/area/almayer/hull/upper_hull/u_f_s)
 "pmV" = (
 /obj/structure/prop/server_equipment/yutani_server/broken{
 	density = 0;
@@ -58802,23 +58819,6 @@
 	icon_state = "sterile_green_side"
 	},
 /area/almayer/medical/lower_medical_medbay)
-"pnL" = (
-/obj/structure/machinery/constructable_frame{
-	icon_state = "box_2"
-	},
-/obj/item/weapon/baseballbat/metal{
-	pixel_x = -2;
-	pixel_y = 8
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "SW-out";
-	pixel_x = -1
-	},
-/turf/open/floor/almayer{
-	dir = 6;
-	icon_state = "orange"
-	},
-/area/almayer/engineering/upper_engineering/starboard)
 "pop" = (
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 1
@@ -59204,6 +59204,20 @@
 	icon_state = "mono"
 	},
 /area/almayer/lifeboat_pumps/south2)
+"pxL" = (
+/obj/structure/disposalpipe/segment{
+	dir = 1;
+	icon_state = "pipe-c"
+	},
+/obj/structure/coatrack{
+	pixel_y = 1;
+	pixel_x = -5
+	},
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 5
+	},
+/turf/open/floor/wood/ship,
+/area/almayer/living/commandbunks)
 "pyc" = (
 /obj/structure/bed/stool,
 /turf/open/floor/almayer{
@@ -59683,15 +59697,16 @@
 	},
 /turf/open/floor/almayer,
 /area/almayer/lifeboat_pumps/south1)
-"pIZ" = (
-/obj/structure/pipes/standard/simple/hidden/supply,
-/obj/structure/machinery/door/firedoor/border_only/almayer{
-	dir = 2
+"pJe" = (
+/obj/structure/surface/table/woodentable/fancy,
+/obj/item/prop/tableflag/uscm{
+	pixel_x = -5
 	},
-/turf/open/floor/almayer{
-	icon_state = "test_floor4"
+/obj/item/prop/tableflag/uscm2{
+	pixel_x = 5
 	},
-/area/almayer/lifeboat_pumps/north1)
+/turf/open/floor/carpet,
+/area/almayer/living/commandbunks)
 "pJi" = (
 /obj/structure/closet/firecloset,
 /turf/open/floor/almayer{
@@ -59699,6 +59714,18 @@
 	icon_state = "red"
 	},
 /area/almayer/shipboard/brig/general_equipment)
+"pJn" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/machinery/light/small{
+	dir = 1
+	},
+/obj/structure/largecrate/random/secure{
+	pixel_x = -5
+	},
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/hull/upper_hull/u_m_s)
 "pJD" = (
 /obj/structure/pipes/vents/scrubber{
 	dir = 1
@@ -59745,6 +59772,21 @@
 	icon_state = "green"
 	},
 /area/almayer/hallways/port_hallway)
+"pJK" = (
+/obj/structure/bookcase{
+	icon_state = "book-5";
+	name = "medical manuals bookcase";
+	opacity = 0
+	},
+/obj/item/book/manual/surgery,
+/obj/item/book/manual/research_and_development,
+/obj/item/book/manual/medical_diagnostics_manual,
+/obj/item/book/manual/medical_cloning,
+/obj/structure/machinery/light{
+	dir = 4
+	},
+/turf/open/floor/wood/ship,
+/area/almayer/living/commandbunks)
 "pJR" = (
 /obj/effect/step_trigger/teleporter_vector{
 	name = "Almayer_AresUp";
@@ -59816,15 +59858,6 @@
 	icon_state = "plate"
 	},
 /area/almayer/living/captain_mess)
-"pMk" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "NE-out";
-	pixel_y = 1
-	},
-/turf/open/floor/almayer{
-	icon_state = "mono"
-	},
-/area/almayer/lifeboat_pumps/north2)
 "pMp" = (
 /obj/structure/disposalpipe/segment,
 /turf/open/floor/almayer{
@@ -59871,6 +59904,14 @@
 /obj/structure/largecrate/random/case/double,
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/hull/lower_hull/l_m_p)
+"pNK" = (
+/obj/effect/decal/warning_stripes{
+	icon_state = "W"
+	},
+/turf/open/floor/almayer{
+	icon_state = "dark_sterile"
+	},
+/area/almayer/living/auxiliary_officer_office)
 "pNM" = (
 /obj/structure/platform{
 	dir = 4
@@ -59977,6 +60018,16 @@
 	icon_state = "plate"
 	},
 /area/almayer/hull/upper_hull/u_a_s)
+"pPF" = (
+/obj/structure/machinery/power/apc/almayer/hardened,
+/obj/effect/decal/warning_stripes{
+	icon_state = "SW-out";
+	pixel_x = -1
+	},
+/turf/open/floor/almayer{
+	icon_state = "mono"
+	},
+/area/almayer/lifeboat_pumps/south2)
 "pPM" = (
 /obj/structure/surface/rack,
 /turf/open/floor/almayer{
@@ -59991,6 +60042,28 @@
 	icon_state = "red"
 	},
 /area/almayer/shipboard/port_missiles)
+"pPV" = (
+/obj/structure/pipes/vents/pump,
+/obj/structure/mirror{
+	pixel_y = 32
+	},
+/obj/structure/sink{
+	pixel_y = 24
+	},
+/obj/structure/machinery/door_control{
+	id = "Alpha_2";
+	name = "Door Lock";
+	normaldoorcontrol = 1;
+	pixel_x = 23;
+	specialfunctions = 4
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "W"
+	},
+/turf/open/floor/almayer{
+	icon_state = "dark_sterile"
+	},
+/area/almayer/living/port_emb)
 "pQq" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "SW-out"
@@ -60117,6 +60190,12 @@
 	icon_state = "test_floor5"
 	},
 /area/almayer/medical/hydroponics)
+"pSH" = (
+/obj/structure/pipes/standard/manifold/hidden/supply{
+	dir = 8
+	},
+/turf/open/floor/wood/ship,
+/area/almayer/living/commandbunks)
 "pSL" = (
 /obj/structure/machinery/alarm/almayer{
 	dir = 1
@@ -60172,6 +60251,16 @@
 	icon_state = "mono"
 	},
 /area/almayer/command/computerlab)
+"pUe" = (
+/obj/structure/machinery/power/apc/almayer/hardened,
+/obj/effect/decal/warning_stripes{
+	icon_state = "SE-out";
+	pixel_x = 1
+	},
+/turf/open/floor/almayer{
+	icon_state = "mono"
+	},
+/area/almayer/lifeboat_pumps/south1)
 "pUf" = (
 /obj/structure/bed/chair{
 	dir = 4
@@ -60195,6 +60284,15 @@
 	},
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/hull/upper_hull/u_m_p)
+"pUl" = (
+/obj/effect/decal/warning_stripes{
+	icon_state = "W";
+	pixel_x = -1
+	},
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/hallways/vehiclehangar)
 "pUp" = (
 /obj/item/device/radio/intercom{
 	freerange = 1;
@@ -60250,12 +60348,6 @@
 	icon_state = "plate"
 	},
 /area/almayer/hull/lower_hull/l_f_p)
-"pVx" = (
-/obj/structure/closet/secure_closet/guncabinet/red/armory_m39_submachinegun,
-/turf/open/floor/almayer{
-	icon_state = "redfull"
-	},
-/area/almayer/squads/req)
 "pVA" = (
 /obj/item/trash/cigbutt/ucigbutt{
 	pixel_x = 2;
@@ -60452,6 +60544,12 @@
 	icon_state = "sterile_green_side"
 	},
 /area/almayer/medical/containment)
+"pYp" = (
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 4
+	},
+/turf/open/floor/wood/ship,
+/area/almayer/living/commandbunks)
 "pYu" = (
 /obj/item/tool/warning_cone{
 	pixel_x = -12;
@@ -60579,6 +60677,15 @@
 	icon_state = "plate"
 	},
 /area/almayer/hull/lower_hull/l_f_s)
+"qbh" = (
+/obj/structure/pipes/vents/pump{
+	dir = 1
+	},
+/obj/structure/machinery/light/small,
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/command/combat_correspondent)
 "qbt" = (
 /obj/structure/pipes/vents/pump,
 /turf/open/floor/almayer{
@@ -60835,12 +60942,6 @@
 	icon_state = "silvercorner"
 	},
 /area/almayer/command/cichallway)
-"qfD" = (
-/obj/structure/bed/chair/office/dark{
-	dir = 8
-	},
-/turf/open/floor/carpet,
-/area/almayer/living/commandbunks)
 "qfR" = (
 /obj/structure/machinery/light{
 	dir = 1
@@ -60905,16 +61006,6 @@
 	},
 /turf/open/floor/almayer,
 /area/almayer/squads/delta)
-"qgU" = (
-/obj/structure/machinery/power/apc/almayer/hardened,
-/obj/effect/decal/warning_stripes{
-	icon_state = "SE-out";
-	pixel_x = 1
-	},
-/turf/open/floor/almayer{
-	icon_state = "mono"
-	},
-/area/almayer/lifeboat_pumps/south1)
 "qhb" = (
 /obj/structure/machinery/light,
 /turf/open/floor/almayer{
@@ -61069,19 +61160,15 @@
 /obj/effect/landmark/late_join/charlie,
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/squads/charlie)
-"qkm" = (
-/obj/structure/flora/pottedplant{
-	icon_state = "pottedplant_21"
-	},
-/obj/structure/sign/poster/io{
-	pixel_y = 32;
-	name = "propaganda poster"
+"qkj" = (
+/obj/effect/decal/warning_stripes{
+	icon_state = "N";
+	pixel_y = 1
 	},
-/obj/structure/sign/safety/escapepod{
-	pixel_x = -17
+/turf/open/floor/almayer{
+	icon_state = "plate"
 	},
-/turf/open/floor/wood/ship,
-/area/almayer/command/corporateliason)
+/area/almayer/command/lifeboat)
 "qkn" = (
 /obj/structure/sign/safety/maint{
 	pixel_x = -17
@@ -61116,16 +61203,6 @@
 /obj/structure/pipes/standard/simple/hidden/supply,
 /turf/open/floor/almayer,
 /area/almayer/hallways/starboard_umbilical)
-"qlp" = (
-/obj/structure/surface/table/woodentable/fancy,
-/obj/item/prop/tableflag/uscm{
-	pixel_x = -5
-	},
-/obj/item/prop/tableflag/uscm2{
-	pixel_x = 5
-	},
-/turf/open/floor/carpet,
-/area/almayer/living/commandbunks)
 "qlz" = (
 /obj/structure/window/framed/almayer,
 /obj/structure/machinery/door/firedoor/border_only/almayer,
@@ -61135,14 +61212,6 @@
 	},
 /turf/open/floor/plating,
 /area/almayer/shipboard/sea_office)
-"qlI" = (
-/obj/structure/machinery/light{
-	dir = 1
-	},
-/obj/structure/machinery/disposal,
-/obj/structure/disposalpipe/trunk,
-/turf/open/floor/wood/ship,
-/area/almayer/living/commandbunks)
 "qmk" = (
 /obj/structure/surface/table/almayer,
 /obj/structure/pipes/standard/simple/hidden/supply{
@@ -61157,6 +61226,21 @@
 	icon_state = "bluecorner"
 	},
 /area/almayer/squads/delta)
+"qmr" = (
+/obj/structure/surface/table/almayer,
+/obj/item/tool/screwdriver,
+/obj/item/prop/helmetgarb/gunoil{
+	pixel_x = -7;
+	pixel_y = 12
+	},
+/obj/item/weapon/gun/rifle/l42a{
+	pixel_x = 17;
+	pixel_y = 6
+	},
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/hull/upper_hull/u_m_s)
 "qmt" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "SW-out";
@@ -61267,17 +61351,6 @@
 	icon_state = "plate"
 	},
 /area/almayer/shipboard/brig/perma)
-"qmZ" = (
-/obj/structure/surface/table/woodentable/fancy,
-/obj/structure/transmitter/rotary{
-	name = "Commanding Officer's Office";
-	phone_category = "Offices";
-	phone_id = "Commanding Officer's Office";
-	pixel_y = 8;
-	pixel_x = 16
-	},
-/turf/open/floor/carpet,
-/area/almayer/living/commandbunks)
 "qnd" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "SW-out"
@@ -61404,6 +61477,16 @@
 	icon_state = "sterile_green_side"
 	},
 /area/almayer/medical/chemistry)
+"qpU" = (
+/obj/structure/flora/pottedplant{
+	icon_state = "pottedplant_22";
+	pixel_y = 12
+	},
+/obj/structure/surface/table/almayer,
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/command/lifeboat)
 "qqn" = (
 /obj/structure/desertdam/decals/road_edge{
 	icon_state = "road_edge_decal3";
@@ -61411,15 +61494,6 @@
 	},
 /turf/open/floor/wood/ship,
 /area/almayer/living/basketball)
-"qqr" = (
-/obj/structure/machinery/light{
-	dir = 8
-	},
-/obj/structure/closet/secure_closet/guncabinet/red/armory_m4a3_pistol,
-/turf/open/floor/almayer{
-	icon_state = "redfull"
-	},
-/area/almayer/engineering/upper_engineering)
 "qqu" = (
 /turf/open/floor/almayer{
 	dir = 1;
@@ -61528,6 +61602,12 @@
 	icon_state = "plate"
 	},
 /area/almayer/living/gym)
+"qtR" = (
+/obj/structure/closet/emcloset,
+/turf/open/floor/almayer{
+	icon_state = "cargo"
+	},
+/area/almayer/command/lifeboat)
 "qtS" = (
 /obj/structure/largecrate/random/case/double,
 /turf/open/floor/almayer,
@@ -61553,20 +61633,6 @@
 	icon_state = "sterile_green_side"
 	},
 /area/almayer/medical/cryo_tubes)
-"quy" = (
-/obj/structure/machinery/door/firedoor/border_only/almayer,
-/obj/structure/sign/safety/maint{
-	pixel_x = 8;
-	pixel_y = -32
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "SW-out";
-	pixel_x = -1
-	},
-/turf/open/floor/almayer{
-	icon_state = "test_floor4"
-	},
-/area/almayer/command/lifeboat)
 "quI" = (
 /obj/structure/machinery/door_control{
 	id = "laddersouthwest";
@@ -61812,6 +61878,35 @@
 	icon_state = "plating"
 	},
 /area/almayer/hallways/vehiclehangar)
+"qyH" = (
+/obj/effect/decal/warning_stripes{
+	icon_state = "NE-out";
+	pixel_y = 1
+	},
+/turf/open/floor/almayer,
+/area/almayer/command/lifeboat)
+"qyJ" = (
+/obj/structure/closet/secure_closet/guncabinet/red/cic_armory_shotgun,
+/turf/open/floor/almayer{
+	icon_state = "redfull"
+	},
+/area/almayer/command/cic)
+"qyM" = (
+/obj/structure/surface/table/almayer,
+/obj/item/clothing/mask/cigarette/pipe{
+	pixel_x = 8
+	},
+/obj/structure/transmitter/rotary{
+	name = "Reporter Telephone";
+	phone_category = "Almayer";
+	phone_id = "Reporter";
+	pixel_x = -4;
+	pixel_y = 6
+	},
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/command/combat_correspondent)
 "qyW" = (
 /obj/structure/bed/chair{
 	dir = 4
@@ -61897,12 +61992,15 @@
 	},
 /turf/open/floor/almayer,
 /area/almayer/living/briefing)
-"qCi" = (
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 5
+"qCg" = (
+/obj/structure/mirror{
+	pixel_y = 32
+	},
+/obj/structure/sink{
+	pixel_y = 24
 	},
 /turf/open/floor/plating/plating_catwalk,
-/area/almayer/hull/upper_hull/u_f_s)
+/area/almayer/engineering/upper_engineering/port)
 "qCo" = (
 /obj/structure/pipes/vents/pump{
 	dir = 1
@@ -62083,12 +62181,6 @@
 	icon_state = "dark_sterile"
 	},
 /area/almayer/medical/operating_room_two)
-"qGU" = (
-/obj/structure/closet/firecloset,
-/turf/open/floor/almayer{
-	icon_state = "cargo"
-	},
-/area/almayer/lifeboat_pumps/south2)
 "qHb" = (
 /obj/structure/bed/chair{
 	dir = 8
@@ -62172,15 +62264,6 @@
 	icon_state = "mono"
 	},
 /area/almayer/medical/medical_science)
-"qJf" = (
-/obj/structure/machinery/light{
-	dir = 4
-	},
-/obj/structure/closet/secure_closet/guncabinet/red/armory_shotgun,
-/turf/open/floor/almayer{
-	icon_state = "redfull"
-	},
-/area/almayer/engineering/upper_engineering)
 "qJj" = (
 /obj/structure/desertdam/decals/road_edge{
 	icon_state = "road_edge_decal3";
@@ -62236,15 +62319,6 @@
 	icon_state = "kitchen"
 	},
 /area/almayer/living/grunt_rnr)
-"qJU" = (
-/obj/structure/bed,
-/obj/item/toy/plush/farwa{
-	pixel_x = 5
-	},
-/obj/item/clothing/under/redpyjamas,
-/obj/item/bedsheet/orange,
-/turf/open/floor/wood/ship,
-/area/almayer/command/corporateliason)
 "qJY" = (
 /obj/structure/surface/table/almayer,
 /obj/item/reagent_container/food/drinks/bottle/orangejuice{
@@ -62290,16 +62364,6 @@
 	icon_state = "plating"
 	},
 /area/almayer/engineering/upper_engineering)
-"qKt" = (
-/obj/structure/closet/emcloset,
-/obj/structure/machinery/camera/autoname/almayer{
-	dir = 4;
-	name = "ship-grade camera"
-	},
-/turf/open/floor/almayer{
-	icon_state = "cargo"
-	},
-/area/almayer/hull/upper_hull/u_f_s)
 "qKz" = (
 /obj/structure/machinery/light/small,
 /turf/open/floor/almayer{
@@ -62328,16 +62392,6 @@
 	icon_state = "greencorner"
 	},
 /area/almayer/hallways/port_hallway)
-"qKY" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "N";
-	pixel_y = 1
-	},
-/turf/open/floor/almayer{
-	dir = 9;
-	icon_state = "orange"
-	},
-/area/almayer/engineering/upper_engineering/port)
 "qLi" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "SE-out";
@@ -62580,15 +62634,6 @@
 	icon_state = "dark_sterile"
 	},
 /area/almayer/medical/lower_medical_lobby)
-"qPX" = (
-/obj/structure/machinery/light,
-/obj/effect/decal/warning_stripes{
-	icon_state = "SE-out"
-	},
-/turf/open/floor/almayer{
-	icon_state = "red"
-	},
-/area/almayer/command/lifeboat)
 "qQc" = (
 /obj/structure/closet/secure_closet/personal/patient{
 	name = "morgue closet"
@@ -62606,6 +62651,16 @@
 	icon_state = "mono"
 	},
 /area/almayer/lifeboat_pumps/south1)
+"qQL" = (
+/obj/effect/decal/warning_stripes{
+	icon_state = "NW-out";
+	pixel_y = 1
+	},
+/turf/open/floor/almayer{
+	dir = 5;
+	icon_state = "orange"
+	},
+/area/almayer/engineering/upper_engineering/port)
 "qQM" = (
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 4
@@ -62667,6 +62722,19 @@
 	icon_state = "red"
 	},
 /area/almayer/shipboard/brig/general_equipment)
+"qRL" = (
+/obj/structure/machinery/door/firedoor/border_only/almayer{
+	dir = 2
+	},
+/obj/structure/machinery/door/airlock/multi_tile/almayer/generic2{
+	access_modified = 1;
+	name = "\improper Flight Crew Quarters";
+	req_one_access_txt = "19;22"
+	},
+/turf/open/floor/almayer{
+	icon_state = "test_floor4"
+	},
+/area/almayer/living/pilotbunks)
 "qRT" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "SE-out";
@@ -63094,15 +63162,6 @@
 	icon_state = "silvercorner"
 	},
 /area/almayer/command/computerlab)
-"rbE" = (
-/obj/structure/machinery/cm_vending/clothing/dress{
-	req_access = list(1);
-	pixel_y = 0
-	},
-/turf/open/floor/almayer{
-	icon_state = "cargo"
-	},
-/area/almayer/living/commandbunks)
 "rbF" = (
 /obj/effect/landmark/late_join,
 /obj/effect/landmark/ert_spawns/distress_cryo,
@@ -63175,6 +63234,14 @@
 	icon_state = "orange"
 	},
 /area/almayer/engineering/upper_engineering)
+"rcW" = (
+/obj/item/storage/toolbox/mechanical{
+	pixel_y = 13
+	},
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/hull/upper_hull/u_m_s)
 "rde" = (
 /obj/structure/sign/prop1,
 /turf/closed/wall/almayer,
@@ -63290,6 +63357,18 @@
 	icon_state = "test_floor4"
 	},
 /area/almayer/hull/upper_hull/u_m_s)
+"rfv" = (
+/obj/structure/surface/table/woodentable/fancy,
+/obj/structure/machinery/faxmachine/uscm/command/capt{
+	name = "Commanding Officer's Fax Machine";
+	pixel_y = 3;
+	pixel_x = -4
+	},
+/obj/structure/machinery/light{
+	dir = 1
+	},
+/turf/open/floor/wood/ship,
+/area/almayer/living/commandbunks)
 "rfI" = (
 /obj/structure/sign/safety/airlock{
 	pixel_y = -32
@@ -63376,6 +63455,17 @@
 	icon_state = "emeraldcorner"
 	},
 /area/almayer/living/briefing)
+"rhD" = (
+/obj/structure/machinery/light/small{
+	dir = 8
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "N";
+	pixel_y = 2
+	},
+/obj/structure/closet/secure_closet/guncabinet/red/mp_armory_m39_submachinegun,
+/turf/open/floor/plating/almayer,
+/area/almayer/shipboard/brig/armory)
 "rhO" = (
 /obj/structure/machinery/vending/cola/research{
 	pixel_x = 4
@@ -63670,17 +63760,6 @@
 	icon_state = "red"
 	},
 /area/almayer/lifeboat_pumps/south1)
-"rmE" = (
-/obj/structure/machinery/light/small{
-	dir = 4
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "S"
-	},
-/turf/open/floor/almayer{
-	icon_state = "dark_sterile"
-	},
-/area/almayer/engineering/upper_engineering/port)
 "rmN" = (
 /obj/structure/pipes/standard/simple/hidden/supply,
 /turf/open/floor/plating/plating_catwalk,
@@ -63851,6 +63930,17 @@
 	icon_state = "plate"
 	},
 /area/almayer/squads/delta)
+"rqH" = (
+/obj/structure/surface/table/woodentable/fancy,
+/obj/structure/transmitter/rotary{
+	name = "Commanding Officer's Office";
+	phone_category = "Offices";
+	phone_id = "Commanding Officer's Office";
+	pixel_y = 8;
+	pixel_x = 16
+	},
+/turf/open/floor/carpet,
+/area/almayer/living/commandbunks)
 "rra" = (
 /obj/structure/machinery/door/poddoor/almayer/locked{
 	dir = 8;
@@ -63958,6 +64048,16 @@
 /obj/structure/pipes/standard/manifold/hidden/supply,
 /turf/open/floor/almayer,
 /area/almayer/command/computerlab)
+"rsW" = (
+/obj/structure/pipes/vents/pump,
+/obj/effect/decal/warning_stripes{
+	icon_state = "N";
+	pixel_y = 2
+	},
+/turf/open/floor/almayer{
+	icon_state = "dark_sterile"
+	},
+/area/almayer/engineering/upper_engineering/port)
 "rsY" = (
 /obj/structure/machinery/power/apc/almayer{
 	dir = 1
@@ -64037,22 +64137,6 @@
 	},
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/living/grunt_rnr)
-"rur" = (
-/obj/structure/machinery/light{
-	dir = 8
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "N";
-	pixel_y = 1
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "S";
-	pixel_y = -1
-	},
-/turf/open/floor/almayer{
-	icon_state = "dark_sterile"
-	},
-/area/almayer/living/port_emb)
 "rux" = (
 /obj/structure/surface/table/almayer,
 /obj/item/paper_bin/uscm,
@@ -64103,6 +64187,12 @@
 /obj/structure/largecrate/random/case/double,
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/hull/upper_hull/u_f_s)
+"rwT" = (
+/obj/structure/closet/secure_closet/guncabinet/red/armory_shotgun,
+/turf/open/floor/almayer{
+	icon_state = "redfull"
+	},
+/area/almayer/engineering/upper_engineering)
 "rwY" = (
 /obj/structure/window/framed/almayer,
 /obj/structure/machinery/door/poddoor/shutters/almayer{
@@ -64163,12 +64253,11 @@
 	icon_state = "mono"
 	},
 /area/almayer/lifeboat_pumps/north1)
-"ryR" = (
-/obj/structure/machinery/cm_vending/clothing/staff_officer_armory,
-/turf/open/floor/almayer{
-	icon_state = "redfull"
-	},
-/area/almayer/command/cic)
+"rzf" = (
+/obj/effect/landmark/late_join/working_joe,
+/obj/effect/landmark/start/working_joe,
+/turf/open/floor/plating/plating_catwalk,
+/area/almayer/command/airoom)
 "rzj" = (
 /obj/structure/pipes/standard/simple/hidden/supply,
 /obj/structure/machinery/door/firedoor/border_only/almayer{
@@ -64210,6 +64299,13 @@
 	icon_state = "bluecorner"
 	},
 /area/almayer/living/briefing)
+"rAv" = (
+/obj/structure/machinery/shower{
+	dir = 8
+	},
+/obj/structure/window/reinforced,
+/turf/open/floor/plating/plating_catwalk,
+/area/almayer/shipboard/brig/cells)
 "rAx" = (
 /obj/structure/disposalpipe/junction{
 	dir = 4
@@ -64515,6 +64611,14 @@
 	icon_state = "plate"
 	},
 /area/almayer/squads/delta)
+"rEJ" = (
+/obj/structure/machinery/light,
+/obj/structure/flora/pottedplant{
+	pixel_y = 3;
+	pixel_x = -1
+	},
+/turf/open/floor/wood/ship,
+/area/almayer/living/commandbunks)
 "rEL" = (
 /obj/structure/machinery/cm_vending/gear/intelligence_officer,
 /turf/open/floor/almayer{
@@ -64752,6 +64856,11 @@
 	},
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/hull/lower_hull/l_m_s)
+"rJg" = (
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/command/combat_correspondent)
 "rJh" = (
 /obj/item/storage/backpack/marine/satchel{
 	desc = "It's the heavy-duty black polymer kind. Time to take out the trash!";
@@ -64876,28 +64985,6 @@
 	dir = 8
 	},
 /area/almayer/medical/containment/cell/cl)
-"rNb" = (
-/obj/structure/pipes/vents/pump,
-/obj/structure/mirror{
-	pixel_y = 32
-	},
-/obj/structure/sink{
-	pixel_y = 24
-	},
-/obj/structure/machinery/door_control{
-	id = "Alpha_2";
-	name = "Door Lock";
-	normaldoorcontrol = 1;
-	pixel_x = 23;
-	specialfunctions = 4
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "W"
-	},
-/turf/open/floor/almayer{
-	icon_state = "dark_sterile"
-	},
-/area/almayer/living/port_emb)
 "rNF" = (
 /obj/structure/machinery/light{
 	unacidable = 1;
@@ -64949,6 +65036,17 @@
 	icon_state = "plate"
 	},
 /area/almayer/living/gym)
+"rOZ" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/closet/secure_closet/guncabinet,
+/obj/item/weapon/gun/rifle/l42a{
+	pixel_y = 6
+	},
+/obj/item/weapon/gun/rifle/l42a,
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/hull/upper_hull/u_m_s)
 "rPh" = (
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 4
@@ -65193,6 +65291,27 @@
 	icon_state = "silver"
 	},
 /area/almayer/command/computerlab)
+"rUB" = (
+/obj/structure/pipes/vents/pump,
+/obj/item/tool/soap,
+/obj/effect/decal/cleanable/blood,
+/obj/effect/decal/warning_stripes{
+	icon_state = "W"
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "E";
+	pixel_x = 1
+	},
+/obj/structure/sink{
+	pixel_y = 24
+	},
+/obj/structure/mirror{
+	pixel_y = 32
+	},
+/turf/open/floor/almayer{
+	icon_state = "dark_sterile"
+	},
+/area/almayer/shipboard/brig/cells)
 "rUU" = (
 /obj/structure/machinery/door/airlock/almayer/maint{
 	req_access = null;
@@ -65228,6 +65347,14 @@
 	},
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/shipboard/brig/cic_hallway)
+"rWF" = (
+/obj/effect/decal/warning_stripes{
+	icon_state = "S"
+	},
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/command/lifeboat)
 "rWL" = (
 /obj/structure/barricade/metal,
 /turf/open/floor/almayer{
@@ -65334,6 +65461,14 @@
 	icon_state = "plate"
 	},
 /area/almayer/living/offices/flight)
+"rYZ" = (
+/obj/effect/decal/warning_stripes{
+	icon_state = "NW-out";
+	pixel_x = -1;
+	pixel_y = 2
+	},
+/turf/open/floor/plating/plating_catwalk,
+/area/almayer/hallways/vehiclehangar)
 "rZz" = (
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 5
@@ -65804,6 +65939,18 @@
 	icon_state = "test_floor4"
 	},
 /area/almayer/command/lifeboat)
+"skg" = (
+/obj/structure/machinery/light/small{
+	dir = 8
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "S"
+	},
+/turf/open/floor/almayer{
+	dir = 10;
+	icon_state = "orange"
+	},
+/area/almayer/engineering/upper_engineering/starboard)
 "skl" = (
 /obj/structure/bed/chair/office/dark{
 	dir = 8
@@ -65955,6 +66102,25 @@
 	icon_state = "blue"
 	},
 /area/almayer/squads/delta)
+"soa" = (
+/obj/structure/pipes/standard/simple/hidden/supply,
+/obj/effect/decal/warning_stripes{
+	icon_state = "NW-out";
+	pixel_y = 1
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "NE-out";
+	pixel_x = 1;
+	pixel_y = 1
+	},
+/obj/structure/machinery/door/airlock/almayer/generic{
+	dir = 1;
+	name = "Bathroom"
+	},
+/turf/open/floor/almayer{
+	icon_state = "test_floor4"
+	},
+/area/almayer/shipboard/brig/cells)
 "soq" = (
 /obj/structure/machinery/computer/working_joe{
 	dir = 4;
@@ -66157,6 +66323,12 @@
 	icon_state = "test_floor4"
 	},
 /area/almayer/hallways/repair_bay)
+"ssn" = (
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 10
+	},
+/turf/open/floor/carpet,
+/area/almayer/living/commandbunks)
 "ssD" = (
 /obj/structure/machinery/light/small{
 	dir = 4
@@ -66185,15 +66357,6 @@
 	icon_state = "orange"
 	},
 /area/almayer/engineering/upper_engineering/starboard)
-"ssW" = (
-/obj/structure/machinery/light{
-	dir = 1
-	},
-/obj/structure/closet/secure_closet/guncabinet/red/cic_armory_shotgun,
-/turf/open/floor/almayer{
-	icon_state = "redfull"
-	},
-/area/almayer/command/cic)
 "ssX" = (
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 6
@@ -66228,12 +66391,6 @@
 	allow_construction = 0
 	},
 /area/almayer/stair_clone/upper)
-"stu" = (
-/obj/structure/machinery/sentry_holder/almayer,
-/turf/open/floor/almayer{
-	icon_state = "mono"
-	},
-/area/almayer/lifeboat_pumps/north1)
 "stY" = (
 /obj/structure/machinery/door/firedoor/border_only/almayer,
 /obj/structure/pipes/standard/simple/hidden/supply{
@@ -66292,18 +66449,16 @@
 	icon_state = "plate"
 	},
 /area/almayer/command/lifeboat)
-"svC" = (
-/obj/structure/closet/secure_closet/guncabinet,
-/obj/item/weapon/gun/smg/m39{
-	pixel_y = 6
-	},
-/obj/item/weapon/gun/smg/m39{
-	pixel_y = -6
+"svp" = (
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 4
 	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
+/obj/effect/decal/warning_stripes{
+	icon_state = "N";
+	pixel_y = 2
 	},
-/area/almayer/hull/upper_hull/u_m_s)
+/turf/open/floor/plating/plating_catwalk,
+/area/almayer/hull/upper_hull/u_f_s)
 "swn" = (
 /obj/structure/window/framed/almayer,
 /obj/structure/machinery/door/firedoor/border_only/almayer{
@@ -66404,28 +66559,6 @@
 	icon_state = "plate"
 	},
 /area/almayer/living/bridgebunks)
-"sxT" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/closet/secure_closet/guncabinet,
-/obj/item/weapon/gun/rifle/m41a{
-	pixel_y = 6
-	},
-/obj/item/weapon/gun/rifle/m41a,
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/almayer/hull/upper_hull/u_m_s)
-"sxW" = (
-/obj/structure/disposalpipe/segment{
-	dir = 4
-	},
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 4
-	},
-/turf/open/floor/almayer{
-	icon_state = "silver"
-	},
-/area/almayer/command/cichallway)
 "syH" = (
 /obj/structure/machinery/firealarm{
 	pixel_y = -28
@@ -67008,25 +67141,6 @@
 	},
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/hallways/starboard_hallway)
-"sLZ" = (
-/obj/structure/surface/table/woodentable/fancy,
-/obj/item/device/flashlight/lamp/green{
-	pixel_y = 20;
-	pixel_x = -7
-	},
-/obj/item/ashtray/bronze{
-	pixel_y = 19;
-	pixel_x = 4
-	},
-/obj/structure/machinery/light{
-	dir = 8
-	},
-/obj/effect/landmark/map_item{
-	pixel_y = 3;
-	pixel_x = -1
-	},
-/turf/open/floor/wood/ship,
-/area/almayer/living/commandbunks)
 "sMs" = (
 /obj/structure/machinery/door/airlock/almayer/maint/reinforced{
 	dir = 1
@@ -67132,15 +67246,6 @@
 	},
 /turf/open/floor/almayer,
 /area/almayer/lifeboat_pumps/south1)
-"sOZ" = (
-/obj/structure/sign/safety/ammunition{
-	pixel_y = 32
-	},
-/obj/structure/closet/secure_closet/guncabinet/red/armory_m4a3_pistol,
-/turf/open/floor/almayer{
-	icon_state = "redfull"
-	},
-/area/almayer/medical/upper_medical)
 "sPc" = (
 /obj/structure/machinery/light{
 	dir = 1
@@ -67445,27 +67550,6 @@
 	},
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/shipboard/brig/cryo)
-"sWs" = (
-/obj/structure/closet/emcloset,
-/turf/open/floor/almayer{
-	icon_state = "cargo"
-	},
-/area/almayer/hull/upper_hull/u_f_p)
-"sWC" = (
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 4
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "NE-out";
-	pixel_y = 2
-	},
-/obj/structure/machinery/door/airlock/almayer/generic{
-	name = "\improper Bathroom"
-	},
-/turf/open/floor/almayer{
-	icon_state = "test_floor4"
-	},
-/area/almayer/engineering/upper_engineering/port)
 "sWW" = (
 /obj/structure/machinery/flasher{
 	alpha = 1;
@@ -67586,14 +67670,6 @@
 	icon_state = "red"
 	},
 /area/almayer/lifeboat_pumps/south2)
-"sYB" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "N";
-	pixel_y = 2
-	},
-/obj/structure/closet/secure_closet/guncabinet/red/mp_armory_m39_submachinegun,
-/turf/open/floor/plating/almayer,
-/area/almayer/shipboard/brig/armory)
 "sYC" = (
 /obj/structure/machinery/door/airlock/almayer/maint,
 /obj/structure/machinery/door/poddoor/almayer/open{
@@ -67723,12 +67799,6 @@
 	},
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/hallways/aft_hallway)
-"tan" = (
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 10
-	},
-/turf/open/floor/carpet,
-/area/almayer/living/commandbunks)
 "tat" = (
 /obj/structure/pipes/standard/simple/hidden/supply,
 /obj/structure/disposalpipe/segment,
@@ -67807,14 +67877,6 @@
 	icon_state = "test_floor4"
 	},
 /area/almayer/shipboard/brig/perma)
-"tcZ" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "S"
-	},
-/turf/open/floor/almayer{
-	icon_state = "dark_sterile"
-	},
-/area/almayer/engineering/upper_engineering/port)
 "tda" = (
 /obj/structure/machinery/door/firedoor/border_only/almayer{
 	dir = 2
@@ -67925,15 +67987,6 @@
 /obj/effect/landmark/late_join,
 /turf/open/floor/almayer,
 /area/almayer/living/cryo_cells)
-"teE" = (
-/obj/structure/machinery/light{
-	dir = 8
-	},
-/obj/structure/toilet{
-	dir = 4
-	},
-/turf/open/floor/plating/plating_catwalk,
-/area/almayer/shipboard/brig/cells)
 "teH" = (
 /obj/structure/disposalpipe/segment,
 /obj/structure/pipes/standard/simple/hidden/supply,
@@ -68074,18 +68127,6 @@
 	icon_state = "sterile_green_side"
 	},
 /area/almayer/medical/lower_medical_medbay)
-"thR" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/machinery/light/small{
-	dir = 1
-	},
-/obj/structure/largecrate/random/secure{
-	pixel_x = -5
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/almayer/hull/upper_hull/u_m_s)
 "thT" = (
 /obj/structure/sign/safety/hvac_old{
 	pixel_x = 8;
@@ -68146,6 +68187,23 @@
 	icon_state = "green"
 	},
 /area/almayer/hallways/starboard_hallway)
+"tiw" = (
+/obj/structure/machinery/constructable_frame{
+	icon_state = "box_2"
+	},
+/obj/item/weapon/baseballbat/metal{
+	pixel_x = -2;
+	pixel_y = 8
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "SW-out";
+	pixel_x = -1
+	},
+/turf/open/floor/almayer{
+	dir = 6;
+	icon_state = "orange"
+	},
+/area/almayer/engineering/upper_engineering/starboard)
 "tiE" = (
 /obj/structure/window/framed/almayer,
 /obj/structure/machinery/door/firedoor/border_only/almayer,
@@ -68462,6 +68520,12 @@
 	icon_state = "test_floor4"
 	},
 /area/almayer/hull/lower_hull/l_m_s)
+"tpt" = (
+/obj/structure/machinery/sentry_holder/almayer,
+/turf/open/floor/almayer{
+	icon_state = "mono"
+	},
+/area/almayer/lifeboat_pumps/north2)
 "tpD" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "E";
@@ -68488,21 +68552,6 @@
 	icon_state = "plate"
 	},
 /area/almayer/hull/upper_hull/u_a_p)
-"tqd" = (
-/obj/structure/surface/table/almayer,
-/obj/item/tool/screwdriver,
-/obj/item/prop/helmetgarb/gunoil{
-	pixel_x = -7;
-	pixel_y = 12
-	},
-/obj/item/weapon/gun/rifle/l42a{
-	pixel_x = 17;
-	pixel_y = 6
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/almayer/hull/upper_hull/u_m_s)
 "tqe" = (
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 4
@@ -68554,6 +68603,32 @@
 	},
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/hull/lower_hull/l_m_p)
+"tqB" = (
+/obj/structure/machinery/light{
+	dir = 1
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "NE-out";
+	pixel_y = 1
+	},
+/turf/open/floor/almayer{
+	dir = 1;
+	icon_state = "red"
+	},
+/area/almayer/command/lifeboat)
+"tqI" = (
+/obj/structure/machinery/door/window/westright,
+/obj/structure/machinery/shower{
+	dir = 8;
+	layer = 3.10;
+	plane = -4
+	},
+/obj/item/tool/soap{
+	pixel_x = 2;
+	pixel_y = 7
+	},
+/turf/open/floor/plating/plating_catwalk,
+/area/almayer/living/commandbunks)
 "tqV" = (
 /obj/structure/extinguisher_cabinet{
 	pixel_y = 26
@@ -68838,25 +68913,6 @@
 	icon_state = "outerhull_dir"
 	},
 /area/space)
-"twI" = (
-/obj/structure/machinery/cm_vending/clothing/dress{
-	density = 0;
-	pixel_y = 16
-	},
-/obj/structure/machinery/light{
-	dir = 8
-	},
-/obj/structure/machinery/door_control{
-	id = "bot_uniforms";
-	name = "Uniform Vendor Lockdown";
-	pixel_x = -24;
-	pixel_y = 18;
-	req_access_txt = "31"
-	},
-/turf/open/floor/almayer{
-	icon_state = "cargo"
-	},
-/area/almayer/command/cic)
 "twT" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -69008,6 +69064,12 @@
 	icon_state = "dark_sterile"
 	},
 /area/almayer/medical/lower_medical_lobby)
+"tAh" = (
+/obj/structure/closet/emcloset,
+/turf/open/floor/almayer{
+	icon_state = "cargo"
+	},
+/area/almayer/engineering/upper_engineering/port)
 "tAi" = (
 /obj/structure/sign/safety/hvac_old{
 	pixel_x = 8;
@@ -69031,6 +69093,12 @@
 	icon_state = "plate"
 	},
 /area/almayer/engineering/upper_engineering/port)
+"tAJ" = (
+/obj/structure/closet/secure_closet/fridge/dry,
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/living/grunt_rnr)
 "tAL" = (
 /obj/structure/machinery/cryopod,
 /turf/open/floor/almayer{
@@ -69075,13 +69143,6 @@
 /obj/item/tool/crowbar,
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/lifeboat_pumps/south1)
-"tBu" = (
-/obj/effect/decal/cleanable/blood/oil/streak,
-/obj/structure/machinery/sentry_holder/almayer,
-/turf/open/floor/almayer{
-	icon_state = "mono"
-	},
-/area/almayer/lifeboat_pumps/south1)
 "tBz" = (
 /obj/structure/machinery/power/apc/almayer{
 	dir = 1
@@ -69267,15 +69328,6 @@
 /obj/effect/spawner/random/tool,
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/lifeboat_pumps/south2)
-"tGj" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "NW-out";
-	pixel_y = 1
-	},
-/turf/open/floor/almayer{
-	icon_state = "mono"
-	},
-/area/almayer/lifeboat_pumps/north1)
 "tGq" = (
 /obj/effect/projector{
 	name = "Almayer_Up4";
@@ -69352,12 +69404,18 @@
 /obj/structure/window/framed/almayer,
 /turf/open/floor/plating,
 /area/almayer/shipboard/brig/cells)
-"tId" = (
-/obj/structure/machinery/recharge_station,
-/turf/open/floor/almayer{
-	icon_state = "cargo"
+"tHU" = (
+/obj/effect/decal/warning_stripes{
+	icon_state = "S"
 	},
-/area/almayer/command/airoom)
+/obj/structure/machinery/power/apc/almayer{
+	dir = 8
+	},
+/obj/item/storage/briefcase{
+	pixel_y = 15
+	},
+/turf/open/floor/wood/ship,
+/area/almayer/living/commandbunks)
 "tIp" = (
 /obj/structure/machinery/door/airlock/almayer/generic{
 	name = "\improper Dorms"
@@ -69423,6 +69481,17 @@
 	icon_state = "plate"
 	},
 /area/almayer/living/bridgebunks)
+"tJo" = (
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 1
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "NE-out";
+	pixel_x = 2;
+	pixel_y = 2
+	},
+/turf/open/floor/plating/plating_catwalk,
+/area/almayer/hull/upper_hull/u_f_p)
 "tJp" = (
 /obj/structure/surface/table/almayer,
 /obj/item/tool/crowbar/red,
@@ -69454,15 +69523,6 @@
 	},
 /turf/open/floor/almayer,
 /area/almayer/squads/charlie_delta_shared)
-"tJN" = (
-/obj/structure/machinery/cryopod/right{
-	layer = 3.1;
-	pixel_y = 13
-	},
-/turf/open/floor/almayer{
-	icon_state = "cargo"
-	},
-/area/almayer/command/airoom)
 "tJR" = (
 /obj/structure/machinery/vending/cigarette,
 /obj/structure/sign/safety/medical{
@@ -69548,6 +69608,14 @@
 	icon_state = "red"
 	},
 /area/almayer/hallways/aft_hallway)
+"tMu" = (
+/obj/structure/machinery/cm_vending/clothing/commanding_officer{
+	pixel_y = 0
+	},
+/turf/open/floor/almayer{
+	icon_state = "cargo"
+	},
+/area/almayer/living/commandbunks)
 "tMW" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "NW-out";
@@ -69783,12 +69851,28 @@
 	icon_state = "orangecorner"
 	},
 /area/almayer/living/briefing)
-"tTk" = (
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 4
+"tSF" = (
+/obj/structure/surface/table/almayer,
+/obj/item/device/camera{
+	pixel_x = -8;
+	pixel_y = 12
 	},
-/turf/open/floor/carpet,
-/area/almayer/living/commandbunks)
+/obj/item/paper_bin/uscm{
+	pixel_x = 6;
+	pixel_y = 6
+	},
+/obj/item/tool/pen{
+	pixel_x = 4;
+	pixel_y = -4
+	},
+/obj/item/storage/box/donkpockets{
+	pixel_x = -8;
+	pixel_y = -1
+	},
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/command/combat_correspondent)
 "tTp" = (
 /obj/structure/surface/table/almayer,
 /obj/item/reagent_container/food/condiment/hotsauce/sriracha{
@@ -69955,6 +70039,13 @@
 	icon_state = "plate"
 	},
 /area/almayer/shipboard/brig/cryo)
+"tXz" = (
+/obj/effect/decal/warning_stripes{
+	icon_state = "W";
+	pixel_x = -1
+	},
+/turf/open/floor/plating/plating_catwalk,
+/area/almayer/hallways/vehiclehangar)
 "tXM" = (
 /obj/structure/pipes/vents/pump{
 	dir = 8
@@ -70013,6 +70104,12 @@
 	icon_state = "dark_sterile"
 	},
 /area/almayer/medical/lower_medical_lobby)
+"tYv" = (
+/obj/structure/closet/emcloset,
+/turf/open/floor/almayer{
+	icon_state = "cargo"
+	},
+/area/almayer/hull/upper_hull/u_f_p)
 "tYw" = (
 /obj/effect/decal/medical_decals{
 	icon_state = "triagedecalbottomleft";
@@ -70034,12 +70131,6 @@
 	icon_state = "plate"
 	},
 /area/almayer/hull/upper_hull/u_f_s)
-"tYM" = (
-/obj/structure/pipes/vents/pump{
-	dir = 4
-	},
-/turf/open/floor/wood/ship,
-/area/almayer/living/commandbunks)
 "tYX" = (
 /turf/open/floor/almayer{
 	icon_state = "test_floor4"
@@ -70189,13 +70280,6 @@
 /obj/structure/pipes/standard/simple/hidden/supply,
 /turf/open/floor/almayer,
 /area/almayer/command/computerlab)
-"uaX" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "W";
-	pixel_x = -1
-	},
-/turf/open/floor/almayer,
-/area/almayer/hull/upper_hull/u_f_s)
 "uaZ" = (
 /obj/structure/surface/table/almayer,
 /obj/item/weapon/gun/rifle/m41a,
@@ -70219,6 +70303,17 @@
 	icon_state = "ai_floors"
 	},
 /area/almayer/command/airoom)
+"uck" = (
+/obj/structure/surface/rack,
+/obj/item/stack/cable_coil,
+/obj/item/attachable/flashlight/grip,
+/obj/item/ammo_box/magazine/l42a{
+	pixel_y = 14
+	},
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/hull/upper_hull/u_m_s)
 "ucp" = (
 /obj/structure/window/framed/almayer,
 /turf/open/floor/plating,
@@ -70251,36 +70346,15 @@
 	icon_state = "plate"
 	},
 /area/almayer/command/cic)
-"ucI" = (
-/obj/item/device/flashlight/lamp/green{
-	pixel_x = 5;
-	pixel_y = 3
-	},
-/obj/structure/machinery/door_control{
-	id = "cl_shutters";
-	name = "Privacy Shutters";
-	pixel_x = -5;
-	pixel_y = 8;
-	req_access_txt = "200"
-	},
-/obj/structure/machinery/door_control{
-	id = "RoomDivider";
-	name = "Room Divider";
-	pixel_x = -5;
-	pixel_y = -4;
-	req_access_txt = "200"
+"udb" = (
+/obj/structure/sign/safety/ammunition{
+	pixel_y = 32
 	},
-/obj/structure/surface/table/woodentable/fancy,
-/obj/structure/machinery/door_control{
-	id = "cl_evac";
-	name = "Evac Pod Door Control";
-	normaldoorcontrol = 1;
-	pixel_x = -5;
-	pixel_y = 2;
-	req_access_txt = "200"
+/obj/structure/closet/secure_closet/guncabinet/red/armory_m4a3_pistol,
+/turf/open/floor/almayer{
+	icon_state = "redfull"
 	},
-/turf/open/floor/carpet,
-/area/almayer/command/corporateliason)
+/area/almayer/medical/upper_medical)
 "udi" = (
 /turf/open/floor/almayer{
 	icon_state = "red"
@@ -70381,6 +70455,15 @@
 	icon_state = "test_floor4"
 	},
 /area/almayer/shipboard/brig/evidence_storage)
+"ueD" = (
+/obj/structure/machinery/light,
+/obj/structure/machinery/cm_vending/gear/commanding_officer{
+	pixel_y = 0
+	},
+/turf/open/floor/almayer{
+	icon_state = "cargo"
+	},
+/area/almayer/living/commandbunks)
 "ueG" = (
 /obj/item/bedsheet/orange,
 /obj/structure/bed{
@@ -70447,12 +70530,16 @@
 	icon_state = "cargo"
 	},
 /area/almayer/squads/req)
-"ufL" = (
-/obj/structure/machinery/door/poddoor/shutters/almayer/uniform_vendors,
+"ufS" = (
+/obj/structure/sign/safety/terminal{
+	pixel_x = 7;
+	pixel_y = 29
+	},
+/obj/structure/filingcabinet,
 /turf/open/floor/almayer{
-	icon_state = "test_floor4"
+	icon_state = "plate"
 	},
-/area/almayer/command/cic)
+/area/almayer/command/combat_correspondent)
 "ugs" = (
 /obj/structure/surface/table/almayer,
 /obj/item/book/manual/marine_law{
@@ -70728,6 +70815,19 @@
 	icon_state = "mono"
 	},
 /area/almayer/medical/upper_medical)
+"umR" = (
+/obj/structure/machinery/power/apc/almayer/hardened{
+	cell_type = /obj/item/cell/hyper;
+	dir = 1
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "NW-out";
+	pixel_y = 1
+	},
+/turf/open/floor/almayer{
+	icon_state = "mono"
+	},
+/area/almayer/lifeboat_pumps/north2)
 "umS" = (
 /obj/structure/bed/chair/comfy{
 	dir = 8
@@ -70745,6 +70845,17 @@
 	icon_state = "test_floor4"
 	},
 /area/almayer/hull/lower_hull/l_f_p)
+"umY" = (
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 4
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "NW-out";
+	pixel_x = -1;
+	pixel_y = 2
+	},
+/turf/open/floor/plating/plating_catwalk,
+/area/almayer/hull/upper_hull/u_f_s)
 "unh" = (
 /obj/structure/surface/table/almayer,
 /obj/item/storage/firstaid/o2,
@@ -70795,6 +70906,40 @@
 	icon_state = "sterile_green_side"
 	},
 /area/almayer/medical/lower_medical_medbay)
+"uoh" = (
+/obj/structure/window/reinforced{
+	dir = 4;
+	pixel_x = -2;
+	pixel_y = 4
+	},
+/obj/structure/window/reinforced{
+	dir = 8;
+	layer = 3.3;
+	pixel_y = 4
+	},
+/obj/structure/bed{
+	can_buckle = 0
+	},
+/obj/structure/bed{
+	buckling_y = 13;
+	layer = 3.5;
+	pixel_y = 13
+	},
+/obj/item/bedsheet/yellow{
+	layer = 3.2
+	},
+/obj/item/bedsheet/yellow{
+	pixel_y = 13
+	},
+/obj/structure/sign/safety/bathunisex{
+	pixel_x = -16;
+	pixel_y = 8
+	},
+/obj/item/toy/plush/barricade,
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/living/port_emb)
 "uoi" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "S"
@@ -71039,6 +71184,27 @@
 	icon_state = "cargo"
 	},
 /area/almayer/engineering/upper_engineering)
+"utw" = (
+/obj/structure/surface/table/woodentable/fancy,
+/obj/item/reagent_container/food/drinks/bottle/whiskey{
+	pixel_x = -5;
+	pixel_y = 16
+	},
+/obj/item/reagent_container/food/drinks/bottle/whiskey{
+	desc = "A premium double-malt whiskey, this bottle was gifted to the Captain of the USS Almayer after the completion of the ship's space trials by the VADM. himself.";
+	pixel_x = 3;
+	pixel_y = 16
+	},
+/obj/item/reagent_container/food/drinks/bottle/whiskey{
+	pixel_x = 11;
+	pixel_y = 16
+	},
+/obj/item/storage/box/drinkingglasses{
+	pixel_x = -1;
+	pixel_y = 2
+	},
+/turf/open/floor/wood/ship,
+/area/almayer/living/commandbunks)
 "utK" = (
 /obj/structure/machinery/light{
 	dir = 4
@@ -71150,24 +71316,14 @@
 	},
 /turf/open/floor/wood/ship,
 /area/almayer/living/basketball)
-"uva" = (
-/obj/structure/surface/table/almayer,
-/obj/effect/landmark/map_item{
-	pixel_x = -8
-	},
-/obj/item/toy/plush/therapy/red{
-	desc = "A USCM approved plush doll. It's not soft and hardly comforting!";
-	force = 15;
-	layer = 4.1;
-	name = "Sergeant Huggs";
-	pixel_x = 7;
-	pixel_y = -1;
-	throwforce = 15
+"uvk" = (
+/obj/effect/decal/warning_stripes{
+	icon_state = "S"
 	},
 /turf/open/floor/almayer{
-	icon_state = "plate"
+	icon_state = "orange"
 	},
-/area/almayer/living/briefing)
+/area/almayer/engineering/upper_engineering/starboard)
 "uvs" = (
 /obj/structure/machinery/conveyor{
 	id = "lower_garbage"
@@ -71450,16 +71606,6 @@
 	icon_state = "red"
 	},
 /area/almayer/shipboard/port_missiles)
-"uAl" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "N";
-	pixel_y = 1
-	},
-/turf/open/floor/almayer{
-	dir = 1;
-	icon_state = "orange"
-	},
-/area/almayer/engineering/upper_engineering/port)
 "uAs" = (
 /obj/structure/machinery/light/small{
 	dir = 1
@@ -71498,12 +71644,6 @@
 	icon_state = "emerald"
 	},
 /area/almayer/living/port_emb)
-"uAL" = (
-/obj/structure/bed/chair/wood/normal,
-/obj/item/bedsheet/brown,
-/obj/item/toy/plush/farwa,
-/turf/open/floor/wood/ship,
-/area/almayer/shipboard/brig/cells)
 "uAW" = (
 /obj/structure/machinery/cryopod{
 	layer = 3.1;
@@ -71543,12 +71683,6 @@
 	icon_state = "orange"
 	},
 /area/almayer/hallways/stern_hallway)
-"uBM" = (
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 5
-	},
-/turf/open/floor/plating/plating_catwalk,
-/area/almayer/command/combat_correspondent)
 "uBN" = (
 /obj/structure/disposalpipe/trunk{
 	dir = 8
@@ -71728,6 +71862,12 @@
 	icon_state = "plate"
 	},
 /area/almayer/hallways/port_hallway)
+"uGa" = (
+/obj/structure/closet/emcloset,
+/turf/open/floor/almayer{
+	icon_state = "cargo"
+	},
+/area/almayer/lifeboat_pumps/south2)
 "uGc" = (
 /obj/structure/machinery/suit_storage_unit/compression_suit/uscm,
 /obj/structure/sign/safety/hazard{
@@ -72201,19 +72341,6 @@
 	icon_state = "plate"
 	},
 /area/almayer/engineering/engineering_workshop/hangar)
-"uRs" = (
-/obj/structure/machinery/light{
-	dir = 8
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "N";
-	pixel_y = 1
-	},
-/turf/open/floor/almayer{
-	dir = 9;
-	icon_state = "red"
-	},
-/area/almayer/command/lifeboat)
 "uRt" = (
 /obj/structure/machinery/light{
 	dir = 8
@@ -72408,6 +72535,16 @@
 	icon_state = "red"
 	},
 /area/almayer/shipboard/brig/processing)
+"uUV" = (
+/obj/structure/machinery/shower,
+/obj/structure/window/reinforced/tinted{
+	dir = 8
+	},
+/obj/structure/machinery/door/window/tinted{
+	dir = 2
+	},
+/turf/open/floor/plating/plating_catwalk,
+/area/almayer/engineering/upper_engineering/port)
 "uVb" = (
 /obj/structure/closet/toolcloset,
 /turf/open/floor/almayer{
@@ -72573,16 +72710,6 @@
 	icon_state = "sterile_green_side"
 	},
 /area/almayer/medical/lower_medical_lobby)
-"uYd" = (
-/obj/structure/flora/pottedplant{
-	icon_state = "pottedplant_22";
-	pixel_y = 12
-	},
-/obj/structure/surface/table/almayer,
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/almayer/command/lifeboat)
 "uYg" = (
 /obj/structure/pipes/standard/simple/hidden/supply,
 /turf/open/floor/almayer,
@@ -72610,16 +72737,6 @@
 /obj/structure/window/framed/almayer,
 /turf/open/floor/plating,
 /area/almayer/hallways/repair_bay)
-"uZY" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "S"
-	},
-/obj/structure/machinery/light/small{
-	dir = 1
-	},
-/obj/structure/closet/secure_closet/guncabinet/blue/riot_control,
-/turf/open/floor/plating/almayer,
-/area/almayer/shipboard/brig/armory)
 "uZZ" = (
 /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{
 	name = "\improper Basketball Court"
@@ -72638,6 +72755,15 @@
 	},
 /turf/closed/wall/almayer,
 /area/almayer/hallways/starboard_umbilical)
+"vba" = (
+/obj/effect/decal/warning_stripes{
+	icon_state = "N";
+	pixel_y = 2
+	},
+/turf/open/floor/almayer{
+	icon_state = "dark_sterile"
+	},
+/area/almayer/engineering/upper_engineering/port)
 "vbf" = (
 /obj/structure/machinery/landinglight/ds2/delaytwo{
 	dir = 8
@@ -72667,23 +72793,6 @@
 	icon_state = "orange"
 	},
 /area/almayer/squads/bravo)
-"vbP" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "NW-out";
-	pixel_y = 2
-	},
-/turf/open/floor/almayer,
-/area/almayer/hull/upper_hull/u_f_p)
-"vbR" = (
-/obj/structure/window/framed/almayer,
-/obj/structure/machinery/door/firedoor/border_only/almayer{
-	dir = 1
-	},
-/turf/open/floor/almayer{
-	dir = 5;
-	icon_state = "green"
-	},
-/area/almayer/squads/req)
 "vbS" = (
 /obj/structure/closet/secure_closet/personal/patient{
 	name = "morgue closet"
@@ -73162,16 +73271,6 @@
 	icon_state = "red"
 	},
 /area/almayer/lifeboat_pumps/south1)
-"vjd" = (
-/obj/structure/machinery/door/firedoor/border_only/almayer,
-/obj/effect/decal/warning_stripes{
-	icon_state = "NW-out";
-	pixel_y = 1
-	},
-/turf/open/floor/almayer{
-	icon_state = "test_floor4"
-	},
-/area/almayer/command/lifeboat)
 "vjg" = (
 /obj/structure/prop/almayer/missile_tube{
 	icon_state = "missiletubesouth"
@@ -73182,6 +73281,19 @@
 	icon_state = "plating"
 	},
 /area/almayer/shipboard/port_missiles)
+"vjn" = (
+/obj/structure/flora/pottedplant{
+	icon_state = "pottedplant_21"
+	},
+/obj/structure/sign/poster/io{
+	pixel_y = 32;
+	name = "propaganda poster"
+	},
+/obj/structure/sign/safety/escapepod{
+	pixel_x = -17
+	},
+/turf/open/floor/wood/ship,
+/area/almayer/command/corporateliason)
 "vjx" = (
 /obj/structure/largecrate/random/barrel/yellow,
 /turf/open/floor/almayer{
@@ -73302,14 +73414,6 @@
 	icon_state = "orange"
 	},
 /area/almayer/shipboard/brig/processing)
-"vlk" = (
-/obj/structure/closet/emcloset,
-/obj/item/clothing/mask/gas,
-/obj/item/clothing/mask/gas,
-/turf/open/floor/almayer{
-	icon_state = "cargo"
-	},
-/area/almayer/command/lifeboat)
 "vln" = (
 /obj/structure/pipes/standard/manifold/hidden/supply{
 	dir = 4
@@ -73327,40 +73431,6 @@
 	icon_state = "redfull"
 	},
 /area/almayer/shipboard/port_missiles)
-"vlO" = (
-/obj/structure/window/reinforced{
-	dir = 4;
-	pixel_x = -2;
-	pixel_y = 4
-	},
-/obj/structure/window/reinforced{
-	dir = 8;
-	layer = 3.3;
-	pixel_y = 4
-	},
-/obj/structure/bed{
-	can_buckle = 0
-	},
-/obj/structure/bed{
-	buckling_y = 13;
-	layer = 3.5;
-	pixel_y = 13
-	},
-/obj/item/bedsheet/yellow{
-	layer = 3.2
-	},
-/obj/item/bedsheet/yellow{
-	pixel_y = 13
-	},
-/obj/structure/sign/safety/bathunisex{
-	pixel_x = -16;
-	pixel_y = 8
-	},
-/obj/item/toy/plush/barricade,
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/almayer/living/port_emb)
 "vlR" = (
 /obj/structure/machinery/light{
 	dir = 4
@@ -73496,17 +73566,6 @@
 	icon_state = "orangefull"
 	},
 /area/almayer/living/briefing)
-"vpv" = (
-/obj/structure/machinery/shower,
-/obj/structure/window/reinforced/tinted{
-	dir = 8
-	},
-/obj/structure/machinery/door/window/tinted{
-	dir = 2
-	},
-/obj/item/clothing/mask/cigarette/weed,
-/turf/open/floor/plating/plating_catwalk,
-/area/almayer/engineering/upper_engineering/port)
 "vpI" = (
 /obj/effect/landmark/start/police,
 /turf/open/floor/plating/plating_catwalk,
@@ -73699,16 +73758,6 @@
 	icon_state = "plate"
 	},
 /area/almayer/hallways/hangar)
-"vsI" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "S"
-	},
-/obj/structure/machinery/camera/autoname/almayer{
-	name = "ship-grade camera"
-	},
-/obj/structure/closet/secure_closet/guncabinet/blue/riot_control,
-/turf/open/floor/plating/almayer,
-/area/almayer/shipboard/brig/armory)
 "vsJ" = (
 /obj/structure/machinery/door/airlock/almayer/maint{
 	access_modified = 1;
@@ -73766,6 +73815,12 @@
 	icon_state = "rasputin3"
 	},
 /area/almayer/powered/agent)
+"vtt" = (
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 4
+	},
+/turf/open/floor/carpet,
+/area/almayer/living/commandbunks)
 "vtx" = (
 /obj/structure/machinery/door/airlock/almayer/generic{
 	name = "\improper Bathroom"
@@ -74233,6 +74288,14 @@
 	icon_state = "green"
 	},
 /area/almayer/shipboard/brig/cells)
+"vCz" = (
+/obj/structure/machinery/door/firedoor/border_only/almayer{
+	dir = 2
+	},
+/turf/open/floor/almayer{
+	icon_state = "test_floor4"
+	},
+/area/almayer/lifeboat_pumps/north1)
 "vCG" = (
 /obj/structure/toilet{
 	dir = 8
@@ -74257,14 +74320,6 @@
 	icon_state = "sterile_green_side"
 	},
 /area/almayer/medical/hydroponics)
-"vEf" = (
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 10
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/almayer/command/combat_correspondent)
 "vEj" = (
 /obj/structure/prop/invuln/overhead_pipe{
 	pixel_x = 12
@@ -74395,6 +74450,16 @@
 /obj/structure/disposalpipe/segment,
 /turf/open/floor/almayer,
 /area/almayer/living/port_emb)
+"vHl" = (
+/obj/structure/machinery/door/firedoor/border_only/almayer,
+/obj/effect/decal/warning_stripes{
+	icon_state = "NW-out";
+	pixel_y = 1
+	},
+/turf/open/floor/almayer{
+	icon_state = "test_floor4"
+	},
+/area/almayer/command/lifeboat)
 "vHq" = (
 /obj/item/device/assembly/mousetrap/armed,
 /obj/structure/pipes/standard/manifold/hidden/supply{
@@ -74712,6 +74777,14 @@
 	},
 /turf/open/floor/almayer,
 /area/almayer/hallways/port_hallway)
+"vMC" = (
+/obj/structure/bed/chair/office/dark{
+	dir = 8
+	},
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/command/combat_correspondent)
 "vME" = (
 /turf/open/floor/almayer{
 	dir = 9;
@@ -75109,14 +75182,6 @@
 /obj/structure/machinery/light/small,
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/hull/lower_hull/l_m_s)
-"vUk" = (
-/obj/item/storage/toolbox/mechanical{
-	pixel_y = 13
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/almayer/hull/upper_hull/u_m_s)
 "vUI" = (
 /obj/structure/largecrate/random/barrel/white,
 /obj/structure/sign/safety/security{
@@ -75183,13 +75248,6 @@
 	icon_state = "sterile_green"
 	},
 /area/almayer/medical/containment)
-"vVu" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "N";
-	pixel_y = 1
-	},
-/turf/open/floor/almayer,
-/area/almayer/command/lifeboat)
 "vVw" = (
 /turf/open/floor/almayer{
 	icon_state = "plate"
@@ -75292,27 +75350,6 @@
 	},
 /turf/open/floor/almayer,
 /area/almayer/squads/charlie_delta_shared)
-"vWG" = (
-/obj/structure/pipes/vents/pump,
-/obj/item/tool/soap,
-/obj/effect/decal/cleanable/blood,
-/obj/effect/decal/warning_stripes{
-	icon_state = "W"
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "E";
-	pixel_x = 1
-	},
-/obj/structure/sink{
-	pixel_y = 24
-	},
-/obj/structure/mirror{
-	pixel_y = 32
-	},
-/turf/open/floor/almayer{
-	icon_state = "dark_sterile"
-	},
-/area/almayer/shipboard/brig/cells)
 "vWJ" = (
 /obj/structure/machinery/landinglight/ds1/delaytwo{
 	dir = 4
@@ -75475,6 +75512,16 @@
 	icon_state = "plate"
 	},
 /area/almayer/hull/lower_hull)
+"vZJ" = (
+/obj/structure/sign/safety/intercom{
+	pixel_x = 8;
+	pixel_y = 32
+	},
+/obj/structure/closet/secure_closet/guncabinet/red/armory_m39_submachinegun,
+/turf/open/floor/almayer{
+	icon_state = "redfull"
+	},
+/area/almayer/medical/upper_medical)
 "wan" = (
 /obj/structure/surface/table/almayer,
 /obj/item/facepaint/brown,
@@ -75552,6 +75599,40 @@
 	icon_state = "mono"
 	},
 /area/almayer/living/pilotbunks)
+"wbw" = (
+/obj/structure/surface/table/woodentable/fancy,
+/obj/structure/machinery/light{
+	dir = 8
+	},
+/obj/item/clothing/mask/cigarette/pipe{
+	pixel_y = -7;
+	layer = 2.8
+	},
+/obj/item/reagent_container/spray/cleaner{
+	pixel_x = -4;
+	pixel_y = 7;
+	layer = 3.04
+	},
+/obj/structure/machinery/door_control/brbutton{
+	pixel_y = 26;
+	pixel_x = -12;
+	id = "Brig Lockdown Shutters";
+	name = "Brig Lockdown"
+	},
+/obj/structure/machinery/door_control/brbutton{
+	pixel_y = 26;
+	id = "ARES StairsLock";
+	name = "ARES Exterior Lockdown Override";
+	pixel_x = -2
+	},
+/obj/structure/machinery/door_control/brbutton{
+	pixel_y = 26;
+	pixel_x = 8;
+	name = "ARES Emergency Lockdown Override";
+	id = "ARES Emergency"
+	},
+/turf/open/floor/wood/ship,
+/area/almayer/living/commandbunks)
 "wbx" = (
 /obj/structure/sign/safety/hazard{
 	desc = "A sign that warns of a hazardous environment nearby";
@@ -75687,6 +75768,15 @@
 	icon_state = "red"
 	},
 /area/almayer/shipboard/brig/main_office)
+"wdv" = (
+/obj/structure/machinery/light{
+	dir = 4
+	},
+/obj/structure/closet/secure_closet/guncabinet/red/armory_shotgun,
+/turf/open/floor/almayer{
+	icon_state = "redfull"
+	},
+/area/almayer/engineering/upper_engineering)
 "wdz" = (
 /obj/effect/landmark/start/marine/engineer/charlie,
 /obj/effect/landmark/late_join/charlie,
@@ -75765,6 +75855,27 @@
 	icon_state = "plate"
 	},
 /area/almayer/hull/upper_hull/u_m_p)
+"wfd" = (
+/obj/structure/surface/table/woodentable/fancy,
+/obj/item/tool/stamp/hop{
+	name = "Commanding Officer's rubber stamp";
+	pixel_x = -5;
+	pixel_y = 9
+	},
+/obj/item/paper_bin/uscm{
+	pixel_y = 6;
+	pixel_x = 7
+	},
+/obj/item/tool/pen/red/clicky{
+	pixel_x = -6;
+	pixel_y = 3
+	},
+/obj/item/tool/pen/blue/clicky{
+	pixel_x = -6;
+	pixel_y = -3
+	},
+/turf/open/floor/wood/ship,
+/area/almayer/living/commandbunks)
 "wft" = (
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 4
@@ -75913,6 +76024,19 @@
 	icon_state = "mono"
 	},
 /area/almayer/lifeboat_pumps/south1)
+"wiF" = (
+/obj/structure/machinery/light{
+	dir = 1
+	},
+/obj/structure/machinery/photocopier{
+	anchored = 0
+	},
+/obj/structure/sign/poster/io{
+	pixel_y = 32;
+	name = "propaganda poster"
+	},
+/turf/open/floor/wood/ship,
+/area/almayer/command/corporateliason)
 "wiG" = (
 /obj/structure/sign/poster{
 	pixel_x = -30;
@@ -76021,12 +76145,6 @@
 	icon_state = "test_floor4"
 	},
 /area/almayer/medical/medical_science)
-"wkA" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "SE-out"
-	},
-/turf/open/floor/almayer,
-/area/almayer/command/lifeboat)
 "wkH" = (
 /obj/structure/surface/table/reinforced/almayer_B,
 /obj/item/device/whistle{
@@ -76039,17 +76157,6 @@
 	icon_state = "bluefull"
 	},
 /area/almayer/command/cichallway)
-"wkL" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/closet/secure_closet/guncabinet,
-/obj/item/weapon/gun/rifle/l42a{
-	pixel_y = 6
-	},
-/obj/item/weapon/gun/rifle/l42a,
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/almayer/hull/upper_hull/u_m_s)
 "wkM" = (
 /obj/structure/machinery/door/poddoor/shutters/almayer{
 	id = "ARES StairsLower";
@@ -76291,6 +76398,13 @@
 	icon_state = "rasputin3"
 	},
 /area/almayer/powered/agent)
+"wpj" = (
+/obj/effect/decal/warning_stripes{
+	icon_state = "E";
+	pixel_x = 2
+	},
+/turf/open/floor/almayer,
+/area/almayer/hull/upper_hull/u_f_p)
 "wpw" = (
 /obj/structure/bed/chair/comfy/ares{
 	dir = 1
@@ -76344,16 +76458,6 @@
 	},
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/hallways/stern_hallway)
-"wqr" = (
-/obj/structure/sign/safety/terminal{
-	pixel_x = 7;
-	pixel_y = 29
-	},
-/obj/structure/filingcabinet,
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/almayer/command/combat_correspondent)
 "wqu" = (
 /obj/structure/window/framed/almayer,
 /turf/open/floor/plating,
@@ -76541,18 +76645,6 @@
 /obj/item/reagent_container/food/snacks/sliceable/pizza/vegetablepizza,
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/hull/lower_hull/l_m_p)
-"wuT" = (
-/obj/structure/machinery/light/small{
-	dir = 8
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "S"
-	},
-/turf/open/floor/almayer{
-	dir = 10;
-	icon_state = "orange"
-	},
-/area/almayer/engineering/upper_engineering/starboard)
 "wvb" = (
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 4
@@ -76729,6 +76821,18 @@
 	icon_state = "bluefull"
 	},
 /area/almayer/command/cichallway)
+"wyv" = (
+/obj/structure/machinery/door_control{
+	id = "ARES JoeCryo";
+	name = "Working Joe Cryogenics Lockdown";
+	pixel_x = -24;
+	pixel_y = -8;
+	req_one_access_txt = "91;92"
+	},
+/obj/effect/landmark/late_join/working_joe,
+/obj/effect/landmark/start/working_joe,
+/turf/open/floor/plating/plating_catwalk,
+/area/almayer/command/airoom)
 "wyO" = (
 /obj/structure/largecrate/random/barrel/red,
 /obj/structure/prop/invuln/overhead_pipe{
@@ -76780,6 +76884,13 @@
 	icon_state = "sterile_green"
 	},
 /area/almayer/medical/lower_medical_medbay)
+"wAd" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/machinery/light{
+	dir = 8
+	},
+/turf/open/floor/almayer,
+/area/almayer/hull/upper_hull/u_f_p)
 "wAR" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "E";
@@ -77013,18 +77124,6 @@
 	},
 /turf/open/floor/almayer,
 /area/almayer/hallways/hangar)
-"wFJ" = (
-/obj/structure/toilet{
-	dir = 8;
-	pixel_y = 8;
-	layer = 2.9
-	},
-/obj/structure/window{
-	pixel_y = -2;
-	layer = 2.95
-	},
-/turf/open/floor/plating/plating_catwalk,
-/area/almayer/living/commandbunks)
 "wFR" = (
 /turf/open/floor/almayer,
 /area/almayer/living/gym)
@@ -77065,13 +77164,6 @@
 /obj/effect/landmark/late_join/delta,
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/squads/delta)
-"wGI" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/machinery/light{
-	dir = 8
-	},
-/turf/open/floor/almayer,
-/area/almayer/hull/upper_hull/u_f_p)
 "wGX" = (
 /obj/structure/pipes/standard/manifold/hidden/supply{
 	dir = 1
@@ -77178,12 +77270,6 @@
 	icon_state = "plate"
 	},
 /area/almayer/hallways/vehiclehangar)
-"wJB" = (
-/obj/structure/machinery/cryopod/right,
-/turf/open/floor/almayer{
-	icon_state = "cargo"
-	},
-/area/almayer/command/airoom)
 "wJD" = (
 /obj/structure/bed/chair{
 	dir = 8;
@@ -77205,23 +77291,6 @@
 "wJH" = (
 /turf/closed/wall/almayer/research/containment/wall/east,
 /area/almayer/medical/containment/cell/cl)
-"wJQ" = (
-/obj/item/trash/plate{
-	pixel_x = 9;
-	pixel_y = 11
-	},
-/obj/item/reagent_container/food/snacks/carpmeat{
-	layer = 3.3;
-	pixel_y = 11;
-	pixel_x = 8
-	},
-/obj/item/reagent_container/food/snacks/carpmeat{
-	layer = 3.3;
-	pixel_y = 11;
-	pixel_x = 8
-	},
-/turf/open/floor/carpet,
-/area/almayer/living/commandbunks)
 "wKn" = (
 /obj/structure/surface/rack,
 /obj/item/facepaint/sniper,
@@ -77253,6 +77322,15 @@
 	},
 /turf/open/floor/plating,
 /area/almayer/medical/containment)
+"wKS" = (
+/obj/effect/decal/warning_stripes{
+	icon_state = "S"
+	},
+/turf/open/floor/almayer{
+	dir = 6;
+	icon_state = "red"
+	},
+/area/almayer/command/lifeboat)
 "wLi" = (
 /obj/structure/machinery/door_control/airlock{
 	id = "s_engi";
@@ -77365,14 +77443,6 @@
 	icon_state = "plate"
 	},
 /area/almayer/hull/upper_hull/u_a_s)
-"wMv" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "W"
-	},
-/turf/open/floor/almayer{
-	icon_state = "dark_sterile"
-	},
-/area/almayer/living/auxiliary_officer_office)
 "wMG" = (
 /obj/structure/machinery/cryopod/right{
 	pixel_y = 6
@@ -77422,14 +77492,6 @@
 	icon_state = "plate"
 	},
 /area/almayer/hull/lower_hull)
-"wNS" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "S"
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/almayer/command/lifeboat)
 "wNT" = (
 /obj/structure/platform,
 /turf/open/floor/almayer,
@@ -77511,6 +77573,16 @@
 	icon_state = "bluefull"
 	},
 /area/almayer/command/cichallway)
+"wQa" = (
+/obj/structure/sign/safety/hazard{
+	pixel_x = 15;
+	pixel_y = 32
+	},
+/obj/structure/closet/secure_closet/guncabinet/red/armory_m4a3_pistol,
+/turf/open/floor/almayer{
+	icon_state = "redfull"
+	},
+/area/almayer/medical/upper_medical)
 "wQg" = (
 /turf/open/floor/almayer{
 	dir = 1;
@@ -77772,17 +77844,6 @@
 "wVb" = (
 /turf/closed/wall/almayer/outer,
 /area/almayer/hull/lower_hull/l_a_s)
-"wVw" = (
-/obj/structure/machinery/light/small{
-	dir = 8
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "N";
-	pixel_y = 2
-	},
-/obj/structure/closet/secure_closet/guncabinet/red/mp_armory_m39_submachinegun,
-/turf/open/floor/plating/almayer,
-/area/almayer/shipboard/brig/armory)
 "wVy" = (
 /obj/structure/window/reinforced{
 	dir = 8
@@ -77894,6 +77955,22 @@
 	icon_state = "blue"
 	},
 /area/almayer/living/pilotbunks)
+"wWJ" = (
+/obj/structure/machinery/light{
+	dir = 8
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "N";
+	pixel_y = 1
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "S";
+	pixel_y = -1
+	},
+/turf/open/floor/almayer{
+	icon_state = "dark_sterile"
+	},
+/area/almayer/living/port_emb)
 "wWL" = (
 /obj/item/tool/screwdriver,
 /obj/structure/platform_decoration{
@@ -78013,18 +78090,14 @@
 /turf/open/floor/plating,
 /area/almayer/engineering/ce_room)
 "wYZ" = (
-/obj/structure/machinery/light{
-	dir = 1
-	},
-/obj/structure/machinery/photocopier{
-	anchored = 0
+/obj/structure/machinery/door/airlock/almayer/secure/reinforced{
+	name = "\improper Armourer's Workshop";
+	req_access = null
 	},
-/obj/structure/sign/poster/io{
-	pixel_y = 32;
-	name = "propaganda poster"
+/turf/open/floor/almayer{
+	icon_state = "test_floor4"
 	},
-/turf/open/floor/wood/ship,
-/area/almayer/command/corporateliason)
+/area/almayer/hull/upper_hull/u_m_s)
 "wZa" = (
 /turf/open/floor/almayer{
 	icon_state = "redcorner"
@@ -78273,22 +78346,20 @@
 	icon_state = "tcomms"
 	},
 /area/almayer/engineering/engine_core)
-"xfk" = (
-/obj/structure/surface/rack,
-/obj/item/stack/cable_coil,
-/obj/item/attachable/flashlight/grip,
-/obj/item/ammo_box/magazine/l42a{
-	pixel_y = 14
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/almayer/hull/upper_hull/u_m_s)
 "xfm" = (
 /obj/structure/pipes/standard/simple/hidden/supply,
 /obj/structure/window/framed/almayer,
 /turf/open/floor/plating,
 /area/almayer/living/cafeteria_officer)
+"xfw" = (
+/obj/structure/surface/table/almayer,
+/obj/item/storage/fancy/cigarettes/lucky_strikes,
+/obj/item/packageWrap,
+/turf/open/floor/almayer{
+	dir = 9;
+	icon_state = "green"
+	},
+/area/almayer/squads/req)
 "xfO" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "E";
@@ -78357,6 +78428,16 @@
 	icon_state = "plating"
 	},
 /area/almayer/hallways/vehiclehangar)
+"xgE" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/item/storage/toolbox/mechanical{
+	pixel_x = 4;
+	pixel_y = -3
+	},
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/hull/upper_hull/u_m_s)
 "xgJ" = (
 /obj/structure/machinery/cm_vending/sorted/medical/blood,
 /obj/structure/machinery/light{
@@ -78450,14 +78531,6 @@
 	},
 /turf/open/floor/carpet,
 /area/almayer/command/cichallway)
-"xik" = (
-/obj/structure/machinery/shower{
-	dir = 8
-	},
-/obj/item/toy/inflatable_duck,
-/obj/structure/window/reinforced,
-/turf/open/floor/plating/plating_catwalk,
-/area/almayer/shipboard/brig/cells)
 "xiz" = (
 /obj/structure/prop/invuln/lattice_prop{
 	icon_state = "lattice12";
@@ -78485,14 +78558,18 @@
 	icon_state = "kitchen"
 	},
 /area/almayer/living/grunt_rnr)
-"xjt" = (
-/obj/structure/surface/table/woodentable/fancy,
-/obj/structure/machinery/computer/card{
-	dir = 4;
-	pixel_x = 2
+"xjw" = (
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 4
 	},
-/turf/open/floor/carpet,
-/area/almayer/living/commandbunks)
+/obj/effect/decal/warning_stripes{
+	icon_state = "N";
+	pixel_y = 2
+	},
+/turf/open/floor/almayer{
+	icon_state = "dark_sterile"
+	},
+/area/almayer/engineering/upper_engineering/port)
 "xjz" = (
 /turf/open/floor/almayer{
 	icon_state = "plating_striped"
@@ -78671,32 +78748,16 @@
 	icon_state = "test_floor4"
 	},
 /area/almayer/hull/lower_hull/l_a_p)
-"xns" = (
-/obj/structure/machinery/door_control{
-	id = "ARES JoeCryo";
-	name = "Working Joe Cryogenics Lockdown";
-	pixel_x = -24;
-	pixel_y = -8;
-	req_one_access_txt = "91;92"
-	},
-/obj/effect/landmark/late_join/working_joe,
-/obj/effect/landmark/start/working_joe,
-/turf/open/floor/plating/plating_catwalk,
-/area/almayer/command/airoom)
-"xnz" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "N";
-	pixel_y = 1
-	},
-/turf/open/floor/almayer{
-	dir = 5;
-	icon_state = "red"
-	},
-/area/almayer/command/lifeboat)
 "xnI" = (
 /obj/effect/landmark/start/requisition,
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/squads/req)
+"xnQ" = (
+/obj/structure/closet/secure_closet/fridge/meat/stock,
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/living/grunt_rnr)
 "xnR" = (
 /obj/structure/machinery/door/airlock/almayer/maint{
 	dir = 1;
@@ -78749,20 +78810,6 @@
 	icon_state = "orange"
 	},
 /area/almayer/engineering/upper_engineering/port)
-"xoS" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "N";
-	pixel_y = 2
-	},
-/obj/structure/reagent_dispensers/peppertank{
-	pixel_y = -30
-	},
-/obj/structure/closet/secure_closet/guncabinet/red/mp_armory_m4ra_rifle,
-/turf/open/floor/almayer{
-	dir = 5;
-	icon_state = "plating"
-	},
-/area/almayer/shipboard/brig/armory)
 "xpd" = (
 /obj/structure/disposalpipe/segment,
 /obj/structure/pipes/standard/manifold/hidden/supply{
@@ -78780,23 +78827,6 @@
 	icon_state = "plate"
 	},
 /area/almayer/hull/lower_hull/l_f_p)
-"xpi" = (
-/obj/structure/sink{
-	dir = 8;
-	pixel_x = -12;
-	pixel_y = 2
-	},
-/obj/structure/mirror{
-	pixel_x = -29
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "E";
-	pixel_x = 1
-	},
-/turf/open/floor/almayer{
-	icon_state = "dark_sterile"
-	},
-/area/almayer/living/commandbunks)
 "xpo" = (
 /obj/structure/machinery/light,
 /turf/open/floor/almayer{
@@ -78908,14 +78938,6 @@
 	icon_state = "plate"
 	},
 /area/almayer/shipboard/brig/perma)
-"xrq" = (
-/obj/structure/closet/firecloset,
-/obj/item/clothing/mask/gas,
-/obj/item/clothing/mask/gas,
-/turf/open/floor/almayer{
-	icon_state = "cargo"
-	},
-/area/almayer/command/lifeboat)
 "xrr" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -78966,6 +78988,12 @@
 	icon_state = "cargo"
 	},
 /area/almayer/hallways/vehiclehangar)
+"xtg" = (
+/obj/structure/machinery/cm_vending/clothing/staff_officer_armory,
+/turf/open/floor/almayer{
+	icon_state = "redfull"
+	},
+/area/almayer/command/cic)
 "xtD" = (
 /obj/structure/surface/table/almayer,
 /obj/item/tool/weldpack,
@@ -78983,36 +79011,17 @@
 	icon_state = "sterile_green_side"
 	},
 /area/almayer/medical/lower_medical_lobby)
-"xtQ" = (
-/obj/structure/surface/rack,
-/obj/item/ammo_magazine/rifle/l42a/ap{
-	current_rounds = 0;
-	pixel_x = -6;
-	pixel_y = 7
-	},
-/obj/item/ammo_magazine/rifle/l42a/ap{
-	current_rounds = 0;
-	pixel_x = -6;
-	pixel_y = -3
-	},
-/obj/item/ammo_magazine/rifle/l42a/ap{
-	current_rounds = 0;
-	pixel_x = 5;
-	pixel_y = 9
-	},
-/obj/item/ammo_magazine/rifle/l42a/ap{
-	current_rounds = 0;
-	pixel_x = 5;
-	pixel_y = -3
-	},
-/obj/structure/noticeboard{
-	desc = "The note is haphazardly attached to the cork board by what looks like a bent firing pin. 'The order has come in to perform end of life service checks on all L42A service rifles, any that are defective are to be dis-assembled and packed into a crate and sent to to the cargo hold. L42A service rifles that are in working order after servicing, are to be locked in secure cabinets ready to be off-loaded at Chinook. Scheduled end of life service for the L42A -  Complete'";
-	pixel_y = 29
+"xub" = (
+/obj/effect/decal/warning_stripes{
+	icon_state = "N";
+	pixel_y = 2
 	},
+/obj/structure/closet/secure_closet/guncabinet/red/mp_armory_m4ra_rifle,
 /turf/open/floor/almayer{
-	icon_state = "plate"
+	dir = 5;
+	icon_state = "plating"
 	},
-/area/almayer/hull/upper_hull/u_m_s)
+/area/almayer/shipboard/brig/armory)
 "xuc" = (
 /obj/structure/surface/table/almayer,
 /obj/item/tool/extinguisher,
@@ -79195,17 +79204,6 @@
 	icon_state = "test_floor4"
 	},
 /area/almayer/hallways/aft_hallway)
-"xxa" = (
-/obj/item/stack/sheet/cardboard{
-	amount = 50
-	},
-/obj/structure/surface/rack,
-/obj/item/packageWrap,
-/turf/open/floor/almayer{
-	dir = 4;
-	icon_state = "green"
-	},
-/area/almayer/squads/req)
 "xxe" = (
 /obj/structure/surface/rack,
 /obj/item/tool/crowbar,
@@ -79367,15 +79365,6 @@
 	},
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/hull/upper_hull/u_a_s)
-"xyL" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "SE-out";
-	pixel_x = 1
-	},
-/turf/open/floor/almayer{
-	icon_state = "mono"
-	},
-/area/almayer/lifeboat_pumps/south2)
 "xyY" = (
 /obj/structure/pipes/standard/simple/hidden/supply,
 /obj/effect/decal/warning_stripes{
@@ -79453,6 +79442,10 @@
 	icon_state = "green"
 	},
 /area/almayer/squads/req)
+"xAC" = (
+/obj/structure/surface/rack,
+/turf/open/floor/plating/plating_catwalk,
+/area/almayer/engineering/upper_engineering/port)
 "xAI" = (
 /obj/structure/platform{
 	dir = 1
@@ -79478,6 +79471,12 @@
 "xBe" = (
 /turf/closed/wall/almayer/reinforced,
 /area/almayer/engineering/upper_engineering)
+"xBg" = (
+/obj/structure/machinery/light{
+	dir = 4
+	},
+/turf/open/floor/wood/ship,
+/area/almayer/living/commandbunks)
 "xBn" = (
 /obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/lifeboat/blastdoor{
 	id_tag = "Boat1-D3";
@@ -79553,13 +79552,6 @@
 	icon_state = "test_floor4"
 	},
 /area/almayer/hull/upper_hull/u_m_p)
-"xDj" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "E";
-	pixel_x = 2
-	},
-/turf/open/floor/almayer,
-/area/almayer/hull/upper_hull/u_f_p)
 "xDn" = (
 /turf/open/floor/almayer{
 	dir = 1;
@@ -79857,6 +79849,12 @@
 	icon_state = "plate"
 	},
 /area/almayer/hull/lower_hull/l_f_s)
+"xJn" = (
+/obj/structure/closet/emcloset,
+/turf/open/floor/almayer{
+	icon_state = "cargo"
+	},
+/area/almayer/engineering/upper_engineering/starboard)
 "xJC" = (
 /obj/structure/machinery/door/airlock/almayer/generic/corporate{
 	name = "Corporate Liaison's Closet"
@@ -79880,12 +79878,6 @@
 	},
 /turf/open/floor/almayer,
 /area/almayer/hallways/hangar)
-"xJT" = (
-/obj/structure/toilet{
-	dir = 4
-	},
-/turf/open/floor/plating/plating_catwalk,
-/area/almayer/shipboard/brig/cells)
 "xKM" = (
 /obj/structure/machinery/status_display{
 	pixel_x = 16;
@@ -80075,14 +80067,6 @@
 	},
 /turf/open/floor/almayer,
 /area/almayer/hallways/starboard_hallway)
-"xNL" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "NW-out";
-	pixel_x = -1;
-	pixel_y = 2
-	},
-/turf/open/floor/plating/plating_catwalk,
-/area/almayer/hallways/vehiclehangar)
 "xOL" = (
 /obj/structure/machinery/disposal,
 /obj/structure/disposalpipe/trunk,
@@ -80447,14 +80431,6 @@
 	icon_state = "plate"
 	},
 /area/almayer/hull/upper_hull/u_m_s)
-"xUV" = (
-/obj/structure/bed/chair{
-	dir = 4
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/almayer/command/combat_correspondent)
 "xVc" = (
 /obj/effect/step_trigger/clone_cleaner,
 /obj/structure/machinery/door_control{
@@ -80593,11 +80569,6 @@
 	icon_state = "mono"
 	},
 /area/almayer/medical/medical_science)
-"xYe" = (
-/obj/structure/surface/table/almayer,
-/obj/item/tool/weldingtool,
-/turf/open/floor/plating/plating_catwalk,
-/area/almayer/hull/upper_hull/u_m_s)
 "xYf" = (
 /obj/structure/machinery/cm_vending/clothing/sea,
 /turf/open/floor/almayer{
@@ -80621,15 +80592,6 @@
 	icon_state = "orange"
 	},
 /area/almayer/shipboard/brig/cells)
-"xYr" = (
-/obj/structure/machinery/light,
-/obj/structure/machinery/cm_vending/gear/commanding_officer{
-	pixel_y = 0
-	},
-/turf/open/floor/almayer{
-	icon_state = "cargo"
-	},
-/area/almayer/living/commandbunks)
 "xYB" = (
 /obj/structure/sign/safety/storage{
 	pixel_x = 8;
@@ -80663,6 +80625,13 @@
 	},
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/engineering/upper_engineering)
+"xZf" = (
+/obj/structure/machinery/light,
+/obj/structure/closet/secure_closet/guncabinet/red/cic_armory_mk1_rifle_ap,
+/turf/open/floor/almayer{
+	icon_state = "redfull"
+	},
+/area/almayer/command/cic)
 "xZI" = (
 /obj/structure/prop/invuln/lattice_prop{
 	dir = 1;
@@ -80856,6 +80825,10 @@
 	icon_state = "plate"
 	},
 /area/almayer/engineering/upper_engineering/port)
+"ydr" = (
+/obj/structure/largecrate/supply/weapons/pistols,
+/turf/open/floor/plating/plating_catwalk,
+/area/almayer/hull/upper_hull/u_m_s)
 "ydx" = (
 /obj/structure/sign/safety/hvac_old{
 	pixel_x = 8;
@@ -80953,6 +80926,16 @@
 	icon_state = "plate"
 	},
 /area/almayer/hallways/hangar)
+"yeO" = (
+/obj/structure/disposalpipe/segment{
+	dir = 4;
+	icon_state = "pipe-c"
+	},
+/obj/structure/machinery/light{
+	dir = 8
+	},
+/turf/open/floor/wood/ship,
+/area/almayer/living/commandbunks)
 "yeP" = (
 /obj/structure/sign/safety/hvac_old{
 	pixel_x = 8;
@@ -80968,18 +80951,13 @@
 	},
 /turf/open/floor/wood/ship,
 /area/almayer/shipboard/brig/chief_mp_office)
-"yff" = (
-/obj/structure/machinery/cm_vending/clothing/dress{
-	density = 0;
-	pixel_y = 16
-	},
-/obj/structure/machinery/light{
-	dir = 4
-	},
-/turf/open/floor/almayer{
-	icon_state = "cargo"
+"yeX" = (
+/obj/effect/decal/warning_stripes{
+	icon_state = "S"
 	},
-/area/almayer/command/cic)
+/obj/structure/closet/secure_closet/guncabinet/blue/riot_control,
+/turf/open/floor/plating/almayer,
+/area/almayer/shipboard/brig/armory)
 "yfm" = (
 /obj/effect/landmark/start/marine/delta,
 /obj/effect/landmark/late_join/delta,
@@ -81024,18 +81002,6 @@
 	icon_state = "plate"
 	},
 /area/almayer/hull/lower_hull/l_m_s)
-"yfG" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "S"
-	},
-/obj/structure/machinery/power/apc/almayer{
-	dir = 8
-	},
-/obj/item/storage/briefcase{
-	pixel_y = 15
-	},
-/turf/open/floor/wood/ship,
-/area/almayer/living/commandbunks)
 "yfS" = (
 /obj/structure/window/framed/almayer,
 /obj/structure/machinery/door/firedoor/border_only/almayer{
@@ -81052,6 +81018,18 @@
 	icon_state = "plate"
 	},
 /area/almayer/command/lifeboat)
+"ygs" = (
+/obj/effect/decal/warning_stripes{
+	icon_state = "NE-out";
+	pixel_y = 1
+	},
+/obj/structure/machinery/door/airlock/almayer/generic{
+	name = "\improper Bathroom"
+	},
+/turf/open/floor/almayer{
+	icon_state = "test_floor4"
+	},
+/area/almayer/living/captain_mess)
 "ygy" = (
 /obj/structure/machinery/light/small{
 	dir = 1
@@ -81067,6 +81045,16 @@
 	icon_state = "plate"
 	},
 /area/almayer/hull/lower_hull/l_m_s)
+"ygM" = (
+/obj/structure/sign/safety/ammunition{
+	pixel_x = 32;
+	pixel_y = 7
+	},
+/obj/structure/closet/secure_closet/guncabinet/red/armory_shotgun,
+/turf/open/floor/almayer{
+	icon_state = "redfull"
+	},
+/area/almayer/medical/upper_medical)
 "yhI" = (
 /turf/open/floor/almayer{
 	dir = 4;
@@ -81114,6 +81102,17 @@
 	},
 /turf/open/floor/almayer,
 /area/almayer/engineering/engineering_workshop/hangar)
+"yiL" = (
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 4
+	},
+/obj/item/device/radio/intercom{
+	freerange = 1;
+	name = "General Listening Channel";
+	pixel_y = -28
+	},
+/turf/open/floor/almayer,
+/area/almayer/hull/upper_hull/u_f_s)
 "yiW" = (
 /obj/structure/machinery/cryopod/right{
 	layer = 3.1;
@@ -81188,6 +81187,16 @@
 	icon_state = "cargo"
 	},
 /area/almayer/hull/lower_hull/l_m_s)
+"ykD" = (
+/obj/effect/decal/warning_stripes{
+	icon_state = "N";
+	pixel_y = 1
+	},
+/turf/open/floor/almayer{
+	dir = 5;
+	icon_state = "red"
+	},
+/area/almayer/command/lifeboat)
 "ykF" = (
 /obj/structure/machinery/cm_vending/sorted/tech/tool_storage,
 /turf/open/floor/almayer{
@@ -81238,6 +81247,12 @@
 	icon_state = "plate"
 	},
 /area/almayer/squads/delta)
+"ylg" = (
+/obj/structure/machinery/cryopod/right,
+/turf/open/floor/almayer{
+	icon_state = "cargo"
+	},
+/area/almayer/command/airoom)
 "ylJ" = (
 /obj/structure/sign/safety/maint{
 	pixel_x = 8;
@@ -89857,8 +89872,8 @@ mLJ
 eiO
 xFs
 xkd
-teE
-xJT
+eiH
+aTV
 xkd
 xkd
 xkd
@@ -90060,9 +90075,9 @@ iqn
 eRL
 tmy
 xkd
-vWG
-lJL
-dQp
+rUB
+dSn
+soa
 xzu
 xkd
 xkd
@@ -90263,8 +90278,8 @@ aJz
 dXy
 nHg
 xkd
-xik
-bjQ
+ghX
+rAv
 xkd
 eTo
 iHG
@@ -92097,7 +92112,7 @@ eZH
 ohJ
 thL
 thL
-uAL
+aHT
 liZ
 rUk
 jVa
@@ -92679,9 +92694,9 @@ pCi
 rPC
 rwS
 lrq
-kTc
+fFq
 uqo
-wVw
+rhD
 cqn
 gTx
 eRL
@@ -92882,9 +92897,9 @@ ahE
 rPC
 nfI
 lrq
-omu
+eTx
 uqo
-sYB
+hGa
 cqn
 ldu
 eRL
@@ -93085,9 +93100,9 @@ ahE
 rPC
 heV
 lrq
-frJ
+lCn
 uqo
-ktn
+xub
 cqn
 nBb
 mdS
@@ -93288,9 +93303,9 @@ ahE
 wcn
 nBc
 lrq
-vsI
+ebt
 uqo
-xoS
+lLN
 lrq
 mAT
 lrq
@@ -93491,7 +93506,7 @@ pCi
 wcn
 wcn
 lrq
-mAr
+yeX
 uqo
 fsT
 jnA
@@ -93694,7 +93709,7 @@ pCi
 oCL
 wcn
 lrq
-uZY
+ebz
 uqo
 uqo
 uqo
@@ -93897,7 +93912,7 @@ pCi
 rPC
 aou
 lrq
-mAr
+yeX
 uqo
 uvy
 tfO
@@ -94210,8 +94225,8 @@ poR
 mGL
 pNp
 kcp
-wMv
-nCR
+pNK
+bIA
 alU
 uDn
 bKf
@@ -94618,9 +94633,9 @@ bTS
 lxo
 qcy
 kcp
-kmk
-kmk
-mIJ
+edM
+edM
+mcl
 bLt
 bXX
 bKh
@@ -94821,9 +94836,9 @@ oQM
 aqI
 aqI
 kcp
-jaK
-jxP
-xNL
+pUl
+tXz
+rYZ
 bLu
 bBB
 bBB
@@ -98053,7 +98068,7 @@ aaa
 nXP
 ndx
 uNL
-nDd
+eRt
 soS
 sgy
 nsu
@@ -98256,9 +98271,9 @@ aaa
 nXP
 hJp
 uNL
-gka
+lUv
 bwQ
-oNf
+gUr
 uNL
 aNw
 kXJ
@@ -98600,7 +98615,7 @@ ukU
 bfP
 fvv
 vcK
-wGI
+wAd
 tuA
 tuA
 tuA
@@ -99614,9 +99629,9 @@ vCO
 vCO
 vCO
 jxB
-xDj
-boc
-eXS
+wpj
+gDq
+tJo
 bGr
 hnV
 xEF
@@ -99817,9 +99832,9 @@ wmT
 jhW
 mWD
 jxB
-gvW
-sWs
-imJ
+hWX
+tYv
+mRU
 xuB
 gpe
 xEF
@@ -99980,7 +99995,7 @@ aad
 aai
 aai
 pCi
-pmI
+nMM
 avl
 avl
 agj
@@ -100022,7 +100037,7 @@ aES
 aES
 aES
 aES
-vbP
+lDj
 uEv
 gpe
 xEF
@@ -100181,20 +100196,20 @@ aaa
 aaa
 aad
 ahE
-qKt
-dKa
-hdb
+iuT
+nna
+svp
 avl
 agj
 agj
-oTM
-mTc
-sLZ
-yfG
-lQi
+wbw
+npK
+hBW
+tHU
+tMu
 kcN
-twI
-ufL
+dkn
+gye
 aic
 aov
 wVW
@@ -100384,20 +100399,20 @@ aaa
 aaa
 aad
 ahE
-ooo
-uaX
-kfR
+afc
+npB
+umY
 avl
 agj
-lDD
+laG
 agc
-qfD
+aUP
 agc
-kJm
-xYr
+ktc
+ueD
 kcN
 cod
-ufL
+gye
 aic
 aov
 wVW
@@ -100590,17 +100605,17 @@ ahE
 aiV
 wBY
 hJJ
-qCi
+anl
 agj
-crw
-wJQ
+fuR
+ouT
 agc
 agc
-kJm
-rbE
+ktc
+nKs
 kcN
-yff
-ufL
+muQ
+gye
 aic
 aKq
 luZ
@@ -100793,13 +100808,13 @@ pCi
 kwS
 avl
 avl
-mRp
+yiL
 agj
-nCx
-tYM
-mqb
-kDK
-jMx
+utw
+kmY
+pSH
+mES
+lWD
 mXj
 kcN
 kcN
@@ -100998,14 +101013,14 @@ avl
 hCo
 lIh
 agj
-keT
+fiP
 hvH
-bVs
+pYp
 hvH
 hvH
-aOj
-bQl
-xpi
+iIm
+odC
+cQD
 agj
 bFA
 aov
@@ -101201,14 +101216,14 @@ avl
 hMI
 lFb
 agj
-dyj
-fnv
-bVs
-iPu
-dFb
+mcK
+xBg
+pYp
+isu
+oBW
 mXj
-wFJ
-kJW
+drp
+tqI
 agj
 aic
 aoA
@@ -101406,7 +101421,7 @@ tDx
 agj
 mXj
 mXj
-lul
+nRQ
 mXj
 mXj
 mXj
@@ -101608,12 +101623,12 @@ jgM
 lFb
 agj
 mXj
-pjR
-jND
-aKk
-aKk
-nCU
-faE
+yeO
+nQH
+lnZ
+lnZ
+pxL
+mzG
 mXj
 agj
 amI
@@ -101810,17 +101825,17 @@ avl
 jpJ
 lzH
 agj
-qlI
-cdB
-xjt
-coD
+iET
+akr
+lfT
+jNY
 agc
-ako
-tYM
-hGB
+jCn
+kmY
+rEJ
 agj
 aic
-acS
+esy
 wVW
 asQ
 awG
@@ -102013,19 +102028,19 @@ avl
 llM
 lGL
 agj
-eBE
+jPn
 hvH
 agc
-azm
+euM
 pxG
-fOv
+klG
 agc
 agc
 agj
 aic
-sxW
+cHA
 wVW
-abQ
+nww
 atN
 cEl
 sOi
@@ -102216,21 +102231,21 @@ avl
 avl
 mrc
 agj
-kSH
+huR
 hvH
-nTA
-qmZ
+gfK
+rqH
 agc
-aiW
+nnG
 xyk
 xyk
-mDX
-aTl
-dLe
+oys
+nDV
+joE
 wVW
-atx
+qyJ
 qEk
-ajm
+ksv
 wVW
 arP
 alX
@@ -102242,7 +102257,7 @@ hkG
 wVW
 fvB
 qEk
-iaa
+aGi
 wVW
 aKn
 aKz
@@ -102419,19 +102434,19 @@ pCi
 jTi
 nRq
 agj
-kVT
+wfd
 hvH
 agc
-qlp
+pJe
 pxG
-tTk
+vtt
 agc
 agc
 agj
-fXP
+lPG
 aov
 wVW
-atx
+qyJ
 qEk
 ato
 wVW
@@ -102445,7 +102460,7 @@ aEB
 wVW
 fvB
 qEk
-iaa
+aGi
 wVW
 aKn
 aKz
@@ -102622,19 +102637,19 @@ pCi
 avl
 myn
 agj
-kNq
+rfv
 hvH
 qck
-gVd
+jEX
 agc
-tan
-kDK
-iEz
+ssn
+mES
+lUw
 agj
 aic
 aov
 wVW
-ssW
+nbr
 qEk
 hrm
 wVW
@@ -102648,7 +102663,7 @@ aEC
 wVW
 dNZ
 qEk
-mje
+xZf
 wVW
 aKn
 aKz
@@ -102826,18 +102841,18 @@ cnX
 lIh
 agj
 mXj
-fnv
+xBg
 hvH
 hvH
-iNY
+bVg
 hvH
-jhB
+pJK
 mXj
 agj
 aic
 aoA
 wVW
-atx
+qyJ
 jvX
 ato
 wVW
@@ -102849,9 +102864,9 @@ alX
 aIf
 aED
 wVW
-ryR
+xtg
 jvX
-iaa
+aGi
 wVW
 aKn
 aKy
@@ -103872,7 +103887,7 @@ aJc
 ecr
 ecr
 ecr
-ohS
+ygs
 aET
 nUv
 aJU
@@ -104074,8 +104089,8 @@ cST
 aTz
 aUl
 aET
-esC
-nsQ
+aWA
+jgu
 aET
 mSi
 wHp
@@ -104273,7 +104288,7 @@ aGV
 rvA
 aKE
 awF
-jzE
+iYR
 aUw
 aUm
 aET
@@ -104648,7 +104663,7 @@ awW
 add
 add
 add
-stu
+juf
 add
 add
 add
@@ -104694,7 +104709,7 @@ baw
 aJU
 aJU
 aJU
-tBu
+hey
 aJU
 aJU
 aJU
@@ -105048,7 +105063,7 @@ bdH
 aaC
 abs
 adq
-myl
+jWH
 ajI
 add
 fsU
@@ -105106,7 +105121,7 @@ qys
 gBW
 aJU
 tiW
-qgU
+pUe
 pgD
 tQV
 aaC
@@ -105278,13 +105293,13 @@ umS
 yjM
 qbO
 aqw
-hnI
+qRL
 bYe
 amO
 wZM
 aPm
 awF
-nvG
+aHk
 vGI
 aLp
 awF
@@ -105489,7 +105504,7 @@ ejp
 awF
 aHn
 szU
-fGa
+aLt
 awF
 aRC
 aUw
@@ -105657,7 +105672,7 @@ aaa
 aaY
 abs
 adq
-tGj
+ckE
 ajI
 add
 fsU
@@ -105715,7 +105730,7 @@ qys
 gBW
 aJU
 tiW
-bpw
+hXD
 pgD
 tQV
 aaY
@@ -106069,7 +106084,7 @@ aoC
 add
 add
 add
-stu
+juf
 add
 add
 add
@@ -106115,7 +106130,7 @@ baw
 aJU
 aJU
 aJU
-nnX
+eyv
 aJU
 aJU
 aJU
@@ -106793,7 +106808,7 @@ bsk
 sxu
 cBI
 bkA
-eFG
+nuI
 bej
 arX
 vSG
@@ -106898,7 +106913,7 @@ aiX
 aiX
 aiX
 sHM
-kUh
+otK
 aiX
 aiX
 aiX
@@ -107094,7 +107109,7 @@ awW
 awW
 awW
 fSm
-hiy
+vCz
 apl
 bbL
 bbL
@@ -107297,7 +107312,7 @@ ajf
 ajf
 ajf
 oAO
-pIZ
+dlN
 aod
 qgG
 amC
@@ -107500,7 +107515,7 @@ awW
 awW
 awW
 aSJ
-isI
+dAi
 dtM
 aii
 mce
@@ -109535,7 +109550,7 @@ dtM
 akU
 ajC
 sqf
-anp
+wQa
 wjz
 fnA
 jZY
@@ -109738,7 +109753,7 @@ dtM
 aii
 ajC
 sqf
-sOZ
+udb
 oNJ
 eDo
 eDo
@@ -109941,7 +109956,7 @@ dtM
 ajt
 aik
 sqf
-anq
+eTh
 awn
 xsz
 jTj
@@ -110144,11 +110159,11 @@ dtM
 aii
 ajC
 sqf
-anr
+vZJ
 awn
 tEi
-asu
-hbI
+iWb
+ygM
 sqf
 ajl
 vtx
@@ -111895,8 +111910,8 @@ bJt
 xOL
 gGI
 eeu
-nbB
-ksA
+dqQ
+ccm
 gAz
 fiq
 uaa
@@ -112298,7 +112313,7 @@ buH
 bHL
 buH
 lhB
-nbB
+tAJ
 bDs
 bIJ
 bDs
@@ -112603,7 +112618,7 @@ kSJ
 avj
 cGr
 awE
-qkm
+vjn
 wQv
 rne
 guC
@@ -112918,7 +112933,7 @@ jFE
 jFE
 idx
 hAz
-fhQ
+hQh
 bJt
 vhI
 oed
@@ -113117,11 +113132,11 @@ vzP
 bJt
 hjB
 bJt
-dpn
+neF
 bDs
 gSk
 bDs
-pdt
+khX
 bJt
 kTq
 oed
@@ -113215,7 +113230,7 @@ awE
 bqy
 bYj
 eUR
-ucI
+gEI
 nDh
 bYj
 xne
@@ -113730,7 +113745,7 @@ rBj
 bDs
 gSk
 bDs
-oMd
+hWS
 bJt
 oDf
 uqH
@@ -113933,7 +113948,7 @@ bJt
 oKb
 gSk
 bDs
-pdt
+ign
 bJt
 sIx
 bxX
@@ -114538,7 +114553,7 @@ qBM
 wXI
 nUd
 lkd
-oMd
+xnQ
 bDs
 gSk
 oDE
@@ -115038,12 +115053,12 @@ ajr
 aii
 avm
 awE
-wYZ
+wiF
 rne
 rne
 fAo
 awE
-bhM
+knT
 wQv
 bBi
 awE
@@ -115450,7 +115465,7 @@ rne
 wft
 awE
 hpf
-qJU
+pbl
 igp
 awE
 hoX
@@ -115908,7 +115923,7 @@ kxd
 jgk
 nsY
 rSG
-rur
+wWJ
 oqS
 nsY
 lhu
@@ -116313,7 +116328,7 @@ gsg
 vHq
 vvY
 nsY
-rNb
+pPV
 bxC
 jiU
 nsY
@@ -116721,7 +116736,7 @@ wNl
 nGh
 fPp
 lqN
-vlO
+uoh
 nsY
 xCN
 pOB
@@ -117388,7 +117403,7 @@ uVh
 nsY
 kzK
 lFh
-jYc
+mus
 pVA
 mzV
 pML
@@ -117540,7 +117555,7 @@ aLf
 tRc
 qEW
 bdd
-uva
+gGo
 mLb
 wmz
 vpt
@@ -118457,7 +118472,7 @@ abg
 caF
 aar
 aar
-lIl
+wYZ
 aar
 aar
 ael
@@ -118659,10 +118674,10 @@ bWs
 abg
 caF
 aar
-vUk
+rcW
 sTB
-lUA
-tqd
+jrV
+qmr
 ael
 afE
 agT
@@ -118862,9 +118877,9 @@ acO
 aJs
 cbN
 aar
-fQY
+lDK
 aap
-elM
+eXU
 vFb
 ael
 afH
@@ -119065,10 +119080,10 @@ pNQ
 abx
 hTy
 aar
-thR
+pJn
 aao
 aao
-gDP
+erz
 ael
 afI
 agY
@@ -119268,10 +119283,10 @@ acP
 bUE
 qFQ
 aar
-xtQ
+jBY
 aap
 aao
-sxT
+mYX
 ael
 afJ
 agY
@@ -119471,10 +119486,10 @@ acG
 abx
 caF
 aar
-com
+ydr
 aap
 aao
-sxT
+mYX
 ael
 afK
 ahc
@@ -119676,7 +119691,7 @@ lCz
 aar
 tAV
 sTB
-xfk
+uck
 wKn
 ael
 afL
@@ -119877,7 +119892,7 @@ acG
 abx
 caF
 aar
-lIl
+wYZ
 aar
 aar
 aar
@@ -120082,8 +120097,8 @@ arJ
 aar
 aao
 aao
-wkL
-mts
+rOZ
+dfP
 adO
 afM
 fpR
@@ -120283,10 +120298,10 @@ jSY
 abx
 hTy
 aar
-hLB
+lAj
 aao
 aao
-laY
+xgE
 adO
 afN
 ahh
@@ -120486,10 +120501,10 @@ acP
 bUE
 qFQ
 aar
-xYe
-kZH
+jkL
+iaE
 aao
-frY
+mXa
 adO
 afO
 ahh
@@ -120689,10 +120704,10 @@ aJa
 abg
 ccf
 aar
-mko
+cRg
 uaZ
 aap
-svC
+epK
 adO
 jkj
 ahh
@@ -121621,7 +121636,7 @@ rbY
 gwD
 bOK
 bPD
-bYa
+nSj
 bPD
 jOk
 bNB
@@ -121824,7 +121839,7 @@ rbY
 bEc
 bKA
 bCA
-bQS
+gJs
 bCA
 bKA
 bEc
@@ -121902,7 +121917,7 @@ aeA
 aeC
 aeC
 aeC
-cVb
+tpt
 aeC
 aeC
 aeC
@@ -121950,7 +121965,7 @@ lJY
 vcE
 vcE
 vcE
-iTd
+oDO
 vcE
 vcE
 vcE
@@ -122237,7 +122252,7 @@ bmD
 mYv
 doP
 jac
-xxa
+isS
 cai
 bdl
 bII
@@ -122302,7 +122317,7 @@ aag
 aag
 abh
 acx
-pMk
+adQ
 ajs
 aeC
 wXh
@@ -122362,7 +122377,7 @@ eyG
 kpo
 vcE
 kUV
-xyL
+mvH
 rRq
 uOi
 aag
@@ -122504,8 +122519,8 @@ aah
 aah
 aah
 abi
-nGY
-gyU
+acE
+adZ
 ajk
 aeA
 asY
@@ -122565,8 +122580,8 @@ deg
 wLu
 lJY
 xVS
-kPH
-knL
+fqg
+uGa
 uyC
 aah
 aah
@@ -122628,7 +122643,7 @@ aYW
 bzV
 beB
 mCo
-iwZ
+xfw
 lBF
 bKA
 sbM
@@ -122643,7 +122658,7 @@ bmD
 lyk
 bOR
 eHa
-cmo
+opj
 xAB
 mCo
 bJz
@@ -122707,8 +122722,8 @@ bdH
 bdH
 bdH
 abi
-dEJ
-gyU
+acT
+adZ
 ajk
 aeA
 atp
@@ -122768,8 +122783,8 @@ pfH
 wlF
 lJY
 xVS
-kPH
-qGU
+fqg
+mIA
 uyC
 bdH
 aaa
@@ -122911,7 +122926,7 @@ aaa
 bdH
 abh
 acx
-gCB
+umR
 ajs
 aeC
 wXh
@@ -122971,7 +122986,7 @@ eyG
 kpo
 vcE
 kUV
-bxA
+pPF
 rRq
 uOi
 bdH
@@ -123323,7 +123338,7 @@ amH
 aeC
 aeC
 aeC
-cVb
+tpt
 aeC
 aeC
 aeC
@@ -123371,7 +123386,7 @@ kKR
 vcE
 vcE
 vcE
-iTd
+oDO
 vcE
 vcE
 vcE
@@ -123456,7 +123471,7 @@ bZr
 bNQ
 bNQ
 bNQ
-bGz
+ohl
 hMs
 cbw
 iEb
@@ -123659,7 +123674,7 @@ bZr
 krN
 krN
 krN
-oqY
+llt
 can
 buH
 iEb
@@ -123765,9 +123780,9 @@ alG
 anG
 apf
 oIB
-jgr
-gGp
-dMf
+tSF
+qyM
+jog
 oIB
 sFR
 vuv
@@ -123862,7 +123877,7 @@ bZr
 ibc
 uly
 bNN
-vbR
+fXt
 pky
 cbv
 cbS
@@ -123968,9 +123983,9 @@ alG
 aYD
 uPI
 oIB
-fXE
-kaS
-aiQ
+hJh
+vMC
+iUC
 oIB
 sFR
 vuv
@@ -124171,9 +124186,9 @@ sUF
 anG
 apd
 oIB
-wqr
+ufS
 bZw
-xUV
+kaJ
 oIB
 sFR
 hPo
@@ -124268,7 +124283,7 @@ bZr
 bKA
 dyx
 eYr
-bUo
+iii
 uys
 cbz
 cbU
@@ -124375,8 +124390,8 @@ aYD
 aTS
 qgK
 tEB
-uBM
-dXo
+llD
+gGl
 oIB
 lBR
 nVu
@@ -124471,7 +124486,7 @@ bmD
 bKA
 dyx
 hGN
-pVx
+ddN
 uys
 ttM
 iEb
@@ -124578,8 +124593,8 @@ anG
 mPX
 oIB
 wKF
-hzb
-ltU
+fOh
+diM
 oIB
 fbx
 cFA
@@ -124780,9 +124795,9 @@ aSC
 aZH
 iAB
 oIB
-phj
-vEf
-cNK
+gqF
+imW
+qbh
 oIB
 fbx
 cxo
@@ -124983,8 +124998,8 @@ rFY
 ctC
 gPF
 oIB
-opI
-dha
+kUb
+rJg
 pxj
 oIB
 fbx
@@ -127005,8 +127020,8 @@ auu
 aoT
 aFm
 xBe
-aIV
-qqr
+cij
+jRZ
 arH
 xBe
 alG
@@ -127413,7 +127428,7 @@ anO
 nFX
 atv
 auV
-amE
+ift
 xBe
 alG
 aDZ
@@ -127616,7 +127631,7 @@ atc
 nFX
 atv
 auV
-amE
+ift
 xBe
 alG
 aYj
@@ -128020,8 +128035,8 @@ atq
 aDr
 aFu
 xBe
-azp
-qJf
+rwT
+wdv
 anV
 xBe
 alG
@@ -131277,7 +131292,7 @@ vuv
 vuv
 jWh
 jWh
-sWC
+olk
 jWh
 jWh
 jWh
@@ -131479,10 +131494,10 @@ vuv
 nfS
 emx
 jWh
-duz
-hXG
-htG
-doU
+qCg
+xjw
+pfA
+xAC
 jWh
 lbB
 uIv
@@ -131682,10 +131697,10 @@ iEs
 cxo
 cxo
 jWh
-axR
-mIP
-tcZ
-fWi
+uUV
+rsW
+djN
+fnQ
 jWh
 lbB
 cKL
@@ -131885,10 +131900,10 @@ vuv
 xct
 cxo
 jWh
-vpv
-pgw
-rmE
-fWi
+dkS
+vba
+naQ
+fnQ
 jWh
 xPZ
 pcv
@@ -132069,7 +132084,7 @@ ptK
 dmQ
 psm
 psm
-lDn
+qyH
 arV
 wZX
 eky
@@ -132083,7 +132098,7 @@ aDQ
 eky
 wZX
 arV
-wkA
+dtv
 vuv
 vuv
 cxo
@@ -132271,8 +132286,8 @@ hWU
 dmQ
 aeq
 psm
-xrq
-vVu
+aNe
+hiN
 arV
 wZX
 eky
@@ -132286,8 +132301,8 @@ aHe
 eky
 wZX
 arV
-oIt
-xrq
+fXM
+aNe
 vuv
 ahb
 cxo
@@ -132474,8 +132489,8 @@ rwb
 dmQ
 jXY
 psm
-vlk
-mKy
+atY
+qkj
 aMT
 svl
 pzJ
@@ -132489,8 +132504,8 @@ qDt
 pzJ
 sQO
 aMT
-wNS
-vlk
+rWF
+atY
 vuv
 woM
 nqD
@@ -132678,7 +132693,7 @@ dmQ
 atD
 psm
 psm
-vjd
+vHl
 aRp
 jBX
 akS
@@ -132692,7 +132707,7 @@ aHe
 tKf
 jBX
 aRp
-quy
+edx
 vuv
 vuv
 myC
@@ -133074,8 +133089,8 @@ cuC
 bNM
 tgK
 tfb
-wuT
-lMx
+skg
+eaX
 pVZ
 pVZ
 pVZ
@@ -133107,8 +133122,8 @@ qMu
 qMu
 qMu
 qMu
-jFY
-qKY
+euY
+iuw
 jHL
 wOK
 uIv
@@ -133277,8 +133292,8 @@ cuC
 riJ
 kHY
 uhM
-kdv
-lkm
+uvk
+xJn
 cuC
 aag
 aag
@@ -133310,8 +133325,8 @@ aag
 aag
 aag
 bYn
-dRs
-uAl
+tAh
+bfe
 rDb
 qjV
 rID
@@ -133480,7 +133495,7 @@ cuC
 cuC
 umy
 iKZ
-pnL
+tiw
 cuC
 cuC
 mNX
@@ -133514,7 +133529,7 @@ mNX
 qOk
 bYn
 bYn
-cWE
+qQL
 kHS
 rID
 bYn
@@ -134507,8 +134522,8 @@ xVk
 xVk
 aad
 jbq
-kRg
-uRs
+jXW
+jcZ
 aDO
 qqu
 eky
@@ -134516,8 +134531,8 @@ aNl
 eky
 dFk
 aDO
-nPY
-kRg
+nzI
+jXW
 jbq
 ajZ
 xVk
@@ -134710,8 +134725,8 @@ xVk
 xVk
 aad
 jbq
-hBL
-dID
+qtR
+jWC
 eky
 eky
 nJu
@@ -134719,8 +134734,8 @@ aNl
 eky
 eky
 eky
-etn
-hBL
+aDc
+qtR
 jbq
 ajZ
 xVk
@@ -134914,7 +134929,7 @@ xVk
 eJQ
 aPw
 aHe
-mRQ
+dnJ
 eky
 eky
 eky
@@ -134922,7 +134937,7 @@ aNl
 eky
 eky
 eky
-biJ
+hfw
 aHe
 aPw
 eJQ
@@ -136741,7 +136756,7 @@ xVk
 oee
 aPw
 aHe
-iTe
+tqB
 eky
 eky
 atg
@@ -136749,7 +136764,7 @@ aBE
 ouB
 eky
 eky
-qPX
+gwu
 aHe
 aPw
 oee
@@ -136943,8 +136958,8 @@ xVk
 xVk
 aad
 jbq
-xrq
-dID
+aNe
+jWC
 eky
 eky
 esT
@@ -136952,8 +136967,8 @@ nYE
 orH
 eky
 eky
-etn
-xrq
+aDc
+aNe
 jbq
 ajZ
 xVk
@@ -137146,8 +137161,8 @@ xVk
 xVk
 aad
 jbq
-vlk
-dID
+atY
+jWC
 eky
 eky
 bAe
@@ -137155,8 +137170,8 @@ aBG
 sGh
 eky
 eky
-etn
-vlk
+aDc
+atY
 jbq
 ajZ
 xVk
@@ -137349,8 +137364,8 @@ xVk
 xVk
 aad
 aPw
-uYd
-xnz
+qpU
+ykD
 dqj
 eky
 xaS
@@ -137358,8 +137373,8 @@ ejt
 mPf
 eky
 gUV
-neG
-uYd
+wKS
+qpU
 aPw
 ajZ
 xVk
@@ -140446,9 +140461,9 @@ lmz
 lmz
 lmz
 daz
-ltc
-eXk
-xns
+rzf
+bRo
+wyv
 pTt
 gAe
 rCi
@@ -140649,9 +140664,9 @@ lmz
 lmz
 lmz
 daz
-tId
-wJB
-tJN
+czG
+ylg
+oIY
 daz
 daz
 daz

From 903f7dc9bb118da8c507b7f23160e95e5e9db063 Mon Sep 17 00:00:00 2001
From: cm13-github <128137806+cm13-github@users.noreply.github.com>
Date: Wed, 29 Nov 2023 22:24:58 +0000
Subject: [PATCH 14/58] Automatic changelog for PR #4586 [ci skip]

---
 html/changelogs/AutoChangeLog-pr-4586.yml | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 html/changelogs/AutoChangeLog-pr-4586.yml

diff --git a/html/changelogs/AutoChangeLog-pr-4586.yml b/html/changelogs/AutoChangeLog-pr-4586.yml
new file mode 100644
index 000000000000..248e91aee714
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-4586.yml
@@ -0,0 +1,8 @@
+author: "Huffie56"
+delete-after: True
+changes:
+  - rscadd: "Added a lot's of food boxes for that hold the basic ingredients for cooking."
+  - rscadd: "Added a file to handle the fridges in almayer kitchen."
+  - rscadd: "Added a vendor in the kitchen that sell boxes of ingredients."
+  - rscadd: "Added a a food crate called surplus boxes ingredient containing random boxes of ingredients."
+  - rscadd: "Added a version of this crate that will be freely given via the ASR system."
\ No newline at end of file

From 49edc3a53929f8e7e944ff9789f6c05a698bd7b1 Mon Sep 17 00:00:00 2001
From: Changelogs <action@github.com>
Date: Thu, 30 Nov 2023 01:12:08 +0000
Subject: [PATCH 15/58] Automatic changelog compile [ci skip]

---
 html/changelogs/AutoChangeLog-pr-4586.yml |  8 --------
 html/changelogs/AutoChangeLog-pr-4991.yml |  4 ----
 html/changelogs/AutoChangeLog-pr-5032.yml |  5 -----
 html/changelogs/AutoChangeLog-pr-5039.yml |  4 ----
 html/changelogs/AutoChangeLog-pr-5050.yml |  4 ----
 html/changelogs/archive/2023-11.yml       | 18 ++++++++++++++++++
 6 files changed, 18 insertions(+), 25 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-4586.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-4991.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-5032.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-5039.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-5050.yml

diff --git a/html/changelogs/AutoChangeLog-pr-4586.yml b/html/changelogs/AutoChangeLog-pr-4586.yml
deleted file mode 100644
index 248e91aee714..000000000000
--- a/html/changelogs/AutoChangeLog-pr-4586.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-author: "Huffie56"
-delete-after: True
-changes:
-  - rscadd: "Added a lot's of food boxes for that hold the basic ingredients for cooking."
-  - rscadd: "Added a file to handle the fridges in almayer kitchen."
-  - rscadd: "Added a vendor in the kitchen that sell boxes of ingredients."
-  - rscadd: "Added a a food crate called surplus boxes ingredient containing random boxes of ingredients."
-  - rscadd: "Added a version of this crate that will be freely given via the ASR system."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-4991.yml b/html/changelogs/AutoChangeLog-pr-4991.yml
deleted file mode 100644
index 857c9c0894d2..000000000000
--- a/html/changelogs/AutoChangeLog-pr-4991.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Birdtalon"
-delete-after: True
-changes:
-  - code_imp: "Refactiors xenomorph initialize & removes some duplicate proc calls"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-5032.yml b/html/changelogs/AutoChangeLog-pr-5032.yml
deleted file mode 100644
index c355c467a42b..000000000000
--- a/html/changelogs/AutoChangeLog-pr-5032.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "harryob"
-delete-after: True
-changes:
-  - bugfix: "the health indicator in the tooltip and colorbox is still present when a POI has 0 health"
-  - bugfix: "admins can refresh the orbit menu without runtimes"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-5039.yml b/html/changelogs/AutoChangeLog-pr-5039.yml
deleted file mode 100644
index c16d44141a92..000000000000
--- a/html/changelogs/AutoChangeLog-pr-5039.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "HeresKozmos"
-delete-after: True
-changes:
-  - mapadd: "added a new spring area to kutjevo's south caves"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-5050.yml b/html/changelogs/AutoChangeLog-pr-5050.yml
deleted file mode 100644
index c78f4bdeb197..000000000000
--- a/html/changelogs/AutoChangeLog-pr-5050.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "SabreML"
-delete-after: True
-changes:
-  - bugfix: "Fixed a few space tiles under a window in Kutjevo Refinery."
\ No newline at end of file
diff --git a/html/changelogs/archive/2023-11.yml b/html/changelogs/archive/2023-11.yml
index 7b16c3526888..02e7bf43396b 100644
--- a/html/changelogs/archive/2023-11.yml
+++ b/html/changelogs/archive/2023-11.yml
@@ -405,3 +405,21 @@
 2023-11-29:
   realforest2001:
   - rscdel: Whiskey Outpost no longer rolls pred rounds naturally.
+2023-11-30:
+  Birdtalon:
+  - code_imp: Refactiors xenomorph initialize & removes some duplicate proc calls
+  HeresKozmos:
+  - mapadd: added a new spring area to kutjevo's south caves
+  Huffie56:
+  - rscadd: Added a lot's of food boxes for that hold the basic ingredients for cooking.
+  - rscadd: Added a file to handle the fridges in almayer kitchen.
+  - rscadd: Added a vendor in the kitchen that sell boxes of ingredients.
+  - rscadd: Added a a food crate called surplus boxes ingredient containing random
+      boxes of ingredients.
+  - rscadd: Added a version of this crate that will be freely given via the ASR system.
+  SabreML:
+  - bugfix: Fixed a few space tiles under a window in Kutjevo Refinery.
+  harryob:
+  - bugfix: the health indicator in the tooltip and colorbox is still present when
+      a POI has 0 health
+  - bugfix: admins can refresh the orbit menu without runtimes

From 2a7009e5c9f15f70806fa70f4229996e1bb15bcb Mon Sep 17 00:00:00 2001
From: Zonespace <41448081+Zonespace27@users.noreply.github.com>
Date: Thu, 30 Nov 2023 03:58:19 -0800
Subject: [PATCH 16/58] Resin holes can no longer be made below stairs (#5056)

# About the pull request
Title.

# Explain why it's good for the game
You can't see the resin hole or interact with it, making this
effectively an exploit.



# Changelog
:cl:
fix: Resin holes can no longer be planted below stairs
/:cl:
---
 .../living/carbon/xenomorph/abilities/general_powers.dm    | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/general_powers.dm b/code/modules/mob/living/carbon/xenomorph/abilities/general_powers.dm
index 94c0110fc68f..74a46a30e9ba 100644
--- a/code/modules/mob/living/carbon/xenomorph/abilities/general_powers.dm
+++ b/code/modules/mob/living/carbon/xenomorph/abilities/general_powers.dm
@@ -570,6 +570,13 @@
 		to_chat(X, SPAN_XENOWARNING("You can only shape on weeds. Find some resin before you start building!"))
 		return FALSE
 
+	// This snowflake check exists because stairs specifically are indestructable, tile-covering, and cannot be moved, which allows resin holes to be
+	// planted under them without any possible counterplay. In the future if resin holes stop being able to be hidden under objects, remove this check.
+	var/obj/structure/stairs/staircase = locate() in src
+	if(staircase)
+		to_chat(X, SPAN_XENOWARNING("You cannot make a hole beneath a staircase!"))
+		return FALSE
+
 	if(alien_weeds.linked_hive.hivenumber != X.hivenumber)
 		to_chat(X, SPAN_XENOWARNING("These weeds don't belong to your hive!"))
 		return FALSE

From 9b2d2d9b482e17d1e21749a3636fa0d77b66e9ea Mon Sep 17 00:00:00 2001
From: cm13-github <128137806+cm13-github@users.noreply.github.com>
Date: Thu, 30 Nov 2023 12:09:33 +0000
Subject: [PATCH 17/58] Automatic changelog for PR #5056 [ci skip]

---
 html/changelogs/AutoChangeLog-pr-5056.yml | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 html/changelogs/AutoChangeLog-pr-5056.yml

diff --git a/html/changelogs/AutoChangeLog-pr-5056.yml b/html/changelogs/AutoChangeLog-pr-5056.yml
new file mode 100644
index 000000000000..dd78bc76f2d0
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-5056.yml
@@ -0,0 +1,4 @@
+author: "Zonespace27"
+delete-after: True
+changes:
+  - bugfix: "Resin holes can no longer be planted below stairs"
\ No newline at end of file

From 858b1f376cbc76dcd40bfbdbe04965a1c5d5cbfb Mon Sep 17 00:00:00 2001
From: morrowwolf <darthbane97@gmail.com>
Date: Thu, 30 Nov 2023 07:03:26 -0500
Subject: [PATCH 18/58] Removes flame particles (#5055)

# About the pull request

This is a paid PR.

Allegedly fire was lagging the player. I assume the particles are the
issue.

# Explain why it's good for the game

Given the vast range of people who play CM with varying levels of
computer hardware it would be prudent to remove anything that may be
lagging players. Game feel good.

# Testing Photographs and Procedure
<details>
<summary>Screenshots & Videos</summary>

Put screenshots and videos here with an empty line between the
screenshots and the `<details>` tags.

</details>


# Changelog

:cl: Morrow
del: Removed flame particles. Possibly increases performance for some
players.
/:cl:
---
 .../modules/projectiles/guns/flamer/flamer.dm | 27 -------------------
 1 file changed, 27 deletions(-)

diff --git a/code/modules/projectiles/guns/flamer/flamer.dm b/code/modules/projectiles/guns/flamer/flamer.dm
index 0e56efe7ab5d..18fb0bf44cd8 100644
--- a/code/modules/projectiles/guns/flamer/flamer.dm
+++ b/code/modules/projectiles/guns/flamer/flamer.dm
@@ -375,29 +375,6 @@
 	. = ..()
 	set_fire_delay(FIRE_DELAY_TIER_7)
 
-GLOBAL_LIST_EMPTY(flamer_particles)
-/particles/flamer_fire
-	icon = 'icons/effects/particles/fire.dmi'
-	icon_state = "bonfire"
-	width = 100
-	height = 100
-	count = 1000
-	spawning = 8
-	lifespan = 0.7 SECONDS
-	fade = 1 SECONDS
-	grow = -0.01
-	velocity = list(0, 0)
-	position = generator("box", list(-16, -16), list(16, 16), NORMAL_RAND)
-	drift = generator("vector", list(0, -0.2), list(0, 0.2))
-	gravity = list(0, 0.95)
-	scale = generator("vector", list(0.3, 0.3), list(1,1), NORMAL_RAND)
-	rotation = 30
-	spin = generator("num", -20, 20)
-
-/particles/flamer_fire/New(set_color)
-	..()
-	color = set_color
-
 /obj/flamer_fire
 	name = "fire"
 	desc = "Ouch!"
@@ -454,10 +431,6 @@ GLOBAL_LIST_EMPTY(flamer_particles)
 
 	set_light(l_color = R.burncolor)
 
-	if(!GLOB.flamer_particles[R.burncolor])
-		GLOB.flamer_particles[R.burncolor] = new /particles/flamer_fire(R.burncolor)
-	particles = GLOB.flamer_particles[R.burncolor]
-
 	tied_reagent = new R.type() // Can't get deleted this way
 	tied_reagent.make_alike(R)
 

From fe0699b0283697645674f6013cbcae898ff7f67f Mon Sep 17 00:00:00 2001
From: cm13-github <128137806+cm13-github@users.noreply.github.com>
Date: Thu, 30 Nov 2023 12:23:49 +0000
Subject: [PATCH 19/58] Automatic changelog for PR #5055 [ci skip]

---
 html/changelogs/AutoChangeLog-pr-5055.yml | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 html/changelogs/AutoChangeLog-pr-5055.yml

diff --git a/html/changelogs/AutoChangeLog-pr-5055.yml b/html/changelogs/AutoChangeLog-pr-5055.yml
new file mode 100644
index 000000000000..91dff8947a9c
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-5055.yml
@@ -0,0 +1,4 @@
+author: "Morrow"
+delete-after: True
+changes:
+  - rscdel: "Removed flame particles. Possibly increases performance for some players."
\ No newline at end of file

From c9e4159321d2dc060fb74fbcb84be1d780e962f5 Mon Sep 17 00:00:00 2001
From: Birdtalon <birdtalon@gmail.com>
Date: Thu, 30 Nov 2023 12:06:56 +0000
Subject: [PATCH 20/58] Eggsac Carrier Hardy weed fix. (#5053)

# About the pull request

In #4716 I forgot about hardy weeds. This allows carrier to plant the
fragile eggs on standard and hardy weeds which are basically standard
weeds +.

# Explain why it's good for the game
# Testing Photographs and Procedure
<details>
<summary>Screenshots & Videos</summary>

Put screenshots and videos here with an empty line between the
screenshots and the `<details>` tags.

</details>


# Changelog
:cl:
fix: Eggsac fragile eggs can be placed on hardy weeds.
/:cl:
---
 code/modules/mob/living/carbon/xenomorph/egg_item.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/modules/mob/living/carbon/xenomorph/egg_item.dm b/code/modules/mob/living/carbon/xenomorph/egg_item.dm
index 05d456d0025d..b9304b33b15a 100644
--- a/code/modules/mob/living/carbon/xenomorph/egg_item.dm
+++ b/code/modules/mob/living/carbon/xenomorph/egg_item.dm
@@ -122,7 +122,7 @@
 			var/obj/effect/alien/egg/newegg
 			if(weed.weed_strength >= WEED_LEVEL_HIVE)
 				newegg = new /obj/effect/alien/egg(T, hivenumber)
-			else if(weed.weed_strength == WEED_LEVEL_STANDARD)
+			else if(weed.weed_strength >= WEED_LEVEL_STANDARD)
 				newegg = new /obj/effect/alien/egg/carrier_egg(T,hivenumber, user)
 			else
 				to_chat(user, SPAN_XENOWARNING("[src] can't be planted on these weeds."))

From dbc71b6b0b29fbfa0ec29c34352fd3b0ee05bfff Mon Sep 17 00:00:00 2001
From: cm13-github <128137806+cm13-github@users.noreply.github.com>
Date: Thu, 30 Nov 2023 12:37:59 +0000
Subject: [PATCH 21/58] Automatic changelog for PR #5053 [ci skip]

---
 html/changelogs/AutoChangeLog-pr-5053.yml | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 html/changelogs/AutoChangeLog-pr-5053.yml

diff --git a/html/changelogs/AutoChangeLog-pr-5053.yml b/html/changelogs/AutoChangeLog-pr-5053.yml
new file mode 100644
index 000000000000..f2bd438fd8e4
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-5053.yml
@@ -0,0 +1,4 @@
+author: "Birdtalon"
+delete-after: True
+changes:
+  - bugfix: "Eggsac fragile eggs can be placed on hardy weeds."
\ No newline at end of file

From 893d01b47014340ab50a58219023a6ef41262344 Mon Sep 17 00:00:00 2001
From: Changelogs <action@github.com>
Date: Fri, 1 Dec 2023 01:17:55 +0000
Subject: [PATCH 22/58] Automatic changelog compile [ci skip]

---
 html/changelogs/AutoChangeLog-pr-5053.yml | 4 ----
 html/changelogs/AutoChangeLog-pr-5055.yml | 4 ----
 html/changelogs/AutoChangeLog-pr-5056.yml | 4 ----
 html/changelogs/archive/2023-12.yml       | 7 +++++++
 4 files changed, 7 insertions(+), 12 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-5053.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-5055.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-5056.yml
 create mode 100644 html/changelogs/archive/2023-12.yml

diff --git a/html/changelogs/AutoChangeLog-pr-5053.yml b/html/changelogs/AutoChangeLog-pr-5053.yml
deleted file mode 100644
index f2bd438fd8e4..000000000000
--- a/html/changelogs/AutoChangeLog-pr-5053.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Birdtalon"
-delete-after: True
-changes:
-  - bugfix: "Eggsac fragile eggs can be placed on hardy weeds."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-5055.yml b/html/changelogs/AutoChangeLog-pr-5055.yml
deleted file mode 100644
index 91dff8947a9c..000000000000
--- a/html/changelogs/AutoChangeLog-pr-5055.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Morrow"
-delete-after: True
-changes:
-  - rscdel: "Removed flame particles. Possibly increases performance for some players."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-5056.yml b/html/changelogs/AutoChangeLog-pr-5056.yml
deleted file mode 100644
index dd78bc76f2d0..000000000000
--- a/html/changelogs/AutoChangeLog-pr-5056.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Zonespace27"
-delete-after: True
-changes:
-  - bugfix: "Resin holes can no longer be planted below stairs"
\ No newline at end of file
diff --git a/html/changelogs/archive/2023-12.yml b/html/changelogs/archive/2023-12.yml
new file mode 100644
index 000000000000..bae8bf190384
--- /dev/null
+++ b/html/changelogs/archive/2023-12.yml
@@ -0,0 +1,7 @@
+2023-12-01:
+  Birdtalon:
+  - bugfix: Eggsac fragile eggs can be placed on hardy weeds.
+  Morrow:
+  - rscdel: Removed flame particles. Possibly increases performance for some players.
+  Zonespace27:
+  - bugfix: Resin holes can no longer be planted below stairs

From 8e7a7046754ac14fd3b569d8492ca732dc497830 Mon Sep 17 00:00:00 2001
From: Birdtalon <birdtalon@gmail.com>
Date: Fri, 1 Dec 2023 19:21:12 +0000
Subject: [PATCH 23/58] Sanitizes burrower tunnel names to alphanumeric only
 (#4911)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# About the pull request

Someone made a tunnel with the characters `'🐝･ﾟ ･ﾟ·:｡･ﾟﾟ･` and the
tunnel was broken and not usable. This PR restricts them to alphanumeric
characters only.

# Explain why it's good for the game
# Testing Photographs and Procedure
<details>
<summary>Screenshots & Videos</summary>

Put screenshots and videos here with an empty line between the
screenshots and the `<details>` tags.

</details>


# Changelog
:cl:
fix: Restricts burrower tunnels to alphanumeric characters as some other
characters break the tunnel.
code; Adds new proc to replace non alphanumeric or space characters.
/:cl:
---
 code/__HELPERS/text.dm                                       | 5 +++++
 code/modules/mob/living/carbon/xenomorph/Abilities.dm        | 1 +
 .../carbon/xenomorph/abilities/burrower/burrower_powers.dm   | 1 +
 3 files changed, 7 insertions(+)

diff --git a/code/__HELPERS/text.dm b/code/__HELPERS/text.dm
index 36dcfed6cfea..967967790b28 100644
--- a/code/__HELPERS/text.dm
+++ b/code/__HELPERS/text.dm
@@ -30,6 +30,11 @@
 		text = replacetext(text, char, repl_chars[char])
 	return text
 
+///Helper for only alphanumeric characters plus common punctuation, spaces, underscore and hyphen _ -.
+/proc/replace_non_alphanumeric_plus(text)
+	var/regex/alphanumeric = regex(@{"[^a-z0-9 ,.?!\-_&]"}, "gi")
+	return alphanumeric.Replace(text, "")
+
 /proc/readd_quotes(text)
 	var/list/repl_chars = list("&#34;" = "\"", "&#39;" = "'")
 	for(var/char in repl_chars)
diff --git a/code/modules/mob/living/carbon/xenomorph/Abilities.dm b/code/modules/mob/living/carbon/xenomorph/Abilities.dm
index 0a6e0ff2ca26..cb46b3c6cc26 100644
--- a/code/modules/mob/living/carbon/xenomorph/Abilities.dm
+++ b/code/modules/mob/living/carbon/xenomorph/Abilities.dm
@@ -75,6 +75,7 @@
 	X.tunnel_delay = 1
 	addtimer(CALLBACK(src, PROC_REF(cooldown_end)), 4 MINUTES)
 	var/msg = strip_html(input("Add a description to the tunnel:", "Tunnel Description") as text|null)
+	msg = replace_non_alphanumeric_plus(msg)
 	var/description
 	if(msg)
 		description = msg
diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/burrower/burrower_powers.dm b/code/modules/mob/living/carbon/xenomorph/abilities/burrower/burrower_powers.dm
index 6a2071fafc3b..3276705ce9b7 100644
--- a/code/modules/mob/living/carbon/xenomorph/abilities/burrower/burrower_powers.dm
+++ b/code/modules/mob/living/carbon/xenomorph/abilities/burrower/burrower_powers.dm
@@ -177,6 +177,7 @@
 		return
 
 	var/new_name = strip_html(input("Change the description of the tunnel:", "Tunnel Description") as text|null)
+	new_name = replace_non_alphanumeric_plus(new_name)
 	if(new_name)
 		new_name = "[new_name] ([get_area_name(T)])"
 		log_admin("[key_name(src)] has renamed the tunnel \"[T.tunnel_desc]\" as \"[new_name]\".")

From 8c3a76e8d313c2313efa5c161741cfa0861891d0 Mon Sep 17 00:00:00 2001
From: cm13-github <128137806+cm13-github@users.noreply.github.com>
Date: Fri, 1 Dec 2023 19:31:41 +0000
Subject: [PATCH 24/58] Automatic changelog for PR #4911 [ci skip]

---
 html/changelogs/AutoChangeLog-pr-4911.yml | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 html/changelogs/AutoChangeLog-pr-4911.yml

diff --git a/html/changelogs/AutoChangeLog-pr-4911.yml b/html/changelogs/AutoChangeLog-pr-4911.yml
new file mode 100644
index 000000000000..2ee16d930caf
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-4911.yml
@@ -0,0 +1,4 @@
+author: "Birdtalon"
+delete-after: True
+changes:
+  - bugfix: "Restricts burrower tunnels to alphanumeric characters as some other characters break the tunnel.\ncode; Adds new proc to replace non alphanumeric or space characters."
\ No newline at end of file

From 354e9b83c3db55c79e5cb469d3858d540a0a5971 Mon Sep 17 00:00:00 2001
From: Birdtalon <birdtalon@gmail.com>
Date: Fri, 1 Dec 2023 19:42:41 +0000
Subject: [PATCH 25/58] Refactors Xeno name generation and set hive and update
 (#4992)

# About the pull request

Refactors xenomorph name generation. Everything is now handled in
`generate_name()`. Refactored out `istype(src)`
Larva name generation no longer handled in `update_icons()`

All hive datums now have a list of 1-999 which gets picked from. If that
list is empty it will fall-back on 0. I can add functionality for
generating a new list but seriously when do we ever get through 999
lives.

Removes `istype(src)` from `set_hive_and_update()`

Adds "Infernal" name prefix for xeno who rolls 666 as a little easter
egg.

# Explain why it's good for the game
# Testing Photographs and Procedure
<details>
<summary>Screenshots & Videos</summary>

Put screenshots and videos here with an empty line between the
screenshots and the `<details>` tags.

</details>


# Changelog
:cl:
add: "Infernal" name prefix for xeno who rolls number 666
code: Refactors xeno name generation. Larva name generation and removes
some istype(src)
/:cl:
---
 .../mob/living/carbon/xenomorph/Xenomorph.dm  | 57 +++++++------
 .../living/carbon/xenomorph/castes/Larva.dm   | 82 +++++++++++--------
 .../living/carbon/xenomorph/castes/Queen.dm   | 13 ++-
 .../living/carbon/xenomorph/xeno_defines.dm   |  5 ++
 4 files changed, 94 insertions(+), 63 deletions(-)

diff --git a/code/modules/mob/living/carbon/xenomorph/Xenomorph.dm b/code/modules/mob/living/carbon/xenomorph/Xenomorph.dm
index 645ade04ea4f..cc0065733e21 100644
--- a/code/modules/mob/living/carbon/xenomorph/Xenomorph.dm
+++ b/code/modules/mob/living/carbon/xenomorph/Xenomorph.dm
@@ -552,22 +552,16 @@
 	if(caste.fire_immunity & FIRE_IMMUNITY_XENO_FRENZY)
 		. |= COMPONENT_XENO_FRENZY
 
+//Off-load this proc so it can be called freely
+//Since Xenos change names like they change shoes, we need somewhere to hammer in all those legos
+//We set their name first, then update their real_name AND their mind name
 //Off-load this proc so it can be called freely
 //Since Xenos change names like they change shoes, we need somewhere to hammer in all those legos
 //We set their name first, then update their real_name AND their mind name
 /mob/living/carbon/xenomorph/proc/generate_name()
 	//We don't have a nicknumber yet, assign one to stick with us
 	if(!nicknumber)
-		var/tempnumber = rand(1, 999)
-		var/list/numberlist = list()
-		for(var/mob/living/carbon/xenomorph/X in GLOB.xeno_mob_list)
-			numberlist += X.nicknumber
-
-		while(tempnumber in numberlist)
-			tempnumber = rand(1, 999)
-
-		nicknumber = tempnumber
-
+		generate_and_set_nicknumber()
 	// Even if we don't have the hive datum we usually still have the hive number
 	var/datum/hive_status/in_hive = hive
 	if(!in_hive)
@@ -576,12 +570,10 @@
 	//Im putting this in here, because this proc gets called when a player inhabits a SSD xeno and it needs to go somewhere (sorry)
 	hud_set_marks()
 
-	handle_name(in_hive)
-
-/mob/living/carbon/xenomorph/proc/handle_name(datum/hive_status/in_hive)
 	var/name_prefix = in_hive.prefix
 	var/name_client_prefix = ""
 	var/name_client_postfix = ""
+	var/number_decorator = ""
 	if(client)
 		name_client_prefix = "[(client.xeno_prefix||client.xeno_postfix) ? client.xeno_prefix : "XX"]-"
 		name_client_postfix = client.xeno_postfix ? ("-"+client.xeno_postfix) : ""
@@ -592,9 +584,12 @@
 
 	var/age_display = show_age_prefix ? age_prefix : ""
 	var/name_display = ""
+	// Rare easter egg
+	if(nicknumber == 666)
+		number_decorator = "Infernal "
 	if(show_name_numbers)
 		name_display = show_only_numbers ? " ([nicknumber])" : " ([name_client_prefix][nicknumber][name_client_postfix])"
-	name = "[name_prefix][age_display][caste.display_name || caste.caste_type][name_display]"
+	name = "[name_prefix][number_decorator][age_display][caste.display_name || caste.caste_type][name_display]"
 
 	//Update linked data so they show up properly
 	change_real_name(src, name)
@@ -814,23 +809,17 @@
 /mob/living/carbon/xenomorph/proc/set_hive_and_update(new_hivenumber = XENO_HIVE_NORMAL)
 	var/datum/hive_status/new_hive = GLOB.hive_datum[new_hivenumber]
 	if(!new_hive)
-		return
+		return FALSE
 
-	for(var/T in _status_traits) // They can't keep getting away with this!!!
-		REMOVE_TRAIT(src, T, TRAIT_SOURCE_HIVE)
+	for(var/trait in _status_traits) // They can't keep getting away with this!!!
+		REMOVE_TRAIT(src, trait, TRAIT_SOURCE_HIVE)
 
 	new_hive.add_xeno(src)
 
-	for(var/T in new_hive.hive_inherant_traits)
-		ADD_TRAIT(src, T, TRAIT_SOURCE_HIVE)
+	for(var/trait in new_hive.hive_inherant_traits)
+		ADD_TRAIT(src, trait, TRAIT_SOURCE_HIVE)
 
-	if(istype(src, /mob/living/carbon/xenomorph/larva))
-		var/mob/living/carbon/xenomorph/larva/L = src
-		L.update_icons() // larva renaming done differently
-	else
-		generate_name()
-	if(istype(src, /mob/living/carbon/xenomorph/queen))
-		update_living_queens()
+	generate_name()
 
 	lock_evolve = FALSE
 	banished = FALSE
@@ -841,6 +830,9 @@
 	// Update the hive status UI
 	new_hive.hive_ui.update_all_xeno_data()
 
+	return TRUE
+
+
 //*********************************************************//
 //********************Mutator functions********************//
 //*********************************************************//
@@ -1113,3 +1105,16 @@
 	. = ..()
 	if(!resting) // !resting because we dont wanna prematurely update wounds if they're just trying to rest
 		update_wounds()
+
+///Generate a new unused nicknumber for the current hive, if hive doesn't exist return 0
+/mob/living/carbon/xenomorph/proc/generate_and_set_nicknumber()
+	if(!hive)
+		//If hive doesn't exist make it 0
+		nicknumber = 0
+		return
+	var/datum/hive_status/hive_status = hive
+	if(length(hive_status.available_nicknumbers))
+		nicknumber = pick_n_take(hive_status.available_nicknumbers)
+	else
+		//If we somehow use all 999 numbers fallback on 0
+		nicknumber = 0
diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Larva.dm b/code/modules/mob/living/carbon/xenomorph/castes/Larva.dm
index 816e6020c30f..6d5c6699b929 100644
--- a/code/modules/mob/living/carbon/xenomorph/castes/Larva.dm
+++ b/code/modules/mob/living/carbon/xenomorph/castes/Larva.dm
@@ -50,15 +50,22 @@
 
 	var/burrowable = TRUE //Can it be safely burrowed if it has no player?
 	var/state_override
+	var/is_bloody = TRUE //We're still "bloody"
 
 	icon_xeno = 'icons/mob/xenos/larva.dmi'
 	icon_xenonid = 'icons/mob/xenonids/larva.dmi'
 
-/mob/living/carbon/xenomorph/larva/initialize_pass_flags(datum/pass_flags_container/PF)
+/mob/living/carbon/xenomorph/larva/Life()
+	if(is_bloody && (evolution_stored >= evolution_threshold / 2)) //We're no longer bloody so update our name...
+		generate_name()
+		is_bloody = FALSE
+	return ..()
+
+/mob/living/carbon/xenomorph/larva/initialize_pass_flags(datum/pass_flags_container/pass_flags)
 	..()
-	if (PF)
-		PF.flags_pass = PASS_MOB_THRU|PASS_FLAGS_CRAWLER
-		PF.flags_can_pass_all = PASS_ALL^PASS_OVER_THROW_ITEM
+	if (pass_flags)
+		pass_flags.flags_pass = PASS_MOB_THRU|PASS_FLAGS_CRAWLER
+		pass_flags.flags_can_pass_all = PASS_ALL^PASS_OVER_THROW_ITEM
 
 /mob/living/carbon/xenomorph/larva/corrupted
 	hivenumber = XENO_HIVE_CORRUPTED
@@ -101,29 +108,10 @@
 
 //Larva code is just a mess, so let's get it over with
 /mob/living/carbon/xenomorph/larva/update_icons()
-	var/progress = "" //Naming convention, three different names
 	var/state = "" //Icon convention, two different sprite sets
 
-	var/name_prefix = ""
-
-	if(hive)
-		name_prefix = hive.prefix
-		color = hive.color
-
-	if(evolution_stored >= evolution_threshold)
-		progress = "Mature "
-	else if(evolution_stored < evolution_threshold / 2) //We're still bloody
-		progress = "Bloody "
+	if(evolution_stored < evolution_threshold / 2) //We're still bloody
 		state = "Bloody "
-	else
-		progress = ""
-
-	name = "[name_prefix][progress]Larva ([nicknumber])"
-
-	if(istype(src,/mob/living/carbon/xenomorph/larva/predalien)) state = "Predalien " //Sort of a hack.
-
-	//Update linked data so they show up properly
-	change_real_name(src, name)
 
 	if(stat == DEAD)
 		icon_state = "[state_override || state]Larva Dead"
@@ -141,16 +129,13 @@
 /mob/living/carbon/xenomorph/larva/alter_ghost(mob/dead/observer/ghost)
 	ghost.icon_state = "[caste.caste_type]"
 
-/mob/living/carbon/xenomorph/larva/handle_name()
-	return
-
 /mob/living/carbon/xenomorph/larva/start_pulling(atom/movable/AM)
 	return
 
 /mob/living/carbon/xenomorph/larva/pull_response(mob/puller)
 	return TRUE
 
-/mob/living/carbon/xenomorph/larva/UnarmedAttack(atom/A, proximity, click_parameters, tile_attack, ignores_resin = FALSE)
+/mob/living/carbon/xenomorph/larva/UnarmedAttack(atom/atom, proximity, click_parameters, tile_attack, ignores_resin = FALSE)
 	a_intent = INTENT_HELP //Forces help intent for all interactions.
 	if(!caste)
 		return FALSE
@@ -158,21 +143,50 @@
 	if(body_position) //No attacks while laying down
 		return FALSE
 
-	A.attack_larva(src)
+	atom.attack_larva(src)
 	xeno_attack_delay(src) //Adds some lag to the 'attack'
 
-/proc/spawn_hivenumber_larva(atom/A, hivenumber)
-	if(!GLOB.hive_datum[hivenumber] || isnull(A))
+/proc/spawn_hivenumber_larva(atom/atom, hivenumber)
+	if(!GLOB.hive_datum[hivenumber] || isnull(atom))
 		return
 
-	var/mob/living/carbon/xenomorph/larva/L = new /mob/living/carbon/xenomorph/larva(A)
+	var/mob/living/carbon/xenomorph/larva/larva = new /mob/living/carbon/xenomorph/larva(atom)
 
-	L.set_hive_and_update(hivenumber)
+	larva.set_hive_and_update(hivenumber)
 
-	return L
+	return larva
 
 /mob/living/carbon/xenomorph/larva/emote(act, m_type, message, intentional, force_silence)
 	playsound(loc, "alien_roar_larva", 15)
 
 /mob/living/carbon/xenomorph/larva/is_xeno_grabbable()
 	return TRUE
+
+/*
+Larva name generation, set nicknumber = (number between 1 & 999) which isn't taken by any other xenos in GLOB.xeno_mob_list if doesn't already exist.
+Also handles the "Mature / Bloody naming convention. Call this to update the name."
+*/
+/mob/living/carbon/xenomorph/larva/generate_name()
+	if(!nicknumber)
+		generate_and_set_nicknumber()
+
+	var/progress = "" //Naming convention, three different names
+	var/name_prefix = "" // Prefix for hive
+
+	if(hive)
+		name_prefix = hive.prefix
+		color = hive.color
+
+	if(evolution_stored >= evolution_threshold)
+		progress = "Mature "
+	else if(evolution_stored < evolution_threshold / 2) //We're still bloody
+		progress = "Bloody "
+
+	name = "[name_prefix][progress]Larva ([nicknumber])"
+
+	//Update linked data so they show up properly
+	change_real_name(src, name)
+	//Update the hive status UI
+	if(hive)
+		var/datum/hive_status/hive_status = hive
+		hive_status.hive_ui.update_xeno_info()
diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Queen.dm b/code/modules/mob/living/carbon/xenomorph/castes/Queen.dm
index ceedff03f2aa..63802d5023c2 100644
--- a/code/modules/mob/living/carbon/xenomorph/castes/Queen.dm
+++ b/code/modules/mob/living/carbon/xenomorph/castes/Queen.dm
@@ -410,8 +410,10 @@
 
 	AddComponent(/datum/component/footstep, 2 , 35, 11, 4, "alien_footstep_large")
 
-/mob/living/carbon/xenomorph/queen/handle_name(datum/hive_status/in_hive)
-	var/name_prefix = in_hive.prefix
+/mob/living/carbon/xenomorph/queen/generate_name()
+	if(!nicknumber)
+		generate_and_set_nicknumber()
+	var/name_prefix = hive.prefix
 	if(queen_aged)
 		age_xeno()
 		switch(age)
@@ -440,11 +442,16 @@
 		name_client_prefix = "[(client.xeno_prefix||client.xeno_postfix) ? client.xeno_prefix : "XX"]-"
 		name_client_postfix = client.xeno_postfix ? ("-"+client.xeno_postfix) : ""
 	full_designation = "[name_client_prefix][nicknumber][name_client_postfix]"
-	color = in_hive.color
+	color = hive.color
 
 	//Update linked data so they show up properly
 	change_real_name(src, name)
 
+/mob/living/carbon/xenomorph/queen/set_hive_and_update(new_hivenumber)
+	if(!..())
+		return FALSE
+	update_living_queens()
+
 /mob/living/carbon/xenomorph/queen/proc/make_combat_effective()
 	queen_aged = TRUE
 
diff --git a/code/modules/mob/living/carbon/xenomorph/xeno_defines.dm b/code/modules/mob/living/carbon/xenomorph/xeno_defines.dm
index 810c8f58666b..99f9c46b5b65 100644
--- a/code/modules/mob/living/carbon/xenomorph/xeno_defines.dm
+++ b/code/modules/mob/living/carbon/xenomorph/xeno_defines.dm
@@ -365,6 +365,8 @@
 	var/datum/tacmap/drawing/xeno/tacmap
 	var/minimap_type = MINIMAP_FLAG_XENO
 
+	var/list/available_nicknumbers = list()
+
 /datum/hive_status/New()
 	mutators.hive = src
 	hive_ui = new(src)
@@ -377,6 +379,9 @@
 	if(hivenumber != XENO_HIVE_NORMAL)
 		return
 
+	for(var/number in 1 to 999)
+		available_nicknumbers += number
+
 	RegisterSignal(SSdcs, COMSIG_GLOB_POST_SETUP, PROC_REF(post_setup))
 
 /datum/hive_status/proc/post_setup()

From 084fd0bbd2a9f497dfedb05131735e968e214c51 Mon Sep 17 00:00:00 2001
From: cm13-github <128137806+cm13-github@users.noreply.github.com>
Date: Fri, 1 Dec 2023 19:51:04 +0000
Subject: [PATCH 26/58] Automatic changelog for PR #4992 [ci skip]

---
 html/changelogs/AutoChangeLog-pr-4992.yml | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 html/changelogs/AutoChangeLog-pr-4992.yml

diff --git a/html/changelogs/AutoChangeLog-pr-4992.yml b/html/changelogs/AutoChangeLog-pr-4992.yml
new file mode 100644
index 000000000000..f1d98d0f0db0
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-4992.yml
@@ -0,0 +1,5 @@
+author: "Birdtalon"
+delete-after: True
+changes:
+  - rscadd: "\"Infernal\" name prefix for xeno who rolls number 666"
+  - code_imp: "Refactors xeno name generation. Larva name generation and removes some istype(src)"
\ No newline at end of file

From da9f6e7753ff6e17ceb1c3f347c82eba132f4106 Mon Sep 17 00:00:00 2001
From: 567Turtle <91508746+567Turtle@users.noreply.github.com>
Date: Fri, 1 Dec 2023 13:43:37 -0600
Subject: [PATCH 27/58] Brown Gloves/Boots Surplus Vendors (#4996)

# About the pull request

adds brown gloves and boots to the surplus vendors

# Explain why it's good for the game

It's a drip or drown world out there, and our marines need a life-vests.


# Testing Photographs and Procedure
<details>
<summary>Screenshots & Videos</summary>


![image](https://github.com/cmss13-devs/cmss13/assets/91508746/10ce0430-8e18-4e35-8244-7fafe5e30b37)

</details>


# Changelog
:cl:
add: Brown boots and gloves are now vendable from the surplus vendors.
/:cl:
---
 .../machinery/vending/vendor_types/squad_prep/squad_prep.dm     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm
index 52418fb8940c..505ef81a1277 100644
--- a/code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm
+++ b/code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm
@@ -71,8 +71,10 @@
 	listed_products = list(
 		list("STANDARD EQUIPMENT", -1, null, null, null),
 		list("Marine Combat Boots", round(scale * 15), /obj/item/clothing/shoes/marine, VENDOR_ITEM_REGULAR),
+		list("Marine Brown Combat Boots", round(scale * 15), /obj/item/clothing/shoes/marine/brown, VENDOR_ITEM_REGULAR),
 		list("USCM Uniform", round(scale * 15), /obj/item/clothing/under/marine, VENDOR_ITEM_REGULAR),
 		list("Marine Combat Gloves", round(scale * 15), /obj/item/clothing/gloves/marine, VENDOR_ITEM_REGULAR),
+		list("Marine Brown Combat Gloves", round(scale * 15), /obj/item/clothing/gloves/marine/brown, VENDOR_ITEM_REGULAR),
 		list("Marine Black Combat Gloves", round(scale * 15), /obj/item/clothing/gloves/marine/black, VENDOR_ITEM_REGULAR),
 		list("Marine Radio Headset", round(scale * 15), /obj/item/device/radio/headset/almayer, VENDOR_ITEM_REGULAR),
 		list("M10 Pattern Marine Helmet", round(scale * 15), /obj/item/clothing/head/helmet/marine, VENDOR_ITEM_REGULAR),

From 08f28b61cd971177cd1f6f6b910bbea83a267d61 Mon Sep 17 00:00:00 2001
From: cm13-github <128137806+cm13-github@users.noreply.github.com>
Date: Fri, 1 Dec 2023 20:06:27 +0000
Subject: [PATCH 28/58] Automatic changelog for PR #4996 [ci skip]

---
 html/changelogs/AutoChangeLog-pr-4996.yml | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 html/changelogs/AutoChangeLog-pr-4996.yml

diff --git a/html/changelogs/AutoChangeLog-pr-4996.yml b/html/changelogs/AutoChangeLog-pr-4996.yml
new file mode 100644
index 000000000000..1580ba0ea317
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-4996.yml
@@ -0,0 +1,4 @@
+author: "567Turtle"
+delete-after: True
+changes:
+  - rscadd: "Brown boots and gloves are now vendable from the surplus vendors."
\ No newline at end of file

From 0772939c3926a2fd7188e2ad96fa1e5d1d031063 Mon Sep 17 00:00:00 2001
From: Drathek <76988376+Drulikar@users.noreply.github.com>
Date: Fri, 1 Dec 2023 12:43:52 -0800
Subject: [PATCH 29/58] Fix vending_products register continue check (#4962)

# About the pull request

This PR cherry picks https://github.com/PvE-CMSS13/PvE-CMSS13/pull/68
but removes the extra logging. That PR was attempting to resolve server
hitching, but the hitching seems to have gone away with it and a TGS
update.

I am not currently able to discern any noticeable differences from this
change, however the change looks correct for the continue check to ever
work correctly. See Testing Notes below.

Let me know if you do find a change this does improve, or maybe
somewhere else we should expect superfluous calls to getFlatIcon.

# Explain why it's good for the game

The continue check as written looks like it would never work, whereas
now the string that will be used for inserting into the list sprites is
the same string we check before creating new icons.

# Testing Photographs and Procedure
<details>
<summary>Testing Notes</summary>

Debugging only:

Lobby (LV-624):
One event of registering (master -> init Assets -> vending_products)
55 getFlatIcon calls (.124 total cpu)

Game Start:
No changes

After opening CO vendors and cig vendor:
No changes

Alt+click self:
77 getFlatIcon calls (.353 total cpu)

Alt+click self again:
No changes

-----

After continue change:

Lobby (LV-624):
One event of registering (master -> init Assets -> vending_products)
55 getFlatIcon calls (.117 total cpu)

Game Start:
No changes

After opening CO vendors and cig vendor:
No changes

Alt+click self:
77 getFlatIcon calls (.346 total cpu)

Alt+click self again:
No changes

------

Debugging only w/ SVN:

Lobby (LV-624):
One event of registering (master -> init Assets -> vending_products)
55 getFlatIcon calls (.124 total cpu)

Game Start:
No changes

After opening CO vendors and cig vendor:
a GET was performed for first CO vendor and first cig vendor opened
(never again)

Alt+click self:
77 getFlatIcon calls (.351 total cpu)
A GET is performed for every item listed

Alt+click self again:
A GET is performed for every item listed

-----

After continue change w/ SVN:

Lobby (LV-624):
One event of registering (master -> init Assets -> vending_products)
55 getFlatIcon calls (.120 total cpu)

Game Start:
No changes

After opening CO vendors and cig vendor:
a GET was performed for first CO vendor and first cig vendor opened
(never again)

Alt+click self:
77 getFlatIcon calls (.347 total cpu)
A GET is performed for every item listed

Alt+click self again:
A GET is performed for every item listed

</details>


# Changelog
:cl: Morrow
code: Corrected a check to avoid repeat work in
/datum/asset/spritesheet/vending_products/register()
/:cl:

---------

Co-authored-by: Morrow <darthbane97@gmail.com>
---
 code/modules/asset_cache/asset_list_items.dm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/code/modules/asset_cache/asset_list_items.dm b/code/modules/asset_cache/asset_list_items.dm
index cb9bb98d339d..300c999b885b 100644
--- a/code/modules/asset_cache/asset_list_items.dm
+++ b/code/modules/asset_cache/asset_list_items.dm
@@ -315,7 +315,9 @@
 			log_debug("not atom! [item]")
 			continue
 
-		if (sprites[icon_file])
+		var/imgid = replacetext(replacetext("[k]", "/obj/item/", ""), "/", "-")
+
+		if(sprites[imgid])
 			continue
 
 		if(icon_state in icon_states(icon_file))
@@ -339,7 +341,6 @@
 				item = new k()
 				I = icon(item.icon, item.icon_state, SOUTH)
 				qdel(item)
-		var/imgid = replacetext(replacetext("[k]", "/obj/item/", ""), "/", "-")
 
 		Insert(imgid, I)
 	return ..()

From 9e64234fd26e36decacb8dd9787e2a58ddc61ad9 Mon Sep 17 00:00:00 2001
From: cm13-github <128137806+cm13-github@users.noreply.github.com>
Date: Fri, 1 Dec 2023 20:58:21 +0000
Subject: [PATCH 30/58] Automatic changelog for PR #4962 [ci skip]

---
 html/changelogs/AutoChangeLog-pr-4962.yml | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 html/changelogs/AutoChangeLog-pr-4962.yml

diff --git a/html/changelogs/AutoChangeLog-pr-4962.yml b/html/changelogs/AutoChangeLog-pr-4962.yml
new file mode 100644
index 000000000000..b7ed6f2cfe7f
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-4962.yml
@@ -0,0 +1,4 @@
+author: "Morrow"
+delete-after: True
+changes:
+  - code_imp: "Corrected a check to avoid repeat work in /datum/asset/spritesheet/vending_products/register()"
\ No newline at end of file

From ee43d8da54139e9f1ba6f3397a5239a4f5d02e36 Mon Sep 17 00:00:00 2001
From: forest2001 <41653574+realforest2001@users.noreply.github.com>
Date: Fri, 1 Dec 2023 22:00:11 +0000
Subject: [PATCH 31/58] Radio TGUI backend Tidy-up & Adds Listening Devices
 (#4866)

# About the pull request
This PR adds listening devices, disguisable objects that can transmit
nearby speech over a radio channel, or in a shortwave-burst like
handheld radios. Four exist on the USS Almayer, two for the MPs and two
for the CL.

I have also gone through the TGUI files to fix missing or incorrect
radio frequency checks regarding the displayed active frequency on
radios, along with adding the channel colours to said UI.
<!-- Remove this text and explain what the purpose of your PR is.

Mention if you have tested your changes. If you changed a map, make sure
you used the mapmerge tool.
If this is an Issue Correction, you can type "Fixes Issue #169420" to
link the PR to the corresponding Issue number #169420.

Remember: something that is self-evident to you might not be to others.
Explain your rationale fully, even if you feel it goes without saying.
-->

# Explain why it's good for the game
# Testing Photographs and Procedure
<details>
<summary>Screenshots & Videos</summary>

Put screenshots and videos here with an empty line between the
screenshots and the `<details>` tags.

</details>


# Changelog
:cl:
add: Added disguisable listening bugs/devices. MPs have two outside CMP
office, the CL has two in their bedroom.
fix: Fixes incorrect frequencies being used to display channel names on
radios.
fix: Radios and tape recorders placed on tables or placed inside webbing
can now hear speech again.
/:cl:
---
 code/__DEFINES/radio.dm                       |   4 +
 code/controllers/subsystem/communications.dm  |  15 +-
 .../items/devices/radio/listening_bugs.dm     | 276 ++++++++++++++++++
 code/modules/clothing/clothing.dm             |   5 +
 code/modules/gear_presets/uscm_event.dm       |   3 +
 code/modules/mob/living/say.dm                |   7 +
 colonialmarines.dme                           |   1 +
 maps/map_files/USS_Almayer/USS_Almayer.dmm    |  32 +-
 .../tgui-panel/styles/goon/chat-dark.scss     |   4 -
 tgui/packages/tgui/constants.js               | 222 +++++++++-----
 tgui/public/tgui-panel.bundle.css             |   2 +-
 11 files changed, 493 insertions(+), 78 deletions(-)
 create mode 100644 code/game/objects/items/devices/radio/listening_bugs.dm

diff --git a/code/__DEFINES/radio.dm b/code/__DEFINES/radio.dm
index e2bd155fcb0d..cc1831501bad 100644
--- a/code/__DEFINES/radio.dm
+++ b/code/__DEFINES/radio.dm
@@ -61,6 +61,10 @@
 #define RADIO_CHANNEL_PMC_CCT "PMC CCT"
 #define RADIO_CHANNEL_WY_WO "SpecOps"
 
+//Listening Devices
+#define RADIO_CHANNEL_BUG_A "Listening Device A"
+#define RADIO_CHANNEL_BUG_B "Listening Device B"
+
 //1-Channel ERTs
 #define RADIO_CHANNEL_DUTCH_DOZEN "DD"
 #define RADIO_CHANNEL_VAI "VAI"
diff --git a/code/controllers/subsystem/communications.dm b/code/controllers/subsystem/communications.dm
index 95839b726151..b8b037c33381 100644
--- a/code/controllers/subsystem/communications.dm
+++ b/code/controllers/subsystem/communications.dm
@@ -71,9 +71,9 @@ Radiochat range: 1441 to 1489 (most devices refuse to be tune to other frequency
 //Misc channels
 #define YAUT_FREQ 1205
 #define DUT_FREQ 1210
-#define CMB_FREQ 1220
 #define VAI_FREQ 1215
 #define RMC_FREQ 1216
+#define CMB_FREQ 1220
 
 //WY Channels (1230-1249)
 #define WY_FREQ 1231
@@ -99,6 +99,11 @@ Radiochat range: 1441 to 1489 (most devices refuse to be tune to other frequency
 #define CLF_MED_FREQ 1274
 #define CLF_CCT_FREQ 1275
 
+//Listening Bugs (1290-1291)
+#define BUG_A_FREQ 1290
+#define BUG_B_FREQ 1291
+
+//General Radio
 #define MIN_FREQ 1460 // ------------------------------------------------------
 #define PUB_FREQ 1461
 #define MAX_FREQ 1468 // ------------------------------------------------------
@@ -191,6 +196,9 @@ GLOBAL_LIST_INIT(radiochannels, list(
 	RADIO_CHANNEL_CLF_ENGI = CLF_ENGI_FREQ,
 	RADIO_CHANNEL_CLF_MED = CLF_MED_FREQ,
 	RADIO_CHANNEL_CLF_CCT = CLF_CCT_FREQ,
+
+	RADIO_CHANNEL_BUG_A = BUG_A_FREQ,
+	RADIO_CHANNEL_BUG_B = BUG_B_FREQ,
 ))
 
 // Response Teams
@@ -205,6 +213,9 @@ GLOBAL_LIST_INIT(radiochannels, list(
 // PMC Frequencies
 #define PMC_FREQS list(PMC_FREQ, PMC_CMD_FREQ, PMC_ENGI_FREQ, PMC_MED_FREQ, PMC_CCT_FREQ, WY_WO_FREQ, WY_FREQ)
 
+//Listening Device Frequencies
+#define BUG_FREQS list(BUG_A_FREQ, BUG_B_FREQ)
+
 //Depts - used for colors in headset.dm, as well as deciding what the marine comms tower can listen into
 #define DEPT_FREQS list(COMM_FREQ, MED_FREQ, ENG_FREQ, SEC_FREQ, SENTRY_FREQ, ALPHA_FREQ, BRAVO_FREQ, CHARLIE_FREQ, DELTA_FREQ, ECHO_FREQ, CRYO_FREQ, REQ_FREQ, JTAC_FREQ, INTEL_FREQ, WY_FREQ)
 
@@ -269,6 +280,8 @@ SUBSYSTEM_DEF(radio)
 		"[HC_FREQ]" = "hcradio",
 		"[PVST_FREQ]" = "pvstradio",
 		"[COLONY_FREQ]" = "deptradio",
+		"[BUG_A_FREQ]" = "airadio",
+		"[BUG_B_FREQ]" = "aiprivradio",
 	)
 
 /datum/controller/subsystem/radio/proc/add_object(obj/device as obj, new_frequency as num, filter = null as text|null)
diff --git a/code/game/objects/items/devices/radio/listening_bugs.dm b/code/game/objects/items/devices/radio/listening_bugs.dm
new file mode 100644
index 000000000000..4a84df071c60
--- /dev/null
+++ b/code/game/objects/items/devices/radio/listening_bugs.dm
@@ -0,0 +1,276 @@
+#define DISGUISE_REMOVE "remove disguise"
+#define DISGUISE_RADIO "radio"
+#define DISGUISE_PEN "pen"
+#define DISGUISE_FOUNTAIN_PEN "fountain pen"
+#define DISGUISE_ACCESS_TUNER "access tuner"
+#define DISGUISE_WHISTLE "whistle"
+#define DISGUISE_MASS_SPEC "mass-spectrometer"
+#define DISGUISE_CAMERA "camera"
+#define DISGUISE_ZIPPO "zippo lighter"
+#define DISGUISE_TAPE_RECORDER "tape recorder"
+
+/obj/item/device/radio/listening_bug
+	name = "listening device"
+	desc = "A small, and disguisable, listening device."
+
+	icon = 'icons/obj/items/devices.dmi'
+	icon_state = "voice0"
+	item_state = "analyzer"
+
+	w_class = SIZE_TINY
+	volume = RADIO_VOLUME_RAISED
+
+	broadcasting = FALSE
+	listening = FALSE
+	frequency = BUG_A_FREQ
+	canhear_range = 2
+	freqlock = TRUE
+	/// If the bug is disguised or not.
+	var/ready_to_disguise = FALSE
+	var/disguised = FALSE
+	/// Whether or not the bug can be used to listen to its own channel.
+	var/prevent_snooping = FALSE
+	/// The ID tag of the device, for identification.
+	var/nametag = "Device"
+
+/obj/item/device/radio/listening_bug/ui_data(mob/user)
+	var/list/data = list()
+
+	data["broadcasting"] = broadcasting
+	data["listening"] = listening
+	data["frequency"] = frequency
+	data["freqlock"] = freqlock
+
+	var/list/radio_channels = list()
+
+	for(var/channel in channels)
+		var/channel_key = channel_to_prefix(channel)
+		radio_channels += list(list(
+			"name" = channel,
+			"status" = channels[channel] & FREQ_LISTENING,
+			"hotkey" = channel_key))
+
+	data["channels"] = radio_channels
+
+	data["command"] = volume
+	data["useCommand"] = use_volume
+	data["subspace"] = subspace_transmission
+	data["subspaceSwitchable"] = subspace_switchable
+	data["headset"] = FALSE
+
+	return data
+
+/obj/item/device/radio/listening_bug/ui_act(action, params, datum/tgui/ui, datum/ui_state/state)
+	switch(action)
+		if("listen")
+			if(prevent_snooping)
+				to_chat(usr, SPAN_WARNING("This device cannot receive transmissions!"))
+				return
+			listening = !listening
+			return
+		if("subspace")
+			if(!ishuman(usr))
+				return
+			var/mob/living/carbon/human/user = usr
+			if(!check_access(user.wear_id) && !check_access(user.get_active_hand()))
+				to_chat(user, SPAN_WARNING("You need an authenticated ID card to change this function!"))
+				return
+			if(subspace_switchable)
+				subspace_transmission = !subspace_transmission
+				var/initial_prevent = initial(prevent_snooping)
+				if(initial_prevent)
+					prevent_snooping = TRUE
+				if(!subspace_transmission)
+					prevent_snooping = FALSE
+					channels = list()
+				return
+	..()
+
+/obj/item/device/radio/listening_bug/hear_talk(mob/M as mob, msg, verb = "says", datum/language/speaking = null)
+	var/processed_verb = "[SPAN_RED("\[LSTN [nametag]\]")] [verb]"
+	if(broadcasting)
+		if(get_dist(src, M) <= 7)
+			talk_into(M, msg,null,processed_verb,speaking)
+
+/obj/item/device/radio/listening_bug/afterattack(atom/target_atom, mob/user as mob, proximity)
+	if(!ready_to_disguise)
+		return ..()
+
+	var/obj/item/target_item = target_atom
+	if(!istype(target_item) || target_item.anchored || target_item.w_class >= SIZE_LARGE)
+		to_chat(user, SPAN_WARNING("You cannot disguise the listening device as this object."))
+		return FALSE
+
+	var/confirm = tgui_alert(user, "Are you sure you wish to disguise the listening device as '[target_item]'?", "Confirm Choice", list("Yes","No"), 20 SECONDS)
+	if(confirm != "Yes")
+		return FALSE
+
+	icon = target_item.icon
+	name = target_item.name
+	desc = target_item.desc
+	icon_state = target_item.icon_state
+	item_state = target_item.item_state
+	flags_equip_slot = target_item.flags_equip_slot
+	w_class = target_item.w_class
+	ready_to_disguise = FALSE
+	disguised = TRUE
+
+/obj/item/device/radio/listening_bug/get_examine_text(mob/user)
+	if(disguised)
+		. = list()
+		var/size
+		switch(w_class)
+			if(SIZE_TINY)
+				size = "tiny"
+			if(SIZE_SMALL)
+				size = "small"
+			if(SIZE_MEDIUM)
+				size = "normal-sized"
+		. += "This is a [blood_color ? blood_color != "#030303" ? "bloody " : "oil-stained " : ""][icon2html(src, user)][src.name]. It is a [size] item."
+		if(desc)
+			. += desc
+		if(desc_lore)
+			. += SPAN_NOTICE("This has an <a href='byond://?src=\ref[src];desc_lore=1'>extended lore description</a>.")
+	else
+		. = ..()
+		. += SPAN_INFO("[src] is set to frequency [get_bug_letter()].")
+		if(nametag != initial(nametag))
+			. += SPAN_INFO("[src]'s nametag is set to '[nametag]'")
+
+/obj/item/device/radio/listening_bug/verb/change_disguise()
+	set name = "Change Disguise"
+	set category = "Object"
+	set src in usr
+
+	if(usr.is_mob_incapacitated())
+		to_chat(usr, SPAN_WARNING("You cannot do this while incapacitated!"))
+		return FALSE
+
+	var/check = tgui_alert(usr, "Do you wish to change the disguise of this listening bug?", "Change Disguise?", list("Yes", "No"))
+	if(check != "Yes")
+		return FALSE
+	if(disguised)
+		var/remove_check = tgui_alert(usr, "Do you wish to remove the current disguise?", "Remove Disguise?", list("Yes","No"))
+		if(remove_check == "Yes")
+			icon = initial(icon)
+			name = initial(name)
+			desc = initial(desc)
+			icon_state = initial(icon_state)
+			item_state = initial(item_state)
+			flags_equip_slot = initial(flags_equip_slot)
+			w_class = initial(w_class)
+			disguised = FALSE
+			return TRUE
+
+	to_chat(usr, SPAN_HELPFUL("You can now change the disguise of the device by selecting a normal, or smaller, sized object."))
+	ready_to_disguise = TRUE
+	return TRUE
+
+/obj/item/device/radio/listening_bug/proc/get_bug_letter()
+	switch(frequency)
+		if(BUG_A_FREQ)
+			return "A"
+		if(BUG_B_FREQ)
+			return "B"
+		if(SEC_FREQ)
+			return "MP"
+		if(PVST_FREQ)
+			return "PVST"
+		if(HC_FREQ)
+			return "HC"
+		if(WY_FREQ, PMC_CCT_FREQ)
+			return "WY"
+		if(PMC_CMD_FREQ)
+			return "WYC"
+		if(UPP_CCT_FREQ, UPP_KDO_FREQ)
+			return "UPP"
+		else
+			return "X"
+
+#define OPTION_REMOVE "Remove Tag"
+#define OPTION_NEW "New Tag"
+
+/obj/item/device/radio/listening_bug/verb/set_nametag()
+	set name = "Set Nametag"
+	set category = "Object"
+	set src in usr
+
+	if(usr.is_mob_incapacitated())
+		to_chat(usr, SPAN_WARNING("You cannot do this while incapacitated!"))
+		return FALSE
+
+	var/check = tgui_alert(usr, "Do you wish to change the name tag of this listening bug?", "Change Name tag?", list("Yes", "No"))
+	if(check != "Yes")
+		return FALSE
+
+
+	var/new_nametag
+	var/remove
+	if(nametag != initial(nametag))
+		remove = tgui_alert(usr, "Do you wish to remove the current nametag?", "Remove Nametag", list("Yes", "No"))
+	if(remove == "Yes")
+		new_nametag = initial(nametag)
+	else
+		new_nametag = tgui_input_text(usr, "What new name tag do you wish to use?", "New Name", initial(nametag), 6)
+
+	if(!new_nametag || (new_nametag == nametag))
+		return FALSE
+
+	nametag = new_nametag
+	log_game("[key_name(usr)] set a listening device nametag to [new_nametag].")
+	return TRUE
+
+#undef OPTION_REMOVE
+#undef OPTION_NEW
+
+/obj/item/device/radio/listening_bug/freq_a
+	frequency = BUG_A_FREQ
+
+/obj/item/device/radio/listening_bug/freq_b
+	frequency = BUG_B_FREQ
+
+/obj/item/device/radio/listening_bug/radio_linked
+	prevent_snooping = TRUE
+	subspace_transmission = TRUE
+	subspace_switchable = TRUE
+
+/obj/item/device/radio/listening_bug/radio_linked/mp
+	frequency = SEC_FREQ
+	req_one_access = list(ACCESS_MARINE_BRIG)
+
+/obj/item/device/radio/listening_bug/radio_linked/hc
+	frequency = HC_FREQ
+	req_one_access = list(ACCESS_MARINE_CO)
+/obj/item/device/radio/listening_bug/radio_linked/hc/pvst
+	frequency = PVST_FREQ
+
+/obj/item/device/radio/listening_bug/radio_linked/wy
+	frequency = WY_FREQ
+	req_one_access = list(ACCESS_WY_EXEC, ACCESS_WY_SECURITY)
+
+/obj/item/device/radio/listening_bug/radio_linked/wy/pmc
+	frequency = PMC_CCT_FREQ
+	req_one_access = list(ACCESS_WY_EXEC, ACCESS_WY_SECURITY)
+
+/obj/item/device/radio/listening_bug/radio_linked/upp
+	frequency = UPP_CCT_FREQ
+	req_one_access = list(ACCESS_UPP_COMMANDO, ACCESS_UPP_SECURITY)
+
+/obj/item/device/radio/listening_bug/radio_linked/upp/commando
+	frequency = UPP_KDO_FREQ
+	req_one_access = list(ACCESS_UPP_COMMANDO)
+
+
+// ENCRYPTION KEYS FOR LISTENING IN!
+//REQURIES SUBSPACE ACTIVATION ON THE BUGS FIRST!
+/obj/item/device/encryptionkey/listening_bug
+	desc = "A small encryption key for listening to a secret broadcasting device! Unlikely to work if the device is not using subspace communications!"
+	icon_state = "stripped_key"
+
+/obj/item/device/encryptionkey/listening_bug/freq_a
+	name = "Listening Bug Encryption Key (A)"
+	channels = list(RADIO_CHANNEL_BUG_A = TRUE)
+
+/obj/item/device/encryptionkey/listening_bug/freq_b
+	name = "Listening Bug Encryption Key (B)"
+	channels = list(RADIO_CHANNEL_BUG_B = TRUE)
diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm
index 4eafeed6c378..d6596474885c 100644
--- a/code/modules/clothing/clothing.dm
+++ b/code/modules/clothing/clothing.dm
@@ -48,6 +48,11 @@
 		return
 	..()
 
+/obj/item/clothing/hear_talk(mob/M, msg)
+	for(var/obj/item/clothing/accessory/attached in accessories)
+		attached.hear_talk(M, msg)
+	..()
+
 /obj/item/clothing/proc/get_armor(armortype)
 	var/armor_total = 0
 	var/armor_count = 0
diff --git a/code/modules/gear_presets/uscm_event.dm b/code/modules/gear_presets/uscm_event.dm
index 5f7c40c016e0..12db6323ac40 100644
--- a/code/modules/gear_presets/uscm_event.dm
+++ b/code/modules/gear_presets/uscm_event.dm
@@ -303,6 +303,9 @@
 	new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK)
 	new_human.equip_to_slot_or_del(new /obj/item/device/taperecorder(new_human), WEAR_L_STORE)
 	new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/large(new_human), WEAR_R_STORE)
+	new_human.equip_to_slot_or_del(new /obj/item/device/radio/listening_bug/radio_linked/hc/pvst(new_human), WEAR_IN_R_STORE)
+	new_human.equip_to_slot_or_del(new /obj/item/device/radio/listening_bug/radio_linked/hc/pvst(new_human), WEAR_IN_R_STORE)
+	new_human.equip_to_slot_or_del(new /obj/item/device/radio/listening_bug/radio_linked/hc/pvst(new_human), WEAR_IN_R_STORE)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/MP/provost/light/flexi(new_human.back), WEAR_IN_BACK)
 
 	new_human.equip_to_slot_or_del(new /obj/item/device/flash(new_human), WEAR_IN_JACKET)
diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm
index 36ae23587a28..9fa38d1ecb43 100644
--- a/code/modules/mob/living/say.dm
+++ b/code/modules/mob/living/say.dm
@@ -118,6 +118,13 @@ GLOBAL_LIST_INIT(department_radio_keys, list(
 					listening += M
 					hearturfs += M.locs[1]
 					for(var/obj/O in M.contents)
+						var/obj/item/clothing/worn_item = O
+						if((O.flags_atom & USES_HEARING) || ((istype(worn_item) && worn_item.accessories)))
+							listening_obj |= O
+				else if(istype(I, /obj/structure/surface))
+					var/obj/structure/surface/table = I
+					hearturfs += table.locs[1]
+					for(var/obj/O in table.contents)
 						if(O.flags_atom & USES_HEARING)
 							listening_obj |= O
 				else if(istype(I, /obj/))
diff --git a/colonialmarines.dme b/colonialmarines.dme
index 6728b6849445..16b54d55aa98 100644
--- a/colonialmarines.dme
+++ b/colonialmarines.dme
@@ -1090,6 +1090,7 @@
 #include "code\game\objects\items\devices\radio\encryptionkey.dm"
 #include "code\game\objects\items\devices\radio\headset.dm"
 #include "code\game\objects\items\devices\radio\intercom.dm"
+#include "code\game\objects\items\devices\radio\listening_bugs.dm"
 #include "code\game\objects\items\devices\radio\radio.dm"
 #include "code\game\objects\items\explosives\explosive.dm"
 #include "code\game\objects\items\explosives\mine.dm"
diff --git a/maps/map_files/USS_Almayer/USS_Almayer.dmm b/maps/map_files/USS_Almayer/USS_Almayer.dmm
index 25926395d624..895f0aaf42b8 100644
--- a/maps/map_files/USS_Almayer/USS_Almayer.dmm
+++ b/maps/map_files/USS_Almayer/USS_Almayer.dmm
@@ -39549,6 +39549,19 @@
 /obj/structure/flora/pottedplant{
 	icon_state = "pottedplant_10"
 	},
+/obj/structure/closet/secure_closet/cmdcabinet{
+	pixel_y = 24;
+	desc = "A bulletproof cabinet containing communications equipment.";
+	name = "communications cabinet";
+	req_access = null;
+	req_one_access_txt = "207;203"
+	},
+/obj/item/device/radio,
+/obj/item/device/radio/listening_bug/radio_linked/wy,
+/obj/item/device/radio/listening_bug/radio_linked/wy{
+	pixel_x = 4;
+	pixel_y = -3
+	},
 /turf/open/floor/wood/ship,
 /area/almayer/command/corporateliason)
 "hpk" = (
@@ -60621,6 +60634,23 @@
 	icon_state = "sterile_green_side"
 	},
 /area/almayer/medical/medical_science)
+"qan" = (
+/obj/item/device/radio/listening_bug/radio_linked/mp{
+	pixel_y = 8
+	},
+/obj/item/device/radio/listening_bug/radio_linked/mp,
+/obj/structure/closet/secure_closet/cmdcabinet{
+	pixel_y = 24;
+	desc = "A bulletproof cabinet containing communications equipment.";
+	name = "communications cabinet";
+	req_access = null;
+	req_one_access_txt = "3"
+	},
+/turf/open/floor/almayer{
+	dir = 1;
+	icon_state = "red"
+	},
+/area/almayer/shipboard/brig/main_office)
 "qau" = (
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 4
@@ -89865,7 +89895,7 @@ tak
 tak
 bvx
 xys
-ldu
+qan
 eRL
 eRL
 mLJ
diff --git a/tgui/packages/tgui-panel/styles/goon/chat-dark.scss b/tgui/packages/tgui-panel/styles/goon/chat-dark.scss
index 835a94341708..b4e59f32c121 100644
--- a/tgui/packages/tgui-panel/styles/goon/chat-dark.scss
+++ b/tgui/packages/tgui-panel/styles/goon/chat-dark.scss
@@ -956,10 +956,6 @@ em {
   color: #844300;
 }
 
-.sentryradio {
-  color: #844300;
-}
-
 .medradio {
   color: #008160;
 }
diff --git a/tgui/packages/tgui/constants.js b/tgui/packages/tgui/constants.js
index 3d7530e7ead8..0ec51380a322 100644
--- a/tgui/packages/tgui/constants.js
+++ b/tgui/packages/tgui/constants.js
@@ -80,153 +80,233 @@ export const CSS_COLORS = [
 export const RADIO_CHANNELS = [
   {
     name: 'Yautja',
-    freq: 1214,
+    freq: 1205,
     color: '#1ecc43',
   },
   {
-    name: 'PMC',
-    freq: 1235,
+    name: "Dutch's Dozen",
+    freq: 1210,
     color: '#1ecc43',
   },
+  {
+    name: 'VAI',
+    freq: 1215,
+    color: '#e3580e',
+  },
+  {
+    name: 'CMB',
+    freq: 1220,
+    color: '#1b748c',
+  },
   {
     name: 'WY',
-    freq: 1236,
-    color: '#1ecc43',
+    freq: 1231,
+    color: '#fe9b24',
   },
   {
-    name: "Dutch's Dozen",
-    freq: 1340,
-    color: '#1ecc43',
+    name: 'PMC CMD',
+    freq: 1232,
+    color: '#4dc5ce',
   },
   {
-    name: 'VAI',
-    freq: 1218,
-    color: '#1ecc43',
+    name: 'PMC',
+    freq: 1233,
+    color: '#4dc5ce',
   },
   {
-    name: 'ERT',
-    freq: 1342,
-    color: '#1ecc43',
+    name: 'PMC ENG',
+    freq: 1234,
+    color: '#4dc5ce',
+  },
+  {
+    name: 'PMC MED',
+    freq: 1235,
+    color: '#4dc5ce',
+  },
+  {
+    name: 'PMC CCT',
+    freq: 1236,
+    color: '#4dc5ce',
+  },
+  {
+    name: 'Deathsquad',
+    freq: 1239,
+    color: '#fe9b24',
   },
   {
     name: 'UPP',
-    freq: 1338,
-    color: '#1ecc43',
+    freq: 1251,
+    color: '#8f4a4b',
+  },
+  {
+    name: 'UPP CMD',
+    freq: 1252,
+    color: '#8f4a4b',
+  },
+  {
+    name: 'UPP ENG',
+    freq: 1253,
+    color: '#8f4a4b',
+  },
+  {
+    name: 'UPP MED',
+    freq: 1254,
+    color: '#8f4a4b',
+  },
+  {
+    name: 'UPP CCT',
+    freq: 1255,
+    color: '#8f4a4b',
+  },
+  {
+    name: 'UPP KDO',
+    freq: 1259,
+    color: '#8f4a4b',
   },
   {
     name: 'CLF',
-    freq: 1339,
-    color: '#1ecc43',
+    freq: 1271,
+    color: '#8e83ca',
   },
   {
-    name: 'Deathsquad',
-    freq: 1344,
+    name: 'CLF CMD',
+    freq: 1272,
+    color: '#8e83ca',
+  },
+  {
+    name: 'CLF ENG',
+    freq: 1273,
+    color: '#8e83ca',
+  },
+  {
+    name: 'CLF MED',
+    freq: 1274,
+    color: '#8e83ca',
+  },
+  {
+    name: 'CLF CCT',
+    freq: 1275,
+    color: '#8e83ca',
+  },
+  {
+    name: 'LSTN BUG A',
+    freq: 1290,
+    color: '#d65d95',
+  },
+  {
+    name: 'LSTN BUG B',
+    freq: 1291,
+    color: '#d65d95',
+  },
+  {
+    name: 'Common',
+    freq: 1461,
     color: '#1ecc43',
   },
   {
-    name: 'ARES',
-    freq: 1447,
+    name: 'Colony',
+    freq: 1469,
     color: '#1ecc43',
   },
   {
     name: 'High Command',
-    freq: 1240,
-    color: '#1ecc43',
+    freq: 1471,
+    color: '#318779',
   },
   {
-    name: 'CCT',
-    freq: 1350,
-    color: '#1ecc43',
+    name: 'SOF',
+    freq: 1472,
+    color: '#318779',
+  },
+  {
+    name: 'Provost',
+    freq: 1473,
+    color: '#9b0612',
+  },
+  {
+    name: 'Sentry',
+    freq: 1480,
+    color: '#844300',
   },
   {
     name: 'Command',
-    freq: 1353,
-    color: '#1ecc43',
+    freq: 1481,
+    color: '#779cc2',
   },
   {
     name: 'Medsci',
-    freq: 1355,
-    color: '#1ecc43',
+    freq: 1482,
+    color: '#008160',
   },
   {
     name: 'Engineering',
-    freq: 1357,
-    color: '#1ecc43',
+    freq: 1483,
+    color: '#a66300',
   },
   {
     name: 'MP',
-    freq: 1359,
-    color: '#1ecc43',
+    freq: 1484,
+    color: '#a52929',
   },
   {
     name: 'Req',
-    freq: 1354,
-    color: '#1ecc43',
+    freq: 1485,
+    color: '#ba8e41',
   },
   {
     name: 'JTAC',
-    freq: 1358,
-    color: '#1ecc43',
+    freq: 1486,
+    color: '#ad3b98',
   },
   {
     name: 'Intel',
-    freq: 1356,
-    color: '#1ecc43',
+    freq: 1487,
+    color: '#027d02',
   },
   {
     name: 'Alamo',
-    freq: 1441,
+    freq: 1488,
     color: '#1ecc43',
   },
   {
     name: 'Normandy',
-    freq: 1443,
+    freq: 1489,
     color: '#1ecc43',
   },
   {
     name: 'Alpha',
-    freq: 1449,
-    color: '#1ecc43',
+    freq: 1491,
+    color: '#db2626',
   },
   {
     name: 'Bravo',
-    freq: 1451,
-    color: '#1ecc43',
-  },
-  {
-    name: 'Common',
-    freq: 1461,
-    color: '#1ecc43',
+    freq: 1492,
+    color: '#c68610',
   },
   {
-    name: 'Colony',
-    freq: 1469,
-    color: '#1ecc43',
-  },
-  {
-    name: 'MARSOC',
-    freq: 1241,
-    color: '#1ecc43',
+    name: 'Charlie',
+    freq: 1493,
+    color: '#aa55aa',
   },
   {
-    name: 'Reserves',
-    freq: 1457,
-    color: '#1ecc43',
+    name: 'Delta',
+    freq: 1494,
+    color: '#007fcf',
   },
   {
     name: 'Echo',
-    freq: 1456,
-    color: '#1ecc43',
+    freq: 1495,
+    color: '#3eb489',
   },
   {
-    name: 'Delta',
-    freq: 1455,
-    color: '#1ecc43',
+    name: 'Reserves',
+    freq: 1496,
+    color: '#ad6d48',
   },
   {
-    name: 'Charlie',
-    freq: 1453,
-    color: '#1ecc43',
+    name: 'ARES',
+    freq: 1500,
+    color: '#ff00ff',
   },
 ];
 
diff --git a/tgui/public/tgui-panel.bundle.css b/tgui/public/tgui-panel.bundle.css
index 3cb39fe3dbb8..9a9fc658bc7a 100644
--- a/tgui/public/tgui-panel.bundle.css
+++ b/tgui/public/tgui-panel.bundle.css
@@ -1,2 +1,2 @@
-html,body{box-sizing:border-box;height:100%;margin:0;font-size:12px}html{overflow:hidden;cursor:default}body{overflow:auto;font-family:Verdana,Geneva,sans-serif}*,*:before,*:after{box-sizing:inherit}h1,h2,h3,h4,h5,h6{display:block;margin:0;padding:6px 0;padding:.5rem 0}h1{font-size:18px;font-size:1.5rem}h2{font-size:16px;font-size:1.333rem}h3{font-size:14px;font-size:1.167rem}h4{font-size:12px;font-size:1rem}td,th{vertical-align:baseline;text-align:left}.candystripe:nth-child(odd){background-color:rgba(0,0,0,.25)}.color-black{color:#1a1a1a !important}.color-white{color:#fff !important}.color-red{color:#df3e3e !important}.color-orange{color:#f37f33 !important}.color-yellow{color:#fbda21 !important}.color-olive{color:#cbe41c !important}.color-green{color:#25ca4c !important}.color-teal{color:#00d6cc !important}.color-blue{color:#2e93de !important}.color-dark-blue{color:#005fa7 !important}.color-violet{color:#7349cf !important}.color-purple{color:#ad45d0 !important}.color-pink{color:#e34da1 !important}.color-brown{color:#b97447 !important}.color-grey{color:#848484 !important}.color-light-grey{color:#b3b3b3 !important}.color-good{color:#68c22d !important}.color-average{color:#f29a29 !important}.color-bad{color:#df3e3e !important}.color-label{color:#8b9bb0 !important}.color-xeno{color:#664573 !important}.color-bg-black{background-color:#000 !important}.color-bg-white{background-color:#d9d9d9 !important}.color-bg-red{background-color:#bd2020 !important}.color-bg-orange{background-color:#d95e0c !important}.color-bg-yellow{background-color:#d9b804 !important}.color-bg-olive{background-color:#9aad14 !important}.color-bg-green{background-color:#1b9638 !important}.color-bg-teal{background-color:#009a93 !important}.color-bg-blue{background-color:#1c71b1 !important}.color-bg-dark-blue{background-color:#003e6e !important}.color-bg-violet{background-color:#552dab !important}.color-bg-purple{background-color:#8b2baa !important}.color-bg-pink{background-color:#cf2082 !important}.color-bg-brown{background-color:#8c5836 !important}.color-bg-grey{background-color:#646464 !important}.color-bg-light-grey{background-color:#919191 !important}.color-bg-good{background-color:#4d9121 !important}.color-bg-average{background-color:#cd7a0d !important}.color-bg-bad{background-color:#bd2020 !important}.color-bg-label{background-color:#657a94 !important}.color-bg-xeno{background-color:#462f4e !important}.debug-layout,.debug-layout *:not(g):not(path){color:rgba(255,255,255,.9) !important;background:transparent !important;outline:1px solid rgba(255,255,255,.5) !important;box-shadow:none !important;filter:none !important}.debug-layout:hover,.debug-layout *:not(g):not(path):hover{outline-color:rgba(255,255,255,.8) !important}.outline-dotted{outline-style:dotted !important}.outline-dashed{outline-style:dashed !important}.outline-solid{outline-style:solid !important}.outline-double{outline-style:double !important}.outline-groove{outline-style:groove !important}.outline-ridge{outline-style:ridge !important}.outline-inset{outline-style:inset !important}.outline-outset{outline-style:outset !important}.outline-color-black{outline:.167rem solid #1a1a1a !important}.outline-color-white{outline:.167rem solid #fff !important}.outline-color-red{outline:.167rem solid #df3e3e !important}.outline-color-orange{outline:.167rem solid #f37f33 !important}.outline-color-yellow{outline:.167rem solid #fbda21 !important}.outline-color-olive{outline:.167rem solid #cbe41c !important}.outline-color-green{outline:.167rem solid #25ca4c !important}.outline-color-teal{outline:.167rem solid #00d6cc !important}.outline-color-blue{outline:.167rem solid #2e93de !important}.outline-color-dark-blue{outline:.167rem solid #005fa7 !important}.outline-color-violet{outline:.167rem solid #7349cf !important}.outline-color-purple{outline:.167rem solid #ad45d0 !important}.outline-color-pink{outline:.167rem solid #e34da1 !important}.outline-color-brown{outline:.167rem solid #b97447 !important}.outline-color-grey{outline:.167rem solid #848484 !important}.outline-color-light-grey{outline:.167rem solid #b3b3b3 !important}.outline-color-good{outline:.167rem solid #68c22d !important}.outline-color-average{outline:.167rem solid #f29a29 !important}.outline-color-bad{outline:.167rem solid #df3e3e !important}.outline-color-label{outline:.167rem solid #8b9bb0 !important}.outline-color-xeno{outline:.167rem solid #664573 !important}.text-left{text-align:left}.text-center{text-align:center}.text-right{text-align:right}.text-baseline{text-align:baseline}.text-justify{text-align:justify}.text-nowrap{white-space:nowrap}.text-pre{white-space:pre}.text-bold{font-weight:bold}.text-italic{font-style:italic}.text-underline{text-decoration:underline}.BlockQuote{color:#8b9bb0;border-left:.1666666667em solid #8b9bb0;padding-left:.5em;margin-bottom:.5em}.BlockQuote:last-child{margin-bottom:0}.Button{position:relative;display:inline-block;line-height:1.667em;padding:0 .5em;margin-right:.1666666667em;white-space:nowrap;outline:0;border-radius:.16em;margin-bottom:.1666666667em;user-select:none;-ms-user-select:none}.Button:last-child{margin-right:0;margin-bottom:0}.Button .fa,.Button .fas,.Button .far{margin-left:-0.25em;margin-right:-0.25em;min-width:1.333em;text-align:center}.Button--hasContent .fa,.Button--hasContent .fas,.Button--hasContent .far{margin-right:.25em}.Button--hasContent.Button--iconPosition--right .fa,.Button--hasContent.Button--iconPosition--right .fas,.Button--hasContent.Button--iconPosition--right .far{margin-right:0px;margin-left:3px}.Button--ellipsis{overflow:hidden;text-overflow:ellipsis}.Button--fluid{display:block;margin-left:0;margin-right:0}.Button--circular{border-radius:50%}.Button--compact{padding:0 .25em;line-height:1.333em}.Button--color--black{transition:color 50ms,background-color 50ms;background-color:#000;color:#fff}.Button--color--black:hover{transition:color 0ms,background-color 0ms}.Button--color--black:focus{transition:color 100ms,background-color 100ms}.Button--color--black:hover,.Button--color--black:focus{background-color:#131313;color:#fff}.Button--color--white{transition:color 50ms,background-color 50ms;background-color:#d9d9d9;color:#000}.Button--color--white:hover{transition:color 0ms,background-color 0ms}.Button--color--white:focus{transition:color 100ms,background-color 100ms}.Button--color--white:hover,.Button--color--white:focus{background-color:#f8f8f8;color:#000}.Button--color--red{transition:color 50ms,background-color 50ms;background-color:#bd2020;color:#fff}.Button--color--red:hover{transition:color 0ms,background-color 0ms}.Button--color--red:focus{transition:color 100ms,background-color 100ms}.Button--color--red:hover,.Button--color--red:focus{background-color:#dc4848;color:#fff}.Button--color--orange{transition:color 50ms,background-color 50ms;background-color:#d95e0c;color:#fff}.Button--color--orange:hover{transition:color 0ms,background-color 0ms}.Button--color--orange:focus{transition:color 100ms,background-color 100ms}.Button--color--orange:hover,.Button--color--orange:focus{background-color:#f0853f;color:#fff}.Button--color--yellow{transition:color 50ms,background-color 50ms;background-color:#d9b804;color:#000}.Button--color--yellow:hover{transition:color 0ms,background-color 0ms}.Button--color--yellow:focus{transition:color 100ms,background-color 100ms}.Button--color--yellow:hover,.Button--color--yellow:focus{background-color:#f5d72e;color:#000}.Button--color--olive{transition:color 50ms,background-color 50ms;background-color:#9aad14;color:#fff}.Button--color--olive:hover{transition:color 0ms,background-color 0ms}.Button--color--olive:focus{transition:color 100ms,background-color 100ms}.Button--color--olive:hover,.Button--color--olive:focus{background-color:#c4da2b;color:#fff}.Button--color--green{transition:color 50ms,background-color 50ms;background-color:#1b9638;color:#fff}.Button--color--green:hover{transition:color 0ms,background-color 0ms}.Button--color--green:focus{transition:color 100ms,background-color 100ms}.Button--color--green:hover,.Button--color--green:focus{background-color:#32c154;color:#fff}.Button--color--teal{transition:color 50ms,background-color 50ms;background-color:#009a93;color:#fff}.Button--color--teal:hover{transition:color 0ms,background-color 0ms}.Button--color--teal:focus{transition:color 100ms,background-color 100ms}.Button--color--teal:hover,.Button--color--teal:focus{background-color:#13c4bc;color:#fff}.Button--color--blue{transition:color 50ms,background-color 50ms;background-color:#1c71b1;color:#fff}.Button--color--blue:hover{transition:color 0ms,background-color 0ms}.Button--color--blue:focus{transition:color 100ms,background-color 100ms}.Button--color--blue:hover,.Button--color--blue:focus{background-color:#3a95d9;color:#fff}.Button--color--dark-blue{transition:color 50ms,background-color 50ms;background-color:#003e6e;color:#fff}.Button--color--dark-blue:hover{transition:color 0ms,background-color 0ms}.Button--color--dark-blue:focus{transition:color 100ms,background-color 100ms}.Button--color--dark-blue:hover,.Button--color--dark-blue:focus{background-color:#135b92;color:#fff}.Button--color--violet{transition:color 50ms,background-color 50ms;background-color:#552dab;color:#fff}.Button--color--violet:hover{transition:color 0ms,background-color 0ms}.Button--color--violet:focus{transition:color 100ms,background-color 100ms}.Button--color--violet:hover,.Button--color--violet:focus{background-color:#7953cc;color:#fff}.Button--color--purple{transition:color 50ms,background-color 50ms;background-color:#8b2baa;color:#fff}.Button--color--purple:hover{transition:color 0ms,background-color 0ms}.Button--color--purple:focus{transition:color 100ms,background-color 100ms}.Button--color--purple:hover,.Button--color--purple:focus{background-color:#ad4fcd;color:#fff}.Button--color--pink{transition:color 50ms,background-color 50ms;background-color:#cf2082;color:#fff}.Button--color--pink:hover{transition:color 0ms,background-color 0ms}.Button--color--pink:focus{transition:color 100ms,background-color 100ms}.Button--color--pink:hover,.Button--color--pink:focus{background-color:#e257a5;color:#fff}.Button--color--brown{transition:color 50ms,background-color 50ms;background-color:#8c5836;color:#fff}.Button--color--brown:hover{transition:color 0ms,background-color 0ms}.Button--color--brown:focus{transition:color 100ms,background-color 100ms}.Button--color--brown:hover,.Button--color--brown:focus{background-color:#b47851;color:#fff}.Button--color--grey{transition:color 50ms,background-color 50ms;background-color:#646464;color:#fff}.Button--color--grey:hover{transition:color 0ms,background-color 0ms}.Button--color--grey:focus{transition:color 100ms,background-color 100ms}.Button--color--grey:hover,.Button--color--grey:focus{background-color:#868686;color:#fff}.Button--color--light-grey{transition:color 50ms,background-color 50ms;background-color:#919191;color:#fff}.Button--color--light-grey:hover{transition:color 0ms,background-color 0ms}.Button--color--light-grey:focus{transition:color 100ms,background-color 100ms}.Button--color--light-grey:hover,.Button--color--light-grey:focus{background-color:#bababa;color:#fff}.Button--color--good{transition:color 50ms,background-color 50ms;background-color:#4d9121;color:#fff}.Button--color--good:hover{transition:color 0ms,background-color 0ms}.Button--color--good:focus{transition:color 100ms,background-color 100ms}.Button--color--good:hover,.Button--color--good:focus{background-color:#6cba39;color:#fff}.Button--color--average{transition:color 50ms,background-color 50ms;background-color:#cd7a0d;color:#fff}.Button--color--average:hover{transition:color 0ms,background-color 0ms}.Button--color--average:focus{transition:color 100ms,background-color 100ms}.Button--color--average:hover,.Button--color--average:focus{background-color:#ed9d35;color:#fff}.Button--color--bad{transition:color 50ms,background-color 50ms;background-color:#bd2020;color:#fff}.Button--color--bad:hover{transition:color 0ms,background-color 0ms}.Button--color--bad:focus{transition:color 100ms,background-color 100ms}.Button--color--bad:hover,.Button--color--bad:focus{background-color:#dc4848;color:#fff}.Button--color--label{transition:color 50ms,background-color 50ms;background-color:#657a94;color:#fff}.Button--color--label:hover{transition:color 0ms,background-color 0ms}.Button--color--label:focus{transition:color 100ms,background-color 100ms}.Button--color--label:hover,.Button--color--label:focus{background-color:#91a1b3;color:#fff}.Button--color--xeno{transition:color 50ms,background-color 50ms;background-color:#462f4e;color:#fff}.Button--color--xeno:hover{transition:color 0ms,background-color 0ms}.Button--color--xeno:focus{transition:color 100ms,background-color 100ms}.Button--color--xeno:hover,.Button--color--xeno:focus{background-color:#64496d;color:#fff}.Button--color--default{transition:color 50ms,background-color 50ms;background-color:#3e6189;color:#fff}.Button--color--default:hover{transition:color 0ms,background-color 0ms}.Button--color--default:focus{transition:color 100ms,background-color 100ms}.Button--color--default:hover,.Button--color--default:focus{background-color:#5c83b0;color:#fff}.Button--color--caution{transition:color 50ms,background-color 50ms;background-color:#d9b804;color:#000}.Button--color--caution:hover{transition:color 0ms,background-color 0ms}.Button--color--caution:focus{transition:color 100ms,background-color 100ms}.Button--color--caution:hover,.Button--color--caution:focus{background-color:#f5d72e;color:#000}.Button--color--danger{transition:color 50ms,background-color 50ms;background-color:#bd2020;color:#fff}.Button--color--danger:hover{transition:color 0ms,background-color 0ms}.Button--color--danger:focus{transition:color 100ms,background-color 100ms}.Button--color--danger:hover,.Button--color--danger:focus{background-color:#dc4848;color:#fff}.Button--color--transparent{transition:color 50ms,background-color 50ms;background-color:#202020;color:#fff;background-color:rgba(32,32,32,0);color:rgba(255,255,255,.5)}.Button--color--transparent:hover{transition:color 0ms,background-color 0ms}.Button--color--transparent:focus{transition:color 100ms,background-color 100ms}.Button--color--transparent:hover,.Button--color--transparent:focus{background-color:#383838;color:#fff}.Button--disabled{background-color:#999 !important}.Button--selected{transition:color 50ms,background-color 50ms;background-color:#1b9638;color:#fff}.Button--selected:hover{transition:color 0ms,background-color 0ms}.Button--selected:focus{transition:color 100ms,background-color 100ms}.Button--selected:hover,.Button--selected:focus{background-color:#32c154;color:#fff}.Button--flex{display:inline-flex;flex-direction:column}.Button--flex--fluid{width:100%}.Button--verticalAlignContent--top{justify-content:flex-start}.Button--verticalAlignContent--middle{justify-content:center}.Button--verticalAlignContent--bottom{justify-content:flex-end}.Button__content{display:block;align-self:stretch}.ColorBox{display:inline-block;width:1em;height:1em;line-height:1em;text-align:center}.Dimmer{display:flex;justify-content:center;align-items:center;position:absolute;top:0;bottom:0;left:0;right:0;background-color:rgba(0,0,0,.75);z-index:1}.Divider--horizontal{margin:.5em 0}.Divider--horizontal:not(.Divider--hidden){border-top:.1666666667em solid rgba(255,255,255,.1)}.Divider--vertical{height:100%;margin:0 .5em}.Divider--vertical:not(.Divider--hidden){border-left:.1666666667em solid rgba(255,255,255,.1)}.Dropdown{position:relative}.Dropdown__control{position:relative;display:inline-block;font-family:Verdana,sans-serif;font-size:1em;width:8.3333333333em;line-height:1.4166666667em;user-select:none}.Dropdown__arrow-button{float:right;padding-left:.35em;width:1.2em;height:1.8333333333em;border-left:.0833333333em solid #000;border-left:.0833333333em solid rgba(0,0,0,.25)}.Dropdown__menu{position:absolute;overflow-y:auto;z-index:5;width:8.3333333333em;max-height:16.6666666667em;overflow-y:scroll;border-radius:0 0 .1666666667em .1666666667em;color:#fff;background-color:#000;background-color:rgba(0,0,0,.75)}.Dropdown__menu-noscroll{position:absolute;overflow-y:auto;z-index:5;width:8.3333333333em;max-height:16.6666666667em;border-radius:0 0 .1666666667em .1666666667em;color:#fff;background-color:#000;background-color:rgba(0,0,0,.75)}.Dropdown__menuentry{padding:.1666666667em .3333333333em;font-family:Verdana,sans-serif;font-size:1em;line-height:1.4166666667em;transition:background-color 100ms ease-out}.Dropdown__menuentry:hover{background-color:rgba(255,255,255,.2);transition:background-color 0ms}.Dropdown__over{top:auto;bottom:100%}.Dropdown__selected-text{display:inline-block;text-overflow:ellipsis;white-space:nowrap;height:1.4166666667em;width:calc(100% - 1.2em)}.Flex{display:-ms-flexbox;display:flex}.Flex--inline{display:inline-flex}.Flex--iefix{display:block}.Flex--iefix.Flex--inline{display:inline-block}.Flex__item--iefix{display:inline-block}.Flex--iefix--column>.Flex__item--iefix{display:block}.Input{position:relative;display:inline-block;width:10em;border:.0833333333em solid #88bfff;border:.0833333333em solid rgba(136,191,255,.75);border-radius:.16em;color:#fff;background-color:#0a0a0a;padding:0 .3333333333em;margin-right:.1666666667em;line-height:1.4166666667em;overflow:visible}.Input--fluid{display:block;width:auto}.Input__baseline{display:inline-block;color:transparent}.Input__input{display:block;position:absolute;top:0;bottom:0;left:0;right:0;border:0;outline:0;width:100%;font-size:1em;line-height:1.4166666667em;height:1.4166666667em;margin:0;padding:0 .5em;font-family:Verdana,sans-serif;background-color:transparent;color:#fff;color:inherit}.Input__input:-ms-input-placeholder{font-style:italic;color:#777;color:rgba(255,255,255,.45)}.Input--monospace .Input__input{font-family:"Consolas",monospace}.Knob{position:relative;font-size:1rem;width:2.6em;height:2.6em;margin:0 auto;margin-bottom:-0.2em;cursor:n-resize}.Knob:after{content:".";color:transparent;line-height:2.5em}.Knob__circle{position:absolute;top:.1em;bottom:.1em;left:.1em;right:.1em;margin:.3em;background-color:#333;background-image:linear-gradient(to bottom, rgba(255, 255, 255, 0.15) 0%, rgba(255, 255, 255, 0) 100%);border-radius:50%;box-shadow:0 .05em .5em 0 rgba(0,0,0,.5)}.Knob__cursorBox{position:absolute;top:0;bottom:0;left:0;right:0}.Knob__cursor{position:relative;top:.05em;margin:0 auto;width:.2em;height:.8em;background-color:rgba(255,255,255,.9)}.Knob__popupValue{position:absolute;top:-2rem;right:50%;font-size:1rem;text-align:center;padding:.25rem .5rem;color:#fff;background-color:#000;transform:translateX(50%);white-space:nowrap}.Knob__ring{position:absolute;top:0;bottom:0;left:0;right:0;padding:.1em}.Knob__ringTrackPivot{transform:rotateZ(135deg)}.Knob__ringTrack{fill:transparent;stroke:rgba(255,255,255,.1);stroke-width:8;stroke-linecap:round;stroke-dasharray:235.62}.Knob__ringFillPivot{transform:rotateZ(135deg)}.Knob--bipolar .Knob__ringFillPivot{transform:rotateZ(270deg)}.Knob__ringFill{fill:transparent;stroke:#6a96c9;stroke-width:8;stroke-linecap:round;stroke-dasharray:314.16;transition:stroke 50ms ease-out}.Knob--color--black .Knob__ringFill{stroke:#1a1a1a}.Knob--color--white .Knob__ringFill{stroke:#fff}.Knob--color--red .Knob__ringFill{stroke:#df3e3e}.Knob--color--orange .Knob__ringFill{stroke:#f37f33}.Knob--color--yellow .Knob__ringFill{stroke:#fbda21}.Knob--color--olive .Knob__ringFill{stroke:#cbe41c}.Knob--color--green .Knob__ringFill{stroke:#25ca4c}.Knob--color--teal .Knob__ringFill{stroke:#00d6cc}.Knob--color--blue .Knob__ringFill{stroke:#2e93de}.Knob--color--dark-blue .Knob__ringFill{stroke:#005fa7}.Knob--color--violet .Knob__ringFill{stroke:#7349cf}.Knob--color--purple .Knob__ringFill{stroke:#ad45d0}.Knob--color--pink .Knob__ringFill{stroke:#e34da1}.Knob--color--brown .Knob__ringFill{stroke:#b97447}.Knob--color--grey .Knob__ringFill{stroke:#848484}.Knob--color--light-grey .Knob__ringFill{stroke:#b3b3b3}.Knob--color--good .Knob__ringFill{stroke:#68c22d}.Knob--color--average .Knob__ringFill{stroke:#f29a29}.Knob--color--bad .Knob__ringFill{stroke:#df3e3e}.Knob--color--label .Knob__ringFill{stroke:#8b9bb0}.Knob--color--xeno .Knob__ringFill{stroke:#664573}.LabeledList{display:table;width:100%;width:calc(100% + 1em);border-collapse:collapse;border-spacing:0;margin:-0.25em -0.5em;margin-bottom:0;padding:0}.LabeledList__row{display:table-row}.LabeledList__row:last-child .LabeledList__cell{padding-bottom:0}.LabeledList__cell{display:table-cell;margin:0;padding:.25em .5em;border:0;text-align:left}.LabeledList__label--nowrap{width:1%;white-space:nowrap;min-width:5em}.LabeledList__buttons{width:.1%;white-space:nowrap;text-align:right;padding-top:.0833333333em;padding-bottom:0}.Modal{background-color:#202020;max-width:calc(100% - 1rem);padding:1rem}.NoticeBox{padding:.33em .5em;margin-bottom:.5em;box-shadow:none;font-weight:bold;font-style:italic;color:#000;background-color:#bb9b68;background-image:repeating-linear-gradient(-45deg, transparent, transparent 0.8333333333em, rgba(0, 0, 0, 0.1) 0.8333333333em, rgba(0, 0, 0, 0.1) 1.6666666667em)}.NoticeBox--color--black{color:#fff;background-color:#000}.NoticeBox--color--white{color:#000;background-color:#b3b3b3}.NoticeBox--color--red{color:#fff;background-color:#701f1f}.NoticeBox--color--orange{color:#fff;background-color:#854114}.NoticeBox--color--yellow{color:#000;background-color:#83710d}.NoticeBox--color--olive{color:#000;background-color:#576015}.NoticeBox--color--green{color:#fff;background-color:#174e24}.NoticeBox--color--teal{color:#fff;background-color:#064845}.NoticeBox--color--blue{color:#fff;background-color:#1b4565}.NoticeBox--color--dark-blue{color:#fff;background-color:#02121f}.NoticeBox--color--violet{color:#fff;background-color:#3b2864}.NoticeBox--color--purple{color:#fff;background-color:#542663}.NoticeBox--color--pink{color:#fff;background-color:#802257}.NoticeBox--color--brown{color:#fff;background-color:#4c3729}.NoticeBox--color--grey{color:#fff;background-color:#3e3e3e}.NoticeBox--color--light-grey{color:#fff;background-color:#6a6a6a}.NoticeBox--color--good{color:#fff;background-color:#2e4b1a}.NoticeBox--color--average{color:#fff;background-color:#7b4e13}.NoticeBox--color--bad{color:#fff;background-color:#701f1f}.NoticeBox--color--label{color:#fff;background-color:#53565a}.NoticeBox--color--xeno{color:#fff;background-color:#19161b}.NoticeBox--type--info{color:#fff;background-color:#235982}.NoticeBox--type--success{color:#fff;background-color:#1e662f}.NoticeBox--type--warning{color:#fff;background-color:#a95219}.NoticeBox--type--danger{color:#fff;background-color:#8f2828}.Input{position:relative;display:inline-block;width:10em;border:.0833333333em solid #88bfff;border:.0833333333em solid rgba(136,191,255,.75);border-radius:.16em;color:#fff;background-color:#0a0a0a;padding:0 .3333333333em;margin-right:.1666666667em;line-height:1.4166666667em;overflow:visible}.Input--fluid{display:block;width:auto}.Input__baseline{display:inline-block;color:transparent}.Input__input{display:block;position:absolute;top:0;bottom:0;left:0;right:0;border:0;outline:0;width:100%;font-size:1em;line-height:1.4166666667em;height:1.4166666667em;margin:0;padding:0 .5em;font-family:Verdana,sans-serif;background-color:transparent;color:#fff;color:inherit}.Input__input:-ms-input-placeholder{font-style:italic;color:#777;color:rgba(255,255,255,.45)}.Input--monospace .Input__input{font-family:"Consolas",monospace}.NumberInput{position:relative;display:inline-block;border:.0833333333em solid #88bfff;border:.0833333333em solid rgba(136,191,255,.75);border-radius:.16em;color:#88bfff;background-color:#0a0a0a;padding:0 .3333333333em;margin-right:.1666666667em;line-height:1.4166666667em;text-align:right;overflow:visible;cursor:n-resize}.NumberInput--fluid{display:block}.NumberInput__content{margin-left:.5em}.NumberInput__barContainer{position:absolute;top:.1666666667em;bottom:.1666666667em;left:.1666666667em}.NumberInput__bar{position:absolute;bottom:0;left:0;width:.25em;box-sizing:border-box;border-bottom:.0833333333em solid #88bfff;background-color:#88bfff}.NumberInput__input{display:block;position:absolute;top:0;bottom:0;left:0;right:0;border:0;outline:0;width:100%;font-size:1em;line-height:1.4166666667em;height:1.4166666667em;margin:0;padding:0 .5em;font-family:Verdana,sans-serif;background-color:#0a0a0a;color:#fff;text-align:right}.ProgressBar{display:inline-block;position:relative;width:100%;padding:0 .5em;border-width:.0833333333em !important;border-style:solid !important;border-radius:.16em;background-color:rgba(0,0,0,0);transition:border-color 900ms ease-out}.ProgressBar__fill{position:absolute;top:-0.5px;left:0px;bottom:-0.5px}.ProgressBar__fill--animated{transition:background-color 900ms ease-out,width 900ms ease-out}.ProgressBar__content{position:relative;line-height:1.4166666667em;width:100%;text-align:right}.ProgressBar--color--default{border:.0833333333em solid #3e6189}.ProgressBar--color--default .ProgressBar__fill{background-color:#3e6189}.ProgressBar--color--black{border-color:#000 !important}.ProgressBar--color--black .ProgressBar__fill{background-color:#000}.ProgressBar--color--white{border-color:#d9d9d9 !important}.ProgressBar--color--white .ProgressBar__fill{background-color:#d9d9d9}.ProgressBar--color--red{border-color:#bd2020 !important}.ProgressBar--color--red .ProgressBar__fill{background-color:#bd2020}.ProgressBar--color--orange{border-color:#d95e0c !important}.ProgressBar--color--orange .ProgressBar__fill{background-color:#d95e0c}.ProgressBar--color--yellow{border-color:#d9b804 !important}.ProgressBar--color--yellow .ProgressBar__fill{background-color:#d9b804}.ProgressBar--color--olive{border-color:#9aad14 !important}.ProgressBar--color--olive .ProgressBar__fill{background-color:#9aad14}.ProgressBar--color--green{border-color:#1b9638 !important}.ProgressBar--color--green .ProgressBar__fill{background-color:#1b9638}.ProgressBar--color--teal{border-color:#009a93 !important}.ProgressBar--color--teal .ProgressBar__fill{background-color:#009a93}.ProgressBar--color--blue{border-color:#1c71b1 !important}.ProgressBar--color--blue .ProgressBar__fill{background-color:#1c71b1}.ProgressBar--color--dark-blue{border-color:#003e6e !important}.ProgressBar--color--dark-blue .ProgressBar__fill{background-color:#003e6e}.ProgressBar--color--violet{border-color:#552dab !important}.ProgressBar--color--violet .ProgressBar__fill{background-color:#552dab}.ProgressBar--color--purple{border-color:#8b2baa !important}.ProgressBar--color--purple .ProgressBar__fill{background-color:#8b2baa}.ProgressBar--color--pink{border-color:#cf2082 !important}.ProgressBar--color--pink .ProgressBar__fill{background-color:#cf2082}.ProgressBar--color--brown{border-color:#8c5836 !important}.ProgressBar--color--brown .ProgressBar__fill{background-color:#8c5836}.ProgressBar--color--grey{border-color:#646464 !important}.ProgressBar--color--grey .ProgressBar__fill{background-color:#646464}.ProgressBar--color--light-grey{border-color:#919191 !important}.ProgressBar--color--light-grey .ProgressBar__fill{background-color:#919191}.ProgressBar--color--good{border-color:#4d9121 !important}.ProgressBar--color--good .ProgressBar__fill{background-color:#4d9121}.ProgressBar--color--average{border-color:#cd7a0d !important}.ProgressBar--color--average .ProgressBar__fill{background-color:#cd7a0d}.ProgressBar--color--bad{border-color:#bd2020 !important}.ProgressBar--color--bad .ProgressBar__fill{background-color:#bd2020}.ProgressBar--color--label{border-color:#657a94 !important}.ProgressBar--color--label .ProgressBar__fill{background-color:#657a94}.ProgressBar--color--xeno{border-color:#462f4e !important}.ProgressBar--color--xeno .ProgressBar__fill{background-color:#462f4e}.Section{position:relative;margin-bottom:.5em;background-color:#131313;background-color:#131313;box-sizing:border-box}.Section:last-child{margin-bottom:0}.Section__title{position:relative;padding:.5em;border-bottom:.1666666667em solid #4972a1}.Section__titleText{font-size:1.1666666667em;font-weight:bold;color:#fff}.Section__buttons{position:absolute;display:inline-block;right:.5em;margin-top:-.0833333333em}.Section__rest{position:relative}.Section__content{padding:.66em .5em}.Section--fitted>.Section__rest>.Section__content{padding:0}.Section--fill{display:flex;flex-direction:column;height:100%}.Section--fill>.Section__rest{flex-grow:1}.Section--fill>.Section__rest>.Section__content{height:100%}.Section--fill.Section--scrollable>.Section__rest>.Section__content{position:absolute;top:0;left:0;right:0;bottom:0}.Section--fill.Section--iefix{display:table !important;width:100% !important;height:100% !important;border-collapse:collapse;border-spacing:0}.Section--fill.Section--iefix>.Section__rest{display:table-row !important;height:100% !important}.Section--scrollable{overflow-x:hidden;overflow-y:hidden}.Section--scrollable>.Section__rest>.Section__content{overflow-y:scroll;overflow-x:hidden}.Section--scrollableHorizontal{overflow-x:hidden;overflow-y:hidden}.Section--scrollableHorizontal>.Section__rest>.Section__content{overflow-y:hidden;overflow-x:scroll}.Section--scrollable.Section--scrollableHorizontal{overflow-x:hidden;overflow-y:hidden}.Section--scrollable.Section--scrollableHorizontal>.Section__rest>.Section__content{overflow-y:scroll;overflow-x:scroll}.Section .Section{background-color:transparent;margin-left:-0.5em;margin-right:-0.5em}.Section .Section:first-child{margin-top:-0.5em}.Section .Section .Section__titleText{font-size:1.0833333333em}.Section .Section .Section .Section__titleText{font-size:1em}.Slider{cursor:e-resize}.Slider__cursorOffset{position:absolute;top:0;left:0;bottom:0;transition:none !important}.Slider__cursor{position:absolute;top:0;right:-.0833333333em;bottom:0;width:0;border-left:.1666666667em solid #fff}.Slider__pointer{position:absolute;right:-.4166666667em;bottom:-.3333333333em;width:0;height:0;border-left:.4166666667em solid transparent;border-right:.4166666667em solid transparent;border-bottom:.4166666667em solid #fff}.Slider__popupValue{position:absolute;right:0;top:-2rem;font-size:1rem;padding:.25rem .5rem;color:#fff;background-color:#000;transform:translateX(50%);white-space:nowrap}.Divider--horizontal{margin:.5em 0}.Divider--horizontal:not(.Divider--hidden){border-top:.1666666667em solid rgba(255,255,255,.1)}.Divider--vertical{height:100%;margin:0 .5em}.Divider--vertical:not(.Divider--hidden){border-left:.1666666667em solid rgba(255,255,255,.1)}.Stack--fill{height:100%}.Stack--horizontal>.Stack__item{margin-left:.5em}.Stack--horizontal>.Stack__item:first-child{margin-left:0}.Stack--vertical>.Stack__item{margin-top:.5em}.Stack--vertical>.Stack__item:first-child{margin-top:0}.Stack--horizontal>.Stack__divider:not(.Stack__divider--hidden){border-left:.1666666667em solid rgba(255,255,255,.1)}.Stack--vertical>.Stack__divider:not(.Stack__divider--hidden){border-top:.1666666667em solid rgba(255,255,255,.1)}.Table{display:table;width:100%;border-collapse:collapse;border-spacing:0;margin:0}.Table--collapsing{width:auto}.Table__row{display:table-row}.Table__cell{display:table-cell;padding:0 .25em}.Table__cell:first-child{padding-left:0}.Table__cell:last-child{padding-right:0}.Table__row--header .Table__cell,.Table__cell--header{font-weight:bold;padding-bottom:.5em}.Table__cell--collapsing{width:1%;white-space:nowrap}.Tabs{display:flex;align-items:stretch;overflow:hidden;background-color:#131313}.Tabs--fill{height:100%}.Section .Tabs{background-color:transparent}.Section:not(.Section--fitted) .Tabs{margin:0 -0.5em .5em}.Section:not(.Section--fitted) .Tabs:first-child{margin-top:-0.5em}.Tabs--vertical{flex-direction:column;padding:.25em 0 .25em .25em}.Tabs--horizontal{margin-bottom:.5em;padding:.25em .25em 0 .25em}.Tabs--horizontal:last-child{margin-bottom:0}.Tabs__Tab{flex-grow:0}.Tabs--fluid .Tabs__Tab{flex-grow:1}.Tab{display:flex;align-items:center;justify-content:space-between;background-color:transparent;color:rgba(255,255,255,.5);min-height:2.25em;min-width:4em}.Tab:not(.Tab--selected):hover{background-color:rgba(255,255,255,.075)}.Tab--selected{background-color:rgba(255,255,255,.125);color:#dfe7f0}.Tab__text{flex-grow:1;margin:0 .5em}.Tab__left{min-width:1.5em;text-align:center;margin-left:.25em}.Tab__right{min-width:1.5em;text-align:center;margin-right:.25em}.Tabs--horizontal .Tab{border-top:.1666666667em solid transparent;border-bottom:.1666666667em solid transparent;border-top-left-radius:.25em;border-top-right-radius:.25em}.Tabs--horizontal .Tab--selected{border-bottom:.1666666667em solid #d4dfec}.Tabs--vertical .Tab{min-height:2em;border-left:.1666666667em solid transparent;border-right:.1666666667em solid transparent;border-top-left-radius:.25em;border-bottom-left-radius:.25em}.Tabs--vertical .Tab--selected{border-right:.1666666667em solid #d4dfec}.Tab--selected.Tab--color--black{color:#535353}.Tabs--horizontal .Tab--selected.Tab--color--black{border-bottom-color:#1a1a1a}.Tabs--vertical .Tab--selected.Tab--color--black{border-right-color:#1a1a1a}.Tab--selected.Tab--color--white{color:#fff}.Tabs--horizontal .Tab--selected.Tab--color--white{border-bottom-color:#fff}.Tabs--vertical .Tab--selected.Tab--color--white{border-right-color:#fff}.Tab--selected.Tab--color--red{color:#e76e6e}.Tabs--horizontal .Tab--selected.Tab--color--red{border-bottom-color:#df3e3e}.Tabs--vertical .Tab--selected.Tab--color--red{border-right-color:#df3e3e}.Tab--selected.Tab--color--orange{color:#f69f66}.Tabs--horizontal .Tab--selected.Tab--color--orange{border-bottom-color:#f37f33}.Tabs--vertical .Tab--selected.Tab--color--orange{border-right-color:#f37f33}.Tab--selected.Tab--color--yellow{color:#fce358}.Tabs--horizontal .Tab--selected.Tab--color--yellow{border-bottom-color:#fbda21}.Tabs--vertical .Tab--selected.Tab--color--yellow{border-right-color:#fbda21}.Tab--selected.Tab--color--olive{color:#d8eb55}.Tabs--horizontal .Tab--selected.Tab--color--olive{border-bottom-color:#cbe41c}.Tabs--vertical .Tab--selected.Tab--color--olive{border-right-color:#cbe41c}.Tab--selected.Tab--color--green{color:#53e074}.Tabs--horizontal .Tab--selected.Tab--color--green{border-bottom-color:#25ca4c}.Tabs--vertical .Tab--selected.Tab--color--green{border-right-color:#25ca4c}.Tab--selected.Tab--color--teal{color:#21fff5}.Tabs--horizontal .Tab--selected.Tab--color--teal{border-bottom-color:#00d6cc}.Tabs--vertical .Tab--selected.Tab--color--teal{border-right-color:#00d6cc}.Tab--selected.Tab--color--blue{color:#62aee6}.Tabs--horizontal .Tab--selected.Tab--color--blue{border-bottom-color:#2e93de}.Tabs--vertical .Tab--selected.Tab--color--blue{border-right-color:#2e93de}.Tab--selected.Tab--color--dark-blue{color:#008ffd}.Tabs--horizontal .Tab--selected.Tab--color--dark-blue{border-bottom-color:#005fa7}.Tabs--vertical .Tab--selected.Tab--color--dark-blue{border-right-color:#005fa7}.Tab--selected.Tab--color--violet{color:#9676db}.Tabs--horizontal .Tab--selected.Tab--color--violet{border-bottom-color:#7349cf}.Tabs--vertical .Tab--selected.Tab--color--violet{border-right-color:#7349cf}.Tab--selected.Tab--color--purple{color:#c274db}.Tabs--horizontal .Tab--selected.Tab--color--purple{border-bottom-color:#ad45d0}.Tabs--vertical .Tab--selected.Tab--color--purple{border-right-color:#ad45d0}.Tab--selected.Tab--color--pink{color:#ea79b9}.Tabs--horizontal .Tab--selected.Tab--color--pink{border-bottom-color:#e34da1}.Tabs--vertical .Tab--selected.Tab--color--pink{border-right-color:#e34da1}.Tab--selected.Tab--color--brown{color:#ca9775}.Tabs--horizontal .Tab--selected.Tab--color--brown{border-bottom-color:#b97447}.Tabs--vertical .Tab--selected.Tab--color--brown{border-right-color:#b97447}.Tab--selected.Tab--color--grey{color:#a3a3a3}.Tabs--horizontal .Tab--selected.Tab--color--grey{border-bottom-color:#848484}.Tabs--vertical .Tab--selected.Tab--color--grey{border-right-color:#848484}.Tab--selected.Tab--color--light-grey{color:#c6c6c6}.Tabs--horizontal .Tab--selected.Tab--color--light-grey{border-bottom-color:#b3b3b3}.Tabs--vertical .Tab--selected.Tab--color--light-grey{border-right-color:#b3b3b3}.Tab--selected.Tab--color--good{color:#8cd95a}.Tabs--horizontal .Tab--selected.Tab--color--good{border-bottom-color:#68c22d}.Tabs--vertical .Tab--selected.Tab--color--good{border-right-color:#68c22d}.Tab--selected.Tab--color--average{color:#f5b35e}.Tabs--horizontal .Tab--selected.Tab--color--average{border-bottom-color:#f29a29}.Tabs--vertical .Tab--selected.Tab--color--average{border-right-color:#f29a29}.Tab--selected.Tab--color--bad{color:#e76e6e}.Tabs--horizontal .Tab--selected.Tab--color--bad{border-bottom-color:#df3e3e}.Tabs--vertical .Tab--selected.Tab--color--bad{border-right-color:#df3e3e}.Tab--selected.Tab--color--label{color:#a8b4c4}.Tabs--horizontal .Tab--selected.Tab--color--label{border-bottom-color:#8b9bb0}.Tabs--vertical .Tab--selected.Tab--color--label{border-right-color:#8b9bb0}.Tab--selected.Tab--color--xeno{color:#9366a3}.Tabs--horizontal .Tab--selected.Tab--color--xeno{border-bottom-color:#664573}.Tabs--vertical .Tab--selected.Tab--color--xeno{border-right-color:#664573}.Input{position:relative;display:inline-block;width:10em;border:.0833333333em solid #88bfff;border:.0833333333em solid rgba(136,191,255,.75);border-radius:.16em;color:#fff;background-color:#0a0a0a;padding:0 .3333333333em;margin-right:.1666666667em;line-height:1.4166666667em;overflow:visible}.Input--fluid{display:block;width:auto}.Input__baseline{display:inline-block;color:transparent}.Input__input{display:block;position:absolute;top:0;bottom:0;left:0;right:0;border:0;outline:0;width:100%;font-size:1em;line-height:1.4166666667em;height:1.4166666667em;margin:0;padding:0 .5em;font-family:Verdana,sans-serif;background-color:transparent;color:#fff;color:inherit}.Input__input:-ms-input-placeholder{font-style:italic;color:#777;color:rgba(255,255,255,.45)}.Input--monospace .Input__input{font-family:"Consolas",monospace}.TextArea{position:relative;display:inline-block;border:.0833333333em solid #88bfff;border:.0833333333em solid rgba(136,191,255,.75);border-radius:.16em;background-color:#0a0a0a;margin-right:.1666666667em;line-height:1.4166666667em;box-sizing:border-box;width:100%}.TextArea--fluid{display:block;width:auto;height:auto}.TextArea--noborder{border:0px}.TextArea__textarea.TextArea__textarea--scrollable{overflow:auto;overflow-x:hidden;overflow-y:scroll}.TextArea__textarea{display:block;position:absolute;top:0;bottom:0;left:0;right:0;border:0;outline:0;width:100%;height:100%;font-size:1em;line-height:1.4166666667em;min-height:1.4166666667em;margin:0;padding:0 .5em;font-family:inherit;background-color:transparent;color:inherit;box-sizing:border-box;word-wrap:break-word;overflow:hidden}.TextArea__textarea:-ms-input-placeholder{font-style:italic;color:#777;color:rgba(255,255,255,.45)}.TextArea__textarea_custom{overflow:visible;white-space:pre-wrap}.Tooltip{z-index:2;padding:.5em .75em;pointer-events:none;text-align:left;transition:opacity 150ms ease-out;background-color:#000;color:#fff;box-shadow:.1em .1em 1.25em -0.1em rgba(0,0,0,.5);border-radius:.16em;max-width:20.8333333333em}.Chat{color:#abc6ec}.Chat__badge{display:inline-block;min-width:.5em;font-size:.7em;padding:.2em .3em;line-height:1;color:#fff;text-align:center;white-space:nowrap;vertical-align:middle;background-color:crimson;border-radius:10px;transition:font-size 200ms ease-out}.Chat__badge:before{content:"x"}.Chat__badge--animate{font-size:.9em;transition:font-size 0ms}.Chat__scrollButton{position:fixed;right:2em;bottom:1em}.Chat__reconnected{font-size:.85em;text-align:center;margin:1em 0 2em}.Chat__reconnected:before{content:"Reconnected";display:inline-block;border-radius:1em;padding:0 .7em;color:#db2828;background-color:#131313}.Chat__reconnected:after{content:"";display:block;margin-top:-0.75em;border-bottom:.1666666667em solid #db2828}.Chat__highlight{color:#000}.Chat__highlight--restricted{color:#fff;background-color:#a00;font-weight:bold}.ChatMessage{word-wrap:break-word}.ChatMessage--highlighted{position:relative;border-left:.1666666667em solid #fd4;padding-left:.5em}.ChatMessage--highlighted:after{content:"";position:absolute;top:0;bottom:0;left:0;right:0;background-color:rgba(255,221,68,.1);pointer-events:none}.Ping{position:relative;padding:.125em .25em;border:.0833333333em solid rgba(140,140,140,.5);border-radius:.25em;width:3.75em;text-align:right}.Ping__indicator{content:"";position:absolute;top:.5em;left:.5em;width:.5em;height:.5em;background-color:#888;border-radius:.25em}.Notifications{position:absolute;bottom:1em;left:1em;right:2em}.Notification{color:#fff;background-color:crimson;padding:.5em;margin:1em 0}.Notification:first-child{margin-top:0}.Notification:last-child{margin-bottom:0}.Layout,.Layout *{scrollbar-base-color:#181818;scrollbar-face-color:#363636;scrollbar-3dlight-color:#202020;scrollbar-highlight-color:#202020;scrollbar-track-color:#181818;scrollbar-arrow-color:#909090;scrollbar-shadow-color:#363636}.Layout__content{position:absolute;top:0;bottom:0;left:0;right:0;overflow-x:hidden;overflow-y:hidden}.Layout__content--scrollable{overflow-y:scroll;margin-bottom:0}.Window{position:fixed;top:0;bottom:0;left:0;right:0;color:#fff;background-color:#202020;background-image:linear-gradient(to bottom, #202020 0%, #202020 100%)}.Window__titleBar{position:fixed;z-index:1;top:0;left:0;width:100%;height:32px;height:2.6666666667rem}.Window__rest{position:fixed;top:32px;top:2.6666666667rem;bottom:0;left:0;right:0}.Window__contentPadding{margin:.5rem;height:100%;height:calc(100% - 1.01rem)}.Window__contentPadding:after{height:0}.Layout__content--scrollable .Window__contentPadding:after{display:block;content:"";height:.5rem}.Window__dimmer{position:fixed;top:0;bottom:0;left:0;right:0;background-color:rgba(56,56,56,.25);pointer-events:none}.Window__resizeHandle__se{position:fixed;bottom:0;right:0;width:20px;width:1.6666666667rem;height:20px;height:1.6666666667rem;cursor:se-resize}.Window__resizeHandle__s{position:fixed;bottom:0;left:0;right:0;height:6px;height:.5rem;cursor:s-resize}.Window__resizeHandle__e{position:fixed;top:0;bottom:0;right:0;width:3px;width:.25rem;cursor:e-resize}em{font-style:normal;font-weight:bold}img{margin:0;padding:0;line-height:1;-ms-interpolation-mode:nearest-neighbor;image-rendering:pixelated}img.icon{height:1em;min-height:16px;width:auto;vertical-align:bottom}a{color:#397ea5}a.visited{color:#7c00e6}a:visited{color:#7c00e6}a.popt{text-decoration:none}.popup{position:fixed;top:50%;left:50%;background:#ddd}.popup .close{position:absolute;background:#aaa;top:0;right:0;color:#333;text-decoration:none;z-index:2;padding:0 10px;height:30px;line-height:30px}.popup .close:hover{background:#999}.popup .head{background:#999;color:#ddd;padding:0 10px;height:30px;line-height:30px;text-transform:uppercase;font-size:.9em;font-weight:bold;border-bottom:2px solid green}.popup input{border:1px solid #999;background:#fff;margin:0;padding:5px;outline:none;color:#333}.popup input[type=text]:hover,.popup input[type=text]:active,.popup input[type=text]:focus{border-color:green}.popup input[type=submit]{padding:5px 10px;background:#999;color:#ddd;text-transform:uppercase;font-size:.9em;font-weight:bold}.popup input[type=submit]:hover,.popup input[type=submit]:focus,.popup input[type=submit]:active{background:#aaa;cursor:pointer}.changeFont{padding:10px}.changeFont a{display:block;text-decoration:none;padding:3px;color:#333}.changeFont a:hover{background:#ccc}.highlightPopup{padding:10px;text-align:center}.highlightPopup input[type=text]{display:block;width:215px;text-align:left;margin-top:5px}.highlightPopup input.highlightColor{background-color:#ff0}.highlightPopup input.highlightTermSubmit{margin-top:5px}.contextMenu{background-color:#ddd;position:fixed;margin:2px;width:150px}.contextMenu a{display:block;padding:2px 5px;text-decoration:none;color:#333}.contextMenu a:hover{background-color:#ccc}.filterMessages{padding:5px}.filterMessages div{padding:2px 0}.icon-stack{height:1em;line-height:1em;width:1em;vertical-align:middle;margin-top:-2px}.motd{color:#a4bad6;font-family:Verdana,sans-serif;white-space:normal}.motd h1,.motd h2,.motd h3,.motd h4,.motd h5,.motd h6{color:#a4bad6;text-decoration:underline}.motd a,.motd a:link,.motd a:visited,.motd a:active,.motd a:hover{color:#a4bad6}.bold,.name,.prefix,.ooc,.looc,.adminooc,.admin,.medal,.yell{font-weight:bold}.italic,.italics{font-style:italic}.highlight{background:#ff0}h1,h2,h3,h4,h5,h6{color:#a4bad6;font-family:Georgia,Verdana,sans-serif}h1.alert,h2.alert{color:#a4bad6}em{font-style:normal;font-weight:bold}.ooc{font-weight:bold}.adminobserverooc{color:#09c;font-weight:bold}.adminooc{color:#3d5bc3;font-weight:bold}.adminsay{color:#9611d4;font-weight:bold}.admin{color:#5975da;font-weight:bold}.name{font-weight:bold}.deadsay{color:#e2c1ff}.binarysay{color:#1e90ff}.binarysay a{color:lime}.binarysay a:active,.binarysay a:visited{color:#8f8}.radio{color:#1ecc43}.sciradio{color:#c68cfa}.comradio{color:#fcdf03}.secradio{color:#dd3535}.medradio{color:#57b8f0}.engradio{color:#f37746}.suppradio{color:#b88646}.servradio{color:#6ca729}.syndradio{color:#8f4a4b}.gangradio{color:#ac2ea1}.centcomradio{color:#2681a5}.aiprivradio{color:#d65d95}.redteamradio{color:#f44}.blueteamradio{color:#3434fd}.greenteamradio{color:#34fd34}.yellowteamradio{color:#fdfd34}.yell{font-weight:bold}.alert{color:#d82020}.userdanger{color:#c51e1e;font-weight:bold;font-size:185%}.bolddanger{color:#c51e1e;font-weight:bold}.danger{color:#c51e1e}.warning{color:#c51e1e;font-style:italic}.alertwarning{color:red;font-weight:bold}.boldwarning{color:#c51e1e;font-style:italic;font-weight:bold}.announce{color:#c51e1e;font-weight:bold}.boldannounce{color:#c51e1e;font-weight:bold}.minorannounce{font-weight:bold;font-size:185%}.greenannounce{color:#059223;font-weight:bold}.rose{color:#ff5050}.info{color:#9ab0ff}.notice{color:#6685f5}.staff_ic{color:#6685f5}.tinynotice{color:#6685f5;font-size:85%}.tinynoticeital{color:#6685f5;font-style:italic;font-size:85%}.smallnotice{color:#6685f5;font-size:90%}.smallnoticeital{color:#6685f5;font-style:italic;font-size:90%}.boldnotice{color:#6685f5;font-weight:bold}.hear{color:#6685f5;font-style:italic}.adminnotice{color:#6685f5}.adminhelp{color:red;font-weight:bold}.unconscious{color:#a4bad6;font-weight:bold}.suicide{color:#ff5050;font-style:italic}.green{color:#059223}.grey{color:#838383}.red{color:red}.blue{color:#215cff}.nicegreen{color:#059223}.boldnicegreen{color:#059223;font-weight:bold}.cult{color:#973e3b}.cultitalic{color:#973e3b;font-style:italic}.cultbold{color:#973e3b;font-style:italic;font-weight:bold}.cultboldtalic{color:#973e3b;font-weight:bold;font-size:185%}.cultlarge{color:#973e3b;font-weight:bold;font-size:185%}.narsie{color:#973e3b;font-weight:bold;font-size:925%}.narsiesmall{color:#973e3b;font-weight:bold;font-size:370%}.colossus{color:#7f282a;font-size:310%}.hierophant{color:#b441ee;font-weight:bold;font-style:italic}.hierophant_warning{color:#c56bf1;font-style:italic}.purple{color:#9956d3}.holoparasite{color:#88809c}.revennotice{color:#c099e2}.revenboldnotice{color:#c099e2;font-weight:bold}.revenbignotice{color:#c099e2;font-weight:bold;font-size:185%}.revenminor{color:#823abb}.revenwarning{color:#760fbb;font-style:italic}.revendanger{color:#760fbb;font-weight:bold;font-size:185%}.deconversion_message{color:#a947ff;font-size:185%;font-style:italic}.ghostalert{color:#60f;font-style:italic;font-weight:bold}.alien{color:#855d85}.noticealien{color:#059223}.alertalien{color:#059223;font-weight:bold}.changeling{color:#059223;font-style:italic}.alertsyndie{color:red;font-size:185%;font-weight:bold}.spider{color:#80f;font-weight:bold;font-size:185%}.interface{color:#750e75}.sans{font-family:"Comic Sans MS",cursive,sans-serif}.papyrus{font-family:"Papyrus",cursive,sans-serif}.robot{font-family:"Courier New",cursive,sans-serif}.tape_recorder{color:red;font-family:"Courier New",cursive,sans-serif}.command_headset{font-weight:bold;font-size:160%}.small{font-size:60%}.big{font-size:185%}.reallybig{font-size:245%}.extremelybig{font-size:310%}.greentext{color:#059223;font-size:185%}.redtext{color:#c51e1e;font-size:185%}.clown{color:#ff70c1;font-size:160%;font-family:"Comic Sans MS",cursive,sans-serif;font-weight:bold}.singing{font-family:"Trebuchet MS",cursive,sans-serif;font-style:italic}.his_grace{color:#15d512;font-family:"Courier New",cursive,sans-serif;font-style:italic}.hypnophrase{color:#202020;font-weight:bold;animation:hypnocolor 1500ms infinite;animation-direction:alternate}@keyframes hypnocolor{0%{color:#202020}25%{color:#4b02ac}50%{color:#9f41f1}75%{color:#541c9c}100%{color:#7adbf3}}.phobia{color:#d00;font-weight:bold;animation:phobia 750ms infinite}@keyframes phobia{0%{color:#f75a5a}50%{color:#d00}100%{color:#f75a5a}}.icon{height:1em;width:auto}.bigicon{font-size:2.5em}.memo{color:#638500;text-align:center}.memoedit{text-align:center;font-size:125%}.abductor{color:#c204c2;font-style:italic}.mind_control{color:#df3da9;font-size:100%;font-weight:bold;font-style:italic}.slime{color:#00ced1}.drone{color:#848482}.monkey{color:#975032}.swarmer{color:#2c75ff}.resonate{color:#298f85}.monkeyhive{color:#a56408}.monkeylead{color:#af6805;font-size:80%}.connectionClosed,.fatalError{background:red;color:#fff;padding:5px}.connectionClosed.restored{background:green}.internal.boldnshit{color:#3d5bc3;font-weight:bold}.text-normal{font-weight:normal;font-style:normal}.hidden{display:none;visibility:hidden}.ml-1{margin-left:1em}.ml-2{margin-left:2em}.ml-3{margin-left:3em}.xooc{color:#ac04e9;font-weight:bold;font-size:140%}.mooc{color:#090;font-weight:bold;font-size:140%}.yooc{color:#999600;font-weight:bold;font-size:140%}.headminsay{color:#653d78;font-weight:bold}.radio{color:#b4b4b4}.deptradio{color:#939}.comradio{color:#779cc2}.centradio{color:#5c5c8a}.hcradio{color:#318779}.pvstradio{color:#9b0612}.cryoradio{color:#ad6d48}.airadio{color:#f0f}.secradio{color:#a52929}.engradio{color:#a66300}.sentryradio{color:#844300}.sentryradio{color:#844300}.medradio{color:#008160}.supradio{color:#ba8e41}.jtacradio{color:#ad3b98}.intelradio{color:#027d02}.wyradio{color:#fe9b24}.pmcradio{color:#4dc5ce}.vairadio{color:#e3580e}.rmcradio{color:#e3580e}.cmbradio{color:#1b748c}.clfradio{color:#8e83ca}.alpharadio{color:#db2626}.bravoradio{color:#c68610}.charlieradio{color:#a5a}.deltaradio{color:#007fcf}.echoradio{color:#3eb489}.medium{font-size:110%}.big{font-size:115%}.large{font-size:125%}.extra_large{font-size:130%}.huge{font-size:150%}.underline{text-decoration:underline}.orange{color:#eca100}.normal{font-style:normal}.attack{color:#ff3838}.moderate{color:#c00}.disarm{color:#900}.passive{color:#600}.helpful{color:#368f31}.scanner{color:#ff3838}.scannerb{color:#ff3838;font-weight:bold}.scannerburn{color:orange}.scannerburnb{color:orange;font-weight:bold}.rose{color:#ff5050}.debuginfo{color:#493d26;font-style:italic}.xenonotice{color:#51a16c}.xenoboldnotice{color:#51a16c;font-style:italic}.xenowarning{color:#51a16c;font-style:italic}.xenominorwarning{color:#51a16c;font-weight:bold;font-style:italic}.xenodanger{color:#51a16c;font-weight:bold}.avoidharm{color:#72a0e5;font-weight:bold}.highdanger{color:#ff3838;font-weight:bold;font-size:140%}.xenohighdanger{color:#51a16c;font-weight:bold;font-size:140%}.xenoannounce{color:#65c585;font-family:book-antiqua;font-weight:bold;font-size:140%}.yautjabold{color:purple;font-weight:bold}.yautjaboldbig{color:purple;font-weight:bold;font-size:120%}.objectivebig{font-weight:bold;font-size:130%}.objectivegreen{color:lime}.objectivered{color:red}.objectivesuccess{color:lime;font-weight:bold;font-size:110%}.objectivefail{color:red;font-weight:bold;font-size:110%}.xenotalk,.xeno{color:#c048c0;font-style:italic}.xenoleader{color:#996e99;font-style:italic;font-size:125%}.xenoqueen{color:#996e99;font-style:italic;font-weight:bold;font-size:125%}.newscaster{color:maroon}.role_header{color:#e92d2d;display:block;text-align:center;font-weight:bold;font-family:trebuchet-ms;font-size:150%}.role_body{color:#3a3ae9;display:block;text-align:center;font-size:125%}.round_header{color:#e92d2d;display:block;text-align:center;font-family:courier;font-weight:bold;font-size:180%}.round_body{color:#c5c5c5;display:block;text-align:center;font-family:trebuchet-ms;font-weight:bold;font-size:125%}.event_announcement{color:#600d48;font-family:arial-narrow;font-weight:bold;font-size:125%}.announce_header{color:#cecece;font-weight:bold;font-size:150%}.announce_header_blue{color:#7575f3;font-weight:bold;font-size:150%}.announce_header_admin{color:#7575f3;font-weight:bold;font-size:150%}.announce_body{color:#e92d2d;font-weight:normal;font-size:125%}.centerbold{display:block;text-align:center;font-weight:bold}.mod{color:#917455;font-weight:bold}.modooc{color:#184880;font-weight:bold}.adminmod{color:#7c440c;font-weight:bold}.mentorsay{color:#d4af57;font-weight:bold}.mentorhelp{color:#090;font-weight:bold}.mentorbody{color:#da6200;font-weight:bold}.mentorstaff{color:#b5850d;font-weight:bold}.staffsay{color:#b5850d;font-weight:bold}.tajaran{color:#803b56}.tajaran_signlang{color:#941c1c}.skrell{color:#00ced1}.soghun{color:#228b22}.changeling{color:purple}.vox{color:#a0a}.monkey{color:#966c47}.german{color:#858f1e;font-family:"Times New Roman",Times,serif}.spanish{color:#cf982b}.japanese{color:#940927}.chinese{color:#fe1919}.zombie{color:#2dacb1;font-style:italic}.rough{font-family:trebuchet-ms,cursive,sans-serif}.commando{color:#fe9b24;font-style:bold}.say_quote{font-family:Georgia,Verdana,sans-serif}.admin .message{color:#314cad}.admin .prefix{font-weight:bolder}.pm{font-size:110%}.deadsay{color:#8b4dff}.retro_translator{font-weight:bold}.yautja_translator{color:#a00;font-weight:bold;animation:glitch .5s infinite}@keyframes glitch{25%{color:#a00;transform:translate(-2px, -1px)}50%{color:#be0000;transform:translate(1px, -2px)}75%{color:#8d0000;transform:translate(-1px, 2px)}100%{color:#830000;transform:translate(1px, 1px)}}.examine_block{background:#1b1c1e;border:1px solid #a4bad6;margin:.5em;padding:.5em .75em}.examine_block .icon{width:1.5em;height:1.5em;margin:0;padding:0}.tooltip{font-style:italic;border-bottom:1px dashed #fff}
+html,body{box-sizing:border-box;height:100%;margin:0;font-size:12px}html{overflow:hidden;cursor:default}body{overflow:auto;font-family:Verdana,Geneva,sans-serif}*,*:before,*:after{box-sizing:inherit}h1,h2,h3,h4,h5,h6{display:block;margin:0;padding:6px 0;padding:.5rem 0}h1{font-size:18px;font-size:1.5rem}h2{font-size:16px;font-size:1.333rem}h3{font-size:14px;font-size:1.167rem}h4{font-size:12px;font-size:1rem}td,th{vertical-align:baseline;text-align:left}.candystripe:nth-child(odd){background-color:rgba(0,0,0,.25)}.color-black{color:#1a1a1a !important}.color-white{color:#fff !important}.color-red{color:#df3e3e !important}.color-orange{color:#f37f33 !important}.color-yellow{color:#fbda21 !important}.color-olive{color:#cbe41c !important}.color-green{color:#25ca4c !important}.color-teal{color:#00d6cc !important}.color-blue{color:#2e93de !important}.color-dark-blue{color:#005fa7 !important}.color-violet{color:#7349cf !important}.color-purple{color:#ad45d0 !important}.color-pink{color:#e34da1 !important}.color-brown{color:#b97447 !important}.color-grey{color:#848484 !important}.color-light-grey{color:#b3b3b3 !important}.color-good{color:#68c22d !important}.color-average{color:#f29a29 !important}.color-bad{color:#df3e3e !important}.color-label{color:#8b9bb0 !important}.color-xeno{color:#664573 !important}.color-bg-black{background-color:#000 !important}.color-bg-white{background-color:#d9d9d9 !important}.color-bg-red{background-color:#bd2020 !important}.color-bg-orange{background-color:#d95e0c !important}.color-bg-yellow{background-color:#d9b804 !important}.color-bg-olive{background-color:#9aad14 !important}.color-bg-green{background-color:#1b9638 !important}.color-bg-teal{background-color:#009a93 !important}.color-bg-blue{background-color:#1c71b1 !important}.color-bg-dark-blue{background-color:#003e6e !important}.color-bg-violet{background-color:#552dab !important}.color-bg-purple{background-color:#8b2baa !important}.color-bg-pink{background-color:#cf2082 !important}.color-bg-brown{background-color:#8c5836 !important}.color-bg-grey{background-color:#646464 !important}.color-bg-light-grey{background-color:#919191 !important}.color-bg-good{background-color:#4d9121 !important}.color-bg-average{background-color:#cd7a0d !important}.color-bg-bad{background-color:#bd2020 !important}.color-bg-label{background-color:#657a94 !important}.color-bg-xeno{background-color:#462f4e !important}.debug-layout,.debug-layout *:not(g):not(path){color:rgba(255,255,255,.9) !important;background:transparent !important;outline:1px solid rgba(255,255,255,.5) !important;box-shadow:none !important;filter:none !important}.debug-layout:hover,.debug-layout *:not(g):not(path):hover{outline-color:rgba(255,255,255,.8) !important}.outline-dotted{outline-style:dotted !important}.outline-dashed{outline-style:dashed !important}.outline-solid{outline-style:solid !important}.outline-double{outline-style:double !important}.outline-groove{outline-style:groove !important}.outline-ridge{outline-style:ridge !important}.outline-inset{outline-style:inset !important}.outline-outset{outline-style:outset !important}.outline-color-black{outline:.167rem solid #1a1a1a !important}.outline-color-white{outline:.167rem solid #fff !important}.outline-color-red{outline:.167rem solid #df3e3e !important}.outline-color-orange{outline:.167rem solid #f37f33 !important}.outline-color-yellow{outline:.167rem solid #fbda21 !important}.outline-color-olive{outline:.167rem solid #cbe41c !important}.outline-color-green{outline:.167rem solid #25ca4c !important}.outline-color-teal{outline:.167rem solid #00d6cc !important}.outline-color-blue{outline:.167rem solid #2e93de !important}.outline-color-dark-blue{outline:.167rem solid #005fa7 !important}.outline-color-violet{outline:.167rem solid #7349cf !important}.outline-color-purple{outline:.167rem solid #ad45d0 !important}.outline-color-pink{outline:.167rem solid #e34da1 !important}.outline-color-brown{outline:.167rem solid #b97447 !important}.outline-color-grey{outline:.167rem solid #848484 !important}.outline-color-light-grey{outline:.167rem solid #b3b3b3 !important}.outline-color-good{outline:.167rem solid #68c22d !important}.outline-color-average{outline:.167rem solid #f29a29 !important}.outline-color-bad{outline:.167rem solid #df3e3e !important}.outline-color-label{outline:.167rem solid #8b9bb0 !important}.outline-color-xeno{outline:.167rem solid #664573 !important}.text-left{text-align:left}.text-center{text-align:center}.text-right{text-align:right}.text-baseline{text-align:baseline}.text-justify{text-align:justify}.text-nowrap{white-space:nowrap}.text-pre{white-space:pre}.text-bold{font-weight:bold}.text-italic{font-style:italic}.text-underline{text-decoration:underline}.BlockQuote{color:#8b9bb0;border-left:.1666666667em solid #8b9bb0;padding-left:.5em;margin-bottom:.5em}.BlockQuote:last-child{margin-bottom:0}.Button{position:relative;display:inline-block;line-height:1.667em;padding:0 .5em;margin-right:.1666666667em;white-space:nowrap;outline:0;border-radius:.16em;margin-bottom:.1666666667em;user-select:none;-ms-user-select:none}.Button:last-child{margin-right:0;margin-bottom:0}.Button .fa,.Button .fas,.Button .far{margin-left:-0.25em;margin-right:-0.25em;min-width:1.333em;text-align:center}.Button--hasContent .fa,.Button--hasContent .fas,.Button--hasContent .far{margin-right:.25em}.Button--hasContent.Button--iconPosition--right .fa,.Button--hasContent.Button--iconPosition--right .fas,.Button--hasContent.Button--iconPosition--right .far{margin-right:0px;margin-left:3px}.Button--ellipsis{overflow:hidden;text-overflow:ellipsis}.Button--fluid{display:block;margin-left:0;margin-right:0}.Button--circular{border-radius:50%}.Button--compact{padding:0 .25em;line-height:1.333em}.Button--color--black{transition:color 50ms,background-color 50ms;background-color:#000;color:#fff}.Button--color--black:hover{transition:color 0ms,background-color 0ms}.Button--color--black:focus{transition:color 100ms,background-color 100ms}.Button--color--black:hover,.Button--color--black:focus{background-color:#131313;color:#fff}.Button--color--white{transition:color 50ms,background-color 50ms;background-color:#d9d9d9;color:#000}.Button--color--white:hover{transition:color 0ms,background-color 0ms}.Button--color--white:focus{transition:color 100ms,background-color 100ms}.Button--color--white:hover,.Button--color--white:focus{background-color:#f8f8f8;color:#000}.Button--color--red{transition:color 50ms,background-color 50ms;background-color:#bd2020;color:#fff}.Button--color--red:hover{transition:color 0ms,background-color 0ms}.Button--color--red:focus{transition:color 100ms,background-color 100ms}.Button--color--red:hover,.Button--color--red:focus{background-color:#dc4848;color:#fff}.Button--color--orange{transition:color 50ms,background-color 50ms;background-color:#d95e0c;color:#fff}.Button--color--orange:hover{transition:color 0ms,background-color 0ms}.Button--color--orange:focus{transition:color 100ms,background-color 100ms}.Button--color--orange:hover,.Button--color--orange:focus{background-color:#f0853f;color:#fff}.Button--color--yellow{transition:color 50ms,background-color 50ms;background-color:#d9b804;color:#000}.Button--color--yellow:hover{transition:color 0ms,background-color 0ms}.Button--color--yellow:focus{transition:color 100ms,background-color 100ms}.Button--color--yellow:hover,.Button--color--yellow:focus{background-color:#f5d72e;color:#000}.Button--color--olive{transition:color 50ms,background-color 50ms;background-color:#9aad14;color:#fff}.Button--color--olive:hover{transition:color 0ms,background-color 0ms}.Button--color--olive:focus{transition:color 100ms,background-color 100ms}.Button--color--olive:hover,.Button--color--olive:focus{background-color:#c4da2b;color:#fff}.Button--color--green{transition:color 50ms,background-color 50ms;background-color:#1b9638;color:#fff}.Button--color--green:hover{transition:color 0ms,background-color 0ms}.Button--color--green:focus{transition:color 100ms,background-color 100ms}.Button--color--green:hover,.Button--color--green:focus{background-color:#32c154;color:#fff}.Button--color--teal{transition:color 50ms,background-color 50ms;background-color:#009a93;color:#fff}.Button--color--teal:hover{transition:color 0ms,background-color 0ms}.Button--color--teal:focus{transition:color 100ms,background-color 100ms}.Button--color--teal:hover,.Button--color--teal:focus{background-color:#13c4bc;color:#fff}.Button--color--blue{transition:color 50ms,background-color 50ms;background-color:#1c71b1;color:#fff}.Button--color--blue:hover{transition:color 0ms,background-color 0ms}.Button--color--blue:focus{transition:color 100ms,background-color 100ms}.Button--color--blue:hover,.Button--color--blue:focus{background-color:#3a95d9;color:#fff}.Button--color--dark-blue{transition:color 50ms,background-color 50ms;background-color:#003e6e;color:#fff}.Button--color--dark-blue:hover{transition:color 0ms,background-color 0ms}.Button--color--dark-blue:focus{transition:color 100ms,background-color 100ms}.Button--color--dark-blue:hover,.Button--color--dark-blue:focus{background-color:#135b92;color:#fff}.Button--color--violet{transition:color 50ms,background-color 50ms;background-color:#552dab;color:#fff}.Button--color--violet:hover{transition:color 0ms,background-color 0ms}.Button--color--violet:focus{transition:color 100ms,background-color 100ms}.Button--color--violet:hover,.Button--color--violet:focus{background-color:#7953cc;color:#fff}.Button--color--purple{transition:color 50ms,background-color 50ms;background-color:#8b2baa;color:#fff}.Button--color--purple:hover{transition:color 0ms,background-color 0ms}.Button--color--purple:focus{transition:color 100ms,background-color 100ms}.Button--color--purple:hover,.Button--color--purple:focus{background-color:#ad4fcd;color:#fff}.Button--color--pink{transition:color 50ms,background-color 50ms;background-color:#cf2082;color:#fff}.Button--color--pink:hover{transition:color 0ms,background-color 0ms}.Button--color--pink:focus{transition:color 100ms,background-color 100ms}.Button--color--pink:hover,.Button--color--pink:focus{background-color:#e257a5;color:#fff}.Button--color--brown{transition:color 50ms,background-color 50ms;background-color:#8c5836;color:#fff}.Button--color--brown:hover{transition:color 0ms,background-color 0ms}.Button--color--brown:focus{transition:color 100ms,background-color 100ms}.Button--color--brown:hover,.Button--color--brown:focus{background-color:#b47851;color:#fff}.Button--color--grey{transition:color 50ms,background-color 50ms;background-color:#646464;color:#fff}.Button--color--grey:hover{transition:color 0ms,background-color 0ms}.Button--color--grey:focus{transition:color 100ms,background-color 100ms}.Button--color--grey:hover,.Button--color--grey:focus{background-color:#868686;color:#fff}.Button--color--light-grey{transition:color 50ms,background-color 50ms;background-color:#919191;color:#fff}.Button--color--light-grey:hover{transition:color 0ms,background-color 0ms}.Button--color--light-grey:focus{transition:color 100ms,background-color 100ms}.Button--color--light-grey:hover,.Button--color--light-grey:focus{background-color:#bababa;color:#fff}.Button--color--good{transition:color 50ms,background-color 50ms;background-color:#4d9121;color:#fff}.Button--color--good:hover{transition:color 0ms,background-color 0ms}.Button--color--good:focus{transition:color 100ms,background-color 100ms}.Button--color--good:hover,.Button--color--good:focus{background-color:#6cba39;color:#fff}.Button--color--average{transition:color 50ms,background-color 50ms;background-color:#cd7a0d;color:#fff}.Button--color--average:hover{transition:color 0ms,background-color 0ms}.Button--color--average:focus{transition:color 100ms,background-color 100ms}.Button--color--average:hover,.Button--color--average:focus{background-color:#ed9d35;color:#fff}.Button--color--bad{transition:color 50ms,background-color 50ms;background-color:#bd2020;color:#fff}.Button--color--bad:hover{transition:color 0ms,background-color 0ms}.Button--color--bad:focus{transition:color 100ms,background-color 100ms}.Button--color--bad:hover,.Button--color--bad:focus{background-color:#dc4848;color:#fff}.Button--color--label{transition:color 50ms,background-color 50ms;background-color:#657a94;color:#fff}.Button--color--label:hover{transition:color 0ms,background-color 0ms}.Button--color--label:focus{transition:color 100ms,background-color 100ms}.Button--color--label:hover,.Button--color--label:focus{background-color:#91a1b3;color:#fff}.Button--color--xeno{transition:color 50ms,background-color 50ms;background-color:#462f4e;color:#fff}.Button--color--xeno:hover{transition:color 0ms,background-color 0ms}.Button--color--xeno:focus{transition:color 100ms,background-color 100ms}.Button--color--xeno:hover,.Button--color--xeno:focus{background-color:#64496d;color:#fff}.Button--color--default{transition:color 50ms,background-color 50ms;background-color:#3e6189;color:#fff}.Button--color--default:hover{transition:color 0ms,background-color 0ms}.Button--color--default:focus{transition:color 100ms,background-color 100ms}.Button--color--default:hover,.Button--color--default:focus{background-color:#5c83b0;color:#fff}.Button--color--caution{transition:color 50ms,background-color 50ms;background-color:#d9b804;color:#000}.Button--color--caution:hover{transition:color 0ms,background-color 0ms}.Button--color--caution:focus{transition:color 100ms,background-color 100ms}.Button--color--caution:hover,.Button--color--caution:focus{background-color:#f5d72e;color:#000}.Button--color--danger{transition:color 50ms,background-color 50ms;background-color:#bd2020;color:#fff}.Button--color--danger:hover{transition:color 0ms,background-color 0ms}.Button--color--danger:focus{transition:color 100ms,background-color 100ms}.Button--color--danger:hover,.Button--color--danger:focus{background-color:#dc4848;color:#fff}.Button--color--transparent{transition:color 50ms,background-color 50ms;background-color:#202020;color:#fff;background-color:rgba(32,32,32,0);color:rgba(255,255,255,.5)}.Button--color--transparent:hover{transition:color 0ms,background-color 0ms}.Button--color--transparent:focus{transition:color 100ms,background-color 100ms}.Button--color--transparent:hover,.Button--color--transparent:focus{background-color:#383838;color:#fff}.Button--disabled{background-color:#999 !important}.Button--selected{transition:color 50ms,background-color 50ms;background-color:#1b9638;color:#fff}.Button--selected:hover{transition:color 0ms,background-color 0ms}.Button--selected:focus{transition:color 100ms,background-color 100ms}.Button--selected:hover,.Button--selected:focus{background-color:#32c154;color:#fff}.Button--flex{display:inline-flex;flex-direction:column}.Button--flex--fluid{width:100%}.Button--verticalAlignContent--top{justify-content:flex-start}.Button--verticalAlignContent--middle{justify-content:center}.Button--verticalAlignContent--bottom{justify-content:flex-end}.Button__content{display:block;align-self:stretch}.ColorBox{display:inline-block;width:1em;height:1em;line-height:1em;text-align:center}.Dimmer{display:flex;justify-content:center;align-items:center;position:absolute;top:0;bottom:0;left:0;right:0;background-color:rgba(0,0,0,.75);z-index:1}.Divider--horizontal{margin:.5em 0}.Divider--horizontal:not(.Divider--hidden){border-top:.1666666667em solid rgba(255,255,255,.1)}.Divider--vertical{height:100%;margin:0 .5em}.Divider--vertical:not(.Divider--hidden){border-left:.1666666667em solid rgba(255,255,255,.1)}.Dropdown{position:relative}.Dropdown__control{position:relative;display:inline-block;font-family:Verdana,sans-serif;font-size:1em;width:8.3333333333em;line-height:1.4166666667em;user-select:none}.Dropdown__arrow-button{float:right;padding-left:.35em;width:1.2em;height:1.8333333333em;border-left:.0833333333em solid #000;border-left:.0833333333em solid rgba(0,0,0,.25)}.Dropdown__menu{position:absolute;overflow-y:auto;z-index:5;width:8.3333333333em;max-height:16.6666666667em;overflow-y:scroll;border-radius:0 0 .1666666667em .1666666667em;color:#fff;background-color:#000;background-color:rgba(0,0,0,.75)}.Dropdown__menu-noscroll{position:absolute;overflow-y:auto;z-index:5;width:8.3333333333em;max-height:16.6666666667em;border-radius:0 0 .1666666667em .1666666667em;color:#fff;background-color:#000;background-color:rgba(0,0,0,.75)}.Dropdown__menuentry{padding:.1666666667em .3333333333em;font-family:Verdana,sans-serif;font-size:1em;line-height:1.4166666667em;transition:background-color 100ms ease-out}.Dropdown__menuentry:hover{background-color:rgba(255,255,255,.2);transition:background-color 0ms}.Dropdown__over{top:auto;bottom:100%}.Dropdown__selected-text{display:inline-block;text-overflow:ellipsis;white-space:nowrap;height:1.4166666667em;width:calc(100% - 1.2em)}.Flex{display:-ms-flexbox;display:flex}.Flex--inline{display:inline-flex}.Flex--iefix{display:block}.Flex--iefix.Flex--inline{display:inline-block}.Flex__item--iefix{display:inline-block}.Flex--iefix--column>.Flex__item--iefix{display:block}.Input{position:relative;display:inline-block;width:10em;border:.0833333333em solid #88bfff;border:.0833333333em solid rgba(136,191,255,.75);border-radius:.16em;color:#fff;background-color:#0a0a0a;padding:0 .3333333333em;margin-right:.1666666667em;line-height:1.4166666667em;overflow:visible}.Input--fluid{display:block;width:auto}.Input__baseline{display:inline-block;color:transparent}.Input__input{display:block;position:absolute;top:0;bottom:0;left:0;right:0;border:0;outline:0;width:100%;font-size:1em;line-height:1.4166666667em;height:1.4166666667em;margin:0;padding:0 .5em;font-family:Verdana,sans-serif;background-color:transparent;color:#fff;color:inherit}.Input__input:-ms-input-placeholder{font-style:italic;color:#777;color:rgba(255,255,255,.45)}.Input--monospace .Input__input{font-family:"Consolas",monospace}.Knob{position:relative;font-size:1rem;width:2.6em;height:2.6em;margin:0 auto;margin-bottom:-0.2em;cursor:n-resize}.Knob:after{content:".";color:transparent;line-height:2.5em}.Knob__circle{position:absolute;top:.1em;bottom:.1em;left:.1em;right:.1em;margin:.3em;background-color:#333;background-image:linear-gradient(to bottom, rgba(255, 255, 255, 0.15) 0%, rgba(255, 255, 255, 0) 100%);border-radius:50%;box-shadow:0 .05em .5em 0 rgba(0,0,0,.5)}.Knob__cursorBox{position:absolute;top:0;bottom:0;left:0;right:0}.Knob__cursor{position:relative;top:.05em;margin:0 auto;width:.2em;height:.8em;background-color:rgba(255,255,255,.9)}.Knob__popupValue{position:absolute;top:-2rem;right:50%;font-size:1rem;text-align:center;padding:.25rem .5rem;color:#fff;background-color:#000;transform:translateX(50%);white-space:nowrap}.Knob__ring{position:absolute;top:0;bottom:0;left:0;right:0;padding:.1em}.Knob__ringTrackPivot{transform:rotateZ(135deg)}.Knob__ringTrack{fill:transparent;stroke:rgba(255,255,255,.1);stroke-width:8;stroke-linecap:round;stroke-dasharray:235.62}.Knob__ringFillPivot{transform:rotateZ(135deg)}.Knob--bipolar .Knob__ringFillPivot{transform:rotateZ(270deg)}.Knob__ringFill{fill:transparent;stroke:#6a96c9;stroke-width:8;stroke-linecap:round;stroke-dasharray:314.16;transition:stroke 50ms ease-out}.Knob--color--black .Knob__ringFill{stroke:#1a1a1a}.Knob--color--white .Knob__ringFill{stroke:#fff}.Knob--color--red .Knob__ringFill{stroke:#df3e3e}.Knob--color--orange .Knob__ringFill{stroke:#f37f33}.Knob--color--yellow .Knob__ringFill{stroke:#fbda21}.Knob--color--olive .Knob__ringFill{stroke:#cbe41c}.Knob--color--green .Knob__ringFill{stroke:#25ca4c}.Knob--color--teal .Knob__ringFill{stroke:#00d6cc}.Knob--color--blue .Knob__ringFill{stroke:#2e93de}.Knob--color--dark-blue .Knob__ringFill{stroke:#005fa7}.Knob--color--violet .Knob__ringFill{stroke:#7349cf}.Knob--color--purple .Knob__ringFill{stroke:#ad45d0}.Knob--color--pink .Knob__ringFill{stroke:#e34da1}.Knob--color--brown .Knob__ringFill{stroke:#b97447}.Knob--color--grey .Knob__ringFill{stroke:#848484}.Knob--color--light-grey .Knob__ringFill{stroke:#b3b3b3}.Knob--color--good .Knob__ringFill{stroke:#68c22d}.Knob--color--average .Knob__ringFill{stroke:#f29a29}.Knob--color--bad .Knob__ringFill{stroke:#df3e3e}.Knob--color--label .Knob__ringFill{stroke:#8b9bb0}.Knob--color--xeno .Knob__ringFill{stroke:#664573}.LabeledList{display:table;width:100%;width:calc(100% + 1em);border-collapse:collapse;border-spacing:0;margin:-0.25em -0.5em;margin-bottom:0;padding:0}.LabeledList__row{display:table-row}.LabeledList__row:last-child .LabeledList__cell{padding-bottom:0}.LabeledList__cell{display:table-cell;margin:0;padding:.25em .5em;border:0;text-align:left}.LabeledList__label--nowrap{width:1%;white-space:nowrap;min-width:5em}.LabeledList__buttons{width:.1%;white-space:nowrap;text-align:right;padding-top:.0833333333em;padding-bottom:0}.Modal{background-color:#202020;max-width:calc(100% - 1rem);padding:1rem}.NoticeBox{padding:.33em .5em;margin-bottom:.5em;box-shadow:none;font-weight:bold;font-style:italic;color:#000;background-color:#bb9b68;background-image:repeating-linear-gradient(-45deg, transparent, transparent 0.8333333333em, rgba(0, 0, 0, 0.1) 0.8333333333em, rgba(0, 0, 0, 0.1) 1.6666666667em)}.NoticeBox--color--black{color:#fff;background-color:#000}.NoticeBox--color--white{color:#000;background-color:#b3b3b3}.NoticeBox--color--red{color:#fff;background-color:#701f1f}.NoticeBox--color--orange{color:#fff;background-color:#854114}.NoticeBox--color--yellow{color:#000;background-color:#83710d}.NoticeBox--color--olive{color:#000;background-color:#576015}.NoticeBox--color--green{color:#fff;background-color:#174e24}.NoticeBox--color--teal{color:#fff;background-color:#064845}.NoticeBox--color--blue{color:#fff;background-color:#1b4565}.NoticeBox--color--dark-blue{color:#fff;background-color:#02121f}.NoticeBox--color--violet{color:#fff;background-color:#3b2864}.NoticeBox--color--purple{color:#fff;background-color:#542663}.NoticeBox--color--pink{color:#fff;background-color:#802257}.NoticeBox--color--brown{color:#fff;background-color:#4c3729}.NoticeBox--color--grey{color:#fff;background-color:#3e3e3e}.NoticeBox--color--light-grey{color:#fff;background-color:#6a6a6a}.NoticeBox--color--good{color:#fff;background-color:#2e4b1a}.NoticeBox--color--average{color:#fff;background-color:#7b4e13}.NoticeBox--color--bad{color:#fff;background-color:#701f1f}.NoticeBox--color--label{color:#fff;background-color:#53565a}.NoticeBox--color--xeno{color:#fff;background-color:#19161b}.NoticeBox--type--info{color:#fff;background-color:#235982}.NoticeBox--type--success{color:#fff;background-color:#1e662f}.NoticeBox--type--warning{color:#fff;background-color:#a95219}.NoticeBox--type--danger{color:#fff;background-color:#8f2828}.Input{position:relative;display:inline-block;width:10em;border:.0833333333em solid #88bfff;border:.0833333333em solid rgba(136,191,255,.75);border-radius:.16em;color:#fff;background-color:#0a0a0a;padding:0 .3333333333em;margin-right:.1666666667em;line-height:1.4166666667em;overflow:visible}.Input--fluid{display:block;width:auto}.Input__baseline{display:inline-block;color:transparent}.Input__input{display:block;position:absolute;top:0;bottom:0;left:0;right:0;border:0;outline:0;width:100%;font-size:1em;line-height:1.4166666667em;height:1.4166666667em;margin:0;padding:0 .5em;font-family:Verdana,sans-serif;background-color:transparent;color:#fff;color:inherit}.Input__input:-ms-input-placeholder{font-style:italic;color:#777;color:rgba(255,255,255,.45)}.Input--monospace .Input__input{font-family:"Consolas",monospace}.NumberInput{position:relative;display:inline-block;border:.0833333333em solid #88bfff;border:.0833333333em solid rgba(136,191,255,.75);border-radius:.16em;color:#88bfff;background-color:#0a0a0a;padding:0 .3333333333em;margin-right:.1666666667em;line-height:1.4166666667em;text-align:right;overflow:visible;cursor:n-resize}.NumberInput--fluid{display:block}.NumberInput__content{margin-left:.5em}.NumberInput__barContainer{position:absolute;top:.1666666667em;bottom:.1666666667em;left:.1666666667em}.NumberInput__bar{position:absolute;bottom:0;left:0;width:.25em;box-sizing:border-box;border-bottom:.0833333333em solid #88bfff;background-color:#88bfff}.NumberInput__input{display:block;position:absolute;top:0;bottom:0;left:0;right:0;border:0;outline:0;width:100%;font-size:1em;line-height:1.4166666667em;height:1.4166666667em;margin:0;padding:0 .5em;font-family:Verdana,sans-serif;background-color:#0a0a0a;color:#fff;text-align:right}.ProgressBar{display:inline-block;position:relative;width:100%;padding:0 .5em;border-width:.0833333333em !important;border-style:solid !important;border-radius:.16em;background-color:rgba(0,0,0,0);transition:border-color 900ms ease-out}.ProgressBar__fill{position:absolute;top:-0.5px;left:0px;bottom:-0.5px}.ProgressBar__fill--animated{transition:background-color 900ms ease-out,width 900ms ease-out}.ProgressBar__content{position:relative;line-height:1.4166666667em;width:100%;text-align:right}.ProgressBar--color--default{border:.0833333333em solid #3e6189}.ProgressBar--color--default .ProgressBar__fill{background-color:#3e6189}.ProgressBar--color--black{border-color:#000 !important}.ProgressBar--color--black .ProgressBar__fill{background-color:#000}.ProgressBar--color--white{border-color:#d9d9d9 !important}.ProgressBar--color--white .ProgressBar__fill{background-color:#d9d9d9}.ProgressBar--color--red{border-color:#bd2020 !important}.ProgressBar--color--red .ProgressBar__fill{background-color:#bd2020}.ProgressBar--color--orange{border-color:#d95e0c !important}.ProgressBar--color--orange .ProgressBar__fill{background-color:#d95e0c}.ProgressBar--color--yellow{border-color:#d9b804 !important}.ProgressBar--color--yellow .ProgressBar__fill{background-color:#d9b804}.ProgressBar--color--olive{border-color:#9aad14 !important}.ProgressBar--color--olive .ProgressBar__fill{background-color:#9aad14}.ProgressBar--color--green{border-color:#1b9638 !important}.ProgressBar--color--green .ProgressBar__fill{background-color:#1b9638}.ProgressBar--color--teal{border-color:#009a93 !important}.ProgressBar--color--teal .ProgressBar__fill{background-color:#009a93}.ProgressBar--color--blue{border-color:#1c71b1 !important}.ProgressBar--color--blue .ProgressBar__fill{background-color:#1c71b1}.ProgressBar--color--dark-blue{border-color:#003e6e !important}.ProgressBar--color--dark-blue .ProgressBar__fill{background-color:#003e6e}.ProgressBar--color--violet{border-color:#552dab !important}.ProgressBar--color--violet .ProgressBar__fill{background-color:#552dab}.ProgressBar--color--purple{border-color:#8b2baa !important}.ProgressBar--color--purple .ProgressBar__fill{background-color:#8b2baa}.ProgressBar--color--pink{border-color:#cf2082 !important}.ProgressBar--color--pink .ProgressBar__fill{background-color:#cf2082}.ProgressBar--color--brown{border-color:#8c5836 !important}.ProgressBar--color--brown .ProgressBar__fill{background-color:#8c5836}.ProgressBar--color--grey{border-color:#646464 !important}.ProgressBar--color--grey .ProgressBar__fill{background-color:#646464}.ProgressBar--color--light-grey{border-color:#919191 !important}.ProgressBar--color--light-grey .ProgressBar__fill{background-color:#919191}.ProgressBar--color--good{border-color:#4d9121 !important}.ProgressBar--color--good .ProgressBar__fill{background-color:#4d9121}.ProgressBar--color--average{border-color:#cd7a0d !important}.ProgressBar--color--average .ProgressBar__fill{background-color:#cd7a0d}.ProgressBar--color--bad{border-color:#bd2020 !important}.ProgressBar--color--bad .ProgressBar__fill{background-color:#bd2020}.ProgressBar--color--label{border-color:#657a94 !important}.ProgressBar--color--label .ProgressBar__fill{background-color:#657a94}.ProgressBar--color--xeno{border-color:#462f4e !important}.ProgressBar--color--xeno .ProgressBar__fill{background-color:#462f4e}.Section{position:relative;margin-bottom:.5em;background-color:#131313;background-color:#131313;box-sizing:border-box}.Section:last-child{margin-bottom:0}.Section__title{position:relative;padding:.5em;border-bottom:.1666666667em solid #4972a1}.Section__titleText{font-size:1.1666666667em;font-weight:bold;color:#fff}.Section__buttons{position:absolute;display:inline-block;right:.5em;margin-top:-.0833333333em}.Section__rest{position:relative}.Section__content{padding:.66em .5em}.Section--fitted>.Section__rest>.Section__content{padding:0}.Section--fill{display:flex;flex-direction:column;height:100%}.Section--fill>.Section__rest{flex-grow:1}.Section--fill>.Section__rest>.Section__content{height:100%}.Section--fill.Section--scrollable>.Section__rest>.Section__content{position:absolute;top:0;left:0;right:0;bottom:0}.Section--fill.Section--iefix{display:table !important;width:100% !important;height:100% !important;border-collapse:collapse;border-spacing:0}.Section--fill.Section--iefix>.Section__rest{display:table-row !important;height:100% !important}.Section--scrollable{overflow-x:hidden;overflow-y:hidden}.Section--scrollable>.Section__rest>.Section__content{overflow-y:scroll;overflow-x:hidden}.Section--scrollableHorizontal{overflow-x:hidden;overflow-y:hidden}.Section--scrollableHorizontal>.Section__rest>.Section__content{overflow-y:hidden;overflow-x:scroll}.Section--scrollable.Section--scrollableHorizontal{overflow-x:hidden;overflow-y:hidden}.Section--scrollable.Section--scrollableHorizontal>.Section__rest>.Section__content{overflow-y:scroll;overflow-x:scroll}.Section .Section{background-color:transparent;margin-left:-0.5em;margin-right:-0.5em}.Section .Section:first-child{margin-top:-0.5em}.Section .Section .Section__titleText{font-size:1.0833333333em}.Section .Section .Section .Section__titleText{font-size:1em}.Slider{cursor:e-resize}.Slider__cursorOffset{position:absolute;top:0;left:0;bottom:0;transition:none !important}.Slider__cursor{position:absolute;top:0;right:-.0833333333em;bottom:0;width:0;border-left:.1666666667em solid #fff}.Slider__pointer{position:absolute;right:-.4166666667em;bottom:-.3333333333em;width:0;height:0;border-left:.4166666667em solid transparent;border-right:.4166666667em solid transparent;border-bottom:.4166666667em solid #fff}.Slider__popupValue{position:absolute;right:0;top:-2rem;font-size:1rem;padding:.25rem .5rem;color:#fff;background-color:#000;transform:translateX(50%);white-space:nowrap}.Divider--horizontal{margin:.5em 0}.Divider--horizontal:not(.Divider--hidden){border-top:.1666666667em solid rgba(255,255,255,.1)}.Divider--vertical{height:100%;margin:0 .5em}.Divider--vertical:not(.Divider--hidden){border-left:.1666666667em solid rgba(255,255,255,.1)}.Stack--fill{height:100%}.Stack--horizontal>.Stack__item{margin-left:.5em}.Stack--horizontal>.Stack__item:first-child{margin-left:0}.Stack--vertical>.Stack__item{margin-top:.5em}.Stack--vertical>.Stack__item:first-child{margin-top:0}.Stack--horizontal>.Stack__divider:not(.Stack__divider--hidden){border-left:.1666666667em solid rgba(255,255,255,.1)}.Stack--vertical>.Stack__divider:not(.Stack__divider--hidden){border-top:.1666666667em solid rgba(255,255,255,.1)}.Table{display:table;width:100%;border-collapse:collapse;border-spacing:0;margin:0}.Table--collapsing{width:auto}.Table__row{display:table-row}.Table__cell{display:table-cell;padding:0 .25em}.Table__cell:first-child{padding-left:0}.Table__cell:last-child{padding-right:0}.Table__row--header .Table__cell,.Table__cell--header{font-weight:bold;padding-bottom:.5em}.Table__cell--collapsing{width:1%;white-space:nowrap}.Tabs{display:flex;align-items:stretch;overflow:hidden;background-color:#131313}.Tabs--fill{height:100%}.Section .Tabs{background-color:transparent}.Section:not(.Section--fitted) .Tabs{margin:0 -0.5em .5em}.Section:not(.Section--fitted) .Tabs:first-child{margin-top:-0.5em}.Tabs--vertical{flex-direction:column;padding:.25em 0 .25em .25em}.Tabs--horizontal{margin-bottom:.5em;padding:.25em .25em 0 .25em}.Tabs--horizontal:last-child{margin-bottom:0}.Tabs__Tab{flex-grow:0}.Tabs--fluid .Tabs__Tab{flex-grow:1}.Tab{display:flex;align-items:center;justify-content:space-between;background-color:transparent;color:rgba(255,255,255,.5);min-height:2.25em;min-width:4em}.Tab:not(.Tab--selected):hover{background-color:rgba(255,255,255,.075)}.Tab--selected{background-color:rgba(255,255,255,.125);color:#dfe7f0}.Tab__text{flex-grow:1;margin:0 .5em}.Tab__left{min-width:1.5em;text-align:center;margin-left:.25em}.Tab__right{min-width:1.5em;text-align:center;margin-right:.25em}.Tabs--horizontal .Tab{border-top:.1666666667em solid transparent;border-bottom:.1666666667em solid transparent;border-top-left-radius:.25em;border-top-right-radius:.25em}.Tabs--horizontal .Tab--selected{border-bottom:.1666666667em solid #d4dfec}.Tabs--vertical .Tab{min-height:2em;border-left:.1666666667em solid transparent;border-right:.1666666667em solid transparent;border-top-left-radius:.25em;border-bottom-left-radius:.25em}.Tabs--vertical .Tab--selected{border-right:.1666666667em solid #d4dfec}.Tab--selected.Tab--color--black{color:#535353}.Tabs--horizontal .Tab--selected.Tab--color--black{border-bottom-color:#1a1a1a}.Tabs--vertical .Tab--selected.Tab--color--black{border-right-color:#1a1a1a}.Tab--selected.Tab--color--white{color:#fff}.Tabs--horizontal .Tab--selected.Tab--color--white{border-bottom-color:#fff}.Tabs--vertical .Tab--selected.Tab--color--white{border-right-color:#fff}.Tab--selected.Tab--color--red{color:#e76e6e}.Tabs--horizontal .Tab--selected.Tab--color--red{border-bottom-color:#df3e3e}.Tabs--vertical .Tab--selected.Tab--color--red{border-right-color:#df3e3e}.Tab--selected.Tab--color--orange{color:#f69f66}.Tabs--horizontal .Tab--selected.Tab--color--orange{border-bottom-color:#f37f33}.Tabs--vertical .Tab--selected.Tab--color--orange{border-right-color:#f37f33}.Tab--selected.Tab--color--yellow{color:#fce358}.Tabs--horizontal .Tab--selected.Tab--color--yellow{border-bottom-color:#fbda21}.Tabs--vertical .Tab--selected.Tab--color--yellow{border-right-color:#fbda21}.Tab--selected.Tab--color--olive{color:#d8eb55}.Tabs--horizontal .Tab--selected.Tab--color--olive{border-bottom-color:#cbe41c}.Tabs--vertical .Tab--selected.Tab--color--olive{border-right-color:#cbe41c}.Tab--selected.Tab--color--green{color:#53e074}.Tabs--horizontal .Tab--selected.Tab--color--green{border-bottom-color:#25ca4c}.Tabs--vertical .Tab--selected.Tab--color--green{border-right-color:#25ca4c}.Tab--selected.Tab--color--teal{color:#21fff5}.Tabs--horizontal .Tab--selected.Tab--color--teal{border-bottom-color:#00d6cc}.Tabs--vertical .Tab--selected.Tab--color--teal{border-right-color:#00d6cc}.Tab--selected.Tab--color--blue{color:#62aee6}.Tabs--horizontal .Tab--selected.Tab--color--blue{border-bottom-color:#2e93de}.Tabs--vertical .Tab--selected.Tab--color--blue{border-right-color:#2e93de}.Tab--selected.Tab--color--dark-blue{color:#008ffd}.Tabs--horizontal .Tab--selected.Tab--color--dark-blue{border-bottom-color:#005fa7}.Tabs--vertical .Tab--selected.Tab--color--dark-blue{border-right-color:#005fa7}.Tab--selected.Tab--color--violet{color:#9676db}.Tabs--horizontal .Tab--selected.Tab--color--violet{border-bottom-color:#7349cf}.Tabs--vertical .Tab--selected.Tab--color--violet{border-right-color:#7349cf}.Tab--selected.Tab--color--purple{color:#c274db}.Tabs--horizontal .Tab--selected.Tab--color--purple{border-bottom-color:#ad45d0}.Tabs--vertical .Tab--selected.Tab--color--purple{border-right-color:#ad45d0}.Tab--selected.Tab--color--pink{color:#ea79b9}.Tabs--horizontal .Tab--selected.Tab--color--pink{border-bottom-color:#e34da1}.Tabs--vertical .Tab--selected.Tab--color--pink{border-right-color:#e34da1}.Tab--selected.Tab--color--brown{color:#ca9775}.Tabs--horizontal .Tab--selected.Tab--color--brown{border-bottom-color:#b97447}.Tabs--vertical .Tab--selected.Tab--color--brown{border-right-color:#b97447}.Tab--selected.Tab--color--grey{color:#a3a3a3}.Tabs--horizontal .Tab--selected.Tab--color--grey{border-bottom-color:#848484}.Tabs--vertical .Tab--selected.Tab--color--grey{border-right-color:#848484}.Tab--selected.Tab--color--light-grey{color:#c6c6c6}.Tabs--horizontal .Tab--selected.Tab--color--light-grey{border-bottom-color:#b3b3b3}.Tabs--vertical .Tab--selected.Tab--color--light-grey{border-right-color:#b3b3b3}.Tab--selected.Tab--color--good{color:#8cd95a}.Tabs--horizontal .Tab--selected.Tab--color--good{border-bottom-color:#68c22d}.Tabs--vertical .Tab--selected.Tab--color--good{border-right-color:#68c22d}.Tab--selected.Tab--color--average{color:#f5b35e}.Tabs--horizontal .Tab--selected.Tab--color--average{border-bottom-color:#f29a29}.Tabs--vertical .Tab--selected.Tab--color--average{border-right-color:#f29a29}.Tab--selected.Tab--color--bad{color:#e76e6e}.Tabs--horizontal .Tab--selected.Tab--color--bad{border-bottom-color:#df3e3e}.Tabs--vertical .Tab--selected.Tab--color--bad{border-right-color:#df3e3e}.Tab--selected.Tab--color--label{color:#a8b4c4}.Tabs--horizontal .Tab--selected.Tab--color--label{border-bottom-color:#8b9bb0}.Tabs--vertical .Tab--selected.Tab--color--label{border-right-color:#8b9bb0}.Tab--selected.Tab--color--xeno{color:#9366a3}.Tabs--horizontal .Tab--selected.Tab--color--xeno{border-bottom-color:#664573}.Tabs--vertical .Tab--selected.Tab--color--xeno{border-right-color:#664573}.Input{position:relative;display:inline-block;width:10em;border:.0833333333em solid #88bfff;border:.0833333333em solid rgba(136,191,255,.75);border-radius:.16em;color:#fff;background-color:#0a0a0a;padding:0 .3333333333em;margin-right:.1666666667em;line-height:1.4166666667em;overflow:visible}.Input--fluid{display:block;width:auto}.Input__baseline{display:inline-block;color:transparent}.Input__input{display:block;position:absolute;top:0;bottom:0;left:0;right:0;border:0;outline:0;width:100%;font-size:1em;line-height:1.4166666667em;height:1.4166666667em;margin:0;padding:0 .5em;font-family:Verdana,sans-serif;background-color:transparent;color:#fff;color:inherit}.Input__input:-ms-input-placeholder{font-style:italic;color:#777;color:rgba(255,255,255,.45)}.Input--monospace .Input__input{font-family:"Consolas",monospace}.TextArea{position:relative;display:inline-block;border:.0833333333em solid #88bfff;border:.0833333333em solid rgba(136,191,255,.75);border-radius:.16em;background-color:#0a0a0a;margin-right:.1666666667em;line-height:1.4166666667em;box-sizing:border-box;width:100%}.TextArea--fluid{display:block;width:auto;height:auto}.TextArea--noborder{border:0px}.TextArea__textarea.TextArea__textarea--scrollable{overflow:auto;overflow-x:hidden;overflow-y:scroll}.TextArea__textarea{display:block;position:absolute;top:0;bottom:0;left:0;right:0;border:0;outline:0;width:100%;height:100%;font-size:1em;line-height:1.4166666667em;min-height:1.4166666667em;margin:0;padding:0 .5em;font-family:inherit;background-color:transparent;color:inherit;box-sizing:border-box;word-wrap:break-word;overflow:hidden}.TextArea__textarea:-ms-input-placeholder{font-style:italic;color:#777;color:rgba(255,255,255,.45)}.TextArea__textarea_custom{overflow:visible;white-space:pre-wrap}.Tooltip{z-index:2;padding:.5em .75em;pointer-events:none;text-align:left;transition:opacity 150ms ease-out;background-color:#000;color:#fff;box-shadow:.1em .1em 1.25em -0.1em rgba(0,0,0,.5);border-radius:.16em;max-width:20.8333333333em}.Chat{color:#abc6ec}.Chat__badge{display:inline-block;min-width:.5em;font-size:.7em;padding:.2em .3em;line-height:1;color:#fff;text-align:center;white-space:nowrap;vertical-align:middle;background-color:crimson;border-radius:10px;transition:font-size 200ms ease-out}.Chat__badge:before{content:"x"}.Chat__badge--animate{font-size:.9em;transition:font-size 0ms}.Chat__scrollButton{position:fixed;right:2em;bottom:1em}.Chat__reconnected{font-size:.85em;text-align:center;margin:1em 0 2em}.Chat__reconnected:before{content:"Reconnected";display:inline-block;border-radius:1em;padding:0 .7em;color:#db2828;background-color:#131313}.Chat__reconnected:after{content:"";display:block;margin-top:-0.75em;border-bottom:.1666666667em solid #db2828}.Chat__highlight{color:#000}.Chat__highlight--restricted{color:#fff;background-color:#a00;font-weight:bold}.ChatMessage{word-wrap:break-word}.ChatMessage--highlighted{position:relative;border-left:.1666666667em solid #fd4;padding-left:.5em}.ChatMessage--highlighted:after{content:"";position:absolute;top:0;bottom:0;left:0;right:0;background-color:rgba(255,221,68,.1);pointer-events:none}.Ping{position:relative;padding:.125em .25em;border:.0833333333em solid rgba(140,140,140,.5);border-radius:.25em;width:3.75em;text-align:right}.Ping__indicator{content:"";position:absolute;top:.5em;left:.5em;width:.5em;height:.5em;background-color:#888;border-radius:.25em}.Notifications{position:absolute;bottom:1em;left:1em;right:2em}.Notification{color:#fff;background-color:crimson;padding:.5em;margin:1em 0}.Notification:first-child{margin-top:0}.Notification:last-child{margin-bottom:0}.Layout,.Layout *{scrollbar-base-color:#181818;scrollbar-face-color:#363636;scrollbar-3dlight-color:#202020;scrollbar-highlight-color:#202020;scrollbar-track-color:#181818;scrollbar-arrow-color:#909090;scrollbar-shadow-color:#363636}.Layout__content{position:absolute;top:0;bottom:0;left:0;right:0;overflow-x:hidden;overflow-y:hidden}.Layout__content--scrollable{overflow-y:scroll;margin-bottom:0}.Window{position:fixed;top:0;bottom:0;left:0;right:0;color:#fff;background-color:#202020;background-image:linear-gradient(to bottom, #202020 0%, #202020 100%)}.Window__titleBar{position:fixed;z-index:1;top:0;left:0;width:100%;height:32px;height:2.6666666667rem}.Window__rest{position:fixed;top:32px;top:2.6666666667rem;bottom:0;left:0;right:0}.Window__contentPadding{margin:.5rem;height:100%;height:calc(100% - 1.01rem)}.Window__contentPadding:after{height:0}.Layout__content--scrollable .Window__contentPadding:after{display:block;content:"";height:.5rem}.Window__dimmer{position:fixed;top:0;bottom:0;left:0;right:0;background-color:rgba(56,56,56,.25);pointer-events:none}.Window__resizeHandle__se{position:fixed;bottom:0;right:0;width:20px;width:1.6666666667rem;height:20px;height:1.6666666667rem;cursor:se-resize}.Window__resizeHandle__s{position:fixed;bottom:0;left:0;right:0;height:6px;height:.5rem;cursor:s-resize}.Window__resizeHandle__e{position:fixed;top:0;bottom:0;right:0;width:3px;width:.25rem;cursor:e-resize}em{font-style:normal;font-weight:bold}img{margin:0;padding:0;line-height:1;-ms-interpolation-mode:nearest-neighbor;image-rendering:pixelated}img.icon{height:1em;min-height:16px;width:auto;vertical-align:bottom}a{color:#397ea5}a.visited{color:#7c00e6}a:visited{color:#7c00e6}a.popt{text-decoration:none}.popup{position:fixed;top:50%;left:50%;background:#ddd}.popup .close{position:absolute;background:#aaa;top:0;right:0;color:#333;text-decoration:none;z-index:2;padding:0 10px;height:30px;line-height:30px}.popup .close:hover{background:#999}.popup .head{background:#999;color:#ddd;padding:0 10px;height:30px;line-height:30px;text-transform:uppercase;font-size:.9em;font-weight:bold;border-bottom:2px solid green}.popup input{border:1px solid #999;background:#fff;margin:0;padding:5px;outline:none;color:#333}.popup input[type=text]:hover,.popup input[type=text]:active,.popup input[type=text]:focus{border-color:green}.popup input[type=submit]{padding:5px 10px;background:#999;color:#ddd;text-transform:uppercase;font-size:.9em;font-weight:bold}.popup input[type=submit]:hover,.popup input[type=submit]:focus,.popup input[type=submit]:active{background:#aaa;cursor:pointer}.changeFont{padding:10px}.changeFont a{display:block;text-decoration:none;padding:3px;color:#333}.changeFont a:hover{background:#ccc}.highlightPopup{padding:10px;text-align:center}.highlightPopup input[type=text]{display:block;width:215px;text-align:left;margin-top:5px}.highlightPopup input.highlightColor{background-color:#ff0}.highlightPopup input.highlightTermSubmit{margin-top:5px}.contextMenu{background-color:#ddd;position:fixed;margin:2px;width:150px}.contextMenu a{display:block;padding:2px 5px;text-decoration:none;color:#333}.contextMenu a:hover{background-color:#ccc}.filterMessages{padding:5px}.filterMessages div{padding:2px 0}.icon-stack{height:1em;line-height:1em;width:1em;vertical-align:middle;margin-top:-2px}.motd{color:#a4bad6;font-family:Verdana,sans-serif;white-space:normal}.motd h1,.motd h2,.motd h3,.motd h4,.motd h5,.motd h6{color:#a4bad6;text-decoration:underline}.motd a,.motd a:link,.motd a:visited,.motd a:active,.motd a:hover{color:#a4bad6}.bold,.name,.prefix,.ooc,.looc,.adminooc,.admin,.medal,.yell{font-weight:bold}.italic,.italics{font-style:italic}.highlight{background:#ff0}h1,h2,h3,h4,h5,h6{color:#a4bad6;font-family:Georgia,Verdana,sans-serif}h1.alert,h2.alert{color:#a4bad6}em{font-style:normal;font-weight:bold}.ooc{font-weight:bold}.adminobserverooc{color:#09c;font-weight:bold}.adminooc{color:#3d5bc3;font-weight:bold}.adminsay{color:#9611d4;font-weight:bold}.admin{color:#5975da;font-weight:bold}.name{font-weight:bold}.deadsay{color:#e2c1ff}.binarysay{color:#1e90ff}.binarysay a{color:lime}.binarysay a:active,.binarysay a:visited{color:#8f8}.radio{color:#1ecc43}.sciradio{color:#c68cfa}.comradio{color:#fcdf03}.secradio{color:#dd3535}.medradio{color:#57b8f0}.engradio{color:#f37746}.suppradio{color:#b88646}.servradio{color:#6ca729}.syndradio{color:#8f4a4b}.gangradio{color:#ac2ea1}.centcomradio{color:#2681a5}.aiprivradio{color:#d65d95}.redteamradio{color:#f44}.blueteamradio{color:#3434fd}.greenteamradio{color:#34fd34}.yellowteamradio{color:#fdfd34}.yell{font-weight:bold}.alert{color:#d82020}.userdanger{color:#c51e1e;font-weight:bold;font-size:185%}.bolddanger{color:#c51e1e;font-weight:bold}.danger{color:#c51e1e}.warning{color:#c51e1e;font-style:italic}.alertwarning{color:red;font-weight:bold}.boldwarning{color:#c51e1e;font-style:italic;font-weight:bold}.announce{color:#c51e1e;font-weight:bold}.boldannounce{color:#c51e1e;font-weight:bold}.minorannounce{font-weight:bold;font-size:185%}.greenannounce{color:#059223;font-weight:bold}.rose{color:#ff5050}.info{color:#9ab0ff}.notice{color:#6685f5}.staff_ic{color:#6685f5}.tinynotice{color:#6685f5;font-size:85%}.tinynoticeital{color:#6685f5;font-style:italic;font-size:85%}.smallnotice{color:#6685f5;font-size:90%}.smallnoticeital{color:#6685f5;font-style:italic;font-size:90%}.boldnotice{color:#6685f5;font-weight:bold}.hear{color:#6685f5;font-style:italic}.adminnotice{color:#6685f5}.adminhelp{color:red;font-weight:bold}.unconscious{color:#a4bad6;font-weight:bold}.suicide{color:#ff5050;font-style:italic}.green{color:#059223}.grey{color:#838383}.red{color:red}.blue{color:#215cff}.nicegreen{color:#059223}.boldnicegreen{color:#059223;font-weight:bold}.cult{color:#973e3b}.cultitalic{color:#973e3b;font-style:italic}.cultbold{color:#973e3b;font-style:italic;font-weight:bold}.cultboldtalic{color:#973e3b;font-weight:bold;font-size:185%}.cultlarge{color:#973e3b;font-weight:bold;font-size:185%}.narsie{color:#973e3b;font-weight:bold;font-size:925%}.narsiesmall{color:#973e3b;font-weight:bold;font-size:370%}.colossus{color:#7f282a;font-size:310%}.hierophant{color:#b441ee;font-weight:bold;font-style:italic}.hierophant_warning{color:#c56bf1;font-style:italic}.purple{color:#9956d3}.holoparasite{color:#88809c}.revennotice{color:#c099e2}.revenboldnotice{color:#c099e2;font-weight:bold}.revenbignotice{color:#c099e2;font-weight:bold;font-size:185%}.revenminor{color:#823abb}.revenwarning{color:#760fbb;font-style:italic}.revendanger{color:#760fbb;font-weight:bold;font-size:185%}.deconversion_message{color:#a947ff;font-size:185%;font-style:italic}.ghostalert{color:#60f;font-style:italic;font-weight:bold}.alien{color:#855d85}.noticealien{color:#059223}.alertalien{color:#059223;font-weight:bold}.changeling{color:#059223;font-style:italic}.alertsyndie{color:red;font-size:185%;font-weight:bold}.spider{color:#80f;font-weight:bold;font-size:185%}.interface{color:#750e75}.sans{font-family:"Comic Sans MS",cursive,sans-serif}.papyrus{font-family:"Papyrus",cursive,sans-serif}.robot{font-family:"Courier New",cursive,sans-serif}.tape_recorder{color:red;font-family:"Courier New",cursive,sans-serif}.command_headset{font-weight:bold;font-size:160%}.small{font-size:60%}.big{font-size:185%}.reallybig{font-size:245%}.extremelybig{font-size:310%}.greentext{color:#059223;font-size:185%}.redtext{color:#c51e1e;font-size:185%}.clown{color:#ff70c1;font-size:160%;font-family:"Comic Sans MS",cursive,sans-serif;font-weight:bold}.singing{font-family:"Trebuchet MS",cursive,sans-serif;font-style:italic}.his_grace{color:#15d512;font-family:"Courier New",cursive,sans-serif;font-style:italic}.hypnophrase{color:#202020;font-weight:bold;animation:hypnocolor 1500ms infinite;animation-direction:alternate}@keyframes hypnocolor{0%{color:#202020}25%{color:#4b02ac}50%{color:#9f41f1}75%{color:#541c9c}100%{color:#7adbf3}}.phobia{color:#d00;font-weight:bold;animation:phobia 750ms infinite}@keyframes phobia{0%{color:#f75a5a}50%{color:#d00}100%{color:#f75a5a}}.icon{height:1em;width:auto}.bigicon{font-size:2.5em}.memo{color:#638500;text-align:center}.memoedit{text-align:center;font-size:125%}.abductor{color:#c204c2;font-style:italic}.mind_control{color:#df3da9;font-size:100%;font-weight:bold;font-style:italic}.slime{color:#00ced1}.drone{color:#848482}.monkey{color:#975032}.swarmer{color:#2c75ff}.resonate{color:#298f85}.monkeyhive{color:#a56408}.monkeylead{color:#af6805;font-size:80%}.connectionClosed,.fatalError{background:red;color:#fff;padding:5px}.connectionClosed.restored{background:green}.internal.boldnshit{color:#3d5bc3;font-weight:bold}.text-normal{font-weight:normal;font-style:normal}.hidden{display:none;visibility:hidden}.ml-1{margin-left:1em}.ml-2{margin-left:2em}.ml-3{margin-left:3em}.xooc{color:#ac04e9;font-weight:bold;font-size:140%}.mooc{color:#090;font-weight:bold;font-size:140%}.yooc{color:#999600;font-weight:bold;font-size:140%}.headminsay{color:#653d78;font-weight:bold}.radio{color:#b4b4b4}.deptradio{color:#939}.comradio{color:#779cc2}.centradio{color:#5c5c8a}.hcradio{color:#318779}.pvstradio{color:#9b0612}.cryoradio{color:#ad6d48}.airadio{color:#f0f}.secradio{color:#a52929}.engradio{color:#a66300}.sentryradio{color:#844300}.medradio{color:#008160}.supradio{color:#ba8e41}.jtacradio{color:#ad3b98}.intelradio{color:#027d02}.wyradio{color:#fe9b24}.pmcradio{color:#4dc5ce}.vairadio{color:#e3580e}.rmcradio{color:#e3580e}.cmbradio{color:#1b748c}.clfradio{color:#8e83ca}.alpharadio{color:#db2626}.bravoradio{color:#c68610}.charlieradio{color:#a5a}.deltaradio{color:#007fcf}.echoradio{color:#3eb489}.medium{font-size:110%}.big{font-size:115%}.large{font-size:125%}.extra_large{font-size:130%}.huge{font-size:150%}.underline{text-decoration:underline}.orange{color:#eca100}.normal{font-style:normal}.attack{color:#ff3838}.moderate{color:#c00}.disarm{color:#900}.passive{color:#600}.helpful{color:#368f31}.scanner{color:#ff3838}.scannerb{color:#ff3838;font-weight:bold}.scannerburn{color:orange}.scannerburnb{color:orange;font-weight:bold}.rose{color:#ff5050}.debuginfo{color:#493d26;font-style:italic}.xenonotice{color:#51a16c}.xenoboldnotice{color:#51a16c;font-style:italic}.xenowarning{color:#51a16c;font-style:italic}.xenominorwarning{color:#51a16c;font-weight:bold;font-style:italic}.xenodanger{color:#51a16c;font-weight:bold}.avoidharm{color:#72a0e5;font-weight:bold}.highdanger{color:#ff3838;font-weight:bold;font-size:140%}.xenohighdanger{color:#51a16c;font-weight:bold;font-size:140%}.xenoannounce{color:#65c585;font-family:book-antiqua;font-weight:bold;font-size:140%}.yautjabold{color:purple;font-weight:bold}.yautjaboldbig{color:purple;font-weight:bold;font-size:120%}.objectivebig{font-weight:bold;font-size:130%}.objectivegreen{color:lime}.objectivered{color:red}.objectivesuccess{color:lime;font-weight:bold;font-size:110%}.objectivefail{color:red;font-weight:bold;font-size:110%}.xenotalk,.xeno{color:#c048c0;font-style:italic}.xenoleader{color:#996e99;font-style:italic;font-size:125%}.xenoqueen{color:#996e99;font-style:italic;font-weight:bold;font-size:125%}.newscaster{color:maroon}.role_header{color:#e92d2d;display:block;text-align:center;font-weight:bold;font-family:trebuchet-ms;font-size:150%}.role_body{color:#3a3ae9;display:block;text-align:center;font-size:125%}.round_header{color:#e92d2d;display:block;text-align:center;font-family:courier;font-weight:bold;font-size:180%}.round_body{color:#c5c5c5;display:block;text-align:center;font-family:trebuchet-ms;font-weight:bold;font-size:125%}.event_announcement{color:#600d48;font-family:arial-narrow;font-weight:bold;font-size:125%}.announce_header{color:#cecece;font-weight:bold;font-size:150%}.announce_header_blue{color:#7575f3;font-weight:bold;font-size:150%}.announce_header_admin{color:#7575f3;font-weight:bold;font-size:150%}.announce_body{color:#e92d2d;font-weight:normal;font-size:125%}.centerbold{display:block;text-align:center;font-weight:bold}.mod{color:#917455;font-weight:bold}.modooc{color:#184880;font-weight:bold}.adminmod{color:#7c440c;font-weight:bold}.mentorsay{color:#d4af57;font-weight:bold}.mentorhelp{color:#090;font-weight:bold}.mentorbody{color:#da6200;font-weight:bold}.mentorstaff{color:#b5850d;font-weight:bold}.staffsay{color:#b5850d;font-weight:bold}.tajaran{color:#803b56}.tajaran_signlang{color:#941c1c}.skrell{color:#00ced1}.soghun{color:#228b22}.changeling{color:purple}.vox{color:#a0a}.monkey{color:#966c47}.german{color:#858f1e;font-family:"Times New Roman",Times,serif}.spanish{color:#cf982b}.japanese{color:#940927}.chinese{color:#fe1919}.zombie{color:#2dacb1;font-style:italic}.rough{font-family:trebuchet-ms,cursive,sans-serif}.commando{color:#fe9b24;font-style:bold}.say_quote{font-family:Georgia,Verdana,sans-serif}.admin .message{color:#314cad}.admin .prefix{font-weight:bolder}.pm{font-size:110%}.deadsay{color:#8b4dff}.retro_translator{font-weight:bold}.yautja_translator{color:#a00;font-weight:bold;animation:glitch .5s infinite}@keyframes glitch{25%{color:#a00;transform:translate(-2px, -1px)}50%{color:#be0000;transform:translate(1px, -2px)}75%{color:#8d0000;transform:translate(-1px, 2px)}100%{color:#830000;transform:translate(1px, 1px)}}.examine_block{background:#1b1c1e;border:1px solid #a4bad6;margin:.5em;padding:.5em .75em}.examine_block .icon{width:1.5em;height:1.5em;margin:0;padding:0}.tooltip{font-style:italic;border-bottom:1px dashed #fff}
 .theme-light .color-black{color:#000 !important}.theme-light .color-white{color:#e6e6e6 !important}.theme-light .color-red{color:#c82121 !important}.theme-light .color-orange{color:#e6630d !important}.theme-light .color-yellow{color:#e5c304 !important}.theme-light .color-olive{color:#a3b816 !important}.theme-light .color-green{color:#1d9f3b !important}.theme-light .color-teal{color:#00a39c !important}.theme-light .color-blue{color:#1e78bb !important}.theme-light .color-dark-blue{color:#004274 !important}.theme-light .color-violet{color:#5a30b5 !important}.theme-light .color-purple{color:#932eb4 !important}.theme-light .color-pink{color:#db228a !important}.theme-light .color-brown{color:#955d39 !important}.theme-light .color-grey{color:#e6e6e6 !important}.theme-light .color-light-grey{color:#999 !important}.theme-light .color-good{color:#529923 !important}.theme-light .color-average{color:#da810e !important}.theme-light .color-bad{color:#c82121 !important}.theme-light .color-label{color:#353535 !important}.theme-light .color-xeno{color:#4a3253 !important}.theme-light .color-bg-black{background-color:#000 !important}.theme-light .color-bg-white{background-color:#bfbfbf !important}.theme-light .color-bg-red{background-color:#a61c1c !important}.theme-light .color-bg-orange{background-color:#c0530b !important}.theme-light .color-bg-yellow{background-color:#bfa303 !important}.theme-light .color-bg-olive{background-color:#889912 !important}.theme-light .color-bg-green{background-color:#188532 !important}.theme-light .color-bg-teal{background-color:#008882 !important}.theme-light .color-bg-blue{background-color:#19649c !important}.theme-light .color-bg-dark-blue{background-color:#003761 !important}.theme-light .color-bg-violet{background-color:#4b2897 !important}.theme-light .color-bg-purple{background-color:#7a2696 !important}.theme-light .color-bg-pink{background-color:#b61d73 !important}.theme-light .color-bg-brown{background-color:#7c4d2f !important}.theme-light .color-bg-grey{background-color:#bfbfbf !important}.theme-light .color-bg-light-grey{background-color:gray !important}.theme-light .color-bg-good{background-color:#44801d !important}.theme-light .color-bg-average{background-color:#b56b0b !important}.theme-light .color-bg-bad{background-color:#a61c1c !important}.theme-light .color-bg-label{background-color:#2c2c2c !important}.theme-light .color-bg-xeno{background-color:#3e2945 !important}.theme-light .Tabs{display:flex;align-items:stretch;overflow:hidden;background-color:#fff}.theme-light .Tabs--fill{height:100%}.theme-light .Section .Tabs{background-color:transparent}.theme-light .Section:not(.Section--fitted) .Tabs{margin:0 -0.5em .5em}.theme-light .Section:not(.Section--fitted) .Tabs:first-child{margin-top:-0.5em}.theme-light .Tabs--vertical{flex-direction:column;padding:.25em 0 .25em .25em}.theme-light .Tabs--horizontal{margin-bottom:.5em;padding:.25em .25em 0 .25em}.theme-light .Tabs--horizontal:last-child{margin-bottom:0}.theme-light .Tabs__Tab{flex-grow:0}.theme-light .Tabs--fluid .Tabs__Tab{flex-grow:1}.theme-light .Tab{display:flex;align-items:center;justify-content:space-between;background-color:transparent;color:rgba(0,0,0,.5);min-height:2.25em;min-width:4em}.theme-light .Tab:not(.Tab--selected):hover{background-color:rgba(255,255,255,.075)}.theme-light .Tab--selected{background-color:rgba(255,255,255,.125);color:#404040}.theme-light .Tab__text{flex-grow:1;margin:0 .5em}.theme-light .Tab__left{min-width:1.5em;text-align:center;margin-left:.25em}.theme-light .Tab__right{min-width:1.5em;text-align:center;margin-right:.25em}.theme-light .Tabs--horizontal .Tab{border-top:.1666666667em solid transparent;border-bottom:.1666666667em solid transparent;border-top-left-radius:.25em;border-top-right-radius:.25em}.theme-light .Tabs--horizontal .Tab--selected{border-bottom:.1666666667em solid #000}.theme-light .Tabs--vertical .Tab{min-height:2em;border-left:.1666666667em solid transparent;border-right:.1666666667em solid transparent;border-top-left-radius:.25em;border-bottom-left-radius:.25em}.theme-light .Tabs--vertical .Tab--selected{border-right:.1666666667em solid #000}.theme-light .Tab--selected.Tab--color--black{color:#404040}.theme-light .Tabs--horizontal .Tab--selected.Tab--color--black{border-bottom-color:#000}.theme-light .Tabs--vertical .Tab--selected.Tab--color--black{border-right-color:#000}.theme-light .Tab--selected.Tab--color--white{color:#ececec}.theme-light .Tabs--horizontal .Tab--selected.Tab--color--white{border-bottom-color:#e6e6e6}.theme-light .Tabs--vertical .Tab--selected.Tab--color--white{border-right-color:#e6e6e6}.theme-light .Tab--selected.Tab--color--red{color:#e14d4d}.theme-light .Tabs--horizontal .Tab--selected.Tab--color--red{border-bottom-color:#c82121}.theme-light .Tabs--vertical .Tab--selected.Tab--color--red{border-right-color:#c82121}.theme-light .Tab--selected.Tab--color--orange{color:#f48942}.theme-light .Tabs--horizontal .Tab--selected.Tab--color--orange{border-bottom-color:#e6630d}.theme-light .Tabs--vertical .Tab--selected.Tab--color--orange{border-right-color:#e6630d}.theme-light .Tab--selected.Tab--color--yellow{color:#fcdd33}.theme-light .Tabs--horizontal .Tab--selected.Tab--color--yellow{border-bottom-color:#e5c304}.theme-light .Tabs--vertical .Tab--selected.Tab--color--yellow{border-right-color:#e5c304}.theme-light .Tab--selected.Tab--color--olive{color:#d0e732}.theme-light .Tabs--horizontal .Tab--selected.Tab--color--olive{border-bottom-color:#a3b816}.theme-light .Tabs--vertical .Tab--selected.Tab--color--olive{border-right-color:#a3b816}.theme-light .Tab--selected.Tab--color--green{color:#33da5a}.theme-light .Tabs--horizontal .Tab--selected.Tab--color--green{border-bottom-color:#1d9f3b}.theme-light .Tabs--vertical .Tab--selected.Tab--color--green{border-right-color:#1d9f3b}.theme-light .Tab--selected.Tab--color--teal{color:#00faef}.theme-light .Tabs--horizontal .Tab--selected.Tab--color--teal{border-bottom-color:#00a39c}.theme-light .Tabs--vertical .Tab--selected.Tab--color--teal{border-right-color:#00a39c}.theme-light .Tab--selected.Tab--color--blue{color:#419ce1}.theme-light .Tabs--horizontal .Tab--selected.Tab--color--blue{border-bottom-color:#1e78bb}.theme-light .Tabs--vertical .Tab--selected.Tab--color--blue{border-right-color:#1e78bb}.theme-light .Tab--selected.Tab--color--dark-blue{color:#0079d7}.theme-light .Tabs--horizontal .Tab--selected.Tab--color--dark-blue{border-bottom-color:#004274}.theme-light .Tabs--vertical .Tab--selected.Tab--color--dark-blue{border-right-color:#004274}.theme-light .Tab--selected.Tab--color--violet{color:#7f58d3}.theme-light .Tabs--horizontal .Tab--selected.Tab--color--violet{border-bottom-color:#5a30b5}.theme-light .Tabs--vertical .Tab--selected.Tab--color--violet{border-right-color:#5a30b5}.theme-light .Tab--selected.Tab--color--purple{color:#b455d4}.theme-light .Tabs--horizontal .Tab--selected.Tab--color--purple{border-bottom-color:#932eb4}.theme-light .Tabs--vertical .Tab--selected.Tab--color--purple{border-right-color:#932eb4}.theme-light .Tab--selected.Tab--color--pink{color:#e558a7}.theme-light .Tabs--horizontal .Tab--selected.Tab--color--pink{border-bottom-color:#db228a}.theme-light .Tabs--vertical .Tab--selected.Tab--color--pink{border-right-color:#db228a}.theme-light .Tab--selected.Tab--color--brown{color:#c0825a}.theme-light .Tabs--horizontal .Tab--selected.Tab--color--brown{border-bottom-color:#955d39}.theme-light .Tabs--vertical .Tab--selected.Tab--color--brown{border-right-color:#955d39}.theme-light .Tab--selected.Tab--color--grey{color:#ececec}.theme-light .Tabs--horizontal .Tab--selected.Tab--color--grey{border-bottom-color:#e6e6e6}.theme-light .Tabs--vertical .Tab--selected.Tab--color--grey{border-right-color:#e6e6e6}.theme-light .Tab--selected.Tab--color--light-grey{color:#b3b3b3}.theme-light .Tabs--horizontal .Tab--selected.Tab--color--light-grey{border-bottom-color:#999}.theme-light .Tabs--vertical .Tab--selected.Tab--color--light-grey{border-right-color:#999}.theme-light .Tab--selected.Tab--color--good{color:#77d23b}.theme-light .Tabs--horizontal .Tab--selected.Tab--color--good{border-bottom-color:#529923}.theme-light .Tabs--vertical .Tab--selected.Tab--color--good{border-right-color:#529923}.theme-light .Tab--selected.Tab--color--average{color:#f3a23a}.theme-light .Tabs--horizontal .Tab--selected.Tab--color--average{border-bottom-color:#da810e}.theme-light .Tabs--vertical .Tab--selected.Tab--color--average{border-right-color:#da810e}.theme-light .Tab--selected.Tab--color--bad{color:#e14d4d}.theme-light .Tabs--horizontal .Tab--selected.Tab--color--bad{border-bottom-color:#c82121}.theme-light .Tabs--vertical .Tab--selected.Tab--color--bad{border-right-color:#c82121}.theme-light .Tab--selected.Tab--color--label{color:#686868}.theme-light .Tabs--horizontal .Tab--selected.Tab--color--label{border-bottom-color:#353535}.theme-light .Tabs--vertical .Tab--selected.Tab--color--label{border-right-color:#353535}.theme-light .Tab--selected.Tab--color--xeno{color:#7e558e}.theme-light .Tabs--horizontal .Tab--selected.Tab--color--xeno{border-bottom-color:#4a3253}.theme-light .Tabs--vertical .Tab--selected.Tab--color--xeno{border-right-color:#4a3253}.theme-light .Section{position:relative;margin-bottom:.5em;background-color:#fff;background-color:#fff;box-sizing:border-box}.theme-light .Section:last-child{margin-bottom:0}.theme-light .Section__title{position:relative;padding:.5em;border-bottom:.1666666667em solid #fff}.theme-light .Section__titleText{font-size:1.1666666667em;font-weight:bold;color:#000}.theme-light .Section__buttons{position:absolute;display:inline-block;right:.5em;margin-top:-.0833333333em}.theme-light .Section__rest{position:relative}.theme-light .Section__content{padding:.66em .5em}.theme-light .Section--fitted>.Section__rest>.Section__content{padding:0}.theme-light .Section--fill{display:flex;flex-direction:column;height:100%}.theme-light .Section--fill>.Section__rest{flex-grow:1}.theme-light .Section--fill>.Section__rest>.Section__content{height:100%}.theme-light .Section--fill.Section--scrollable>.Section__rest>.Section__content{position:absolute;top:0;left:0;right:0;bottom:0}.theme-light .Section--fill.Section--iefix{display:table !important;width:100% !important;height:100% !important;border-collapse:collapse;border-spacing:0}.theme-light .Section--fill.Section--iefix>.Section__rest{display:table-row !important;height:100% !important}.theme-light .Section--scrollable{overflow-x:hidden;overflow-y:hidden}.theme-light .Section--scrollable>.Section__rest>.Section__content{overflow-y:scroll;overflow-x:hidden}.theme-light .Section--scrollableHorizontal{overflow-x:hidden;overflow-y:hidden}.theme-light .Section--scrollableHorizontal>.Section__rest>.Section__content{overflow-y:hidden;overflow-x:scroll}.theme-light .Section--scrollable.Section--scrollableHorizontal{overflow-x:hidden;overflow-y:hidden}.theme-light .Section--scrollable.Section--scrollableHorizontal>.Section__rest>.Section__content{overflow-y:scroll;overflow-x:scroll}.theme-light .Section .Section{background-color:transparent;margin-left:-0.5em;margin-right:-0.5em}.theme-light .Section .Section:first-child{margin-top:-0.5em}.theme-light .Section .Section .Section__titleText{font-size:1.0833333333em}.theme-light .Section .Section .Section .Section__titleText{font-size:1em}.theme-light .Button{position:relative;display:inline-block;line-height:1.667em;padding:0 .5em;margin-right:.1666666667em;white-space:nowrap;outline:0;border-radius:.16em;margin-bottom:.1666666667em;user-select:none;-ms-user-select:none}.theme-light .Button:last-child{margin-right:0;margin-bottom:0}.theme-light .Button .fa,.theme-light .Button .fas,.theme-light .Button .far{margin-left:-0.25em;margin-right:-0.25em;min-width:1.333em;text-align:center}.theme-light .Button--hasContent .fa,.theme-light .Button--hasContent .fas,.theme-light .Button--hasContent .far{margin-right:.25em}.theme-light .Button--hasContent.Button--iconPosition--right .fa,.theme-light .Button--hasContent.Button--iconPosition--right .fas,.theme-light .Button--hasContent.Button--iconPosition--right .far{margin-right:0px;margin-left:3px}.theme-light .Button--ellipsis{overflow:hidden;text-overflow:ellipsis}.theme-light .Button--fluid{display:block;margin-left:0;margin-right:0}.theme-light .Button--circular{border-radius:50%}.theme-light .Button--compact{padding:0 .25em;line-height:1.333em}.theme-light .Button--color--black{transition:color 50ms,background-color 50ms;background-color:#000;color:#fff}.theme-light .Button--color--black:hover{transition:color 0ms,background-color 0ms}.theme-light .Button--color--black:focus{transition:color 100ms,background-color 100ms}.theme-light .Button--color--black:hover,.theme-light .Button--color--black:focus{background-color:#131313;color:#fff}.theme-light .Button--color--white{transition:color 50ms,background-color 50ms;background-color:#bfbfbf;color:#000}.theme-light .Button--color--white:hover{transition:color 0ms,background-color 0ms}.theme-light .Button--color--white:focus{transition:color 100ms,background-color 100ms}.theme-light .Button--color--white:hover,.theme-light .Button--color--white:focus{background-color:#efefef;color:#000}.theme-light .Button--color--red{transition:color 50ms,background-color 50ms;background-color:#a61c1c;color:#fff}.theme-light .Button--color--red:hover{transition:color 0ms,background-color 0ms}.theme-light .Button--color--red:focus{transition:color 100ms,background-color 100ms}.theme-light .Button--color--red:hover,.theme-light .Button--color--red:focus{background-color:#d23333;color:#fff}.theme-light .Button--color--orange{transition:color 50ms,background-color 50ms;background-color:#c0530b;color:#fff}.theme-light .Button--color--orange:hover{transition:color 0ms,background-color 0ms}.theme-light .Button--color--orange:focus{transition:color 100ms,background-color 100ms}.theme-light .Button--color--orange:hover,.theme-light .Button--color--orange:focus{background-color:#ea7426;color:#fff}.theme-light .Button--color--yellow{transition:color 50ms,background-color 50ms;background-color:#bfa303;color:#fff}.theme-light .Button--color--yellow:hover{transition:color 0ms,background-color 0ms}.theme-light .Button--color--yellow:focus{transition:color 100ms,background-color 100ms}.theme-light .Button--color--yellow:hover,.theme-light .Button--color--yellow:focus{background-color:#efce17;color:#fff}.theme-light .Button--color--olive{transition:color 50ms,background-color 50ms;background-color:#889912;color:#fff}.theme-light .Button--color--olive:hover{transition:color 0ms,background-color 0ms}.theme-light .Button--color--olive:focus{transition:color 100ms,background-color 100ms}.theme-light .Button--color--olive:hover,.theme-light .Button--color--olive:focus{background-color:#afc328;color:#fff}.theme-light .Button--color--green{transition:color 50ms,background-color 50ms;background-color:#188532;color:#fff}.theme-light .Button--color--green:hover{transition:color 0ms,background-color 0ms}.theme-light .Button--color--green:focus{transition:color 100ms,background-color 100ms}.theme-light .Button--color--green:hover,.theme-light .Button--color--green:focus{background-color:#2fac4c;color:#fff}.theme-light .Button--color--teal{transition:color 50ms,background-color 50ms;background-color:#008882;color:#fff}.theme-light .Button--color--teal:hover{transition:color 0ms,background-color 0ms}.theme-light .Button--color--teal:focus{transition:color 100ms,background-color 100ms}.theme-light .Button--color--teal:hover,.theme-light .Button--color--teal:focus{background-color:#13afa9;color:#fff}.theme-light .Button--color--blue{transition:color 50ms,background-color 50ms;background-color:#19649c;color:#fff}.theme-light .Button--color--blue:hover{transition:color 0ms,background-color 0ms}.theme-light .Button--color--blue:focus{transition:color 100ms,background-color 100ms}.theme-light .Button--color--blue:hover,.theme-light .Button--color--blue:focus{background-color:#3086c7;color:#fff}.theme-light .Button--color--dark-blue{transition:color 50ms,background-color 50ms;background-color:#003761;color:#fff}.theme-light .Button--color--dark-blue:hover{transition:color 0ms,background-color 0ms}.theme-light .Button--color--dark-blue:focus{transition:color 100ms,background-color 100ms}.theme-light .Button--color--dark-blue:hover,.theme-light .Button--color--dark-blue:focus{background-color:#135283;color:#fff}.theme-light .Button--color--violet{transition:color 50ms,background-color 50ms;background-color:#4b2897;color:#fff}.theme-light .Button--color--violet:hover{transition:color 0ms,background-color 0ms}.theme-light .Button--color--violet:focus{transition:color 100ms,background-color 100ms}.theme-light .Button--color--violet:hover,.theme-light .Button--color--violet:focus{background-color:#6a41c1;color:#fff}.theme-light .Button--color--purple{transition:color 50ms,background-color 50ms;background-color:#7a2696;color:#fff}.theme-light .Button--color--purple:hover{transition:color 0ms,background-color 0ms}.theme-light .Button--color--purple:focus{transition:color 100ms,background-color 100ms}.theme-light .Button--color--purple:hover,.theme-light .Button--color--purple:focus{background-color:#a03fc0;color:#fff}.theme-light .Button--color--pink{transition:color 50ms,background-color 50ms;background-color:#b61d73;color:#fff}.theme-light .Button--color--pink:hover{transition:color 0ms,background-color 0ms}.theme-light .Button--color--pink:focus{transition:color 100ms,background-color 100ms}.theme-light .Button--color--pink:hover,.theme-light .Button--color--pink:focus{background-color:#da3f96;color:#fff}.theme-light .Button--color--brown{transition:color 50ms,background-color 50ms;background-color:#7c4d2f;color:#fff}.theme-light .Button--color--brown:hover{transition:color 0ms,background-color 0ms}.theme-light .Button--color--brown:focus{transition:color 100ms,background-color 100ms}.theme-light .Button--color--brown:hover,.theme-light .Button--color--brown:focus{background-color:#a26c49;color:#fff}.theme-light .Button--color--grey{transition:color 50ms,background-color 50ms;background-color:#bfbfbf;color:#000}.theme-light .Button--color--grey:hover{transition:color 0ms,background-color 0ms}.theme-light .Button--color--grey:focus{transition:color 100ms,background-color 100ms}.theme-light .Button--color--grey:hover,.theme-light .Button--color--grey:focus{background-color:#efefef;color:#000}.theme-light .Button--color--light-grey{transition:color 50ms,background-color 50ms;background-color:gray;color:#fff}.theme-light .Button--color--light-grey:hover{transition:color 0ms,background-color 0ms}.theme-light .Button--color--light-grey:focus{transition:color 100ms,background-color 100ms}.theme-light .Button--color--light-grey:hover,.theme-light .Button--color--light-grey:focus{background-color:#a6a6a6;color:#fff}.theme-light .Button--color--good{transition:color 50ms,background-color 50ms;background-color:#44801d;color:#fff}.theme-light .Button--color--good:hover{transition:color 0ms,background-color 0ms}.theme-light .Button--color--good:focus{transition:color 100ms,background-color 100ms}.theme-light .Button--color--good:hover,.theme-light .Button--color--good:focus{background-color:#62a635;color:#fff}.theme-light .Button--color--average{transition:color 50ms,background-color 50ms;background-color:#b56b0b;color:#fff}.theme-light .Button--color--average:hover{transition:color 0ms,background-color 0ms}.theme-light .Button--color--average:focus{transition:color 100ms,background-color 100ms}.theme-light .Button--color--average:hover,.theme-light .Button--color--average:focus{background-color:#e48f20;color:#fff}.theme-light .Button--color--bad{transition:color 50ms,background-color 50ms;background-color:#a61c1c;color:#fff}.theme-light .Button--color--bad:hover{transition:color 0ms,background-color 0ms}.theme-light .Button--color--bad:focus{transition:color 100ms,background-color 100ms}.theme-light .Button--color--bad:hover,.theme-light .Button--color--bad:focus{background-color:#d23333;color:#fff}.theme-light .Button--color--label{transition:color 50ms,background-color 50ms;background-color:#2c2c2c;color:#fff}.theme-light .Button--color--label:hover{transition:color 0ms,background-color 0ms}.theme-light .Button--color--label:focus{transition:color 100ms,background-color 100ms}.theme-light .Button--color--label:hover,.theme-light .Button--color--label:focus{background-color:#464646;color:#fff}.theme-light .Button--color--xeno{transition:color 50ms,background-color 50ms;background-color:#3e2945;color:#fff}.theme-light .Button--color--xeno:hover{transition:color 0ms,background-color 0ms}.theme-light .Button--color--xeno:focus{transition:color 100ms,background-color 100ms}.theme-light .Button--color--xeno:hover,.theme-light .Button--color--xeno:focus{background-color:#5a4363;color:#fff}.theme-light .Button--color--default{transition:color 50ms,background-color 50ms;background-color:#bbb;color:#000}.theme-light .Button--color--default:hover{transition:color 0ms,background-color 0ms}.theme-light .Button--color--default:focus{transition:color 100ms,background-color 100ms}.theme-light .Button--color--default:hover,.theme-light .Button--color--default:focus{background-color:#eaeaea;color:#000}.theme-light .Button--color--caution{transition:color 50ms,background-color 50ms;background-color:#be6209;color:#fff}.theme-light .Button--color--caution:hover{transition:color 0ms,background-color 0ms}.theme-light .Button--color--caution:focus{transition:color 100ms,background-color 100ms}.theme-light .Button--color--caution:hover,.theme-light .Button--color--caution:focus{background-color:#ec8420;color:#fff}.theme-light .Button--color--danger{transition:color 50ms,background-color 50ms;background-color:#9a9d00;color:#fff}.theme-light .Button--color--danger:hover{transition:color 0ms,background-color 0ms}.theme-light .Button--color--danger:focus{transition:color 100ms,background-color 100ms}.theme-light .Button--color--danger:hover,.theme-light .Button--color--danger:focus{background-color:#c4c813;color:#fff}.theme-light .Button--color--transparent{transition:color 50ms,background-color 50ms;background-color:#eee;color:#000;background-color:rgba(238,238,238,0);color:rgba(0,0,0,.5)}.theme-light .Button--color--transparent:hover{transition:color 0ms,background-color 0ms}.theme-light .Button--color--transparent:focus{transition:color 100ms,background-color 100ms}.theme-light .Button--color--transparent:hover,.theme-light .Button--color--transparent:focus{background-color:#fcfcfc;color:#000}.theme-light .Button--disabled{background-color:#363636 !important}.theme-light .Button--selected{transition:color 50ms,background-color 50ms;background-color:#0668b8;color:#fff}.theme-light .Button--selected:hover{transition:color 0ms,background-color 0ms}.theme-light .Button--selected:focus{transition:color 100ms,background-color 100ms}.theme-light .Button--selected:hover,.theme-light .Button--selected:focus{background-color:#1a8be7;color:#fff}.theme-light .Button--flex{display:inline-flex;flex-direction:column}.theme-light .Button--flex--fluid{width:100%}.theme-light .Button--verticalAlignContent--top{justify-content:flex-start}.theme-light .Button--verticalAlignContent--middle{justify-content:center}.theme-light .Button--verticalAlignContent--bottom{justify-content:flex-end}.theme-light .Button__content{display:block;align-self:stretch}.theme-light .Input{position:relative;display:inline-block;width:10em;border:.0833333333em solid #353535;border:.0833333333em solid rgba(53,53,53,.75);border-radius:.16em;color:#000;background-color:#fff;padding:0 .3333333333em;margin-right:.1666666667em;line-height:1.4166666667em;overflow:visible}.theme-light .Input--fluid{display:block;width:auto}.theme-light .Input__baseline{display:inline-block;color:transparent}.theme-light .Input__input{display:block;position:absolute;top:0;bottom:0;left:0;right:0;border:0;outline:0;width:100%;font-size:1em;line-height:1.4166666667em;height:1.4166666667em;margin:0;padding:0 .5em;font-family:Verdana,sans-serif;background-color:transparent;color:#000;color:inherit}.theme-light .Input__input:-ms-input-placeholder{font-style:italic;color:#777;color:rgba(255,255,255,.45)}.theme-light .Input--monospace .Input__input{font-family:"Consolas",monospace}.theme-light .Input{position:relative;display:inline-block;width:10em;border:.0833333333em solid #353535;border:.0833333333em solid rgba(53,53,53,.75);border-radius:.16em;color:#000;background-color:#fff;padding:0 .3333333333em;margin-right:.1666666667em;line-height:1.4166666667em;overflow:visible}.theme-light .Input--fluid{display:block;width:auto}.theme-light .Input__baseline{display:inline-block;color:transparent}.theme-light .Input__input{display:block;position:absolute;top:0;bottom:0;left:0;right:0;border:0;outline:0;width:100%;font-size:1em;line-height:1.4166666667em;height:1.4166666667em;margin:0;padding:0 .5em;font-family:Verdana,sans-serif;background-color:transparent;color:#000;color:inherit}.theme-light .Input__input:-ms-input-placeholder{font-style:italic;color:#777;color:rgba(255,255,255,.45)}.theme-light .Input--monospace .Input__input{font-family:"Consolas",monospace}.theme-light .NumberInput{position:relative;display:inline-block;border:.0833333333em solid #353535;border:.0833333333em solid rgba(53,53,53,.75);border-radius:.16em;color:#353535;background-color:#fff;padding:0 .3333333333em;margin-right:.1666666667em;line-height:1.4166666667em;text-align:right;overflow:visible;cursor:n-resize}.theme-light .NumberInput--fluid{display:block}.theme-light .NumberInput__content{margin-left:.5em}.theme-light .NumberInput__barContainer{position:absolute;top:.1666666667em;bottom:.1666666667em;left:.1666666667em}.theme-light .NumberInput__bar{position:absolute;bottom:0;left:0;width:.25em;box-sizing:border-box;border-bottom:.0833333333em solid #353535;background-color:#353535}.theme-light .NumberInput__input{display:block;position:absolute;top:0;bottom:0;left:0;right:0;border:0;outline:0;width:100%;font-size:1em;line-height:1.4166666667em;height:1.4166666667em;margin:0;padding:0 .5em;font-family:Verdana,sans-serif;background-color:#fff;color:#000;text-align:right}.theme-light .Input{position:relative;display:inline-block;width:10em;border:.0833333333em solid #353535;border:.0833333333em solid rgba(53,53,53,.75);border-radius:.16em;color:#000;background-color:#fff;padding:0 .3333333333em;margin-right:.1666666667em;line-height:1.4166666667em;overflow:visible}.theme-light .Input--fluid{display:block;width:auto}.theme-light .Input__baseline{display:inline-block;color:transparent}.theme-light .Input__input{display:block;position:absolute;top:0;bottom:0;left:0;right:0;border:0;outline:0;width:100%;font-size:1em;line-height:1.4166666667em;height:1.4166666667em;margin:0;padding:0 .5em;font-family:Verdana,sans-serif;background-color:transparent;color:#000;color:inherit}.theme-light .Input__input:-ms-input-placeholder{font-style:italic;color:#777;color:rgba(255,255,255,.45)}.theme-light .Input--monospace .Input__input{font-family:"Consolas",monospace}.theme-light .TextArea{position:relative;display:inline-block;border:.0833333333em solid #353535;border:.0833333333em solid rgba(53,53,53,.75);border-radius:.16em;background-color:#fff;margin-right:.1666666667em;line-height:1.4166666667em;box-sizing:border-box;width:100%}.theme-light .TextArea--fluid{display:block;width:auto;height:auto}.theme-light .TextArea--noborder{border:0px}.theme-light .TextArea__textarea.TextArea__textarea--scrollable{overflow:auto;overflow-x:hidden;overflow-y:scroll}.theme-light .TextArea__textarea{display:block;position:absolute;top:0;bottom:0;left:0;right:0;border:0;outline:0;width:100%;height:100%;font-size:1em;line-height:1.4166666667em;min-height:1.4166666667em;margin:0;padding:0 .5em;font-family:inherit;background-color:transparent;color:inherit;box-sizing:border-box;word-wrap:break-word;overflow:hidden}.theme-light .TextArea__textarea:-ms-input-placeholder{font-style:italic;color:#777;color:rgba(255,255,255,.45)}.theme-light .TextArea__textarea_custom{overflow:visible;white-space:pre-wrap}.theme-light .Knob{position:relative;font-size:1rem;width:2.6em;height:2.6em;margin:0 auto;margin-bottom:-0.2em;cursor:n-resize}.theme-light .Knob:after{content:".";color:transparent;line-height:2.5em}.theme-light .Knob__circle{position:absolute;top:.1em;bottom:.1em;left:.1em;right:.1em;margin:.3em;background-color:#333;background-image:linear-gradient(to bottom, rgba(255, 255, 255, 0.15) 0%, rgba(255, 255, 255, 0) 100%);border-radius:50%;box-shadow:0 .05em .5em 0 rgba(0,0,0,.5)}.theme-light .Knob__cursorBox{position:absolute;top:0;bottom:0;left:0;right:0}.theme-light .Knob__cursor{position:relative;top:.05em;margin:0 auto;width:.2em;height:.8em;background-color:rgba(255,255,255,.9)}.theme-light .Knob__popupValue{position:absolute;top:-2rem;right:50%;font-size:1rem;text-align:center;padding:.25rem .5rem;color:#fff;background-color:#000;transform:translateX(50%);white-space:nowrap}.theme-light .Knob__ring{position:absolute;top:0;bottom:0;left:0;right:0;padding:.1em}.theme-light .Knob__ringTrackPivot{transform:rotateZ(135deg)}.theme-light .Knob__ringTrack{fill:transparent;stroke:rgba(255,255,255,.1);stroke-width:8;stroke-linecap:round;stroke-dasharray:235.62}.theme-light .Knob__ringFillPivot{transform:rotateZ(135deg)}.theme-light .Knob--bipolar .Knob__ringFillPivot{transform:rotateZ(270deg)}.theme-light .Knob__ringFill{fill:transparent;stroke:#6a96c9;stroke-width:8;stroke-linecap:round;stroke-dasharray:314.16;transition:stroke 50ms ease-out}.theme-light .Knob--color--black .Knob__ringFill{stroke:#000}.theme-light .Knob--color--white .Knob__ringFill{stroke:#e6e6e6}.theme-light .Knob--color--red .Knob__ringFill{stroke:#c82121}.theme-light .Knob--color--orange .Knob__ringFill{stroke:#e6630d}.theme-light .Knob--color--yellow .Knob__ringFill{stroke:#e5c304}.theme-light .Knob--color--olive .Knob__ringFill{stroke:#a3b816}.theme-light .Knob--color--green .Knob__ringFill{stroke:#1d9f3b}.theme-light .Knob--color--teal .Knob__ringFill{stroke:#00a39c}.theme-light .Knob--color--blue .Knob__ringFill{stroke:#1e78bb}.theme-light .Knob--color--dark-blue .Knob__ringFill{stroke:#004274}.theme-light .Knob--color--violet .Knob__ringFill{stroke:#5a30b5}.theme-light .Knob--color--purple .Knob__ringFill{stroke:#932eb4}.theme-light .Knob--color--pink .Knob__ringFill{stroke:#db228a}.theme-light .Knob--color--brown .Knob__ringFill{stroke:#955d39}.theme-light .Knob--color--grey .Knob__ringFill{stroke:#e6e6e6}.theme-light .Knob--color--light-grey .Knob__ringFill{stroke:#999}.theme-light .Knob--color--good .Knob__ringFill{stroke:#529923}.theme-light .Knob--color--average .Knob__ringFill{stroke:#da810e}.theme-light .Knob--color--bad .Knob__ringFill{stroke:#c82121}.theme-light .Knob--color--label .Knob__ringFill{stroke:#353535}.theme-light .Knob--color--xeno .Knob__ringFill{stroke:#4a3253}.theme-light .Slider{cursor:e-resize}.theme-light .Slider__cursorOffset{position:absolute;top:0;left:0;bottom:0;transition:none !important}.theme-light .Slider__cursor{position:absolute;top:0;right:-.0833333333em;bottom:0;width:0;border-left:.1666666667em solid #000}.theme-light .Slider__pointer{position:absolute;right:-.4166666667em;bottom:-.3333333333em;width:0;height:0;border-left:.4166666667em solid transparent;border-right:.4166666667em solid transparent;border-bottom:.4166666667em solid #000}.theme-light .Slider__popupValue{position:absolute;right:0;top:-2rem;font-size:1rem;padding:.25rem .5rem;color:#fff;background-color:#000;transform:translateX(50%);white-space:nowrap}.theme-light .ProgressBar{display:inline-block;position:relative;width:100%;padding:0 .5em;border-width:.0833333333em !important;border-style:solid !important;border-radius:.16em;background-color:rgba(0,0,0,0);transition:border-color 900ms ease-out}.theme-light .ProgressBar__fill{position:absolute;top:-0.5px;left:0px;bottom:-0.5px}.theme-light .ProgressBar__fill--animated{transition:background-color 900ms ease-out,width 900ms ease-out}.theme-light .ProgressBar__content{position:relative;line-height:1.4166666667em;width:100%;text-align:right}.theme-light .ProgressBar--color--default{border:.0833333333em solid #bfbfbf}.theme-light .ProgressBar--color--default .ProgressBar__fill{background-color:#bfbfbf}.theme-light .ProgressBar--color--black{border-color:#000 !important}.theme-light .ProgressBar--color--black .ProgressBar__fill{background-color:#000}.theme-light .ProgressBar--color--white{border-color:#bfbfbf !important}.theme-light .ProgressBar--color--white .ProgressBar__fill{background-color:#bfbfbf}.theme-light .ProgressBar--color--red{border-color:#a61c1c !important}.theme-light .ProgressBar--color--red .ProgressBar__fill{background-color:#a61c1c}.theme-light .ProgressBar--color--orange{border-color:#c0530b !important}.theme-light .ProgressBar--color--orange .ProgressBar__fill{background-color:#c0530b}.theme-light .ProgressBar--color--yellow{border-color:#bfa303 !important}.theme-light .ProgressBar--color--yellow .ProgressBar__fill{background-color:#bfa303}.theme-light .ProgressBar--color--olive{border-color:#889912 !important}.theme-light .ProgressBar--color--olive .ProgressBar__fill{background-color:#889912}.theme-light .ProgressBar--color--green{border-color:#188532 !important}.theme-light .ProgressBar--color--green .ProgressBar__fill{background-color:#188532}.theme-light .ProgressBar--color--teal{border-color:#008882 !important}.theme-light .ProgressBar--color--teal .ProgressBar__fill{background-color:#008882}.theme-light .ProgressBar--color--blue{border-color:#19649c !important}.theme-light .ProgressBar--color--blue .ProgressBar__fill{background-color:#19649c}.theme-light .ProgressBar--color--dark-blue{border-color:#003761 !important}.theme-light .ProgressBar--color--dark-blue .ProgressBar__fill{background-color:#003761}.theme-light .ProgressBar--color--violet{border-color:#4b2897 !important}.theme-light .ProgressBar--color--violet .ProgressBar__fill{background-color:#4b2897}.theme-light .ProgressBar--color--purple{border-color:#7a2696 !important}.theme-light .ProgressBar--color--purple .ProgressBar__fill{background-color:#7a2696}.theme-light .ProgressBar--color--pink{border-color:#b61d73 !important}.theme-light .ProgressBar--color--pink .ProgressBar__fill{background-color:#b61d73}.theme-light .ProgressBar--color--brown{border-color:#7c4d2f !important}.theme-light .ProgressBar--color--brown .ProgressBar__fill{background-color:#7c4d2f}.theme-light .ProgressBar--color--grey{border-color:#bfbfbf !important}.theme-light .ProgressBar--color--grey .ProgressBar__fill{background-color:#bfbfbf}.theme-light .ProgressBar--color--light-grey{border-color:gray !important}.theme-light .ProgressBar--color--light-grey .ProgressBar__fill{background-color:gray}.theme-light .ProgressBar--color--good{border-color:#44801d !important}.theme-light .ProgressBar--color--good .ProgressBar__fill{background-color:#44801d}.theme-light .ProgressBar--color--average{border-color:#b56b0b !important}.theme-light .ProgressBar--color--average .ProgressBar__fill{background-color:#b56b0b}.theme-light .ProgressBar--color--bad{border-color:#a61c1c !important}.theme-light .ProgressBar--color--bad .ProgressBar__fill{background-color:#a61c1c}.theme-light .ProgressBar--color--label{border-color:#2c2c2c !important}.theme-light .ProgressBar--color--label .ProgressBar__fill{background-color:#2c2c2c}.theme-light .ProgressBar--color--xeno{border-color:#3e2945 !important}.theme-light .ProgressBar--color--xeno .ProgressBar__fill{background-color:#3e2945}.theme-light .Chat{color:#000}.theme-light .Chat__badge{display:inline-block;min-width:.5em;font-size:.7em;padding:.2em .3em;line-height:1;color:#fff;text-align:center;white-space:nowrap;vertical-align:middle;background-color:crimson;border-radius:10px;transition:font-size 200ms ease-out}.theme-light .Chat__badge:before{content:"x"}.theme-light .Chat__badge--animate{font-size:.9em;transition:font-size 0ms}.theme-light .Chat__scrollButton{position:fixed;right:2em;bottom:1em}.theme-light .Chat__reconnected{font-size:.85em;text-align:center;margin:1em 0 2em}.theme-light .Chat__reconnected:before{content:"Reconnected";display:inline-block;border-radius:1em;padding:0 .7em;color:#db2828;background-color:#fff}.theme-light .Chat__reconnected:after{content:"";display:block;margin-top:-0.75em;border-bottom:.1666666667em solid #db2828}.theme-light .Chat__highlight{color:#000}.theme-light .Chat__highlight--restricted{color:#fff;background-color:#a00;font-weight:bold}.theme-light .ChatMessage{word-wrap:break-word}.theme-light .ChatMessage--highlighted{position:relative;border-left:.1666666667em solid #fd4;padding-left:.5em}.theme-light .ChatMessage--highlighted:after{content:"";position:absolute;top:0;bottom:0;left:0;right:0;background-color:rgba(255,221,68,.1);pointer-events:none}.theme-light .Layout,.theme-light .Layout *{scrollbar-base-color:#f2f2f2;scrollbar-face-color:#d6d6d6;scrollbar-3dlight-color:#eee;scrollbar-highlight-color:#eee;scrollbar-track-color:#f2f2f2;scrollbar-arrow-color:#777;scrollbar-shadow-color:#d6d6d6}.theme-light .Layout__content{position:absolute;top:0;bottom:0;left:0;right:0;overflow-x:hidden;overflow-y:hidden}.theme-light .Layout__content--scrollable{overflow-y:scroll;margin-bottom:0}.theme-light .Window{position:fixed;top:0;bottom:0;left:0;right:0;color:#000;background-color:#eee;background-image:linear-gradient(to bottom, #eeeeee 0%, #eeeeee 100%)}.theme-light .Window__titleBar{position:fixed;z-index:1;top:0;left:0;width:100%;height:32px;height:2.6666666667rem}.theme-light .Window__rest{position:fixed;top:32px;top:2.6666666667rem;bottom:0;left:0;right:0}.theme-light .Window__contentPadding{margin:.5rem;height:100%;height:calc(100% - 1.01rem)}.theme-light .Window__contentPadding:after{height:0}.theme-light .Layout__content--scrollable .Window__contentPadding:after{display:block;content:"";height:.5rem}.theme-light .Window__dimmer{position:fixed;top:0;bottom:0;left:0;right:0;background-color:rgba(252,252,252,.25);pointer-events:none}.theme-light .Window__resizeHandle__se{position:fixed;bottom:0;right:0;width:20px;width:1.6666666667rem;height:20px;height:1.6666666667rem;cursor:se-resize}.theme-light .Window__resizeHandle__s{position:fixed;bottom:0;left:0;right:0;height:6px;height:.5rem;cursor:s-resize}.theme-light .Window__resizeHandle__e{position:fixed;top:0;bottom:0;right:0;width:3px;width:.25rem;cursor:e-resize}.theme-light .TitleBar{background-color:#eee;border-bottom:1px solid rgba(0,0,0,.25);box-shadow:0 2px 2px rgba(0,0,0,.1);box-shadow:0 .1666666667rem .1666666667rem rgba(0,0,0,.1);user-select:none;-ms-user-select:none}.theme-light .TitleBar__clickable{color:rgba(0,0,0,.5);background-color:#eee;transition:color 250ms ease-out,background-color 250ms ease-out}.theme-light .TitleBar__clickable:hover{color:#fff;background-color:#c00;transition:color 0ms,background-color 0ms}.theme-light .TitleBar__title{position:absolute;display:inline-block;top:0;left:46px;left:3.8333333333rem;color:rgba(0,0,0,.75);font-size:14px;font-size:1.1666666667rem;line-height:31px;line-height:2.5833333333rem;white-space:nowrap;pointer-events:none}.theme-light .TitleBar__buttons{pointer-events:initial;display:inline-block;width:100%;margin-left:10px}.theme-light .TitleBar__dragZone{position:absolute;top:0;left:0;right:0;height:32px;height:2.6666666667rem}.theme-light .TitleBar__statusIcon{position:absolute;top:0;left:12px;left:1rem;transition:color .5s;font-size:20px;font-size:1.6666666667rem;line-height:32px !important;line-height:2.6666666667rem !important}.theme-light .TitleBar__close{position:absolute;top:-1px;right:0;width:45px;width:3.75rem;height:32px;height:2.6666666667rem;font-size:20px;font-size:1.6666666667rem;line-height:31px;line-height:2.5833333333rem;text-align:center}.theme-light .TitleBar__devBuildIndicator{position:absolute;top:6px;top:.5rem;right:52px;right:4.3333333333rem;min-width:20px;min-width:1.6666666667rem;padding:2px 4px;padding:.1666666667rem .3333333333rem;background-color:rgba(91,170,39,.75);color:#fff;text-align:center}.theme-light html,.theme-light body{padding:0;margin:0;height:100%;color:#000}.theme-light body{background:#fff;font-family:Verdana,sans-serif;font-size:13px;line-height:1.2;overflow-x:hidden;overflow-y:scroll;word-wrap:break-word}.theme-light em{font-style:normal;font-weight:bold}.theme-light img{margin:0;padding:0;line-height:1;-ms-interpolation-mode:nearest-neighbor;image-rendering:pixelated}.theme-light img.icon{height:1em;min-height:16px;width:auto;vertical-align:bottom}.theme-light a{color:blue}.theme-light a.visited{color:#f0f}.theme-light a:visited{color:#f0f}.theme-light a.popt{text-decoration:none}.theme-light .popup{position:fixed;top:50%;left:50%;background:#ddd}.theme-light .popup .close{position:absolute;background:#aaa;top:0;right:0;color:#333;text-decoration:none;z-index:2;padding:0 10px;height:30px;line-height:30px}.theme-light .popup .close:hover{background:#999}.theme-light .popup .head{background:#999;color:#ddd;padding:0 10px;height:30px;line-height:30px;text-transform:uppercase;font-size:.9em;font-weight:bold;border-bottom:2px solid green}.theme-light .popup input{border:1px solid #999;background:#fff;margin:0;padding:5px;outline:none;color:#333}.theme-light .popup input[type=text]:hover,.theme-light .popup input[type=text]:active,.theme-light .popup input[type=text]:focus{border-color:green}.theme-light .popup input[type=submit]{padding:5px 10px;background:#999;color:#ddd;text-transform:uppercase;font-size:.9em;font-weight:bold}.theme-light .popup input[type=submit]:hover,.theme-light .popup input[type=submit]:focus,.theme-light .popup input[type=submit]:active{background:#aaa;cursor:pointer}.theme-light .changeFont{padding:10px}.theme-light .changeFont a{display:block;text-decoration:none;padding:3px;color:#333}.theme-light .changeFont a:hover{background:#ccc}.theme-light .highlightPopup{padding:10px;text-align:center}.theme-light .highlightPopup input[type=text]{display:block;width:215px;text-align:left;margin-top:5px}.theme-light .highlightPopup input.highlightColor{background-color:#ff0}.theme-light .highlightPopup input.highlightTermSubmit{margin-top:5px}.theme-light .contextMenu{background-color:#ddd;position:fixed;margin:2px;width:150px}.theme-light .contextMenu a{display:block;padding:2px 5px;text-decoration:none;color:#333}.theme-light .contextMenu a:hover{background-color:#ccc}.theme-light .filterMessages{padding:5px}.theme-light .filterMessages div{padding:2px 0}.theme-light .icon-stack{height:1em;line-height:1em;width:1em;vertical-align:middle;margin-top:-2px}.theme-light .motd{color:#638500;font-family:Verdana,sans-serif;white-space:normal}.theme-light .motd h1,.theme-light .motd h2,.theme-light .motd h3,.theme-light .motd h4,.theme-light .motd h5,.theme-light .motd h6{color:#638500;text-decoration:underline}.theme-light .motd a,.theme-light .motd a:link,.theme-light .motd a:visited,.theme-light .motd a:active,.theme-light .motd a:hover{color:#638500}.theme-light .bold,.theme-light .name,.theme-light .prefix,.theme-light .ooc,.theme-light .looc,.theme-light .adminooc,.theme-light .admin,.theme-light .medal,.theme-light .yell{font-weight:bold}.theme-light .italic,.theme-light .italics{font-style:italic}.theme-light .highlight{background:#ff0}.theme-light h1,.theme-light h2,.theme-light h3,.theme-light h4,.theme-light h5,.theme-light h6{color:blue;font-family:Georgia,Verdana,sans-serif}.theme-light h1.alert,.theme-light h2.alert{color:#000}.theme-light em{font-style:normal;font-weight:bold}.theme-light .ooc{font-weight:bold}.theme-light .adminobserverooc{color:#09c;font-weight:bold}.theme-light .adminooc{color:#700038;font-weight:bold}.theme-light .adminsay{color:#ff4500;font-weight:bold}.theme-light .admin{color:#4473ff;font-weight:bold}.theme-light .name{font-weight:bold}.theme-light .deadsay{color:#5c00e6}.theme-light .binarysay{color:#20c20e;background-color:#000;display:block}.theme-light .binarysay a{color:lime}.theme-light .binarysay a:active,.theme-light .binarysay a:visited{color:#8f8}.theme-light .radio{color:green}.theme-light .sciradio{color:#939}.theme-light .comradio{color:#948f02}.theme-light .secradio{color:#a30000}.theme-light .medradio{color:#337296}.theme-light .engradio{color:#fb5613}.theme-light .sentryradio{color:#844300}.theme-light .suppradio{color:#a8732b}.theme-light .servradio{color:#6eaa2c}.theme-light .syndradio{color:#6d3f40}.theme-light .gangradio{color:#ac2ea1}.theme-light .centcomradio{color:#686868}.theme-light .aiprivradio{color:#f0f}.theme-light .redteamradio{color:red}.theme-light .blueteamradio{color:blue}.theme-light .greenteamradio{color:lime}.theme-light .yellowteamradio{color:#d1ba22}.theme-light .yell{font-weight:bold}.theme-light .alert{color:red}.theme-light h1.alert,.theme-light h2.alert{color:#000}.theme-light .userdanger{color:red;font-weight:bold;font-size:185%}.theme-light .bolddanger{color:red;font-weight:bold}.theme-light .danger{color:red}.theme-light .tinydanger{color:red;font-size:85%}.theme-light .smalldanger{color:red;font-size:90%}.theme-light .warning{color:red;font-style:italic}.theme-light .alertwarning{color:red;font-weight:bold}.theme-light .boldwarning{color:red;font-style:italic;font-weight:bold}.theme-light .announce{color:#228b22;font-weight:bold}.theme-light .boldannounce{color:red;font-weight:bold}.theme-light .minorannounce{font-weight:bold;font-size:185%}.theme-light .greenannounce{color:lime;font-weight:bold}.theme-light .rose{color:#ff5050}.theme-light .info{color:#00c}.theme-light .notice{color:#009}.theme-light .staff_ic{color:#009}.theme-light .tinynotice{color:#009;font-size:85%}.theme-light .tinynoticeital{color:#009;font-style:italic;font-size:85%}.theme-light .smallnotice{color:#009;font-size:90%}.theme-light .smallnoticeital{color:#009;font-style:italic;font-size:90%}.theme-light .boldnotice{color:#009;font-weight:bold}.theme-light .hear{color:#009;font-style:italic}.theme-light .adminnotice{color:blue}.theme-light .adminhelp{color:red;font-weight:bold}.theme-light .unconscious{color:blue;font-weight:bold}.theme-light .suicide{color:#ff5050;font-style:italic}.theme-light .green{color:#03ff39}.theme-light .grey{color:#838383}.theme-light .red{color:red}.theme-light .blue{color:blue}.theme-light .nicegreen{color:#14a833}.theme-light .boldnicegreen{color:#14a833;font-weight:bold}.theme-light .cult{color:#973e3b}.theme-light .cultitalic{color:#973e3b;font-style:italic}.theme-light .cultbold{color:#973e3b;font-style:italic;font-weight:bold}.theme-light .cultboldtalic{color:#973e3b;font-weight:bold;font-size:185%}.theme-light .cultlarge{color:#973e3b;font-weight:bold;font-size:185%}.theme-light .narsie{color:#973e3b;font-weight:bold;font-size:925%}.theme-light .narsiesmall{color:#973e3b;font-weight:bold;font-size:370%}.theme-light .colossus{color:#7f282a;font-size:310%}.theme-light .hierophant{color:#609;font-weight:bold;font-style:italic}.theme-light .hierophant_warning{color:#609;font-style:italic}.theme-light .purple{color:#5e2d79}.theme-light .holoparasite{color:#35333a}.theme-light .revennotice{color:#1d2953}.theme-light .revenboldnotice{color:#1d2953;font-weight:bold}.theme-light .revenbignotice{color:#1d2953;font-weight:bold;font-size:185%}.theme-light .revenminor{color:#823abb}.theme-light .revenwarning{color:#760fbb;font-style:italic}.theme-light .revendanger{color:#760fbb;font-weight:bold;font-size:185%}.theme-light .deconversion_message{color:#5000a0;font-size:185%;font-style:italic}.theme-light .ghostalert{color:#5c00e6;font-style:italic;font-weight:bold}.theme-light .alien{color:#543354}.theme-light .noticealien{color:#00c000}.theme-light .alertalien{color:#00c000;font-weight:bold}.theme-light .changeling{color:purple;font-style:italic}.theme-light .alertsyndie{color:red;font-size:185%;font-weight:bold}.theme-light .spider{color:#4d004d;font-weight:bold;font-size:185%}.theme-light .interface{color:#303}.theme-light .sans{font-family:"Comic Sans MS",cursive,sans-serif}.theme-light .papyrus{font-family:"Papyrus",cursive,sans-serif}.theme-light .robot{font-family:"Courier New",cursive,sans-serif}.theme-light .tape_recorder{color:maroon;font-family:"Courier New",cursive,sans-serif}.theme-light .command_headset{font-weight:bold;font-size:160%}.theme-light .small{font-size:60%}.theme-light .big{font-size:185%}.theme-light .reallybig{font-size:245%}.theme-light .extremelybig{font-size:310%}.theme-light .greentext{color:lime;font-size:185%}.theme-light .redtext{color:red;font-size:185%}.theme-light .clown{color:#ff69bf;font-size:160%;font-family:"Comic Sans MS",cursive,sans-serif;font-weight:bold}.theme-light .singing{font-family:"Trebuchet MS",cursive,sans-serif;font-style:italic}.theme-light .his_grace{color:#15d512;font-family:"Courier New",cursive,sans-serif;font-style:italic}.theme-light .hypnophrase{color:#0d0d0d;font-weight:bold;animation:hypnocolor 1500ms infinite;animation-direction:alternate}@keyframes hypnocolor{0%{color:#0d0d0d}25%{color:#410194}50%{color:#7f17d8}75%{color:#410194}100%{color:#3bb5d3}}.theme-light .phobia{color:#d00;font-weight:bold;animation:phobia 750ms infinite}@keyframes phobia{0%{color:#0d0d0d}50%{color:#d00}100%{color:#0d0d0d}}.theme-light .icon{height:1em;width:auto}.theme-light .bigicon{font-size:2.5em}.theme-light .memo{color:#638500;text-align:center}.theme-light .memoedit{text-align:center;font-size:125%}.theme-light .abductor{color:purple;font-style:italic}.theme-light .mind_control{color:#a00d6f;font-size:100%;font-weight:bold;font-style:italic}.theme-light .slime{color:#00ced1}.theme-light .drone{color:#848482}.theme-light .monkey{color:#975032}.theme-light .swarmer{color:#2c75ff}.theme-light .resonate{color:#298f85}.theme-light .monkeyhive{color:#774704}.theme-light .monkeylead{color:#774704;font-size:80%}.theme-light .connectionClosed,.theme-light .fatalError{background:red;color:#fff;padding:5px}.theme-light .connectionClosed.restored{background:green}.theme-light .internal.boldnshit{color:blue;font-weight:bold}.theme-light .text-normal{font-weight:normal;font-style:normal}.theme-light .hidden{display:none;visibility:hidden}.theme-light .ml-1{margin-left:1em}.theme-light .ml-2{margin-left:2em}.theme-light .ml-3{margin-left:3em}.theme-light .xooc{color:#6c0094;font-weight:bold;font-size:140%}.theme-light .mooc{color:#090;font-weight:bold;font-size:140%}.theme-light .yooc{color:#999600;font-weight:bold;font-size:140%}.theme-light .headminsay{color:#5a0a7f;font-weight:bold}.theme-light .radio{color:#4e4e4e}.theme-light .deptradio{color:#939}.theme-light .comradio{color:#004080}.theme-light .centradio{color:#5c5c8a}.theme-light .cryoradio{color:#554e3f}.theme-light .hcradio{color:#318779}.theme-light .pvstradio{color:#9b0612}.theme-light .airadio{color:#f0f}.theme-light .secradio{color:#a30000}.theme-light .engradio{color:#a66300}.theme-light .sentryradio{color:#844300}.theme-light .medradio{color:#008160}.theme-light .supradio{color:#5f4519}.theme-light .jtacradio{color:#702963}.theme-light .intelradio{color:#027d02}.theme-light .wyradio{color:#fe9b24}.theme-light .pmcradio{color:#136957}.theme-light .vairadio{color:#943d0a}.theme-light .cmbradio{color:#1b748c}.theme-light .clfradio{color:#6f679c}.theme-light .alpharadio{color:#ea0000}.theme-light .bravoradio{color:#c68610}.theme-light .charlieradio{color:#a5a}.theme-light .deltaradio{color:#007fcf}.theme-light .echoradio{color:#3a7e65}.theme-light .medium{font-size:110%}.theme-light .big{font-size:115%}.theme-light .large{font-size:125%}.theme-light .extra_large{font-size:130%}.theme-light .huge{font-size:150%}.theme-light .underline{text-decoration:underline}.theme-light .orange{color:#eca100}.theme-light .normal{font-style:normal}.theme-light .attack{color:red}.theme-light .moderate{color:#c00}.theme-light .disarm{color:#900}.theme-light .passive{color:#600}.theme-light .helpful{color:#368f31}.theme-light .scanner{color:red}.theme-light .scannerb{color:red;font-weight:bold}.theme-light .scannerburn{color:orange}.theme-light .scannerburnb{color:orange;font-weight:bold}.theme-light .rose{color:#ff5050}.theme-light .debuginfo{color:#493d26;font-style:italic}.theme-light .xenonotice{color:#2a623d}.theme-light .xenoboldnotice{color:#2a623d;font-style:italic}.theme-light .xenowarning{color:#2a623d;font-style:italic}.theme-light .xenominorwarning{color:#2a623d;font-weight:bold;font-style:italic}.theme-light .xenodanger{color:#2a623d;font-weight:bold}.theme-light .avoidharm{color:#72a0e5;font-weight:bold}.theme-light .highdanger{color:red;font-weight:bold;font-size:140%}.theme-light .xenohighdanger{color:#2a623d;font-weight:bold;font-size:140%}.theme-light .xenoannounce{color:#1a472a;font-family:book-antiqua;font-weight:bold;font-size:140%}.theme-light .yautjabold{color:purple;font-weight:bold}.theme-light .yautjaboldbig{color:purple;font-weight:bold;font-size:120%}.theme-light .objectivebig{font-weight:bold;font-size:130%}.theme-light .objectivegreen{color:lime}.theme-light .objectivered{color:red}.theme-light .objectivesuccess{color:lime;font-weight:bold;font-size:110%}.theme-light .objectivefail{color:red;font-weight:bold;font-size:110%}.theme-light .xenotalk,.theme-light .xeno{color:#900090;font-style:italic}.theme-light .xenoleader{color:#730d73;font-style:italic;font-size:125%}.theme-light .xenoqueen{color:#730d73;font-style:italic;font-weight:bold;font-size:125%}.theme-light .newscaster{color:maroon}.theme-light .role_header{color:#db0000;display:block;text-align:center;font-weight:bold;font-family:trebuchet-ms;font-size:150%}.theme-light .role_body{color:#009;display:block;text-align:center;font-size:125%}.theme-light .round_header{color:#db0000;display:block;text-align:center;font-family:courier;font-weight:bold;font-size:180%}.theme-light .round_body{color:#001427;display:block;text-align:center;font-family:trebuchet-ms;font-weight:bold;font-size:125%}.theme-light .event_announcement{color:#600d48;font-family:arial-narrow;font-weight:bold;font-size:125%}.theme-light .announce_header{color:#000;font-weight:bold;font-size:150%}.theme-light .announce_header_blue{color:#009;font-weight:bold;font-size:150%}.theme-light .announce_body{color:red;font-weight:normal;font-size:125%}.theme-light .centerbold{display:block;text-align:center;font-weight:bold}.theme-light .mod{color:#735638;font-weight:bold}.theme-light .modooc{color:#184880;font-weight:bold}.theme-light .adminmod{color:#402a14;font-weight:bold}.theme-light .mentorsay{color:#b38c32;font-weight:bold}.theme-light .mentorhelp{color:#007e00;font-weight:bold}.theme-light .mentorbody{color:#da6200;font-weight:bold}.theme-light .mentorstaff{color:#876101;font-weight:bold}.theme-light .staffsay{color:#876101;font-weight:bold}.theme-light .tajaran{color:#803b56}.theme-light .tajaran_signlang{color:#941c1c}.theme-light .skrell{color:#00ced1}.theme-light .soghun{color:#228b22}.theme-light .changeling{color:purple}.theme-light .vox{color:#a0a}.theme-light .monkey{color:#966c47}.theme-light .german{color:#858f1e;font-family:"Times New Roman",Times,serif}.theme-light .spanish{color:#cf982b}.theme-light .japanese{color:#940927}.theme-light .chinese{color:#fe1919}.theme-light .zombie{color:#216163;font-style:italic}.theme-light .commando{color:#fe9b24;font-style:bold}.theme-light .rough{font-family:trebuchet-ms,cursive,sans-serif}.theme-light .say_quote{font-family:Georgia,Verdana,sans-serif}.theme-light .admin .message{color:#314cad}.theme-light .admin .prefix{font-weight:bolder}.theme-light .pm{font-size:110%}.theme-light .retro_translator{font-weight:bold}.theme-light .yautja_translator{color:#a00;font-weight:bold;animation:glitch .5s infinite}@keyframes glitch{25%{color:#a00;transform:translate(-2px, -1px)}50%{color:#be0000;transform:translate(1px, -2px)}75%{color:#8d0000;transform:translate(-1px, 2px)}100%{color:#830000;transform:translate(1px, 1px)}}.theme-light .examine_block{background:#f2f7fa;border:1px solid #111a27;margin:.5em;padding:.5em .75em}.theme-light .examine_block .icon{width:1.5em;height:1.5em;margin:0;padding:0}.theme-light .tooltip{font-style:italic;border-bottom:1px dashed #000}

From a0ea33b983683567eaaadfa1638b159c4566bb5d Mon Sep 17 00:00:00 2001
From: cm13-github <128137806+cm13-github@users.noreply.github.com>
Date: Fri, 1 Dec 2023 22:08:36 +0000
Subject: [PATCH 32/58] Automatic changelog for PR #4866 [ci skip]

---
 html/changelogs/AutoChangeLog-pr-4866.yml | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 html/changelogs/AutoChangeLog-pr-4866.yml

diff --git a/html/changelogs/AutoChangeLog-pr-4866.yml b/html/changelogs/AutoChangeLog-pr-4866.yml
new file mode 100644
index 000000000000..e9370f9725e7
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-4866.yml
@@ -0,0 +1,6 @@
+author: "realforest2001"
+delete-after: True
+changes:
+  - rscadd: "Added disguisable listening bugs/devices. MPs have two outside CMP office, the CL has two in their bedroom."
+  - bugfix: "Fixes incorrect frequencies being used to display channel names on radios."
+  - bugfix: "Radios and tape recorders placed on tables or placed inside webbing can now hear speech again."
\ No newline at end of file

From b9105741778f85bbcffffaa09870609e6ac0fb4b Mon Sep 17 00:00:00 2001
From: BadAtThisGame <79063506+BadAtThisGame302@users.noreply.github.com>
Date: Sat, 2 Dec 2023 02:33:26 +0200
Subject: [PATCH 33/58] Repurposed nightmare insert + Lambda Changes (#5045)

# About the pull request

Makes Lambda more nice and adds some more items in the lackluster areas,
makes the Director's office more like a Director's office and not a
rundown 3 table 1 paper bin office, with a fluff diary note in his Panic
Room/Bedroom.

Also uses an old nightmare/sprinkle of Big Red and repurposes it to a
like Chance's, a moneybags vault which was mined out and created around
the same time the new mining began southwest in the caves of the map

# Explain why it's good for the game

I made the Director's Office, Admin Office and Relax Room in Lambda more
nice and added a fluff note in the Director's Safe Room

I repurposed an old nightmare insert, there is a roadmap saying to add
more nightmare inserts so why not.


# Testing Photographs and Procedure
<details>
<summary>Screenshots & Videos</summary>
The Director's brand new office. An expanded Administration Office. More
funded Relaxation Room. (Union mandated)


![image](https://github.com/cmss13-devs/cmss13/assets/79063506/c2d93801-0e22-4b12-b785-44385523e172)

The Weyland-Yutani shared vault, with a dead PMC outside guarding it.


![image](https://github.com/cmss13-devs/cmss13/assets/79063506/6cbf160f-2cec-4d13-8262-085ccdf13091)


</details>


# Changelog
:cl:
add: Added a flavor diary entry from the Director of Lambda
mapadd: added back the old vault nightmare insert on Solaris which was
removed due to the creation of static comms where it spawned
maptweak: tweaked the Lambda Director's Office
maptweak: tweaked the Lambda Administration Office
maptweak: tweaked the Lambda Relaxation Room
/:cl:

---------

Co-authored-by: Jeff Watchson <johncenatoutourourou@gmail.com>
---
 code/modules/paperwork/paper.dm               |   4 +
 maps/map_files/BigRed/BigRed.dmm              | 227 +++--
 .../BigRed/sprinkles/25.vault_v2.dmm          | 872 ++++++++++--------
 3 files changed, 665 insertions(+), 438 deletions(-)

diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm
index 258132a112e1..b572b5d9e87b 100644
--- a/code/modules/paperwork/paper.dm
+++ b/code/modules/paperwork/paper.dm
@@ -569,6 +569,10 @@
 	name = "crumpled note"
 	info = "<b>there is cotten candy in the walls</b>"
 
+/obj/item/paper/bigred/lambda
+	name = "ripped diary entry"
+	info = "Director Smith's Diary\nEntry Date: 15 December 2181\nToday, I've felt true progress! The XX-121 reproduction program is in full effect, and Administrator Cooper have given us the all clear to continue producing specimens. To think that all this is coming from just that first specimen, a single 'Queen' form... It's grown to almost 5 meters tall and shows no signs of ceasing egg production! These creatures will be the next Synthetic of our time, we'll show those Seegson bastards."
+
 /obj/item/paper/bigred/union
 	name = "Shaft miners union"
 	info = "Today we have had enough of being underpaid and treated like shit for not reaching the higher up's unreasonable quotas of ore. They say this place has a \"sea of valuable ores,\" yet we have been mining for years and are yet to find a single diamond. We have had it, enough is enough. They think they can control everything we do, they thought wrong! We, the oppressed workers, shall rise up against the capitalist dogs in a mutiny and take back our pay by force. \n If they send their dogs here to bust us, we will kill each and every single one of them."
diff --git a/maps/map_files/BigRed/BigRed.dmm b/maps/map_files/BigRed/BigRed.dmm
index 2cdf06d411c7..117006e1ec8b 100644
--- a/maps/map_files/BigRed/BigRed.dmm
+++ b/maps/map_files/BigRed/BigRed.dmm
@@ -2548,7 +2548,8 @@
 "ahv" = (
 /obj/structure/surface/table/holotable/wood,
 /obj/item/paper_bin,
-/turf/open/floor/wood,
+/obj/item/tool/pen/clicky,
+/turf/open/floor/carpet,
 /area/bigredv2/caves/lambda/breakroom)
 "ahw" = (
 /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
@@ -3147,6 +3148,15 @@
 /area/bigredv2/outside/marshal_office)
 "ajd" = (
 /obj/structure/surface/table/holotable/wood,
+/obj/structure/transmitter/colony_net/rotary{
+	phone_category = "Lambda Labs";
+	phone_color = "blue";
+	phone_id = "Administration"
+	},
+/obj/item/clothing/mask/cigarette{
+	pixel_x = 5;
+	pixel_y = 6
+	},
 /turf/open/floor/carpet,
 /area/bigredv2/caves/lambda/breakroom)
 "aje" = (
@@ -3198,7 +3208,8 @@
 /area/bigredv2/outside/dorms)
 "ajm" = (
 /obj/structure/filingcabinet,
-/obj/effect/landmark/objective_landmark/science,
+/obj/effect/landmark/objective_landmark/close,
+/obj/effect/landmark/objective_landmark/medium,
 /turf/open/floor/wood,
 /area/bigredv2/caves/lambda/breakroom)
 "ajn" = (
@@ -3410,8 +3421,8 @@
 /turf/open/floor,
 /area/bigredv2/outside/marshal_office)
 "ajO" = (
-/obj/structure/surface/table/holotable/wood,
-/obj/item/tool/pen,
+/obj/structure/machinery/prop/almayer/computer/PC,
+/obj/structure/surface/table/woodentable/fancy,
 /turf/open/floor/carpet,
 /area/bigredv2/caves/lambda/breakroom)
 "ajP" = (
@@ -3501,8 +3512,8 @@
 	},
 /area/bigredv2/outside/nw)
 "aka" = (
-/obj/structure/filingcabinet/chestdrawer,
-/obj/effect/landmark/objective_landmark/close,
+/obj/structure/machinery/faxmachine,
+/obj/structure/surface/table/woodentable/fancy,
 /turf/open/floor/wood,
 /area/bigredv2/caves/lambda/breakroom)
 "akc" = (
@@ -4484,16 +4495,14 @@
 /turf/open/floor/plating,
 /area/bigredv2/outside/dorms)
 "amW" = (
-/obj/structure/machinery/door_control{
-	id = "safe_room";
-	layer = 4;
-	name = "Door Bolt Control";
-	normaldoorcontrol = 1;
-	pixel_y = -5;
-	req_access_txt = "7";
-	specialfunctions = 4
+/obj/structure/machinery/light{
+	dir = 1
+	},
+/obj/structure/closet/crate/freezer/rations,
+/turf/open/floor{
+	dir = 1;
+	icon_state = "elevatorshaft"
 	},
-/turf/closed/wall/solaris/reinforced,
 /area/bigredv2/caves/lambda/breakroom)
 "amX" = (
 /obj/structure/window/framed/solaris/reinforced,
@@ -5896,9 +5905,13 @@
 	},
 /area/bigredv2/outside/general_offices)
 "aqX" = (
-/obj/structure/closet/crate/freezer/rations,
 /obj/item/storage/toolbox/mechanical,
 /obj/item/device/multitool,
+/obj/structure/window/reinforced{
+	dir = 4;
+	health = 80
+	},
+/obj/structure/surface/rack,
 /turf/open/floor{
 	dir = 1;
 	icon_state = "elevatorshaft"
@@ -5914,8 +5927,15 @@
 	},
 /area/bigredv2/caves/lambda/breakroom)
 "aqZ" = (
-/obj/structure/closet/fireaxecabinet{
-	pixel_y = 32
+/obj/structure/noticeboard{
+	dir = 1;
+	pixel_y = 30;
+	desc = "A board for pinning important items upon.";
+	name = "trophy board"
+	},
+/obj/item/XenoBio/Chitin{
+	pixel_y = 27;
+	anchored = 1
 	},
 /turf/open/floor{
 	dir = 1;
@@ -5923,8 +5943,11 @@
 	},
 /area/bigredv2/caves/lambda/breakroom)
 "ara" = (
-/obj/structure/surface/table/holotable/wood,
-/obj/item/device/flashlight/lamp,
+/obj/structure/surface/table/woodentable/fancy,
+/obj/item/device/flashlight/lamp{
+	pixel_y = 15
+	},
+/obj/item/paper/bigred/lambda,
 /turf/open/floor{
 	dir = 1;
 	icon_state = "elevatorshaft"
@@ -6141,9 +6164,7 @@
 /obj/item/ammo_magazine/shotgun/incendiary,
 /obj/item/ammo_magazine/shotgun/incendiary,
 /obj/item/weapon/gun/shotgun/combat,
-/obj/structure/window/reinforced{
-	dir = 1
-	},
+/obj/structure/machinery/door/window/eastleft,
 /turf/open/floor{
 	dir = 1;
 	icon_state = "elevatorshaft"
@@ -6157,7 +6178,7 @@
 /area/bigredv2/caves/lambda/breakroom)
 "arG" = (
 /obj/structure/bed,
-/obj/item/bedsheet/captain,
+/obj/item/bedsheet/rd,
 /turf/open/floor{
 	dir = 1;
 	icon_state = "elevatorshaft"
@@ -6387,8 +6408,9 @@
 /area/bigredv2/outside/ne)
 "asn" = (
 /obj/structure/surface/rack,
-/obj/structure/window/reinforced,
 /obj/item/clothing/suit/armor/vest,
+/obj/structure/machinery/door/window/eastright,
+/obj/structure/window/reinforced,
 /turf/open/floor{
 	dir = 1;
 	icon_state = "elevatorshaft"
@@ -6405,9 +6427,7 @@
 	},
 /area/bigredv2/caves/lambda/breakroom)
 "asp" = (
-/obj/structure/bed/chair/office/light{
-	dir = 4
-	},
+/obj/structure/bed/chair/comfy/black,
 /turf/open/floor/wood,
 /area/bigredv2/caves/lambda/breakroom)
 "asq" = (
@@ -6417,7 +6437,7 @@
 	},
 /area/bigredv2/outside/medical)
 "asr" = (
-/obj/structure/bed/chair{
+/obj/structure/bed/chair/comfy{
 	dir = 8
 	},
 /turf/open/floor/carpet,
@@ -6690,9 +6710,12 @@
 /area/bigredv2/outside/chapel)
 "ate" = (
 /obj/structure/machinery/door_control{
-	id = "safe_blast";
-	name = "Blast Door";
-	pixel_y = -25
+	id = "safe_room";
+	name = "Door Bolt Control";
+	normaldoorcontrol = 1;
+	pixel_y = -28;
+	req_access_txt = "106";
+	specialfunctions = 4
 	},
 /turf/open/floor{
 	dir = 1;
@@ -6700,12 +6723,8 @@
 	},
 /area/bigredv2/caves/lambda/breakroom)
 "atf" = (
-/obj/structure/closet/crate/medical,
-/obj/item/storage/firstaid/adv,
-/obj/item/storage/firstaid/o2,
-/obj/item/storage/firstaid/toxin,
-/obj/item/storage/firstaid/rad,
-/obj/effect/landmark/objective_landmark/medium,
+/obj/structure/closet/secure_closet/RD,
+/obj/effect/landmark/objective_landmark/science,
 /turf/open/floor{
 	dir = 1;
 	icon_state = "elevatorshaft"
@@ -6918,7 +6937,7 @@
 	dir = 1;
 	icon_state = "door_locked";
 	id = "safe_room";
-	name = "\improper Lambda Lab Secure Storage"
+	name = "\improper Lambda Lab Director's Safe Room"
 	},
 /turf/open/floor{
 	icon_state = "delivery"
@@ -7145,7 +7164,7 @@
 /area/bigredv2/outside/office_complex)
 "aum" = (
 /obj/structure/machinery/door/airlock/almayer/research/glass/colony{
-	name = "\improper Lambda Lab Administration Office"
+	name = "\improper Lambda Lab Director's Office"
 	},
 /turf/open/floor{
 	icon_state = "delivery"
@@ -7718,7 +7737,6 @@
 /turf/open/floor/wood,
 /area/bigredv2/caves/lambda/breakroom)
 "avN" = (
-/obj/structure/bed/chair,
 /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
 /turf/open/floor/carpet,
 /area/bigredv2/caves/lambda/breakroom)
@@ -7982,8 +8000,19 @@
 /turf/open/mars,
 /area/bigredv2/outside/ne)
 "awz" = (
-/obj/structure/surface/table/holotable/wood,
-/obj/item/XenoBio/Chitin,
+/obj/item/ashtray/bronze{
+	pixel_x = -7
+	},
+/obj/item/trash/cigbutt,
+/obj/item/trash/cigbutt{
+	pixel_x = 7;
+	pixel_y = 7
+	},
+/obj/item/trash/cigbutt{
+	pixel_x = -10;
+	pixel_y = 14
+	},
+/obj/structure/surface/table/woodentable/fancy,
 /turf/open/floor/carpet,
 /area/bigredv2/caves/lambda/breakroom)
 "awA" = (
@@ -7998,13 +8027,12 @@
 	},
 /area/bigredv2/caves/lambda/research)
 "awB" = (
-/obj/structure/surface/table/holotable/wood,
-/obj/item/reagent_container/food/drinks/coffee,
 /obj/structure/transmitter/colony_net/rotary{
 	phone_category = "Lambda Labs";
 	phone_color = "blue";
-	phone_id = "Administration"
+	phone_id = "Director"
 	},
+/obj/structure/surface/table/woodentable/fancy,
 /turf/open/floor/carpet,
 /area/bigredv2/caves/lambda/breakroom)
 "awC" = (
@@ -8253,10 +8281,10 @@
 	},
 /area/bigredv2/caves/lambda/virology)
 "axo" = (
-/obj/structure/bed/chair/office/light{
+/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
+/obj/structure/bed/chair/comfy/black{
 	dir = 8
 	},
-/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
 /turf/open/floor/wood,
 /area/bigredv2/caves/lambda/breakroom)
 "axp" = (
@@ -8711,6 +8739,12 @@
 /area/bigredv2/caves/lambda/breakroom)
 "ayB" = (
 /obj/structure/machinery/light,
+/obj/structure/surface/table/woodentable,
+/obj/item/storage/fancy/cigarettes/wypacket{
+	pixel_x = -5;
+	pixel_y = 4
+	},
+/obj/item/tool/lighter/zippo,
 /turf/open/floor/carpet,
 /area/bigredv2/caves/lambda/breakroom)
 "ayC" = (
@@ -10831,8 +10865,10 @@
 	},
 /area/bigredv2/caves/lambda/research)
 "aEs" = (
-/obj/structure/surface/table/holotable/wood,
-/turf/open/floor/wood,
+/obj/structure/bed/chair/comfy/lime{
+	dir = 8
+	},
+/turf/open/floor/carpet,
 /area/bigredv2/caves/lambda/breakroom)
 "aEt" = (
 /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
@@ -11491,9 +11527,7 @@
 	},
 /area/bigredv2/caves/lambda/research)
 "aGh" = (
-/obj/structure/bed/chair/office/light{
-	dir = 1
-	},
+/obj/structure/filingcabinet/filingcabinet,
 /turf/open/floor/wood,
 /area/bigredv2/caves/lambda/breakroom)
 "aGi" = (
@@ -19537,7 +19571,7 @@
 /turf/open/floor,
 /area/bigredv2/outside/cargo)
 "bcy" = (
-/obj/structure/machinery/vending/cigarette,
+/obj/structure/machinery/vending/cigarette/colony,
 /turf/open/floor,
 /area/bigredv2/outside/cargo)
 "bcz" = (
@@ -29670,6 +29704,10 @@
 	icon_state = "darkyellowcorners2"
 	},
 /area/bigredv2/caves/eta/living)
+"fnv" = (
+/obj/structure/bed/chair/comfy,
+/turf/open/floor/carpet,
+/area/bigredv2/caves/lambda/breakroom)
 "fnO" = (
 /turf/open/mars_cave{
 	icon_state = "mars_cave_13"
@@ -30300,7 +30338,7 @@
 	do_not_disturb = 1;
 	phone_category = "Lambda Labs";
 	phone_color = "red";
-	phone_id = "Secure Storage";
+	phone_id = "Director's Safe Room";
 	pixel_x = -18
 	},
 /turf/open/floor{
@@ -30986,7 +31024,7 @@
 	},
 /area/bigredv2/outside/lambda_cave_cas)
 "hSP" = (
-/obj/structure/machinery/vending/cigarette,
+/obj/structure/machinery/vending/cigarette/colony,
 /turf/open/mars_cave{
 	icon_state = "mars_dirt_6"
 	},
@@ -32672,6 +32710,12 @@
 	icon_state = "wood"
 	},
 /area/bigredv2/outside/admin_building)
+"kIF" = (
+/obj/structure/bed/chair/comfy/orange{
+	dir = 1
+	},
+/turf/open/floor/carpet,
+/area/bigredv2/caves/lambda/breakroom)
 "kIW" = (
 /obj/structure/fence,
 /turf/open/floor{
@@ -33067,6 +33111,12 @@
 /obj/structure/blocker/forcefield/multitile_vehicles,
 /turf/closed/wall/solaris/reinforced,
 /area/bigredv2/caves)
+"lAF" = (
+/obj/item/paper_bin,
+/obj/item/tool/pen,
+/obj/structure/surface/table/woodentable/fancy,
+/turf/open/floor/wood,
+/area/bigredv2/caves/lambda/breakroom)
 "lAK" = (
 /obj/effect/landmark/static_comms/net_two,
 /turf/open/floor{
@@ -34629,6 +34679,10 @@
 	icon_state = "dark"
 	},
 /area/bigredv2/caves/eta/research)
+"orT" = (
+/obj/structure/machinery/vending/coffee,
+/turf/open/floor/carpet,
+/area/bigredv2/caves/lambda/breakroom)
 "orZ" = (
 /obj/structure/closet/secure_closet/atmos_personal,
 /obj/effect/landmark/objective_landmark/medium,
@@ -36192,6 +36246,12 @@
 	icon_state = "mars_cave_13"
 	},
 /area/bigredv2/caves/mining)
+"reL" = (
+/obj/effect/landmark/nightmare{
+	insert_tag = "vault_v2"
+	},
+/turf/closed/wall/solaris/rock,
+/area/bigredv2/caves)
 "rfe" = (
 /obj/structure/platform/kutjevo/rock{
 	dir = 8
@@ -36653,6 +36713,17 @@
 	},
 /turf/open/floor/plating,
 /area/bigredv2/caves/mining)
+"rUs" = (
+/obj/structure/machinery/door_control{
+	id = "safe_room";
+	name = "Door Bolt Control";
+	normaldoorcontrol = 1;
+	pixel_y = 28;
+	req_access_txt = "106";
+	specialfunctions = 4
+	},
+/turf/open/floor/wood,
+/area/bigredv2/caves/lambda/breakroom)
 "rUN" = (
 /obj/structure/platform{
 	dir = 4
@@ -37316,6 +37387,10 @@
 	icon_state = "mars_cave_19"
 	},
 /area/bigredv2/outside/lz2_south_cas)
+"sUQ" = (
+/obj/structure/machinery/photocopier,
+/turf/open/floor/wood,
+/area/bigredv2/caves/lambda/breakroom)
 "sWa" = (
 /obj/item/ore{
 	pixel_x = 12;
@@ -39478,6 +39553,10 @@
 	icon_state = "mars_dirt_4"
 	},
 /area/bigredv2/caves/mining)
+"wCs" = (
+/obj/structure/machinery/vending/cigarette/colony,
+/turf/open/floor/carpet,
+/area/bigredv2/caves/lambda/breakroom)
 "wDa" = (
 /obj/effect/decal/cleanable/blood/drip{
 	pixel_x = 6
@@ -76696,9 +76775,9 @@ asn
 gvI
 amk
 ajm
-aqc
+sUQ
 avM
-aqc
+lAF
 aka
 amk
 tQw
@@ -76914,9 +76993,9 @@ atc
 amk
 auj
 auY
-auY
+fnv
 awz
-ahv
+aqc
 amk
 aao
 tQw
@@ -77341,14 +77420,14 @@ adZ
 afd
 afd
 adZ
-aqY
+amW
 arF
 arF
 ate
-amW
-aqc
-auY
+amk
+rUs
 auY
+fnv
 awB
 aqc
 amk
@@ -78001,7 +78080,7 @@ agd
 agd
 amX
 awC
-axp
+kIF
 axp
 ayA
 amk
@@ -78220,7 +78299,7 @@ avO
 auY
 aqc
 axT
-auY
+wCs
 amk
 anI
 aAM
@@ -78437,7 +78516,7 @@ auy
 auY
 aqc
 aqc
-auY
+orT
 amk
 anI
 aAN
@@ -78652,8 +78731,8 @@ agd
 agd
 amX
 awD
-auY
-auY
+aEs
+aEs
 ayB
 amk
 anI
@@ -78859,8 +78938,8 @@ adZ
 anQ
 amK
 adZ
-aEs
-aGh
+sUQ
+aqc
 aqc
 asp
 aqc
@@ -79077,7 +79156,7 @@ anR
 amM
 adZ
 adZ
-aqc
+aGh
 ahv
 ajd
 aqc
@@ -79295,7 +79374,7 @@ anS
 apv
 adZ
 adZ
-aqc
+auY
 asr
 aqc
 amX
@@ -82127,7 +82206,7 @@ aao
 aao
 jgW
 aig
-aao
+reL
 aao
 anI
 anI
diff --git a/maps/map_files/BigRed/sprinkles/25.vault_v2.dmm b/maps/map_files/BigRed/sprinkles/25.vault_v2.dmm
index 566f892d6fdd..f62f085e7ea2 100644
--- a/maps/map_files/BigRed/sprinkles/25.vault_v2.dmm
+++ b/maps/map_files/BigRed/sprinkles/25.vault_v2.dmm
@@ -1,508 +1,652 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
 "aa" = (
-/turf/open/mars,
-/area/bigredv2/outside/c)
+/obj/structure/inflatable/popped/door,
+/obj/effect/decal/cleanable/blood/drip{
+	pixel_x = -11;
+	pixel_y = 10
+	},
+/turf/open/floor{
+	icon_state = "darkpurplecorners2"
+	},
+/area/bigredv2/caves/lambda/breakroom)
 "ab" = (
-/turf/open/mars{
-	icon_state = "mars_dirt_8"
+/obj/effect/decal/cleanable/blood/drip{
+	pixel_y = 6
 	},
-/area/bigredv2/outside/c)
+/turf/open/floor{
+	dir = 4;
+	icon_state = "darkpurplecorners2"
+	},
+/area/bigredv2/caves/lambda/breakroom)
 "ac" = (
+/obj/item/tool/pickaxe/drill,
+/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
 /turf/open/mars_cave{
-	icon_state = "mars_dirt_4"
+	icon_state = "mars_cave_2"
 	},
-/area/bigredv2/outside/c)
+/area/bigredv2/caves_lambda)
 "ad" = (
-/obj/effect/decal/cleanable/blood,
-/turf/open/mars_cave{
-	icon_state = "mars_dirt_4"
-	},
-/area/bigredv2/outside/c)
+/obj/effect/glowshroom,
+/turf/open/mars_cave,
+/area/bigredv2/caves_lambda)
 "ae" = (
-/turf/open/mars{
-	icon_state = "mars_dirt_3"
+/obj/effect/glowshroom,
+/turf/open/mars_cave{
+	icon_state = "mars_cave_7"
 	},
-/area/bigredv2/outside/c)
+/area/bigredv2/caves_lambda)
 "af" = (
-/obj/effect/landmark/crap_item,
-/turf/open/mars,
-/area/bigredv2/outside/c)
+/obj/effect/decal/cleanable/blood/xeno,
+/turf/open/mars_cave{
+	icon_state = "mars_cave_7"
+	},
+/area/bigredv2/caves_lambda)
 "ag" = (
-/turf/open/mars{
-	icon_state = "mars_dirt_9"
+/obj/structure/barricade/wooden,
+/turf/open/floor{
+	dir = 4;
+	icon_state = "darkpurplecorners2"
 	},
-/area/bigredv2/outside/c)
+/area/bigredv2/caves/lambda/breakroom)
 "ah" = (
-/turf/open/mars{
-	icon_state = "mars_dirt_13"
+/obj/effect/glowshroom,
+/turf/open/mars_cave{
+	icon_state = "mars_cave_10"
 	},
-/area/bigredv2/outside/c)
+/area/bigredv2/caves_lambda)
 "ai" = (
-/turf/open/mars{
-	icon_state = "mars_dirt_10"
+/turf/open/mars_cave{
+	icon_state = "mars_cave_6"
 	},
-/area/bigredv2/outside/c)
+/area/bigredv2/caves_lambda)
 "aj" = (
-/turf/open/mars{
-	icon_state = "mars_dirt_14"
+/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
+/turf/open/mars_cave{
+	icon_state = "mars_cave_11"
 	},
-/area/bigredv2/outside/c)
+/area/bigredv2/caves_lambda)
 "ak" = (
+/turf/closed/wall/solaris/rock,
+/area/bigredv2/caves)
+"al" = (
+/obj/structure/sign/safety/restrictedarea{
+	pixel_x = 8;
+	pixel_y = -32
+	},
+/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
 /turf/open/floor{
-	dir = 1;
-	icon_state = "asteroidwarning"
+	dir = 4;
+	icon_state = "darkpurplecorners2"
 	},
-/area/bigredv2/outside/c)
-"al" = (
-/turf/closed/wall/solaris/reinforced,
-/area/bigredv2/outside/storage)
+/area/bigredv2/caves/lambda/breakroom)
 "am" = (
-/obj/structure/largecrate/hunter_games_guns/mediocre,
-/turf/open/floor,
-/area/bigredv2/outside/storage)
+/obj/structure/machinery/door_control{
+	id = "sci_br";
+	name = "Observation Shutters";
+	pixel_y = 28
+	},
+/obj/effect/decal/cleanable/blood/gibs/xeno,
+/turf/open/floor{
+	icon_state = "darkpurplecorners2"
+	},
+/area/bigredv2/caves/lambda/breakroom)
 "an" = (
-/obj/structure/largecrate/supply/floodlights,
-/turf/open/floor,
-/area/bigredv2/outside/storage)
+/obj/effect/decal/cleanable/mucus,
+/obj/structure/machinery/door_control{
+	id = "sci_br";
+	name = "Observation Shutters";
+	pixel_y = 28
+	},
+/obj/effect/landmark/corpsespawner/pmc,
+/obj/effect/decal/cleanable/vomit,
+/turf/open/floor{
+	icon_state = "darkpurplecorners2"
+	},
+/area/bigredv2/caves/lambda/breakroom)
 "ao" = (
-/turf/open/floor,
-/area/bigredv2/outside/storage)
+/obj/effect/decal/cleanable/blood/drip{
+	pixel_x = -8;
+	pixel_y = 6
+	},
+/turf/open/floor{
+	icon_state = "darkpurplecorners2"
+	},
+/area/bigredv2/caves/lambda/breakroom)
 "ap" = (
-/obj/structure/surface/table,
-/obj/effect/spawner/random/technology_scanner,
-/turf/open/floor,
-/area/bigredv2/outside/storage)
+/obj/structure/sign/safety/bulkhead_door,
+/turf/closed/wall/solaris/reinforced,
+/area/bigredv2/caves/lambda/breakroom)
 "aq" = (
-/obj/structure/surface/table,
-/obj/structure/machinery/power/apc{
-	dir = 1
+/turf/open/floor/almayer{
+	dir = 1;
+	icon_state = "w-y0"
 	},
-/obj/effect/spawner/random/powercell,
-/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot,
-/turf/open/floor,
-/area/bigredv2/outside/storage)
+/area/bigredv2/caves/lambda/breakroom)
 "ar" = (
-/obj/structure/surface/table,
-/obj/structure/machinery/light{
-	dir = 1
+/obj/structure/filingcabinet{
+	density = 0;
+	layer = 3.1;
+	pixel_x = 8;
+	pixel_y = 18
+	},
+/obj/structure/filingcabinet{
+	density = 0;
+	pixel_x = -8;
+	pixel_y = 20
+	},
+/turf/open/floor/strata{
+	dir = 4;
+	icon_state = "white_cyan1"
 	},
-/obj/effect/spawner/random/tech_supply,
-/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot,
-/turf/open/floor,
-/area/bigredv2/outside/storage)
+/area/bigredv2/caves/lambda/breakroom)
 "as" = (
-/obj/structure/surface/table,
-/obj/effect/spawner/random/tool,
-/turf/open/floor,
-/area/bigredv2/outside/storage)
+/obj/structure/filingcabinet{
+	pixel_x = 7
+	},
+/obj/structure/filingcabinet{
+	density = 0;
+	pixel_x = -7;
+	pixel_y = 19
+	},
+/obj/structure/filingcabinet{
+	pixel_x = -9
+	},
+/turf/open/floor/strata{
+	dir = 4;
+	icon_state = "white_cyan1"
+	},
+/area/bigredv2/caves/lambda/breakroom)
 "at" = (
-/obj/structure/surface/table,
-/obj/effect/spawner/random/tech_supply,
-/turf/open/floor,
-/area/bigredv2/outside/storage)
+/turf/open/floor/plating/almayer,
+/area/bigredv2/caves/lambda/breakroom)
 "au" = (
-/obj/structure/surface/table,
-/obj/effect/spawner/random/toolbox,
-/turf/open/floor,
-/area/bigredv2/outside/storage)
+/turf/open/floor/strata{
+	dir = 4;
+	icon_state = "white_cyan1"
+	},
+/area/bigredv2/caves/lambda/breakroom)
 "av" = (
-/obj/structure/surface/table,
-/obj/item/tool/extinguisher,
-/turf/open/floor,
-/area/bigredv2/outside/storage)
+/obj/structure/filingcabinet{
+	density = 0;
+	pixel_x = 8;
+	pixel_y = 20
+	},
+/obj/structure/filingcabinet{
+	density = 0;
+	pixel_x = -8;
+	pixel_y = 16
+	},
+/turf/open/floor/strata{
+	dir = 4;
+	icon_state = "white_cyan1"
+	},
+/area/bigredv2/caves/lambda/breakroom)
 "aw" = (
-/obj/structure/largecrate/supply/generator,
-/turf/open/floor,
-/area/bigredv2/outside/storage)
+/obj/structure/inflatable/popped/door,
+/turf/open/floor{
+	icon_state = "darkpurplecorners2"
+	},
+/area/bigredv2/caves/lambda/breakroom)
 "ax" = (
-/obj/structure/largecrate/random/secure,
-/turf/open/floor,
-/area/bigredv2/outside/storage)
-"aA" = (
-/obj/structure/pipes/standard/simple/hidden/green{
-	dir = 6
+/obj/structure/machinery/light{
+	dir = 1
+	},
+/obj/effect/decal/cleanable/blood,
+/turf/open/floor{
+	icon_state = "darkpurplecorners2"
 	},
-/turf/open/floor,
-/area/bigredv2/outside/storage)
+/area/bigredv2/caves/lambda/breakroom)
+"aA" = (
+/turf/template_noop,
+/area/template_noop)
 "aB" = (
-/obj/structure/pipes/standard/simple/hidden/green{
-	dir = 4;
-	layer = 2.4
+/turf/open/floor/almayer{
+	dir = 1;
+	icon_state = "w-y1"
 	},
-/turf/open/floor,
-/area/bigredv2/outside/storage)
+/area/bigredv2/caves/lambda/breakroom)
 "aC" = (
-/obj/structure/pipes/standard/simple/hidden/green{
+/obj/structure/machinery/light,
+/turf/open/floor{
 	dir = 4;
-	layer = 2.4
-	},
-/obj/structure/machinery/door/airlock/almayer/secure/colony{
-	icon_state = "door_locked";
-	locked = 0;
-	name = "\improper Emergency Vault"
+	icon_state = "darkpurplecorners2"
 	},
-/turf/open/floor,
-/area/bigredv2/outside/storage)
+/area/bigredv2/caves/lambda/breakroom)
 "aD" = (
-/obj/structure/largecrate/supply/supplies/water,
-/turf/open/floor,
-/area/bigredv2/outside/storage)
+/obj/structure/inflatable/popped/door,
+/turf/open/floor{
+	dir = 4;
+	icon_state = "darkpurplecorners2"
+	},
+/area/bigredv2/caves/lambda/breakroom)
 "aE" = (
-/obj/structure/largecrate/random,
-/turf/open/floor,
-/area/bigredv2/outside/storage)
+/turf/open/floor{
+	dir = 4;
+	icon_state = "darkpurplecorners2"
+	},
+/area/bigredv2/caves/lambda/breakroom)
 "aF" = (
-/obj/structure/pipes/standard/simple/hidden/green,
-/turf/open/floor,
-/area/bigredv2/outside/storage)
+/obj/structure/machinery/light{
+	dir = 1
+	},
+/obj/structure/surface/table/reinforced/prison,
+/obj/structure/window/reinforced{
+	dir = 8
+	},
+/obj/structure/window/reinforced{
+	dir = 4
+	},
+/obj/structure/machinery/door/window/brigdoor/southright,
+/obj/item/clothing/accessory/medal/gold{
+	pixel_x = 7;
+	pixel_y = 10
+	},
+/obj/item/clothing/accessory/medal/bronze/science{
+	pixel_x = -5
+	},
+/turf/open/floor/strata{
+	dir = 4;
+	icon_state = "white_cyan1"
+	},
+/area/bigredv2/caves/lambda/breakroom)
 "aG" = (
-/obj/structure/largecrate/supply/medicine/medkits,
-/turf/open/floor,
-/area/bigredv2/outside/storage)
+/obj/structure/window/framed/solaris/reinforced,
+/obj/structure/machinery/door/poddoor/almayer{
+	id = "sci_br";
+	name = "\improper Lambda Observation Shutters"
+	},
+/turf/open/floor/plating,
+/area/bigredv2/caves/lambda/breakroom)
 "aH" = (
-/obj/structure/largecrate/supply/medicine/blood,
-/turf/open/floor,
-/area/bigredv2/outside/storage)
+/obj/structure/barricade/wooden{
+	dir = 1;
+	pixel_y = 7
+	},
+/turf/open/floor{
+	icon_state = "darkpurplecorners2"
+	},
+/area/bigredv2/caves/lambda/breakroom)
 "aI" = (
-/obj/structure/largecrate/supply/medicine/iv,
-/turf/open/floor,
-/area/bigredv2/outside/storage)
+/turf/closed/wall/solaris/reinforced,
+/area/bigredv2/caves/lambda/breakroom)
 "aJ" = (
 /obj/structure/machinery/light,
-/turf/open/floor,
-/area/bigredv2/outside/storage)
-"aK" = (
-/obj/structure/pipes/vents/pump{
-	dir = 1
-	},
-/obj/structure/surface/table,
-/obj/effect/spawner/random/toolbox,
-/turf/open/floor,
-/area/bigredv2/outside/storage)
-"aL" = (
-/obj/structure/surface/table,
-/obj/structure/machinery/light,
-/obj/effect/spawner/random/powercell,
-/turf/open/floor,
-/area/bigredv2/outside/storage)
-"aM" = (
-/obj/structure/pipes/standard/simple/hidden/green{
+/turf/open/floor/strata{
 	dir = 4;
-	layer = 2.4
+	icon_state = "white_cyan1"
 	},
-/turf/open/floor{
-	icon_state = "asteroidwarning"
+/area/bigredv2/caves/lambda/breakroom)
+"aK" = (
+/obj/structure/surface/table/reinforced/prison,
+/obj/structure/machinery/door_control{
+	id = "vault";
+	name = "Vault Lockdown"
 	},
-/area/bigredv2/outside/s)
-"aN" = (
-/obj/structure/pipes/standard/simple/hidden/green{
+/turf/open/floor/strata{
 	dir = 4;
-	layer = 2.4
-	},
-/turf/open/floor{
-	dir = 1;
-	icon_state = "asteroidfloor"
+	icon_state = "white_cyan1"
 	},
-/area/bigredv2/outside/s)
-"aO" = (
-/obj/structure/pipes/standard/manifold/hidden/green{
-	dir = 1
+/area/bigredv2/caves/lambda/breakroom)
+"aL" = (
+/obj/structure/surface/table/reinforced/prison,
+/obj/item/spacecash/c1000,
+/obj/item/spacecash/c1000,
+/obj/item/spacecash/c1000,
+/obj/item/spacecash/c1000,
+/turf/open/floor/strata{
+	dir = 4;
+	icon_state = "white_cyan1"
 	},
-/turf/open/floor{
+/area/bigredv2/caves/lambda/breakroom)
+"aM" = (
+/turf/open/floor/almayer{
 	dir = 1;
-	icon_state = "asteroidfloor"
+	icon_state = "w-y2"
 	},
-/area/bigredv2/outside/s)
+/area/bigredv2/caves/lambda/breakroom)
+"aN" = (
+/turf/open/mars_cave,
+/area/bigredv2/caves_lambda)
 "aP" = (
-/turf/open/mars{
-	icon_state = "mars_dirt_3"
+/turf/open/mars_cave{
+	icon_state = "mars_cave_7"
 	},
-/area/bigredv2/outside/s)
+/area/bigredv2/caves_lambda)
 "aQ" = (
 /turf/open/mars_cave{
-	icon_state = "mars_dirt_4"
+	icon_state = "mars_cave_18"
 	},
-/area/bigredv2/outside/s)
+/area/bigredv2/caves_lambda)
 "aR" = (
-/turf/open/floor{
-	dir = 8;
-	icon_state = "asteroidwarning"
+/obj/structure/filingcabinet{
+	density = 0;
+	pixel_x = 8;
+	pixel_y = 19
 	},
-/area/bigredv2/outside/s)
-"aS" = (
-/obj/structure/pipes/standard/simple/hidden/green,
-/turf/open/floor{
+/obj/structure/filingcabinet{
+	density = 0;
+	pixel_x = -9;
+	pixel_y = 20
+	},
+/turf/open/floor/strata{
 	dir = 4;
-	icon_state = "asteroidwarning"
+	icon_state = "white_cyan1"
+	},
+/area/bigredv2/caves/lambda/breakroom)
+"aS" = (
+/obj/effect/glowshroom,
+/turf/open/mars_cave{
+	icon_state = "mars_cave_2"
 	},
-/area/bigredv2/outside/s)
+/area/bigredv2/caves_lambda)
 "aT" = (
-/turf/open/mars,
-/area/bigredv2/outside/s)
-"aU" = (
-/turf/open/mars{
-	icon_state = "mars_dirt_11"
+/turf/open/mars_cave{
+	icon_state = "mars_cave_4"
 	},
-/area/bigredv2/outside/s)
+/area/bigredv2/caves_lambda)
 "aV" = (
-/turf/open/mars{
-	icon_state = "mars_dirt_9"
+/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
+/turf/open/mars_cave{
+	icon_state = "mars_cave_2"
 	},
-/area/bigredv2/outside/s)
+/area/bigredv2/caves_lambda)
 "aW" = (
-/turf/open/mars{
-	icon_state = "mars_dirt_8"
+/obj/structure/machinery/door/airlock/almayer/secure/reinforced/colony{
+	icon_state = "door_locked"
 	},
-/area/bigredv2/outside/s)
+/obj/structure/machinery/door/poddoor/almayer/closed{
+	dir = 4;
+	id = "vault";
+	name = "Vault Lockdown"
+	},
+/turf/open/floor{
+	icon_state = "delivery"
+	},
+/area/bigredv2/caves/lambda/breakroom)
 "aX" = (
-/turf/open/mars{
-	icon_state = "mars_dirt_10"
+/turf/open/mars_cave{
+	icon_state = "mars_cave_8"
 	},
-/area/bigredv2/outside/s)
+/area/bigredv2/caves_lambda)
 "aY" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor{
-	dir = 8;
-	icon_state = "asteroidwarning"
+/turf/open/mars_cave{
+	icon_state = "mars_cave_10"
 	},
-/area/bigredv2/outside/s)
+/area/bigredv2/caves_lambda)
 "aZ" = (
-/turf/open/mars{
-	icon_state = "mars_dirt_12"
+/turf/open/mars_cave{
+	icon_state = "mars_cave_5"
 	},
-/area/bigredv2/outside/s)
+/area/bigredv2/caves_lambda)
 "ba" = (
-/obj/effect/landmark/crap_item,
-/turf/open/mars,
-/area/bigredv2/outside/s)
+/turf/open/mars_cave{
+	icon_state = "mars_cave_2"
+	},
+/area/bigredv2/caves_lambda)
+"vm" = (
+/obj/item/shard{
+	icon_state = "small"
+	},
+/turf/open/mars_cave{
+	icon_state = "mars_cave_18"
+	},
+/area/bigredv2/caves_lambda)
 "zP" = (
-/obj/structure/surface/table,
-/obj/effect/spawner/random/technology_scanner,
-/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot,
-/turf/open/floor,
-/area/bigredv2/outside/storage)
+/obj/effect/glowshroom,
+/turf/open/mars_cave{
+	icon_state = "mars_cave_5"
+	},
+/area/bigredv2/caves_lambda)
+"EW" = (
+/obj/structure/machinery/door/poddoor/almayer{
+	id = "sci_br";
+	name = "\improper Lambda Observation Shutters"
+	},
+/obj/item/shard{
+	icon_state = "medium"
+	},
+/obj/structure/window_frame/solaris/reinforced,
+/turf/open/floor/plating,
+/area/bigredv2/caves/lambda/breakroom)
+"Gv" = (
+/obj/structure/machinery/door/poddoor/almayer{
+	id = "sci_br";
+	name = "\improper Lambda Observation Shutters"
+	},
+/obj/item/shard,
+/obj/structure/window_frame/solaris/reinforced,
+/turf/open/floor/plating,
+/area/bigredv2/caves/lambda/breakroom)
+"RW" = (
+/obj/item/shard{
+	icon_state = "medium"
+	},
+/turf/open/mars_cave{
+	icon_state = "mars_cave_6"
+	},
+/area/bigredv2/caves_lambda)
 
 (1,1,1) = {"
-aa
-aa
-aa
-ak
-al
-al
-al
-al
-al
+aA
+aA
+aA
+aA
+aA
+aI
+am
 al
-aM
-aP
+aI
+aA
+aA
+aY
 aT
-aX
+ak
 "}
 (2,1,1) = {"
-aa
-aa
-aa
-ak
-al
-am
+aA
+aA
+aA
+aA
+zP
+aG
 aw
 aD
 aG
-al
-aM
-aP
-aT
+ai
+ai
+aZ
+ba
 aX
 "}
 (3,1,1) = {"
-aa
-aa
+aA
+aA
 ah
-ak
-al
-an
-ax
-aE
+ai
+ai
+aG
 aH
-al
-aM
+aE
+aG
 aP
-aT
-aX
+ba
+aP
+ai
+aZ
 "}
 (4,1,1) = {"
-aa
-aa
-ai
-ak
-al
-ao
+aA
+ae
+aP
+ba
+aZ
+aI
 ax
-ao
+aC
 aI
-al
-aM
-aP
-aT
-aX
+ae
+RW
+ac
+ba
+aZ
 "}
 (5,1,1) = {"
-aa
-aa
 ai
-ak
-al
-ao
-ao
+ai
+aj
+ad
+aZ
+aG
 ao
-aJ
-al
-aM
-aQ
-aU
-aQ
+ag
+EW
+af
+ba
+ba
+ba
+aZ
 "}
 (6,1,1) = {"
-aa
-aa
+aY
 ai
-ak
-al
-zP
-ao
-ao
-as
-al
+ai
+ba
+ba
+aG
+aa
+aD
+Gv
+vm
 aN
-aR
-aR
-aY
+aS
+ba
+aZ
 "}
 (7,1,1) = {"
-aa
-aa
-aj
+ba
+ba
 ak
-al
-aq
-ao
-ao
+ak
+ak
+aI
+an
+ab
 ap
-al
-aO
-aS
-aS
+aA
+aA
+aP
 aS
+aZ
 "}
 (8,1,1) = {"
-aa
-aa
-aa
+ba
 ak
-al
-ar
-ao
-ao
-as
-al
-aM
-aQ
-aQ
-aQ
+ak
+aI
+aI
+aI
+aI
+aW
+aI
+aI
+aA
+ba
+aP
+aZ
 "}
 (9,1,1) = {"
-aa
-aa
-aa
+aZ
 ak
-al
+ak
+aI
+aR
 as
-aA
-aF
+au
+au
 aK
-al
-aM
-aQ
-aQ
-aQ
+aI
+aA
+aY
+ba
+aZ
 "}
 (10,1,1) = {"
-aa
-af
-aa
 ak
-al
-as
-aB
-ao
+aA
+aA
+aI
 au
-al
-aM
-aQ
-aQ
+at
+aq
+at
+au
+aI
+aA
+aP
+ba
 aZ
 "}
 (11,1,1) = {"
-ab
-aa
-aa
 ak
-al
+aA
+aA
+aI
+aF
 at
 aB
-ao
-as
-al
-aM
-aQ
-aQ
-aT
+at
+aJ
+aI
+aA
+aP
+ba
+aZ
 "}
 (12,1,1) = {"
-ac
-ab
-aa
-ak
-al
+aA
+aA
+aA
+aI
 au
-aB
-ao
-aL
-al
+at
 aM
+at
+aL
+aI
+aA
 aQ
 aV
-aT
+ba
 "}
 (13,1,1) = {"
-ad
-ag
-aa
-ak
-al
+aA
+aA
+aA
+aI
+ar
 av
-aB
-ao
-at
-al
-aM
-aP
-aT
+aL
+aL
+aL
+aI
+aA
+ba
+ba
 ba
 "}
 (14,1,1) = {"
-ae
-aa
-aa
-ak
-al
-al
-aC
-al
-al
-al
-aM
-aQ
-aW
-aT
+aA
+aA
+aA
+aI
+aI
+aI
+aI
+aI
+aI
+aI
+aA
+ba
+ba
+ba
 "}

From fc8f2468947146d171886d66ebd2a82f21ffc527 Mon Sep 17 00:00:00 2001
From: cm13-github <128137806+cm13-github@users.noreply.github.com>
Date: Sat, 2 Dec 2023 01:11:57 +0000
Subject: [PATCH 34/58] Automatic changelog for PR #5045 [ci skip]

---
 html/changelogs/AutoChangeLog-pr-5045.yml | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 html/changelogs/AutoChangeLog-pr-5045.yml

diff --git a/html/changelogs/AutoChangeLog-pr-5045.yml b/html/changelogs/AutoChangeLog-pr-5045.yml
new file mode 100644
index 000000000000..69ba77c78e3c
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-5045.yml
@@ -0,0 +1,8 @@
+author: "BadAtThisGame302"
+delete-after: True
+changes:
+  - rscadd: "Added a flavor diary entry from the Director of Lambda"
+  - mapadd: "added back the old vault nightmare insert on Solaris which was removed due to the creation of static comms where it spawned"
+  - maptweak: "tweaked the Lambda Director's Office"
+  - maptweak: "tweaked the Lambda Administration Office"
+  - maptweak: "tweaked the Lambda Relaxation Room"
\ No newline at end of file

From 79dcb84dd60870f22cc12513ad4c6371f07d8805 Mon Sep 17 00:00:00 2001
From: Changelogs <action@github.com>
Date: Sat, 2 Dec 2023 01:12:25 +0000
Subject: [PATCH 35/58] Automatic changelog compile [ci skip]

---
 html/changelogs/AutoChangeLog-pr-4866.yml |  6 ------
 html/changelogs/AutoChangeLog-pr-4911.yml |  4 ----
 html/changelogs/AutoChangeLog-pr-4962.yml |  4 ----
 html/changelogs/AutoChangeLog-pr-4992.yml |  5 -----
 html/changelogs/AutoChangeLog-pr-4996.yml |  4 ----
 html/changelogs/archive/2023-12.yml       | 19 +++++++++++++++++++
 6 files changed, 19 insertions(+), 23 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-4866.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-4911.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-4962.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-4992.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-4996.yml

diff --git a/html/changelogs/AutoChangeLog-pr-4866.yml b/html/changelogs/AutoChangeLog-pr-4866.yml
deleted file mode 100644
index e9370f9725e7..000000000000
--- a/html/changelogs/AutoChangeLog-pr-4866.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: "realforest2001"
-delete-after: True
-changes:
-  - rscadd: "Added disguisable listening bugs/devices. MPs have two outside CMP office, the CL has two in their bedroom."
-  - bugfix: "Fixes incorrect frequencies being used to display channel names on radios."
-  - bugfix: "Radios and tape recorders placed on tables or placed inside webbing can now hear speech again."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-4911.yml b/html/changelogs/AutoChangeLog-pr-4911.yml
deleted file mode 100644
index 2ee16d930caf..000000000000
--- a/html/changelogs/AutoChangeLog-pr-4911.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Birdtalon"
-delete-after: True
-changes:
-  - bugfix: "Restricts burrower tunnels to alphanumeric characters as some other characters break the tunnel.\ncode; Adds new proc to replace non alphanumeric or space characters."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-4962.yml b/html/changelogs/AutoChangeLog-pr-4962.yml
deleted file mode 100644
index b7ed6f2cfe7f..000000000000
--- a/html/changelogs/AutoChangeLog-pr-4962.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Morrow"
-delete-after: True
-changes:
-  - code_imp: "Corrected a check to avoid repeat work in /datum/asset/spritesheet/vending_products/register()"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-4992.yml b/html/changelogs/AutoChangeLog-pr-4992.yml
deleted file mode 100644
index f1d98d0f0db0..000000000000
--- a/html/changelogs/AutoChangeLog-pr-4992.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "Birdtalon"
-delete-after: True
-changes:
-  - rscadd: "\"Infernal\" name prefix for xeno who rolls number 666"
-  - code_imp: "Refactors xeno name generation. Larva name generation and removes some istype(src)"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-4996.yml b/html/changelogs/AutoChangeLog-pr-4996.yml
deleted file mode 100644
index 1580ba0ea317..000000000000
--- a/html/changelogs/AutoChangeLog-pr-4996.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "567Turtle"
-delete-after: True
-changes:
-  - rscadd: "Brown boots and gloves are now vendable from the surplus vendors."
\ No newline at end of file
diff --git a/html/changelogs/archive/2023-12.yml b/html/changelogs/archive/2023-12.yml
index bae8bf190384..fc75f95c6a43 100644
--- a/html/changelogs/archive/2023-12.yml
+++ b/html/changelogs/archive/2023-12.yml
@@ -5,3 +5,22 @@
   - rscdel: Removed flame particles. Possibly increases performance for some players.
   Zonespace27:
   - bugfix: Resin holes can no longer be planted below stairs
+2023-12-02:
+  567Turtle:
+  - rscadd: Brown boots and gloves are now vendable from the surplus vendors.
+  Birdtalon:
+  - rscadd: '"Infernal" name prefix for xeno who rolls number 666'
+  - code_imp: Refactors xeno name generation. Larva name generation and removes some
+      istype(src)
+  - bugfix: 'Restricts burrower tunnels to alphanumeric characters as some other characters
+      break the tunnel.
+
+      code; Adds new proc to replace non alphanumeric or space characters.'
+  Morrow:
+  - code_imp: Corrected a check to avoid repeat work in /datum/asset/spritesheet/vending_products/register()
+  realforest2001:
+  - rscadd: Added disguisable listening bugs/devices. MPs have two outside CMP office,
+      the CL has two in their bedroom.
+  - bugfix: Fixes incorrect frequencies being used to display channel names on radios.
+  - bugfix: Radios and tape recorders placed on tables or placed inside webbing can
+      now hear speech again.

From 3a2cd5a7a5617e0dcd19abaf472ee2b834fdd351 Mon Sep 17 00:00:00 2001
From: blackdragonTOW <31581761+blackdragonTOW@users.noreply.github.com>
Date: Sat, 2 Dec 2023 06:14:25 -0800
Subject: [PATCH 36/58] Consistent LZ names. (#5079)

# About the pull request

Alters the lz1/lz2 names of each map placed object to have LZ1 or LZ2 in
the front of the name, that way there's never any confusion over which
is which when looking at the DS consoles. "We're going to LZ2" should
never be a point of confusion for new POs anymore.

# Explain why it's good for the game

Information good.


# Testing Photographs and Procedure
<details>
<summary>Screenshots & Videos</summary>

Put screenshots and videos here with an empty line between the
screenshots and the `<details>` tags.

</details>


# Changelog
:cl:
maptweak: Standardized the names of LZs to include the name of the LZ.
/:cl:
---
 maps/map_files/BigRed/BigRed.dmm                           | 4 ++--
 maps/map_files/CORSAT/Corsat.dmm                           | 4 ++--
 maps/map_files/FOP_v2_Cellblocks/Prison_Station_FOP.dmm    | 4 ++--
 maps/map_files/FOP_v3_Sciannex/Fiorina_SciAnnex.dmm        | 2 +-
 maps/map_files/Ice_Colony_v2/Ice_Colony_v2.dmm             | 2 +-
 maps/map_files/Ice_Colony_v3/Shivas_Snowball.dmm           | 2 +-
 maps/map_files/Kutjevo/Kutjevo.dmm                         | 4 ++--
 maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm | 4 ++--
 maps/map_files/LV624/LV624.dmm                             | 4 ++--
 maps/map_files/New_Varadero/New_Varadero.dmm               | 4 ++--
 10 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/maps/map_files/BigRed/BigRed.dmm b/maps/map_files/BigRed/BigRed.dmm
index 117006e1ec8b..6a90f35e4de3 100644
--- a/maps/map_files/BigRed/BigRed.dmm
+++ b/maps/map_files/BigRed/BigRed.dmm
@@ -119,7 +119,7 @@
 /area/bigredv2/outside/space_port)
 "aau" = (
 /obj/docking_port/stationary/marine_dropship/lz1{
-	name = "Communications Landing Zone"
+	name = "LZ1: Communications Landing Zone"
 	},
 /turf/open/floor/plating,
 /area/bigredv2/outside/space_port)
@@ -21488,7 +21488,7 @@
 /area/bigredv2/outside/space_port_lz2)
 "biI" = (
 /obj/docking_port/stationary/marine_dropship/lz2{
-	name = "Engineering Landing Zone"
+	name = "LZ2: Engineering Landing Zone"
 	},
 /turf/open/floor/plating,
 /area/bigredv2/outside/space_port_lz2)
diff --git a/maps/map_files/CORSAT/Corsat.dmm b/maps/map_files/CORSAT/Corsat.dmm
index b00a12dc86bd..7029d71a6076 100644
--- a/maps/map_files/CORSAT/Corsat.dmm
+++ b/maps/map_files/CORSAT/Corsat.dmm
@@ -37445,7 +37445,7 @@
 /area/corsat/gamma/biodome/virology)
 "drp" = (
 /obj/docking_port/stationary/marine_dropship/lz1{
-	name = "Gamma Landing Zone"
+	name = "LZ1: Gamma Landing Zone"
 	},
 /turf/open/floor/plating,
 /area/corsat/gamma/hangar)
@@ -38222,7 +38222,7 @@
 /area/corsat/omega/complex)
 "dUj" = (
 /obj/docking_port/stationary/marine_dropship/lz2{
-	name = "Sigma Landing Zone"
+	name = "LZ2: Sigma Landing Zone"
 	},
 /turf/open/floor/plating,
 /area/corsat/sigma/hangar)
diff --git a/maps/map_files/FOP_v2_Cellblocks/Prison_Station_FOP.dmm b/maps/map_files/FOP_v2_Cellblocks/Prison_Station_FOP.dmm
index 5da17a318887..ba9986948eed 100644
--- a/maps/map_files/FOP_v2_Cellblocks/Prison_Station_FOP.dmm
+++ b/maps/map_files/FOP_v2_Cellblocks/Prison_Station_FOP.dmm
@@ -5305,7 +5305,7 @@
 /area/prison/hanger/research)
 "aoj" = (
 /obj/docking_port/stationary/marine_dropship/lz2{
-	name = "Research Landing Zone"
+	name = "LZ2: Research Landing Zone"
 	},
 /turf/open/floor/plating,
 /area/prison/hanger/research)
@@ -19201,7 +19201,7 @@
 /area/prison/hanger/main)
 "bcF" = (
 /obj/docking_port/stationary/marine_dropship/lz1{
-	name = "Hangar Landing Zone"
+	name = "LZ1: Hangar Landing Zone"
 	},
 /turf/open/floor/plating,
 /area/prison/hanger/main)
diff --git a/maps/map_files/FOP_v3_Sciannex/Fiorina_SciAnnex.dmm b/maps/map_files/FOP_v3_Sciannex/Fiorina_SciAnnex.dmm
index 7238b5ab66cb..bffe3f990722 100644
--- a/maps/map_files/FOP_v3_Sciannex/Fiorina_SciAnnex.dmm
+++ b/maps/map_files/FOP_v3_Sciannex/Fiorina_SciAnnex.dmm
@@ -6510,7 +6510,7 @@
 /area/fiorina/station/disco)
 "dYp" = (
 /obj/docking_port/stationary/marine_dropship/lz1{
-	name = "Hangar Landing Zone"
+	name = "LZ1: Hangar Landing Zone"
 	},
 /turf/open/floor/plating/prison,
 /area/fiorina/lz/near_lzI)
diff --git a/maps/map_files/Ice_Colony_v2/Ice_Colony_v2.dmm b/maps/map_files/Ice_Colony_v2/Ice_Colony_v2.dmm
index 73bac536752f..485760ebc2af 100644
--- a/maps/map_files/Ice_Colony_v2/Ice_Colony_v2.dmm
+++ b/maps/map_files/Ice_Colony_v2/Ice_Colony_v2.dmm
@@ -34904,7 +34904,7 @@
 /area/ice_colony/surface/hangar/alpha)
 "sto" = (
 /obj/docking_port/stationary/marine_dropship/lz1{
-	name = "Hangar Landing Zone"
+	name = "LZ1: Hangar Landing Zone"
 	},
 /turf/open/floor/plating,
 /area/ice_colony/exterior/surface/landing_pad)
diff --git a/maps/map_files/Ice_Colony_v3/Shivas_Snowball.dmm b/maps/map_files/Ice_Colony_v3/Shivas_Snowball.dmm
index f5e2f597ef24..60847e12bae1 100644
--- a/maps/map_files/Ice_Colony_v3/Shivas_Snowball.dmm
+++ b/maps/map_files/Ice_Colony_v3/Shivas_Snowball.dmm
@@ -17375,7 +17375,7 @@
 /area/shiva/interior/caves/s_lz2)
 "mlX" = (
 /obj/docking_port/stationary/marine_dropship/lz2{
-	name = "Research Landing Zone"
+	name = "LZ2: Research Landing Zone"
 	},
 /turf/open/floor/plating,
 /area/shiva/exterior/lz2_fortress)
diff --git a/maps/map_files/Kutjevo/Kutjevo.dmm b/maps/map_files/Kutjevo/Kutjevo.dmm
index 4eb4d6fd77e9..d2d3111364df 100644
--- a/maps/map_files/Kutjevo/Kutjevo.dmm
+++ b/maps/map_files/Kutjevo/Kutjevo.dmm
@@ -4883,7 +4883,7 @@
 /area/kutjevo/interior/oob)
 "gnj" = (
 /obj/docking_port/stationary/marine_dropship/lz1{
-	name = "Dunes Landing Zone"
+	name = "LZ1: Dunes Landing Zone"
 	},
 /turf/open/floor/plating/kutjevo,
 /area/shuttle/drop1/kutjevo)
@@ -8316,7 +8316,7 @@
 /area/kutjevo/interior/power/comms)
 "lkY" = (
 /obj/docking_port/stationary/marine_dropship/lz2{
-	name = "NW Colony Landing Zone"
+	name = "LZ2: NW Colony Landing Zone"
 	},
 /turf/open/floor/plating/kutjevo,
 /area/shuttle/drop2/kutjevo)
diff --git a/maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm b/maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm
index 50240fcd8d55..5a4fa0fbdf91 100644
--- a/maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm
+++ b/maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm
@@ -1030,7 +1030,7 @@
 /area/lv522/outdoors/colony_streets/north_east_street)
 "aDE" = (
 /obj/docking_port/stationary/marine_dropship/lz2{
-	name = "Southeast Landing Zone"
+	name = "LZ2: Southeast Landing Zone"
 	},
 /turf/open/floor/plating,
 /area/shuttle/drop2/lv522)
@@ -7115,7 +7115,7 @@
 /area/lv522/indoors/a_block/dorms)
 "dos" = (
 /obj/docking_port/stationary/marine_dropship/lz1{
-	name = "Southwest Landing Zone"
+	name = "LZ1: Southwest Landing Zone"
 	},
 /turf/open/floor/plating,
 /area/shuttle/drop1/lv522)
diff --git a/maps/map_files/LV624/LV624.dmm b/maps/map_files/LV624/LV624.dmm
index af507ab907fd..9c84577bbbdd 100644
--- a/maps/map_files/LV624/LV624.dmm
+++ b/maps/map_files/LV624/LV624.dmm
@@ -5862,7 +5862,7 @@
 /area/lv624/ground/river/west_river)
 "aBo" = (
 /obj/docking_port/stationary/marine_dropship/lz2{
-	name = "Robotics Landing Zone"
+	name = "LZ2: Robotics Landing Zone"
 	},
 /turf/open/floor/plating,
 /area/lv624/lazarus/landing_zones/lz2)
@@ -8590,7 +8590,7 @@
 /area/lv624/ground/jungle/south_west_jungle)
 "aLz" = (
 /obj/docking_port/stationary/marine_dropship/lz1{
-	name = "Nexus Landing Zone"
+	name = "LZ1: Nexus Landing Zone"
 	},
 /turf/open/floor/plating,
 /area/lv624/lazarus/landing_zones/lz1)
diff --git a/maps/map_files/New_Varadero/New_Varadero.dmm b/maps/map_files/New_Varadero/New_Varadero.dmm
index aeddb1aa1021..656c4a7f48b1 100644
--- a/maps/map_files/New_Varadero/New_Varadero.dmm
+++ b/maps/map_files/New_Varadero/New_Varadero.dmm
@@ -788,7 +788,7 @@
 /area/varadero/exterior/pool)
 "aAX" = (
 /obj/docking_port/stationary/marine_dropship/lz2{
-	name = "LZ2 - Palm Airfield"
+	name = "LZ2: Palm Airfield"
 	},
 /turf/open/gm/dirt,
 /area/varadero/exterior/lz2_near)
@@ -23224,7 +23224,7 @@
 /area/varadero/interior/security)
 "oXw" = (
 /obj/docking_port/stationary/marine_dropship/lz1{
-	name = "LZ1 - Pontoon Dock"
+	name = "LZ1: Pontoon Dock"
 	},
 /turf/open/floor/plating/icefloor,
 /area/varadero/exterior/lz1_near)

From 0e2d46e8a6cb2c71d4fdc40f6a978cf615dcab62 Mon Sep 17 00:00:00 2001
From: cm13-github <128137806+cm13-github@users.noreply.github.com>
Date: Sat, 2 Dec 2023 14:22:58 +0000
Subject: [PATCH 37/58] Automatic changelog for PR #5079 [ci skip]

---
 html/changelogs/AutoChangeLog-pr-5079.yml | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 html/changelogs/AutoChangeLog-pr-5079.yml

diff --git a/html/changelogs/AutoChangeLog-pr-5079.yml b/html/changelogs/AutoChangeLog-pr-5079.yml
new file mode 100644
index 000000000000..a55879366c51
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-5079.yml
@@ -0,0 +1,4 @@
+author: "blackdragonTOW"
+delete-after: True
+changes:
+  - maptweak: "Standardized the names of LZs to include the name of the LZ."
\ No newline at end of file

From 5bb746b86024c797acf8f01a9f80f46e783dae30 Mon Sep 17 00:00:00 2001
From: spartanbobby <71467726+spartanbobby@users.noreply.github.com>
Date: Sat, 2 Dec 2023 15:31:16 +0000
Subject: [PATCH 38/58] Redetails Almayer Squad Briefing Areas (#5092)

# About the pull request

As per title

# Explain why it's good for the game

Currently they look very boring I think this makes them have a bit more
character, tactically 5 seats are lose in this PR but I'm gonna keep it
100 with you no one uses these rooms anyway


# Testing Photographs and Procedure
<details>
<summary>Screenshots & Videos</summary>

Put screenshots and videos here with an empty line between the
screenshots and the `<details>` tags.

</details>


# Changelog
:cl:SpartanBobby
maptweak: Redetails Almayer Squad briefing rooms
/:cl:
---
 maps/map_files/USS_Almayer/USS_Almayer.dmm | 1421 +++++++++++++++-----
 1 file changed, 1086 insertions(+), 335 deletions(-)

diff --git a/maps/map_files/USS_Almayer/USS_Almayer.dmm b/maps/map_files/USS_Almayer/USS_Almayer.dmm
index 895f0aaf42b8..263bce521d2a 100644
--- a/maps/map_files/USS_Almayer/USS_Almayer.dmm
+++ b/maps/map_files/USS_Almayer/USS_Almayer.dmm
@@ -10698,6 +10698,15 @@
 	icon_state = "dark_sterile"
 	},
 /area/almayer/living/numbertwobunks)
+"aLA" = (
+/obj/item/trash/uscm_mre,
+/obj/structure/bed/chair/comfy/charlie{
+	dir = 1
+	},
+/turf/open/floor/almayer{
+	icon_state = "emeraldfull"
+	},
+/area/almayer/living/briefing)
 "aLB" = (
 /turf/closed/wall/almayer,
 /area/almayer/hallways/starboard_hallway)
@@ -12021,12 +12030,25 @@
 	},
 /area/almayer/medical/upper_medical)
 "aSh" = (
-/obj/structure/bed/chair/comfy/alpha{
-	dir = 1
+/obj/structure/surface/table/almayer,
+/obj/item/device/flashlight/lamp{
+	layer = 3.3;
+	pixel_x = 15
+	},
+/obj/item/paper_bin/uscm{
+	pixel_x = -7;
+	pixel_y = 6
+	},
+/obj/item/tool/pen{
+	pixel_x = -11;
+	pixel_y = 5
+	},
+/obj/item/tool/pen{
+	pixel_x = -10;
+	pixel_y = -2
 	},
-/obj/item/prop/helmetgarb/helmet_nvg/cosmetic,
 /turf/open/floor/almayer{
-	icon_state = "redfull"
+	icon_state = "plate"
 	},
 /area/almayer/living/briefing)
 "aSl" = (
@@ -20164,6 +20186,28 @@
 "bHP" = (
 /turf/open/floor/plating/almayer,
 /area/almayer/shipboard/weapon_room)
+"bHS" = (
+/obj/structure/surface/table/almayer,
+/obj/item/trash/USCMtray{
+	pixel_y = 4
+	},
+/obj/item/trash/USCMtray{
+	pixel_y = 6
+	},
+/obj/item/trash/USCMtray{
+	pixel_y = 8
+	},
+/obj/item/trash/USCMtray{
+	pixel_y = 10
+	},
+/obj/item/device/flashlight/lamp{
+	layer = 3.3;
+	pixel_x = 15
+	},
+/turf/open/floor/almayer{
+	icon_state = "emeraldfull"
+	},
+/area/almayer/living/briefing)
 "bHT" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -23671,18 +23715,10 @@
 /area/almayer/engineering/engineering_workshop)
 "bXc" = (
 /obj/structure/surface/table/almayer,
-/obj/item/reagent_container/food/snacks/mre_pack/xmas2{
-	pixel_x = 5;
+/obj/structure/machinery/microwave{
 	pixel_y = 9
 	},
-/obj/effect/landmark/map_item{
-	layer = 3.03;
-	pixel_x = -7;
-	pixel_y = 4
-	},
-/obj/item/reagent_container/food/snacks/mre_pack/xmas3{
-	pixel_x = 5
-	},
+/obj/item/reagent_container/food/snacks/packaged_burger,
 /turf/open/floor/almayer{
 	icon_state = "plate"
 	},
@@ -25020,14 +25056,14 @@
 	},
 /area/almayer/engineering/lower_engineering)
 "ccF" = (
-/obj/structure/bed/chair/comfy/alpha{
-	dir = 1
-	},
 /obj/structure/machinery/light{
 	dir = 8
 	},
+/obj/structure/bed/chair/comfy/alpha{
+	dir = 1
+	},
 /turf/open/floor/almayer{
-	icon_state = "redfull"
+	icon_state = "plate"
 	},
 /area/almayer/living/briefing)
 "ccG" = (
@@ -25630,15 +25666,27 @@
 /turf/open/floor/almayer,
 /area/almayer/squads/charlie)
 "cgz" = (
-/obj/structure/bed/chair/comfy/charlie,
 /obj/structure/sign/poster{
 	desc = "Eat an EAT bar! ...Aren't they called MEAT bars?";
 	icon_state = "poster7";
 	name = "EAT - poster";
 	pixel_x = 27
 	},
+/obj/structure/surface/table/almayer,
+/obj/item/paper_bin/uscm{
+	pixel_x = 9;
+	pixel_y = 6
+	},
+/obj/item/tool/pen{
+	pixel_x = 9;
+	pixel_y = 9
+	},
+/obj/item/tool/pen{
+	pixel_x = 9;
+	pixel_y = 2
+	},
 /turf/open/floor/almayer{
-	icon_state = "emeraldfull"
+	icon_state = "plate"
 	},
 /area/almayer/living/briefing)
 "cgA" = (
@@ -27319,10 +27367,8 @@
 	},
 /area/almayer/squads/req)
 "crK" = (
-/obj/structure/bed/chair/comfy/alpha{
-	dir = 1
-	},
 /obj/structure/pipes/vents/pump,
+/obj/structure/surface/table/almayer,
 /turf/open/floor/almayer{
 	icon_state = "redfull"
 	},
@@ -27352,8 +27398,15 @@
 	},
 /area/almayer/hull/upper_hull/u_m_p)
 "csG" = (
-/obj/structure/bed/chair/comfy/delta,
-/obj/item/trash/popcorn,
+/obj/structure/surface/table/almayer,
+/obj/item/device/flashlight/lamp{
+	pixel_x = 15
+	},
+/obj/item/paper,
+/obj/item/reagent_container/food/drinks/cans/waterbottle{
+	pixel_x = -10;
+	pixel_y = 4
+	},
 /turf/open/floor/almayer{
 	icon_state = "bluefull"
 	},
@@ -27447,6 +27500,15 @@
 	icon_state = "test_floor4"
 	},
 /area/almayer/shipboard/brig/cryo)
+"cum" = (
+/obj/structure/pipes/standard/simple/hidden/supply,
+/obj/structure/bed/chair/comfy/charlie{
+	dir = 4
+	},
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/living/briefing)
 "cus" = (
 /obj/docking_port/stationary/lifeboat_dock/starboard,
 /turf/open/floor/almayer_hull{
@@ -27592,6 +27654,13 @@
 	icon_state = "test_floor4"
 	},
 /area/almayer/shipboard/brig/main_office)
+"cxZ" = (
+/obj/structure/bed/chair/comfy/delta,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/living/briefing)
 "cyo" = (
 /obj/structure/machinery/vending/cigarette,
 /turf/open/floor/almayer{
@@ -27959,7 +28028,9 @@
 	pixel_x = -27
 	},
 /obj/structure/pipes/standard/simple/hidden/supply,
-/turf/open/floor/almayer,
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
 /area/almayer/living/briefing)
 "cEO" = (
 /obj/structure/largecrate/supply/floodlights,
@@ -28116,6 +28187,13 @@
 	},
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/hull/lower_hull/l_f_s)
+"cIl" = (
+/obj/structure/pipes/standard/simple/hidden/supply,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/living/briefing)
 "cIr" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -28261,11 +28339,17 @@
 	},
 /area/almayer/engineering/upper_engineering/port)
 "cKX" = (
-/obj/structure/platform,
 /obj/structure/pipes/vents/scrubber{
 	dir = 4
 	},
-/turf/open/floor/almayer,
+/obj/structure/surface/table/almayer,
+/obj/structure/machinery/computer/emails{
+	pixel_x = 2;
+	pixel_y = 5
+	},
+/turf/open/floor/almayer{
+	icon_state = "bluefull"
+	},
 /area/almayer/living/briefing)
 "cKY" = (
 /obj/structure/machinery/light,
@@ -29357,12 +29441,13 @@
 	},
 /area/almayer/hallways/starboard_umbilical)
 "diw" = (
-/obj/structure/bed/chair/comfy/delta,
 /obj/structure/machinery/light{
 	dir = 8
 	},
+/obj/structure/bed/chair/comfy/delta,
+/obj/effect/decal/cleanable/dirt,
 /turf/open/floor/almayer{
-	icon_state = "bluefull"
+	icon_state = "plate"
 	},
 /area/almayer/living/briefing)
 "diz" = (
@@ -29547,10 +29632,10 @@
 	},
 /area/almayer/living/briefing)
 "dkH" = (
-/obj/structure/bed/chair/comfy/delta,
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 6
 	},
+/obj/structure/bed/chair/comfy/delta,
 /turf/open/floor/almayer{
 	icon_state = "bluefull"
 	},
@@ -29949,12 +30034,12 @@
 "drp" = (
 /obj/structure/toilet{
 	dir = 8;
-	pixel_y = 8;
-	layer = 2.9
+	layer = 2.9;
+	pixel_y = 8
 	},
 /obj/structure/window{
-	pixel_y = -2;
-	layer = 2.95
+	layer = 2.95;
+	pixel_y = -2
 	},
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/living/commandbunks)
@@ -30391,7 +30476,9 @@
 	dir = 8
 	},
 /obj/structure/pipes/standard/simple/hidden/supply,
-/turf/open/floor/almayer,
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
 /area/almayer/living/briefing)
 "dAX" = (
 /obj/structure/machinery/camera/autoname/almayer{
@@ -31506,6 +31593,17 @@
 	},
 /turf/open/floor/almayer,
 /area/almayer/living/chapel)
+"dYH" = (
+/obj/structure/machinery/light{
+	dir = 1
+	},
+/obj/structure/bed/chair/comfy/alpha{
+	dir = 8
+	},
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/living/briefing)
 "dYK" = (
 /obj/item/folder/red{
 	desc = "A red folder. The previous contents are a mystery, though the number 28 has been written on the inside of each flap numerous times. Smells faintly of cough syrup.";
@@ -32256,6 +32354,22 @@
 	dir = 1
 	},
 /area/almayer/medical/containment/cell)
+"elX" = (
+/obj/structure/surface/table/almayer,
+/obj/item/trash/uscm_mre,
+/obj/effect/decal/cleanable/dirt,
+/obj/item/device/flashlight/lamp{
+	layer = 3.3;
+	pixel_x = 15
+	},
+/obj/item/reagent_container/food/drinks/cans/souto/diet/grape{
+	pixel_x = -7;
+	pixel_y = 10
+	},
+/turf/open/floor/almayer{
+	icon_state = "emeraldfull"
+	},
+/area/almayer/living/briefing)
 "eme" = (
 /obj/structure/pipes/vents/pump{
 	dir = 4
@@ -32398,10 +32512,6 @@
 	},
 /area/almayer/hallways/aft_hallway)
 "epq" = (
-/obj/structure/stairs/perspective{
-	dir = 1;
-	icon_state = "p_stair_full"
-	},
 /obj/structure/sign/poster{
 	desc = "One of those hot, tanned babes back the beaches of good ol' Earth.";
 	icon_state = "poster12";
@@ -32409,7 +32519,13 @@
 	pixel_x = 27;
 	serial_number = 12
 	},
-/turf/open/floor/almayer,
+/obj/structure/bed/chair/comfy/delta{
+	dir = 8
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
 /area/almayer/living/briefing)
 "epu" = (
 /obj/structure/machinery/door/firedoor/border_only/almayer,
@@ -32722,27 +32838,27 @@
 "euM" = (
 /obj/structure/surface/table/woodentable/fancy,
 /obj/item/paper_bin/uscm{
-	pixel_y = 7;
-	pixel_x = -17
+	pixel_x = -17;
+	pixel_y = 7
 	},
 /obj/item/tool/pen/clicky{
 	pixel_x = -13;
 	pixel_y = -1
 	},
 /obj/item/tool/pen/clicky{
-	pixel_y = 5;
-	pixel_x = -13
+	pixel_x = -13;
+	pixel_y = 5
 	},
 /obj/structure/machinery/door_control{
 	id = "CO-Office";
 	name = "Door Control";
 	normaldoorcontrol = 1;
-	req_access_txt = "31";
-	pixel_y = 7
+	pixel_y = 7;
+	req_access_txt = "31"
 	},
 /obj/item/ashtray/bronze{
-	pixel_y = 1;
-	pixel_x = 12
+	pixel_x = 12;
+	pixel_y = 1
 	},
 /turf/open/floor/carpet,
 /area/almayer/living/commandbunks)
@@ -33140,8 +33256,6 @@
 	},
 /area/almayer/lifeboat_pumps/south2)
 "eCS" = (
-/obj/structure/bed/chair/comfy/delta,
-/obj/item/trash/popcorn,
 /obj/structure/pipes/standard/manifold/hidden/supply{
 	dir = 1
 	},
@@ -34419,6 +34533,17 @@
 	icon_state = "sterile_green_side"
 	},
 /area/almayer/medical/operating_room_two)
+"ffl" = (
+/obj/structure/surface/table/almayer,
+/obj/effect/landmark/map_item,
+/obj/item/paper_bin/uscm{
+	pixel_x = -7;
+	pixel_y = 6
+	},
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/living/briefing)
 "ffE" = (
 /turf/open/floor/almayer/no_build{
 	icon_state = "plating"
@@ -34559,17 +34684,17 @@
 "fiP" = (
 /obj/structure/surface/table/woodentable/fancy,
 /obj/item/storage/fancy/cigar{
-	pixel_y = 2;
 	layer = 3.04;
-	pixel_x = -2
+	pixel_x = -2;
+	pixel_y = 2
 	},
 /obj/item/reagent_container/food/drinks/bottle/sake{
 	pixel_x = -11;
 	pixel_y = 16
 	},
 /obj/item/reagent_container/food/drinks/bottle/sake{
-	pixel_y = 16;
-	pixel_x = -2
+	pixel_x = -2;
+	pixel_y = 16
 	},
 /obj/item/reagent_container/food/drinks/bottle/sake{
 	pixel_x = 7;
@@ -35067,16 +35192,16 @@
 /area/almayer/hull/upper_hull/u_f_s)
 "fuR" = (
 /obj/structure/bed/bedroll{
-	name = "cat bed";
 	desc = "A bed of cotton fabric, purposely made for a cat to comfortably sleep on.";
+	name = "cat bed";
 	pixel_y = 0
 	},
 /mob/living/simple_animal/cat/Jones{
 	dir = 8
 	},
 /obj/structure/machinery/firealarm{
-	pixel_y = 28;
-	pixel_x = -1
+	pixel_x = -1;
+	pixel_y = 28
 	},
 /turf/open/floor/wood/ship,
 /area/almayer/living/commandbunks)
@@ -35391,6 +35516,15 @@
 	},
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/command/lifeboat)
+"fCt" = (
+/obj/structure/bed/chair/comfy/delta{
+	dir = 8
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/living/briefing)
 "fCL" = (
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 4
@@ -35640,6 +35774,17 @@
 	},
 /turf/open/floor/plating,
 /area/almayer/hull/lower_hull/l_f_p)
+"fHe" = (
+/obj/structure/surface/table/almayer,
+/obj/item/device/flashlight/lamp{
+	layer = 3.3;
+	pixel_x = 15
+	},
+/obj/item/prop/helmetgarb/helmet_nvg/cosmetic,
+/turf/open/floor/almayer{
+	icon_state = "redfull"
+	},
+/area/almayer/living/briefing)
 "fHh" = (
 /obj/structure/disposalpipe/segment{
 	dir = 8;
@@ -35970,6 +36115,17 @@
 	},
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/hallways/hangar)
+"fNu" = (
+/obj/structure/surface/table/almayer,
+/obj/item/paper,
+/obj/item/tool/pen{
+	pixel_x = -5;
+	pixel_y = 2
+	},
+/turf/open/floor/almayer{
+	icon_state = "redfull"
+	},
+/area/almayer/living/briefing)
 "fNA" = (
 /obj/structure/closet/fireaxecabinet{
 	pixel_y = 32
@@ -36510,6 +36666,12 @@
 	icon_state = "plate"
 	},
 /area/almayer/hull/upper_hull/u_f_p)
+"gcw" = (
+/obj/structure/bed/chair/comfy/bravo,
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/living/briefing)
 "gcK" = (
 /obj/structure/machinery/light/small{
 	dir = 1
@@ -36913,7 +37075,10 @@
 /obj/structure/pipes/standard/manifold/hidden/supply{
 	dir = 8
 	},
-/turf/open/floor/almayer,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
 /area/almayer/living/briefing)
 "gkK" = (
 /obj/structure/pipes/standard/simple/hidden/supply,
@@ -36993,6 +37158,16 @@
 	icon_state = "plate"
 	},
 /area/almayer/shipboard/starboard_point_defense)
+"gmp" = (
+/obj/structure/surface/table/almayer,
+/obj/item/device/flashlight/lamp{
+	layer = 3.3;
+	pixel_x = 15
+	},
+/turf/open/floor/almayer{
+	icon_state = "redfull"
+	},
+/area/almayer/living/briefing)
 "gms" = (
 /obj/structure/pipes/standard/simple/hidden/supply,
 /turf/open/floor/almayer{
@@ -37929,17 +38104,24 @@
 /area/almayer/command/combat_correspondent)
 "gGo" = (
 /obj/structure/surface/table/almayer,
-/obj/effect/landmark/map_item{
-	pixel_x = -8
+/obj/structure/machinery/firealarm{
+	pixel_y = 28
 	},
-/obj/item/toy/plush/therapy/red{
-	desc = "A USCM approved plush doll. It's not soft and hardly comforting!";
-	force = 15;
-	layer = 4.1;
-	name = "Sergeant Huggs";
-	pixel_x = 7;
-	pixel_y = -1;
-	throwforce = 15
+/obj/structure/prop/holidays/string_lights{
+	dir = 8;
+	pixel_x = 29
+	},
+/obj/item/reagent_container/food/condiment/hotsauce/cholula{
+	pixel_x = 10;
+	pixel_y = 14
+	},
+/obj/item/trash/USCMtray{
+	pixel_x = -4;
+	pixel_y = 4
+	},
+/obj/item/reagent_container/food/snacks/hotdog{
+	pixel_x = -7;
+	pixel_y = 5
 	},
 /turf/open/floor/almayer{
 	icon_state = "plate"
@@ -38112,10 +38294,10 @@
 	},
 /area/almayer/shipboard/port_missiles)
 "gKH" = (
-/obj/structure/bed/chair/comfy/charlie,
 /obj/item/trash/uscm_mre,
+/obj/structure/bed/chair/comfy/charlie,
 /turf/open/floor/almayer{
-	icon_state = "emeraldfull"
+	icon_state = "plate"
 	},
 /area/almayer/living/briefing)
 "gKJ" = (
@@ -38295,7 +38477,6 @@
 	},
 /area/almayer/engineering/engine_core)
 "gNi" = (
-/obj/structure/bed/chair/comfy/delta,
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 4
 	},
@@ -38328,6 +38509,18 @@
 /obj/effect/spawner/random/tool,
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/hull/lower_hull/l_m_p)
+"gOm" = (
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 6
+	},
+/obj/structure/bed/chair/comfy/bravo{
+	dir = 4
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/living/briefing)
 "gOs" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "N";
@@ -38605,6 +38798,18 @@
 /obj/structure/pipes/standard/manifold/hidden/supply,
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/lifeboat_pumps/north2)
+"gVm" = (
+/obj/structure/bed/chair/comfy/bravo{
+	dir = 4
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/sign/arcturianstopsign{
+	pixel_y = 32
+	},
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/living/briefing)
 "gVq" = (
 /obj/structure/machinery/light,
 /obj/effect/decal/warning_stripes{
@@ -39344,6 +39549,13 @@
 	icon_state = "test_floor4"
 	},
 /area/almayer/living/grunt_rnr)
+"hjT" = (
+/obj/structure/bed/chair/comfy/alpha,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/living/briefing)
 "hki" = (
 /obj/structure/machinery/cm_vending/sorted/tech/electronics_storage,
 /turf/open/floor/almayer{
@@ -39516,6 +39728,17 @@
 	icon_state = "sterile_green"
 	},
 /area/almayer/medical/hydroponics)
+"hnH" = (
+/obj/structure/surface/table/almayer,
+/obj/effect/decal/cleanable/dirt,
+/obj/item/prop/magazine/boots/n117{
+	pixel_x = 2;
+	pixel_y = 5
+	},
+/turf/open/floor/almayer{
+	icon_state = "bluefull"
+	},
+/area/almayer/living/briefing)
 "hnV" = (
 /obj/structure/machinery/light,
 /turf/open/floor/almayer,
@@ -40151,19 +40374,19 @@
 "hBW" = (
 /obj/structure/surface/table/woodentable/fancy,
 /obj/item/device/flashlight/lamp/green{
-	pixel_y = 20;
-	pixel_x = -7
+	pixel_x = -7;
+	pixel_y = 20
 	},
 /obj/item/ashtray/bronze{
-	pixel_y = 19;
-	pixel_x = 4
+	pixel_x = 4;
+	pixel_y = 19
 	},
 /obj/structure/machinery/light{
 	dir = 8
 	},
 /obj/effect/landmark/map_item{
-	pixel_y = 3;
-	pixel_x = -1
+	pixel_x = -1;
+	pixel_y = 3
 	},
 /turf/open/floor/wood/ship,
 /area/almayer/living/commandbunks)
@@ -40305,6 +40528,15 @@
 /obj/structure/largecrate/random/barrel/red,
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/hull/upper_hull/u_f_p)
+"hFX" = (
+/obj/structure/pipes/standard/simple/hidden/supply,
+/obj/structure/bed/chair/comfy/bravo{
+	dir = 4
+	},
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/living/briefing)
 "hGa" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "N";
@@ -40399,6 +40631,23 @@
 	icon_state = "plate"
 	},
 /area/almayer/hull/upper_hull/u_a_p)
+"hIt" = (
+/obj/structure/surface/table/almayer,
+/obj/effect/decal/cleanable/dirt,
+/obj/item/tool/kitchen/tray{
+	pixel_y = 9
+	},
+/obj/item/device/flashlight/lamp{
+	pixel_x = 15
+	},
+/obj/item/reagent_container/food/snacks/meatpizzaslice{
+	pixel_x = -5;
+	pixel_y = 7
+	},
+/turf/open/floor/almayer{
+	icon_state = "emeraldfull"
+	},
+/area/almayer/living/briefing)
 "hII" = (
 /obj/structure/machinery/cm_vending/gear/tl{
 	density = 0;
@@ -40574,6 +40823,14 @@
 	icon_state = "plate"
 	},
 /area/almayer/hull/upper_hull/u_f_s)
+"hMJ" = (
+/obj/structure/bed/chair/comfy/bravo{
+	dir = 1
+	},
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/living/briefing)
 "hMN" = (
 /obj/structure/machinery/power/apc/almayer,
 /turf/open/floor/almayer{
@@ -41356,6 +41613,22 @@
 	icon_state = "kitchen"
 	},
 /area/almayer/living/grunt_rnr)
+"idJ" = (
+/obj/structure/surface/table/almayer,
+/obj/effect/decal/cleanable/dirt,
+/obj/item/device/flashlight/lamp{
+	layer = 3.3;
+	pixel_x = 15
+	},
+/obj/item/paper,
+/obj/item/tool/pen{
+	pixel_x = -5;
+	pixel_y = 2
+	},
+/turf/open/floor/almayer{
+	icon_state = "orangefull"
+	},
+/area/almayer/living/briefing)
 "idX" = (
 /obj/structure/pipes/vents/pump,
 /turf/open/floor/prison{
@@ -42459,14 +42732,14 @@
 	},
 /area/almayer/living/offices)
 "izr" = (
-/obj/structure/bed/chair/comfy/alpha{
-	dir = 1
-	},
 /obj/structure/sign/poster/propaganda{
 	pixel_x = -27
 	},
+/obj/structure/bed/chair/comfy/alpha{
+	dir = 1
+	},
 /turf/open/floor/almayer{
-	icon_state = "redfull"
+	icon_state = "plate"
 	},
 /area/almayer/living/briefing)
 "izx" = (
@@ -42732,6 +43005,21 @@
 	},
 /turf/open/floor/wood/ship,
 /area/almayer/shipboard/sea_office)
+"iFG" = (
+/obj/structure/machinery/light{
+	dir = 1
+	},
+/obj/structure/bed/chair/comfy/bravo{
+	dir = 4
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/barricade/deployable{
+	dir = 4
+	},
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/living/briefing)
 "iFH" = (
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 9
@@ -42823,8 +43111,8 @@
 /area/almayer/living/grunt_rnr)
 "iIm" = (
 /obj/structure/machinery/door/airlock/almayer/generic{
-	name = "\improper Bathroom";
-	dir = 2
+	dir = 2;
+	name = "\improper Bathroom"
 	},
 /obj/structure/machinery/door/firedoor/border_only/almayer{
 	dir = 1
@@ -43458,13 +43746,18 @@
 /turf/open/floor/almayer,
 /area/almayer/hallways/hangar)
 "iWE" = (
-/obj/structure/platform{
-	dir = 1
-	},
 /obj/structure/pipes/vents/pump{
 	dir = 4
 	},
-/turf/open/floor/almayer,
+/obj/structure/bed/chair/comfy/bravo{
+	dir = 4
+	},
+/obj/structure/barricade/deployable{
+	dir = 4
+	},
+/turf/open/floor/almayer{
+	icon_state = "orangefull"
+	},
 /area/almayer/living/briefing)
 "iWL" = (
 /obj/structure/pipes/standard/simple/hidden/supply,
@@ -43493,6 +43786,11 @@
 	icon_state = "bluefull"
 	},
 /area/almayer/living/briefing)
+"iXd" = (
+/turf/open/floor/almayer{
+	icon_state = "orangefull"
+	},
+/area/almayer/living/briefing)
 "iXt" = (
 /obj/structure/pipes/standard/simple/hidden/supply,
 /turf/open/floor/almayer{
@@ -43500,6 +43798,15 @@
 	icon_state = "red"
 	},
 /area/almayer/shipboard/brig/processing)
+"iXR" = (
+/obj/structure/bed/chair/comfy/alpha{
+	dir = 1
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/living/briefing)
 "iXT" = (
 /obj/item/trash/uscm_mre,
 /turf/open/floor/almayer,
@@ -45091,6 +45398,15 @@
 	},
 /turf/open/floor/plating,
 /area/almayer/hull/lower_hull/l_f_p)
+"jEI" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/machinery/computer/cameras/wooden_tv/prop{
+	pixel_y = 29
+	},
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/living/briefing)
 "jEX" = (
 /obj/structure/surface/table/woodentable/fancy,
 /obj/item/folder/black{
@@ -45098,8 +45414,8 @@
 	},
 /obj/item/folder/yellow,
 /obj/item/device/flashlight/lamp/green{
-	pixel_y = 8;
-	pixel_x = -16
+	pixel_x = -16;
+	pixel_y = 8
 	},
 /turf/open/floor/carpet,
 /area/almayer/living/commandbunks)
@@ -45246,6 +45562,15 @@
 	},
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/medical/morgue)
+"jIG" = (
+/obj/structure/bed/chair/comfy/charlie{
+	dir = 4
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/living/briefing)
 "jIV" = (
 /obj/structure/surface/rack,
 /obj/item/book/manual/marine_law{
@@ -45827,9 +46152,6 @@
 /turf/open/floor/almayer,
 /area/almayer/engineering/engineering_workshop/hangar)
 "jUo" = (
-/obj/structure/bed/chair/comfy/bravo{
-	dir = 1
-	},
 /obj/structure/pipes/standard/manifold/hidden/supply,
 /turf/open/floor/almayer{
 	icon_state = "orangefull"
@@ -46060,6 +46382,16 @@
 	},
 /turf/open/floor/almayer,
 /area/almayer/shipboard/brig/processing)
+"jZr" = (
+/obj/structure/surface/table/almayer,
+/obj/structure/machinery/computer/emails{
+	dir = 1
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/almayer{
+	icon_state = "redfull"
+	},
+/area/almayer/living/briefing)
 "jZs" = (
 /obj/structure/machinery/light/containment{
 	dir = 4
@@ -46368,6 +46700,16 @@
 	icon_state = "silver"
 	},
 /area/almayer/shipboard/brig/cic_hallway)
+"kfG" = (
+/obj/structure/surface/table/almayer,
+/obj/effect/decal/cleanable/dirt,
+/obj/item/device/flashlight/lamp{
+	pixel_x = 15
+	},
+/turf/open/floor/almayer{
+	icon_state = "bluefull"
+	},
+/area/almayer/living/briefing)
 "kfN" = (
 /obj/structure/closet/secure_closet/brig,
 /turf/open/floor/almayer{
@@ -47147,6 +47489,13 @@
 	icon_state = "dark_sterile"
 	},
 /area/almayer/engineering/laundry)
+"kxF" = (
+/obj/structure/bed/chair/comfy/charlie,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/living/briefing)
 "kxL" = (
 /obj/structure/closet/coffin/woodencrate,
 /obj/structure/largecrate/random/mini/wooden{
@@ -47766,11 +48115,20 @@
 	},
 /area/almayer/hull/lower_hull/l_f_s)
 "kKL" = (
-/obj/structure/stairs/perspective{
-	dir = 4;
-	icon_state = "p_stair_sn_full_cap"
+/obj/structure/bed/chair/comfy/bravo{
+	dir = 4
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/sign/poster{
+	desc = "YOU ALWAYS KNOW A WORKING JOE. YOU ALWAYS KNOW A WORKING JOE. YOU ALWAYS KNOW A WORKING JOE. YOU ALWAYS KNOW A WORKING JOE. YOU ALWAYS KNOW A WORKING JOE.";
+	icon_state = "poster11";
+	name = "YOU ALWAYS KNOW A WORKING JOE.";
+	pixel_x = -27;
+	serial_number = 11
+	},
+/turf/open/floor/almayer{
+	icon_state = "plate"
 	},
-/turf/open/floor/almayer,
 /area/almayer/living/briefing)
 "kKR" = (
 /obj/structure/pipes/vents/pump{
@@ -48090,11 +48448,13 @@
 /obj/structure/bed/chair/comfy/bravo{
 	dir = 1
 	},
-/obj/structure/machinery/light{
-	dir = 4
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/prop/holidays/string_lights{
+	dir = 8;
+	pixel_x = 29
 	},
 /turf/open/floor/almayer{
-	icon_state = "orangefull"
+	icon_state = "plate"
 	},
 /area/almayer/living/briefing)
 "kRd" = (
@@ -48202,14 +48562,16 @@
 	},
 /area/almayer/command/telecomms)
 "kTx" = (
-/obj/structure/stairs/perspective{
-	dir = 1;
-	icon_state = "p_stair_full"
-	},
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 5
 	},
-/turf/open/floor/almayer,
+/obj/structure/bed/chair/comfy/charlie{
+	dir = 4
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
 /area/almayer/living/briefing)
 "kTM" = (
 /obj/item/frame/rack{
@@ -48400,6 +48762,13 @@
 	icon_state = "sterile_green_side"
 	},
 /area/almayer/medical/medical_science)
+"kXH" = (
+/obj/structure/bed/chair/comfy/delta,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/almayer{
+	icon_state = "bluefull"
+	},
+/area/almayer/living/briefing)
 "kXJ" = (
 /obj/structure/surface/table/reinforced/almayer_B,
 /obj/structure/machinery/computer/secure_data{
@@ -48505,6 +48874,23 @@
 	icon_state = "mono"
 	},
 /area/almayer/medical/hydroponics)
+"lad" = (
+/obj/structure/surface/table/almayer,
+/obj/effect/decal/cleanable/dirt,
+/obj/item/device/flashlight/lamp{
+	layer = 3.3;
+	pixel_x = 15
+	},
+/obj/item/tool/kitchen/tray{
+	pixel_y = 9
+	},
+/obj/item/reagent_container/food/snacks/sliceable/pizza/vegetablepizza{
+	pixel_y = 8
+	},
+/turf/open/floor/almayer{
+	icon_state = "emeraldfull"
+	},
+/area/almayer/living/briefing)
 "lah" = (
 /turf/open/floor/almayer{
 	dir = 6;
@@ -48535,8 +48921,8 @@
 /obj/structure/safe/co_office,
 /obj/item/weapon/pole/fancy_cane,
 /obj/item/tool/lighter/zippo/gold{
-	pixel_y = 3;
-	layer = 3.05
+	layer = 3.05;
+	pixel_y = 3
 	},
 /turf/open/floor/wood/ship,
 /area/almayer/living/commandbunks)
@@ -48658,8 +49044,9 @@
 /area/almayer/shipboard/brig/chief_mp_office)
 "ldj" = (
 /obj/structure/pipes/vents/pump,
-/obj/structure/platform,
-/turf/open/floor/almayer,
+/turf/open/floor/almayer{
+	icon_state = "emeraldfull"
+	},
 /area/almayer/living/briefing)
 "ldl" = (
 /obj/structure/sign/safety/maint{
@@ -48989,6 +49376,15 @@
 /obj/effect/landmark/late_join/bravo,
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/squads/bravo)
+"ljz" = (
+/obj/structure/pipes/standard/simple/hidden/supply,
+/obj/structure/bed/chair/comfy/delta{
+	dir = 8
+	},
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/living/briefing)
 "ljG" = (
 /obj/structure/closet/crate/freezer,
 /obj/item/reagent_container/food/condiment/coldsauce,
@@ -51307,6 +51703,19 @@
 	icon_state = "cargo_arrow"
 	},
 /area/almayer/squads/charlie_delta_shared)
+"mgR" = (
+/obj/structure/surface/table/almayer,
+/obj/item/prop/magazine/dirty{
+	pixel_y = 5
+	},
+/obj/item/tool/pen{
+	pixel_x = 4;
+	pixel_y = 6
+	},
+/turf/open/floor/almayer{
+	icon_state = "bluefull"
+	},
+/area/almayer/living/briefing)
 "mha" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "SE-out";
@@ -52032,6 +52441,11 @@
 	icon_state = "sterile_green_side"
 	},
 /area/almayer/medical/lower_medical_lobby)
+"mwz" = (
+/turf/open/floor/almayer{
+	icon_state = "emeraldfull"
+	},
+/area/almayer/living/briefing)
 "mwA" = (
 /obj/structure/disposalpipe/segment{
 	dir = 8;
@@ -52753,18 +53167,22 @@
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/hallways/port_hallway)
 "mLb" = (
-/obj/structure/platform{
-	dir = 1
+/obj/structure/surface/table/almayer,
+/obj/item/toy/deck{
+	pixel_x = -6;
+	pixel_y = -2
 	},
 /obj/item/toy/deck/uno{
 	pixel_x = 6;
 	pixel_y = -1
 	},
-/obj/item/toy/deck{
-	pixel_x = -6;
-	pixel_y = -2
+/obj/structure/prop/holidays/string_lights{
+	dir = 8;
+	pixel_x = 29
+	},
+/turf/open/floor/almayer{
+	icon_state = "plate"
 	},
-/turf/open/floor/almayer,
 /area/almayer/living/briefing)
 "mLu" = (
 /obj/effect/decal/warning_stripes{
@@ -53275,7 +53693,13 @@
 	pixel_x = -27
 	},
 /obj/structure/pipes/standard/simple/hidden/supply,
-/turf/open/floor/almayer,
+/obj/structure/bed/chair/comfy/charlie{
+	dir = 4
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
 /area/almayer/living/briefing)
 "mWe" = (
 /obj/structure/machinery/camera/autoname/almayer{
@@ -54244,6 +54668,20 @@
 	},
 /turf/open/floor/wood/ship,
 /area/almayer/living/commandbunks)
+"npS" = (
+/obj/structure/surface/table/almayer,
+/obj/item/device/flashlight/lamp{
+	layer = 3.3;
+	pixel_x = 15
+	},
+/obj/structure/prop/server_equipment/laptop{
+	pixel_x = -2;
+	pixel_y = 1
+	},
+/turf/open/floor/almayer{
+	icon_state = "orangefull"
+	},
+/area/almayer/living/briefing)
 "nqx" = (
 /obj/structure/pipes/standard/manifold/hidden/supply,
 /turf/open/floor/plating/plating_catwalk,
@@ -54702,11 +55140,12 @@
 /turf/open/floor/almayer,
 /area/almayer/squads/charlie_delta_shared)
 "nza" = (
-/obj/structure/bed/chair/comfy/charlie,
 /obj/structure/pipes/vents/scrubber{
 	dir = 4
 	},
-/obj/item/trash/uscm_mre,
+/obj/structure/bed/chair/comfy/charlie{
+	dir = 4
+	},
 /turf/open/floor/almayer{
 	icon_state = "emeraldfull"
 	},
@@ -55156,12 +55595,12 @@
 /turf/open/floor/almayer,
 /area/almayer/living/basketball)
 "nIW" = (
-/obj/structure/bed/chair/comfy/bravo{
-	dir = 1
-	},
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 9
 	},
+/obj/structure/bed/chair/comfy/bravo{
+	dir = 1
+	},
 /turf/open/floor/almayer{
 	icon_state = "orangefull"
 	},
@@ -55209,8 +55648,8 @@
 /area/almayer/command/lifeboat)
 "nKs" = (
 /obj/structure/machinery/cm_vending/clothing/dress{
-	req_access = list(1);
-	pixel_y = 0
+	pixel_y = 0;
+	req_access = list(1)
 	},
 /turf/open/floor/almayer{
 	icon_state = "cargo"
@@ -56079,9 +56518,9 @@
 	dir = 8
 	},
 /obj/item/prop/magazine/boots/n160{
-	pixel_y = -8;
+	layer = 2.8;
 	pixel_x = 4;
-	layer = 2.8
+	pixel_y = -8
 	},
 /obj/effect/decal/warning_stripes{
 	icon_state = "E";
@@ -56425,9 +56864,6 @@
 	},
 /area/almayer/engineering/engine_core)
 "okB" = (
-/obj/structure/bed/chair/comfy/alpha{
-	dir = 1
-	},
 /obj/structure/pipes/vents/scrubber{
 	dir = 4
 	},
@@ -56734,6 +57170,14 @@
 	},
 /turf/open/floor/plating,
 /area/almayer/hull/lower_hull/l_f_p)
+"oqP" = (
+/obj/structure/bed/chair/comfy/delta{
+	dir = 1
+	},
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/living/briefing)
 "oqS" = (
 /obj/structure/toilet{
 	dir = 1
@@ -56975,13 +57419,13 @@
 	},
 /obj/item/reagent_container/food/snacks/carpmeat{
 	layer = 3.3;
-	pixel_y = 11;
-	pixel_x = 8
+	pixel_x = 8;
+	pixel_y = 11
 	},
 /obj/item/reagent_container/food/snacks/carpmeat{
 	layer = 3.3;
-	pixel_y = 11;
-	pixel_x = 8
+	pixel_x = 8;
+	pixel_y = 11
 	},
 /turf/open/floor/carpet,
 /area/almayer/living/commandbunks)
@@ -57306,12 +57750,12 @@
 	pixel_y = 9
 	},
 /obj/item/prop/helmetgarb/rosary{
-	pixel_y = 5;
-	pixel_x = -4
+	pixel_x = -4;
+	pixel_y = 5
 	},
 /obj/item/device/flashlight/lamp{
-	pixel_y = 1;
-	pixel_x = 3
+	pixel_x = 3;
+	pixel_y = 1
 	},
 /turf/open/floor/wood/ship,
 /area/almayer/living/commandbunks)
@@ -57812,6 +58256,13 @@
 	icon_state = "rasputin3"
 	},
 /area/almayer/powered/agent)
+"oMC" = (
+/obj/structure/machinery/light,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/living/briefing)
 "oMH" = (
 /obj/structure/bed/chair{
 	dir = 4
@@ -58550,6 +59001,7 @@
 /obj/item/facepaint/black{
 	pixel_x = -10
 	},
+/obj/effect/decal/cleanable/dirt,
 /turf/open/floor/almayer{
 	icon_state = "plate"
 	},
@@ -59223,8 +59675,8 @@
 	icon_state = "pipe-c"
 	},
 /obj/structure/coatrack{
-	pixel_y = 1;
-	pixel_x = -5
+	pixel_x = -5;
+	pixel_y = 1
 	},
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 5
@@ -60990,10 +61442,13 @@
 	},
 /area/almayer/living/starboard_garden)
 "qgw" = (
-/obj/structure/stairs/perspective{
-	icon_state = "p_stair_sn_full_cap"
+/obj/structure/bed/chair/comfy/alpha{
+	dir = 8
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/almayer{
+	icon_state = "plate"
 	},
-/turf/open/floor/almayer,
 /area/almayer/living/briefing)
 "qgG" = (
 /obj/structure/pipes/standard/manifold/hidden/supply{
@@ -61122,7 +61577,9 @@
 	pixel_x = 27
 	},
 /obj/structure/pipes/standard/simple/hidden/supply,
-/turf/open/floor/almayer,
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
 /area/almayer/living/briefing)
 "qit" = (
 /obj/structure/surface/table/reinforced/almayer_B,
@@ -61319,6 +61776,18 @@
 	icon_state = "sterile_green_corner"
 	},
 /area/almayer/medical/medical_science)
+"qmB" = (
+/obj/structure/bed/chair/comfy/bravo{
+	dir = 1
+	},
+/obj/structure/prop/holidays/string_lights{
+	dir = 8;
+	pixel_x = 29
+	},
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/living/briefing)
 "qmC" = (
 /obj/structure/machinery/door/poddoor/almayer/open{
 	dir = 4;
@@ -61589,6 +62058,15 @@
 	icon_state = "silver"
 	},
 /area/almayer/command/computerlab)
+"qsa" = (
+/obj/structure/bed/chair/comfy/bravo{
+	dir = 1
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/living/briefing)
 "qsd" = (
 /obj/structure/largecrate/random,
 /turf/open/floor/almayer{
@@ -62943,6 +63421,12 @@
 	icon_state = "plate"
 	},
 /area/almayer/squads/delta)
+"qWy" = (
+/obj/structure/bed/chair/comfy/delta,
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/living/briefing)
 "qWI" = (
 /obj/structure/machinery/status_display{
 	pixel_y = -30
@@ -63272,6 +63756,29 @@
 	icon_state = "plate"
 	},
 /area/almayer/hull/upper_hull/u_m_s)
+"rdb" = (
+/obj/structure/surface/table/almayer,
+/obj/effect/decal/cleanable/dirt,
+/obj/item/paper_bin/uscm{
+	pixel_x = 9;
+	pixel_y = 6
+	},
+/obj/item/tool/pen{
+	pixel_x = 9;
+	pixel_y = 2
+	},
+/obj/item/tool/pen{
+	pixel_x = 9;
+	pixel_y = 9
+	},
+/obj/structure/prop/holidays/string_lights{
+	dir = 8;
+	pixel_x = 29
+	},
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/living/briefing)
 "rde" = (
 /obj/structure/sign/prop1,
 /turf/closed/wall/almayer,
@@ -63391,8 +63898,8 @@
 /obj/structure/surface/table/woodentable/fancy,
 /obj/structure/machinery/faxmachine/uscm/command/capt{
 	name = "Commanding Officer's Fax Machine";
-	pixel_y = 3;
-	pixel_x = -4
+	pixel_x = -4;
+	pixel_y = 3
 	},
 /obj/structure/machinery/light{
 	dir = 1
@@ -63446,14 +63953,6 @@
 "rgJ" = (
 /obj/structure/machinery/light,
 /obj/structure/machinery/disposal,
-/obj/item/bananapeel{
-	desc = "An experimental B8 Smart-Scope. Based on the technologies used in the Smart Gun by ARMAT, this sight has integrated IFF systems. It can only attach to the L42A Battle Rifle, M44 Combat Revolver, and M46C Pulse Rifle. This one appears to be covered in gun oil";
-	icon = 'icons/obj/items/weapons/guns/attachments.dmi';
-	icon_state = "iffbarrel";
-	name = "Broken B8 Smart-Scope";
-	pixel_x = -1;
-	pixel_y = 11
-	},
 /obj/structure/disposalpipe/trunk{
 	dir = 1
 	},
@@ -63966,8 +64465,8 @@
 	name = "Commanding Officer's Office";
 	phone_category = "Offices";
 	phone_id = "Commanding Officer's Office";
-	pixel_y = 8;
-	pixel_x = 16
+	pixel_x = 16;
+	pixel_y = 8
 	},
 /turf/open/floor/carpet,
 /area/almayer/living/commandbunks)
@@ -64644,8 +65143,8 @@
 "rEJ" = (
 /obj/structure/machinery/light,
 /obj/structure/flora/pottedplant{
-	pixel_y = 3;
-	pixel_x = -1
+	pixel_x = -1;
+	pixel_y = 3
 	},
 /turf/open/floor/wood/ship,
 /area/almayer/living/commandbunks)
@@ -64711,6 +65210,29 @@
 	icon_state = "sterile_green_side"
 	},
 /area/almayer/medical/lower_medical_medbay)
+"rFV" = (
+/obj/structure/surface/table/almayer,
+/obj/effect/decal/cleanable/dirt,
+/obj/item/device/flashlight/lamp{
+	layer = 3.3;
+	pixel_x = 15
+	},
+/obj/item/paper_bin/uscm{
+	pixel_x = -7;
+	pixel_y = 6
+	},
+/obj/item/tool/pen{
+	pixel_x = -10;
+	pixel_y = 6
+	},
+/obj/item/tool/pen{
+	pixel_x = -10;
+	pixel_y = -2
+	},
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/living/briefing)
 "rFY" = (
 /turf/open/floor/almayer{
 	dir = 5;
@@ -65830,6 +66352,17 @@
 	icon_state = "plating"
 	},
 /area/almayer/hull/lower_hull/l_f_s)
+"sgE" = (
+/obj/structure/pipes/standard/simple/hidden/supply,
+/obj/structure/reagent_dispensers/water_cooler{
+	density = 0;
+	pixel_x = 12;
+	pixel_y = 6
+	},
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/living/briefing)
 "sgM" = (
 /obj/structure/closet/toolcloset,
 /turf/open/floor/almayer{
@@ -66706,6 +67239,18 @@
 	icon_state = "orange"
 	},
 /area/almayer/engineering/ce_room)
+"sBs" = (
+/obj/structure/surface/table/almayer,
+/obj/effect/decal/cleanable/dirt,
+/obj/item/paper,
+/obj/item/tool/pen{
+	pixel_x = -5;
+	pixel_y = 2
+	},
+/turf/open/floor/almayer{
+	icon_state = "redfull"
+	},
+/area/almayer/living/briefing)
 "sBH" = (
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 10
@@ -66977,6 +67522,17 @@
 /obj/structure/mirror,
 /turf/closed/wall/almayer,
 /area/almayer/living/gym)
+"sGX" = (
+/obj/structure/machinery/firealarm{
+	pixel_y = -28
+	},
+/obj/structure/bed/chair/comfy/charlie{
+	dir = 1
+	},
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/living/briefing)
 "sGZ" = (
 /obj/structure/closet/firecloset,
 /turf/open/floor/almayer{
@@ -68096,6 +68652,11 @@
 	icon_state = "plating"
 	},
 /area/almayer/shipboard/brig/armory)
+"tgE" = (
+/turf/open/floor/almayer{
+	icon_state = "redfull"
+	},
+/area/almayer/living/briefing)
 "tgK" = (
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 4
@@ -68143,6 +68704,15 @@
 	icon_state = "cargo_arrow"
 	},
 /area/almayer/squads/alpha_bravo_shared)
+"thE" = (
+/obj/structure/bed/chair/comfy/charlie{
+	dir = 1
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/almayer{
+	icon_state = "emeraldfull"
+	},
+/area/almayer/living/briefing)
 "thL" = (
 /turf/open/floor/wood/ship,
 /area/almayer/shipboard/brig/cells)
@@ -69626,6 +70196,17 @@
 	},
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/hull/upper_hull/u_a_s)
+"tMc" = (
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 10
+	},
+/obj/structure/bed/chair/comfy/alpha{
+	dir = 8
+	},
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/living/briefing)
 "tMf" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "W"
@@ -69869,6 +70450,28 @@
 	icon_state = "plate"
 	},
 /area/almayer/hull/lower_hull/l_a_p)
+"tSv" = (
+/obj/structure/surface/table/almayer,
+/obj/effect/decal/cleanable/dirt,
+/obj/item/device/flashlight/lamp{
+	pixel_x = 15
+	},
+/obj/item/paper_bin/uscm{
+	pixel_x = -7;
+	pixel_y = 6
+	},
+/obj/item/tool/pen{
+	pixel_x = -9;
+	pixel_y = 3
+	},
+/obj/item/tool/pen{
+	pixel_x = 4;
+	pixel_y = -4
+	},
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/living/briefing)
 "tSw" = (
 /obj/structure/pipes/standard/simple/hidden/supply,
 /turf/open/floor/almayer{
@@ -70442,6 +71045,10 @@
 /obj/structure/machinery/firealarm{
 	pixel_y = -28
 	},
+/obj/structure/bed/chair/comfy/delta{
+	dir = 8
+	},
+/obj/effect/decal/cleanable/dirt,
 /turf/open/floor/almayer{
 	icon_state = "plate"
 	},
@@ -70752,11 +71359,13 @@
 /turf/open/floor/plating,
 /area/almayer/engineering/engineering_workshop/hangar)
 "ukA" = (
-/obj/structure/platform,
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 4
 	},
-/turf/open/floor/almayer,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/almayer{
+	icon_state = "emeraldfull"
+	},
 /area/almayer/living/briefing)
 "ukS" = (
 /obj/structure/disposalpipe/segment{
@@ -71545,6 +72154,25 @@
 	icon_state = "dark_sterile"
 	},
 /area/almayer/medical/chemistry)
+"uzb" = (
+/obj/structure/surface/table/almayer,
+/obj/item/device/flashlight/lamp{
+	layer = 3.3;
+	pixel_x = 15
+	},
+/obj/item/tool/screwdriver,
+/obj/item/bananapeel{
+	desc = "An experimental B8 Smart-Scope. Based on the technologies used in the Smart Gun by ARMAT, this sight has integrated IFF systems. It can only attach to the L42A Battle Rifle, M44 Combat Revolver, and M46C Pulse Rifle. This one appears to be covered in gun oil";
+	icon = 'icons/obj/items/weapons/guns/attachments.dmi';
+	icon_state = "iffbarrel";
+	name = "Broken B8 Smart-Scope";
+	pixel_x = -3;
+	pixel_y = 7
+	},
+/turf/open/floor/almayer{
+	icon_state = "orangefull"
+	},
+/area/almayer/living/briefing)
 "uzg" = (
 /obj/structure/sign/safety/water{
 	pixel_x = 8;
@@ -72118,6 +72746,14 @@
 	},
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/engineering/upper_engineering/starboard)
+"uLe" = (
+/obj/structure/pipes/standard/manifold/hidden/supply{
+	dir = 4
+	},
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/living/briefing)
 "uLn" = (
 /obj/structure/pipes/standard/simple/hidden/supply,
 /turf/open/floor/almayer,
@@ -72767,6 +73403,17 @@
 /obj/structure/window/framed/almayer,
 /turf/open/floor/plating,
 /area/almayer/hallways/repair_bay)
+"uZX" = (
+/obj/structure/surface/table/almayer,
+/obj/item/paper{
+	pixel_x = -4;
+	pixel_y = 5
+	},
+/obj/item/tool/pen,
+/turf/open/floor/almayer{
+	icon_state = "bluefull"
+	},
+/area/almayer/living/briefing)
 "uZZ" = (
 /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{
 	name = "\improper Basketball Court"
@@ -73316,8 +73963,8 @@
 	icon_state = "pottedplant_21"
 	},
 /obj/structure/sign/poster/io{
-	pixel_y = 32;
-	name = "propaganda poster"
+	name = "propaganda poster";
+	pixel_y = 32
 	},
 /obj/structure/sign/safety/escapepod{
 	pixel_x = -17
@@ -73418,6 +74065,15 @@
 	icon_state = "test_floor4"
 	},
 /area/almayer/shipboard/brig/general_equipment)
+"vkN" = (
+/obj/structure/bed/chair/comfy/charlie{
+	dir = 1
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/living/briefing)
 "vkR" = (
 /obj/structure/machinery/power/apc/almayer{
 	dir = 1
@@ -73466,7 +74122,9 @@
 	dir = 4
 	},
 /obj/structure/pipes/standard/simple/hidden/supply,
-/turf/open/floor/almayer,
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
 /area/almayer/living/briefing)
 "vlX" = (
 /obj/structure/machinery/cm_vending/sorted/cargo_guns/squad_prep,
@@ -73581,19 +74239,25 @@
 	},
 /area/almayer/lifeboat_pumps/south1)
 "vpt" = (
-/obj/structure/bed/chair/comfy/bravo{
-	dir = 1
+/obj/structure/surface/table/almayer,
+/obj/item/paper_bin/uscm{
+	pixel_x = 9;
+	pixel_y = 6
 	},
-/obj/structure/sign/poster{
-	desc = "YOU ALWAYS KNOW A WORKING JOE. YOU ALWAYS KNOW A WORKING JOE. YOU ALWAYS KNOW A WORKING JOE. YOU ALWAYS KNOW A WORKING JOE. YOU ALWAYS KNOW A WORKING JOE.";
-	icon_state = "poster11";
-	name = "YOU ALWAYS KNOW A WORKING JOE.";
-	pixel_x = 27;
-	serial_number = 11
+/obj/item/tool/pen{
+	pixel_x = 9;
+	pixel_y = 2
+	},
+/obj/item/tool/pen{
+	pixel_x = 9;
+	pixel_y = 9
+	},
+/obj/structure/prop/holidays/string_lights{
+	dir = 8;
+	pixel_x = 29
 	},
-/obj/item/stack/folding_barricade,
 /turf/open/floor/almayer{
-	icon_state = "orangefull"
+	icon_state = "plate"
 	},
 /area/almayer/living/briefing)
 "vpI" = (
@@ -74137,12 +74801,15 @@
 /turf/open/floor/almayer,
 /area/almayer/engineering/upper_engineering/port)
 "vyU" = (
-/obj/structure/bed/chair/comfy/charlie,
 /obj/structure/machinery/light{
 	dir = 4
 	},
+/obj/structure/bed/chair/comfy/charlie{
+	dir = 1
+	},
+/obj/effect/decal/cleanable/dirt,
 /turf/open/floor/almayer{
-	icon_state = "emeraldfull"
+	icon_state = "plate"
 	},
 /area/almayer/living/briefing)
 "vzl" = (
@@ -74358,11 +75025,15 @@
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/living/synthcloset)
 "vEn" = (
-/obj/structure/bed/chair/comfy/bravo{
-	dir = 1
+/obj/structure/surface/table/almayer,
+/obj/item/device/flashlight/lamp{
+	layer = 3.3;
+	pixel_x = 15
 	},
-/obj/item/stack/sheet/mineral/uranium{
-	layer = 2.99
+/obj/item/paper,
+/obj/item/tool/pen{
+	pixel_x = -5;
+	pixel_y = 2
 	},
 /turf/open/floor/almayer{
 	icon_state = "orangefull"
@@ -75150,6 +75821,7 @@
 /obj/structure/machinery/firealarm{
 	pixel_y = 28
 	},
+/obj/effect/decal/cleanable/dirt,
 /turf/open/floor/almayer{
 	icon_state = "plate"
 	},
@@ -75582,18 +76254,15 @@
 /area/almayer/hallways/aft_hallway)
 "wbe" = (
 /obj/structure/surface/table/almayer,
-/obj/effect/landmark/map_item{
-	layer = 3.03;
-	pixel_x = 7;
-	pixel_y = 4
-	},
-/obj/item/prop/helmetgarb/spacejam_tickets{
+/obj/item/reagent_container/food/drinks/coffeecup{
 	pixel_x = -8;
-	pixel_y = 5
+	pixel_y = -1
 	},
-/obj/item/prop/helmetgarb/spacejam_tickets{
-	pixel_x = -8;
-	pixel_y = -3
+/obj/item/reagent_container/food/drinks/coffee{
+	pixel_y = 9
+	},
+/obj/item/tool/pen{
+	pixel_x = 5
 	},
 /turf/open/floor/almayer{
 	icon_state = "plate"
@@ -75635,31 +76304,31 @@
 	dir = 8
 	},
 /obj/item/clothing/mask/cigarette/pipe{
-	pixel_y = -7;
-	layer = 2.8
+	layer = 2.8;
+	pixel_y = -7
 	},
 /obj/item/reagent_container/spray/cleaner{
+	layer = 3.04;
 	pixel_x = -4;
-	pixel_y = 7;
-	layer = 3.04
+	pixel_y = 7
 	},
 /obj/structure/machinery/door_control/brbutton{
-	pixel_y = 26;
-	pixel_x = -12;
 	id = "Brig Lockdown Shutters";
-	name = "Brig Lockdown"
+	name = "Brig Lockdown";
+	pixel_x = -12;
+	pixel_y = 26
 	},
 /obj/structure/machinery/door_control/brbutton{
-	pixel_y = 26;
 	id = "ARES StairsLock";
 	name = "ARES Exterior Lockdown Override";
-	pixel_x = -2
+	pixel_x = -2;
+	pixel_y = 26
 	},
 /obj/structure/machinery/door_control/brbutton{
-	pixel_y = 26;
-	pixel_x = 8;
+	id = "ARES Emergency";
 	name = "ARES Emergency Lockdown Override";
-	id = "ARES Emergency"
+	pixel_x = 8;
+	pixel_y = 26
 	},
 /turf/open/floor/wood/ship,
 /area/almayer/living/commandbunks)
@@ -75893,8 +76562,8 @@
 	pixel_y = 9
 	},
 /obj/item/paper_bin/uscm{
-	pixel_y = 6;
-	pixel_x = 7
+	pixel_x = 7;
+	pixel_y = 6
 	},
 /obj/item/tool/pen/red/clicky{
 	pixel_x = -6;
@@ -76062,8 +76731,8 @@
 	anchored = 0
 	},
 /obj/structure/sign/poster/io{
-	pixel_y = 32;
-	name = "propaganda poster"
+	name = "propaganda poster";
+	pixel_y = 32
 	},
 /turf/open/floor/wood/ship,
 /area/almayer/command/corporateliason)
@@ -76289,6 +76958,16 @@
 	},
 /turf/open/floor/almayer,
 /area/almayer/lifeboat_pumps/south2)
+"wlH" = (
+/obj/structure/surface/table/almayer,
+/obj/structure/machinery/computer/emails{
+	pixel_x = 2;
+	pixel_y = 5
+	},
+/turf/open/floor/almayer{
+	icon_state = "emeraldfull"
+	},
+/area/almayer/living/briefing)
 "wlK" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "N";
@@ -76566,29 +77245,31 @@
 /turf/open/floor/almayer,
 /area/almayer/shipboard/brig/cic_hallway)
 "wsP" = (
-/obj/structure/platform{
-	dir = 1
-	},
 /obj/item/prop/helmetgarb/gunoil{
 	layer = 4.2;
 	pixel_x = -3;
-	pixel_y = 1
+	pixel_y = 6
 	},
 /obj/item/prop/helmetgarb/gunoil{
 	layer = 4.2;
 	pixel_x = -10;
-	pixel_y = 1
+	pixel_y = 10
 	},
 /obj/item/prop/helmetgarb/gunoil{
 	layer = 4.2;
 	pixel_x = 4;
-	pixel_y = 1
+	pixel_y = 9
 	},
 /obj/item/weapon/broken_bottle{
-	pixel_x = 11;
-	pixel_y = -2
+	layer = 4.51;
+	pixel_x = 9;
+	pixel_y = 1
+	},
+/obj/structure/surface/table/almayer,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/almayer{
+	icon_state = "plate"
 	},
-/turf/open/floor/almayer,
 /area/almayer/living/briefing)
 "wsR" = (
 /obj/structure/machinery/door/firedoor/border_only/almayer,
@@ -76723,13 +77404,8 @@
 	},
 /area/almayer/living/synthcloset)
 "wwk" = (
-/obj/structure/bed/chair/comfy/bravo{
-	dir = 1
-	},
-/obj/item/stack/folding_barricade,
-/obj/item/stack/sheet/mineral/uranium{
-	layer = 2.99
-	},
+/obj/structure/surface/table/almayer,
+/obj/effect/landmark/map_item,
 /turf/open/floor/almayer{
 	icon_state = "orangefull"
 	},
@@ -76933,12 +77609,32 @@
 	},
 /area/almayer/hallways/port_hallway)
 "wAU" = (
-/obj/structure/bed/chair/comfy/delta,
 /obj/structure/sign/poster/music{
 	pixel_x = -27
 	},
+/obj/structure/surface/table/almayer,
+/obj/effect/decal/cleanable/dirt,
+/obj/item/device/flashlight/lamp{
+	pixel_x = 15
+	},
+/obj/item/paper_bin/uscm{
+	pixel_x = -7;
+	pixel_y = 6
+	},
+/obj/item/tool/pen{
+	pixel_x = -10;
+	pixel_y = -1
+	},
+/obj/item/tool/pen{
+	pixel_x = 3;
+	pixel_y = -4
+	},
+/obj/item/tool/pen{
+	pixel_x = -11;
+	pixel_y = 5
+	},
 /turf/open/floor/almayer{
-	icon_state = "bluefull"
+	icon_state = "plate"
 	},
 /area/almayer/living/briefing)
 "wBY" = (
@@ -77321,6 +78017,11 @@
 "wJH" = (
 /turf/closed/wall/almayer/research/containment/wall/east,
 /area/almayer/medical/containment/cell/cl)
+"wJL" = (
+/turf/open/floor/almayer{
+	icon_state = "bluefull"
+	},
+/area/almayer/living/briefing)
 "wKn" = (
 /obj/structure/surface/rack,
 /obj/item/facepaint/sniper,
@@ -77459,9 +78160,13 @@
 	},
 /area/almayer/medical/containment)
 "wLV" = (
-/obj/structure/bed/chair/comfy/charlie,
+/obj/structure/machinery/vending/cola{
+	density = 0;
+	pixel_y = 16
+	},
+/obj/effect/decal/cleanable/dirt,
 /turf/open/floor/almayer{
-	icon_state = "emeraldfull"
+	icon_state = "plate"
 	},
 /area/almayer/living/briefing)
 "wMm" = (
@@ -78496,9 +79201,6 @@
 	desc = "A supply crate containing everything you need to stop a CLF uprising.";
 	name = "\improper USCM crate 'FOB supplies'"
 	},
-/obj/structure/sign/arcturianstopsign{
-	pixel_y = 32
-	},
 /obj/item/folded_tent/big{
 	pixel_x = -6;
 	pixel_y = 10
@@ -78676,6 +79378,14 @@
 	icon_state = "emerald"
 	},
 /area/almayer/hallways/port_hallway)
+"xkY" = (
+/obj/structure/bed/chair/comfy/alpha{
+	dir = 1
+	},
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/living/briefing)
 "xlk" = (
 /obj/structure/surface/table/almayer,
 /turf/open/floor/almayer,
@@ -78949,9 +79659,13 @@
 /turf/closed/wall/almayer,
 /area/almayer/command/securestorage)
 "xqM" = (
-/obj/structure/platform,
 /obj/structure/pipes/vents/pump,
-/turf/open/floor/almayer,
+/obj/structure/bed/chair/comfy/delta{
+	dir = 8
+	},
+/turf/open/floor/almayer{
+	icon_state = "bluefull"
+	},
 /area/almayer/living/briefing)
 "xqS" = (
 /obj/effect/decal/warning_stripes{
@@ -79424,9 +80138,6 @@
 /turf/open/floor/plating,
 /area/almayer/hull/upper_hull/u_a_p)
 "xzp" = (
-/obj/structure/bed/chair/comfy/bravo{
-	dir = 1
-	},
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 4
 	},
@@ -79443,6 +80154,18 @@
 	},
 /turf/open/floor/almayer,
 /area/almayer/shipboard/brig/cells)
+"xzB" = (
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 9
+	},
+/obj/structure/bed/chair/comfy/delta{
+	dir = 8
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/living/briefing)
 "xAe" = (
 /turf/closed/wall/almayer/research/containment/wall/corner,
 /area/almayer/medical/containment/cell)
@@ -79607,20 +80330,22 @@
 	},
 /area/almayer/command/airoom)
 "xDQ" = (
-/obj/structure/platform,
-/obj/item/trash/USCMtray{
-	pixel_y = 4
+/obj/structure/surface/table/almayer,
+/obj/item/reagent_container/food/snacks/mre_pack/xmas3{
+	pixel_x = 5
 	},
-/obj/item/trash/USCMtray{
-	pixel_y = 6
+/obj/item/reagent_container/food/snacks/mre_pack/xmas2{
+	pixel_x = 5;
+	pixel_y = 9
 	},
-/obj/item/trash/USCMtray{
-	pixel_y = 8
+/obj/effect/landmark/map_item{
+	layer = 3.03;
+	pixel_x = -7;
+	pixel_y = 4
 	},
-/obj/item/trash/USCMtray{
-	pixel_y = 10
+/turf/open/floor/almayer{
+	icon_state = "plate"
 	},
-/turf/open/floor/almayer,
 /area/almayer/living/briefing)
 "xEc" = (
 /turf/open/floor/almayer{
@@ -79771,6 +80496,25 @@
 	icon_state = "red"
 	},
 /area/almayer/living/briefing)
+"xGL" = (
+/obj/structure/surface/table/almayer,
+/obj/effect/decal/cleanable/dirt,
+/obj/item/paper_bin/uscm{
+	pixel_x = 9;
+	pixel_y = 6
+	},
+/obj/item/tool/pen{
+	pixel_x = 9;
+	pixel_y = 2
+	},
+/obj/item/tool/pen{
+	pixel_x = 9;
+	pixel_y = 9
+	},
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/living/briefing)
 "xHe" = (
 /obj/structure/pipes/vents/pump{
 	dir = 4
@@ -80125,13 +80869,20 @@
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/hull/lower_hull/l_m_s)
 "xPR" = (
-/obj/structure/platform{
-	dir = 1
-	},
 /obj/structure/pipes/vents/scrubber{
 	dir = 4
 	},
-/turf/open/floor/almayer,
+/obj/structure/surface/table/almayer,
+/obj/structure/machinery/computer/emails{
+	dir = 1
+	},
+/obj/item/reagent_container/food/snacks/grown/banana{
+	pixel_x = 18;
+	pixel_y = 5
+	},
+/turf/open/floor/almayer{
+	icon_state = "orangefull"
+	},
 /area/almayer/living/briefing)
 "xPZ" = (
 /obj/structure/pipes/standard/simple/hidden/supply{
@@ -115560,8 +116311,8 @@ wsP
 izr
 aSh
 ccF
-tGG
-tGG
+rFV
+iXR
 bdg
 aLG
 awb
@@ -115591,12 +116342,12 @@ buH
 hOR
 buH
 bdg
-sNI
+cxZ
 wAU
 diw
-csG
-sNI
-wNT
+tSv
+cxZ
+ffl
 wbe
 bdd
 qXo
@@ -115758,13 +116509,13 @@ hhw
 umv
 hhw
 bdd
-bqZ
-kbV
-tGG
-tGG
-tGG
+hjT
+jZr
 tGG
+fHe
 tGG
+sBs
+iXR
 bdg
 aLG
 aYO
@@ -115794,13 +116545,13 @@ buH
 bHL
 buH
 bdg
-sNI
-sNI
-sNI
-sNI
+cxZ
+hnH
+kXH
+kfG
 dkH
 cKX
-bqZ
+oqP
 bdd
 tLc
 rsM
@@ -115962,12 +116713,12 @@ aSm
 eoM
 bdd
 vTt
-kbV
-tGG
-tGG
-tGG
-tGG
+tgE
+tgE
+fNu
 tGG
+gmp
+iXR
 bdg
 aLG
 aYO
@@ -115997,13 +116748,13 @@ buH
 bHL
 buH
 bdg
-sNI
+cxZ
 csG
 sNI
-sNI
+mgR
 gNi
-wNT
-cab
+wJL
+oMC
 bdd
 hxZ
 rsM
@@ -116164,14 +116915,14 @@ aSm
 aSm
 kOf
 bdd
-bDQ
-kbV
-tGG
+dYH
+bDP
+tgE
 okB
-tGG
+tgE
 crK
-tGG
-bdg
+xkY
+bdd
 beB
 aYT
 beB
@@ -116199,11 +116950,11 @@ bCx
 buH
 bHL
 buH
-bdg
-sNI
-sNI
-sNI
-sNI
+bdd
+qWy
+uZX
+wJL
+wJL
 eCS
 xqM
 udV
@@ -116367,12 +117118,12 @@ mhl
 aSm
 ylY
 bdd
-bqZ
 qgw
-beH
-qMR
+qgw
+qgw
+tMc
 vlR
-dRT
+uLe
 qin
 pmv
 tBF
@@ -116403,13 +117154,13 @@ bFu
 omW
 bFu
 hLS
-eBg
-eBg
-eBg
-eBg
-fOk
+vKe
+vKe
+sgE
+ljz
+xzB
 epq
-bqZ
+fCt
 bdd
 hTf
 rKO
@@ -116773,13 +117524,13 @@ pOB
 hfk
 aLf
 bdd
-bqZ
+gVm
 kKL
-aLJ
-eBg
+gOm
+hFX
 dAO
 cEG
-eBg
+vKe
 dYX
 tBF
 lBz
@@ -116809,13 +117560,13 @@ buH
 uXu
 bFu
 iUk
-eBg
+cIl
 gkJ
-eBg
-eBg
+vKe
+cum
 mVZ
 kTx
-bqZ
+jIG
 bdd
 hTf
 wRO
@@ -116976,14 +117727,14 @@ lQu
 lQu
 aSm
 bdd
-bDQ
+iFG
 iWE
 jUo
-wmz
-wmz
+iXd
+iXd
 wwk
-wmz
-bdg
+hMJ
+bdd
 aLG
 awb
 aLG
@@ -117011,14 +117762,14 @@ bdg
 buH
 hOR
 buH
-bdg
+bdd
 wLV
 nza
-wLV
-wLV
-wLV
+mwz
+mwz
+mwz
 ukA
-bqZ
+jIG
 bdd
 gKB
 rsM
@@ -117179,13 +117930,13 @@ yfy
 ugV
 vUi
 bdd
-vTt
-kbV
+jEI
+iXd
 xzp
 vEn
 wmz
-wmz
-wmz
+npS
+qsa
 bdg
 aLG
 aYO
@@ -117215,13 +117966,13 @@ bGe
 bHL
 buH
 bdg
-wLV
-wLV
-wLV
-wLV
-gKH
+kxF
+elX
+gAj
+bHS
+aLA
 ldj
-cab
+oMC
 bdd
 sOt
 cNX
@@ -117382,13 +118133,13 @@ aLf
 qce
 aSm
 bdd
-bqZ
+gcw
 xPR
 nIW
+uzb
 wmz
-wmz
-wmz
-wmz
+idJ
+qsa
 bdg
 beB
 aYT
@@ -117418,13 +118169,13 @@ bJz
 bHT
 bJz
 bdg
-wLV
-wLV
-wLV
-wLV
-wLV
-wNT
-udV
+kxF
+lad
+thE
+hIt
+gAj
+wlH
+sGX
 bdd
 pEl
 roU
@@ -117587,11 +118338,11 @@ qEW
 bdd
 gGo
 mLb
-wmz
+qmB
 vpt
 kQU
-wmz
-wmz
+rdb
+kQU
 bdg
 aLG
 aYO
@@ -117624,8 +118375,8 @@ bdg
 gKH
 cgz
 vyU
-wLV
-wLV
+xGL
+vkN
 xDQ
 bXc
 bdd

From 354e2eedc9e0a8b6fa9a8ad65ef040d463773d39 Mon Sep 17 00:00:00 2001
From: cm13-github <128137806+cm13-github@users.noreply.github.com>
Date: Sat, 2 Dec 2023 15:39:50 +0000
Subject: [PATCH 39/58] Automatic changelog for PR #5092 [ci skip]

---
 html/changelogs/AutoChangeLog-pr-5092.yml | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 html/changelogs/AutoChangeLog-pr-5092.yml

diff --git a/html/changelogs/AutoChangeLog-pr-5092.yml b/html/changelogs/AutoChangeLog-pr-5092.yml
new file mode 100644
index 000000000000..9d7d2045a8c9
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-5092.yml
@@ -0,0 +1,4 @@
+author: "SpartanBobby"
+delete-after: True
+changes:
+  - maptweak: "Redetails Almayer Squad briefing rooms"
\ No newline at end of file

From c857aeb51ba7741c7c480a89bda94493f969c076 Mon Sep 17 00:00:00 2001
From: stalkerino <66872447+irakligabunia@users.noreply.github.com>
Date: Sun, 3 Dec 2023 01:35:06 +0400
Subject: [PATCH 40/58] fix skull facepaint, masks (#5091)

# About the pull request

it fixes the previous PR of adding the skull mask, facepaint


# Explain why it's good for the game

its a fix and sorry, i will test my PR's in the future


# Testing Photographs and Procedure
https://files.catbox.moe/6tyox1.png



</details>


# Changelog
:cl: stalkerino
fix: fixes the skull facepaint, black mask, blue mask
/:cl:

---------

Co-authored-by: fira <loyauflorian@gmail.com>
---
 code/modules/client/preferences_gear.dm | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/code/modules/client/preferences_gear.dm b/code/modules/client/preferences_gear.dm
index 8a46e60956db..a71f7dbcb3e9 100644
--- a/code/modules/client/preferences_gear.dm
+++ b/code/modules/client/preferences_gear.dm
@@ -161,14 +161,14 @@ GLOBAL_LIST_EMPTY(gear_datums_by_name)
 	display_name = "USCM balaclava, tan"
 	path = /obj/item/clothing/mask/rebreather/scarf/tan
 
-/datum/gear/skull_balaclava_blue
-	display_name = "Blue Skull Balaclava"
+/datum/gear/mask/uscm/skull_balaclava_blue
+	display_name = "USCM balaclava, blue skull"
 	path = /obj/item/clothing/mask/rebreather/skull
 	cost = 4 //same as skull facepaint
 	slot = WEAR_FACE
 
-/datum/gear/skull_balaclava_black
-	display_name = "Black Skull Balaclava"
+/datum/gear/mask/uscm/skull_balaclava_black
+	display_name = "USCM balaclava, black skull"
 	path = /obj/item/clothing/mask/rebreather/skull/black
 	cost = 4
 	slot = WEAR_FACE
@@ -888,8 +888,8 @@ GLOBAL_LIST_EMPTY(gear_datums_by_name)
 	display_name = "Facepaint, black"
 	path = /obj/item/facepaint/black
 
-/datum/gear/skullfacepaint
-	display_name = "Skull Facepaint"
+/datum/gear/misc/facepaint_skull
+	display_name = "Facepaint, skull"
 	path = /obj/item/facepaint/skull
 	cost = 3 
 

From 3e0832cbd0b06d6a2266e52401b0269dbc3d0981 Mon Sep 17 00:00:00 2001
From: cm13-github <128137806+cm13-github@users.noreply.github.com>
Date: Sat, 2 Dec 2023 21:43:42 +0000
Subject: [PATCH 41/58] Automatic changelog for PR #5091 [ci skip]

---
 html/changelogs/AutoChangeLog-pr-5091.yml | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 html/changelogs/AutoChangeLog-pr-5091.yml

diff --git a/html/changelogs/AutoChangeLog-pr-5091.yml b/html/changelogs/AutoChangeLog-pr-5091.yml
new file mode 100644
index 000000000000..ec5e88ae1dbf
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-5091.yml
@@ -0,0 +1,4 @@
+author: "stalkerino"
+delete-after: True
+changes:
+  - bugfix: "fixes the skull facepaint, black mask, blue mask"
\ No newline at end of file

From 0e9dd8bea0cb279fba3731cc11452966ddd54345 Mon Sep 17 00:00:00 2001
From: Changelogs <action@github.com>
Date: Sun, 3 Dec 2023 01:15:14 +0000
Subject: [PATCH 42/58] Automatic changelog compile [ci skip]

---
 html/changelogs/AutoChangeLog-pr-5045.yml |  8 --------
 html/changelogs/AutoChangeLog-pr-5079.yml |  4 ----
 html/changelogs/AutoChangeLog-pr-5091.yml |  4 ----
 html/changelogs/AutoChangeLog-pr-5092.yml |  4 ----
 html/changelogs/archive/2023-12.yml       | 14 ++++++++++++++
 5 files changed, 14 insertions(+), 20 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-5045.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-5079.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-5091.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-5092.yml

diff --git a/html/changelogs/AutoChangeLog-pr-5045.yml b/html/changelogs/AutoChangeLog-pr-5045.yml
deleted file mode 100644
index 69ba77c78e3c..000000000000
--- a/html/changelogs/AutoChangeLog-pr-5045.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-author: "BadAtThisGame302"
-delete-after: True
-changes:
-  - rscadd: "Added a flavor diary entry from the Director of Lambda"
-  - mapadd: "added back the old vault nightmare insert on Solaris which was removed due to the creation of static comms where it spawned"
-  - maptweak: "tweaked the Lambda Director's Office"
-  - maptweak: "tweaked the Lambda Administration Office"
-  - maptweak: "tweaked the Lambda Relaxation Room"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-5079.yml b/html/changelogs/AutoChangeLog-pr-5079.yml
deleted file mode 100644
index a55879366c51..000000000000
--- a/html/changelogs/AutoChangeLog-pr-5079.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "blackdragonTOW"
-delete-after: True
-changes:
-  - maptweak: "Standardized the names of LZs to include the name of the LZ."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-5091.yml b/html/changelogs/AutoChangeLog-pr-5091.yml
deleted file mode 100644
index ec5e88ae1dbf..000000000000
--- a/html/changelogs/AutoChangeLog-pr-5091.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "stalkerino"
-delete-after: True
-changes:
-  - bugfix: "fixes the skull facepaint, black mask, blue mask"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-5092.yml b/html/changelogs/AutoChangeLog-pr-5092.yml
deleted file mode 100644
index 9d7d2045a8c9..000000000000
--- a/html/changelogs/AutoChangeLog-pr-5092.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "SpartanBobby"
-delete-after: True
-changes:
-  - maptweak: "Redetails Almayer Squad briefing rooms"
\ No newline at end of file
diff --git a/html/changelogs/archive/2023-12.yml b/html/changelogs/archive/2023-12.yml
index fc75f95c6a43..a481ce6987cd 100644
--- a/html/changelogs/archive/2023-12.yml
+++ b/html/changelogs/archive/2023-12.yml
@@ -24,3 +24,17 @@
   - bugfix: Fixes incorrect frequencies being used to display channel names on radios.
   - bugfix: Radios and tape recorders placed on tables or placed inside webbing can
       now hear speech again.
+2023-12-03:
+  BadAtThisGame302:
+  - rscadd: Added a flavor diary entry from the Director of Lambda
+  - mapadd: added back the old vault nightmare insert on Solaris which was removed
+      due to the creation of static comms where it spawned
+  - maptweak: tweaked the Lambda Director's Office
+  - maptweak: tweaked the Lambda Administration Office
+  - maptweak: tweaked the Lambda Relaxation Room
+  SpartanBobby:
+  - maptweak: Redetails Almayer Squad briefing rooms
+  blackdragonTOW:
+  - maptweak: Standardized the names of LZs to include the name of the LZ.
+  stalkerino:
+  - bugfix: fixes the skull facepaint, black mask, blue mask

From 732f2e9f6931dd5f4dd87bb8f1e56562ffa227ec Mon Sep 17 00:00:00 2001
From: ihatethisengine <115417687+ihatethisengine@users.noreply.github.com>
Date: Sun, 3 Dec 2023 09:00:43 +0300
Subject: [PATCH 43/58] Makes whiskey outpost rarer + adds pop lock (#5062)

# About the pull request
Whiskey outpost is available 3 times less often + requires 140 players
to be online.

# Explain why it's good for the game
The gamemode get into the vote way more often than once per 5 day, plus
for some reason can be rolled during lowpop hours (and this gamemode is
awful on lowpop).

# Testing Photographs and Procedure
<details>
<summary>Screenshots & Videos</summary>

Put screenshots and videos here with an empty line between the
screenshots and the `<details>` tags.

</details>


# Changelog
:cl: ihatethisengine
del: Whiskey outpost is voteable less often and requires 140 players.
/:cl:
---
 code/controllers/configuration/entries/game_options.dm | 5 +++++
 code/controllers/subsystem/vote.dm                     | 3 ++-
 code/game/gamemodes/colonialmarines/whiskey_outpost.dm | 8 ++++++--
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/code/controllers/configuration/entries/game_options.dm b/code/controllers/configuration/entries/game_options.dm
index 743f9be9fec0..741862b5d65d 100644
--- a/code/controllers/configuration/entries/game_options.dm
+++ b/code/controllers/configuration/entries/game_options.dm
@@ -127,3 +127,8 @@
 	min_val = 1
 	config_entry_value = 450
 	integer = TRUE
+
+/datum/config_entry/number/whiskey_required_players
+	min_val = 0
+	config_entry_value = 140
+	integer = TRUE
diff --git a/code/controllers/subsystem/vote.dm b/code/controllers/subsystem/vote.dm
index a56e10636a1e..79bd10c65736 100644
--- a/code/controllers/subsystem/vote.dm
+++ b/code/controllers/subsystem/vote.dm
@@ -276,7 +276,8 @@ SUBSYSTEM_DEF(vote)
 					var/datum/game_mode/M = mode_type
 					if(initial(M.config_tag))
 						var/vote_cycle_met = !initial(M.vote_cycle) || (text2num(SSperf_logging?.round?.id) % initial(M.vote_cycle) == 0)
-						if(initial(M.votable) && vote_cycle_met)
+						var/min_players_met = length(GLOB.clients) >= M.required_players
+						if(initial(M.votable) && vote_cycle_met && min_players_met)
 							choices += initial(M.config_tag)
 			if("groundmap")
 				question = "Ground map vote"
diff --git a/code/game/gamemodes/colonialmarines/whiskey_outpost.dm b/code/game/gamemodes/colonialmarines/whiskey_outpost.dm
index 3bc56728a7b9..6ebda633a19b 100644
--- a/code/game/gamemodes/colonialmarines/whiskey_outpost.dm
+++ b/code/game/gamemodes/colonialmarines/whiskey_outpost.dm
@@ -9,7 +9,7 @@
 /datum/game_mode/whiskey_outpost
 	name = GAMEMODE_WHISKEY_OUTPOST
 	config_tag = GAMEMODE_WHISKEY_OUTPOST
-	required_players = 0
+	required_players = 140
 	xeno_bypass_timer = 1
 	flags_round_type = MODE_NEW_SPAWN
 	role_mappings = list(
@@ -76,10 +76,14 @@
 	hardcore = TRUE
 
 	votable = TRUE
-	vote_cycle = 25 // approx. once every 5 days, if it wins the vote
+	vote_cycle = 75 // approx. once every 5 days, if it wins the vote
 
 	taskbar_icon = 'icons/taskbar/gml_wo.png'
 
+/datum/game_mode/whiskey_outpost/New()
+	. = ..()
+	required_players = CONFIG_GET(number/whiskey_required_players)
+
 /datum/game_mode/whiskey_outpost/get_roles_list()
 	return GLOB.ROLES_WO
 

From a404e66fc56a663c280b1d236bb352f9ab6f9bc3 Mon Sep 17 00:00:00 2001
From: cm13-github <128137806+cm13-github@users.noreply.github.com>
Date: Sun, 3 Dec 2023 06:08:56 +0000
Subject: [PATCH 44/58] Automatic changelog for PR #5062 [ci skip]

---
 html/changelogs/AutoChangeLog-pr-5062.yml | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 html/changelogs/AutoChangeLog-pr-5062.yml

diff --git a/html/changelogs/AutoChangeLog-pr-5062.yml b/html/changelogs/AutoChangeLog-pr-5062.yml
new file mode 100644
index 000000000000..f733828f0911
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-5062.yml
@@ -0,0 +1,4 @@
+author: "ihatethisengine"
+delete-after: True
+changes:
+  - rscadd: "Whiskey outpost is voteable less often and requires 140 players."
\ No newline at end of file

From 02ab728a24369737a8accec0e8fd06c487c3cac3 Mon Sep 17 00:00:00 2001
From: Birdtalon <birdtalon@gmail.com>
Date: Sun, 3 Dec 2023 09:24:51 +0000
Subject: [PATCH 45/58] New Radial Menu for Xeno Evolve (#5022)

<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->

# About the pull request

Converts xeno evolve menu to a radial one.


![dreamseeker_2023-11-24_14-56-31](https://github.com/cmss13-devs/cmss13/assets/25027759/f8af0b0c-16ce-485f-bd31-a0780adda076)

![dreamseeker_2023-11-24_14-50-01](https://github.com/cmss13-devs/cmss13/assets/25027759/62e47d79-731a-4f16-86a8-a63e5ab24326)

![dreamseeker_2023-11-24_14-56-20](https://github.com/cmss13-devs/cmss13/assets/25027759/3be32724-5bf3-4438-87d7-9a4666902ffd)

# Explain why it's good for the game

It looks cool!

# Testing Photographs and Procedure
<!-- Include any screenshots/videos/debugging steps of the modified code
functioning successfully, ideally including edge cases. -->
<details>
<summary>Screenshots & Videos</summary>


![dreamseeker_2023-11-24_14-56-31](https://github.com/cmss13-devs/cmss13/assets/25027759/f8af0b0c-16ce-485f-bd31-a0780adda076)

![dreamseeker_2023-11-24_14-50-01](https://github.com/cmss13-devs/cmss13/assets/25027759/62e47d79-731a-4f16-86a8-a63e5ab24326)

![dreamseeker_2023-11-24_14-56-20](https://github.com/cmss13-devs/cmss13/assets/25027759/3be32724-5bf3-4438-87d7-9a4666902ffd)


</details>


# Changelog

<!-- If your PR modifies aspects of the game that can be concretely
observed by players or admins you should add a changelog. If your change
does NOT meet this description, remove this section. Be sure to properly
label your changes in the changelog. Please note that maintainers freely
reserve the right to remove and add tags should they deem it
appropriate. You can attempt to finagle the system all you want, but
it's best to shoot for clear communication right off the bat. -->
<!-- If you add a name after the ':cl', that name will be used in the
changelog. You must add your CKEY after the CL if your GitHub name
doesn't match. Maintainers freely reserve the right to remove and add
tags should they deem it appropriate. -->

:cl:
add: Radial Menu for xeno Evolve
/:cl:

<!-- Both :cl:'s are required for the changelog to work! -->

---------

Co-authored-by: harryob <me@harryob.live>
---
 .../mob/living/carbon/xenomorph/Evolution.dm    |   9 ++++++++-
 .../mob/living/carbon/xenomorph/xeno_defines.dm |  16 ++++++++++++++++
 icons/mob/xenos/radial_xenos.dmi                | Bin 0 -> 4965 bytes
 3 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 icons/mob/xenos/radial_xenos.dmi

diff --git a/code/modules/mob/living/carbon/xenomorph/Evolution.dm b/code/modules/mob/living/carbon/xenomorph/Evolution.dm
index 63aa7b09a633..af6be8265cc0 100644
--- a/code/modules/mob/living/carbon/xenomorph/Evolution.dm
+++ b/code/modules/mob/living/carbon/xenomorph/Evolution.dm
@@ -26,8 +26,15 @@
 	if(!length(castes_available))
 		to_chat(src, SPAN_WARNING("The Hive is not capable of supporting any castes you can evolve to yet."))
 		return
+	var/castepick
+	if((client.prefs && client.prefs.no_radials_preference) || !hive.evolution_menu_images)
+		castepick = tgui_input_list(usr, "You are growing into a beautiful alien! It is time to choose a caste.", "Evolve", castes_available, theme="hive_status")
+	else
+		var/list/fancy_caste_list = list()
+		for(var/caste in castes_available)
+			fancy_caste_list[caste] = hive.evolution_menu_images[caste]
 
-	var/castepick = tgui_input_list(usr, "You are growing into a beautiful alien! It is time to choose a caste.", "Evolve", castes_available, theme="hive_status")
+		castepick = show_radial_menu(src, src.client?.eye, fancy_caste_list)
 	if(!castepick) //Changed my mind
 		return
 
diff --git a/code/modules/mob/living/carbon/xenomorph/xeno_defines.dm b/code/modules/mob/living/carbon/xenomorph/xeno_defines.dm
index 99f9c46b5b65..fc9585b56154 100644
--- a/code/modules/mob/living/carbon/xenomorph/xeno_defines.dm
+++ b/code/modules/mob/living/carbon/xenomorph/xeno_defines.dm
@@ -367,6 +367,13 @@
 
 	var/list/available_nicknumbers = list()
 
+	/*Stores the image()'s for the xeno evolution radial menu
+	To add an image for your caste - add an icon to icons/mob/xenos/radial_xenos.dmi
+	Icon size should be 32x32, to make them fit within the radial menu border size your icon 22x22 and leave 10px transparent border.
+	The name of the icon should be the same as the XENO_CASTE_ define for that caste eg. #define XENO_CASTE_DRONE "Drone"
+	*/
+	var/static/list/evolution_menu_images
+
 /datum/hive_status/New()
 	mutators.hive = src
 	hive_ui = new(src)
@@ -382,8 +389,17 @@
 	for(var/number in 1 to 999)
 		available_nicknumbers += number
 
+	if(!evolution_menu_images)
+		evolution_menu_images = list()
+		generate_evo_menu_images()
+
 	RegisterSignal(SSdcs, COMSIG_GLOB_POST_SETUP, PROC_REF(post_setup))
 
+///Generate the image()'s requried for the evolution radial menu.
+/datum/hive_status/proc/generate_evo_menu_images()
+	for(var/datum/caste_datum/caste as anything in subtypesof(/datum/caste_datum))
+		evolution_menu_images[initial(caste.caste_type)] = image('icons/mob/xenos/radial_xenos.dmi', initial(caste.caste_type))
+
 /datum/hive_status/proc/post_setup()
 	SIGNAL_HANDLER
 
diff --git a/icons/mob/xenos/radial_xenos.dmi b/icons/mob/xenos/radial_xenos.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..2832f42fda33e5cdaaeebc5dbcd486ce72b17db7
GIT binary patch
literal 4965
zcmV-r6PoOaP)<h;3K|Lk000e1NJLTq004jh004jp0{{R3^x%>C0006*P)t-sz`(!&
z0022XO>1d`Dl9QgUTF&$9y1mvOfX0-FE%+)WEmSCDhvumML|nTHDhCAV04NpD=;G=
zB0)=QSY>z{8y6`qHc%}WeN-}>lam}04J08WxtL`yFE7l@%p@^4Lrz-^2ngWDj};Xa
z8yXuUCm{(26--o+$icA>2n!Dk2|sdjr=YKCW|1;HWI-(>T}CvJeqDWNM<5CcFeWT`
zVM8@OPdp|UBoYrbGAB+=N05w_gBT#BG$}a@7)lr^Y9K)|3@L*+N*xazE<sOKTYV80
z9VRL_G&D3sKS4oVW_g*~ViYOOSus)=IS>>Olyx~l7&%KzWP5viV|Af9ED%aK5HTP*
za%-9!9w|svR09DE4G0air@{{f4<H~QYEU4(ww$zGV!+44|N8EOg?ma&N_sddJ~B%<
zBM>@zgL<r+4*&=_Ek<*Adr?M1Wm#x47cr$_C`VanDjOj~O=@0OMRjdd&~+`v+}hX7
zrS0UxY#J>J8wVsOEy1pPxTAbK6&8S>o?~1`{{Hp^1qRc|p%4lfM>R?o93DayH+X7>
z%fhioIyIPxDF+1&l8%L2M->SQANc5rZBZ$}z`!^ZBUCLYYCt)KS1hD?L3SJ-lQ1YV
z8yoh%QehS(p+`B*ol3lBS5j3{90??vnwn>4XC^8^N<c9f6c}n*T1!SZ0s{#M3;=s^
zd%LumrIl-JWKS_D5IaCfWNvyrLP<0*COAAsfO1lynu3mjTu(?jO;lShF*YS48#^~E
zNJvO_5d@O}0004WQchC<K<3zH0002UdQ@0+L}hbha%pgMX>V=-0C=2@(oGA(FboFZ
zbNegGb{D^{Ugm}lbf`OcE-YJvvz4^n{=U<JH)(Hq;UOU*smO{$S&95y@&U-A(PAgI
zizR0xHcm}pv*t_zcFN7cI_Y34ldA{N31<zGo$`vamgE!W`ll`=!5KmsrYBDipddTq
z0KK6m2y-$Tg6bv**+q=qlea3yNg|AJnI|%11k9lY-9*6qXR-;q`i0I#^s7NT)X;}d
z=(Ud7*kJ#krJ|_v?<2kepSrs@-m+lX000mCNkl<Zc%1E<{Z|{;na4-i=&cq8gp^o~
zEVRO^MU%K`cH7;J&<hfhN)@ZZxGacOob0+FkPHIFVH<&?rb;ZjnA-J`g27c2u!UTc
zwrpQ^+ijaat>5QLHZxZv^}y*lyFchLGn(P*@O<v~d6~JBi6FGCZU28v(Q&HdbVnz)
zQyq%NVWmo`RI61Qm0GRDv2;+YWglNU^Cj_VgXy}?cAxFiH3R5@^WNTGK=d>MDD@h+
zRqOloYJ6(+QUZg4_Qn@pe8G5hDhqI~34p>x5_Ep~bjRs0cai`mjsXBFjZ&{xtMy78
z$pf5u;Y@3Qvj8~T9H6I@g@6gb12BST3h@2~1M_Qq@ue4Q2aNz`oz6@E=eq!a6AKT}
zO9ZEx0;kD;Z$lK6eM)t|My=^r<A@tG8Y$|}LZGejNX$wEy6&!XUEMnJZ<Pl?6gm`5
z00bnVUel+61iXJtnOquQ`n#9dXQO{cV6mCI&v%<`7M+>*Px_k>hn~(;ojp+B)R2Z6
zwOXT8tJHdIN}Q-T0w^$W0Sa6gfC91r7OT}}vDvU$t-Jup0Fppq>h0<1=_LRNV3K^r
z4yQ^@pI)!;(@;6uc?q;e!-X?v&Rj6aMgV3uo2|C)bKN$p#bV>9Z>mXPQgnW$6DLdn
zDF6{53HvVgAqmwQ&Oga+FgT!q!(fn&fMDs;b?K~7z-qw(N5J&&HJQ+hE}{#Wm;gN-
zfXZ%H>Xk}tb~`TsRi42xh$?W<ft-J{`K->2Fjy@%0GOo&<lJQH=uvbk6xezcEDgCo
zq0wmU8YrN&tN2C;|Jtu=jgFUJdD(#jheHlPNAWiU!e(obK!ND@!hcT>6zIWchp8bA
zRsHIIwH*rBRXE@Y28`NQjSdI>;6O$Ko7sjGuv)q-*xSq&v!oFyOdY)l1Llub3=K>@
z6c4F?4eC#WFxZg^{ip~YzzDyWw3jFaWC$>IsBbny1>_>qK-!7m-vodTNB~oGn0l!g
zH~^GCdLST_%0>wW23|E7zV_PJU;CQFVUQs}3RtXgj}TyIWuXualYcY;WFK;Xc2tkj
z98hYM8aw3gS7A?A18E~LzB=G=yngBLFTHL60Rq7hKyoM#1QrPk>0lNOlm8k48WCy1
z2si<tzD5HTkc&tIH4gxSORxRIYnNVeXa@{DfCcT(g6N|MS#9UKt-7-o$u-GTn>r$Z
z5A2u*k{mz^sO)f$5MXC#p%D8Y_=Xk)-~7jKzV3L%@r_0SY+Yy1c3G$j$-1q!E}IyD
z<_(W<k0S+rUOc7X6i`8VAh1ZNNC%B**kBwOAcBATX9H>xc_=MJgj|Pvfi7Jg;hgoH
zP6E);(b3sin|x1A28H63SOMG$s8onPdXQcDMxR}+SLxMa7w|bSU>snDi1~Ak04WFp
z<R4uINda58RdPM*W!3@VJ5hs_hJxav1VGuZ*Y~Ta3d#EH%6_E;K!96Z5?@CCIbJag
z2%K4%*$CvExgG~`E27lzg$x&24%7fniOLWmSF8K={pvcx8}>KU900Baj+fz_)d25b
zsJn#plmN98t{0jvV$RT=@{c;P<XVIj1cADC86*XieRl48gew4fhkLn8!Sm!J?<hfP
z%ls9wZEb5?+uBBEl)t4H1m_U#U2eD2<8-^dbTaG_f5GP;@dbkZpx=)z81RkweKLP0
z^sUivkA5rE+`m>UyQ&g|@SC*vx-SpCITUtB=;S-mqv4?73;IX=AQ;2HU;xL#CIDAX
z2*4zWM8lq8XP7B4><LQ%;N0)?kByCwjp36-Xa+Fa3gD|v0EFn(up2SB>~^}t5WpS%
z?u2M`Jm?z>1cPH^*lHhvF<(#yVDzs6{7W+cw`T$X$N?yTsk_5YkpRL-5IFz>N&(Cs
z{*ePR0F$FrSEfcMPXZu>y)HK*;rxyVuH7!T*uM}QkNN%M0q8&>@C5_oet&Gd;crY&
zhM+)ba$43mt?#w}s%^Huce|n!k;v7dH;0`rugm3<0*u6hL@>q_7$g6|*hqu_(DdZ=
zG`3I(H;6m{2n-i+TSM!6*<y5g<MFrLS5bzMcqHtSjQN7&0rDIid%h2hb0G-n;6HTb
z{1qq=nwpy8Gl8w|p+M91eK_omd*j#Mz7~(TBCa?GFcM%bAczpKOh6V$079Wr-Q*Oe
zKM4`0bW@|D5Jy1EdIwpP^?lUobjH2zcsvdT;t{W8Fz5@$C<t{0C;%~WBY@^4`xGPy
zK>!2*1kxbX*7xXyP1g6}YwtLR;&B%gaK$6eYf%Y7aKslQf-!1?w8xoGlmogcU1$<+
zLm}h<cKG3A@K@INZs*XD=N)7Lv&hiUcPAom9Sz6E18_;cStAPiaTX9&0nM8vK=4PW
zn19lP1E4jvQEQZ4-=qG~0He_;)Q@|^k*iK;RNM(;C<8P?GyrNuL39OwOq>IVJ?2hs
zp#YK*={U*d09)T1aaV7YTi>JYpaDm(UIRloJmd<8(VLw|<NlaG5DWM~K#>Ugd^q#R
zL<;Dpr>-yvC;$>x2cr@fY<&;;iJ@_QAI5bs9*uY+6CRIeB7!z>Iec~KXgnB0?}zGv
zn9t{<j~K2EVt{G5JwHtfgrEQw!W7pD*!rF=EalesLqjfC6shm=l6fc%qEWX9faXte
z_l^7;F3XgH_|4JymFX+f0`(wN;uH$8mJt&Fwe>wKMVa;e(9p2Q6ZcL;u0nyUkqM-N
zH!cbR%^5#I+F=W_GZDb~(D`YhMgY44=coxu4m?}m8;r8+`{7~F@G!bS)D01kij<2{
zQ3z=6Y~D<PniheWz!~-7nn4jA--lYR?>(NV2R8sNq#*oHOyGj-je3s8eE~#(&72u2
zfnV_eM+E1m&o^9<TCVRg-^-Vyh`rYpeGAjauaJl$0GhNfhT9@I$IVcTo%1fJ8!)4G
z)Bw<WeJ{kL|9<^?Bu=d;5`POl=zG_%AB|EIq5uTwo&ak2s4em#phm=O5*&>lTCeXx
z@Xp)UBNK72Hxi%ldZWVk-WCJ+YdJu|vvQyu@Js&yJ);TLvTzcWDCeVXZEIWG+6J4M
znQ1;aJDZrDo1epewsA0-y0MU2Tp(LaE!;?@lX8Ee=>v#o{+E`PniC`vv&(aHbIY@d
zgdD&k16X7Li^+@(z~H+#-@EzlU`ziiEePO$dHz4<mqE}tm`SAou()^wTPl@GXC$L+
z;)CxFe*gXN54Ir4F0HJrEM=PwuR?%%{9B$~l^KQCWE~*M`>z8GuHCwIYi)2)X!0M}
zp}@)qD@_zY-~qrw0DxRBx7<jOL<0N(F-WF3|Fzh!eYp1i58ubW2|zYm2gqh+M93#{
z`PEq<EQ2JU%P-GK$1||x0#jfiiQ@(WK~Q|S_R&Wlt$p~hd@^QdX7IDZ_B_Edrk&4$
z06NSj$bWvGQ{eW(?M$YSUi`sgs*p-G5Rga3t+n^wdvER5$FdIqvg_;X@QwM;;D`rU
zo?j-ftGU%xZ25c+L>#~(2nv}(0b3>moCXQB!r;wYH*bA7__0<-fb2R7AWQ1cAQhJy
z3E(l2$gd&?AwUk1-~b9Jz(TTs5EPQ|zt{+XWvAjM{?Y2QQGoTCl@Fc+e6TXJ&W)4D
z+2z?h6v*dh*_mV<>fc^SfuI2Y42I7FdhW3HqyPNTn*0NZELy<KI>JAb1<O)nEwc1O
zB0_#t!z?F2h6100{K+KzrxtFf3tT0z2M~i~@(&=gOEXJwjT`_59rItvq4*I01Rz$4
zK-vm2NV_!VpGl(y6d25HDZqeHyJ6h8bLY;+#)ixT2uvNb-dz9j2R~llgc=Zn`^IWw
z6)BL<Eu$7t4Y@>4;(wu#E~Jx?Kb670kj^aJPH_OnJ9i8lckgc8*=T$Kf$T^6uis-K
zxVK(Al?srUh5CsER6s5w4Q8bPNPDQCP9q1>X@ueS?Gy(vuyN-n8;%X^We8aLt#3ZF
zb#~4HApUTV5MY;Qp%4SWV<rjr2my9U77EE9pa&3$fEGGzG(Lb}6W`pthsm$sqXQ;|
z6aeMF3IrC39O)psBBA#p^w2(Ci$sQWNOJ&0aM$6uyCL%cBFpA~Zxi0{t#9IIJuB^o
zxdgR;6d~fUIzN}cznl}-A!b~lR*V`<CJQ%kHCo6lNJ3D50CCq~xGVPng5tl)=1#^K
zvJwSytM^fcIjTakx%}$#sssR~w}47W)@(6ZKwXMG)E_{g1n$Z`fI!IC?>)}}l3_-2
zQOwab00j5z2=n>*Sup@Yo}&AKX9zcvH#mT!2M`-_4<IP#Xx{LQ4WC&afC!L(_wO@;
zxz)LRB7Zba-eK%A#1tqjCi#1^XAdAY<Q_nv_hsQ&V2LOo7`PrtZVPhERtaQ2QICTN
zfL)AnG0ddXsT=8f95{fM4<G<Av$-h<ECq34*qq@2a6iD(58@*M8Uc_7Ed3xp5}*k{
z>jw~RYg^me);6+10n2Bh#qwDw7K<%LOP_2#c<^BBlhR26>dWUA{<n9wn-e@F|34*y
zhbIK6FQ1!^m$!F*wzFMsHe4zJ;8OsUP6|+8J~tUH7R%+G&vwe?W?|U<8vwB7v;5%R
z_I9xh1<J+k?Y*V|TU*#lyC(#wFQ1zL6nBb<!FCy+@&KiW@cvUUJUmGj(hCGwK7WMe
zv-}GLJ0gG`oIiTR``;>k!b0!~j!pnTFAykh-o)}*_W8l~XGH{`ssNv#ZR0nOrC+F&
zwzg0PpP~r1wn~+g5IkQ#%lOCKchCgNNP%K;N3Ikqr3arrWPRY_rw>j7!2SmTGTHTe
zc^lgAmA8MkUEV9w3IBzCq~KN++g7Pc3LKk&t>4)T#j@-7BBbBjgZRbr-X221S7K%V
z$?kroS}B!E*jM&(a!i2w3j{xxe}MpVhX1F<$B!NtpMrpw;9;e@`((FzP<`_Glj;Hd
zKiNO72J8ibU;Oe{zx;*F3k2md{6B>u0q6q+WeEWQ4iN+pRN<e&RF2t==mmoR`t@&q
z`<q|?uJHweGK44Zd(1f)5DYQE!%C?N@vGI!!2$f2cJ~jf$IU}pzyJ6D{Qg(JmwSPr
zOumtWG<~oX35ElxR1Pu!%3<lSQe`m5O#)iK|KWfC_@_V0y+BY#?gId6z(4>{mLx%?
zv|Bx_9v(pcQU&|!VP$v!c+IG`e*eRt4S$w<fuIHe<)5;x1|TYgN(pIC>SOk(0UYe_
zmyQR}`UL_M0RafL1R#KI4gel2h<+6zpiE$)I2J(b7YNV?$*}+eRt!&zI}(6{QU#%h
z_J_4d5Xs@;@c>%BK(I%R7;Ztp=Fgh3=#q#TLwQ8Mia1n1e{xXTt?VB6g4AmLj{JYL
z^Qe9m-ebpN{{kz$-4aEg*^`4R>hjnCE!OXQUwrYX{J0MAxcumgFC@1F2sv!G^bFzi
jgU^o-(6+YyAK703NZ)Mhm{!X$00000NkvXXu0mjfn1jU&

literal 0
HcmV?d00001


From 8238318094fc65b3a82dfb66cb1d122551893097 Mon Sep 17 00:00:00 2001
From: cm13-github <128137806+cm13-github@users.noreply.github.com>
Date: Sun, 3 Dec 2023 09:34:30 +0000
Subject: [PATCH 46/58] Automatic changelog for PR #5022 [ci skip]

---
 html/changelogs/AutoChangeLog-pr-5022.yml | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 html/changelogs/AutoChangeLog-pr-5022.yml

diff --git a/html/changelogs/AutoChangeLog-pr-5022.yml b/html/changelogs/AutoChangeLog-pr-5022.yml
new file mode 100644
index 000000000000..389b3f533380
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-5022.yml
@@ -0,0 +1,4 @@
+author: "Birdtalon"
+delete-after: True
+changes:
+  - rscadd: "Radial Menu for xeno Evolve"
\ No newline at end of file

From ddddd3191e900cf2bf73c00c33f9d7c921e3e942 Mon Sep 17 00:00:00 2001
From: Birdtalon <birdtalon@gmail.com>
Date: Sun, 3 Dec 2023 09:26:15 +0000
Subject: [PATCH 47/58] Fixes non normal hive nickname numbering (#5098)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# About the pull request

#4992 broke non normal hive nick numbering due to an oversight. You will
laugh when you see why.
This fixes that.

# Explain why it's good for the game
# Testing Photographs and Procedure
<details>
<summary>Screenshots & Videos</summary>

Put screenshots and videos here with an empty line between the
screenshots and the `<details>` tags.

</details>


# Changelog
🆑
fix: Fixed non normal xeno hive nick numbering
/🆑
---
 code/modules/mob/living/carbon/xenomorph/xeno_defines.dm | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/code/modules/mob/living/carbon/xenomorph/xeno_defines.dm b/code/modules/mob/living/carbon/xenomorph/xeno_defines.dm
index fc9585b56154..a5da9763047d 100644
--- a/code/modules/mob/living/carbon/xenomorph/xeno_defines.dm
+++ b/code/modules/mob/living/carbon/xenomorph/xeno_defines.dm
@@ -383,11 +383,10 @@
 	tacmap = new(src, minimap_type)
 	if(!internal_faction)
 		internal_faction = name
-	if(hivenumber != XENO_HIVE_NORMAL)
-		return
-
 	for(var/number in 1 to 999)
 		available_nicknumbers += number
+	if(hivenumber != XENO_HIVE_NORMAL)
+		return
 
 	if(!evolution_menu_images)
 		evolution_menu_images = list()

From d2eac0e02e55d5fc4dfdd97b326ea4abd376e1ab Mon Sep 17 00:00:00 2001
From: Birdtalon <birdtalon@gmail.com>
Date: Sun, 3 Dec 2023 09:27:00 +0000
Subject: [PATCH 48/58] Weeds are conserved under walls being upgraded and
 destroyed (#5096)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# About the pull request

Fixes #5060

Side effect of this PR is that when resin walls are destroyed then do
not remove the weeds underneath. However those weeds should still be
linked to a nearby node and recede as normal when that is destroyed.

# Explain why it's good for the game


# Testing Photographs and Procedure
<details>
<summary>Screenshots & Videos</summary>

Put screenshots and videos here with an empty line between the
screenshots and the `<details>` tags.

</details>


# Changelog
:cl:
fix: Upgraded resin walls can now nest hosts.
/🆑
---
 code/game/turfs/walls/walls.dm | 2 --
 1 file changed, 2 deletions(-)

diff --git a/code/game/turfs/walls/walls.dm b/code/game/turfs/walls/walls.dm
index 437f203c5fbb..303a9a7655e8 100644
--- a/code/game/turfs/walls/walls.dm
+++ b/code/game/turfs/walls/walls.dm
@@ -88,8 +88,6 @@
 			if(istype(found_object, /obj/structure/sign/poster))
 				var/obj/structure/sign/poster/found_poster = found_object
 				found_poster.roll_and_drop(src)
-			if(istype(found_object, /obj/effect/alien/weeds))
-				qdel(found_object)
 
 		var/list/turf/cardinal_neighbors = list(get_step(src, NORTH), get_step(src, SOUTH), get_step(src, EAST), get_step(src, WEST))
 		for(var/turf/cardinal_turf as anything in cardinal_neighbors)

From 18a2079fa2e0fdc26eed0d28a45d7295b4c74369 Mon Sep 17 00:00:00 2001
From: cm13-github <128137806+cm13-github@users.noreply.github.com>
Date: Sun, 3 Dec 2023 09:55:59 +0000
Subject: [PATCH 49/58] Automatic changelog for PR #5096 [ci skip]

---
 html/changelogs/AutoChangeLog-pr-5096.yml | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 html/changelogs/AutoChangeLog-pr-5096.yml

diff --git a/html/changelogs/AutoChangeLog-pr-5096.yml b/html/changelogs/AutoChangeLog-pr-5096.yml
new file mode 100644
index 000000000000..7384ce62d666
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-5096.yml
@@ -0,0 +1,4 @@
+author: "Birdtalon"
+delete-after: True
+changes:
+  - bugfix: "Upgraded resin walls can now nest hosts.\n/🆑"
\ No newline at end of file

From b9c13b695c5ce5aeed72aa7a797b7b7eb998dd57 Mon Sep 17 00:00:00 2001
From: tool mind <106038874+toolmind@users.noreply.github.com>
Date: Sun, 3 Dec 2023 03:29:49 -0600
Subject: [PATCH 50/58] Sorokyne Corporate Liaison (#4942)

# About the pull request

adds a corporate liaison survivor to sorokyne, along with a subtype of
the liaison's winter coat that can holster guns and a few other utility
items/weapons. it cannot hold any rifle magazines or similarly sized
items in its pockets though because there should be a tradeoff for how
cool it looks.

also fixed a very small typo in the political prisoner's name and
assignment.

# Explain why it's good for the game

more diversity in survivor types is good, map didn't have a corporate
survivor, a really cool sprite sees more use, fits with the map's lore,
etc.

the subtype of the liaison's winter coat is only available on this map
at the moment, and it's a downgrade from the survivor snowsuits/soviet
snowcoats that already spawn on sorokyne, so it's a fine tradeoff for it
looking cool i think. if needed i can always just make it a regular
liaison's winter coat.

typos are bad!!!

# Testing Photographs and Procedure
<details>
<summary>Screenshots & Videos</summary>


![image](https://github.com/cmss13-devs/cmss13/assets/106038874/17c74652-5e36-495e-b48c-8a7c269b22df)

It's a cold day in Hell, suit.
</details>

# Changelog
:cl:IowaPotatoFarmer
add: Added a Corporate Liaison survivor to Sorokyne.
add: Added a modified version of the liaison's winter coat that allows
it to holster guns and a few other things. Only available to the
Sorokyne Strata Corporate Liaison for now.
spellcheck: Fixed a typo in the Sorokyne Strata Political Prisoner's ID
tag.
/:cl:
---
 code/modules/clothing/suits/labcoat.dm         | 18 ++++++++++++++++++
 .../sorokyne_strata/preset_sorokyne_strata.dm  | 18 ++++++++++++++++--
 maps/sorokyne_strata.json                      |  1 +
 3 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/code/modules/clothing/suits/labcoat.dm b/code/modules/clothing/suits/labcoat.dm
index 1c2fb2a9f29d..54e9d91576f1 100644
--- a/code/modules/clothing/suits/labcoat.dm
+++ b/code/modules/clothing/suits/labcoat.dm
@@ -299,3 +299,21 @@
 	name = "liaison's winter coat"
 	desc = "A Weyland-Yutani winter coat. Only the best comfort for the liaison in a cold environment."
 	icon_state = "snowsuit_liaison"
+
+/obj/item/clothing/suit/storage/snow_suit/liaison/modified
+	name = "modified liaison's winter coat"
+	desc = "A Weyland-Yutani winter coat. This one has been modified to holster guns and other objects. Only the best comfort and utility for the liaison surviving in a cold, hostile environment."
+	allowed = list(
+		/obj/item/weapon/gun,
+		/obj/item/tank/emergency_oxygen,
+		/obj/item/device/flashlight,
+		/obj/item/ammo_magazine,
+		/obj/item/explosive/grenade,
+		/obj/item/device/binoculars,
+		/obj/item/attachable/bayonet,
+		/obj/item/storage/large_holster/machete,
+		/obj/item/weapon/baseballbat,
+		/obj/item/weapon/baseballbat/metal,
+		/obj/item/device/motiondetector,
+		/obj/item/device/walkman,
+	)
diff --git a/code/modules/gear_presets/survivors/sorokyne_strata/preset_sorokyne_strata.dm b/code/modules/gear_presets/survivors/sorokyne_strata/preset_sorokyne_strata.dm
index 532b422a13a9..f53f25326b69 100644
--- a/code/modules/gear_presets/survivors/sorokyne_strata/preset_sorokyne_strata.dm
+++ b/code/modules/gear_presets/survivors/sorokyne_strata/preset_sorokyne_strata.dm
@@ -1,6 +1,6 @@
 /datum/equipment_preset/survivor/engineer/soro
-	name = "Survivor - Sorokyne Strata Political Prisioner"
-	assignment = "Sorokyne Strata Political Prisioner"
+	name = "Survivor - Sorokyne Strata Political Prisoner"
+	assignment = "Sorokyne Strata Political Prisoner"
 
 /datum/equipment_preset/survivor/engineer/soro/load_gear(mob/living/carbon/human/new_human)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/UPP(new_human), WEAR_BODY)
@@ -58,3 +58,17 @@
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/snow_suit/survivor(new_human), WEAR_JACKET)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/head/ushanka(new_human), WEAR_HEAD)
 	..()
+
+/datum/equipment_preset/survivor/corporate/soro
+	name = "Survivor - Sorokyne Strata Corporate Liaison"
+	assignment = "Sorokyne Strata Corporate Liaison"
+
+/datum/equipment_preset/survivor/corporate/soro/load_gear(mob/living/carbon/human/new_human)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/charcoal(new_human), WEAR_BODY)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/head/ushanka(new_human), WEAR_HEAD)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/rebreather/scarf(new_human), WEAR_FACE)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/snow_suit/liaison/modified(new_human), WEAR_JACKET)
+	new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/lockable/liaison, WEAR_BACK)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET)
+	..()
+
diff --git a/maps/sorokyne_strata.json b/maps/sorokyne_strata.json
index 61c3a7fd3f69..5a0f6d67c410 100644
--- a/maps/sorokyne_strata.json
+++ b/maps/sorokyne_strata.json
@@ -11,6 +11,7 @@
         "/datum/equipment_preset/survivor/scientist/soro",
         "/datum/equipment_preset/survivor/doctor/soro",
         "/datum/equipment_preset/survivor/engineer/soro",
+        "/datum/equipment_preset/survivor/corporate/soro",
         "/datum/equipment_preset/survivor/security/soro",
         "/datum/equipment_preset/survivor/interstellar_human_rights_observer/soro"
     ],

From d18e2722a2b32829e40bbe9752efd6459759fab3 Mon Sep 17 00:00:00 2001
From: cm13-github <128137806+cm13-github@users.noreply.github.com>
Date: Sun, 3 Dec 2023 10:08:53 +0000
Subject: [PATCH 51/58] Automatic changelog for PR #4942 [ci skip]

---
 html/changelogs/AutoChangeLog-pr-4942.yml | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 html/changelogs/AutoChangeLog-pr-4942.yml

diff --git a/html/changelogs/AutoChangeLog-pr-4942.yml b/html/changelogs/AutoChangeLog-pr-4942.yml
new file mode 100644
index 000000000000..910b59085760
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-4942.yml
@@ -0,0 +1,6 @@
+author: "IowaPotatoFarmer"
+delete-after: True
+changes:
+  - rscadd: "Added a Corporate Liaison survivor to Sorokyne."
+  - rscadd: "Added a modified version of the liaison's winter coat that allows it to holster guns and a few other things. Only available to the Sorokyne Strata Corporate Liaison for now."
+  - spellcheck: "Fixed a typo in the Sorokyne Strata Political Prisoner's ID tag."
\ No newline at end of file

From 31da57d273639c3057641de127121f2863c199f4 Mon Sep 17 00:00:00 2001
From: Birdtalon <birdtalon@gmail.com>
Date: Sun, 3 Dec 2023 09:34:54 +0000
Subject: [PATCH 52/58] Eggsac carrier bugfix (#5059)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# About the pull request

So in one of various refactors of #4716 I removed some important code
from `Burst()` for the new egg type which removes it from the carrier's
sustained eggs. This is bad because we keep trying to call procs on eggs
which have already burst etc.

This removes the egg from the carrier's sustain list properly on
Burst().
I also added a check in Life() on the carrier to remove it from their
sustained eggs. If something funky happens we don't want to impact the
player from playing

# Explain why it's good for the game
# Testing Photographs and Procedure
<details>
<summary>Screenshots & Videos</summary>

Put screenshots and videos here with an empty line between the
screenshots and the `<details>` tags.

</details>


# Changelog
🆑
fix: Eggsack carrier eggs get properly removed from sustained list upon
bursting.
/🆑
---
 code/modules/cm_aliens/structures/egg.dm                   | 6 +++++-
 .../carbon/xenomorph/mutators/strains/carrier/eggsac.dm    | 7 ++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/code/modules/cm_aliens/structures/egg.dm b/code/modules/cm_aliens/structures/egg.dm
index ce0be7c0c8a1..eda9803c8784 100644
--- a/code/modules/cm_aliens/structures/egg.dm
+++ b/code/modules/cm_aliens/structures/egg.dm
@@ -355,4 +355,8 @@ SPECIAL EGG USED BY EGG CARRIER
 
 /obj/effect/alien/egg/carrier_egg/Burst(kill, instant_trigger, mob/living/carbon/xenomorph/X, is_hugger_player_controlled)
 	. = ..()
-	owner = null
+	if(owner)
+		var/datum/behavior_delegate/carrier_eggsac/behavior = owner.behavior_delegate
+		behavior.remove_egg_owner(src)
+	if(life_timer)
+		deltimer(life_timer)
diff --git a/code/modules/mob/living/carbon/xenomorph/mutators/strains/carrier/eggsac.dm b/code/modules/mob/living/carbon/xenomorph/mutators/strains/carrier/eggsac.dm
index 3d032da2fe36..3b321ca259c9 100644
--- a/code/modules/mob/living/carbon/xenomorph/mutators/strains/carrier/eggsac.dm
+++ b/code/modules/mob/living/carbon/xenomorph/mutators/strains/carrier/eggsac.dm
@@ -63,9 +63,10 @@
 /datum/behavior_delegate/carrier_eggsac/on_life()
 	if(length(eggs_sustained) > egg_sustain_cap)
 		var/obj/effect/alien/egg/carrier_egg/my_egg = eggs_sustained[1]
-		remove_egg_owner(my_egg)
-		my_egg.start_unstoppable_decay()
-		to_chat(bound_xeno, SPAN_XENOWARNING("You can only sustain [egg_sustain_cap] eggs off hive weeds! Your oldest placed egg is decaying rapidly."))
+		if(my_egg)
+			remove_egg_owner(my_egg)
+			my_egg.start_unstoppable_decay()
+			to_chat(bound_xeno, SPAN_XENOWARNING("You can only sustain [egg_sustain_cap] eggs off hive weeds! Your oldest placed egg is decaying rapidly."))
 
 	for(var/obj/effect/alien/egg/carrier_egg/my_egg as anything in eggs_sustained)
 		//Get the distance from us to our sustained egg

From 570f55aae0900de1baf4423cc1a96205cdedc65b Mon Sep 17 00:00:00 2001
From: cuberound <122645057+cuberound@users.noreply.github.com>
Date: Sun, 3 Dec 2023 13:29:51 +0100
Subject: [PATCH 53/58] adds returns to prevent runtimes in
 /datum/component/healing_reduction/process(delta_time) hopefuly (#5084)

# About the pull request

when there is no parent the function deleted src but then kept going and
asked for parent of null, it calls return now instead

# Explain why it's good for the game

runtime bad


# Testing Photographs and Procedure
<details>
<summary>Screenshots & Videos</summary>

Put screenshots and videos here with an empty line between the
screenshots and the `<details>` tags.

</details>


# Changelog
:cl:
fix: fixed a runtime in
/datum/component/healing_reduction/process(delta_time)
/:cl:

---------

Co-authored-by: Drathek <76988376+Drulikar@users.noreply.github.com>
---
 code/datums/components/healing_reduction.dm | 31 +++++++++++----------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/code/datums/components/healing_reduction.dm b/code/datums/components/healing_reduction.dm
index b98d52cab251..54ea02dc6b73 100644
--- a/code/datums/components/healing_reduction.dm
+++ b/code/datums/components/healing_reduction.dm
@@ -21,33 +21,36 @@ Humans will take continuous damage instead.
 	src.healing_reduction_dissipation = healing_reduction_dissipation
 	src.max_buildup = max_buildup
 
-/datum/component/healing_reduction/InheritComponent(datum/component/healing_reduction/C, i_am_original, healing_reduction)
+/datum/component/healing_reduction/InheritComponent(datum/component/healing_reduction/inherit_component, i_am_original, healing_reduction)
 	. = ..()
-	if(!C)
+	if(!inherit_component)
 		src.healing_reduction += healing_reduction
 	else
-		src.healing_reduction += C.healing_reduction
+		src.healing_reduction += inherit_component.healing_reduction
 
 	src.healing_reduction = min(src.healing_reduction, max_buildup)
 
 /datum/component/healing_reduction/process(delta_time)
 	if(!parent)
 		qdel(src)
-	healing_reduction = max(healing_reduction - healing_reduction_dissipation * delta_time, 0)
+		return
 
-	if(ishuman(parent)) //deals brute to humans
-		var/mob/living/carbon/human/H = parent
-		H.apply_damage(healing_reduction_dissipation * delta_time, BRUTE)
+	healing_reduction = max(healing_reduction - healing_reduction_dissipation * delta_time, 0)
 
 	if(healing_reduction <= 0)
 		qdel(src)
+		return
+
+	if(ishuman(parent)) //deals brute to humans
+		var/mob/living/carbon/human/human_parent = parent
+		human_parent.apply_damage(healing_reduction_dissipation * delta_time, BRUTE)
 
 	var/color = GLOW_COLOR
 	var/intensity = healing_reduction/max_buildup
 	color += num2text(MAX_ALPHA*intensity, 2, 16)
 
-	var/atom/A = parent
-	A.add_filter("healing_reduction", 2, list("type" = "outline", "color" = color, "size" = 1))
+	var/atom/parent_atom = parent
+	parent_atom.add_filter("healing_reduction", 2, list("type" = "outline", "color" = color, "size" = 1))
 
 /datum/component/healing_reduction/RegisterWithParent()
 	START_PROCESSING(SSdcs, src)
@@ -64,14 +67,14 @@ Humans will take continuous damage instead.
 		COMSIG_XENO_ON_HEAL_WOUNDS,
 		COMSIG_XENO_APPEND_TO_STAT
 	))
-	var/atom/A = parent
-	A.remove_filter("healing_reduction")
+	var/atom/parent_atom = parent
+	parent_atom.remove_filter("healing_reduction")
 
-/datum/component/healing_reduction/proc/stat_append(mob/M, list/L)
+/datum/component/healing_reduction/proc/stat_append(mob/target_mob, list/stat_list)
 	SIGNAL_HANDLER
-	L += "Healing Reduction: [healing_reduction]/[max_buildup]"
+	stat_list += "Healing Reduction: [healing_reduction]/[max_buildup]"
 
-/datum/component/healing_reduction/proc/apply_healing_reduction(mob/living/carbon/xenomorph/X, list/healing)
+/datum/component/healing_reduction/proc/apply_healing_reduction(mob/living/carbon/xenomorph/xeno, list/healing)
 	SIGNAL_HANDLER
 	healing["healing"] -= healing_reduction
 

From 0d0565939ab88053e619363ab5129f6436e5e670 Mon Sep 17 00:00:00 2001
From: cm13-github <128137806+cm13-github@users.noreply.github.com>
Date: Sun, 3 Dec 2023 12:38:24 +0000
Subject: [PATCH 54/58] Automatic changelog for PR #5084 [ci skip]

---
 html/changelogs/AutoChangeLog-pr-5084.yml | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 html/changelogs/AutoChangeLog-pr-5084.yml

diff --git a/html/changelogs/AutoChangeLog-pr-5084.yml b/html/changelogs/AutoChangeLog-pr-5084.yml
new file mode 100644
index 000000000000..2ace834670e5
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-5084.yml
@@ -0,0 +1,4 @@
+author: "cuberound"
+delete-after: True
+changes:
+  - bugfix: "fixed a runtime in /datum/component/healing_reduction/process(delta_time)"
\ No newline at end of file

From 2bbc1d792081aca5903fccb745e7f7e2a8410e08 Mon Sep 17 00:00:00 2001
From: forest2001 <41653574+realforest2001@users.noreply.github.com>
Date: Sun, 3 Dec 2023 12:39:22 +0000
Subject: [PATCH 55/58] asrs spec_kit fix & working marine tokens (#5066)

# About the pull request
Merry Christmas.
<!-- Remove this text and explain what the purpose of your PR is.

Mention if you have tested your changes. If you changed a map, make sure
you used the mapmerge tool.
If this is an Issue Correction, you can type "Fixes Issue #169420" to
link the PR to the corresponding Issue number #169420.

Remember: something that is self-evident to you might not be to others.
Explain your rationale fully, even if you feel it goes without saying.
-->

# Explain why it's good for the game
# Testing Photographs and Procedure
<details>
<summary>Screenshots & Videos</summary>

Put screenshots and videos here with an empty line between the
screenshots and the `<details>` tags.

</details>


# Changelog
:cl:
fix: Fixes /spec_kit/asrs (now /spec_kit/rifleman) not allowing use.
code: Adds back-end functionality for token redeeming on cm_vending
vendors, and moves synth experimental tools token to use it.
add: Spec tokens are real.
/:cl:
---
 code/__DEFINES/skills.dm                      |  2 ++
 code/__DEFINES/vendors.dm                     |  7 ++++
 code/datums/supply_packs/operations.dm        |  8 ++---
 code/game/machinery/vending/cm_vending.dm     | 32 +++++++++++++++--
 .../vending/vendor_types/crew/synthetic.dm    | 10 +++---
 code/game/objects/items/devices/coins.dm      | 36 +++++++++++++++----
 code/modules/cm_marines/equipment/gear.dm     |  9 -----
 .../modules/cm_marines/equipment/kit_boxes.dm | 17 ++++++++-
 code/modules/cm_marines/smartgun_mount.dm     |  6 ----
 9 files changed, 94 insertions(+), 33 deletions(-)

diff --git a/code/__DEFINES/skills.dm b/code/__DEFINES/skills.dm
index 5dabb4545a32..d33e26c1c3f6 100644
--- a/code/__DEFINES/skills.dm
+++ b/code/__DEFINES/skills.dm
@@ -42,6 +42,8 @@
 #define SKILL_SPEC_DEFAULT 0
 /// Is trained to use specialist gear, but hasn't picked a kit.
 #define SKILL_SPEC_TRAINED 1
+/// Is trained to use specialist gear & HAS picked a kit. (Functionally same as SPEC_ROCKET)
+#define SKILL_SPEC_KITTED 2
 /// Can use RPG
 #define SKILL_SPEC_ROCKET 2
 /// Can use thermal cloaks and custom M4RA rifle
diff --git a/code/__DEFINES/vendors.dm b/code/__DEFINES/vendors.dm
index 04ee5ffef2b6..eeec210a56c3 100644
--- a/code/__DEFINES/vendors.dm
+++ b/code/__DEFINES/vendors.dm
@@ -67,3 +67,10 @@
 //Whether or not to load ammo boxes depending on ammo loaded into the vendor
 //Only relevant in big vendors, like Requisitions or Squad Prep
 #define VEND_LOAD_AMMO_BOXES (1<<9)
+
+// Redemption Tokens
+#define VEND_TOKEN_ENGINEER "Engineer"
+#define VEND_TOKEN_SPEC "Specialist"
+#define VEND_TOKEN_SYNTH "Synthetic"
+/// Token invalid/unrecognised.
+#define VEND_TOKEN_VOID "Void"
diff --git a/code/datums/supply_packs/operations.dm b/code/datums/supply_packs/operations.dm
index 6d5e5d14756c..dcc270cb00a1 100644
--- a/code/datums/supply_packs/operations.dm
+++ b/code/datums/supply_packs/operations.dm
@@ -112,10 +112,10 @@
 /datum/supply_packs/spec_kits
 	name = "Weapons Specialist Kits"
 	contains = list(
-		/obj/item/spec_kit/asrs,
-		/obj/item/spec_kit/asrs,
-		/obj/item/spec_kit/asrs,
-		/obj/item/spec_kit/asrs,
+		/obj/item/spec_kit/rifleman,
+		/obj/item/spec_kit/rifleman,
+		/obj/item/spec_kit/rifleman,
+		/obj/item/spec_kit/rifleman,
 	)
 	cost = 0
 	containertype = /obj/structure/closet/crate/supply
diff --git a/code/game/machinery/vending/cm_vending.dm b/code/game/machinery/vending/cm_vending.dm
index 6205f24c8e05..b0a09dcd1767 100644
--- a/code/game/machinery/vending/cm_vending.dm
+++ b/code/game/machinery/vending/cm_vending.dm
@@ -440,6 +440,34 @@ GLOBAL_LIST_EMPTY(vending_products)
 	user.set_interaction(src)
 	tgui_interact(user)
 
+/// Handles redeeming coin tokens.
+/obj/structure/machinery/cm_vending/attackby(obj/item/attacking_item, mob/user)
+	if(!istype(attacking_item, /obj/item/coin/marine))
+		..()
+	if(!can_access_to_vend(user, ignore_hack = TRUE))
+		return FALSE
+	redeem_token(attacking_item, user)
+
+/obj/structure/machinery/cm_vending/proc/redeem_token(obj/item/coin/marine/token, mob/user)
+	var/reward_typepath
+	switch(token.token_type)
+		if(VEND_TOKEN_VOID)
+			to_chat(user, SPAN_WARNING("ERROR: TOKEN NOT RECOGNISED."))
+			return FALSE
+		if(VEND_TOKEN_SPEC)
+			reward_typepath = /obj/item/spec_kit/rifleman
+		else
+			to_chat(user, SPAN_WARNING("ERROR: INCORRECT TOKEN."))
+			return FALSE
+
+	if(reward_typepath && user.drop_inv_item_to_loc(token, src))
+		to_chat(user, SPAN_NOTICE("You insert \the [token] into \the [src]."))
+		var/obj/new_item = new reward_typepath(get_turf(src))
+		user.put_in_any_hand_if_possible(new_item)
+		return TRUE
+	return FALSE
+
+
 //------------TGUI PROCS---------------
 
 /obj/structure/machinery/cm_vending/ui_data(mob/user)
@@ -743,8 +771,8 @@ GLOBAL_LIST_EMPTY(vending_products)
 /obj/structure/machinery/cm_vending/proc/get_listed_products(mob/user)
 	return listed_products
 
-/obj/structure/machinery/cm_vending/proc/can_access_to_vend(mob/user, display=TRUE)
-	if(!hacked)
+/obj/structure/machinery/cm_vending/proc/can_access_to_vend(mob/user, display = TRUE, ignore_hack = FALSE)
+	if(!hacked || ignore_hack)
 		if(!allowed(user))
 			if(display)
 				to_chat(user, SPAN_WARNING("Access denied."))
diff --git a/code/game/machinery/vending/vendor_types/crew/synthetic.dm b/code/game/machinery/vending/vendor_types/crew/synthetic.dm
index b489dbab16a4..ecef3ed622d9 100644
--- a/code/game/machinery/vending/vendor_types/crew/synthetic.dm
+++ b/code/game/machinery/vending/vendor_types/crew/synthetic.dm
@@ -335,13 +335,13 @@ GLOBAL_LIST_INIT(cm_vending_clothing_synth_snowflake, list(
 	req_access = list(ACCESS_MARINE_SYNTH)
 	vendor_role = list(JOB_SYNTH)
 
-/obj/structure/machinery/cm_vending/own_points/experimental_tools/attackby(obj/item/W, mob/user)
-	if(istype(W, /obj/item/coin/marine/synth))
-		if(user.drop_inv_item_to_loc(W, src))
+/obj/structure/machinery/cm_vending/own_points/experimental_tools/redeem_token(obj/item/coin/marine/token, mob/user)
+	if(token.token_type == VEND_TOKEN_SYNTH)
+		if(user.drop_inv_item_to_loc(token, src))
 			available_points = 30
 			available_points_to_display = available_points
-			to_chat(user, SPAN_NOTICE("You insert \the [W] into \the [src]."))
-			return
+			to_chat(user, SPAN_NOTICE("You insert \the [token] into \the [src]."))
+			return TRUE
 	return ..()
 
 /obj/structure/machinery/cm_vending/own_points/experimental_tools/get_listed_products(mob/user)
diff --git a/code/game/objects/items/devices/coins.dm b/code/game/objects/items/devices/coins.dm
index 139ea1cbac8c..6c00364642da 100644
--- a/code/game/objects/items/devices/coins.dm
+++ b/code/game/objects/items/devices/coins.dm
@@ -67,12 +67,6 @@
 	icon_state = "coin_platinum"
 	black_market_value = 35
 
-/obj/item/coin/marine/synth
-	name = "synthetic experimental tool redemption token"
-	desc = "Insert this into a synthetic experimental tools vendor in order to access a variety of experimental support tools."
-	icon_state = "coin_synth"
-	black_market_value = 0
-
 /obj/item/coin/chitin
 	name = "chitin coin"
 	desc = "Durable alien chitin pressed into a coin. There are much better uses for chitin..."
@@ -121,3 +115,33 @@
 		comment = "heads"
 	user.visible_message(SPAN_NOTICE("[user] has thrown \the [src]. It lands on [comment]! "), \
 						SPAN_NOTICE("You throw \the [src]. It lands on [comment]! "))
+
+
+/obj/item/coin/marine
+	name = "marine equipment token"
+	desc = "I wonder what it does?"
+	icon_state = "coin_copper"
+	black_market_value = 0
+	/// What is the token for?
+	var/token_type = VEND_TOKEN_VOID
+
+/obj/item/coin/marine/attackby(obj/item/W as obj, mob/user as mob) //To remove attaching a string functionality
+	return
+
+/obj/item/coin/marine/engineer
+	name = "marine engineer support token"
+	desc = "Insert this into an engineer vendor in order to access a support weapon."
+	icon_state = "coin_gold"
+	token_type = VEND_TOKEN_ENGINEER
+
+/obj/item/coin/marine/specialist
+	name = "marine specialist weapon token"
+	desc = "Insert this into a USCM equipment vendor in order to access a single highly dangerous weapon."
+	icon_state = "coin_diamond"
+	token_type = VEND_TOKEN_SPEC
+
+/obj/item/coin/marine/synth
+	name = "synthetic experimental tool redemption token"
+	desc = "Insert this into a synthetic experimental tools vendor in order to access a variety of experimental support tools."
+	icon_state = "coin_synth"
+	token_type = VEND_TOKEN_SYNTH
diff --git a/code/modules/cm_marines/equipment/gear.dm b/code/modules/cm_marines/equipment/gear.dm
index b3ec6c800c68..00f956fdd4ed 100644
--- a/code/modules/cm_marines/equipment/gear.dm
+++ b/code/modules/cm_marines/equipment/gear.dm
@@ -149,15 +149,6 @@
 		return FALSE
 	. = ..()
 	handle_cloaking()
-
-/obj/item/coin/marine
-	name = "marine specialist weapon token"
-	desc = "Insert this into a specialist vendor in order to access a single highly dangerous weapon."
-	icon_state = "coin_platinum"
-
-/obj/item/coin/marine/attackby(obj/item/W as obj, mob/user as mob) //To remove attaching a string functionality
-	return
-
 /obj/structure/broken_apc
 	name = "\improper M577 armored personnel carrier"
 	desc = "A large, armored behemoth capable of ferrying marines around. \nThis one is sitting nonfunctional."
diff --git a/code/modules/cm_marines/equipment/kit_boxes.dm b/code/modules/cm_marines/equipment/kit_boxes.dm
index 342f9a775718..d99da8f59f2c 100644
--- a/code/modules/cm_marines/equipment/kit_boxes.dm
+++ b/code/modules/cm_marines/equipment/kit_boxes.dm
@@ -165,9 +165,13 @@
 	var/squad_assignment_update = TRUE
 
 //this one is delivered via ASRS as a reward for DEFCON/techwebs/whatever else we will have
-/obj/item/spec_kit/asrs
+/obj/item/spec_kit/rifleman
+	squad_assignment_update = FALSE
 	allowed_roles_list = list(JOB_SQUAD_MARINE, JOB_WO_SQUAD_MARINE)
 
+/obj/item/spec_kit/rifleman/jobless
+	allowed_roles_list = list()
+
 /obj/item/spec_kit/cryo
 	squad_assignment_update = FALSE
 
@@ -212,6 +216,17 @@
 				return FALSE
 			return TRUE
 
+/obj/item/spec_kit/rifleman/can_use(mob/living/carbon/human/user)
+	if(!length(allowed_roles_list))
+		return TRUE
+
+	for(var/allowed_role in allowed_roles_list)
+		if(user.job == allowed_role)//Alternate check to normal kit as this is distributed to people without SKILL_SPEC_TRAINED.
+			if(skillcheck(user, SKILL_SPEC_WEAPONS, SKILL_SPEC_KITTED) && !skillcheckexplicit(user, SKILL_SPEC_WEAPONS, SKILL_SPEC_ALL))
+				to_chat(user, SPAN_WARNING("You already have specialization, give this kit to someone else!"))
+				return FALSE
+			return TRUE
+
 /obj/item/spec_kit/proc/select_and_spawn(mob/living/carbon/human/user)
 	var/selection = tgui_input_list(user, "Pick your specialist equipment type.", "Specialist Kit Selection", GLOB.available_specialist_kit_boxes)
 	if(!selection || QDELETED(src))
diff --git a/code/modules/cm_marines/smartgun_mount.dm b/code/modules/cm_marines/smartgun_mount.dm
index 8b6dde5527e2..01183ebceca5 100644
--- a/code/modules/cm_marines/smartgun_mount.dm
+++ b/code/modules/cm_marines/smartgun_mount.dm
@@ -1,12 +1,6 @@
 //////////////////////////////////////////////////////////////
 //Mounted MG, Replacment for the current jury rig code.
 
-//Adds a coin for engi vendors
-/obj/item/coin/marine/engineer
-	name = "marine engineer support token"
-	desc = "Insert this into an engineer vendor in order to access a support weapon."
-	icon_state = "coin_platinum"
-
 // First thing we need is the ammo drum for this thing.
 /obj/item/ammo_magazine/m56d
 	name = "M56D drum magazine (10x28mm Caseless)"

From c1c8de0201d1d203baf56d977ad4ffef4b6947b0 Mon Sep 17 00:00:00 2001
From: cm13-github <128137806+cm13-github@users.noreply.github.com>
Date: Sun, 3 Dec 2023 12:52:32 +0000
Subject: [PATCH 56/58] Automatic changelog for PR #5066 [ci skip]

---
 html/changelogs/AutoChangeLog-pr-5066.yml | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 html/changelogs/AutoChangeLog-pr-5066.yml

diff --git a/html/changelogs/AutoChangeLog-pr-5066.yml b/html/changelogs/AutoChangeLog-pr-5066.yml
new file mode 100644
index 000000000000..96ab60a4bbf4
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-5066.yml
@@ -0,0 +1,6 @@
+author: "realforest2001"
+delete-after: True
+changes:
+  - bugfix: "Fixes /spec_kit/asrs (now /spec_kit/rifleman) not allowing use."
+  - code_imp: "Adds back-end functionality for token redeeming on cm_vending vendors, and moves synth experimental tools token to use it."
+  - rscadd: "Spec tokens are real."
\ No newline at end of file

From a39760261a3f5c7fa19890ac6dc9413d390dbf01 Mon Sep 17 00:00:00 2001
From: MrDas <62486730+Das15@users.noreply.github.com>
Date: Sun, 3 Dec 2023 13:43:30 +0100
Subject: [PATCH 57/58] Fixes ocassional observer minimap desync (#5095)

# About the pull request

Fixes annoying bug involving jumptocoord hrefs in some deadchat
messages, making ghost's minimap desync with the map observer is in.
<!-- Remove this text and explain what the purpose of your PR is.

Mention if you have tested your changes. If you changed a map, make sure
you used the mapmerge tool.
If this is an Issue Correction, you can type "Fixes Issue #169420" to
link the PR to the corresponding Issue number #169420.

Remember: something that is self-evident to you might not be to others.
Explain your rationale fully, even if you feel it goes without saying.
-->

# Explain why it's good for the game
Bugs bad. Removing bugs good.
# Testing Photographs and Procedure
<details>
<summary>Screenshots & Videos</summary>

Put screenshots and videos here with an empty line between the
screenshots and the `<details>` tags.

</details>


# Changelog
:cl: MrDas
fix: Observer minimap should no longer occasionally show wrong / no map.
/:cl:
---
 code/modules/mob/dead/observer/observer.dm | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm
index 887313eb4db9..430f959a7718 100644
--- a/code/modules/mob/dead/observer/observer.dm
+++ b/code/modules/mob/dead/observer/observer.dm
@@ -758,12 +758,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 	if(!tx || !ty || !tz)
 		return
 	following = null
-	spawn(0)
-		// To stop the ghost flickering.
-		x = tx
-		y = ty
-		z = tz
-		sleep(15)
+	forceMove(locate(tx, ty, tz))
 
 /mob/dead/observer/verb/dead_teleport_mob() //Moves the ghost instead of just changing the ghosts's eye -Nodrak
 	set category = "Ghost"

From c46d7545de4667ba83de492410e9a657ff7b97f2 Mon Sep 17 00:00:00 2001
From: cm13-github <128137806+cm13-github@users.noreply.github.com>
Date: Sun, 3 Dec 2023 13:12:53 +0000
Subject: [PATCH 58/58] Automatic changelog for PR #5095 [ci skip]

---
 html/changelogs/AutoChangeLog-pr-5095.yml | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 html/changelogs/AutoChangeLog-pr-5095.yml

diff --git a/html/changelogs/AutoChangeLog-pr-5095.yml b/html/changelogs/AutoChangeLog-pr-5095.yml
new file mode 100644
index 000000000000..8ed12b90778d
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-5095.yml
@@ -0,0 +1,4 @@
+author: "MrDas"
+delete-after: True
+changes:
+  - bugfix: "Observer minimap should no longer occasionally show wrong / no map."
\ No newline at end of file