From e1bcb4859aa7c3bf2afa4e8b595ae8c26cff2216 Mon Sep 17 00:00:00 2001
From: Mark Suckerberg <mark@suckerberg.gay>
Date: Tue, 5 Nov 2024 21:01:20 -0600
Subject: [PATCH 01/29] Mission Abandonment Confirmation (#3707)

<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request

Fixes #3700 by requiring a confirmation pop up to give up on missions.
Minor QoL.

## Why It's Good For The Game

Prevents people from accidentally abandoning missions when they didn't
mean to, and provides more time to reconsider it.

## Changelog

:cl:
add: Added a confirmation pop up for abandoning missions.
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
---
 code/modules/cargo/console.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/modules/cargo/console.dm b/code/modules/cargo/console.dm
index ab03be49e574..c06b7c6bc51e 100644
--- a/code/modules/cargo/console.dm
+++ b/code/modules/cargo/console.dm
@@ -255,7 +255,7 @@
 			else if(mission.servant == ship)
 				if(mission.can_complete())
 					mission.turn_in()
-				else
+				else if(tgui_alert(usr, "Give up on [mission]?", src, list("Yes", "No")) == "Yes")
 					mission.give_up()
 				return TRUE
 

From b51883f06e7244fcd2335379734d179890e67691 Mon Sep 17 00:00:00 2001
From: Changelogs <action@github.com>
Date: Tue, 5 Nov 2024 21:27:23 -0600
Subject: [PATCH 02/29] Automatic changelog generation for PR #3707 [ci skip]

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

diff --git a/html/changelogs/AutoChangeLog-pr-3707.yml b/html/changelogs/AutoChangeLog-pr-3707.yml
new file mode 100644
index 000000000000..5b4491e47906
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-3707.yml
@@ -0,0 +1,4 @@
+author: MarkSuckerberg
+changes:
+  - {rscadd: Added a confirmation pop up for abandoning missions.}
+delete-after: true

From 79d54b4687ad5587f9869714304962858b51f0d7 Mon Sep 17 00:00:00 2001
From: Apogee-dev <60533805+Apogee-dev@users.noreply.github.com>
Date: Tue, 5 Nov 2024 20:01:12 -0800
Subject: [PATCH 03/29] NGR Kali Andhi-class Destroyer (#3554)

<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request

![kali_andhi_ingame](https://github.com/user-attachments/assets/dff8226f-0cfd-4086-be04-34941df001ab)

![kali_andhi](https://github.com/user-attachments/assets/71eaa7d3-ac03-4721-b0c4-001e0d686acc)

![kali_andhi_areas](https://github.com/user-attachments/assets/16497551-4328-49ee-932d-247a80079168)


Adds the Kali Andhi-class, a new class of NGR destroyer that makes up
the bulk of the NGR's young fleet. This class's activity in securing
NGR's territorial claims has made them an unwelcome sight for the PGF
especially. The Kali Andhi is a combat ship, comparable to the Crying
Sun or the Colossus, featuring good armament and plenty of space for the
crew to interact. Crew count is as follows:

- 1 NGR Captain
- 1 Lieutenant; Commands the Operatives, organizes and executes away
missions
- 1 Ensign; Mans the bridge, manages communications, coordinates the
support crew
- 3 Operatives; Soldiers, plain and simple. Can be armed with a
Sidewinder, a Hydra DMR, or an Asp.
- 1 Wrecker; Organize and handle the storage bay, retrieve resources,
and occasionally scout for the Operatives
- 1 Mechanic; Operate and maintain the power and life support systems
- 1 Medical Doctor; Maintain the crew's general health, organize and
manage medical supplies, bag and tag corpses
- 2 Initiates; General-purpose muscle for cleaning and maintaining the
ship.

Also adds a set of NGR Tan floor decals, NGR wall and desk flags, and
tweaks a few of the NGR outfits.

![kali_salute](https://github.com/user-attachments/assets/98f17072-4b00-4c44-ab79-f74f744aa09c)

## Why It's Good For The Game

NGR needs a ship and the Hyena doesn't count.

## Changelog

:cl:
add: the NGR Kali Andhi-class destroyer
add: NGR floor decals and flags
balance: red space suit armor made equivalent to sec hardsuits
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

---------

Signed-off-by: Sun-Soaked <45698967+Sun-Soaked@users.noreply.github.com>
Co-authored-by: meemofcourse <75212565+meemofcourse@users.noreply.github.com>
Co-authored-by: Sun-Soaked <45698967+Sun-Soaked@users.noreply.github.com>
---
 _maps/configs/syndicate_ngr_kaliandhi.json    |   58 +
 .../syndicate/syndicate_ngr_kaliandhi.dmm     | 9160 +++++++++++++++++
 .../decals/turfdecal/flooring_decals.dm       |    2 +
 code/game/objects/items/desk_flags.dm         |    5 +
 .../objects/items/storage/filled_guncases.dm  |    4 +
 .../crates_lockers/closets/secure/security.dm |    5 +
 .../objects/structures/signs/signs_flags.dm   |   12 +
 .../clothing/outfits/factions/syndicate.dm    |   55 +-
 code/modules/clothing/spacesuits/syndi.dm     |   10 +-
 .../manufacturer/scarborough/ballistics.dm    |    2 +
 icons/obj/deskflags.dmi                       |  Bin 649 -> 784 bytes
 icons/obj/structures/signs/wallflags.dmi      |  Bin 1421 -> 2176 bytes
 12 files changed, 9288 insertions(+), 25 deletions(-)
 create mode 100644 _maps/configs/syndicate_ngr_kaliandhi.json
 create mode 100644 _maps/shuttles/syndicate/syndicate_ngr_kaliandhi.dmm

diff --git a/_maps/configs/syndicate_ngr_kaliandhi.json b/_maps/configs/syndicate_ngr_kaliandhi.json
new file mode 100644
index 000000000000..81b32af32741
--- /dev/null
+++ b/_maps/configs/syndicate_ngr_kaliandhi.json
@@ -0,0 +1,58 @@
+{
+	"faction": "/datum/faction/syndicate/ngr",
+	"prefix": "NGRV",
+	"namelists": [
+		"GORLEX",
+		"NATURAL_AGGRESSIVE",
+		"BEASTS",
+		"WEAPONS"
+	],
+	"map_name": "Kali Andhi-class Destroyer",
+	"map_short_name": "Kali Andhi-class",
+	"description": "A post-ICW destroyer design commissioned by the New Gorlex Republic and outfitted for general patrol and reclamation duties. The Kali Andhi-class, despite its young age, has been instrumental in securing New Gorlex's modest territorial claims, making them a somewhat unwelcome sight for the PGF's frontier mission.",
+	"tags": [
+		"RP Focus",
+		"Combat"
+	],
+	"map_path": "_maps/shuttles/syndicate/syndicate_ngr_kaliandhi.dmm",
+	"map_id": "syndicate_gorlex_kaliandhi",
+	"limit": 1,
+	"job_slots": {
+		"Captain": {
+			"outfit": "/datum/outfit/job/syndicate/captain/ngr",
+			"officer": true,
+			"slots": 1
+		},
+		"Lieutenant": {
+			"outfit": "/datum/outfit/job/syndicate/hos/ngr",
+			"officer": true,
+			"slots": 1
+		},
+		"Ensign": {
+			"outfit": "/datum/outfit/job/syndicate/head_of_personnel/ngr",
+			"officer": true,
+			"slots": 1
+		},
+		"Medical Doctor": {
+			"outfit": "/datum/outfit/job/syndicate/doctor/ngr",
+			"slots": 1
+		},
+		"Mechanic": {
+			"outfit": "/datum/outfit/job/syndicate/engineer/ngr",
+			"slots": 1
+		},
+		"Wrecker": {
+			"outfit": "/datum/outfit/job/syndicate/miner/ngr",
+			"slots":1
+		},
+		"Operative": {
+			"outfit": "/datum/outfit/job/syndicate/security/ngr",
+			"slots": 3
+		},
+		"Initiate": {
+			"outfit": "/datum/outfit/job/syndicate/assistant/ngr",
+			"slots": 2
+		}
+	},
+	"enabled": true
+}
diff --git a/_maps/shuttles/syndicate/syndicate_ngr_kaliandhi.dmm b/_maps/shuttles/syndicate/syndicate_ngr_kaliandhi.dmm
new file mode 100644
index 000000000000..acae9b9b0701
--- /dev/null
+++ b/_maps/shuttles/syndicate/syndicate_ngr_kaliandhi.dmm
@@ -0,0 +1,9160 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"ab" = (
+/obj/structure/chair/comfy/shuttle{
+	dir = 1;
+	name = "Operations"
+	},
+/obj/effect/landmark/start/head_of_personnel,
+/obj/effect/turf_decal/corner/opaque/tan{
+	dir = 5
+	},
+/obj/effect/turf_decal/corner/opaque/beige/half,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/bridge)
+"ah" = (
+/obj/machinery/computer/security{
+	dir = 8;
+	icon_state = "computer-right"
+	},
+/obj/structure/railing{
+	dir = 4
+	},
+/obj/effect/turf_decal/corner/opaque/tan/full,
+/obj/effect/turf_decal/techfloor{
+	dir = 4
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"ar" = (
+/obj/structure/closet/syndicate/personal{
+	name = "operative's closet";
+	populate = 0
+	},
+/obj/effect/turf_decal/industrial/outline{
+	color = "#791500"
+	},
+/obj/item/storage/backpack,
+/obj/item/clothing/shoes/combat,
+/obj/item/clothing/under/syndicate/ngr,
+/obj/item/clothing/suit/hooded/wintercoat/security/ngr,
+/obj/item/clothing/gloves/color/black,
+/obj/item/clothing/mask/balaclava/ngr,
+/obj/item/clothing/mask/breath/ngr,
+/obj/item/clothing/neck/shemagh/ngr,
+/obj/item/clothing/head/ngr/flap,
+/obj/item/clothing/head/ngr,
+/obj/machinery/camera/autoname,
+/obj/structure/sign/poster/contraband/stechkin{
+	pixel_x = -32
+	},
+/turf/open/floor/pod/dark,
+/area/ship/security)
+"au" = (
+/obj/effect/turf_decal/industrial/warning,
+/obj/machinery/atmospherics/pipe/layer_manifold/visible,
+/turf/open/floor/pod/dark,
+/area/ship/crew/canteen)
+"av" = (
+/obj/machinery/porta_turret/ship/ngr/light{
+	dir = 9;
+	id = "kali_grid"
+	},
+/turf/closed/wall/mineral/plastitanium,
+/area/ship/bridge)
+"aA" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/door/airlock/maintenance_hatch{
+	dir = 4;
+	name = "Port Thrusters";
+	req_access_txt = "10"
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 8
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 4
+	},
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/engineering/engines/port)
+"aL" = (
+/obj/structure/table/reinforced,
+/obj/effect/turf_decal/corner/opaque/tan/full,
+/obj/effect/turf_decal/techfloor{
+	dir = 1
+	},
+/obj/machinery/newscaster/directional/west,
+/obj/item/desk_flag/ngr{
+	pixel_x = 11;
+	pixel_y = 15
+	},
+/obj/machinery/fax/syndicate,
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"aP" = (
+/obj/effect/turf_decal/corner/opaque/tan/full,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/structure/cable{
+	icon_state = "2-4"
+	},
+/obj/effect/turf_decal/techfloor{
+	dir = 1
+	},
+/obj/machinery/computer/cargo{
+	icon_state = "computer-left"
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"aR" = (
+/obj/structure/chair/comfy/shuttle{
+	dir = 4;
+	name = "Helm"
+	},
+/obj/effect/landmark/start/captain,
+/obj/structure/cable{
+	icon_state = "2-4"
+	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"aS" = (
+/obj/effect/turf_decal/corner/opaque/tan/full,
+/obj/effect/turf_decal/techfloor{
+	dir = 1
+	},
+/obj/structure/cable{
+	icon_state = "1-8"
+	},
+/obj/machinery/computer/monitor{
+	icon_state = "computer-right"
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"bg" = (
+/obj/effect/turf_decal/corner/opaque/beige/mono,
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/bridge)
+"bj" = (
+/obj/machinery/photocopier,
+/obj/effect/turf_decal/corner/opaque/tan/full,
+/obj/structure/sign/flag/ngr{
+	pixel_y = 32
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"bl" = (
+/obj/effect/turf_decal/corner/opaque/tan{
+	dir = 6
+	},
+/obj/effect/turf_decal/corner/opaque/beige/half{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/bridge)
+"bm" = (
+/obj/structure/cable{
+	icon_state = "1-8"
+	},
+/obj/structure/cable{
+	icon_state = "1-4"
+	},
+/obj/effect/turf_decal/corner/opaque/red/mono,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 5
+	},
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+	dir = 1
+	},
+/turf/open/floor/pod/dark,
+/area/ship/engineering)
+"bn" = (
+/obj/docking_port/stationary{
+	dwidth = 10;
+	height = 15;
+	width = 30
+	},
+/turf/template_noop,
+/area/template_noop)
+"bp" = (
+/obj/structure/marker_beacon{
+	picked_color = "Lime"
+	},
+/obj/structure/catwalk/over,
+/turf/open/floor/plating,
+/area/ship/external/dark)
+"bq" = (
+/obj/effect/turf_decal/industrial/warning{
+	dir = 5
+	},
+/turf/open/floor/engine/hull/reinforced,
+/area/ship/external/dark)
+"bt" = (
+/obj/machinery/cryopod{
+	dir = 1
+	},
+/obj/effect/turf_decal/industrial/warning{
+	dir = 1
+	},
+/obj/machinery/airalarm/directional/south,
+/turf/open/floor/pod/dark,
+/area/ship/crew/cryo)
+"bv" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/effect/turf_decal/spline/plain/opaque/solgovgold,
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+	dir = 1
+	},
+/obj/structure/sign/warning/enginesafety{
+	pixel_y = 32
+	},
+/obj/effect/turf_decal/number/zero,
+/turf/open/floor/pod/dark,
+/area/ship/engineering/electrical)
+"bz" = (
+/obj/machinery/porta_turret/ship/ngr/light{
+	dir = 10;
+	id = "kali_grid"
+	},
+/turf/closed/wall/mineral/plastitanium,
+/area/ship/engineering)
+"bH" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/firealarm/directional/south,
+/turf/open/floor/plasteel/stairs{
+	dir = 8;
+	icon = 'icons/obj/stairs.dmi'
+	},
+/area/ship/bridge)
+"bS" = (
+/obj/effect/turf_decal/techfloor{
+	dir = 1
+	},
+/obj/machinery/light/dim/directional/east,
+/obj/machinery/power/ship_gravity,
+/obj/effect/turf_decal/industrial/outline{
+	color = "#791500";
+	layer = 2.04
+	},
+/obj/structure/cable{
+	icon_state = "0-8"
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering/electrical)
+"bX" = (
+/obj/machinery/computer/card{
+	dir = 8;
+	icon_state = "computer-right"
+	},
+/obj/effect/turf_decal/techfloor{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "1-4"
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"bY" = (
+/obj/structure/window/plasma/reinforced{
+	dir = 8
+	},
+/obj/machinery/atmospherics/components/unary/outlet_injector/on/layer4{
+	dir = 8
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 8
+	},
+/turf/open/floor/engine/air,
+/area/ship/engineering/atmospherics)
+"ce" = (
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/ship/engineering)
+"cf" = (
+/obj/machinery/atmospherics/pipe/simple/dark/visible/layer4,
+/obj/effect/turf_decal/techfloor{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
+/obj/machinery/atmospherics/components/binary/pump/layer2{
+	dir = 8;
+	name = "distribution pump"
+	},
+/turf/open/floor/pod/dark,
+/area/ship/engineering/atmospherics)
+"cg" = (
+/obj/structure/cable{
+	icon_state = "1-8"
+	},
+/obj/effect/turf_decal/corner/opaque/tan/mono,
+/obj/machinery/airalarm/directional/east,
+/obj/machinery/light/directional/south,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 9
+	},
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/security)
+"ch" = (
+/obj/effect/turf_decal/corner/opaque/tan{
+	dir = 5
+	},
+/obj/effect/turf_decal/trimline/opaque/bar/line{
+	dir = 1
+	},
+/obj/structure/chair/handrail,
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/central)
+"cj" = (
+/obj/effect/turf_decal/corner/opaque/beige/half{
+	dir = 8
+	},
+/obj/effect/turf_decal/corner/opaque/tan{
+	dir = 6
+	},
+/obj/machinery/power/apc/auto_name/directional/east,
+/obj/structure/cable{
+	icon_state = "0-8"
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/crew)
+"ck" = (
+/obj/effect/turf_decal/spline/plain/opaque/solgovgold{
+	dir = 1
+	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 1
+	},
+/obj/structure/cable{
+	icon_state = "1-4"
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering/electrical)
+"cu" = (
+/obj/machinery/door/airlock/hatch{
+	dir = 8;
+	name = "Storage Bay"
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 4
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/cargo)
+"cJ" = (
+/obj/effect/turf_decal/corner/opaque/tan/full,
+/obj/machinery/turretid/ship{
+	id = "kali_grid";
+	pixel_x = 3;
+	pixel_y = 24
+	},
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
+/obj/item/cigbutt{
+	pixel_x = 7;
+	pixel_y = -3
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"cL" = (
+/obj/effect/turf_decal/corner/opaque/tan/mono,
+/obj/structure/sign/flag/ngr{
+	pixel_y = 32
+	},
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+	dir = 4
+	},
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/security)
+"cX" = (
+/obj/effect/turf_decal/corner/opaque/white/full{
+	color = "#c59973"
+	},
+/obj/effect/turf_decal/corner/opaque/beige/mono,
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/canteen)
+"cY" = (
+/obj/machinery/power/terminal{
+	dir = 8
+	},
+/obj/structure/cable{
+	icon_state = "0-1"
+	},
+/obj/effect/turf_decal/techfloor,
+/obj/machinery/light/small/directional/east,
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering/engines/port)
+"dc" = (
+/obj/effect/turf_decal/steeldecal/steel_decals_central4{
+	dir = 4
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering/engines/port)
+"df" = (
+/obj/machinery/suit_storage_unit/inherit{
+	req_access_txt = "3"
+	},
+/obj/item/clothing/suit/space/syndicate/black/red,
+/obj/item/clothing/head/helmet/space/syndicate/black/red,
+/obj/machinery/light/directional/south,
+/obj/effect/turf_decal/corner/opaque/red/half{
+	dir = 1
+	},
+/obj/effect/turf_decal/borderfloorblack,
+/turf/open/floor/plasteel/dark,
+/area/ship/security/armory)
+"dh" = (
+/obj/structure/catwalk/over,
+/turf/open/floor/plating,
+/area/ship/external/dark)
+"dj" = (
+/obj/machinery/porta_turret/ship/ngr/heavy{
+	dir = 4;
+	id = "kali_grid"
+	},
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/ship/external/dark)
+"dr" = (
+/obj/effect/turf_decal/corner/opaque/tan{
+	dir = 9
+	},
+/obj/effect/turf_decal/corner/opaque/tan,
+/obj/effect/turf_decal/corner/opaque/beige{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 6
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 6
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"dt" = (
+/obj/machinery/porta_turret/ship/ngr/light{
+	dir = 10;
+	id = "kali_grid"
+	},
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/ship/crew)
+"dv" = (
+/obj/effect/turf_decal/corner/opaque/beige/mono,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 9
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 9
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/crew)
+"dD" = (
+/obj/machinery/light/directional/south,
+/obj/effect/turf_decal/techfloor{
+	dir = 4
+	},
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+	dir = 8
+	},
+/obj/machinery/airalarm/directional/east,
+/obj/item/book/manual/wiki/piloting{
+	pixel_x = -6;
+	pixel_y = 3
+	},
+/obj/structure/table,
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"dE" = (
+/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
+/obj/machinery/door/poddoor/shutters{
+	id = "kali_sec_shut"
+	},
+/turf/open/floor/plating,
+/area/ship/security)
+"dG" = (
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/ship/hallway/central)
+"dM" = (
+/obj/structure/curtain/bounty,
+/obj/effect/spawner/bunk_bed,
+/turf/open/floor/carpet/red,
+/area/ship/crew)
+"dV" = (
+/obj/structure/cable/yellow{
+	icon_state = "0-2"
+	},
+/obj/machinery/power/terminal{
+	dir = 1
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering/electrical)
+"ed" = (
+/obj/effect/turf_decal/industrial/warning{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+	dir = 1
+	},
+/obj/structure/sign/warning/nosmoking/circle{
+	pixel_y = 22
+	},
+/turf/open/floor/pod/dark,
+/area/ship/crew/canteen)
+"eh" = (
+/obj/structure/table,
+/obj/item/paper_bin{
+	pixel_y = 4
+	},
+/obj/item/pen{
+	pixel_y = 4
+	},
+/obj/structure/sign/flag/ngr{
+	dir = 1;
+	pixel_y = -32
+	},
+/turf/open/floor/carpet/red,
+/area/ship/crew)
+"ex" = (
+/obj/structure/railing{
+	dir = 4
+	},
+/obj/machinery/computer/crew{
+	dir = 8;
+	icon_state = "computer-left"
+	},
+/obj/effect/turf_decal/corner/opaque/tan/full,
+/obj/effect/turf_decal/techfloor{
+	dir = 4
+	},
+/obj/machinery/light/directional/north,
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"eI" = (
+/obj/machinery/power/port_gen/pacman/super,
+/obj/structure/cable/yellow,
+/obj/effect/turf_decal/industrial/outline{
+	color = "#791500"
+	},
+/obj/effect/turf_decal/radiation/white,
+/obj/structure/railing,
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/engineering/electrical)
+"eJ" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/effect/turf_decal/corner/opaque/red/mono,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/obj/machinery/holopad/secure,
+/obj/effect/turf_decal/industrial/outline{
+	color = "#791500"
+	},
+/turf/open/floor/pod/dark,
+/area/ship/engineering)
+"eM" = (
+/obj/effect/turf_decal/corner/opaque/tan/mono,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/security)
+"eN" = (
+/obj/structure/table/reinforced,
+/obj/effect/turf_decal/techfloor{
+	dir = 1
+	},
+/obj/structure/cable{
+	icon_state = "1-4"
+	},
+/obj/item/radio/intercom/table{
+	dir = 1;
+	pixel_x = 7;
+	pixel_y = 3
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"eS" = (
+/obj/structure/table/reinforced,
+/obj/item/radio/intercom/wideband/table{
+	dir = 1;
+	pixel_x = -6;
+	pixel_y = 3
+	},
+/obj/effect/turf_decal/techfloor{
+	dir = 1
+	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
+/obj/structure/cable{
+	icon_state = "2-4"
+	},
+/obj/item/reagent_containers/food/drinks/waterbottle{
+	pixel_x = 9;
+	pixel_y = 11
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"eT" = (
+/obj/machinery/computer/helm{
+	dir = 8;
+	icon_state = "computer-left"
+	},
+/obj/effect/turf_decal/techfloor{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/structure/cable{
+	icon_state = "1-8"
+	},
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"eV" = (
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
+/obj/effect/turf_decal/corner/opaque/red/mono,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 9
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 10
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/security/armory)
+"eX" = (
+/obj/structure/closet/syndicate/personal{
+	name = "operative's closet";
+	populate = 0
+	},
+/obj/effect/turf_decal/industrial/outline{
+	color = "#791500"
+	},
+/obj/item/storage/backpack,
+/obj/item/clothing/shoes/combat,
+/obj/item/clothing/under/syndicate/ngr,
+/obj/item/clothing/suit/hooded/wintercoat/security/ngr,
+/obj/item/clothing/gloves/color/black,
+/obj/item/clothing/mask/balaclava/ngr,
+/obj/item/clothing/mask/breath/ngr,
+/obj/item/clothing/neck/shemagh/ngr,
+/obj/item/clothing/head/ngr/flap,
+/obj/item/clothing/head/ngr,
+/turf/open/floor/pod/dark,
+/area/ship/security)
+"fa" = (
+/obj/machinery/atmospherics/pipe/simple/yellow/hidden{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/structure/closet/emcloset/wall/directional/north,
+/obj/effect/turf_decal/hardline_small,
+/turf/open/floor/pod/dark,
+/area/ship/engineering/electrical)
+"fb" = (
+/obj/machinery/door/airlock/maintenance_hatch{
+	name = "Starboard Thrusters";
+	req_access_txt = "10"
+	},
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/door/firedoor/border_only{
+	dir = 1
+	},
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/engineering/engines/starboard)
+"fd" = (
+/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
+/obj/machinery/door/poddoor/shutters{
+	dir = 4;
+	id = "kali_bridge_shut"
+	},
+/obj/structure/cable{
+	icon_state = "0-8"
+	},
+/turf/open/floor/plating,
+/area/ship/bridge)
+"fe" = (
+/obj/structure/railing/corner,
+/obj/structure/reagent_dispensers/fueltank,
+/obj/effect/turf_decal/industrial/outline{
+	color = "#791500"
+	},
+/turf/open/floor/pod/dark,
+/area/ship/engineering/electrical)
+"fh" = (
+/obj/effect/turf_decal/techfloor{
+	dir = 1
+	},
+/obj/structure/cable{
+	icon_state = "0-1"
+	},
+/obj/machinery/light/dim/directional/west,
+/obj/machinery/power/smes/engineering,
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering/electrical)
+"fj" = (
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/ship/crew/dorm)
+"fn" = (
+/obj/machinery/atmospherics/components/unary/outlet_injector/on/layer4,
+/turf/open/floor/engine/hull/reinforced,
+/area/ship/external/dark)
+"fp" = (
+/obj/machinery/light/directional/north,
+/obj/effect/turf_decal/corner/opaque/red/mono,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
+/turf/open/floor/plasteel/tech,
+/area/ship/security)
+"fz" = (
+/obj/machinery/atmospherics/pipe/simple/yellow/visible,
+/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer2{
+	dir = 4
+	},
+/obj/machinery/portable_atmospherics/canister/hydrogen,
+/obj/effect/turf_decal/techfloor{
+	dir = 8
+	},
+/obj/machinery/light/dim/directional/west,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 6
+	},
+/turf/open/floor/pod/dark,
+/area/ship/engineering/atmospherics)
+"fD" = (
+/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
+/obj/machinery/door/poddoor/shutters{
+	id = "kali_eng_shut"
+	},
+/turf/open/floor/plating,
+/area/ship/engineering)
+"fF" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/components/trinary/mixer/airmix{
+	dir = 4;
+	piping_layer = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 1
+	},
+/turf/open/floor/pod/dark,
+/area/ship/engineering/atmospherics)
+"fH" = (
+/obj/machinery/porta_turret/ship/ngr{
+	dir = 9;
+	id = "kali_grid"
+	},
+/turf/closed/wall/mineral/plastitanium,
+/area/ship/hallway/central)
+"fV" = (
+/obj/machinery/door/airlock/hatch{
+	dir = 1;
+	name = "Restroom";
+	req_ship_access = 0
+	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 1
+	},
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/crew/toilet)
+"fY" = (
+/obj/effect/turf_decal/corner/opaque/tan{
+	dir = 9
+	},
+/obj/effect/turf_decal/corner/opaque/beige/half{
+	dir = 4
+	},
+/obj/machinery/light_switch{
+	dir = 4;
+	pixel_x = -19;
+	pixel_y = -7
+	},
+/obj/machinery/button/door{
+	dir = 4;
+	id = "kali_gym_shut";
+	name = "Gym Shutters";
+	pixel_x = -20;
+	pixel_y = 4
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/ccommons)
+"gq" = (
+/obj/structure/closet/crate/bin,
+/obj/effect/turf_decal/corner/opaque/beige{
+	dir = 4
+	},
+/obj/effect/turf_decal/corner/opaque/tan{
+	dir = 9
+	},
+/obj/effect/turf_decal/corner/opaque/tan,
+/obj/structure/sign/warning/vacuum/external{
+	pixel_x = -32;
+	pixel_y = 10
+	},
+/obj/machinery/power/apc/auto_name/directional/south,
+/obj/structure/cable{
+	icon_state = "0-1"
+	},
+/obj/item/trash/can,
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/canteen)
+"gs" = (
+/obj/structure/sign/warning/gasmask,
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/ship/hallway/fore)
+"gw" = (
+/obj/effect/turf_decal/corner/opaque/tan{
+	dir = 5
+	},
+/obj/effect/turf_decal/trimline/opaque/bar/line{
+	dir = 1
+	},
+/obj/structure/sign/directions/supply{
+	dir = 4;
+	pixel_y = 25
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/central)
+"gx" = (
+/obj/machinery/door/airlock/external,
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/hallway/central)
+"gB" = (
+/turf/open/floor/engine/hull/reinforced,
+/area/ship/external/dark)
+"gF" = (
+/obj/structure/marker_beacon{
+	picked_color = "Burgundy"
+	},
+/turf/open/floor/engine/hull/reinforced,
+/area/ship/external/dark)
+"gO" = (
+/obj/effect/turf_decal/corner/opaque/beige/half{
+	dir = 1
+	},
+/obj/effect/turf_decal/corner/opaque/tan{
+	dir = 10
+	},
+/obj/structure/table,
+/obj/item/trash/plate,
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/canteen)
+"gQ" = (
+/obj/effect/turf_decal/corner/opaque/bottlegreen/half,
+/obj/effect/turf_decal/corner/opaque/beige{
+	dir = 5
+	},
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4,
+/turf/open/floor/plasteel/dark,
+/area/ship/medical)
+"gT" = (
+/obj/structure/table,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+	dir = 1
+	},
+/obj/structure/sign/poster/rilena/random{
+	pixel_x = -32
+	},
+/obj/item/stamp/ngr{
+	pixel_x = 5;
+	pixel_y = 8
+	},
+/obj/item/stamp/ngr/ensign{
+	pixel_x = 7;
+	pixel_y = 2
+	},
+/obj/item/flashlight/lamp{
+	pixel_x = -7;
+	pixel_y = 10
+	},
+/obj/item/reagent_containers/food/drinks/waterbottle{
+	pixel_x = -4;
+	pixel_y = 3
+	},
+/turf/open/floor/carpet/black,
+/area/ship/crew/dorm/dormtwo)
+"gU" = (
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/ship/engineering/atmospherics)
+"gV" = (
+/obj/effect/turf_decal/corner/opaque/red/mono,
+/turf/open/floor/plasteel/dark,
+/area/ship/security/armory)
+"ha" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/central)
+"hb" = (
+/obj/effect/turf_decal/corner/opaque/beige/half,
+/obj/effect/turf_decal/corner/opaque/tan{
+	dir = 5
+	},
+/obj/effect/turf_decal/industrial/warning{
+	dir = 1
+	},
+/obj/structure/cable{
+	icon_state = "1-8"
+	},
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+	dir = 1
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/ccommons)
+"hg" = (
+/obj/effect/turf_decal/corner/opaque/bottlegreen{
+	dir = 1
+	},
+/obj/effect/turf_decal/corner/opaque/beige{
+	dir = 10
+	},
+/obj/effect/turf_decal/corner/opaque/beige{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/light_switch{
+	dir = 1;
+	pixel_x = 7;
+	pixel_y = -19
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/obj/structure/extinguisher_cabinet/directional/south{
+	pixel_x = -4
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/medical)
+"hk" = (
+/obj/machinery/power/apc/auto_name/directional/south,
+/obj/structure/cable{
+	icon_state = "0-1"
+	},
+/obj/effect/turf_decal/corner/opaque/red/half{
+	dir = 1
+	},
+/obj/effect/turf_decal/borderfloorblack,
+/obj/structure/chair/bench/orange/directional/north,
+/turf/open/floor/plasteel/tech,
+/area/ship/security)
+"ho" = (
+/obj/effect/turf_decal/corner/opaque/tan{
+	dir = 10
+	},
+/obj/effect/turf_decal/corner/opaque/beige/half{
+	dir = 1
+	},
+/obj/structure/reagent_dispensers/water_cooler{
+	pixel_x = 6
+	},
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "1-4"
+	},
+/obj/machinery/light/directional/south,
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/bridge)
+"hs" = (
+/obj/machinery/suit_storage_unit/inherit,
+/obj/item/clothing/suit/space/syndicate/surplus,
+/obj/item/clothing/head/helmet/space/syndicate/surplus,
+/obj/item/tank/internals/emergency_oxygen/engi,
+/turf/open/floor/plasteel/dark,
+/area/ship/cargo)
+"hB" = (
+/obj/effect/turf_decal/corner/opaque/tan{
+	dir = 10
+	},
+/obj/effect/turf_decal/corner/opaque/beige/half{
+	dir = 1
+	},
+/obj/machinery/light/directional/south,
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/ccommons)
+"hC" = (
+/obj/effect/turf_decal/corner/opaque/tan{
+	dir = 10
+	},
+/obj/effect/turf_decal/corner/opaque/beige/half{
+	dir = 1
+	},
+/obj/structure/cable{
+	icon_state = "2-4"
+	},
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+	dir = 1
+	},
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/bridge)
+"hG" = (
+/obj/effect/turf_decal/corner/opaque/beige/half{
+	dir = 1
+	},
+/obj/effect/turf_decal/corner/opaque/tan{
+	dir = 10
+	},
+/obj/structure/chair/bench/orange/directional/north,
+/obj/machinery/firealarm/directional/south,
+/turf/open/floor/plasteel/dark,
+/area/ship/crew)
+"hI" = (
+/obj/effect/turf_decal/corner/opaque/tan{
+	dir = 6
+	},
+/obj/effect/turf_decal/corner/opaque/tan{
+	dir = 8
+	},
+/obj/effect/turf_decal/corner/opaque/beige{
+	dir = 1
+	},
+/obj/effect/turf_decal/spline/plain/opaque/solgovgold{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/light_switch{
+	dir = 1;
+	pixel_x = -7;
+	pixel_y = -19
+	},
+/obj/machinery/button/door{
+	dir = 1;
+	id = "kali_bridge_shut";
+	name = "Bridge Shutters";
+	pixel_x = 3;
+	pixel_y = -20
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/bridge)
+"hP" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 5
+	},
+/turf/open/floor/plasteel/showroomfloor,
+/area/ship/bridge)
+"ib" = (
+/obj/effect/turf_decal/corner/opaque/tan{
+	dir = 9
+	},
+/obj/effect/turf_decal/trimline/opaque/bar/filled/shrink_ccw{
+	dir = 8
+	},
+/obj/machinery/light/directional/west,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+	dir = 8
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/aft)
+"id" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/central)
+"ik" = (
+/obj/effect/turf_decal/spline/plain/opaque/solgovgold{
+	dir = 8
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/obj/structure/extinguisher_cabinet/directional/south,
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"is" = (
+/obj/effect/turf_decal/corner/opaque/beige/mono,
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/crew)
+"iw" = (
+/obj/machinery/suit_storage_unit/inherit,
+/obj/effect/turf_decal/industrial/warning{
+	dir = 8
+	},
+/obj/item/clothing/suit/space/syndicate/surplus,
+/obj/item/clothing/head/helmet/space/syndicate/surplus,
+/obj/item/tank/internals/emergency_oxygen/engi,
+/turf/open/floor/pod/dark,
+/area/ship/hallway/central)
+"iC" = (
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/ship/engineering/electrical)
+"iE" = (
+/obj/effect/turf_decal/corner/opaque/tan{
+	dir = 10
+	},
+/obj/effect/turf_decal/trimline/opaque/bar/line,
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/central)
+"iI" = (
+/obj/structure/closet/crate/bin,
+/obj/effect/turf_decal/corner/opaque/tan/full,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
+/turf/open/floor/plasteel/dark,
+/area/ship/hallway/central)
+"iN" = (
+/obj/effect/turf_decal/corner/opaque/red/mono,
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/security)
+"iO" = (
+/obj/machinery/power/apc/auto_name/directional/north,
+/obj/structure/cable{
+	icon_state = "0-4"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 6
+	},
+/turf/open/floor/carpet/black,
+/area/ship/crew/dorm/dormtwo)
+"iS" = (
+/obj/effect/turf_decal/corner/opaque/beige/half{
+	dir = 4
+	},
+/obj/effect/turf_decal/corner/opaque/tan{
+	dir = 9
+	},
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
+/obj/machinery/newscaster/directional/west,
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/canteen)
+"ja" = (
+/obj/effect/turf_decal/corner/transparent/bar/diagonal,
+/obj/structure/table/reinforced,
+/obj/item/storage/fancy/donut_box,
+/turf/open/floor/plasteel,
+/area/ship/crew/canteen)
+"jd" = (
+/obj/effect/turf_decal/techfloor,
+/obj/structure/cable{
+	icon_state = "2-4"
+	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/crew/ccommons)
+"jj" = (
+/obj/effect/turf_decal/techfloor{
+	dir = 1
+	},
+/obj/structure/chair/handrail{
+	dir = 8
+	},
+/turf/open/floor/pod/dark,
+/area/ship/crew/cryo)
+"jm" = (
+/obj/effect/turf_decal/techfloor,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/fore)
+"jL" = (
+/obj/machinery/door/airlock/hatch{
+	dir = 8;
+	name = "Armory";
+	normalspeed = 0;
+	req_access = list(3)
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 4
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/security/armory)
+"jM" = (
+/obj/machinery/power/shuttle/engine/electric{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "0-4"
+	},
+/turf/open/floor/plating,
+/area/ship/engineering/engines/starboard)
+"jN" = (
+/obj/structure/closet/secure_closet/engineering_electrical{
+	req_access = null;
+	req_access_txt = "11";
+	req_one_access = null
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering/electrical)
+"ka" = (
+/obj/machinery/porta_turret/ship/ngr/light{
+	dir = 5;
+	id = "kali_grid"
+	},
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/ship/security)
+"kf" = (
+/obj/structure/cable{
+	icon_state = "1-8"
+	},
+/obj/effect/turf_decal/spline/plain/opaque/solgovgold{
+	dir = 8
+	},
+/obj/effect/turf_decal/steeldecal/steel_decals_central7,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 9
+	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering/electrical)
+"kg" = (
+/obj/effect/turf_decal/techfloor,
+/obj/effect/turf_decal/corner/opaque/red/half{
+	dir = 1
+	},
+/obj/structure/closet/crate/bin,
+/turf/open/floor/pod/dark,
+/area/ship/engineering)
+"ki" = (
+/obj/effect/turf_decal/corner/opaque/tan{
+	dir = 10
+	},
+/obj/effect/turf_decal/corner/opaque/tan{
+	dir = 4
+	},
+/obj/effect/turf_decal/corner/opaque/beige{
+	dir = 1
+	},
+/obj/structure/punching_bag,
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/ccommons)
+"kp" = (
+/obj/structure/cable{
+	icon_state = "2-4"
+	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+	dir = 8
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/central)
+"kA" = (
+/obj/effect/turf_decal/corner/opaque/beige/mono,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/ccommons)
+"kB" = (
+/obj/structure/table/reinforced,
+/obj/effect/turf_decal/borderfloorblack{
+	dir = 8
+	},
+/obj/effect/turf_decal/corner/opaque/tan/half{
+	dir = 4
+	},
+/obj/effect/turf_decal/spline/plain/opaque/solgovgold{
+	dir = 8
+	},
+/obj/item/folder/syndicate{
+	pixel_y = 6
+	},
+/obj/item/laser_pointer/red,
+/obj/item/desk_flag/ngr{
+	pixel_x = 11;
+	pixel_y = 15
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/security)
+"kG" = (
+/obj/structure/table/reinforced,
+/obj/machinery/door/window/brigdoor/westright{
+	layer = 3.29;
+	req_access = list(3);
+	req_ship_access = 1
+	},
+/obj/effect/turf_decal/corner/opaque/black/half{
+	dir = 4
+	},
+/obj/machinery/door/poddoor/shutters{
+	dir = 4;
+	id = "kali_armory_shut";
+	layer = 3.3
+	},
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/security/armory)
+"kR" = (
+/obj/structure/reagent_dispensers/watertank,
+/obj/effect/turf_decal/industrial/outline{
+	color = "#791500"
+	},
+/obj/machinery/light/directional/north,
+/obj/machinery/power/apc/auto_name/directional/west,
+/obj/structure/cable{
+	icon_state = "0-2"
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/cargo)
+"kV" = (
+/obj/machinery/photocopier,
+/obj/structure/sign/poster/contraband/bulldog{
+	pixel_x = 32
+	},
+/obj/effect/turf_decal/borderfloorblack{
+	dir = 1
+	},
+/obj/effect/turf_decal/corner/opaque/red/half,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+	dir = 8
+	},
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/security/armory)
+"lf" = (
+/obj/effect/turf_decal/corner/opaque/tan{
+	dir = 5
+	},
+/obj/effect/turf_decal/trimline/opaque/bar/line{
+	dir = 1
+	},
+/obj/machinery/light/directional/north,
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/central)
+"lu" = (
+/obj/machinery/light_switch{
+	dir = 4;
+	pixel_x = -19;
+	pixel_y = -7
+	},
+/obj/effect/turf_decal/corner/opaque/red/mono,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
+/obj/structure/extinguisher_cabinet/directional/west{
+	pixel_y = 4
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/security/armory)
+"lw" = (
+/obj/machinery/atmospherics/pipe/simple/yellow/visible/layer2{
+	dir = 9
+	},
+/obj/machinery/atmospherics/pipe/simple/cyan/visible/layer4{
+	dir = 6
+	},
+/turf/open/floor/pod/dark,
+/area/ship/engineering/atmospherics)
+"lz" = (
+/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
+/turf/open/floor/plating,
+/area/ship/hallway/central)
+"lC" = (
+/obj/effect/turf_decal/corner/opaque/tan{
+	dir = 10
+	},
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+	dir = 1
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/aft)
+"lD" = (
+/obj/structure/table,
+/obj/structure/bedsheetbin,
+/obj/machinery/light/directional/south,
+/turf/open/floor/plasteel/showroomfloor,
+/area/ship/crew/toilet)
+"lF" = (
+/obj/machinery/light/small/directional/east,
+/obj/effect/turf_decal/techfloor{
+	dir = 1
+	},
+/obj/effect/turf_decal/corner/opaque/red/half,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 10
+	},
+/obj/structure/noticeboard{
+	pixel_y = 28
+	},
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/cryo)
+"lG" = (
+/obj/effect/turf_decal/techfloor{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/structure/chair/handrail,
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/fore)
+"lI" = (
+/obj/machinery/door/airlock/hatch{
+	dir = 8;
+	name = "Canteen";
+	req_ship_access = 0
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 4
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/crew/canteen)
+"lK" = (
+/obj/structure/toilet{
+	dir = 4
+	},
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+	dir = 4
+	},
+/turf/open/floor/plasteel/showroomfloor,
+/area/ship/bridge)
+"lP" = (
+/obj/structure/table,
+/obj/item/flashlight/lamp{
+	pixel_x = -8;
+	pixel_y = 4
+	},
+/turf/open/floor/carpet/red,
+/area/ship/crew)
+"lR" = (
+/obj/machinery/shower{
+	pixel_y = 19
+	},
+/obj/structure/window/reinforced{
+	dir = 8
+	},
+/obj/structure/curtain,
+/obj/effect/turf_decal/steeldecal/steel_decals10{
+	dir = 9
+	},
+/obj/item/soap{
+	pixel_x = -5;
+	pixel_y = 6
+	},
+/turf/open/floor/plasteel/showroomfloor,
+/area/ship/crew/toilet)
+"lW" = (
+/obj/effect/turf_decal/steeldecal/steel_decals10{
+	dir = 10
+	},
+/obj/machinery/light/small/directional/south,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 9
+	},
+/obj/structure/chair/handrail{
+	dir = 1
+	},
+/turf/open/floor/plasteel/showroomfloor,
+/area/ship/bridge)
+"lX" = (
+/obj/effect/turf_decal/corner/opaque/tan{
+	dir = 9
+	},
+/obj/effect/turf_decal/trimline/opaque/bar/line{
+	dir = 8
+	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/firealarm/directional/west,
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/aft)
+"ma" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 6
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 6
+	},
+/obj/machinery/advanced_airlock_controller{
+	pixel_y = 25;
+	req_access = null
+	},
+/obj/structure/chair/handrail{
+	dir = 4
+	},
+/turf/open/floor/pod/dark,
+/area/ship/crew/canteen)
+"mb" = (
+/obj/effect/turf_decal/techfloor{
+	dir = 1;
+	layer = 2.04
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "1-8"
+	},
+/obj/effect/turf_decal/steeldecal/steel_decals_central4{
+	dir = 4;
+	layer = 2.038
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/cargo)
+"md" = (
+/obj/effect/turf_decal/corner/opaque/tan{
+	dir = 6
+	},
+/obj/effect/turf_decal/trimline/opaque/bar/line{
+	dir = 4
+	},
+/obj/structure/cabinet/fireaxe{
+	dir = 8;
+	pixel_x = 24
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/aft)
+"mj" = (
+/obj/machinery/cryopod{
+	dir = 1
+	},
+/obj/effect/turf_decal/industrial/warning{
+	dir = 5
+	},
+/turf/open/floor/pod/dark,
+/area/ship/crew/cryo)
+"mn" = (
+/obj/effect/turf_decal/corner/opaque/white/full{
+	color = "#c59973"
+	},
+/obj/effect/turf_decal/corner/opaque/beige/mono,
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/canteen)
+"mt" = (
+/obj/structure/table/wood,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+	dir = 4
+	},
+/obj/item/paper{
+	pixel_x = -6;
+	pixel_y = 7
+	},
+/obj/machinery/newscaster/directional/west,
+/obj/machinery/light/small/directional/south,
+/obj/item/stamp/ngr/captain{
+	pixel_x = -7;
+	pixel_y = 8
+	},
+/obj/item/stamp/ngr{
+	pixel_x = 1;
+	pixel_y = 4
+	},
+/obj/item/flashlight/lamp/green{
+	pixel_x = 7;
+	pixel_y = 4
+	},
+/obj/item/pen/fountain/captain{
+	pixel_x = -4;
+	pixel_y = -1
+	},
+/turf/open/floor/carpet/red_gold,
+/area/ship/crew/dorm/captain)
+"mv" = (
+/obj/machinery/atmospherics/pipe/manifold/yellow/hidden{
+	dir = 8
+	},
+/obj/machinery/light_switch{
+	dir = 4;
+	pixel_x = -19;
+	pixel_y = -7
+	},
+/obj/structure/cable{
+	icon_state = "2-4"
+	},
+/obj/structure/cable{
+	icon_state = "1-4"
+	},
+/obj/effect/turf_decal/hardline_small/left,
+/turf/open/floor/pod/dark,
+/area/ship/engineering/electrical)
+"my" = (
+/obj/effect/turf_decal/corner/opaque/red/half{
+	dir = 8
+	},
+/obj/effect/turf_decal/borderfloorblack{
+	dir = 4
+	},
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+	dir = 8
+	},
+/obj/structure/chair/handrail{
+	dir = 8
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/security/armory)
+"mA" = (
+/obj/structure/cable{
+	icon_state = "1-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/turf/open/floor/carpet/red_gold,
+/area/ship/crew/dorm/captain)
+"mG" = (
+/obj/structure/table/wood,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+	dir = 8
+	},
+/obj/item/reagent_containers/food/drinks/bottle/patron{
+	pixel_x = -6;
+	pixel_y = 16
+	},
+/obj/machinery/airalarm/directional/east,
+/obj/machinery/light/small/directional/south,
+/obj/item/desk_flag/ngr{
+	pixel_x = 8;
+	pixel_y = 15
+	},
+/obj/item/reagent_containers/food/drinks/modglass{
+	icon_state = "mglass-6-";
+	pixel_x = 7;
+	pixel_y = 2
+	},
+/obj/item/reagent_containers/food/drinks/modglass{
+	icon_state = "mglass-6-";
+	pixel_x = -3
+	},
+/turf/open/floor/carpet/red_gold,
+/area/ship/crew/dorm/captain)
+"mK" = (
+/obj/structure/rack,
+/obj/item/storage/box/bodybags{
+	pixel_x = -10;
+	pixel_y = 12
+	},
+/obj/item/storage/box/gloves{
+	pixel_x = 6;
+	pixel_y = 10
+	},
+/obj/item/storage/box/syringes{
+	pixel_x = -8;
+	pixel_y = 2
+	},
+/obj/item/reagent_containers/glass/bottle/formaldehyde{
+	pixel_x = 8
+	},
+/obj/effect/turf_decal/borderfloorwhite,
+/obj/machinery/light/small/directional/south,
+/obj/machinery/light_switch{
+	dir = 1;
+	pixel_x = 7;
+	pixel_y = -19
+	},
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+	dir = 4
+	},
+/turf/open/floor/plasteel/showroomfloor,
+/area/ship/medical)
+"mN" = (
+/obj/structure/closet/secure_closet/armorycage{
+	anchored = 1;
+	can_be_unanchored = 1;
+	name = "armor locker"
+	},
+/obj/effect/turf_decal/corner/opaque/red/half,
+/obj/effect/turf_decal/borderfloorblack{
+	dir = 1
+	},
+/obj/item/clothing/head/helmet/ngr{
+	pixel_x = -8;
+	pixel_y = 7
+	},
+/obj/item/clothing/head/helmet/ngr{
+	pixel_x = -8;
+	pixel_y = 3
+	},
+/obj/item/clothing/head/helmet/ngr{
+	pixel_x = -8;
+	pixel_y = -1
+	},
+/obj/item/clothing/head/helmet/ngr{
+	pixel_x = -8;
+	pixel_y = -5
+	},
+/obj/item/clothing/suit/armor/ngr{
+	pixel_x = 8;
+	pixel_y = 7
+	},
+/obj/item/clothing/suit/armor/ngr{
+	pixel_x = 8;
+	pixel_y = 7
+	},
+/obj/item/clothing/suit/armor/ngr{
+	pixel_x = 8;
+	pixel_y = 7
+	},
+/obj/item/storage/belt/security/webbing/ngr{
+	pixel_x = 7;
+	pixel_y = -4
+	},
+/obj/item/storage/belt/security/webbing/ngr{
+	pixel_x = 7;
+	pixel_y = -4
+	},
+/obj/item/storage/belt/security/webbing/ngr{
+	pixel_x = 7;
+	pixel_y = -4
+	},
+/obj/item/storage/belt/security/webbing/ngr{
+	pixel_x = 7;
+	pixel_y = -4
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/security/armory)
+"mO" = (
+/obj/structure/closet/secure_closet/armorycage{
+	anchored = 1;
+	can_be_unanchored = 1;
+	name = "equipment locker"
+	},
+/obj/effect/turf_decal/corner/opaque/red/half,
+/obj/effect/turf_decal/borderfloorblack{
+	dir = 1
+	},
+/obj/item/melee/knife/survival,
+/obj/item/melee/knife/survival,
+/obj/item/melee/knife/survival,
+/obj/item/melee/knife/survival,
+/obj/item/clothing/mask/gas/syndicate{
+	pixel_x = -7;
+	pixel_y = 5
+	},
+/obj/item/clothing/mask/gas/syndicate{
+	pixel_x = -7;
+	pixel_y = 5
+	},
+/obj/item/clothing/mask/gas/syndicate{
+	pixel_x = -7;
+	pixel_y = 5
+	},
+/obj/item/clothing/mask/gas/syndicate{
+	pixel_x = -7;
+	pixel_y = 5
+	},
+/obj/item/clothing/glasses/hud/security/sunglasses/ngr{
+	pixel_x = 8;
+	pixel_y = 4
+	},
+/obj/item/clothing/glasses/hud/security/sunglasses/ngr{
+	pixel_x = 8;
+	pixel_y = 4
+	},
+/obj/item/clothing/glasses/hud/security/sunglasses/ngr{
+	pixel_x = 8;
+	pixel_y = 4
+	},
+/obj/item/clothing/glasses/hud/security/sunglasses/ngr{
+	pixel_x = 8;
+	pixel_y = 4
+	},
+/obj/item/radio/headset/alt{
+	pixel_x = -2;
+	pixel_y = -5
+	},
+/obj/item/radio/headset/alt{
+	pixel_x = -2;
+	pixel_y = -5
+	},
+/obj/item/radio/headset/alt{
+	pixel_x = -2;
+	pixel_y = -5
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/security/armory)
+"mS" = (
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 10
+	},
+/obj/machinery/firealarm/directional/east,
+/obj/structure/chair/handrail{
+	dir = 8
+	},
+/turf/open/floor/plasteel/showroomfloor,
+/area/ship/crew/toilet)
+"mU" = (
+/obj/structure/sink{
+	dir = 8;
+	pixel_x = 12
+	},
+/obj/effect/turf_decal/borderfloorwhite,
+/obj/machinery/light/small/directional/south,
+/obj/machinery/light_switch{
+	dir = 1;
+	pixel_x = -7;
+	pixel_y = -19
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 9
+	},
+/turf/open/floor/plasteel/showroomfloor,
+/area/ship/medical)
+"mW" = (
+/obj/structure/guncloset{
+	anchored = 1;
+	can_be_unanchored = 1;
+	open = 0;
+	req_access_txt = "3"
+	},
+/obj/item/gun/ballistic/automatic/pistol/asp/no_mag,
+/obj/machinery/light/directional/north,
+/obj/effect/turf_decal/corner/opaque/red/half,
+/obj/effect/turf_decal/borderfloorblack{
+	dir = 1
+	},
+/obj/item/gun/ballistic/automatic/pistol/asp/no_mag,
+/turf/open/floor/plasteel/dark,
+/area/ship/security/armory)
+"na" = (
+/obj/structure/railing{
+	dir = 10
+	},
+/obj/structure/closet,
+/obj/item/radio,
+/obj/item/radio,
+/obj/item/radio,
+/obj/item/radio,
+/obj/item/radio,
+/obj/effect/turf_decal/corner/opaque/red/mono,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+	dir = 1
+	},
+/obj/machinery/power/apc/auto_name/directional/east,
+/obj/structure/cable{
+	icon_state = "0-1"
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/cryo)
+"ne" = (
+/obj/machinery/atmospherics/pipe/simple/yellow/visible,
+/obj/machinery/light/small/directional/east,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering/engines/port)
+"nj" = (
+/obj/machinery/power/terminal{
+	dir = 8
+	},
+/obj/structure/cable{
+	icon_state = "0-1"
+	},
+/obj/effect/turf_decal/techfloor,
+/obj/machinery/button/door{
+	dir = 8;
+	id = "kali_starboard_engine_blast";
+	name = "Engine Blast Doors";
+	pixel_x = 20;
+	pixel_y = -3
+	},
+/obj/machinery/light_switch{
+	dir = 8;
+	pixel_x = 19;
+	pixel_y = 7
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering/engines/starboard)
+"nm" = (
+/obj/effect/turf_decal/corner/opaque/tan{
+	dir = 5
+	},
+/obj/effect/turf_decal/corner/opaque/tan{
+	dir = 8
+	},
+/obj/effect/turf_decal/trimline/opaque/bar/line{
+	dir = 9
+	},
+/obj/machinery/light/directional/west,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 5
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/central)
+"np" = (
+/obj/effect/turf_decal/corner/opaque/beige/mono,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/crew)
+"nr" = (
+/obj/structure/toilet,
+/obj/structure/curtain,
+/turf/open/floor/plasteel/showroomfloor,
+/area/ship/crew/toilet)
+"ns" = (
+/obj/effect/turf_decal/techfloor{
+	layer = 2.04
+	},
+/obj/structure/closet/emcloset/wall/directional/east,
+/obj/effect/turf_decal/steeldecal/steel_decals_central4{
+	dir = 8;
+	layer = 2.038
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/cargo)
+"nw" = (
+/obj/effect/turf_decal/corner/opaque/tan{
+	dir = 5
+	},
+/obj/effect/turf_decal/trimline/opaque/bar/line{
+	dir = 1
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/central)
+"nA" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering/electrical)
+"nC" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/effect/turf_decal/corner/opaque/red/mono,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/security)
+"nG" = (
+/obj/machinery/door/airlock/hatch{
+	id_tag = "kali_bathroom_door";
+	name = "Restroom";
+	req_access_txt = "19"
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 1
+	},
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/bridge)
+"nH" = (
+/obj/structure/marker_beacon{
+	picked_color = "Yellow"
+	},
+/turf/open/floor/engine/hull/reinforced,
+/area/ship/external/dark)
+"nJ" = (
+/obj/machinery/atmospherics/pipe/simple/dark/visible/layer4,
+/obj/effect/turf_decal/techfloor{
+	dir = 4
+	},
+/obj/machinery/airalarm/directional/east,
+/obj/machinery/portable_atmospherics/scrubber,
+/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer4{
+	dir = 8
+	},
+/turf/open/floor/pod/dark,
+/area/ship/engineering/atmospherics)
+"nT" = (
+/obj/machinery/atmospherics/components/trinary/filter/atmos/flipped/n2{
+	dir = 8;
+	piping_layer = 4
+	},
+/obj/structure/chair/handrail{
+	dir = 1
+	},
+/turf/open/floor/pod/dark,
+/area/ship/engineering/atmospherics)
+"nV" = (
+/obj/effect/turf_decal/corner/opaque/tan{
+	dir = 9
+	},
+/obj/effect/turf_decal/trimline/opaque/bar/line{
+	dir = 8
+	},
+/obj/machinery/firealarm/directional/west,
+/obj/machinery/camera/autoname{
+	dir = 5
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/central)
+"oa" = (
+/obj/effect/turf_decal/corner/opaque/beige/half{
+	dir = 8
+	},
+/obj/effect/turf_decal/corner/opaque/tan{
+	dir = 6
+	},
+/obj/structure/chair/bench/orange/directional/west,
+/obj/item/radio/intercom/directional/east,
+/turf/open/floor/plasteel/dark,
+/area/ship/crew)
+"oc" = (
+/obj/machinery/door/airlock/hatch{
+	name = "Bridge";
+	normalspeed = 0;
+	req_access_txt = "19"
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 1
+	},
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/bridge)
+"oi" = (
+/obj/structure/sign/number/random,
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/ship/security/armory)
+"ok" = (
+/obj/effect/turf_decal/corner/opaque/tan/full,
+/obj/structure/chair{
+	dir = 8
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/canteen)
+"op" = (
+/obj/structure/tank_dispenser,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+	dir = 1
+	},
+/obj/structure/sign/warning/nosmoking/circle{
+	pixel_y = -20
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/hallway/fore)
+"oD" = (
+/obj/machinery/door/airlock/hatch{
+	id_tag = "kali_captain_door";
+	name = "Captain's Quarters";
+	req_access_txt = "20"
+	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 1
+	},
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/crew/dorm/captain)
+"oG" = (
+/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
+/turf/open/floor/plating,
+/area/ship/medical)
+"oR" = (
+/obj/effect/turf_decal/borderfloorwhite,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 10
+	},
+/obj/structure/chair/handrail{
+	dir = 8
+	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/plasteel/showroomfloor,
+/area/ship/medical)
+"oU" = (
+/obj/structure/cable/yellow{
+	icon_state = "0-2"
+	},
+/obj/machinery/power/terminal{
+	dir = 1
+	},
+/obj/machinery/airalarm/directional/west,
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering/electrical)
+"oW" = (
+/turf/closed/wall/mineral/plastitanium,
+/area/ship/engineering/atmospherics)
+"pb" = (
+/obj/structure/window/reinforced{
+	dir = 8
+	},
+/obj/effect/turf_decal/corner/opaque/beige/half{
+	dir = 4
+	},
+/obj/effect/turf_decal/corner/opaque/tan{
+	dir = 9
+	},
+/obj/structure/closet/wardrobe/black{
+	name = "wardrobe";
+	populate = 0
+	},
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+	dir = 4
+	},
+/obj/item/storage/backpack,
+/obj/item/clothing/shoes/combat,
+/obj/item/clothing/under/syndicate/ngr,
+/obj/item/radio/headset,
+/obj/item/clothing/head/ngr,
+/obj/item/clothing/head/ngr/flap,
+/obj/item/clothing/neck/shemagh/ngr,
+/obj/item/clothing/suit/hooded/wintercoat/security/ngr,
+/turf/open/floor/plasteel/dark,
+/area/ship/crew)
+"pl" = (
+/obj/structure/table/reinforced,
+/obj/item/paper_bin{
+	pixel_x = 7;
+	pixel_y = 6
+	},
+/obj/item/folder/syndicate{
+	pixel_x = 7;
+	pixel_y = 6
+	},
+/obj/item/pen/blue{
+	pixel_x = 6;
+	pixel_y = 8
+	},
+/obj/item/pen/red{
+	pixel_x = 6;
+	pixel_y = 4
+	},
+/obj/effect/turf_decal/corner/opaque/tan{
+	dir = 5
+	},
+/obj/effect/turf_decal/corner/opaque/tan{
+	dir = 8
+	},
+/obj/effect/turf_decal/corner/opaque/beige,
+/obj/item/flashlight/lamp{
+	pixel_x = -8;
+	pixel_y = 17
+	},
+/obj/machinery/computer/helm/viewscreen/directional/west,
+/obj/item/stamp/denied{
+	pixel_x = -5;
+	pixel_y = 7
+	},
+/obj/item/stamp{
+	pixel_x = -5;
+	pixel_y = 1
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"pp" = (
+/obj/effect/turf_decal/techfloor{
+	dir = 1
+	},
+/obj/machinery/computer/atmos_alert{
+	icon_state = "computer-left"
+	},
+/obj/effect/turf_decal/corner/opaque/red/half,
+/turf/open/floor/pod/dark,
+/area/ship/engineering)
+"ps" = (
+/obj/structure/tank_dispenser,
+/obj/effect/turf_decal/industrial/warning{
+	dir = 8
+	},
+/obj/structure/sign/warning/nosmoking/circle{
+	pixel_y = -20
+	},
+/turf/open/floor/pod/dark,
+/area/ship/hallway/central)
+"pu" = (
+/obj/effect/turf_decal/industrial/warning{
+	dir = 6
+	},
+/turf/open/floor/engine/hull/reinforced,
+/area/ship/external/dark)
+"pv" = (
+/obj/machinery/atmospherics/components/trinary/filter/atmos/flipped/o2{
+	dir = 8;
+	piping_layer = 4
+	},
+/obj/machinery/light_switch{
+	dir = 1;
+	pixel_x = -7;
+	pixel_y = -19
+	},
+/obj/machinery/button/door{
+	dir = 1;
+	id = "kali_atmos_shut";
+	name = "Atmospherics Shutters";
+	pixel_x = 3;
+	pixel_y = -20
+	},
+/turf/open/floor/pod/dark,
+/area/ship/engineering/atmospherics)
+"py" = (
+/obj/structure/chair/sofa/brown/left/directional/north,
+/obj/machinery/light/dim/directional/south,
+/turf/open/floor/carpet/red,
+/area/ship/crew)
+"pB" = (
+/obj/effect/turf_decal/corner/opaque/red/mono,
+/obj/structure/chair/comfy/shuttle{
+	dir = 4
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/security)
+"pI" = (
+/obj/structure/bed{
+	dir = 8
+	},
+/obj/structure/curtain/cloth/fancy,
+/obj/item/bedsheet/syndie{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/turf/open/floor/carpet/red_gold,
+/area/ship/crew/dorm/captain)
+"pP" = (
+/obj/effect/turf_decal/corner/opaque/bottlegreen,
+/obj/effect/turf_decal/corner/opaque/beige{
+	dir = 5
+	},
+/obj/effect/turf_decal/corner/opaque/beige{
+	dir = 8
+	},
+/obj/structure/sign/poster/official/fruit_bowl{
+	pixel_x = -32
+	},
+/obj/structure/cable{
+	icon_state = "1-4"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 5
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 5
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/medical)
+"pQ" = (
+/obj/effect/turf_decal/corner/opaque/tan{
+	dir = 10
+	},
+/obj/effect/turf_decal/trimline/opaque/bar/line,
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/obj/machinery/firealarm/directional/south,
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/central)
+"pU" = (
+/obj/machinery/atmospherics/pipe/manifold/yellow/visible{
+	dir = 4
+	},
+/obj/effect/turf_decal/techfloor{
+	dir = 1
+	},
+/obj/machinery/button/door{
+	dir = 8;
+	id = "kali_starboard_engine_blast";
+	name = "Engine Blast Doors";
+	pixel_x = 20;
+	pixel_y = -3
+	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/light_switch{
+	dir = 8;
+	pixel_x = 19;
+	pixel_y = 7
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering/engines/starboard)
+"pX" = (
+/obj/effect/turf_decal/corner/opaque/tan{
+	dir = 9
+	},
+/obj/effect/turf_decal/trimline/opaque/bar/filled/shrink_cw{
+	dir = 8
+	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/structure/extinguisher_cabinet/directional/west,
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/aft)
+"pZ" = (
+/obj/structure/chair/sofa/brown/right/directional/west,
+/obj/effect/landmark/start/assistant,
+/obj/structure/sign/poster/contraband/aclf{
+	pixel_x = 32
+	},
+/turf/open/floor/carpet/red,
+/area/ship/crew)
+"qa" = (
+/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
+/obj/machinery/door/poddoor/shutters{
+	id = "kali_bridge_shut"
+	},
+/obj/structure/cable{
+	icon_state = "1-8"
+	},
+/obj/structure/cable{
+	icon_state = "0-8"
+	},
+/obj/structure/cable{
+	icon_state = "2-4"
+	},
+/turf/open/floor/plating,
+/area/ship/bridge)
+"qe" = (
+/obj/machinery/atmospherics/pipe/simple/yellow/visible{
+	dir = 9
+	},
+/obj/effect/turf_decal/techfloor,
+/obj/machinery/power/apc/auto_name/directional/east,
+/obj/structure/cable{
+	icon_state = "0-1"
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering/engines/starboard)
+"ql" = (
+/obj/effect/turf_decal/corner/opaque/tan{
+	dir = 6
+	},
+/obj/effect/turf_decal/trimline/opaque/bar/filled/shrink_ccw{
+	dir = 4
+	},
+/obj/structure/closet/emcloset/wall/directional/east,
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/aft)
+"qo" = (
+/obj/effect/turf_decal/corner/opaque/tan/mono,
+/turf/open/floor/plasteel/dark,
+/area/ship/security)
+"qw" = (
+/obj/structure/curtain,
+/obj/structure/window/reinforced,
+/obj/machinery/shower{
+	pixel_y = 19
+	},
+/obj/effect/turf_decal/steeldecal/steel_decals10{
+	dir = 8
+	},
+/obj/item/soap/deluxe,
+/turf/open/floor/plasteel/showroomfloor,
+/area/ship/bridge)
+"qG" = (
+/obj/effect/turf_decal/corner/opaque/beige/half{
+	dir = 1
+	},
+/obj/effect/turf_decal/corner/opaque/tan{
+	dir = 10
+	},
+/obj/structure/chair{
+	dir = 8
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/canteen)
+"qI" = (
+/obj/effect/turf_decal/corner/opaque/bottlegreen/half{
+	dir = 1
+	},
+/obj/effect/turf_decal/corner/opaque/beige{
+	dir = 10
+	},
+/obj/structure/closet/wall/white/med{
+	name = "medical doctor's locker";
+	pixel_y = -28;
+	req_access_txt = "5"
+	},
+/obj/item/storage/backpack/duffelbag/syndie/med,
+/obj/item/clothing/shoes/combat,
+/obj/item/clothing/under/syndicate/ngr,
+/obj/item/clothing/suit/ngr/smock,
+/obj/item/clothing/head/ngr/surgical,
+/obj/item/clothing/glasses/hud/health,
+/obj/structure/cable{
+	icon_state = "1-4"
+	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 5
+	},
+/obj/item/clothing/head/ngr,
+/obj/item/clothing/suit/hooded/wintercoat/security/ngr,
+/obj/item/radio/headset,
+/obj/item/clothing/mask/breath/ngr,
+/obj/item/clothing/neck/shemagh/ngr,
+/turf/open/floor/plasteel/dark,
+/area/ship/medical)
+"qN" = (
+/obj/machinery/light_switch{
+	pixel_x = -7;
+	pixel_y = 22
+	},
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+	dir = 8
+	},
+/obj/machinery/button/door{
+	id = "kali_bathroom_door";
+	name = "Door Bolt Control";
+	normaldoorcontrol = 1;
+	pixel_x = 3;
+	pixel_y = 23;
+	req_access_txt = "3";
+	specialfunctions = 4
+	},
+/obj/machinery/airalarm/directional/east,
+/turf/open/floor/plasteel/showroomfloor,
+/area/ship/bridge)
+"qP" = (
+/obj/structure/cable{
+	icon_state = "2-4"
+	},
+/obj/effect/turf_decal/spline/plain/opaque/solgovgold{
+	dir = 4
+	},
+/obj/machinery/light/dim/directional/west,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 6
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 6
+	},
+/obj/structure/chair/handrail{
+	dir = 4
+	},
+/turf/open/floor/pod/dark,
+/area/ship/engineering/electrical)
+"qQ" = (
+/obj/effect/turf_decal/corner/opaque/tan{
+	dir = 10
+	},
+/obj/effect/turf_decal/trimline/opaque/bar/filled/shrink_cw,
+/obj/machinery/light/directional/south,
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/central)
+"qS" = (
+/obj/effect/turf_decal/corner/opaque/tan{
+	dir = 6
+	},
+/obj/effect/turf_decal/trimline/opaque/bar/filled/shrink_cw{
+	dir = 4
+	},
+/obj/machinery/light_switch{
+	pixel_x = -7;
+	pixel_y = 22
+	},
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+	dir = 8
+	},
+/obj/machinery/camera/autoname{
+	dir = 6
+	},
+/obj/structure/chair/handrail{
+	dir = 8
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/aft)
+"rj" = (
+/turf/closed/wall/mineral/plastitanium,
+/area/ship/bridge)
+"rm" = (
+/obj/machinery/atmospherics/pipe/simple/yellow/visible,
+/obj/machinery/light/small/directional/east,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering/engines/starboard)
+"rs" = (
+/obj/effect/turf_decal/techfloor{
+	dir = 1
+	},
+/obj/effect/turf_decal/spline/plain/opaque/solgovgold{
+	dir = 1
+	},
+/obj/machinery/light/directional/west,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/fore)
+"rv" = (
+/obj/structure/sink{
+	dir = 8;
+	pixel_x = 12
+	},
+/obj/structure/mirror{
+	pixel_x = 28
+	},
+/turf/open/floor/plasteel/showroomfloor,
+/area/ship/bridge)
+"ry" = (
+/obj/structure/filingcabinet/double{
+	density = 0;
+	dir = 4;
+	pixel_x = -10
+	},
+/obj/effect/turf_decal/corner/opaque/tan{
+	dir = 9
+	},
+/obj/effect/turf_decal/corner/opaque/beige/half{
+	dir = 4
+	},
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+	dir = 4
+	},
+/obj/machinery/power/apc/auto_name/directional/west,
+/obj/structure/cable{
+	icon_state = "0-4"
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"rz" = (
+/obj/structure/sign/poster/contraband/gec{
+	pixel_x = 32
+	},
+/obj/structure/table,
+/obj/effect/turf_decal/techfloor{
+	dir = 1
+	},
+/obj/effect/turf_decal/corner/opaque/red/half,
+/obj/machinery/light/dim/directional/north,
+/obj/item/reagent_containers/food/drinks/waterbottle{
+	pixel_x = -9;
+	pixel_y = 15
+	},
+/obj/item/instrument/guitar{
+	pixel_x = -1;
+	pixel_y = 9
+	},
+/obj/machinery/cell_charger,
+/turf/open/floor/pod/dark,
+/area/ship/engineering)
+"rA" = (
+/obj/machinery/atmospherics/pipe/simple/yellow/visible{
+	dir = 6
+	},
+/obj/machinery/portable_atmospherics/canister/oxygen,
+/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer2{
+	dir = 4
+	},
+/obj/effect/turf_decal/techfloor{
+	dir = 8
+	},
+/turf/open/floor/pod/dark,
+/area/ship/engineering/atmospherics)
+"rF" = (
+/obj/effect/turf_decal/techfloor{
+	layer = 2.04
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/cargo)
+"rI" = (
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/ship/crew)
+"rM" = (
+/obj/machinery/light_switch{
+	dir = 4;
+	pixel_x = -19;
+	pixel_y = 7
+	},
+/obj/structure/closet/crate/bin,
+/obj/effect/turf_decal/corner/opaque/red/half{
+	dir = 1
+	},
+/obj/effect/turf_decal/borderfloorblack,
+/obj/machinery/button/door{
+	dir = 4;
+	id = "kali_sec_shut";
+	name = "Briefing Room Shutters";
+	pixel_x = -20;
+	pixel_y = -3
+	},
+/obj/item/trash/can,
+/obj/item/cigbutt,
+/turf/open/floor/plasteel/tech,
+/area/ship/security)
+"rN" = (
+/obj/effect/turf_decal/corner/opaque/tan{
+	dir = 9
+	},
+/obj/effect/turf_decal/trimline/opaque/bar/filled/line{
+	dir = 8
+	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+	dir = 8
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/aft)
+"rS" = (
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/ship/crew/dorm/dormtwo)
+"rY" = (
+/obj/machinery/shower{
+	pixel_y = 19
+	},
+/obj/structure/window/reinforced{
+	dir = 8
+	},
+/obj/structure/curtain,
+/obj/effect/turf_decal/steeldecal/steel_decals10{
+	dir = 9
+	},
+/turf/open/floor/plasteel/showroomfloor,
+/area/ship/crew/toilet)
+"rZ" = (
+/obj/structure/chair/comfy/grey/directional/east,
+/obj/machinery/power/apc/auto_name/directional/west,
+/obj/structure/cable{
+	icon_state = "0-4"
+	},
+/obj/machinery/light_switch{
+	pixel_x = 7;
+	pixel_y = 22
+	},
+/obj/machinery/button/door{
+	id = "kali_captain_door";
+	name = "Door Bolt Control";
+	normaldoorcontrol = 1;
+	pixel_x = -3;
+	pixel_y = 23;
+	req_access_txt = "3";
+	specialfunctions = 4
+	},
+/turf/open/floor/carpet/red_gold,
+/area/ship/crew/dorm/captain)
+"so" = (
+/obj/effect/turf_decal/techfloor,
+/obj/effect/turf_decal/corner/opaque/red/half{
+	dir = 1
+	},
+/obj/machinery/power/apc/auto_name/directional/south,
+/obj/structure/cable{
+	icon_state = "0-1"
+	},
+/obj/item/cigbutt,
+/turf/open/floor/pod/dark,
+/area/ship/engineering)
+"sA" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 1
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering/electrical)
+"sF" = (
+/obj/machinery/power/shuttle/engine/fire{
+	dir = 4
+	},
+/turf/open/floor/plating,
+/area/ship/engineering/engines/port)
+"sJ" = (
+/obj/effect/turf_decal/industrial/warning{
+	dir = 8
+	},
+/obj/effect/turf_decal/corner/opaque/beige/half{
+	dir = 4
+	},
+/obj/effect/turf_decal/corner/opaque/tan{
+	dir = 9
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
+/obj/structure/cable{
+	icon_state = "2-4"
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/canteen)
+"sM" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/turf/open/floor/plasteel/stairs{
+	dir = 8;
+	icon = 'icons/obj/stairs.dmi'
+	},
+/area/ship/engineering/electrical)
+"sO" = (
+/obj/structure/bookcase/random/fiction,
+/obj/machinery/firealarm/directional/north,
+/obj/structure/sign/poster/syndicate/random{
+	pixel_x = 32
+	},
+/turf/open/floor/carpet/red_gold,
+/area/ship/crew/dorm/captain)
+"sV" = (
+/obj/machinery/atmospherics/pipe/simple/dark/visible/layer4{
+	dir = 9
+	},
+/obj/effect/turf_decal/techfloor{
+	dir = 4
+	},
+/obj/machinery/power/apc/auto_name/directional/east,
+/obj/structure/cable{
+	icon_state = "0-1"
+	},
+/obj/machinery/light/dim/directional/south,
+/turf/open/floor/pod/dark,
+/area/ship/engineering/atmospherics)
+"tc" = (
+/obj/structure/bodycontainer/morgue,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+	dir = 4
+	},
+/turf/open/floor/plasteel/showroomfloor,
+/area/ship/medical)
+"td" = (
+/obj/structure/railing{
+	dir = 6;
+	layer = 4.1
+	},
+/obj/machinery/autolathe/hacked,
+/obj/effect/turf_decal/industrial/outline{
+	color = "#791500"
+	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/pod/dark,
+/area/ship/engineering/electrical)
+"te" = (
+/obj/structure/sign/warning/vacuum{
+	pixel_y = -10
+	},
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/ship/hallway/fore)
+"tf" = (
+/obj/effect/turf_decal/corner/opaque/tan{
+	dir = 5
+	},
+/obj/effect/turf_decal/trimline/opaque/bar/line{
+	dir = 1
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+	dir = 1
+	},
+/obj/structure/closet/emcloset/wall/directional/north,
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/aft)
+"tm" = (
+/obj/structure/window/plasma/reinforced{
+	dir = 8
+	},
+/obj/machinery/atmospherics/components/unary/vent_scrubber{
+	dir = 8
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 8
+	},
+/turf/open/floor/engine/airless,
+/area/ship/engineering/atmospherics)
+"tr" = (
+/obj/effect/turf_decal/corner/opaque/beige/half{
+	dir = 4
+	},
+/obj/effect/turf_decal/corner/opaque/beige{
+	dir = 8
+	},
+/obj/effect/turf_decal/corner/opaque/tan{
+	dir = 1
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/crew)
+"tF" = (
+/obj/effect/turf_decal/corner/opaque/tan{
+	dir = 6
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/aft)
+"tG" = (
+/obj/effect/turf_decal/corner/opaque/white/full{
+	color = "#c59973"
+	},
+/obj/effect/turf_decal/corner/opaque/beige/mono,
+/obj/structure/cable{
+	icon_state = "1-4"
+	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
+/obj/structure/cable{
+	icon_state = "1-8"
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/canteen)
+"tH" = (
+/obj/effect/turf_decal/corner/opaque/tan{
+	dir = 5
+	},
+/obj/effect/turf_decal/trimline/opaque/bar/line{
+	dir = 1
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/obj/structure/extinguisher_cabinet/directional/north,
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/aft)
+"tN" = (
+/obj/structure/table/optable,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
+/obj/machinery/airalarm/directional/north,
+/turf/open/floor/plasteel/showroomfloor,
+/area/ship/medical)
+"tO" = (
+/obj/machinery/suit_storage_unit/inherit,
+/obj/item/clothing/suit/space/syndicate/surplus,
+/obj/item/clothing/head/helmet/space/syndicate/surplus,
+/obj/machinery/airalarm/directional/north,
+/obj/item/tank/internals/emergency_oxygen/engi,
+/turf/open/floor/plasteel/dark,
+/area/ship/cargo)
+"tR" = (
+/obj/machinery/atmospherics/pipe/simple/yellow/visible/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/dark/visible/layer4{
+	dir = 10
+	},
+/obj/effect/turf_decal/techfloor{
+	dir = 4
+	},
+/obj/machinery/light/dim/directional/north,
+/turf/open/floor/pod/dark,
+/area/ship/engineering/atmospherics)
+"tU" = (
+/obj/machinery/door/airlock/maintenance_hatch{
+	name = "Port Thrusters";
+	req_access_txt = "10"
+	},
+/obj/machinery/door/firedoor/border_only,
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/engineering/engines/port)
+"uh" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/plasteel/stairs{
+	dir = 1;
+	icon = 'icons/obj/stairs.dmi'
+	},
+/area/ship/hallway/fore)
+"ui" = (
+/obj/effect/turf_decal/corner/opaque/tan/full,
+/obj/structure/closet/emcloset/anchored,
+/turf/open/floor/plasteel/dark,
+/area/ship/hallway/central)
+"ul" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/effect/turf_decal/corner/opaque/red/mono,
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
+/turf/open/floor/plasteel/tech,
+/area/ship/security)
+"un" = (
+/obj/structure/cable{
+	icon_state = "0-8"
+	},
+/obj/machinery/power/shieldwallgen/atmos/roundstart{
+	dir = 1;
+	id = "kali_entrance_holo";
+	locked = 1
+	},
+/obj/machinery/door/poddoor{
+	dir = 4;
+	id = "kali_entrance_blast"
+	},
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/hallway/fore)
+"uH" = (
+/obj/structure/closet/syndicate/personal{
+	name = "operative's closet";
+	populate = 0
+	},
+/obj/effect/turf_decal/industrial/outline{
+	color = "#791500"
+	},
+/obj/item/storage/backpack,
+/obj/item/clothing/shoes/combat,
+/obj/item/clothing/under/syndicate/ngr,
+/obj/item/clothing/suit/hooded/wintercoat/security/ngr,
+/obj/item/clothing/gloves/color/black,
+/obj/item/clothing/mask/balaclava/ngr,
+/obj/item/clothing/mask/breath/ngr,
+/obj/item/clothing/neck/shemagh/ngr,
+/obj/item/clothing/head/ngr/flap,
+/obj/item/clothing/head/ngr,
+/obj/structure/window/reinforced,
+/turf/open/floor/pod/dark,
+/area/ship/security)
+"uN" = (
+/obj/structure/crate_shelf,
+/turf/open/floor/plasteel/dark,
+/area/ship/cargo)
+"uS" = (
+/obj/machinery/door/airlock/external,
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/crew/canteen)
+"va" = (
+/obj/structure/chair/office{
+	dir = 8
+	},
+/obj/effect/turf_decal/corner/opaque/red/mono,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 5
+	},
+/obj/structure/cable{
+	icon_state = "1-4"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 5
+	},
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/security/armory)
+"vk" = (
+/obj/structure/railing,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
+/turf/open/floor/pod,
+/area/ship/hallway/fore)
+"vl" = (
+/obj/machinery/door/airlock/hatch{
+	dir = 8;
+	name = "Armory";
+	normalspeed = 0;
+	req_access = list(3)
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 4
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/security/armory)
+"vm" = (
+/obj/effect/turf_decal/borderfloorblack{
+	dir = 8
+	},
+/obj/effect/turf_decal/corner/opaque/tan/half{
+	dir = 4
+	},
+/obj/effect/turf_decal/spline/plain/opaque/solgovgold{
+	dir = 8
+	},
+/obj/item/radio/intercom/directional/north,
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/security)
+"vr" = (
+/obj/effect/turf_decal/corner/opaque/red/mono,
+/obj/item/canvas/twentythreeXtwentythree,
+/obj/item/canvas/twentythreeXtwentythree,
+/obj/item/canvas/twentythreeXtwentythree,
+/obj/item/canvas/twentythreeXtwentythree,
+/obj/structure/closet/wall/directional/west{
+	name = "spare display boards"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/security/armory)
+"vC" = (
+/obj/machinery/suit_storage_unit/inherit{
+	req_access_txt = "3"
+	},
+/obj/item/tank/jetpack/carbondioxide,
+/obj/item/clothing/suit/space/hardsuit/syndi/ngr,
+/obj/effect/turf_decal/corner/opaque/red{
+	dir = 1
+	},
+/obj/effect/turf_decal/borderfloorblack{
+	dir = 6
+	},
+/obj/machinery/airalarm/directional/east,
+/turf/open/floor/plasteel/dark,
+/area/ship/security/armory)
+"vJ" = (
+/obj/machinery/recharger{
+	pixel_y = 4
+	},
+/obj/structure/table,
+/obj/item/screwdriver,
+/obj/effect/turf_decal/corner/opaque/red/mono,
+/turf/open/floor/plasteel/dark,
+/area/ship/security/armory)
+"vP" = (
+/obj/machinery/portable_atmospherics/canister/hydrogen,
+/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/yellow/visible,
+/obj/effect/turf_decal/techfloor{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/turf/open/floor/pod/dark,
+/area/ship/engineering/atmospherics)
+"vV" = (
+/obj/effect/turf_decal/corner/opaque/tan{
+	dir = 6
+	},
+/obj/effect/turf_decal/trimline/opaque/bar/filled/line{
+	dir = 4
+	},
+/obj/machinery/light/directional/east,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+	dir = 8
+	},
+/obj/machinery/airalarm/directional/south,
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/aft)
+"vZ" = (
+/obj/effect/turf_decal/corner/transparent/bar/diagonal,
+/obj/structure/table/reinforced,
+/obj/structure/noticeboard{
+	dir = 8;
+	name = "menu board";
+	pixel_x = 28;
+	pixel_y = 3
+	},
+/obj/item/reagent_containers/condiment/peppermill{
+	pixel_x = 8;
+	pixel_y = 10
+	},
+/obj/item/reagent_containers/condiment/saltshaker{
+	pixel_x = 11;
+	pixel_y = 4
+	},
+/obj/item/storage/box/drinkingglasses{
+	pixel_x = -2;
+	pixel_y = 7
+	},
+/turf/open/floor/plasteel,
+/area/ship/crew/canteen)
+"wb" = (
+/obj/machinery/light/small/directional/west,
+/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/structure/chair/handrail{
+	dir = 4
+	},
+/turf/open/floor/pod/dark,
+/area/ship/crew/canteen)
+"wh" = (
+/obj/structure/bed{
+	dir = 1
+	},
+/obj/item/bedsheet/syndie{
+	dir = 1
+	},
+/obj/structure/curtain/cloth/fancy,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 5
+	},
+/turf/open/floor/carpet/black,
+/area/ship/crew/dorm)
+"wj" = (
+/obj/machinery/door/airlock/hatch{
+	dir = 8;
+	req_ship_access = 0
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 8
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/hallway/central)
+"ws" = (
+/obj/structure/table,
+/obj/item/storage/guncase{
+	pixel_y = 4
+	},
+/obj/effect/turf_decal/corner/opaque/red/mono,
+/turf/open/floor/plasteel/dark,
+/area/ship/security/armory)
+"wv" = (
+/obj/machinery/light/small/directional/north,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/turf/open/floor/carpet/black,
+/area/ship/crew/dorm/dormtwo)
+"wx" = (
+/obj/effect/turf_decal/corner/opaque/red/mono,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+	dir = 8
+	},
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
+/turf/open/floor/pod/dark,
+/area/ship/engineering)
+"wE" = (
+/obj/effect/turf_decal/corner/opaque/beige/mono,
+/obj/structure/cable{
+	icon_state = "1-8"
+	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4,
+/turf/open/floor/plasteel/dark,
+/area/ship/crew)
+"wG" = (
+/obj/effect/turf_decal/techfloor,
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/crew/ccommons)
+"wK" = (
+/obj/effect/spawner/bunk_bed{
+	dir = 1
+	},
+/obj/structure/curtain/bounty,
+/obj/structure/sign/poster/syndicate/random{
+	pixel_x = -32
+	},
+/turf/open/floor/carpet/red,
+/area/ship/crew)
+"wL" = (
+/obj/effect/turf_decal/corner/opaque/red/mono,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/security/armory)
+"wM" = (
+/obj/effect/turf_decal/corner/opaque/beige/mono,
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/obj/machinery/button/door{
+	id = "kali_dorms_shut";
+	name = "Crew Quarters Shutters";
+	pixel_x = 3;
+	pixel_y = 23
+	},
+/obj/machinery/light_switch{
+	pixel_x = -7;
+	pixel_y = 22
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/crew)
+"wR" = (
+/obj/effect/turf_decal/corner/opaque/tan/full,
+/obj/structure/chair{
+	dir = 8
+	},
+/obj/structure/sign/poster/syndicate/random{
+	pixel_y = -32
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/canteen)
+"wY" = (
+/obj/effect/turf_decal/corner/opaque/white/full{
+	color = "#c59973"
+	},
+/obj/effect/turf_decal/corner/opaque/beige/mono,
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/canteen)
+"xa" = (
+/obj/effect/turf_decal/corner/opaque/tan{
+	dir = 10
+	},
+/obj/effect/turf_decal/trimline/opaque/bar/line,
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
+/obj/machinery/firealarm/directional/south,
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/aft)
+"xe" = (
+/obj/effect/turf_decal/corner/opaque/beige/half{
+	dir = 1
+	},
+/obj/effect/turf_decal/corner/opaque/tan{
+	dir = 10
+	},
+/obj/machinery/light/dim/directional/south,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+	dir = 1
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/crew)
+"xi" = (
+/obj/structure/closet/syndicate/personal{
+	name = "captain's closet";
+	populate = 0
+	},
+/obj/item/storage/backpack/security,
+/obj/item/clothing/shoes/combat,
+/obj/item/clothing/under/syndicate/ngr/officer,
+/obj/item/clothing/suit/armor/ngr/captain,
+/obj/item/clothing/gloves/combat,
+/obj/item/radio/headset/syndicate/alt/captain,
+/obj/item/clothing/head/ngr/peaked,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 5
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 9
+	},
+/obj/item/clothing/neck/shemagh/ngr,
+/obj/item/clothing/mask/breath/ngr,
+/obj/item/clothing/mask/balaclava/ngr,
+/obj/structure/sign/flag/ngr{
+	dir = 1;
+	pixel_y = -32
+	},
+/obj/item/megaphone,
+/obj/item/storage/guncase/pistol/inherit,
+/obj/item/gun/ballistic/revolver/viper/empty,
+/obj/item/ammo_box/a357/empty,
+/obj/item/ammo_box/a357/empty,
+/turf/open/floor/carpet/red_gold,
+/area/ship/crew/dorm/captain)
+"xo" = (
+/obj/effect/turf_decal/steeldecal/steel_decals10,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/firealarm/directional/west,
+/obj/structure/chair/handrail{
+	dir = 4
+	},
+/turf/open/floor/pod,
+/area/ship/hallway/aft)
+"xp" = (
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/ship/engineering/engines/port)
+"xr" = (
+/obj/effect/turf_decal/corner/opaque/tan{
+	dir = 5
+	},
+/obj/effect/turf_decal/trimline/opaque/bar/filled/shrink_ccw{
+	dir = 1
+	},
+/obj/structure/sign/warning/vacuum/external{
+	pixel_y = 24
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/central)
+"xA" = (
+/obj/effect/turf_decal/corner/opaque/red/mono,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/turf/open/floor/plasteel/tech,
+/area/ship/security)
+"xC" = (
+/obj/structure/mopbucket,
+/obj/item/mop,
+/obj/effect/turf_decal/industrial/outline{
+	color = "#791500"
+	},
+/obj/machinery/light/small/directional/east,
+/turf/open/floor/pod,
+/area/ship/hallway/aft)
+"xH" = (
+/obj/effect/turf_decal/industrial/warning{
+	dir = 1
+	},
+/obj/effect/turf_decal/corner/opaque/tan{
+	dir = 5
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/central)
+"xI" = (
+/obj/machinery/atmospherics/pipe/simple/yellow/visible/layer2{
+	dir = 6
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/dark/visible/layer4{
+	dir = 5
+	},
+/turf/open/floor/pod/dark,
+/area/ship/engineering/atmospherics)
+"xM" = (
+/obj/effect/turf_decal/corner/opaque/tan{
+	dir = 6
+	},
+/obj/effect/turf_decal/trimline/opaque/bar/line{
+	dir = 4
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/central)
+"xN" = (
+/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
+/obj/machinery/door/poddoor/shutters{
+	id = "kali_dorms_shut"
+	},
+/turf/open/floor/plating,
+/area/ship/crew)
+"xO" = (
+/obj/machinery/atmospherics/pipe/simple/yellow/hidden,
+/obj/machinery/door/airlock/maintenance_hatch{
+	name = "Starboard Thrusters";
+	req_access_txt = "10"
+	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/door/firedoor/border_only{
+	dir = 1
+	},
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/engineering/engines/starboard)
+"xP" = (
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/ship/hallway/fore)
+"xU" = (
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 10
+	},
+/obj/structure/cable{
+	icon_state = "1-8"
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"xZ" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
+/turf/open/floor/carpet/red,
+/area/ship/crew)
+"ya" = (
+/obj/effect/turf_decal/corner/opaque/tan{
+	dir = 10
+	},
+/obj/effect/turf_decal/corner/opaque/beige/half{
+	dir = 1
+	},
+/obj/structure/closet/crate/bin,
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/item/reagent_containers/food/drinks/waterbottle{
+	list_reagents = null;
+	pixel_x = 5;
+	pixel_y = 1
+	},
+/obj/structure/noticeboard{
+	dir = 1;
+	pixel_y = -25
+	},
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/bridge)
+"ye" = (
+/obj/effect/turf_decal/corner/opaque/beige/mono,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/turf/open/floor/plasteel/dark,
+/area/ship/crew)
+"yg" = (
+/obj/structure/cable{
+	icon_state = "1-4"
+	},
+/obj/structure/cable{
+	icon_state = "2-4"
+	},
+/obj/effect/turf_decal/steeldecal/steel_decals_central6{
+	dir = 4
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering/engines/starboard)
+"yi" = (
+/obj/effect/turf_decal/techfloor{
+	dir = 10
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 6
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 6
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/crew/ccommons)
+"ym" = (
+/obj/machinery/computer/cryopod/directional/west,
+/obj/machinery/light_switch{
+	pixel_x = 7;
+	pixel_y = 22
+	},
+/obj/effect/turf_decal/techfloor{
+	dir = 1
+	},
+/obj/effect/turf_decal/corner/opaque/red/half,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 6
+	},
+/obj/machinery/firealarm/directional/north{
+	pixel_x = -4
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/cryo)
+"yo" = (
+/obj/machinery/suit_storage_unit/inherit,
+/obj/effect/turf_decal/industrial/warning{
+	dir = 9
+	},
+/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/item/clothing/suit/space/syndicate/surplus,
+/obj/item/clothing/head/helmet/space/syndicate/surplus,
+/obj/item/tank/internals/emergency_oxygen/engi,
+/turf/open/floor/pod/dark,
+/area/ship/crew/canteen)
+"yz" = (
+/obj/effect/turf_decal/corner/opaque/tan{
+	dir = 5
+	},
+/obj/effect/turf_decal/trimline/opaque/bar/filled/line{
+	dir = 1
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+	dir = 1
+	},
+/obj/structure/sign/directions/security{
+	dir = 4;
+	pixel_y = 25
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/central)
+"yC" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/effect/turf_decal/corner/opaque/tan/mono,
+/obj/structure/sign/flag/ngr{
+	dir = 1;
+	pixel_y = -32
+	},
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/security)
+"yG" = (
+/obj/machinery/suit_storage_unit/inherit,
+/obj/item/clothing/suit/space/syndicate/surplus,
+/obj/item/clothing/head/helmet/space/syndicate/surplus,
+/obj/machinery/light/directional/north,
+/obj/machinery/camera/autoname{
+	dir = 8
+	},
+/obj/item/tank/internals/emergency_oxygen/engi,
+/turf/open/floor/plasteel/dark,
+/area/ship/cargo)
+"yI" = (
+/obj/structure/easel{
+	anchored = 1;
+	can_be_unanchored = 1;
+	name = "whiteboard stand"
+	},
+/obj/effect/turf_decal/corner/opaque/tan/mono,
+/obj/machinery/light_switch{
+	dir = 8;
+	pixel_x = 19;
+	pixel_y = 7
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/security)
+"yL" = (
+/obj/effect/turf_decal/corner/opaque/tan{
+	dir = 10
+	},
+/obj/effect/turf_decal/trimline/opaque/bar/filled/shrink_cw{
+	layer = 2.032
+	},
+/obj/structure/cable{
+	icon_state = "1-4"
+	},
+/obj/structure/cable{
+	icon_state = "1-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 5
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 5
+	},
+/obj/structure/sign/directions/service{
+	pixel_y = -20
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/aft)
+"yM" = (
+/obj/effect/turf_decal/corner/opaque/tan{
+	dir = 6
+	},
+/obj/effect/turf_decal/trimline/opaque/bar/line{
+	dir = 4
+	},
+/obj/machinery/light/directional/east,
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/central)
+"yN" = (
+/obj/machinery/door/airlock/hatch{
+	dir = 8;
+	name = "Briefing Room";
+	req_access = list(1)
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 4
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/security)
+"yX" = (
+/obj/structure/chair/bench/orange/directional/west,
+/obj/machinery/light/small/directional/east,
+/turf/open/floor/carpet/black,
+/area/ship/crew/dorm)
+"zc" = (
+/obj/effect/turf_decal/corner/opaque/tan{
+	dir = 5
+	},
+/obj/effect/turf_decal/trimline/opaque/bar/line{
+	dir = 1
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/obj/machinery/firealarm/directional/north,
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/aft)
+"ze" = (
+/obj/structure/closet/crate/radiation{
+	name = "fuel crate"
+	},
+/obj/effect/turf_decal/radiation/white,
+/obj/effect/turf_decal/industrial/outline{
+	color = "#791500"
+	},
+/obj/item/stack/sheet/mineral/uranium/ten,
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering/electrical)
+"zg" = (
+/obj/machinery/defibrillator_mount/loaded{
+	pixel_x = -25
+	},
+/obj/effect/turf_decal/borderfloorwhite,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 6
+	},
+/obj/structure/chair/handrail{
+	dir = 4
+	},
+/turf/open/floor/plasteel/showroomfloor,
+/area/ship/medical)
+"zh" = (
+/obj/structure/bookcase/random/fiction,
+/obj/machinery/airalarm/directional/south,
+/turf/open/floor/carpet/red,
+/area/ship/crew)
+"zj" = (
+/obj/machinery/atmospherics/components/binary/pump{
+	dir = 8;
+	name = "engine fuel pump"
+	},
+/obj/effect/turf_decal/techfloor{
+	dir = 1
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering/engines/starboard)
+"zk" = (
+/obj/effect/turf_decal/techfloor,
+/obj/effect/turf_decal/corner/opaque/red/half{
+	dir = 1
+	},
+/obj/structure/rack,
+/obj/item/pipe_dispenser{
+	pixel_x = 2;
+	pixel_y = 13
+	},
+/obj/item/geiger_counter{
+	pixel_x = 6;
+	pixel_y = 5
+	},
+/obj/item/storage/toolbox/syndicate{
+	name = "syndicate toolbox";
+	pixel_x = -2;
+	pixel_y = 1
+	},
+/obj/machinery/airalarm/directional/south,
+/turf/open/floor/pod/dark,
+/area/ship/engineering)
+"zl" = (
+/obj/machinery/porta_turret/ship/ngr/light{
+	dir = 5;
+	id = "kali_grid"
+	},
+/turf/closed/wall/mineral/plastitanium,
+/area/ship/security/armory)
+"zt" = (
+/obj/effect/turf_decal/corner/opaque/tan{
+	dir = 6
+	},
+/obj/effect/turf_decal/trimline/opaque/bar/line{
+	dir = 4
+	},
+/obj/item/radio/intercom/directional/east,
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/central)
+"zx" = (
+/obj/machinery/atmospherics/pipe/simple/yellow/visible{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/dark/visible/layer4,
+/obj/effect/turf_decal/techfloor{
+	dir = 4
+	},
+/turf/open/floor/pod/dark,
+/area/ship/engineering/atmospherics)
+"zD" = (
+/obj/effect/turf_decal/techfloor{
+	dir = 1;
+	layer = 2.04
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/cargo)
+"zG" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 6
+	},
+/turf/open/floor/pod,
+/area/ship/hallway/aft)
+"zM" = (
+/obj/structure/closet/crate/trashcart,
+/obj/effect/turf_decal/industrial/outline{
+	color = "#791500"
+	},
+/obj/machinery/light_switch{
+	dir = 1;
+	pixel_x = -7;
+	pixel_y = -19
+	},
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+	dir = 8
+	},
+/turf/open/floor/pod,
+/area/ship/hallway/aft)
+"zW" = (
+/obj/effect/turf_decal/corner/opaque/tan{
+	dir = 9
+	},
+/obj/effect/turf_decal/corner/opaque/beige/half{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/ccommons)
+"zZ" = (
+/obj/structure/closet/crate/freezer/blood,
+/obj/effect/turf_decal/corner/opaque/bottlegreen{
+	dir = 4
+	},
+/obj/effect/turf_decal/corner/opaque/beige{
+	dir = 10
+	},
+/obj/effect/turf_decal/corner/opaque/beige{
+	dir = 1
+	},
+/obj/machinery/iv_drip,
+/obj/machinery/light/small/directional/south,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+	dir = 4
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/medical)
+"Ad" = (
+/obj/effect/turf_decal/corner/opaque/beige/mono,
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/crew)
+"Ai" = (
+/obj/structure/table/reinforced,
+/obj/item/paper_bin{
+	pixel_y = 6
+	},
+/obj/item/pen/blue{
+	pixel_x = -1;
+	pixel_y = 8
+	},
+/obj/item/pen/red{
+	pixel_x = -1;
+	pixel_y = 4
+	},
+/obj/machinery/computer/helm/viewscreen/directional/south,
+/obj/effect/turf_decal/borderfloorblack,
+/obj/effect/turf_decal/corner/opaque/red/half{
+	dir = 1
+	},
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+	dir = 1
+	},
+/obj/item/radio/intercom/directional/east,
+/obj/item/stamp/denied{
+	pixel_x = -13;
+	pixel_y = 8
+	},
+/obj/item/stamp{
+	pixel_x = -13;
+	pixel_y = 1
+	},
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/security/armory)
+"An" = (
+/obj/effect/landmark/start/shaft_miner,
+/obj/machinery/button/door{
+	id = "kali_entrance_blast";
+	name = "Blast Door Control";
+	pixel_x = -4;
+	pixel_y = 23
+	},
+/obj/machinery/button/shieldwallgen{
+	id = "kali_entrance_holo";
+	pixel_x = 7;
+	pixel_y = 21
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/open/floor/pod,
+/area/ship/hallway/fore)
+"Ao" = (
+/obj/structure/railing,
+/obj/structure/closet/crate,
+/obj/item/stack/sheet/metal/twenty,
+/obj/item/stack/sheet/glass/twenty,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+	dir = 1
+	},
+/turf/open/floor/pod/dark,
+/area/ship/engineering/electrical)
+"Aq" = (
+/obj/effect/turf_decal/corner/opaque/tan{
+	dir = 9
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/central)
+"As" = (
+/obj/effect/turf_decal/spline/plain/opaque/solgovgold,
+/obj/structure/cable{
+	icon_state = "2-4"
+	},
+/obj/structure/closet/emcloset/wall/directional/north,
+/obj/machinery/firealarm/directional/west,
+/obj/machinery/camera/autoname{
+	dir = 4
+	},
+/turf/open/floor/pod,
+/area/ship/hallway/fore)
+"AF" = (
+/obj/effect/turf_decal/corner/opaque/tan{
+	dir = 9
+	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/structure/cable{
+	icon_state = "2-4"
+	},
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
+/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2,
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/aft)
+"AL" = (
+/obj/effect/turf_decal/industrial/warning,
+/obj/machinery/light/small/directional/west,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/layer2{
+	dir = 1
+	},
+/obj/structure/chair/handrail{
+	dir = 4
+	},
+/turf/open/floor/pod/dark,
+/area/ship/hallway/central)
+"AR" = (
+/obj/effect/turf_decal/corner/transparent/bar/diagonal,
+/obj/machinery/microwave{
+	pixel_y = 8
+	},
+/obj/structure/table/reinforced,
+/obj/machinery/light/directional/north,
+/turf/open/floor/plasteel,
+/area/ship/crew/canteen)
+"AV" = (
+/obj/effect/turf_decal/corner/opaque/tan{
+	dir = 5
+	},
+/obj/effect/turf_decal/corner/opaque/tan,
+/obj/effect/turf_decal/trimline/opaque/bar/filled/shrink_cw{
+	dir = 4
+	},
+/obj/machinery/light_switch{
+	pixel_x = -7;
+	pixel_y = 22
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/aft)
+"AX" = (
+/obj/effect/turf_decal/corner/opaque/tan{
+	dir = 10
+	},
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
+/obj/structure/cable{
+	icon_state = "1-8"
+	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/central)
+"AZ" = (
+/obj/item/gun/ballistic/automatic/smg/sidewinder/no_mag,
+/obj/item/gun/ballistic/automatic/assault/hydra/dmr/no_mag,
+/obj/effect/turf_decal/corner/opaque/red{
+	dir = 8
+	},
+/obj/effect/turf_decal/borderfloorblack{
+	dir = 5
+	},
+/obj/structure/guncloset{
+	anchored = 1;
+	can_be_unanchored = 1;
+	open = 0;
+	req_access_txt = "3"
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/security/armory)
+"Ba" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/item/radio/intercom/directional/north,
+/obj/item/cigbutt,
+/turf/open/floor/pod,
+/area/ship/hallway/fore)
+"Bb" = (
+/obj/structure/table,
+/obj/item/toy/plush/nukeplushie{
+	pixel_x = 10;
+	pixel_y = 14
+	},
+/obj/item/storage/fancy/cigarettes/cigpack_syndicate{
+	pixel_y = 8
+	},
+/obj/item/lighter{
+	pixel_x = 7;
+	pixel_y = -2
+	},
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+	dir = 8
+	},
+/obj/structure/sign/poster/syndicate/random{
+	pixel_x = 32
+	},
+/obj/machinery/newscaster/directional/south,
+/obj/item/stamp/ngr{
+	pixel_x = -10;
+	pixel_y = 7
+	},
+/obj/item/stamp/ngr/lieutenant{
+	pixel_x = -6
+	},
+/turf/open/floor/carpet/black,
+/area/ship/crew/dorm)
+"Bi" = (
+/obj/effect/turf_decal/corner/opaque/red/mono,
+/turf/open/floor/plasteel/dark,
+/area/ship/security)
+"Bk" = (
+/obj/machinery/door/airlock/hatch{
+	dir = 1;
+	name = "Morgue";
+	req_access_txt = "5"
+	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/door/firedoor/border_only{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/medical)
+"Bo" = (
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/ship/hallway/aft)
+"Bt" = (
+/obj/machinery/door/airlock/hatch{
+	dir = 1;
+	name = "Surgery"
+	},
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/door/firedoor/border_only{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/medical)
+"Bu" = (
+/obj/effect/turf_decal/corner/opaque/tan{
+	dir = 10
+	},
+/obj/effect/turf_decal/trimline/opaque/bar/line,
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/obj/machinery/airalarm/directional/south,
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/central)
+"BA" = (
+/obj/effect/turf_decal/corner/opaque/beige/half{
+	dir = 1
+	},
+/obj/effect/turf_decal/corner/opaque/tan{
+	dir = 10
+	},
+/obj/structure/chair{
+	dir = 4
+	},
+/obj/effect/landmark/start/assistant,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/canteen)
+"BB" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/effect/turf_decal/techfloor{
+	dir = 8
+	},
+/turf/open/floor/pod/dark,
+/area/ship/engineering/atmospherics)
+"BG" = (
+/obj/machinery/light/directional/south,
+/obj/effect/turf_decal/corner/opaque/red/half{
+	dir = 1
+	},
+/obj/effect/turf_decal/borderfloorblack,
+/obj/machinery/vending/coffee,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+	dir = 1
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/security)
+"BI" = (
+/obj/structure/table,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+	dir = 1
+	},
+/obj/item/storage/pill_bottle/dice{
+	pixel_x = -7;
+	pixel_y = 6
+	},
+/obj/item/toy/cards/deck/syndicate{
+	pixel_x = 3;
+	pixel_y = 2
+	},
+/obj/item/reagent_containers/food/drinks/waterbottle{
+	pixel_x = 7;
+	pixel_y = 14
+	},
+/turf/open/floor/carpet/red,
+/area/ship/crew)
+"BO" = (
+/obj/machinery/atmospherics/pipe/simple/yellow/visible{
+	dir = 10
+	},
+/obj/effect/turf_decal/techfloor{
+	dir = 1
+	},
+/obj/machinery/power/apc/auto_name/directional/east,
+/obj/structure/cable{
+	icon_state = "0-2"
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering/engines/port)
+"BT" = (
+/obj/machinery/atmospherics/pipe/simple/cyan/visible/layer4,
+/obj/structure/cable{
+	icon_state = "1-8"
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
+/turf/open/floor/pod/dark,
+/area/ship/engineering/atmospherics)
+"BW" = (
+/turf/closed/wall/mineral/plastitanium,
+/area/ship/hallway/central)
+"Ca" = (
+/obj/effect/turf_decal/corner/transparent/bar/diagonal,
+/obj/structure/table/reinforced,
+/obj/machinery/jukebox/boombox,
+/turf/open/floor/plasteel,
+/area/ship/crew/canteen)
+"Ce" = (
+/obj/effect/turf_decal/corner/opaque/tan{
+	dir = 9
+	},
+/obj/effect/turf_decal/trimline/opaque/bar/filled/shrink_ccw{
+	dir = 8
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/central)
+"Cf" = (
+/obj/effect/turf_decal/corner/opaque/tan,
+/obj/effect/turf_decal/trimline/opaque/bar/corner,
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/central)
+"Co" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/effect/turf_decal/steeldecal/steel_decals_central7,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 1
+	},
+/obj/machinery/atmospherics/components/binary/pump/layer4{
+	dir = 8
+	},
+/turf/open/floor/pod/dark,
+/area/ship/engineering/atmospherics)
+"Cs" = (
+/obj/effect/turf_decal/corner/opaque/beige/half,
+/obj/effect/turf_decal/corner/opaque/tan{
+	dir = 5
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/crew)
+"Ct" = (
+/obj/structure/sign/warning/docking{
+	pixel_y = -8
+	},
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/ship/hallway/central)
+"Cu" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/effect/turf_decal/borderfloorblack{
+	dir = 8
+	},
+/obj/effect/turf_decal/corner/opaque/tan/half{
+	dir = 4
+	},
+/obj/effect/turf_decal/spline/plain/opaque/solgovgold{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/obj/structure/closet/emcloset/wall/directional/south,
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/security)
+"CC" = (
+/obj/machinery/porta_turret/ship/ngr{
+	dir = 6;
+	id = "kali_grid"
+	},
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/ship/crew/canteen)
+"CF" = (
+/obj/structure/filingcabinet{
+	density = 0;
+	dir = 8;
+	pixel_x = 10
+	},
+/obj/machinery/light/directional/east,
+/obj/effect/turf_decal/corner/opaque/red/mono,
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/security/armory)
+"CK" = (
+/obj/effect/turf_decal/corner/opaque/bottlegreen/half{
+	dir = 1
+	},
+/obj/effect/turf_decal/corner/opaque/beige{
+	dir = 10
+	},
+/obj/structure/rack,
+/obj/item/storage/box/masks{
+	pixel_x = -8;
+	pixel_y = 8
+	},
+/obj/item/storage/box/gloves{
+	pixel_x = 6;
+	pixel_y = 10
+	},
+/obj/item/storage/firstaid/regular{
+	pixel_x = 8;
+	pixel_y = 2
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/airalarm/directional/south,
+/turf/open/floor/plasteel/dark,
+/area/ship/medical)
+"CQ" = (
+/obj/machinery/suit_storage_unit/inherit{
+	req_access_txt = "3"
+	},
+/obj/item/clothing/suit/space/syndicate/black/red,
+/obj/item/clothing/head/helmet/space/syndicate/black/red,
+/obj/effect/turf_decal/corner/opaque/red/half{
+	dir = 1
+	},
+/obj/effect/turf_decal/borderfloorblack,
+/turf/open/floor/plasteel/dark,
+/area/ship/security/armory)
+"Dd" = (
+/obj/machinery/light/directional/south,
+/turf/open/floor/plasteel/dark,
+/area/ship/hallway/fore)
+"Dk" = (
+/obj/structure/table,
+/obj/effect/turf_decal/corner/opaque/tan/full,
+/obj/item/trash/plate,
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/canteen)
+"Do" = (
+/obj/machinery/power/smes/shuttle/precharged{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "0-8"
+	},
+/obj/structure/window/reinforced{
+	dir = 8
+	},
+/obj/machinery/door/poddoor{
+	dir = 4;
+	id = "kali_starboard_engine_blast"
+	},
+/turf/open/floor/plating,
+/area/ship/engineering/engines/starboard)
+"Dq" = (
+/obj/effect/turf_decal/corner/opaque/beige/half,
+/obj/effect/turf_decal/corner/opaque/tan{
+	dir = 5
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/canteen)
+"Dt" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
+/obj/effect/turf_decal/corner/opaque/red/mono,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/security)
+"Dz" = (
+/obj/machinery/power/apc/auto_name/directional/north,
+/obj/structure/cable{
+	icon_state = "0-2"
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/crew/ccommons)
+"DK" = (
+/obj/effect/turf_decal/techfloor{
+	dir = 1
+	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/light_switch{
+	dir = 4;
+	pixel_x = -19;
+	pixel_y = -7
+	},
+/obj/machinery/button/door{
+	dir = 4;
+	id = "kali_eng_shut";
+	name = "Engineering Shutters";
+	pixel_x = -20;
+	pixel_y = 4
+	},
+/obj/effect/turf_decal/corner/opaque/red/half,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/turf/open/floor/pod/dark,
+/area/ship/engineering)
+"DP" = (
+/obj/effect/turf_decal/corner/opaque/tan{
+	dir = 5
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/aft)
+"Ea" = (
+/obj/effect/turf_decal/corner/opaque/tan{
+	dir = 10
+	},
+/obj/effect/turf_decal/trimline/opaque/bar/line,
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/obj/structure/chair/handrail{
+	dir = 1
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/aft)
+"Ec" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/aft)
+"Eg" = (
+/obj/effect/turf_decal/corner/opaque/tan{
+	dir = 5
+	},
+/obj/structure/cable{
+	icon_state = "1-8"
+	},
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/aft)
+"Eo" = (
+/obj/effect/turf_decal/corner/opaque/tan{
+	dir = 10
+	},
+/obj/effect/turf_decal/trimline/opaque/bar/line,
+/obj/machinery/light/directional/south,
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/aft)
+"Eq" = (
+/obj/effect/turf_decal/corner/opaque/tan{
+	dir = 5
+	},
+/obj/effect/turf_decal/trimline/opaque/bar/filled/line{
+	dir = 1
+	},
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/aft)
+"Es" = (
+/obj/effect/turf_decal/techfloor{
+	dir = 1
+	},
+/obj/structure/cable{
+	icon_state = "0-1"
+	},
+/obj/machinery/power/smes/engineering,
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering/electrical)
+"Et" = (
+/obj/structure/chair/bench/orange/directional/east,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 6
+	},
+/obj/machinery/newscaster/directional/north,
+/obj/machinery/airalarm/directional/west,
+/turf/open/floor/carpet/black,
+/area/ship/crew/dorm/dormtwo)
+"Ew" = (
+/obj/effect/turf_decal/corner/opaque/tan{
+	dir = 1
+	},
+/obj/effect/turf_decal/trimline/opaque/bar/corner{
+	dir = 1
+	},
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/central)
+"Ex" = (
+/obj/structure/chair/sofa/brown/corner/directional/west,
+/obj/machinery/newscaster/directional/east,
+/obj/machinery/camera/autoname{
+	dir = 9
+	},
+/turf/open/floor/carpet/red,
+/area/ship/crew)
+"EC" = (
+/obj/effect/turf_decal/corner/opaque/tan{
+	dir = 6
+	},
+/obj/effect/turf_decal/industrial/warning{
+	dir = 4;
+	layer = 2.04
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/central)
+"EL" = (
+/obj/effect/turf_decal/steeldecal/steel_decals_central4{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "1-8"
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/fore)
+"Fa" = (
+/obj/effect/turf_decal/steeldecal/steel_decals_central4{
+	dir = 8
+	},
+/obj/effect/turf_decal/industrial/warning{
+	dir = 4;
+	layer = 2.04
+	},
+/obj/structure/cable{
+	icon_state = "1-8"
+	},
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/fore)
+"Fc" = (
+/obj/effect/turf_decal/corner/opaque/tan{
+	dir = 10
+	},
+/obj/effect/turf_decal/corner/opaque/beige/half{
+	dir = 1
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/ccommons)
+"Ff" = (
+/obj/machinery/door/airlock/hatch{
+	dir = 4;
+	id_tag = "kali_ensign_door";
+	name = "Ensign's Quarters";
+	req_access_txt = "57"
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 4
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/crew/dorm/dormtwo)
+"Fi" = (
+/obj/structure/cable{
+	icon_state = "0-8"
+	},
+/obj/machinery/power/shieldwallgen/atmos/roundstart{
+	id = "kali_entrance_holo";
+	locked = 1
+	},
+/obj/machinery/door/poddoor{
+	dir = 4;
+	id = "kali_entrance_blast"
+	},
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/hallway/fore)
+"Fp" = (
+/obj/effect/turf_decal/corner/opaque/white/full{
+	color = "#c59973"
+	},
+/obj/effect/turf_decal/corner/opaque/beige/mono,
+/obj/machinery/light/directional/north,
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/canteen)
+"Fv" = (
+/obj/machinery/atmospherics/pipe/simple/cyan/visible/layer4,
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+	dir = 8
+	},
+/turf/open/floor/pod/dark,
+/area/ship/engineering/atmospherics)
+"Fy" = (
+/obj/machinery/door/airlock/hatch{
+	dir = 4;
+	id_tag = "kali_lt_door";
+	name = "Lieutenant's Quarters";
+	req_access_txt = "58"
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 4
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/crew/dorm)
+"Fz" = (
+/obj/effect/turf_decal/corner/opaque/tan{
+	dir = 10
+	},
+/obj/effect/turf_decal/trimline/opaque/bar/line,
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/aft)
+"FD" = (
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/ship/engineering/engines/starboard)
+"FE" = (
+/obj/effect/turf_decal/corner/opaque/beige/half,
+/obj/effect/turf_decal/corner/opaque/tan{
+	dir = 5
+	},
+/obj/effect/turf_decal/industrial/warning{
+	dir = 1
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 9
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 9
+	},
+/obj/structure/weightmachine/weightlifter,
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/ccommons)
+"FF" = (
+/obj/structure/railing,
+/obj/structure/closet/wardrobe/cargotech{
+	name = "wrecker's wardrobe";
+	populate = 0
+	},
+/obj/effect/turf_decal/industrial/outline{
+	color = "#791500"
+	},
+/obj/item/storage/backpack,
+/obj/item/clothing/shoes/workboots,
+/obj/item/clothing/under/syndicate/ngr/jumpsuit,
+/obj/item/clothing/accessory/armband/cargo,
+/obj/item/clothing/suit/hazardvest/ngr,
+/obj/item/clothing/head/hardhat/ngr,
+/obj/item/radio/headset/alt,
+/obj/item/clothing/gloves/explorer,
+/obj/item/clothing/head/ngr/flap,
+/obj/item/clothing/head/ngr,
+/obj/item/clothing/neck/shemagh/ngr,
+/obj/item/clothing/mask/balaclava/ngr,
+/obj/item/clothing/suit/hooded/wintercoat/security/ngr,
+/obj/item/storage/belt/mining,
+/turf/open/floor/pod,
+/area/ship/hallway/fore)
+"FJ" = (
+/obj/machinery/atmospherics/components/binary/pump{
+	dir = 8;
+	name = "engine fuel pump"
+	},
+/obj/effect/turf_decal/techfloor,
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering/engines/starboard)
+"FQ" = (
+/obj/effect/turf_decal/corner/opaque/beige/half{
+	dir = 1
+	},
+/obj/effect/turf_decal/corner/opaque/tan{
+	dir = 10
+	},
+/obj/structure/chair{
+	dir = 4
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/canteen)
+"Gh" = (
+/obj/structure/curtain/bounty,
+/obj/effect/spawner/bunk_bed,
+/obj/structure/sign/poster/syndicate/random{
+	pixel_y = 32
+	},
+/turf/open/floor/carpet/red,
+/area/ship/crew)
+"Gm" = (
+/obj/machinery/atmospherics/components/binary/pump{
+	dir = 8;
+	name = "engine fuel pump"
+	},
+/obj/effect/turf_decal/techfloor{
+	dir = 1
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering/engines/port)
+"Gn" = (
+/obj/machinery/power/shuttle/engine/fire{
+	dir = 4
+	},
+/turf/open/floor/plating,
+/area/ship/engineering/engines/starboard)
+"Gv" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/light_switch{
+	dir = 8;
+	pixel_x = 19;
+	pixel_y = 7
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/turf/open/floor/plasteel/showroomfloor,
+/area/ship/crew/toilet)
+"Gz" = (
+/obj/item/clothing/shoes/combat,
+/obj/structure/closet/syndicate/personal{
+	name = "lieutenant's closet";
+	populate = 0
+	},
+/obj/item/storage/backpack,
+/obj/item/clothing/under/syndicate/ngr/officer,
+/obj/item/clothing/suit/armor/ngr/lieutenant,
+/obj/item/clothing/gloves/color/black,
+/obj/item/clothing/head/ngr/peaked,
+/obj/item/radio/headset/syndicate/alt,
+/obj/item/clothing/glasses/hud/security/sunglasses,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+	dir = 8
+	},
+/obj/item/clothing/neck/shemagh/ngr,
+/obj/item/clothing/mask/breath/ngr,
+/obj/item/clothing/mask/balaclava/ngr,
+/obj/machinery/airalarm/directional/east,
+/obj/machinery/firealarm/directional/north,
+/obj/item/storage/belt/military/assault,
+/obj/item/storage/guncase/pistol/asp,
+/obj/item/megaphone,
+/turf/open/floor/carpet/black,
+/area/ship/crew/dorm)
+"GD" = (
+/obj/effect/turf_decal/corner/opaque/bottlegreen/mono,
+/turf/open/floor/plasteel/dark,
+/area/ship/medical)
+"GE" = (
+/obj/machinery/door/airlock/hatch{
+	dir = 1;
+	name = "Cryo Bay"
+	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 1
+	},
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/crew/cryo)
+"GM" = (
+/obj/structure/railing{
+	dir = 10
+	},
+/obj/structure/table/reinforced,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
+/obj/item/storage/box/gum/nicotine,
+/turf/open/floor/pod,
+/area/ship/hallway/fore)
+"GO" = (
+/obj/effect/turf_decal/corner/opaque/tan{
+	dir = 10
+	},
+/obj/effect/turf_decal/corner/opaque/tan{
+	dir = 1
+	},
+/obj/effect/turf_decal/trimline/opaque/bar/line{
+	dir = 10
+	},
+/obj/machinery/power/apc/auto_name/directional/west,
+/obj/structure/cable{
+	icon_state = "0-4"
+	},
+/obj/machinery/airalarm/directional/south,
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/aft)
+"GP" = (
+/obj/structure/table/reinforced,
+/obj/machinery/computer/secure_data/laptop{
+	dir = 1;
+	pixel_y = 6
+	},
+/obj/effect/turf_decal/borderfloorblack,
+/obj/effect/turf_decal/corner/opaque/red/half{
+	dir = 1
+	},
+/obj/machinery/airalarm/directional/south,
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/security/armory)
+"GR" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 6
+	},
+/obj/structure/sink/kitchen{
+	pixel_y = 20
+	},
+/turf/open/floor/pod,
+/area/ship/hallway/aft)
+"GS" = (
+/obj/effect/turf_decal/corner/opaque/tan{
+	dir = 10
+	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/aft)
+"GV" = (
+/obj/effect/turf_decal/corner/opaque/red/half{
+	dir = 8
+	},
+/obj/effect/turf_decal/borderfloorblack{
+	dir = 4
+	},
+/obj/item/radio/intercom/directional/east,
+/obj/structure/chair/handrail{
+	dir = 8
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/security/armory)
+"GX" = (
+/obj/effect/turf_decal/corner/opaque/tan{
+	dir = 10
+	},
+/obj/effect/turf_decal/trimline/opaque/bar/filled/shrink_ccw,
+/obj/machinery/light/directional/south,
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/aft)
+"Hg" = (
+/obj/machinery/atmospherics/pipe/simple/yellow/hidden,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/light/small/directional/west,
+/turf/open/floor/pod/dark,
+/area/ship/engineering/electrical)
+"Hl" = (
+/obj/machinery/porta_turret/ship/ngr/light{
+	dir = 5;
+	id = "kali_grid"
+	},
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/ship/cargo)
+"Hm" = (
+/obj/effect/turf_decal/corner/opaque/tan/mono,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 9
+	},
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/security)
+"Hn" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/fore)
+"Hp" = (
+/obj/effect/turf_decal/corner/opaque/tan/full,
+/obj/structure/chair{
+	dir = 4
+	},
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+	dir = 1
+	},
+/obj/structure/sign/warning/nosmoking/circle{
+	pixel_y = -20
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/canteen)
+"Hs" = (
+/obj/effect/turf_decal/corner/opaque/tan{
+	dir = 10
+	},
+/obj/effect/turf_decal/trimline/opaque/bar/line,
+/obj/structure/chair/handrail{
+	dir = 1
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/aft)
+"Hx" = (
+/obj/machinery/computer/helm/viewscreen/directional/north,
+/turf/open/floor/carpet/red_gold,
+/area/ship/crew/dorm/captain)
+"Hy" = (
+/obj/docking_port/stationary{
+	dir = 2;
+	dwidth = 15;
+	height = 15;
+	width = 30
+	},
+/turf/template_noop,
+/area/template_noop)
+"HE" = (
+/obj/structure/closet/secure_closet/engineering_personal{
+	populate = 0
+	},
+/obj/effect/turf_decal/techfloor,
+/obj/effect/turf_decal/corner/opaque/red/half{
+	dir = 1
+	},
+/obj/item/storage/backpack/industrial,
+/obj/item/clothing/shoes/workboots,
+/obj/item/clothing/under/syndicate/ngr,
+/obj/item/clothing/suit/hazardvest/ngr,
+/obj/item/clothing/accessory/armband/engine,
+/obj/item/clothing/head/hardhat/ngr,
+/obj/item/storage/belt/utility,
+/obj/machinery/light/dim/directional/east,
+/obj/item/clothing/suit/hooded/wintercoat/security/ngr,
+/obj/item/clothing/mask/balaclava/ngr,
+/obj/item/clothing/head/ngr,
+/obj/item/radio/headset/alt,
+/obj/machinery/firealarm/directional/south,
+/obj/item/clothing/mask/gas/syndicate,
+/turf/open/floor/pod/dark,
+/area/ship/engineering)
+"HH" = (
+/obj/effect/turf_decal/corner/opaque/tan{
+	dir = 10
+	},
+/obj/effect/turf_decal/corner/opaque/beige/half{
+	dir = 1
+	},
+/obj/structure/extinguisher_cabinet/directional/south,
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/ccommons)
+"HM" = (
+/obj/effect/turf_decal/corner/opaque/tan{
+	dir = 10
+	},
+/obj/effect/turf_decal/trimline/opaque/bar/filled/shrink_cw,
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/aft)
+"HQ" = (
+/obj/effect/turf_decal/corner/opaque/tan{
+	dir = 10
+	},
+/obj/effect/turf_decal/trimline/opaque/bar/filled/shrink_ccw,
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
+/obj/machinery/light_switch{
+	dir = 1;
+	pixel_x = 7;
+	pixel_y = -19
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/central)
+"Ic" = (
+/obj/machinery/suit_storage_unit/inherit,
+/obj/item/clothing/suit/space/syndicate/black/engie,
+/obj/item/clothing/head/helmet/space/syndicate/black/engie,
+/obj/item/clothing/shoes/magboots/syndie,
+/obj/effect/turf_decal/corner/opaque/red/mono,
+/obj/item/radio/intercom/directional/east,
+/turf/open/floor/pod/dark,
+/area/ship/engineering)
+"Id" = (
+/obj/structure/sign/poster/syndicate/random{
+	pixel_y = 32
+	},
+/obj/structure/chair/handrail{
+	dir = 8
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/crew/ccommons)
+"If" = (
+/obj/structure/window/reinforced{
+	dir = 8
+	},
+/obj/structure/toilet,
+/obj/structure/curtain,
+/turf/open/floor/plasteel/showroomfloor,
+/area/ship/crew/toilet)
+"Ig" = (
+/obj/machinery/power/shuttle/engine/electric{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "0-4"
+	},
+/turf/open/floor/plating,
+/area/ship/engineering/engines/port)
+"Ij" = (
+/obj/structure/marker_beacon{
+	picked_color = "Lime"
+	},
+/obj/docking_port/mobile{
+	dir = 4;
+	launch_status = 0;
+	port_direction = 2;
+	preferred_direction = 4
+	},
+/obj/structure/catwalk/over,
+/turf/open/floor/plating,
+/area/ship/external/dark)
+"Im" = (
+/obj/effect/turf_decal/techfloor,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/fore)
+"Iu" = (
+/obj/effect/turf_decal/steeldecal/steel_decals_central4{
+	dir = 4
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering/engines/starboard)
+"Iy" = (
+/obj/effect/turf_decal/corner/opaque/tan{
+	dir = 10
+	},
+/obj/effect/turf_decal/trimline/opaque/bar/filled/shrink_cw,
+/obj/machinery/light_switch{
+	dir = 8;
+	pixel_x = 19;
+	pixel_y = 7
+	},
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+	dir = 1
+	},
+/obj/machinery/light/directional/south,
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/central)
+"ID" = (
+/obj/effect/turf_decal/corner/opaque/tan{
+	dir = 6
+	},
+/obj/effect/turf_decal/corner/opaque/tan{
+	dir = 8
+	},
+/obj/effect/turf_decal/trimline/opaque/bar/filled/line{
+	dir = 6
+	},
+/obj/machinery/light_switch{
+	dir = 8;
+	pixel_x = 19;
+	pixel_y = 7
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/central)
+"IP" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/light_switch{
+	pixel_x = -7;
+	pixel_y = 22
+	},
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
+/obj/structure/extinguisher_cabinet/directional/north{
+	pixel_x = 4
+	},
+/obj/effect/turf_decal/number/left_four,
+/turf/open/floor/pod/dark,
+/area/ship/engineering/electrical)
+"IT" = (
+/obj/effect/turf_decal/corner/opaque/beige/half,
+/obj/effect/turf_decal/corner/opaque/tan{
+	dir = 5
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/turf/open/floor/plasteel/dark,
+/area/ship/crew)
+"IW" = (
+/obj/effect/landmark/start/security_officer,
+/obj/effect/turf_decal/corner/opaque/red/mono,
+/obj/structure/chair/comfy/shuttle{
+	dir = 4
+	},
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/security)
+"Jd" = (
+/obj/structure/chair/office{
+	dir = 1
+	},
+/obj/effect/landmark/start/station_engineer,
+/obj/effect/turf_decal/corner/opaque/red/mono,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/open/floor/pod/dark,
+/area/ship/engineering)
+"Je" = (
+/obj/effect/turf_decal/corner/opaque/tan/full,
+/obj/structure/chair{
+	dir = 4
+	},
+/obj/machinery/firealarm/directional/west,
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/canteen)
+"Jg" = (
+/obj/structure/railing,
+/obj/structure/table/reinforced,
+/obj/item/reagent_containers/food/drinks/waterbottle{
+	pixel_x = 5;
+	pixel_y = 11
+	},
+/turf/open/floor/pod,
+/area/ship/hallway/fore)
+"Jr" = (
+/obj/structure/closet/secure_closet/freezer{
+	anchored = 1;
+	locked = 0;
+	name = "fridge"
+	},
+/obj/effect/turf_decal/corner/transparent/bar/diagonal,
+/obj/item/reagent_containers/condiment/soymilk,
+/obj/item/reagent_containers/food/drinks/bottle/orangejuice,
+/obj/item/reagent_containers/condiment/flour,
+/obj/item/storage/fancy/egg_box,
+/obj/item/reagent_containers/condiment/sugar,
+/obj/machinery/airalarm/directional/north,
+/obj/machinery/camera/autoname{
+	dir = 8
+	},
+/turf/open/floor/plasteel,
+/area/ship/crew/canteen)
+"JF" = (
+/obj/effect/turf_decal/corner/opaque/beige/mono,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/crew)
+"JN" = (
+/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
+/turf/open/floor/plating,
+/area/ship/crew/canteen)
+"JV" = (
+/obj/machinery/power/smes/shuttle/precharged{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "0-8"
+	},
+/obj/structure/window/reinforced{
+	dir = 8
+	},
+/obj/machinery/door/poddoor{
+	dir = 4;
+	id = "kali_port_engine_blast"
+	},
+/turf/open/floor/plating,
+/area/ship/engineering/engines/port)
+"JY" = (
+/obj/effect/turf_decal/corner/opaque/tan{
+	dir = 5
+	},
+/obj/effect/turf_decal/trimline/opaque/bar/line{
+	dir = 1
+	},
+/obj/machinery/light/directional/north,
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/aft)
+"Kd" = (
+/obj/effect/turf_decal/corner/opaque/tan{
+	dir = 5
+	},
+/obj/effect/turf_decal/trimline/opaque/bar/filled/shrink_ccw{
+	dir = 1
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/obj/structure/sign/directions/command{
+	dir = 1;
+	pixel_y = 25
+	},
+/obj/machinery/camera/autoname{
+	dir = 6
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/aft)
+"Ke" = (
+/obj/structure/table,
+/obj/item/reagent_containers/glass/bucket,
+/obj/item/pushbroom,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+	dir = 8
+	},
+/obj/machinery/airalarm/directional/north,
+/obj/item/soap/syndie,
+/turf/open/floor/pod,
+/area/ship/hallway/aft)
+"Kk" = (
+/obj/structure/table,
+/obj/item/paper_bin{
+	pixel_y = 6
+	},
+/obj/item/folder/white{
+	pixel_y = 6
+	},
+/obj/item/pen/blue{
+	pixel_x = -1;
+	pixel_y = 8
+	},
+/obj/item/pen/red{
+	pixel_x = -1;
+	pixel_y = 4
+	},
+/obj/effect/turf_decal/corner/opaque/bottlegreen{
+	dir = 8
+	},
+/obj/effect/turf_decal/corner/opaque/beige{
+	dir = 5
+	},
+/obj/effect/turf_decal/corner/opaque/beige,
+/obj/machinery/light/small/directional/north,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+	dir = 8
+	},
+/obj/item/radio/intercom/directional/east,
+/turf/open/floor/plasteel/dark,
+/area/ship/medical)
+"Kt" = (
+/obj/structure/bed{
+	dir = 1
+	},
+/obj/item/bedsheet/syndie{
+	dir = 1
+	},
+/obj/structure/curtain/cloth/fancy,
+/turf/open/floor/carpet/black,
+/area/ship/crew/dorm/dormtwo)
+"Ku" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/door/airlock/hatch{
+	name = "Control Room";
+	normalspeed = 0;
+	req_access_txt = "10"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/door/firedoor/border_only{
+	dir = 1
+	},
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/engineering)
+"Kz" = (
+/turf/template_noop,
+/area/template_noop)
+"KA" = (
+/obj/structure/window/plasma/reinforced{
+	dir = 8
+	},
+/obj/machinery/atmospherics/components/unary/vent_pump/high_volume/siphon/atmos/air_output{
+	dir = 8;
+	piping_layer = 2
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 8
+	},
+/turf/open/floor/engine/air,
+/area/ship/engineering/atmospherics)
+"KF" = (
+/obj/structure/table,
+/obj/effect/turf_decal/corner/opaque/tan/full,
+/obj/machinery/light/directional/south,
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/canteen)
+"KK" = (
+/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
+/obj/machinery/door/poddoor/shutters{
+	id = "kali_mess_shut"
+	},
+/turf/open/floor/plating,
+/area/ship/crew/canteen)
+"KO" = (
+/obj/effect/turf_decal/corner/opaque/tan{
+	dir = 6
+	},
+/obj/effect/turf_decal/corner/opaque/tan{
+	dir = 1
+	},
+/obj/effect/turf_decal/corner/opaque/beige{
+	dir = 8
+	},
+/obj/effect/turf_decal/industrial/warning{
+	dir = 1
+	},
+/obj/structure/chair/handrail{
+	dir = 8
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/ccommons)
+"KS" = (
+/obj/machinery/power/terminal{
+	dir = 8
+	},
+/obj/structure/cable{
+	icon_state = "0-2"
+	},
+/obj/effect/turf_decal/techfloor{
+	dir = 1
+	},
+/obj/machinery/light/small/directional/east,
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering/engines/starboard)
+"KU" = (
+/obj/structure/window/reinforced{
+	dir = 8
+	},
+/obj/effect/turf_decal/corner/opaque/beige/half{
+	dir = 4
+	},
+/obj/effect/turf_decal/corner/opaque/tan{
+	dir = 9
+	},
+/obj/structure/closet/wardrobe/black{
+	name = "wardrobe";
+	populate = 0
+	},
+/obj/item/storage/backpack,
+/obj/item/clothing/shoes/combat,
+/obj/item/clothing/under/syndicate/ngr,
+/obj/item/radio/headset,
+/obj/item/clothing/head/ngr,
+/obj/item/clothing/head/ngr/flap,
+/obj/item/clothing/neck/shemagh/ngr,
+/obj/item/clothing/suit/hooded/wintercoat/security/ngr,
+/obj/machinery/light_switch{
+	pixel_x = -7;
+	pixel_y = 22
+	},
+/obj/machinery/button/door{
+	id = "kali_dorms_shut";
+	name = "Crew Quarters Shutters";
+	pixel_x = 3;
+	pixel_y = 23
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/crew)
+"KX" = (
+/obj/effect/turf_decal/techfloor,
+/obj/machinery/light_switch{
+	dir = 4;
+	pixel_x = -19;
+	pixel_y = 7
+	},
+/obj/structure/extinguisher_cabinet/directional/west{
+	pixel_y = -4
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/fore)
+"KY" = (
+/obj/effect/turf_decal/techfloor,
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/fore)
+"Lf" = (
+/obj/effect/turf_decal/techfloor,
+/obj/effect/turf_decal/industrial/warning{
+	dir = 4;
+	layer = 2.04
+	},
+/obj/machinery/light/floor/hangar,
+/obj/structure/cable{
+	icon_state = "1-4"
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/fore)
+"Li" = (
+/obj/effect/turf_decal/corner/opaque/beige/mono,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/obj/structure/closet/emcloset/wall/directional/north,
+/turf/open/floor/plasteel/dark,
+/area/ship/crew)
+"Lm" = (
+/obj/machinery/light/dim/directional/east,
+/obj/structure/closet/secure_closet/engineering_welding{
+	req_access = null;
+	req_access_txt = "11";
+	req_one_access = null
+	},
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+	dir = 8
+	},
+/obj/machinery/firealarm/directional/south,
+/obj/machinery/camera/autoname{
+	dir = 10
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering/electrical)
+"Lp" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/door/airlock/maintenance_hatch{
+	dir = 4;
+	name = "Starboard Thrusters";
+	req_access_txt = "10"
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 8
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 4
+	},
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/engineering/engines/starboard)
+"LB" = (
+/obj/effect/turf_decal/corner/opaque/beige/half{
+	dir = 4
+	},
+/obj/effect/turf_decal/corner/opaque/tan{
+	dir = 9
+	},
+/obj/machinery/vending/cola/sodie,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+	dir = 4
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/canteen)
+"LH" = (
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/ship/crew/cryo)
+"LK" = (
+/obj/effect/turf_decal/corner/opaque/tan{
+	dir = 5
+	},
+/obj/effect/turf_decal/corner/opaque/beige/half,
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/bridge)
+"LM" = (
+/obj/machinery/atmospherics/pipe/simple/dark/visible/layer4,
+/obj/machinery/atmospherics/pipe/simple/cyan/visible/layer4{
+	dir = 4
+	},
+/obj/effect/turf_decal/techfloor{
+	dir = 4
+	},
+/turf/open/floor/pod/dark,
+/area/ship/engineering/atmospherics)
+"LP" = (
+/obj/structure/bed{
+	dir = 1
+	},
+/obj/item/bedsheet/medical{
+	dir = 1
+	},
+/obj/structure/curtain,
+/obj/effect/turf_decal/corner/opaque/bottlegreen/half{
+	dir = 4
+	},
+/obj/effect/turf_decal/corner/opaque/beige{
+	dir = 9
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/medical)
+"LV" = (
+/obj/effect/turf_decal/spline/plain/opaque/solgovgold{
+	layer = 2.04
+	},
+/obj/effect/turf_decal/corner/opaque/red/half,
+/obj/effect/turf_decal/techfloor{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 5
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 9
+	},
+/obj/structure/cable{
+	icon_state = "1-4"
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/cryo)
+"LX" = (
+/obj/effect/turf_decal/corner/opaque/bottlegreen/mono,
+/obj/effect/landmark/start/medical_doctor,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/turf/open/floor/plasteel/dark,
+/area/ship/medical)
+"Ml" = (
+/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
+/turf/open/floor/plating,
+/area/ship/engineering)
+"Mq" = (
+/obj/machinery/porta_turret/ship/ngr/light{
+	dir = 6;
+	id = "kali_grid"
+	},
+/turf/closed/wall/mineral/plastitanium,
+/area/ship/crew)
+"Mt" = (
+/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
+/obj/machinery/door/poddoor/shutters{
+	id = "kali_gym_shut"
+	},
+/turf/open/floor/plating,
+/area/ship/crew/ccommons)
+"Mv" = (
+/obj/effect/turf_decal/corner/opaque/tan{
+	dir = 9
+	},
+/obj/effect/turf_decal/trimline/opaque/bar/filled/shrink_cw{
+	dir = 8
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/central)
+"MC" = (
+/obj/structure/chair/office,
+/turf/open/floor/carpet/red,
+/area/ship/crew)
+"ME" = (
+/obj/machinery/power/apc/auto_name/directional/west,
+/obj/structure/cable{
+	icon_state = "0-1"
+	},
+/obj/effect/turf_decal/corner/opaque/red/mono,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 5
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/security/armory)
+"MI" = (
+/obj/effect/turf_decal/corner/opaque/beige/mono,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 10
+	},
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/bridge)
+"MN" = (
+/obj/machinery/suit_storage_unit/inherit{
+	name = "wrecker's suit storage unit";
+	req_access_txt = "48"
+	},
+/obj/item/clothing/suit/space/syndicate/black/green,
+/obj/item/clothing/head/helmet/space/syndicate/black/green,
+/obj/machinery/power/apc/auto_name/directional/north,
+/obj/structure/cable{
+	icon_state = "0-8"
+	},
+/obj/item/clothing/mask/gas/syndicate,
+/turf/open/floor/pod,
+/area/ship/hallway/fore)
+"MS" = (
+/obj/machinery/door/airlock/hatch{
+	name = "Command Deck";
+	normalspeed = 0;
+	req_access_txt = "19"
+	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 1
+	},
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/hallway/aft)
+"MT" = (
+/obj/machinery/door/airlock/hatch{
+	dir = 4;
+	name = "Infirmary"
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 4
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/medical)
+"MU" = (
+/obj/machinery/door/airlock/hatch{
+	dir = 4;
+	name = "Engineering";
+	normalspeed = 0;
+	req_access_txt = "10"
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 8
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 4
+	},
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/engineering/electrical)
+"Nc" = (
+/obj/structure/cable{
+	icon_state = "1-4"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 5
+	},
+/obj/machinery/atmospherics/pipe/simple/yellow/hidden{
+	dir = 9
+	},
+/obj/structure/cable{
+	icon_state = "2-4"
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+	dir = 8
+	},
+/obj/effect/turf_decal/hardline_small/right,
+/turf/open/floor/pod/dark,
+/area/ship/engineering/electrical)
+"Np" = (
+/obj/effect/turf_decal/corner/opaque/tan{
+	dir = 5
+	},
+/obj/effect/turf_decal/trimline/opaque/bar/filled/shrink_cw{
+	dir = 1
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+	dir = 1
+	},
+/obj/structure/sign/directions/engineering{
+	dir = 8;
+	pixel_y = 25
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/aft)
+"Nr" = (
+/obj/machinery/door/airlock/hatch{
+	name = "Crew Quarters";
+	req_ship_access = 0
+	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 1
+	},
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/hallway/central)
+"Nt" = (
+/obj/effect/turf_decal/corner/opaque/tan{
+	dir = 5
+	},
+/obj/effect/turf_decal/trimline/opaque/bar/line{
+	dir = 1
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/aft)
+"Nv" = (
+/obj/effect/turf_decal/corner/opaque/white/full{
+	color = "#c59973"
+	},
+/obj/effect/turf_decal/corner/opaque/beige/mono,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/canteen)
+"NA" = (
+/obj/effect/turf_decal/corner/opaque/tan{
+	dir = 5
+	},
+/obj/effect/turf_decal/trimline/opaque/bar/filled/shrink_ccw{
+	dir = 1
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/aft)
+"NH" = (
+/obj/effect/turf_decal/techfloor,
+/obj/structure/closet/firecloset,
+/obj/effect/turf_decal/corner/opaque/red/half{
+	dir = 1
+	},
+/obj/structure/sign/poster/contraband/hacking_guide{
+	pixel_y = -32
+	},
+/obj/machinery/light/dim/directional/west,
+/obj/machinery/camera/autoname{
+	dir = 1
+	},
+/turf/open/floor/pod/dark,
+/area/ship/engineering)
+"NI" = (
+/obj/effect/turf_decal/corner/opaque/white/full{
+	color = "#c59973"
+	},
+/obj/effect/turf_decal/corner/opaque/beige/mono,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/obj/machinery/light_switch{
+	pixel_x = 7;
+	pixel_y = 22
+	},
+/obj/machinery/button/door{
+	id = "kali_mess_shut";
+	name = "Canteen Shutters";
+	pixel_x = -3;
+	pixel_y = 23
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/canteen)
+"NL" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
+/obj/structure/filingcabinet/chestdrawer{
+	density = 0;
+	dir = 4;
+	pixel_x = -6
+	},
+/obj/item/folder/documents/syndicate/ngr,
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"NM" = (
+/obj/machinery/atmospherics/components/binary/pump{
+	dir = 8;
+	name = "engine fuel pump"
+	},
+/obj/effect/turf_decal/techfloor,
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering/engines/port)
+"NQ" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 8
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "2-4"
+	},
+/obj/structure/sign/warning/nosmoking{
+	pixel_y = 28
+	},
+/obj/effect/turf_decal/number/right_five,
+/obj/structure/chair/handrail,
+/turf/open/floor/pod/dark,
+/area/ship/engineering/electrical)
+"NU" = (
+/obj/effect/turf_decal/techfloor{
+	layer = 2.04
+	},
+/obj/structure/closet/crate,
+/turf/open/floor/plasteel/tech,
+/area/ship/cargo)
+"Oa" = (
+/obj/structure/railing{
+	dir = 10;
+	layer = 3.1
+	},
+/obj/structure/cable{
+	icon_state = "0-1"
+	},
+/obj/machinery/power/apc/auto_name/directional/east,
+/turf/open/floor/pod/dark,
+/area/ship/engineering/electrical)
+"Od" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/effect/turf_decal/corner/opaque/red/mono,
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/security/armory)
+"Ol" = (
+/obj/structure/rack,
+/obj/item/pickaxe,
+/obj/machinery/airalarm/directional/south,
+/turf/open/floor/plasteel/dark,
+/area/ship/hallway/fore)
+"On" = (
+/obj/machinery/power/apc/auto_name/directional/north,
+/obj/structure/cable{
+	icon_state = "0-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 10
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/turf/open/floor/carpet/black,
+/area/ship/crew/dorm)
+"Oq" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+	dir = 1
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/hallway/fore)
+"Ot" = (
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/ship/security/armory)
+"Ow" = (
+/obj/machinery/holopad/emergency/command,
+/obj/effect/turf_decal/corner/opaque/beige/mono,
+/obj/effect/turf_decal/industrial/outline{
+	color = "#791500"
+	},
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/bridge)
+"Ox" = (
+/obj/structure/railing{
+	dir = 6;
+	layer = 4.1
+	},
+/obj/effect/turf_decal/corner/opaque/red/mono,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+	dir = 1
+	},
+/obj/structure/closet/emcloset/anchored,
+/obj/item/radio/intercom/directional/west,
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/cryo)
+"OC" = (
+/obj/structure/sign/poster/contraband/energy_swords{
+	pixel_y = -32
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/effect/turf_decal/corner/opaque/red/mono,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/security)
+"OH" = (
+/obj/machinery/door/airlock/hatch{
+	dir = 1;
+	name = "Custodial Closet"
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 1
+	},
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/aft)
+"OK" = (
+/obj/machinery/light_switch{
+	pixel_x = -7;
+	pixel_y = 22
+	},
+/obj/effect/turf_decal/borderfloorblack{
+	dir = 1
+	},
+/obj/effect/turf_decal/corner/opaque/red/half,
+/obj/machinery/button/door{
+	id = "kali_armory_shut";
+	name = "Desk Shutters";
+	pixel_x = 4;
+	pixel_y = 23
+	},
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+	dir = 1
+	},
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 10
+	},
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/security/armory)
+"ON" = (
+/obj/effect/turf_decal/techfloor{
+	layer = 2.04
+	},
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+	dir = 1
+	},
+/obj/effect/spawner/random/food_or_drink/ration,
+/obj/effect/spawner/random/food_or_drink/ration,
+/obj/effect/spawner/random/food_or_drink/ration,
+/obj/effect/spawner/random/food_or_drink/ration,
+/obj/effect/spawner/random/food_or_drink/ration,
+/obj/effect/spawner/random/food_or_drink/ration,
+/obj/item/reagent_containers/food/drinks/waterbottle,
+/obj/item/reagent_containers/food/drinks/waterbottle,
+/obj/item/reagent_containers/food/drinks/waterbottle,
+/obj/item/reagent_containers/food/drinks/waterbottle,
+/obj/item/reagent_containers/food/drinks/waterbottle,
+/obj/item/reagent_containers/food/drinks/waterbottle,
+/obj/item/reagent_containers/food/snacks/canned/beans,
+/obj/item/reagent_containers/food/snacks/canned/beans,
+/obj/item/reagent_containers/food/snacks/canned/beans,
+/obj/structure/closet/crate{
+	name = "food crate"
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/cargo)
+"OR" = (
+/obj/structure/sink{
+	dir = 1;
+	layer = 2.8;
+	pixel_y = -12
+	},
+/obj/structure/mirror{
+	pixel_y = -30
+	},
+/turf/open/floor/plasteel/showroomfloor,
+/area/ship/crew/toilet)
+"OS" = (
+/obj/structure/chair/comfy/shuttle{
+	dir = 4;
+	name = "Sensors"
+	},
+/obj/effect/turf_decal/corner/opaque/tan{
+	dir = 6
+	},
+/obj/effect/turf_decal/corner/opaque/tan{
+	dir = 1
+	},
+/obj/effect/turf_decal/corner/opaque/beige{
+	dir = 8
+	},
+/obj/effect/landmark/start/head_of_security,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/bridge)
+"Pf" = (
+/turf/open/floor/plasteel/stairs{
+	dir = 1;
+	icon = 'icons/obj/stairs.dmi'
+	},
+/area/ship/crew/cryo)
+"Pg" = (
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/ship/crew/canteen)
+"Pl" = (
+/obj/effect/turf_decal/corner/opaque/tan{
+	dir = 5
+	},
+/obj/effect/turf_decal/trimline/opaque/bar/line{
+	dir = 1
+	},
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
+/obj/item/radio/intercom/directional/north,
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/aft)
+"Pq" = (
+/obj/machinery/atmospherics/pipe/simple/yellow/hidden,
+/obj/machinery/door/airlock/maintenance_hatch{
+	name = "Port Thrusters";
+	req_access_txt = "10"
+	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/door/firedoor/border_only{
+	dir = 1
+	},
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/engineering/engines/port)
+"Pr" = (
+/obj/machinery/atmospherics/pipe/simple/yellow/visible/layer2{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
+/obj/item/radio/intercom/directional/north,
+/obj/machinery/atmospherics/components/binary/pump/layer4{
+	dir = 8;
+	name = "waste pump"
+	},
+/turf/open/floor/pod/dark,
+/area/ship/engineering/atmospherics)
+"Px" = (
+/obj/machinery/light_switch{
+	dir = 4;
+	pixel_x = -19;
+	pixel_y = 7
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 1
+	},
+/obj/machinery/button/door{
+	dir = 4;
+	id = "kali_lt_door";
+	name = "Door Bolt Control";
+	normaldoorcontrol = 1;
+	pixel_x = -20;
+	pixel_y = -3;
+	req_access_txt = "3";
+	specialfunctions = 4
+	},
+/turf/open/floor/carpet/black,
+/area/ship/crew/dorm)
+"Pz" = (
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/ship/crew/ccommons)
+"PG" = (
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/ship/crew/toilet)
+"PR" = (
+/obj/machinery/atmospherics/components/trinary/mixer/flipped/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 8
+	},
+/obj/item/paper/guides/jobs/engi/combustion_thruster,
+/turf/open/floor/pod/dark,
+/area/ship/engineering/atmospherics)
+"PT" = (
+/obj/effect/turf_decal/corner/opaque/white/full{
+	color = "#c59973"
+	},
+/obj/effect/turf_decal/corner/opaque/beige/mono,
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/obj/machinery/light_switch{
+	pixel_x = 7;
+	pixel_y = 22
+	},
+/obj/machinery/button/door{
+	id = "kali_mess_shut";
+	name = "Canteen Shutters";
+	pixel_x = -3;
+	pixel_y = 23
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/canteen)
+"PU" = (
+/obj/structure/crate_shelf,
+/obj/machinery/light/directional/south,
+/turf/open/floor/plasteel/dark,
+/area/ship/cargo)
+"PW" = (
+/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
+/obj/machinery/atmospherics/pipe/simple/dark/visible/layer4,
+/obj/machinery/door/poddoor/shutters{
+	id = "kali_atmos_shut"
+	},
+/turf/open/floor/plating,
+/area/ship/engineering/atmospherics)
+"Qd" = (
+/obj/effect/turf_decal/corner/opaque/beige/mono,
+/obj/structure/cable{
+	icon_state = "1-4"
+	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/turf/open/floor/plasteel/dark,
+/area/ship/crew)
+"Qj" = (
+/obj/structure/weightmachine/weightlifter,
+/obj/effect/turf_decal/corner/opaque/tan{
+	dir = 4
+	},
+/obj/effect/turf_decal/corner/opaque/beige/half,
+/obj/effect/turf_decal/corner/opaque/beige{
+	dir = 1
+	},
+/obj/effect/turf_decal/industrial/warning/corner{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/ccommons)
+"Ql" = (
+/obj/effect/turf_decal/corner/opaque/tan/mono,
+/obj/machinery/light/directional/north,
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+	dir = 1
+	},
+/obj/structure/cable{
+	icon_state = "2-4"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 6
+	},
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/security)
+"Qq" = (
+/obj/machinery/door/airlock/external,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/hallway/central)
+"QI" = (
+/obj/effect/turf_decal/steeldecal/steel_decals10{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 10
+	},
+/obj/machinery/airalarm/directional/north,
+/obj/machinery/power/apc/auto_name/directional/east,
+/obj/structure/cable{
+	icon_state = "0-2"
+	},
+/turf/open/floor/plasteel/showroomfloor,
+/area/ship/medical)
+"QL" = (
+/obj/structure/tank_dispenser,
+/obj/effect/turf_decal/industrial/warning{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/layer_manifold/visible,
+/turf/open/floor/pod/dark,
+/area/ship/crew/canteen)
+"QT" = (
+/obj/machinery/atmospherics/pipe/manifold/yellow/visible{
+	dir = 4
+	},
+/obj/effect/turf_decal/techfloor,
+/obj/machinery/button/door{
+	dir = 8;
+	id = "kali_port_engine_blast";
+	name = "Engine Blast Doors";
+	pixel_x = 20;
+	pixel_y = 3
+	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/light_switch{
+	dir = 8;
+	pixel_x = 19;
+	pixel_y = -7
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering/engines/port)
+"Ra" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/structure/bed/dogbed,
+/mob/living/simple_animal/hostile/carp/cayenne{
+	desc = "Originally the failed results of an ICW-era biological warfare program, this breed of docile space carp have become popular as pets on New Gorlex.";
+	environment_smash = 0;
+	faction = list("New Gorlex Republic","playerSyndicate");
+	name = "Sirocco"
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"Rd" = (
+/obj/effect/turf_decal/corner/opaque/beige/mono,
+/obj/structure/cable{
+	icon_state = "1-4"
+	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+	dir = 8
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/crew)
+"Re" = (
+/obj/effect/turf_decal/corner/opaque/beige/half,
+/obj/effect/turf_decal/corner/opaque/tan{
+	dir = 5
+	},
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
+/obj/structure/extinguisher_cabinet/directional/east,
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/canteen)
+"Rh" = (
+/obj/machinery/atmospherics/pipe/simple/yellow/visible,
+/obj/structure/cable{
+	icon_state = "2-4"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 6
+	},
+/obj/effect/turf_decal/techfloor{
+	dir = 8
+	},
+/obj/structure/extinguisher_cabinet/directional/west,
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+	dir = 8
+	},
+/obj/machinery/camera/autoname{
+	dir = 5
+	},
+/turf/open/floor/pod/dark,
+/area/ship/engineering/atmospherics)
+"Rk" = (
+/obj/effect/turf_decal/corner/opaque/tan{
+	dir = 6
+	},
+/obj/effect/turf_decal/trimline/opaque/bar/filled/shrink_ccw{
+	dir = 4
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/central)
+"Rp" = (
+/obj/effect/turf_decal/techfloor{
+	dir = 1;
+	layer = 2.04
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 10
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/cargo)
+"RG" = (
+/obj/effect/turf_decal/borderfloorblack{
+	dir = 8
+	},
+/obj/effect/turf_decal/corner/opaque/tan/half{
+	dir = 4
+	},
+/obj/effect/turf_decal/spline/plain/opaque/solgovgold{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 6
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/security)
+"RJ" = (
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/ship/crew/dorm/captain)
+"RM" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"RP" = (
+/obj/effect/turf_decal/techfloor{
+	dir = 1
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/fore)
+"RQ" = (
+/obj/machinery/door/firedoor/border_only{
+	dir = 1
+	},
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/door/airlock/hatch{
+	name = "Cargo Bay";
+	req_ship_access = 0
+	},
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/hallway/fore)
+"RX" = (
+/obj/machinery/atmospherics/pipe/simple/yellow/visible{
+	dir = 4
+	},
+/obj/machinery/atmospherics/components/trinary/mixer/flipped/layer2,
+/turf/open/floor/pod/dark,
+/area/ship/engineering/atmospherics)
+"Sc" = (
+/obj/structure/closet/syndicate/personal{
+	name = "ensign's closet";
+	populate = 0
+	},
+/obj/item/storage/backpack,
+/obj/item/clothing/shoes/combat,
+/obj/item/clothing/under/syndicate/ngr/officer,
+/obj/item/clothing/suit/armor/ngr/lieutenant,
+/obj/item/radio/headset/syndicate,
+/obj/item/clothing/head/ngr,
+/obj/item/clothing/neck/shemagh/ngr,
+/obj/machinery/light_switch{
+	dir = 8;
+	pixel_x = 19;
+	pixel_y = 7
+	},
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+	dir = 1
+	},
+/obj/machinery/button/door{
+	dir = 8;
+	id = "kali_ensign_door";
+	name = "Door Bolt Control";
+	normaldoorcontrol = 1;
+	pixel_x = 20;
+	pixel_y = -3;
+	req_access_txt = "3";
+	specialfunctions = 4
+	},
+/obj/item/clothing/mask/breath/ngr,
+/obj/item/clothing/mask/balaclava/ngr,
+/obj/machinery/firealarm/directional/south,
+/obj/item/storage/guncase/pistol/pc76,
+/obj/item/megaphone,
+/turf/open/floor/carpet/black,
+/area/ship/crew/dorm/dormtwo)
+"Sp" = (
+/obj/effect/turf_decal/techfloor{
+	dir = 8
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/crew/ccommons)
+"Sq" = (
+/obj/machinery/porta_turret/ship/ngr/light{
+	dir = 6;
+	id = "kali_grid"
+	},
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/ship/security/armory)
+"SB" = (
+/obj/effect/turf_decal/industrial/warning{
+	dir = 4;
+	layer = 2.04
+	},
+/obj/effect/turf_decal/techfloor{
+	dir = 1
+	},
+/obj/machinery/light/floor/hangar,
+/obj/structure/cable{
+	icon_state = "2-4"
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/fore)
+"SD" = (
+/obj/machinery/telecomms/relay/preset/mining{
+	autolinkers = list("relay","hub");
+	freq_listening = list(1213);
+	id = "NGR Relay";
+	name = "NGR Relay";
+	network = "ngr_commnet"
+	},
+/obj/machinery/door/window/brigdoor/westright{
+	dir = 4;
+	req_access = list(20);
+	req_ship_access = 1
+	},
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/bridge)
+"SJ" = (
+/obj/structure/sign/warning/docking{
+	pixel_y = -8
+	},
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/ship/crew/canteen)
+"SK" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/turf/open/floor/plasteel/stairs{
+	dir = 1;
+	icon = 'icons/obj/stairs.dmi'
+	},
+/area/ship/engineering/electrical)
+"SU" = (
+/obj/machinery/atmospherics/components/unary/shuttle/fire_heater{
+	dir = 4
+	},
+/obj/structure/window/reinforced{
+	dir = 8
+	},
+/obj/machinery/door/poddoor{
+	dir = 4;
+	id = "kali_starboard_engine_blast"
+	},
+/turf/open/floor/plating,
+/area/ship/engineering/engines/starboard)
+"Tm" = (
+/obj/effect/turf_decal/corner/opaque/beige/half{
+	dir = 1
+	},
+/obj/effect/turf_decal/corner/opaque/tan{
+	dir = 10
+	},
+/obj/structure/extinguisher_cabinet/directional/south,
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/canteen)
+"Tn" = (
+/obj/effect/turf_decal/corner/opaque/red/mono,
+/obj/machinery/holopad/secure,
+/obj/effect/turf_decal/industrial/outline{
+	color = "#791500"
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/security)
+"To" = (
+/obj/effect/turf_decal/spline/plain/opaque/solgovgold{
+	dir = 1
+	},
+/turf/open/floor/pod/dark,
+/area/ship/crew/cryo)
+"Tr" = (
+/obj/effect/turf_decal/industrial/warning{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/layer_manifold/visible,
+/obj/machinery/advanced_airlock_controller{
+	pixel_x = -25;
+	req_access = null
+	},
+/obj/structure/chair/handrail{
+	dir = 4
+	},
+/turf/open/floor/pod/dark,
+/area/ship/hallway/central)
+"Ts" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/yellow/visible{
+	dir = 4
+	},
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
+/turf/open/floor/pod/dark,
+/area/ship/engineering/atmospherics)
+"Tv" = (
+/obj/structure/weightmachine/stacklifter,
+/obj/effect/turf_decal/corner/opaque/tan{
+	dir = 5
+	},
+/obj/effect/turf_decal/corner/opaque/beige/half,
+/obj/machinery/light/directional/north,
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/ccommons)
+"Ty" = (
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/ship/security)
+"TH" = (
+/obj/structure/chair/office,
+/obj/machinery/light/directional/north,
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/open/floor/pod,
+/area/ship/hallway/fore)
+"TJ" = (
+/obj/effect/spawner/bunk_bed{
+	dir = 1
+	},
+/obj/structure/curtain/bounty,
+/obj/structure/sign/poster/rilena/random{
+	pixel_x = -32
+	},
+/turf/open/floor/carpet/red,
+/area/ship/crew)
+"TK" = (
+/obj/structure/window/plasma/reinforced{
+	dir = 8
+	},
+/obj/machinery/atmospherics/components/unary/outlet_injector/on/layer2{
+	dir = 8
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 8
+	},
+/turf/open/floor/engine/airless,
+/area/ship/engineering/atmospherics)
+"TL" = (
+/obj/machinery/door/airlock/hatch{
+	name = "Canteen";
+	req_ship_access = 0
+	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/door/firedoor/border_only{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/crew/canteen)
+"TN" = (
+/obj/structure/table/reinforced,
+/obj/item/storage/box/gloves{
+	pixel_x = 6;
+	pixel_y = 12
+	},
+/obj/item/storage/firstaid/medical{
+	pixel_x = -5;
+	pixel_y = 4
+	},
+/obj/structure/sign/poster/official/cleanliness{
+	pixel_x = 32
+	},
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
+/turf/open/floor/plasteel/showroomfloor,
+/area/ship/medical)
+"TQ" = (
+/obj/machinery/light/small/directional/west,
+/obj/effect/turf_decal/techfloor{
+	dir = 1
+	},
+/obj/structure/chair/handrail{
+	dir = 4
+	},
+/turf/open/floor/pod/dark,
+/area/ship/crew/cryo)
+"TS" = (
+/obj/effect/turf_decal/corner/opaque/beige/half{
+	dir = 4
+	},
+/obj/effect/turf_decal/corner/opaque/tan{
+	dir = 9
+	},
+/obj/structure/sign/poster/contraband/syndiemoth{
+	pixel_x = -32
+	},
+/obj/machinery/vending/coffee,
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/canteen)
+"TV" = (
+/obj/effect/turf_decal/corner/opaque/tan{
+	dir = 6
+	},
+/obj/effect/turf_decal/corner/opaque/beige/half{
+	dir = 8
+	},
+/obj/effect/turf_decal/industrial/warning{
+	dir = 4;
+	layer = 2.04
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/ccommons)
+"TX" = (
+/obj/effect/turf_decal/corner/opaque/tan{
+	dir = 10
+	},
+/obj/effect/turf_decal/trimline/opaque/bar/filled/shrink_ccw,
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/aft)
+"TZ" = (
+/obj/machinery/computer/apc_control{
+	icon_state = "computer-right"
+	},
+/obj/effect/turf_decal/techfloor{
+	dir = 1
+	},
+/obj/effect/turf_decal/corner/opaque/red/half,
+/turf/open/floor/pod/dark,
+/area/ship/engineering)
+"Ug" = (
+/obj/effect/turf_decal/corner/transparent/bar/diagonal,
+/turf/open/floor/plasteel,
+/area/ship/crew/canteen)
+"Uh" = (
+/obj/machinery/atmospherics/pipe/simple/yellow/visible,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/effect/turf_decal/techfloor{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+	dir = 8
+	},
+/obj/machinery/firealarm/directional/west,
+/turf/open/floor/pod/dark,
+/area/ship/engineering/atmospherics)
+"Uk" = (
+/obj/effect/turf_decal/steeldecal/steel_decals10{
+	dir = 10
+	},
+/obj/effect/turf_decal/corner/transparent/bar/diagonal,
+/turf/open/floor/plasteel,
+/area/ship/crew/canteen)
+"Um" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/fore)
+"Ur" = (
+/obj/effect/turf_decal/corner/transparent/bar/diagonal,
+/obj/structure/sink/kitchen{
+	dir = 8
+	},
+/obj/item/radio/intercom/directional/east,
+/turf/open/floor/plasteel,
+/area/ship/crew/canteen)
+"Ut" = (
+/obj/machinery/power/apc/auto_name/directional/west,
+/obj/structure/cable{
+	icon_state = "0-4"
+	},
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+	dir = 4
+	},
+/turf/open/floor/plasteel/showroomfloor,
+/area/ship/crew/toilet)
+"UC" = (
+/obj/structure/sink{
+	pixel_y = 20
+	},
+/obj/effect/turf_decal/corner/opaque/bottlegreen/half,
+/obj/effect/turf_decal/corner/opaque/beige{
+	dir = 5
+	},
+/obj/effect/turf_decal/steeldecal/steel_decals10,
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/medical)
+"UG" = (
+/obj/structure/closet/secure_closet/armorycage{
+	anchored = 1;
+	can_be_unanchored = 1;
+	name = "ammunition locker"
+	},
+/obj/item/storage/box/ammo/c57x39{
+	pixel_x = 13;
+	pixel_y = 1
+	},
+/obj/item/storage/box/ammo/c57x39{
+	pixel_x = 13;
+	pixel_y = 1
+	},
+/obj/item/storage/box/ammo/a556_42{
+	pixel_y = 1
+	},
+/obj/item/storage/box/ammo/a357{
+	pixel_x = -7;
+	pixel_y = 2
+	},
+/obj/item/storage/box/ammo/c10mm{
+	pixel_x = -7
+	},
+/obj/item/storage/box/ammo/c10mm{
+	pixel_x = -7
+	},
+/obj/item/ammo_box/magazine/m57_39_asp{
+	pixel_x = 14;
+	pixel_y = -7
+	},
+/obj/item/ammo_box/magazine/m57_39_asp{
+	pixel_x = 14;
+	pixel_y = -7
+	},
+/obj/item/ammo_box/magazine/m556_42_hydra/small{
+	pixel_x = 6;
+	pixel_y = -2
+	},
+/obj/item/ammo_box/magazine/m556_42_hydra/small{
+	pixel_x = 6;
+	pixel_y = -2
+	},
+/obj/item/ammo_box/magazine/m57_39_sidewinder{
+	pixel_x = 4;
+	pixel_y = -9
+	},
+/obj/item/ammo_box/magazine/m57_39_sidewinder{
+	pixel_x = 4;
+	pixel_y = -9
+	},
+/obj/effect/turf_decal/corner/opaque/red/half{
+	dir = 8
+	},
+/obj/effect/turf_decal/borderfloorblack{
+	dir = 4
+	},
+/obj/item/ammo_box/magazine/m57_39_asp{
+	pixel_x = 14;
+	pixel_y = -7
+	},
+/obj/item/ammo_box/magazine/m57_39_asp{
+	pixel_x = 14;
+	pixel_y = -7
+	},
+/obj/structure/sign/poster/contraband/c20r{
+	pixel_x = 32
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/security/armory)
+"UM" = (
+/obj/effect/turf_decal/corner/opaque/beige/mono,
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/ccommons)
+"UR" = (
+/obj/effect/turf_decal/steeldecal/steel_decals10,
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/turf/open/floor/plasteel/showroomfloor,
+/area/ship/crew/toilet)
+"UY" = (
+/obj/machinery/light/dim/directional/north,
+/turf/open/floor/carpet/red,
+/area/ship/crew)
+"Vd" = (
+/obj/effect/turf_decal/steeldecal/steel_decals10{
+	dir = 8
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/turf/open/floor/plasteel/showroomfloor,
+/area/ship/crew/toilet)
+"Vk" = (
+/obj/effect/turf_decal/corner/opaque/beige/half{
+	dir = 8
+	},
+/obj/effect/turf_decal/corner/opaque/tan{
+	dir = 6
+	},
+/obj/structure/closet/crate/bin,
+/obj/machinery/light_switch{
+	dir = 8;
+	pixel_x = 19;
+	pixel_y = 7
+	},
+/obj/item/reagent_containers/food/drinks/waterbottle{
+	list_reagents = null;
+	pixel_x = -4;
+	pixel_y = 1
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/crew)
+"Vm" = (
+/obj/effect/spawner/bunk_bed{
+	dir = 1
+	},
+/obj/structure/curtain/bounty,
+/turf/open/floor/carpet/red,
+/area/ship/crew)
+"Vp" = (
+/obj/effect/turf_decal/corner/opaque/tan{
+	dir = 10
+	},
+/obj/effect/turf_decal/trimline/opaque/bar/filled/line,
+/obj/machinery/light_switch{
+	dir = 1;
+	pixel_x = 7;
+	pixel_y = -19
+	},
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+	dir = 1
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/aft)
+"Vq" = (
+/obj/effect/turf_decal/corner/opaque/beige/half{
+	dir = 8
+	},
+/obj/effect/turf_decal/corner/opaque/beige,
+/obj/effect/turf_decal/corner/opaque/tan{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/canteen)
+"Vs" = (
+/turf/open/floor/carpet/red,
+/area/ship/crew)
+"Vt" = (
+/obj/effect/landmark/start/security_officer,
+/obj/effect/turf_decal/corner/opaque/red/mono,
+/obj/structure/chair/comfy/shuttle{
+	dir = 4
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/security)
+"Vx" = (
+/obj/machinery/light_switch{
+	dir = 1;
+	pixel_x = -7;
+	pixel_y = -19
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/hallway/fore)
+"VA" = (
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/ship/bridge)
+"VD" = (
+/obj/machinery/door/poddoor{
+	dir = 4;
+	id = "kali_entrance_blast"
+	},
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/hallway/fore)
+"VG" = (
+/obj/machinery/atmospherics/components/unary/shuttle/fire_heater{
+	dir = 4
+	},
+/obj/structure/window/reinforced{
+	dir = 8
+	},
+/obj/machinery/door/poddoor{
+	dir = 4;
+	id = "kali_port_engine_blast"
+	},
+/turf/open/floor/plating,
+/area/ship/engineering/engines/port)
+"VU" = (
+/obj/effect/spawner/bunk_bed,
+/obj/structure/curtain/bounty,
+/turf/open/floor/carpet/red,
+/area/ship/crew)
+"Wg" = (
+/obj/structure/window/reinforced{
+	dir = 8
+	},
+/obj/effect/turf_decal/corner/opaque/beige/half{
+	dir = 4
+	},
+/obj/effect/turf_decal/corner/opaque/tan{
+	dir = 9
+	},
+/obj/structure/closet/wardrobe/black{
+	name = "wardrobe";
+	populate = 0
+	},
+/obj/item/storage/backpack,
+/obj/item/clothing/shoes/combat,
+/obj/item/clothing/under/syndicate/ngr,
+/obj/item/radio/headset,
+/obj/item/clothing/head/ngr,
+/obj/item/clothing/head/ngr/flap,
+/obj/item/clothing/neck/shemagh/ngr,
+/obj/item/clothing/suit/hooded/wintercoat/security/ngr,
+/turf/open/floor/plasteel/dark,
+/area/ship/crew)
+"Wj" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/effect/turf_decal/corner/opaque/red/mono,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/structure/extinguisher_cabinet/directional/south,
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/security)
+"Wo" = (
+/obj/structure/cable{
+	icon_state = "1-4"
+	},
+/obj/structure/cable{
+	icon_state = "2-4"
+	},
+/obj/effect/turf_decal/steeldecal/steel_decals_central6{
+	dir = 4
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering/engines/port)
+"Wr" = (
+/obj/effect/turf_decal/corner/opaque/beige/half{
+	dir = 8
+	},
+/obj/effect/turf_decal/corner/opaque/tan{
+	dir = 6
+	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/canteen)
+"Wu" = (
+/obj/effect/turf_decal/corner/opaque/tan{
+	dir = 10
+	},
+/obj/effect/turf_decal/trimline/opaque/bar/line,
+/obj/structure/extinguisher_cabinet/directional/south,
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/central)
+"Ww" = (
+/obj/structure/weightmachine/stacklifter,
+/obj/effect/turf_decal/corner/opaque/tan{
+	dir = 5
+	},
+/obj/effect/turf_decal/corner/opaque/tan{
+	dir = 8
+	},
+/obj/effect/turf_decal/corner/opaque/beige,
+/obj/machinery/airalarm/directional/north,
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/ccommons)
+"WC" = (
+/obj/effect/turf_decal/corner/opaque/tan{
+	dir = 5
+	},
+/obj/effect/turf_decal/trimline/opaque/bar/line{
+	dir = 1
+	},
+/obj/structure/cable{
+	icon_state = "2-4"
+	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 6
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/central)
+"WK" = (
+/obj/machinery/door/airlock/external{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/crew/canteen)
+"WN" = (
+/obj/effect/turf_decal/corner/opaque/beige/half{
+	dir = 8
+	},
+/obj/effect/turf_decal/corner/opaque/tan{
+	dir = 6
+	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/canteen)
+"WQ" = (
+/obj/effect/turf_decal/steeldecal/steel_decals_central4{
+	dir = 4;
+	layer = 2.038
+	},
+/obj/effect/turf_decal/techfloor{
+	layer = 2.04
+	},
+/obj/structure/extinguisher_cabinet/directional/west{
+	pixel_y = -4
+	},
+/obj/machinery/light_switch{
+	dir = 4;
+	pixel_x = -19;
+	pixel_y = 7
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/cargo)
+"WS" = (
+/obj/effect/turf_decal/corner/opaque/tan{
+	dir = 9
+	},
+/obj/effect/turf_decal/trimline/opaque/bar/line{
+	dir = 8
+	},
+/obj/structure/chair/handrail{
+	dir = 4
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/central)
+"WT" = (
+/obj/effect/turf_decal/corner/opaque/beige/half{
+	dir = 1
+	},
+/obj/effect/turf_decal/corner/opaque/tan{
+	dir = 10
+	},
+/obj/structure/table,
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/canteen)
+"Xd" = (
+/obj/effect/turf_decal/techfloor{
+	dir = 1;
+	layer = 2.04
+	},
+/obj/item/radio/intercom/directional/east,
+/obj/effect/turf_decal/steeldecal/steel_decals_central4{
+	dir = 8;
+	layer = 2.038
+	},
+/obj/structure/chair/handrail{
+	dir = 8
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/cargo)
+"Xl" = (
+/obj/effect/turf_decal/corner/opaque/tan{
+	dir = 9
+	},
+/obj/effect/turf_decal/corner/opaque/tan,
+/obj/effect/turf_decal/corner/opaque/beige{
+	dir = 4
+	},
+/obj/structure/table,
+/obj/machinery/jukebox/boombox,
+/obj/structure/sign/poster/syndicate/random{
+	pixel_y = -32
+	},
+/obj/machinery/camera/autoname{
+	dir = 1
+	},
+/obj/item/reagent_containers/food/drinks/waterbottle{
+	pixel_x = 9;
+	pixel_y = 4
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/ccommons)
+"Xq" = (
+/obj/structure/railing{
+	dir = 6;
+	layer = 4.1
+	},
+/obj/effect/turf_decal/corner/opaque/tan/full,
+/obj/effect/turf_decal/techfloor{
+	dir = 4
+	},
+/obj/item/reagent_containers/food/drinks/waterbottle{
+	pixel_x = 5;
+	pixel_y = 11
+	},
+/obj/structure/table,
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"Xw" = (
+/obj/machinery/door/airlock/hatch{
+	dir = 8;
+	name = "Rec Room";
+	req_ship_access = 0
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 4
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/crew/ccommons)
+"Xx" = (
+/turf/closed/wall/mineral/plastitanium,
+/area/ship/cargo)
+"XN" = (
+/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
+/obj/machinery/door/poddoor/shutters{
+	id = "kali_bridge_shut"
+	},
+/obj/structure/cable{
+	icon_state = "0-2"
+	},
+/turf/open/floor/plating,
+/area/ship/bridge)
+"XP" = (
+/obj/structure/dresser{
+	dir = 4
+	},
+/obj/effect/turf_decal/corner/opaque/beige/half,
+/obj/effect/turf_decal/corner/opaque/tan{
+	dir = 5
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/crew)
+"XY" = (
+/obj/machinery/power/terminal{
+	dir = 8
+	},
+/obj/structure/cable{
+	icon_state = "0-2"
+	},
+/obj/effect/turf_decal/techfloor{
+	dir = 1
+	},
+/obj/machinery/button/door{
+	dir = 8;
+	id = "kali_port_engine_blast";
+	name = "Engine Blast Doors";
+	pixel_x = 20;
+	pixel_y = 3
+	},
+/obj/machinery/light_switch{
+	dir = 8;
+	pixel_x = 19;
+	pixel_y = -7
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering/engines/port)
+"Yb" = (
+/obj/effect/turf_decal/corner/opaque/tan{
+	dir = 8
+	},
+/obj/effect/turf_decal/trimline/opaque/bar/corner{
+	dir = 8
+	},
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+	dir = 1
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/aft)
+"Ym" = (
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/ship/medical)
+"YC" = (
+/obj/effect/turf_decal/techfloor{
+	dir = 1;
+	layer = 2.04
+	},
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+	dir = 8
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/cargo)
+"YF" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/turf/open/floor/carpet/red,
+/area/ship/crew)
+"YK" = (
+/obj/effect/turf_decal/corner/opaque/tan{
+	dir = 4
+	},
+/obj/effect/turf_decal/trimline/opaque/bar/corner{
+	dir = 4
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/aft)
+"YT" = (
+/obj/effect/turf_decal/corner/opaque/white/full{
+	color = "#c59973"
+	},
+/obj/effect/turf_decal/corner/opaque/beige/mono,
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/canteen)
+"YV" = (
+/obj/effect/turf_decal/techfloor{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/structure/chair/handrail,
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/fore)
+"YX" = (
+/obj/effect/turf_decal/corner/opaque/tan{
+	dir = 5
+	},
+/obj/effect/turf_decal/corner/opaque/tan,
+/obj/effect/turf_decal/corner/opaque/beige{
+	dir = 8
+	},
+/obj/effect/turf_decal/industrial/warning{
+	dir = 4;
+	layer = 2.04
+	},
+/obj/structure/reagent_dispensers/water_cooler{
+	pixel_x = -3
+	},
+/obj/machinery/firealarm/directional/north,
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/ccommons)
+"YY" = (
+/obj/effect/turf_decal/corner/opaque/tan{
+	dir = 5
+	},
+/obj/effect/turf_decal/trimline/opaque/bar/filled/shrink_cw{
+	dir = 1
+	},
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
+/obj/structure/extinguisher_cabinet/directional/north,
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/central)
+"Zb" = (
+/obj/machinery/door/airlock/hatch{
+	dir = 8;
+	name = "Cargo Bay";
+	req_ship_access = 0
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 4
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/hallway/fore)
+"Zh" = (
+/obj/effect/turf_decal/corner/opaque/beige/half{
+	dir = 8
+	},
+/obj/effect/turf_decal/corner/opaque/tan{
+	dir = 6
+	},
+/obj/machinery/light/dim/directional/east,
+/turf/open/floor/plasteel/dark,
+/area/ship/crew)
+"Zj" = (
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/ship/cargo)
+"Zp" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/yellow/hidden{
+	dir = 1
+	},
+/obj/machinery/door/airlock/hatch{
+	name = "Life Support";
+	normalspeed = 0;
+	req_access_txt = "10"
+	},
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/door/firedoor/border_only{
+	dir = 1
+	},
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/engineering/atmospherics)
+"Zs" = (
+/obj/structure/reagent_dispensers/fueltank,
+/obj/effect/turf_decal/industrial/outline{
+	color = "#791500"
+	},
+/obj/machinery/firealarm/directional/north,
+/turf/open/floor/plasteel/dark,
+/area/ship/cargo)
+"Zv" = (
+/obj/machinery/cryopod{
+	dir = 1
+	},
+/obj/effect/turf_decal/industrial/warning{
+	dir = 9
+	},
+/turf/open/floor/pod/dark,
+/area/ship/crew/cryo)
+"ZE" = (
+/obj/structure/chair/office{
+	dir = 1
+	},
+/obj/effect/turf_decal/corner/opaque/bottlegreen/half{
+	dir = 8
+	},
+/obj/effect/turf_decal/corner/opaque/beige{
+	dir = 6
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/medical)
+"ZI" = (
+/obj/effect/turf_decal/corner/opaque/beige/half{
+	dir = 8
+	},
+/obj/effect/turf_decal/corner/opaque/tan{
+	dir = 6
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/crew)
+"ZJ" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/fore)
+"ZM" = (
+/obj/effect/turf_decal/corner/opaque/beige/half{
+	dir = 4
+	},
+/obj/effect/turf_decal/corner/opaque/tan{
+	dir = 9
+	},
+/obj/machinery/light/directional/west,
+/obj/structure/chair/bench/orange/directional/east,
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/canteen)
+"ZO" = (
+/obj/effect/turf_decal/corner/transparent/bar/diagonal,
+/obj/structure/table/reinforced,
+/obj/item/melee/knife,
+/obj/item/cutting_board{
+	pixel_y = 3
+	},
+/turf/open/floor/plasteel,
+/area/ship/crew/canteen)
+"ZY" = (
+/obj/machinery/washing_machine,
+/obj/machinery/airalarm/directional/south,
+/turf/open/floor/plasteel/showroomfloor,
+/area/ship/crew/toilet)
+"ZZ" = (
+/obj/structure/sign/departments/medbay/alt,
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/ship/medical)
+
+(1,1,1) = {"
+Kz
+Kz
+Kz
+nH
+Kz
+Kz
+Kz
+xp
+sF
+xp
+sF
+xp
+Kz
+Kz
+FD
+Gn
+FD
+Gn
+FD
+Kz
+Kz
+Kz
+nH
+Kz
+Kz
+"}
+(2,1,1) = {"
+Kz
+Kz
+Kz
+xp
+Ig
+xp
+Ig
+xp
+VG
+xp
+VG
+xp
+Kz
+Kz
+FD
+SU
+FD
+SU
+FD
+jM
+FD
+jM
+FD
+Kz
+Kz
+"}
+(3,1,1) = {"
+Kz
+Kz
+Kz
+xp
+JV
+xp
+JV
+xp
+Gm
+dc
+NM
+xp
+iC
+iC
+FD
+zj
+Iu
+FJ
+FD
+Do
+FD
+Do
+FD
+Kz
+Kz
+"}
+(4,1,1) = {"
+Kz
+Kz
+Kz
+xp
+XY
+Wo
+cY
+tU
+BO
+ne
+QT
+Pq
+mv
+Hg
+xO
+pU
+rm
+qe
+fb
+KS
+yg
+nj
+FD
+Kz
+Kz
+"}
+(5,1,1) = {"
+Kz
+Kz
+Kz
+xp
+xp
+aA
+xp
+xp
+xp
+xp
+xp
+xp
+fa
+fe
+iC
+iC
+iC
+iC
+FD
+FD
+Lp
+FD
+FD
+Kz
+Kz
+"}
+(6,1,1) = {"
+Kz
+Kz
+Kz
+oW
+gU
+BB
+rA
+fz
+vP
+Rh
+Uh
+Zp
+Nc
+Ao
+fh
+oU
+eI
+qP
+Ku
+DK
+bm
+NH
+ce
+Kz
+Kz
+"}
+(7,1,1) = {"
+Kz
+Kz
+Kz
+fn
+PW
+xI
+RX
+PR
+lw
+Fv
+pv
+gU
+NQ
+td
+Es
+dV
+eI
+sM
+Ml
+pp
+eJ
+kg
+fD
+Kz
+Kz
+"}
+(8,1,1) = {"
+Kz
+Kz
+Kz
+Kz
+gU
+Pr
+Ts
+Co
+fF
+BT
+nT
+gU
+bv
+SK
+ck
+sA
+nA
+kf
+Ml
+TZ
+Jd
+zk
+ce
+Kz
+Kz
+"}
+(9,1,1) = {"
+Kz
+Kz
+Kz
+Kz
+gU
+tR
+zx
+nJ
+LM
+cf
+sV
+gU
+IP
+Oa
+bS
+ze
+jN
+Lm
+ce
+rz
+wx
+so
+ce
+Kz
+Kz
+"}
+(10,1,1) = {"
+Kz
+Kz
+Kz
+Kz
+gU
+TK
+tm
+gU
+bY
+KA
+gU
+gU
+MU
+iC
+LH
+LH
+LH
+LH
+LH
+ce
+Ic
+HE
+ce
+bz
+Kz
+"}
+(11,1,1) = {"
+Kz
+Kz
+Kz
+rj
+VA
+VA
+VA
+VA
+rS
+rS
+rS
+rS
+Np
+Vp
+LH
+ym
+Ox
+TQ
+Zv
+Pg
+Pg
+Pg
+Pg
+Pg
+Kz
+"}
+(12,1,1) = {"
+av
+VA
+VA
+VA
+SD
+VA
+qw
+lK
+rS
+Et
+gT
+rS
+tf
+GS
+GE
+LV
+Pf
+To
+bt
+Pg
+ma
+wb
+au
+uS
+Hy
+"}
+(13,1,1) = {"
+VA
+aL
+pl
+ry
+dr
+nG
+hP
+lW
+rS
+wv
+Kt
+rS
+tH
+GX
+LH
+lF
+na
+jj
+mj
+Pg
+ed
+yo
+QL
+SJ
+Kz
+"}
+(14,1,1) = {"
+XN
+aP
+ab
+MI
+ho
+VA
+qN
+rv
+rS
+iO
+Sc
+rS
+zc
+Hs
+LH
+LH
+LH
+LH
+LH
+Pg
+WK
+Pg
+Pg
+CC
+Kz
+"}
+(15,1,1) = {"
+XN
+aS
+LK
+Ow
+ya
+VA
+VA
+VA
+rS
+Ff
+rS
+rS
+Kd
+Yb
+GO
+Pg
+LB
+TS
+ZM
+iS
+sJ
+gq
+Pg
+Pg
+Kz
+"}
+(16,1,1) = {"
+VA
+bj
+LK
+bg
+hC
+oc
+ib
+lX
+pX
+AF
+rN
+MS
+Eg
+Ec
+yL
+Pg
+NI
+YT
+YT
+YT
+Nv
+FQ
+Je
+KK
+Kz
+"}
+(17,1,1) = {"
+VA
+cJ
+OS
+bl
+hI
+VA
+qS
+md
+ql
+tF
+vV
+Bo
+AV
+YK
+lC
+TL
+WN
+Wr
+Wr
+Vq
+tG
+gO
+KF
+Pg
+Kz
+"}
+(18,1,1) = {"
+VA
+ex
+ah
+Xq
+bH
+RJ
+RJ
+RJ
+RJ
+Fy
+fj
+fj
+fj
+JY
+TX
+Pg
+AR
+Ug
+Ca
+Dq
+mn
+qG
+ok
+KK
+Kz
+"}
+(19,1,1) = {"
+XN
+eN
+NL
+Ra
+ik
+RJ
+rZ
+mt
+RJ
+On
+Px
+wh
+fj
+Pl
+Fz
+JN
+ZO
+Uk
+ja
+Dq
+wY
+BA
+Hp
+Pg
+Kz
+"}
+(20,1,1) = {"
+XN
+eS
+aR
+RM
+xU
+oD
+mA
+xi
+RJ
+Gz
+yX
+Bb
+fj
+Nt
+Ea
+Pg
+Jr
+Ur
+vZ
+Re
+cX
+WT
+Dk
+KK
+Kz
+"}
+(21,1,1) = {"
+XN
+qa
+eT
+bX
+dD
+RJ
+Hx
+pI
+RJ
+fj
+fj
+fj
+fj
+NA
+Eo
+PG
+PG
+PG
+PG
+PG
+Fp
+qG
+wR
+Pg
+Kz
+"}
+(22,1,1) = {"
+Kz
+fd
+fd
+fd
+VA
+RJ
+sO
+mG
+RJ
+GR
+xo
+zG
+OH
+DP
+xa
+PG
+nr
+Ut
+ZY
+PG
+PT
+Tm
+Pg
+Pg
+Kz
+"}
+(23,1,1) = {"
+Kz
+Kz
+Kz
+Kz
+Kz
+Ym
+Ym
+Ym
+Ym
+Ke
+xC
+zM
+Bo
+Eq
+HM
+PG
+If
+UR
+lD
+PG
+lI
+JN
+Pg
+Kz
+Kz
+"}
+(24,1,1) = {"
+Kz
+Kz
+Kz
+Kz
+Kz
+Ym
+tc
+mK
+Ym
+Ym
+Ym
+Ym
+Ym
+dG
+wj
+PG
+lR
+Vd
+OR
+PG
+wM
+hG
+rI
+Kz
+Kz
+"}
+(25,1,1) = {"
+Kz
+Kz
+Kz
+Kz
+Kz
+Ym
+QI
+oR
+Bk
+pP
+LP
+zZ
+Ym
+YY
+HQ
+PG
+rY
+mS
+Gv
+fV
+wE
+xe
+rI
+dt
+Kz
+"}
+(26,1,1) = {"
+Kz
+Kz
+Kz
+Kz
+Kz
+Ym
+Ym
+Ym
+Ym
+UC
+GD
+CK
+Ym
+lf
+pQ
+PG
+PG
+PG
+PG
+PG
+Li
+Vs
+zh
+rI
+Kz
+"}
+(27,1,1) = {"
+Kz
+Kz
+Kz
+Kz
+Kz
+Ym
+tN
+zg
+Bt
+gQ
+LX
+qI
+Ym
+ch
+iE
+dG
+TJ
+Vm
+wK
+XP
+np
+MC
+lP
+xN
+Kz
+"}
+(28,1,1) = {"
+Kz
+Kz
+Kz
+Kz
+Kz
+Ym
+TN
+mU
+Ym
+Kk
+ZE
+hg
+Ym
+gw
+Bu
+dG
+UY
+xZ
+YF
+IT
+is
+Vs
+eh
+rI
+Kz
+"}
+(29,1,1) = {"
+Kz
+Kz
+Kz
+Kz
+Kz
+Ym
+Ym
+Ym
+Ym
+Ym
+oG
+MT
+ZZ
+nw
+iE
+dG
+Gh
+VU
+dM
+Cs
+np
+Vs
+Vs
+xN
+Kz
+"}
+(30,1,1) = {"
+Kz
+Kz
+Kz
+Kz
+BW
+dG
+iI
+nm
+nV
+WS
+Mv
+Aq
+Ce
+Ew
+qQ
+dG
+KU
+pb
+Wg
+tr
+Ad
+BI
+py
+rI
+Kz
+"}
+(31,1,1) = {"
+Kz
+Kz
+Kz
+fH
+dG
+dG
+ui
+WC
+ha
+ha
+ha
+id
+ha
+kp
+AX
+Nr
+Qd
+JF
+ye
+Rd
+dv
+pZ
+Ex
+xN
+Kz
+"}
+(32,1,1) = {"
+Kz
+Kz
+Kz
+dG
+dG
+dG
+dG
+xr
+Cf
+xM
+zt
+yM
+Rk
+EC
+ID
+lz
+cj
+oa
+Zh
+ZI
+Vk
+rI
+rI
+Mq
+Kz
+"}
+(33,1,1) = {"
+Kz
+Kz
+bn
+gx
+Tr
+AL
+Qq
+xH
+Wu
+xP
+xP
+xP
+xP
+Zb
+xP
+xP
+xP
+Pz
+Pz
+Xw
+Pz
+Pz
+Kz
+Kz
+Kz
+"}
+(34,1,1) = {"
+Kz
+Kz
+Kz
+Ct
+iw
+ps
+dG
+yz
+Iy
+xP
+As
+uh
+rs
+EL
+KX
+Ol
+xP
+Ww
+fY
+zW
+Xl
+Pz
+Kz
+Kz
+Kz
+"}
+(35,1,1) = {"
+Kz
+Kz
+Kz
+ka
+Ty
+Ty
+Ty
+yN
+Ty
+Ty
+An
+GM
+YV
+ZJ
+Im
+op
+xP
+Tv
+kA
+UM
+Fc
+Mt
+Kz
+Kz
+Kz
+"}
+(36,1,1) = {"
+Kz
+Kz
+Kz
+Ty
+ar
+eX
+uH
+nC
+rM
+Ty
+TH
+Jg
+RP
+Hn
+KY
+Dd
+xP
+YX
+TV
+Qj
+HH
+Pz
+Kz
+Kz
+Kz
+"}
+(37,1,1) = {"
+Kz
+Kz
+Kz
+Ty
+fp
+xA
+xA
+ul
+BG
+Ty
+Ba
+vk
+lG
+Um
+jm
+Oq
+RQ
+Sp
+yi
+FE
+Fc
+Mt
+Kz
+Kz
+Kz
+"}
+(38,1,1) = {"
+Kz
+Kz
+Kz
+dE
+IW
+pB
+pB
+Dt
+hk
+Ty
+MN
+FF
+SB
+Fa
+Lf
+Vx
+xP
+Dz
+jd
+hb
+hB
+Pz
+Kz
+Kz
+Kz
+"}
+(39,1,1) = {"
+Kz
+Kz
+Kz
+Ty
+IW
+Vt
+pB
+Wj
+Ty
+Ty
+xP
+te
+Fi
+VD
+un
+gs
+xP
+Id
+wG
+KO
+ki
+Pz
+Kz
+Kz
+Kz
+"}
+(40,1,1) = {"
+Kz
+Kz
+Kz
+dE
+iN
+Tn
+Bi
+OC
+Ty
+bq
+dj
+pu
+Kz
+Kz
+Kz
+Kz
+Zj
+Zj
+cu
+Zj
+Zj
+Zj
+Kz
+Kz
+Kz
+"}
+(41,1,1) = {"
+Kz
+Kz
+Kz
+Ty
+vm
+kB
+RG
+Cu
+Ty
+Kz
+Kz
+Kz
+Kz
+Kz
+Kz
+Kz
+Zj
+kR
+mb
+WQ
+PU
+Zj
+Kz
+Kz
+Kz
+"}
+(42,1,1) = {"
+Kz
+Kz
+Kz
+Ty
+cL
+qo
+eM
+yC
+Ty
+Kz
+Kz
+Kz
+Kz
+Kz
+Kz
+Kz
+Zj
+Zs
+Rp
+ON
+uN
+Zj
+Kz
+Kz
+Kz
+"}
+(43,1,1) = {"
+Kz
+Kz
+Kz
+Ty
+Ql
+yI
+Hm
+cg
+Ty
+Kz
+Kz
+Kz
+Kz
+Kz
+Kz
+Kz
+Zj
+hs
+zD
+rF
+uN
+Zj
+Kz
+Kz
+Kz
+"}
+(44,1,1) = {"
+Kz
+Kz
+Kz
+Ot
+jL
+Ot
+kG
+Ot
+Ot
+Kz
+Kz
+Kz
+Kz
+Kz
+Kz
+Kz
+Zj
+tO
+YC
+NU
+uN
+Zj
+Kz
+Kz
+Kz
+"}
+(45,1,1) = {"
+Kz
+Kz
+Kz
+Ot
+OK
+vr
+va
+GP
+Ot
+Kz
+Kz
+Kz
+Kz
+Kz
+Kz
+Kz
+Zj
+yG
+Xd
+ns
+PU
+Zj
+Kz
+Kz
+Kz
+"}
+(46,1,1) = {"
+Kz
+Kz
+Kz
+oi
+kV
+CF
+Od
+Ai
+Ot
+Ot
+Kz
+Kz
+Kz
+Kz
+Kz
+Kz
+Hl
+Zj
+Zj
+Zj
+Zj
+Xx
+Kz
+Kz
+Kz
+"}
+(47,1,1) = {"
+Kz
+Kz
+Kz
+oi
+Ot
+Ot
+vl
+Ot
+Ot
+Ot
+Kz
+Kz
+Kz
+Kz
+Kz
+Kz
+Kz
+dh
+Kz
+dh
+Kz
+Kz
+Kz
+Kz
+Kz
+"}
+(48,1,1) = {"
+Kz
+Kz
+Kz
+oi
+mN
+lu
+eV
+ME
+CQ
+Ot
+Kz
+Kz
+Kz
+Kz
+Kz
+Kz
+Kz
+dh
+Kz
+dh
+Kz
+Kz
+Kz
+Kz
+Kz
+"}
+(49,1,1) = {"
+Kz
+Kz
+Kz
+oi
+mO
+gV
+vJ
+wL
+df
+Ot
+Kz
+Kz
+Kz
+Kz
+Kz
+Kz
+Kz
+dh
+Kz
+dh
+Kz
+Kz
+Kz
+Kz
+Kz
+"}
+(50,1,1) = {"
+Kz
+Kz
+Kz
+Ot
+mW
+gV
+ws
+wL
+CQ
+Ot
+Kz
+Kz
+Kz
+Kz
+Kz
+Kz
+Kz
+dh
+Kz
+dh
+Kz
+Kz
+Kz
+Kz
+Kz
+"}
+(51,1,1) = {"
+Kz
+Kz
+gB
+Ot
+AZ
+GV
+UG
+my
+vC
+Ot
+Kz
+Kz
+Kz
+Kz
+Kz
+Kz
+Kz
+dh
+Kz
+bp
+Kz
+Kz
+Kz
+Kz
+Kz
+"}
+(52,1,1) = {"
+Kz
+Kz
+gF
+zl
+Ot
+Ot
+Ot
+Ot
+Ot
+Sq
+Kz
+Kz
+Kz
+Kz
+Kz
+Kz
+Kz
+Ij
+Kz
+Kz
+Kz
+Kz
+Kz
+Kz
+Kz
+"}
+(53,1,1) = {"
+Kz
+Kz
+Kz
+Kz
+Kz
+Kz
+Kz
+Kz
+Kz
+Kz
+Kz
+Kz
+Kz
+Kz
+Kz
+Kz
+Kz
+Kz
+Kz
+Kz
+Kz
+Kz
+Kz
+Kz
+Kz
+"}
diff --git a/code/game/objects/effects/decals/turfdecal/flooring_decals.dm b/code/game/objects/effects/decals/turfdecal/flooring_decals.dm
index afbdc5248c4d..1309d8f8fc7d 100644
--- a/code/game/objects/effects/decals/turfdecal/flooring_decals.dm
+++ b/code/game/objects/effects/decals/turfdecal/flooring_decals.dm
@@ -126,6 +126,7 @@ TURF_DECAL_COLOR_HELPER(opaque/green, COLOR_GREEN_GRAY, 255)
 TURF_DECAL_COLOR_HELPER(opaque/lime, COLOR_PALE_GREEN_GRAY, 255)
 TURF_DECAL_COLOR_HELPER(opaque/yellow, COLOR_BROWN, 255)
 TURF_DECAL_COLOR_HELPER(opaque/beige, COLOR_BEIGE, 255)
+TURF_DECAL_COLOR_HELPER(opaque/tan, "#c59973", 255)
 TURF_DECAL_COLOR_HELPER(opaque/red, COLOR_RED_GRAY, 255)
 TURF_DECAL_COLOR_HELPER(opaque/bar, "#791500", 255)
 TURF_DECAL_COLOR_HELPER(opaque/pink, COLOR_PALE_RED_GRAY, 255)
@@ -154,6 +155,7 @@ TURF_DECAL_COLOR_HELPER(transparent/green, COLOR_GREEN_GRAY, 140)
 TURF_DECAL_COLOR_HELPER(transparent/lime, COLOR_PALE_GREEN_GRAY, 140)
 TURF_DECAL_COLOR_HELPER(transparent/yellow, COLOR_BROWN, 140)
 TURF_DECAL_COLOR_HELPER(transparent/beige, COLOR_BEIGE, 140)
+TURF_DECAL_COLOR_HELPER(transparent/tan, "#c59973", 140)
 TURF_DECAL_COLOR_HELPER(transparent/red, COLOR_RED_GRAY, 140)
 TURF_DECAL_COLOR_HELPER(transparent/bar, "#791500", 130)
 TURF_DECAL_COLOR_HELPER(transparent/pink, COLOR_PALE_RED_GRAY, 140)
diff --git a/code/game/objects/items/desk_flags.dm b/code/game/objects/items/desk_flags.dm
index c1af9cfe6c3f..5f0d76eee5a0 100644
--- a/code/game/objects/items/desk_flags.dm
+++ b/code/game/objects/items/desk_flags.dm
@@ -35,3 +35,8 @@
 	name = "SUNS desk flag"
 	desc = "A little desk decoration in the gold and purple color palette of SUNS."
 	icon_state = "suns"
+
+/obj/item/desk_flag/ngr
+	name = "new gorlexian desk flag"
+	desc = "The crimson, black, and tan flag of the New Gorlex Republic."
+	icon_state = "ngr"
diff --git a/code/game/objects/items/storage/filled_guncases.dm b/code/game/objects/items/storage/filled_guncases.dm
index 57f6f70e32b7..cc432f85b0b3 100644
--- a/code/game/objects/items/storage/filled_guncases.dm
+++ b/code/game/objects/items/storage/filled_guncases.dm
@@ -70,6 +70,10 @@
 	gun_type = /obj/item/gun/ballistic/automatic/pistol/ringneck
 	mag_type = /obj/item/ammo_box/magazine/m10mm_ringneck
 
+/obj/item/storage/guncase/pistol/asp
+	gun_type = /obj/item/gun/ballistic/automatic/pistol/asp
+	mag_type = /obj/item/ammo_box/magazine/m57_39_asp
+
 /obj/item/storage/guncase/pistol/rattlesnake
 	gun_type = /obj/item/gun/ballistic/automatic/pistol/rattlesnake
 	mag_type = /obj/item/ammo_box/magazine/m9mm_rattlesnake
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm
index 9c2e0605de7e..0e1bc2ec3efa 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm
@@ -267,6 +267,11 @@
 	name = "Contraband Locker"
 	req_access = list(ACCESS_HEADS)
 
+/obj/structure/closet/secure_closet/armorycage
+	name = "armory locker"
+	req_access = list(ACCESS_ARMORY)
+	icon_state = "shotguncase"
+
 /obj/structure/closet/secure_closet/armory1
 	name = "armory armor locker"
 	req_access = list(ACCESS_ARMORY)
diff --git a/code/game/objects/structures/signs/signs_flags.dm b/code/game/objects/structures/signs/signs_flags.dm
index 415bce3bf6f5..48eb38cafa32 100644
--- a/code/game/objects/structures/signs/signs_flags.dm
+++ b/code/game/objects/structures/signs/signs_flags.dm
@@ -43,6 +43,12 @@
 	icon_state = "flag_suns"
 	item_flag = /obj/item/sign/flag/suns
 
+/obj/structure/sign/flag/ngr
+	name = "\improper New Gorlexian flag"
+	desc = "The New Gorlex Republic's colors: Red for the martyrs of Old Gorlex, Black for the endless Frontier, and tan for the sands of New Gorlex."
+	icon_state = "flag_ngr"
+	item_flag = /obj/item/sign/flag/ngr
+
 // ITEM FLAGS - THE THINGS YOU HOLD AND PLACE
 
 /obj/item/sign/flag
@@ -63,3 +69,9 @@
 	desc = "A folded up purple Flag. Something about this flag makes you think of chemistry."
 	icon_state = "folded_suns"
 	sign_path = /obj/structure/sign/flag/suns
+
+/obj/item/sign/flag/ngr
+	name = "folded New Gorlexian flag"
+	desc = "A folded up NGR flag. Something about this flag makes you think of explosives."
+	icon_state = "folded_ngr"
+	sign_path = /obj/structure/sign/flag/ngr
diff --git a/code/modules/clothing/outfits/factions/syndicate.dm b/code/modules/clothing/outfits/factions/syndicate.dm
index 1d91a94b766d..af3bc97ac2e9 100644
--- a/code/modules/clothing/outfits/factions/syndicate.dm
+++ b/code/modules/clothing/outfits/factions/syndicate.dm
@@ -40,18 +40,13 @@
 	alt_uniform = null
 
 	shoes = /obj/item/clothing/shoes/jackboots
-	gloves = /obj/item/clothing/gloves/color/black
+	gloves = null
 	ears = /obj/item/radio/headset
 	back = /obj/item/storage/backpack
 
 	id = /obj/item/card/id/syndicate_command/crew_id
 	r_pocket = /obj/item/radio
 
-	backpack = /obj/item/storage/backpack/security
-	satchel = /obj/item/storage/backpack/satchel/sec
-	duffelbag = /obj/item/storage/backpack/duffelbag/syndie
-	courierbag = /obj/item/storage/backpack/messenger/sec
-
 	box = /obj/item/storage/box/survival
 
 /datum/outfit/job/syndicate/assistant/gorlex
@@ -521,6 +516,20 @@
 	backpack_contents = list(/obj/item/storage/box/ids=1,\
 		/obj/item/melee/classic_baton/telescopic=1, /obj/item/modular_computer/tablet/preset/advanced = 1)
 
+/datum/outfit/job/syndicate/head_of_personnel/ngr
+	name = "Syndicate - Ensign (NGR)"
+	id_assignment = "Ensign"
+
+	ears = /obj/item/radio/headset/syndicate
+	uniform = /obj/item/clothing/under/syndicate/ngr/officer
+	head = /obj/item/clothing/head/ngr
+	suit = /obj/item/clothing/suit/armor/ngr/lieutenant
+	id = /obj/item/card/id/syndicate_command/crew_id
+	shoes = /obj/item/clothing/shoes/combat
+	glasses = null
+	gloves = null
+
+
 /datum/outfit/job/syndicate/head_of_personnel/cybersun
 	name = "Syndicate - Intelligence Officer (Cybersun)"
 	id_assignment = "Intelligence Officer"
@@ -594,7 +603,8 @@
 	suit = /obj/item/clothing/suit/armor/ngr/lieutenant
 	id = /obj/item/card/id/syndicate_command/crew_id
 	shoes = /obj/item/clothing/shoes/combat
-	suit_store = /obj/item/gun/ballistic/automatic/pistol/ringneck
+	suit_store = null
+	gloves = /obj/item/clothing/gloves/color/black
 
 
 /datum/outfit/job/syndicate/hos/twink
@@ -676,10 +686,12 @@
 	uniform = /obj/item/clothing/under/syndicate
 	id = /obj/item/card/id/syndicate_command/crew_id
 	shoes = /obj/item/clothing/shoes/jackboots
-	shoes = /obj/item/clothing/shoes/sneakers/white
 	alt_suit = /obj/item/clothing/suit/apron/surgical
-	l_hand = /obj/item/storage/firstaid/medical
 	box = /obj/item/storage/box/survival/medical
+	backpack = /obj/item/storage/backpack/medic
+	satchel = /obj/item/storage/backpack/satchel/med
+	duffelbag = /obj/item/storage/backpack/duffelbag/syndie/med
+	courierbag = /obj/item/storage/backpack/messenger/med
 
 /datum/outfit/job/syndicate/doctor/suns
 	name = "Syndicate - Medical Doctor (SUNS)"
@@ -712,9 +724,9 @@
 	suit = /obj/item/clothing/suit/hardliners
 	glasses = /obj/item/clothing/glasses/hud/health
 	r_pocket = /obj/item/melee/knife/survival
-	back = /obj/item/storage/backpack/duffelbag/syndie/med
 	id = /obj/item/card/id/syndicate_command/crew_id
 	backpack_contents = list(/obj/item/storage/box/survival/syndie=1, /obj/item/storage/firstaid/medical,)
+	shoes = /obj/item/clothing/shoes/combat
 
 /datum/outfit/job/syndicate/doctor/ngr
 	name = "Syndicate - Medical Doctor (New Gorlex Republic)"
@@ -724,9 +736,8 @@
 	suit = /obj/item/clothing/suit/ngr/smock
 	glasses = /obj/item/clothing/glasses/hud/health
 	r_pocket = /obj/item/melee/knife/survival
-	back = /obj/item/storage/backpack/duffelbag/syndie/med
 	id = /obj/item/card/id/syndicate_command/crew_id
-	backpack_contents = list(/obj/item/storage/box/survival/syndie=1, /obj/item/storage/firstaid/medical,)
+	shoes = /obj/item/clothing/shoes/combat
 
 //paramedics
 
@@ -910,10 +921,6 @@
 	l_pocket = /obj/item/restraints/handcuffs
 	r_pocket = /obj/item/assembly/flash/handheld
 
-	backpack_contents = list(
-		/obj/item/melee/baton/loaded=1,
-	)
-
 	box = /obj/item/storage/box/survival/security
 
 
@@ -1016,14 +1023,13 @@
 	shoes = /obj/item/clothing/shoes/workboots/mining
 	gloves = /obj/item/clothing/gloves/explorer
 	uniform = /obj/item/clothing/under/rank/cargo/miner/lavaland
-	l_pocket = /obj/item/reagent_containers/hypospray/medipen/survival
 	r_pocket = /obj/item/storage/bag/ore
 	backpack_contents = list(
-		/obj/item/flashlight/seclite=1,\
-		/obj/item/melee/knife/survival=1,\
-		/obj/item/mining_voucher=1,\
-		/obj/item/stack/marker_beacon/ten=1)
-
+						/obj/item/flashlight/seclite=1,
+						/obj/item/melee/knife/survival=1,
+						/obj/item/stack/marker_beacon/ten=1,
+						/obj/item/radio/weather_monitor=1,
+						)
 	box = /obj/item/storage/box/survival/mining
 
 /datum/outfit/job/syndicate/miner/gorlex
@@ -1117,6 +1123,11 @@
 	head = /obj/item/clothing/head/hardhat/dblue
 	r_pocket = /obj/item/t_scanner
 
+	backpack = /obj/item/storage/backpack/industrial
+	satchel = /obj/item/storage/backpack/satchel/eng
+	duffelbag = /obj/item/storage/backpack/duffelbag/engineering
+	courierbag = /obj/item/storage/backpack/messenger/engi
+
 	box = /obj/item/storage/box/survival/engineer
 	pda_slot = ITEM_SLOT_LPOCKET
 	backpack_contents = list(/obj/item/modular_computer/tablet/preset/advanced=1)
diff --git a/code/modules/clothing/spacesuits/syndi.dm b/code/modules/clothing/spacesuits/syndi.dm
index 67dc2201d60c..2b2660af4f9c 100644
--- a/code/modules/clothing/spacesuits/syndi.dm
+++ b/code/modules/clothing/spacesuits/syndi.dm
@@ -4,7 +4,7 @@
 	icon_state = "syndicate"
 	item_state = "syndicate"
 	desc = "An advanced, lightweight space helmet made of durable composites. Almost matches integrated hardsuit helmets for protection. Almost."
-	armor = list("melee" = 30, "bullet" = 15, "laser" = 15, "energy" = 40, "bomb" = 20, "bio" = 100, "rad" = 30, "fire" = 75, "acid" = 75)
+	armor = list("melee" = 30, "bullet" = 15, "laser" = 30, "energy" = 40, "bomb" = 20, "bio" = 100, "rad" = 30, "fire" = 75, "acid" = 75)
 	supports_variations = VOX_VARIATION
 
 /obj/item/clothing/suit/space/syndicate
@@ -13,8 +13,11 @@
 	item_state = "space_suit_syndicate"
 	desc = "A space suit made of high-grade ballistic fabric with integrated armor plates. More compact than a normal space suit while almost matching powered hardsuits for protection. Almost."
 	w_class = WEIGHT_CLASS_NORMAL
-	allowed = list(/obj/item/gun, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/melee/energy/sword/saber, /obj/item/restraints/handcuffs, /obj/item/tank/internals)
-	armor = list("melee" = 30, "bullet" = 15, "laser" = 15, "energy" = 40, "bomb" = 20, "bio" = 100, "rad" = 30, "fire" = 75, "acid" = 75)
+	armor = list("melee" = 30, "bullet" = 15, "laser" = 30, "energy" = 40, "bomb" = 20, "bio" = 100, "rad" = 30, "fire" = 75, "acid" = 75)
+
+/obj/item/clothing/suit/space/syndicate/Initialize()
+	. = ..()
+	allowed = GLOB.security_hardsuit_allowed
 
 //Green syndicate space suit
 /obj/item/clothing/head/helmet/space/syndicate/green
@@ -105,6 +108,7 @@
 	icon_state = "syndicate-helm-black-med"
 	item_state = "syndicate-helm-black"
 
+
 /obj/item/clothing/suit/space/syndicate/black/med
 	name = "green space suit"
 	icon_state = "syndicate-black-med"
diff --git a/code/modules/projectiles/guns/manufacturer/scarborough/ballistics.dm b/code/modules/projectiles/guns/manufacturer/scarborough/ballistics.dm
index 200d608cbe61..2fd29228f1d1 100644
--- a/code/modules/projectiles/guns/manufacturer/scarborough/ballistics.dm
+++ b/code/modules/projectiles/guns/manufacturer/scarborough/ballistics.dm
@@ -158,6 +158,8 @@ NO_MAG_GUN_HELPER(automatic/pistol/asp)
 	else
 		icon_state = "[base_icon_state]-0"
 
+/obj/item/ammo_box/magazine/m57_39_asp/empty
+	start_empty = TRUE
 
 /obj/item/gun/ballistic/revolver/viper
 	name = "R-23 \"Viper\""
diff --git a/icons/obj/deskflags.dmi b/icons/obj/deskflags.dmi
index 6a950bcebc4e991a8150926b7db6585c3eeaaf3e..10f24d037fd71c433b348b38638ccd918d2c6cbd 100644
GIT binary patch
delta 561
zcmV-10?z%31&{`i7Y<+u0{{R3)kcR30001WktJR*z`(#+9WlW+Ba9j}Pft)YH9Fa?
zf)WuHrg~cg{d&>>0004WQchC<K<3zH0001uk(hjc5}_zBy$F{YWd&D17jT#X02pvr
zrK~ZF4gdfFut`KgRA_<inEj4|Fc8FxV)+t~;t7aEKGgSr#H$bBOfH+f+$EiVhwd-a
z)@D~@f_|t-+uz|Yq`onGY{$fB>y0_!`ZmGKQ@ox65&}pwF#r?N+-AA}Yx4{vARtZ%
zA<J`rn_EqQPe3+_0|24O3Y+HwfG5BNX_3)WrU0}<$HFHlBmk4d$W4!#B|F3bG4azQ
z3BUl{Pq7~z$ZIL}cL(_1N`3#qjuepjW*<cndeNo6|6;G}2L%NM{SB4Gm(B-Oi3#HQ
zpsuigBCl~n{Mxn9KYv|t{jSG=w#0zpiUECp$p8*VNUk_SUy=x}#DKx#2xEsM)cz7V
zaLnfcM`*?hN2p!pT>aTU4GD~J8*g2O0F!&`GvN(Dgr={`5l5(83leyOwFB^*zQd<H
zwe5s_4}e3U2e5kz>l<@9W4~{(Zzj^7pNQWG2XVO{=7TUF1O){J{f=0FFRoAj{}<|H
zuKe2G=S3H=teY-iTa^jRV^#$`U$4iic?!?vHR}SlZJkvw(sR?T@ApXkhj7=eZ|=0e
zmr5JJ`g?JG*5Atkq`#Mn_xEB#=<kDq{-eGD^WYVJsJ<gF00000NkvXXu0mjf%WnNL

delta 425
zcmV;a0apHy28jib7Y;xO0{{R3(&~ad00015ktJRgxvSSj00001bW%=J06^y0W&i*H
zhmo^<f8ti8tl;YB0uB!VO*~D&cSG5!0003>Nkl<ZScUDE+m3@E07UV|O+i7oVy*xG
zn@c~SGwBkOePCV>a57+s2vPH8n!9<6N0f3QI*fb5*?b`eyuMU;y2kUVKoNm9#R6>5
zR+@VSQd)x*P|z!4FxE;d?-b+)WRti67)CQne`^Z_*#H~p(a=+-0<=TZm>Y~G0-<_D
z^<*U3AtvYv*Apqg1e|Nkn}OVxrMw;BeOt=&fR-#!#zogO4Z6`wc^=W-%WG<CYW_zY
z;ic~b@35ixeK32>7jhd1!soa`zWqG#`g_8H)nUQ$#De6QAmR$@i7O;WDny3`hr|`m
zcO6%l^G6iHF>eR15KfOP%+bd<f9A`fV1?KD+C36n@tx0xw*VPJ^6tbHd|W|;Y>@H*
zJft0;^0lrP;#mM6fmy)5Q@Fkmj}7w_Fc%m3Jzoe9g%9y^Uf&1xeNa<V^QZg*-_Z{x
TBFId$00000NkvXXu0mjfbxpm-

diff --git a/icons/obj/structures/signs/wallflags.dmi b/icons/obj/structures/signs/wallflags.dmi
index 837e442f27ca180c918a316da773cf9d88a22c7b..94dfc2144e66a9f7ca2ad06efcd4b9df810a8dbb 100644
GIT binary patch
delta 2030
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
M07*qoM6N<$f*+N-$p8QV

delta 1270
zcmV<S1PS|q5seEaiBL{Q4GJ0x0000DNk~Le0001h0001B2m=5B0OF*IdjJ3cKanLR
zGhQQnfKQY>98LfK{~QY}|J!Efgd(d-Cxa~$4ha_;&T$t20004WQchC<K<3zH0001!
zk(h{o#iv$T!PU<N9Bcp{?_FR22%7Z(00do0L_t(&f$dn0nxh~L+$|sqa)SE)&w7)n
ztv_9>#e=<XH`Uf+Ylch`5<WhT%ID|pc0UjQ>oQrW&jBGjfR*~s+m8c~or3HD&QWlC
za{JlXaaqloK<opUpf0bI$-`31>kI(qXF>pfA5YY$4czPio>B0#0Gy`aWSn0Q;Od|`
zPr=2Eod<An(3}s$>;SS;a4mp0)`Dv(cw;%v4&Z7Ej*a~@0B=a%#q&D=$WB3a0NLB`
zco9+wCHW;pdi7EiLTX4^mX%Z{IRt^(>uQiv7SbdKAdQhyDOkW%l}t~9gnCKp%TmdI
zs!9()2u!?W(MDzfAPc47eia?1QiV*dpLv&X1W<tseBJx`{@r(k^v}K$f>%E$Ngu7F
z$f_XiB7L-uLRk|D1CEo+1VX`AfIwygP#O&cWu;a(Qf(&55_wx0WbNg6vTBGXPs>)h
zv_QHIH8TNNSYW3jJQ?S&0g!Ugpyw8U*egj-X1dn^*aE83v&ZcBaTn)$_5rOH7T5=X
zyeTPnlvHt09*qP*lfk;J=g-;g3Mg?KJ*>AEBoF}u;3-<J^T5~t5Y?mPs!Xf}gsLio
zB1Rmh67>dUuE78%w&cQEKqZt>#o^}&vin4Vj0J$z5RW)D4_LrRHI-a4av>jo{FvhT
zH~=yM1JDZPr-=*0H?jyNAC3a86z8KT0B;CqKXccgejPXHcFHjfb&l>&7{yUY?H~7n
z$pN6@ME7U#5?T~FN-1$~zE!qL?pJ>0yNb1S{babVtxW^KL6zH%0@ikPN922j_Mbmc
zWpOl3GwE}<=CMNns7)3ks?vvl32HJpKse_}x#f{#2B5kG7>bBWp8$AIDueev)YI2v
z20)FE6)q~j65Sz;=i_qA01QOO62Q=>o0zQvS2GE|t$o0&ZrK`cV*z*tXu>fcR6~Jo
z%0mDE_lc#*-=V*&p_q@(^T;X+2Un@x5&_B#gCbq8JN4)K3zP&;3R3caK$`#k)%tC6
zaFd&K-5h}$`{W}&C<;Rb(G~%FA?OdR9-sBr2c0FqAP^yRvs-ck@Vd-Iv~XKsHVB*p
z0WD3BanyAS65IknV;^o(hwfnlg(jVw^_Kuf{oI(WZuQ<WfWSTw7=ZQtT>s#vqnp_9
zAORhpI%EOzRLw&BODhY1^v(y$0UQPN5j@5=`X@IDHr#^|7Et<#4~RK{6$fzau(Cjy
zC*narImzHAT^;UuTWEAVwCnKF2~i7+0)qFo5A+NG`DmD+bqwG^f#VF|TMWYb!FIug
z2>?o6-mp8C2fmP=Oki8+APOw5$N&!jNPpJbKmf+Wg^2>R=xEe`t152Ov~OH!d2*iL
zTX4MaL6&Y5y0|-`C}`Idoo`gF4GvuBXl~vPCZ02}FSKWkGiEg$IIv^`P(bsy3kLQ@
za-$x(^Vc-Y??^D6ZPUE|+Y(6B)??GQ<mzn*u!D83ZO`hDmcDPeAfl3}>5tm~au9v!
gb1DCo|5g41DNsHUMJYi0w*UYD07*qoM6N<$g1Ol`WdHyG


From a0d35d4d011a0c6f10aa9ec6c55c352eee91c702 Mon Sep 17 00:00:00 2001
From: Changelogs <action@github.com>
Date: Tue, 5 Nov 2024 22:16:26 -0600
Subject: [PATCH 04/29] Automatic changelog generation for PR #3554 [ci skip]

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

diff --git a/html/changelogs/AutoChangeLog-pr-3554.yml b/html/changelogs/AutoChangeLog-pr-3554.yml
new file mode 100644
index 000000000000..3f5cfd6d3eb5
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-3554.yml
@@ -0,0 +1,6 @@
+author: Apogee-dev
+changes:
+  - {rscadd: the NGR Kali Andhi-class destroyer}
+  - {rscadd: NGR floor decals and flags}
+  - {balance: red space suit armor made equivalent to sec hardsuits}
+delete-after: true

From f86b5952e3d101a05eb10e61149549c4c3143ad7 Mon Sep 17 00:00:00 2001
From: Changelogs <action@github.com>
Date: Thu, 7 Nov 2024 01:01:52 +0000
Subject: [PATCH 05/29] Automatic changelog compile [ci skip]

---
 html/changelogs/AutoChangeLog-pr-3554.yml | 6 ------
 html/changelogs/AutoChangeLog-pr-3707.yml | 4 ----
 html/changelogs/archive/2024-11.yml       | 7 +++++++
 3 files changed, 7 insertions(+), 10 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-3554.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-3707.yml

diff --git a/html/changelogs/AutoChangeLog-pr-3554.yml b/html/changelogs/AutoChangeLog-pr-3554.yml
deleted file mode 100644
index 3f5cfd6d3eb5..000000000000
--- a/html/changelogs/AutoChangeLog-pr-3554.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: Apogee-dev
-changes:
-  - {rscadd: the NGR Kali Andhi-class destroyer}
-  - {rscadd: NGR floor decals and flags}
-  - {balance: red space suit armor made equivalent to sec hardsuits}
-delete-after: true
diff --git a/html/changelogs/AutoChangeLog-pr-3707.yml b/html/changelogs/AutoChangeLog-pr-3707.yml
deleted file mode 100644
index 5b4491e47906..000000000000
--- a/html/changelogs/AutoChangeLog-pr-3707.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: MarkSuckerberg
-changes:
-  - {rscadd: Added a confirmation pop up for abandoning missions.}
-delete-after: true
diff --git a/html/changelogs/archive/2024-11.yml b/html/changelogs/archive/2024-11.yml
index ae14b83eccc3..02fdf8a4d733 100644
--- a/html/changelogs/archive/2024-11.yml
+++ b/html/changelogs/archive/2024-11.yml
@@ -89,3 +89,10 @@
       in the frontier!
   SomeguyManperson:
   - bugfix: shields work as intended again
+2024-11-07:
+  Apogee-dev:
+  - rscadd: the NGR Kali Andhi-class destroyer
+  - rscadd: NGR floor decals and flags
+  - balance: red space suit armor made equivalent to sec hardsuits
+  MarkSuckerberg:
+  - rscadd: Added a confirmation pop up for abandoning missions.

From b120f7607ce96302320d015473a5b9b56e3a383a Mon Sep 17 00:00:00 2001
From: Erika Fox <94164348+Erikafox@users.noreply.github.com>
Date: Fri, 8 Nov 2024 16:35:34 -0500
Subject: [PATCH 06/29] wasteplanets no longer spawn manhacks (#3706)

## About The Pull Request

Wasteplanets no longer spawn manhacks. I don't think the live manhack
fields fits the aesthetic of them (nor is it particularly interesting in
gameplay)

## Changelog

:cl:
balance: wasteplanets no longer spawn manhacks
/:cl:

Co-authored-by: Bjarl <94164348+Bjarl@users.noreply.github.com>
---
 code/datums/mapgen/planetary/WasteGenerator.dm | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/code/datums/mapgen/planetary/WasteGenerator.dm b/code/datums/mapgen/planetary/WasteGenerator.dm
index 3f87e6879c1b..a4f9a1fcae71 100644
--- a/code/datums/mapgen/planetary/WasteGenerator.dm
+++ b/code/datums/mapgen/planetary/WasteGenerator.dm
@@ -400,9 +400,7 @@
 		/obj/effect/spawner/random/maintenance/three = 20,
 		/obj/effect/spawner/random/maintenance/four = 40,
 		/obj/effect/spawner/random/waste/salvageable = 80,
-		/obj/item/mine/proximity/spawner/manhack/live = 40,
 		/obj/effect/spawner/random/mine = 8,
-		/obj/effect/spawner/minefield/manhack = 2
 	)
 	mob_spawn_list = list( //nor organics, more biased towards hivebots though
 		/mob/living/simple_animal/hostile/hivebot/wasteplanet/strong = 80,
@@ -430,7 +428,6 @@
 		/obj/effect/spawner/random/maintenance/four = 20,
 		/obj/effect/spawner/random/waste/salvageable = 40,
 		/obj/structure/foamedmetal = 100,
-		/obj/item/mine/proximity/spawner/manhack/live = 20
 	)
 	mob_spawn_list = list( //Whoops! All hivebots!
 		/mob/living/simple_animal/hostile/hivebot/wasteplanet/strong = 80,
@@ -440,7 +437,6 @@
 	mob_spawn_chance = 30
 	feature_spawn_list = list(
 		/obj/structure/spawner/hivebot = 1,
-		/obj/effect/spawner/minefield/manhack = 2
 		)
 	feature_spawn_chance = 2 //hivebot biomes should have their dongles
 
@@ -484,4 +480,3 @@
 	flora_spawn_chance = 30
 	feature_spawn_chance = 8
 	mob_spawn_chance = 5
-

From cc229340beeae7c50287ea78ae025404dd17d947 Mon Sep 17 00:00:00 2001
From: Changelogs <action@github.com>
Date: Fri, 8 Nov 2024 15:48:38 -0600
Subject: [PATCH 07/29] Automatic changelog generation for PR #3706 [ci skip]

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

diff --git a/html/changelogs/AutoChangeLog-pr-3706.yml b/html/changelogs/AutoChangeLog-pr-3706.yml
new file mode 100644
index 000000000000..354b45cdf8ea
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-3706.yml
@@ -0,0 +1,4 @@
+author: Erikafox
+changes:
+  - {balance: wasteplanets no longer spawn manhacks}
+delete-after: true

From 710748eedeb47d754e3b87abfd390a57016ff1c1 Mon Sep 17 00:00:00 2001
From: Theos <theubernyan@gmail.com>
Date: Fri, 8 Nov 2024 16:35:41 -0500
Subject: [PATCH 08/29] kilo shotgun fix (#3714)

<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request
Hello everybody my name is market pliers and today we will be pulling
the plug

## Why It's Good For The Game

fixes #3682

## Changelog

:cl:
fix: the kilo sawnoff shotgun is no longer the private domicile of The
Void
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

---------

Signed-off-by: Theos <theubernyan@gmail.com>
---
 _maps/shuttles/independent/independent_kilo.dmm    | 4 +---
 code/modules/projectiles/guns/ballistic/shotgun.dm | 2 ++
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/_maps/shuttles/independent/independent_kilo.dmm b/_maps/shuttles/independent/independent_kilo.dmm
index 7783dff02df5..d0d7523167b9 100644
--- a/_maps/shuttles/independent/independent_kilo.dmm
+++ b/_maps/shuttles/independent/independent_kilo.dmm
@@ -662,12 +662,10 @@
 	dir = 8
 	},
 /obj/item/storage/box/ammo/a12g_rubbershot,
-/obj/item/gun/ballistic/shotgun/doublebarrel/presawn{
-	default_ammo_type = 0
-	},
 /obj/structure/cable/pink{
 	icon_state = "4-10"
 	},
+/obj/item/gun/ballistic/shotgun/doublebarrel/presawn/empty,
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
 "gs" = (
diff --git a/code/modules/projectiles/guns/ballistic/shotgun.dm b/code/modules/projectiles/guns/ballistic/shotgun.dm
index 567862ca1791..a519dc257ae6 100644
--- a/code/modules/projectiles/guns/ballistic/shotgun.dm
+++ b/code/modules/projectiles/guns/ballistic/shotgun.dm
@@ -353,6 +353,8 @@ EMPTY_GUN_HELPER(shotgun/doublebarrel)
 		/obj/item/ammo_box/magazine/internal/shot/dual/lethal,
 	)
 
+EMPTY_GUN_HELPER(shotgun/doublebarrel/presawn)
+
 /obj/item/gun/ballistic/shotgun/doublebarrel/roumain
 	name = "HP antique double-barreled shotgun"
 	desc = "A special-edition shotgun hand-made by Hunter's Pride with a high-quality walnut stock inlaid with brass scrollwork. Shotguns like this are very rare outside of the Saint-Roumain Militia's ranks. Otherwise functionally identical to a common double-barreled shotgun. Chambered in 12g."

From 512db5ec54338e96ac609fccc0c4d9ed0d0a5cd9 Mon Sep 17 00:00:00 2001
From: Changelogs <action@github.com>
Date: Fri, 8 Nov 2024 16:04:11 -0600
Subject: [PATCH 09/29] Automatic changelog generation for PR #3714 [ci skip]

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

diff --git a/html/changelogs/AutoChangeLog-pr-3714.yml b/html/changelogs/AutoChangeLog-pr-3714.yml
new file mode 100644
index 000000000000..b6d9221fcf42
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-3714.yml
@@ -0,0 +1,4 @@
+author: SomeguyManperson
+changes:
+  - {bugfix: the kilo sawnoff shotgun is no longer the private domicile of The Void}
+delete-after: true

From 65923043fb9d2108dd0daf00c9edae4272c208fb Mon Sep 17 00:00:00 2001
From: Changelogs <action@github.com>
Date: Sat, 9 Nov 2024 00:59:57 +0000
Subject: [PATCH 10/29] Automatic changelog compile [ci skip]

---
 html/changelogs/AutoChangeLog-pr-3706.yml | 4 ----
 html/changelogs/AutoChangeLog-pr-3714.yml | 4 ----
 html/changelogs/archive/2024-11.yml       | 5 +++++
 3 files changed, 5 insertions(+), 8 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-3706.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-3714.yml

diff --git a/html/changelogs/AutoChangeLog-pr-3706.yml b/html/changelogs/AutoChangeLog-pr-3706.yml
deleted file mode 100644
index 354b45cdf8ea..000000000000
--- a/html/changelogs/AutoChangeLog-pr-3706.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: Erikafox
-changes:
-  - {balance: wasteplanets no longer spawn manhacks}
-delete-after: true
diff --git a/html/changelogs/AutoChangeLog-pr-3714.yml b/html/changelogs/AutoChangeLog-pr-3714.yml
deleted file mode 100644
index b6d9221fcf42..000000000000
--- a/html/changelogs/AutoChangeLog-pr-3714.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: SomeguyManperson
-changes:
-  - {bugfix: the kilo sawnoff shotgun is no longer the private domicile of The Void}
-delete-after: true
diff --git a/html/changelogs/archive/2024-11.yml b/html/changelogs/archive/2024-11.yml
index 02fdf8a4d733..815f1bdbc653 100644
--- a/html/changelogs/archive/2024-11.yml
+++ b/html/changelogs/archive/2024-11.yml
@@ -96,3 +96,8 @@
   - balance: red space suit armor made equivalent to sec hardsuits
   MarkSuckerberg:
   - rscadd: Added a confirmation pop up for abandoning missions.
+2024-11-09:
+  Erikafox:
+  - balance: wasteplanets no longer spawn manhacks
+  SomeguyManperson:
+  - bugfix: the kilo sawnoff shotgun is no longer the private domicile of The Void

From ccafc6640572028925d8b63daf2326c88c4a4ed9 Mon Sep 17 00:00:00 2001
From: Mark Suckerberg <mark@suckerberg.gay>
Date: Fri, 8 Nov 2024 19:58:17 -0600
Subject: [PATCH 11/29] Tidies Configs (#3705)

<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request

Removes a bunch of unused config options to reduce confusion when people
edit the config, and prevents people from using options that are fully
deprecated.

## Why It's Good For The Game

See about

## Changelog

:cl:
config: Removes a lot of old, unused config options
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
---
 .../configuration/entries/game_options.dm     | 48 ------------
 .../configuration/entries/general.dm          | 40 ----------
 code/game/area/areas.dm                       | 11 ---
 .../nukeop/equipment/nuclear_challenge.dm     |  1 -
 code/modules/awaymissions/zlevel.dm           |  2 -
 config/config.txt                             | 20 +----
 config/game_options.txt                       | 74 -------------------
 7 files changed, 1 insertion(+), 195 deletions(-)

diff --git a/code/controllers/configuration/entries/game_options.dm b/code/controllers/configuration/entries/game_options.dm
index ac7298dc100d..dfdeaa8e1b56 100644
--- a/code/controllers/configuration/entries/game_options.dm
+++ b/code/controllers/configuration/entries/game_options.dm
@@ -120,11 +120,6 @@
 	min_val = 0
 	max_val = 1
 
-/datum/config_entry/number/shuttle_refuel_delay
-	config_entry_value = 12000
-	integer = FALSE
-	min_val = 0
-
 /datum/config_entry/flag/show_game_type_odds	//if set this allows players to see the odds of each roundtype on the get revision screen
 
 /datum/config_entry/keyed_list/roundstart_races	//races you can play as from the get go.
@@ -250,15 +245,6 @@
 	movedelay_type = /mob/living/simple_animal
 /////////////////////////////////////////////////
 
-/datum/config_entry/flag/virtual_reality	//Will virtual reality be loaded
-
-/datum/config_entry/flag/roundstart_away	//Will random away mission be loaded.
-
-/datum/config_entry/number/gateway_delay	//How long the gateway takes before it activates. Default is half an hour. Only matters if roundstart_away is enabled.
-	config_entry_value = 18000
-	integer = FALSE
-	min_val = 0
-
 /datum/config_entry/flag/ghost_interaction
 
 /datum/config_entry/flag/near_death_experience //If carbons can hear ghosts when unconscious and very close to death
@@ -293,32 +279,9 @@
 	config_entry_value = -1
 	min_val = -1
 
-/datum/config_entry/string/overflow_job
-	config_entry_value = "Assistant"
-
 /datum/config_entry/flag/starlight
 /datum/config_entry/flag/grey_assistants
 
-/datum/config_entry/number/lavaland_budget
-	config_entry_value = 60
-	integer = FALSE
-	min_val = 0
-
-/datum/config_entry/number/whitesands_budget
-	config_entry_value = 60
-	integer = FALSE
-	min_val = 0
-
-/datum/config_entry/number/icemoon_budget
-	config_entry_value = 90
-	integer = FALSE
-	min_val = 0
-
-/datum/config_entry/number/space_budget
-	config_entry_value = 16
-	integer = FALSE
-	min_val = 0
-
 /datum/config_entry/flag/allow_random_events	// Enables random events mid-round when set
 
 /datum/config_entry/number/events_min_time_mul	// Multipliers for random events minimal starting time and minimal players amounts
@@ -352,13 +315,6 @@
 		GLOB.MAX_EX_FLASH_RANGE = config_entry_value
 		GLOB.MAX_EX_FLAME_RANGE = config_entry_value
 
-/datum/config_entry/number/emergency_shuttle_autocall_threshold
-	min_val = 0
-	max_val = 1
-	integer = FALSE
-
-/datum/config_entry/flag/ic_printing
-
 /datum/config_entry/flag/roundstart_traits
 
 /datum/config_entry/flag/randomize_shift_time
@@ -373,10 +329,6 @@
 	config_entry_value = 64
 	min_val = 0
 
-/datum/config_entry/number/maxfine
-	config_entry_value = 1000
-	min_val = 0
-
 /datum/config_entry/flag/dynamic_config_enabled
 
 /datum/config_entry/number/respawn_timer
diff --git a/code/controllers/configuration/entries/general.dm b/code/controllers/configuration/entries/general.dm
index a59d14cce4d3..a9b83106320b 100644
--- a/code/controllers/configuration/entries/general.dm
+++ b/code/controllers/configuration/entries/general.dm
@@ -137,8 +137,6 @@
 
 /datum/config_entry/flag/no_dead_vote	// dead people can't vote
 
-/datum/config_entry/flag/allow_metadata	// Metadata is supported.
-
 /// Gives the ability to send players a maptext popup.
 /datum/config_entry/flag/popup_admin_pm
 
@@ -289,8 +287,6 @@
 
 /datum/config_entry/flag/kick_inactive	//force disconnect for inactive players
 
-/datum/config_entry/flag/load_jobs_from_txt
-
 /datum/config_entry/flag/forbid_singulo_possession
 
 /datum/config_entry/flag/automute_on	//enables automuting/spam prevention
@@ -322,8 +318,6 @@
 	min_val = 0
 	integer = FALSE
 
-/datum/config_entry/flag/maprotation
-
 /datum/config_entry/number/auto_lag_switch_pop //Number of clients at which drastic lag mitigation measures kick in
 	config_entry_value = null
 	min_val = 0
@@ -408,14 +402,6 @@
 
 /datum/config_entry/flag/announce_admin_login
 
-/datum/config_entry/flag/allow_map_voting
-	deprecated_by = /datum/config_entry/flag/preference_map_voting
-
-/datum/config_entry/flag/allow_map_voting/DeprecationUpdate(value)
-	return value
-
-/datum/config_entry/flag/preference_map_voting
-
 /datum/config_entry/number/client_warn_version
 	config_entry_value = null
 	min_val = 500
@@ -525,36 +511,10 @@
 
 /datum/config_entry/flag/auto_profile
 
-//BeginWS Edit
-/datum/config_entry/flag/minimaps_enabled
-	config_entry_value = TRUE
-//EndWS Edit
 /datum/config_entry/string/centcom_ban_db	// URL for the CentCom Galactic Ban DB API
 
 /datum/config_entry/string/centcom_source_whitelist
 
-/datum/config_entry/number/whitesands_atmos_moles
-	config_entry_value = 103
-	integer = FALSE
-	min_val = 10
-	max_val = 200
-
-/datum/config_entry/keyed_list/whitesands_atmos_mix
-	key_mode = KEY_MODE_TEXT
-	value_mode = VALUE_MODE_NUM
-	lowercase = FALSE
-	splitter = " "
-
-
-/datum/config_entry/keyed_list/whitesands_atmos_mix/ValidateListEntry(key_name, key_value)
-	var/list/gas_types = gas_types()
-	for (var/type in gas_types)
-		var/datum/gas/T = type
-		if (initial(T.id) == key_name)
-			// even a high pressure zone will be less than 1.5x one atmos
-			return key_value > 0 && key_value < 1.5
-	return FALSE
-
 // Elasticsearch stuffs
 /datum/config_entry/flag/elasticsearch_metrics_enabled
 
diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm
index 2798158eda0b..b5949ac16f97 100644
--- a/code/game/area/areas.dm
+++ b/code/game/area/areas.dm
@@ -66,9 +66,6 @@
 	///Boolean to limit the areas (subtypes included) that atoms in this area can smooth with. Used for shuttles.
 	var/area_limited_icon_smoothing = FALSE
 
-	///WS Addition - Color on minimaps, if it's null (which is default) it makes one at random.
-	var/minimap_color
-
 	var/list/power_usage
 
 	var/lighting_colour_tube = "#FFF6ED"
@@ -128,14 +125,6 @@ GLOBAL_LIST_EMPTY(teleportlocs)
  *  Adds the item to the GLOB.areas_by_type list based on area type
  */
 /area/New()
-	if(!minimap_color) // goes in New() because otherwise it doesn't fucking work
-		// generate one using the icon_state
-		if(icon_state && icon_state != "unknown")
-			var/icon/I = new(icon, icon_state, dir)
-			I.Scale(1,1)
-			minimap_color = I.GetPixel(1,1)
-		else // no icon state? use random.
-			minimap_color = rgb(rand(50,70),rand(50,70),rand(50,70))
 	// This interacts with the map loader, so it needs to be set immediately
 	// rather than waiting for atoms to initialize.
 	if (area_flags & UNIQUE_AREA)
diff --git a/code/modules/antagonists/nukeop/equipment/nuclear_challenge.dm b/code/modules/antagonists/nukeop/equipment/nuclear_challenge.dm
index 8fbb858da103..88a3b176a2f7 100644
--- a/code/modules/antagonists/nukeop/equipment/nuclear_challenge.dm
+++ b/code/modules/antagonists/nukeop/equipment/nuclear_challenge.dm
@@ -87,7 +87,6 @@
 				C.visible_message("<span class='notice'>[C] coughs up a half-digested telecrystal</span>","<span class='notice'>You cough up a half-digested telecrystal!</span>")
 				break
 
-	CONFIG_SET(number/shuttle_refuel_delay, max(CONFIG_GET(number/shuttle_refuel_delay), CHALLENGE_SHUTTLE_DELAY))
 	SSblackbox.record_feedback("amount", "nuclear_challenge_mode", 1)
 
 	qdel(src)
diff --git a/code/modules/awaymissions/zlevel.dm b/code/modules/awaymissions/zlevel.dm
index dae36500093f..0a127891b1b8 100644
--- a/code/modules/awaymissions/zlevel.dm
+++ b/code/modules/awaymissions/zlevel.dm
@@ -23,8 +23,6 @@ GLOBAL_LIST_INIT(potentialRandomZlevels, generateMapList(filename = "[global.con
 	if(!current)
 		current = new
 		current.id = id
-		if(delay)
-			current.wait = CONFIG_GET(number/gateway_delay)
 		GLOB.gateway_destinations += current
 	current.target_turfs += get_turf(src)
 
diff --git a/config/config.txt b/config/config.txt
index 7a348b2c9cc0..d81d1a7e63cc 100644
--- a/config/config.txt
+++ b/config/config.txt
@@ -6,7 +6,6 @@ $include dbconfig.txt
 $include comms.txt
 $include resources.txt
 $include interviews.txt
-$include atmos_mix.txt
 
 # You can use the @ character at the beginning of a config option to lock it from being edited in-game
 # Example usage:
@@ -156,9 +155,6 @@ LOG_CLONING
 ## log shuttle actions
 LOG_SHUTTLE
 
-## Enable the demo subsystem
-# DEMOS_ENABLED
-
 ## Log all timers on timer auto reset
 # LOG_TIMERS_ON_BUCKET_RESET
 
@@ -210,9 +206,6 @@ VOTE_AUTOTRANSFER_INTERVAL 18000
 ## disable abandon mob
 #NORESPAWN
 
-## disables calling del(src) on newmobs if they logout before spawnin in
-# DONT_DEL_NEWMOB
-
 ## set a hosted by name for unix platforms
 HOSTEDBY Yournamehere
 
@@ -300,8 +293,6 @@ CHECK_RANDOMIZER
 # INVOKE_YOUTUBEDL youtube-dl
 
 ## In-game features
-##Toggle for having jobs load up from the .txt
-# LOAD_JOBS_FROM_TXT
 
 ## Uncomment this to forbid admins from possessing the singularity.
 #FORBID_SINGULO_POSSESSION
@@ -399,7 +390,7 @@ NOTIFY_NEW_PLAYER_ACCOUNT_AGE 1
 #AGGRESSIVE_CHANGELOG
 
 ## Comment this out if you've used the mass conversion sql proc for notes or want to stop converting notes
-AUTOCONVERT_NOTES
+#AUTOCONVERT_NOTES
 
 ## Comment this out to stop admin messages sent anytime an admin disconnects from a round in play, you can edit the messages in admin.dm
 ANNOUNCE_ADMIN_LOGOUT
@@ -407,15 +398,6 @@ ANNOUNCE_ADMIN_LOGOUT
 ## Uncomment to have an admin message sent anytime an admin connects to a round in play, you can edit the messages in admin.dm
 #ANNOUNCE_ADMIN_LOGIN
 
-## Map rotation
-## You should edit maps.txt to match your configuration when you enable this.
-MAPROTATION
-
-## Map voting
-## Allows players to vote with their preffered map setting
-## When it's set to zero, the map will be randomly picked each round
-PREFERENCE_MAP_VOTING 1
-
 ## AUTOADMIN
 ## The default admin rank
 AUTOADMIN_RANK Game Master
diff --git a/config/game_options.txt b/config/game_options.txt
index 135123b845ad..ba369a6e0b04 100644
--- a/config/game_options.txt
+++ b/config/game_options.txt
@@ -93,16 +93,10 @@ PROBABILITY TRAITORBRO 2
 PROBABILITY TRAITORCHAN 3
 PROBABILITY INTERNAL_AFFAIRS 3
 PROBABILITY NUCLEAR 2
-PROBABILITY REVOLUTION 2
-PROBABILITY CULT 2
 PROBABILITY CHANGELING 2
 PROBABILITY WIZARD 4
-PROBABILITY MONKEY 1
-PROBABILITY METEOR 0
 PROBABILITY EXTENDED 1
 PROBABILITY SECRET_EXTENDED 1
-PROBABILITY DEVIL 0
-PROBABILITY DEVIL_AGENTS 0
 PROBABILITY CLOWNOPS 2
 
 ## You probably want to keep sandbox off by default for secret and random.
@@ -120,15 +114,11 @@ CONTINUOUS TRAITORBRO
 CONTINUOUS TRAITORCHAN
 CONTINUOUS INTERNAL_AFFAIRS
 #CONTINUOUS NUCLEAR
-#CONTINUOUS REVOLUTION
-CONTINUOUS CULT
 CONTINUOUS CHANGELING
 CONTINUOUS WIZARD
-#CONTINUOUS MONKEY
 
 ##Note: do not toggle continuous off for these modes, as they have no antagonists and would thus end immediately!
 
-CONTINUOUS METEOR
 CONTINUOUS EXTENDED
 CONTINUOUS SECRET_EXTENDED
 
@@ -141,11 +131,8 @@ MIDROUND_ANTAG TRAITOR
 MIDROUND_ANTAG TRAITORCHAN
 MIDROUND_ANTAG INTERNAL_AFFAIRS
 #MIDROUND_ANTAG  NUCLEAR
-#MIDROUND_ANTAG  REVOLUTION
-MIDROUND_ANTAG CULT
 MIDROUND_ANTAG CHANGELING
 MIDROUND_ANTAG WIZARD
-#MIDROUND_ANTAG  MONKEY
 
 ## Uncomment these for overrides of the minimum / maximum number of players in a round type.
 ## If you set any of these occasionally check to see if you still need them as the modes
@@ -168,39 +155,17 @@ MIDROUND_ANTAG WIZARD
 #MIN_POP NUCLEAR 0
 #MAX_POP NUCLEAR -1
 
-#MIN_POP REVOLUTION 20
-#MAX_POP REVOLUTION -1
-
-#MIN_POP CULT 24
-#MAX_POP CULT -1
-
 #MIN_POP CHANGELING 15
 #MAX_POP CHANGELING -1
 
 #MIN_POP WIZARD 20
 #MAX_POP WIZARD -1
 
-#MIN_POP MONKEY 20
-#MAX_POP MONKEY -1
-
-#MIN_POP METEOR 0
-#MAX_POP METEOR -1
-
-#MIN_POP DEVIL 0
-#MAX_POP DEVIL -1
-
-#MIN_POP DEVIL_AGENTS 25
-#MAX_POP DEVIL_AGENTS -1
-
 ## Setting at least one mode to be playable at 0/1 players is required.
 #MIN_POP EXTENDED 0
 #MAX_POP EXTENDED -1
 
 
-
-## The amount of time it takes for the emergency shuttle to be called, from round start.
-SHUTTLE_REFUEL_DELAY 12000
-
 ## Variables calculate how number of antagonists will scale to population.
 ## Used as (Antagonists = Population / Coeff)
 ## Set to 0 to disable scaling and use default numbers instead.
@@ -272,19 +237,6 @@ ALLOW_AI_MULTICAM
 ## Uncomment to prevent the peacekeeper cyborg module from being chosen
 #DISABLE_PEACEBORG
 
-## AWAY MISSIONS ###
-
-## Uncomment to load the virtual reality hub map
-#VIRTUAL_REALITY
-
-## Uncomment to load one of the missions from awaymissionconfig.txt at roundstart.
-#ROUNDSTART_AWAY
-
-## How long the delay is before the Away Mission gate opens. Default is half an hour.
-## 600 is one minute.
-GATEWAY_DELAY 18000
-
-
 ## ACCESS ###
 
 ## If the number of players ready at round starts exceeds this threshold, JOBS_HAVE_MINIMAL_ACCESS will automatically be enabled. Otherwise, it will be disabled.
@@ -465,9 +417,6 @@ ROUNDSTART_RACES jelly
 ## The amount of loadout items players are allowed to spawn with. Default 10
 MAX_LOADOUT_ITEMS 10
 
-##Overflow job. Default is assistant
-OVERFLOW_JOB Assistant
-
 ## Overflow slot cap. Set to -1 for unlimited. If limited, it will still open up if every other job is full.
 OVERFLOW_CAP -1
 
@@ -510,17 +459,6 @@ BOMBCAP 20
 ## LagHell (7, 14, 28)
 #BOMBCAP 28
 
-
-## Lavaland "Budget"
-## Lavaland ruin spawning has an imaginary budget to spend on ruins, where
-## a less lootfilled or smaller or less round effecting ruin costs less to
-## spawn, while the converse is true. Alter this number to affect the amount
-## of ruins.
-LAVALAND_BUDGET 60
-
-## Space Ruin Budged
-Space_Budget 16
-
 ## How many wirechewing rodents you want to spawn on exposed maintenane wires at the start of the round. You may wish to set this to 0 if you're testing powernets.
 
 MICE_ROUNDSTART 10
@@ -529,12 +467,6 @@ MICE_ROUNDSTART 10
 
 SMUGGLER_SATCHELS 3
 
-## If the percentage of players alive (doesn't count conversions) drops below this threshold the emergency shuttle will be forcefully called (provided it can be)
-#EMERGENCY_SHUTTLE_AUTOCALL_THRESHOLD 0.2
-
-## Determines if players are allowed to print integrated circuits, uncomment to allow.
-#IC_PRINTING
-
 ## Uncomment to allow roundstart quirk selection in the character setup menu.
 ## This used to be named traits, hence the config name, but it handles quirks, not the other kind of trait!
 ROUNDSTART_TRAITS
@@ -542,9 +474,6 @@ ROUNDSTART_TRAITS
 ## Uncomment to disable human moods.
 #DISABLE_HUMAN_MOOD
 
-## Enable night shifts ##
-#ENABLE_NIGHT_SHIFTS
-
 ## Enable randomized shift start times##
 #RANDOMIZE_SHIFT_TIME
 
@@ -557,9 +486,6 @@ MONKEYCAP 64
 ## A cap on how many mice can be bred via cheese wedges
 RATCAP 64
 
-## Maximum fine for a citation
-MAXFINE 2000
-
 ## Enable the capitalist agenda on your server.
 ECONOMY
 

From 9881da770c41d9f44dbc80c812f044fad42582ba Mon Sep 17 00:00:00 2001
From: Changelogs <action@github.com>
Date: Fri, 8 Nov 2024 20:12:02 -0600
Subject: [PATCH 12/29] Automatic changelog generation for PR #3705 [ci skip]

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

diff --git a/html/changelogs/AutoChangeLog-pr-3705.yml b/html/changelogs/AutoChangeLog-pr-3705.yml
new file mode 100644
index 000000000000..9c033c451ca8
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-3705.yml
@@ -0,0 +1,4 @@
+author: MarkSuckerberg
+changes:
+  - {config: 'Removes a lot of old, unused config options'}
+delete-after: true

From e26264c95f39fead7e015b2ee93d0ba53db531c4 Mon Sep 17 00:00:00 2001
From: meem <75212565+meemofcourse@users.noreply.github.com>
Date: Fri, 8 Nov 2024 23:00:03 -0300
Subject: [PATCH 13/29] tiny fax related fixes (#3715)

<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request
* Adds a NT fax machine to the Delta-class
* Replaces PGF vessels' fax machines with correct subtypes
* Replaces the Lavaland listening post's and Sandplanet distillery's
faxes with correct subtypes
* Fax requests now make a sound alert
* Fax machines are now, by default, offset by 6 pixels

<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Why It's Good For The Game
consistency good. also we probably should stop missing faxes

<!-- 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. -->

## Changelog

:cl:
add: The Delta-class now has a fax machine
add: Fax machines are now offset by 6 pixels
fix: Fixed some faxes' subtypes
admin: Fax requests now make a noise
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
---
 .../lavaland_abandonedlisteningpost.dmm       |  30 ++--
 .../RockRuins/rockplanet_distillery.dmm       |  34 ++--
 .../shuttles/nanotrasen/nanotrasen_delta.dmm  |  45 ++----
 _maps/shuttles/nanotrasen/nanotrasen_meta.dmm |  31 +---
 _maps/shuttles/pgf/pgf_elated_bolide.dmm      | 145 +++++-------------
 _maps/shuttles/pgf/pgf_woeful_cthonian.dmm    |  32 ++--
 code/modules/paperwork/fax.dm                 |   1 +
 code/modules/requests/requests_manager.dm     |   3 +
 sound/misc/mail.ogg                           | Bin 0 -> 8412 bytes
 9 files changed, 95 insertions(+), 226 deletions(-)
 create mode 100644 sound/misc/mail.ogg

diff --git a/_maps/RandomRuins/LavaRuins/lavaland_abandonedlisteningpost.dmm b/_maps/RandomRuins/LavaRuins/lavaland_abandonedlisteningpost.dmm
index dd98807a4958..6341438965e4 100644
--- a/_maps/RandomRuins/LavaRuins/lavaland_abandonedlisteningpost.dmm
+++ b/_maps/RandomRuins/LavaRuins/lavaland_abandonedlisteningpost.dmm
@@ -186,9 +186,7 @@
 "dJ" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/turf_decal/siding/wood{
-	dir = 2
-	},
+/obj/effect/turf_decal/siding/wood,
 /turf/open/floor/carpet/nanoweave/red,
 /area/ruin/unpowered/listening_post/commons)
 "dM" = (
@@ -298,9 +296,7 @@
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 2
-	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/effect/turf_decal/siding/thinplating/dark{
 	dir = 1
@@ -464,9 +460,7 @@
 /turf/open/floor/carpet/nanoweave/red,
 /area/ruin/unpowered/listening_post/commons)
 "hA" = (
-/obj/structure/cable{
-	icon_state = "0-1"
-	},
+/obj/structure/cable,
 /obj/machinery/power/terminal{
 	dir = 1
 	},
@@ -727,12 +721,12 @@
 /area/ruin/unpowered/listening_post/operations)
 "na" = (
 /obj/structure/table/reinforced,
-/obj/machinery/fax{
-	pixel_y = 7
-	},
 /obj/effect/turf_decal/siding/thinplating/dark{
 	dir = 1
 	},
+/obj/machinery/fax/ruin{
+	pixel_y = 6
+	},
 /turf/open/floor/plasteel/dark,
 /area/ruin/unpowered/listening_post/operations)
 "nc" = (
@@ -1763,9 +1757,7 @@
 /turf/open/floor/plasteel/dark,
 /area/ruin/unpowered/listening_post/operations)
 "FW" = (
-/obj/structure/cable{
-	icon_state = "0-1"
-	},
+/obj/structure/cable,
 /obj/machinery/power/smes/engineering,
 /turf/open/floor/plating,
 /area/ruin/unpowered/listening_post/engineering)
@@ -2199,9 +2191,7 @@
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 2
-	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/effect/turf_decal/siding/thinplating/dark{
 	dir = 8
@@ -2471,9 +2461,7 @@
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 2
-	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/plasteel/dark,
diff --git a/_maps/RandomRuins/RockRuins/rockplanet_distillery.dmm b/_maps/RandomRuins/RockRuins/rockplanet_distillery.dmm
index 441df85eb4b6..67eb3e648365 100644
--- a/_maps/RandomRuins/RockRuins/rockplanet_distillery.dmm
+++ b/_maps/RandomRuins/RockRuins/rockplanet_distillery.dmm
@@ -766,9 +766,7 @@
 /turf/open/floor/wood,
 /area/ruin/rockplanet/distillery/office)
 "ir" = (
-/obj/structure/cable/yellow{
-	icon_state = "0-1"
-	},
+/obj/structure/cable/yellow,
 /obj/machinery/porta_turret/ship/weak,
 /turf/open/floor/plating/asteroid/rockplanet/cracked/lit,
 /area/ruin/rockplanet/distillery/office)
@@ -798,9 +796,7 @@
 /obj/structure/window/reinforced{
 	dir = 8
 	},
-/obj/machinery/power/smes/shuttle/micro/precharged{
-	dir = 4
-	},
+/obj/machinery/power/smes/shuttle/micro/precharged,
 /obj/machinery/door/poddoor/shutters/preopen{
 	id = "pod_window"
 	},
@@ -1125,9 +1121,7 @@
 /turf/open/floor/pod/rockplanet,
 /area/ruin/rockplanet/distillery/shuttle)
 "mK" = (
-/turf/open/floor/plasteel/stairs/wood{
-	color = "#5B3E1D"
-	},
+/turf/open/floor/plasteel/stairs/wood,
 /area/ruin/rockplanet/distillery/saloon)
 "mX" = (
 /obj/effect/turf_decal/siding/wood{
@@ -2416,9 +2410,7 @@
 /obj/effect/turf_decal/spline/fancy/opaque/white{
 	dir = 9
 	},
-/obj/effect/turf_decal/trimline/opaque/neutral/filled/corner{
-	dir = 2
-	},
+/obj/effect/turf_decal/trimline/opaque/neutral/filled/corner,
 /turf/open/floor/plasteel/patterned/rockplanet/lit,
 /area/overmap_encounter/planetoid/rockplanet/explored)
 "Bn" = (
@@ -2595,7 +2587,7 @@
 /turf/open/floor/plasteel/patterned/brushed/rockplanet,
 /area/ruin/rockplanet/distillery)
 "CW" = (
-/obj/machinery/fax/admin/frontiersmen,
+/obj/machinery/fax/ruin,
 /obj/structure/table/wood/reinforced,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
 	dir = 5
@@ -2631,9 +2623,7 @@
 /turf/open/floor/pod,
 /area/ruin/rockplanet/distillery/crew)
 "DX" = (
-/obj/structure/cable{
-	icon_state = "0-1"
-	},
+/obj/structure/cable,
 /obj/structure/cable/yellow{
 	icon_state = "1-10"
 	},
@@ -3581,9 +3571,7 @@
 	},
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/machinery/power/apc/auto_name/directional/east,
-/obj/structure/cable/yellow{
-	icon_state = "0-1"
-	},
+/obj/structure/cable/yellow,
 /obj/machinery/light/small/directional/south,
 /turf/open/floor/pod/rockplanet,
 /area/ruin/rockplanet/distillery)
@@ -3657,9 +3645,7 @@
 /turf/open/floor/plasteel/patterned/brushed,
 /area/ruin/rockplanet/distillery/engineering)
 "PI" = (
-/obj/machinery/power/shuttle/engine/electric{
-	dir = 4
-	},
+/obj/machinery/power/shuttle/engine/electric,
 /obj/structure/cable/yellow{
 	icon_state = "0-4"
 	},
@@ -4544,9 +4530,7 @@
 /obj/structure/window/reinforced{
 	dir = 1
 	},
-/obj/machinery/power/smes/shuttle/micro/precharged{
-	dir = 4
-	},
+/obj/machinery/power/smes/shuttle/micro/precharged,
 /obj/machinery/door/poddoor/shutters/preopen{
 	id = "pod_window"
 	},
diff --git a/_maps/shuttles/nanotrasen/nanotrasen_delta.dmm b/_maps/shuttles/nanotrasen/nanotrasen_delta.dmm
index 8e05518ed21e..a1272cb575b4 100644
--- a/_maps/shuttles/nanotrasen/nanotrasen_delta.dmm
+++ b/_maps/shuttles/nanotrasen/nanotrasen_delta.dmm
@@ -983,9 +983,7 @@
 	dir = 8
 	},
 /obj/machinery/power/ship_gravity,
-/obj/structure/cable{
-	icon_state = "0-1"
-	},
+/obj/structure/cable,
 /turf/open/floor/plating,
 /area/ship/engineering)
 "dE" = (
@@ -1039,13 +1037,18 @@
 /area/ship/crew)
 "dI" = (
 /obj/structure/table,
+/obj/item/spacecash/bundle/c1000{
+	pixel_x = -5;
+	pixel_y = 9
+	},
+/obj/item/spacecash/bundle/c1000,
 /obj/item/paper_bin{
 	pixel_x = 5;
 	pixel_y = 4
 	},
 /obj/item/folder/yellow{
 	pixel_x = 5;
-	pixel_y = 5
+	pixel_y = 7
 	},
 /obj/item/pen/fountain/captain,
 /obj/effect/turf_decal/corner/opaque/nsorange,
@@ -1123,9 +1126,7 @@
 /turf/closed/wall/mineral/titanium/nodiagonal,
 /area/ship/science/robotics)
 "em" = (
-/obj/machinery/power/shuttle/engine/fueled/plasma{
-	dir = 4
-	},
+/obj/machinery/power/shuttle/engine/fueled/plasma,
 /turf/open/floor/plating/airless,
 /area/ship/engineering)
 "ev" = (
@@ -1851,9 +1852,7 @@
 	dir = 4;
 	name = "Engine Access"
 	},
-/obj/machinery/atmospherics/components/unary/shuttle/heater{
-	dir = 4
-	},
+/obj/machinery/atmospherics/components/unary/shuttle/heater,
 /obj/machinery/door/poddoor{
 	dir = 4;
 	id = "whiteship_windows"
@@ -2068,12 +2067,12 @@
 	},
 /obj/structure/table,
 /obj/machinery/recharger,
-/obj/item/spacecash/bundle/c1000,
-/obj/item/spacecash/bundle/c1000,
-/obj/item/areaeditor/shuttle,
 /obj/machinery/turretid/ship{
 	pixel_y = -24
 	},
+/obj/machinery/fax/nanotrasen{
+	pixel_y = 6
+	},
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
 "Aw" = (
@@ -2159,9 +2158,7 @@
 /turf/open/floor/plating,
 /area/ship/hallway/central)
 "Bw" = (
-/obj/machinery/power/shuttle/engine/electric{
-	dir = 4
-	},
+/obj/machinery/power/shuttle/engine/electric,
 /obj/structure/cable{
 	icon_state = "0-4"
 	},
@@ -2388,9 +2385,7 @@
 	dir = 4;
 	name = "Engine Access"
 	},
-/obj/machinery/power/smes/shuttle/precharged{
-	dir = 4
-	},
+/obj/machinery/power/smes/shuttle/precharged,
 /obj/structure/cable{
 	icon_state = "0-8"
 	},
@@ -2676,9 +2671,7 @@
 	dir = 4;
 	name = "Engine Access"
 	},
-/obj/machinery/power/smes/shuttle/precharged{
-	dir = 4
-	},
+/obj/machinery/power/smes/shuttle/precharged,
 /obj/structure/cable{
 	icon_state = "0-8"
 	},
@@ -2839,9 +2832,7 @@
 /turf/open/floor/plasteel/tech,
 /area/ship/science/robotics)
 "TO" = (
-/obj/machinery/power/shuttle/engine/electric{
-	dir = 4
-	},
+/obj/machinery/power/shuttle/engine/electric,
 /obj/structure/cable{
 	icon_state = "0-4"
 	},
@@ -2979,9 +2970,7 @@
 	dir = 4;
 	name = "Engine Access"
 	},
-/obj/machinery/atmospherics/components/unary/shuttle/heater{
-	dir = 4
-	},
+/obj/machinery/atmospherics/components/unary/shuttle/heater,
 /obj/machinery/door/poddoor{
 	dir = 4;
 	id = "whiteship_windows"
diff --git a/_maps/shuttles/nanotrasen/nanotrasen_meta.dmm b/_maps/shuttles/nanotrasen/nanotrasen_meta.dmm
index 81d596c4c484..b3f02ffdec42 100644
--- a/_maps/shuttles/nanotrasen/nanotrasen_meta.dmm
+++ b/_maps/shuttles/nanotrasen/nanotrasen_meta.dmm
@@ -156,9 +156,7 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/crew/canteen)
 "ax" = (
-/obj/machinery/power/shuttle/engine/electric{
-	dir = 4
-	},
+/obj/machinery/power/shuttle/engine/electric,
 /obj/structure/cable{
 	icon_state = "0-4"
 	},
@@ -274,15 +272,11 @@
 /turf/open/floor/plasteel,
 /area/ship/crew/canteen)
 "aL" = (
-/obj/machinery/power/shuttle/engine/fueled/plasma{
-	dir = 4
-	},
+/obj/machinery/power/shuttle/engine/fueled/plasma,
 /turf/open/floor/plating,
 /area/ship/engineering)
 "aM" = (
-/obj/machinery/atmospherics/components/unary/shuttle/heater{
-	dir = 4
-	},
+/obj/machinery/atmospherics/components/unary/shuttle/heater,
 /obj/structure/window/reinforced{
 	dir = 8
 	},
@@ -631,9 +625,11 @@
 /area/ship/crew/canteen)
 "ce" = (
 /obj/structure/table,
-/obj/machinery/fax,
 /obj/machinery/light/small/directional/west,
 /obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/fax/nanotrasen{
+	pixel_y = 6
+	},
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
 "cf" = (
@@ -1528,9 +1524,7 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
 "fb" = (
-/obj/machinery/power/smes/shuttle/precharged{
-	dir = 4
-	},
+/obj/machinery/power/smes/shuttle/precharged,
 /obj/structure/window/reinforced{
 	dir = 8
 	},
@@ -1683,7 +1677,6 @@
 "jo" = (
 /obj/machinery/porta_turret/ship/nt/light{
 	id = "meta_grid";
-	pixel_y = 0;
 	dir = 4
 	},
 /turf/closed/wall/mineral/titanium,
@@ -1793,9 +1786,7 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/crew/canteen)
 "lC" = (
-/obj/machinery/power/smes/shuttle/precharged{
-	dir = 4
-	},
+/obj/machinery/power/smes/shuttle/precharged,
 /obj/structure/window/reinforced{
 	dir = 8
 	},
@@ -2210,7 +2201,6 @@
 "uT" = (
 /obj/machinery/porta_turret/ship/nt/light{
 	id = "meta_grid";
-	pixel_y = 0;
 	dir = 4
 	},
 /turf/closed/wall/mineral/titanium,
@@ -2404,7 +2394,6 @@
 "yF" = (
 /obj/machinery/porta_turret/ship/nt/light{
 	id = "meta_grid";
-	pixel_y = 0;
 	dir = 5
 	},
 /turf/closed/wall/mineral/titanium,
@@ -3087,7 +3076,6 @@
 "Lo" = (
 /obj/machinery/porta_turret/ship/nt/light{
 	id = "meta_grid";
-	pixel_y = 0;
 	dir = 6
 	},
 /turf/closed/wall/mineral/titanium,
@@ -3267,7 +3255,6 @@
 	dir = 4
 	},
 /obj/docking_port/mobile{
-	can_move_docking_ports = 1;
 	name = "Salvage Ship";
 	port_direction = 2;
 	preferred_direction = 4;
@@ -3489,7 +3476,6 @@
 "TR" = (
 /obj/machinery/porta_turret/ship/nt/light{
 	id = "meta_grid";
-	pixel_y = 0;
 	dir = 10
 	},
 /turf/closed/wall/mineral/titanium,
@@ -3497,7 +3483,6 @@
 "TV" = (
 /obj/machinery/porta_turret/ship/nt/light{
 	id = "meta_grid";
-	pixel_y = 0;
 	dir = 9
 	},
 /turf/closed/wall/mineral/titanium,
diff --git a/_maps/shuttles/pgf/pgf_elated_bolide.dmm b/_maps/shuttles/pgf/pgf_elated_bolide.dmm
index c1d91bde84d7..f2b921d8fea3 100644
--- a/_maps/shuttles/pgf/pgf_elated_bolide.dmm
+++ b/_maps/shuttles/pgf/pgf_elated_bolide.dmm
@@ -620,7 +620,6 @@
 "eI" = (
 /obj/structure/grille,
 /obj/docking_port/mobile{
-	can_move_docking_ports = 1;
 	name = "bolide docking port";
 	port_direction = 4;
 	preferred_direction = 4
@@ -734,9 +733,7 @@
 /obj/effect/turf_decal/steeldecal/steel_decals_central7{
 	dir = 8
 	},
-/obj/structure/cable{
-	icon_state = "0-1"
-	},
+/obj/structure/cable,
 /obj/machinery/light_switch{
 	dir = 1;
 	pixel_x = 11;
@@ -767,9 +764,7 @@
 /turf/closed/wall/mineral/titanium/nodiagonal,
 /area/ship/crew/dorm/captain)
 "fG" = (
-/obj/machinery/power/shuttle/engine/fire{
-	dir = 4
-	},
+/obj/machinery/power/shuttle/engine/fire,
 /obj/effect/turf_decal/techfloor/orange{
 	dir = 4
 	},
@@ -855,9 +850,7 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/security)
 "gf" = (
-/obj/machinery/power/shuttle/engine/fire{
-	dir = 4
-	},
+/obj/machinery/power/shuttle/engine/fire,
 /obj/structure/sign/warning{
 	pixel_x = -10;
 	pixel_y = 23
@@ -894,7 +887,6 @@
 	dir = 6
 	},
 /obj/machinery/button/door{
-	dir = 2;
 	pixel_y = 21;
 	pixel_x = -12;
 	id = "bolide_engine_3";
@@ -956,9 +948,7 @@
 /turf/open/floor/plasteel/tech,
 /area/ship/crew/dorm/captain)
 "gP" = (
-/obj/machinery/power/shuttle/engine/fire{
-	dir = 4
-	},
+/obj/machinery/power/shuttle/engine/fire,
 /obj/structure/sign/warning{
 	pixel_x = -10;
 	pixel_y = -21
@@ -1189,8 +1179,7 @@
 	pixel_y = 4
 	},
 /obj/item/desk_flag/gezena{
-	pixel_x = -12;
-	pixel_y = 0
+	pixel_x = -12
 	},
 /obj/machinery/light/small/directional/west,
 /turf/open/floor/plasteel/telecomms_floor,
@@ -1320,9 +1309,7 @@
 /turf/open/floor/plasteel/mono,
 /area/ship/crew/dorm)
 "iO" = (
-/obj/machinery/power/smes/shuttle/precharged{
-	dir = 4
-	},
+/obj/machinery/power/smes/shuttle/precharged,
 /obj/machinery/door/poddoor/shutters{
 	id = "bolide_engine_1";
 	dir = 4
@@ -1482,16 +1469,13 @@
 	pixel_x = -7
 	},
 /obj/item/clothing/shoes/combat/gezena{
-	pixel_x = 3;
-	pixel_y = 0
+	pixel_x = 3
 	},
 /obj/item/clothing/shoes/combat/gezena{
-	pixel_x = 3;
-	pixel_y = 0
+	pixel_x = 3
 	},
 /obj/item/clothing/shoes/combat/gezena{
-	pixel_x = 3;
-	pixel_y = 0
+	pixel_x = 3
 	},
 /turf/open/floor/vault,
 /area/ship/security/armory)
@@ -1635,8 +1619,7 @@
 /area/ship/security/armory)
 "jB" = (
 /obj/structure/sink{
-	pixel_y = 18;
-	dir = 2
+	pixel_y = 18
 	},
 /obj/machinery/light/directional/north,
 /turf/open/floor/mineral/titanium/tiled,
@@ -1743,7 +1726,6 @@
 /obj/effect/turf_decal/box,
 /obj/machinery/light/floor,
 /obj/machinery/porta_turret/ship/pgf/heavy{
-	dir = 2;
 	id = "bolide_grid"
 	},
 /obj/effect/decal/cleanable/dirt,
@@ -1766,9 +1748,7 @@
 "kg" = (
 /obj/structure/grille,
 /obj/structure/window/reinforced/fulltile,
-/obj/structure/cable{
-	icon_state = "0-1"
-	},
+/obj/structure/cable,
 /obj/structure/cable{
 	icon_state = "0-2"
 	},
@@ -1806,8 +1786,7 @@
 	icon_state = "0-4"
 	},
 /obj/machinery/door/poddoor/shutters{
-	id = "bolide_win_bridge";
-	dir = 2
+	id = "bolide_win_bridge"
 	},
 /obj/machinery/door/firedoor/window,
 /turf/open/floor/engine/hull/interior,
@@ -2125,7 +2104,6 @@
 /obj/effect/turf_decal/steeldecal/steel_decals_central4,
 /obj/machinery/button/door{
 	name = "privacy lock";
-	dir = 2;
 	pixel_y = 22;
 	pixel_x = 10;
 	id = "bol_priv2";
@@ -2199,12 +2177,12 @@
 	pixel_y = 6
 	},
 /obj/item/clipboard{
-	pixel_x = -6;
-	pixel_y = -10
+	pixel_x = -7;
+	pixel_y = -5
 	},
 /obj/item/folder/pgf/blue/bolide{
-	pixel_x = -8;
-	pixel_y = 3
+	pixel_x = -9;
+	pixel_y = 5
 	},
 /obj/machinery/light/directional/east,
 /obj/effect/turf_decal/borderfloorblack{
@@ -2403,7 +2381,6 @@
 /area/ship/bridge)
 "ol" = (
 /obj/machinery/shower{
-	pixel_y = 0;
 	dir = 1
 	},
 /obj/effect/turf_decal/borderfloor{
@@ -2448,8 +2425,7 @@
 	},
 /obj/structure/cable,
 /obj/machinery/door/poddoor/shutters{
-	id = "bolide_win_bridge";
-	dir = 2
+	id = "bolide_win_bridge"
 	},
 /obj/machinery/door/firedoor/window,
 /turf/open/floor/engine/hull/interior,
@@ -2515,14 +2491,11 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /turf/open/floor/plasteel/stairs{
-	icon = 'icons/obj/stairs.dmi';
-	dir = 2
+	icon = 'icons/obj/stairs.dmi'
 	},
 /area/ship/cargo)
 "pl" = (
-/obj/machinery/atmospherics/components/unary/shuttle/fire_heater{
-	dir = 4
-	},
+/obj/machinery/atmospherics/components/unary/shuttle/fire_heater,
 /obj/machinery/door/poddoor/shutters{
 	id = "bolide_engine_3";
 	dir = 4
@@ -2563,8 +2536,7 @@
 /obj/structure/window/reinforced/fulltile,
 /obj/structure/cable,
 /obj/machinery/door/poddoor/shutters{
-	id = "bolide_win_bridge";
-	dir = 2
+	id = "bolide_win_bridge"
 	},
 /obj/machinery/door/firedoor/window,
 /turf/open/floor/engine/hull/interior,
@@ -2721,9 +2693,7 @@
 /turf/open/floor/plasteel/sepia,
 /area/ship/crew/dorm)
 "qW" = (
-/obj/machinery/power/shuttle/engine/electric{
-	dir = 4
-	},
+/obj/machinery/power/shuttle/engine/electric,
 /obj/structure/cable/yellow{
 	icon_state = "0-4"
 	},
@@ -2797,9 +2767,7 @@
 /turf/open/floor/plasteel/patterned,
 /area/ship/cargo)
 "rB" = (
-/obj/machinery/power/shuttle/engine/fire{
-	dir = 4
-	},
+/obj/machinery/power/shuttle/engine/fire,
 /obj/structure/sign/warning{
 	pixel_x = -10;
 	pixel_y = -21
@@ -3068,8 +3036,7 @@
 	icon_state = "0-8"
 	},
 /obj/machinery/door/poddoor/shutters{
-	id = "bolide_win_bridge";
-	dir = 2
+	id = "bolide_win_bridge"
 	},
 /obj/machinery/door/firedoor/window,
 /turf/open/floor/engine/hull/interior,
@@ -3119,7 +3086,6 @@
 	},
 /obj/machinery/button/door{
 	name = "privacy lock";
-	dir = 2;
 	pixel_y = 22;
 	pixel_x = -10;
 	id = "bol_priv3";
@@ -3254,9 +3220,7 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/crew/office)
 "uq" = (
-/obj/machinery/power/shuttle/engine/fire{
-	dir = 4
-	},
+/obj/machinery/power/shuttle/engine/fire,
 /obj/effect/turf_decal/techfloor/orange{
 	dir = 4
 	},
@@ -3557,15 +3521,13 @@
 /area/ship/medical)
 "wx" = (
 /obj/structure/table/reinforced,
-/obj/machinery/fax{
-	pixel_y = 0
-	},
 /obj/machinery/camera/autoname{
 	dir = 10
 	},
 /obj/effect/turf_decal/borderfloorblack/corner{
 	dir = 1
 	},
+/obj/machinery/fax/indie,
 /turf/open/floor/plasteel/telecomms_floor,
 /area/ship/crew/office)
 "wy" = (
@@ -3619,9 +3581,7 @@
 /turf/open/floor/plasteel/tech,
 /area/ship/security)
 "xe" = (
-/obj/machinery/atmospherics/components/unary/shuttle/fire_heater{
-	dir = 4
-	},
+/obj/machinery/atmospherics/components/unary/shuttle/fire_heater,
 /obj/machinery/door/poddoor/shutters{
 	id = "bolide_engine_2";
 	dir = 4
@@ -4129,7 +4089,6 @@
 /obj/effect/turf_decal/techfloor/orange,
 /obj/machinery/light_switch{
 	pixel_x = -12;
-	dir = 2;
 	pixel_y = 21
 	},
 /turf/open/floor/plasteel/tech,
@@ -4187,16 +4146,13 @@
 	pixel_y = 9
 	},
 /obj/item/clothing/shoes/combat/gezena{
-	pixel_x = 3;
-	pixel_y = 0
+	pixel_x = 3
 	},
 /obj/item/clothing/shoes/combat/gezena{
-	pixel_x = 3;
-	pixel_y = 0
+	pixel_x = 3
 	},
 /obj/item/clothing/shoes/combat/gezena{
-	pixel_x = 3;
-	pixel_y = 0
+	pixel_x = 3
 	},
 /obj/item/storage/backpack/security{
 	pixel_y = -6
@@ -5655,7 +5611,6 @@
 /area/ship/crew/dorm)
 "Je" = (
 /obj/machinery/shower{
-	pixel_y = 0;
 	dir = 1
 	},
 /obj/effect/turf_decal/borderfloor/corner{
@@ -6029,9 +5984,7 @@
 "Lh" = (
 /obj/structure/grille,
 /obj/structure/window/reinforced/fulltile,
-/obj/structure/cable{
-	icon_state = "0-1"
-	},
+/obj/structure/cable,
 /obj/structure/cable{
 	icon_state = "0-8"
 	},
@@ -6152,9 +6105,7 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/crew/cryo)
 "LG" = (
-/obj/machinery/power/shuttle/engine/fire{
-	dir = 4
-	},
+/obj/machinery/power/shuttle/engine/fire,
 /obj/structure/sign/warning{
 	pixel_x = -10;
 	pixel_y = 23
@@ -6177,8 +6128,7 @@
 	icon_state = "0-8"
 	},
 /obj/machinery/door/poddoor/shutters{
-	id = "bolide_win_bridge";
-	dir = 2
+	id = "bolide_win_bridge"
 	},
 /obj/machinery/door/firedoor/window,
 /turf/open/floor/engine/hull/interior,
@@ -6538,7 +6488,6 @@
 	pixel_y = 5
 	},
 /obj/item/storage/box/syringes{
-	pixel_y = 0;
 	pixel_x = -6
 	},
 /obj/machinery/light/small/directional/east,
@@ -6634,8 +6583,7 @@
 /area/ship/crew/ccommons)
 "PD" = (
 /turf/open/floor/plasteel/stairs{
-	icon = 'icons/obj/stairs.dmi';
-	dir = 2
+	icon = 'icons/obj/stairs.dmi'
 	},
 /area/ship/cargo)
 "PI" = (
@@ -6828,7 +6776,6 @@
 /obj/effect/turf_decal/techfloor/orange,
 /obj/machinery/door/firedoor/border_only,
 /obj/machinery/door/airlock/security{
-	dir = 2;
 	name = "Armory";
 	req_one_access_txt = "1"
 	},
@@ -7125,9 +7072,7 @@
 /obj/structure/cable{
 	icon_state = "0-4"
 	},
-/obj/structure/cable{
-	icon_state = "0-1"
-	},
+/obj/structure/cable,
 /obj/structure/cable{
 	icon_state = "0-2"
 	},
@@ -7235,9 +7180,7 @@
 /turf/open/floor/engine/hull/interior,
 /area/ship/hallway/fore)
 "Tn" = (
-/obj/machinery/atmospherics/components/binary/dp_vent_pump/on/layer2{
-	dir = 2
-	},
+/obj/machinery/atmospherics/components/binary/dp_vent_pump/on/layer2,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /obj/effect/turf_decal/industrial/warning,
 /obj/effect/turf_decal/industrial/warning{
@@ -7247,7 +7190,6 @@
 /area/ship/storage/starboard)
 "To" = (
 /obj/machinery/light_switch{
-	dir = 2;
 	pixel_x = -11;
 	pixel_y = 20
 	},
@@ -7352,8 +7294,7 @@
 	dir = 8
 	},
 /obj/item/kirbyplants{
-	icon_state = "plant-21";
-	pixel_y = 0
+	icon_state = "plant-21"
 	},
 /obj/machinery/newscaster/directional/south,
 /turf/open/floor/plasteel/sepia,
@@ -7620,7 +7561,6 @@
 /obj/item/storage/ration/crayons,
 /obj/structure/table/reinforced,
 /obj/machinery/door/airlock/security{
-	dir = 2;
 	name = "Engineering Storage";
 	req_one_access_txt = "1"
 	},
@@ -7823,8 +7763,7 @@
 /area/ship/engineering)
 "Ws" = (
 /turf/open/floor/plasteel/stairs{
-	icon = 'icons/obj/stairs.dmi';
-	dir = 2
+	icon = 'icons/obj/stairs.dmi'
 	},
 /area/ship/engineering)
 "Wy" = (
@@ -7869,9 +7808,7 @@
 "WN" = (
 /obj/structure/grille,
 /obj/structure/window/reinforced/fulltile,
-/obj/structure/cable{
-	icon_state = "0-1"
-	},
+/obj/structure/cable,
 /obj/machinery/door/poddoor/shutters{
 	id = "bolide_bay_win_2";
 	dir = 4
@@ -7881,9 +7818,7 @@
 "WS" = (
 /obj/structure/grille,
 /obj/structure/window/reinforced/fulltile,
-/obj/structure/cable{
-	icon_state = "0-1"
-	},
+/obj/structure/cable,
 /obj/structure/cable{
 	icon_state = "0-2"
 	},
@@ -8040,7 +7975,6 @@
 /area/ship/engineering/engines/port)
 "Yg" = (
 /obj/machinery/shower{
-	pixel_y = 0;
 	dir = 1
 	},
 /obj/effect/turf_decal/borderfloor/corner{
@@ -8287,7 +8221,6 @@
 	pixel_y = -9
 	},
 /obj/machinery/button/door{
-	dir = 2;
 	pixel_y = 21;
 	pixel_x = -12;
 	id = "bolide_engine_1";
diff --git a/_maps/shuttles/pgf/pgf_woeful_cthonian.dmm b/_maps/shuttles/pgf/pgf_woeful_cthonian.dmm
index 643eafafeaf9..a04c729df8ef 100644
--- a/_maps/shuttles/pgf/pgf_woeful_cthonian.dmm
+++ b/_maps/shuttles/pgf/pgf_woeful_cthonian.dmm
@@ -221,8 +221,7 @@
 	dir = 8
 	},
 /obj/structure/chair{
-	dir = 4;
-	pixel_y = 0
+	dir = 4
 	},
 /obj/effect/turf_decal/corner_steel_grid{
 	dir = 9
@@ -959,7 +958,6 @@
 	dir = 6
 	},
 /obj/structure/closet/crate/bin{
-	pixel_y = 0;
 	pixel_x = 4
 	},
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
@@ -1033,7 +1031,6 @@
 /area/ship/crew/ccommons)
 "lP" = (
 /obj/machinery/turretid/ship{
-	pixel_y = 0;
 	pixel_x = 26
 	},
 /obj/machinery/computer/cargo{
@@ -1043,7 +1040,6 @@
 	dir = 4
 	},
 /obj/machinery/button/door{
-	dir = 2;
 	pixel_y = 22;
 	pixel_x = -8;
 	id = "cth_bridge";
@@ -1122,7 +1118,6 @@
 	},
 /obj/structure/chair{
 	dir = 4;
-	pixel_y = 0;
 	pixel_x = 7
 	},
 /obj/machinery/newscaster/directional/west,
@@ -1374,7 +1369,6 @@
 	pixel_y = 4
 	},
 /obj/item/desk_flag/gezena{
-	pixel_y = 0;
 	pixel_x = 8
 	},
 /obj/structure/platform/ship_two{
@@ -1476,14 +1470,8 @@
 /area/ship/external/dark)
 "sg" = (
 /obj/structure/table/reinforced,
-/obj/machinery/fax{
-	pixel_y = 4
-	},
+/obj/machinery/fax/pgf,
 /obj/machinery/airalarm/directional/north,
-/obj/item/folder/pgf/empty_sheets{
-	pixel_x = 4;
-	pixel_y = 4
-	},
 /turf/open/floor/plasteel/tech,
 /area/ship/bridge)
 "sm" = (
@@ -1641,6 +1629,10 @@
 	pixel_x = -11;
 	pixel_y = -4
 	},
+/obj/item/folder/pgf/empty_sheets{
+	pixel_x = -3;
+	pixel_y = -6
+	},
 /turf/open/floor/plasteel/telecomms_floor,
 /area/ship/bridge)
 "uK" = (
@@ -2036,8 +2028,7 @@
 /area/ship/engineering)
 "yx" = (
 /obj/machinery/defibrillator_mount{
-	pixel_x = -25;
-	pixel_y = 0
+	pixel_x = -25
 	},
 /obj/structure/chair/handrail{
 	dir = 4
@@ -2121,8 +2112,7 @@
 /obj/structure/window/reinforced/fulltile/shuttle,
 /obj/structure/grille,
 /obj/machinery/door/poddoor/shutters{
-	id = "cth_bridge";
-	dir = 2
+	id = "cth_bridge"
 	},
 /turf/open/floor/plating,
 /area/ship/bridge)
@@ -3065,11 +3055,9 @@
 	id = "cth_bay"
 	},
 /obj/docking_port/mobile{
-	can_move_docking_ports = 1;
 	name = "cthonian dock";
 	port_direction = 4;
-	preferred_direction = 4;
-	dir = 1
+	preferred_direction = 4
 	},
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/cargo)
@@ -3132,7 +3120,6 @@
 /obj/item/storage/backpack/satchel/flat/cthonian,
 /obj/structure/platform/corner,
 /obj/structure/platform/corner{
-	pixel_y = 0;
 	dir = 8
 	},
 /turf/open/floor/plasteel/tech,
@@ -3242,7 +3229,6 @@
 	dir = 4
 	},
 /obj/machinery/button/door{
-	dir = 2;
 	pixel_y = 20;
 	pixel_x = -9;
 	id = "cth_in";
diff --git a/code/modules/paperwork/fax.dm b/code/modules/paperwork/fax.dm
index 36d25e940917..90fdeb79af9c 100644
--- a/code/modules/paperwork/fax.dm
+++ b/code/modules/paperwork/fax.dm
@@ -7,6 +7,7 @@
 	power_channel = AREA_USAGE_EQUIP
 	max_integrity = 100
 	pass_flags = PASSTABLE
+	pixel_y = 6
 	circuit = /obj/item/circuitboard/machine/fax
 	/// The unique ID by which the fax will build a list of existing faxes.
 	var/fax_id
diff --git a/code/modules/requests/requests_manager.dm b/code/modules/requests/requests_manager.dm
index e33da846d4de..c8985058dac1 100644
--- a/code/modules/requests/requests_manager.dm
+++ b/code/modules/requests/requests_manager.dm
@@ -106,6 +106,9 @@ GLOBAL_DATUM_INIT(requests, /datum/request_manager, new)
  */
 /datum/request_manager/proc/fax_request(client/requester, message, additional_info)
 	request_for_client(requester, REQUEST_FAX, message, additional_info)
+	for(var/client/admin in GLOB.admins)
+		if(admin.prefs.chat_toggles & CHAT_PRAYER && admin.prefs.toggles & SOUND_PRAYERS)
+			SEND_SOUND(admin, sound('sound/misc/mail.ogg'))
 
 /**
  * Creates a request and registers the request with all necessary internal tracking lists
diff --git a/sound/misc/mail.ogg b/sound/misc/mail.ogg
new file mode 100644
index 0000000000000000000000000000000000000000..3b6651e9b94f2d821f4e565c36950d93690b285c
GIT binary patch
literal 8412
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
X?X^tZC&iZ(2Gvhq+dm2aMGyQRqd6qR

literal 0
HcmV?d00001


From f9f3ec5068586ed79e13176a046641705f9f3b5d Mon Sep 17 00:00:00 2001
From: Theos <theubernyan@gmail.com>
Date: Fri, 8 Nov 2024 21:02:25 -0500
Subject: [PATCH 14/29] Twohanded weapons now support having 0 force (#3698)

<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request

setting force wielded or unwielded to 0 would cause it to permanently
keep the other value since it skipped setting that value when
wielded/unwielded

## Why It's Good For The Game

why??

## Changelog

:cl:
code: weapons which can be wielded may now have a force of 0 when
wielded or unwielded
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

---------

Signed-off-by: Theos <theubernyan@gmail.com>
---
 code/datums/components/melee/twohanded.dm | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/code/datums/components/melee/twohanded.dm b/code/datums/components/melee/twohanded.dm
index 4ede9a6fc168..c459b49a628e 100644
--- a/code/datums/components/melee/twohanded.dm
+++ b/code/datums/components/melee/twohanded.dm
@@ -9,8 +9,8 @@
 	dupe_mode = COMPONENT_DUPE_UNIQUE_PASSARGS 		// Only one of the component can exist on an item
 	var/wielded = FALSE 							/// Are we holding the two handed item properly
 	var/force_multiplier = 0						/// The multiplier applied to force when wielded, does not work with force_wielded, and force_unwielded
-	var/force_wielded = 0	 						/// The force of the item when wielded
-	var/force_unwielded = 0		 					/// The force of the item when unwielded
+	var/force_wielded = null						/// The force of the item when wielded
+	var/force_unwielded = null						/// The force of the item when unwielded
 	var/wieldsound = FALSE 							/// Play sound when wielded
 	var/unwieldsound = FALSE 						/// Play sound when unwielded
 	var/attacksound = FALSE							/// Play sound on attack when wielded
@@ -33,7 +33,7 @@
  * * icon_wielded (optional) The icon to be used when wielded
  */
 /datum/component/two_handed/Initialize(require_twohands=FALSE, wieldsound=FALSE, unwieldsound=FALSE, attacksound=FALSE, \
-										force_multiplier=0, force_wielded=0, force_unwielded=0, icon_wielded=FALSE)
+										force_multiplier=0, force_wielded=null, force_unwielded=null, icon_wielded=FALSE)
 	if(!isitem(parent))
 		return COMPONENT_INCOMPATIBLE
 
@@ -153,7 +153,7 @@
 	var/obj/item/parent_item = parent
 	if(force_multiplier)
 		parent_item.force *= force_multiplier
-	else if(force_wielded)
+	else if(!isnull(force_wielded))
 		parent_item.force = force_wielded
 	if(sharpened_increase)
 		parent_item.force += sharpened_increase
@@ -200,7 +200,7 @@
 		parent_item.force -= sharpened_increase
 	if(force_multiplier)
 		parent_item.force /= force_multiplier
-	else if(force_unwielded)
+	else if(!isnull(force_unwielded))
 		parent_item.force = force_unwielded
 
 	// update the items name to remove the wielded status

From 77a10d5dee918117c2af598680dcf0d390f55ae3 Mon Sep 17 00:00:00 2001
From: Changelogs <action@github.com>
Date: Fri, 8 Nov 2024 20:30:54 -0600
Subject: [PATCH 15/29] Automatic changelog generation for PR #3698 [ci skip]

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

diff --git a/html/changelogs/AutoChangeLog-pr-3698.yml b/html/changelogs/AutoChangeLog-pr-3698.yml
new file mode 100644
index 000000000000..55e643ded168
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-3698.yml
@@ -0,0 +1,5 @@
+author: SomeguyManperson
+changes:
+  - {code_imp: weapons which can be wielded may now have a force of 0 when wielded
+      or unwielded}
+delete-after: true

From 87651359a9df37598dc171b71671b56565eb60c0 Mon Sep 17 00:00:00 2001
From: Aquidu <98631832+Aquidu@users.noreply.github.com>
Date: Fri, 8 Nov 2024 18:04:55 -0800
Subject: [PATCH 16/29] Allows medical smocks to use their suit storage.
 (#3586)

<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request
This PR adds a whitelist of medical items to the suit storage slots of
Frontiersmen, NGR, Hardliners, and Nanotrasen smocks, as well as
expanding the whitelist for the non-factional surgical apron.

Currently, I don't know of any items that work in the smocks aside from
oxytanks and a PDA for the NT smock. Whereas other, more generic
suits(such as winter coats and labcoats) would be more useful to wear by
having a suit slot in them. This is a shame, because the four smock
sprites are very pleasing, and compliment their faction uniform well.
Pulling from labcoats and medical winter coats, with a few tweakings of
my own, I have created a whitelist for the suit storage slot to be used
on each smock, including but not limited to surgical tools, medical
scanners, chemistry tools, and a few generic items.

NOTE: While working on this, I discovered a few things that may warrant
attention. The Hardliner and Frontiersmen smocks are the "base" suit
model for all the factional gear, meaning future edits to them that we
don't want all their equipment to inherit may be difficult if we don't
add a placeholder model. Additionally, in the future, it may be smart to
put the faction AFTER the category of item it is, e.g:
"/clothing/suit/medical_smock/nanotrasen" instead of what it is now,
"/clothing/suit/nanotrasen/medical smock" for easier grouping or
cross-faction changes.

## Why It's Good For The Game
Players will feel less inclined to forgo the cool-looking smocks for
other clothes simply because they don't have suit storage. Makes medical
inventory management slightly easier.

## Changelog

:cl:
add: Added a suit storage whitelist to the Nanotrasen, Hardliner, NGR,
and Frontiersmen smocks. Expands the whitelist of the surgical smock.
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
---
 code/__DEFINES/storage.dm                     | 30 +++++++++++++++++++
 .../modules/clothing/factions/frontiersmen.dm |  3 +-
 code/modules/clothing/factions/hardliners.dm  |  3 +-
 code/modules/clothing/factions/nanotrasen.dm  |  1 +
 code/modules/clothing/factions/ngr.dm         |  1 +
 code/modules/clothing/suits/jobs.dm           |  2 +-
 code/modules/clothing/suits/labcoat.dm        |  4 +--
 code/modules/clothing/suits/wintercoats.dm    | 23 +-------------
 8 files changed, 40 insertions(+), 27 deletions(-)

diff --git a/code/__DEFINES/storage.dm b/code/__DEFINES/storage.dm
index f8f7e1f10c5b..01d77e0df2f2 100644
--- a/code/__DEFINES/storage.dm
+++ b/code/__DEFINES/storage.dm
@@ -86,3 +86,33 @@ GLOBAL_LIST_INIT(default_weight_class_to_volume, list(
 #define STORAGE_VOLUME_BACKPACK (DEFAULT_VOLUME_NORMAL * 6) //1.5x satchel, 3 bulky items
 #define STORAGE_VOLUME_DUFFLEBAG (DEFAULT_VOLUME_NORMAL * 8) // 2 huge items, or 4 bulky items
 #define STORAGE_VOLUME_BAG_OF_HOLDING (DEFAULT_VOLUME_NORMAL * 9) //1.5X backpack
+
+//Whitelist for the suit storage slot on medical suits
+#define MEDICAL_SUIT_ALLOWED_ITEMS list(	\
+	/obj/item/scalpel,	\
+	/obj/item/cautery,	\
+	/obj/item/hemostat,	\
+	/obj/item/retractor,	\
+	/obj/item/surgicaldrill,	\
+	/obj/item/circular_saw,	\
+	/obj/item/analyzer,	\
+	/obj/item/sensor_device,	\
+	/obj/item/stack/medical,	\
+	/obj/item/dnainjector,	\
+	/obj/item/reagent_containers/dropper,	\
+	/obj/item/reagent_containers/syringe,	\
+	/obj/item/reagent_containers/hypospray,	\
+	/obj/item/healthanalyzer,	\
+	/obj/item/flashlight/pen,	\
+	/obj/item/reagent_containers/glass/bottle,	\
+	/obj/item/reagent_containers/glass/beaker,	\
+	/obj/item/reagent_containers/pill,	\
+	/obj/item/storage/pill_bottle,	\
+	/obj/item/paper,	\
+	/obj/item/melee/classic_baton/telescopic,	\
+	/obj/item/toy,	\
+	/obj/item/storage/fancy/cigarettes,	\
+	/obj/item/lighter,	\
+	/obj/item/tank/internals/emergency_oxygen,	\
+	/obj/item/tank/internals/plasmaman	\
+)
diff --git a/code/modules/clothing/factions/frontiersmen.dm b/code/modules/clothing/factions/frontiersmen.dm
index bb0ed8999367..ab18f7a2b738 100644
--- a/code/modules/clothing/factions/frontiersmen.dm
+++ b/code/modules/clothing/factions/frontiersmen.dm
@@ -41,12 +41,13 @@
 //Unarmored suits//
 ///////////////////
 
-/obj/item/clothing/suit/frontiersmen
+/obj/item/clothing/suit/frontiersmen //Ideally, the basic suit model here should be turned into a placeholder model, and this item have "smock" or "apron" added on the end.
 	name = "frontiersmen smock"
 	desc = "A basic white surgical apron worn by the Frontiersmen. It seems it could stain very easily..."
 	icon_state = "frontier_surgery"
 	icon = 'icons/obj/clothing/faction/frontiersmen/suits.dmi'
 	mob_overlay_icon = 'icons/mob/clothing/faction/frontiersmen/suits.dmi'
+	allowed = MEDICAL_SUIT_ALLOWED_ITEMS
 
 //////////////////
 //Armored suits//
diff --git a/code/modules/clothing/factions/hardliners.dm b/code/modules/clothing/factions/hardliners.dm
index ae664ed2a7ea..ffa5a5e459ae 100644
--- a/code/modules/clothing/factions/hardliners.dm
+++ b/code/modules/clothing/factions/hardliners.dm
@@ -28,13 +28,14 @@
 //Unarmored suits//
 ///////////////////
 
-/obj/item/clothing/suit/hardliners
+/obj/item/clothing/suit/hardliners //Ideally, the basic suit model here should be turned into a placeholder model, and this item have "smock" or "apron" added on the end.
 	name = "white smock"
 	desc = "A plain-white surgical smock typically worn by both Hardliners and Cybersun staff. Even mercenaries need medical attention!"
 	icon = 'icons/obj/clothing/faction/hardliners/suits.dmi'
 	mob_overlay_icon = 'icons/mob/clothing/faction/hardliners/suits.dmi'
 	icon_state = "hl_apron"
 	item_state = "whitecloth"
+	allowed = MEDICAL_SUIT_ALLOWED_ITEMS
 
 /obj/item/clothing/suit/hazardvest/hardliners
 	name = "blood-red hazard vest"
diff --git a/code/modules/clothing/factions/nanotrasen.dm b/code/modules/clothing/factions/nanotrasen.dm
index d8b0f33f8a22..ea85672ad546 100644
--- a/code/modules/clothing/factions/nanotrasen.dm
+++ b/code/modules/clothing/factions/nanotrasen.dm
@@ -163,6 +163,7 @@
 	desc = "A thick fluid-repelling smock rendered in what is unmistakeably Nanotrasen Blue. The tag on the inside declares it property of Nanotrasen, Inc."
 	icon_state = "med_smock"
 	item_state = "bluecloth"
+	allowed = MEDICAL_SUIT_ALLOWED_ITEMS
 
 /obj/item/clothing/suit/nanotrasen/suitjacket
 	name = "fancy black suit jacket"
diff --git a/code/modules/clothing/factions/ngr.dm b/code/modules/clothing/factions/ngr.dm
index 553d6a8b1015..09e25d1ed753 100644
--- a/code/modules/clothing/factions/ngr.dm
+++ b/code/modules/clothing/factions/ngr.dm
@@ -56,6 +56,7 @@
 	desc = "A blood-red surgical smock typically worn by field medics of the New Gorlex Republic. It hides red blood really well!"
 	icon_state = "ngr_apron"
 	item_state = "redcloth"
+	allowed = MEDICAL_SUIT_ALLOWED_ITEMS
 
 /obj/item/clothing/suit/hazardvest/ngr
 	name = "blood-red hazard vest"
diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm
index 2b06e695851c..03822d3f7a11 100644
--- a/code/modules/clothing/suits/jobs.dm
+++ b/code/modules/clothing/suits/jobs.dm
@@ -207,7 +207,7 @@
 	name = "surgical apron"
 	desc = "A sterile blue surgical apron."
 	icon_state = "surgical"
-	allowed = list(/obj/item/scalpel, /obj/item/cautery, /obj/item/hemostat, /obj/item/retractor)
+	allowed = MEDICAL_SUIT_ALLOWED_ITEMS
 
 //SolGov suits
 
diff --git a/code/modules/clothing/suits/labcoat.dm b/code/modules/clothing/suits/labcoat.dm
index 798a34606bc1..51d0f1eb08b1 100644
--- a/code/modules/clothing/suits/labcoat.dm
+++ b/code/modules/clothing/suits/labcoat.dm
@@ -5,7 +5,7 @@
 	item_state = "labcoat"
 	blood_overlay_type = "coat"
 	body_parts_covered = CHEST|ARMS|GROIN
-	allowed = list(/obj/item/analyzer, /obj/item/stack/medical, /obj/item/dnainjector, /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/syringe, /obj/item/reagent_containers/hypospray, /obj/item/healthanalyzer, /obj/item/flashlight/pen, /obj/item/reagent_containers/glass/bottle, /obj/item/reagent_containers/glass/beaker, /obj/item/reagent_containers/pill, /obj/item/storage/pill_bottle, /obj/item/paper, /obj/item/melee/classic_baton/telescopic, /obj/item/soap, /obj/item/sensor_device, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman)
+	allowed = MEDICAL_SUIT_ALLOWED_ITEMS
 	armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 50, "rad" = 0, "fire" = 50, "acid" = 50)
 	togglename = "buttons"
 
@@ -75,7 +75,7 @@ You're pretty sure this is just a raincoat.
 	mob_overlay_icon = 'icons/mob/clothing/suits/utility.dmi'
 	icon_state = "labcoat_long"
 	item_state = "labcoat"
-	allowed = list(/obj/item/analyzer, /obj/item/stack/medical, /obj/item/dnainjector, /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/syringe, /obj/item/reagent_containers/hypospray, /obj/item/healthanalyzer, /obj/item/flashlight/pen, /obj/item/reagent_containers/glass/bottle, /obj/item/reagent_containers/glass/beaker, /obj/item/reagent_containers/pill, /obj/item/storage/pill_bottle, /obj/item/paper, /obj/item/melee/classic_baton/telescopic, /obj/item/soap, /obj/item/sensor_device, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman)
+	allowed = MEDICAL_SUIT_ALLOWED_ITEMS
 	armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 50, "rad" = 0, "fire" = 50, "acid" = 50)
 	togglename = "buttons"
 
diff --git a/code/modules/clothing/suits/wintercoats.dm b/code/modules/clothing/suits/wintercoats.dm
index 5c1bfb47be66..29faddfdd49d 100644
--- a/code/modules/clothing/suits/wintercoats.dm
+++ b/code/modules/clothing/suits/wintercoats.dm
@@ -65,28 +65,7 @@
 	icon_state = "coatmedical"
 	item_state = "coatmedical"
 	hoodtype = /obj/item/clothing/head/hooded/winterhood/medical
-	allowed = list(
-				/obj/item/analyzer,
-				/obj/item/sensor_device,
-				/obj/item/stack/medical,
-				/obj/item/dnainjector,
-				/obj/item/reagent_containers/dropper,
-				/obj/item/reagent_containers/syringe,
-				/obj/item/reagent_containers/hypospray,
-				/obj/item/healthanalyzer,
-				/obj/item/flashlight/pen,
-				/obj/item/reagent_containers/glass/bottle,
-				/obj/item/reagent_containers/glass/beaker,
-				/obj/item/reagent_containers/pill,
-				/obj/item/storage/pill_bottle,
-				/obj/item/paper,
-				/obj/item/melee/classic_baton/telescopic,
-				/obj/item/toy,
-				/obj/item/storage/fancy/cigarettes,
-				/obj/item/lighter,
-				/obj/item/tank/internals/emergency_oxygen,
-				/obj/item/tank/internals/plasmaman,
-				)
+	allowed = MEDICAL_SUIT_ALLOWED_ITEMS
 
 /obj/item/clothing/head/hooded/winterhood/medical
 	icon_state = "hood_medical"

From cc5de1ac1c71310ee0788b48de5ac7e41f2991cc Mon Sep 17 00:00:00 2001
From: Changelogs <action@github.com>
Date: Fri, 8 Nov 2024 20:47:39 -0600
Subject: [PATCH 17/29] Automatic changelog generation for PR #3586 [ci skip]

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

diff --git a/html/changelogs/AutoChangeLog-pr-3586.yml b/html/changelogs/AutoChangeLog-pr-3586.yml
new file mode 100644
index 000000000000..7fe2c24503ba
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-3586.yml
@@ -0,0 +1,5 @@
+author: Aquidu
+changes:
+  - {rscadd: 'Added a suit storage whitelist to the Nanotrasen, Hardliner, NGR, and
+      Frontiersmen smocks. Expands the whitelist of the surgical smock.'}
+delete-after: true

From 87ed3ea3d1cabe53fbc57d2baffac9612972cc3c Mon Sep 17 00:00:00 2001
From: Feenie <62373791+FeenieRU@users.noreply.github.com>
Date: Sat, 9 Nov 2024 09:56:29 +0300
Subject: [PATCH 18/29] Fix donuts inbox states (#3631)

<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request

Fixing unavailable inbox donuts

## Why It's Good For The Game

No ERROR in box

## Changelog

:cl:
imageadd: added icons for inbox donuts
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

Signed-off-by: Feenie <62373791+FeenieRU@users.noreply.github.com>
---
 icons/obj/food/donuts.dmi | Bin 9365 -> 9392 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/icons/obj/food/donuts.dmi b/icons/obj/food/donuts.dmi
index 07c8d7ed162c80ab794c751ea488898ef1817019..31b4d3188f39f83b5645b7226b48fee09a6cbd48 100644
GIT binary patch
literal 9392
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
X2%9o}VFEeS!T@s<E8{vt_ecK*Nd0!x

literal 9365
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


From b552ff8fd9eb5f2d173757dbcf806bf2aefc4f66 Mon Sep 17 00:00:00 2001
From: Changelogs <action@github.com>
Date: Sat, 9 Nov 2024 01:09:16 -0600
Subject: [PATCH 19/29] Automatic changelog generation for PR #3631 [ci skip]

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

diff --git a/html/changelogs/AutoChangeLog-pr-3631.yml b/html/changelogs/AutoChangeLog-pr-3631.yml
new file mode 100644
index 000000000000..1b4f91b499b8
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-3631.yml
@@ -0,0 +1,4 @@
+author: FeenieRU
+changes:
+  - {imageadd: added icons for inbox donuts}
+delete-after: true

From 846a027b6fb87d14693292a9a2f45df6e404556b Mon Sep 17 00:00:00 2001
From: Mark Suckerberg <mark@suckerberg.gay>
Date: Sat, 9 Nov 2024 17:55:21 -0600
Subject: [PATCH 20/29] [s] Blocks RUSTG Proccalls (#3724)

## About The Pull Request

Basically ParadiseSS13/Paradise#27327
---
 code/modules/admin/callproc/callproc.dm | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/code/modules/admin/callproc/callproc.dm b/code/modules/admin/callproc/callproc.dm
index 0fbae3fe55d2..8e99b47573ac 100644
--- a/code/modules/admin/callproc/callproc.dm
+++ b/code/modules/admin/callproc/callproc.dm
@@ -90,6 +90,12 @@ GLOBAL_PROTECT(LastAdminCalledProc)
 		to_chat(usr, "Calling Del() is not allowed", confidential = TRUE)
 		return
 
+	if(findtextEx(trim(lowertext(procname)), "rustg"))
+		var/message = "[key_name(usr)] attempted to call [procname] with arguments: [english_list(arguments)]. Rustg calls are not allowed."
+		log_admin_private(message)
+		message_admins(message)
+		return
+
 	if(target != GLOBAL_PROC && !target.CanProcCall(procname))
 		to_chat(usr, "Proccall on [target.type]/proc/[procname] is disallowed!", confidential = TRUE)
 		return

From daba8a86ed470a951b6c28eeaea06bc5bf422914 Mon Sep 17 00:00:00 2001
From: Changelogs <action@github.com>
Date: Sun, 10 Nov 2024 01:06:04 +0000
Subject: [PATCH 21/29] Automatic changelog compile [ci skip]

---
 html/changelogs/AutoChangeLog-pr-3586.yml |  5 -----
 html/changelogs/AutoChangeLog-pr-3631.yml |  4 ----
 html/changelogs/AutoChangeLog-pr-3698.yml |  5 -----
 html/changelogs/AutoChangeLog-pr-3705.yml |  4 ----
 html/changelogs/archive/2024-11.yml       | 11 +++++++++++
 5 files changed, 11 insertions(+), 18 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-3586.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-3631.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-3698.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-3705.yml

diff --git a/html/changelogs/AutoChangeLog-pr-3586.yml b/html/changelogs/AutoChangeLog-pr-3586.yml
deleted file mode 100644
index 7fe2c24503ba..000000000000
--- a/html/changelogs/AutoChangeLog-pr-3586.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: Aquidu
-changes:
-  - {rscadd: 'Added a suit storage whitelist to the Nanotrasen, Hardliner, NGR, and
-      Frontiersmen smocks. Expands the whitelist of the surgical smock.'}
-delete-after: true
diff --git a/html/changelogs/AutoChangeLog-pr-3631.yml b/html/changelogs/AutoChangeLog-pr-3631.yml
deleted file mode 100644
index 1b4f91b499b8..000000000000
--- a/html/changelogs/AutoChangeLog-pr-3631.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: FeenieRU
-changes:
-  - {imageadd: added icons for inbox donuts}
-delete-after: true
diff --git a/html/changelogs/AutoChangeLog-pr-3698.yml b/html/changelogs/AutoChangeLog-pr-3698.yml
deleted file mode 100644
index 55e643ded168..000000000000
--- a/html/changelogs/AutoChangeLog-pr-3698.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: SomeguyManperson
-changes:
-  - {code_imp: weapons which can be wielded may now have a force of 0 when wielded
-      or unwielded}
-delete-after: true
diff --git a/html/changelogs/AutoChangeLog-pr-3705.yml b/html/changelogs/AutoChangeLog-pr-3705.yml
deleted file mode 100644
index 9c033c451ca8..000000000000
--- a/html/changelogs/AutoChangeLog-pr-3705.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: MarkSuckerberg
-changes:
-  - {config: 'Removes a lot of old, unused config options'}
-delete-after: true
diff --git a/html/changelogs/archive/2024-11.yml b/html/changelogs/archive/2024-11.yml
index 815f1bdbc653..99ec182caf24 100644
--- a/html/changelogs/archive/2024-11.yml
+++ b/html/changelogs/archive/2024-11.yml
@@ -101,3 +101,14 @@
   - balance: wasteplanets no longer spawn manhacks
   SomeguyManperson:
   - bugfix: the kilo sawnoff shotgun is no longer the private domicile of The Void
+2024-11-10:
+  Aquidu:
+  - rscadd: Added a suit storage whitelist to the Nanotrasen, Hardliner, NGR, and
+      Frontiersmen smocks. Expands the whitelist of the surgical smock.
+  FeenieRU:
+  - imageadd: added icons for inbox donuts
+  MarkSuckerberg:
+  - config: Removes a lot of old, unused config options
+  SomeguyManperson:
+  - code_imp: weapons which can be wielded may now have a force of 0 when wielded
+      or unwielded

From 1c0bec0c35d3b7dfaa17bb9a1608c946199fdf35 Mon Sep 17 00:00:00 2001
From: Erika Fox <94164348+Erikafox@users.noreply.github.com>
Date: Sun, 10 Nov 2024 01:31:51 -0500
Subject: [PATCH 22/29] Crusher Balance (#3591)

<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request
Crusher Code slightly cleaner
Crushers do more damage
<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Why It's Good For The Game
I want to see how they feel like this.
<!-- 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. -->

## Changelog

:cl:
balance: Crusher damage has been slightly increased across the board.
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

---------

Signed-off-by: Erika Fox <94164348+Erikafox@users.noreply.github.com>
Co-authored-by: Erika Fox <94164348+Bjarl@users.noreply.github.com>
Co-authored-by: Sun-Soaked <45698967+Sun-Soaked@users.noreply.github.com>
Co-authored-by: Theos <theubernyan@gmail.com>
---
 .../mining/equipment/kinetic_crusher.dm       | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/code/modules/mining/equipment/kinetic_crusher.dm b/code/modules/mining/equipment/kinetic_crusher.dm
index d110fe901082..27f71dfa9359 100644
--- a/code/modules/mining/equipment/kinetic_crusher.dm
+++ b/code/modules/mining/equipment/kinetic_crusher.dm
@@ -28,11 +28,13 @@
 	var/charge_time = 15
 	var/detonation_damage = 20
 	var/backstab_bonus = 10
+	var/unwielded_force = 0
+	var/wielded_force = 25
 
 /obj/item/kinetic_crusher/ComponentInitialize()
 	. = ..()
 	AddComponent(/datum/component/butchering, 60, 110) //technically it's huge and bulky, but this provides an incentive to use it
-	AddComponent(/datum/component/two_handed, force_unwielded=0, force_wielded=15)
+	AddComponent(/datum/component/two_handed, force_unwielded=unwielded_force, force_wielded=wielded_force)
 
 /obj/item/kinetic_crusher/examine(mob/living/user)
 	. = ..()
@@ -154,16 +156,13 @@
 	detonation_damage = 10
 	slowdown = 0.5//hevy
 	attack_verb = list("mashed", "flattened", "bisected", "eradicated","destroyed")
+	unwielded_force = 0
+	wielded_force = 30
 
 /obj/item/kinetic_crusher/old/examine(mob/user)
 	. = ..()
 	. += "<span class='notice'>This hunk of junk's so heavy that you can barely swing it! Though, that blade looks pretty sharp...</span>"
 
-/obj/item/kinetic_crusher/old/ComponentInitialize()
-	. = ..()
-	AddComponent(/datum/component/butchering, 60, 110)
-	AddComponent(/datum/component/two_handed, force_unwielded=0, force_wielded=25)//big choppa!
-
 /obj/item/kinetic_crusher/old/melee_attack_chain(mob/user, atom/target, params)
 	..()
 	user.changeNext_move(CLICK_CD_MELEE * 2.0)//...slow swinga.
@@ -204,18 +203,14 @@
 	detonation_damage = 35
 	backstab_bonus = 15
 	actions_types = list()
-
+	unwielded_force = 0
+	wielded_force = 22
 
 /obj/item/kinetic_crusher/syndie_crusher/Initialize()
 	. = ..()
 	RegisterSignal(src, COMSIG_TWOHANDED_WIELD, PROC_REF(on_wield))
 	RegisterSignal(src, COMSIG_TWOHANDED_UNWIELD, PROC_REF(on_unwield))
 
-/obj/item/kinetic_crusher/syndie_crusher/ComponentInitialize()
-	. = ..()
-	AddComponent(/datum/component/butchering, 60, 150)
-	AddComponent(/datum/component/two_handed, force_unwielded=0, force_wielded=10)
-
 /// triggered on wield of two handed item
 /obj/item/kinetic_crusher/syndie_crusher/proc/on_wield(obj/item/source, mob/user)
 	SIGNAL_HANDLER

From fe23cce25e6a7698825f047a0fd9b57ef2bb847d Mon Sep 17 00:00:00 2001
From: Changelogs <action@github.com>
Date: Sun, 10 Nov 2024 00:47:37 -0600
Subject: [PATCH 23/29] Automatic changelog generation for PR #3591 [ci skip]

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

diff --git a/html/changelogs/AutoChangeLog-pr-3591.yml b/html/changelogs/AutoChangeLog-pr-3591.yml
new file mode 100644
index 000000000000..6c67d830895c
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-3591.yml
@@ -0,0 +1,4 @@
+author: Erikafox
+changes:
+  - {balance: Crusher damage has been slightly increased across the board.}
+delete-after: true

From 622ec9c77ac623471cf2b8389984735746bc7673 Mon Sep 17 00:00:00 2001
From: Theos <theubernyan@gmail.com>
Date: Sun, 10 Nov 2024 02:21:34 -0500
Subject: [PATCH 24/29] Fixes a number of issues revolving around guns not
 taking certain magazines (#3719)

<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request

Replaces the strict type-check for allowed ammo lists (in ballistics, im
not touching cells. yet.) with a typecache of any allowed magazine & an
available list of blacklisted specific ammo types.
Etherbor guns can now take both civilian and military etherbor cells,
mirroring sharplite weapons which can accept both standard and upgraded
cells. Behind every blade of grass.

## Why It's Good For The Game

The shredder can now take slug boxes again
Any gun where you can find or make empty magazines can now take those
empty magazines. Guncrates conveniently avoided this by emptying
non-subtyped magazines.
Guns with alternate ammunition in magazines no longer require those
alternate ammunition magazine types to be added to their allowed types
despite only really changing the ammunition the magazine starts with


## Changelog

:cl:
fix: guns with magazines can no longer sometimes refuse to accept those
magazines
balance: etherbor military and civilian weapon cells are interchangeable
between military and civilian arms
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

---------

Signed-off-by: Theos <theubernyan@gmail.com>
---
 code/modules/projectiles/gun.dm                        |  3 +++
 code/modules/projectiles/guns/ballistic.dm             |  3 +++
 code/modules/projectiles/guns/ballistic/assault.dm     |  2 --
 code/modules/projectiles/guns/ballistic/hmg.dm         |  2 --
 code/modules/projectiles/guns/ballistic/smg.dm         |  6 ------
 code/modules/projectiles/guns/ballistic/toy.dm         |  3 ---
 code/modules/projectiles/guns/energy.dm                |  2 +-
 .../guns/manufacturer/clip_lanchester/ballistics.dm    |  2 --
 .../guns/manufacturer/etherbor/energy_gunsword.dm      |  3 +++
 .../guns/manufacturer/scarborough/ballistics.dm        | 10 ----------
 10 files changed, 10 insertions(+), 26 deletions(-)

diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm
index 1f5b2f2cb3db..3393eae8c9ac 100644
--- a/code/modules/projectiles/gun.dm
+++ b/code/modules/projectiles/gun.dm
@@ -57,7 +57,10 @@
 //BALLISTIC
 	///Compatible magazines with the gun
 	var/default_ammo_type
+	///Allowed base types of magazines with the gun
 	var/allowed_ammo_types
+	///Incompatible magazines with the gun
+	var/blacklisted_ammo_types
 	///Whether the gun alarms when empty or not.
 	var/empty_alarm = FALSE
 	///Do we eject the magazine upon runing out of ammo?
diff --git a/code/modules/projectiles/guns/ballistic.dm b/code/modules/projectiles/guns/ballistic.dm
index debfc647e667..0bfb0f3e3546 100644
--- a/code/modules/projectiles/guns/ballistic.dm
+++ b/code/modules/projectiles/guns/ballistic.dm
@@ -42,6 +42,9 @@
 
 /obj/item/gun/ballistic/Initialize(mapload, spawn_empty)
 	. = ..()
+
+	allowed_ammo_types = typecacheof(allowed_ammo_types) - blacklisted_ammo_types
+
 	if(spawn_empty)
 		if(internal_magazine)
 			spawn_no_ammo = TRUE
diff --git a/code/modules/projectiles/guns/ballistic/assault.dm b/code/modules/projectiles/guns/ballistic/assault.dm
index f06b83d42f77..0141667d1ce6 100644
--- a/code/modules/projectiles/guns/ballistic/assault.dm
+++ b/code/modules/projectiles/guns/ballistic/assault.dm
@@ -46,8 +46,6 @@
 	default_ammo_type = /obj/item/ammo_box/magazine/skm_762_40
 	allowed_ammo_types = list(
 		/obj/item/ammo_box/magazine/skm_762_40,
-		/obj/item/ammo_box/magazine/skm_762_40/extended,
-		/obj/item/ammo_box/magazine/skm_762_40/drum,
 	)
 
 	spread = 1
diff --git a/code/modules/projectiles/guns/ballistic/hmg.dm b/code/modules/projectiles/guns/ballistic/hmg.dm
index 0a1265034f85..46f615ccf9cc 100644
--- a/code/modules/projectiles/guns/ballistic/hmg.dm
+++ b/code/modules/projectiles/guns/ballistic/hmg.dm
@@ -184,8 +184,6 @@
 	default_ammo_type = /obj/item/ammo_box/magazine/skm_762_40
 	allowed_ammo_types = list(
 		/obj/item/ammo_box/magazine/skm_762_40,
-		/obj/item/ammo_box/magazine/skm_762_40/extended,
-		/obj/item/ammo_box/magazine/skm_762_40/drum
 	)
 
 	fire_delay = 0.13 SECONDS
diff --git a/code/modules/projectiles/guns/ballistic/smg.dm b/code/modules/projectiles/guns/ballistic/smg.dm
index f2d223e968d3..8e9e403a05cb 100644
--- a/code/modules/projectiles/guns/ballistic/smg.dm
+++ b/code/modules/projectiles/guns/ballistic/smg.dm
@@ -79,7 +79,6 @@
 	default_ammo_type = /obj/item/ammo_box/magazine/c45_firestorm_mag
 	allowed_ammo_types = list(
 		/obj/item/ammo_box/magazine/c45_firestorm_mag,
-		/obj/item/ammo_box/magazine/c45_firestorm_mag/pan
 	)
 	unique_mag_sprites_for_variants = TRUE
 	burst_size = 1
@@ -118,7 +117,6 @@
 	default_ammo_type = /obj/item/ammo_box/magazine/skm_46_30
 	allowed_ammo_types = list(
 		/obj/item/ammo_box/magazine/skm_46_30,
-		/obj/item/ammo_box/magazine/skm_46_30/recycled,
 	)
 
 	recoil = 2
@@ -210,10 +208,6 @@
 	default_ammo_type = /obj/item/ammo_box/magazine/smgm9mm
 	allowed_ammo_types = list(
 		/obj/item/ammo_box/magazine/smgm9mm,
-		/obj/item/ammo_box/magazine/smgm9mm/ap,
-		/obj/item/ammo_box/magazine/smgm9mm/inc,
-		/obj/item/ammo_box/magazine/smgm9mm/rubber,
-
 	)
 
 	fire_sound = 'sound/weapons/gun/smg/vector_fire.ogg'
diff --git a/code/modules/projectiles/guns/ballistic/toy.dm b/code/modules/projectiles/guns/ballistic/toy.dm
index 52abb7dd32ee..016cbe94f4c5 100644
--- a/code/modules/projectiles/guns/ballistic/toy.dm
+++ b/code/modules/projectiles/guns/ballistic/toy.dm
@@ -45,9 +45,6 @@
 
 /obj/item/gun/ballistic/automatic/toy/pistol/riot
 	default_ammo_type = /obj/item/ammo_box/magazine/toy/pistol/riot
-	allowed_ammo_types = list(
-		/obj/item/ammo_box/magazine/toy/pistol/riot,
-	)
 
 /obj/item/gun/ballistic/automatic/toy/pistol/riot/Initialize()
 	magazine = new /obj/item/ammo_box/magazine/toy/pistol/riot(src)
diff --git a/code/modules/projectiles/guns/energy.dm b/code/modules/projectiles/guns/energy.dm
index f4193723e8fd..1f595e994902 100644
--- a/code/modules/projectiles/guns/energy.dm
+++ b/code/modules/projectiles/guns/energy.dm
@@ -125,7 +125,7 @@
 		update_appearance()
 
 /obj/item/gun/energy/attackby(obj/item/A, mob/user, params)
-	if (!internal_magazine && (A.type in allowed_ammo_types))
+	if (!internal_magazine && (A.type in (allowed_ammo_types - blacklisted_ammo_types)))
 		var/obj/item/stock_parts/cell/gun/C = A
 		if (!cell)
 			insert_cell(user, C)
diff --git a/code/modules/projectiles/guns/manufacturer/clip_lanchester/ballistics.dm b/code/modules/projectiles/guns/manufacturer/clip_lanchester/ballistics.dm
index 5b2a61abc343..737c34792f24 100644
--- a/code/modules/projectiles/guns/manufacturer/clip_lanchester/ballistics.dm
+++ b/code/modules/projectiles/guns/manufacturer/clip_lanchester/ballistics.dm
@@ -146,7 +146,6 @@ NO_MAG_GUN_HELPER(automatic/pistol/cm357)
 	default_ammo_type = /obj/item/ammo_box/magazine/cm5_9mm
 	allowed_ammo_types = list(
 		/obj/item/ammo_box/magazine/cm5_9mm,
-		/obj/item/ammo_box/magazine/cm5_9mm/rubber,
 	)
 	bolt_type = BOLT_TYPE_CLIP
 	weapon_weight = WEAPON_LIGHT
@@ -527,7 +526,6 @@ NO_MAG_GUN_HELPER(automatic/smg/cm5)
 	default_ammo_type = /obj/item/ammo_box/magazine/cm15_12g
 	allowed_ammo_types = list(
 		/obj/item/ammo_box/magazine/cm15_12g,
-		/obj/item/ammo_box/magazine/cm15_12g/incendiary
 	)
 
 	empty_indicator = FALSE
diff --git a/code/modules/projectiles/guns/manufacturer/etherbor/energy_gunsword.dm b/code/modules/projectiles/guns/manufacturer/etherbor/energy_gunsword.dm
index a0bbb7185621..a0b85b285911 100644
--- a/code/modules/projectiles/guns/manufacturer/etherbor/energy_gunsword.dm
+++ b/code/modules/projectiles/guns/manufacturer/etherbor/energy_gunsword.dm
@@ -19,6 +19,7 @@
 	default_ammo_type = /obj/item/stock_parts/cell/gun/kalix
 	allowed_ammo_types = list(
 		/obj/item/stock_parts/cell/gun/kalix,
+		/obj/item/stock_parts/cell/gun/pgf,
 	)
 	ammo_type = list(/obj/item/ammo_casing/energy/kalix, /obj/item/ammo_casing/energy/disabler/hitscan)
 
@@ -60,6 +61,7 @@
 	default_ammo_type = /obj/item/stock_parts/cell/gun/pgf
 	allowed_ammo_types = list(
 		/obj/item/stock_parts/cell/gun/pgf,
+		/obj/item/stock_parts/cell/gun/kalix,
 	)
 	ammo_type = list(/obj/item/ammo_casing/energy/kalix/pgf , /obj/item/ammo_casing/energy/disabler/hitscan)
 
@@ -95,6 +97,7 @@
 	default_ammo_type = /obj/item/stock_parts/cell/gun/kalix
 	allowed_ammo_types = list(
 		/obj/item/stock_parts/cell/gun/kalix,
+		/obj/item/stock_parts/cell/gun/pgf,
 	)
 	ammo_type = list(/obj/item/ammo_casing/energy/kalix/pistol)
 
diff --git a/code/modules/projectiles/guns/manufacturer/scarborough/ballistics.dm b/code/modules/projectiles/guns/manufacturer/scarborough/ballistics.dm
index 2fd29228f1d1..ff43fc8cf56c 100644
--- a/code/modules/projectiles/guns/manufacturer/scarborough/ballistics.dm
+++ b/code/modules/projectiles/guns/manufacturer/scarborough/ballistics.dm
@@ -525,7 +525,6 @@ NO_MAG_GUN_HELPER(automatic/smg/sidewinder)
 	default_ammo_type = /obj/item/ammo_box/magazine/boomslang
 	allowed_ammo_types = list(
 		/obj/item/ammo_box/magazine/boomslang,
-		/obj/item/ammo_box/magazine/boomslang/short,
 	)
 	w_class = WEIGHT_CLASS_BULKY
 
@@ -657,9 +656,6 @@ NO_MAG_GUN_HELPER(automatic/marksman/taipan)
 	default_ammo_type = /obj/item/ammo_box/magazine/m556_42_hydra
 	allowed_ammo_types = list(
 		/obj/item/ammo_box/magazine/m556_42_hydra,
-		/obj/item/ammo_box/magazine/m556_42_hydra/extended,
-		/obj/item/ammo_box/magazine/m556_42_hydra/casket,
-		/obj/item/ammo_box/magazine/m556_42_hydra/small
 	)
 	gun_firenames = list(FIREMODE_SEMIAUTO = "single", FIREMODE_BURST = "burst fire", FIREMODE_FULLAUTO = "full auto", FIREMODE_OTHER = "underbarrel grenade launcher")
 	gun_firemodes = list(FIREMODE_SEMIAUTO, FIREMODE_FULLAUTO)
@@ -913,12 +909,6 @@ NO_MAG_GUN_HELPER(automatic/assault/hydra/dmr)
 	default_ammo_type = /obj/item/ammo_box/magazine/m12g_bulldog
 	allowed_ammo_types = list(
 		/obj/item/ammo_box/magazine/m12g_bulldog,
-		/obj/item/ammo_box/magazine/m12g_bulldog/drum,
-		/obj/item/ammo_box/magazine/m12g_bulldog/drum/stun,
-		/obj/item/ammo_box/magazine/m12g_bulldog/drum/slug,
-		/obj/item/ammo_box/magazine/m12g_bulldog/drum/dragon,
-		/obj/item/ammo_box/magazine/m12g_bulldog/drum/bioterror,
-		/obj/item/ammo_box/magazine/m12g_bulldog/drum/meteor,
 	)
 	fire_delay = 0.4 SECONDS // this NEEDS the old delay.
 	fire_sound = 'sound/weapons/gun/shotgun/bulldog.ogg'

From b87599617a24f5f09a31a433eab66b032f877078 Mon Sep 17 00:00:00 2001
From: Changelogs <action@github.com>
Date: Sun, 10 Nov 2024 01:48:13 -0600
Subject: [PATCH 25/29] Automatic changelog generation for PR #3719 [ci skip]

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

diff --git a/html/changelogs/AutoChangeLog-pr-3719.yml b/html/changelogs/AutoChangeLog-pr-3719.yml
new file mode 100644
index 000000000000..a6dc892f4393
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-3719.yml
@@ -0,0 +1,6 @@
+author: SomeguyManperson
+changes:
+  - {bugfix: guns with magazines can no longer sometimes refuse to accept those magazines}
+  - {balance: etherbor military and civilian weapon cells are interchangeable between
+      military and civilian arms}
+delete-after: true

From 82064e5d44f05b776c749e0b234213f931e8fb80 Mon Sep 17 00:00:00 2001
From: Changelogs <action@github.com>
Date: Mon, 11 Nov 2024 01:03:08 +0000
Subject: [PATCH 26/29] Automatic changelog compile [ci skip]

---
 html/changelogs/AutoChangeLog-pr-3591.yml | 4 ----
 html/changelogs/AutoChangeLog-pr-3719.yml | 6 ------
 html/changelogs/archive/2024-11.yml       | 7 +++++++
 3 files changed, 7 insertions(+), 10 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-3591.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-3719.yml

diff --git a/html/changelogs/AutoChangeLog-pr-3591.yml b/html/changelogs/AutoChangeLog-pr-3591.yml
deleted file mode 100644
index 6c67d830895c..000000000000
--- a/html/changelogs/AutoChangeLog-pr-3591.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: Erikafox
-changes:
-  - {balance: Crusher damage has been slightly increased across the board.}
-delete-after: true
diff --git a/html/changelogs/AutoChangeLog-pr-3719.yml b/html/changelogs/AutoChangeLog-pr-3719.yml
deleted file mode 100644
index a6dc892f4393..000000000000
--- a/html/changelogs/AutoChangeLog-pr-3719.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: SomeguyManperson
-changes:
-  - {bugfix: guns with magazines can no longer sometimes refuse to accept those magazines}
-  - {balance: etherbor military and civilian weapon cells are interchangeable between
-      military and civilian arms}
-delete-after: true
diff --git a/html/changelogs/archive/2024-11.yml b/html/changelogs/archive/2024-11.yml
index 99ec182caf24..bea480573c4f 100644
--- a/html/changelogs/archive/2024-11.yml
+++ b/html/changelogs/archive/2024-11.yml
@@ -112,3 +112,10 @@
   SomeguyManperson:
   - code_imp: weapons which can be wielded may now have a force of 0 when wielded
       or unwielded
+2024-11-11:
+  Erikafox:
+  - balance: Crusher damage has been slightly increased across the board.
+  SomeguyManperson:
+  - bugfix: guns with magazines can no longer sometimes refuse to accept those magazines
+  - balance: etherbor military and civilian weapon cells are interchangeable between
+      military and civilian arms

From cc9645600af6640cbf28034a11e807835eb0541e Mon Sep 17 00:00:00 2001
From: firebudgy <153147550+firebudgy@users.noreply.github.com>
Date: Sun, 10 Nov 2024 20:29:38 -0500
Subject: [PATCH 27/29] Changes the Kansatsu-class to Aspawn (#3732)

## About The Pull Request

Changes the Kansatsu-class to be aspawned. Contact an admin if you would
like to have it spawned in.

## Why It's Good For The Game

Maptainer request.

## Changelog

:cl:
balance: Kansatsu has been removed from the player-accessible ship pool.
/:cl:
---
 _maps/configs/syndicate_cybersun_kansatsu.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/_maps/configs/syndicate_cybersun_kansatsu.json b/_maps/configs/syndicate_cybersun_kansatsu.json
index 013be2455640..dbafa1605120 100644
--- a/_maps/configs/syndicate_cybersun_kansatsu.json
+++ b/_maps/configs/syndicate_cybersun_kansatsu.json
@@ -39,5 +39,5 @@
 			"slots": 2
 		}
 	},
-	"enabled": true
+	"enabled": false
 }

From e3ee9e4d4e8929b8b68ff40f8fd04faef1d39e5a Mon Sep 17 00:00:00 2001
From: Changelogs <action@github.com>
Date: Sun, 10 Nov 2024 19:43:21 -0600
Subject: [PATCH 28/29] Automatic changelog generation for PR #3732 [ci skip]

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

diff --git a/html/changelogs/AutoChangeLog-pr-3732.yml b/html/changelogs/AutoChangeLog-pr-3732.yml
new file mode 100644
index 000000000000..28316c5c7883
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-3732.yml
@@ -0,0 +1,4 @@
+author: firebudgy
+changes:
+  - {balance: Kansatsu has been removed from the player-accessible ship pool.}
+delete-after: true

From bb6bd3975a661da9247ce5e31c0505eb7e5eed01 Mon Sep 17 00:00:00 2001
From: Changelogs <action@github.com>
Date: Tue, 12 Nov 2024 01:01:05 +0000
Subject: [PATCH 29/29] Automatic changelog compile [ci skip]

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

diff --git a/html/changelogs/AutoChangeLog-pr-3732.yml b/html/changelogs/AutoChangeLog-pr-3732.yml
deleted file mode 100644
index 28316c5c7883..000000000000
--- a/html/changelogs/AutoChangeLog-pr-3732.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: firebudgy
-changes:
-  - {balance: Kansatsu has been removed from the player-accessible ship pool.}
-delete-after: true
diff --git a/html/changelogs/archive/2024-11.yml b/html/changelogs/archive/2024-11.yml
index bea480573c4f..cd5ac9a844bb 100644
--- a/html/changelogs/archive/2024-11.yml
+++ b/html/changelogs/archive/2024-11.yml
@@ -119,3 +119,6 @@
   - bugfix: guns with magazines can no longer sometimes refuse to accept those magazines
   - balance: etherbor military and civilian weapon cells are interchangeable between
       military and civilian arms
+2024-11-12:
+  firebudgy:
+  - balance: Kansatsu has been removed from the player-accessible ship pool.