From c11732b30217fd774db071fe28d53d41fb6745af Mon Sep 17 00:00:00 2001
From: PumPey <196648826+PumPeyMey@users.noreply.github.com>
Date: Mon, 11 May 2026 17:45:33 +0800
Subject: [PATCH] small tweak

---
 .../_mod_celadon/configs/pirate_stingray.json |   12 +-
 .../shuttles/pirate/pirate_stingray.dmm       | 1613 +++++++++--------
 mod_celadon/outfit/code/pirate/_outfit.dm     |   53 +
 3 files changed, 945 insertions(+), 733 deletions(-)

diff --git a/_maps/_mod_celadon/configs/pirate_stingray.json b/_maps/_mod_celadon/configs/pirate_stingray.json
index c4cc0c10858c..3267d0e6a097 100644
--- a/_maps/_mod_celadon/configs/pirate_stingray.json
+++ b/_maps/_mod_celadon/configs/pirate_stingray.json
@@ -18,18 +18,18 @@
 		"NATURAL_AGGRESSIVE"
 	],
 	"job_slots": {
-		"Deck Boss": {
-			"outfit": "/datum/outfit/job/cel/pirate/captain",
+		"Defector Commander": {
+			"outfit": "/datum/outfit/job/cel/pirate/captain/stingray",
  			"officer": true,
 			"slots": 1
 		},
-			"Helmsman": {
-			"outfit": "/datum/outfit/job/cel/pirate/hop",
+			"Defector Radioman": {
+			"outfit": "/datum/outfit/job/cel/pirate/hop/stingray",
 			"officer": true,
 			"slots": 1
 		},
-			"Officer": {
-			"outfit": "/datum/outfit/job/cel/pirate/engineer",
+			"Defector Officer": {
+			"outfit": "/datum/outfit/job/cel/pirate/security/stingray",
 			"officer": true,
 			"slots": 1
 		}
diff --git a/_maps/_mod_celadon/shuttles/pirate/pirate_stingray.dmm b/_maps/_mod_celadon/shuttles/pirate/pirate_stingray.dmm
index ac127150fe69..e56deac9b40a 100644
--- a/_maps/_mod_celadon/shuttles/pirate/pirate_stingray.dmm
+++ b/_maps/_mod_celadon/shuttles/pirate/pirate_stingray.dmm
@@ -1,6 +1,5 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
 "aa" = (
-/obj/machinery/autolathe,
 /obj/structure/closet/wall/orange/directional/east{
 	name = "locker"
 	},
@@ -13,14 +12,9 @@
 	pixel_x = -2;
 	pixel_y = -2
 	},
+/obj/machinery/autolathe,
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/engineering)
-"ab" = (
-/obj/machinery/power/terminal{
-	dir = 8
-	},
-/turf/closed/wall/mineral/plastitanium/nodiagonal,
-/area/ship/engineering)
 "ax" = (
 /obj/effect/turf_decal/techfloor{
 	dir = 4
@@ -154,7 +148,6 @@
 /obj/effect/turf_decal/spline/fancy/opaque/black{
 	dir = 10
 	},
-/obj/machinery/light/directional/south,
 /turf/open/floor/plasteel/tech,
 /area/ship/hallway/central)
 "be" = (
@@ -211,6 +204,12 @@
 	dir = 1
 	},
 /obj/effect/turf_decal/spline/fancy/opaque/black,
+/obj/structure/reagent_dispensers/water_cooler{
+	pixel_x = 9;
+	layer = 3.3;
+	pixel_y = 14;
+	density = 0
+	},
 /turf/open/floor/plasteel,
 /area/ship/hallway/central)
 "bJ" = (
@@ -228,14 +227,14 @@
 /turf/open/floor/plating,
 /area/ship/hallway/central)
 "bL" = (
-/obj/structure/cable{
-	icon_state = "2-8";
-	tag = null
-	},
 /obj/structure/toilet{
 	pixel_y = 13
 	},
 /obj/machinery/light/small/directional/east,
+/obj/machinery/power/apc/auto_name/directional/west,
+/obj/structure/cable{
+	icon_state = "0-2"
+	},
 /turf/open/floor/plasteel/patterned/brushed,
 /area/ship/crew/toilet)
 "bN" = (
@@ -278,21 +277,18 @@
 /obj/effect/turf_decal/borderfloorblack{
 	dir = 8
 	},
-/obj/item/stamp/officer{
-	pixel_x = 11
-	},
-/obj/item/paper_bin{
-	pixel_y = 10;
-	pixel_x = -2
-	},
-/obj/item/pen{
-	pixel_y = 11;
-	pixel_x = -2
-	},
 /obj/structure/cable{
 	icon_state = "2-8";
 	tag = null
 	},
+/obj/machinery/recharger{
+	pixel_x = 8;
+	pixel_y = 2
+	},
+/obj/item/storage/ashtray{
+	pixel_x = -5;
+	pixel_y = 1
+	},
 /turf/open/floor/mineral/plastitanium,
 /area/ship/security)
 "cz" = (
@@ -309,8 +305,11 @@
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/obj/machinery/vending/cigarette{
-	all_items_free = 1
+/obj/machinery/computer/arcade/orion_trail{
+	dir = 1
+	},
+/obj/structure/railing/thin{
+	dir = 4
 	},
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/hallway/central)
@@ -320,12 +319,8 @@
 	name = "locker"
 	},
 /obj/item/stack/sheet/mineral/uranium/ten,
-/obj/machinery/power/port_gen/pacman/super{
-	time_per_sheet = 100;
-	name = "inefficient radioisotope generator"
-	},
 /obj/item/toy/plush/plushvar,
-/obj/item/stack/sheet/mineral/uranium/five,
+/obj/machinery/power/port_gen/pacman/super,
 /turf/open/floor/plasteel/telecomms_floor,
 /area/ship/engineering/engines/starboard)
 "db" = (
@@ -346,41 +341,44 @@
 /turf/open/floor/plasteel,
 /area/ship/cargo/port)
 "dL" = (
-/obj/structure/closet/cabinet{
-	anchored = 1
-	},
 /obj/effect/turf_decal/borderfloorblack{
 	dir = 4
 	},
-/obj/item/storage/backpack/satchel{
+/obj/machinery/light/directional/west,
+/obj/structure/closet/secure_closet/cabinet{
+	name = "Radioman cabinet";
+	anchored = 1;
+	req_access = list(1);
+	req_ship_access = 1
+	},
+/obj/item/storage/backpack/satchel/sec{
 	pixel_y = 6
 	},
-/obj/item/storage/backpack{
+/obj/item/storage/backpack/security{
 	pixel_y = -5
 	},
-/obj/machinery/light/directional/west,
-/obj/item/clothing/shoes/jackboots/padded{
-	pixel_y = -7;
-	pixel_x = 10
-	},
 /obj/item/clothing/shoes/laceup{
 	pixel_y = -11;
 	pixel_x = -7
 	},
-/obj/item/clothing/gloves/color/fyellow/old{
-	pixel_y = -6;
+/obj/item/clothing/shoes/combat{
+	pixel_x = 9;
+	pixel_y = -6
+	},
+/obj/item/clothing/gloves/combat{
+	pixel_y = -4;
 	pixel_x = -6;
-	name = "insulated gloves";
-	desc = "These gloves provide protection against electric shock."
+	desc = "Old and worn out insulated gloves, hopefully they still work.";
+	name = "worn out combat gloves"
 	},
 /obj/item/clothing/under/nanotrasen/officer{
 	pixel_x = -7;
 	pixel_y = 7
 	},
 /obj/item/clothing/under/nanotrasen/science/director{
-	pixel_y = 6;
+	pixel_y = 5;
 	pixel_x = 7;
-	name = "second officer's slacks"
+	name = "radioman's slacks"
 	},
 /obj/item/clothing/under/frontiersmen/fireproof{
 	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 35, "acid" = 45);
@@ -388,26 +386,15 @@
 	name = "aramid suit";
 	desc = "An all-black set of fatigues, made of aramid fabric. It feels oddly itchy when worn..."
 	},
-/obj/item/clothing/suit/armor/vest/security/warden{
-	pixel_x = -8;
-	pixel_y = 2;
-	armor = list("melee" = 10, "bullet" = 15, "laser" = 10, "energy" = 10, "bomb" = 10, "bio" = 0, "rad" = 0, "fire" = 20, "acid" = 15, "wound" = 10);
-	name = "officer's jacket";
-	desc = "Perfectly suited for the officer that wants to leave an impression of style on those who visit the bridge."
+/obj/item/storage/belt/military/assault{
+	pixel_y = -7;
+	pixel_x = 6
 	},
 /obj/item/clothing/suit/armor/vest/security/brig_phys{
 	desc = "A black jacket with dark blue and silver accents, for the officer to prove they're a real member of security in style.";
 	name = "officer jacket";
 	pixel_x = 9;
-	armor = list("melee" = 10, "bullet" = 15, "laser" = 10, "energy" = 10, "bomb" = 10, "bio" = 0, "rad" = 0, "fire" = 20, "acid" = 15, "wound" = 10);
-	pixel_y = 2
-	},
-/obj/item/clothing/head/warden{
-	pixel_y = 11;
-	pixel_x = -9;
-	armor = list("melee" = 10, "bullet" = 15, "laser" = 10, "energy" = 10, "bomb" = 15, "bio" = 0, "rad" = 0, "fire" = 30, "acid" = 20, "wound" = 10);
-	name = "officer hat";
-	desc = "It's a special hat issued to the Officer of a deck. A classic symbol of middling authority."
+	armor = list("melee" = 10, "bullet" = 15, "laser" = 10, "energy" = 10, "bomb" = 10, "bio" = 0, "rad" = 0, "fire" = 20, "acid" = 15, "wound" = 10)
 	},
 /obj/item/clothing/head/beret/sec/brig_phys{
 	name = "officer beret";
@@ -416,17 +403,26 @@
 	pixel_x = 8;
 	pixel_y = 13
 	},
-/obj/item/storage/belt/military/assault{
-	pixel_y = -7;
-	pixel_x = 6
+/obj/item/clothing/suit/armor/vest/security/warden{
+	pixel_x = -8;
+	armor = list("melee" = 10, "bullet" = 15, "laser" = 10, "energy" = 10, "bomb" = 10, "bio" = 0, "rad" = 0, "fire" = 20, "acid" = 15, "wound" = 10);
+	name = "officer's jacket";
+	desc = "Perfectly suited for the officer that wants to leave an impression of style on those who visit the bridge."
+	},
+/obj/item/clothing/head/warden{
+	pixel_y = 11;
+	pixel_x = -9;
+	armor = list("melee" = 10, "bullet" = 15, "laser" = 10, "energy" = 10, "bomb" = 15, "bio" = 0, "rad" = 0, "fire" = 30, "acid" = 20, "wound" = 10);
+	name = "officer hat";
+	desc = "It's a special hat issued to the Officer of a deck. A classic symbol of middling authority."
 	},
 /obj/item/clothing/glasses/meson/gar{
 	pixel_y = 8;
 	pixel_x = -9
 	},
-/obj/item/clothing/mask/breath/facemask{
-	pixel_y = 8;
-	pixel_x = 10
+/obj/item/clothing/mask/gas/sechailer/swat{
+	pixel_x = 9;
+	pixel_y = 3
 	},
 /turf/open/floor/mineral/plastitanium,
 /area/ship/crew/dorm)
@@ -464,49 +460,64 @@
 	dir = 9;
 	color = "#808080"
 	},
-/obj/structure/closet/secure_closet/wall/directional/west{
+/obj/structure/closet/secure_closet/wall/directional/north{
 	icon_state = "sec_wall";
 	name = "locker";
-	dir = 1;
-	pixel_x = 0;
-	pixel_y = 28;
-	req_ship_access = 1
-	},
-/obj/item/ammo_box/magazine/cm5_9mm/empty{
-	pixel_x = 8;
-	pixel_y = 12
+	req_ship_access = 1;
+	req_access = list(1)
 	},
-/obj/item/ammo_box/magazine/cm5_9mm/empty{
-	pixel_x = 8;
-	pixel_y = 7
+/obj/item/storage/box/ammo/a12g_rubbershot{
+	pixel_x = 5;
+	pixel_y = 2
 	},
-/obj/item/ammo_box/magazine/cm5_9mm/empty{
-	pixel_x = 8;
-	pixel_y = 1
+/obj/item/storage/box/ammo/a12g_rubbershot{
+	pixel_x = 5;
+	pixel_y = -6
 	},
 /obj/item/storage/box/ammo/c9mm_rubber{
-	pixel_y = 15;
-	pixel_x = -7
+	pixel_y = 10;
+	pixel_x = -6
 	},
 /obj/item/storage/box/ammo/c9mm_rubber{
-	pixel_y = 7;
-	pixel_x = -7
+	pixel_y = 2;
+	pixel_x = -6
 	},
-/obj/item/storage/box/ammo/a12g_rubbershot{
+/obj/item/storage/box/ammo/c9mm_rubber{
 	pixel_y = -6;
-	pixel_x = -8
+	pixel_x = -6
 	},
-/obj/item/melee/classic_baton{
-	pixel_x = -8;
-	pixel_y = -8
+/obj/item/restraints/legcuffs/bola/tactical{
+	pixel_x = 5
+	},
+/obj/item/restraints/legcuffs/bola/energy{
+	pixel_x = 8
+	},
+/obj/item/restraints/legcuffs/bola/energy{
+	pixel_x = 11
+	},
+/obj/item/ammo_box/magazine/cm5_9mm/empty{
+	pixel_x = -10;
+	pixel_y = 12
+	},
+/obj/item/ammo_box/magazine/cm5_9mm/empty{
+	pixel_x = -10;
+	pixel_y = 7
+	},
+/obj/item/ammo_box/magazine/cm5_9mm/empty{
+	pixel_x = -10;
+	pixel_y = 1
 	},
 /obj/item/attachment/rail_light{
-	pixel_x = -2;
-	pixel_y = -1
+	pixel_x = 12;
+	pixel_y = -10
 	},
 /obj/item/attachment/rail_light{
-	pixel_x = -2;
-	pixel_y = -8
+	pixel_x = 12;
+	pixel_y = -4
+	},
+/obj/item/attachment/silencer{
+	pixel_x = 8;
+	pixel_y = 4
 	},
 /turf/open/floor/mineral/plastitanium,
 /area/ship/security)
@@ -646,40 +657,100 @@
 /obj/effect/turf_decal/spline/fancy/opaque/black{
 	dir = 10
 	},
-/obj/structure/closet/crate/freezer/blood,
-/obj/machinery/iv_drip,
+/obj/structure/closet/secure_closet/wall/directional/west{
+	icon_state = "solgov_wall";
+	name = "medical locker";
+	req_ship_access = 1
+	},
+/obj/item/storage/box/bodybags{
+	pixel_x = 9;
+	pixel_y = -5
+	},
+/obj/item/tank/internals/anesthetic{
+	pixel_y = -6;
+	pixel_x = 5
+	},
+/obj/item/storage/firstaid/radiation{
+	pixel_y = 6;
+	pixel_x = -7
+	},
+/obj/item/storage/firstaid/toxin{
+	pixel_x = -7
+	},
+/obj/item/storage/firstaid/medical{
+	pixel_y = -7;
+	pixel_x = -7
+	},
+/obj/item/clothing/mask/breath/medical{
+	pixel_y = 4;
+	pixel_x = 9
+	},
+/obj/item/clothing/mask/surgical{
+	pixel_y = 9;
+	pixel_x = 8
+	},
+/obj/item/clothing/gloves/color/latex/nitrile/clip{
+	pixel_y = -10;
+	pixel_x = 1
+	},
+/obj/item/clothing/suit/nanotrasen/medical_smock{
+	pixel_y = -3;
+	pixel_x = 8
+	},
+/obj/item/clothing/head/nanotrasen/surgical/blue{
+	pixel_y = 14;
+	pixel_x = 7
+	},
 /turf/open/floor/plasteel/tech,
 /area/ship/hallway/central)
 "fO" = (
 /obj/effect/turf_decal/industrial/warning/fulltile,
 /obj/structure/crate_shelf,
-/obj/structure/closet/crate{
-	icon_state = "o2crate"
+/obj/structure/sign/poster/pol/pol_1{
+	pixel_x = -32
 	},
-/obj/item/tank/internals/emergency_oxygen/engi{
-	pixel_x = -1
+/obj/structure/closet/crate,
+/obj/effect/spawner/random/food_or_drink/ration{
+	pixel_y = 3
 	},
-/obj/item/tank/internals/emergency_oxygen/engi{
-	pixel_x = -7
+/obj/item/trash/dote{
+	pixel_x = -7;
+	pixel_y = -6
 	},
-/obj/item/clothing/mask/gas{
-	pixel_y = 8;
-	pixel_x = 2
+/obj/item/trash/mirastin{
+	pixel_y = 3;
+	pixel_x = 3
 	},
-/obj/item/clothing/mask/gas{
-	pixel_y = 8;
-	pixel_x = -7
+/obj/item/trash/cheesie{
+	pixel_y = 3;
+	pixel_x = -8
 	},
-/obj/item/extinguisher/mini{
-	pixel_y = -5;
-	pixel_x = 2
+/obj/item/trash/lifosa{
+	pixel_x = 5
 	},
-/obj/item/extinguisher/mini{
-	pixel_y = -5;
+/obj/item/trash/popcorn{
+	pixel_y = 10
+	},
+/obj/item/trash/sosjerky{
+	pixel_x = 3
+	},
+/obj/item/reagent_containers/food/drinks/waterbottle/large{
+	pixel_x = 6
+	},
+/obj/item/reagent_containers/food/drinks/waterbottle{
+	pixel_x = -8;
+	pixel_y = -3
+	},
+/obj/item/reagent_containers/condiment/rice{
+	pixel_y = 1;
+	pixel_x = -6
+	},
+/obj/item/reagent_containers/condiment/sugar{
+	pixel_y = -2;
 	pixel_x = 8
 	},
-/obj/structure/sign/poster/pol/pol_1{
-	pixel_x = -32
+/obj/item/reagent_containers/condiment/flour{
+	pixel_y = -3
 	},
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/cargo/port)
@@ -708,14 +779,13 @@
 /turf/open/floor/mineral/plastitanium,
 /area/ship/bridge)
 "go" = (
-/obj/structure/table/reinforced/plastitaniumglass,
 /obj/effect/turf_decal/borderfloorblack{
 	dir = 8
 	},
 /obj/machinery/microwave{
-	pixel_y = 6;
-	pixel_x = -1
+	pixel_y = 8
 	},
+/obj/structure/table/reinforced/plastitaniumglass,
 /turf/open/floor/mineral/plastitanium,
 /area/ship/hallway/central)
 "gp" = (
@@ -786,52 +856,19 @@
 /turf/open/floor/plasteel,
 /area/ship/hallway/central)
 "hh" = (
-/obj/effect/turf_decal/borderfloorblack,
-/obj/structure/closet/secure_closet{
-	icon_state = "med_secure";
-	name = "medical locker"
-	},
-/obj/item/clothing/mask/breath/medical{
-	pixel_y = 4;
-	pixel_x = 9
-	},
-/obj/item/storage/firstaid/radiation{
-	pixel_y = 6;
-	pixel_x = -8
-	},
-/obj/item/storage/firstaid/toxin{
-	pixel_x = -8
-	},
-/obj/item/storage/firstaid/regular{
-	pixel_y = -8;
-	pixel_x = -8
-	},
-/obj/item/tank/internals/anesthetic{
-	pixel_y = -6;
-	pixel_x = 9
-	},
-/obj/item/clothing/gloves/color/latex/nitrile/clip{
-	pixel_y = -10;
-	pixel_x = 1
-	},
-/obj/item/clothing/suit/nanotrasen/medical_smock{
-	pixel_y = -1;
-	pixel_x = 11
-	},
-/obj/item/clothing/mask/surgical{
-	pixel_y = 10;
-	pixel_x = 8
+/obj/effect/turf_decal/borderfloorblack,
+/obj/structure/table/reinforced/plastitaniumglass,
+/obj/item/storage/pill_bottle/iron{
+	pixel_y = 8;
+	pixel_x = -13
 	},
-/obj/item/clothing/head/nanotrasen/surgical/blue{
-	pixel_y = 14;
-	pixel_x = 8
+/obj/item/reagent_containers/syringe{
+	pixel_y = 3;
+	pixel_x = -6
 	},
 /turf/open/floor/mineral/plastitanium,
 /area/ship/hallway/central)
 "hm" = (
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
 /obj/structure/sink{
 	dir = 4;
 	pixel_x = -12;
@@ -846,6 +883,9 @@
 	pixel_x = -23;
 	pixel_y = -10
 	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
 /turf/open/floor/plasteel/patterned/brushed,
 /area/ship/crew/toilet)
 "ho" = (
@@ -942,16 +982,30 @@
 	},
 /turf/open/floor/plasteel,
 /area/ship/hallway/central)
-"iM" = (
+"iA" = (
 /obj/effect/turf_decal/techfloor{
-	dir = 5
+	dir = 9
 	},
-/obj/machinery/suit_storage_unit/inherit/industrial,
-/obj/item/clothing/suit/space/hardsuit/security,
-/obj/item/clothing/mask/gas/vigilitas,
-/obj/item/tank/internals/oxygen/red,
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/ship/hallway/aft)
+"iM" = (
 /obj/machinery/light/directional/east,
-/turf/open/floor/plasteel,
+/obj/effect/turf_decal/borderfloorblack{
+	dir = 8
+	},
+/obj/structure/table/reinforced/plastitaniumglass,
+/obj/item/gps{
+	pixel_y = 4;
+	pixel_x = -5
+	},
+/obj/item/gps{
+	pixel_y = 4
+	},
+/obj/item/clothing/neck/dogtag/ramzi{
+	pixel_y = -11;
+	pixel_x = -4
+	},
+/turf/open/floor/mineral/plastitanium,
 /area/ship/cargo)
 "iV" = (
 /obj/effect/turf_decal/industrial/hatch/yellow,
@@ -970,8 +1024,7 @@
 	dir = 4
 	},
 /obj/machinery/camera/autoname{
-	dir = 10;
-	pixel_x = 11
+	dir = 10
 	},
 /turf/open/floor/plasteel/stairs{
 	icon = 'icons/obj/stairs.dmi';
@@ -982,47 +1035,20 @@
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/ship/engineering/engines/port)
 "jI" = (
-/obj/effect/turf_decal/techfloor{
-	dir = 10
-	},
-/obj/structure/closet/secure_closet{
-	anchored = 1;
-	icon_state = "syndicate";
-	name = "locker"
-	},
-/obj/item/tank/internals/emergency_oxygen/engi{
-	pixel_y = 5;
-	pixel_x = -8
-	},
-/obj/item/melee/knife/survival{
-	pixel_y = 4;
-	pixel_x = 8
-	},
-/obj/item/storage/bag/ore{
-	pixel_y = -8;
-	pixel_x = -4
-	},
-/obj/item/pickaxe/mini{
-	pixel_y = -4;
-	pixel_x = -5
-	},
-/obj/item/flashlight/seclite{
-	pixel_y = -11;
-	pixel_x = 5
-	},
-/obj/item/gps{
-	pixel_y = -7
-	},
-/obj/item/stack/rods/twentyfive{
-	pixel_x = 10
-	},
 /obj/structure/sign/warning/gasmask{
 	pixel_y = -32
 	},
 /obj/structure/sign/poster/official/miners{
 	pixel_x = -32
 	},
-/turf/open/floor/plasteel,
+/obj/effect/turf_decal/borderfloorblack{
+	dir = 4
+	},
+/obj/machinery/suit_storage_unit/inherit/industrial,
+/obj/item/clothing/suit/space/hardsuit/security,
+/obj/item/clothing/mask/gas/vigilitas,
+/obj/item/tank/internals/oxygen/red,
+/turf/open/floor/mineral/plastitanium,
 /area/ship/cargo)
 "jL" = (
 /obj/effect/decal/fakelattice,
@@ -1088,13 +1114,9 @@
 /obj/effect/turf_decal/borderfloorblack{
 	dir = 8
 	},
-/obj/machinery/recharger{
-	pixel_x = 7;
-	pixel_y = 6
-	},
 /obj/item/phone{
-	pixel_x = -6;
-	pixel_y = 8
+	pixel_x = 10;
+	pixel_y = 5
 	},
 /obj/machinery/button/door{
 	id = "Veil_cargoS_shutters";
@@ -1118,13 +1140,22 @@
 	dir = 8;
 	pixel_y = -10
 	},
-/obj/item/storage/ashtray{
+/obj/item/flashlight/lamp{
 	pixel_x = -5;
-	pixel_y = -2
+	pixel_y = 13;
+	layer = 3.42
 	},
-/obj/item/flashlight/lamp{
-	pixel_x = 7;
-	pixel_y = -3
+/obj/item/paper_bin{
+	pixel_y = -12;
+	pixel_x = -3
+	},
+/obj/item/pen{
+	pixel_y = -10;
+	pixel_x = -3
+	},
+/obj/item/stamp/officer{
+	pixel_x = 11;
+	pixel_y = -4
 	},
 /turf/open/floor/mineral/plastitanium,
 /area/ship/security)
@@ -1196,8 +1227,13 @@
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/ship/crew/dorm)
 "lC" = (
-/obj/effect/turf_decal/stairs,
-/turf/open/floor/plasteel/tech/grid,
+/obj/effect/turf_decal/stairs{
+	layer = 2.0391
+	},
+/obj/effect/turf_decal/spline/fancy/opaque/black{
+	dir = 4
+	},
+/turf/open/floor/plasteel/tech,
 /area/ship/crew/dorm)
 "lK" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
@@ -1227,46 +1263,52 @@
 	pixel_y = 10;
 	pixel_x = -3
 	},
-/obj/item/paper/paperslip{
-	pixel_y = -10;
-	pixel_x = 5;
-	default_raw_text = "der Anfang vom Ende";
-	name = "Safe"
+/mob/living/basic/mouse/white{
+	name = "Isior"
 	},
 /turf/open/floor/circuit/off,
 /area/ship/hallway/aft)
 "lU" = (
-/obj/structure/closet/secure_closet/freezer/fridge/open,
 /obj/effect/turf_decal/borderfloorblack{
 	dir = 1
 	},
-/obj/item/food/meat/slab/monkey{
-	pixel_y = 2;
-	pixel_x = -8
+/obj/structure/table/reinforced/plastitaniumglass,
+/obj/structure/closet/wall/white/directional/east,
+/obj/structure/reagent_dispensers/servingdish{
+	tank_volume = 200
 	},
-/obj/item/food/meat/slab/monkey{
-	pixel_x = -8;
-	pixel_y = -2
+/obj/item/reagent_containers/condiment/soysauce{
+	pixel_x = -2;
+	pixel_y = 14
 	},
-/obj/item/food/meat/slab/monkey{
-	pixel_y = -6;
-	pixel_x = -8
+/obj/item/reagent_containers/condiment/mayonnaise{
+	pixel_y = 9;
+	pixel_x = -7
 	},
-/obj/item/food/meat/slab/monkey{
-	pixel_y = -10;
-	pixel_x = -8
+/obj/item/reagent_containers/condiment/ketchup{
+	pixel_y = 6
 	},
-/obj/item/reagent_containers/condiment/milk{
-	pixel_y = -4;
-	pixel_x = 11
+/obj/item/reagent_containers/condiment/saltshaker{
+	pixel_y = 11;
+	pixel_x = 9
 	},
-/obj/item/reagent_containers/condiment/milk{
-	pixel_y = -10;
-	pixel_x = 11
+/obj/item/reagent_containers/condiment/peppermill{
+	pixel_y = 5;
+	pixel_x = 7
 	},
-/obj/item/reagent_containers/condiment/soymilk{
-	pixel_y = -10;
-	pixel_x = 2
+/obj/item/reagent_containers/condiment/hotsauce{
+	pixel_y = 5;
+	pixel_x = -11
+	},
+/obj/item/reagent_containers/condiment/pack/sugar{
+	pixel_x = -4
+	},
+/obj/item/reagent_containers/condiment/pack/sugar{
+	pixel_y = 4
+	},
+/obj/item/reagent_containers/condiment/pack/chocolate{
+	pixel_x = 2;
+	pixel_y = 1
 	},
 /turf/open/floor/mineral/plastitanium,
 /area/ship/hallway/central)
@@ -1341,6 +1383,12 @@
 /obj/structure/sign/poster/official/report_crimes{
 	pixel_y = -32
 	},
+/obj/item/paper/paperslip{
+	pixel_y = -6;
+	pixel_x = 3;
+	default_raw_text = "ОТКРЫВАТЬ ТОЛЬКО В СЛУЧАЕ ЭКСТРЕННОЙ НЕОБХОДИМОСТИ, ПРИОРИТЕТ НА НЕЛЕТАЛЬНОЕ ЗАДЕРЖАНИЕ! КОД 57-34";
+	name = "Safe"
+	},
 /turf/open/floor/mineral/plastitanium,
 /area/ship/security)
 "mx" = (
@@ -1358,12 +1406,13 @@
 	pixel_x = 7;
 	pixel_y = 15
 	},
-/obj/item/food/donut/jelly/slimejelly/caramel{
-	pixel_y = 2
-	},
 /obj/effect/turf_decal/spline/fancy/opaque/black{
 	dir = 1
 	},
+/obj/item/food/donut/jelly/caramel{
+	pixel_y = 2;
+	pixel_x = 5
+	},
 /turf/open/floor/plasteel,
 /area/ship/hallway/central)
 "mA" = (
@@ -1410,9 +1459,6 @@
 /obj/effect/turf_decal/techfloor/corner{
 	dir = 1
 	},
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
-	dir = 4
-	},
 /turf/open/floor/plasteel,
 /area/ship/cargo)
 "ng" = (
@@ -1426,6 +1472,24 @@
 /obj/effect/turf_decal/spline/fancy/opaque/black/corner,
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/engineering)
+"nn" = (
+/obj/effect/turf_decal/borderfloorblack{
+	dir = 1
+	},
+/obj/structure/table/reinforced/plastitaniumglass,
+/obj/machinery/light/directional/south,
+/obj/item/storage/bag/tray{
+	pixel_y = 7
+	},
+/obj/item/melee/knife/kitchen{
+	pixel_y = 9
+	},
+/obj/item/kitchen/rollingpin{
+	pixel_y = 4;
+	pixel_x = 7
+	},
+/turf/open/floor/mineral/plastitanium,
+/area/ship/hallway/central)
 "nD" = (
 /obj/structure/catwalk/over/plated_catwalk/dark,
 /obj/structure/cable{
@@ -1456,20 +1520,19 @@
 /obj/effect/turf_decal/spline/fancy/opaque/black{
 	dir = 9
 	},
-/obj/machinery/light/directional/north,
 /turf/open/floor/plasteel/tech,
 /area/ship/hallway/central)
 "nK" = (
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/obj/effect/turf_decal/techfloor{
-	dir = 1
-	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 1
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/effect/turf_decal/techfloor{
+	dir = 5
+	},
 /turf/open/floor/plasteel,
 /area/ship/cargo)
 "oh" = (
@@ -1483,13 +1546,13 @@
 /obj/structure/closet/wall/orange/directional/east{
 	name = "locker"
 	},
-/obj/item/screwdriver{
-	pixel_y = -4;
-	pixel_x = 2
+/obj/item/mod/module/stamp{
+	pixel_y = -7;
+	pixel_x = 9
 	},
-/obj/item/stock_parts/cell/hyper/empty{
-	pixel_y = -9;
-	pixel_x = 7
+/obj/item/mod/module/flashlight{
+	pixel_y = 6;
+	pixel_x = -5
 	},
 /obj/item/crowbar/old{
 	pixel_y = 2;
@@ -1498,13 +1561,9 @@
 /obj/item/wirecutters{
 	pixel_x = -2
 	},
-/obj/item/mod/module/flashlight{
-	pixel_y = 6;
-	pixel_x = -5
-	},
-/obj/item/mod/module/stamp{
-	pixel_y = -7;
-	pixel_x = 9
+/obj/item/screwdriver{
+	pixel_y = -4;
+	pixel_x = 2
 	},
 /turf/open/floor/plasteel,
 /area/ship/cargo/port)
@@ -1537,8 +1596,12 @@
 /obj/effect/turf_decal/techfloor{
 	dir = 1
 	},
-/obj/machinery/vending/cola/space_up,
 /obj/effect/turf_decal/spline/fancy/opaque/black,
+/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,
 /area/ship/hallway/central)
 "oF" = (
@@ -1557,6 +1620,9 @@
 /area/ship/bridge)
 "oI" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
+/obj/effect/turf_decal/spline/fancy/opaque/black{
+	dir = 4
+	},
 /turf/open/floor/plasteel/tech,
 /area/ship/crew/dorm)
 "oP" = (
@@ -1675,9 +1741,10 @@
 	pixel_x = 5;
 	pixel_y = 5
 	},
-/obj/item/storage/box/handcuffs{
+/obj/item/storage/box/flares{
+	pixel_y = 2;
 	pixel_x = -5;
-	pixel_y = 2
+	icon_state = "secbox"
 	},
 /obj/item/storage/box/smokebombs{
 	pixel_y = -4
@@ -1711,37 +1778,42 @@
 /obj/machinery/door/airlock/hatch{
 	name = "Bathroom"
 	},
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
 /obj/machinery/door/firedoor/border_only{
 	dir = 1
 	},
 /obj/machinery/door/firedoor/border_only,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/crew/toilet)
 "qC" = (
-/obj/structure/safe{
-	number_of_tumblers = 3;
-	desc = "A huge chunk of metal with a dial embedded in it. Fine print on the dial reads \"Scarborough Arms - 3 tumbler safe, guaranteed thermite resistant, explosion resistant, and assistant resistant.\""
-	},
 /obj/effect/turf_decal/box/red,
 /obj/machinery/door/window/brigdoor/westleft{
 	req_ship_access = 1;
 	dir = 4
 	},
 /obj/machinery/light/directional/west,
-/obj/item/storage/box/ammo/a12g_slug,
+/obj/structure/safe{
+	tumblers = list(57, 34)
+	},
+/obj/item/storage/box/ammo/c9mm,
+/obj/item/storage/box/ammo/c9mm,
+/obj/item/storage/box/ammo/c9mm,
 /obj/item/storage/box/ammo/a12g_buckshot,
-/obj/item/storage/toolbox/ammo/c9mm,
-/obj/item/storage/box/flares,
+/obj/item/storage/box/ammo/a12g_slug,
+/obj/item/gun/energy/plasmacutter{
+	icon = 'mod_celadon/_storage_icons/icons/items/weapons/ntsl_lasers.dmi';
+	icon_state = "plasma_pistol_fire";
+	name = "M87";
+	desc = "A fresh-new experimental plasma pistol manufactured by Nanotrasen-Sharplite, it uses superheated plasma bursts. You could use it to cut limbs off xenos! Or, you know, cut through walls."
+	},
 /obj/item/melee/sword/mass{
 	force = 25;
 	name = "machete";
 	desc = "A jagged and painful machete made of stamped steel, with a faux-leather grip for ease of handling. Right between that of a one-handed and two-handed weapon.";
-	armour_penetration = 10
+	armour_penetration = 15
 	},
-/obj/item/restraints/legcuffs/bola/tactical,
 /turf/open/floor/mineral/plastitanium,
 /area/ship/security)
 "qH" = (
@@ -1798,32 +1870,34 @@
 /obj/effect/turf_decal/borderfloorblack{
 	dir = 5
 	},
-/obj/structure/closet/cabinet{
-	anchored = 1
-	},
 /obj/machinery/power/apc/auto_name/directional/east,
 /obj/structure/cable{
 	icon_state = "0-2"
 	},
-/obj/item/storage/backpack/satchel{
-	pixel_y = 6
-	},
-/obj/item/storage/backpack{
-	pixel_y = -5
-	},
 /obj/machinery/light_switch{
 	pixel_x = 18;
 	dir = 8;
 	pixel_y = -12
 	},
-/obj/item/clothing/shoes/combat{
-	pixel_x = 9;
-	pixel_y = -6
+/obj/structure/closet/secure_closet/cabinet{
+	name = "Commander cabinet";
+	req_access = list(19);
+	req_ship_access = 1
+	},
+/obj/item/storage/backpack/satchel/sec{
+	pixel_y = 6
+	},
+/obj/item/storage/backpack/security{
+	pixel_y = -5
 	},
 /obj/item/clothing/shoes/laceup{
 	pixel_y = -11;
 	pixel_x = -7
 	},
+/obj/item/clothing/shoes/combat{
+	pixel_x = 9;
+	pixel_y = -6
+	},
 /obj/item/clothing/gloves/combat{
 	pixel_y = -3;
 	pixel_x = -3
@@ -1843,17 +1917,27 @@
 	desc = "A stylish alternative to the normal captain jumpsuit, complete with tactical pants.";
 	pixel_y = -1
 	},
-/obj/item/clothing/suit/armor/hos/trenchcoat{
-	armor = list("melee" = 15, "bullet" = 20, "laser" = 10, "energy" = 15, "bomb" = 15, "bio" = 0, "rad" = 0, "fire" = 25, "acid" = 20, "wound" = 10);
-	pixel_x = 10;
-	pixel_y = 4
+/obj/item/storage/belt/military/assault{
+	pixel_y = -1;
+	pixel_x = 6
 	},
 /obj/item/clothing/suit/armor/vest/security/hos{
 	armor = list("melee" = 15, "bullet" = 15, "laser" = 15, "energy" = 10, "bomb" = 10, "bio" = 0, "rad" = 0, "fire" = 25, "acid" = 20, "wound" = 10);
-	pixel_y = 4;
+	pixel_y = 1;
 	pixel_x = -9;
 	name = "parade jacket"
 	},
+/obj/item/clothing/head/HoS{
+	pixel_y = 11;
+	pixel_x = -10;
+	name = "parade cap";
+	desc = "The robust standard-issue cap of the Captain. For showing the officers who's in charge.";
+	armor = list("melee" = 10, "bullet" = 20, "laser" = 10, "energy" = 10, "bomb" = 15, "bio" = 0, "rad" = 0, "fire" = 35, "acid" = 25, "wound" = 10)
+	},
+/obj/item/clothing/suit/armor/hos/trenchcoat{
+	armor = list("melee" = 15, "bullet" = 20, "laser" = 10, "energy" = 15, "bomb" = 15, "bio" = 0, "rad" = 0, "fire" = 25, "acid" = 20, "wound" = 10);
+	pixel_x = 10
+	},
 /obj/item/clothing/head/beret/sec/hos{
 	pixel_y = 14;
 	name = "captain beret";
@@ -1861,24 +1945,13 @@
 	pixel_x = 10;
 	armor = list("melee" = 10, "bullet" = 20, "laser" = 10, "energy" = 10, "bomb" = 15, "bio" = 0, "rad" = 0, "fire" = 35, "acid" = 25, "wound" = 10)
 	},
-/obj/item/storage/belt/military/assault{
-	pixel_y = -1;
-	pixel_x = 6
-	},
-/obj/item/clothing/mask/breath/facemask{
+/obj/item/clothing/glasses/hud/security/sunglasses/gars{
 	pixel_y = 7;
-	pixel_x = 10
-	},
-/obj/item/clothing/head/HoS{
-	pixel_y = 11;
-	pixel_x = -10;
-	name = "parade cap";
-	desc = "The robust standard-issue cap of the Captain. For showing the officers who's in charge.";
-	armor = list("melee" = 10, "bullet" = 20, "laser" = 10, "energy" = 10, "bomb" = 15, "bio" = 0, "rad" = 0, "fire" = 35, "acid" = 25, "wound" = 10)
+	pixel_x = -9
 	},
-/obj/item/clothing/glasses/hud/security/sunglasses/gars{
-	pixel_y = 5;
-	pixel_x = -7
+/obj/item/clothing/mask/gas/sechailer/swat{
+	pixel_x = 9;
+	pixel_y = 3
 	},
 /turf/open/floor/plasteel/tech,
 /area/ship/general/command_crew)
@@ -1960,40 +2033,38 @@
 	},
 /area/ship/engineering)
 "rZ" = (
-/obj/structure/cable{
-	icon_state = "2-4"
-	},
 /obj/effect/turf_decal/siding/wood/end{
 	dir = 4
 	},
-/obj/item/reagent_containers/food/drinks/dry_ramen{
-	pixel_y = 14;
-	pixel_x = 8
-	},
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/decal/cleanable/robot_debris{
-	pixel_y = 21;
-	pixel_x = -11;
-	name = "electric debris"
+/obj/machinery/power/apc/auto_name/directional/east,
+/obj/structure/cable{
+	icon_state = "0-2"
 	},
-/obj/effect/decal/cleanable/wrapping{
-	pixel_y = -4;
-	pixel_x = -13
+/obj/machinery/light/small/directional/east{
+	pixel_y = -17
 	},
 /turf/open/floor/carpet/green,
-/area/ship/crew/toilet)
+/area/ship/security/prison)
 "sf" = (
-/obj/structure/chair/sofa/brown/old/left/directional/north,
 /obj/effect/turf_decal/borderfloorblack{
 	dir = 1
 	},
-/obj/item/reagent_containers/food/drinks/flask{
-	pixel_y = 14;
-	pixel_x = -8
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+	dir = 4
 	},
+/obj/effect/spawner/bunk_bed{
+	dir = 1
+	},
+/obj/item/bedsheet/black{
+	dir = 4
+	},
+/obj/item/bedsheet/black{
+	dir = 4;
+	pixel_y = 14
+	},
+/obj/machinery/airalarm/directional/west,
 /turf/open/floor/mineral/plastitanium,
-/area/ship/crew/toilet)
+/area/ship/security/prison)
 "sm" = (
 /obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
 /obj/machinery/door/firedoor/window,
@@ -2102,6 +2173,10 @@
 /obj/effect/turf_decal/spline/fancy/opaque/black{
 	dir = 5
 	},
+/obj/machinery/iv_drip{
+	pixel_y = 23;
+	pixel_x = 8
+	},
 /turf/open/floor/plasteel/tech,
 /area/ship/hallway/central)
 "tI" = (
@@ -2208,21 +2283,48 @@
 /turf/open/floor/plasteel/tech/techmaint,
 /area/ship/engineering)
 "ux" = (
-/obj/effect/turf_decal/techfloor{
-	dir = 6
-	},
-/obj/structure/table/reinforced/plastitaniumglass,
-/obj/machinery/cell_charger{
-	pixel_y = 2
-	},
 /obj/item/radio/intercom/directional/south{
 	frequency = 1655
 	},
-/obj/machinery/camera/autoname{
-	dir = 9;
-	layer = 4.2
+/obj/effect/turf_decal/borderfloorblack{
+	dir = 8
 	},
-/turf/open/floor/plasteel,
+/obj/machinery/airalarm/directional/east,
+/obj/structure/closet/secure_closet{
+	anchored = 1;
+	icon_state = "syndicate";
+	name = "locker"
+	},
+/obj/item/storage/box/zipties{
+	pixel_x = 5;
+	pixel_y = 9
+	},
+/obj/item/card/id/syndicate/anyone{
+	pixel_y = -7
+	},
+/obj/item/stock_parts/cell/gun{
+	pixel_y = 5;
+	pixel_x = -7
+	},
+/obj/item/gun/energy/e_gun/advtaser{
+	pixel_x = -6;
+	pixel_y = -8
+	},
+/obj/item/melee/classic_baton/telescopic{
+	pixel_y = -4;
+	pixel_x = 4
+	},
+/obj/item/reagent_containers/spray/pepper{
+	pixel_y = -7;
+	pixel_x = 10
+	},
+/obj/item/clothing/mask/muzzle{
+	pixel_y = 5
+	},
+/obj/item/clothing/glasses/blindfold{
+	pixel_y = 7
+	},
+/turf/open/floor/mineral/plastitanium,
 /area/ship/cargo)
 "uB" = (
 /obj/structure/reagent_dispensers/virusfood{
@@ -2235,54 +2337,32 @@
 /obj/effect/turf_decal/spline/fancy/opaque/black{
 	dir = 9
 	},
-/obj/structure/table/reinforced/plastitaniumglass,
-/obj/structure/closet/wall/white/directional/west{
-	pixel_y = 5;
-	name = "locker"
+/obj/structure/closet/secure_closet/freezer/fridge/open,
+/obj/item/food/meat/slab/monkey{
+	pixel_y = -10;
+	pixel_x = -8
 	},
-/obj/item/reagent_containers/condiment/soysauce{
-	pixel_x = -2;
-	pixel_y = 14
+/obj/item/food/meat/slab/monkey{
+	pixel_y = -6;
+	pixel_x = -8
 	},
-/obj/item/reagent_containers/condiment/mayonnaise{
-	pixel_y = 9;
-	pixel_x = -7
+/obj/item/food/meat/slab/monkey{
+	pixel_x = -8;
+	pixel_y = -2
 	},
-/obj/item/reagent_containers/condiment/ketchup{
-	pixel_y = 6
+/obj/item/food/meat/slab/monkey{
+	pixel_y = 2;
+	pixel_x = -8
 	},
-/obj/item/reagent_containers/condiment/saltshaker{
-	pixel_y = 11;
+/obj/item/reagent_containers/condiment/milk{
 	pixel_x = 9
 	},
-/obj/item/reagent_containers/condiment/peppermill{
-	pixel_y = 5;
-	pixel_x = 7
-	},
-/obj/item/reagent_containers/condiment/hotsauce{
-	pixel_y = 5;
-	pixel_x = -11
-	},
-/obj/structure/reagent_dispensers/servingdish{
-	tank_volume = 200
-	},
-/obj/item/reagent_containers/condiment/pack/sugar{
-	pixel_y = 4
-	},
-/obj/item/reagent_containers/condiment/pack/sugar{
-	pixel_x = -4
-	},
-/obj/item/reagent_containers/condiment/pack/chocolate{
-	pixel_x = 2;
-	pixel_y = 1
-	},
-/obj/item/storage/bag/tray,
-/obj/item/melee/knife/kitchen{
-	pixel_y = 9
+/obj/item/storage/fancy/egg_box{
+	pixel_y = -4
 	},
-/obj/item/kitchen/rollingpin{
-	pixel_y = 4;
-	pixel_x = 7
+/obj/item/reagent_containers/condiment/soymilk{
+	pixel_y = -4;
+	pixel_x = -1
 	},
 /turf/open/floor/plasteel/tech,
 /area/ship/hallway/central)
@@ -2306,18 +2386,24 @@
 	},
 /area/ship/engineering)
 "uN" = (
-/obj/effect/turf_decal/techfloor{
-	dir = 4
+/obj/effect/turf_decal/borderfloorblack{
+	dir = 8
 	},
-/obj/machinery/suit_storage_unit/inherit/industrial,
-/obj/item/clothing/suit/space/hardsuit/security,
-/obj/item/clothing/mask/gas/vigilitas,
-/obj/item/tank/internals/oxygen/red,
-/obj/machinery/power/apc/auto_name/directional/east,
-/obj/structure/cable{
-	icon_state = "0-8"
+/obj/structure/table/reinforced/plastitaniumglass,
+/obj/item/trench_tool{
+	pixel_y = 18;
+	pixel_x = 5;
+	desc = "A dual-purpose excavation tool in black and red, serving as both a powerful bladed shovel and a pickaxe."
 	},
-/turf/open/floor/plasteel,
+/obj/item/binoculars{
+	pixel_y = 1;
+	pixel_x = 3
+	},
+/obj/machinery/camera/autoname{
+	dir = 9;
+	layer = 4.2
+	},
+/turf/open/floor/mineral/plastitanium,
 /area/ship/cargo)
 "vp" = (
 /obj/effect/turf_decal/corner/opaque/ntblue/half{
@@ -2352,10 +2438,6 @@
 	pixel_y = 2;
 	pixel_x = 3
 	},
-/obj/item/stock_parts/cell/high{
-	pixel_y = 4;
-	pixel_x = 5
-	},
 /obj/machinery/light_switch{
 	dir = 8;
 	pixel_y = 9;
@@ -2365,22 +2447,12 @@
 	pixel_y = -3
 	},
 /obj/machinery/airalarm/directional/south,
+/obj/item/stock_parts/cell/hyper/empty{
+	pixel_y = 4;
+	pixel_x = 5
+	},
 /turf/open/floor/pod/dark,
 /area/ship/engineering/engines/port)
-"vF" = (
-/obj/structure/catwalk/over/plated_catwalk/dark,
-/obj/structure/cable{
-	icon_state = "2-4";
-	tag = null
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 6
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 6
-	},
-/turf/open/floor/plating,
-/area/ship/hallway/central)
 "vO" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -2478,29 +2550,31 @@
 /turf/open/floor/plasteel,
 /area/ship/hallway/central)
 "wR" = (
-/obj/structure/safe/floor{
-	tumblers = list(24, 78)
-	},
 /obj/effect/turf_decal/borderfloorblack{
 	dir = 1
 	},
 /obj/machinery/light/broken/directional/south,
-/obj/item/storage/photo_album,
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/item/documents/nanotrasen{
 	desc = "\"Top Secret\" The documents contain data on flights and reconnaissance of remote sectors. It is impossible to determine from the classification to whom these documents belong."
 	},
-/obj/item/paper/crumpled,
-/obj/item/gun/energy/plasmacutter{
-	icon = 'mod_celadon/_storage_icons/icons/items/weapons/ntsl_lasers.dmi';
-	icon_state = "plasma_pistol_fire";
-	name = "M87";
-	desc = "A fresh-new experimental plasma pistol manufactured by Nanotrasen-Sharplite, it uses superheated plasma bursts. You could use it to cut limbs off xenos! Or, you know, cut through walls."
-	},
 /obj/item/toy/musicbox{
 	desc = "Надпись на дне: <i>Erin... dich ... unser ...sprechen.</i>"
 	},
 /obj/item/stamp/nanotrasen/vigilitas/captain,
+/obj/structure/safe{
+	number_of_tumblers = 3;
+	desc = "A huge chunk of metal with a dial embedded in it. Fine print on the dial reads. Scarborough Arms - 3 tumbler safe, guaranteed thermite resistant, explosion resistant, and assistant resistant."
+	},
+/obj/item/clothing/under/suit/black_really{
+	name = "strange executive suitskirt";
+	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 35, "acid" = 45);
+	desc = "A formal black suit, intended for the galaxy's finest. Be careful with this nasty thing, it has threads sticking out everywhere, who knows, maybe some joker will decide to pull one of them out.";
+	max_integrity = 10
+	},
+/obj/item/clothing/neck/tie/red,
+/obj/item/sign/flag/nanotrasen,
+/obj/item/desk_flag/nanotrasen,
 /turf/open/floor/mineral/plastitanium,
 /area/ship/hallway/aft)
 "wW" = (
@@ -2509,6 +2583,9 @@
 	},
 /obj/machinery/power/apc/auto_name/directional/west,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/effect/turf_decal/spline/fancy/opaque/black{
+	dir = 8
+	},
 /turf/open/floor/plasteel/tech,
 /area/ship/crew/dorm)
 "xf" = (
@@ -2524,6 +2601,7 @@
 	dir = 1
 	},
 /obj/effect/decal/cleanable/oil,
+/obj/effect/decal/cleanable/oil,
 /turf/open/floor/plasteel,
 /area/ship/cargo/port)
 "xB" = (
@@ -2566,11 +2644,11 @@
 /obj/effect/turf_decal/techfloor{
 	dir = 10
 	},
-/obj/machinery/jukebox,
 /obj/effect/turf_decal/spline/fancy/opaque/black/corner{
 	dir = 4;
 	layer = 2.1
 	},
+/obj/machinery/vending/snack/green,
 /turf/open/floor/plasteel,
 /area/ship/hallway/central)
 "yh" = (
@@ -2591,6 +2669,13 @@
 	},
 /turf/open/floor/plating,
 /area/ship/bridge)
+"yk" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/effect/turf_decal/techfloor,
+/turf/open/floor/plasteel,
+/area/ship/cargo)
 "ym" = (
 /obj/effect/turf_decal/techfloor{
 	dir = 8
@@ -2672,19 +2757,20 @@
 /turf/open/floor/plasteel/tech,
 /area/ship/general/command_crew)
 "zc" = (
+/obj/effect/turf_decal/borderfloorblack,
 /obj/structure/table/reinforced/plastitaniumglass,
+/obj/item/tape{
+	desc = "This cassette has no name, just like the tape with the film."
+	},
 /obj/structure/showcase/machinery/tv{
 	name = "\improper old TV";
 	desc = "An old broken TV. It doesn't look like it can be repaired.";
 	pixel_y = 14;
-	pixel_x = 2
-	},
-/obj/effect/turf_decal/borderfloorblack,
-/obj/item/tape{
-	desc = "This cassette has no name, just like the tape with the film."
+	pixel_x = 2;
+	layer = 3.01
 	},
 /turf/open/floor/mineral/plastitanium,
-/area/ship/crew/toilet)
+/area/ship/security/prison)
 "zf" = (
 /obj/structure/falsewall/plastitanium,
 /obj/structure/cable{
@@ -2802,6 +2888,9 @@
 	},
 /turf/open/floor/plasteel/tech,
 /area/ship/engineering/engines/port)
+"Bc" = (
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/ship/security/prison)
 "Bi" = (
 /obj/effect/turf_decal/techfloor,
 /obj/machinery/light_switch{
@@ -2819,42 +2908,15 @@
 	},
 /area/ship/engineering)
 "Bq" = (
-/obj/effect/turf_decal/techfloor{
-	dir = 9
-	},
-/obj/structure/closet/secure_closet{
-	anchored = 1;
-	icon_state = "syndicate";
-	name = "locker"
-	},
-/obj/item/tank/internals/emergency_oxygen/engi{
-	pixel_y = 5;
-	pixel_x = -8
-	},
-/obj/item/melee/knife/survival{
-	pixel_y = 4;
-	pixel_x = 8
-	},
-/obj/item/storage/bag/ore{
-	pixel_y = -8;
-	pixel_x = -4
-	},
-/obj/item/pickaxe/mini{
-	pixel_y = -4;
-	pixel_x = -5
-	},
-/obj/item/flashlight/seclite{
-	pixel_y = -11;
-	pixel_x = 5
-	},
-/obj/item/gps{
-	pixel_y = -7
-	},
-/obj/item/stack/rods/twentyfive{
-	pixel_x = 10
-	},
 /obj/machinery/light/directional/west,
-/turf/open/floor/plasteel,
+/obj/effect/turf_decal/borderfloorblack{
+	dir = 4
+	},
+/obj/machinery/suit_storage_unit/inherit/industrial,
+/obj/item/clothing/suit/space/hardsuit/security,
+/obj/item/clothing/mask/gas/vigilitas,
+/obj/item/tank/internals/oxygen/red,
+/turf/open/floor/mineral/plastitanium,
 /area/ship/cargo)
 "Bs" = (
 /obj/structure/cable{
@@ -2885,15 +2947,19 @@
 /turf/open/floor/plasteel/tech,
 /area/ship/engineering/engines/starboard)
 "By" = (
-/obj/structure/guncloset,
+/obj/structure/guncloset{
+	anchored = 1
+	},
 /obj/effect/turf_decal/borderfloorblack,
+/obj/machinery/light/directional/north,
 /obj/item/gun/ballistic/automatic/smg/cm5/compact/no_mag{
-	projectile_damage_multiplier = 1.4;
+	projectile_damage_multiplier = 1.1;
 	name = "MP5K";
-	desc = "A modification of the CM-5 with a significantly shortened barrel and removed stock. Designed for Nanotrase agents specifically for operations in confined spaces, the components were replaced with similar ones to increase stopping power, but accuracy at long ranges leaves much to be desired. Chambered in 9mm."
+	desc = "A modification of the CM-5 with a significantly shortened barrel and removed stock. Designed for Nanotrase agents specifically for operations in confined spaces, the components were replaced with similar ones to increase stopping power, but accuracy at long ranges leaves much to be desired. Chambered in 9mm.";
+	recoil = 0.5;
+	recoil_unwielded = 1
 	},
-/obj/machinery/light/directional/north,
-/obj/item/gun/ballistic/shotgun/automatic/combat/compact{
+/obj/item/gun/ballistic/shotgun/automatic/combat{
 	spawn_no_ammo = 1
 	},
 /turf/open/floor/mineral/plastitanium,
@@ -3078,22 +3144,40 @@
 	icon_state = "2-8";
 	tag = null
 	},
+/obj/effect/turf_decal/spline/fancy/opaque/black{
+	dir = 6
+	},
 /turf/open/floor/plasteel/tech,
 /area/ship/crew/dorm)
 "Ee" = (
 /obj/effect/turf_decal/techfloor{
 	dir = 5
 	},
-/obj/structure/reagent_dispensers/water_cooler{
-	pixel_x = 8;
-	layer = 3.3;
-	pixel_y = 14;
-	density = 0
-	},
 /obj/effect/turf_decal/spline/fancy/opaque/black/corner{
 	dir = 8;
 	layer = 2.1
 	},
+/obj/structure/closet/crate/bin{
+	pixel_y = 8;
+	pixel_x = 6;
+	allow_dense = 0;
+	dense_when_open = 0;
+	density = 0
+	},
+/obj/item/lipstick/random{
+	pixel_y = -6;
+	pixel_x = -9
+	},
+/obj/item/trash/can{
+	pixel_y = -6
+	},
+/obj/item/trash/energybar{
+	pixel_y = 5;
+	pixel_x = -7
+	},
+/obj/item/trash/chips{
+	pixel_y = 5
+	},
 /turf/open/floor/plasteel,
 /area/ship/hallway/central)
 "Et" = (
@@ -3227,8 +3311,8 @@
 /obj/effect/turf_decal/techfloor{
 	dir = 9
 	},
-/obj/machinery/computer/arcade/orion_trail,
 /obj/effect/turf_decal/spline/fancy/opaque/black/corner,
+/obj/machinery/vending/cola/space_up,
 /turf/open/floor/plasteel,
 /area/ship/hallway/central)
 "FG" = (
@@ -3251,14 +3335,9 @@
 	layer = 2.04
 	},
 /obj/effect/turf_decal/industrial/hatch/yellow,
-/obj/effect/decal/cleanable/oil,
-/obj/structure/reagent_dispensers/cooking_oil{
-	desc = "A huge metal vat with a tap on the front. Contains your backup fuel.";
-	name = "vat of engine oil";
-	reagent_id = /datum/reagent/fuel/oil;
-	tank_volume = 300
-	},
 /obj/machinery/light/directional/west,
+/obj/structure/closet/crate/large,
+/obj/machinery/portable_atmospherics/canister/oxygen,
 /turf/open/floor/plasteel,
 /area/ship/cargo/port)
 "FP" = (
@@ -3268,28 +3347,13 @@
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
 	dir = 8
 	},
-/obj/structure/table/reinforced/plastitaniumglass,
 /obj/effect/turf_decal/borderfloorblack{
 	dir = 8
 	},
-/obj/item/reagent_containers/glass/bottle/epinephrine{
-	pixel_x = -9;
-	pixel_y = 15
-	},
-/obj/item/reagent_containers/glass/bottle/formaldehyde{
-	pixel_x = 1;
-	pixel_y = 15
-	},
-/obj/item/storage/pill_bottle/iron{
-	pixel_y = 12;
-	pixel_x = 10
-	},
-/obj/item/storage/case/surgery{
-	pixel_x = -3
-	},
 /obj/structure/sign/poster/retro/science{
 	pixel_x = 32
 	},
+/obj/structure/bed/roller/future,
 /turf/open/floor/mineral/plastitanium,
 /area/ship/hallway/central)
 "FZ" = (
@@ -3332,6 +3396,9 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
 /turf/open/floor/plasteel,
 /area/ship/cargo)
 "Gv" = (
@@ -3345,13 +3412,18 @@
 /turf/open/floor/plasteel,
 /area/ship/hallway/central)
 "Gw" = (
-/obj/effect/turf_decal/techfloor/corner,
 /obj/structure/cable{
 	icon_state = "1-8"
 	},
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
 	dir = 1
 	},
+/obj/effect/turf_decal/techfloor{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 9
+	},
 /turf/open/floor/plasteel,
 /area/ship/cargo)
 "Hh" = (
@@ -3371,12 +3443,12 @@
 	dir = 8
 	},
 /obj/item/paper_bin{
-	pixel_x = -4;
-	pixel_y = 2
+	pixel_x = 1;
+	pixel_y = 6
 	},
 /obj/item/pen/fountain{
-	pixel_y = 2;
-	pixel_x = -3
+	pixel_y = 7;
+	pixel_x = 1
 	},
 /obj/structure/cable{
 	icon_state = "1-4"
@@ -3384,6 +3456,10 @@
 /obj/structure/cable{
 	icon_state = "2-4"
 	},
+/obj/item/desk_flag{
+	pixel_x = -10;
+	pixel_y = -7
+	},
 /turf/open/floor/plasteel/tech,
 /area/ship/general/command_crew)
 "Hs" = (
@@ -3397,6 +3473,9 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
+/obj/effect/turf_decal/spline/fancy/opaque/black{
+	dir = 10
+	},
 /turf/open/floor/plasteel/tech,
 /area/ship/crew/dorm)
 "Hz" = (
@@ -3501,13 +3580,13 @@
 /turf/open/floor/plasteel,
 /area/ship/cargo/port)
 "Jc" = (
-/obj/structure/table/optable,
 /obj/effect/turf_decal/borderfloorblack{
 	dir = 8
 	},
 /obj/machinery/defibrillator_mount/loaded{
 	pixel_y = -29
 	},
+/obj/structure/closet/crate/freezer,
 /turf/open/floor/mineral/plastitanium,
 /area/ship/hallway/central)
 "Jg" = (
@@ -3551,56 +3630,13 @@
 /area/ship/hallway/central)
 "JN" = (
 /obj/effect/turf_decal/industrial/warning/fulltile,
-/obj/structure/crate_shelf,
-/obj/structure/closet/crate,
-/obj/item/reagent_containers/condiment/flour{
-	pixel_y = -2;
-	pixel_x = 6
-	},
-/obj/item/reagent_containers/condiment/sugar{
-	pixel_x = -6;
-	pixel_y = -2
-	},
-/obj/item/reagent_containers/condiment/flour{
-	pixel_y = -8;
-	pixel_x = 6
-	},
-/obj/item/reagent_containers/condiment/rice{
-	pixel_y = -8;
-	pixel_x = -6
-	},
-/obj/item/reagent_containers/glass/bowl{
-	pixel_y = -3;
-	pixel_x = 7
-	},
-/obj/item/reagent_containers/glass/bowl{
-	pixel_y = -8;
-	pixel_x = 7
-	},
-/obj/item/kitchen/fork{
-	pixel_x = -6
-	},
-/obj/item/kitchen/fork{
-	pixel_x = -11
-	},
-/obj/item/kitchen/spoon/plastic{
-	pixel_y = -5;
-	pixel_x = -1
-	},
-/obj/item/kitchen/spoon/plastic{
-	pixel_y = -5;
-	pixel_x = -6
-	},
-/obj/item/reagent_containers/food/drinks/drinkingglass{
-	pixel_y = 5;
-	pixel_x = 12
-	},
-/obj/item/reagent_containers/food/drinks/drinkingglass{
-	pixel_y = 5;
-	pixel_x = 4
+/obj/structure/reagent_dispensers/cooking_oil{
+	desc = "A huge metal vat with a tap on the front. Contains your backup fuel.";
+	name = "vat of engine oil";
+	reagent_id = /datum/reagent/fuel/oil;
+	tank_volume = 300
 	},
-/obj/item/circuitboard/machine/oven,
-/obj/item/plate/oven_tray,
+/obj/effect/decal/cleanable/oil,
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/cargo/port)
 "JU" = (
@@ -3691,38 +3727,53 @@
 /obj/effect/turf_decal/siding/wood/end{
 	dir = 8
 	},
-/obj/structure/closet/secure_closet/wall/directional/west{
-	icon_state = "sec_wall";
-	name = "locker";
-	dir = 1;
-	pixel_x = 0;
-	pixel_y = 28
+/obj/structure/sign/poster/retro/we_watch{
+	pixel_x = -32
 	},
-/obj/machinery/light/small/broken/directional/west,
-/obj/effect/decal/cleanable/glass,
-/obj/effect/decal/cleanable/cobweb,
-/obj/item/toy/plush/narplush,
-/obj/item/modular_computer/tablet{
-	pixel_y = 4;
-	pixel_x = -5
+/obj/structure/closet/secure_closet/wall/directional/north{
+	icon_state = "sec_wall";
+	name = "locker"
 	},
 /obj/item/tape{
 	desc = "The cassette only has a partial title, the other half is marked with a black hand, the title sounds like '...t an address'. Some vandal cut the film inside the cassette.";
 	pixel_y = -6;
 	pixel_x = 6
 	},
+/obj/item/tape{
+	desc = "A cassette tape labeled 'Seventeen Months of Spring'. It likely once contained a film, but the tape is now missing.";
+	pixel_x = -4;
+	pixel_y = -3
+	},
 /obj/item/tape{
 	desc = "A cassette tape labeled 'Quiet Flows the Don'. It likely once held a film, but it's now warped.";
 	pixel_x = 8;
 	pixel_y = 7
 	},
-/obj/item/tape{
-	desc = "A cassette tape labeled 'Seventeen Months of Spring'. It likely once contained a film, but the tape is now missing.";
-	pixel_x = -4;
+/obj/machinery/camera/autoname{
+	dir = 5
+	},
+/obj/machinery/flasher{
+	name = "floor-mounted flash";
+	id = "stingray_flasher";
+	desc = "A floor-mounted flashbulb device.";
+	pixel_x = 16;
+	pixel_y = -17
+	},
+/obj/item/clothing/shoes/slippers/carp{
+	pixel_y = -6;
+	pixel_x = -6
+	},
+/obj/item/modular_computer/tablet{
+	pixel_y = 4;
+	pixel_x = -5
+	},
+/obj/item/toy/plush/narplush,
+/obj/item/toy/cards/deck/kotahi{
+	pixel_x = 6;
 	pixel_y = -3
 	},
 /turf/open/floor/carpet/green,
-/area/ship/crew/toilet)
+/area/ship/security/prison)
 "Lv" = (
 /obj/machinery/suit_storage_unit/inherit/industrial,
 /obj/item/mod/control/pre_equipped/loader{
@@ -3737,7 +3788,10 @@
 /area/ship/cargo/port)
 "LN" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
-/turf/open/floor/plasteel/tech/grid,
+/obj/effect/turf_decal/spline/fancy/opaque/black{
+	dir = 9
+	},
+/turf/open/floor/plasteel/tech,
 /area/ship/crew/dorm)
 "LP" = (
 /obj/effect/turf_decal/techfloor{
@@ -3746,15 +3800,15 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/structure/cable{
-	icon_state = "1-8"
-	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 8
 	},
+/obj/structure/cable{
+	icon_state = "1-8"
+	},
 /turf/open/floor/plasteel/stairs{
 	icon = 'icons/obj/stairs.dmi';
 	dir = 4
@@ -3789,7 +3843,7 @@
 	dir = 8;
 	layer = 2.04
 	},
-/obj/structure/ore_box,
+/obj/effect/decal/cleanable/oil,
 /turf/open/floor/plasteel,
 /area/ship/cargo/port)
 "Me" = (
@@ -3814,30 +3868,35 @@
 /obj/effect/turf_decal/borderfloorblack{
 	dir = 1
 	},
-/obj/item/radio/intercom/table{
-	dir = 1;
-	pixel_y = 4;
-	pixel_x = 4;
-	frequency = 1655
-	},
 /obj/machinery/button/door{
 	id = "Veil_vacantO_holo";
 	name = "Window Shutters";
-	pixel_y = 26;
+	pixel_y = 24;
 	req_ship_access = 1
 	},
 /obj/item/stamp/captain{
 	pixel_y = 12;
-	pixel_x = -11
+	pixel_x = 8
 	},
 /obj/item/stamp{
 	pixel_y = 7;
-	pixel_x = -11
+	pixel_x = 8
 	},
 /obj/item/stamp/denied{
-	pixel_x = -11;
+	pixel_x = 8;
 	pixel_y = 1
 	},
+/obj/item/paper/paperslip{
+	pixel_y = 1;
+	pixel_x = -11;
+	default_raw_text = "der Beginn eines Sturms im blauen Weltraum.";
+	name = "Safe"
+	},
+/obj/item/radio/old{
+	pixel_y = 13;
+	pixel_x = -8;
+	frequency = 1655
+	},
 /turf/open/floor/plasteel/tech,
 /area/ship/general/command_crew)
 "Mq" = (
@@ -3886,26 +3945,18 @@
 /obj/effect/turf_decal/techfloor{
 	dir = 5
 	},
-/obj/machinery/light/directional/north,
-/obj/structure/closet/crate/bin,
-/obj/item/lipstick/random{
-	pixel_y = -6;
-	pixel_x = -9
-	},
-/obj/item/trash/chips{
-	pixel_y = 5
-	},
-/obj/item/trash/can{
-	pixel_y = -6
-	},
-/obj/item/trash/energybar{
-	pixel_y = 5;
-	pixel_x = -7
-	},
 /obj/effect/turf_decal/spline/fancy/opaque/black/corner{
 	dir = 8;
 	layer = 2.1
 	},
+/obj/machinery/vending/cigarette{
+	all_items_free = 1
+	},
+/obj/machinery/light/directional/north,
+/obj/machinery/jukebox/boombox{
+	pixel_y = 12;
+	pixel_x = -1
+	},
 /turf/open/floor/plasteel,
 /area/ship/hallway/central)
 "MX" = (
@@ -3966,7 +4017,14 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 9
+	dir = 1
+	},
+/obj/effect/turf_decal/techfloor{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "1-4";
+	tag = null
 	},
 /turf/open/floor/plasteel,
 /area/ship/cargo)
@@ -4019,8 +4077,7 @@
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/security)
 "Ok" = (
-/obj/effect/turf_decal/industrial/defective/fulltile,
-/obj/machinery/portable_atmospherics/canister/oxygen,
+/obj/machinery/recharge_station,
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/cargo/port)
 "Om" = (
@@ -4134,6 +4191,24 @@
 	},
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/cargo/port)
+"Pt" = (
+/obj/machinery/light/directional/north,
+/obj/effect/turf_decal/borderfloorblack,
+/obj/structure/table/reinforced/plastitaniumglass,
+/obj/item/reagent_containers/glass/bottle/epinephrine{
+	pixel_x = -6;
+	pixel_y = 11
+	},
+/obj/item/reagent_containers/glass/bottle/formaldehyde{
+	pixel_x = 5;
+	pixel_y = 11
+	},
+/obj/item/reagent_containers/glass/bottle/morphine{
+	pixel_x = 2;
+	pixel_y = 5
+	},
+/turf/open/floor/mineral/plastitanium,
+/area/ship/hallway/central)
 "PG" = (
 /obj/structure/sign/number/one{
 	pixel_y = 31;
@@ -4229,22 +4304,20 @@
 	},
 /obj/item/phone{
 	pixel_y = 9;
-	pixel_x = 4
+	pixel_x = 6
 	},
 /obj/item/flashlight/lamp{
-	pixel_x = -9;
-	pixel_y = 4
-	},
-/obj/item/food/honeybar{
-	pixel_x = 8;
-	pixel_y = -2
-	},
-/obj/item/lighter/zippo{
-	pixel_y = -11
+	pixel_x = -10;
+	pixel_y = 5;
+	layer = 3.22
 	},
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
+/obj/item/food/honeybar{
+	pixel_x = 6;
+	pixel_y = -2
+	},
 /turf/open/floor/plasteel/tech,
 /area/ship/general/command_crew)
 "Re" = (
@@ -4302,20 +4375,23 @@
 /turf/open/floor/mineral/plastitanium,
 /area/ship/security)
 "RB" = (
-/obj/structure/cable,
-/obj/structure/chair/sofa/brown/old/right/directional/north,
-/obj/machinery/power/apc/auto_name/directional/east,
 /obj/effect/turf_decal/borderfloorblack{
 	dir = 1
 	},
 /obj/machinery/light_switch{
 	pixel_x = 19;
 	dir = 8;
-	pixel_y = 12
+	pixel_y = -10
+	},
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 10
+	},
+/obj/structure/cable{
+	icon_state = "1-2"
 	},
-/obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/mineral/plastitanium,
-/area/ship/crew/toilet)
+/area/ship/security/prison)
 "RW" = (
 /obj/machinery/door/firedoor/border_only,
 /obj/machinery/door/firedoor/border_only{
@@ -4332,7 +4408,6 @@
 /obj/effect/turf_decal/techfloor{
 	dir = 8
 	},
-/obj/effect/decal/cleanable/oil,
 /turf/open/floor/plasteel,
 /area/ship/cargo/port)
 "Sk" = (
@@ -4349,22 +4424,22 @@
 	req_access = list(19)
 	},
 /obj/item/clothing/accessory/holster,
-/obj/item/reagent_containers/food/drinks/bottle/moonshine,
-/obj/item/reagent_containers/food/drinks/drinkingglass,
-/obj/item/reagent_containers/food/drinks/drinkingglass,
-/obj/item/clothing/under/suit/black_really/skirt{
-	max_integrity = 10;
-	name = "strange executive suitskirt";
-	desc = "A formal black suitskirt and red tie, intended for the galaxy's finest. Be careful with this nasty thing, it has threads sticking out everywhere, who knows, maybe some joker will decide to pull one of them out.";
-	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 35, "acid" = 45)
-	},
 /obj/machinery/light/directional/south,
-/obj/item/storage/guncase/pistol/rhino,
-/obj/item/storage/box/ammo/a357,
 /obj/structure/safe{
-	number_of_tumblers = 3;
-	desc = "A huge chunk of metal with a dial embedded in it. Fine print on the dial reads \"Scarborough Arms - 3 tumbler safe, guaranteed thermite resistant, explosion resistant, and assistant resistant.\""
+	tumblers = list(24, 78)
+	},
+/obj/item/lighter/zippo/red,
+/obj/item/gun/energy/laser/captain,
+/obj/item/implanter/mindshield{
+	name = "implanter (trust)"
+	},
+/obj/item/implanter/mindshield{
+	name = "implanter (trust)"
+	},
+/obj/item/implanter/mindshield{
+	name = "implanter (trust)"
 	},
+/obj/item/disk/nuclear/fake,
 /turf/open/floor/mineral/plastitanium,
 /area/ship/general/command_crew)
 "Sy" = (
@@ -4482,7 +4557,7 @@
 /area/ship/bridge)
 "Tg" = (
 /obj/structure/curtain/cloth/grey{
-	layer = 3.5
+	layer = 3.41
 	},
 /obj/structure/bed,
 /obj/effect/turf_decal/borderfloorblack{
@@ -4526,6 +4601,9 @@
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
+/obj/structure/railing/thin{
+	dir = 4
+	},
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/hallway/central)
 "Uh" = (
@@ -4580,20 +4658,12 @@
 /obj/effect/turf_decal/borderfloorblack{
 	dir = 8
 	},
-/obj/structure/closet/secure_closet{
-	icon_door = "tac";
-	icon_state = "tac";
-	name = "equipment locker";
-	req_ship_access = 1;
-	req_access = list(1);
-	anchored = 1
+/obj/item/storage/backpack/satchel/sec{
+	pixel_y = 6
 	},
-/obj/item/storage/backpack{
+/obj/item/storage/backpack/security{
 	pixel_y = -5
 	},
-/obj/item/storage/backpack/satchel{
-	pixel_y = 6
-	},
 /obj/item/clothing/shoes/combat{
 	pixel_x = 9;
 	pixel_y = -6
@@ -4602,78 +4672,87 @@
 	pixel_y = -11;
 	pixel_x = -7
 	},
+/obj/item/clothing/gloves/tackler/combat/insulated{
+	pixel_y = -7;
+	pixel_x = -3;
+	name = "combat gloves plus";
+	desc = "These tactical gloves are fireproof and once contained nanochip technology within them, but time has not been kind to it."
+	},
 /obj/item/clothing/under/nanotrasen/medical/director{
 	pixel_y = 5;
 	pixel_x = 8;
 	desc = "A neat blue shirt with white arm bands and comfortable black slacks. DeForest Command logos are finely stitched into the collar and cuffs.";
-	name = "first officer's slacks"
+	name = "assaulter's slacks"
 	},
 /obj/item/clothing/under/nanotrasen/officer{
 	pixel_x = -7;
 	pixel_y = 7
 	},
-/obj/item/clothing/gloves/color/black{
-	pixel_y = -7;
-	pixel_x = -3;
-	icon_state = "combat";
-	name = "combat gloves plus";
-	desc = "These tactical gloves are fireproof and once contained nanochip technology within them, but time has not been kind to it.";
-	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
-	},
 /obj/item/clothing/under/syndicate/combat{
 	pixel_y = -1
 	},
+/obj/item/storage/belt/military/assault{
+	pixel_y = -7;
+	pixel_x = 6
+	},
+/obj/item/clothing/mask/gas/sechailer/swat{
+	pixel_y = 3
+	},
 /obj/item/clothing/suit/armor/vest/security/officer{
 	name = "officer's jacket";
 	desc = "This jacket is for those special occasions when a officer isn't required to wear their armor.";
 	armor = list("melee" = 10, "bullet" = 15, "laser" = 10, "energy" = 10, "bomb" = 10, "bio" = 0, "rad" = 0, "fire" = 20, "acid" = 15, "wound" = 10);
-	pixel_y = 3;
 	pixel_x = 11
 	},
 /obj/item/clothing/head/beret/sec/officer{
-	pixel_x = 10;
+	pixel_x = 11;
 	pixel_y = 14;
 	name = "officer beret";
 	armor = list("melee" = 10, "bullet" = 20, "laser" = 10, "energy" = 10, "bomb" = 15, "bio" = 0, "rad" = 0, "fire" = 35, "acid" = 25, "wound" = 10)
 	},
-/obj/item/clothing/suit/armor/nanotrasen/slim{
-	armor = list("melee" = 25, "bullet" = 35, "laser" = 15, "energy" = 30, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50, "wound" = 10);
-	name = "Degrading Slim Armor Vest";
+/obj/item/clothing/suit/armor/nanotrasen{
 	pixel_x = -8;
-	pixel_y = -3
-	},
-/obj/item/clothing/head/helmet/bulletproof/x11/nanotrasen{
-	armor = list("melee" = 20, "bullet" = 30, "laser" = 15, "energy" = 15, "bomb" = 40, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50, "wound" = 20);
-	name = "Degrading Vigilitas Helmet";
-	desc = "A bulky helmet in the X-11 pattern, utilized by Vigilitas and NT loss prevention!";
-	pixel_y = 8;
-	pixel_x = -8
+	pixel_y = -3;
+	name = "Degrading Slim Armor Vest"
 	},
-/obj/item/storage/belt/military/assault{
-	pixel_y = -7;
-	pixel_x = 6
+/obj/item/clothing/head/helmet/riot/nanotrasen{
+	pixel_y = 11;
+	pixel_x = -8;
+	armor = list("melee" = 40, "bullet" = 35, "laser" = 35, "energy" = 25, "bomb" = 30, "bio" = 75, "fire" = 40, "acid" = 50, "wound" = 20);
+	name = "Degrading Vigilitas Riot Helmet"
 	},
 /obj/item/clothing/glasses/sunglasses/ballistic{
 	pixel_y = 3;
 	pixel_x = -6
 	},
-/obj/item/clothing/mask/gas/sechailer/swat{
-	pixel_y = 3
-	},
-/obj/item/clothing/mask/breath/facemask{
-	pixel_y = 8;
-	pixel_x = 10
+/obj/structure/closet/secure_closet{
+	icon_door = "tac";
+	icon_state = "tac";
+	name = "Assaulter locker";
+	req_ship_access = 1;
+	req_access = list(1);
+	anchored = 1
 	},
 /turf/open/floor/mineral/plastitanium,
 /area/ship/security)
 "UZ" = (
-/obj/structure/falsewall/plastitanium,
 /obj/structure/cable{
-	icon_state = "4-8"
+	icon_state = "1-2"
 	},
-/obj/effect/decal/cleanable/sprayweb,
-/turf/open/floor/plating,
-/area/ship/crew/toilet)
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/door/firedoor/border_only{
+	dir = 1
+	},
+/obj/machinery/door/airlock/maintenance/external/glass{
+	name = "Prisoner Quartures"
+	},
+/obj/machinery/door/poddoor/shutters/preopen{
+	id = "stingray_cell"
+	},
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/security/prison)
 "Vl" = (
 /obj/effect/turf_decal/techfloor{
 	dir = 4
@@ -4731,18 +4810,18 @@
 /turf/open/floor/plasteel/tech,
 /area/ship/engineering/engines/starboard)
 "VA" = (
-/obj/effect/turf_decal/techfloor/corner{
-	dir = 1
-	},
 /obj/structure/cable{
 	icon_state = "2-4"
 	},
+/obj/effect/turf_decal/techfloor{
+	dir = 8
+	},
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+	dir = 4
+	},
 /turf/open/floor/plasteel,
 /area/ship/cargo)
 "VN" = (
-/obj/effect/turf_decal/techfloor{
-	dir = 6
-	},
 /obj/item/kirbyplants{
 	icon_state = "plant-22";
 	pixel_x = 7;
@@ -4761,6 +4840,9 @@
 	pixel_y = -22;
 	dir = 1
 	},
+/obj/effect/turf_decal/techfloor{
+	dir = 6
+	},
 /turf/open/floor/plasteel,
 /area/ship/cargo)
 "VR" = (
@@ -4961,14 +5043,13 @@
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/obj/structure/cable{
-	icon_state = "1-4";
-	tag = null
-	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 1
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/effect/turf_decal/techfloor{
+	dir = 4
+	},
 /turf/open/floor/plasteel,
 /area/ship/cargo)
 "Xs" = (
@@ -4978,9 +5059,9 @@
 /obj/structure/closet/wall/directional/east{
 	name = "locker"
 	},
-/obj/item/soap{
+/obj/item/soap/nanotrasen{
 	pixel_y = -9;
-	pixel_x = -6
+	pixel_x = -7
 	},
 /obj/item/towel{
 	pixel_y = -3;
@@ -5094,23 +5175,48 @@
 /turf/open/floor/mineral/plastitanium,
 /area/ship/security)
 "Zc" = (
-/obj/effect/turf_decal/techfloor{
-	dir = 4
+/obj/effect/turf_decal/borderfloorblack{
+	dir = 8
 	},
-/obj/structure/table/reinforced/plastitaniumglass,
-/obj/item/storage/toolbox/electrical{
-	pixel_y = 11;
-	pixel_x = -2
+/obj/machinery/power/apc/auto_name/directional/east,
+/obj/structure/cable{
+	icon_state = "0-8"
 	},
-/obj/item/storage/toolbox/mechanical{
-	pixel_y = 4;
-	pixel_x = -2
+/obj/structure/closet/secure_closet{
+	anchored = 1;
+	icon_state = "syndicate";
+	name = "locker"
 	},
-/obj/item/binoculars{
-	pixel_y = -12
+/obj/item/storage/box/zipties{
+	pixel_x = 5;
+	pixel_y = 9
 	},
-/obj/machinery/airalarm/directional/east,
-/turf/open/floor/plasteel,
+/obj/item/card/id/syndicate/anyone{
+	pixel_y = -7
+	},
+/obj/item/stock_parts/cell/gun{
+	pixel_y = 5;
+	pixel_x = -7
+	},
+/obj/item/gun/energy/e_gun/advtaser{
+	pixel_x = -6;
+	pixel_y = -8
+	},
+/obj/item/melee/classic_baton/telescopic{
+	pixel_y = -4;
+	pixel_x = 4
+	},
+/obj/item/reagent_containers/spray/pepper{
+	pixel_y = -7;
+	pixel_x = 10
+	},
+/obj/item/clothing/mask/muzzle{
+	pixel_y = 5
+	},
+/obj/item/clothing/glasses/blindfold{
+	pixel_y = 7
+	},
+/turf/open/floor/mineral/plastitanium,
 /area/ship/cargo)
 "Zf" = (
 /obj/effect/turf_decal/siding/white{
@@ -5132,10 +5238,12 @@
 /turf/open/floor/mineral/plastitanium,
 /area/ship/security)
 "Zu" = (
-/obj/effect/turf_decal/techfloor,
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
+/obj/effect/turf_decal/techfloor{
+	dir = 10
+	},
 /turf/open/floor/plasteel,
 /area/ship/cargo)
 "Zx" = (
@@ -5164,11 +5272,62 @@
 /obj/effect/turf_decal/techfloor{
 	dir = 9
 	},
-/obj/machinery/vending/snack/green,
+/obj/effect/turf_decal/spline/fancy/opaque/black/corner,
 /obj/structure/sign/poster/pol/pol_5{
 	pixel_y = 32
 	},
-/obj/effect/turf_decal/spline/fancy/opaque/black/corner,
+/obj/machinery/button/flasher{
+	dir = 4;
+	pixel_x = -19;
+	pixel_y = -3;
+	id = "stingray_flasher"
+	},
+/obj/machinery/button/door{
+	dir = 4;
+	pixel_x = -21;
+	pixel_y = 6;
+	id = "stingray_cell";
+	name = "lockdown button"
+	},
+/obj/structure/closet/secure_closet{
+	anchored = 1;
+	icon_state = "syndicate";
+	name = "locker"
+	},
+/obj/item/card/id/prisoner/two{
+	pixel_y = -2
+	},
+/obj/item/card/id/prisoner/one{
+	pixel_y = -6
+	},
+/obj/item/clothing/suit/straight_jacket,
+/obj/item/clothing/suit/straight_jacket{
+	pixel_y = -7
+	},
+/obj/item/clothing/under/rank/prisoner/protected_custody/skirt{
+	pixel_x = 5;
+	pixel_y = 4
+	},
+/obj/item/clothing/under/rank/prisoner/protected_custody/skirt{
+	pixel_x = 5;
+	pixel_y = 8
+	},
+/obj/item/clothing/under/rank/prisoner/protected_custody{
+	pixel_x = -8;
+	pixel_y = 2
+	},
+/obj/item/clothing/under/rank/prisoner/protected_custody{
+	pixel_x = -8;
+	pixel_y = 8
+	},
+/obj/item/clothing/shoes/sneakers/orange{
+	pixel_x = 6;
+	pixel_y = -12
+	},
+/obj/item/clothing/shoes/sneakers/orange{
+	pixel_x = -6;
+	pixel_y = -12
+	},
 /turf/open/floor/plasteel,
 /area/ship/hallway/central)
 
@@ -5576,7 +5735,7 @@ bS
 VS
 Vx
 VS
-ab
+bS
 oW
 aZ
 mW
@@ -5901,7 +6060,7 @@ Cf
 tU
 mX
 Gr
-Zu
+yk
 BS
 id
 id
@@ -5987,7 +6146,7 @@ XT
 XT
 Lg
 sf
-wc
+Bc
 ZU
 NU
 kb
@@ -6018,13 +6177,13 @@ BD
 Cn
 mf
 mf
-wc
+Bc
 zc
 rZ
 RB
-wc
+UZ
 ow
-vF
+nD
 Ag
 Yl
 Yl
@@ -6055,7 +6214,7 @@ mf
 mf
 wc
 wc
-UZ
+wc
 wc
 wc
 MS
@@ -6071,7 +6230,7 @@ Yl
 KG
 sW
 Mq
-FP
+iA
 FP
 zf
 FP
@@ -6128,7 +6287,7 @@ wc
 wc
 SK
 wc
-iW
+Pt
 nF
 lK
 ft
@@ -6140,7 +6299,7 @@ Yl
 uB
 Uh
 bc
-iW
+nn
 FP
 Xs
 FP
diff --git a/mod_celadon/outfit/code/pirate/_outfit.dm b/mod_celadon/outfit/code/pirate/_outfit.dm
index 7c02e45f0b85..f9b5e09d6c5b 100644
--- a/mod_celadon/outfit/code/pirate/_outfit.dm
+++ b/mod_celadon/outfit/code/pirate/_outfit.dm
@@ -48,6 +48,24 @@
 	implants = list(/obj/item/implant/radio)
 	accessory = null
 
+/datum/outfit/job/cel/pirate/captain/stingray
+	name = "Pirate - Captain (Defector)"
+	job_icon = "piratecaptain"
+
+	uniform = /obj/item/clothing/under/nanotrasen/officer
+	gloves = /obj/item/clothing/gloves/color/black
+	suit = null
+	head = /obj/item/clothing/head/beret/black
+	shoes = /obj/item/clothing/shoes/jackboots
+	mask = /obj/item/clothing/mask/gas/sechailer/sec
+	ears = /obj/item/radio/headset/pirate/alt/captain
+	accessory = null
+
+	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
+
 // MARK: Head of Personal
 /datum/outfit/job/cel/pirate/hop
 	name = "Pirate - Bridge Officer"
@@ -63,6 +81,26 @@
 	gloves = /obj/item/clothing/gloves/combat
 	r_pocket = /obj/item/melee/knife/survival
 
+/datum/outfit/job/cel/pirate/hop/stingray
+	name = "Pirate - Bridge Officer (Defector)"
+	id_assignment = null
+	jobtype = /datum/job/head_of_personnel
+
+	id = /obj/item/card/id/cel/pirate/headofpersonnel
+	ears = /obj/item/radio/headset/pirate/alt
+	uniform = /obj/item/clothing/under/nanotrasen/affairs
+	shoes = /obj/item/clothing/shoes/jackboots
+	glasses = /obj/item/clothing/glasses/sunglasses
+	gloves = /obj/item/clothing/gloves/color/black
+	mask = /obj/item/clothing/mask/gas/sechailer/sec
+	head = null
+	r_pocket = null
+
+	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
+
 // MARK: Head of Security
 /datum/outfit/job/cel/pirate/hos
 	name = "Frontiersmen - Deck Boss"
@@ -147,6 +185,21 @@
 
 	implants = list(/obj/item/implant/radio)
 
+/datum/outfit/job/cel/pirate/security/stingray
+	name = "Pirate - Security Officer (Defector)"
+
+	uniform = /obj/item/clothing/under/nanotrasen/security
+	head = /obj/item/clothing/head/beret
+	shoes = /obj/item/clothing/shoes/jackboots
+	l_pocket = /obj/item/flashlight/seclite
+	mask = /obj/item/clothing/mask/gas/sechailer/sec
+	suit = null
+
+	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
+
 // MARK: Medic
 /datum/outfit/job/cel/pirate/medic
 	name = "Pirate - Medical Doctor"