From 5aae4aaa4cc3f6c0a3813f9c4e2981328a699ad8 Mon Sep 17 00:00:00 2001
From: Ratvar <supermajormeltdown@gmail.com>
Date: Sat, 30 Nov 2024 20:27:38 -0800
Subject: [PATCH 01/14] =?UTF-8?q?bye=20bye=20longetm=20AGONY=20hello=20son?=
 =?UTF-8?q?nens=C3=B6ldner?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 _maps/configs/solgov_paracelsus.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/_maps/configs/solgov_paracelsus.json b/_maps/configs/solgov_paracelsus.json
index 0e9695952e16..edae442b4dfd 100644
--- a/_maps/configs/solgov_paracelsus.json
+++ b/_maps/configs/solgov_paracelsus.json
@@ -33,6 +33,10 @@
 			"outfit": "/datum/outfit/job/solgov/engineer",
 			"slots": 1
 		},
+		"Sonnensöldner": {
+			"outfit": "/datum/outfit/job/solgov/sonnensoldner",
+			"slots": 3
+		},
 		"Psychologist": {
 			"outfit": "/datum/outfit/job/solgov/psychologist",
 			"slots": 1
@@ -44,10 +48,6 @@
 		"Scribe": {
 			"outfit": "/datum/outfit/job/solgov/assistant",
 			"slots" : 3
-		},
-		"Attentive Care Patient": {
-			"outfit": "/datum/outfit/job/solgov/patient",
-			"slots" : 3
 		}
 
 	},

From 70380da5eb483070a804abd931b22c126c57312e Mon Sep 17 00:00:00 2001
From: Ratvar <supermajormeltdown@gmail.com>
Date: Sat, 30 Nov 2024 20:28:24 -0800
Subject: [PATCH 02/14] remaps the paracelsus slightly

---
 _maps/shuttles/solgov/solgov_paracelsus.dmm | 52 +++++++++++----------
 1 file changed, 27 insertions(+), 25 deletions(-)

diff --git a/_maps/shuttles/solgov/solgov_paracelsus.dmm b/_maps/shuttles/solgov/solgov_paracelsus.dmm
index 4c749a5744fe..7c9567bc56f2 100644
--- a/_maps/shuttles/solgov/solgov_paracelsus.dmm
+++ b/_maps/shuttles/solgov/solgov_paracelsus.dmm
@@ -829,8 +829,8 @@
 /obj/effect/turf_decal/borderfloorblack{
 	dir = 8
 	},
-/obj/effect/turf_decal/industrial/outline/yellow,
-/obj/structure/closet/crate/freezer/surplus_limbs/organs,
+/obj/machinery/autolathe,
+/obj/effect/turf_decal/industrial/outline/orange,
 /turf/open/floor/plasteel/mono,
 /area/ship/cargo/office)
 "is" = (
@@ -2102,6 +2102,7 @@
 	icon_state = "1-2"
 	},
 /obj/effect/turf_decal/siding/wood/corner,
+/obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/plasteel/patterned,
 /area/ship/cargo/office)
 "vi" = (
@@ -3352,11 +3353,11 @@
 /turf/open/floor/plasteel/patterned,
 /area/ship/cargo/office)
 "Gk" = (
-/obj/effect/decal/cleanable/dirt/dust,
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
 	dir = 1
 	},
 /obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/plasteel/patterned,
 /area/ship/cargo/office)
 "GG" = (
@@ -3572,7 +3573,6 @@
 /obj/item/folder/solgov,
 /obj/item/folder/solgov,
 /obj/item/folder/documents/solgov,
-/obj/item/folder/documents/solgov,
 /obj/structure/closet/secure_closet{
 	icon_state = "cap";
 	name = "\proper captain's locker";
@@ -3900,7 +3900,6 @@
 	pixel_y = -6;
 	specialfunctions = 4
 	},
-/obj/machinery/autolathe,
 /turf/open/floor/plasteel/white,
 /area/ship/medical)
 "LS" = (
@@ -4229,13 +4228,30 @@
 /turf/open/floor/plasteel/patterned/ridged,
 /area/ship/cargo/office)
 "OX" = (
-/obj/machinery/light/directional/west,
 /obj/effect/turf_decal/borderfloorblack{
 	dir = 8
 	},
-/obj/effect/turf_decal/industrial/outline/yellow,
-/obj/structure/reagent_dispensers/fueltank,
-/turf/open/floor/plasteel/mono,
+/obj/effect/turf_decal/industrial/outline/red,
+/obj/structure/closet/secure_closet/security{
+	anchored = 1;
+	name = "sonnensöldners's locker";
+	populate = 0
+	},
+/obj/item/clothing/head/solgov/sonnensoldner,
+/obj/item/radio{
+	icon_state = "sec_radio"
+	},
+/obj/item/clothing/under/solgov/formal,
+/obj/item/clothing/under/solgov/dress,
+/obj/item/clothing/under/solgov,
+/obj/item/clothing/shoes/workboots,
+/obj/item/clothing/gloves/combat,
+/obj/item/storage/belt/sabre/solgov,
+/obj/item/radio/headset/solgov/alt,
+/obj/item/storage/backpack,
+/obj/item/clothing/suit/armor/vest/solgov,
+/obj/item/clothing/suit/armor/vest/solgov,
+/turf/open/floor/plasteel/patterned,
 /area/ship/cargo/office)
 "OZ" = (
 /obj/structure/closet/secure_closet/personal/patient,
@@ -4736,7 +4752,6 @@
 /obj/effect/turf_decal/siding/wood{
 	dir = 4
 	},
-/obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/plasteel/patterned,
 /area/ship/cargo/office)
 "Tm" = (
@@ -5110,6 +5125,7 @@
 	pixel_y = 30
 	},
 /obj/effect/turf_decal/industrial/outline/yellow,
