From b08bf6bfcd25d59b5f736b6207f6ef65010086c2 Mon Sep 17 00:00:00 2001
From: arealbeba <121337883+arealbeba@users.noreply.github.com>
Date: Fri, 13 Dec 2024 19:05:22 +0700
Subject: [PATCH] =?UTF-8?q?=D0=A0=D0=B5=D0=BC=D0=B0=D0=BF=D0=BF=D0=B8?=
 =?UTF-8?q?=D0=BD=D0=B3=20=D0=B4=D0=B0=D1=80=D0=B5=D0=BA=D1=82=D0=B0=20(#1?=
 =?UTF-8?q?249)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* ремап даректа под СБ

* попытка номер 2

---------

Signed-off-by: arealbeba <121337883+arealbeba@users.noreply.github.com>
---
 .../configs/nanotrasen_darect.json            |   25 +-
 .../shuttles/nanotrasen/nanotrasen_darect.dmm | 2104 ++++++++---------
 .../outfit/code/nanotrasen/nt_outfit.dm       |   29 +
 3 files changed, 1091 insertions(+), 1067 deletions(-)

diff --git a/_maps/_mod_celadon/configs/nanotrasen_darect.json b/_maps/_mod_celadon/configs/nanotrasen_darect.json
index 655759c92461..578438b939e1 100644
--- a/_maps/_mod_celadon/configs/nanotrasen_darect.json
+++ b/_maps/_mod_celadon/configs/nanotrasen_darect.json
@@ -2,11 +2,11 @@
 	"$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
 	"map_name": "Darect-class Patrol Vessel",
 	"map_short_name": "Darect",
-	"description": " 'Darect', передовой патрульный космический корабль, управляемый межзвездным конгломератом, известным как НаноТрейзен, представляет собой элегантный и грозный корабль, который патрулирует обширные просторы галактики, чтобы защитить интересы своих корпоративных повелителей. Знакомое зрелище в бесчисленных звездных системах, является впечатляющим символом доминирования НТ в контролируемых корпорациями регионах космоса.",
+	"description": " 'Darect', передовой патрульный космический корабль, управляемый межзвездным конгломератом, известным как Нанотрейзен, Darect-class имеет на себе отряд патрульных офицеров СБ усердно работающих, чтобы защитить интересы своих корпоративных повелителей. Знакомое зрелище в бесчисленных звездных системах, является впечатляющим символом доминирования НТ в контролируемых корпорациями регионах космоса.",
 	"map_path": "_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_darect.dmm",
 	"enabled": true,
 	"limit": 1,