+/obj/structure/closet/crate/freezer/surplus_limbs/organs,
 /turf/open/floor/plasteel/mono,
 /area/ship/cargo/office)
 "WG" = (
@@ -5154,21 +5170,7 @@
 /obj/effect/turf_decal/techfloor{
 	dir = 10
 	},
-/obj/structure/table,
-/obj/item/cigbutt{
-	pixel_y = 5
-	},
-/obj/item/cigbutt{
-	pixel_y = 15
-	},
-/obj/item/cigbutt{
-	pixel_x = -11;
-	pixel_y = 9
-	},
-/obj/item/clothing/mask/cigarette/robust{
-	pixel_x = 8;
-	pixel_y = 10
-	},
+/obj/structure/reagent_dispensers/fueltank,
 /turf/open/floor/plasteel/tech/techmaint,
 /area/ship/maintenance/port)
 "Xe" = (

From 9ba3f0e7d38b0a40d0bfd8b9dfd7bad9014660eb Mon Sep 17 00:00:00 2001
From: Ratvar <supermajormeltdown@gmail.com>
Date: Sun, 1 Dec 2024 12:18:08 -0800
Subject: [PATCH 03/14] okay dokes we have got the paracelsus map part done
 (THANK YOU JEDI FOR THE IDEAS)

---
 _maps/shuttles/solgov/solgov_paracelsus.dmm | 924 ++++++++++++--------
 1 file changed, 544 insertions(+), 380 deletions(-)

diff --git a/_maps/shuttles/solgov/solgov_paracelsus.dmm b/_maps/shuttles/solgov/solgov_paracelsus.dmm
index 7c9567bc56f2..30fd67d19140 100644
--- a/_maps/shuttles/solgov/solgov_paracelsus.dmm
+++ b/_maps/shuttles/solgov/solgov_paracelsus.dmm
@@ -165,7 +165,15 @@
 /obj/structure/chair/wood{
 	dir = 1
 	},
-/obj/machinery/computer/helm/viewscreen/directional/south,
+/obj/structure/sign/solgov_flag{
+	dir = 8;
+	pixel_x = 28
+	},
+/obj/machinery/light_switch{
+	dir = 1;
+	pixel_x = 6;
+	pixel_y = -21
+	},
 /turf/open/floor/wood/ebony,
 /area/ship/crew/crewtwo)
 "bD" = (
@@ -192,12 +200,28 @@
 /turf/open/floor/plasteel/white,
 /area/ship/hallway/port)
 "cf" = (
-/obj/effect/turf_decal/siding/wood{
-	color = "#332521";
-	dir = 4
+/obj/structure/bed,
+/obj/item/bedsheet/solgov,
+/obj/machinery/light/directional/east,
+/obj/machinery/button/door{
+	id = "sg_par_psych";
+	name = "psychology office privacy shutters";
+	pixel_x = 6;
+	pixel_y = 24
 	},
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/wood/ebony,
+/obj/machinery/button/door{
+	id = "sg_par_psychlock";
+	name = "psychology office door bolt";
+	normaldoorcontrol = 1;
+	pixel_x = -6;
+	pixel_y = 24;
+	specialfunctions = 4
+	},
+/obj/structure/curtain/cloth,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+	dir = 8
+	},
+/turf/open/floor/carpet/royalblue,
 /area/ship/crew/office)
 "cg" = (
 /obj/structure/chair/sofa/brown/right/directional/north,
@@ -221,8 +245,8 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/crew/toilet)
 "cr" = (
-/obj/effect/turf_decal/siding/wood{
-	dir = 1
+/obj/structure/cable{
+	icon_state = "1-2"
 	},
 /turf/open/floor/wood,
 /area/ship/crew/crewtwo)
@@ -335,8 +359,14 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/maintenance/starboard)
 "dh" = (
-/turf/open/floor/wood/ebony,
-/area/ship/crew/dorm)
+/obj/effect/turf_decal/borderfloorblack{
+	dir = 8
+	},
+/obj/effect/turf_decal/industrial/warning{
+	dir = 1
+	},
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/crew/crewtwo)
 "dj" = (
 /obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/on/layer2{
 	dir = 8
@@ -450,6 +480,12 @@
 /obj/machinery/door/poddoor/shutters,
 /turf/open/floor/plating,
 /area/ship/crew/crewtwo)
+"ev" = (
+/obj/effect/turf_decal/industrial/warning{
+	dir = 1
+	},
+/turf/open/floor/plasteel/mono,
+/area/ship/crew/crewtwo)
 "eC" = (
 /obj/effect/turf_decal/trimline/opaque/solgovblue/filled/corner,
 /obj/effect/turf_decal/trimline/opaque/solgovblue/filled/corner{
@@ -501,6 +537,26 @@
 	},
 /turf/open/floor/plasteel/white,
 /area/ship/medical/surgery)
+"fg" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 6
+	},
+/obj/structure/table/wood,
+/obj/item/paper_bin{
+	pixel_x = 9;
+	pixel_y = 0
+	},
+/obj/item/pen/solgov{
+	pixel_x = 9;
+	pixel_y = 2
+	},
+/obj/item/folder/solgov{
+	pixel_x = -6;
+	pixel_y = -1
+	},
+/obj/item/radio/intercom/directional/east,
+/turf/open/floor/carpet/royalblue,
+/area/outpost/security/armory)
 "fl" = (
 /obj/structure/chair/wood{
 	dir = 8
@@ -605,12 +661,29 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/maintenance/port)
 "gK" = (
-/obj/structure/bed,
-/obj/item/bedsheet/solgov,
-/obj/machinery/firealarm/directional/north,
-/obj/machinery/light/directional/east,
+/obj/effect/turf_decal/siding/wood{
+	dir = 10
+	},
+/obj/structure/closet/secure_closet/security{
+	anchored = 1;
+	name = "sonnensöldners's locker";
+	populate = 0
+	},
+/obj/item/clothing/suit/armor/vest/solgov,
+/obj/item/storage/backpack,
+/obj/item/radio/headset/solgov/alt,
+/obj/item/clothing/gloves/combat,
+/obj/item/storage/belt/sabre/solgov,
+/obj/item/clothing/shoes/workboots,
+/obj/item/clothing/under/solgov,
+/obj/item/clothing/under/solgov/dress,
+/obj/item/radio{
+	icon_state = "sec_radio"
+	},
+/obj/item/clothing/under/solgov/formal,
+/obj/item/clothing/head/solgov/sonnensoldner,
 /turf/open/floor/carpet/royalblue,
-/area/ship/crew/office)
+/area/outpost/security/armory)
 "gQ" = (
 /obj/effect/turf_decal/industrial/warning{
 	dir = 4
@@ -687,8 +760,8 @@
 "hd" = (
 /obj/structure/sink/kitchen{
 	dir = 8;
-	pixel_x = 12;
-	pixel_y = 8
+	pixel_x = -1;
+	pixel_y = -2
 	},
 /obj/effect/turf_decal/trimline/opaque/solgovblue/filled/line,
 /obj/effect/turf_decal/borderfloorwhite{
@@ -787,13 +860,7 @@
 /turf/open/floor/wood/ebony,
 /area/ship/crew/dorm)
 "if" = (
-/obj/structure/table/wood,
 /obj/machinery/light/directional/west,
-/obj/machinery/computer/med_data/laptop{
-	dir = 4;
-	pixel_x = -4;
-	pixel_y = 7
-	},
 /turf/open/floor/wood/ebony,
 /area/ship/crew/crewtwo)
 "io" = (
@@ -829,8 +896,8 @@
 /obj/effect/turf_decal/borderfloorblack{
 	dir = 8
 	},
+/obj/effect/turf_decal/industrial/outline/yellow,
 /obj/machinery/autolathe,
-/obj/effect/turf_decal/industrial/outline/orange,
 /turf/open/floor/plasteel/mono,
 /area/ship/cargo/office)
 "is" = (
@@ -874,15 +941,18 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/cargo)
 "iW" = (
-/obj/effect/turf_decal/siding/wood{
-	dir = 8
+/obj/machinery/door/airlock/security/glass/seclock{
+	name = "Sonnensoldner Chambers"
 	},
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/siding/wood{
-	dir = 4
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 1
 	},
-/turf/open/floor/wood,
-/area/ship/crew/crewtwo)
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/plasteel/dark,
+/area/outpost/security/armory)
 "iZ" = (
 /obj/structure/grille,
 /turf/open/floor/plating,
@@ -1074,6 +1144,14 @@
 /obj/effect/turf_decal/solgov/all/center_left,
 /turf/open/floor/plasteel/mono,
 /area/ship/cargo)
+"kN" = (
+/obj/structure/grille,
+/obj/structure/window/reinforced/fulltile/shuttle,
+/obj/machinery/door/poddoor/shutters{
+	id = "sg_par_sonnen"
+	},
+/turf/open/floor/plating,
+/area/outpost/security/armory)
 "kO" = (
 /obj/effect/turf_decal/techfloor/corner{
 	dir = 8
@@ -1098,6 +1176,26 @@
 "kR" = (
 /turf/open/floor/plasteel/mono,
 /area/ship/cargo)
+"kU" = (
+/obj/structure/curtain/cloth,
+/obj/structure/bed,
+/obj/item/bedsheet/solgov,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+	dir = 8
+	},
+/obj/machinery/light_switch{
+	pixel_x = 11;
+	pixel_y = 22
+	},
+/obj/machinery/button/door{
+	dir = 8;
+	id = "sg_par_dorms";
+	name = "shutter control";
+	pixel_x = 20;
+	pixel_y = 7
+	},
+/turf/open/floor/wood/ebony,
+/area/outpost/security/armory)
 "kW" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/machinery/suit_storage_unit/inherit,
@@ -1257,6 +1355,17 @@
 	},
 /turf/open/floor/plasteel,
 /area/ship/cargo)
+"mT" = (
+/obj/machinery/power/apc/auto_name/directional/west,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 5
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 1
+	},
+/obj/structure/cable,
+/turf/open/floor/wood,
+/area/outpost/security/armory)
 "nb" = (
 /obj/effect/turf_decal/solgov/all/bottom_left,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
@@ -1271,19 +1380,7 @@
 /obj/effect/turf_decal/borderfloorblack{
 	dir = 4
 	},
-/obj/effect/turf_decal/siding/yellow{
-	dir = 1
-	},
-/obj/structure/cable{
-	icon_state = "0-8"
-	},
-/obj/machinery/door/poddoor{
-	id = "sg_par_cargo1"
-	},
-/obj/machinery/power/shieldwallgen/atmos/roundstart{
-	dir = 8;
-	id = "sg_par_holocargo1"
-	},
+/obj/effect/turf_decal/solgov/all/top_right,
 /turf/open/floor/plasteel/patterned/ridged,
 /area/ship/cargo/office)
 "nq" = (
@@ -1319,16 +1416,6 @@
 	dir = 8
 	},
 /obj/effect/turf_decal/industrial/warning,
-/obj/structure/cable{
-	icon_state = "0-4"
-	},
-/obj/machinery/door/poddoor{
-	id = "sg_par_cargo2"
-	},
-/obj/machinery/power/shieldwallgen/atmos/roundstart{
-	dir = 4;
-	id = "sg_par_holocargo2"
-	},
 /turf/open/floor/plasteel/patterned/ridged,
 /area/ship/cargo/office)
 "nG" = (
@@ -1344,14 +1431,24 @@
 /turf/open/floor/carpet/royalblue,
 /area/ship/crew/office)
 "nZ" = (
-/obj/structure/grille,
-/obj/machinery/door/poddoor/shutters/preopen{
-	dir = 1;
-	id = "sg_par_psych"
+/obj/effect/turf_decal/borderfloorblack{
+	dir = 8
 	},
-/obj/structure/window/reinforced/fulltile/shuttle,
-/turf/open/floor/plating,
-/area/ship/crew/office)
+/obj/effect/turf_decal/siding/wood/corner{
+	dir = 8
+	},
+/obj/structure/cable{
+	icon_state = "0-4"
+	},
+/obj/machinery/power/shieldwallgen/atmos/roundstart{
+	dir = 4;
+	id = "sg_par_holocargo2"
+	},
+/obj/machinery/door/poddoor{
+	id = "sg_par_cargo2"
+	},
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/crew/crewtwo)
 "oo" = (
 /obj/machinery/smartfridge/organ,
 /turf/closed/wall/mineral/titanium/nodiagonal,
@@ -1362,10 +1459,21 @@
 	dir = 8
 	},
 /obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 5
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 9
+	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
 /turf/open/floor/wood/ebony,
 /area/ship/crew/office)
 "os" = (
-/obj/structure/closet/crate/bin,
+/obj/structure/table/wood,
+/obj/item/paper_bin,
+/obj/item/pen/solgov,
 /turf/open/floor/wood/ebony,
 /area/ship/crew/crewtwo)
 "ot" = (
@@ -1470,10 +1578,22 @@
 /turf/open/floor/wood/mahogany,
 /area/ship/bridge)
 "oU" = (
-/obj/item/radio/intercom/directional/west,
 /obj/effect/turf_decal/borderfloorblack{
 	dir = 8
 	},
+/obj/machinery/power/shieldwallgen/atmos/roundstart{
+	dir = 4;
+	id = "sg_par_holocargo1"
+	},
+/obj/structure/cable{
+	icon_state = "0-4"
+	},
+/obj/machinery/door/poddoor{
+	id = "sg_par_cargo1"
+	},
+/obj/effect/turf_decal/siding/yellow{
+	dir = 1
+	},
 /turf/open/floor/plasteel/patterned/ridged,
 /area/ship/cargo/office)
 "oZ" = (
@@ -1498,6 +1618,7 @@
 /obj/effect/turf_decal/siding/wood{
 	dir = 4
 	},
+/obj/structure/closet/crate/bin,
 /turf/open/floor/wood,
 /area/ship/crew/crewtwo)
 "pe" = (
@@ -1525,16 +1646,11 @@
 /turf/open/floor/plasteel/tech/techmaint,
 /area/ship/maintenance/starboard)
 "py" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 9
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 5
-	},
-/obj/structure/cable{
-	icon_state = "1-8"
-	},
 /obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/turf_decal/siding/wood{
+	color = "#332521";
+	dir = 4
+	},
 /turf/open/floor/wood/ebony,
 /area/ship/crew/office)
 "pA" = (
@@ -1641,8 +1757,8 @@
 /turf/closed/wall/mineral/titanium,
 /area/ship/cargo)
 "qs" = (
-/obj/item/kirbyplants/random,
 /obj/effect/turf_decal/siding/wood,
+/obj/machinery/vending/coffee,
 /turf/open/floor/wood,
 /area/ship/crew/crewtwo)
 "qw" = (
@@ -1686,6 +1802,15 @@
 /obj/machinery/light/directional/east,
 /turf/open/floor/mineral/titanium/tiled/white,
 /area/ship/medical/surgery)
+"qK" = (
+/obj/effect/turf_decal/borderfloorblack{
+	dir = 4
+	},
+/obj/effect/turf_decal/industrial/warning{
+	dir = 1
+	},
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/crew/crewtwo)
 "qL" = (
 /turf/closed/wall/mineral/titanium,
 /area/ship/crew/cryo)
@@ -1806,18 +1931,13 @@
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/plasteel/patterned,
 /area/ship/cargo/office)
+"rE" = (
+/obj/structure/table/wood,
+/obj/machinery/computer/med_data/laptop,
+/turf/open/floor/wood/ebony,
+/area/ship/crew/crewtwo)
 "rK" = (
 /obj/effect/turf_decal/industrial/warning,
-/obj/structure/cable{
-	icon_state = "1-8"
-	},
-/obj/structure/cable{
-	icon_state = "1-4"
-	},
-/obj/structure/cable,
-/obj/machinery/door/poddoor{
-	id = "sg_par_cargo2"
-	},
 /turf/open/floor/plasteel/mono,
 /area/ship/cargo/office)
 "rM" = (
@@ -1863,6 +1983,11 @@
 /turf/open/floor/wood/yew,
 /area/ship/crew)
 "sk" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
 /turf/open/floor/wood,
 /area/ship/hallway/starboard)
 "sl" = (
@@ -1900,13 +2025,6 @@
 /turf/open/floor/plating,
 /area/ship/medical/surgery)
 "sC" = (
-/obj/machinery/button/door{
-	dir = 1;
-	id = "sg_par_cargo1";
-	name = "cargo blast door control";
-	pixel_x = -8;
-	pixel_y = -23
-	},
 /obj/machinery/button/door{
 	dir = 1;
 	id = "sg_par_cargo2";
@@ -1917,6 +2035,12 @@
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
 	dir = 4
 	},
+/obj/machinery/button/shieldwallgen{
+	dir = 1;
+	id = "sg_par_holocargo1";
+	pixel_x = -5;
+	pixel_y = -21
+	},
 /turf/open/floor/wood,
 /area/ship/cargo/office)
 "sF" = (
@@ -1929,9 +2053,17 @@
 /turf/open/floor/carpet/royalblue,
 /area/ship/crew)
 "sS" = (
-/obj/structure/curtain/cloth,
-/turf/open/floor/carpet/royalblue,
-/area/ship/crew/office)
+/obj/structure/cable{
+	icon_state = "2-4"
+	},
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
+/obj/machinery/door/poddoor{
+	id = "sg_par_cargo2"
+	},
+/turf/open/floor/plasteel/mono,
+/area/ship/crew/crewtwo)
 "sW" = (
 /obj/structure/fireplace{
 	dir = 4
@@ -1963,11 +2095,15 @@
 /area/ship/maintenance/starboard)
 "tr" = (
 /obj/structure/table/chem,
-/obj/item/reagent_containers/glass/filter,
 /obj/effect/turf_decal/siding/thinplating/light{
 	dir = 1
 	},
 /obj/machinery/light/directional/north,
+/obj/item/reagent_containers/glass/filter{
+	pixel_x = -10;
+	pixel_y = 2
+	},
+/obj/structure/sink/chem,
 /turf/open/floor/mineral/titanium/tiled/white,
 /area/ship/medical)
 "tu" = (
@@ -1996,18 +2132,21 @@
 /area/ship/cargo/office)
 "tP" = (
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 4
+/obj/effect/turf_decal/siding/wood{
+	dir = 1
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 8
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+	dir = 1
 	},
-/obj/effect/turf_decal/siding/wood{
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
 	dir = 1
 	},
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
+/obj/structure/cable{
+	icon_state = "2-4"
+	},
 /turf/open/floor/wood,
 /area/ship/hallway/starboard)
 "tW" = (
@@ -2036,6 +2175,14 @@
 	},
 /turf/open/floor/wood/mahogany,
 /area/ship/bridge)
+"uD" = (
+/obj/structure/grille,
+/obj/structure/window/reinforced/fulltile/shuttle,
+/obj/machinery/door/poddoor/shutters{
+	id = "sg_par_dorms"
+	},
+/turf/open/floor/plating,
+/area/outpost/security/armory)
 "uJ" = (
 /obj/effect/turf_decal/siding/yellow{
 	dir = 8
@@ -2102,7 +2249,6 @@
 	icon_state = "1-2"
 	},
 /obj/effect/turf_decal/siding/wood/corner,
-/obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/plasteel/patterned,
 /area/ship/cargo/office)
 "vi" = (
@@ -2117,13 +2263,13 @@
 /turf/open/floor/plasteel/mono,
 /area/ship/cargo)
 "vj" = (
-/obj/structure/chair/office{
-	dir = 8
-	},
 /obj/effect/turf_decal/siding/wood{
 	color = "#792f27"
 	},
 /obj/item/radio/intercom/directional/south,
+/obj/structure/chair/office{
+	dir = 8
+	},
 /turf/open/floor/wood/mahogany,
 /area/ship/bridge)
 "vk" = (
@@ -2155,6 +2301,11 @@
 /obj/effect/turf_decal/siding/wood{
 	dir = 8
 	},
+/obj/machinery/light_switch{
+	dir = 4;
+	pixel_x = -24;
+	pixel_y = 5
+	},
 /turf/open/floor/wood,
 /area/ship/crew/crewtwo)
 "vw" = (
@@ -2221,18 +2372,6 @@
 /turf/open/floor/plasteel/white,
 /area/ship/medical/surgery)
 "wi" = (
-/obj/machinery/button/shieldwallgen{
-	dir = 1;
-	id = "sg_par_holocargo1";
-	pixel_x = -5;
-	pixel_y = -21
-	},
-/obj/machinery/button/shieldwallgen{
-	dir = 1;
-	id = "sg_par_holocargo2";
-	pixel_x = 5;
-	pixel_y = -21
-	},
 /obj/structure/railing/wood{
 	dir = 4
 	},
@@ -2245,24 +2384,13 @@
 /turf/open/floor/wood,
 /area/ship/cargo/office)
 "wk" = (
-/obj/machinery/door/airlock/solgov{
-	id_tag = "sg_par_psychlock";
-	name = "Psychologist Office"
-	},
-/obj/effect/turf_decal/industrial/warning{
-	dir = 1
-	},
-/obj/effect/turf_decal/industrial/warning,
-/obj/machinery/door/firedoor/border_only,
-/obj/machinery/door/firedoor/border_only{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/structure/cable{
-	icon_state = "1-2"
+/obj/structure/grille,
+/obj/machinery/door/poddoor/shutters/preopen{
+	dir = 1;
+	id = "sg_par_psych"
 	},
-/turf/open/floor/plasteel/dark,
+/obj/structure/window/reinforced/fulltile/shuttle,
+/turf/open/floor/plating,
 /area/ship/crew/office)
 "wm" = (
 /obj/effect/decal/cleanable/dirt/dust,
@@ -2386,8 +2514,14 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/maintenance/port)
 "wZ" = (
-/obj/structure/reagent_dispensers/water_cooler,
-/turf/open/floor/wood/ebony,
+/obj/effect/turf_decal/borderfloorblack{
+	dir = 8
+	},
+/obj/effect/turf_decal/industrial/warning,
+/obj/effect/turf_decal/siding/wood{
+	dir = 8
+	},
+/turf/open/floor/plasteel/patterned/ridged,
 /area/ship/crew/crewtwo)
 "xh" = (
 /obj/structure/grille,
@@ -2617,6 +2751,7 @@
 	dir = 8
 	},
 /obj/machinery/airalarm/directional/west,
+/obj/structure/reagent_dispensers/water_cooler,
 /turf/open/floor/wood,
 /area/ship/crew/crewtwo)
 "zs" = (
@@ -2850,17 +2985,18 @@
 /obj/structure/railing/wood{
 	dir = 8
 	},
-/obj/item/gun/ballistic/automatic/pistol/solgov,
-/obj/item/gun/ballistic/automatic/pistol/solgov,
 /obj/item/ammo_box/magazine/pistol556mm,
 /obj/item/ammo_box/magazine/pistol556mm,
 /obj/item/ammo_box/magazine/pistol556mm,
 /obj/item/ammo_box/magazine/pistol556mm,
+/obj/item/gun/ballistic/automatic/pistol/solgov,
+/obj/item/gun/ballistic/automatic/pistol/solgov,
 /obj/structure/closet/secure_closet/wall/directional/south{
 	icon_state = "sec_wall";
 	name = "firearms locker";
 	req_access_txt = "19"
 	},
+/obj/item/storage/box/ammo/c556mm,
 /turf/open/floor/carpet/royalblue,
 /area/ship/bridge)
 "BU" = (
@@ -2903,11 +3039,7 @@
 	dir = 8
 	},
 /obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
-	dir = 4
+	icon_state = "1-8"
 	},
 /turf/open/floor/wood/ebony,
 /area/ship/crew/office)
@@ -2982,8 +3114,6 @@
 /turf/closed/wall/mineral/titanium,
 /area/ship/cargo)
 "Di" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/turf_decal/solgov/all/top_right,
 /obj/structure/cable{
 	icon_state = "1-8"
 	},
@@ -3001,6 +3131,9 @@
 	},
 /turf/open/floor/plasteel/white,
 /area/ship/hallway/port)
+"Dr" = (
+/turf/closed/wall/mineral/titanium/nodiagonal,
+/area/outpost/security/armory)
 "Du" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/structure/cable{
@@ -3030,11 +3163,8 @@
 /turf/open/floor/plasteel/mono,
 /area/ship/cargo)
 "Dz" = (
-/obj/structure/table/wood,
-/obj/item/paper_bin,
-/obj/item/pen/solgov,
-/obj/item/folder/solgov{
-	pixel_x = -16
+/obj/structure/chair/office{
+	dir = 4
 	},
 /turf/open/floor/wood/ebony,
 /area/ship/crew/crewtwo)
@@ -3167,22 +3297,10 @@
 /turf/open/floor/plasteel/patterned,
 /area/ship/cargo/office)
 "EE" = (
-/obj/effect/turf_decal/siding/yellow{
-	dir = 1
-	},
-/obj/structure/cable{
-	icon_state = "1-8"
-	},
-/obj/structure/cable{
-	icon_state = "1-4"
-	},
-/obj/structure/cable,
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/obj/machinery/door/poddoor{
-	id = "sg_par_cargo1"
-	},
+/obj/effect/turf_decal/solgov/all/top,
 /turf/open/floor/plasteel/mono,
 /area/ship/cargo/office)
 "EL" = (
@@ -3190,34 +3308,37 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/structure/cable{
-	icon_state = "1-8"
-	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 8
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
 	},
+/obj/effect/turf_decal/siding/wood/corner{
+	dir = 4
+	},
 /turf/open/floor/wood,
 /area/ship/crew/crewtwo)
 "EM" = (
-/obj/machinery/light_switch{
-	dir = 4;
-	pixel_x = -24;
-	pixel_y = 5
-	},
-/obj/machinery/photocopier,
+/obj/structure/filingcabinet/double/grey,
 /turf/open/floor/wood/ebony,
 /area/ship/crew/crewtwo)
 "EQ" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/power/apc/auto_name/directional/east,
-/obj/structure/cable{
-	icon_state = "0-2"
+/obj/effect/turf_decal/borderfloorblack{
+	dir = 4
 	},
-/obj/structure/chair/wood,
-/turf/open/floor/wood/ebony,
+/obj/effect/turf_decal/industrial/warning,
+/obj/effect/turf_decal/siding/wood{
+	dir = 4
+	},
+/obj/machinery/button/door{
+	dir = 8;
+	id = "sg_par_cargo2";
+	name = "shutter control";
+	pixel_x = 20;
+	pixel_y = 7
+	},
+/turf/open/floor/plasteel/patterned/ridged,
 /area/ship/crew/crewtwo)
 "ER" = (
 /obj/structure/table/wood,
@@ -3231,6 +3352,10 @@
 /turf/open/floor/carpet/royalblue,
 /area/ship/crew/canteen)
 "EV" = (
+/obj/effect/turf_decal/siding/wood{
+	color = "#332521";
+	dir = 4
+	},
 /turf/open/floor/wood/ebony,
 /area/ship/crew/office)
 "Fe" = (
@@ -3270,9 +3395,6 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/maintenance/port)
 "FD" = (
-/obj/effect/turf_decal/siding/wood/corner{
-	dir = 1
-	},
 /obj/effect/turf_decal/siding/wood/corner,
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -3283,6 +3405,9 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
 	},
+/obj/effect/turf_decal/siding/wood{
+	dir = 1
+	},
 /turf/open/floor/wood,
 /area/ship/crew/crewtwo)
 "FE" = (
@@ -3353,11 +3478,11 @@
 /turf/open/floor/plasteel/patterned,
 /area/ship/cargo/office)
 "Gk" = (
+/obj/effect/decal/cleanable/dirt/dust,
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
 	dir = 1
 	},
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/plasteel/patterned,
 /area/ship/cargo/office)
 "GG" = (
@@ -3383,18 +3508,25 @@
 /turf/open/floor/wood/ebony,
 /area/ship/crew/dorm)
 "Ho" = (
-/obj/structure/chair/wood,
-/turf/open/floor/wood/ebony,
+/obj/effect/turf_decal/industrial/warning,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/plasteel/mono,
 /area/ship/crew/crewtwo)
 "Ht" = (
 /obj/effect/turf_decal/trimline/opaque/solgovblue/filled/line{
 	dir = 8
 	},
-/obj/structure/table,
-/obj/item/paper_bin,
-/obj/item/pen/solgov,
 /turf/open/floor/plasteel/white,
 /area/ship/hallway/port)
+"Hv" = (
+/obj/machinery/door/airlock/medical{
+	name = "Morgue";
+	req_one_access = list(5,45)
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/hallway/port)
 "HD" = (
 /obj/machinery/light_switch{
 	dir = 4;
@@ -3419,9 +3551,6 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
 	},
-/obj/structure/sign/poster/solgov/random{
-	pixel_y = 30
-	},
 /turf/open/floor/plasteel/white,
 /area/ship/hallway/port)
 "HM" = (
@@ -3514,7 +3643,19 @@
 /obj/effect/turf_decal/borderfloorblack{
 	dir = 4
 	},
-/obj/machinery/light/small/directional/east,
+/obj/machinery/power/shieldwallgen/atmos/roundstart{
+	dir = 8;
+	id = "sg_par_holocargo1"
+	},
+/obj/structure/cable{
+	icon_state = "0-8"
+	},
+/obj/machinery/door/poddoor{
+	id = "sg_par_cargo1"
+	},
+/obj/effect/turf_decal/siding/yellow{
+	dir = 1
+	},
 /turf/open/floor/plasteel/patterned/ridged,
 /area/ship/cargo/office)
 "IE" = (
@@ -3550,15 +3691,14 @@
 /turf/open/floor/wood/ebony,
 /area/ship/crew/canteen)
 "IP" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/turf_decal/siding/wood{
-	dir = 8
-	},
-/obj/effect/turf_decal/siding/wood/corner{
-	dir = 4
+/obj/machinery/button/shieldwallgen{
+	dir = 8;
+	id = "sgi_holocargo2";
+	pixel_x = -13;
+	pixel_y = -6
 	},
-/turf/open/floor/wood,
-/area/ship/crew/crewtwo)
+/turf/closed/wall/mineral/titanium,
+/area/ship/hallway/port)
 "IX" = (
 /obj/item/clothing/head/solgov/captain,
 /obj/item/clothing/suit/armor/vest/solgov/captain,
@@ -3573,6 +3713,7 @@
 /obj/item/folder/solgov,
 /obj/item/folder/solgov,
 /obj/item/folder/documents/solgov,
+/obj/item/folder/documents/solgov,
 /obj/structure/closet/secure_closet{
 	icon_state = "cap";
 	name = "\proper captain's locker";
@@ -3736,8 +3877,7 @@
 /turf/open/floor/plasteel/white,
 /area/ship/bridge)
 "Ko" = (
-/obj/structure/chair/office,
-/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/photocopier,
 /turf/open/floor/wood/ebony,
 /area/ship/crew/crewtwo)
 "Kt" = (
@@ -3920,6 +4060,14 @@
 /obj/item/clothing/shoes/sandal/slippers,
 /turf/open/floor/plasteel/white,
 /area/ship/medical/surgery)
+"Mg" = (
+/obj/machinery/light/directional/east,
+/obj/structure/chair/comfy/orange/directional/south,
+/obj/effect/turf_decal/siding/wood{
+	dir = 5
+	},
+/turf/open/floor/carpet/royalblue,
+/area/outpost/security/armory)
 "Mi" = (
 /obj/structure/extinguisher_cabinet/directional/north,
 /obj/structure/table/wood,
@@ -4078,6 +4226,16 @@
 	},
 /turf/open/floor/plasteel/white,
 /area/ship/hallway/port)