-	"prefix": "NTSPSV",
+	"prefix": "NTBSV",
 	"faction": "/datum/faction/nt",
 	"tags": [
 		"Combat",
@@ -17,25 +17,20 @@
 		"WEAPONS"
 	],
 	"job_slots": {
-		"Lieutenant": {
-			"outfit": "/datum/outfit/job/nanotrasen/captain/lp",
+		"Patrol Leader": {
+			"outfit": "/datum/outfit/job/nanotrasen/hos/captain",
 			"officer": true,
 			"slots": 1
 		},
-		"Flight group commander": {
-			"outfit": "/datum/outfit/job/nanotrasen/hos",
-			"officer": true,
-			"slots": 1
-		},
-		"Military technician": {
-			"outfit": "/datum/outfit/job/nanotrasen/engineer/lp",
+		"Security Engineer": {
+			"outfit": "/datum/outfit/job/nanotrasen/engineer",
 			"slots": 1
 		},
-		"Flight group officer": {
-			"outfit": "/datum/outfit/job/nanotrasen/security/lp",
-			"slots": 2
+		"Patrol Officer": {
+			"outfit": "/datum/outfit/job/nanotrasen/security",
+			"slots": 3
 		},
-		"Military surgeon": {
+		"Security Medic": {
 			"outfit": "/datum/outfit/job/nanotrasen/paramedic",
 			"slots": 1
 		}
diff --git a/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_darect.dmm b/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_darect.dmm
index 247997a78c3d..9f6f4c86c78e 100644
--- a/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_darect.dmm
+++ b/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_darect.dmm
@@ -1,62 +1,56 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
 "aO" = (
-/obj/structure/closet/wall{
-	name = "uniform closet";
-	pixel_y = -30
-	},
-/obj/item/clothing/under/color/jumpskirt/orange,
-/obj/item/clothing/under/color/jumpskirt/orange,
-/obj/item/clothing/shoes/sneakers/orange,
-/obj/item/clothing/shoes/sneakers/orange,
-/obj/effect/turf_decal/corner/opaque/grey/diagonal,
-/obj/effect/turf_decal/siding/white,
-/obj/item/clothing/shoes/sneakers/orange,
-/obj/item/clothing/under/color/jumpskirt/orange,
-/obj/effect/turf_decal/industrial/warning{
-	color = "#808080";
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/turf_decal/trimline/opaque/red/warning{
 	dir = 4
 	},
-/obj/effect/turf_decal/industrial/warning{
-	color = "#808080";
-	dir = 8
+/obj/structure/closet/secure_closet/wall{
+	icon_state = "sec_wall";
+	req_access_txt = "1";
+	pixel_y = -29;
+	name = "clothing locker"
 	},
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/item/clothing/glasses/blindfold,
-/obj/item/clothing/glasses/blindfold,
-/obj/item/clothing/glasses/blindfold,
-/turf/open/floor/plasteel/dark,
-/area/ship/hallway/central)
+/obj/item/clothing/head/helmet/swat/nanotrasen,
+/obj/item/clothing/head/helmet/swat/nanotrasen,
+/obj/item/clothing/head/helmet/swat/nanotrasen,
+/obj/item/clothing/mask/gas/sechailer/swat,
+/obj/item/clothing/mask/gas/sechailer/swat,
+/obj/item/clothing/mask/gas/sechailer,
+/obj/item/clothing/mask/gas/sechailer,
+/obj/item/clothing/suit/armor/nanotrasen,
+/obj/item/clothing/suit/armor/nanotrasen,
+/obj/item/clothing/suit/armor/nanotrasen,
+/obj/item/clothing/suit/armor/nanotrasen,
+/obj/item/clothing/head/fedora/det_hat,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 9
+	},
+/turf/open/floor/mineral/plastitanium,
+/area/ship/security/armory)
 "bf" = (
 /obj/effect/turf_decal/techfloor/orange{
 	dir = 4
 	},
-/obj/item/clothing/accessory/armband/engine,
-/obj/item/clothing/head/hardhat/dblue,
-/obj/item/clothing/gloves/color/yellow,
-/obj/item/storage/backpack/industrial,
-/obj/item/clothing/shoes/workboots,
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
 /obj/structure/cable{
 	icon_state = "2-8"
 	},
-/obj/item/clothing/head/beret/eng/hazard,
-/obj/item/clothing/under/rank/engineering/engineer/nt/lp,
 /obj/effect/turf_decal/steeldecal/steel_decals3{
 	dir = 5
 	},
 /obj/effect/turf_decal/steeldecal/steel_decals3{
 	dir = 4
 	},
-/obj/item/clothing/mask/gas/atmos,
-/obj/item/tank/internals/emergency_oxygen/engi,
-/obj/item/clothing/head/helmet/space/light/engineer,
-/obj/item/clothing/suit/space/engineer,
-/obj/structure/closet/wall{
-	dir = 4;
-	pixel_x = 30
+/obj/structure/closet/wall/orange/directional/east,
+/obj/item/stack/sheet/mineral/plasma/twenty{
+	pixel_y = 7
+	},
+/obj/item/stack/sheet/mineral/plasma/twenty{
+	pixel_y = -6
 	},
+/obj/item/stack/sheet/mineral/plasma/twenty,
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/engineering)
 "bA" = (
@@ -79,27 +73,21 @@
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/engineering)
 "cx" = (
-/obj/structure/extinguisher_cabinet/directional/north,
-/obj/effect/turf_decal/corner/opaque/blue/border{
-	dir = 5
+/obj/effect/turf_decal/trimline/opaque/brown/warning{
+	dir = 8
 	},
-/obj/structure/table/glass,
-/obj/item/storage/backpack/duffelbag/med/surgery{
-	pixel_y = 10;
-	pixel_x = -5
+/obj/effect/turf_decal/trimline/opaque/brown/line{
+	dir = 4
 	},
-/obj/machinery/light/directional/east,
-/obj/item/storage/box/bodybags{
-	pixel_x = 11
+/obj/structure/cable{
+	icon_state = "1-10"
 	},
-/turf/open/floor/plasteel/dark,
-/area/ship/medical)
+/turf/open/floor/plasteel/patterned,
+/area/ship/cargo)
 "cC" = (
 /obj/effect/turf_decal/siding/wood{
 	dir = 10
 	},
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/turf_decal/siding/wood/corner{
 	dir = 4
 	},
@@ -126,18 +114,29 @@
 /turf/open/floor/plasteel/patterned,
 /area/ship/hallway/central)
 "dB" = (
-/obj/machinery/door/firedoor/border_only{
-	dir = 4
+/obj/structure/closet/secure_closet{
+	icon_door = "tac";
+	icon_state = "tac";
+	name = "boarding tools locker";
+	req_access_txt = "1"
 	},
-/obj/machinery/door/firedoor/border_only{
-	dir = 8
+/obj/item/storage/backpack/duffelbag/syndie/c4{
+	icon_state = "duffel-sec";
+	name = "breaching charges duffel bag"
 	},
-/obj/effect/turf_decal/industrial/warning{
+/obj/item/grenade/frag,
+/obj/item/grenade/frag,
+/obj/item/grenade/smokebomb,
+/obj/item/grenade/smokebomb,
+/obj/machinery/airalarm/directional/north,
+/obj/effect/turf_decal/corner/opaque/red/half{
 	dir = 4
 	},
-/obj/structure/extinguisher_cabinet/directional/south,
-/turf/open/floor/plasteel/patterned,
-/area/ship/hallway/central)
+/obj/effect/turf_decal/trimline/opaque/red/warning{
+	dir = 8
+	},
+/turf/open/floor/mineral/plastitanium,
+/area/ship/security/armory)
 "dI" = (
 /obj/machinery/button/door{
 	dir = 4;
@@ -146,7 +145,6 @@
 	pixel_x = -22;
 	pixel_y = -10
 	},
-/obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/turf_decal/techfloor{
 	dir = 8
 	},
@@ -159,13 +157,14 @@
 /turf/open/floor/plasteel/tech,
 /area/ship/bridge)
 "dJ" = (
-/obj/effect/turf_decal/siding/wood/end{
-	dir = 1
-	},
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/item/kirbyplants/random,
-/turf/open/floor/wood,
+/obj/effect/turf_decal/siding/wideplating/dark{
+	dir = 4
+	},
+/obj/effect/turf_decal/siding/wideplating/dark{
+	dir = 8
+	},
+/turf/open/floor/plasteel/telecomms_floor,
 /area/ship/crew)
 "dU" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
@@ -196,6 +195,15 @@
 	},
 /turf/open/floor/plasteel/tech/techmaint,
 /area/ship/engineering)
+"eb" = (
+/obj/effect/turf_decal/techfloor{
+	dir = 1
+	},
+/obj/structure/table,
+/obj/machinery/microwave,
+/obj/machinery/light/directional/south,
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/crew/canteen)
 "ej" = (
 /obj/effect/turf_decal/techfloor/orange,
 /obj/structure/railing{
@@ -217,18 +225,6 @@
 /obj/effect/turf_decal/techfloor/orange{
 	dir = 1
 	},
-/obj/structure/closet/wall/orange{
-	name = "fuel locker";
-	pixel_y = 30;
-	dir = 1
-	},
-/obj/item/stack/sheet/mineral/plasma/twenty,
-/obj/item/stack/sheet/mineral/plasma/twenty{
-	pixel_y = 7
-	},
-/obj/item/stack/sheet/mineral/plasma/twenty{
-	pixel_y = -6
-	},
 /turf/open/floor/plasteel/tech/techmaint,
 /area/ship/engineering)
 "em" = (
@@ -238,7 +234,6 @@
 /obj/effect/turf_decal/steeldecal/steel_decals10{
 	dir = 1
 	},
-/obj/effect/decal/cleanable/dirt/dust,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 8
 	},
@@ -258,11 +253,9 @@
 	dir = 1
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/effect/turf_decal/siding/thinplating{
-	dir = 1
-	},
 /mob/living/simple_animal/bot/secbot/beepsky/jr,
-/turf/open/floor/plastic,
+/obj/effect/turf_decal/trimline/opaque/red/line,
+/turf/open/floor/plasteel,
 /area/ship/hallway/central)
 "er" = (
 /obj/structure/cable{
@@ -274,24 +267,19 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
 	},
+/obj/effect/turf_decal/ntspaceworks_small,
 /turf/open/floor/plasteel/patterned,
 /area/ship/hallway/central)
 "eE" = (
-/obj/effect/turf_decal/techfloor{
-	dir = 9
-	},
-/obj/structure/closet/crate/medical,
-/obj/item/roller,
-/obj/item/storage/firstaid/medical,
-/obj/item/storage/pill_bottle/charcoal,
-/obj/item/storage/pill_bottle/iron,
-/obj/effect/turf_decal/industrial/hatch/blue,
 /obj/machinery/airalarm/directional/west,
-/obj/item/storage/firstaid/o2,
-/obj/item/storage/firstaid/brute,
-/obj/item/storage/firstaid/fire,
-/turf/open/floor/plasteel/tech,
-/area/ship/medical)
+/obj/effect/turf_decal/trimline/opaque/brown/filled/arrow_ccw{
+	dir = 8
+	},
+/obj/machinery/computer/cargo{
+	dir = 4
+	},
+/turf/open/floor/plasteel/patterned,
+/area/ship/cargo)
 "eF" = (
 /obj/machinery/door/airlock/grunge{
 	name = "Bathroom"
@@ -304,51 +292,43 @@
 /area/ship/hallway/central)
 "eS" = (
 /obj/machinery/light/directional/north,
-/obj/machinery/door/firedoor/border_only{
-	dir = 4
-	},
 /obj/machinery/door/firedoor/border_only{
 	dir = 8
 	},
-/obj/effect/turf_decal/industrial/warning{
+/obj/machinery/door/firedoor/border_only{
 	dir = 4
 	},
-/turf/open/floor/plasteel/patterned,
+/obj/effect/turf_decal/trimline/opaque/red/line,
+/turf/open/floor/plasteel,
 /area/ship/hallway/central)
 "eZ" = (
-/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/patterned,
-/area/ship/cargo)
+/turf/open/floor/plasteel/dark,
+/area/ship/medical)
 "fy" = (
 /obj/effect/turf_decal/techfloor{
 	dir = 8
 	},
-/obj/structure/rack,
-/obj/item/storage/belt/utility/full/engi{
-	pixel_y = 9
-	},
-/obj/item/clothing/glasses/welding{
-	pixel_y = 13
-	},
-/obj/item/storage/toolbox/electrical{
-	pixel_y = -9
-	},
-/obj/item/storage/toolbox/mechanical{
-	pixel_y = 1;
-	pixel_x = -4
-	},
-/obj/item/multitool{
-	pixel_x = 9
+/obj/structure/extinguisher_cabinet/directional/south,
+/obj/structure/closet/secure_closet{
+	icon_state = "eng_secure";
+	name = "security engineer's locker";
+	req_access_txt = "10"
 	},
-/obj/effect/turf_decal/kfp_small/left,
+/obj/item/tank/internals/emergency_oxygen/engi,
+/obj/item/clothing/head/beret/eng/hazard,
+/obj/item/clothing/shoes/workboots,
+/obj/item/storage/backpack/industrial,
+/obj/item/clothing/gloves/color/yellow,
+/obj/item/clothing/head/hardhat/nanotrasen/blue,
+/obj/item/clothing/accessory/armband/engine,
+/obj/item/storage/belt/utility/full/engi,
+/obj/item/clothing/under/nanotrasen/engineering,
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/engineering)
 "fR" = (
@@ -361,38 +341,29 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
 	},
-/obj/machinery/button/door{
-	dir = 1;
-	id = "nthip_armorybay";
-	name = "Weapon Hold";
-	pixel_x = 7;
-	req_access_txt = "3";
-	pixel_y = -25
-	},
 /obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/turf_decal/ntspaceworks_small/left,
 /turf/open/floor/plasteel/patterned,
 /area/ship/hallway/central)
 "fX" = (
-/obj/effect/turf_decal/techfloor{
-	dir = 6
-	},
-/obj/effect/turf_decal/industrial/loading{
-	dir = 1
-	},
 /obj/effect/decal/cleanable/blood/old,
-/obj/item/spacecash/bundle/c500{
-	pixel_y = 14;
-	pixel_x = 15
+/obj/machinery/light/directional/east,
+/obj/effect/turf_decal/trimline/opaque/brown/filled/arrow_ccw{
+	dir = 4
 	},
-/turf/open/floor/plasteel/tech,
-/area/ship/medical)
-"gb" = (
-/obj/effect/turf_decal/siding/white{
-	dir = 8
+/obj/machinery/suit_storage_unit/inherit,
+/obj/item/tank/internals/oxygen,
+/obj/item/clothing/suit/space{
+	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.";
+	armor = list("melee" = 30, "bullet" = 15, "laser" = 15, "energy" = 40, "bomb" = 20, "bio" = 100, "rad" = 30, "fire" = 75, "acid" = 75)
 	},
-/obj/effect/turf_decal/ntspaceworks_small{
-	dir = 4
+/obj/item/clothing/head/helmet/space/light{
+	desc = "A special helmet with solar UV shielding to protect your eyes from harmful rays.""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)
 	},
+/turf/open/floor/plasteel/patterned,
+/area/ship/cargo)
+"gb" = (
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
@@ -402,7 +373,9 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
 	},
-/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/turf_decal/trimline/opaque/red/line{
+	dir = 1
+	},
 /turf/open/floor/plasteel,
 /area/ship/hallway/central)
 "gH" = (
@@ -450,11 +423,15 @@
 /turf/open/floor/plasteel/stairs,
 /area/ship/engineering)
 "hc" = (
-/obj/effect/turf_decal/techfloor,
-/obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/decal/cleanable/glass,
-/turf/open/floor/plasteel/tech,
-/area/ship/security)
+/obj/structure/sink/kitchen{
+	dir = 8
+	},
+/obj/effect/turf_decal/siding/wood{
+	dir = 6
+	},
+/turf/open/floor/wood,
+/area/ship/crew/canteen)
 "hk" = (
 /obj/effect/spawner/structure/window/shuttle,
 /obj/machinery/door/poddoor{
@@ -482,26 +459,24 @@
 /turf/open/floor/plating,
 /area/ship/engineering)
 "hY" = (
-/obj/effect/turf_decal/corner/opaque/blue/border{
-	dir = 6
+/obj/effect/turf_decal/trimline/opaque/brown/warning{
+	dir = 8
 	},
-/turf/open/floor/plasteel/dark,
-/area/ship/medical)
+/obj/effect/turf_decal/trimline/opaque/brown/line{
+	dir = 4
+	},
+/turf/open/floor/plasteel/patterned,
+/area/ship/cargo)
 "ie" = (
-/obj/effect/turf_decal/corner/opaque/grey/diagonal,
-/obj/effect/turf_decal/siding/white{
-	dir = 6
+/obj/structure/chair/plastic,
+/obj/machinery/door/firedoor/border_only{
+	dir = 1
 	},
-/obj/structure/curtain/bounty,
-/obj/structure/toilet{
-	pixel_y = 1;
-	dir = 8;
-	pixel_x = 9
+/obj/effect/turf_decal/siding/wood{
+	dir = 9
 	},
-/obj/effect/decal/cleanable/xenoblood/xgibs,
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/plasteel/dark,
-/area/ship/hallway/central)
+/turf/open/floor/wood,
+/area/ship/crew/canteen)
 "iJ" = (
 /obj/effect/turf_decal/techfloor/orange{
 	dir = 8
@@ -540,62 +515,82 @@
 /obj/effect/turf_decal/siding/thinplating/dark/corner{
 	dir = 1
 	},
-/obj/effect/turf_decal/siding/thinplating/dark{
-	dir = 6
-	},
+/obj/effect/turf_decal/siding/thinplating/dark,
 /turf/open/floor/plasteel/patterned,
 /area/ship/hallway/central)
 "iV" = (
 /obj/effect/turf_decal/siding/thinplating/dark{
 	dir = 8
 	},
-/obj/effect/turf_decal/industrial/stand_clear,
 /obj/machinery/light/small/directional/west,
-/obj/structure/cable{
-	icon_state = "1-6"
+/obj/effect/turf_decal/trimline/opaque/blue/line{
+	dir = 8
 	},
-/obj/effect/decal/cleanable/glass,
-/turf/open/floor/plasteel/patterned,
-/area/ship/cargo)
-"ji" = (
-/obj/structure/sign/nanotrasen,
-/turf/closed/wall/mineral/titanium,
+/obj/effect/turf_decal/trimline/opaque/blue/warning{
+	dir = 4
+	},
+/obj/structure/closet/secure_closet{
+	icon_state = "brig_phys";
+	name = "security medic's locker";
+	req_access_txt = "5"
+	},
+/obj/item/clothing/under/nanotrasen/medical/paramedic,
+/obj/item/clothing/under/nanotrasen/medical,
+/obj/item/reagent_containers/hypospray/combat,
+/obj/item/clothing/glasses/hud/health/sunglasses,
+/obj/item/clothing/shoes/jackboots,
+/obj/item/clothing/head/nanotrasen/cap/medical,
+/obj/item/clothing/head/nanotrasen/surgical/blue,
+/obj/item/clothing/suit/toggle/labcoat/nanotrasen/paramedic,
+/obj/item/clothing/suit/nanotrasen/medical_smock,
+/obj/item/clothing/suit/nanotrasen/vest/blue,
+/obj/item/clothing/suit/nanotrasen/suitjacket,
+/obj/item/clothing/gloves/color/latex/nitrile,
+/turf/open/floor/plasteel/dark,
 /area/ship/medical)
 "jk" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/poddoor/shutters{
-	id = "nthip_armorybay";
-	name = "Weapon Hold"
+/obj/machinery/door/firedoor/border_only{
+	dir = 1
 	},
-/turf/open/floor/plasteel/tech,
-/area/ship/security)
+/obj/effect/turf_decal/siding/wood{
+	dir = 1
+	},
+/turf/open/floor/wood,
+/area/ship/crew/canteen)
 "jE" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 1
 	},
-/obj/structure/tank_dispenser,
 /obj/effect/turf_decal/industrial/hatch/yellow,
 /obj/machinery/airalarm/directional/east,
+/obj/machinery/autolathe,
+/obj/item/stack/sheet/glass/fifty{
+	pixel_x = 6
+	},
+/obj/item/stack/sheet/metal/fifty,
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/engineering)
 "jF" = (
-/obj/effect/turf_decal/siding/wood/corner{
-	dir = 4
-	},
-/obj/effect/turf_decal/siding/wood/corner{
-	dir = 1
-	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 1
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 10
 	},
+/obj/effect/turf_decal/siding/wideplating/dark/corner,
+/obj/effect/turf_decal/siding/wideplating/dark/corner{
+	dir = 4
+	},
+/obj/effect/turf_decal/siding/wideplating/dark/corner{
+	dir = 1
+	},
+/obj/effect/turf_decal/siding/wideplating/dark/corner{
+	dir = 8
+	},
 /obj/structure/cable{
-	icon_state = "2-4"
+	icon_state = "2-8"
 	},
-/obj/effect/decal/cleanable/plasma,
-/turf/open/floor/wood,
+/turf/open/floor/plasteel/telecomms_floor,
 /area/ship/crew)
 "ka" = (
 /obj/effect/turf_decal/industrial/warning/cee{
@@ -645,23 +640,26 @@
 /turf/open/floor/plasteel/tech/techmaint,
 /area/ship/engineering)
 "lE" = (
-/obj/effect/turf_decal/siding/white{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
 /obj/structure/cable{
 	icon_state = "1-4"
 	},
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
+/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4,
+/obj/effect/turf_decal/trimline/opaque/red/corner{
+	dir = 1
+	},
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
+/obj/effect/turf_decal/trimline/opaque/red/line{
+	dir = 4
+	},
 /turf/open/floor/plasteel,
 /area/ship/hallway/central)
 "lM" = (
-/obj/effect/turf_decal/siding/white{
-	dir = 4
-	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 1
 	},
@@ -671,32 +669,40 @@
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
+/obj/effect/turf_decal/trimline/opaque/red/corner{
+	dir = 8
+	},
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/turf_decal/siding/white/corner{
-	dir = 1
+/obj/effect/turf_decal/trimline/opaque/red/line{
+	dir = 4
 	},
 /turf/open/floor/plasteel,
 /area/ship/hallway/central)
 "lX" = (
-/obj/effect/turf_decal/techfloor,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 9
 	},
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel/tech,
-/area/ship/security)
+/obj/effect/turf_decal/siding/wood,
+/turf/open/floor/wood,
+/area/ship/crew/canteen)
 "mh" = (
-/obj/effect/turf_decal/siding/wood{
-	dir = 9
-	},
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
 	dir = 4
 	},
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/airalarm/directional/west,
-/turf/open/floor/wood,
+/obj/effect/turf_decal/siding/wideplating/dark{
+	dir = 1
+	},
+/obj/effect/turf_decal/siding/wideplating/dark,
+/obj/machinery/power/apc/auto_name/directional/west,
+/obj/structure/cable{
+	icon_state = "0-4"
+	},
+/obj/machinery/light_switch{
+	dir = 4;
+	pixel_x = -19;
+	pixel_y = 12
+	},
+/turf/open/floor/plasteel/telecomms_floor,
 /area/ship/crew)
 "mo" = (
 /obj/effect/turf_decal/techfloor/orange{
@@ -713,29 +719,36 @@
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/engineering)
 "mz" = (
-/obj/structure/table/reinforced,
-/obj/effect/turf_decal/siding/thinplating{
-	dir = 9
+/obj/machinery/newscaster/directional/north,
+/obj/structure/table/reinforced{
+	pixel_x = 0;
+	pixel_y = 0
 	},
-/obj/item/spacecash/bundle/c1000{
-	pixel_x = 3;
-	pixel_y = -4
+/obj/item/clothing/mask/cigarette/syndicate{
+	pixel_x = 2;
+	pixel_y = 0
 	},
-/obj/item/toy/cards/deck{
-	pixel_x = -3
+/obj/item/clothing/mask/cigarette/syndicate{
+	pixel_x = 5;
+	pixel_y = 6
 	},
-/obj/machinery/jukebox/boombox{
-	pixel_y = 4
+/obj/item/clothing/mask/cigarette/syndicate{
+	pixel_x = -6;
+	pixel_y = 11
 	},
-/obj/machinery/newscaster/directional/north,
-/obj/item/storage/fancy/cigarettes/cigpack_robustgold{
-	pixel_x = -11
+/obj/item/clothing/mask/cigarette/syndicate{
+	pixel_x = 5;
+	pixel_y = 15
 	},
-/obj/item/lighter/greyscale{
-	pixel_y = 9;
-	pixel_x = -11
+/obj/item/restraints/handcuffs{
+	pixel_x = 3;
+	pixel_y = 6
+	},
+/obj/item/restraints/handcuffs,
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 6
 	},
-/turf/open/floor/plastic,
+/turf/open/floor/plasteel/patterned,
 /area/ship/hallway/central)
 "mV" = (
 /obj/structure/cable{
@@ -747,63 +760,59 @@
 	pixel_x = 19;
 	pixel_y = -12
 	},
-/turf/open/floor/carpet/nanoweave,
+/obj/effect/turf_decal/trimline/opaque/ntblue/line{
+	dir = 1
+	},
+/obj/effect/turf_decal/trimline/opaque/ntblue/warning,
+/turf/open/floor/plasteel/dark,
 /area/ship/hallway/central)
 "mW" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
-/obj/structure/chair/greyscale{
-	dir = 1
-	},
-/obj/effect/turf_decal/siding/thinplating{
-	dir = 4
-	},
+/obj/effect/turf_decal/trimline/opaque/red/line,
 /obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/plastic,
+/turf/open/floor/plasteel,
 /area/ship/hallway/central)
 "nG" = (
 /obj/structure/sign/nanotrasen,
 /turf/closed/wall/mineral/titanium,
 /area/ship/cargo)
 "nI" = (
-/obj/effect/turf_decal/corner/opaque/grey/diagonal,
-/obj/structure/chair/comfy/shuttle{
-	dir = 4;
-	name = "Helm"
-	},
 /obj/effect/turf_decal/industrial/warning{
 	color = "#808080";
 	dir = 2
 	},
 /obj/item/radio/intercom/directional/west,
-/turf/open/floor/plasteel/dark,
-/area/ship/cargo)
+/obj/structure/table/glass,
+/obj/item/storage/backpack/duffelbag/med/surgery{
+	pixel_y = 10;
+	pixel_x = -5
+	},
+/obj/item/storage/box/bodybags{
+	pixel_x = 11
+	},
+/obj/effect/turf_decal/corner/opaque/blue/diagonal,
+/turf/open/floor/plasteel/tech,
+/area/ship/medical)
 "nW" = (
-/obj/effect/turf_decal/corner/opaque/grey/diagonal,
-/obj/effect/turf_decal/industrial/warning{
-	color = "#808080";
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/turf_decal/trimline/opaque/red/warning{
 	dir = 4
 	},
-/obj/effect/turf_decal/industrial/warning{
-	color = "#808080";
-	dir = 8
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/structure/cable{
+	icon_state = "1-4"
 	},
-/obj/machinery/door/window/brigdoor/southright{
-	dir = 1;
-	req_access_txt = "1"
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 9
 	},
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/plasteel/dark,
-/area/ship/hallway/central)
+/turf/open/floor/mineral/plastitanium,
+/area/ship/security/armory)
 "of" = (
 /obj/effect/turf_decal/siding/thinplating/dark{
 	dir = 1
 	},
 /obj/effect/turf_decal/siding/thinplating/dark,
-/obj/machinery/door/airlock/hatch{
-	dir = 4;
-	name = "Cargo Bay"
-	},
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
@@ -819,6 +828,10 @@
 /obj/machinery/door/firedoor/border_only{
 	dir = 4
 	},
+/obj/machinery/door/airlock/medical/glass{
+	dir = 4;
+	name = "Medbay"
+	},
 /turf/open/floor/plasteel/patterned,
 /area/ship/hallway/central)
 "oj" = (
@@ -833,8 +846,14 @@
 	pixel_x = 32;
 	dir = 4
 	},
-/turf/open/floor/plasteel/patterned,
-/area/ship/cargo)
+/obj/effect/turf_decal/trimline/opaque/blue/warning{
+	dir = 8
+	},
+/obj/effect/turf_decal/trimline/opaque/blue/line{
+	dir = 4
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/medical)
 "oQ" = (
 /obj/machinery/power/smes/engineering,
 /obj/effect/turf_decal/industrial/warning,
@@ -844,20 +863,17 @@
 /turf/open/floor/plasteel/tech/techmaint,
 /area/ship/engineering)
 "oR" = (
-/obj/effect/turf_decal/techfloor{
-	dir = 1
-	},
-/obj/structure/cable{
-	icon_state = "1-4"
-	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 9
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 1
 	},
-/turf/open/floor/plasteel/tech,
-/area/ship/security)
+/obj/structure/cable{
+	icon_state = "1-4"
+	},
+/turf/open/floor/wood,
+/area/ship/crew/canteen)
 "py" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
@@ -870,44 +886,24 @@
 	icon_state = "4-8"
 	},
 /obj/machinery/light/directional/south,
-/turf/open/floor/carpet/nanoweave,
+/obj/effect/turf_decal/trimline/opaque/ntblue/line,
+/obj/effect/turf_decal/trimline/opaque/ntblue/warning{
+	dir = 1
+	},
+/turf/open/floor/plasteel/dark,
 /area/ship/hallway/central)
 "pN" = (
-/obj/effect/spawner/structure/window/shuttle,
 /obj/machinery/door/poddoor{
-	id = "ntmed_windows"
+	id = "darect_cargodoors"
 	},
-/turf/open/floor/plating,
-/area/ship/medical)
+/turf/open/floor/engine,
+/area/ship/cargo)
 "pW" = (
-/obj/item/radio/intercom/directional/east,
-/obj/machinery/light_switch{
-	dir = 8;
-	pixel_x = 22;
-	pixel_y = 8
-	},
-/obj/machinery/light/directional/south,
 /obj/effect/turf_decal/techfloor{
 	dir = 6
 	},
-/obj/structure/guncloset{
-	anchored = 1
-	},
-/obj/item/gun/energy/e_gun/smg{
-	pixel_y = 10
-	},
-/obj/item/gun/energy/e_gun/smg{
-	pixel_y = 4
-	},
-/obj/item/gun/energy/e_gun/iot{
-	pixel_y = -1
-	},
-/obj/item/gun/energy/e_gun/iot{
-	pixel_y = -7
-	},
-/obj/item/gun/energy/ionrifle,
-/turf/open/floor/plasteel/tech,
-/area/ship/security)
+/turf/closed/wall/mineral/titanium/nodiagonal,
+/area/ship/security/armory)
 "qb" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 8
@@ -918,27 +914,28 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/machinery/door/airlock/maintenance_hatch{
-	dir = 4;
-	name = "Engineering"
-	},
 /obj/machinery/door/firedoor/border_only{
 	dir = 8
 	},
 /obj/machinery/door/firedoor/border_only{
 	dir = 4
 	},
+/obj/machinery/door/airlock/engineering{
+	name = "Engineering";
+	req_access_txt = "10";
+	dir = 8
+	},
 /turf/open/floor/plasteel/tech/techmaint,
 /area/ship/engineering)
 "qw" = (
 /obj/effect/turf_decal/siding/thinplating/dark,
 /obj/machinery/light/small/directional/south,
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/computer/cargo{
+/obj/structure/bodycontainer/morgue{
 	dir = 1
 	},
-/turf/open/floor/plasteel/patterned,
-/area/ship/cargo)
+/turf/open/floor/plasteel/dark,
+/area/ship/medical)
 "qL" = (
 /obj/effect/spawner/structure/window/shuttle,
 /obj/machinery/door/poddoor{
@@ -973,11 +970,12 @@
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
 	dir = 8
 	},
-/obj/effect/turf_decal/siding/thinplating,
-/turf/open/floor/plastic,
+/obj/effect/turf_decal/trimline/opaque/red/line{
+	dir = 1
+	},
+/turf/open/floor/plasteel,
 /area/ship/hallway/central)
 "qW" = (
-/obj/effect/turf_decal/siding/wood,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 1
 	},
@@ -987,8 +985,13 @@
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/wood,
+/obj/effect/turf_decal/siding/wideplating/dark{
+	dir = 4
+	},
+/obj/effect/turf_decal/siding/wideplating/dark{
+	dir = 8
+	},
+/turf/open/floor/plasteel/telecomms_floor,
 /area/ship/crew)
 "rb" = (
 /obj/effect/turf_decal/techfloor{
@@ -1015,7 +1018,11 @@
 	pixel_y = 30;
 	dir = 1
 	},
-/turf/open/floor/carpet/nanoweave,
+/obj/effect/turf_decal/trimline/opaque/ntblue/line{
+	dir = 1
+	},
+/obj/effect/turf_decal/trimline/opaque/ntblue/warning,
+/turf/open/floor/plasteel/dark,
 /area/ship/hallway/central)
 "rk" = (
 /obj/machinery/door/poddoor{
@@ -1025,7 +1032,6 @@
 /turf/open/floor/plating,
 /area/ship/bridge)
 "rt" = (
-/obj/effect/turf_decal/techfloor,
 /obj/machinery/power/apc/auto_name/directional/south,
 /obj/machinery/light_switch{
 	dir = 1;
@@ -1038,8 +1044,14 @@
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
 	dir = 8
 	},
-/turf/open/floor/plasteel/tech,
-/area/ship/medical)
+/obj/effect/turf_decal/trimline/opaque/brown/warning{
+	dir = 8
+	},
+/obj/effect/turf_decal/trimline/opaque/brown/line{
+	dir = 4
+	},
+/turf/open/floor/plasteel/patterned,
+/area/ship/cargo)
 "rx" = (
 /obj/effect/turf_decal/steeldecal/steel_decals1,
 /obj/effect/decal/cleanable/dirt/dust,
@@ -1068,46 +1080,43 @@
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/hallway/central)
 "rO" = (
-/obj/effect/turf_decal/siding/thinplating{
-	dir = 9
-	},
-/obj/structure/table/reinforced,
-/obj/machinery/microwave{
-	pixel_y = 5
-	},
-/turf/open/floor/plastic,
+/obj/effect/turf_decal/trimline/opaque/red/corner,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel,
 /area/ship/hallway/central)
 "sc" = (
 /obj/effect/turf_decal/borderfloorblack,
-/obj/machinery/door/airlock/hatch{
-	name = "Captains Cabin"
+/obj/machinery/door/airlock/command{
+	name = "Patrol Leader's quarters"
 	},
 /turf/open/floor/plasteel/tech,
 /area/ship/bridge)
 "st" = (
-/obj/effect/turf_decal/corner/opaque/grey/diagonal,
-/obj/structure/rack,
-/obj/item/storage/bag/ore,
-/obj/item/pickaxe/rusted,
-/obj/item/pickaxe/drill,
-/obj/item/mining_scanner,
+/obj/effect/turf_decal/industrial/hatch/blue,
+/obj/machinery/stasis,
+/obj/machinery/vending/wallmed{
+	pixel_y = -28
+	},
 /turf/open/floor/plasteel/dark,
-/area/ship/cargo)
+/area/ship/medical)
 "sy" = (
-/obj/machinery/light_switch{
-	pixel_x = -12;
-	pixel_y = 21
-	},
-/obj/effect/turf_decal/techfloor{
-	dir = 1
-	},
-/obj/machinery/power/apc/auto_name/directional/north,
+/obj/structure/table,
+/obj/machinery/power/apc/auto_name/directional/east,
 /obj/structure/cable{
 	icon_state = "0-8"
 	},
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/plasteel/tech,
-/area/ship/security)
+/obj/machinery/jukebox/boombox{
+	pixel_y = 4
+	},
+/obj/item/lighter/greyscale{
+	pixel_y = -4;
+	pixel_x = -9
+	},
+/obj/effect/turf_decal/siding/wood{
+	dir = 4
+	},
+/turf/open/floor/wood,
+/area/ship/crew/canteen)
 "sL" = (
 /obj/structure/window/reinforced{
 	dir = 8
@@ -1124,18 +1133,13 @@
 /turf/open/floor/plating,
 /area/ship/engineering)
 "sW" = (
-/obj/structure/table/reinforced{
-	color = "#c1b6a5"
-	},
 /obj/effect/turf_decal/techfloor{
 	dir = 9
 	},
-/obj/machinery/cell_charger,
-/obj/item/stock_parts/cell/high,
-/obj/item/stock_parts/cell/high,
-/obj/item/geiger_counter{
-	pixel_y = 14
-	},
+/obj/machinery/suit_storage_unit/inherit,
+/obj/item/clothing/suit/space/hardsuit/engine,
+/obj/item/clothing/mask/gas/atmos,
+/obj/item/clothing/shoes/magboots,
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/engineering)
 "tc" = (
@@ -1143,8 +1147,11 @@
 /obj/machinery/firealarm/directional/north{
 	pixel_x = 4
 	},
-/obj/item/banner/command/mundane,
-/turf/open/floor/carpet/nanoweave,
+/obj/effect/turf_decal/trimline/opaque/ntblue/line{
+	dir = 9
+	},
+/obj/effect/turf_decal/trimline/opaque/ntblue/corner,
+/turf/open/floor/plasteel/dark,
 /area/ship/hallway/central)
 "tp" = (
 /obj/effect/decal/cleanable/dirt/dust,
@@ -1159,8 +1166,8 @@
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/engineering)
 "tt" = (
-/turf/closed/wall/mineral/titanium,
-/area/ship/security)
+/turf/closed/wall/mineral/titanium/nodiagonal,
+/area/ship/security/armory)
 "tD" = (
 /obj/machinery/airalarm/directional/west,
 /obj/structure/sign/poster/official/help_others{
@@ -1173,16 +1180,18 @@
 /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 = 8
 	},
-/obj/effect/turf_decal/siding/thinplating,
-/obj/effect/decal/cleanable/dirt/dust,
 /obj/machinery/holopad/emergency/kitchen,
-/turf/open/floor/plastic,
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+	dir = 1
+	},
+/obj/effect/turf_decal/trimline/opaque/red/line{
+	dir = 1
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel,
 /area/ship/hallway/central)
 "tQ" = (
 /obj/structure/railing{
@@ -1197,18 +1206,30 @@
 	},
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
-"uu" = (
-/obj/effect/turf_decal/industrial/warning{
-	color = "#808080";
-	dir = 1
+"tX" = (
+/obj/effect/turf_decal/corner/opaque/red/half{
+	dir = 8
 	},
-/obj/structure/extinguisher_cabinet/directional/south,
-/obj/effect/turf_decal/industrial/outline/yellow,
-/obj/structure/reagent_dispensers/fueltank,
+/obj/structure/rack,
+/obj/item/melee/baton/loaded{
+	pixel_x = -3;
+	pixel_y = 3
+	},
+/obj/item/melee/baton/loaded,
+/obj/item/melee/baton/loaded{
+	pixel_x = 3;
+	pixel_y = -3
+	},
+/obj/effect/turf_decal/trimline/opaque/red/warning{
+	dir = 4
+	},
+/turf/open/floor/mineral/plastitanium,
+/area/ship/security/armory)
+"uu" = (
 /obj/structure/railing{
 	dir = 4
 	},
-/turf/open/floor/plasteel/tech/techmaint,
+/turf/closed/wall/mineral/titanium/nodiagonal,
 /area/ship/engineering)
 "uF" = (
 /turf/closed/wall/mineral/titanium/nodiagonal,
@@ -1229,25 +1250,37 @@
 /turf/template_noop,
 /area/template_noop)
 "vN" = (
-/obj/structure/chair/greyscale{
-	dir = 8
+/obj/effect/turf_decal/trimline/opaque/red/line{
+	dir = 1
 	},
-/obj/effect/turf_decal/siding/thinplating,
 /obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/plastic,
+/turf/open/floor/plasteel,
 /area/ship/hallway/central)
 "vO" = (
 /obj/effect/turf_decal/techfloor{
 	dir = 1
 	},
-/obj/effect/turf_decal/box,
-/obj/machinery/suit_storage_unit/inherit/industrial,
-/obj/item/tank/jetpack,
-/obj/machinery/door/window/northleft,
-/obj/item/clothing/mask/gas/sechailer,
-/obj/item/clothing/suit/space/hardsuit/ert/lp/med,
+/obj/structure/closet/secure_closet/freezer{
+	name = "emergency donuts locker"
+	},
+/obj/effect/spawner/lootdrop/donut,
+/obj/effect/spawner/lootdrop/donut,
+/obj/effect/spawner/lootdrop/donut,
+/obj/effect/spawner/lootdrop/donut,
+/obj/effect/spawner/lootdrop/donut,
+/obj/effect/spawner/lootdrop/donut,
+/obj/effect/spawner/lootdrop/donut,
+/obj/effect/spawner/lootdrop/donut,
+/obj/effect/spawner/lootdrop/donut,
+/obj/effect/spawner/lootdrop/donut,
+/obj/effect/spawner/lootdrop/donut,
+/obj/effect/spawner/lootdrop/donut,
+/obj/item/storage/fancy/donut_box{
+	pixel_x = 0;
+	pixel_y = -4
+	},
 /turf/open/floor/plasteel/tech/grid,
-/area/ship/security)
+/area/ship/crew/canteen)
 "wu" = (
 /obj/effect/turf_decal/borderfloorblack{
 	dir = 4
@@ -1267,9 +1300,10 @@
 /obj/machinery/door/firedoor/border_only{
 	dir = 8
 	},
-/obj/machinery/door/airlock/highsecurity{
-	name = "Bridge";
-	req_access_txt = "302"
+/obj/machinery/door/airlock/command{
+	dir = 4;
+	req_access_txt = "19";
+	name = "Bridge"
 	},
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
@@ -1293,16 +1327,17 @@
 	dir = 1
 	},
 /obj/machinery/light/directional/north,
+/obj/machinery/door/airlock/engineering{
+	name = "Engineering";
+	req_access_txt = "10";
+	dir = 8
+	},
 /turf/open/floor/plasteel/tech/techmaint,
 /area/ship/engineering)
 "xt" = (
-/obj/structure/chair/greyscale{
-	dir = 1
-	},
-/obj/effect/turf_decal/siding/thinplating/corner{
-	dir = 1
-	},
-/turf/open/floor/plastic,
+/obj/effect/turf_decal/trimline/opaque/red/line,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel,
 /area/ship/hallway/central)
 "xL" = (
 /obj/structure/cable{
@@ -1314,76 +1349,86 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
 	},
-/obj/machinery/door/firedoor/border_only{
-	dir = 4
-	},
 /obj/machinery/door/firedoor/border_only{
 	dir = 8
 	},
-/obj/effect/turf_decal/industrial/warning{
+/obj/machinery/door/firedoor/border_only{
 	dir = 4
 	},
+/obj/effect/turf_decal/trimline/opaque/red/line{
+	dir = 1
+	},
 /obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/plasteel/patterned,
+/turf/open/floor/plasteel,
 /area/ship/hallway/central)
 "yu" = (
-/obj/effect/turf_decal/corner/opaque/grey/diagonal,
-/obj/effect/turf_decal/siding/white{
-	dir = 10
+/obj/effect/turf_decal/trimline/opaque/red/warning{
+	dir = 8
 	},
-/obj/structure/bed,
-/obj/item/bedsheet/grey,
-/obj/item/radio/intercom/directional/west,
-/turf/open/floor/plasteel/dark,
-/area/ship/hallway/central)
+/obj/structure/closet/secure_closet/wall{
+	icon_state = "sec_wall";
+	req_access_txt = "1";
+	pixel_y = -29;
+	name = "ammo locker"
+	},
+/obj/item/ammo_box/magazine/gauss,
+/obj/item/ammo_box/ferropelletbox,
+/obj/item/ammo_box/c46x30mm_box,
+/obj/item/ammo_box/c46x30mm_box,
+/obj/item/ammo_box/magazine/wt550m9,
+/obj/item/ammo_box/magazine/wt550m9,
+/obj/item/ammo_box/magazine/wt550m9,
+/obj/item/ammo_box/magazine/wt550m9,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+	dir = 4
+	},
+/turf/open/floor/mineral/plastitanium,
+/area/ship/security/armory)
 "yE" = (
-/obj/effect/turf_decal/corner/opaque/grey/diagonal,
-/obj/effect/turf_decal/industrial/warning{
-	color = "#808080";
-	dir = 8
+/obj/effect/turf_decal/trimline/opaque/red/warning{
+	dir = 4
 	},
-/obj/effect/turf_decal/industrial/warning{
-	color = "#808080";
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/effect/turf_decal/industrial/caution{
 	dir = 4
 	},
-/obj/effect/decal/cleanable/blood/gibs/down,
-/turf/open/floor/plasteel/dark,
-/area/ship/hallway/central)
+/turf/open/floor/mineral/plastitanium,
+/area/ship/security/armory)
 "yI" = (
-/turf/closed/wall/mineral/titanium/nodiagonal,
-/area/ship/security)
+/obj/effect/turf_decal/corner/opaque/red/half{
+	dir = 4
+	},
+/obj/structure/table/reinforced,
+/obj/item/binoculars{
+	pixel_x = -7;
+	pixel_y = 4
+	},
+/obj/item/binoculars{
+	pixel_x = 7;
+	pixel_y = 0
+	},
+/obj/effect/turf_decal/trimline/opaque/red/warning{
+	dir = 8
+	},
+/obj/structure/sign/poster/official/ion_carbine{
+	pixel_x = -32;
+	pixel_y = 0
+	},
+/turf/open/floor/mineral/plastitanium,
+/area/ship/security/armory)
 "ze" = (
-/obj/effect/turf_decal/techfloor,
-/obj/structure/closet/secure_closet/wall{
-	icon_state = "generic_wall";
-	name = "equipment locker";
-	pixel_y = -28;
-	req_access_txt = "1";
-	req_access = list(58)
+/obj/structure/chair/plastic{
+	dir = 1
 	},
-/obj/item/clothing/glasses/hud/security/sunglasses,
-/obj/item/clothing/glasses/hud/security/sunglasses,
-/obj/item/clothing/glasses/hud/security/sunglasses,
-/obj/item/clothing/glasses/hud/security/sunglasses,
-/obj/item/clothing/gloves/combat,
-/obj/item/clothing/gloves/combat,
-/obj/item/clothing/gloves/combat,
-/obj/item/clothing/gloves/combat,
-/obj/item/storage/belt/military,
-/obj/item/storage/belt/military,
-/obj/item/storage/belt/military,
-/obj/item/storage/belt/military,
-/obj/item/clothing/mask/gas/sechailer,
-/obj/item/clothing/mask/gas/sechailer,
-/obj/item/clothing/mask/gas/sechailer,
-/obj/item/clothing/mask/gas/sechailer,
-/obj/item/clothing/suit/armor/vest/bulletproof,
-/obj/item/clothing/suit/armor/vest/bulletproof,
-/obj/item/clothing/suit/armor/vest/bulletproof,
-/obj/item/clothing/suit/armor/vest/bulletproof,
-/obj/item/megaphone/sec,
-/turf/open/floor/plasteel/tech,
-/area/ship/security)
+/obj/machinery/vending/boozeomat{
+	all_items_free = 1;
+	pixel_x = 0;
+	pixel_y = -32;
+	density = 0
+	},
+/obj/effect/turf_decal/siding/wood,
+/turf/open/floor/wood,
+/area/ship/crew/canteen)
 "zu" = (
 /obj/effect/spawner/structure/window/shuttle,
 /obj/machinery/door/poddoor{
@@ -1395,14 +1440,16 @@
 /obj/effect/turf_decal/siding/wood{
 	dir = 5
 	},
-/obj/effect/decal/cleanable/dirt/dust,
 /obj/machinery/suit_storage_unit/inherit,
 /obj/item/tank/internals/oxygen,
 /obj/effect/turf_decal/siding/wood/corner{
 	dir = 8
 	},
 /obj/item/clothing/mask/gas/sechailer/swat,
-/obj/item/clothing/suit/space/hardsuit/ert/lp,
+/obj/item/clothing/suit/space/hardsuit/security/hos{
+	slowdown = 0;
+	desc = "A special bulky suit that protects against hazardous, low pressure environments. Has an additional layer of armor. This one seems to be modified with advanced servos and lightweight materials."
+	},
 /turf/open/floor/wood,
 /area/ship/bridge)
 "Ab" = (
@@ -1425,17 +1472,53 @@
 /obj/machinery/door/airlock/wood{
 	name = "Dormitories"
 	},
-/turf/open/floor/wood,
+/turf/open/floor/plasteel/telecomms_floor,
 /area/ship/crew)
-"At" = (
-/obj/effect/turf_decal/siding/white{
-	dir = 9
+"Am" = (
+/obj/effect/turf_decal/corner/opaque/red/half{
+	dir = 8
+	},
+/obj/machinery/power/apc/auto_name/directional/north,
+/obj/structure/cable{
+	icon_state = "0-8"
 	},
-/obj/effect/turf_decal/ntspaceworks_small/right{
+/obj/structure/closet/secure_closet{
+	icon_state = "armory";
+	name = "security tools locker";
+	req_access_txt = "1"
+	},
+/obj/item/restraints/legcuffs/bola/energy,
+/obj/item/restraints/legcuffs/bola/energy,
+/obj/item/restraints/legcuffs/bola/energy,
+/obj/item/restraints/legcuffs/bola/energy,
+/obj/item/restraints/legcuffs/bola/energy,
+/obj/item/shield/riot/tele{
+	pixel_x = 8;
+	pixel_y = 4
+	},
+/obj/item/shield/riot/tele{
+	pixel_x = -7;
+	pixel_y = 4
+	},
+/obj/item/shield/riot/tele,
+/obj/item/reagent_containers/spray/pepper,
+/obj/item/reagent_containers/spray/pepper,
+/obj/effect/turf_decal/trimline/opaque/red/warning{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
-/area/ship/hallway/central)
+/turf/open/floor/mineral/plastitanium,
+/area/ship/security/armory)
+"At" = (
+/obj/structure/chair/plastic,
+/obj/machinery/airalarm/directional/east,
+/obj/machinery/door/firedoor/border_only{
+	dir = 1
+	},
+/obj/effect/turf_decal/siding/wood{
+	dir = 5
+	},
+/turf/open/floor/wood,
+/area/ship/crew/canteen)
 "Bg" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/docking_port/mobile{
@@ -1445,15 +1528,11 @@
 	port_direction = 8;
 	preferred_direction = 4
 	},
-/obj/machinery/door/poddoor{
-	id = "minutecop_cargohatch";
-	name = "Cargo Bay Blast Door"
-	},
-/turf/open/floor/plasteel/patterned/ridged,
-/area/ship/cargo)
+/turf/closed/wall/mineral/titanium/nodiagonal,
+/area/ship/medical)
 "Bk" = (
-/turf/closed/wall/mineral/titanium,
-/area/ship/cargo)
+/turf/closed/wall/mineral/titanium/nodiagonal,
+/area/ship/crew/canteen)
 "Bu" = (
 /obj/effect/turf_decal/siding/thinplating/dark{
 	dir = 6
@@ -1464,190 +1543,107 @@
 	pixel_x = -12;
 	pixel_y = -16
 	},
-/obj/structure/table,
-/obj/item/storage/box/handcuffs{
-	pixel_x = -5;
-	pixel_y = 3
-	},
-/obj/machinery/recharger{
-	pixel_x = 8;
-	pixel_y = 3
-	},
-/obj/item/gps{
-	gpstag = null;
-	pixel_x = -9;
-	pixel_y = 7
-	},
 /obj/structure/cable{
 	icon_state = "0-1"
 	},
-/obj/structure/reagent_dispensers/peppertank{
-	pixel_x = 31
+/obj/effect/turf_decal/trimline/opaque/blue/warning{
+	dir = 8
 	},
-/turf/open/floor/plasteel/patterned,
-/area/ship/cargo)
-"BA" = (
-/obj/effect/turf_decal/techfloor{
-	dir = 10
+/obj/machinery/computer/crew{
+	dir = 1
 	},
+/obj/effect/turf_decal/trimline/opaque/blue/line{
+	dir = 4
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/medical)
+"BA" = (
 /obj/machinery/light/directional/south,
-/obj/machinery/autolathe,
-/obj/item/stack/sheet/metal/fifty,
-/obj/item/stack/sheet/glass/fifty{
-	pixel_x = 6
+/obj/structure/chair/plastic{
+	dir = 1
 	},
-/turf/open/floor/plasteel/tech,
-/area/ship/security)
-"BE" = (
-/obj/effect/turf_decal/techfloor{
-	dir = 5
+/obj/effect/turf_decal/siding/wood{
+	dir = 10
 	},
+/turf/open/floor/wood,
+/area/ship/crew/canteen)
+"BE" = (
 /obj/machinery/firealarm/directional/north,
-/obj/structure/bodycontainer/morgue{
-	dir = 2
-	},
 /obj/structure/sign/nanotrasen{
 	pixel_x = 32
 	},
-/turf/open/floor/plasteel/tech,
-/area/ship/medical)
+/obj/effect/turf_decal/trimline/opaque/brown/filled/arrow_ccw{
+	dir = 4
+	},
+/obj/machinery/suit_storage_unit/inherit,
+/obj/item/tank/internals/oxygen,
+/obj/item/clothing/suit/space{
+	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.";
+	armor = list("melee" = 30, "bullet" = 15, "laser" = 15, "energy" = 40, "bomb" = 20, "bio" = 100, "rad" = 30, "fire" = 75, "acid" = 75)
+	},
+/obj/item/clothing/head/helmet/space/light{
+	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)
+	},
+/turf/open/floor/plasteel/patterned,
+/area/ship/cargo)
 "BG" = (
-/obj/structure/curtain/cloth/grey,
-/obj/structure/bed,
-/obj/item/bedsheet/dorms,
 /obj/structure/sign/poster/official/no_erp{
 	pixel_x = -32
 	},
 /obj/machinery/newscaster/directional/north,
-/turf/open/floor/carpet/royalblue,
+/obj/machinery/airalarm/directional/west,
+/obj/structure/bed,
+/obj/item/bedsheet/nanotrasen,
+/obj/structure/curtain/cloth,
+/turf/open/floor/plasteel/tech/grid,
 /area/ship/crew)
 "BN" = (
-/obj/effect/turf_decal/techfloor,
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
 	dir = 4
 	},
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/plasteel/tech,
-/area/ship/security)
+/obj/effect/turf_decal/siding/wood,
+/turf/open/floor/wood,
+/area/ship/crew/canteen)
 "Ci" = (
 /obj/structure/sign/warning/docking,
 /turf/closed/wall/mineral/titanium,
-/area/ship/hallway/central)
+/area/ship/security/armory)
 "Cm" = (
-/obj/effect/turf_decal/corner/opaque/blue/border{
-	dir = 10
+/obj/effect/turf_decal/trimline/opaque/brown/warning{
+	dir = 4
 	},
-/obj/structure/chair/office{
-	dir = 4;
-	name = "tactical swivel chair"
+/obj/effect/turf_decal/trimline/opaque/brown/line{
+	dir = 8
 	},
-/turf/open/floor/plasteel/dark,
-/area/ship/medical)
+/turf/open/floor/plasteel/patterned,
+/area/ship/cargo)
 "Co" = (
-/obj/effect/turf_decal/techfloor{
-	dir = 1
-	},
-/obj/structure/closet/wall/red{
-	name = "Ammo locker";
-	pixel_y = 28;
-	pixel_x = -7;
-	dir = 1
-	},
-/obj/item/stock_parts/cell/gun{
+/obj/structure/table,
+/obj/item/reagent_containers/food/drinks/beer{
 	pixel_x = -4;
-	maxcharge = 20000;
-	pixel_y = -4;
-	name = "special weapon power cell"
-	},
-/obj/item/stock_parts/cell/gun{
-	pixel_x = 4;
-	maxcharge = 20000;
-	pixel_y = -4;
-	name = "special weapon power cell"
-	},
-/obj/item/stock_parts/cell/gun{
-	pixel_x = 10;
-	maxcharge = 20000;
-	pixel_y = 5;
-	name = "special weapon power cell"
-	},
-/obj/item/stock_parts/cell/gun{
-	maxcharge = 20000;
-	pixel_y = 5;
-	name = "special weapon power cell"
-	},
-/obj/item/stock_parts/cell/gun{
-	maxcharge = 20000;
-	pixel_y = 5;
-	name = "special weapon power cell";
-	pixel_x = -8
-	},
-/obj/item/stock_parts/cell/gun{
-	maxcharge = 20000;
-	pixel_y = -5;
-	name = "special weapon power cell";
-	pixel_x = -8
-	},
-/obj/item/stock_parts/cell/gun{
-	maxcharge = 20000;
-	pixel_y = -5;
-	name = "special weapon power cell";
-	pixel_x = 11
-	},
-/obj/item/stock_parts/cell/gun{
-	maxcharge = 20000;
-	pixel_y = 7;
-	name = "special weapon power cell";
-	pixel_x = 11
-	},
-/obj/item/stock_parts/cell/gun{
-	maxcharge = 20000;
-	pixel_y = 7;
-	name = "special weapon power cell";
-	pixel_x = -6
+	pixel_y = 3
 	},
-/obj/item/stock_parts/cell/gun{
-	maxcharge = 20000;
-	pixel_y = 7;
-	name = "special weapon power cell";
-	pixel_x = 1
+/obj/item/reagent_containers/food/drinks/soda_cans/cola{
+	pixel_x = 8;
+	pixel_y = 2
 	},
-/turf/open/floor/plasteel/tech,
-/area/ship/security)
+/turf/open/floor/wood,
+/area/ship/crew/canteen)
 "Cr" = (
-/obj/machinery/light/directional/west,
-/obj/effect/turf_decal/siding/white{
+/obj/effect/turf_decal/trimline/opaque/red/warning{
 	dir = 8
 	},
-/obj/structure/bed,
-/obj/effect/turf_decal/corner/opaque/grey/diagonal,
-/obj/item/bedsheet/grey,
-/obj/structure/window/reinforced{
-	dir = 1
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+	dir = 4
 	},
-/turf/open/floor/plasteel/dark,
-/area/ship/hallway/central)
+/turf/open/floor/mineral/plastitanium,
+/area/ship/security/armory)
 "CA" = (
-/obj/structure/table/reinforced,
-/obj/effect/turf_decal/siding/thinplating{
-	dir = 5
-	},
-/obj/machinery/computer/secure_data/laptop{
-	pixel_x = 6;
-	pixel_y = 4
-	},
-/obj/item/paper_bin{
-	pixel_x = -9;
-	pixel_y = 4
-	},
-/obj/item/pen{
-	pixel_x = -10;
-	pixel_y = 4
-	},
 /obj/structure/sign/poster/contraband/ntos{
 	pixel_y = 32
 	},
-/turf/open/floor/plastic,
+/turf/closed/wall/mineral/titanium/nodiagonal,
 /area/ship/hallway/central)
 "Ds" = (
 /obj/effect/spawner/structure/window/shuttle,
@@ -1657,30 +1653,40 @@
 /turf/open/floor/plating,
 /area/ship/crew)
 "DJ" = (
-/obj/effect/turf_decal/siding/white{
-	dir = 8
+/obj/machinery/light/directional/west,
+/obj/structure/guncloset{
+	anchored = 1
 	},
-/obj/effect/turf_decal/ntspaceworks_small/left{
+/obj/effect/turf_decal/corner/opaque/red/half{
 	dir = 4
 	},
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/plasteel,
-/area/ship/hallway/central)
-"DS" = (
-/obj/effect/turf_decal/siding/white{
-	dir = 5
+/obj/item/gun/ballistic/automatic/smg/wt550{
+	pixel_x = 0;
+	pixel_y = -9
+	},
+/obj/item/gun/ballistic/automatic/smg/wt550{
+	pixel_x = 0;
+	pixel_y = 0
 	},
-/obj/structure/chair/greyscale{
+/obj/item/gun/ballistic/automatic/powered/gauss{
+	pixel_x = 0;
+	pixel_y = 9
+	},
+/obj/effect/turf_decal/trimline/opaque/red/warning{
 	dir = 8
 	},
-/obj/machinery/button/flasher{
-	dir = 8;
-	id = "minuteman_cell1";
-	pixel_x = 21;
-	pixel_y = -11
+/turf/open/floor/mineral/plastitanium,
+/area/ship/security/armory)
+"DS" = (
+/obj/structure/chair/plastic,
+/obj/machinery/door/firedoor/border_only{
+	dir = 1
 	},
-/turf/open/floor/plasteel,
-/area/ship/hallway/central)
+/obj/effect/turf_decal/siding/wood{
+	dir = 1
+	},
+/turf/open/floor/wood,
+/area/ship/crew/canteen)
 "DY" = (
 /obj/effect/turf_decal/industrial/hatch/yellow,
 /obj/effect/mapping_helpers/airlock/cyclelink_helper,
@@ -1694,32 +1700,6 @@
 /turf/open/floor/plasteel/patterned/grid,
 /area/ship/hallway/central)
 "Ea" = (
-/obj/effect/turf_decal/siding/wood{
-	dir = 5
-	},
-/obj/structure/chair/office/light{
-	pixel_y = 3
-	},
-/obj/machinery/power/apc/auto_name/directional/east,
-/obj/structure/cable{
-	icon_state = "0-8"
-	},
-/obj/machinery/light_switch{
-	dir = 8;
-	pixel_x = 19;
-	pixel_y = -12
-	},
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/wood,
-/area/ship/crew)
-"Eo" = (
-/obj/effect/turf_decal/siding/wood{
-	dir = 10
-	},
-/obj/structure/closet/wall{
-	name = "uniform closet";
-	pixel_y = -30
-	},
 /obj/item/radio/headset/nanotrasen/alt,
 /obj/item/radio/headset/nanotrasen/alt,
 /obj/item/radio/headset/nanotrasen/alt,
@@ -1727,43 +1707,50 @@
 /obj/item/flashlight/seclite,
 /obj/item/flashlight/seclite,
 /obj/item/flashlight/seclite,
-/obj/item/flashlight/seclite,
-/obj/item/clothing/shoes/combat,
 /obj/item/clothing/shoes/combat,
 /obj/item/clothing/shoes/combat,
 /obj/item/clothing/shoes/combat,
 /obj/item/melee/knife/survival,
 /obj/item/melee/knife/survival,
 /obj/item/melee/knife/survival,
-/obj/item/melee/knife/survival,
 /obj/item/storage/backpack/security,
 /obj/item/storage/backpack/security,
 /obj/item/storage/backpack/security,
-/obj/item/storage/backpack/security,
-/obj/item/clothing/suit/armor/vest/security/officer,
-/obj/item/clothing/suit/armor/vest/security/officer,
-/obj/item/clothing/under/rank/security/head_of_security/nt/lp,
-/obj/item/clothing/under/rank/security/head_of_security/nt/lp,
-/obj/item/clothing/under/rank/security/head_of_security/nt/lp,
-/obj/item/clothing/under/rank/security/head_of_security/nt/lp,
+/obj/item/clothing/under/nanotrasen/security,
+/obj/item/clothing/under/nanotrasen/security,
+/obj/item/clothing/under/nanotrasen/security,
+/obj/item/clothing/head/nanotrasen/beret/security,
+/obj/item/clothing/head/nanotrasen/beret/security,
+/obj/item/clothing/head/nanotrasen/beret/security,
+/obj/item/clothing/head/nanotrasen/cap/security,
+/obj/item/clothing/head/nanotrasen/cap/security,
+/obj/item/clothing/head/nanotrasen/cap/security,
+/obj/structure/closet/wall{
+	dir = 4;
+	pixel_x = 30
+	},
+/obj/effect/turf_decal/siding/wideplating/dark,
+/obj/effect/turf_decal/siding/wideplating/dark{
+	dir = 1
+	},
+/turf/open/floor/plasteel/telecomms_floor,
+/area/ship/crew)
+"Eo" = (
 /obj/machinery/firealarm/directional/west,
-/turf/open/floor/wood,
+/obj/structure/bed,
+/obj/item/bedsheet/nanotrasen,
+/obj/structure/curtain/cloth,
+/turf/open/floor/plasteel/tech/grid,
 /area/ship/crew)
 "Es" = (
-/obj/structure/bed,
-/obj/item/bedsheet/grey,
-/obj/effect/turf_decal/corner/opaque/grey/diagonal,
-/obj/machinery/flasher{
-	id = "minuteman_cell1";
-	pixel_x = -25
+/obj/effect/turf_decal/trimline/opaque/red/warning{
+	dir = 8
 	},
-/obj/item/flashlight/glowstick/orange,
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/turf_decal/siding/white{
+/obj/effect/turf_decal/industrial/caution{
 	dir = 8
 	},
-/turf/open/floor/plasteel/dark,
-/area/ship/hallway/central)
+/turf/open/floor/mineral/plastitanium,
+/area/ship/security/armory)
 "Ew" = (
 /obj/effect/turf_decal/techfloor{
 	dir = 10
@@ -1772,8 +1759,6 @@
 	pixel_x = -4
 	},
 /obj/item/radio/intercom/wideband/directional/west,
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/table/reinforced,
 /obj/item/folder/blue{
 	pixel_x = 6;
 	pixel_y = 6
@@ -1790,34 +1775,41 @@
 	pixel_x = -6;
 	pixel_y = 5
 	},
-/obj/item/stamp/captain{
-	pixel_x = -8;
-	pixel_y = 12
-	},
 /obj/machinery/light/small/directional/south{
 	pixel_x = 10
 	},
+/obj/item/stamp/hos{
+	pixel_x = -9;
+	pixel_y = -6
+	},
+/obj/item/stamp/nt/captain{
+	pixel_x = 0;
+	pixel_y = -6
+	},
+/obj/structure/table/reinforced/titaniumglass,
+/obj/item/spacecash/bundle/c1000,
+/obj/item/spacecash/bundle/c500{
+	pixel_x = 5;
+	pixel_y = 8
+	},
 /turf/open/floor/plasteel/tech,
 /area/ship/bridge)
 "EO" = (
 /turf/closed/wall/mineral/titanium,
 /area/ship/bridge)
 "ER" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/power/shieldwallgen/atmos{
-	anchored = 1;
-	dir = 4;
-	id = "corvus_cargo";
+/obj/machinery/power/shieldwallgen/atmos/roundstart{
+	dir = 8;
+	id = "darect_cargo";
 	locked = 1
 	},
-/obj/machinery/door/poddoor{
-	id = "minutecop_cargohatch";
-	name = "Cargo Bay Blast Door"
-	},
 /obj/structure/cable{
 	icon_state = "0-2"
 	},
-/turf/open/floor/plasteel/patterned/ridged,
+/obj/machinery/door/poddoor{
+	id = "darect_cargodoors"
+	},
+/turf/open/floor/engine,
 /area/ship/cargo)
 "EW" = (
 /obj/machinery/porta_turret/ship/faction/nanotrasen{
@@ -1839,35 +1831,42 @@
 /obj/structure/cable{
 	icon_state = "1-8"
 	},
-/turf/open/floor/carpet/nanoweave,
+/obj/effect/turf_decal/trimline/opaque/ntblue/line,
+/obj/effect/turf_decal/trimline/opaque/ntblue/warning{
+	dir = 1
+	},
+/turf/open/floor/plasteel/dark,
 /area/ship/hallway/central)
 "Fy" = (
 /obj/item/radio/intercom/directional/west,
-/obj/effect/decal/cleanable/dirt/dust,
 /obj/machinery/light/directional/south,
 /obj/structure/bed,
-/obj/item/bedsheet/blue,
-/obj/structure/curtain/bounty,
-/turf/open/floor/carpet/royalblue,
+/obj/item/bedsheet/hos,
+/obj/structure/curtain/cloth/fancy,
+/turf/open/floor/carpet/red_gold,
 /area/ship/bridge)
 "Fz" = (
 /obj/effect/turf_decal/siding/thinplating/dark{
 	dir = 1
 	},
 /turf/closed/wall/mineral/titanium/nodiagonal,
-/area/ship/medical)
+/area/ship/cargo)
 "FD" = (
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/effect/turf_decal/trimline/opaque/red/line{
 	dir = 1
 	},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
-/obj/effect/turf_decal/siding/thinplating{
-	dir = 6
+/obj/structure/sign/departments/security{
+	pixel_x = 0;
+	pixel_y = -32
 	},
-/turf/open/floor/plastic,
+/turf/open/floor/plasteel,
 /area/ship/hallway/central)
 "FW" = (
 /obj/machinery/atmospherics/components/unary/outlet_injector/on/layer4{
@@ -1880,8 +1879,14 @@
 	dir = 8
 	},
 /obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/plasteel/patterned,
-/area/ship/cargo)
+/obj/effect/turf_decal/trimline/opaque/blue/warning{
+	dir = 4
+	},
+/obj/effect/turf_decal/trimline/opaque/blue/line{
+	dir = 8
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/medical)
 "Gf" = (
 /turf/closed/wall/mineral/titanium/nodiagonal,
 /area/ship/hallway/central)
@@ -1909,7 +1914,7 @@
 	dir = 1
 	},
 /obj/effect/turf_decal/industrial/outline/yellow,
-/obj/structure/reagent_dispensers/watertank,
+/obj/structure/reagent_dispensers/fueltank,
 /turf/open/floor/plasteel/tech/techmaint,
 /area/ship/engineering)
 "Gu" = (
@@ -1919,17 +1924,20 @@
 /turf/closed/wall/mineral/titanium,
 /area/ship/bridge)
 "Gv" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
-	dir = 1
+/obj/machinery/power/shieldwallgen/atmos/roundstart{
+	dir = 4;
+	id = "darect_cargo";
+	locked = 1
 	},
-/obj/machinery/vending/wallmed{
-	pixel_y = -28
+/obj/structure/cable{
+	icon_state = "0-2"
 	},
-/obj/item/kirbyplants/random,
-/turf/open/floor/plasteel/patterned,
-/area/ship/hallway/central)
+/obj/machinery/door/poddoor{
+	id = "darect_cargodoors"
+	},
+/turf/open/floor/engine,
+/area/ship/cargo)
 "Gz" = (
-/obj/effect/turf_decal/techfloor,
 /obj/structure/cable{
 	icon_state = "2-4"
 	},
@@ -1939,9 +1947,11 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 6
 	},
-/obj/effect/decal/cleanable/plasma,
-/turf/open/floor/plasteel/tech,
-/area/ship/medical)
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/plasteel/patterned,
+/area/ship/cargo)
 "GF" = (
 /obj/machinery/computer/helm{
 	dir = 8
@@ -1955,45 +1965,57 @@
 /obj/effect/turf_decal/siding/white/corner{
 	dir = 4
 	},
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/decal/cleanable/glass,
-/turf/open/floor/plasteel,
-/area/ship/hallway/central)
-"Ha" = (
-/obj/effect/turf_decal/corner/opaque/grey/diagonal,
-/obj/structure/toilet{
-	pixel_y = 1;
-	dir = 8;
-	pixel_x = 9
-	},
-/obj/effect/decal/cleanable/vomit/old{
-	pixel_x = 5
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/structure/cable{
+	icon_state = "1-2"
 	},
-/obj/effect/decal/cleanable/wrapping,
-/obj/effect/turf_decal/siding/white{
+/obj/effect/turf_decal/trimline/opaque/red/warning{
 	dir = 4
 	},
-/obj/structure/curtain/bounty,
-/turf/open/floor/plasteel/dark,
-/area/ship/hallway/central)
-"Hl" = (
-/obj/effect/turf_decal/siding/wood{
-	dir = 6
+/obj/machinery/door/poddoor/shutters{
+	id = "darect_armory";
+	name = "Armory"
 	},
-/obj/structure/table/wood,
-/obj/item/modular_computer/laptop/preset/civilian{
-	pixel_x = 12;
-	pixel_y = 3
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 1
 	},
-/obj/item/flashlight/lamp{
-	pixel_x = -5;
-	pixel_y = 10
+/turf/open/floor/mineral/plastitanium,
+/area/ship/security/armory)
+"Ha" = (
+/obj/effect/turf_decal/corner/opaque/red/half{
+	dir = 8
+	},
+/obj/structure/table/reinforced,
+/obj/item/clothing/glasses/hud/security/night{
+	pixel_x = 7;
+	pixel_y = 2
+	},
+/obj/item/clothing/glasses/hud/security/night{
+	pixel_x = 0;
+	pixel_y = 2
 	},
-/obj/item/reagent_containers/food/drinks/mug{
-	pixel_x = -6
+/obj/item/clothing/glasses/hud/security/night{
+	pixel_x = -8;
+	pixel_y = 2
+	},
+/obj/effect/turf_decal/trimline/opaque/red/warning{
+	dir = 4
 	},
+/obj/structure/sign/poster/official/love_ian{
+	pixel_x = 32;
+	pixel_y = 0
+	},
+/turf/open/floor/mineral/plastitanium,
+/area/ship/security/armory)
+"Hl" = (
 /obj/machinery/light/directional/south,
-/turf/open/floor/wood,
+/obj/machinery/cryopod{
+	dir = 8
+	},
+/obj/effect/turf_decal/industrial/warning/cee{
+	dir = 8
+	},
+/turf/open/floor/plasteel/tech/grid,
 /area/ship/crew)
 "Hw" = (
 /obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2,
@@ -2002,43 +2024,52 @@
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/hallway/central)
 "Ip" = (
-/obj/effect/turf_decal/steeldecal/steel_decals_central4{
-	dir = 1
-	},
-/turf/open/floor/plasteel/patterned,
-/area/ship/cargo)
-"IF" = (
-/obj/machinery/airalarm/directional/west,
-/obj/structure/rack,
-/obj/item/gun/energy/disabler{
-	pixel_y = 2
+/obj/structure/closet/secure_closet{
+	icon_state = "med";
+	name = "medical supplies's locker";
+	req_access_txt = "5"
 	},
-/obj/item/melee/baton/loaded,
-/obj/item/melee/baton/loaded{
-	pixel_x = 3;
-	pixel_y = -2
+/obj/item/storage/firstaid/brute{
+	pixel_x = 6;
+	pixel_y = -5
 	},
-/obj/item/reagent_containers/spray/pepper{
-	pixel_x = 3;
-	pixel_y = -4
+/obj/item/storage/firstaid/fire{
+	pixel_x = -8;
+	pixel_y = 5
 	},
-/obj/item/reagent_containers/spray/pepper{
+/obj/item/storage/firstaid/o2{
 	pixel_x = 8;
-	pixel_y = -4
+	pixel_y = 4
 	},
-/obj/effect/turf_decal/techfloor{
-	dir = 9
+/obj/item/storage/pill_bottle/epinephrine{
+	pixel_x = -1;
+	pixel_y = -7
+	},
+/obj/item/storage/pill_bottle/iron{
+	pixel_x = -6;
+	pixel_y = -7
 	},
-/obj/item/gun/energy/disabler{
-	pixel_y = 6;
-	pixel_x = -3
+/obj/item/storage/pill_bottle/charcoal{
+	pixel_x = -11;
+	pixel_y = -7
 	},
-/obj/item/key/security{
-	pixel_x = -10;
-	pixel_y = -10
+/turf/open/floor/plasteel/dark,
+/area/ship/medical)
+"IF" = (
+/obj/structure/table,
+/obj/item/clothing/head/helmet/blueshirt{
+	pixel_x = 7;
+	pixel_y = 9
 	},
-/turf/open/floor/plasteel/tech,
-/area/ship/security)
+/obj/item/reagent_containers/food/snacks/burger/cheese{
+	pixel_x = -5;
+	pixel_y = -1
+	},
+/obj/effect/turf_decal/siding/wood{
+	dir = 8
+	},
+/turf/open/floor/wood,
+/area/ship/crew/canteen)
 "IX" = (
 /turf/closed/wall/mineral/titanium/nodiagonal,
 /area/ship/engineering)
@@ -2056,36 +2087,33 @@
 /obj/effect/turf_decal/techfloor{
 	dir = 1
 	},
-/obj/effect/turf_decal/box,
-/obj/machinery/suit_storage_unit/inherit/industrial,
-/obj/item/tank/jetpack,
-/obj/machinery/door/window/northleft,
-/obj/item/clothing/mask/gas/sechailer,
-/obj/item/clothing/suit/space/hardsuit/ert/lp/sec,
+/obj/structure/table,
+/obj/structure/closet/secure_closet/freezer/kitchen/wall/directional/south,
+/obj/item/reagent_containers/condiment/enzyme,
+/obj/item/reagent_containers/condiment/flour,
+/obj/item/reagent_containers/condiment/flour,
+/obj/item/reagent_containers/condiment/flour,
+/obj/item/reagent_containers/food/snacks/meat/slab/monkey,
+/obj/item/reagent_containers/food/snacks/meat/slab/monkey,
+/obj/item/reagent_containers/food/snacks/meat/slab/monkey,
 /turf/open/floor/plasteel/tech/grid,
-/area/ship/security)
+/area/ship/crew/canteen)
 "Ju" = (
 /obj/effect/turf_decal/siding/thinplating/dark{
 	dir = 4
 	},
-/obj/effect/turf_decal/industrial/stand_clear,
-/obj/machinery/button/door{
-	dir = 8;
-	id = "minutecop_cargohatch";
-	name = "Cargo hatch";
-	pixel_x = 23;
-	pixel_y = 10
-	},
-/obj/machinery/button/shieldwallgen{
-	dir = 8;
-	id = "corvus_cargo";
-	pixel_x = 21
+/obj/effect/turf_decal/trimline/opaque/blue/line{
+	dir = 4
 	},
-/obj/structure/cable{
-	icon_state = "1-10"
+/obj/effect/turf_decal/trimline/opaque/blue/warning{
+	dir = 8
 	},
-/turf/open/floor/plasteel/patterned,
-/area/ship/cargo)
+/obj/machinery/suit_storage_unit/inherit,
+/obj/item/tank/internals/oxygen,
+/obj/item/clothing/suit/space/hardsuit/medical,
+/obj/item/clothing/mask/breath/medical,
+/turf/open/floor/plasteel/dark,
+/area/ship/medical)
 "JE" = (
 /obj/effect/turf_decal/steeldecal/steel_decals10{
 	dir = 9
@@ -2093,7 +2121,6 @@
 /obj/effect/turf_decal/steeldecal/steel_decals10{
 	dir = 10
 	},
-/obj/effect/decal/cleanable/dirt/dust,
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
@@ -2101,43 +2128,34 @@
 /obj/effect/turf_decal/siding/thinplating/dark{
 	dir = 10
 	},
-/obj/vehicle/ridden/secway,
 /obj/machinery/airalarm/directional/south,
-/turf/open/floor/plasteel/patterned,
-/area/ship/cargo)
+/obj/effect/turf_decal/trimline/opaque/blue/warning{
+	dir = 4
+	},
+/obj/effect/turf_decal/trimline/opaque/blue/line{
+	dir = 8
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/medical)
 "Kz" = (
-/obj/effect/turf_decal/corner/opaque/grey/diagonal,
 /obj/effect/turf_decal/industrial/warning{
 	color = "#808080";
 	dir = 1
 	},
-/obj/structure/chair/comfy/shuttle{
-	dir = 4;
-	name = "Helm"
+/obj/machinery/computer/operating{
+	dir = 4
 	},
-/turf/open/floor/plasteel/dark,
-/area/ship/cargo)
+/obj/effect/turf_decal/corner/opaque/blue/diagonal,
+/turf/open/floor/plasteel/tech,
+/area/ship/medical)
 "Ld" = (
-/obj/effect/turf_decal/siding/thinplating{
-	dir = 10
-	},
-/obj/structure/table/reinforced,
-/obj/effect/spawner/lootdrop/ration,
-/obj/effect/spawner/lootdrop/ration,
-/obj/effect/spawner/lootdrop/ration,
-/obj/effect/spawner/lootdrop/ration,
-/obj/item/trash/chips{
-	pixel_x = 7;
-	pixel_y = 6
-	},
-/obj/item/newspaper{
-	pixel_x = -8;
-	pixel_y = 12
-	},
 /obj/item/radio/intercom/directional/west{
 	pixel_y = 10
 	},
-/turf/open/floor/plastic,
+/obj/effect/turf_decal/trimline/opaque/red/corner{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
 /area/ship/hallway/central)
 "Lj" = (
 /obj/effect/turf_decal/siding/thinplating/dark{
@@ -2148,8 +2166,14 @@
 /obj/machinery/firealarm/directional/east{
 	pixel_y = -12
 	},
-/turf/open/floor/plasteel/patterned,
-/area/ship/cargo)
+/obj/effect/turf_decal/trimline/opaque/blue/warning{
+	dir = 8
+	},
+/obj/effect/turf_decal/trimline/opaque/blue/line{
+	dir = 4
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/medical)
 "Lq" = (
 /obj/structure/window/reinforced{
 	dir = 8
@@ -2172,7 +2196,6 @@
 	},
 /area/ship/bridge)
 "Mh" = (
-/obj/machinery/door/firedoor,
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
@@ -2182,20 +2205,19 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 1
 	},
-/obj/machinery/door/poddoor/shutters{
-	id = "nthip_armorybay";
-	name = "Weapon Hold"
+/obj/machinery/door/firedoor/border_only{
+	dir = 1
 	},
-/turf/open/floor/plasteel/tech,
-/area/ship/security)
+/obj/effect/turf_decal/siding/wood{
+	dir = 1
+	},
+/turf/open/floor/wood,
+/area/ship/crew/canteen)
 "Mt" = (
 /obj/effect/turf_decal/siding/thinplating/dark/corner{
 	dir = 4
 	},
 /obj/effect/turf_decal/siding/thinplating/dark/corner,
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
 /obj/structure/cable{
 	icon_state = "2-4"
 	},
@@ -2205,8 +2227,14 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 8
 	},
-/turf/open/floor/plasteel/patterned,
-/area/ship/cargo)
+/obj/effect/turf_decal/trimline/opaque/blue/warning{
+	dir = 8
+	},
+/obj/effect/turf_decal/trimline/opaque/blue/line{
+	dir = 4
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/medical)
 "Mu" = (
 /obj/effect/spawner/structure/window/shuttle,
 /obj/machinery/door/poddoor{
@@ -2239,7 +2267,6 @@
 	dir = 2;
 	layer = 4.1
 	},
-/obj/effect/decal/cleanable/dirt/dust,
 /obj/structure/chair/comfy/shuttle{
 	dir = 4;
 	name = "Helm"
@@ -2277,30 +2304,49 @@
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/engineering)
 "NL" = (
-/obj/effect/turf_decal/techfloor{
-	dir = 10
+/obj/machinery/light/directional/west,
+/obj/structure/rack,
+/obj/item/storage/bag/ore,
+/obj/item/pickaxe/drill,
+/obj/item/mining_scanner,
+/obj/effect/turf_decal/trimline/opaque/brown/filled/arrow_ccw{
+	dir = 8
 	},
-/turf/open/floor/plasteel/tech,
-/area/ship/medical)
+/obj/machinery/newscaster/directional/south{
+	pixel_x = 7;
+	pixel_y = -32
+	},
+/turf/open/floor/plasteel/patterned,
+/area/ship/cargo)
 "Ok" = (
 /obj/structure/closet/secure_closet{
-	icon_state = "cap";
-	name = "\proper captain's locker";
-	req_access_txt = "20"
+	icon_state = "hos";
+	name = "patrol leader's locker";
+	req_access_txt = "58"
 	},
-/obj/item/storage/backpack/captain,
 /obj/item/melee/classic_baton/telescopic,
-/obj/item/clothing/under/rank/security/head_of_security/alt/lp,
-/obj/item/clothing/under/rank/security/head_of_security/alt/skirt,
-/obj/item/clothing/suit/jacket/leather/duster/command,
 /obj/item/clothing/suit/jacket/miljacket,
-/obj/item/clothing/shoes/jackboots,
-/obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/turf_decal/siding/wood/end{
 	dir = 4
 	},
-/obj/item/gun/energy/laser/captain,
 /obj/item/tank/jetpack/suit,
+/obj/item/gun/energy/e_gun/hos,
+/obj/item/clothing/shoes/combat,
+/obj/item/clothing/neck/cloak/hos,
+/obj/item/clothing/suit/toggle/armor/hos_formal{
+	armor = list("melee" = 50, "bullet" = 40, "laser" = 50, "energy" = 50, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 90)
+	},
+/obj/item/clothing/head/nanotrasen/beret/security/command,
+/obj/item/clothing/suit/armor/nanotrasen/sec_director,
+/obj/item/clothing/under/nanotrasen/security/director,
+/obj/item/clothing/glasses/hud/security/night,
+/obj/item/clothing/suit/armor/nanotrasen,
+/obj/item/clothing/gloves/combat,
+/obj/item/melee/knife/switchblade,
+/obj/machinery/light/directional/east,
+/obj/item/stock_parts/cell/gun/upgraded,
+/obj/item/stock_parts/cell/gun/upgraded,
+/obj/item/radio/headset/nanotrasen/alt/captain,
 /turf/open/floor/wood,
 /area/ship/bridge)
 "OG" = (
@@ -2332,8 +2378,14 @@
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
 	dir = 4
 	},
-/turf/open/floor/plasteel/patterned,
-/area/ship/cargo)
+/obj/effect/turf_decal/trimline/opaque/blue/warning{
+	dir = 4
+	},
+/obj/effect/turf_decal/trimline/opaque/blue/line{
+	dir = 8
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/medical)
 "PE" = (
 /obj/machinery/power/port_gen/pacman,
 /obj/effect/turf_decal/industrial/warning{
@@ -2346,45 +2398,21 @@
 /turf/open/floor/plasteel/tech/techmaint,
 /area/ship/engineering)
 "Qj" = (
-/obj/effect/turf_decal/techfloor{
-	dir = 1
-	},
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
 	dir = 4
 	},
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/plasteel/tech,
-/area/ship/security)
+/turf/open/floor/wood,
+/area/ship/crew/canteen)
 "QS" = (
-/obj/item/radio,
-/obj/item/radio,
-/obj/item/radio,
-/obj/item/radio,
-/obj/item/radio,
-/obj/item/radio,
-/obj/structure/closet/wall{
-	name = "radio locker";
-	pixel_y = -28
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+	dir = 1
 	},
 /turf/open/floor/plasteel/patterned,
 /area/ship/hallway/central)
 "QY" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/power/shieldwallgen/atmos{
-	anchored = 1;
-	dir = 8;
-	id = "corvus_cargo";
-	locked = 1
-	},
-/obj/machinery/door/poddoor{
-	id = "minutecop_cargohatch";
-	name = "Cargo Bay Blast Door"
-	},
-/obj/structure/cable{
-	icon_state = "0-2"
-	},
-/turf/open/floor/plasteel/patterned/ridged,
-/area/ship/cargo)
+/turf/closed/wall/mineral/titanium/nodiagonal,
+/area/ship/medical)
 "Ri" = (
 /obj/machinery/power/smes/shuttle/precharged{
 	dir = 4
@@ -2430,6 +2458,16 @@
 "Sn" = (
 /turf/closed/wall/mineral/titanium/nodiagonal,
 /area/ship/crew)
+"SA" = (
+/obj/effect/turf_decal/trimline/opaque/red/warning{
+	dir = 8
+	},
+/obj/machinery/door/poddoor/shutters{
+	id = "darect_armory";
+	name = "Armory"
+	},
+/turf/open/floor/mineral/plastitanium,
+/area/ship/security/armory)
 "Tk" = (
 /obj/effect/turf_decal/techfloor/orange,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
@@ -2461,23 +2499,12 @@
 /turf/open/floor/plating,
 /area/ship/engineering)
 "TS" = (
-/obj/effect/turf_decal/corner/opaque/blue/border{
-	dir = 1
-	},
-/obj/structure/table/optable,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel/dark,
-/area/ship/medical)
-"Ua" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/cable{
-	icon_state = "2-5"
-	},
-/obj/structure/cable{
-	icon_state = "2-9"
-	},
 /turf/open/floor/plasteel/patterned,
 /area/ship/cargo)
+"Ua" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/dark,
+/area/ship/medical)
 "Um" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 1
@@ -2495,36 +2522,27 @@
 	dir = 1
 	},
 /obj/machinery/door/firedoor/border_only,
-/obj/machinery/door/airlock/medical{
-	name = "Surgery"
+/obj/machinery/door/airlock/mining{
+	name = "Cargo"
 	},
 /turf/open/floor/plasteel/patterned,
-/area/ship/medical)
+/area/ship/cargo)
 "Uq" = (
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 10
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 6
 	},
-/turf/open/floor/plasteel/patterned,
-/area/ship/cargo)
+/turf/open/floor/plasteel/dark,
+/area/ship/medical)
 "Uy" = (
 /turf/closed/wall/mineral/titanium/nodiagonal,
 /area/ship/cargo)
 "UH" = (
-/obj/structure/chair/greyscale{
-	dir = 8
-	},
-/obj/effect/turf_decal/siding/thinplating{
-	dir = 1
-	},
-/obj/effect/decal/cleanable/food/flour,
-/turf/open/floor/plastic,
+/obj/effect/turf_decal/trimline/opaque/red/line,
+/turf/open/floor/plasteel,
 /area/ship/hallway/central)
 "UP" = (
 /obj/machinery/atmospherics/pipe/layer_manifold,
@@ -2549,30 +2567,6 @@
 /obj/structure/extinguisher_cabinet/directional/east,
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/engineering)
-"Wl" = (
-/obj/effect/turf_decal/techfloor{
-	dir = 5
-	},
-/obj/machinery/firealarm/directional/north{
-	pixel_x = -6
-	},
-/obj/structure/closet/secure_closet{
-	icon_door = "tac";
-	icon_state = "tac";
-	name = "boarding tools locker";
-	req_access_txt = "3"
-	},
-/obj/item/grenade/c4,
-/obj/item/grenade/c4,
-/obj/item/grenade/c4,
-/obj/item/grenade/c4,
-/obj/item/grenade/c4,
-/obj/item/grenade/c4,
-/obj/item/door_seal,
-/obj/item/door_seal,
-/obj/item/door_seal,
-/turf/open/floor/plasteel/tech,
-/area/ship/security)
 "WR" = (
 /obj/structure/sign/nanotrasen,
 /turf/closed/wall/mineral/titanium,
@@ -2587,27 +2581,24 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/machinery/light/directional/south,
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/machinery/airalarm/directional/north,
 /turf/open/floor/plasteel/tech/techmaint,
 /area/ship/hallway/central)
 "WW" = (
-/obj/effect/turf_decal/corner/opaque/blue/border,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel/dark,
-/area/ship/medical)
+/obj/structure/cable{
+	icon_state = "2-5"
+	},
+/obj/structure/cable{
+	icon_state = "2-9"
+	},
+/turf/open/floor/plasteel/patterned,
+/area/ship/cargo)
 "WY" = (
 /obj/effect/turf_decal/techfloor/orange{
 	dir = 9
 	},
 /obj/effect/turf_decal/steeldecal/steel_decals2,
-/obj/item/wirecutters{
-	pixel_x = 6;
-	pixel_y = -8
-	},
 /obj/machinery/firealarm/directional/north{
 	pixel_x = 4
 	},
@@ -2620,7 +2611,9 @@
 	pixel_x = -10;
 	pixel_y = 24
 	},
-/obj/item/kirbyplants/random,
+/obj/structure/table,
+/obj/machinery/cell_charger,
+/obj/item/stock_parts/cell/high,
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/engineering)
 "Xr" = (
@@ -2629,7 +2622,6 @@
 	},
 /obj/effect/turf_decal/techfloor/corner,
 /obj/effect/turf_decal/steeldecal/steel_decals1,
-/obj/effect/decal/cleanable/dirt/dust,
 /obj/structure/chair/comfy/shuttle{
 	dir = 4;
 	name = "Helm"
@@ -2637,24 +2629,30 @@
 /turf/open/floor/plasteel/tech,
 /area/ship/bridge)
 "XL" = (
-/obj/effect/turf_decal/techfloor,
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
 	dir = 4
 	},
-/obj/effect/decal/cleanable/dirt,
 /obj/machinery/button/door{
-	id = "ntmed_windows";
-	name = "Window blastdoors";
-	pixel_x = -7;
+	id = "darect_cargodoors";
+	name = "Cargo Doors";
+	pixel_x = -6;
 	pixel_y = -24;
 	dir = 1
 	},
-/obj/machinery/newscaster/directional/south{
+/obj/effect/turf_decal/trimline/opaque/brown/warning{
+	dir = 4
+	},
+/obj/effect/turf_decal/trimline/opaque/brown/line{
+	dir = 8
+	},
+/obj/machinery/button/shieldwallgen{
+	id = "darect_cargo";
 	pixel_x = 7;
-	pixel_y = -32
+	pixel_y = -22;
+	dir = 1
 	},
-/turf/open/floor/plasteel/tech,
-/area/ship/medical)
+/turf/open/floor/plasteel/patterned,
+/area/ship/cargo)
 "XM" = (
 /obj/machinery/power/apc/auto_name/directional/west,
 /obj/structure/cable{
@@ -2671,23 +2669,9 @@
 	},
 /area/ship/bridge)
 "XR" = (
-/obj/effect/turf_decal/corner/opaque/grey/diagonal,
-/obj/structure/window/reinforced{
-	dir = 1
-	},
-/obj/effect/turf_decal/siding/white{
-	dir = 4
-	},
-/obj/machinery/shower{
-	pixel_y = -1;
-	dir = 8;
-	pixel_x = 4
-	},
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/item/soap/deluxe,
-/obj/structure/curtain/bounty,
-/turf/open/floor/plasteel/dark,
-/area/ship/hallway/central)
+/obj/item/reagent_containers/glass/bottle/vial/large/preloaded/combat,
+/turf/closed/wall/mineral/titanium/nodiagonal,
+/area/ship/engineering)
 "XU" = (
 /obj/effect/turf_decal/techfloor/orange{
 	dir = 5
@@ -2705,7 +2689,6 @@
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/engineering)
 "Yh" = (
-/obj/effect/decal/cleanable/dirt/dust,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 8
 	},
@@ -2717,7 +2700,6 @@
 "Yn" = (
 /obj/machinery/light/directional/north,
 /obj/machinery/holopad/emergency/command,
-/obj/effect/decal/cleanable/dirt/dust,
 /obj/machinery/turretid/lethal{
 	pixel_y = 24;
 	pixel_x = 17
@@ -2749,16 +2731,25 @@
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
 	dir = 4
 	},
+/obj/effect/turf_decal/ntspaceworks_small/right,
 /turf/open/floor/plasteel/patterned,
 /area/ship/hallway/central)
 "YE" = (
-/obj/effect/turf_decal/corner/opaque/blue/border{
-	dir = 9
+/obj/effect/turf_decal/trimline/opaque/brown/warning{
+	dir = 4
 	},
-/obj/machinery/computer/operating,
-/obj/machinery/light/directional/west,
-/turf/open/floor/plasteel/dark,
-/area/ship/medical)
+/obj/effect/turf_decal/trimline/opaque/brown/line{
+	dir = 8
+	},
+/obj/structure/cable{
+	icon_state = "1-6"
+	},
+/obj/structure/reagent_dispensers/peppertank{
+	pixel_x = -32;
+	pixel_y = 0
+	},
+/turf/open/floor/plasteel/patterned,
+/area/ship/cargo)
 "YG" = (
 /obj/effect/turf_decal/techfloor/orange{
 	dir = 1
@@ -2781,14 +2772,11 @@
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/engineering)
 "YL" = (
-/obj/effect/turf_decal/corner/opaque/grey/diagonal,
 /obj/machinery/computer/helm/viewscreen/directional/west,
-/obj/structure/chair/comfy/shuttle{
-	dir = 4;
-	name = "Helm"
-	},
-/turf/open/floor/plasteel/dark,
-/area/ship/cargo)
+/obj/structure/table/optable,
+/obj/effect/turf_decal/corner/opaque/blue/diagonal,
+/turf/open/floor/plasteel/tech,
+/area/ship/medical)
 "YM" = (
 /obj/structure/table/reinforced,
 /obj/effect/turf_decal/techfloor{
@@ -2820,7 +2808,19 @@
 	icon_state = "4-8"
 	},
 /obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/carpet/nanoweave,
+/obj/effect/turf_decal/trimline/opaque/ntblue/line{
+	dir = 10
+	},
+/obj/effect/turf_decal/trimline/opaque/ntblue/corner{
+	dir = 4
+	},
+/obj/machinery/button/door{
+	id = "darect_armory";
+	dir = 1;
+	pixel_y = -21;
+	name = "Armory Shutters"
+	},
+/turf/open/floor/plasteel/dark,
 /area/ship/hallway/central)
 "YT" = (
 /obj/machinery/porta_turret/ship/faction/nanotrasen{
@@ -2829,11 +2829,11 @@
 /turf/closed/wall/mineral/titanium,
 /area/ship/bridge)
 "Zh" = (
-/obj/structure/table/reinforced,
 /obj/effect/turf_decal/techfloor{
 	dir = 6
 	},
 /obj/machinery/fax,
+/obj/structure/table/reinforced/titaniumglass,
 /turf/open/floor/plasteel/tech,
 /area/ship/bridge)
 "Zt" = (
@@ -2926,11 +2926,11 @@ bA
 (6,1,1) = {"
 bA
 bA
-Bk
-Uy
-Uy
-Uy
-Uy
+OG
+uF
+uF
+uF
+uF
 IX
 wx
 uu
@@ -2941,8 +2941,8 @@ bA
 "}
 (7,1,1) = {"
 bA
-nG
-Uy
+OG
+uF
 Kz
 YL
 nI
@@ -2957,7 +2957,7 @@ bA
 "}
 (8,1,1) = {"
 bA
-ER
+QY
 iV
 Gd
 PA
@@ -2995,7 +2995,7 @@ Lj
 oj
 Mt
 Bu
-IX
+XR
 qb
 IX
 IX
@@ -3005,23 +3005,23 @@ bA
 "}
 (11,1,1) = {"
 bA
-ji
-uF
-uF
-uF
+Uy
+Uy
+Uy
+Uy
 of
 Gf
 Gf
 WT
-yI
+ie
 IF
 BA
-yI
+Bk
 bA
 "}
 (12,1,1) = {"
-OG
-uF
+nG
+Uy
 eE
 NL
 Fz
@@ -3029,14 +3029,14 @@ Pj
 rO
 Ld
 fR
-yI
+DS
 Co
 ze
-yI
+Bk
 YT
 "}
 (13,1,1) = {"
-pN
+Gv
 YE
 Cm
 XL
@@ -3049,7 +3049,7 @@ jk
 Qj
 BN
 vO
-yI
+Bk
 "}
 (14,1,1) = {"
 pN
@@ -3065,10 +3065,10 @@ Mh
 oR
 lX
 Jo
-yI
+Bk
 "}
 (15,1,1) = {"
-pN
+ER
 cx
 hY
 rt
@@ -3077,40 +3077,40 @@ mz
 xt
 tJ
 QS
-yI
+At
 sy
 hc
-Jo
-yI
+eb
+Bk
 "}
 (16,1,1) = {"
-OG
-uF
+nG
+Uy
 BE
 fX
 Fz
 CA
 mW
 FD
-Gv
-yI
-Wl
+tt
+tt
+tt
 pW
-yI
+tt
 Gu
 "}
 (17,1,1) = {"
 bA
-uF
-uF
-uF
-uF
+Uy
+Uy
+Uy
+Uy
 Gf
 eS
 xL
+tt
 dB
-yI
-yI
+DJ
 yI
 tt
 bA
@@ -3122,13 +3122,13 @@ BG
 mh
 Eo
 Sn
-At
+UH
 gb
-DJ
+SA
 Cr
 Es
 yu
-Gf
+tt
 bA
 "}
 (19,1,1) = {"
@@ -3144,7 +3144,7 @@ GI
 nW
 yE
 aO
-Gf
+tt
 bA
 "}
 (20,1,1) = {"
@@ -3156,11 +3156,11 @@ Hl
 Sn
 tc
 YO
-DS
-XR
+tt
+Am
+tX
 Ha
-ie
-Gf
+tt
 bA
 "}
 (21,1,1) = {"
@@ -3172,10 +3172,10 @@ Sn
 Sn
 rh
 py
-Gf
-Gf
-Gf
-Gf
+tt
+tt
+tt
+tt
 Ci
 bA
 "}
diff --git a/mod_celadon/outfit/code/nanotrasen/nt_outfit.dm b/mod_celadon/outfit/code/nanotrasen/nt_outfit.dm
index 519477cd718e..ed12e56f1b76 100644
--- a/mod_celadon/outfit/code/nanotrasen/nt_outfit.dm
+++ b/mod_celadon/outfit/code/nanotrasen/nt_outfit.dm
@@ -109,6 +109,35 @@
 	courierbag = /obj/item/storage/backpack/messenger/tox
 	box = /obj/item/storage/box/survival/medical
 
+// Директор СБ - ХОС капитан
+
+/datum/outfit/job/nanotrasen/hos/captain
+	name = "Nanotrasen - Security Director (Captain)"
+	job_icon = "headofsecurity"
+	jobtype = /datum/job/captain
+
+	id = /obj/item/card/id/gold
+	belt = /obj/item/pda/heads/hos
+	gloves = /obj/item/clothing/gloves/combat
+	ears = /obj/item/radio/headset/nanotrasen/alt/captain
+	uniform = /obj/item/clothing/under/nanotrasen/security/director
+	suit = /obj/item/clothing/suit/armor/nanotrasen/sec_director
+	alt_suit = /obj/item/clothing/suit/toggle/armor/hos_formal
+	dcoat = /obj/item/clothing/suit/hooded/wintercoat/security
+	shoes = /obj/item/clothing/shoes/combat
+	neck = /obj/item/clothing/neck/scarf/black
+	head = /obj/item/clothing/head/nanotrasen/beret/security/command
+	backpack_contents = list(/obj/item/melee/classic_baton/telescopic=1)
+
+	backpack = /obj/item/storage/backpack/security
+	satchel = /obj/item/storage/backpack/satchel/sec
+	duffelbag = /obj/item/storage/backpack/duffelbag/sec
+	courierbag = /obj/item/storage/backpack/messenger/sec
+
+	accessory = /obj/item/clothing/accessory/medal/silver/security
+
+	chameleon_extras = /obj/item/stamp/hos
+
 //лп уборщик
 
 /datum/outfit/job/nanotrasen/janitor/lp