+"NE" = (
+/obj/machinery/airalarm/directional/west,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+	dir = 1
+	},
+/obj/effect/turf_decal/siding/wood{
+	dir = 9
+	},
+/turf/open/floor/carpet/royalblue,
+/area/outpost/security/armory)
 "NW" = (
 /obj/effect/turf_decal/industrial/warning{
 	dir = 4
@@ -4123,18 +4281,11 @@
 /turf/open/floor/plasteel/white,
 /area/ship/medical/surgery)
 "NY" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/power/apc/auto_name/directional/west,
-/obj/machinery/light_switch{
-	dir = 4;
-	pixel_x = -20;
-	pixel_y = 12
-	},
-/obj/structure/cable{
-	icon_state = "0-4"
+/obj/machinery/light{
+	dir = 4
 	},
-/turf/open/floor/wood/ebony,
-/area/ship/crew/dorm)
+/turf/closed/wall/mineral/titanium,
+/area/ship/cargo/office)
 "Ol" = (
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
 	dir = 4
@@ -4153,7 +4304,16 @@
 /area/ship/crew/toilet)
 "OC" = (
 /obj/structure/cable{
-	icon_state = "1-2"
+	icon_state = "1-4"
+	},
+/obj/structure/cable{
+	icon_state = "1-8"
+	},
+/obj/machinery/door/poddoor{
+	id = "sg_par_cargo1"
+	},
+/obj/effect/turf_decal/siding/yellow{
+	dir = 1
 	},
 /turf/open/floor/plasteel/mono,
 /area/ship/cargo/office)
@@ -4180,8 +4340,8 @@
 "OS" = (
 /obj/structure/sink/kitchen{
 	dir = 4;
-	pixel_x = -12;
-	pixel_y = 8
+	pixel_x = 1;
+	pixel_y = -2
 	},
 /obj/effect/turf_decal/trimline/opaque/solgovblue/filled/line,
 /obj/effect/turf_decal/borderfloorwhite{
@@ -4212,46 +4372,18 @@
 /obj/effect/turf_decal/borderfloorblack{
 	dir = 8
 	},
-/obj/effect/turf_decal/siding/yellow{
-	dir = 1
-	},
-/obj/structure/cable{
-	icon_state = "0-4"
-	},
-/obj/machinery/door/poddoor{
-	id = "sg_par_cargo1"
-	},
-/obj/machinery/power/shieldwallgen/atmos/roundstart{
-	dir = 4;
-	id = "sg_par_holocargo1"
-	},
-/turf/open/floor/plasteel/patterned/ridged,
-/area/ship/cargo/office)
-"OX" = (
-/obj/effect/turf_decal/borderfloorblack{
-	dir = 8
-	},
-/obj/effect/turf_decal/industrial/outline/red,
-/obj/structure/closet/secure_closet/security{
-	anchored = 1;
-	name = "sonnensöldners's locker";
-	populate = 0
-	},
-/obj/item/clothing/head/solgov/sonnensoldner,
-/obj/item/radio{
-	icon_state = "sec_radio"
-	},
-/obj/item/clothing/under/solgov/formal,
-/obj/item/clothing/under/solgov/dress,
-/obj/item/clothing/under/solgov,
-/obj/item/clothing/shoes/workboots,
-/obj/item/clothing/gloves/combat,
-/obj/item/storage/belt/sabre/solgov,
-/obj/item/radio/headset/solgov/alt,
-/obj/item/storage/backpack,
-/obj/item/clothing/suit/armor/vest/solgov,
-/obj/item/clothing/suit/armor/vest/solgov,
-/turf/open/floor/plasteel/patterned,
+/obj/item/radio/intercom/directional/west,
+/obj/effect/turf_decal/solgov/all,
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/cargo/office)
+"OX" = (
+/obj/machinery/light/directional/west,
+/obj/effect/turf_decal/borderfloorblack{
+	dir = 8
+	},
+/obj/effect/turf_decal/industrial/outline/yellow,
+/obj/structure/reagent_dispensers/fueltank,
+/turf/open/floor/plasteel/mono,
 /area/ship/cargo/office)
 "OZ" = (
 /obj/structure/closet/secure_closet/personal/patient,
@@ -4279,6 +4411,9 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
 	},
+/obj/structure/cable{
+	icon_state = "1-8"
+	},
 /turf/open/floor/wood,
 /area/ship/crew/crewtwo)
 "Pg" = (
@@ -4373,6 +4508,12 @@
 	},
 /turf/open/floor/plasteel/dark,
 /area/ship/maintenance/port)
+"PJ" = (
+/obj/machinery/light{
+	dir = 4
+	},
+/turf/closed/wall/mineral/titanium,
+/area/ship/hallway/port)
 "PN" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/structure/cable{
@@ -4409,6 +4550,12 @@
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/wood,
 /area/ship/bridge)
+"PY" = (
+/obj/machinery/light{
+	dir = 8
+	},
+/turf/closed/wall/mineral/titanium,
+/area/ship/cargo/office)
 "Qc" = (
 /obj/effect/turf_decal/siding/wood{
 	dir = 1
@@ -4432,7 +4579,6 @@
 /obj/structure/cable{
 	icon_state = "2-4"
 	},
-/obj/effect/turf_decal/solgov/all/top,
 /turf/open/floor/plasteel/patterned,
 /area/ship/cargo/office)
 "QB" = (
@@ -4591,6 +4737,9 @@
 	pixel_x = -7;
 	pixel_y = -2
 	},
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+	dir = 4
+	},
 /turf/open/floor/carpet/royalblue,
 /area/ship/crew/office)
 "RL" = (
@@ -4601,16 +4750,6 @@
 	dir = 4
 	},
 /obj/effect/turf_decal/industrial/warning,
-/obj/structure/cable{
-	icon_state = "0-8"
-	},
-/obj/machinery/door/poddoor{
-	id = "sg_par_cargo2"
-	},
-/obj/machinery/power/shieldwallgen/atmos/roundstart{
-	dir = 8;
-	id = "sg_par_holocargo2"
-	},
 /turf/open/floor/plasteel/patterned/ridged,
 /area/ship/cargo/office)
 "RQ" = (
@@ -4711,11 +4850,6 @@
 /area/ship/crew/canteen)
 "SK" = (
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
 /turf/open/floor/wood,
 /area/ship/hallway/starboard)
 "SL" = (
@@ -4809,10 +4943,10 @@
 /turf/open/floor/wood/ebony,
 /area/ship/crew/crewtwo)
 "TI" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
 /obj/effect/turf_decal/siding/wood{
-	dir = 1
+	dir = 8
 	},
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
 /turf/open/floor/wood,
 /area/ship/crew/crewtwo)
 "TJ" = (
@@ -4835,15 +4969,24 @@
 /turf/open/floor/plasteel/freezer,
 /area/ship/crew/toilet)
 "Uc" = (
-/obj/effect/turf_decal/siding/wood{
-	color = "#332521";
+/obj/effect/turf_decal/borderfloorblack{
 	dir = 4
 	},
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
-	dir = 8
+/obj/effect/turf_decal/siding/wood/corner{
+	color = "#543C30"
 	},
-/turf/open/floor/wood/ebony,
-/area/ship/crew/office)
+/obj/structure/cable{
+	icon_state = "0-8"
+	},
+/obj/machinery/power/shieldwallgen/atmos/roundstart{
+	dir = 8;
+	id = "sg_par_holocargo2"
+	},
+/obj/machinery/door/poddoor{
+	id = "sg_par_cargo2"
+	},
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/crew/crewtwo)
 "Ug" = (
 /turf/closed/wall/mineral/titanium/nodiagonal,
 /area/ship/crew/canteen)
@@ -4863,14 +5006,16 @@
 /turf/open/floor/plasteel/white,
 /area/ship/medical/surgery)
 "Uq" = (
-/obj/machinery/vending/coffee,
+/obj/structure/chair/wood{
+	dir = 1
+	},
+/obj/machinery/computer/helm/viewscreen/directional/south,
 /turf/open/floor/wood/ebony,
 /area/ship/crew/crewtwo)
 "Uu" = (
 /obj/effect/turf_decal/borderfloorblack{
 	dir = 8
 	},
-/obj/effect/turf_decal/solgov/all,
 /obj/structure/sign/warning/incident{
 	pixel_x = -32
 	},
@@ -4927,23 +5072,9 @@
 /turf/open/floor/plasteel/white,
 /area/ship/medical/surgery)
 "UV" = (
-/obj/structure/curtain/cloth,
-/obj/machinery/button/door{
-	id = "sg_par_psychlock";
-	name = "psychology office door bolt";
-	normaldoorcontrol = 1;
-	pixel_x = -6;
-	pixel_y = 24;
-	specialfunctions = 4
-	},
-/obj/machinery/button/door{
-	id = "sg_par_psych";
-	name = "psychology office privacy shutters";
-	pixel_x = 6;
-	pixel_y = 24
-	},
-/turf/open/floor/carpet/royalblue,
-/area/ship/crew/office)
+/obj/structure/table,
+/turf/open/floor/plasteel/dark,
+/area/ship/hallway/port)
 "Vq" = (
 /obj/effect/turf_decal/corner/opaque/solgovblue{
 	dir = 9
@@ -5008,6 +5139,26 @@
 /obj/effect/turf_decal/industrial/outline/yellow,
 /turf/open/floor/plasteel/mono,
 /area/ship/cargo)
+"Wa" = (
+/obj/machinery/door/firedoor/border_only,
+/obj/effect/turf_decal/industrial/warning,
+/obj/machinery/door/firedoor/border_only{
+	dir = 1
+	},
+/obj/effect/turf_decal/industrial/warning{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/door/airlock/solgov{
+	id_tag = "sg_par_psychlock";
+	name = "Psychologist Office"
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/office)
 "Wf" = (
 /obj/effect/turf_decal/techfloor,
 /obj/structure/cable{
@@ -5047,13 +5198,9 @@
 /turf/open/floor/plasteel/tech/techmaint,
 /area/ship/maintenance/port)
 "Wo" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/turf_decal/siding/wood{
-	dir = 1
-	},
 /obj/machinery/light/directional/east,
-/obj/structure/cable{
-	icon_state = "1-2"
+/obj/effect/turf_decal/siding/wood{
+	dir = 4
 	},
 /turf/open/floor/wood,
 /area/ship/crew/crewtwo)
@@ -5068,12 +5215,11 @@
 /turf/open/floor/carpet/royalblue,
 /area/ship/crew/canteen)
 "Wt" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
-	dir = 4
+/obj/machinery/light{
+	dir = 8
 	},
-/turf/open/floor/wood/ebony,
-/area/ship/crew/dorm)
+/turf/closed/wall/mineral/titanium,
+/area/ship/crew/crewtwo)
 "Wx" = (
 /obj/effect/turf_decal/siding/wood{
 	dir = 1
@@ -5100,12 +5246,15 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 8
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 4
-	},
 /obj/effect/turf_decal/siding/wood{
 	dir = 1
 	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+	dir = 1
+	},
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
 /turf/open/floor/wood,
 /area/ship/hallway/starboard)
 "WB" = (
@@ -5170,14 +5319,30 @@
 /obj/effect/turf_decal/techfloor{
 	dir = 10
 	},
-/obj/structure/reagent_dispensers/fueltank,
+/obj/structure/table,
+/obj/item/cigbutt{
+	pixel_y = 5
+	},
+/obj/item/cigbutt{
+	pixel_y = 15
+	},
+/obj/item/cigbutt{
+	pixel_x = -11;
+	pixel_y = 9
+	},
+/obj/item/clothing/mask/cigarette/robust{
+	pixel_x = 8;
+	pixel_y = 10
+	},
 /turf/open/floor/plasteel/tech/techmaint,
 /area/ship/maintenance/port)
 "Xe" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/structure/cable{
-	icon_state = "1-2"
+/obj/effect/turf_decal/siding/wood{
+	color = "#332521";
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
 	},
 /turf/open/floor/wood/ebony,
 /area/ship/crew/office)
@@ -5264,12 +5429,9 @@
 /turf/open/floor/mineral/titanium/tiled/white,
 /area/ship/medical)
 "XQ" = (
-/obj/structure/sink{
-	dir = 1;
-	pixel_y = -12
-	},
 /obj/structure/mirror{
-	pixel_y = -32
+	pixel_y = -25;
+	pixel_x = 0
 	},
 /obj/structure/cable{
 	icon_state = "1-4"
@@ -5280,23 +5442,23 @@
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
 	dir = 1
 	},
+/obj/structure/sink/kitchen{
+	dir = 1
+	},
 /turf/open/floor/plasteel/freezer,
 /area/ship/crew/toilet)
 "XV" = (
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
-	dir = 1
-	},
 /obj/effect/turf_decal/siding/wood{
 	dir = 1
 	},
-/obj/structure/cable{
-	icon_state = "2-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 = "2-4"
+	icon_state = "4-8"
 	},
 /turf/open/floor/wood,
 /area/ship/hallway/starboard)
@@ -5407,6 +5569,9 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
 	},
+/obj/effect/turf_decal/siding/wood/corner{
+	dir = 1
+	},
 /turf/open/floor/wood,
 /area/ship/crew/crewtwo)
 "YY" = (
@@ -5486,10 +5651,9 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/door/airlock/medical{
-	name = "Morgue";
-	req_one_access = list(5,45)
-	},
+/obj/structure/table,
+/obj/item/paper_bin,
+/obj/item/pen/solgov,
 /turf/open/floor/plasteel/dark,
 /area/ship/hallway/port)
 "ZU" = (
@@ -5759,7 +5923,7 @@ vB
 vB
 vB
 wb
-wb
+PY
 wI
 "}
 (9,1,1) = {"
@@ -5831,7 +5995,7 @@ wI
 wI
 wI
 et
-AX
+rE
 os
 Wx
 gR
@@ -5861,10 +6025,10 @@ wI
 (12,1,1) = {"
 wI
 wI
-wI
-et
-iW
-IP
+Wt
+rY
+AX
+AX
 FD
 pd
 BH
@@ -5887,14 +6051,14 @@ Vr
 sC
 ph
 wb
-wb
+NY
 wI
 "}
 (13,1,1) = {"
 wI
 wI
-wI
-et
+dh
+nZ
 wZ
 TI
 YU
@@ -5925,8 +6089,8 @@ wI
 (14,1,1) = {"
 wI
 wI
-wI
-et
+ev
+sS
 Ho
 cr
 Pc
@@ -5957,8 +6121,8 @@ wI
 (15,1,1) = {"
 wI
 wI
-wI
-rY
+qK
+Uc
 EQ
 Wo
 EL
@@ -5989,9 +6153,9 @@ wI
 (16,1,1) = {"
 wI
 jg
+PJ
 jg
-jg
-jg
+IP
 jg
 JR
 jg
@@ -6024,7 +6188,7 @@ jg
 jw
 Lf
 Ht
-jg
+UV
 HK
 RA
 jg
@@ -6088,7 +6252,7 @@ jg
 mn
 nt
 NB
-jg
+Hv
 RC
 cd
 UJ
@@ -6107,7 +6271,7 @@ Jq
 Mi
 tP
 sk
-YJ
+Wa
 op
 Cf
 Pg
@@ -6171,11 +6335,11 @@ Cd
 SL
 hb
 IZ
-nZ
-cf
-Uc
+gj
 cf
-ou
+cH
+Pp
+gj
 wI
 "}
 (22,1,1) = {"
@@ -6204,9 +6368,9 @@ Ol
 FL
 he
 gj
-UV
-sS
-sS
+gj
+gj
+gj
 gj
 wI
 "}
@@ -6235,11 +6399,11 @@ Rf
 mH
 zs
 Wz
-gj
+iW
+mT
+NE
 gK
-cH
-Pp
-gj
+uD
 wI
 "}
 (24,1,1) = {"
@@ -6267,11 +6431,11 @@ qL
 qL
 Ev
 gQ
-vL
-Ky
-Ky
-Ky
-Ky
+Dr
+kU
+Mg
+fg
+kN
 wI
 "}
 (25,1,1) = {"
@@ -6299,11 +6463,11 @@ Es
 BJ
 qL
 BU
-vL
-oF
-pc
-eH
-Ky
+Dr
+Dr
+Dr
+Dr
+Dr
 wI
 "}
 (26,1,1) = {"
@@ -6331,11 +6495,11 @@ tu
 YY
 qL
 pK
-NY
-dh
-Wt
-AZ
-bf
+vL
+oF
+pc
+eH
+Ky
 wI
 "}
 (27,1,1) = {"

From f28ecc08fecc127362f1a3017922002ee383dd4e Mon Sep 17 00:00:00 2001
From: Ratvar <supermajormeltdown@gmail.com>
Date: Sun, 1 Dec 2024 13:25:26 -0800
Subject: [PATCH 04/14] i fucking hate blastdoors

---
 _maps/shuttles/solgov/solgov_paracelsus.dmm | 24 ++++++++++-----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/_maps/shuttles/solgov/solgov_paracelsus.dmm b/_maps/shuttles/solgov/solgov_paracelsus.dmm
index 30fd67d19140..92a710619236 100644
--- a/_maps/shuttles/solgov/solgov_paracelsus.dmm
+++ b/_maps/shuttles/solgov/solgov_paracelsus.dmm
@@ -556,7 +556,7 @@
 	},
 /obj/item/radio/intercom/directional/east,
 /turf/open/floor/carpet/royalblue,
-/area/outpost/security/armory)
+/area/ship/security/armory)
 "fl" = (
 /obj/structure/chair/wood{
 	dir = 8
@@ -683,7 +683,7 @@
 /obj/item/clothing/under/solgov/formal,
 /obj/item/clothing/head/solgov/sonnensoldner,
 /turf/open/floor/carpet/royalblue,
-/area/outpost/security/armory)
+/area/ship/security/armory)
 "gQ" = (
 /obj/effect/turf_decal/industrial/warning{
 	dir = 4
@@ -952,7 +952,7 @@
 	icon_state = "1-2"
 	},
 /turf/open/floor/plasteel/dark,
-/area/outpost/security/armory)
+/area/ship/security/armory)
 "iZ" = (
 /obj/structure/grille,
 /turf/open/floor/plating,
@@ -1151,7 +1151,7 @@
 	id = "sg_par_sonnen"
 	},
 /turf/open/floor/plating,
-/area/outpost/security/armory)
+/area/ship/security/armory)
 "kO" = (
 /obj/effect/turf_decal/techfloor/corner{
 	dir = 8
@@ -1195,7 +1195,7 @@
 	pixel_y = 7
 	},
 /turf/open/floor/wood/ebony,
-/area/outpost/security/armory)
+/area/ship/security/armory)
 "kW" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/machinery/suit_storage_unit/inherit,
@@ -1365,7 +1365,7 @@
 	},
 /obj/structure/cable,
 /turf/open/floor/wood,
-/area/outpost/security/armory)
+/area/ship/security/armory)
 "nb" = (
 /obj/effect/turf_decal/solgov/all/bottom_left,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
@@ -2182,7 +2182,7 @@
 	id = "sg_par_dorms"
 	},
 /turf/open/floor/plating,
-/area/outpost/security/armory)
+/area/ship/security/armory)
 "uJ" = (
 /obj/effect/turf_decal/siding/yellow{
 	dir = 8
@@ -3133,7 +3133,7 @@
 /area/ship/hallway/port)
 "Dr" = (
 /turf/closed/wall/mineral/titanium/nodiagonal,
-/area/outpost/security/armory)
+/area/ship/security/armory)
 "Du" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/structure/cable{
@@ -3333,7 +3333,7 @@
 	},
 /obj/machinery/button/door{
 	dir = 8;
-	id = "sg_par_cargo2";
+	id = "sg_par_holocargo2";
 	name = "shutter control";
 	pixel_x = 20;
 	pixel_y = 7
@@ -3693,7 +3693,7 @@
 "IP" = (
 /obj/machinery/button/shieldwallgen{
 	dir = 8;
-	id = "sgi_holocargo2";
+	id = "sg_par_holocargo2";
 	pixel_x = -13;
 	pixel_y = -6
 	},
@@ -4067,7 +4067,7 @@
 	dir = 5
 	},
 /turf/open/floor/carpet/royalblue,
-/area/outpost/security/armory)
+/area/ship/security/armory)
 "Mi" = (
 /obj/structure/extinguisher_cabinet/directional/north,
 /obj/structure/table/wood,
@@ -4235,7 +4235,7 @@
 	dir = 9
 	},
 /turf/open/floor/carpet/royalblue,
-/area/outpost/security/armory)
+/area/ship/security/armory)
 "NW" = (
 /obj/effect/turf_decal/industrial/warning{
 	dir = 4

From ae3e24149c4796ca23e2ca2d9844ca4872f5b0a2 Mon Sep 17 00:00:00 2001
From: Ratvar <supermajormeltdown@gmail.com>
Date: Sun, 1 Dec 2024 13:34:25 -0800
Subject: [PATCH 05/14] please

---
 _maps/shuttles/solgov/solgov_paracelsus.dmm | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/_maps/shuttles/solgov/solgov_paracelsus.dmm b/_maps/shuttles/solgov/solgov_paracelsus.dmm
index 92a710619236..474ca487614d 100644
--- a/_maps/shuttles/solgov/solgov_paracelsus.dmm
+++ b/_maps/shuttles/solgov/solgov_paracelsus.dmm
@@ -1144,14 +1144,6 @@
 /obj/effect/turf_decal/solgov/all/center_left,
 /turf/open/floor/plasteel/mono,
 /area/ship/cargo)
-"kN" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced/fulltile/shuttle,
-/obj/machinery/door/poddoor/shutters{
-	id = "sg_par_sonnen"
-	},
-/turf/open/floor/plating,
-/area/ship/security/armory)
 "kO" = (
 /obj/effect/turf_decal/techfloor/corner{
 	dir = 8
@@ -1189,7 +1181,7 @@
 	},
 /obj/machinery/button/door{
 	dir = 8;
-	id = "sg_par_dorms";
+	id = "sg_par_sonnen";
 	name = "shutter control";
 	pixel_x = 20;
 	pixel_y = 7
@@ -2179,7 +2171,7 @@
 /obj/structure/grille,
 /obj/structure/window/reinforced/fulltile/shuttle,
 /obj/machinery/door/poddoor/shutters{
-	id = "sg_par_dorms"
+	id = "sg_par_sonnen"
 	},
 /turf/open/floor/plating,
 /area/ship/security/armory)
@@ -3333,7 +3325,7 @@
 	},
 /obj/machinery/button/door{
 	dir = 8;
-	id = "sg_par_holocargo2";
+	id = "sg_par_cargo2";
 	name = "shutter control";
 	pixel_x = 20;
 	pixel_y = 7
@@ -6435,7 +6427,7 @@ Dr
 kU
 Mg
 fg
-kN
+uD
 wI
 "}
 (25,1,1) = {"

From 47a151df80347fdb1f12211eb6b4d4656c40a5f9 Mon Sep 17 00:00:00 2001
From: Ratvar <supermajormeltdown@gmail.com>
Date: Sun, 1 Dec 2024 13:38:01 -0800
Subject: [PATCH 06/14] i swear

---
 _maps/shuttles/solgov/solgov_paracelsus.dmm | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/_maps/shuttles/solgov/solgov_paracelsus.dmm b/_maps/shuttles/solgov/solgov_paracelsus.dmm
index 474ca487614d..1080752022f5 100644
--- a/_maps/shuttles/solgov/solgov_paracelsus.dmm
+++ b/_maps/shuttles/solgov/solgov_paracelsus.dmm
@@ -2019,7 +2019,7 @@
 "sC" = (
 /obj/machinery/button/door{
 	dir = 1;
-	id = "sg_par_cargo2";
+	id = "sg_par_cargo1";
 	name = "cargo blast door control";
 	pixel_x = 6;
 	pixel_y = -23
@@ -3323,6 +3323,12 @@
 /obj/effect/turf_decal/siding/wood{
 	dir = 4
 	},
+/obj/machinery/button/shieldwallgen{
+	dir = 8;
+	id = "sg_par_holocargo2";
+	pixel_x = 19;
+	pixel_y = -6
+	},
 /obj/machinery/button/door{
 	dir = 8;
 	id = "sg_par_cargo2";
@@ -3682,15 +3688,6 @@
 	},
 /turf/open/floor/wood/ebony,
 /area/ship/crew/canteen)
-"IP" = (
-/obj/machinery/button/shieldwallgen{
-	dir = 8;
-	id = "sg_par_holocargo2";
-	pixel_x = -13;
-	pixel_y = -6
-	},
-/turf/closed/wall/mineral/titanium,
-/area/ship/hallway/port)
 "IX" = (
 /obj/item/clothing/head/solgov/captain,
 /obj/item/clothing/suit/armor/vest/solgov/captain,
@@ -6147,7 +6144,7 @@ wI
 jg
 PJ
 jg
-IP
+jg
 jg
 JR
 jg

From 3d580b81b481dd404d73e18d777faa30f9558a12 Mon Sep 17 00:00:00 2001
From: Ratvar <supermajormeltdown@gmail.com>
Date: Sun, 1 Dec 2024 15:16:53 -0800
Subject: [PATCH 07/14] decals and i hope it FUCKING DIXES IT!!!!!!!!!

---
 _maps/shuttles/solgov/solgov_paracelsus.dmm | 38 +++++++++++++--------
 1 file changed, 23 insertions(+), 15 deletions(-)

diff --git a/_maps/shuttles/solgov/solgov_paracelsus.dmm b/_maps/shuttles/solgov/solgov_paracelsus.dmm
index 1080752022f5..f1aafcb6c0b1 100644
--- a/_maps/shuttles/solgov/solgov_paracelsus.dmm
+++ b/_maps/shuttles/solgov/solgov_paracelsus.dmm
@@ -365,6 +365,7 @@
 /obj/effect/turf_decal/industrial/warning{
 	dir = 1
 	},
+/obj/effect/turf_decal/solgov/all,
 /turf/open/floor/plasteel/patterned/ridged,
 /area/ship/crew/crewtwo)
 "dj" = (
@@ -484,6 +485,7 @@
 /obj/effect/turf_decal/industrial/warning{
 	dir = 1
 	},
+/obj/effect/turf_decal/solgov/top,
 /turf/open/floor/plasteel/mono,
 /area/ship/crew/crewtwo)
 "eC" = (
@@ -1144,6 +1146,14 @@
 /obj/effect/turf_decal/solgov/all/center_left,
 /turf/open/floor/plasteel/mono,
 /area/ship/cargo)
+"kN" = (
+/obj/structure/grille,
+/obj/structure/window/reinforced/fulltile/shuttle,
+/obj/machinery/door/poddoor/shutters{
+	id = "sg_par_sonnen"
+	},
+/turf/open/floor/plating,
+/area/ship/security/armory)
 "kO" = (
 /obj/effect/turf_decal/techfloor/corner{
 	dir = 8
@@ -1408,6 +1418,7 @@
 	dir = 8
 	},
 /obj/effect/turf_decal/industrial/warning,
+/obj/effect/turf_decal/solgov/bottom_left,
 /turf/open/floor/plasteel/patterned/ridged,
 /area/ship/cargo/office)
 "nG" = (
@@ -1801,6 +1812,7 @@
 /obj/effect/turf_decal/industrial/warning{
 	dir = 1
 	},
+/obj/effect/turf_decal/solgov/all/top_right,
 /turf/open/floor/plasteel/patterned/ridged,
 /area/ship/crew/crewtwo)
 "qL" = (
@@ -2167,14 +2179,6 @@
 	},
 /turf/open/floor/wood/mahogany,
 /area/ship/bridge)
-"uD" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced/fulltile/shuttle,
-/obj/machinery/door/poddoor/shutters{
-	id = "sg_par_sonnen"
-	},
-/turf/open/floor/plating,
-/area/ship/security/armory)
 "uJ" = (
 /obj/effect/turf_decal/siding/yellow{
 	dir = 8
@@ -2513,6 +2517,7 @@
 /obj/effect/turf_decal/siding/wood{
 	dir = 8
 	},
+/obj/effect/turf_decal/solgov/bottom_left,
 /turf/open/floor/plasteel/patterned/ridged,
 /area/ship/crew/crewtwo)
 "xh" = (
@@ -3336,6 +3341,7 @@
 	pixel_x = 20;
 	pixel_y = 7
 	},
+/obj/effect/turf_decal/solgov/bottom_right,
 /turf/open/floor/plasteel/patterned/ridged,
 /area/ship/crew/crewtwo)
 "ER" = (
@@ -3506,10 +3512,11 @@
 /turf/open/floor/wood/ebony,
 /area/ship/crew/dorm)
 "Ho" = (
-/obj/effect/turf_decal/industrial/warning,
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
+/obj/effect/turf_decal/industrial/warning,
+/obj/effect/turf_decal/solgov/all/bottom_center,
 /turf/open/floor/plasteel/mono,
 /area/ship/crew/crewtwo)
 "Ht" = (
@@ -4502,7 +4509,7 @@
 	dir = 4
 	},
 /turf/closed/wall/mineral/titanium,
-/area/ship/hallway/port)
+/area/ship/crew/crewtwo)
 "PN" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/structure/cable{
@@ -4739,6 +4746,7 @@
 	dir = 4
 	},
 /obj/effect/turf_decal/industrial/warning,
+/obj/effect/turf_decal/solgov/bottom_right,
 /turf/open/floor/plasteel/patterned/ridged,
 /area/ship/cargo/office)
 "RQ" = (
@@ -6141,10 +6149,10 @@ wI
 "}
 (16,1,1) = {"
 wI
-jg
+rM
 PJ
-jg
-jg
+rM
+rM
 jg
 JR
 jg
@@ -6392,7 +6400,7 @@ iW
 mT
 NE
 gK
-uD
+kN
 wI
 "}
 (24,1,1) = {"
@@ -6424,7 +6432,7 @@ Dr
 kU
 Mg
 fg
-uD
+kN
 wI
 "}
 (25,1,1) = {"

From f53752e4059e5ef58abea2bfc0ecfb39ab645ef7 Mon Sep 17 00:00:00 2001
From: Ratvar <supermajormeltdown@gmail.com>
Date: Sun, 1 Dec 2024 15:45:20 -0800
Subject: [PATCH 08/14] final touch ups

---
 _maps/shuttles/solgov/solgov_paracelsus.dmm | 71 ++++++++++++++-------
 1 file changed, 49 insertions(+), 22 deletions(-)

diff --git a/_maps/shuttles/solgov/solgov_paracelsus.dmm b/_maps/shuttles/solgov/solgov_paracelsus.dmm
index f1aafcb6c0b1..67d1d3507337 100644
--- a/_maps/shuttles/solgov/solgov_paracelsus.dmm
+++ b/_maps/shuttles/solgov/solgov_paracelsus.dmm
@@ -50,6 +50,11 @@
 /obj/structure/cable{
 	icon_state = "1-8"
 	},
+/obj/machinery/light_switch{
+	dir = 4;
+	pixel_x = -19;
+	pixel_y = -5
+	},
 /turf/open/floor/wood/ebony,
 /area/ship/crew/dorm)
 "aG" = (
@@ -365,8 +370,7 @@
 /obj/effect/turf_decal/industrial/warning{
 	dir = 1
 	},
-/obj/effect/turf_decal/solgov/all,
-/turf/open/floor/plasteel/patterned/ridged,
+/turf/open/floor/engine/hull,
 /area/ship/crew/crewtwo)
 "dj" = (
 /obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/on/layer2{
@@ -485,8 +489,7 @@
 /obj/effect/turf_decal/industrial/warning{
 	dir = 1
 	},
-/obj/effect/turf_decal/solgov/top,
-/turf/open/floor/plasteel/mono,
+/turf/open/floor/engine/hull,
 /area/ship/crew/crewtwo)
 "eC" = (
 /obj/effect/turf_decal/trimline/opaque/solgovblue/filled/corner,
@@ -1062,6 +1065,7 @@
 /area/ship/crew/canteen)
 "jZ" = (
 /obj/machinery/light/small/directional/south,
+/obj/structure/reagent_dispensers/water_cooler,
 /turf/open/floor/plasteel/white,
 /area/ship/hallway/port)
 "kl" = (
@@ -1186,8 +1190,8 @@
 	dir = 8
 	},
 /obj/machinery/light_switch{
-	pixel_x = 11;
-	pixel_y = 22
+	pixel_x = 12;
+	pixel_y = 21
 	},
 /obj/machinery/button/door{
 	dir = 8;
@@ -1418,8 +1422,7 @@
 	dir = 8
 	},
 /obj/effect/turf_decal/industrial/warning,
-/obj/effect/turf_decal/solgov/bottom_left,
-/turf/open/floor/plasteel/patterned/ridged,
+/turf/open/floor/engine/hull,
 /area/ship/cargo/office)
 "nG" = (
 /obj/machinery/button/door{
@@ -1812,8 +1815,7 @@
 /obj/effect/turf_decal/industrial/warning{
 	dir = 1
 	},
-/obj/effect/turf_decal/solgov/all/top_right,
-/turf/open/floor/plasteel/patterned/ridged,
+/turf/open/floor/engine/hull,
 /area/ship/crew/crewtwo)
 "qL" = (
 /turf/closed/wall/mineral/titanium,
@@ -1942,7 +1944,7 @@
 /area/ship/crew/crewtwo)
 "rK" = (
 /obj/effect/turf_decal/industrial/warning,
-/turf/open/floor/plasteel/mono,
+/turf/open/floor/engine/hull,
 /area/ship/cargo/office)
 "rM" = (
 /turf/closed/wall/mineral/titanium,
@@ -2179,6 +2181,12 @@
 	},
 /turf/open/floor/wood/mahogany,
 /area/ship/bridge)
+"uD" = (
+/obj/structure/sign/solgov_seal{
+	pixel_y = -27
+	},
+/turf/template_noop,
+/area/template_noop)
 "uJ" = (
 /obj/effect/turf_decal/siding/yellow{
 	dir = 8
@@ -2748,7 +2756,6 @@
 	dir = 8
 	},
 /obj/machinery/airalarm/directional/west,
-/obj/structure/reagent_dispensers/water_cooler,
 /turf/open/floor/wood,
 /area/ship/crew/crewtwo)
 "zs" = (
@@ -2882,6 +2889,9 @@
 /turf/open/floor/plasteel/mono/white,
 /area/ship/medical/surgery)
 "AX" = (
+/obj/structure/chair/wood{
+	dir = 8
+	},
 /turf/open/floor/wood/ebony,
 /area/ship/crew/crewtwo)
 "AZ" = (
@@ -3226,6 +3236,13 @@
 /obj/effect/turf_decal/industrial/outline/yellow,
 /turf/open/floor/plasteel/mono,
 /area/ship/cargo/office)
+"Eq" = (
+/obj/structure/sign/solgov_seal{
+	pixel_x = 28;
+	pixel_y = 0
+	},
+/turf/template_noop,
+/area/template_noop)
 "Er" = (
 /obj/effect/turf_decal/techfloor,
 /obj/item/radio/intercom/directional/south,
@@ -3695,6 +3712,10 @@
 	},
 /turf/open/floor/wood/ebony,
 /area/ship/crew/canteen)
+"IP" = (
+/obj/structure/sign/solgov_seal,
+/turf/template_noop,
+/area/template_noop)
 "IX" = (
 /obj/item/clothing/head/solgov/captain,
 /obj/item/clothing/suit/armor/vest/solgov/captain,
@@ -4305,12 +4326,12 @@
 /obj/structure/cable{
 	icon_state = "1-8"
 	},
-/obj/machinery/door/poddoor{
-	id = "sg_par_cargo1"
-	},
 /obj/effect/turf_decal/siding/yellow{
 	dir = 1
 	},
+/obj/machinery/door/poddoor{
+	id = "sg_par_cargo1"
+	},
 /turf/open/floor/plasteel/mono,
 /area/ship/cargo/office)
 "OH" = (
@@ -4738,6 +4759,13 @@
 	},
 /turf/open/floor/carpet/royalblue,
 /area/ship/crew/office)
+"RK" = (
+/obj/structure/sign/solgov_flag{
+	pixel_x = -1;
+	pixel_y = 0
+	},
+/turf/closed/wall/mineral/titanium/nodiagonal,
+/area/ship/security/armory)
 "RL" = (
 /turf/closed/wall/mineral/titanium,
 /area/ship/maintenance/port)
@@ -4746,8 +4774,7 @@
 	dir = 4
 	},
 /obj/effect/turf_decal/industrial/warning,
-/obj/effect/turf_decal/solgov/bottom_right,
-/turf/open/floor/plasteel/patterned/ridged,
+/turf/open/floor/engine/hull,
 /area/ship/cargo/office)
 "RQ" = (
 /obj/structure/railing/wood{
@@ -5921,7 +5948,7 @@ vB
 vB
 wb
 PY
-wI
+IP
 "}
 (9,1,1) = {"
 wI
@@ -6021,7 +6048,7 @@ wI
 "}
 (12,1,1) = {"
 wI
-wI
+uD
 Wt
 rY
 AX
@@ -6049,7 +6076,7 @@ sC
 ph
 wb
 NY
-wI
+IP
 "}
 (13,1,1) = {"
 wI
@@ -6117,7 +6144,7 @@ wI
 "}
 (15,1,1) = {"
 wI
-wI
+Eq
 qK
 Uc
 EQ
@@ -6428,7 +6455,7 @@ qL
 qL
 Ev
 gQ
-Dr
+RK
 kU
 Mg
 fg

From e05b399babfded803e41dfe960979ca874e64e70 Mon Sep 17 00:00:00 2001
From: Ratvar <supermajormeltdown@gmail.com>
Date: Sun, 1 Dec 2024 17:15:54 -0800
Subject: [PATCH 09/14] tocuhes up some more decals

---
 _maps/shuttles/solgov/solgov_paracelsus.dmm | 66 ++++++++++-----------
 1 file changed, 31 insertions(+), 35 deletions(-)

diff --git a/_maps/shuttles/solgov/solgov_paracelsus.dmm b/_maps/shuttles/solgov/solgov_paracelsus.dmm
index 67d1d3507337..93e891c4dcf9 100644
--- a/_maps/shuttles/solgov/solgov_paracelsus.dmm
+++ b/_maps/shuttles/solgov/solgov_paracelsus.dmm
@@ -839,6 +839,13 @@
 	},
 /turf/open/floor/plasteel/tech/techmaint,
 /area/ship/maintenance/port)
+"hB" = (
+/obj/structure/sign/solgov_seal{
+	pixel_x = 28;
+	pixel_y = 0
+	},
+/turf/template_noop,
+/area/template_noop)
 "hM" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/item/clothing/neck/stripedsolgovscarf,
@@ -2182,11 +2189,8 @@
 /turf/open/floor/wood/mahogany,
 /area/ship/bridge)
 "uD" = (
-/obj/structure/sign/solgov_seal{
-	pixel_y = -27
-	},
-/turf/template_noop,
-/area/template_noop)
+/turf/closed/wall/mineral/titanium/nodiagonal,
+/area/ship/security/armory)
 "uJ" = (
 /obj/effect/turf_decal/siding/yellow{
 	dir = 8
@@ -2521,11 +2525,10 @@
 /obj/effect/turf_decal/borderfloorblack{
 	dir = 8
 	},
-/obj/effect/turf_decal/industrial/warning,
+/obj/effect/turf_decal/solgov/bottom_left,
 /obj/effect/turf_decal/siding/wood{
-	dir = 8
+	dir = 10
 	},
-/obj/effect/turf_decal/solgov/bottom_left,
 /turf/open/floor/plasteel/patterned/ridged,
 /area/ship/crew/crewtwo)
 "xh" = (
@@ -3139,6 +3142,10 @@
 /turf/open/floor/plasteel/white,
 /area/ship/hallway/port)
 "Dr" = (
+/obj/structure/sign/solgov_flag{
+	pixel_x = -1;
+	pixel_y = 0
+	},
 /turf/closed/wall/mineral/titanium/nodiagonal,
 /area/ship/security/armory)
 "Du" = (
@@ -3169,6 +3176,12 @@
 	},
 /turf/open/floor/plasteel/mono,
 /area/ship/cargo)
+"Dw" = (
+/obj/structure/sign/solgov_seal{
+	pixel_y = -27
+	},
+/turf/template_noop,
+/area/template_noop)
 "Dz" = (
 /obj/structure/chair/office{
 	dir = 4
@@ -3236,13 +3249,6 @@
 /obj/effect/turf_decal/industrial/outline/yellow,
 /turf/open/floor/plasteel/mono,
 /area/ship/cargo/office)
-"Eq" = (
-/obj/structure/sign/solgov_seal{
-	pixel_x = 28;
-	pixel_y = 0
-	},
-/turf/template_noop,
-/area/template_noop)
 "Er" = (
 /obj/effect/turf_decal/techfloor,
 /obj/item/radio/intercom/directional/south,
@@ -3341,10 +3347,6 @@
 /obj/effect/turf_decal/borderfloorblack{
 	dir = 4
 	},
-/obj/effect/turf_decal/industrial/warning,
-/obj/effect/turf_decal/siding/wood{
-	dir = 4
-	},
 /obj/machinery/button/shieldwallgen{
 	dir = 8;
 	id = "sg_par_holocargo2";
@@ -3359,6 +3361,7 @@
 	pixel_y = 7
 	},
 /obj/effect/turf_decal/solgov/bottom_right,
+/obj/effect/turf_decal/siding/wood,
 /turf/open/floor/plasteel/patterned/ridged,
 /area/ship/crew/crewtwo)
 "ER" = (
@@ -3532,8 +3535,8 @@
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/obj/effect/turf_decal/industrial/warning,
 /obj/effect/turf_decal/solgov/all/bottom_center,
+/obj/effect/turf_decal/siding/wood,
 /turf/open/floor/plasteel/mono,
 /area/ship/crew/crewtwo)
 "Ht" = (
@@ -4759,13 +4762,6 @@
 	},
 /turf/open/floor/carpet/royalblue,
 /area/ship/crew/office)
-"RK" = (
-/obj/structure/sign/solgov_flag{
-	pixel_x = -1;
-	pixel_y = 0
-	},
-/turf/closed/wall/mineral/titanium/nodiagonal,
-/area/ship/security/armory)
 "RL" = (
 /turf/closed/wall/mineral/titanium,
 /area/ship/maintenance/port)
@@ -6048,7 +6044,7 @@ wI
 "}
 (12,1,1) = {"
 wI
-uD
+Dw
 Wt
 rY
 AX
@@ -6144,7 +6140,7 @@ wI
 "}
 (15,1,1) = {"
 wI
-Eq
+hB
 qK
 Uc
 EQ
@@ -6455,7 +6451,7 @@ qL
 qL
 Ev
 gQ
-RK
+Dr
 kU
 Mg
 fg
@@ -6487,11 +6483,11 @@ Es
 BJ
 qL
 BU
-Dr
-Dr
-Dr
-Dr
-Dr
+uD
+uD
+uD
+uD
+uD
 wI
 "}
 (26,1,1) = {"

From cd19c05d0dda91a133a98898d1656fb8d6109fa0 Mon Sep 17 00:00:00 2001
From: Ratvar <supermajormeltdown@gmail.com>
Date: Sun, 1 Dec 2024 18:07:22 -0800
Subject: [PATCH 10/14] i missed a lightbulb being on a door somehow

---
 _maps/shuttles/solgov/solgov_paracelsus.dmm | 81 ++++++++++-----------
 1 file changed, 40 insertions(+), 41 deletions(-)

diff --git a/_maps/shuttles/solgov/solgov_paracelsus.dmm b/_maps/shuttles/solgov/solgov_paracelsus.dmm
index 93e891c4dcf9..519386461918 100644
--- a/_maps/shuttles/solgov/solgov_paracelsus.dmm
+++ b/_maps/shuttles/solgov/solgov_paracelsus.dmm
@@ -839,13 +839,6 @@
 	},
 /turf/open/floor/plasteel/tech/techmaint,
 /area/ship/maintenance/port)
-"hB" = (
-/obj/structure/sign/solgov_seal{
-	pixel_x = 28;
-	pixel_y = 0
-	},
-/turf/template_noop,
-/area/template_noop)
 "hM" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/item/clothing/neck/stripedsolgovscarf,
@@ -1025,6 +1018,13 @@
 "jF" = (
 /turf/closed/wall/mineral/titanium,
 /area/ship/bridge)
+"jH" = (
+/obj/structure/sign/solgov_seal{
+	pixel_x = 28;
+	pixel_y = 0
+	},
+/turf/template_noop,
+/area/template_noop)
 "jJ" = (
 /obj/effect/turf_decal/siding/yellow{
 	dir = 1
@@ -1158,13 +1158,9 @@
 /turf/open/floor/plasteel/mono,
 /area/ship/cargo)
 "kN" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced/fulltile/shuttle,
-/obj/machinery/door/poddoor/shutters{
-	id = "sg_par_sonnen"
-	},
-/turf/open/floor/plating,
-/area/ship/security/armory)
+/obj/structure/sign/solgov_seal,
+/turf/template_noop,
+/area/template_noop)
 "kO" = (
 /obj/effect/turf_decal/techfloor/corner{
 	dir = 8
@@ -1268,6 +1264,12 @@
 	},
 /turf/template_noop,
 /area/template_noop)
+"lv" = (
+/obj/structure/sign/solgov_seal{
+	pixel_y = -27
+	},
+/turf/template_noop,
+/area/template_noop)
 "lD" = (
 /obj/structure/closet/wall/directional/north,
 /obj/item/radio,
@@ -2189,7 +2191,12 @@
 /turf/open/floor/wood/mahogany,
 /area/ship/bridge)
 "uD" = (
-/turf/closed/wall/mineral/titanium/nodiagonal,
+/obj/structure/grille,
+/obj/structure/window/reinforced/fulltile/shuttle,
+/obj/machinery/door/poddoor/shutters{
+	id = "sg_par_sonnen"
+	},
+/turf/open/floor/plating,
 /area/ship/security/armory)
 "uJ" = (
 /obj/effect/turf_decal/siding/yellow{
@@ -3142,10 +3149,6 @@
 /turf/open/floor/plasteel/white,
 /area/ship/hallway/port)
 "Dr" = (
-/obj/structure/sign/solgov_flag{
-	pixel_x = -1;
-	pixel_y = 0
-	},
 /turf/closed/wall/mineral/titanium/nodiagonal,
 /area/ship/security/armory)
 "Du" = (
@@ -3176,12 +3179,6 @@
 	},
 /turf/open/floor/plasteel/mono,
 /area/ship/cargo)
-"Dw" = (
-/obj/structure/sign/solgov_seal{
-	pixel_y = -27
-	},
-/turf/template_noop,
-/area/template_noop)
 "Dz" = (
 /obj/structure/chair/office{
 	dir = 4
@@ -3716,9 +3713,12 @@
 /turf/open/floor/wood/ebony,
 /area/ship/crew/canteen)
 "IP" = (
-/obj/structure/sign/solgov_seal,
-/turf/template_noop,
-/area/template_noop)
+/obj/structure/sign/solgov_flag{
+	pixel_x = -1;
+	pixel_y = 0
+	},
+/turf/closed/wall/mineral/titanium/nodiagonal,
+/area/ship/security/armory)
 "IX" = (
 /obj/item/clothing/head/solgov/captain,
 /obj/item/clothing/suit/armor/vest/solgov/captain,
@@ -4744,7 +4744,6 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
 	},
-/obj/machinery/light/directional/north,
 /turf/open/floor/plasteel/white,
 /area/ship/hallway/port)
 "RI" = (
@@ -5944,7 +5943,7 @@ vB
 vB
 wb
 PY
-IP
+kN
 "}
 (9,1,1) = {"
 wI
@@ -6044,7 +6043,7 @@ wI
 "}
 (12,1,1) = {"
 wI
-Dw
+lv
 Wt
 rY
 AX
@@ -6072,7 +6071,7 @@ sC
 ph
 wb
 NY
-IP
+kN
 "}
 (13,1,1) = {"
 wI
@@ -6140,7 +6139,7 @@ wI
 "}
 (15,1,1) = {"
 wI
-hB
+jH
 qK
 Uc
 EQ
@@ -6423,7 +6422,7 @@ iW
 mT
 NE
 gK
-kN
+uD
 wI
 "}
 (24,1,1) = {"
@@ -6451,11 +6450,11 @@ qL
 qL
 Ev
 gQ
-Dr
+IP
 kU
 Mg
 fg
-kN
+uD
 wI
 "}
 (25,1,1) = {"
@@ -6483,11 +6482,11 @@ Es
 BJ
 qL
 BU
-uD
-uD
-uD
-uD
-uD
+Dr
+Dr
+Dr
+Dr
+Dr
 wI
 "}
 (26,1,1) = {"

From fd91be6720415600fdd60dc2838ebd25cb5c8843 Mon Sep 17 00:00:00 2001
From: Ratvar <supermajormeltdown@gmail.com>
Date: Fri, 6 Dec 2024 11:11:41 -0800
Subject: [PATCH 11/14] very last minute fix sonnersoldners are 1 slot nto
 THREE

---
 _maps/configs/solgov_paracelsus.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/_maps/configs/solgov_paracelsus.json b/_maps/configs/solgov_paracelsus.json
index edae442b4dfd..56c510c7fea9 100644
--- a/_maps/configs/solgov_paracelsus.json
+++ b/_maps/configs/solgov_paracelsus.json
@@ -35,7 +35,7 @@
 		},
 		"Sonnensöldner": {
 			"outfit": "/datum/outfit/job/solgov/sonnensoldner",
-			"slots": 3
+			"slots": 1
 		},
 		"Psychologist": {
 			"outfit": "/datum/outfit/job/solgov/psychologist",

From 8babc9e48b39aec53d261d4ec72f9baa043ddcc6 Mon Sep 17 00:00:00 2001
From: Ratvar <supermajormeltdown@gmail.com>
Date: Fri, 6 Dec 2024 23:09:21 -0800
Subject: [PATCH 12/14] fixing map

---
 _maps/shuttles/solgov/solgov_paracelsus.dmm | 100 +++++++++-----------
 1 file changed, 44 insertions(+), 56 deletions(-)

diff --git a/_maps/shuttles/solgov/solgov_paracelsus.dmm b/_maps/shuttles/solgov/solgov_paracelsus.dmm
index 519386461918..8b21e43f863f 100644
--- a/_maps/shuttles/solgov/solgov_paracelsus.dmm
+++ b/_maps/shuttles/solgov/solgov_paracelsus.dmm
@@ -166,10 +166,6 @@
 /turf/open/floor/plasteel/mono/white,
 /area/ship/medical/surgery)
 "bt" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/chair/wood{
-	dir = 1
-	},
 /obj/structure/sign/solgov_flag{
 	dir = 8;
 	pixel_x = 28
@@ -179,7 +175,12 @@
 	pixel_x = 6;
 	pixel_y = -21
 	},
-/turf/open/floor/wood/ebony,
+/obj/effect/turf_decal/trimline/opaque/solgovblue/filled/line{
+	dir = 6
+	},
+/obj/structure/mopbucket,
+/obj/item/mop,
+/turf/open/floor/plasteel/white,
 /area/ship/crew/crewtwo)
 "bD" = (
 /turf/closed/wall/mineral/titanium/nodiagonal,
@@ -253,7 +254,10 @@
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/turf/open/floor/wood,
+/obj/effect/turf_decal/trimline/opaque/solgovblue/filled/warning{
+	dir = 1
+	},
+/turf/open/floor/plasteel/white,
 /area/ship/crew/crewtwo)
 "cu" = (
 /obj/effect/turf_decal/trimline/opaque/solgovblue/filled/corner{
@@ -906,9 +910,6 @@
 /turf/open/floor/plasteel/mono,
 /area/ship/cargo/office)
 "is" = (
-/obj/structure/chair/office{
-	dir = 8
-	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 6
@@ -1633,7 +1634,6 @@
 /obj/effect/turf_decal/siding/wood{
 	dir = 4
 	},
-/obj/structure/closet/crate/bin,
 /turf/open/floor/wood,
 /area/ship/crew/crewtwo)
 "pe" = (
@@ -2533,9 +2533,6 @@
 	dir = 8
 	},
 /obj/effect/turf_decal/solgov/bottom_left,
-/obj/effect/turf_decal/siding/wood{
-	dir = 10
-	},
 /turf/open/floor/plasteel/patterned/ridged,
 /area/ship/crew/crewtwo)
 "xh" = (
@@ -3321,7 +3318,6 @@
 /turf/open/floor/plasteel/mono,
 /area/ship/cargo/office)
 "EL" = (
-/obj/effect/turf_decal/siding/wood,
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
@@ -3331,10 +3327,11 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
 	},
-/obj/effect/turf_decal/siding/wood/corner{
+/obj/effect/turf_decal/trimline/opaque/solgovblue/filled/corner{
 	dir = 4
 	},
-/turf/open/floor/wood,
+/obj/effect/turf_decal/trimline/opaque/solgovblue/filled/corner,
+/turf/open/floor/plasteel/white,
 /area/ship/crew/crewtwo)
 "EM" = (
 /obj/structure/filingcabinet/double/grey,
@@ -3358,7 +3355,6 @@
 	pixel_y = 7
 	},
 /obj/effect/turf_decal/solgov/bottom_right,
-/obj/effect/turf_decal/siding/wood,
 /turf/open/floor/plasteel/patterned/ridged,
 /area/ship/crew/crewtwo)
 "ER" = (
@@ -3416,7 +3412,6 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/maintenance/port)
 "FD" = (
-/obj/effect/turf_decal/siding/wood/corner,
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
@@ -3427,7 +3422,7 @@
 	dir = 4
 	},
 /obj/effect/turf_decal/siding/wood{
-	dir = 1
+	dir = 5
 	},
 /turf/open/floor/wood,
 /area/ship/crew/crewtwo)
@@ -3533,7 +3528,6 @@
 	icon_state = "1-2"
 	},
 /obj/effect/turf_decal/solgov/all/bottom_center,
-/obj/effect/turf_decal/siding/wood,
 /turf/open/floor/plasteel/mono,
 /area/ship/crew/crewtwo)
 "Ht" = (
@@ -3542,13 +3536,6 @@
 	},
 /turf/open/floor/plasteel/white,
 /area/ship/hallway/port)
-"Hv" = (
-/obj/machinery/door/airlock/medical{
-	name = "Morgue";
-	req_one_access = list(5,45)
-	},
-/turf/open/floor/plasteel/dark,
-/area/ship/hallway/port)
 "HD" = (
 /obj/machinery/light_switch{
 	dir = 4;
@@ -4244,6 +4231,11 @@
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
 	dir = 8
 	},
+/obj/structure/table,
+/obj/item/storage/box/bodybags{
+	pixel_x = 0;
+	pixel_y = 4
+	},
 /turf/open/floor/plasteel/white,
 /area/ship/hallway/port)
 "NE" = (
@@ -4421,7 +4413,6 @@
 /turf/open/floor/plasteel/white,
 /area/ship/medical/surgery)
 "Pc" = (
-/obj/effect/turf_decal/siding/wood,
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
@@ -4434,7 +4425,7 @@
 /obj/structure/cable{
 	icon_state = "1-8"
 	},
-/turf/open/floor/wood,
+/turf/open/floor/plasteel/white,
 /area/ship/crew/crewtwo)
 "Pg" = (
 /obj/effect/turf_decal/siding/wood{
@@ -4956,17 +4947,18 @@
 /area/ship/hallway/port)
 "TD" = (
 /obj/item/radio/intercom/directional/south,
-/obj/structure/chair/wood{
-	dir = 1
+/obj/effect/turf_decal/trimline/opaque/solgovblue/filled/line{
+	dir = 2
 	},
-/turf/open/floor/wood/ebony,
+/obj/structure/bed/roller,
+/turf/open/floor/plasteel/white,
 /area/ship/crew/crewtwo)
 "TI" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
-/obj/effect/turf_decal/siding/wood{
-	dir = 8
+/obj/effect/turf_decal/trimline/opaque/solgovblue/filled/warning{
+	dir = 9
 	},
-/turf/open/floor/wood,
+/turf/open/floor/plasteel/white,
 /area/ship/crew/crewtwo)
 "TJ" = (
 /obj/structure/toilet{
@@ -5025,11 +5017,12 @@
 /turf/open/floor/plasteel/white,
 /area/ship/medical/surgery)
 "Uq" = (
-/obj/structure/chair/wood{
-	dir = 1
-	},
 /obj/machinery/computer/helm/viewscreen/directional/south,
-/turf/open/floor/wood/ebony,
+/obj/effect/turf_decal/trimline/opaque/solgovblue/filled/line{
+	dir = 10
+	},
+/obj/structure/bed/roller,
+/turf/open/floor/plasteel/white,
 /area/ship/crew/crewtwo)
 "Uu" = (
 /obj/effect/turf_decal/borderfloorblack{
@@ -5090,10 +5083,6 @@
 	},
 /turf/open/floor/plasteel/white,
 /area/ship/medical/surgery)
-"UV" = (
-/obj/structure/table,
-/turf/open/floor/plasteel/dark,
-/area/ship/hallway/port)
 "Vq" = (
 /obj/effect/turf_decal/corner/opaque/solgovblue{
 	dir = 9
@@ -5218,10 +5207,10 @@
 /area/ship/maintenance/port)
 "Wo" = (
 /obj/machinery/light/directional/east,
-/obj/effect/turf_decal/siding/wood{
-	dir = 4
+/obj/effect/turf_decal/trimline/opaque/solgovblue/filled/warning{
+	dir = 5
 	},
-/turf/open/floor/wood,
+/turf/open/floor/plasteel/white,
 /area/ship/crew/crewtwo)
 "Ws" = (
 /obj/structure/table/wood,
@@ -5579,8 +5568,6 @@
 /turf/open/floor/wood/yew,
 /area/ship/crew)
 "YU" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/turf_decal/siding/wood,
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
@@ -5588,10 +5575,10 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
 	},
-/obj/effect/turf_decal/siding/wood/corner{
-	dir = 1
+/obj/effect/turf_decal/trimline/opaque/solgovblue/filled/line{
+	dir = 8
 	},
-/turf/open/floor/wood,
+/turf/open/floor/plasteel/white,
 /area/ship/crew/crewtwo)
 "YY" = (
 /obj/effect/turf_decal/borderfloor{
@@ -5670,9 +5657,10 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/structure/table,
-/obj/item/paper_bin,
-/obj/item/pen/solgov,
+/obj/machinery/door/airlock/medical{
+	name = "Morgue";
+	req_one_access = list(5,45)
+	},
 /turf/open/floor/plasteel/dark,
 /area/ship/hallway/port)
 "ZU" = (
@@ -6207,7 +6195,7 @@ jg
 jw
 Lf
 Ht
-UV
+jg
 HK
 RA
 jg
@@ -6271,7 +6259,7 @@ jg
 mn
 nt
 NB
-Hv
+jg
 RC
 cd
 UJ

From 3d935780f025f715b3aa69e7967b68245843b5f9 Mon Sep 17 00:00:00 2001
From: Ratvar <supermajormeltdown@gmail.com>
Date: Fri, 6 Dec 2024 23:12:40 -0800
Subject: [PATCH 13/14] not finished just. suffering quickly

---
 _maps/shuttles/solgov/solgov_paracelsus.dmm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/_maps/shuttles/solgov/solgov_paracelsus.dmm b/_maps/shuttles/solgov/solgov_paracelsus.dmm
index 8b21e43f863f..5d3c86f37ecd 100644
--- a/_maps/shuttles/solgov/solgov_paracelsus.dmm
+++ b/_maps/shuttles/solgov/solgov_paracelsus.dmm
@@ -3963,6 +3963,7 @@
 	dir = 4
 	},
 /obj/item/radio/intercom/directional/west,
+/obj/structure/closet/body_bag,
 /turf/open/floor/plasteel/white,
 /area/ship/hallway/port)
 "Lw" = (

From 183de1dc30c357c9f99f294e3dbcbfff2bfb6995 Mon Sep 17 00:00:00 2001
From: Ratvar <supermajormeltdown@gmail.com>
Date: Fri, 6 Dec 2024 23:20:17 -0800
Subject: [PATCH 14/14] i hate strong dmm for it's visual glitches

---
 _maps/shuttles/solgov/solgov_paracelsus.dmm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/_maps/shuttles/solgov/solgov_paracelsus.dmm b/_maps/shuttles/solgov/solgov_paracelsus.dmm
index 869c208b7e82..d8781cb227a5 100644
--- a/_maps/shuttles/solgov/solgov_paracelsus.dmm
+++ b/_maps/shuttles/solgov/solgov_paracelsus.dmm
@@ -180,6 +180,7 @@
 	},
 /obj/structure/mopbucket,
 /obj/item/mop,
+/obj/item/mop,
 /turf/open/floor/plasteel/white,
 /area/ship/crew/crewtwo)
 "bD" = (
@@ -3235,6 +3236,7 @@
 	pixel_y = 7
 	},
 /obj/structure/table/wood,
+/obj/item/soap,
 /turf/open/floor/wood/ebony,
 /area/ship/crew/canteen)
 "Eh" = (