diff --git a/_maps/PentestMaps/BeachRuins/_modular_beachplanet.dm b/_maps/PentestMaps/BeachRuins/_modular_beachplanet.dm
index 937122aaf6..2e8215c8b2 100644
--- a/_maps/PentestMaps/BeachRuins/_modular_beachplanet.dm
+++ b/_maps/PentestMaps/BeachRuins/_modular_beachplanet.dm
@@ -17,6 +17,21 @@
 	description = "A abandoned colony. It seems that this colony was abandoned, for a reason or another"
 	suffix = "beach_colony.dmm"
 
+/datum/map_template/ruin/beachplanet/pentest/crashedengie
+	name = "Crashed Engineer Ship"
+	id = "beach_crashed_engineer"
+	description = "An abandoned camp built by a crashed engineer"
+	suffix = "beach_crashed_engineer.dmm"
+	ruin_tags = list(RUIN_TAG_MINOR_COMBAT, RUIN_TAG_MEDIUM_LOOT, RUIN_TAG_HAZARDOUS)
+	ruin_mission_types = list(/datum/mission/ruin/lost_axe)
+
+/datum/mission/ruin/lost_axe
+	name = "Axe Retrieval"
+	desc = "I recently lost a heirloom axe - produced by a very fine Syebenaltch Guild. I was unable to retrieve it when my vessel crashed, and I was rescued. Please bring it home to me."
+	mission_limit = 1
+	value = 1000
+	setpiece_item = /obj/item/melee/axe/fire
+
 /datum/map_template/ruin/beachplanet/pentest/fishing_hole
 	name = "Fishing Hole"
 	id = "fishing_hole"
@@ -41,6 +56,14 @@
 	description = "A rather large town built on the edge of the ocean."
 	suffix = "beach_ocean_town.dmm"
 
+/datum/map_template/ruin/beachplanet/pentest/scrapvillage
+	name = "Pirate Village"
+	id = "beach_pirate"
+	description = "A small pirate outpost formed from the remains of a wrecked shuttle."
+	suffix = "beach_pirate_crash.dmm"
+	ruin_tags = list(RUIN_TAG_MEDIUM_COMBAT, RUIN_TAG_MEDIUM_LOOT, RUIN_TAG_LIVEABLE)
+	ruin_mission_types = list(/datum/mission/ruin/signaled/kill/frontiersmen)
+
 /// Maps that do exist on shiptest code - Custom Modified ///
 
 /datum/map_template/ruin/beachplanet/pentest/fishinghut
diff --git a/_maps/RandomRuins/BeachRuins/beach_crashed_engineer.dmm b/_maps/PentestMaps/BeachRuins/beach_crashed_engineer.dmm
similarity index 100%
rename from _maps/RandomRuins/BeachRuins/beach_crashed_engineer.dmm
rename to _maps/PentestMaps/BeachRuins/beach_crashed_engineer.dmm
diff --git a/_maps/PentestMaps/BeachRuins/beach_pirate_crash.dmm b/_maps/PentestMaps/BeachRuins/beach_pirate_crash.dmm
index d1d7d1bc8a..74727a9411 100644
--- a/_maps/PentestMaps/BeachRuins/beach_pirate_crash.dmm
+++ b/_maps/PentestMaps/BeachRuins/beach_pirate_crash.dmm
@@ -568,11 +568,11 @@
 /obj/item/stack/medical/gauze/improvised,
 /obj/item/stack/medical/gauze/improvised,
 /obj/item/stack/medical/gauze/improvised,
-/obj/item/reagent_containers/pill/patch/silver_sulf{
+/obj/item/reagent_containers/pill/patch/alvitane{
 	pixel_x = 5;
 	pixel_y = 3
 	},
-/obj/item/reagent_containers/pill/patch/styptic,
+/obj/item/reagent_containers/pill/patch/indomide,
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/wood,
 /area/ruin/beach/piratecrash)
diff --git a/_maps/PentestMaps/BeachRuins/beach_pirate_treasure_cove.dmm b/_maps/PentestMaps/BeachRuins/beach_pirate_treasure_cove.dmm
index 0f56f1458c..92b8cfc7de 100644
--- a/_maps/PentestMaps/BeachRuins/beach_pirate_treasure_cove.dmm
+++ b/_maps/PentestMaps/BeachRuins/beach_pirate_treasure_cove.dmm
@@ -414,9 +414,9 @@
 	pixel_x = 9;
 	pixel_y = -1
 	},
-/obj/item/gun/ballistic/automatic/assault/cm82{
-	pixel_y = 7;
-	pixel_x = -9
+/obj/item/gun/ballistic/automatic/smg/cm5{
+	pixel_x = -5;
+	pixel_y = 5
 	},
 /turf/open/floor/carpet/red,
 /area/ruin/beach/treasure_cove)
@@ -1656,7 +1656,6 @@
 /obj/structure/closet/crate/secure/weapon,
 /obj/item/gun/energy/laser,
 /obj/item/gun/energy/laser,
-/obj/item/gun/energy/laser,
 /turf/open/floor/wood,
 /area/ruin/beach/treasure_cove)
 "Ya" = (
@@ -1746,26 +1745,10 @@
 /area/ruin/beach/treasure_cove)
 "ZG" = (
 /obj/effect/mob_spawn/human/corpse/damaged,
-/obj/item/ammo_box/magazine/p16{
-	pixel_x = -7;
-	pixel_y = 2
-	},
-/obj/item/ammo_box/magazine/p16{
-	pixel_x = -7;
-	pixel_y = 2
-	},
-/obj/item/ammo_box/magazine/p16{
-	pixel_x = -7;
-	pixel_y = 2
-	},
 /obj/structure/closet/body_bag,
-/obj/item/ammo_box/magazine/p16{
-	pixel_x = -7;
-	pixel_y = 2
-	},
-/obj/item/ammo_box/magazine/p16{
-	pixel_x = -7;
-	pixel_y = 2
+/obj/item/ammo_box/magazine/cm5_9mm{
+	pixel_x = -8;
+	pixel_y = -1
 	},
 /obj/item/clothing/head/helmet/bulletproof/x11/clip,
 /obj/item/clothing/under/clip/officer,
diff --git a/_maps/RandomRuins/BeachRuins/beach_ancient_ruin.dmm b/_maps/RandomRuins/BeachRuins/beach_ancient_ruin.dmm
index b1362d35ca..533c9ce581 100644
--- a/_maps/RandomRuins/BeachRuins/beach_ancient_ruin.dmm
+++ b/_maps/RandomRuins/BeachRuins/beach_ancient_ruin.dmm
@@ -486,11 +486,11 @@
 /turf/open/floor/concrete/slab_1,
 /area/ruin/beach/complex/wall)
 "iB" = (
-/obj/item/reagent_containers/pill/patch/styptic{
+/obj/item/reagent_containers/pill/patch/indomide{
 	name = "industrial medicine";
 	pixel_y = 5
 	},
-/obj/item/reagent_containers/pill/patch/styptic{
+/obj/item/reagent_containers/pill/patch/indomide{
 	name = "industrial medicine"
 	},
 /obj/structure/table,
@@ -1726,10 +1726,10 @@
 /area/ruin/beach/complex)
 "Cb" = (
 /obj/structure/table,
-/obj/item/reagent_containers/pill/patch/silver_sulf{
+/obj/item/reagent_containers/pill/patch/alvitane{
 	name = "industrial medicine"
 	},
-/obj/item/reagent_containers/pill/patch/silver_sulf{
+/obj/item/reagent_containers/pill/patch/alvitane{
 	pixel_y = -5;
 	name = "industrial medicine"
 	},
diff --git a/_maps/RandomRuins/BeachRuins/beach_frontie_moat.dmm b/_maps/RandomRuins/BeachRuins/beach_frontie_moat.dmm
new file mode 100644
index 0000000000..718782f254
--- /dev/null
+++ b/_maps/RandomRuins/BeachRuins/beach_frontie_moat.dmm
@@ -0,0 +1,6781 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"ad" = (
+/turf/open/floor/concrete/slab_3,
+/area/ruin/beach/village/kitchen)
+"an" = (
+/turf/open/floor/concrete/slab_2,
+/area/ruin/beach/village/dorm)
+"au" = (
+/obj/machinery/door/airlock/freezer{
+	name = "Corpse Storage"
+	},
+/obj/effect/decal/cleanable/blood/tracks,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/concrete/slab_1,
+/area/ruin/beach/village/armory)
+"av" = (
+/obj/effect/turf_decal/siding/wideplating,
+/obj/machinery/power/apc/auto_name/directional/east,
+/obj/structure/cable{
+	icon_state = "0-10"
+	},
+/turf/open/floor/plasteel,
+/area/ruin/beach/village/infirmary)
+"aC" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/turf_decal/siding/thinplating/dark,
+/turf/open/floor/concrete/slab_3,
+/area/ruin/beach/village/armory)
+"aM" = (
+/obj/structure/cable{
+	icon_state = "4-9"
+	},
+/turf/open/floor/concrete/slab_1,
+/area/ruin/beach/village/dorm)
+"aW" = (
+/obj/structure/cable{
+	icon_state = "2-5"
+	},
+/turf/open/floor/plating/asteroid/dirt/beach,
+/area/overmap_encounter/planetoid/beachplanet/explored)
+"aZ" = (
+/obj/structure/table/reinforced,
+/obj/item/storage/box/emptysandbags{
+	pixel_x = -10;
+	pixel_y = 1
+	},
+/obj/item/storage/box/emptysandbags{
+	pixel_x = 6;
+	pixel_y = 2
+	},
+/turf/open/floor/plasteel/tech,
+/area/ruin/beach/village/armory)
+"be" = (
+/obj/effect/turf_decal/stairs_wood{
+	dir = 5;
+	color = "#543C30"
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/wood/walnut,
+/area/ruin/beach/village/kitchen)
+"bf" = (
+/obj/structure/chair/sofa/brown/old/right/directional/east,
+/turf/open/floor/wood/walnut,
+/area/ruin/beach/village/kitchen)
+"bg" = (
+/obj/effect/overlay/palmtree_r,
+/turf/open/floor/plating/asteroid/sand/lit,
+/area/overmap_encounter/planetoid/beachplanet/explored)
+"bo" = (
+/obj/effect/turf_decal/siding/wood,
+/turf/open/floor/wood,
+/area/ruin/beach/village/officers)
+"bp" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/light/small/directional/east,
+/turf/open/floor/concrete/slab_1,
+/area/ruin/beach/village/kitchen)
+"bs" = (
+/obj/effect/turf_decal/siding/thinplating{
+	dir = 4
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/tech/techmaint,
+/area/ruin/beach/village/armory)
+"bG" = (
+/obj/structure/railing/wood,
+/turf/open/floor/plating/asteroid/dirt/grass/beach,
+/area/overmap_encounter/planetoid/beachplanet/explored)
+"bS" = (
+/obj/machinery/power/smes/engineering,
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/structure/cable{
+	icon_state = "0-8"
+	},
+/turf/open/floor/plating,
+/area/ruin/beach/village/armory)
+"bW" = (
+/obj/effect/turf_decal/siding/thinplating{
+	dir = 4
+	},
+/obj/structure/closet/wall/red/directional/west{
+	name = "armor closet"
+	},
+/obj/item/clothing/head/helmet/bulletproof/x11/frontier,
+/obj/item/clothing/head/helmet/bulletproof/x11/frontier,
+/obj/item/clothing/suit/armor/vest/frontier,
+/obj/item/clothing/suit/armor/vest/frontier,
+/turf/open/floor/plasteel/tech/techmaint,
+/area/ruin/beach/village/armory)
+"cd" = (
+/obj/item/ammo_casing/spent/rifle_brass,
+/turf/open/floor/plating/asteroid/dirt/beach,
+/area/overmap_encounter/planetoid/beachplanet/explored)
+"ck" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/concrete/slab_2,
+/area/ruin/beach/village/dorm)
+"cl" = (
+/obj/structure/closet/cabinet,
+/obj/item/clothing/under/frontiersmen,
+/obj/item/clothing/under/frontiersmen/deckhand,
+/obj/item/clothing/shoes/combat{
+	pixel_y = -10
+	},
+/obj/item/clothing/head/soft/frontiersmen{
+	pixel_y = 5
+	},
+/obj/item/storage/backpack/duffelbag,
+/obj/item/storage/fancy/cigarettes/derringer,
+/turf/open/floor/wood,
+/area/ruin/beach/village/dorm)
+"cx" = (
+/obj/machinery/light/small/directional/south,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/concrete/slab_2,
+/area/ruin/beach/village/armory)
+"cK" = (
+/turf/open/floor/plasteel/showroomfloor,
+/area/ruin/beach/village/infirmary)
+"cT" = (
+/obj/effect/decal/cleanable/food/flour,
+/obj/item/reagent_containers/glass/bowl{
+	pixel_x = 5;
+	pixel_y = -6
+	},
+/obj/item/reagent_containers/glass/bowl{
+	pixel_x = -9;
+	pixel_y = 8
+	},
+/obj/item/reagent_containers/condiment/milk{
+	pixel_x = -12;
+	pixel_y = -8;
+	list_reagents = null
+	},
+/turf/open/floor/concrete/slab_1,
+/area/ruin/beach/village/kitchen)
+"cU" = (
+/obj/structure/barricade/sandbags,
+/turf/open/floor/plating/asteroid/dirt/grass/beach,
+/area/overmap_encounter/planetoid/beachplanet/explored)
+"cV" = (
+/obj/structure/cable{
+	icon_state = "2-4"
+	},
+/turf/open/floor/concrete/slab_1,
+/area/ruin/beach/village/armory)
+"cZ" = (
+/obj/effect/decal/cleanable/crayon{
+	color = "#FF3333";
+	icon_state = "s";
+	pixel_y = 13;
+	pixel_x = 14
+	},
+/turf/open/floor/plating/asteroid/sand/lit,
+/area/overmap_encounter/planetoid/beachplanet/explored)
+"df" = (
+/obj/structure/chair/comfy/beige/old/directional/west,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/wood{
+	icon_state = "wood-broken6"
+	},
+/area/ruin/beach/village/officers)
+"di" = (
+/obj/structure/cable{
+	icon_state = "2-9"
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 1
+	},
+/turf/open/floor/concrete/slab_3,
+/area/ruin/beach/village/armory)
+"dl" = (
+/obj/machinery/vending/cola/starkist,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/wood{
+	icon_state = "wood-broken"
+	},
+/area/ruin/beach/village/dorm)
+"dq" = (
+/obj/effect/turf_decal/road{
+	dir = 1
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/concrete/pavement/beachplanet/lit,
+/area/overmap_encounter/planetoid/beachplanet/explored)
+"dN" = (
+/obj/structure/toilet{
+	dir = 1
+	},
+/obj/machinery/light/small/directional/south,
+/obj/effect/decal/cleanable/vomit/old,
+/turf/open/floor/plasteel/tech/techmaint,
+/area/ruin/beach/village/armory)
+"ed" = (
+/obj/machinery/firealarm/directional/north{
+	pixel_x = 7;
+	pixel_y = 33
+	},
+/obj/structure/extinguisher_cabinet/directional/north{
+	pixel_x = -6;
+	pixel_y = 28
+	},
+/obj/item/clothing/head/chefhat{
+	pixel_x = -8;
+	pixel_y = -9
+	},
+/turf/open/floor/concrete/slab_1,
+/area/ruin/beach/village/kitchen)
+"ee" = (
+/obj/structure/closet/crate/freezer,
+/obj/item/fish/lanternfish,
+/obj/item/fish/lanternfish,
+/obj/item/fish/lanternfish,
+/obj/item/fish/lanternfish,
+/obj/item/fish/pufferfish,
+/obj/item/fish/bass,
+/obj/item/fish/bass,
+/obj/structure/platform/wood{
+	dir = 8
+	},
+/obj/item/fish/donkfish,
+/obj/item/fish/emulsijack,
+/obj/item/fish/salmon,
+/obj/item/fish/salmon,
+/turf/open/floor/wood/walnut,
+/area/ruin/beach/village/kitchen)
+"eh" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/structure/cable{
+	icon_state = "2-4"
+	},
+/turf/open/floor/concrete/slab_1,
+/area/ruin/beach/village/officers)
+"ei" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/machinery/power/rtg/geothermal,
+/obj/structure/cable/yellow{
+	icon_state = "0-2"
+	},
+/turf/open/floor/plating,
+/area/ruin/beach/village/armory)
+"ew" = (
+/turf/closed/wall/mineral/wood,
+/area/ruin/beach/village/dorm)
+"eW" = (
+/mob/living/simple_animal/hostile/human/frontier/ranged/officer,
+/obj/machinery/light/directional/north,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/carpet/black,
+/area/ruin/beach/village/officers)
+"fa" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/open/floor/plating/asteroid/sand/lit,
+/area/overmap_encounter/planetoid/beachplanet/explored)
+"fh" = (
+/turf/open/floor/plating/asteroid/sand/lit,
+/area/overmap_encounter/planetoid/beachplanet/explored)
+"fr" = (
+/obj/effect/turf_decal/siding/wideplating{
+	dir = 6
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel,
+/area/ruin/beach/village/infirmary)
+"ft" = (
+/obj/effect/turf_decal/siding/wideplating/dark{
+	dir = 1
+	},
+/mob/living/simple_animal/hostile/human/frontier/ranged/surgeon/neuter,
+/turf/open/floor/plasteel/showroomfloor,
+/area/ruin/beach/village/infirmary)
+"fC" = (
+/obj/machinery/shower{
+	dir = 8
+	},
+/obj/effect/turf_decal/steeldecal/steel_decals10,
+/obj/effect/turf_decal/steeldecal/steel_decals10{
+	dir = 4
+	},
+/obj/effect/turf_decal/steeldecal/steel_decals2,
+/turf/open/floor/plasteel/freezer,
+/area/ruin/beach/village/armory)
+"fR" = (
+/turf/open/floor/plasteel/tech/techmaint,
+/area/ruin/beach/village/armory)
+"fU" = (
+/obj/machinery/door/airlock/wood/glass{
+	dir = 4;
+	name = "Dormitory"
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 8
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 4
+	},
+/turf/open/floor/concrete/slab_1,
+/area/ruin/beach/village/dorm)
+"gh" = (
+/obj/structure/rack,
+/obj/item/reagent_containers/glass/concrete_bag{
+	pixel_x = 7;
+	pixel_y = 1
+	},
+/obj/item/reagent_containers/glass/concrete_bag{
+	pixel_x = -6;
+	pixel_y = 1
+	},
+/turf/open/floor/plasteel/tech,
+/area/ruin/beach/village/armory)
+"gj" = (
+/obj/effect/decal/cleanable/blood/tracks,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/turf_decal/siding/black{
+	dir = 4
+	},
+/turf/open/floor/concrete/slab_3,
+/area/ruin/beach/village/armory)
+"go" = (
+/obj/structure/cable{
+	icon_state = "1-6"
+	},
+/turf/open/floor/concrete/slab_1,
+/area/ruin/beach/village/infirmary)
+"gr" = (
+/obj/structure/table,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/carpet,
+/area/ruin/beach/village/kitchen)
+"gz" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/concrete/slab_2,
+/area/ruin/beach/village/armory)
+"gE" = (
+/obj/effect/decal/cleanable/crayon{
+	color = "#FF3333";
+	icon_state = "getout";
+	pixel_y = -3;
+	pixel_x = -5
+	},
+/turf/open/water/beach/deep,
+/area/overmap_encounter/planetoid/beachplanet/explored)
+"gK" = (
+/obj/effect/turf_decal/siding/thinplating{
+	dir = 10
+	},
+/turf/open/floor/plasteel/tech/techmaint,
+/area/ruin/beach/village/armory)
+"gM" = (
+/obj/structure/table,
+/obj/item/food/candyheart{
+	pixel_x = 5;
+	pixel_y = 4
+	},
+/turf/open/floor/plating/asteroid/sand/lit,
+/area/overmap_encounter/planetoid/beachplanet/explored)
+"gX" = (
+/obj/structure/railing/wood{
+	dir = 6
+	},
+/obj/structure/flora/ausbushes/grassybush,
+/turf/open/floor/plating/asteroid/dirt/grass/beach,
+/area/overmap_encounter/planetoid/beachplanet/explored)
+"hv" = (
+/obj/structure/rack,
+/obj/item/ammo_box/magazine/cm23{
+	pixel_x = 5;
+	pixel_y = 0
+	},
+/obj/item/ammo_box/magazine/cm23{
+	pixel_x = -5;
+	pixel_y = 0
+	},
+/obj/item/stock_parts/cell/gun,
+/obj/effect/turf_decal/siding/thinplating/corner,
+/turf/open/floor/plasteel/tech/techmaint,
+/area/ruin/beach/village/armory)
+"hy" = (
+/obj/machinery/light/small/directional/north,
+/turf/open/floor/concrete/slab_1,
+/area/ruin/beach/village/infirmary)
+"hD" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/effect/turf_decal/siding/thinplating/dark,
+/turf/open/floor/concrete/slab_3,
+/area/ruin/beach/village/armory)
+"hF" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/door/airlock/wood{
+	dir = 4;
+	name = "Kitchen"
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 8
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 4
+	},
+/turf/open/floor/concrete/slab_1,
+/area/ruin/beach/village/kitchen)
+"hG" = (
+/obj/structure/dresser{
+	dir = 8;
+	pixel_x = 4;
+	pixel_y = 0
+	},
+/turf/open/floor/wood,
+/area/ruin/beach/village/officers)
+"hR" = (
+/obj/effect/decal/cleanable/crayon{
+	color = "#FF3333";
+	icon_state = "o";
+	pixel_y = 12;
+	pixel_x = 5
+	},
+/obj/effect/decal/cleanable/crayon{
+	color = "#FF3333";
+	icon_state = "shotgun";
+	pixel_y = -6;
+	pixel_x = -8
+	},
+/obj/effect/decal/cleanable/crayon{
+	color = "#FF3333";
+	icon_state = "h";
+	pixel_y = 14;
+	pixel_x = -7
+	},
+/turf/open/floor/plating/asteroid/sand/lit,
+/area/overmap_encounter/planetoid/beachplanet/explored)
+"hV" = (
+/obj/structure/cable{
+	icon_state = "2-5"
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/concrete/slab_3,
+/area/ruin/beach/village/infirmary)
+"hY" = (
+/obj/machinery/door/airlock/wood{
+	dir = 4;
+	name = "Head Boss Bedroom"
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 8
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 4
+	},
+/turf/open/floor/concrete/slab_1,
+/area/ruin/beach/village/officers)
+"iE" = (
+/obj/structure/rack,
+/obj/item/pickaxe{
+	pixel_x = -6;
+	pixel_y = 9
+	},
+/obj/item/pickaxe{
+	pixel_x = -2;
+	pixel_y = 6
+	},
+/obj/item/pickaxe,
+/obj/item/pickaxe{
+	pixel_x = 6;
+	pixel_y = -1
+	},
+/turf/open/floor/concrete/slab_1,
+/area/ruin/beach/village/armory)
+"iF" = (
+/obj/structure/chair/sofa/brown/old/right{
+	dir = 4
+	},
+/turf/open/floor/concrete/slab_2,
+/area/ruin/beach/village/dorm)
+"iG" = (
+/obj/machinery/power/apc/auto_name/directional/north,
+/obj/structure/cable{
+	icon_state = "0-8"
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/wood,
+/area/ruin/beach/village/officers)
+"iN" = (
+/obj/structure/chair{
+	dir = 8
+	},
+/turf/open/floor/carpet/red,
+/area/ruin/beach/village/officers)
+"iQ" = (
+/obj/machinery/door/airlock/wood{
+	name = "Boss Bedroom"
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 1
+	},
+/obj/machinery/door/firedoor/border_only,
+/turf/open/floor/concrete/slab_1,
+/area/ruin/beach/village/officers)
+"iR" = (
+/obj/effect/overlay/palmtree_l,
+/turf/open/floor/plating/asteroid/sand/lit,
+/area/overmap_encounter/planetoid/beachplanet/explored)
+"iU" = (
+/turf/open/floor/wood/walnut,
+/area/ruin/beach/village/kitchen)
+"iZ" = (
+/obj/structure/flora/ausbushes/grassybush,
+/turf/open/floor/plating/asteroid/dirt/grass/beach,
+/area/overmap_encounter/planetoid/beachplanet/explored)
+"jb" = (
+/obj/machinery/door/airlock/wood{
+	name = "Deck"
+	},
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/door/firedoor/border_only{
+	dir = 1
+	},
+/turf/open/floor/concrete/slab_1,
+/area/ruin/beach/village/officers)
+"jd" = (
+/obj/structure/railing{
+	dir = 4
+	},
+/obj/effect/turf_decal/siding/thinplating{
+	dir = 8
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/tech/techmaint,
+/area/ruin/beach/village/armory)
+"je" = (
+/turf/open/floor/carpet,
+/area/ruin/beach/village/kitchen)
+"jm" = (
+/turf/open/floor/concrete/pavement/beachplanet/lit,
+/area/ruin/beach/village/armory)
+"jn" = (
+/mob/living/simple_animal/hostile/human/frontier,
+/turf/open/floor/carpet/orange,
+/area/ruin/beach/village/dorm)
+"jD" = (
+/obj/structure/cable{
+	icon_state = "5-8"
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/concrete/slab_1,
+/area/ruin/beach/village/armory)
+"jH" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 4;
+	color = "#543C30"
+	},
+/turf/open/floor/plasteel/tech/techmaint,
+/area/ruin/beach/village/kitchen)
+"jS" = (
+/obj/structure/cable{
+	icon_state = "5-8"
+	},
+/turf/open/floor/plating/asteroid/dirt/beach,
+/area/overmap_encounter/planetoid/beachplanet/explored)
+"kc" = (
+/obj/machinery/power/terminal,
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/structure/cable/yellow{
+	icon_state = "0-8"
+	},
+/turf/open/floor/plating,
+/area/ruin/beach/village/armory)
+"ki" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/wood,
+/area/ruin/beach/village/officers)
+"kr" = (
+/obj/structure/railing/wood{
+	dir = 4
+	},
+/turf/open/floor/plating/asteroid/dirt/grass/beach,
+/area/overmap_encounter/planetoid/beachplanet/explored)
+"kA" = (
+/obj/structure/cable{
+	icon_state = "0-2"
+	},
+/obj/machinery/power/apc/auto_name/directional/north,
+/turf/open/floor/wood,
+/area/ruin/beach/village/dorm)
+"kI" = (
+/turf/open/floor/wood/walnut,
+/area/ruin/beach/village/officers)
+"kL" = (
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
+/turf/open/floor/plating/asteroid/dirt/beach,
+/area/overmap_encounter/planetoid/beachplanet/explored)
+"lc" = (
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 1
+	},
+/turf/open/floor/concrete/slab_3,
+/area/ruin/beach/village/armory)
+"le" = (
+/obj/structure/flora/tree/jungle/small,
+/turf/open/floor/plating/asteroid/dirt/grass/beach,
+/area/overmap_encounter/planetoid/beachplanet/explored)
+"lf" = (
+/obj/effect/decal/cleanable/blood,
+/turf/open/floor/plating/asteroid/sand/lit,
+/area/overmap_encounter/planetoid/beachplanet/explored)
+"ll" = (
+/turf/closed/wall/mineral/wood,
+/area/ruin/beach/village/kitchen)
+"lm" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/structure/cable{
+	icon_state = "2-9"
+	},
+/turf/open/floor/plating/asteroid/dirt/beach,
+/area/overmap_encounter/planetoid/beachplanet/explored)
+"lw" = (
+/obj/structure/bed{
+	dir = 4
+	},
+/obj/item/bedsheet/black{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
+/area/ruin/beach/village/infirmary)
+"lx" = (
+/obj/effect/turf_decal/siding/wideplating/dark,
+/obj/structure/cable{
+	icon_state = "2-10"
+	},
+/turf/open/floor/plasteel/showroomfloor,
+/area/ruin/beach/village/infirmary)
+"ly" = (
+/obj/structure/closet/crate/bin,
+/obj/machinery/light/directional/south,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/wood,
+/area/ruin/beach/village/dorm)
+"lz" = (
+/turf/open/floor/carpet/green,
+/area/ruin/beach/village/dorm)
+"lB" = (
+/turf/open/water/beach,
+/area/overmap_encounter/planetoid/beachplanet/explored)
+"lC" = (
+/obj/structure/platform/wood{
+	dir = 10
+	},
+/turf/open/water/beach/deep,
+/area/overmap_encounter/planetoid/beachplanet/explored)
+"lM" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 1
+	},
+/turf/open/floor/concrete/slab_4,
+/area/ruin/beach/village/armory)
+"lR" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/open/floor/wood,
+/area/ruin/beach/village/officers)
+"mb" = (
+/obj/structure/railing/corner{
+	dir = 8
+	},
+/turf/open/floor/concrete/slab_3,
+/area/ruin/beach/village/kitchen)
+"mh" = (
+/obj/machinery/light/directional/south,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/wood,
+/area/ruin/beach/village/officers)
+"mi" = (
+/turf/open/floor/concrete/slab_2,
+/area/ruin/beach/village/armory)
+"mm" = (
+/obj/structure/cable{
+	icon_state = "2-4"
+	},
+/obj/effect/turf_decal/siding/thinplating/dark,
+/turf/open/floor/concrete/slab_3,
+/area/ruin/beach/village/armory)
+"mn" = (
+/obj/structure/crate_shelf,
+/turf/open/floor/plasteel/tech/techmaint,
+/area/ruin/beach/village/armory)
+"mw" = (
+/obj/structure/chair{
+	dir = 1
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/concrete/slab_3,
+/area/ruin/beach/village/infirmary)
+"mG" = (
+/obj/effect/turf_decal/road,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/concrete/pavement/beachplanet/lit,
+/area/overmap_encounter/planetoid/beachplanet/explored)
+"mK" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/plating/asteroid/dirt/grass/beach,
+/area/overmap_encounter/planetoid/beachplanet/explored)
+"mM" = (
+/obj/structure/table/reinforced,
+/obj/item/defibrillator/loaded{
+	pixel_x = 0;
+	pixel_y = 4
+	},
+/obj/effect/turf_decal/siding/wideplating{
+	dir = 8
+	},
+/turf/open/floor/plasteel,
+/area/ruin/beach/village/infirmary)
+"mQ" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/carpet/black,
+/area/ruin/beach/village/officers)
+"ng" = (
+/obj/structure/platform/wood{
+	dir = 4
+	},
+/turf/open/water/beach/deep,
+/area/overmap_encounter/planetoid/beachplanet/explored)
+"nu" = (
+/obj/structure/flora/ausbushes/fullgrass,
+/turf/open/floor/plating/asteroid/dirt/grass/beach,
+/area/overmap_encounter/planetoid/beachplanet/explored)
+"nL" = (
+/turf/open/floor/carpet/black,
+/area/ruin/beach/village/officers)
+"nM" = (
+/obj/machinery/door/airlock/hatch,
+/turf/open/floor/concrete/slab_1,
+/area/ruin/beach/village/armory)
+"nQ" = (
+/obj/item/clothing/head/chefhat{
+	pixel_x = 7;
+	pixel_y = 6
+	},
+/turf/open/floor/wood/walnut,
+/area/ruin/beach/village/kitchen)
+"nT" = (
+/obj/structure/cable{
+	icon_state = "5-8"
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/concrete/slab_3,
+/area/ruin/beach/village/kitchen)
+"nV" = (
+/obj/item/ammo_casing/spent/rifle_brass,
+/turf/open/floor/plating/asteroid/sand/lit,
+/area/overmap_encounter/planetoid/beachplanet/explored)
+"ol" = (
+/obj/structure/platform/wood/corner,
+/turf/open/water/beach/deep,
+/area/overmap_encounter/planetoid/beachplanet/explored)
+"op" = (
+/obj/structure/chair/plastic,
+/obj/effect/mapping_helpers/chair/tim_buckley,
+/obj/effect/mob_spawn/human/corpse/frontier/fake,
+/turf/open/floor/plating/asteroid/sand/lit,
+/area/overmap_encounter/planetoid/beachplanet/explored)
+"ot" = (
+/obj/structure/table/wood/fancy,
+/obj/item/paper_bin{
+	pixel_x = 0;
+	pixel_y = 5
+	},
+/obj/item/pen{
+	pixel_x = 4;
+	pixel_y = 5
+	},
+/turf/open/floor/wood,
+/area/ruin/beach/village/officers)
+"oz" = (
+/obj/structure/cable{
+	icon_state = "2-9"
+	},
+/turf/open/floor/plating/asteroid/dirt/grass/beach,
+/area/overmap_encounter/planetoid/beachplanet/explored)
+"oH" = (
+/obj/structure/chair/plastic{
+	dir = 4
+	},
+/turf/open/floor/wood/walnut,
+/area/ruin/beach/village/officers)
+"oK" = (
+/obj/effect/turf_decal/siding/wideplating{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
+/area/ruin/beach/village/infirmary)
+"oM" = (
+/obj/effect/decal/cleanable/crayon{
+	color = "#FF3333";
+	icon_state = "o";
+	pixel_y = 12;
+	pixel_x = -10
+	},
+/obj/effect/decal/cleanable/crayon{
+	color = "#FF3333";
+	icon_state = "t";
+	pixel_y = 12;
+	pixel_x = 5
+	},
+/obj/effect/decal/cleanable/crayon{
+	color = "#FF3333";
+	icon_state = "e";
+	pixel_y = -5;
+	pixel_x = 9
+	},
+/obj/effect/decal/cleanable/crayon{
+	color = "#FF3333";
+	icon_state = "m";
+	pixel_y = -4;
+	pixel_x = -8
+	},
+/turf/open/floor/plating/asteroid/dirt/beach,
+/area/overmap_encounter/planetoid/beachplanet/explored)
+"oR" = (
+/obj/machinery/light/directional/north,
+/turf/open/floor/concrete/slab_3,
+/area/ruin/beach/village/kitchen)
+"oU" = (
+/turf/open/floor/plating/asteroid/dirt/grass/beach,
+/area/overmap_encounter/planetoid/beachplanet/explored)
+"pg" = (
+/obj/structure/chair/plastic,
+/turf/open/floor/plating/asteroid/sand/lit,
+/area/overmap_encounter/planetoid/beachplanet/explored)
+"ph" = (
+/obj/structure/chair/comfy/beige/old/directional/north,
+/turf/open/floor/concrete/slab_2,
+/area/ruin/beach/village/officers)
+"pl" = (
+/obj/structure/table/reinforced,
+/obj/item/storage/firstaid/medical{
+	pixel_x = 0;
+	pixel_y = 13
+	},
+/obj/item/screwdriver/power{
+	pixel_x = -12;
+	pixel_y = 2
+	},
+/obj/item/gear_pack/anglegrinder{
+	pixel_x = 8;
+	pixel_y = 0
+	},
+/obj/effect/turf_decal/siding/wideplating{
+	dir = 8
+	},
+/turf/open/floor/plasteel,
+/area/ruin/beach/village/infirmary)
+"pm" = (
+/obj/machinery/shower{
+	dir = 8
+	},
+/obj/effect/turf_decal/steeldecal/steel_decals10,
+/obj/effect/turf_decal/steeldecal/steel_decals10{
+	dir = 4
+	},
+/obj/effect/turf_decal/steeldecal/steel_decals2,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/freezer,
+/area/ruin/beach/village/armory)
+"pI" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/open/floor/plating/asteroid/dirt/grass/beach,
+/area/overmap_encounter/planetoid/beachplanet/explored)
+"pJ" = (
+/obj/structure/cable{
+	icon_state = "1-6"
+	},
+/turf/open/floor/plating/asteroid/dirt/beach,
+/area/overmap_encounter/planetoid/beachplanet/explored)
+"pK" = (
+/obj/effect/turf_decal/siding/thinplating{
+	dir = 6
+	},
+/turf/open/floor/plasteel/tech/techmaint,
+/area/ruin/beach/village/armory)
+"pQ" = (
+/obj/structure/table,
+/obj/item/clothing/mask/cigarette,
+/obj/item/clothing/mask/cigarette{
+	pixel_x = -3;
+	pixel_y = 8
+	},
+/obj/item/clothing/mask/cigarette{
+	pixel_x = 6;
+	pixel_y = 5
+	},
+/obj/item/lighter{
+	pixel_x = -7;
+	pixel_y = 4
+	},
+/obj/machinery/light/directional/south,
+/turf/open/floor/concrete/slab_2,
+/area/ruin/beach/village/officers)
+"qa" = (
+/obj/structure/cable{
+	icon_state = "5-8"
+	},
+/turf/open/floor/plating/asteroid/dirt/grass/beach,
+/area/overmap_encounter/planetoid/beachplanet/explored)
+"qe" = (
+/obj/effect/mob_spawn/human/corpse/clip/vc,
+/obj/effect/landmark/mission_poi/main{
+	already_spawned = 1
+	},
+/turf/open/floor/concrete/slab_1,
+/area/ruin/beach/village/armory)
+"qk" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/machinery/power/rtg/geothermal,
+/obj/structure/cable/yellow{
+	icon_state = "0-2"
+	},
+/obj/machinery/light/directional/north,
+/turf/open/floor/plating,
+/area/ruin/beach/village/armory)
+"qp" = (
+/obj/structure/railing/corner{
+	dir = 4
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/concrete/slab_3,
+/area/ruin/beach/village/kitchen)
+"qq" = (
+/obj/effect/spawner/bunk_bed,
+/turf/open/floor/wood,
+/area/ruin/beach/village/dorm)
+"qF" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/open/floor/carpet,
+/area/ruin/beach/village/kitchen)
+"qI" = (
+/obj/structure/platform/wood{
+	dir = 6
+	},
+/turf/open/water/beach/deep,
+/area/overmap_encounter/planetoid/beachplanet/explored)
+"qK" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 8
+	},
+/turf/open/floor/wood,
+/area/ruin/beach/village/dorm)
+"qO" = (
+/obj/structure/table/wood/fancy,
+/obj/machinery/fax/ruin,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/wood,
+/area/ruin/beach/village/officers)
+"qZ" = (
+/obj/structure/cable{
+	icon_state = "6-9"
+	},
+/turf/open/floor/plating/asteroid/dirt/beach,
+/area/overmap_encounter/planetoid/beachplanet/explored)
+"rb" = (
+/turf/template_noop,
+/area/template_noop)
+"rn" = (
+/obj/structure/closet/cabinet,
+/obj/item/clothing/under/frontiersmen,
+/obj/item/clothing/under/frontiersmen/deckhand,
+/obj/item/clothing/shoes/combat{
+	pixel_y = -10
+	},
+/turf/open/floor/wood,
+/area/ruin/beach/village/dorm)
+"rv" = (
+/obj/structure/chair/plastic,
+/mob/living/simple_animal/hostile/human/frontier/ranged,
+/turf/open/floor/plating/asteroid/sand/lit,
+/area/overmap_encounter/planetoid/beachplanet/explored)
+"rz" = (
+/obj/effect/mob_spawn/human/corpse/clip/minuteman,
+/obj/machinery/light/small/directional/south,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/concrete/slab_1,
+/area/ruin/beach/village/armory)
+"rA" = (
+/obj/structure/platform/wood,
+/turf/open/water/beach/deep,
+/area/overmap_encounter/planetoid/beachplanet/explored)
+"rB" = (
+/obj/structure/closet/cabinet,
+/obj/item/clothing/under/frontiersmen,
+/obj/item/clothing/under/frontiersmen/deckhand,
+/obj/item/clothing/shoes/combat{
+	pixel_y = -10
+	},
+/obj/item/clothing/head/soft/frontiersmen{
+	pixel_y = 5
+	},
+/obj/item/storage/backpack/duffelbag,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/wood,
+/area/ruin/beach/village/dorm)
+"rD" = (
+/turf/open/floor/concrete/slab_1,
+/area/ruin/beach/village/armory)
+"rI" = (
+/obj/structure/platform/wood{
+	dir = 1
+	},
+/obj/item/clothing/under/clip/minutemen{
+	pixel_x = -10;
+	pixel_y = 2
+	},
+/turf/open/water/beach/deep,
+/area/overmap_encounter/planetoid/beachplanet/explored)
+"sh" = (
+/obj/structure/chair/comfy/beige/old/directional/east,
+/turf/open/floor/wood,
+/area/ruin/beach/village/officers)
+"si" = (
+/obj/structure/cable/yellow{
+	icon_state = "1-4"
+	},
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/concrete/slab_1,
+/area/ruin/beach/village/armory)
+"sq" = (
+/obj/machinery/door/airlock/maintenance/external/glass{
+	name = "Armory"
+	},
+/turf/open/floor/concrete/slab_1,
+/area/ruin/beach/village/armory)
+"st" = (
+/obj/structure/chair/sofa/brown/old/directional/east,
+/turf/open/floor/wood/walnut,
+/area/ruin/beach/village/kitchen)
+"sU" = (
+/obj/structure/table/glass,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/item/clothing/mask/cigarette/rollie/trippy{
+	pixel_x = 6;
+	pixel_y = -9
+	},
+/turf/open/floor/carpet/green,
+/area/ruin/beach/village/dorm)
+"sY" = (
+/obj/structure/chair/sofa/brown/old/left{
+	dir = 4
+	},
+/obj/item/bedsheet/black{
+	dir = 4;
+	pixel_x = -2;
+	pixel_y = -11
+	},
+/turf/open/floor/concrete/slab_2,
+/area/ruin/beach/village/dorm)
+"sZ" = (
+/obj/machinery/light/directional/south,
+/turf/open/floor/plasteel/tech/techmaint,
+/area/ruin/beach/village/kitchen)
+"tc" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/open/floor/plating/asteroid/dirt/beach,
+/area/overmap_encounter/planetoid/beachplanet/explored)
+"ts" = (
+/obj/structure/chair/office{
+	dir = 8
+	},
+/obj/machinery/light/directional/south,
+/turf/open/floor/concrete/slab_3,
+/area/ruin/beach/village/armory)
+"tw" = (
+/obj/structure/table,
+/obj/item/storage/box/fishing_hooks{
+	pixel_x = 11;
+	pixel_y = 4
+	},
+/obj/item/bait_can/worm/premium{
+	pixel_x = -5;
+	pixel_y = 15
+	},
+/obj/item/bait_can/worm/premium{
+	pixel_x = -4;
+	pixel_y = 6
+	},
+/turf/open/floor/wood/walnut,
+/area/ruin/beach/village/officers)
+"tN" = (
+/obj/structure/closet,
+/turf/open/floor/plasteel/tech/techmaint,
+/area/ruin/beach/village/armory)
+"uc" = (
+/obj/structure/platform/wood,
+/obj/structure/platform/wood{
+	dir = 10
+	},
+/turf/open/water/beach/deep,
+/area/overmap_encounter/planetoid/beachplanet/explored)
+"uk" = (
+/obj/machinery/shower{
+	dir = 8
+	},
+/obj/effect/turf_decal/steeldecal/steel_decals10,
+/obj/effect/turf_decal/steeldecal/steel_decals10{
+	dir = 4
+	},
+/obj/effect/turf_decal/steeldecal/steel_decals2,
+/obj/effect/decal/cleanable/blood/old,
+/turf/open/floor/plasteel/freezer,
+/area/ruin/beach/village/armory)
+"uw" = (
+/obj/structure/cable{
+	icon_state = "5-8"
+	},
+/turf/open/floor/concrete/slab_3,
+/area/ruin/beach/village/infirmary)
+"uE" = (
+/obj/structure/destructible/tribal_torch/lit,
+/turf/open/floor/wood/walnut,
+/area/ruin/beach/village/officers)
+"uF" = (
+/obj/structure/table,
+/obj/item/storage/cans/sixbeer{
+	pixel_x = 0;
+	pixel_y = 3
+	},
+/obj/item/fishing_rod,
+/turf/open/floor/wood/walnut,
+/area/ruin/beach/village/kitchen)
+"uJ" = (
+/obj/structure/table/wood/fancy,
+/obj/item/storage/fancy/heart_box{
+	pixel_x = 2;
+	pixel_y = 2
+	},
+/turf/open/floor/wood,
+/area/ruin/beach/village/officers)
+"uP" = (
+/obj/structure/chair/sofa/brown/old/right{
+	dir = 8
+	},
+/turf/open/floor/carpet/green,
+/area/ruin/beach/village/dorm)
+"uS" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/structure/catwalk/over/plated_catwalk/dark,
+/turf/open/floor/plating,
+/area/ruin/beach/village/armory)
+"uU" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/open/floor/concrete/pavement/beachplanet/lit,
+/area/overmap_encounter/planetoid/beachplanet/explored)
+"uV" = (
+/turf/closed/wall/mineral/wood,
+/area/overmap_encounter/planetoid/beachplanet/explored)
+"vd" = (
+/obj/effect/turf_decal/siding/thinplating/corner,
+/turf/open/floor/plasteel/tech/techmaint,
+/area/ruin/beach/village/armory)
+"vm" = (
+/obj/structure/platform/wood/corner{
+	dir = 8
+	},
+/turf/open/water/beach/deep,
+/area/overmap_encounter/planetoid/beachplanet/explored)
+"vn" = (
+/obj/structure/rack,
+/obj/item/storage/firstaid/regular,
+/turf/open/floor/plasteel,
+/area/ruin/beach/village/infirmary)
+"vv" = (
+/obj/item/kitchen/rollingpin{
+	pixel_x = 12;
+	pixel_y = 6
+	},
+/obj/effect/decal/cleanable/food/flour,
+/obj/effect/turf_decal/techfloor{
+	dir = 1
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/tech/techmaint,
+/area/ruin/beach/village/kitchen)
+"vB" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/door/airlock/wood{
+	name = "Medical"
+	},
+/turf/open/floor/concrete/slab_1,
+/area/ruin/beach/village/infirmary)
+"vK" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/wood/walnut,
+/area/ruin/beach/village/officers)
+"vP" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/light/small/directional/east,
+/turf/open/floor/concrete/slab_1,
+/area/ruin/beach/village/officers)
+"vR" = (
+/mob/living/simple_animal/hostile/human/frontier/ranged/mosin/neutered,
+/turf/open/floor/plating/asteroid/sand/lit,
+/area/overmap_encounter/planetoid/beachplanet/explored)
+"vU" = (
+/obj/effect/decal/cleanable/blood/drip{
+	pixel_x = 11;
+	pixel_y = 11
+	},
+/obj/effect/decal/cleanable/blood/tracks,
+/obj/item/clothing/head/helmet/bulletproof/m10/clip_vc{
+	pixel_x = -10;
+	pixel_y = -9
+	},
+/turf/open/floor/concrete/slab_1,
+/area/ruin/beach/village/armory)
+"vV" = (
+/obj/structure/railing{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "1-10"
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/concrete/slab_3,
+/area/ruin/beach/village/kitchen)
+"vX" = (
+/obj/effect/spawner/bunk_bed,
+/obj/effect/turf_decal/siding/wood/corner{
+	dir = 8
+	},
+/obj/machinery/light/directional/north,
+/turf/open/floor/wood,
+/area/ruin/beach/village/dorm)
+"wk" = (
+/obj/structure/chair/plastic{
+	dir = 1
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/carpet,
+/area/ruin/beach/village/kitchen)
+"wo" = (
+/obj/effect/turf_decal/siding/wood,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/wood,
+/area/ruin/beach/village/officers)
+"wx" = (
+/obj/machinery/light/directional/west,
+/turf/open/floor/plasteel/tech/techmaint,
+/area/ruin/beach/village/armory)
+"wA" = (
+/turf/closed/wall/mineral/sandstone,
+/area/overmap_encounter/planetoid/beachplanet/explored)
+"wK" = (
+/obj/machinery/vending/cigarette,
+/turf/open/floor/concrete/slab_2,
+/area/ruin/beach/village/officers)
+"wP" = (
+/obj/structure/table,
+/turf/open/floor/carpet,
+/area/ruin/beach/village/kitchen)
+"wT" = (
+/obj/effect/decal/cleanable/blood/splatter{
+	icon_state = "gib4";
+	dir = 4
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/concrete/slab_1,
+/area/ruin/beach/village/armory)
+"wW" = (
+/mob/living/simple_animal/hostile/human/frontier,
+/turf/open/floor/plating/asteroid/sand/dense/lit,
+/area/overmap_encounter/planetoid/beachplanet/explored)
+"xc" = (
+/obj/structure/platform/wood{
+	dir = 8
+	},
+/obj/structure/destructible/tribal_torch/lit,
+/turf/open/floor/wood/walnut,
+/area/ruin/beach/village/kitchen)
+"xe" = (
+/obj/machinery/door/airlock/hatch,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/concrete/slab_1,
+/area/ruin/beach/village/armory)
+"xi" = (
+/obj/structure/railing/wood{
+	dir = 4
+	},
+/turf/open/floor/plating/asteroid/dirt/beach,
+/area/overmap_encounter/planetoid/beachplanet/explored)
+"xj" = (
+/obj/structure/table/chem,
+/obj/item/reagent_containers/glass/beaker/large/napalm{
+	pixel_x = 6;
+	pixel_y = 4
+	},
+/obj/item/reagent_containers/hypospray/medipen/combat_drug{
+	pixel_x = -10;
+	pixel_y = 5
+	},
+/obj/item/reagent_containers/hypospray/medipen/combat_drug{
+	pixel_x = -4;
+	pixel_y = 2
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/concrete/slab_3,
+/area/ruin/beach/village/infirmary)
+"xm" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/concrete/pavement/beachplanet/lit,
+/area/overmap_encounter/planetoid/beachplanet/explored)
+"xs" = (
+/obj/structure/punji_sticks,
+/obj/structure/flora/ausbushes/leafybush,
+/turf/open/floor/plating/asteroid/dirt/grass/beach,
+/area/overmap_encounter/planetoid/beachplanet/explored)
+"xy" = (
+/obj/item/restraints/legcuffs/beartrap{
+	armed = 1
+	},
+/turf/open/floor/plating/asteroid/dirt/beach,
+/area/overmap_encounter/planetoid/beachplanet/explored)
+"xC" = (
+/obj/structure/closet/cabinet,
+/obj/item/clothing/under/frontiersmen,
+/obj/item/clothing/under/frontiersmen/deckhand,
+/obj/item/clothing/shoes/combat{
+	pixel_y = -10
+	},
+/obj/item/clothing/head/soft/frontiersmen{
+	pixel_y = 5
+	},
+/obj/item/storage/backpack/duffelbag,
+/obj/effect/turf_decal/siding/wood{
+	dir = 1
+	},
+/obj/item/clothing/mask/cigarette/rollie/cannabis{
+	pixel_x = -10;
+	pixel_y = 5
+	},
+/obj/item/clothing/mask/cigarette/rollie/cannabis{
+	pixel_x = 13;
+	pixel_y = 13
+	},
+/turf/open/floor/wood,
+/area/ruin/beach/village/dorm)
+"xN" = (
+/obj/effect/decal/cleanable/blood/gibs/core,
+/obj/effect/mob_spawn/human/corpse/clip/minuteman,
+/turf/open/floor/concrete/slab_1,
+/area/ruin/beach/village/armory)
+"xO" = (
+/mob/living/simple_animal/hostile/human/frontier/ranged/mosin/neutered/sentry,
+/turf/open/floor/plating/asteroid/dirt/grass/beach,
+/area/overmap_encounter/planetoid/beachplanet/explored)
+"xR" = (
+/obj/effect/turf_decal/road,
+/obj/structure/cable{
+	icon_state = "1-4"
+	},
+/turf/open/floor/concrete/pavement/beachplanet/lit,
+/area/overmap_encounter/planetoid/beachplanet/explored)
+"xS" = (
+/obj/structure/window/fulltile,
+/obj/structure/grille,
+/turf/open/floor/plating,
+/area/ruin/beach/village/dorm)
+"xU" = (
+/obj/structure/barricade/sandbags,
+/turf/open/floor/plating/asteroid/dirt/beach,
+/area/overmap_encounter/planetoid/beachplanet/explored)
+"yb" = (
+/obj/effect/mob_spawn/animal_corpse/wolf,
+/obj/item/clothing/suit/armor/vest{
+	pixel_x = -9;
+	pixel_y = 8
+	},
+/turf/open/floor/concrete/slab_1,
+/area/ruin/beach/village/armory)
+"ym" = (
+/obj/structure/platform/wood/corner{
+	dir = 4
+	},
+/turf/open/water/beach/deep,
+/area/overmap_encounter/planetoid/beachplanet/explored)
+"yx" = (
+/obj/structure/rack,
+/obj/item/ammo_box/magazine/f4_308/empty{
+	pixel_x = -8;
+	pixel_y = 0
+	},
+/obj/item/ammo_box/magazine/f4_308/empty{
+	pixel_x = 5;
+	pixel_y = 0
+	},
+/obj/effect/turf_decal/siding/thinplating,
+/obj/machinery/light/small/directional/north,
+/turf/open/floor/plasteel/tech/techmaint,
+/area/ruin/beach/village/armory)
+"yR" = (
+/obj/effect/decal/cleanable/blood/splatter{
+	icon_state = "floor4"
+	},
+/obj/effect/mob_spawn/human/corpse/clip/vc,
+/turf/open/floor/plating/asteroid/sand/lit,
+/area/overmap_encounter/planetoid/beachplanet/explored)
+"yT" = (
+/obj/structure/chair/office,
+/turf/open/floor/concrete/slab_3,
+/area/ruin/beach/village/infirmary)
+"za" = (
+/obj/structure/cable{
+	icon_state = "4-9"
+	},
+/turf/open/floor/plating/asteroid/dirt/beach,
+/area/overmap_encounter/planetoid/beachplanet/explored)
+"zp" = (
+/obj/effect/decal/cleanable/crayon{
+	color = "#FF3333";
+	icon_state = "!";
+	pixel_y = -4;
+	pixel_x = -10
+	},
+/turf/open/floor/plating/asteroid/dirt/beach,
+/area/overmap_encounter/planetoid/beachplanet/explored)
+"zw" = (
+/obj/structure/table/reinforced,
+/obj/item/cutting_board,
+/obj/item/food/pancakes,
+/obj/item/food/pancakes{
+	pixel_x = 0;
+	pixel_y = 4
+	},
+/obj/item/melee/knife/butcher{
+	pixel_x = -5;
+	pixel_y = 9
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/item/food/grown/banana{
+	pixel_x = 10;
+	pixel_y = -8
+	},
+/turf/open/floor/concrete/slab_1,
+/area/ruin/beach/village/kitchen)
+"zy" = (
+/turf/closed/wall/mineral/wood,
+/area/ruin/beach/village/infirmary)
+"zK" = (
+/obj/structure/cable{
+	icon_state = "6-10"
+	},
+/turf/open/floor/plating/asteroid/dirt/grass/beach,
+/area/overmap_encounter/planetoid/beachplanet/explored)
+"Am" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 8
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/wood,
+/area/ruin/beach/village/dorm)
+"Aq" = (
+/turf/open/floor/plasteel/freezer,
+/area/ruin/beach/village/armory)
+"Ay" = (
+/obj/structure/railing/wood{
+	dir = 1
+	},
+/turf/open/floor/plating/asteroid/dirt/grass/beach,
+/area/overmap_encounter/planetoid/beachplanet/explored)
+"AA" = (
+/obj/structure/table/chem,
+/obj/item/reagent_containers/glass/beaker/plastic{
+	pixel_x = -6;
+	pixel_y = 4
+	},
+/obj/item/bodybag{
+	pixel_x = 8;
+	pixel_y = 13
+	},
+/obj/item/bodybag{
+	pixel_x = 8;
+	pixel_y = 5
+	},
+/turf/open/floor/concrete/slab_3,
+/area/ruin/beach/village/infirmary)
+"AC" = (
+/obj/structure/chair/sofa/brown/old/left/directional/west,
+/turf/open/floor/carpet/green,
+/area/ruin/beach/village/dorm)
+"AF" = (
+/obj/structure/closet/secure_closet/engineering_welding,
+/turf/open/floor/plasteel/tech,
+/area/ruin/beach/village/armory)
+"AP" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 8
+	},
+/turf/open/floor/concrete/slab_4,
+/area/ruin/beach/village/armory)
+"AV" = (
+/obj/machinery/grill,
+/turf/open/floor/concrete/slab_1,
+/area/ruin/beach/village/kitchen)
+"Ba" = (
+/obj/structure/closet/cabinet,
+/obj/item/clothing/under/frontiersmen,
+/obj/item/clothing/under/frontiersmen/deckhand,
+/obj/item/clothing/shoes/combat{
+	pixel_y = -10
+	},
+/obj/item/clothing/head/soft/frontiersmen{
+	pixel_y = 5
+	},
+/obj/item/storage/backpack/duffelbag,
+/obj/effect/turf_decal/siding/wood,
+/obj/item/storage/fancy/cigarettes/cigars/havana,
+/turf/open/floor/wood,
+/area/ruin/beach/village/dorm)
+"Bd" = (
+/obj/machinery/door/airlock/wood{
+	dir = 4;
+	name = "Officers Quarters"
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 8
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 4
+	},
+/turf/open/floor/concrete/slab_1,
+/area/ruin/beach/village/officers)
+"Bh" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/concrete/slab_3,
+/area/ruin/beach/village/infirmary)
+"Bk" = (
+/obj/structure/flora/tree/jungle,
+/turf/open/floor/plating/asteroid/dirt/grass/beach,
+/area/overmap_encounter/planetoid/beachplanet/explored)
+"Bx" = (
+/obj/effect/turf_decal/siding/thinplating{
+	dir = 8
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/tech/techmaint,
+/area/ruin/beach/village/armory)
+"BH" = (
+/turf/open/floor/carpet/red,
+/area/overmap_encounter/planetoid/beachplanet/explored)
+"BK" = (
+/obj/structure/table,
+/obj/item/fishing_rod{
+	pixel_x = 4;
+	pixel_y = 6
+	},
+/turf/open/floor/wood/walnut,
+/area/ruin/beach/village/officers)
+"BP" = (
+/mob/living/simple_animal/hostile/human/frontier/ranged/trooper/f3/sentry{
+	weapon_drop_chance = 100;
+	desc = "A member of the brutal Frontiersman terrorist fleet! Bedecked in military-grade armor, they steadily hold their well-kept DMR in your direction."
+	},
+/turf/open/floor/plating/asteroid/dirt/grass/beach,
+/area/overmap_encounter/planetoid/beachplanet/explored)
+"Ca" = (
+/obj/structure/table/glass,
+/turf/open/floor/wood/walnut,
+/area/ruin/beach/village/kitchen)
+"Cf" = (
+/obj/machinery/door/airlock/wood{
+	dir = 4;
+	name = "Kitchen"
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 8
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 4
+	},
+/turf/open/floor/concrete/slab_1,
+/area/ruin/beach/village/kitchen)
+"Cn" = (
+/obj/structure/chair{
+	dir = 8
+	},
+/obj/effect/turf_decal/siding/thinplating{
+	dir = 8
+	},
+/turf/open/floor/plasteel/tech/techmaint,
+/area/ruin/beach/village/armory)
+"Cw" = (
+/obj/structure/table/glass,
+/turf/open/floor/carpet/green,
+/area/ruin/beach/village/dorm)
+"CK" = (
+/obj/machinery/light/small/directional/east,
+/turf/open/floor/concrete/slab_1,
+/area/ruin/beach/village/kitchen)
+"CM" = (
+/obj/structure/closet/crate/bin,
+/obj/machinery/light/directional/north,
+/turf/open/floor/wood,
+/area/ruin/beach/village/dorm)
+"CP" = (
+/obj/structure/platform/wood{
+	dir = 8
+	},
+/turf/open/water/beach/deep,
+/area/overmap_encounter/planetoid/beachplanet/explored)
+"De" = (
+/obj/item/ammo_casing/spent/pistol_brass,
+/obj/structure/cable{
+	icon_state = "1-10"
+	},
+/obj/structure/cable{
+	icon_state = "4-10"
+	},
+/turf/open/floor/plating/asteroid/dirt/beach,
+/area/overmap_encounter/planetoid/beachplanet/explored)
+"Df" = (
+/obj/effect/turf_decal/siding/thinplating/dark,
+/turf/open/floor/concrete/slab_3,
+/area/ruin/beach/village/armory)
+"Dg" = (
+/obj/structure/closet/secure_closet/armorycage{
+	req_access = null
+	},
+/obj/item/storage/box/ammo/a8_50r,
+/obj/item/storage/box/ammo/a12g_buckshot,
+/obj/item/storage/box/ammo/c10mm,
+/obj/effect/turf_decal/siding/thinplating,
+/obj/item/storage/box/ammo/a308,
+/obj/item/storage/box/ammo/a308,
+/obj/item/storage/box/ammo/c9mm,
+/obj/item/storage/box/ammo/c9mm,
+/obj/machinery/light/small/directional/north,
+/turf/open/floor/plasteel/tech/techmaint,
+/area/ruin/beach/village/armory)
+"Dn" = (
+/obj/effect/turf_decal/siding/thinplating/corner{
+	dir = 8
+	},
+/obj/structure/cable{
+	icon_state = "1-10"
+	},
+/turf/open/floor/plasteel/tech/techmaint,
+/area/ruin/beach/village/armory)
+"Dp" = (
+/obj/structure/table/optable,
+/obj/effect/decal/cleanable/blood/splatter{
+	icon_state = "floor4"
+	},
+/obj/effect/mob_spawn/human/corpse/frontier/ranged/officer,
+/turf/open/floor/plasteel/showroomfloor,
+/area/ruin/beach/village/infirmary)
+"Dq" = (
+/obj/structure/table/reinforced,
+/obj/machinery/microwave,
+/turf/open/floor/concrete/slab_1,
+/area/ruin/beach/village/kitchen)
+"Dt" = (
+/obj/effect/turf_decal/siding/wideplating/dark{
+	dir = 1
+	},
+/obj/machinery/light/directional/north,
+/turf/open/floor/plasteel/showroomfloor,
+/area/ruin/beach/village/infirmary)
+"Dv" = (
+/turf/open/floor/wood,
+/area/ruin/beach/village/officers)
+"Dy" = (
+/turf/open/floor/plating/asteroid/dirt/beach,
+/area/overmap_encounter/planetoid/beachplanet/explored)
+"DG" = (
+/obj/structure/chair/plastic,
+/turf/open/floor/carpet,
+/area/ruin/beach/village/kitchen)
+"DJ" = (
+/obj/machinery/button/door{
+	dir = 1;
+	pixel_x = 0;
+	pixel_y = -22;
+	id = "villagesecure";
+	name = "Shed Door"
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 1
+	},
+/turf/open/floor/concrete/slab_3,
+/area/ruin/beach/village/armory)
+"DK" = (
+/obj/item/ammo_casing/spent/rifle_brass,
+/turf/open/floor/plating/asteroid/dirt/grass/beach,
+/area/overmap_encounter/planetoid/beachplanet/explored)
+"DQ" = (
+/obj/structure/chair/bench/beige/directional/east,
+/obj/machinery/light/directional/west,
+/turf/open/floor/plasteel/tech,
+/area/ruin/beach/village/armory)
+"DT" = (
+/obj/structure/cable{
+	icon_state = "6-9"
+	},
+/turf/open/floor/plating/asteroid/dirt/grass/beach,
+/area/overmap_encounter/planetoid/beachplanet/explored)
+"DU" = (
+/turf/open/floor/carpet/red,
+/area/ruin/beach/village/officers)
+"Eb" = (
+/turf/open/floor/plasteel/tech/techmaint,
+/area/ruin/beach/village/kitchen)
+"Ef" = (
+/obj/structure/flora/stump,
+/turf/open/floor/plating/asteroid/dirt/beach,
+/area/overmap_encounter/planetoid/beachplanet/explored)
+"Eg" = (
+/obj/effect/decal/cleanable/blood/drip{
+	pixel_x = -9;
+	pixel_y = -2
+	},
+/obj/effect/decal/cleanable/blood/splatter{
+	icon_state = "floor4"
+	},
+/obj/item/clothing/head/helmet/bulletproof/x11/clip{
+	pixel_x = 6;
+	pixel_y = -5
+	},
+/turf/open/floor/concrete/slab_1,
+/area/ruin/beach/village/armory)
+"Eo" = (
+/obj/structure/cable{
+	icon_state = "6-10"
+	},
+/turf/open/floor/plating/asteroid/dirt/beach,
+/area/overmap_encounter/planetoid/beachplanet/explored)
+"Er" = (
+/obj/structure/chair/plastic{
+	dir = 8
+	},
+/turf/open/floor/plating/asteroid/sand/lit,
+/area/overmap_encounter/planetoid/beachplanet/explored)
+"Es" = (
+/turf/open/floor/plating/asteroid/sand/dense/lit,
+/area/overmap_encounter/planetoid/beachplanet/explored)
+"EG" = (
+/obj/effect/decal/cleanable/crayon{
+	color = "#FF3333";
+	icon_state = "getout";
+	pixel_y = 1;
+	pixel_x = 2
+	},
+/turf/open/floor/plating/asteroid/sand/lit,
+/area/overmap_encounter/planetoid/beachplanet/explored)
+"EK" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/carpet/green,
+/area/ruin/beach/village/dorm)
+"ER" = (
+/obj/structure/flora/tree/dead/barren,
+/turf/open/floor/plating/asteroid/dirt/grass/beach,
+/area/overmap_encounter/planetoid/beachplanet/explored)
+"EU" = (
+/obj/structure/crate_shelf,
+/obj/structure/closet/crate/internals,
+/obj/item/clothing/mask/gas/frontiersmen,
+/obj/item/clothing/mask/gas/frontiersmen,
+/obj/item/clothing/mask/gas/clip,
+/obj/item/clothing/mask/gas/clip,
+/obj/item/tank/internals/emergency_oxygen/engi,
+/obj/item/tank/internals/emergency_oxygen/engi,
+/obj/effect/turf_decal/siding/thinplating,
+/turf/open/floor/plasteel/tech/techmaint,
+/area/ruin/beach/village/armory)
+"Fa" = (
+/mob/living/simple_animal/hostile/human/frontier/ranged/trooper{
+	retreat_distance = 0;
+	minimum_distance = 0
+	},
+/obj/structure/chair/bench/beige/directional/west,
+/obj/machinery/light/directional/east,
+/turf/open/floor/plasteel/tech,
+/area/ruin/beach/village/armory)
+"Fp" = (
+/obj/effect/turf_decal/siding/thinplating{
+	dir = 4
+	},
+/turf/open/floor/plasteel/tech/techmaint,
+/area/ruin/beach/village/armory)
+"Fw" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/tech/techmaint,
+/area/ruin/beach/village/armory)
+"FD" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/tech/techmaint,
+/area/ruin/beach/village/kitchen)
+"FJ" = (
+/obj/structure/closet/secure_closet/engineering_electrical,
+/turf/open/floor/plasteel/tech,
+/area/ruin/beach/village/armory)
+"FL" = (
+/mob/living/basic/cow{
+	faction = list("Frontiersmen");
+	name = "frontiersmen cow";
+	desc = "You get the feeling that somehow, this cow wishes they'd hit Luna-Town again."
+	},
+/obj/structure/railing/wood{
+	dir = 1
+	},
+/turf/open/floor/plating/asteroid/dirt/grass/beach,
+/area/overmap_encounter/planetoid/beachplanet/explored)
+"FM" = (
+/obj/structure/flora/ausbushes/reedbush,
+/turf/open/floor/plating/asteroid/dirt/grass/beach,
+/area/overmap_encounter/planetoid/beachplanet/explored)
+"FT" = (
+/obj/structure/platform/wood{
+	dir = 5
+	},
+/obj/item/clothing/suit/armor/vest{
+	pixel_x = 7;
+	pixel_y = 1
+	},
+/turf/open/water/beach/deep,
+/area/overmap_encounter/planetoid/beachplanet/explored)
+"FV" = (
+/obj/structure/railing/corner/wood,
+/obj/structure/railing/corner/wood{
+	dir = 4
+	},
+/turf/open/floor/plating/asteroid/dirt/grass/beach,
+/area/overmap_encounter/planetoid/beachplanet/explored)
+"FX" = (
+/turf/open/floor/carpet/orange,
+/area/ruin/beach/village/dorm)
+"FY" = (
+/obj/effect/decal/cleanable/blood/tracks{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "1-8"
+	},
+/obj/structure/catwalk/over/plated_catwalk/dark,
+/turf/open/floor/plating,
+/area/ruin/beach/village/armory)
+"Gj" = (
+/obj/structure/window/fulltile,
+/obj/structure/grille,
+/turf/open/floor/plating,
+/area/ruin/beach/village/infirmary)
+"Gl" = (
+/obj/machinery/power/apc/auto_name/directional/west,
+/obj/structure/cable{
+	icon_state = "0-4"
+	},
+/turf/open/floor/concrete/slab_1,
+/area/ruin/beach/village/armory)
+"Gn" = (
+/obj/effect/spawner/bunk_bed,
+/obj/effect/turf_decal/siding/wood/corner{
+	dir = 1
+	},
+/obj/machinery/light/directional/south,
+/turf/open/floor/wood,
+/area/ruin/beach/village/dorm)
+"Gs" = (
+/obj/structure/window/fulltile,
+/obj/structure/grille,
+/turf/open/floor/plating,
+/area/ruin/beach/village/armory)
+"GB" = (
+/obj/structure/railing/corner,
+/obj/machinery/power/apc/auto_name/directional/north,
+/obj/structure/cable{
+	icon_state = "0-2"
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/concrete/slab_3,
+/area/ruin/beach/village/kitchen)
+"GE" = (
+/obj/effect/turf_decal/siding/wood,
+/turf/open/floor/wood{
+	icon_state = "wood-broken5"
+	},
+/area/ruin/beach/village/officers)
+"GM" = (
+/obj/effect/mob_spawn/animal_corpse/wolf,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/item/clothing/suit/armor/vest{
+	pixel_x = -8;
+	pixel_y = 6
+	},
+/turf/open/floor/concrete/slab_1,
+/area/ruin/beach/village/armory)
+"GN" = (
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 8
+	},
+/turf/open/floor/concrete/slab_4,
+/area/ruin/beach/village/armory)
+"GP" = (
+/obj/effect/decal/cleanable/blood,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/concrete/slab_1,
+/area/ruin/beach/village/armory)
+"Hk" = (
+/obj/machinery/firealarm/directional/north{
+	pixel_x = 7;
+	pixel_y = 33
+	},
+/obj/structure/extinguisher_cabinet/directional/north{
+	pixel_x = -6;
+	pixel_y = 28
+	},
+/turf/open/floor/wood,
+/area/ruin/beach/village/officers)
+"Hn" = (
+/obj/structure/toilet{
+	dir = 1
+	},
+/obj/machinery/light/small/directional/south,
+/obj/effect/decal/cleanable/blood/old,
+/turf/open/floor/plasteel/tech/techmaint,
+/area/ruin/beach/village/armory)
+"Hq" = (
+/turf/open/floor/wood{
+	icon_state = "wood-broken4"
+	},
+/area/ruin/beach/village/officers)
+"Ht" = (
+/obj/machinery/firealarm/directional/south{
+	pixel_x = 8;
+	pixel_y = -32
+	},
+/obj/structure/extinguisher_cabinet/directional/south{
+	pixel_x = -6;
+	pixel_y = -28
+	},
+/turf/open/floor/wood{
+	icon_state = "wood-broken4"
+	},
+/area/ruin/beach/village/dorm)
+"HA" = (
+/obj/effect/decal/cleanable/blood/tracks,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/turf_decal/siding/black{
+	dir = 4
+	},
+/obj/effect/turf_decal/siding/thinplating/dark/corner{
+	dir = 1
+	},
+/turf/open/floor/concrete/slab_4,
+/area/ruin/beach/village/armory)
+"HB" = (
+/obj/structure/platform/wood{
+	dir = 5
+	},
+/turf/open/water/beach/deep,
+/area/overmap_encounter/planetoid/beachplanet/explored)
+"HI" = (
+/obj/structure/catwalk/over/plated_catwalk/dark,
+/turf/open/floor/plating,
+/area/ruin/beach/village/armory)
+"HK" = (
+/obj/structure/platform/wood/corner{
+	dir = 1
+	},
+/turf/open/water/beach/deep,
+/area/overmap_encounter/planetoid/beachplanet/explored)
+"HP" = (
+/obj/structure/chair/plastic{
+	dir = 4
+	},
+/turf/open/floor/plating/asteroid/sand/lit,
+/area/overmap_encounter/planetoid/beachplanet/explored)
+"HR" = (
+/obj/machinery/button/door{
+	dir = 4;
+	pixel_x = -20;
+	pixel_y = 2;
+	id = "villagesecure";
+	name = "Shed Override"
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/wood,
+/area/ruin/beach/village/officers)
+"HS" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 1
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/wood{
+	icon_state = "wood-broken4"
+	},
+/area/ruin/beach/village/dorm)
+"If" = (
+/turf/closed/wall/concrete,
+/area/ruin/beach/village/armory)
+"Ig" = (
+/obj/structure/cable{
+	icon_state = "4-10"
+	},
+/turf/open/floor/plating/asteroid/dirt/grass/beach,
+/area/overmap_encounter/planetoid/beachplanet/explored)
+"Iw" = (
+/obj/effect/turf_decal/siding/thinplating,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/tech/techmaint,
+/area/ruin/beach/village/armory)
+"Iz" = (
+/obj/structure/fluff/hedge/opaque,
+/obj/structure/platform/wood{
+	dir = 8
+	},
+/turf/open/floor/wood/walnut,
+/area/ruin/beach/village/kitchen)
+"IM" = (
+/mob/living/simple_animal/hostile/human/frontier/ranged/pounder,
+/turf/open/floor/plating/asteroid/sand/lit,
+/area/overmap_encounter/planetoid/beachplanet/explored)
+"IO" = (
+/obj/effect/decal/cleanable/garbage,
+/turf/open/floor/plasteel/tech/techmaint,
+/area/ruin/beach/village/armory)
+"IU" = (
+/obj/machinery/door/airlock/engineering{
+	name = "Generator"
+	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/concrete/slab_1,
+/area/ruin/beach/village/armory)
+"Jk" = (
+/turf/open/water/beach/deep,
+/area/overmap_encounter/planetoid/beachplanet/explored)
+"Jr" = (
+/obj/structure/curtain/cloth/grey,
+/turf/open/floor/plasteel/tech/techmaint,
+/area/ruin/beach/village/armory)
+"JV" = (
+/obj/structure/cable{
+	icon_state = "1-4"
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/concrete/slab_3,
+/area/ruin/beach/village/infirmary)
+"Kc" = (
+/obj/structure/table,
+/obj/item/binoculars{
+	pixel_x = -6;
+	pixel_y = -3
+	},
+/turf/open/floor/plating/asteroid/sand/dense/lit,
+/area/overmap_encounter/planetoid/beachplanet/explored)
+"Kd" = (
+/obj/effect/overlay/palmtree_l,
+/turf/open/floor/plating/asteroid/dirt/grass/beach,
+/area/overmap_encounter/planetoid/beachplanet/explored)
+"Kh" = (
+/turf/open/floor/concrete/pavement/beachplanet/lit,
+/area/overmap_encounter/planetoid/beachplanet/explored)
+"Kk" = (
+/obj/item/gun/ballistic/automatic/pistol/cm23,
+/obj/structure/guncloset,
+/obj/effect/turf_decal/siding/thinplating/corner{
+	dir = 8
+	},
+/turf/open/floor/plasteel/tech/techmaint,
+/area/ruin/beach/village/armory)
+"Ko" = (
+/obj/structure/cable{
+	icon_state = "2-4"
+	},
+/turf/open/floor/concrete/slab_1,
+/area/ruin/beach/village/kitchen)
+"Kp" = (
+/mob/living/simple_animal/hostile/human/frontier/ranged/wasp,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/carpet/green,
+/area/ruin/beach/village/dorm)
+"Kv" = (
+/obj/machinery/light/directional/north,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/concrete/slab_4,
+/area/ruin/beach/village/armory)
+"KS" = (
+/obj/effect/turf_decal/techfloor{
+	dir = 1
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/tech/techmaint,
+/area/ruin/beach/village/kitchen)
+"KT" = (
+/obj/structure/cable{
+	icon_state = "2-4"
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/concrete/slab_1,
+/area/ruin/beach/village/armory)
+"Lu" = (
+/obj/structure/dresser{
+	dir = 8;
+	pixel_x = 5;
+	pixel_y = 0
+	},
+/turf/open/floor/wood,
+/area/ruin/beach/village/officers)
+"LH" = (
+/obj/effect/turf_decal/road{
+	dir = 1
+	},
+/turf/open/floor/concrete/pavement/beachplanet/lit,
+/area/overmap_encounter/planetoid/beachplanet/explored)
+"LN" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/door/poddoor/shutters{
+	id = "villagesecure"
+	},
+/turf/open/floor/concrete/slab_1,
+/area/ruin/beach/village/armory)
+"LR" = (
+/obj/structure/urinal{
+	dir = 4;
+	pixel_x = -18;
+	pixel_y = -2
+	},
+/obj/effect/turf_decal/steeldecal/steel_decals_central1{
+	dir = 4
+	},
+/turf/open/floor/plasteel/tech/grid,
+/area/ruin/beach/village/armory)
+"LS" = (
+/obj/machinery/light/directional/south,
+/turf/open/floor/wood/walnut,
+/area/ruin/beach/village/kitchen)
+"Mq" = (
+/obj/machinery/light/directional/south,
+/turf/open/floor/plasteel/freezer,
+/area/ruin/beach/village/armory)
+"Mt" = (
+/obj/effect/turf_decal/siding/wood,
+/obj/structure/cable{
+	icon_state = "1-8"
+	},
+/turf/open/floor/wood{
+	icon_state = "wood-broken5"
+	},
+/area/ruin/beach/village/dorm)
+"ML" = (
+/mob/living/simple_animal/hostile/human/frontier{
+	name = "Frontiersman Chef";
+	desc = "A member of the brutal Frontiersman terrorist fleet! This one clutches an average looking kitchen knife, and seems quite frustrated."
+	},
+/obj/effect/decal/cleanable/food/flour,
+/turf/open/floor/concrete/slab_1,
+/area/ruin/beach/village/kitchen)
+"MW" = (
+/obj/structure/railing/corner{
+	dir = 1
+	},
+/turf/open/floor/concrete/slab_3,
+/area/ruin/beach/village/kitchen)
+"MX" = (
+/obj/structure/barricade/sandbags,
+/turf/open/floor/plating/asteroid/sand/dense/lit,
+/area/overmap_encounter/planetoid/beachplanet/explored)
+"MY" = (
+/obj/structure/table/reinforced,
+/obj/item/shovel{
+	pixel_x = -3;
+	pixel_y = 3
+	},
+/obj/item/shovel{
+	pixel_x = 4;
+	pixel_y = -2
+	},
+/obj/item/shovel{
+	pixel_x = 0;
+	pixel_y = 0
+	},
+/obj/item/hatchet/wooden{
+	pixel_x = -9;
+	pixel_y = 6
+	},
+/obj/item/hatchet/wooden{
+	pixel_x = -3;
+	pixel_y = 9
+	},
+/obj/item/reagent_containers/food/drinks/molotov/full{
+	pixel_x = 9;
+	pixel_y = -4
+	},
+/obj/item/lighter/greyscale{
+	pixel_x = 2;
+	pixel_y = -16
+	},
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 1
+	},
+/turf/open/floor/plasteel/tech,
+/area/ruin/beach/village/armory)
+"Nq" = (
+/obj/machinery/light/small/directional/north,
+/turf/open/floor/concrete/slab_1,
+/area/ruin/beach/village/armory)
+"Ns" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/concrete/slab_1,
+/area/ruin/beach/village/kitchen)
+"Nu" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/concrete/slab_1,
+/area/ruin/beach/village/armory)
+"Ny" = (
+/obj/effect/turf_decal/road{
+	dir = 1
+	},
+/turf/open/floor/concrete/pavement/beachplanet/lit,
+/area/ruin/beach/village/armory)
+"NB" = (
+/turf/open/floor/concrete/slab_2,
+/area/ruin/beach/village/officers)
+"NC" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/concrete/slab_3,
+/area/ruin/beach/village/infirmary)
+"NN" = (
+/turf/open/floor/wood{
+	icon_state = "wood-broken6"
+	},
+/area/ruin/beach/village/officers)
+"NU" = (
+/obj/structure/cable/yellow{
+	icon_state = "1-4"
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/concrete/slab_1,
+/area/ruin/beach/village/armory)
+"NV" = (
+/obj/structure/bed/double,
+/obj/item/bedsheet/double/red,
+/turf/open/floor/wood,
+/area/ruin/beach/village/officers)
+"NZ" = (
+/obj/machinery/door/airlock/hatch{
+	dir = 4;
+	name = "Bathroom"
+	},
+/turf/open/floor/concrete/slab_1,
+/area/ruin/beach/village/armory)
+"Oc" = (
+/obj/structure/chair/plastic{
+	dir = 1
+	},
+/turf/open/floor/carpet,
+/area/ruin/beach/village/kitchen)
+"Oi" = (
+/obj/machinery/vending/cigarette,
+/turf/open/floor/wood,
+/area/ruin/beach/village/dorm)
+"Oj" = (
+/obj/structure/closet/cabinet,
+/obj/item/clothing/suit/armor/frontier,
+/obj/item/clothing/under/frontiersmen/officer,
+/obj/item/clothing/head/frontier/peaked,
+/obj/item/clothing/shoes/sandal,
+/obj/item/clothing/under/shorts/jorts,
+/turf/open/floor/wood,
+/area/ruin/beach/village/officers)
+"Ol" = (
+/obj/structure/closet/crate/freezer/blood,
+/turf/open/floor/plasteel,
+/area/ruin/beach/village/infirmary)
+"Ow" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/open/floor/plating/asteroid/sand/dense/lit,
+/area/overmap_encounter/planetoid/beachplanet/explored)
+"Oy" = (
+/obj/structure/ore_box,
+/turf/open/floor/concrete/slab_1,
+/area/ruin/beach/village/armory)
+"OB" = (
+/obj/structure/barricade/sandbags,
+/turf/open/floor/plating/asteroid/sand/lit,
+/area/overmap_encounter/planetoid/beachplanet/explored)
+"ON" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/concrete/slab_4,
+/area/ruin/beach/village/armory)
+"OY" = (
+/obj/structure/railing/wood{
+	dir = 5
+	},
+/turf/open/floor/plating/asteroid/dirt/grass/beach,
+/area/overmap_encounter/planetoid/beachplanet/explored)
+"Pe" = (
+/obj/structure/crate_shelf,
+/obj/structure/closet/crate/rations,
+/turf/open/floor/plasteel/tech/techmaint,
+/area/ruin/beach/village/armory)
+"Pl" = (
+/obj/structure/railing{
+	dir = 4
+	},
+/obj/effect/turf_decal/siding/thinplating{
+	dir = 8
+	},
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/turf/open/floor/plasteel/tech/techmaint,
+/area/ruin/beach/village/armory)
+"Pm" = (
+/obj/structure/chair/sofa/brown/old/left/directional/east,
+/turf/open/floor/wood/walnut,
+/area/ruin/beach/village/kitchen)
+"Pu" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/wood,
+/area/ruin/beach/village/dorm)
+"Py" = (
+/mob/living/basic/cow{
+	faction = list("Frontiersmen");
+	name = "frontiersmen cow";
+	desc = "You get the feeling that somehow, this cow wishes they'd hit Luna-Town again. They also have a pancake in their mouth."
+	},
+/obj/item/grown/bananapeel{
+	pixel_x = -8;
+	pixel_y = -13
+	},
+/turf/open/floor/concrete/slab_1,
+/area/ruin/beach/village/kitchen)
+"PK" = (
+/obj/structure/table/reinforced,
+/obj/item/storage/bag/tray/cafeteria,
+/obj/item/storage/bag/tray/cafeteria{
+	pixel_x = 0;
+	pixel_y = 6
+	},
+/obj/item/storage/bag/tray/cafeteria{
+	pixel_x = 0;
+	pixel_y = 9
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/concrete/slab_1,
+/area/ruin/beach/village/kitchen)
+"PT" = (
+/obj/structure/flora/ausbushes/fullgrass,
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/open/floor/plating/asteroid/dirt/grass/beach,
+/area/overmap_encounter/planetoid/beachplanet/explored)
+"PZ" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/freezer,
+/area/ruin/beach/village/armory)
+"Qe" = (
+/obj/machinery/light/small/directional/east,
+/turf/open/floor/concrete/slab_1,
+/area/ruin/beach/village/dorm)
+"Qf" = (
+/obj/structure/cable{
+	icon_state = "1-10"
+	},
+/turf/open/floor/plating/asteroid/dirt/beach,
+/area/overmap_encounter/planetoid/beachplanet/explored)
+"QA" = (
+/obj/structure/chair{
+	dir = 1
+	},
+/obj/machinery/light/directional/south,
+/turf/open/floor/concrete/slab_3,
+/area/ruin/beach/village/infirmary)
+"QB" = (
+/obj/structure/table/wood,
+/obj/item/clothing/mask/cigarette/rollie/cannabis{
+	pixel_x = 8;
+	pixel_y = 2
+	},
+/obj/item/clothing/mask/cigarette/rollie/trippy{
+	pixel_x = 3;
+	pixel_y = 12
+	},
+/turf/open/floor/plating/asteroid/sand/lit,
+/area/overmap_encounter/planetoid/beachplanet/explored)
+"QO" = (
+/obj/machinery/light/directional/south,
+/turf/open/floor/carpet/red,
+/area/ruin/beach/village/officers)
+"QP" = (
+/obj/structure/platform/wood{
+	dir = 1
+	},
+/turf/open/water/beach/deep,
+/area/overmap_encounter/planetoid/beachplanet/explored)
+"Rx" = (
+/obj/structure/cable{
+	icon_state = "4-10"
+	},
+/turf/open/floor/plating/asteroid/sand/dense/lit,
+/area/overmap_encounter/planetoid/beachplanet/explored)
+"RE" = (
+/turf/open/floor/concrete/slab_1,
+/area/ruin/beach/village/dorm)
+"RP" = (
+/obj/machinery/door/airlock/engineering{
+	dir = 8;
+	name = "Engineering"
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/open/floor/concrete/slab_1,
+/area/ruin/beach/village/armory)
+"Sg" = (
+/obj/structure/flora/ausbushes/leafybush,
+/turf/open/floor/plating/asteroid/dirt/grass/beach,
+/area/overmap_encounter/planetoid/beachplanet/explored)
+"Sp" = (
+/obj/effect/turf_decal/siding/wideplating/dark,
+/turf/open/floor/plasteel/showroomfloor,
+/area/ruin/beach/village/infirmary)
+"Su" = (
+/obj/structure/flora/stump,
+/turf/open/floor/plating/asteroid/dirt/grass/beach,
+/area/overmap_encounter/planetoid/beachplanet/explored)
+"Sw" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/carpet/red,
+/area/ruin/beach/village/officers)
+"SE" = (
+/obj/structure/bed{
+	dir = 4
+	},
+/obj/item/bedsheet/black{
+	dir = 4
+	},
+/obj/effect/turf_decal/siding/wideplating,
+/turf/open/floor/plasteel,
+/area/ruin/beach/village/infirmary)
+"SP" = (
+/obj/structure/railing{
+	dir = 8
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/concrete/slab_3,
+/area/ruin/beach/village/kitchen)
+"SU" = (
+/obj/machinery/door/airlock/wood/glass{
+	dir = 4;
+	name = "Dormitory"
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 8
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 4
+	},
+/turf/open/floor/concrete/slab_1,
+/area/ruin/beach/village/dorm)
+"Tj" = (
+/obj/structure/closet/cabinet,
+/obj/item/clothing/under/frontiersmen,
+/obj/item/clothing/under/frontiersmen/deckhand,
+/obj/item/clothing/shoes/combat{
+	pixel_y = -10
+	},
+/obj/item/clothing/head/soft/frontiersmen{
+	pixel_y = 5
+	},
+/obj/item/storage/backpack/duffelbag,
+/obj/item/clothing/under/shorts/jorts,
+/obj/item/clothing/under/shorts/jorts,
+/turf/open/floor/wood,
+/area/ruin/beach/village/dorm)
+"Tr" = (
+/obj/structure/fluff/beach_umbrella,
+/turf/open/floor/carpet/red,
+/area/overmap_encounter/planetoid/beachplanet/explored)
+"Tv" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/concrete/slab_1,
+/area/ruin/beach/village/armory)
+"Ty" = (
+/obj/effect/decal/cleanable/blood/tracks{
+	dir = 5
+	},
+/obj/effect/turf_decal/siding/black{
+	dir = 4
+	},
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 8
+	},
+/turf/open/floor/concrete/slab_4,
+/area/ruin/beach/village/armory)
+"Tz" = (
+/obj/structure/rack,
+/obj/item/towel{
+	pixel_x = -6;
+	pixel_y = 1
+	},
+/obj/item/towel{
+	pixel_x = 0;
+	pixel_y = 1
+	},
+/obj/item/towel{
+	pixel_x = 9;
+	pixel_y = 1
+	},
+/obj/item/towel{
+	pixel_x = -8;
+	pixel_y = 8
+	},
+/obj/item/towel{
+	pixel_x = 0;
+	pixel_y = 9
+	},
+/obj/item/towel{
+	pixel_x = 8;
+	pixel_y = 7
+	},
+/turf/open/floor/plasteel/tech/techmaint,
+/area/ruin/beach/village/armory)
+"TA" = (
+/obj/structure/crate_shelf,
+/obj/structure/closet/crate/trashcart,
+/obj/effect/turf_decal/siding/thinplating,
+/obj/effect/spawner/random/trash/crushed_can,
+/obj/effect/spawner/random/trash/food_packaging,
+/obj/effect/spawner/random/trash/food_packaging,
+/obj/effect/spawner/random/trash/food_packaging,
+/obj/effect/spawner/random/trash/ghetto_containers,
+/turf/open/floor/plasteel/tech/techmaint,
+/area/ruin/beach/village/armory)
+"TD" = (
+/obj/structure/curtain/cloth/grey,
+/obj/effect/turf_decal/siding/thinplating/dark/corner{
+	dir = 1
+	},
+/turf/open/floor/concrete/slab_1,
+/area/ruin/beach/village/armory)
+"TP" = (
+/mob/living/simple_animal/hostile/human/frontier/ranged,
+/obj/structure/cable{
+	icon_state = "1-6"
+	},
+/turf/open/floor/plating/asteroid/dirt/beach,
+/area/overmap_encounter/planetoid/beachplanet/explored)
+"TR" = (
+/obj/structure/flora/ausbushes/reedbush,
+/turf/open/floor/plating/asteroid/sand/lit,
+/area/overmap_encounter/planetoid/beachplanet/explored)
+"TV" = (
+/mob/living/simple_animal/hostile/human/frontier/ranged/trooper/f3/sentry,
+/turf/open/floor/plating/asteroid/sand/lit,
+/area/overmap_encounter/planetoid/beachplanet/explored)
+"Ud" = (
+/turf/open/floor/wood,
+/area/ruin/beach/village/dorm)
+"Uh" = (
+/obj/effect/turf_decal/road,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/concrete/pavement/beachplanet/lit,
+/area/ruin/beach/village/armory)
+"Uj" = (
+/obj/structure/closet/cabinet,
+/obj/item/clothing/suit/armor/frontier,
+/obj/item/clothing/under/frontiersmen/officer,
+/obj/item/clothing/head/frontier/peaked,
+/obj/item/clothing/shoes/sandal,
+/obj/item/clothing/under/shorts/dolphin,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/wood,
+/area/ruin/beach/village/officers)
+"Ul" = (
+/obj/machinery/door/poddoor/shutters{
+	id = "villagesecure"
+	},
+/turf/open/floor/concrete/slab_1,
+/area/ruin/beach/village/armory)
+"Ut" = (
+/obj/structure/chair{
+	dir = 4
+	},
+/turf/open/floor/carpet/black,
+/area/ruin/beach/village/officers)
+"Uw" = (
+/obj/structure/cable{
+	icon_state = "6-8"
+	},
+/turf/open/floor/plating/asteroid/dirt/beach,
+/area/overmap_encounter/planetoid/beachplanet/explored)
+"UB" = (
+/obj/structure/mirror{
+	pixel_x = 0;
+	pixel_y = -24
+	},
+/obj/structure/table/reinforced,
+/obj/structure/sink/kitchen{
+	dir = 1;
+	pixel_x = 0;
+	pixel_y = 12
+	},
+/turf/open/floor/concrete/slab_3,
+/area/ruin/beach/village/armory)
+"UD" = (
+/obj/machinery/door/airlock/wood{
+	dir = 4;
+	name = "Dormitory"
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 4
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 8
+	},
+/turf/open/floor/concrete/slab_1,
+/area/ruin/beach/village/dorm)
+"UK" = (
+/obj/item/storage/toolbox/fishing{
+	pixel_x = 5;
+	pixel_y = -3
+	},
+/obj/item/storage/backpack/duffelbag{
+	pixel_x = -17;
+	pixel_y = -11
+	},
+/obj/structure/railing/wood{
+	dir = 1
+	},
+/turf/open/floor/wood/walnut,
+/area/ruin/beach/village/officers)
+"UM" = (
+/obj/effect/turf_decal/techfloor{
+	dir = 1
+	},
+/turf/open/floor/plasteel/tech/techmaint,
+/area/ruin/beach/village/kitchen)
+"UX" = (
+/obj/structure/bed,
+/obj/item/bedsheet/brown,
+/turf/open/floor/wood,
+/area/ruin/beach/village/officers)
+"Vg" = (
+/obj/structure/chair{
+	dir = 4
+	},
+/obj/effect/turf_decal/siding/thinplating{
+	dir = 4
+	},
+/turf/open/floor/plasteel/tech/techmaint,
+/area/ruin/beach/village/armory)
+"Vt" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/plating/asteroid/dirt/beach,
+/area/overmap_encounter/planetoid/beachplanet/explored)
+"Vu" = (
+/obj/structure/window/fulltile,
+/obj/structure/grille,
+/turf/open/floor/plating,
+/area/ruin/beach/village/officers)
+"VF" = (
+/obj/effect/turf_decal/siding/wideplating{
+	dir = 10
+	},
+/turf/open/floor/plasteel,
+/area/ruin/beach/village/infirmary)
+"VN" = (
+/obj/machinery/light/directional/east,
+/turf/open/floor/plasteel/tech/techmaint,
+/area/ruin/beach/village/armory)
+"VV" = (
+/obj/structure/curtain/cloth/grey,
+/obj/effect/turf_decal/siding/thinplating/dark/corner{
+	dir = 8
+	},
+/turf/open/floor/concrete/slab_1,
+/area/ruin/beach/village/armory)
+"Wa" = (
+/obj/effect/turf_decal/road{
+	dir = 1
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/concrete/pavement/beachplanet/lit,
+/area/overmap_encounter/planetoid/beachplanet/explored)
+"WC" = (
+/obj/item/ammo_casing/spent/pistol_brass,
+/turf/open/floor/plating/asteroid/dirt/beach,
+/area/overmap_encounter/planetoid/beachplanet/explored)
+"WO" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/wood/walnut,
+/area/ruin/beach/village/kitchen)
+"WR" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/carpet/orange,
+/area/ruin/beach/village/dorm)
+"Xg" = (
+/obj/effect/turf_decal/siding/wideplating/dark{
+	dir = 1
+	},
+/turf/open/floor/plasteel/showroomfloor,
+/area/ruin/beach/village/infirmary)
+"Xt" = (
+/obj/effect/turf_decal/techfloor{
+	dir = 1
+	},
+/obj/effect/turf_decal/siding/wood{
+	dir = 4;
+	color = "#543C30"
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/tech/techmaint,
+/area/ruin/beach/village/kitchen)
+"Xv" = (
+/obj/structure/railing/corner/wood{
+	dir = 1
+	},
+/obj/structure/railing/corner/wood{
+	dir = 8
+	},
+/turf/open/floor/plating/asteroid/dirt/grass/beach,
+/area/overmap_encounter/planetoid/beachplanet/explored)
+"Xz" = (
+/obj/structure/railing/wood{
+	dir = 1
+	},
+/turf/open/floor/wood/walnut,
+/area/ruin/beach/village/officers)
+"XF" = (
+/obj/structure/table,
+/obj/item/food/candyheart{
+	pixel_x = -5;
+	pixel_y = 4
+	},
+/turf/open/floor/plating/asteroid/sand/lit,
+/area/overmap_encounter/planetoid/beachplanet/explored)
+"Ya" = (
+/mob/living/simple_animal/hostile/human/frontier/ranged/officer,
+/turf/open/floor/concrete/slab_3,
+/area/ruin/beach/village/infirmary)
+"Ye" = (
+/turf/open/floor/concrete/slab_4,
+/area/ruin/beach/village/armory)
+"Yf" = (
+/mob/living/basic/cow{
+	faction = list("Frontiersmen");
+	name = "frontiersmen cow";
+	desc = "You get the feeling that somehow, this cow wishes they'd hit Luna-Town again."
+	},
+/turf/open/floor/plating/asteroid/dirt/grass/beach,
+/area/overmap_encounter/planetoid/beachplanet/explored)
+"Yv" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 8
+	},
+/turf/open/floor/concrete/slab_3,
+/area/ruin/beach/village/armory)
+"Yz" = (
+/obj/structure/cable{
+	icon_state = "1-6"
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/catwalk/over/plated_catwalk/dark,
+/turf/open/floor/plating,
+/area/ruin/beach/village/armory)
+"YG" = (
+/obj/effect/turf_decal/road,
+/turf/open/floor/concrete/pavement/beachplanet/lit,
+/area/overmap_encounter/planetoid/beachplanet/explored)
+"YV" = (
+/obj/structure/closet/cabinet,
+/obj/item/clothing/suit/armor/frontier,
+/obj/item/clothing/under/frontiersmen/officer,
+/obj/item/clothing/head/frontier/peaked,
+/obj/item/clothing/shoes/sandal,
+/obj/item/clothing/under/shorts/jorts,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/wood,
+/area/ruin/beach/village/officers)
+"YW" = (
+/obj/structure/cable{
+	icon_state = "5-10"
+	},
+/turf/open/floor/plating/asteroid/dirt/beach,
+/area/overmap_encounter/planetoid/beachplanet/explored)
+"Za" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/plasteel/tech/techmaint,
+/area/ruin/beach/village/armory)
+"Zs" = (
+/obj/structure/closet/secure_closet/freezer/fridge{
+	populate = 0
+	},
+/obj/item/food/fishmeat,
+/obj/item/food/fishmeat,
+/obj/item/food/fishmeat,
+/obj/item/food/fishmeat,
+/obj/item/food/fishmeat,
+/obj/item/food/fishmeat,
+/obj/item/food/fishmeat,
+/obj/item/food/fishmeat,
+/obj/item/food/fishmeat,
+/obj/item/reagent_containers/condiment/milk,
+/obj/item/reagent_containers/condiment/milk,
+/obj/item/reagent_containers/condiment/milk,
+/obj/item/reagent_containers/condiment/milk,
+/obj/item/reagent_containers/condiment/milk,
+/obj/item/reagent_containers/condiment/milk,
+/obj/item/reagent_containers/condiment/milk,
+/obj/item/reagent_containers/condiment/milk,
+/obj/item/food/cheese/wheel,
+/obj/item/food/cheese/wheel,
+/obj/machinery/light/directional/north,
+/turf/open/floor/concrete/slab_1,
+/area/ruin/beach/village/kitchen)
+"ZA" = (
+/turf/closed/wall/mineral/wood,
+/area/ruin/beach/village/officers)
+"ZI" = (
+/obj/structure/platform/wood{
+	dir = 9
+	},
+/turf/open/water/beach/deep,
+/area/overmap_encounter/planetoid/beachplanet/explored)
+
+(1,1,1) = {"
+rb
+rb
+rb
+rb
+fh
+fh
+fh
+fh
+fh
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+fh
+fh
+fh
+fh
+fh
+fh
+fh
+fh
+fh
+fh
+fh
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+"}
+(2,1,1) = {"
+rb
+rb
+rb
+fh
+fh
+fh
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+fh
+fh
+fh
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+"}
+(3,1,1) = {"
+rb
+rb
+fh
+fh
+fh
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+fh
+fh
+fh
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+"}
+(4,1,1) = {"
+rb
+rb
+fh
+fh
+fh
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+fh
+fh
+fh
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+"}
+(5,1,1) = {"
+rb
+rb
+fh
+fh
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+fh
+fh
+fh
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+"}
+(6,1,1) = {"
+rb
+rb
+fh
+fh
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+fh
+fh
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+"}
+(7,1,1) = {"
+rb
+rb
+fh
+fh
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+fh
+fh
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+"}
+(8,1,1) = {"
+rb
+rb
+fh
+fh
+fh
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+fh
+fh
+fh
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+"}
+(9,1,1) = {"
+rb
+rb
+fh
+fh
+fh
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+fh
+fh
+fh
+fh
+fh
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+oU
+oU
+rb
+rb
+rb
+rb
+rb
+"}
+(10,1,1) = {"
+rb
+rb
+fh
+fh
+fh
+fh
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+fh
+fh
+fh
+fh
+fh
+fh
+fh
+fh
+fh
+fh
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+oU
+oU
+oU
+rb
+rb
+rb
+rb
+rb
+rb
+"}
+(11,1,1) = {"
+rb
+rb
+fh
+fh
+fh
+fh
+fh
+fh
+lB
+lB
+Jk
+Jk
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+lB
+fh
+fh
+fh
+fh
+fh
+fh
+fh
+fh
+fh
+fh
+fh
+fh
+rb
+rb
+rb
+rb
+rb
+Dy
+Dy
+Dy
+Dy
+oU
+oU
+oU
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+"}
+(12,1,1) = {"
+rb
+rb
+fh
+fh
+fh
+fh
+fh
+fh
+ng
+ng
+ng
+ng
+ng
+vm
+lB
+lB
+lB
+ol
+ng
+ng
+ng
+ng
+fh
+fh
+fh
+fh
+fh
+fh
+Dy
+Dy
+fh
+fh
+Dy
+fh
+fh
+fh
+fh
+fh
+rb
+Dy
+Dy
+Dy
+Dy
+oU
+oU
+le
+oU
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+"}
+(13,1,1) = {"
+rb
+rb
+rb
+fh
+fh
+fh
+fh
+fh
+fh
+fh
+fh
+fh
+fh
+QP
+lB
+lB
+lB
+rA
+fh
+fh
+fh
+fh
+fh
+fh
+Dy
+Dy
+Dy
+Dy
+Dy
+fh
+fh
+fh
+fh
+fh
+fh
+fh
+fh
+fh
+fh
+fh
+fh
+fh
+oU
+oU
+oU
+oU
+oU
+oU
+rb
+rb
+rb
+rb
+rb
+rb
+"}
+(14,1,1) = {"
+rb
+rb
+rb
+rb
+fh
+fh
+fh
+fh
+fh
+fh
+fh
+fh
+fh
+QP
+lB
+lB
+lB
+rA
+fh
+fh
+fh
+fh
+fh
+Dy
+xs
+oU
+Dy
+fh
+fh
+fh
+Dy
+fh
+fh
+fh
+fh
+fh
+fh
+fh
+fh
+fh
+fh
+Dy
+Dy
+Dy
+nu
+oU
+oU
+oU
+rb
+rb
+rb
+rb
+rb
+rb
+"}
+(15,1,1) = {"
+rb
+rb
+rb
+rb
+fh
+fh
+fh
+fh
+fh
+fh
+fh
+fh
+fh
+QP
+Jk
+lB
+lB
+rA
+fh
+fh
+fh
+fh
+fh
+Dy
+Dy
+fh
+fh
+fh
+fh
+fh
+fh
+fh
+fh
+fh
+fh
+fh
+fh
+fh
+Dy
+Dy
+fh
+oU
+oU
+oU
+oU
+oU
+oU
+oU
+rb
+rb
+rb
+rb
+rb
+rb
+"}
+(16,1,1) = {"
+rb
+rb
+rb
+rb
+fh
+fh
+fh
+ZI
+CP
+CP
+CP
+CP
+CP
+ym
+Jk
+lB
+Jk
+HK
+CP
+CP
+CP
+CP
+lC
+Dy
+Dy
+ZI
+CP
+CP
+CP
+CP
+CP
+CP
+CP
+CP
+CP
+CP
+CP
+lC
+Dy
+xy
+ZI
+CP
+lC
+oU
+oU
+oU
+oU
+oU
+rb
+rb
+rb
+rb
+rb
+rb
+"}
+(17,1,1) = {"
+rb
+rb
+rb
+rb
+fh
+fh
+ZI
+ym
+Jk
+Jk
+Jk
+Jk
+Jk
+Jk
+Jk
+Jk
+Jk
+Jk
+Jk
+Jk
+Jk
+Jk
+rA
+oU
+Dy
+QP
+Jk
+Jk
+Jk
+Jk
+Jk
+Jk
+Jk
+Jk
+Jk
+Jk
+Jk
+rA
+Dy
+Dy
+QP
+Jk
+HK
+lC
+oU
+oU
+oU
+oU
+oU
+oU
+rb
+rb
+rb
+rb
+"}
+(18,1,1) = {"
+rb
+rb
+rb
+rb
+fh
+fh
+QP
+Jk
+ol
+ng
+ng
+ng
+ng
+ng
+ng
+ng
+ng
+ng
+ng
+ng
+ng
+ng
+qI
+xs
+Dy
+HB
+ng
+ng
+ng
+ng
+vm
+Jk
+ol
+ng
+ng
+ng
+ng
+qI
+xy
+Dy
+HB
+vm
+Jk
+rA
+oU
+oU
+nu
+oU
+oU
+rb
+rb
+rb
+rb
+rb
+"}
+(19,1,1) = {"
+rb
+rb
+rb
+fh
+fh
+fh
+QP
+Jk
+rA
+fh
+fh
+fh
+fh
+fh
+fh
+fh
+fh
+fh
+TR
+fh
+fh
+fh
+fh
+Dy
+Dy
+fh
+fh
+fh
+fh
+fh
+HB
+ng
+qI
+fh
+fh
+fh
+fh
+fh
+Dy
+Dy
+fh
+QP
+Jk
+rA
+oU
+oU
+oU
+oU
+oU
+rb
+oU
+oU
+rb
+rb
+"}
+(20,1,1) = {"
+rb
+rb
+rb
+fh
+fh
+fh
+QP
+Jk
+rA
+fh
+zy
+Gj
+Gj
+Gj
+zy
+fh
+fh
+fh
+fh
+Dy
+Dy
+Dy
+Dy
+Dy
+Dy
+Dy
+fh
+fh
+Dy
+Dy
+Dy
+Dy
+Dy
+Dy
+Dy
+Dy
+fh
+fh
+Dy
+OB
+OB
+QP
+Jk
+rA
+oU
+oU
+oU
+oU
+oU
+nu
+oU
+rb
+rb
+rb
+"}
+(21,1,1) = {"
+rb
+rb
+rb
+fh
+fh
+fh
+QP
+Jk
+rA
+fh
+zy
+lw
+vn
+SE
+zy
+zy
+zy
+fh
+Dy
+Dy
+Dy
+Dy
+oU
+FM
+Dy
+Dy
+Dy
+Dy
+Dy
+Dy
+Dy
+Dy
+Dy
+Dy
+Dy
+Dy
+cd
+TR
+Dy
+vR
+OB
+QP
+Jk
+rA
+oU
+oU
+oU
+Kd
+oU
+oU
+oU
+oU
+rb
+rb
+"}
+(22,1,1) = {"
+rb
+rb
+rb
+fh
+fh
+fh
+QP
+Jk
+rA
+Dy
+zy
+oK
+oK
+fr
+NC
+mw
+zy
+Dy
+Dy
+Dy
+oU
+oU
+oU
+oU
+oU
+iZ
+oU
+Es
+Es
+Es
+ZI
+CP
+lC
+fh
+fh
+Dy
+cd
+Dy
+Dy
+QB
+OB
+QP
+Jk
+rA
+oU
+oU
+oU
+oU
+oU
+Dy
+Dy
+Dy
+rb
+rb
+"}
+(23,1,1) = {"
+rb
+fh
+fh
+fh
+fh
+fh
+QP
+Jk
+rA
+Dy
+zy
+Xg
+cK
+Sp
+Ya
+QA
+zy
+hy
+Dy
+oU
+oU
+oU
+iZ
+oU
+oU
+oU
+oU
+oU
+oU
+Es
+QP
+Jk
+rA
+fh
+fh
+fh
+Dy
+Dy
+nV
+OB
+OB
+QP
+Jk
+rA
+oU
+oU
+oU
+oU
+Dy
+Dy
+Dy
+Dy
+rb
+rb
+"}
+(24,1,1) = {"
+rb
+fh
+fh
+fh
+fh
+fh
+QP
+Jk
+rA
+Dy
+Gj
+ft
+Dp
+Sp
+hV
+Bh
+vB
+go
+Dy
+oU
+oU
+oU
+If
+If
+If
+If
+If
+If
+If
+If
+If
+If
+If
+If
+fh
+fh
+Dy
+Dy
+fh
+fh
+fh
+QP
+gE
+rA
+fh
+Bk
+oU
+Dy
+Dy
+Dy
+Dy
+Dy
+Dy
+rb
+"}
+(25,1,1) = {"
+rb
+fh
+fh
+fh
+fh
+fh
+QP
+Jk
+rA
+Dy
+zy
+Dt
+cK
+lx
+JV
+NC
+zy
+hy
+za
+oU
+oU
+oU
+If
+tN
+Tz
+If
+LR
+LR
+LR
+If
+gz
+Jr
+Hn
+If
+fh
+Es
+Dy
+Ef
+cZ
+OB
+OB
+QP
+Jk
+rA
+fh
+fh
+fh
+Dy
+Dy
+Dy
+Dy
+Dy
+Dy
+rb
+"}
+(26,1,1) = {"
+rb
+fh
+fh
+fh
+fh
+fh
+QP
+Jk
+rA
+Dy
+zy
+mM
+pl
+VF
+uw
+xj
+zy
+oU
+pI
+oU
+oU
+If
+If
+bs
+Fp
+VV
+GN
+AP
+Yv
+TD
+cx
+If
+If
+If
+Es
+Es
+Dy
+Dy
+hR
+EG
+OB
+QP
+Jk
+rA
+fh
+fh
+fh
+fh
+fh
+Dy
+Dy
+Dy
+Dy
+Dy
+"}
+(27,1,1) = {"
+fh
+fh
+fh
+fh
+fh
+fh
+QP
+Jk
+rA
+oU
+zy
+zy
+Ol
+av
+yT
+AA
+zy
+Dy
+pI
+oU
+oU
+If
+Aq
+PZ
+Mq
+If
+Kv
+ON
+UB
+If
+gz
+Jr
+dN
+If
+Es
+Es
+Es
+Dy
+oM
+op
+OB
+QP
+Jk
+rA
+fh
+fh
+fh
+fh
+fh
+fh
+Dy
+Dy
+Dy
+Dy
+"}
+(28,1,1) = {"
+fh
+fh
+fh
+fh
+fh
+fh
+QP
+Jk
+rA
+oU
+oU
+zy
+zy
+zy
+zy
+zy
+zy
+Dy
+PT
+oU
+Su
+If
+uk
+pm
+fC
+If
+Ye
+Ye
+UB
+If
+If
+If
+If
+If
+If
+Es
+Dy
+oU
+zp
+OB
+OB
+rI
+Jk
+rA
+fh
+fh
+fh
+fh
+fh
+fh
+fh
+fh
+Dy
+Dy
+"}
+(29,1,1) = {"
+fh
+fh
+fh
+fh
+fh
+fh
+QP
+Jk
+rA
+oU
+oU
+FL
+oU
+oU
+oU
+bG
+oU
+Dy
+pI
+oU
+oU
+If
+If
+If
+If
+If
+NZ
+If
+If
+If
+Pe
+wx
+TA
+iE
+If
+Nq
+Dy
+oU
+oU
+fh
+fh
+FT
+ng
+qI
+fh
+fh
+fh
+fh
+oU
+oU
+oU
+oU
+oU
+oU
+"}
+(30,1,1) = {"
+fh
+fh
+fh
+fh
+fh
+oU
+QP
+Jk
+rA
+oU
+oU
+Ay
+oU
+Yf
+nu
+bG
+oU
+oU
+pI
+iZ
+oU
+If
+hv
+bW
+Vg
+If
+Df
+DQ
+lc
+nM
+IO
+vd
+pK
+rD
+Ul
+jm
+Kh
+Kh
+Kh
+Kh
+Kh
+Kh
+Kh
+Kh
+Kh
+Kh
+Kh
+Kh
+xm
+xm
+Kh
+Kh
+Kh
+oU
+"}
+(31,1,1) = {"
+fh
+fh
+fh
+fh
+fh
+oU
+QP
+Jk
+rA
+oU
+oU
+Ay
+oU
+oU
+oU
+bG
+oU
+Su
+tc
+oU
+oU
+If
+Dg
+gz
+gz
+Gs
+aC
+HI
+lc
+If
+Fw
+Iw
+cV
+Nu
+LN
+Uh
+xR
+YG
+YG
+mG
+mG
+mG
+mG
+mG
+YG
+YG
+YG
+mG
+mG
+YG
+YG
+YG
+YG
+oU
+"}
+(32,1,1) = {"
+rb
+fh
+fh
+fh
+oU
+oU
+QP
+Jk
+rA
+oU
+oU
+FL
+oU
+nu
+oU
+bG
+oU
+oU
+tc
+oU
+oU
+If
+yx
+gz
+mi
+sq
+mm
+Yz
+DJ
+If
+fR
+Iw
+jD
+Tv
+Ul
+Ny
+dq
+Wa
+Wa
+LH
+LH
+LH
+LH
+LH
+Wa
+Wa
+Wa
+Wa
+LH
+LH
+LH
+LH
+oU
+oU
+"}
+(33,1,1) = {"
+rb
+rb
+fh
+fh
+oU
+oU
+QP
+Jk
+rA
+fh
+fh
+OY
+kr
+FV
+xi
+gX
+oU
+Dy
+jS
+oU
+oU
+If
+Kk
+Bx
+Cn
+Gs
+hD
+Fa
+di
+xe
+Za
+Dn
+gK
+Tv
+Ul
+jm
+uU
+Kh
+Kh
+Kh
+Kh
+Kh
+Kh
+Kh
+Kh
+xm
+xm
+Kh
+Kh
+Kh
+oU
+oU
+oU
+oU
+"}
+(34,1,1) = {"
+rb
+rb
+rb
+oU
+oU
+oU
+QP
+Jk
+rA
+fh
+fh
+fh
+oU
+Xv
+Dy
+oU
+oU
+Eo
+oU
+oU
+oU
+If
+If
+If
+If
+If
+RP
+If
+If
+If
+mn
+VN
+EU
+Oy
+If
+Nq
+fa
+fh
+fh
+fh
+fh
+ZI
+CP
+lC
+fh
+fh
+fh
+oU
+oU
+oU
+oU
+oU
+oU
+fh
+"}
+(35,1,1) = {"
+rb
+rb
+oU
+oU
+oU
+oU
+QP
+Jk
+rA
+fh
+fh
+IM
+Dy
+oU
+oU
+oU
+oU
+Dy
+DT
+Dy
+oU
+If
+ei
+NU
+Gl
+If
+uS
+MY
+aZ
+If
+If
+If
+If
+If
+If
+Dy
+tc
+fh
+fh
+fh
+fh
+QP
+Jk
+rA
+fh
+fh
+fh
+fh
+fh
+fh
+fh
+fh
+fh
+fh
+"}
+(36,1,1) = {"
+rb
+rb
+oU
+oU
+oU
+oU
+QP
+ol
+qI
+fh
+fh
+fh
+Dy
+Dy
+oU
+oU
+oU
+oU
+oU
+qZ
+oU
+If
+qk
+si
+KT
+IU
+FY
+lM
+ts
+If
+qe
+GM
+wT
+If
+Es
+Dy
+jS
+fh
+fh
+fh
+fh
+QP
+Jk
+rA
+fh
+fh
+fh
+fh
+fh
+fh
+fh
+rb
+rb
+rb
+"}
+(37,1,1) = {"
+rb
+rb
+oU
+oU
+oU
+fh
+QP
+rA
+fh
+HP
+fh
+fh
+fh
+Dy
+oU
+oU
+oU
+oU
+oU
+Dy
+za
+If
+If
+Pl
+jd
+If
+Ty
+HA
+gj
+au
+vU
+GP
+rz
+If
+Es
+YW
+oU
+oU
+fh
+fh
+fh
+QP
+Jk
+rA
+fh
+fh
+bg
+fh
+fh
+fh
+rb
+rb
+rb
+rb
+"}
+(38,1,1) = {"
+rb
+rb
+fh
+oU
+fh
+fh
+QP
+rA
+rv
+gM
+fh
+fh
+fh
+Dy
+oU
+Su
+oU
+oU
+oU
+oU
+tc
+Dy
+If
+kc
+bS
+If
+FJ
+gh
+AF
+If
+Eg
+xN
+yb
+If
+Rx
+wA
+nV
+wA
+fh
+fh
+fh
+QP
+Jk
+rA
+fh
+fh
+fh
+fh
+fh
+fh
+fh
+rb
+rb
+rb
+"}
+(39,1,1) = {"
+rb
+rb
+fh
+fh
+fh
+fh
+QP
+rA
+pg
+XF
+fh
+Tr
+fh
+Dy
+uV
+cU
+cU
+cU
+cU
+uV
+tc
+Dy
+If
+If
+If
+If
+If
+If
+If
+If
+If
+If
+If
+If
+Ow
+wA
+fh
+fh
+OB
+OB
+fh
+QP
+Jk
+rA
+fh
+fh
+fh
+fh
+fh
+fh
+fh
+fh
+fh
+rb
+"}
+(40,1,1) = {"
+rb
+rb
+rb
+fh
+fh
+fh
+QP
+rA
+fh
+Er
+fh
+BH
+fh
+Dy
+uV
+oU
+oU
+xO
+oU
+uV
+tc
+Dy
+Es
+Es
+Es
+Es
+Es
+Es
+Es
+oU
+QP
+Jk
+rA
+oU
+pI
+wA
+DK
+nV
+TV
+OB
+fh
+QP
+Jk
+rA
+fh
+fh
+fh
+fh
+fh
+yR
+lf
+fh
+fh
+rb
+"}
+(41,1,1) = {"
+rb
+rb
+rb
+rb
+fh
+fh
+QP
+HK
+lC
+fh
+fh
+fh
+fh
+Dy
+Dy
+Dy
+oU
+oU
+oU
+oU
+tc
+Es
+Es
+Es
+Es
+Es
+Es
+Es
+Dy
+oU
+QP
+Jk
+rA
+oU
+pI
+wA
+DK
+fh
+OB
+cU
+fh
+QP
+Jk
+rA
+fh
+fh
+fh
+fh
+fh
+fh
+fh
+fh
+fh
+rb
+"}
+(42,1,1) = {"
+rb
+rb
+rb
+rb
+fh
+fh
+QP
+Jk
+rA
+fh
+fh
+fh
+Dy
+Dy
+Dy
+Dy
+Dy
+Dy
+oU
+oU
+tc
+Es
+Es
+wA
+Es
+Es
+MX
+cU
+Dy
+Dy
+QP
+Jk
+rA
+oU
+pI
+wA
+oU
+wA
+oU
+oU
+fh
+QP
+Jk
+rA
+fh
+Tr
+fh
+fh
+fh
+fh
+fh
+fh
+fh
+rb
+"}
+(43,1,1) = {"
+rb
+rb
+rb
+rb
+fh
+fh
+QP
+Jk
+rA
+fh
+BH
+fh
+Dy
+oU
+uV
+Dy
+Dy
+Dy
+Dy
+uV
+tc
+Dy
+Es
+wA
+Es
+Es
+Kc
+cU
+Dy
+Dy
+QP
+Jk
+rA
+oU
+qa
+oU
+Dy
+oU
+oU
+fh
+fh
+QP
+Jk
+rA
+fh
+BH
+fh
+fh
+fh
+fh
+fh
+fh
+fh
+rb
+"}
+(44,1,1) = {"
+rb
+rb
+rb
+rb
+rb
+fh
+QP
+Jk
+rA
+fh
+BH
+fh
+Dy
+oU
+cU
+xU
+Dy
+oU
+xU
+cU
+tc
+Dy
+Es
+wA
+Es
+Es
+BP
+cU
+Dy
+Dy
+QP
+Jk
+rA
+Ig
+oU
+oU
+oU
+Sg
+oU
+fh
+fh
+QP
+Jk
+rA
+fh
+fh
+fh
+iR
+fh
+fh
+fh
+fh
+rb
+rb
+"}
+(45,1,1) = {"
+rb
+rb
+rb
+rb
+rb
+fh
+QP
+Jk
+rA
+fh
+fh
+fh
+Dy
+oU
+oU
+cU
+xU
+cU
+cU
+oU
+tc
+Dy
+Es
+wA
+Dy
+Es
+cU
+cU
+oU
+Dy
+QP
+Jk
+rA
+pI
+Bk
+oU
+FM
+Dy
+oU
+fh
+fh
+QP
+Jk
+rA
+fh
+fh
+fh
+fh
+fh
+oU
+oU
+oU
+rb
+rb
+"}
+(46,1,1) = {"
+rb
+rb
+rb
+rb
+rb
+fh
+QP
+Jk
+rA
+fh
+fh
+fh
+Dy
+Dy
+Dy
+oU
+oU
+oU
+oU
+oU
+jS
+Dy
+wW
+Es
+Dy
+oU
+oU
+oU
+Dy
+Dy
+QP
+Jk
+rA
+pI
+oU
+oU
+Dy
+Dy
+oU
+fh
+fh
+QP
+Jk
+rA
+bg
+fh
+fh
+fh
+fh
+fh
+fh
+oU
+oU
+rb
+"}
+(47,1,1) = {"
+rb
+rb
+rb
+rb
+rb
+fh
+QP
+Jk
+rA
+fh
+fh
+fh
+oU
+oU
+Dy
+Dy
+oU
+oU
+oU
+zK
+Dy
+Dy
+Dy
+Dy
+Dy
+oU
+Sg
+oU
+Dy
+Dy
+HB
+ng
+qI
+pI
+Sg
+oU
+Dy
+oU
+Su
+oU
+fh
+HB
+ng
+qI
+fh
+fh
+fh
+fh
+fh
+Dy
+Dy
+Dy
+oU
+oU
+"}
+(48,1,1) = {"
+rb
+rb
+rb
+rb
+fh
+fh
+QP
+Jk
+rA
+fh
+fh
+oU
+oU
+oU
+oU
+Dy
+Dy
+Dy
+Dy
+Dy
+za
+Dy
+Dy
+Dy
+Dy
+Dy
+Dy
+Dy
+Dy
+Dy
+Dy
+Dy
+Dy
+jS
+WC
+Dy
+Dy
+Dy
+Dy
+Dy
+fh
+Dy
+Dy
+Dy
+Dy
+Dy
+Dy
+Dy
+Dy
+Dy
+oU
+oU
+oU
+rb
+"}
+(49,1,1) = {"
+rb
+rb
+rb
+rb
+fh
+fh
+QP
+Jk
+rA
+oU
+oU
+CK
+Ko
+Ns
+Ns
+bp
+Vt
+pJ
+Dy
+Dy
+Uw
+Dy
+oU
+oU
+Dy
+Dy
+Dy
+Dy
+Dy
+Dy
+Dy
+aW
+De
+Dy
+Dy
+WC
+Dy
+oU
+oU
+Dy
+Dy
+Dy
+Dy
+Dy
+Dy
+Dy
+Dy
+Dy
+oU
+oU
+oU
+oU
+rb
+rb
+"}
+(50,1,1) = {"
+rb
+rb
+rb
+rb
+fh
+fh
+QP
+Jk
+rA
+oU
+oU
+ll
+hF
+ll
+Cf
+ll
+oU
+oU
+oz
+Vt
+Vt
+lm
+mK
+mK
+mK
+vP
+eh
+vP
+Vt
+mK
+Qf
+Dy
+kL
+TP
+Dy
+Dy
+oU
+oU
+Dy
+Dy
+Dy
+Dy
+Dy
+Dy
+Dy
+Dy
+Dy
+Dy
+oU
+oU
+oU
+oU
+oU
+rb
+"}
+(51,1,1) = {"
+rb
+rb
+rb
+rb
+fh
+fh
+QP
+Jk
+rA
+ll
+ll
+ll
+qF
+je
+je
+ll
+ll
+ll
+oU
+oU
+oU
+oU
+ZA
+ZA
+ZA
+ZA
+Bd
+ZA
+ZA
+oU
+ZI
+CP
+uc
+oU
+qZ
+Dy
+Dy
+Dy
+Dy
+oU
+Dy
+ZI
+CP
+lC
+oU
+oU
+oU
+Dy
+Dy
+Dy
+Dy
+oU
+rb
+rb
+"}
+(52,1,1) = {"
+rb
+rb
+rb
+fh
+fh
+fh
+QP
+Jk
+rA
+ll
+oR
+ad
+nT
+UM
+Eb
+FD
+sZ
+ll
+ZI
+CP
+lC
+ZA
+ZA
+uJ
+ot
+ZA
+lR
+wo
+ZA
+ZA
+QP
+Jk
+rA
+oU
+Qe
+aM
+RE
+RE
+RE
+Qe
+oU
+QP
+Jk
+rA
+oU
+oU
+Dy
+Dy
+oU
+oU
+oU
+oU
+rb
+rb
+"}
+(53,1,1) = {"
+rb
+rb
+rb
+fh
+fh
+fh
+QP
+Jk
+rA
+ll
+GB
+vV
+qp
+KS
+DG
+gr
+Oc
+ll
+QP
+Jk
+rA
+ZA
+Oj
+DU
+iN
+ZA
+iG
+bo
+wK
+ZA
+QP
+Jk
+rA
+ew
+ew
+fU
+xS
+xS
+SU
+ew
+ew
+QP
+Jk
+rA
+oU
+oU
+oU
+oU
+oU
+rb
+rb
+rb
+rb
+rb
+"}
+(54,1,1) = {"
+rb
+rb
+rb
+fh
+fh
+fh
+QP
+Jk
+rA
+ll
+mb
+SP
+MW
+vv
+DG
+gr
+wk
+ll
+QP
+Jk
+rA
+ZA
+YV
+Sw
+QO
+ZA
+Hk
+wo
+pQ
+ZA
+QP
+Jk
+rA
+ew
+kA
+Mt
+ck
+ck
+HS
+Ht
+ew
+QP
+Jk
+rA
+oU
+oU
+nu
+oU
+rb
+rb
+rb
+rb
+rb
+rb
+"}
+(55,1,1) = {"
+rb
+rb
+rb
+rb
+fh
+fh
+QP
+Jk
+rA
+ll
+Dq
+zw
+PK
+KS
+DG
+wP
+wk
+ll
+QP
+Jk
+rA
+Vu
+Dv
+Sw
+DU
+iQ
+NN
+wo
+ph
+ZA
+QP
+Jk
+rA
+ew
+CM
+Kp
+sU
+Cw
+lz
+ly
+ew
+QP
+Jk
+rA
+ER
+oU
+oU
+oU
+rb
+rb
+rb
+rb
+rb
+rb
+"}
+(56,1,1) = {"
+rb
+rb
+rb
+rb
+fh
+fh
+QP
+Jk
+rA
+ll
+ed
+ML
+Py
+Xt
+jH
+jH
+jH
+ll
+QP
+Jk
+rA
+Vu
+Dv
+ki
+df
+ZA
+Hq
+GE
+NB
+ZA
+QP
+Jk
+rA
+ew
+Oi
+EK
+uP
+AC
+EK
+dl
+ew
+QP
+Jk
+rA
+oU
+oU
+oU
+oU
+rb
+rb
+rb
+rb
+rb
+rb
+"}
+(57,1,1) = {"
+rb
+rb
+rb
+rb
+rb
+fh
+QP
+Jk
+rA
+ll
+Zs
+AV
+cT
+nQ
+WO
+iU
+LS
+ll
+QP
+Jk
+rA
+ZA
+NV
+hG
+ZA
+ZA
+ZA
+hY
+ZA
+ZA
+QP
+Jk
+rA
+ew
+ew
+UD
+ew
+ew
+UD
+ew
+ew
+QP
+Jk
+rA
+oU
+oU
+oU
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+"}
+(58,1,1) = {"
+rb
+rb
+rb
+rb
+rb
+fh
+QP
+Jk
+rA
+ll
+ll
+Iz
+Iz
+xc
+be
+ee
+ll
+ll
+QP
+Jk
+rA
+ZA
+ZA
+ZA
+ZA
+Uj
+HR
+Dv
+sh
+ZA
+QP
+Jk
+rA
+ew
+Ba
+ck
+sY
+iF
+an
+xC
+ew
+QP
+Jk
+rA
+oU
+oU
+oU
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+"}
+(59,1,1) = {"
+rb
+rb
+rb
+rb
+rb
+fh
+QP
+Jk
+HK
+CP
+lC
+Pm
+st
+bf
+iU
+uF
+ZI
+CP
+ym
+Jk
+rA
+Xz
+uE
+kI
+jb
+nL
+mQ
+mQ
+Dv
+ZA
+QP
+Jk
+rA
+ew
+vX
+Am
+jn
+FX
+qK
+Gn
+ew
+QP
+Jk
+rA
+oU
+nu
+oU
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+"}
+(60,1,1) = {"
+rb
+rb
+rb
+rb
+rb
+fh
+QP
+Jk
+Jk
+Jk
+rA
+Ca
+Ca
+iU
+iU
+iU
+QP
+Jk
+Jk
+Jk
+rA
+Xz
+vK
+vK
+ZA
+eW
+Ut
+mQ
+mh
+ZA
+QP
+Jk
+rA
+ew
+Tj
+Pu
+WR
+WR
+Ud
+rn
+ew
+QP
+Jk
+rA
+oU
+oU
+fh
+fh
+fh
+fh
+fh
+fh
+rb
+rb
+"}
+(61,1,1) = {"
+rb
+rb
+rb
+rb
+fh
+fh
+QP
+Jk
+Jk
+Jk
+HK
+CP
+CP
+CP
+CP
+CP
+ym
+Jk
+Jk
+Jk
+rA
+Xz
+vK
+tw
+ZA
+qO
+ot
+Lu
+UX
+ZA
+QP
+Jk
+rA
+ew
+ew
+qq
+cl
+rB
+qq
+ew
+ew
+QP
+Jk
+rA
+oU
+oU
+fh
+fh
+fh
+fh
+fh
+fh
+rb
+rb
+"}
+(62,1,1) = {"
+rb
+rb
+rb
+rb
+fh
+fh
+QP
+Jk
+Jk
+Jk
+Jk
+Jk
+Jk
+Jk
+Jk
+Jk
+Jk
+Jk
+Jk
+Jk
+rA
+UK
+oH
+BK
+ZA
+ZA
+Vu
+Vu
+ZA
+ZA
+QP
+Jk
+HK
+lC
+ew
+xS
+ew
+ew
+xS
+ew
+ZI
+ym
+Jk
+rA
+oU
+oU
+fh
+fh
+fh
+fh
+fh
+fh
+rb
+rb
+"}
+(63,1,1) = {"
+rb
+rb
+rb
+rb
+fh
+fh
+QP
+Jk
+Jk
+Jk
+Jk
+Jk
+Jk
+Jk
+Jk
+Jk
+Jk
+Jk
+Jk
+Jk
+HK
+CP
+CP
+CP
+CP
+CP
+CP
+CP
+CP
+CP
+ym
+Jk
+Jk
+HK
+CP
+CP
+CP
+CP
+CP
+CP
+ym
+Jk
+Jk
+rA
+oU
+fh
+fh
+fh
+fh
+fh
+rb
+rb
+rb
+rb
+"}
+(64,1,1) = {"
+rb
+rb
+rb
+rb
+fh
+fh
+HB
+vm
+Jk
+Jk
+Jk
+Jk
+Jk
+Jk
+Jk
+Jk
+Jk
+Jk
+Jk
+Jk
+Jk
+Jk
+Jk
+Jk
+Jk
+Jk
+Jk
+Jk
+Jk
+Jk
+Jk
+Jk
+Jk
+Jk
+Jk
+Jk
+Jk
+Jk
+Jk
+Jk
+Jk
+Jk
+ol
+qI
+oU
+fh
+fh
+fh
+fh
+fh
+rb
+rb
+rb
+rb
+"}
+(65,1,1) = {"
+rb
+rb
+rb
+rb
+fh
+fh
+fh
+HB
+ng
+ng
+ng
+ng
+ng
+ng
+ng
+ng
+ng
+ng
+ng
+ng
+ng
+ng
+ng
+ng
+ng
+ng
+ng
+ng
+ng
+ng
+ng
+ng
+ng
+ng
+ng
+ng
+ng
+ng
+ng
+ng
+ng
+ng
+qI
+fh
+fh
+fh
+fh
+fh
+fh
+fh
+rb
+rb
+rb
+rb
+"}
+(66,1,1) = {"
+rb
+rb
+rb
+fh
+fh
+fh
+fh
+fh
+fh
+fh
+fh
+fh
+fh
+fh
+fh
+fh
+fh
+fh
+fh
+fh
+fh
+fh
+fh
+fh
+fh
+fh
+fh
+fh
+fh
+fh
+fh
+fh
+fh
+fh
+fh
+fh
+fh
+fh
+fh
+fh
+fh
+fh
+fh
+fh
+fh
+fh
+fh
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+"}
+(67,1,1) = {"
+rb
+rb
+rb
+fh
+fh
+fh
+fh
+fh
+fh
+fh
+fh
+fh
+fh
+fh
+fh
+fh
+fh
+rb
+rb
+rb
+fh
+fh
+fh
+fh
+fh
+rb
+rb
+rb
+fh
+fh
+fh
+fh
+rb
+rb
+rb
+fh
+fh
+fh
+rb
+rb
+fh
+fh
+fh
+fh
+fh
+fh
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+"}
+(68,1,1) = {"
+rb
+rb
+rb
+fh
+fh
+rb
+rb
+rb
+rb
+rb
+fh
+fh
+fh
+fh
+fh
+fh
+rb
+rb
+rb
+rb
+rb
+rb
+fh
+fh
+rb
+rb
+rb
+rb
+fh
+fh
+fh
+fh
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+fh
+fh
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+"}
+(69,1,1) = {"
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+fh
+fh
+fh
+fh
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+rb
+"}
diff --git a/_maps/RandomRuins/IceRuins/icemoon_tesla_lab.dmm b/_maps/RandomRuins/IceRuins/icemoon_tesla_lab.dmm
index 79b6c62f13..e7c68ba624 100644
--- a/_maps/RandomRuins/IceRuins/icemoon_tesla_lab.dmm
+++ b/_maps/RandomRuins/IceRuins/icemoon_tesla_lab.dmm
@@ -5257,7 +5257,7 @@
 	pixel_y = 5;
 	pixel_x = -5
 	},
-/obj/item/reagent_containers/pill/trophazole{
+/obj/item/reagent_containers/pill/indomide{
 	pixel_x = 11;
 	pixel_y = -10
 	},
diff --git a/_maps/RandomRuins/JungleRuins/jungle_bombed_starport.dmm b/_maps/RandomRuins/JungleRuins/jungle_bombed_starport.dmm
index c94533a396..5e31130bb9 100644
--- a/_maps/RandomRuins/JungleRuins/jungle_bombed_starport.dmm
+++ b/_maps/RandomRuins/JungleRuins/jungle_bombed_starport.dmm
@@ -35,7 +35,7 @@
 	},
 /obj/structure/spider/stickyweb,
 /obj/item/radio/intercom/directional/west,
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/jungleplanet,
 /area/ruin/jungle/airbase/dorms)
 "ah" = (
 /obj/structure/flora/tree/jungle{
@@ -115,7 +115,7 @@
 	},
 /obj/structure/spider/stickyweb,
 /obj/structure/spider/cocoon,
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/jungleplanet,
 /area/ruin/jungle/airbase/dorms)
 "aI" = (
 /obj/structure/platform/military,
@@ -284,7 +284,7 @@
 	dir = 1
 	},
 /obj/structure/spider/stickyweb,
-/turf/open/floor/wood,
+/turf/open/floor/wood/jungleplanet,
 /area/ruin/jungle/airbase/dorms)
 "bv" = (
 /obj/machinery/atmospherics/pipe/simple/green/hidden{
@@ -328,7 +328,7 @@
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/structure/spider/stickyweb,
 /mob/living/simple_animal/hostile/poison/giant_spider,
-/turf/open/floor/plasteel/patterned/brushed,
+/turf/open/floor/plasteel/patterned/brushed/jungleplanet,
 /area/ruin/jungle/airbase/dorms)
 "bF" = (
 /obj/structure/cable{
@@ -400,7 +400,7 @@
 /area/overmap_encounter/planetoid/jungle/explored)
 "ca" = (
 /obj/structure/spider/stickyweb,
-/turf/open/floor/plasteel/patterned/brushed,
+/turf/open/floor/plasteel/patterned/brushed/jungleplanet,
 /area/ruin/jungle/airbase/dorms)
 "cb" = (
 /obj/machinery/suit_storage_unit/industrial/atmos_firesuit,
@@ -445,7 +445,7 @@
 	pixel_y = -5
 	},
 /obj/structure/spider/cocoon,
-/turf/open/floor/wood,
+/turf/open/floor/wood/jungleplanet,
 /area/ruin/jungle/airbase/dorms)
 "co" = (
 /obj/structure/flora/grass/jungle,
@@ -539,7 +539,7 @@
 /obj/effect/turf_decal/corner/transparent/bar/diagonal{
 	dir = 1
 	},
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/jungleplanet,
 /area/ruin/jungle/airbase/dorms)
 "cH" = (
 /obj/structure/platform/military{
@@ -701,8 +701,10 @@
 /obj/effect/turf_decal/industrial/warning{
 	dir = 1
 	},
-/turf/open/floor/plasteel/stairs/modern{
-	dir = 1
+/turf/open/floor/plasteel/stairs/jungleplanet{
+	icon = 'icons/obj/stairs.dmi';
+	dir = 1;
+	icon_state = "stairs_t"
 	},
 /area/overmap_encounter/planetoid/jungle/explored)
 "dz" = (
@@ -811,7 +813,7 @@
 	pixel_x = 3;
 	start_empty = 1
 	},
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/jungleplanet,
 /area/ruin/jungle/airbase/dorms)
 "dU" = (
 /obj/effect/turf_decal/borderfloorblack{
@@ -962,7 +964,7 @@
 	dir = 4
 	},
 /obj/structure/spider/stickyweb,
-/turf/open/floor/wood,
+/turf/open/floor/wood/jungleplanet,
 /area/ruin/jungle/airbase/dorms)
 "ex" = (
 /obj/structure/cable{
@@ -1087,7 +1089,7 @@
 /obj/structure/spider/stickyweb,
 /obj/structure/spider/cocoon,
 /obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/jungleplanet,
 /area/ruin/jungle/airbase/dorms)
 "fi" = (
 /obj/effect/turf_decal/techfloor{
@@ -1205,7 +1207,7 @@
 	pixel_y = 11;
 	pixel_x = -8
 	},
-/turf/open/floor/carpet/red,
+/turf/open/floor/carpet/red/jungleplanet,
 /area/ruin/jungle/airbase/dorms)
 "fJ" = (
 /obj/effect/turf_decal/techfloor{
@@ -1261,8 +1263,10 @@
 /turf/open/floor/plasteel/mono/dark,
 /area/ruin/jungle/airbase/tower)
 "fU" = (
-/turf/open/floor/plasteel/stairs/modern{
-	dir = 8
+/turf/open/floor/plasteel/stairs/jungleplanet{
+	icon = 'icons/obj/stairs.dmi';
+	dir = 8;
+	icon_state = "stairs_t"
 	},
 /area/ruin/jungle/airbase)
 "fV" = (
@@ -1429,8 +1433,8 @@
 "gE" = (
 /obj/effect/turf_decal/industrial/warning,
 /obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/plasteel/stairs/modern/dark{
-	dir = 2
+/turf/open/floor/plasteel/stairs/jungleplanet{
+	icon = 'icons/obj/stairs.dmi'
 	},
 /area/overmap_encounter/planetoid/jungle/explored)
 "gF" = (
@@ -1557,8 +1561,8 @@
 	dir = 8
 	},
 /obj/effect/turf_decal/industrial/warning,
-/turf/open/floor/plasteel/stairs/modern/dark{
-	dir = 2
+/turf/open/floor/plasteel/stairs/jungleplanet{
+	icon = 'icons/obj/stairs.dmi'
 	},
 /area/overmap_encounter/planetoid/jungle/explored)
 "hf" = (
@@ -1586,7 +1590,7 @@
 /obj/structure/closet/wall/directional/south,
 /obj/item/clothing/shoes/jackboots,
 /obj/item/radio/intercom/directional/east,
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/jungleplanet,
 /area/ruin/jungle/airbase/dorms)
 "hj" = (
 /obj/structure/spider/stickyweb,
@@ -1738,7 +1742,7 @@
 	pixel_x = -2;
 	start_empty = 1
 	},
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/jungleplanet,
 /area/ruin/jungle/airbase/dorms)
 "hR" = (
 /obj/structure/platform/military{
@@ -1783,8 +1787,10 @@
 /obj/effect/turf_decal/industrial/warning{
 	dir = 1
 	},
-/turf/open/floor/plasteel/stairs/modern{
-	dir = 1
+/turf/open/floor/plasteel/stairs/jungleplanet{
+	icon = 'icons/obj/stairs.dmi';
+	dir = 1;
+	icon_state = "stairs_t"
 	},
 /area/overmap_encounter/planetoid/jungle/explored)
 "ia" = (
@@ -1853,7 +1859,7 @@
 	icon_state = "4-8"
 	},
 /obj/structure/spider/stickyweb,
-/turf/open/floor/wood,
+/turf/open/floor/wood/jungleplanet,
 /area/ruin/jungle/airbase/dorms)
 "in" = (
 /obj/effect/turf_decal/corner/transparent/syndiered/border{
@@ -2112,7 +2118,7 @@
 	pixel_x = -9
 	},
 /obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/jungleplanet,
 /area/ruin/jungle/airbase/dorms)
 "jE" = (
 /obj/structure/grille,
@@ -2124,7 +2130,7 @@
 /obj/item/food/meat/slab/human{
 	pixel_y = 8
 	},
-/turf/open/floor/carpet/red,
+/turf/open/floor/carpet/red/jungleplanet,
 /area/ruin/jungle/airbase/dorms)
 "jG" = (
 /obj/effect/turf_decal/corner/opaque/orange{
@@ -2406,7 +2412,7 @@
 /obj/item/ammo_casing/spent/pistol_brass,
 /obj/structure/spider/eggcluster,
 /obj/effect/gibspawner/human/bodypartless,
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/jungleplanet,
 /area/ruin/jungle/airbase/dorms)
 "lc" = (
 /obj/structure/cable{
@@ -2502,7 +2508,7 @@
 /obj/item/stack/cable_coil/cut,
 /obj/structure/spider/stickyweb,
 /obj/structure/spider/cocoon,
-/turf/open/floor/plasteel/patterned/brushed,
+/turf/open/floor/plasteel/patterned/brushed/jungleplanet,
 /area/ruin/jungle/airbase/med)
 "lI" = (
 /obj/structure/chair/bench/red/directional/west,
@@ -2518,7 +2524,7 @@
 	pixel_y = 7
 	},
 /obj/machinery/light/small/directional/north,
-/turf/open/floor/plasteel/patterned/brushed,
+/turf/open/floor/plasteel/patterned/brushed/jungleplanet,
 /area/ruin/jungle/airbase/tower)
 "lM" = (
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
@@ -2680,7 +2686,7 @@
 /obj/structure/closet/wall/directional/south,
 /obj/item/clothing/shoes/jackboots,
 /obj/item/clothing/under/syndicate,
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/jungleplanet,
 /area/ruin/jungle/airbase/dorms)
 "my" = (
 /obj/machinery/atmospherics/components/unary/portables_connector/layer2,
@@ -2709,8 +2715,10 @@
 	dir = 8
 	},
 /obj/item/chair,
-/turf/open/floor/plasteel/stairs/modern{
-	dir = 8
+/turf/open/floor/plasteel/stairs/jungleplanet{
+	icon = 'icons/obj/stairs.dmi';
+	dir = 8;
+	icon_state = "stairs_t"
 	},
 /area/ruin/jungle/airbase)
 "mC" = (
@@ -2799,7 +2807,7 @@
 /obj/effect/turf_decal/corner/transparent/bar/diagonal{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/jungleplanet,
 /area/ruin/jungle/airbase/dorms)
 "mU" = (
 /obj/structure/salvageable/airbase/cannon{
@@ -3229,14 +3237,16 @@
 	dir = 1
 	},
 /obj/structure/spider/stickyweb,
-/turf/open/floor/wood,
+/turf/open/floor/wood/jungleplanet,
 /area/ruin/jungle/airbase/dorms)
 "oz" = (
 /obj/effect/turf_decal/industrial/warning{
 	dir = 8
 	},
-/turf/open/floor/plasteel/stairs/modern{
-	dir = 8
+/turf/open/floor/plasteel/stairs/jungleplanet{
+	icon = 'icons/obj/stairs.dmi';
+	dir = 8;
+	icon_state = "stairs_t"
 	},
 /area/ruin/jungle/airbase)
 "oD" = (
@@ -3247,7 +3257,7 @@
 	pixel_x = -6
 	},
 /obj/structure/spider/cocoon,
-/turf/open/floor/wood,
+/turf/open/floor/wood/jungleplanet,
 /area/ruin/jungle/airbase/dorms)
 "oF" = (
 /obj/structure/spider/stickyweb,
@@ -3258,7 +3268,7 @@
 /turf/open/floor/plating/asteroid/dirt/grass/jungle,
 /area/overmap_encounter/planetoid/jungle/explored)
 "oG" = (
-/turf/open/floor/wood,
+/turf/open/floor/wood/jungleplanet,
 /area/ruin/jungle/airbase/dorms)
 "oI" = (
 /obj/effect/decal/cleanable/oil,
@@ -3329,7 +3339,7 @@
 	dir = 4
 	},
 /obj/structure/spider/stickyweb,
-/turf/open/floor/wood,
+/turf/open/floor/wood/jungleplanet,
 /area/ruin/jungle/airbase/dorms)
 "oZ" = (
 /obj/machinery/atmospherics/pipe/simple/green/hidden,
@@ -3450,8 +3460,8 @@
 	icon_state = "1-2"
 	},
 /obj/effect/turf_decal/industrial/warning,
-/turf/open/floor/plasteel/stairs/modern/dark{
-	dir = 2
+/turf/open/floor/plasteel/stairs/jungleplanet{
+	icon = 'icons/obj/stairs.dmi'
 	},
 /area/overmap_encounter/planetoid/jungle/explored)
 "py" = (
@@ -3466,7 +3476,7 @@
 /turf/open/floor/plasteel/dark,
 /area/ruin/jungle/airbase/hangar)
 "pE" = (
-/turf/open/floor/carpet/red,
+/turf/open/floor/carpet/red/jungleplanet,
 /area/ruin/jungle/airbase/dorms)
 "pF" = (
 /obj/machinery/modular_computer/console/preset/command{
@@ -3611,7 +3621,7 @@
 /obj/structure/spider/stickyweb,
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/machinery/light/broken/directional/east,
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/jungleplanet,
 /area/ruin/jungle/airbase/dorms)
 "qi" = (
 /obj/machinery/atmospherics/pipe/layer_manifold/visible{
@@ -3843,7 +3853,7 @@
 	pixel_y = 7;
 	pixel_x = 5
 	},
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/jungleplanet,
 /area/ruin/jungle/airbase/dorms)
 "rc" = (
 /obj/structure/spider/stickyweb,
@@ -4195,7 +4205,7 @@
 	},
 /obj/structure/spider/stickyweb,
 /obj/effect/gibspawner/human/bodypartless,
-/turf/open/floor/wood,
+/turf/open/floor/wood/jungleplanet,
 /area/ruin/jungle/airbase/dorms)
 "so" = (
 /obj/structure/platform/military,
@@ -4278,7 +4288,7 @@
 	pixel_y = 17;
 	pixel_x = -8
 	},
-/turf/open/floor/plasteel/patterned/brushed,
+/turf/open/floor/plasteel/patterned/brushed/jungleplanet,
 /area/ruin/jungle/airbase/dorms)
 "sK" = (
 /obj/effect/gibspawner/generic/animal,
@@ -4290,7 +4300,7 @@
 /obj/structure/spider/stickyweb,
 /obj/item/ammo_casing/spent/pistol_brass,
 /obj/item/ammo_casing/spent/pistol_brass,
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/jungleplanet,
 /area/ruin/jungle/airbase/dorms)
 "sM" = (
 /obj/effect/turf_decal/industrial/warning{
@@ -4376,7 +4386,7 @@
 /obj/structure/table,
 /obj/structure/spider/stickyweb,
 /obj/machinery/light/broken/directional/west,
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/jungleplanet,
 /area/ruin/jungle/airbase/dorms)
 "to" = (
 /obj/structure/table,
@@ -4386,7 +4396,7 @@
 	pixel_y = 10
 	},
 /obj/structure/door_assembly,
-/turf/open/floor/carpet/red,
+/turf/open/floor/carpet/red/jungleplanet,
 /area/ruin/jungle/airbase/dorms)
 "tq" = (
 /obj/effect/turf_decal/corner/opaque/syndiered/border{
@@ -4407,7 +4417,7 @@
 /obj/item/ammo_casing/spent/pistol_brass,
 /obj/item/ammo_casing/spent/pistol_brass,
 /obj/item/ammo_casing/spent/pistol_brass,
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/jungleplanet,
 /area/ruin/jungle/airbase/dorms)
 "tv" = (
 /obj/effect/turf_decal/techfloor{
@@ -4539,7 +4549,7 @@
 	pixel_y = 7;
 	pixel_x = -4
 	},
-/turf/open/floor/carpet/red,
+/turf/open/floor/carpet/red/jungleplanet,
 /area/ruin/jungle/airbase/dorms)
 "ub" = (
 /obj/effect/turf_decal/techfloor{
@@ -4593,6 +4603,13 @@
 	},
 /turf/open/floor/plasteel/dark,
 /area/ruin/jungle/airbase/cargo)
+"uk" = (
+/turf/open/floor/plasteel/stairs/jungleplanet{
+	icon = 'icons/obj/stairs.dmi';
+	dir = 8;
+	icon_state = "stairs_t"
+	},
+/area/overmap_encounter/planetoid/jungle/explored)
 "ul" = (
 /obj/structure/window/plasma/reinforced/plastitanium,
 /obj/structure/grille,
@@ -4611,8 +4628,10 @@
 	dir = 1
 	},
 /obj/structure/spacevine/dense,
-/turf/open/floor/plasteel/stairs/modern{
-	dir = 1
+/turf/open/floor/plasteel/stairs/jungleplanet{
+	icon = 'icons/obj/stairs.dmi';
+	dir = 1;
+	icon_state = "stairs_t"
 	},
 /area/overmap_encounter/planetoid/jungle/explored)
 "up" = (
@@ -4890,7 +4909,7 @@
 /obj/machinery/atmospherics/components/unary/passive_vent{
 	dir = 1
 	},
-/turf/open/floor/wood,
+/turf/open/floor/wood/jungleplanet,
 /area/ruin/jungle/airbase/dorms)
 "vC" = (
 /obj/structure/platform/military{
@@ -4920,7 +4939,7 @@
 "vK" = (
 /obj/structure/spider/stickyweb,
 /obj/structure/spider/cocoon,
-/turf/open/floor/carpet/red,
+/turf/open/floor/carpet/red/jungleplanet,
 /area/ruin/jungle/airbase/dorms)
 "vO" = (
 /obj/effect/turf_decal/techfloor{
@@ -4961,7 +4980,7 @@
 	pixel_y = 6;
 	pixel_x = 5
 	},
-/turf/open/floor/carpet/red,
+/turf/open/floor/carpet/red/jungleplanet,
 /area/ruin/jungle/airbase/dorms)
 "vX" = (
 /obj/structure/platform/military,
@@ -4972,8 +4991,10 @@
 	dir = 1
 	},
 /obj/structure/spacevine,
-/turf/open/floor/plasteel/stairs/modern{
-	dir = 1
+/turf/open/floor/plasteel/stairs/jungleplanet{
+	icon = 'icons/obj/stairs.dmi';
+	dir = 1;
+	icon_state = "stairs_t"
 	},
 /area/overmap_encounter/planetoid/jungle/explored)
 "wi" = (
@@ -5067,8 +5088,10 @@
 	dir = 8
 	},
 /obj/structure/spider/stickyweb,
-/turf/open/floor/plasteel/stairs/modern{
-	dir = 8
+/turf/open/floor/plasteel/stairs/jungleplanet{
+	icon = 'icons/obj/stairs.dmi';
+	dir = 8;
+	icon_state = "stairs_t"
 	},
 /area/overmap_encounter/planetoid/jungle/explored)
 "wT" = (
@@ -5157,7 +5180,7 @@
 /obj/structure/chair/stool{
 	dir = 8
 	},
-/turf/open/floor/wood,
+/turf/open/floor/wood/jungleplanet,
 /area/ruin/jungle/airbase/dorms)
 "xo" = (
 /obj/structure/table,
@@ -5335,12 +5358,12 @@
 /obj/effect/turf_decal/corner/transparent/bar/diagonal{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/jungleplanet,
 /area/ruin/jungle/airbase/dorms)
 "yh" = (
 /obj/machinery/atmospherics/components/unary/passive_vent,
 /obj/structure/reagent_dispensers/water_cooler,
-/turf/open/floor/wood,
+/turf/open/floor/wood/jungleplanet,
 /area/ruin/jungle/airbase/dorms)
 "yi" = (
 /obj/structure/railing{
@@ -5354,7 +5377,7 @@
 "yj" = (
 /obj/machinery/atmospherics/pipe/simple/green/hidden,
 /obj/structure/spider/stickyweb,
-/turf/open/floor/wood,
+/turf/open/floor/wood/jungleplanet,
 /area/ruin/jungle/airbase/dorms)
 "yl" = (
 /obj/machinery/modular_computer/console/preset/engineering,
@@ -5393,7 +5416,7 @@
 /obj/structure/chair/stool{
 	dir = 1
 	},
-/turf/open/floor/wood,
+/turf/open/floor/wood/jungleplanet,
 /area/ruin/jungle/airbase/dorms)
 "yr" = (
 /obj/effect/turf_decal/trimline/transparent/syndiered/filled/warning{
@@ -5575,7 +5598,7 @@
 /obj/effect/turf_decal/corner/transparent/bar/diagonal{
 	dir = 1
 	},
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/jungleplanet,
 /area/ruin/jungle/airbase/dorms)
 "zd" = (
 /obj/structure/railing/thin{
@@ -5678,7 +5701,7 @@
 	dir = 1
 	},
 /obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/plasteel/patterned/brushed,
+/turf/open/floor/plasteel/patterned/brushed/jungleplanet,
 /area/ruin/jungle/airbase/med)
 "zG" = (
 /obj/structure/spacevine{
@@ -5729,7 +5752,7 @@
 /area/ruin/jungle/airbase/hangar)
 "zP" = (
 /obj/structure/spider/stickyweb,
-/turf/open/floor/wood,
+/turf/open/floor/wood/jungleplanet,
 /area/ruin/jungle/airbase/dorms)
 "zQ" = (
 /obj/effect/turf_decal/corner/transparent/bar/diagonal{
@@ -5744,7 +5767,7 @@
 /obj/item/clothing/gloves/combat,
 /obj/item/clothing/mask/gas/syndicate/voicechanger,
 /obj/machinery/light/directional/east,
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/jungleplanet,
 /area/ruin/jungle/airbase/dorms)
 "zR" = (
 /obj/effect/turf_decal/siding/wood{
@@ -5757,7 +5780,7 @@
 	dir = 1
 	},
 /obj/structure/spider/stickyweb,
-/turf/open/floor/wood,
+/turf/open/floor/wood/jungleplanet,
 /area/ruin/jungle/airbase/dorms)
 "zT" = (
 /obj/structure/railing/thin{
@@ -5820,7 +5843,7 @@
 	dir = 4
 	},
 /obj/structure/spider/stickyweb,
-/turf/open/floor/wood,
+/turf/open/floor/wood/jungleplanet,
 /area/ruin/jungle/airbase/dorms)
 "Ah" = (
 /obj/structure/flora/tree/jungle/small{
@@ -6000,8 +6023,10 @@
 	dir = 4
 	},
 /obj/structure/spacevine,
-/turf/open/floor/plasteel/stairs/modern{
-	dir = 1
+/turf/open/floor/plasteel/stairs/jungleplanet{
+	icon = 'icons/obj/stairs.dmi';
+	dir = 1;
+	icon_state = "stairs_t"
 	},
 /area/overmap_encounter/planetoid/jungle/explored)
 "AV" = (
@@ -6024,8 +6049,8 @@
 /turf/closed/wall,
 /area/ruin/jungle/airbase/armory)
 "Ba" = (
-/turf/open/floor/plasteel/stairs/modern/dark{
-	dir = 2
+/turf/open/floor/plasteel/stairs/jungleplanet{
+	icon = 'icons/obj/stairs.dmi'
 	},
 /area/ruin/jungle/airbase)
 "Bb" = (
@@ -6277,14 +6302,14 @@
 	pixel_x = 12
 	},
 /obj/structure/table_frame,
-/turf/open/floor/wood,
+/turf/open/floor/wood/jungleplanet,
 /area/ruin/jungle/airbase/dorms)
 "Cp" = (
 /obj/effect/turf_decal/corner/transparent/bar/diagonal{
 	dir = 4
 	},
 /obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/jungleplanet,
 /area/ruin/jungle/airbase/dorms)
 "Cq" = (
 /obj/effect/turf_decal/corner/transparent/bar/diagonal,
@@ -6296,7 +6321,7 @@
 	pixel_x = 9
 	},
 /obj/item/ammo_casing/spent/pistol_brass,
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/jungleplanet,
 /area/ruin/jungle/airbase/dorms)
 "Cu" = (
 /obj/effect/turf_decal/borderfloorblack{
@@ -6314,7 +6339,7 @@
 	},
 /obj/structure/spider/stickyweb,
 /obj/structure/spider/cocoon,
-/turf/open/floor/wood,
+/turf/open/floor/wood/jungleplanet,
 /area/ruin/jungle/airbase/dorms)
 "CB" = (
 /obj/structure/platform/military{
@@ -6399,7 +6424,7 @@
 /mob/living/simple_animal/hostile/poison/giant_spider/nurse,
 /obj/item/ammo_casing/spent/pistol_brass,
 /obj/item/ammo_casing/spent/pistol_brass,
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/jungleplanet,
 /area/ruin/jungle/airbase/dorms)
 "CT" = (
 /obj/structure/railing,
@@ -6410,7 +6435,7 @@
 /area/ruin/jungle/airbase/engineering)
 "CU" = (
 /obj/machinery/light/small/directional/south,
-/turf/open/floor/plasteel/patterned/brushed,
+/turf/open/floor/plasteel/patterned/brushed/jungleplanet,
 /area/ruin/jungle/airbase/tower)
 "CV" = (
 /obj/structure/chair{
@@ -6535,7 +6560,7 @@
 /obj/effect/turf_decal/corner/transparent/bar/diagonal{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/jungleplanet,
 /area/ruin/jungle/airbase/dorms)
 "Ds" = (
 /obj/structure/spacevine,
@@ -6546,7 +6571,7 @@
 /obj/machinery/atmospherics/components/unary/passive_vent,
 /obj/effect/turf_decal/corner/transparent/bar/diagonal,
 /obj/structure/spider/stickyweb,
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/jungleplanet,
 /area/ruin/jungle/airbase/dorms)
 "Dx" = (
 /obj/structure/barricade/security{
@@ -6579,7 +6604,7 @@
 /area/overmap_encounter/planetoid/jungle/explored)
 "DF" = (
 /obj/structure/door_assembly,
-/turf/open/floor/wood,
+/turf/open/floor/wood/jungleplanet,
 /area/ruin/jungle/airbase/dorms)
 "DH" = (
 /obj/structure/platform/military,
@@ -6604,7 +6629,7 @@
 	},
 /obj/structure/chair,
 /obj/item/radio/intercom/directional/west,
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/jungleplanet,
 /area/ruin/jungle/airbase/dorms)
 "DK" = (
 /obj/mecha/working/ripley/firefighter{
@@ -6698,8 +6723,10 @@
 /obj/structure/railing/thin{
 	dir = 8
 	},
-/turf/open/floor/plasteel/stairs/modern{
-	dir = 1
+/turf/open/floor/plasteel/stairs/jungleplanet{
+	icon = 'icons/obj/stairs.dmi';
+	dir = 1;
+	icon_state = "stairs_t"
 	},
 /area/overmap_encounter/planetoid/jungle/explored)
 "Ed" = (
@@ -6963,6 +6990,15 @@
 /obj/structure/spider/stickyweb,
 /turf/open/floor/plating/asteroid/dirt/jungle/dark,
 /area/overmap_encounter/planetoid/jungle/explored)
+"Fj" = (
+/obj/effect/turf_decal/industrial/warning{
+	dir = 8
+	},
+/turf/open/floor/plasteel/stairs/jungleplanet{
+	icon = 'icons/obj/stairs.dmi';
+	dir = 8
+	},
+/area/overmap_encounter/planetoid/jungle/explored)
 "Fk" = (
 /obj/effect/decal/cleanable/greenglow/filled,
 /obj/effect/decal/cleanable/molten_object,
@@ -7092,7 +7128,7 @@
 /obj/item/ammo_casing/spent/pistol_brass,
 /obj/item/ammo_casing/spent/pistol_brass,
 /obj/structure/spider/eggcluster,
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/jungleplanet,
 /area/ruin/jungle/airbase/dorms)
 "FK" = (
 /obj/effect/turf_decal/techfloor{
@@ -7149,7 +7185,8 @@
 /obj/structure/railing/thin{
 	dir = 1
 	},
-/turf/open/floor/plasteel/stairs/modern/dark{
+/turf/open/floor/plasteel/stairs/jungleplanet{
+	icon = 'icons/obj/stairs.dmi';
 	dir = 4
 	},
 /area/overmap_encounter/planetoid/jungle/explored)
@@ -7296,7 +7333,7 @@
 "Gv" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/structure/spider/stickyweb,
-/turf/open/floor/plasteel/patterned/brushed,
+/turf/open/floor/plasteel/patterned/brushed/jungleplanet,
 /area/ruin/jungle/airbase/dorms)
 "Gw" = (
 /obj/effect/turf_decal/trimline/opaque/syndiered/end,
@@ -7333,7 +7370,7 @@
 	},
 /obj/structure/spider/stickyweb,
 /obj/machinery/light/broken/directional/east,
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/jungleplanet,
 /area/ruin/jungle/airbase/dorms)
 "GD" = (
 /obj/structure/platform/military/corner{
@@ -7408,8 +7445,10 @@
 /obj/structure/railing/thin{
 	dir = 4
 	},
-/turf/open/floor/plasteel/stairs/modern{
-	dir = 1
+/turf/open/floor/plasteel/stairs/jungleplanet{
+	icon = 'icons/obj/stairs.dmi';
+	dir = 1;
+	icon_state = "stairs_t"
 	},
 /area/overmap_encounter/planetoid/jungle/explored)
 "GY" = (
@@ -7453,7 +7492,7 @@
 /obj/machinery/light/broken/directional/east,
 /obj/item/ammo_casing/spent/pistol_brass,
 /obj/item/ammo_casing/spent/pistol_brass,
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/jungleplanet,
 /area/ruin/jungle/airbase/dorms)
 "Hh" = (
 /obj/structure/spider/stickyweb,
@@ -7474,7 +7513,7 @@
 /obj/effect/turf_decal/corner/transparent/bar/diagonal,
 /obj/effect/decal/cleanable/cobweb,
 /obj/structure/spider/stickyweb,
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/jungleplanet,
 /area/ruin/jungle/airbase/dorms)
 "Hn" = (
 /obj/structure/platform/military/corner{
@@ -7578,7 +7617,7 @@
 /obj/item/towel,
 /obj/item/towel,
 /obj/item/towel,
-/turf/open/floor/plasteel/patterned/brushed,
+/turf/open/floor/plasteel/patterned/brushed/jungleplanet,
 /area/ruin/jungle/airbase/tower)
 "HE" = (
 /obj/effect/turf_decal/techfloor{
@@ -7778,7 +7817,7 @@
 /mob/living/simple_animal/hostile/poison/giant_spider/nurse,
 /obj/structure/spider/stickyweb,
 /obj/machinery/light/broken/directional/west,
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/jungleplanet,
 /area/ruin/jungle/airbase/dorms)
 "ID" = (
 /obj/effect/turf_decal/road,
@@ -7859,7 +7898,7 @@
 	dir = 1
 	},
 /obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/jungleplanet,
 /area/ruin/jungle/airbase/dorms)
 "IZ" = (
 /obj/effect/turf_decal/trimline/opaque/syndiered/warning{
@@ -8018,7 +8057,7 @@
 	},
 /obj/structure/chair,
 /obj/structure/spider/stickyweb,
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/jungleplanet,
 /area/ruin/jungle/airbase/dorms)
 "JA" = (
 /obj/machinery/door/airlock/external{
@@ -8068,7 +8107,7 @@
 /obj/machinery/atmospherics/pipe/simple/green/hidden,
 /obj/effect/turf_decal/corner/transparent/bar/diagonal,
 /obj/structure/spider/stickyweb,
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/jungleplanet,
 /area/ruin/jungle/airbase/dorms)
 "JG" = (
 /obj/effect/turf_decal/borderfloorblack{
@@ -8085,7 +8124,7 @@
 "JH" = (
 /obj/structure/spider/stickyweb,
 /mob/living/simple_animal/hostile/poison/giant_spider/nurse/midwife,
-/turf/open/floor/carpet/red,
+/turf/open/floor/carpet/red/jungleplanet,
 /area/ruin/jungle/airbase/dorms)
 "JJ" = (
 /obj/structure/spider/stickyweb,
@@ -8106,7 +8145,7 @@
 /area/overmap_encounter/planetoid/jungle/explored)
 "JL" = (
 /obj/structure/table,
-/turf/open/floor/carpet/red,
+/turf/open/floor/carpet/red/jungleplanet,
 /area/ruin/jungle/airbase/dorms)
 "JN" = (
 /obj/effect/turf_decal/road{
@@ -8142,7 +8181,7 @@
 	},
 /obj/structure/spider/stickyweb,
 /mob/living/simple_animal/hostile/poison/giant_spider/nurse/midwife,
-/turf/open/floor/wood,
+/turf/open/floor/wood/jungleplanet,
 /area/ruin/jungle/airbase/dorms)
 "JW" = (
 /obj/item/food/spidereggs{
@@ -8193,7 +8232,7 @@
 "Kf" = (
 /obj/structure/spider/stickyweb,
 /obj/structure/table_frame,
-/turf/open/floor/wood,
+/turf/open/floor/wood/jungleplanet,
 /area/ruin/jungle/airbase/dorms)
 "Kg" = (
 /obj/structure/cable{
@@ -8533,6 +8572,15 @@
 /obj/item/pen/blue,
 /turf/open/floor/plasteel/mono/dark,
 /area/ruin/jungle/airbase/tower)
+"Lw" = (
+/obj/effect/turf_decal/industrial/warning{
+	dir = 4
+	},
+/turf/open/floor/plasteel/stairs/jungleplanet{
+	icon = 'icons/obj/stairs.dmi';
+	dir = 4
+	},
+/area/overmap_encounter/planetoid/jungle/explored)
 "Ly" = (
 /obj/structure/table,
 /turf/open/floor/plasteel/dark,
@@ -8803,7 +8851,7 @@
 	},
 /obj/item/ammo_casing/spent/pistol_brass,
 /obj/item/ammo_casing/spent/pistol_brass,
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/jungleplanet,
 /area/ruin/jungle/airbase/dorms)
 "MF" = (
 /obj/machinery/computer/operating,
@@ -9018,7 +9066,7 @@
 	dir = 1
 	},
 /obj/structure/spider/stickyweb,
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/jungleplanet,
 /area/ruin/jungle/airbase/dorms)
 "ND" = (
 /obj/effect/turf_decal/syndicateemblem/top/middle{
@@ -9117,7 +9165,7 @@
 /mob/living/simple_animal/hostile/poison/giant_spider/nurse,
 /obj/structure/spider/stickyweb,
 /obj/item/radio/intercom/directional/east,
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/jungleplanet,
 /area/ruin/jungle/airbase/dorms)
 "NW" = (
 /obj/structure/spacevine,
@@ -9131,7 +9179,7 @@
 	},
 /obj/structure/spider/stickyweb,
 /obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/jungleplanet,
 /area/ruin/jungle/airbase/dorms)
 "NZ" = (
 /mob/living/simple_animal/hostile/human/ramzi/ranged{
@@ -9209,6 +9257,16 @@
 /obj/structure/spacevine,
 /turf/open/floor/concrete/reinforced/jungleplanet/lit,
 /area/overmap_encounter/planetoid/jungle/explored)
+"OI" = (
+/obj/effect/turf_decal/industrial/warning{
+	dir = 4
+	},
+/obj/structure/railing/thin,
+/turf/open/floor/plasteel/stairs/jungleplanet{
+	icon = 'icons/obj/stairs.dmi';
+	dir = 4
+	},
+/area/overmap_encounter/planetoid/jungle/explored)
 "OL" = (
 /obj/structure/platform/military{
 	dir = 9
@@ -9498,7 +9556,7 @@
 	},
 /obj/structure/dresser,
 /obj/structure/spider/stickyweb,
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/jungleplanet,
 /area/ruin/jungle/airbase/dorms)
 "PU" = (
 /obj/structure/chair/office/light,
@@ -9933,7 +9991,7 @@
 	dir = 1
 	},
 /obj/structure/spider/stickyweb,
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/jungleplanet,
 /area/ruin/jungle/airbase/dorms)
 "RU" = (
 /obj/structure/spacevine,
@@ -10077,7 +10135,7 @@
 /obj/effect/turf_decal/corner/transparent/bar/diagonal,
 /obj/structure/spider/stickyweb,
 /obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/jungleplanet,
 /area/ruin/jungle/airbase/dorms)
 "Sz" = (
 /obj/structure/flora/grass/jungle,
@@ -10104,8 +10162,8 @@
 	dir = 4
 	},
 /obj/structure/spacevine,
-/turf/open/floor/plasteel/stairs/modern/dark{
-	dir = 2
+/turf/open/floor/plasteel/stairs/jungleplanet{
+	icon = 'icons/obj/stairs.dmi'
 	},
 /area/overmap_encounter/planetoid/jungle/explored)
 "SG" = (
@@ -10153,7 +10211,7 @@
 	pixel_y = 13;
 	pixel_x = 9
 	},
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/jungleplanet,
 /area/ruin/jungle/airbase/dorms)
 "SS" = (
 /obj/effect/turf_decal/rechargefloor,
@@ -10220,7 +10278,7 @@
 /obj/structure/dresser,
 /obj/structure/spider/stickyweb,
 /obj/structure/spider/cocoon,
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/jungleplanet,
 /area/ruin/jungle/airbase/dorms)
 "Tl" = (
 /obj/structure/spider/stickyweb,
@@ -10442,7 +10500,8 @@
 	dir = 1
 	},
 /obj/structure/railing/thin,
-/turf/open/floor/plasteel/stairs/modern/dark{
+/turf/open/floor/plasteel/stairs/jungleplanet{
+	icon = 'icons/obj/stairs.dmi';
 	dir = 8
 	},
 /area/overmap_encounter/planetoid/jungle/explored)
@@ -10498,8 +10557,8 @@
 /area/overmap_encounter/planetoid/jungle/explored)
 "Ur" = (
 /obj/effect/turf_decal/industrial/warning,
-/turf/open/floor/plasteel/stairs/modern/dark{
-	dir = 2
+/turf/open/floor/plasteel/stairs/jungleplanet{
+	icon = 'icons/obj/stairs.dmi'
 	},
 /area/overmap_encounter/planetoid/jungle/explored)
 "Ux" = (
@@ -10535,7 +10594,7 @@
 	pixel_y = 17;
 	pixel_x = -9
 	},
-/turf/open/floor/plasteel/patterned/brushed,
+/turf/open/floor/plasteel/patterned/brushed/jungleplanet,
 /area/ruin/jungle/airbase/dorms)
 "UE" = (
 /obj/structure/cable{
@@ -10558,7 +10617,7 @@
 	name = "blood-red curtains"
 	},
 /obj/machinery/light/small/directional/east,
-/turf/open/floor/carpet/red,
+/turf/open/floor/carpet/red/jungleplanet,
 /area/ruin/jungle/airbase/tower)
 "UK" = (
 /obj/effect/turf_decal/corner/transparent/bar/diagonal{
@@ -10566,7 +10625,7 @@
 	},
 /obj/structure/dresser,
 /obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/jungleplanet,
 /area/ruin/jungle/airbase/dorms)
 "UN" = (
 /obj/structure/spider/stickyweb,
@@ -10672,7 +10731,7 @@
 	pixel_x = 9
 	},
 /obj/machinery/light/directional/west,
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/jungleplanet,
 /area/ruin/jungle/airbase/dorms)
 "Vm" = (
 /obj/structure/table,
@@ -10784,7 +10843,7 @@
 "VA" = (
 /obj/effect/turf_decal/corner/transparent/bar/diagonal,
 /obj/structure/spider/stickyweb,
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/jungleplanet,
 /area/ruin/jungle/airbase/dorms)
 "VB" = (
 /obj/structure/window/plasma/reinforced/plastitanium,
@@ -10856,7 +10915,7 @@
 	},
 /obj/structure/spider/stickyweb,
 /mob/living/simple_animal/hostile/poison/giant_spider,
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/jungleplanet,
 /area/ruin/jungle/airbase/dorms)
 "VW" = (
 /obj/structure/barricade/sandbags,
@@ -10895,7 +10954,7 @@
 	pixel_y = 15
 	},
 /obj/structure/spider/stickyweb,
-/turf/open/floor/carpet/red,
+/turf/open/floor/carpet/red/jungleplanet,
 /area/ruin/jungle/airbase/dorms)
 "Wd" = (
 /obj/structure/chair/stool{
@@ -10903,7 +10962,7 @@
 	},
 /obj/structure/spider/stickyweb,
 /obj/effect/gibspawner/human/bodypartless,
-/turf/open/floor/wood,
+/turf/open/floor/wood/jungleplanet,
 /area/ruin/jungle/airbase/dorms)
 "Wf" = (
 /obj/effect/turf_decal/trimline/transparent/syndiered/filled/warning{
@@ -10940,7 +10999,7 @@
 /obj/structure/spider/cocoon,
 /obj/structure/spider/stickyweb,
 /obj/item/gun/ballistic/automatic/pistol/ringneck/no_mag,
-/turf/open/floor/plasteel/patterned/brushed,
+/turf/open/floor/plasteel/patterned/brushed/jungleplanet,
 /area/ruin/jungle/airbase/dorms)
 "Wp" = (
 /obj/effect/turf_decal/techfloor,
@@ -10961,7 +11020,7 @@
 	dir = 1
 	},
 /obj/structure/spider/stickyweb,
-/turf/open/floor/plasteel/patterned/brushed,
+/turf/open/floor/plasteel/patterned/brushed/jungleplanet,
 /area/ruin/jungle/airbase/med)
 "Wt" = (
 /obj/structure/catwalk/over/plated_catwalk/dark,
@@ -10986,7 +11045,7 @@
 /obj/structure/chair/stool{
 	dir = 1
 	},
-/turf/open/floor/wood,
+/turf/open/floor/wood/jungleplanet,
 /area/ruin/jungle/airbase/dorms)
 "Wx" = (
 /turf/closed/wall,
@@ -11015,8 +11074,8 @@
 /obj/structure/spacevine{
 	pixel_x = -32
 	},
-/turf/open/floor/plasteel/stairs/modern/dark{
-	dir = 2
+/turf/open/floor/plasteel/stairs/jungleplanet{
+	icon = 'icons/obj/stairs.dmi'
 	},
 /area/overmap_encounter/planetoid/jungle/explored)
 "WF" = (
@@ -11060,7 +11119,7 @@
 "WR" = (
 /obj/structure/table,
 /obj/structure/spider/stickyweb,
-/turf/open/floor/wood,
+/turf/open/floor/wood/jungleplanet,
 /area/ruin/jungle/airbase/dorms)
 "WT" = (
 /turf/open/floor/plasteel/tech,
@@ -11175,7 +11234,7 @@
 /area/ruin/jungle/airbase/hangar)
 "Xw" = (
 /obj/structure/spider/stickyweb,
-/turf/open/floor/carpet/red,
+/turf/open/floor/carpet/red/jungleplanet,
 /area/ruin/jungle/airbase/dorms)
 "Xy" = (
 /obj/effect/turf_decal/road{
@@ -11241,7 +11300,7 @@
 /obj/effect/turf_decal/corner/transparent/bar/diagonal{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/jungleplanet,
 /area/ruin/jungle/airbase/dorms)
 "XR" = (
 /obj/structure/spider/stickyweb,
@@ -11420,7 +11479,7 @@
 "YD" = (
 /obj/structure/spider/stickyweb,
 /obj/effect/gibspawner/human/bodypartless,
-/turf/open/floor/carpet/red,
+/turf/open/floor/carpet/red/jungleplanet,
 /area/ruin/jungle/airbase/dorms)
 "YE" = (
 /obj/structure/platform/military{
@@ -11567,7 +11626,7 @@
 "Zm" = (
 /obj/structure/table,
 /obj/structure/spider/stickyweb,
-/turf/open/floor/carpet/red,
+/turf/open/floor/carpet/red/jungleplanet,
 /area/ruin/jungle/airbase/dorms)
 "Zo" = (
 /obj/structure/spider/stickyweb,
@@ -11623,7 +11682,7 @@
 	dir = 4;
 	name = "Restroom"
 	},
-/turf/open/floor/plasteel/patterned/brushed,
+/turf/open/floor/plasteel/patterned/brushed/jungleplanet,
 /area/ruin/jungle/airbase/dorms)
 "ZA" = (
 /obj/structure/table,
@@ -11714,7 +11773,7 @@
 	pixel_y = 18
 	},
 /obj/structure/curtain/bounty,
-/turf/open/floor/plasteel/patterned/brushed,
+/turf/open/floor/plasteel/patterned/brushed/jungleplanet,
 /area/ruin/jungle/airbase/tower)
 "ZN" = (
 /obj/effect/turf_decal/corner/opaque/syndiered/border{
@@ -13895,7 +13954,7 @@ lo
 bw
 bw
 bw
-SM
+Lw
 pZ
 GR
 Yq
@@ -13951,7 +14010,7 @@ EH
 dJ
 OY
 FW
-TQ
+OI
 os
 ZS
 Jk
@@ -14961,7 +15020,7 @@ xC
 bw
 bw
 bw
-mj
+Fj
 xq
 lP
 lP
@@ -15467,8 +15526,8 @@ PQ
 PQ
 dp
 Ms
-Ni
-Ni
+uk
+uk
 Wy
 qC
 VF
@@ -18351,7 +18410,7 @@ AX
 AX
 AX
 AX
-SM
+Lw
 os
 ZS
 Jk
diff --git a/_maps/RandomRuins/JungleRuins/jungle_cavecrew.dmm b/_maps/RandomRuins/JungleRuins/jungle_cavecrew.dmm
index 534fcdd337..6ab13da026 100644
--- a/_maps/RandomRuins/JungleRuins/jungle_cavecrew.dmm
+++ b/_maps/RandomRuins/JungleRuins/jungle_cavecrew.dmm
@@ -2568,10 +2568,6 @@
 /turf/open/floor/plating,
 /area/ruin/jungle/cavecrew/ship)
 "IZ" = (
-/obj/item/reagent_containers/syringe/contraband/fentanyl{
-	pixel_x = -3;
-	pixel_y = 4
-	},
 /obj/item/reagent_containers/syringe/contraband/methamphetamine,
 /obj/item/reagent_containers/food/drinks/beer{
 	pixel_x = -4
@@ -2590,6 +2586,10 @@
 	pixel_y = 11;
 	pixel_x = 5
 	},
+/obj/item/reagent_containers/syringe/contraband/morphine{
+	pixel_y = 4;
+	pixel_x = -4
+	},
 /turf/open/floor/wood{
 	icon_state = "wood-broken2"
 	},
diff --git a/_maps/RandomRuins/JungleRuins/jungle_paradise.dmm b/_maps/RandomRuins/JungleRuins/jungle_paradise.dmm
index c075d11c60..9015669308 100644
--- a/_maps/RandomRuins/JungleRuins/jungle_paradise.dmm
+++ b/_maps/RandomRuins/JungleRuins/jungle_paradise.dmm
@@ -4452,7 +4452,7 @@
 /area/overmap_encounter/planetoid/cave/explored)
 "FM" = (
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/item/reagent_containers/syringe/oxandrolone{
+/obj/item/reagent_containers/syringe/ysiltane{
 	pixel_x = 5;
 	pixel_y = -7
 	},
diff --git a/_maps/RandomRuins/RockRuins/rockplanet_distillery.dmm b/_maps/RandomRuins/RockRuins/rockplanet_distillery.dmm
index 5c7b593bd6..647feae1d8 100644
--- a/_maps/RandomRuins/RockRuins/rockplanet_distillery.dmm
+++ b/_maps/RandomRuins/RockRuins/rockplanet_distillery.dmm
@@ -1207,11 +1207,11 @@
 /obj/effect/turf_decal/industrial/outline/red,
 /obj/structure/closet/crate/medical,
 /obj/item/storage/firstaid/regular,
-/obj/item/reagent_containers/glass/bottle/bicaridine{
+/obj/item/reagent_containers/glass/bottle/indomide{
 	pixel_x = -6
 	},
 /obj/item/reagent_containers/syringe,
-/obj/item/reagent_containers/glass/bottle/bicaridine{
+/obj/item/reagent_containers/glass/bottle/indomide{
 	pixel_x = 6
 	},
 /turf/open/floor/plasteel/patterned/brushed/rockplanet,
diff --git a/_maps/RandomRuins/RockRuins/rockplanet_rustbase.dmm b/_maps/RandomRuins/RockRuins/rockplanet_rustbase.dmm
index 56551d0877..0fa0c5a2e1 100644
--- a/_maps/RandomRuins/RockRuins/rockplanet_rustbase.dmm
+++ b/_maps/RandomRuins/RockRuins/rockplanet_rustbase.dmm
@@ -485,7 +485,7 @@
 	pixel_x = 6;
 	pixel_y = 2
 	},
-/obj/item/reagent_containers/hypospray/medipen/stimulants{
+/obj/item/reagent_containers/hypospray/medipen/stimpack/crisis{
 	pixel_x = 10;
 	pixel_y = 7
 	},
diff --git a/_maps/RandomRuins/SandRuins/whitesands_surface_e11_manufactory.dmm b/_maps/RandomRuins/SandRuins/whitesands_surface_e11_manufactory.dmm
index 040b457121..43f3d72fc1 100644
--- a/_maps/RandomRuins/SandRuins/whitesands_surface_e11_manufactory.dmm
+++ b/_maps/RandomRuins/SandRuins/whitesands_surface_e11_manufactory.dmm
@@ -497,9 +497,7 @@
 /obj/structure/sign/poster/official/work_for_a_future{
 	pixel_y = 32
 	},
-/mob/living/simple_animal/hostile/human/hermit/ranged/e11{
-	faction = list("eoehoma")
-	},
+/mob/living/simple_animal/hostile/human/hermit/ranged/e11,
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
 	dir = 8
 	},
@@ -832,9 +830,7 @@
 /area/ruin/whitesands/e11manufactory/warehouse)
 "hf" = (
 /obj/effect/decal/cleanable/dirt/dust,
-/mob/living/simple_animal/hostile/human/hermit/ranged/e11{
-	faction = list("eoehoma")
-	},
+/mob/living/simple_animal/hostile/human/hermit/ranged/e11,
 /turf/open/floor/concrete/whitesands/lit,
 /area/overmap_encounter/planetoid/sand/explored)
 "hi" = (
@@ -870,9 +866,7 @@
 /turf/open/floor/carpet/nanoweave/beige,
 /area/ruin/whitesands/e11manufactory/office)
 "hp" = (
-/mob/living/simple_animal/hostile/human/hermit/ranged/e11{
-	faction = list("eoehoma")
-	},
+/mob/living/simple_animal/hostile/human/hermit/ranged/e11,
 /turf/open/floor/plasteel/mono,
 /area/ruin/whitesands/e11manufactory/warehouse)
 "hq" = (
@@ -974,9 +968,7 @@
 /obj/structure/chair/office{
 	dir = 4
 	},
-/mob/living/simple_animal/hostile/human/hermit/ranged/e11{
-	faction = list("eoehoma")
-	},
+/mob/living/simple_animal/hostile/human/hermit/ranged/e11,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/carpet/nanoweave/beige,
 /area/ruin/whitesands/e11manufactory/office)
@@ -1894,9 +1886,7 @@
 /turf/open/floor/concrete/reinforced/whitesands/lit,
 /area/overmap_encounter/planetoid/sand/explored)
 "pd" = (
-/mob/living/simple_animal/hostile/human/hermit/ranged/e11{
-	faction = list("eoehoma")
-	},
+/mob/living/simple_animal/hostile/human/hermit/ranged/e11,
 /obj/structure/fluff/paper/stack,
 /obj/structure/fluff/paper/stack{
 	dir = 1
@@ -2089,9 +2079,7 @@
 /turf/open/floor/plasteel/tech/grid,
 /area/ruin/whitesands/e11manufactory/office)
 "qY" = (
-/mob/living/simple_animal/hostile/human/hermit/ranged/hunter{
-	faction = list("eoehoma")
-	},
+/mob/living/simple_animal/hostile/human/hermit/ranged/hunter,
 /turf/open/floor/concrete/pavement/whitesands/lit,
 /area/overmap_encounter/planetoid/sand/explored)
 "rb" = (
@@ -3265,9 +3253,7 @@
 /turf/open/floor/plating/asteroid/whitesands/lit,
 /area/overmap_encounter/planetoid/sand/explored)
 "BE" = (
-/mob/living/simple_animal/hostile/human/hermit/ranged/e11{
-	faction = list("eoehoma")
-	},
+/mob/living/simple_animal/hostile/human/hermit/ranged/e11,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
 	},
@@ -4055,9 +4041,7 @@
 /obj/structure/cable/orange{
 	icon_state = "4-8"
 	},
-/mob/living/simple_animal/hostile/human/hermit/ranged/e11{
-	faction = list("eoehoma")
-	},
+/mob/living/simple_animal/hostile/human/hermit/ranged/e11,
 /turf/open/floor/concrete/whitesands/lit,
 /area/overmap_encounter/planetoid/sand/explored)
 "IF" = (
@@ -4189,9 +4173,7 @@
 /turf/open/floor/plasteel/dark,
 /area/ruin/whitesands/e11manufactory/barracks)
 "JY" = (
-/mob/living/simple_animal/hostile/human/hermit/ranged/e11{
-	faction = list("eoehoma")
-	},
+/mob/living/simple_animal/hostile/human/hermit/ranged/e11,
 /obj/machinery/light/small/directional/south,
 /turf/open/floor/plasteel/mono,
 /area/ruin/whitesands/e11manufactory/barracks)
@@ -4502,9 +4484,7 @@
 /obj/effect/turf_decal/corner/opaque/red/diagonal{
 	dir = 4
 	},
-/mob/living/simple_animal/hostile/human/hermit/ranged/e11{
-	faction = list("eoehoma")
-	},
+/mob/living/simple_animal/hostile/human/hermit/ranged/e11,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
 	},
@@ -4597,9 +4577,7 @@
 /area/overmap_encounter/planetoid/sand/explored)
 "Na" = (
 /obj/effect/turf_decal/corner/opaque/red/diagonal,
-/mob/living/simple_animal/hostile/human/hermit/ranged/e11{
-	faction = list("eoehoma")
-	},
+/mob/living/simple_animal/hostile/human/hermit/ranged/e11,
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
 /obj/structure/sign/poster/official/bless_this_spess{
 	pixel_y = 32
@@ -4859,9 +4837,7 @@
 /obj/structure/chair{
 	dir = 8
 	},
-/mob/living/simple_animal/hostile/human/hermit/survivor{
-	faction = list("eoehoma")
-	},
+/mob/living/simple_animal/hostile/human/hermit/survivor,
 /turf/open/floor/carpet,
 /area/ruin/whitesands/e11manufactory/barracks)
 "Po" = (
@@ -5582,9 +5558,7 @@
 /turf/open/floor/concrete/reinforced/whitesands/lit,
 /area/overmap_encounter/planetoid/sand/explored)
 "Vd" = (
-/mob/living/simple_animal/hostile/human/hermit/ranged/gunslinger{
-	faction = list("eoehoma")
-	},
+/mob/living/simple_animal/hostile/human/hermit/ranged/gunslinger,
 /obj/structure/cable/orange{
 	icon_state = "4-8"
 	},
@@ -5775,9 +5749,7 @@
 /turf/open/floor/carpet/nanoweave/red,
 /area/ruin/whitesands/e11manufactory/security)
 "WX" = (
-/mob/living/simple_animal/hostile/human/hermit/ranged/e11{
-	faction = list("eoehoma")
-	},
+/mob/living/simple_animal/hostile/human/hermit/ranged/e11,
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/concrete/whitesands/lit,
 /area/overmap_encounter/planetoid/sand/explored)
diff --git a/_maps/RandomRuins/SpaceRuins/scrapstation.dmm b/_maps/RandomRuins/SpaceRuins/scrapstation.dmm
index ac2d7a35f2..64c5f41d02 100644
--- a/_maps/RandomRuins/SpaceRuins/scrapstation.dmm
+++ b/_maps/RandomRuins/SpaceRuins/scrapstation.dmm
@@ -7286,7 +7286,7 @@
 /obj/structure/railing{
 	dir = 1
 	},
-/obj/item/storage/toolbox/ammo/c75,
+/obj/item/storage/toolbox/ammo/c65,
 /turf/open/floor/plating/airless,
 /area/ruin/space/has_grav/powered/ramzi_station/solars)
 "Oz" = (
diff --git a/_maps/RandomRuins/SpaceRuins/spacemall.dmm b/_maps/RandomRuins/SpaceRuins/spacemall.dmm
index 1ec27f8237..af5c71eb98 100644
--- a/_maps/RandomRuins/SpaceRuins/spacemall.dmm
+++ b/_maps/RandomRuins/SpaceRuins/spacemall.dmm
@@ -9910,7 +9910,6 @@
 /obj/effect/turf_decal/road/line/transparent/solgovblue,
 /obj/effect/turf_decal/corner/transparent/black/diagonal,
 /obj/structure/rack,
-/obj/item/hot_potato/harmless/toy,
 /obj/item/toy/talking/AI,
 /turf/open/floor/plasteel,
 /area/ruin/space/has_grav/spacemall/shop2)
diff --git a/_maps/RandomRuins/SpaceRuins/vi_deepstorage.dmm b/_maps/RandomRuins/SpaceRuins/vi_deepstorage.dmm
index 0e452c4b55..bf7f8e20ee 100644
--- a/_maps/RandomRuins/SpaceRuins/vi_deepstorage.dmm
+++ b/_maps/RandomRuins/SpaceRuins/vi_deepstorage.dmm
@@ -6839,8 +6839,8 @@
 /obj/item/reagent_containers/hypospray/medipen/rabbit,
 /obj/item/reagent_containers/hypospray/medipen/survival,
 /obj/item/reagent_containers/hypospray/medipen/survival,
-/obj/item/reagent_containers/hypospray/medipen/tricord,
-/obj/item/reagent_containers/hypospray/medipen/tricord,
+/obj/item/reagent_containers/hypospray/medipen/cureall,
+/obj/item/reagent_containers/hypospray/medipen/cureall,
 /obj/item/reagent_containers/hypospray/medipen/bonefixingjuice,
 /obj/item/reagent_containers/hypospray/medipen/bonefixingjuice,
 /obj/item/reagent_containers/hypospray/medipen/morphine,
diff --git a/_maps/RandomRuins/WasteRuins/wasteplanet_facility.dmm b/_maps/RandomRuins/WasteRuins/wasteplanet_facility.dmm
index f93f529b54..cda339a49e 100644
--- a/_maps/RandomRuins/WasteRuins/wasteplanet_facility.dmm
+++ b/_maps/RandomRuins/WasteRuins/wasteplanet_facility.dmm
@@ -285,10 +285,7 @@
 	pixel_y = 2;
 	pixel_x = 8
 	},
-/obj/item/reagent_containers/glass/bottle/antitoxin{
-	pixel_x = -4;
-	pixel_y = 2
-	},
+/obj/item/reagent_containers/glass/bottle/charcoal,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
 	dir = 9
 	},
diff --git a/_maps/configs/inteq_colossus.json b/_maps/configs/inteq_colossus.json
index 6b91b7ad23..f68eeebbbd 100644
--- a/_maps/configs/inteq_colossus.json
+++ b/_maps/configs/inteq_colossus.json
@@ -55,6 +55,8 @@
 	"enabled": true,
 	"space_spawn": false,
 
+	"token_icon_state": "ship_carrier",
+
 	"architect": "Apogee-dev",
 	"contributors": [
 		"moffball19 - Refit"
diff --git a/_maps/configs/minutemen_atlas.json b/_maps/configs/minutemen_atlas.json
index 4fbd8018ca..8c82e59180 100644
--- a/_maps/configs/minutemen_atlas.json
+++ b/_maps/configs/minutemen_atlas.json
@@ -22,27 +22,31 @@
 			"officer": true,
 			"slots": 1
 		},
-		"First Officer": {
-			"outfit": "/datum/outfit/job/clip/first_officer",
+		"Bridge Officer": {
+			"outfit": "/datum/outfit/job/clip/minutemen/bridge_officer",
 			"officer": true,
 			"slots": 1
 		},
-		"Sergeant": {
+		"Team Sergeant": {
 			"outfit": "/datum/outfit/job/clip/minutemen/grunt/lead",
 			"officer": true,
 			"slots": 1
 		},
-		"Corpsman": {
-			"outfit": "/datum/outfit/job/clip/minutemen/doctor",
+		"Combat Medic": {
+			"outfit": "/datum/outfit/job/clip/minutemen/grunt/medic",
 			"slots": 1
 		},
-		"Engineer": {
+		"Naval Engineer": {
 			"outfit": "/datum/outfit/job/clip/minutemen/engineer",
 			"slots": 1
 		},
 		"Minuteman": {
 			"outfit": "/datum/outfit/job/clip/minutemen/grunt",
-			"slots": 4
+			"slots": 2
+		},
+		"Military Correspondent": {
+			"outfit": "/datum/outfit/job/clip/correspondent",
+			"slots": 1
 		},
 		"Reservist": {
 			"outfit": "/datum/outfit/job/clip/minutemen/grunt/reserve",
diff --git a/_maps/configs/nanotrasen_shrike.json b/_maps/configs/nanotrasen_shrike.json
new file mode 100644
index 0000000000..4a07f7bbc7
--- /dev/null
+++ b/_maps/configs/nanotrasen_shrike.json
@@ -0,0 +1,47 @@
+{
+	"$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
+	"prefix": "VISV",
+	"manufacturer": "Nanotrasen Spaceworks",
+	"map_name": "Shrike-class Fast Response Vessel",
+	"faction": "/datum/faction/nt/vigilitas",
+	"namelists": [
+		"NANOTRASEN",
+		"NATURAL_AGGRESSIVE",
+		"WEAPONS"
+	],
+	"map_short_name": "Shrike-class",
+	"description": "A new class of vessel fresh from Nanotrasen Shipworks, the Shrike-class is purpose-built for Vigilitas Interstellar's Fast Response Teams. The hull is considered under-armed by most people, which is an acceptable trade for Vigilitas as it narrowly circumvents several Core World treaties on militarized private assets, reducing the legal overhead of manufacturing. The small size also allows rapid deployment into conflict areas. The designs strengths have lead to its quick adoption by Vigilitas for both Core and Frontier operations.",
+	"tags": [
+		"Combat",
+		"RP Focus"
+	],
+	"starting_funds": 3000,
+	"map_path": "_maps/shuttles/nanotrasen/nanotrasen_shrike.dmm",
+	"token_icon_state": "ship_generic",
+	"limit": 1,
+	"job_slots": {
+		"Security Director": {
+			"outfit": "/datum/outfit/job/nanotrasen/captain/vi",
+			"officer": true,
+			"slots": 1
+		},
+		"Sergeant": {
+			"outfit": "/datum/outfit/job/nanotrasen/hos/vi",
+			"officer": true,
+			"slots": 1
+		},
+		"Vigilitas Officer": {
+			"outfit": "/datum/outfit/job/nanotrasen/security/vi",
+			"slots": 2
+		},
+		"Mechanic": {
+			"outfit": "/datum/outfit/job/nanotrasen/engineer",
+			"slots": 1
+		},
+		"Deckhand": {
+			"outfit": "/datum/outfit/job/nanotrasen/assistant",
+			"slots": 1
+		}
+	},
+	"enabled": true
+}
diff --git a/_maps/configs/pgf_woeful_cthonian.json b/_maps/configs/pgf_woeful_cthonian.json
index c8488252e3..e4a8d92727 100644
--- a/_maps/configs/pgf_woeful_cthonian.json
+++ b/_maps/configs/pgf_woeful_cthonian.json
@@ -36,7 +36,7 @@
 		},
 		"Crewman": {
 			"outfit": "/datum/outfit/job/gezena/assistant",
-			"slots": 3
+			"slots": 2
 		}
 	},
 	"limit": 1,
diff --git a/_maps/configs/pirate_tortuga.json b/_maps/configs/pirate_tortuga.json
index 14c5c53eb8..d9735f12e3 100644
--- a/_maps/configs/pirate_tortuga.json
+++ b/_maps/configs/pirate_tortuga.json
@@ -26,6 +26,11 @@
 			"officer": true,
 			"slots": 1
 		},
+		"Helmsman": {
+			"outfit": "/datum/outfit/job/frontiersmen/hop",
+			"officer": true,
+			"slots": 1
+		},
 		"Surgeon": {
 			"outfit": "/datum/outfit/job/frontiersmen/doctor",
 			"slots": 1
diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm
index d5b13fb9e9..4ab7449fc5 100644
--- a/_maps/map_files/generic/CentCom.dmm
+++ b/_maps/map_files/generic/CentCom.dmm
@@ -627,7 +627,7 @@
 /turf/open/floor/plating/abductor,
 /area/abductor_ship)
 "alE" = (
-/obj/structure/table/optable/abductor,
+/obj/structure/table/optable,
 /turf/open/floor/plating/abductor,
 /area/abductor_ship)
 "alF" = (
@@ -18594,7 +18594,7 @@ aaa
 akq
 aJB
 ali
-alE
+ali
 ali
 amu
 and
@@ -18621,7 +18621,7 @@ aaa
 akq
 akN
 ali
-alE
+ali
 ali
 amu
 and
@@ -18648,7 +18648,7 @@ aaa
 akq
 aAv
 ali
-alE
+ali
 ali
 amu
 and
diff --git a/_maps/outpost/clip_ocean.dmm b/_maps/outpost/clip_ocean.dmm
index 66768134d6..09dcdf62f3 100644
--- a/_maps/outpost/clip_ocean.dmm
+++ b/_maps/outpost/clip_ocean.dmm
@@ -239,10 +239,10 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 4
 	},
-/obj/machinery/power/apc/auto_name/directional/north,
 /obj/structure/cable{
 	icon_state = "0-4"
 	},
+/obj/machinery/power/apc/auto_name/directional/north/outpost,
 /turf/open/floor/plasteel/tech/techmaint,
 /area/outpost/cargo/smeltery)
 "aR" = (
@@ -841,7 +841,8 @@
 /obj/item/gun/ballistic/automatic/hmg/skm_lmg/extended{
 	pixel_x = -4;
 	pixel_y = 2;
-	name = "Decommissioned SKM-24u"
+	name = "Decommissioned SKM-24u";
+	spawn_no_ammo = 1
 	},
 /turf/open/floor/plasteel/dark,
 /area/outpost/crew/library)
@@ -849,10 +850,10 @@
 /obj/effect/turf_decal/trimline/opaque/red/line{
 	dir = 8
 	},
-/obj/machinery/power/apc/auto_name/directional/west,
 /obj/structure/cable{
 	icon_state = "0-4"
 	},
+/obj/machinery/power/apc/auto_name/directional/west/outpost,
 /turf/open/floor/plasteel/dark,
 /area/outpost/crew/library)
 "cA" = (
@@ -1090,10 +1091,10 @@
 /turf/open/floor/plasteel/tech,
 /area/outpost/exterior/ocean)
 "cV" = (
-/obj/machinery/power/apc/auto_name/directional/north,
 /obj/structure/cable{
 	icon_state = "0-4"
 	},
+/obj/machinery/power/apc/auto_name/directional/north/outpost,
 /turf/open/floor/plasteel/dark,
 /area/outpost/crew/law_office)
 "cY" = (
@@ -1298,13 +1299,13 @@
 /obj/effect/turf_decal/trimline/opaque/yellow/line{
 	dir = 8
 	},
-/obj/machinery/power/apc/auto_name/directional/west,
 /obj/structure/cable{
 	icon_state = "0-4"
 	},
 /obj/structure/cable{
 	icon_state = "2-4"
 	},
+/obj/machinery/power/apc/auto_name/directional/west/outpost,
 /turf/open/floor/plasteel/patterned/grid,
 /area/outpost/hallway/starboard)
 "dY" = (
@@ -1580,6 +1581,7 @@
 	name = "morphine syringe"
 	},
 /obj/machinery/light/directional/east,
+/obj/item/defibrillator/compact/loaded,
 /turf/open/floor/plasteel/tech,
 /area/outpost/security/armory)
 "eX" = (
@@ -1704,6 +1706,11 @@
 	icon_state = "1-2"
 	},
 /obj/effect/turf_decal/siding/thinplating/dark,
+/obj/item/folder/blue,
+/obj/item/folder/blue,
+/obj/item/folder/blue,
+/obj/item/clipboard,
+/obj/item/clipboard,
 /turf/open/floor/plasteel,
 /area/outpost/operations)
 "fq" = (
@@ -2653,10 +2660,10 @@
 /area/outpost/cargo/smeltery)
 "iE" = (
 /obj/effect/turf_decal/siding/thinplating/dark,
-/obj/machinery/power/apc/auto_name/directional/west,
 /obj/structure/cable{
 	icon_state = "0-2"
 	},
+/obj/machinery/power/apc/auto_name/directional/west/outpost,
 /turf/open/floor/plasteel/patterned/brushed,
 /area/outpost/crew/canteen)
 "iF" = (
@@ -2669,10 +2676,10 @@
 /obj/machinery/camera/autoname{
 	dir = 2
 	},
-/obj/machinery/power/apc/auto_name/directional/north,
 /obj/structure/cable{
 	icon_state = "0-2"
 	},
+/obj/machinery/power/apc/auto_name/directional/north/outpost,
 /turf/open/floor/plasteel/dark,
 /area/outpost/crew/cryo)
 "iH" = (
@@ -3132,6 +3139,12 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 10
 	},
+/obj/item/clothing/mask/breath/facemask,
+/obj/item/clothing/mask/breath/facemask,
+/obj/item/clothing/mask/breath/facemask,
+/obj/item/clothing/mask/breath/facemask,
+/obj/item/clothing/mask/breath/facemask,
+/obj/item/clothing/mask/breath/facemask,
 /turf/open/floor/plasteel/tech/grid,
 /area/outpost/hallway/starboard)
 "kn" = (
@@ -4224,11 +4237,13 @@
 /obj/structure/rack,
 /obj/item/gun/ballistic/automatic/assault/skm/cm24{
 	pixel_x = -7;
-	pixel_y = 4
+	pixel_y = 4;
+	spawn_no_ammo = 1
 	},
 /obj/item/gun/ballistic/automatic/assault/skm{
 	pixel_x = -6;
-	pixel_y = -2
+	pixel_y = -2;
+	spawn_no_ammo = 1
 	},
 /turf/open/floor/plasteel/dark,
 /area/outpost/crew/library)
@@ -4289,10 +4304,10 @@
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
 	dir = 4
 	},
-/obj/machinery/power/apc/auto_name/directional/west,
 /obj/structure/cable{
 	icon_state = "0-4"
 	},
+/obj/machinery/power/apc/auto_name/directional/west/outpost,
 /turf/open/floor/plasteel/tech/techmaint,
 /area/outpost/engineering)
 "of" = (
@@ -5029,10 +5044,10 @@
 /obj/effect/turf_decal/siding/wood/corner{
 	dir = 4
 	},
-/obj/machinery/power/apc/auto_name/directional/west,
 /obj/structure/cable{
 	icon_state = "0-4"
 	},
+/obj/machinery/power/apc/auto_name/directional/west/outpost,
 /turf/open/floor/plasteel/dark,
 /area/outpost/crew/dorm)
 "qz" = (
@@ -5313,10 +5328,10 @@
 /obj/effect/turf_decal/siding/thinplating/dark{
 	dir = 5
 	},
-/obj/machinery/power/apc/auto_name/directional/north,
 /obj/structure/cable{
 	icon_state = "0-8"
 	},
+/obj/machinery/power/apc/auto_name/directional/north/outpost,
 /turf/open/floor/plasteel/dark,
 /area/outpost/crew/bathroom)
 "rC" = (
@@ -6190,11 +6205,13 @@
 /obj/structure/rack,
 /obj/item/gun/ballistic/automatic/smg/cm5{
 	pixel_x = -1;
-	pixel_y = 8
+	pixel_y = 8;
+	spawn_no_ammo = 1
 	},
 /obj/item/gun/ballistic/automatic/smg/cm5/compact{
 	pixel_x = 2;
-	pixel_y = 0
+	pixel_y = 0;
+	spawn_no_ammo = 1
 	},
 /turf/open/floor/plasteel/dark,
 /area/outpost/crew/library)
@@ -6298,10 +6315,14 @@
 	pixel_y = 1
 	},
 /obj/item/storage/toolbox/ammo/c10mm{
-	pixel_x = 0;
+	pixel_x = 9;
 	pixel_y = -9
 	},
 /obj/effect/turf_decal/trimline/opaque/yellow/line,
+/obj/item/storage/toolbox/ammo/c65{
+	pixel_x = -9;
+	pixel_y = -9
+	},
 /turf/open/floor/plasteel/tech,
 /area/outpost/security/armory)
 "va" = (
@@ -6669,7 +6690,8 @@
 /obj/item/gun/ballistic/automatic/hmg/shredder{
 	pixel_x = -2;
 	pixel_y = 1;
-	name = "Decommissioned Shredder"
+	name = "Decommissioned Shredder";
+	spawn_no_ammo = 1
 	},
 /obj/machinery/light/directional/east,
 /turf/open/floor/plasteel/dark,
@@ -7074,8 +7096,6 @@
 	},
 /obj/item/ammo_box/magazine/skm_762_40/extended,
 /obj/item/ammo_box/magazine/skm_762_40/extended,
-/obj/item/ammo_box/magazine/skm_762_40/extended,
-/obj/item/ammo_box/magazine/skm_762_40/extended,
 /obj/item/ammo_box/magazine/rottweiler_308_box,
 /obj/item/ammo_box/magazine/f4_308,
 /obj/item/ammo_box/magazine/f4_308,
@@ -7097,6 +7117,8 @@
 /obj/item/ammo_box/magazine/m12g_bulldog/empty,
 /obj/effect/turf_decal/trimline/opaque/yellow/line,
 /obj/machinery/light/directional/south,
+/obj/item/ammo_box/magazine/f90,
+/obj/item/ammo_box/magazine/f90,
 /turf/open/floor/plasteel/tech,
 /area/outpost/security/armory)
 "xq" = (
@@ -7336,10 +7358,10 @@
 /turf/open/floor/plasteel/tech,
 /area/outpost/exterior/ocean)
 "xZ" = (
-/obj/machinery/power/apc/auto_name/directional/east,
 /obj/structure/cable{
 	icon_state = "0-8"
 	},
+/obj/machinery/power/apc/auto_name/directional/east/outpost,
 /turf/open/floor/wood/walnut,
 /area/outpost/vacant_rooms)
 "ya" = (
@@ -7872,11 +7894,11 @@
 /obj/effect/turf_decal/trimline/opaque/blue/warning{
 	dir = 1
 	},
-/obj/machinery/power/apc/auto_name/directional/south,
 /obj/structure/cable{
 	icon_state = "0-4"
 	},
 /obj/effect/turf_decal/siding/thinplating/dark,
+/obj/machinery/power/apc/auto_name/directional/south/outpost,
 /turf/open/floor/plasteel/dark,
 /area/outpost/security/checkpoint)
 "zP" = (
@@ -8423,10 +8445,10 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/power/apc/auto_name/directional/east,
 /obj/structure/cable{
 	icon_state = "0-2"
 	},
+/obj/machinery/power/apc/auto_name/directional/east/outpost,
 /turf/open/floor/plasteel/dark,
 /area/outpost/crew/lounge)
 "BP" = (
@@ -8444,10 +8466,10 @@
 /obj/effect/turf_decal/trimline/transparent/blue/line{
 	dir = 8
 	},
-/obj/machinery/power/apc/auto_name/directional/north,
 /obj/structure/cable{
 	icon_state = "0-2"
 	},
+/obj/machinery/power/apc/auto_name/directional/north/outpost,
 /turf/open/floor/plasteel/tech,
 /area/outpost/storage)
 "BR" = (
@@ -9007,8 +9029,8 @@
 /obj/item/gun/ballistic/automatic/hmg/rottweiler,
 /obj/item/gun/ballistic/automatic/marksman/f4/inteq,
 /obj/item/gun/ballistic/automatic/assault/skm/inteq,
-/obj/item/gun/ballistic/automatic/assault/skm/inteq,
 /obj/effect/turf_decal/trimline/opaque/yellow/line,
+/obj/item/gun/ballistic/automatic/marksman/f90/inteq,
 /turf/open/floor/plasteel/tech,
 /area/outpost/security/armory)
 "DC" = (
@@ -9847,8 +9869,8 @@
 /area/outpost/crew/library)
 "FH" = (
 /obj/structure/closet/crate/bin,
-/obj/machinery/power/apc/auto_name/directional/east,
 /obj/structure/cable,
+/obj/machinery/power/apc/auto_name/directional/east/outpost,
 /turf/open/floor/plasteel/tech,
 /area/outpost/operations)
 "FK" = (
@@ -9973,7 +9995,7 @@
 	icon_state = "1-2"
 	},
 /turf/open/floor/plasteel/tech/grid,
-/area/outpost/security/checkpoint)
+/area/outpost/hallway/starboard)
 "Gh" = (
 /obj/structure/platform/industrial_alt/indestructible{
 	dir = 1
@@ -9994,8 +10016,8 @@
 /obj/effect/turf_decal/trimline/opaque/yellow/corner{
 	dir = 1
 	},
-/obj/machinery/power/apc/auto_name/directional/east,
 /obj/structure/cable,
+/obj/machinery/power/apc/auto_name/directional/east/outpost,
 /turf/open/floor/plasteel/dark,
 /area/outpost/security/armory)
 "Gm" = (
@@ -12271,10 +12293,10 @@
 	dir = 1
 	},
 /obj/effect/turf_decal/siding/thinplating/dark,
-/obj/machinery/power/apc/auto_name/directional/south,
 /obj/structure/cable{
 	icon_state = "0-4"
 	},
+/obj/machinery/power/apc/auto_name/directional/south/outpost,
 /turf/open/floor/plasteel/dark,
 /area/outpost/vacant_rooms/office)
 "Ni" = (
@@ -12407,6 +12429,12 @@
 /obj/item/clothing/gloves/combat,
 /obj/item/clothing/head/helmet/bulletproof/x11/clip,
 /obj/item/clothing/suit/armor/vest/bulletproof,
+/obj/item/clothing/mask/breath/facemask,
+/obj/item/clothing/mask/breath/facemask,
+/obj/item/clothing/mask/breath/facemask,
+/obj/item/clothing/mask/breath/facemask,
+/obj/item/clothing/mask/breath/facemask,
+/obj/item/clothing/mask/breath/facemask,
 /turf/open/floor/plasteel/tech/grid,
 /area/outpost/hallway/starboard)
 "NK" = (
@@ -12714,7 +12742,6 @@
 /turf/open/floor/plasteel/tech/techmaint,
 /area/outpost/cargo/smeltery)
 "OP" = (
-/obj/structure/table/reinforced,
 /obj/machinery/button/door{
 	pixel_x = 0;
 	pixel_y = 21;
@@ -12724,6 +12751,7 @@
 /obj/effect/turf_decal/techfloor{
 	dir = 9
 	},
+/obj/machinery/telecomms/allinone/indestructible,
 /turf/open/floor/plasteel/tech,
 /area/outpost/operations)
 "OQ" = (
@@ -13423,11 +13451,13 @@
 /obj/structure/rack,
 /obj/item/gun/ballistic/automatic/marksman/f4{
 	pixel_x = -4;
-	pixel_y = 7
+	pixel_y = 7;
+	spawn_no_ammo = 1
 	},
 /obj/item/gun/ballistic/automatic/marksman/f4/indie{
 	pixel_x = -4;
-	pixel_y = 2
+	pixel_y = 2;
+	spawn_no_ammo = 1
 	},
 /turf/open/floor/plasteel/dark,
 /area/outpost/crew/library)
@@ -13451,10 +13481,10 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 4
 	},
-/obj/machinery/power/apc/auto_name/directional/south,
 /obj/structure/cable{
 	icon_state = "0-8"
 	},
+/obj/machinery/power/apc/auto_name/directional/south/outpost,
 /turf/open/floor/plasteel/dark,
 /area/outpost/medical)
 "Rj" = (
@@ -14372,6 +14402,11 @@
 /obj/effect/turf_decal/siding/thinplating/dark{
 	dir = 5
 	},
+/obj/item/folder/yellow,
+/obj/item/folder/yellow,
+/obj/item/folder/yellow,
+/obj/item/clipboard,
+/obj/item/clipboard,
 /turf/open/floor/plasteel/dark,
 /area/outpost/operations)
 "Ui" = (
@@ -14803,8 +14838,8 @@
 	},
 /area/outpost/crew/library)
 "Vw" = (
-/obj/machinery/power/apc/auto_name/directional/west,
 /obj/structure/cable,
+/obj/machinery/power/apc/auto_name/directional/west/outpost,
 /turf/open/floor/wood/walnut,
 /area/outpost/crew/bar)
 "Vx" = (
@@ -15034,11 +15069,11 @@
 /obj/effect/turf_decal/siding/thinplating/dark{
 	dir = 1
 	},
-/obj/machinery/power/apc/auto_name/directional/north,
 /obj/structure/cable{
 	icon_state = "0-4"
 	},
 /obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/power/apc/auto_name/directional/north/outpost,
 /turf/open/floor/plasteel/dark,
 /area/outpost/vacant_rooms/shop)
 "Wt" = (
@@ -15693,10 +15728,6 @@
 "Ya" = (
 /obj/structure/table/reinforced,
 /obj/item/cutting_board,
-/obj/item/melee/knife{
-	pixel_x = 7;
-	pixel_y = 3
-	},
 /obj/item/kitchen/rollingpin{
 	pixel_x = -5;
 	pixel_y = 3
@@ -15708,6 +15739,10 @@
 	pixel_y = 8;
 	pixel_x = -32
 	},
+/obj/item/melee/knife/kitchen{
+	pixel_x = 8;
+	pixel_y = 2
+	},
 /turf/open/floor/plasteel/patterned/brushed,
 /area/outpost/crew/canteen)
 "Yb" = (
@@ -15837,12 +15872,14 @@
 /obj/item/gun/ballistic/automatic/smg/pounder{
 	name = "Decommissioned Pounder";
 	pixel_x = -1;
-	pixel_y = 6
+	pixel_y = 6;
+	spawn_no_ammo = 1
 	},
 /obj/item/gun/ballistic/automatic/pistol/spitter{
 	pixel_x = 1;
 	pixel_y = -11;
-	name = "Decommissioned Spitter"
+	name = "Decommissioned Spitter";
+	spawn_no_ammo = 1
 	},
 /turf/open/floor/plasteel/dark,
 /area/outpost/crew/library)
@@ -26948,7 +26985,7 @@ oS
 bT
 Sa
 DY
-lM
+Yc
 zt
 Qd
 Ai
@@ -27071,7 +27108,7 @@ RY
 qj
 Qp
 mk
-lM
+Yc
 iA
 xh
 gr
@@ -27317,7 +27354,7 @@ Xl
 dz
 aa
 rv
-lM
+Id
 Id
 Id
 Id
diff --git a/_maps/shuttles/_images/Atira-class.png b/_maps/shuttles/_images/Atira-class.png
index c9d51c4eaf..1876fa90c7 100644
Binary files a/_maps/shuttles/_images/Atira-class.png and b/_maps/shuttles/_images/Atira-class.png differ
diff --git a/_maps/shuttles/_images/Atlas-class.png b/_maps/shuttles/_images/Atlas-class.png
index be04510b16..c1a08ed5aa 100644
Binary files a/_maps/shuttles/_images/Atlas-class.png and b/_maps/shuttles/_images/Atlas-class.png differ
diff --git a/_maps/shuttles/_images/Atoll-class.png b/_maps/shuttles/_images/Atoll-class.png
index 0595ae8d4d..feb7f0a130 100644
Binary files a/_maps/shuttles/_images/Atoll-class.png and b/_maps/shuttles/_images/Atoll-class.png differ
diff --git a/_maps/shuttles/_images/Cirrus-class.png b/_maps/shuttles/_images/Cirrus-class.png
index 0824237fdd..452fb01f19 100644
Binary files a/_maps/shuttles/_images/Cirrus-class.png and b/_maps/shuttles/_images/Cirrus-class.png differ
diff --git a/_maps/shuttles/_images/Colossus-class.png b/_maps/shuttles/_images/Colossus-class.png
index d76873b6fc..2a8aaa800b 100644
Binary files a/_maps/shuttles/_images/Colossus-class.png and b/_maps/shuttles/_images/Colossus-class.png differ
diff --git a/_maps/shuttles/_images/Crying Sun-class.png b/_maps/shuttles/_images/Crying Sun-class.png
index 4ec452cc3b..11a6b215ac 100644
Binary files a/_maps/shuttles/_images/Crying Sun-class.png and b/_maps/shuttles/_images/Crying Sun-class.png differ
diff --git a/_maps/shuttles/_images/Cthonian-class.png b/_maps/shuttles/_images/Cthonian-class.png
index c764b041a4..96dd902a65 100644
Binary files a/_maps/shuttles/_images/Cthonian-class.png and b/_maps/shuttles/_images/Cthonian-class.png differ
diff --git a/_maps/shuttles/_images/Derecho-class.png b/_maps/shuttles/_images/Derecho-class.png
index f2852c7108..5ece158e2b 100644
Binary files a/_maps/shuttles/_images/Derecho-class.png and b/_maps/shuttles/_images/Derecho-class.png differ
diff --git a/_maps/shuttles/_images/Elated Bolide-class.png b/_maps/shuttles/_images/Elated Bolide-class.png
index 201bae92fc..d1662924b7 100644
Binary files a/_maps/shuttles/_images/Elated Bolide-class.png and b/_maps/shuttles/_images/Elated Bolide-class.png differ
diff --git a/_maps/shuttles/_images/Elder-class.png b/_maps/shuttles/_images/Elder-class.png
index 6a0a82cce3..5806511c20 100644
Binary files a/_maps/shuttles/_images/Elder-class.png and b/_maps/shuttles/_images/Elder-class.png differ
diff --git a/_maps/shuttles/_images/Ivory-class.png b/_maps/shuttles/_images/Ivory-class.png
index 0e32b99d45..717e525743 100644
Binary files a/_maps/shuttles/_images/Ivory-class.png and b/_maps/shuttles/_images/Ivory-class.png differ
diff --git a/_maps/shuttles/_images/Kiwi-class.png b/_maps/shuttles/_images/Kiwi-class.png
index 1103b64977..171a968269 100644
Binary files a/_maps/shuttles/_images/Kiwi-class.png and b/_maps/shuttles/_images/Kiwi-class.png differ
diff --git a/_maps/shuttles/_images/Leyak-class.png b/_maps/shuttles/_images/Leyak-class.png
index b1c9c03489..66c1dbc0f4 100644
Binary files a/_maps/shuttles/_images/Leyak-class.png and b/_maps/shuttles/_images/Leyak-class.png differ
diff --git a/_maps/shuttles/_images/M. Quasar-class.png b/_maps/shuttles/_images/M. Quasar-class.png
index b38e434d48..27596f8a38 100644
Binary files a/_maps/shuttles/_images/M. Quasar-class.png and b/_maps/shuttles/_images/M. Quasar-class.png differ
diff --git a/_maps/shuttles/_images/Magpie-class.png b/_maps/shuttles/_images/Magpie-class.png
index b79bdaa4c0..aeff2f20b7 100644
Binary files a/_maps/shuttles/_images/Magpie-class.png and b/_maps/shuttles/_images/Magpie-class.png differ
diff --git a/_maps/shuttles/_images/Mudskipper-class.png b/_maps/shuttles/_images/Mudskipper-class.png
index 3f93ab8fb0..1c088a60a8 100644
Binary files a/_maps/shuttles/_images/Mudskipper-class.png and b/_maps/shuttles/_images/Mudskipper-class.png differ
diff --git a/_maps/shuttles/_images/Nimbus-class.png b/_maps/shuttles/_images/Nimbus-class.png
index 381c551450..368bae623f 100644
Binary files a/_maps/shuttles/_images/Nimbus-class.png and b/_maps/shuttles/_images/Nimbus-class.png differ
diff --git a/_maps/shuttles/_images/Paracelsus-class.png b/_maps/shuttles/_images/Paracelsus-class.png
index 2d0e55a35b..14c3f72b87 100644
Binary files a/_maps/shuttles/_images/Paracelsus-class.png and b/_maps/shuttles/_images/Paracelsus-class.png differ
diff --git a/_maps/shuttles/_images/Riggs-class.png b/_maps/shuttles/_images/Riggs-class.png
index bad014c4d6..3b58b58326 100644
Binary files a/_maps/shuttles/_images/Riggs-class.png and b/_maps/shuttles/_images/Riggs-class.png differ
diff --git a/_maps/shuttles/_images/Roach-class.png b/_maps/shuttles/_images/Roach-class.png
index 2f61161299..0d500db01d 100644
Binary files a/_maps/shuttles/_images/Roach-class.png and b/_maps/shuttles/_images/Roach-class.png differ
diff --git a/_maps/shuttles/_images/Shetland-class.png b/_maps/shuttles/_images/Shetland-class.png
index 5599f437b2..54aeeaf25f 100644
Binary files a/_maps/shuttles/_images/Shetland-class.png and b/_maps/shuttles/_images/Shetland-class.png differ
diff --git a/_maps/shuttles/_images/Shrike-class.png b/_maps/shuttles/_images/Shrike-class.png
new file mode 100644
index 0000000000..f07741f24a
Binary files /dev/null and b/_maps/shuttles/_images/Shrike-class.png differ
diff --git a/_maps/shuttles/_images/Sola-class.png b/_maps/shuttles/_images/Sola-class.png
index a7448c4cc6..805c7f64bc 100644
Binary files a/_maps/shuttles/_images/Sola-class.png and b/_maps/shuttles/_images/Sola-class.png differ
diff --git a/_maps/shuttles/_images/Sunskipper-class.png b/_maps/shuttles/_images/Sunskipper-class.png
index 7e0be50864..2775682951 100644
Binary files a/_maps/shuttles/_images/Sunskipper-class.png and b/_maps/shuttles/_images/Sunskipper-class.png differ
diff --git a/_maps/shuttles/_images/Talos-class.png b/_maps/shuttles/_images/Talos-class.png
index 9357cd68cf..65ada61dda 100644
Binary files a/_maps/shuttles/_images/Talos-class.png and b/_maps/shuttles/_images/Talos-class.png differ
diff --git a/_maps/shuttles/_images/Tortuga-class.png b/_maps/shuttles/_images/Tortuga-class.png
index 374d97848b..7eeed7cbd8 100644
Binary files a/_maps/shuttles/_images/Tortuga-class.png and b/_maps/shuttles/_images/Tortuga-class.png differ
diff --git a/_maps/shuttles/_images/Typhon-class.png b/_maps/shuttles/_images/Typhon-class.png
index dbd2888af1..e379faaef2 100644
Binary files a/_maps/shuttles/_images/Typhon-class.png and b/_maps/shuttles/_images/Typhon-class.png differ
diff --git a/_maps/shuttles/_images/Valor-class.png b/_maps/shuttles/_images/Valor-class.png
index 36b9ae630a..d507d6fe1e 100644
Binary files a/_maps/shuttles/_images/Valor-class.png and b/_maps/shuttles/_images/Valor-class.png differ
diff --git a/_maps/shuttles/_images/Vaquero-class.png b/_maps/shuttles/_images/Vaquero-class.png
index a7e042ff91..a06710aefb 100644
Binary files a/_maps/shuttles/_images/Vaquero-class.png and b/_maps/shuttles/_images/Vaquero-class.png differ
diff --git a/_maps/shuttles/cybersun/cybersun_nimbus.dmm b/_maps/shuttles/cybersun/cybersun_nimbus.dmm
index 95ac6a2523..51d3f05eb9 100644
--- a/_maps/shuttles/cybersun/cybersun_nimbus.dmm
+++ b/_maps/shuttles/cybersun/cybersun_nimbus.dmm
@@ -38,14 +38,9 @@
 /obj/item/storage/firstaid/medical{
 	pixel_x = -4
 	},
-/obj/item/hypospray/mkii/tricord{
-	pixel_x = 7;
-	pixel_y = 2
-	},
-/obj/item/reagent_containers/glass/bottle/vial/small/preloaded/tricord,
-/obj/item/reagent_containers/glass/bottle/vial/small/preloaded/tricord{
-	pixel_x = -5
-	},
+/obj/item/hypospray/mkii/cureall,
+/obj/item/reagent_containers/glass/bottle/vial/small/preloaded/cureall,
+/obj/item/reagent_containers/glass/bottle/vial/small/preloaded/cureall,
 /turf/open/floor/plasteel/mono/white,
 /area/ship/cargo)
 "aL" = (
diff --git a/_maps/shuttles/independent/independent_atoll.dmm b/_maps/shuttles/independent/independent_atoll.dmm
index 7c146a610e..6813610b8f 100644
--- a/_maps/shuttles/independent/independent_atoll.dmm
+++ b/_maps/shuttles/independent/independent_atoll.dmm
@@ -1006,8 +1006,7 @@
 /area/ship/hallway/aft)
 "in" = (
 /obj/effect/turf_decal/siding/wood{
-	color = "#543C30";
-	dir = 2
+	color = "#543C30"
 	},
 /obj/machinery/airalarm/directional/south,
 /turf/open/floor/wood/walnut,
@@ -2123,8 +2122,7 @@
 "sv" = (
 /obj/structure/fluff/hedge,
 /obj/effect/turf_decal/siding/wood{
-	color = "#543C30";
-	dir = 2
+	color = "#543C30"
 	},
 /turf/open/floor/wood/walnut,
 /area/ship/crew/ccommons)
@@ -2190,8 +2188,7 @@
 /area/ship/crew/dorm/captain)
 "sX" = (
 /obj/effect/turf_decal/siding/wood{
-	color = "#543C30";
-	dir = 2
+	color = "#543C30"
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 5
@@ -2277,8 +2274,7 @@
 /area/ship/medical)
 "ux" = (
 /obj/effect/turf_decal/siding/wood{
-	color = "#543C30";
-	dir = 2
+	color = "#543C30"
 	},
 /turf/open/floor/wood/walnut,
 /area/ship/crew/ccommons)
@@ -2292,9 +2288,7 @@
 /turf/open/floor/plasteel/tech,
 /area/ship/engineering/engines/starboard)
 "uL" = (
-/obj/machinery/power/smes/shuttle/precharged{
-	dir = 4
-	},
+/obj/machinery/power/smes/shuttle/precharged,
 /obj/structure/cable/yellow{
 	icon_state = "0-8"
 	},
@@ -2716,8 +2710,7 @@
 /area/ship/crew/dorm/captain)
 "yA" = (
 /obj/effect/turf_decal/siding/wood{
-	color = "#543C30";
-	dir = 2
+	color = "#543C30"
 	},
 /turf/open/floor/wood/walnut,
 /area/ship/crew/office)
@@ -2732,9 +2725,7 @@
 /turf/open/floor/plating,
 /area/ship/engineering/engines/port)
 "yF" = (
-/obj/machinery/power/smes/shuttle/precharged{
-	dir = 4
-	},
+/obj/machinery/power/smes/shuttle/precharged,
 /obj/structure/cable/yellow{
 	icon_state = "0-8"
 	},
@@ -3380,8 +3371,7 @@
 /area/ship/hallway/port)
 "Fv" = (
 /obj/effect/turf_decal/siding/wood{
-	color = "#543C30";
-	dir = 2
+	color = "#543C30"
 	},
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/machinery/computer/med_data/laptop{
@@ -4830,9 +4820,7 @@
 /turf/open/floor/plasteel/patterned/ridged,
 /area/ship/crew/office)
 "Rj" = (
-/obj/machinery/power/shuttle/engine/electric{
-	dir = 4
-	},
+/obj/machinery/power/shuttle/engine/electric,
 /obj/structure/cable/yellow{
 	icon_state = "0-4"
 	},
@@ -5001,24 +4989,22 @@
 	pixel_x = -6;
 	pixel_y = 14
 	},
-/obj/item/reagent_containers/glass/bottle{
-	list_reagents = list(/datum/reagent/medicine/thializid=30);
-	name = "thializid bottle";
-	pixel_x = 6;
-	pixel_y = 14
-	},
 /obj/item/reagent_containers/glass/bottle/atropine{
 	pixel_x = -6;
 	pixel_y = 8
 	},
-/obj/item/reagent_containers/glass/bottle/morphine{
-	pixel_x = 6;
-	pixel_y = 8
-	},
 /obj/item/storage/pill_bottle/mannitol{
 	pixel_x = -8
 	},
 /obj/item/storage/pill_bottle/mutadone,
+/obj/item/reagent_containers/glass/bottle/gjalrazine{
+	pixel_y = 14;
+	pixel_x = 6
+	},
+/obj/item/reagent_containers/glass/bottle/morphine{
+	pixel_x = 6;
+	pixel_y = 8
+	},
 /obj/item/storage/pill_bottle/penacid{
 	pixel_x = 8
 	},
@@ -5101,9 +5087,7 @@
 /turf/open/floor/carpet,
 /area/ship/crew/ccommons)
 "TZ" = (
-/obj/machinery/power/shuttle/engine/electric{
-	dir = 4
-	},
+/obj/machinery/power/shuttle/engine/electric,
 /obj/structure/cable/yellow{
 	icon_state = "0-4"
 	},
@@ -5742,8 +5726,7 @@
 /area/ship/hallway/aft)
 "ZQ" = (
 /obj/effect/turf_decal/siding/wood{
-	color = "#543C30";
-	dir = 2
+	color = "#543C30"
 	},
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/wood/walnut,
diff --git a/_maps/shuttles/independent/independent_mudskipper.dmm b/_maps/shuttles/independent/independent_mudskipper.dmm
index 5fbd51aa17..5a40be16d0 100644
--- a/_maps/shuttles/independent/independent_mudskipper.dmm
+++ b/_maps/shuttles/independent/independent_mudskipper.dmm
@@ -366,8 +366,8 @@
 /obj/item/bodybag,
 /obj/item/bodybag,
 /obj/item/pickaxe/mini,
-/obj/item/reagent_containers/pill/patch/styptic,
-/obj/item/reagent_containers/pill/patch/silver_sulf,
+/obj/item/reagent_containers/pill/patch/indomide,
+/obj/item/reagent_containers/pill/patch/alvitane,
 /obj/item/multitool,
 /obj/item/stack/marker_beacon/thirty,
 /obj/item/gear_pack/anglegrinder,
diff --git a/_maps/shuttles/independent/independent_rigger.dmm b/_maps/shuttles/independent/independent_rigger.dmm
index 21acdaac8e..c893782c58 100644
--- a/_maps/shuttles/independent/independent_rigger.dmm
+++ b/_maps/shuttles/independent/independent_rigger.dmm
@@ -365,11 +365,7 @@
 	pixel_x = 8;
 	pixel_y = 8
 	},
-/obj/item/reagent_containers/glass/bottle{
-	list_reagents = list(/datum/reagent/medicine/thializid=30);
-	name = "thializid bottle";
-	pixel_x = 5
-	},
+/obj/item/reagent_containers/glass/bottle/gjalrazine,
 /obj/item/reagent_containers/syringe{
 	pixel_x = 7
 	},
@@ -4488,7 +4484,6 @@
 /area/ship/hallway/central)
 "ZI" = (
 /obj/item/storage/case/surgery{
-	pixel_x = 0;
 	pixel_y = 3
 	},
 /obj/item/clothing/gloves/color/latex/nitrile,
diff --git a/_maps/shuttles/independent/independent_shetland.dmm b/_maps/shuttles/independent/independent_shetland.dmm
index 933904b921..bb9ab8bd84 100644
--- a/_maps/shuttles/independent/independent_shetland.dmm
+++ b/_maps/shuttles/independent/independent_shetland.dmm
@@ -1295,14 +1295,14 @@
 	pixel_x = 5;
 	pixel_y = 8
 	},
-/obj/item/reagent_containers/glass/bottle{
-	list_reagents = list(/datum/reagent/medicine/thializid=30);
-	name = "thializid bottle"
-	},
 /obj/item/storage/box/bodybags,
 /obj/structure/cable{
 	icon_state = "1-8"
 	},
+/obj/item/reagent_containers/glass/bottle/gjalrazine{
+	pixel_x = 5;
+	pixel_y = -8
+	},
 /turf/open/floor/plasteel/white,
 /area/ship/medical)
 "lc" = (
diff --git a/_maps/shuttles/independent/independent_sola.dmm b/_maps/shuttles/independent/independent_sola.dmm
index 81bb07da0d..7a6f87df48 100644
--- a/_maps/shuttles/independent/independent_sola.dmm
+++ b/_maps/shuttles/independent/independent_sola.dmm
@@ -2882,11 +2882,11 @@
 /obj/item/storage/box/bodybags,
 /obj/item/storage/box/syringes,
 /obj/item/roller,
-/obj/item/reagent_containers/syringe/thializid,
 /obj/effect/turf_decal/corner/opaque/bottlegreen{
 	dir = 6
 	},
 /obj/item/healthanalyzer,
+/obj/item/reagent_containers/syringe/pancrazine,
 /turf/open/floor/plasteel/white,
 /area/ship/medical)
 "LR" = (
diff --git a/_maps/shuttles/inteq/inteq_colossus.dmm b/_maps/shuttles/inteq/inteq_colossus.dmm
index f442a6951c..3c6788bb61 100644
--- a/_maps/shuttles/inteq/inteq_colossus.dmm
+++ b/_maps/shuttles/inteq/inteq_colossus.dmm
@@ -9,6 +9,10 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/light/directional/west,
 /obj/machinery/atmospherics/components/unary/passive_vent/layer4,
+/obj/structure/sign/warning/securearea{
+	pixel_y = 28;
+	pixel_x = 6
+	},
 /turf/open/floor/engine/hull/reinforced,
 /area/ship/external/dark)
 "aH" = (
@@ -105,7 +109,7 @@
 	dir = 4
 	},
 /turf/open/floor/plasteel/tech,
-/area/ship/engineering/engines/starboard)
+/area/ship/engineering)
 "bm" = (
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/ship/bridge)
@@ -116,60 +120,8 @@
 /obj/structure/railing{
 	dir = 8
 	},
-/obj/structure/table,
-/obj/structure/closet/secure_closet/wall/directional/north{
-	icon_door = "med_wall";
-	name = "medical locker";
-	req_access_txt = "5"
-	},
-/obj/item/storage/firstaid/regular{
-	pixel_y = 15;
-	pixel_x = -3
-	},
-/obj/item/storage/firstaid/medical{
-	pixel_x = -3;
-	pixel_y = 10
-	},
-/obj/item/sensor_device{
-	pixel_x = -3;
-	pixel_y = 4
-	},
-/obj/item/reagent_containers/glass/bottle/dimorlin{
-	pixel_y = 6;
-	pixel_x = 8
-	},
-/obj/item/reagent_containers/glass/bottle/dimorlin{
-	pixel_y = 1;
-	pixel_x = 8
-	},
-/obj/item/reagent_containers/syringe{
-	pixel_y = 5;
-	pixel_x = 6
-	},
-/obj/item/storage/pill_bottle/charcoal{
-	pixel_x = 1;
-	pixel_y = -1
-	},
-/obj/item/bodybag{
-	pixel_x = -7
-	},
-/obj/item/bodybag{
-	pixel_x = -7
-	},
-/obj/item/bodybag{
-	pixel_x = -7
-	},
-/obj/item/bodybag{
-	pixel_x = -7
-	},
-/obj/item/wrench/medical{
-	pixel_x = -8
-	},
 /obj/effect/decal/cleanable/dirt,
-/obj/item/reagent_containers/glass/bottle/formaldehyde{
-	pixel_x = 8;
-	pixel_y = -4
-	},
+/obj/machinery/autolathe,
 /turf/open/floor/plasteel/patterned/cargo_one,
 /area/ship/cargo)
 "bx" = (
@@ -184,8 +136,8 @@
 	icon_state = "1-2"
 	},
 /obj/machinery/door/airlock/command{
-	name = "Master At Arms' Quarters";
-	req_access_txt = "3"
+	name = "Command Quarters";
+	req_access_txt = list(3,48)
 	},
 /turf/open/floor/plasteel/tech,
 /area/ship/crew/dorm/dormtwo)
@@ -238,13 +190,13 @@
 /area/ship/crew/canteen)
 "ch" = (
 /obj/structure/railing/corner,
-/obj/structure/catwalk/over/plated_catwalk,
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 8
+	dir = 9
 	},
+/obj/structure/catwalk/over/plated_catwalk,
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/cargo)
 "cj" = (
@@ -252,10 +204,6 @@
 	dir = 8
 	},
 /obj/machinery/airalarm/directional/south,
-/obj/effect/turf_decal/siding/thinplating/dark{
-	dir = 10;
-	layer = 2.030
-	},
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plasteel/patterned/grid/dark,
 /area/ship/engineering/engines/port)
@@ -272,10 +220,10 @@
 	dir = 8
 	},
 /obj/structure/cable{
-	icon_state = "1-8"
+	icon_state = "4-8"
 	},
 /obj/structure/cable{
-	icon_state = "4-8"
+	icon_state = "1-8"
 	},
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
@@ -321,9 +269,6 @@
 /area/ship/crew/toilet)
 "cr" = (
 /obj/effect/turf_decal/box/corners,
-/obj/structure/chair/plastic{
-	dir = 8
-	},
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
@@ -414,16 +359,11 @@
 	dir = 1
 	},
 /obj/machinery/light/small/directional/south,
-/obj/machinery/light_switch{
-	dir = 1;
-	pixel_x = 10;
-	pixel_y = -20
-	},
 /obj/machinery/camera/autoname{
 	dir = 1
 	},
 /turf/open/floor/plasteel/tech,
-/area/ship/engineering/engines/port)
+/area/ship/storage/port)
 "cT" = (
 /obj/effect/turf_decal/industrial/traffic{
 	dir = 9
@@ -469,7 +409,7 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plasteel/tech/grid,
-/area/ship/engineering/engines/port)
+/area/ship/storage/port)
 "dr" = (
 /obj/structure/table/reinforced,
 /obj/item/folder/syndicate{
@@ -584,6 +524,7 @@
 	pixel_y = 8
 	},
 /obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/steeldecal/steel_decals_central7,
 /turf/open/floor/plasteel/tech,
 /area/ship/external/dark)
 "dU" = (
@@ -600,12 +541,19 @@
 /turf/open/floor/plating,
 /area/ship/hangar)
 "eb" = (
-/obj/effect/spawner/bunk_bed,
 /obj/effect/turf_decal/corner/opaque/brown{
 	dir = 8
 	},
 /obj/effect/turf_decal/corner/opaque/yellow,
 /obj/effect/decal/cleanable/dirt,
+/obj/machinery/computer/security/telescreen/entertainment{
+	pixel_y = -32;
+	pixel_x = 15
+	},
+/obj/item/radio/intercom/directional/south{
+	pixel_x = 15
+	},
+/obj/structure/table/wood,
 /turf/open/floor/plasteel/dark,
 /area/ship/crew)
 "ef" = (
@@ -674,6 +622,7 @@
 	dir = 1
 	},
 /obj/effect/decal/cleanable/dirt,
+/obj/structure/closet/emcloset/wall/directional/north,
 /turf/open/floor/plating,
 /area/ship/engineering/engines/port)
 "eG" = (
@@ -726,6 +675,7 @@
 	pixel_x = 20;
 	pixel_y = -12
 	},
+/obj/effect/turf_decal/steeldecal/steel_decals_central7,
 /turf/open/floor/plasteel/patterned,
 /area/ship/crew/toilet)
 "fc" = (
@@ -797,60 +747,12 @@
 	dir = 8
 	},
 /obj/effect/turf_decal/corner/opaque/yellow,
-/obj/structure/closet/wall/directional/south{
-	name = "uniform closet"
-	},
-/obj/item/storage/backpack/messenger/inteq,
-/obj/item/storage/backpack/messenger/inteq,
-/obj/item/storage/backpack/messenger/inteq,
-/obj/item/clothing/suit/hooded/wintercoat/security/inteq{
-	pixel_x = -8;
-	pixel_y = -4
-	},
-/obj/item/clothing/suit/hooded/wintercoat/security/inteq{
-	pixel_x = -8;
-	pixel_y = -4
-	},
-/obj/item/clothing/suit/hooded/wintercoat/security/inteq{
-	pixel_x = -8;
-	pixel_y = -4
-	},
-/obj/item/clothing/suit/hooded/wintercoat/security/inteq/alt{
-	pixel_x = 8;
-	pixel_y = -4
-	},
-/obj/item/clothing/suit/hooded/wintercoat/security/inteq/alt{
-	pixel_x = 8;
-	pixel_y = -4
-	},
-/obj/item/clothing/suit/hooded/wintercoat/security/inteq/alt{
-	pixel_x = 8;
-	pixel_y = -4
-	},
-/obj/item/clothing/head/soft/inteq{
-	pixel_x = -8;
-	pixel_y = 8
-	},
-/obj/item/clothing/head/soft/inteq{
-	pixel_x = -8;
-	pixel_y = 8
-	},
-/obj/item/clothing/head/soft/inteq{
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/table/wood,
+/obj/item/reagent_containers/food/drinks/mug{
 	pixel_x = -8;
 	pixel_y = 8
 	},
-/obj/item/clothing/head/beret/sec/inteq{
-	pixel_x = 8;
-	pixel_y = 8
-	},
-/obj/item/clothing/head/beret/sec/inteq{
-	pixel_x = 8;
-	pixel_y = 8
-	},
-/obj/item/clothing/head/beret/sec/inteq{
-	pixel_x = 8;
-	pixel_y = 8
-	},
 /turf/open/floor/plasteel/dark,
 /area/ship/crew)
 "ga" = (
@@ -862,6 +764,7 @@
 /area/ship/engineering/engines/port)
 "gf" = (
 /obj/effect/turf_decal/siding/thinplating/dark,
+/obj/effect/decal/cleanable/plasma,
 /turf/open/floor/plasteel/tech,
 /area/ship/engineering/engines/starboard)
 "gl" = (
@@ -892,11 +795,10 @@
 /obj/effect/turf_decal/siding/thinplating/dark{
 	dir = 4
 	},
-/obj/structure/bed/dogbed,
-/mob/living/simple_animal/pet/dog/pug{
-	name = "Solstice"
+/obj/machinery/hydroponics/wooden,
+/obj/item/shovel/spade{
+	pixel_y = -8
 	},
-/obj/effect/decal/cleanable/food/egg_smudge,
 /turf/open/floor/plasteel/patterned/brushed,
 /area/ship/crew/canteen)
 "gR" = (
@@ -962,12 +864,18 @@
 	dir = 10
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/item/radio/intercom/directional/east{
-	pixel_y = 7
-	},
 /obj/structure/cable{
 	icon_state = "2-8"
 	},
+/obj/machinery/light_switch{
+	dir = 8;
+	pixel_x = 20;
+	pixel_y = 12
+	},
+/obj/machinery/power/apc/auto_name/directional/east,
+/obj/structure/cable{
+	icon_state = "0-2"
+	},
 /turf/open/floor/carpet,
 /area/ship/crew/dorm/dormtwo)
 "hm" = (
@@ -979,8 +887,9 @@
 	},
 /obj/item/radio/intercom/directional/west,
 /obj/effect/decal/cleanable/dirt,
+/obj/machinery/airalarm/directional/south,
 /turf/open/floor/plasteel/tech,
-/area/ship/engineering/engines/port)
+/area/ship/storage/port)
 "hA" = (
 /obj/structure/grille,
 /obj/structure/window/plasma/reinforced/plastitanium,
@@ -994,9 +903,6 @@
 /turf/open/floor/plating,
 /area/ship/bridge)
 "hB" = (
-/obj/structure/chair/handrail{
-	dir = 8
-	},
 /obj/effect/turf_decal/siding/thinplating{
 	dir = 4
 	},
@@ -1016,28 +922,60 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/security)
 "hM" = (
-/obj/structure/bed/roller,
-/obj/structure/curtain,
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
+/obj/structure/table,
+/obj/item/stack/sheet/metal/five{
+	pixel_x = -5;
+	pixel_y = 5
+	},
+/obj/item/stack/sheet/glass/five,
+/obj/item/stack/tape/industrial{
+	pixel_y = 10;
+	pixel_x = 9
+	},
 /turf/open/floor/plasteel/patterned/cargo_one,
 /area/ship/cargo)
 "hN" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
 	},
-/obj/machinery/power/apc/auto_name/directional/south,
-/obj/machinery/light_switch{
-	dir = 1;
-	pixel_x = 11;
-	pixel_y = -20
-	},
 /obj/structure/cable{
 	icon_state = "1-4"
 	},
-/obj/structure/cable{
-	icon_state = "0-4"
+/obj/structure/closet/secure_closet/wall/directional/south{
+	icon_door = "sec_wall";
+	name = "master at arms' locker";
+	req_access_txt = "3";
+	icon_state = "sec_wall"
+	},
+/obj/item/storage/backpack/messenger/inteq,
+/obj/item/clothing/under/syndicate/inteq/honorable,
+/obj/item/clothing/shoes/combat{
+	pixel_y = -8;
+	pixel_x = -5
+	},
+/obj/item/clothing/gloves/tackler/combat/insulated{
+	pixel_x = 5;
+	pixel_y = -10
+	},
+/obj/item/clothing/mask/balaclava/inteq{
+	pixel_x = -5
+	},
+/obj/item/clothing/suit/armor/vest/security/warden/inteq{
+	pixel_x = 5
+	},
+/obj/item/clothing/head/warden/inteq{
+	pixel_y = 5
+	},
+/obj/item/clothing/glasses/hud/security/sunglasses/inteq,
+/obj/item/storage/belt/military/assault{
+	pixel_y = -5
+	},
+/obj/item/megaphone/sec,
+/obj/item/storage/pouch/squad{
+	pixel_y = -5
 	},
 /turf/open/floor/carpet,
 /area/ship/crew/dorm/dormtwo)
@@ -1056,9 +994,9 @@
 /area/ship/bridge)
 "hT" = (
 /obj/machinery/power/smes/engineering,
-/obj/structure/catwalk/over/plated_catwalk/dark,
 /obj/structure/cable,
 /obj/effect/decal/cleanable/dirt,
+/obj/structure/catwalk/over/plated_catwalk/dark,
 /turf/open/floor/plating,
 /area/ship/engineering/engines/starboard)
 "hU" = (
@@ -1070,10 +1008,6 @@
 /area/ship/engineering/engines/port)
 "hZ" = (
 /obj/structure/dresser,
-/obj/item/flashlight/lamp/green{
-	pixel_y = 17;
-	pixel_x = -8
-	},
 /obj/effect/turf_decal/corner/opaque/yellow{
 	dir = 1
 	},
@@ -1087,6 +1021,10 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
+/obj/item/flashlight/lamp/green{
+	pixel_y = 17;
+	pixel_x = -8
+	},
 /turf/open/floor/plasteel/dark,
 /area/ship/crew)
 "if" = (
@@ -1221,6 +1159,20 @@
 	},
 /turf/open/floor/plasteel/tech,
 /area/ship/crew)
+"jk" = (
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 4
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/bed/dogbed,
+/mob/living/simple_animal/pet/dog/pug{
+	name = "Solstice"
+	},
+/obj/item/food/meat/slab/human/mutant/skeleton{
+	pixel_y = -4
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/crew)
 "jm" = (
 /obj/effect/turf_decal/siding/thinplating{
 	dir = 4
@@ -1290,7 +1242,6 @@
 /turf/open/floor/plasteel/tech,
 /area/ship/hangar)
 "jR" = (
-/obj/structure/catwalk/over/plated_catwalk,
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
@@ -1298,8 +1249,9 @@
 	icon_state = "1-8"
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 8
+	dir = 10
 	},
+/obj/structure/catwalk/over/plated_catwalk,
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/cargo)
 "jT" = (
@@ -1449,6 +1401,7 @@
 	pixel_y = 15;
 	pixel_x = 10
 	},
+/obj/effect/turf_decal/steeldecal/steel_decals_central7,
 /turf/open/floor/plasteel/dark,
 /area/ship/crew/canteen)
 "kC" = (
@@ -1631,6 +1584,7 @@
 /obj/structure/cable{
 	icon_state = "0-8"
 	},
+/obj/effect/turf_decal/steeldecal/steel_decals_central7,
 /turf/open/floor/plasteel/tech,
 /area/ship/engineering/engines/starboard)
 "li" = (
@@ -1648,14 +1602,14 @@
 	pixel_x = -14;
 	pixel_y = 15
 	},
-/obj/item/coffee_cartridge/fancy{
-	pixel_x = -1;
-	pixel_y = 3
+/obj/item/coffee_cartridge/fancy/blend{
+	pixel_y = 3;
+	pixel_x = -1
 	},
-/obj/item/coffee_cartridge/fancy{
+/obj/item/coffee_cartridge/fancy/mocha{
 	pixel_x = -1
 	},
-/obj/item/coffee_cartridge/fancy{
+/obj/item/coffee_cartridge/fancy/blue{
 	pixel_x = -1;
 	pixel_y = -3
 	},
@@ -1676,6 +1630,11 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/turf_decal/box,
 /obj/structure/railing,
+/obj/machinery/light_switch{
+	dir = 8;
+	pixel_x = 20;
+	pixel_y = -12
+	},
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/engineering/engines/port)
 "lp" = (
@@ -1747,19 +1706,35 @@
 /turf/open/floor/engine/hull/reinforced/interior,
 /area/ship/engineering/engines/port)
 "lF" = (
-/obj/effect/turf_decal/corner/transparent/inteqbrown/half{
-	dir = 8
+/obj/structure/table/chem,
+/obj/structure/sink/chem{
+	dir = 1;
+	pixel_y = -5;
+	pixel_x = -3
 	},
-/obj/structure/table,
-/obj/effect/decal/cleanable/dirt,
-/obj/item/toy/prize/basenji{
-	pixel_x = -7
+/obj/item/stack/sticky_tape/surgical{
+	pixel_y = 12;
+	pixel_x = 5
 	},
-/obj/item/gps{
-	pixel_x = 6;
-	pixel_y = 3
+/obj/item/reagent_containers/glass/rag{
+	pixel_y = 3;
+	pixel_x = 8
+	},
+/obj/machinery/button/door{
+	pixel_x = -21;
+	name = "Window Shutters";
+	id = "sus_med_shutters";
+	dir = 4;
+	pixel_y = 10
 	},
-/turf/open/floor/plasteel,
+/obj/machinery/light/directional/south,
+/obj/item/radio/intercom/directional/west{
+	pixel_y = -5
+	},
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 4
+	},
+/turf/open/floor/plasteel/tech,
 /area/ship/crew/office)
 "lI" = (
 /obj/structure/marker_beacon{
@@ -1815,10 +1790,6 @@
 	pixel_y = -8;
 	pixel_x = -5
 	},
-/obj/item/clothing/gloves/combat{
-	pixel_y = -10;
-	pixel_x = 5
-	},
 /obj/item/clothing/head/beret/sec/inteq{
 	pixel_y = 5;
 	pixel_x = -5
@@ -1832,16 +1803,22 @@
 	},
 /obj/item/storage/pouch/engi,
 /obj/item/clothing/gloves/color/yellow{
-	pixel_y = -8;
-	pixel_x = -8
+	pixel_y = -8
 	},
 /obj/item/clothing/glasses/welding{
 	pixel_x = -4
 	},
-/obj/item/clothing/mask/gas/inteq,
 /obj/item/clothing/suit/hazardvest,
+/obj/item/clothing/suit/hooded/wintercoat/security/inteq{
+	pixel_x = -8;
+	pixel_y = -4
+	},
+/obj/item/clothing/suit/hooded/wintercoat/security/inteq/alt{
+	pixel_x = 8;
+	pixel_y = -4
+	},
 /turf/open/floor/plasteel/tech/grid,
-/area/ship/engineering/engines/starboard)
+/area/ship/engineering)
 "mc" = (
 /obj/structure/table,
 /obj/effect/turf_decal/siding/thinplating{
@@ -1882,11 +1859,10 @@
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/obj/machinery/door/airlock/grunge{
-	name = "Pilot's Office";
-	req_access_txt = "48"
+/obj/machinery/door/airlock/medical/glass{
+	name = "Corpsman's Office"
 	},
-/turf/open/floor/plasteel/tech,
+/turf/open/floor/plasteel/white,
 /area/ship/crew/office)
 "mE" = (
 /obj/effect/turf_decal/borderfloor,
@@ -1964,8 +1940,11 @@
 	dir = 9
 	},
 /obj/effect/decal/cleanable/dirt,
-/obj/structure/closet/crate/large,
+/obj/structure/closet/crate/large{
+	name = "hydrogen canister crate"
+	},
 /obj/machinery/portable_atmospherics/canister/hydrogen,
+/obj/effect/turf_decal/steeldecal/steel_decals_central7,
 /turf/open/floor/plasteel/patterned/grid/dark,
 /area/ship/engineering/engines/port)
 "mN" = (
@@ -1973,7 +1952,7 @@
 	dir = 1
 	},
 /turf/open/floor/plasteel/tech,
-/area/ship/engineering/engines/starboard)
+/area/ship/engineering)
 "mP" = (
 /obj/effect/turf_decal/trimline/opaque/yellow/warning{
 	dir = 10
@@ -2021,7 +2000,11 @@
 /turf/open/floor/plasteel/tech,
 /area/ship/bridge)
 "mW" = (
-/obj/machinery/suit_storage_unit/inherit,
+/obj/machinery/suit_storage_unit/inherit{
+	req_access_txt = "3";
+	name = "master at arms' suit storage unit";
+	locked = 1
+	},
 /obj/item/tank/jetpack/oxygen,
 /obj/item/clothing/suit/space/hardsuit/syndi/inteq,
 /obj/item/clothing/mask/gas/inteq,
@@ -2059,7 +2042,7 @@
 	dir = 1
 	},
 /turf/open/floor/plasteel/tech,
-/area/ship/engineering/engines/starboard)
+/area/ship/engineering)
 "nc" = (
 /obj/structure/table/reinforced,
 /obj/item/mine/pressure/training{
@@ -2085,9 +2068,11 @@
 "nB" = (
 /obj/effect/turf_decal/siding/thinplating/dark,
 /obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/plasma,
 /turf/open/floor/plasteel/tech,
 /area/ship/engineering/engines/starboard)
+"nE" = (
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/ship/engineering)
 "nG" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -2153,29 +2138,54 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/engine/hull/reinforced,
 /area/ship/engineering/engines/starboard)
-"nZ" = (
-/obj/structure/table,
-/obj/effect/turf_decal/corner/transparent/inteqbrown/half{
-	dir = 8
+"nV" = (
+/obj/structure/crate_shelf,
+/obj/structure/closet/crate/hydroponics{
+	name = "ration crate"
 	},
-/obj/machinery/computer/helm/viewscreen/directional/west{
-	pixel_y = 4
+/obj/effect/spawner/random/food_or_drink/ration,
+/obj/effect/spawner/random/food_or_drink/ration,
+/obj/effect/spawner/random/food_or_drink/ration,
+/obj/effect/spawner/random/food_or_drink/ration,
+/obj/effect/spawner/random/food_or_drink/ration,
+/obj/effect/spawner/random/food_or_drink/ration,
+/obj/effect/spawner/random/food_or_drink/ration,
+/obj/effect/spawner/random/food_or_drink/ration,
+/obj/item/reagent_containers/food/drinks/waterbottle/large{
+	pixel_x = 8
 	},
-/obj/item/radio/intercom/wideband/table{
-	dir = 8;
-	pixel_x = -4;
-	pixel_y = -1
+/obj/item/reagent_containers/food/drinks/waterbottle/large{
+	pixel_x = 8
 	},
-/obj/machinery/light/small/directional/west{
-	pixel_y = -13
+/obj/item/reagent_containers/food/drinks/waterbottle/large{
+	pixel_x = 8
 	},
-/obj/structure/sign/poster/contraband/cardinal_fore_aft{
-	pixel_y = -32;
-	pixel_x = 5
+/obj/item/reagent_containers/food/drinks/waterbottle/large{
+	pixel_x = 8
 	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
-/area/ship/crew/office)
+/obj/item/reagent_containers/food/drinks/waterbottle{
+	pixel_y = -5
+	},
+/obj/item/reagent_containers/food/drinks/waterbottle{
+	pixel_y = -5
+	},
+/obj/item/reagent_containers/food/drinks/waterbottle{
+	pixel_y = -5
+	},
+/obj/item/reagent_containers/food/drinks/waterbottle{
+	pixel_y = -5
+	},
+/obj/item/reagent_containers/food/drinks/waterbottle{
+	pixel_y = -5
+	},
+/obj/item/reagent_containers/food/drinks/waterbottle{
+	pixel_y = -5
+	},
+/turf/open/floor/plasteel/patterned,
+/area/ship/cargo)
+"nZ" = (
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/ship/storage/equip)
 "oe" = (
 /obj/effect/turf_decal/corner/opaque/yellow{
 	dir = 1
@@ -2193,66 +2203,18 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plasteel/patterned/grid/dark,
 /area/ship/hangar)
-"oL" = (
-/obj/structure/closet/secure_closet{
-	icon_door = "prisoner";
-	icon_state = "prisoner";
-	name = "shuttle pilot locker";
-	req_access_txt = "48";
-	anchored = 1
-	},
-/obj/item/storage/backpack/messenger/inteq,
-/obj/item/clothing/under/syndicate/inteq{
-	pixel_x = -5
-	},
-/obj/item/clothing/under/syndicate/inteq/skirt{
-	pixel_x = 5
-	},
-/obj/item/clothing/shoes/combat{
-	pixel_y = -8;
-	pixel_x = -5
-	},
-/obj/item/clothing/gloves/combat{
-	pixel_y = -10;
-	pixel_x = 5
-	},
-/obj/item/clothing/head/beret/sec/inteq{
-	pixel_y = 5;
-	pixel_x = -5
-	},
-/obj/item/clothing/head/soft/inteq{
-	pixel_x = 5;
-	pixel_y = 5
-	},
-/obj/item/clothing/mask/balaclava/inteq{
-	pixel_x = -5
-	},
-/obj/item/clothing/suit/hooded/wintercoat/security/inteq,
-/obj/item/clothing/suit/hooded/wintercoat/security/inteq/alt,
-/obj/item/clothing/glasses/hud/security/sunglasses/inteq{
-	pixel_x = 5
-	},
-/obj/item/storage/belt/security/webbing/inteq/alt,
-/obj/effect/turf_decal/siding/thinplating/dark{
-	dir = 8
-	},
-/obj/machinery/power/apc/auto_name/directional/north,
-/obj/structure/cable{
-	icon_state = "0-8"
-	},
-/obj/machinery/light_switch{
-	pixel_x = -12;
-	pixel_y = 22
+"oN" = (
+/obj/effect/turf_decal/corner/opaque/white{
+	dir = 6
 	},
-/obj/item/storage/pouch/squad{
-	pixel_y = -5
+/obj/effect/turf_decal/trimline/opaque/inteqbrownlight/line{
+	dir = 4
 	},
-/obj/item/radio/headset/inteq/alt,
-/obj/item/megaphone/cargo,
-/turf/open/floor/plasteel/tech,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/turf/open/floor/plasteel/patterned/grid/dark,
 /area/ship/crew/office)
 "oX" = (
-/obj/structure/chair/sofa/brown/right/directional/south,
+/obj/effect/spawner/bunk_bed,
 /obj/effect/turf_decal/corner/opaque/yellow{
 	dir = 1
 	},
@@ -2268,18 +2230,6 @@
 	},
 /turf/open/floor/plasteel/dark,
 /area/ship/crew)
-"oZ" = (
-/obj/machinery/suit_storage_unit/inherit,
-/obj/effect/turf_decal/siding/thinplating/dark{
-	dir = 8
-	},
-/obj/item/tank/internals/oxygen/yellow,
-/obj/item/clothing/suit/space/inteq,
-/obj/item/clothing/head/helmet/space/inteq,
-/obj/effect/decal/cleanable/dirt,
-/obj/item/clothing/mask/gas/inteq,
-/turf/open/floor/plasteel/tech,
-/area/ship/crew/office)
 "pa" = (
 /obj/structure/bed/double{
 	dir = 1
@@ -2317,6 +2267,10 @@
 	dir = 8
 	},
 /obj/effect/decal/cleanable/dirt,
+/obj/structure/sign/poster/contraband/cardinal_fore_aft{
+	pixel_y = 32;
+	pixel_x = 5
+	},
 /turf/open/floor/plasteel/patterned,
 /area/ship/hangar)
 "ps" = (
@@ -2329,14 +2283,16 @@
 /turf/open/floor/plasteel/patterned,
 /area/ship/hangar)
 "pu" = (
-/obj/structure/crate_shelf,
-/obj/structure/closet/crate/freezer/blood,
-/obj/machinery/iv_drip,
 /obj/machinery/light/directional/north,
 /obj/machinery/camera/autoname{
 	dir = 6
 	},
 /obj/effect/decal/cleanable/dirt,
+/obj/structure/rack,
+/obj/item/towel{
+	pixel_x = -5;
+	pixel_y = 4
+	},
 /turf/open/floor/plasteel/patterned,
 /area/ship/cargo)
 "pz" = (
@@ -2352,6 +2308,7 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 5
 	},
+/obj/structure/chair/sofa/brown/right/directional/south,
 /turf/open/floor/carpet/black,
 /area/ship/crew)
 "pC" = (
@@ -2529,13 +2486,16 @@
 /turf/open/floor/plating,
 /area/ship/hangar)
 "qu" = (
-/obj/structure/reagent_dispensers/fueltank,
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable{
-	icon_state = "1-2"
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 8
 	},
-/turf/open/floor/plasteel/patterned/cargo_one,
-/area/ship/cargo)
+/obj/effect/turf_decal/trimline/opaque/bottlegreen/line{
+	dir = 4
+	},
+/obj/structure/closet/crate/freezer/blood,
+/obj/machinery/airalarm/directional/south,
+/turf/open/floor/plasteel/patterned/brushed,
+/area/ship/crew/office)
 "qx" = (
 /obj/machinery/atmospherics/pipe/layer_manifold{
 	dir = 8
@@ -2613,8 +2573,7 @@
 	dir = 5
 	},
 /obj/effect/turf_decal/siding/thinplating/dark{
-	dir = 10;
-	layer = 2.030
+	dir = 10
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 5
@@ -2884,18 +2843,62 @@
 /turf/open/floor/plasteel/patterned/grid,
 /area/ship/hallway/central)
 "tl" = (
-/obj/structure/sign/poster/contraband/cardinal_port_starboard{
-	pixel_y = -32;
-	pixel_x = -6
+/obj/effect/turf_decal/corner/opaque/white{
+	dir = 10
+	},
+/obj/effect/turf_decal/trimline/opaque/inteqbrownlight/line,
+/obj/structure/closet/secure_closet/wall/directional/south{
+	icon_door = "med_wall";
+	req_access_txt = "5";
+	name = "corpsman's locker"
+	},
+/obj/item/storage/backpack/medic{
+	pixel_y = 5
+	},
+/obj/item/storage/backpack/satchel/med,
+/obj/item/storage/backpack/duffelbag/med{
+	pixel_y = -5
+	},
+/obj/item/clothing/under/syndicate/inteq/corpsman{
+	pixel_x = -5
+	},
+/obj/item/clothing/under/syndicate/inteq/corpsman/skirt{
+	pixel_x = 5
+	},
+/obj/item/clothing/shoes/combat{
+	pixel_y = -8;
+	pixel_x = -5
+	},
+/obj/item/clothing/gloves/color/latex/nitrile/inteq{
+	pixel_x = 5;
+	pixel_y = -10
+	},
+/obj/item/clothing/mask/balaclava/inteq{
+	pixel_x = -5
 	},
+/obj/item/clothing/suit/armor/inteq/corpsman{
+	pixel_x = 5
+	},
+/obj/item/clothing/head/soft/inteq/corpsman{
+	pixel_y = 5
+	},
+/obj/item/clothing/glasses/hud/health{
+	pixel_x = 5
+	},
+/obj/item/storage/belt/medical/webbing,
+/obj/item/clothing/mask/surgical,
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
 	dir = 4
 	},
-/obj/machinery/camera/autoname{
-	dir = 10
+/obj/item/clothing/suit/hooded/wintercoat/security/inteq{
+	pixel_x = -8;
+	pixel_y = -4
 	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
+/obj/item/clothing/suit/hooded/wintercoat/security/inteq/alt{
+	pixel_x = 8;
+	pixel_y = -4
+	},
+/turf/open/floor/plasteel/patterned/grid/dark,
 /area/ship/crew/office)
 "tv" = (
 /obj/effect/turf_decal/industrial/warning/dust/corner{
@@ -2965,12 +2968,30 @@
 	pixel_x = -6;
 	pixel_y = -3
 	},
+/obj/item/clothing/suit/space/inteq{
+	pixel_x = -6;
+	pixel_y = -3
+	},
+/obj/item/clothing/suit/space/inteq{
+	pixel_x = -6;
+	pixel_y = -3
+	},
 /obj/item/clothing/head/helmet/space/inteq{
 	pixel_x = -6
 	},
 /obj/item/clothing/head/helmet/space/inteq{
 	pixel_x = -6
 	},
+/obj/item/clothing/head/helmet/space/inteq{
+	pixel_x = -6
+	},
+/obj/item/clothing/head/helmet/space/inteq{
+	pixel_x = -6
+	},
+/obj/item/clothing/mask/gas/inteq,
+/obj/item/clothing/mask/gas/inteq,
+/obj/item/clothing/mask/gas/inteq,
+/obj/item/clothing/mask/gas/inteq,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 10
 	},
@@ -2982,7 +3003,7 @@
 	},
 /obj/effect/mapping_helpers/crate_shelve,
 /turf/open/floor/plasteel/tech,
-/area/ship/engineering/engines/port)
+/area/ship/storage/port)
 "tZ" = (
 /turf/open/floor/carpet/black,
 /area/ship/crew)
@@ -3075,18 +3096,13 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/power/apc/auto_name/directional/east,
-/obj/machinery/light_switch{
-	dir = 8;
-	pixel_x = 20;
-	pixel_y = 12
-	},
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
 /obj/structure/cable{
-	icon_state = "0-2"
+	icon_state = "2-8"
 	},
+/obj/machinery/airalarm/directional/east,
 /turf/open/floor/plasteel/dark,
 /area/ship/crew)
 "uy" = (
@@ -3112,7 +3128,7 @@
 	icon_state = "4-8"
 	},
 /turf/open/floor/plasteel/tech,
-/area/ship/engineering/engines/port)
+/area/ship/storage/port)
 "uA" = (
 /obj/structure/chair/comfy/shuttle{
 	name = "Operations"
@@ -3133,68 +3149,29 @@
 /obj/effect/turf_decal/siding/thinplating/dark{
 	dir = 8
 	},
-/obj/structure/filingcabinet/double{
-	dir = 8;
-	pixel_x = 10;
-	density = 0
-	},
-/obj/machinery/light/directional/east,
-/obj/item/folder/syndicate{
-	desc = "A slick black folder stamped 'Property of Inteq Risk Management Group.'";
-	pixel_x = -8
-	},
-/obj/item/folder/syndicate{
-	desc = "A slick black folder stamped 'Property of Inteq Risk Management Group.'";
-	pixel_x = -8;
-	pixel_y = -4
-	},
-/obj/item/clipboard{
-	pixel_y = -2
+/obj/effect/turf_decal/trimline/opaque/bottlegreen/line{
+	dir = 4
 	},
-/turf/open/floor/plasteel/tech,
+/obj/structure/bed/roller,
+/turf/open/floor/plasteel/patterned/brushed,
 /area/ship/crew/office)
 "uP" = (
-/obj/structure/closet/crate/medical{
-	name = "corpsman's kit"
-	},
-/obj/item/storage/backpack/medic{
-	pixel_y = 5
-	},
-/obj/item/storage/backpack/satchel/med,
-/obj/item/storage/backpack/duffelbag/med{
-	pixel_y = -5
-	},
-/obj/item/clothing/under/syndicate/inteq/corpsman{
-	pixel_x = -5
-	},
-/obj/item/clothing/under/syndicate/inteq/corpsman/skirt{
-	pixel_x = 5
-	},
-/obj/item/clothing/shoes/combat{
-	pixel_y = -8;
-	pixel_x = -5
-	},
-/obj/item/clothing/gloves/color/latex/nitrile/inteq{
-	pixel_x = 5;
-	pixel_y = -10
-	},
-/obj/item/clothing/mask/balaclava/inteq{
-	pixel_x = -5
-	},
-/obj/item/clothing/suit/armor/inteq/corpsman{
-	pixel_x = 5
+/obj/effect/turf_decal/industrial/traffic{
+	dir = 8
 	},
-/obj/item/clothing/head/soft/inteq/corpsman{
-	pixel_y = 5
+/obj/machinery/suit_storage_unit/inherit{
+	name = "shuttle pilot's suit storage unit";
+	req_access_txt = "48"
 	},
-/obj/item/clothing/glasses/hud/health{
-	pixel_x = 5
+/obj/machinery/door/firedoor/border_only{
+	dir = 8
 	},
-/obj/item/storage/belt/medical/webbing,
-/obj/item/clothing/mask/surgical,
-/obj/effect/mapping_helpers/crate_shelve,
+/obj/item/tank/internals/oxygen/yellow,
+/obj/item/clothing/suit/space/inteq/pilot,
+/obj/item/clothing/head/helmet/space/inteq/pilot,
+/obj/item/clothing/mask/gas/inteq,
 /turf/open/floor/plasteel/patterned,
-/area/ship/cargo)
+/area/ship/hangar)
 "uZ" = (
 /obj/effect/turf_decal/corner/opaque/yellow,
 /obj/effect/turf_decal/corner/opaque/brown{
@@ -3248,13 +3225,9 @@
 /obj/effect/turf_decal/box/corners{
 	dir = 8
 	},
-/obj/structure/rack,
-/obj/item/stack/sheet/metal/five{
-	pixel_x = -5;
-	pixel_y = 5
+/obj/machinery/computer/monitor{
+	dir = 1
 	},
-/obj/item/stack/sheet/glass/five,
-/obj/item/wrench/crescent,
 /turf/open/floor/plating,
 /area/ship/engineering/engines/starboard)
 "vh" = (
@@ -3299,8 +3272,11 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 5
 	},
+/obj/structure/cable{
+	icon_state = "1-8"
+	},
 /turf/open/floor/plasteel/tech,
-/area/ship/security/armory)
+/area/ship/storage/equip)
 "vs" = (
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/ship/crew/dorm/captain)
@@ -3438,6 +3414,9 @@
 	pixel_x = 4;
 	pixel_y = -5
 	},
+/obj/structure/sign/poster/contraband/twelve_gauge{
+	pixel_x = 32
+	},
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/security/armory)
 "vI" = (
@@ -3447,7 +3426,7 @@
 	icon_state = "0-4"
 	},
 /turf/open/floor/plating,
-/area/ship/security/armory)
+/area/ship/storage/equip)
 "vK" = (
 /obj/structure/sign/warning/electricshock{
 	pixel_y = 8
@@ -3475,19 +3454,72 @@
 /obj/effect/turf_decal/industrial/traffic{
 	dir = 8
 	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel/patterned,
-/area/ship/hangar)
-"wq" = (
-/obj/effect/turf_decal/trimline/opaque/yellow/warning{
-	dir = 1
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/patterned,
+/area/ship/hangar)
+"wq" = (
+/obj/structure/table/chem,
+/obj/structure/closet/secure_closet/wall/directional/north{
+	icon_door = "med_wall";
+	name = "medical locker";
+	req_access_txt = "5"
+	},
+/obj/item/storage/firstaid/regular{
+	pixel_y = 15;
+	pixel_x = -3
+	},
+/obj/item/storage/firstaid/medical{
+	pixel_x = -3;
+	pixel_y = 10
+	},
+/obj/item/sensor_device{
+	pixel_x = -3;
+	pixel_y = 4
+	},
+/obj/item/reagent_containers/glass/bottle/dimorlin{
+	pixel_y = 6;
+	pixel_x = 8
+	},
+/obj/item/reagent_containers/glass/bottle/dimorlin{
+	pixel_y = 1;
+	pixel_x = 8
+	},
+/obj/item/reagent_containers/syringe{
+	pixel_y = 5;
+	pixel_x = 6
+	},
+/obj/item/storage/pill_bottle/charcoal{
+	pixel_x = 1;
+	pixel_y = -1
+	},
+/obj/item/bodybag{
+	pixel_x = -7
+	},
+/obj/item/bodybag{
+	pixel_x = -7
+	},
+/obj/item/bodybag{
+	pixel_x = -7
+	},
+/obj/item/bodybag{
+	pixel_x = -7
+	},
+/obj/item/wrench/medical{
+	pixel_x = -8
 	},
-/obj/structure/sign/warning/securearea{
-	pixel_y = 28;
-	pixel_x = -26
+/obj/item/reagent_containers/glass/bottle/formaldehyde{
+	pixel_x = 8;
+	pixel_y = -4
 	},
-/turf/open/floor/engine/hull/reinforced,
-/area/ship/external/dark)
+/obj/item/bonesetter{
+	pixel_y = 4
+	},
+/obj/item/reagent_scanner,
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 4
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/crew/office)
 "ws" = (
 /obj/structure/grille,
 /obj/structure/window/plasma/reinforced/plastitanium,
@@ -3542,12 +3574,7 @@
 	req_access_txt = "20"
 	},
 /obj/item/storage/backpack/messenger/inteq,
-/obj/item/clothing/under/syndicate/inteq{
-	pixel_x = -5
-	},
-/obj/item/clothing/under/syndicate/inteq/skirt{
-	pixel_x = 5
-	},
+/obj/item/clothing/under/syndicate/inteq/honorable,
 /obj/item/clothing/shoes/combat{
 	pixel_y = -8;
 	pixel_x = -5
@@ -3612,11 +3639,10 @@
 /turf/open/floor/plating,
 /area/ship/hangar)
 "xj" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
-	dir = 4
+/obj/structure/chair/office/light{
+	dir = 8
 	},
-/obj/machinery/airalarm/directional/north,
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/patterned/grid/dark,
 /area/ship/crew/office)
 "xn" = (
 /obj/effect/turf_decal/corner/opaque/yellow/full,
@@ -3626,12 +3652,7 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
 "xr" = (
-/obj/structure/bed/double{
-	dir = 1
-	},
-/obj/item/bedsheet/double/brown{
-	dir = 1
-	},
+/obj/effect/spawner/bunk_bed,
 /obj/effect/turf_decal/corner/opaque/yellow{
 	dir = 1
 	},
@@ -3723,7 +3744,9 @@
 	dir = 8
 	},
 /obj/machinery/suit_storage_unit/inherit{
-	req_access_txt = "1"
+	req_access_txt = "1";
+	name = "enforcer's suit storage unit";
+	locked = 1
 	},
 /obj/item/tank/internals/oxygen/yellow,
 /obj/item/clothing/suit/space/hardsuit/security/inteq,
@@ -3731,7 +3754,7 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/light/directional/west,
 /turf/open/floor/plasteel/tech/grid,
-/area/ship/security/armory)
+/area/ship/storage/equip)
 "yh" = (
 /obj/machinery/atmospherics/pipe/simple/orange/hidden{
 	dir = 10
@@ -3779,17 +3802,20 @@
 /turf/open/floor/plasteel/patterned,
 /area/ship/cargo)
 "yX" = (
-/obj/effect/turf_decal/corner/transparent/inteqbrown/half{
-	dir = 4
+/obj/effect/turf_decal/corner/opaque/white/three_quarters{
+	dir = 8
+	},
+/obj/effect/turf_decal/trimline/opaque/inteqbrownlight/warning{
+	dir = 5
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 9
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /obj/structure/cable{
-	icon_state = "1-4"
+	icon_state = "1-8"
 	},
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/patterned/grid/dark,
 /area/ship/crew/office)
 "zc" = (
 /obj/structure/table/reinforced,
@@ -3801,9 +3827,6 @@
 /area/ship/crew/canteen)
 "zd" = (
 /obj/effect/turf_decal/box/corners,
-/obj/structure/chair/handrail{
-	dir = 8
-	},
 /obj/item/radio/intercom/directional/east,
 /obj/item/trash/energybar{
 	pixel_y = 12;
@@ -3833,9 +3856,6 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 10
-	},
 /turf/open/floor/plasteel/stairs/right{
 	dir = 4
 	},
@@ -3869,6 +3889,9 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
+/obj/structure/cable{
+	icon_state = "2-4"
+	},
 /turf/open/floor/plasteel/tech,
 /area/ship/engineering/engines/starboard)
 "zr" = (
@@ -3942,10 +3965,13 @@
 /obj/machinery/power/terminal{
 	dir = 8
 	},
-/obj/structure/catwalk/over/plated_catwalk/dark,
 /obj/structure/cable/yellow{
 	icon_state = "0-4"
 	},
+/obj/machinery/power/port_gen/pacman{
+	anchored = 1
+	},
+/obj/structure/catwalk/over/plated_catwalk/dark,
 /turf/open/floor/plating,
 /area/ship/engineering/engines/starboard)
 "zR" = (
@@ -3990,8 +4016,18 @@
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
+/obj/machinery/power/apc/auto_name/directional/east,
+/obj/machinery/light_switch{
+	dir = 8;
+	pixel_x = 20;
+	pixel_y = 12
+	},
+/obj/effect/turf_decal/steeldecal/steel_decals_central7,
+/obj/structure/cable{
+	icon_state = "0-2"
+	},
 /turf/open/floor/plasteel/tech,
-/area/ship/engineering/engines/port)
+/area/ship/storage/port)
 "zV" = (
 /obj/machinery/computer/security{
 	dir = 1;
@@ -4026,7 +4062,6 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/effect/mapping_helpers/crate_shelve,
 /obj/item/storage/toolbox/ammo,
 /obj/item/mine/pressure/training,
 /obj/item/mine/pressure/training,
@@ -4034,8 +4069,9 @@
 /obj/item/mine/pressure/training,
 /obj/item/mine/pressure/training,
 /obj/item/mine/pressure/training,
+/obj/effect/mapping_helpers/crate_shelve,
 /turf/open/floor/plasteel/tech,
-/area/ship/engineering/engines/port)
+/area/ship/storage/port)
 "Ag" = (
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
 	dir = 1
@@ -4063,6 +4099,10 @@
 /obj/machinery/cell_charger{
 	pixel_y = 6
 	},
+/obj/item/stock_parts/cell/computer{
+	pixel_x = 8;
+	pixel_y = -4
+	},
 /turf/open/floor/plasteel/dark,
 /area/ship/crew/canteen)
 "AF" = (
@@ -4119,51 +4159,62 @@
 /turf/open/floor/plasteel/tech,
 /area/ship/external/dark)
 "AQ" = (
-/obj/structure/crate_shelf,
 /obj/machinery/light/directional/south,
 /obj/machinery/camera/autoname{
 	dir = 10
 	},
-/obj/structure/closet/crate{
-	name = "food crate"
+/obj/structure/crate_shelf,
+/obj/structure/closet/crate/secure/gear{
+	name = "training equipment crate"
 	},
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/item/reagent_containers/food/drinks/waterbottle/large{
-	pixel_x = 8
+/obj/item/target/alien{
+	pixel_y = 3;
+	pixel_x = 5
 	},
-/obj/item/reagent_containers/food/drinks/waterbottle/large{
-	pixel_x = 8
+/obj/item/target/alien{
+	pixel_y = 3;
+	pixel_x = 5
 	},
-/obj/item/reagent_containers/food/drinks/waterbottle/large{
-	pixel_x = 8
+/obj/item/target/alien{
+	pixel_y = 3;
+	pixel_x = 5
 	},
-/obj/item/reagent_containers/food/drinks/waterbottle/large{
-	pixel_x = 8
+/obj/item/target/syndicate{
+	pixel_y = 3
 	},
-/obj/item/reagent_containers/food/drinks/waterbottle{
-	pixel_y = -5
+/obj/item/target/syndicate{
+	pixel_y = 3
 	},
-/obj/item/reagent_containers/food/drinks/waterbottle{
-	pixel_y = -5
+/obj/item/target/syndicate{
+	pixel_y = 3
 	},
-/obj/item/reagent_containers/food/drinks/waterbottle{
-	pixel_y = -5
+/obj/item/target{
+	pixel_x = -5;
+	pixel_y = 2
 	},
-/obj/item/reagent_containers/food/drinks/waterbottle{
-	pixel_y = -5
+/obj/item/target{
+	pixel_x = -5;
+	pixel_y = 2
 	},
-/obj/item/reagent_containers/food/drinks/waterbottle{
-	pixel_y = -5
+/obj/item/target{
+	pixel_x = -5;
+	pixel_y = 2
 	},
-/obj/item/reagent_containers/food/drinks/waterbottle{
-	pixel_y = -5
+/obj/item/gun/energy/laser/practice,
+/obj/item/gun/energy/laser/practice{
+	pixel_y = -4
+	},
+/obj/item/gun/energy/laser/practice{
+	pixel_y = -8
+	},
+/obj/item/clothing/ears/earmuffs{
+	pixel_y = 6
+	},
+/obj/item/clothing/ears/earmuffs{
+	pixel_y = 6
+	},
+/obj/item/clothing/ears/earmuffs{
+	pixel_y = 6
 	},
 /turf/open/floor/plasteel/patterned,
 /area/ship/cargo)
@@ -4174,6 +4225,7 @@
 /obj/effect/turf_decal/trimline/opaque/yellow/line{
 	dir = 10
 	},
+/obj/item/kirbyplants/random,
 /turf/open/floor/plasteel/patterned/grid,
 /area/ship/hallway/central)
 "AV" = (
@@ -4249,8 +4301,14 @@
 /obj/effect/turf_decal/siding/thinplating/dark,
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/decal/cleanable/plastic,
+/obj/structure/extinguisher_cabinet/directional/south{
+	pixel_x = 6
+	},
+/obj/machinery/firealarm/directional/south{
+	pixel_x = -6
+	},
 /turf/open/floor/plasteel/tech,
-/area/ship/engineering/engines/port)
+/area/ship/storage/port)
 "BH" = (
 /obj/effect/turf_decal/industrial/warning/dust/corner{
 	dir = 1
@@ -4283,7 +4341,7 @@
 	pixel_x = 7
 	},
 /turf/open/floor/plasteel/tech/grid,
-/area/ship/security/armory)
+/area/ship/storage/equip)
 "BK" = (
 /obj/effect/turf_decal/siding/thinplating/corner{
 	dir = 8
@@ -4301,18 +4359,14 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plasteel/patterned/grid,
 /area/ship/hallway/central)
-"BL" = (
-/obj/structure/chair/office{
-	dir = 8
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
-/area/ship/crew/office)
 "BS" = (
 /obj/machinery/recharge_station,
 /obj/effect/turf_decal/siding/thinplating/dark{
 	dir = 4
 	},
+/obj/structure/sign/poster/contraband/lusty_xenomorph{
+	pixel_x = -32
+	},
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plasteel/tech,
 /area/ship/crew)
@@ -4391,6 +4445,12 @@
 	},
 /turf/open/floor/plasteel/tech,
 /area/ship/engineering/engines/port)
+"CB" = (
+/obj/structure/sign/number/random{
+	pixel_y = -8
+	},
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/ship/storage/equip)
 "CE" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 8
@@ -4445,19 +4505,37 @@
 /turf/open/floor/plasteel/patterned/grid,
 /area/ship/hallway/central)
 "CR" = (
-/obj/effect/decal/cleanable/crayon{
-	icon_state = "med";
-	color = "#6ccca0";
-	paint_colour = "#6ccca0"
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 8
 	},
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable{
-	icon_state = "1-2"
+/obj/effect/turf_decal/trimline/opaque/bottlegreen/line{
+	dir = 4
 	},
-/turf/open/floor/plasteel/patterned/cargo_one,
-/area/ship/cargo)
+/obj/structure/rack,
+/obj/item/roller{
+	pixel_x = 5;
+	pixel_y = 10
+	},
+/obj/item/roller{
+	pixel_x = 5;
+	pixel_y = 5
+	},
+/obj/item/roller{
+	pixel_x = 5
+	},
+/obj/item/stack/medical/splint{
+	pixel_y = 4;
+	pixel_x = -4
+	},
+/obj/item/storage/pouch/medical{
+	pixel_y = -9;
+	pixel_x = -9
+	},
+/obj/machinery/light/small/directional/north,
+/turf/open/floor/plasteel/patterned/brushed,
+/area/ship/crew/office)
 "CS" = (
-/obj/structure/chair/sofa/brown/left/directional/south,
+/obj/effect/spawner/bunk_bed,
 /obj/effect/turf_decal/corner/opaque/brown{
 	dir = 4
 	},
@@ -4465,7 +4543,6 @@
 /obj/effect/turf_decal/corner/opaque/yellow{
 	dir = 1
 	},
-/obj/item/radio/intercom/directional/east,
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -4473,6 +4550,7 @@
 /obj/structure/cable{
 	icon_state = "2-8"
 	},
+/obj/machinery/light/directional/east,
 /turf/open/floor/plasteel/dark,
 /area/ship/crew)
 "CT" = (
@@ -4495,6 +4573,21 @@
 	},
 /turf/open/floor/engine/hull/reinforced,
 /area/ship/engineering/engines/starboard)
+"Df" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 8
+	},
+/obj/structure/chair/sofa/brown/left/directional/south,
+/obj/item/toy/plush/blahaj{
+	pixel_x = 4;
+	pixel_y = -2;
+	name = "Kaz"
+	},
+/turf/open/floor/carpet/black,
+/area/ship/crew)
 "Dj" = (
 /obj/effect/turf_decal/corner/opaque/yellow{
 	dir = 1
@@ -4596,9 +4689,6 @@
 	},
 /obj/machinery/power/apc/auto_name/directional/west,
 /obj/structure/cable,
-/obj/structure/chair/handrail{
-	dir = 4
-	},
 /obj/machinery/light_switch{
 	dir = 4;
 	pixel_x = -20;
@@ -4607,6 +4697,7 @@
 /obj/machinery/camera/autoname{
 	dir = 5
 	},
+/obj/effect/turf_decal/steeldecal/steel_decals_central7,
 /turf/open/floor/plasteel/patterned/grid,
 /area/ship/hallway/central)
 "DU" = (
@@ -4650,6 +4741,13 @@
 /obj/effect/turf_decal/siding/thinplating/dark{
 	dir = 9
 	},
+/obj/structure/rack,
+/obj/item/stack/sheet/metal/five{
+	pixel_x = -5;
+	pixel_y = 5
+	},
+/obj/item/stack/sheet/glass/five,
+/obj/item/wrench/crescent,
 /turf/open/floor/plasteel/tech,
 /area/ship/engineering/engines/starboard)
 "Eo" = (
@@ -4744,7 +4842,7 @@
 	pixel_x = 2
 	},
 /turf/open/floor/plasteel/tech,
-/area/ship/security/armory)
+/area/ship/storage/equip)
 "EW" = (
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
 	dir = 8
@@ -4783,19 +4881,26 @@
 /turf/open/floor/engine/hull/reinforced,
 /area/ship/engineering/engines/starboard)
 "Fo" = (
-/obj/effect/turf_decal/corner/transparent/inteqbrown/half{
-	dir = 4
+/obj/effect/turf_decal/corner/opaque/white/three_quarters,
+/obj/effect/turf_decal/trimline/opaque/inteqbrownlight/line{
+	dir = 6
+	},
+/obj/machinery/iv_drip{
+	pixel_x = 8
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 9
 	},
+/obj/machinery/camera/autoname{
+	dir = 1
+	},
 /obj/machinery/firealarm/directional/south{
-	pixel_x = -6
+	pixel_x = -2
 	},
 /obj/structure/extinguisher_cabinet/directional/south{
-	pixel_x = 6
+	pixel_x = 10
 	},
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/patterned/grid/dark,
 /area/ship/crew/office)
 "Fw" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
@@ -4837,8 +4942,21 @@
 /obj/effect/turf_decal/siding/thinplating/dark{
 	dir = 4
 	},
+/obj/machinery/power/apc/auto_name/directional/east,
+/obj/machinery/light_switch{
+	dir = 8;
+	pixel_x = 20;
+	pixel_y = 12
+	},
+/obj/effect/turf_decal/steeldecal/steel_decals_central7,
+/obj/structure/cable,
 /turf/open/floor/plasteel/tech,
-/area/ship/engineering/engines/starboard)
+/area/ship/engineering)
+"FI" = (
+/obj/effect/turf_decal/siding/thinplating/dark,
+/obj/effect/decal/cleanable/food/egg_smudge,
+/turf/open/floor/plasteel/patterned/brushed,
+/area/ship/crew/canteen)
 "FM" = (
 /obj/effect/turf_decal/corner/opaque/yellow{
 	dir = 10
@@ -4849,15 +4967,11 @@
 /obj/effect/turf_decal/trimline/opaque/yellow/line{
 	dir = 1
 	},
-/obj/structure/cable{
-	icon_state = "0-2"
-	},
+/obj/machinery/camera/autoname,
 /obj/machinery/power/apc/auto_name/directional/north,
-/obj/machinery/light_switch{
-	pixel_x = 11;
-	pixel_y = 22
+/obj/structure/cable{
+	icon_state = "0-2"
 	},
-/obj/machinery/camera/autoname,
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
 "FQ" = (
@@ -4912,8 +5026,16 @@
 /obj/item/storage/belt/security/webbing/inteq,
 /obj/item/storage/belt/security/webbing/inteq/alt,
 /obj/effect/decal/cleanable/dirt,
+/obj/item/clothing/suit/hooded/wintercoat/security/inteq{
+	pixel_x = -8;
+	pixel_y = -4
+	},
+/obj/item/clothing/suit/hooded/wintercoat/security/inteq/alt{
+	pixel_x = 8;
+	pixel_y = -4
+	},
 /turf/open/floor/plasteel/tech,
-/area/ship/security/armory)
+/area/ship/storage/equip)
 "FX" = (
 /turf/open/floor/plasteel/mono,
 /area/ship/hangar)
@@ -4923,21 +5045,71 @@
 	pixel_y = 32
 	},
 /turf/open/floor/plasteel/tech/grid,
-/area/ship/engineering/engines/port)
+/area/ship/storage/port)
 "Gi" = (
-/obj/machinery/light/directional/east,
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
+/obj/structure/closet/wall/directional/east{
+	name = "uniform closet"
+	},
+/obj/item/clothing/under/syndicate/inteq{
+	pixel_x = -8
+	},
+/obj/item/clothing/under/syndicate/inteq{
+	pixel_x = -8
+	},
+/obj/item/clothing/under/syndicate/inteq{
+	pixel_x = -8
+	},
+/obj/item/clothing/under/syndicate/inteq/skirt{
+	pixel_x = 8
+	},
+/obj/item/clothing/under/syndicate/inteq/skirt{
+	pixel_x = 8
+	},
+/obj/item/clothing/under/syndicate/inteq/skirt{
+	pixel_x = 8
+	},
+/obj/item/clothing/shoes/combat{
+	pixel_y = -8;
+	pixel_x = -8
+	},
+/obj/item/clothing/shoes/combat{
+	pixel_y = -8;
+	pixel_x = -8
+	},
+/obj/item/clothing/shoes/combat{
+	pixel_y = -8;
+	pixel_x = -8
+	},
+/obj/item/clothing/shoes/sneakers/black{
+	pixel_x = 8;
+	pixel_y = -13
+	},
+/obj/item/clothing/shoes/sneakers/black{
+	pixel_x = 8;
+	pixel_y = -13
+	},
+/obj/item/clothing/shoes/sneakers/black{
+	pixel_x = 8;
+	pixel_y = -13
+	},
+/obj/item/clothing/gloves/color/black{
+	pixel_y = -4
+	},
+/obj/item/clothing/gloves/color/black{
+	pixel_y = -4
+	},
+/obj/item/clothing/gloves/color/black{
+	pixel_y = -4
+	},
 /turf/open/floor/carpet/black,
 /area/ship/crew)
 "Gj" = (
 /obj/effect/turf_decal/box/corners{
 	dir = 4
 	},
-/obj/structure/chair/handrail{
-	dir = 8
-	},
 /obj/machinery/button/shieldwallgen{
 	dir = 8;
 	id = "sus_cargo_field";
@@ -4994,7 +5166,7 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/item/radio/intercom/directional/south,
 /turf/open/floor/plasteel/tech/grid,
-/area/ship/security/armory)
+/area/ship/storage/equip)
 "Gx" = (
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/ship/crew/cryo)
@@ -5136,7 +5308,7 @@
 	},
 /obj/machinery/light/small/directional/east,
 /turf/open/floor/plasteel/tech/grid,
-/area/ship/security/armory)
+/area/ship/storage/equip)
 "Hd" = (
 /obj/machinery/light/directional/west,
 /obj/effect/turf_decal/industrial/traffic/corner{
@@ -5156,66 +5328,22 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plasteel/tech,
-/area/ship/engineering/engines/starboard)
+/area/ship/engineering)
 "Hj" = (
 /obj/effect/turf_decal/corner/opaque/brown{
 	dir = 8
 	},
 /obj/effect/turf_decal/corner/opaque/yellow,
-/obj/structure/closet/wall/directional/south{
-	name = "uniform closet"
-	},
-/obj/item/clothing/under/syndicate/inteq{
-	pixel_x = -8
-	},
-/obj/item/clothing/under/syndicate/inteq{
-	pixel_x = -8
-	},
-/obj/item/clothing/under/syndicate/inteq{
-	pixel_x = -8
-	},
-/obj/item/clothing/under/syndicate/inteq/skirt{
-	pixel_x = 8
-	},
-/obj/item/clothing/under/syndicate/inteq/skirt{
-	pixel_x = 8
-	},
-/obj/item/clothing/under/syndicate/inteq/skirt{
-	pixel_x = 8
-	},
-/obj/item/clothing/shoes/combat{
-	pixel_y = -8;
-	pixel_x = -8
-	},
-/obj/item/clothing/shoes/combat{
-	pixel_y = -8;
-	pixel_x = -8
-	},
-/obj/item/clothing/shoes/combat{
-	pixel_y = -8;
-	pixel_x = -8
-	},
-/obj/item/clothing/shoes/sneakers/black{
-	pixel_x = 8;
-	pixel_y = -13
-	},
-/obj/item/clothing/shoes/sneakers/black{
-	pixel_x = 8;
-	pixel_y = -13
-	},
-/obj/item/clothing/shoes/sneakers/black{
-	pixel_x = 8;
-	pixel_y = -13
-	},
-/obj/item/clothing/gloves/color/black{
-	pixel_y = -4
-	},
-/obj/item/clothing/gloves/color/black{
-	pixel_y = -4
+/obj/machinery/power/apc/auto_name/directional/south,
+/obj/machinery/light_switch{
+	dir = 1;
+	pixel_x = 11;
+	pixel_y = -20
 	},
-/obj/item/clothing/gloves/color/black{
-	pixel_y = -4
+/obj/structure/cable{
+	icon_state = "0-4"
 	},
+/obj/effect/turf_decal/steeldecal/steel_decals_central7,
 /turf/open/floor/plasteel/dark,
 /area/ship/crew)
 "Hk" = (
@@ -5362,7 +5490,7 @@
 	},
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/plasteel/tech,
-/area/ship/security/armory)
+/area/ship/storage/equip)
 "Ia" = (
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
 	dir = 1
@@ -5412,7 +5540,7 @@
 	name = "Engineering Storage"
 	},
 /turf/open/floor/plasteel/tech,
-/area/ship/engineering/engines/port)
+/area/ship/storage/port)
 "Ir" = (
 /obj/machinery/atmospherics/pipe/simple/orange/hidden{
 	dir = 4
@@ -5443,21 +5571,21 @@
 /turf/open/floor/engine/hull/reinforced,
 /area/ship/external/dark)
 "IC" = (
-/obj/machinery/power/port_gen/pacman{
-	anchored = 1
-	},
-/obj/structure/catwalk/over/plated_catwalk/dark,
-/obj/structure/cable/yellow{
-	icon_state = "4-8"
-	},
-/obj/structure/cable/yellow{
-	icon_state = "0-8"
-	},
 /obj/machinery/camera/autoname{
 	dir = 10
 	},
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/plasma,
+/obj/structure/cable/yellow{
+	icon_state = "0-8"
+	},
+/obj/machinery/power/terminal{
+	dir = 4
+	},
+/obj/machinery/power/port_gen/pacman/super{
+	anchored = 1
+	},
+/obj/structure/catwalk/over/plated_catwalk/dark,
 /turf/open/floor/plating,
 /area/ship/engineering/engines/starboard)
 "IG" = (
@@ -5474,15 +5602,12 @@
 /area/ship/hallway/central)
 "IJ" = (
 /turf/open/floor/plasteel/tech,
-/area/ship/security/armory)
+/area/ship/storage/equip)
 "IO" = (
 /obj/structure/railing,
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 9
-	},
 /obj/effect/decal/cleanable/oil/slippery,
 /turf/open/floor/plasteel/stairs/left{
 	dir = 4
@@ -5579,6 +5704,9 @@
 /obj/structure/cable{
 	icon_state = "1-4"
 	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
 /turf/open/floor/plasteel/dark,
 /area/ship/security)
 "JO" = (
@@ -5623,6 +5751,25 @@
 "JZ" = (
 /obj/machinery/light/directional/east,
 /obj/effect/decal/cleanable/dirt,
+/obj/structure/closet/emcloset/wall/directional/south,
+/turf/open/floor/plasteel/patterned,
+/area/ship/hangar)
+"Ka" = (
+/obj/effect/turf_decal/industrial/traffic{
+	dir = 8
+	},
+/obj/machinery/suit_storage_unit/inherit{
+	req_access_txt = "10";
+	name = "artificer's suit storage unit";
+	locked = 1
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 8
+	},
+/obj/item/tank/jetpack/carbondioxide,
+/obj/item/clothing/suit/space/inteq,
+/obj/item/clothing/head/helmet/space/inteq,
+/obj/item/clothing/mask/gas/inteq,
 /turf/open/floor/plasteel/patterned,
 /area/ship/hangar)
 "Kd" = (
@@ -5641,7 +5788,7 @@
 	},
 /obj/machinery/light/small/directional/south,
 /turf/open/floor/plasteel/tech,
-/area/ship/engineering/engines/starboard)
+/area/ship/engineering)
 "Ke" = (
 /obj/machinery/door/firedoor/border_only{
 	dir = 1
@@ -5658,7 +5805,7 @@
 	name = "Artificer Gear Room"
 	},
 /turf/open/floor/plasteel/tech,
-/area/ship/engineering/engines/starboard)
+/area/ship/engineering)
 "Kk" = (
 /obj/effect/turf_decal/siding/thinplating/dark{
 	dir = 5
@@ -5738,7 +5885,7 @@
 	pixel_y = -4
 	},
 /turf/open/floor/plasteel/tech,
-/area/ship/security/armory)
+/area/ship/storage/equip)
 "Kl" = (
 /obj/effect/turf_decal/industrial/warning/fulltile,
 /obj/machinery/door/airlock/external,
@@ -5884,8 +6031,16 @@
 /obj/item/clothing/glasses/hud/security/sunglasses/inteq,
 /obj/item/storage/belt/security/webbing/inteq,
 /obj/item/storage/belt/security/webbing/inteq/alt,
+/obj/item/clothing/suit/hooded/wintercoat/security/inteq{
+	pixel_x = -8;
+	pixel_y = -4
+	},
+/obj/item/clothing/suit/hooded/wintercoat/security/inteq/alt{
+	pixel_x = 8;
+	pixel_y = -4
+	},
 /turf/open/floor/plasteel/tech,
-/area/ship/security/armory)
+/area/ship/storage/equip)
 "KF" = (
 /obj/machinery/porta_turret/ship/inteq/light{
 	id = "colossus_grid";
@@ -5895,7 +6050,6 @@
 /area/ship/crew/dorm/dormtwo)
 "KK" = (
 /obj/effect/turf_decal/box/corners,
-/obj/structure/reagent_dispensers/watertank,
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -5966,8 +6120,9 @@
 	dir = 8
 	},
 /obj/effect/turf_decal/siding/thinplating/dark,
+/obj/machinery/airalarm/directional/south,
 /turf/open/floor/plasteel/tech,
-/area/ship/engineering/engines/starboard)
+/area/ship/engineering)
 "LE" = (
 /obj/effect/turf_decal/corner/opaque/yellow{
 	dir = 10
@@ -6042,36 +6197,25 @@
 	pixel_y = 12
 	},
 /obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/steeldecal/steel_decals_central7,
 /turf/open/floor/plasteel/tech,
 /area/ship/bridge)
 "ME" = (
 /obj/effect/turf_decal/box/corners{
 	dir = 4
 	},
-/obj/structure/rack,
-/obj/item/roller{
-	pixel_x = 5
-	},
-/obj/item/roller{
-	pixel_x = 5;
-	pixel_y = 5
-	},
-/obj/item/roller{
-	pixel_x = 5;
-	pixel_y = 10
-	},
-/obj/item/stack/medical/splint{
-	pixel_y = 4;
-	pixel_x = -4
-	},
-/obj/item/storage/pouch/medical{
-	pixel_y = -9;
-	pixel_x = -9
-	},
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
+/obj/structure/table,
+/obj/item/stack/sheet/metal/twenty{
+	pixel_y = 5
+	},
+/obj/item/stack/sheet/glass/twenty{
+	pixel_y = 8;
+	pixel_x = -8
+	},
 /turf/open/floor/plasteel/patterned/cargo_one,
 /area/ship/cargo)
 "MF" = (
@@ -6140,7 +6284,6 @@
 /turf/open/floor/plating,
 /area/ship/hangar)
 "MP" = (
-/obj/structure/chair/comfy/orange/directional/east,
 /obj/effect/turf_decal/corner/opaque/yellow{
 	dir = 1
 	},
@@ -6151,14 +6294,51 @@
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
 	dir = 4
 	},
-/obj/machinery/firealarm/directional/south{
-	pixel_x = -6
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/light/small/directional/west,
+/obj/structure/closet/secure_closet/wall/directional/south{
+	icon_door = "cargo_wall";
+	name = "shuttle pilot's locker";
+	req_access_txt = "48";
+	icon_state = "cargo_wall"
+	},
+/obj/item/storage/backpack/messenger/inteq,
+/obj/item/clothing/under/syndicate/inteq{
+	pixel_x = -5
+	},
+/obj/item/clothing/under/syndicate/inteq/skirt{
+	pixel_x = 5
+	},
+/obj/item/clothing/shoes/combat{
+	pixel_y = -8;
+	pixel_x = -5
+	},
+/obj/item/clothing/gloves/combat{
+	pixel_y = -10;
+	pixel_x = 5
+	},
+/obj/item/clothing/head/beret/sec/inteq{
+	pixel_y = 5;
+	pixel_x = -5
+	},
+/obj/item/clothing/head/soft/inteq{
+	pixel_x = 5;
+	pixel_y = 5
+	},
+/obj/item/clothing/mask/balaclava/inteq{
+	pixel_x = -5
+	},
+/obj/item/clothing/suit/hooded/wintercoat/security/inteq,
+/obj/item/clothing/suit/hooded/wintercoat/security/inteq/alt,
+/obj/item/clothing/glasses/hud/security/sunglasses/inteq{
+	pixel_x = 5
 	},
-/obj/structure/extinguisher_cabinet/directional/south{
-	pixel_x = 6
+/obj/item/storage/belt/security/webbing/inteq/alt,
+/obj/item/megaphone/cargo,
+/obj/item/storage/pouch/squad{
+	pixel_y = -5
 	},
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/light/small/directional/west,
+/obj/item/radio/headset/inteq/alt,
 /turf/open/floor/plasteel/dark,
 /area/ship/crew/dorm/dormtwo)
 "MQ" = (
@@ -6188,12 +6368,13 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/crew/canteen)
 "MV" = (
-/obj/effect/turf_decal/corner/transparent/inteqbrown/half{
-	dir = 4
+/obj/effect/turf_decal/industrial/traffic{
+	dir = 8
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/turf/open/floor/plasteel,
-/area/ship/crew/office)
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/closet/firecloset/wall/directional/south,
+/turf/open/floor/plasteel/patterned,
+/area/ship/hangar)
 "MW" = (
 /obj/effect/turf_decal/box/corners{
 	dir = 1
@@ -6237,6 +6418,7 @@
 /obj/structure/cable{
 	icon_state = "0-8"
 	},
+/obj/effect/turf_decal/steeldecal/steel_decals_central7,
 /turf/open/floor/plasteel/dark,
 /area/ship/security)
 "Nq" = (
@@ -6250,7 +6432,7 @@
 /obj/structure/window/plasma/reinforced/plastitanium,
 /obj/machinery/door/poddoor/shutters{
 	dir = 4;
-	id = "sus_pilot_shutters"
+	id = "sus_med_shutters"
 	},
 /turf/open/floor/plating,
 /area/ship/crew/office)
@@ -6304,10 +6486,6 @@
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
 	dir = 8
 	},
-/obj/machinery/light_switch{
-	pixel_x = -10;
-	pixel_y = 22
-	},
 /obj/structure/closet/secure_closet/wall/directional/north{
 	name = "armour locker";
 	icon_state = "sec_wall";
@@ -6390,7 +6568,7 @@
 	pixel_y = 10
 	},
 /turf/open/floor/plasteel/tech,
-/area/ship/security/armory)
+/area/ship/storage/equip)
 "Oa" = (
 /obj/machinery/atmospherics/pipe/manifold/cyan/visible/layer2{
 	dir = 1
@@ -6405,7 +6583,9 @@
 	dir = 1
 	},
 /obj/effect/decal/cleanable/dirt,
-/obj/structure/closet/crate/large,
+/obj/structure/closet/crate/large{
+	name = "hydrogen canister crate"
+	},
 /obj/machinery/portable_atmospherics/canister/hydrogen,
 /turf/open/floor/plating,
 /area/ship/engineering/engines/port)
@@ -6582,8 +6762,16 @@
 /obj/item/clothing/glasses/hud/security/sunglasses/inteq,
 /obj/item/storage/belt/security/webbing/inteq,
 /obj/item/storage/belt/security/webbing/inteq/alt,
+/obj/item/clothing/suit/hooded/wintercoat/security/inteq{
+	pixel_x = -8;
+	pixel_y = -4
+	},
+/obj/item/clothing/suit/hooded/wintercoat/security/inteq/alt{
+	pixel_x = 8;
+	pixel_y = -4
+	},
 /turf/open/floor/plasteel/tech,
-/area/ship/security/armory)
+/area/ship/storage/equip)
 "Pn" = (
 /obj/effect/turf_decal/siding/thinplating/corner{
 	dir = 8
@@ -6653,16 +6841,20 @@
 	},
 /area/ship/engineering/engines/starboard)
 "PI" = (
-/obj/effect/turf_decal/trimline/opaque/yellow/warning,
-/obj/structure/sign/warning/securearea{
-	pixel_y = -24;
-	pixel_x = -26
+/obj/machinery/porta_turret/ship/inteq/heavy{
+	dir = 4;
+	id = "colossus_grid"
 	},
-/turf/open/floor/engine/hull/reinforced,
-/area/ship/external/dark)
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/ship/security)
 "PK" = (
+/obj/machinery/light/directional/east,
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating,
+/obj/structure/sign/poster/contraband/cardinal_port_starboard{
+	pixel_y = 32;
+	pixel_x = -6
+	},
+/turf/open/floor/plasteel/patterned,
 /area/ship/hangar)
 "PO" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
@@ -6708,19 +6900,7 @@
 /obj/structure/railing{
 	dir = 10
 	},
-/obj/structure/sink{
-	dir = 4;
-	pixel_x = -9
-	},
-/obj/structure/table,
-/obj/item/folder/white{
-	pixel_x = 5;
-	pixel_y = 5
-	},
 /obj/effect/decal/cleanable/dirt,
-/obj/item/flashlight/pen{
-	pixel_x = 4
-	},
 /turf/open/floor/plasteel/patterned/cargo_one,
 /area/ship/cargo)
 "PY" = (
@@ -6728,10 +6908,10 @@
 /area/ship/hangar)
 "Qa" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 5
+	dir = 8
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 6
+	dir = 4
 	},
 /turf/open/floor/plasteel/stairs/mid{
 	dir = 4
@@ -6810,8 +6990,11 @@
 	name = "Enforcer Ready Room";
 	req_access_txt = "1"
 	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
 /turf/open/floor/plasteel/tech,
-/area/ship/security/armory)
+/area/ship/storage/equip)
 "QU" = (
 /obj/machinery/atmospherics/pipe/layer_manifold{
 	dir = 8
@@ -6900,17 +7083,26 @@
 	dir = 8
 	},
 /obj/machinery/suit_storage_unit/inherit{
-	req_access_txt = "1"
+	req_access_txt = "1";
+	name = "enforcer's suit storage unit";
+	locked = 1
 	},
 /obj/item/tank/internals/oxygen/yellow,
 /obj/item/clothing/suit/space/hardsuit/security/inteq,
 /obj/item/clothing/mask/gas/inteq,
-/obj/machinery/camera/autoname{
-	dir = 6
-	},
+/obj/machinery/camera/autoname,
 /obj/effect/decal/cleanable/dirt,
+/obj/machinery/power/apc/auto_name/directional/north,
+/obj/machinery/light_switch{
+	pixel_x = 11;
+	pixel_y = 22
+	},
+/obj/effect/turf_decal/steeldecal/steel_decals_central7,
+/obj/structure/cable{
+	icon_state = "0-4"
+	},
 /turf/open/floor/plasteel/tech/grid,
-/area/ship/security/armory)
+/area/ship/storage/equip)
 "RS" = (
 /obj/structure/grille,
 /obj/structure/window/plasma/reinforced/plastitanium,
@@ -7098,6 +7290,7 @@
 /obj/item/reagent_containers/food/drinks/rilenacup{
 	pixel_x = 6
 	},
+/obj/item/reagent_containers/glass/beaker/large,
 /turf/open/floor/plasteel/patterned/brushed,
 /area/ship/crew/canteen)
 "Sz" = (
@@ -7132,69 +7325,6 @@
 	},
 /turf/open/floor/plasteel/dark,
 /area/ship/security)
-"SQ" = (
-/obj/effect/turf_decal/box/corners{
-	dir = 8
-	},
-/obj/structure/crate_shelf,
-/obj/structure/closet/crate/secure/gear{
-	name = "training equipment crate"
-	},
-/obj/item/target/alien{
-	pixel_y = 3;
-	pixel_x = 5
-	},
-/obj/item/target/alien{
-	pixel_y = 3;
-	pixel_x = 5
-	},
-/obj/item/target/alien{
-	pixel_y = 3;
-	pixel_x = 5
-	},
-/obj/item/target/syndicate{
-	pixel_y = 3
-	},
-/obj/item/target/syndicate{
-	pixel_y = 3
-	},
-/obj/item/target/syndicate{
-	pixel_y = 3
-	},
-/obj/item/target{
-	pixel_x = -5;
-	pixel_y = 2
-	},
-/obj/item/target{
-	pixel_x = -5;
-	pixel_y = 2
-	},
-/obj/item/target{
-	pixel_x = -5;
-	pixel_y = 2
-	},
-/obj/item/gun/energy/laser/practice,
-/obj/item/gun/energy/laser/practice{
-	pixel_y = -4
-	},
-/obj/item/gun/energy/laser/practice{
-	pixel_y = -8
-	},
-/obj/item/clothing/ears/earmuffs{
-	pixel_y = 6
-	},
-/obj/item/clothing/ears/earmuffs{
-	pixel_y = 6
-	},
-/obj/item/clothing/ears/earmuffs{
-	pixel_y = 6
-	},
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/turf/open/floor/plasteel/patterned/cargo_one,
-/area/ship/cargo)
 "SU" = (
 /obj/effect/turf_decal/siding/thinplating/dark/corner{
 	dir = 8
@@ -7221,7 +7351,7 @@
 	icon_state = "4-8"
 	},
 /turf/open/floor/plasteel/tech,
-/area/ship/engineering/engines/port)
+/area/ship/storage/port)
 "SV" = (
 /obj/structure/crate_shelf,
 /obj/structure/closet/crate/engineering,
@@ -7254,7 +7384,7 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plasteel/tech/grid,
-/area/ship/engineering/engines/port)
+/area/ship/storage/port)
 "Ta" = (
 /obj/structure/chair,
 /obj/effect/turf_decal/corner/opaque/yellow{
@@ -7267,9 +7397,6 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/security)
 "Tc" = (
-/obj/effect/spawner/bunk_bed{
-	dir = 1
-	},
 /obj/effect/turf_decal/corner/opaque/brown{
 	dir = 8
 	},
@@ -7277,10 +7404,12 @@
 /obj/effect/turf_decal/corner/opaque/yellow{
 	dir = 1
 	},
-/obj/structure/sign/poster/contraband/lusty_xenomorph{
-	pixel_x = -32
-	},
 /obj/effect/decal/cleanable/dirt,
+/obj/item/kirbyplants{
+	icon_state = "plant-05";
+	pixel_x = 8;
+	pixel_y = -1
+	},
 /turf/open/floor/plasteel/dark,
 /area/ship/crew)
 "Td" = (
@@ -7336,8 +7465,14 @@
 	pixel_y = 3;
 	pixel_x = 6
 	},
+/obj/machinery/firealarm/directional/south{
+	pixel_x = -6
+	},
+/obj/structure/extinguisher_cabinet/directional/south{
+	pixel_x = 6
+	},
 /turf/open/floor/plasteel/tech,
-/area/ship/engineering/engines/starboard)
+/area/ship/engineering)
 "To" = (
 /obj/effect/turf_decal/siding/thinplating/dark{
 	dir = 5
@@ -7347,6 +7482,12 @@
 /obj/effect/turf_decal/trimline/opaque/yellow/line{
 	dir = 5
 	},
+/obj/structure/closet/firecloset/wall/directional/north,
+/obj/machinery/light_switch{
+	dir = 8;
+	pixel_x = 20;
+	pixel_y = -12
+	},
 /turf/open/floor/plasteel/dark,
 /area/ship/engineering/engines/starboard)
 "TB" = (
@@ -7388,8 +7529,14 @@
 /turf/open/floor/plasteel/patterned,
 /area/ship/crew/toilet)
 "TH" = (
-/obj/structure/catwalk/over/plated_catwalk,
 /obj/machinery/computer/helm/viewscreen/directional/west,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 5
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 6
+	},
+/obj/structure/catwalk/over/plated_catwalk,
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/cargo)
 "TM" = (
@@ -7519,9 +7666,7 @@
 /turf/open/floor/plasteel/tech,
 /area/ship/bridge)
 "TR" = (
-/obj/effect/spawner/bunk_bed{
-	dir = 1
-	},
+/obj/effect/spawner/bunk_bed,
 /obj/effect/turf_decal/corner/opaque/yellow{
 	dir = 1
 	},
@@ -7560,6 +7705,9 @@
 /obj/structure/railing{
 	dir = 4
 	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
 /turf/open/floor/plasteel/tech,
 /area/ship/engineering/engines/starboard)
 "TX" = (
@@ -7567,9 +7715,8 @@
 	dir = 4;
 	id = "colossus_grid"
 	},
-/obj/effect/turf_decal/industrial/warning/fulltile,
-/turf/open/floor/engine/hull/reinforced,
-/area/ship/external/dark)
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/ship/bridge)
 "TZ" = (
 /obj/machinery/power/terminal{
 	dir = 8
@@ -7652,17 +7799,13 @@
 /turf/open/floor/engine/hull/reinforced/interior,
 /area/ship/cargo)
 "UN" = (
-/obj/machinery/power/port_gen/pacman/super{
-	anchored = 1
-	},
-/obj/structure/catwalk/over/plated_catwalk/dark,
-/obj/structure/cable/yellow{
-	icon_state = "0-8"
-	},
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/railing{
 	dir = 4
 	},
+/obj/machinery/power/smes/engineering,
+/obj/structure/cable,
+/obj/structure/catwalk/over/plated_catwalk/dark,
 /turf/open/floor/plating,
 /area/ship/engineering/engines/starboard)
 "UR" = (
@@ -7685,18 +7828,8 @@
 /obj/effect/turf_decal/box/corners{
 	dir = 1
 	},
-/obj/structure/rack,
-/obj/item/stack/sheet/metal/twenty{
-	pixel_x = -5;
-	pixel_y = 5
-	},
-/obj/item/stack/sheet/metal/five{
-	pixel_x = -5;
-	pixel_y = 5
-	},
-/obj/item/stack/sheet/glass/twenty,
-/obj/item/stack/sheet/glass/five,
 /obj/effect/decal/cleanable/dirt,
+/obj/structure/reagent_dispensers/watertank,
 /turf/open/floor/plasteel/patterned/cargo_one,
 /area/ship/cargo)
 "Vd" = (
@@ -7790,8 +7923,34 @@
 /obj/machinery/atmospherics/components/unary/passive_vent/layer4{
 	dir = 1
 	},
+/obj/structure/sign/warning/securearea{
+	pixel_y = -24;
+	pixel_x = 6
+	},
 /turf/open/floor/engine/hull/reinforced,
 /area/ship/external/dark)
+"VB" = (
+/obj/structure/table/chem,
+/obj/item/folder/white{
+	pixel_x = 5;
+	pixel_y = 5
+	},
+/obj/item/flashlight/pen{
+	pixel_x = 4
+	},
+/obj/item/stack/medical/bone_gel/four{
+	pixel_y = -10;
+	pixel_x = -9
+	},
+/obj/item/reagent_containers/medigel/sterilizine{
+	pixel_x = -10;
+	pixel_y = 8
+	},
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 4
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/crew/office)
 "VD" = (
 /turf/open/floor/plasteel/stairs/right{
 	dir = 8
@@ -7890,6 +8049,27 @@
 	},
 /turf/open/floor/plasteel/dark,
 /area/ship/security)
+"VT" = (
+/obj/effect/turf_decal/corner/opaque/white{
+	dir = 5
+	},
+/obj/effect/turf_decal/trimline/opaque/inteqbrownlight/line{
+	dir = 1
+	},
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+	dir = 4
+	},
+/obj/machinery/power/apc/auto_name/directional/north,
+/obj/machinery/light_switch{
+	pixel_x = 11;
+	pixel_y = 22
+	},
+/obj/structure/cable{
+	icon_state = "0-4"
+	},
+/obj/effect/turf_decal/steeldecal/steel_decals_central7,
+/turf/open/floor/plasteel/patterned/grid/dark,
+/area/ship/crew/office)
 "VZ" = (
 /obj/effect/turf_decal/trimline/opaque/yellow/warning,
 /turf/open/floor/engine/hull/reinforced,
@@ -8026,13 +8206,9 @@
 	},
 /obj/machinery/light/small/directional/west,
 /turf/open/floor/plasteel/dark,
-/area/ship/crew)
-"WZ" = (
-/obj/machinery/light/small/directional/north,
-/obj/machinery/light_switch{
-	pixel_x = 10;
-	pixel_y = 22
-	},
+/area/ship/crew)
+"WZ" = (
+/obj/machinery/light/small/directional/north,
 /obj/machinery/camera/autoname,
 /obj/effect/turf_decal/trimline/opaque/yellow/line{
 	dir = 1
@@ -8045,47 +8221,8 @@
 	dir = 8
 	},
 /turf/open/floor/plasteel/tech,
-/area/ship/engineering/engines/starboard)
+/area/ship/engineering)
 "Xc" = (
-/obj/structure/closet/secure_closet{
-	anchored = 1;
-	can_be_unanchored = 1;
-	icon_state = "warden";
-	name = "master at arms' locker";
-	req_access_txt = "3"
-	},
-/obj/item/storage/backpack/messenger/inteq,
-/obj/item/clothing/under/syndicate/inteq{
-	pixel_x = -5
-	},
-/obj/item/clothing/under/syndicate/inteq/skirt{
-	pixel_x = 5
-	},
-/obj/item/clothing/shoes/combat{
-	pixel_y = -8;
-	pixel_x = -5
-	},
-/obj/item/clothing/gloves/tackler/combat/insulated{
-	pixel_x = 5;
-	pixel_y = -10
-	},
-/obj/item/clothing/mask/balaclava/inteq{
-	pixel_x = -5
-	},
-/obj/item/clothing/suit/armor/vest/security/warden/inteq{
-	pixel_x = 5
-	},
-/obj/item/clothing/head/warden/inteq{
-	pixel_y = 5
-	},
-/obj/item/clothing/glasses/hud/security/sunglasses/inteq,
-/obj/item/storage/belt/military/assault{
-	pixel_y = -5
-	},
-/obj/item/megaphone/sec,
-/obj/item/storage/pouch/squad{
-	pixel_y = -5
-	},
 /obj/effect/turf_decal/corner/opaque/yellow{
 	dir = 1
 	},
@@ -8095,6 +8232,18 @@
 	},
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
 /obj/machinery/light/small/directional/north,
+/obj/item/radio/intercom/directional/east{
+	pixel_y = 7
+	},
+/obj/structure/dresser,
+/obj/item/toy/prize/basenji{
+	pixel_x = 6;
+	pixel_y = 17
+	},
+/obj/item/clothing/glasses/sunglasses/big{
+	pixel_y = 7;
+	pixel_x = -6
+	},
 /turf/open/floor/plasteel/dark,
 /area/ship/crew/dorm/dormtwo)
 "Xr" = (
@@ -8122,53 +8271,68 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 10
 	},
-/obj/machinery/airalarm/directional/east,
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/turf/open/floor/carpet/black,
-/area/ship/crew)
-"XD" = (
-/obj/structure/table,
-/obj/effect/turf_decal/corner/transparent/inteqbrown/half{
-	dir = 8
+/obj/structure/closet/wall/directional/east{
+	name = "uniform closet"
 	},
-/obj/machinery/button/door{
-	pixel_y = 21;
-	pixel_x = -10;
-	name = "Window Shutters";
-	id = "sus_pilot_shutters"
+/obj/item/storage/backpack/messenger/inteq,
+/obj/item/storage/backpack/messenger/inteq,
+/obj/item/storage/backpack/messenger/inteq,
+/obj/item/clothing/suit/hooded/wintercoat/security/inteq{
+	pixel_x = -8;
+	pixel_y = -4
 	},
-/obj/item/radio/intercom/directional/north{
-	pixel_x = 6
+/obj/item/clothing/suit/hooded/wintercoat/security/inteq{
+	pixel_x = -8;
+	pixel_y = -4
 	},
-/obj/item/radio/intercom/directional/north{
-	freerange = 1;
-	freqlock = 1;
-	frequency = 1347;
-	name = "IRMG shortwave intercom";
-	pixel_y = 41;
-	pixel_x = 6
+/obj/item/clothing/suit/hooded/wintercoat/security/inteq{
+	pixel_x = -8;
+	pixel_y = -4
 	},
-/obj/item/book/manual/wiki/piloting{
-	pixel_x = 7;
-	pixel_y = 3
+/obj/item/clothing/suit/hooded/wintercoat/security/inteq/alt{
+	pixel_x = 8;
+	pixel_y = -4
 	},
-/obj/effect/decal/cleanable/dirt,
-/obj/item/paper_bin{
-	pixel_x = -6;
-	pixel_y = 4
+/obj/item/clothing/suit/hooded/wintercoat/security/inteq/alt{
+	pixel_x = 8;
+	pixel_y = -4
 	},
-/obj/item/pen{
-	pixel_x = -6;
-	pixel_y = 4
+/obj/item/clothing/suit/hooded/wintercoat/security/inteq/alt{
+	pixel_x = 8;
+	pixel_y = -4
 	},
-/obj/item/clothing/glasses/sunglasses/big{
-	pixel_x = 2;
-	pixel_y = -6
+/obj/item/clothing/head/soft/inteq{
+	pixel_x = -8;
+	pixel_y = 8
 	},
-/turf/open/floor/plasteel,
-/area/ship/crew/office)
+/obj/item/clothing/head/soft/inteq{
+	pixel_x = -8;
+	pixel_y = 8
+	},
+/obj/item/clothing/head/soft/inteq{
+	pixel_x = -8;
+	pixel_y = 8
+	},
+/obj/item/clothing/head/beret/sec/inteq{
+	pixel_x = 8;
+	pixel_y = 8
+	},
+/obj/item/clothing/head/beret/sec/inteq{
+	pixel_x = 8;
+	pixel_y = 8
+	},
+/obj/item/clothing/head/beret/sec/inteq{
+	pixel_x = 8;
+	pixel_y = 8
+	},
+/turf/open/floor/carpet/black,
+/area/ship/crew)
+"XD" = (
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/ship/storage/port)
 "XT" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /obj/structure/cable{
@@ -8197,7 +8361,7 @@
 /obj/machinery/light/small/directional/north,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plasteel/tech/grid,
-/area/ship/engineering/engines/port)
+/area/ship/storage/port)
 "Yf" = (
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/ship/hallway/central)
@@ -8206,11 +8370,12 @@
 	dir = 8
 	},
 /obj/machinery/suit_storage_unit/inherit,
-/obj/item/clothing/suit/space/inteq,
-/obj/item/clothing/head/helmet/space/inteq,
 /obj/machinery/door/firedoor/border_only{
 	dir = 8
 	},
+/obj/item/tank/internals/oxygen/yellow,
+/obj/item/clothing/suit/space/inteq,
+/obj/item/clothing/head/helmet/space/inteq,
 /turf/open/floor/plasteel/patterned,
 /area/ship/hangar)
 "Yr" = (
@@ -8346,11 +8511,7 @@
 /turf/open/floor/plasteel/patterned,
 /area/ship/cargo)
 "Zk" = (
-/obj/structure/dresser,
-/obj/item/flashlight/lamp/green{
-	pixel_y = 17;
-	pixel_x = -7
-	},
+/obj/structure/chair/comfy/orange/directional/south,
 /obj/effect/turf_decal/corner/opaque/yellow{
 	dir = 1
 	},
@@ -8360,11 +8521,14 @@
 /obj/effect/turf_decal/corner/opaque/brown{
 	dir = 4
 	},
-/obj/structure/sign/poster/contraband/twelve_gauge{
-	pixel_x = -32
-	},
 /obj/machinery/airalarm/directional/north,
 /obj/effect/decal/cleanable/dirt,
+/obj/structure/extinguisher_cabinet/directional/west{
+	pixel_y = 6
+	},
+/obj/machinery/firealarm/directional/west{
+	pixel_y = -6
+	},
 /turf/open/floor/plasteel/dark,
 /area/ship/crew/dorm/dormtwo)
 "Zn" = (
@@ -8375,14 +8539,17 @@
 	dir = 8
 	},
 /obj/machinery/suit_storage_unit/inherit{
-	req_access_txt = "1"
+	req_access_txt = "1";
+	name = "enforcer's suit storage unit";
+	locked = 1
 	},
 /obj/item/tank/internals/oxygen/yellow,
 /obj/item/clothing/suit/space/hardsuit/security/inteq,
 /obj/item/clothing/mask/gas/inteq,
 /obj/effect/decal/cleanable/dirt,
+/obj/machinery/airalarm/directional/south,
 /turf/open/floor/plasteel/tech/grid,
-/area/ship/security/armory)
+/area/ship/storage/equip)
 "Zr" = (
 /obj/structure/table/reinforced,
 /obj/effect/turf_decal/corner/opaque/yellow{
@@ -8464,6 +8631,7 @@
 	pixel_x = -20;
 	pixel_y = 12
 	},
+/obj/effect/turf_decal/steeldecal/steel_decals_central7,
 /turf/open/floor/plasteel/tech,
 /area/ship/security/armory)
 "ZK" = (
@@ -8480,6 +8648,7 @@
 /obj/effect/turf_decal/siding/thinplating/dark{
 	dir = 1
 	},
+/obj/structure/closet/firecloset/wall/directional/north,
 /turf/open/floor/plating,
 /area/ship/engineering/engines/port)
 "ZM" = (
@@ -8526,7 +8695,7 @@
 	pixel_x = 2
 	},
 /turf/open/floor/plasteel/tech,
-/area/ship/engineering/engines/starboard)
+/area/ship/engineering)
 "ZU" = (
 /obj/structure/chair/office{
 	dir = 8
@@ -8543,8 +8712,8 @@
 /obj/effect/turf_decal/box/corners{
 	dir = 8
 	},
-/obj/machinery/autolathe,
 /obj/effect/decal/cleanable/dirt,
+/obj/structure/reagent_dispensers/fueltank,
 /turf/open/floor/plasteel/patterned/cargo_one,
 /area/ship/cargo)
 
@@ -8655,9 +8824,9 @@ Rg
 Rg
 zS
 KY
-PK
 DZ
-PK
+DZ
+DZ
 wt
 IU
 pz
@@ -8939,7 +9108,7 @@ DZ
 DZ
 DZ
 cT
-pq
+MV
 Rg
 De
 tv
@@ -8954,15 +9123,15 @@ re
 (14,1,1) = {"
 re
 re
-vm
+XD
 Gf
 SU
 hm
-vm
+XD
 OZ
 ga
 Rg
-JZ
+PK
 pg
 Wh
 dX
@@ -8974,22 +9143,22 @@ JZ
 Rg
 Dp
 nU
-sy
+nE
 ma
 Hg
 Lo
-sy
+nE
 re
 re
 "}
 (15,1,1) = {"
 re
 re
-vm
+XD
 Yc
 uy
 BG
-vm
+XD
 Rg
 jA
 Rg
@@ -9005,49 +9174,49 @@ Rg
 Rg
 jA
 Rg
-sy
+nE
 ma
 mN
 Kd
-sy
+nE
 re
 re
 "}
 (16,1,1) = {"
 re
 re
-vm
+XD
 SV
 Ae
 cQ
-vm
+XD
 kl
 VH
 Rg
 vb
 Yk
-Yk
+uP
 PC
 pX
 Vn
-Yk
-Yk
+Ka
+Ka
 WP
 Rg
 lw
 jN
-sy
+nE
 WZ
 nb
 bl
-sy
+nE
 re
 re
 "}
 (17,1,1) = {"
 re
 re
-vm
+XD
 dm
 tY
 zU
@@ -9071,18 +9240,18 @@ Ke
 FH
 ZP
 Ti
-sy
+nE
 re
 re
 "}
 (18,1,1) = {"
 re
 re
-vm
-vm
-vm
-vm
-vm
+XD
+XD
+XD
+XD
+XD
 Rg
 Rg
 Rg
@@ -9098,11 +9267,11 @@ eT
 Rg
 Rg
 Rg
-sy
-sy
-sy
-sy
-sy
+nE
+nE
+nE
+nE
+nE
 re
 re
 "}
@@ -9174,7 +9343,7 @@ al
 al
 al
 BS
-al
+jk
 al
 Gt
 PR
@@ -9186,9 +9355,9 @@ Vj
 DS
 fz
 fp
-XD
+wq
+VB
 lF
-nZ
 Vu
 ko
 Sy
@@ -9217,8 +9386,8 @@ iQ
 Qo
 zL
 fp
+VT
 xj
-BL
 tl
 Vu
 zc
@@ -9249,11 +9418,11 @@ Pr
 BK
 mt
 yX
-MV
+oN
 Fo
 Vu
 iC
-Aq
+FI
 ju
 FD
 Hy
@@ -9266,7 +9435,7 @@ re
 vK
 hZ
 tZ
-Vm
+Df
 fQ
 al
 Vd
@@ -9279,9 +9448,9 @@ Rl
 Fw
 eH
 fp
-oL
+CR
 uB
-oZ
+qu
 Vu
 li
 bO
@@ -9310,8 +9479,8 @@ dl
 ZM
 SC
 fp
-fp
-fp
+Nr
+Nr
 fp
 Vu
 Vu
@@ -9501,11 +9670,11 @@ vC
 ry
 MY
 GO
-GN
+nZ
 RQ
 ye
 Zn
-GN
+nZ
 re
 re
 "}
@@ -9522,12 +9691,12 @@ bg
 kD
 Hk
 hM
-CR
+Fj
 Wl
 Za
 VO
 nG
-qu
+Fj
 LZ
 Er
 gZ
@@ -9536,7 +9705,7 @@ QS
 vn
 HQ
 FQ
-GN
+nZ
 re
 re
 "}
@@ -9563,11 +9732,11 @@ LZ
 Ta
 CE
 VS
-GN
+nZ
 NT
 IJ
 KD
-GN
+nZ
 re
 re
 "}
@@ -9584,21 +9753,21 @@ cm
 mV
 bm
 pu
-uP
+qJ
 Zf
 Sf
 qm
-qJ
+nV
 AQ
 vC
 rb
 cp
 kP
-GN
+nZ
 Kk
 ES
 Pk
-GN
+nZ
 re
 re
 "}
@@ -9620,16 +9789,16 @@ TT
 et
 Nu
 Ea
-SQ
+bB
 LZ
 rx
 ZU
 Nf
-GN
+nZ
 Hb
 BJ
 Gu
-Sz
+CB
 re
 re
 "}
@@ -9656,11 +9825,11 @@ LZ
 en
 Ag
 SD
-GN
-GN
+nZ
+nZ
 vI
-GN
-Sz
+nZ
+CB
 re
 re
 "}
@@ -9769,14 +9938,14 @@ re
 re
 re
 TX
-wq
+Cb
 Kw
 Cb
 va
 VZ
 Kw
+VZ
 PI
-TX
 re
 re
 re
diff --git a/_maps/shuttles/inteq/inteq_talos.dmm b/_maps/shuttles/inteq/inteq_talos.dmm
index a0392d7e6f..2bc5c06727 100644
--- a/_maps/shuttles/inteq/inteq_talos.dmm
+++ b/_maps/shuttles/inteq/inteq_talos.dmm
@@ -6379,8 +6379,6 @@
 /obj/item/clothing/shoes/combat,
 /obj/item/storage/belt/military/assault,
 /obj/item/storage/backpack/messenger/inteq,
-/obj/item/clothing/under/syndicate/inteq/skirt,
-/obj/item/clothing/under/syndicate/inteq,
 /obj/structure/closet/secure_closet{
 	anchored = 1;
 	can_be_unanchored = 1;
@@ -6405,6 +6403,7 @@
 	pixel_x = -8;
 	pixel_y = 23
 	},
+/obj/item/clothing/under/syndicate/inteq/honorable,
 /turf/open/floor/plasteel/dark,
 /area/ship/security)
 "KY" = (
@@ -8058,6 +8057,7 @@
 /obj/item/gear_pack/anglegrinder/energy,
 /obj/item/radio/headset/alt,
 /obj/item/clothing/mask/gas/inteq,
+/obj/item/clothing/under/syndicate/inteq/honorable,
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/engineering/communications)
 "VG" = (
@@ -8538,8 +8538,6 @@
 /obj/item/storage/belt/military/assault,
 /obj/item/storage/backpack/messenger/inteq,
 /obj/item/megaphone/command,
-/obj/item/clothing/under/syndicate/inteq/skirt,
-/obj/item/clothing/under/syndicate/inteq,
 /obj/item/clothing/suit/armor/hos/inteq,
 /obj/item/clothing/head/beret/sec/hos/inteq,
 /obj/item/shield/riot/tele,
@@ -8565,6 +8563,7 @@
 /obj/item/clothing/head/inteq_peaked,
 /obj/item/storage/guncase/pistol/pinscher,
 /obj/item/storage/box/ammo/a44roum,
+/obj/item/clothing/under/syndicate/inteq/honorable,
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
 "YC" = (
diff --git a/_maps/shuttles/inteq/inteq_valor.dmm b/_maps/shuttles/inteq/inteq_valor.dmm
index b2e769fc77..2197297840 100644
--- a/_maps/shuttles/inteq/inteq_valor.dmm
+++ b/_maps/shuttles/inteq/inteq_valor.dmm
@@ -103,8 +103,10 @@
 /obj/machinery/suit_storage_unit/inherit,
 /obj/effect/turf_decal/industrial/outline/yellow,
 /obj/machinery/light/small/directional/north,
-/obj/item/clothing/suit/space/inteq,
-/obj/item/clothing/head/helmet/space/inteq,
+/obj/item/tank/internals/oxygen/yellow,
+/obj/item/clothing/suit/space/inteq/pilot,
+/obj/item/clothing/head/helmet/space/inteq/pilot,
+/obj/item/clothing/mask/gas/inteq,
 /turf/open/floor/plasteel,
 /area/ship/crew/office)
 "bx" = (
@@ -4532,8 +4534,6 @@
 /obj/item/clothing/shoes/combat,
 /obj/item/storage/backpack/messenger/inteq,
 /obj/item/megaphone/command,
-/obj/item/clothing/under/syndicate/inteq/skirt,
-/obj/item/clothing/under/syndicate/inteq,
 /obj/item/clothing/suit/armor/hos/inteq,
 /obj/item/clothing/head/beret/sec/hos/inteq,
 /obj/structure/closet/secure_closet/wall/directional/west{
@@ -4548,6 +4548,10 @@
 /obj/item/stamp/inteq/vanguard,
 /obj/item/storage/box/ammo/a44roum,
 /obj/item/storage/guncase/pistol/pinscher,
+/obj/item/clothing/under/syndicate/inteq/honorable{
+	pixel_x = -5;
+	pixel_y = 1
+	},
 /turf/open/floor/carpet/orange,
 /area/ship/bridge)
 "Od" = (
@@ -4947,6 +4951,10 @@
 /obj/item/storage/box/hypospray/mkiii,
 /obj/item/stamp/inteq/corpsman,
 /obj/item/clothing/gloves/color/latex/nitrile/inteq,
+/obj/item/clothing/under/syndicate/inteq/honorable{
+	pixel_x = -5;
+	pixel_y = 1
+	},
 /turf/open/floor/carpet/blue,
 /area/ship/bridge)
 "RT" = (
diff --git a/_maps/shuttles/inteq/inteq_vaquero.dmm b/_maps/shuttles/inteq/inteq_vaquero.dmm
index 4f4c2b0ed9..71d83dce9c 100644
--- a/_maps/shuttles/inteq/inteq_vaquero.dmm
+++ b/_maps/shuttles/inteq/inteq_vaquero.dmm
@@ -33,10 +33,6 @@
 	pixel_y = -8;
 	pixel_x = -5
 	},
-/obj/item/clothing/gloves/combat{
-	pixel_y = -10;
-	pixel_x = 5
-	},
 /obj/item/clothing/head/beret/sec/inteq{
 	pixel_y = 5;
 	pixel_x = -5
@@ -50,8 +46,7 @@
 	},
 /obj/item/storage/pouch/engi,
 /obj/item/clothing/gloves/color/yellow{
-	pixel_y = -8;
-	pixel_x = -8
+	pixel_y = -8
 	},
 /obj/item/clothing/glasses/welding{
 	pixel_x = -4
@@ -61,6 +56,14 @@
 	dir = 1
 	},
 /obj/effect/decal/cleanable/dirt,
+/obj/item/clothing/suit/hooded/wintercoat/security/inteq{
+	pixel_x = -8;
+	pixel_y = -4
+	},
+/obj/item/clothing/suit/hooded/wintercoat/security/inteq/alt{
+	pixel_x = 8;
+	pixel_y = -4
+	},
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/engineering)
 "aq" = (
@@ -2528,6 +2531,14 @@
 	dir = 6
 	},
 /obj/effect/turf_decal/steeldecal/steel_decals_central7,
+/obj/item/clothing/suit/hooded/wintercoat/security/inteq{
+	pixel_x = -8;
+	pixel_y = -4
+	},
+/obj/item/clothing/suit/hooded/wintercoat/security/inteq/alt{
+	pixel_x = 8;
+	pixel_y = -4
+	},
 /turf/open/floor/plasteel/patterned/brushed,
 /area/ship/medical)
 "uy" = (
@@ -4075,12 +4086,6 @@
 	req_access_txt = "20"
 	},
 /obj/item/storage/backpack/messenger/inteq,
-/obj/item/clothing/under/syndicate/inteq{
-	pixel_x = -5
-	},
-/obj/item/clothing/under/syndicate/inteq/skirt{
-	pixel_x = 5
-	},
 /obj/item/clothing/shoes/combat{
 	pixel_y = -8;
 	pixel_x = -5
@@ -4131,6 +4136,7 @@
 	pixel_x = 20;
 	pixel_y = 12
 	},
+/obj/item/clothing/under/syndicate/inteq/honorable,
 /turf/open/floor/plasteel/dark,
 /area/ship/crew/dorm/captain)
 "IN" = (
@@ -4933,6 +4939,7 @@
 	pixel_x = -20;
 	pixel_y = -12
 	},
+/obj/item/reagent_containers/glass/beaker/large,
 /turf/open/floor/plasteel/patterned/brushed,
 /area/ship/crew/canteen)
 "Pn" = (
diff --git a/_maps/shuttles/minutemen/minutemen_atlas.dmm b/_maps/shuttles/minutemen/minutemen_atlas.dmm
index eb84733f89..af245442e1 100644
--- a/_maps/shuttles/minutemen/minutemen_atlas.dmm
+++ b/_maps/shuttles/minutemen/minutemen_atlas.dmm
@@ -1,24 +1,11 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
 "aa" = (
-/obj/effect/turf_decal/corner/transparent/blue{
-	dir = 9
-	},
-/obj/structure/table/chem,
-/obj/item/paper_bin{
-	pixel_y = 5;
-	pixel_x = 6
-	},
-/obj/item/pen{
-	pixel_y = 5;
-	pixel_x = 6
-	},
-/obj/item/folder/white{
-	pixel_x = -7;
-	pixel_y = 6
+/obj/effect/turf_decal/corner/transparent/blue/diagonal,
+/obj/effect/turf_decal/spline/fancy/opaque/white{
+	dir = 1
 	},
-/obj/item/folder/white{
-	pixel_x = -8;
-	pixel_y = 2
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+	dir = 8
 	},
 /turf/open/floor/plasteel/white,
 /area/ship/medical)
@@ -29,1308 +16,1512 @@
 	},
 /turf/open/floor/plating,
 /area/ship/external/dark)
-"am" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/plasteel/grimy,
-/area/ship/crew/canteen)
-"aw" = (
-/obj/effect/turf_decal/siding/wood,
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/plasteel/dark,
-/area/ship/crew/crewtwo)
-"aC" = (
-/obj/effect/turf_decal/corner/transparent/blue/diagonal,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/structure/cable{
-	icon_state = "1-4"
+"ah" = (
+/obj/effect/turf_decal/corner_steel_grid{
+	dir = 5;
+	layer = 2.030
 	},
-/obj/effect/turf_decal/spline/fancy/opaque/white/corner,
-/obj/machinery/light_switch{
-	dir = 4;
-	pixel_x = -23
+/obj/effect/turf_decal/corner_steel_grid{
+	dir = 10
 	},
-/obj/effect/turf_decal/siding/white{
-	dir = 9
+/obj/effect/turf_decal/industrial/warning/green{
+	dir = 1
 	},
-/turf/open/floor/plasteel/white,
-/area/ship/medical)
-"aI" = (
-/obj/structure/closet/wall/blue/directional/east{
-	name = "uniforms locker"
+/obj/effect/turf_decal/industrial/stand_clear/white,
+/obj/structure/cable{
+	icon_state = "1-2"
 	},
-/obj/item/clothing/shoes/combat{
-	pixel_y = -8;
-	pixel_x = 12
+/obj/machinery/light/directional/east,
+/obj/structure/cable{
+	icon_state = "2-8"
 	},
-/obj/item/clothing/shoes/combat{
-	pixel_y = -8;
-	pixel_x = 10
+/turf/open/floor/pod/light,
+/area/ship/cargo)
+"am" = (
+/obj/structure/platform/industrial{
+	dir = 1;
+	layer = 2.89
 	},
-/obj/item/clothing/shoes/combat{
-	pixel_y = -8;
-	pixel_x = 8
+/obj/effect/turf_decal/corner/transparent/lime/half{
+	dir = 1
 	},
-/obj/item/clothing/shoes/combat{
-	pixel_y = -8;
-	pixel_x = 6
+/obj/machinery/power/port_gen/pacman{
+	anchored = 1
 	},
-/obj/item/clothing/shoes/combat{
-	pixel_y = -8;
-	pixel_x = 4
+/obj/structure/cable/yellow{
+	icon_state = "0-8"
 	},
-/obj/item/clothing/head/clip{
-	pixel_x = -7;
-	pixel_y = -11
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering)
+"an" = (
+/obj/effect/turf_decal/corner/transparent/blue/mono,
+/obj/structure/closet/crate/freezer/blood,
+/obj/effect/mapping_helpers/crate_shelve,
+/obj/structure/curtain,
+/turf/open/floor/plasteel/mono/white,
+/area/ship/medical)
+"av" = (
+/obj/effect/turf_decal/corner/opaque/blue/half{
+	dir = 4
 	},
-/obj/item/clothing/head/clip{
-	pixel_x = -7;
-	pixel_y = -9
+/obj/effect/turf_decal/corner/opaque/blue{
+	dir = 1
 	},
-/obj/item/clothing/head/clip{
-	pixel_x = -7;
-	pixel_y = -7
+/obj/structure/chair{
+	dir = 8
 	},
-/obj/item/clothing/head/clip{
-	pixel_x = -7;
-	pixel_y = -5
+/obj/structure/cable{
+	icon_state = "1-2"
 	},
-/obj/item/clothing/head/clip{
-	pixel_x = -7;
-	pixel_y = -3
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/turf/open/floor/plasteel/white,
+/area/ship/crew/canteen)
+"aC" = (
+/obj/structure/grille,
+/obj/structure/window/reinforced/fulltile,
+/obj/machinery/door/poddoor/shutters{
+	dir = 4;
+	id = "atlas_bridge"
 	},
-/obj/item/storage/backpack/satchel/sec/clip{
-	pixel_y = 14;
-	pixel_x = -6
+/turf/open/floor/plating,
+/area/ship/bridge)
+"aL" = (
+/obj/structure/platform/industrial{
+	dir = 8
 	},
-/obj/item/storage/backpack/satchel/sec/clip{
-	pixel_y = 13;
-	pixel_x = -8
+/obj/effect/turf_decal/corner/transparent/lime/half{
+	dir = 8
 	},
-/obj/item/storage/backpack/security/clip{
-	pixel_y = 13;
-	pixel_x = 12
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+	dir = 4
 	},
-/obj/item/storage/backpack/security/clip{
-	pixel_y = 12;
-	pixel_x = 10
+/obj/structure/platform/industrial,
+/obj/structure/railing/thin{
+	dir = 10;
+	layer = 3.081
 	},
-/obj/item/clothing/under/clip/minutemen{
-	pixel_x = 14;
-	pixel_y = 3
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering)
+"aS" = (
+/obj/effect/turf_decal/corner_steel_grid,
+/obj/effect/turf_decal/box/white/corners{
+	color = "#CBB1CA"
 	},
-/obj/item/clothing/under/clip/minutemen{
-	pixel_x = 11;
-	pixel_y = 3
+/obj/structure/closet/crate/large,
+/obj/machinery/portable_atmospherics/canister,
+/turf/open/floor/pod/light,
+/area/ship/cargo)
+"be" = (
+/obj/structure/chair/handrail{
+	dir = 8
 	},
-/obj/item/clothing/under/clip/minutemen{
-	pixel_x = 8;
-	pixel_y = 3
+/turf/open/floor/plasteel/patterned/grid/dark,
+/area/ship/crew/cryo)
+"bh" = (
+/obj/effect/turf_decal/industrial/warning/green,
+/obj/machinery/door/firedoor/heavy,
+/obj/structure/cable{
+	icon_state = "0-2"
 	},
-/obj/item/clothing/under/clip/minutemen{
-	pixel_x = 5;
-	pixel_y = 3
+/obj/machinery/power/shieldwallgen/atmos/roundstart{
+	dir = 4;
+	id = "atlas_cargo_holo"
 	},
-/obj/item/clothing/under/clip/minutemen{
-	pixel_x = 2;
-	pixel_y = 3
+/obj/machinery/door/poddoor{
+	id = "atlas_cargo"
 	},
-/turf/open/floor/plasteel/dark,
-/area/ship/crew)
-"aS" = (
-/obj/machinery/firealarm/directional/west,
-/obj/effect/turf_decal/siding/thinplating/dark{
-	dir = 8
+/turf/open/floor/plating,
+/area/ship/cargo)
+"bj" = (
+/obj/machinery/atmospherics/pipe/simple/orange/hidden,
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering)
+"bk" = (
+/turf/open/floor/plasteel/stairs/mid{
+	dir = 4;
+	color = "#535456"
 	},
-/obj/effect/turf_decal/industrial/warning,
-/turf/open/floor/plasteel/dark,
-/area/ship/hallway/central)
-"aX" = (
-/obj/effect/turf_decal/trimline/transparent/blue/filled/corner{
+/area/ship/crew/canteen)
+"bl" = (
+/obj/structure/platform/ship_three,
+/obj/structure/railing/thin{
+	layer = 3.081
+	},
+/obj/effect/turf_decal/techfloor,
+/obj/effect/turf_decal/trimline/opaque/beige/filled/line{
 	dir = 1
 	},
-/obj/effect/turf_decal/trimline/transparent/blue/filled/corner{
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"bu" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/structure/railing/thin/corner{
 	dir = 4
 	},
-/obj/effect/turf_decal/siding/thinplating/dark/corner{
+/obj/machinery/atmospherics/pipe/layer_manifold{
 	dir = 4
 	},
-/obj/effect/turf_decal/siding/thinplating/dark/corner{
+/obj/structure/catwalk/over,
+/turf/open/floor/plating,
+/area/ship/engineering)
+"bx" = (
+/obj/effect/turf_decal/corner/opaque/black/half{
+	dir = 8
+	},
+/obj/effect/turf_decal/industrial/warning/green{
+	dir = 8
+	},
+/obj/structure/railing/corner{
 	dir = 1
 	},
-/obj/effect/turf_decal/spline/fancy/opaque/black,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 4
+/obj/effect/turf_decal/siding/thinplating{
+	dir = 8
 	},
 /turf/open/floor/plasteel/dark,
-/area/ship/security)
+/area/ship/crew/canteen)
+"bC" = (
+/obj/effect/turf_decal/corner/transparent/blue/full,
+/obj/machinery/door/airlock/medical{
+	name = "Infirmary"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/door/firedoor/border_only{
+	dir = 1
+	},
+/obj/machinery/door/firedoor/border_only,
+/turf/open/floor/plasteel/white,
+/area/ship/medical)
 "bF" = (
 /obj/machinery/atmospherics/components/unary/outlet_injector/on/layer4,
-/turf/open/floor/plating/airless,
+/obj/effect/turf_decal/industrial/warning/green{
+	dir = 5
+	},
+/turf/open/floor/engine/hull/reinforced,
 /area/ship/engineering)
 "bK" = (
-/obj/machinery/power/terminal{
-	dir = 8
+/obj/effect/turf_decal/techfloor,
+/obj/effect/turf_decal/spline/plain/opaque/grey,
+/obj/structure/chair/office{
+	dir = 1;
+	pixel_y = 2
 	},
-/obj/structure/cable{
-	icon_state = "0-4"
+/obj/effect/turf_decal/trimline/opaque/beige/filled/line{
+	dir = 1
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"cd" = (
+/obj/structure/railing/thin,
+/obj/effect/turf_decal/corner/transparent/lime/half,
+/obj/machinery/atmospherics/components/binary/valve{
+	dir = 4
 	},
 /turf/open/floor/plasteel/tech,
 /area/ship/engineering)
-"bQ" = (
-/obj/structure/sign/poster/clip/bard{
-	pixel_y = 32
+"cf" = (
+/obj/effect/turf_decal/corner/opaque/blue/half{
+	dir = 8
 	},
-/obj/effect/turf_decal/techfloor{
+/obj/effect/turf_decal/corner/opaque/blue/half{
 	dir = 1
 	},
-/turf/open/floor/plasteel/tech/grid,
-/area/ship/security)
-"bS" = (
-/obj/effect/turf_decal/trimline/transparent/blue/filled/line{
+/obj/effect/turf_decal/corner/opaque/blue,
+/obj/structure/chair{
 	dir = 4
 	},
-/obj/effect/turf_decal/siding/thinplating/dark/corner,
-/obj/effect/turf_decal/siding/thinplating/dark/corner{
+/turf/open/floor/plasteel/white,
+/area/ship/crew/canteen)
+"cm" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/effect/turf_decal/corner/opaque/black/half,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
 	},
-/obj/effect/turf_decal/spline/fancy/opaque/black{
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 8
 	},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
-	dir = 8
+/obj/structure/chair{
+	dir = 1
 	},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+/obj/effect/turf_decal/corner/opaque/blue/border,
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/canteen)
+"cn" = (
+/obj/effect/turf_decal/corner/opaque/blue/half{
 	dir = 8
 	},
-/obj/structure/cable{
-	icon_state = "2-4"
-	},
-/obj/structure/cable{
-	icon_state = "1-2"
+/obj/effect/turf_decal/corner/opaque/blue,
+/obj/structure/chair{
+	dir = 4
 	},
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plasteel/white,
 /area/ship/crew/canteen)
-"cc" = (
-/turf/open/floor/wood,
-/area/ship/crew/crewthree)
-"cm" = (
-/obj/effect/turf_decal/trimline/transparent/blue/warning,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/structure/cable{
-	icon_state = "1-2"
+"cr" = (
+/obj/structure/chair{
+	dir = 4
 	},
-/obj/effect/turf_decal/siding/thinplating/dark/corner{
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/turf_decal/trimline/opaque/beige/filled/line{
 	dir = 8
 	},
-/obj/effect/turf_decal/siding/thinplating/dark/corner,
-/turf/open/floor/plasteel/dark,
-/area/ship/crew/canteen)
-"ct" = (
-/obj/effect/turf_decal/siding/thinplating/dark{
-	dir = 1
-	},
-/obj/effect/turf_decal/trimline/transparent/blue/line{
-	dir = 1
+/obj/machinery/button/door{
+	dir = 1;
+	pixel_y = -20;
+	pixel_x = -7;
+	name = "bridge door button";
+	normaldoorcontrol = 1;
+	id = "atlas_bridge_entry"
 	},
-/obj/structure/railing,
-/turf/open/floor/pod/dark,
-/area/ship/crew/canteen)
-"cN" = (
+/turf/open/floor/plasteel,
+/area/ship/bridge)
+"cs" = (
 /obj/machinery/power/smes/shuttle/precharged,
 /obj/structure/cable/yellow{
 	icon_state = "0-8"
 	},
-/obj/effect/turf_decal/steeldecal/steel_decals_central3{
-	dir = 4
+/obj/structure/window/reinforced{
+	dir = 8
+	},
+/obj/effect/turf_decal/industrial/warning/green/full,
+/obj/machinery/door/poddoor/shutters{
+	dir = 4;
+	id = "atlas_engines_north"
 	},
 /turf/open/floor/plasteel/tech,
 /area/ship/engineering)
-"cV" = (
-/obj/structure/sign/poster/clip/random{
-	pixel_y = -32
-	},
-/obj/effect/turf_decal/siding/wood/corner{
-	dir = 8
-	},
-/turf/open/floor/carpet/nanoweave/blue,
-/area/ship/crew/crewtwo)
-"cY" = (
-/obj/effect/turf_decal/corner/transparent/blue/border{
-	dir = 4
-	},
-/obj/effect/turf_decal/corner/transparent/blue/mono,
-/obj/machinery/door/firedoor/border_only{
-	dir = 4
+"ct" = (
+/obj/structure/platform/ship_three{
+	dir = 6
 	},
-/obj/structure/curtain/cloth,
-/obj/effect/turf_decal/siding/thinplating{
-	dir = 4
+/obj/effect/turf_decal/techfloor{
+	dir = 6
 	},
-/turf/open/floor/plasteel/mono/white,
-/area/ship/medical)
-"da" = (
-/turf/closed/wall/mineral/plastitanium/nodiagonal,
-/area/ship/crew/crewtwo)
-"di" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced/fulltile,
-/obj/machinery/door/poddoor/shutters/preopen{
-	id = "atlas_dorms"
+/obj/structure/railing/thin{
+	dir = 6;
+	layer = 3.081
 	},
-/turf/open/floor/plating,
-/area/ship/crew)
-"dw" = (
 /obj/effect/turf_decal/minutemen/corner{
 	dir = 1
 	},
-/turf/open/floor/plasteel/dark,
-/area/ship/bridge)
-"dM" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/plasteel/grimy,
-/area/ship/crew/canteen)
-"dV" = (
-/obj/effect/turf_decal/trimline/transparent/blue/filled/line{
+/obj/effect/turf_decal/spline/fancy/opaque/black/corner{
 	dir = 1
 	},
+/obj/machinery/light/floor,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/bridge)
+"cu" = (
 /obj/effect/turf_decal/siding/thinplating/dark{
 	dir = 1
 	},
-/obj/effect/turf_decal/spline/fancy/opaque/black,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 4
-	},
-/turf/open/floor/plasteel/dark,
-/area/ship/security)
-"ec" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 4
+/obj/effect/turf_decal/corner/opaque/black/half{
+	dir = 1
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 4
+/obj/effect/turf_decal/trimline/opaque/blue/warning{
+	dir = 1
 	},
-/obj/structure/cable{
-	icon_state = "4-8"
+/obj/effect/turf_decal/corner/opaque/white/border,
+/obj/effect/turf_decal/corner/transparent/blue/border,
+/obj/machinery/light/directional/south,
+/obj/structure/chair{
+	dir = 1
 	},
-/turf/open/floor/plasteel/mono/dark,
+/turf/open/floor/plasteel/dark,
 /area/ship/hallway/central)
-"em" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 4
+"cy" = (
+/obj/structure/grille,
+/obj/structure/window/reinforced/fulltile,
+/obj/machinery/door/poddoor/shutters/preopen{
+	dir = 8;
+	id = "atlas_bridgelockdown"
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+/turf/open/floor/plating,
+/area/ship/bridge)
+"cB" = (
+/obj/structure/railing/thin{
 	dir = 4
 	},
 /obj/structure/cable{
-	icon_state = "4-8"
+	icon_state = "1-8"
 	},
-/obj/machinery/light/directional/north,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden,
+/obj/effect/turf_decal/corner/transparent/lime/half{
+	dir = 4
+	},
+/obj/machinery/telecomms/relay/preset/minutemen,
 /turf/open/floor/plasteel/tech,
-/area/ship/crew/canteen)
-"ev" = (
-/obj/effect/decal/fakelattice,
-/obj/structure/railing,
-/turf/open/floor/plasteel/elevatorshaft,
-/area/ship/hallway/central)
-"eB" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/door/airlock/grunge{
-	name = "Bathroom";
-	id_tag = "atlas_bathroom"
+/area/ship/engineering)
+"cE" = (
+/obj/structure/grille,
+/obj/structure/window/reinforced/fulltile,
+/obj/machinery/door/poddoor/shutters{
+	id = "atlas_engi_south"
 	},
-/obj/machinery/door/firedoor/border_only{
-	dir = 1
+/obj/machinery/atmospherics/pipe/simple/general/hidden/layer2,
+/turf/open/floor/plating,
+/area/ship/engineering)
+"cI" = (
+/obj/structure/catwalk/over/plated_catwalk/dark,
+/turf/open/floor/plasteel/telecomms_floor,
+/area/ship/bridge)
+"cM" = (
+/obj/effect/turf_decal/corner/opaque/beige/border,
+/obj/effect/turf_decal/corner/opaque/white/bordercorner{
+	dir = 4
 	},
-/obj/machinery/door/firedoor/border_only,
-/obj/effect/turf_decal/siding/thinplating/dark/corner{
+/obj/effect/turf_decal/corner/opaque/beige/bordercorner{
 	dir = 1
 	},
-/turf/open/floor/plasteel/dark,
-/area/ship/crew)
-"eH" = (
-/obj/structure/closet/secure_closet{
-	icon_state = "cap";
-	name = "captain's locker";
-	req_access_txt = "20"
+/obj/structure/closet/secure_closet/clip/minutemen/captain{
+	pixel_x = 8
 	},
 /obj/item/storage/guncase/pistol/cm23,
-/obj/item/clothing/suit/armor/clip_capcoat{
-	pixel_x = -14
-	},
-/obj/item/clothing/under/clip/officer{
-	pixel_x = 13
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/dorm/commad)
+"cX" = (
+/obj/effect/turf_decal/corner/opaque/white/border{
+	dir = 4
 	},
-/obj/item/clothing/under/clip/officer/alt{
-	pixel_x = 13
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 5
 	},
-/obj/item/radio/headset/clip/captain{
-	pixel_x = 7
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 5
 	},
-/obj/item/clothing/head/clip/slouch/officer{
-	pixel_y = 13
+/obj/structure/cable{
+	icon_state = "1-4"
 	},
-/obj/item/storage/backpack/satchel/sec/clip{
-	pixel_y = -15
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/hallway/central)
+"da" = (
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/ship/crew/office)
+"di" = (
+/obj/structure/platform/ship_four/corner{
+	dir = 1
 	},
-/obj/item/storage/backpack/security/clip{
-	pixel_y = -15
+/turf/open/floor/engine/hull/reinforced,
+/area/ship/external/dark)
+"ds" = (
+/obj/effect/spawner/bunk_bed{
+	dir = 1
 	},
-/turf/open/floor/carpet/blue,
-/area/ship/crew/crewthree)
-"eJ" = (
-/obj/effect/turf_decal/siding/thinplating/dark{
+/obj/structure/curtain/cloth/grey,
+/turf/open/floor/carpet/nanoweave/beige,
+/area/ship/crew/dorm/commad)
+"dw" = (
+/obj/effect/turf_decal/minutemen/corner{
 	dir = 4
 	},
-/obj/effect/turf_decal/trimline/transparent/blue/filled/line{
+/obj/effect/turf_decal/spline/fancy/opaque/black{
+	dir = 8
+	},
+/obj/effect/turf_decal/spline/fancy/opaque/black/corner{
 	dir = 4
 	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /turf/open/floor/plasteel/dark,
-/area/ship/crew/canteen)
-"eK" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 4
+/area/ship/bridge)
+"dy" = (
+/obj/effect/turf_decal/minutemen/corner{
+	dir = 8
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
 	dir = 4
 	},
+/obj/machinery/atmospherics/pipe/simple/orange/hidden,
 /obj/structure/cable{
-	icon_state = "4-8"
+	icon_state = "1-2"
 	},
-/turf/open/floor/plasteel/tech,
-/area/ship/crew/canteen)
-"eU" = (
-/obj/effect/landmark/start/security_officer,
-/obj/structure/chair,
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/plasteel/grimy,
-/area/ship/crew/canteen)
-"eW" = (
-/obj/effect/decal/cleanable/confetti,
-/obj/structure/reagent_dispensers/watertank,
-/turf/open/floor/engine/hull/interior,
+/obj/structure/cable{
+	icon_state = "1-10"
+	},
+/obj/structure/catwalk/over,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/turf/open/floor/plating,
 /area/ship/engineering)
-"fd" = (
+"dM" = (
 /obj/structure/railing{
-	layer = 3.31
+	dir = 4;
+	pixel_x = -1
 	},
-/obj/effect/turf_decal/box/corners{
-	color = "#75A2BB"
+/obj/structure/chair{
+	dir = 4
 	},
-/obj/effect/turf_decal/box/corners{
-	dir = 8;
-	color = "#75A2BB"
+/obj/effect/turf_decal/techfloor{
+	dir = 4
 	},
-/obj/effect/turf_decal/spline/fancy/opaque/black{
-	dir = 8
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/sign/poster/clip/lanchester{
+	pixel_y = -32
 	},
-/obj/machinery/portable_atmospherics/canister/air,
-/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer2{
+/turf/open/floor/plasteel,
+/area/ship/bridge)
+"dO" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer3{
 	dir = 8
 	},
-/turf/open/floor/engine/hull/interior,
+/obj/machinery/portable_atmospherics/canister/oxygen,
+/obj/machinery/atmospherics/pipe/simple/general/hidden/layer2{
+	dir = 10
+	},
+/obj/effect/turf_decal/corner/transparent/lime/half,
+/turf/open/floor/plasteel/tech,
 /area/ship/engineering)
-"fg" = (
-/obj/effect/turf_decal/siding/wood{
-	dir = 8
+"dR" = (
+/obj/effect/turf_decal/corner_steel_grid{
+	dir = 5;
+	layer = 2.030
 	},
-/obj/machinery/light_switch{
-	pixel_y = 20;
-	pixel_x = 9
+/obj/effect/turf_decal/corner_steel_grid{
+	dir = 10
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+/obj/machinery/door/airlock/research{
+	name = "Cargo Bay"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 1
+	},
+/obj/machinery/door/firedoor/border_only,
+/turf/open/floor/pod/light,
+/area/ship/cargo)
+"dX" = (
+/obj/effect/turf_decal/industrial/warning/green/corner{
+	dir = 1
+	},
+/obj/effect/turf_decal/corner/opaque/blue/border{
+	dir = 1
+	},
+/obj/machinery/light/directional/south,
+/turf/open/floor/plasteel/dark,
+/area/ship/hallway/central)
+"dY" = (
+/obj/machinery/atmospherics/pipe/simple/general/hidden/layer4{
 	dir = 4
 	},
+/obj/structure/catwalk/over,
+/turf/open/floor/plating,
+/area/ship/engineering)
+"ec" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 9
+	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 6
+	dir = 9
 	},
-/obj/machinery/firealarm/directional/north,
-/turf/open/floor/plasteel/dark,
-/area/ship/crew)
-"fi" = (
-/obj/structure/catwalk/over/plated_catwalk/dark,
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+/obj/structure/cable{
+	icon_state = "1-8"
+	},
+/turf/open/floor/plasteel,
+/area/ship/crew/dorm/commad)
+"eg" = (
+/obj/structure/chair{
+	dir = 4
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/turf_decal/trimline/opaque/beige/filled/line{
 	dir = 8
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/structure/cable{
-	icon_state = "2-4"
+/obj/machinery/power/apc/auto_name/directional/north,
+/obj/machinery/light_switch{
+	pixel_y = 22;
+	pixel_x = 12
 	},
 /obj/structure/cable{
-	icon_state = "1-2"
+	icon_state = "0-2"
 	},
-/turf/open/floor/plating,
-/area/ship/hallway/central)
-"fj" = (
-/obj/structure/catwalk/over/plated_catwalk/dark,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/structure/cable{
-	icon_state = "1-2"
+/turf/open/floor/plasteel,
+/area/ship/bridge)
+"en" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/camera/autoname{
+	dir = 10;
+	network = list("atlas")
 	},
-/obj/effect/turf_decal/industrial/warning{
-	layer = 2.456;
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/crew/office)
+"ev" = (
+/obj/effect/turf_decal/techfloor{
 	dir = 1
 	},
-/turf/open/floor/plating,
-/area/ship/hallway/central)
-"fp" = (
-/obj/structure/table,
-/obj/machinery/jukebox/boombox,
-/turf/open/floor/plasteel/grimy,
-/area/ship/crew/canteen)
-"fs" = (
 /obj/effect/turf_decal/trimline/transparent/blue/filled/line{
-	dir = 8
-	},
-/obj/effect/turf_decal/siding/thinplating/dark{
-	dir = 8
+	dir = 1
 	},
-/obj/structure/cable{
-	icon_state = "1-2"
+/obj/effect/turf_decal/siding/thinplating{
+	dir = 1
 	},
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
+/obj/machinery/airalarm/directional/east,
 /turf/open/floor/plasteel/tech/grid,
-/area/ship/security)
-"fF" = (
-/obj/effect/turf_decal/corner/transparent/blue/mono,
-/obj/machinery/light/small/directional/east,
-/obj/structure/sink{
-	pixel_y = 19;
-	pixel_x = 7
+/area/ship/security/armory)
+"eB" = (
+/obj/effect/turf_decal/corner/opaque/white/half,
+/obj/effect/turf_decal/corner/opaque/white/half{
+	dir = 1
 	},
-/turf/open/floor/plasteel/mono/white,
-/area/ship/medical)
-"fL" = (
-/obj/effect/turf_decal/corner_steel_grid{
-	dir = 5
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/power/apc/auto_name/directional/west,
+/obj/machinery/light_switch{
+	dir = 4;
+	pixel_x = -19;
+	pixel_y = 13
 	},
+/obj/structure/cable,
+/turf/open/floor/plasteel/white,
+/area/ship/crew/toilet)
+"eD" = (
 /obj/effect/turf_decal/corner_steel_grid{
-	dir = 10
+	dir = 8
 	},
-/turf/open/floor/plasteel/tech/grid,
-/area/ship/crew/canteen)
-"fM" = (
-/obj/structure/cable{
-	icon_state = "6-8"
+/obj/effect/turf_decal/box/white/corners{
+	dir = 8;
+	color = "#CBB1CA"
 	},
-/obj/structure/cable{
-	icon_state = "1-6"
+/obj/structure/crate_shelf,
+/obj/machinery/light/directional/west,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/pod/light,
+/area/ship/cargo)
+"eF" = (
+/obj/effect/turf_decal/corner/transparent/blue/diagonal,
+/obj/effect/turf_decal/spline/fancy/opaque/white{
+	dir = 1
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 5
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+	dir = 4
 	},
-/turf/open/floor/plasteel/tech,
-/area/ship/engineering)
-"fR" = (
-/turf/open/floor/carpet/blue,
-/area/ship/crew)
-"gk" = (
-/obj/machinery/light/directional/south,
-/obj/effect/turf_decal/corner_steel_grid{
-	dir = 5
+/turf/open/floor/plasteel/white,
+/area/ship/medical)
+"eJ" = (
+/obj/effect/turf_decal/corner/opaque/black/half{
+	dir = 1
 	},
-/obj/effect/turf_decal/siding/thinplating/dark/corner,
-/obj/structure/janitorialcart{
-	dir = 8
+/obj/effect/turf_decal/spline/fancy/opaque/grey{
+	dir = 4
 	},
-/obj/item/mop{
-	pixel_x = -3;
-	pixel_y = -2
+/obj/effect/turf_decal/siding/thinplating{
+	dir = 8
 	},
-/obj/effect/turf_decal/box/corners{
-	color = "#75A2BB"
+/obj/structure/cable{
+	icon_state = "1-2"
 	},
-/turf/open/floor/plasteel/tech/grid,
+/turf/open/floor/plasteel/mono,
 /area/ship/crew/canteen)
-"gu" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/spline/fancy/opaque/black{
-	dir = 8
-	},
-/obj/effect/turf_decal/trimline/transparent/blue/filled/line{
-	dir = 4
+"eY" = (
+/obj/effect/turf_decal/industrial/warning/green{
+	dir = 10
 	},
-/obj/effect/turf_decal/siding/thinplating/dark/corner,
-/obj/effect/turf_decal/siding/thinplating/dark/corner{
-	dir = 4
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{
+	dir = 1;
+	filter_types = list("n2")
 	},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
-	dir = 8
+/obj/effect/turf_decal/atmos/nitrogen{
+	pixel_x = 8;
+	pixel_y = 10
 	},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+/turf/open/floor/engine/hull/reinforced,
+/area/ship/engineering)
+"fd" = (
+/obj/effect/turf_decal/corner/opaque/white/bordercorner{
 	dir = 8
 	},
-/obj/structure/cable{
-	icon_state = "1-4"
-	},
-/obj/structure/cable{
-	icon_state = "1-2"
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 10
 	},
-/turf/open/floor/plasteel/dark,
-/area/ship/crew/canteen)
-"gw" = (
-/obj/effect/turf_decal/corner/transparent/blue{
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 10
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /obj/structure/cable{
-	icon_state = "1-2"
+	icon_state = "2-8"
 	},
-/obj/machinery/door/firedoor/border_only{
+/turf/open/floor/plasteel,
+/area/ship/crew/office)
+"fg" = (
+/obj/effect/spawner/bunk_bed{
 	dir = 1
 	},
-/obj/machinery/door/firedoor/border_only,
-/obj/machinery/door/airlock/medical{
-	name = "Medical Bay"
+/obj/structure/railing/thin/corner{
+	dir = 4
 	},
-/turf/open/floor/plasteel/white,
-/area/ship/medical)
-"gy" = (
-/obj/structure/closet/crate/freezer/blood,
+/obj/structure/curtain/cloth/grey,
+/obj/structure/sign/poster/contraband/pgf{
+	pixel_y = 32
+	},
+/obj/item/toy/crayon/red{
+	pixel_x = 3;
+	pixel_y = 8
+	},
+/turf/open/floor/carpet/nanoweave/blue,
+/area/ship/crew/dorm)
+"fi" = (
 /obj/effect/turf_decal/corner/transparent/blue/mono,
-/obj/machinery/light/small/directional/west,
-/obj/machinery/airalarm/directional/north,
+/obj/structure/table/chem,
+/obj/item/storage/case/surgery{
+	pixel_y = 4
+	},
 /turf/open/floor/plasteel/mono/white,
 /area/ship/medical)
-"gA" = (
-/obj/machinery/holopad/emergency/command,
-/obj/effect/turf_decal/minutemen/middle,
-/turf/open/floor/plasteel/dark,
-/area/ship/bridge)
-"gE" = (
-/obj/effect/turf_decal/siding/thinplating/dark/corner{
-	dir = 4
-	},
-/obj/effect/turf_decal/trimline/transparent/blue/filled/corner{
+"fj" = (
+/obj/structure/railing/thin,
+/obj/effect/turf_decal/industrial/warning/green{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 5
-	},
-/obj/effect/turf_decal/spline/fancy/opaque/black,
-/turf/open/floor/plasteel/dark,
-/area/ship/security)
-"gF" = (
-/obj/effect/turf_decal/spline/fancy/opaque/black{
-	dir = 1
-	},
-/obj/effect/turf_decal/minutemen/edge{
-	dir = 1
+/turf/open/floor/plasteel/stairs{
+	dir = 8;
+	color = "#535456"
 	},
-/turf/open/floor/plasteel/dark,
 /area/ship/bridge)
-"gH" = (
-/obj/structure/catwalk/over/plated_catwalk/dark,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/structure/cable{
-	icon_state = "1-2"
+"fp" = (
+/obj/effect/turf_decal/spline/fancy/opaque/grey,
+/obj/effect/turf_decal/corner/opaque/black/half,
+/obj/effect/turf_decal/siding/thinplating{
+	dir = 1
 	},
-/obj/effect/turf_decal/industrial/warning{
-	layer = 2.456
+/turf/open/floor/plasteel/mono,
+/area/ship/crew/canteen)
+"fr" = (
+/obj/structure/table/reinforced,
+/obj/item/storage/toolbox/ammo/c9mm{
+	pixel_x = -3;
+	pixel_y = 24
 	},
-/turf/open/floor/plating,
-/area/ship/hallway/central)
-"gR" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced/fulltile,
-/obj/machinery/door/poddoor/shutters/preopen{
-	id = "atlas_fo"
+/obj/item/storage/toolbox/ammo/c10mm{
+	pixel_x = 7;
+	pixel_y = 10
 	},
-/turf/open/floor/plating,
-/area/ship/crew/crewtwo)
-"gT" = (
-/turf/closed/wall/mineral/plastitanium/nodiagonal,
-/area/ship/security)
-"gU" = (
-/obj/effect/turf_decal/spline/fancy/opaque/black/corner{
-	dir = 4
+/obj/item/storage/toolbox/ammo/a762_40{
+	pixel_x = -13;
+	pixel_y = 10
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 5
+/obj/item/storage/box/ammo/a12g_buckshot{
+	pixel_y = -1;
+	pixel_x = -3
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 5
+/obj/machinery/camera/autoname{
+	network = list("atlas")
 	},
-/obj/structure/cable{
-	icon_state = "1-4"
+/obj/structure/closet/secure_closet/wall/directional/west{
+	req_access = list(3);
+	name = "ammunition storage"
 	},
-/obj/effect/turf_decal/siding/thinplating/dark,
+/obj/machinery/light/small/directional/north,
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/security/armory)
+"fw" = (
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering)
+"fF" = (
+/obj/machinery/suit_storage_unit/inherit/industrial,
+/obj/item/clothing/suit/space/hardsuit/clip_patroller,
+/obj/item/clothing/mask/breath,
+/obj/item/tank/internals/oxygen,
+/obj/effect/turf_decal/industrial/warning/green/fulltile,
+/obj/machinery/light/directional/north,
 /turf/open/floor/plasteel/dark,
-/area/ship/crew/canteen)
-"hg" = (
-/obj/effect/turf_decal/trimline/transparent/blue/line,
-/obj/machinery/light_switch{
-	dir = 1;
-	pixel_y = -23
+/area/ship/security/armory)
+"fH" = (
+/obj/effect/turf_decal/corner_steel_grid{
+	dir = 5;
+	layer = 2.030
 	},
-/obj/effect/turf_decal/siding/thinplating/dark,
-/turf/open/floor/plasteel/dark,
-/area/ship/crew/canteen)
-"hq" = (
-/obj/effect/turf_decal/siding/wood{
+/obj/effect/turf_decal/industrial/warning/green{
 	dir = 1
 	},
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
-/obj/machinery/light/directional/west,
-/turf/open/floor/plasteel/dark,
-/area/ship/crew/crewthree)
-"hL" = (
-/obj/structure/catwalk/over/plated_catwalk/dark,
-/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 4
+/obj/effect/turf_decal/corner_steel_grid{
+	dir = 10
 	},
+/obj/effect/turf_decal/industrial/stand_clear/white,
+/obj/machinery/light/directional/west,
 /obj/structure/cable{
-	icon_state = "4-8"
+	icon_state = "1-4"
 	},
-/obj/structure/cable{
-	icon_state = "2-8"
+/turf/open/floor/pod/light,
+/area/ship/cargo)
+"fJ" = (
+/obj/effect/decal/fakelattice{
+	icon_state = "lattice-3"
 	},
-/obj/structure/cable{
-	icon_state = "1-8"
+/obj/structure/railing/thin,
+/turf/open/floor/plasteel/elevatorshaft,
+/area/ship/bridge)
+"fL" = (
+/obj/structure/table,
+/obj/structure/reagent_dispensers/peppertank{
+	pixel_y = 28
 	},
-/turf/open/floor/plating,
-/area/ship/hallway/central)
-"hQ" = (
-/obj/effect/turf_decal/trimline/transparent/blue/warning,
-/obj/effect/turf_decal/siding/thinplating/dark{
+/obj/machinery/recharger{
+	pixel_y = 3
+	},
+/obj/effect/turf_decal/techfloor{
 	dir = 1
 	},
-/obj/structure/chair,
-/obj/machinery/light/directional/north,
-/turf/open/floor/plasteel/dark,
-/area/ship/hallway/central)
-"hR" = (
-/obj/structure/table/wood,
-/obj/structure/sign/poster/official/moth/smokey{
-	pixel_x = -32
+/obj/effect/turf_decal/spline/plain/opaque/blue{
+	dir = 1
 	},
-/obj/item/modular_computer/laptop/preset/civilian{
-	pixel_y = 5;
-	pixel_x = 2
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/security/armory)
+"fM" = (
+/obj/machinery/atmospherics/components/binary/valve{
+	dir = 4
 	},
-/turf/open/floor/wood,
-/area/ship/crew/crewthree)
-"ia" = (
-/obj/effect/turf_decal/trimline/transparent/blue/warning{
+/obj/effect/turf_decal/corner/transparent/lime/half{
 	dir = 1
 	},
-/obj/effect/turf_decal/siding/thinplating/dark,
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering)
+"fR" = (
+/obj/effect/turf_decal/corner/opaque/blue/border{
+	dir = 1
+	},
+/obj/effect/turf_decal/corner/opaque/blue/bordercorner,
+/obj/effect/turf_decal/corner/opaque/white/bordercorner{
+	dir = 8
+	},
+/obj/effect/decal/cleanable/dirt/dust,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 9
+	dir = 8
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 9
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/dorm)
+"fX" = (
+/obj/machinery/camera/autoname{
+	dir = 8;
+	network = list("atlas")
 	},
-/obj/structure/cable{
-	icon_state = "1-8"
+/obj/effect/turf_decal/corner/opaque/black/half{
+	dir = 4
 	},
+/obj/machinery/vending/cola/starkist,
 /turf/open/floor/plasteel/dark,
-/area/ship/hallway/central)
-"is" = (
-/obj/effect/turf_decal/trimline/transparent/blue/warning{
+/area/ship/crew/canteen)
+"ga" = (
+/obj/machinery/atmospherics/pipe/simple/cyan/hidden/layer2{
+	dir = 6
+	},
+/obj/structure/catwalk/over,
+/obj/machinery/light/directional/west,
+/turf/open/floor/plating,
+/area/ship/engineering)
+"gb" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/turf_decal/corner/opaque/white/border{
+	dir = 8
+	},
+/obj/structure/filingcabinet/double{
+	pixel_x = -11;
+	pixel_y = 1;
+	density = 0;
 	dir = 4
 	},
-/obj/effect/turf_decal/siding/thinplating/dark/corner{
-	dir = 1
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 5
 	},
-/obj/effect/turf_decal/industrial/warning{
+/turf/open/floor/plasteel,
+/area/ship/crew/office)
+"go" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel,
+/area/ship/crew/dorm/commad)
+"gs" = (
+/obj/effect/turf_decal/corner/opaque/blue/bordercorner,
+/obj/effect/turf_decal/corner/opaque/blue/border{
 	dir = 1
 	},
-/turf/open/floor/plasteel/dark,
-/area/ship/hallway/central)
-"iw" = (
-/obj/effect/turf_decal/siding/wood,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
-	dir = 1
+/obj/effect/turf_decal/corner/opaque/white/bordercorner{
+	dir = 8
 	},
-/obj/machinery/light/directional/west,
 /turf/open/floor/plasteel/dark,
-/area/ship/crew/crewtwo)
-"ix" = (
-/obj/structure/catwalk/over/plated_catwalk/dark,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2,
-/obj/structure/cable{
-	icon_state = "4-8"
+/area/ship/crew/dorm)
+"gu" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+	dir = 8
 	},
-/obj/structure/cable{
-	icon_state = "2-8"
+/turf/open/floor/pod/light,
+/area/ship/cargo)
+"gw" = (
+/obj/effect/turf_decal/corner/opaque/blue/border,
+/obj/effect/turf_decal/corner/opaque/blue/bordercorner{
+	dir = 1
 	},
-/obj/structure/cable{
-	icon_state = "1-8"
+/obj/effect/turf_decal/corner/opaque/white/bordercorner{
+	dir = 4
 	},
-/obj/effect/turf_decal/industrial/warning{
+/obj/structure/closet/wardrobe/clip/minutemen/wall{
 	dir = 4;
-	layer = 2.456
+	pixel_x = 28
 	},
-/turf/open/floor/plating,
-/area/ship/hallway/central)
-"iN" = (
-/obj/structure/railing/corner{
-	dir = 8
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+	dir = 1
 	},
-/obj/structure/railing/corner,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/structure/cable{
-	icon_state = "2-9"
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/dorm)
+"gy" = (
+/obj/machinery/shower{
+	dir = 8;
+	pixel_y = 8
 	},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
-	dir = 8
+/obj/structure/catwalk/over/plated_catwalk/white,
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/crew/toilet)
+"gA" = (
+/obj/machinery/atmospherics/pipe/layer_manifold,
+/obj/machinery/button/door{
+	pixel_x = -20;
+	pixel_y = -7;
+	id = "atlas_engi_south";
+	name = "window shutters button";
+	dir = 4
+	},
+/obj/machinery/button/door{
+	pixel_x = -20;
+	pixel_y = 7;
+	id = "atlas_engines_south";
+	name = "engine shutters button";
+	dir = 4
 	},
 /obj/structure/catwalk/over,
 /turf/open/floor/plating,
 /area/ship/engineering)
-"iO" = (
-/obj/structure/table/reinforced,
-/obj/machinery/fax/clip{
-	pixel_y = 7
-	},
-/obj/machinery/light/directional/north,
-/turf/open/floor/plasteel/telecomms_floor,
-/area/ship/bridge)
-"iQ" = (
-/obj/machinery/firealarm/directional/west,
-/obj/effect/turf_decal/siding/thinplating/dark{
-	dir = 8
-	},
-/obj/effect/turf_decal/industrial/warning{
-	dir = 1
-	},
-/turf/open/floor/plasteel/dark,
-/area/ship/hallway/central)
-"iS" = (
-/obj/effect/turf_decal/spline/fancy/opaque/black{
+"gC" = (
+/obj/effect/turf_decal/minutemen/corner{
 	dir = 1
 	},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden,
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
 	dir = 4
 	},
 /obj/structure/cable{
-	icon_state = "4-8"
+	icon_state = "1-2"
 	},
-/turf/open/floor/plasteel/dark,
-/area/ship/crew/canteen)
-"iW" = (
-/obj/structure/closet/secure_closet{
-	icon_state = "cap";
-	name = "first officer's locker";
-	req_access_txt = "19"
+/obj/structure/cable{
+	icon_state = "2-9"
 	},
-/obj/item/storage/guncase/pistol/cm23{
-	pixel_y = -4
+/obj/structure/catwalk/over,
+/turf/open/floor/plating,
+/area/ship/engineering)
+"gF" = (
+/obj/structure/railing{
+	dir = 4;
+	pixel_x = -1
 	},
-/obj/item/clothing/head/clip/slouch/officer{
-	pixel_y = 13
+/obj/structure/chair{
+	dir = 4
 	},
-/obj/item/radio/headset/clip/captain{
-	pixel_x = 7
+/obj/effect/turf_decal/techfloor{
+	dir = 4
 	},
-/obj/item/clothing/under/clip/officer/alt{
-	pixel_x = 13
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel,
+/area/ship/bridge)
+"gH" = (
+/obj/machinery/door/window,
+/obj/effect/turf_decal/corner/opaque/white/half,
+/obj/effect/turf_decal/corner/opaque/white/half{
+	dir = 1
 	},
-/obj/item/clothing/under/clip/officer{
-	pixel_x = 13
+/turf/open/floor/plasteel/white,
+/area/ship/crew/toilet)
+"gR" = (
+/obj/structure/grille,
+/obj/structure/window/reinforced/fulltile,
+/obj/machinery/door/poddoor/shutters{
+	id = "atlas_office"
 	},
-/obj/item/clothing/suit/toggle/lawyer/clip/command{
-	pixel_x = -13
+/turf/open/floor/plating,
+/area/ship/crew/office)
+"gT" = (
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/ship/security/armory)
+"gU" = (
+/obj/structure/railing{
+	dir = 1
 	},
-/obj/item/storage/backpack/satchel/sec/clip{
-	pixel_y = -15
+/turf/open/floor/plasteel/stairs/right{
+	dir = 4;
+	color = "#535456"
 	},
-/obj/item/storage/backpack/security/clip{
-	pixel_y = -15
+/area/ship/crew/canteen)
+"gV" = (
+/obj/effect/decal/fakelattice{
+	icon_state = "lattice-21"
 	},
-/turf/open/floor/carpet/nanoweave/blue,
-/area/ship/crew/crewtwo)
-"jc" = (
-/obj/machinery/door/window/brigdoor/southright{
-	req_access = list(3);
-	dir = 4
+/obj/structure/lattice/catwalk,
+/obj/machinery/camera/autoname{
+	dir = 8;
+	network = list("atlas")
 	},
-/obj/effect/turf_decal/trimline/transparent/blue/warning{
+/turf/open/floor/plating,
+/area/ship/external/dark)
+"he" = (
+/obj/effect/turf_decal/corner/opaque/white/half{
 	dir = 4
 	},
-/turf/open/floor/plasteel/dark,
-/area/ship/security)
-"jp" = (
-/obj/structure/sign/number/random,
-/turf/closed/wall/mineral/plastitanium/nodiagonal,
-/area/ship/crew/crewtwo)
-"js" = (
-/turf/open/floor/plasteel/dark,
-/area/ship/bridge)
-"jG" = (
-/obj/effect/turf_decal/siding/thinplating/dark{
+/turf/open/floor/plasteel,
+/area/ship/crew/office)
+"ho" = (
+/obj/structure/platform/ship_three{
 	dir = 1
 	},
-/obj/effect/turf_decal/trimline/transparent/blue/line{
+/obj/structure/railing/thin{
 	dir = 1
 	},
-/turf/open/floor/pod/dark,
-/area/ship/crew/canteen)
-"jI" = (
-/obj/structure/chair,
-/turf/open/floor/plasteel/grimy,
-/area/ship/crew/canteen)
-"jL" = (
-/obj/structure/catwalk/over/plated_catwalk/dark,
-/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4,
-/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2,
-/obj/structure/cable{
-	icon_state = "1-8"
+/obj/effect/turf_decal/techfloor{
+	dir = 1
+	},
+/obj/structure/chair/office{
+	dir = 8;
+	layer = 3.081
+	},
+/obj/effect/turf_decal/trimline/opaque/beige/filled/line,
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"hu" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
 	},
 /obj/structure/cable{
-	icon_state = "2-8"
+	icon_state = "4-8"
 	},
-/turf/open/floor/plating,
-/area/ship/hallway/central)
-"jQ" = (
-/obj/structure/table/wood,
-/obj/item/flashlight/lamp/green{
-	pixel_y = 7;
-	pixel_x = 12
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 8
 	},
-/obj/item/melee/chainofcommand{
-	pixel_x = -4;
-	pixel_y = 2
+/obj/structure/railing,
+/turf/open/floor/plasteel/stairs/left{
+	dir = 4;
+	color = "#535456"
 	},
-/obj/item/radio/intercom/directional/west,
-/obj/item/spacecash/bundle/c1000{
-	pixel_y = -10;
-	pixel_x = -5
+/area/ship/crew/canteen)
+"hL" = (
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 6
 	},
-/obj/item/spacecash/bundle/c1000{
-	pixel_y = -8;
-	pixel_x = 4
+/obj/effect/turf_decal/corner/opaque/black/half,
+/obj/effect/turf_decal/corner/opaque/black/half{
+	dir = 4
 	},
-/obj/item/spacecash/bundle/c1000{
-	pixel_y = -2;
-	pixel_x = -3
+/obj/effect/turf_decal/trimline/opaque/blue/warning{
+	dir = 6
 	},
-/turf/open/floor/wood,
-/area/ship/crew/crewthree)
-"jR" = (
-/obj/effect/landmark/start/station_engineer,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+/obj/effect/turf_decal/corner/opaque/blue/bordercorner{
 	dir = 1
 	},
-/obj/structure/catwalk/over,
-/turf/open/floor/plating,
-/area/ship/engineering)
-"jY" = (
-/obj/machinery/power/smes/shuttle/precharged,
-/obj/structure/cable/yellow{
-	icon_state = "0-8"
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel,
+/area/ship/hallway/central)
+"hO" = (
+/obj/structure/grille,
+/obj/structure/window/reinforced/fulltile,
+/obj/machinery/door/poddoor/shutters{
+	id = "atlas_engi_south"
 	},
+/obj/machinery/atmospherics/pipe/simple/general/hidden/layer1,
 /turf/open/floor/plating,
 /area/ship/engineering)
-"jZ" = (
-/turf/open/floor/plasteel/tech,
-/area/ship/cargo)
-"kd" = (
-/obj/structure/table,
-/obj/effect/turf_decal/trimline/transparent/blue/filled/line{
-	dir = 4
-	},
-/obj/effect/turf_decal/siding/thinplating/dark{
+"hP" = (
+/obj/effect/turf_decal/trimline/transparent/blue/filled/corner{
 	dir = 4
 	},
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
-/obj/structure/closet/wall/red/directional/north{
-	name = "field supply cabinet"
-	},
-/obj/item/storage/box/zipties{
-	pixel_x = -8;
-	pixel_y = 12
+/obj/structure/closet/secure_closet/freezer{
+	anchored = 1;
+	name = "refrigerator";
+	secure = 0;
+	locked = 0
 	},
-/obj/item/storage/box/zipties{
+/obj/effect/spawner/random/food_or_drink/ration,
+/obj/effect/spawner/random/food_or_drink/ration,
+/obj/effect/spawner/random/food_or_drink/ration,
+/obj/effect/spawner/random/food_or_drink/ration,
+/obj/effect/spawner/random/food_or_drink/ration,
+/obj/effect/spawner/random/food_or_drink/ration,
+/obj/item/food/energybar{
 	pixel_x = -8;
-	pixel_y = 23
+	pixel_y = -6
 	},
-/obj/item/reagent_containers/spray/pepper{
-	pixel_y = 3;
-	pixel_x = -10
+/obj/item/food/energybar{
+	pixel_x = -9;
+	pixel_y = -4
 	},
-/obj/item/reagent_containers/spray/pepper{
-	pixel_y = 3;
-	pixel_x = -5
+/obj/item/food/energybar{
+	pixel_x = -10;
+	pixel_y = -2
 	},
-/obj/item/reagent_containers/spray/pepper{
-	pixel_y = 1;
-	pixel_x = -8
+/obj/item/food/energybar{
+	pixel_x = -11
 	},
-/obj/item/reagent_containers/spray/pepper{
-	pixel_y = 1;
-	pixel_x = -3
+/obj/item/reagent_containers/food/drinks/waterbottle{
+	pixel_x = 9;
+	pixel_y = -4
 	},
-/obj/item/storage/box/flares{
-	pixel_y = 17;
-	pixel_x = 7
+/obj/item/reagent_containers/food/drinks/waterbottle{
+	pixel_x = 9;
+	pixel_y = -4
 	},
-/obj/item/assembly/flash{
-	pixel_y = 5;
-	pixel_x = 3
+/obj/item/reagent_containers/food/drinks/waterbottle{
+	pixel_x = 9;
+	pixel_y = -4
 	},
-/obj/item/assembly/flash{
-	pixel_y = 5;
-	pixel_x = 9
+/obj/item/reagent_containers/food/drinks/waterbottle{
+	pixel_x = 9;
+	pixel_y = -4
 	},
-/obj/item/assembly/flash{
-	pixel_y = 3;
-	pixel_x = 5
+/obj/item/reagent_containers/food/drinks/waterbottle{
+	pixel_x = 9;
+	pixel_y = -4
 	},
-/obj/item/assembly/flash{
-	pixel_y = 3;
-	pixel_x = 11
+/obj/item/reagent_containers/food/drinks/waterbottle{
+	pixel_x = 9;
+	pixel_y = -4
 	},
-/turf/open/floor/plasteel/tech/grid,
-/area/ship/security)
-"kt" = (
-/obj/effect/turf_decal/spline/fancy/opaque/black{
-	dir = 4;
-	pixel_y = 1
+/obj/machinery/light/small/directional/north,
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/canteen)
+"hQ" = (
+/obj/structure/table/reinforced,
+/obj/machinery/fax/clip,
+/obj/effect/turf_decal/corner/opaque/white/mono,
+/obj/machinery/light/directional/north,
+/turf/open/floor/plasteel,
+/area/ship/crew/office)
+"ia" = (
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 1
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+/obj/effect/turf_decal/corner/opaque/black/half{
+	dir = 1
+	},
+/obj/effect/turf_decal/trimline/opaque/blue/warning{
 	dir = 1
 	},
+/obj/effect/turf_decal/corner/opaque/white/border,
+/obj/effect/turf_decal/corner/transparent/blue/border,
+/obj/machinery/power/apc/auto_name/directional/south,
 /obj/structure/cable{
-	icon_state = "1-2"
+	icon_state = "0-8"
 	},
-/obj/effect/turf_decal/siding/thinplating/dark/corner{
-	dir = 1
+/obj/machinery/light_switch{
+	dir = 1;
+	pixel_x = -13;
+	pixel_y = -16
 	},
 /turf/open/floor/plasteel/dark,
-/area/ship/crew/canteen)
-"kv" = (
-/obj/effect/turf_decal/trimline/transparent/blue/line,
-/obj/effect/turf_decal/siding/thinplating/dark,
-/turf/open/floor/plasteel/dark,
-/area/ship/crew/canteen)
-"kE" = (
-/obj/effect/turf_decal/siding/thinplating/dark{
-	dir = 9
+/area/ship/hallway/central)
+"if" = (
+/obj/effect/turf_decal/spline/fancy/opaque/grey{
+	dir = 8
 	},
-/obj/structure/railing{
+/obj/effect/turf_decal/corner/opaque/black/half,
+/obj/effect/turf_decal/siding/thinplating{
 	dir = 4
 	},
-/obj/machinery/light/directional/north,
-/obj/structure/closet/crate/bin{
-	pixel_y = 11
-	},
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plasteel/mono,
 /area/ship/crew/canteen)
-"kG" = (
-/obj/structure/table,
-/obj/effect/turf_decal/siding/thinplating/dark{
-	dir = 1
-	},
-/obj/structure/sign/poster/clip/gold{
-	pixel_y = 32
-	},
-/turf/open/floor/plasteel/dark,
-/area/ship/hallway/central)
-"kL" = (
-/obj/effect/turf_decal/trimline/transparent/blue/warning,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
-/turf/open/floor/plasteel/dark,
-/area/ship/hallway/central)
-"kS" = (
-/obj/machinery/door/poddoor{
-	id = "atlas_cargo"
+"is" = (
+/obj/effect/turf_decal/corner_steel_grid{
+	dir = 4
 	},
-/obj/machinery/power/shieldwallgen/atmos/roundstart{
-	dir = 8;
-	id = "atlas_holo"
+/obj/effect/turf_decal/box/white/corners{
+	dir = 4;
+	color = "#CBB1CA"
 	},
 /obj/structure/cable{
-	icon_state = "0-2"
+	icon_state = "1-2"
 	},
-/obj/effect/turf_decal/industrial/warning,
-/turf/open/floor/plating,
+/turf/open/floor/pod/light,
 /area/ship/cargo)
-"kX" = (
-/obj/effect/turf_decal/techfloor{
-	dir = 4
+"it" = (
+/obj/structure/cable{
+	icon_state = "2-8"
 	},
-/obj/structure/closet/crate/bin,
-/turf/open/floor/plasteel/dark,
-/area/ship/hallway/central)
-"lc" = (
-/obj/structure/catwalk/over/plated_catwalk/dark,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 6
+	dir = 10
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 6
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+	dir = 10
 	},
-/obj/structure/cable{
-	icon_state = "2-4"
+/obj/structure/railing/thin/corner{
+	dir = 8
 	},
-/turf/open/floor/plating,
-/area/ship/hallway/central)
-"le" = (
-/obj/effect/turf_decal/industrial/loading{
-	icon_state = "loadingarea_stripes"
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering)
+"iu" = (
+/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/layer2{
+	dir = 1
 	},
-/obj/structure/cable{
-	icon_state = "1-2"
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/structure/closet/emcloset/wall/directional/east,
+/obj/effect/turf_decal/industrial/warning/green{
+	dir = 5
 	},
 /turf/open/floor/plasteel/tech,
-/area/ship/cargo)
-"lw" = (
-/obj/structure/chair/comfy/shuttle{
-	dir = 4
+/area/ship/engineering)
+"ix" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/table/emptycomputer{
+	dir = 1;
+	icon_state = "emptycomputer-right"
 	},
-/obj/effect/landmark/start/head_of_personnel,
-/obj/item/radio/intercom/wideband/directional/south,
-/obj/machinery/firealarm/directional/west{
-	pixel_x = -33;
-	pixel_y = 9
+/obj/item/radio/intercom/wideband{
+	pixel_y = -7
 	},
-/turf/open/floor/plasteel/dark,
-/area/ship/bridge)
-"lJ" = (
-/obj/machinery/power/apc/auto_name/directional/north,
+/obj/machinery/airalarm/directional/south,
+/turf/open/floor/plasteel,
+/area/ship/crew/dorm/commad)
+"iy" = (
+/obj/effect/decal/fakelattice,
+/obj/structure/railing,
+/turf/open/floor/plasteel/elevatorshaft,
+/area/ship/hallway/central)
+"iD" = (
+/obj/machinery/camera/autoname{
+	dir = 6;
+	network = list("atlas")
+	},
+/turf/open/floor/engine/hull/reinforced,
+/area/ship/external/dark)
+"iJ" = (
+/obj/effect/turf_decal/techfloor{
+	dir = 1
+	},
+/obj/effect/turf_decal/spline/plain/opaque/green{
+	dir = 1
+	},
+/obj/machinery/power/apc/auto_name/directional/east,
 /obj/structure/cable{
-	icon_state = "0-8"
+	icon_state = "0-2"
 	},
 /obj/machinery/light_switch{
-	pixel_y = 22;
-	pixel_x = 11
+	dir = 8;
+	pixel_x = 20;
+	pixel_y = -13
 	},
-/turf/open/floor/plasteel/tech,
-/area/ship/crew)
-"lY" = (
-/obj/structure/catwalk/over/plated_catwalk/dark,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/crew/cryo)
+"iP" = (
+/obj/effect/turf_decal/industrial/warning/green{
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 8
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4,
+/obj/structure/cable{
+	icon_state = "1-8"
 	},
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/turf/open/floor/plating,
+/turf/open/floor/plasteel/mono/dark,
 /area/ship/hallway/central)
-"mf" = (
-/obj/effect/turf_decal/techfloor/orange{
+"iQ" = (
+/obj/machinery/door/poddoor/shutters/preopen{
+	id = "atlas_armory"
+	},
+/obj/machinery/door/firedoor,
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/security/armory)
+"iS" = (
+/obj/effect/turf_decal/industrial/warning/green{
 	dir = 4
 	},
-/obj/structure/table,
-/obj/structure/closet/wall/directional/east,
-/obj/item/radio{
-	pixel_y = 15;
-	pixel_x = 7
+/obj/machinery/light/directional/west,
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/canteen)
+"iV" = (
+/obj/effect/turf_decal/corner/opaque/white/half{
+	dir = 1
 	},
-/obj/item/radio{
-	pixel_y = 9;
-	pixel_x = 7
+/obj/effect/turf_decal/corner/opaque/white/half,
+/obj/machinery/door/airlock/grunge{
+	dir = 4;
+	name = "Restroom";
+	id_tag = "atlas_bathroom"
 	},
-/obj/item/radio{
-	pixel_y = 9;
-	pixel_x = 4
+/obj/machinery/door/firedoor/border_only{
+	dir = 8
 	},
-/obj/item/radio{
-	pixel_y = 9
+/obj/machinery/door/firedoor/border_only{
+	dir = 4
 	},
-/obj/item/radio{
-	pixel_y = 9;
-	pixel_x = -4
+/turf/open/floor/plasteel/white,
+/area/ship/crew/dorm/commad)
+"iY" = (
+/obj/structure/platform/industrial{
+	dir = 8
 	},
-/obj/item/radio{
-	pixel_y = 9;
-	pixel_x = -9
+/obj/structure/railing/thin{
+	dir = 8;
+	layer = 3.081
 	},
-/obj/item/radio{
-	pixel_y = 15;
-	pixel_x = 4
+/obj/effect/turf_decal/corner/transparent/lime/half{
+	dir = 8
 	},
-/obj/item/radio{
-	pixel_y = 15
+/obj/structure/cable{
+	icon_state = "1-4"
 	},
-/obj/item/radio{
-	pixel_y = 15;
-	pixel_x = -4
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+	dir = 5
 	},
-/obj/item/radio{
-	pixel_y = 15;
-	pixel_x = -9
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 5
 	},
-/turf/open/floor/plasteel/tech/grid,
-/area/ship/crew)
-"mh" = (
-/obj/structure/dresser,
-/obj/machinery/button/door{
-	pixel_y = 23;
-	id = "atlas_fo";
-	name = "private windows button"
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 5
 	},
-/turf/open/floor/carpet/nanoweave/blue,
-/area/ship/crew/crewtwo)
-"ms" = (
-/obj/docking_port/mobile{
-	dir = 2;
-	launch_status = 0;
-	port_direction = 8;
-	preferred_direction = 4;
-	name = "atlas dock"
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering)
+"ja" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 5
 	},
-/obj/machinery/porta_turret/ship/clip{
-	id = "atlas";
-	dir = 9
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+	dir = 4
 	},
-/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/obj/structure/railing/thin/corner,
+/obj/structure/cable{
+	icon_state = "4-10"
+	},
+/turf/open/floor/plasteel/tech,
 /area/ship/engineering)
-"mw" = (
-/obj/machinery/power/terminal{
+"jf" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
+/obj/effect/turf_decal/trimline/transparent/blue/filled/line{
+	dir = 1
+	},
+/obj/effect/turf_decal/siding/thinplating{
+	dir = 1
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/security/armory)
+"jp" = (
+/obj/effect/turf_decal/spline/fancy/opaque/black{
 	dir = 8
 	},
-/obj/structure/cable{
-	icon_state = "0-4"
+/obj/effect/turf_decal/spline/fancy/opaque/black,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"js" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/computer/security/telescreen/entertainment{
+	pixel_y = 28;
+	network = list("IntraNet, clip")
 	},
-/turf/open/floor/plating,
-/area/ship/engineering)
-"mK" = (
-/obj/structure/cable/yellow{
-	icon_state = "4-10"
+/obj/machinery/light/directional/west,
+/obj/machinery/computer/transponder{
+	icon_state = "transponder-middle"
+	},
+/turf/open/floor/plasteel,
+/area/ship/bridge)
+"jw" = (
+/obj/effect/turf_decal/minutemen/edge{
+	dir = 8
 	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/obj/structure/cable{
-	icon_state = "1-8"
+/obj/machinery/atmospherics/pipe/simple/orange/hidden,
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+	dir = 4
 	},
 /obj/structure/catwalk/over,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 9
+/obj/structure/cable{
+	icon_state = "4-8"
 	},
 /turf/open/floor/plating,
 /area/ship/engineering)
-"mN" = (
-/obj/structure/sign/clip,
-/turf/closed/wall/mineral/plastitanium/nodiagonal,
-/area/ship/engineering)
-"mS" = (
-/obj/effect/turf_decal/corner/transparent/blue/diagonal,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
-	dir = 1
+"jB" = (
+/obj/effect/turf_decal/corner_steel_grid{
+	dir = 5;
+	layer = 2.030
 	},
-/obj/effect/turf_decal/spline/fancy/opaque/white/corner{
-	dir = 4
+/obj/effect/turf_decal/corner_steel_grid{
+	dir = 10
 	},
-/obj/effect/turf_decal/siding/white{
-	dir = 8
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
+/obj/machinery/airalarm/directional/east,
+/turf/open/floor/pod/light,
+/area/ship/cargo)
+"jI" = (
+/obj/structure/table,
+/obj/effect/turf_decal/corner/opaque/blue/diagonal,
+/obj/item/trash/plate{
+	pixel_y = 11;
+	pixel_x = 2
+	},
+/obj/item/reagent_containers/food/drinks/soda_cans/lunapunch{
+	pixel_x = -1;
+	pixel_y = 4
+	},
+/obj/item/reagent_containers/food/drinks/soda_cans/lunapunch{
+	pixel_x = -7
 	},
 /turf/open/floor/plasteel/white,
-/area/ship/medical)
-"nl" = (
-/obj/effect/landmark/start/security_officer,
-/obj/structure/chair,
-/turf/open/floor/plasteel/grimy,
 /area/ship/crew/canteen)
-"nm" = (
-/obj/effect/turf_decal/box/corners{
-	dir = 1;
-	color = "#75A2BB"
+"jL" = (
+/obj/structure/table/chem,
+/obj/effect/turf_decal/corner/transparent/blue{
+	dir = 6
 	},
-/obj/effect/turf_decal/box/corners{
-	dir = 8;
-	color = "#75A2BB"
+/obj/machinery/newscaster/directional/north,
+/obj/item/defibrillator/loaded{
+	pixel_y = 10
 	},
-/turf/open/floor/pod/dark,
-/area/ship/cargo)
-"ny" = (
-/obj/item/gun/ballistic/automatic/smg/cm5/no_mag{
-	pixel_y = -4;
-	pixel_x = 6
+/turf/open/floor/plasteel/white,
+/area/ship/medical)
+"jN" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
 	},
-/obj/effect/turf_decal/trimline/transparent/blue/filled/line{
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 8
 	},
-/obj/effect/turf_decal/trimline/transparent/blue/filled/line{
+/obj/effect/turf_decal/industrial/warning/green{
 	dir = 4
 	},
-/obj/effect/turf_decal/siding/thinplating/dark{
+/obj/structure/railing,
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/canteen)
+"jU" = (
+/obj/effect/turf_decal/corner/opaque/black/half{
+	dir = 4
+	},
+/obj/effect/turf_decal/trimline/opaque/blue/warning{
 	dir = 4
 	},
 /obj/effect/turf_decal/siding/thinplating/dark{
-	dir = 8
+	dir = 4
 	},
-/obj/effect/turf_decal/techfloor{
-	dir = 1
+/obj/effect/turf_decal/corner/opaque/blue/border{
+	dir = 8
 	},
-/obj/machinery/airalarm/directional/north,
-/obj/structure/guncloset,
-/obj/item/gun/ballistic/automatic/assault/cm82{
-	default_ammo_type = 0;
-	pixel_x = -4;
-	pixel_y = 8
+/obj/effect/turf_decal/industrial/warning/green,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/firealarm/directional/west{
+	pixel_y = 7
 	},
-/obj/item/gun/ballistic/automatic/pistol/cm23/no_mag{
-	pixel_x = -4;
-	pixel_y = -8
+/obj/structure/extinguisher_cabinet/directional/west{
+	pixel_y = -5
 	},
-/obj/item/gun/ballistic/automatic/pistol/cm23/no_mag{
-	pixel_x = -4;
-	pixel_y = -8
+/turf/open/floor/plasteel,
+/area/ship/hallway/central)
+"ks" = (
+/obj/structure/grille,
+/obj/structure/window/reinforced/fulltile,
+/obj/machinery/door/poddoor/shutters{
+	dir = 4;
+	id = "atlas_interview"
 	},
-/turf/open/floor/plasteel/tech/grid,
-/area/ship/security)
-"nO" = (
-/obj/machinery/cryopod{
+/turf/open/floor/plating,
+/area/ship/crew/office)
+"kv" = (
+/obj/effect/turf_decal/industrial/warning/green/corner{
 	dir = 8
 	},
-/obj/effect/turf_decal/techfloor/orange{
+/obj/machinery/vending/cigarette,
+/obj/effect/turf_decal/corner/opaque/blue/border,
+/obj/machinery/light/directional/north,
+/turf/open/floor/plasteel/dark,
+/area/ship/hallway/central)
+"ky" = (
+/obj/effect/turf_decal/corner/transparent/blue/three_quarters,
+/obj/effect/turf_decal/corner/transparent/blue{
+	dir = 1
+	},
+/obj/effect/turf_decal/siding/white{
 	dir = 6
 	},
-/turf/open/floor/plasteel/tech/grid,
-/area/ship/crew)
-"nP" = (
-/obj/machinery/door/airlock/mining{
-	name = "Cargo Bay"
+/obj/effect/turf_decal/spline/fancy/opaque/white{
+	dir = 8
+	},
+/obj/machinery/iv_drip{
+	pixel_x = -9;
+	pixel_y = 9;
+	anchored = 1
+	},
+/obj/structure/bed/pod{
+	dir = 1
+	},
+/obj/machinery/light/directional/east,
+/obj/structure/sign/poster/clip/bard{
+	pixel_y = -28
+	},
+/turf/open/floor/plasteel/white,
+/area/ship/medical)
+"kE" = (
+/obj/effect/turf_decal/minutemen/corner{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/structure/cable{
-	icon_state = "1-2"
+	icon_state = "1-10"
 	},
-/obj/machinery/door/firedoor/border_only,
-/obj/machinery/door/firedoor/border_only{
+/obj/structure/catwalk/over,
+/obj/effect/turf_decal/corner/transparent/lime/half{
+	dir = 8
+	},
+/turf/open/floor/plating,
+/area/ship/engineering)
+"kG" = (
+/obj/effect/turf_decal/corner/opaque/blue/border,
+/obj/effect/turf_decal/corner/opaque/white/bordercorner{
+	dir = 4
+	},
+/obj/effect/turf_decal/corner/opaque/blue/bordercorner{
 	dir = 1
 	},
+/obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/plasteel/dark,
-/area/ship/cargo)
-"nQ" = (
-/obj/structure/table,
-/obj/machinery/light/directional/south,
-/obj/effect/turf_decal/trimline/transparent/blue/corner,
-/obj/effect/turf_decal/siding/thinplating/dark{
-	dir = 10
-	},
-/obj/machinery/microwave{
-	pixel_y = 7
+/area/ship/crew/dorm)
+"kL" = (
+/obj/effect/turf_decal/corner/opaque/white{
+	dir = 4
 	},
+/turf/open/floor/plasteel,
+/area/ship/crew/office)
+"kN" = (
+/obj/effect/turf_decal/industrial/warning/green/fulltile,
+/obj/machinery/suit_storage_unit/inherit/industrial,
+/obj/item/clothing/suit/space/hardsuit/clip_patroller,
+/obj/item/clothing/mask/breath,
+/obj/item/tank/internals/oxygen,
+/obj/machinery/light/directional/north,
 /turf/open/floor/plasteel/dark,
-/area/ship/crew/canteen)
-"nS" = (
+/area/ship/security/armory)
+"kS" = (
 /obj/effect/turf_decal/siding/thinplating/dark/corner{
 	dir = 1
 	},
-/obj/effect/turf_decal/spline/fancy/opaque/black/corner,
-/obj/effect/turf_decal/spline/fancy/opaque/black,
+/obj/effect/turf_decal/siding/thinplating/dark/corner{
+	dir = 8
+	},
+/obj/effect/turf_decal/siding/thinplating/dark/corner,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 4
+	dir = 8
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
@@ -1338,320 +1529,344 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/turf/open/floor/plasteel/dark,
-/area/ship/crew/canteen)
-"nU" = (
-/obj/structure/closet/firecloset,
-/obj/effect/turf_decal/corner_steel_grid{
-	dir = 9
-	},
-/obj/effect/turf_decal/box/corners{
+/obj/machinery/door/airlock/grunge{
 	dir = 4;
-	color = "#75A2BB"
+	name = "Canteen"
 	},
-/obj/effect/turf_decal/box/corners{
-	color = "#75A2BB"
-	},
-/obj/effect/turf_decal/spline/fancy/opaque/black{
+/obj/effect/turf_decal/siding/thinplating/corner{
 	dir = 1
 	},
-/turf/open/floor/pod/dark,
-/area/ship/crew/canteen)
-"nW" = (
-/obj/structure/chair{
-	dir = 1
+/obj/effect/turf_decal/siding/thinplating/corner{
+	dir = 8
 	},
-/obj/effect/landmark/start/security_officer,
-/turf/open/floor/plasteel/grimy,
-/area/ship/crew/canteen)
-"nX" = (
-/obj/effect/turf_decal/industrial/warning{
-	dir = 1
+/obj/machinery/door/firedoor/border_only{
+	dir = 8
 	},
-/turf/open/floor/plasteel/tech,
-/area/ship/cargo)
-"nY" = (
-/obj/effect/turf_decal/trimline/transparent/blue/line,
-/obj/structure/table,
-/obj/item/storage/bag/tray/cafeteria{
-	pixel_y = 2
+/obj/machinery/door/firedoor/border_only{
+	dir = 4
 	},
-/obj/item/storage/bag/tray/cafeteria{
-	pixel_y = 4
+/turf/open/floor/plasteel/dark,
+/area/ship/hallway/central)
+"kZ" = (
+/obj/effect/turf_decal/corner/transparent/blue/mono,
+/obj/effect/decal/cleanable/cobweb,
+/obj/structure/closet/secure_closet/clip/minutemen/combat_medic,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/mono/white,
+/area/ship/medical)
+"lb" = (
+/obj/structure/reagent_dispensers/fueltank,
+/turf/open/floor/pod/light,
+/area/ship/cargo)
+"lc" = (
+/obj/machinery/power/smes/shuttle/precharged,
+/obj/structure/cable/yellow{
+	icon_state = "0-8"
 	},
-/obj/item/storage/bag/tray/cafeteria{
-	pixel_y = 6
+/obj/structure/window/reinforced{
+	dir = 8
 	},
-/obj/item/storage/bag/tray/cafeteria{
-	pixel_y = 8
+/obj/effect/turf_decal/industrial/warning/green/full,
+/obj/machinery/door/poddoor/shutters{
+	dir = 4;
+	id = "atlas_engines_south"
 	},
-/obj/item/storage/bag/tray/cafeteria{
-	pixel_y = 10
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering)
+"lh" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/turf_decal/corner/opaque/white/border{
+	dir = 8
 	},
-/obj/item/storage/bag/tray/cafeteria{
-	pixel_y = 12
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/power/apc/auto_name/directional/west,
+/obj/structure/cable,
+/obj/machinery/light_switch{
+	dir = 4;
+	pixel_x = -19;
+	pixel_y = 13
 	},
-/obj/effect/turf_decal/siding/thinplating/dark,
-/turf/open/floor/plasteel/dark,
-/area/ship/crew/canteen)
-"oa" = (
-/obj/structure/table,
-/obj/item/trash/plate{
-	pixel_x = 4;
-	pixel_y = 1
+/turf/open/floor/plasteel,
+/area/ship/crew/office)
+"ln" = (
+/obj/effect/turf_decal/siding/thinplating/dark/corner{
+	dir = 1
 	},
-/obj/item/trash/plate{
-	pixel_x = -2;
-	pixel_y = 4
+/obj/effect/turf_decal/siding/thinplating/dark/corner{
+	dir = 8
 	},
-/turf/open/floor/plasteel/grimy,
-/area/ship/crew/canteen)
-"of" = (
-/obj/machinery/firealarm/directional/north,
-/obj/item/paperplane{
-	pixel_y = 5
+/obj/effect/turf_decal/siding/thinplating/dark/corner{
+	dir = 4
 	},
-/obj/structure/fluff/paper/stack{
-	name = "stack of papers";
-	desc = "Seems like someone needs to work on their aim.";
-	pixel_x = 4;
-	pixel_y = -4;
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
 	},
-/obj/structure/closet/crate/bin{
-	pixel_y = 12;
-	pixel_x = 5
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 8
 	},
-/obj/item/paperplane{
-	pixel_x = 9;
-	pixel_y = 10
+/obj/structure/cable{
+	icon_state = "4-8"
 	},
-/obj/item/paperplane{
-	pixel_x = 2;
-	pixel_y = 10
+/obj/machinery/door/airlock/grunge{
+	dir = 4;
+	name = "Canteen"
 	},
-/obj/effect/turf_decal/siding/thinplating/dark{
-	dir = 5
+/obj/effect/turf_decal/siding/thinplating/corner{
+	dir = 8
 	},
-/turf/open/floor/plasteel/dark,
-/area/ship/crew/crewtwo)
-"ov" = (
-/obj/effect/turf_decal/box/corners{
-	dir = 1;
-	color = "#75A2BB"
+/obj/effect/turf_decal/siding/thinplating/corner{
+	dir = 1
 	},
-/obj/effect/turf_decal/box/corners{
-	dir = 8;
-	color = "#75A2BB"
+/obj/machinery/door/firedoor/border_only{
+	dir = 4
 	},
-/obj/machinery/firealarm/directional/south,
-/turf/open/floor/pod/dark,
-/area/ship/cargo)
-"oJ" = (
-/obj/effect/turf_decal/trimline/transparent/blue/warning{
-	dir = 5;
-	pixel_y = -1
+/obj/machinery/door/firedoor/border_only{
+	dir = 8
 	},
-/obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/plasteel/dark,
 /area/ship/hallway/central)
-"oX" = (
-/obj/machinery/door/airlock/grunge{
-	dir = 4;
-	name = "Captain's Quarters";
-	req_one_access = list(20)
+"lu" = (
+/obj/effect/spawner/bunk_bed{
+	dir = 1
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 4
+/obj/structure/curtain/cloth/grey,
+/obj/structure/sign/poster/clip/random{
+	pixel_y = 32
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 4
+/turf/open/floor/carpet/nanoweave/blue,
+/area/ship/crew/dorm)
+"lB" = (
+/obj/structure/platform/industrial,
+/obj/structure/railing/thin{
+	layer = 3.081
 	},
-/obj/structure/cable{
-	icon_state = "4-8"
+/obj/machinery/power/terminal{
+	dir = 8
 	},
-/obj/machinery/door/firedoor/border_only{
+/obj/structure/cable/yellow{
+	icon_state = "0-4"
+	},
+/obj/structure/rack,
+/obj/item/stack/sheet/mineral/plasma/ten,
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering)
+"lD" = (
+/obj/structure/catwalk/over/plated_catwalk/dark,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
 	dir = 8
 	},
-/obj/machinery/door/firedoor/border_only{
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/plating,
+/area/ship/hallway/central)
+"lE" = (
+/obj/effect/turf_decal/corner/opaque/black/half{
 	dir = 4
 	},
-/obj/effect/turf_decal/siding/thinplating/dark/corner,
-/turf/open/floor/plasteel/dark,
-/area/ship/crew/crewthree)
-"oY" = (
-/obj/structure/toilet{
-	dir = 1;
-	pixel_x = 9;
-	pixel_y = 1
+/obj/effect/turf_decal/trimline/opaque/blue/warning{
+	dir = 4
 	},
-/obj/machinery/light/small/directional/south,
-/obj/structure/catwalk/over/plated_catwalk/dark,
-/obj/machinery/shower{
+/obj/effect/turf_decal/siding/thinplating/dark{
 	dir = 4
 	},
-/turf/open/floor/plasteel/tech/grid,
-/area/ship/security)
-"pi" = (
-/obj/structure/catwalk/over/plated_catwalk/dark,
-/obj/structure/cable{
-	icon_state = "4-8"
+/obj/effect/turf_decal/corner/opaque/blue/border{
+	dir = 8
 	},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
-	dir = 1
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/camera/autoname{
+	dir = 1;
+	network = list("atlas")
 	},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
-/turf/open/floor/plating,
+/obj/machinery/airalarm/directional/west,
+/turf/open/floor/plasteel,
 /area/ship/hallway/central)
-"pn" = (
-/obj/effect/turf_decal/corner_steel_grid{
+"lJ" = (
+/obj/structure/table/chem,
+/obj/effect/turf_decal/corner/transparent/blue{
 	dir = 9
 	},
-/obj/structure/rack,
-/obj/item/storage/lockbox/medal{
-	pixel_x = 3;
-	pixel_y = 6
+/obj/item/storage/box/masks{
+	pixel_x = -8;
+	pixel_y = 4
 	},
-/obj/item/storage/lockbox/medal/sec{
-	pixel_x = -4;
+/obj/item/storage/box/gloves{
+	pixel_x = 8;
+	pixel_y = 4
+	},
+/obj/machinery/power/apc/auto_name/directional/north,
+/obj/structure/cable{
+	icon_state = "0-8"
+	},
+/obj/machinery/light_switch{
+	pixel_y = 22;
+	pixel_x = 12
+	},
+/turf/open/floor/plasteel/white,
+/area/ship/medical)
+"lY" = (
+/obj/structure/table/reinforced,
+/obj/effect/turf_decal/corner/opaque/white/mono,
+/obj/item/radio/intercom/wideband/table{
+	pixel_x = -2;
 	pixel_y = -1
 	},
-/turf/open/floor/plasteel/telecomms_floor,
-/area/ship/bridge)
-"pp" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced/fulltile,
-/obj/machinery/door/poddoor/shutters/preopen{
-	id = "atlas_engi_lockdown"
+/obj/machinery/button/door{
+	pixel_x = 20;
+	pixel_y = 7;
+	id = "atlas_office";
+	name = "window shutters button";
+	dir = 8
 	},
-/turf/open/floor/plating,
-/area/ship/engineering)
-"pq" = (
-/obj/structure/catwalk/over/plated_catwalk/dark,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 4
+/turf/open/floor/plasteel,
+/area/ship/crew/office)
+"mf" = (
+/obj/machinery/shower{
+	dir = 4;
+	pixel_y = 7
 	},
+/obj/structure/catwalk/over/plated_catwalk/white,
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/crew/toilet)
+"mn" = (
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/turf/open/floor/plating,
-/area/ship/hallway/central)
-"ps" = (
-/turf/template_noop,
-/area/template_noop)
-"pE" = (
-/obj/structure/catwalk/over/plated_catwalk/dark,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+/obj/machinery/atmospherics/pipe/manifold/cyan/hidden/layer2{
 	dir = 8
 	},
 /obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/effect/turf_decal/industrial/warning{
-	dir = 8;
-	layer = 2.456
+	icon_state = "4-9"
 	},
+/obj/structure/catwalk/over,
 /turf/open/floor/plating,
-/area/ship/hallway/central)
-"qb" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
-	dir = 1
+/area/ship/engineering)
+"ms" = (
+/obj/docking_port/mobile{
+	dir = 2;
+	launch_status = 0;
+	port_direction = 8;
+	preferred_direction = 4;
+	name = "atlas dock"
 	},
-/obj/effect/turf_decal/corner_steel_grid{
-	dir = 8
+/obj/machinery/porta_turret/ship/clip{
+	id = "atlas_turrets";
+	dir = 9
 	},
-/turf/open/floor/plasteel/telecomms_floor,
-/area/ship/bridge)
-"qc" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced/fulltile,
-/obj/machinery/door/poddoor/shutters/preopen{
-	dir = 8;
-	id = "atlas_bridge"
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/ship/engineering)
+"mw" = (
+/obj/structure/chair/comfy/shuttle{
+	dir = 4
 	},
-/turf/open/floor/plating,
-/area/ship/bridge)
-"qn" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
-/obj/effect/turf_decal/corner_steel_grid{
-	dir = 1
+/obj/structure/catwalk/over/plated_catwalk/dark,
+/obj/machinery/computer/helm/viewscreen/directional/north{
+	pixel_x = 10;
+	pixel_y = 20
 	},
 /turf/open/floor/plasteel/telecomms_floor,
 /area/ship/bridge)
-"qr" = (
-/obj/effect/turf_decal/minutemen/corner{
-	dir = 8
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
+"mx" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 5
 	},
 /turf/open/floor/plasteel/dark,
-/area/ship/bridge)
-"qA" = (
-/obj/effect/turf_decal/corner/transparent/blue/diagonal,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
-	dir = 1
-	},
-/obj/effect/turf_decal/spline/fancy/opaque/white/corner{
-	dir = 1
-	},
-/obj/effect/turf_decal/siding/white{
+/area/ship/security/armory)
+"mA" = (
+/obj/effect/turf_decal/industrial/warning/green/corner{
 	dir = 4
 	},
-/turf/open/floor/plasteel/white,
-/area/ship/medical)
-"qG" = (
-/obj/machinery/power/terminal,
-/obj/machinery/power/terminal{
+/obj/effect/turf_decal/industrial/warning/green,
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
+/obj/machinery/light/small/directional/south,
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering)
+"mC" = (
+/obj/machinery/light/small/directional/north,
+/obj/effect/turf_decal/corner/transparent/lime/half{
 	dir = 1
 	},
-/obj/effect/turf_decal/industrial,
-/obj/structure/sign/warning/nosmoking{
-	pixel_x = 32
+/obj/machinery/bluespace_drive,
+/obj/effect/decal/cleanable/cobweb,
+/obj/effect/turf_decal/industrial/warning/green{
+	dir = 10
 	},
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering)
+"mH" = (
+/obj/machinery/power/smes/shuttle/precharged,
 /obj/structure/cable/yellow{
 	icon_state = "0-8"
 	},
-/turf/open/floor/engine/hull/interior,
-/area/ship/engineering)
-"qP" = (
 /obj/effect/turf_decal/spline/fancy/opaque/black{
-	dir = 8
+	dir = 1
 	},
-/obj/effect/turf_decal/minutemen/edge{
+/obj/structure/window/reinforced{
 	dir = 8
 	},
-/obj/structure/chair/comfy/shuttle{
+/obj/effect/turf_decal/industrial/warning/green/full,
+/obj/machinery/door/poddoor/shutters{
+	dir = 4;
+	id = "atlas_engines_north"
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering)
+"mI" = (
+/obj/effect/turf_decal/siding/thinplating/dark,
+/obj/effect/turf_decal/corner/opaque/black/half,
+/obj/effect/turf_decal/trimline/opaque/blue/warning,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 10
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 10
+	},
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
+/obj/effect/turf_decal/corner/opaque/mauve/bordercorner{
 	dir = 4
 	},
-/obj/effect/landmark/start/captain,
 /turf/open/floor/plasteel/dark,
-/area/ship/bridge)
-"qR" = (
-/obj/structure/chair/office,
-/obj/effect/turf_decal/trimline/transparent/blue/filled/line{
+/area/ship/hallway/central)
+"mJ" = (
+/obj/structure/chair/office{
+	dir = 8
+	},
+/obj/effect/turf_decal/corner/opaque/white/half{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
+/area/ship/crew/office)
+"mK" = (
+/obj/effect/turf_decal/corner/opaque/grey/half,
+/obj/effect/turf_decal/spline/fancy/opaque/grey/corner{
 	dir = 1
 	},
-/obj/effect/landmark/start/warden,
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/security)
-"qS" = (
-/obj/effect/turf_decal/spline/fancy/opaque/black{
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
 	dir = 8
 	},
-/obj/machinery/portable_atmospherics/canister/air,
-/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer2{
-	dir = 8
+/obj/effect/turf_decal/corner/opaque/black/half,
+/obj/effect/turf_decal/siding/thinplating{
+	dir = 6
+	},
+/obj/item/kirbyplants{
+	icon_state = "plant-02";
+	pixel_x = 6
 	},
-/turf/open/floor/engine/hull/interior,
+/turf/open/floor/plasteel/mono,
+/area/ship/crew/canteen)
+"mN" = (
+/obj/structure/sign/clip,
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/ship/engineering)
-"rk" = (
-/obj/structure/catwalk/over/plated_catwalk/dark,
+"mO" = (
+/obj/effect/turf_decal/siding/thinplating/dark/corner,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 4
+	dir = 8
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
@@ -1659,1400 +1874,2352 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/turf/open/floor/plating,
-/area/ship/hallway/central)
-"rr" = (
-/obj/structure/chair{
-	dir = 1
+/obj/machinery/door/airlock/command{
+	dir = 4;
+	name = "Officer Quarters";
+	req_access = list(19)
 	},
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/plasteel/grimy,
-/area/ship/crew/canteen)
-"ry" = (
-/obj/machinery/airalarm/directional/south,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 9
+/obj/machinery/door/firedoor/border_only{
+	dir = 4
 	},
-/obj/effect/turf_decal/siding/thinplating/dark/corner{
+/obj/machinery/door/firedoor/border_only{
 	dir = 8
 	},
-/turf/open/floor/plasteel/dark,
-/area/ship/crew/crewthree)
-"rz" = (
-/obj/structure/table/wood,
-/obj/item/paper_bin{
-	pixel_y = 5
+/turf/open/floor/plasteel,
+/area/ship/crew/dorm/commad)
+"mS" = (
+/obj/effect/turf_decal/corner/transparent/blue{
+	dir = 9
 	},
-/obj/item/pen{
-	pixel_y = 5
+/obj/effect/turf_decal/corner/transparent/blue,
+/obj/effect/turf_decal/siding/white{
+	dir = 8
+	},
+/obj/effect/turf_decal/spline/fancy/opaque/white/corner,
+/turf/open/floor/plasteel/white,
+/area/ship/medical)
+"nj" = (
+/obj/effect/turf_decal/corner/opaque/beige/border{
+	dir = 4
+	},
+/obj/effect/turf_decal/corner/opaque/white/bordercorner{
+	dir = 4
+	},
+/obj/effect/turf_decal/corner/opaque/white/bordercorner,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 6
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 6
 	},
-/turf/open/floor/wood,
-/area/ship/crew/crewthree)
-"rO" = (
-/obj/machinery/power/apc/auto_name/directional/north,
 /obj/structure/cable{
-	icon_state = "0-2"
+	icon_state = "2-4"
 	},
-/obj/structure/closet/cabinet{
-	name = "formal uniform cabinet"
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/hallway/central)
+"nl" = (
+/obj/effect/turf_decal/industrial/warning/green{
+	dir = 8
 	},
-/obj/item/clothing/under/clip/formal/with_shirt{
-	pixel_x = 8;
-	pixel_y = 10
+/obj/machinery/door/firedoor/heavy,
+/obj/machinery/door/airlock/external{
+	dir = 4
 	},
-/obj/item/clothing/under/clip/formal/with_shirt{
-	pixel_y = 10
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
 	},
-/obj/item/clothing/under/clip/formal/with_shirt{
-	pixel_x = -5;
-	pixel_y = 10
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering)
+"nm" = (
+/obj/structure/table/chem,
+/obj/effect/turf_decal/corner/transparent/blue{
+	dir = 6
 	},
-/obj/item/clothing/under/clip/formal/with_shirt{
-	pixel_x = -10;
-	pixel_y = 9
+/obj/item/clipboard{
+	pixel_x = -1;
+	pixel_y = 4
 	},
-/obj/item/clothing/under/clip/formal/with_shirt/alt{
-	pixel_x = 8;
-	pixel_y = -3
+/obj/item/desk_flag{
+	pixel_x = 9;
+	pixel_y = 4
 	},
-/obj/item/clothing/under/clip/formal/with_shirt/alt{
-	pixel_x = 2;
-	pixel_y = -4
+/obj/item/paper_bin{
+	pixel_x = -16;
+	pixel_y = 5
 	},
-/obj/item/clothing/under/clip/formal/with_shirt/alt{
-	pixel_x = -3;
-	pixel_y = -3
+/obj/item/pen{
+	pixel_x = -18;
+	pixel_y = 5
 	},
-/obj/item/clothing/under/clip/formal/with_shirt/alt{
-	pixel_x = -10;
-	pixel_y = -4
+/obj/item/pen/blue{
+	pixel_x = -15;
+	pixel_y = 9
 	},
-/obj/item/clothing/shoes/laceup{
-	pixel_x = 6;
-	pixel_y = -14
+/turf/open/floor/plasteel/white,
+/area/ship/medical)
+"nu" = (
+/obj/effect/turf_decal/minutemen/edge,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 8
 	},
-/obj/item/clothing/shoes/laceup{
-	pixel_x = 6;
-	pixel_y = -14
+/obj/structure/catwalk/over,
+/turf/open/floor/plating,
+/area/ship/engineering)
+"nv" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 8
 	},
-/obj/item/clothing/shoes/laceup{
-	pixel_x = 6;
-	pixel_y = -14
+/obj/structure/cable{
+	icon_state = "4-8"
 	},
-/obj/item/clothing/shoes/laceup{
-	pixel_x = 6;
-	pixel_y = -14
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
 	},
-/obj/item/clothing/shoes/laceup{
-	pixel_x = 6;
-	pixel_y = -14
+/obj/machinery/door/firedoor/border_only{
+	dir = 4
 	},
-/obj/item/clothing/shoes/laceup{
-	pixel_x = 6;
-	pixel_y = -14
+/obj/machinery/door/firedoor/border_only{
+	dir = 8
 	},
-/obj/item/clothing/shoes/laceup{
-	pixel_x = 6;
-	pixel_y = -14
+/obj/machinery/door/airlock/grunge{
+	dir = 4;
+	name = "Engineering"
 	},
-/obj/item/clothing/shoes/laceup{
-	pixel_x = 6;
-	pixel_y = -14
+/obj/effect/turf_decal/industrial/warning/green{
+	dir = 4
 	},
-/obj/effect/turf_decal/siding/thinplating/dark/end{
-	dir = 1
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering)
+"nI" = (
+/obj/machinery/button/door{
+	pixel_x = -20;
+	pixel_y = 5;
+	id = "atlas_engi_north";
+	name = "window shutters button";
+	dir = 4
 	},
-/turf/open/floor/plasteel/dark,
-/area/ship/crew/crewtwo)
-"rR" = (
-/obj/effect/turf_decal/techfloor{
+/obj/machinery/button/door{
+	pixel_x = -20;
+	pixel_y = -7;
+	id = "atlas_engines_north";
+	name = "engine shutters button";
 	dir = 4
 	},
-/obj/machinery/light_switch{
-	pixel_y = 23
+/obj/effect/turf_decal/steeldecal/steel_decals_central6,
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering)
+"nO" = (
+/obj/machinery/shower{
+	dir = 4;
+	pixel_y = 8
 	},
-/obj/structure/closet/firecloset,
-/turf/open/floor/plasteel/dark,
-/area/ship/hallway/central)
-"sh" = (
-/obj/structure/railing{
-	dir = 8
+/obj/structure/catwalk/over/plated_catwalk/white,
+/obj/machinery/light/small/directional/south,
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/crew/toilet)
+"nP" = (
+/obj/item/cigbutt{
+	anchored = 1;
+	color = "#808080";
+	layer = 2;
+	pixel_x = -4;
+	pixel_y = 8
 	},
-/obj/structure/railing{
+/obj/effect/decal/fakelattice,
+/obj/structure/railing,
+/turf/open/floor/plasteel/elevatorshaft,
+/area/ship/hallway/central)
+"nQ" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /obj/structure/cable{
-	icon_state = "1-2"
+	icon_state = "4-8"
 	},
-/obj/machinery/light_switch{
-	dir = 8;
-	pixel_x = 20
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 8
 	},
-/turf/open/floor/plasteel/stairs/modern/dark{
-	dir = 1
+/obj/effect/turf_decal/corner/opaque/black/half,
+/obj/effect/turf_decal/corner/opaque/black/half{
+	dir = 8
 	},
-/area/ship/engineering)
-"si" = (
-/obj/effect/turf_decal/siding/thinplating/dark,
-/turf/open/floor/plasteel/dark,
-/area/ship/hallway/central)
-"sl" = (
-/obj/effect/turf_decal/spline/fancy/opaque/black{
+/obj/effect/turf_decal/industrial/warning/green{
 	dir = 8
 	},
-/obj/machinery/light_switch{
-	pixel_y = -20;
-	dir = 1
+/obj/structure/railing/corner{
+	dir = 8
 	},
-/obj/structure/closet/secure_closet{
-	icon_state = "hop";
-	name = "sergeant's locker";
-	req_access_txt = "3"
+/obj/effect/turf_decal/corner/opaque/blue/border,
+/obj/effect/turf_decal/siding/thinplating{
+	dir = 8
 	},
-/obj/item/storage/guncase/doublebarrel{
-	pixel_x = 1;
-	pixel_y = 4
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/canteen)
+"nU" = (
+/obj/structure/urinal{
+	dir = 4;
+	pixel_x = -13
 	},
-/obj/item/clothing/shoes/combat{
-	pixel_y = -8
+/obj/effect/turf_decal/corner/opaque/white/half{
+	dir = 1
 	},
-/obj/item/clothing/under/clip/minutemen{
-	pixel_x = -5
+/obj/effect/turf_decal/corner/opaque/white/half,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/decal/cleanable/cobweb,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+	dir = 4
 	},
-/obj/item/clothing/suit/armor/vest/alt{
-	pixel_x = 7
+/obj/machinery/light/small/directional/north,
+/turf/open/floor/plasteel/white,
+/area/ship/crew/toilet)
+"nY" = (
+/obj/structure/platform/ship_three{
+	dir = 5
 	},
-/obj/effect/turf_decal/box{
-	color = "#75A2BB"
+/obj/effect/turf_decal/techfloor{
+	dir = 5
 	},
-/obj/item/storage/backpack/security/clip{
-	pixel_x = 13;
-	pixel_y = -13
+/obj/effect/turf_decal/minutemen/corner{
+	dir = 8
 	},
-/obj/item/storage/box/ammo/a12g_buckshot{
-	pixel_x = -7;
-	pixel_y = -12
+/obj/effect/turf_decal/spline/fancy/opaque/black/corner{
+	dir = 8
 	},
-/obj/item/clothing/head/soft/utility_navy{
-	pixel_y = 13
+/obj/machinery/light/floor,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/bridge)
+"oc" = (
+/obj/effect/turf_decal/siding/thinplating/dark,
+/obj/effect/turf_decal/corner/opaque/black/half,
+/obj/effect/turf_decal/trimline/opaque/blue/warning,
+/obj/machinery/light/directional/north,
+/obj/effect/turf_decal/corner/opaque/mauve/border{
+	dir = 1
+	},
+/obj/machinery/camera/autoname{
+	network = list("atlas")
 	},
 /turf/open/floor/plasteel/dark,
-/area/ship/security)
-"sz" = (
-/turf/open/floor/plasteel/tech/grid,
-/area/ship/security)
-"sA" = (
-/obj/effect/turf_decal/trimline/transparent/blue/filled/corner,
-/obj/structure/window/reinforced,
-/obj/machinery/suit_storage_unit/minutemen,
-/obj/effect/turf_decal/siding/thinplating/dark{
+/area/ship/hallway/central)
+"oq" = (
+/obj/effect/turf_decal/corner/opaque/beige/border,
+/obj/effect/turf_decal/corner/opaque/white/bordercorner{
 	dir = 4
 	},
-/obj/effect/turf_decal/box{
-	color = "#75A2BB"
-	},
-/obj/machinery/door/firedoor/border_only,
-/turf/open/floor/pod/dark,
-/area/ship/crew/canteen)
-"sB" = (
-/obj/effect/turf_decal/trimline/transparent/blue/warning,
-/obj/effect/turf_decal/siding/thinplating/dark{
+/obj/effect/turf_decal/corner/opaque/beige/bordercorner{
 	dir = 1
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 10
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 10
-	},
-/obj/structure/cable{
-	icon_state = "2-8"
+	dir = 9
 	},
 /turf/open/floor/plasteel/dark,
-/area/ship/hallway/central)
-"sD" = (
-/obj/machinery/door/airlock/external{
-	dir = 4
+/area/ship/crew/dorm/commad)
+"oJ" = (
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 5
 	},
-/obj/effect/turf_decal/industrial/warning{
+/obj/effect/turf_decal/corner/opaque/black/half{
 	dir = 1
 	},
-/obj/effect/turf_decal/industrial/warning,
-/obj/machinery/atmospherics/pipe/layer_manifold/visible{
+/obj/effect/turf_decal/corner/opaque/black/half{
 	dir = 4
 	},
-/turf/open/floor/plasteel/dark,
-/area/ship/engineering)
-"sF" = (
-/obj/machinery/power/apc/auto_name/directional/south,
-/obj/structure/cable,
-/obj/effect/turf_decal/siding/thinplating/dark/end,
-/obj/machinery/blackbox_recorder,
-/obj/machinery/door/window/brigdoor/northleft,
-/turf/open/floor/plasteel/dark,
-/area/ship/crew/crewthree)
-"sI" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 4
+/obj/effect/turf_decal/trimline/opaque/blue/warning{
+	dir = 5
+	},
+/obj/effect/turf_decal/corner/opaque/blue/bordercorner{
+	dir = 8
 	},
+/turf/open/floor/plasteel,
+/area/ship/hallway/central)
+"oX" = (
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering)
+"pi" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
 	dir = 4
 	},
-/obj/effect/turf_decal/siding/thinplating/dark/corner{
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering)
+"pj" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/effect/turf_decal/corner/opaque/white/border{
 	dir = 4
 	},
-/obj/effect/turf_decal/siding/thinplating/dark/corner,
+/obj/effect/turf_decal/industrial/warning/green{
+	dir = 1
+	},
+/obj/machinery/light/directional/east,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/hallway/central)
+"pp" = (
+/obj/structure/grille,
+/obj/structure/window/reinforced/fulltile,
+/obj/machinery/door/poddoor/shutters{
+	id = "atlas_engi_south"
+	},
+/turf/open/floor/plating,
+/area/ship/engineering)
+"pq" = (
+/obj/structure/table/reinforced,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/item/folder/blue{
+	pixel_x = -6;
+	pixel_y = 3
+	},
+/obj/item/folder{
+	pixel_x = 5
+	},
+/obj/structure/cable,
+/turf/open/floor/plasteel,
+/area/ship/bridge)
+"ps" = (
+/turf/template_noop,
+/area/template_noop)
+"pv" = (
+/obj/machinery/power/terminal{
+	dir = 8
+	},
+/obj/structure/cable{
+	icon_state = "0-4"
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering)
+"pE" = (
+/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer2,
+/obj/machinery/portable_atmospherics/canister/air,
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering)
+"pL" = (
+/obj/machinery/fax/clip,
+/obj/structure/table/reinforced,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/light/directional/north,
+/turf/open/floor/plasteel,
+/area/ship/bridge)
+"pM" = (
+/obj/structure/reagent_dispensers/water_cooler{
+	pixel_x = 11;
+	pixel_y = 1;
+	density = 0
+	},
+/obj/structure/closet/crate/bin{
+	pixel_x = -7
+	},
+/obj/machinery/light/directional/west,
+/turf/open/floor/plasteel,
+/area/ship/bridge)
+"pQ" = (
+/obj/machinery/modular_computer/console/preset/civilian{
+	dir = 1
+	},
+/obj/effect/turf_decal/corner/opaque/white/mono,
+/turf/open/floor/plasteel,
+/area/ship/crew/office)
+"pS" = (
+/obj/machinery/light/directional/west,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+	dir = 4
+	},
+/obj/structure/tank_dispenser,
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering)
+"pU" = (
+/obj/structure/chair/office,
+/obj/effect/turf_decal/trimline/transparent/blue/filled/line,
+/turf/open/floor/plasteel/dark,
+/area/ship/security/armory)
+"pZ" = (
+/obj/structure/table,
+/obj/item/reagent_containers/spray/pepper{
+	pixel_x = -3;
+	pixel_y = 7
+	},
+/obj/item/reagent_containers/spray/pepper{
+	pixel_x = -6;
+	pixel_y = 5
+	},
+/obj/item/reagent_containers/spray/pepper{
+	pixel_y = 5
+	},
+/obj/item/reagent_containers/spray/pepper{
+	pixel_x = -3;
+	pixel_y = 3
+	},
+/obj/structure/closet/wall/directional/north,
+/obj/item/storage/box/smokebombs{
+	pixel_x = 7;
+	pixel_y = 14
+	},
+/obj/item/storage/box/zipties{
+	pixel_x = 7;
+	pixel_y = 2
+	},
+/obj/effect/turf_decal/techfloor{
+	dir = 1
+	},
+/obj/effect/turf_decal/spline/plain/opaque/blue{
+	dir = 1
+	},
+/obj/item/melee/knife/survival{
+	pixel_x = -7;
+	pixel_y = -1
+	},
+/obj/item/melee/knife/survival{
+	pixel_x = -3
+	},
+/obj/item/melee/knife/survival{
+	pixel_x = 2
+	},
+/obj/item/melee/knife/survival{
+	pixel_x = 4;
+	pixel_y = -2
+	},
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/security/armory)
+"qc" = (
+/obj/effect/turf_decal/corner/opaque/blue/border{
+	dir = 1
+	},
+/obj/effect/turf_decal/corner/opaque/white/bordercorner{
+	dir = 8
+	},
+/obj/effect/turf_decal/corner/opaque/blue/bordercorner,
+/obj/machinery/light/directional/west,
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/dorm)
+"qh" = (
+/obj/effect/turf_decal/corner/opaque/grey/half,
+/obj/effect/turf_decal/spline/fancy/opaque/grey{
+	dir = 1
+	},
+/obj/effect/turf_decal/corner/opaque/black/half,
+/obj/effect/turf_decal/siding/thinplating,
+/obj/structure/sign/departments/restroom{
+	pixel_y = -28
+	},
+/turf/open/floor/plasteel/mono,
+/area/ship/crew/canteen)
+"qr" = (
+/obj/effect/turf_decal/minutemen/corner,
+/obj/effect/turf_decal/spline/fancy/opaque/black{
+	dir = 8
+	},
+/obj/effect/turf_decal/spline/fancy/opaque/black/corner,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"qt" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/power/apc/auto_name/directional/west,
+/obj/structure/cable{
+	icon_state = "0-2"
+	},
+/obj/machinery/light_switch{
+	dir = 4;
+	pixel_x = -19;
+	pixel_y = 13
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/chair/sofa/blue/right/directional/east,
+/turf/open/floor/plasteel,
+/area/ship/crew/dorm/commad)
+"qy" = (
+/obj/effect/turf_decal/industrial/warning/green,
+/obj/structure/cable{
+	icon_state = "2-5"
+	},
+/obj/machinery/button/door{
+	pixel_x = -20;
+	id = "atlas_armory";
+	name = "entry shutters button";
+	dir = 4;
+	pixel_y = -7;
+	req_one_access = list(19, 3)
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/turf/open/floor/plasteel/dark,
+/area/ship/security/armory)
+"qA" = (
+/obj/effect/turf_decal/corner/transparent/blue/three_quarters{
+	dir = 8
+	},
+/obj/effect/turf_decal/spline/fancy/opaque/white/corner{
+	dir = 8
+	},
+/obj/effect/turf_decal/siding/white{
+	dir = 4
+	},
+/turf/open/floor/plasteel/white,
+/area/ship/medical)
+"qC" = (
+/obj/item/toy/plush/moth/atlas{
+	pixel_y = 17
+	},
+/obj/item/food/energybar{
+	pixel_x = 3
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/toilet)
+"qM" = (
+/obj/structure/catwalk/over/plated_catwalk/dark,
+/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4,
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/structure/cable{
+	icon_state = "1-8"
+	},
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
+/turf/open/floor/plating,
+/area/ship/hallway/central)
+"qP" = (
+/obj/effect/turf_decal/minutemen/edge{
+	dir = 4
+	},
+/obj/effect/turf_decal/spline/fancy/opaque/black{
+	dir = 8
+	},
+/obj/effect/turf_decal/spline/fancy/opaque/black{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 9
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 10
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"rb" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/camera/autoname{
+	dir = 1;
+	network = list("atlas")
+	},
+/obj/structure/chair/office{
+	dir = 1
+	},
+/turf/open/floor/pod/light,
+/area/ship/cargo)
+"rk" = (
+/obj/effect/turf_decal/spline/fancy/opaque/black,
+/obj/effect/turf_decal/stairs{
+	dir = 9;
+	color = "#535456"
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"rn" = (
+/obj/effect/turf_decal/corner/opaque/black/half{
+	dir = 8
+	},
+/obj/effect/turf_decal/industrial/warning/green{
+	dir = 8
+	},
+/obj/effect/turf_decal/siding/thinplating{
+	dir = 8
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/canteen)
+"ro" = (
+/obj/effect/turf_decal/trimline/transparent/blue/filled/line{
+	dir = 9
+	},
+/obj/structure/rack,
+/obj/item/clothing/glasses/sunglasses/ballistic{
+	pixel_x = 1;
+	pixel_y = 7
+	},
+/obj/item/clothing/glasses/sunglasses/ballistic{
+	pixel_x = -3;
+	pixel_y = 4
+	},
+/obj/item/clothing/glasses/sunglasses/ballistic{
+	pixel_x = -1;
+	pixel_y = 1
+	},
+/obj/item/clothing/glasses/sunglasses/ballistic{
+	pixel_x = -3;
+	pixel_y = -3
+	},
+/obj/effect/turf_decal/siding/thinplating/corner{
+	dir = 4
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/security/armory)
+"ry" = (
+/turf/open/floor/plasteel,
+/area/ship/crew/dorm/commad)
+"rP" = (
+/obj/effect/turf_decal/corner/opaque/black/half,
+/obj/structure/closet/crate/bin,
+/obj/effect/turf_decal/corner/opaque/black/half{
+	dir = 4
+	},
+/obj/effect/turf_decal/corner/opaque/blue/border,
+/obj/machinery/light/directional/south,
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/canteen)
+"rR" = (
+/obj/effect/turf_decal/corner/opaque/blue/half{
+	dir = 8
+	},
+/obj/effect/turf_decal/corner/opaque/blue/half,
+/obj/structure/chair{
+	dir = 4
+	},
+/turf/open/floor/plasteel/white,
+/area/ship/crew/canteen)
+"sb" = (
+/obj/effect/turf_decal/industrial/warning/green{
+	dir = 8
+	},
+/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/layer2{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/effect/turf_decal/industrial/warning/green/corner{
+	dir = 4
+	},
+/obj/machinery/advanced_airlock_controller/directional/west,
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering)
+"sf" = (
+/obj/machinery/door/window/westleft{
+	opacity = 1
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/curtain/cloth/grey{
+	dir = 4
+	},
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/crew/office)
+"sh" = (
+/obj/effect/turf_decal/industrial/warning/green{
+	dir = 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 = "4-8"
+	},
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/hallway/central)
+"si" = (
+/obj/effect/turf_decal/corner/opaque/white,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+	dir = 1
+	},
+/turf/open/floor/plasteel,
+/area/ship/crew/office)
+"sn" = (
+/obj/machinery/atmospherics/pipe/layer_manifold,
+/obj/machinery/suit_storage_unit/industrial{
+	suit_type = /obj/item/clothing/suit/space/eva;
+	helmet_type = /obj/item/clothing/head/helmet/space/eva;
+	mask_type = /obj/item/clothing/mask/breath
+	},
+/obj/effect/turf_decal/industrial/warning/green/fulltile,
+/obj/machinery/light/small/directional/east,
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/engineering)
+"sz" = (
+/obj/structure/platform/ship_four/corner{
+	dir = 4
+	},
+/turf/open/floor/engine/hull/reinforced,
+/area/ship/external/dark)
+"sB" = (
+/obj/effect/turf_decal/corner_steel_grid{
+	dir = 8
+	},
+/obj/effect/turf_decal/box/white/corners{
+	dir = 8;
+	color = "#CBB1CA"
+	},
+/turf/open/floor/pod/light,
+/area/ship/cargo)
+"sD" = (
+/obj/effect/turf_decal/industrial/warning/green{
+	dir = 1
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/open/floor/pod/light,
+/area/ship/cargo)
+"sF" = (
+/obj/effect/turf_decal/techfloor{
+	dir = 1
+	},
+/obj/effect/turf_decal/spline/plain/opaque/grey{
+	dir = 1
+	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/effect/turf_decal/trimline/opaque/beige/filled/line,
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"sK" = (
+/obj/machinery/atmospherics/pipe/simple/general/hidden/layer4{
+	dir = 5
+	},
+/obj/structure/catwalk/over,
+/turf/open/floor/plating,
+/area/ship/engineering)
+"sL" = (
+/obj/structure/railing/thin,
+/obj/effect/decal/fakelattice{
+	icon_state = "lattice-3"
+	},
+/turf/open/floor/plasteel/elevatorshaft,
+/area/ship/bridge)
+"sM" = (
+/obj/effect/turf_decal/corner/transparent/blue/three_quarters{
+	dir = 8
+	},
+/obj/effect/turf_decal/siding/white{
+	dir = 4
+	},
+/obj/effect/turf_decal/spline/fancy/opaque/white/corner{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 9
+	},
+/turf/open/floor/plasteel/white,
+/area/ship/medical)
+"tc" = (
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/ship/crew/dorm/commad)
+"td" = (
+/obj/structure/table/reinforced,
+/obj/structure/closet/secure_closet/wall/directional/west{
+	req_access = list(3);
+	name = "ammunition storage"
+	},
+/obj/item/ammo_box/magazine/cm5_9mm{
+	pixel_x = -8
+	},
+/obj/item/ammo_box/magazine/cm5_9mm{
+	pixel_x = -9;
+	pixel_y = -3
+	},
+/obj/item/ammo_box/magazine/cm5_9mm{
+	pixel_x = -10;
+	pixel_y = -6
+	},
+/obj/item/ammo_box/magazine/cm5_9mm{
+	pixel_x = -7;
+	pixel_y = -9
+	},
+/obj/item/ammo_box/magazine/cm5_9mm{
+	pixel_x = -6;
+	pixel_y = -12
+	},
+/obj/item/ammo_box/magazine/cm5_9mm{
+	pixel_x = -3;
+	pixel_y = -15
+	},
+/obj/item/ammo_box/magazine/skm_762_40{
+	pixel_x = 12;
+	pixel_y = 10
+	},
+/obj/item/ammo_box/magazine/skm_762_40{
+	pixel_x = 9;
+	pixel_y = 10
+	},
+/obj/item/ammo_box/magazine/skm_762_40{
+	pixel_x = 6;
+	pixel_y = 10
+	},
+/obj/item/ammo_box/magazine/cm23{
+	pixel_x = 16;
+	pixel_y = -14
+	},
+/obj/item/ammo_box/magazine/cm23{
+	pixel_x = 12;
+	pixel_y = -12
+	},
+/obj/item/ammo_box/magazine/cm23{
+	pixel_x = 9;
+	pixel_y = -15
+	},
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/security/armory)
+"tg" = (
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+	dir = 8
+	},
+/obj/structure/cable{
+	icon_state = "2-4"
+	},
+/obj/structure/cable{
+	icon_state = "1-4"
+	},
+/obj/machinery/airalarm/directional/west,
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/hallway/central)
+"tj" = (
+/obj/effect/decal/fakelattice{
+	icon_state = "lattice-6"
+	},
+/obj/structure/lattice/catwalk,
+/obj/machinery/camera/autoname{
+	dir = 9;
+	network = list("atlas")
+	},
+/turf/open/floor/plating,
+/area/ship/external/dark)
+"tq" = (
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 1
+	},
+/obj/effect/turf_decal/corner/opaque/black/half{
+	dir = 1
+	},
+/obj/effect/turf_decal/trimline/opaque/blue/warning{
+	dir = 1
+	},
+/obj/effect/turf_decal/corner/opaque/white/border,
+/obj/effect/turf_decal/corner/transparent/blue/border,
+/obj/effect/turf_decal/industrial/warning/green{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /turf/open/floor/plasteel/dark,
-/area/ship/security)
-"sL" = (
+/area/ship/hallway/central)
+"ts" = (
+/obj/machinery/light/directional/west,
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering)
+"tB" = (
+/obj/machinery/light/directional/east,
+/obj/effect/turf_decal/corner/opaque/black/half{
+	dir = 4
+	},
+/obj/effect/turf_decal/corner/opaque/black/half{
+	dir = 4
+	},
+/obj/effect/turf_decal/corner/opaque/black/half,
+/obj/machinery/vending/snack/teal,
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/canteen)
+"tE" = (
+/obj/structure/grille,
+/obj/structure/window/reinforced/fulltile,
+/obj/machinery/door/poddoor/shutters{
+	id = "atlas_dorms"
+	},
+/turf/open/floor/plating,
+/area/ship/crew/dorm)
+"tF" = (
+/obj/effect/turf_decal/industrial/warning/green{
+	dir = 4
+	},
+/obj/structure/railing{
+	dir = 1
+	},
 /turf/open/floor/plasteel/dark,
 /area/ship/crew/canteen)
-"sP" = (
-/obj/machinery/computer/cryopod/directional/west,
+"tJ" = (
+/obj/effect/turf_decal/corner/opaque/blue/border{
+	dir = 1
+	},
+/obj/effect/turf_decal/corner/opaque/blue/bordercorner,
+/obj/effect/turf_decal/corner/opaque/white/bordercorner{
+	dir = 8
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/dorm)
+"tV" = (
+/obj/machinery/power/shuttle/engine/fire,
+/turf/open/floor/plating,
+/area/ship/external/dark)
+"tW" = (
+/obj/structure/platform/industrial{
+	dir = 1;
+	layer = 2.89
+	},
+/obj/effect/turf_decal/corner/transparent/lime/half{
+	dir = 1
+	},
+/obj/effect/turf_decal/floordetail/pryhole,
+/obj/machinery/power/terminal{
+	dir = 8
+	},
+/obj/structure/cable/yellow{
+	icon_state = "0-4"
+	},
+/obj/structure/rack,
+/obj/item/stack/sheet/mineral/plasma/ten,
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering)
+"tX" = (
+/obj/structure/catwalk/over/plated_catwalk/dark,
+/obj/machinery/modular_computer/console/preset/command{
+	dir = 8;
+	icon_state = "computer-left";
+	pixel_x = 7;
+	pixel_y = -1
+	},
+/turf/open/floor/plasteel/telecomms_floor,
+/area/ship/bridge)
+"uo" = (
+/obj/structure/cable{
+	icon_state = "1-4"
+	},
+/obj/machinery/atmospherics/components/trinary/mixer{
+	dir = 4;
+	name = "fuel mixer";
+	node1_concentration = 0.33;
+	node2_concentration = 0.67;
+	target_pressure = 500;
+	piping_layer = 4
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering)
+"ux" = (
+/obj/effect/turf_decal/corner_steel_grid,
+/obj/effect/turf_decal/box/white/corners{
+	color = "#CBB1CA"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 10
+	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/pod/light,
+/area/ship/cargo)
+"uC" = (
+/obj/effect/turf_decal/corner/transparent/lime/half{
+	dir = 8
+	},
+/obj/structure/platform/industrial{
+	dir = 9
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering)
+"uG" = (
+/obj/structure/chair/comfy/shuttle{
+	dir = 4;
+	name = "Helm"
+	},
+/obj/structure/catwalk/over/plated_catwalk/dark,
+/obj/structure/railing/thin{
+	dir = 10
+	},
+/turf/open/floor/plasteel/telecomms_floor,
+/area/ship/bridge)
+"uH" = (
+/obj/effect/turf_decal/corner/opaque/beige/border{
+	dir = 1
+	},
+/obj/effect/turf_decal/corner/opaque/white/bordercorner{
+	dir = 8
+	},
+/obj/effect/turf_decal/corner/opaque/beige/bordercorner,
+/obj/structure/closet/secure_closet/clip/minutemen/bridge_officer{
+	pixel_x = 8
+	},
+/obj/item/storage/guncase/pistol/cm23,
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/dorm/commad)
+"uO" = (
+/obj/effect/turf_decal/industrial/warning/green{
+	dir = 10
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 5
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 5
+	},
+/obj/machinery/light/small/directional/west,
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering)
+"uQ" = (
+/obj/effect/turf_decal/techfloor{
+	dir = 1
+	},
+/obj/structure/cable{
+	icon_state = "1-10"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 9
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 9
+	},
+/obj/effect/turf_decal/trimline/transparent/blue/filled/corner{
+	dir = 4
+	},
+/obj/effect/turf_decal/trimline/transparent/blue/filled/corner{
+	dir = 1
+	},
+/obj/effect/turf_decal/siding/thinplating/corner{
+	dir = 1
+	},
+/obj/effect/turf_decal/siding/thinplating/corner{
+	dir = 4
+	},
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/security/armory)
+"uX" = (
+/obj/effect/turf_decal/techfloor{
+	dir = 8
+	},
+/obj/effect/turf_decal/spline/plain/opaque/green{
+	dir = 8
+	},
+/obj/structure/table,
+/obj/item/flashlight/seclite{
+	pixel_x = 5;
+	pixel_y = -2
+	},
+/obj/item/flashlight/seclite{
+	pixel_x = 3;
+	pixel_y = -8
+	},
+/obj/item/flashlight/seclite{
+	pixel_y = 2;
+	pixel_x = 3
+	},
+/obj/item/flashlight/seclite{
+	pixel_x = 2;
+	pixel_y = -4
+	},
+/obj/structure/closet/wall/directional/west,
+/obj/item/radio{
+	pixel_x = 7;
+	pixel_y = 14
+	},
+/obj/item/radio{
+	pixel_x = 2;
+	pixel_y = 11
+	},
+/obj/item/radio{
+	pixel_x = -9;
+	pixel_y = 11
+	},
+/obj/item/radio{
+	pixel_x = -5;
+	pixel_y = 8
+	},
+/turf/open/floor/plasteel/patterned/grid/dark,
+/area/ship/crew/cryo)
+"uY" = (
+/obj/machinery/door/firedoor,
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/hallway/central)
+"vo" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/modular_computer/console/preset/command{
+	dir = 1;
+	icon_state = "computer-middle"
+	},
+/turf/open/floor/plasteel,
+/area/ship/crew/dorm/commad)
+"vp" = (
+/obj/effect/turf_decal/corner_steel_grid{
+	dir = 1
+	},
+/obj/effect/turf_decal/box/white/corners{
+	dir = 1;
+	color = "#CBB1CA"
+	},
+/obj/structure/crate_shelf,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/pod/light,
+/area/ship/cargo)
+"vy" = (
+/obj/machinery/atmospherics/components/trinary/mixer/airmix/flipped/inverse{
+	piping_layer = 2
+	},
+/obj/machinery/atmospherics/pipe/simple/general/hidden/layer4{
+	dir = 6
+	},
 /turf/open/floor/plasteel/tech,
-/area/ship/crew)
-"tc" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced/fulltile,
-/obj/machinery/door/poddoor/shutters/preopen{
-	dir = 8;
-	id = "atlas_cap"
+/area/ship/engineering)
+"vA" = (
+/obj/structure/platform/ship_three{
+	dir = 1
 	},
-/turf/open/floor/plating,
-/area/ship/crew/crewthree)
-"tq" = (
-/obj/structure/cable{
-	icon_state = "1-2"
+/obj/structure/railing/thin{
+	dir = 1
 	},
-/obj/structure/railing{
+/obj/effect/turf_decal/techfloor{
 	dir = 1
 	},
-/obj/structure/railing,
+/obj/effect/turf_decal/trimline/opaque/beige/filled/line,
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
-"tA" = (
-/obj/effect/decal/cleanable/dirt/dust,
+"vB" = (
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+	dir = 6
+	},
+/obj/effect/turf_decal/corner/transparent/lime/full,
+/obj/structure/table/reinforced,
+/obj/item/flashlight/lamp{
+	pixel_x = 4;
+	pixel_y = 5
+	},
+/obj/item/paper_bin{
+	pixel_y = 5;
+	pixel_x = -11
+	},
+/obj/item/pen{
+	pixel_x = -11;
+	pixel_y = 5
+	},
 /turf/open/floor/plasteel/tech,
-/area/ship/cargo)
-"tF" = (
-/obj/structure/catwalk/over/plated_catwalk/dark,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 4
+/area/ship/engineering)
+"vC" = (
+/obj/effect/turf_decal/corner/transparent/blue/mono,
+/obj/structure/curtain,
+/turf/open/floor/plasteel/mono/white,
+/area/ship/medical)
+"vH" = (
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/ship/crew/cryo)
+"vN" = (
+/obj/effect/turf_decal/corner/transparent/blue/mono,
+/obj/structure/table/optable,
+/obj/structure/sink{
+	pixel_x = -9;
+	pixel_y = 22
+	},
+/obj/machinery/light/small/directional/east,
+/turf/open/floor/plasteel/mono/white,
+/area/ship/medical)
+"vS" = (
+/obj/machinery/porta_turret/ship/clip{
+	id = "atlas_turrets";
+	dir = 10
 	},
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/ship/engineering)
+"vT" = (
+/obj/effect/turf_decal/corner/opaque/white/bordercorner,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
 	},
-/obj/structure/cable{
-	icon_state = "4-8"
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 8
 	},
 /obj/structure/cable{
-	icon_state = "2-8"
-	},
-/turf/open/floor/plating,
-/area/ship/hallway/central)
-"tP" = (
-/obj/structure/table,
-/obj/item/stamp{
-	pixel_x = 9;
-	pixel_y = 13
+	icon_state = "4-8"
 	},
-/obj/item/clipboard,
-/obj/item/stamp/denied{
-	pixel_x = 10;
-	pixel_y = 4
+/obj/machinery/door/airlock/grunge{
+	dir = 4;
+	name = "Office"
 	},
-/obj/item/binoculars{
-	pixel_y = 6;
-	pixel_x = -4
+/obj/machinery/door/firedoor/border_only{
+	dir = 4
 	},
-/obj/machinery/light/directional/north,
-/obj/item/stamp/clip/cmm{
-	pixel_y = -3;
-	pixel_x = 9
+/obj/machinery/door/firedoor/border_only{
+	dir = 8
 	},
-/turf/open/floor/plasteel/telecomms_floor,
-/area/ship/bridge)
-"tV" = (
-/obj/machinery/power/smes/shuttle/precharged,
-/obj/structure/cable/yellow{
-	icon_state = "0-8"
+/turf/open/floor/plasteel,
+/area/ship/crew/office)
+"vY" = (
+/obj/effect/turf_decal/spline/fancy/opaque/grey/corner{
+	dir = 8
 	},
-/obj/structure/window/reinforced{
+/obj/effect/turf_decal/corner/opaque/black/half,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
 	dir = 8
 	},
-/obj/machinery/door/poddoor/shutters/preopen{
-	dir = 8;
-	id = "atlas_engi_lockdown"
+/obj/effect/turf_decal/siding/thinplating{
+	dir = 5
 	},
-/turf/open/floor/plasteel/tech,
-/area/ship/engineering)
-"tW" = (
-/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/turf/open/floor/plasteel/mono,
 /area/ship/crew/canteen)
-"us" = (
-/obj/machinery/airalarm/directional/west,
-/turf/open/floor/carpet/blue,
-/area/ship/crew)
-"ut" = (
-/obj/effect/spawner/bunk_bed{
-	dir = 1
+"vZ" = (
+/obj/machinery/bluespace_drive{
+	icon_state = "bsdrive_right"
 	},
-/obj/structure/curtain/cloth,
-/obj/structure/window/reinforced{
-	pixel_y = -1
+/obj/effect/turf_decal/industrial/warning/green{
+	dir = 6
 	},
-/turf/open/floor/carpet/blue,
-/area/ship/crew)
-"ux" = (
-/obj/effect/turf_decal/spline/fancy/opaque/black{
-	dir = 4;
-	pixel_y = 1
+/obj/item/clothing/head/hardhat/dblue{
+	pixel_x = 9;
+	pixel_y = 12
 	},
-/obj/effect/turf_decal/minutemen/edge{
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering)
+"we" = (
+/obj/effect/turf_decal/corner/transparent/blue/three_quarters{
 	dir = 4
 	},
-/turf/open/floor/plasteel/dark,
-/area/ship/bridge)
-"uC" = (
-/obj/structure/table/reinforced,
-/obj/machinery/button/door{
-	id = "atlas_bridge_lockdown";
-	dir = 1;
-	pixel_y = 4;
-	name = "bridge lockdown";
-	pixel_x = -6
+/obj/effect/turf_decal/corner/transparent/blue,
+/obj/effect/turf_decal/siding/white{
+	dir = 9
 	},
-/obj/machinery/button/door{
-	id = "atlas_bridge";
-	dir = 1;
-	pixel_x = 7;
-	pixel_y = 4;
-	name = "bridge shutters"
+/obj/effect/turf_decal/spline/fancy/opaque/white{
+	dir = 4
 	},
-/obj/item/megaphone/command{
-	pixel_y = -7;
-	pixel_x = 7
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/structure/cable{
+	icon_state = "1-4"
 	},
-/turf/open/floor/plasteel/telecomms_floor,
-/area/ship/bridge)
-"uG" = (
-/obj/effect/turf_decal/siding/wood{
+/obj/machinery/light/directional/west,
+/turf/open/floor/plasteel/white,
+/area/ship/medical)
+"wh" = (
+/obj/effect/turf_decal/corner/opaque/blue/half,
+/obj/effect/turf_decal/corner/opaque/blue{
 	dir = 1
 	},
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
-/turf/open/floor/plasteel/dark,
-/area/ship/crew/crewthree)
-"uH" = (
-/obj/structure/table,
-/obj/item/clipboard{
-	pixel_x = 5;
-	pixel_y = 3
+/obj/structure/chair{
+	dir = 8
 	},
-/obj/effect/turf_decal/trimline/transparent/blue/filled/line{
-	dir = 5
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 6
 	},
-/obj/machinery/computer/helm/viewscreen/directional/south,
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/security)
-"uO" = (
-/obj/effect/turf_decal/corner/transparent/blue{
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 6
 	},
-/obj/structure/table/chem,
-/obj/structure/sink/chem,
-/obj/item/roller{
-	pixel_y = 15;
-	pixel_x = -12
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/white,
+/area/ship/crew/canteen)
+"wi" = (
+/obj/structure/table,
+/obj/effect/turf_decal/corner/opaque/blue/diagonal,
+/obj/item/storage/box/plasticware{
+	pixel_x = -5;
+	pixel_y = 5
 	},
-/obj/item/roller{
-	pixel_y = 6;
-	pixel_x = -14
+/obj/item/desk_flag/trans{
+	pixel_x = 8;
+	pixel_y = 12
 	},
+/obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/plasteel/white,
-/area/ship/medical)
-"uQ" = (
-/obj/effect/turf_decal/trimline/transparent/blue/warning{
+/area/ship/crew/canteen)
+"wA" = (
+/obj/effect/turf_decal/corner/opaque/beige/border{
 	dir = 1
 	},
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/turf_decal/industrial/warning{
+/obj/effect/turf_decal/corner/opaque/beige/bordercorner,
+/obj/effect/turf_decal/corner/opaque/white/bordercorner{
 	dir = 8
 	},
+/obj/machinery/button/door{
+	pixel_x = -20;
+	pixel_y = 1;
+	id = "atlas_officers";
+	name = "privacy shutters button";
+	dir = 4
+	},
+/obj/machinery/light/small/directional/south,
 /turf/open/floor/plasteel/dark,
+/area/ship/crew/dorm/commad)
+"wN" = (
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 8
+	},
+/obj/effect/turf_decal/corner/opaque/black/half{
+	dir = 8
+	},
+/obj/effect/turf_decal/trimline/opaque/blue/warning{
+	dir = 8
+	},
+/obj/effect/turf_decal/industrial/warning/green/corner{
+	dir = 1
+	},
+/obj/machinery/light/directional/east,
+/obj/effect/turf_decal/trimline/opaque/beige/filled/line{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
 /area/ship/hallway/central)
-"uU" = (
-/obj/structure/table,
-/obj/item/reagent_containers/food/drinks/soda_cans/cola{
-	pixel_y = 9;
-	pixel_x = -5
+"wO" = (
+/obj/effect/turf_decal/trimline/transparent/blue/filled/line{
+	dir = 5
 	},
-/obj/item/trash/can{
-	pixel_x = 7;
-	pixel_y = 9
+/obj/machinery/light_switch{
+	dir = 8;
+	pixel_x = 20;
+	pixel_y = -13
 	},
-/obj/item/reagent_containers/food/drinks/soda_cans/cola{
-	pixel_y = 4;
-	pixel_x = 1
+/obj/effect/turf_decal/siding/thinplating{
+	dir = 1
 	},
-/obj/item/storage/fancy/donut_box{
+/turf/open/floor/plasteel/dark,
+/area/ship/security/armory)
+"wW" = (
+/obj/structure/table,
+/obj/machinery/power/apc/auto_name/directional/south,
+/obj/machinery/light_switch{
+	dir = 1;
 	pixel_x = -13;
-	pixel_y = -2
+	pixel_y = -16
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/cable{
+	icon_state = "0-4"
+	},
+/obj/item/clipboard,
+/turf/open/floor/pod/light,
+/area/ship/cargo)
+"wY" = (
+/obj/structure/catwalk/over/plated_catwalk/dark,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+	dir = 8
 	},
-/turf/open/floor/plasteel/grimy,
-/area/ship/crew/canteen)
-"uX" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/plating,
+/area/ship/hallway/central)
+"xc" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 9
+	dir = 8
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 9
-	},
-/obj/structure/cable{
-	icon_state = "2-8"
+	dir = 4
 	},
-/obj/effect/turf_decal/siding/thinplating/dark/corner,
-/obj/effect/turf_decal/siding/thinplating/dark/corner{
-	dir = 8
+/obj/effect/turf_decal/trimline/transparent/blue/filled/corner,
+/obj/effect/turf_decal/trimline/transparent/blue/filled/corner{
+	dir = 4
 	},
 /turf/open/floor/plasteel/dark,
-/area/ship/crew/crewthree)
-"uY" = (
-/obj/machinery/door/firedoor,
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/hallway/central)
-"vd" = (
-/obj/structure/catwalk/over,
-/obj/machinery/airalarm/directional/east,
+/area/ship/security/armory)
+"xg" = (
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/obj/structure/cable{
-	icon_state = "1-8"
+/obj/machinery/atmospherics/pipe/manifold/orange/hidden{
+	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/turf/open/floor/plating,
-/area/ship/engineering)
-"vo" = (
-/obj/structure/railing,
-/obj/item/storage/toolbox/mechanical{
-	pixel_y = 9;
-	pixel_x = 2
+/obj/machinery/light/small/directional/east,
+/obj/effect/turf_decal/industrial/warning/green,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 9
 	},
-/obj/item/storage/toolbox/electrical{
-	pixel_x = -2;
-	pixel_y = 2
+/obj/structure/railing/thin{
+	dir = 8
+	},
+/turf/open/floor/plasteel/stairs{
+	color = "#535456";
+	dir = 1
 	},
-/obj/machinery/light/directional/west,
-/obj/machinery/cell_charger,
-/obj/structure/table,
-/turf/open/floor/plasteel/tech,
 /area/ship/engineering)
-"vw" = (
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
-	dir = 8
+"xi" = (
+/obj/effect/decal/fakelattice{
+	icon_state = "lattice-203"
 	},
-/obj/structure/catwalk/over,
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
-	dir = 8
+/obj/structure/lattice/catwalk,
+/turf/open/floor/plating,
+/area/ship/external/dark)
+"xj" = (
+/obj/effect/turf_decal/corner/opaque/blue/half,
+/obj/effect/turf_decal/corner/opaque/blue/half{
+	dir = 4
 	},
-/obj/structure/cable{
-	icon_state = "2-4"
+/obj/effect/turf_decal/corner/opaque/blue{
+	dir = 1
+	},
+/obj/structure/chair{
+	dir = 8
 	},
+/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4,
 /obj/structure/cable{
-	icon_state = "2-9"
+	icon_state = "4-8"
 	},
 /obj/structure/cable{
 	icon_state = "2-8"
 	},
 /obj/structure/cable{
-	icon_state = "1-2"
+	icon_state = "1-8"
 	},
-/turf/open/floor/plating,
-/area/ship/engineering)
-"vy" = (
-/obj/structure/table,
-/obj/item/paper_bin{
-	pixel_y = 5;
-	pixel_x = -13
+/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/white,
+/area/ship/crew/canteen)
+"xm" = (
+/obj/structure/catwalk/over/plated_catwalk/dark,
+/obj/structure/railing/thin/corner{
+	dir = 8
 	},
-/obj/item/pen{
-	pixel_y = 5;
-	pixel_x = -13
+/turf/open/floor/plasteel/telecomms_floor,
+/area/ship/bridge)
+"xp" = (
+/obj/machinery/shower{
+	dir = 1
 	},
-/obj/item/kitchen/fork/plastic{
-	pixel_x = 4;
-	pixel_y = 1
+/obj/effect/turf_decal/steeldecal/steel_decals10{
+	dir = 6
 	},
-/obj/item/kitchen/fork/plastic{
-	pixel_x = 6;
-	pixel_y = 3
+/obj/effect/turf_decal/steeldecal/steel_decals10{
+	dir = 5
 	},
-/obj/item/kitchen/fork/plastic{
-	pixel_x = 8;
-	pixel_y = 1
+/obj/machinery/door/window/westleft,
+/obj/structure/curtain,
+/obj/structure/window{
+	dir = 5
 	},
-/obj/item/kitchen/fork/plastic{
-	pixel_x = 10;
-	pixel_y = 2
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/item/towel{
+	pixel_x = -1;
+	pixel_y = 14
 	},
-/obj/item/melee/knife/plastic,
-/obj/item/melee/knife/plastic{
-	pixel_x = -3;
-	pixel_y = 1
+/turf/open/floor/plasteel/mono/white,
+/area/ship/crew/dorm/commad)
+"xt" = (
+/obj/structure/cable{
+	icon_state = "1-8"
 	},
-/obj/item/melee/knife/plastic{
-	pixel_x = 2;
-	pixel_y = 1
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+	dir = 9
 	},
-/obj/item/melee/knife/plastic{
-	pixel_x = -1;
-	pixel_y = 2
+/obj/structure/railing/thin/corner{
+	dir = 1
 	},
-/turf/open/floor/plasteel/grimy,
-/area/ship/crew/canteen)
-"vS" = (
-/obj/machinery/porta_turret/ship/clip{
-	id = "atlas";
-	dir = 10
+/obj/machinery/atmospherics/pipe/simple/general/hidden/layer4{
+	dir = 6
 	},
-/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/obj/structure/catwalk/over,
+/turf/open/floor/plating,
 /area/ship/engineering)
-"vT" = (
-/obj/effect/turf_decal/siding/wood/corner{
+"xy" = (
+/obj/effect/turf_decal/industrial/warning/green{
 	dir = 1
 	},
-/turf/open/floor/plasteel/dark,
-/area/ship/crew)
-"vW" = (
-/obj/structure/sign/poster/clip/random{
-	pixel_y = 32
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/structure/cable{
+	icon_state = "1-2"
 	},
-/obj/effect/turf_decal/siding/wood/corner{
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/hallway/central)
+"xU" = (
+/obj/effect/turf_decal/siding/thinplating/dark,
+/obj/effect/turf_decal/corner/opaque/black/half,
+/obj/effect/turf_decal/corner/opaque/mauve/border{
 	dir = 1
 	},
-/turf/open/floor/carpet/blue,
-/area/ship/crew/crewthree)
-"vZ" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced/fulltile,
+/obj/effect/turf_decal/trimline/opaque/blue/warning,
+/obj/effect/turf_decal/industrial/warning/green{
+	dir = 4
+	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/hallway/central)
+"xZ" = (
 /obj/machinery/door/poddoor/shutters/preopen{
-	id = "atlas_engi_lockdown"
+	id = "atlas_armory"
 	},
-/turf/open/floor/plating,
-/area/ship/engineering)
-"wc" = (
-/obj/machinery/power/terminal{
-	dir = 8
+/obj/machinery/door/firedoor,
+/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/mono/dark,
+/area/ship/security/armory)
+"yo" = (
+/obj/machinery/power/apc/auto_name/directional/north,
+/obj/machinery/light_switch{
+	pixel_y = 22;
+	pixel_x = 12
 	},
 /obj/structure/cable{
-	icon_state = "0-6"
+	icon_state = "0-4"
 	},
-/obj/structure/platform/industrial{
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel,
+/area/ship/crew/dorm)
+"yq" = (
+/obj/effect/turf_decal/minutemen/edge{
 	dir = 1
 	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/structure/catwalk/over,
 /turf/open/floor/plating,
 /area/ship/engineering)
-"wd" = (
-/obj/structure/sign/warning/nosmoking/circle{
-	pixel_x = -28
+"yv" = (
+/obj/effect/decal/fakelattice,
+/obj/structure/railing{
+	dir = 1
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/elevatorshaft,
+/area/ship/hallway/central)
+"yB" = (
+/obj/effect/turf_decal/siding/thinplating/dark,
+/obj/effect/turf_decal/corner/opaque/black/half,
+/obj/effect/turf_decal/corner/opaque/blue/border{
+	dir = 1
+	},
+/obj/effect/turf_decal/trimline/opaque/blue/warning,
+/obj/effect/turf_decal/industrial/warning/green{
+	dir = 8
+	},
+/turf/open/floor/plasteel,
+/area/ship/hallway/central)
+"yE" = (
+/obj/structure/closet/secure_closet/clip/minutemen/armor{
+	pixel_y = 6
+	},
+/obj/item/storage/pouch/ammo,
+/obj/item/storage/pouch/ammo,
+/obj/item/storage/pouch/ammo,
+/obj/item/storage/pouch/ammo,
+/obj/effect/turf_decal/techfloor{
+	dir = 1
+	},
+/obj/effect/turf_decal/spline/plain/opaque/blue{
+	dir = 1
+	},
+/obj/machinery/light/directional/east,
+/obj/structure/sign/poster/contraband/eoehoma{
+	pixel_y = 32
+	},
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/security/armory)
+"yI" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 8
 	},
-/obj/machinery/power/ship_gravity,
 /obj/structure/cable{
-	icon_state = "0-4"
+	icon_state = "4-8"
+	},
+/obj/effect/turf_decal/corner/opaque/black/half{
+	dir = 4
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/canteen)
+"yJ" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 9
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 9
+	},
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+	dir = 9
+	},
+/obj/effect/turf_decal/corner/transparent/lime/half{
+	dir = 4
 	},
+/obj/machinery/light/small/directional/east,
 /turf/open/floor/plasteel/tech,
 /area/ship/engineering)
-"we" = (
-/obj/effect/turf_decal/corner/transparent/blue/diagonal,
-/obj/structure/cable{
-	icon_state = "4-8"
+"yO" = (
+/obj/structure/mirror{
+	pixel_y = 28;
+	pixel_x = 5
+	},
+/obj/effect/turf_decal/corner/opaque/white/half{
+	dir = 1
+	},
+/obj/effect/turf_decal/corner/opaque/white/half,
+/obj/structure/sink{
+	pixel_y = 19;
+	pixel_x = 5
+	},
+/turf/open/floor/plasteel/white,
+/area/ship/crew/dorm/commad)
+"yR" = (
+/obj/structure/table/chem,
+/obj/effect/turf_decal/corner/transparent/blue{
+	dir = 9
+	},
+/obj/machinery/computer/med_data/laptop{
+	dir = 1;
+	pixel_x = -2;
+	pixel_y = 4
+	},
+/turf/open/floor/plasteel/white,
+/area/ship/medical)
+"yX" = (
+/obj/structure/dresser{
+	pixel_y = 2
+	},
+/turf/open/floor/carpet/nanoweave/beige,
+/area/ship/crew/dorm/commad)
+"zf" = (
+/obj/effect/turf_decal/corner_steel_grid{
+	dir = 5;
+	layer = 2.030
 	},
-/obj/effect/turf_decal/spline/fancy/opaque/white,
-/obj/effect/turf_decal/siding/white{
+/obj/effect/turf_decal/corner_steel_grid{
+	dir = 10
+	},
+/obj/machinery/door/airlock/research{
+	name = "Cargo Bay"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/door/firedoor/border_only{
 	dir = 1
 	},
-/obj/structure/closet/secure_closet/wall/directional/north{
-	icon_door = "med_wall";
-	req_access = list(5)
+/turf/open/floor/pod/light,
+/area/ship/cargo)
+"zl" = (
+/obj/effect/turf_decal/techfloor{
+	dir = 8
 	},
-/obj/item/storage/belt/medical/webbing/clip/prefilled{
-	pixel_x = -6;
-	pixel_y = -7
+/obj/effect/turf_decal/spline/plain/opaque/green{
+	dir = 8
 	},
-/obj/item/clothing/gloves/color/latex/nitrile/clip{
-	pixel_x = -11;
-	pixel_y = 5
+/obj/machinery/light/small/directional/west,
+/obj/structure/railing/thin{
+	dir = 1
 	},
-/obj/item/clothing/under/clip/medic{
-	pixel_x = 9;
-	pixel_y = -4
+/obj/machinery/cryopod{
+	dir = 4
 	},
-/obj/item/clothing/head/clip/corpsman{
-	pixel_y = 8;
-	pixel_x = 9
+/turf/open/floor/plasteel/patterned/grid/dark,
+/area/ship/crew/cryo)
+"zq" = (
+/obj/effect/turf_decal/corner_steel_grid,
+/obj/effect/turf_decal/box/white/corners{
+	color = "#CBB1CA"
 	},
-/obj/item/defibrillator/loaded{
-	pixel_y = 26
+/obj/structure/rack,
+/obj/item/stack/sheet/metal/five{
+	pixel_x = -5
 	},
-/obj/item/storage/backpack/satchel/med{
-	pixel_x = 11;
-	pixel_y = -14
+/obj/item/stack/sheet/glass/five{
+	pixel_x = 4;
+	pixel_y = 9
 	},
-/obj/item/storage/backpack/messenger/med{
-	pixel_x = 10;
-	pixel_y = -10
+/obj/machinery/light/directional/east,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/pod/light,
+/area/ship/cargo)
+"zx" = (
+/obj/structure/window/reinforced{
+	dir = 8
 	},
-/obj/item/storage/backpack/medic{
-	pixel_x = 9;
-	pixel_y = -14
+/obj/machinery/atmospherics/components/unary/shuttle/fire_heater,
+/obj/effect/turf_decal/industrial/warning/green/full,
+/obj/structure/railing/thin,
+/obj/machinery/door/poddoor/shutters{
+	dir = 4;
+	id = "atlas_engines_north"
 	},
-/obj/item/storage/case/surgery{
-	pixel_y = -3
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering)
+"zz" = (
+/obj/effect/turf_decal/industrial/warning/green,
+/turf/open/floor/engine/hull/reinforced,
+/area/ship/engineering)
+"zC" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 8
 	},
-/turf/open/floor/plasteel/white,
-/area/ship/medical)
-"wh" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/plasteel/grimy,
-/area/ship/crew/canteen)
-"wi" = (
-/obj/item/radio/intercom/directional/south,
-/obj/effect/turf_decal/techfloor/orange,
-/turf/open/floor/plasteel/tech/grid,
-/area/ship/crew)
-"wk" = (
-/obj/effect/turf_decal/spline/fancy/opaque/black,
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
-/obj/structure/cable{
-	icon_state = "4-8"
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
 	},
-/obj/structure/cable{
-	icon_state = "1-8"
+/obj/machinery/door/airlock/command{
+	dir = 4;
+	name = "Armory";
+	req_one_access = list(19, 3)
+	},
+/obj/effect/turf_decal/trimline/transparent/blue/filled/corner{
+	dir = 8
 	},
 /obj/effect/turf_decal/trimline/transparent/blue/filled/corner{
 	dir = 1
 	},
-/turf/open/floor/plasteel/dark,
-/area/ship/crew/canteen)
-"wu" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/effect/turf_decal/siding/thinplating/corner{
 	dir = 4
 	},
-/obj/machinery/airalarm/directional/north,
-/obj/machinery/turretid/ship{
-	pixel_x = -28;
-	pixel_y = -3;
-	id = "atlas"
-	},
 /turf/open/floor/plasteel/dark,
-/area/ship/bridge)
-"wy" = (
-/obj/effect/turf_decal/siding/thinplating/dark/corner{
+/area/ship/security/armory)
+"zE" = (
+/obj/structure/table,
+/obj/structure/bedsheetbin{
+	pixel_x = -1;
+	pixel_y = 5
+	},
+/obj/machinery/button/door{
+	pixel_x = -20;
+	pixel_y = 1;
+	id = "atlas_dorms";
+	name = "privacy shutters button";
 	dir = 4
 	},
-/obj/effect/turf_decal/siding/thinplating/dark/corner{
+/turf/open/floor/plasteel,
+/area/ship/crew/dorm)
+"zK" = (
+/obj/effect/turf_decal/siding/thinplating/dark{
 	dir = 8
 	},
-/obj/effect/turf_decal/trimline/transparent/blue/warning{
-	dir = 6
+/obj/effect/turf_decal/corner/opaque/black/half{
+	dir = 8
 	},
-/turf/open/floor/plasteel/dark,
-/area/ship/crew/canteen)
-"wJ" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/effect/turf_decal/siding/wood{
+/obj/effect/turf_decal/trimline/opaque/blue/warning{
 	dir = 8
 	},
-/turf/open/floor/plasteel/dark,
-/area/ship/crew)
-"wU" = (
-/obj/machinery/power/smes/engineering,
-/obj/effect/turf_decal/industrial,
-/obj/structure/cable{
-	icon_state = "0-8"
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+	dir = 8
 	},
-/turf/open/floor/engine/hull/interior,
-/area/ship/engineering)
-"wW" = (
-/obj/effect/turf_decal/trimline/transparent/blue/warning,
-/obj/effect/turf_decal/siding/thinplating/dark{
-	dir = 1
+/obj/effect/turf_decal/trimline/opaque/beige/filled/line{
+	dir = 4
 	},
-/obj/structure/chair,
-/obj/machinery/firealarm/directional/north,
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plasteel,
 /area/ship/hallway/central)
-"xi" = (
-/obj/effect/decal/fakelattice{
-	icon_state = "lattice-203"
-	},
-/obj/structure/lattice/catwalk,
-/turf/open/floor/plating,
-/area/ship/external/dark)
-"xz" = (
-/obj/effect/turf_decal/box/corners{
-	dir = 4;
-	color = "#75A2BB"
-	},
-/obj/effect/turf_decal/box/corners{
-	color = "#75A2BB"
+"zN" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 8
 	},
-/obj/structure/tank_dispenser/oxygen,
-/turf/open/floor/pod/dark,
-/area/ship/cargo)
-"xU" = (
-/obj/machinery/light/directional/east,
-/obj/item/radio/intercom/directional/south,
-/obj/effect/turf_decal/siding/white{
-	dir = 6
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
 	},
-/obj/effect/turf_decal/corner/transparent/blue/diagonal,
-/obj/machinery/iv_drip,
-/turf/open/floor/plasteel/white,
-/area/ship/medical)
-"yi" = (
 /obj/structure/cable{
-	icon_state = "1-4"
+	icon_state = "4-8"
 	},
-/turf/open/floor/plasteel/dark,
-/area/ship/crew)
-"yn" = (
-/obj/structure/salvageable/computer{
+/obj/effect/turf_decal/corner/opaque/black/half{
 	dir = 4
 	},
-/obj/effect/turf_decal/box/corners{
-	color = "#75A2BB"
-	},
-/obj/item/clothing/head/helmet/bulletproof/m10/clip_vc{
-	pixel_y = 5;
-	pixel_x = -9
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/canteen)
+"zQ" = (
+/obj/structure/window/reinforced{
+	dir = 4
 	},
-/turf/open/floor/pod/dark,
-/area/ship/cargo)
-"yo" = (
-/obj/effect/turf_decal/trimline/transparent/blue/filled/line{
-	dir = 8
+/obj/structure/guncloset{
+	pixel_y = 15;
+	pixel_x = -3
 	},
-/obj/effect/turf_decal/siding/thinplating/dark{
-	dir = 8
+/obj/item/gun/ballistic/automatic/smg/cm5/no_mag{
+	pixel_x = -8;
+	pixel_y = 28
 	},
-/obj/structure/cable{
-	icon_state = "0-2"
+/obj/item/gun/ballistic/automatic/smg/cm5/no_mag{
+	pixel_x = -10;
+	pixel_y = 23
 	},
-/obj/machinery/power/apc/auto_name/directional/north,
-/obj/effect/turf_decal/techfloor{
-	dir = 1
+/obj/item/gun/ballistic/automatic/assault/skm/cm24/no_mag{
+	pixel_x = -9;
+	pixel_y = 12
 	},
-/obj/structure/table,
-/obj/machinery/recharger{
-	pixel_y = 6;
-	pixel_x = -7
+/obj/item/gun/ballistic/automatic/pistol/cm23/no_mag{
+	pixel_x = -5;
+	pixel_y = -1
 	},
-/obj/item/storage/fancy/cigarettes{
-	pixel_x = 10;
-	pixel_y = 10
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/security/armory)
+"An" = (
+/obj/structure/chair{
+	dir = 4
 	},
-/obj/item/storage/fancy/cigarettes{
-	pixel_x = 6;
-	pixel_y = 8
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/turf_decal/trimline/opaque/beige/filled/line{
+	dir = 8
 	},
-/obj/item/storage/fancy/cigarettes{
-	pixel_x = 9;
+/turf/open/floor/plasteel,
+/area/ship/bridge)
+"Aq" = (
+/obj/structure/table/reinforced,
+/obj/item/reagent_containers/food/drinks/beaglemug{
+	pixel_x = 7;
 	pixel_y = 6
 	},
-/obj/item/clothing/mask/cigarette{
-	pixel_x = -1;
-	pixel_y = 2
-	},
-/obj/effect/spawner/random/entertainment/lighter{
-	pixel_y = -1;
-	pixel_x = 11
-	},
-/turf/open/floor/plasteel/tech/grid,
-/area/ship/security)
-"yx" = (
-/obj/structure/bed/double,
-/obj/item/bedsheet/double/grey,
-/turf/open/floor/carpet/nanoweave/blue,
-/area/ship/crew/crewtwo)
-"yB" = (
-/obj/structure/catwalk/over/plated_catwalk/dark,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/effect/turf_decal/industrial/warning{
-	dir = 4;
-	layer = 2.456
+/obj/item/reagent_containers/glass/maunamug{
+	pixel_x = -6;
+	pixel_y = 6
 	},
-/turf/open/floor/plating,
-/area/ship/hallway/central)
-"yC" = (
-/obj/effect/turf_decal/siding/wood{
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/light/directional/south,
+/turf/open/floor/plasteel,
+/area/ship/bridge)
+"Ar" = (
+/obj/effect/turf_decal/spline/fancy/opaque/grey,
+/obj/effect/turf_decal/corner/opaque/black/half{
 	dir = 1
 	},
-/obj/machinery/holopad/emergency/counselor,
-/turf/open/floor/plasteel/dark,
-/area/ship/crew/crewthree)
-"yI" = (
-/obj/effect/turf_decal/box/corners{
-	dir = 1;
-	color = "#75A2BB"
+/obj/effect/turf_decal/siding/thinplating{
+	dir = 1
 	},
-/obj/effect/turf_decal/box/corners{
-	dir = 8;
-	color = "#75A2BB"
+/turf/open/floor/plasteel/mono,
+/area/ship/crew/canteen)
+"Aw" = (
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 8
 	},
-/obj/effect/turf_decal/corner_steel_grid{
-	dir = 6
+/obj/effect/turf_decal/corner/opaque/black/half{
+	dir = 8
 	},
-/obj/structure/punching_bag,
-/obj/machinery/light_switch{
-	dir = 1;
-	pixel_y = -20
+/obj/effect/turf_decal/trimline/opaque/blue/warning{
+	dir = 8
 	},
-/obj/structure/cable{
-	icon_state = "4-8"
+/obj/effect/turf_decal/industrial/warning/green/corner{
+	dir = 8
 	},
-/turf/open/floor/pod/dark,
-/area/ship/cargo)
-"yL" = (
-/obj/structure/cable{
-	icon_state = "4-8"
+/obj/machinery/light/directional/east,
+/obj/effect/turf_decal/trimline/opaque/beige/filled/line{
+	dir = 4
 	},
-/turf/open/floor/plasteel/tech,
-/area/ship/engineering)
-"yO" = (
-/obj/machinery/computer/helm/viewscreen/directional/north,
-/turf/open/floor/carpet/blue,
-/area/ship/crew/crewthree)
-"yR" = (
-/obj/effect/turf_decal/siding/white,
-/obj/effect/turf_decal/corner/transparent/blue/diagonal,
-/obj/structure/bed/roller,
-/turf/open/floor/plasteel/white,
-/area/ship/medical)
-"yT" = (
-/obj/machinery/door/firedoor,
-/obj/structure/extinguisher_cabinet/directional/north,
-/turf/open/floor/plasteel/mono/dark,
+/turf/open/floor/plasteel,
 /area/ship/hallway/central)
-"yZ" = (
-/obj/machinery/light/directional/north,
-/obj/effect/turf_decal/techfloor{
-	dir = 1
+"Ay" = (
+/obj/machinery/button/door{
+	pixel_x = 1;
+	pixel_y = -20;
+	id = "atlas_armory_desk";
+	name = "desk shutters button";
+	dir = 1;
+	req_one_access = list(19, 3)
 	},
-/obj/structure/closet/secure_closet/armorycage{
-	anchored = 1;
-	can_be_unanchored = 1;
-	name = "confiscation locker"
+/obj/effect/turf_decal/trimline/transparent/blue/filled/corner,
+/turf/open/floor/plasteel/dark,
+/area/ship/security/armory)
+"AE" = (
+/obj/effect/turf_decal/corner/opaque/black/half{
+	dir = 1
 	},
-/obj/item/storage/box/evidence{
-	pixel_y = -4
+/obj/effect/turf_decal/siding/thinplating{
+	dir = 8
 	},
-/turf/open/floor/plasteel/tech/grid,
-/area/ship/security)
-"zc" = (
-/obj/structure/closet/crate/freezer,
-/obj/item/tank/internals/anesthetic{
-	pixel_x = 12
+/obj/structure/cable{
+	icon_state = "1-2"
 	},
-/obj/item/tank/internals/anesthetic{
-	pixel_x = 12
+/obj/machinery/computer/security/telescreen/entertainment{
+	pixel_x = -28
 	},
-/obj/item/clothing/mask/breath/medical{
-	pixel_y = -12;
-	pixel_x = 5
+/obj/effect/turf_decal/spline/fancy/opaque/grey{
+	dir = 4
 	},
-/obj/item/clothing/mask/breath/medical{
-	pixel_y = -12;
-	pixel_x = 6
+/turf/open/floor/plasteel/mono,
+/area/ship/crew/canteen)
+"AH" = (
+/obj/effect/turf_decal/corner/opaque/blue/border{
+	dir = 1
 	},
-/obj/effect/turf_decal/corner/transparent/blue/mono,
-/obj/item/storage/firstaid/regular{
-	pixel_y = 8;
-	pixel_x = -8
+/obj/effect/turf_decal/corner/opaque/white/bordercorner{
+	dir = 8
 	},
-/obj/item/storage/box/gloves{
-	pixel_x = -10;
-	pixel_y = 2
+/obj/effect/turf_decal/corner/opaque/blue/bordercorner,
+/obj/structure/closet/wardrobe/clip/formal/wall{
+	dir = 4;
+	pixel_x = 28
 	},
-/obj/item/storage/box/masks{
-	pixel_y = -5;
-	pixel_x = -12
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 9
 	},
-/turf/open/floor/plasteel/mono/white,
-/area/ship/medical)
-"zf" = (
-/obj/effect/turf_decal/industrial/warning{
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/dorm)
+"AO" = (
+/obj/effect/turf_decal/corner_steel_grid{
 	dir = 1
 	},
-/obj/effect/turf_decal/industrial/warning,
-/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{
-	dir = 8
+/obj/effect/turf_decal/box/white/corners{
+	dir = 1;
+	color = "#CBB1CA"
 	},
-/obj/machinery/advanced_airlock_controller{
-	pixel_y = 26
+/obj/machinery/button/door{
+	pixel_x = -1;
+	pixel_y = 20;
+	id = "atlas_cargo";
+	name = "cargo doors button"
 	},
-/obj/structure/closet/emcloset/wall/directional/south,
-/obj/item/clothing/suit/space/fragile{
-	pixel_x = 6;
-	pixel_y = -14
+/obj/machinery/button/shieldwallgen{
+	pixel_x = 9;
+	pixel_y = 19;
+	id = "atlas_cargo_holo"
 	},
-/obj/item/clothing/suit/space/fragile{
-	pixel_x = 11;
-	pixel_y = -17
+/turf/open/floor/pod/light,
+/area/ship/cargo)
+"AP" = (
+/obj/effect/turf_decal/trimline/transparent/blue/filled/line,
+/turf/open/floor/plasteel/dark,
+/area/ship/security/armory)
+"Bh" = (
+/obj/structure/table/reinforced,
+/obj/item/paper_bin{
+	pixel_x = -8;
+	pixel_y = 5
 	},
-/obj/item/clothing/head/helmet/space/fragile{
+/obj/item/pen/fourcolor{
 	pixel_x = -8;
-	pixel_y = -9
+	pixel_y = 5
 	},
-/obj/item/clothing/head/helmet/space/fragile{
-	pixel_x = -2;
-	pixel_y = -14
+/obj/effect/turf_decal/corner/opaque/white/mono,
+/obj/item/radio/intercom/directional/north,
+/obj/item/folder{
+	pixel_x = 7;
+	pixel_y = 10
 	},
-/turf/open/floor/plasteel/dark,
-/area/ship/engineering)
-"zl" = (
-/obj/structure/closet/crate/trashcart/laundry,
-/obj/effect/turf_decal/corner_steel_grid{
-	dir = 10
+/obj/item/folder{
+	pixel_x = 8;
+	pixel_y = 5
 	},
-/obj/effect/turf_decal/box/corners{
+/turf/open/floor/plasteel,
+/area/ship/crew/office)
+"Bk" = (
+/obj/machinery/door/airlock/grunge{
 	dir = 4;
-	color = "#75A2BB"
+	name = "Cryogenics"
 	},
-/turf/open/floor/plasteel/tech/grid,
-/area/ship/crew/canteen)
-"zq" = (
-/obj/machinery/door/poddoor{
-	id = "atlas_cargo"
+/obj/machinery/door/firedoor/border_only{
+	dir = 4
 	},
-/obj/machinery/power/shieldwallgen/atmos/roundstart{
-	dir = 4;
-	id = "atlas_holo"
+/obj/machinery/door/firedoor/border_only{
+	dir = 8
 	},
 /obj/structure/cable{
-	icon_state = "0-2"
+	icon_state = "4-8"
 	},
-/obj/effect/turf_decal/industrial/warning,
-/turf/open/floor/plating,
-/area/ship/cargo)
-"zt" = (
-/obj/effect/turf_decal/trimline/transparent/blue/warning,
-/obj/effect/turf_decal/siding/thinplating/dark{
-	dir = 1
+/obj/effect/turf_decal/siding/thinplating/corner,
+/turf/open/floor/plasteel/patterned/grid/dark,
+/area/ship/crew/cryo)
+"Bo" = (
+/obj/structure/railing/thin{
+	dir = 6
+	},
+/obj/effect/turf_decal/corner/transparent/lime/half,
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering)
+"Br" = (
+/obj/structure/catwalk/over/plated_catwalk/dark,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 8
 	},
-/obj/machinery/airalarm/directional/north,
-/turf/open/floor/plasteel/dark,
-/area/ship/hallway/central)
-"zx" = (
-/obj/effect/turf_decal/corner/transparent/blue/diagonal,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/power/apc/auto_name/directional/east,
-/obj/structure/cable,
 /obj/structure/cable{
-	icon_state = "1-8"
+	icon_state = "4-8"
 	},
-/obj/effect/turf_decal/spline/fancy/opaque/white/corner{
-	dir = 8
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
+/turf/open/floor/plating,
+/area/ship/hallway/central)
+"Bx" = (
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 4
 	},
-/obj/effect/turf_decal/siding/white{
-	dir = 5
+/obj/effect/turf_decal/corner/opaque/black/half{
+	dir = 4
 	},
-/turf/open/floor/plasteel/white,
-/area/ship/medical)
-"zE" = (
-/obj/machinery/button/door{
-	id = "atlas_dorms";
-	name = "private windows button";
-	pixel_x = -23;
+/obj/effect/turf_decal/trimline/opaque/blue/warning{
 	dir = 4
 	},
-/obj/structure/dresser{
-	dir = 4;
-	pixel_x = -5
+/obj/effect/turf_decal/corner/opaque/blue/border{
+	dir = 8
 	},
-/obj/item/reagent_containers/food/drinks/beaglemug{
-	pixel_y = 8;
-	pixel_x = -4
+/obj/effect/turf_decal/industrial/warning/green{
+	dir = 1
 	},
-/obj/effect/turf_decal/siding/wood{
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel,
+/area/ship/hallway/central)
+"BH" = (
+/obj/structure/table,
+/obj/effect/turf_decal/corner/opaque/blue/half,
+/obj/effect/turf_decal/corner/opaque/blue{
 	dir = 1
 	},
-/turf/open/floor/plasteel/dark,
-/area/ship/crew)
-"zQ" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 10
-	},
-/obj/structure/cable{
-	icon_state = "2-8"
-	},
-/obj/effect/turf_decal/siding/thinplating/dark{
-	dir = 1
+	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 10
-	},
-/obj/effect/turf_decal/siding/thinplating/dark/corner{
 	dir = 8
 	},
-/obj/machinery/door/airlock/grunge{
-	req_access = list(3);
-	dir = 4;
-	name = "Armory"
+/obj/structure/cable{
+	icon_state = "4-8"
 	},
-/turf/open/floor/plasteel/dark,
-/area/ship/security)
-"Aa" = (
-/obj/effect/turf_decal/spline/fancy/opaque/black,
-/obj/effect/turf_decal/trimline/transparent/blue/filled/arrow_ccw{
-	dir = 1
+/obj/item/storage/box/plasticware{
+	pixel_x = 4;
+	pixel_y = 18
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 4
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/white,
+/area/ship/crew/canteen)
+"BI" = (
+/obj/effect/turf_decal/spline/fancy/opaque/grey{
+	dir = 8
 	},
+/obj/effect/turf_decal/corner/opaque/black/half,
 /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 = "4-8"
 	},
-/turf/open/floor/plasteel/dark,
-/area/ship/crew/canteen)
-"An" = (
-/obj/machinery/light/directional/west,
-/obj/effect/spawner/bunk_bed{
+/obj/effect/turf_decal/siding/thinplating{
 	dir = 4
 	},
-/obj/structure/curtain/cloth,
-/obj/structure/window/reinforced{
-	pixel_y = -1
+/turf/open/floor/plasteel/mono,
+/area/ship/crew/canteen)
+"BR" = (
+/obj/structure/catwalk/over/plated_catwalk/dark,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 8
 	},
-/turf/open/floor/carpet/blue,
-/area/ship/crew)
-"Av" = (
-/obj/structure/table/wood,
-/obj/item/flashlight/lamp{
-	pixel_y = 6;
-	pixel_x = 1
+/obj/structure/cable{
+	icon_state = "4-8"
 	},
-/obj/item/radio/intercom/directional/west,
-/turf/open/floor/wood,
-/area/ship/crew/crewtwo)
-"Ay" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2,
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
+/turf/open/floor/plating,
+/area/ship/hallway/central)
+"BW" = (
+/obj/effect/turf_decal/industrial/warning/green{
 	dir = 4
 	},
-/obj/item/paperplane{
-	pixel_x = 11;
-	pixel_y = 9
+/obj/machinery/door/firedoor/heavy,
+/obj/machinery/door/airlock/external{
+	dir = 4
 	},
-/obj/effect/turf_decal/siding/thinplating/dark/corner{
+/turf/open/floor/plating,
+/area/ship/engineering)
+"BX" = (
+/obj/effect/turf_decal/corner/transparent/lime/half{
 	dir = 4
 	},
-/turf/open/floor/plasteel/dark,
-/area/ship/crew/crewtwo)
-"AH" = (
-/obj/effect/turf_decal/corner/transparent/blue/diagonal,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/effect/turf_decal/spline/fancy/opaque/white{
-	dir = 8
+/obj/machinery/airalarm/directional/east,
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering)
+"Ck" = (
+/obj/structure/closet/crate{
+	name = "mining kit"
 	},
-/obj/effect/turf_decal/siding/white{
-	dir = 4
+/obj/item/storage/bag/ore,
+/obj/item/storage/bag/ore,
+/obj/item/pickaxe/emergency,
+/obj/item/pickaxe/emergency,
+/obj/item/mining_scanner{
+	pixel_x = 4;
+	pixel_y = -3
 	},
-/turf/open/floor/plasteel/white,
-/area/ship/medical)
-"AP" = (
-/obj/structure/catwalk/over/plated_catwalk/dark,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+/obj/item/mining_scanner{
+	pixel_x = 4;
+	pixel_y = -3
+	},
+/obj/effect/mapping_helpers/crate_shelve,
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/ship/cargo)
+"Cm" = (
+/obj/structure/sign/clip,
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/ship/crew/dorm/commad)
+"Cn" = (
+/obj/machinery/power/terminal{
 	dir = 8
 	},
 /obj/structure/cable{
-	icon_state = "1-4"
+	icon_state = "0-6"
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering)
+"Cu" = (
+/obj/effect/turf_decal/spline/fancy/opaque/grey{
+	dir = 1
+	},
+/obj/effect/turf_decal/corner/opaque/black/half{
+	dir = 1
 	},
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/turf_decal/siding/thinplating,
+/turf/open/floor/plasteel/mono,
+/area/ship/crew/canteen)
+"Cx" = (
+/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/plating,
-/area/ship/hallway/central)
-"Bm" = (
-/obj/machinery/power/shuttle/engine/electric,
-/obj/structure/window/reinforced{
-	dir = 4
-	},
-/obj/structure/cable/yellow{
-	icon_state = "0-4"
+/obj/machinery/door/airlock/grunge{
+	name = "Sleeping Quarters"
 	},
-/obj/machinery/door/poddoor/shutters/preopen{
-	dir = 8;
-	id = "atlas_engi_lockdown"
+/turf/open/floor/plasteel,
+/area/ship/crew/dorm)
+"CE" = (
+/obj/effect/turf_decal/corner/opaque/beige/border,
+/obj/effect/turf_decal/corner/opaque/white/bordercorner{
+	dir = 4
 	},
-/turf/open/floor/plating,
-/area/ship/external/dark)
-"Bx" = (
-/obj/machinery/light/directional/south,
-/obj/effect/turf_decal/spline/fancy/opaque/black{
-	dir = 8
+/obj/effect/turf_decal/corner/opaque/beige/bordercorner{
+	dir = 1
 	},
-/obj/effect/turf_decal/trimline/transparent/blue/filled/line{
-	dir = 9
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 6
 	},
-/obj/structure/reagent_dispensers/peppertank{
-	pixel_y = -28
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/structure/chair/sofa/blue/left/directional/east,
+/obj/structure/sign/warning/nosmoking/circle{
+	pixel_x = -28;
+	pixel_y = 2
 	},
-/obj/structure/bed/dogbed{
-	name = "Mushroom's bed";
-	desc = "A comfy-looking dog bed. Despite the name, the owner is a mothroach."
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/dorm/commad)
+"CJ" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/light/directional/east,
+/obj/structure/cable{
+	icon_state = "1-2"
 	},
-/mob/living/simple_animal/pet/mothroach{
-	name = "Mushroom";
-	desc = "Master Sergeant Mushroom is assigned to overwatch C-MM armory officers. Don't let her eat the armor.";
-	gender = "female"
+/obj/effect/turf_decal/corner/opaque/beige/border{
+	dir = 4
 	},
-/obj/item/storage/fancy/egg_box{
-	pixel_x = -3;
-	pixel_y = -3
+/obj/effect/turf_decal/corner/opaque/white/bordercorner,
+/obj/effect/turf_decal/corner/opaque/white/bordercorner{
+	dir = 4
 	},
+/obj/effect/turf_decal/industrial/warning/green,
 /turf/open/floor/plasteel/mono/dark,
-/area/ship/security)
-"BH" = (
-/obj/structure/catwalk/over/plated_catwalk/dark,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 8
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/turf/open/floor/plating,
 /area/ship/hallway/central)
-"BI" = (
-/obj/effect/turf_decal/spline/fancy/opaque/black{
+"CO" = (
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/ship/medical)
+"CS" = (
+/obj/effect/turf_decal/corner/opaque/black/half,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/recharge_station,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/light/small/directional/east,
+/turf/open/floor/plasteel,
+/area/ship/crew/dorm)
+"CX" = (
+/obj/effect/turf_decal/techfloor{
 	dir = 1
 	},
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
 	dir = 1
 	},
-/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2,
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/structure/cable{
-	icon_state = "2-8"
-	},
-/turf/open/floor/plasteel/dark,
-/area/ship/crew/canteen)
-"BL" = (
-/obj/machinery/power/smes/engineering,
-/obj/structure/railing{
-	dir = 1;
-	layer = 2.89
-	},
-/obj/effect/turf_decal/industrial,
-/obj/structure/cable{
-	icon_state = "0-8"
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+	dir = 1
 	},
-/turf/open/floor/engine/hull/interior,
-/area/ship/engineering)
-"BW" = (
-/obj/effect/turf_decal/trimline/transparent/blue/warning{
+/obj/effect/turf_decal/trimline/transparent/blue/filled/line{
 	dir = 1
 	},
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+/obj/effect/turf_decal/siding/thinplating{
 	dir = 1
 	},
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/plasteel/dark,
-/area/ship/hallway/central)
-"Cc" = (
-/obj/effect/turf_decal/box/corners{
-	dir = 1;
-	color = "#75A2BB"
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/security/armory)
+"CZ" = (
+/obj/structure/table,
+/obj/machinery/coffeemaker{
+	pixel_x = 3;
+	pixel_y = 13
 	},
-/obj/effect/turf_decal/box/corners{
-	dir = 4;
-	color = "#75A2BB"
+/obj/item/reagent_containers/food/drinks/mug{
+	pixel_x = -1;
+	pixel_y = 3
 	},
-/obj/effect/turf_decal/spline/fancy/opaque/black{
-	dir = 8
+/obj/item/reagent_containers/food/drinks/mug{
+	pixel_x = -7
 	},
-/obj/machinery/atmospherics/components/unary/tank/air{
-	dir = 8;
-	piping_layer = 2
+/obj/item/reagent_containers/food/drinks/mug{
+	pixel_x = 5
 	},
-/turf/open/floor/engine/hull/interior,
-/area/ship/engineering)
-"Cm" = (
-/obj/structure/sign/clip,
-/turf/closed/wall/mineral/plastitanium/nodiagonal,
-/area/ship/crew/crewthree)
-"Cn" = (
-/obj/item/cigbutt{
-	anchored = 1;
-	color = "#808080";
-	layer = 2;
-	pixel_x = -4;
-	pixel_y = 8
+/obj/structure/noticeboard{
+	pixel_y = 28
 	},
-/obj/effect/decal/fakelattice,
-/obj/structure/railing,
-/turf/open/floor/plasteel/elevatorshaft,
-/area/ship/hallway/central)
-"Cq" = (
-/obj/effect/turf_decal/spline/fancy/opaque/black/corner,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+/obj/effect/turf_decal/corner/opaque/black/half{
 	dir = 1
 	},
-/obj/structure/cable{
-	icon_state = "1-2"
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/canteen)
+"Dc" = (
+/obj/structure/table/reinforced,
+/obj/machinery/door/firedoor/border_only,
+/obj/effect/turf_decal/siding/thinplating/corner,
+/obj/machinery/door/poddoor/shutters{
+	id = "atlas_armory_desk"
 	},
-/obj/effect/turf_decal/siding/thinplating/dark/corner{
+/obj/machinery/door/window/brigdoor/northright{
+	req_one_access = list(19, 3)
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/security/armory)
+"Dd" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 10
+	},
+/turf/open/floor/plasteel,
+/area/ship/crew/office)
+"Do" = (
+/obj/effect/turf_decal/corner/opaque/blue/half{
+	dir = 1
+	},
+/obj/effect/turf_decal/corner/opaque/blue,
+/obj/machinery/jukebox/boombox,
+/obj/structure/table,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/white,
+/area/ship/crew/canteen)
+"Ds" = (
+/obj/effect/turf_decal/corner/opaque/blue/half{
 	dir = 1
 	},
-/obj/effect/turf_decal/trimline/transparent/blue/filled/arrow_ccw{
+/obj/effect/turf_decal/corner/opaque/blue,
+/obj/structure/chair{
 	dir = 8
 	},
-/turf/open/floor/plasteel/dark,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/white,
 /area/ship/crew/canteen)
-"Cr" = (
-/obj/machinery/power/port_gen/pacman{
-	anchored = 1
+"Dz" = (
+/obj/effect/turf_decal/box/white/corners{
+	color = "#B7D993";
+	dir = 1
 	},
-/obj/item/stack/sheet/mineral/plasma/twenty,
-/obj/structure/cable/yellow{
-	icon_state = "0-9"
+/obj/structure/janitorialcart,
+/obj/item/mop{
+	pixel_x = 5;
+	pixel_y = -4
+	},
+/obj/structure/sink{
+	pixel_x = 7;
+	pixel_y = 24
 	},
-/turf/open/floor/engine/hull/interior,
+/obj/machinery/light/small/directional/east,
+/turf/open/floor/plasteel/tech,
 /area/ship/engineering)
-"CM" = (
-/obj/structure/table/wood,
-/obj/item/paper_bin{
-	pixel_y = 3
+"DC" = (
+/obj/machinery/power/smes/shuttle/precharged,
+/obj/structure/cable/yellow{
+	icon_state = "0-8"
 	},
-/obj/item/pen{
-	pixel_y = 3
+/obj/effect/turf_decal/spline/fancy/opaque/black{
+	dir = 1
 	},
-/obj/item/reagent_containers/food/drinks/coffee{
-	pixel_x = 16;
-	pixel_y = 11
+/obj/structure/window/reinforced{
+	dir = 8
 	},
-/turf/open/floor/wood,
-/area/ship/crew/crewtwo)
-"CO" = (
-/turf/closed/wall/mineral/plastitanium/nodiagonal,
-/area/ship/medical)
-"CX" = (
-/obj/machinery/light/directional/west,
-/obj/machinery/button/door{
-	pixel_y = -23;
-	id = "atlas_med";
-	dir = 1;
-	name = "medbay shutters"
+/obj/effect/turf_decal/industrial/warning/green/full,
+/obj/machinery/door/poddoor/shutters{
+	dir = 4;
+	id = "atlas_engines_south"
 	},
-/obj/effect/turf_decal/siding/white{
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering)
+"DL" = (
+/obj/effect/turf_decal/corner/opaque/white/half{
+	dir = 4
+	},
+/obj/effect/turf_decal/corner/opaque/white/half{
+	dir = 1
+	},
+/obj/machinery/airalarm/directional/north,
+/turf/open/floor/plasteel,
+/area/ship/crew/office)
+"DM" = (
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
 	dir = 10
 	},
-/obj/effect/turf_decal/corner/transparent/blue/diagonal,
-/obj/machinery/iv_drip,
-/turf/open/floor/plasteel/white,
-/area/ship/medical)
-"CZ" = (
-/obj/effect/turf_decal/siding/thinplating/dark{
+/obj/effect/turf_decal/corner/transparent/lime/half{
 	dir = 1
 	},
-/obj/effect/turf_decal/spline/fancy/opaque/black/corner{
-	dir = 8
+/obj/structure/rack,
+/obj/item/geiger_counter{
+	pixel_x = -4;
+	pixel_y = 9
 	},
-/obj/structure/railing,
-/turf/open/floor/pod/dark,
-/area/ship/crew/canteen)
-"Da" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
-/obj/effect/decal/cleanable/dirt/dust,
+/obj/item/geiger_counter{
+	pixel_x = 4;
+	pixel_y = 1
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering)
+"DP" = (
+/obj/machinery/door/firedoor,
+/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/plasteel/tech,
-/area/ship/cargo)
-"Do" = (
-/obj/structure/chair{
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/hallway/central)
+"DX" = (
+/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer3{
 	dir = 1
 	},
-/turf/open/floor/plasteel/grimy,
-/area/ship/crew/canteen)
-"Dq" = (
-/obj/effect/turf_decal/corner/transparent/blue/diagonal,
-/obj/structure/cable{
-	icon_state = "4-8"
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/light/small/directional/south,
+/obj/machinery/portable_atmospherics/canister/nitrogen,
+/obj/machinery/atmospherics/pipe/simple/general/hidden/layer1{
+	dir = 5
 	},
-/obj/effect/turf_decal/spline/fancy/opaque/white,
-/obj/structure/mirror{
-	pixel_y = 28
+/obj/effect/turf_decal/corner/transparent/lime/half,
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering)
+"Ea" = (
+/obj/effect/turf_decal/techfloor{
+	dir = 1
 	},
-/obj/effect/turf_decal/siding/white{
+/obj/effect/turf_decal/spline/plain/opaque/grey{
 	dir = 1
 	},
-/turf/open/floor/plasteel/white,
-/area/ship/medical)
-"DL" = (
-/obj/machinery/photocopier,
-/turf/open/floor/plasteel/telecomms_floor,
-/area/ship/bridge)
-"Ea" = (
-/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/turf_decal/trimline/opaque/beige/filled/line,
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
 "Ej" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 9
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 9
+/obj/effect/turf_decal/corner_steel_grid{
+	dir = 8
 	},
-/obj/structure/cable{
-	icon_state = "1-2"
+/obj/effect/turf_decal/box/white/corners{
+	dir = 8;
+	color = "#CBB1CA"
 	},
-/obj/machinery/light/directional/east,
-/turf/open/floor/plasteel/dark,
-/area/ship/crew)
-"Eo" = (
-/obj/structure/railing{
-	dir = 1;
-	layer = 2.89
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 6
 	},
-/obj/machinery/autolathe,
-/obj/machinery/light/directional/west,
-/obj/item/stack/sheet/glass/twenty,
-/obj/item/stack/sheet/metal/twenty,
-/turf/open/floor/plasteel/tech,
-/area/ship/engineering)
-"Es" = (
-/obj/structure/curtain/cloth/grey,
-/obj/effect/turf_decal/siding/wood/corner{
+/turf/open/floor/pod/light,
+/area/ship/cargo)
+"Ek" = (
+/obj/effect/turf_decal/corner/transparent/blue/three_quarters{
 	dir = 8
 	},
-/obj/structure/cable{
-	icon_state = "4-8"
+/obj/effect/turf_decal/siding/white{
+	dir = 5
 	},
-/obj/machinery/door/firedoor/border_only{
+/obj/effect/turf_decal/spline/fancy/opaque/white{
 	dir = 8
 	},
-/obj/machinery/door/firedoor/border_only{
-	dir = 4
-	},
-/turf/open/floor/plasteel/dark,
-/area/ship/crew)
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/light/directional/east,
+/turf/open/floor/plasteel/white,
+/area/ship/medical)
 "Ey" = (
 /obj/effect/decal/fakelattice{
 	icon_state = "lattice-23"
@@ -3061,124 +4228,97 @@
 /turf/open/floor/plating,
 /area/ship/external/dark)
 "Ez" = (
-/obj/machinery/power/smes/shuttle/precharged,
-/obj/structure/cable/yellow{
-	icon_state = "0-8"
+/obj/structure/cable{
+	icon_state = "5-8"
 	},
-/obj/effect/turf_decal/spline/fancy/opaque/black{
-	dir = 1
+/obj/structure/cable{
+	icon_state = "4-8"
 	},
-/obj/machinery/door/poddoor/shutters/preopen{
-	dir = 8;
-	id = "atlas_engi_lockdown"
+/obj/effect/turf_decal/corner/opaque/black/half,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
 	},
-/obj/structure/window/reinforced{
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 8
 	},
-/turf/open/floor/plasteel/tech,
-/area/ship/engineering)
-"EB" = (
-/obj/machinery/light/directional/north,
-/turf/open/floor/carpet/nanoweave/blue,
-/area/ship/crew/crewtwo)
-"ED" = (
-/obj/item/kirbyplants{
-	icon_state = "plant-02";
-	pixel_x = -7
-	},
-/obj/structure/extinguisher_cabinet/directional/south,
-/obj/effect/turf_decal/corner_steel_grid/full,
-/obj/structure/railing{
+/obj/structure/chair{
 	dir = 1
 	},
-/obj/machinery/light_switch{
-	dir = 4;
-	pixel_x = -23
+/obj/effect/turf_decal/corner/opaque/blue/border,
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/canteen)
+"EB" = (
+/obj/structure/chair/office,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/turf_decal/corner/opaque/white/bordercorner{
+	dir = 1
 	},
-/turf/open/floor/plasteel/telecomms_floor,
-/area/ship/bridge)
-"EH" = (
-/obj/structure/filingcabinet/double/grey{
-	dir = 1;
-	pixel_y = -3
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+	dir = 1
 	},
-/obj/item/folder,
-/obj/item/folder/blue,
-/obj/item/folder/red,
-/obj/item/folder/white,
-/obj/item/folder/yellow,
-/turf/open/floor/wood,
-/area/ship/crew/crewtwo)
+/turf/open/floor/plasteel,
+/area/ship/crew/office)
 "EJ" = (
-/obj/item/kirbyplants{
-	icon_state = "plant-02"
-	},
-/obj/machinery/light/directional/west,
-/obj/effect/turf_decal/siding/thinplating/dark{
-	dir = 9
+/obj/effect/turf_decal/corner/opaque/blue/border,
+/obj/effect/turf_decal/industrial/warning/green/corner{
+	dir = 4
 	},
+/obj/structure/chair/handrail,
+/obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/plasteel/dark,
 /area/ship/hallway/central)
 "EO" = (
-/obj/machinery/porta_turret/ship/clip{
-	id = "atlas";
-	dir = 5
-	},
-/turf/closed/wall/mineral/plastitanium/nodiagonal,
-/area/ship/security)
-"EP" = (
-/obj/effect/turf_decal/spline/fancy/opaque/black,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+/obj/effect/turf_decal/trimline/transparent/blue/filled/line{
 	dir = 4
 	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/effect/turf_decal/trimline/transparent/blue/filled/arrow_ccw{
-	dir = 1
-	},
-/turf/open/floor/plasteel/dark,
-/area/ship/crew/canteen)
-"ES" = (
-/obj/effect/decal/cleanable/dirt,
 /obj/effect/turf_decal/trimline/transparent/blue/filled/line{
-	dir = 4
+	dir = 8
 	},
-/obj/effect/turf_decal/spline/fancy/opaque/black{
+/obj/effect/turf_decal/siding/thinplating{
 	dir = 8
 	},
-/obj/effect/turf_decal/siding/thinplating/dark{
+/obj/effect/turf_decal/siding/thinplating{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 1
-	},
+/obj/machinery/power/apc/auto_name/directional/north,
 /obj/structure/cable{
-	icon_state = "1-2"
+	icon_state = "0-2"
 	},
-/obj/machinery/computer/security/telescreen/entertainment{
-	pixel_x = 30
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
+/obj/machinery/light_switch{
+	pixel_y = 22;
+	pixel_x = 12
 	},
-/turf/open/floor/plasteel/dark,
-/area/ship/crew/canteen)
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/security/armory)
 "EZ" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 5
+	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
 	},
-/obj/structure/cable{
-	icon_state = "1-8"
+/turf/open/floor/plasteel/dark,
+/area/ship/security/armory)
+"Fh" = (
+/obj/effect/turf_decal/spline/fancy/opaque/grey{
+	dir = 8
 	},
-/obj/effect/turf_decal/spline/fancy/opaque/black{
+/obj/effect/turf_decal/corner/opaque/black/half,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
 	},
-/turf/open/floor/plasteel/stairs/modern/dark{
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/effect/turf_decal/siding/thinplating{
 	dir = 4
 	},
-/area/ship/bridge)
+/turf/open/floor/plasteel/mono,
+/area/ship/crew/canteen)
 "Fu" = (
 /obj/effect/decal/fakelattice{
 	icon_state = "lattice-21"
@@ -3186,1480 +4326,1607 @@
 /obj/structure/lattice/catwalk,
 /turf/open/floor/plating,
 /area/ship/external/dark)
-"Fv" = (
-/obj/effect/turf_decal/trimline/transparent/blue/warning,
-/obj/effect/turf_decal/industrial/warning{
-	dir = 8
+"FB" = (
+/obj/effect/turf_decal/industrial/warning/green{
+	dir = 1
 	},
-/turf/open/floor/plasteel/dark,
-/area/ship/hallway/central)
-"FF" = (
-/obj/effect/turf_decal/spline/fancy/opaque/black{
+/turf/open/floor/engine/hull/reinforced,
+/area/ship/engineering)
+"FC" = (
+/obj/effect/turf_decal/corner/opaque/beige/border{
 	dir = 1
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+/obj/effect/turf_decal/corner/opaque/white/bordercorner{
 	dir = 8
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 4
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
+/obj/effect/turf_decal/corner/opaque/beige/bordercorner,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
 /turf/open/floor/plasteel/dark,
-/area/ship/crew/canteen)
-"FI" = (
+/area/ship/crew/dorm/commad)
+"FD" = (
 /obj/structure/table,
-/obj/item/desk_flag/trans{
-	pixel_x = -5;
-	pixel_y = 4
-	},
-/obj/item/toy/cards/deck{
-	pixel_x = 6;
-	pixel_y = 9
+/obj/effect/turf_decal/corner/opaque/blue/half,
+/obj/effect/turf_decal/corner/opaque/blue{
+	dir = 1
 	},
-/turf/open/floor/plasteel/grimy,
+/turf/open/floor/plasteel/white,
 /area/ship/crew/canteen)
-"FN" = (
-/turf/closed/wall/mineral/plastitanium/nodiagonal,
-/area/ship/crew/crewthree)
-"FO" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+"FE" = (
+/obj/structure/chair/plastic{
+	dir = 4
+	},
+/obj/structure/window/reinforced/tinted{
 	dir = 8
 	},
-/obj/structure/cable{
-	icon_state = "1-8"
+/obj/machinery/button/door{
+	pixel_x = 7;
+	pixel_y = 20;
+	id = "atlas_interview";
+	name = "privacy shutters button"
 	},
-/obj/structure/cable{
-	icon_state = "2-8"
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/crew/office)
+"FF" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 8
 	},
-/obj/effect/turf_decal/spline/fancy/opaque/black{
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
 	},
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/turf/open/floor/plasteel/stairs/modern/dark{
-	dir = 4
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/turf_decal/trimline/opaque/beige/filled/line{
+	dir = 8
+	},
+/obj/structure/cable{
+	icon_state = "1-8"
 	},
+/turf/open/floor/plasteel,
 /area/ship/bridge)
-"FQ" = (
-/obj/effect/turf_decal/corner/transparent/blue/diagonal,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/effect/turf_decal/spline/fancy/opaque/white{
-	dir = 4
+"FN" = (
+/obj/structure/table/emptycomputer{
+	icon_state = "emptycomputer-right"
 	},
-/obj/effect/landmark/start/medical_doctor,
-/obj/effect/turf_decal/siding/white{
-	dir = 8
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/item/radio/intercom/wideband{
+	dir = 1;
+	pixel_x = 2;
+	pixel_y = 9
 	},
-/turf/open/floor/plasteel/white,
-/area/ship/medical)
-"Gi" = (
-/obj/structure/sink{
-	dir = 4;
-	pixel_x = -12;
-	pixel_y = 6
+/obj/item/reagent_containers/food/drinks/coffee/empty{
+	pixel_x = -7;
+	pixel_y = 20;
+	icon_state = "coffee"
 	},
-/turf/open/floor/plasteel/dark,
-/area/ship/security)
-"Gj" = (
-/obj/effect/turf_decal/corner_steel_grid{
-	dir = 5
+/obj/machinery/button/door{
+	pixel_x = -13;
+	pixel_y = -1;
+	id = "atlas_bridgelockdown";
+	name = "bridge lockdown button";
+	color = "#FFD6D6"
 	},
-/obj/effect/turf_decal/box/corners{
-	dir = 8;
-	color = "#75A2BB"
+/obj/machinery/button/door{
+	pixel_x = -13;
+	pixel_y = 7;
+	id = "atlas_bridge";
+	name = "bridge shutters button"
 	},
-/obj/structure/table,
-/obj/structure/bedsheetbin,
-/turf/open/floor/plasteel/tech/grid,
-/area/ship/crew/canteen)
-"Gt" = (
-/obj/structure/bed/double,
-/obj/item/bedsheet/double/blue,
-/turf/open/floor/carpet/blue,
-/area/ship/crew/crewthree)
-"GU" = (
-/obj/machinery/porta_turret/ship/clip{
-	id = "atlas";
-	dir = 6
+/obj/machinery/turretid/ship{
+	id = "atlas_turrets";
+	pixel_y = 28
 	},
-/turf/closed/wall/mineral/plastitanium/nodiagonal,
-/area/ship/crew/crewtwo)
-"Hf" = (
-/turf/open/floor/wood,
-/area/ship/crew/crewtwo)
-"Hg" = (
-/obj/machinery/airalarm/directional/west,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/turf/open/floor/plasteel,
+/area/ship/bridge)
+"FQ" = (
+/obj/effect/turf_decal/corner/transparent/blue/mono,
+/obj/structure/curtain,
+/obj/structure/closet/crate/medical,
+/obj/item/roller,
+/obj/item/roller,
+/obj/item/roller,
+/obj/item/storage/firstaid/medical,
+/obj/item/storage/firstaid/regular,
+/obj/item/storage/firstaid/brute,
+/obj/item/reagent_containers/glass/bottle/formaldehyde,
+/obj/effect/mapping_helpers/crate_shelve,
 /obj/structure/cable{
-	icon_state = "2-4"
+	icon_state = "0-4"
 	},
-/obj/structure/cable{
-	icon_state = "1-2"
+/turf/open/floor/plasteel/mono/white,
+/area/ship/medical)
+"FR" = (
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 4
 	},
-/turf/open/floor/plasteel/tech,
-/area/ship/cargo)
-"Hh" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+/obj/effect/turf_decal/corner/opaque/black/half{
 	dir = 4
 	},
-/obj/machinery/button/door{
-	id = "atlas_engi_lockdown";
-	dir = 4;
-	pixel_y = 2;
-	name = "engineering shutters";
-	pixel_x = -24
+/obj/effect/turf_decal/corner/opaque/blue/border{
+	dir = 8
 	},
-/turf/open/floor/plasteel/tech,
-/area/ship/engineering)
-"Hl" = (
-/obj/structure/reagent_dispensers/fueltank,
-/obj/machinery/light/directional/west,
-/turf/open/floor/engine/hull/interior,
-/area/ship/engineering)
-"Hu" = (
-/obj/machinery/door/poddoor{
-	id = "atlas_cargo"
+/obj/effect/turf_decal/trimline/opaque/blue/warning{
+	dir = 4
 	},
-/obj/effect/turf_decal/industrial/warning,
-/turf/open/floor/plating,
-/area/ship/cargo)
-"HW" = (
-/turf/closed/wall/mineral/plastitanium/nodiagonal,
-/area/ship/crew)
-"HX" = (
-/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/obj/effect/turf_decal/industrial/warning/green,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel,
 /area/ship/hallway/central)
-"Ig" = (
-/obj/effect/turf_decal/siding/thinplating/dark{
+"FT" = (
+/obj/effect/turf_decal/spline/fancy/opaque/grey{
 	dir = 1
 	},
-/obj/structure/railing,
-/obj/effect/turf_decal/trimline/transparent/blue/corner{
-	dir = 1
+/obj/effect/turf_decal/corner/opaque/black/half,
+/obj/structure/cable{
+	icon_state = "5-10"
 	},
-/turf/open/floor/pod/dark,
+/obj/effect/turf_decal/siding/thinplating,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/turf/open/floor/plasteel/mono,
 /area/ship/crew/canteen)
-"Ir" = (
-/obj/effect/turf_decal/spline/fancy/opaque/black,
-/obj/effect/turf_decal/minutemen/edge,
-/obj/structure/cable{
-	icon_state = "4-8"
+"FY" = (
+/obj/effect/turf_decal/corner_steel_grid{
+	dir = 4
 	},
-/turf/open/floor/plasteel/dark,
-/area/ship/bridge)
-"IK" = (
-/obj/effect/turf_decal/box/corners{
+/obj/effect/turf_decal/box/white/corners{
 	dir = 4;
-	color = "#75A2BB"
-	},
-/obj/effect/turf_decal/box/corners{
-	color = "#75A2BB"
-	},
-/obj/structure/closet/crate,
-/obj/item/storage/box/emptysandbags,
-/obj/item/storage/box/emptysandbags,
-/obj/item/shovel,
-/obj/item/shovel,
-/obj/item/pickaxe,
-/obj/item/pickaxe,
-/obj/item/storage/bag/ore,
-/obj/item/storage/bag/ore,
-/obj/machinery/light/directional/east,
-/obj/structure/crate_shelf,
-/turf/open/floor/pod/dark,
+	color = "#CBB1CA"
+	},
+/turf/open/floor/pod/light,
 /area/ship/cargo)
-"IP" = (
-/obj/structure/table/wood,
-/obj/item/melee/knife/letter_opener{
-	pixel_x = 9;
-	pixel_y = -6
+"Gc" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+	dir = 4
+	},
+/obj/structure/catwalk/over,
+/turf/open/floor/plating,
+/area/ship/engineering)
+"Gj" = (
+/obj/machinery/door/firedoor/border_only{
+	dir = 4
 	},
-/obj/item/folder/biscuit/unsealed{
-	pixel_x = -4
+/obj/machinery/door/firedoor/border_only{
+	dir = 8
 	},
-/obj/item/papercutter{
-	pixel_x = 5;
-	pixel_y = 5
+/obj/machinery/door/airlock/grunge{
+	dir = 4;
+	name = "Engineering"
 	},
-/turf/open/floor/wood,
-/area/ship/crew/crewtwo)
-"IR" = (
-/obj/item/kirbyplants{
-	icon_state = "plant-02"
+/obj/effect/turf_decal/industrial/warning/green{
+	dir = 4
 	},
-/obj/machinery/light/directional/west,
-/obj/effect/turf_decal/siding/thinplating/dark{
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering)
+"Gl" = (
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
 	dir = 10
 	},
-/turf/open/floor/plasteel/dark,
-/area/ship/hallway/central)
-"IY" = (
-/obj/effect/turf_decal/spline/fancy/opaque/black,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 4
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+	dir = 1
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 4
+/obj/structure/cable{
+	icon_state = "2-8"
 	},
 /obj/structure/cable{
-	icon_state = "4-8"
+	icon_state = "2-4"
 	},
-/turf/open/floor/plasteel/dark,
-/area/ship/crew/canteen)
-"Jb" = (
-/obj/machinery/door/airlock/command{
-	dir = 4;
-	name = "Bridge";
-	req_one_access = list(19,3)
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+	dir = 1
 	},
-/obj/effect/turf_decal/corner_techfloor_gray{
-	dir = 9
+/obj/effect/turf_decal/corner/transparent/lime/half{
+	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering)
+"Gr" = (
+/obj/effect/turf_decal/techfloor{
 	dir = 4
 	},
-/obj/machinery/door/firedoor/border_only{
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 8
 	},
-/obj/machinery/door/firedoor/border_only{
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
 	},
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/machinery/door/poddoor/shutters/preopen{
-	dir = 8;
-	id = "atlas_bridge_lockdown"
-	},
-/turf/open/floor/plasteel/telecomms_floor,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel,
 /area/ship/bridge)
-"Je" = (
-/turf/open/floor/engine/hull/reinforced,
-/area/ship/external/dark)
-"JL" = (
-/obj/effect/turf_decal/corner/transparent/blue/diagonal,
-/obj/effect/turf_decal/spline/fancy/opaque/white{
+"Gs" = (
+/obj/effect/turf_decal/industrial/warning/green/corner,
+/obj/effect/turf_decal/corner/opaque/blue/border{
 	dir = 1
 	},
-/obj/machinery/holopad/emergency/medical,
-/turf/open/floor/plasteel/white,
-/area/ship/medical)
-"JR" = (
-/obj/structure/cable{
-	icon_state = "5-8"
+/obj/structure/chair/handrail{
+	dir = 1
 	},
-/turf/open/floor/plasteel/tech,
-/area/ship/engineering)
-"JU" = (
-/obj/effect/turf_decal/trimline/transparent/blue/warning{
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/dark,
+/area/ship/hallway/central)
+"Gt" = (
+/obj/effect/turf_decal/siding/thinplating/dark{
 	dir = 1
 	},
-/obj/effect/turf_decal/siding/thinplating/dark,
-/obj/structure/chair{
+/obj/effect/turf_decal/corner/opaque/black/half{
 	dir = 1
 	},
-/obj/item/radio/intercom/directional/south,
-/turf/open/floor/plasteel/dark,
-/area/ship/hallway/central)
-"JV" = (
-/obj/item/kirbyplants{
-	icon_state = "plant-02";
-	pixel_y = 16;
-	pixel_x = -6
+/obj/effect/turf_decal/trimline/opaque/blue/warning{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 9
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 9
 	},
-/obj/machinery/power/apc/auto_name/directional/north,
 /obj/structure/cable{
-	icon_state = "0-2"
+	icon_state = "1-8"
 	},
-/obj/effect/turf_decal/corner_steel_grid/full{
-	dir = 8
+/obj/effect/turf_decal/corner/opaque/white/bordercorner,
+/obj/effect/turf_decal/corner/transparent/blue/bordercorner,
+/turf/open/floor/plasteel/dark,
+/area/ship/hallway/central)
+"Gv" = (
+/obj/effect/turf_decal/corner/opaque/white/half,
+/obj/effect/turf_decal/corner/opaque/white/half{
+	dir = 1
 	},
-/obj/structure/railing,
-/obj/machinery/light_switch{
-	dir = 4;
-	pixel_x = -23
+/obj/structure/table/reinforced,
+/obj/structure/sink/chem{
+	pixel_y = 3
 	},
-/turf/open/floor/plasteel/telecomms_floor,
-/area/ship/bridge)
-"Kc" = (
-/obj/effect/decal/fakelattice{
-	icon_state = "lattice-203"
+/obj/structure/mirror{
+	pixel_y = 28
 	},
-/obj/structure/lattice/catwalk,
-/obj/item/toy/plush/moth/royal{
-	pixel_x = 9;
-	pixel_y = 8;
-	name = "Specialist Aloe";
-	desc = "An adorable mothperson plushy. Judging by a tag attached just beneath its left leg, it is part of the Colonial League's armed forces."
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/light/directional/east,
+/turf/open/floor/plasteel/white,
+/area/ship/crew/toilet)
+"GM" = (
+/obj/structure/cable{
+	icon_state = "1-2"
 	},
-/obj/item/clothing/head/clip{
-	pixel_x = 9;
-	pixel_y = 18
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+	dir = 1
 	},
-/obj/item/reagent_containers/food/drinks/coffee{
-	pixel_x = 5;
-	list_reagents = list(/datum/reagent/consumable/ice=30)
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/effect/turf_decal/corner/transparent/lime/half{
+	dir = 4
 	},
-/turf/open/floor/plating,
-/area/ship/external/dark)
-"Kf" = (
-/obj/structure/chair/plastic{
+/obj/effect/turf_decal/industrial/warning/green,
+/obj/structure/railing/thin/corner{
 	dir = 8;
-	pixel_y = 9;
-	pixel_x = 7
-	},
-/obj/effect/decal/cleanable/confetti,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/effect/turf_decal/spline/fancy/opaque/black{
-	dir = 1
+	layer = 3.081
 	},
-/obj/machinery/atmospherics/components/binary/pump/layer2{
-	dir = 8
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 9
 	},
-/obj/structure/catwalk/over,
-/turf/open/floor/plating,
+/turf/open/floor/plasteel/tech,
 /area/ship/engineering)
-"Km" = (
-/obj/machinery/computer/helm/viewscreen/directional/south,
-/turf/open/floor/carpet/nanoweave/blue,
-/area/ship/crew/crewtwo)
-"KB" = (
-/obj/effect/turf_decal/trimline/transparent/blue/line,
-/obj/machinery/light/directional/south,
-/obj/effect/turf_decal/siding/thinplating/dark,
-/turf/open/floor/plasteel/dark,
-/area/ship/crew/canteen)
-"Ld" = (
-/obj/item/caution{
-	pixel_x = 6
+"GN" = (
+/obj/structure/cable{
+	icon_state = "2-8"
 	},
-/obj/effect/decal/cleanable/oil/slippery{
-	icon_state = "floor5";
-	pixel_x = -12;
-	pixel_y = 1
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+	dir = 4
 	},
-/obj/item/wirecutters{
-	pixel_x = -12;
-	pixel_y = -8
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+	dir = 4
 	},
-/obj/item/crowbar/large{
-	pixel_y = 14
+/obj/effect/turf_decal/corner/opaque/black/half,
+/obj/effect/turf_decal/corner/opaque/blue/border,
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/canteen)
+"GU" = (
+/obj/machinery/porta_turret/ship/clip{
+	id = "atlas_turrets";
+	dir = 6
+	},
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/ship/crew/office)
+"Hu" = (
+/obj/effect/turf_decal/industrial/warning/green,
+/obj/machinery/door/firedoor/heavy,
+/obj/machinery/door/poddoor{
+	id = "atlas_cargo"
 	},
 /turf/open/floor/plating,
 /area/ship/cargo)
-"Ln" = (
-/obj/effect/turf_decal/trimline/transparent/blue/warning{
-	dir = 1
-	},
-/obj/effect/turf_decal/siding/thinplating/dark,
-/obj/structure/chair{
-	dir = 1
-	},
-/obj/machinery/light/directional/south,
-/turf/open/floor/plasteel/dark,
+"HW" = (
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/ship/crew/dorm)
+"HX" = (
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/ship/hallway/central)
-"Lp" = (
-/obj/structure/table/reinforced,
-/obj/item/book/manual/wiki/command{
-	pixel_y = 6;
-	pixel_x = -3
+"Ic" = (
+/obj/effect/turf_decal/minutemen/middle,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
 	},
-/obj/item/book/manual/wiki/piloting{
-	pixel_x = 4;
-	pixel_y = 2
+/obj/structure/cable{
+	icon_state = "0-8"
 	},
-/obj/machinery/light/directional/south,
-/turf/open/floor/plasteel/telecomms_floor,
-/area/ship/bridge)
-"Lw" = (
-/obj/effect/turf_decal/industrial/warning{
-	dir = 1
+/obj/structure/cable{
+	icon_state = "6-8"
 	},
-/obj/effect/turf_decal/industrial/stand_clear/white,
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/button/door{
-	id = "atlas_cargo";
-	dir = 4;
-	pixel_x = -23;
-	pixel_y = 6;
-	name = "cargo bay control"
+/obj/structure/cable{
+	icon_state = "5-8"
 	},
+/obj/machinery/power/ship_gravity,
+/obj/structure/catwalk/over,
 /obj/structure/cable{
-	icon_state = "1-2"
+	icon_state = "4-8"
 	},
-/obj/machinery/button/shieldwallgen{
-	dir = 4;
-	pixel_y = -4;
-	pixel_x = -20;
-	id = "atlas_holo"
+/turf/open/floor/plating,
+/area/ship/engineering)
+"Ie" = (
+/obj/effect/turf_decal/corner/opaque/blue/border,
+/obj/effect/turf_decal/corner/opaque/white/bordercorner{
+	dir = 4
 	},
-/turf/open/floor/plasteel/tech,
-/area/ship/cargo)
-"LE" = (
-/obj/structure/grille,
-/turf/open/floor/engine/hull/reinforced,
-/area/ship/external/dark)
-"LH" = (
-/obj/structure/filingcabinet/double/grey{
-	pixel_y = 14
+/obj/effect/turf_decal/corner/opaque/blue/bordercorner{
+	dir = 1
 	},
-/obj/item/folder,
-/obj/item/folder/blue,
-/obj/item/folder/red,
-/obj/item/folder/white,
-/obj/item/folder/yellow,
-/obj/item/food/grown/tobacco,
-/obj/item/food/grown/tobacco,
-/obj/item/food/grown/tobacco,
-/obj/item/food/grown/tobacco,
-/turf/open/floor/wood,
-/area/ship/crew/crewthree)
-"LM" = (
-/turf/closed/wall/mineral/plastitanium/nodiagonal,
-/area/ship/bridge)
-"Ml" = (
-/obj/effect/turf_decal/industrial/warning{
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
 	dir = 1
 	},
-/obj/effect/turf_decal/industrial/stand_clear/white,
-/obj/machinery/light/directional/east,
-/obj/structure/cable{
-	icon_state = "1-2"
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/dorm)
+"Ig" = (
+/obj/effect/turf_decal/corner/opaque/black/half{
+	dir = 1
 	},
-/turf/open/floor/plasteel/tech,
-/area/ship/cargo)
-"Mq" = (
-/obj/structure/closet/crate/bin{
-	pixel_y = 11;
-	pixel_x = -10
+/obj/effect/turf_decal/trimline/transparent/blue/filled/line{
+	dir = 1
 	},
-/obj/effect/turf_decal/corner_steel_grid{
-	dir = 9
+/obj/structure/reagent_dispensers/water_cooler{
+	pixel_x = 12;
+	pixel_y = 9;
+	density = 0
 	},
-/turf/open/floor/plasteel/telecomms_floor,
-/area/ship/bridge)
-"Mu" = (
-/obj/effect/landmark/start/station_engineer,
-/obj/structure/cable/yellow{
-	icon_state = "2-5"
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/canteen)
+"Ij" = (
+/obj/effect/turf_decal/corner/opaque/grey/half,
+/obj/effect/turf_decal/spline/fancy/opaque/grey{
+	dir = 1
+	},
+/obj/effect/turf_decal/corner/opaque/black/half{
+	dir = 1
 	},
-/obj/structure/cable/yellow{
-	icon_state = "5-6"
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+	dir = 8
 	},
-/obj/structure/catwalk/over,
-/turf/open/floor/plating,
-/area/ship/engineering)
-"My" = (
-/obj/machinery/power/terminal{
+/obj/effect/turf_decal/siding/thinplating/corner,
+/obj/effect/turf_decal/siding/thinplating/corner{
 	dir = 8
 	},
 /obj/structure/cable{
-	icon_state = "0-4"
+	icon_state = "1-2"
 	},
-/obj/effect/turf_decal/spline/fancy/opaque/black{
+/turf/open/floor/plasteel/mono,
+/area/ship/crew/canteen)
+"Iq" = (
+/obj/structure/catwalk/over/plated_catwalk/dark,
+/obj/machinery/computer/security{
+	icon_state = "computer-right";
+	dir = 8;
+	pixel_x = 7;
+	network = list("atlas")
+	},
+/turf/open/floor/plasteel/telecomms_floor,
+/area/ship/bridge)
+"Ir" = (
+/obj/effect/turf_decal/corner/transparent/blue/three_quarters{
 	dir = 1
 	},
-/turf/open/floor/plasteel/tech,
-/area/ship/engineering)
-"MC" = (
-/obj/effect/turf_decal/siding/thinplating/dark{
-	dir = 5
+/obj/effect/turf_decal/siding/white{
+	dir = 10
 	},
-/obj/machinery/suit_storage_unit/minutemen,
-/obj/effect/turf_decal/box{
-	color = "#75A2BB"
+/obj/effect/turf_decal/spline/fancy/opaque/white{
+	dir = 4
 	},
-/turf/open/floor/pod/dark,
-/area/ship/crew/canteen)
-"MH" = (
-/obj/machinery/power/port_gen/pacman{
+/obj/machinery/iv_drip{
+	pixel_x = -9;
+	pixel_y = 9;
 	anchored = 1
 	},
-/obj/structure/cable/yellow,
-/turf/open/floor/engine/hull/interior,
-/area/ship/engineering)
-"MO" = (
-/obj/structure/chair{
+/obj/structure/bed/pod{
 	dir = 4
 	},
-/obj/effect/turf_decal/siding/thinplating/dark{
+/obj/machinery/light/directional/west,
+/obj/machinery/button/door{
+	pixel_x = 1;
+	pixel_y = -20;
+	id = "atlas_medical";
+	name = "privacy shutters button";
 	dir = 1
 	},
-/turf/open/floor/plasteel/dark,
-/area/ship/hallway/central)
-"MQ" = (
-/obj/structure/chair/comfy/beige,
-/turf/open/floor/wood,
-/area/ship/crew/crewtwo)
-"Ni" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 10
+/turf/open/floor/plasteel/white,
+/area/ship/medical)
+"IO" = (
+/obj/machinery/cryopod{
+	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 10
+/obj/effect/turf_decal/techfloor{
+	dir = 9
 	},
-/obj/structure/cable{
-	icon_state = "1-8"
+/obj/effect/turf_decal/spline/plain/opaque/green{
+	dir = 8
 	},
-/obj/effect/turf_decal/siding/thinplating/dark/corner{
+/obj/effect/turf_decal/spline/plain/opaque/green{
 	dir = 1
 	},
-/obj/effect/turf_decal/siding/thinplating/dark/corner{
+/obj/machinery/light/small/directional/west,
+/obj/structure/railing/thin,
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/crew/cryo)
+"IR" = (
+/obj/effect/turf_decal/corner/opaque/blue/half{
+	dir = 1
+	},
+/obj/effect/turf_decal/corner/opaque/blue/half{
 	dir = 4
 	},
-/turf/open/floor/plasteel/dark,
-/area/ship/crew/crewtwo)
-"No" = (
-/obj/machinery/mech_bay_recharge_port{
-	dir = 1
+/obj/structure/chair{
+	dir = 8
 	},
-/obj/effect/turf_decal/industrial/hatch/blue,
-/turf/open/floor/pod/dark,
-/area/ship/cargo)
-"NE" = (
-/obj/structure/closet/emcloset/anchored,
-/obj/effect/turf_decal/corner_steel_grid{
-	dir = 6
+/obj/structure/cable{
+	icon_state = "1-4"
 	},
-/obj/effect/turf_decal/box/corners{
-	dir = 1;
-	color = "#75A2BB"
+/obj/structure/cable{
+	icon_state = "1-2"
 	},
-/obj/effect/turf_decal/box/corners{
-	dir = 8;
-	color = "#75A2BB"
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+	dir = 8
 	},
-/obj/effect/turf_decal/spline/fancy/opaque/black{
-	dir = 1
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+	dir = 8
 	},
-/turf/open/floor/pod/dark,
+/turf/open/floor/plasteel/white,
 /area/ship/crew/canteen)
-"NY" = (
-/obj/structure/chair/comfy/blue{
-	dir = 1
+"IY" = (
+/obj/structure/platform/ship_four{
+	dir = 8
 	},
-/turf/open/floor/wood,
-/area/ship/crew/crewthree)
-"Ob" = (
-/obj/structure/sign/clip,
-/turf/closed/wall/mineral/plastitanium/nodiagonal,
-/area/ship/crew/crewtwo)
-"Oj" = (
-/obj/structure/sign/number/random,
-/turf/closed/wall/mineral/plastitanium/nodiagonal,
-/area/ship/crew/crewthree)
-"Ot" = (
-/obj/structure/catwalk/over/plated_catwalk/dark,
-/obj/machinery/light_switch{
-	dir = 4;
-	pixel_x = -20
+/turf/open/floor/engine/hull/reinforced,
+/area/ship/external/dark)
+"Jb" = (
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 8
 	},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+/obj/effect/turf_decal/corner/opaque/black/half{
 	dir = 8
 	},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+/obj/effect/turf_decal/trimline/opaque/blue/warning{
 	dir = 8
 	},
-/obj/structure/cable{
-	icon_state = "2-4"
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
 	},
-/obj/structure/cable{
-	icon_state = "1-4"
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 8
 	},
-/turf/open/floor/plating,
-/area/ship/hallway/central)
-"OA" = (
-/obj/structure/catwalk/over,
 /obj/structure/cable{
-	icon_state = "1-2"
+	icon_state = "4-8"
 	},
-/obj/machinery/light/directional/east,
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+/obj/effect/turf_decal/trimline/opaque/beige/filled/line{
 	dir = 4
 	},
-/turf/open/floor/plating,
-/area/ship/engineering)
-"OQ" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/turf/open/floor/plasteel/grimy,
-/area/ship/crew/canteen)
-"OV" = (
-/obj/effect/turf_decal/rechargefloor,
-/obj/item/stack/ore/salvage/scraptitanium{
-	pixel_x = -4;
-	pixel_y = 6
+/turf/open/floor/plasteel,
+/area/ship/hallway/central)
+"Je" = (
+/turf/open/floor/engine/hull/reinforced,
+/area/ship/external/dark)
+"Jn" = (
+/obj/effect/turf_decal/corner_steel_grid{
+	dir = 4
 	},
-/obj/item/stack/ore/salvage/scrapsilver{
-	pixel_x = 4;
-	pixel_y = -8
+/obj/effect/turf_decal/box/white/corners{
+	dir = 4;
+	color = "#CBB1CA"
 	},
-/obj/structure/mecha_wreckage/ripley/clip,
-/obj/machinery/light/directional/west,
-/obj/effect/turf_decal/box/corners{
-	dir = 1;
-	color = "#75A2BB"
+/obj/machinery/autolathe,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/sign/poster/clip/gold{
+	pixel_x = 28
 	},
-/turf/open/floor/pod/dark,
+/turf/open/floor/pod/light,
 /area/ship/cargo)
-"OW" = (
-/obj/effect/decal/fakelattice,
-/obj/structure/railing{
-	dir = 1
+"JF" = (
+/obj/structure/table/reinforced,
+/obj/item/tape{
+	pixel_x = -2;
+	pixel_y = 9
 	},
-/turf/open/floor/plasteel/elevatorshaft,
-/area/ship/hallway/central)
-"Pd" = (
-/obj/effect/turf_decal/siding/thinplating/dark{
-	dir = 8
+/obj/item/tape{
+	pixel_x = 7;
+	pixel_y = -1
 	},
-/obj/effect/turf_decal/spline/fancy/opaque/black{
-	dir = 4;
-	pixel_y = 1
+/obj/machinery/newscaster/directional/north{
+	pixel_x = 6
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 1
+/obj/item/taperecorder{
+	pixel_x = -10
+	},
+/obj/effect/turf_decal/corner/opaque/white/mono,
+/obj/machinery/computer/security/telescreen/entertainment{
+	pixel_x = -28
 	},
+/turf/open/floor/plasteel,
+/area/ship/crew/office)
+"JK" = (
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/obj/machinery/airalarm/directional/west,
-/turf/open/floor/plasteel/dark,
-/area/ship/crew/canteen)
-"Pi" = (
-/obj/effect/turf_decal/siding/thinplating/dark{
-	dir = 4
-	},
-/obj/effect/turf_decal/box{
-	color = "#75A2BB"
-	},
-/obj/machinery/suit_storage_unit/minutemen,
-/turf/open/floor/pod/dark,
-/area/ship/crew/canteen)
-"Pj" = (
-/obj/machinery/power/terminal{
-	dir = 8
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+	dir = 1
 	},
-/obj/structure/cable{
-	icon_state = "0-4"
+/obj/machinery/light/small/directional/east,
+/obj/effect/turf_decal/industrial/warning/green{
+	dir = 1
 	},
-/obj/item/clothing/head/cone{
-	pixel_y = -8;
-	pixel_x = -13
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/turf/open/floor/plasteel/stairs{
+	color = "#535456"
 	},
-/turf/open/floor/plasteel/tech,
 /area/ship/engineering)
-"Pk" = (
-/obj/effect/turf_decal/minutemen/corner{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 10
+"JL" = (
+/obj/structure/chair/office,
+/obj/effect/turf_decal/corner/transparent/blue/diagonal,
+/obj/effect/turf_decal/spline/fancy/opaque/white,
+/turf/open/floor/plasteel/white,
+/area/ship/medical)
+"JR" = (
+/obj/effect/turf_decal/techfloor,
+/obj/effect/turf_decal/spline/plain/opaque/grey,
+/obj/effect/turf_decal/trimline/opaque/beige/filled/line{
+	dir = 1
 	},
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
-"Pn" = (
-/obj/structure/table,
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/plasteel/grimy,
-/area/ship/crew/canteen)
-"Py" = (
-/obj/structure/closet/secure_closet/engineering_personal{
-	populate = 0
+"JU" = (
+/obj/effect/turf_decal/corner/opaque/black/half{
+	dir = 1
 	},
-/obj/effect/decal/cleanable/confetti,
-/obj/item/clothing/glasses/meson{
-	pixel_x = -1;
-	pixel_y = -8
+/obj/effect/turf_decal/industrial/warning/green{
+	dir = 1
 	},
-/obj/item/storage/belt/utility/full,
-/obj/item/storage/backpack/satchel/eng{
-	pixel_y = 10
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/canteen)
+"Kc" = (
+/obj/effect/decal/fakelattice{
+	icon_state = "lattice-203"
 	},
-/obj/item/clothing/under/clip{
-	pixel_x = 7
+/obj/structure/lattice/catwalk,
+/obj/item/toy/plush/moth/royal{
+	pixel_x = 9;
+	pixel_y = 8;
+	name = "Specialist Aloe";
+	desc = "An adorable mothperson plushy. Judging by a tag attached just beneath its left leg, it is part of the Colonial League's armed forces."
 	},
-/obj/item/clothing/suit/hazardvest{
-	pixel_x = -8;
-	pixel_y = 3
+/obj/item/clothing/head/clip{
+	pixel_x = 9;
+	pixel_y = 18
 	},
-/obj/item/clothing/suit/space/syndicate/blue,
-/obj/item/clothing/head/helmet/space/syndicate/blue,
-/turf/open/floor/engine/hull/interior,
-/area/ship/engineering)
-"PD" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/toilet{
-	dir = 8;
-	pixel_x = 4
+/obj/item/reagent_containers/food/drinks/coffee{
+	pixel_x = 5;
+	list_reagents = list(/datum/reagent/consumable/ice=30)
 	},
-/obj/structure/curtain,
-/obj/machinery/shower{
-	dir = 1;
-	pixel_x = -6
+/turf/open/floor/plating,
+/area/ship/external/dark)
+"Kg" = (
+/obj/machinery/atmospherics/pipe/simple/orange/hidden,
+/obj/structure/railing/thin/corner,
+/obj/structure/cable{
+	icon_state = "2-5"
 	},
-/obj/effect/turf_decal/floordetail/pryhole,
-/obj/machinery/light/small/directional/east,
-/turf/open/floor/plastic,
-/area/ship/crew)
-"PG" = (
-/obj/machinery/light/directional/south,
-/turf/open/floor/carpet/blue,
-/area/ship/crew/crewthree)
-"PK" = (
-/obj/effect/turf_decal/trimline/transparent/blue/line,
-/obj/effect/turf_decal/siding/thinplating/dark,
-/obj/structure/closet/secure_closet/freezer/fridge/open{
-	populate = 0
+/obj/structure/cable{
+	icon_state = "5-8"
 	},
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/item/reagent_containers/food/drinks/waterbottle/large,
-/obj/item/reagent_containers/food/drinks/waterbottle/large,
-/obj/item/reagent_containers/food/drinks/waterbottle/large,
-/obj/item/reagent_containers/food/drinks/waterbottle/large,
-/obj/item/reagent_containers/food/drinks/waterbottle/large,
-/turf/open/floor/plasteel/dark,
-/area/ship/crew/canteen)
-"PT" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+/obj/effect/turf_decal/corner/transparent/lime,
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering)
+"Kh" = (
+/obj/machinery/atmospherics/pipe/simple/cyan/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/general/hidden/layer4,
+/obj/structure/catwalk/over,
+/turf/open/floor/plating,
+/area/ship/engineering)
+"Kj" = (
+/obj/effect/decal/fakelattice,
+/obj/structure/railing{
 	dir = 1
 	},
+/turf/open/floor/plasteel/elevatorshaft,
+/area/ship/hallway/central)
+"Ko" = (
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/ship/external/dark)
+"KA" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/effect/turf_decal/siding/thinplating/dark{
-	dir = 8
-	},
-/turf/closed/wall/mineral/plastitanium/nodiagonal,
-/area/ship/security)
-"PU" = (
-/turf/closed/wall/mineral/plastitanium/nodiagonal,
-/area/ship/engineering)
-"PV" = (
-/obj/machinery/door/airlock/grunge{
-	dir = 4
-	},
-/obj/effect/turf_decal/siding/thinplating/dark/corner{
+/obj/effect/turf_decal/corner/opaque/black/half{
 	dir = 1
 	},
-/obj/effect/turf_decal/siding/thinplating/dark/corner{
-	dir = 8
+/obj/effect/turf_decal/industrial/warning/green{
+	dir = 1
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/canteen)
+"KB" = (
+/obj/machinery/light/directional/south,
+/turf/template_noop,
+/area/template_noop)
+"KE" = (
+/obj/effect/turf_decal/corner/opaque/black/half{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+/obj/effect/turf_decal/trimline/opaque/blue/warning{
 	dir = 4
 	},
-/obj/machinery/door/firedoor/border_only{
+/obj/effect/turf_decal/siding/thinplating/dark{
 	dir = 4
 	},
-/obj/machinery/door/firedoor/border_only{
+/obj/effect/turf_decal/corner/opaque/blue/border{
 	dir = 8
 	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/turf/open/floor/plasteel/dark,
-/area/ship/hallway/central)
-"PX" = (
-/obj/structure/railing/corner{
+/obj/effect/turf_decal/industrial/warning/green{
 	dir = 1
 	},
-/obj/structure/railing/corner{
-	dir = 4
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/firealarm/directional/west{
+	pixel_y = 7
 	},
-/obj/structure/cable{
-	icon_state = "1-4"
+/obj/structure/extinguisher_cabinet/directional/west{
+	pixel_y = -5
 	},
-/obj/structure/cable{
-	icon_state = "1-2"
+/turf/open/floor/plasteel,
+/area/ship/hallway/central)
+"KK" = (
+/obj/machinery/atmospherics/pipe/simple/general/hidden/layer4{
+	dir = 5
 	},
-/obj/structure/catwalk/over,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/turf/open/floor/plating,
-/area/ship/engineering)
-"Qb" = (
-/obj/machinery/recharge_station,
-/obj/structure/extinguisher_cabinet/directional/east,
-/turf/open/floor/plasteel/dark,
-/area/ship/crew)
-"Qg" = (
-/obj/item/cigbutt{
-	pixel_x = -8;
-	pixel_y = 11
+/obj/machinery/atmospherics/pipe/simple/cyan/hidden/layer2{
+	dir = 5
 	},
-/obj/structure/catwalk/over,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 4
+/obj/machinery/atmospherics/pipe/simple/general/hidden/layer1{
+	dir = 10
 	},
+/obj/structure/catwalk/over,
 /turf/open/floor/plating,
 /area/ship/engineering)
-"Qj" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/sink{
-	dir = 4;
-	pixel_x = -12;
-	pixel_y = 6
+"KM" = (
+/obj/effect/turf_decal/siding/thinplating/dark,
+/obj/effect/turf_decal/corner/opaque/black/half,
+/obj/effect/turf_decal/corner/opaque/mauve/border{
+	dir = 1
 	},
-/obj/item/lipstick{
-	pixel_x = -11
+/obj/effect/turf_decal/trimline/opaque/blue/warning,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
+/obj/machinery/firealarm/directional/north{
+	pixel_x = -7
 	},
-/obj/item/lipstick/black{
-	pixel_x = -11
+/obj/structure/extinguisher_cabinet/directional/north{
+	pixel_x = 5
 	},
-/obj/item/lipstick/jade{
-	pixel_x = -11
+/turf/open/floor/plasteel/dark,
+/area/ship/hallway/central)
+"KO" = (
+/obj/effect/turf_decal/industrial/warning/green{
+	dir = 9
 	},
-/obj/item/lipstick/purple{
-	pixel_x = -11
+/turf/open/floor/engine/hull/reinforced,
+/area/ship/engineering)
+"KY" = (
+/obj/effect/turf_decal/corner/opaque/beige/border{
+	dir = 1
 	},
-/obj/structure/closet/wall/white{
-	dir = 4;
-	pixel_x = 28;
+/obj/effect/turf_decal/corner/opaque/white/bordercorner{
+	dir = 8
+	},
+/obj/effect/turf_decal/corner/opaque/beige/bordercorner,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/dorm/commad)
+"Lk" = (
+/obj/structure/closet/secure_closet/clip/minutemen/lead{
 	pixel_y = 6
 	},
-/obj/structure/mirror{
-	pixel_x = -28;
-	pixel_y = 7
+/obj/item/storage/guncase/hellfire,
+/obj/effect/turf_decal/techfloor{
+	dir = 1
 	},
-/obj/item/dyespray{
-	pixel_x = 10
+/obj/effect/turf_decal/spline/plain/opaque/blue{
+	dir = 1
 	},
-/obj/item/clothing/head/wig/random{
-	pixel_x = 11
+/obj/item/melee/sword/mass,
+/obj/machinery/airalarm/directional/north,
+/obj/item/attachment/rail_light,
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/security/armory)
+"Ln" = (
+/obj/effect/turf_decal/corner/opaque/black/half{
+	dir = 1
 	},
-/obj/machinery/button/door{
-	pixel_x = -20;
-	pixel_y = -10;
-	dir = 4;
-	id = "atlas_bathroom";
-	normaldoorcontrol = 1;
-	specialfunctions = 4;
-	name = "Bathroom Lock"
+/obj/effect/turf_decal/spline/fancy/opaque/grey/corner{
+	dir = 4
 	},
-/turf/open/floor/plastic,
-/area/ship/crew)
-"Qt" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/plasteel/grimy,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/effect/turf_decal/siding/thinplating{
+	dir = 10
+	},
+/turf/open/floor/plasteel/mono,
 /area/ship/crew/canteen)
-"Qu" = (
-/obj/machinery/door/airlock/external{
+"Lp" = (
+/obj/effect/turf_decal/industrial/warning/green{
 	dir = 4
 	},
-/obj/effect/turf_decal/industrial/warning{
-	dir = 1
+/turf/open/floor/plasteel/stairs{
+	dir = 8;
+	color = "#535456"
 	},
-/obj/effect/turf_decal/industrial/warning,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 4
+/area/ship/bridge)
+"Lr" = (
+/obj/machinery/door/window/brigdoor/eastleft{
+	req_one_access = list(19, 3)
 	},
-/turf/open/floor/plasteel/dark,
-/area/ship/engineering)
-"Qw" = (
-/obj/effect/turf_decal/minutemen/corner,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/security/armory)
+"LD" = (
+/obj/effect/turf_decal/corner/transparent/blue{
 	dir = 9
 	},
-/obj/structure/cable{
-	icon_state = "4-8"
+/obj/effect/turf_decal/corner/transparent/blue,
+/obj/effect/turf_decal/siding/white{
+	dir = 8
 	},
-/turf/open/floor/plasteel/dark,
-/area/ship/bridge)
-"Qx" = (
-/obj/structure/bed/pod{
+/obj/effect/turf_decal/spline/fancy/opaque/white/corner{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 5
+	},
+/turf/open/floor/plasteel/white,
+/area/ship/medical)
+"LE" = (
+/obj/structure/window/reinforced/tinted{
+	dir = 8
+	},
+/obj/structure/toilet{
 	dir = 1
 	},
-/obj/item/bedsheet/red{
+/obj/structure/curtain/cloth,
+/obj/effect/turf_decal/corner/opaque/white/half,
+/obj/effect/turf_decal/corner/opaque/white/half{
 	dir = 1
 	},
-/turf/open/floor/plasteel/dark,
-/area/ship/security)
-"Qz" = (
-/obj/structure/sign/clip,
-/turf/closed/wall/mineral/plastitanium/nodiagonal,
-/area/ship/cargo)
-"QC" = (
+/turf/open/floor/plasteel/white,
+/area/ship/crew/toilet)
+"LF" = (
+/obj/effect/turf_decal/spline/fancy/opaque/grey,
+/obj/effect/turf_decal/corner/opaque/black/half{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+	dir = 8
+	},
+/obj/effect/turf_decal/siding/thinplating{
+	dir = 1
+	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/turf/open/floor/plasteel/mono,
+/area/ship/crew/canteen)
+"LH" = (
+/obj/machinery/computer/helm/viewscreen/directional/south,
 /obj/effect/turf_decal/trimline/transparent/blue/filled/corner{
+	dir = 8
+	},
+/obj/structure/filingcabinet/chestdrawer{
+	dir = 8
+	},
+/obj/item/folder,
+/obj/item/folder,
+/obj/item/hand_labeler_refill,
+/obj/item/hand_labeler_refill,
+/obj/item/hand_labeler,
+/obj/effect/turf_decal/trimline/transparent/blue/filled/corner,
+/turf/open/floor/plasteel/dark,
+/area/ship/security/armory)
+"LI" = (
+/obj/effect/turf_decal/corner/opaque/black/half{
 	dir = 1
 	},
-/obj/effect/turf_decal/siding/thinplating/dark/corner{
+/obj/effect/turf_decal/siding/thinplating{
 	dir = 1
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 4
+/obj/effect/turf_decal/siding/thinplating/corner{
+	dir = 8
 	},
+/obj/effect/turf_decal/spline/fancy/opaque/grey/corner,
 /obj/structure/cable{
-	icon_state = "1-4"
+	icon_state = "2-8"
 	},
-/obj/effect/turf_decal/spline/fancy/opaque/black/corner{
+/turf/open/floor/plasteel/mono,
+/area/ship/crew/canteen)
+"LL" = (
+/obj/effect/turf_decal/trimline/transparent/blue/filled/line{
+	dir = 4
+	},
+/obj/effect/turf_decal/trimline/transparent/blue/filled/line{
 	dir = 8
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 5
+/obj/effect/turf_decal/siding/thinplating{
+	dir = 8
+	},
+/obj/effect/turf_decal/siding/thinplating{
+	dir = 4
 	},
-/turf/open/floor/plasteel/dark,
-/area/ship/security)
-"QG" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/hallway/central)
-"QM" = (
-/obj/structure/table/reinforced,
-/obj/item/radio/intercom/table{
-	dir = 4;
-	pixel_y = 3
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/security/armory)
+"LM" = (
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/ship/bridge)
+"LP" = (
+/obj/structure/platform/industrial,
+/obj/structure/railing/thin{
+	layer = 3.081
 	},
-/obj/item/radio/weather_monitor{
-	pixel_x = -6;
-	pixel_y = 20
+/obj/machinery/power/port_gen/pacman{
+	anchored = 1
 	},
-/turf/open/floor/plasteel/telecomms_floor,
-/area/ship/bridge)
-"QS" = (
-/obj/effect/turf_decal/trimline/transparent/blue/filled/line{
+/obj/structure/cable/yellow{
+	icon_state = "0-8"
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering)
+"LT" = (
+/obj/structure/platform/industrial,
+/obj/structure/railing/thin{
+	layer = 3.081
+	},
+/obj/machinery/power/smes/engineering{
+	charge = 1e+006
+	},
+/obj/structure/cable{
+	icon_state = "0-5"
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering)
+"LU" = (
+/obj/effect/spawner/bunk_bed{
+	dir = 1
+	},
+/obj/structure/curtain/cloth/grey,
+/obj/structure/sign/poster/clip/lunatown{
+	pixel_x = -28
+	},
+/turf/open/floor/carpet/nanoweave/beige,
+/area/ship/crew/dorm/commad)
+"LX" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/effect/decal/cleanable/cobweb/cobweb2,
+/obj/structure/closet/secure_closet/clip/minutemen/engineer{
+	pixel_x = -6
+	},
+/obj/item/clothing/mask/gas/clip,
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering)
+"LY" = (
+/obj/effect/turf_decal/corner/opaque/blue/half,
+/obj/effect/turf_decal/corner/opaque/blue{
 	dir = 1
 	},
-/obj/effect/turf_decal/siding/thinplating/dark{
-	dir = 1
+/obj/structure/chair{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 8
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
 	},
-/obj/effect/turf_decal/spline/fancy/opaque/black,
-/turf/open/floor/plasteel/dark,
-/area/ship/security)
-"Rf" = (
-/obj/machinery/door/airlock/grunge{
-	name = "Dormitories"
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/structure/cable{
-	icon_state = "1-2"
+	icon_state = "4-10"
 	},
-/obj/machinery/door/firedoor/border_only{
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/white,
+/area/ship/crew/canteen)
+"Ma" = (
+/obj/effect/turf_decal/siding/thinplating/dark{
 	dir = 1
 	},
-/obj/machinery/door/firedoor/border_only,
-/turf/open/floor/plasteel/dark,
-/area/ship/crew)
-"Rt" = (
-/obj/effect/turf_decal/siding/wood,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+/obj/effect/turf_decal/corner/opaque/black/half{
+	dir = 1
+	},
+/obj/effect/turf_decal/trimline/opaque/blue/warning{
 	dir = 1
 	},
+/obj/machinery/light/directional/south,
+/obj/effect/turf_decal/corner/opaque/white/border,
+/obj/effect/turf_decal/corner/transparent/blue/border,
 /turf/open/floor/plasteel/dark,
-/area/ship/crew/crewtwo)
-"Rv" = (
+/area/ship/hallway/central)
+"Mg" = (
+/turf/open/floor/plasteel/dark,
+/area/ship/security/armory)
+"Ml" = (
 /obj/structure/cable{
-	icon_state = "4-8"
+	icon_state = "1-4"
 	},
-/obj/structure/cable{
-	icon_state = "4-10"
+/turf/open/floor/plasteel/patterned/grid/dark,
+/area/ship/crew/cryo)
+"Mm" = (
+/obj/structure/railing/thin/corner{
+	dir = 1
 	},
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
-	dir = 4
+/obj/effect/turf_decal/corner/opaque/cybersunteal/border{
+	dir = 1
 	},
-/turf/open/floor/plasteel/tech,
-/area/ship/engineering)
-"Rz" = (
-/obj/structure/rack,
-/obj/effect/turf_decal/trimline/transparent/blue/filled,
-/obj/item/clothing/suit/armor/vest/bulletproof{
-	pixel_y = 13;
-	pixel_x = 7
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/structure/cable{
+	icon_state = "1-8"
 	},
-/obj/item/clothing/suit/armor/vest/bulletproof{
-	pixel_y = 10;
-	pixel_x = 6
+/obj/machinery/airalarm/directional/east,
+/turf/open/floor/plasteel,
+/area/ship/crew/dorm)
+"Mn" = (
+/obj/effect/turf_decal/industrial/warning/green,
+/obj/machinery/door/firedoor/heavy,
+/obj/structure/cable{
+	icon_state = "0-2"
 	},
-/obj/item/clothing/suit/armor/vest/bulletproof{
-	pixel_x = 7;
-	pixel_y = 5
+/obj/machinery/power/shieldwallgen/atmos/roundstart{
+	dir = 8;
+	id = "atlas_cargo_holo"
 	},
-/obj/item/clothing/suit/armor/vest/bulletproof{
-	pixel_x = 8;
-	pixel_y = 1
+/obj/machinery/door/poddoor{
+	id = "atlas_cargo"
 	},
-/obj/item/clothing/head/helmet/bulletproof/x11/clip{
-	pixel_y = 12;
-	pixel_x = -9
+/turf/open/floor/plating,
+/area/ship/cargo)
+"Mp" = (
+/obj/structure/cable{
+	icon_state = "4-8"
 	},
-/obj/item/clothing/head/helmet/bulletproof/x11/clip{
-	pixel_y = 10;
-	pixel_x = -6
+/obj/structure/cable{
+	icon_state = "1-8"
 	},
-/obj/item/clothing/head/helmet/bulletproof/x11/clip{
-	pixel_y = 4;
-	pixel_x = -10
+/obj/effect/turf_decal/corner/opaque/black/half,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
 	},
-/obj/item/clothing/head/helmet/bulletproof/x11/clip{
-	pixel_y = -2;
-	pixel_x = -7
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 8
 	},
-/obj/structure/window/reinforced{
+/obj/effect/turf_decal/corner/opaque/blue/border,
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/canteen)
+"Mw" = (
+/obj/machinery/light/directional/east,
+/obj/effect/turf_decal/corner/opaque/black/half{
 	dir = 4
 	},
-/obj/item/flashlight/seclite{
-	pixel_y = -5;
-	pixel_x = 1
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/canteen)
+"My" = (
+/obj/structure/table,
+/obj/machinery/light/small/directional/north,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/crew/office)
+"MM" = (
+/obj/machinery/shower{
+	dir = 8;
+	pixel_y = 7
 	},
-/obj/item/flashlight/seclite{
-	pixel_y = -7;
-	pixel_x = 1
+/obj/structure/catwalk/over/plated_catwalk/white,
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/crew/toilet)
+"MO" = (
+/turf/open/floor/pod/light,
+/area/ship/cargo)
+"MX" = (
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 1
 	},
-/obj/item/flashlight/seclite{
-	pixel_y = -9;
-	pixel_x = 1
+/obj/effect/turf_decal/corner/opaque/black/half{
+	dir = 1
 	},
-/obj/item/flashlight/seclite{
-	pixel_y = -11;
-	pixel_x = 1
+/obj/effect/turf_decal/trimline/opaque/blue/warning{
+	dir = 1
 	},
-/turf/open/floor/plasteel/dark,
-/area/ship/security)
-"RL" = (
-/obj/structure/table/wood,
-/obj/item/storage/fancy/cigarettes/cigars{
-	pixel_y = 6;
-	pixel_x = 2
+/obj/effect/turf_decal/corner/opaque/white/border,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/structure/cable{
+	icon_state = "1-2"
 	},
-/obj/item/storage/fancy/cigarettes/cigars{
-	pixel_y = 9;
-	pixel_x = 1
+/obj/effect/turf_decal/corner/transparent/blue/border,
+/obj/structure/cable{
+	icon_state = "1-4"
 	},
-/obj/item/clothing/mask/cigarette/pipe{
-	pixel_x = 10
+/turf/open/floor/plasteel/dark,
+/area/ship/hallway/central)
+"Nk" = (
+/obj/structure/cable{
+	icon_state = "4-8"
 	},
-/obj/item/lighter{
-	pixel_x = -9
+/obj/effect/turf_decal/corner/opaque/black/half{
+	dir = 4
 	},
-/turf/open/floor/wood,
-/area/ship/crew/crewthree)
-"RM" = (
-/obj/effect/turf_decal/trimline/transparent/blue/filled/line{
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/ship/crew/cryo)
+"ND" = (
+/obj/structure/cable{
+	icon_state = "1-8"
+	},
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
 	dir = 4
 	},
-/obj/effect/turf_decal/siding/thinplating/dark{
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden,
+/obj/effect/turf_decal/corner/transparent/lime/half{
 	dir = 4
 	},
-/obj/effect/turf_decal/spline/fancy/opaque/black/corner{
-	dir = 8
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering)
+"NJ" = (
+/obj/effect/turf_decal/corner/opaque/white/half{
+	dir = 1
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 10
+/obj/effect/turf_decal/corner/opaque/white/half,
+/obj/structure/toilet{
+	pixel_y = 12;
+	pixel_x = -5
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 10
+/obj/machinery/light/small/directional/north{
+	pixel_x = 7
 	},
-/obj/structure/cable{
-	icon_state = "2-8"
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/button/door{
+	id = "atlas_bathroom";
+	normaldoorcontrol = 1;
+	specialfunctions = 4;
+	name = "Restroom Lock";
+	dir = 8;
+	pixel_y = 7;
+	pixel_x = 20
 	},
-/turf/open/floor/plasteel/dark,
-/area/ship/crew/canteen)
-"RQ" = (
-/obj/structure/catwalk/over/plated_catwalk/dark,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 5
+/turf/open/floor/plasteel/white,
+/area/ship/crew/dorm/commad)
+"NN" = (
+/obj/structure/platform/industrial/corner{
+	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 5
+/obj/effect/turf_decal/corner/transparent/lime{
+	dir = 1
 	},
 /obj/structure/cable{
-	icon_state = "1-4"
+	icon_state = "1-2"
 	},
-/turf/open/floor/plating,
-/area/ship/hallway/central)
-"RT" = (
-/obj/machinery/porta_turret/ship/clip{
-	id = "atlas";
+/obj/effect/turf_decal/floordetail/pryhole,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 6
 	},
-/turf/closed/wall/mineral/plastitanium/nodiagonal,
-/area/ship/crew)
-"RU" = (
-/obj/structure/catwalk/over/plated_catwalk/dark,
-/obj/machinery/computer/monitor{
-	dir = 8;
-	icon_state = "computer-left"
-	},
-/obj/structure/cable{
-	icon_state = "0-8"
-	},
-/turf/open/floor/plasteel/telecomms_floor,
-/area/ship/bridge)
-"Sb" = (
-/obj/effect/turf_decal/spline/fancy/opaque/black{
-	dir = 1
-	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 4
+	dir = 6
 	},
-/obj/structure/cable{
-	icon_state = "4-8"
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+	dir = 6
 	},
-/obj/effect/turf_decal/siding/thinplating/dark/corner{
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering)
+"NU" = (
+/obj/effect/turf_decal/corner/opaque/blue/diagonal,
+/obj/structure/chair{
 	dir = 8
 	},
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plasteel/white,
 /area/ship/crew/canteen)
-"Sp" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced/fulltile,
-/obj/machinery/door/poddoor/shutters/preopen{
-	id = "atlas_cap"
+"Ob" = (
+/obj/structure/sign/clip,
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/ship/crew/office)
+"Oj" = (
+/obj/structure/sign/number/random,
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/ship/crew/dorm/commad)
+"Ok" = (
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/ship/crew/toilet)
+"Oo" = (
+/obj/effect/turf_decal/industrial/caution,
+/obj/structure/chair/office,
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering)
+"Ot" = (
+/obj/effect/turf_decal/corner_steel_grid{
+	dir = 1
 	},
-/turf/open/floor/plating,
-/area/ship/crew/crewthree)
-"Ss" = (
-/obj/effect/turf_decal/trimline/transparent/blue/filled/line{
-	dir = 4
+/obj/effect/turf_decal/box/white/corners{
+	dir = 1;
+	color = "#CBB1CA"
 	},
-/obj/effect/turf_decal/spline/fancy/opaque/black/corner{
-	dir = 1
+/turf/open/floor/pod/light,
+/area/ship/cargo)
+"OI" = (
+/obj/machinery/suit_storage_unit/industrial{
+	suit_type = /obj/item/clothing/suit/space/eva;
+	helmet_type = /obj/item/clothing/head/helmet/space/eva;
+	mask_type = /obj/item/clothing/mask/breath
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 9
+/obj/effect/turf_decal/industrial/warning/green/fulltile,
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering)
+"OW" = (
+/obj/effect/turf_decal/industrial/warning/green,
+/turf/open/floor/plasteel/dark,
+/area/ship/security/armory)
+"Pd" = (
+/obj/effect/turf_decal/corner/opaque/white/half{
+	dir = 1
 	},
+/obj/effect/turf_decal/corner/opaque/white/half,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 9
 	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 5
+	},
+/turf/open/floor/plasteel/white,
+/area/ship/crew/toilet)
+"Pk" = (
 /obj/structure/cable{
-	icon_state = "1-8"
+	icon_state = "1-2"
 	},
-/obj/effect/turf_decal/siding/thinplating/dark{
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/effect/turf_decal/corner/transparent/lime/half{
 	dir = 4
 	},
-/obj/item/radio/intercom/directional/east,
-/turf/open/floor/plasteel/dark,
-/area/ship/crew/canteen)
-"Sw" = (
-/obj/structure/rack,
-/obj/structure/window/reinforced{
+/obj/effect/turf_decal/industrial/warning/green{
+	dir = 1
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering)
+"Pu" = (
+/obj/machinery/porta_turret/ship/clip/heavy{
+	dir = 5;
+	id = "atlas_turrets"
+	},
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/ship/security/armory)
+"Pv" = (
+/obj/machinery/light/directional/east,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/chair/office,
+/turf/open/floor/plasteel,
+/area/ship/crew/dorm/commad)
+"PD" = (
+/obj/structure/window/reinforced/tinted{
 	dir = 8
 	},
-/obj/effect/turf_decal/trimline/transparent/blue/filled,
-/obj/item/storage/box/ammo/a556_42{
-	pixel_y = -4
+/obj/structure/toilet{
+	dir = 1
+	},
+/obj/structure/curtain/cloth,
+/obj/effect/turf_decal/corner/opaque/white/half,
+/obj/effect/turf_decal/corner/opaque/white/half{
+	dir = 1
 	},
-/obj/item/storage/box/ammo/c10mm{
+/obj/effect/decal/cleanable/vomit/old{
+	pixel_x = 1;
 	pixel_y = 4
 	},
-/obj/item/storage/box/ammo/c10mm{
-	pixel_y = 4
+/turf/open/floor/plasteel/white,
+/area/ship/crew/toilet)
+"PK" = (
+/obj/effect/turf_decal/corner/transparent/blue/full,
+/obj/machinery/door/airlock/medical{
+	name = "Infirmary"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/structure/cable{
+	icon_state = "1-2"
 	},
-/obj/item/storage/box/ammo/c9mm{
-	pixel_y = 10;
-	pixel_x = -2
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/door/firedoor/border_only{
+	dir = 1
 	},
-/turf/open/floor/plasteel/dark,
-/area/ship/security)
-"Sz" = (
-/obj/effect/turf_decal/trimline/transparent/blue/warning{
+/turf/open/floor/plasteel/white,
+/area/ship/medical)
+"PN" = (
+/obj/effect/turf_decal/techfloor{
 	dir = 4
 	},
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/turf_decal/siding/thinplating/dark/corner{
+/obj/structure/easel{
+	anchored = 1;
+	can_be_unanchored = 1;
+	name = "whiteboard stand";
+	pixel_x = -10
+	},
+/obj/item/canvas/twentythreeXtwentythree{
+	pixel_x = -6
+	},
+/obj/structure/railing/thin/corner,
+/obj/effect/turf_decal/minutemen/edge{
 	dir = 8
 	},
-/obj/effect/turf_decal/industrial/warning,
-/turf/open/floor/plasteel/dark,
-/area/ship/hallway/central)
-"SB" = (
-/obj/effect/turf_decal/trimline/transparent/blue/filled/line{
-	dir = 1
+/obj/effect/turf_decal/spline/fancy/opaque/black{
+	dir = 8
 	},
+/obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/plasteel/mono/dark,
-/area/ship/security)
-"SI" = (
-/obj/machinery/power/apc/auto_name/directional/east,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/structure/cable{
-	icon_state = "0-2"
+/area/ship/bridge)
+"PS" = (
+/obj/effect/turf_decal/corner/opaque/white/half{
+	dir = 1
 	},
-/obj/structure/cable{
-	icon_state = "2-8"
+/obj/effect/turf_decal/corner/opaque/white/half,
+/obj/structure/closet/wall/directional/east,
+/obj/item/towel{
+	pixel_x = 9;
+	pixel_y = -4
 	},
-/obj/structure/cable{
-	icon_state = "1-2"
+/obj/item/towel{
+	pixel_x = 2;
+	pixel_y = 3
 	},
-/turf/open/floor/plasteel/tech,
-/area/ship/cargo)
-"SK" = (
-/obj/structure/sign/clip,
-/turf/closed/wall/mineral/plastitanium/nodiagonal,
-/area/ship/medical)
-"ST" = (
-/obj/structure/table/reinforced,
-/obj/machinery/door/window/brigdoor/southright{
-	req_access = list(3)
+/obj/item/towel{
+	pixel_x = -7;
+	pixel_y = -4
 	},
-/obj/item/radio/intercom/table{
-	pixel_y = -3;
-	pixel_x = 5
+/obj/item/towel{
+	pixel_x = -4;
+	pixel_y = 10
 	},
-/obj/machinery/door/firedoor/border_only,
-/turf/open/floor/plasteel/dark,
-/area/ship/security)
-"SW" = (
-/obj/structure/table/wood,
-/obj/item/modular_computer/laptop/preset/civilian{
-	pixel_y = 3
+/turf/open/floor/plasteel/white,
+/area/ship/crew/toilet)
+"PU" = (
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/ship/engineering)
+"PV" = (
+/obj/effect/turf_decal/corner/opaque/white/half{
+	dir = 4
 	},
-/turf/open/floor/wood,
-/area/ship/crew/crewtwo)
-"Ti" = (
-/obj/machinery/light/directional/west,
-/obj/machinery/telecomms/relay/preset/minutemen,
-/obj/effect/turf_decal/siding/thinplating/dark{
-	dir = 6
+/obj/effect/turf_decal/corner/opaque/white/half,
+/obj/structure/closet/secure_closet/clip/minutemen/correspondent,
+/turf/open/floor/plasteel,
+/area/ship/crew/office)
+"Qb" = (
+/obj/machinery/washing_machine{
+	pixel_x = -4;
+	pixel_y = -1
 	},
-/turf/open/floor/plasteel/telecomms_floor,
-/area/ship/engineering)
-"Tx" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 5
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel,
+/area/ship/crew/dorm)
+"Qg" = (
+/obj/structure/table/reinforced,
+/obj/item/camera_film{
+	pixel_x = -6;
+	pixel_y = 13
 	},
-/obj/machinery/light_switch{
-	dir = 4;
-	pixel_x = -23
+/obj/item/camera_film{
+	pixel_x = 8;
+	pixel_y = 10
 	},
-/turf/open/floor/plasteel/dark,
-/area/ship/crew/crewtwo)
-"Ty" = (
-/obj/effect/turf_decal/trimline/transparent/blue/warning{
-	dir = 1
+/obj/item/camera{
+	pixel_x = 1;
+	pixel_y = 2
 	},
+/obj/effect/turf_decal/corner/opaque/white/mono,
+/obj/machinery/light/directional/west,
+/turf/open/floor/plasteel,
+/area/ship/crew/office)
+"Qh" = (
 /obj/effect/turf_decal/siding/thinplating/dark,
-/obj/machinery/power/apc/auto_name/directional/south,
-/obj/structure/cable,
+/obj/effect/turf_decal/corner/opaque/black/half,
+/obj/effect/turf_decal/corner/opaque/mauve/border{
+	dir = 1
+	},
+/obj/effect/turf_decal/trimline/opaque/blue/warning,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /turf/open/floor/plasteel/dark,
 /area/ship/hallway/central)
-"TA" = (
-/obj/item/emptysandbag{
-	pixel_x = -10;
-	pixel_y = -8
-	},
-/obj/item/emptysandbag{
-	pixel_x = 4;
-	pixel_y = -8
+"Qt" = (
+/obj/structure/window/reinforced{
+	dir = 8
 	},
-/obj/item/emptysandbag{
-	pixel_x = -3;
-	pixel_y = -6
+/obj/machinery/atmospherics/components/unary/shuttle/fire_heater,
+/obj/effect/turf_decal/industrial/warning/green/full,
+/obj/machinery/door/poddoor/shutters{
+	dir = 4;
+	id = "atlas_engines_south"
 	},
-/obj/item/emptysandbag{
-	pixel_x = -3;
-	pixel_y = -6
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering)
+"Qw" = (
+/obj/structure/chair{
+	dir = 4
 	},
-/obj/item/emptysandbag{
-	pixel_x = 4;
-	pixel_y = -4
+/obj/effect/turf_decal/trimline/opaque/beige/filled/line{
+	dir = 8
 	},
-/obj/item/emptysandbag{
-	pixel_x = -10;
-	pixel_y = -5
+/obj/structure/cable{
+	icon_state = "1-2"
 	},
-/obj/item/emptysandbag{
-	pixel_x = 2;
-	pixel_y = -2
+/turf/open/floor/plasteel,
+/area/ship/bridge)
+"Qz" = (
+/obj/structure/sign/clip,
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/ship/cargo)
+"QA" = (
+/obj/structure/railing/thin,
+/obj/effect/turf_decal/corner/transparent/lime/half,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+	dir = 4
 	},
-/obj/item/emptysandbag{
-	pixel_x = -10
+/obj/structure/rack,
+/obj/item/stack/sheet/metal/twenty{
+	pixel_x = -5;
+	pixel_y = 9
 	},
-/obj/item/shovel{
-	pixel_x = -18;
-	pixel_y = -3
+/obj/item/stack/sheet/glass/twenty{
+	pixel_x = 5
 	},
-/obj/structure/table,
-/turf/open/floor/engine/hull/interior,
+/turf/open/floor/plasteel/tech,
 /area/ship/engineering)
-"TE" = (
+"QG" = (
+/obj/structure/closet/crate{
+	name = "minuteman morale kit";
+	desc = "Strength in unity."
+	},
+/obj/item/storage/cans/sixbeer,
+/obj/item/storage/cans/sixbeer,
+/obj/item/food/muffin/berry,
+/obj/item/food/muffin/berry,
+/obj/item/food/muffin/berry,
+/obj/item/food/muffin/berry,
+/obj/item/food/muffin/berry,
+/obj/item/food/muffin/berry,
+/obj/item/food/energybar,
+/obj/item/food/energybar,
+/obj/item/food/energybar,
+/obj/item/food/energybar,
+/obj/item/food/energybar,
+/obj/item/food/energybar,
+/obj/effect/mapping_helpers/crate_shelve,
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/ship/cargo)
-"TK" = (
-/obj/structure/dresser{
+"QL" = (
+/obj/structure/table,
+/obj/effect/turf_decal/corner/opaque/blue/half{
 	dir = 1
 	},
-/obj/machinery/button/door{
-	pixel_y = -23;
-	id = "atlas_cap";
-	dir = 1;
-	name = "private windows button"
-	},
-/turf/open/floor/carpet/blue,
-/area/ship/crew/crewthree)
-"TT" = (
-/obj/structure/catwalk/over/plated_catwalk/dark,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/turf/open/floor/plating,
-/area/ship/hallway/central)
-"Uh" = (
-/obj/structure/rack,
-/obj/effect/turf_decal/trimline/transparent/blue/filled,
-/obj/structure/window/reinforced{
-	dir = 4
+/obj/effect/turf_decal/corner/opaque/blue,
+/obj/item/reagent_containers/condiment/saltshaker{
+	pixel_x = 3;
+	pixel_y = 10
 	},
-/obj/item/clothing/gloves/combat{
-	pixel_y = 8;
-	pixel_x = -9
+/obj/item/reagent_containers/condiment/peppermill{
+	pixel_x = 6;
+	pixel_y = 3
 	},
-/obj/item/clothing/gloves/combat{
-	pixel_y = 3;
-	pixel_x = -11
+/turf/open/floor/plasteel/white,
+/area/ship/crew/canteen)
+"QM" = (
+/obj/effect/turf_decal/corner/opaque/white/half{
+	dir = 1
 	},
-/obj/item/clothing/gloves/combat{
-	pixel_y = -1;
-	pixel_x = -8
+/obj/effect/turf_decal/corner/opaque/white/half,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/white,
+/area/ship/crew/dorm/commad)
+"QT" = (
+/obj/structure/platform/industrial/corner{
+	dir = 1
 	},
-/obj/item/clothing/gloves/combat{
-	pixel_y = -5;
-	pixel_x = -10
+/obj/structure/railing/thin/corner{
+	dir = 8;
+	layer = 3.081
 	},
-/obj/item/storage/belt/military/clip{
-	pixel_y = 14;
-	pixel_x = 5
+/obj/structure/cable{
+	icon_state = "1-2"
 	},
-/obj/item/storage/belt/military/clip{
-	pixel_y = 11;
-	pixel_x = 7
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden,
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering)
+"Ra" = (
+/obj/effect/turf_decal/spline/fancy/opaque/grey{
+	dir = 1
 	},
-/obj/item/storage/belt/military/clip{
-	pixel_y = 2;
-	pixel_x = 4
+/obj/effect/turf_decal/corner/opaque/black/half{
+	dir = 1
 	},
-/obj/item/storage/belt/military/clip{
-	pixel_y = -2;
-	pixel_x = 7
+/obj/effect/turf_decal/siding/thinplating,
+/turf/open/floor/plasteel/mono,
+/area/ship/crew/canteen)
+"Rd" = (
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+	dir = 4
 	},
-/turf/open/floor/plasteel/dark,
-/area/ship/security)
-"Um" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+/obj/effect/turf_decal/corner/transparent/lime/half{
 	dir = 1
 	},
-/obj/structure/cable{
-	icon_state = "1-2"
+/obj/structure/rack,
+/obj/item/pipe_dispenser{
+	pixel_x = -1;
+	pixel_y = 7
 	},
-/obj/effect/turf_decal/trimline/transparent/blue/filled/corner{
-	dir = 8
+/obj/item/storage/belt/utility{
+	pixel_x = 8;
+	pixel_y = -2
 	},
-/obj/structure/window/reinforced,
-/obj/effect/turf_decal/siding/thinplating/dark{
-	dir = 8
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering)
+"Rf" = (
+/obj/structure/table,
+/obj/effect/turf_decal/trimline/transparent/blue/filled/line{
+	dir = 6
+	},
+/obj/machinery/light/directional/east,
+/obj/item/radio/intercom/table{
+	pixel_y = 1;
+	pixel_x = 2;
+	dir = 4
 	},
-/obj/effect/turf_decal/box{
-	color = "#75A2BB"
+/turf/open/floor/plasteel/dark,
+/area/ship/security/armory)
+"Rs" = (
+/obj/effect/turf_decal/spline/fancy/opaque/grey{
+	dir = 1
 	},
-/obj/machinery/door/firedoor/border_only,
-/obj/machinery/suit_storage_unit/minutemen,
-/turf/open/floor/pod/dark,
+/obj/effect/turf_decal/corner/opaque/black/half,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/turf_decal/siding/thinplating,
+/turf/open/floor/plasteel/mono,
 /area/ship/crew/canteen)
-"UC" = (
-/obj/effect/turf_decal/corner/transparent/blue/diagonal,
-/obj/effect/turf_decal/spline/fancy/opaque/white{
+"RG" = (
+/obj/effect/turf_decal/corner/opaque/black/half{
 	dir = 1
 	},
-/turf/open/floor/plasteel/white,
-/area/ship/medical)
-"UG" = (
-/obj/structure/table/optable,
-/obj/effect/turf_decal/corner/transparent/blue/mono,
-/obj/item/clothing/suit/apron/surgical{
-	pixel_x = -5;
-	pixel_y = -3
+/obj/effect/turf_decal/corner/opaque/black/half{
+	dir = 4
 	},
-/obj/item/book/manual/wiki/surgery{
-	pixel_x = 6;
-	pixel_y = 1
+/obj/effect/turf_decal/industrial/warning/green{
+	dir = 1
 	},
-/obj/structure/sign/poster/clip/serene{
-	pixel_x = 32
+/obj/machinery/button/door{
+	pixel_x = 20;
+	id = "atlas_armory";
+	name = "entry shutters button";
+	dir = 8;
+	pixel_y = 7;
+	req_one_access = list(19, 3)
 	},
-/obj/machinery/defibrillator_mount{
-	pixel_y = -28
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/canteen)
+"RM" = (
+/obj/effect/turf_decal/corner/opaque/blue/half{
+	dir = 1
 	},
-/turf/open/floor/plasteel/mono/white,
-/area/ship/medical)
-"UK" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+/obj/effect/turf_decal/corner/opaque/blue,
+/obj/structure/chair{
+	dir = 4
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/white,
+/area/ship/crew/canteen)
+"RQ" = (
+/obj/effect/turf_decal/box/white/corners{
+	color = "#B7D993";
 	dir = 1
 	},
-/obj/effect/turf_decal/siding/wood{
+/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer4{
 	dir = 8
 	},
+/obj/machinery/portable_atmospherics/canister/hydrogen,
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering)
+"RT" = (
+/obj/machinery/suit_storage_unit/inherit/industrial,
+/obj/item/clothing/suit/space/hardsuit/clip_patroller,
+/obj/item/clothing/mask/breath,
+/obj/item/tank/internals/oxygen,
+/obj/effect/turf_decal/industrial/warning/green/fulltile,
 /turf/open/floor/plasteel/dark,
-/area/ship/crew)
-"UP" = (
-/obj/effect/turf_decal/box/corners{
-	dir = 4;
-	color = "#75A2BB"
-	},
-/obj/effect/turf_decal/box/corners{
-	color = "#75A2BB"
+/area/ship/security/armory)
+"RU" = (
+/obj/effect/turf_decal/minutemen/edge,
+/obj/effect/turf_decal/spline/fancy/opaque/black,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"Se" = (
+/obj/machinery/door/firedoor,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
 	},
-/obj/effect/turf_decal/corner_steel_grid{
-	dir = 9
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 8
 	},
-/obj/structure/weightmachine/weightlifter,
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/turf/open/floor/pod/dark,
-/area/ship/cargo)
-"US" = (
-/obj/structure/catwalk/over/plated_catwalk/dark,
-/obj/machinery/computer/cargo{
-	dir = 8;
-	icon_state = "computer-right"
-	},
-/turf/open/floor/plasteel/telecomms_floor,
-/area/ship/bridge)
-"UY" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 9
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/hallway/central)
+"Sk" = (
+/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer4{
+	dir = 8
 	},
-/obj/structure/catwalk/over,
-/obj/machinery/power/apc/auto_name/directional/east,
-/obj/structure/cable{
-	icon_state = "0-2"
+/obj/machinery/portable_atmospherics/canister/hydrogen,
+/obj/effect/turf_decal/box/white/corners{
+	color = "#B7D993"
 	},
-/obj/structure/cable{
-	icon_state = "1-2"
+/obj/machinery/light/small/directional/east,
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering)
+"Sp" = (
+/obj/structure/grille,
+/obj/structure/window/reinforced/fulltile,
+/obj/machinery/door/poddoor/shutters{
+	id = "atlas_officers"
 	},
 /turf/open/floor/plating,
+/area/ship/crew/dorm/commad)
+"Sz" = (
+/obj/effect/turf_decal/corner/transparent/lime/full,
+/obj/structure/table/reinforced,
+/obj/machinery/cell_charger{
+	pixel_y = 9
+	},
+/turf/open/floor/plasteel/tech,
 /area/ship/engineering)
-"Vk" = (
+"SG" = (
+/obj/machinery/newscaster/directional/south,
+/obj/effect/turf_decal/corner/opaque/blue/border,
+/obj/effect/turf_decal/corner/opaque/white/bordercorner{
+	dir = 4
+	},
+/obj/effect/turf_decal/corner/opaque/blue/bordercorner{
+	dir = 1
+	},
+/obj/structure/extinguisher_cabinet/directional/west{
+	pixel_y = 5
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/dorm)
+"SK" = (
+/obj/structure/sign/clip,
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/ship/medical)
+"ST" = (
 /obj/structure/table/reinforced,
 /obj/item/paper_bin{
 	pixel_y = 5;
@@ -4669,9 +5936,6 @@
 	pixel_y = 5;
 	pixel_x = 16
 	},
-/obj/machinery/door/window/brigdoor/southleft{
-	req_access = list(3)
-	},
 /obj/item/flashlight/lamp{
 	pixel_x = -8;
 	pixel_y = 13
@@ -4681,157 +5945,261 @@
 	},
 /obj/item/stamp/denied,
 /obj/machinery/door/firedoor/border_only,
-/turf/open/floor/plasteel/dark,
-/area/ship/security)
-"Vl" = (
-/obj/effect/turf_decal/corner/transparent/blue/border{
+/obj/effect/turf_decal/siding/thinplating/corner{
 	dir = 8
 	},
-/obj/structure/curtain,
-/obj/effect/turf_decal/corner/transparent/blue/mono,
-/obj/machinery/door/firedoor/border_only{
-	dir = 8
+/obj/machinery/door/poddoor/shutters{
+	id = "atlas_armory_desk"
 	},
-/obj/effect/turf_decal/siding/thinplating{
+/obj/machinery/door/window/brigdoor/northleft{
+	req_one_access = list(19, 3)
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/security/armory)
+"Ti" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 8
 	},
-/turf/open/floor/plasteel/mono/white,
-/area/ship/medical)
-"Vo" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced/fulltile,
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/door/airlock/command/glass{
+	dir = 8;
+	name = "Bridge";
+	req_one_access = list(19, 3);
+	id_tag = "atlas_bridge_entry"
+	},
 /obj/machinery/door/poddoor/shutters/preopen{
-	id = "atlas_med"
+	dir = 8;
+	id = "atlas_bridgelockdown"
 	},
-/turf/open/floor/plating,
-/area/ship/medical)
-"Vq" = (
-/obj/structure/rack,
-/obj/effect/turf_decal/trimline/transparent/blue/filled,
-/obj/machinery/light/directional/north,
-/obj/structure/window/reinforced{
+/obj/machinery/door/firedoor/border_only{
 	dir = 8
 	},
-/obj/item/ammo_box/magazine/cm5_9mm{
-	pixel_x = -4;
-	pixel_y = 7
-	},
-/obj/item/ammo_box/magazine/cm23{
-	pixel_y = 9;
-	pixel_x = 8
+/obj/machinery/door/firedoor/border_only{
+	dir = 4
 	},
-/obj/item/melee/knife/survival{
-	pixel_x = 8;
-	pixel_y = -2
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/bridge)
+"Tx" = (
+/obj/structure/railing{
+	dir = 4;
+	pixel_x = -1
 	},
-/obj/item/ammo_box/magazine/cm23{
-	pixel_y = 9;
-	pixel_x = 8
+/obj/structure/chair{
+	dir = 4
 	},
-/obj/item/ammo_box/magazine/cm23{
-	pixel_y = 9;
-	pixel_x = 8
+/obj/effect/turf_decal/techfloor{
+	dir = 4
 	},
-/obj/item/ammo_box/magazine/cm23{
-	pixel_y = 9;
-	pixel_x = 8
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/extinguisher_cabinet/directional/north{
+	pixel_x = 5
 	},
-/obj/item/ammo_box/magazine/cm5_9mm{
-	pixel_x = -4;
-	pixel_y = 7
+/obj/machinery/firealarm/directional/north{
+	pixel_x = -7
 	},
-/obj/item/ammo_box/magazine/p16{
-	pixel_x = -6
+/turf/open/floor/plasteel,
+/area/ship/bridge)
+"Ty" = (
+/obj/effect/turf_decal/corner/opaque/white/half,
+/obj/effect/turf_decal/corner/opaque/white/half{
+	dir = 1
 	},
-/obj/item/ammo_box/magazine/p16{
-	pixel_x = -6
+/obj/structure/table/reinforced,
+/obj/structure/sink/chem{
+	pixel_y = 3
 	},
-/obj/item/melee/knife/survival{
-	pixel_x = 7;
-	pixel_y = -1
+/obj/structure/mirror{
+	pixel_y = 28
 	},
-/obj/item/melee/knife/survival{
-	pixel_x = 10;
-	pixel_y = -6
+/obj/item/reagent_containers/spray/cleaner{
+	pixel_x = 15;
+	pixel_y = 17
 	},
-/obj/item/melee/knife/survival{
-	pixel_x = 9;
-	pixel_y = -4
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/white,
+/area/ship/crew/toilet)
+"TE" = (
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/ship/cargo)
+"TJ" = (
+/obj/effect/turf_decal/siding/thinplating/dark,
+/obj/effect/turf_decal/corner/opaque/black/half,
+/obj/effect/turf_decal/corner/opaque/mauve/border{
+	dir = 1
 	},
+/obj/effect/turf_decal/trimline/opaque/blue/warning,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
+/obj/machinery/light/directional/north,
 /turf/open/floor/plasteel/dark,
-/area/ship/security)
-"Vw" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 4
+/area/ship/hallway/central)
+"TK" = (
+/obj/effect/turf_decal/corner/opaque/white/half{
+	dir = 1
 	},
-/obj/effect/turf_decal/siding/thinplating/dark/corner,
-/turf/open/floor/plasteel/dark,
-/area/ship/crew/crewthree)
-"VG" = (
-/obj/machinery/modular_computer/console/preset/command{
+/obj/effect/turf_decal/corner/opaque/white/half,
+/obj/effect/decal/cleanable/blood/old{
+	icon_state = "floor4-old";
+	pixel_x = -3;
+	pixel_y = 17
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
 	dir = 8
 	},
-/obj/machinery/light/directional/south,
-/obj/structure/catwalk/over/plated_catwalk/dark,
-/turf/open/floor/plasteel/telecomms_floor,
-/area/ship/bridge)
-"VK" = (
+/turf/open/floor/plasteel/white,
+/area/ship/crew/toilet)
+"TT" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/structure/closet/secure_closet/engineering_welding,
-/turf/open/floor/engine/hull/interior,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/tech,
 /area/ship/engineering)
-"VQ" = (
-/obj/structure/railing{
+"Um" = (
+/obj/effect/turf_decal/industrial/warning/green{
+	dir = 6
+	},
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+	dir = 1;
+	filter_types = list("o2")
+	},
+/obj/effect/turf_decal/atmos/oxygen{
+	pixel_x = 5;
+	pixel_y = 9
+	},
+/turf/open/floor/engine/hull/reinforced,
+/area/ship/engineering)
+"Up" = (
+/obj/effect/turf_decal/corner/transparent/lime/half{
+	dir = 4
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering)
+"Ur" = (
+/obj/effect/turf_decal/minutemen/edge{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "2-4"
+	},
+/obj/structure/cable{
+	icon_state = "1-4"
+	},
+/obj/structure/catwalk/over,
+/obj/effect/turf_decal/corner/transparent/lime/half{
 	dir = 8
 	},
-/obj/structure/railing{
+/turf/open/floor/plating,
+/area/ship/engineering)
+"UC" = (
+/obj/effect/turf_decal/corner/transparent/blue/diagonal,
+/obj/effect/turf_decal/spline/fancy/opaque/white,
+/turf/open/floor/plasteel/white,
+/area/ship/medical)
+"UF" = (
+/obj/structure/table/reinforced,
+/obj/machinery/coffeemaker{
+	pixel_x = 6;
+	pixel_y = 3
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/item/storage/fancy/coffee_cart_rack{
+	pixel_x = -9;
+	pixel_y = 3
+	},
+/turf/open/floor/plasteel,
+/area/ship/bridge)
+"UO" = (
+/obj/effect/turf_decal/corner/transparent/lime/half{
 	dir = 4
 	},
+/obj/machinery/light/small/directional/east,
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering)
+"UR" = (
+/obj/effect/turf_decal/corner_steel_grid{
+	dir = 5;
+	layer = 2.030
+	},
+/obj/effect/turf_decal/corner_steel_grid{
+	dir = 10
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/structure/sign/warning/nosmoking{
+	pixel_x = -28
+	},
+/turf/open/floor/pod/light,
+/area/ship/cargo)
+"US" = (
+/obj/effect/turf_decal/minutemen/edge{
+	dir = 1
+	},
+/obj/effect/turf_decal/spline/fancy/opaque/black{
+	dir = 1
+	},
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/obj/structure/extinguisher_cabinet/directional/east,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/turf/open/floor/plasteel/stairs/modern/dark,
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"UV" = (
+/obj/machinery/camera/autoname{
+	dir = 10;
+	network = list("atlas")
+	},
+/turf/open/floor/engine/hull/reinforced,
+/area/ship/external/dark)
+"Vk" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/turf/open/floor/plasteel/tech,
 /area/ship/engineering)
-"VR" = (
-/obj/effect/turf_decal/trimline/transparent/blue/filled/line{
-	dir = 8
+"Vo" = (
+/obj/structure/grille,
+/obj/structure/window/reinforced/fulltile,
+/obj/machinery/door/poddoor/shutters{
+	id = "atlas_medical"
 	},
-/obj/effect/turf_decal/trimline/transparent/blue/filled/line{
-	dir = 4
+/turf/open/floor/plating,
+/area/ship/medical)
+"Vs" = (
+/obj/structure/grille,
+/obj/structure/window/reinforced/fulltile,
+/obj/machinery/atmospherics/pipe/layer_manifold,
+/obj/machinery/door/poddoor/shutters{
+	id = "atlas_engi_north"
 	},
-/obj/effect/turf_decal/siding/thinplating/dark{
-	dir = 4
+/turf/open/floor/plating,
+/area/ship/engineering)
+"VE" = (
+/obj/machinery/porta_turret/ship/clip/heavy{
+	dir = 6;
+	id = "atlas_turrets"
 	},
-/obj/effect/turf_decal/siding/thinplating/dark{
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/ship/crew/toilet)
+"VP" = (
+/obj/structure/platform/industrial{
 	dir = 8
 	},
-/turf/open/floor/plasteel/tech/grid,
-/area/ship/security)
-"VT" = (
-/obj/effect/turf_decal/spline/fancy/opaque/black/corner,
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
-	dir = 1
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
+/obj/effect/turf_decal/corner/transparent/lime/half{
+	dir = 8
 	},
 /obj/structure/cable{
 	icon_state = "2-4"
 	},
-/obj/structure/extinguisher_cabinet/directional/north,
-/obj/effect/turf_decal/siding/thinplating/dark/corner{
-	dir = 8
-	},
-/obj/effect/turf_decal/siding/thinplating/dark/corner{
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
 	dir = 4
 	},
-/turf/open/floor/plasteel/dark,
-/area/ship/crew/canteen)
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering)
 "VW" = (
 /obj/effect/decal/fakelattice{
 	icon_state = "lattice-6"
@@ -4839,192 +6207,367 @@
 /obj/structure/lattice/catwalk,
 /turf/open/floor/plating,
 /area/ship/external/dark)
-"We" = (
-/obj/machinery/door/firedoor/border_only,
-/turf/open/floor/plasteel/dark,
-/area/ship/crew/canteen)
 "Wg" = (
 /obj/structure/catwalk/over/plated_catwalk/dark,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/structure/cable{
-	icon_state = "1-2"
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
 	},
-/obj/effect/turf_decal/industrial/warning{
-	dir = 1;
-	layer = 2.456
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 8
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
 	},
 /turf/open/floor/plating,
 /area/ship/hallway/central)
-"Wi" = (
-/turf/open/floor/plasteel/grimy,
-/area/ship/crew/canteen)
 "Wk" = (
-/obj/effect/turf_decal/corner/transparent/blue{
-	dir = 10
+/obj/machinery/door/firedoor,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/structure/cable{
+	icon_state = "1-2"
 	},
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/hallway/central)
+"Wm" = (
+/obj/effect/turf_decal/industrial/warning/green,
 /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/firedoor/border_only{
-	dir = 1
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/hallway/central)
+"Wq" = (
+/obj/machinery/camera/autoname{
+	dir = 8;
+	network = list("atlas")
 	},
-/obj/machinery/door/firedoor/border_only,
-/obj/machinery/door/airlock/medical{
-	name = "Medical Bay"
+/obj/effect/turf_decal/box/white/corners{
+	color = "#B7D993"
 	},
-/turf/open/floor/plasteel/white,
-/area/ship/medical)
+/obj/structure/rack,
+/obj/item/storage/bag/trash{
+	pixel_x = 6;
+	pixel_y = -4
+	},
+/obj/item/storage/bag/trash{
+	pixel_x = 10;
+	pixel_y = -5
+	},
+/obj/item/storage/bag/trash{
+	pixel_x = 6;
+	pixel_y = -7
+	},
+/obj/item/reagent_containers/glass/bucket{
+	pixel_x = -5;
+	pixel_y = 9
+	},
+/obj/item/caution{
+	pixel_x = -8;
+	pixel_y = -2
+	},
+/obj/item/caution{
+	pixel_x = -4;
+	pixel_y = -6
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering)
 "Wr" = (
-/obj/machinery/door/airlock/grunge{
-	dir = 4;
-	name = "First Officer's Quarters";
-	req_one_access = list(19)
+/obj/effect/turf_decal/minutemen/middle,
+/obj/machinery/holopad/emergency/command,
+/obj/structure/cable{
+	icon_state = "2-8"
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"Wx" = (
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 8
+	},
+/obj/effect/turf_decal/corner/opaque/black/half{
+	dir = 8
+	},
+/obj/effect/turf_decal/trimline/opaque/blue/warning{
+	dir = 8
+	},
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+	dir = 8
+	},
+/obj/effect/turf_decal/trimline/opaque/beige/filled/line{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
+/area/ship/hallway/central)
+"WA" = (
+/obj/structure/catwalk/over/plated_catwalk/dark,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
 	},
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/machinery/door/firedoor/border_only{
-	dir = 4
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
+/turf/open/floor/plating,
+/area/ship/hallway/central)
+"WE" = (
+/obj/effect/turf_decal/corner/opaque/blue/border{
+	dir = 1
 	},
-/obj/machinery/door/firedoor/border_only{
+/obj/effect/turf_decal/corner/opaque/blue/bordercorner,
+/obj/effect/turf_decal/corner/opaque/white/bordercorner{
 	dir = 8
 	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 6
+	},
 /turf/open/floor/plasteel/dark,
-/area/ship/crew/crewtwo)
-"Wx" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced/fulltile,
-/obj/machinery/door/poddoor/shutters/preopen{
-	dir = 8;
-	id = "atlas_bridge_lockdown"
+/area/ship/crew/dorm)
+"WI" = (
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+	dir = 5
 	},
+/obj/machinery/atmospherics/components/binary/pump/on/layer2{
+	name = "air to distro";
+	dir = 4
+	},
+/obj/structure/catwalk/over,
 /turf/open/floor/plating,
-/area/ship/bridge)
+/area/ship/engineering)
 "WO" = (
-/obj/machinery/cryopod{
-	dir = 8
+/obj/structure/window,
+/obj/structure/urinal{
+	dir = 4;
+	pixel_x = -13
 	},
-/obj/effect/turf_decal/techfloor/orange{
-	dir = 4
+/obj/effect/turf_decal/corner/opaque/white/half{
+	dir = 1
 	},
-/obj/machinery/light/directional/north,
-/turf/open/floor/plasteel/tech/grid,
-/area/ship/crew)
+/obj/effect/turf_decal/corner/opaque/white/half,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/white,
+/area/ship/crew/toilet)
 "WQ" = (
-/obj/machinery/door/airlock/grunge{
-	dir = 4;
-	name = "Engineering"
+/obj/structure/railing/thin{
+	dir = 6
 	},
-/obj/effect/turf_decal/siding/thinplating/dark/corner,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 8
+/obj/effect/turf_decal/corner/transparent/lime/half,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+	dir = 9
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+/obj/effect/turf_decal/corner/transparent/lime/half{
 	dir = 4
 	},
-/obj/effect/turf_decal/siding/thinplating/dark/corner,
-/obj/effect/turf_decal/siding/thinplating/dark/corner{
+/obj/structure/rack,
+/obj/item/storage/toolbox/mechanical{
+	pixel_x = -3;
+	pixel_y = 9
+	},
+/obj/item/storage/toolbox/electrical{
+	pixel_x = 3;
+	pixel_y = 2
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering)
+"WR" = (
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 1
+	},
+/obj/effect/turf_decal/corner/opaque/black/half{
+	dir = 1
+	},
+/obj/effect/turf_decal/corner/opaque/blue/border,
+/obj/effect/turf_decal/trimline/opaque/blue/warning{
+	dir = 1
+	},
+/obj/effect/turf_decal/industrial/warning/green{
+	dir = 8
+	},
+/turf/open/floor/plasteel,
+/area/ship/hallway/central)
+"WY" = (
+/obj/structure/grille,
+/obj/structure/window/reinforced/fulltile,
+/obj/machinery/door/poddoor/shutters{
+	id = "atlas_engi_north"
+	},
+/turf/open/floor/plating,
+/area/ship/engineering)
+"WZ" = (
+/obj/effect/turf_decal/corner/opaque/white/half,
+/obj/effect/turf_decal/corner/opaque/white/half{
+	dir = 1
+	},
+/obj/machinery/door/airlock/grunge{
+	name = "Head"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/effect/turf_decal/siding/thinplating/corner{
 	dir = 4
 	},
+/obj/effect/turf_decal/siding/thinplating/corner{
+	dir = 1
+	},
 /obj/structure/cable{
-	icon_state = "4-8"
+	icon_state = "1-2"
 	},
 /obj/machinery/door/firedoor/border_only{
+	dir = 1
+	},
+/obj/machinery/door/firedoor/border_only,
+/turf/open/floor/plasteel/white,
+/area/ship/crew/toilet)
+"Xg" = (
+/obj/effect/turf_decal/siding/thinplating/dark,
+/obj/effect/turf_decal/corner/opaque/black/half,
+/obj/effect/turf_decal/trimline/opaque/blue/warning,
+/obj/effect/turf_decal/corner/opaque/blue/border{
+	dir = 1
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel,
+/area/ship/hallway/central)
+"Xl" = (
+/obj/effect/turf_decal/corner/opaque/black/half,
+/obj/effect/turf_decal/corner/opaque/black/half{
+	dir = 1
+	},
+/obj/effect/turf_decal/trimline/transparent/blue/filled/corner{
+	dir = 1
+	},
+/obj/structure/table,
+/obj/item/storage/fancy/donut_box{
+	pixel_y = 4
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/canteen)
+"Xp" = (
+/obj/effect/turf_decal/corner/opaque/black/half{
 	dir = 4
 	},
-/obj/machinery/door/firedoor/border_only{
+/obj/effect/turf_decal/trimline/opaque/blue/warning{
+	dir = 4
+	},
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 4
+	},
+/obj/effect/turf_decal/corner/opaque/blue/border{
 	dir = 8
 	},
-/turf/open/floor/plasteel/dark,
-/area/ship/engineering)
-"WR" = (
-/obj/effect/spawner/bunk_bed{
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/camera/autoname{
+	dir = 6;
+	network = list("atlas")
+	},
+/obj/machinery/airalarm/directional/west,
+/turf/open/floor/plasteel,
+/area/ship/hallway/central)
+"XC" = (
+/obj/structure/table,
+/obj/machinery/microwave{
+	pixel_x = -1;
+	pixel_y = 9
+	},
+/obj/machinery/light/directional/north,
+/obj/effect/turf_decal/corner/opaque/black/half{
+	dir = 1
+	},
+/obj/effect/turf_decal/industrial/warning/green/corner{
+	dir = 4
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/canteen)
+"XT" = (
+/obj/structure/reagent_dispensers/watertank,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+	dir = 4
+	},
+/turf/open/floor/pod/light,
+/area/ship/cargo)
+"XZ" = (
+/obj/machinery/porta_turret/ship/clip{
+	id = "atlas_turrets";
+	dir = 5
+	},
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/ship/crew/dorm/commad)
+"Ya" = (
+/obj/effect/turf_decal/trimline/transparent/blue/filled/corner{
 	dir = 1
 	},
-/obj/structure/curtain/cloth,
-/turf/open/floor/carpet/blue,
-/area/ship/crew)
-"WZ" = (
-/obj/structure/catwalk/over,
-/obj/machinery/firealarm/directional/east,
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/structure/cable{
-	icon_state = "1-10"
+/turf/open/floor/plasteel/dark,
+/area/ship/security/armory)
+"Yg" = (
+/obj/item/paper_bin{
+	pixel_x = 8;
+	pixel_y = 5
 	},
-/obj/structure/cable{
-	icon_state = "1-8"
+/obj/item/pen/fourcolor{
+	pixel_x = 8;
+	pixel_y = 5
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/turf/open/floor/plating,
-/area/ship/engineering)
-"Xc" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 6
+/obj/structure/table/reinforced,
+/obj/item/stamp{
+	pixel_x = -3;
+	pixel_y = 12
 	},
-/obj/machinery/light_switch{
-	dir = 4;
-	pixel_x = -23
+/obj/item/stamp/clip/cmm{
+	pixel_x = -9;
+	pixel_y = 8
 	},
-/turf/open/floor/plasteel/dark,
-/area/ship/crew/crewthree)
-"Xg" = (
-/obj/effect/turf_decal/trimline/transparent/blue/warning{
-	dir = 6
+/obj/item/stamp/denied{
+	pixel_x = -3;
+	pixel_y = 2
 	},
-/turf/open/floor/plasteel/dark,
-/area/ship/hallway/central)
-"Xl" = (
-/obj/effect/turf_decal/siding/thinplating/dark{
-	dir = 1
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/airalarm/directional/north,
+/turf/open/floor/plasteel,
+/area/ship/bridge)
+"Yh" = (
+/obj/structure/catwalk/over/plated_catwalk/dark,
+/obj/machinery/computer/cargo{
+	dir = 8;
+	icon_state = "computer-left";
+	pixel_x = 7;
+	pixel_y = 4
 	},
-/obj/structure/railing,
-/obj/machinery/firealarm/directional/north,
-/obj/machinery/light_switch{
-	pixel_y = 23;
-	pixel_x = 10
+/turf/open/floor/plasteel/telecomms_floor,
+/area/ship/bridge)
+"Yi" = (
+/obj/effect/turf_decal/minutemen/corner,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 8
 	},
-/turf/open/floor/pod/dark,
-/area/ship/crew/canteen)
-"Xp" = (
 /obj/structure/cable{
-	icon_state = "1-4"
+	icon_state = "2-9"
 	},
 /obj/structure/catwalk/over,
+/obj/effect/turf_decal/corner/transparent/lime/half{
+	dir = 8
+	},
 /turf/open/floor/plating,
 /area/ship/engineering)
-"XT" = (
-/obj/structure/window/reinforced{
-	dir = 4
-	},
-/obj/effect/turf_decal/trimline/transparent/blue/corner{
-	dir = 4
+"Yl" = (
+/obj/effect/turf_decal/corner/transparent/blue/mono,
+/obj/structure/crate_shelf,
+/obj/machinery/light/small/directional/west,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/airalarm/directional/south,
+/turf/open/floor/plasteel/mono/white,
+/area/ship/medical)
+"Yr" = (
+/obj/effect/turf_decal/corner/opaque/black/half{
+	dir = 1
 	},
-/obj/structure/chair/plastic{
-	dir = 8;
-	pixel_x = -4
+/obj/effect/turf_decal/trimline/transparent/blue/filled/line{
+	dir = 1
 	},
 /turf/open/floor/plasteel/dark,
-/area/ship/security)
-"XZ" = (
-/obj/machinery/porta_turret/ship/clip{
-	id = "atlas";
-	dir = 5
-	},
-/turf/closed/wall/mineral/plastitanium/nodiagonal,
-/area/ship/crew/crewthree)
-"Ya" = (
-/turf/open/floor/plasteel/tech,
 /area/ship/crew/canteen)
 "Yt" = (
 /obj/docking_port/stationary{
@@ -5034,209 +6577,216 @@
 	},
 /turf/template_noop,
 /area/template_noop)
-"Yu" = (
-/obj/item/food/cakeslice/birthday{
-	pixel_x = 6;
-	pixel_y = 3
+"Yw" = (
+/obj/effect/turf_decal/industrial/warning/green/corner{
+	dir = 8
 	},
-/obj/structure/cable{
-	icon_state = "2-8"
+/obj/machinery/atmospherics/pipe/layer_manifold,
+/obj/effect/turf_decal/industrial/warning/green{
+	dir = 5
 	},
-/obj/effect/turf_decal/spline/fancy/opaque/black{
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering)
+"YF" = (
+/obj/effect/turf_decal/siding/thinplating/dark{
 	dir = 1
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 6
-	},
-/obj/structure/catwalk/over,
-/turf/open/floor/plating,
-/area/ship/engineering)
-"Yw" = (
-/obj/machinery/door/airlock/mining{
-	name = "Cargo Bay"
+/obj/effect/turf_decal/corner/opaque/black/half{
+	dir = 1
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/structure/cable{
-	icon_state = "1-2"
+/obj/effect/turf_decal/trimline/opaque/blue/warning{
+	dir = 1
 	},
-/obj/machinery/door/firedoor/border_only,
-/obj/machinery/door/firedoor/border_only{
+/obj/effect/turf_decal/corner/opaque/blue/border,
+/turf/open/floor/plasteel,
+/area/ship/hallway/central)
+"YH" = (
+/obj/effect/turf_decal/corner/opaque/black/half{
 	dir = 1
 	},
-/turf/open/floor/plasteel/dark,
-/area/ship/cargo)
-"YG" = (
-/obj/effect/turf_decal/spline/fancy/opaque/black{
+/obj/machinery/power/apc/auto_name/directional/west,
+/obj/machinery/light_switch{
 	dir = 4;
-	pixel_y = 1
+	pixel_x = -19;
+	pixel_y = 13
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 1
+/obj/structure/cable{
+	icon_state = "0-2"
+	},
+/obj/effect/turf_decal/siding/thinplating{
+	dir = 8
+	},
+/obj/effect/turf_decal/spline/fancy/opaque/grey{
+	dir = 4
 	},
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plasteel/mono,
 /area/ship/crew/canteen)
-"YK" = (
-/obj/structure/closet/crate/bin,
-/obj/machinery/firealarm/directional/south,
-/obj/item/broken_bottle,
-/obj/effect/turf_decal/siding/thinplating/dark{
-	dir = 6
-	},
-/turf/open/floor/plasteel/dark,
-/area/ship/crew/crewthree)
 "YM" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced/fulltile,
-/obj/machinery/door/poddoor/shutters/preopen{
-	dir = 8;
-	id = "atlas_fo"
+/obj/structure/chair/plastic{
+	dir = 8
 	},
-/turf/open/floor/plating,
-/area/ship/crew/crewtwo)
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/crew/office)
 "YO" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
-/obj/structure/cable{
-	icon_state = "1-2"
+/obj/machinery/computer/helm{
+	dir = 8;
+	icon_state = "computer-right";
+	pixel_x = 7;
+	pixel_y = 4
 	},
-/turf/open/floor/plasteel/tech,
-/area/ship/cargo)
-"Zd" = (
-/obj/effect/turf_decal/siding/thinplating/dark{
-	dir = 1
+/obj/structure/catwalk/over/plated_catwalk/dark,
+/obj/structure/railing/thin,
+/turf/open/floor/plasteel/telecomms_floor,
+/area/ship/bridge)
+"YP" = (
+/obj/structure/platform/industrial{
+	dir = 1;
+	layer = 2.89
 	},
-/obj/machinery/light/directional/north,
-/turf/open/floor/plasteel/dark,
-/area/ship/crew/canteen)
-"Ze" = (
-/obj/machinery/washing_machine,
-/obj/effect/turf_decal/corner_steel_grid{
-	dir = 10
+/obj/effect/turf_decal/corner/transparent/lime/half{
+	dir = 1
 	},
-/obj/effect/turf_decal/box/corners{
-	dir = 1;
-	color = "#75A2BB"
+/obj/machinery/power/smes/engineering{
+	charge = 1e+006
 	},
-/turf/open/floor/plasteel/tech/grid,
-/area/ship/crew/canteen)
-"Zo" = (
-/obj/structure/table/reinforced,
-/obj/item/paper_bin{
-	pixel_y = 5;
-	pixel_x = 11
+/obj/structure/cable{
+	icon_state = "0-6"
 	},
-/obj/item/pen{
-	pixel_y = 5;
-	pixel_x = 11
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering)
+"YQ" = (
+/obj/effect/turf_decal/corner/transparent/lime/half{
+	dir = 4
 	},
-/obj/item/papercutter{
-	pixel_x = -2;
-	pixel_y = 5
+/obj/machinery/power/apc/auto_name/directional/east,
+/obj/machinery/light_switch{
+	dir = 8;
+	pixel_x = 20;
+	pixel_y = -13
 	},
-/obj/item/areaeditor/shuttle,
-/turf/open/floor/plasteel/telecomms_floor,
-/area/ship/bridge)
-"Zs" = (
-/obj/machinery/door/airlock/command{
-	dir = 4;
-	name = "Bridge";
-	req_one_access = list(19,3)
+/obj/structure/cable{
+	icon_state = "0-8"
 	},
-/obj/effect/turf_decal/corner_techfloor_gray{
-	dir = 9
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering)
+"Ze" = (
+/obj/effect/turf_decal/trimline/transparent/blue/filled/line{
+	dir = 1
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 4
+/obj/effect/turf_decal/siding/thinplating{
+	dir = 1
 	},
-/obj/machinery/door/firedoor/border_only{
+/turf/open/floor/plasteel/dark,
+/area/ship/security/armory)
+"Zo" = (
+/obj/effect/turf_decal/spline/fancy/opaque/black{
 	dir = 8
 	},
-/obj/machinery/door/firedoor/border_only{
-	dir = 4
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
+/obj/effect/turf_decal/spline/fancy/opaque/black{
+	dir = 1
 	},
-/obj/machinery/door/poddoor/shutters/preopen{
-	dir = 8;
-	id = "atlas_bridge_lockdown"
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+	dir = 1
 	},
-/turf/open/floor/plasteel/telecomms_floor,
+/turf/open/floor/plasteel/dark,
 /area/ship/bridge)
-"ZE" = (
-/obj/machinery/airalarm/directional/north,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 10
+"Zs" = (
+/obj/effect/turf_decal/corner/opaque/blue/diagonal,
+/obj/structure/chair{
+	dir = 4
 	},
-/obj/effect/turf_decal/siding/thinplating/dark/corner{
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/white,
+/area/ship/crew/canteen)
+"Zw" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
+/obj/effect/turf_decal/trimline/transparent/blue/filled/line{
+	dir = 1
+	},
+/obj/effect/turf_decal/siding/thinplating{
 	dir = 1
 	},
 /turf/open/floor/plasteel/dark,
-/area/ship/crew/crewtwo)
+/area/ship/security/armory)
+"ZF" = (
+/obj/item/paper/guides/jobs/engi/combustion_thruster,
+/obj/structure/noticeboard{
+	pixel_y = 28
+	},
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering)
 "ZG" = (
-/obj/structure/sign/poster/clip/enlist{
-	pixel_y = 32
+/obj/structure/dresser{
+	pixel_y = 3
 	},
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
-	dir = 4
+/obj/item/flashlight/lamp{
+	pixel_x = 4;
+	pixel_y = 15
 	},
-/obj/effect/spawner/bunk_bed{
+/turf/open/floor/carpet/nanoweave/blue,
+/area/ship/crew/dorm)
+"ZW" = (
+/obj/effect/turf_decal/spline/fancy/opaque/black{
 	dir = 1
 	},
-/obj/structure/curtain/cloth,
-/turf/open/floor/carpet/blue,
-/area/ship/crew)
-"ZM" = (
-/obj/machinery/power/terminal{
-	dir = 8
+/obj/effect/turf_decal/stairs{
+	dir = 9;
+	color = "#535456"
 	},
 /obj/structure/cable{
-	icon_state = "0-5"
+	icon_state = "1-2"
 	},
-/obj/structure/platform/industrial,
-/turf/open/floor/plating,
-/area/ship/engineering)
-"ZU" = (
-/obj/effect/turf_decal/techfloor{
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"ZX" = (
+/obj/machinery/atmospherics/pipe/layer_manifold{
 	dir = 4
 	},
-/obj/structure/closet/emcloset/anchored,
-/turf/open/floor/plasteel/dark,
-/area/ship/hallway/central)
+/obj/structure/catwalk/over,
+/turf/open/floor/plating,
+/area/ship/engineering)
+"ZY" = (
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/crew/office)
 "ZZ" = (
-/obj/structure/catwalk/over/plated_catwalk/dark,
-/obj/machinery/computer/helm{
-	dir = 8;
-	icon_state = "computer-middle"
+/obj/machinery/camera/autoname{
+	dir = 10;
+	network = list("atlas")
 	},
-/turf/open/floor/plasteel/telecomms_floor,
-/area/ship/bridge)
+/obj/structure/sign/warning/nosmoking{
+	pixel_y = -28
+	},
+/obj/machinery/atmospherics/components/trinary/mixer/layer4{
+	dir = 8
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering)
 
 (1,1,1) = {"
 ps
 ps
 ps
 ps
-ms
-ps
-af
-af
 ps
 ps
 ps
 ps
+PU
+BW
+PU
+PU
+PU
 ps
 ps
 ps
 ps
 ps
-Bm
-Bm
 ps
-vS
 ps
 ps
 "}
@@ -5245,568 +6795,591 @@ ps
 ps
 ps
 ps
-PU
-PU
-Ez
-tV
-PU
 ps
 ps
-PU
-sD
-PU
 ps
 ps
 PU
-cN
-cN
-PU
+Yw
+sb
+uO
 PU
 ps
 ps
+ps
+ps
+ps
+ps
+ps
+ps
 "}
 (3,1,1) = {"
 ps
+ms
+Ey
+Ey
+Ko
+af
+af
+tV
+PU
+sn
+iu
+mA
+PU
+tV
+af
+af
+Ko
+Ey
+Ey
+vS
 ps
-ps
+"}
+(4,1,1) = {"
 ps
 PU
-Ti
-My
-Pj
 PU
-Bm
-Bm
 PU
-zf
 PU
-Bm
-Bm
+mH
+cs
+zx
 PU
-bK
-bK
-Hl
 PU
-ps
-ps
-"}
-(4,1,1) = {"
-ps
-ps
-ps
-ps
-pp
-eW
-yL
-yL
 PU
-jY
-jY
+nl
+PU
+Qt
+DC
+lc
+PU
 PU
-Qu
 PU
-jY
-jY
 PU
-yL
-JR
-TA
-pp
-ps
 ps
 "}
 (5,1,1) = {"
 ps
-ps
-ps
-ps
-pp
-Py
-Yu
+PU
+mC
+nI
+ts
+pv
+pv
+cd
+YP
+pi
+pS
+Vk
+LT
 fM
-vo
-wc
-mw
-Hh
-Qg
-wd
-mw
-ZM
-Eo
-Rv
-Mu
-MH
-pp
-ps
+Cn
+pv
+ga
+gA
+DX
+PU
 ps
 "}
 (6,1,1) = {"
-ps
-ps
-ps
-bF
+KO
+WY
 vZ
-VK
-Kf
-jR
-iN
-sh
-vw
-UY
-OA
-vd
-WZ
-VQ
-PX
-mK
-Xp
-Cr
-pp
-ps
-ps
+Oo
+Sz
+oX
+oX
+QA
+tW
+Yi
+Ur
+kE
+lB
+Rd
+pE
+mn
+vy
+Kh
+KK
+hO
+eY
 "}
 (7,1,1) = {"
-ps
-ps
-ps
+FB
+WY
+OI
+fw
+vB
+Kg
+cB
+WQ
+am
+nu
+Ic
+yq
+LP
+DM
+bj
+WI
+uo
+sK
+ZX
+pp
+zz
+"}
+(8,1,1) = {"
+bF
+Vs
+LX
+TT
+ja
+Bo
+uC
+VP
+NN
+dy
+jw
+gC
+QT
+iY
+aL
+Gc
+bu
+dY
+dO
+cE
+Um
+"}
+(9,1,1) = {"
 ps
 mN
 PU
-Cc
-qS
-fd
-PU
-WQ
-PU
-PU
-PU
-PU
-PU
-BL
-qG
-wU
+ZF
+it
+JK
+Pk
+ND
+yJ
+BX
+YQ
+Up
+UO
+Gl
+GM
+xg
+xt
+ZZ
 PU
 mN
 ps
-ps
 "}
-(8,1,1) = {"
-ps
-ps
-ps
+(10,1,1) = {"
 ps
 ps
 PU
+Dz
+Wq
+PU
+PU
+PU
 PU
 PU
 PU
-tW
-eK
-tW
-Ze
-fL
 Gj
-tW
 PU
+nv
 PU
 PU
+RQ
+Sk
 PU
 ps
 ps
-ps
 "}
-(9,1,1) = {"
-ps
-ps
-ps
+(11,1,1) = {"
 ps
 ps
 gT
-Qx
-Gi
-oY
-tW
-em
-tW
+gT
+gT
+gT
+gT
+IO
+uX
 zl
-Ya
-gk
-tW
-LE
-LE
-LE
-ps
-ps
+vH
+tF
+iS
+jN
+PU
+PU
+PU
+PU
+PU
 ps
 ps
 "}
-(10,1,1) = {"
-ps
+(12,1,1) = {"
 ps
 ps
 ps
 gT
+fr
+td
 gT
-jc
-XT
-gT
-tW
-VT
-Pd
-kt
-YG
+iJ
+Ml
+be
+vH
 gU
-tW
-HW
-HW
-HW
+bk
+hu
 HW
+lu
+qc
 HW
 ps
 ps
-"}
-(11,1,1) = {"
 ps
+"}
+(13,1,1) = {"
 ps
 ps
 gT
 gT
-kd
-gE
-Bx
+zQ
+Lr
 gT
-kE
-nS
-jI
-fp
-Do
-Sb
+vH
+Bk
+Nk
+vH
+bx
+rn
 nQ
 HW
-WR
-us
-An
+lu
+gs
 HW
 HW
 ps
-"}
-(12,1,1) = {"
-ps
 ps
+"}
+(14,1,1) = {"
 ps
 gT
-Vq
-Sw
-QS
-SB
-Vk
-jG
-IY
-jI
-vy
-nW
-FF
-PK
+gT
+ro
+Ya
+Ay
+gT
+hP
+LI
+YH
+AE
+eJ
+Ln
+Mp
 HW
 ZG
-fR
-ut
-zE
-di
+tJ
+SG
+HW
+HW
 ps
 "}
-(13,1,1) = {"
-ps
-ps
+(15,1,1) = {"
 ps
 gT
-ny
-VR
-aX
-qR
+fL
+Ze
+Mg
+AP
 ST
-ct
-Aa
-nl
-oa
-nW
-FF
-nY
+Yr
+fp
+cf
+cn
+rR
+Rs
+cm
 HW
 fg
-wJ
-UK
-vT
-di
+WE
+Ie
+zE
+tE
 ps
 "}
-(14,1,1) = {"
-ps
-ps
+(16,1,1) = {"
 ps
 gT
-Rz
-Uh
-dV
-uH
-gT
+pZ
+Zw
+mx
+pU
+Dc
 Ig
-Aa
-Wi
-am
-dM
-BI
-cm
-Rf
-Ej
-yi
-aI
+Ar
+Do
+jI
+FD
+Cu
+Ez
+HW
+yo
+fR
+kG
 Qb
-di
+tE
 ps
 "}
-(15,1,1) = {"
-ps
-ps
+(17,1,1) = {"
 ps
 gT
-yo
-fs
-QC
-sl
+Lk
+jf
+EZ
+LH
 gT
 Xl
-Aa
+fp
+Ds
+NU
 wh
-Qt
-OQ
-iS
-hg
-HW
-HW
-Es
-HW
-HW
-HW
+FT
+GN
+Cx
+Mm
+AH
+gw
+CS
+tE
 ps
 "}
-(16,1,1) = {"
-ps
-ps
+(18,1,1) = {"
 ps
 gT
-bQ
-sz
-sI
-gT
+yE
+wO
+xc
+Rf
 gT
 CZ
-EP
-eU
-FI
-Do
-FF
-kv
-NE
-HW
-lJ
-sP
-wi
-HW
+Ar
+RM
+Zs
+LY
+Ra
+rP
+Ok
+Ok
+Ok
+Ok
+Ok
+Ok
 ps
 "}
-(17,1,1) = {"
-ps
-ps
+(19,1,1) = {"
 ps
 gT
-yZ
 gT
-zQ
-PT
-Um
-Cq
-wk
-jI
-Pn
-rr
-FF
-kv
+gT
+zC
+gT
+gT
+XC
+fp
+QL
+wi
+BH
+qh
+Ok
+Ok
 nU
-HW
 WO
 mf
 nO
-HW
+Ok
 ps
 "}
-(18,1,1) = {"
-ps
-ps
+(20,1,1) = {"
 ps
-EO
 gT
-gT
-Zd
-sL
-We
-sL
-IY
-jI
-uU
-rr
-FF
-KB
-HW
-HW
-HW
-HW
-HW
+kN
 RT
+CX
+qy
+xZ
+KA
+LF
+IR
+av
+xj
+Ij
+WZ
+eB
+Pd
+gH
+gy
+MM
+Ok
 ps
 "}
-(19,1,1) = {"
-ps
-ps
-ps
-ps
-ps
+(21,1,1) = {"
+KB
 gT
-MC
-Pi
-sA
-eJ
-RM
-gu
-ES
-bS
-Ss
-wy
-eB
-Qj
+EO
+LL
+uQ
+OW
+iQ
+JU
+vY
+Fh
+if
+BI
+mK
+Ok
+Ty
+TK
 PD
-HW
-ps
-ps
+Ok
+Ok
+Ok
 ps
 "}
-(20,1,1) = {"
-ps
-ps
+(22,1,1) = {"
 ps
+gT
+fF
+RT
+ev
+OW
+iQ
+RG
+Mw
+zN
+fX
+yI
+tB
+Ok
+Gv
+PS
+LE
+Ok
+qC
+Ok
 ps
+"}
+(23,1,1) = {"
 ps
-TE
+Pu
+gT
+gT
 TE
 TE
 TE
 TE
 HX
-PV
+kS
 HX
-PV
+ln
 HX
 CO
 CO
 CO
 CO
-HW
-ps
-ps
+Ok
+Ok
+VE
 ps
 "}
-(21,1,1) = {"
-ps
-ps
+(24,1,1) = {"
 ps
 ps
 ps
 ps
+Ck
+vp
+eD
 TE
-OV
-No
-TE
-ev
-sB
-Ot
-ia
-OW
+iy
+mI
+tg
+Gt
+Kj
 CO
-gy
-zc
+kZ
+Yl
 CO
 ps
 ps
 ps
 ps
 "}
-(22,1,1) = {"
-ps
-ps
+(25,1,1) = {"
 ps
 ps
 ps
 Qz
-TE
-Ld
-yn
+QG
+FY
+aS
 TE
 TE
-zt
-tF
-Ty
+oc
+Wg
+Ma
 CO
 CO
-cY
-cY
+FQ
+an
 CO
 SK
 ps
 ps
 ps
 "}
-(23,1,1) = {"
-ps
-ps
+(26,1,1) = {"
 ps
 ps
 ps
-zq
-Lw
-le
-YO
-Hg
-Yw
-TT
-hL
-TT
-gw
-aC
-FQ
+bh
+fH
+Ot
+Ej
+UR
+zf
+Qh
+BR
+MX
+PK
+we
+LD
 mS
-CX
+Ir
 CO
 ps
 ps
 ps
 "}
-(24,1,1) = {"
-ps
-ps
+(27,1,1) = {"
 ps
 ps
 Yt
 Hu
-nX
-tA
-jZ
-yI
+sD
+lb
+gu
+rb
 TE
-hQ
-rk
-Ln
+KM
+Br
+ia
 CO
-Dq
+lJ
 aa
 JL
 yR
@@ -5815,378 +7388,394 @@ ps
 ps
 ps
 "}
-(25,1,1) = {"
-ps
-ps
+(28,1,1) = {"
 ps
 ps
 ps
 Hu
-nX
-tA
-tA
-UP
-TE
+sD
+MO
+XT
 wW
-rk
-JU
+TE
+TJ
+WA
+cu
 CO
-we
-uO
+jL
+eF
 UC
-yR
+nm
 Vo
 ps
 ps
 ps
 "}
-(26,1,1) = {"
-ps
-ps
+(29,1,1) = {"
 ps
 ps
 ps
-kS
-Ml
-le
-Da
-SI
-nP
-yB
-ix
-yB
-Wk
-zx
-AH
-qA
+Mn
+ah
+is
+ux
+jB
+dR
 xU
+iP
+tq
+bC
+Ek
+sM
+qA
+ky
 CO
 ps
 ps
 ps
 "}
-(27,1,1) = {"
-ps
-ps
+(30,1,1) = {"
 ps
 ps
 ps
 Qz
 TE
-nm
-ov
+AO
+sB
 TE
 TE
-yT
-ec
+uY
+Se
 uY
 CO
 CO
-Vl
-Vl
+vC
+vC
 CO
 SK
 ps
 ps
 ps
-"}
-(28,1,1) = {"
-ps
-ps
-ps
+"}
+(31,1,1) = {"
+ps
 ps
 ps
 ps
 TE
-IK
-xz
+Jn
+zq
 TE
-MO
-Fv
-pE
-uQ
-si
+kv
+yB
+sh
+WR
+dX
 CO
-fF
-UG
+vN
+fi
 CO
 ps
 ps
 ps
 ps
 "}
-(29,1,1) = {"
-ps
-ps
-jp
-VW
+(32,1,1) = {"
+Oj
+tj
 Ey
 Fu
 TE
 TE
 TE
 TE
-kG
-kL
-pi
-BW
-si
+EJ
+Xg
+Wg
+YF
+Gs
 CO
 CO
 CO
 CO
 VW
 Ey
-Fu
+gV
 da
 "}
-(30,1,1) = {"
-ps
-ps
+(33,1,1) = {"
 Oj
-FN
+tc
 xi
 HX
 HX
-EJ
-aS
+Xp
+jU
 uY
-is
-Xg
-lY
+Bx
+hL
+Wg
 oJ
-Sz
+FR
 uY
-iQ
-IR
+KE
+lE
 HX
 HX
 Kc
 da
 da
 "}
-(31,1,1) = {"
-ps
-ps
+(34,1,1) = {"
 Oj
-FN
-FN
-FN
-Cn
-lc
-gH
-QG
-Wg
-fi
-jL
-AP
-gH
-QG
-fj
-RQ
-OW
+tc
+tc
+tc
+nP
+nj
+CJ
+Wk
+xy
+wY
+qM
+lD
+Wm
+DP
+pj
+cX
+yv
 da
 da
 da
 da
 "}
-(32,1,1) = {"
-ps
-ps
+(35,1,1) = {"
 Sp
-jQ
-hR
-FN
-FN
-oX
-FN
-FN
-rR
-BH
-kX
-pq
-ZU
+LU
+wA
+tc
+tc
+mO
+tc
+tc
+wN
+zK
+Jb
+Wx
+Aw
 da
 da
-Wr
+vT
 da
 da
-SW
-Av
+JF
+Qg
 gR
 "}
-(33,1,1) = {"
-ps
-ps
+(36,1,1) = {"
 Sp
-rz
-NY
-hq
-Xc
-uX
-sF
+yX
+FC
+CE
+qt
+ec
+ix
 LM
 LM
-Jb
-Wx
-Zs
+cy
+Ti
+cy
 LM
 LM
-rO
-Ni
-Tx
-iw
-MQ
-CM
+hQ
+fd
+lh
+gb
+EB
+pQ
 gR
 "}
-(34,1,1) = {"
-ps
-ps
+(37,1,1) = {"
 Sp
-RL
-cc
-yC
-Vw
-YK
-LM
-LM
-JV
-FO
-tq
-EZ
-ED
+ds
+KY
+oq
+go
+Pv
+vo
 LM
+eg
+Qw
+FF
+An
+cr
 LM
-of
-Ay
-aw
-Hf
-IP
+Bh
+mJ
+kL
+Dd
+si
+lY
 gR
 "}
-(35,1,1) = {"
-ps
-ps
+(38,1,1) = {"
 XZ
-FN
-LH
-uG
+tc
+uH
+cM
 ry
 LM
 LM
-Mq
-qn
-Qw
-ux
-Pk
-qb
-pn
+LM
+Tx
+gF
+Gr
+gF
+dM
+LM
 LM
 LM
-ZE
-Rt
-EH
+DL
+he
+PV
 da
 GU
 "}
-(36,1,1) = {"
-ps
-ps
+(39,1,1) = {"
 ps
-FN
-FN
-vW
-TK
+tc
+tc
+tc
+iV
 LM
-wu
 js
-js
-Ir
-gA
-gF
-Ea
+bK
+jp
+qr
+qP
+dw
+Zo
 Ea
-lw
+pM
 LM
-mh
-cV
+FE
+sf
 da
 da
 ps
 "}
-(37,1,1) = {"
+(40,1,1) = {"
 ps
+Je
+tc
+yO
+QM
+LM
+FN
+JR
+rk
+RU
+Wr
+US
+ZW
+sF
+pq
+LM
+My
+en
+da
+Je
 ps
+"}
+(41,1,1) = {"
 ps
 Je
-FN
-yO
-PG
+tc
+NJ
+xp
 LM
-tP
-DL
-Zo
-qr
-qP
-dw
-uC
-QM
-VG
+Yg
+bl
+fj
+nY
+PN
+ct
+Lp
+vA
+UF
 LM
-EB
-Km
+YM
+ZY
 da
 Je
 ps
 "}
-(38,1,1) = {"
+(42,1,1) = {"
+ps
+UV
+Cm
+tc
+tc
+LM
+pL
+bl
+xm
+uG
+sL
+mw
+cI
+ho
+Aq
+LM
+ks
+ks
+Ob
+iD
 ps
+"}
+(43,1,1) = {"
 ps
 ps
 Je
-FN
-Gt
-eH
+Je
+Je
 LM
-qc
+aC
 LM
-iO
-RU
-ZZ
-US
-Lp
+Yh
+YO
+fJ
+tX
+Iq
 LM
-qc
+aC
 LM
-iW
-yx
-da
+Je
+Je
 Je
 ps
+ps
 "}
-(39,1,1) = {"
+(44,1,1) = {"
 ps
 ps
 ps
 ps
-Cm
-tc
-tc
-LM
 ps
+di
+IY
 LM
-qc
-qc
-qc
-qc
-qc
+aC
+aC
+aC
+aC
+aC
 LM
+IY
+sz
+ps
+ps
 ps
-LM
-YM
-YM
-Ob
 ps
 ps
 "}
diff --git a/_maps/shuttles/minutemen/minutemen_typhon.dmm b/_maps/shuttles/minutemen/minutemen_typhon.dmm
index 0dfcf2fa92..22b338e06d 100644
--- a/_maps/shuttles/minutemen/minutemen_typhon.dmm
+++ b/_maps/shuttles/minutemen/minutemen_typhon.dmm
@@ -62,19 +62,19 @@
 	pixel_y = 3;
 	pixel_x = -8
 	},
-/obj/item/storage/box/ammo/c9mm{
-	pixel_y = 11;
-	pixel_x = 5
+/obj/structure/window,
+/obj/item/storage/toolbox/ammo/c9mm{
+	pixel_x = 4;
+	pixel_y = 9
 	},
-/obj/item/storage/box/ammo/c9mm{
-	pixel_y = 7;
+/obj/item/storage/box/ammo/c10mm{
+	pixel_y = 3;
 	pixel_x = 5
 	},
 /obj/item/storage/box/ammo/c10mm{
-	pixel_y = 3;
+	pixel_y = -3;
 	pixel_x = 5
 	},
-/obj/structure/window,
 /turf/open/floor/plasteel/dark,
 /area/ship/security)
 "bp" = (
@@ -664,6 +664,11 @@
 /obj/machinery/firealarm/directional/west{
 	pixel_y = -11
 	},
+/obj/item/megaphone/command,
+/obj/item/storage/pouch/squad{
+	pixel_x = -12;
+	pixel_y = -13
+	},
 /turf/open/floor/wood,
 /area/ship/crew/dorm/captain)
 "iR" = (
@@ -1304,6 +1309,10 @@
 /obj/item/clothing/head/soft/utility_navy{
 	pixel_y = 13
 	},
+/obj/item/megaphone/command,
+/obj/item/storage/belt/military/clip{
+	pixel_y = -9
+	},
 /turf/open/floor/plasteel/dark,
 /area/ship/security)
 "qQ" = (
@@ -1678,10 +1687,6 @@
 /obj/effect/turf_decal/techfloor{
 	dir = 10
 	},
-/obj/item/hand_labeler{
-	pixel_x = 12;
-	pixel_y = -9
-	},
 /obj/structure/cable/cyan{
 	icon_state = "1-4"
 	},
@@ -1778,15 +1783,15 @@
 /turf/open/floor/plating,
 /area/ship/engineering/engines/starboard)
 "vz" = (
-/obj/effect/turf_decal/techfloor{
-	dir = 4
-	},
 /obj/effect/turf_decal/siding/thinplating/dark{
 	dir = 4
 	},
 /obj/structure/sign/poster/contraband/cardinal_port_starboard{
 	pixel_x = 27
 	},
+/obj/effect/turf_decal/trimline/transparent/blue/line{
+	dir = 4
+	},
 /turf/open/floor/plasteel/dark,
 /area/ship/hallway/central)
 "vB" = (
@@ -1914,7 +1919,7 @@
 	pixel_y = 17
 	},
 /obj/item/reagent_containers/glass/bottle/welding_fuel{
-	list_reagents = list(/datum/reagent/fuel = 5);
+	list_reagents = list(/datum/reagent/fuel=5);
 	layer = 3.01
 	},
 /turf/open/floor/plating/airless,
@@ -2023,7 +2028,7 @@
 /obj/item/reagent_containers/spray{
 	pixel_y = -5;
 	pixel_x = 6;
-	list_reagents = list(/datum/reagent/water = 120, /datum/reagent/plantnutriment/eznutriment = 20, /datum/reagent/plantnutriment/endurogrow = 10);
+	list_reagents = list(/datum/reagent/water=120,/datum/reagent/plantnutriment/eznutriment=20,/datum/reagent/plantnutriment/endurogrow=10);
 	volume = 150;
 	desc = "A spray bottle with a label saying 'Food'.";
 	name = "'Food' spray"
@@ -2173,14 +2178,14 @@
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/ship/security)
 "Bm" = (
-/obj/effect/turf_decal/techfloor{
-	dir = 1
-	},
 /obj/effect/turf_decal/siding/thinplating/dark{
 	dir = 1
 	},
 /obj/machinery/light/directional/north,
 /obj/structure/chair/handrail,
+/obj/effect/turf_decal/trimline/transparent/blue/line{
+	dir = 1
+	},
 /turf/open/floor/plasteel/dark,
 /area/ship/hallway/central)
 "Bp" = (
@@ -2737,6 +2742,14 @@
 	pixel_y = -6;
 	pixel_x = 12
 	},
+/obj/item/clothing/glasses/sunglasses/ballistic{
+	pixel_y = 7;
+	pixel_x = 2
+	},
+/obj/item/clothing/glasses/sunglasses/ballistic{
+	pixel_x = 2;
+	pixel_y = 2
+	},
 /turf/open/floor/plasteel/dark,
 /area/ship/security)
 "JA" = (
@@ -3490,9 +3503,6 @@
 /obj/effect/turf_decal/trimline/transparent/blue/filled/line{
 	dir = 4
 	},
-/obj/structure/sign/poster/clip/random{
-	pixel_y = 30
-	},
 /obj/structure/cable/cyan{
 	icon_state = "2-8"
 	},
@@ -3511,6 +3521,15 @@
 /obj/effect/turf_decal/techfloor/corner{
 	dir = 8
 	},
+/obj/structure/filingcabinet/double/grey{
+	pixel_y = 18;
+	pixel_x = 6;
+	density = 0
+	},
+/obj/item/clipboard,
+/obj/item/hand_labeler,
+/obj/item/folder/red,
+/obj/item/folder,
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/security)
 "RD" = (
@@ -3729,6 +3748,9 @@
 /obj/item/gun/ballistic/automatic/smg/cm5/no_mag,
 /obj/item/gun/ballistic/automatic/smg/cm5/no_mag,
 /obj/item/gun/ballistic/automatic/pistol/cm23/no_mag,
+/obj/structure/sign/poster/clip/random{
+	pixel_y = 30
+	},
 /turf/open/floor/plasteel/dark,
 /area/ship/security)
 "Tw" = (
@@ -4099,11 +4121,6 @@
 	pixel_x = 2
 	},
 /obj/item/pen,
-/obj/item/clipboard{
-	pixel_y = 9;
-	pixel_x = 5;
-	layer = 2.99
-	},
 /turf/open/floor/plasteel/mono/dark,
 /area/ship/security)
 "Yj" = (
diff --git a/_maps/shuttles/nanotrasen/nanotrasen_kiwi.dmm b/_maps/shuttles/nanotrasen/nanotrasen_kiwi.dmm
index fc4846d960..b12a7bf61a 100644
--- a/_maps/shuttles/nanotrasen/nanotrasen_kiwi.dmm
+++ b/_maps/shuttles/nanotrasen/nanotrasen_kiwi.dmm
@@ -9,10 +9,6 @@
 	icon_state = "computer-left";
 	pixel_x = 7
 	},
-/obj/structure/cable{
-	icon_state = "0-8"
-	},
-/obj/machinery/power/apc/auto_name/directional/north,
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/camera/autoname{
 	dir = 8
@@ -22,6 +18,10 @@
 	pixel_x = 25;
 	pixel_y = -9
 	},
+/obj/machinery/computer/security/telescreen/entertainment{
+	pixel_y = 34
+	},
+/obj/item/radio/intercom/directional/north,
 /turf/open/floor/plasteel/tech,
 /area/ship/engineering)
 "aw" = (
@@ -1717,6 +1717,10 @@
 	pixel_x = 6
 	},
 /obj/effect/decal/cleanable/dirt,
+/obj/item/reagent_containers/glass/bottle/welding_fuel{
+	pixel_y = 2;
+	pixel_x = -4
+	},
 /turf/open/floor/plasteel/patterned/grid/dark,
 /area/ship/science/workshop)
 "lf" = (
@@ -3120,14 +3124,7 @@
 /obj/machinery/camera/autoname{
 	dir = 6
 	},
-/obj/machinery/turretid/ship{
-	id = "ns_miner_grid";
-	pixel_y = 22;
-	pixel_x = 5
-	},
-/obj/machinery/light/small/directional/north{
-	pixel_x = -8
-	},
+/obj/machinery/computer/helm/viewscreen/directional/north,
 /turf/open/floor/plasteel/dark,
 /area/ship/cargo/office)
 "vU" = (
@@ -3556,7 +3553,7 @@
 	name = "kitchen cabinet"
 	},
 /obj/effect/decal/cleanable/food/egg_smudge,
-/obj/structure/chair/handrail{
+/obj/structure/sink/kitchen{
 	dir = 8
 	},
 /obj/effect/decal/cleanable/dirt,
@@ -3706,7 +3703,7 @@
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/structure/cable{
-	icon_state = "1-2"
+	icon_state = "2-4"
 	},
 /obj/effect/turf_decal/borderfloor/full,
 /obj/effect/turf_decal/siding/white{
@@ -3717,6 +3714,7 @@
 	},
 /obj/effect/turf_decal/siding/white/corner,
 /obj/effect/decal/cleanable/dirt,
+/obj/machinery/light/small/directional/west,
 /turf/open/floor/plasteel,
 /area/ship/engineering)
 "zM" = (
@@ -4532,9 +4530,6 @@
 /area/ship/cargo/port)
 "FJ" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
 /obj/effect/turf_decal/borderfloor/full,
 /obj/effect/turf_decal/siding/white{
 	dir = 8
@@ -5298,9 +5293,6 @@
 	dir = 4
 	},
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
-/obj/structure/cable{
-	icon_state = "2-4"
-	},
 /obj/effect/turf_decal/borderfloor/full,
 /obj/effect/turf_decal/siding/white/end{
 	dir = 1
@@ -6257,13 +6249,13 @@
 	pixel_x = -8;
 	pixel_y = 2
 	},
-/obj/item/coffee_cartridge/fancy{
+/obj/item/coffee_cartridge/fancy/roast{
 	pixel_x = -8;
 	pixel_y = -1
 	},
-/obj/item/coffee_cartridge/fancy{
-	pixel_x = -8;
-	pixel_y = -4
+/obj/item/coffee_cartridge/fancy/blend{
+	pixel_y = -4;
+	pixel_x = -8
 	},
 /obj/machinery/light/small/directional/north{
 	pixel_x = 14
@@ -6694,6 +6686,10 @@
 /obj/structure/table/reinforced,
 /obj/effect/turf_decal/siding/thinplating/dark,
 /obj/effect/decal/cleanable/dirt,
+/obj/item/spacecash/bundle/c500{
+	pixel_y = 4;
+	pixel_x = 4
+	},
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/bridge)
 "TI" = (
@@ -6779,10 +6775,10 @@
 /obj/machinery/airalarm/directional/east,
 /obj/machinery/light_switch{
 	dir = 1;
-	pixel_x = -11;
-	pixel_y = -19
+	pixel_x = -12;
+	pixel_y = -20
 	},
-/obj/machinery/light/small/directional/south,
+/obj/machinery/power/apc/auto_name/directional/south,
 /obj/effect/turf_decal/borderfloor/full,
 /obj/effect/turf_decal/siding/white/end{
 	dir = 4
@@ -6827,6 +6823,9 @@
 /obj/item/storage/belt/utility/full/engi,
 /obj/item/radio/headset/alt,
 /obj/item/storage/pouch/engi,
+/obj/structure/cable{
+	icon_state = "0-8"
+	},
 /turf/open/floor/plasteel,
 /area/ship/engineering)
 "Ul" = (
@@ -7207,6 +7206,12 @@
 /obj/effect/turf_decal/trimline/opaque/nsorange/filled/line{
 	dir = 4
 	},
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/turretid/ship{
+	id = "ns_miner_grid";
+	pixel_y = 36;
+	pixel_x = -8
+	},
 /obj/structure/noticeboard{
 	dir = 8;
 	pixel_x = 25
@@ -7219,7 +7224,6 @@
 	pixel_x = 8;
 	pixel_y = 4
 	},
-/obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plasteel/dark,
 /area/ship/cargo/office)
 "Vn" = (
@@ -7658,6 +7662,9 @@
 "Ze" = (
 /obj/structure/chair/comfy/orange/directional/west,
 /obj/effect/decal/cleanable/dirt,
+/obj/structure/sign/poster/contraband/backdoor_xeno_babes_6{
+	pixel_y = -32
+	},
 /turf/open/floor/carpet/nanoweave/orange,
 /area/ship/crew/dorm/dormtwo)
 "Zn" = (
diff --git a/_maps/shuttles/nanotrasen/nanotrasen_magpie.dmm b/_maps/shuttles/nanotrasen/nanotrasen_magpie.dmm
index ac01c1bbae..e2fa31b908 100644
--- a/_maps/shuttles/nanotrasen/nanotrasen_magpie.dmm
+++ b/_maps/shuttles/nanotrasen/nanotrasen_magpie.dmm
@@ -130,20 +130,17 @@
 /turf/closed/wall/mineral/titanium/nodiagonal,
 /area/ship/crew/canteen)
 "bD" = (
-/obj/effect/turf_decal/trimline/opaque/blue/filled/line{
-	dir = 1
-	},
-/obj/effect/turf_decal/trimline/opaque/blue/filled/corner,
-/obj/machinery/power/apc/auto_name/directional/north,
+/obj/machinery/power/apc/auto_name/directional/east,
 /obj/structure/cable{
 	icon_state = "0-8"
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 4
-	},
 /obj/machinery/light_switch{
-	pixel_x = 11;
-	pixel_y = 22
+	dir = 8;
+	pixel_x = 20;
+	pixel_y = -12
+	},
+/obj/effect/turf_decal/trimline/opaque/blue/filled/line{
+	dir = 4
 	},
 /turf/open/floor/plasteel/white,
 /area/ship/medical)
@@ -635,9 +632,16 @@
 /turf/open/floor/plasteel/freezer,
 /area/ship/crew/toilet)
 "jx" = (
-/obj/structure/closet/crate/bin,
-/turf/open/floor/plasteel/mono,
-/area/ship/cargo)
+/obj/structure/bed/roller,
+/obj/machinery/iv_drip{
+	pixel_x = -13
+	},
+/obj/effect/turf_decal/trimline/opaque/blue/filled/line{
+	dir = 5
+	},
+/obj/machinery/light/directional/north,
+/turf/open/floor/plasteel/white,
+/area/ship/medical)
 "jz" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -889,7 +893,15 @@
 /obj/item/storage/box/ammo/c9mm,
 /obj/item/ammo_box/magazine/smgm9mm/empty,
 /obj/item/ammo_box/magazine/smgm9mm/empty,
-/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/trimline/opaque/vired/filled/line{
+	dir = 4
+	},
+/obj/effect/turf_decal/trimline/opaque/vired/filled/corner{
+	dir = 1
+	},
+/obj/effect/turf_decal/corner/opaque/black{
+	dir = 4
+	},
 /turf/open/floor/plasteel/dark,
 /area/ship/security)
 "nr" = (
@@ -1038,9 +1050,14 @@
 /turf/closed/wall/mineral/titanium,
 /area/ship/security)
 "rW" = (
-/obj/effect/spawner/random/vending/snack,
-/turf/open/floor/plasteel/mono,
-/area/ship/cargo)
+/obj/machinery/firealarm/directional/east{
+	pixel_y = 6
+	},
+/obj/effect/turf_decal/trimline/opaque/blue/filled/line{
+	dir = 4
+	},
+/turf/open/floor/plasteel/white,
+/area/ship/medical)
 "rZ" = (
 /obj/structure/bed/bunk,
 /obj/structure/bed/bunk/top,
@@ -1079,14 +1096,12 @@
 /obj/structure/guncloset,
 /obj/item/gun/ballistic/automatic/pistol/commander,
 /obj/item/gun/ballistic/automatic/smg/vector,
-/obj/effect/turf_decal/borderfloorblack{
-	dir = 4
-	},
-/obj/effect/turf_decal/corner/opaque/vired/half{
-	dir = 8
-	},
-/obj/machinery/light/directional/west,
 /obj/machinery/camera/autoname,
+/obj/effect/turf_decal/trimline/opaque/vired/filled/line{
+	dir = 9
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/light/directional/north,
 /turf/open/floor/plasteel/dark,
 /area/ship/security)
 "sI" = (
@@ -1127,10 +1142,6 @@
 	},
 /turf/open/floor/plasteel,
 /area/ship/crew/ccommons)
-"sQ" = (
-/obj/effect/spawner/random/vending/cola,
-/turf/open/floor/plasteel/mono,
-/area/ship/cargo)
 "sR" = (
 /obj/effect/turf_decal/borderfloorblack{
 	dir = 5
@@ -1241,19 +1252,10 @@
 	dir = 4
 	},
 /obj/structure/cable,
-/obj/effect/turf_decal/trimline/opaque/vired/filled/corner,
-/obj/machinery/light_switch{
-	pixel_x = -21;
-	pixel_y = 4;
-	dir = 4
-	},
-/obj/machinery/button/door{
-	dir = 4;
-	pixel_x = -22;
-	pixel_y = -7;
-	id = "magpie_sec_office";
-	name = "Security Office Shutters"
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 9
 	},
+/obj/effect/turf_decal/trimline/opaque/vired/filled/line,
 /turf/open/floor/plasteel/dark,
 /area/ship/security)
 "tE" = (
@@ -1396,9 +1398,6 @@
 /obj/effect/turf_decal/industrial/warning{
 	dir = 4
 	},
-/obj/structure/camera_assembly{
-	dir = 10
-	},
 /obj/structure/cable{
 	icon_state = "1-8"
 	},
@@ -1406,6 +1405,9 @@
 	dir = 4
 	},
 /obj/machinery/light/directional/south,
+/obj/machinery/camera/autoname{
+	dir = 10
+	},
 /turf/open/floor/plasteel/patterned/grid,
 /area/ship/cargo)
 "uV" = (
@@ -1416,22 +1418,34 @@
 /turf/closed/wall/mineral/titanium,
 /area/ship/bridge)
 "vb" = (
-/obj/effect/turf_decal/trimline/opaque/blue/filled/line{
-	dir = 6
-	},
-/obj/structure/bed/roller,
-/obj/machinery/firealarm/directional/east{
-	pixel_y = 6
+/obj/structure/closet/secure_closet/medical3{
+	populate = 0
 	},
-/obj/structure/sign/nanotrasen{
-	pixel_y = -32
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+	dir = 8
 	},
-/obj/machinery/light/directional/south,
+/obj/item/storage/box/gloves,
+/obj/item/storage/box/masks,
+/obj/item/clothing/glasses/hud/health,
+/obj/item/clothing/suit/toggle/labcoat/nanotrasen,
+/obj/item/clothing/under/nanotrasen/medical,
+/obj/item/clothing/shoes/sneakers/white,
+/obj/item/storage/backpack/satchel/med,
+/obj/item/storage/belt/medical/webbing,
+/obj/item/clothing/head/nanotrasen/cap/medical,
+/obj/item/storage/backpack/medic,
+/obj/item/clothing/head/nanotrasen/surgical/blue,
+/obj/item/clothing/suit/nanotrasen/medical_smock,
+/obj/item/storage/backpack/duffelbag/med,
 /obj/machinery/camera/autoname{
 	dir = 10
 	},
-/obj/machinery/iv_drip{
-	pixel_x = -13
+/obj/machinery/light/directional/south,
+/obj/effect/turf_decal/trimline/opaque/blue/filled/line{
+	dir = 6
+	},
+/obj/structure/sign/nanotrasen{
+	pixel_y = -32
 	},
 /turf/open/floor/plasteel/white,
 /area/ship/medical)
@@ -1542,20 +1556,20 @@
 /turf/open/floor/carpet/cyan,
 /area/ship/crew/dorm)
 "vI" = (
-/obj/effect/turf_decal/trimline/opaque/blue/filled/line{
-	dir = 8
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 10
 	},
-/obj/effect/turf_decal/trimline/opaque/blue/filled/corner{
-	dir = 4
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 9
 	},
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 4
+/obj/effect/turf_decal/trimline/opaque/blue/filled/corner{
+	dir = 8
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 9
+/obj/effect/turf_decal/trimline/opaque/blue/filled/corner{
+	dir = 1
 	},
 /turf/open/floor/plasteel/white,
 /area/ship/medical)
@@ -1886,7 +1900,6 @@
 	},
 /obj/effect/mapping_helpers/crate_shelve,
 /obj/item/stack/sheet/mineral/uranium/ten,
-/obj/item/stack/sheet/mineral/plasma/ten,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plasteel/patterned,
 /area/ship/storage/equip)
@@ -1942,35 +1955,24 @@
 /turf/open/floor/plasteel/patterned,
 /area/ship/cargo)
 "Bu" = (
-/obj/effect/turf_decal/trimline/opaque/blue/filled/end{
-	dir = 1
-	},
-/obj/machinery/suit_storage_unit/inherit/industrial,
-/obj/item/clothing/mask/gas,
-/obj/item/tank/internals/oxygen,
-/obj/item/clothing/suit/space/hardsuit/medical,
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
+/obj/effect/turf_decal/trimline/opaque/blue/filled/line{
+	dir = 8
+	},
+/obj/machinery/airalarm/directional/west,
 /turf/open/floor/plasteel/white,
 /area/ship/medical)
 "Bv" = (
 /turf/closed/wall/mineral/titanium,
 /area/ship/cargo)
 "Bx" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 5
+	},
 /obj/effect/turf_decal/trimline/opaque/blue/filled/line{
 	dir = 10
 	},
-/obj/structure/table/reinforced,
-/obj/structure/closet/wall/med/directional/south{
-	populate = 0;
-	name = "Medical Supplies"
-	},
-/obj/machinery/airalarm/directional/west,
-/obj/item/storage/box/syringes,
-/obj/item/reagent_containers/glass/bottle/bicaridine,
-/obj/item/storage/pill_bottle/charcoal,
-/obj/effect/spawner/random/medical/medkit,
-/obj/item/storage/firstaid/medical,
-/obj/item/reagent_containers/chem_pack/dimorlin,
+/obj/machinery/suit_storage_unit/inherit/industrial,
 /turf/open/floor/plasteel/white,
 /area/ship/medical)
 "BI" = (
@@ -1990,30 +1992,21 @@
 /turf/open/floor/plasteel/patterned,
 /area/ship/engineering/engines/port)
 "BS" = (
-/obj/structure/closet/secure_closet/medical3{
-	populate = 0
+/obj/machinery/firealarm/directional/south{
+	pixel_x = 7
 	},
-/obj/effect/turf_decal/trimline/opaque/blue/filled/end{
-	dir = 4
+/obj/effect/turf_decal/trimline/opaque/vired/filled/line{
+	dir = 10
 	},
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
-	dir = 8
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/chair/office/dark{
+	dir = 1
 	},
-/obj/item/storage/box/gloves,
-/obj/item/storage/box/masks,
-/obj/item/clothing/glasses/hud/health,
-/obj/item/clothing/suit/toggle/labcoat/nanotrasen,
-/obj/item/clothing/under/nanotrasen/medical,
-/obj/item/clothing/shoes/sneakers/white,
-/obj/item/storage/backpack/satchel/med,
-/obj/item/storage/belt/medical/webbing,
-/obj/item/clothing/head/nanotrasen/cap/medical,
-/obj/item/storage/backpack/medic,
-/obj/item/clothing/head/nanotrasen/surgical/blue,
-/obj/item/clothing/suit/nanotrasen/medical_smock,
-/obj/item/storage/backpack/duffelbag/med,
-/turf/open/floor/plasteel/white,
-/area/ship/medical)
+/obj/structure/sign/nanotrasen/vigilitas{
+	pixel_x = -30
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/security)
 "BY" = (
 /obj/machinery/power/shuttle/engine/electric,
 /obj/structure/cable{
@@ -2023,36 +2016,20 @@
 /area/ship/engineering/engines/port)
 "Ce" = (
 /obj/structure/table/reinforced,
-/obj/machinery/firealarm/directional/south{
-	pixel_x = 7
-	},
-/obj/machinery/recharger{
-	pixel_x = -10;
-	pixel_y = 10
-	},
-/obj/structure/sign/nanotrasen/vigilitas{
-	pixel_x = -30
-	},
-/obj/item/paper_bin{
-	pixel_x = 5;
-	pixel_y = 3
-	},
-/obj/item/pen{
-	pixel_x = 5;
-	pixel_y = 5
-	},
-/obj/item/stamp/nanotrasen/vigilitas{
-	pixel_x = 6;
-	pixel_y = 5
-	},
-/obj/structure/sign/poster/official/random{
-	pixel_y = 31
-	},
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
-	dir = 4
+/obj/item/storage/box/syringes,
+/obj/item/storage/pill_bottle/charcoal,
+/obj/effect/spawner/random/medical/medkit,
+/obj/item/storage/firstaid/medical,
+/obj/item/reagent_containers/chem_pack/dimorlin,
+/obj/structure/closet/wall/med/directional/north,
+/obj/effect/turf_decal/trimline/opaque/blue/filled/line{
+	dir = 9
 	},
-/turf/open/floor/plasteel/dark,
-/area/ship/security)
+/obj/item/reagent_containers/glass/bottle/curare,
+/obj/item/reagent_containers/glass/bottle/curare,
+/obj/item/reagent_containers/glass/bottle/indomide,
+/turf/open/floor/plasteel/white,
+/area/ship/medical)
 "Cq" = (
 /obj/effect/turf_decal/industrial/warning/corner{
 	dir = 4
@@ -2431,19 +2408,17 @@
 	icon_state = "sec_wall";
 	name = "Equipment"
 	},
-/obj/effect/turf_decal/trimline/opaque/vired/filled/corner,
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 9
-	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 9
 	},
 /obj/item/storage/backpack/duffelbag/sec,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/effect/turf_decal/trimline/opaque/vired/filled/line{
+	dir = 4
+	},
 /turf/open/floor/plasteel/dark,
 /area/ship/security)
 "Hc" = (
@@ -3293,19 +3268,46 @@
 /turf/open/floor/plasteel,
 /area/ship/medical)
 "Tv" = (
-/obj/structure/chair/office/dark{
-	dir = 8
+/obj/machinery/recharger{
+	pixel_x = -10;
+	pixel_y = 10
 	},
-/obj/effect/turf_decal/borderfloorblack{
-	dir = 4
+/obj/item/paper_bin{
+	pixel_x = 5;
+	pixel_y = 3
 	},
-/obj/machinery/airalarm/directional/south,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+/obj/item/pen{
+	pixel_x = 5;
+	pixel_y = 5
+	},
+/obj/item/stamp/nanotrasen/vigilitas{
+	pixel_x = 6;
+	pixel_y = 5
+	},
+/obj/structure/table/reinforced,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+/obj/effect/turf_decal/trimline/opaque/vired/filled/line{
+	dir = 8
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/light_switch{
+	pixel_x = -21;
+	pixel_y = 4;
 	dir = 4
 	},
+/obj/machinery/button/door{
+	dir = 4;
+	pixel_x = -22;
+	pixel_y = -7;
+	id = "magpie_sec_office";
+	name = "Security Office Shutters"
+	},
+/obj/item/folder/red{
+	pixel_x = -8;
+	pixel_y = -4
+	},
 /turf/open/floor/plasteel/dark,
 /area/ship/security)
 "TE" = (
@@ -3398,7 +3400,6 @@
 /turf/open/floor/plasteel,
 /area/ship/cargo)
 "UE" = (
-/obj/structure/camera_assembly,
 /obj/effect/turf_decal/trimline/opaque/nsorange/filled/line{
 	dir = 1
 	},
@@ -4178,7 +4179,7 @@ ph
 gE
 Ap
 qI
-rW
+ic
 ic
 ic
 Tk
@@ -4201,8 +4202,8 @@ ph
 CB
 pH
 jB
-sQ
 ic
+Ce
 Bu
 vI
 Bx
@@ -4223,10 +4224,10 @@ KO
 NI
 TZ
 HD
-jx
+Bv
 ic
-ci
-ci
+jx
+rW
 bD
 vb
 ic
@@ -4248,9 +4249,9 @@ if
 cQ
 ry
 Wf
-Ce
 Wf
-BS
+ci
+ci
 ci
 ic
 Ag
@@ -4272,7 +4273,7 @@ QR
 ry
 sE
 Tv
-Wf
+BS
 Wf
 ic
 Ag
diff --git a/_maps/shuttles/nanotrasen/nanotrasen_shrike.dmm b/_maps/shuttles/nanotrasen/nanotrasen_shrike.dmm
new file mode 100644
index 0000000000..65b889a3bf
--- /dev/null
+++ b/_maps/shuttles/nanotrasen/nanotrasen_shrike.dmm
@@ -0,0 +1,6090 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"aa" = (
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/structure/cable{
+	icon_state = "1-8"
+	},
+/obj/machinery/airalarm/directional/south,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+	dir = 4
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/hallway/port)
+"ag" = (
+/obj/structure/table,
+/obj/item/storage/toolbox/mechanical{
+	pixel_y = 7
+	},
+/obj/item/storage/toolbox/electrical,
+/obj/item/storage/fancy/cigarettes/cigpack_mindbreaker{
+	pixel_x = 12;
+	pixel_y = -2
+	},
+/obj/machinery/button/door{
+	id = "shrikeventwindow";
+	name = "Window button";
+	pixel_x = 8;
+	pixel_y = -23;
+	dir = 1
+	},
+/turf/open/floor/plating,
+/area/ship/engineering/engines/starboard)
+"aj" = (
+/obj/machinery/computer/secure_data{
+	icon_state = "computer-middle";
+	dir = 1
+	},
+/obj/item/radio/intercom/directional/east,
+/obj/machinery/light/directional/south,
+/obj/effect/turf_decal/techfloor{
+	dir = 1
+	},
+/turf/open/floor/plasteel/telecomms_floor,
+/area/ship/bridge)
+"ax" = (
+/obj/effect/turf_decal/siding/white{
+	dir = 8
+	},
+/obj/effect/turf_decal/siding/white{
+	layer = 2.041;
+	dir = 4
+	},
+/obj/effect/turf_decal/trimline/opaque/vired/line{
+	dir = 8
+	},
+/obj/effect/turf_decal/trimline/opaque/vired/line{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/orange/hidden,
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/starboard)
+"aG" = (
+/obj/effect/turf_decal/industrial/warning{
+	dir = 8
+	},
+/obj/effect/turf_decal/industrial/stand_clear{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "6-8"
+	},
+/obj/machinery/button/door{
+	id = "shrikecargobay";
+	name = "Cargo door button";
+	pixel_x = 7;
+	pixel_y = 23
+	},
+/obj/machinery/button/shieldwallgen{
+	pixel_x = -1;
+	pixel_y = 21;
+	id = "shrikecargofields"
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/sign/warning/vacuum/external{
+	pixel_y = 34
+	},
+/turf/open/floor/plasteel/patterned/cargo_one,
+/area/ship/cargo)
+"aM" = (
+/obj/machinery/fax/nanotrasen,
+/obj/structure/table/reinforced{
+	color = "#c1b6a5"
+	},
+/obj/machinery/camera/autoname{
+	network = list("shrikenetwork");
+	dir = 4
+	},
+/obj/machinery/light_switch{
+	dir = 4;
+	pixel_x = -20;
+	pixel_y = 12
+	},
+/obj/machinery/turretid/ship{
+	pixel_y = -3;
+	id = "shriketurrets";
+	pixel_x = -24
+	},
+/obj/effect/turf_decal/siding/thinplating/dark,
+/obj/effect/turf_decal/corner/opaque/vired/half,
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"aT" = (
+/obj/effect/turf_decal/trimline/opaque/vired/line{
+	dir = 4
+	},
+/obj/effect/turf_decal/trimline/opaque/vired/line{
+	dir = 8
+	},
+/obj/effect/turf_decal/siding/white{
+	dir = 4
+	},
+/obj/effect/turf_decal/siding/white{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/orange/hidden,
+/turf/open/floor/plasteel/dark,
+/area/ship/hallway/port)
+"bk" = (
+/obj/effect/turf_decal/trimline/transparent/white/filled/warning{
+	dir = 8
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 4
+	},
+/turf/open/floor/plasteel/mono,
+/area/ship/cargo)
+"bv" = (
+/obj/docking_port/stationary{
+	dwidth = 15;
+	height = 15;
+	width = 30;
+	name = "Airlock";
+	dir = 2
+	},
+/turf/template_noop,
+/area/template_noop)
+"by" = (
+/turf/closed/wall/mineral/titanium/nodiagonal,
+/area/ship/bridge)
+"bz" = (
+/obj/effect/turf_decal/siding/white{
+	dir = 8
+	},
+/obj/effect/turf_decal/siding/white{
+	layer = 2.041;
+	dir = 4
+	},
+/obj/effect/turf_decal/trimline/opaque/vired/line{
+	dir = 8
+	},
+/obj/effect/turf_decal/trimline/opaque/vired/line{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/orange/hidden,
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/starboard)
+"bD" = (
+/obj/machinery/airalarm/directional/south,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4,
+/turf/open/floor/plasteel/patterned,
+/area/ship/engineering/engines/starboard)
+"bH" = (
+/obj/machinery/atmospherics/components/binary/pump/layer4{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+	dir = 5
+	},
+/turf/open/floor/plasteel/patterned,
+/area/ship/engineering/engines/starboard)
+"bK" = (
+/obj/effect/spawner/bunk_bed,
+/obj/structure/curtain/bounty,
+/turf/open/floor/carpet/red,
+/area/ship/crew)
+"bQ" = (
+/obj/structure/table/reinforced,
+/obj/item/radio/intercom/table,
+/turf/open/floor/carpet/red,
+/area/ship/hallway/port)
+"bV" = (
+/obj/effect/turf_decal/corner/opaque/vired/border{
+	dir = 4
+	},
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 4
+	},
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+	dir = 8
+	},
+/obj/machinery/airalarm/directional/east,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel,
+/area/ship/hallway/starboard)
+"ca" = (
+/obj/machinery/vending/cigarette,
+/obj/effect/turf_decal/siding/white{
+	dir = 8
+	},
+/obj/machinery/light/dim/directional/east,
+/obj/effect/decal/cleanable/cobweb/cobweb2,
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/port)
+"cL" = (
+/obj/effect/turf_decal/siding/white{
+	layer = 2.041;
+	dir = 4
+	},
+/obj/effect/turf_decal/borderfloorblack{
+	dir = 1
+	},
+/obj/effect/turf_decal/corner/transparent/vired/border{
+	layer = 2.040;
+	dir = 1
+	},
+/obj/machinery/power/apc/auto_name/directional/north,
+/obj/structure/cable{
+	icon_state = "0-8"
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/security/armory)
+"dh" = (
+/obj/machinery/porta_turret/ship/nt/light{
+	dir = 8;
+	id = "shriketurrets"
+	},
+/turf/closed/wall/mineral/titanium/nodiagonal,
+/area/ship/engineering/engines/starboard)
+"dj" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/mono,
+/area/ship/cargo)
+"dl" = (
+/obj/machinery/atmospherics/components/unary/tank/air{
+	dir = 8;
+	piping_layer = 4
+	},
+/obj/effect/turf_decal/siding/white{
+	dir = 4
+	},
+/obj/machinery/camera/autoname{
+	network = list("shrikenetwork");
+	dir = 1
+	},
+/obj/structure/sign/warning/nosmoking{
+	pixel_y = -32
+	},
+/turf/open/floor/plasteel/patterned,
+/area/ship/engineering/engines/starboard)
+"dp" = (
+/obj/structure/railing/thin{
+	dir = 4
+	},
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/door/firedoor/border_only{
+	dir = 1
+	},
+/obj/machinery/door/poddoor/shutters/preopen{
+	id = "shrikeportlockdown";
+	name = "Port Lockdown Shutters"
+	},
+/obj/machinery/door/airlock/glass{
+	name = "Central Hallway"
+	},
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/hallway/central)
+"dv" = (
+/obj/machinery/porta_turret/ship/nt{
+	dir = 4;
+	id = "shriketurrets"
+	},
+/turf/closed/wall/mineral/titanium,
+/area/ship/crew/cryo)
+"dC" = (
+/obj/structure/closet/crate/bin,
+/obj/effect/turf_decal/siding/white{
+	dir = 8
+	},
+/obj/machinery/camera/autoname{
+	network = list("shrikenetwork");
+	dir = 8
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/starboard)
+"dF" = (
+/obj/structure/table,
+/obj/item/food/breadslice/creamcheese{
+	pixel_x = -3;
+	pixel_y = 10
+	},
+/obj/item/reagent_containers/food/drinks/coffee{
+	pixel_x = 10;
+	pixel_y = -1
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 4
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/hallway/port)
+"dH" = (
+/obj/effect/turf_decal/corner/opaque/vired/border{
+	dir = 4
+	},
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 4
+	},
+/obj/structure/chair/handrail{
+	dir = 8
+	},
+/turf/open/floor/plasteel,
+/area/ship/hallway/central)
+"dP" = (
+/obj/machinery/light/dim/directional/east,
+/obj/structure/extinguisher_cabinet/directional/south,
+/obj/effect/turf_decal/siding/white{
+	dir = 1
+	},
+/obj/structure/rack,
+/obj/effect/turf_decal/trimline/transparent/vired/warning{
+	dir = 1
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/cargo)
+"dS" = (
+/obj/effect/turf_decal/siding/thinplating/dark/corner,
+/obj/item/paper_bin{
+	pixel_y = 7;
+	pixel_x = 8
+	},
+/obj/item/pen/fourcolor{
+	pixel_y = 3
+	},
+/obj/item/toy/plush/moth/monarch{
+	pixel_x = -7
+	},
+/obj/item/clothing/mask/cigarette/candy{
+	pixel_x = -11;
+	pixel_y = 6
+	},
+/obj/structure/table,
+/obj/effect/turf_decal/borderfloorblack,
+/obj/structure/railing/thin{
+	dir = 8
+	},
+/obj/effect/turf_decal/corner/transparent/vired/border{
+	layer = 2.040
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/crew)
+"ea" = (
+/obj/machinery/atmospherics/components/unary/outlet_injector/on{
+	dir = 1
+	},
+/turf/open/floor/engine/hull,
+/area/ship/external)
+"ed" = (
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 4
+	},
+/obj/effect/turf_decal/trimline/opaque/vired/line{
+	dir = 4
+	},
+/obj/structure/chair/handrail{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
+/obj/structure/extinguisher_cabinet/directional/east,
+/obj/effect/turf_decal/trimline/transparent/white/warning,
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/starboard)
+"eo" = (
+/obj/effect/turf_decal/trimline/transparent/white/filled/warning{
+	dir = 8
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/mono,
+/area/ship/cargo)
+"ey" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 4
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 8
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 4
+	},
+/obj/machinery/door/airlock/mining/glass{
+	name = "Cargo Bay";
+	dir = 4
+	},
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/cargo)
+"eC" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 4
+	},
+/obj/effect/turf_decal/siding/white,
+/obj/machinery/atmospherics/components/binary/pump{
+	name = "afterburner pump";
+	dir = 4
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel,
+/area/ship/engineering/engines/starboard)
+"eE" = (
+/obj/machinery/newscaster/directional/north,
+/turf/open/floor/carpet/red,
+/area/ship/crew)
+"eS" = (
+/obj/effect/turf_decal/trimline/transparent/white/filled/warning{
+	dir = 8
+	},
+/obj/effect/turf_decal/siding/white,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/airalarm/directional/south,
+/turf/open/floor/plasteel,
+/area/ship/crew)
+"fh" = (
+/obj/machinery/door/airlock{
+	name = "Bathroom";
+	dir = 4;
+	id_tag = "shrikebathroom"
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 4
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 8
+	},
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/hallway/port)
+"fI" = (
+/obj/structure/dresser,
+/obj/structure/bedsheetbin{
+	pixel_y = 5
+	},
+/obj/machinery/light/dim/directional/north,
+/turf/open/floor/carpet/red,
+/area/ship/crew)
+"fO" = (
+/obj/structure/window/reinforced{
+	dir = 8
+	},
+/obj/structure/table,
+/obj/effect/turf_decal/siding/white{
+	dir = 9
+	},
+/obj/item/storage/toolbox/mechanical{
+	pixel_y = 7
+	},
+/obj/item/storage/belt/utility{
+	pixel_x = -4;
+	pixel_y = -3
+	},
+/obj/item/clothing/glasses/meson/engine{
+	pixel_x = 10;
+	pixel_y = -8
+	},
+/obj/item/clothing/gloves/color/yellow{
+	pixel_x = 8
+	},
+/obj/effect/turf_decal/siding/white{
+	dir = 10
+	},
+/obj/effect/turf_decal/trimline/opaque/nsorange/line{
+	dir = 8
+	},
+/obj/item/radio/intercom/directional/south,
+/turf/open/floor/plasteel/mono,
+/area/ship/engineering/engines/starboard)
+"fR" = (
+/obj/structure/sign/number/random,
+/turf/closed/wall/mineral/titanium/nodiagonal,
+/area/ship/security/armory)
+"gi" = (
+/obj/structure/chair{
+	dir = 1
+	},
+/obj/machinery/light_switch{
+	dir = 8;
+	pixel_x = 19;
+	pixel_y = -10
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/hallway/port)
+"gs" = (
+/obj/machinery/portable_atmospherics/canister/toxins,
+/obj/effect/turf_decal/siding/white,
+/obj/effect/decal/cleanable/cobweb,
+/obj/machinery/atmospherics/components/unary/portables_connector{
+	dir = 4
+	},
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/engineering/engines/starboard)
+"gt" = (
+/obj/structure/extinguisher_cabinet/directional/north,
+/obj/effect/turf_decal/siding/white,
+/obj/machinery/atmospherics/components/unary/tank/toxins,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/engineering/engines/starboard)
+"gu" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer4,
+/obj/machinery/holopad/emergency,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden,
+/turf/open/floor/plasteel/mono,
+/area/ship/hallway/central)
+"gD" = (
+/obj/effect/turf_decal/borderfloorblack,
+/obj/effect/turf_decal/corner/transparent/vired/border{
+	layer = 2.040
+	},
+/obj/effect/turf_decal/siding/white{
+	layer = 2.041
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 5
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/security/armory)
+"gS" = (
+/obj/machinery/firealarm/directional/south,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+	dir = 4
+	},
+/turf/open/floor/plating,
+/area/ship/engineering/engines/port)
+"gU" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 10
+	},
+/turf/open/floor/plasteel/stairs/left{
+	dir = 8
+	},
+/area/ship/cargo)
+"gZ" = (
+/obj/effect/turf_decal/steeldecal/steel_decals10{
+	dir = 1
+	},
+/obj/effect/turf_decal/steeldecal/steel_decals10{
+	dir = 8
+	},
+/obj/machinery/shower{
+	dir = 1
+	},
+/obj/structure/curtain,
+/turf/open/floor/plasteel/showroomfloor,
+/area/ship/hallway/port)
+"hh" = (
+/obj/effect/turf_decal/siding/white{
+	dir = 1
+	},
+/obj/structure/reagent_dispensers/watertank,
+/obj/effect/turf_decal/trimline/transparent/vired/warning{
+	dir = 1
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/cargo)
+"hC" = (
+/obj/machinery/camera/autoname{
+	network = list("shrikenetwork");
+	dir = 8
+	},
+/obj/effect/turf_decal/corner/transparent/lightgrey/diagonal,
+/obj/effect/turf_decal/siding/white{
+	dir = 1
+	},
+/obj/machinery/microwave{
+	pixel_y = 5
+	},
+/obj/structure/table/reinforced,
+/turf/open/floor/plasteel/white,
+/area/ship/hallway/port)
+"hP" = (
+/obj/structure/railing/thin{
+	dir = 8
+	},
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/door/firedoor/border_only{
+	dir = 1
+	},
+/obj/machinery/door/poddoor/shutters/preopen{
+	id = "shrikeportlockdown";
+	name = "Port Lockdown Shutters"
+	},
+/obj/machinery/door/airlock/glass{
+	name = "Central Hallway"
+	},
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/hallway/central)
+"iR" = (
+/obj/item/food/cherrycupcake{
+	pixel_y = 3;
+	pixel_x = 6
+	},
+/obj/item/reagent_containers/food/drinks/coffee{
+	pixel_x = 10;
+	pixel_y = -1
+	},
+/obj/item/paper/crumpled{
+	default_raw_text = "I miss the warm meals back home...";
+	desc = "A few words are written on the front, hastily writen before being crumpled.";
+	pixel_x = -7;
+	pixel_y = 9
+	},
+/obj/item/pen{
+	pixel_x = -7;
+	pixel_y = 10
+	},
+/obj/structure/table,
+/obj/effect/turf_decal/borderfloorblack{
+	dir = 1
+	},
+/obj/structure/railing/thin{
+	dir = 8
+	},
+/obj/effect/turf_decal/corner/transparent/vired/border{
+	layer = 2.040;
+	dir = 1
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/crew)
+"iY" = (
+/obj/structure/chair/office,
+/turf/open/floor/carpet/red,
+/area/ship/hallway/port)
+"jz" = (
+/turf/closed/wall/mineral/titanium,
+/area/ship/hallway/starboard)
+"jA" = (
+/obj/structure/filingcabinet/double/grey{
+	dir = 1
+	},
+/obj/item/folder/red{
+	pixel_x = 6
+	},
+/obj/item/folder/blue,
+/obj/item/reagent_containers/food/drinks/bottle/amaretto,
+/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass,
+/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass,
+/turf/open/floor/carpet/red,
+/area/ship/security/armory)
+"jE" = (
+/obj/effect/turf_decal/corner/opaque/vired/border{
+	dir = 8
+	},
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
+/area/ship/hallway/starboard)
+"jN" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+	dir = 1
+	},
+/obj/effect/turf_decal/siding/white{
+	layer = 2.041;
+	dir = 4
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/security/armory)
+"jQ" = (
+/turf/closed/wall/mineral/titanium,
+/area/ship/security/armory)
+"jZ" = (
+/obj/machinery/light/dim/directional/north,
+/obj/effect/turf_decal/borderfloorblack{
+	dir = 1
+	},
+/obj/effect/turf_decal/corner/transparent/vired/border{
+	layer = 2.040;
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/dark,
+/area/ship/security/armory)
+"kf" = (
+/obj/structure/table,
+/obj/machinery/computer/security/telescreen/entertainment{
+	pixel_x = 32
+	},
+/obj/item/newspaper{
+	pixel_x = -2;
+	pixel_y = 7
+	},
+/obj/item/reagent_containers/food/drinks/coffee{
+	pixel_x = -3;
+	pixel_y = -1
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/hallway/port)
+"kn" = (
+/obj/effect/turf_decal/techfloor{
+	dir = 1
+	},
+/obj/machinery/light_switch{
+	dir = 4;
+	pixel_x = -21;
+	pixel_y = 8
+	},
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
+/obj/machinery/firealarm/directional/west{
+	pixel_y = -7
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/cryo)
+"kr" = (
+/obj/structure/window/reinforced{
+	dir = 8
+	},
+/obj/machinery/door/window/brigdoor/eastleft,
+/obj/machinery/door/poddoor{
+	id = "shrinkestarboardengine";
+	dir = 4
+	},
+/obj/machinery/atmospherics/components/unary/shuttle/heater,
+/turf/open/floor/plating,
+/area/ship/engineering/engines/starboard)
+"kx" = (
+/obj/structure/table/reinforced,
+/obj/machinery/light/dim/directional/east,
+/obj/item/paper_bin,
+/obj/item/pen/fourcolor,
+/turf/open/floor/carpet/red,
+/area/ship/hallway/port)
+"kF" = (
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 8
+	},
+/obj/effect/turf_decal/trimline/opaque/vired/line{
+	dir = 8
+	},
+/obj/machinery/advanced_airlock_controller{
+	pixel_x = -24
+	},
+/obj/effect/turf_decal/trimline/transparent/white/warning,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 5
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/starboard)
+"kK" = (
+/obj/machinery/button/door{
+	id = "shrinkestarboardengine";
+	name = "Starboard engine bay";
+	pixel_x = -8;
+	pixel_y = 23
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/decal/cleanable/plastic,
+/obj/effect/decal/cleanable/robot_debris/up,
+/obj/machinery/firealarm/directional/north{
+	pixel_x = 6
+	},
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+	dir = 4
+	},
+/turf/open/floor/plating,
+/area/ship/engineering/engines/starboard)
+"kN" = (
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 4
+	},
+/obj/effect/turf_decal/corner/opaque/vired/border{
+	dir = 4
+	},
+/obj/machinery/firealarm/directional/east,
+/turf/open/floor/plasteel,
+/area/ship/hallway/port)
+"kW" = (
+/obj/machinery/power/smes/shuttle/precharged,
+/obj/structure/cable{
+	icon_state = "0-8"
+	},
+/obj/machinery/door/window/brigdoor/eastright,
+/obj/structure/window/reinforced{
+	dir = 8
+	},
+/obj/machinery/door/poddoor{
+	id = "shrikeportengine";
+	dir = 4
+	},
+/turf/open/floor/plating,
+/area/ship/engineering/engines/port)
+"lm" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/carpet/red,
+/area/ship/hallway/port)
+"lv" = (
+/obj/structure/cable{
+	icon_state = "1-8"
+	},
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2{
+	dir = 4
+	},
+/obj/effect/turf_decal/siding/white{
+	dir = 9
+	},
+/turf/open/floor/plasteel/patterned,
+/area/ship/engineering/engines/starboard)
+"ly" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/item/storage/backpack/duffelbag/engineering{
+	pixel_x = 10;
+	pixel_y = -9
+	},
+/obj/item/storage/backpack/industrial{
+	pixel_x = 12;
+	pixel_y = -2
+	},
+/obj/item/storage/backpack/satchel/eng{
+	pixel_x = 13;
+	pixel_y = 5
+	},
+/obj/item/clothing/shoes/workboots{
+	pixel_y = -8
+	},
+/obj/item/clothing/mask/gas/welding,
+/obj/item/storage/belt/utility/full{
+	pixel_x = 1;
+	pixel_y = -4
+	},
+/obj/item/clothing/under/nanotrasen/engineering,
+/obj/item/radio/headset/alt{
+	pixel_x = 8;
+	pixel_y = 10
+	},
+/obj/item/clothing/suit/nanotrasen/vest{
+	pixel_x = -15
+	},
+/obj/item/clothing/suit/nanotrasen/vest/blue{
+	pixel_x = -11
+	},
+/obj/item/clothing/head/hardhat/nanotrasen{
+	pixel_x = -15;
+	pixel_y = 12
+	},
+/obj/item/clothing/head/hardhat/nanotrasen/blue{
+	pixel_x = -5;
+	pixel_y = 12
+	},
+/obj/structure/closet/wall/orange/directional/north,
+/obj/effect/turf_decal/siding/white,
+/turf/open/floor/plasteel,
+/area/ship/engineering/engines/starboard)
+"lB" = (
+/obj/structure/chair{
+	dir = 1
+	},
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/hallway/port)
+"lJ" = (
+/obj/structure/cable{
+	icon_state = "0-4"
+	},
+/obj/machinery/power/terminal{
+	dir = 8
+	},
+/obj/machinery/light/small/directional/north,
+/obj/machinery/button/door{
+	id = "shrikeportengine";
+	name = "Port Engine Shutters";
+	pixel_x = 8;
+	pixel_y = 20;
+	req_ship_access = 1
+	},
+/turf/open/floor/plating,
+/area/ship/engineering/engines/port)
+"lL" = (
+/obj/effect/turf_decal/siding/white,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+	dir = 4
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/hallway/port)
+"lS" = (
+/obj/machinery/door/window/brigdoor/eastright,
+/obj/structure/window/reinforced{
+	dir = 8
+	},
+/obj/machinery/door/poddoor{
+	id = "shrikeportengine";
+	dir = 4
+	},
+/obj/machinery/atmospherics/components/unary/shuttle/heater,
+/turf/open/floor/plating,
+/area/ship/engineering/engines/port)
+"ma" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/mono,
+/area/ship/hallway/port)
+"ml" = (
+/obj/effect/turf_decal/corner/opaque/vired/border{
+	dir = 8
+	},
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 8
+	},
+/turf/open/floor/plasteel,
+/area/ship/hallway/starboard)
+"mm" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 9
+	},
+/turf/open/floor/plasteel/stairs/right{
+	dir = 8
+	},
+/area/ship/cargo)
+"mq" = (
+/obj/effect/turf_decal/siding/white{
+	layer = 2.041
+	},
+/obj/effect/turf_decal/borderfloorblack,
+/obj/effect/turf_decal/corner/transparent/vired/border{
+	layer = 2.040
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/hallway/starboard)
+"mw" = (
+/obj/effect/turf_decal/siding/white{
+	dir = 8
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/turf_decal/ntspaceworks_small/left,
+/obj/structure/cable{
+	icon_state = "4-10"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 6
+	},
+/obj/machinery/power/apc/auto_name/directional/north,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 6
+	},
+/obj/structure/cable{
+	icon_state = "0-4"
+	},
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+	dir = 4
+	},
+/turf/open/floor/plasteel/patterned,
+/area/ship/engineering/engines/starboard)
+"mP" = (
+/obj/machinery/camera/autoname{
+	network = list("shrikenetwork");
+	dir = 10
+	},
+/obj/effect/turf_decal/industrial/outline/yellow,
+/obj/structure/crate_shelf,
+/obj/item/radio/intercom/directional/west,
+/turf/open/floor/plasteel/tech/techmaint,
+/area/ship/cargo)
+"mQ" = (
+/obj/structure/closet/secure_closet/wall/directional/west{
+	icon_state = "solgov_wall";
+	name = "Command Essentials"
+	},
+/obj/item/binoculars,
+/obj/item/modular_computer/tablet/preset/advanced,
+/obj/item/storage/box/ids,
+/obj/item/megaphone,
+/obj/item/radio/headset/headset_com/alt,
+/obj/structure/table/reinforced{
+	color = "#c1b6a5"
+	},
+/obj/structure/extinguisher_cabinet/directional/north,
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 1
+	},
+/obj/effect/turf_decal/corner/opaque/vired/half{
+	dir = 1
+	},
+/obj/item/paper_bin,
+/obj/item/pen/fourcolor,
+/obj/item/toy/plush/moth/redish{
+	pixel_x = -4
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"mV" = (
+/obj/machinery/door/airlock/security{
+	req_access_txt = "3";
+	name = "Armoury";
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 4
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 8
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 4
+	},
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/security/armory)
+"na" = (
+/obj/effect/turf_decal/corner/transparent/lightgrey/diagonal,
+/obj/structure/table/reinforced,
+/obj/item/cutting_board,
+/turf/open/floor/plasteel/white,
+/area/ship/hallway/port)
+"nb" = (
+/obj/structure/grille,
+/obj/machinery/door/poddoor{
+	id = "shrikeventwindow"
+	},
+/obj/structure/window/reinforced/fulltile/shuttle,
+/obj/machinery/door/firedoor/heavy,
+/turf/open/floor/plating,
+/area/ship/engineering/engines/port)
+"ng" = (
+/turf/closed/wall/mineral/titanium/nodiagonal,
+/area/ship/engineering/engines/starboard)
+"nE" = (
+/obj/structure/cable{
+	icon_state = "1-4"
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 4
+	},
+/turf/open/floor/plasteel/mono,
+/area/ship/cargo)
+"nQ" = (
+/obj/effect/turf_decal/siding/white{
+	dir = 5
+	},
+/obj/machinery/photocopier,
+/obj/machinery/camera/autoname{
+	network = list("shrikenetwork");
+	dir = 6
+	},
+/turf/open/floor/plasteel/mono,
+/area/ship/hallway/port)
+"oa" = (
+/obj/effect/turf_decal/siding/thinplating/dark,
+/obj/effect/turf_decal/corner/opaque/vired/half,
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/bridge)
+"oA" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 4
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/mono,
+/area/ship/cargo)
+"oC" = (
+/obj/effect/turf_decal/siding/white{
+	dir = 8
+	},
+/obj/effect/turf_decal/siding/white{
+	layer = 2.041;
+	dir = 4
+	},
+/obj/effect/turf_decal/trimline/opaque/vired/line{
+	dir = 8
+	},
+/obj/effect/turf_decal/trimline/opaque/vired/line{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/structure/cable{
+	icon_state = "1-8"
+	},
+/obj/structure/cable{
+	icon_state = "2-4"
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+	dir = 9
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/starboard)
+"oM" = (
+/obj/machinery/autolathe,
+/obj/effect/turf_decal/industrial/outline{
+	color = "#FF6600"
+	},
+/obj/item/stack/sheet/metal/twenty,
+/turf/open/floor/plasteel/tech,
+/area/ship/cargo)
+"pi" = (
+/obj/machinery/power/shieldwallgen/atmos/roundstart{
+	id = "shrikecargofields";
+	dir = 1
+	},
+/obj/structure/cable{
+	icon_state = "0-4"
+	},
+/obj/machinery/door/poddoor{
+	id = "shrikecargobay";
+	name = "Cargo Bay";
+	dir = 4
+	},
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/cargo)
+"pn" = (
+/obj/structure/window/reinforced/fulltile/shuttle,
+/turf/open/floor/plating,
+/area/ship/security/armory)
+"pr" = (
+/obj/machinery/airalarm/directional/north,
+/obj/effect/turf_decal/siding/thinplating/dark/corner,
+/obj/structure/tank_dispenser,
+/turf/open/floor/plasteel/tech,
+/area/ship/cargo)
+"pE" = (
+/obj/effect/turf_decal/siding/white{
+	dir = 10
+	},
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+	dir = 4
+	},
+/turf/open/floor/plasteel/patterned,
+/area/ship/engineering/engines/port)
+"pG" = (
+/obj/structure/cable{
+	icon_state = "4-9"
+	},
+/obj/effect/decal/cleanable/plastic,
+/turf/open/floor/plating,
+/area/ship/engineering/engines/port)
+"pQ" = (
+/obj/structure/reagent_dispensers/peppertank{
+	pixel_x = -32
+	},
+/obj/effect/turf_decal/borderfloorblack,
+/obj/effect/turf_decal/siding/white{
+	layer = 2.041
+	},
+/obj/effect/turf_decal/corner/transparent/vired/border{
+	layer = 2.040
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/hallway/starboard)
+"pS" = (
+/turf/closed/wall/mineral/titanium,
+/area/ship/crew)
+"pY" = (
+/obj/effect/turf_decal/trimline/opaque/vired/line{
+	dir = 1
+	},
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 6
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"qa" = (
+/obj/effect/turf_decal/borderfloorblack{
+	dir = 1
+	},
+/obj/item/radio/intercom/directional/east,
+/obj/effect/turf_decal/corner/transparent/vired/border{
+	layer = 2.040;
+	dir = 1
+	},
+/obj/effect/turf_decal/corner/transparent/vired/border{
+	dir = 4
+	},
+/obj/structure/chair/sofa/brown/corpo/right/directional/west,
+/turf/open/floor/plasteel/dark,
+/area/ship/crew)
+"qf" = (
+/obj/effect/turf_decal/siding/white{
+	dir = 1
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/hallway/port)
+"qp" = (
+/obj/machinery/cryopod,
+/obj/machinery/computer/cryopod/directional/north,
+/obj/effect/turf_decal/siding/thinplating/dark/end{
+	dir = 1
+	},
+/turf/open/floor/plasteel/telecomms_floor,
+/area/ship/crew/cryo)
+"qD" = (
+/obj/effect/turf_decal/siding/white,
+/obj/effect/turf_decal/trimline/transparent/vired/warning,
+/turf/open/floor/plasteel/tech,
+/area/ship/cargo)
+"qQ" = (
+/obj/machinery/vending/snack,
+/obj/effect/turf_decal/siding/white{
+	dir = 8
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/decal/cleanable/cobweb/cobweb2,
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/starboard)
+"qT" = (
+/obj/machinery/power/shuttle/engine/fueled/plasma,
+/turf/open/floor/plating,
+/area/ship/engineering/engines/port)
+"qU" = (
+/obj/effect/turf_decal/siding/white{
+	dir = 5
+	},
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
+/turf/open/floor/plasteel,
+/area/ship/crew)
+"rh" = (
+/obj/machinery/power/smes/shuttle/precharged,
+/obj/structure/cable{
+	icon_state = "0-8"
+	},
+/obj/machinery/door/poddoor{
+	id = "shrinkestarboardengine";
+	dir = 4
+	},
+/obj/structure/window/reinforced{
+	dir = 8
+	},
+/obj/machinery/door/window/brigdoor/eastleft,
+/turf/open/floor/plating,
+/area/ship/engineering/engines/starboard)
+"rj" = (
+/obj/effect/turf_decal/siding/white{
+	dir = 9
+	},
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
+/turf/open/floor/plasteel,
+/area/ship/crew)
+"rk" = (
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 8
+	},
+/obj/effect/turf_decal/corner/opaque/vired/border{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
+/area/ship/hallway/port)
+"rw" = (
+/obj/effect/turf_decal/siding/white,
+/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2{
+	dir = 1
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/cable{
+	icon_state = "2-4"
+	},
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+	dir = 10
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/hallway/port)
+"rA" = (
+/obj/machinery/camera/autoname{
+	network = list("shrikenetwork");
+	dir = 6
+	},
+/obj/effect/turf_decal/borderfloorblack{
+	dir = 1
+	},
+/obj/effect/turf_decal/corner/transparent/vired/border{
+	layer = 2.040;
+	dir = 1
+	},
+/obj/effect/turf_decal/siding/white/corner,
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/dark,
+/area/ship/security/armory)
+"rC" = (
+/obj/structure/closet/secure_closet/armorycage{
+	anchored = 1;
+	name = "ammunition locker";
+	locked = 0;
+	req_access = null
+	},
+/obj/effect/turf_decal/siding/white{
+	dir = 4
+	},
+/obj/machinery/camera/autoname{
+	network = list("shrikenetwork");
+	dir = 9
+	},
+/obj/item/ammo_box/magazine/co9mm{
+	pixel_x = -10;
+	pixel_y = -4
+	},
+/obj/item/ammo_box/magazine/co9mm{
+	pixel_x = -10;
+	pixel_y = -4
+	},
+/obj/item/ammo_box/magazine/co9mm{
+	pixel_x = -10;
+	pixel_y = -4
+	},
+/obj/item/ammo_box/magazine/smgm9mm{
+	pixel_x = 11;
+	pixel_y = 8
+	},
+/obj/item/ammo_box/magazine/smgm9mm{
+	pixel_x = 11;
+	pixel_y = 8
+	},
+/obj/item/ammo_box/magazine/smgm9mm{
+	pixel_x = 11;
+	pixel_y = 8
+	},
+/obj/item/stock_parts/cell/gun/upgraded{
+	pixel_x = -9;
+	pixel_y = 13
+	},
+/obj/item/stock_parts/cell/gun/upgraded{
+	pixel_x = -9;
+	pixel_y = 13
+	},
+/obj/item/stock_parts/cell/gun{
+	pixel_x = -2;
+	pixel_y = 12
+	},
+/obj/item/stock_parts/cell/gun{
+	pixel_x = -2;
+	pixel_y = 12
+	},
+/obj/item/stock_parts/cell/gun{
+	pixel_x = -2;
+	pixel_y = 12
+	},
+/obj/item/storage/toolbox/ammo/c9mm{
+	pixel_y = -4;
+	pixel_x = -2
+	},
+/obj/item/storage/toolbox/ammo/c9mm{
+	pixel_y = -4;
+	pixel_x = 7
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/security/armory)
+"rG" = (
+/obj/effect/turf_decal/corner/opaque/vired/border{
+	dir = 4
+	},
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 4
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel,
+/area/ship/hallway/starboard)
+"si" = (
+/obj/structure/sign/number/random,
+/turf/closed/wall/mineral/titanium,
+/area/ship/security/armory)
+"sn" = (
+/obj/machinery/suit_storage_unit/inherit/industrial,
+/obj/item/clothing/head/helmet/space/eva,
+/obj/item/clothing/mask/gas,
+/obj/item/clothing/suit/space/eva,
+/obj/effect/decal/cleanable/cobweb,
+/turf/open/floor/plasteel/tech,
+/area/ship/cargo)
+"su" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+	dir = 4
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/hallway/port)
+"sH" = (
+/obj/machinery/power/apc/auto_name/directional/east,
+/obj/structure/cable{
+	icon_state = "0-2"
+	},
+/obj/machinery/light_switch{
+	dir = 8;
+	pixel_x = 19;
+	pixel_y = -10
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/mono,
+/area/ship/cargo)
+"sS" = (
+/obj/effect/turf_decal/borderfloorblack,
+/obj/effect/turf_decal/corner/transparent/vired/border{
+	layer = 2.040
+	},
+/obj/effect/turf_decal/siding/white{
+	layer = 2.041
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
+/turf/open/floor/plasteel/dark,
+/area/ship/security/armory)
+"sX" = (
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 1
+	},
+/obj/effect/turf_decal/trimline/opaque/vired/line{
+	dir = 1
+	},
+/obj/structure/closet/firecloset,
+/obj/machinery/light/dim/directional/west,
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/starboard)
+"tj" = (
+/turf/open/floor/plasteel/tech/techmaint,
+/area/ship/cargo)
+"tr" = (
+/obj/effect/turf_decal/trimline/opaque/vired/line{
+	dir = 4
+	},
+/obj/effect/turf_decal/trimline/opaque/vired/line{
+	dir = 8
+	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/structure/cable{
+	icon_state = "1-10"
+	},
+/obj/structure/cable{
+	icon_state = "1-6"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
+/obj/effect/turf_decal/siding/white/end,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden,
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/central)
+"tu" = (
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 1
+	},
+/obj/effect/turf_decal/trimline/opaque/vired/line{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 10
+	},
+/obj/machinery/power/apc/auto_name/directional/north,
+/obj/structure/cable{
+	icon_state = "0-4"
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/starboard)
+"tB" = (
+/obj/structure/chair/handrail,
+/obj/effect/decal/cleanable/dirt,
+/obj/item/radio/intercom/directional/north,
+/turf/open/floor/plasteel/tech,
+/area/ship/cargo)
+"tG" = (
+/obj/structure/chair{
+	dir = 8
+	},
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 1
+	},
+/obj/machinery/light_switch{
+	pixel_x = 11;
+	pixel_y = 22
+	},
+/obj/machinery/firealarm/directional/north{
+	pixel_x = -8
+	},
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/hallway/starboard)
+"tR" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+	dir = 4
+	},
+/turf/open/floor/plasteel/patterned/cargo_one,
+/area/ship/cargo)
+"ue" = (
+/obj/structure/railing/thin{
+	dir = 4
+	},
+/obj/effect/turf_decal/siding/thinplating/dark,
+/obj/machinery/computer/cargo{
+	dir = 8;
+	icon_state = "computer-right";
+	pixel_x = 4
+	},
+/obj/effect/turf_decal/corner/opaque/vired/half,
+/obj/structure/railing/thin{
+	layer = 3.07
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"up" = (
+/obj/structure/chair/comfy/shuttle{
+	dir = 1
+	},
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 1
+	},
+/obj/effect/turf_decal/corner/opaque/vired/half{
+	dir = 1
+	},
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/bridge)
+"uv" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+	dir = 1
+	},
+/obj/structure/table/reinforced,
+/obj/machinery/recharger{
+	pixel_x = 5
+	},
+/obj/machinery/recharger{
+	pixel_x = -5
+	},
+/obj/machinery/camera/autoname{
+	network = list("shrikenetwork");
+	dir = 10
+	},
+/turf/open/floor/carpet/red,
+/area/ship/security/armory)
+"uB" = (
+/obj/effect/turf_decal/trimline/opaque/vired/line{
+	dir = 4
+	},
+/obj/effect/turf_decal/trimline/opaque/vired/line{
+	dir = 8
+	},
+/obj/effect/turf_decal/siding/white/end{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/orange/hidden,
+/turf/open/floor/plasteel/dark,
+/area/ship/hallway/port)
+"uD" = (
+/obj/effect/turf_decal/siding/white{
+	dir = 4
+	},
+/obj/structure/closet/firecloset/wall/directional/south,
+/turf/open/floor/plasteel/dark,
+/area/ship/hallway/port)
+"uE" = (
+/obj/structure/railing/thin{
+	dir = 4
+	},
+/obj/machinery/computer/helm{
+	icon_state = "computer-middle";
+	dir = 8;
+	pixel_x = 4
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"uT" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+	dir = 4
+	},
+/obj/effect/decal/cleanable/glass,
+/obj/structure/cable{
+	icon_state = "2-4"
+	},
+/turf/open/floor/plating,
+/area/ship/engineering/engines/starboard)
+"vg" = (
+/turf/open/floor/plasteel/mono,
+/area/ship/cargo)
+"vh" = (
+/obj/effect/turf_decal/corner/opaque/vired/border{
+	dir = 4
+	},
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 4
+	},
+/obj/machinery/light/dim/directional/east,
+/turf/open/floor/plasteel,
+/area/ship/hallway/starboard)
+"vq" = (
+/turf/closed/wall/mineral/titanium/nodiagonal,
+/area/ship/hallway/starboard)
+"vx" = (
+/obj/effect/turf_decal/trimline/opaque/vired/line,
+/obj/effect/turf_decal/siding/thinplating/dark,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+	dir = 8
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"vz" = (
+/obj/effect/turf_decal/trimline/opaque/ntblue/line{
+	dir = 1
+	},
+/obj/effect/turf_decal/siding/white{
+	dir = 5
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/hallway/port)
+"vC" = (
+/obj/structure/chair/office{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+	dir = 9
+	},
+/turf/open/floor/plasteel/mono,
+/area/ship/engineering/engines/starboard)
+"vJ" = (
+/obj/machinery/computer/monitor{
+	icon_state = "computer-middle"
+	},
+/obj/structure/cable{
+	icon_state = "0-2"
+	},
+/obj/machinery/light/directional/north,
+/obj/effect/turf_decal/techfloor,
+/turf/open/floor/plasteel/telecomms_floor,
+/area/ship/bridge)
+"vV" = (
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 4
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/hallway/port)
+"wd" = (
+/obj/structure/cable{
+	icon_state = "0-4"
+	},
+/obj/machinery/power/terminal{
+	dir = 8
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plating,
+/area/ship/engineering/engines/port)
+"wh" = (
+/obj/effect/turf_decal/siding/white{
+	dir = 1
+	},
+/obj/machinery/newscaster/directional/east,
+/turf/open/floor/plasteel/dark,
+/area/ship/hallway/port)
+"wi" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+	dir = 4
+	},
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 1
+	},
+/obj/effect/turf_decal/trimline/opaque/vired/line{
+	dir = 1
+	},
+/obj/machinery/airalarm/directional/north,
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/starboard)
+"wS" = (
+/obj/structure/closet/crate{
+	name = "Exploration Kit"
+	},
+/obj/item/storage/box/flares,
+/obj/item/storage/box/flares,
+/obj/item/pickaxe,
+/obj/item/pickaxe,
+/obj/item/gps,
+/obj/item/gps,
+/obj/structure/railing/thin{
+	dir = 1
+	},
+/obj/effect/turf_decal/siding/white{
+	dir = 1
+	},
+/obj/effect/turf_decal/trimline/transparent/vired/warning{
+	dir = 1
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/cargo)
+"wW" = (
+/obj/machinery/porta_turret/ship/nt/light{
+	dir = 4;
+	id = "shriketurrets"
+	},
+/turf/closed/wall/mineral/titanium,
+/area/ship/hallway/starboard)
+"xb" = (
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 4
+	},
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+	dir = 4
+	},
+/obj/machinery/light/dim/directional/west,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/dark,
+/area/ship/hallway/port)
+"xl" = (
+/obj/machinery/door/poddoor/shutters/preopen{
+	id = "shrikestarboardlockdown";
+	name = "Starboard Lockdown Shutters"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
+/obj/structure/grille,
+/obj/structure/window/reinforced/fulltile/shuttle,
+/obj/machinery/door/firedoor/window,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/orange/hidden,
+/turf/open/floor/plating,
+/area/ship/hallway/central)
+"xo" = (
+/obj/effect/turf_decal/corner/opaque/vired/border{
+	dir = 4
+	},
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 4
+	},
+/obj/machinery/airalarm/directional/east,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+	dir = 8
+	},
+/turf/open/floor/plasteel,
+/area/ship/hallway/central)
+"xI" = (
+/obj/structure/cable{
+	icon_state = "4-9"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
+/area/ship/hallway/central)
+"xM" = (
+/turf/open/floor/plasteel/tech/techmaint,
+/area/ship/hallway/port)
+"xO" = (
+/obj/machinery/power/terminal{
+	dir = 4
+	},
+/obj/structure/sign/warning/electricshock{
+	pixel_y = 28;
+	pixel_x = -6
+	},
+/obj/structure/cable{
+	icon_state = "0-8"
+	},
+/obj/item/stack/sheet/mineral/plasma/twenty,
+/obj/structure/closet/crate/radiation,
+/turf/open/floor/plasteel/patterned,
+/area/ship/engineering/engines/port)
+"xP" = (
+/obj/effect/turf_decal/trimline/opaque/vired/line{
+	dir = 8
+	},
+/obj/effect/turf_decal/trimline/opaque/vired/line{
+	dir = 4
+	},
+/obj/effect/turf_decal/siding/white/end,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/structure/cable{
+	icon_state = "2-4"
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/starboard)
+"xW" = (
+/obj/effect/turf_decal/corner/opaque/vired/border{
+	dir = 8
+	},
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 8
+	},
+/obj/structure/chair/handrail{
+	dir = 4
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel,
+/area/ship/hallway/central)
+"ya" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/mono,
+/area/ship/cargo)
+"yk" = (
+/obj/effect/turf_decal/corner/transparent/lightgrey/diagonal,
+/turf/open/floor/plasteel/white,
+/area/ship/hallway/port)
+"ym" = (
+/obj/effect/turf_decal/trimline/opaque/nsorange/line{
+	dir = 8
+	},
+/turf/closed/wall/mineral/titanium/nodiagonal,
+/area/ship/cargo)
+"yC" = (
+/obj/structure/table,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 4
+	},
+/obj/item/trash/chips,
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/hallway/port)
+"yE" = (
+/obj/machinery/door/airlock/external/glass,
+/obj/effect/turf_decal/corner/opaque/vired/half{
+	dir = 8
+	},
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
+/obj/docking_port/mobile{
+	dir = 4;
+	name = "Fast responder";
+	port_direction = 2;
+	preferred_direction = 4
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/hallway/starboard)
+"yN" = (
+/obj/effect/turf_decal/siding/white{
+	dir = 8
+	},
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 9
+	},
+/turf/open/floor/plasteel/patterned,
+/area/ship/engineering/engines/starboard)
+"yQ" = (
+/obj/machinery/door/airlock/engineering{
+	dir = 4;
+	name = "Port Engine Bay";
+	req_access_txt = "10"
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+	dir = 4
+	},
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/engineering/engines/port)
+"yS" = (
+/obj/structure/grille,
+/obj/machinery/door/poddoor/preopen{
+	id = "shrikebridgewindow";
+	dir = 4
+	},
+/obj/structure/window/reinforced/fulltile/shuttle,
+/obj/machinery/door/firedoor/heavy,
+/turf/open/floor/plating,
+/area/ship/bridge)
+"yV" = (
+/obj/effect/turf_decal/borderfloorblack{
+	dir = 8
+	},
+/obj/effect/turf_decal/siding/white{
+	dir = 1;
+	layer = 2.038
+	},
+/obj/effect/turf_decal/corner/transparent/vired/border{
+	layer = 2.040;
+	dir = 8
+	},
+/obj/structure/extinguisher_cabinet/directional/north,
+/obj/structure/filingcabinet/chestdrawer{
+	pixel_x = 7;
+	pixel_y = 13
+	},
+/obj/item/folder/red,
+/obj/item/folder/yellow,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/mono,
+/area/ship/hallway/port)
+"zg" = (
+/obj/structure/chair/office/dark{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
+/turf/open/floor/carpet/red,
+/area/ship/security/armory)
+"zj" = (
+/obj/machinery/light/dim/directional/north,
+/obj/effect/turf_decal/siding/white,
+/obj/machinery/atmospherics/pipe/manifold/orange/hidden{
+	dir = 1
+	},
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/engineering/engines/starboard)
+"zm" = (
+/obj/structure/cable{
+	icon_state = "1-8"
+	},
+/turf/open/floor/plating,
+/area/ship/engineering/engines/starboard)
+"zJ" = (
+/obj/effect/turf_decal/corner/transparent/lightgrey/diagonal,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
+/obj/structure/table/reinforced,
+/obj/item/melee/knife{
+	pixel_y = -4;
+	pixel_x = 4
+	},
+/obj/item/kitchen/rollingpin,
+/turf/open/floor/plasteel/white,
+/area/ship/hallway/port)
+"zM" = (
+/obj/effect/turf_decal/siding/white{
+	dir = 5
+	},
+/obj/machinery/light_switch{
+	dir = 8;
+	pixel_x = 19;
+	pixel_y = -10
+	},
+/obj/machinery/firealarm/directional/east{
+	pixel_y = 8
+	},
+/turf/open/floor/plasteel,
+/area/ship/crew)
+"zV" = (
+/obj/structure/cable{
+	icon_state = "2-5"
+	},
+/obj/effect/decal/cleanable/glass,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 6
+	},
+/turf/open/floor/plating,
+/area/ship/engineering/engines/starboard)
+"Aa" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 4
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 8
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 4
+	},
+/obj/machinery/door/airlock/security/glass{
+	dir = 4;
+	name = "Armoury"
+	},
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/security/armory)
+"As" = (
+/obj/effect/turf_decal/corner/transparent/lightgrey/diagonal,
+/obj/machinery/light/dim/directional/west,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
+/turf/open/floor/plasteel/white,
+/area/ship/hallway/port)
+"AT" = (
+/obj/effect/turf_decal/corner/opaque/vired/border{
+	dir = 8
+	},
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 8
+	},
+/obj/machinery/light/dim/directional/west,
+/turf/open/floor/plasteel,
+/area/ship/hallway/starboard)
+"AW" = (
+/obj/machinery/door/airlock/security{
+	name = "Gear Room"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/door/firedoor/border_only{
+	dir = 1
+	},
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/hallway/starboard)
+"AX" = (
+/obj/structure/guncloset{
+	req_access_txt = "2"
+	},
+/obj/item/gun/ballistic/automatic/smg/vector,
+/obj/item/gun/energy/e_gun/smg{
+	default_ammo_type = 0
+	},
+/obj/item/gun/ballistic/automatic/pistol/commander/no_mag,
+/obj/structure/railing/thin,
+/obj/item/gun/energy/e_gun{
+	default_ammo_type = 0
+	},
+/obj/effect/turf_decal/siding/white{
+	dir = 4
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/security/armory)
+"Bt" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
+/area/ship/hallway/starboard)
+"Bu" = (
+/turf/open/floor/carpet/red,
+/area/ship/security/armory)
+"BA" = (
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 8
+	},
+/obj/effect/turf_decal/corner/opaque/vired/border{
+	dir = 8
+	},
+/turf/open/floor/plasteel,
+/area/ship/hallway/port)
+"BJ" = (
+/obj/structure/grille,
+/obj/machinery/door/poddoor{
+	id = "shrikegeneralwindows"
+	},
+/obj/structure/window/reinforced/fulltile/shuttle,
+/obj/machinery/door/firedoor/heavy,
+/turf/open/floor/plating,
+/area/ship/crew)
+"BL" = (
+/obj/effect/turf_decal/corner/opaque/vired/border{
+	dir = 4
+	},
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 4
+	},
+/obj/machinery/power/apc/auto_name/directional/east,
+/obj/structure/cable{
+	icon_state = "0-8"
+	},
+/turf/open/floor/plasteel,
+/area/ship/hallway/central)
+"BP" = (
+/obj/structure/cable{
+	icon_state = "1-8"
+	},
+/obj/machinery/airalarm/directional/south,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+	dir = 8
+	},
+/obj/item/radio/intercom/directional/east,
+/obj/effect/turf_decal/siding/thinplating/dark,
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/cryo)
+"Cg" = (
+/obj/structure/cable{
+	icon_state = "1-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 4
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"Ch" = (
+/turf/open/floor/engine/hull,
+/area/ship/external)
+"Cn" = (
+/obj/effect/turf_decal/siding/white,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 4
+	},
+/obj/machinery/power/apc/auto_name/directional/south,
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/structure/cable{
+	icon_state = "0-4"
+	},
+/turf/open/floor/plasteel/mono,
+/area/ship/crew)
+"Ct" = (
+/obj/structure/chair/comfy/shuttle,
+/obj/effect/turf_decal/siding/thinplating/dark,
+/obj/effect/turf_decal/corner/opaque/vired/half,
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/bridge)
+"Cy" = (
+/obj/machinery/button/shieldwallgen{
+	id = "shrikecargofields";
+	dir = 8;
+	pixel_x = 23;
+	pixel_y = 7
+	},
+/obj/machinery/button/door{
+	id = "shrikecargobay";
+	name = "Cargo door button";
+	pixel_x = 24;
+	pixel_y = -2;
+	dir = 8
+	},
+/turf/open/floor/plasteel/mono,
+/area/ship/cargo)
+"CA" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 4
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 8
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 4
+	},
+/obj/machinery/door/airlock/command{
+	req_access_txt = "19";
+	name = "Bridge";
+	dir = 4
+	},
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/bridge)
+"CN" = (
+/obj/structure/cable{
+	icon_state = "6-8"
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/cable{
+	icon_state = "1-6"
+	},
+/turf/open/floor/plating,
+/area/ship/engineering/engines/port)
+"CP" = (
+/obj/structure/sign/poster/official/cleanliness{
+	pixel_y = -32
+	},
+/obj/structure/sink{
+	pixel_y = 20
+	},
+/obj/structure/mirror{
+	pixel_y = 35
+	},
+/obj/machinery/button/door{
+	pixel_y = 23;
+	pixel_x = 11;
+	id = "shrikebathroom";
+	name = "Bathroom Bolt"
+	},
+/turf/open/floor/plasteel/tech/techmaint,
+/area/ship/hallway/port)
+"CW" = (
+/obj/structure/closet/secure_closet/wall/directional/north{
+	icon_state = "sec_wall";
+	name = "Heavy Armour";
+	req_access_txt = "1"
+	},
+/obj/item/clothing/suit/armor/vest/bulletproof{
+	pixel_x = -8
+	},
+/obj/item/clothing/suit/armor/vest/bulletproof{
+	pixel_x = 8
+	},
+/obj/item/clothing/head/helmet/bulletproof{
+	pixel_x = -8;
+	pixel_y = 9
+	},
+/obj/item/clothing/head/helmet/bulletproof{
+	pixel_x = 8;
+	pixel_y = 9
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/dark,
+/area/ship/hallway/starboard)
+"Db" = (
+/obj/effect/turf_decal/corner/opaque/vired/border{
+	dir = 4
+	},
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 4
+	},
+/obj/machinery/power/apc/auto_name/directional/east,
+/obj/structure/cable{
+	icon_state = "0-8"
+	},
+/turf/open/floor/plasteel,
+/area/ship/hallway/starboard)
+"Dp" = (
+/obj/effect/turf_decal/siding/white{
+	layer = 2.041;
+	dir = 8
+	},
+/obj/machinery/light/dim/directional/west,
+/obj/structure/chair/handrail{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/dark,
+/area/ship/security/armory)
+"DA" = (
+/obj/machinery/modular_computer/console/preset/command{
+	icon_state = "computer-middle"
+	},
+/obj/item/radio/intercom/directional/north,
+/obj/machinery/newscaster/directional/west,
+/obj/effect/turf_decal/techfloor,
+/turf/open/floor/plasteel/telecomms_floor,
+/area/ship/bridge)
+"DB" = (
+/obj/machinery/porta_turret/ship/nt/light{
+	dir = 4;
+	id = "shriketurrets"
+	},
+/turf/closed/wall/mineral/titanium,
+/area/ship/hallway/port)
+"DP" = (
+/obj/effect/turf_decal/trimline/transparent/white/filled/warning{
+	dir = 8
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/mono,
+/area/ship/cargo)
+"DQ" = (
+/obj/effect/turf_decal/siding/thinplating/dark,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+	dir = 4
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/hallway/starboard)
+"DT" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+	dir = 8
+	},
+/obj/effect/turf_decal/borderfloorblack,
+/obj/effect/turf_decal/corner/transparent/vired/border{
+	layer = 2.040
+	},
+/obj/effect/turf_decal/siding/white{
+	layer = 2.041;
+	dir = 6
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/security/armory)
+"Ea" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/dark,
+/area/ship/hallway/port)
+"Ek" = (
+/obj/structure/cable{
+	icon_state = "4-9"
+	},
+/obj/structure/cable{
+	icon_state = "4-10"
+	},
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+	dir = 4
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/patterned/cargo_one,
+/area/ship/cargo)
+"Em" = (
+/obj/structure/table/reinforced,
+/obj/item/modular_computer/laptop/preset,
+/turf/open/floor/carpet/red,
+/area/ship/hallway/port)
+"En" = (
+/obj/effect/turf_decal/corner/transparent/lightgrey/diagonal,
+/obj/effect/turf_decal/siding/white{
+	dir = 1
+	},
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
+/obj/machinery/grill,
+/turf/open/floor/plasteel/white,
+/area/ship/hallway/port)
+"Eo" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 4
+	},
+/obj/machinery/door/airlock{
+	dir = 4;
+	name = "Cryogenic Storage"
+	},
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/crew/cryo)
+"Ep" = (
+/obj/structure/filingcabinet/double/grey{
+	dir = 4;
+	pixel_x = -8;
+	pixel_y = 10;
+	density = 0
+	},
+/obj/item/folder/blue{
+	pixel_x = 3
+	},
+/obj/item/folder/red{
+	pixel_x = 6
+	},
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 1
+	},
+/obj/effect/turf_decal/corner/opaque/vired/half{
+	dir = 1
+	},
+/obj/machinery/power/apc/auto_name/directional/west,
+/obj/structure/cable{
+	icon_state = "0-2"
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"Ez" = (
+/obj/effect/turf_decal/siding/white{
+	dir = 1
+	},
+/obj/effect/turf_decal/trimline/opaque/ntblue/line{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
+/turf/open/floor/plasteel/dark,
+/area/ship/hallway/port)
+"EE" = (
+/turf/open/floor/carpet/red,
+/area/ship/crew)
+"EI" = (
+/obj/effect/turf_decal/siding/white{
+	dir = 8
+	},
+/obj/structure/cable{
+	icon_state = "0-4"
+	},
+/obj/machinery/power/port_gen/pacman,
+/obj/structure/extinguisher_cabinet/directional/north,
+/turf/open/floor/plasteel/patterned,
+/area/ship/engineering/engines/port)
+"FC" = (
+/obj/structure/chair/comfy/shuttle{
+	dir = 4
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"FD" = (
+/obj/effect/turf_decal/siding/white{
+	layer = 2.041;
+	dir = 4
+	},
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 1
+	},
+/obj/effect/turf_decal/trimline/opaque/vired/line{
+	dir = 1
+	},
+/obj/structure/extinguisher_cabinet/directional/north,
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/starboard)
+"FS" = (
+/obj/structure/closet/secure_closet/hos{
+	populate = 0;
+	name = "sergeants locker"
+	},
+/obj/item/storage/backpack/satchel/sec{
+	pixel_x = 10;
+	pixel_y = -9
+	},
+/obj/item/storage/backpack/security{
+	pixel_x = -11;
+	pixel_y = -9
+	},
+/obj/item/clothing/shoes/combat{
+	pixel_y = -8
+	},
+/obj/item/clothing/gloves/combat{
+	pixel_x = -11;
+	pixel_y = 3
+	},
+/obj/item/clothing/gloves/tackler/combat/insulated{
+	pixel_x = -11;
+	pixel_y = -2
+	},
+/obj/item/clothing/mask/gas/vigilitas,
+/obj/item/clothing/under/nanotrasen/security/director,
+/obj/item/radio/headset/heads/hos/alt{
+	pixel_x = 10;
+	pixel_y = 8
+	},
+/obj/item/radio/headset/nanotrasen/alt{
+	pixel_x = 9
+	},
+/obj/item/clothing/head/nanotrasen/beret/security/command{
+	pixel_y = 12
+	},
+/obj/structure/cable{
+	icon_state = "0-6"
+	},
+/obj/effect/turf_decal/siding/white,
+/obj/effect/turf_decal/siding/white{
+	dir = 8
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/security/armory)
+"FV" = (
+/turf/closed/wall/mineral/titanium,
+/area/ship/crew/cryo)
+"FW" = (
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
+/obj/machinery/power/apc/auto_name/directional/west,
+/obj/structure/cable{
+	icon_state = "0-2"
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/hallway/port)
+"FX" = (
+/turf/closed/wall/mineral/titanium/nodiagonal,
+/area/ship/crew/cryo)
+"Ga" = (
+/obj/effect/turf_decal/siding/white{
+	dir = 6
+	},
+/obj/structure/closet/secure_closet/security{
+	populate = 0
+	},
+/obj/item/clothing/suit/armor/nanotrasen{
+	pixel_x = -8
+	},
+/obj/item/clothing/suit/armor/nanotrasen/slim,
+/obj/item/clothing/head/helmet/sec,
+/obj/item/clothing/shoes/combat{
+	pixel_y = -7;
+	pixel_x = -2
+	},
+/obj/item/clothing/gloves/combat{
+	pixel_x = -9
+	},
+/obj/item/storage/belt/security,
+/obj/item/clothing/glasses/sunglasses{
+	pixel_y = 12
+	},
+/obj/item/radio/headset/headset_sec/alt{
+	pixel_x = -12;
+	pixel_y = 11
+	},
+/obj/item/reagent_containers/spray/pepper{
+	pixel_x = 11;
+	pixel_y = 8
+	},
+/obj/item/melee/knife/combat,
+/obj/item/attachment/rail_light{
+	pixel_x = 14;
+	pixel_y = -2
+	},
+/obj/effect/turf_decal/trimline/transparent/vired/warning,
+/obj/effect/turf_decal/trimline/transparent/vired/corner{
+	dir = 1
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/starboard)
+"Gc" = (
+/obj/effect/turf_decal/siding/white{
+	dir = 8
+	},
+/obj/effect/turf_decal/siding/white{
+	dir = 4
+	},
+/obj/effect/turf_decal/trimline/opaque/vired/line{
+	dir = 4
+	},
+/obj/effect/turf_decal/trimline/opaque/vired/line{
+	dir = 8
+	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/structure/cable{
+	icon_state = "2-4"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/orange/hidden,
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/central)
+"Gi" = (
+/obj/effect/turf_decal/borderfloorblack,
+/obj/effect/turf_decal/corner/transparent/vired/border{
+	layer = 2.040
+	},
+/obj/effect/turf_decal/siding/white{
+	layer = 2.041
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/dark,
+/area/ship/security/armory)
+"Gk" = (
+/obj/effect/turf_decal/siding/white/corner{
+	dir = 4
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/hallway/port)
+"Gl" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/open/floor/plasteel,
+/area/ship/hallway/starboard)
+"GD" = (
+/obj/machinery/light_switch{
+	dir = 4;
+	pixel_x = -20;
+	pixel_y = 12
+	},
+/obj/effect/turf_decal/siding/white{
+	layer = 2.041;
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
+/turf/open/floor/plasteel/dark,
+/area/ship/security/armory)
+"GG" = (
+/obj/effect/turf_decal/corner/transparent/lightgrey/diagonal,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
+/turf/open/floor/plasteel/white,
+/area/ship/hallway/port)
+"GQ" = (
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 4
+	},
+/obj/effect/turf_decal/trimline/opaque/vired/line{
+	dir = 4
+	},
+/obj/effect/turf_decal/trimline/transparent/white/warning{
+	dir = 1
+	},
+/obj/machinery/camera/autoname{
+	network = list("shrikenetwork");
+	dir = 9
+	},
+/obj/structure/chair/handrail{
+	dir = 8
+	},
+/obj/structure/sign/warning/docking{
+	pixel_x = 32
+	},
+/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/layer2{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/starboard)
+"Hn" = (
+/obj/machinery/door/airlock/external/glass,
+/obj/effect/turf_decal/corner/opaque/vired/half{
+	dir = 4
+	},
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 4
+	},
+/obj/effect/decal/cleanable/oil/slippery,
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2{
+	dir = 4
+	},
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/hallway/starboard)
+"HJ" = (
+/obj/structure/grille,
+/obj/machinery/door/poddoor{
+	id = "shrikegeneralwindows";
+	dir = 4
+	},
+/obj/structure/window/reinforced/fulltile/shuttle,
+/obj/machinery/door/firedoor/heavy,
+/turf/open/floor/plating,
+/area/ship/hallway/port)
+"HP" = (
+/obj/effect/turf_decal/siding/white/corner,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+	dir = 4
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/hallway/port)
+"Ia" = (
+/obj/structure/table,
+/obj/machinery/light/dim/directional/east,
+/obj/effect/turf_decal/siding/white{
+	dir = 4
+	},
+/obj/item/modular_computer/tablet,
+/obj/item/computer_hardware/processor_unit/photonic/small{
+	pixel_x = -6;
+	pixel_y = 6
+	},
+/obj/item/stack/cable_coil/cut/red{
+	pixel_x = 4;
+	pixel_y = 9
+	},
+/obj/item/stock_parts/cell/computer/micro{
+	pixel_x = -6
+	},
+/obj/item/computer_hardware/hard_drive/small{
+	pixel_y = -7;
+	pixel_x = 7
+	},
+/obj/item/screwdriver{
+	pixel_y = -5;
+	pixel_x = -5
+	},
+/obj/effect/turf_decal/trimline/opaque/nsorange/line{
+	dir = 4
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/mono,
+/area/ship/engineering/engines/starboard)
+"Ig" = (
+/obj/effect/turf_decal/siding/white{
+	dir = 1
+	},
+/obj/effect/turf_decal/trimline/opaque/ntblue/line{
+	dir = 1
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/hallway/port)
+"Ii" = (
+/obj/effect/turf_decal/siding/white{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 10
+	},
+/obj/structure/rack,
+/obj/item/storage/toolbox/mechanical{
+	pixel_y = 7
+	},
+/obj/item/storage/toolbox/electrical,
+/obj/machinery/light/dim/directional/east,
+/turf/open/floor/plasteel/patterned,
+/area/ship/engineering/engines/port)
+"Iq" = (
+/obj/effect/decal/fakelattice,
+/obj/structure/platform/ship_three{
+	dir = 8
+	},
+/turf/open/floor/plasteel/elevatorshaft,
+/area/ship/bridge)
+"IA" = (
+/obj/effect/turf_decal/trimline/opaque/vired/corner,
+/obj/effect/turf_decal/siding/thinplating/dark/corner,
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2{
+	dir = 8
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/starboard)
+"IP" = (
+/obj/machinery/door/poddoor/shutters/preopen{
+	id = "shrikeportlockdown";
+	name = "Port Lockdown Shutters"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
+/obj/machinery/door/firedoor/border_only{
+	dir = 1
+	},
+/obj/structure/grille,
+/obj/structure/window/reinforced/fulltile/shuttle,
+/obj/machinery/door/firedoor/window,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/orange/hidden,
+/turf/open/floor/plating,
+/area/ship/hallway/central)
+"IQ" = (
+/obj/effect/turf_decal/siding/white{
+	layer = 2.041;
+	dir = 4
+	},
+/obj/effect/turf_decal/borderfloorblack{
+	dir = 4
+	},
+/obj/effect/turf_decal/corner/transparent/vired/border{
+	layer = 2.040;
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
+/obj/structure/cable{
+	icon_state = "1-8"
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/hallway/starboard)
+"IW" = (
+/turf/closed/wall/mineral/titanium/nodiagonal,
+/area/ship/hallway/port)
+"IZ" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 4
+	},
+/obj/effect/turf_decal/siding/white,
+/obj/machinery/light_switch{
+	pixel_x = 11;
+	pixel_y = 22
+	},
+/obj/machinery/atmospherics/pipe/manifold/orange/hidden{
+	dir = 1
+	},
+/turf/open/floor/plasteel,
+/area/ship/engineering/engines/starboard)
+"Jb" = (
+/obj/docking_port/stationary{
+	dwidth = 15;
+	height = 10;
+	width = 30;
+	name = "Cargo";
+	dir = 8
+	},
+/turf/template_noop,
+/area/template_noop)
+"JG" = (
+/obj/structure/closet/crate/bin,
+/obj/effect/turf_decal/siding/white{
+	dir = 8
+	},
+/obj/machinery/camera/autoname{
+	network = list("shrikenetwork");
+	dir = 8
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/port)
+"JH" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 4
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/hallway/starboard)
+"JJ" = (
+/obj/machinery/door/airlock/external/glass,
+/obj/effect/turf_decal/corner/opaque/vired/half{
+	dir = 8
+	},
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 8
+	},
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 6
+	},
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/hallway/starboard)
+"JO" = (
+/obj/effect/turf_decal/siding/white,
+/obj/structure/closet/secure_closet/security{
+	populate = 0
+	},
+/obj/item/clothing/suit/armor/nanotrasen{
+	pixel_x = -8
+	},
+/obj/item/clothing/suit/armor/nanotrasen/slim,
+/obj/item/clothing/head/helmet/sec,
+/obj/item/clothing/shoes/combat{
+	pixel_y = -7;
+	pixel_x = -2
+	},
+/obj/item/clothing/gloves/combat{
+	pixel_x = -9
+	},
+/obj/item/storage/belt/security,
+/obj/item/clothing/glasses/sunglasses{
+	pixel_y = 12
+	},
+/obj/item/radio/headset/headset_sec/alt{
+	pixel_x = -12;
+	pixel_y = 11
+	},
+/obj/item/reagent_containers/spray/pepper{
+	pixel_x = 11;
+	pixel_y = 8
+	},
+/obj/item/melee/knife/combat,
+/obj/item/attachment/rail_light{
+	pixel_x = 14;
+	pixel_y = -2
+	},
+/obj/effect/turf_decal/trimline/transparent/vired/warning,
+/obj/effect/turf_decal/trimline/transparent/vired/corner{
+	dir = 4
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/starboard)
+"Kb" = (
+/obj/structure/table,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 10
+	},
+/obj/item/trash/sosjerky{
+	pixel_x = 6;
+	pixel_y = 8
+	},
+/obj/item/trash/can{
+	pixel_x = -8
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/hallway/port)
+"Km" = (
+/obj/machinery/suit_storage_unit/inherit,
+/obj/structure/railing/thin{
+	dir = 8
+	},
+/obj/item/tank/jetpack/oxygen/security,
+/obj/item/clothing/mask/gas/vigilitas,
+/obj/item/clothing/suit/space/hardsuit/security/hos,
+/obj/effect/turf_decal/siding/white,
+/obj/machinery/firealarm/directional/south,
+/turf/open/floor/plasteel/tech,
+/area/ship/security/armory)
+"Kv" = (
+/obj/structure/cable{
+	icon_state = "0-4"
+	},
+/obj/machinery/power/terminal{
+	dir = 8
+	},
+/obj/structure/sign/warning/electricshock{
+	pixel_y = 28;
+	pixel_x = -6
+	},
+/turf/open/floor/plating,
+/area/ship/engineering/engines/starboard)
+"KB" = (
+/obj/machinery/suit_storage_unit/inherit,
+/obj/item/clothing/mask/gas/vigilitas,
+/obj/item/tank/jetpack/oxygen/security,
+/obj/item/clothing/suit/space/hardsuit/security,
+/obj/effect/turf_decal/siding/white{
+	dir = 4
+	},
+/obj/effect/turf_decal/trimline/transparent/vired/warning{
+	dir = 4
+	},
+/obj/effect/turf_decal/trimline/transparent/vired/corner{
+	dir = 8
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/starboard)
+"KI" = (
+/obj/effect/turf_decal/trimline/opaque/vired/corner{
+	dir = 8
+	},
+/obj/effect/turf_decal/siding/thinplating/dark/corner{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 4
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/starboard)
+"KU" = (
+/obj/structure/railing/thin,
+/obj/machinery/door/window/brigdoor/eastright{
+	dir = 8;
+	req_access_txt = "19";
+	layer = 3
+	},
+/obj/structure/window/reinforced,
+/obj/machinery/blackbox_recorder,
+/obj/effect/turf_decal/techfloor{
+	dir = 8
+	},
+/turf/open/floor/plasteel/telecomms_floor,
+/area/ship/bridge)
+"KX" = (
+/obj/structure/table,
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 1
+	},
+/obj/item/newspaper{
+	pixel_x = 6;
+	pixel_y = 7
+	},
+/obj/item/food/donut/jelly/slimejelly/berry,
+/obj/item/reagent_containers/food/drinks/soylatte{
+	pixel_x = -8
+	},
+/obj/item/pen/red{
+	pixel_y = 7;
+	pixel_x = 7
+	},
+/obj/machinery/computer/security/telescreen/entertainment{
+	pixel_x = -32
+	},
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/hallway/starboard)
+"La" = (
+/turf/closed/wall/mineral/titanium/nodiagonal,
+/area/ship/security/armory)
+"Lb" = (
+/obj/effect/turf_decal/siding/thinplating/dark,
+/obj/effect/turf_decal/trimline/opaque/vired/line,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+	dir = 4
+	},
+/obj/structure/closet/emcloset,
+/obj/item/tank/internals/emergency_oxygen/double,
+/obj/item/tank/internals/emergency_oxygen/double,
+/obj/item/tank/internals/emergency_oxygen/double,
+/obj/item/tank/internals/emergency_oxygen/double,
+/obj/item/clothing/mask/gas/vigilitas,
+/obj/item/clothing/mask/gas/vigilitas,
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/starboard)
+"Ld" = (
+/obj/effect/turf_decal/siding/white{
+	dir = 4
+	},
+/obj/structure/tank_dispenser,
+/obj/effect/turf_decal/trimline/transparent/vired/warning{
+	dir = 4
+	},
+/obj/effect/turf_decal/trimline/transparent/vired/line{
+	dir = 8
+	},
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/hallway/starboard)
+"Lj" = (
+/obj/structure/toilet{
+	pixel_y = 15;
+	pixel_x = -10
+	},
+/obj/structure/closet/wall/directional/south{
+	name = "Cleaning Supplies"
+	},
+/obj/item/pushbroom,
+/obj/item/mop,
+/obj/item/storage/bag/trash,
+/obj/item/reagent_containers/glass/bucket,
+/obj/item/soap/nanotrasen,
+/obj/machinery/light/small/directional/north,
+/turf/open/floor/plasteel/tech/techmaint,
+/area/ship/hallway/port)
+"Ln" = (
+/obj/structure/cable{
+	icon_state = "5-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
+/area/ship/hallway/central)
+"Lo" = (
+/obj/effect/turf_decal/borderfloorblack{
+	dir = 8
+	},
+/obj/effect/turf_decal/corner/transparent/vired/border{
+	layer = 2.040;
+	dir = 8
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/mono,
+/area/ship/hallway/port)
+"Lw" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 4
+	},
+/turf/open/floor/plasteel/mono,
+/area/ship/cargo)
+"LB" = (
+/obj/structure/closet/crate/medical,
+/obj/item/storage/firstaid/regular,
+/obj/item/storage/firstaid/brute,
+/obj/item/reagent_containers/glass/bottle/morphine,
+/obj/item/storage/pill_bottle/charcoal,
+/obj/item/reagent_containers/syringe,
+/obj/effect/turf_decal/siding/white,
+/obj/machinery/firealarm/directional/east,
+/turf/open/floor/plasteel/tech,
+/area/ship/cargo)
+"LL" = (
+/obj/effect/turf_decal/siding/white{
+	dir = 1
+	},
+/obj/structure/table/reinforced,
+/obj/item/storage/fancy/donut_box,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/mono,
+/area/ship/hallway/port)
+"LS" = (
+/obj/structure/table/reinforced,
+/obj/item/paper_bin,
+/obj/item/pen/fourcolor,
+/obj/item/stamp/nanotrasen/vigilitas/security{
+	pixel_x = 11;
+	pixel_y = 8
+	},
+/obj/machinery/door/window/brigdoor/eastright{
+	dir = 8;
+	req_access_txt = "3"
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/security/armory)
+"Mw" = (
+/obj/effect/turf_decal/siding/white{
+	dir = 8
+	},
+/obj/effect/turf_decal/siding/white{
+	dir = 4
+	},
+/obj/effect/turf_decal/trimline/opaque/vired/line{
+	dir = 4
+	},
+/obj/effect/turf_decal/trimline/opaque/vired/line{
+	dir = 8
+	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/orange/hidden,
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/central)
+"MI" = (
+/obj/machinery/computer/security{
+	icon_state = "computer-middle";
+	dir = 1;
+	network = list("shrikenetwork")
+	},
+/obj/item/radio/intercom/wideband/directional/west,
+/obj/machinery/firealarm/directional/south,
+/obj/effect/turf_decal/techfloor{
+	dir = 1
+	},
+/turf/open/floor/plasteel/telecomms_floor,
+/area/ship/bridge)
+"MR" = (
+/obj/machinery/power/shuttle/engine/fueled/plasma,
+/turf/open/floor/plating,
+/area/ship/engineering/engines/starboard)
+"MV" = (
+/obj/machinery/cell_charger{
+	dir = 4;
+	pixel_x = -5
+	},
+/obj/structure/table,
+/obj/effect/turf_decal/siding/white{
+	dir = 6
+	},
+/obj/effect/turf_decal/trimline/opaque/nsorange/line{
+	dir = 4
+	},
+/obj/structure/sign/poster/official/moth/piping{
+	pixel_x = 32
+	},
+/turf/open/floor/plasteel/mono,
+/area/ship/engineering/engines/starboard)
+"MZ" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+	dir = 4
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/patterned/cargo_one,
+/area/ship/cargo)
+"Nh" = (
+/obj/structure/railing/thin{
+	dir = 4
+	},
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 1
+	},
+/obj/machinery/computer/crew{
+	icon_state = "computer-left";
+	dir = 8;
+	pixel_x = 4
+	},
+/obj/effect/turf_decal/corner/opaque/vired/half{
+	dir = 1
+	},
+/obj/structure/railing/thin{
+	dir = 1;
+	layer = 2.89
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"NC" = (
+/turf/closed/wall/mineral/titanium/nodiagonal,
+/area/ship/crew)
+"ND" = (
+/obj/structure/chair/handrail,
+/obj/structure/sign/poster/random{
+	pixel_y = 32
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/tech,
+/area/ship/cargo)
+"NF" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+	dir = 1
+	},
+/obj/effect/turf_decal/borderfloorblack,
+/obj/effect/turf_decal/corner/transparent/vired/border{
+	layer = 2.040
+	},
+/obj/effect/turf_decal/siding/white{
+	layer = 2.041;
+	dir = 8
+	},
+/obj/structure/chair/handrail{
+	dir = 4
+	},
+/obj/machinery/computer/helm/viewscreen/directional/south,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/dark,
+/area/ship/security/armory)
+"NN" = (
+/obj/effect/turf_decal/siding/white{
+	dir = 5
+	},
+/obj/structure/sign/poster/official/focus{
+	pixel_y = 32;
+	layer = 2.89
+	},
+/obj/structure/table/reinforced,
+/obj/item/megaphone/sec,
+/turf/open/floor/plasteel/mono,
+/area/ship/hallway/port)
+"Ob" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/siding/white{
+	dir = 1
+	},
+/obj/effect/turf_decal/trimline/transparent/vired/warning{
+	dir = 1
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/cargo)
+"Od" = (
+/obj/effect/turf_decal/siding/white,
+/obj/effect/turf_decal/trimline/transparent/vired/warning,
+/obj/structure/table/reinforced,
+/obj/machinery/airalarm/directional/north,
+/turf/open/floor/plasteel/tech,
+/area/ship/cargo)
+"Of" = (
+/obj/effect/turf_decal/siding/white{
+	layer = 2.041;
+	dir = 4
+	},
+/obj/effect/turf_decal/siding/white{
+	layer = 2.041;
+	dir = 4
+	},
+/obj/effect/turf_decal/siding/thinplating/dark,
+/obj/effect/turf_decal/trimline/opaque/vired/line,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 4
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/starboard)
+"Ok" = (
+/obj/effect/turf_decal/siding/white{
+	dir = 8
+	},
+/obj/structure/reagent_dispensers/fueltank,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
+/turf/open/floor/plasteel/patterned,
+/area/ship/engineering/engines/starboard)
+"Op" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 10
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 9
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/holopad/emergency/command,
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"Ox" = (
+/obj/machinery/door/airlock/external/glass,
+/obj/effect/turf_decal/corner/opaque/vired/half{
+	dir = 4
+	},
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/layer_manifold,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/hallway/starboard)
+"ON" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2{
+	dir = 8
+	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/plasteel/mono,
+/area/ship/hallway/starboard)
+"OX" = (
+/obj/structure/closet/secure_closet/captains{
+	populate = 0
+	},
+/obj/item/storage/backpack/satchel/sec{
+	pixel_x = 10;
+	pixel_y = -9
+	},
+/obj/item/storage/backpack/security{
+	pixel_x = -11;
+	pixel_y = -9
+	},
+/obj/item/clothing/shoes/combat{
+	pixel_y = -8
+	},
+/obj/item/clothing/gloves/combat{
+	pixel_x = -11;
+	pixel_y = 3
+	},
+/obj/item/clothing/mask/gas/vigilitas,
+/obj/item/clothing/under/nanotrasen/security/director,
+/obj/item/clothing/suit/armor/nanotrasen/sec_director{
+	pixel_x = 10
+	},
+/obj/item/radio/headset/heads/captain/alt{
+	pixel_x = 11;
+	pixel_y = 10
+	},
+/obj/item/radio/headset/nanotrasen/alt/captain{
+	pixel_x = 12;
+	pixel_y = 4
+	},
+/obj/item/clothing/head/nanotrasen/beret/security/command{
+	pixel_y = 12
+	},
+/obj/item/clothing/glasses/sunglasses{
+	pixel_y = 12;
+	pixel_x = -10
+	},
+/obj/item/storage/belt/military/assault,
+/obj/effect/turf_decal/siding/thinplating/dark,
+/obj/effect/turf_decal/corner/opaque/vired/half,
+/obj/machinery/button/door{
+	pixel_x = -21;
+	dir = 4;
+	pixel_y = -6;
+	id = "shrikegeneralwindows";
+	name = "Window shutters"
+	},
+/obj/machinery/button/door{
+	pixel_x = -30;
+	dir = 4;
+	pixel_y = 5;
+	id = "shrikeportlockdown";
+	name = "Port lockdown"
+	},
+/obj/machinery/button/door{
+	pixel_x = -30;
+	dir = 4;
+	pixel_y = -6;
+	id = "shrikestarboardlockdown";
+	name = "Starboard lockdown"
+	},
+/obj/machinery/button/door{
+	pixel_x = -21;
+	dir = 4;
+	pixel_y = 5;
+	name = "Bridge shutters";
+	id = "shrikebridgewindow"
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"OY" = (
+/obj/machinery/door/poddoor{
+	id = "shrikecargobay";
+	name = "Cargo Bay";
+	dir = 4
+	},
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/cargo)
+"OZ" = (
+/obj/effect/turf_decal/siding/white/corner{
+	dir = 4
+	},
+/obj/machinery/holopad/emergency,
+/turf/open/floor/plasteel/mono,
+/area/ship/hallway/port)
+"Pd" = (
+/obj/effect/turf_decal/borderfloorblack,
+/obj/effect/turf_decal/corner/transparent/vired/border{
+	layer = 2.040
+	},
+/obj/effect/turf_decal/corner/transparent/vired/border{
+	dir = 4
+	},
+/obj/structure/chair/sofa/brown/corpo/left/directional/west,
+/turf/open/floor/plasteel/dark,
+/area/ship/crew)
+"Pj" = (
+/obj/machinery/power/shuttle/engine/electric,
+/obj/structure/cable{
+	icon_state = "0-4"
+	},
+/turf/open/floor/plating,
+/area/ship/engineering/engines/port)
+"PD" = (
+/obj/effect/turf_decal/siding/white{
+	dir = 1
+	},
+/obj/machinery/holopad/emergency,
+/turf/open/floor/plasteel/mono,
+/area/ship/crew)
+"PL" = (
+/turf/closed/wall/mineral/titanium,
+/area/ship/hallway/port)
+"PN" = (
+/obj/effect/turf_decal/industrial/warning{
+	dir = 8
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/light/floor,
+/turf/open/floor/plasteel/patterned/cargo_one,
+/area/ship/cargo)
+"PU" = (
+/obj/machinery/atmospherics/components/unary/portables_connector/layer4{
+	dir = 4
+	},
+/obj/effect/turf_decal/siding/white/corner{
+	dir = 1
+	},
+/turf/open/floor/plasteel/patterned,
+/area/ship/engineering/engines/starboard)
+"Qa" = (
+/obj/effect/turf_decal/borderfloorblack,
+/obj/effect/turf_decal/corner/transparent/vired/border{
+	layer = 2.040
+	},
+/obj/effect/turf_decal/siding/white{
+	layer = 2.041;
+	dir = 4
+	},
+/obj/machinery/newscaster/directional/south,
+/turf/open/floor/plasteel/dark,
+/area/ship/security/armory)
+"Qf" = (
+/obj/effect/turf_decal/siding/white,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/dark,
+/area/ship/hallway/port)
+"Qo" = (
+/obj/machinery/suit_storage_unit/inherit,
+/obj/item/clothing/mask/gas/vigilitas,
+/obj/item/tank/jetpack/oxygen/security,
+/obj/item/clothing/suit/space/hardsuit/security,
+/obj/effect/turf_decal/siding/white{
+	dir = 6
+	},
+/obj/effect/turf_decal/trimline/transparent/vired/warning{
+	dir = 4
+	},
+/obj/effect/turf_decal/trimline/transparent/vired/corner{
+	dir = 1
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/starboard)
+"Qq" = (
+/obj/structure/closet/emcloset/wall/directional/west,
+/obj/item/clothing/mask/gas/vigilitas,
+/obj/item/clothing/mask/gas/vigilitas,
+/obj/item/clothing/mask/gas/vigilitas,
+/obj/item/clothing/mask/gas/vigilitas,
+/obj/effect/turf_decal/siding/white{
+	dir = 4
+	},
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+	dir = 4
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/hallway/port)
+"Qu" = (
+/obj/machinery/power/shieldwallgen/atmos/roundstart{
+	id = "shrikecargofields"
+	},
+/obj/structure/cable{
+	icon_state = "0-4"
+	},
+/obj/effect/decal/cleanable/oil/slippery,
+/obj/machinery/door/poddoor{
+	id = "shrikecargobay";
+	name = "Cargo Bay";
+	dir = 4
+	},
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/cargo)
+"Qw" = (
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 8
+	},
+/obj/effect/turf_decal/trimline/opaque/vired/line{
+	dir = 8
+	},
+/obj/effect/turf_decal/trimline/transparent/white/warning{
+	dir = 1
+	},
+/obj/machinery/light/small/directional/west,
+/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/layer2{
+	dir = 1
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/starboard)
+"QA" = (
+/obj/machinery/power/ship_gravity,
+/obj/structure/window/reinforced,
+/obj/structure/cable,
+/obj/effect/turf_decal/siding/white{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+	dir = 4
+	},
+/turf/open/floor/plasteel/patterned,
+/area/ship/engineering/engines/starboard)
+"QD" = (
+/obj/structure/railing/thin{
+	dir = 1
+	},
+/obj/machinery/door/window/brigdoor/eastleft{
+	dir = 8;
+	req_access_txt = "19";
+	layer = 3
+	},
+/obj/structure/window/reinforced{
+	dir = 1
+	},
+/obj/machinery/telecomms/relay/preset/nanotrasen,
+/obj/effect/turf_decal/techfloor{
+	dir = 8
+	},
+/turf/open/floor/plasteel/telecomms_floor,
+/area/ship/bridge)
+"QH" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 9
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/closet/wall/directional/south,
+/obj/item/radio{
+	pixel_x = -8
+	},
+/obj/item/radio{
+	pixel_x = -2
+	},
+/obj/item/radio{
+	pixel_x = 3
+	},
+/obj/item/radio{
+	pixel_x = -8;
+	pixel_y = 9
+	},
+/obj/item/radio{
+	pixel_x = -4;
+	pixel_y = 9
+	},
+/obj/item/radio{
+	pixel_x = 3;
+	pixel_y = 9
+	},
+/obj/effect/turf_decal/siding/thinplating/dark,
+/obj/effect/turf_decal/siding/thinplating/dark,
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/cryo)
+"QT" = (
+/obj/effect/decal/fakelattice{
+	icon_state = "lattice-3"
+	},
+/obj/structure/platform/ship_three{
+	dir = 10
+	},
+/turf/open/floor/plasteel/elevatorshaft,
+/area/ship/bridge)
+"QY" = (
+/obj/structure/grille,
+/obj/structure/window/reinforced/fulltile/shuttle,
+/obj/machinery/door/poddoor{
+	id = "shrikegeneralwindows"
+	},
+/obj/machinery/door/firedoor/heavy,
+/turf/open/floor/plating,
+/area/ship/hallway/port)
+"Rn" = (
+/obj/structure/railing/thin,
+/obj/machinery/suit_storage_unit/inherit/industrial,
+/obj/item/clothing/shoes/magboots,
+/obj/item/clothing/mask/gas/atmos,
+/obj/item/clothing/suit/space/hardsuit/engine,
+/obj/effect/turf_decal/siding/white,
+/obj/effect/turf_decal/trimline/transparent/vired/warning,
+/turf/open/floor/plasteel/tech,
+/area/ship/cargo)
+"Rr" = (
+/obj/effect/turf_decal/borderfloorblack{
+	dir = 10
+	},
+/obj/effect/turf_decal/corner/transparent/vired/border{
+	layer = 2.040;
+	dir = 10
+	},
+/turf/open/floor/plasteel/mono,
+/area/ship/hallway/port)
+"Rt" = (
+/obj/effect/turf_decal/corner/opaque/white{
+	dir = 4
+	},
+/obj/effect/turf_decal/corner/opaque/white{
+	dir = 8
+	},
+/obj/structure/closet/secure_closet/freezer/fridge{
+	populate = 0
+	},
+/obj/item/food/meat/slab,
+/obj/item/food/meat/slab,
+/obj/item/food/meat/slab,
+/obj/item/food/meat/slab,
+/obj/item/food/meat/slab,
+/obj/item/food/meat/slab,
+/obj/item/storage/fancy/egg_box,
+/obj/item/storage/fancy/egg_box,
+/obj/item/storage/fancy/egg_box,
+/obj/item/reagent_containers/condiment/milk,
+/obj/item/reagent_containers/condiment/milk,
+/obj/item/reagent_containers/condiment/soymilk,
+/obj/item/reagent_containers/condiment/enzyme,
+/obj/item/storage/box/ingredients/vegetarian,
+/obj/item/storage/box/ingredients/vegetarian,
+/obj/item/reagent_containers/condiment/flour,
+/obj/item/reagent_containers/condiment/flour,
+/obj/item/reagent_containers/condiment/sugar,
+/obj/item/reagent_containers/condiment/rice,
+/obj/item/food/cheese/wheel,
+/obj/effect/turf_decal/siding/white{
+	dir = 8
+	},
+/turf/open/floor/plasteel/lightgrey,
+/area/ship/hallway/port)
+"Rx" = (
+/obj/machinery/porta_turret/ship/nt/light{
+	dir = 8;
+	id = "shriketurrets"
+	},
+/turf/closed/wall/mineral/titanium/nodiagonal,
+/area/ship/engineering/engines/port)
+"RA" = (
+/turf/closed/wall/mineral/titanium,
+/area/ship/external)
+"RD" = (
+/obj/machinery/light/dim/directional/east,
+/obj/machinery/computer/helm/viewscreen/directional/north,
+/obj/machinery/camera/autoname{
+	network = list("shrikenetwork");
+	dir = 8
+	},
+/obj/effect/turf_decal/siding/white,
+/obj/effect/turf_decal/trimline/transparent/vired/warning,
+/obj/structure/table/reinforced,
+/obj/machinery/recharger{
+	pixel_x = -5
+	},
+/obj/machinery/recharger{
+	pixel_x = 5
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/cargo)
+"RH" = (
+/turf/closed/wall/mineral/titanium/nodiagonal,
+/area/ship/engineering/engines/port)
+"RI" = (
+/obj/structure/cable{
+	icon_state = "0-4"
+	},
+/obj/machinery/power/terminal{
+	dir = 8
+	},
+/obj/machinery/light/small/directional/south,
+/turf/open/floor/plating,
+/area/ship/engineering/engines/starboard)
+"RL" = (
+/obj/effect/turf_decal/trimline/opaque/vired/line{
+	dir = 1
+	},
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 1
+	},
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+	dir = 8
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"RQ" = (
+/obj/machinery/light_switch{
+	pixel_x = -11;
+	pixel_y = 22
+	},
+/obj/effect/turf_decal/borderfloorblack{
+	dir = 1
+	},
+/obj/effect/turf_decal/corner/transparent/vired/border{
+	layer = 2.040;
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 10
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/firealarm/directional/north{
+	pixel_x = 6
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/security/armory)
+"RX" = (
+/obj/structure/railing/thin{
+	dir = 8
+	},
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/door/firedoor/border_only{
+	dir = 1
+	},
+/obj/machinery/door/poddoor/shutters/preopen{
+	id = "shrikestarboardlockdown";
+	name = "Starboard Lockdown Shutters"
+	},
+/obj/machinery/door/airlock/glass{
+	name = "Central Hallway"
+	},
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/hallway/central)
+"Se" = (
+/obj/structure/cable{
+	icon_state = "2-4"
+	},
+/obj/effect/turf_decal/siding/white{
+	dir = 4
+	},
+/obj/effect/turf_decal/ntspaceworks_small/right,
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 4
+	},
+/obj/effect/decal/cleanable/oil/slippery,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+	dir = 5
+	},
+/turf/open/floor/plasteel/patterned,
+/area/ship/engineering/engines/starboard)
+"Si" = (
+/turf/template_noop,
+/area/template_noop)
+"Sj" = (
+/obj/structure/railing/thin,
+/obj/effect/turf_decal/siding/white,
+/obj/effect/turf_decal/trimline/transparent/vired/warning,
+/turf/open/floor/plasteel/tech,
+/area/ship/cargo)
+"Sm" = (
+/obj/structure/closet/crate,
+/obj/effect/spawner/random/food_or_drink/ration,
+/obj/effect/spawner/random/food_or_drink/ration,
+/obj/effect/spawner/random/food_or_drink/ration,
+/obj/effect/spawner/random/food_or_drink/ration,
+/obj/effect/spawner/random/food_or_drink/ration,
+/obj/effect/spawner/random/food_or_drink/ration,
+/obj/effect/spawner/random/food_or_drink/ration,
+/obj/effect/spawner/random/food_or_drink/ration,
+/obj/effect/spawner/random/food_or_drink/ration,
+/obj/effect/spawner/random/food_or_drink/ration,
+/obj/item/toy/plush/lizardplushie,
+/obj/effect/turf_decal/siding/white,
+/turf/open/floor/plasteel/tech,
+/area/ship/cargo)
+"Sn" = (
+/obj/effect/turf_decal/siding/white{
+	dir = 8
+	},
+/obj/machinery/airalarm/directional/south,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+	dir = 4
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+	dir = 4
+	},
+/turf/open/floor/plasteel/patterned,
+/area/ship/engineering/engines/port)
+"Sp" = (
+/obj/structure/table,
+/obj/effect/turf_decal/siding/thinplating/dark,
+/obj/item/storage/fancy/donut_box,
+/obj/machinery/newscaster/directional/west,
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/hallway/starboard)
+"Sv" = (
+/obj/effect/turf_decal/siding/white{
+	dir = 8
+	},
+/obj/structure/cable{
+	icon_state = "6-8"
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/patterned,
+/area/ship/engineering/engines/port)
+"SH" = (
+/obj/effect/turf_decal/corner/transparent/lightgrey/diagonal,
+/obj/effect/turf_decal/siding/white{
+	dir = 8
+	},
+/obj/item/reagent_containers/condiment/saltshaker{
+	pixel_x = -5;
+	pixel_y = 5
+	},
+/obj/item/reagent_containers/condiment/peppermill{
+	pixel_x = 5;
+	pixel_y = 5
+	},
+/obj/structure/table/reinforced,
+/turf/open/floor/plasteel/white,
+/area/ship/hallway/port)
+"SI" = (
+/obj/effect/turf_decal/siding/white{
+	dir = 9
+	},
+/turf/open/floor/plasteel,
+/area/ship/crew)
+"SN" = (
+/turf/closed/wall/mineral/titanium/nodiagonal,
+/area/ship/cargo)
+"Th" = (
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 8
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/hallway/port)
+"Tv" = (
+/obj/structure/closet/wall/directional/south{
+	name = "Wardrobe"
+	},
+/obj/item/storage/backpack/security,
+/obj/item/storage/backpack/security,
+/obj/item/storage/backpack/satchel/sec,
+/obj/item/storage/backpack/satchel/sec,
+/obj/item/storage/backpack/messenger/sec,
+/obj/item/storage/backpack/messenger/sec,
+/obj/item/storage/backpack/duffelbag/sec,
+/obj/item/storage/backpack/duffelbag/sec,
+/obj/effect/turf_decal/siding/white{
+	dir = 6
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4,
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/open/floor/plasteel,
+/area/ship/crew)
+"TA" = (
+/obj/structure/chair{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/hallway/port)
+"TK" = (
+/obj/effect/turf_decal/industrial/warning{
+	dir = 8
+	},
+/obj/effect/turf_decal/industrial/stand_clear{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "5-8"
+	},
+/obj/structure/sign/nanotrasen/vigilitas{
+	pixel_y = -32
+	},
+/turf/open/floor/plasteel/patterned/cargo_one,
+/area/ship/cargo)
+"TU" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
+/obj/structure/noticeboard{
+	dir = 4;
+	pixel_x = -32
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/dark,
+/area/ship/hallway/port)
+"Uo" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 4
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 8
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 4
+	},
+/obj/machinery/door/airlock{
+	name = "Crew Quarters";
+	dir = 4
+	},
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/crew)
+"Uq" = (
+/obj/effect/turf_decal/ntspaceworks_small,
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+	dir = 10
+	},
+/turf/open/floor/plasteel/patterned,
+/area/ship/engineering/engines/starboard)
+"Uu" = (
+/obj/structure/grille,
+/obj/machinery/door/poddoor{
+	id = "shrikegeneralwindows";
+	dir = 4
+	},
+/obj/structure/window/reinforced/fulltile/shuttle,
+/turf/open/floor/plating,
+/area/ship/cargo)
+"Uv" = (
+/obj/effect/turf_decal/corner/opaque/vired/border{
+	dir = 8
+	},
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 8
+	},
+/obj/structure/chair/handrail{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
+/area/ship/hallway/central)
+"UA" = (
+/obj/effect/decal/cleanable/plasma,
+/obj/effect/turf_decal/siding/white/corner{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 4
+	},
+/turf/open/floor/plasteel/patterned,
+/area/ship/engineering/engines/port)
+"UH" = (
+/obj/effect/turf_decal/trimline/opaque/vired/line,
+/obj/effect/turf_decal/siding/thinplating/dark,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 5
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"UM" = (
+/obj/machinery/power/shuttle/engine/electric,
+/obj/structure/cable{
+	icon_state = "0-4"
+	},
+/turf/open/floor/plating,
+/area/ship/engineering/engines/starboard)
+"UU" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/camera/autoname{
+	network = list("shrikenetwork");
+	dir = 10
+	},
+/obj/machinery/light_switch{
+	dir = 1;
+	pixel_x = -9;
+	pixel_y = -19
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 5
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/robot_debris,
+/obj/effect/turf_decal/siding/white/corner{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "4-9"
+	},
+/obj/structure/cable{
+	icon_state = "1-4"
+	},
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+	dir = 4
+	},
+/turf/open/floor/plasteel/patterned,
+/area/ship/engineering/engines/port)
+"UW" = (
+/obj/effect/decal/fakelattice{
+	icon_state = "lattice-3"
+	},
+/obj/structure/platform/ship_three{
+	dir = 9
+	},
+/turf/open/floor/plasteel/elevatorshaft,
+/area/ship/bridge)
+"Vb" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 4
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/stairs/mid{
+	dir = 8
+	},
+/area/ship/cargo)
+"Vo" = (
+/obj/effect/turf_decal/siding/white,
+/obj/structure/table,
+/obj/machinery/recharger,
+/obj/effect/turf_decal/trimline/transparent/vired/warning,
+/obj/effect/turf_decal/trimline/transparent/vired/line{
+	dir = 1
+	},
+/obj/machinery/camera/autoname{
+	network = list("shrikenetwork");
+	dir = 10
+	},
+/obj/machinery/light/dim/directional/south,
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/hallway/starboard)
+"Vz" = (
+/obj/effect/turf_decal/siding/white,
+/turf/open/floor/plasteel/tech,
+/area/ship/cargo)
+"VD" = (
+/obj/effect/turf_decal/corner/opaque/vired/border{
+	dir = 8
+	},
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 8
+	},
+/obj/machinery/light/small/directional/west,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel,
+/area/ship/hallway/central)
+"VY" = (
+/obj/effect/turf_decal/corner/opaque/vired/border{
+	dir = 8
+	},
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 8
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel,
+/area/ship/hallway/starboard)
+"We" = (
+/obj/structure/window/reinforced{
+	dir = 8
+	},
+/obj/effect/turf_decal/siding/white{
+	dir = 8
+	},
+/obj/effect/turf_decal/trimline/opaque/nsorange/line{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+	dir = 4
+	},
+/turf/open/floor/plasteel/mono,
+/area/ship/engineering/engines/starboard)
+"Wn" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 4
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 8
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 4
+	},
+/obj/machinery/door/airlock/engineering{
+	dir = 4;
+	name = "Starboard Engine Bay";
+	req_access_txt = "10"
+	},
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+	dir = 4
+	},
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/engineering/engines/starboard)
+"Wt" = (
+/obj/effect/turf_decal/techfloor{
+	dir = 1
+	},
+/obj/machinery/power/apc/auto_name/directional/north,
+/obj/structure/cable{
+	icon_state = "0-2"
+	},
+/obj/machinery/light/small/directional/east,
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/cryo)
+"Wx" = (
+/obj/machinery/light_switch{
+	pixel_x = 11;
+	pixel_y = 22
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/firealarm/directional/north{
+	pixel_x = -8
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/dark,
+/area/ship/hallway/starboard)
+"WF" = (
+/obj/structure/grille,
+/obj/machinery/atmospherics/pipe/layer_manifold,
+/obj/machinery/door/poddoor{
+	id = "shrikeventwindow"
+	},
+/obj/structure/window/reinforced/fulltile/shuttle,
+/obj/item/tank/internals/emergency_oxygen/double/empty,
+/obj/machinery/door/firedoor/heavy,
+/turf/open/floor/plating,
+/area/ship/engineering/engines/port)
+"WP" = (
+/turf/closed/wall/mineral/titanium,
+/area/ship/bridge)
+"WV" = (
+/obj/structure/closet/wall/directional/south{
+	name = "Wardrobe"
+	},
+/obj/item/clothing/under/nanotrasen/security{
+	pixel_x = -11
+	},
+/obj/item/clothing/under/nanotrasen/security{
+	pixel_x = -11
+	},
+/obj/item/clothing/under/nanotrasen/security{
+	pixel_x = -11
+	},
+/obj/item/clothing/under/nanotrasen,
+/obj/item/clothing/under/nanotrasen,
+/obj/item/clothing/suit/hooded/wintercoat/security{
+	pixel_x = 11;
+	pixel_y = 2
+	},
+/obj/item/clothing/suit/hooded/wintercoat/security{
+	pixel_x = 11;
+	pixel_y = 2
+	},
+/obj/item/clothing/suit/hooded/wintercoat/security{
+	pixel_x = 11;
+	pixel_y = 2
+	},
+/obj/item/clothing/shoes/jackboots{
+	pixel_y = -10;
+	pixel_x = -12
+	},
+/obj/item/clothing/shoes/jackboots{
+	pixel_y = -10;
+	pixel_x = -12
+	},
+/obj/item/clothing/shoes/jackboots{
+	pixel_y = -10;
+	pixel_x = -12
+	},
+/obj/item/clothing/shoes/sneakers/black{
+	pixel_x = -1;
+	pixel_y = -14
+	},
+/obj/item/clothing/shoes/sneakers/black{
+	pixel_x = -1;
+	pixel_y = -14
+	},
+/obj/item/clothing/shoes/sneakers/black{
+	pixel_x = -1;
+	pixel_y = -14
+	},
+/obj/item/clothing/head/nanotrasen/beret/security{
+	pixel_x = -12;
+	pixel_y = 12
+	},
+/obj/item/clothing/head/nanotrasen/beret/security{
+	pixel_x = -12;
+	pixel_y = 12
+	},
+/obj/item/clothing/head/nanotrasen/beret/security{
+	pixel_x = -12;
+	pixel_y = 12
+	},
+/obj/item/clothing/head/soft/utility_beige{
+	pixel_x = -1;
+	pixel_y = 12
+	},
+/obj/item/clothing/head/soft/utility_beige{
+	pixel_x = -1;
+	pixel_y = 12
+	},
+/obj/item/clothing/head/nanotrasen/cap/security{
+	pixel_x = 11;
+	pixel_y = 12
+	},
+/obj/item/clothing/head/nanotrasen/cap/security{
+	pixel_x = 11;
+	pixel_y = 12
+	},
+/obj/item/clothing/gloves/color/black{
+	pixel_x = 11;
+	pixel_y = -12
+	},
+/obj/item/clothing/gloves/color/black{
+	pixel_x = 11;
+	pixel_y = -12
+	},
+/obj/item/clothing/gloves/color/black{
+	pixel_x = 11;
+	pixel_y = -12
+	},
+/obj/item/clothing/gloves/color/black{
+	pixel_x = 11;
+	pixel_y = -12
+	},
+/obj/item/clothing/gloves/color/black{
+	pixel_x = 11;
+	pixel_y = -12
+	},
+/obj/effect/turf_decal/siding/white{
+	dir = 10
+	},
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/open/floor/plasteel,
+/area/ship/crew)
+"Xf" = (
+/obj/effect/turf_decal/trimline/opaque/vired/line{
+	dir = 4
+	},
+/obj/effect/turf_decal/trimline/opaque/vired/line{
+	dir = 8
+	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
+/obj/effect/turf_decal/siding/white/end{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/orange/hidden,
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/central)
+"Xv" = (
+/obj/effect/turf_decal/siding/white/corner{
+	layer = 2.042
+	},
+/obj/effect/turf_decal/siding/white{
+	layer = 2.041;
+	dir = 6
+	},
+/obj/effect/turf_decal/borderfloorblack{
+	dir = 6
+	},
+/obj/effect/turf_decal/corner/transparent/vired/border{
+	layer = 2.040;
+	dir = 6
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/hallway/starboard)
+"Xx" = (
+/obj/machinery/porta_turret/ship/nt{
+	dir = 4;
+	id = "shriketurrets"
+	},
+/turf/closed/wall/mineral/titanium,
+/area/ship/security/armory)
+"XE" = (
+/obj/structure/railing/thin{
+	dir = 1
+	},
+/obj/effect/turf_decal/siding/white{
+	dir = 1
+	},
+/obj/structure/chair/handrail{
+	dir = 4
+	},
+/obj/effect/turf_decal/trimline/transparent/vired/warning{
+	dir = 1
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/cargo)
+"XP" = (
+/obj/structure/railing/thin/corner{
+	dir = 4
+	},
+/obj/machinery/airalarm/directional/south,
+/obj/effect/turf_decal/siding/thinplating/dark,
+/obj/effect/turf_decal/corner/opaque/vired/half,
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/bridge)
+"XQ" = (
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 4
+	},
+/obj/effect/turf_decal/corner/opaque/vired/border{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
+/area/ship/hallway/port)
+"Yc" = (
+/obj/effect/turf_decal/borderfloorblack{
+	dir = 1
+	},
+/obj/effect/turf_decal/corner/transparent/vired/border{
+	layer = 2.040;
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 10
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/airalarm/directional/north,
+/turf/open/floor/plasteel/dark,
+/area/ship/security/armory)
+"Yd" = (
+/obj/effect/turf_decal/corner/opaque/vired/border{
+	dir = 4
+	},
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 4
+	},
+/obj/structure/chair/handrail{
+	dir = 8
+	},
+/obj/machinery/camera/autoname{
+	network = list("shrikenetwork");
+	dir = 8
+	},
+/obj/machinery/firealarm/directional/east,
+/turf/open/floor/plasteel,
+/area/ship/hallway/central)
+"Yo" = (
+/obj/effect/turf_decal/siding/white{
+	dir = 4
+	},
+/obj/machinery/power/smes/engineering,
+/obj/structure/cable{
+	icon_state = "0-2"
+	},
+/obj/effect/decal/cleanable/cobweb/cobweb2,
+/turf/open/floor/plasteel/patterned,
+/area/ship/engineering/engines/port)
+"Ys" = (
+/turf/closed/wall/mineral/titanium,
+/area/ship/engineering/engines/port)
+"Yu" = (
+/obj/effect/turf_decal/siding/white{
+	layer = 2.041;
+	dir = 4
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/security/armory)
+"YG" = (
+/obj/structure/table/reinforced,
+/obj/structure/window/reinforced{
+	dir = 8
+	},
+/obj/item/storage/fancy/donut_box,
+/turf/open/floor/plasteel/dark,
+/area/ship/security/armory)
+"YQ" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 1
+	},
+/obj/effect/turf_decal/corner/opaque/vired/half{
+	dir = 1
+	},
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/bridge)
+"YT" = (
+/obj/effect/turf_decal/corner/opaque/vired/border{
+	dir = 8
+	},
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 8
+	},
+/obj/machinery/light/small/directional/west,
+/obj/machinery/light_switch{
+	dir = 4;
+	pixel_x = -20;
+	pixel_y = 12
+	},
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
+/area/ship/hallway/central)
+"YZ" = (
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 4
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/hallway/port)
+"Zk" = (
+/obj/structure/table/reinforced,
+/obj/machinery/computer/helm/viewscreen/directional/east,
+/obj/machinery/recharger,
+/turf/open/floor/carpet/red,
+/area/ship/hallway/port)
+"Zm" = (
+/obj/effect/turf_decal/corner/transparent/lightgrey/diagonal,
+/obj/effect/turf_decal/siding/white{
+	dir = 1
+	},
+/obj/machinery/grill,
+/turf/open/floor/plasteel/white,
+/area/ship/hallway/port)
+"Zp" = (
+/obj/effect/turf_decal/siding/white{
+	dir = 4
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
+/obj/structure/table,
+/obj/item/weldingtool/hugetank,
+/turf/open/floor/plasteel/patterned,
+/area/ship/engineering/engines/port)
+"Zv" = (
+/obj/machinery/power/apc/auto_name/directional/north,
+/obj/structure/cable{
+	icon_state = "0-8"
+	},
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
+/turf/open/floor/plating,
+/area/ship/engineering/engines/port)
+"Zx" = (
+/obj/effect/turf_decal/siding/white{
+	layer = 2.041;
+	dir = 4
+	},
+/obj/effect/turf_decal/borderfloorblack{
+	dir = 4
+	},
+/obj/effect/turf_decal/corner/transparent/vired/border{
+	layer = 2.040;
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 9
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 9
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/hallway/starboard)
+"ZB" = (
+/obj/machinery/modular_computer/console/preset/engineering{
+	dir = 1
+	},
+/obj/effect/turf_decal/siding/white,
+/turf/open/floor/plasteel/mono,
+/area/ship/engineering/engines/starboard)
+"ZD" = (
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 4
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/hallway/port)
+"ZL" = (
+/obj/structure/railing/thin/corner,
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 1
+	},
+/obj/effect/turf_decal/corner/opaque/vired/half{
+	dir = 1
+	},
+/obj/item/storage/secure/safe/nt{
+	dir = 1;
+	pixel_y = 31
+	},
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/bridge)
+"ZN" = (
+/obj/effect/turf_decal/borderfloorblack{
+	dir = 1
+	},
+/obj/effect/turf_decal/corner/transparent/vired/border{
+	layer = 2.040;
+	dir = 1
+	},
+/obj/effect/turf_decal/siding/white/corner{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4{
+	dir = 1
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/firealarm/directional/north{
+	pixel_x = -8
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/security/armory)
+"ZT" = (
+/obj/structure/sign/poster/retro/random{
+	pixel_x = 32
+	},
+/obj/effect/turf_decal/industrial/outline/yellow,
+/obj/structure/crate_shelf,
+/turf/open/floor/plasteel/tech/techmaint,
+/area/ship/cargo)
+"ZW" = (
+/obj/effect/turf_decal/trimline/transparent/white/filled/warning{
+	dir = 4
+	},
+/obj/effect/turf_decal/siding/white,
+/obj/machinery/light_switch{
+	dir = 1;
+	pixel_x = 7;
+	pixel_y = -20
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/open/floor/plasteel,
+/area/ship/crew)
+
+(1,1,1) = {"
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+"}
+(2,1,1) = {"
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+"}
+(3,1,1) = {"
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+"}
+(4,1,1) = {"
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+"}
+(5,1,1) = {"
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+"}
+(6,1,1) = {"
+Si
+Si
+Si
+Si
+Si
+Si
+RH
+Pj
+Pj
+RH
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+ng
+UM
+UM
+RH
+Si
+Si
+Si
+Si
+Si
+Si
+"}
+(7,1,1) = {"
+Si
+Si
+Si
+Si
+Si
+Si
+RH
+kW
+kW
+RH
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+ng
+rh
+rh
+RH
+Si
+Si
+Si
+Si
+Si
+Si
+"}
+(8,1,1) = {"
+Si
+Si
+Si
+Si
+Si
+Si
+RH
+lJ
+wd
+RH
+qT
+Rx
+Si
+Si
+Si
+Si
+Si
+Jb
+Si
+Si
+Si
+Si
+Si
+dh
+MR
+ng
+Kv
+RI
+RH
+Si
+Si
+Si
+Si
+Si
+Si
+"}
+(9,1,1) = {"
+Si
+Si
+Si
+Si
+Si
+Si
+RH
+Zv
+CN
+RH
+lS
+RH
+Si
+Si
+Si
+SN
+Qu
+OY
+pi
+SN
+Si
+Si
+Si
+ng
+kr
+ng
+uT
+zm
+nb
+Ch
+Si
+Si
+Si
+Si
+Si
+"}
+(10,1,1) = {"
+Si
+Si
+Si
+Si
+Si
+Si
+RH
+EI
+pE
+pG
+gS
+RH
+Si
+SN
+Uu
+SN
+aG
+PN
+TK
+ym
+Uu
+SN
+Si
+ng
+kK
+zV
+lv
+Ok
+WF
+ea
+Si
+Si
+Si
+Si
+Si
+"}
+(11,1,1) = {"
+Si
+Si
+Si
+Si
+Si
+Ys
+RH
+xO
+UA
+Sv
+Sn
+RH
+IW
+IW
+sn
+Rn
+tR
+Ek
+MZ
+XE
+oM
+SN
+SN
+ng
+mw
+yN
+PU
+ag
+RH
+RA
+Si
+Si
+Si
+Si
+Si
+"}
+(12,1,1) = {"
+Si
+Si
+Si
+Ys
+RH
+RH
+RH
+Yo
+Ii
+Zp
+UU
+RH
+gZ
+IW
+ND
+Sj
+gU
+Vb
+mm
+wS
+Sm
+mP
+SN
+gs
+Uq
+bH
+bD
+ng
+RH
+RH
+vq
+jz
+Si
+Si
+Si
+"}
+(13,1,1) = {"
+Si
+IW
+IW
+IW
+Rt
+SH
+RH
+RH
+RH
+RH
+yQ
+RH
+Lj
+IW
+tB
+qD
+eo
+bk
+DP
+Ob
+Vz
+tj
+SN
+zj
+Se
+QA
+dl
+ng
+sX
+Lb
+vq
+vq
+vq
+vq
+Si
+"}
+(14,1,1) = {"
+Si
+QY
+En
+As
+GG
+zJ
+Ez
+TU
+xb
+FW
+aa
+IW
+CP
+IW
+pr
+qD
+ya
+oA
+dj
+Ob
+LB
+ZT
+SN
+gt
+eC
+We
+fO
+ng
+wi
+KI
+JJ
+Qw
+kF
+yE
+Si
+"}
+(15,1,1) = {"
+Si
+QY
+Zm
+yk
+yk
+na
+Ig
+Ea
+dF
+lB
+su
+IW
+xM
+IW
+SN
+Od
+vg
+Lw
+vg
+hh
+SN
+SN
+SN
+ng
+IZ
+vC
+ZB
+ng
+tu
+IA
+Hn
+GQ
+ed
+Ox
+bv
+"}
+(16,1,1) = {"
+Si
+QY
+hC
+yk
+yk
+yk
+vz
+Gk
+yC
+lB
+su
+IW
+fh
+IW
+SN
+RD
+sH
+nE
+Cy
+dP
+SN
+KX
+Sp
+ng
+ly
+Ia
+MV
+ng
+FD
+Of
+vq
+vq
+vq
+vq
+Si
+"}
+(17,1,1) = {"
+Si
+IW
+IW
+yV
+Lo
+Lo
+Rr
+qf
+vV
+Th
+HP
+Qq
+uD
+IW
+SN
+SN
+SN
+ey
+SN
+SN
+SN
+tG
+DQ
+ng
+Wn
+ng
+ng
+ng
+CW
+JH
+pQ
+JO
+vq
+vq
+Si
+"}
+(18,1,1) = {"
+Si
+PL
+IW
+LL
+ma
+lm
+bQ
+qf
+ZD
+YZ
+lL
+rk
+BA
+BA
+hP
+YT
+Uv
+Ln
+xW
+VD
+RX
+ml
+jE
+AT
+Bt
+VY
+ml
+vq
+Wx
+JH
+mq
+Vo
+vq
+jz
+Si
+"}
+(19,1,1) = {"
+Si
+Si
+IW
+NN
+OZ
+iY
+Em
+qf
+Kb
+TA
+rw
+uB
+aT
+aT
+IP
+Gc
+tr
+gu
+Xf
+Mw
+xl
+ax
+bz
+ax
+oC
+xP
+ON
+AW
+IQ
+Zx
+Xv
+Ga
+vq
+Si
+Si
+"}
+(20,1,1) = {"
+Si
+Si
+DB
+IW
+nQ
+kx
+Zk
+wh
+kf
+gi
+Qf
+kN
+XQ
+XQ
+dp
+BL
+Yd
+xI
+dH
+xo
+RX
+rG
+rG
+vh
+Gl
+Db
+bV
+vq
+KB
+Ld
+Qo
+vq
+wW
+Si
+Si
+"}
+(21,1,1) = {"
+Si
+Si
+Si
+PL
+HJ
+IW
+IW
+NC
+NC
+NC
+Uo
+NC
+ca
+JG
+by
+by
+by
+CA
+by
+by
+by
+qQ
+dC
+La
+Aa
+La
+La
+vq
+vq
+vq
+vq
+jz
+Si
+Si
+Si
+"}
+(22,1,1) = {"
+Si
+Si
+Si
+Si
+Si
+pS
+NC
+bK
+bK
+SI
+eS
+NC
+IW
+by
+by
+mQ
+Ep
+Cg
+OX
+aM
+by
+by
+La
+La
+ZN
+GD
+Dp
+NF
+La
+jQ
+Si
+Si
+Si
+Si
+Si
+"}
+(23,1,1) = {"
+Si
+Si
+Si
+Si
+Si
+Si
+NC
+eE
+EE
+qU
+Tv
+NC
+IW
+by
+DA
+up
+pY
+Op
+UH
+Ct
+MI
+by
+La
+La
+rA
+jN
+Yu
+Qa
+La
+Si
+Si
+Si
+Si
+Si
+Si
+"}
+(24,1,1) = {"
+Si
+Si
+Si
+Si
+Si
+Si
+NC
+fI
+EE
+PD
+Cn
+NC
+Si
+by
+vJ
+YQ
+RL
+FC
+vx
+oa
+aj
+by
+Si
+La
+mV
+pn
+LS
+YG
+fR
+Si
+Si
+Si
+Si
+Si
+Si
+"}
+(25,1,1) = {"
+Si
+Si
+Si
+Si
+Si
+Si
+BJ
+iR
+dS
+rj
+WV
+NC
+Si
+WP
+by
+ZL
+Nh
+uE
+ue
+XP
+by
+WP
+Si
+La
+RQ
+sS
+zg
+uv
+fR
+Si
+Si
+Si
+Si
+Si
+Si
+"}
+(26,1,1) = {"
+Si
+Si
+Si
+Si
+Si
+Si
+BJ
+qa
+Pd
+zM
+ZW
+NC
+Si
+Si
+by
+KU
+UW
+Iq
+QT
+QD
+by
+Si
+Si
+La
+jZ
+Gi
+Bu
+jA
+fR
+Si
+Si
+Si
+Si
+Si
+Si
+"}
+(27,1,1) = {"
+Si
+Si
+Si
+Si
+Si
+Si
+pS
+FX
+FX
+FX
+Eo
+FX
+Si
+Si
+WP
+by
+yS
+yS
+yS
+by
+WP
+Si
+Si
+La
+Yc
+gD
+FS
+La
+si
+Si
+Si
+Si
+Si
+Si
+Si
+"}
+(28,1,1) = {"
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+FX
+qp
+kn
+QH
+FX
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+La
+cL
+DT
+Km
+La
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+"}
+(29,1,1) = {"
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+FV
+FX
+Wt
+BP
+FX
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+La
+AX
+rC
+La
+jQ
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+"}
+(30,1,1) = {"
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+FV
+FX
+FX
+dv
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Xx
+La
+La
+jQ
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+"}
+(31,1,1) = {"
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+"}
+(32,1,1) = {"
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+"}
+(33,1,1) = {"
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+"}
+(34,1,1) = {"
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+"}
+(35,1,1) = {"
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+"}
+(36,1,1) = {"
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+Si
+"}
diff --git a/_maps/shuttles/pgf/pgf_crying_sun.dmm b/_maps/shuttles/pgf/pgf_crying_sun.dmm
index 92a078d641..3e3d51caec 100644
--- a/_maps/shuttles/pgf/pgf_crying_sun.dmm
+++ b/_maps/shuttles/pgf/pgf_crying_sun.dmm
@@ -370,12 +370,12 @@
 /turf/open/floor/plating,
 /area/ship/crew/canteen)
 "cV" = (
-/obj/item/clothing/suit/space/gezena,
-/obj/item/clothing/head/helmet/space/gezena,
 /obj/item/tank/internals/oxygen/red,
-/obj/item/clothing/mask/gas/explorer,
 /obj/machinery/light/directional/east,
 /obj/machinery/suit_storage_unit/inherit,
+/obj/item/clothing/mask/breath/pgfmask,
+/obj/item/clothing/suit/space/gezena/marine,
+/obj/item/clothing/head/helmet/space/gezena/marine,
 /turf/open/floor/plasteel/tech,
 /area/ship/security)
 "cY" = (
@@ -808,107 +808,101 @@
 /obj/structure/closet/wall/directional/south{
 	name = "Uniforms"
 	},
-/obj/item/clothing/under/gezena{
-	pixel_y = -5;
-	pixel_x = -9
+/obj/item/clothing/shoes/combat/gezena{
+	pixel_y = -7;
+	pixel_x = -11
 	},
-/obj/item/clothing/under/gezena{
-	pixel_y = -5;
-	pixel_x = -9
+/obj/item/clothing/shoes/combat/gezena{
+	pixel_y = -7;
+	pixel_x = -11
 	},
-/obj/item/clothing/under/gezena{
-	pixel_y = -5;
-	pixel_x = -9
+/obj/item/clothing/shoes/combat/gezena{
+	pixel_y = -7;
+	pixel_x = -11
 	},
-/obj/item/clothing/under/gezena{
-	pixel_y = -5;
-	pixel_x = -9
+/obj/item/clothing/shoes/combat/gezena{
+	pixel_y = -7;
+	pixel_x = -11
 	},
-/obj/item/clothing/under/gezena{
-	pixel_y = -5;
-	pixel_x = -9
+/obj/item/clothing/shoes/combat/gezena{
+	pixel_y = -7;
+	pixel_x = -11
 	},
-/obj/item/clothing/under/gezena{
-	pixel_y = -5;
-	pixel_x = -9
+/obj/item/clothing/shoes/combat/gezena{
+	pixel_y = -7;
+	pixel_x = -11
 	},
-/obj/item/clothing/neck/cloak/gezena{
-	pixel_x = 8;
-	pixel_y = -5
+/obj/item/clothing/under/gezena{
+	pixel_y = -6;
+	pixel_x = 5
 	},
-/obj/item/clothing/neck/cloak/gezena{
-	pixel_x = 8;
-	pixel_y = -5
+/obj/item/clothing/under/gezena{
+	pixel_y = -6;
+	pixel_x = 5
 	},
-/obj/item/clothing/neck/cloak/gezena{
-	pixel_x = 8;
-	pixel_y = -5
+/obj/item/clothing/under/gezena{
+	pixel_y = -6;
+	pixel_x = 5
 	},
-/obj/item/clothing/neck/cloak/gezena{
-	pixel_x = 8;
-	pixel_y = -5
+/obj/item/clothing/under/gezena{
+	pixel_y = -6;
+	pixel_x = 5
 	},
-/obj/item/clothing/neck/cloak/gezena{
-	pixel_x = 8;
-	pixel_y = -5
+/obj/item/clothing/under/gezena{
+	pixel_y = -6;
+	pixel_x = 5
 	},
-/obj/item/clothing/neck/cloak/gezena{
-	pixel_x = 8;
-	pixel_y = -5
+/obj/item/clothing/under/gezena{
+	pixel_y = -6;
+	pixel_x = 5
 	},
-/obj/item/clothing/shoes/combat/gezena{
-	pixel_y = 11;
-	pixel_x = -4
+/obj/item/clothing/head/gezena/flap{
+	pixel_x = -9;
+	pixel_y = 3
 	},
-/obj/item/clothing/shoes/combat/gezena{
-	pixel_y = 11;
-	pixel_x = -4
+/obj/item/clothing/head/gezena/flap{
+	pixel_x = -9;
+	pixel_y = 3
 	},
-/obj/item/clothing/shoes/combat/gezena{
-	pixel_y = 11;
-	pixel_x = -4
+/obj/item/clothing/head/gezena/flap{
+	pixel_x = -9;
+	pixel_y = 3
 	},
-/obj/item/clothing/shoes/combat/gezena{
-	pixel_y = 11;
-	pixel_x = -4
+/obj/item/clothing/head/gezena/flap{
+	pixel_x = -9;
+	pixel_y = 3
 	},
-/obj/item/clothing/shoes/combat/gezena{
-	pixel_y = 11;
-	pixel_x = -4
+/obj/item/clothing/head/gezena/flap{
+	pixel_x = -9;
+	pixel_y = 3
 	},
-/obj/item/clothing/shoes/combat/gezena{
-	pixel_y = 11;
-	pixel_x = -4
+/obj/item/clothing/head/gezena/flap{
+	pixel_x = -9;
+	pixel_y = 3
 	},
-/obj/item/clothing/suit/toggle/gezena,
-/obj/item/clothing/suit/toggle/gezena,
-/obj/item/clothing/suit/toggle/gezena,
-/obj/item/clothing/suit/toggle/gezena,
-/obj/item/clothing/suit/toggle/gezena,
-/obj/item/clothing/suit/toggle/gezena,
-/obj/item/storage/backpack/duffelbag{
-	pixel_x = -3;
-	pixel_y = -11
+/obj/item/clothing/head/gezena{
+	pixel_x = 6;
+	pixel_y = 3
 	},
-/obj/item/storage/backpack/duffelbag{
-	pixel_x = -3;
-	pixel_y = -11
+/obj/item/clothing/head/gezena{
+	pixel_x = 6;
+	pixel_y = 3
 	},
-/obj/item/storage/backpack/duffelbag{
-	pixel_x = -3;
-	pixel_y = -11
+/obj/item/clothing/head/gezena{
+	pixel_x = 6;
+	pixel_y = 3
 	},
-/obj/item/storage/backpack/duffelbag{
-	pixel_x = -3;
-	pixel_y = -11
+/obj/item/clothing/head/gezena{
+	pixel_x = 6;
+	pixel_y = 3
 	},
-/obj/item/storage/backpack/duffelbag{
-	pixel_x = -3;
-	pixel_y = -11
+/obj/item/clothing/head/gezena{
+	pixel_x = 6;
+	pixel_y = 3
 	},
-/obj/item/storage/backpack/duffelbag{
-	pixel_x = -3;
-	pixel_y = -11
+/obj/item/clothing/head/gezena{
+	pixel_x = 6;
+	pixel_y = 3
 	},
 /turf/open/floor/plasteel/sepia,
 /area/ship/crew/dorm)
@@ -1036,6 +1030,10 @@
 /obj/structure/window/reinforced{
 	dir = 1
 	},
+/obj/item/computer_hardware/card_slot{
+	pixel_y = 2;
+	pixel_x = 7
+	},
 /turf/open/floor/vault,
 /area/ship/security/armory)
 "ii" = (
@@ -1212,6 +1210,14 @@
 	pixel_x = -1;
 	pixel_y = -8
 	},
+/obj/item/clothing/head/gezena/engi{
+	pixel_y = 16;
+	pixel_x = -10
+	},
+/obj/item/clothing/head/gezena/flap/engi{
+	pixel_y = 14;
+	pixel_x = 7
+	},
 /turf/open/floor/plasteel/tech/techmaint,
 /area/ship/engineering)
 "jv" = (
@@ -1589,53 +1595,53 @@
 /obj/effect/turf_decal/industrial/warning/corner{
 	dir = 4
 	},
-/obj/item/clothing/suit/space/eva{
-	pixel_y = 2;
-	pixel_x = 4
+/obj/item/clothing/suit/space/gezena{
+	pixel_x = -9;
+	pixel_y = -8
 	},
-/obj/item/clothing/suit/space/eva{
-	pixel_y = 2;
-	pixel_x = 4
+/obj/item/clothing/suit/space/gezena{
+	pixel_x = -9;
+	pixel_y = -8
 	},
-/obj/item/clothing/suit/space/eva{
-	pixel_y = 2;
-	pixel_x = 4
+/obj/item/clothing/suit/space/gezena{
+	pixel_x = -9;
+	pixel_y = -8
 	},
-/obj/item/clothing/suit/space/eva{
-	pixel_y = 2;
-	pixel_x = 4
+/obj/item/clothing/suit/space/gezena{
+	pixel_x = -9;
+	pixel_y = -8
 	},
-/obj/item/clothing/suit/space/eva{
-	pixel_y = 2;
-	pixel_x = 4
+/obj/item/clothing/suit/space/gezena{
+	pixel_x = -9;
+	pixel_y = -8
 	},
-/obj/item/clothing/suit/space/eva{
-	pixel_y = 2;
-	pixel_x = 4
+/obj/item/clothing/suit/space/gezena{
+	pixel_x = -9;
+	pixel_y = -8
 	},
-/obj/item/clothing/head/helmet/space/eva{
-	pixel_y = -5;
-	pixel_x = -7
+/obj/item/clothing/head/helmet/space/gezena{
+	pixel_y = 8;
+	pixel_x = -8
 	},
-/obj/item/clothing/head/helmet/space/eva{
-	pixel_y = -5;
-	pixel_x = -7
+/obj/item/clothing/head/helmet/space/gezena{
+	pixel_y = 8;
+	pixel_x = -8
 	},
-/obj/item/clothing/head/helmet/space/eva{
-	pixel_y = -5;
-	pixel_x = -7
+/obj/item/clothing/head/helmet/space/gezena{
+	pixel_y = 8;
+	pixel_x = -8
 	},
-/obj/item/clothing/head/helmet/space/eva{
-	pixel_y = -5;
-	pixel_x = -7
+/obj/item/clothing/head/helmet/space/gezena{
+	pixel_y = 8;
+	pixel_x = -8
 	},
-/obj/item/clothing/head/helmet/space/eva{
-	pixel_y = -5;
-	pixel_x = -7
+/obj/item/clothing/head/helmet/space/gezena{
+	pixel_y = 8;
+	pixel_x = -8
 	},
-/obj/item/clothing/head/helmet/space/eva{
-	pixel_y = -5;
-	pixel_x = -7
+/obj/item/clothing/head/helmet/space/gezena{
+	pixel_y = 8;
+	pixel_x = -8
 	},
 /turf/open/floor/plasteel/white,
 /area/ship/hallway/port)
@@ -1757,11 +1763,11 @@
 /turf/open/floor/plasteel/mono/dark,
 /area/ship/hallway/central)
 "oE" = (
-/obj/item/clothing/suit/space/gezena,
-/obj/item/clothing/head/helmet/space/gezena,
 /obj/item/tank/internals/oxygen/red,
-/obj/item/clothing/mask/gas/explorer,
 /obj/machinery/suit_storage_unit/inherit,
+/obj/item/clothing/mask/breath/pgfmask,
+/obj/item/clothing/suit/space/gezena/marine,
+/obj/item/clothing/head/helmet/space/gezena/marine,
 /turf/open/floor/plasteel/tech,
 /area/ship/security)
 "oM" = (
@@ -2022,12 +2028,6 @@
 /obj/effect/turf_decal/corner/opaque/purple,
 /turf/open/floor/vault,
 /area/ship/security/armory)
-"qJ" = (
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/turf/open/floor/pod,
-/area/ship/hangar/starboard)
 "qV" = (
 /obj/effect/turf_decal/corner_steel_grid/full{
 	dir = 8
@@ -2083,6 +2083,14 @@
 	pixel_x = -1;
 	pixel_y = -8
 	},
+/obj/item/clothing/head/gezena/engi{
+	pixel_y = 16;
+	pixel_x = -10
+	},
+/obj/item/clothing/head/gezena/flap/engi{
+	pixel_y = 14;
+	pixel_x = 7
+	},
 /turf/open/floor/plasteel/tech/techmaint,
 /area/ship/engineering)
 "ra" = (
@@ -2218,12 +2226,11 @@
 	},
 /obj/item/clothing/suit/space/gezena,
 /obj/item/tank/internals/oxygen/red,
-/obj/item/clothing/mask/gas/explorer,
-/obj/item/clothing/head/helmet/space/gezena,
 /obj/machinery/camera/autoname{
 	dir = 9
 	},
 /obj/machinery/suit_storage_unit/inherit/industrial,
+/obj/item/clothing/head/helmet/space/gezena,
 /turf/open/floor/plasteel/tech/techmaint,
 /area/ship/engineering)
 "sW" = (
@@ -3580,7 +3587,6 @@
 	},
 /obj/machinery/suit_storage_unit/inherit/industrial,
 /obj/item/clothing/suit/space/gezena,
-/obj/item/clothing/mask/gas/explorer,
 /obj/item/tank/internals/oxygen/red,
 /obj/item/clothing/head/helmet/space/gezena,
 /turf/open/floor/plating,
@@ -3771,77 +3777,125 @@
 /obj/structure/closet/wall/directional/south{
 	name = "Uniforms"
 	},
-/obj/item/clothing/gloves/gezena{
-	pixel_x = -5;
-	pixel_y = -9
-	},
-/obj/item/clothing/gloves/gezena{
-	pixel_x = -5;
-	pixel_y = -9
+/obj/item/clothing/suit/toggle/gezena{
+	pixel_y = -3;
+	pixel_x = -9
 	},
 /obj/item/clothing/gloves/gezena{
-	pixel_x = -5;
-	pixel_y = -9
+	pixel_x = 8;
+	pixel_y = -8
 	},
-/obj/item/clothing/gloves/gezena{
-	pixel_x = -5;
-	pixel_y = -9
+/obj/item/storage/backpack/duffelbag{
+	pixel_y = -16;
+	pixel_x = 8
 	},
-/obj/item/clothing/gloves/gezena{
-	pixel_x = -5;
-	pixel_y = -9
+/obj/item/clothing/neck/cloak/gezena{
+	pixel_x = 7;
+	pixel_y = 4
 	},
-/obj/item/clothing/gloves/gezena{
-	pixel_x = -5;
-	pixel_y = -9
+/obj/item/storage/backpack/satchel/explorer{
+	pixel_x = -10;
+	pixel_y = -16
 	},
-/obj/item/clothing/head/gezena{
-	pixel_x = 10
+/obj/item/clothing/suit/toggle/gezena{
+	pixel_y = -3;
+	pixel_x = -9
 	},
-/obj/item/clothing/head/gezena{
-	pixel_x = 10
+/obj/item/clothing/suit/toggle/gezena{
+	pixel_y = -3;
+	pixel_x = -9
 	},
-/obj/item/clothing/head/gezena{
-	pixel_x = 10
+/obj/item/clothing/suit/toggle/gezena{
+	pixel_y = -3;
+	pixel_x = -9
 	},
-/obj/item/clothing/head/gezena{
-	pixel_x = 10
+/obj/item/clothing/suit/toggle/gezena{
+	pixel_y = -3;
+	pixel_x = -9
 	},
-/obj/item/clothing/head/gezena{
-	pixel_x = 10
+/obj/item/clothing/suit/toggle/gezena{
+	pixel_y = -3;
+	pixel_x = -9
 	},
-/obj/item/clothing/head/gezena{
-	pixel_x = 10
+/obj/item/clothing/gloves/gezena{
+	pixel_x = 8;
+	pixel_y = -8
 	},
-/obj/item/clothing/head/gezena/flap,
-/obj/item/clothing/head/gezena/flap,
-/obj/item/clothing/head/gezena/flap,
-/obj/item/clothing/head/gezena/flap,
-/obj/item/clothing/head/gezena/flap,
-/obj/item/clothing/head/gezena/flap,
-/obj/item/storage/backpack/satchel/explorer{
-	pixel_x = -12;
-	pixel_y = 3
+/obj/item/clothing/gloves/gezena{
+	pixel_x = 8;
+	pixel_y = -8
+	},
+/obj/item/clothing/gloves/gezena{
+	pixel_x = 8;
+	pixel_y = -8
+	},
+/obj/item/clothing/gloves/gezena{
+	pixel_x = 8;
+	pixel_y = -8
+	},
+/obj/item/clothing/gloves/gezena{
+	pixel_x = 8;
+	pixel_y = -8
+	},
+/obj/item/clothing/neck/cloak/gezena{
+	pixel_x = 7;
+	pixel_y = 4
+	},
+/obj/item/clothing/neck/cloak/gezena{
+	pixel_x = 7;
+	pixel_y = 4
+	},
+/obj/item/clothing/neck/cloak/gezena{
+	pixel_x = 7;
+	pixel_y = 4
+	},
+/obj/item/clothing/neck/cloak/gezena{
+	pixel_x = 7;
+	pixel_y = 4
+	},
+/obj/item/clothing/neck/cloak/gezena{
+	pixel_x = 7;
+	pixel_y = 4
+	},
+/obj/item/storage/backpack/duffelbag{
+	pixel_y = -16;
+	pixel_x = 8
+	},
+/obj/item/storage/backpack/duffelbag{
+	pixel_y = -16;
+	pixel_x = 8
+	},
+/obj/item/storage/backpack/duffelbag{
+	pixel_y = -16;
+	pixel_x = 8
+	},
+/obj/item/storage/backpack/duffelbag{
+	pixel_y = -16;
+	pixel_x = 8
+	},
+/obj/item/storage/backpack/duffelbag{
+	pixel_y = -16;
+	pixel_x = 8
 	},
 /obj/item/storage/backpack/satchel/explorer{
-	pixel_x = -12;
-	pixel_y = 3
+	pixel_x = -10;
+	pixel_y = -16
 	},
 /obj/item/storage/backpack/satchel/explorer{
-	pixel_x = -12;
-	pixel_y = 3
+	pixel_x = -10;
+	pixel_y = -16
 	},
 /obj/item/storage/backpack/satchel/explorer{
-	pixel_x = -12;
-	pixel_y = 3
+	pixel_x = -10;
+	pixel_y = -16
 	},
 /obj/item/storage/backpack/satchel/explorer{
-	pixel_x = -12;
-	pixel_y = 3
+	pixel_x = -10;
+	pixel_y = -16
 	},
 /obj/item/storage/backpack/satchel/explorer{
-	pixel_x = -12;
-	pixel_y = 3
+	pixel_x = -10;
+	pixel_y = -16
 	},
 /turf/open/floor/plasteel/sepia,
 /area/ship/crew/dorm)
@@ -3857,6 +3911,14 @@
 	},
 /turf/open/floor/plasteel/white,
 /area/ship/hallway/port)
+"ET" = (
+/obj/machinery/suit_storage_unit/inherit,
+/obj/item/tank/internals/oxygen/red,
+/obj/item/clothing/mask/breath/pgfmask,
+/obj/item/clothing/suit/space/gezena/marine,
+/obj/item/clothing/head/helmet/space/gezena/marine,
+/turf/open/floor/plasteel/tech,
+/area/ship/security)
 "Fb" = (
 /obj/structure/catwalk/over/plated_catwalk,
 /obj/structure/cable{
@@ -4695,10 +4757,6 @@
 	pixel_x = -9;
 	pixel_y = -5
 	},
-/obj/item/clothing/suit/armor/gezena{
-	pixel_y = 9;
-	pixel_x = -9
-	},
 /obj/item/clothing/neck/cloak/gezena/med{
 	pixel_y = -4;
 	pixel_x = 1
@@ -4751,6 +4809,7 @@
 	pixel_x = 3;
 	pixel_y = -4
 	},
+/obj/item/clothing/suit/armor/gezena/medic,
 /turf/open/floor/mineral/titanium,
 /area/ship/medical)
 "MD" = (
@@ -5083,38 +5142,65 @@
 	req_access_txt = "1"
 	},
 /obj/effect/turf_decal/corner/opaque/neutral/full,
+/obj/item/clothing/head/helmet/gezena{
+	pixel_y = 14
+	},
 /obj/item/clothing/suit/armor/gezena/marine{
-	pixel_y = 1;
+	pixel_y = -8;
+	pixel_x = -5
+	},
+/obj/item/storage/belt/military/gezena{
+	pixel_x = 4;
+	pixel_y = -9
+	},
+/obj/item/clothing/glasses/sunglasses/pgf{
+	pixel_y = 4;
 	pixel_x = 1
 	},
 /obj/item/clothing/suit/armor/gezena/marine{
-	pixel_y = 1;
-	pixel_x = 1
+	pixel_y = -8;
+	pixel_x = -5
 	},
 /obj/item/clothing/suit/armor/gezena/marine{
-	pixel_y = 1;
-	pixel_x = 1
+	pixel_y = -8;
+	pixel_x = -5
+	},
+/obj/item/clothing/suit/armor/gezena/marine{
+	pixel_y = -8;
+	pixel_x = -5
+	},
+/obj/item/storage/belt/military/gezena{
+	pixel_x = 4;
+	pixel_y = -9
+	},
+/obj/item/storage/belt/military/gezena{
+	pixel_x = 4;
+	pixel_y = -9
+	},
+/obj/item/storage/belt/military/gezena{
+	pixel_x = 4;
+	pixel_y = -9
 	},
 /obj/item/clothing/head/helmet/gezena{
-	pixel_y = -11
+	pixel_y = 14
 	},
 /obj/item/clothing/head/helmet/gezena{
-	pixel_y = -11
+	pixel_y = 14
 	},
 /obj/item/clothing/head/helmet/gezena{
-	pixel_y = -11
+	pixel_y = 14
 	},
-/obj/item/storage/belt/military/gezena{
-	pixel_x = 1;
-	pixel_y = -1
+/obj/item/clothing/glasses/sunglasses/pgf{
+	pixel_y = 4;
+	pixel_x = 1
 	},
-/obj/item/storage/belt/military/gezena{
-	pixel_x = 1;
-	pixel_y = -1
+/obj/item/clothing/glasses/sunglasses/pgf{
+	pixel_y = 4;
+	pixel_x = 1
 	},
-/obj/item/storage/belt/military/gezena{
-	pixel_x = 1;
-	pixel_y = -1
+/obj/item/clothing/glasses/sunglasses/pgf{
+	pixel_y = 4;
+	pixel_x = 1
 	},
 /turf/open/floor/vault,
 /area/ship/security/armory)
@@ -5492,6 +5578,12 @@
 /obj/structure/chair,
 /turf/open/floor/mineral/titanium/tiled,
 /area/ship/hallway/central)
+"Rp" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/pod,
+/area/ship/hangar/starboard)
 "Rx" = (
 /obj/structure/window/reinforced/fulltile/shuttle,
 /obj/structure/grille,
@@ -5873,37 +5965,48 @@
 	pixel_x = 6;
 	pixel_y = -17
 	},
-/obj/item/storage/guncase/pistol/kalixpistol{
-	pixel_y = -13;
-	pixel_x = -1
+/obj/item/clothing/head/gezena/captain{
+	pixel_y = 12;
+	pixel_x = -8
 	},
-/obj/item/clothing/neck/cloak/gezena/captain{
-	pixel_y = -4;
+/obj/item/clothing/head/gezena/flap/captain{
+	pixel_y = 8;
+	pixel_x = 8
+	},
+/obj/item/clothing/under/gezena/captain{
+	pixel_y = 2;
 	pixel_x = -8
 	},
 /obj/item/clothing/suit/armor/gezena/captain{
-	pixel_y = -2;
+	pixel_y = 2;
 	pixel_x = 8
 	},
-/obj/item/storage/belt/sabre{
-	pixel_y = -9;
-	pixel_x = -4
+/obj/item/storage/guncase/pistol/kalixpistol{
+	pixel_y = -15;
+	pixel_x = -1
 	},
-/obj/item/clothing/under/gezena/captain{
-	pixel_y = 3
+/obj/item/clothing/shoes/combat/gezena{
+	pixel_y = -7;
+	pixel_x = -11
+	},
+/obj/item/clothing/neck/cloak/gezena/captain{
+	pixel_y = 2;
+	pixel_x = 3
+	},
+/obj/item/clothing/gloves/gezena/captain{
+	pixel_y = -10
+	},
+/obj/item/storage/belt/sabre/pgf{
+	pixel_y = -6;
+	pixel_x = -2
 	},
 /obj/item/radio/headset/pgf/alt/captain{
 	pixel_x = 10;
-	pixel_y = 4
+	pixel_y = -4
 	},
 /obj/item/radio/headset/pgf/captain{
-	pixel_x = -10
-	},
-/obj/item/clothing/gloves/gezena/captain{
-	pixel_y = 11
-	},
-/obj/item/clothing/head/gezena/captain{
-	pixel_y = 12
+	pixel_x = -10;
+	pixel_y = -8
 	},
 /turf/open/floor/plasteel/sepia,
 /area/ship/crew/dorm/dormthree)
@@ -5943,39 +6046,6 @@
 /turf/open/floor/engine/airless,
 /area/ship/engineering/engines/starboard)
 "Vo" = (
-/obj/item/clothing/under/gezena/marine{
-	pixel_x = -10;
-	pixel_y = -7
-	},
-/obj/item/clothing/under/gezena/marine{
-	pixel_x = -10;
-	pixel_y = -7
-	},
-/obj/item/clothing/under/gezena/marine{
-	pixel_x = -10;
-	pixel_y = -7
-	},
-/obj/item/clothing/gloves/gezena/marine{
-	pixel_y = 11
-	},
-/obj/item/clothing/gloves/gezena/marine{
-	pixel_y = 11
-	},
-/obj/item/clothing/gloves/gezena/marine{
-	pixel_y = 11
-	},
-/obj/item/clothing/head/gezena/marine{
-	pixel_y = 10;
-	pixel_x = -10
-	},
-/obj/item/clothing/head/gezena/marine{
-	pixel_y = 10;
-	pixel_x = -10
-	},
-/obj/item/clothing/head/gezena/marine{
-	pixel_y = 10;
-	pixel_x = -10
-	},
 /obj/structure/closet/secure_closet{
 	anchored = 1;
 	can_be_unanchored = 1;
@@ -5984,47 +6054,118 @@
 	req_access_txt = "1"
 	},
 /obj/item/storage/backpack/duffelbag/sec{
-	pixel_y = -13
+	pixel_y = -13;
+	pixel_x = 4
+	},
+/obj/item/storage/backpack/satchel/sec{
+	pixel_x = -7;
+	pixel_y = -17
 	},
+/obj/effect/turf_decal/corner/opaque/neutral/full,
 /obj/item/storage/backpack/duffelbag/sec{
-	pixel_y = -13
+	pixel_y = -13;
+	pixel_x = 4
 	},
 /obj/item/storage/backpack/duffelbag/sec{
-	pixel_y = -13
+	pixel_y = -13;
+	pixel_x = 4
+	},
+/obj/item/storage/backpack/duffelbag/sec{
+	pixel_y = -13;
+	pixel_x = 4
 	},
 /obj/item/storage/backpack/satchel/sec{
-	pixel_x = -8;
+	pixel_x = -7;
 	pixel_y = -17
 	},
 /obj/item/storage/backpack/satchel/sec{
-	pixel_x = -8;
+	pixel_x = -7;
 	pixel_y = -17
 	},
 /obj/item/storage/backpack/satchel/sec{
-	pixel_x = -8;
+	pixel_x = -7;
 	pixel_y = -17
 	},
-/obj/item/clothing/shoes/combat/gezena{
-	pixel_x = 3
+/obj/item/clothing/suit/toggle/gezena/marine{
+	pixel_y = -2;
+	pixel_x = 8
 	},
-/obj/item/clothing/shoes/combat/gezena{
-	pixel_x = 3
+/obj/item/clothing/suit/toggle/gezena/marine{
+	pixel_y = -2;
+	pixel_x = 8
 	},
-/obj/item/clothing/shoes/combat/gezena{
-	pixel_x = 3
+/obj/item/clothing/suit/toggle/gezena/marine{
+	pixel_y = -2;
+	pixel_x = 8
+	},
+/obj/item/clothing/under/gezena/marine{
+	pixel_x = -9;
+	pixel_y = -1
+	},
+/obj/item/clothing/under/gezena/marine{
+	pixel_x = -9;
+	pixel_y = -1
+	},
+/obj/item/clothing/under/gezena/marine{
+	pixel_x = -9;
+	pixel_y = -1
 	},
-/obj/effect/turf_decal/corner/opaque/neutral/full,
 /obj/item/clothing/head/gezena/flap/marine{
-	pixel_y = 1;
-	pixel_x = -10
+	pixel_y = 11;
+	pixel_x = -8
 	},
 /obj/item/clothing/head/gezena/flap/marine{
-	pixel_y = 1;
-	pixel_x = -10
+	pixel_y = 11;
+	pixel_x = -8
 	},
 /obj/item/clothing/head/gezena/flap/marine{
-	pixel_y = 1;
-	pixel_x = -10
+	pixel_y = 11;
+	pixel_x = -8
+	},
+/obj/item/clothing/head/gezena/marine{
+	pixel_y = 12;
+	pixel_x = 8
+	},
+/obj/item/clothing/head/gezena/marine{
+	pixel_y = 12;
+	pixel_x = 8
+	},
+/obj/item/clothing/head/gezena/marine{
+	pixel_y = 12;
+	pixel_x = 8
+	},
+/obj/item/clothing/gloves/gezena/marine{
+	pixel_y = 3
+	},
+/obj/item/clothing/gloves/gezena/marine{
+	pixel_y = 3
+	},
+/obj/item/clothing/gloves/gezena/marine{
+	pixel_y = 3
+	},
+/obj/item/clothing/shoes/combat/gezena/marine{
+	pixel_y = -11;
+	pixel_x = 6
+	},
+/obj/item/clothing/shoes/combat/gezena/marine{
+	pixel_y = -11;
+	pixel_x = 6
+	},
+/obj/item/clothing/shoes/combat/gezena/marine{
+	pixel_y = -11;
+	pixel_x = 6
+	},
+/obj/item/clothing/neck/cloak/gezena{
+	pixel_x = -6;
+	pixel_y = -13
+	},
+/obj/item/clothing/neck/cloak/gezena{
+	pixel_x = -6;
+	pixel_y = -13
+	},
+/obj/item/clothing/neck/cloak/gezena{
+	pixel_x = -6;
+	pixel_y = -13
 	},
 /turf/open/floor/vault,
 /area/ship/security/armory)
@@ -6097,63 +6238,57 @@
 	dir = 1
 	},
 /obj/machinery/light/directional/north,
-/obj/item/storage/backpack/satchel/sec{
-	pixel_x = -8;
-	pixel_y = -17
+/obj/item/clothing/head/gezena/flap/marine{
+	pixel_y = 11;
+	pixel_x = -8
+	},
+/obj/item/clothing/head/gezena/marine{
+	pixel_y = 12;
+	pixel_x = 8
 	},
 /obj/item/storage/backpack/duffelbag/sec{
-	pixel_y = -16;
-	pixel_x = 3
+	pixel_y = -13;
+	pixel_x = 4
+	},
+/obj/item/storage/backpack/satchel/sec{
+	pixel_x = -7;
+	pixel_y = -17
 	},
 /obj/item/storage/guncase/pistol/kalixpistol{
 	pixel_y = -13
 	},
-/obj/item/clothing/shoes/combat/gezena{
-	pixel_x = 3;
-	pixel_y = -7
+/obj/item/clothing/suit/toggle/gezena/marine{
+	pixel_y = -2;
+	pixel_x = 8
 	},
 /obj/item/clothing/under/gezena/marine{
-	pixel_x = -6;
-	pixel_y = -7
+	pixel_x = -9;
+	pixel_y = -1
 	},
-/obj/item/clothing/neck/cloak/gezena/lead{
-	pixel_y = -4;
-	pixel_x = -12
+/obj/item/clothing/neck/cloak/gezena/command{
+	pixel_y = -9;
+	pixel_x = -7
 	},
-/obj/item/clothing/head/gezena/marine/lead{
-	pixel_y = 1;
-	pixel_x = -11
+/obj/item/clothing/shoes/combat/gezena/marine{
+	pixel_y = -9;
+	pixel_x = 6
 	},
-/obj/item/clothing/suit/armor/gezena/marinecoat{
-	pixel_y = 8
+/obj/item/clothing/gloves/gezena/marine{
+	pixel_x = -1;
+	pixel_y = 0
+	},
+/obj/item/clothing/accessory/holster{
+	pixel_y = 0;
+	pixel_x = -2
 	},
 /obj/item/radio/headset/pgf/captain{
-	pixel_x = -5;
-	pixel_y = 7
+	pixel_x = -15;
+	pixel_y = 9
 	},
 /obj/item/radio/headset/pgf/alt/captain{
-	pixel_y = 11;
-	pixel_x = 5
-	},
-/obj/item/clothing/suit/armor/gezena/marine{
-	pixel_y = 8
-	},
-/obj/item/storage/belt/military/gezena{
-	pixel_y = 6
-	},
-/obj/item/clothing/head/helmet/gezena{
-	pixel_y = 14;
-	pixel_x = -1
-	},
-/obj/item/clothing/head/gezena/flap/marine/lead{
-	pixel_y = 1;
-	pixel_x = 10
-	},
-/obj/item/clothing/gloves/gezena/marine{
-	pixel_x = 3;
-	pixel_y = -6
+	pixel_y = -4;
+	pixel_x = -20
 	},
-/obj/item/clothing/accessory/holster,
 /turf/open/floor/plasteel/tech,
 /area/ship/crew/dorm/dormtwo)
 "Wc" = (
@@ -7164,7 +7299,7 @@ DM
 cV
 oE
 oE
-oE
+ET
 ra
 KY
 AL
@@ -7357,7 +7492,7 @@ oC
 IF
 SB
 QU
-qJ
+Rp
 eB
 eB
 eB
diff --git a/_maps/shuttles/pgf/pgf_elated_bolide.dmm b/_maps/shuttles/pgf/pgf_elated_bolide.dmm
index dba41a9991..d269eba3c4 100644
--- a/_maps/shuttles/pgf/pgf_elated_bolide.dmm
+++ b/_maps/shuttles/pgf/pgf_elated_bolide.dmm
@@ -345,10 +345,6 @@
 "co" = (
 /obj/structure/table/wood,
 /obj/item/radio/intercom/directional/north,
-/obj/item/clothing/head/gezena/marine/lead{
-	pixel_x = 7;
-	pixel_y = 5
-	},
 /obj/item/flashlight/lamp/green{
 	pixel_x = -7;
 	pixel_y = 12
@@ -421,14 +417,112 @@
 /area/ship/crew/ccommons)
 "dk" = (
 /obj/machinery/airalarm/directional/west,
-/obj/structure/table/reinforced,
-/obj/machinery/recharger{
-	pixel_x = -5;
-	pixel_y = 4
-	},
 /obj/effect/turf_decal/trimline/opaque/bottlegreen/filled/line{
 	dir = 8
 	},
+/obj/structure/closet/secure_closet{
+	anchored = 1;
+	can_be_unanchored = 1;
+	icon_state = "sec";
+	name = "uniforms locker";
+	req_access_txt = "1"
+	},
+/obj/item/clothing/suit/toggle/gezena/marine{
+	pixel_y = -1;
+	pixel_x = 2
+	},
+/obj/item/clothing/suit/toggle/gezena/marine{
+	pixel_y = -1;
+	pixel_x = 2
+	},
+/obj/item/clothing/suit/toggle/gezena/marine{
+	pixel_y = -1;
+	pixel_x = 2
+	},
+/obj/item/clothing/suit/toggle/gezena/marine{
+	pixel_y = -1;
+	pixel_x = 2
+	},
+/obj/item/clothing/suit/toggle/gezena/marine{
+	pixel_y = -1;
+	pixel_x = 2
+	},
+/obj/item/clothing/suit/toggle/gezena/marine{
+	pixel_y = -1;
+	pixel_x = 2
+	},
+/obj/item/clothing/head/gezena/flap/marine{
+	pixel_y = 11;
+	pixel_x = -8
+	},
+/obj/item/clothing/head/gezena/flap/marine{
+	pixel_y = 11;
+	pixel_x = -8
+	},
+/obj/item/clothing/head/gezena/flap/marine{
+	pixel_y = 11;
+	pixel_x = -8
+	},
+/obj/item/clothing/head/gezena/flap/marine{
+	pixel_y = 11;
+	pixel_x = -8
+	},
+/obj/item/clothing/head/gezena/flap/marine{
+	pixel_y = 11;
+	pixel_x = -8
+	},
+/obj/item/clothing/head/gezena/flap/marine{
+	pixel_y = 11;
+	pixel_x = -8
+	},
+/obj/item/clothing/head/gezena/marine{
+	pixel_y = 12;
+	pixel_x = 8
+	},
+/obj/item/clothing/head/gezena/marine{
+	pixel_y = 12;
+	pixel_x = 8
+	},
+/obj/item/clothing/head/gezena/marine{
+	pixel_y = 12;
+	pixel_x = 8
+	},
+/obj/item/clothing/head/gezena/marine{
+	pixel_y = 12;
+	pixel_x = 8
+	},
+/obj/item/clothing/head/gezena/marine{
+	pixel_y = 12;
+	pixel_x = 8
+	},
+/obj/item/clothing/head/gezena/marine{
+	pixel_y = 12;
+	pixel_x = 8
+	},
+/obj/item/clothing/gloves/gezena/marine{
+	pixel_y = -9;
+	pixel_x = 1
+	},
+/obj/item/clothing/gloves/gezena/marine{
+	pixel_y = -9;
+	pixel_x = 1
+	},
+/obj/item/clothing/gloves/gezena/marine{
+	pixel_y = -9;
+	pixel_x = 1
+	},
+/obj/item/clothing/gloves/gezena/marine{
+	pixel_y = -9;
+	pixel_x = 1
+	},
+/obj/item/clothing/gloves/gezena/marine{
+	pixel_y = -9;
+	pixel_x = 1
+	},
+/obj/item/clothing/gloves/gezena/marine{
+	pixel_y = -9;
+	pixel_x = 1
+	},
 /turf/open/floor/plasteel/dark,
 /area/ship/security)
 "dn" = (
@@ -699,7 +793,6 @@
 /obj/item/clothing/suit/space/gezena,
 /obj/item/clothing/head/helmet/space/gezena,
 /obj/item/tank/internals/oxygen/red,
-/obj/item/clothing/mask/gas,
 /obj/machinery/light/small/directional/north,
 /obj/structure/sign/warning/vacuum{
 	pixel_x = 3;
@@ -1341,6 +1434,18 @@
 /obj/effect/turf_decal/trimline/opaque/bottlegreen/filled/line{
 	dir = 1
 	},
+/obj/machinery/recharger{
+	pixel_x = -6;
+	pixel_y = 6
+	},
+/obj/machinery/recharger{
+	pixel_x = 6;
+	pixel_y = 6
+	},
+/obj/machinery/recharger{
+	pixel_x = -18;
+	pixel_y = 6
+	},
 /turf/open/floor/plasteel/dark,
 /area/ship/security)
 "iW" = (
@@ -1402,83 +1507,11 @@
 	dir = 1
 	},
 /obj/machinery/airalarm/directional/south,
-/obj/structure/closet/secure_closet{
-	anchored = 1;
-	can_be_unanchored = 1;
-	icon_state = "sec";
-	name = "uniforms locker";
-	req_access_txt = "1"
-	},
-/obj/item/clothing/gloves/gezena/marine{
-	pixel_x = 8;
-	pixel_y = 10
-	},
-/obj/item/clothing/gloves/gezena/marine{
-	pixel_x = 8;
-	pixel_y = 10
-	},
-/obj/item/clothing/gloves/gezena/marine{
-	pixel_x = 8;
-	pixel_y = 10
-	},
-/obj/item/clothing/gloves/gezena/marine{
-	pixel_x = 8;
-	pixel_y = 10
-	},
-/obj/item/clothing/gloves/gezena/marine{
-	pixel_x = 8;
-	pixel_y = 10
-	},
-/obj/item/clothing/gloves/gezena/marine{
-	pixel_x = 8;
+/obj/structure/table/reinforced,
+/obj/item/kirbyplants{
+	pixel_x = -5;
 	pixel_y = 10
 	},
-/obj/item/storage/backpack/industrial{
-	pixel_x = 7
-	},
-/obj/item/storage/backpack/industrial{
-	pixel_x = 7
-	},
-/obj/item/storage/backpack/industrial{
-	pixel_x = 7
-	},
-/obj/item/clothing/head/gezena/flap/marine,
-/obj/item/clothing/head/gezena/flap/marine,
-/obj/item/clothing/head/gezena/flap/marine,
-/obj/item/clothing/head/gezena/flap/marine,
-/obj/item/radio/headset/pgf/alt,
-/obj/item/radio/headset/pgf/alt,
-/obj/item/radio/headset/pgf/alt,
-/obj/item/clothing/head/gezena/marine{
-	pixel_x = -6;
-	pixel_y = 9
-	},
-/obj/item/clothing/head/gezena/marine{
-	pixel_x = -6;
-	pixel_y = 9
-	},
-/obj/item/clothing/head/gezena/marine{
-	pixel_x = -6;
-	pixel_y = 9
-	},
-/obj/item/clothing/under/gezena/marine{
-	pixel_x = -7
-	},
-/obj/item/clothing/under/gezena/marine{
-	pixel_x = -7
-	},
-/obj/item/clothing/under/gezena/marine{
-	pixel_x = -7
-	},
-/obj/item/clothing/shoes/combat/gezena{
-	pixel_x = 3
-	},
-/obj/item/clothing/shoes/combat/gezena{
-	pixel_x = 3
-	},
-/obj/item/clothing/shoes/combat/gezena{
-	pixel_x = 3
-	},
 /turf/open/floor/vault,
 /area/ship/security/armory)
 "jg" = (
@@ -1535,50 +1568,66 @@
 	can_be_unanchored = 1;
 	icon_state = "warden";
 	name = "Lieutenant's locker";
-	req_access = list(3);
-	req_access_txt = "3"
+	req_access_txt = "3";
+	req_access = list(3)
 	},
-/obj/item/radio/headset/pgf/alt/captain{
-	pixel_x = 5;
-	pixel_y = 11
+/obj/effect/turf_decal/borderfloorblack{
+	dir = 1
 	},
-/obj/item/clothing/neck/cloak/gezena/lead{
-	pixel_x = -3;
-	pixel_y = 3
+/obj/item/clothing/head/gezena/flap/marine{
+	pixel_y = 11;
+	pixel_x = -8
 	},
-/obj/item/clothing/suit/armor/gezena/marine{
-	pixel_y = 8
+/obj/item/clothing/head/gezena/marine{
+	pixel_y = 12;
+	pixel_x = 8
 	},
-/obj/item/clothing/under/gezena/marine{
-	pixel_x = -6;
-	pixel_y = -7
+/obj/item/storage/backpack/duffelbag/sec{
+	pixel_y = -13;
+	pixel_x = 4
 	},
-/obj/item/clothing/gloves/gezena/marine{
-	pixel_x = 3;
-	pixel_y = -6
+/obj/item/storage/backpack/satchel/sec{
+	pixel_x = -7;
+	pixel_y = -17
 	},
-/obj/item/storage/belt/military/gezena{
-	pixel_y = 1
+/obj/item/storage/guncase/pistol/kalixpistol{
+	pixel_y = -13
 	},
-/obj/item/storage/backpack/security{
-	pixel_y = -6
+/obj/item/clothing/suit/toggle/gezena/marine{
+	pixel_y = -2;
+	pixel_x = 8
 	},
-/obj/effect/turf_decal/borderfloorblack{
-	dir = 8
+/obj/item/clothing/under/gezena/marine{
+	pixel_x = -9;
+	pixel_y = -1
 	},
-/obj/item/clothing/accessory/medal/silver/valor,
-/obj/item/clothing/mask/whistle{
-	name = "marine whistle"
+/obj/item/clothing/neck/cloak/gezena/command{
+	pixel_y = -9;
+	pixel_x = -7
 	},
-/obj/item/clothing/head/helmet/gezena{
+/obj/item/clothing/shoes/combat/gezena/marine{
+	pixel_y = -9;
+	pixel_x = 6
+	},
+/obj/item/clothing/gloves/gezena/marine{
 	pixel_x = -1;
-	pixel_y = 8
+	pixel_y = 0
+	},
+/obj/item/clothing/accessory/holster{
+	pixel_y = 0;
+	pixel_x = -2
 	},
-/obj/item/clothing/head/gezena/flap/marine/lead{
-	pixel_x = -4
+/obj/item/radio/headset/pgf/captain{
+	pixel_x = -15;
+	pixel_y = 9
+	},
+/obj/item/radio/headset/pgf/alt/captain{
+	pixel_y = -4;
+	pixel_x = -20
+	},
+/obj/effect/turf_decal/borderfloorblack{
+	dir = 8
 	},
-/obj/item/storage/guncase/pistol/kalixpistol,
-/obj/item/clothing/accessory/holster,
 /turf/open/floor/plasteel/tech,
 /area/ship/security)
 "jn" = (
@@ -2092,6 +2141,7 @@
 /obj/effect/turf_decal/trimline/opaque/bottlegreen/filled/line{
 	dir = 9
 	},
+/obj/machinery/computer/helm/viewscreen/directional/north,
 /turf/open/floor/plasteel/dark,
 /area/ship/security)
 "mR" = (
@@ -2837,40 +2887,24 @@
 /obj/structure/rack,
 /obj/effect/turf_decal/corner/opaque/neutral/full,
 /obj/item/storage/box/metalfoam{
-	pixel_x = 7;
-	pixel_y = 2
+	pixel_x = -9;
+	pixel_y = 12
+	},
+/obj/structure/sign/warning/nosmoking{
+	pixel_y = 28
 	},
 /obj/item/storage/box/metalfoam{
-	pixel_x = 2;
-	pixel_y = 4
+	pixel_x = 7;
+	pixel_y = 12
 	},
 /obj/item/storage/box/smokebombs{
-	pixel_x = -9;
+	pixel_x = 7;
 	pixel_y = -3
 	},
 /obj/item/storage/box/smokebombs{
-	pixel_x = -4;
+	pixel_x = -9;
 	pixel_y = -3
 	},
-/obj/structure/sign/warning/nosmoking{
-	pixel_y = 28
-	},
-/obj/item/storage/box/flares{
-	pixel_x = 11;
-	pixel_y = -5
-	},
-/obj/item/storage/box/flares{
-	pixel_x = -11;
-	pixel_y = -5
-	},
-/obj/item/storage/box/flares{
-	pixel_x = -3;
-	pixel_y = -5
-	},
-/obj/item/storage/box/flares{
-	pixel_x = 2;
-	pixel_y = -5
-	},
 /obj/item/gun/grenadelauncher{
 	pixel_y = 6
 	},
@@ -3289,6 +3323,10 @@
 /obj/item/storage/box/flares,
 /obj/item/storage/box/flares,
 /obj/item/storage/box/flares,
+/obj/item/storage/box/flares,
+/obj/item/storage/box/flares,
+/obj/item/storage/box/flares,
+/obj/item/storage/box/flares,
 /turf/open/floor/plasteel/patterned/ridged,
 /area/ship/cargo)
 "uN" = (
@@ -3577,6 +3615,18 @@
 	pixel_y = -21
 	},
 /obj/machinery/light/directional/east,
+/obj/item/folder/pgf/blue{
+	pixel_y = 5;
+	pixel_x = 1
+	},
+/obj/item/folder/pgf/red{
+	pixel_x = -1;
+	pixel_y = 1
+	},
+/obj/item/folder/pgf{
+	pixel_x = -3;
+	pixel_y = -3
+	},
 /turf/open/floor/plasteel/tech,
 /area/ship/security)
 "xe" = (
@@ -3782,6 +3832,10 @@
 	pixel_x = 6;
 	pixel_y = 4
 	},
+/obj/item/stock_parts/cell/gun/pgf{
+	pixel_x = -8;
+	pixel_y = -4
+	},
 /obj/item/stock_parts/cell/gun/kalix{
 	pixel_x = 6;
 	pixel_y = 2
@@ -3847,13 +3901,13 @@
 /area/ship/hallway/fore)
 "yD" = (
 /obj/machinery/suit_storage_unit/inherit,
-/obj/item/clothing/suit/space/gezena,
-/obj/item/clothing/head/helmet/space/gezena,
 /obj/item/tank/internals/oxygen/red,
-/obj/item/clothing/mask/gas,
 /obj/effect/turf_decal/spline/fancy/opaque/black{
 	dir = 8
 	},
+/obj/item/clothing/suit/space/gezena/marine,
+/obj/item/clothing/head/helmet/space/gezena/marine,
+/obj/item/clothing/mask/breath/pgfmask,
 /turf/open/floor/plasteel/tech,
 /area/ship/security)
 "yJ" = (
@@ -4147,52 +4201,6 @@
 /obj/effect/turf_decal/corner/opaque/purple/border{
 	dir = 1
 	},
-/obj/structure/closet/secure_closet{
-	anchored = 1;
-	can_be_unanchored = 1;
-	icon_state = "sec";
-	name = "uniforms locker";
-	req_access_txt = "1"
-	},
-/obj/item/clothing/under/gezena/marine{
-	pixel_x = -7
-	},
-/obj/item/clothing/under/gezena/marine{
-	pixel_x = -7
-	},
-/obj/item/clothing/under/gezena/marine{
-	pixel_x = -7
-	},
-/obj/item/clothing/head/gezena/marine{
-	pixel_x = -6;
-	pixel_y = 9
-	},
-/obj/item/clothing/head/gezena/marine{
-	pixel_x = -6;
-	pixel_y = 9
-	},
-/obj/item/clothing/head/gezena/marine{
-	pixel_x = -6;
-	pixel_y = 9
-	},
-/obj/item/clothing/shoes/combat/gezena{
-	pixel_x = 3
-	},
-/obj/item/clothing/shoes/combat/gezena{
-	pixel_x = 3
-	},
-/obj/item/clothing/shoes/combat/gezena{
-	pixel_x = 3
-	},
-/obj/item/storage/backpack/security{
-	pixel_y = -6
-	},
-/obj/item/storage/backpack/security{
-	pixel_y = -6
-	},
-/obj/item/radio/headset/pgf/alt,
-/obj/item/radio/headset/pgf/alt,
-/obj/item/radio/headset/pgf/alt,
 /obj/machinery/light_switch{
 	dir = 8;
 	pixel_x = 20;
@@ -4207,16 +4215,15 @@
 	pixel_y = 1;
 	req_access = list(3)
 	},
-/obj/item/clothing/head/gezena/marine{
-	pixel_x = -6;
-	pixel_y = 9
+/obj/structure/table/reinforced,
+/obj/item/modular_computer/laptop/preset{
+	pixel_y = 3;
+	pixel_x = -7
 	},
-/obj/item/storage/backpack/security{
-	pixel_y = -6
+/obj/item/computer_hardware/card_slot{
+	pixel_y = 6;
+	pixel_x = 1
 	},
-/obj/item/clothing/head/gezena/flap/marine,
-/obj/item/clothing/head/gezena/flap/marine,
-/obj/item/clothing/head/gezena/flap/marine,
 /turf/open/floor/vault,
 /area/ship/security/armory)
 "AC" = (
@@ -4310,100 +4317,97 @@
 /turf/open/floor/plating,
 /area/ship/engineering)
 "AY" = (
-/obj/item/clothing/under/gezena{
-	pixel_x = 9;
-	pixel_y = 2
+/obj/structure/closet{
+	name = "spare uniforms"
 	},
-/obj/item/clothing/under/gezena{
-	pixel_x = 9;
-	pixel_y = 2
+/obj/effect/turf_decal/borderfloorblack,
+/obj/structure/noticeboard{
+	pixel_y = 25
 	},
-/obj/item/clothing/under/gezena{
-	pixel_x = 9;
-	pixel_y = 2
+/obj/item/clothing/head/gezena/flap{
+	pixel_x = -9;
+	pixel_y = 12
+	},
+/obj/item/clothing/head/gezena/flap{
+	pixel_x = -9;
+	pixel_y = 12
+	},
+/obj/item/clothing/head/gezena/flap{
+	pixel_x = -9;
+	pixel_y = 12
+	},
+/obj/item/clothing/head/gezena{
+	pixel_x = 8;
+	pixel_y = 13
+	},
+/obj/item/clothing/head/gezena{
+	pixel_x = 8;
+	pixel_y = 13
+	},
+/obj/item/clothing/head/gezena{
+	pixel_x = 8;
+	pixel_y = 13
 	},
 /obj/item/clothing/under/gezena{
-	pixel_x = 9;
-	pixel_y = 2
+	pixel_y = 0;
+	pixel_x = -9
 	},
-/obj/item/clothing/suit/toggle/gezena,
-/obj/item/clothing/suit/toggle/gezena,
-/obj/item/clothing/suit/toggle/gezena,
-/obj/item/clothing/suit/toggle/gezena,
-/obj/item/clothing/shoes/combat/gezena{
-	pixel_x = 3;
-	pixel_y = -7
+/obj/item/clothing/under/gezena{
+	pixel_y = 0;
+	pixel_x = -9
 	},
-/obj/item/clothing/shoes/combat/gezena{
-	pixel_x = 3;
-	pixel_y = -7
+/obj/item/clothing/under/gezena{
+	pixel_y = 0;
+	pixel_x = -9
 	},
-/obj/item/clothing/shoes/combat/gezena{
-	pixel_x = 3;
-	pixel_y = -7
+/obj/item/clothing/suit/toggle/gezena{
+	pixel_y = -1;
+	pixel_x = 8
 	},
-/obj/item/clothing/shoes/combat/gezena{
-	pixel_x = 3;
-	pixel_y = -7
+/obj/item/clothing/suit/toggle/gezena{
+	pixel_y = -1;
+	pixel_x = 8
 	},
-/obj/item/clothing/neck/cloak/gezena{
-	pixel_x = -8;
-	pixel_y = -1
+/obj/item/clothing/suit/toggle/gezena{
+	pixel_y = -1;
+	pixel_x = 8
 	},
 /obj/item/clothing/neck/cloak/gezena{
-	pixel_x = -8;
-	pixel_y = -1
+	pixel_x = 2;
+	pixel_y = 12
 	},
 /obj/item/clothing/neck/cloak/gezena{
-	pixel_x = -8;
-	pixel_y = -1
+	pixel_x = 2;
+	pixel_y = 12
 	},
 /obj/item/clothing/neck/cloak/gezena{
-	pixel_x = -8;
-	pixel_y = -1
-	},
-/obj/structure/closet{
-	name = "spare uniforms"
-	},
-/obj/item/clothing/head/gezena,
-/obj/item/clothing/head/gezena,
-/obj/item/clothing/head/gezena,
-/obj/item/clothing/head/gezena,
-/obj/effect/turf_decal/borderfloorblack,
-/obj/structure/noticeboard{
-	pixel_y = 25
+	pixel_x = 2;
+	pixel_y = 12
 	},
-/obj/item/clothing/head/gezena/flap,
-/obj/item/clothing/head/gezena/flap,
-/obj/item/clothing/head/gezena/flap,
-/obj/item/clothing/head/gezena/flap,
-/obj/item/storage/backpack/satchel/explorer{
+/obj/item/clothing/gloves/gezena{
 	pixel_y = -2
 	},
-/obj/item/storage/backpack/satchel/explorer{
+/obj/item/clothing/gloves/gezena{
 	pixel_y = -2
 	},
-/obj/item/storage/backpack/satchel/explorer{
+/obj/item/clothing/gloves/gezena{
 	pixel_y = -2
 	},
 /obj/item/storage/backpack/satchel/explorer{
-	pixel_y = -2
+	pixel_y = -8;
+	pixel_x = -10
 	},
-/obj/item/storage/backpack/explorer,
-/obj/item/storage/backpack/explorer,
-/obj/item/storage/backpack/explorer,
-/obj/item/storage/backpack/explorer,
-/obj/item/clothing/gloves/gezena{
-	pixel_y = -15
-	},
-/obj/item/clothing/gloves/gezena{
-	pixel_y = -15
+/obj/item/storage/backpack/satchel/explorer{
+	pixel_y = -8;
+	pixel_x = -10
 	},
-/obj/item/clothing/gloves/gezena{
-	pixel_y = -15
+/obj/item/storage/backpack/duffelbag{
+	pixel_y = -8;
+	pixel_x = 8
 	},
-/obj/item/clothing/gloves/gezena{
-	pixel_y = -15
+/obj/item/storage/backpack/duffelbag{
+	pixel_y = -8;
+	pixel_x = 8
 	},
 /turf/open/floor/plasteel/tech/techmaint,
 /area/ship/crew/dorm)
@@ -4423,6 +4427,7 @@
 /obj/effect/turf_decal/spline/fancy/opaque/green{
 	dir = 1
 	},
+/obj/machinery/computer/helm/viewscreen/directional/north,
 /turf/open/floor/plasteel/mono/dark,
 /area/ship/crew/ccommons)
 "Br" = (
@@ -4431,18 +4436,6 @@
 	pixel_x = -6;
 	pixel_y = 9
 	},
-/obj/item/folder/pgf{
-	pixel_x = -3;
-	pixel_y = -3
-	},
-/obj/item/folder/pgf{
-	pixel_x = 3;
-	pixel_y = 1
-	},
-/obj/item/folder/pgf{
-	pixel_x = 9;
-	pixel_y = 6
-	},
 /obj/effect/turf_decal/techfloor/orange{
 	dir = 1
 	},
@@ -4609,19 +4602,120 @@
 /obj/machinery/atmospherics/pipe/simple/orange/visible{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/turf/open/floor/plasteel/tech,
-/area/ship/engineering/engines/port)
-"CA" = (
-/obj/structure/table/reinforced,
-/obj/machinery/recharger{
-	pixel_x = -5;
-	pixel_y = 8
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering/engines/port)
+"CA" = (
+/obj/machinery/light/small/directional/west,
+/obj/effect/turf_decal/trimline/opaque/bottlegreen/filled/line{
+	dir = 8
+	},
+/obj/structure/closet/secure_closet{
+	anchored = 1;
+	can_be_unanchored = 1;
+	icon_state = "sec";
+	name = "uniforms locker";
+	req_access_txt = "1"
+	},
+/obj/item/storage/backpack/duffelbag/sec{
+	pixel_y = -9;
+	pixel_x = 4
+	},
+/obj/item/storage/backpack/duffelbag/sec{
+	pixel_y = -9;
+	pixel_x = 4
+	},
+/obj/item/storage/backpack/duffelbag/sec{
+	pixel_y = -9;
+	pixel_x = 4
+	},
+/obj/item/storage/backpack/satchel/sec{
+	pixel_x = -8;
+	pixel_y = -13
+	},
+/obj/item/storage/backpack/satchel/sec{
+	pixel_x = -8;
+	pixel_y = -13
+	},
+/obj/item/storage/backpack/satchel/sec{
+	pixel_x = -8;
+	pixel_y = -13
+	},
+/obj/item/storage/backpack/industrial{
+	pixel_y = -11
+	},
+/obj/item/storage/backpack/industrial{
+	pixel_y = -11
+	},
+/obj/item/storage/backpack/industrial{
+	pixel_y = -11
+	},
+/obj/item/clothing/under/gezena/marine{
+	pixel_y = 8
+	},
+/obj/item/clothing/under/gezena/marine{
+	pixel_y = 8
+	},
+/obj/item/clothing/under/gezena/marine{
+	pixel_y = 8
+	},
+/obj/item/clothing/under/gezena/marine{
+	pixel_y = 8
+	},
+/obj/item/clothing/under/gezena/marine{
+	pixel_y = 8
+	},
+/obj/item/clothing/under/gezena/marine{
+	pixel_y = 8
+	},
+/obj/item/clothing/shoes/combat/gezena/marine{
+	pixel_y = 1;
+	pixel_x = 6
+	},
+/obj/item/clothing/shoes/combat/gezena/marine{
+	pixel_y = 1;
+	pixel_x = 6
+	},
+/obj/item/clothing/shoes/combat/gezena/marine{
+	pixel_y = 1;
+	pixel_x = 6
+	},
+/obj/item/clothing/shoes/combat/gezena/marine{
+	pixel_y = 1;
+	pixel_x = 6
+	},
+/obj/item/clothing/shoes/combat/gezena/marine{
+	pixel_y = 1;
+	pixel_x = 6
+	},
+/obj/item/clothing/shoes/combat/gezena/marine{
+	pixel_y = 1;
+	pixel_x = 6
+	},
+/obj/item/clothing/neck/cloak/gezena{
+	pixel_x = -4;
+	pixel_y = 0
+	},
+/obj/item/clothing/neck/cloak/gezena{
+	pixel_x = -4;
+	pixel_y = 0
+	},
+/obj/item/clothing/neck/cloak/gezena{
+	pixel_x = -4;
+	pixel_y = 0
+	},
+/obj/item/clothing/neck/cloak/gezena{
+	pixel_x = -4;
+	pixel_y = 0
+	},
+/obj/item/clothing/neck/cloak/gezena{
+	pixel_x = -4;
+	pixel_y = 0
 	},
-/obj/machinery/light/small/directional/west,
-/obj/effect/turf_decal/trimline/opaque/bottlegreen/filled/line{
-	dir = 8
+/obj/item/clothing/neck/cloak/gezena{
+	pixel_x = -4;
+	pixel_y = 0
 	},
 /turf/open/floor/plasteel/dark,
 /area/ship/security)
@@ -5125,12 +5219,12 @@
 /obj/structure/bed/double{
 	dir = 4
 	},
-/obj/effect/turf_decal/siding/wood{
-	dir = 8
-	},
 /obj/item/bedsheet/double/brown{
 	dir = 1
 	},
+/obj/effect/turf_decal/siding/wood{
+	dir = 9
+	},
 /turf/open/floor/plasteel/sepia,
 /area/ship/crew/dorm/captain)
 "FP" = (
@@ -5363,10 +5457,7 @@
 /area/ship/bridge)
 "Ho" = (
 /obj/machinery/suit_storage_unit/inherit,
-/obj/item/clothing/suit/space/gezena,
-/obj/item/clothing/head/helmet/space/gezena,
 /obj/item/tank/internals/oxygen/red,
-/obj/item/clothing/mask/gas,
 /obj/effect/turf_decal/spline/fancy/opaque/black{
 	dir = 8
 	},
@@ -5374,33 +5465,21 @@
 /obj/structure/noticeboard{
 	pixel_y = 25
 	},
+/obj/item/clothing/suit/space/gezena/marine,
+/obj/item/clothing/head/helmet/space/gezena/marine,
+/obj/item/clothing/mask/breath/pgfmask,
 /turf/open/floor/plasteel/tech,
 /area/ship/security)
 "Hr" = (
 /obj/structure/table/reinforced,
 /obj/machinery/recharger{
-	pixel_x = 8;
-	pixel_y = 8
-	},
-/obj/machinery/recharger{
-	pixel_x = -8;
-	pixel_y = 8
+	pixel_x = -15;
+	pixel_y = 2
 	},
 /obj/item/radio/intercom/directional/east,
-/obj/item/bodycamera{
-	pixel_y = -7;
-	pixel_x = -9
-	},
-/obj/item/bodycamera{
-	pixel_y = -7;
-	pixel_x = 9
-	},
-/obj/item/multitool{
-	pixel_x = -1;
-	pixel_y = 6
-	},
-/obj/item/bodycamera{
-	pixel_y = -7
+/obj/machinery/cell_charger{
+	pixel_y = 2;
+	pixel_x = 2
 	},
 /turf/open/floor/vault,
 /area/ship/security/armory)
@@ -5532,43 +5611,114 @@
 	name = "armor locker";
 	req_access_txt = "1"
 	},
-/obj/item/clothing/suit/armor/gezena/marinecoat,
-/obj/item/clothing/suit/armor/gezena/marinecoat,
-/obj/item/clothing/suit/armor/gezena/marinecoat,
-/obj/item/clothing/suit/armor/gezena/marinecoat,
-/obj/item/storage/belt/military/gezena,
-/obj/item/storage/belt/military/gezena,
-/obj/item/storage/belt/military/gezena,
-/obj/item/storage/belt/military/gezena,
-/obj/item/storage/belt/military/gezena,
+/obj/machinery/light/directional/south,
 /obj/item/clothing/head/helmet/gezena{
-	pixel_x = -1;
-	pixel_y = 8
+	pixel_y = 14
 	},
 /obj/item/clothing/head/helmet/gezena{
-	pixel_x = -1;
-	pixel_y = 8
+	pixel_y = 14
 	},
 /obj/item/clothing/head/helmet/gezena{
-	pixel_x = -1;
-	pixel_y = 8
+	pixel_y = 14
 	},
 /obj/item/clothing/head/helmet/gezena{
-	pixel_x = -1;
-	pixel_y = 8
+	pixel_y = 14
 	},
 /obj/item/clothing/head/helmet/gezena{
-	pixel_x = -1;
-	pixel_y = 8
+	pixel_y = 14
 	},
 /obj/item/clothing/head/helmet/gezena{
-	pixel_x = -1;
-	pixel_y = 8
+	pixel_y = 14
 	},
-/obj/machinery/light/directional/south,
-/obj/item/clothing/suit/armor/gezena/marine,
-/obj/item/clothing/suit/armor/gezena/marine,
-/obj/item/storage/belt/military/gezena,
+/obj/item/clothing/head/helmet/gezena{
+	pixel_y = 14
+	},
+/obj/item/clothing/glasses/sunglasses/pgf{
+	pixel_y = 4;
+	pixel_x = 1
+	},
+/obj/item/clothing/glasses/sunglasses/pgf{
+	pixel_y = 4;
+	pixel_x = 1
+	},
+/obj/item/clothing/glasses/sunglasses/pgf{
+	pixel_y = 4;
+	pixel_x = 1
+	},
+/obj/item/clothing/glasses/sunglasses/pgf{
+	pixel_y = 4;
+	pixel_x = 1
+	},
+/obj/item/clothing/glasses/sunglasses/pgf{
+	pixel_y = 4;
+	pixel_x = 1
+	},
+/obj/item/clothing/glasses/sunglasses/pgf{
+	pixel_y = 4;
+	pixel_x = 1
+	},
+/obj/item/clothing/glasses/sunglasses/pgf{
+	pixel_y = 4;
+	pixel_x = 1
+	},
+/obj/item/clothing/suit/armor/gezena/marine{
+	pixel_y = -8;
+	pixel_x = -5
+	},
+/obj/item/clothing/suit/armor/gezena/marine{
+	pixel_y = -8;
+	pixel_x = -5
+	},
+/obj/item/clothing/suit/armor/gezena/marine{
+	pixel_y = -8;
+	pixel_x = -5
+	},
+/obj/item/clothing/suit/armor/gezena/marine{
+	pixel_y = -8;
+	pixel_x = -5
+	},
+/obj/item/clothing/suit/armor/gezena/marine{
+	pixel_y = -8;
+	pixel_x = -5
+	},
+/obj/item/clothing/suit/armor/gezena/marine{
+	pixel_y = -8;
+	pixel_x = -5
+	},
+/obj/item/clothing/suit/armor/gezena/marine{
+	pixel_y = -8;
+	pixel_x = -5
+	},
+/obj/item/storage/belt/military/gezena{
+	pixel_x = 4;
+	pixel_y = -9
+	},
+/obj/item/storage/belt/military/gezena{
+	pixel_x = 4;
+	pixel_y = -9
+	},
+/obj/item/storage/belt/military/gezena{
+	pixel_x = 4;
+	pixel_y = -9
+	},
+/obj/item/storage/belt/military/gezena{
+	pixel_x = 4;
+	pixel_y = -9
+	},
+/obj/item/storage/belt/military/gezena{
+	pixel_x = 4;
+	pixel_y = -9
+	},
+/obj/item/storage/belt/military/gezena{
+	pixel_x = 4;
+	pixel_y = -9
+	},
+/obj/item/storage/belt/military/gezena{
+	pixel_x = 4;
+	pixel_y = -9
+	},
+/obj/item/radio/headset/pgf/alt,
+/obj/item/radio/headset/pgf/alt,
 /turf/open/floor/vault,
 /area/ship/security/armory)
 "IM" = (
@@ -5735,34 +5885,72 @@
 /turf/open/floor/plasteel/patterned/cargo_one,
 /area/ship/cargo)
 "JS" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
 /obj/structure/closet/secure_closet{
 	icon_state = "blueshield";
-	name = "captain's locker";
-	req_access = list(20)
+	req_access = list(20);
+	name = "captain's locker"
 	},
-/obj/effect/turf_decal/siding/wood{
-	dir = 5
+/obj/item/storage/lockbox/medal{
+	pixel_y = -20;
+	pixel_x = null
+	},
+/obj/item/storage/backpack/satchel/cap{
+	pixel_y = -18;
+	pixel_x = -8
+	},
+/obj/item/storage/backpack/duffelbag/captain{
+	pixel_x = 6;
+	pixel_y = -17
+	},
+/obj/item/clothing/head/gezena/captain{
+	pixel_y = 12;
+	pixel_x = -8
+	},
+/obj/item/clothing/head/gezena/flap/captain{
+	pixel_y = 8;
+	pixel_x = 8
 	},
-/obj/item/radio/headset/pgf/alt/captain,
 /obj/item/clothing/under/gezena/captain{
-	pixel_x = 5;
-	pixel_y = -5
+	pixel_y = 2;
+	pixel_x = -8
+	},
+/obj/item/clothing/suit/armor/gezena/captain{
+	pixel_y = 2;
+	pixel_x = 8
+	},
+/obj/item/storage/guncase/pistol/kalixpistol{
+	pixel_y = -15;
+	pixel_x = -1
+	},
+/obj/item/clothing/shoes/combat/gezena{
+	pixel_y = -7;
+	pixel_x = -11
+	},
+/obj/item/clothing/neck/cloak/gezena/captain{
+	pixel_y = 2;
+	pixel_x = 3
 	},
-/obj/item/clothing/neck/cloak/gezena/captain,
 /obj/item/clothing/gloves/gezena/captain{
-	pixel_y = 4
+	pixel_y = -10
 	},
-/obj/item/clothing/accessory/medal/silver/valor,
-/obj/item/clothing/mask/whistle{
-	name = "marine whistle"
+/obj/item/storage/belt/sabre/pgf{
+	pixel_y = -6;
+	pixel_x = -2
 	},
-/obj/item/storage/box/holodisc{
-	pixel_x = 7
+/obj/item/radio/headset/pgf/alt/captain{
+	pixel_x = 10;
+	pixel_y = -4
+	},
+/obj/item/radio/headset/pgf/captain{
+	pixel_x = -10;
+	pixel_y = -8
+	},
+/obj/effect/turf_decal/siding/wood{
+	dir = 5
 	},
-/obj/item/clothing/suit/toggle/gezena,
-/obj/item/clothing/head/gezena/captain,
-/obj/item/clothing/suit/armor/gezena/captain,
-/obj/item/storage/guncase/pistol/kalixpistol,
 /turf/open/floor/plasteel/sepia,
 /area/ship/crew/dorm/captain)
 "JY" = (
@@ -5808,10 +5996,6 @@
 /obj/effect/turf_decal/spline/fancy/opaque/green,
 /turf/open/floor/plasteel/mono/dark,
 /area/ship/crew/ccommons)
-"Kn" = (
-/obj/structure/table/reinforced,
-/turf/closed/wall/mineral/titanium/nodiagonal,
-/area/ship/security/armory)
 "Ko" = (
 /obj/structure/floodlight_frame,
 /turf/open/floor/plasteel/patterned,
@@ -5819,30 +6003,26 @@
 "Kp" = (
 /obj/structure/rack,
 /obj/effect/turf_decal/corner/opaque/neutral/full,
-/obj/item/gun/energy/kalix/pgf/heavy{
-	pixel_x = -3;
-	pixel_y = 11
+/obj/machinery/camera/autoname{
+	dir = 4
 	},
+/obj/machinery/light/directional/north,
 /obj/item/gun/energy/kalix/pistol{
 	pixel_x = 4;
-	pixel_y = -5
+	pixel_y = -8
 	},
 /obj/item/gun/energy/kalix/pistol{
 	pixel_x = -6;
-	pixel_y = 2
-	},
-/obj/item/gun/energy/kalix/pistol{
-	pixel_x = 3;
-	pixel_y = 2
+	pixel_y = -8
 	},
-/obj/item/gun/energy/kalix/pistol{
-	pixel_x = -6;
-	pixel_y = -5
+/obj/item/gun/energy/kalix,
+/obj/item/gun/energy/kalix{
+	pixel_y = 6
 	},
-/obj/machinery/camera/autoname{
-	dir = 4
+/obj/item/gun/energy/kalix/pgf/heavy{
+	pixel_x = -3;
+	pixel_y = 11
 	},
-/obj/machinery/light/directional/north,
 /turf/open/floor/vault,
 /area/ship/security/armory)
 "Kt" = (
@@ -6258,14 +6438,13 @@
 	},
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/machinery/suit_storage_unit/inherit,
-/obj/item/clothing/head/helmet/space/gezena,
 /obj/item/tank/internals/oxygen/red,
-/obj/item/clothing/mask/gas,
 /obj/item/clothing/suit/space/gezena,
 /obj/machinery/power/apc/auto_name/directional/north,
 /obj/structure/cable{
 	icon_state = "0-2"
 	},
+/obj/item/clothing/head/helmet/space/gezena,
 /turf/open/floor/engine/hull/reinforced/interior,
 /area/ship/hallway/fore)
 "MS" = (
@@ -6591,10 +6770,6 @@
 /area/ship/crew/dorm)
 "PS" = (
 /obj/structure/table/reinforced,
-/obj/machinery/cell_charger{
-	pixel_x = 2;
-	pixel_y = 7
-	},
 /obj/item/gps{
 	pixel_x = -10;
 	pixel_y = -6
@@ -6606,6 +6781,20 @@
 	pixel_x = 10;
 	pixel_y = -6
 	},
+/obj/item/bodycamera{
+	pixel_y = 8;
+	pixel_x = -9
+	},
+/obj/item/bodycamera{
+	pixel_y = 11
+	},
+/obj/item/multitool{
+	pixel_y = 3
+	},
+/obj/item/bodycamera{
+	pixel_y = 8;
+	pixel_x = 9
+	},
 /turf/open/floor/vault,
 /area/ship/security/armory)
 "PZ" = (
@@ -6669,7 +6858,12 @@
 /obj/structure/table/reinforced,
 /obj/item/geiger_counter,
 /obj/item/radio/headset/pgf/alt,
-/obj/item/clothing/head/gezena,
+/obj/item/clothing/head/gezena/engi{
+	pixel_x = 7
+	},
+/obj/item/clothing/head/gezena/flap/engi{
+	pixel_x = -9
+	},
 /turf/open/floor/plasteel/tech,
 /area/ship/storage/starboard)
 "Qb" = (
@@ -7773,7 +7967,12 @@
 /obj/structure/table/reinforced,
 /obj/item/geiger_counter,
 /obj/item/radio/headset/pgf/alt,
-/obj/item/clothing/head/gezena,
+/obj/item/clothing/head/gezena/engi{
+	pixel_x = 7
+	},
+/obj/item/clothing/head/gezena/flap/engi{
+	pixel_x = -9
+	},
 /turf/open/floor/plasteel/tech,
 /area/ship/storage/starboard)
 "VF" = (
@@ -8136,10 +8335,6 @@
 	pixel_x = 7;
 	pixel_y = -10
 	},
-/obj/item/clothing/suit/armor/gezena{
-	pixel_x = -9;
-	pixel_y = 9
-	},
 /obj/item/clothing/under/gezena{
 	pixel_x = -9;
 	pixel_y = -5
@@ -8149,12 +8344,16 @@
 	pixel_y = 3
 	},
 /obj/effect/turf_decal/box,
+/obj/item/defibrillator/loaded,
 /obj/item/clothing/gloves/color/latex/nitrile{
-	pixel_x = 4;
-	pixel_y = 5
+	pixel_x = 1;
+	pixel_y = 10
 	},
-/obj/item/defibrillator/loaded,
-/obj/item/flashlight/pen,
+/obj/item/flashlight/pen{
+	pixel_y = 0;
+	pixel_x = 11
+	},
+/obj/item/clothing/suit/armor/gezena/medic,
 /turf/open/floor/mineral/titanium/tiled,
 /area/ship/medical)
 "YN" = (
@@ -8321,16 +8520,16 @@
 /obj/structure/rack,
 /obj/effect/turf_decal/corner/opaque/neutral/full,
 /obj/item/gun/energy/kalix/pgf{
-	pixel_y = 4
+	pixel_y = 3
 	},
 /obj/item/gun/energy/kalix/pgf{
-	pixel_y = 11
+	pixel_y = 10
 	},
 /obj/machinery/light/directional/north,
 /obj/effect/decal/cleanable/cobweb/cobweb2,
 /obj/item/gun/energy/kalix/pgf/medium{
 	pixel_x = -2;
-	pixel_y = -3
+	pixel_y = -4
 	},
 /turf/open/floor/vault,
 /area/ship/security/armory)
@@ -9007,7 +9206,7 @@ dg
 Qg
 ks
 ks
-Kn
+ks
 ks
 zS
 jF
diff --git a/_maps/shuttles/pgf/pgf_mercurial_quasar.dmm b/_maps/shuttles/pgf/pgf_mercurial_quasar.dmm
index 8b60d6b8c6..46ecba92a0 100644
--- a/_maps/shuttles/pgf/pgf_mercurial_quasar.dmm
+++ b/_maps/shuttles/pgf/pgf_mercurial_quasar.dmm
@@ -3,8 +3,6 @@
 /obj/structure/railing{
 	dir = 8
 	},
-/obj/item/clothing/suit/space/gezena,
-/obj/item/clothing/head/helmet/space/gezena,
 /obj/effect/turf_decal/borderfloor{
 	dir = 10
 	},
@@ -13,6 +11,9 @@
 	},
 /obj/machinery/suit_storage_unit/inherit/industrial,
 /obj/item/tank/internals/oxygen/red,
+/obj/item/clothing/suit/space/gezena/marine,
+/obj/item/clothing/head/helmet/space/gezena/marine,
+/obj/item/clothing/mask/breath/pgfmask,
 /turf/open/floor/plasteel/patterned/ridged,
 /area/ship/cargo)
 "at" = (
@@ -59,39 +60,76 @@
 /turf/open/floor/plasteel/tech/techmaint,
 /area/ship/engineering)
 "bb" = (
-/obj/item/clothing/suit/armor/gezena/captain,
-/obj/item/clothing/neck/cloak/gezena/captain,
-/obj/item/clothing/gloves/gezena/captain,
-/obj/item/clothing/shoes/combat/gezena{
-	pixel_y = -8;
-	pixel_x = 5
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/structure/closet/secure_closet{
+	icon_state = "blueshield";
+	req_access = list(20);
+	name = "captain's locker"
+	},
+/obj/item/storage/lockbox/medal{
+	pixel_y = -16;
+	pixel_x = null
 	},
 /obj/item/storage/backpack/satchel/cap{
-	pixel_y = -11;
+	pixel_y = -6;
 	pixel_x = -8
 	},
 /obj/item/storage/backpack/duffelbag/captain{
 	pixel_x = 6;
-	pixel_y = -5
-	},
-/obj/item/radio/headset/pgf/alt/captain,
-/obj/item/radio/headset/pgf/captain,
-/obj/item/storage/belt/sabre,
-/obj/structure/closet/secure_closet/captains{
-	populate = 0
+	pixel_y = -9
 	},
-/obj/item/storage/guncase/pistol/kalixpistol,
-/obj/item/megaphone/command,
 /obj/item/clothing/head/gezena/captain{
-	pixel_y = 11
+	pixel_y = 13;
+	pixel_x = -8
+	},
+/obj/item/clothing/head/gezena/flap/captain{
+	pixel_y = 11;
+	pixel_x = 8
+	},
+/obj/item/clothing/under/gezena/captain{
+	pixel_y = 4;
+	pixel_x = -8
+	},
+/obj/item/clothing/suit/armor/gezena/captain{
+	pixel_y = 4;
+	pixel_x = 8
+	},
+/obj/item/storage/guncase/pistol/kalixpistol{
+	pixel_y = -12;
+	pixel_x = -1
+	},
+/obj/item/clothing/shoes/combat/gezena{
+	pixel_y = -3;
+	pixel_x = -11
+	},
+/obj/item/clothing/neck/cloak/gezena/captain{
+	pixel_y = 2;
+	pixel_x = 3
+	},
+/obj/item/clothing/gloves/gezena/captain{
+	pixel_y = -6
+	},
+/obj/item/storage/belt/sabre/pgf{
+	pixel_y = -6;
+	pixel_x = -2
+	},
+/obj/item/radio/headset/pgf/alt/captain{
+	pixel_x = 10;
+	pixel_y = -4
+	},
+/obj/item/radio/headset/pgf/captain{
+	pixel_x = -10;
+	pixel_y = -8
 	},
-/obj/machinery/light/directional/west,
 /obj/effect/turf_decal/steeldecal/steel_decals10{
 	dir = 9
 	},
 /obj/effect/turf_decal/steeldecal/steel_decals10{
 	dir = 10
 	},
+/obj/machinery/light/directional/west,
 /obj/machinery/firealarm/directional/south,
 /turf/open/floor/plasteel/mono/dark,
 /area/ship/bridge)
@@ -165,13 +203,14 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/crew/dorm)
 "cx" = (
-/obj/item/clothing/suit/space/gezena,
-/obj/item/clothing/head/helmet/space/gezena,
 /obj/effect/turf_decal/borderfloor{
 	dir = 6
 	},
 /obj/machinery/suit_storage_unit/inherit/industrial,
 /obj/item/tank/internals/oxygen/red,
+/obj/item/clothing/suit/space/gezena/marine,
+/obj/item/clothing/head/helmet/space/gezena/marine,
+/obj/item/clothing/mask/breath/pgfmask,
 /turf/open/floor/plasteel/patterned/ridged,
 /area/ship/cargo)
 "cy" = (
@@ -475,59 +514,10 @@
 	icon_door = null;
 	name = "uniform locker"
 	},
-/obj/item/clothing/neck/cloak/gezena{
-	pixel_x = 8;
-	pixel_y = 0
-	},
-/obj/item/clothing/under/gezena{
-	pixel_y = 3;
-	pixel_x = -9
-	},
-/obj/item/clothing/suit/toggle/gezena{
-	pixel_y = 10
-	},
-/obj/item/clothing/suit/toggle/gezena{
-	pixel_y = 10
-	},
-/obj/item/clothing/under/gezena{
-	pixel_y = 3;
-	pixel_x = -9
-	},
-/obj/item/clothing/under/gezena{
-	pixel_y = 3;
-	pixel_x = -9
-	},
-/obj/item/clothing/suit/toggle/gezena{
-	pixel_y = 10
-	},
-/obj/item/clothing/neck/cloak/gezena{
-	pixel_x = 9;
-	pixel_y = 0
-	},
 /obj/item/storage/backpack/duffelbag{
 	pixel_x = -10;
 	pixel_y = -6
 	},
-/obj/item/clothing/neck/cloak/gezena{
-	pixel_x = 9;
-	pixel_y = 0
-	},
-/obj/item/clothing/neck/cloak/gezena{
-	pixel_x = 9;
-	pixel_y = 0
-	},
-/obj/item/clothing/shoes/combat/gezena{
-	pixel_y = 0;
-	pixel_x = -1
-	},
-/obj/item/clothing/shoes/combat/gezena{
-	pixel_y = 0;
-	pixel_x = -1
-	},
-/obj/item/clothing/shoes/combat/gezena{
-	pixel_y = 0;
-	pixel_x = -1
-	},
 /obj/item/storage/backpack/satchel/explorer{
 	pixel_y = -7;
 	pixel_x = 8
@@ -540,14 +530,38 @@
 	pixel_x = -10;
 	pixel_y = -6
 	},
-/obj/item/clothing/gloves/gezena{
-	pixel_y = -15
+/obj/effect/turf_decal/siding/wood{
+	dir = 10
 	},
-/obj/item/clothing/gloves/gezena{
-	pixel_y = -15
+/obj/machinery/firealarm/directional/west{
+	pixel_y = 2
 	},
-/obj/item/clothing/gloves/gezena{
-	pixel_y = -15
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+	dir = 4
+	},
+/obj/item/clothing/suit/toggle/gezena{
+	pixel_y = 10;
+	pixel_x = 3
+	},
+/obj/item/clothing/suit/toggle/gezena{
+	pixel_y = 10;
+	pixel_x = 3
+	},
+/obj/item/clothing/suit/toggle/gezena{
+	pixel_y = 10;
+	pixel_x = 3
+	},
+/obj/item/clothing/under/gezena{
+	pixel_y = 3;
+	pixel_x = -9
+	},
+/obj/item/clothing/under/gezena{
+	pixel_y = 3;
+	pixel_x = -9
+	},
+/obj/item/clothing/under/gezena{
+	pixel_y = 3;
+	pixel_x = -9
 	},
 /obj/item/clothing/head/gezena/flap{
 	pixel_y = 11;
@@ -573,22 +587,37 @@
 	pixel_x = 10;
 	pixel_y = 9
 	},
-/obj/effect/turf_decal/siding/wood{
-	dir = 10
+/obj/item/clothing/shoes/combat/gezena{
+	pixel_y = 0;
+	pixel_x = -1
 	},
-/obj/machinery/firealarm/directional/west{
-	pixel_y = 2
+/obj/item/clothing/shoes/combat/gezena{
+	pixel_y = 0;
+	pixel_x = -1
 	},
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
-	dir = 4
+/obj/item/clothing/shoes/combat/gezena{
+	pixel_y = 0;
+	pixel_x = -1
 	},
-/obj/item/radio/headset/pgf{
+/obj/item/clothing/neck/cloak/gezena{
+	pixel_x = 9;
+	pixel_y = 0
+	},
+/obj/item/clothing/neck/cloak/gezena{
+	pixel_x = 9;
+	pixel_y = 0
+	},
+/obj/item/clothing/neck/cloak/gezena{
+	pixel_x = 9;
+	pixel_y = 0
+	},
+/obj/item/clothing/gloves/gezena{
 	pixel_y = -15
 	},
-/obj/item/radio/headset/pgf{
+/obj/item/clothing/gloves/gezena{
 	pixel_y = -15
 	},
-/obj/item/radio/headset/pgf{
+/obj/item/clothing/gloves/gezena{
 	pixel_y = -15
 	},
 /turf/open/floor/plasteel/sepia,
@@ -880,9 +909,15 @@
 	name = "engineer's locker"
 	},
 /obj/item/clothing/glasses/welding,
-/obj/item/clothing/suit/armor/gezena{
-	pixel_y = -4;
-	pixel_x = -11
+/obj/item/clothing/suit/armor/gezena/engi{
+	pixel_y = -6
+	},
+/obj/item/clothing/head/gezena/engi{
+	pixel_y = 0;
+	pixel_x = -9
+	},
+/obj/item/clothing/head/gezena/flap/engi{
+	pixel_x = 9
 	},
 /turf/open/floor/plasteel/tech/techmaint,
 /area/ship/engineering)
@@ -1645,48 +1680,59 @@
 	pixel_x = 0;
 	pixel_y = 28
 	},
-/obj/item/clothing/suit/armor/gezena/marine{
-	pixel_y = 11;
-	pixel_x = 6
-	},
-/obj/item/clothing/suit/armor/gezena/marine{
-	pixel_y = 11;
-	pixel_x = -6
+/obj/effect/turf_decal/corner/opaque/bottlegreen/border{
+	dir = 5
 	},
-/obj/item/storage/belt/military/gezena{
-	pixel_x = -6;
-	pixel_y = 11
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 10
 	},
-/obj/item/storage/belt/military/gezena{
-	pixel_x = 6;
-	pixel_y = 11
+/obj/structure/cable{
+	icon_state = "2-8"
 	},
 /obj/item/clothing/head/helmet/gezena{
-	pixel_y = 1;
-	pixel_x = -7
+	pixel_y = 24
 	},
 /obj/item/clothing/head/helmet/gezena{
-	pixel_y = 1;
-	pixel_x = 5
+	pixel_y = 24
 	},
-/obj/effect/turf_decal/corner/opaque/bottlegreen/border{
-	dir = 5
+/obj/item/clothing/head/helmet/gezena{
+	pixel_y = 24
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 10
+/obj/item/clothing/suit/armor/gezena/marine{
+	pixel_y = 5;
+	pixel_x = -5
 	},
-/obj/structure/cable{
-	icon_state = "2-8"
+/obj/item/clothing/suit/armor/gezena/marine{
+	pixel_y = 5;
+	pixel_x = -5
 	},
 /obj/item/clothing/suit/armor/gezena/marine{
-	pixel_y = 11
+	pixel_y = 5;
+	pixel_x = -5
 	},
 /obj/item/storage/belt/military/gezena{
-	pixel_y = 11
+	pixel_x = 4;
+	pixel_y = 4
 	},
-/obj/item/clothing/head/helmet/gezena{
-	pixel_y = 1;
-	pixel_x = -1
+/obj/item/storage/belt/military/gezena{
+	pixel_x = 4;
+	pixel_y = 4
+	},
+/obj/item/storage/belt/military/gezena{
+	pixel_x = 4;
+	pixel_y = 4
+	},
+/obj/item/clothing/glasses/sunglasses/pgf{
+	pixel_y = 15;
+	pixel_x = 1
+	},
+/obj/item/clothing/glasses/sunglasses/pgf{
+	pixel_y = 15;
+	pixel_x = 1
+	},
+/obj/item/clothing/glasses/sunglasses/pgf{
+	pixel_y = 15;
+	pixel_x = 1
 	},
 /turf/open/floor/plasteel/dark,
 /area/ship/security/armory)
@@ -2495,10 +2541,6 @@
 /turf/open/floor/pod/dark,
 /area/ship/crew/cryo)
 "Ji" = (
-/obj/item/clothing/head/gezena/medic{
-	pixel_y = 9;
-	pixel_x = -11
-	},
 /obj/item/clothing/head/gezena/flap/medic{
 	pixel_y = 3;
 	pixel_x = -11
@@ -2529,13 +2571,17 @@
 	dir = 1
 	},
 /obj/item/radio/headset/pgf,
-/obj/item/clothing/suit/armor/gezena{
-	pixel_y = -4;
-	pixel_x = -11
+/obj/item/clothing/suit/armor/gezena/medic{
+	pixel_y = -6;
+	pixel_x = -10
 	},
 /obj/item/storage/belt/medical/gezena{
 	pixel_x = -11;
-	pixel_y = -4
+	pixel_y = -12
+	},
+/obj/item/clothing/head/gezena/medic{
+	pixel_y = 13;
+	pixel_x = 1
 	},
 /turf/open/floor/plasteel,
 /area/ship/medical)
@@ -2587,90 +2633,118 @@
 /turf/open/floor/plasteel/telecomms_floor,
 /area/ship/hallway/fore)
 "Jo" = (
-/obj/item/clothing/under/gezena/marine{
-	pixel_x = -6;
-	pixel_y = -7
+/obj/structure/closet/secure_closet/wall/directional/west{
+	icon_state = "sec_wall";
+	name = "uniform locker";
+	dir = 2;
+	pixel_x = 0;
+	pixel_y = -28
 	},
-/obj/item/clothing/under/gezena/marine{
-	pixel_x = -6;
-	pixel_y = -7
+/obj/structure/window/reinforced{
+	dir = 8
+	},
+/obj/effect/turf_decal/corner/opaque/bottlegreen/border{
+	dir = 10
+	},
+/obj/item/storage/backpack/duffelbag/sec{
+	pixel_y = -12;
+	pixel_x = 7
+	},
+/obj/item/storage/backpack/duffelbag/sec{
+	pixel_y = -12;
+	pixel_x = 7
+	},
+/obj/item/storage/backpack/satchel/sec{
+	pixel_x = -3;
+	pixel_y = -16
+	},
+/obj/item/storage/backpack/satchel/sec{
+	pixel_x = -3;
+	pixel_y = -16
 	},
 /obj/item/clothing/head/gezena/flap/marine{
-	pixel_y = 1;
+	pixel_y = 8;
 	pixel_x = -6
 	},
 /obj/item/clothing/head/gezena/flap/marine{
-	pixel_y = 1;
+	pixel_y = 8;
+	pixel_x = -6
+	},
+/obj/item/clothing/head/gezena/flap/marine{
+	pixel_y = 8;
 	pixel_x = -6
 	},
 /obj/item/clothing/head/gezena/marine{
-	pixel_y = 10;
-	pixel_x = -5
+	pixel_y = 12;
+	pixel_x = 7
 	},
 /obj/item/clothing/head/gezena/marine{
-	pixel_y = 10;
-	pixel_x = -5
+	pixel_y = 12;
+	pixel_x = 7
 	},
-/obj/item/storage/backpack/duffelbag/sec{
-	pixel_y = -5;
+/obj/item/clothing/head/gezena/marine{
+	pixel_y = 12;
 	pixel_x = 7
 	},
-/obj/item/storage/backpack/satchel/sec{
-	pixel_x = 5;
-	pixel_y = -8
+/obj/item/clothing/under/gezena/marine{
+	pixel_x = -6;
+	pixel_y = 2
 	},
-/obj/item/clothing/shoes/combat/gezena{
-	pixel_x = 6;
-	pixel_y = 4
+/obj/item/clothing/under/gezena/marine{
+	pixel_x = -6;
+	pixel_y = 2
 	},
-/obj/item/clothing/shoes/combat/gezena{
-	pixel_x = 6;
-	pixel_y = 4
+/obj/item/clothing/under/gezena/marine{
+	pixel_x = -6;
+	pixel_y = 2
+	},
+/obj/item/clothing/suit/toggle/gezena/marine{
+	pixel_y = -1;
+	pixel_x = 6
+	},
+/obj/item/clothing/suit/toggle/gezena/marine{
+	pixel_y = -1;
+	pixel_x = 6
+	},
+/obj/item/clothing/suit/toggle/gezena/marine{
+	pixel_y = -1;
+	pixel_x = 6
 	},
 /obj/item/clothing/gloves/gezena/marine{
-	pixel_y = 11;
+	pixel_y = -2;
 	pixel_x = 7
 	},
 /obj/item/clothing/gloves/gezena/marine{
-	pixel_y = 11;
+	pixel_y = -2;
 	pixel_x = 7
 	},
-/obj/structure/closet/secure_closet/wall/directional/west{
-	icon_state = "sec_wall";
-	name = "uniform locker";
-	dir = 2;
-	pixel_x = 0;
-	pixel_y = -28
-	},
-/obj/structure/window/reinforced{
-	dir = 8
-	},
-/obj/effect/turf_decal/corner/opaque/bottlegreen/border{
-	dir = 10
+/obj/item/clothing/gloves/gezena/marine{
+	pixel_y = -2;
+	pixel_x = 7
 	},
-/obj/item/clothing/head/gezena/marine{
-	pixel_y = 10;
-	pixel_x = -5
+/obj/item/clothing/neck/cloak/gezena{
+	pixel_x = -2;
+	pixel_y = 0
 	},
-/obj/item/clothing/head/gezena/flap/marine{
-	pixel_y = 1;
-	pixel_x = -6
+/obj/item/clothing/neck/cloak/gezena{
+	pixel_x = -2;
+	pixel_y = 0
 	},
-/obj/item/clothing/under/gezena/marine{
-	pixel_x = -6;
-	pixel_y = -7
+/obj/item/clothing/neck/cloak/gezena{
+	pixel_x = -2;
+	pixel_y = 0
 	},
-/obj/item/storage/backpack/satchel/sec{
-	pixel_x = 5;
-	pixel_y = -8
+/obj/item/clothing/shoes/combat/gezena/marine{
+	pixel_y = -10;
+	pixel_x = 1
 	},
-/obj/item/clothing/shoes/combat/gezena{
-	pixel_x = 6;
-	pixel_y = 4
+/obj/item/clothing/shoes/combat/gezena/marine{
+	pixel_y = -10;
+	pixel_x = 1
 	},
-/obj/item/clothing/gloves/gezena/marine{
-	pixel_y = 11;
-	pixel_x = 7
+/obj/item/clothing/shoes/combat/gezena/marine{
+	pixel_y = -10;
+	pixel_x = 1
 	},
 /turf/open/floor/plasteel/dark,
 /area/ship/security/armory)
@@ -3364,15 +3438,9 @@
 /turf/open/floor/plasteel/mono/dark,
 /area/ship/bridge)
 "Uj" = (
-/obj/item/gun/energy/kalix/pistol{
-	pixel_y = -8
-	},
 /obj/item/gun/energy/kalix/pgf/medium{
 	pixel_y = 13
 	},
-/obj/item/gun/energy/kalix/pgf{
-	pixel_y = -1
-	},
 /obj/structure/rack,
 /obj/machinery/light/small/directional/west,
 /obj/structure/sign/poster/contraband/pgf{
@@ -3382,6 +3450,12 @@
 /obj/item/gun/energy/kalix/pgf{
 	pixel_y = 6
 	},
+/obj/item/gun/energy/kalix/pistol{
+	pixel_y = -8
+	},
+/obj/item/gun/energy/kalix/pgf{
+	pixel_y = 0
+	},
 /turf/open/floor/vault,
 /area/ship/security/armory)
 "Ur" = (
diff --git a/_maps/shuttles/pgf/pgf_woeful_cthonian.dmm b/_maps/shuttles/pgf/pgf_woeful_cthonian.dmm
index b6f8735f5c..9ac04bd933 100644
--- a/_maps/shuttles/pgf/pgf_woeful_cthonian.dmm
+++ b/_maps/shuttles/pgf/pgf_woeful_cthonian.dmm
@@ -79,10 +79,6 @@
 	pixel_y = 2;
 	pixel_x = 2
 	},
-/obj/item/clothing/suit/armor/gezena{
-	pixel_y = 1;
-	pixel_x = 2
-	},
 /obj/item/clothing/gloves/color/latex/nitrile{
 	pixel_x = 1;
 	pixel_y = -4
@@ -133,6 +129,7 @@
 	pixel_y = 7;
 	pixel_x = -3
 	},
+/obj/item/clothing/suit/armor/gezena/medic,
 /turf/open/floor/mineral/titanium/tiled,
 /area/ship/medical/surgery)
 "bw" = (
@@ -433,9 +430,14 @@
 	name = "engineer's locker"
 	},
 /obj/item/clothing/glasses/welding,
-/obj/item/clothing/suit/armor/gezena{
-	pixel_y = -4;
-	pixel_x = -11
+/obj/item/clothing/suit/armor/gezena/engi,
+/obj/item/clothing/head/gezena/engi{
+	pixel_y = -9;
+	pixel_x = -9
+	},
+/obj/item/clothing/head/gezena/flap/engi{
+	pixel_y = -7;
+	pixel_x = 9
 	},
 /turf/open/floor/plasteel/tech/techmaint,
 /area/ship/engineering)
@@ -1067,11 +1069,15 @@
 /area/ship/crew/ccommons)
 "jO" = (
 /obj/structure/guncloset,
-/obj/item/gun/energy/kalix/pistol,
-/obj/item/gun/energy/kalix/pistol,
+/obj/item/gun/energy/kalix/pistol{
+	pixel_y = 8
+	},
 /obj/item/gun/energy/kalix{
 	pixel_y = -8
 	},
+/obj/item/gun/energy/kalix/pistol{
+	pixel_y = 0
+	},
 /turf/open/floor/plasteel/rockvault,
 /area/ship/security/armory)
 "jQ" = (
@@ -1885,6 +1891,7 @@
 /obj/item/tank/jetpack/oxygen/harness,
 /obj/machinery/airalarm/directional/north,
 /obj/machinery/light/small/directional/west,
+/obj/item/tank/internals/oxygen/red,
 /turf/open/floor/plasteel/mono/dark,
 /area/ship/security/armory)
 "un" = (
@@ -1978,9 +1985,7 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 4
 	},
-/obj/structure/noticeboard{
-	pixel_y = 25
-	},
+/obj/machinery/computer/helm/viewscreen/directional/north,
 /turf/open/floor/plasteel/mono/dark,
 /area/ship/crew/ccommons)
 "vl" = (
@@ -2298,6 +2303,7 @@
 /obj/item/tank/jetpack/oxygen/harness,
 /obj/machinery/light/directional/east,
 /obj/machinery/firealarm/directional/north,
+/obj/item/tank/internals/oxygen/red,
 /turf/open/floor/plasteel/rockvault,
 /area/ship/security/armory)
 "yp" = (
@@ -2346,12 +2352,42 @@
 /obj/item/tank/internals/emergency_oxygen/engi,
 /obj/item/tank/internals/emergency_oxygen/engi,
 /obj/item/tank/internals/emergency_oxygen/engi,
-/obj/item/clothing/mask/breath,
-/obj/item/clothing/mask/breath,
-/obj/item/clothing/mask/breath,
-/obj/item/clothing/mask/breath,
-/obj/item/clothing/mask/gas,
-/obj/item/clothing/mask/gas,
+/obj/item/clothing/mask/breath/pgfmask{
+	pixel_y = -10
+	},
+/obj/item/clothing/mask/breath/pgfmask{
+	pixel_y = -10
+	},
+/obj/item/clothing/mask/breath/pgfmask{
+	pixel_y = -10
+	},
+/obj/item/clothing/mask/breath/pgfmask{
+	pixel_y = -10
+	},
+/obj/item/clothing/glasses/sunglasses/pgf{
+	pixel_y = 7
+	},
+/obj/item/clothing/glasses/sunglasses/pgf{
+	pixel_y = 7
+	},
+/obj/item/clothing/glasses/sunglasses/pgf{
+	pixel_y = 7
+	},
+/obj/item/clothing/glasses/sunglasses/pgf{
+	pixel_y = 7
+	},
+/obj/item/clothing/mask/breath/pgfmask{
+	pixel_y = -10
+	},
+/obj/item/clothing/mask/breath/pgfmask{
+	pixel_y = -10
+	},
+/obj/item/clothing/glasses/sunglasses/pgf{
+	pixel_y = 7
+	},
+/obj/item/clothing/glasses/sunglasses/pgf{
+	pixel_y = 7
+	},
 /turf/open/floor/plasteel/mono/dark,
 /area/ship/cargo)
 "zz" = (
@@ -2473,10 +2509,6 @@
 	pixel_y = 2;
 	pixel_x = 2
 	},
-/obj/item/clothing/suit/armor/gezena{
-	pixel_y = 1;
-	pixel_x = 2
-	},
 /obj/item/clothing/gloves/color/latex/nitrile{
 	pixel_x = 1;
 	pixel_y = -4
@@ -2529,6 +2561,7 @@
 	pixel_y = 4;
 	pixel_x = -9
 	},
+/obj/item/clothing/suit/armor/gezena/medic,
 /turf/open/floor/mineral/titanium/tiled,
 /area/ship/medical/surgery)
 "Aj" = (
@@ -2722,6 +2755,18 @@
 "CY" = (
 /turf/closed/wall/mineral/titanium/nodiagonal,
 /area/ship/medical/surgery)
+"Dg" = (
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/door/firedoor/border_only{
+	dir = 1
+	},
+/obj/machinery/door/poddoor/shutters{
+	id = "cth_cap"
+	},
+/obj/structure/window/reinforced/fulltile/shuttle,
+/obj/structure/grille,
+/turf/open/floor/plating,
+/area/ship/bridge)
 "Dt" = (
 /obj/effect/turf_decal/arrows,
 /obj/structure/sign/warning{
@@ -3048,6 +3093,8 @@
 /obj/machinery/door/firedoor/border_only,
 /obj/item/radio/headset/pgf,
 /obj/item/radio/headset/pgf,
+/obj/item/clothing/head/gezena/flap,
+/obj/item/clothing/head/gezena/flap,
 /turf/open/floor/plasteel/sepia,
 /area/ship/crew/dorm)
 "HA" = (
@@ -3323,6 +3370,10 @@
 "JT" = (
 /obj/machinery/washing_machine,
 /obj/machinery/light/small/directional/east,
+/obj/structure/noticeboard{
+	pixel_y = -25;
+	dir = 1
+	},
 /turf/open/floor/plasteel/tech,
 /area/ship/crew/ccommons)
 "JX" = (
@@ -3978,6 +4029,7 @@
 /obj/machinery/atmospherics/pipe/layer_manifold{
 	dir = 2
 	},
+/obj/item/tank/internals/oxygen/red,
 /turf/open/floor/engine/hull/interior,
 /area/ship/medical/surgery)
 "Td" = (
@@ -4100,33 +4152,68 @@
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/medical/surgery)
 "UM" = (
-/obj/effect/turf_decal/spline/fancy/opaque/black{
-	dir = 4
+/obj/structure/cable{
+	icon_state = "1-2"
 	},
-/obj/item/clothing/suit/armor/gezena/captain,
-/obj/item/clothing/neck/cloak/gezena/captain,
-/obj/item/clothing/gloves/gezena/captain,
-/obj/item/clothing/shoes/combat/gezena{
-	pixel_y = -8;
-	pixel_x = 5
+/obj/structure/closet/secure_closet{
+	icon_state = "blueshield";
+	req_access = list(20);
+	name = "captain's locker"
+	},
+/obj/item/storage/lockbox/medal{
+	pixel_y = -6;
+	pixel_x = null
 	},
-/obj/machinery/light/small/directional/west,
 /obj/item/storage/backpack/satchel/cap{
-	pixel_y = -11;
+	pixel_y = -3;
 	pixel_x = -8
 	},
 /obj/item/storage/backpack/duffelbag/captain{
 	pixel_x = 6;
 	pixel_y = -5
 	},
-/obj/item/radio/headset/pgf/alt/captain,
-/obj/item/storage/lockbox/medal,
-/obj/item/radio/headset/pgf/captain,
-/obj/item/storage/belt/sabre,
-/obj/structure/closet/secure_closet/captains{
-	populate = 0
+/obj/item/clothing/head/gezena/flap/captain{
+	pixel_y = 8;
+	pixel_x = 8
+	},
+/obj/item/clothing/under/gezena/captain{
+	pixel_y = 2;
+	pixel_x = -8
+	},
+/obj/item/clothing/suit/armor/gezena/captain{
+	pixel_y = 2;
+	pixel_x = 8
+	},
+/obj/item/storage/guncase/pistol/kalixpistol{
+	pixel_y = -15;
+	pixel_x = -1
+	},
+/obj/item/clothing/shoes/combat/gezena{
+	pixel_y = -7;
+	pixel_x = -11
+	},
+/obj/item/clothing/neck/cloak/gezena/captain{
+	pixel_y = 2;
+	pixel_x = 3
+	},
+/obj/item/clothing/gloves/gezena/captain{
+	pixel_y = -10
+	},
+/obj/item/storage/belt/sabre/pgf{
+	pixel_y = -6;
+	pixel_x = -2
+	},
+/obj/item/radio/headset/pgf/alt/captain{
+	pixel_x = 10;
+	pixel_y = -4
+	},
+/obj/item/radio/headset/pgf/captain{
+	pixel_x = -10;
+	pixel_y = -8
+	},
+/obj/effect/turf_decal/spline/fancy/opaque/black{
+	dir = 4
 	},
-/obj/item/storage/guncase/pistol/kalixpistol,
 /obj/item/megaphone/command,
 /turf/open/floor/plasteel/tech,
 /area/ship/bridge)
@@ -4314,6 +4401,8 @@
 /obj/machinery/door/firedoor/border_only,
 /obj/item/radio/headset/pgf,
 /obj/item/radio/headset/pgf,
+/obj/item/clothing/head/gezena,
+/obj/item/clothing/head/gezena,
 /turf/open/floor/plasteel/sepia,
 /area/ship/crew/dorm)
 "Xd" = (
@@ -5236,7 +5325,7 @@ hQ
 jn
 fu
 UM
-TH
+Dg
 "}
 (36,1,1) = {"
 Ua
diff --git a/_maps/shuttles/pirate/pirate_tortuga.dmm b/_maps/shuttles/pirate/pirate_tortuga.dmm
index e5d0d45a34..b897ac9bda 100644
--- a/_maps/shuttles/pirate/pirate_tortuga.dmm
+++ b/_maps/shuttles/pirate/pirate_tortuga.dmm
@@ -1,12 +1,30 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"aa" = (
+/obj/effect/turf_decal/borderfloor{
+	dir = 1
+	},
+/obj/machinery/firealarm/directional/north,
+/obj/effect/turf_decal/siding/thinplating/dark,
+/turf/open/floor/plasteel/tech/techmaint,
+/area/ship/cargo)
 "ah" = (
 /turf/closed/wall/r_wall/rust,
 /area/ship/bridge)
+"ao" = (
+/obj/machinery/door/airlock/hatch{
+	id_tag = "toilet2";
+	name = "Stall Two"
+	},
+/turf/open/floor/plasteel/showroomfloor,
+/area/ship/crew/toilet)
 "aA" = (
 /obj/structure/grille,
 /obj/structure/window/reinforced/fulltile,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /obj/machinery/door/firedoor/window,
+/obj/machinery/door/poddoor/shutters{
+	id = "pmaint_shutter"
+	},
 /turf/open/floor/plating,
 /area/ship/maintenance/port)
 "aE" = (
@@ -19,6 +37,7 @@
 /obj/machinery/door/firedoor/border_only{
 	dir = 8
 	},
+/obj/effect/turf_decal/siding/thinplating/dark,
 /turf/open/floor/plasteel/mono,
 /area/ship/cargo)
 "aT" = (
@@ -34,34 +53,64 @@
 /obj/structure/catwalk/over/plated_catwalk,
 /turf/open/floor/plating,
 /area/ship/cargo)
-"bj" = (
-/obj/machinery/light/directional/north,
-/obj/structure/rack,
-/obj/item/book/manual/wiki/command{
-	pixel_x = -8;
-	pixel_y = 6
+"aV" = (
+/obj/machinery/chem_press,
+/obj/structure/table/wood,
+/turf/open/floor/plating{
+	icon_state = "plating_rust"
 	},
-/obj/item/book/manual/wiki/piloting{
-	pixel_y = 5;
+/area/ship/maintenance)
+"be" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/portable_atmospherics/canister/chlorine,
+/turf/open/floor/plating{
+	icon_state = "plating_rust"
+	},
+/area/ship/maintenance)
+"bi" = (
+/obj/effect/turf_decal/siding/wood,
+/obj/item/clothing/under/frontiersmen/officer{
 	pixel_x = -5
 	},
-/obj/item/areaeditor/shuttle,
-/turf/open/floor/plasteel/tech,
-/area/ship/bridge)
-"bu" = (
-/obj/machinery/door/poddoor/shutters{
-	dir = 4;
-	id = "watchdog_cargo"
+/obj/item/clothing/shoes/jackboots{
+	pixel_y = -13
 	},
-/obj/structure/cable/yellow{
-	icon_state = "0-4"
+/obj/item/clothing/head/frontier/peaked{
+	pixel_y = 9
 	},
-/obj/machinery/power/shieldwallgen/atmos/roundstart{
-	id = "tortuga_holo"
+/obj/item/clothing/suit/armor/frontier{
+	pixel_x = 8
 	},
-/turf/open/floor/plating,
-/area/ship/cargo)
-"bv" = (
+/obj/item/clothing/suit/armor/frontier{
+	pixel_x = 8
+	},
+/obj/item/clothing/under/frontiersmen/officer{
+	pixel_x = -5
+	},
+/obj/item/clothing/head/frontier/peaked{
+	pixel_y = 9
+	},
+/obj/item/clothing/shoes/jackboots{
+	pixel_y = -13
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/item/ammo_box/a357,
+/obj/item/ammo_box/a357,
+/obj/item/storage/box/ammo/a357,
+/obj/item/blackmarket_uplink,
+/obj/item/megaphone,
+/obj/item/storage/pouch/squad,
+/obj/item/radio/headset/pirate/alt/captain,
+/obj/structure/closet/secure_closet/cabinet{
+	req_access_txt = "20"
+	},
+/turf/open/floor/carpet/nanoweave,
+/area/ship/crew/crewtwo)
+"bj" = (
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/crayon{
 	icon_state = "skull";
 	pixel_x = 4;
@@ -82,86 +131,133 @@
 	pixel_x = 12;
 	pixel_y = -6
 	},
-/turf/open/floor/plating/airless{
-	icon_state = "plating_rust"
+/turf/open/floor/plating,
+/area/ship/maintenance/aft)
+"bu" = (
+/obj/machinery/door/poddoor/shutters{
+	dir = 4;
+	id = "watchdog_cargo"
 	},
-/area/ship/maintenance)
-"bD" = (
 /obj/structure/cable/yellow{
-	icon_state = "4-8"
+	icon_state = "0-4"
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+/obj/machinery/power/shieldwallgen/atmos/roundstart{
+	id = "tortuga_holo"
+	},
+/turf/open/floor/plating,
+/area/ship/cargo)
+"bv" = (
+/obj/effect/turf_decal/siding/wood/corner{
 	dir = 8
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+/turf/open/floor/wood,
+/area/ship/crew/ccommons)
+"bx" = (
+/obj/effect/turf_decal/box/corners{
 	dir = 4
 	},
-/obj/effect/turf_decal/siding/wideplating,
-/obj/machinery/light/directional/south,
-/turf/open/floor/plasteel,
-/area/ship/crew/canteen)
-"bF" = (
-/obj/structure/table,
-/obj/effect/turf_decal/siding/wideplating{
+/obj/structure/tank_dispenser/oxygen,
+/obj/machinery/airalarm/directional/east,
+/obj/effect/turf_decal/siding/thinplating/dark{
 	dir = 1
 	},
-/obj/item/storage/bag/tray/cafeteria{
-	pixel_y = 3
+/turf/open/floor/plasteel/mono,
+/area/ship/cargo)
+"bD" = (
+/obj/structure/cable/yellow{
+	icon_state = "2-4"
 	},
-/obj/item/storage/bag/tray/cafeteria{
-	pixel_y = 5
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 1
 	},
-/obj/item/storage/bag/tray/cafeteria{
-	pixel_y = 7
+/obj/effect/turf_decal/borderfloor,
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+	dir = 1
 	},
-/obj/item/storage/bag/tray/cafeteria{
-	pixel_y = 9
+/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4,
+/obj/structure/cable/yellow{
+	icon_state = "2-8"
+	},
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/crew/canteen)
+"bF" = (
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 4
 	},
-/obj/item/storage/bag/tray/cafeteria{
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/crew/canteen)
+"bH" = (
+/obj/effect/decal/cleanable/crayon{
+	icon_state = "c";
+	pixel_x = -10;
 	pixel_y = 11
 	},
-/obj/item/storage/bag/tray/cafeteria{
-	pixel_y = 13
+/obj/effect/decal/cleanable/crayon{
+	icon_state = "l";
+	pixel_y = 8
 	},
-/obj/item/storage/bag/tray/cafeteria{
-	pixel_y = 15
+/obj/effect/decal/cleanable/crayon{
+	icon_state = "i";
+	pixel_x = 7;
+	pixel_y = 10
 	},
-/obj/machinery/light_switch{
-	pixel_y = 22
+/obj/effect/decal/cleanable/crayon{
+	icon_state = "p";
+	pixel_x = 16;
+	pixel_y = 9
 	},
-/turf/open/floor/plasteel/patterned/grid,
-/area/ship/crew/canteen)
-"bH" = (
-/obj/structure/salvageable/autolathe,
-/obj/effect/decal/cleanable/glass,
-/turf/open/floor/plating/airless,
-/area/ship/maintenance)
-"bJ" = (
-/obj/machinery/door/airlock/grunge{
-	req_one_access = list(1)
+/turf/open/floor/plating,
+/area/ship/maintenance/aft)
+"bI" = (
+/obj/machinery/shower{
+	dir = 1
 	},
+/obj/effect/turf_decal/techfloor/hole/right,
+/obj/effect/turf_decal/techfloor/hole,
+/turf/open/floor/plasteel/showroomfloor,
+/area/ship/crew/toilet)
+"bJ" = (
 /obj/structure/cable/yellow{
 	icon_state = "1-2"
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/turf/open/floor/plating,
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/door/firedoor/border_only{
+	dir = 1
+	},
+/obj/effect/turf_decal/corner/opaque/black{
+	dir = 1
+	},
+/obj/effect/turf_decal/corner/opaque/black{
+	dir = 4
+	},
+/obj/machinery/door/airlock/grunge{
+	req_one_access = list(1);
+	id_tag = "armory"
+	},
+/turf/open/floor/plating/rust,
 /area/ship/security/armory)
 "bN" = (
-/obj/machinery/holopad/emergency/command,
 /obj/effect/decal/cleanable/dirt,
+/obj/structure/chair/comfy/shuttle{
+	dir = 8
+	},
 /turf/open/floor/plasteel/tech,
 /area/ship/bridge)
 "bP" = (
 /obj/structure/grille,
 /obj/structure/window/reinforced/fulltile,
 /obj/machinery/door/firedoor/window,
+/obj/machinery/door/poddoor/shutters{
+	id = "smaint_shutter"
+	},
 /turf/open/floor/plating,
 /area/ship/maintenance/starboard)
 "bR" = (
-/obj/effect/spawner/random/trash/decal,
-/turf/open/floor/plating/airless,
-/area/ship/maintenance)
+/obj/machinery/light/directional/south,
+/turf/open/floor/holofloor/carpet,
+/area/ship/crew/ccommons)
 "cb" = (
 /obj/effect/turf_decal/spline/fancy/opaque/black/corner{
 	dir = 1
@@ -214,14 +310,6 @@
 /obj/machinery/light/directional/north,
 /turf/open/floor/wood,
 /area/ship/crew/crewtwo)
-"cz" = (
-/obj/effect/turf_decal/siding/wideplating{
-	dir = 9
-	},
-/obj/machinery/light/directional/north,
-/obj/structure/reagent_dispensers/water_cooler,
-/turf/open/floor/plasteel/patterned/grid,
-/area/ship/crew/canteen)
 "cG" = (
 /obj/structure/chair/stool{
 	dir = 8
@@ -231,26 +319,34 @@
 /turf/open/floor/plasteel/grimy,
 /area/ship/crew/canteen)
 "cS" = (
-/obj/structure/flippedtable{
-	dir = 8
+/obj/structure/chair/stool/bar,
+/turf/open/floor/wood{
+	icon_state = "wood-broken5"
 	},
-/obj/structure/fluff/paper/stack{
-	pixel_x = 9
+/area/ship/crew/ccommons)
+"dj" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 5
 	},
-/turf/open/floor/plating/airless,
-/area/ship/maintenance)
-"dl" = (
-/obj/effect/turf_decal/siding/wideplating/corner{
-	dir = 8
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 5
 	},
-/obj/effect/turf_decal/siding/wideplating/corner{
-	dir = 1
+/obj/structure/cable/yellow{
+	icon_state = "1-4"
 	},
-/turf/open/floor/plasteel,
+/obj/structure/catwalk/over/plated_catwalk/dark,
+/turf/open/floor/plating,
 /area/ship/crew/canteen)
 "dm" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/mineral/titanium,
+/obj/structure/chair/plastic{
+	dir = 1
+	},
+/obj/effect/turf_decal/corner/opaque/black{
+	dir = 4
+	},
+/turf/open/floor/plating{
+	icon_state = "plating_rust"
+	},
 /area/ship/security/armory)
 "ds" = (
 /obj/machinery/door/poddoor/shutters{
@@ -276,14 +372,25 @@
 /obj/structure/chair/sofa/brown/old/right{
 	dir = 1
 	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /turf/open/floor/plasteel/tech,
 /area/ship/maintenance/port)
 "dF" = (
+/obj/effect/spawner/random/trash/decal,
+/obj/effect/turf_decal/siding/wood{
+	dir = 8
+	},
 /obj/structure/cable/yellow{
-	icon_state = "2-8"
+	icon_state = "4-8"
 	},
-/turf/open/floor/plating/airless,
-/area/ship/maintenance)
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 8
+	},
+/turf/open/floor/wood,
+/area/ship/crew/ccommons)
 "dN" = (
 /obj/structure/catwalk/over/plated_catwalk,
 /obj/structure/railing/corner{
@@ -298,15 +405,13 @@
 /turf/open/floor/plating,
 /area/ship/cargo)
 "dV" = (
-/obj/structure/toilet{
-	dir = 4;
-	pixel_x = -2;
-	pixel_y = 5
-	},
-/obj/machinery/shower,
 /obj/machinery/light/directional/west,
-/obj/structure/curtain/cloth,
-/turf/open/floor/plating,
+/obj/effect/turf_decal/corner/opaque/black{
+	dir = 1
+	},
+/turf/open/floor/plating{
+	icon_state = "plating_rust"
+	},
 /area/ship/security/armory)
 "dX" = (
 /obj/structure/railing/corner{
@@ -333,12 +438,12 @@
 /turf/open/floor/pod/dark,
 /area/ship/maintenance/port)
 "dZ" = (
-/obj/effect/turf_decal/industrial/stand_clear{
-	dir = 4
-	},
 /obj/structure/cable/yellow{
 	icon_state = "1-2"
 	},
+/obj/effect/turf_decal/siding/thinplating/dark/end{
+	dir = 8
+	},
 /turf/open/floor/plasteel/tech/techmaint,
 /area/ship/cargo)
 "em" = (
@@ -353,20 +458,37 @@
 /turf/open/floor/pod/dark,
 /area/ship/maintenance/port)
 "es" = (
-/obj/machinery/door/window/westright,
-/turf/open/floor/pod/dark,
-/area/ship/maintenance/starboard)
+/obj/structure/cable/yellow{
+	icon_state = "1-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/structure/cable/yellow{
+	icon_state = "1-10"
+	},
+/turf/open/floor/mineral/titanium/tiled,
+/area/ship/security/armory)
 "et" = (
+/obj/effect/spawner/random/trash/decal,
 /obj/structure/cable/yellow{
-	icon_state = "1-9"
+	icon_state = "4-8"
 	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating/airless,
+/obj/structure/cable/yellow{
+	icon_state = "2-8"
+	},
+/turf/open/floor/plating,
 /area/ship/maintenance)
 "eA" = (
-/obj/item/flashlight/flare,
-/turf/open/floor/plating/airless,
-/area/ship/maintenance)
+/obj/effect/decal/cleanable/vomit{
+	pixel_x = 8;
+	pixel_y = 14
+	},
+/obj/effect/turf_decal/borderfloor{
+	dir = 1
+	},
+/obj/effect/turf_decal/siding/thinplating/dark,
+/turf/open/floor/plasteel/tech/techmaint,
+/area/ship/crew/toilet)
 "eD" = (
 /obj/structure/railing/corner,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
@@ -392,18 +514,25 @@
 /turf/open/floor/plasteel/telecomms_floor,
 /area/ship/crew)
 "eU" = (
-/obj/effect/turf_decal/techfloor,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/light_switch{
-	dir = 4;
-	pixel_x = -22;
-	pixel_y = -10
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
 	},
-/obj/structure/salvageable/computer{
-	dir = 4
+/turf/open/floor/plating,
+/area/ship/maintenance)
+"eW" = (
+/obj/structure/cable{
+	icon_state = "0-4"
 	},
-/turf/open/floor/plasteel/tech,
-/area/ship/bridge)
+/obj/machinery/power/shuttle/engine/electric,
+/turf/open/floor/plating/airless,
+/area/ship/maintenance/starboard)
+"eZ" = (
+/obj/effect/turf_decal/siding/thinplating/dark/corner{
+	dir = 1
+	},
+/turf/open/floor/plasteel,
+/area/ship/crew)
 "ff" = (
 /obj/machinery/power/terminal{
 	dir = 4
@@ -425,12 +554,20 @@
 /obj/effect/decal/cleanable/wrapping{
 	pixel_y = -7
 	},
+/obj/effect/turf_decal/siding/thinplating/dark,
 /turf/open/floor/plasteel/mono,
 /area/ship/cargo)
+"fk" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable/yellow{
+	icon_state = "5-8"
+	},
+/turf/open/floor/plating,
+/area/ship/maintenance)
 "fn" = (
 /obj/effect/gibspawner/human/bodypartless,
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating/airless{
+/turf/open/floor/plating{
 	icon_state = "plating_rust"
 	},
 /area/ship/maintenance)
@@ -446,6 +583,9 @@
 	},
 /turf/open/floor/plating,
 /area/ship/cargo)
+"fv" = (
+/turf/closed/wall/r_wall/rust,
+/area/ship/cargo)
 "fA" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
 	dir = 1
@@ -456,34 +596,23 @@
 	},
 /turf/open/floor/plasteel/dark,
 /area/ship/maintenance/starboard)
-"fE" = (
-/obj/structure/cable/yellow{
-	icon_state = "0-9"
-	},
-/obj/structure/grille/broken,
-/obj/effect/decal/cleanable/crayon{
-	icon_state = "c";
-	pixel_x = -10;
-	pixel_y = 11
-	},
-/obj/effect/decal/cleanable/crayon{
-	icon_state = "l";
-	pixel_y = 8
+"fC" = (
+/obj/effect/turf_decal/siding/blue{
+	dir = 8
 	},
-/obj/effect/decal/cleanable/crayon{
-	icon_state = "i";
-	pixel_x = 7;
-	pixel_y = 10
+/obj/structure/chair/handrail{
+	dir = 1
 	},
-/obj/effect/decal/cleanable/crayon{
-	icon_state = "p";
-	pixel_x = 16;
-	pixel_y = 9
+/turf/open/floor/plasteel/white,
+/area/ship/medical)
+"fE" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 10
 	},
-/turf/open/floor/plating/airless{
-	icon_state = "plating_rust"
+/turf/open/floor/wood{
+	icon_state = "wood-broken3"
 	},
-/area/ship/maintenance)
+/area/ship/crew/ccommons)
 "fF" = (
 /obj/machinery/light/directional/south,
 /obj/effect/decal/cleanable/dirt,
@@ -506,19 +635,30 @@
 	},
 /turf/template_noop,
 /area/template_noop)
+"fU" = (
+/obj/structure/grille,
+/obj/structure/window/reinforced/fulltile,
+/obj/machinery/door/poddoor/shutters/preopen{
+	dir = 1;
+	id = "cell"
+	},
+/obj/structure/cable/yellow{
+	icon_state = "0-2"
+	},
+/turf/open/floor/plating,
+/area/ship/security/armory)
 "fW" = (
 /turf/open/floor/carpet/nanoweave,
 /area/ship/crew/crewtwo)
 "gi" = (
-/obj/machinery/door/airlock/grunge{
-	dir = 4
-	},
-/obj/effect/turf_decal/siding/wideplating/corner{
-	dir = 4
+/obj/structure/window/reinforced/fulltile,
+/obj/machinery/door/poddoor/shutters/preopen{
+	dir = 4;
+	id = "flyboy"
 	},
-/obj/effect/turf_decal/siding/wideplating/corner,
-/turf/open/floor/plasteel/showroomfloor,
-/area/ship/crew/canteen)
+/obj/structure/grille,
+/turf/open/floor/plating,
+/area/ship/crew/office)
 "gr" = (
 /obj/machinery/door/airlock/maintenance,
 /obj/structure/cable/yellow{
@@ -556,10 +696,18 @@
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/security/armory)
 "gG" = (
-/obj/effect/spawner/random/trash/decal,
-/obj/effect/decal/cleanable/glass,
-/turf/open/floor/plating/airless,
-/area/ship/maintenance)
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 5
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/turf/open/floor/plating,
+/area/ship/crew/toilet)
 "gI" = (
 /obj/machinery/power/apc/auto_name/directional/north,
 /obj/structure/cable/yellow{
@@ -567,25 +715,52 @@
 	},
 /turf/open/floor/pod/dark,
 /area/ship/maintenance/starboard)
+"gK" = (
+/obj/machinery/light/small/directional/north,
+/obj/structure/toilet{
+	pixel_x = 0;
+	pixel_y = 10
+	},
+/obj/machinery/button/door{
+	dir = 4;
+	pixel_x = -24;
+	id = "toilet1";
+	name = "privacy lock";
+	normaldoorcontrol = 1
+	},
+/turf/open/floor/plasteel/showroomfloor,
+/area/ship/crew/toilet)
 "gM" = (
 /obj/structure/cable/yellow{
 	icon_state = "1-4"
 	},
 /obj/effect/decal/cleanable/dirt,
+/obj/structure/chair/comfy/grey/old/directional/south,
 /turf/open/floor/carpet/nanoweave,
 /area/ship/crew/crewtwo)
 "gQ" = (
-/obj/effect/turf_decal/siding/wideplating{
-	dir = 4
+/obj/machinery/firealarm/directional/east,
+/obj/structure/table,
+/obj/machinery/microwave{
+	pixel_y = 6;
+	pixel_x = -1
 	},
-/obj/structure/chair{
-	dir = 8
+/obj/effect/turf_decal/corner/opaque/bar,
+/obj/effect/turf_decal/corner/opaque/bar{
+	dir = 1
 	},
 /turf/open/floor/plasteel,
 /area/ship/crew/canteen)
 "hh" = (
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating/airless{
+/obj/machinery/power/apc/auto_name/directional/south,
+/obj/machinery/light_switch{
+	dir = 1;
+	pixel_x = -9;
+	pixel_y = -16
+	},
+/obj/structure/cable/yellow,
+/turf/open/floor/plating{
 	icon_state = "plating_rust"
 	},
 /area/ship/maintenance)
@@ -599,18 +774,37 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 10
 	},
-/turf/open/floor/plasteel,
+/obj/effect/turf_decal/siding/white{
+	dir = 4
+	},
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 8
+	},
+/turf/open/floor/plasteel/mono/dark,
 /area/ship/crew/canteen)
 "hz" = (
-/obj/machinery/suit_storage_unit/industrial{
-	suit_type = /obj/item/clothing/suit/space/hardsuit/security/independent/frontier
-	},
 /obj/effect/decal/cleanable/dirt,
+/obj/machinery/suit_storage_unit/frontiersmen/locked,
 /turf/open/floor/mineral/plastitanium,
 /area/ship/security/armory)
+"hC" = (
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/obj/structure/cable/yellow{
+	icon_state = "1-4"
+	},
+/obj/structure/cable/yellow{
+	icon_state = "4-9"
+	},
+/obj/effect/spawner/bunk_bed,
+/turf/open/floor/plasteel/dark,
+/area/ship/security/armory)
 "hD" = (
 /obj/machinery/door/airlock/command{
-	dir = 4
+	dir = 4;
+	id_tag = "bridge_door";
+	req_one_access = list(19)
 	},
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
@@ -629,6 +823,17 @@
 	},
 /turf/open/floor/plasteel/tech,
 /area/ship/bridge)
+"hE" = (
+/obj/effect/turf_decal/siding/wood/corner{
+	dir = 4
+	},
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/turf/open/floor/wood{
+	icon_state = "wood-broken5"
+	},
+/area/ship/crew/ccommons)
 "hG" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /turf/open/floor/mineral/titanium/tiled,
@@ -651,87 +856,88 @@
 /obj/effect/turf_decal/techfloor{
 	dir = 10
 	},
-/obj/structure/guncloset{
-	anchored = 1
-	},
-/obj/item/gun/ballistic/automatic/assault/skm/pirate,
-/obj/item/gun/ballistic/rifle/illestren,
-/obj/item/gun/ballistic/rifle/illestren,
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/security/armory)
 "hT" = (
-/obj/machinery/suit_storage_unit/industrial{
-	suit_type = /obj/item/clothing/suit/space/hardsuit/security/independent/frontier
-	},
 /obj/machinery/light/directional/south,
+/obj/machinery/suit_storage_unit/frontiersmen/locked,
 /turf/open/floor/mineral/plastitanium,
 /area/ship/security/armory)
 "hU" = (
-/obj/structure/rack,
-/obj/item/storage/box/ammo/c45,
-/obj/item/storage/toolbox/ammo/a762_40{
-	pixel_x = 5;
-	pixel_y = 6
-	},
-/obj/item/storage/toolbox/ammo/a850r{
-	pixel_x = -6;
-	pixel_y = 2
+/obj/structure/cable/yellow{
+	icon_state = "2-8"
 	},
-/obj/item/ammo_box/magazine/m45{
-	pixel_x = 5
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 10
 	},
-/obj/item/ammo_box/magazine/m45{
-	pixel_x = 5
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+	dir = 8
 	},
-/obj/item/ammo_box/magazine/m45{
-	pixel_x = 5
+/turf/open/floor/wood,
+/area/ship/crew/ccommons)
+"if" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/siding/red{
+	dir = 8
 	},
-/obj/item/ammo_box/magazine/m45{
-	pixel_x = 5
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
 	},
-/obj/item/ammo_box/magazine/m45{
-	pixel_x = 5
+/turf/open/floor/mineral/titanium,
+/area/ship/security/armory)
+"ik" = (
+/obj/effect/turf_decal/techfloor{
+	dir = 4
 	},
-/obj/item/ammo_box/magazine/m45{
-	pixel_x = 5
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
 	},
-/obj/item/ammo_box/magazine/skm_762_40{
-	pixel_x = 5
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 5
 	},
-/obj/item/ammo_box/magazine/skm_762_40{
-	pixel_y = -3
+/obj/structure/cable/yellow{
+	icon_state = "1-4"
 	},
-/turf/open/floor/mineral/plastitanium,
-/area/ship/security/armory)
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/office)
 "iq" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 9
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 8
 	},
-/obj/machinery/light/directional/south,
-/turf/open/floor/plasteel,
-/area/ship/crew)
-"iw" = (
-/obj/effect/turf_decal/siding/wideplating,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
-/area/ship/crew/canteen)
+/turf/open/floor/plasteel/tech/techmaint,
+/area/ship/cargo)
 "iy" = (
 /obj/structure/cable/yellow{
 	icon_state = "6-10"
 	},
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating/airless{
+/obj/effect/spawner/random/decoration/glowstick/on,
+/obj/structure/sign/warning/nosmoking/burnt{
+	pixel_y = 27
+	},
+/turf/open/floor/plating{
 	icon_state = "plating_rust"
 	},
 /area/ship/maintenance)
 "iB" = (
-/obj/structure/cable/yellow{
-	icon_state = "1-2"
+/obj/structure/rack,
+/obj/item/storage/toolbox/ammo/c9mm{
+	pixel_x = -10;
+	pixel_y = 10
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/turf/open/floor/plasteel,
-/area/ship/crew/canteen)
+/obj/item/storage/toolbox/ammo/a308{
+	pixel_x = -10
+	},
+/obj/item/storage/toolbox/ammo/c9mm{
+	pixel_x = 10;
+	pixel_y = 10
+	},
+/obj/item/storage/toolbox/ammo/a308{
+	pixel_y = 0;
+	pixel_x = 10
+	},
+/turf/open/floor/mineral/plastitanium,
+/area/ship/security/armory)
 "iD" = (
 /obj/structure/cable/yellow{
 	icon_state = "1-2"
@@ -747,13 +953,21 @@
 	},
 /turf/open/floor/pod/dark,
 /area/ship/maintenance/port)
+"iI" = (
+/obj/structure/closet/secure_closet/wall/directional/north,
+/obj/item/towel,
+/turf/open/floor/plasteel/tech/techmaint,
+/area/ship/crew/toilet)
 "iN" = (
 /obj/structure/closet/crate{
 	icon_state = "o2crate"
 	},
 /obj/item/melee/spear/explosive,
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating/airless,
+/obj/effect/spawner/random/medical/chem_jug,
+/obj/effect/spawner/random/medical/chem_jug,
+/obj/effect/spawner/random/medical/chem_jug,
+/turf/open/floor/plating,
 /area/ship/maintenance)
 "iP" = (
 /obj/machinery/power/port_gen/pacman{
@@ -767,21 +981,33 @@
 /turf/open/floor/pod/dark,
 /area/ship/maintenance/port)
 "iW" = (
-/turf/open/floor/plasteel/white,
-/area/ship/crew/canteen)
-"iY" = (
-/obj/machinery/microwave{
-	pixel_y = 6;
-	pixel_x = -1
+/obj/machinery/computer/helm/viewscreen/directional/west,
+/obj/structure/bed{
+	dir = 1
 	},
-/obj/structure/table,
-/obj/effect/turf_decal/siding/wideplating{
+/obj/structure/curtain,
+/obj/effect/decal/cleanable/blood/old,
+/obj/effect/turf_decal/corner/opaque/blue{
 	dir = 1
 	},
+/turf/open/floor/plating{
+	icon_state = "plating_rust"
+	},
+/area/ship/medical)
+"iY" = (
 /obj/structure/sign/poster/retro/build{
 	pixel_y = 32
 	},
-/turf/open/floor/plasteel/patterned/grid,
+/obj/effect/turf_decal/siding/thinplating/dark/corner{
+	dir = 8
+	},
+/obj/effect/turf_decal/borderfloor{
+	dir = 1
+	},
+/obj/effect/turf_decal/siding/white{
+	dir = 4
+	},
+/turf/open/floor/plasteel/mono/dark,
 /area/ship/crew/canteen)
 "ja" = (
 /obj/structure/railing,
@@ -800,58 +1026,75 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/pod/dark,
 /area/ship/maintenance/starboard)
-"jh" = (
-/obj/structure/cable/yellow{
-	icon_state = "1-2"
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 10
+"jd" = (
+/obj/structure/table/glass,
+/obj/effect/turf_decal/corner/opaque/blue/full,
+/obj/machinery/light_switch{
+	pixel_y = 22
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 6
+/obj/machinery/firealarm/directional/east,
+/obj/item/reagent_containers/food/drinks/bottle/whiskey{
+	pixel_y = 7;
+	pixel_x = -8
 	},
-/turf/open/floor/plasteel,
-/area/ship/crew)
-"jp" = (
-/obj/structure/window/reinforced{
-	dir = 8
+/obj/item/reagent_containers/food/drinks/bottle/whiskey{
+	pixel_y = 10;
+	pixel_x = -1
 	},
-/obj/machinery/power/smes/shuttle/precharged{
-	dir = 4
+/obj/item/melee/baton/cattleprod/loaded,
+/obj/item/stack/sticky_tape/surgical{
+	pixel_x = 7
 	},
-/obj/structure/cable{
-	icon_state = "0-8"
+/turf/open/floor/plasteel/white,
+/area/ship/medical)
+"jg" = (
+/obj/item/flashlight/glowstick/pink,
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
 	},
-/turf/open/floor/plasteel/tech,
-/area/ship/maintenance/starboard)
+/obj/effect/decal/cleanable/oil/slippery,
+/turf/open/floor/plating,
+/area/ship/maintenance/aft)
+"jh" = (
+/turf/open/floor/plasteel/tech/techmaint,
+/area/ship/crew/toilet)
+"jp" = (
+/obj/effect/decal/cleanable/glass,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/siding/thinplating/dark,
+/obj/effect/turf_decal/borderfloor{
+	dir = 1
+	},
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
+/turf/open/floor/plasteel/tech/techmaint,
+/area/ship/crew/toilet)
 "js" = (
-/obj/structure/cable/yellow{
-	icon_state = "5-8"
+/obj/machinery/button/door{
+	dir = 1;
+	pixel_y = -22;
+	id = "cell";
+	name = "cell lockdown"
 	},
-/turf/open/floor/plating/airless{
-	icon_state = "plating_rust"
+/obj/effect/turf_decal/siding/red{
+	dir = 8
 	},
-/area/ship/maintenance)
+/turf/open/floor/mineral/titanium,
+/area/ship/security/armory)
 "jt" = (
-/obj/machinery/telecomms/relay/preset/frontiersmen,
-/obj/machinery/door/window/southleft,
-/obj/structure/catwalk/over/plated_catwalk/dark,
-/turf/open/floor/plasteel/telecomms_floor,
-/area/ship/bridge)
-"jA" = (
-/obj/structure/railing,
-/obj/structure/cable{
-	icon_state = "2-4"
+/obj/structure/dresser{
+	dir = 1;
+	pixel_y = -5
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 9
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 9
+	dir = 5
 	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/pod/dark,
-/area/ship/maintenance/starboard)
+/obj/machinery/light/directional/south,
+/obj/effect/turf_decal/siding/thinplating/dark,
+/turf/open/floor/plasteel,
+/area/ship/crew)
+"jA" = (
+/turf/closed/wall/r_wall,
+/area/ship/maintenance/port)
 "jH" = (
 /obj/machinery/cryopod{
 	dir = 4
@@ -864,98 +1107,141 @@
 /turf/open/floor/plasteel/telecomms_floor,
 /area/ship/crew)
 "jJ" = (
-/obj/structure/table,
-/obj/effect/turf_decal/siding/wideplating{
-	dir = 1
-	},
-/obj/item/reagent_containers/glass/bowl{
-	pixel_y = 3;
-	w_class = 2
-	},
-/obj/item/reagent_containers/glass/bowl{
-	pixel_y = 5;
-	w_class = 2
-	},
-/obj/item/reagent_containers/glass/bowl{
-	pixel_y = 7;
-	w_class = 2
-	},
-/obj/item/reagent_containers/glass/bowl{
-	pixel_y = 9;
-	w_class = 2
-	},
-/obj/item/reagent_containers/glass/bowl{
-	pixel_y = 11;
-	w_class = 2
-	},
-/obj/item/reagent_containers/glass/bowl{
-	pixel_y = 13;
-	w_class = 2
-	},
-/turf/open/floor/plasteel/patterned/grid,
-/area/ship/crew/canteen)
+/turf/closed/wall/rust,
+/area/ship/maintenance/aft)
 "jK" = (
-/obj/machinery/power/shuttle/engine/electric/bad{
-	dir = 4
-	},
 /obj/structure/cable{
 	icon_state = "0-4"
 	},
+/obj/machinery/power/shuttle/engine/electric,
 /turf/open/floor/plating/airless,
 /area/ship/maintenance/port)
-"jV" = (
-/obj/structure/table,
-/obj/machinery/power/apc/auto_name/directional/north,
+"jQ" = (
+/obj/structure/grille,
+/obj/structure/window/reinforced/fulltile,
+/obj/machinery/door/poddoor/shutters/preopen{
+	dir = 4;
+	id = "cell"
+	},
 /obj/structure/cable/yellow{
 	icon_state = "0-4"
 	},
-/obj/machinery/recharger{
-	pixel_x = -8
-	},
-/obj/machinery/light_switch{
-	pixel_y = 20;
-	pixel_x = 12
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
 	},
-/turf/open/floor/mineral/plastitanium,
+/turf/open/floor/plating,
 /area/ship/security/armory)
+"jY" = (
+/obj/effect/spawner/random/trash/decal,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/light/small/directional/south,
+/turf/open/floor/plating{
+	icon_state = "plating_rust"
+	},
+/area/ship/maintenance)
 "kp" = (
 /obj/effect/spawner/random/maintenance,
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
 	},
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating/airless{
+/turf/open/floor/plating{
 	icon_state = "plating_rust"
 	},
 /area/ship/maintenance)
 "kv" = (
 /obj/effect/spawner/random/trash/decal,
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating/airless,
+/turf/open/floor/plating,
 /area/ship/maintenance)
-"kK" = (
+"kA" = (
 /obj/structure/cable/yellow{
-	icon_state = "1-6"
+	icon_state = "4-8"
 	},
-/turf/open/floor/plating/airless,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 1
+	},
+/obj/effect/turf_decal/borderfloor,
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/crew/canteen)
+"kK" = (
+/obj/effect/decal/cleanable/crayon{
+	icon_state = "radiation"
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/plasma,
+/turf/open/floor/plating,
 /area/ship/maintenance)
 "kO" = (
-/obj/structure/cable/yellow{
-	icon_state = "1-2"
+/obj/structure/chair/stool/bar,
+/obj/effect/turf_decal/siding/wood{
+	dir = 8
 	},
-/obj/effect/spawner/random/trash/grille_or_waste,
-/turf/open/floor/plating/airless,
-/area/ship/maintenance)
-"la" = (
-/obj/machinery/power/smes/shuttle/precharged{
+/turf/open/floor/wood,
+/area/ship/crew/ccommons)
+"kP" = (
+/obj/machinery/door/airlock/grunge{
+	dir = 4;
+	name = "Helmsman's Office";
+	req_access_txt = "57"
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 4
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 4
 	},
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/office)
+"kQ" = (
+/obj/structure/cable/yellow{
+	icon_state = "0-2"
+	},
+/obj/machinery/power/apc/auto_name/directional/north,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/light_switch{
+	pixel_y = 21;
+	pixel_x = -12
+	},
+/turf/open/floor/plating{
+	icon_state = "plating_rust"
+	},
+/area/ship/maintenance/aft)
+"kS" = (
+/obj/machinery/door/window/southleft,
+/obj/structure/catwalk/over/plated_catwalk/dark,
+/obj/machinery/ltsrbt,
+/obj/structure/sign/poster/retro/radio{
+	pixel_y = 32
+	},
+/turf/open/floor/plasteel/telecomms_floor,
+/area/ship/bridge)
+"la" = (
 /obj/structure/window/reinforced{
 	dir = 8
 	},
+/obj/machinery/power/smes/shuttle/precharged{
+	dir = 4
+	},
 /obj/structure/cable{
 	icon_state = "0-8"
 	},
+/obj/machinery/door/poddoor/shutters{
+	dir = 4;
+	id = "sboard_engine"
+	},
 /turf/open/floor/plasteel/tech,
 /area/ship/maintenance/starboard)
 "ld" = (
@@ -975,12 +1261,14 @@
 /obj/effect/turf_decal/borderfloor{
 	dir = 1
 	},
+/obj/effect/turf_decal/siding/thinplating/dark,
+/obj/structure/chair/handrail,
 /turf/open/floor/plasteel/tech/techmaint,
 /area/ship/cargo)
 "li" = (
 /obj/effect/spawner/random/maintenance,
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating/airless,
+/turf/open/floor/plating,
 /area/ship/maintenance)
 "lo" = (
 /obj/structure/catwalk/over/plated_catwalk,
@@ -995,6 +1283,14 @@
 	},
 /turf/open/floor/plasteel/tech/techmaint,
 /area/ship/cargo)
+"lz" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable/yellow{
+	icon_state = "1-4"
+	},
+/obj/effect/spawner/random/decoration/glowstick/on,
+/turf/open/floor/plating,
+/area/ship/maintenance/aft)
 "lE" = (
 /obj/effect/decal/fakelattice{
 	icon_state = "lattice-12"
@@ -1008,27 +1304,56 @@
 /turf/closed/mineral/ship,
 /area/ship/maintenance)
 "lQ" = (
-/obj/machinery/power/apc/auto_name/directional/east,
-/obj/structure/cable/yellow{
-	icon_state = "0-8"
+/obj/machinery/telecomms/hub{
+	autolinkers = list("hub","bus","relay","messaging","pirate","broadcasterB","receiverB");
+	id = "Frontiersmen Communications Hub";
+	network = "frontier_commnet"
 	},
-/turf/open/floor/plasteel,
-/area/ship/crew)
-"lY" = (
-/obj/structure/table,
-/obj/machinery/recharger{
-	pixel_x = 8
+/turf/open/floor/plating,
+/area/ship/maintenance/aft)
+"lV" = (
+/obj/item/storage/firstaid/brute{
+	pixel_y = 8;
+	pixel_x = 2
 	},
-/obj/machinery/light/directional/north,
-/turf/open/floor/mineral/plastitanium,
-/area/ship/security/armory)
-"mf" = (
-/obj/effect/spawner/random/trash/grille_or_waste,
-/obj/structure/cable/yellow{
-	icon_state = "5-9"
+/obj/item/storage/firstaid/fire{
+	pixel_x = -8;
+	pixel_y = 6
 	},
-/turf/open/floor/plating/airless,
-/area/ship/maintenance)
+/obj/item/clothing/accessory/armband/medblue{
+	pixel_y = -1;
+	pixel_x = -6
+	},
+/obj/item/clothing/gloves/color/latex{
+	pixel_y = -13
+	},
+/obj/item/storage/belt/medical/webbing{
+	pixel_y = 8;
+	pixel_x = 5
+	},
+/obj/item/clothing/head/soft,
+/obj/effect/turf_decal/siding/blue{
+	dir = 4
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/closet/wall/white/med{
+	pixel_y = -29
+	},
+/obj/item/storage/firstaid/medical,
+/obj/item/storage/firstaid/toxin{
+	pixel_x = -10
+	},
+/obj/item/reagent_containers/glass/bottle/dimorlin,
+/obj/item/reagent_containers/syringe,
+/obj/item/reagent_containers/glass/bottle/chitosan,
+/obj/item/reagent_containers/glass/bottle/chitosan,
+/obj/item/stack/medical/bone_gel/four,
+/turf/open/floor/plasteel/white,
+/area/ship/medical)
+"mf" = (
+/obj/structure/table,
+/turf/open/floor/plasteel/grimy,
+/area/ship/crew/canteen)
 "mg" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
 	dir = 4
@@ -1038,6 +1363,9 @@
 /obj/effect/turf_decal/siding/red{
 	dir = 4
 	},
+/obj/structure/chair/handrail{
+	dir = 1
+	},
 /turf/open/floor/mineral/titanium,
 /area/ship/security/armory)
 "ml" = (
@@ -1045,7 +1373,7 @@
 	icon_state = "1-8"
 	},
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating/airless,
+/turf/open/floor/plating,
 /area/ship/maintenance)
 "mp" = (
 /obj/structure/chair/stool{
@@ -1054,11 +1382,41 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plasteel/grimy,
 /area/ship/crew/canteen)
-"mu" = (
-/obj/effect/turf_decal/borderfloor,
-/obj/machinery/light/directional/south,
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ship/cargo)
+"mt" = (
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/door/airlock/grunge{
+	dir = 4
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 8
+	},
+/turf/open/floor/plasteel/tech/techmaint,
+/area/ship/crew/ccommons)
+"mu" = (
+/obj/effect/turf_decal/borderfloor,
+/obj/machinery/light/directional/south,
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 1
+	},
+/turf/open/floor/plasteel/tech/techmaint,
+/area/ship/cargo)
+"mv" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/telecomms/server/presets/pirate{
+	network = "frontier_commnet"
+	},
+/turf/open/floor/plating{
+	icon_state = "plating_rust"
+	},
+/area/ship/maintenance/aft)
 "mw" = (
 /turf/closed/wall/r_wall/rust,
 /area/ship/crew/crewtwo)
@@ -1069,13 +1427,17 @@
 /obj/structure/cable/yellow{
 	icon_state = "1-2"
 	},
-/obj/machinery/door/airlock/grunge,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /obj/effect/turf_decal/siding/wideplating/corner,
 /obj/effect/turf_decal/siding/wideplating/corner{
 	dir = 8
 	},
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/door/firedoor/border_only{
+	dir = 1
+	},
+/obj/machinery/door/airlock/grunge,
 /turf/open/floor/plasteel,
 /area/ship/crew)
 "mE" = (
@@ -1086,30 +1448,14 @@
 /obj/structure/closet/secure_closet{
 	icon_state = "sec";
 	name = "equipment locker";
-	req_access_txt = "1"
+	req_access_txt = "3"
 	},
 /obj/effect/turf_decal/box,
 /obj/item/clothing/head/helmet/bulletproof/x11/frontier{
 	pixel_y = 6;
 	pixel_x = 7
 	},
-/obj/item/clothing/suit/armor/vest/frontier{
-	pixel_y = -4;
-	pixel_x = 8
-	},
 /obj/machinery/light/directional/north,
-/obj/item/clothing/suit/armor/vest/frontier{
-	pixel_y = -4;
-	pixel_x = 8
-	},
-/obj/item/clothing/suit/armor/vest/frontier{
-	pixel_y = -4;
-	pixel_x = 8
-	},
-/obj/item/clothing/suit/armor/vest/frontier{
-	pixel_y = -4;
-	pixel_x = 8
-	},
 /obj/item/clothing/head/helmet/bulletproof/x11/frontier{
 	pixel_y = 6;
 	pixel_x = 7
@@ -1122,34 +1468,89 @@
 	pixel_y = 6;
 	pixel_x = 7
 	},
-/obj/item/storage/belt/military/assault{
+/obj/item/melee/knife/survival,
+/obj/item/melee/knife/survival,
+/obj/item/melee/knife/survival,
+/obj/item/melee/knife/survival,
+/obj/item/storage/belt/security/military/frontiersmen{
 	pixel_x = -4;
-	pixel_y = -11
+	pixel_y = -10
 	},
-/obj/item/storage/belt/military/assault{
+/obj/item/storage/belt/security/military/frontiersmen{
 	pixel_x = -4;
-	pixel_y = -11
+	pixel_y = -10
 	},
-/obj/item/storage/belt/military/assault{
+/obj/item/storage/belt/security/military/frontiersmen{
 	pixel_x = -4;
-	pixel_y = -11
+	pixel_y = -10
 	},
-/obj/item/storage/belt/military/assault{
+/obj/item/storage/belt/security/military/frontiersmen{
 	pixel_x = -4;
-	pixel_y = -11
+	pixel_y = -10
+	},
+/obj/item/clothing/suit/armor/vest/bulletproof/frontier{
+	pixel_x = 8;
+	pixel_y = -4
+	},
+/obj/item/clothing/suit/armor/vest/bulletproof/frontier{
+	pixel_x = 8;
+	pixel_y = -4
+	},
+/obj/item/clothing/suit/armor/vest/bulletproof/frontier{
+	pixel_x = 8;
+	pixel_y = -4
+	},
+/obj/item/clothing/suit/armor/vest/bulletproof/frontier{
+	pixel_x = 8;
+	pixel_y = -4
+	},
+/obj/item/flashlight/seclite,
+/obj/item/flashlight/seclite,
+/obj/item/flashlight/seclite,
+/obj/item/flashlight/seclite,
+/obj/item/clothing/head/helmet/bulletproof/x11/frontier{
+	pixel_y = 6;
+	pixel_x = 7
 	},
 /turf/open/floor/mineral/plastitanium,
 /area/ship/security/armory)
 "mZ" = (
-/obj/structure/curtain,
-/turf/open/floor/plasteel/white,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 10
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 10
+	},
+/obj/structure/cable/yellow{
+	icon_state = "2-8"
+	},
+/obj/structure/catwalk/over/plated_catwalk/dark,
+/obj/structure/sign/poster/retro/lasergun{
+	pixel_x = 32
+	},
+/turf/open/floor/plating{
+	icon_state = "plating_rust"
+	},
 /area/ship/crew/canteen)
 "nc" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plasteel/tech/techmaint,
 /area/ship/cargo)
 "ng" = (
-/turf/closed/wall/r_wall,
+/obj/effect/turf_decal/siding/thinplating/dark/corner{
+	dir = 4
+	},
+/obj/effect/turf_decal/borderfloor,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 8
+	},
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/turf/open/floor/plasteel/mono/dark,
 /area/ship/crew/canteen)
 "nt" = (
 /obj/structure/catwalk/over/plated_catwalk,
@@ -1175,29 +1576,19 @@
 /area/ship/cargo)
 "nv" = (
 /obj/structure/cable/yellow{
-	icon_state = "1-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 9
+	icon_state = "4-8"
 	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 9
-	},
-/turf/open/floor/plasteel,
-/area/ship/crew/canteen)
-"ny" = (
-/obj/effect/mob_spawn/human/corpse/frontier{
-	mob_type = /mob/living/carbon/human/species/moth
-	},
-/obj/effect/decal/cleanable/crayon{
-	icon_state = "body"
+	dir = 4
 	},
-/obj/item/clothing/mask/muzzle{
-	pixel_x = 10;
-	pixel_y = -10
+/obj/machinery/light/directional/south,
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 1
 	},
-/turf/open/floor/plating/airless,
-/area/ship/maintenance)
+/obj/effect/turf_decal/borderfloor,
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/crew/canteen)
 "nE" = (
 /obj/machinery/light_switch{
 	pixel_y = 20
@@ -1215,59 +1606,80 @@
 	},
 /obj/item/stack/sheet/metal/twenty,
 /obj/item/stack/sheet/glass/twenty,
+/obj/structure/crate_shelf,
+/obj/item/stack/sheet/mineral/wood/twentyfive,
 /turf/open/floor/plasteel/mono,
 /area/ship/cargo)
 "nV" = (
-/obj/structure/cable/yellow{
-	icon_state = "1-8"
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/siding/thinplating/dark,
+/obj/effect/turf_decal/siding/thinplating/dark/corner{
+	dir = 1
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/turf/open/floor/mineral/titanium/tiled,
-/area/ship/security/armory)
+/turf/open/floor/plasteel/tech/techmaint,
+/area/ship/cargo)
 "oe" = (
 /obj/effect/turf_decal/borderfloor{
 	dir = 1
 	},
 /obj/machinery/light/floor,
+/obj/effect/turf_decal/siding/thinplating/dark,
 /turf/open/floor/plasteel/tech/techmaint,
 /area/ship/cargo)
 "om" = (
+/obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/yellow{
-	icon_state = "4-10"
-	},
-/obj/structure/cable/yellow{
-	icon_state = "2-10"
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 6
+	icon_state = "5-10"
 	},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
-	dir = 8
+/turf/open/floor/plating{
+	icon_state = "plating_rust"
 	},
-/obj/effect/turf_decal/siding/wideplating,
-/obj/effect/turf_decal/siding/wideplating,
-/turf/open/floor/plasteel,
-/area/ship/crew/canteen)
+/area/ship/maintenance)
 "oq" = (
 /obj/effect/turf_decal/siding/wood,
 /obj/effect/decal/cleanable/dirt,
+/obj/machinery/firealarm/directional/east,
 /turf/open/floor/wood,
 /area/ship/crew/crewtwo)
+"ot" = (
+/obj/structure/cable/yellow{
+	icon_state = "0-2"
+	},
+/obj/effect/spawner/random/maintenance,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plating{
+	icon_state = "plating_rust"
+	},
+/area/ship/maintenance)
 "ov" = (
 /obj/structure/cable/yellow{
 	icon_state = "6-8"
 	},
 /obj/machinery/light/floor,
 /obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 8
+	},
 /turf/open/floor/plasteel/tech/techmaint,
 /area/ship/cargo)
 "oy" = (
-/obj/machinery/door/airlock/hatch,
-/obj/effect/mapping_helpers/airlock/locked,
-/obj/machinery/door/firedoor/heavy,
-/turf/open/floor/plating/airless,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/turf/open/floor/carpet,
 /area/ship/crew)
+"oB" = (
+/obj/effect/turf_decal/siding/thinplating/dark,
+/obj/machinery/light_switch{
+	pixel_y = 22
+	},
+/obj/effect/turf_decal/borderfloor{
+	dir = 1
+	},
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/crew/canteen)
 "oG" = (
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
@@ -1289,20 +1701,32 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/effect/turf_decal/siding/wideplating/corner{
-	dir = 4
-	},
-/obj/effect/turf_decal/siding/wideplating/corner{
+/obj/effect/turf_decal/siding/thinplating/dark,
+/obj/effect/turf_decal/borderfloor{
 	dir = 1
 	},
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/mono/dark,
 /area/ship/crew/canteen)
 "oK" = (
 /obj/effect/spawner/random/trash/grille_or_waste,
 /obj/effect/spawner/random/maintenance,
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating/airless,
+/turf/open/floor/plating,
 /area/ship/maintenance)
+"oO" = (
+/obj/machinery/telecomms/receiver/preset_left{
+	freq_listening = list(1359,1459);
+	autolinkers = list("receiverA","hub");
+	network = "frontier_commnet"
+	},
+/obj/machinery/power/deck_relay{
+	pixel_x = 1;
+	pixel_y = 21
+	},
+/turf/open/floor/plating{
+	icon_state = "plating_rust"
+	},
+/area/ship/maintenance/aft)
 "oS" = (
 /obj/effect/turf_decal/borderfloor,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
@@ -1311,6 +1735,9 @@
 	icon_state = "1-2"
 	},
 /obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 1
+	},
 /turf/open/floor/plasteel/tech/techmaint,
 /area/ship/cargo)
 "oU" = (
@@ -1341,6 +1768,7 @@
 	dir = 4
 	},
 /obj/structure/cable,
+/obj/machinery/light/directional/south,
 /turf/open/floor/plasteel/tech,
 /area/ship/maintenance/starboard)
 "pr" = (
@@ -1351,6 +1779,16 @@
 	},
 /turf/open/floor/plating,
 /area/ship/cargo)
+"pt" = (
+/obj/structure/railing,
+/obj/structure/cable{
+	icon_state = "2-4"
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
+/turf/open/floor/pod/dark,
+/area/ship/maintenance/starboard)
 "pA" = (
 /obj/structure/catwalk/over/plated_catwalk,
 /obj/effect/turf_decal/industrial/warning/fulltile,
@@ -1360,58 +1798,78 @@
 /turf/open/floor/plating,
 /area/ship/cargo)
 "pB" = (
-/obj/structure/closet/secure_closet/engineering_personal{
-	populate = 0
-	},
-/obj/item/storage/belt/utility/full/engi{
-	pixel_y = -9
-	},
-/obj/item/clothing/accessory/armband/engine{
-	pixel_y = 2;
-	pixel_x = -12
-	},
-/obj/item/clothing/accessory/armband/engine{
-	pixel_y = 2;
-	pixel_x = -12
+/turf/closed/wall/r_wall,
+/area/ship/crew/office)
+"pE" = (
+/obj/structure/cable/yellow{
+	icon_state = "2-4"
 	},
-/obj/item/clothing/glasses/welding{
-	pixel_x = 9
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
 	},
-/obj/item/storage/toolbox/electrical{
-	pixel_y = 14
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/oil,
+/turf/open/floor/plating,
+/area/ship/maintenance/aft)
+"pF" = (
+/turf/closed/wall/r_wall/rust,
+/area/ship/crew/toilet)
+"pP" = (
+/obj/effect/turf_decal/borderfloor,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/airalarm/directional/south,
+/obj/effect/turf_decal/siding/thinplating/dark/corner{
+	dir = 1
 	},
-/turf/open/floor/plasteel/tech,
-/area/ship/maintenance/port)
-"pE" = (
-/obj/effect/decal/cleanable/chem_pile{
-	pixel_x = 9
+/turf/open/floor/plasteel/tech/techmaint,
+/area/ship/cargo)
+"pW" = (
+/obj/effect/spawner/random/trash/grille_or_waste,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plating{
+	icon_state = "plating_rust"
 	},
-/turf/open/floor/plating/airless,
 /area/ship/maintenance)
 "qd" = (
-/turf/closed/wall,
-/area/ship/crew/canteen)
+/obj/structure/grille,
+/obj/structure/window/reinforced/fulltile,
+/obj/machinery/door/poddoor/shutters/preopen{
+	dir = 1;
+	id = "flyboy"
+	},
+/turf/open/floor/plating,
+/area/ship/crew/office)
 "qi" = (
 /obj/effect/spawner/random/trash/grille_or_waste,
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/crayon{
 	icon_state = "med"
 	},
-/turf/open/floor/plating/airless,
+/turf/open/floor/plating,
 /area/ship/maintenance)
 "qp" = (
-/obj/machinery/door/airlock/medical{
-	req_one_access = list(5)
+/obj/effect/turf_decal/siding/blue{
+	dir = 4
 	},
-/obj/machinery/door/firedoor/border_only,
-/obj/machinery/door/firedoor/border_only{
-	dir = 1
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 9
 	},
 /turf/open/floor/plasteel/white,
-/area/ship/crew/canteen)
+/area/ship/medical)
+"qq" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/item/towel,
+/obj/structure/closet/secure_closet/wall/directional/south,
+/turf/open/floor/plasteel/tech/techmaint,
+/area/ship/crew/toilet)
 "qu" = (
-/obj/machinery/door/window/brigdoor/eastleft,
-/turf/open/floor/plating,
+/turf/open/floor/plating{
+	icon_state = "plating_rust"
+	},
 /area/ship/security/armory)
 "qy" = (
 /obj/machinery/light/directional/north,
@@ -1425,36 +1883,65 @@
 /obj/effect/turf_decal/industrial/hatch,
 /turf/open/floor/pod/dark,
 /area/ship/maintenance/starboard)
+"qC" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable/yellow{
+	icon_state = "2-4"
+	},
+/turf/open/floor/plating,
+/area/ship/maintenance/aft)
 "qD" = (
 /turf/closed/wall/r_wall/rust,
 /area/ship/security/armory)
 "qE" = (
 /obj/structure/cable/yellow{
-	icon_state = "2-4"
+	icon_state = "1-2"
 	},
-/turf/open/floor/plating/airless,
-/area/ship/maintenance)
+/obj/structure/cable/yellow,
+/obj/structure/grille,
+/turf/open/floor/plating,
+/area/ship/maintenance/aft)
 "qI" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/effect/turf_decal/siding/thinplating/dark,
 /turf/open/floor/plasteel/tech/techmaint,
 /area/ship/cargo)
 "qM" = (
-/obj/effect/decal/cleanable/garbage{
-	pixel_y = 7;
-	pixel_x = 6
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable/yellow{
+	icon_state = "1-4"
 	},
-/turf/open/floor/plating/airless,
-/area/ship/maintenance)
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+	dir = 1
+	},
+/turf/open/floor/wood{
+	icon_state = "wood-broken2"
+	},
+/area/ship/crew/ccommons)
 "qT" = (
-/obj/structure/cable/yellow{
-	icon_state = "0-2"
+/obj/effect/turf_decal/techfloor,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/light_switch{
+	dir = 4;
+	pixel_x = -22;
+	pixel_y = -10
 	},
-/obj/effect/spawner/random/maintenance,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating/airless{
-	icon_state = "plating_rust"
+/obj/item/folder{
+	pixel_x = -6;
+	pixel_y = 5
 	},
-/area/ship/maintenance)
+/obj/item/folder{
+	pixel_x = -2;
+	pixel_y = 2
+	},
+/obj/item/multitool,
+/obj/structure/rack,
+/turf/open/floor/plasteel/tech,
+/area/ship/bridge)
 "ra" = (
 /obj/machinery/power/apc/auto_name/directional/south,
 /obj/structure/cable/yellow,
@@ -1470,60 +1957,141 @@
 /obj/item/flashlight/lamp{
 	pixel_x = -6
 	},
+/obj/machinery/button/door{
+	dir = 4;
+	pixel_x = -24;
+	id = "bridge_door";
+	name = "bridge lockdown";
+	normaldoorcontrol = 1
+	},
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
 "rd" = (
 /turf/closed/wall/r_wall,
 /area/ship/cargo)
+"ru" = (
+/obj/effect/turf_decal/borderfloor,
+/obj/machinery/firealarm/directional/south,
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 1
+	},
+/turf/open/floor/plasteel/tech/techmaint,
+/area/ship/cargo)
+"rB" = (
+/obj/structure/cable{
+	icon_state = "0-4"
+	},
+/obj/machinery/power/shuttle/engine/electric/bad,
+/turf/open/floor/plating/airless,
+/area/ship/maintenance/port)
+"rM" = (
+/obj/machinery/power/shuttle/engine/fire,
+/turf/open/floor/plating,
+/area/ship/maintenance/starboard)
 "rU" = (
 /turf/closed/wall/r_wall,
 /area/ship/crew)
 "rW" = (
-/obj/structure/cable/yellow{
-	icon_state = "5-10"
+/obj/effect/turf_decal/borderfloor{
+	dir = 1
 	},
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating/airless{
-	icon_state = "plating_rust"
+/obj/machinery/firealarm/directional/north,
+/obj/item/crowbar{
+	pixel_x = 21
 	},
-/area/ship/maintenance)
-"rY" = (
-/obj/effect/decal/cleanable/crayon{
-	icon_state = "!";
-	pixel_y = 6;
-	pixel_x = -7
+/obj/effect/turf_decal/siding/thinplating/dark/corner{
+	dir = 8
 	},
-/turf/open/floor/plating/airless,
-/area/ship/maintenance)
+/turf/open/floor/plasteel/tech/techmaint,
+/area/ship/cargo)
+"rY" = (
+/obj/effect/decal/cleanable/glass,
+/obj/structure/table/wood,
+/obj/effect/turf_decal/siding/wood,
+/turf/open/floor/wood,
+/area/ship/crew/ccommons)
 "so" = (
 /turf/closed/wall/rust,
 /area/ship/crew)
+"sr" = (
+/obj/machinery/power/smes/shuttle/precharged{
+	dir = 4
+	},
+/obj/structure/window/reinforced{
+	dir = 8
+	},
+/obj/structure/cable{
+	icon_state = "0-8"
+	},
+/obj/machinery/door/poddoor/shutters{
+	dir = 4;
+	id = "sboard_engine"
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/maintenance/starboard)
 "ss" = (
-/obj/machinery/light/directional/south,
-/obj/structure/closet/crate/bin,
+/obj/machinery/button/door{
+	dir = 1;
+	pixel_y = -22;
+	id = "smaint_shutter";
+	name = "bridge shutters"
+	},
+/obj/machinery/pipedispenser,
 /turf/open/floor/plasteel/tech,
 /area/ship/maintenance/starboard)
 "sA" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 6
 	},
+/obj/item/wrench{
+	pixel_y = 12;
+	pixel_x = 10
+	},
 /turf/open/floor/pod/dark,
 /area/ship/maintenance/starboard)
+"sC" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/crayon{
+	icon_state = "!";
+	pixel_y = 6;
+	pixel_x = -7
+	},
+/obj/effect/spawner/random/food_or_drink/donut,
+/turf/open/floor/plating{
+	icon_state = "plating_rust"
+	},
+/area/ship/maintenance/aft)
 "sM" = (
-/obj/structure/table,
-/obj/item/desk_flag/trans{
-	pixel_x = 9;
-	pixel_y = -6
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 1
+	},
+/obj/effect/turf_decal/spline/fancy/opaque/black{
+	dir = 1
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 1
+	},
+/obj/structure/catwalk/over/plated_catwalk/dark,
+/turf/open/floor/plating{
+	icon_state = "plating_rust"
 	},
-/turf/open/floor/plasteel/grimy,
 /area/ship/crew/canteen)
 "sQ" = (
 /turf/closed/wall,
 /area/ship/maintenance/starboard)
 "tb" = (
-/obj/structure/flippedtable,
-/turf/open/floor/plating/airless,
-/area/ship/maintenance)
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/catwalk/over/plated_catwalk,
+/turf/open/floor/plating,
+/area/ship/crew/toilet)
 "tc" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
@@ -1536,25 +2104,31 @@
 /turf/open/floor/pod/dark,
 /area/ship/maintenance/starboard)
 "td" = (
-/obj/structure/bonfire,
-/turf/open/floor/plating/airless,
-/area/ship/maintenance)
-"te" = (
-/obj/effect/turf_decal/siding/wideplating/corner{
-	dir = 1
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
-/area/ship/crew/canteen)
+/turf/closed/wall/r_wall/rust,
+/area/ship/maintenance/aft)
 "ti" = (
-/obj/effect/spawner/random/food_or_drink/donut,
-/turf/open/floor/plating/airless{
-	icon_state = "plating_rust"
+/obj/effect/turf_decal/siding/wood{
+	dir = 5
 	},
-/area/ship/maintenance)
+/obj/item/reagent_containers/glass/bucket{
+	name = "vomit bucket"
+	},
+/obj/effect/decal/cleanable/vomit/old,
+/obj/effect/decal/cleanable/garbage{
+	pixel_y = 7;
+	pixel_x = 6
+	},
+/turf/open/floor/wood,
+/area/ship/crew/ccommons)
 "tq" = (
-/turf/closed/wall,
-/area/ship/cargo)
+/obj/structure/grille,
+/obj/structure/window/reinforced/fulltile,
+/obj/machinery/door/poddoor/shutters/preopen{
+	dir = 4;
+	id = "flyboy"
+	},
+/turf/open/floor/plating,
+/area/ship/crew/office)
 "ts" = (
 /obj/item/storage/pill_bottle/floorpill/full{
 	pixel_x = 10;
@@ -1569,34 +2143,51 @@
 	pixel_x = 7
 	},
 /obj/structure/table/rolling,
-/turf/open/floor/plating/airless{
+/obj/structure/cable/yellow{
+	icon_state = "2-4"
+	},
+/turf/open/floor/plating{
 	icon_state = "platingdmg3"
 	},
 /area/ship/maintenance)
 "tu" = (
-/obj/structure/bed{
-	dir = 1
-	},
 /obj/structure/curtain/cloth,
-/obj/effect/spawner/random/bedsheet,
 /obj/structure/extinguisher_cabinet/directional/north,
+/obj/effect/spawner/bunk_bed,
 /turf/open/floor/carpet,
 /area/ship/crew)
-"tI" = (
-/obj/machinery/door/airlock/hatch,
-/obj/effect/mapping_helpers/airlock/locked,
-/obj/machinery/door/firedoor/heavy,
-/turf/open/floor/plating/airless,
+"tE" = (
+/obj/structure/grille,
+/obj/structure/window/reinforced/fulltile,
+/obj/machinery/door/poddoor/shutters/preopen{
+	dir = 4;
+	id = "cell"
+	},
+/obj/structure/cable/yellow{
+	icon_state = "0-6"
+	},
+/turf/open/floor/plating,
 /area/ship/security/armory)
+"tI" = (
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/structure/catwalk/over/plated_catwalk/dark,
+/turf/open/floor/plating,
+/area/ship/crew/canteen)
 "tL" = (
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
 	},
 /obj/effect/decal/cleanable/dirt,
-/obj/structure/chair/comfy/grey/old/directional/south,
 /turf/open/floor/carpet/nanoweave,
 /area/ship/crew/crewtwo)
 "tR" = (
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 4
+	},
 /turf/open/floor/plasteel/tech/techmaint,
 /area/ship/cargo)
 "tS" = (
@@ -1610,18 +2201,31 @@
 /turf/open/floor/plasteel/elevatorshaft,
 /area/ship/cargo)
 "tV" = (
-/obj/machinery/space_heater,
-/obj/effect/decal/cleanable/blood/gibs/old,
-/turf/open/floor/plating/airless,
-/area/ship/maintenance)
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/siding/thinplating/dark,
+/obj/effect/turf_decal/borderfloor{
+	dir = 1
+	},
+/obj/effect/decal/cleanable/crayon{
+	icon_state = "toilet";
+	pixel_y = 29
+	},
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
+/turf/open/floor/plasteel/tech/techmaint,
+/area/ship/crew/toilet)
 "ub" = (
 /obj/effect/turf_decal/techfloor,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 1
 	},
 /obj/effect/decal/cleanable/dirt,
+/obj/machinery/holopad/emergency/command,
 /turf/open/floor/plasteel/tech,
 /area/ship/bridge)
+"uf" = (
+/obj/structure/salvageable/computer,
+/turf/open/floor/plating,
+/area/ship/maintenance/aft)
 "uh" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
 	dir = 1
@@ -1630,21 +2234,12 @@
 /turf/open/floor/plasteel/tech/techmaint,
 /area/ship/cargo)
 "ut" = (
-/obj/structure/table/glass,
-/obj/item/reagent_containers/food/drinks/bottle/whiskey{
-	pixel_y = 10;
-	pixel_x = -1
-	},
-/obj/item/reagent_containers/food/drinks/bottle/whiskey{
-	pixel_y = 7;
-	pixel_x = -8
-	},
 /obj/effect/turf_decal/corner/opaque/blue/full,
-/obj/item/stack/tape{
-	pixel_x = 6
-	},
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/airalarm/directional/east,
 /turf/open/floor/plasteel/white,
-/area/ship/crew/canteen)
+/area/ship/medical)
 "ux" = (
 /obj/machinery/power/terminal{
 	dir = 8
@@ -1652,21 +2247,42 @@
 /obj/structure/cable/yellow{
 	icon_state = "0-4"
 	},
+/obj/machinery/button/door{
+	id = "sboard_engine";
+	pixel_y = 24
+	},
 /turf/open/floor/plasteel/tech,
 /area/ship/maintenance/starboard)
-"uC" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/chair/sofa/brown{
-	dir = 1;
-	icon_state = "brown_sofa_end_right"
-	},
-/turf/open/floor/wood,
-/area/ship/crew/crewtwo)
-"uE" = (
-/obj/effect/turf_decal/borderfloor{
-	dir = 1
+"uB" = (
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/obj/structure/catwalk/over/plated_catwalk/dark,
+/obj/structure/cable/yellow{
+	icon_state = "2-8"
+	},
+/turf/open/floor/plating,
+/area/ship/crew/canteen)
+"uC" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/chair/sofa/brown{
+	dir = 1;
+	icon_state = "brown_sofa_end_right"
+	},
+/turf/open/floor/wood,
+/area/ship/crew/crewtwo)
+"uE" = (
+/obj/effect/turf_decal/borderfloor{
+	dir = 1
 	},
 /obj/machinery/light/directional/north,
+/obj/effect/turf_decal/siding/thinplating/dark,
 /turf/open/floor/plasteel/tech/techmaint,
 /area/ship/cargo)
 "uG" = (
@@ -1723,15 +2339,22 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/maintenance/port)
 "uQ" = (
-/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 = 3000
-	},
 /obj/effect/turf_decal/industrial/hatch,
+/obj/machinery/power/ship_gravity,
+/obj/structure/cable/yellow{
+	icon_state = "0-2"
+	},
 /turf/open/floor/pod/dark,
 /area/ship/maintenance/starboard)
+"uX" = (
+/obj/item/chair/plastic{
+	pixel_x = 1;
+	pixel_y = 10
+	},
+/turf/open/floor/plating{
+	icon_state = "platingdmg3"
+	},
+/area/ship/maintenance)
 "va" = (
 /obj/structure/railing{
 	dir = 1
@@ -1750,22 +2373,44 @@
 /obj/machinery/light/directional/south,
 /turf/open/floor/pod/dark,
 /area/ship/maintenance/port)
+"vd" = (
+/obj/structure/table/wood,
+/obj/effect/turf_decal/siding/wood,
+/obj/item/reagent_containers/glass/rag,
+/turf/open/floor/wood,
+/area/ship/crew/ccommons)
 "vl" = (
 /turf/closed/wall/rust,
-/area/ship/crew/canteen)
+/area/ship/crew/office)
 "vm" = (
 /obj/effect/turf_decal/borderfloor{
 	dir = 1
 	},
 /obj/machinery/light/directional/north,
 /obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/siding/thinplating/dark,
 /turf/open/floor/plasteel/tech/techmaint,
 /area/ship/cargo)
+"vr" = (
+/obj/structure/fluff/paper/stack{
+	dir = 4;
+	pixel_y = 9;
+	layer = 2.79
+	},
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/flippedtable{
+	dir = 8
+	},
+/turf/open/floor/plating,
+/area/ship/maintenance/aft)
 "vD" = (
 /obj/structure/cable/yellow{
 	icon_state = "5-10"
 	},
-/turf/open/floor/plating/airless{
+/turf/open/floor/plating{
 	icon_state = "plating_rust"
 	},
 /area/ship/maintenance)
@@ -1780,6 +2425,12 @@
 /obj/structure/cable/yellow{
 	icon_state = "2-4"
 	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
 /turf/open/floor/pod/dark,
 /area/ship/maintenance/starboard)
 "vV" = (
@@ -1790,13 +2441,11 @@
 /turf/open/floor/plasteel/grimy,
 /area/ship/crew)
 "vW" = (
-/obj/item/flashlight/flare,
-/obj/structure/bed/double/maint{
-	dir = 1
+/obj/machinery/computer/security/telescreen/entertainment{
+	pixel_y = -25
 	},
-/obj/effect/gibspawner/human/bodypartless,
-/turf/open/floor/plating/airless,
-/area/ship/maintenance)
+/turf/open/floor/holofloor/carpet,
+/area/ship/crew/ccommons)
 "wa" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
 	dir = 1
@@ -1808,21 +2457,34 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/maintenance/starboard)
 "wb" = (
-/obj/item/flashlight/glowstick/pink,
 /obj/structure/cable/yellow{
 	icon_state = "1-2"
 	},
-/turf/open/floor/plating/airless,
-/area/ship/maintenance)
+/obj/effect/decal/cleanable/crayon{
+	icon_state = "electricdanger"
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plating,
+/area/ship/maintenance/aft)
 "wg" = (
-/obj/machinery/blackbox_recorder,
-/obj/machinery/door/window/southright,
-/obj/structure/sign/poster/retro/radio{
-	pixel_y = 32
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
 	},
-/obj/structure/catwalk/over/plated_catwalk/dark,
-/turf/open/floor/plasteel/telecomms_floor,
-/area/ship/bridge)
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/door/airlock/maintenance_hatch,
+/turf/open/floor/plating,
+/area/ship/maintenance)
+"wn" = (
+/obj/structure/curtain/bounty,
+/obj/machinery/light_switch{
+	pixel_y = 22
+	},
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 9
+	},
+/turf/open/floor/plasteel,
+/area/ship/crew)
 "wp" = (
 /obj/effect/decal/fakelattice{
 	icon_state = "lattice-12"
@@ -1835,6 +2497,43 @@
 	},
 /turf/open/floor/plasteel/elevatorshaft,
 /area/ship/cargo)
+"wy" = (
+/obj/structure/sink{
+	pixel_x = 2;
+	pixel_y = 20
+	},
+/obj/structure/mirror{
+	pixel_y = 35;
+	pixel_x = 1
+	},
+/obj/effect/turf_decal/techfloor,
+/turf/open/floor/plasteel/tech/grid/airless,
+/area/ship/crew/toilet)
+"wA" = (
+/obj/structure/closet/secure_closet/engineering_personal{
+	populate = 0
+	},
+/obj/item/storage/belt/utility/full/engi{
+	pixel_y = -9
+	},
+/obj/item/clothing/accessory/armband/engine{
+	pixel_y = 2;
+	pixel_x = -12
+	},
+/obj/item/clothing/accessory/armband/engine{
+	pixel_y = 2;
+	pixel_x = -12
+	},
+/obj/item/clothing/glasses/welding{
+	pixel_x = 9
+	},
+/obj/item/storage/toolbox/electrical{
+	pixel_y = 14
+	},
+/obj/item/gear_pack/anglegrinder,
+/obj/item/radio/headset/pirate/alt,
+/turf/open/floor/plasteel/tech,
+/area/ship/maintenance/port)
 "wC" = (
 /obj/structure/bed/double,
 /obj/item/bedsheet/double/black,
@@ -1844,6 +2543,9 @@
 "wF" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 1
+	},
 /turf/open/floor/plasteel/tech/techmaint,
 /area/ship/cargo)
 "wH" = (
@@ -1857,6 +2559,9 @@
 	},
 /turf/open/floor/pod/dark,
 /area/ship/maintenance/starboard)
+"wK" = (
+/turf/closed/wall/r_wall,
+/area/ship/maintenance/starboard)
 "wL" = (
 /obj/effect/turf_decal/box/corners{
 	dir = 8
@@ -1864,7 +2569,6 @@
 /obj/machinery/door/firedoor/border_only{
 	dir = 8
 	},
-/obj/machinery/airalarm/directional/south,
 /turf/open/floor/plasteel/mono,
 /area/ship/cargo)
 "wN" = (
@@ -1883,17 +2587,18 @@
 /turf/open/floor/plasteel/mono,
 /area/ship/cargo)
 "wY" = (
-/obj/structure/cable/yellow{
-	icon_state = "4-8"
+/turf/open/floor/plating,
+/area/ship/maintenance/aft)
+"xb" = (
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 4
 	},
-/obj/structure/flippedtable{
-	dir = 8
+/obj/structure/chair/handrail{
+	dir = 8;
+	pixel_x = 2
 	},
-/turf/open/floor/plating/airless,
-/area/ship/maintenance)
-"xb" = (
-/turf/closed/wall/r_wall/rust,
-/area/ship/cargo)
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/canteen)
 "xf" = (
 /obj/effect/turf_decal/siding/wood{
 	dir = 8
@@ -1901,6 +2606,12 @@
 /obj/machinery/computer/helm/viewscreen/directional/north,
 /turf/open/floor/carpet/nanoweave,
 /area/ship/crew/crewtwo)
+"xi" = (
+/obj/machinery/portable_atmospherics/pump,
+/turf/open/floor/plating{
+	icon_state = "plating_rust"
+	},
+/area/ship/maintenance)
 "xB" = (
 /obj/structure/closet/secure_closet{
 	icon_door = "tac";
@@ -1918,8 +2629,22 @@
 /obj/item/door_seal{
 	pixel_y = -7
 	},
+/obj/item/shield/riot/spike,
+/obj/item/storage/box/smokebombs,
+/obj/item/storage/toolbox/ammo/frag,
+/obj/item/crowbar/power,
 /turf/open/floor/mineral/plastitanium,
 /area/ship/security/armory)
+"xV" = (
+/obj/effect/turf_decal/borderfloor,
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 1
+	},
+/obj/structure/chair/handrail{
+	dir = 1
+	},
+/turf/open/floor/plasteel/tech/techmaint,
+/area/ship/cargo)
 "xX" = (
 /obj/structure/cable/yellow{
 	icon_state = "1-4"
@@ -1933,22 +2658,44 @@
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
 	dir = 8
 	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 8
+	},
+/obj/effect/turf_decal/siding/white/corner{
+	dir = 4
+	},
+/turf/open/floor/plasteel/mono/dark,
 /area/ship/crew/canteen)
-"yc" = (
-/obj/effect/spawner/random/trash/grille_or_waste,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating/airless,
-/area/ship/maintenance)
 "yd" = (
 /obj/structure/table/wood,
 /obj/item/flashlight/lamp{
 	pixel_x = -6;
 	pixel_y = 12
 	},
+/obj/machinery/firealarm/directional/south,
 /turf/open/floor/plasteel/grimy,
 /area/ship/crew)
+"ye" = (
+/obj/machinery/atmospherics/components/unary/shuttle/fire_heater,
+/obj/machinery/door/poddoor/shutters{
+	dir = 4;
+	id = "sboard_engine"
+	},
+/turf/open/floor/pod/dark,
+/area/ship/maintenance/starboard)
+"yj" = (
+/obj/machinery/light/directional/west,
+/obj/machinery/iv_drip,
+/obj/effect/turf_decal/corner/opaque/blue{
+	dir = 8
+	},
+/obj/effect/turf_decal/corner/opaque/blue{
+	dir = 1
+	},
+/turf/open/floor/plating{
+	icon_state = "plating_rust"
+	},
+/area/ship/medical)
 "yl" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 4
@@ -1965,18 +2712,17 @@
 	pixel_x = -6;
 	pixel_y = -2
 	},
-/turf/open/floor/plating/airless{
+/turf/open/floor/plating{
 	icon_state = "plating_rust"
 	},
 /area/ship/maintenance)
 "yv" = (
-/obj/structure/table,
-/obj/effect/turf_decal/siding/wideplating{
+/obj/machinery/airalarm/directional/north,
+/obj/effect/turf_decal/siding/thinplating/dark,
+/obj/effect/turf_decal/borderfloor{
 	dir = 1
 	},
-/obj/structure/reagent_dispensers/servingdish,
-/obj/machinery/airalarm/directional/north,
-/turf/open/floor/plasteel/patterned/grid,
+/turf/open/floor/plasteel/mono/dark,
 /area/ship/crew/canteen)
 "yz" = (
 /turf/open/floor/plasteel/tech,
@@ -2001,11 +2747,18 @@
 /obj/structure/grille,
 /obj/structure/window/reinforced/fulltile,
 /obj/machinery/door/firedoor/window,
+/obj/machinery/door/poddoor/shutters{
+	dir = 4;
+	id = "tbridge"
+	},
 /turf/open/floor/plating,
 /area/ship/bridge)
 "yV" = (
 /obj/effect/turf_decal/borderfloor,
 /obj/machinery/light/floor,
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 1
+	},
 /turf/open/floor/plasteel/tech/techmaint,
 /area/ship/cargo)
 "yX" = (
@@ -2016,16 +2769,50 @@
 	pixel_x = -6
 	},
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating/airless{
+/obj/effect/decal/cleanable/chem_pile{
+	pixel_x = 9
+	},
+/turf/open/floor/plating{
 	icon_state = "plating_rust"
 	},
 /area/ship/maintenance)
+"za" = (
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 1
+	},
+/obj/effect/turf_decal/siding/thinplating/dark/corner{
+	dir = 8
+	},
+/turf/open/floor/plasteel/tech/techmaint,
+/area/ship/cargo)
 "ze" = (
 /obj/structure/cable/yellow{
 	icon_state = "6-8"
 	},
 /turf/open/floor/plasteel/dark,
 /area/ship/maintenance/starboard)
+"zm" = (
+/obj/docking_port/mobile{
+	name = "tortuga docking port";
+	port_direction = 8;
+	preferred_direction = 4;
+	dir = 2
+	},
+/turf/closed/wall/r_wall,
+/area/ship/maintenance/port)
+"zu" = (
+/obj/effect/turf_decal/borderfloor,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 5
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 5
+	},
+/obj/structure/cable/yellow{
+	icon_state = "1-4"
+	},
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/crew/canteen)
 "zG" = (
 /obj/structure/chair/sofa/brown{
 	dir = 1;
@@ -2034,88 +2821,186 @@
 /turf/open/floor/wood,
 /area/ship/crew/crewtwo)
 "zJ" = (
-/obj/item/flashlight/glowstick,
-/obj/effect/decal/cleanable/crayon{
-	icon_state = "radiation"
-	},
-/turf/open/floor/plating/airless,
-/area/ship/maintenance)
+/turf/closed/wall/r_wall/rust,
+/area/ship/maintenance/starboard)
 "zZ" = (
-/obj/structure/bed{
-	dir = 1
+/obj/effect/turf_decal/corner/opaque/black{
+	dir = 9
+	},
+/obj/effect/turf_decal/corner/opaque/black,
+/obj/structure/sink/kitchen{
+	dir = 4
+	},
+/turf/open/floor/plating{
+	icon_state = "plating_rust"
 	},
-/turf/open/floor/plating,
 /area/ship/security/armory)
 "Ab" = (
 /turf/closed/wall/r_wall/rust,
 /area/ship/crew)
 "Ar" = (
-/obj/structure/bed,
 /obj/structure/curtain/cloth,
-/obj/effect/spawner/random/bedsheet,
+/obj/effect/spawner/bunk_bed,
 /turf/open/floor/carpet,
 /area/ship/crew)
-"Av" = (
-/obj/effect/turf_decal/siding/wideplating{
+"At" = (
+/obj/effect/turf_decal/siding/blue{
 	dir = 4
 	},
-/obj/structure/chair{
-	dir = 8
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable/yellow{
+	icon_state = "1-4"
+	},
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+	dir = 1
 	},
+/turf/open/floor/plasteel/white,
+/area/ship/medical)
+"Av" = (
 /obj/structure/extinguisher_cabinet/directional/east,
+/obj/structure/table,
+/obj/structure/reagent_dispensers/servingdish,
+/obj/effect/turf_decal/corner/opaque/bar,
+/obj/effect/turf_decal/corner/opaque/bar{
+	dir = 1
+	},
 /turf/open/floor/plasteel,
 /area/ship/crew/canteen)
 "Az" = (
 /obj/structure/curtain/bounty,
-/obj/machinery/light_switch{
-	pixel_y = 22
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 10
 	},
 /turf/open/floor/plasteel,
 /area/ship/crew)
-"AG" = (
-/obj/effect/spawner/random/trash/grille_or_waste,
-/turf/open/floor/plating/airless,
-/area/ship/maintenance)
-"AQ" = (
-/obj/structure/closet/crate/bin,
+"AA" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/grille/indestructible,
+/obj/machinery/door/poddoor/shutters/preopen{
+	dir = 1;
+	id = "flyboy"
+	},
+/obj/structure/window/reinforced/fulltile,
+/turf/open/floor/plating,
+/area/ship/maintenance)
+"AE" = (
+/obj/structure/cable/yellow{
+	icon_state = "4-9"
+	},
+/obj/structure/cable/yellow{
+	icon_state = "2-9"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 10
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 10
+	},
+/turf/open/floor/plating,
+/area/ship/maintenance)
+"AG" = (
+/obj/effect/mapping_helpers/airlock/abandoned,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/door/firedoor/border_only{
+	dir = 8
+	},
+/obj/structure/cable/yellow{
+	icon_state = "5-8"
+	},
+/obj/machinery/door/airlock/hatch{
+	dir = 8
+	},
+/obj/effect/mapping_helpers/airlock/abandoned,
+/turf/open/floor/plating,
+/area/ship/maintenance)
+"AQ" = (
+/obj/structure/closet/crate/bin,
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/airalarm/directional/north,
+/obj/machinery/firealarm/directional/east,
 /turf/open/floor/plasteel/tech,
 /area/ship/bridge)
 "AZ" = (
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
 	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
 /turf/open/floor/pod/dark,
 /area/ship/maintenance/starboard)
+"Be" = (
+/obj/effect/decal/cleanable/glass,
+/obj/machinery/light/small/directional/north,
+/obj/structure/toilet{
+	pixel_x = 0;
+	pixel_y = 10
+	},
+/obj/machinery/button/door{
+	dir = 4;
+	pixel_x = -24;
+	id = "toilet2";
+	name = "privacy lock";
+	normaldoorcontrol = 1
+	},
+/turf/open/floor/plasteel/showroomfloor,
+/area/ship/crew/toilet)
 "Bk" = (
-/turf/open/floor/plating/airless,
+/turf/open/floor/plating,
 /area/ship/maintenance)
+"Bo" = (
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/turf/open/floor/plating{
+	icon_state = "plating_rust"
+	},
+/area/ship/maintenance/aft)
 "Bp" = (
-/turf/closed/wall/rust,
+/obj/effect/spawner/random/trash/decal,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plating,
 /area/ship/maintenance)
+"Bw" = (
+/obj/effect/spawner/random/trash/decal,
+/turf/open/floor/plating,
+/area/ship/maintenance/aft)
 "BA" = (
 /obj/structure/cable/yellow{
 	icon_state = "5-10"
 	},
 /turf/open/floor/plasteel/dark,
 /area/ship/maintenance/starboard)
+"BB" = (
+/obj/effect/turf_decal/siding/blue{
+	dir = 8
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+	dir = 4
+	},
+/turf/open/floor/plasteel/white,
+/area/ship/medical)
 "BF" = (
 /obj/effect/turf_decal/borderfloor,
 /obj/structure/extinguisher_cabinet/directional/south,
+/obj/structure/chair/plastic{
+	dir = 8
+	},
 /turf/open/floor/plasteel/tech/techmaint,
 /area/ship/cargo)
 "BG" = (
-/obj/structure/cable/yellow{
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 4
+/obj/machinery/shower{
+	dir = 1
 	},
-/obj/effect/turf_decal/siding/wideplating,
-/turf/open/floor/plasteel,
-/area/ship/crew/canteen)
+/obj/structure/curtain/cloth,
+/turf/open/floor/plating/catwalk_floor,
+/area/ship/security/armory)
 "BN" = (
 /obj/structure/cable/yellow{
 	icon_state = "1-2"
@@ -2125,11 +3010,9 @@
 /turf/open/floor/wood,
 /area/ship/crew/crewtwo)
 "BV" = (
-/obj/structure/salvageable/server,
-/turf/open/floor/plating/airless{
-	icon_state = "plating_rust"
-	},
-/area/ship/maintenance)
+/obj/effect/spawner/random/trash/grille_or_waste,
+/turf/open/floor/plating,
+/area/ship/maintenance/aft)
 "Ca" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
@@ -2144,10 +3027,12 @@
 /turf/open/floor/plating,
 /area/ship/cargo)
 "Cx" = (
-/obj/machinery/portable_atmospherics/pump,
-/obj/effect/decal/cleanable/glass,
-/turf/open/floor/plating/airless,
-/area/ship/maintenance)
+/obj/effect/turf_decal/borderfloor{
+	dir = 1
+	},
+/obj/effect/turf_decal/siding/thinplating/dark,
+/turf/open/floor/plasteel/tech/techmaint,
+/area/ship/crew/toilet)
 "Cy" = (
 /obj/structure/chair/stool{
 	dir = 8
@@ -2160,6 +3045,12 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plasteel/tech,
 /area/ship/bridge)
+"CD" = (
+/obj/effect/turf_decal/siding/thinplating/dark/corner{
+	dir = 8
+	},
+/turf/open/floor/plasteel,
+/area/ship/crew)
 "CE" = (
 /obj/structure/table,
 /obj/machinery/jukebox/boombox{
@@ -2172,8 +3063,8 @@
 /turf/closed/wall,
 /area/ship/maintenance/port)
 "CN" = (
-/obj/effect/turf_decal/industrial/stand_clear{
-	dir = 4
+/obj/effect/turf_decal/siding/thinplating/dark/end{
+	dir = 8
 	},
 /turf/open/floor/plasteel/tech/techmaint,
 /area/ship/cargo)
@@ -2191,32 +3082,60 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
 "CT" = (
-/obj/machinery/power/shuttle/engine/liquid/oil{
+/obj/machinery/blackbox_recorder,
+/obj/machinery/door/window/southright,
+/obj/structure/catwalk/over/plated_catwalk/dark,
+/turf/open/floor/plasteel/telecomms_floor,
+/area/ship/bridge)
+"Du" = (
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/obj/structure/door_assembly/door_assembly_hatch{
 	dir = 4
 	},
-/turf/open/floor/plating,
-/area/ship/maintenance/port)
+/obj/machinery/door/firedoor/border_only/closed{
+	dir = 8
+	},
+/obj/structure/firelock_frame/border{
+	dir = 4
+	},
+/turf/open/floor/plating{
+	icon_state = "plating_rust"
+	},
+/area/ship/maintenance)
 "Dv" = (
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
 	},
 /obj/effect/spawner/random/maintenance,
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating/airless{
+/turf/open/floor/plating{
 	icon_state = "plating_rust"
 	},
 /area/ship/maintenance)
 "Dw" = (
-/obj/structure/dresser{
-	dir = 1;
-	pixel_y = -5
+/obj/machinery/light/directional/north,
+/obj/item/storage/pouch/squad,
+/obj/item/clothing/suit/armor/vest/marine/frontier,
+/obj/item/clothing/head/helmet/frontier,
+/obj/item/megaphone,
+/obj/item/clothing/under/frontiersmen/officer{
+	pixel_x = -5
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 5
+/obj/item/clothing/shoes/jackboots{
+	pixel_y = -13
 	},
-/obj/machinery/light/directional/south,
-/turf/open/floor/plasteel,
-/area/ship/crew)
+/obj/item/clothing/head/beret/sec/frontier/officer,
+/obj/item/radio/headset/pirate/alt,
+/obj/item/binoculars,
+/obj/structure/closet/secure_closet{
+	icon_state = "hos";
+	name = "Deck Boss' Locker";
+	req_access_txt = "3"
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/bridge)
 "DF" = (
 /obj/structure/cable/yellow{
 	icon_state = "6-8"
@@ -2229,38 +3148,62 @@
 "DG" = (
 /turf/open/floor/plasteel/elevatorshaft,
 /area/ship/cargo)
-"DN" = (
-/obj/structure/bed{
-	dir = 1
+"DJ" = (
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/obj/structure/door_assembly/door_assembly_hatch{
+	dir = 4
+	},
+/obj/machinery/door/firedoor/heavy/closed,
+/obj/structure/barricade/wooden/crude,
+/turf/open/floor/plating{
+	icon_state = "plating_rust"
 	},
+/area/ship/maintenance/aft)
+"DN" = (
 /obj/structure/curtain/cloth,
-/obj/effect/spawner/random/bedsheet,
 /obj/machinery/airalarm/directional/north,
+/obj/effect/spawner/bunk_bed,
 /turf/open/floor/carpet,
 /area/ship/crew)
 "DR" = (
+/obj/effect/decal/cleanable/glass,
+/obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/yellow{
-	icon_state = "4-10"
+	icon_state = "4-8"
 	},
-/obj/effect/gibspawner/human/bodypartless,
-/obj/effect/decal/cleanable/glass,
-/turf/open/floor/plating/airless{
-	icon_state = "plating_rust"
+/obj/structure/cable/yellow{
+	icon_state = "2-4"
 	},
-/area/ship/maintenance)
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+	dir = 1
+	},
+/obj/structure/catwalk/over/plated_catwalk,
+/turf/open/floor/plating,
+/area/ship/crew/toilet)
 "DU" = (
-/obj/structure/cable/yellow{
-	icon_state = "5-8"
+/obj/structure/sink{
+	pixel_x = 2;
+	pixel_y = 20
 	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating/airless,
-/area/ship/maintenance)
-"Eb" = (
-/obj/effect/spawner/random/trash/decal,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating/airless{
-	icon_state = "plating_rust"
+/obj/effect/turf_decal/techfloor,
+/obj/effect/decal/cleanable/glass,
+/obj/structure/mirror{
+	pixel_y = 35;
+	pixel_x = 1;
+	icon_state = "mirror_broke"
 	},
+/obj/machinery/light/small/directional/west,
+/turf/open/floor/plasteel/tech/grid/airless,
+/area/ship/crew/toilet)
+"Eb" = (
+/obj/machinery/door/airlock/hatch,
+/obj/machinery/door/firedoor/heavy,
+/turf/open/floor/plating,
 /area/ship/maintenance)
 "Ek" = (
 /turf/template_noop,
@@ -2273,6 +3216,17 @@
 	},
 /turf/open/floor/plating,
 /area/ship/cargo)
+"Eu" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/item/book/manual/wiki/ghetto_chemistry{
+	pixel_y = 11;
+	pixel_x = -7
+	},
+/obj/item/lighter{
+	pixel_x = 5
+	},
+/turf/open/floor/plating,
+/area/ship/maintenance)
 "Ev" = (
 /obj/effect/turf_decal/box/corners{
 	dir = 1
@@ -2281,8 +3235,21 @@
 /obj/machinery/door/firedoor/border_only{
 	dir = 8
 	},
+/obj/item/modular_computer/laptop/preset/civilian/rilena,
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 1
+	},
 /turf/open/floor/plasteel/mono,
 /area/ship/cargo)
+"Ez" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/door/airlock/hatch{
+	id_tag = "toilet1";
+	name = "Stall One"
+	},
+/turf/open/floor/plasteel/showroomfloor,
+/area/ship/crew/toilet)
 "EB" = (
 /obj/effect/decal/fakelattice{
 	icon_state = "lattice-12"
@@ -2292,6 +3259,30 @@
 	},
 /turf/open/floor/plasteel/elevatorshaft,
 /area/ship/cargo)
+"EG" = (
+/obj/structure/cable/yellow{
+	icon_state = "1-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 9
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 9
+	},
+/obj/effect/turf_decal/siding/thinplating/dark/corner{
+	dir = 1
+	},
+/obj/effect/turf_decal/borderfloor,
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/crew/canteen)
+"EH" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable/yellow{
+	icon_state = "4-10"
+	},
+/turf/open/floor/plating,
+/area/ship/maintenance)
 "EI" = (
 /obj/machinery/power/smes/shuttle/precharged{
 	dir = 4
@@ -2302,8 +3293,32 @@
 /obj/structure/cable{
 	icon_state = "0-8"
 	},
+/obj/machinery/door/poddoor/shutters{
+	dir = 4;
+	id = "port_engine"
+	},
 /turf/open/floor/plasteel/tech,
 /area/ship/maintenance/port)
+"EL" = (
+/obj/effect/decal/cleanable/glass,
+/obj/item/broken_bottle,
+/obj/effect/decal/cleanable/blood/old,
+/obj/effect/turf_decal/siding/wood{
+	dir = 6
+	},
+/obj/structure/cable/yellow{
+	icon_state = "0-8"
+	},
+/obj/machinery/power/apc/auto_name/directional/east,
+/obj/machinery/light_switch{
+	dir = 8;
+	pixel_x = 19;
+	pixel_y = 13
+	},
+/turf/open/floor/wood{
+	icon_state = "wood-broken3"
+	},
+/area/ship/crew/ccommons)
 "EN" = (
 /obj/machinery/atmospherics/components/unary/tank/air{
 	dir = 4
@@ -2317,54 +3332,61 @@
 /obj/structure/grille,
 /obj/structure/window/reinforced/fulltile,
 /obj/machinery/door/firedoor/window,
+/obj/machinery/door/poddoor/shutters{
+	id = "pmaint_shutter"
+	},
 /turf/open/floor/plating,
 /area/ship/maintenance/port)
 "Fc" = (
-/obj/structure/toilet{
-	dir = 4;
-	pixel_x = -2;
-	pixel_y = 5
+/obj/structure/chair/plastic,
+/obj/structure/sign/poster/contraband/winchester{
+	pixel_x = -31
 	},
-/obj/effect/decal/cleanable/vomit/old,
-/obj/effect/decal/cleanable/vomit/old{
-	icon_state = "vomit_4";
-	pixel_x = 15;
-	pixel_y = -12
-	},
-/obj/effect/decal/cleanable/vomit/old{
-	icon_state = "vomit_2";
-	pixel_x = -13
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+	dir = 4
 	},
-/turf/open/floor/plasteel/showroomfloor,
-/area/ship/crew/canteen)
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/office)
+"Ff" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/portable_atmospherics/canister/oxygen,
+/turf/open/floor/plating,
+/area/ship/maintenance)
 "Fh" = (
-/obj/structure/flippedtable,
-/obj/effect/decal/cleanable/garbage{
-	pixel_x = -7;
-	pixel_y = 11
+/obj/machinery/power/apc/auto_name/directional/east,
+/obj/structure/cable/yellow{
+	icon_state = "0-8"
 	},
-/turf/open/floor/plating/airless,
-/area/ship/maintenance)
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 6
+	},
+/turf/open/floor/plasteel,
+/area/ship/crew)
 "Fk" = (
+/obj/machinery/light/directional/south,
 /obj/structure/table,
 /obj/item/reagent_containers/food/drinks/soda_cans/sol_dry{
 	pixel_x = -5;
 	pixel_y = 10
 	},
-/obj/item/reagent_containers/food/drinks/soda_cans/sol_dry{
-	pixel_x = 6;
-	pixel_y = 6
-	},
 /obj/item/reagent_containers/food/drinks/soda_cans/sol_dry{
 	pixel_x = -3;
 	pixel_y = 2
 	},
-/obj/effect/turf_decal/techfloor{
-	dir = 4
+/obj/item/reagent_containers/food/drinks/soda_cans/sol_dry{
+	pixel_x = 6;
+	pixel_y = 6
 	},
-/obj/machinery/light/directional/south,
 /turf/open/floor/plasteel/telecomms_floor,
 /area/ship/crew)
+"Fx" = (
+/obj/machinery/light/directional/north,
+/obj/effect/turf_decal/siding/thinplating/dark/corner,
+/obj/effect/turf_decal/borderfloor{
+	dir = 1
+	},
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/crew/canteen)
 "Fy" = (
 /obj/effect/turf_decal/industrial/warning{
 	dir = 8
@@ -2372,73 +3394,118 @@
 /turf/open/floor/plasteel/elevatorshaft,
 /area/ship/cargo)
 "FB" = (
-/obj/structure/rack,
-/obj/item/melee/knife/survival{
-	pixel_y = 8;
-	pixel_x = -9
-	},
-/obj/item/melee/knife/survival{
-	pixel_y = 7;
-	pixel_x = 5
-	},
-/obj/item/melee/knife/survival{
-	pixel_y = 7;
-	pixel_x = -4
-	},
-/obj/item/melee/knife/survival{
-	pixel_y = 7;
-	pixel_x = 1
-	},
-/obj/item/melee/baton/boomerang/loaded{
-	pixel_y = -14;
-	pixel_x = 3
+/obj/effect/turf_decal/techfloor,
+/obj/structure/guncloset{
+	anchored = 1
 	},
-/turf/open/floor/mineral/plastitanium,
+/obj/item/gun/energy/laser/wasp,
+/obj/item/gun/ballistic/automatic/hmg/mower,
+/obj/item/gun/ballistic/automatic/marksman/f4/indie,
+/obj/item/gun/ballistic/automatic/pistol/spitter,
+/obj/item/gun/ballistic/automatic/pistol/mauler,
+/obj/item/gun/ballistic/automatic/pistol/mauler/regular,
+/turf/open/floor/plasteel/tech/grid,
 /area/ship/security/armory)
 "FL" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
 /turf/open/floor/plasteel/tech/techmaint,
 /area/ship/cargo)
+"FM" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/techfloor{
+	dir = 1
+	},
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+	dir = 4
+	},
+/turf/open/floor/plating{
+	icon_state = "plating_rust"
+	},
+/area/ship/maintenance)
 "FP" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/turf_decal/spline/fancy/opaque/black,
 /turf/open/floor/mineral/titanium/tiled,
 /area/ship/security/armory)
 "FQ" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/siding/red{
+	dir = 8
+	},
+/obj/structure/cable/yellow{
+	icon_state = "5-8"
+	},
 /turf/open/floor/mineral/titanium,
 /area/ship/security/armory)
 "FR" = (
-/obj/structure/cable/yellow{
-	icon_state = "1-6"
+/obj/effect/decal/cleanable/glass,
+/obj/effect/turf_decal/siding/wood{
+	dir = 10
 	},
-/obj/effect/decal/cleanable/garbage{
-	pixel_x = -7;
-	pixel_y = 8
+/obj/machinery/light/directional/south,
+/obj/machinery/computer/arcade/orion_trail{
+	dir = 1
 	},
-/turf/open/floor/plating/airless{
-	icon_state = "plating_rust"
+/turf/open/floor/wood{
+	icon_state = "wood-broken"
 	},
-/area/ship/maintenance)
+/area/ship/crew/ccommons)
 "FU" = (
 /obj/machinery/light/directional/west,
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 4
+	},
 /turf/open/floor/plasteel/tech/techmaint,
 /area/ship/cargo)
 "FW" = (
 /obj/structure/cable/yellow{
 	icon_state = "1-2"
 	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 6
+	},
+/obj/effect/turf_decal/siding/thinplating/dark,
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+	dir = 1
+	},
 /turf/open/floor/plasteel,
 /area/ship/crew)
-"Gd" = (
+"Gb" = (
+/obj/machinery/door/airlock/security/glass{
+	dir = 4;
+	req_one_access = list(1)
+	},
+/obj/machinery/door/poddoor/shutters/preopen{
+	dir = 4;
+	id = "cell"
+	},
+/turf/open/floor/plating,
+/area/ship/security/armory)
+"Gc" = (
 /obj/structure/cable/yellow{
-	icon_state = "2-5"
+	icon_state = "4-8"
+	},
+/obj/effect/decal/cleanable/glass,
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 5
+	},
+/obj/machinery/power/apc/auto_name/directional/south,
+/obj/structure/cable/yellow{
+	icon_state = "0-4"
 	},
+/turf/open/floor/plating,
+/area/ship/crew/toilet)
+"Gd" = (
 /obj/effect/turf_decal/spline/fancy/opaque/black{
 	dir = 1
 	},
 /obj/machinery/door/firedoor/border_only{
 	dir = 1
 	},
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 1
+	},
 /turf/open/floor/plasteel/dark,
 /area/ship/crew/canteen)
 "Gm" = (
@@ -2450,44 +3517,79 @@
 /turf/open/floor/plasteel/tech,
 /area/ship/maintenance/starboard)
 "Gr" = (
-/obj/structure/cable/yellow{
-	icon_state = "1-2"
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/structure/sign/poster/retro/lasergun{
-	pixel_x = 32
+/obj/structure/toilet{
+	dir = 4;
+	pixel_x = -2;
+	pixel_y = 5
 	},
-/turf/open/floor/plasteel/dark,
-/area/ship/crew/canteen)
+/obj/structure/curtain/cloth,
+/turf/open/floor/plating/catwalk_floor,
+/area/ship/security/armory)
 "Gx" = (
-/obj/machinery/vending/coffee,
-/turf/open/floor/plasteel/dark,
+/obj/effect/turf_decal/techfloor{
+	dir = 1
+	},
+/obj/machinery/vending/cola,
+/turf/open/floor/plasteel/tech/grid/airless,
 /area/ship/crew/canteen)
 "Gy" = (
-/obj/structure/cable/yellow{
-	icon_state = "1-2"
-	},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 4
 	},
-/obj/machinery/light/directional/east,
-/turf/open/floor/plasteel/dark,
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/obj/structure/catwalk/over/plated_catwalk/dark,
+/turf/open/floor/plating{
+	icon_state = "plating_rust"
+	},
 /area/ship/crew/canteen)
 "GA" = (
 /obj/structure/cable/yellow{
 	icon_state = "2-8"
 	},
 /obj/effect/turf_decal/industrial/warning,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 10
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 10
+	},
+/obj/structure/cable/yellow{
+	icon_state = "1-8"
+	},
 /turf/open/floor/pod/dark,
 /area/ship/maintenance/starboard)
 "GM" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 9
+	},
+/obj/machinery/light/directional/south,
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 6
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 9
+	},
 /turf/open/floor/plasteel,
 /area/ship/crew)
+"GP" = (
+/obj/structure/table/wood,
+/obj/item/clothing/mask/surgical,
+/obj/item/reagent_scanner{
+	pixel_y = 12
+	},
+/obj/item/reagent_containers/glass/filter{
+	pixel_y = 4;
+	pixel_x = 11
+	},
+/turf/open/floor/plating{
+	icon_state = "platingdmg3"
+	},
+/area/ship/maintenance)
 "GV" = (
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
@@ -2502,14 +3604,17 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 4
 	},
-/obj/effect/turf_decal/siding/wideplating,
-/turf/open/floor/plasteel,
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 1
+	},
+/obj/effect/turf_decal/borderfloor,
+/turf/open/floor/plasteel/mono/dark,
 /area/ship/crew/canteen)
 "GY" = (
+/obj/effect/turf_decal/spline/fancy/opaque/black,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 5
+	dir = 4
 	},
-/obj/effect/turf_decal/spline/fancy/opaque/black,
 /turf/open/floor/plasteel/dark,
 /area/ship/maintenance/port)
 "Ha" = (
@@ -2524,10 +3629,53 @@
 	},
 /turf/open/floor/plasteel/tech,
 /area/ship/maintenance/port)
+"Hh" = (
+/obj/effect/gibspawner/human/bodypartless,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/light/small/directional/south,
+/turf/open/floor/plating{
+	icon_state = "plating_rust"
+	},
+/area/ship/maintenance)
+"Hi" = (
+/obj/effect/decal/cleanable/plasma,
+/obj/machinery/light/small/directional/south,
+/turf/open/floor/plating,
+/area/ship/maintenance)
 "Hk" = (
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating/airless,
+/turf/open/floor/plating,
+/area/ship/maintenance)
+"Hl" = (
+/obj/effect/turf_decal/techfloor{
+	dir = 1
+	},
+/obj/structure/cable/yellow,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 9
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/maintenance)
+"Hn" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/techfloor{
+	dir = 1
+	},
+/obj/effect/spawner/random/trash/decal,
+/turf/open/floor/plasteel/dark,
 /area/ship/maintenance)
+"Hw" = (
+/obj/structure/table,
+/obj/machinery/computer/security/telescreen/entertainment{
+	pixel_y = 26
+	},
+/obj/item/storage/bag/tray/cafeteria,
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/security/armory)
 "Hx" = (
 /obj/structure/catwalk/over/plated_catwalk,
 /obj/structure/railing{
@@ -2537,6 +3685,9 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /turf/open/floor/plating,
 /area/ship/cargo)
+"HE" = (
+/turf/closed/wall/r_wall,
+/area/ship/maintenance)
 "HG" = (
 /obj/structure/railing/corner{
 	dir = 1
@@ -2555,6 +3706,9 @@
 	icon_state = "6-8"
 	},
 /obj/effect/turf_decal/spline/fancy/opaque/black,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 5
+	},
 /turf/open/floor/plasteel/dark,
 /area/ship/maintenance/port)
 "HX" = (
@@ -2564,7 +3718,6 @@
 /obj/structure/cable/yellow{
 	icon_state = "0-4"
 	},
-/obj/structure/reagent_dispensers/fueltank,
 /turf/open/floor/plasteel/tech,
 /area/ship/maintenance/port)
 "HY" = (
@@ -2581,9 +3734,24 @@
 	icon_state = "wood-broken5"
 	},
 /area/ship/crew/crewtwo)
+"Iu" = (
+/obj/machinery/shower{
+	pixel_x = 0;
+	pixel_y = 17
+	},
+/obj/effect/turf_decal/techfloor/hole{
+	dir = 1
+	},
+/obj/effect/turf_decal/techfloor/hole/right{
+	dir = 1
+	},
+/obj/machinery/light/small/directional/west,
+/obj/item/soap/homemade,
+/turf/open/floor/plasteel/showroomfloor,
+/area/ship/crew/toilet)
 "Iw" = (
 /obj/structure/cable/yellow{
-	icon_state = "1-8"
+	icon_state = "4-8"
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
@@ -2591,22 +3759,42 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 4
 	},
-/turf/open/floor/plasteel/dark,
+/obj/structure/catwalk/over/plated_catwalk/dark,
+/turf/open/floor/plating,
 /area/ship/crew/canteen)
 "Iy" = (
-/obj/machinery/shower{
-	pixel_y = 14
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/spawner/random/trash/decal,
+/obj/item/megaphone/cargo,
+/obj/item/clothing/mask/gas/frontiersmen,
+/obj/item/clothing/shoes/jackboots,
+/obj/item/clothing/under/frontiersmen/officer{
+	pixel_x = -5
 	},
-/obj/item/bikehorn/rubberducky{
-	pixel_x = 7;
-	pixel_y = -2
+/obj/item/clothing/head/beret/sec/frontier/officer,
+/obj/item/radio/headset/pirate/alt,
+/obj/item/storage/toolbox/ammo/c22lr,
+/obj/item/storage/guncase/pounder{
+	mag_count = 3
 	},
-/obj/structure/curtain,
-/turf/open/floor/plasteel/showroomfloor,
-/area/ship/crew/canteen)
-"ID" = (
-/obj/structure/catwalk/over/plated_catwalk,
-/obj/structure/railing/corner{
+/obj/item/storage/belt/security/military/frontiersmen{
+	pixel_x = -4;
+	pixel_y = -10
+	},
+/obj/item/clothing/suit/jacket,
+/obj/structure/closet/secure_closet/wall/directional/west{
+	icon_state = "sec_wall";
+	req_one_access = list(57)
+	},
+/obj/item/storage/pouch/squad{
+	pixel_x = -10;
+	pixel_y = -10
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/office)
+"ID" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/structure/railing/corner{
 	dir = 4
 	},
 /obj/effect/turf_decal/industrial/stand_clear,
@@ -2623,32 +3811,52 @@
 /area/ship/cargo)
 "II" = (
 /obj/machinery/door/airlock/hatch,
-/obj/effect/mapping_helpers/airlock/locked,
 /obj/structure/cable/yellow{
 	icon_state = "1-2"
 	},
 /obj/machinery/door/firedoor/heavy,
 /turf/open/floor/plating,
 /area/ship/maintenance/port)
+"IM" = (
+/obj/structure/chair/stool/bar,
+/obj/effect/turf_decal/siding/wood/corner{
+	dir = 4
+	},
+/turf/open/floor/wood,
+/area/ship/crew/ccommons)
 "IO" = (
 /obj/structure/sign/poster/rilena/tali{
 	pixel_y = 32
 	},
 /obj/structure/table/wood,
-/obj/item/gun/ballistic/derringer{
-	pixel_x = 5;
-	pixel_y = 6
-	},
-/obj/item/ammo_casing/c38{
-	pixel_x = 9
+/obj/effect/decal/cleanable/dirt,
+/obj/item/gun/ballistic/revolver/mateba{
+	pixel_y = 5
 	},
-/obj/item/ammo_casing/c38{
+/obj/item/ammo_casing/a357{
 	pixel_x = 6;
-	pixel_y = -1
+	pixel_y = -1;
+	auto_rotate = 0;
+	auto_scatter = 0
+	},
+/obj/item/ammo_casing/a357{
+	pixel_x = 10;
+	auto_rotate = 0;
+	auto_scatter = 0
 	},
-/obj/effect/decal/cleanable/dirt,
 /turf/open/floor/wood,
 /area/ship/crew/crewtwo)
+"Jd" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 5
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 5
+	},
+/obj/effect/spawner/random/decoration/glowstick/on,
+/turf/open/floor/plating,
+/area/ship/maintenance)
 "Je" = (
 /obj/structure/catwalk/over/plated_catwalk,
 /obj/structure/railing/corner{
@@ -2676,28 +3884,29 @@
 /turf/open/floor/plasteel/tech,
 /area/ship/bridge)
 "Jv" = (
-/obj/structure/cable/yellow{
-	icon_state = "4-10"
-	},
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating/airless,
-/area/ship/maintenance)
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/canteen)
 "JA" = (
-/turf/open/floor/plating/airless{
-	icon_state = "plating_rust"
-	},
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/portable_atmospherics/scrubber,
+/turf/open/floor/plasteel/dark,
 /area/ship/maintenance)
 "JE" = (
-/obj/effect/turf_decal/spline/fancy/opaque/black{
-	dir = 1
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
 	},
-/obj/machinery/door/firedoor/border_only{
-	dir = 1
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
 	},
-/obj/structure/chair{
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
 	},
-/turf/open/floor/plasteel/dark,
+/obj/structure/catwalk/over/plated_catwalk/dark,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plating{
+	icon_state = "plating_rust"
+	},
 /area/ship/crew/canteen)
 "JJ" = (
 /obj/effect/turf_decal/spline/fancy/opaque/black{
@@ -2739,18 +3948,13 @@
 	},
 /turf/open/floor/engine/hull,
 /area/ship/external/dark)
+"Kc" = (
+/obj/machinery/door/airlock/hatch,
+/turf/open/floor/plasteel/tech/techmaint,
+/area/ship/crew/toilet)
 "Ke" = (
-/obj/machinery/door/airlock/hatch{
-	dir = 8
-	},
-/obj/effect/mapping_helpers/airlock/abandoned,
-/obj/structure/cable/yellow{
-	icon_state = "4-8"
-	},
-/turf/open/floor/plating/airless{
-	icon_state = "plating_rust"
-	},
-/area/ship/maintenance)
+/turf/closed/wall/r_wall/rust,
+/area/ship/crew/ccommons)
 "Kf" = (
 /obj/effect/turf_decal/siding/wood,
 /obj/effect/decal/cleanable/dirt,
@@ -2761,7 +3965,7 @@
 "Kn" = (
 /obj/structure/frame/machine,
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating/airless,
+/turf/open/floor/plating,
 /area/ship/maintenance)
 "Ko" = (
 /turf/closed/wall/rust,
@@ -2776,6 +3980,29 @@
 /obj/machinery/light/directional/south,
 /turf/open/floor/plasteel/tech,
 /area/ship/maintenance/starboard)
+"Kr" = (
+/obj/structure/closet/secure_closet/wall/directional/east{
+	icon_state = "sec_wall";
+	name = "ammo closet";
+	req_access_txt = "3"
+	},
+/obj/item/ammo_box/magazine/f4_308/empty,
+/obj/item/ammo_box/magazine/f4_308/empty,
+/obj/item/ammo_box/magazine/mower_lmg_308,
+/obj/item/ammo_box/magazine/mower_lmg_308,
+/obj/item/stock_parts/cell/gun,
+/obj/item/stock_parts/cell/gun,
+/obj/item/stock_parts/cell/gun,
+/obj/item/ammo_box/magazine/spitter_9mm,
+/obj/item/ammo_box/magazine/spitter_9mm,
+/obj/item/ammo_box/magazine/spitter_9mm,
+/obj/item/ammo_box/magazine/f4_308/empty,
+/obj/item/ammo_box/magazine/m9mm_mauler/extended,
+/obj/item/ammo_box/magazine/m9mm_mauler/extended,
+/obj/item/ammo_box/magazine/m9mm_mauler/extended,
+/obj/item/ammo_box/magazine/m9mm_mauler/extended,
+/turf/open/floor/mineral/plastitanium,
+/area/ship/security/armory)
 "Kx" = (
 /obj/structure/cable/yellow{
 	icon_state = "0-4"
@@ -2810,69 +4037,197 @@
 /turf/open/floor/pod/dark,
 /area/ship/maintenance/port)
 "KO" = (
-/obj/effect/turf_decal/siding/wideplating{
-	dir = 8
-	},
-/obj/effect/decal/cleanable/dirt,
 /obj/structure/sign/poster/retro/smile{
 	pixel_x = -32
 	},
-/turf/open/floor/plasteel,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/obj/structure/chair/handrail{
+	dir = 4
+	},
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/crew/canteen)
+"KP" = (
+/obj/structure/table,
+/obj/item/modular_computer/laptop/preset/civilian,
+/obj/item/desk_flag/trans{
+	pixel_x = 9;
+	pixel_y = -6
+	},
+/turf/open/floor/plasteel/grimy,
 /area/ship/crew/canteen)
+"KR" = (
+/obj/effect/decal/cleanable/blood/gibs/old,
+/turf/closed/wall/r_wall/rust,
+/area/ship/crew/toilet)
+"KU" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/obj/effect/decal/cleanable/garbage{
+	pixel_x = -7;
+	pixel_y = 11
+	},
+/obj/structure/catwalk/over/plated_catwalk,
+/turf/open/floor/plating,
+/area/ship/crew/toilet)
+"KZ" = (
+/obj/machinery/door/window/brigdoor/eastright,
+/obj/machinery/shower{
+	dir = 1
+	},
+/obj/effect/turf_decal/techfloor/hole,
+/obj/effect/turf_decal/techfloor/hole/right{
+	dir = 2
+	},
+/obj/item/bikehorn/rubberducky/plasticducky{
+	pixel_y = 7;
+	pixel_x = -6
+	},
+/turf/open/floor/plasteel/showroomfloor,
+/area/ship/crew/toilet)
 "Lb" = (
 /obj/structure/table,
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/turf_decal/siding/wideplating{
-	dir = 5
+/obj/item/reagent_containers/glass/bowl{
+	pixel_y = 3;
+	w_class = 2
 	},
-/obj/machinery/light/directional/north,
-/turf/open/floor/plasteel/patterned/grid,
+/obj/item/reagent_containers/glass/bowl{
+	pixel_y = 5;
+	w_class = 2
+	},
+/obj/item/reagent_containers/glass/bowl{
+	pixel_y = 7;
+	w_class = 2
+	},
+/obj/item/reagent_containers/glass/bowl{
+	pixel_y = 9;
+	w_class = 2
+	},
+/obj/item/reagent_containers/glass/bowl{
+	pixel_y = 11;
+	w_class = 2
+	},
+/obj/item/reagent_containers/glass/bowl{
+	pixel_y = 13;
+	w_class = 2
+	},
+/obj/effect/turf_decal/corner/opaque/bar,
+/obj/effect/turf_decal/corner/opaque/bar{
+	dir = 1
+	},
+/turf/open/floor/plasteel,
 /area/ship/crew/canteen)
 "Ld" = (
-/obj/item/toy/plush/moth/error,
-/turf/open/floor/plating/airless,
-/area/ship/maintenance)
+/obj/machinery/telecomms/bus/preset_six,
+/obj/machinery/light/small/directional/north,
+/turf/open/floor/plating{
+	icon_state = "plating_rust"
+	},
+/area/ship/maintenance/aft)
+"Lf" = (
+/turf/open/floor/plasteel/dark,
+/area/ship/security/armory)
 "Lg" = (
 /obj/effect/gibspawner/human/bodypartless,
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating/airless,
+/turf/open/floor/plating,
 /area/ship/maintenance)
 "Lm" = (
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
 	},
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating/airless{
+/turf/open/floor/plating{
 	icon_state = "plating_rust"
 	},
 /area/ship/maintenance)
 "Lo" = (
 /obj/structure/cable/yellow{
-	icon_state = "4-8"
+	icon_state = "1-2"
 	},
-/obj/structure/door_assembly/door_assembly_hatch{
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
 	dir = 4
 	},
-/turf/open/floor/plating/airless,
-/area/ship/maintenance)
+/turf/open/floor/plasteel,
+/area/ship/crew)
 "Lt" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /obj/structure/table,
 /obj/item/storage/cans/sixbeer,
 /obj/machinery/cell_charger,
+/obj/machinery/button/door{
+	id = "pmaint_shutter";
+	pixel_y = 23
+	},
 /turf/open/floor/plasteel/tech,
 /area/ship/maintenance/port)
+"Lx" = (
+/obj/structure/closet/cabinet,
+/obj/item/clothing/under/frontiersmen{
+	pixel_x = -7
+	},
+/obj/item/clothing/under/frontiersmen{
+	pixel_x = -4
+	},
+/obj/item/clothing/under/frontiersmen,
+/obj/item/clothing/under/frontiersmen{
+	pixel_x = 4
+	},
+/obj/item/clothing/under/frontiersmen{
+	pixel_x = 8
+	},
+/obj/item/clothing/shoes/jackboots{
+	pixel_y = -13;
+	pixel_x = -8
+	},
+/obj/item/clothing/shoes/jackboots{
+	pixel_y = -13;
+	pixel_x = -4
+	},
+/obj/item/clothing/shoes/jackboots{
+	pixel_y = -13
+	},
+/obj/item/clothing/shoes/jackboots{
+	pixel_y = -13;
+	pixel_x = 4
+	},
+/obj/item/clothing/shoes/jackboots{
+	pixel_y = -13;
+	pixel_x = 8
+	},
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 10
+	},
+/turf/open/floor/plasteel,
+/area/ship/crew)
 "Lz" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
-	dir = 4
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/grille/indestructible,
+/obj/machinery/door/poddoor/shutters/preopen{
+	dir = 1;
+	id = "flyboy"
 	},
-/obj/effect/turf_decal/siding/red{
+/obj/structure/window/reinforced/fulltile,
+/turf/open/floor/plating{
+	icon_state = "plating_rust"
+	},
+/area/ship/maintenance)
+"LF" = (
+/obj/machinery/light/directional/east,
+/obj/effect/turf_decal/siding/thinplating/dark{
 	dir = 4
 	},
-/turf/open/floor/mineral/titanium,
-/area/ship/security/armory)
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/chair/handrail{
+	dir = 8;
+	pixel_x = 2
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/canteen)
 "LG" = (
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
@@ -2883,12 +4238,10 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 4
 	},
-/obj/effect/turf_decal/siding/wideplating/corner,
-/obj/effect/turf_decal/siding/wideplating/corner{
-	dir = 4
+/obj/effect/turf_decal/siding/white{
+	dir = 1
 	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/mono/dark,
 /area/ship/crew/canteen)
 "LH" = (
 /obj/effect/decal/fakelattice{
@@ -2899,6 +4252,20 @@
 	},
 /turf/open/floor/plasteel/elevatorshaft,
 /area/ship/cargo)
+"LJ" = (
+/obj/effect/turf_decal/corner/opaque/bar,
+/obj/effect/turf_decal/corner/opaque/bar{
+	dir = 1
+	},
+/obj/structure/closet/secure_closet/freezer/kitchen/wall/directional/north,
+/obj/effect/spawner/random/food_or_drink/ration,
+/obj/effect/spawner/random/food_or_drink/ration,
+/obj/effect/spawner/random/food_or_drink/ration,
+/obj/effect/spawner/random/food_or_drink/ration,
+/obj/effect/spawner/random/food_or_drink/ration,
+/obj/effect/spawner/random/food_or_drink/ration,
+/turf/open/floor/plasteel,
+/area/ship/crew/canteen)
 "Mb" = (
 /obj/structure/chair/plastic{
 	dir = 8
@@ -2913,32 +4280,18 @@
 /turf/open/floor/pod/dark,
 /area/ship/maintenance/starboard)
 "Mk" = (
-/obj/machinery/light/directional/south,
 /obj/structure/table,
-/obj/item/dyespray{
-	pixel_x = -5;
-	pixel_y = 7
+/obj/item/modular_computer/laptop,
+/obj/item/clothing/glasses/sunglasses,
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/office)
+"Ml" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
 	},
-/obj/item/lipstick/jade{
-	pixel_x = 9;
-	pixel_y = 5
-	},
-/obj/item/lipstick/purple{
-	pixel_x = 8
-	},
-/obj/item/lipstick{
-	pixel_x = 5;
-	pixel_y = -4
-	},
-/turf/open/floor/plasteel/showroomfloor,
-/area/ship/crew/canteen)
-"Ml" = (
-/obj/structure/catwalk/over/plated_catwalk,
-/obj/structure/cable/yellow{
-	icon_state = "4-8"
-	},
-/obj/effect/turf_decal/industrial/warning{
-	dir = 1
+/obj/effect/turf_decal/industrial/warning{
+	dir = 1
 	},
 /obj/structure/railing/corner{
 	dir = 1
@@ -2977,65 +4330,67 @@
 /area/ship/cargo)
 "MC" = (
 /obj/structure/cable/yellow{
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 4
+	icon_state = "1-6"
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 4
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/light/small/directional/west,
+/turf/open/floor/plating{
+	icon_state = "plating_rust"
 	},
-/turf/open/floor/plasteel/dark,
-/area/ship/crew/canteen)
+/area/ship/maintenance)
 "MD" = (
-/obj/structure/table/wood,
-/turf/open/floor/carpet,
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/obj/effect/turf_decal/siding/thinplating/dark/corner,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/structure/cable/yellow{
+	icon_state = "1-8"
+	},
+/turf/open/floor/plasteel,
 /area/ship/crew)
 "MF" = (
-/obj/structure/floodlight_frame,
-/turf/open/floor/plating/airless,
-/area/ship/maintenance)
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plating{
+	icon_state = "plating_rust"
+	},
+/area/ship/maintenance/aft)
 "MH" = (
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
 	},
 /obj/effect/spawner/random/trash/grille_or_waste,
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating/airless{
-	icon_state = "plating_rust"
-	},
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plating,
 /area/ship/maintenance)
 "MI" = (
-/obj/machinery/door/airlock/hatch{
-	dir = 8
-	},
-/obj/effect/mapping_helpers/airlock/abandoned,
-/obj/structure/cable/yellow{
-	icon_state = "4-8"
-	},
-/turf/open/floor/plating/airless,
+/obj/machinery/deepfryer,
+/turf/open/floor/plating,
 /area/ship/maintenance)
 "MK" = (
-/obj/structure/cable/yellow{
-	icon_state = "1-2"
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+/obj/effect/turf_decal/borderfloor{
 	dir = 1
 	},
-/obj/effect/turf_decal/spline/fancy/opaque/black{
-	dir = 1
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 10
 	},
-/obj/machinery/door/firedoor/border_only{
-	dir = 1
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 10
 	},
-/obj/item/kirbyplants{
-	icon_state = "plant-25";
-	pixel_x = 8;
-	pixel_y = -5
+/obj/structure/cable/yellow{
+	icon_state = "2-8"
 	},
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plasteel/mono/dark,
 /area/ship/crew/canteen)
+"MM" = (
+/obj/structure/closet/secure_closet/wall/directional/south,
+/obj/item/towel,
+/turf/open/floor/plasteel/tech/techmaint,
+/area/ship/crew/toilet)
 "MO" = (
 /obj/effect/turf_decal/borderfloor{
 	dir = 1
@@ -3050,11 +4405,27 @@
 /obj/structure/cable/yellow{
 	icon_state = "1-2"
 	},
+/obj/effect/turf_decal/siding/thinplating/dark,
 /turf/open/floor/plasteel/tech/techmaint,
 /area/ship/cargo)
 "MS" = (
-/turf/open/floor/plasteel/showroomfloor,
-/area/ship/crew/canteen)
+/obj/structure/table,
+/obj/item/storage/toolbox/drone,
+/obj/machinery/button/door{
+	dir = 1;
+	pixel_x = -6;
+	pixel_y = -21;
+	id = "flyboy"
+	},
+/obj/effect/turf_decal/techfloor{
+	dir = 4
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/office)
+"Nm" = (
+/obj/machinery/vending/boozeomat/all_access,
+/turf/open/floor/holofloor/carpet,
+/area/ship/crew/ccommons)
 "Nr" = (
 /obj/structure/cable/yellow{
 	icon_state = "1-4"
@@ -3065,7 +4436,10 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 5
 	},
-/turf/open/floor/plasteel,
+/obj/structure/chair/stool{
+	dir = 8
+	},
+/turf/open/floor/plasteel/grimy,
 /area/ship/crew/canteen)
 "NI" = (
 /obj/effect/turf_decal/techfloor{
@@ -3084,6 +4458,12 @@
 	pixel_x = -9;
 	pixel_y = -6
 	},
+/obj/machinery/button/door{
+	dir = 1;
+	pixel_y = -22;
+	id = "tbridge";
+	name = "bridge shutters"
+	},
 /turf/open/floor/plasteel/mono/dark,
 /area/ship/bridge)
 "Ol" = (
@@ -3096,6 +4476,12 @@
 	},
 /turf/open/floor/plating,
 /area/ship/cargo)
+"Om" = (
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/turf/open/floor/plating,
+/area/ship/maintenance/aft)
 "Oo" = (
 /obj/structure/catwalk/over/plated_catwalk,
 /obj/structure/railing{
@@ -3113,36 +4499,19 @@
 /turf/open/floor/plating,
 /area/ship/cargo)
 "Op" = (
-/obj/effect/turf_decal/siding/wood,
-/obj/structure/closet/cabinet,
-/obj/item/clothing/under/frontiersmen/officer{
-	pixel_x = -5
-	},
-/obj/item/clothing/shoes/jackboots{
-	pixel_y = -13
-	},
-/obj/item/clothing/head/frontier/peaked{
-	pixel_y = 9
-	},
-/obj/item/clothing/suit/armor/frontier{
-	pixel_x = 8
-	},
-/obj/item/clothing/suit/armor/frontier{
-	pixel_x = 8
-	},
-/obj/item/clothing/under/frontiersmen/officer{
-	pixel_x = -5
+/obj/machinery/door/firedoor/border_only{
+	dir = 1
 	},
-/obj/item/clothing/head/frontier/peaked{
-	pixel_y = 9
+/obj/item/kirbyplants{
+	icon_state = "plant-25";
+	pixel_x = 8;
+	pixel_y = -5
 	},
-/obj/item/clothing/shoes/jackboots{
-	pixel_y = -13
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 5
 	},
-/obj/item/storage/box/ammo/c38_surplus,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/carpet/nanoweave,
-/area/ship/crew/crewtwo)
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/canteen)
 "OF" = (
 /obj/effect/decal/fakelattice{
 	icon_state = "lattice-12"
@@ -3154,12 +4523,13 @@
 /turf/open/floor/plasteel/elevatorshaft,
 /area/ship/cargo)
 "OG" = (
-/obj/effect/decal/cleanable/vomit{
-	pixel_x = 8;
-	pixel_y = 14
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
 	},
-/turf/open/floor/plating/airless,
-/area/ship/maintenance)
+/obj/machinery/light/small/directional/south,
+/obj/structure/catwalk/over/plated_catwalk,
+/turf/open/floor/plating,
+/area/ship/crew/toilet)
 "OH" = (
 /obj/structure/catwalk/over/plated_catwalk,
 /obj/structure/cable/yellow{
@@ -3187,6 +4557,13 @@
 	},
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
+"OM" = (
+/obj/effect/turf_decal/techfloor{
+	dir = 5
+	},
+/obj/machinery/vending/coffee,
+/turf/open/floor/plasteel/tech/grid/airless,
+/area/ship/crew/canteen)
 "OP" = (
 /obj/machinery/power/terminal{
 	dir = 8
@@ -3198,30 +4575,53 @@
 	pixel_x = 8;
 	pixel_y = -7
 	},
+/obj/machinery/button/door{
+	id = "port_engine";
+	pixel_y = 23
+	},
 /turf/open/floor/plasteel/tech,
 /area/ship/maintenance/port)
-"Pa" = (
-/obj/structure/table/glass,
-/obj/effect/turf_decal/corner/opaque/blue/full,
-/obj/item/storage/case/surgery{
-	pixel_x = 0;
-	pixel_y = 3
-	},
-/obj/machinery/light_switch{
-	pixel_y = 22
+"OU" = (
+/obj/structure/table,
+/obj/machinery/recharger{
+	pixel_x = -8
 	},
-/obj/item/clothing/suit/apron/surgical{
+/obj/item/bodycamera/broadcast_camera,
+/obj/machinery/button/door{
+	id = "armory";
+	name = "Door Control";
+	normaldoorcontrol = 1;
 	pixel_x = -7;
-	pixel_y = 10
+	pixel_y = 21;
+	req_access_txt = "3"
+	},
+/obj/machinery/button/door{
+	id = "armory";
+	name = "Door Bolt Control";
+	normaldoorcontrol = 1;
+	pixel_x = 6;
+	pixel_y = 21;
+	req_access_txt = "3";
+	specialfunctions = 4
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/security/armory)
+"Pa" = (
+/obj/effect/turf_decal/corner/opaque/blue/full,
+/obj/structure/cable/yellow{
+	icon_state = "0-8"
 	},
+/obj/machinery/power/apc/auto_name/directional/east,
 /turf/open/floor/plasteel/white,
-/area/ship/crew/canteen)
+/area/ship/medical)
 "Pb" = (
 /obj/effect/spawner/random/trash/grille_or_waste,
-/turf/open/floor/plating/airless{
-	icon_state = "platingdmg1"
-	},
+/turf/open/floor/plating,
 /area/ship/maintenance)
+"Pg" = (
+/obj/item/toy/plush/moth/error,
+/turf/open/floor/plating/airless,
+/area/ship/maintenance/aft)
 "Pl" = (
 /obj/structure/catwalk/over/plated_catwalk,
 /obj/structure/railing/corner{
@@ -3233,14 +4633,25 @@
 /turf/open/floor/plating,
 /area/ship/cargo)
 "Po" = (
-/obj/structure/bed{
-	dir = 1
+/obj/effect/turf_decal/corner/opaque/blue{
+	dir = 4
 	},
-/obj/effect/turf_decal/corner/opaque/blue/full,
-/obj/machinery/computer/helm/viewscreen/directional/north,
-/obj/machinery/light/directional/west,
-/turf/open/floor/plasteel/white,
-/area/ship/crew/canteen)
+/obj/effect/turf_decal/corner/opaque/blue{
+	dir = 8
+	},
+/obj/structure/table/glass,
+/obj/item/storage/case/surgery{
+	pixel_x = 0;
+	pixel_y = 3
+	},
+/obj/item/clothing/suit/apron/surgical{
+	pixel_x = -7;
+	pixel_y = 10
+	},
+/turf/open/floor/plating{
+	icon_state = "plating_rust"
+	},
+/area/ship/medical)
 "Pu" = (
 /obj/structure/window/reinforced{
 	dir = 8
@@ -3251,6 +4662,10 @@
 /obj/structure/cable{
 	icon_state = "0-8"
 	},
+/obj/machinery/door/poddoor/shutters{
+	dir = 4;
+	id = "port_engine"
+	},
 /turf/open/floor/plasteel/tech,
 /area/ship/maintenance/port)
 "Pw" = (
@@ -3266,30 +4681,67 @@
 /turf/open/floor/pod/dark,
 /area/ship/maintenance/port)
 "Px" = (
-/obj/effect/turf_decal/techfloor,
-/obj/structure/guncloset{
-	anchored = 1
-	},
-/obj/item/gun/ballistic/automatic/pistol/candor,
-/obj/item/gun/ballistic/automatic/pistol/candor,
-/obj/item/gun/ballistic/automatic/pistol/candor,
-/turf/open/floor/plasteel/tech/grid,
-/area/ship/security/armory)
+/turf/closed/mineral/ship,
+/area/ship/maintenance/aft)
+"PB" = (
+/obj/machinery/light/directional/north,
+/obj/machinery/suit_storage_unit/frontiersmen/locked,
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/office)
 "PC" = (
-/obj/effect/turf_decal/siding/wideplating{
-	dir = 10
+/obj/structure/chair{
+	dir = 4
 	},
-/turf/open/floor/plasteel,
+/obj/effect/turf_decal/borderfloor,
+/turf/open/floor/plasteel/mono/dark,
 /area/ship/crew/canteen)
 "PI" = (
 /obj/effect/turf_decal/borderfloor,
 /obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 1
+	},
 /turf/open/floor/plasteel/tech/techmaint,
 /area/ship/cargo)
+"PJ" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 6
+	},
+/obj/machinery/jukebox,
+/obj/machinery/light/directional/north,
+/turf/open/floor/wood,
+/area/ship/crew/ccommons)
+"PR" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+	dir = 1
+	},
+/obj/machinery/portable_atmospherics/canister/fuel,
+/turf/open/floor/plating{
+	icon_state = "plating_rust"
+	},
+/area/ship/maintenance)
 "PV" = (
 /obj/structure/chair/office,
 /turf/open/floor/plasteel/grimy,
 /area/ship/crew)
+"Qc" = (
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/obj/structure/cable/yellow{
+	icon_state = "2-8"
+	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+	dir = 1
+	},
+/obj/effect/turf_decal/siding/white{
+	dir = 1
+	},
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/crew/canteen)
 "Qi" = (
 /obj/effect/turf_decal/siding/wood,
 /obj/effect/decal/cleanable/dirt,
@@ -3303,39 +4755,72 @@
 /turf/closed/wall/r_wall/rust,
 /area/ship/maintenance)
 "QK" = (
-/obj/effect/turf_decal/box/corners{
-	dir = 4
+/obj/effect/spawner/random/trash/decal,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plating{
+	icon_state = "plating_rust"
 	},
-/obj/structure/tank_dispenser/oxygen,
-/turf/open/floor/plasteel/mono,
-/area/ship/cargo)
+/area/ship/maintenance)
 "QM" = (
 /obj/effect/spawner/random/maintenance/three,
 /obj/structure/closet/cardboard,
-/turf/open/floor/plating/airless,
+/turf/open/floor/plating,
 /area/ship/maintenance)
+"QN" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 8
+	},
+/turf/open/floor/plasteel/tech/techmaint,
+/area/ship/cargo)
 "QP" = (
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
 	},
 /turf/open/floor/plasteel/dark,
 /area/ship/maintenance/port)
+"QR" = (
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/effect/turf_decal/siding/white{
+	dir = 4
+	},
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 8
+	},
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/crew/canteen)
 "QT" = (
 /obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/corner/opaque/bar,
+/obj/effect/turf_decal/corner/opaque/bar{
+	dir = 1
+	},
 /turf/open/floor/plasteel,
 /area/ship/crew/canteen)
 "QV" = (
-/obj/item/book/manual/wiki/ghetto_chemistry{
-	pixel_y = 11;
-	pixel_x = -7
-	},
-/obj/item/lighter{
-	pixel_x = 5
-	},
-/turf/open/floor/plating/airless{
-	icon_state = "panelscorched"
+/obj/structure/floodlight_frame,
+/obj/item/light/tube/broken,
+/obj/structure/cable/yellow,
+/turf/open/floor/plating,
+/area/ship/maintenance/aft)
+"Rc" = (
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
 	},
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plating,
 /area/ship/maintenance)
+"Re" = (
+/obj/effect/turf_decal/corner/opaque/bar,
+/obj/effect/turf_decal/corner/opaque/bar{
+	dir = 1
+	},
+/turf/open/floor/plasteel,
+/area/ship/crew/canteen)
 "Rg" = (
 /obj/machinery/button/door{
 	id = "watchdog_cargo";
@@ -3348,6 +4833,9 @@
 	pixel_y = 23
 	},
 /obj/machinery/light/directional/west,
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 4
+	},
 /turf/open/floor/plasteel/tech/techmaint,
 /area/ship/cargo)
 "Rn" = (
@@ -3356,22 +4844,40 @@
 /turf/open/floor/plating,
 /area/ship/cargo)
 "Rs" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+	dir = 4
+	},
+/obj/effect/turf_decal/siding/red{
+	dir = 4
+	},
 /obj/structure/cable/yellow{
-	icon_state = "4-8"
+	icon_state = "5-8"
 	},
-/obj/effect/spawner/random/trash/grille_or_waste,
-/turf/open/floor/plating/airless{
-	icon_state = "plating_rust"
+/obj/structure/cable/yellow{
+	icon_state = "5-10"
 	},
-/area/ship/maintenance)
+/turf/open/floor/mineral/titanium,
+/area/ship/security/armory)
+"Rw" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/closet/crate/secure/loot,
+/obj/machinery/light/small/directional/south,
+/turf/open/floor/plating,
+/area/ship/maintenance/aft)
 "Ry" = (
 /obj/machinery/light/floor,
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 8
+	},
 /turf/open/floor/plasteel/tech/techmaint,
 /area/ship/cargo)
 "RB" = (
 /obj/structure/cable/yellow{
 	icon_state = "6-8"
 	},
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 4
+	},
 /turf/open/floor/plasteel/tech/techmaint,
 /area/ship/cargo)
 "RF" = (
@@ -3388,19 +4894,12 @@
 	},
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/security/armory)
-"RP" = (
-/obj/structure/catwalk/over/plated_catwalk,
-/obj/structure/railing{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/structure/cable/yellow{
-	icon_state = "1-10"
-	},
-/turf/open/floor/plating,
-/area/ship/cargo)
-"RV" = (
+"RK" = (
+/obj/structure/table,
+/obj/item/reagent_containers/food/drinks/bottle/whiskey,
+/turf/open/floor/plasteel/grimy,
+/area/ship/crew/canteen)
+"RN" = (
 /obj/item/melee/knife/plastic{
 	pixel_x = 8
 	},
@@ -3431,11 +4930,41 @@
 	pixel_x = -12;
 	pixel_y = -3
 	},
-/obj/structure/window/reinforced{
-	dir = 4
+/obj/structure/table,
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/obj/item/radio/intercom/directional/north,
+/turf/open/floor/plasteel/dark,
+/area/ship/security/armory)
+"RP" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/structure/railing{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/structure/cable/yellow{
+	icon_state = "1-10"
 	},
 /turf/open/floor/plating,
+/area/ship/cargo)
+"RV" = (
+/obj/structure/chair/plastic{
+	dir = 1
+	},
+/turf/open/floor/plating{
+	icon_state = "plating_rust"
+	},
 /area/ship/security/armory)
+"Sc" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/crew/canteen)
 "Se" = (
 /turf/closed/wall/r_wall,
 /area/ship/bridge)
@@ -3445,12 +4974,28 @@
 	},
 /turf/open/floor/plasteel/mono,
 /area/ship/cargo)
+"Sp" = (
+/obj/item/chair/stool/bar,
+/obj/effect/decal/cleanable/vomit/old,
+/obj/effect/turf_decal/siding/wood{
+	dir = 6
+	},
+/turf/open/floor/wood,
+/area/ship/crew/ccommons)
 "Ss" = (
 /obj/structure/table/wood/reinforced,
 /obj/item/modular_computer/laptop/preset/civilian/rilena{
 	pixel_x = -16;
 	pixel_y = 4
 	},
+/obj/item/spacecash/bundle/c1000{
+	pixel_x = 5;
+	pixel_y = 9
+	},
+/obj/item/spacecash/bundle/c1000{
+	pixel_x = 8;
+	pixel_y = -1
+	},
 /turf/open/floor/carpet/nanoweave,
 /area/ship/crew/crewtwo)
 "Su" = (
@@ -3479,10 +5024,14 @@
 /turf/open/floor/plating,
 /area/ship/cargo)
 "Sy" = (
-/obj/machinery/iv_drip,
-/obj/effect/turf_decal/corner/opaque/blue/full,
-/turf/open/floor/plasteel/white,
-/area/ship/crew/canteen)
+/obj/machinery/light/directional/west,
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/crate_shelf,
+/obj/structure/closet/crate/secure/loot,
+/turf/open/floor/plating{
+	icon_state = "plating_rust"
+	},
+/area/ship/maintenance)
 "SC" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plasteel/tech,
@@ -3495,10 +5044,7 @@
 /area/ship/security/armory)
 "SG" = (
 /obj/structure/closet/crate/bin,
-/obj/effect/turf_decal/siding/wideplating{
-	dir = 9
-	},
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/mono/dark,
 /area/ship/crew/canteen)
 "SJ" = (
 /obj/structure/cable/yellow{
@@ -3521,9 +5067,13 @@
 /turf/open/floor/pod/dark,
 /area/ship/maintenance/port)
 "SV" = (
-/obj/structure/cable/yellow{
-	icon_state = "4-8"
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 4
 	},
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /turf/open/floor/plasteel,
 /area/ship/crew)
 "SX" = (
@@ -3544,8 +5094,35 @@
 /area/ship/crew/crewtwo)
 "Td" = (
 /obj/effect/turf_decal/borderfloor,
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 1
+	},
 /turf/open/floor/plasteel/tech/techmaint,
 /area/ship/cargo)
+"Te" = (
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/effect/turf_decal/borderfloor,
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/crew/canteen)
+"Tk" = (
+/obj/effect/turf_decal/techfloor{
+	dir = 1
+	},
+/obj/machinery/button/door{
+	pixel_y = 23;
+	id = "flyboy";
+	name = "privacy shutters"
+	},
+/obj/effect/mapping_helpers/crate_shelve,
+/obj/structure/closet/crate/secure/loot,
+/turf/open/floor/plating{
+	icon_state = "plating_rust"
+	},
+/area/ship/maintenance)
 "Tq" = (
 /obj/structure/cable/yellow{
 	icon_state = "0-2"
@@ -3565,6 +5142,9 @@
 /obj/effect/turf_decal/borderfloor,
 /obj/machinery/light/directional/south,
 /obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 1
+	},
 /turf/open/floor/plasteel/tech/techmaint,
 /area/ship/cargo)
 "TN" = (
@@ -3577,6 +5157,31 @@
 	icon_state = "wood-broken6"
 	},
 /area/ship/crew/crewtwo)
+"TR" = (
+/turf/closed/wall/r_wall/rust,
+/area/ship/maintenance/port)
+"TZ" = (
+/obj/machinery/door/airlock/hatch{
+	dir = 8
+	},
+/obj/effect/mapping_helpers/airlock/abandoned,
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 8
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 4
+	},
+/turf/open/floor/plating,
+/area/ship/maintenance)
+"Uf" = (
+/obj/structure/salvageable/safe_server,
+/turf/open/floor/plating{
+	icon_state = "plating_rust"
+	},
+/area/ship/maintenance/aft)
 "Uk" = (
 /obj/effect/turf_decal/siding/wood{
 	dir = 10
@@ -3606,12 +5211,22 @@
 /obj/structure/closet/emcloset,
 /turf/open/floor/pod/dark,
 /area/ship/maintenance/port)
+"Uz" = (
+/obj/machinery/light/small/directional/east,
+/turf/open/floor/plasteel/tech/techmaint,
+/area/ship/crew/toilet)
 "UE" = (
 /obj/structure/cable/yellow{
 	icon_state = "2-4"
 	},
 /turf/open/floor/plasteel,
 /area/ship/crew)
+"UJ" = (
+/obj/effect/turf_decal/siding/blue{
+	dir = 8
+	},
+/turf/open/floor/plasteel/white,
+/area/ship/medical)
 "UO" = (
 /obj/structure/table/wood,
 /obj/machinery/light/directional/north,
@@ -3622,80 +5237,75 @@
 /turf/open/floor/plasteel/tech/techmaint,
 /area/ship/cargo)
 "UT" = (
-/obj/effect/mapping_helpers/airlock/locked,
 /obj/machinery/door/airlock/hatch,
 /obj/structure/cable/yellow{
 	icon_state = "1-2"
 	},
-/obj/machinery/door/firedoor/heavy,
-/turf/open/floor/plating/airless,
-/area/ship/maintenance)
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/turf/open/floor/plating,
+/area/ship/maintenance/starboard)
 "Vb" = (
-/obj/machinery/suit_storage_unit/industrial{
-	suit_type = /obj/item/clothing/suit/space/hardsuit/security/independent/frontier
-	},
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/extinguisher_cabinet/directional/south,
+/obj/machinery/suit_storage_unit/frontiersmen/locked,
 /turf/open/floor/mineral/plastitanium,
 /area/ship/security/armory)
 "Vd" = (
-/obj/structure/curtain/bounty,
-/turf/open/floor/plasteel,
-/area/ship/crew)
-"Vf" = (
+/obj/structure/mirror{
+	pixel_y = 35;
+	pixel_x = 1
+	},
 /obj/structure/sink{
 	pixel_x = 2;
 	pixel_y = 20
 	},
-/obj/structure/mirror{
-	pixel_y = 28;
-	pixel_x = 1
+/obj/effect/turf_decal/techfloor{
+	dir = 6
 	},
-/turf/open/floor/plasteel/showroomfloor,
-/area/ship/crew/canteen)
-"Vg" = (
-/obj/structure/closet/cabinet,
-/obj/item/clothing/under/frontiersmen{
-	pixel_x = -7
+/turf/open/floor/plasteel/tech/grid/airless,
+/area/ship/crew/toilet)
+"Vf" = (
+/obj/effect/turf_decal/techfloor{
+	dir = 4
 	},
-/obj/item/clothing/under/frontiersmen{
-	pixel_x = -4
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
+/obj/machinery/power/apc/auto_name/directional/north,
+/obj/structure/cable/yellow{
+	icon_state = "0-2"
 	},
-/obj/item/clothing/under/frontiersmen,
-/obj/item/clothing/under/frontiersmen{
-	pixel_x = 4
+/obj/machinery/light_switch{
+	pixel_y = 20;
+	pixel_x = 12
 	},
-/obj/item/clothing/under/frontiersmen{
-	pixel_x = 8
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/office)
+"Vg" = (
+/obj/structure/table,
+/obj/structure/cable/yellow{
+	icon_state = "0-4"
 	},
-/obj/item/clothing/shoes/jackboots{
-	pixel_y = -13;
-	pixel_x = -8
+/obj/machinery/power/apc/auto_name/directional/north,
+/obj/machinery/light_switch{
+	pixel_y = 20;
+	pixel_x = 12
 	},
-/obj/item/clothing/shoes/jackboots{
-	pixel_y = -13;
-	pixel_x = -4
+/obj/structure/sign/warning/electricshock{
+	pixel_x = -25
 	},
-/obj/item/clothing/shoes/jackboots{
-	pixel_y = -13
+/turf/open/floor/mineral/plastitanium,
+/area/ship/security/armory)
+"Vh" = (
+/obj/structure/chair/stool{
+	dir = 4
 	},
-/obj/item/clothing/shoes/jackboots{
-	pixel_y = -13;
-	pixel_x = 4
-	},
-/obj/item/clothing/shoes/jackboots{
-	pixel_y = -13;
-	pixel_x = 8
-	},
-/turf/open/floor/plasteel,
-/area/ship/crew)
+/turf/open/floor/plasteel/grimy,
+/area/ship/crew/canteen)
 "Vm" = (
-/obj/item/reagent_containers/glass/bucket{
-	desc = "Better get scoopin'.";
-	name = "oil-soaked bucket";
-	pixel_x = -5;
-	pixel_y = 5
+/obj/machinery/atmospherics/components/unary/portables_connector{
+	dir = 8
 	},
+/obj/machinery/portable_atmospherics/canister/fuel,
 /turf/open/floor/pod/dark,
 /area/ship/maintenance/starboard)
 "Vt" = (
@@ -3706,9 +5316,6 @@
 	pixel_x = -9;
 	pixel_y = 12
 	},
-/obj/item/crowbar{
-	pixel_x = 21
-	},
 /obj/effect/decal/cleanable/blood/drip{
 	pixel_y = 3;
 	pixel_x = -9;
@@ -3721,8 +5328,8 @@
 /obj/effect/decal/cleanable/blood/splatter{
 	pixel_y = -4
 	},
-/turf/open/floor/plating/airless{
-	icon_state = "platingdmg1"
+/turf/open/floor/plating{
+	icon_state = "plating_rust"
 	},
 /area/ship/cargo)
 "VE" = (
@@ -3739,53 +5346,49 @@
 /area/ship/cargo)
 "VH" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
-/obj/structure/table,
-/obj/item/folder{
-	pixel_x = -6;
-	pixel_y = 12
-	},
-/obj/item/folder{
-	pixel_x = -2;
-	pixel_y = 7
+/obj/machinery/modular_computer/console/preset/command{
+	dir = 4
 	},
 /turf/open/floor/plasteel/tech,
 /area/ship/bridge)
 "VO" = (
-/obj/docking_port/mobile{
-	name = "tortuga docking port";
-	port_direction = 8;
-	preferred_direction = 4;
-	dir = 2
-	},
-/turf/closed/wall,
-/area/ship/maintenance/port)
+/turf/closed/wall/r_wall,
+/area/ship/medical)
 "VP" = (
 /obj/effect/turf_decal/borderfloor{
 	dir = 1
 	},
 /obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/siding/thinplating/dark,
 /turf/open/floor/plasteel/tech/techmaint,
 /area/ship/cargo)
 "VQ" = (
-/obj/structure/cable/yellow{
-	icon_state = "2-4"
+/obj/structure/table/wood,
+/obj/item/reagent_containers/food/drinks/shaker,
+/obj/effect/turf_decal/siding/wood{
+	dir = 6
 	},
-/obj/structure/salvageable/computer,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating/airless,
-/area/ship/maintenance)
+/turf/open/floor/wood,
+/area/ship/crew/ccommons)
 "Wa" = (
 /obj/structure/cable/yellow{
 	icon_state = "5-8"
 	},
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 4
+	},
 /turf/open/floor/plasteel/tech/techmaint,
 /area/ship/cargo)
 "Wd" = (
-/obj/effect/decal/cleanable/crayon{
-	icon_state = "engie"
+/obj/machinery/door/airlock/hatch,
+/obj/machinery/door/firedoor/heavy,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
 	},
-/turf/open/floor/plating/airless,
-/area/ship/maintenance)
+/turf/open/floor/plating,
+/area/ship/crew)
 "We" = (
 /obj/effect/turf_decal/box/corners{
 	dir = 1
@@ -3816,21 +5419,47 @@
 /obj/item/storage/bag/ore{
 	pixel_x = -11
 	},
+/obj/item/storage/box/emptysandbags,
+/obj/item/storage/box/emptysandbags,
+/obj/item/storage/box/flares,
+/obj/item/storage/box/flares,
+/obj/item/storage/box/flares,
 /turf/open/floor/plasteel/mono,
 /area/ship/cargo)
 "Wv" = (
-/obj/structure/cable/yellow{
-	icon_state = "4-8"
+/obj/effect/turf_decal/spline/fancy/opaque/black{
+	dir = 1
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 1
 	},
-/obj/structure/salvageable/computer{
+/obj/effect/turf_decal/siding/thinplating/dark{
 	dir = 1
 	},
-/obj/effect/decal/cleanable/glass,
-/turf/open/floor/plating/airless,
-/area/ship/maintenance)
-"Wx" = (
-/turf/closed/wall/r_wall/rust,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/dark,
 /area/ship/crew/canteen)
+"Ww" = (
+/obj/structure/grille,
+/obj/structure/window/reinforced/fulltile,
+/obj/machinery/door/poddoor/shutters/preopen{
+	dir = 4;
+	id = "cell"
+	},
+/obj/structure/cable/yellow{
+	icon_state = "0-4"
+	},
+/turf/open/floor/plating,
+/area/ship/security/armory)
+"Wx" = (
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 8
+	},
+/obj/effect/turf_decal/industrial/stand_clear{
+	dir = 4
+	},
+/turf/open/floor/plasteel/tech/techmaint,
+/area/ship/cargo)
 "WA" = (
 /obj/effect/turf_decal/borderfloor{
 	dir = 1
@@ -3839,11 +5468,24 @@
 /obj/structure/sign/poster/ripped{
 	pixel_y = 32
 	},
+/obj/effect/turf_decal/siding/thinplating/dark,
 /turf/open/floor/plasteel/tech/techmaint,
 /area/ship/cargo)
 "WF" = (
 /turf/closed/wall/rust,
 /area/ship/cargo)
+"WS" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/table,
+/obj/item/laser_pointer/red{
+	pixel_y = -4
+	},
+/obj/item/gun/energy/laser/practice{
+	pixel_x = 5;
+	pixel_y = 9
+	},
+/turf/open/floor/plasteel/tech/techmaint,
+/area/ship/cargo)
 "Xb" = (
 /obj/structure/catwalk/over/plated_catwalk,
 /obj/structure/railing/corner{
@@ -3874,10 +5516,16 @@
 	icon_state = "4-9"
 	},
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/power/ship_gravity,
 /obj/effect/turf_decal/borderfloorblack/full,
+/obj/structure/reagent_dispensers/fueltank,
 /turf/open/floor/plasteel/tech,
 /area/ship/maintenance/starboard)
+"Xq" = (
+/obj/machinery/telecomms/processor/preset_six{
+	network = "frontier_commnet"
+	},
+/turf/open/floor/plating,
+/area/ship/maintenance/aft)
 "Xs" = (
 /obj/machinery/power/apc/auto_name/directional/east,
 /obj/structure/cable/yellow{
@@ -3891,6 +5539,7 @@
 /obj/structure/closet/crate{
 	icon_state = "o2crate"
 	},
+/obj/effect/mapping_helpers/crate_shelve,
 /turf/open/floor/plasteel/mono,
 /area/ship/cargo)
 "Xu" = (
@@ -3917,21 +5566,30 @@
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
 	},
-/turf/open/floor/plating/airless{
-	icon_state = "plating_rust"
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 8
 	},
-/area/ship/maintenance)
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/structure/catwalk/over/plated_catwalk,
+/turf/open/floor/plating,
+/area/ship/crew/toilet)
+"XH" = (
+/obj/effect/turf_decal/borderfloor{
+	dir = 1
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/siding/thinplating/dark,
+/obj/structure/chair/handrail,
+/turf/open/floor/plasteel/tech/techmaint,
+/area/ship/cargo)
 "XJ" = (
 /obj/structure/cable/yellow{
 	icon_state = "1-2"
 	},
-/obj/structure/fluff/paper/stack{
-	dir = 4;
-	pixel_y = 9;
-	layer = 2.79
-	},
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating/airless{
+/turf/open/floor/plating{
 	icon_state = "plating_rust"
 	},
 /area/ship/maintenance)
@@ -3942,12 +5600,37 @@
 	},
 /turf/open/floor/plasteel/grimy,
 /area/ship/crew/canteen)
+"XN" = (
+/obj/machinery/telecomms/broadcaster/preset_left{
+	autolinkers = list("broadcasterA","hub");
+	network = "frontier_commnet"
+	},
+/obj/machinery/light/small/directional/west,
+/turf/open/floor/plating,
+/area/ship/maintenance/aft)
+"XP" = (
+/obj/machinery/door/firedoor/border_only{
+	dir = 1
+	},
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 9
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/canteen)
 "XX" = (
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
 	},
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating/airless,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plating,
+/area/ship/maintenance)
+"Yi" = (
+/obj/structure/cable/yellow{
+	icon_state = "1-9"
+	},
+/turf/open/floor/plating,
 /area/ship/maintenance)
 "Yk" = (
 /obj/structure/railing,
@@ -3961,10 +5644,14 @@
 /turf/open/floor/pod/dark,
 /area/ship/maintenance/starboard)
 "Yo" = (
-/obj/machinery/icecream_vat{
-	desc = "Ding-aling ding dong. Get your Frontiersmen-approved ice cream!"
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
 	},
-/turf/open/floor/plating/airless,
+/obj/machinery/door/airlock/hatch{
+	dir = 8
+	},
+/obj/effect/mapping_helpers/airlock/abandoned,
+/turf/open/floor/plating,
 /area/ship/maintenance)
 "Yr" = (
 /obj/structure/cable/yellow{
@@ -3980,9 +5667,20 @@
 /turf/open/floor/plasteel/tech/techmaint,
 /area/ship/cargo)
 "Yu" = (
-/obj/machinery/vending/cigarette,
-/turf/open/floor/plasteel/dark,
+/obj/effect/turf_decal/techfloor{
+	dir = 1
+	},
+/obj/machinery/vending/snack,
+/turf/open/floor/plasteel/tech/grid/airless,
 /area/ship/crew/canteen)
+"YC" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 9
+	},
+/turf/open/floor/wood{
+	icon_state = "wood-broken2"
+	},
+/area/ship/crew/ccommons)
 "YD" = (
 /obj/structure/reagent_dispensers/watertank,
 /obj/item/reagent_containers/glass/bucket{
@@ -3996,9 +5694,8 @@
 /turf/open/floor/plasteel/tech,
 /area/ship/maintenance/starboard)
 "YE" = (
-/obj/effect/decal/cleanable/glass,
-/turf/open/floor/plating/airless,
-/area/ship/maintenance)
+/turf/open/floor/holofloor/carpet,
+/area/ship/crew/ccommons)
 "YG" = (
 /obj/effect/turf_decal/techfloor,
 /obj/effect/decal/cleanable/dirt,
@@ -4018,17 +5715,21 @@
 /turf/open/floor/plating,
 /area/ship/crew/crewtwo)
 "YI" = (
-/obj/effect/turf_decal/siding/wideplating{
-	dir = 6
-	},
 /obj/machinery/light/directional/south,
-/turf/open/floor/plasteel,
+/obj/structure/chair/handrail{
+	dir = 8
+	},
+/obj/effect/turf_decal/borderfloor,
+/turf/open/floor/plasteel/mono/dark,
 /area/ship/crew/canteen)
 "YJ" = (
-/obj/structure/salvageable/machine,
-/obj/effect/decal/cleanable/glass,
-/turf/open/floor/plating/airless,
-/area/ship/maintenance)
+/obj/machinery/light/small/directional/north,
+/obj/effect/turf_decal/borderfloor{
+	dir = 1
+	},
+/obj/effect/turf_decal/siding/thinplating/dark,
+/turf/open/floor/plasteel/tech/techmaint,
+/area/ship/crew/toilet)
 "YL" = (
 /obj/structure/catwalk/over/plated_catwalk,
 /obj/structure/railing,
@@ -4047,7 +5748,7 @@
 "YU" = (
 /obj/effect/spawner/random/maintenance,
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating/airless{
+/turf/open/floor/plating{
 	icon_state = "plating_rust"
 	},
 /area/ship/maintenance)
@@ -4091,31 +5792,14 @@
 /turf/open/floor/plasteel/tech/techmaint,
 /area/ship/cargo)
 "Zz" = (
-/obj/structure/closet/secure_closet/wall{
-	pixel_y = -28;
-	req_access = list(5)
+/obj/machinery/computer/security/telescreen/entertainment{
+	pixel_y = 26
 	},
-/obj/item/storage/firstaid/brute{
-	pixel_y = 8;
-	pixel_x = 2
-	},
-/obj/item/storage/firstaid/fire{
-	pixel_x = -8;
-	pixel_y = 6
-	},
-/obj/item/clothing/accessory/armband/medblue{
-	pixel_y = -1;
-	pixel_x = -6
-	},
-/obj/item/clothing/gloves/color/latex{
-	pixel_y = -13
-	},
-/obj/item/storage/belt/medical/webbing{
-	pixel_y = 8;
-	pixel_x = 5
+/obj/effect/turf_decal/siding/thinplating/dark,
+/obj/effect/turf_decal/borderfloor{
+	dir = 1
 	},
-/obj/item/clothing/head/soft,
-/turf/open/floor/plasteel/white,
+/turf/open/floor/plasteel/mono/dark,
 /area/ship/crew/canteen)
 "ZC" = (
 /obj/structure/cable/yellow{
@@ -4126,14 +5810,34 @@
 	},
 /area/ship/crew/crewtwo)
 "ZH" = (
+/obj/machinery/door/airlock/medical{
+	req_one_access = list(5)
+	},
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/door/firedoor/border_only{
+	dir = 1
+	},
 /obj/structure/cable/yellow{
 	icon_state = "1-2"
 	},
-/obj/effect/decal/cleanable/crayon{
-	icon_state = "electricdanger"
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/turf/open/floor/plasteel/white,
+/area/ship/medical)
+"ZV" = (
+/obj/machinery/door/window/brigdoor/eastleft,
+/obj/machinery/shower{
+	pixel_x = 0;
+	pixel_y = 17
 	},
-/turf/open/floor/plating/airless,
-/area/ship/maintenance)
+/obj/effect/turf_decal/techfloor/hole/right{
+	dir = 1
+	},
+/obj/effect/turf_decal/techfloor/hole{
+	dir = 1
+	},
+/turf/open/floor/plasteel/showroomfloor,
+/area/ship/crew/toilet)
 "ZY" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/turf_decal/siding/red{
@@ -4160,6 +5864,9 @@ Ek
 Ek
 Ek
 Ek
+Ek
+Ek
+Ek
 fR
 Ek
 Ek
@@ -4176,6 +5883,8 @@ Ek
 Ek
 Ek
 Ek
+Ek
+Ek
 "}
 (2,1,1) = {"
 Ek
@@ -4190,8 +5899,11 @@ Ek
 Ek
 Ek
 Ek
-WF
-WF
+Ek
+Ek
+Ek
+fv
+fv
 bu
 ds
 ds
@@ -4199,8 +5911,10 @@ ds
 ds
 ds
 Kx
-tq
-tq
+rd
+rd
+Ek
+Ek
 Ek
 Ek
 Ek
@@ -4224,8 +5938,11 @@ Ek
 Ek
 Ek
 Ek
-WF
-tq
+Ek
+Ek
+Ek
+fv
+rd
 Rg
 Wa
 tR
@@ -4235,8 +5952,10 @@ tR
 tR
 RB
 FU
-tq
-tq
+rd
+rd
+Ek
+Ek
 Ek
 Ek
 Ek
@@ -4259,7 +5978,10 @@ Ek
 Ek
 Ek
 Ek
-tq
+Ek
+Ek
+Ek
+rd
 oe
 Er
 SX
@@ -4271,7 +5993,9 @@ SX
 SX
 Ol
 yV
-tq
+rd
+Ek
+Ek
 Ek
 Ek
 Ek
@@ -4294,8 +6018,11 @@ Ek
 Ek
 Ek
 Ek
-tq
-lh
+Ek
+Ek
+Ek
+rd
+aa
 Uo
 LH
 Fy
@@ -4305,8 +6032,10 @@ Fy
 Fy
 wp
 ld
-Td
-tq
+ru
+rd
+Ek
+Ek
 Ek
 Ek
 Ek
@@ -4324,12 +6053,15 @@ Ek
 Ek
 Ek
 Ek
-VO
-jK
+Ek
+Ek
+Ek
+zm
+rB
 jK
-CG
+jA
 Ek
-tq
+rd
 uE
 Uo
 EB
@@ -4341,12 +6073,14 @@ DG
 uL
 ld
 mu
-WF
+fv
+Ek
+wK
+eW
+eW
+zJ
+Ek
 Ek
-sQ
-jK
-jK
-Ko
 Ek
 Ek
 Ek
@@ -4359,12 +6093,15 @@ Ek
 Ek
 Ek
 Ek
-CG
+Ek
+Ek
+Ek
+jA
 Pu
 EI
-oH
+TR
 Ek
-tq
+rd
 lh
 OH
 Rn
@@ -4375,13 +6112,15 @@ DG
 DG
 Rn
 Ml
-Td
-WF
+xV
+fv
 Ek
-sQ
+wK
+sr
 la
-jp
-Ko
+zJ
+Ek
+Ek
 Ek
 Ek
 Ek
@@ -4394,12 +6133,15 @@ Ek
 Ek
 Ek
 Ek
-oH
+Ek
+Ek
+Ek
+TR
 OP
 HX
-oH
-CG
-tq
+TR
+jA
+rd
 lh
 VE
 Rn
@@ -4410,13 +6152,15 @@ DG
 DG
 Rn
 Mo
-Td
-WF
-CT
-Ko
+xV
+fv
+rM
+zJ
 ux
 Kp
-sQ
+wK
+Ek
+Ek
 Ek
 Ek
 Ek
@@ -4429,13 +6173,16 @@ Ek
 Ek
 Ek
 Ek
+Ek
+Ek
+Ek
 EQ
 DF
 QP
 CG
 EN
-CG
-VP
+jA
+XH
 oV
 pA
 DG
@@ -4445,9 +6192,9 @@ DG
 DG
 Rn
 ID
-Td
-Ko
-es
+xV
+fv
+ye
 sQ
 ze
 RF
@@ -4456,6 +6203,8 @@ Ek
 Ek
 Ek
 Ek
+Ek
+Ek
 "}
 (10,1,1) = {"
 Ek
@@ -4464,7 +6213,10 @@ Ek
 Ek
 Ek
 Ek
-EQ
+Ek
+Ek
+JZ
+aA
 dE
 HS
 mE
@@ -4491,15 +6243,20 @@ Ek
 Ek
 Ek
 Ek
+Ek
+Ek
 "}
 (11,1,1) = {"
 Ek
 Ek
-lJ
-lJ
 Ek
-JZ
-aA
+Ek
+Px
+Px
+Px
+Px
+Px
+TR
 Lt
 GY
 dX
@@ -4526,15 +6283,20 @@ Ek
 Ek
 Ek
 Ek
+Ek
+Ek
 "}
 (12,1,1) = {"
 Ek
-Bp
-Bp
-Bp
-Bp
-Bp
-oH
+Ek
+Ek
+td
+td
+td
+td
+td
+td
+TR
 Ha
 uP
 em
@@ -4556,21 +6318,26 @@ Mb
 Yk
 BA
 ss
-sQ
+wK
 lJ
 lJ
+lJ
+Ek
 Ek
 Ek
 "}
 (13,1,1) = {"
 Ek
-lJ
-lJ
-lJ
-lJ
-BV
+Ek
+Ek
+Px
+Px
+td
+oO
+XN
+Uf
 CG
-pB
+wA
 yl
 va
 Uw
@@ -4591,7 +6358,9 @@ gI
 ja
 TN
 YD
-sQ
+wK
+lJ
+lJ
 lJ
 lJ
 lJ
@@ -4599,11 +6368,14 @@ Ek
 "}
 (14,1,1) = {"
 Ek
-lJ
-lJ
-lJ
-QV
-Pb
+Ek
+Ek
+Px
+Px
+td
+kQ
+lz
+BV
 CG
 CG
 ff
@@ -4623,23 +6395,28 @@ nt
 oS
 dA
 tc
-jA
+pt
 ph
 Ko
-Ko
-Bp
-Bp
-Bp
-Bp
+zJ
+QJ
+QJ
+QJ
+QJ
+QJ
+Ek
 "}
 (15,1,1) = {"
-lJ
-lJ
-lJ
-lJ
-MF
+Ek
+Ek
+Px
+Px
+Px
+td
+lQ
 pE
-ts
+QV
+mv
 CG
 Tq
 dY
@@ -4661,56 +6438,66 @@ eE
 vQ
 YX
 Ko
-QM
-Hk
-yc
+QJ
+QJ
+Tk
+Sy
+QJ
+lJ
 lJ
-Ek
 "}
 (16,1,1) = {"
-lJ
-lJ
-lJ
-lJ
-zJ
-QJ
-QJ
+Ek
+Ek
+Px
+Px
+Px
+td
+Ld
+Om
+MF
+jJ
 oH
 oH
 HG
 SS
 oH
-VP
+rW
 ov
-nc
-tR
-nc
+QN
+Wx
+nV
 hL
-tR
-tR
-tR
+za
+Wx
+iq
 Ry
-PI
+pP
 Ko
 qy
 AZ
 sQ
 Ko
-Hk
-kv
+Pb
+Lz
+Hn
+JA
+QJ
 lJ
 lJ
-Ek
 "}
 (17,1,1) = {"
-lJ
-lJ
-AG
-Bk
+Ek
+Ek
+Px
+Px
+Px
+td
+Xq
+qC
 qE
-kO
+jg
 wb
-ZH
 II
 wN
 iP
@@ -4724,34 +6511,39 @@ oG
 wF
 uh
 nc
-nc
+WS
 BF
 Ko
 uQ
 GA
 UT
-kK
-Bk
-lJ
+MC
+Jd
+AA
+FM
+xi
+QJ
 lJ
 lJ
-Ek
 "}
 (18,1,1) = {"
-lJ
-lJ
-lJ
-QJ
+Ek
+Ek
+Px
+Px
+Px
+td
+uf
+vr
 wY
-Bk
-Bk
-bR
-so
-vl
-vl
-vl
-qd
-qd
+wY
+Bw
+oH
+oH
+oH
+oH
+tq
+tq
 We
 yC
 aE
@@ -4759,30 +6551,35 @@ Sv
 Ev
 So
 wL
+tE
+Ww
 Vt
-Vt
-Vt
-qD
-QJ
+wK
+zJ
 QJ
+QM
+AE
+wg
+Hl
+PR
 QJ
-mf
 lJ
 lJ
-lJ
-Ek
 "}
 (19,1,1) = {"
-lJ
-lJ
-lJ
+Ek
+Ek
+Px
+Px
+Px
+td
+td
+bj
+bH
+Rw
 QJ
-XC
-JA
-Ab
-rU
-rU
-Wx
+so
+PB
 Iy
 Fc
 Mk
@@ -4791,35 +6588,40 @@ nT
 Xs
 fj
 aT
-QK
+bx
 Su
 wQ
-Vt
+fU
+hC
 dV
 zZ
-Vt
-Kn
-bR
-vD
-hh
-lJ
+Gr
+QJ
+QJ
+Yo
+QJ
+QJ
+QJ
+QJ
 lJ
 lJ
-Ek
 "}
 (20,1,1) = {"
-lJ
-lJ
-lJ
-QJ
-XC
-ti
+Ek
+td
+pF
+pF
+pF
+pF
+td
+Bo
+sC
 Ab
-jH
-eS
-ng
+rU
+rU
+pB
 Vf
-MS
+ik
 MS
 vl
 WF
@@ -4827,84 +6629,136 @@ WF
 WF
 Zp
 rd
-xb
-Vt
+rd
+fv
 Vt
+Hw
 RV
 qu
-qD
-AG
-Jv
-Eb
-Hk
+BG
+HE
+Kn
+et
+hh
+QJ
+lJ
+lJ
 lJ
 lJ
-Ek
-Ek
 "}
 (21,1,1) = {"
-QJ
-QJ
-QJ
-QJ
-Lo
+Px
+Px
+pF
+Iu
+bI
+pF
+td
+DJ
+td
 Ab
-rU
-Xc
-tS
-ng
-ng
-ng
+jH
+eS
+pB
+pB
+kP
 gi
 vl
 SG
 PC
+XP
 JE
-MC
+Jv
 Gx
 qD
-lY
-dm
+Vt
+RN
 dm
-FQ
+Lf
 qD
-Yo
-XX
-Hk
+QJ
+Pb
+eU
+jY
+QJ
+lJ
 lJ
 lJ
-Ek
-Ek
 Ek
 "}
 (22,1,1) = {"
-Ek
+Px
+Px
+pF
+ZV
+KZ
+pF
+DU
+KU
+Ab
+rU
+Xc
+tS
+rU
+rU
+MK
+Sc
+KO
+Sc
+zu
+Wv
+Iw
+Jv
+Yu
+qD
+qD
+jQ
+Ww
+Gb
+qD
+QJ
+MI
+Rc
+Ff
+QJ
 lJ
 lJ
-Fh
-XC
+Ek
+Ek
+"}
+(23,1,1) = {"
+Px
+Px
+pF
+iI
+MM
+pF
+wy
+tb
 rU
 uG
 NI
 NI
 Fk
 Ab
-cz
-dl
-KO
-te
-iw
+Fx
+bF
+bF
+bF
+ng
 Gd
-Iw
-Yu
-qD
-jV
-Lz
-ZY
-mg
+Gy
+Jv
+OM
 qD
+Vg
+if
+FQ
+js
 qD
-MI
+QJ
+QJ
+AG
 QJ
 QJ
 QJ
@@ -4912,149 +6766,173 @@ QJ
 Ek
 Ek
 "}
-(23,1,1) = {"
-lJ
-lJ
-lJ
+(24,1,1) = {"
+Px
+Px
+pF
+iI
+qq
+pF
+Vd
 tb
-XC
 Ab
 Ab
+wn
 Az
-Vd
 rU
 Ab
 yv
-QT
+Vh
 mp
 cv
-om
-MK
-Gy
-Gr
-bJ
-nV
-fM
-hG
-TG
-hT
+bD
+sM
+uB
+tI
+dj
 qD
-XX
-kv
-lJ
+OU
+Rs
+ZY
+mg
+qD
+QJ
+EH
+Bp
+QJ
 lJ
 lJ
 Ek
 Ek
+Ek
 "}
-(24,1,1) = {"
-lJ
-lJ
+(25,1,1) = {"
+Px
+Px
+pF
+Uz
+jh
+Kc
 eA
 OG
-Rs
 Ab
 DN
-EO
-EO
-Vg
+eZ
+CD
+Lx
 Ab
-jJ
-QT
-sM
+Zz
+RK
+KP
 CE
-bD
-ng
-ng
-ng
-Vt
-xB
-RH
-hP
-FP
-hz
-qD
+kA
+Op
+LF
+xb
+mZ
+bJ
+es
+fM
+hG
+TG
+hT
+QJ
 Dv
-fn
+Hh
+QJ
 lJ
 lJ
 Ek
 Ek
 Ek
 "}
-(25,1,1) = {"
-lJ
-lJ
+(26,1,1) = {"
+Px
+Px
+pF
+pF
+KR
+pF
 tV
-Bk
-Wv
+Gc
 Ab
 UO
 EO
 Ql
-Dw
+jt
 rU
-bF
-QT
+oB
+mf
 XM
 oU
 GV
-ng
-Po
-Sy
+VO
+VO
+VO
+VO
 Vt
-hU
-gD
-yH
+xB
+RH
+hP
 FP
-Vb
-qD
+hz
+QJ
 MH
-Eb
+QK
+QJ
 lJ
 lJ
 Ek
 Ek
 Ek
 "}
-(26,1,1) = {"
-lJ
-lJ
-AG
+(27,1,1) = {"
+Px
+Px
+Px
+pF
+gK
+Ez
+jp
 gG
-js
 Ab
 tu
 UE
+Lo
 FW
-jh
 mD
 oI
 Nr
 Cy
 cG
-BG
-ng
-mZ
-mZ
+nv
+VO
+yj
+iW
+Po
 Vt
-mG
-FB
-Px
-SD
-hT
-qD
+iB
+gD
+yH
+FP
+Vb
+QJ
 XX
 YU
+QJ
 lJ
 lJ
-lJ
+Ek
 Ek
 Ek
 "}
-(27,1,1) = {"
-lJ
-lJ
+(28,1,1) = {"
+Px
+Px
+Px
+pF
+pF
+pF
 YJ
 DR
 Wd
@@ -5062,77 +6940,126 @@ oy
 MD
 SV
 GM
-iq
 rU
 iY
 hi
-iB
+QR
 xX
-nv
-qp
-iW
-Zz
-Vt
-Vt
-qD
-qD
-qD
-qD
+EG
+VO
+BB
+UJ
+fC
 Vt
-MI
+mG
+Kr
+FB
+SD
+hT
+HE
+TZ
 QJ
 QJ
 QJ
 QJ
 QJ
 Ek
+Ek
 "}
-(28,1,1) = {"
-lJ
-lJ
+(29,1,1) = {"
+Px
+Px
+Px
+pF
+Be
+ao
 Cx
 XC
-eA
 Ab
 Ar
-lQ
+Fh
 PV
 yd
 rU
+LJ
+Re
+QT
+Qc
+Te
+ZH
+qp
+At
+lV
+Vt
+Vt
+qD
+qD
+qD
+qD
+QJ
+fk
+QJ
+lJ
+lJ
+lJ
+Ek
+Ek
+Ek
+"}
+(30,1,1) = {"
+Ek
+Px
+td
+td
+td
+Ke
+Ke
+mt
+Ab
+Ab
+Ab
+vV
+JX
+Ab
 Lb
 Av
 gQ
 LG
 YI
-ng
+VO
+jd
 Pa
 ut
-tI
+Eb
 iN
 qi
 Lg
 Hk
 kv
-hh
-DU
+om
 Hk
+QJ
 lJ
 lJ
 lJ
 Ek
 Ek
+Ek
 "}
-(29,1,1) = {"
-QJ
-QJ
-QJ
+(31,1,1) = {"
+Ek
+Ek
+Px
+Px
+Px
 Ke
-QJ
-Ab
-Ab
-Ab
-vV
-JX
+YC
+dF
+kO
+FR
+rU
+rU
+ah
 ah
 Se
 Se
@@ -5148,8 +7075,10 @@ mB
 li
 QJ
 YU
-rW
+vD
 kv
+QJ
+QJ
 lJ
 lJ
 lJ
@@ -5157,21 +7086,24 @@ Ek
 Ek
 Ek
 "}
-(30,1,1) = {"
-lJ
-lJ
-lJ
-dF
-kO
-FR
-bR
-rU
-rU
+(32,1,1) = {"
+Ek
+Ek
+Ek
+Px
+Px
+Ke
+ti
+hU
+qM
+bv
+fE
+YE
 ah
 ah
-bj
+Dw
 VH
-eU
+qT
 gB
 ra
 mB
@@ -5184,26 +7116,31 @@ mB
 QJ
 iy
 oK
+Hi
+QJ
+lJ
 lJ
 lJ
 lJ
-Ek
 Ek
 Ek
 Ek
 "}
-(31,1,1) = {"
+(33,1,1) = {"
 Ek
-lJ
-lJ
-lJ
-qM
-bv
-fE
-YE
-bH
-ah
-jt
+Ek
+Ek
+Px
+Px
+Ke
+Ke
+PJ
+hE
+cS
+rY
+bR
+Se
+kS
 yz
 bN
 YG
@@ -5216,29 +7153,34 @@ TO
 fW
 Xu
 mB
-VQ
+ts
 XJ
-et
+Yi
+Bk
+QJ
+lJ
 lJ
 lJ
 lJ
-Ek
 Ek
 Ek
 Ek
 "}
-(32,1,1) = {"
+(34,1,1) = {"
 Ek
-lJ
-lJ
-lJ
-lJ
-cS
-rY
-bR
-ny
-Se
-wg
+Ek
+Ek
+Ek
+Px
+Px
+Ke
+Ke
+EL
+IM
+vd
+vW
+ah
+CT
 SC
 CA
 ub
@@ -5253,6 +7195,9 @@ Zf
 mB
 yX
 fn
+kK
+uX
+QJ
 lJ
 lJ
 lJ
@@ -5260,18 +7205,20 @@ Ek
 Ek
 Ek
 Ek
-Ek
 "}
-(33,1,1) = {"
+(35,1,1) = {"
 Ek
 Ek
-lJ
-lJ
-lJ
-lJ
-lJ
-vW
-td
+Ek
+Ek
+Ek
+Px
+Px
+Ke
+Ke
+Sp
+VQ
+Nm
 ah
 Se
 ah
@@ -5287,28 +7234,33 @@ tL
 Ss
 mB
 kp
-Hk
+Eu
+GP
+aV
+QJ
+lJ
 lJ
 lJ
-Ek
-Ek
 Ek
 Ek
 Ek
 Ek
 "}
-(34,1,1) = {"
+(36,1,1) = {"
 Ek
 Ek
 Ek
 Ek
-lJ
-lJ
-lJ
-lJ
-QJ
-QJ
-Ld
+Ek
+Px
+Px
+Px
+Ke
+Ke
+Ke
+Ke
+td
+Pg
 ah
 ah
 ah
@@ -5321,43 +7273,50 @@ oq
 SJ
 mB
 mw
-Lo
+Du
 QJ
 QJ
 QJ
 QJ
+lJ
+lJ
 Ek
 Ek
 Ek
 Ek
 Ek
 "}
-(35,1,1) = {"
+(37,1,1) = {"
 Ek
 Ek
 Ek
 Ek
 Ek
-lJ
-lJ
-lJ
-lJ
-QJ
-lJ
-lJ
-lJ
+Ek
+Px
+Px
+Px
+Px
+Px
+Px
+td
+Px
+Px
+Px
 ah
 yK
 yK
 mB
 wC
-Op
+bi
 mw
 mw
 mw
 yt
 Lm
 Kn
+QJ
+lJ
 lJ
 lJ
 lJ
@@ -5367,20 +7326,23 @@ Ek
 Ek
 Ek
 "}
-(36,1,1) = {"
+(38,1,1) = {"
 Ek
 Ek
 Ek
 Ek
 Ek
 Ek
-lJ
-lJ
-lJ
-QJ
-lJ
-lJ
-lJ
+Ek
+Ek
+Px
+Px
+Px
+Px
+td
+Px
+Px
+Px
 Ek
 Ek
 Ek
@@ -5388,11 +7350,12 @@ mB
 mB
 mw
 mw
-yc
-hh
-qT
+pW
+be
+ot
 ml
-lJ
+QJ
+QJ
 lJ
 lJ
 Ek
@@ -5401,8 +7364,9 @@ Ek
 Ek
 Ek
 Ek
+Ek
 "}
-(37,1,1) = {"
+(39,1,1) = {"
 Ek
 Ek
 Ek
@@ -5410,11 +7374,14 @@ Ek
 Ek
 Ek
 Ek
-lJ
-lJ
-QJ
-lJ
-lJ
+Ek
+Ek
+Px
+Px
+Px
+td
+Px
+Px
 Ek
 Ek
 Ek
@@ -5423,12 +7390,14 @@ Ek
 Ek
 Ek
 QJ
+QJ
+QJ
+QJ
+QJ
+QJ
 lJ
 lJ
-lJ
-lJ
-lJ
-lJ
+Ek
 Ek
 Ek
 Ek
@@ -5437,7 +7406,7 @@ Ek
 Ek
 Ek
 "}
-(38,1,1) = {"
+(40,1,1) = {"
 Ek
 Ek
 Ek
@@ -5446,9 +7415,12 @@ Ek
 Ek
 Ek
 Ek
-lJ
-QJ
-lJ
+Ek
+Ek
+Px
+Px
+Ek
+Px
 Ek
 Ek
 Ek
@@ -5463,6 +7435,8 @@ lJ
 lJ
 lJ
 lJ
+lJ
+Ek
 Ek
 Ek
 Ek
@@ -5472,7 +7446,10 @@ Ek
 Ek
 Ek
 "}
-(39,1,1) = {"
+(41,1,1) = {"
+Ek
+Ek
+Ek
 Ek
 Ek
 Ek
@@ -5506,4 +7483,6 @@ Ek
 Ek
 Ek
 Ek
+Ek
+Ek
 "}
diff --git a/_maps/shuttles/solgov/solgov_paracelsus.dmm b/_maps/shuttles/solgov/solgov_paracelsus.dmm
index aabb0c5bd3..c6d051ed4d 100644
--- a/_maps/shuttles/solgov/solgov_paracelsus.dmm
+++ b/_maps/shuttles/solgov/solgov_paracelsus.dmm
@@ -683,8 +683,7 @@
 	pixel_y = -1
 	},
 /obj/item/paper_bin{
-	pixel_x = 9;
-	pixel_y = 0
+	pixel_x = 9
 	},
 /obj/item/pen/solgov{
 	pixel_x = 9;
@@ -1161,7 +1160,6 @@
 /area/ship/storage/eva)
 "kN" = (
 /obj/structure/sign/solgov_seal{
-	pixel_x = 0;
 	pixel_y = -1
 	},
 /turf/closed/wall/mineral/titanium,
@@ -1421,8 +1419,7 @@
 "nG" = (
 /obj/structure/filingcabinet/double{
 	dir = 4;
-	pixel_x = -10;
-	pixel_y = 0
+	pixel_x = -10
 	},
 /obj/machinery/light/directional/west,
 /turf/open/floor/carpet/royalblue,
@@ -1651,8 +1648,7 @@
 	pixel_y = -1
 	},
 /obj/item/paper_bin{
-	pixel_x = 9;
-	pixel_y = 0
+	pixel_x = 9
 	},
 /obj/item/pen/solgov{
 	pixel_x = 9;
@@ -2500,10 +2496,7 @@
 	pixel_x = -3;
 	pixel_y = 8
 	},
-/obj/item/reagent_containers/glass/bottle{
-	list_reagents = list(/datum/reagent/medicine/thializid=30);
-	name = "thializid bottle"
-	},
+/obj/item/reagent_containers/glass/bottle/gjalrazine,
 /turf/open/floor/mineral/titanium/tiled/white,
 /area/ship/medical/surgery)
 "wY" = (
@@ -3650,8 +3643,7 @@
 /area/ship/crew/canteen)
 "IP" = (
 /obj/structure/sign/solgov_flag{
-	pixel_x = -1;
-	pixel_y = 0
+	pixel_x = -1
 	},
 /turf/closed/wall/mineral/titanium/nodiagonal,
 /area/ship/security/armory)
@@ -4195,7 +4187,6 @@
 	},
 /obj/structure/table,
 /obj/item/storage/box/bodybags{
-	pixel_x = 0;
 	pixel_y = 4
 	},
 /turf/open/floor/plasteel/white,
@@ -4914,9 +4905,7 @@
 /area/ship/hallway/port)
 "TD" = (
 /obj/item/radio/intercom/directional/south,
-/obj/effect/turf_decal/trimline/opaque/solgovblue/filled/line{
-	dir = 2
-	},
+/obj/effect/turf_decal/trimline/opaque/solgovblue/filled/line,
 /obj/structure/bed/roller,
 /turf/open/floor/plasteel/white,
 /area/ship/crew/crewtwo)
@@ -5381,8 +5370,7 @@
 /area/ship/medical)
 "XQ" = (
 /obj/structure/mirror{
-	pixel_y = -25;
-	pixel_x = 0
+	pixel_y = -25
 	},
 /obj/structure/cable{
 	icon_state = "1-4"
diff --git a/_maps/shuttles/subshuttles/frontiersmen_brawler.dmm b/_maps/shuttles/subshuttles/frontiersmen_brawler.dmm
index 8c9cab41f4..87b80981cc 100644
--- a/_maps/shuttles/subshuttles/frontiersmen_brawler.dmm
+++ b/_maps/shuttles/subshuttles/frontiersmen_brawler.dmm
@@ -15,6 +15,10 @@
 	id = "brawler_starboard_holo"
 	},
 /obj/structure/cable/yellow,
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/door/firedoor/border_only{
+	dir = 1
+	},
 /turf/open/floor/engine/hull/interior,
 /area/ship/bridge)
 "e" = (
@@ -24,7 +28,14 @@
 /obj/machinery/telecomms/relay/preset/frontiersmen,
 /obj/machinery/light_switch{
 	pixel_y = -22;
-	dir = 1
+	dir = 1;
+	pixel_x = -9
+	},
+/obj/machinery/button/door{
+	dir = 1;
+	pixel_y = -23;
+	id = "brawler_shutter";
+	name = "window shutters"
 	},
 /turf/open/floor/plasteel/mono,
 /area/ship/bridge)
@@ -38,6 +49,10 @@
 "g" = (
 /obj/structure/grille,
 /obj/structure/window/reinforced/fulltile,
+/obj/machinery/door/poddoor/shutters{
+	dir = 8;
+	id = "brawler_shutter"
+	},
 /turf/open/floor/plating,
 /area/ship/bridge)
 "i" = (
@@ -80,33 +95,13 @@
 	id = "brawler_starboard_holo"
 	},
 /obj/structure/cable/yellow,
-/obj/machinery/button/door{
-	dir = 4;
-	pixel_y = 7;
-	pixel_x = -23;
-	id = "brawler_starboard"
-	},
-/obj/machinery/button/shieldwallgen{
-	pixel_y = -7;
-	pixel_x = -23;
-	id = "brawler_starboard_holo";
-	dir = 4
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/door/firedoor/border_only{
+	dir = 1
 	},
 /turf/open/floor/engine/hull/interior,
 /area/ship/bridge)
 "m" = (
-/obj/machinery/button/door{
-	pixel_x = -23;
-	pixel_y = -7;
-	id = "brawler_port";
-	dir = 4
-	},
-/obj/machinery/button/shieldwallgen{
-	pixel_y = 7;
-	pixel_x = -23;
-	id = "brawler_port_holo";
-	dir = 4
-	},
 /obj/machinery/power/shieldwallgen/atmos/roundstart{
 	dir = 4;
 	id = "brawler_port_holo"
@@ -118,6 +113,10 @@
 /obj/structure/cable/yellow{
 	icon_state = "0-2"
 	},
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/door/firedoor/border_only{
+	dir = 1
+	},
 /turf/open/floor/engine/hull/interior,
 /area/ship/bridge)
 "o" = (
@@ -175,10 +174,16 @@
 /obj/structure/cable/yellow{
 	icon_state = "0-4"
 	},
-/obj/machinery/door/poddoor/shutters{
+/obj/machinery/door/poddoor/shutters/preopen{
 	dir = 8;
 	id = "brawler_aft"
 	},
+/obj/machinery/door/firedoor/border_only/closed{
+	dir = 4
+	},
+/obj/machinery/door/firedoor/border_only/closed{
+	dir = 8
+	},
 /turf/open/floor/engine/hull/interior,
 /area/ship/bridge)
 "s" = (
@@ -231,6 +236,7 @@
 /obj/machinery/door/firedoor/border_only{
 	dir = 8
 	},
+/obj/machinery/holopad/emergency/command,
 /turf/open/floor/plasteel,
 /area/ship/bridge)
 "y" = (
@@ -248,6 +254,10 @@
 /obj/structure/cable/yellow{
 	icon_state = "1-2"
 	},
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/door/firedoor/border_only{
+	dir = 1
+	},
 /turf/open/floor/engine/hull/interior,
 /area/ship/bridge)
 "z" = (
@@ -260,10 +270,16 @@
 	port_direction = 2;
 	preferred_direction = 4
 	},
-/obj/machinery/door/poddoor/shutters{
+/obj/machinery/door/poddoor/shutters/preopen{
 	dir = 8;
 	id = "brawler_aft"
 	},
+/obj/machinery/door/firedoor/border_only/closed{
+	dir = 4
+	},
+/obj/machinery/door/firedoor/border_only/closed{
+	dir = 8
+	},
 /turf/open/floor/engine/hull/interior,
 /area/ship/bridge)
 "A" = (
@@ -271,6 +287,10 @@
 	dir = 1;
 	id = "brawler_port"
 	},
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/door/firedoor/border_only{
+	dir = 1
+	},
 /turf/open/floor/engine/hull/interior,
 /area/ship/bridge)
 "B" = (
@@ -287,6 +307,18 @@
 	pixel_x = -6;
 	pixel_y = 5
 	},
+/obj/structure/chair/handrail,
+/obj/machinery/button/door{
+	id = "brawler_port";
+	pixel_y = 25;
+	pixel_x = -6;
+	name = "port shutters"
+	},
+/obj/machinery/button/shieldwallgen{
+	pixel_y = 23;
+	pixel_x = 3;
+	id = "brawler_port_holo"
+	},
 /turf/open/floor/plasteel/patterned/ridged,
 /area/ship/bridge)
 "C" = (
@@ -302,7 +334,6 @@
 /turf/open/floor/plasteel/patterned/ridged,
 /area/ship/bridge)
 "D" = (
-/obj/machinery/light/directional/south,
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/oil/streak{
 	pixel_x = 5;
@@ -320,19 +351,29 @@
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
 	},
+/obj/structure/chair/handrail{
+	dir = 1
+	},
+/obj/machinery/light/directional/south,
 /turf/open/floor/plasteel,
 /area/ship/bridge)
 "E" = (
-/obj/machinery/door/poddoor/shutters{
-	dir = 8;
-	id = "brawler_aft"
-	},
 /obj/machinery/power/shieldwallgen/atmos/roundstart{
 	id = "brawler_aft_holo"
 	},
 /obj/structure/cable/yellow{
 	icon_state = "0-2"
 	},
+/obj/machinery/door/poddoor/shutters/preopen{
+	dir = 8;
+	id = "brawler_aft"
+	},
+/obj/machinery/door/firedoor/border_only/closed{
+	dir = 4
+	},
+/obj/machinery/door/firedoor/border_only/closed{
+	dir = 8
+	},
 /turf/open/floor/engine/hull/interior,
 /area/ship/bridge)
 "F" = (
@@ -347,7 +388,8 @@
 /obj/machinery/button/door{
 	id = "brawler_aft";
 	pixel_x = -7;
-	dir = 8
+	dir = 8;
+	name = "aft shutters"
 	},
 /obj/machinery/power/apc/auto_name/directional/north,
 /obj/structure/cable/yellow{
@@ -429,6 +471,10 @@
 /obj/machinery/door/poddoor/shutters{
 	id = "brawler_starboard"
 	},
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/door/firedoor/border_only{
+	dir = 1
+	},
 /turf/open/floor/engine/hull/interior,
 /area/ship/bridge)
 "N" = (
@@ -438,7 +484,6 @@
 /turf/open/floor/plasteel/patterned/ridged,
 /area/ship/bridge)
 "O" = (
-/obj/machinery/light/directional/north,
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/turf_decal/siding/thinplating{
 	dir = 4
@@ -452,6 +497,8 @@
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
 	},
+/obj/structure/chair/handrail,
+/obj/machinery/light/directional/north,
 /turf/open/floor/plasteel,
 /area/ship/bridge)
 "P" = (
@@ -461,6 +508,22 @@
 /obj/structure/cable/yellow{
 	icon_state = "5-9"
 	},
+/obj/structure/chair/handrail{
+	dir = 1
+	},
+/obj/machinery/button/door{
+	dir = 1;
+	pixel_x = -6;
+	pixel_y = -21;
+	id = "brawler_starboard";
+	name = "starboard shutters"
+	},
+/obj/machinery/button/shieldwallgen{
+	dir = 1;
+	pixel_y = -19;
+	pixel_x = 3;
+	id = "brawler_starboard_holo"
+	},
 /turf/open/floor/plasteel/patterned/ridged,
 /area/ship/bridge)
 "R" = (
diff --git a/_maps/shuttles/subshuttles/inteq_thunder.dmm b/_maps/shuttles/subshuttles/inteq_thunder.dmm
index 246fcdc094..ef71dda71d 100644
--- a/_maps/shuttles/subshuttles/inteq_thunder.dmm
+++ b/_maps/shuttles/subshuttles/inteq_thunder.dmm
@@ -421,7 +421,6 @@
 /obj/item/modular_computer/laptop/preset/civilian{
 	pixel_y = -5
 	},
-/obj/item/gps,
 /obj/item/oxygen_candle{
 	pixel_x = -10;
 	pixel_y = 5
@@ -429,6 +428,8 @@
 /obj/item/oxygen_candle{
 	pixel_x = -10
 	},
+/obj/item/gps,
+/obj/item/gps,
 /obj/item/tank/internals/emergency_oxygen/engi{
 	pixel_x = 8;
 	pixel_y = -2
diff --git a/_maps/shuttles/subshuttles/syndicate_runner.dmm b/_maps/shuttles/subshuttles/syndicate_runner.dmm
index 036a10b490..c4b723e24d 100644
--- a/_maps/shuttles/subshuttles/syndicate_runner.dmm
+++ b/_maps/shuttles/subshuttles/syndicate_runner.dmm
@@ -50,9 +50,7 @@
 /turf/open/floor/plasteel/white,
 /area/ship/bridge)
 "aj" = (
-/obj/machinery/power/shuttle/engine/electric/premium{
-	dir = 4
-	},
+/obj/machinery/power/shuttle/engine/electric/premium,
 /obj/structure/window/reinforced,
 /obj/structure/window/reinforced{
 	dir = 1
@@ -85,18 +83,11 @@
 /area/ship/bridge)
 "al" = (
 /obj/structure/table/chem,
-/obj/item/reagent_containers/glass/bottle/bicaridine{
+/obj/item/reagent_containers/glass/bottle/indomide{
 	pixel_x = 7;
 	pixel_y = 14
 	},
-/obj/item/reagent_containers/glass/bottle/antitoxin{
-	pixel_x = -4;
-	pixel_y = 10
-	},
-/obj/item/reagent_containers/glass/bottle/kelotane{
-	pixel_x = 4;
-	pixel_y = 7
-	},
+/obj/item/reagent_containers/glass/bottle/charcoal,
 /obj/item/reagent_containers/glass/bottle/dexalin{
 	pixel_x = -3;
 	pixel_y = 2
@@ -104,6 +95,10 @@
 /obj/item/reagent_containers/syringe{
 	pixel_x = 8
 	},
+/obj/item/reagent_containers/glass/bottle/alvitane{
+	pixel_x = 4;
+	pixel_y = 3
+	},
 /turf/open/floor/plasteel/mono/dark,
 /area/ship/bridge)
 "bz" = (
@@ -237,7 +232,6 @@
 /area/ship/bridge)
 "gi" = (
 /obj/item/storage/case/surgery{
-	pixel_x = 0;
 	pixel_y = 3
 	},
 /obj/structure/table/chem,
@@ -434,9 +428,7 @@
 /turf/open/floor/plasteel/white,
 /area/ship/bridge)
 "DW" = (
-/obj/machinery/power/shuttle/engine/electric/premium{
-	dir = 4
-	},
+/obj/machinery/power/shuttle/engine/electric/premium,
 /obj/structure/window/reinforced{
 	dir = 1
 	},
diff --git a/_maps/shuttles/syndicate/syndicate_hardliners_leyak.dmm b/_maps/shuttles/syndicate/syndicate_hardliners_leyak.dmm
index 3d8ad46928..0a377ac6e4 100644
--- a/_maps/shuttles/syndicate/syndicate_hardliners_leyak.dmm
+++ b/_maps/shuttles/syndicate/syndicate_hardliners_leyak.dmm
@@ -672,6 +672,10 @@
 	pixel_y = -21;
 	id = "leyakgun"
 	},
+/obj/item/stamp/hardliners{
+	pixel_x = 2;
+	pixel_y = -5
+	},
 /turf/open/floor/plasteel/patterned/brushed,
 /area/ship/bridge)
 "fS" = (
@@ -1312,11 +1316,8 @@
 /obj/effect/turf_decal/trimline/opaque/syndiered/filled/line{
 	dir = 10
 	},
-/obj/structure/closet/crate/bin,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
-	dir = 1
-	},
 /obj/machinery/airalarm/directional/west,
+/obj/machinery/photocopier,
 /turf/open/floor/plasteel/patterned/brushed,
 /area/ship/bridge)
 "nt" = (
@@ -1635,6 +1636,10 @@
 	pixel_x = 0;
 	pixel_y = 11
 	},
+/obj/item/stamp/cybersun{
+	pixel_x = 1;
+	pixel_y = 4
+	},
 /turf/open/floor/plasteel/patterned/brushed,
 /area/ship/bridge)
 "se" = (
@@ -2271,8 +2276,10 @@
 /obj/machinery/door/window/brigdoor/westright{
 	layer = 3.29;
 	req_access = list(3);
-	req_ship_access = 1
+	req_ship_access = 1;
+	dir = 4
 	},
+/obj/machinery/door/window/westleft,
 /turf/open/floor/plasteel/dark,
 /area/ship/security)
 "AT" = (
diff --git a/_maps/shuttles/syndicate/syndicate_ngr_derecho.dmm b/_maps/shuttles/syndicate/syndicate_ngr_derecho.dmm
index 6fbf15b523..a3b5d7c02e 100644
--- a/_maps/shuttles/syndicate/syndicate_ngr_derecho.dmm
+++ b/_maps/shuttles/syndicate/syndicate_ngr_derecho.dmm
@@ -2485,6 +2485,7 @@
 /obj/item/megaphone,
 /obj/item/storage/guncase/pistol/pc76,
 /obj/machinery/light/small/directional/west,
+/obj/item/clothing/glasses/hud/security/sunglasses/ngr,
 /turf/open/floor/carpet/black,
 /area/ship/crew/dorm)
 "vs" = (
@@ -4804,6 +4805,7 @@
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/item/melee/knife/survival,
 /obj/item/clothing/mask/breath/ngr,
+/obj/item/clothing/glasses/hud/security/sunglasses/ngr,
 /turf/open/floor/pod,
 /area/ship/storage/equip)
 "QD" = (
@@ -5340,6 +5342,7 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/item/melee/knife/survival,
 /obj/item/clothing/mask/breath/ngr,
+/obj/item/clothing/glasses/hud/security/sunglasses/ngr,
 /turf/open/floor/pod,
 /area/ship/storage/equip)
 "Uv" = (
@@ -5851,6 +5854,7 @@
 /obj/item/storage/guncase/pistol/a357,
 /obj/machinery/light/small/directional/east,
 /obj/item/storage/belt/military/assault,
+/obj/item/clothing/glasses/hud/security/sunglasses/ngr,
 /turf/open/floor/carpet/red_gold,
 /area/ship/crew/dorm/captain)
 "Yq" = (
diff --git a/code/__DEFINES/mobfactions.dm b/code/__DEFINES/mobfactions.dm
index ef1d584b32..bf8a90f76b 100644
--- a/code/__DEFINES/mobfactions.dm
+++ b/code/__DEFINES/mobfactions.dm
@@ -11,6 +11,7 @@
 // anything with these factions should be hostile to the average player.
 #define FACTION_ANTAG_SYNDICATE "Syndicate"
 #define FACTION_ANTAG_FRONTIERSMEN "Frontiersmen"
+#define FACTION_ANTAG_HERMITS "Hermit"
 
 //Player Factions
 #define FACTION_PLAYER_SYNDICATE "playerSyndicate"
diff --git a/code/controllers/subsystem/traumas.dm b/code/controllers/subsystem/traumas.dm
index e8da247968..c890cc95dc 100644
--- a/code/controllers/subsystem/traumas.dm
+++ b/code/controllers/subsystem/traumas.dm
@@ -126,7 +126,7 @@ SUBSYSTEM_DEF(traumas)
 			/obj/item/melee/baton/abductor, /obj/item/radio/headset/abductor, /obj/item/scalpel/alien, /obj/item/hemostat/alien,
 			/obj/item/retractor/alien, /obj/item/circular_saw/alien, /obj/item/surgicaldrill/alien, /obj/item/cautery/alien,
 			/obj/item/clothing/head/helmet/abductor, /obj/structure/bed/abductor, /obj/structure/table_frame/abductor,
-			/obj/structure/table/abductor, /obj/structure/table/optable/abductor, /obj/structure/closet/abductor, /obj/item/organ/heart/gland,
+			/obj/structure/table/abductor, /obj/structure/closet/abductor, /obj/item/organ/heart/gland,
 			/obj/machinery/abductor, /obj/item/crowbar/abductor, /obj/item/screwdriver/abductor, /obj/item/weldingtool/abductor,
 			/obj/item/wirecutters/abductor, /obj/item/wrench/abductor, /obj/item/stack/sheet/mineral/abductor)),
 
diff --git a/code/datums/components/embedded.dm b/code/datums/components/embedded.dm
index bae7a4f905..e02ad5c832 100644
--- a/code/datums/components/embedded.dm
+++ b/code/datums/components/embedded.dm
@@ -218,8 +218,8 @@
 	if(harmful)
 		var/damage = weapon.w_class * remove_pain_mult
 		// It hurts to rip it out, get surgery you dingus. unlike the others, this CAN wound + increase slash bloodflow
-		limb.receive_damage(brute = (1 - pain_stam_pct) * damage, stamina = pain_stam_pct * damage, sharpness = SHARP_EDGED)
-		victim.force_scream()
+		var/scream_power = limb.receive_damage(brute = (1 - pain_stam_pct) * damage, stamina = pain_stam_pct * damage, sharpness = SHARP_EDGED)
+		victim.force_pain_noise(scream_power)
 
 	victim.visible_message(
 		span_notice("[victim] successfully rips [weapon] [harmful ? "out" : "off"] of [victim.p_their()] [limb.name]!"),
diff --git a/code/datums/components/storage/concrete/pockets.dm b/code/datums/components/storage/concrete/pockets.dm
index 0cd90d6b60..c478c5f4ac 100644
--- a/code/datums/components/storage/concrete/pockets.dm
+++ b/code/datums/components/storage/concrete/pockets.dm
@@ -90,6 +90,7 @@
 		/obj/item/clothing/glasses/hud/security/night,
 		/obj/item/clothing/glasses/hud/security/sunglasses/inteq,
 		/obj/item/clothing/glasses/sunglasses/ballistic,
+		/obj/item/clothing/glasses/sunglasses/pgf,
 		/obj/item/clothing/glasses/hud/security/sunglasses/ngr,
 		/obj/item/clothing/glasses/hud/security/sunglasses/hardliners,
 		/obj/item/ammo_casing,
diff --git a/code/datums/components/tackle.dm b/code/datums/components/tackle.dm
index 112ca515d0..9fc2971084 100644
--- a/code/datums/components/tackle.dm
+++ b/code/datums/components/tackle.dm
@@ -395,7 +395,7 @@
 			playsound(user, 'sound/effects/blobattack.ogg', 60, TRUE)
 			playsound(user, 'sound/effects/splat.ogg', 70, TRUE)
 			playsound(user, 'sound/effects/wounds/crack2.ogg', 70, TRUE)
-			user.force_scream()
+			user.force_pain_noise(400)
 			user.gain_trauma(/datum/brain_trauma/severe/paralysis/paraplegic) // oopsie indeed!
 			shake_camera(user, 7, 7)
 			user.flash_act(1, TRUE, TRUE, length = 4.5) //PENTEST EDIT
diff --git a/code/datums/diseases/advance/advance.dm b/code/datums/diseases/advance/advance.dm
index db748da77e..d4a5e0315d 100644
--- a/code/datums/diseases/advance/advance.dm
+++ b/code/datums/diseases/advance/advance.dm
@@ -60,7 +60,7 @@
 										/datum/reagent/pax, /datum/reagent/drug/happiness, /datum/reagent/medicine/ephedrine
 									),
 									list(	// level 9
-										/datum/reagent/toxin/lipolicide, /datum/reagent/medicine/sal_acid
+										/datum/reagent/toxin/lipolicide, /datum/reagent/medicine/silfrine
 									),
 									list(	// level 10
 										/datum/reagent/medicine/haloperidol, /datum/reagent/drug/aranesp, /datum/reagent/medicine/diphenhydramine
diff --git a/code/datums/diseases/decloning.dm b/code/datums/diseases/decloning.dm
deleted file mode 100644
index 340d9fd0f3..0000000000
--- a/code/datums/diseases/decloning.dm
+++ /dev/null
@@ -1,59 +0,0 @@
-/datum/disease/decloning
-	form = "Virus"
-	name = "Cellular Degeneration"
-	max_stages = 5
-	stage_prob = 1
-	cure_text = "Rezadone or death."
-	agent = "Severe Genetic Damage"
-	viable_mobtypes = list(/mob/living/carbon/human)
-	desc = @"If left untreated the subject will [REDACTED]!"
-	severity = "Dangerous!"
-	cures = list(/datum/reagent/medicine/rezadone)
-	disease_flags = CAN_CARRY|CAN_RESIST
-	spread_flags = DISEASE_SPREAD_NON_CONTAGIOUS
-	process_dead = TRUE
-
-/datum/disease/decloning/stage_act()
-	..()
-	if(affected_mob.stat == DEAD)
-		cure()
-		return
-	switch(stage)
-		if(2)
-			if(prob(2))
-				affected_mob.emote("itch")
-			if(prob(2))
-				affected_mob.emote("yawn")
-		if(3)
-			if(prob(2))
-				affected_mob.emote("itch")
-			if(prob(2))
-				affected_mob.emote("drool")
-			if(prob(3))
-				affected_mob.adjustCloneLoss(1)
-			if(prob(2))
-				to_chat(affected_mob, span_danger("Your skin feels strange."))
-
-		if(4)
-			if(prob(2))
-				affected_mob.emote("itch")
-			if(prob(2))
-				affected_mob.emote("drool")
-			if(prob(5))
-				affected_mob.adjustOrganLoss(ORGAN_SLOT_BRAIN, 1, 170)
-				affected_mob.adjustCloneLoss(2)
-			if(prob(15))
-				affected_mob.stuttering += 3
-		if(5)
-			if(prob(2))
-				affected_mob.emote("itch")
-			if(prob(2))
-				affected_mob.emote("drool")
-			if(prob(5))
-				to_chat(affected_mob, span_danger("Your skin starts degrading!"))
-			if(prob(10))
-				affected_mob.adjustCloneLoss(5)
-				affected_mob.adjustOrganLoss(ORGAN_SLOT_BRAIN, 2, 170)
-			if(affected_mob.cloneloss >= 100)
-				affected_mob.visible_message(span_danger("[affected_mob] skin turns to dust!"), "<span class'boldwarning'>Your skin turns to dust!</span>")
-				affected_mob.dust()
diff --git a/code/datums/diseases/tuberculosis.dm b/code/datums/diseases/tuberculosis.dm
index 6ddd9e8ad3..007b530d06 100644
--- a/code/datums/diseases/tuberculosis.dm
+++ b/code/datums/diseases/tuberculosis.dm
@@ -4,7 +4,7 @@
 	max_stages = 5
 	spread_text = "Airborne"
 	cure_text = "Spaceacillin & Perfluorodecalin"
-	cures = list(/datum/reagent/medicine/spaceacillin, /datum/reagent/medicine/perfluorodecalin)
+	cures = list(/datum/reagent/medicine/spaceacillin, /datum/reagent/medicine/salbutamol)
 	agent = "Fungal Tubercle bacillus Cosmosis"
 	viable_mobtypes = list(/mob/living/carbon/human)
 	cure_chance = 5//like hell are you getting out of hell
diff --git a/code/datums/dna.dm b/code/datums/dna.dm
index 63f65d8dd7..787d60fc8f 100644
--- a/code/datums/dna.dm
+++ b/code/datums/dna.dm
@@ -626,7 +626,7 @@
 	dna.remove_all_mutations()
 	dna.stability = 100
 	if(prob(max(70-instability,0)))
-		switch(rand(0,10)) //not complete and utter death
+		switch(rand(0,8)) //not complete and utter death
 			if(0)
 				monkeyize()
 			if(1)
@@ -641,14 +641,8 @@
 				to_chat(src, span_notice("Oh, I actually feel quite alright!")) //you thought
 				physiology.damage_resistance = -20000
 			if(5)
-				to_chat(src, span_notice("Oh, I actually feel quite alright!"))
-				reagents.add_reagent(/datum/reagent/aslimetoxin, 10)
-			if(6)
 				apply_status_effect(STATUS_EFFECT_GO_AWAY)
-			if(7)
-				to_chat(src, span_notice("Oh, I actually feel quite alright!"))
-				ForceContractDisease(new/datum/disease/decloning()) //slow acting, non-viral clone damage based GBS
-			if(8)
+			if(6)
 				var/list/elligible_organs = list()
 				for(var/obj/item/organ/O in internal_organs) //make sure we dont get an implant or cavity item
 					elligible_organs += O
@@ -658,7 +652,7 @@
 					O.Remove(src)
 					visible_message(span_danger("[src] vomits up their [O.name]!"), span_danger("You vomit up your [O.name]")) //no "vomit up your the heart"
 					O.forceMove(drop_location())
-			if(9 to 10)
+			if(7 to 8) //Pentest Correction - Shiptest couldn't count
 				ForceContractDisease(new/datum/disease/gastrolosis())
 				to_chat(src, span_notice("Oh, I actually feel quite alright!"))
 	else
diff --git a/code/datums/mapgen/planetary/AsteroidGenerator.dm b/code/datums/mapgen/planetary/AsteroidGenerator.dm
index 77aaab08da..20ef2015e7 100644
--- a/code/datums/mapgen/planetary/AsteroidGenerator.dm
+++ b/code/datums/mapgen/planetary/AsteroidGenerator.dm
@@ -127,7 +127,7 @@
 		/obj/structure/geyser/random = 1,
 		/obj/structure/vein/asteroid = 5,
 		/obj/structure/vein/asteroid/classtwo = 10,
-		/obj/structure/vein/asteroid/classtwo/rare = 5,
+		/obj/structure/vein/asteroid/classtwo/rare = 3,
 		/obj/structure/vein/asteroid/classthree = 5,
 		/obj/structure/vein/asteroid/classthree/rare = 1,
 	)
diff --git a/code/datums/mood_events/generic_negative_events.dm b/code/datums/mood_events/generic_negative_events.dm
index 358d4e1559..0c016e7fc9 100644
--- a/code/datums/mood_events/generic_negative_events.dm
+++ b/code/datums/mood_events/generic_negative_events.dm
@@ -114,6 +114,11 @@
 	mood_change = -4
 	timeout = 3 MINUTES
 
+/datum/mood_event/uncomfortable_medicine
+	description = span_warning("Medicine may be good for me, but right now I feel worse.")
+	mood_change = -3
+	timeout = 120 SECONDS
+
 /datum/mood_event/painful_medicine
 	description = span_warning("Medicine may be good for me but right now it stings like hell.")
 	mood_change = -5
diff --git a/code/datums/ruins/beachplanet.dm b/code/datums/ruins/beachplanet.dm
index 8e4784d4c4..7c5320556b 100644
--- a/code/datums/ruins/beachplanet.dm
+++ b/code/datums/ruins/beachplanet.dm
@@ -4,21 +4,6 @@
 	prefix = "_maps/RandomRuins/BeachRuins/"
 	ruin_type = RUINTYPE_BEACH
 
-/datum/map_template/ruin/beachplanet/crashedengie
-	name = "Crashed Engineer Ship"
-	id = "beach_crashed_engineer"
-	description = "An abandoned camp built by a crashed engineer"
-	suffix = "beach_crashed_engineer.dmm"
-	ruin_tags = list(RUIN_TAG_MINOR_COMBAT, RUIN_TAG_MEDIUM_LOOT, RUIN_TAG_HAZARDOUS)
-	ruin_mission_types = list(/datum/mission/ruin/lost_axe)
-
-/datum/mission/ruin/lost_axe
-	name = "Axe Retrieval"
-	desc = "I recently lost a heirloom axe - produced by a very fine Syebenaltch Guild. I was unable to retrieve it when my vessel crashed, and I was rescued. Please bring it home to me."
-	mission_limit = 1
-	value = 1000
-	setpiece_item = /obj/item/melee/axe/fire
-
 /datum/map_template/ruin/beachplanet/ancient
 	name = "Ancient Danger"
 	id = "beach_ancient"
@@ -26,6 +11,31 @@
 	suffix = "beach_ancient_ruin.dmm"
 	ruin_tags = list(RUIN_TAG_MEDIUM_COMBAT, RUIN_TAG_MEDIUM_LOOT, RUIN_TAG_LIVEABLE)
 
+/datum/map_template/ruin/beachplanet/treasurecove
+	name = "Treasure Cove"
+	id = "beach_treasure_cove"
+	description = "A abandoned colony. It seems that this colony was abandoned, for a reason or another"
+	suffix = "beach_treasure_cove.dmm"
+	ruin_tags = list(RUIN_TAG_MEDIUM_COMBAT, RUIN_TAG_MEDIUM_LOOT, RUIN_TAG_LIVEABLE)
+	ruin_mission_types = list(/datum/mission/ruin/signaled/kill/frontiersmen)
+
+/datum/map_template/ruin/beachplanet/frontie_moat
+	name = "Frontiersman Moat"
+	id = "beach_frontie_moat"
+	description = "A frontiersman-built moat village. Not the worst place to live."
+	suffix = "beach_frontie_moat.dmm"
+	ruin_tags = list(RUIN_TAG_MEDIUM_COMBAT, RUIN_TAG_MEDIUM_LOOT, RUIN_TAG_LIVEABLE)
+	ruin_mission_types = list(/datum/mission/ruin/minutecorpse)
+
+/datum/mission/ruin/minutecorpse
+	name = "Bro's gone."
+	desc = "One of my pals, great person, recently enlisted into the minutemen as some vehicle dude or whatever. Said they were going on some scouting mission here, haven't heard a response from them in about a week. Think you could find out what happened, and get something for their family?"
+	value = 2250
+	mission_limit = 1
+	author = "A friend."
+	faction = /datum/faction/clip
+	setpiece_item = /mob/living/carbon/human
+
 /datum/map_template/ruin/beachplanet/frontiersmen_depot
 	name = "Frontiersmen Depot"
 	id = "beach_bunkers"
diff --git a/code/datums/wounds/_wounds.dm b/code/datums/wounds/_wounds.dm
index 9a3f37015c..2e97bbe5d9 100644
--- a/code/datums/wounds/_wounds.dm
+++ b/code/datums/wounds/_wounds.dm
@@ -327,6 +327,14 @@
 /datum/wound/proc/on_synthflesh(power)
 	return
 
+/// When silfrine is applied to the victim, we call this.
+/datum/wound/proc/on_silfrine(power)
+	return
+
+/// When ysiltane/alvitane/quardextane is applied to the victim, we call this.
+/datum/wound/proc/on_tane(power)
+	return
+
 /// Called when the patient is undergoing stasis, so that having fully treated a wound doesn't make you sit there helplessly until you think to unbuckle them
 /datum/wound/proc/on_stasis()
 	return
diff --git a/code/datums/wounds/bones.dm b/code/datums/wounds/bones.dm
index f881c115b5..73420e2e43 100644
--- a/code/datums/wounds/bones.dm
+++ b/code/datums/wounds/bones.dm
@@ -102,7 +102,8 @@
 	if(prob((severity - 1) * 15))
 		// And you have a 70% or 50% chance to actually land the blow, respectively
 		if(prob(70 - 20 * (severity - 1)))
-			to_chat(victim, span_userdanger("The fracture in your [limb.name] shoots with pain as you strike [target]!"))
+			if(!HAS_TRAIT(M, TRAIT_ANALGESIA))
+				to_chat(victim, span_userdanger("The fracture in your [limb.name] shoots with pain as you strike [target]!"))
 			limb.receive_damage(brute = rand(1,2))
 		else
 			victim.visible_message(
@@ -287,7 +288,7 @@
 			ignored_mobs = victim,
 		)
 		to_chat(victim, span_userdanger("[user] snaps your dislocated [limb.name] back into place!"))
-		victim.force_scream()
+		victim.force_pain_noise(80)
 		limb.receive_damage(brute = 5, wound_bonus = CANT_WOUND)
 		qdel(src)
 	else
@@ -314,7 +315,7 @@
 			ignored_mobs = victim,
 		)
 		to_chat(victim, span_userdanger("[user] snaps your dislocated [limb.name] with a sickening crack!"))
-		victim.force_scream()
+		victim.force_pain_noise(100)
 		limb.receive_damage(brute = 20, wound_bonus = 40)
 	else
 		user.visible_message(
@@ -431,7 +432,7 @@
 		return
 
 	I.use(1)
-	victim.force_scream()
+	victim.force_pain_noise(60)
 	if(user != victim)
 		user.visible_message(
 			span_notice("[user] finishes applying [I] to [victim]'s [limb.name], giving off a wet fizzle."),
diff --git a/code/datums/wounds/burns.dm b/code/datums/wounds/burns.dm
index cb6eff02d3..922c67ecd8 100644
--- a/code/datums/wounds/burns.dm
+++ b/code/datums/wounds/burns.dm
@@ -227,10 +227,21 @@
 			to_chat(user, span_warning("You need to open [mesh_check] first."))
 			return
 		ointmentmesh(mesh_check, user)
-e
+
 /datum/wound/burn/on_synthflesh(amount)
 	flesh_healing += amount * 0.5 // 20u patch will heal 10 flesh standard
 
+/// When a -tane chem is applied to the victim, we call this.
+/datum/wound/burn/on_tane(amount)
+	if(amount > 10 && severity <= WOUND_SEVERITY_SEVERE)
+		qdel(src)
+		return
+
+	flesh_healing += amount * 0.25
+	sanitization += amount * 0.1
+	return
+
+
 // we don't even care about first degree burns, straight to second
 /datum/wound/burn/moderate
 	name = "Second Degree Burns"
diff --git a/code/datums/wounds/muscle.dm b/code/datums/wounds/muscle.dm
index cf13b3bf2a..88b7093ab6 100644
--- a/code/datums/wounds/muscle.dm
+++ b/code/datums/wounds/muscle.dm
@@ -73,7 +73,8 @@
 	if(prob(severity * 15))
 		//And you have a 70% or 50% chance to actually land the blow, respectively
 		if(prob(70 - 20 * severity))
-			to_chat(victim, span_userdanger("The damaged muscle in your [limb.name] shoots with pain as you strike [target]!"))
+			if(!HAS_TRAIT(M, TRAIT_ANALGESIA))
+				to_chat(victim, span_userdanger("The damaged muscle in your [limb.name] shoots with pain as you strike [target]!"))
 			limb.receive_damage(brute=rand(1,3))
 		else
 			victim.visible_message(
diff --git a/code/datums/wounds/pierce.dm b/code/datums/wounds/pierce.dm
index cc607e3a6c..a7ddf660d0 100644
--- a/code/datums/wounds/pierce.dm
+++ b/code/datums/wounds/pierce.dm
@@ -116,6 +116,18 @@
 	. = ..()
 	blood_flow -= 0.05 * power // 20u * 0.05 = -1 blood flow, less than with slashes but still good considering smaller bleed rates
 
+/datum/wound/pierce/on_silfrine(power)
+	switch(power)
+		if(0 to 3)
+			EMPTY_BLOCK_GUARD
+		if(4 to 8)
+			if(severity < WOUND_SEVERITY_MODERATE)
+				qdel(src)
+		if(8 to 30)
+			if(severity < WOUND_SEVERITY_SEVERE)
+				qdel(src)
+	blood_flow -= 0.05 * power
+
 /// If someone is using a suture to close this puncture
 /datum/wound/pierce/proc/suture(obj/item/stack/medical/suture/I, mob/user)
 	var/self_penalty_mult = (user == victim ? 1 : 1)
@@ -158,7 +170,7 @@
 	)
 	limb.receive_damage(burn = 2 + severity, wound_bonus = CANT_WOUND)
 	if(prob(15))
-		victim.force_scream()
+		victim.force_pain_noise(50)
 	var/blood_cauterized = (0.6 / (self_penalty_mult * improv_penalty_mult))
 	blood_flow -= blood_cauterized
 
diff --git a/code/datums/wounds/slash.dm b/code/datums/wounds/slash.dm
index 7648ff0788..a3003c22a6 100644
--- a/code/datums/wounds/slash.dm
+++ b/code/datums/wounds/slash.dm
@@ -151,6 +151,18 @@
 	. = ..()
 	blood_flow -= 0.075 * power // 20u * 0.075 = -1.5 blood flow
 
+/datum/wound/slash/on_silfrine(power)
+	switch(power)
+		if(0 to 5)
+			EMPTY_BLOCK_GUARD
+		if(6 to 11)
+			if(severity < WOUND_SEVERITY_MODERATE)
+				qdel(src)
+		if(12 to 30)
+			if(severity < WOUND_SEVERITY_SEVERE)
+				qdel(src)
+	blood_flow -= 0.05 * power
+
 /// If someone's putting a laser gun up to our cut to cauterize it
 /datum/wound/slash/proc/las_cauterize(obj/item/gun/energy/laser/lasgun, mob/user)
 	var/self_penalty_mult = (user == victim ? 1.25 : 1)
diff --git a/code/game/area/areas/ruins/beachplanet.dm b/code/game/area/areas/ruins/beachplanet.dm
index 636d3a224b..c5d06d490a 100644
--- a/code/game/area/areas/ruins/beachplanet.dm
+++ b/code/game/area/areas/ruins/beachplanet.dm
@@ -52,3 +52,22 @@
 /area/ruin/beach/bunker/side_two
 	icon_state = "green"
 
+// fishing village
+
+/area/ruin/beach/village
+	icon_state = "green"
+
+/area/ruin/beach/village/armory
+	icon_state = "armory"
+
+/area/ruin/beach/village/infirmary
+	icon_state = "blue"
+
+/area/ruin/beach/village/kitchen
+	icon_state = "bar"
+
+/area/ruin/beach/village/officers
+	icon_state = "bridge"
+
+/area/ruin/beach/village/dorm
+	icon_state = "crew_quarters"
diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm
index 46e419666c..36fc981ed5 100644
--- a/code/game/machinery/cloning.dm
+++ b/code/game/machinery/cloning.dm
@@ -286,7 +286,7 @@
 			connected_message("Clone Ejected: Not enough material.")
 			if(internal_radio)
 				SPEAK("The cloning of [mob_occupant.real_name] has been ended prematurely due to insufficient material.")
-		if(mob_occupant && (mob_occupant.stat == DEAD) ||  mob_occupant.hellbound)  //Autoeject corpses.
+		if(mob_occupant && (mob_occupant.stat == DEAD))  //Autoeject corpses.
 			connected_message("Clone Rejected: Deceased.")
 			if(internal_radio)
 				SPEAK("The cloning of [mob_occupant.real_name] has been \
diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm
index 9abb6ed8b1..be79ff44b9 100644
--- a/code/game/machinery/computer/arcade.dm
+++ b/code/game/machinery/computer/arcade.dm
@@ -40,7 +40,6 @@ GLOBAL_LIST_INIT(arcade_prize_pool, list(
 		/obj/item/toy/clockwork_watch = 2,
 		/obj/item/toy/toy_dagger = 2,
 		/obj/item/extendohand/acme = 1,
-		/obj/item/hot_potato/harmless/toy = 1,
 		/obj/item/card/emagfake = 1,
 		/obj/item/clothing/shoes/kindleKicks = 2,
 		/obj/item/toy/plush/goatplushie/angry/realgoat = 2,
diff --git a/code/game/machinery/computer/cloning.dm b/code/game/machinery/computer/cloning.dm
index cea3f2eada..9218c140d3 100644
--- a/code/game/machinery/computer/cloning.dm
+++ b/code/game/machinery/computer/cloning.dm
@@ -542,10 +542,6 @@
 		scantemp = "<font class='bad'>Unable to locate valid genetic data.</font>"
 		playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, FALSE)
 		return
-	if(!body_only && mob_occupant.hellbound)
-		scantemp = "<font class='bad'>Subject's brain is not responding to scanning stimuli.</font>"
-		playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, FALSE)
-		return
 	if((HAS_TRAIT(mob_occupant, TRAIT_HUSK)) && (src.scanner.scan_level < 2))
 		scantemp = "<font class='bad'>Subject's body is too damaged to scan properly.</font>"
 		playsound(src, 'sound/machines/terminal_alert.ogg', 50, FALSE)
diff --git a/code/game/machinery/medipen_refiller.dm b/code/game/machinery/medipen_refiller.dm
index 749c1aa322..1d385839df 100644
--- a/code/game/machinery/medipen_refiller.dm
+++ b/code/game/machinery/medipen_refiller.dm
@@ -11,8 +11,8 @@
 		/obj/item/reagent_containers/hypospray/medipen = /datum/reagent/medicine/epinephrine,
 		/obj/item/reagent_containers/hypospray/medipen/atropine = /datum/reagent/medicine/atropine,
 		/obj/item/reagent_containers/hypospray/medipen/salbutamol = /datum/reagent/medicine/salbutamol,
-		/obj/item/reagent_containers/hypospray/medipen/oxandrolone = /datum/reagent/medicine/oxandrolone,
-		/obj/item/reagent_containers/hypospray/medipen/salacid = /datum/reagent/medicine/sal_acid,
+		/obj/item/reagent_containers/hypospray/medipen/ysiltane = /datum/reagent/medicine/ysiltane,
+		/obj/item/reagent_containers/hypospray/medipen/silfrine = /datum/reagent/medicine/silfrine,
 		/obj/item/reagent_containers/hypospray/medipen/penacid = /datum/reagent/medicine/pen_acid
 	)
 	/// var to prevent glitches in the animation
diff --git a/code/game/machinery/sleeper.dm b/code/game/machinery/sleeper.dm
index 6d89618d6e..c99eff22de 100644
--- a/code/game/machinery/sleeper.dm
+++ b/code/game/machinery/sleeper.dm
@@ -27,11 +27,11 @@
 	var/list/dispensable_reagents
 
 	var/list/starting_beakers = list(
-		/obj/item/reagent_containers/glass/bottle/antitoxin/sleeper,
-		/obj/item/reagent_containers/glass/bottle/bicaridine/sleeper,
+		/obj/item/reagent_containers/glass/bottle/charcoal/sleeper,
+		/obj/item/reagent_containers/glass/bottle/indomide/sleeper,
 		/obj/item/reagent_containers/glass/bottle/dexalin/sleeper,
 		/obj/item/reagent_containers/glass/bottle/epinephrine/sleeper,
-		/obj/item/reagent_containers/glass/bottle/kelotane/sleeper,
+		/obj/item/reagent_containers/glass/bottle/alvitane/sleeper,
 		/obj/item/reagent_containers/glass/bottle/morphine/sleeper)
 
 	///Chembag which holds all the beakers, don't look at me like that
diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm
index 488739e459..a32af07098 100644
--- a/code/game/machinery/suit_storage_unit.dm
+++ b/code/game/machinery/suit_storage_unit.dm
@@ -223,6 +223,14 @@ LOCKED_SSU_HELPER(rd)
 	mask_type = /obj/item/clothing/mask/breath
 	storage_type = /obj/item/tank/internals/emergency_oxygen/engi
 
+/obj/machinery/suit_storage_unit/frontiersmen
+	name = "frontiersmen suit storage unit"
+	suit_type = /obj/item/clothing/suit/space/hardsuit/security/independent/frontier
+	storage_type = /obj/item/tank/jetpack/oxygen
+	req_access = list(ACCESS_SECURITY)
+
+LOCKED_SSU_HELPER(frontiersmen)
+
 /obj/machinery/suit_storage_unit/independent/security
 	name = "security suit storage unit"
 	suit_type = /obj/item/clothing/suit/space/hardsuit/security/independent
diff --git a/code/game/objects/effects/decals/turfdecal/flooring_decals.dm b/code/game/objects/effects/decals/turfdecal/flooring_decals.dm
index 416c251277..b2bffe5a47 100644
--- a/code/game/objects/effects/decals/turfdecal/flooring_decals.dm
+++ b/code/game/objects/effects/decals/turfdecal/flooring_decals.dm
@@ -135,6 +135,7 @@ TURF_DECAL_COLOR_HELPER(opaque/solgovblue, "#2d2a4e", 255)
 TURF_DECAL_COLOR_HELPER(opaque/solgovgold, "#eeac2e", 255)
 TURF_DECAL_COLOR_HELPER(opaque/syndiered, "#730622", 255)
 TURF_DECAL_COLOR_HELPER(opaque/inteqbrown, "#4b2a18", 255)
+TURF_DECAL_COLOR_HELPER(opaque/inteqbrownlight, "#804433", 255)
 TURF_DECAL_COLOR_HELPER(opaque/cybersunteal, "#4C9C9C", 255)
 
 //transparent
@@ -164,6 +165,7 @@ TURF_DECAL_COLOR_HELPER(transparent/solgovblue, "#2d2a4e", 140)
 TURF_DECAL_COLOR_HELPER(transparent/solgovgold, "#eeac2e", 140)
 TURF_DECAL_COLOR_HELPER(transparent/syndiered, "#730622", 140)
 TURF_DECAL_COLOR_HELPER(transparent/inteqbrown, "#4b2a18", 140)
+TURF_DECAL_COLOR_HELPER(transparent/inteqbrownlight, "#804433", 140)
 TURF_DECAL_COLOR_HELPER(transparent/cybersunteal, "#4C9C9C", 140)
 
 /obj/effect/turf_decal/spline/plain
@@ -197,13 +199,28 @@ TURF_DECAL_COLOR_HELPER(transparent/cybersunteal, "#4C9C9C", 140)
 /obj/effect/turf_decal/industrial/warning/full
 	icon_state = "stripefull"
 
-
 /obj/effect/turf_decal/industrial/warning/cee
 	icon_state = "stripecee"
 
 /obj/effect/turf_decal/industrial/warning/fulltile
 	icon_state = "stripefulltile"
 
+/obj/effect/turf_decal/industrial/warning/green
+	color = null
+	icon_state = "stripe_green"
+
+/obj/effect/turf_decal/industrial/warning/green/corner
+	icon_state = "stripecorner_green"
+
+/obj/effect/turf_decal/industrial/warning/green/full
+	icon_state = "stripefull_green"
+
+/obj/effect/turf_decal/industrial/warning/green/cee
+	icon_state = "stripecee_green"
+
+/obj/effect/turf_decal/industrial/warning/green/fulltile
+	icon_state = "stripefulltile_green"
+
 /obj/effect/turf_decal/industrial/custodial
 	name = "custodial stripes"
 	icon_state = "stripe"
diff --git a/code/game/objects/effects/spawners/random/exotic.dm b/code/game/objects/effects/spawners/random/exotic.dm
index 4cc66f19e2..b2b7975e90 100644
--- a/code/game/objects/effects/spawners/random/exotic.dm
+++ b/code/game/objects/effects/spawners/random/exotic.dm
@@ -36,7 +36,6 @@
 		/obj/item/reagent_containers/syringe/contraband/crank = 1,
 		/obj/item/reagent_containers/syringe/contraband/methamphetamine = 1,
 		/obj/item/reagent_containers/syringe/contraband/mammoth = 1,
-		/obj/item/reagent_containers/syringe/contraband/fentanyl = 1,
 		/obj/item/reagent_containers/syringe/contraband/morphine = 1,
 		/obj/item/storage/pill_bottle/happy = 1,
 		/obj/item/storage/pill_bottle/lsd = 1,
diff --git a/code/game/objects/effects/spawners/random/salvaging.dm b/code/game/objects/effects/spawners/random/salvaging.dm
index dfa50c49bb..b94b057639 100644
--- a/code/game/objects/effects/spawners/random/salvaging.dm
+++ b/code/game/objects/effects/spawners/random/salvaging.dm
@@ -61,7 +61,7 @@
 			/obj/item/clothing/gloves/combat = 200,
 			/obj/item/clothing/head/chameleon = 200,
 			/obj/item/pen/sleepy = 200,
-			/obj/item/reagent_containers/hypospray/medipen/stimpack/traitor = 100,
+			/obj/item/reagent_containers/hypospray/medipen/stimpack/crisis = 100,
 			/obj/item/grenade/c4 = 100,
 
 			/obj/item/wrench/syndie = 30,
diff --git a/code/game/objects/items/attachments/ammo_counter.dm b/code/game/objects/items/attachments/ammo_counter.dm
index 2b04fff106..e0aac9ec6c 100644
--- a/code/game/objects/items/attachments/ammo_counter.dm
+++ b/code/game/objects/items/attachments/ammo_counter.dm
@@ -1,11 +1,11 @@
 /obj/item/attachment/ammo_counter
 	name = "ammunition counter"
-	desc = "A computerized ammunition tracker for use on conventional firearms. Includes a small toggle for telling the user when ammo is depleted."
+	desc = "A computerized ammunition tracker for use on conventional firearms. Includes a small toggle for telling the user when ammo is depleted. Capable of mounting on both a railing or scope, depending on the user's preference."
 	icon_state = "ammo_counter"
 
 	attach_features_flags = ATTACH_REMOVABLE_HAND|ATTACH_TOGGLE
 
-	slot = ATTACHMENT_SLOT_RAIL
+	slot = ATTACHMENT_SLOT_SCOPE
 	pixel_shift_x = 0
 	pixel_shift_y = 0
 	size_mod = 0
@@ -36,6 +36,15 @@
 			qdel(our_counter)
 			return TRUE
 
+/obj/item/attachment/ammo_counter/attack_self(mob/user)
+	. = ..()
+	playsound(src, 'sound/items/flashlight_on.ogg', 25)
+	if(slot == src::slot)
+		slot = ATTACHMENT_SLOT_RAIL
+	else
+		slot = src::slot
+	to_chat(user, span_notice("You adjust [src] to fit on a gun's [slot]."))
+
 /obj/item/attachment/ammo_counter/toggle_attachment(obj/item/gun/gun, mob/user)
 	. = ..()
 	if(gun::empty_alarm)
diff --git a/code/game/objects/items/bodycamera.dm b/code/game/objects/items/bodycamera.dm
index 043be1ca29..116cb09587 100644
--- a/code/game/objects/items/bodycamera.dm
+++ b/code/game/objects/items/bodycamera.dm
@@ -1,3 +1,5 @@
+#define BODYCAM_UPDATE_BUFFER 1 SECONDS
+
 /obj/item/bodycamera
 	name = "body camera"
 	desc = "Ruggedized portable camera unit. Warranty void if exposed to space."
@@ -15,6 +17,9 @@
 	var/view_range = 5
 	var/busy = FALSE
 	var/can_transmit_across_z_levels = FALSE
+	var/updating = FALSE //portable camera camerachunk update
+	var/mob/tracked_mob //last mob that picked up the bodycamera. needed for cameranet updates
+	var/datum/movement_detector/tracker
 
 /obj/item/bodycamera/Initialize()
 	. = ..()
@@ -22,6 +27,7 @@
 		network -= i
 		network += lowertext(i)
 
+	tracker = new /datum/movement_detector(src, CALLBACK(src, PROC_REF(obj_move)))
 	GLOB.cameranet.cameras += src
 	GLOB.cameranet.addCamera(src)
 	c_tag = "Body Camera - " + random_string(4, list("0","1","2","3","4","5","6","7","8","9","A","B","C","D","E","F"))
@@ -31,6 +37,7 @@
 	if(can_use())
 		toggle_cam(null, 0) //kick anyone viewing out and remove from the camera chunks
 	GLOB.cameranet.cameras -= src
+	qdel(tracker)
 	return ..()
 
 /obj/item/bodycamera/examine(mob/user)
@@ -46,7 +53,7 @@
 	if(!user.CanReach(src))
 		return
 	if(do_after(user, 10, src, IGNORE_USER_LOC_CHANGE))
-		status = !status
+		toggle_cam(user)
 		if(status)
 			icon_state = "bodycamera-on"
 			playsound(user, 'sound/items/bodycamera_on.ogg', 23, FALSE)
@@ -97,7 +104,7 @@
 	src.view_range = num
 	GLOB.cameranet.updateVisibility(src, 0)
 
-/obj/item/bodycamera/proc/toggle_cam(mob/user, displaymessage = 1)
+/obj/item/bodycamera/proc/toggle_cam(mob/user)
 	status = !status
 	if(can_use())
 		GLOB.cameranet.addCamera(src)
@@ -107,6 +114,7 @@
 		if (isarea(myarea))
 			LAZYREMOVE(myarea.cameras, src)
 	GLOB.cameranet.updateChunk(x, y, z)
+	do_camera_update()
 	update_appearance() //update Initialize() if you remove this.
 
 	// now disconnect anyone using the camera
@@ -138,6 +146,25 @@
 	user.see_in_dark = 2
 	return 1
 
+/obj/item/bodycamera/proc/obj_move()
+	SIGNAL_HANDLER
+
+	var/cam_location = src.loc
+	if(isturf(cam_location) || isatom(cam_location))
+		update_camera_location(cam_location)
+	return
+
+/obj/item/bodycamera/proc/do_camera_update(oldLoc)
+	if(oldLoc != get_turf(src)) //we want to make sure the camera source has actually moved before running expensive camera updates
+		GLOB.cameranet.updatePortableCamera(src)
+	updating = FALSE
+
+/obj/item/bodycamera/proc/update_camera_location(oldLoc)
+	oldLoc = get_turf(oldLoc)
+	if(!updating)
+		updating = TRUE
+		addtimer(CALLBACK(src, PROC_REF(do_camera_update), oldLoc), BODYCAM_UPDATE_BUFFER)
+
 /obj/item/paper/guides/bodycam
 	name = "Portable Camera Unit Users Guide"
 	default_raw_text = "<font face='serif'><font size=2><div align='center'><u><font size=5>Portable Camera Unit User's Guide</u>\n<div align='left'><font size=3> The Mark I Portable Camera unit is a versatile solution ⠀   for all of your project management needs.\n\n<font size=4><dl><dt> Features</dt><font size=3><dd> - Real-time visual data feedback </dd><dd> - Configurable EEPROM memory settings</dd><dd> - Passive thermal regulator</dd><dd> - Long-range millimeter-wave band antenna</dd><dd> - High-capacity self-recharging battery</dd><dd> - Easy to reach power button</dd></dl>\n\n To activate the camera, simply press and hold the\n power button for one second. You should hear a chime\n and a green status light should become lit.\n\n To deactivate the camera, depress the power button\n again for one second.\n\n In order to modify the settings of your portable camera\n unit, a ISO-standard multitool will be required.\n \n Simply connect the tool to the camera's settings port,\n and you should be able to modify the internal address\n of the camera, or the network configuration.\n\n You will also be able to save the network configuration\n of the camera and copy it to other Mark I Portable\n Camera units.\n\n We hope that our tools will provide the edge you need\n in order to ensure your team stays on-task."
@@ -248,3 +275,5 @@
 		for(var/obj/machinery/computer/security/telescreen/entertainment/TV in GLOB.machines)
 			TV.notify(TRUE, "[c_tag] is now live on [network[1]]!")
 			COOLDOWN_START(src, broadcast_announcement, 20 SECONDS)
+
+#undef BODYCAM_UPDATE_BUFFER
diff --git a/code/game/objects/items/cigs_lighters.dm b/code/game/objects/items/cigs_lighters.dm
index 9a8a6e4174..5803c1efad 100644
--- a/code/game/objects/items/cigs_lighters.dm
+++ b/code/game/objects/items/cigs_lighters.dm
@@ -339,11 +339,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 	chem_volume = 60
 	smoketime = 2 * 60
 	smoke_all = TRUE
-	list_reagents = list(/datum/reagent/drug/nicotine = 10, /datum/reagent/medicine/omnizine = 15)
-
-/obj/item/clothing/mask/cigarette/xeno
-	desc = "A Xeno Filtered brand cigarette."
-	list_reagents = list (/datum/reagent/drug/nicotine = 20, /datum/reagent/medicine/regen_jelly = 15)
+	list_reagents = list(/datum/reagent/drug/nicotine = 10, /datum/reagent/medicine/panacea = 15)
 
 // Rollies.
 
@@ -744,7 +740,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 	heat = 3000 //Blue flame!
 	light_color = LIGHT_COLOR_CYAN
 	overlay_state = "slime"
-	grind_results = list(/datum/reagent/iron = 1, /datum/reagent/fuel = 5, /datum/reagent/medicine/pyroxadone = 5)
+	grind_results = list(/datum/reagent/iron = 1, /datum/reagent/fuel = 5)
 
 /obj/item/lighter/clockwork
 	name = "bronze zippo"
diff --git a/code/game/objects/items/defib.dm b/code/game/objects/items/defib.dm
index 86af260dae..c5a8fd4d9e 100644
--- a/code/game/objects/items/defib.dm
+++ b/code/game/objects/items/defib.dm
@@ -552,10 +552,7 @@
 				shock_touching(30, H)
 				var/failed
 
-
-				if (H.hellbound)
-					failed = span_warning("[req_defib ? "[defib]" : "[src]"] buzzes: Resuscitation failed - Patient's soul appears to be on another plane of existence. Further attempts futile.")
-				else if (!heart)
+				if (!heart)
 					failed = span_warning("[req_defib ? "[defib]" : "[src]"] buzzes: Resuscitation failed - Patient's heart is missing.")
 				else if (heart.organ_flags & ORGAN_FAILING)
 					failed = span_warning("[req_defib ? "[defib]" : "[src]"] buzzes: Resuscitation failed - Patient's heart too damaged, replace or repair and try again.")
diff --git a/code/game/objects/items/food/donk.dm b/code/game/objects/items/food/donk.dm
index d9eb797c7a..5d6c266289 100644
--- a/code/game/objects/items/food/donk.dm
+++ b/code/game/objects/items/food/donk.dm
@@ -50,7 +50,7 @@
 	food_reagents = list(
 		/datum/reagent/consumable/nutriment = 3,
 		/datum/reagent/consumable/nutriment/protein = 2,
-		/datum/reagent/medicine/omnizine = 6
+		/datum/reagent/medicine/panacea/effluvial = 6
 	)
 	tastes = list("meat" = 2, "dough" = 2, "laziness" = 1)
 	foodtypes = GRAIN
@@ -92,7 +92,7 @@
 	food_reagents = list(
 		/datum/reagent/consumable/nutriment = 3,
 		/datum/reagent/consumable/nutriment/protein = 2,
-		/datum/reagent/medicine/omnizine = 2,
+		/datum/reagent/medicine/panacea/effluvial = 2,
 		/datum/reagent/consumable/capsaicin = 5
 	)
 	tastes = list("meat" = 2, "dough" = 2, "weird spices" = 2)
@@ -120,7 +120,7 @@
 	food_reagents = list(
 		/datum/reagent/consumable/nutriment = 3,
 		/datum/reagent/consumable/nutriment/protein = 3,
-		/datum/reagent/medicine/omnizine = 2,
+		/datum/reagent/medicine/panacea/effluvial = 2,
 		/datum/reagent/consumable/soysauce = 2,
 	)
 	tastes = list("meat" = 2, "dough" = 2, "soy sauce" = 2)
@@ -148,7 +148,7 @@
 	food_reagents = list(
 		/datum/reagent/consumable/nutriment = 3,
 		/datum/reagent/consumable/nutriment/protein = 2,
-		/datum/reagent/medicine/omnizine = 2,
+		/datum/reagent/medicine/panacea/effluvial = 2,
 		/datum/reagent/consumable/tomatojuice = 2
 	)
 	tastes = list("meat" = 2, "dough" = 2, "melty cheese"= 2)
@@ -174,7 +174,7 @@
 	icon_state = "donkpocketberry"
 	food_reagents = list(
 		/datum/reagent/consumable/nutriment = 4,
-		/datum/reagent/medicine/omnizine = 2,
+		/datum/reagent/medicine/panacea/effluvial = 2,
 		/datum/reagent/consumable/berryjuice = 3
 	)
 	tastes = list("dough" = 2, "warm jam" = 2)
diff --git a/code/game/objects/items/food/donut.dm b/code/game/objects/items/food/donut.dm
index c589231d61..7c8a919475 100644
--- a/code/game/objects/items/food/donut.dm
+++ b/code/game/objects/items/food/donut.dm
@@ -89,7 +89,7 @@
 		/datum/reagent/toxin/slimejelly,
 		/datum/reagent/consumable/banana,
 		/datum/reagent/consumable/berryjuice,
-		/datum/reagent/medicine/omnizine,
+		/datum/reagent/medicine/panacea,
 	)
 	reagents.add_reagent(extra_reagent, 3)
 
diff --git a/code/game/objects/items/food/meatslab.dm b/code/game/objects/items/food/meatslab.dm
index 3947456a98..f4edc995bd 100644
--- a/code/game/objects/items/food/meatslab.dm
+++ b/code/game/objects/items/food/meatslab.dm
@@ -862,7 +862,7 @@
 	bite_consumption = 1
 	food_reagents = list(
 		/datum/reagent/consumable/nutriment = 1,
-		/datum/reagent/medicine/regen_jelly = 1,
+		/datum/reagent/medicine/panacea/effluvial = 1,
 	)
 	tastes = list("jelly" = 1, "sweet meat" = 1, "oil" = 1)
 	foodtypes = MEAT
diff --git a/code/game/objects/items/food/pastry.dm b/code/game/objects/items/food/pastry.dm
index 1e56a1de31..fa0ff82e86 100644
--- a/code/game/objects/items/food/pastry.dm
+++ b/code/game/objects/items/food/pastry.dm
@@ -188,13 +188,11 @@
 		name = "exceptional plump helmet biscuit"
 		desc = "Microwave is taken by a fey mood! It has cooked an exceptional plump helmet biscuit!"
 		food_reagents = list(
-			/datum/reagent/medicine/omnizine = 5,
+			/datum/reagent/medicine/panacea = 5,
 			/datum/reagent/consumable/nutriment = 1,
 			/datum/reagent/consumable/nutriment/vitamin = 1,
 		)
 	. = ..()
-	if(fey)
-		reagents.add_reagent(/datum/reagent/medicine/omnizine, 5)
 
 /obj/item/food/cracker
 	name = "cracker"
diff --git a/code/game/objects/items/food/pie.dm b/code/game/objects/items/food/pie.dm
index 77c7ff22f0..f43cd33782 100644
--- a/code/game/objects/items/food/pie.dm
+++ b/code/game/objects/items/food/pie.dm
@@ -201,7 +201,7 @@
 		desc = "Microwave is taken by a fey mood! It has cooked an exceptional plump pie!"
 		food_reagents = list(
 			/datum/reagent/consumable/nutriment = 11,
-			/datum/reagent/medicine/omnizine = 5,
+			/datum/reagent/medicine/panacea = 5,
 			/datum/reagent/consumable/nutriment/vitamin = 4,
 		)
 	. = ..()
diff --git a/code/game/objects/items/food/pizza.dm b/code/game/objects/items/food/pizza.dm
index 58d846c331..3d163bf7a2 100644
--- a/code/game/objects/items/food/pizza.dm
+++ b/code/game/objects/items/food/pizza.dm
@@ -136,7 +136,7 @@
 		/datum/reagent/consumable/nutriment = 20,
 		/datum/reagent/consumable/nutriment/protein = 15,
 		/datum/reagent/consumable/tomatojuice = 6,
-		/datum/reagent/medicine/omnizine = 10,
+		/datum/reagent/medicine/panacea/effluvial = 10,
 		/datum/reagent/consumable/nutriment/vitamin = 5,
 	)
 	tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "meat" = 1, "laziness" = 1)
diff --git a/code/game/objects/items/food/salad.dm b/code/game/objects/items/food/salad.dm
index 2af6ed6ec4..3bdded37c1 100644
--- a/code/game/objects/items/food/salad.dm
+++ b/code/game/objects/items/food/salad.dm
@@ -19,7 +19,7 @@
 	icon_state = "aesirsalad"
 	food_reagents = list(
 		/datum/reagent/consumable/nutriment = 8,
-		/datum/reagent/medicine/omnizine = 10,
+		/datum/reagent/medicine/panacea = 10,
 		/datum/reagent/consumable/nutriment/vitamin = 12
 	)
 	tastes = list("leaves" = 1)
diff --git a/code/game/objects/items/food/soup.dm b/code/game/objects/items/food/soup.dm
index d93e6ff6e4..fe04a95a3e 100644
--- a/code/game/objects/items/food/soup.dm
+++ b/code/game/objects/items/food/soup.dm
@@ -103,7 +103,7 @@
 		/datum/reagent/consumable/nutriment/protein = 2,
 		/datum/reagent/water = 5,
 		/datum/reagent/consumable/nutriment/vitamin = 9,
-		/datum/reagent/medicine/omnizine = 5
+		/datum/reagent/medicine/neoxanthin = 5
 	)
 	tastes = list("nettles" = 1)
 	foodtypes = VEGETABLES
@@ -128,7 +128,7 @@
 		/datum/reagent/consumable/capsaicin,
 		/datum/reagent/consumable/frostoil,
 		/datum/reagent/medicine/oculine,
-		/datum/reagent/medicine/omnizine,
+		/datum/reagent/medicine/panacea,
 		/datum/reagent/toxin,
 		/datum/reagent/toxin/slimejelly,
 		)
diff --git a/code/game/objects/items/food/sweets.dm b/code/game/objects/items/food/sweets.dm
index f3ec680a41..9ab28804f6 100644
--- a/code/game/objects/items/food/sweets.dm
+++ b/code/game/objects/items/food/sweets.dm
@@ -124,7 +124,7 @@
 		/datum/reagent/toxin = 1,
 		/datum/reagent/iron = 10,
 		/datum/reagent/consumable/sugar = 5,
-		/datum/reagent/medicine/omnizine = 2,
+		/datum/reagent/medicine/panacea = 2,
 	) //lollipop, but vitamins = toxins
 	tastes = list("cobwebs" = 1, "sugar" = 2)
 	foodtypes = JUNKFOOD | SUGAR //| BUGS
diff --git a/code/game/objects/items/grenades/syndieminibomb.dm b/code/game/objects/items/grenades/syndieminibomb.dm
index d820ada940..6e53d48d2f 100644
--- a/code/game/objects/items/grenades/syndieminibomb.dm
+++ b/code/game/objects/items/grenades/syndieminibomb.dm
@@ -18,6 +18,7 @@
 	name = "HE Grenade"
 	desc = "A compact shrapnel grenade meant to devastate nearby organisms and cause some damage in the process. Pull pin and throw opposite direction."
 	icon_state = "concussion"
+	ex_dev = 0
 	ex_heavy = 2
 	ex_light = 3
 	ex_flame = 3
@@ -28,9 +29,9 @@
 	icon_state = "frag"
 	shrapnel_type = /obj/projectile/bullet/shrapnel
 	shrapnel_radius = 4
-	ex_heavy = 1
+	ex_heavy = 0
 	ex_light = 3
-	ex_flame = 4
+	ex_flame = 1
 
 /obj/item/grenade/frag/mega
 	name = "FRAG grenade"
diff --git a/code/game/objects/items/hot_potato.dm b/code/game/objects/items/hot_potato.dm
deleted file mode 100644
index f1957f7132..0000000000
--- a/code/game/objects/items/hot_potato.dm
+++ /dev/null
@@ -1,175 +0,0 @@
-//CREATOR'S NOTE: DO NOT FUCKING GIVE THIS TO BOTANY!
-/obj/item/hot_potato
-	name = "hot potato"
-	desc = "A label on the side of this potato reads \"Product of DonkCo Service Wing. Activate far away from populated areas. Device will only attach to sapient creatures.\" <span class='boldnotice'>You can attack anyone with it to force it on them instead of yourself!</span>"
-	icon = 'icons/obj/hydroponics/harvest.dmi'
-	icon_state = "potato"
-	item_flags = NOBLUDGEON
-	force = 0
-	var/icon_off = "potato"
-	var/icon_on = "potato_active"
-	var/detonation_timerid
-	var/activation_time = 0
-	var/timer = 600			//deciseconds
-	var/show_timer = FALSE
-	var/reusable = FALSE		//absolute madman
-	var/sticky = TRUE
-	var/forceful_attachment = TRUE
-	var/stimulant = TRUE
-	var/detonate_explosion = TRUE
-	var/detonate_dev_range = 0
-	var/detonate_heavy_range = 0
-	var/detonate_light_range = 2
-	var/detonate_flash_range = 5
-	var/detonate_fire_range = 5
-
-	var/active = FALSE
-
-	var/color_val = FALSE
-
-	var/datum/weakref/current
-
-/obj/item/hot_potato/Destroy()
-	if(active)
-		deactivate()
-	return ..()
-
-/obj/item/hot_potato/proc/colorize(mob/target)
-	//Clear color from old target
-	if(current)
-		var/mob/M = current.resolve()
-		if(istype(M))
-			M.remove_atom_colour(FIXED_COLOUR_PRIORITY)
-	//Give to new target
-	current = null
-	//Swap colors
-	color_val = !color_val
-	if(istype(target))
-		current = WEAKREF(target)
-		target.add_atom_colour(color_val? "#ffff00" : "#00ffff", FIXED_COLOUR_PRIORITY)
-
-/obj/item/hot_potato/proc/detonate()
-	var/atom/location = loc
-	location.visible_message(span_userdanger("[src] [detonate_explosion? "explodes" : "activates"]!"), span_userdanger("[src] activates! You've ran out of time!"))
-	if(detonate_explosion)
-		explosion(src, detonate_dev_range, detonate_heavy_range, detonate_light_range, detonate_flash_range, flame_range = detonate_fire_range)
-	deactivate()
-	if(!reusable)
-		var/mob/M = loc
-		if(istype(M))
-			M.dropItemToGround(src, TRUE)
-		qdel(src)
-
-/obj/item/hot_potato/attack_self(mob/user)
-	if(activate(timer, user))
-		user.visible_message(span_boldwarning("[user] squeezes [src], which promptly starts to flash red-hot colors!"), span_boldwarning("You squeeze [src], activating its countdown and attachment mechanism!"),
-		span_boldwarning("You hear a mechanical click and a loud beeping!"))
-		return
-	return ..()
-
-/obj/item/hot_potato/process(seconds_per_tick)
-	if(stimulant)
-		if(isliving(loc))
-			var/mob/living/L = loc
-			L.SetStun(0)
-			L.SetKnockdown(0)
-			L.set_sleeping(0)
-			L.SetImmobilized(0)
-			L.SetParalyzed(0)
-			L.SetUnconscious(0)
-			L.reagents.add_reagent(/datum/reagent/medicine/muscle_stimulant, clamp(5 - L.reagents.get_reagent_amount(/datum/reagent/medicine/muscle_stimulant), 0, 5))	//If you don't have legs or get bola'd, tough luck!
-			colorize(L)
-
-/obj/item/hot_potato/examine(mob/user)
-	. = ..()
-	if(active)
-		. += span_warning("[src] is flashing red-hot! You should probably get rid of it!")
-		if(show_timer)
-			. += span_warning("[src]'s timer looks to be at [DisplayTimeText(activation_time - world.time)]!")
-
-/obj/item/hot_potato/equipped(mob/user)
-	. = ..()
-	if(active)
-		to_chat(user, span_userdanger("You have a really bad feeling about [src]!"))
-
-/obj/item/hot_potato/afterattack(atom/target, mob/user, adjacent, params)
-	. = ..()
-	if(!adjacent || !ismob(target))
-		return
-	force_onto(target, user)
-
-/obj/item/hot_potato/proc/force_onto(mob/living/victim, mob/user)
-	if(!istype(victim) || user != loc || victim == user)
-		return FALSE
-	if(!victim.client)
-		to_chat(user, span_boldwarning("[src] refuses to attach to a non-sapient creature!"))
-	if(victim.stat != CONSCIOUS || !victim.usable_legs)
-		to_chat(user, span_boldwarning("[src] refuses to attach to someone incapable of using it!"))
-	user.temporarilyRemoveItemFromInventory(src, TRUE)
-	. = FALSE
-	if(!victim.put_in_hands(src))
-		if(forceful_attachment)
-			victim.dropItemToGround(victim.get_inactive_held_item())
-			if(!victim.put_in_hands(src))
-				victim.dropItemToGround(victim.get_active_held_item())
-				if(victim.put_in_hands(src))
-					. = TRUE
-			else
-				. = TRUE
-	else
-		. = TRUE
-	if(.)
-		log_combat(user, victim, "forced a hot potato with explosive variables ([detonate_explosion]-[detonate_dev_range]/[detonate_heavy_range]/[detonate_light_range]/[detonate_flash_range]/[detonate_fire_range]) onto")
-		user.visible_message(span_userdanger("[user] forces [src] onto [victim]!"), span_userdanger("You force [src] onto [victim]!"), span_boldwarning("You hear a mechanical click and a beep."))
-		colorize(null)
-	else
-		log_combat(user, victim, "tried to force a hot potato with explosive variables ([detonate_explosion]-[detonate_dev_range]/[detonate_heavy_range]/[detonate_light_range]/[detonate_flash_range]/[detonate_fire_range]) onto")
-		user.visible_message(span_boldwarning("[user] tried to force [src] onto [victim], but it could not attach!"), span_boldwarning("You try to force [src] onto [victim], but it is unable to attach!"), span_boldwarning("You hear a mechanical click and two buzzes."))
-		user.put_in_hands(src)
-
-/obj/item/hot_potato/dropped(mob/user)
-	. = ..()
-	colorize(null)
-
-/obj/item/hot_potato/proc/activate(delay, mob/user)
-	if(active)
-		return
-	update_appearance()
-	if(sticky)
-		ADD_TRAIT(src, TRAIT_NODROP, HOT_POTATO_TRAIT)
-	name = "primed [name]"
-	activation_time = timer + world.time
-	detonation_timerid = addtimer(CALLBACK(src, PROC_REF(detonate)), delay, TIMER_STOPPABLE)
-	START_PROCESSING(SSfastprocess, src)
-	if(user)
-		log_bomber(user, "has primed a", src, "for detonation (Timer:[delay],Explosive:[detonate_explosion],Range:[detonate_dev_range]/[detonate_heavy_range]/[detonate_light_range]/[detonate_fire_range])")
-	else
-		log_bomber(null, null, src, "was primed for detonation (Timer:[delay],Explosive:[detonate_explosion],Range:[detonate_dev_range]/[detonate_heavy_range]/[detonate_light_range]/[detonate_fire_range])")
-	active = TRUE
-
-/obj/item/hot_potato/proc/deactivate()
-	update_appearance()
-	name = initial(name)
-	REMOVE_TRAIT(src, TRAIT_NODROP, HOT_POTATO_TRAIT)
-	deltimer(detonation_timerid)
-	STOP_PROCESSING(SSfastprocess, src)
-	detonation_timerid = null
-	colorize(null)
-	active = FALSE
-
-/obj/item/hot_potato/update_icon_state()
-	icon_state = active ? icon_on : icon_off
-	return ..()
-
-/obj/item/hot_potato/syndicate
-	detonate_light_range = 4
-	detonate_fire_range = 5
-
-/obj/item/hot_potato/harmless
-	detonate_explosion = FALSE
-
-/obj/item/hot_potato/harmless/toy
-	desc = "A label on the side of this potato reads \"Product of DonkCo Toys and Recreation department.\" <span class='boldnotice'>You can attack anyone with it to put it on them instead, if they have a free hand to take it!</span>"
-	sticky = FALSE
-	reusable = TRUE
-	forceful_attachment = FALSE
diff --git a/code/game/objects/items/implants/implant_misc.dm b/code/game/objects/items/implants/implant_misc.dm
index 684289c0f1..4aa1e36992 100644
--- a/code/game/objects/items/implants/implant_misc.dm
+++ b/code/game/objects/items/implants/implant_misc.dm
@@ -37,7 +37,7 @@
 	imp_in.set_resting(FALSE)
 
 	imp_in.reagents.add_reagent(/datum/reagent/medicine/synaptizine, 10)
-	imp_in.reagents.add_reagent(/datum/reagent/medicine/omnizine, 10)
+	imp_in.reagents.add_reagent(/datum/reagent/medicine/panacea, 10)
 	imp_in.reagents.add_reagent(/datum/reagent/medicine/stimulants, 10)
 	if(!uses)
 		qdel(src)
diff --git a/code/game/objects/items/melee/sword.dm b/code/game/objects/items/melee/sword.dm
index f0e7a90025..84325ebd18 100644
--- a/code/game/objects/items/melee/sword.dm
+++ b/code/game/objects/items/melee/sword.dm
@@ -186,8 +186,8 @@
 	name = "\improper boarding cutlass"
 	desc = "When beam and bullet puncture the hull, a trustworthy blade will carry you through the fight"
 	icon_state = "pgf-sabre"
-	block_chance = 30
-	force = 22
+	block_chance = 15
+	force = 28
 
 /obj/item/melee/sword/sabre/suns/telescopic
 	name = "telescopic sabre"
@@ -337,9 +337,8 @@
 		/datum/reagent/drug/mammoth = 5,
 		/datum/reagent/drug/aranesp = 5,
 		/datum/reagent/drug/pumpup = 10,
-		/datum/reagent/medicine/omnizine = 10,
+		/datum/reagent/medicine/panacea = 10,
 		/datum/reagent/medicine/earthsblood = 15,
-		/datum/reagent/medicine/omnizine/protozine = 15
 	)
 
 /obj/item/melee/sword/greyking/afterattack(atom/target, mob/user, proximity_flag, click_parameters)
diff --git a/code/game/objects/items/robot/robot_upgrades.dm b/code/game/objects/items/robot/robot_upgrades.dm
index b01eddb258..f4186d3c1f 100644
--- a/code/game/objects/items/robot/robot_upgrades.dm
+++ b/code/game/objects/items/robot/robot_upgrades.dm
@@ -402,7 +402,7 @@
 	desc = "An upgrade to the Medical module's hypospray, allowing it \
 		to treat a wider range of conditions and problems."
 	additional_reagents = list(/datum/reagent/medicine/mannitol, /datum/reagent/medicine/oculine, /datum/reagent/medicine/inacusiate,
-		/datum/reagent/medicine/mutadone, /datum/reagent/medicine/haloperidol, /datum/reagent/medicine/oxandrolone, /datum/reagent/medicine/sal_acid, /datum/reagent/medicine/rezadone,
+		/datum/reagent/medicine/mutadone, /datum/reagent/medicine/haloperidol, /datum/reagent/medicine/ysiltane, /datum/reagent/medicine/silfrine, /datum/reagent/medicine/rezadone,
 		/datum/reagent/medicine/pen_acid)
 
 /obj/item/borg/upgrade/piercing_hypospray
diff --git a/code/game/objects/items/stacks/medical.dm b/code/game/objects/items/stacks/medical.dm
index 9f6a7c1dfb..4f552bb5b6 100644
--- a/code/game/objects/items/stacks/medical.dm
+++ b/code/game/objects/items/stacks/medical.dm
@@ -138,7 +138,7 @@
 	self_delay = 2 SECONDS
 	other_delay = 1.5 SECONDS
 	heal_brute = 10
-	grind_results = list(/datum/reagent/medicine/c2/libital = 10)
+	grind_results = list(/datum/reagent/medicine/indomide = 10)
 	merge_type = /obj/item/stack/medical/bruise_pack
 
 /obj/item/stack/medical/gauze
diff --git a/code/game/objects/items/storage/ammo_can.dm b/code/game/objects/items/storage/ammo_can.dm
index 8ea9da87fe..f482c525fa 100644
--- a/code/game/objects/items/storage/ammo_can.dm
+++ b/code/game/objects/items/storage/ammo_can.dm
@@ -144,7 +144,7 @@
 	for (var/i in 1 to 4)
 		new /obj/item/storage/box/ammo/c46x30mm(src)
 
-/obj/item/storage/toolbox/ammo/c75/PopulateContents()
+/obj/item/storage/toolbox/ammo/c65/PopulateContents()
 	name = "ammo can (6.5mm CLIP)"
 	icon_state = "ammobox_65"
 	current_skin = "6.5mm CLIP"
@@ -200,6 +200,13 @@
 	for (var/i in 1 to 4)
 		new /obj/item/storage/box/ammo/a12g_slug(src)
 
+/obj/item/storage/toolbox/ammo/frag/PopulateContents()
+	name = "ammo can (frag grenades)"
+	icon_state = "ammobox_expl"
+	current_skin = "EXPLOSIVE"
+	for (var/i in 1 to 7)
+		new /obj/item/grenade/frag(src)
+
 /obj/item/storage/toolbox/ammo/c50bmg/PopulateContents()
 	name = "ammo can (.50BMG)"
 	icon_state = "ammobox_50"
diff --git a/code/game/objects/items/storage/backpack.dm b/code/game/objects/items/storage/backpack.dm
index 7058b2ec8f..e836a6aa71 100644
--- a/code/game/objects/items/storage/backpack.dm
+++ b/code/game/objects/items/storage/backpack.dm
@@ -661,7 +661,7 @@
 	new /obj/item/ammo_box/magazine/m9mm_rattlesnake(src)
 	new /obj/item/ammo_box/magazine/m9mm_rattlesnake(src)
 	new /obj/item/reagent_containers/food/drinks/bottle/vodka/badminka(src)
-	new /obj/item/reagent_containers/hypospray/medipen/stimulants(src)
+	new /obj/item/reagent_containers/hypospray/medipen/combat_drug(src)
 	new /obj/item/grenade/syndieminibomb(src)
 
 /obj/item/storage/backpack/henchmen
diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm
index 9245c8109c..de1bf1e616 100644
--- a/code/game/objects/items/storage/belt.dm
+++ b/code/game/objects/items/storage/belt.dm
@@ -271,10 +271,10 @@
 
 /obj/item/storage/belt/medical/webbing/combat/PopulateContents()
 	. = ..()
-	new /obj/item/reagent_containers/hypospray/medipen/stimpack/traitor(src)
-	new /obj/item/reagent_containers/hypospray/medipen/stimpack/traitor(src)
-	new /obj/item/reagent_containers/medigel/silver_sulf(src)
-	new /obj/item/reagent_containers/medigel/styptic(src)
+	new /obj/item/reagent_containers/hypospray/medipen/stimpack(src)
+	new /obj/item/reagent_containers/hypospray/medipen/stimpack(src)
+	new /obj/item/reagent_containers/medigel/hadrakine(src)
+	new /obj/item/reagent_containers/medigel/quardexane(src)
 	new /obj/item/stack/medical/gauze/twelve(src)
 	new /obj/item/stack/medical/splint(src)
 
@@ -908,9 +908,11 @@
 	sabre_type = /obj/item/melee/sword/sabre/suns/cmo
 
 /obj/item/storage/belt/sabre/pgf
-	name = "cutlass sheath"
-	desc = "A mass produced thermoplastic-leather sheath made to hold a boarding cutlass."
-	base_icon_state = "sheath-pgf"
-	icon_state = "sheath-pgf"
-	item_state = "sheath-pgf"
+	name = "cutlass scabbard"
+	desc = "A mass produced thermoplastic-leather scabbard made to hold a boarding cutlass."
+	icon = 'icons/obj/clothing/faction/gezena/belt.dmi'
+	mob_overlay_icon = 'icons/mob/clothing/faction/gezena/belt.dmi'
+	base_icon_state = "pgf-scabbard"
+	icon_state = "pgf-scabbard"
+	item_state = "pgf-scabbard"
 	sabre_type = /obj/item/melee/sword/sabre/pgf
diff --git a/code/game/objects/items/storage/boxes.dm b/code/game/objects/items/storage/boxes.dm
index be1fd38f9d..bb49eed4ae 100644
--- a/code/game/objects/items/storage/boxes.dm
+++ b/code/game/objects/items/storage/boxes.dm
@@ -158,10 +158,14 @@
 /obj/item/storage/box/survival/clip
 	internal_type = /obj/item/tank/internals/emergency_oxygen/engi //clip actually cares about their personnel
 
-/obj/item/storage/box/survival/clip/balaclava
-	mask_type = /obj/item/clothing/mask/balaclava
+/obj/item/storage/box/survival/clip/minutemen
+	mask_type = /obj/item/clothing/mask/balaclava/combat
 	internal_type = /obj/item/tank/internals/emergency_oxygen/double
 
+/obj/item/storage/box/survival/pgf
+	mask_type = /obj/item/clothing/mask/breath/pgfmask
+	internal_type = /obj/item/tank/internals/emergency_oxygen/engi
+
 /obj/item/storage/box/survival/inteq
 	mask_type = /obj/item/clothing/mask/balaclava/inteq
 	internal_type = /obj/item/tank/internals/emergency_oxygen/engi
@@ -170,6 +174,10 @@
 	mask_type = null // we spawn in gas masks in frontiersmen bags alongside this, so it isn't nessary
 	internal_type = /obj/item/tank/internals/emergency_oxygen //frontiersmen dont
 
+/obj/item/storage/box/survival/vi
+	mask_type = /obj/item/clothing/mask/gas/vigilitas
+	internal_type = /obj/item/tank/internals/emergency_oxygen/engi
+
 /obj/item/storage/box/gloves
 	name = "box of latex gloves"
 	desc = "Contains sterile latex gloves."
@@ -260,9 +268,9 @@
 
 /obj/item/storage/box/hypospray/PopulateContents()
 	new /obj/item/hypospray/mkii(src)
-	new /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/bicaridine(src)
-	new /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/antitoxin(src)
-	new /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/kelotane(src)
+	new /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/indomide(src)
+	new /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/pancrazine(src)
+	new /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/alvitane(src)
 	new /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/dexalin(src)
 
 /obj/item/storage/box/hypospray/mkiii
@@ -270,10 +278,10 @@
 
 /obj/item/storage/box/hypospray/mkiii/PopulateContents()
 	new /obj/item/hypospray/mkii/mkiii(src)
-	new /obj/item/reagent_containers/glass/bottle/vial/large/preloaded/bicaridine(src)
-	new /obj/item/reagent_containers/glass/bottle/vial/large/preloaded/antitoxin(src)
-	new /obj/item/reagent_containers/glass/bottle/vial/large/preloaded/kelotane(src)
-	new /obj/item/reagent_containers/glass/bottle/vial/large/preloaded/dexalin(src)
+	new /obj/item/reagent_containers/glass/bottle/vial/large/preloaded/silfrine(src)
+	new /obj/item/reagent_containers/glass/bottle/vial/large/preloaded/gjalrazine(src)
+	new /obj/item/reagent_containers/glass/bottle/vial/large/preloaded/ysiltane(src)
+	new /obj/item/reagent_containers/glass/bottle/vial/large/preloaded/salbutamol(src)
 
 /obj/item/storage/box/medigels
 	name = "box of medical gels"
@@ -1177,14 +1185,14 @@
 	new /obj/item/circuitboard/machine/circuit_imprinter/department/science(src)
 	new /obj/item/circuitboard/computer/rdconsole(src)
 
-/obj/item/storage/box/silver_sulf
-	name = "box of silver sulfadiazine patches"
+/obj/item/storage/box/alvitane
+	name = "box of alvitane patches"
 	desc = "Contains patches used to treat burns."
 	illustration = "firepatch"
 
-/obj/item/storage/box/silver_sulf/PopulateContents()
+/obj/item/storage/box/alvitane/PopulateContents()
 	for(var/i in 1 to 7)
-		new /obj/item/reagent_containers/pill/patch/silver_sulf(src)
+		new /obj/item/reagent_containers/pill/patch/alvitane(src)
 
 /obj/item/storage/box/fountainpens
 	name = "box of fountain pens"
@@ -1473,3 +1481,12 @@
 		)
 	generate_items_inside(items_inside,src)
 
+/obj/item/storage/box/plasticware
+	name = "plasticware box"
+	desc = "Contains plastic forks, spoons and knives for eating food (and other things)."
+
+/obj/item/storage/box/plasticware/PopulateContents()
+	for(var/i in 1 to 3)
+		new /obj/item/kitchen/fork/plastic(src)
+		new /obj/item/kitchen/spoon/plastic(src)
+		new /obj/item/melee/knife/plastic(src)
diff --git a/code/game/objects/items/storage/fancy.dm b/code/game/objects/items/storage/fancy.dm
index 0559b48445..92cf5e0238 100644
--- a/code/game/objects/items/storage/fancy.dm
+++ b/code/game/objects/items/storage/fancy.dm
@@ -329,13 +329,6 @@
 	if(prob(7))
 		spawn_type = /obj/item/clothing/mask/cigarette/candy/nicotine //uh oh!
 
-/obj/item/storage/fancy/cigarettes/cigpack_xeno
-	name = "\improper Xeno Filtered packet"
-	desc = "Loaded with 100% pure slime. And also nicotine."
-	icon_state = "slime"
-	base_icon_state = "slime"
-	spawn_type = /obj/item/clothing/mask/cigarette/xeno
-
 /obj/item/storage/fancy/cigarettes/cigpack_cannabis
 	name = "\improper Freak Brothers' Special packet"
 	desc = "A label on the packaging reads, \"Endorsed by Phineas, Freddy and Franklin.\""
diff --git a/code/game/objects/items/storage/filled_guncases.dm b/code/game/objects/items/storage/filled_guncases.dm
index c78f1dee1e..c6a832aa08 100644
--- a/code/game/objects/items/storage/filled_guncases.dm
+++ b/code/game/objects/items/storage/filled_guncases.dm
@@ -375,6 +375,11 @@
 /obj/item/storage/guncase/energy/e10
 	gun_type = /obj/item/gun/energy/laser/e10
 
+/* Frontiersmen */
+/obj/item/storage/guncase/pounder
+	gun_type = /obj/item/gun/ballistic/automatic/smg/pounder
+	mag_type = /obj/item/ammo_box/magazine/c22lr_pounder_pan
+
 /* underbarrel guns */
 /obj/item/storage/guncase/underbarrel_shotgun
 	gun_type = /obj/item/attachment/gun/ballistic/shotgun
diff --git a/code/game/objects/items/storage/firstaid.dm b/code/game/objects/items/storage/firstaid.dm
index 2aff38194b..0021ae837f 100644
--- a/code/game/objects/items/storage/firstaid.dm
+++ b/code/game/objects/items/storage/firstaid.dm
@@ -155,8 +155,8 @@
 		/obj/item/stack/medical/ointment = 2,
 		/obj/item/stack/medical/mesh = 1,
 		/obj/item/stack/medical/gauze = 1,
-		/obj/item/reagent_containers/pill/patch/silver_sulf = 1,
-		/obj/item/reagent_containers/hypospray/medipen/oxandrolone = 1,
+		/obj/item/reagent_containers/pill/patch/alvitane = 1,
+		/obj/item/reagent_containers/hypospray/medipen/ysiltane = 1,
 		/obj/item/reagent_containers/hypospray/medipen = 1,
 		/obj/item/reagent_containers/hypospray/medipen/ekit = 1,
 	)
@@ -175,9 +175,9 @@
 		return
 	var/static/items_inside = list(
 		/obj/item/storage/pill_bottle/charcoal/less = 1,
-		/obj/item/reagent_containers/syringe/thializid = 3,
+		/obj/item/reagent_containers/syringe/pancrazine = 3,
 		/obj/item/storage/pill_bottle/potassiodide = 1,
-		/obj/item/reagent_containers/hypospray/medipen/penacid = 1,
+		/obj/item/reagent_containers/hypospray/medipen/gjalrazine = 1,
 	)
 	generate_items_inside(items_inside,src)
 
@@ -211,7 +211,7 @@
 	if(empty)
 		return
 	var/static/items_inside = list(
-		/obj/item/reagent_containers/syringe/perfluorodecalin = 3,
+		/obj/item/reagent_containers/syringe/dexalin = 3,
 		/obj/item/reagent_containers/hypospray/medipen/salbutamol = 1,
 		/obj/item/reagent_containers/hypospray/medipen = 1,
 		/obj/item/storage/pill_bottle/iron = 1,
@@ -231,13 +231,13 @@
 	if(empty)
 		return
 	var/static/items_inside = list(
-		/obj/item/reagent_containers/pill/patch/styptic = 1,
-		/obj/item/storage/pill_bottle/trophazole = 1,
+		/obj/item/reagent_containers/medigel/hadrakine = 1,
+		/obj/item/storage/pill_bottle/indomide = 1,
 		/obj/item/stack/medical/bone_gel = 1,
 		/obj/item/stack/sticky_tape/surgical = 1,
 		/obj/item/stack/medical/gauze = 1,
 		/obj/item/stack/medical/splint = 1,
-		/obj/item/reagent_containers/hypospray/medipen/salacid = 1,
+		/obj/item/reagent_containers/hypospray/medipen/silfrine = 1,
 		/obj/item/reagent_containers/hypospray/medipen/ekit = 1,
 	)
 	generate_items_inside(items_inside,src)
@@ -287,10 +287,10 @@
 	new /obj/item/stack/medical/gauze(src)
 	new /obj/item/defibrillator/compact/combat/loaded(src)
 	new /obj/item/reagent_containers/hypospray/combat(src)
-	new /obj/item/reagent_containers/pill/patch/styptic(src)
-	new /obj/item/reagent_containers/pill/patch/styptic(src)
-	new /obj/item/reagent_containers/pill/patch/silver_sulf(src)
-	new /obj/item/reagent_containers/pill/patch/silver_sulf(src)
+	new /obj/item/reagent_containers/hypospray/medipen/ysiltane(src)
+	new /obj/item/reagent_containers/hypospray/medipen/ysiltane(src)
+	new /obj/item/reagent_containers/hypospray/medipen/silfrine(src)
+	new /obj/item/reagent_containers/hypospray/medipen/silfrine(src)
 	new /obj/item/clothing/glasses/hud/health/night(src)
 
 //medibot assembly
@@ -406,15 +406,6 @@
 	for(var/i in 1 to 5)
 		new /obj/item/reagent_containers/pill/stimulant(src)
 
-/obj/item/storage/pill_bottle/mining
-	name = "bottle of patches"
-	desc = "Contains patches used to treat brute and burn damage."
-
-/obj/item/storage/pill_bottle/mining/PopulateContents()
-	new /obj/item/reagent_containers/pill/patch/silver_sulf(src)
-	for(var/i in 1 to 3)
-		new /obj/item/reagent_containers/pill/patch/styptic(src)
-
 /obj/item/storage/pill_bottle/zoom
 	name = "suspicious pill bottle"
 	desc = "The label is pretty old and almost unreadable, you recognize some chemical compounds."
@@ -489,13 +480,13 @@
 	for(var/i in 1 to 7)
 		new /obj/item/reagent_containers/pill/floorpill(src)
 
-/obj/item/storage/pill_bottle/trophazole
-	name = "bottle of trophazole pills"
+/obj/item/storage/pill_bottle/indomide
+	name = "bottle of indomide pills"
 	desc = "Contains pills used to treat brute damage.The tag in the bottle states 'Eat before ingesting'."
 
-/obj/item/storage/pill_bottle/trophazole/PopulateContents()
+/obj/item/storage/pill_bottle/indomide/PopulateContents()
 	for(var/i in 1 to 4)
-		new /obj/item/reagent_containers/pill/trophazole(src)
+		new /obj/item/reagent_containers/pill/indomide(src)
 
 /obj/item/storage/pill_bottle/licarb
 	name = "bottle of lithium carbonate pills"
@@ -515,7 +506,7 @@
 		new /obj/item/reagent_containers/pill/finobranc(src)
 
 /obj/item/storage/pill_bottle/stardrop
-	name = "bottle of stardrop capsules"
+	name = "bottle of stardrop patches"
 	desc = "Contains vision-enhancing patches."
 	custom_price = 300
 
@@ -524,7 +515,7 @@
 		new /obj/item/reagent_containers/pill/patch/stardrop(src)
 
 /obj/item/storage/pill_bottle/starlight
-	name = "bottle of starlight capsules"
+	name = "bottle of starlight patches"
 	desc = "Contains vision-enhancing patches."
 
 /obj/item/storage/pill_bottle/starlight/PopulateContents()
diff --git a/code/game/objects/items/storage/secure.dm b/code/game/objects/items/storage/secure.dm
index 3e78c532bd..3d6c089524 100644
--- a/code/game/objects/items/storage/secure.dm
+++ b/code/game/objects/items/storage/secure.dm
@@ -228,3 +228,11 @@
 /obj/item/storage/secure/safe/cybersun/biodynamics/PopulateContents()
 	. = ..()
 	new /obj/item/folder/documents/syndicate/cybersun/biodynamics(src)
+
+/obj/item/storage/secure/safe/nt
+	name = "Sensitive Data Safe"
+	desc = "A secure electronic safe to keep pesky, unauthorized personal from accessing."
+
+/obj/item/storage/secure/safe/nt/PopulateContents()
+	. = ..()
+	new /obj/item/folder/documents(src)
diff --git a/code/game/objects/items/storage/uplink_kits.dm b/code/game/objects/items/storage/uplink_kits.dm
index c8739f010d..8b025e07cc 100644
--- a/code/game/objects/items/storage/uplink_kits.dm
+++ b/code/game/objects/items/storage/uplink_kits.dm
@@ -119,7 +119,7 @@
 			new /obj/item/ammo_box/magazine/m10mm_ringneck(src)
 			new /obj/item/clothing/under/chameleon(src)
 			new /obj/item/card/id/syndicate(src)
-			new /obj/item/reagent_containers/hypospray/medipen/stimulants(src)
+			new /obj/item/reagent_containers/hypospray/medipen/combat_drug(src)
 			new /obj/item/reagent_containers/glass/rag(src)
 
 		if("ninja")
@@ -369,7 +369,6 @@
 /obj/item/storage/box/syndie_kit/chemical/PopulateContents()
 	new /obj/item/reagent_containers/glass/bottle/polonium(src)
 	new /obj/item/reagent_containers/glass/bottle/venom(src)
-	new /obj/item/reagent_containers/glass/bottle/fentanyl(src)
 	new /obj/item/reagent_containers/glass/bottle/formaldehyde(src)
 	new /obj/item/reagent_containers/glass/bottle/spewium(src)
 	new /obj/item/reagent_containers/glass/bottle/cyanide(src)
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/clip.dm b/code/game/objects/structures/crates_lockers/closets/secure/clip.dm
new file mode 100644
index 0000000000..71b9ad42d8
--- /dev/null
+++ b/code/game/objects/structures/crates_lockers/closets/secure/clip.dm
@@ -0,0 +1,123 @@
+/obj/structure/closet/secure_closet/clip
+	name = "CLIP storage"
+	desc = "dont use this type stinky"
+
+/obj/structure/closet/secure_closet/clip/minutemen/armor
+	name = "minuteman personal equipment locker"
+	desc = "A locker to safeguard your armor and vests."
+	req_access = list(ACCESS_ARMORY)
+	var/armor_sets = 5
+
+/obj/structure/closet/secure_closet/clip/minutemen/armor/PopulateContents()
+	. = ..()
+	for(var/i in 1 to armor_sets)
+		new /obj/item/clothing/head/helmet/bulletproof/x11/clip(src)
+		new /obj/item/clothing/suit/armor/vest/bulletproof(src)
+		new /obj/item/clothing/mask/gas/clip(src)
+		new /obj/item/storage/belt/military/clip(src)
+	return
+
+/obj/structure/closet/secure_closet/clip/minutemen/captain
+	name = "captain locker"
+	desc = "This locker contains all (most of what) a cunning captain needs for day to day leadership."
+	req_access = list(ACCESS_CAPTAIN)
+	icon_state = "cap"
+
+/obj/structure/closet/secure_closet/clip/minutemen/captain/PopulateContents()
+	new /obj/item/clothing/head/clip/slouch/officer(src)
+	new /obj/item/clothing/under/clip/officer(src)
+	new /obj/item/clothing/under/clip/officer/alt(src)
+	new /obj/item/clothing/suit/armor/clip_capcoat(src)
+	new /obj/item/storage/belt/military/clip(src) // you know, just in case
+	new /obj/item/clothing/shoes/jackboots(src)
+	new /obj/item/clothing/gloves/color/captain(src)
+	new /obj/item/storage/backpack/security/clip(src)
+	new /obj/item/storage/backpack/satchel/sec/clip(src)
+	new /obj/item/binoculars(src)
+	new /obj/item/clipboard(src)
+	new /obj/item/megaphone(src)
+	return
+
+/obj/structure/closet/secure_closet/clip/minutemen/bridge_officer
+	name = "bridge officer locker"
+	desc = "This locker contains all (most of what) a responsible bridge officer needs for keeping the ship efficient."
+	req_access = list(ACCESS_HOP)
+	icon_state = "hop"
+
+/obj/structure/closet/secure_closet/clip/minutemen/bridge_officer/PopulateContents()
+	new /obj/item/clothing/head/clip/slouch(src)
+	new /obj/item/clothing/under/clip/officer(src)
+	new /obj/item/clothing/under/clip/officer/alt(src)
+	new /obj/item/clothing/suit/toggle/lawyer/clip(src)
+	new /obj/item/clothing/shoes/jackboots(src)
+	new /obj/item/storage/belt/military/clip(src) // you know, just in case
+	new /obj/item/binoculars(src)
+	new /obj/item/clipboard(src)
+	return
+
+/obj/structure/closet/secure_closet/clip/minutemen/lead
+	name = "team sergeant locker"
+	desc = "This locker contains all (most of what) a bold team sergeant needs for keeping the frontier safe."
+	req_access = list(ACCESS_ARMORY)
+	icon_state = "blueshield"
+
+/obj/structure/closet/secure_closet/clip/minutemen/lead/PopulateContents()
+	new /obj/item/clothing/under/clip/minutemen(src)
+	new /obj/item/clothing/shoes/jackboots(src)
+	new /obj/item/clothing/head/soft/utility_navy(src)
+	new /obj/item/storage/belt/military/clip(src)
+	new /obj/item/storage/pouch/squad(src)
+	new /obj/item/megaphone(src)
+	new /obj/item/binoculars(src)
+	new /obj/item/clipboard(src)
+
+/obj/structure/closet/secure_closet/clip/minutemen/combat_medic
+	name = "combat medic locker"
+	desc = "This locker contains all (most of what) a clever combat medic needs to keep the Minutemen fighting."
+	req_access = list(ACCESS_MEDICAL)
+	icon_state = "med_secure"
+
+/obj/structure/closet/secure_closet/clip/minutemen/combat_medic/PopulateContents()
+	new /obj/item/clothing/head/clip/corpsman(src)
+	new /obj/item/clothing/accessory/armband/medblue(src)
+	new /obj/item/clothing/under/clip/minutemen(src)
+	new /obj/item/clothing/shoes/combat(src)
+	new /obj/item/storage/belt/medical/webbing/clip(src)
+	new /obj/item/storage/pouch/medical(src)
+
+
+/obj/structure/closet/secure_closet/clip/minutemen/engineer
+	name = "naval engineer locker"
+	desc = "This locker contains all (most of what) a cunning engineer needs for ship maintenance."
+	req_access = list(ACCESS_ENGINE)
+	icon_state = "eng_secure"
+
+/obj/structure/closet/secure_closet/clip/minutemen/engineer/PopulateContents()
+	new /obj/item/clothing/under/clip/minutemen(src)
+	new /obj/item/clothing/shoes/workboots(src)
+	new /obj/item/storage/belt/utility/full/engi(src)
+	new /obj/item/clothing/gloves/color/yellow(src)
+	new /obj/item/clothing/gloves/color/yellow(src)
+	new /obj/item/clothing/suit/hazardvest(src)
+	new /obj/item/storage/backpack/satchel/eng(src)
+	new /obj/item/clothing/head/clip(src)
+	new /obj/item/clothing/head/hardhat/dblue(src)
+	new /obj/item/clothing/glasses/welding(src)
+	new /obj/item/storage/box/emptysandbags(src)
+	new /obj/item/shovel(src)
+	new /obj/item/holosign_creator/engineering(src)
+
+/obj/structure/closet/secure_closet/clip/minutemen/correspondent
+	name = "military correspondent locker"
+	desc = "This locker contains all (most of what) a curious correspondent needs for informing the frontier."
+	req_access = list(ACCESS_LIBRARY)
+
+/obj/structure/closet/secure_closet/clip/minutemen/correspondent/PopulateContents()
+	new /obj/item/clothing/under/clip/formal(src)
+	new /obj/item/clothing/shoes/workboots(src)
+	new /obj/item/clothing/head/helmet/bulletproof/m10/clip_correspondent(src)
+	new /obj/item/clothing/suit/armor/vest/clip_correspondent(src)
+	new /obj/item/bodycamera/broadcast_camera(src)
+	new /obj/item/binoculars(src)
+	new /obj/item/clipboard(src)
+	new /obj/item/storage/photo_album/correspondent(src)
diff --git a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm
index 88e7dae151..49bd344fe7 100644
--- a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm
+++ b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm
@@ -200,3 +200,75 @@
 		new /obj/item/clothing/suit/hooded/wintercoat(src)
 		new /obj/item/clothing/shoes/winterboots(src)
 	return
+
+/obj/structure/closet/wardrobe/clip
+	name = "CLIP spare uniforms locker"
+	desc = "This locker stores spare CLIP uniforms."
+	icon_door = "blue"
+
+/obj/structure/closet/wardrobe/clip/PopulateContents()
+	for(var/i in 1 to 4)
+		new /obj/item/clothing/under/clip(src)
+	for(var/i in 1 to 4)
+		new /obj/item/clothing/shoes/workboots(src)
+	return
+
+/obj/structure/closet/wardrobe/clip/wall
+	icon = 'icons/obj/wallcloset.dmi'
+	icon_state = "generic_wall"
+	icon_door = null
+	wall_mounted = TRUE
+	anchored = TRUE
+	density = TRUE
+	can_be_unanchored = FALSE
+
+/obj/structure/closet/wardrobe/clip/formal
+	name = "formal CLIP spare uniforms locker"
+	desc = "This locker stores spare formal CLIP uniforms."
+	icon_door = "white"
+
+/obj/structure/closet/wardrobe/clip/formal/PopulateContents()
+	for(var/i in 1 to 3)
+		new /obj/item/clothing/under/clip/formal/with_shirt(src)
+	for(var/i in 1 to 3)
+		new /obj/item/clothing/under/clip/formal/with_shirt/alt(src)
+	for(var/i in 1 to 6)
+		new /obj/item/clothing/shoes/laceup(src)
+	return
+
+/obj/structure/closet/wardrobe/clip/formal/wall
+	icon = 'icons/obj/wallcloset.dmi'
+	icon_state = "generic_wall"
+	icon_door = null
+	wall_mounted = TRUE
+	anchored = TRUE
+	density = TRUE
+	can_be_unanchored = FALSE
+
+/obj/structure/closet/wardrobe/clip/minutemen
+	name = "C-MM spare uniforms locker"
+	desc = "This locker stores spare C-MM uniforms. Make sure any boots taken out are polished."
+
+/obj/structure/closet/wardrobe/clip/minutemen/PopulateContents()
+	for(var/i in 1 to 4)
+		new /obj/item/clothing/under/clip/minutemen(src)
+	for(var/i in 1 to 4)
+		new /obj/item/clothing/head/clip(src)
+	for(var/i in 1 to 4)
+		new /obj/item/clothing/head/soft/utility_navy(src)
+	for(var/i in 1 to 4)
+		new /obj/item/clothing/shoes/combat(src)
+	for(var/i in 1 to 4)
+		new /obj/item/storage/backpack/security/clip(src)
+	for(var/i in 1 to 4)
+		new /obj/item/storage/backpack/satchel/sec/clip(src)
+	return
+
+/obj/structure/closet/wardrobe/clip/minutemen/wall
+	icon = 'icons/obj/wallcloset.dmi'
+	icon_state = "generic_wall"
+	icon_door = null
+	wall_mounted = TRUE
+	anchored = TRUE
+	density = TRUE
+	can_be_unanchored = FALSE
diff --git a/code/game/objects/structures/divine.dm b/code/game/objects/structures/divine.dm
index 3f2920c570..98beb900d3 100644
--- a/code/game/objects/structures/divine.dm
+++ b/code/game/objects/structures/divine.dm
@@ -39,7 +39,7 @@
 		return
 	last_process = world.time
 	to_chat(user, span_notice("The water feels warm and soothing as you touch it. The fountain immediately dries up shortly afterwards."))
-	user.reagents.add_reagent(/datum/reagent/medicine/omnizine/godblood,20)
+	user.reagents.add_reagent(/datum/reagent/medicine/panacea,20)
 	update_appearance()
 	addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, update_appearance)), time_between_uses)
 
diff --git a/code/game/objects/structures/flora.dm b/code/game/objects/structures/flora.dm
index 97cecda745..3cab14f796 100644
--- a/code/game/objects/structures/flora.dm
+++ b/code/game/objects/structures/flora.dm
@@ -33,6 +33,7 @@
 	pixel_x = -16
 	layer = FLY_LAYER
 	var/log_amount = 10
+	max_integrity = 200
 
 	fuel_power = 1 // trees are more resistant to fire and take much longer to burn
 	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 0)
@@ -808,7 +809,6 @@
 	icon_state = "churchtree"
 	desc = "A true earthen oak tree imported directly from the holy soil of earth. It's radiates a spiritual warmth that calms the soul."
 	pixel_x = -16
-	max_integrity = 200
 	bound_height = 64
 	var/karma = 0
 	var/mojorange = 4
@@ -835,7 +835,6 @@
 		/datum/reagent/toxin/acid/fluacid = -0.4,
 		/datum/reagent/toxin/plantbgone = -0.5,
 		/datum/reagent/napalm = -0.6,
-		/datum/reagent/hellwater = -1,
 		/datum/reagent/liquidgibs = -0.2,
 		/datum/reagent/consumable/ethanol/demonsblood = -0.8,
 		/datum/reagent/medicine/soulus = -0.2
@@ -959,7 +958,7 @@
 		var/luck = rand(1, 100)
 		if(karma > 100)
 			if(luck > 90)
-				L.reagents.add_reagent(/datum/reagent/medicine/omnizine, 5)
+				L.reagents.add_reagent(/datum/reagent/medicine/panacea, 5)
 			else if (luck > 50)
 				SEND_SIGNAL(L, COMSIG_ADD_MOOD_EVENT, "treekarma", /datum/mood_event/better_tree, name)
 			else if (luck > 25)
@@ -1003,7 +1002,6 @@
 	icon_state = "churchtree"
 	desc = "A sturdy oak tree imported directly from Illestren the homeworld of the Saint-Roumain Militia. It contains a bacteria native to the planet. The soil was carfuly transfered from the same place it was planted. A apple tree branch has been grafted onto it. You could try watering it"
 	pixel_x = -16
-	max_integrity = 200
 	bound_height = 64
 	var/health = 0
 	var/lastcycle = 0
@@ -1032,7 +1030,6 @@
 		/datum/reagent/toxin/acid/fluacid = -0.4,
 		/datum/reagent/toxin/plantbgone = -0.5,
 		/datum/reagent/napalm = -0.6,
-		/datum/reagent/hellwater = -1,
 		/datum/reagent/liquidgibs = -0.2,
 		/datum/reagent/consumable/ethanol/demonsblood = -0.8,
 		/datum/reagent/medicine/soulus = -0.2
diff --git a/code/game/objects/structures/geyser.dm b/code/game/objects/structures/geyser.dm
index 58b117daeb..27ae00f8f5 100644
--- a/code/game/objects/structures/geyser.dm
+++ b/code/game/objects/structures/geyser.dm
@@ -48,7 +48,7 @@
 		/datum/reagent/uranium/radium = 10,
 		/datum/reagent/ammonia = 6,
 		/datum/reagent/saltpetre = 6,
-		/datum/reagent/medicine/omnizine/protozine = 3,
+		/datum/reagent/medicine/panacea/effluvial = 3,
 		/datum/reagent/wittel = 1
 	)
 
diff --git a/code/game/objects/structures/morgue.dm b/code/game/objects/structures/morgue.dm
index 0ded860cdd..8e4cf6eaf2 100644
--- a/code/game/objects/structures/morgue.dm
+++ b/code/game/objects/structures/morgue.dm
@@ -189,7 +189,7 @@ GLOBAL_LIST_EMPTY(bodycontainers) //Let them act as spawnpoints for revenants an
 
 	for(var/mob/living/M in compiled)
 		var/mob/living/mob_occupant = get_mob_or_brainmob(M)
-		if(mob_occupant.client && !(HAS_TRAIT(mob_occupant, TRAIT_BADDNA)) && !mob_occupant.hellbound)
+		if(mob_occupant.client && !(HAS_TRAIT(mob_occupant, TRAIT_BADDNA)))
 			icon_state = "morgue4" // Revivable
 			if(mob_occupant.stat == DEAD && beeper && COOLDOWN_FINISHED(src, next_beep))
 				playsound(src, 'sound/weapons/gun/general/empty_alarm.ogg', 50, FALSE) //Revive them you blind fucks
diff --git a/code/game/turfs/open/floor/plating/jungle.dm b/code/game/turfs/open/floor/plating/jungle.dm
index 9e64d47b9b..851937d937 100644
--- a/code/game/turfs/open/floor/plating/jungle.dm
+++ b/code/game/turfs/open/floor/plating/jungle.dm
@@ -53,6 +53,35 @@
 	light_range = 2
 	light_power = 1
 
+//for bombed spartport
+
+/turf/open/floor/carpet/red/jungleplanet
+	planetary_atmos = TRUE
+	light_color = COLOR_JUNGLEPLANET_LIGHT
+	initial_gas_mix = JUNGLEPLANET_DEFAULT_ATMOS
+
+/turf/open/floor/plasteel/jungleplanet
+	planetary_atmos = TRUE
+	light_color = COLOR_JUNGLEPLANET_LIGHT
+	initial_gas_mix = JUNGLEPLANET_DEFAULT_ATMOS
+
+/turf/open/floor/plasteel/patterned/brushed/jungleplanet
+	planetary_atmos = TRUE
+	light_color = COLOR_JUNGLEPLANET_LIGHT
+	initial_gas_mix = JUNGLEPLANET_DEFAULT_ATMOS
+
+/turf/open/floor/plasteel/freezer/jungleplanet
+	planetary_atmos = TRUE
+	light_color = COLOR_JUNGLEPLANET_LIGHT
+	initial_gas_mix = JUNGLEPLANET_DEFAULT_ATMOS
+
+/turf/open/floor/plasteel/stairs/jungleplanet
+	planetary_atmos = TRUE
+	light_color = COLOR_JUNGLEPLANET_LIGHT
+	initial_gas_mix = JUNGLEPLANET_DEFAULT_ATMOS
+
+//end of stuff for starport
+
 /turf/open/floor/plasteel/dark/jungleplanet
 	planetary_atmos = TRUE
 	light_color = COLOR_JUNGLEPLANET_LIGHT
diff --git a/code/modules/antagonists/abductor/equipment/abduction_gear.dm b/code/modules/antagonists/abductor/equipment/abduction_gear.dm
index 185133d577..2a8dc9df31 100644
--- a/code/modules/antagonists/abductor/equipment/abduction_gear.dm
+++ b/code/modules/antagonists/abductor/equipment/abduction_gear.dm
@@ -797,10 +797,6 @@ Congratulations! You are now trained for invasive xenobiology research!"}
 			to_chat(user, span_warning("You need one sheet of silver to do	this!"))
 			return
 		to_chat(user, span_notice("You start adding [P] to [src]..."))
-		if(do_after(user, 50, target = src))
-			P.use(1)
-			new /obj/structure/table/optable/abductor(src.loc)
-			qdel(src)
 
 /obj/structure/table/abductor
 	name = "alien table"
@@ -816,47 +812,6 @@ Congratulations! You are now trained for invasive xenobiology research!"}
 	canSmoothWith = list(SMOOTH_GROUP_ABDUCTOR_TABLES)
 	frame = /obj/structure/table_frame/abductor
 
-/obj/structure/table/optable/abductor
-	name = "alien operating table"
-	desc = "Used for alien medical procedures. The surface is covered in tiny spines."
-	frame = /obj/structure/table_frame/abductor
-	buildstack = /obj/item/stack/sheet/mineral/silver
-	framestack = /obj/item/stack/sheet/mineral/abductor
-	buildstackamount = 1
-	framestackamount = 1
-	icon = 'icons/obj/abductor.dmi'
-	icon_state = "bed"
-	can_buckle = 1
-	/// Amount to inject per second
-	var/inject_am = 0.5
-
-	var/static/list/injected_reagents = list(/datum/reagent/medicine/cordiolis_hepatico)
-
-/obj/structure/table/optable/abductor/Initialize()
-	. = ..()
-	var/static/list/loc_connections = list(
-		COMSIG_ATOM_ENTERED = PROC_REF(on_entered),
-	)
-	AddElement(/datum/element/connect_loc, loc_connections)
-
-/obj/structure/table/optable/abductor/proc/on_entered(datum/source, atom/movable/AM)
-	SIGNAL_HANDLER
-	if(iscarbon(AM))
-		START_PROCESSING(SSobj, src)
-		to_chat(AM, span_danger("You feel a series of tiny pricks!"))
-
-/obj/structure/table/optable/abductor/process(seconds_per_tick)
-	. = PROCESS_KILL
-	for(var/mob/living/carbon/C in get_turf(src))
-		. = TRUE
-		for(var/chemical in injected_reagents)
-			if(C.reagents.get_reagent_amount(chemical) < inject_am * seconds_per_tick)
-				C.reagents.add_reagent(chemical, inject_am * seconds_per_tick)
-
-/obj/structure/table/optable/abductor/Destroy()
-	STOP_PROCESSING(SSobj, src)
-	. = ..()
-
 /obj/structure/closet/abductor
 	name = "alien locker"
 	desc = "Contains secrets of the universe."
diff --git a/code/modules/antagonists/borer/borer_chems.dm b/code/modules/antagonists/borer/borer_chems.dm
index dc869b88c6..2b94b9e495 100644
--- a/code/modules/antagonists/borer/borer_chems.dm
+++ b/code/modules/antagonists/borer/borer_chems.dm
@@ -29,9 +29,9 @@
 	chemname = "mannitol"
 	chem_desc = "Heals any brain damage the host may have."
 
-/datum/borer_chem/omnizine
-	chem = /datum/reagent/medicine/omnizine
-	chemname = "omnizine"
+/datum/borer_chem/panacea
+	chem = /datum/reagent/medicine/panacea
+	chemname = "panacea"
 	chem_desc = "Slowly heals all damage types in the host. Overdose will cause damage in all types instead."
 	quantity = 5
 
diff --git a/code/modules/antagonists/ert/minutemen.dm b/code/modules/antagonists/ert/minutemen.dm
index 94c185b0c0..5a63d55974 100644
--- a/code/modules/antagonists/ert/minutemen.dm
+++ b/code/modules/antagonists/ert/minutemen.dm
@@ -34,17 +34,17 @@
 
 /datum/antagonist/ert/minutemen/corpsman
 	name = "C-MM Field Corpsman"
-	outfit = /datum/outfit/job/clip/minutemen/grunt/dressed/med/armed
+	outfit = /datum/outfit/job/clip/minutemen/grunt/medic/dressed/cm5
 	role = "Corpsman"
 
 /datum/antagonist/ert/minutemen/engi
 	name = "C-MM Field Engineer"
-	outfit = /datum/outfit/job/clip/minutemen/grunt/dressed/engi/armed
+	outfit = /datum/outfit/job/clip/minutemen/grunt/engineer/dressed/armed
 	role = "Engineer"
 
 /datum/antagonist/ert/minutemen/gunner
 	name = "C-MM Machinegunner"
-	outfit = /datum/outfit/job/clip/minutemen/grunt/dressed/gunner_armed
+	outfit = /datum/outfit/job/clip/minutemen/grunt/gunner/dressed/armed
 	role = "Field Gunner"
 
 // BARD
@@ -102,7 +102,7 @@
 	to_chat(owner, "You are part of The Galactic Optimum Labor Division, a division of the CLIP Government. Your task: [ert_team.mission.explanation_text]")
 
 /datum/antagonist/ert/minutemen/correspondent
-	name = "C-MM War Correspondent"
+	name = "C-MM Military Correspondent"
 	outfit = /datum/outfit/job/clip/correspondent
 	role = "Correspondant"
 
diff --git a/code/modules/awaymissions/mission_code/Academy.dm b/code/modules/awaymissions/mission_code/Academy.dm
index 66397bc4e3..b19c8a8175 100644
--- a/code/modules/awaymissions/mission_code/Academy.dm
+++ b/code/modules/awaymissions/mission_code/Academy.dm
@@ -83,203 +83,6 @@
 		icon_state = "forge_off"
 		STOP_PROCESSING(SSobj, src)
 
-/obj/item/dice/d20/fate
-	name = "\improper Die of Fate"
-	desc = "A die with twenty sides. You can feel unearthly energies radiating from it. Using this might be VERY risky."
-	icon_state = "d20"
-	sides = 20
-	microwave_riggable = FALSE
-	var/reusable = TRUE
-	var/used = FALSE
-
-/obj/item/dice/d20/fate/one_use
-	reusable = FALSE
-
-/obj/item/dice/d20/fate/cursed
-	name = "cursed Die of Fate"
-	desc = "A die with twenty sides. You feel that rolling this is a REALLY bad idea."
-	color = "#00BB00"
-
-	rigged = DICE_TOTALLY_RIGGED
-	rigged_value = 1
-
-/obj/item/dice/d20/fate/cursed/one_use
-	reusable = FALSE
-
-/obj/item/dice/d20/fate/stealth
-	name = "d20"
-	desc = "A die with twenty sides. The preferred die to throw at the GM."
-
-/obj/item/dice/d20/fate/stealth/one_use
-	reusable = FALSE
-
-/obj/item/dice/d20/fate/stealth/cursed
-	rigged = DICE_TOTALLY_RIGGED
-	rigged_value = 1
-
-/obj/item/dice/d20/fate/stealth/cursed/one_use
-	reusable = FALSE
-
-/obj/item/dice/d20/fate/diceroll(mob/user)
-	. = ..()
-	if(!used)
-		if(!ishuman(user) || !user.mind || (user.mind in SSticker.mode.wizards))
-			to_chat(user, span_warning("You feel the magic of the dice is restricted to ordinary humans!"))
-			return
-
-		if(!reusable)
-			used = TRUE
-
-		var/turf/T = get_turf(src)
-		T.visible_message(span_userdanger("[src] flares briefly."))
-
-		addtimer(CALLBACK(src, PROC_REF(effect), user, .), 1 SECONDS)
-
-/obj/item/dice/d20/fate/equipped(mob/user, slot)
-	. = ..()
-	if(!ishuman(user) || !user.mind || (user.mind in SSticker.mode.wizards))
-		to_chat(user, span_warning("You feel the magic of the dice is restricted to ordinary humans! You should leave it alone."))
-		user.dropItemToGround(src)
-
-
-/obj/item/dice/d20/fate/proc/effect(mob/living/carbon/human/user,roll)
-	var/turf/T = get_turf(src)
-	switch(roll)
-		if(1)
-			//Dust
-			T.visible_message(span_userdanger("[user] turns to dust!"))
-			user.hellbound = TRUE
-			user.dust()
-		if(2)
-			//Death
-			T.visible_message(span_userdanger("[user] suddenly dies!"))
-			user.death()
-		if(3)
-			//Swarm of creatures
-			T.visible_message(span_userdanger("A swarm of creatures surround [user]!"))
-			for(var/direction in GLOB.alldirs)
-				new /mob/living/simple_animal/hostile/netherworld(get_step(get_turf(user),direction))
-		if(4)
-			//Destroy Equipment
-			T.visible_message(span_userdanger("Everything [user] is holding and wearing disappears!"))
-			for(var/obj/item/I in user)
-				if(istype(I, /obj/item/implant))
-					continue
-				qdel(I)
-		if(5)
-			//Monkeying
-			T.visible_message(span_userdanger("[user] transforms into a monkey!"))
-			user.monkeyize()
-		if(6)
-			//Cut speed
-			T.visible_message(span_userdanger("[user] starts moving slower!"))
-			user.add_movespeed_modifier(/datum/movespeed_modifier/die_of_fate)
-		if(7)
-			//Throw
-			T.visible_message(span_userdanger("Unseen forces throw [user]!"))
-			user.Stun(60)
-			user.adjustBruteLoss(50)
-			var/throw_dir = pick(GLOB.cardinals)
-			var/atom/throw_target = get_edge_target_turf(user, throw_dir)
-			user.throw_at(throw_target, 200, 4)
-		if(8)
-			//Fueltank Explosion
-			T.visible_message(span_userdanger("An explosion bursts into existence around [user]!"))
-			explosion(get_turf(user),-1,0,2, flame_range = 2)
-		if(9)
-			//Cold
-			var/datum/disease/D = new /datum/disease/cold()
-			T.visible_message(span_userdanger("[user] looks a little under the weather!"))
-			user.ForceContractDisease(D, FALSE, TRUE)
-		if(10)
-			//Nothing
-			T.visible_message(span_userdanger("Nothing seems to happen."))
-		if(11)
-			//Cookie
-			T.visible_message(span_userdanger("A cookie appears out of thin air!"))
-			var/obj/item/food/cookie/C = new(drop_location())
-			do_smoke(0, drop_location())
-			C.name = "Cookie of Fate"
-		if(12)
-			//Healing
-			T.visible_message(span_userdanger("[user] looks very healthy!"))
-			user.revive(full_heal = TRUE, admin_revive = TRUE)
-		if(13)
-			//Mad Dosh
-			T.visible_message(span_userdanger("Mad dosh shoots out of [src]!"))
-			var/turf/Start = get_turf(src)
-			for(var/direction in GLOB.alldirs)
-				var/turf/dirturf = get_step(Start,direction)
-				if(rand(0,1))
-					new /obj/item/spacecash/bundle/c1000(dirturf)
-				else
-					var/obj/item/storage/bag/money/M = new(dirturf)
-					for(var/i in 1 to rand(5,50))
-						new /obj/item/coin/gold(M)
-		if(14)
-			//Free Gun
-			T.visible_message(span_userdanger("An impressive gun appears!"))
-			do_smoke(0, drop_location())
-			new /obj/item/gun/ballistic/revolver/mateba(drop_location())
-		if(15)
-			//Random One-use spellbook
-			T.visible_message(span_userdanger("A magical looking book drops to the floor!"))
-			do_smoke(0, drop_location())
-			new /obj/item/book/granter/spell/random(drop_location())
-		if(16)
-			//Servant & Servant Summon
-			T.visible_message(span_userdanger("A Dice Servant appears in a cloud of smoke!"))
-			var/mob/living/carbon/human/H = new(drop_location())
-			do_smoke(0, drop_location())
-
-			H.equipOutfit(/datum/outfit/butler)
-			var/datum/mind/servant_mind = new /datum/mind()
-			var/datum/antagonist/magic_servant/A = new
-			servant_mind.add_antag_datum(A)
-			A.setup_master(user)
-			servant_mind.transfer_to(H)
-
-			var/list/mob/dead/observer/candidates = pollCandidatesForMob("Do you want to play as [user.real_name] Servant?", ROLE_WIZARD, null, ROLE_WIZARD, 50, H)
-			if(LAZYLEN(candidates))
-				var/mob/dead/observer/C = pick(candidates)
-				message_admins("[ADMIN_LOOKUPFLW(C)] was spawned as Dice Servant")
-				H.key = C.key
-
-			var/obj/effect/proc_holder/spell/targeted/summonmob/S = new
-			S.target_mob = H
-			user.mind.AddSpell(S)
-
-		if(17)
-			//Tator Kit
-			T.visible_message(span_userdanger("A suspicious box appears!"))
-			new /obj/item/storage/box/syndicate/bundle_A(drop_location())
-			do_smoke(0, drop_location())
-		if(18)
-			//Captain ID
-			T.visible_message(span_userdanger("A golden identification card appears!"))
-			new /obj/item/card/id/captains_spare(drop_location())
-			do_smoke(0, drop_location())
-		if(19)
-			//Instrinct Resistance
-			T.visible_message(span_userdanger("[user] looks very robust!"))
-			user.physiology.brute_mod *= 0.5
-			user.physiology.burn_mod *= 0.5
-
-		if(20)
-			//Free wizard! //NOT ANY MORE FUCKING CHRIST
-			T.visible_message(span_userdanger("Magic arches out of [src] and into ground under [user]!"))
-			new /obj/item/clothing/suit/wizrobe(drop_location())
-			new /obj/item/clothing/head/wizard(drop_location())
-			new /obj/item/clothing/gloves/combat/wizard(drop_location())
-			new /obj/item/staff(drop_location())
-			new /obj/structure/mirror/magic(drop_location())
-
-/datum/outfit/butler
-	name = "Butler"
-	uniform = /obj/item/clothing/under/suit/black_really
-	shoes = /obj/item/clothing/shoes/laceup
-	gloves = /obj/item/clothing/gloves/color/white
-
 /obj/effect/proc_holder/spell/targeted/summonmob
 	name = "Summon Servant"
 	desc = "This spell can be used to call your servant, whenever you need it."
diff --git a/code/modules/cargo/blackmarket/packs/ammo.dm b/code/modules/cargo/blackmarket/packs/ammo.dm
index 668a6d5c2b..98ccb0e5af 100644
--- a/code/modules/cargo/blackmarket/packs/ammo.dm
+++ b/code/modules/cargo/blackmarket/packs/ammo.dm
@@ -176,6 +176,17 @@
 	stock = 2
 	availability_prob = 20
 
+/datum/blackmarket_item/ammo/military_etherbor_cell
+	name = "military-grade Etherbor cell"
+	desc = "A military-grade Etherbor weapon cell. A surefire upgrade to the ones on the civilian market. Lime flavor!"
+	item = /obj/item/stock_parts/cell/gun/pgf
+
+	cost_min = 800
+	cost_max = 1200
+	stock_min = 2
+	stock_max = 4
+	availability_prob = 40
+
 /datum/blackmarket_item/ammo/gauss_cell
 	name = "SolCon Weapon Cell"
 	desc = "A Solarian weapon cell, for powering their gauss weaponry."
diff --git a/code/modules/cargo/blackmarket/packs/clothing.dm b/code/modules/cargo/blackmarket/packs/clothing.dm
index 216026bed4..50964fa444 100644
--- a/code/modules/cargo/blackmarket/packs/clothing.dm
+++ b/code/modules/cargo/blackmarket/packs/clothing.dm
@@ -212,8 +212,8 @@
 	return B
 
 /datum/blackmarket_item/clothing/gezena_armor
-	name = "Raksha-Plating vest"
-	desc = "Genuine armor vests used by the PGF Marine Corp. If a military guy in a cape comes by, play dumb."
+	name = "Gezenan Composite Armor Set"
+	desc = "A genuine set of composite body armor used by the PGF Marine Corps. We even tossed in one of their little mask thingies. If a military guy in a cape comes by, play dumb."
 	item =  /obj/item/storage/backpack/duffelbag/sec
 
 	cost_min = 750
@@ -227,6 +227,8 @@
 	B.desc = "A beat up looking duffel with a frayed embroided nametag."
 	new /obj/item/clothing/suit/armor/gezena/marine(B)
 	new /obj/item/clothing/head/helmet/gezena(B)
+	new /obj/item/clothing/mask/breath/pgfmask(B)
+	new /obj/item/clothing/glasses/sunglasses/pgf(B)
 	return B
 
 /datum/blackmarket_item/clothing/full_spacesuit_set
diff --git a/code/modules/cargo/blackmarket/packs/consumables.dm b/code/modules/cargo/blackmarket/packs/consumables.dm
index 1eeb2faf88..45a0296c56 100644
--- a/code/modules/cargo/blackmarket/packs/consumables.dm
+++ b/code/modules/cargo/blackmarket/packs/consumables.dm
@@ -43,7 +43,7 @@
 
 /datum/blackmarket_item/consumable/syndie_cigs
 	name = "Syndicate Cigarettes"
-	desc = "Who said smoking was bad for you? These omnizine laced cigarettes will have you feeling like a million bucks!"
+	desc = "Who said smoking was bad for you? These Panacea laced cigarettes will have you feeling like a million bucks!"
 	item = /obj/item/storage/fancy/cigarettes/cigpack_syndicate
 
 	cost_min = 50
@@ -77,7 +77,7 @@
 /datum/blackmarket_item/consumable/stimpack
 	name = "Stimpack"
 	desc = "A quick inject medipen loaded with a cocktail of powerful stimulants. Side effects may include nasuea, heartburn, constipation, weight loss, increased blood pressure, kidney stones, liver damage, mood swings, mania, anemia, weight gain, total organ failure, runny nose and minor retinal irritation."
-	item = /obj/item/reagent_containers/hypospray/medipen/stimpack/traitor
+	item = /obj/item/reagent_containers/hypospray/medipen/stimpack/crisis
 
 	stock_min = 4
 	stock_max = 6
@@ -294,6 +294,16 @@
 	availability_prob = 30
 	spawn_weighting = FALSE
 
+/datum/blackmarket_item/consumable/nesah
+	name = "Nesah Injector"
+	desc = "Other day some dude with black hair called us up and started talkin about some grand plan. Grand plan to sell merch, we assume, because he offloaded way too fuckin many of these injectors. Our chems guy said it's just a healing injector, so go fuckin wild. "
+	item = /obj/item/reagent_containers/hypospray/medipen/netzach
+	cost_min = 500
+	cost_max = 1000
+	stock_max = 12
+	availability_prob = 50
+	spawn_weighting = FALSE
+
 /datum/blackmarket_item/consumable/finobranc
 	name = "Finobranc Tablets"
 	desc = "So get this, I know a Solarian Tgirl over the intranet, and we're chatting, and she sends me these things to try. I figure, hell yeah, try them, and got 5 days work done in one day. Now I'm sellin them. Miracle product I tell ya"
diff --git a/code/modules/cargo/blackmarket/packs/weapons.dm b/code/modules/cargo/blackmarket/packs/weapons.dm
index 7e583ebf6f..37a24d226c 100644
--- a/code/modules/cargo/blackmarket/packs/weapons.dm
+++ b/code/modules/cargo/blackmarket/packs/weapons.dm
@@ -77,6 +77,16 @@
 	stock_max = 2
 	availability_prob = 50
 
+/datum/blackmarket_item/weapon/cutlass
+	name = "Gezenan Boarding Cutlass"
+	desc = "A mass produced fighting blade fresh from the belt of some poor sailor. It's got some mean weight to it."
+	item = /obj/item/storage/belt/sabre/pgf
+
+	cost_min = 1000
+	cost_max = 1750
+	stock = 1
+	availability_prob = 25
+
 /datum/blackmarket_item/weapon/sabre
 	name = "SUNS Dueling Sabre"
 	desc = "A mastercrafted sabre formerly wielded by a SUNS academic. It's very sharp, we had to spend hours stitching our fingers back on after getting it."
diff --git a/code/modules/cargo/exports/scraping.dm b/code/modules/cargo/exports/scraping.dm
index 776625dffb..3415c16594 100644
--- a/code/modules/cargo/exports/scraping.dm
+++ b/code/modules/cargo/exports/scraping.dm
@@ -5,6 +5,13 @@
 	elasticity_coeff = 0.1
 	export_types = list(/obj/item/mine/pressure/explosive)
 
+/datum/export/claymore
+	unit_name = "defused claymores"
+	desc = "The Confederated League maintains an active bounty program for the disposal of UXO. Make the frontier a safer place today!"
+	cost = 1250
+	elasticity_coeff = 0.1
+	export_types = list(/obj/item/mine/directional/claymore)
+
 /datum/export/anomaly
 	unit_name = "stabilized anomaly core"
 	cost = 3000
diff --git a/code/modules/cargo/packs/armor.dm b/code/modules/cargo/packs/armor.dm
index ab93a98da2..8fb0cd2235 100644
--- a/code/modules/cargo/packs/armor.dm
+++ b/code/modules/cargo/packs/armor.dm
@@ -91,11 +91,13 @@
 
 //gezena
 /datum/supply_pack/armor/pgf_marine_armor
-	name = "Raksha-plate Crate"
-	desc = "One set of standard issue Raksha-plate armor, highly protective and very mobile. The helmet is adjustable for horns."
+	name = "Gezenan Composite Armor Crate"
+	desc = "One set of standard issue AR-98 body armor, highly protective and quite mobile. Comes with a matching L-98 respirator."
 	cost = 1500
 	contains = list(/obj/item/clothing/suit/armor/gezena/marine,
-					/obj/item/clothing/head/helmet/gezena)
+					/obj/item/clothing/head/helmet/gezena,
+					/obj/item/clothing/glasses/sunglasses/pgf,
+					/obj/item/clothing/mask/breath/pgfmask)
 	crate_name = "armor crate"
 	crate_type = /obj/structure/closet/crate/secure/gear
 	faction = /datum/faction/pgf
diff --git a/code/modules/cargo/packs/magazines.dm b/code/modules/cargo/packs/magazines.dm
index 54b3a42ccf..1fc78c4ee4 100644
--- a/code/modules/cargo/packs/magazines.dm
+++ b/code/modules/cargo/packs/magazines.dm
@@ -42,7 +42,7 @@
 	name = ".44 Roumain Speedloader Crate"
 	desc = "Contains a .44 Roumain speedloader for the HP Montagne, with a capacity of six rounds."
 	contains = list(/obj/item/ammo_box/a44roum_speedloader/empty)
-	cost = 250
+	cost = 100
 	faction = /datum/faction/srm
 
 /datum/supply_pack/magazine/firestorm_mag
@@ -58,7 +58,7 @@
 	name = "Firestorm Pan Magazine Crate"
 	desc = "Contains a 40-round pan magazine for the Hunter's Pride Firestorm SMG."
 	contains = list(/obj/item/ammo_box/magazine/c44_firestorm_mag/pan/empty)
-	cost = 1000
+	cost = 750
 	faction = /datum/faction/srm
 
 /datum/supply_pack/magazine/invictus_mag
@@ -163,14 +163,14 @@
 	name = "SBR-80 DMR Short Magazine Crate"
 	desc = "Contains a 5.56x42mm CLIP made specially for the SBR-80 Designated Marksman Rifle, with a capacity of 20 rounds."
 	contains = list(/obj/item/ammo_box/magazine/m556_42_hydra/small/empty)
-	cost = 400
+	cost = 300
 	faction = /datum/faction/syndicate/scarborough
 
 /datum/supply_pack/magazine/hydra_mag
 	name = "SMR-80 Rifle Magazine Crate"
 	desc = "Contains a 5.56x42mm CLIP for the SMR-80 assault rifle, with a capacity of 30 rounds."
 	contains = list(/obj/item/ammo_box/magazine/m556_42_hydra/empty)
-	cost = 500
+	cost = 400
 	faction = /datum/faction/syndicate/scarborough
 
 /datum/supply_pack/magazine/saw_mag
@@ -186,14 +186,14 @@
 	name = "Boomslang-90 Magazine Crate"
 	desc = "Contains a 6.5mm CLIP magazine for the Boomslang rifle platform, with a capacity of five rounds."
 	contains = list(/obj/item/ammo_box/magazine/boomslang/short/empty)
-	cost = 750
+	cost = 200
 	faction = /datum/faction/syndicate/scarborough
 
 /datum/supply_pack/magazine/boomslang_mag_extended
 	name = "MSR-90 'Boomslang' Magazine Crate"
 	desc = "Contains a 6.5mm CLIP magazine for the Boomslang rifle platform, with a capacity of ten rounds."
 	contains = list(/obj/item/ammo_box/magazine/boomslang/empty)
-	cost = 1500
+	cost = 750
 	faction = /datum/faction/syndicate/scarborough
 
 
@@ -210,7 +210,7 @@
 	name = "CM-70 Magazine Crate"
 	desc = "Contains a 9x18mm magazine for the CM-70 machinepistol."
 	contains = list(/obj/item/ammo_box/magazine/m9mm_cm70/empty)
-	cost = 350
+	cost = 150
 	faction = /datum/faction/clip
 	faction_discount = 20
 
@@ -218,7 +218,7 @@
 	name = "CM-357 Magazine Crate"
 	desc = "Contains a .357 magazine for the CM-357 automag pistol with a capacity of 7 rounds."
 	contains = list(/obj/item/ammo_box/magazine/cm357/empty)
-	cost = 250
+	cost = 150
 	faction = /datum/faction/clip
 
 /datum/supply_pack/magazine/cm5_mag
@@ -233,14 +233,14 @@
 	name = "CM-82 Magazine Crate"
 	desc = "Contains a 5.56mm magazine for the CM-82 rifle, with a capacity of thirty rounds."
 	contains = list(/obj/item/ammo_box/magazine/p16/empty)
-	cost = 500
+	cost = 300
 	faction = /datum/faction/clip
 
 /datum/supply_pack/magazine/skm_ammo
 	name = "SKM Magazine Crate"
 	desc = "Contains a 7.62x40mm magazine for the SKM rifles, with a capacity of twenty rounds."
 	contains = list(/obj/item/ammo_box/magazine/skm_762_40/empty)
-	cost = 500
+	cost = 300
 
 /datum/supply_pack/magazine/skm_ammo_extended
 	name = "SKM Extended Magazine Crate"
@@ -255,14 +255,14 @@
 	name = "F4 Magazine Crate"
 	desc = "Contains a .308 magazine for SsG-04 and CM-F4 platform rifles, with a capacity of ten rounds."
 	contains = list(/obj/item/ammo_box/magazine/f4_308/empty)
-	cost = 500
+	cost = 300
 	faction = /datum/faction/clip
 
 /datum/supply_pack/magazine/f90
 	name = "CM-F90 Magazine Crate"
 	desc = "Contains a 5-round 6.5mm magazine for use with the CM-F90 sniper rifle."
 	contains = list(/obj/item/ammo_box/magazine/f90/empty)
-	cost = 750
+	cost = 200
 	faction = /datum/faction/clip
 
 /datum/supply_pack/magazine/cm15
@@ -324,7 +324,7 @@
 	name = "Mongrel Magazine Crate"
 	desc = "Contains a 10x22mm magazine for the SKM-44v 'Mongrel' SMG, with a capacity of twenty-four rounds."
 	contains = list(/obj/item/ammo_box/magazine/smgm10mm/empty)
-	cost = 300
+	cost = 200
 	faction = /datum/faction/inteq
 
 /datum/supply_pack/magazine/rottweiler_mag
@@ -358,7 +358,7 @@
 	desc = "Contains a weapon cell, compatible with laser guns."
 	contains = list(/obj/item/stock_parts/cell/gun)
 	faction = /datum/faction/nt
-	cost = 500
+	cost = 300
 
 /datum/supply_pack/magazine/solgovcell
 	name = "SolCon Weapon Cell Crate"
diff --git a/code/modules/cargo/packs/medical.dm b/code/modules/cargo/packs/medical.dm
index 937f0036d5..9906e6dd3d 100644
--- a/code/modules/cargo/packs/medical.dm
+++ b/code/modules/cargo/packs/medical.dm
@@ -166,7 +166,6 @@
 					/obj/item/storage/firstaid/fire,
 					/obj/item/defibrillator/loaded,
 					/obj/item/reagent_containers/blood/OMinus,
-					/obj/item/storage/pill_bottle/mining,
 					/obj/item/reagent_containers/pill/neurine,
 					/obj/item/vending_refill/medical)
 	crate_name = "medical surplus crate"
@@ -226,32 +225,32 @@
 		/obj/item/reagent_containers/glass/bottle/vial/small)
 	crate_name = "empty vial crate"
 
-/datum/supply_pack/medical/vials/bica_vial
-	name = "Bicaridine Vial Crate"
-	desc = "Contains a spare bicaridine vial, for usage in a Hypospray."
+/datum/supply_pack/medical/vials/indo_vial
+	name = "Indomide Vial Crate"
+	desc = "Contains a spare indomide vial, for usage in a Hypospray."
 	cost = 400
 	contains = list(
-		/obj/item/reagent_containers/glass/bottle/vial/small/preloaded/bicaridine,
+		/obj/item/reagent_containers/glass/bottle/vial/small/preloaded/indomide,
 	)
-	crate_name = "bicaridine vial crate"
+	crate_name = "indomide vial crate"
 
-/datum/supply_pack/medical/vials/kelo_vial
-	name = "Kelotane Vial Crate"
-	desc = "Contains a spare kelotane vial, for usage in a Hypospray."
+/datum/supply_pack/medical/vials/alvi_vial
+	name = "Alvitane Vial Crate"
+	desc = "Contains a spare alvitane vial, for usage in a Hypospray."
 	cost = 400
 	contains = list(
-		/obj/item/reagent_containers/glass/bottle/vial/small/preloaded/kelotane,
+		/obj/item/reagent_containers/glass/bottle/vial/small/preloaded/alvitane,
 	)
-	crate_name = "kelotane vial crate"
+	crate_name = "alvitane vial crate"
 
 /datum/supply_pack/medical/vials/dylo_vial
-	name = "Dylovene Vial Crate"
+	name = "Pancrazine Vial Crate"
 	desc = "Contains a spare dylovene vial, for usage in a Hypospray."
 	cost = 400
 	contains = list(
-		/obj/item/reagent_containers/glass/bottle/vial/small/preloaded/antitoxin,
+		/obj/item/reagent_containers/glass/bottle/vial/small/preloaded/pancrazine,
 	)
-	crate_name = "dylovene vial crate"
+	crate_name = "pancrazine vial crate"
 
 /datum/supply_pack/medical/vials/dexa_vial
 	name = "Dexalin Vial Crate"
@@ -263,13 +262,13 @@
 	crate_name = "dexalin vial crate"
 
 /datum/supply_pack/medical/vials/tric_vial
-	name = "Tricordrazine Vial Crate"
-	desc = "Contains a spare tricordrazine vial, for usage in a Hypospray."
+	name = "Cureall Vial Crate"
+	desc = "Contains a spare cureall vial, for usage in a Hypospray."
 	cost = 300
 	contains = list(
-		/obj/item/reagent_containers/glass/bottle/vial/small/preloaded/tricord,
+		/obj/item/reagent_containers/glass/bottle/vial/small/preloaded/cureall,
 	)
-	crate_name = "tricordrazine vial crate"
+	crate_name = "cureall vial crate"
 
 /datum/supply_pack/medical/vials/morb_vial
 	name = "Morphine Vial Crate"
diff --git a/code/modules/cargo/packs/sec_supply.dm b/code/modules/cargo/packs/sec_supply.dm
index 984965ec76..35b6695081 100644
--- a/code/modules/cargo/packs/sec_supply.dm
+++ b/code/modules/cargo/packs/sec_supply.dm
@@ -43,7 +43,7 @@
 /datum/supply_pack/sec_supply/flashbangs
 	name = "Flashbang Crate"
 	desc = "Contains one flashbang for use in door breaching and riot control."
-	cost = 100
+	cost = 200
 	contains = list(/obj/item/grenade/flashbang)
 	crate_name = "flashbangs crate"
 
@@ -57,7 +57,7 @@
 /datum/supply_pack/sec_supply/teargas
 	name = "Teargas Grenade Crate"
 	desc = "Contains one teargas grenade for use in crowd dispersion and riot control."
-	cost = 100
+	cost = 200
 	contains = list(/obj/item/grenade/chem_grenade/teargas)
 	crate_name = "teargas grenades crate"
 
@@ -166,7 +166,7 @@
 /datum/supply_pack/sec_supply/frag_grenade
 	name = "Frag Grenade Crate"
 	desc = "Contains one fragmentation grenade. Better not let it go off in your hands."
-	cost = 250
+	cost = 500
 	contains = list(/obj/item/grenade/frag)
 	crate_name = "frag grenade crate"
 	crate_type = /obj/structure/closet/crate/secure/weapon
@@ -215,25 +215,19 @@
 	cost = 2500
 	contains = list(/obj/item/melee/baton/loaded)
 	crate_name = "stun baton crate"
+/*
+		Factional
+*/
+
+//gezena
+
+/datum/supply_pack/tools/pgfwebbing
+	name = "Gezenan Combat Webbing"
+	desc = "Contains a lightweight harness covered in pouches for use in carrying ammunition and tools."
+	cost = 500
+	contains = list(/obj/item/storage/belt/military/gezena)
+	crate_name = "webbing crate"
+	faction = /datum/faction/pgf
+	faction_discount = 0
+	faction_locked = TRUE
 
-/datum/supply_pack/sec_supply/claymore
-	name = "C-10 Claymore Crate"
-	desc = "Contains one motion-activated directional mine, perfect for ambushing enemy infantry. Still debatably legal to sell!"
-	cost = 750
-	contains = list(/obj/item/paper/fluff/claymore,
-					/obj/item/mine/directional/claymore)
-	crate_name = "C-10 Claymore crate"
-
-/obj/item/paper/fluff/claymore
-	name = "PRODUCT USAGE GUIDE"
-	desc = "A dusty memo stamped with the Scarborough Arms logo."
-	default_raw_text = "<b>ASSEMBLY:</b><br><br>\
-	-Deploy mounting legs and emplace device. Front should be placed in direction of enemy egress, no more then three meters from intended target area.<br><br> \
-	-<b>INFORM ALLIES OF PLACEMENT LOCATION.</b><br><br> \
-	-Wait for arming sequence to complete.<br><br> \
-	-Enjoy hands-free area denial, courtesy of Scarborough Arms.<br><br><br> \
-	<b>DISASSEMBLY & STORAGE:</b><br><br>\
-	-Insert screwdriver into arming pin access and turn 180 degrees. There will be considerable resistance. <b>DO NOT Step onto or in front of device.</b><br><br> \
-	-When pressure releases, reach below device and lift via underside in one clean motion. Mounting legs will automatically retract. <br><br> \
-	-The device is now safe to handle. <br><br> \
-	-Safely stow device in secure, moisture-free location, away from fire and blunt force. "
diff --git a/code/modules/cargo/packs/spacesuits.dm b/code/modules/cargo/packs/spacesuits.dm
index 486b119111..a562b08da9 100644
--- a/code/modules/cargo/packs/spacesuits.dm
+++ b/code/modules/cargo/packs/spacesuits.dm
@@ -84,6 +84,17 @@
 	faction_discount = 0
 	faction_locked = TRUE
 
+/datum/supply_pack/spacesuits/spacesuit/inteq/pilot
+	name = "Inteq Pilot Space Suit Crate"
+	desc = "Contains one lightweight suit designed for exosuit and shuttle pilots of the IRMG. While highly mobile, it offers poor protection against prolonged exposure to extreme temperatures of either end."
+	cost = 500
+	contains = list(/obj/item/clothing/suit/space/inteq/pilot,
+					/obj/item/clothing/head/helmet/space/inteq/pilot)
+	crate_name = "space suit crate"
+	faction = /datum/faction/inteq
+	faction_discount = 0
+	faction_locked = TRUE
+
 //solgov
 
 /datum/supply_pack/spacesuits/spacesuit/solgov
@@ -100,8 +111,8 @@
 //fucking gezena
 
 /datum/supply_pack/spacesuits/spacesuit/pgf
-	name = "Rakalla Crate"
-	desc = "Contains one Rakalla Suit. It provides robust-enough protection from the elements while being quite flexible."
+	name = "Rakalla Navy Utility Suit Crate"
+	desc = "Contains one Rakalla Utility Suit. The aging but beloved workhorse of Navy space operations."
 	cost = 600
 	contains = list(/obj/item/clothing/suit/space/gezena,
 					/obj/item/clothing/head/helmet/space/gezena)
@@ -110,6 +121,17 @@
 	faction_discount = 0
 	faction_locked = TRUE
 
+/datum/supply_pack/spacesuits/spacesuit/pgf/marine
+	name = "Lataka Composite Combat Suit Crate"
+	desc = "Contains one Lataka Combat Suit. The backbone of any Marine Corps space assault."
+	cost = 1000
+	contains = list(/obj/item/clothing/suit/space/gezena/marine,
+					/obj/item/clothing/head/helmet/space/gezena/marine)
+	crate_name = "lataka suit crate"
+	faction = /datum/faction/pgf
+	faction_discount = 0
+	faction_locked = TRUE
+
 
 /*
 		Hardsuits
diff --git a/code/modules/cargo/packs/weapon_attachments.dm b/code/modules/cargo/packs/weapon_attachments.dm
index d4e9192a42..212796d255 100644
--- a/code/modules/cargo/packs/weapon_attachments.dm
+++ b/code/modules/cargo/packs/weapon_attachments.dm
@@ -94,13 +94,6 @@
 	contains = list(/obj/item/storage/guncase/energy/underbarrel_e_gun)
 	crate_name = "underbarrel energy gun crate"
 
-/datum/supply_pack/attachment/riot_launcher
-	name = "Underbarrel Riot Grenade Launcher Crate"
-	desc = "Contains a single shot underbarrel riot grenade launcher to be mounted on a firearm."
-	cost = 750
-	contains = list(/obj/item/storage/guncase/underbarrel_riot_grenade)
-	crate_name = "underbarrel riot grenade launcher crate"
-
 /datum/supply_pack/attachment/flare
 	name = "Underbarrel Flare Gun Crate"
 	desc = "Contains a single shot underbarrel flare gun to be mounted on a firearm. One box of flares included."
diff --git a/code/modules/client/loadout/loadout_accessories.dm b/code/modules/client/loadout/loadout_accessories.dm
index 488b1c1965..8dca7a4d79 100644
--- a/code/modules/client/loadout/loadout_accessories.dm
+++ b/code/modules/client/loadout/loadout_accessories.dm
@@ -143,6 +143,10 @@
 	display_name = "face mask"
 	path = /obj/item/clothing/mask/breath/facemask
 
+/datum/gear/accessory/mask/halfmask
+	display_name = "half mask"
+	path = /obj/item/clothing/mask/gas/sechailer
+
 //Misc
 
 /datum/gear/accessory/waistcoat
diff --git a/code/modules/client/loadout/loadout_footwear.dm b/code/modules/client/loadout/loadout_footwear.dm
index d673f4d30b..e365f3ce3f 100644
--- a/code/modules/client/loadout/loadout_footwear.dm
+++ b/code/modules/client/loadout/loadout_footwear.dm
@@ -28,6 +28,11 @@
 /datum/gear/footwear/workboots
 	display_name = "work boots"
 	path = /obj/item/clothing/shoes/workboots
+
+/datum/gear/footwear/heels
+	display_name = "heels, recolorable"
+	path = /obj/item/clothing/shoes/heels
+
 //Sneakers
 
 /datum/gear/footwear/color
diff --git a/code/modules/client/loadout/loadout_uniform.dm b/code/modules/client/loadout/loadout_uniform.dm
index e434bc83b1..168fb5eb55 100644
--- a/code/modules/client/loadout/loadout_uniform.dm
+++ b/code/modules/client/loadout/loadout_uniform.dm
@@ -34,29 +34,9 @@
 
 //Shorts
 
-/datum/gear/uniform/athshortsred
-	display_name = "athletic shorts, red"
-	path = /obj/item/clothing/under/shorts/red
-
-/datum/gear/uniform/athshortsblack
-	display_name = "athletic shorts, black"
-	path = /obj/item/clothing/under/shorts/black
-
-/datum/gear/uniform/athshortsgrey
-	display_name = "athletic shorts, grey"
-	path = /obj/item/clothing/under/shorts/grey
-
-/datum/gear/uniform/athshortsblue
-	display_name = "athletic shorts, blue"
-	path = /obj/item/clothing/under/shorts/blue
-
-/datum/gear/uniform/athshortsgreen
-	display_name = "athletic shorts, green"
-	path = /obj/item/clothing/under/shorts/green
-
-/datum/gear/uniform/athshortspurple
-	display_name = "athletic shorts, purple"
-	path = /obj/item/clothing/under/shorts/purple
+/datum/gear/uniform/athshorts
+	display_name = "athletic shorts, recolorable"
+	path = /obj/item/clothing/under/shorts
 
 /datum/gear/uniform/dolphinshorts
 	display_name = "dolphin shorts"
@@ -82,6 +62,18 @@
 	display_name = "khaki pants"
 	path = /obj/item/clothing/under/pants/khaki
 
+/datum/gear/uniform/pants/pajamared
+	display_name = "red pajama pants"
+	path = /obj/item/clothing/under/pants/pajamared
+
+/datum/gear/uniform/pants/pajamablue
+	display_name = "blue pajama pants"
+	path = /obj/item/clothing/under/pants/pajamablue
+
+/datum/gear/uniform/pants/pajamagreen
+	display_name = "green pajama pants"
+	path = /obj/item/clothing/under/pants/pajamagreen
+
 /datum/gear/uniform/pants/tan
 	display_name = "tan pants"
 	path = /obj/item/clothing/under/pants/tan
diff --git a/code/modules/clothing/ears/_ears.dm b/code/modules/clothing/ears/_ears.dm
index 72d29ce55b..a3c3e7e6e9 100644
--- a/code/modules/clothing/ears/_ears.dm
+++ b/code/modules/clothing/ears/_ears.dm
@@ -20,6 +20,7 @@
 	equip_delay_other = 25
 	resistance_flags = FLAMMABLE
 	custom_price = 250
+	alternate_worn_layer = UNDER_HEAD_LAYER
 
 /obj/item/clothing/ears/earmuffs/ComponentInitialize()
 	. = ..()
diff --git a/code/modules/clothing/factions/clip.dm b/code/modules/clothing/factions/clip.dm
index a1279f78fb..a919422932 100644
--- a/code/modules/clothing/factions/clip.dm
+++ b/code/modules/clothing/factions/clip.dm
@@ -169,6 +169,11 @@
 	item_state = "armor_correspondant"
 	supports_variations = VOX_VARIATION | DIGITIGRADE_VARIATION_SAME_ICON_FILE
 
+/obj/item/clothing/suit/armor/vest/clip_correspondent/Initialize()
+	. = ..()
+	if(allowed)
+		allowed += list(/obj/item/bodycamera/broadcast_camera) // i mean. come on
+
 // biosuits
 
 /obj/item/clothing/suit/bio_suit/bard
@@ -566,10 +571,10 @@
 	supports_variations = VOX_VARIATION
 
 /obj/item/storage/belt/medical/webbing/clip/prefilled/PopulateContents()
-	new /obj/item/reagent_containers/medigel/styptic(src)
-	new /obj/item/reagent_containers/medigel/styptic(src)
-	new /obj/item/reagent_containers/medigel/silver_sulf(src)
-	new /obj/item/reagent_containers/medigel/silver_sulf(src)
+	new /obj/item/reagent_containers/medigel/hadrakine(src)
+	new /obj/item/reagent_containers/medigel/hadrakine(src)
+	new /obj/item/reagent_containers/medigel/quardexane(src)
+	new /obj/item/reagent_containers/medigel/quardexane(src)
 	new /obj/item/reagent_containers/medigel/synthflesh(src)
 	new /obj/item/reagent_containers/medigel/synthflesh(src)
 	new /obj/item/stack/medical/splint(src)
diff --git a/code/modules/clothing/factions/frontiersmen.dm b/code/modules/clothing/factions/frontiersmen.dm
index 23f0c66fe4..5e0fc272b9 100644
--- a/code/modules/clothing/factions/frontiersmen.dm
+++ b/code/modules/clothing/factions/frontiersmen.dm
@@ -314,9 +314,9 @@
 	update_appearance()
 
 /obj/item/storage/belt/medical/webbing/frontiersmen/combat/PopulateContents()
-	new /obj/item/reagent_containers/hypospray/medipen/stimulants(src)
-	new /obj/item/reagent_containers/hypospray/medipen/stimulants(src)
-	new /obj/item/reagent_containers/medigel/silver_sulf(src)
-	new /obj/item/reagent_containers/medigel/styptic(src)
+	new /obj/item/reagent_containers/hypospray/medipen/combat_drug(src)
+	new /obj/item/reagent_containers/hypospray/medipen/combat_drug(src)
+	new /obj/item/reagent_containers/medigel/quardexane(src)
+	new /obj/item/reagent_containers/medigel/hadrakine(src)
 	new /obj/item/stack/medical/gauze/twelve(src)
 	new /obj/item/stack/medical/splint(src)
diff --git a/code/modules/clothing/factions/gezena.dm b/code/modules/clothing/factions/gezena.dm
index 47c484c25a..ac24af2741 100644
--- a/code/modules/clothing/factions/gezena.dm
+++ b/code/modules/clothing/factions/gezena.dm
@@ -1,38 +1,46 @@
 //Jumpsuits
 /obj/item/clothing/under/gezena
-	name = "gezenan navywear"
-	desc = "Made of a slick synthetic material that is both breathable, and resistant to scale and thorn alike."
+	name = "Gezenan navywear"
+	desc = "A practical blue jumpsuit with deep pockets and two identifier plates on the chest."
 	icon = 'icons/obj/clothing/faction/gezena/uniforms.dmi'
 	mob_overlay_icon = 'icons/mob/clothing/faction/gezena/uniforms.dmi'
 	lefthand_file = 'icons/mob/inhands/faction/gezena/gezena_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/faction/gezena/gezena_righthand.dmi'
-	icon_state = "naval"
-	item_state = "bluejump"
-	supports_variations = DIGITIGRADE_VARIATION
+	icon_state = "navywear"
+	item_state = "navyjump"
+	supports_variations = DIGITIGRADE_VARIATION_SAME_ICON_FILE | VOX_VARIATION | KEPORI_VARIATION
+	vox_override_icon = 'icons/mob/clothing/faction/gezena/vox.dmi'
+	kepori_override_icon = 'icons/mob/clothing/faction/gezena/kepori.dmi'
 	armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 40)
 
 /obj/item/clothing/under/gezena/captain
 	name = "\improper Gezenan captain's navywear"
-	desc = "A refined variation of the basic navywear, sporting sleek silver trim."
-	icon_state = "captain"
-	item_state = "bluejump"
+	desc = "A refined variation of the basic navywear with a large frontal flap and sleek silver trim."
+	icon_state = "captainwear"
+	item_state = "navyjump"
+
+/obj/item/clothing/under/gezena/officer
+	name = "\improper Gezenan officer's navywear"
+	desc = "A refined variation of the basic navywear with a large frontal flap and eyecatching green trim."
+	icon_state = "officerwear"
+	item_state = "navyjump"
 
 /obj/item/clothing/under/gezena/marine
 	name = "\improper Gezenan marine fatigue"
-	desc = "Rough inside and out, these fatigues have seen their fair share."
-	icon_state = "marine"
+	desc = "A rugged green uniform with canvas re-enforced elbows and knees along with numerous pockets."
+	icon_state = "marinewear"
 	item_state = "marinejump"
 
 //Unarmored suit
 
 /obj/item/clothing/suit/toggle/gezena
-	name = "silkenweave jacket"
-	desc = "Refined and sturdy, emblazoned below the neck with the Federation's symbol."
+	name = "navy silkenweave jacket"
+	desc = "Comfortable, light, and surprisingly warm with it's removable liner, the silkenweave jacket has found few complaints. This one is in Navy blue."
 	icon = 'icons/obj/clothing/faction/gezena/suits.dmi'
 	mob_overlay_icon = 'icons/mob/clothing/faction/gezena/suits.dmi'
 	lefthand_file = 'icons/mob/inhands/faction/gezena/gezena_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/faction/gezena/gezena_righthand.dmi'
-	icon_state = "lightcoat"
+	icon_state = "navyjacket"
 	item_state = "bluecloth"
 	blood_overlay_type = "coat"
 	togglename = "zipper"
@@ -41,154 +49,233 @@
 	min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT
 	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
 	pocket_storage_component_path = /datum/component/storage/concrete/pockets/exo
-	supports_variations = DIGITIGRADE_VARIATION_NO_NEW_ICON
+	supports_variations = DIGITIGRADE_VARIATION_NO_NEW_ICON | VOX_VARIATION | KEPORI_VARIATION
+	vox_override_icon = 'icons/mob/clothing/faction/gezena/vox.dmi'
+	kepori_override_icon = 'icons/mob/clothing/faction/gezena/kepori.dmi'
+
+/obj/item/clothing/suit/toggle/gezena/marine
+	name = "marine silkenweave jacket"
+	desc = "Comfortable, light, and surprisingly warm with it's removable liner, the silkenweave jacket has found few complaints. This one is in Marine Corps green."
+	icon_state = "marinejacket"
+	item_state = "greencloth"
 
 //Armored suit
 
 /obj/item/clothing/suit/armor/gezena
 	name = "navywear coat"
-	desc = "Formal navywear, emblazoned across the back with the Gezenan sigil."
+	desc = "A heavy belted coat with a pair of sleek epaulettes in a recognizable Gezenan green."
 	icon = 'icons/obj/clothing/faction/gezena/suits.dmi'
 	mob_overlay_icon = 'icons/mob/clothing/faction/gezena/suits.dmi'
 	lefthand_file = 'icons/mob/inhands/faction/gezena/gezena_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/faction/gezena/gezena_righthand.dmi'
-	icon_state = "coat"
+	icon_state = "navycoat"
 	item_state = "bluecloth"
 	blood_overlay_type = "coat"
 	body_parts_covered = CHEST|GROIN
+	cold_protection = CHEST|GROIN|ARMS
+	min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT
 	pocket_storage_component_path = /datum/component/storage/concrete/pockets/exo
-	supports_variations = DIGITIGRADE_VARIATION_NO_NEW_ICON
+	supports_variations = DIGITIGRADE_VARIATION_SAME_ICON_FILE | VOX_VARIATION | KEPORI_VARIATION
+	vox_override_icon = 'icons/mob/clothing/faction/gezena/vox.dmi'
+	kepori_override_icon = 'icons/mob/clothing/faction/gezena/kepori.dmi'
 	armor = list("melee" = 35, "bullet" = 35, "laser" = 20, "energy" = 40, "bomb" = 20, "bio" = 20, "rad" = 0, "fire" = 50, "acid" = 50, "wound" = 10)
 	allowed = null
 
+/obj/item/clothing/suit/armor/gezena/medic
+	name = "medical navywear coat"
+	desc = "A heavy belted coat with a pair of sleek epaulettes in a sterile medical white."
+	icon_state = "medcoat"
+	item_state = "bluecloth"
+
 /obj/item/clothing/suit/armor/gezena/engi
-	name = "engineer navywear coat"
-	desc = "Oil and stain resistant, with orange trim signifiying the wearer doesn't mind getting their hands dirty."
+	name = "engineering navywear coat"
+	desc = "A heavy belted coat with a pair of sleek epaulettes in a rugged engineering orange."
 	icon_state = "engicoat"
 	item_state = "bluecloth"
 
 /obj/item/clothing/suit/armor/gezena/captain
 	name = "captain's navywear coat"
-	desc = "Sleek, blood-resisting silver lines the inside and out of this coat, with a luxurious, soft internal lining."
+	desc = "A heavy belted coat with a pair of sleek epaulettes in a regal command silver."
 	icon_state = "captaincoat"
-	item_state = "captaincoat"
+	item_state = "bluecloth"
 
 /obj/item/clothing/suit/armor/gezena/marine
-	name = "\improper Raksha-plating vest"
-	desc = "Raksha - a Kalixcian word for 'protection of the heart'. Sturdy and reliable."
+	name = "\improper composite marine vest"
+	desc = "Heavy composite plating in a striking bright green, with sturdy shoulder pads for extra protection."
 	icon_state = "marinevest"
 	item_state = "marinevest"
 	armor = list("melee" = 35, "bullet" = 50, "laser" = 50, "energy" = 50, "bomb" = 40, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50, "wound" = 20) //the laser gun country should probably have laser armor
-
-/obj/item/clothing/suit/armor/gezena/marinecoat
-	name = "coated Raksha-plating"
-	desc = "Less practical with the coat than without."
-	icon_state = "marinecoat"
-	item_state = "bluecloth"
-	armor = list("melee" = 35, "bullet" = 50, "laser" = 50, "energy" = 50, "bomb" = 40, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50, "wound" = 20) //same
+	supports_variations = VOX_VARIATION | KEPORI_VARIATION
+	vox_override_icon = 'icons/mob/clothing/faction/gezena/vox.dmi'
+	kepori_override_icon = 'icons/mob/clothing/faction/gezena/kepori.dmi'
 
 //Spacesuits
 
 /obj/item/clothing/suit/space/gezena
-	name = "\improper Rakalla-suit"
-	desc = "Rakalla - a Kalixcian word for 'protection among the stars'. Sturdy, flexible, and reliable."
+	name = "navy utility suit"
+	desc = "With bright hardened plating covering the body and tail, the 'Rakalla' utility suit stands firmly between you and the void of space."
 	icon = 'icons/obj/clothing/faction/gezena/suits.dmi'
 	mob_overlay_icon = 'icons/mob/clothing/faction/gezena/suits.dmi'
 	lefthand_file = 'icons/mob/inhands/faction/gezena/gezena_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/faction/gezena/gezena_righthand.dmi'
-	icon_state = "spacesuit"
-	item_state = "spacesuit"
+	icon_state = "navyspacesuit"
+	item_state = "navyspace"
 	armor = list("melee" = 15, "bullet" = 10, "laser" = 10, "energy" = 10, "bomb" = 15, "bio" = 100, "rad" = 50, "fire" = 75, "acid" = 75, "wound" = 10)
 	w_class = WEIGHT_CLASS_NORMAL
-	supports_variations = DIGITIGRADE_VARIATION
+	supports_variations = DIGITIGRADE_VARIATION_SAME_ICON_FILE | VOX_VARIATION | KEPORI_VARIATION
+	vox_override_icon = 'icons/mob/clothing/faction/gezena/vox.dmi'
+	kepori_override_icon = 'icons/mob/clothing/faction/gezena/kepori.dmi'
 
 /obj/item/clothing/suit/space/gezena/Initialize()
 	. = ..()
 	allowed = GLOB.security_hardsuit_allowed
 
+/obj/item/clothing/suit/space/gezena/marine
+	name = "composite combat suit"
+	desc = "With striking bright green composite plating, the 'Lataka' combat suit threatens any danger with the promise of protection."
+	icon_state = "marinespacesuit"
+	item_state = "marinespace"
+	armor = list("melee" = 40, "bullet" = 35, "laser" = 35, "energy" = 40, "bomb" = 20, "bio" = 100, "rad" = 50, "fire" = 75, "acid" = 75, "wound" = 20)
+	supports_variations = DIGITIGRADE_VARIATION_SAME_ICON_FILE | VOX_VARIATION | KEPORI_VARIATION
+	vox_override_icon = 'icons/mob/clothing/faction/gezena/vox.dmi'
+	kepori_override_icon = 'icons/mob/clothing/faction/gezena/kepori.dmi'
+
 /obj/item/clothing/head/helmet/space/gezena
-	name = "\improper Rakalla-helm"
-	desc = "Featuring rubberized grommets fitting for any length of horn, and an internal monitor for life support."
+	name = "navy utility helmet"
+	desc = "Features rubberized grommets for safely accomodating any length of horn, all the while boasting second to none panoramic visibilty though it's domed visor."
 	icon = 'icons/obj/clothing/faction/gezena/head.dmi'
 	mob_overlay_icon = 'icons/mob/clothing/faction/gezena/head.dmi'
 	lefthand_file = 'icons/mob/inhands/faction/gezena/gezena_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/faction/gezena/gezena_righthand.dmi'
-	icon_state = "spacehelmet"
-	item_state = "spacehelm"
+	icon_state = "navyspacehelmet"
+	item_state = "navyspacehelm"
 	armor = list("melee" = 15, "bullet" = 10, "laser" = 10, "energy" = 10, "bomb" = 15, "bio" = 100, "rad" = 50, "fire" = 75, "acid" = 75, "wound" = 10)
 	w_class = WEIGHT_CLASS_NORMAL
+	supports_variations = SNOUTED_VARIATION | SNOUTED_SMALL_VARIATION | VOX_VARIATION | KEPORI_VARIATION
+	vox_override_icon = 'icons/mob/clothing/faction/gezena/vox.dmi'
+	kepori_override_icon = 'icons/mob/clothing/faction/gezena/kepori.dmi'
+
+/obj/item/clothing/head/helmet/space/gezena/marine
+	name = "composite combat helmet"
+	desc = "Features rubberized grommets for safely accomodating any length of horn and thicker plating on the forehead, sacrificing visibility for much needed protection."
+	icon_state = "marinespacehelmet"
+	item_state = "marinespacehelm"
+	armor = list("melee" = 35, "bullet" = 35, "laser" = 35, "energy" = 40, "bomb" = 20, "bio" = 100, "rad" = 50, "fire" = 75, "acid" = 75, "wound" = 20)
+	supports_variations = SNOUTED_VARIATION | SNOUTED_SMALL_VARIATION | VOX_VARIATION | KEPORI_VARIATION
+	vox_override_icon = 'icons/mob/clothing/faction/gezena/vox.dmi'
+	kepori_override_icon = 'icons/mob/clothing/faction/gezena/kepori.dmi'
 
 //Hats
 
 /obj/item/clothing/head/gezena
-	name = "\improper PGFN Cap"
+	name = "\improper navy cap"
 	desc = "The standard cap of the PGF military, in Navy colors."
 	icon = 'icons/obj/clothing/faction/gezena/head.dmi'
 	mob_overlay_icon = 'icons/mob/clothing/faction/gezena/head.dmi'
 	lefthand_file = 'icons/mob/inhands/faction/gezena/gezena_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/faction/gezena/gezena_righthand.dmi'
-	icon_state = "navalhat"
+	icon_state = "navyhat"
 	item_state = "bluecloth"
 	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
+	supports_variations = VOX_VARIATION | KEPORI_VARIATION
+	vox_override_icon = 'icons/mob/clothing/faction/gezena/vox.dmi'
+	kepori_override_icon = 'icons/mob/clothing/faction/gezena/kepori.dmi'
 
 /obj/item/clothing/head/gezena/flap
-	name = "\improper PGFN Betzu-il cap"
-	desc = "The standard cap of the PGF military, in Navy colors. “betzu-il”, translating to “sun-blocker”, refers to the flap at the back for protection against natural hazards such as sunburns, sandstorms, and biting insects."
-	icon_state = "navalflap"
+	name = "navy flap cap"
+	desc = "The standard cap of the PGF military, in Navy colors. Features a neck-covering flap for harsher environments."
+	icon_state = "navyflap"
 	item_state = "bluecloth"
+	supports_variations = VOX_VARIATION | KEPORI_VARIATION
+	vox_override_icon = 'icons/mob/clothing/faction/gezena/vox.dmi'
+	kepori_override_icon = 'icons/mob/clothing/faction/gezena/kepori.dmi'
 	cold_protection = HEAD
 	min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT
 	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
 
 /obj/item/clothing/head/gezena/marine
-	name = "\improper PGFMC Cap"
+	name = "marine cap"
 	desc = "The standard cap of the PGF military, in Marine Corps colors."
+	supports_variations = VOX_VARIATION | KEPORI_VARIATION
+	vox_override_icon = 'icons/mob/clothing/faction/gezena/vox.dmi'
+	kepori_override_icon = 'icons/mob/clothing/faction/gezena/kepori.dmi'
 	icon_state = "marinehat"
-	item_state = "marinecloth"
+	item_state = "greencloth"
 
 /obj/item/clothing/head/gezena/flap/marine
-	name = "\improper PGFMC Betzu-il cap"
-	desc = "The standard cap of the PGF military, in Marine Corps colors. “betzu-il”, translating to “sun-blocker”, refers to the flap at the back for protection against natural hazards such as sunburns, sandstorms, and biting insects."
+	name = "marine flap cap"
+	desc = "The standard cap of the PGF military, in Marine colors. Features a neck-covering flap for harsher environments."
+	supports_variations = VOX_VARIATION | KEPORI_VARIATION
+	vox_override_icon = 'icons/mob/clothing/faction/gezena/vox.dmi'
+	kepori_override_icon = 'icons/mob/clothing/faction/gezena/kepori.dmi'
 	icon_state = "marineflap"
-	item_state = "marinecloth"
+	item_state = "greencloth"
 
-/obj/item/clothing/head/gezena/marine/lead
-	name = "\improper PGFMC Commander Cap"
-	desc = "The standard cap of the PGF military, in Marine Corps colors. The silver markings denote it as a commander's cap."
-	icon_state = "squadhat"
-	item_state = "marinecloth"
+/obj/item/clothing/head/gezena/engi
+	name = "navy engineer cap"
+	desc = "The standard cap of the PGF military. The coloring indicates the wearer as an engineering specialist."
+	supports_variations = VOX_VARIATION | KEPORI_VARIATION
+	vox_override_icon = 'icons/mob/clothing/faction/gezena/vox.dmi'
+	kepori_override_icon = 'icons/mob/clothing/faction/gezena/kepori.dmi'
+	icon_state = "engihat"
+	item_state = "bluecloth"
 
-/obj/item/clothing/head/gezena/flap/marine/lead
-	name = "\improper PGFMC Commander's' Betzu-il cap"
-	desc = "The standard cap of the PGF military, in Marine Corps colors. “betzu-il”, translating to “sun-blocker”, refers to the flap at the back for protection against natural hazards such as sunburns, sandstorms, and biting insects. The silver markings denote it as a commander's cap."
-	icon_state = "squadflap"
-	item_state = "marinecloth"
+/obj/item/clothing/head/gezena/flap/engi
+	name = "\improper navy engineering flap cap"
+	desc = "The standard cap of the PGF military. Features a neck-covering flap for harsher environments. The coloring indicates the wearer as an engineering specialist."
+	supports_variations = VOX_VARIATION | KEPORI_VARIATION
+	vox_override_icon = 'icons/mob/clothing/faction/gezena/vox.dmi'
+	kepori_override_icon = 'icons/mob/clothing/faction/gezena/kepori.dmi'
+	icon_state = "engiflap"
+	item_state = "bluecloth"
 
 /obj/item/clothing/head/gezena/medic
-	name = "\improper PGF medic cap"
-	desc = "The standard cap of the PGF military. The coloring indicates the wearer as a medical officer."
+	name = "navy medical cap"
+	desc = "The standard cap of the PGF military. The coloring indicates the wearer as a medical specialist."
+	supports_variations = VOX_VARIATION | KEPORI_VARIATION
+	vox_override_icon = 'icons/mob/clothing/faction/gezena/vox.dmi'
+	kepori_override_icon = 'icons/mob/clothing/faction/gezena/kepori.dmi'
 	icon_state = "medichat"
 	item_state = "whitecloth"
 
 /obj/item/clothing/head/gezena/flap/medic
-	name = "\improper PGF medic Betzu-il cap"
-	desc = "The standard cap of the PGF military. “betzu-il”, translating to “sun-blocker”, refers to the flap at the back for protection against natural hazards such as sunburns, sandstorms, and biting insects. The coloring indicates the wearer as a medical officer."
+	name = "medic flap cap"
+	desc = "The standard cap of the PGF military. Features a neck-covering flap for harsher environments. The coloring indicates the wearer as a medical specialist."
+	supports_variations = VOX_VARIATION | KEPORI_VARIATION
+	vox_override_icon = 'icons/mob/clothing/faction/gezena/vox.dmi'
+	kepori_override_icon = 'icons/mob/clothing/faction/gezena/kepori.dmi'
 	icon_state = "medicflap"
 	item_state = "whitecloth"
 
-/obj/item/clothing/head/gezena/captain // no captain flap yet(?)
-	name = "\improper PGFN captain's cap"
+/obj/item/clothing/head/gezena/captain
+	name = "navy command cap"
 	desc = "The standard cap of the PGF military, in Navy colors. The decoration indicates the wearer as a ship's Captain."
+	supports_variations = VOX_VARIATION | KEPORI_VARIATION
+	vox_override_icon = 'icons/mob/clothing/faction/gezena/vox.dmi'
+	kepori_override_icon = 'icons/mob/clothing/faction/gezena/kepori.dmi'
 	icon_state = "captainhat"
 	item_state = "bluecloth"
 
+/obj/item/clothing/head/gezena/flap/captain
+	name = "command flap cap"
+	desc = "The standard cap of the PGF military. Features a neck-covering flap for harsher environments. The decoration indicates the wearer as a ship's Captain."
+	supports_variations = VOX_VARIATION | KEPORI_VARIATION
+	vox_override_icon = 'icons/mob/clothing/faction/gezena/vox.dmi'
+	kepori_override_icon = 'icons/mob/clothing/faction/gezena/kepori.dmi'
+	icon_state = "captainflap"
+	item_state = "bluecloth"
+
 /obj/item/clothing/head/helmet/gezena
-	name = "\improper Raksha-helm"
-	desc = "Far more practical for combat than either type of cap, but not nearly as traditional or comfortable. Features small sections of removable plating to make space for the horns of horned races."
+	name = "composite combat helmet"
+	desc = "An armored composite military helmet employed by the PGF. Fitted to connect seamlessly with the L-98 respirator"
 	icon = 'icons/obj/clothing/faction/gezena/head.dmi'
 	mob_overlay_icon = 'icons/mob/clothing/faction/gezena/head.dmi'
 	lefthand_file = 'icons/mob/inhands/faction/gezena/gezena_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/faction/gezena/gezena_righthand.dmi'
+	supports_variations = VOX_VARIATION | KEPORI_VARIATION
+	flags_inv = HIDEHAIR
+	vox_override_icon = 'icons/mob/clothing/faction/gezena/vox.dmi'
+	kepori_override_icon = 'icons/mob/clothing/faction/gezena/kepori.dmi'
 	armor = list("melee" = 35, "bullet" = 50, "laser" = 50, "energy" = 50, "bomb" = 40, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50, "wound" = 20) //the laser gun country should probably have laser armor
 	icon_state = "marinehelmet"
 	item_state = "marinehelm"
@@ -198,131 +285,198 @@
 //Gloves
 
 /obj/item/clothing/gloves/gezena
-	name = "\improper PGFN Ihuz-irra Gloves"
-	desc = "As the name, “ihuz-irra”, or “sure-grip”, suggests, the gloves employed by the PGF military are designed to ensure the highest possible grip is maintained while also providing protection from blisters in work environments."
+	name = "navywear gloves"
+	desc = "A pair of durable black gloves with extra grip and knuckle-pads."
 	icon = 'icons/obj/clothing/faction/gezena/hands.dmi'
 	mob_overlay_icon = 'icons/mob/clothing/faction/gezena/hands.dmi'
 	icon_state = "navalgloves"
 	cold_protection = HANDS
 	min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT
 	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
+	supports_variations = VOX_VARIATION | KEPORI_VARIATION
+	vox_override_icon = 'icons/mob/clothing/faction/gezena/vox.dmi'
+	kepori_override_icon = 'icons/mob/clothing/faction/gezena/kepori.dmi'
+
 
 /obj/item/clothing/gloves/gezena/marine
-	name = "\improper PGFMC Ihuz-irra Gloves"
-	desc = "As the name, “ihuz-irra”, or “sure-grip”, suggests, the gloves employed by the PGF military are designed to ensure the highest possible grip is maintained while also providing protection from blisters in work environments. Carries extra tactile grip on the fingertips for easy use of firearms."
+	name = "marine combat gloves"
+	desc = "A pair of durable black gloves with extra grip and knuckle-pads. The fingers are left particularly nimble for the easier operation of weapons."
 	icon_state = "marinegloves"
 	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 75, "acid" = 50)
 
 /obj/item/clothing/gloves/gezena/engi
-	name = "\improper PGFN Engineering Ihuz-irra Gloves"
-	desc = "As the name, “ihuz-irra”, or “sure-grip”, suggests, the gloves employed by the PGF military are designed to ensure the highest possible grip is maintained while also providing protection from blisters in work environments. Comes with anti-conductive microfibers interwoven to supply the useer with electrical insulation."
+	name = "navywear engineering gloves"
+	desc = "A pair of durable black gloves with extra grip and knuckle-pads. This pair comes with anti-conductive microfibers interwoven to supply the user with electrical insulation."
 	icon_state = "engigloves"
 	siemens_coefficient = 0
 
 /obj/item/clothing/gloves/gezena/captain
-	name = "\improper PGFN Captain's Ihuz-irra Gloves"
-	desc = "As the name, “ihuz-irra”, or “sure-grip”, suggests, the gloves employed by the PGF military are designed to ensure the highest possible grip is maintained while also providing protection from blisters in work environments. Bears the silver standard of a Gezenan captain."
+	name = "navywear captain gloves"
+	desc = "A pair of durable black gloves with extra grip and knuckle-pads. This pair bears the silver standard of a Gezenan captain."
 	icon_state = "captaingloves"
 
 //Boots
 
 /obj/item/clothing/shoes/combat/gezena
-	name = "\improper PGF Uhro-sez Boots"
-	desc = "The word “uhro-sez” translates to “steel-foot”, in reference to the steel toe protection provided by these boots. Standard issue to all members of all branches of the PGF military."
+	name = "navywear high boots"
+	desc = "Steel-toe rubber laceless boots that will fit just about any kind of feet."
 	icon = 'icons/obj/clothing/faction/gezena/feet.dmi'
 	mob_overlay_icon = 'icons/mob/clothing/faction/gezena/feet.dmi'
-	icon_state = "pgfboots"
-	item_state = "jackboots"
+	icon_state = "pgfnboots"
+	supports_variations = DIGITIGRADE_VARIATION | VOX_VARIATION | KEPORI_VARIATION
+	vox_override_icon = 'icons/mob/clothing/faction/gezena/vox.dmi'
+	kepori_override_icon = 'icons/mob/clothing/faction/gezena/kepori.dmi'
+
+
+/obj/item/clothing/shoes/combat/gezena/marine
+	name = "marine high boots"
+	desc = "Composite-toe rubber laceless boots that will fit just about any kind of feet. Sacrificing steel for a composite toe-cap combined with increased ankle flexibility, these boots are far more comfortable on extended excursions."
+	icon = 'icons/obj/clothing/faction/gezena/feet.dmi'
+	mob_overlay_icon = 'icons/mob/clothing/faction/gezena/feet.dmi'
+	icon_state = "pgfmcboots"
+	supports_variations = DIGITIGRADE_VARIATION | VOX_VARIATION | KEPORI_VARIATION
+	vox_override_icon = 'icons/mob/clothing/faction/gezena/vox.dmi'
+	kepori_override_icon = 'icons/mob/clothing/faction/gezena/kepori.dmi'
 
 //Belt
 
 /obj/item/storage/belt/military/gezena
-	name = "\improper PGF Iho-Usks"
-	desc = "The “iho-usks”, translating to “gear-holder”, is a lightweight harness covered in pouches, supplied to the ground troops of the PGF. This variant is designed for carrying ammunition."
+	name = "marine webbing"
+	desc = "A lightweight harness covered in pouches and a slightly larger than average rear pack. Supplied to the combat ground forces of the PGF. This variant is designed for carrying ammunition."
 	icon = 'icons/obj/clothing/faction/gezena/belt.dmi'
 	mob_overlay_icon = 'icons/mob/clothing/faction/gezena/belt.dmi'
 	lefthand_file = 'icons/mob/inhands/faction/gezena/gezena_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/faction/gezena/gezena_righthand.dmi'
-	icon_state = "pouches"
-	item_state = "bluecloth"
+	icon_state = "pgfwebbing"
+	item_state = "greencloth"
+	supports_variations = VOX_VARIATION | KEPORI_VARIATION
+	vox_override_icon = 'icons/mob/clothing/faction/gezena/vox.dmi'
+	kepori_override_icon = 'icons/mob/clothing/faction/gezena/kepori.dmi'
 	unique_reskin = null
 
 /obj/item/storage/belt/military/gezena/bg16/PopulateContents()
 	. = ..()
 	for(var/i in 1 to 4)
 		new /obj/item/stock_parts/cell/gun/pgf(src)
-	new /obj/item/screwdriver(src)
+	new /obj/item/grenade/frag(src)
+	new /obj/item/grenade/smokebomb(src)
 
 /obj/item/storage/belt/military/gezena/engineer/PopulateContents()
 	. = ..()
-	for(var/i in 1 to 2)
+	for(var/i in 1 to 3)
 		new /obj/item/stock_parts/cell/gun/pgf(src)
-	new /obj/item/screwdriver(src)
-	new /obj/item/grenade/c4
-	new /obj/item/grenade/c4
+	new /obj/item/grenade/smokebomb(src)
+	new /obj/item/grenade/c4(src)
+	new /obj/item/grenade/c4(src)
 
 /obj/item/storage/belt/medical/gezena
-	name = "\improper PGF Medical Iho-Usks"
-	desc = "The “iho-usks”, translating to “gear-holder”, is a lightweight harness covered in pouches, supplied to the ground troops of the PGF. This variant is designed for carrying medical supplies."
+	name = "medic webbing"
+	desc = "A lightweight harness covered in pouches and a slightly larger than average rear pack. Supplied to the combat ground forces of the PGF. This variant is designed for carrying medical equipment."
 	icon = 'icons/obj/clothing/faction/gezena/belt.dmi'
 	mob_overlay_icon = 'icons/mob/clothing/faction/gezena/belt.dmi'
 	lefthand_file = 'icons/mob/inhands/faction/gezena/gezena_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/faction/gezena/gezena_righthand.dmi'
-	icon_state = "medpouches"
+	icon_state = "pgfmedwebbing"
 	item_state = "whitecloth"
+	supports_variations = VOX_VARIATION | KEPORI_VARIATION
+	vox_override_icon = 'icons/mob/clothing/faction/gezena/vox.dmi'
+	kepori_override_icon = 'icons/mob/clothing/faction/gezena/kepori.dmi'
 
 /obj/item/storage/belt/medical/gezena/paramedic/PopulateContents()
-	new /obj/item/reagent_containers/medigel/styptic(src)
-	new /obj/item/reagent_containers/medigel/styptic(src)
-	new /obj/item/reagent_containers/medigel/silver_sulf(src)
-	new /obj/item/reagent_containers/medigel/silver_sulf(src)
+	new /obj/item/reagent_containers/medigel/hadrakine(src)
+	new /obj/item/reagent_containers/medigel/hadrakine(src)
+	new /obj/item/reagent_containers/medigel/quardexane(src)
+	new /obj/item/reagent_containers/medigel/quardexane(src)
 	new /obj/item/reagent_containers/medigel/synthflesh(src)
 	new /obj/item/stack/medical/gauze/twelve(src)
 	new /obj/item/stack/medical/splint(src)
 	. = ..()
 
+//Masks
+/obj/item/clothing/mask/breath/pgfmask
+	name = "gezenan composite respirator"
+	desc = "An armored composite L-98 mask designed to protect both face and snout, and allowing easy attachment of external air sources. It's surprisingly comfortable."
+	icon_state = "pgfmask"
+	item_state = "pgfmask"
+	icon = 'icons/obj/clothing/faction/gezena/mask.dmi'
+	mob_overlay_icon = 'icons/mob/clothing/faction/gezena/mask.dmi'
+	clothing_flags = BLOCK_GAS_SMOKE_EFFECT | ALLOWINTERNALS
+	supports_variations = SNOUTED_VARIATION | SNOUTED_SMALL_VARIATION | KEPORI_VARIATION | VOX_VARIATION
+	vox_override_icon = 'icons/mob/clothing/faction/gezena/vox.dmi'
+	kepori_override_icon = 'icons/mob/clothing/faction/gezena/kepori.dmi'
+	gas_transfer_coefficient = 0.01
+	permeability_coefficient = 0.01
+
+//Eyes
+/obj/item/clothing/glasses/sunglasses/pgf
+	name = "gezenan protective goggles"
+	desc = "Bright cyan goggles with a polarized lens that obscures the wearer's eyes."
+	icon = 'icons/obj/clothing/faction/gezena/eyes.dmi'
+	mob_overlay_icon = 'icons/mob/clothing/faction/gezena/eyes.dmi'
+	icon_state = "pgfgoggles"
+	item_state = "pgfgoggles"
+	clothing_flags = SEALS_EYES | FLASH_PROTECTION_FLASH
+	supports_variations = KEPORI_VARIATION | VOX_VARIATION
+	vox_override_icon = 'icons/mob/clothing/faction/gezena/vox.dmi'
+	kepori_override_icon = 'icons/mob/clothing/faction/gezena/kepori.dmi'
+	glass_colour_type = /datum/client_colour/glass_colour/green
 
 //Cloaks
 
 /obj/item/clothing/neck/cloak/gezena
-	name = "\improper Aziulhauz"
-	desc = "The “Aziulhauz”, or “rank-cape”, is the method with which PGF military members display their rank to others. Wearing one while on duty is required by uniform code. This variant displays the wearer's rank as a standard non-officer soldier or crewperson."
+	name = "gezenan rank-cape"
+	desc = "A flowing black drape, engrained deep into Gezenan military tradition. Issued to every member of the Pan-Gezenan Federation's armed forces."
 	icon = 'icons/obj/clothing/faction/gezena/neck.dmi'
 	mob_overlay_icon = 'icons/mob/clothing/faction/gezena/neck.dmi'
 	lefthand_file = 'icons/mob/inhands/faction/gezena/gezena_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/faction/gezena/gezena_righthand.dmi'
 	icon_state = "cape"
 	item_state = "blackcloth"
+	obj_flags = INFINITE_RESKIN
 	supports_variations = VOX_VARIATION | KEPORI_VARIATION
 	vox_override_icon = 'icons/mob/clothing/faction/gezena/vox.dmi'
 	kepori_override_icon = 'icons/mob/clothing/faction/gezena/kepori.dmi'
-
-/obj/item/clothing/neck/cloak/gezena/lead
-	name = "marine officer's Azuilhauz"
-	desc = "The “Aziulhauz”, or “rank-cape”, is the method with which PGF military members display their rank to others. Wearing one while on duty is required by uniform code. This variant displays the wearer's rank as a squad leader."
-	icon_state = "squadcape"
-	item_state = "blackcloth"
+	unique_reskin = list(
+		"shoulder cape" = "cape_folded",
+		"full cape" = "cape",
+	)
 
 /obj/item/clothing/neck/cloak/gezena/engi
-	name = "engineering Aziulhauz"
-	desc = "The “Aziulhauz”, or “rank-cape”, is the method with which PGF military members display their rank to others. Wearing one while on duty is required by uniform code. This variant displays the wearer's rank as an officer with an engineering specialization."
+	name = "engineering rank-cape"
+	desc = "A flowing black drape, engrained deep into Gezenan military tradition. Issued to every member of the Pan-Gezenan Federation's armed forces. This variant displays the wearer's engineering specialization."
 	icon_state = "engicape"
 	item_state = "blackcloth"
+	unique_reskin = list(
+		"shoulder cape" = "engicape_folded",
+		"full cape" = "engicape",
+	)
 
 /obj/item/clothing/neck/cloak/gezena/med
-	name = "medical Aziulhauz"
-	desc = "The “Aziulhauz”, or “rank-cape”, is the method with which PGF military members display their rank to others. Wearing one while on duty is required by uniform code. This variant displays the wearer's rank as an officer with a medical specialization."
+	name = "medic rank-cape"
+	desc = "A flowing black drape, engrained deep into Gezenan military tradition. Issued to every member of the Pan-Gezenan Federation's armed forces. This variant displays the wearer's medical specialization."
 	icon_state = "medcape"
 	item_state = "whitecloth"
+	unique_reskin = list(
+		"shoulder cape" = "medcape_folded",
+		"full cape" = "medcape",
+	)
 
 /obj/item/clothing/neck/cloak/gezena/command
-	name = "navy officer's Azuilhauz"
-	desc = "The “Aziulhauz”, or “rank-cape”, is the method with which PGF military members display their rank to others. Wearing one while on duty is required by uniform code. This variant displays the wearer's rank as an officer."
-	icon_state = "commandcape"
-	item_state = "whitecloth"
+	name = "command rank-cape"
+	desc = "A flowing black drape, engrained deep into Gezenan military tradition. Issued to every member of the Pan-Gezenan Federation's armed forces. This variant displays the wearer's rank as an officer."
+	icon_state = "officercape"
+	item_state = "blackcloth"
+	unique_reskin = list(
+		"shoulder cape" = "officercape_folded",
+		"full cape" = "officercape",
+	)
 
 /obj/item/clothing/neck/cloak/gezena/captain
-	name = "captain's Azuilhauz"
-	desc = "The “Aziulhauz”, or “rank-cape”, is the method with which PGF military members display their rank to others. Wearing one while on duty is required by uniform code. This variant displays the wearer's rank as a high ranking officer."
+	name = "captain's rank-cape"
+	desc = "A flowing black drape, engrained deep into Gezenan military tradition. Issued to every member of the Pan-Gezenan Federation's armed forces. This variant displays the wearer's rank as a high ranking officer."
 	icon_state = "captaincape"
 	item_state = "whitecloth"
+	unique_reskin = list(
+		"shoulder cape" = "captaincape_folded",
+		"full cape" = "captaincape",
+	)
diff --git a/code/modules/clothing/factions/hardliners.dm b/code/modules/clothing/factions/hardliners.dm
index 05d949587b..86a0be75ba 100644
--- a/code/modules/clothing/factions/hardliners.dm
+++ b/code/modules/clothing/factions/hardliners.dm
@@ -228,6 +228,7 @@
 	icon = 'icons/obj/clothing/faction/hardliners/eyes.dmi'
 	mob_overlay_icon = 'icons/mob/clothing/faction/hardliners/eyes.dmi'
 	glass_colour_type = /datum/client_colour/glass_colour/red
+	flags_cover = GLASSESCOVERSEYES | SEALS_EYES
 
 //////////
 //Belts//
diff --git a/code/modules/clothing/factions/inteq.dm b/code/modules/clothing/factions/inteq.dm
index 0b81a59fbd..ba5c046ed3 100644
--- a/code/modules/clothing/factions/inteq.dm
+++ b/code/modules/clothing/factions/inteq.dm
@@ -50,11 +50,11 @@
 	supports_variations = KEPORI_VARIATION | VOX_VARIATION | DIGITIGRADE_VARIATION_NO_NEW_ICON
 
 /obj/item/clothing/under/syndicate/inteq/honorable
-	name = "honorable vanguard turtleneck"
-	desc = "A midnight black turtleneck worn by honorable Vanguards of the IRMG."
+	name = "inteq midnight turtleneck"
+	desc = "A midnight black turtleneck worn by command of the IRMG."
 	icon_state = "inteq_honorable"
 	item_state = "inteq_honorable"
-	supports_variations = KEPORI_VARIATION | DIGITIGRADE_VARIATION
+	supports_variations = KEPORI_VARIATION | DIGITIGRADE_VARIATION | VOX_VARIATION
 
 /obj/item/clothing/under/syndicate/inteq/sneaksuit
 	name = "inteq sneaksuit"
@@ -73,7 +73,7 @@
 	mob_overlay_icon = 'icons/mob/clothing/faction/inteq/suits.dmi'
 	icon_state = "armor_inteq_battlecoat"
 	item_state = "inteq_battlecoat"
-	supports_variations = DIGITIGRADE_VARIATION_NO_NEW_ICON | VOX_VARIATION
+	supports_variations = DIGITIGRADE_VARIATION_NO_NEW_ICON | VOX_VARIATION | KEPORI_VARIATION
 	vox_override_icon = 'icons/mob/clothing/faction/inteq/vox.dmi'
 	kepori_override_icon = 'icons/mob/clothing/faction/inteq/kepori.dmi'
 
@@ -90,7 +90,9 @@
 	desc = "A brown armored coat with a bulletproof vest over it, usually worn by the Master At Arms of the IRMG."
 	icon = 'icons/obj/clothing/faction/inteq/suits.dmi'
 	mob_overlay_icon = 'icons/mob/clothing/faction/inteq/suits.dmi'
+	kepori_override_icon = 'icons/mob/clothing/faction/inteq/kepori.dmi'
 	icon_state = "maacoat"
+	supports_variations = KEPORI_VARIATION
 
 /obj/item/clothing/suit/armor/inteq/corpsman
 	name = "inteq corpsman vest"
@@ -259,6 +261,74 @@
 	full_retraction = TRUE
 	supports_variations = VOX_VARIATION | KEPORI_VARIATION
 
+// pilot softsuit
+/obj/item/clothing/suit/space/inteq/pilot
+	name = "inteq pilot space suit"
+	icon = 'icons/obj/clothing/faction/inteq/suits.dmi'
+	mob_overlay_icon = 'icons/mob/clothing/faction/inteq/suits.dmi'
+	item_state = "space-inteq-pilot"
+	icon_state = "space-inteq-pilot"
+	desc = "A rich brown, lightweight spacesuit made of a fire retardant material. While uncumbersome, it has poor protection against extreme temperatures of either end. Utilized by exosuit and shuttle pilots of the IRMG."
+	armor = list("melee" = 10, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 100, "rad" = 60, "fire" = 80, "acid" = 75, "wound" = 5)
+	clothing_flags = STOPSPRESSUREDAMAGE | THICKMATERIAL | FAST_EMBARK
+	min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT
+	resistance_flags = FIRE_PROOF
+	pocket_storage_component_path = /datum/component/storage/concrete/pockets/exo/large
+	slowdown = 0.2
+
+/obj/item/clothing/head/helmet/space/inteq/pilot
+	name = "inteq pilot helmet"
+	icon = 'icons/obj/clothing/faction/inteq/hats.dmi'
+	mob_overlay_icon = 'icons/mob/clothing/faction/inteq/hats.dmi'
+	lefthand_file = 'icons/mob/inhands/faction/inteq/inteq_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/faction/inteq/inteq_righthand.dmi'
+	item_state = "space-inteq-pilot"
+	icon_state = "space-inteq-pilot0"
+	desc = "A specialized space helmet with a large gold visor, designed to provide maximum visibility while protecting from glare. While protective against low pressure environments, it does little against extreme temperatures of either end. Utilized by exosuit and shuttle pilots of the IRMG."
+	armor = list("melee" = 20, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 100, "rad" = 60, "fire" = 80, "acid" = 75, "wound" = 5)
+	visor_flags_inv = HIDEHAIR|HIDEEARS|HIDEFACE|HIDEFACIALHAIR|HIDEMASK
+	visor_flags = STOPSPRESSUREDAMAGE | ALLOWINTERNALS | FLASH_PROTECTION_WELDER
+	min_cold_protection_temperature = FIRE_HELM_MIN_TEMP_PROTECT
+	resistance_flags = FIRE_PROOF
+
+	up = FALSE
+	actions_types = list(/datum/action/item_action/toggle_helmet)
+
+/obj/item/clothing/head/helmet/space/inteq/pilot/update_icon_state()
+	icon_state = "space-inteq-pilot[up]"
+	return ..()
+
+/obj/item/clothing/head/helmet/space/inteq/pilot/attack_self(mob/user) //toggle copied from indie pilot helm
+	if(!isturf(user.loc))
+		to_chat(user, span_warning("You cannot toggle your helmet while in this [user.loc]!") )
+		return
+	up = !up
+	if(!up || force)
+		to_chat(user, span_notice("You close your helmet's visor and breathing mask."))
+		gas_transfer_coefficient = initial(gas_transfer_coefficient)
+		permeability_coefficient = initial(permeability_coefficient)
+		clothing_flags |= visor_flags
+		flags_cover |= HEADCOVERSEYES | HEADCOVERSMOUTH
+		flags_inv |= visor_flags_inv
+		cold_protection |= HEAD
+	else
+		to_chat(user, span_notice("You open your helmet's visor and breathing mask."))
+		gas_transfer_coefficient = null
+		permeability_coefficient = null
+		clothing_flags &= ~visor_flags
+		flags_cover &= ~(HEADCOVERSEYES | HEADCOVERSMOUTH)
+		flags_inv &= ~visor_flags_inv
+		cold_protection &= ~HEAD
+	update_appearance()
+	playsound(src.loc, 'sound/mecha/mechmove03.ogg', 50, TRUE)
+	user.update_inv_head()
+	if(iscarbon(user))
+		var/mob/living/carbon/C = user
+		C.head_update(src, forced = 1)
+	for(var/X in actions)
+		var/datum/action/A = X
+		A.UpdateButtonIcon()
+
 // Headgear
 
 /obj/item/clothing/head/warden/inteq
@@ -370,6 +440,7 @@
 	vox_override_icon = 'icons/mob/clothing/faction/inteq/vox.dmi'
 	kepori_override_icon = 'icons/mob/clothing/faction/inteq/kepori.dmi'
 	glass_colour_type = /datum/client_colour/glass_colour/orange
+	flags_cover = GLASSESCOVERSEYES | SEALS_EYES
 
 // Mask
 
@@ -438,7 +509,7 @@
 	desc = "A harness with a bunch of pouches attached to them emblazoned in the colors of the IRMG, can hold security gear."
 	icon_state = "inteq_droppouch"
 	item_state = "inteq_droppouch"
-	supports_variations = VOX_VARIATION
+	supports_variations = VOX_VARIATION | KEPORI_VARIATION
 	vox_override_icon = 'icons/mob/clothing/faction/inteq/vox.dmi'
 
 /obj/item/storage/belt/security/webbing/inteq/alt/bulldog/PopulateContents()
diff --git a/code/modules/clothing/factions/nanotrasen.dm b/code/modules/clothing/factions/nanotrasen.dm
index d82e615fa8..6d7e7bc7d3 100644
--- a/code/modules/clothing/factions/nanotrasen.dm
+++ b/code/modules/clothing/factions/nanotrasen.dm
@@ -158,6 +158,7 @@
 	mob_overlay_icon = 'icons/mob/clothing/faction/nanotrasen/suits.dmi'
 	lefthand_file = 'icons/mob/inhands/faction/nanotrasen/nt_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/faction/nanotrasen/nt_righthand.dmi'
+	vox_override_icon = 'icons/mob/clothing/faction/nanotrasen/vox.dmi'
 
 /obj/item/clothing/suit/nanotrasen/medical_smock
 	name = "surgical smock"
@@ -171,18 +172,21 @@
 	desc = "A fine black linen suit jacket with blue markings and a Nanotrasen lapel pin. It has a strangely menacing aura."
 	icon_state = "suit_jacket"
 	item_state = "blackcloth"
+	supports_variations = VOX_VARIATION
 
 /obj/item/clothing/suit/nanotrasen/vest
 	name = "black hazard vest"
 	desc = "A thin black vest with reflective markings, worn to guarantee visibility when operating around industrial equipment or in dark or dusty conditions. Property of Nanotrasen, Inc."
 	icon_state = "engi_vest"
 	item_state = "blackcloth"
+	supports_variations = VOX_VARIATION
 
 /obj/item/clothing/suit/nanotrasen/vest/blue
 	name = "blue hazard vest"
 	desc = "A thin vest with reflective stripes, worn to guarantee visibility in dangerous conditions. The vest itself is an offensively bright shade of Nanotrasen Blue. Property of Nanotrasen, Inc."
 	icon_state = "atmos_vest"
 	item_state = "bluecloth"
+	supports_variations = VOX_VARIATION
 
 /obj/item/clothing/suit/toggle/nanotrasen
 	name = "officer's coat"
diff --git a/code/modules/clothing/factions/ngr.dm b/code/modules/clothing/factions/ngr.dm
index 108929aa29..6f94bc9e16 100644
--- a/code/modules/clothing/factions/ngr.dm
+++ b/code/modules/clothing/factions/ngr.dm
@@ -244,6 +244,7 @@
 	icon = 'icons/obj/clothing/faction/ngr/eyes.dmi'
 	mob_overlay_icon = 'icons/mob/clothing/faction/ngr/eyes.dmi'
 	glass_colour_type = /datum/client_colour/glass_colour/green
+	flags_cover = GLASSESCOVERSEYES | SEALS_EYES
 
 //////////
 //Masks//
diff --git a/code/modules/clothing/glasses/_glasses.dm b/code/modules/clothing/glasses/_glasses.dm
index 82ee9a56c7..e10144e755 100644
--- a/code/modules/clothing/glasses/_glasses.dm
+++ b/code/modules/clothing/glasses/_glasses.dm
@@ -76,6 +76,7 @@
 	vision_flags = SEE_TURFS
 	lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_VISIBLE
 	glass_colour_type = /datum/client_colour/glass_colour/lightgreen
+	flags_cover = GLASSESCOVERSEYES | SEALS_EYES
 
 
 /obj/item/clothing/glasses/meson/night
@@ -100,6 +101,7 @@
 	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 100)
 	custom_price = 250
 	supports_variations = VOX_VARIATION
+	flags_cover = GLASSESCOVERSEYES | SEALS_EYES
 
 /obj/item/clothing/glasses/science/item_action_slot_check(slot)
 	if(slot == ITEM_SLOT_EYES)
@@ -110,6 +112,7 @@
 	desc = "A pair of prescription glasses fitted with an analyzer for scanning items and reagents. "
 	icon_state = "prescriptionpurple"
 	vision_correction = 1
+	flags_cover = GLASSESCOVERSEYES
 
 /obj/item/clothing/glasses/science/prescription/fake
 	name = "science glasses"
@@ -126,6 +129,7 @@
 	lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE
 	glass_colour_type = /datum/client_colour/glass_colour/green
 	supports_variations = VOX_VARIATION
+	flags_cover = GLASSESCOVERSEYES | SEALS_EYES
 
 /obj/item/clothing/glasses/eyepatch
 	name = "eyepatch"
@@ -163,6 +167,7 @@
 	item_state = "glasses"
 	vision_flags = SEE_OBJS
 	glass_colour_type = /datum/client_colour/glass_colour/lightblue
+	flags_cover = GLASSESCOVERSEYES | SEALS_EYES
 
 /obj/item/clothing/glasses/material/mining
 	name = "optical material scanner"
@@ -244,6 +249,7 @@
 	item_state = "ballistic_goggles"
 	supports_variations = KEPORI_VARIATION | VOX_VARIATION
 	glass_colour_type = /datum/client_colour/glass_colour/lightblue
+	flags_cover = GLASSESCOVERSEYES | SEALS_EYES
 
 /obj/item/clothing/glasses/welding
 	name = "welding goggles"
@@ -344,6 +350,7 @@
 	lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_VISIBLE
 	flash_protect = FLASH_PROTECTION_SENSITIVE
 	glass_colour_type = /datum/client_colour/glass_colour/red
+	flags_cover = GLASSESCOVERSEYES | SEALS_EYES
 
 /obj/item/clothing/glasses/thermal/emp_act(severity)
 	. = ..()
@@ -382,6 +389,7 @@
 	icon_state = "eyepatch-0"
 	item_state = "eyepatch-0"
 	var/flipped = FALSE
+	flags_cover = GLASSESCOVERSEYES
 
 /obj/item/clothing/glasses/thermal/eyepatch/AltClick(mob/user)
 	. = ..()
diff --git a/code/modules/clothing/glasses/engine_goggles.dm b/code/modules/clothing/glasses/engine_goggles.dm
index 13f904fcde..06e0a4e355 100644
--- a/code/modules/clothing/glasses/engine_goggles.dm
+++ b/code/modules/clothing/glasses/engine_goggles.dm
@@ -173,12 +173,14 @@
 	desc = "Used by engineering and mining staff to see basic structural and terrain layouts through walls, regardless of lighting conditions. This pair also corrects nearsightedness."
 	icon_state = "prescriptionmeson"
 	vision_correction = 1
+	flags_cover = GLASSESCOVERSEYES
 
 /obj/item/clothing/glasses/meson/sunglasses
 	name = "optical meson scannerglasses"
 	desc = "Used by engineering and mining staff to see basic structural and terrain layouts through walls, regardless of lighting conditions. This pair is built into a pair of sunglasses."
 	icon_state = "sunmeson"
 	flash_protect = FLASH_PROTECTION_FLASH
+	flags_cover = GLASSESCOVERSEYES
 
 #undef MODE_NONE
 #undef MODE_MESON
diff --git a/code/modules/clothing/glasses/hud.dm b/code/modules/clothing/glasses/hud.dm
index c58b595155..6d88c1c49f 100644
--- a/code/modules/clothing/glasses/hud.dm
+++ b/code/modules/clothing/glasses/hud.dm
@@ -57,6 +57,7 @@
 	flash_protect = FLASH_PROTECTION_SENSITIVE
 	lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_VISIBLE
 	glass_colour_type = /datum/client_colour/glass_colour/green
+	flags_cover = GLASSESCOVERSEYES | SEALS_EYES
 
 /obj/item/clothing/glasses/hud/health/sunglasses
 	name = "medical HUDSunglasses"
@@ -84,6 +85,7 @@
 	flash_protect = FLASH_PROTECTION_SENSITIVE
 	lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_VISIBLE
 	glass_colour_type = /datum/client_colour/glass_colour/green
+	flags_cover = GLASSESCOVERSEYES | SEALS_EYES
 
 /obj/item/clothing/glasses/hud/diagnostic/sunglasses
 	name = "diagnostic sunglasses"
@@ -161,6 +163,7 @@
 	flash_protect = FLASH_PROTECTION_SENSITIVE
 	lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_VISIBLE
 	glass_colour_type = /datum/client_colour/glass_colour/green
+	flags_cover = GLASSESCOVERSEYES | SEALS_EYES
 
 /obj/item/clothing/glasses/hud/toggle
 	name = "Toggle HUD"
@@ -197,6 +200,7 @@
 	vision_flags = SEE_MOBS
 	lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_VISIBLE
 	glass_colour_type = /datum/client_colour/glass_colour/red
+	flags_cover = GLASSESCOVERSEYES | SEALS_EYES
 
 /obj/item/clothing/glasses/hud/toggle/thermal/attack_self(mob/user)
 	..()
diff --git a/code/modules/clothing/masks/gasmask.dm b/code/modules/clothing/masks/gasmask.dm
index 10e878a1fc..c2f1ff8a19 100644
--- a/code/modules/clothing/masks/gasmask.dm
+++ b/code/modules/clothing/masks/gasmask.dm
@@ -10,6 +10,7 @@
 	permeability_coefficient = 0.01
 	flags_cover = MASKCOVERSEYES | MASKCOVERSMOUTH | PEPPERPROOF | SEALS_EYES
 	resistance_flags = NONE
+	supports_variations = KEPORI_VARIATION
 
 	equip_sound = 'sound/items/equip/armor_equip.ogg'
 	equipping_sound = EQUIP_SOUND_VFAST_GENERIC
diff --git a/code/modules/clothing/masks/hailer.dm b/code/modules/clothing/masks/hailer.dm
index 35fd0e3043..d902979e36 100644
--- a/code/modules/clothing/masks/hailer.dm
+++ b/code/modules/clothing/masks/hailer.dm
@@ -1,8 +1,8 @@
 // **** Security gas mask ****
 
 /obj/item/clothing/mask/gas/sechailer
-	name = "security gas mask"
-	desc = "A standard issue Security gas mask. It doesn't cover the eyes."
+	name = "half mask"
+	desc = "A standard half mask. It doesn't cover the eyes."
 	actions_types = list(/datum/action/item_action/adjust)
 	icon_state = "sechailer"
 	item_state = "sechailer"
@@ -13,7 +13,7 @@
 	visor_flags_inv = HIDEFACIALHAIR | HIDEFACE
 	flags_cover = MASKCOVERSMOUTH | MASKCOVERSEYES | PEPPERPROOF
 	visor_flags_cover = MASKCOVERSMOUTH | MASKCOVERSEYES | PEPPERPROOF
-	supports_variations = VOX_VARIATION
+	supports_variations = VOX_VARIATION | SNOUTED_VARIATION | KEPORI_VARIATION
 
 /obj/item/clothing/mask/gas/sechailer/swat
 	name = "\improper SWAT mask"
diff --git a/code/modules/clothing/outfits/ert/frontiersmen_ert.dm b/code/modules/clothing/outfits/ert/frontiersmen_ert.dm
index ad27bc6b4c..161ef12609 100644
--- a/code/modules/clothing/outfits/ert/frontiersmen_ert.dm
+++ b/code/modules/clothing/outfits/ert/frontiersmen_ert.dm
@@ -242,7 +242,7 @@
 	belt = /obj/item/storage/belt/medical/webbing/frontiersmen/combat
 	glasses = /obj/item/clothing/glasses/hud/health
 
-	backpack_contents = list(/obj/item/clothing/mask/gas/frontiersmen, /obj/item/storage/firstaid/medical=1, /obj/item/reagent_containers/hypospray/medipen/stimpack/traitor = 3, /obj/item/ammo_box/magazine/m9mm_mauler/extended=2)
+	backpack_contents = list(/obj/item/clothing/mask/gas/frontiersmen, /obj/item/storage/firstaid/medical=1, /obj/item/reagent_containers/hypospray/medipen/stimpack/crisis = 3, /obj/item/ammo_box/magazine/m9mm_mauler/extended=2)
 
 /datum/outfit/job/frontiersmen/ert/engineer
 	name = "ERT - Frontiersman Engineer"
diff --git a/code/modules/clothing/outfits/ert/gezena_ert.dm b/code/modules/clothing/outfits/ert/gezena_ert.dm
index 436b737959..89e53226eb 100644
--- a/code/modules/clothing/outfits/ert/gezena_ert.dm
+++ b/code/modules/clothing/outfits/ert/gezena_ert.dm
@@ -9,9 +9,11 @@
 	head = /obj/item/clothing/head/helmet/gezena
 	belt = /obj/item/storage/belt/military/gezena/bg16
 	gloves = /obj/item/clothing/gloves/gezena/marine
-	shoes = /obj/item/clothing/shoes/combat/gezena
+	shoes = /obj/item/clothing/shoes/combat/gezena/marine
 	neck = /obj/item/clothing/neck/cloak/gezena
-	suit_store = /obj/item/gun/energy/kalix/pgf
+	suit_store = /obj/item/gun/energy/kalix/pgf/medium
+	mask = /obj/item/clothing/mask/breath/pgfmask
+	glasses = /obj/item/clothing/glasses/sunglasses/pgf
 
 	l_pocket = /obj/item/melee/knife/combat
 	r_pocket = /obj/item/flashlight/seclite
@@ -22,12 +24,13 @@
 /datum/outfit/job/gezena/ert/gunner
 	name = "ERT - PGF Marine Gunner"
 
-	suit_store = /obj/item/gun/energy/kalix/pgf/heavy // yea there's not much else to put in. sorry
+	suit_store = /obj/item/gun/energy/kalix/pgf/heavy
 
 /datum/outfit/job/gezena/ert/engineer
 	name = "ERT - PGF Marine Combat Engineer"
 	id_assignment = "Marine Combat Engineer"
 
+	suit_store = /obj/item/gun/energy/kalix/pgf
 	belt = /obj/item/storage/belt/military/gezena/engineer
 
 /datum/outfit/job/gezena/ert/medic
@@ -39,6 +42,7 @@
 	belt = /obj/item/storage/belt/medical/gezena/paramedic
 	gloves = /obj/item/clothing/gloves/gezena/marine
 	neck = /obj/item/clothing/neck/cloak/gezena/med
+	suit_store = /obj/item/gun/energy/kalix/pgf
 
 	backpack = /obj/item/storage/backpack/medic
 	satchel = /obj/item/storage/backpack/satchel/med
@@ -46,7 +50,7 @@
 	courierbag = /obj/item/storage/backpack/messenger/para
 	box = /obj/item/storage/box/survival/medical
 
-	backpack_contents = list(/obj/item/gun/energy/kalix/pistol, /obj/item/stock_parts/cell/gun/kalix = 2, /obj/item/screwdriver)
+	backpack_contents = list(/obj/item/gun/energy/kalix/pistol, /obj/item/stock_parts/cell/gun/kalix = 2)
 
 
 /datum/outfit/job/gezena/ert/leader
@@ -55,11 +59,11 @@
 	jobtype = /datum/job/hos
 	job_icon = "headofsecurity"
 
-	suit = /obj/item/clothing/suit/armor/gezena/marinecoat
+	suit = /obj/item/clothing/suit/armor/gezena/marine
 	head = /obj/item/clothing/head/helmet/gezena
 	gloves = /obj/item/clothing/gloves/gezena/marine
-	shoes = /obj/item/clothing/shoes/combat/gezena
-	neck = /obj/item/clothing/neck/cloak/gezena/lead
+	shoes = /obj/item/clothing/shoes/combat/gezena/marine
+	neck = /obj/item/clothing/neck/cloak/gezena/command
 	suit_store = /obj/item/gun/energy/kalix/pgf/heavy
 
 	backpack_contents = list(/obj/item/gun/energy/kalix/pistol, /obj/item/stock_parts/cell/gun/kalix = 2, /obj/item/grenade/smokebomb = 3, /obj/item/binoculars)
@@ -75,6 +79,7 @@
 	neck = /obj/item/clothing/neck/cloak/gezena/command
 	uniform = /obj/item/clothing/under/gezena
 	suit = /obj/item/clothing/suit/armor/gezena
+	shoes = /obj/item/clothing/shoes/combat/gezena
 	suit_store = null
 	belt = null
 	gloves = /obj/item/clothing/gloves/gezena
diff --git a/code/modules/clothing/outfits/factions/clip.dm b/code/modules/clothing/outfits/factions/clip.dm
index 13d3e39166..7080e1352c 100644
--- a/code/modules/clothing/outfits/factions/clip.dm
+++ b/code/modules/clothing/outfits/factions/clip.dm
@@ -273,37 +273,43 @@
 	r_pocket = /obj/item/radio
 
 /datum/outfit/job/clip/correspondent
-	name = "CLIP - War Correspondent"
+	name = "CLIP - Military Correspondent"
 	job_icon = "curator"
 	jobtype = /datum/job/curator
 
-	head = /obj/item/clothing/head/helmet/bulletproof/m10/clip_correspondent
 	uniform = /obj/item/clothing/under/clip/formal/with_shirt
-	suit = /obj/item/clothing/suit/armor/vest/clip_correspondent
 	shoes = /obj/item/clothing/shoes/laceup
 
-	belt = /obj/item/bodycamera/broadcast_camera
-
 	backpack = /obj/item/storage/backpack
 	satchel = /obj/item/storage/backpack/satchel
 
 	r_pocket = /obj/item/radio
 	l_pocket = /obj/item/multitool
 
+/datum/outfit/job/clip/correspondent/dressed
+	name = "CLIP - Military Correspondent (Dressed)"
+
+	head = /obj/item/clothing/head/helmet/bulletproof/m10/clip_correspondent
+	suit = /obj/item/clothing/suit/armor/vest/clip_correspondent
+
+	belt = /obj/item/bodycamera/broadcast_camera
+
 // Confederated League Minutemen
 
 /datum/outfit/job/clip/minutemen
 	name = "CLIP Minutemen - Base Outfit"
 
 	jobtype = /datum/job/assistant
+
 	uniform = /obj/item/clothing/under/clip/minutemen
+	shoes = /obj/item/clothing/shoes/combat
 
 	backpack = /obj/item/storage/backpack/security/clip
 	satchel = /obj/item/storage/backpack/satchel/sec/clip
 	duffelbag = /obj/item/storage/backpack/duffelbag
 	courierbag = /obj/item/storage/backpack/satchel/sec/clip
 
-	box = /obj/item/storage/box/survival/clip/balaclava
+	box = /obj/item/storage/box/survival/clip/minutemen
 
 /datum/outfit/job/clip/minutemen/deckhand
 	name = "CLIP Minutemen - Deckhand"
@@ -311,11 +317,10 @@
 	job_icon = "clip_navy1"
 	jobtype = /datum/job/assistant
 
-	uniform =  /obj/item/clothing/under/clip/minutemen
-	shoes = /obj/item/clothing/shoes/combat
-
 	r_pocket = /obj/item/radio
 
+// captain
+
 /datum/outfit/job/clip/minutemen/captain
 	name = "CLIP Minutemen - Captain"
 	job_icon = "clip_navy5"
@@ -323,7 +328,7 @@
 
 	id = /obj/item/card/id/gold
 	gloves = /obj/item/clothing/gloves/color/captain
-	accessory = /obj/item/clothing/accessory/medal/gold/captain
+//	accessory = /obj/item/clothing/accessory/medal/gold/captain
 	ears = /obj/item/radio/headset/clip/alt/captain
 	uniform = /obj/item/clothing/under/clip/officer
 	alt_uniform = null
@@ -346,7 +351,7 @@
 	ears = /obj/item/radio/headset/clip/alt/captain
 	uniform = /obj/item/clothing/under/clip/officer
 	suit = /obj/item/clothing/suit/armor/vest/capcarapace/clip
-	shoes = /obj/item/clothing/shoes/combat
+	shoes = /obj/item/clothing/shoes/jackboots
 
 	box = /obj/item/storage/box/survival/engineer
 	backpack_contents = list(/obj/item/melee/classic_baton/telescopic=1, /obj/item/gun/ballistic/revolver/mateba=1)
@@ -359,7 +364,9 @@
 	head = /obj/item/clothing/head/clip/bicorne
 	suit = /obj/item/clothing/suit/armor/vest/capcarapace/clip/admiral
 
-/datum/outfit/job/clip/minutemen/head_of_personnel
+// bridge officer
+
+/datum/outfit/job/clip/minutemen/bridge_officer
 	name = "CLIP Minutemen - Bridge Officer"
 	id_assignment = "Bridge Officer"
 	job_icon = "clip_navy3"
@@ -376,9 +383,11 @@
 
 	backpack_contents = list(/obj/item/modular_computer/tablet/preset/advanced = 1)
 
+// doctor
+
 /datum/outfit/job/clip/minutemen/doctor
-	name = "CLIP Minutemen - Corpsman"
-	id_assignment = "Corpsman"
+	name = "CLIP Minutemen - Naval Corpsman"
+	id_assignment = "Naval Corpsman"
 	job_icon = "clip_navy2"
 	jobtype = /datum/job/doctor
 
@@ -388,7 +397,7 @@
 	suit = null
 	suit_store = null
 
-///vehicle crew
+// vehicle crew
 
 /datum/outfit/job/clip/minutemen/vehicle_crew
 	name = "CLIP Minutemen - Vehicle Crewman"
@@ -396,7 +405,7 @@
 	job_icon = "clip_mech1"
 	jobtype = /datum/job/roboticist
 
-	belt = /obj/item/storage/belt/utility/full
+	belt = /obj/item/storage/belt/utility
 
 	backpack = /obj/item/storage/backpack/industrial
 	satchel = /obj/item/storage/backpack/satchel/eng
@@ -454,27 +463,28 @@
 	shoes = /obj/item/clothing/shoes/jackboots
 	suit = /obj/item/clothing/suit/hazardvest
 
+// engineer (not combat)
+
 /datum/outfit/job/clip/minutemen/engineer
-	name = "CLIP Minutemen - Engineer"
+	name = "CLIP Minutemen - Naval Engineer"
+	id_assignment = "Naval Engineer"
 	job_icon = "clip_navy2"
 	jobtype = /datum/job/engineer
 
-	belt = /obj/item/storage/belt/utility/full/engi
 	shoes = /obj/item/clothing/shoes/workboots
-	r_pocket = /obj/item/t_scanner
 
 	backpack = /obj/item/storage/backpack/industrial
 	satchel = /obj/item/storage/backpack/satchel/eng
 	duffelbag = /obj/item/storage/backpack/duffelbag/engineering
 	courierbag = /obj/item/storage/backpack/messenger/engi
 
-	uniform = /obj/item/clothing/under/clip
+	uniform = /obj/item/clothing/under/clip/minutemen
 	head = /obj/item/clothing/head/clip
 	suit =  /obj/item/clothing/suit/hazardvest
 
 	backpack_contents = list(/obj/item/modular_computer/tablet/preset/advanced=1)
 
-//grunts - for erts as well
+//grunts - soldiers, combat engineers and medics, etc. for erts as well
 
 /obj/item/twenty_pounds_of_ice
 	name = "20 pounds of ice"
@@ -487,13 +497,13 @@
 	id_assignment = "Minuteman"
 	jobtype = /datum/job/officer
 	job_icon = "clip_cmm2"
+
 	ears = /obj/item/radio/headset/alt
-	box = /obj/item/storage/box/survival/clip/balaclava
 	shoes = /obj/item/clothing/shoes/combat // shoos
 
 	backpack = /obj/item/storage/backpack/security/clip
 	satchel = /obj/item/storage/backpack/satchel/sec/clip
-	duffelbag = /obj/item/storage/backpack/security/clip //to-do: bug rye for clip duffles // rye. rye. give me 20 pound bag of ice //done
+	duffelbag = /obj/item/storage/backpack/duffelbag //to-do: bug rye for clip duffles // rye. rye. give me 20 pound bag of ice //done // rye. rye. give me clip duffels
 
 /datum/outfit/job/clip/minutemen/grunt/post_equip(mob/living/carbon/human/H, visualsOnly)
 	. = ..()
@@ -501,15 +511,6 @@
 		H.equip_to_slot_if_possible(new /obj/item/twenty_pounds_of_ice, ITEM_SLOT_HANDS, FALSE, FALSE)
 
 
-/datum/outfit/job/clip/minutemen/grunt/reserve
-	name = "CLIP Minutemen - Reservist"
-	id_assignment = "Reservist"
-	job_icon = "clip_cmm1"
-	jobtype = /datum/job/assistant
-
-	head = /obj/item/clothing/head/clip
-	shoes = /obj/item/clothing/shoes/combat
-
 /datum/outfit/job/clip/minutemen/grunt/dressed
 	name = "CLIP Minutemen - Minuteman (Dressed)"
 
@@ -528,10 +529,13 @@
 
 	backpack_contents = list(/obj/item/clothing/mask/gas/clip=1, /obj/item/storage/ration/chicken_wings_hot_sauce=1)
 
-/datum/outfit/job/clip/minutemen/grunt/dressed/hardsuit
-	name = "CLIP Minutemen - Minuteman (Spotter Hardsuit)"
+/datum/outfit/job/clip/minutemen/grunt/dressed/eva_spotter
+	name = "CLIP Minutemen - Minuteman (EVA - Spotter Hardsuit)"
+
 	head = null
+	mask = /obj/item/clothing/mask/breath
 	suit = /obj/item/clothing/suit/space/hardsuit/clip_spotter
+	suit_store = /obj/item/tank/internals/oxygen
 
 /datum/outfit/job/clip/minutemen/grunt/dressed/armed
 	name = "CLIP Minutemen - Minuteman (Armed - CM-82)"
@@ -551,62 +555,107 @@
 	suit_store = /obj/item/gun/ballistic/automatic/smg/cm5
 	belt = /obj/item/storage/belt/military/clip/cm5
 
-//ert outfits, i suppose you could use these for non-ert roles although i highly discourage it
+// reservist
+
+/datum/outfit/job/clip/minutemen/grunt/reserve
+	name = "CLIP Minutemen - Reservist"
+	id_assignment = "Reservist"
+	job_icon = "clip_cmm1"
+	jobtype = /datum/job/assistant
+
+	head = /obj/item/clothing/head/clip
+	shoes = /obj/item/clothing/shoes/combat
+
+// combat engineer
 
-/datum/outfit/job/clip/minutemen/grunt/dressed/engi
-	name = "CLIP Minutemen - Field Engineer (Dressed)"
-	id_assignment = "Field Engineer"
+/datum/outfit/job/clip/minutemen/grunt/engineer
+	name = "CLIP Minutemen - Combat Engineer"
+	id_assignment = "Combat Engineer"
 	jobtype = /datum/job/engineer
 
 	accessory = /obj/item/clothing/accessory/armband/engine
-	belt = /obj/item/storage/belt/military/clip/engi
 
-/datum/outfit/job/clip/minutemen/grunt/dressed/engi/armed
-	name = "CLIP Minutemen - Field Engineer (Armed - CM-82)"
+/datum/outfit/job/clip/minutemen/grunt/engineer/dressed
+	name = "CLIP Minutemen - Combat Engineer (Dressed)"
+
+	head = /obj/item/clothing/head/helmet/bulletproof/x11/clip
+	suit = /obj/item/clothing/suit/armor/vest/bulletproof
+	belt = /obj/item/storage/belt/military/clip
+
+/datum/outfit/job/clip/minutemen/grunt/engineer/dressed/armed
+	name = "CLIP Minutemen - Combat Engineer (Armed - CM-82)"
 
 	suit_store = /obj/item/gun/ballistic/automatic/assault/cm82
+	belt = /obj/item/storage/belt/military/clip/engi
+
 	backpack_contents = list(/obj/item/clothing/mask/gas/clip=1, /obj/item/storage/ration/chili_macaroni=1, /obj/item/grenade/c4=2, /obj/item/ammo_box/magazine/p16=3)
 
-/datum/outfit/job/clip/minutemen/grunt/dressed/med
-	name = "CLIP Minutemen - Field Corpsman (Dressed)"
-	id_assignment = "Field Corpsman"
+// combat medic
+
+/datum/outfit/job/clip/minutemen/grunt/medic
+	name = "CLIP Minutemen - Combat Medic"
+	id_assignment = "Combat Medic"
 	jobtype = /datum/job/doctor
 
 	accessory = /obj/item/clothing/accessory/armband/medblue
-	belt = /obj/item/storage/belt/medical/webbing/clip/prefilled
 
-/datum/outfit/job/clip/minutemen/grunt/dressed/med/armed
-	name = "CLIP Minutemen - Field Corpsman (Armed - CM-5)"
+/datum/outfit/job/clip/minutemen/grunt/medic/dressed
+	name = "CLIP Minutemen - Combat Medic (Dressed)"
+
+	head = /obj/item/clothing/head/helmet/bulletproof/x11/clip
+	suit = /obj/item/clothing/suit/armor/vest/bulletproof
+	belt = /obj/item/storage/belt/medical/webbing/clip
+
+/datum/outfit/job/clip/minutemen/grunt/medic/dressed/cm5
+	name = "CLIP Minutemen - Combat Medic (Armed - CM-5)"
 
 	suit_store = /obj/item/gun/ballistic/automatic/smg/cm5
 
-	backpack_contents = list(/obj/item/clothing/mask/gas/clip=1, /obj/item/storage/ration/cheese_pizza_slice, /obj/item/defibrillator/compact/loaded=1, /obj/item/storage/firstaid/medical=1, /obj/item/ammo_box/magazine/cm5_9mm=3)
+	backpack_contents = list(
+		/obj/item/clothing/mask/gas/clip = 1,
+		/obj/item/storage/ration/cheese_pizza_slice,
+		/obj/item/defibrillator/compact/loaded = 1,
+		/obj/item/storage/firstaid/medical = 1,
+		/obj/item/ammo_box/magazine/cm5_9mm = 3)
+
+// combat gunner
+
+/datum/outfit/job/clip/minutemen/grunt/gunner
+	name = "CLIP Minutemen - Support Gunner"
+
+	accessory = /obj/item/clothing/accessory/armband
+
+/datum/outfit/job/clip/minutemen/grunt/gunner/dressed
+	name = "CLIP Minutemen - Support Gunner (Dressed)"
+
+	head = /obj/item/clothing/head/helmet/bulletproof/x11/clip
+	suit = /obj/item/clothing/suit/armor/vest/bulletproof
+	belt = /obj/item/storage/belt/military/clip/gunner
+
+/datum/outfit/job/clip/minutemen/grunt/gunner/dressed/armed
+	name = "CLIP Minutemen - Support Gunner (Armed - CM-40)"
+	id_assignment = "Support Gunner"
+
+	belt = /obj/item/storage/belt/military/clip/gunner/cm40
+	suit_store = /obj/item/gun/ballistic/automatic/hmg/cm40
+
+	backpack_contents = list(/obj/item/clothing/mask/gas/clip=1, /obj/item/storage/ration/shredded_beef=1)
 
 /obj/item/storage/belt/military/clip/gunner/ComponentInitialize()
 	. = ..()
 	var/datum/component/storage/STR = GetComponent(/datum/component/storage)
 	STR.max_w_class = WEIGHT_CLASS_NORMAL
 
-/obj/item/storage/belt/military/clip/gunner/PopulateContents()
+/obj/item/storage/belt/military/clip/gunner/cm40/PopulateContents()
 	for(var/i in 1 to 5)
 		new /obj/item/ammo_box/magazine/cm40_762_40_box(src)
 	new /obj/item/grenade/frag(src)
 
-/datum/outfit/job/clip/minutemen/grunt/dressed/gunner_armed
-	name = "CLIP Minutemen - Field Gunner (Armed - CM-40)"
-	id_assignment = "Machinegunner"
-
-	accessory = /obj/item/clothing/accessory/armband
-	belt = /obj/item/storage/belt/military/clip/gunner
-	suit_store = /obj/item/gun/ballistic/automatic/hmg/cm40
-
-	backpack_contents = list(/obj/item/clothing/mask/gas/clip=1, /obj/item/storage/ration/shredded_beef=1)
-
-///lead, i guess you could reuse this for "Brig Officer"
+// team sergeant
 
 /datum/outfit/job/clip/minutemen/grunt/lead
-	name = "CLIP Minutemen - Field Sergeant"
-	id_assignment = "Sergeant"
+	name = "CLIP Minutemen - Team Sergeant"
+	id_assignment = "Team Sergeant"
 	job_icon = "clip_cmm3"
 	jobtype = /datum/job/warden
 
@@ -616,21 +665,23 @@
 	head = /obj/item/clothing/head/soft/utility_navy
 	shoes = /obj/item/clothing/shoes/jackboots
 
-	l_pocket = /obj/item/flashlight/seclite
-	r_pocket = /obj/item/tank/internals/emergency_oxygen/double
-
 	backpack_contents = list(/obj/item/clothing/mask/gas/clip=1)
 
 /datum/outfit/job/clip/minutemen/grunt/lead/armed
-	name = "CLIP Minutemen - Field Sergeant (Armed, CM-82)"
+	name = "CLIP Minutemen - Team Sergeant (Armed - CM-82)"
 
+	head = /obj/item/clothing/head/helmet/bulletproof/x11/clip
 	suit = /obj/item/clothing/suit/armor/vest/bulletproof
 	suit_store = /obj/item/gun/ballistic/automatic/assault/cm82
 	belt = /obj/item/storage/belt/military/clip/cm82
 	backpack_contents = list(
-		/obj/item/clothing/mask/gas/clip,
-		/obj/item/storage/ration/shredded_beef,
-		/obj/item/gun/ballistic/automatic/pistol/cm23)
+		/obj/item/clothing/mask/gas/clip = 1,
+		/obj/item/storage/ration/shredded_beef = 1,
+		/obj/item/gun/ballistic/automatic/pistol/cm23 = 1
+		)
+
+	l_pocket = /obj/item/flashlight/seclite
+	r_pocket = /obj/item/tank/internals/emergency_oxygen/double
 
 /datum/outfit/job/clip/minutemen/grunt/commander
 	name = "CLIP Minutemen - Field Commander"
diff --git a/code/modules/clothing/outfits/factions/frontiersmen.dm b/code/modules/clothing/outfits/factions/frontiersmen.dm
index 9aca8d1993..ae84b7cbae 100644
--- a/code/modules/clothing/outfits/factions/frontiersmen.dm
+++ b/code/modules/clothing/outfits/factions/frontiersmen.dm
@@ -15,6 +15,11 @@
 	duffelbag = /obj/item/storage/backpack/duffelbag
 	courierbag = /obj/item/storage/backpack/messenger
 
+/datum/outfit/job/frontiersmen/post_equip(mob/living/carbon/human/H, visualsOnly, client/preference_source)
+	. = ..()
+	if(visualsOnly)
+		return
+	H.faction |= list(FACTION_ANTAG_FRONTIERSMEN)
 // Assistant
 
 /datum/outfit/job/frontiersmen/assistant
diff --git a/code/modules/clothing/outfits/factions/gezena.dm b/code/modules/clothing/outfits/factions/gezena.dm
index 70bd2b6b0f..ce24f187e6 100644
--- a/code/modules/clothing/outfits/factions/gezena.dm
+++ b/code/modules/clothing/outfits/factions/gezena.dm
@@ -39,6 +39,7 @@
 	satchel = /obj/item/storage/backpack/satchel/eng
 	duffelbag = /obj/item/storage/backpack/duffelbag/engineering
 	courierbag = /obj/item/storage/backpack/messenger/engi
+	box = /obj/item/storage/box/survival/engineer
 
 /datum/outfit/job/gezena/doctor
 	name = "PGF - Navy Doctor"
@@ -62,14 +63,14 @@
 	job_icon = "securityofficer"
 
 	uniform = /obj/item/clothing/under/gezena/marine
-	shoes = /obj/item/clothing/shoes/combat/gezena
+	shoes = /obj/item/clothing/shoes/combat/gezena/marine
 	neck = /obj/item/clothing/neck/cloak/gezena
 
 	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
-	box = /obj/item/storage/box/survival/security
+	box = /obj/item/storage/box/survival/pgf
 
 /datum/outfit/job/gezena/security/sapper
 	name = "PGF - Marine Pioneer"
@@ -102,15 +103,14 @@
 	job_icon = "headofsecurity"
 
 	uniform = /obj/item/clothing/under/gezena/marine
-	head = /obj/item/clothing/head/gezena/marine/lead
-	shoes = /obj/item/clothing/shoes/combat/gezena
-	neck = /obj/item/clothing/neck/cloak/gezena/lead
+	shoes = /obj/item/clothing/shoes/combat/gezena/marine
+	neck = /obj/item/clothing/neck/cloak/gezena/command
 
 	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
-	box = /obj/item/storage/box/survival/security
+	box = /obj/item/storage/box/survival/pgf
 
 /datum/outfit/job/gezena/hop
 	name = "PGF - Bridge Officer"
@@ -161,7 +161,7 @@
 
 	uniform = /obj/item/clothing/under/gezena
 	suit = /obj/item/clothing/suit/armor/gezena/engi
-	head = /obj/item/clothing/head/gezena
+	head = /obj/item/clothing/head/gezena/engi
 	belt = /obj/item/storage/belt/utility/full/engi
 	gloves = /obj/item/clothing/gloves/gezena/engi
 	shoes = /obj/item/clothing/shoes/combat/gezena
@@ -178,9 +178,9 @@
 	job_icon = "medicaldoctor"
 
 	uniform = /obj/item/clothing/under/gezena
-	suit = /obj/item/clothing/suit/armor/gezena
+	suit = /obj/item/clothing/suit/armor/gezena/medic
 	head = /obj/item/clothing/head/gezena/medic
-	gloves = /obj/item/clothing/gloves/gezena
+	gloves = /obj/item/clothing/gloves/color/latex/nitrile
 	shoes = /obj/item/clothing/shoes/combat/gezena
 	neck = /obj/item/clothing/neck/cloak/gezena/med
 
@@ -200,15 +200,17 @@
 	head = /obj/item/clothing/head/helmet/gezena
 	belt = /obj/item/storage/belt/military/gezena
 	gloves = /obj/item/clothing/gloves/gezena/marine
-	shoes = /obj/item/clothing/shoes/combat/gezena
+	shoes = /obj/item/clothing/shoes/combat/gezena/marine
 	neck = /obj/item/clothing/neck/cloak/gezena
-	r_hand = /obj/item/gun/energy/kalix/pgf/heavy
+	r_hand = /obj/item/gun/energy/kalix/pgf/medium
+	mask = /obj/item/clothing/mask/breath/pgfmask
+	glasses = /obj/item/clothing/glasses/sunglasses/pgf
 
 	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
-	box = /obj/item/storage/box/survival/security
+	box = /obj/item/storage/box/survival/pgf
 
 /datum/outfit/job/gezena/hos/geared
 	name = "PGF - Marine Sergeant - Equipped"
@@ -217,18 +219,20 @@
 
 	uniform = /obj/item/clothing/under/gezena/marine
 	suit = /obj/item/clothing/suit/armor/gezena/marine
-	head = /obj/item/clothing/head/gezena/marine/lead
+	head = /obj/item/clothing/head/helmet/gezena
 	belt = /obj/item/storage/belt/military/gezena
 	gloves = /obj/item/clothing/gloves/gezena/marine
-	shoes = /obj/item/clothing/shoes/combat/gezena
-	neck = /obj/item/clothing/neck/cloak/gezena/lead
-	r_hand = /obj/item/gun/energy/kalix/pgf
+	shoes = /obj/item/clothing/shoes/combat/gezena/marine
+	neck = /obj/item/clothing/neck/cloak/gezena/command
+	r_hand = /obj/item/gun/energy/kalix/pgf/heavy
+	mask = /obj/item/clothing/mask/breath/pgfmask
+	glasses = /obj/item/clothing/glasses/sunglasses/pgf
 
 	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
-	box = /obj/item/storage/box/survival/security
+	box = /obj/item/storage/box/survival/pgf
 
 /datum/outfit/job/gezena/paramedic
 	name = "PGF - Marine Medic - Equipped"
@@ -240,9 +244,11 @@
 	head = /obj/item/clothing/head/helmet/gezena
 	belt = /obj/item/storage/belt/medical/gezena
 	gloves = /obj/item/clothing/gloves/gezena/marine
-	shoes = /obj/item/clothing/shoes/combat/gezena
+	shoes = /obj/item/clothing/shoes/combat/gezena/marine
 	neck = /obj/item/clothing/neck/cloak/gezena/med
 	r_hand = /obj/item/gun/energy/kalix/pgf
+	mask = /obj/item/clothing/mask/breath/pgfmask
+	glasses = /obj/item/clothing/glasses/sunglasses/pgf
 
 	backpack = /obj/item/storage/backpack/medic
 	satchel = /obj/item/storage/backpack/satchel/med
diff --git a/code/modules/clothing/outfits/factions/inteq.dm b/code/modules/clothing/outfits/factions/inteq.dm
index 8e18e77c1c..89a5c2cd52 100644
--- a/code/modules/clothing/outfits/factions/inteq.dm
+++ b/code/modules/clothing/outfits/factions/inteq.dm
@@ -36,6 +36,7 @@
 	glasses = /obj/item/clothing/glasses/hud/security/sunglasses/inteq
 	mask = /obj/item/clothing/mask/balaclava/inteq
 	suit = /obj/item/clothing/suit/armor/hos/inteq
+	uniform = /obj/item/clothing/under/syndicate/inteq/honorable
 	dcoat = /obj/item/clothing/suit/hooded/wintercoat/security/inteq
 	belt = /obj/item/storage/belt/security/webbing/inteq
 	gloves = /obj/item/clothing/gloves/combat
@@ -204,7 +205,7 @@
 
 	ears = /obj/item/radio/headset/inteq/alt
 	head = /obj/item/clothing/head/warden/inteq
-	uniform = /obj/item/clothing/under/syndicate/inteq
+	uniform = /obj/item/clothing/under/syndicate/inteq/honorable
 	glasses = /obj/item/clothing/glasses/hud/security/sunglasses/inteq
 	mask = /obj/item/clothing/mask/balaclava/inteq
 	belt = /obj/item/storage/belt/military/assault
diff --git a/code/modules/clothing/outfits/factions/nanotrasen.dm b/code/modules/clothing/outfits/factions/nanotrasen.dm
index 557eed76a4..a7082ec4fe 100644
--- a/code/modules/clothing/outfits/factions/nanotrasen.dm
+++ b/code/modules/clothing/outfits/factions/nanotrasen.dm
@@ -43,6 +43,7 @@
 
 	chameleon_extras = list(/obj/item/gun/energy/e_gun, /obj/item/stamp/captain)
 
+
 /datum/outfit/job/nanotrasen/captain/ns
 	name = "Nanotrasen - Captain (N+S Logistics)"
 
@@ -76,6 +77,30 @@
 
 	chameleon_extras = /obj/item/stamp/qm
 
+/datum/outfit/job/nanotrasen/captain/vi
+	name = "Nanotrasen - Captain (Vigilitas Interstellar)"
+
+	id = /obj/item/card/id/gold
+	head = /obj/item/clothing/head/nanotrasen/beret/security/command
+	uniform = /obj/item/clothing/under/nanotrasen/security/director
+	suit = /obj/item/clothing/suit/armor/nanotrasen/sec_director
+	alt_suit = null
+	dcoat = /obj/item/clothing/suit/hooded/wintercoat/security
+	shoes = /obj/item/clothing/shoes/combat
+	glasses = /obj/item/clothing/glasses/sunglasses
+	gloves = /obj/item/clothing/gloves/combat
+	ears = /obj/item/radio/headset/nanotrasen/alt/captain
+	neck = null
+	backpack_contents = list(/obj/item/melee/classic_baton/telescopic=1)
+
+	backpack = /obj/item/storage/backpack/security
+	satchel = /obj/item/storage/backpack/satchel/cap
+	duffelbag = /obj/item/storage/backpack/duffelbag/sec
+	courierbag = /obj/item/storage/backpack/messenger/sec
+	box = /obj/item/storage/box/survival/vi
+
+	chameleon_extras = /obj/item/stamp/nanotrasen/vigilitas/captain
+
 /datum/outfit/job/nanotrasen/captain/centcom
 	name = "Nanotrasen - Captain (Central Command)"
 
@@ -148,6 +173,31 @@
 
 	chameleon_extras = list(/obj/item/gun/energy/e_gun/hos, /obj/item/stamp/hos)
 
+/datum/outfit/job/nanotrasen/hos/vi
+	name = "Nanotrasen - Vigilitas Sergeant"
+
+	id = /obj/item/card/id/silver
+	ears = /obj/item/radio/headset/nanotrasen/alt
+	uniform = /obj/item/clothing/under/nanotrasen/security/director
+	alt_uniform = null
+	shoes = /obj/item/clothing/shoes/combat
+	suit = null
+	alt_suit = null
+	dcoat = /obj/item/clothing/suit/hooded/wintercoat/security
+	gloves = /obj/item/clothing/gloves/combat
+	head = /obj/item/clothing/head/nanotrasen/beret/security/command
+	r_pocket = /obj/item/assembly/flash/handheld
+	l_pocket = /obj/item/restraints/handcuffs
+	backpack_contents = list(/obj/item/melee/classic_baton=1)
+
+	backpack = /obj/item/storage/backpack/security
+	satchel = /obj/item/storage/backpack/satchel/sec
+	duffelbag = /obj/item/storage/backpack/duffelbag/sec
+	courierbag = /obj/item/storage/backpack/messenger/sec
+	box = /obj/item/storage/box/survival/vi
+
+	chameleon_extras = /obj/item/stamp/nanotrasen/vigilitas/security
+
 // Security Officer
 /datum/outfit/job/nanotrasen/security
 	name = "Nanotrasen - Security Officer"
@@ -175,6 +225,28 @@
 	chameleon_extras = list(/obj/item/gun/energy/disabler, /obj/item/clothing/glasses/hud/security/sunglasses, /obj/item/clothing/head/helmet)
 	//The helmet is necessary because /obj/item/clothing/head/helmet/sec is overwritten in the chameleon list by the standard helmet, which has the same name and icon state
 
+/datum/outfit/job/nanotrasen/security/vi
+	name = "Nanotrasen - Security Officer (Vigilatis Interstellar)"
+	job_icon = "securityofficer"
+
+	ears = /obj/item/radio/headset/alt
+	uniform = /obj/item/clothing/under/nanotrasen/security
+	gloves = /obj/item/clothing/gloves/color/black
+	head = /obj/item/clothing/head/nanotrasen/cap/security
+	suit = null
+	alt_suit = null
+	dcoat = /obj/item/clothing/suit/hooded/wintercoat/security
+	shoes = /obj/item/clothing/shoes/jackboots
+	l_pocket = /obj/item/restraints/handcuffs
+
+	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
+	box = /obj/item/storage/box/survival/vi
+
+	chameleon_extras = null
+
 /datum/outfit/job/nanotrasen/security/disarmed
 	name = "Nanotrasen - Security Officer (Disarmed)"
 	jobtype = /datum/job/officer
diff --git a/code/modules/clothing/shoes/heels.dm b/code/modules/clothing/shoes/heels.dm
new file mode 100644
index 0000000000..d318c9444b
--- /dev/null
+++ b/code/modules/clothing/shoes/heels.dm
@@ -0,0 +1,128 @@
+/obj/item/clothing/shoes/heels
+	name = "heels"
+	desc = "A pair of shoes, for those who wish to look more formal. Your calves hurt just looking at them."
+	icon_state = "heels-white"
+	item_state = "heels-white"
+	icon = 'icons/obj/clothing/feet/color.dmi'
+	mob_overlay_icon = 'icons/mob/clothing/feet/color.dmi'
+	supports_variations = DIGITIGRADE_VARIATION | VOX_VARIATION | KEPORI_VARIATION
+	custom_price = 20
+	cold_protection = FEET
+	min_cold_protection_temperature = SHOES_MIN_TEMP_PROTECT
+	heat_protection = FEET
+	max_heat_protection_temperature = SHOES_MAX_TEMP_PROTECT
+	unique_reskin = list("white heels" = "heels-white",
+						"grey heels" = "heels-grey",
+						"black heels" = "heels-black",
+						"red heels" = "heels-red",
+						"maroon heels" = "heels-maroon",
+						"orange heels" = "heels-orange",
+						"yellow heels" = "heels-yellow",
+						"green heels" = "heels-green",
+						"dark green heels" = "heels-darkgreen",
+						"teal heels" = "heels-teal",
+						"blue heels" = "heels-blue",
+						"dark blue heels" = "heels-darkblue",
+						"purple heels" = "heels-purple",
+						"pink heels" = "heels-pink",
+						"brown heels" = "heels-brown",
+						"light brown heels" = "heels-lightbrown"
+						)
+	unique_reskin_changes_base_icon_state = TRUE
+	unique_reskin_changes_name = TRUE
+
+/obj/item/clothing/shoes/heels/white
+	name = "white heels"
+	desc = "A pair of white heels."
+	icon_state = "heels-white"
+	current_skin = "white heels"
+
+/obj/item/clothing/shoes/heels/grey
+	name = "grey heels"
+	desc = "A pair of grey heels."
+	icon_state = "heels-grey"
+	current_skin = "grey heels"
+
+/obj/item/clothing/shoes/heels/black
+	name = "black heels"
+	desc = "A pair of black heels."
+	icon_state = "heels-black"
+	current_skin = "black heels"
+
+/obj/item/clothing/shoes/heels/red
+	name = "red heels"
+	desc = "Stylish red heels."
+	icon_state = "heels-red"
+	current_skin = "red heels"
+
+/obj/item/clothing/shoes/heels/maroon
+	name = "maroon heels"
+	desc = "Stylish maroon heels."
+	icon_state = "heels-maroon"
+	current_skin = "maroon heels"
+
+/obj/item/clothing/shoes/heels/orange
+	name = "orange heels"
+	desc = "A pair of orange heels."
+	icon_state = "heels-orange"
+	current_skin = "orange heels"
+
+/obj/item/clothing/shoes/heels/yellow
+	name = "yellow heels"
+	desc = "A pair of yellow heels."
+	icon_state = "heels-yellow"
+	current_skin = "yellow heels"
+
+/obj/item/clothing/shoes/heels/green
+	name = "green heels"
+	desc = "A pair of green heels."
+	icon_state = "heels-green"
+	current_skin = "green heels"
+
+/obj/item/clothing/shoes/heels/darkgreen
+	name = "dark green heels"
+	desc = "A pair of dark green heels."
+	icon_state = "heels-darkgreen"
+	current_skin = "dark green heels"
+
+/obj/item/clothing/shoes/heels/teal
+	name = "teal heels"
+	desc = "A pair of teal heels."
+	icon_state = "heels-teal"
+	current_skin = "teal heels"
+
+/obj/item/clothing/shoes/heels/blue
+	name = "blue heels"
+	desc = "A pair of blue heels."
+	icon_state = "heels-blue"
+	current_skin = "blue heels"
+
+/obj/item/clothing/shoes/heels/darkblue
+	name = "dark blue heels"
+	desc = "A pair of dark blue heels."
+	icon_state = "heels-darkblue"
+	current_skin = "dark blue heels"
+
+/obj/item/clothing/shoes/heels/purple
+	name = "purple heels"
+	desc = "A pair of purple heels."
+	icon_state = "heels-purple"
+	current_skin = "purple heels"
+
+/obj/item/clothing/shoes/heels/pink
+	name = "pink heels"
+	desc = "A pair of pink heels."
+	icon_state = "heels-pink"
+	current_skin = "pink heels"
+
+/obj/item/clothing/shoes/heels/brown
+	name = "brown heels"
+	desc = "A pair of brown heels."
+	icon_state = "heels-brown"
+	current_skin = "brown heels"
+
+/obj/item/clothing/shoes/heels/lightbrown
+	name = "light brown heels"
+	desc = "A pair of light brown heels."
+	icon_state = "heels-lightbrown"
+	current_skin = "light brown heels"
diff --git a/code/modules/clothing/spacesuits/hardsuit.dm b/code/modules/clothing/spacesuits/hardsuit.dm
index bd38c3db41..d6bc1aabcc 100644
--- a/code/modules/clothing/spacesuits/hardsuit.dm
+++ b/code/modules/clothing/spacesuits/hardsuit.dm
@@ -325,6 +325,7 @@
 	hardsuit_type = "nsmining"
 	resistance_flags = FIRE_PROOF | ACID_PROOF
 	armor = list("melee" = 65, "bullet" = 30, "laser" = 25, "energy" = 30, "bomb" = 70, "bio" = 100, "rad" = 85, "fire" = 100, "acid" = 100)
+	supports_variations = KEPORI_VARIATION
 
 /obj/item/clothing/head/helmet/space/hardsuit/mining/heavy/ns
 	name = "N+S mining hardsuit helmet"
@@ -334,6 +335,7 @@
 	hardsuit_type = "nsmining"
 	resistance_flags = FIRE_PROOF | ACID_PROOF
 	armor = list("melee" = 65, "bullet" = 30, "laser" = 25, "energy" = 30, "bomb" = 70, "bio" = 100, "rad" = 85, "fire" = 100, "acid" = 100)
+	supports_variations = KEPORI_VARIATION
 
 	//Syndicate hardsuit
 /obj/item/clothing/head/helmet/space/hardsuit/syndi
diff --git a/code/modules/clothing/under/pants.dm b/code/modules/clothing/under/pants.dm
index 2c53a70ad1..4bec1d768f 100644
--- a/code/modules/clothing/under/pants.dm
+++ b/code/modules/clothing/under/pants.dm
@@ -107,3 +107,18 @@
 	name = "camo pants"
 	desc = "A pair of woodland camouflage pants. Probably not the best choice for deep space."
 	icon_state = "camopants"
+
+/obj/item/clothing/under/pants/pajamared
+	name = "camo pants"
+	desc = "A comfy pair of pajamas. Probably not the best for work attire."
+	icon_state = "pajamared"
+
+/obj/item/clothing/under/pants/pajamablue
+	name = "blue pajama pants"
+	desc = "A comfy pair of pajamas. Probably not the best for work attire."
+	icon_state = "pajamablue"
+
+/obj/item/clothing/under/pants/pajamagreen
+	name = "green pajama pants"
+	desc = "A comfy pair of pajamas. Probably not the best for work attire."
+	icon_state = "pajamagreen"
diff --git a/code/modules/clothing/under/shorts.dm b/code/modules/clothing/under/shorts.dm
index 429d52ce6f..0414ec5862 100644
--- a/code/modules/clothing/under/shorts.dm
+++ b/code/modules/clothing/under/shorts.dm
@@ -6,8 +6,17 @@
 	supports_variations = DIGITIGRADE_VARIATION | VOX_VARIATION
 	icon = 'icons/obj/clothing/under/shorts_pants.dmi'
 	mob_overlay_icon = 'icons/mob/clothing/under/shorts_pants.dmi'
-	greyscale_colors = list(list(16, 11), list(16, 10), list(16, 9))
-	greyscale_icon_state = "shorts"
+	icon_state = "greyshorts"
+	unique_reskin = list("red athletic shorts" = "redshorts",
+						"green athletic shorts" = "greenshorts",
+						"blue athletic shorts" = "blueshorts",
+						"black athletic shorts" = "blackshorts",
+						"grey athletic shorts" = "greyshorts",
+						"purple athletic shorts" = "purpleshorts",
+						"pink athletic shorts" = "pinkshorts",
+						)
+	unique_reskin_changes_base_icon_state = TRUE
+	unique_reskin_changes_name = TRUE
 
 /obj/item/clothing/under/shorts/red
 	name = "red athletic shorts"
@@ -33,6 +42,10 @@
 	name = "purple athletic shorts"
 	icon_state = "purpleshorts"
 
+/obj/item/clothing/under/shorts/pink
+	name = "pink athletic shorts"
+	icon_state = "pinkshorts"
+
 /obj/item/clothing/under/shorts/cookjorts
 	name = "grilling shorts"
 	desc = "For when all you want in life is to grill for god's sake!"
diff --git a/code/modules/food_and_drinks/drinks/drinks/bottle.dm b/code/modules/food_and_drinks/drinks/drinks/bottle.dm
index afa588b745..1157a10499 100644
--- a/code/modules/food_and_drinks/drinks/drinks/bottle.dm
+++ b/code/modules/food_and_drinks/drinks/drinks/bottle.dm
@@ -185,10 +185,6 @@
 	list_reagents = list(/datum/reagent/water/holywater = 100)
 	foodtype = NONE
 
-/obj/item/reagent_containers/food/drinks/bottle/holywater/hell
-	desc = "A flask of holy water...it's been sitting in the Necropolis a while though."
-	list_reagents = list(/datum/reagent/hellwater = 100)
-
 /obj/item/reagent_containers/food/drinks/bottle/vermouth
 	name = "Whitespear Dry Vermouth"
 	desc = "Dry and sweet vermouth, commonly used for mixed drinks. Some Solarians drink it as a digestive before meals."
diff --git a/code/modules/food_and_drinks/recipes/drinks_recipes.dm b/code/modules/food_and_drinks/recipes/drinks_recipes.dm
index cbaf24e8c9..2066506e6c 100644
--- a/code/modules/food_and_drinks/recipes/drinks_recipes.dm
+++ b/code/modules/food_and_drinks/recipes/drinks_recipes.dm
@@ -651,7 +651,7 @@
 
 /datum/chemical_reaction/molten_bubbles
 	results = list(/datum/reagent/consumable/molten = 30)
-	required_reagents = list(/datum/reagent/clf3 = 10, /datum/reagent/consumable/space_cola = 20, /datum/reagent/medicine/leporazine = 1, /datum/reagent/medicine/lavaland_extract = 1)
+	required_reagents = list(/datum/reagent/clf3 = 10, /datum/reagent/consumable/space_cola = 20, /datum/reagent/medicine/leporazine = 1, /datum/reagent/medicine/hunter_extract = 1)
 
 /datum/chemical_reaction/plasma_bubbles
 	results = list(/datum/reagent/consumable/molten/plasma_fizz = 3)
diff --git a/code/modules/hydroponics/grown/ambrosia.dm b/code/modules/hydroponics/grown/ambrosia.dm
index 09a31d99fc..a4de7ccd4e 100644
--- a/code/modules/hydroponics/grown/ambrosia.dm
+++ b/code/modules/hydroponics/grown/ambrosia.dm
@@ -24,7 +24,7 @@
 	icon_dead = "ambrosia-dead"
 	genes = list(/datum/plant_gene/trait/repeated_harvest)
 	mutatelist = list(/obj/item/seeds/ambrosia/deus)
-	reagents_add = list(/datum/reagent/drug/space_drugs = 0.15, /datum/reagent/medicine/bicaridine = 0.1, /datum/reagent/medicine/kelotane = 0.1, /datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.05, /datum/reagent/toxin = 0.1)
+	reagents_add = list(/datum/reagent/drug/space_drugs = 0.15, /datum/reagent/medicine/indomide = 0.1, /datum/reagent/medicine/alvitane = 0.1, /datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.05, /datum/reagent/toxin = 0.1)
 
 /obj/item/food/grown/ambrosia/vulgaris
 	seed = /obj/item/seeds/ambrosia
@@ -41,7 +41,7 @@
 	plantname = "Ambrosia Deus"
 	product = /obj/item/food/grown/ambrosia/deus
 	mutatelist = list(/obj/item/seeds/ambrosia/gaia)
-	reagents_add = list(/datum/reagent/medicine/omnizine = 0.15, /datum/reagent/medicine/synaptizine = 0.15, /datum/reagent/drug/space_drugs = 0.1, /datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.05)
+	reagents_add = list(/datum/reagent/medicine/panacea = 0.15, /datum/reagent/medicine/synaptizine = 0.15, /datum/reagent/drug/space_drugs = 0.1, /datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.05)
 	rarity = 40
 	research = PLANT_RESEARCH_TIER_2
 
diff --git a/code/modules/hydroponics/grown/berries.dm b/code/modules/hydroponics/grown/berries.dm
index 3b5b0bd885..f97ea9d3b8 100644
--- a/code/modules/hydroponics/grown/berries.dm
+++ b/code/modules/hydroponics/grown/berries.dm
@@ -237,7 +237,7 @@
 	species = "greengrape"
 	plantname = "Green-Grape Vine"
 	product = /obj/item/food/grown/grapes/green
-	reagents_add = list(/datum/reagent/medicine/kelotane = 0.2, /datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.1, /datum/reagent/consumable/sugar = 0.1)
+	reagents_add = list(/datum/reagent/medicine/alvitane = 0.2, /datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.1, /datum/reagent/consumable/sugar = 0.1)
 	// No rarity: technically it's a beneficial mutant, but it's not exactly "new"...
 	mutatelist = list()
 	research = PLANT_RESEARCH_TIER_0//see above
diff --git a/code/modules/hydroponics/grown/cannabis.dm b/code/modules/hydroponics/grown/cannabis.dm
index e82802745a..b786be6943 100644
--- a/code/modules/hydroponics/grown/cannabis.dm
+++ b/code/modules/hydroponics/grown/cannabis.dm
@@ -51,7 +51,7 @@
 	plantname = "Lifeweed"
 	product = /obj/item/food/grown/cannabis/white
 	mutatelist = list()
-	reagents_add = list(/datum/reagent/medicine/omnizine = 0.35, /datum/reagent/drug/space_drugs = 0.15, /datum/reagent/toxin/lipolicide = 0.15)
+	reagents_add = list(/datum/reagent/medicine/panacea = 0.35, /datum/reagent/drug/space_drugs = 0.15, /datum/reagent/toxin/lipolicide = 0.15)
 	rarity = 40
 	research = PLANT_RESEARCH_TIER_3
 
diff --git a/code/modules/hydroponics/grown/cocoa_vanilla.dm b/code/modules/hydroponics/grown/cocoa_vanilla.dm
index 21f6994fd9..4ba942ff2f 100644
--- a/code/modules/hydroponics/grown/cocoa_vanilla.dm
+++ b/code/modules/hydroponics/grown/cocoa_vanilla.dm
@@ -38,7 +38,7 @@
 	product = /obj/item/food/grown/vanillapod
 	genes = list(/datum/plant_gene/trait/repeated_harvest)
 	mutatelist = list()
-	reagents_add = list(/datum/reagent/consumable/vanilla = 0.25, /datum/reagent/consumable/nutriment = 0.1, /datum/reagent/medicine/antitoxin = 0.2)
+	reagents_add = list(/datum/reagent/consumable/vanilla = 0.25, /datum/reagent/consumable/nutriment = 0.1)
 	research = PLANT_RESEARCH_TIER_0 //nothing new, technically
 
 /obj/item/food/grown/vanillapod
diff --git a/code/modules/hydroponics/grown/flowers.dm b/code/modules/hydroponics/grown/flowers.dm
index d43cae2aa0..86358e79b2 100644
--- a/code/modules/hydroponics/grown/flowers.dm
+++ b/code/modules/hydroponics/grown/flowers.dm
@@ -15,7 +15,7 @@
 	icon_grow = "poppy-grow"
 	icon_dead = "poppy-dead"
 	mutatelist = list(/obj/item/seeds/poppy/geranium, /obj/item/seeds/poppy/lily)
-	reagents_add = list(/datum/reagent/medicine/bicaridine = 0.2, /datum/reagent/consumable/nutriment = 0.05)
+	reagents_add = list(/datum/reagent/medicine/indomide = 0.2, /datum/reagent/consumable/nutriment = 0.05)
 
 /obj/item/food/grown/poppy
 	seed = /obj/item/seeds/poppy
diff --git a/code/modules/hydroponics/grown/nettle.dm b/code/modules/hydroponics/grown/nettle.dm
index 1a91acc8a5..3f6d813322 100644
--- a/code/modules/hydroponics/grown/nettle.dm
+++ b/code/modules/hydroponics/grown/nettle.dm
@@ -11,7 +11,7 @@
 	growthstages = 5
 	genes = list(/datum/plant_gene/trait/repeated_harvest, /datum/plant_gene/trait/plant_type/weed_hardy, /datum/plant_gene/trait/attack/nettle_attack, /datum/plant_gene/trait/backfire/nettle_burn)
 	mutatelist = list(/obj/item/seeds/nettle/death)
-	reagents_add = list(/datum/reagent/toxin/acid = 0.5)
+	reagents_add = list(/datum/reagent/toxin/acid = 0.5, /datum/reagent/medicine/neoxanthin = 0.25)
 
 /obj/item/seeds/nettle/Initialize(mapload,nogenes)
 	. = ..()
@@ -50,7 +50,7 @@
 	bite_consumption_mod = 2
 	lefthand_file = 'icons/mob/inhands/weapons/plants_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/weapons/plants_righthand.dmi'
-	damtype = "fire"
+	damtype = BURN
 	force = 15
 	hitsound = 'sound/weapons/bladeslice.ogg'
 	throwforce = 5
diff --git a/code/modules/hydroponics/grown/replicapod.dm b/code/modules/hydroponics/grown/replicapod.dm
index 611de0ce5c..437bd7f2ae 100644
--- a/code/modules/hydroponics/grown/replicapod.dm
+++ b/code/modules/hydroponics/grown/replicapod.dm
@@ -84,9 +84,6 @@
 				else
 					if(M.ckey == ckey && M.stat == DEAD)
 						make_podman = TRUE
-						if(isliving(M))
-							var/mob/living/L = M
-							make_podman = !L.hellbound
 						break
 		else //If the player has ghosted from his corpse before blood was drawn, his ckey is no longer attached to the mob, so we need to match up the cloned player through the mind key
 			for(var/mob/M in GLOB.player_list)
@@ -96,9 +93,6 @@
 						if(!O.can_reenter_corpse)
 							break
 					make_podman = TRUE
-					if(isliving(M))
-						var/mob/living/L = M
-						make_podman = !L.hellbound
 					ckey_holder = M.ckey
 					break
 
diff --git a/code/modules/instruments/items.dm b/code/modules/instruments/items.dm
index 8ba2d38a33..a9f2bab5ca 100644
--- a/code/modules/instruments/items.dm
+++ b/code/modules/instruments/items.dm
@@ -80,6 +80,7 @@
 	slot_flags = ITEM_SLOT_EARS | ITEM_SLOT_HEAD
 	force = 0
 	w_class = WEIGHT_CLASS_SMALL
+	alternate_worn_layer = UNDER_HEAD_LAYER
 	custom_price = 125
 	instrument_range = 1
 
diff --git a/code/modules/mining/equipment/explorer_gear.dm b/code/modules/mining/equipment/explorer_gear.dm
index 53159d0c06..5e44b85f51 100644
--- a/code/modules/mining/equipment/explorer_gear.dm
+++ b/code/modules/mining/equipment/explorer_gear.dm
@@ -41,21 +41,9 @@
 	visor_flags = BLOCK_GAS_SMOKE_EFFECT | ALLOWINTERNALS
 	visor_flags_inv = HIDEFACIALHAIR
 	visor_flags_cover = MASKCOVERSMOUTH
-	actions_types = list(/datum/action/item_action/adjust)
 	armor = list("melee" = 0, "bullet" = 5, "laser" = 5, "energy" = 5, "bomb" = 0, "bio" = 50, "rad" = 0, "fire" = 20, "acid" = 40)
 	resistance_flags = FIRE_PROOF
 
-/obj/item/clothing/mask/gas/explorer/attack_self(mob/user)
-	adjustmask(user)
-
-/obj/item/clothing/mask/gas/explorer/adjustmask(user)
-	..()
-	w_class = mask_adjusted ? WEIGHT_CLASS_NORMAL : WEIGHT_CLASS_SMALL
-
-/obj/item/clothing/mask/gas/explorer/folded/Initialize()
-	. = ..()
-	adjustmask()
-
 /obj/item/clothing/suit/space/hostile_environment
 	name = "H.E.C.K. suit"
 	desc = "Hostile Environment Cross-Kinetic Suit: A suit overdesigned at great expense to withstand the wide variety of hazards from the outer frontier. It wasn't enough for its last owner."
diff --git a/code/modules/mining/ore_veins.dm b/code/modules/mining/ore_veins.dm
index cc3b4ba57d..3654c3830d 100644
--- a/code/modules/mining/ore_veins.dm
+++ b/code/modules/mining/ore_veins.dm
@@ -209,9 +209,7 @@ GLOBAL_LIST_EMPTY(ore_veins)
 	ore_list = list(
 		/obj/item/stack/ore/iron = 10,
 		/obj/item/stack/ore/plasma = 10,
-		/obj/item/stack/ore/diamond = 1,
-		/obj/item/stack/ore/gold = 2,
-		/obj/item/stack/ore/bluespace_crystal = 1,
+		/obj/item/stack/ore/gold = 1,
 		)
 	max_mobs = 2
 	mob_types = list(
@@ -223,7 +221,7 @@ GLOBAL_LIST_EMPTY(ore_veins)
 		)
 
 /obj/structure/vein/lavaland/classtwo/rare
-	mining_charges = 12
+	mining_charges = 8
 	vein_class = 2
 	ore_list = list(
 		/obj/item/stack/ore/plasma = 20,
@@ -236,11 +234,9 @@ GLOBAL_LIST_EMPTY(ore_veins)
 	mining_charges = 10
 	vein_class = 3
 	ore_list = list(
-		/obj/item/stack/ore/iron = 4,
-		/obj/item/stack/ore/plasma = 5,
-		/obj/item/stack/ore/diamond = 1,
-		/obj/item/stack/ore/gold = 2,
-		/obj/item/stack/ore/bluespace_crystal = 1,
+		/obj/item/stack/ore/iron = 6,
+		/obj/item/stack/ore/plasma = 6,
+		/obj/item/stack/ore/gold = 1,
 		)
 	max_mobs = 3 //Best not to go past 6 due to balance and lag reasons
 	spawn_time = 8 SECONDS
@@ -253,7 +249,7 @@ GLOBAL_LIST_EMPTY(ore_veins)
 		)
 
 /obj/structure/vein/lavaland/classthree/rare
-	mining_charges = 14
+	mining_charges = 10
 	vein_class = 3
 	ore_list = list(
 		/obj/item/stack/ore/plasma = 10,
@@ -282,12 +278,11 @@ GLOBAL_LIST_EMPTY(ore_veins)
 	//Alongside being a much more reliable source of plasma
 	ore_list = list(
 		/obj/item/stack/ore/iron = 20,
-		/obj/item/stack/ore/gold = 20,
+		/obj/item/stack/ore/gold = 5,
 		/obj/item/stack/ore/titanium = 15,
 		/obj/item/stack/ore/plasma = 10,
 		/obj/item/stack/ore/silver = 10,
 		/obj/item/stack/ore/uranium = 10,
-		/obj/item/stack/ore/bluespace_crystal = 1,
 		/obj/item/stack/ore/ice = 7,
 		)
 
@@ -295,20 +290,19 @@ GLOBAL_LIST_EMPTY(ore_veins)
 	mining_charges = 8
 	vein_class = 2
 	ore_list = list(
-		/obj/item/stack/ore/iron = 10,
-		/obj/item/stack/ore/gold = 10,
+		/obj/item/stack/ore/iron = 15,
+		/obj/item/stack/ore/gold = 5,
 		/obj/item/stack/ore/titanium = 5,
 		/obj/item/stack/ore/plasma = 5,
-		/obj/item/stack/ore/silver = 5,
+		/obj/item/stack/ore/silver = 10,
 		/obj/item/stack/ore/uranium = 5,
-		/obj/item/stack/ore/bluespace_crystal = 1,
 		/obj/item/stack/ore/ice = 8,
 		)
 	max_mobs = 6
 	spawn_time = 10 SECONDS
 
 /obj/structure/vein/ice/classtwo/rare
-	mining_charges = 12
+	mining_charges = 8
 	vein_class = 2
 	ore_list = list(
 		/obj/item/stack/ore/ice = 10,
@@ -319,19 +313,18 @@ GLOBAL_LIST_EMPTY(ore_veins)
 	vein_class = 3
 	ore_list = list(
 		/obj/item/stack/ore/iron = 2,
-		/obj/item/stack/ore/gold = 5,
+		/obj/item/stack/ore/gold = 2,
 		/obj/item/stack/ore/titanium = 5,
 		/obj/item/stack/ore/plasma = 5,
 		/obj/item/stack/ore/silver = 5,
 		/obj/item/stack/ore/uranium = 5,
-		/obj/item/stack/ore/bluespace_crystal = 4,
 		/obj/item/stack/ore/ice = 8,
 		)
 	max_mobs = 6
 	spawn_time = 8 SECONDS
 
 /obj/structure/vein/ice/classthree/rare
-	mining_charges = 14
+	mining_charges = 10
 	vein_class = 3
 	ore_list = list(
 		/obj/item/stack/ore/ice = 10,
@@ -363,13 +356,11 @@ GLOBAL_LIST_EMPTY(ore_veins)
 		/mob/living/simple_animal/hostile/poison/giant_spider/tarantula = 1,
 	)
 
-	//same surface ore drop rate too...
 	ore_list = list(
 		/obj/item/stack/ore/iron = 50,
-		/obj/item/stack/ore/gold = 30,
-		/obj/item/stack/ore/silver = 20,
+		/obj/item/stack/ore/gold = 5,
+		/obj/item/stack/ore/silver = 15,
 		/obj/item/stack/ore/uranium = 10,
-		/obj/item/stack/ore/diamond = 10,
 		/obj/item/stack/ore/titanium = 1,
 		)
 
@@ -387,18 +378,17 @@ GLOBAL_LIST_EMPTY(ore_veins)
 		/mob/living/simple_animal/hostile/jungle/mook = 1,
 	)
 	ore_list = list(
-		/obj/item/stack/ore/iron = 40,
-		/obj/item/stack/ore/gold = 20,
+		/obj/item/stack/ore/iron = 50,
+		/obj/item/stack/ore/gold = 5,
 		/obj/item/stack/ore/silver = 10,
 		/obj/item/stack/ore/uranium = 10,
-		/obj/item/stack/ore/diamond = 10,
 		/obj/item/stack/ore/titanium = 4,
 		)
 	max_mobs = 2
 	spawn_time = 15 SECONDS
 
 /obj/structure/vein/jungle/classtwo/rare
-	mining_charges = 12
+	mining_charges = 8
 	vein_class = 2
 	ore_list = list(
 		/obj/item/stack/ore/gold = 10,
@@ -418,9 +408,8 @@ GLOBAL_LIST_EMPTY(ore_veins)
 	ore_list = list(
 		/obj/item/stack/ore/iron = 10,
 		/obj/item/stack/ore/uranium = 10,
-		/obj/item/stack/ore/gold = 10,
+		/obj/item/stack/ore/gold = 5,
 		/obj/item/stack/ore/silver = 10,
-		/obj/item/stack/ore/diamond = 10,
 		/obj/item/stack/ore/titanium = 4,
 		)
 	//jungle mobs are kind of fucking hard, less max
@@ -428,7 +417,7 @@ GLOBAL_LIST_EMPTY(ore_veins)
 	spawn_time = 10 SECONDS
 
 /obj/structure/vein/jungle/classthree/rare
-	mining_charges = 14
+	mining_charges = 10
 	vein_class = 3
 	ore_list = list(
 		/obj/item/stack/ore/gold = 10,
@@ -449,7 +438,6 @@ GLOBAL_LIST_EMPTY(ore_veins)
 		/obj/item/stack/ore/titanium = 20,
 		/obj/item/stack/ore/plasma = 10,
 		/obj/item/stack/ore/uranium = 1,
-		/obj/item/stack/ore/diamond = 1,
 		)
 
 /obj/structure/vein/sand/classtwo
@@ -467,7 +455,6 @@ GLOBAL_LIST_EMPTY(ore_veins)
 		/obj/item/stack/ore/titanium = 10,
 		/obj/item/stack/ore/plasma = 5,
 		/obj/item/stack/ore/uranium = 4,
-		/obj/item/stack/ore/diamond = 4,
 		)
 	max_mobs = 6
 	spawn_time = 10 SECONDS
@@ -486,11 +473,10 @@ GLOBAL_LIST_EMPTY(ore_veins)
 	vein_class = 3
 
 	ore_list = list(
-		/obj/item/stack/ore/iron = 10,
+		/obj/item/stack/ore/iron = 20,
 		/obj/item/stack/ore/titanium = 5,
 		/obj/item/stack/ore/plasma = 5,
 		/obj/item/stack/ore/uranium = 6,
-		/obj/item/stack/ore/diamond = 6,
 		)
 
 	max_mobs = 6
@@ -519,8 +505,6 @@ GLOBAL_LIST_EMPTY(ore_veins)
 		/obj/item/stack/ore/iron = 80,
 		/obj/item/stack/ore/uranium = 5,
 		/obj/item/stack/ore/gold = 4,
-		/obj/item/stack/ore/diamond = 1,
-		/obj/item/stack/ore/bluespace_crystal = 1,
 		)
 
 /obj/structure/vein/rockplanet/classtwo
@@ -537,8 +521,6 @@ GLOBAL_LIST_EMPTY(ore_veins)
 		/obj/item/stack/ore/iron = 60,
 		/obj/item/stack/ore/uranium = 5,
 		/obj/item/stack/ore/gold = 4,
-		/obj/item/stack/ore/diamond = 1,
-		/obj/item/stack/ore/bluespace_crystal = 1,
 		)
 
 	max_mobs = 3
@@ -557,11 +539,9 @@ GLOBAL_LIST_EMPTY(ore_veins)
 		)
 
 	ore_list = list(
-		/obj/item/stack/ore/iron = 20,
+		/obj/item/stack/ore/iron = 30,
 		/obj/item/stack/ore/uranium = 5,
 		/obj/item/stack/ore/gold = 6,
-		/obj/item/stack/ore/diamond = 5,
-		/obj/item/stack/ore/bluespace_crystal = 4,
 		)
 
 	max_mobs = 3
@@ -582,9 +562,7 @@ GLOBAL_LIST_EMPTY(ore_veins)
 	ore_list = list(
 		/obj/item/stack/ore/iron = 20,
 		/obj/item/stack/ore/uranium = 5,
-		/obj/item/stack/ore/gold = 6,
-		/obj/item/stack/ore/diamond = 5,
-		/obj/item/stack/ore/bluespace_crystal = 4,
+		/obj/item/stack/ore/gold = 3,
 		)
 
 //moons, have a dupe of asteroid but less of an emphasis on  goliaths
@@ -598,14 +576,11 @@ GLOBAL_LIST_EMPTY(ore_veins)
 		/mob/living/simple_animal/hostile/carp = 20,
 		)
 
-	//same surface ore drop rate too...
 	ore_list = list(
 		/obj/item/stack/ore/iron = 40,
 		/obj/item/stack/ore/titanium = 20,
-		/obj/item/stack/ore/bluespace_crystal = 5,
-		/obj/item/stack/ore/gold = 5,
+		/obj/item/stack/ore/gold = 2,
 		/obj/item/stack/ore/uranium = 2,
-		/obj/item/stack/ore/diamond = 1,
 		)
 
 /obj/structure/vein/moon/classtwo
@@ -624,10 +599,8 @@ GLOBAL_LIST_EMPTY(ore_veins)
 	ore_list = list(
 		/obj/item/stack/ore/iron = 30,
 		/obj/item/stack/ore/titanium = 10,
-		/obj/item/stack/ore/bluespace_crystal = 7,
-		/obj/item/stack/ore/gold = 7,
+		/obj/item/stack/ore/gold = 5,
 		/obj/item/stack/ore/uranium = 5,
-		/obj/item/stack/ore/diamond = 2,
 		)
 	max_mobs = 3
 	spawn_time = 10 SECONDS
@@ -647,10 +620,8 @@ GLOBAL_LIST_EMPTY(ore_veins)
 	ore_list = list(
 		/obj/item/stack/ore/iron = 15,
 		/obj/item/stack/ore/titanium = 10,
-		/obj/item/stack/ore/bluespace_crystal = 7,
-		/obj/item/stack/ore/gold = 7,
+		/obj/item/stack/ore/gold = 5,
 		/obj/item/stack/ore/uranium = 7,
-		/obj/item/stack/ore/diamond = 5,
 		)
 
 	max_mobs = 3
@@ -843,7 +814,7 @@ GLOBAL_LIST_EMPTY(ore_veins)
 	spawn_time = 10 SECONDS
 
 /obj/structure/vein/asteroid/classtwo/rare
-	mining_charges = 12
+	mining_charges = 8
 	vein_class = 2
 	ore_list = list(
 		/obj/item/stack/ore/ice = 10,
@@ -875,7 +846,7 @@ GLOBAL_LIST_EMPTY(ore_veins)
 	spawn_time = 8 SECONDS
 
 /obj/structure/vein/asteroid/classthree/rare
-	mining_charges = 14
+	mining_charges = 10
 	vein_class = 3
 	ore_list = list(
 		/obj/item/stack/ore/ice = 10,
diff --git a/code/modules/missions/mission.dm b/code/modules/missions/mission.dm
index 63c0b4a618..7fcf62e453 100644
--- a/code/modules/missions/mission.dm
+++ b/code/modules/missions/mission.dm
@@ -22,7 +22,7 @@
 	var/requires_poi = TRUE
 
 	/// The amount of time in which to complete the mission. Setting it to 0 will result in no time limit
-	var/duration = 1.5 HOURS
+	var/duration = 2 HOURS
 	/// Should mission value scale proportionally to the deviation from the mission's base duration?
 	var/dur_value_scaling = FALSE
 	/// The maximum deviation of the mission's true value from the base value, as a proportion.
diff --git a/code/modules/missions/outpost/_outpost.dm b/code/modules/missions/outpost/_outpost.dm
index 82dbdb89e0..370071c41a 100644
--- a/code/modules/missions/outpost/_outpost.dm
+++ b/code/modules/missions/outpost/_outpost.dm
@@ -60,7 +60,7 @@
 		"value" = src.value,
 		"duration" = src.duration,
 		"remaining" = time_remaining,
-		"timeStr" = time2text(time_remaining, "mm:ss"),
+		"timeStr" = time2text(time_remaining, "hh:mm:ss"),
 		"progressStr" = get_progress_string(),
 		"actStr" = act_str
 	)
diff --git a/code/modules/missions/outpost/acquire_mission.dm b/code/modules/missions/outpost/acquire_mission.dm
index b3d3cf4342..79d0c4bcd1 100644
--- a/code/modules/missions/outpost/acquire_mission.dm
+++ b/code/modules/missions/outpost/acquire_mission.dm
@@ -73,7 +73,7 @@
 	name = ""
 	desc = ""
 	value = 1500
-	duration = 60 MINUTES
+	duration = 90 MINUTES
 	weight = 6
 	container_type = /obj/structure/closet/mob_capture
 	objective_type = /mob/living/simple_animal/hostile/asteroid/goliath
diff --git a/code/modules/missions/outpost/drill_mission.dm b/code/modules/missions/outpost/drill_mission.dm
index 948c9a3c7c..7c9fcf1144 100644
--- a/code/modules/missions/outpost/drill_mission.dm
+++ b/code/modules/missions/outpost/drill_mission.dm
@@ -7,7 +7,7 @@
 			Please anchor the drill in place and defend it until it has gathered enough samples. \
 			Operation of the core sampling drill is extremely dangerous, caution is advised. "
 	value = 2500
-	duration = 90 MINUTES
+	duration = 135 MINUTES
 	weight = 11
 
 	var/datum/planet_type/selected_planet
@@ -102,7 +102,7 @@
 	name = "Class 3 core sample mission"
 	value = 8000
 	weight = 5
-	duration = 120 MINUTES
+	duration = 180 MINUTES
 	class_wanted = 3
 	num_wanted = 8
 
@@ -116,7 +116,7 @@
 			Not much information on these planets are known, caution is advised. \
 			A punchcard will be provided to locate the planet, as it is impossible to find otherwise. "
 	value = 3000
-	duration = 90 MINUTES
+	duration = 135 MINUTES
 	weight = 4
 
 	available_planets = list(
@@ -164,7 +164,7 @@
 	name = "Class 3 rare core sample mission"
 	value = 6500
 	weight = 2
-	duration = 120 MINUTES
+	duration = 180 MINUTES
 	class_wanted = 3
 	num_wanted = 10
 	available_planets = list(
diff --git a/code/modules/missions/outpost/garden_scan.dm b/code/modules/missions/outpost/garden_scan.dm
index bfae9439b8..b8a7ae4055 100644
--- a/code/modules/missions/outpost/garden_scan.dm
+++ b/code/modules/missions/outpost/garden_scan.dm
@@ -56,7 +56,7 @@
 	desc = ""
 	value = 1500
 	weight = 10
-	duration = 60 MINUTES
+	duration = 90 MINUTES
 	scanner_type = /obj/item/survey_handheld
 	objective_type = /obj/structure/flora/ash/garden
 	num_wanted = 12
@@ -110,7 +110,7 @@
 	value = 2500
 	objective_type = /obj/structure/geyser
 	scanner_type = /obj/item/survey_handheld/elite
-	duration = 60 MINUTES
+	duration = 90 MINUTES
 	weight = 4
 
 	num_wanted = 1
diff --git a/code/modules/missions/outpost/research_mission.dm b/code/modules/missions/outpost/research_mission.dm
index 1015a25a80..0398930a50 100644
--- a/code/modules/missions/outpost/research_mission.dm
+++ b/code/modules/missions/outpost/research_mission.dm
@@ -4,7 +4,7 @@
 			Please anchor the attached sensor array to your ship and fly it through the storms. \
 			It must be powered to collect the data. "
 	value = 1850 // base value, before adding bonus for number of things to fly through
-	duration = 60 MINUTES
+	duration = 90 MINUTES
 	weight = 8
 
 	var/datum/overmap/objective_type = /datum/overmap/event/electric
diff --git a/code/modules/mob/dead/new_player/sprite_accessories/ears.dm b/code/modules/mob/dead/new_player/sprite_accessories/ears.dm
index c01a20a18f..e3f0fad46d 100644
--- a/code/modules/mob/dead/new_player/sprite_accessories/ears.dm
+++ b/code/modules/mob/dead/new_player/sprite_accessories/ears.dm
@@ -62,3 +62,10 @@
 	icon_state = "bunny_floppy"
 	secondary_color = TRUE
 	color_src = HAIR
+
+/datum/sprite_accessory/ears/human/horse
+	icon = 'icons/mob/species/human/horse.dmi'
+	name = "Horse"
+	icon_state = "horse"
+	secondary_color = TRUE
+	color_src = HAIR
diff --git a/code/modules/mob/dead/new_player/sprite_accessories/lizard.dm b/code/modules/mob/dead/new_player/sprite_accessories/lizard.dm
index da374baa6a..1805349618 100644
--- a/code/modules/mob/dead/new_player/sprite_accessories/lizard.dm
+++ b/code/modules/mob/dead/new_player/sprite_accessories/lizard.dm
@@ -173,7 +173,6 @@
 	icon_state = "none"
 
 //Ears are here because having frills+ears would overlap and be weird.
-
 /datum/sprite_accessory/frills/aquatic
 	name = "Aquatic"
 	icon_state = "aqua"
@@ -183,9 +182,16 @@
 	icon_state = "droopy"
 
 /datum/sprite_accessory/frills/ears
-	name = "Normal ears"
+	name = "Ears"
 	icon_state = "ears"
 
+/datum/sprite_accessory/frills/ears_long
+	name = "Ears (Long)"
+	icon_state = "long"
+
+/datum/sprite_accessory/frills/ears_curved
+	name = "Ears (curved)"
+	icon_state = "curved"
 //End ears
 
 /datum/sprite_accessory/frills/frillhawk
diff --git a/code/modules/mob/dead/new_player/sprite_accessories/tails.dm b/code/modules/mob/dead/new_player/sprite_accessories/tails.dm
index 9a0da947d3..5f4878498f 100644
--- a/code/modules/mob/dead/new_player/sprite_accessories/tails.dm
+++ b/code/modules/mob/dead/new_player/sprite_accessories/tails.dm
@@ -73,3 +73,9 @@
 	name = "Rabbit"
 	icon_state = "bunny"
 	color_src = HAIR
+
+/datum/sprite_accessory/tails/human/horse
+	icon = 'icons/mob/species/human/horse.dmi'
+	name = "Horse"
+	icon_state = "horse"
+	color_src = HAIR
diff --git a/code/modules/mob/dead/new_player/sprite_accessories/underwear/underwear_socks.dm b/code/modules/mob/dead/new_player/sprite_accessories/underwear/underwear_socks.dm
index ab7a030e67..b0d4f511fe 100644
--- a/code/modules/mob/dead/new_player/sprite_accessories/underwear/underwear_socks.dm
+++ b/code/modules/mob/dead/new_player/sprite_accessories/underwear/underwear_socks.dm
@@ -64,22 +64,27 @@
 	icon_state = "thigh_blue"
 	use_static = TRUE
 
+/datum/sprite_accessory/socks/stockings_cyan
+	name = "Cyan Thigh-Highs"
+	icon_state = "thigh_cyan"
+	use_static = TRUE
+
 /datum/sprite_accessory/socks/stockings_green
 	name = "Green Thigh-Highs"
 	icon_state = "thigh_green"
 	use_static = TRUE
 
-/datum/sprite_accessory/socks/stockings_cyan
-	name = "Cyan Thigh-Highs"
+/datum/sprite_accessory/socks/stockings_purple
+	name = "Purple Thigh-Highs"
 	icon_state = "thigh_purple"
 	use_static = TRUE
 
-/datum/sprite_accessory/socks/stockings_cyan
+/datum/sprite_accessory/socks/stockings_orange
 	name = "Orange Thigh-Highs"
 	icon_state = "thigh_orange"
 	use_static = TRUE
 
-/datum/sprite_accessory/socks/stockings_cyan
+/datum/sprite_accessory/socks/stockings_yellow
 	name = "Yellow Thigh-Highs"
 	icon_state = "thigh_yellow"
 	use_static = TRUE
diff --git a/code/modules/mob/dead/new_player/sprite_accessories/underwear/underwear_torso.dm b/code/modules/mob/dead/new_player/sprite_accessories/underwear/underwear_torso.dm
index c48f679bf6..85a9a587f4 100644
--- a/code/modules/mob/dead/new_player/sprite_accessories/underwear/underwear_torso.dm
+++ b/code/modules/mob/dead/new_player/sprite_accessories/underwear/underwear_torso.dm
@@ -96,6 +96,18 @@
 	name = "Short Sleeve Button-Down (Greyscale)"
 	icon_state = "button_short"
 
+/datum/sprite_accessory/undershirt/croptank
+	name = "Cropped Tank Top (Greyscale)"
+	icon_state = "croptank"
+
+/datum/sprite_accessory/undershirt/cropshort
+	name = "Cropped Short Sleeve (Greyscale)"
+	icon_state = "cropshortsleeve"
+
+/datum/sprite_accessory/undershirt/croptshirt
+	name = "Cropped T-shirt (Greyscale)"
+	icon_state = "croptshirt"
+
 /datum/sprite_accessory/undershirt/band
 	name = "T-Shirt (Band)"
 	icon_state = "band"
diff --git a/code/modules/mob/emote.dm b/code/modules/mob/emote.dm
index b4880eb507..b076d2f242 100644
--- a/code/modules/mob/emote.dm
+++ b/code/modules/mob/emote.dm
@@ -33,6 +33,19 @@
 		return
 	emote("scream")
 
+/mob/proc/force_pain_noise(power)
+	if(HAS_TRAIT(src, TRAIT_ANALGESIA))
+		power = power/4
+	if(HAS_TRAIT(src, TRAIT_PAIN_RESIST))
+		power = power/2
+	switch(power)
+		if(10 to 25)
+			emote("gasp")
+		if(25 to 50)
+			emote("groan")
+		if(50 to 100)
+			emote("scream")
+
 /mob/proc/force_manual_scream()
 	if(HAS_TRAIT(src, TRAIT_ANALGESIA))
 		return
diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm
index 5e10d67f5e..98efd0f9df 100644
--- a/code/modules/mob/living/carbon/carbon.dm
+++ b/code/modules/mob/living/carbon/carbon.dm
@@ -925,7 +925,7 @@
 
 /mob/living/carbon/proc/can_defib()
 	var/obj/item/organ/heart = getorgan(/obj/item/organ/heart)
-	if (hellbound || HAS_TRAIT(src, TRAIT_HUSK))
+	if (HAS_TRAIT(src, TRAIT_HUSK))
 		return
 	if((getBruteLoss() >= MAX_REVIVE_BRUTE_DAMAGE) || (getFireLoss() >= MAX_REVIVE_FIRE_DAMAGE))
 		return
diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm
index fbb474f78e..ede3f3b334 100644
--- a/code/modules/mob/living/carbon/human/emote.dm
+++ b/code/modules/mob/living/carbon/human/emote.dm
@@ -111,6 +111,20 @@
 	if(!isnull(user.getorgan(/obj/item/organ/tail)) || (isvox(user)))
 		return 'sound/voice/lizard/tailthump.ogg' //https://freesound.org/people/TylerAM/sounds/389665/
 
+/datum/emote/living/carbon/human/stomp
+	key = "stomp"
+	key_third_person = "stomps their foot"
+	message = "stomps their foot!"
+	emote_type = EMOTE_AUDIBLE
+	vary = TRUE
+
+/datum/emote/living/carbon/human/stomp/get_sound(mob/living/user)
+	if(ishuman(user))
+		if(!user.get_bodypart(BODY_ZONE_L_LEG) || !user.get_bodypart(BODY_ZONE_R_LEG))
+			return
+		else
+			return 'sound/voice/lizard/tailthump.ogg' //https://freesound.org/people/TylerAM/sounds/389665/
+
 /datum/emote/living/carbon/human/weh //lizard
 	key = "weh"
 	key_third_person = "lets out a weh"
diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm
index 59726dcacb..2adbcee197 100644
--- a/code/modules/mob/living/carbon/human/examine.dm
+++ b/code/modules/mob/living/carbon/human/examine.dm
@@ -136,8 +136,6 @@
 			just_sleeping = TRUE
 
 		if(!just_sleeping)
-			if(hellbound)
-				. += span_warning("[t_His] soul seems to have been ripped out of [t_his] body. Revival is impossible.")
 			. += ""
 			if(getorgan(/obj/item/organ/brain) && !key && !get_ghost(even_if_they_cant_reenter = FALSE, ghosts_with_clients = FALSE)) //PENTEST EDIT START
 				. += span_deadsay("[t_He] [t_is] limp and unresponsive; there are no signs of life and [t_his] soul has moved on. [t_He] won't be coming back...")
diff --git a/code/modules/mob/living/carbon/human/species_types/humans.dm b/code/modules/mob/living/carbon/human/species_types/humans.dm
index 935d716087..7dff82a1ed 100644
--- a/code/modules/mob/living/carbon/human/species_types/humans.dm
+++ b/code/modules/mob/living/carbon/human/species_types/humans.dm
@@ -38,6 +38,8 @@
 			mutantears = /obj/item/organ/ears/rabbit/bent
 		if("Floppy Rabbit")
 			mutantears = /obj/item/organ/ears/rabbit/floppy
+		if("Horse")
+			mutantears = /obj/item/organ/ears/horse
 	switch(C.dna.features["tail_human"])
 		if("Cat")
 			mutant_organs |= /obj/item/organ/tail/cat
@@ -49,6 +51,8 @@
 			mutant_organs |= /obj/item/organ/tail/fox/alt
 		if("Rabbit")
 			mutant_organs |= /obj/item/organ/tail/rabbit
+		if("Horse")
+			mutant_organs |= /obj/item/organ/tail/horse
 
 	return ..()
 
diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm
index a188861ffd..94d420119a 100644
--- a/code/modules/mob/living/carbon/human/update_icons.dm
+++ b/code/modules/mob/living/carbon/human/update_icons.dm
@@ -504,6 +504,9 @@ There are several things that need to be remembered:
 		if((head_bodypart.bodytype & BODYTYPE_SNOUT) && (I.supports_variations & SNOUTED_VARIATION))
 			target_overlay = "[target_overlay]_snouted"
 
+		if((head_bodypart.bodytype & BODYTYPE_SNOUT_SMALL) && (I.supports_variations & SNOUTED_SMALL_VARIATION))
+			target_overlay = "[target_overlay]_snouted_small"
+
 		else if(dna.species.bodytype & BODYTYPE_VOX)
 			if(I.supports_variations & VOX_VARIATION)
 				icon_file = VOX_HEAD_PATH
diff --git a/code/modules/mob/living/living_defines.dm b/code/modules/mob/living/living_defines.dm
index c67a58f004..c41f67cc19 100644
--- a/code/modules/mob/living/living_defines.dm
+++ b/code/modules/mob/living/living_defines.dm
@@ -124,8 +124,6 @@
 	var/list/guaranteed_butcher_results = null ///these will always be yielded from butchering
 	var/butcher_difficulty = 0 ///effectiveness prob. is modified negatively by this amount; positive numbers make it more difficult, negative ones make it easier
 
-	var/hellbound = 0 ///People who've signed infernal contracts are unrevivable.
-
 	var/list/weather_immunities = list()
 
 	var/stun_absorption = null ///converted to a list of stun absorption sources this mob has when one is added
diff --git a/code/modules/mob/living/simple_animal/corpse_spawners/frontiersman.dm b/code/modules/mob/living/simple_animal/corpse_spawners/frontiersman.dm
index 5a461bfe9a..47e9659074 100644
--- a/code/modules/mob/living/simple_animal/corpse_spawners/frontiersman.dm
+++ b/code/modules/mob/living/simple_animal/corpse_spawners/frontiersman.dm
@@ -19,9 +19,18 @@
 	mask = /obj/item/clothing/mask/gas/sechailer
 	l_pocket = /obj/item/tank/internals/emergency_oxygen/engi
 
+/datum/outfit/frontier/internals/fake
+	name = "Fake Frontiersman Corpse Internals"
+	head = /obj/item/clothing/head/clip/boonie
+	neck = null
+	mask = /obj/item/clothing/mask/gas/frontiersmen
+
 /obj/effect/mob_spawn/human/corpse/frontier/ranged
 	outfit = /datum/outfit/frontier
 
+/obj/effect/mob_spawn/human/corpse/frontier/fake
+	outfit = /datum/outfit/frontier/internals/fake
+
 /obj/effect/mob_spawn/human/corpse/frontier/space
 	outfit = /datum/outfit/frontier/trooper/space
 
diff --git a/code/modules/mob/living/simple_animal/hostile/human/frontiersman.dm b/code/modules/mob/living/simple_animal/hostile/human/frontiersman.dm
index c251c3d671..5391b7b959 100644
--- a/code/modules/mob/living/simple_animal/hostile/human/frontiersman.dm
+++ b/code/modules/mob/living/simple_animal/hostile/human/frontiersman.dm
@@ -237,6 +237,29 @@
 /mob/living/simple_animal/hostile/human/frontier/ranged/trooper/neutered
 	weapon_drop_chance = 0
 
+/mob/living/simple_animal/hostile/human/frontier/ranged/trooper/f3
+	name = "Frontiersman Marksman"
+	desc = "A member of the brutal Frontiersman terrorist fleet! Bedecked in military-grade armor, they steadily hold their aging DMR in your direction."
+	icon_state = "frontiersmanrangedmosin"
+	shoot_point_blank = TRUE
+	projectilesound = 'sound/weapons/gun/rifle/f4.ogg'
+	rapid = 2
+	rapid_fire_delay = 5
+	casingtype = /obj/item/ammo_casing/a308
+	mob_spawner = /obj/effect/mob_spawn/human/corpse/frontier/ranged/trooper
+	r_hand = /obj/item/gun/ballistic/automatic/marksman/f4/indie
+	armor_base = /obj/item/clothing/suit/armor/vest/frontier
+
+
+/mob/living/simple_animal/hostile/human/frontier/ranged/trooper/f3/sentry
+	vision_range = 14
+	aggro_vision_range = 14
+	minimum_distance = 14
+	stop_automated_movement = 1
+	wander = 0
+	retreat_distance = 0
+	environment_smash = 0
+
 /mob/living/simple_animal/hostile/human/frontier/ranged/trooper/wasp
 	name = "Frontiersman Stinger"
 	desc = "A member of the brutal Frontiersman terrorist fleet! This one is well protected with their laser SMG, ready to scorch anyone who stands in their way."
diff --git a/code/modules/mob/living/simple_animal/hostile/human/human.dm b/code/modules/mob/living/simple_animal/hostile/human/human.dm
index d32f23cbd3..df27ff47eb 100644
--- a/code/modules/mob/living/simple_animal/hostile/human/human.dm
+++ b/code/modules/mob/living/simple_animal/hostile/human/human.dm
@@ -73,6 +73,8 @@
 
 /mob/living/simple_animal/hostile/human/drop_loot()
 	. = ..()
+	if(QDELING(src))
+		return
 	if(!human_loot)
 		return
 	if(mob_spawner)
diff --git a/code/modules/mob/living/simple_animal/hostile/human/survivors.dm b/code/modules/mob/living/simple_animal/hostile/human/survivors.dm
index ace6c6b44d..dd99af26ef 100644
--- a/code/modules/mob/living/simple_animal/hostile/human/survivors.dm
+++ b/code/modules/mob/living/simple_animal/hostile/human/survivors.dm
@@ -8,6 +8,7 @@
 	mob_spawner = /obj/effect/mob_spawn/human/corpse/damaged/whitesands
 	footstep_type = FOOTSTEP_MOB_SHOE
 	armor_base = /obj/item/clothing/suit/hooded/survivor
+	faction = list(FACTION_ANTAG_HERMITS)
 
 	speak_emote = list("breathes heavily.", "growls.", "sharply inhales.")
 	emote_hear = list("murmers.","grumbles.","whimpers.")
@@ -280,6 +281,12 @@
 	gloves = /obj/item/clothing/gloves/color/black
 	head = /obj/item/clothing/head/hooded/survivor_hood
 
+/datum/outfit/hermit/post_equip(mob/living/carbon/human/H, visualsOnly)
+	. = ..()
+	if(visualsOnly)
+		return
+	H.faction |= list(FACTION_ANTAG_HERMITS)
+
 /datum/outfit/hermit/brown
 	name = "Whitesands Survivor Brown"
 	suit = /obj/item/clothing/suit/hooded/survivor/brown
diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm
index bac09fde17..8300da1999 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm
@@ -315,15 +315,15 @@
 	for(var/i = 1 to 3)
 		if(prob(75))
 			backpack_contents += pick_weight(list(
-				/obj/item/reagent_containers/pill/patch/styptic = 5,
-				/obj/item/reagent_containers/pill/patch/silver_sulf = 5,
+				/obj/item/reagent_containers/pill/patch/indomide = 5,
+				/obj/item/reagent_containers/pill/patch/alvitane = 5,
 				/obj/item/storage/firstaid/medical = 3,
 				/obj/item/reagent_containers/syringe = 3,
 				/obj/item/reagent_containers/glass/beaker = 2,
 				/obj/item/reagent_containers/dropper = 2,
 				/obj/item/reagent_containers/pill/charcoal = 2,
-				/obj/item/reagent_containers/medigel/styptic = 2,
-				/obj/item/reagent_containers/medigel/silver_sulf = 2,
+				/obj/item/reagent_containers/medigel/quardexane = 2,
+				/obj/item/reagent_containers/medigel/hadrakine = 2,
 				/obj/item/reagent_containers/medigel/sterilizine = 1,
 				/obj/item/flashlight/pen = 1,
 				/obj/item/hypospray/mkii = 1,
diff --git a/code/modules/mob/living/simple_animal/hostile/mushroom.dm b/code/modules/mob/living/simple_animal/hostile/mushroom.dm
index d052f111e9..2d24e57b9f 100644
--- a/code/modules/mob/living/simple_animal/hostile/mushroom.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mushroom.dm
@@ -191,5 +191,5 @@
 	for(counter=0, counter<=powerlevel, counter++)
 		var/obj/item/food/hugemushroomslice/S = new /obj/item/food/hugemushroomslice(src.loc)
 		S.reagents.add_reagent(/datum/reagent/drug/mushroomhallucinogen, powerlevel)
-		S.reagents.add_reagent(/datum/reagent/medicine/omnizine, powerlevel)
+		S.reagents.add_reagent(/datum/reagent/medicine/panacea, powerlevel)
 		S.reagents.add_reagent(/datum/reagent/medicine/synaptizine, powerlevel)
diff --git a/code/modules/mob/transform_procs.dm b/code/modules/mob/transform_procs.dm
index 223e7d984b..5940c567a6 100644
--- a/code/modules/mob/transform_procs.dm
+++ b/code/modules/mob/transform_procs.dm
@@ -59,8 +59,6 @@
 		O.dna.default_mutation_genes = dna.default_mutation_genes
 		O.dna.set_se(1, GET_INITIALIZED_MUTATION(RACEMUT))
 
-	if(hellbound)
-		O.hellbound = hellbound
 	O.a_intent = INTENT_HARM
 
 	//keep viruses?
@@ -236,9 +234,6 @@
 		O.dna.set_se(0, GET_INITIALIZED_MUTATION(RACEMUT))
 		O.domutcheck()
 
-	if(hellbound)
-		O.hellbound = hellbound
-
 	//keep viruses?
 	if (tr_flags & TR_KEEPVIRUS)
 		O.diseases = diseases
diff --git a/code/modules/movespeed/modifiers/reagent.dm b/code/modules/movespeed/modifiers/reagent.dm
index a66baa6c51..e533cdd6d6 100644
--- a/code/modules/movespeed/modifiers/reagent.dm
+++ b/code/modules/movespeed/modifiers/reagent.dm
@@ -45,3 +45,9 @@
 
 /datum/movespeed_modifier/reagent/shock_wine
 	multiplicative_slowdown = -0.30
+
+/datum/movespeed_modifier/reagent/silfrine
+	multiplicative_slowdown = 0.2
+
+/datum/movespeed_modifier/reagent/silfrine_od
+	multiplicative_slowdown = 0.4
diff --git a/code/modules/overmap/objects/dynamic_datum.dm b/code/modules/overmap/objects/dynamic_datum.dm
index 36372efb1a..91d2970a0e 100644
--- a/code/modules/overmap/objects/dynamic_datum.dm
+++ b/code/modules/overmap/objects/dynamic_datum.dm
@@ -247,14 +247,16 @@
 /datum/overmap/dynamic/proc/gen_planet_name()
 	. = ""
 	switch(rand(1,12))
-		if(1 to 4)
+		if(1 to 3)
 			for(var/i in 1 to rand(2,3))
 				. += capitalize(pick(GLOB.alphabet))
 			. += "-"
 			. += "[pick(rand(1,999))]"
-		if(4 to 9)
+		if(3 to 5)
+			. += "[pick(GLOB.planet_names)]"
+		if(5 to 7)
 			. += "[pick(GLOB.planet_names)] \Roman[rand(1,9)]"
-		if(10, 11)
+		if(8 to 11)
 			. += "[pick(GLOB.planet_prefixes)] [pick(GLOB.planet_names)]"
 		if(12)
 			. += "[capitalize(pick(GLOB.adjectives))] [pick(GLOB.planet_names)]"
diff --git a/code/modules/overmap/objects/outpost/outpost_types.dm b/code/modules/overmap/objects/outpost/outpost_types.dm
index bc4ebd9a58..e20648d978 100644
--- a/code/modules/overmap/objects/outpost/outpost_types.dm
+++ b/code/modules/overmap/objects/outpost/outpost_types.dm
@@ -199,7 +199,7 @@
 	)
 
 /datum/overmap/outpost/clip_ocean
-	token_icon_state = "station_asteroid"
+	token_icon_state = "station_planet"
 	main_template = /datum/map_template/outpost/clip_ocean
 	elevator_template = /datum/map_template/outpost/elevator_clip
 	weather_controller_type = /datum/weather_controller/lush
diff --git a/code/modules/overmap/ships/ship_datum.dm b/code/modules/overmap/ships/ship_datum.dm
index 9c52daf2fb..fdb23530ed 100644
--- a/code/modules/overmap/ships/ship_datum.dm
+++ b/code/modules/overmap/ships/ship_datum.dm
@@ -71,6 +71,8 @@
 		adjust_speed(old_dock.speed_x, old_dock.speed_y)
 
 /datum/overmap/ship/proc/on_docked_to_moved()
+	x = docked_to.x
+	y = docked_to.y
 	token.update_screen()
 
 /**
diff --git a/code/modules/photography/photos/album.dm b/code/modules/photography/photos/album.dm
index 19c2c1297f..883abc8804 100644
--- a/code/modules/photography/photos/album.dm
+++ b/code/modules/photography/photos/album.dm
@@ -103,3 +103,7 @@
 /obj/item/storage/photo_album/prison
 	name = "photo album (Prison)"
 	persistence_id = "prison"
+
+/obj/item/storage/photo_album/correspondent
+	name = "photo album (CLIP Correspondents)"
+	persistence_id = "correspondent"
diff --git a/code/modules/projectiles/guns/manufacturer/clip_lanchester/ballistics.dm b/code/modules/projectiles/guns/manufacturer/clip_lanchester/ballistics.dm
index c2e973ea12..974689a615 100644
--- a/code/modules/projectiles/guns/manufacturer/clip_lanchester/ballistics.dm
+++ b/code/modules/projectiles/guns/manufacturer/clip_lanchester/ballistics.dm
@@ -556,6 +556,8 @@ NO_MAG_GUN_HELPER(automatic/marksman/f4/inteq)
 	fire_select_icon_state_prefix = "clip_"
 	adjust_fire_select_icon_state_on_safety = TRUE
 
+NO_MAG_GUN_HELPER(automatic/assault/skm/cm24)
+
 /obj/item/gun/ballistic/automatic/hmg/cm40
 	name = "\improper CM-40"
 	desc = "A light machine gun used by CLIP heavy weapons teams, capable of withering suppressive fire. The weight and recoil make it nearly impossible to use without deploying the bipod against appropriate cover, such as a table, or bracing against solid cover. Chambered in 7.62x40mm CLIP."
diff --git a/code/modules/reagents/chemistry/machinery/chem_synthesizer.dm b/code/modules/reagents/chemistry/machinery/chem_synthesizer.dm
index 98c2b012c5..5cb4354305 100644
--- a/code/modules/reagents/chemistry/machinery/chem_synthesizer.dm
+++ b/code/modules/reagents/chemistry/machinery/chem_synthesizer.dm
@@ -10,7 +10,7 @@
 	use_power = NO_POWER_USE
 	var/static/list/shortcuts = list(
 		"meth" = /datum/reagent/drug/methamphetamine,
-		"tricord" = /datum/reagent/medicine/tricordrazine
+		"cureall" = /datum/reagent/medicine/cureall
 	)
 
 /obj/machinery/chem_dispenser/chem_synthesizer/ui_interact(mob/user, datum/tgui/ui)
diff --git a/code/modules/reagents/chemistry/reagents/cat2_medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/cat2_medicine_reagents.dm
deleted file mode 100644
index b7becfa6e6..0000000000
--- a/code/modules/reagents/chemistry/reagents/cat2_medicine_reagents.dm
+++ /dev/null
@@ -1,519 +0,0 @@
-// Category 2 medicines are medicines that have an ill effect regardless of volume/OD to dissuade doping. Mostly used as emergency chemicals OR to convert damage (and heal a bit in the process). The type is used to prompt borgs that the medicine is harmful.
-/datum/reagent/medicine/c2
-	name = "Category two reagent"
-	harmful = TRUE
-	metabolization_rate = 0.2
-
-/******BRUTE******/
-/*Suffix: -bital*/
-
-/datum/reagent/medicine/c2/helbital //kinda a C2 only if you're not in hardcrit.
-	name = "Helbital"
-	description = "Named after the norse goddess Hel, this medicine heals the patient's bruises the closer they are to death. Patients will find the medicine 'aids' their healing if not near death by causing asphyxiation."
-	color = "#9400D3"
-	taste_description = "cold and lifeless"
-	overdose_threshold = 35
-	reagent_state = SOLID
-	var/helbent = FALSE
-	var/reaping = FALSE
-
-/datum/reagent/medicine/c2/helbital/on_mob_life(mob/living/carbon/M)
-	. = TRUE
-	var/death_is_coming = (M.getToxLoss() + M.getOxyLoss() + M.getFireLoss() + M.getBruteLoss())
-	var/thou_shall_heal = 0
-	var/good_kind_of_healing = FALSE
-	switch(M.stat)
-		if(CONSCIOUS) //bad
-			thou_shall_heal = death_is_coming/50
-			M.adjustOxyLoss(2, TRUE)
-		if(SOFT_CRIT) //meh convert
-			thou_shall_heal = round(death_is_coming/47,0.1)
-			M.adjustOxyLoss(1, TRUE)
-		else //no convert
-			thou_shall_heal = round(death_is_coming/45,0.1)
-			good_kind_of_healing = TRUE
-	M.adjustBruteLoss(-thou_shall_heal, FALSE)
-
-	if(good_kind_of_healing && !reaping && prob(0.0001)) //janken with the grim reaper!
-		reaping = TRUE
-		var/list/RockPaperScissors = list("rock" = "paper", "paper" = "scissors", "scissors" = "rock") //choice = loses to
-		if(M.apply_status_effect(/datum/status_effect/necropolis_curse,CURSE_BLINDING))
-			helbent = TRUE
-		to_chat(M, span_hierophant("Malevolent spirits appear before you, bartering your life in a 'friendly' game of rock, paper, scissors. Which do you choose?"))
-		var/timeisticking = world.time
-		var/RPSchoice = input(M, "Janken Time! You have 60 Seconds to Choose!", "Rock Paper Scissors",null) as null|anything in RockPaperScissors
-		if(QDELETED(M) || (timeisticking+(1.1 MINUTES) < world.time))
-			reaping = FALSE
-			return //good job, you ruined it
-		if(!RPSchoice)
-			to_chat(M, span_hierophant("You decide to not press your luck, but the spirits remain... hopefully they'll go away soon."))
-			reaping = FALSE
-			return
-		var/grim = pick(RockPaperScissors)
-		if(grim == RPSchoice) //You Tied!
-			to_chat(M, span_hierophant("You tie, and the malevolent spirits disappear... for now."))
-			reaping = FALSE
-		else if(RockPaperScissors[RPSchoice] == grim) //You lost!
-			to_chat(M, span_hierophant("You lose, and the malevolent spirits smirk eerily as they surround your body."))
-			M.dust()
-			return
-		else //VICTORY ROYALE
-			to_chat(M, span_hierophant("You win, and the malevolent spirits fade away as well as your wounds."))
-			M.client.give_award(/datum/award/achievement/misc/helbitaljanken, M)
-			M.revive(full_heal = TRUE, admin_revive = FALSE)
-			M.reagents.del_reagent(type)
-			return
-
-	..()
-	return
-
-/datum/reagent/medicine/c2/helbital/overdose_process(mob/living/carbon/M)
-	if(!helbent)
-		M.apply_necropolis_curse(CURSE_WASTING | CURSE_BLINDING)
-		helbent = TRUE
-	..()
-	return TRUE
-
-/datum/reagent/medicine/c2/helbital/on_mob_delete(mob/living/L)
-	if(helbent)
-		L.remove_status_effect(STATUS_EFFECT_NECROPOLIS_CURSE)
-	..()
-
-/datum/reagent/medicine/c2/libital //messes with your liber
-	name = "Libital"
-	description = "A bruise reliever. Does minor liver damage."
-	color = "#ECEC8D" // rgb: 236	236	141
-	taste_description = "bitter with a hint of alcohol"
-	reagent_state = SOLID
-
-/datum/reagent/medicine/c2/libital/on_mob_life(mob/living/carbon/M)
-	M.adjustOrganLoss(ORGAN_SLOT_LIVER, 0.3*REM)
-	M.adjustBruteLoss(-3*REM)
-	..()
-	return TRUE
-
-/*WS Begin - Medicine Fixes
-
-/datum/reagent/medicine/c2/probital
-	name = "Probital"
-	description = "Originally developed as a prototype-gym supliment for those looking for quick workout turnover, this oral medication quickly repairs broken muscle tissue but causes lactic acid buildup, tiring the patient. Overdosing can cause extreme drowsiness. An Influx of nutrients promotes the muscle repair even further."
-	reagent_state = SOLID
-	color = "#FFFF6B"
-	overdose_threshold = 20
-
-/datum/reagent/medicine/c2/probital/on_mob_life(mob/living/carbon/M)
-	M.adjustBruteLoss(-2.25*REM, FALSE)
-	var/ooo_youaregettingsleepy = 3.5
-	switch(round(M.getStaminaLoss()))
-		if(10 to 40)
-			ooo_youaregettingsleepy = 3
-		if(41 to 60)
-			ooo_youaregettingsleepy = 2.5
-		if(61 to 200) //you really can only go to 120
-			ooo_youaregettingsleepy = 2
-	M.adjustStaminaLoss(ooo_youaregettingsleepy*REM, FALSE)
-	..()
-	. = TRUE
-
-/datum/reagent/medicine/c2/probital/overdose_process(mob/living/M)
-	M.adjustStaminaLoss(3*REM, 0)
-	if(M.getStaminaLoss() >= 80)
-		M.drowsyness++
-	if(M.getStaminaLoss() >= 100)
-		to_chat(M,span_warning("You feel more tired than you usually do, perhaps if you rest your eyes for a bit..."))
-		M.adjustStaminaLoss(-100, TRUE)
-		M.Sleeping(10 SECONDS)
-	..()
-	. = TRUE
-
-/datum/reagent/medicine/c2/probital/on_transfer(atom/A, method=INGEST, trans_volume)
-	if(method != INGEST || !iscarbon(A))
-		return
-
-	A.reagents.remove_reagent(/datum/reagent/medicine/c2/probital, trans_volume * 0.05)
-	A.reagents.add_reagent(/datum/reagent/medicine/metafactor, trans_volume * 0.25)
-
-	..()
-
-WS End */
-
-/******BURN******/
-/*Suffix: -uri*/
-/datum/reagent/medicine/c2/lenturi
-	name = "Lenturi"
-	description = "Used to treat burns. Makes you move slower while it is in your system. Applies stomach damage when it leaves your system."
-	reagent_state = LIQUID
-	color = "#6171FF"
-	var/resetting_probability = 0
-	var/spammer = 0
-
-/datum/reagent/medicine/c2/lenturi/on_mob_life(mob/living/carbon/M)
-	M.adjustFireLoss(-3 * REM)
-	M.adjustOrganLoss(ORGAN_SLOT_STOMACH, 0.4 * REM)
-	..()
-	return TRUE
-
-/datum/reagent/medicine/c2/lenturi/on_mob_metabolize(mob/living/carbon/M)
-	M.add_movespeed_modifier(/datum/movespeed_modifier/reagent/lenturi)
-	return ..()
-
-/datum/reagent/medicine/c2/lenturi/on_mob_end_metabolize(mob/living/carbon/M)
-	M.remove_movespeed_modifier(/datum/movespeed_modifier/reagent/lenturi)
-	return ..()
-
-/datum/reagent/medicine/c2/aiuri
-	name = "Aiuri"
-	description = "Used to treat burns. Does minor eye damage."
-	reagent_state = LIQUID
-	color = "#8C93FF"
-	var/resetting_probability = 0
-	var/message_cd = 0
-
-/datum/reagent/medicine/c2/aiuri/on_mob_life(mob/living/carbon/M)
-	M.adjustFireLoss(-2*REM)
-	M.adjustOrganLoss(ORGAN_SLOT_EYES,0.25*REM)
-	..()
-	return TRUE
-
-/*WS Begin - Fixes Medicines
-
-/datum/reagent/medicine/c2/hercuri
-	name = "Hercuri"
-	description = "Not to be confused with element Mercury, this medicine excels in reverting effects of dangerous high-temperature environments. Prolonged exposure can cause hypothermia."
-	reagent_state = LIQUID
-	color = "#F7FFA5"
-	overdose_threshold = 25
-	reagent_weight = 0.6
-
-/datum/reagent/medicine/c2/hercuri/on_mob_life(mob/living/carbon/M)
-	if(M.getFireLoss() > 50)
-		M.adjustFireLoss(-2*REM, FALSE)
-	else
-		M.adjustFireLoss(-1.25*REM, FALSE)
-	M.adjust_bodytemperature(rand(-25,-5)*(TEMPERATURE_DAMAGE_COEFFICIENT*REM), 50)
-	M.reagents?.chem_temp +=(-10*REM)
-	M.adjust_fire_stacks(-1)
-	..()
-	. = TRUE
-
-/datum/reagent/medicine/c2/hercuri/expose_mob(mob/living/carbon/M, method=VAPOR, reac_volume)
-	if(method != VAPOR)
-		return
-
-	M.adjust_bodytemperature(-reac_volume * TEMPERATURE_DAMAGE_COEFFICIENT, 50)
-	M.adjust_fire_stacks(-reac_volume / 2)
-	if(reac_volume >= metabolization_rate)
-		M.ExtinguishMob()
-
-	..()
-
-/datum/reagent/medicine/c2/hercuri/overdose_process(mob/living/carbon/M)
-	M.adjust_bodytemperature(-10*TEMPERATURE_DAMAGE_COEFFICIENT*REM,50) //chilly chilly
-	..()
-
-WS End*/
-
-/******OXY******/
-/*Suffix: -mol*/
-#define CONVERMOL_RATIO 5		//# Oxygen damage to result in 1 tox
-
-/datum/reagent/medicine/c2/convermol
-	name = "Convermol"
-	description = "Restores oxygen deprivation while producing a lesser amount of toxic byproducts. Both scale with exposure to the drug and current amount of oxygen deprivation. Overdose causes toxic byproducts regardless of oxygen deprivation."
-	reagent_state = LIQUID
-	color = "#FF6464"
-	overdose_threshold = 35 // at least 2 full syringes +some, this stuff is nasty if left in for long
-
-/datum/reagent/medicine/c2/convermol/on_mob_life(mob/living/carbon/human/M)
-	var/oxycalc = 2.5*REM*current_cycle
-	if(!overdosed)
-		oxycalc = min(oxycalc,M.getOxyLoss()+0.5) //if NOT overdosing, we lower our toxdamage to only the damage we actually healed with a minimum of 0.1*current_cycle. IE if we only heal 10 oxygen damage but we COULD have healed 20, we will only take toxdamage for the 10. We would take the toxdamage for the extra 10 if we were overdosing.
-	M.adjustOxyLoss(-oxycalc, 0)
-	M.adjustToxLoss(oxycalc/CONVERMOL_RATIO, 0)
-	if(prob(current_cycle) && M.losebreath)
-		M.losebreath--
-	..()
-	return TRUE
-
-/datum/reagent/medicine/c2/convermol/overdose_process(mob/living/carbon/human/M)
-	metabolization_rate += 1
-	..()
-	return TRUE
-
-#undef	CONVERMOL_RATIO
-
-/datum/reagent/medicine/c2/tirimol
-	name = "Tirimol"
-	description = "An oxygen deprivation medication that causes fatigue. Prolonged exposure causes the patient to fall asleep once the medicine metabolizes."
-	color = "#FF6464"
-	var/drowsycd = 0
-
-/datum/reagent/medicine/c2/tirimol/on_mob_life(mob/living/carbon/human/M)
-	M.adjustOxyLoss(-3)
-	M.adjustStaminaLoss(2)
-	if(drowsycd && (world.time > drowsycd))
-		M.drowsyness += 10
-		drowsycd = world.time + (45 SECONDS)
-	else if(!drowsycd)
-		drowsycd = world.time + (15 SECONDS)
-	..()
-	return TRUE
-
-/datum/reagent/medicine/c2/tirimol/on_mob_end_metabolize(mob/living/L)
-	if(current_cycle > 20)
-		L.Sleeping(10 SECONDS)
-	..()
-
-/******TOXIN******/
-/*Suffix: -iver*/
-
-/datum/reagent/medicine/c2/seiver //a bit of a gray joke
-	name = "Seiver"
-	description = "A medicine that shifts functionality based on temperature. Colder temperatures incurs radiation removal while hotter temperatures promote antitoxicity. Damages the heart." //CHEM HOLDER TEMPS, NOT AIR TEMPS
-	var/radbonustemp = (T0C - 100) //being below this number gives you 10% off rads.
-
-/datum/reagent/medicine/c2/seiver/on_mob_metabolize(mob/living/carbon/human/M)
-	. = ..()
-	radbonustemp = rand(radbonustemp - 50, radbonustemp + 50) // Basically this means 50K and below will always give the percent heal, and upto 150K could. Calculated once.
-
-/datum/reagent/medicine/c2/seiver/on_mob_life(mob/living/carbon/human/M)
-	var/chemtemp = min(holder.chem_temp, 1000)
-	chemtemp = chemtemp ? chemtemp : 273 //why do you have null sweaty
-	var/healypoints = 0 //5 healypoints = 1 heart damage; 5 rads = 1 tox damage healed for the purpose of healypoints
-
-	//you're hot
-	var/toxcalc = min(round((chemtemp-1000)/175+5,0.1),5) //max 5 tox healing a tick
-	if(toxcalc > 0)
-		M.adjustToxLoss(toxcalc*-1)
-		healypoints += toxcalc
-
-	//and you're cold
-	var/radcalc = round((T0C-chemtemp)/6,0.1) //max ~45 rad loss unless you've hit below 0K. if so, wow.
-	if(radcalc > 0)
-		//no cost percent healing if you are SUPER cold (on top of cost healing)
-		if(chemtemp < radbonustemp*0.1) //if you're super chilly, it takes off 25% of your current rads
-			M.radiation = round(M.radiation * 0.75)
-		else if(chemtemp < radbonustemp)//else if you're under the chill-zone, it takes off 10% of your current rads
-			M.radiation = round(M.radiation * 0.9)
-		M.radiation -= radcalc
-		healypoints += (radcalc/5)
-
-
-	//you're yes and... oh no!
-	healypoints = round(healypoints,0.1)
-	M.adjustOrganLoss(ORGAN_SLOT_HEART, healypoints/5)
-	..()
-	return TRUE
-
-/datum/reagent/medicine/c2/multiver //enhanced with MULTIple medicines
-	name = "Multiver"
-	description = "A chem-purger that becomes more effective the more unique medicines present. Slightly heals toxicity but causes lung damage (mitigatable by unique medicines)."
-
-/datum/reagent/medicine/c2/multiver/on_mob_life(mob/living/carbon/human/M)
-	var/medibonus = 0 //it will always have itself which makes it REALLY start @ 1
-	for(var/r in M.reagents.reagent_list)
-		var/datum/reagent/the_reagent = r
-		if(istype(the_reagent, /datum/reagent/medicine))
-			medibonus += 1
-	M.adjustToxLoss(-0.5 * min(medibonus, 3)) //not great at healing but if you have nothing else it will work
-	M.adjustOrganLoss(ORGAN_SLOT_LUNGS, 0.5) //kills at 40u
-	for(var/r2 in M.reagents.reagent_list)
-		var/datum/reagent/the_reagent2 = r2
-		if(the_reagent2 == src)
-			continue
-		var/amount2purge = 3
-		if(medibonus >= 3 && istype(the_reagent2, /datum/reagent/medicine)) //3 unique meds (2+multiver) will make it not purge medicines
-			continue
-		M.reagents.remove_reagent(the_reagent2.type, amount2purge)
-	..()
-	return TRUE
-
-#define issyrinormusc(A)	(istype(A,/datum/reagent/medicine/c2/syriniver) || istype(A,/datum/reagent/medicine/c2/musiver)) //musc is metab of syrin so let's make sure we're not purging either
-
-/*WS Begin - Medicine Fixes
-
-/datum/reagent/medicine/c2/syriniver //Inject >> SYRINge
-	name = "Syriniver"
-	description = "A potent antidote for intravenous use with a narrow therapeutic index, it is considered an active prodrug of musiver."
-	reagent_state = LIQUID
-	color = "#8CDF24" // heavy saturation to make the color blend better
-	metabolization_rate = 0.75 * REAGENTS_METABOLISM
-	overdose_threshold = 6
-	var/conversion_amount
-
-/datum/reagent/medicine/c2/syriniver/on_transfer(atom/A, method=INJECT, trans_volume)
-	if(method != INJECT || !iscarbon(A))
-		return
-	var/mob/living/carbon/C = A
-	if(trans_volume >= 0.6) //prevents cheesing with ultralow doses.
-		C.adjustToxLoss(-1.5 * min(2, trans_volume) * REM, 0)	  //This is to promote iv pole use for that chemotherapy feel.
-	var/obj/item/organ/liver/L = C.internal_organs_slot[ORGAN_SLOT_LIVER]
-	if((L.organ_flags & ORGAN_FAILING) || !L)
-		return
-	conversion_amount = trans_volume * (min(100 -C.getOrganLoss(ORGAN_SLOT_LIVER), 80) / 100) //the more damaged the liver the worse we metabolize.
-	C.reagents.remove_reagent(/datum/reagent/medicine/c2/syriniver, conversion_amount)
-	C.reagents.add_reagent(/datum/reagent/medicine/c2/musiver, conversion_amount)
-	..()
-
-/datum/reagent/medicine/c2/syriniver/on_mob_life(mob/living/carbon/M)
-	M.adjustOrganLoss(ORGAN_SLOT_LIVER, 0.8)
-	M.adjustToxLoss(-1*REM, 0)
-	for(var/datum/reagent/R in M.reagents.reagent_list)
-		if(issyrinormusc(R))
-			continue
-		M.reagents.remove_reagent(R.type,0.4)
-
-	..()
-	. = 1
-
-/datum/reagent/medicine/c2/syriniver/overdose_process(mob/living/carbon/M)
-	M.adjustOrganLoss(ORGAN_SLOT_LIVER, 1.5)
-	M.adjust_disgust(3)
-	M.reagents.add_reagent(/datum/reagent/medicine/c2/musiver, 0.225 * REM)
-	..()
-	. = 1
-
-/datum/reagent/medicine/c2/musiver //MUScles
-	name = "Musiver"
-	description = "The active metabolite of syriniver. Causes muscle weakness on overdose"
-	reagent_state = LIQUID
-	color = "#DFD54E"
-	metabolization_rate = 0.25 * REAGENTS_METABOLISM
-	overdose_threshold = 25
-	var/datum/brain_trauma/mild/muscle_weakness/U
-
-/datum/reagent/medicine/c2/musiver/on_mob_life(mob/living/carbon/M)
-	M.adjustOrganLoss(ORGAN_SLOT_LIVER, 0.1)
-	M.adjustToxLoss(-1*REM, 0)
-	for(var/datum/reagent/R in M.reagents.reagent_list)
-		if(issyrinormusc(R))
-			continue
-		M.reagents.remove_reagent(R.type,0.2)
-	..()
-	. = 1
-
-/datum/reagent/medicine/c2/musiver/overdose_start(mob/living/carbon/M)
-	U = new()
-	M.gain_trauma(U, TRAUMA_RESILIENCE_ABSOLUTE)
-	..()
-
-/datum/reagent/medicine/c2/musiver/on_mob_delete(mob/living/carbon/M)
-	if(U)
-		QDEL_NULL(U)
-	return ..()
-
-/datum/reagent/medicine/c2/musiver/overdose_process(mob/living/carbon/M)
-	M.adjustOrganLoss(ORGAN_SLOT_LIVER, 1.5)
-	M.adjust_disgust(3)
-	..()
-	. = 1
-
-#undef issyrinormusc
-
-WS End*/
-
-/******COMBOS******/
-/*Suffix: Combo of healing, prob gonna get wack REAL fast*/
-
-
-
-/* fucking whitesands left this in code while we had the OTHER synthflesh
-/datum/reagent/medicine/c2/instabitaluri
-	name = "Synthflesh (Instabitaluri)"
-	description = "Heals brute and burn damage at the cost of toxicity (66% of damage healed). Touch application only."
-	reagent_state = LIQUID
-	color = "#FFEBEB"
-
-/datum/reagent/medicine/c2/instabitaluri/expose_mob(mob/living/M, method=TOUCH, reac_volume,show_message = 1)
-	if(iscarbon(M))
-		var/mob/living/carbon/carbies = M
-		if (carbies.stat == DEAD)
-			show_message = 0
-		if(method in list(PATCH, TOUCH, SMOKE))
-			var/harmies = min(carbies.getBruteLoss(),carbies.adjustBruteLoss(-1.25 * reac_volume)*-1)
-			var/burnies = min(carbies.getFireLoss(),carbies.adjustFireLoss(-1.25 * reac_volume)*-1)
-			for(var/i in carbies.all_wounds)
-				var/datum/wound/iter_wound = i
-				iter_wound.on_synthflesh(reac_volume)
-			carbies.adjustToxLoss((harmies+burnies)*0.66)
-			if(show_message)
-				to_chat(carbies, span_danger("You feel your burns and bruises healing! It stings like hell!"))
-			SEND_SIGNAL(carbies, COMSIG_ADD_MOOD_EVENT, "painful_medicine", /datum/mood_event/painful_medicine)
-			if(HAS_TRAIT_FROM(M, TRAIT_HUSK, "burn") && carbies.getFireLoss() < THRESHOLD_UNHUSK && (carbies.reagents.get_reagent_amount(/datum/reagent/medicine/c2/instabitaluri) + reac_volume >= 100))
-				carbies.cure_husk("burn")
-				carbies.visible_message("<span class='nicegreen'>A rubbery liquid coats [carbies]'s burns. [carbies] looks a lot healthier!") //we're avoiding using the phrases "burnt flesh" and "burnt skin" here because carbies could be a skeleton or something
-	..()
-	return TRUE
-*/
-
-/******ORGAN HEALING******/
-/*Suffix: -rite*/
-/*
-*How this medicine works:
-*Penthrite if you are not in crit only stabilizes your heart.
-*As soon as you pass crit threshold it's special effects kick in. Penthrite forces your heart to beat preventing you from entering
-*soft and hard crit, but there is a catch. During this you will be healed and you will sustain
-*heart damage that will not imapct you as long as penthrite is in your system.
-*If you reach the threshold of -60 HP penthrite stops working and you get a heart attack, penthrite is flushed from your system in that very moment,
-*causing you to loose your soft crit, hard crit and heart stabilization effects.
-*Overdosing on penthrite also causes a heart failure.
-*/
-/datum/reagent/medicine/c2/penthrite
-	name = "Penthrite"
-	description = "An expensive medicine that aids with pumping blood around the body even without a heart, and prevents the heart from slowing down. It reacts violently with other emergency medication."
-	color = "#F5F5F5"
-	overdose_threshold = 50
-
-/datum/reagent/medicine/c2/penthrite/on_mob_add(mob/living/M)
-	. = ..()
-	to_chat(M,"<span class='notice'>Your heart begins to beat with great force!")
-	ADD_TRAIT(M, TRAIT_STABLEHEART, type)
-	ADD_TRAIT(M, TRAIT_NOHARDCRIT,type)
-	ADD_TRAIT(M, TRAIT_NOSOFTCRIT,type)
-	M.crit_threshold = M.crit_threshold + HEALTH_THRESHOLD_FULLCRIT*2 //your heart is still pumping!
-
-
-/datum/reagent/medicine/c2/penthrite/on_mob_life(mob/living/carbon/human/H)
-	H.adjustOrganLoss(ORGAN_SLOT_STOMACH,0.25)
-	if(H.health <= HEALTH_THRESHOLD_CRIT && H.health > H.crit_threshold) //we cannot save someone above our raised crit threshold.
-
-		H.adjustToxLoss(-2 * REM, 0)
-		H.adjustBruteLoss(-2 * REM, 0)
-		H.adjustFireLoss(-2 * REM, 0)
-		H.adjustOxyLoss(-6 * REM, 0)
-
-		H.losebreath = 0
-
-		H.adjustOrganLoss(ORGAN_SLOT_HEART,max(1,volume/10)) // your heart is barely keeping up!
-
-		H.set_timed_status_effect(rand(0 SECONDS, 4 SECONDS) * REM, /datum/status_effect/jitter, only_if_higher = TRUE)
-		H.set_timed_status_effect(rand(0 SECONDS, 4 SECONDS) * REM, /datum/status_effect/dizziness, only_if_higher = TRUE)
-
-
-		if(prob(33))
-			to_chat(H,span_danger("Your body is trying to give up, but your heart is still beating!"))
-
-	if(H.health <= H.crit_threshold) //certain death above this threshold
-		REMOVE_TRAIT(H, TRAIT_STABLEHEART, type) //we have to remove the stable heart before we give him heart attack
-		to_chat(H,span_danger("You feel something rupturing inside your chest!"))
-		H.force_scream()
-		H.set_heartattack(TRUE)
-		volume = 0
-	. = ..()
-
-/datum/reagent/medicine/c2/penthrite/on_mob_end_metabolize(mob/living/M)
-	M.crit_threshold = M.crit_threshold - HEALTH_THRESHOLD_FULLCRIT*2 //your heart is still pumping!
-	REMOVE_TRAIT(M, TRAIT_STABLEHEART, type)
-	REMOVE_TRAIT(M, TRAIT_NOHARDCRIT,type)
-	REMOVE_TRAIT(M, TRAIT_NOSOFTCRIT,type)
-	. = ..()
-
-/datum/reagent/medicine/c2/penthrite/overdose_process(mob/living/carbon/human/H)
-	REMOVE_TRAIT(H, TRAIT_STABLEHEART, type)
-	H.adjustStaminaLoss(10)
-	H.adjustOrganLoss(ORGAN_SLOT_HEART,10)
-	H.set_heartattack(TRUE)
-
-
-/******NICHE******/
-//todo
diff --git a/code/modules/reagents/chemistry/reagents/medical_reagents/_medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/medical_reagents/_medicine_reagents.dm
new file mode 100644
index 0000000000..9cdf5d2a1d
--- /dev/null
+++ b/code/modules/reagents/chemistry/reagents/medical_reagents/_medicine_reagents.dm
@@ -0,0 +1,8 @@
+/datum/reagent/medicine
+	name = "Medicine"
+	taste_description = "bitterness"
+	category = "Medicine"
+
+/datum/reagent/medicine/on_mob_life(mob/living/carbon/M)
+	current_cycle++
+	holder.remove_reagent(type, metabolization_rate / M.metabolism_efficiency) //medicine reagents stay longer if you have a better metabolism
diff --git a/code/modules/reagents/chemistry/reagents/medical_reagents/blood_reagents.dm b/code/modules/reagents/chemistry/reagents/medical_reagents/blood_reagents.dm
new file mode 100644
index 0000000000..2e6f3c8adc
--- /dev/null
+++ b/code/modules/reagents/chemistry/reagents/medical_reagents/blood_reagents.dm
@@ -0,0 +1,129 @@
+/* Reagents that primarily interface with blood and bleeding
+** chitosan I guess
+*/
+
+
+// helps bleeding wounds clot faster
+/datum/reagent/medicine/chitosan
+	name = "Chitosan"
+	description = "Vastly improves the blood's natural ability to coagulate and stop bleeding by hightening platelet production and effectiveness. Overdosing will cause extreme blood clotting, resulting in potential brain damage."
+	reagent_state = LIQUID
+	color = "#bb2424"
+	metabolization_rate = 0.25 * REAGENTS_METABOLISM
+	overdose_threshold = 20
+	/// The bloodiest wound that the patient has will have its blood_flow reduced by this much each tick
+	var/clot_rate = 0.3
+	/// While this reagent is in our bloodstream, we reduce all bleeding by this factor
+	var/passive_bleed_modifier = 0.7
+	/// For tracking when we tell the person we're no longer bleeding
+	var/was_working
+
+/datum/reagent/medicine/chitosan/on_mob_metabolize(mob/living/M)
+	ADD_TRAIT(M, TRAIT_COAGULATING, /datum/reagent/medicine/chitosan)
+
+	if(!ishuman(M))
+		return
+
+	var/mob/living/carbon/human/blood_boy = M
+	blood_boy.physiology?.bleed_mod *= passive_bleed_modifier
+	return ..()
+
+/datum/reagent/medicine/chitosan/on_mob_end_metabolize(mob/living/M)
+	REMOVE_TRAIT(M, TRAIT_COAGULATING, /datum/reagent/medicine/chitosan)
+
+	if(was_working)
+		to_chat(M, span_warning("The medicine thickening your blood loses its effect!"))
+	if(!ishuman(M))
+		return
+
+	var/mob/living/carbon/human/blood_boy = M
+	blood_boy.physiology?.bleed_mod /= passive_bleed_modifier
+
+	return ..()
+
+/datum/reagent/medicine/chitosan/on_mob_life(mob/living/carbon/M)
+	. = ..()
+	if(!M.blood_volume || !M.all_wounds)
+		return
+
+	var/datum/wound/bloodiest_wound
+
+	for(var/i in M.all_wounds)
+		var/datum/wound/iter_wound = i
+		if(iter_wound.blood_flow)
+			if(iter_wound.blood_flow > bloodiest_wound?.blood_flow)
+				bloodiest_wound = iter_wound
+
+	if(bloodiest_wound)
+		if(!was_working)
+			to_chat(M, span_green("You can feel your flowing blood start thickening!"))
+			was_working = TRUE
+		bloodiest_wound.blood_flow = max(0, bloodiest_wound.blood_flow - clot_rate)
+	else if(was_working)
+		was_working = FALSE
+
+/datum/reagent/medicine/chitosan/overdose_process(mob/living/carbon/M)
+	. = ..()
+	if(!M.blood_volume)
+		return
+
+	if(prob(15))
+		M.losebreath += rand(2,4)
+		M.adjustOxyLoss(rand(1,3))
+		if(prob(30))
+			to_chat(M, span_danger("You can feel your blood clotting up in your veins!"))
+		else if(prob(10))
+			to_chat(M, span_userdanger("You feel like your blood has stopped moving!"))
+			M.adjustOxyLoss(rand(3,4))
+
+		if(prob(50))
+			var/obj/item/organ/lungs/our_lungs = M.getorganslot(ORGAN_SLOT_LUNGS)
+			our_lungs.applyOrganDamage(1)
+		else if(prob(25))
+			var/obj/item/organ/lungs/our_brain = M.getorganslot(ORGAN_SLOT_BRAIN)
+			our_brain.applyOrganDamage(1)
+		else
+			var/obj/item/organ/heart/our_heart = M.getorganslot(ORGAN_SLOT_HEART)
+			our_heart.applyOrganDamage(1)
+
+/datum/reagent/medicine/salglu_solution
+	name = "Saline-Glucose Solution"
+	description = "Has a 33% chance per metabolism cycle to heal brute and burn damage. Can be used as a temporary blood substitute."
+	reagent_state = LIQUID
+	color = "#DCDCDC"
+	metabolization_rate = 0.5 * REAGENTS_METABOLISM
+	overdose_threshold = 60
+	taste_description = "sweetness and salt"
+	var/last_added = 0
+	var/maximum_reachable = BLOOD_VOLUME_NORMAL - 10	//So that normal blood regeneration can continue with salglu active
+	var/extra_regen = 0.25 // in addition to acting as temporary blood, also add this much to their actual blood per tick
+
+/datum/reagent/medicine/salglu_solution/on_mob_life(mob/living/carbon/M)
+	if(last_added)
+		M.blood_volume -= last_added
+		last_added = 0
+	if(M.blood_volume < maximum_reachable)	//Can only up to double your effective blood level.
+		var/amount_to_add = min(M.blood_volume, volume*5)
+		var/new_blood_level = min(M.blood_volume + amount_to_add, maximum_reachable)
+		last_added = new_blood_level - M.blood_volume
+		M.blood_volume = new_blood_level + extra_regen
+	if(prob(33))
+		M.adjustBruteLoss(-0.5*REM, 0)
+		M.adjustFireLoss(-0.5*REM, 0)
+		. = TRUE
+	..()
+
+/datum/reagent/medicine/salglu_solution/overdose_process(mob/living/M)
+	if(prob(3))
+		to_chat(M, span_warning("You feel salty."))
+		holder.add_reagent(/datum/reagent/consumable/sodiumchloride, 1)
+		holder.remove_reagent(/datum/reagent/medicine/salglu_solution, 0.5)
+	else if(prob(3))
+		to_chat(M, span_warning("You feel sweet."))
+		holder.add_reagent(/datum/reagent/consumable/sugar, 1)
+		holder.remove_reagent(/datum/reagent/medicine/salglu_solution, 0.5)
+	if(prob(33))
+		M.adjustBruteLoss(0.5*REM, FALSE, FALSE, BODYTYPE_ORGANIC)
+		M.adjustFireLoss(0.5*REM, FALSE, FALSE, BODYTYPE_ORGANIC)
+		. = TRUE
+	..()
diff --git a/code/modules/reagents/chemistry/reagents/medical_reagents/fauna_reagents.dm b/code/modules/reagents/chemistry/reagents/medical_reagents/fauna_reagents.dm
new file mode 100644
index 0000000000..1b251d6521
--- /dev/null
+++ b/code/modules/reagents/chemistry/reagents/medical_reagents/fauna_reagents.dm
@@ -0,0 +1,52 @@
+/*
+** Reagents that are from fauna
+*/
+
+/datum/reagent/medicine/soulus
+	name = "Soulus Dust"
+	description = "Ground legion cores. The dust quickly seals wounds yet slowly causes the tissue to undergo necrosis."
+	reagent_state = SOLID
+	color = "#302f20"
+	metabolization_rate = REAGENTS_METABOLISM * 0.8
+	overdose_threshold = 50
+	var/tox_dam = 0.25
+
+/datum/reagent/medicine/soulus/expose_mob(mob/living/M, method=TOUCH, reac_volume, show_message = 1)
+	if(iscarbon(M) && M.stat != DEAD)
+		if(method in list(INGEST, INJECT))
+			M.set_timed_status_effect(reac_volume SECONDS * REM, /datum/status_effect/jitter, only_if_higher = TRUE)
+			if(M.getFireLoss())
+				M.adjustFireLoss(-reac_volume*1.2)
+			if(M.getBruteLoss())
+				M.adjustBruteLoss(-reac_volume*1.2)
+	if(prob(50))
+		SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "legion", /datum/mood_event/legion_good, name)
+	else
+		SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "legion", /datum/mood_event/legion_bad, name)
+	..()
+
+/datum/reagent/medicine/soulus/on_mob_life(mob/living/carbon/M)
+	M.adjustFireLoss(-0.1*REM, 0)
+	M.adjustBruteLoss(-0.1*REM, 0)
+	M.adjustToxLoss(tox_dam*REM, 0)
+	..()
+
+/datum/reagent/medicine/soulus/overdose_process(mob/living/M)
+	var/mob/living/carbon/C = M
+	if(!istype(C.getorganslot(ORGAN_SLOT_REGENERATIVE_CORE), /obj/item/organ/legion_skull))
+		var/obj/item/organ/legion_skull/spare_ribs = new()
+		spare_ribs.Insert(M)
+	..()
+
+/datum/reagent/medicine/soulus/on_mob_end_metabolize(mob/living/M)
+	SEND_SIGNAL(M, COMSIG_CLEAR_MOOD_EVENT, "legion")
+	..()
+
+/datum/reagent/medicine/soulus/pure
+	name = "Purified Soulus Dust"
+	description = "Ground legion cores."
+	reagent_state = SOLID
+	color = "#302f20"
+	metabolization_rate = REAGENTS_METABOLISM
+	overdose_threshold = 100
+	tox_dam = 0
diff --git a/code/modules/reagents/chemistry/reagents/medical_reagents/flora_reagents.dm b/code/modules/reagents/chemistry/reagents/medical_reagents/flora_reagents.dm
new file mode 100644
index 0000000000..601333f1b2
--- /dev/null
+++ b/code/modules/reagents/chemistry/reagents/medical_reagents/flora_reagents.dm
@@ -0,0 +1,196 @@
+/*
+** reagents that come from plants
+*/
+
+/datum/reagent/medicine/polypyr  //This is intended to be an ingredient in advanced chems.
+	name = "Polypyrylium Oligomers"
+	description = "A purple mixture of short polyelectrolyte chains not easily synthesized in the laboratory. It is valued as an intermediate in the synthesis of the cutting edge pharmaceuticals."
+	reagent_state = SOLID
+	color = "#9423FF"
+	metabolization_rate = 0.15 * REAGENTS_METABOLISM
+	overdose_threshold = 50
+	taste_description = "numbing bitterness"
+	/// While this reagent is in our bloodstream, we reduce all bleeding by this factor
+	var/passive_bleed_modifier = 0.55
+	/// For tracking when we tell the person we're no longer bleeding
+	var/was_working
+
+/datum/reagent/medicine/polypyr/on_mob_metabolize(mob/living/M)
+	ADD_TRAIT(M, TRAIT_COAGULATING, /datum/reagent/medicine/polypyr)
+	if(!ishuman(M))
+		return
+
+	var/mob/living/carbon/human/blood_boy = M
+	blood_boy.physiology?.bleed_mod *= passive_bleed_modifier
+	return ..()
+
+/datum/reagent/medicine/polypyr/on_mob_end_metabolize(mob/living/M)
+	REMOVE_TRAIT(M, TRAIT_COAGULATING, /datum/reagent/medicine/polypyr)
+	//should probably generic proc this at a later point. I'm probably gonna use it a bit
+	if(was_working)
+		to_chat(M, span_warning("The medicine thickening your blood loses its effect!"))
+	if(!ishuman(M))
+		return
+
+	var/mob/living/carbon/human/blood_boy = M
+	blood_boy.physiology?.bleed_mod /= passive_bleed_modifier
+
+	return ..()
+
+
+/datum/reagent/medicine/polypyr/on_mob_life(mob/living/carbon/M) //I wanted a collection of small positive effects, this is as hard to obtain as coniine after all.
+	M.adjustOrganLoss(ORGAN_SLOT_LUNGS, -0.25)
+	M.adjustBruteLoss(-0.5, 0)
+	..()
+	. = 1
+
+/datum/reagent/medicine/polypyr/expose_mob(mob/living/M, method=TOUCH, reac_volume)
+	if(method == TOUCH || method == SMOKE || method == VAPOR)
+		if(M && ishuman(M) && reac_volume >= 0.5)
+			var/mob/living/carbon/human/H = M
+			H.hair_color = "92f"
+			H.facial_hair_color = "92f"
+			H.update_hair()
+
+/datum/reagent/medicine/polypyr/overdose_process(mob/living/M)
+	M.adjustOrganLoss(ORGAN_SLOT_LUNGS, 0.5)
+	..()
+	. = 1
+
+
+/datum/reagent/medicine/puce_essence
+	name = "Pucetylline Essence"
+	description = "Ground essence of puce crystals."
+	reagent_state = SOLID
+	color = "#CC8899"
+	metabolization_rate = 2.5 * REAGENTS_METABOLISM
+	overdose_threshold = 30
+
+/datum/reagent/medicine/puce_essence/on_mob_life(mob/living/carbon/M)
+	if(prob(80))
+		M.adjustToxLoss(-1*REM, 0)
+	else
+		M.adjustCloneLoss(-1*REM, 0)
+	for(var/datum/reagent/toxin/R in M.reagents.reagent_list)
+		M.reagents.remove_reagent(R.type, 0.25)
+	if(holder.has_reagent(/datum/reagent/medicine/soulus))				// No, you can't chemstack with soulus dust
+		holder.remove_reagent(/datum/reagent/medicine/soulus, 5)
+	M.add_atom_colour(color, TEMPORARY_COLOUR_PRIORITY)		// Changes color to puce
+	..()
+
+/datum/reagent/medicine/puce_essence/expose_atom(atom/A, volume)
+	if(!iscarbon(A))
+		A.add_atom_colour(color, WASHABLE_COLOUR_PRIORITY)
+	..()
+
+/datum/reagent/medicine/puce_essence/on_mob_end_metabolize(mob/living/M)
+	M.remove_atom_colour(TEMPORARY_COLOUR_PRIORITY, color)		// Removes temporary (not permanent) puce
+
+/datum/reagent/medicine/puce_essence/overdose_process(mob/living/M)
+	M.add_atom_colour(color, FIXED_COLOUR_PRIORITY)		// Eternal puce
+
+/datum/reagent/medicine/chartreuse		// C H A R T R E U S E
+	name = "Chartreuse Solution"
+	description = "Refined essence of puce crystals."
+	reagent_state = SOLID
+	color = "#DFFF00"
+	metabolization_rate = 2.5 * REAGENTS_METABOLISM
+	overdose_threshold = 30
+
+/datum/reagent/medicine/chartreuse/on_mob_life(mob/living/carbon/M)		// Yes, you can chemstack with soulus dust
+	if(prob(80))
+		M.adjustToxLoss(-2*REM, 0)
+		M.adjustCloneLoss(-1*REM, 0)
+	for(var/datum/reagent/toxin/R in M.reagents.reagent_list)
+		M.reagents.remove_reagent(R.type, 1)
+	M.add_atom_colour(color, TEMPORARY_COLOUR_PRIORITY)		// Changes color to chartreuse
+	..()
+
+/datum/reagent/medicine/chartreuse/expose_atom(atom/A, volume)
+	if(!iscarbon(A))
+		A.add_atom_colour(color, WASHABLE_COLOUR_PRIORITY)
+	..()
+
+/datum/reagent/medicine/chartreuse/on_mob_end_metabolize(mob/living/M)
+	M.remove_atom_colour(TEMPORARY_COLOUR_PRIORITY, color)		// Removes temporary (not permanent) chartreuse
+
+/datum/reagent/medicine/chartreuse/overdose_process(mob/living/M)
+	M.add_atom_colour(color, FIXED_COLOUR_PRIORITY)		// Eternal chartreuse
+	M.set_drugginess(15)		// Also druggy
+	..()
+
+
+/datum/reagent/medicine/earthsblood //Created by ambrosia gaia plants
+	name = "Earthsblood"
+	description = "Ichor from an extremely powerful plant. Great for restoring wounds, but it's a little heavy on the brain. For some strange reason, it also induces temporary pacifism in those who imbibe it and semi-permanent pacifism in those who overdose on it."
+	color = "#FFAF00"
+	metabolization_rate = 0.4 //Math is based on specific metab rate so we want this to be static AKA if define or medicine metab rate changes, we want this to stay until we can rework calculations.
+	overdose_threshold = 25
+
+/datum/reagent/medicine/earthsblood/on_mob_life(mob/living/carbon/M)
+	if(current_cycle <= 25) //10u has to be processed before u get into THE FUN ZONE
+		M.adjustBruteLoss(-1 * REM, 0)
+		M.adjustFireLoss(-1 * REM, 0)
+		M.adjustOxyLoss(-0.5 * REM, 0)
+		M.adjustToxLoss(-0.5 * REM, 0)
+		M.adjustCloneLoss(-0.1 * REM, 0)
+		M.adjustStaminaLoss(-0.5 * REM, 0)
+		M.adjustOrganLoss(ORGAN_SLOT_BRAIN, 1 * REM, 150) //This does, after all, come from ambrosia, and the most powerful ambrosia in existence, at that!
+	else
+		M.adjustBruteLoss(-5 * REM, 0) //slow to start, but very quick healing once it gets going
+		M.adjustFireLoss(-5 * REM, 0)
+		M.adjustOxyLoss(-3 * REM, 0)
+		M.adjustToxLoss(-3 * REM, 0)
+		M.adjustCloneLoss(-1 * REM, 0)
+		M.adjustStaminaLoss(-3 * REM, 0)
+		M.adjust_timed_status_effect(3 SECONDS, /datum/status_effect/jitter, 30 SECONDS)
+		M.adjustOrganLoss(ORGAN_SLOT_BRAIN, 2 * REM, 150)
+	M.druggy = min(max(0, M.druggy + 10), 15) //See above
+	..()
+	. = 1
+
+/datum/reagent/medicine/earthsblood/on_mob_metabolize(mob/living/L)
+	..()
+	ADD_TRAIT(L, TRAIT_PACIFISM, type)
+
+/datum/reagent/medicine/earthsblood/on_mob_end_metabolize(mob/living/L)
+	REMOVE_TRAIT(L, TRAIT_PACIFISM, type)
+	..()
+
+/datum/reagent/medicine/earthsblood/overdose_process(mob/living/M)
+	M.hallucination = min(max(0, M.hallucination + 5), 60)
+	if(current_cycle > 25)
+		M.adjustToxLoss(4 * REM, 0)
+		if(current_cycle > 100) //podpeople get out reeeeeeeeeeeeeeeeeeeee
+			M.adjustToxLoss(6 * REM, 0)
+	if(iscarbon(M))
+		var/mob/living/carbon/hippie = M
+		hippie.gain_trauma(/datum/brain_trauma/severe/pacifism)
+	..()
+	. = 1
+
+//Earthsblood is still a wonderdrug. Just... don't expect to be able to mutate something that makes plants so healthy.
+/datum/reagent/medicine/earthsblood/on_hydroponics_apply(obj/item/seeds/myseed, datum/reagents/chems, obj/machinery/hydroponics/mytray, mob/user)
+	. = ..()
+	if(chems.has_reagent(type, 1))
+		mytray.adjustHealth(round(chems.get_reagent_amount(type) * 1))
+		mytray.adjustPests(-rand(1,3))
+		mytray.adjustWeeds (-rand(1,3))
+		if(myseed)
+			myseed.adjust_instability(-round(chems.get_reagent_amount(type) * 1.3))
+			myseed.adjust_potency(round(chems.get_reagent_amount(type)))
+			myseed.adjust_yield(round(chems.get_reagent_amount(type)))
+			myseed.adjust_endurance(round(chems.get_reagent_amount(type) * 0.5))
+			myseed.adjust_production(-round(chems.get_reagent_amount(type) * 0.5))
+
+/datum/reagent/medicine/neoxanthin
+	name = "Neoxanthin"
+	description = "A naturally occuring carotenoid found in several varieties of plants. Has mild antioxidant properties."
+	reagent_state = SOLID
+	color = "#CC8899"
+	metabolization_rate = 0.15 * REAGENTS_METABOLISM
+	overdose_threshold = 30
+
+/datum/reagent/medicine/neoxanthin/on_mob_life(mob/living/carbon/M)
+	if(prob(80))
+		M.adjustToxLoss(-1*REM, 0)
diff --git a/code/modules/reagents/chemistry/reagents/medical_reagents/ipc_reagents.dm b/code/modules/reagents/chemistry/reagents/medical_reagents/ipc_reagents.dm
new file mode 100644
index 0000000000..06fe6fdd90
--- /dev/null
+++ b/code/modules/reagents/chemistry/reagents/medical_reagents/ipc_reagents.dm
@@ -0,0 +1,36 @@
+/*
+** for some reason
+*/
+
+/datum/reagent/medicine/system_cleaner
+	name = "System Cleaner"
+	description = "Neutralizes harmful chemical compounds inside synthetic systems."
+	reagent_state = LIQUID
+	color = "#F1C40F"
+	metabolization_rate = 0.5 * REAGENTS_METABOLISM
+	process_flags = SYNTHETIC
+
+/datum/reagent/medicine/system_cleaner/on_mob_life(mob/living/M)
+	M.adjustToxLoss(-2*REM, 0)
+	. = 1
+	for(var/datum/reagent/R in M.reagents.reagent_list)
+		if(R != src)
+			M.reagents.remove_reagent(R.type,1)
+	..()
+
+/datum/reagent/medicine/liquid_solder
+	name = "Liquid Solder"
+	description = "Repairs brain damage in synthetics."
+	color = "#727272"
+	taste_description = "metallic"
+	process_flags = SYNTHETIC
+
+/datum/reagent/medicine/liquid_solder/on_mob_life(mob/living/M)
+	M.adjustOrganLoss(ORGAN_SLOT_BRAIN, -3*REM)
+	if(iscarbon(M))
+		var/mob/living/carbon/C = M
+		if(prob(30) && C.has_trauma_type(BRAIN_TRAUMA_SPECIAL))
+			C.cure_trauma_type(BRAIN_TRAUMA_SPECIAL)
+		if(prob(10) && C.has_trauma_type(BRAIN_TRAUMA_MILD))
+			C.cure_trauma_type(BRAIN_TRAUMA_MILD)
+	..()
diff --git a/code/modules/reagents/chemistry/reagents/medical_reagents/medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/medical_reagents/medicine_reagents.dm
new file mode 100644
index 0000000000..09e84767c8
--- /dev/null
+++ b/code/modules/reagents/chemistry/reagents/medical_reagents/medicine_reagents.dm
@@ -0,0 +1,842 @@
+/* For chems that primarily interface with damage
+** I.E. healing chems
+** organized
+** >brute
+** >burn
+** >tox
+** >oxygen
+** >multi
+** >misc
+*/
+
+
+
+/// BRUTE CHEMS ///
+
+/datum/reagent/medicine/indomide
+	name = "Indomide"
+	description = "An anti-inflammatory initially isolated from a Kalixcian cave fungus. Thins the blood, and causes bruises and cuts to slowly heal. Overdose can cause sores to open along the body."
+	reagent_state = LIQUID
+	color = "#FFFF6B"
+	overdose_threshold = 30
+	var/passive_bleed_modifier = 1.2
+
+/datum/reagent/medicine/indomide/on_mob_life(mob/living/carbon/M)
+	M.adjustBruteLoss(-1*REM, 0)
+	..()
+	. = 1
+
+/datum/reagent/medicine/indomide/on_mob_metabolize(mob/living/L)
+	. = ..()
+	if(!ishuman(L))
+		return
+	var/mob/living/carbon/human/normal_guy = L
+	normal_guy.physiology?.bleed_mod *= passive_bleed_modifier
+
+/datum/reagent/medicine/indomide/on_mob_end_metabolize(mob/living/L)
+	. = ..()
+	if(!ishuman(L))
+		return
+	var/mob/living/carbon/human/normal_guy = L
+	normal_guy.physiology?.bleed_mod /= passive_bleed_modifier
+
+
+/datum/reagent/medicine/indomide/overdose_start(mob/living/M)
+	. = ..()
+	ADD_TRAIT(M, TRAIT_BLOODY_MESS, /datum/reagent/medicine/indomide)
+
+/datum/reagent/medicine/indomide/overdose_process(mob/living/M)
+	. = ..()
+	M.adjustBruteLoss(0.2*REM, 0)
+
+	if(!iscarbon(M))
+		return
+
+	var/mob/living/carbon/victim = M
+
+	if(prob(5))
+		var/obj/item/bodypart/open_sore = pick(victim.bodyparts)
+		if(IS_ORGANIC_LIMB(open_sore))
+			open_sore.force_wound_upwards(/datum/wound/slash/moderate)
+		M.emote("gasps")
+
+/datum/reagent/medicine/indomide/on_mob_end_metabolize(mob/living/L)
+	. = ..()
+	REMOVE_TRAIT(L, TRAIT_BLOODY_MESS, /datum/reagent/medicine/indomide)
+
+/datum/reagent/medicine/indomide/on_transfer(atom/A, method=INGEST, trans_volume)
+	if(method != INGEST || !istype(A, /obj/item/organ/stomach))
+		return
+
+	A.reagents.remove_reagent(/datum/reagent/medicine/indomide, trans_volume * 0.05)
+	A.reagents.add_reagent(/datum/reagent/medicine/metafactor, trans_volume * 0.25)
+
+	..()
+
+/datum/reagent/medicine/metafactor
+	name = "Mitogen Metabolism Factor"
+	description = "This enzyme catalyzes the conversion of nutricious food into healing peptides."
+	//slow metabolism rate so the patient can self heal with food even after the troph has metabolized away for amazing reagent efficency.
+	metabolization_rate = 0.0625  * REAGENTS_METABOLISM
+	reagent_state = SOLID
+	color = "#FFBE00"
+	overdose_threshold = 10
+
+/datum/reagent/medicine/metafactor/overdose_start(mob/living/carbon/M)
+	metabolization_rate = 2  * REAGENTS_METABOLISM
+
+/datum/reagent/medicine/metafactor/overdose_process(mob/living/carbon/M)
+	if(prob(25))
+		M.vomit()
+	..()
+
+
+/datum/reagent/medicine/hadrakine
+	name = "Hadrakine Powder"
+	description = "An aluminum based styptic that rapidly seals flesh wounds upon administration, and lingers in the blood stream, causing slightly reduced blood flow, and stimulating healing of further, minor injuries. Overdose causes blood clotting, shortness of breath, and potential brain damage."
+	reagent_state = LIQUID
+	color = "#FF9696"
+	overdose_threshold = 45
+	var/passive_bleed_modifier = 0.9
+	var/overdose_bleed_modifier = 0.3
+	var/brute_damage_modifier = 1.5
+
+/datum/reagent/medicine/hadrakine/expose_mob(mob/living/M, method=TOUCH, reac_volume, show_message = 1)
+	if(iscarbon(M) && M.stat != DEAD)
+		if(method in list(INGEST, VAPOR, INJECT))
+			M.adjustToxLoss(0.5*reac_volume)
+			if(show_message)
+				to_chat(M, span_warning("You don't feel so good..."))
+		else if(M.getBruteLoss())
+			M.adjustBruteLoss(-reac_volume)
+			var/pain_points = M.adjustStaminaLoss(reac_volume*4)
+			M.force_pain_noise(pain_points)
+			if(show_message && !HAS_TRAIT(M, TRAIT_ANALGESIA))
+				to_chat(M, span_danger("You feel your bruises healing! It stings like hell!"))
+				SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "painful_medicine", /datum/mood_event/painful_medicine)
+			else
+				to_chat(M, span_notice("You feel your bruises throbbing."))
+	..()
+
+
+/datum/reagent/medicine/hadrakine/on_mob_life(mob/living/carbon/M)
+	M.adjustBruteLoss(-2*REM, 0)
+	..()
+	. = 1
+
+/datum/reagent/medicine/hadrakine/on_mob_metabolize(mob/living/L)
+	. = ..()
+	if(!ishuman(L))
+		return
+	var/mob/living/carbon/human/normal_guy = L
+	normal_guy.physiology?.bleed_mod *= passive_bleed_modifier
+
+/datum/reagent/medicine/hadrakine/on_mob_end_metabolize(mob/living/L)
+	. = ..()
+	if(!ishuman(L))
+		return
+	var/mob/living/carbon/human/normal_guy = L
+	normal_guy.physiology?.bleed_mod /= passive_bleed_modifier
+	if(overdosed)
+		normal_guy.physiology?.bleed_mod /= overdose_bleed_modifier
+		normal_guy.physiology?.brute_mod /= brute_damage_modifier
+
+/datum/reagent/medicine/hadrakine/overdose_start(mob/living/M)
+	. = ..()
+
+	if(!ishuman(M))
+		return
+
+	var/mob/living/carbon/human/overdose_victim = M
+	overdose_victim.physiology?.bleed_mod *= overdose_bleed_modifier
+	overdose_victim.physiology?.brute_mod *= brute_damage_modifier
+
+/datum/reagent/medicine/hadrakine/overdose_process(mob/living/M)
+	M.adjustBruteLoss(0.5*REM, 0)
+	M.adjustToxLoss(0.5, 0)
+	if(prob(25))
+		M.losebreath++
+	if(prob(10))
+		M.adjustOrganLoss(ORGAN_SLOT_BRAIN, 2*REM)
+	..()
+	. = 1
+
+/datum/reagent/medicine/silfrine
+	name = "Silfrine"
+	description = "An extremely aggressive silver-based compound suited best for catalyzing rapid platlet movement, and sealing of wounds. This is an extremely painful process. Overdose causes shortness of breath, and brute damage, as the body tries to seal non-existent wounds."
+	reagent_state = LIQUID
+	color = "#725cfd"
+	overdose_threshold = 20
+
+/datum/reagent/medicine/silfrine/expose_mob(mob/living/M, method=TOUCH, reac_volume, show_message = 1)
+	if(iscarbon(M) && M.stat != DEAD)
+		var/mob/living/carbon/paper_cut_victim = M
+		if(method in list(INGEST, INJECT, PATCH))
+			if(!HAS_TRAIT(M, TRAIT_ANALGESIA))
+				to_chat(M, span_boldwarning("Your body ignites in pain as nerves are rapidly reformed, and flesh is freshly knit!"))
+				M.force_pain_noise(reac_volume*6)
+				M.adjustStaminaLoss(reac_volume*4)
+			for(var/owie in paper_cut_victim.all_wounds)
+				var/datum/wound/paper_cut = owie
+				paper_cut.on_silfrine(reac_volume)
+	..()
+
+/datum/reagent/medicine/silfrine/on_mob_life(mob/living/carbon/M)
+	var/effectiveness_multiplier = clamp(M.getBruteLoss()/75, 0.3, 1.5)
+	var/brute_heal = effectiveness_multiplier * REM * -4
+	M.adjustBruteLoss(brute_heal, 0)
+	..()
+	. = 1
+
+/datum/reagent/medicine/silfrine/on_mob_metabolize(mob/living/L)
+	. = ..()
+	L.add_movespeed_modifier(/datum/movespeed_modifier/reagent/silfrine)
+	if(!HAS_TRAIT(L, TRAIT_ANALGESIA))
+		SEND_SIGNAL(L, COMSIG_ADD_MOOD_EVENT, "painful_medicine", /datum/mood_event/painful_medicine)
+
+/datum/reagent/medicine/silfrine/on_mob_end_metabolize(mob/living/L)
+	. = ..()
+	L.remove_movespeed_modifier(/datum/movespeed_modifier/reagent/silfrine)
+
+/datum/reagent/medicine/silfrine/overdose_start(mob/living/M)
+	. = ..()
+	M.add_movespeed_modifier(/datum/movespeed_modifier/reagent/silfrine_od)
+	M.force_pain_noise(200)
+
+
+/datum/reagent/medicine/silfrine/overdose_process(mob/living/M)
+	if(prob(10))
+		if(!HAS_TRAIT(M, TRAIT_ANALGESIA))
+			to_chat(M, span_danger("You feel your flesh twisting as it tries to grow around non-existent wounds!"))
+		else
+			to_chat(M, span_danger("You feel points of pressure all across your body starting to throb uncomfortably."))
+		M.force_pain_noise(40)
+		M.adjustStaminaLoss(40*REM, 0)
+		M.adjustBruteLoss(5*REM, 0)
+	if(prob(25))
+		M.losebreath++
+	..()
+	. = 1
+
+
+/// BURN REAGENTS ///
+
+/datum/reagent/medicine/leporazine
+	name = "Leporazine"
+	description = "Leporazine will effectively regulate a patient's body temperature, ensuring it never leaves safe levels."
+	color = "#DB90C6"
+
+/datum/reagent/medicine/leporazine/on_mob_life(mob/living/carbon/M)
+	if(M.bodytemperature > M.get_body_temp_normal(apply_change=FALSE))
+		M.adjust_bodytemperature(-4 * TEMPERATURE_DAMAGE_COEFFICIENT, M.get_body_temp_normal(apply_change=FALSE))
+	else if(M.bodytemperature < (M.get_body_temp_normal(apply_change=FALSE) + 1))
+		M.adjust_bodytemperature(4 * TEMPERATURE_DAMAGE_COEFFICIENT, 0, M.get_body_temp_normal(apply_change=FALSE))
+	..()
+
+/datum/reagent/medicine/alvitane
+	name = "Alvitane"
+	description = "A moderate intensity burn medication derived from chemicals specializing in dermal regeneration. Ideal application is exposing it to the flesh, as it allows burns to rapidly reknit themselves. Overdose weakens the user's ability to resist burns, and causes minor toxic effects."
+	reagent_state = LIQUID
+	color = "#F7FFA5"
+	overdose_threshold = 30
+	var/burn_damage_modifier = 1.3
+
+/datum/reagent/medicine/alvitane/on_mob_life(mob/living/carbon/M)
+	M.adjustFireLoss(-1*REM, 0)
+	M.adjust_bodytemperature(-0.6 * TEMPERATURE_DAMAGE_COEFFICIENT, M.dna.species.bodytemp_normal)
+	..()
+	. = 1
+
+/datum/reagent/medicine/alvitane/expose_mob(mob/living/M, method=TOUCH, reac_volume, show_message = 1)
+	M.adjustFireLoss(-reac_volume/2)
+	M.force_pain_noise(reac_volume/2)
+	M.adjustStaminaLoss(reac_volume/2)
+	if(iscarbon(M) && M.stat != DEAD)
+		var/mob/living/carbon/burn_ward_attendee = M
+		for(var/owie in burn_ward_attendee.all_wounds)
+			var/datum/wound/burn = owie
+			burn.on_tane(reac_volume/4)
+	if(show_message && !HAS_TRAIT(M, TRAIT_ANALGESIA))
+		to_chat(M, span_danger("You feel your burns regenerating! Your nerves are burning!"))
+		SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "painful_medicine", /datum/mood_event/painful_medicine)
+	else
+		to_chat(M, span_notice("You feel your burns twisting."))
+	..()
+
+/datum/reagent/medicine/alvitane/on_mob_end_metabolize(mob/living/L)
+	. = ..()
+	if(!ishuman(L))
+		return
+
+	if(overdosed)
+		var/mob/living/carbon/human/normal_guy = L
+		normal_guy.physiology?.burn_mod /= burn_damage_modifier
+
+/datum/reagent/medicine/alvitane/overdose_start(mob/living/M)
+	. = ..()
+
+	if(!ishuman(M))
+		return
+
+	var/mob/living/carbon/human/overdose_victim = M
+	overdose_victim.physiology?.burn_mod *= burn_damage_modifier
+
+/datum/reagent/medicine/alvitane/overdose_process(mob/living/carbon/M)
+	M.adjustToxLoss(0.5*REM, 0)
+	M.set_timed_status_effect(5 SECONDS, /datum/status_effect/jitter, only_if_higher = TRUE)
+	..()
+
+
+/datum/reagent/medicine/quardexane
+	name = "Quardexane"
+	description = "A third-generation burn medication originating from the Shoal. Injection allows it to rapidly re-knit burns, while vaporous application acts as an cooling agent and sanitizing substance. Overdose causes new burns to form on the user's body."
+	reagent_state = LIQUID
+	color = "#4ab1ba"
+	overdose_threshold = 25
+	reagent_weight = 0.6
+
+/datum/reagent/medicine/quardexane/on_mob_life(mob/living/carbon/M)
+	M.adjustFireLoss(-2*REM, 0)
+	M.adjust_bodytemperature(-0.6 * TEMPERATURE_DAMAGE_COEFFICIENT, M.dna.species.bodytemp_normal)
+	..()
+	. = 1
+
+/datum/reagent/medicine/quardexane/expose_mob(mob/living/carbon/M, method=VAPOR, reac_volume)
+	if(method == VAPOR || TOUCH)
+		M.adjust_bodytemperature(-reac_volume * TEMPERATURE_DAMAGE_COEFFICIENT * 0.5, 200)
+		M.adjust_fire_stacks(-reac_volume / 2)
+		if(reac_volume >= metabolization_rate)
+			M.ExtinguishMob()
+
+	if(method == INJECT)
+		M.adjustFireLoss(-2*reac_volume, 0)
+		if(!HAS_TRAIT(M, TRAIT_ANALGESIA))
+			to_chat(M, span_danger("You feel your burns regenerating! Your nerves are burning!"))
+			SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "painful_medicine", /datum/mood_event/painful_medicine)
+		else
+			to_chat(M, span_danger("Your burns start to throb, before subsiding!"))
+
+	if(iscarbon(M) && M.stat != DEAD && (method in list(VAPOR, INJECT, TOUCH)))
+		var/mob/living/carbon/burn_ward_attendee = M
+		for(var/owie in burn_ward_attendee.all_wounds)
+			var/datum/wound/burn = owie
+			burn.on_tane(reac_volume/2)
+
+	..()
+
+/datum/reagent/medicine/quardexane/overdose_process(mob/living/carbon/M)
+	M.adjustFireLoss(3*REM, 0.)
+	M.adjust_bodytemperature(-5 * TEMPERATURE_DAMAGE_COEFFICIENT, 50)
+	..()
+
+/datum/reagent/medicine/ysiltane
+	name = "Ysiltane"
+	description = "A burn treatment derived from plasma. Application by injection or ingestion causes burns to rapidly repair themselves. The intensity of application causes the user's system to temporarily crash. Overdose causes a toxic crisis within the user's system, and can damage organs."
+	reagent_state = LIQUID
+	color = "#862929"
+	overdose_threshold = 21
+	reagent_weight = 2
+
+/datum/reagent/medicine/ysiltane/on_mob_life(mob/living/carbon/M)
+	if(current_cycle > 2 && current_cycle <= 6)
+		M.adjustFireLoss(-10*REM, 0)
+	M.adjustFireLoss(-2*REM, 0)
+	M.adjustStaminaLoss(1*REM, 0)
+	..()
+	. = 1
+
+/datum/reagent/medicine/ysiltane/expose_mob(mob/living/carbon/M, method=VAPOR, reac_volume)
+	if(method in list(INJECT, INGEST))
+		M.adjustFireLoss(-reac_volume*2)
+		M.adjustStaminaLoss(reac_volume*6)
+		if(!HAS_TRAIT(M, TRAIT_ANALGESIA))
+			to_chat(M, span_boldwarning("Your nerves ignite in pain as burns start to rapidly regenerate!"))
+			SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "painful_medicine", /datum/mood_event/painful_medicine)
+		else
+			to_chat(M, span_warning("You feel your burns twisting."))
+
+		if(iscarbon(M) && M.stat != DEAD)
+			var/mob/living/carbon/burn_ward_attendee = M
+			for(var/owie in burn_ward_attendee.all_wounds)
+				var/datum/wound/burn = owie
+				burn.on_tane(reac_volume)
+
+	..()
+
+/datum/reagent/medicine/ysiltane/overdose_process(mob/living/carbon/M)
+	M.adjustFireLoss(3*REM, 0.)
+	M.adjust_bodytemperature(5 * TEMPERATURE_DAMAGE_COEFFICIENT, 330)
+	..()
+
+
+/// TOXIN REAGENTS ///
+
+
+/datum/reagent/medicine/calomel
+	name = "Calomel"
+	description = "Quickly purges the body of all chemicals. Toxin damage is dealt if the patient is in good condition."
+	reagent_state = LIQUID
+	color = "#8CDF24" // heavy saturation to make the color blend better
+	metabolization_rate = 0.5 * REAGENTS_METABOLISM
+	taste_description = "acid"
+
+/datum/reagent/medicine/calomel/on_mob_life(mob/living/carbon/M)
+	for(var/datum/reagent/R in M.reagents.reagent_list)
+		if(R != src)
+			M.reagents.remove_reagent(R.type,3)
+	if(M.health > 20)
+		M.adjustToxLoss(1*REM, 0)
+		. = 1
+	..()
+
+/datum/reagent/medicine/charcoal
+	name = "Charcoal"
+	description = "Heals toxin damage as well as slowly removing any other chemicals the patient has in their bloodstream. Administer orally"
+	reagent_state = SOLID
+	color = "#101a13"
+	metabolization_rate = 0.75 * REAGENTS_METABOLISM
+	overdose_threshold = 20
+
+/datum/reagent/medicine/charcoal/on_mob_life(mob/living/carbon/M)
+	M.adjustToxLoss(-1*REM, 0)
+	. = 1
+	for(var/datum/reagent/R in M.reagents.reagent_list)
+		if(R != src)
+			M.reagents.remove_reagent(R.type,1)
+	..()
+
+/datum/reagent/medicine/charcoal/on_transfer(atom/A, method=TOUCH, volume)
+	if(method == INGEST || !istype(A, /obj/item/organ/stomach))
+		return
+	A.reagents.remove_reagent(/datum/reagent/medicine/charcoal, volume) //We really should not be injecting an insoluble granular material.
+	A.reagents.add_reagent(/datum/reagent/carbon, volume) // Its pores would get clogged with gunk anyway.
+	..()
+
+//its seiver. i ran out of ideas + seiver was a good one
+/datum/reagent/medicine/pancrazine
+	name = "Pancrazine"
+	description = "A second generation Tecetian research chemical developed as the byproduct of the terraforming process. Injection of the substance while cold causes the body to regenerate radiation damage, while heating it causes rapid purging of toxic effects."
+	color = "#c3915d"
+	var/radbonustemp = (T0C - 100) //being below this number gives you 10% off rads.
+
+/datum/reagent/medicine/pancrazine/on_mob_metabolize(mob/living/carbon/human/M)
+	. = ..()
+	radbonustemp = rand(radbonustemp - 50, radbonustemp + 50) // Basically this means 50K and below will always give the percent heal, and upto 150K could. Calculated once.
+
+/datum/reagent/medicine/pancrazine/on_mob_life(mob/living/carbon/human/M)
+	var/chemtemp = min(holder.chem_temp, 1000)
+	chemtemp = chemtemp ? chemtemp : 273 //why do you have null sweaty
+	var/healypoints = 0 //5 healypoints = 1 heart damage; 5 rads = 1 tox damage healed for the purpose of healypoints
+
+	//you're hot
+	var/toxcalc = min(round((chemtemp-1000)/175+5,0.1),5) //max 2.5 tox healing a tick
+	if(toxcalc > 0)
+		M.adjustToxLoss(toxcalc*-0.5)
+		healypoints += toxcalc
+
+	//and you're cold
+	var/radcalc = round((T0C-chemtemp)/6,0.1) //max ~45 rad loss unless you've hit below 0K. if so, wow.
+	if(radcalc > 0)
+		//no cost percent healing if you are SUPER cold (on top of cost healing)
+		if(chemtemp < radbonustemp*0.1) //if you're super chilly, it takes off 25% of your current rads
+			M.radiation = round(M.radiation * 0.75)
+		else if(chemtemp < radbonustemp)//else if you're under the chill-zone, it takes off 10% of your current rads
+			M.radiation = round(M.radiation * 0.9)
+		M.radiation -= radcalc
+		healypoints += (radcalc/5)
+
+
+	//you're yes and... oh no!
+	healypoints = round(healypoints,0.1)
+	M.adjustOrganLoss(ORGAN_SLOT_HEART, healypoints/5)
+	..()
+	return TRUE
+
+/datum/reagent/medicine/pancrazine/overdose_process(mob/living/M)
+	. = ..()
+	if(prob(50))
+		M.set_timed_status_effect(5 SECONDS * REM, /datum/status_effect/dizziness, only_if_higher = TRUE)
+		M.set_timed_status_effect(10 SECONDS * REM, /datum/status_effect/jitter, only_if_higher = TRUE)
+	if(prob(10))
+		M.adjust_disgust(33)
+
+/datum/reagent/medicine/gjalrazine
+	name = "Gjalrazine"
+	description = "A plasma-derieved syrum that stimulates the body's natural defenses against toxins. Injection forces the body to start purging toxins, at cost of a rising sense of disgust. Overdose causes the substance to start binding to blood cells, causing blood toxicity."
+	reagent_state = LIQUID
+	color = "#8CDF24"
+	metabolization_rate = 0.75 * REAGENTS_METABOLISM
+	overdose_threshold = 12
+
+/datum/reagent/medicine/gjalrazine/on_mob_life(mob/living/carbon/M)
+	M.adjustToxLoss(-3*REM, 0)
+	M.adjust_disgust(1)
+	. = 1
+	..()
+
+/datum/reagent/medicine/gjalrazine/expose_mob(mob/living/M, method, reac_volume, show_message, touch_protection)
+	. = ..()
+	if((method in list(TOUCH, PATCH, INGEST, INJECT)) && M.stat != DEAD)
+		if(method == INGEST)
+			M.adjustOrganLoss(ORGAN_SLOT_STOMACH, reac_volume)
+			to_chat(M, "Your stomach cramps!")
+			SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "painful_medicine", /datum/mood_event/painful_medicine)
+		M.adjustToxLoss(-reac_volume*4)
+		M.adjust_disgust(50)
+		M.set_timed_status_effect(5 SECONDS * REM, /datum/status_effect/dizziness, only_if_higher = TRUE)
+
+/datum/reagent/medicine/gjalrazine/overdose_process(mob/living/M)
+	. = ..()
+	M.set_timed_status_effect(30 SECONDS * REM, /datum/status_effect/dizziness, only_if_higher = TRUE)
+	M.adjust_disgust(30)
+	M.adjustToxLoss(2*REM, 0)
+
+/// OXYGEN REAGENTS ///
+
+// oxygen has good reason to be less complicated because it's major causes are suffocating and blood loss
+// blood loss has treatment methods aside from these meds
+// and suffocation shouldn't be a major affair
+
+/datum/reagent/medicine/dexalin
+	name = "Dexalin"
+	description = "Restores oxygen loss. Overdose causes it instead."
+	reagent_state = LIQUID
+	color = "#0080FF"
+	overdose_threshold = 30
+
+/datum/reagent/medicine/dexalin/on_mob_life(mob/living/carbon/M)
+	M.adjustOxyLoss(-0.5*REM, 0)
+	..()
+	. = 1
+
+/datum/reagent/medicine/dexalin/overdose_process(mob/living/M)
+	M.adjustOxyLoss(2*REM, 0)
+	..()
+	. = 1
+
+/datum/reagent/medicine/salbutamol
+	name = "Salbutamol"
+	description = "Rapidly restores oxygen deprivation as well as preventing more of it to an extent."
+	reagent_state = LIQUID
+	color = "#00FFFF"
+	metabolization_rate = 0.25 * REAGENTS_METABOLISM
+
+/datum/reagent/medicine/salbutamol/on_mob_life(mob/living/carbon/M)
+	M.adjustOxyLoss(-3*REM, 0)
+	if(M.losebreath >= 4)
+		M.losebreath -= 2
+	..()
+	. = 1
+
+/datum/reagent/medicine/inaprovaline
+	name = "Inaprovaline"
+	description = "Stabilizes the breathing of patients. Good for those in critical condition."
+	reagent_state = LIQUID
+	color = "#A4D8D8"
+
+/datum/reagent/medicine/inaprovaline/on_mob_life(mob/living/carbon/M)
+	if(M.losebreath >= 5)
+		M.losebreath -= 5
+	..()
+
+/// RADIATION REAGENTS ///
+
+/datum/reagent/medicine/anti_rad
+	name = "Emergency Radiation Purgant" //taking real names
+	description = "Rapidly purges radiation from the body."
+	reagent_state = LIQUID
+	color = "#E6FFF0"
+	metabolization_rate = 0.5 * REAGENTS_METABOLISM
+
+/datum/reagent/medicine/anti_rad/on_mob_metabolize(mob/living/L)
+	to_chat(L, span_warning("Your stomach starts to churn and cramp!"))
+	. = ..()
+
+/datum/reagent/medicine/anti_rad/on_mob_life(mob/living/carbon/M)
+	M.radiation -= M.radiation - rand(50,150)
+	M.adjust_disgust(4*REM)
+	..()
+	. = 1
+
+/datum/reagent/medicine/potass_iodide
+	name = "Potassium Iodide"
+	description = "Efficiently restores low radiation damage."
+	reagent_state = LIQUID
+	color = "#BAA15D"
+	metabolization_rate = 2 * REAGENTS_METABOLISM
+
+/datum/reagent/medicine/potass_iodide/on_mob_life(mob/living/carbon/M)
+	if(M.radiation > 0)
+		M.radiation -= min(M.radiation, 8)
+	..()
+
+/datum/reagent/medicine/pen_acid
+	name = "Pentetic Acid"
+	description = "Reduces massive amounts of radiation and toxin damage while purging other chemicals from the body."
+	reagent_state = LIQUID
+	color = "#E6FFF0"
+	metabolization_rate = 0.5 * REAGENTS_METABOLISM
+
+/datum/reagent/medicine/pen_acid/on_mob_life(mob/living/carbon/M)
+	M.radiation -= max(M.radiation-RAD_MOB_SAFE, 0)/50
+	M.adjustToxLoss(-2*REM, 0)
+	for(var/datum/reagent/R in M.reagents.reagent_list)
+		if(R != src)
+			M.reagents.remove_reagent(R.type,2)
+	..()
+	. = 1
+
+/// MULTI-DAMAGE REAGENTS ///
+
+
+/datum/reagent/medicine/synthflesh
+	name = "Synthflesh"
+	description = "Has a 100% chance of instantly healing brute and burn damage. One unit of the chemical will heal one point of damage. Touch application only."
+	reagent_state = LIQUID
+	color = "#FFEBEB"
+
+/datum/reagent/medicine/synthflesh/expose_mob(mob/living/M, method=TOUCH, reac_volume,show_message = 1)
+	if(iscarbon(M))
+		var/mob/living/carbon/carbies = M
+		if (carbies.stat == DEAD)
+			show_message = 0
+		if(method in list(PATCH, TOUCH, SMOKE))
+			var/harmies = min(carbies.getBruteLoss(),carbies.adjustBruteLoss(-1.25 * reac_volume)*-1)
+			var/burnies = min(carbies.getFireLoss(),carbies.adjustFireLoss(-1.25 * reac_volume)*-1)
+			for(var/i in carbies.all_wounds)
+				var/datum/wound/iter_wound = i
+				iter_wound.on_synthflesh(reac_volume)
+			carbies.adjustToxLoss((harmies+burnies)*0.66)
+			if(show_message)
+				to_chat(carbies, span_danger("You feel your burns and bruises healing! It stings like hell!"))
+			SEND_SIGNAL(carbies, COMSIG_ADD_MOOD_EVENT, "painful_medicine", /datum/mood_event/painful_medicine)
+			if(HAS_TRAIT_FROM(M, TRAIT_HUSK, "burn") && carbies.getFireLoss() < THRESHOLD_UNHUSK && (carbies.reagents.get_reagent_amount(/datum/reagent/medicine/synthflesh) + reac_volume >= 100))
+				carbies.cure_husk("burn")
+				carbies.visible_message("<span class='nicegreen'>A rubbery liquid coats [carbies]'s burns. [carbies] looks a lot healthier!") //we're avoiding using the phrases "burnt flesh" and "burnt skin" here because carbies could be a skeleton or something
+	..()
+	return TRUE
+
+/datum/reagent/medicine/cryoxadone
+	name = "Cryoxadone"
+	description = "A chemical mixture with almost magical healing powers. Its main limitation is that the patient's body temperature must be under 270K for it to metabolise correctly."
+	color = "#0000C8"
+	taste_description = "sludge"
+
+/datum/reagent/medicine/cryoxadone/on_mob_life(mob/living/carbon/M)
+	var/power = -0.00003 * (M.bodytemperature ** 2) + 3
+	if(M.bodytemperature < T0C)
+		M.adjustOxyLoss(-3 * power, 0)
+		M.adjustBruteLoss(-power, 0)
+		M.adjustFireLoss(-power, 0)
+		M.adjustToxLoss(-power, 0, TRUE) //heals TOXINLOVERs
+		M.adjustCloneLoss(-power, 0)
+		for(var/i in M.all_wounds)
+			var/datum/wound/iter_wound = i
+			iter_wound.on_xadone(power)
+		REMOVE_TRAIT(M, TRAIT_DISFIGURED, TRAIT_GENERIC) //fixes common causes for disfiguration
+		. = 1
+	metabolization_rate = REAGENTS_METABOLISM * (0.00001 * (M.bodytemperature ** 2) + 0.5)
+	..()
+
+/datum/reagent/medicine/hunter_extract
+	name = "Hunter's Extract"
+	description = "An extract of floral compounds and exotic frontier bacteria. Heals the user in small doses, but is extremely toxic otherwise."
+	color = "#6B372E" //dark and red like lavaland
+	metabolization_rate = REAGENTS_METABOLISM * 0.5
+	overdose_threshold = 10
+
+/datum/reagent/medicine/hunter_extract/expose_mob(mob/living/M, method=TOUCH, reac_volume, show_message = 1)
+	ADD_TRAIT(M, TRAIT_NOLIMBDISABLE, TRAIT_GENERIC)
+	..()
+
+/datum/reagent/medicine/hunter_extract/on_mob_end_metabolize(mob/living/M)
+	REMOVE_TRAIT(M, TRAIT_NOLIMBDISABLE, TRAIT_GENERIC)
+	..()
+
+/datum/reagent/medicine/hunter_extract/on_mob_life(mob/living/carbon/M)
+	M.adjustFireLoss(-1*REM, 0)
+	M.adjustBruteLoss(-1*REM, 0)
+	M.adjustToxLoss(-1*REM, 0)
+	if(M.health <= M.crit_threshold)
+		M.adjustOxyLoss(-1*REM, 0)
+	..()
+	return TRUE
+
+/datum/reagent/medicine/hunter_extract/overdose_process(mob/living/M)		// Thanks to actioninja
+	if(prob(2) && iscarbon(M))
+		var/selected_part = pick(BODY_ZONE_L_ARM, BODY_ZONE_R_ARM, BODY_ZONE_L_LEG, BODY_ZONE_R_LEG)
+		var/obj/item/bodypart/bp = M.get_bodypart(selected_part)
+		if(bp)
+			M.visible_message(span_warning("[M] feels a spike of pain!!"), span_danger("You feel a spike of pain!!"))
+			bp.receive_damage(0, 0, 200)
+		else	//SUCH A LUST FOR REVENGE!!!
+			to_chat(M, span_warning("A phantom limb hurts!"))
+	return ..()
+
+
+/datum/reagent/medicine/panacea
+	name = "Panacea"
+	description = "One of the developments of the frontier, Panacea is a term for a variety of mildly-anomalous substances usually found within Frontier space. Despite disparate origins, they all share a similar effect of slowly healing the body. Overdosing on them causes this effect to reverse."
+	reagent_state = LIQUID
+	color = "#DCDCDC"
+	metabolization_rate = 0.25 * REAGENTS_METABOLISM
+	overdose_threshold = 30
+	var/healing = 1
+
+/datum/reagent/medicine/panacea/on_mob_life(mob/living/carbon/M)
+	M.adjustToxLoss(-healing*REM, 0)
+	M.adjustOxyLoss(-healing*REM, 0)
+	M.adjustBruteLoss(-healing*REM, 0)
+	M.adjustFireLoss(-healing*REM, 0)
+	..()
+	. = 1
+
+/datum/reagent/medicine/panacea/overdose_process(mob/living/M)
+	M.adjustToxLoss(1.5*REM, 0)
+	M.adjustOxyLoss(1.5*REM, 0)
+	M.adjustBruteLoss(1.5*REM, FALSE, FALSE, BODYTYPE_ORGANIC)
+	M.adjustFireLoss(1.5*REM, FALSE, FALSE, BODYTYPE_ORGANIC)
+	..()
+	. = 1
+
+/datum/reagent/medicine/panacea/effluvial
+	name = "Effluvial Panacea"
+	description = "A waste product of industrial processes to synthesize Panacea, or more often, an impure form, Effluvial Panacea has the same effects as true panacea, simply reduced in effectiveness."
+	color = "#d8c7b7"
+	healing = 0.2
+
+/datum/reagent/medicine/panacea/effluvial/on_mob_life(mob/living/carbon/M)
+	if(prob(25))
+		M.adjustOrganLoss(ORGAN_SLOT_HEART, 0.5)
+	..()
+	. = 1
+
+/datum/reagent/medicine/stimulants
+	name = "Indoril Stimulant"
+	description = "Increases stun resistance and movement speed in addition to restoring minor damage and weakness. Overdose causes weakness and toxin damage."
+	color = "#78008C"
+	metabolization_rate = 0.5 * REAGENTS_METABOLISM
+	overdose_threshold = 60
+
+/datum/reagent/medicine/stimulants/on_mob_metabolize(mob/living/L)
+	..()
+	L.add_movespeed_modifier(/datum/movespeed_modifier/reagent/stimulants)
+	ADD_TRAIT(L, TRAIT_STUNRESISTANCE, type)
+
+/datum/reagent/medicine/stimulants/on_mob_end_metabolize(mob/living/L)
+	L.remove_movespeed_modifier(/datum/movespeed_modifier/reagent/stimulants)
+	REMOVE_TRAIT(L, TRAIT_STUNRESISTANCE, type)
+	..()
+
+/datum/reagent/medicine/stimulants/on_mob_life(mob/living/carbon/M)
+	if(M.health < 50 && M.health > 0)
+		M.adjustOxyLoss(-1*REM, 0)
+		M.adjustToxLoss(-1*REM, 0)
+		M.adjustBruteLoss(-1*REM, 0)
+		M.adjustFireLoss(-1*REM, 0)
+	M.AdjustAllImmobility(-60)
+	M.adjustStaminaLoss(-5*REM, 0)
+	..()
+	. = 1
+
+/datum/reagent/medicine/stimulants/overdose_process(mob/living/M)
+	if(prob(33))
+		M.adjustStaminaLoss(2.5*REM, 0)
+		M.adjustToxLoss(1*REM, 0)
+		M.losebreath++
+		. = 1
+	..()
+
+/datum/reagent/medicine/cureall
+	name = "Cureall Solution"
+	description = "A diluted solution created from plasmatic binding of Alvitane, Indomide, and charcoal. Slowly restores all types of damage."
+	reagent_state = LIQUID
+	color = "#C8A5DC"
+	taste_description = "still water"
+	overdose_threshold = 30
+
+/datum/reagent/medicine/cureall/on_mob_life(mob/living/carbon/M)
+	M.adjustBruteLoss(-0.3*REM, 0)
+	M.adjustFireLoss(-0.3*REM, 0)
+	M.adjustToxLoss(-0.3*REM, 0)
+	. = 1
+	..()
+
+/datum/reagent/medicine/cureall/overdose_process(mob/living/M)
+	if(prob(50))
+		M.adjustBruteLoss(0.5*REM, 0)
+		M.adjustFireLoss(0.5*REM, 0)
+		M.adjustToxLoss(0.5*REM, 0)
+		. = 1
+	..()
+
+/// CRIT REAGENTS ///
+
+/datum/reagent/medicine/epinephrine
+	name = "Epinephrine"
+	description = "Very minor boost to stun resistance. Slowly heals damage if a patient is in critical condition, as well as regulating oxygen loss. Overdose causes weakness and toxin damage."
+	reagent_state = LIQUID
+	color = "#D2FFFA"
+	metabolization_rate = 0.25 * REAGENTS_METABOLISM
+	overdose_threshold = 30
+
+/datum/reagent/medicine/epinephrine/on_mob_metabolize(mob/living/carbon/M)
+	..()
+	ADD_TRAIT(M, TRAIT_NOCRITDAMAGE, type)
+
+/datum/reagent/medicine/epinephrine/on_mob_end_metabolize(mob/living/carbon/M)
+	REMOVE_TRAIT(M, TRAIT_NOCRITDAMAGE, type)
+	..()
+
+/datum/reagent/medicine/epinephrine/on_mob_life(mob/living/carbon/M)
+	if(M.health <= M.crit_threshold)
+		M.adjustToxLoss(-0.5*REM, 0)
+		M.adjustBruteLoss(-0.5*REM, 0)
+		M.adjustFireLoss(-0.5*REM, 0)
+		M.adjustOxyLoss(-0.5*REM, 0)
+	if(M.losebreath >= 4)
+		M.losebreath -= 2
+	if(M.losebreath < 0)
+		M.losebreath = 0
+	M.adjustStaminaLoss(-0.5*REM, 0)
+	. = 1
+	if(prob(20))
+		M.AdjustAllImmobility(-20)
+	..()
+
+/datum/reagent/medicine/epinephrine/overdose_process(mob/living/M)
+	if(prob(33))
+		M.adjustStaminaLoss(2.5*REM, 0)
+		M.adjustToxLoss(1*REM, 0)
+		M.losebreath++
+		. = 1
+	..()
+
+/datum/reagent/medicine/atropine
+	name = "Atropine"
+	description = "If a patient is in critical condition, rapidly heals all damage types as well as regulating oxygen in the body. Excellent for stabilizing wounded patients."
+	reagent_state = LIQUID
+	color = "#1D3535" //slightly more blue, like epinephrine
+	metabolization_rate = 0.25 * REAGENTS_METABOLISM
+	overdose_threshold = 35
+
+/datum/reagent/medicine/atropine/on_mob_life(mob/living/carbon/M)
+	if(M.health <= M.crit_threshold)
+		M.adjustToxLoss(-2*REM, 0)
+		M.adjustBruteLoss(-2*REM, 0)
+		M.adjustFireLoss(-2*REM, 0)
+		M.adjustOxyLoss(-5*REM, 0)
+		. = 1
+	M.losebreath = 0
+	if(prob(20))
+		M.set_timed_status_effect(10 SECONDS * REM, /datum/status_effect/jitter, only_if_higher = TRUE)
+		M.set_timed_status_effect(10 SECONDS * REM, /datum/status_effect/jitter, only_if_higher = TRUE)
+	..()
+
+/datum/reagent/medicine/atropine/overdose_process(mob/living/M)
+	M.adjustToxLoss(0.5*REM, 0)
+	. = 1
+	M.set_timed_status_effect(2 SECONDS * REM, /datum/status_effect/jitter, only_if_higher = TRUE)
+	M.adjust_timed_status_effect(2 SECONDS * REM, /datum/status_effect/dizziness, max_duration = 20 SECONDS)
+	..()
+
diff --git a/code/modules/reagents/chemistry/reagents/medical_reagents/misc_reagents.dm b/code/modules/reagents/chemistry/reagents/medical_reagents/misc_reagents.dm
new file mode 100644
index 0000000000..0cb149911c
--- /dev/null
+++ b/code/modules/reagents/chemistry/reagents/medical_reagents/misc_reagents.dm
@@ -0,0 +1,242 @@
+/*
+** really more "weird" reagents
+** one could even say strange ones
+*/
+
+/* Admin Reagent */
+
+/datum/reagent/medicine/adminordrazine
+	name = "Adminordrazine"
+	description = "It's magic. We don't have to explain it."
+	color = "#E0BB00" //golden for the gods
+	can_synth = FALSE
+	taste_description = "badmins"
+
+/datum/reagent/medicine/adminordrazine/on_mob_life(mob/living/carbon/M)
+	M.reagents.remove_all_type(/datum/reagent/toxin, 5*REM, 0, 1)
+	M.setCloneLoss(0, 0)
+	M.setOxyLoss(0, 0)
+	M.radiation = 0
+	M.heal_bodypart_damage(5,5)
+	M.adjustToxLoss(-5, 0, TRUE)
+	M.hallucination = 0
+	REMOVE_TRAITS_NOT_IN(M, list(SPECIES_TRAIT, ROUNDSTART_TRAIT, ORGAN_TRAIT))
+	M.set_blurriness(0)
+	M.set_blindness(0)
+	M.SetKnockdown(0)
+	M.SetStun(0)
+	M.SetUnconscious(0)
+	M.SetParalyzed(0)
+	M.SetImmobilized(0)
+	M.silent = FALSE
+	M.disgust = 0
+	M.drowsyness = 0
+	M.stuttering = 0
+	M.slurring = 0
+	M.confused = 0
+	M.set_sleeping(0)
+	M.remove_status_effect(/datum/status_effect/jitter)
+	M.remove_status_effect(/datum/status_effect/dizziness)
+	if(M.blood_volume < BLOOD_VOLUME_NORMAL)
+		M.blood_volume = BLOOD_VOLUME_NORMAL
+
+	M.cure_all_traumas(TRAUMA_RESILIENCE_MAGIC)
+	for(var/organ in M.internal_organs)
+		var/obj/item/organ/O = organ
+		O.setOrganDamage(0)
+	for(var/thing in M.diseases)
+		var/datum/disease/D = thing
+		if(D.severity == DISEASE_SEVERITY_POSITIVE)
+			continue
+		D.cure()
+	..()
+	. = 1
+
+/datum/reagent/medicine/adminordrazine/on_hydroponics_apply(obj/item/seeds/myseed, datum/reagents/chems, obj/machinery/hydroponics/mytray, mob/user)
+	. = ..()
+	if(chems.has_reagent(type, 1))
+		mytray.adjustWater(round(chems.get_reagent_amount(type) * 1))
+		mytray.adjustHealth(round(chems.get_reagent_amount(type) * 1))
+		mytray.adjustPests(-rand(1,5))
+		mytray.adjustWeeds(-rand(1,5))
+	if(chems.has_reagent(type, 3))
+		switch(rand(100))
+			if(66 to 100)
+				mytray.mutatespecie()
+			if(33 to 65)
+				mytray.mutateweed()
+			if(1 to 32)
+				mytray.mutatepest(user)
+			else
+				if(prob(20))
+					mytray.visible_message(span_warning("Nothing happens..."))
+
+/* Basically an anomalychem at this point */
+
+/datum/reagent/medicine/strange_reagent
+	name = "Strange Reagent"
+	description = "A miracle drug capable of bringing the dead back to life. Works topically unless anotamically complex, in which case works orally. Only works if the target has less than 200 total brute and burn damage and hasn't been husked and requires more reagent depending on damage inflicted. Causes damage to the living."
+	reagent_state = LIQUID
+	color = "#A0E85E"
+	metabolization_rate = 1.25 * REAGENTS_METABOLISM
+	taste_description = "magnets"
+	harmful = TRUE
+
+/datum/reagent/medicine/strange_reagent/expose_mob(mob/living/M, method=TOUCH, reac_volume)
+	if(M.stat != DEAD)
+		return ..()
+	if(iscarbon(M) && method != INGEST) //simplemobs can still be splashed
+		return ..()
+	var/amount_to_revive = round((M.getBruteLoss()+M.getFireLoss())/20)
+	if(M.getBruteLoss()+M.getFireLoss() >= 200 || HAS_TRAIT(M, TRAIT_HUSK) || reac_volume < amount_to_revive) //body will die from brute+burn on revive or you haven't provided enough to revive.
+		M.visible_message(span_warning("[M]'s body convulses a bit, and then falls still once more."))
+		M.do_jitter_animation(10)
+		return
+	M.visible_message(span_warning("[M]'s body starts convulsing!"))
+	M.notify_ghost_cloning("Your body is being revived with Strange Reagent!")
+	M.do_jitter_animation(10)
+	var/excess_healing = 5*(reac_volume-amount_to_revive) //excess reagent will heal blood and organs across the board
+	addtimer(CALLBACK(M, TYPE_PROC_REF(/mob/living/carbon, do_jitter_animation), 10), 40) //jitter immediately, then again after 4 and 8 seconds
+	addtimer(CALLBACK(M, TYPE_PROC_REF(/mob/living/carbon, do_jitter_animation), 10), 80)
+	addtimer(CALLBACK(M, TYPE_PROC_REF(/mob/living, revive), FALSE, FALSE, excess_healing), 79)
+	..()
+
+/datum/reagent/medicine/strange_reagent/on_mob_life(mob/living/carbon/M)
+	var/damage_at_random = rand(0,250)/100 //0 to 2.5
+	M.adjustBruteLoss(damage_at_random*REM, FALSE)
+	M.adjustFireLoss(damage_at_random*REM, FALSE)
+	..()
+	. = TRUE
+
+/datum/reagent/medicine/strange_reagent/on_hydroponics_apply(obj/item/seeds/myseed, datum/reagents/chems, obj/machinery/hydroponics/mytray, mob/user)
+	. = ..()
+	if(chems.has_reagent(type, 5))
+		mytray.spawnplant()
+
+/* Stasis just freezes you. It's pretty misc */
+
+/datum/reagent/medicine/stasis
+	name = "Stasis"
+	description = "A liquid blue chemical that causes the body to enter a chemically induced stasis, irregardless of current state."
+	reagent_state = LIQUID
+	color = "#51b5cb" //a nice blue
+	overdose_threshold = 0
+
+/datum/reagent/medicine/stasis/expose_mob(mob/living/M, method=INJECT, reac_volume, show_message = 1)
+	if(method != INJECT)
+		return
+	if(iscarbon(M))
+		var/stasis_duration = min(20 SECONDS * reac_volume, 300 SECONDS)
+		to_chat(M, span_warning("Your body starts to slow down, sensation retreating from your limbs!"))
+		M.apply_status_effect(STATUS_EFFECT_STASIS, STASIS_DRUG_EFFECT)
+		addtimer(CALLBACK(M, TYPE_PROC_REF(/mob/living, remove_status_effect), STATUS_EFFECT_STASIS, STASIS_DRUG_EFFECT), stasis_duration, TIMER_UNIQUE)
+
+/datum/reagent/medicine/stasis/on_mob_life(mob/living/carbon/M)
+	M.adjustToxLoss(1)
+	..()
+	. = 1
+
+/* Rezadone is good for unhusking at this point */
+
+/datum/reagent/medicine/rezadone
+	name = "Rezadone"
+	description = "A powder derived from fish toxin, Rezadone can effectively treat genetic damage as well as restoring minor wounds. Overdose will cause intense nausea and minor toxin damage."
+	reagent_state = SOLID
+	color = "#669900" // rgb: 102, 153, 0
+	overdose_threshold = 30
+	taste_description = "fish"
+
+/datum/reagent/medicine/rezadone/on_mob_life(mob/living/carbon/M)
+	M.setCloneLoss(0) //Rezadone is almost never used in favor of cryoxadone. Hopefully this will change that.
+	M.heal_bodypart_damage(1,1)
+	REMOVE_TRAIT(M, TRAIT_DISFIGURED, TRAIT_GENERIC)
+	..()
+	. = 1
+
+/datum/reagent/medicine/rezadone/overdose_process(mob/living/M)
+	M.adjustToxLoss(1, 0)
+	M.set_timed_status_effect(10 SECONDS * REM, /datum/status_effect/jitter, only_if_higher = TRUE)
+	M.set_timed_status_effect(10 SECONDS * REM, /datum/status_effect/dizziness, only_if_higher = TRUE)
+	..()
+	. = 1
+
+/datum/reagent/medicine/rezadone/expose_mob(mob/living/M, method=TOUCH, reac_volume)
+	. = ..()
+	if(iscarbon(M))
+		var/mob/living/carbon/patient = M
+		if(reac_volume >= 5 && HAS_TRAIT_FROM(patient, TRAIT_HUSK, "burn") && patient.getFireLoss() < THRESHOLD_UNHUSK) //One carp yields 12u rezadone.
+			patient.cure_husk("burn")
+			patient.visible_message(span_nicegreen("[patient]'s body rapidly absorbs moisture from the enviroment, taking on a more healthy appearance."))
+
+
+//insulin
+/datum/reagent/medicine/insulin
+	name = "Insulin"
+	description = "Increases sugar depletion rates."
+	reagent_state = LIQUID
+	color = "#FFFFF0"
+	metabolization_rate = 0.5 * REAGENTS_METABOLISM
+
+/datum/reagent/medicine/insulin/on_mob_life(mob/living/carbon/M)
+	if(M.AdjustSleeping(-20))
+		. = 1
+	M.reagents.remove_reagent(/datum/reagent/consumable/sugar, 3)
+	..()
+
+/*
+** 	changeling reagents
+** there's only two so no file
+*/
+
+//used for changeling's adrenaline power
+/datum/reagent/medicine/changelingadrenaline
+	name = "Changeling Adrenaline"
+	description = "Reduces the duration of unconciousness, knockdown and stuns. Restores stamina, but deals toxin damage when overdosed."
+	color = "#C1151D"
+	overdose_threshold = 30
+
+/datum/reagent/medicine/changelingadrenaline/on_mob_life(mob/living/carbon/M as mob)
+	..()
+	M.AdjustAllImmobility(-20)
+	M.adjustStaminaLoss(-10, 0)
+	M.set_timed_status_effect(20 SECONDS * REM, /datum/status_effect/jitter, only_if_higher = TRUE)
+	M.set_timed_status_effect(20 SECONDS * REM, /datum/status_effect/dizziness, only_if_higher = TRUE)
+	return TRUE
+
+/datum/reagent/medicine/changelingadrenaline/on_mob_metabolize(mob/living/L)
+	..()
+	ADD_TRAIT(L, TRAIT_SLEEPIMMUNE, type)
+	ADD_TRAIT(L, TRAIT_STUNRESISTANCE, type)
+	L.add_movespeed_mod_immunities(type, /datum/movespeed_modifier/damage_slowdown)
+
+/datum/reagent/medicine/changelingadrenaline/on_mob_end_metabolize(mob/living/L)
+	..()
+	REMOVE_TRAIT(L, TRAIT_SLEEPIMMUNE, type)
+	REMOVE_TRAIT(L, TRAIT_STUNRESISTANCE, type)
+	L.remove_movespeed_mod_immunities(type, /datum/movespeed_modifier/damage_slowdown)
+	L.remove_status_effect(/datum/status_effect/dizziness)
+	L.remove_status_effect(/datum/status_effect/jitter)
+
+/datum/reagent/medicine/changelingadrenaline/overdose_process(mob/living/M as mob)
+	M.adjustToxLoss(1, 0)
+	..()
+	return TRUE
+
+/datum/reagent/medicine/changelinghaste
+	name = "Changeling Haste"
+	description = "Drastically increases movement speed, but deals toxin damage."
+	color = "#AE151D"
+	metabolization_rate = 1
+
+/datum/reagent/medicine/changelinghaste/on_mob_metabolize(mob/living/L)
+	..()
+	L.add_movespeed_modifier(/datum/movespeed_modifier/reagent/changelinghaste)
+
+/datum/reagent/medicine/changelinghaste/on_mob_end_metabolize(mob/living/L)
+	L.remove_movespeed_modifier(/datum/movespeed_modifier/reagent/changelinghaste)
+	..()
+
+/datum/reagent/medicine/changelinghaste/on_mob_life(mob/living/carbon/M)
+	M.adjustToxLoss(2, 0)
+	..()
+	return TRUE
diff --git a/code/modules/reagents/chemistry/reagents/medical_reagents/organ_reagents.dm b/code/modules/reagents/chemistry/reagents/medical_reagents/organ_reagents.dm
new file mode 100644
index 0000000000..8a2987d797
--- /dev/null
+++ b/code/modules/reagents/chemistry/reagents/medical_reagents/organ_reagents.dm
@@ -0,0 +1,175 @@
+/* reagents that primarily interface with organ damage.
+** Things like oculine, incausiate
+*/
+
+
+/datum/reagent/medicine/oculine
+	name = "Oculine"
+	description = "Quickly restores eye damage, cures nearsightedness, and has a chance to restore vision to the blind."
+	reagent_state = LIQUID
+	color = "#404040" //oculine is dark grey,
+	metabolization_rate = 0.25 * REAGENTS_METABOLISM
+	taste_description = "dull toxin"
+
+/datum/reagent/medicine/oculine/on_mob_life(mob/living/carbon/M)
+	var/obj/item/organ/eyes/eyes = M.getorganslot(ORGAN_SLOT_EYES)
+	if (!eyes)
+		return
+	eyes.applyOrganDamage(-2)
+	if(HAS_TRAIT_FROM(M, TRAIT_BLIND, EYE_DAMAGE))
+		if(prob(20))
+			to_chat(M, span_warning("Your vision slowly returns..."))
+			M.cure_blind(EYE_DAMAGE)
+			M.cure_nearsighted(EYE_DAMAGE)
+			M.blur_eyes(35)
+
+	else if(HAS_TRAIT_FROM(M, TRAIT_NEARSIGHT, EYE_DAMAGE))
+		to_chat(M, span_warning("The blackness in your peripheral vision fades."))
+		M.cure_nearsighted(EYE_DAMAGE)
+		M.blur_eyes(10)
+	else if(M.eye_blind || M.eye_blurry)
+		M.set_blindness(0)
+		M.set_blurriness(0)
+	..()
+
+/datum/reagent/medicine/inacusiate
+	name = "Inacusiate"
+	description = "Rapidly restores hearing to a patient, assuming the loss of hearing is not chronic."
+	color = "#606060" //inacusiate is light grey
+
+/datum/reagent/medicine/inacusiate/on_mob_life(mob/living/carbon/M)
+	var/obj/item/organ/ears/ears = M.getorganslot(ORGAN_SLOT_EARS)
+	if(!ears)
+		return
+	ears.adjustEarDamage(-4 * REM)
+	return ..()
+
+/datum/reagent/medicine/mannitol
+	name = "Mannitol"
+	description = "Efficiently restores brain damage."
+	color = "#A0A0A0" //mannitol is light grey, neurine is lighter grey
+
+/datum/reagent/medicine/mannitol/on_mob_life(mob/living/carbon/C)
+	C.adjustOrganLoss(ORGAN_SLOT_BRAIN, -2*REM)
+	..()
+
+/datum/reagent/medicine/neurine
+	name = "Neurine"
+	description = "Reacts with neural tissue, helping reform damaged connections. Can cure minor traumas."
+	color = "#C0C0C0" //ditto
+
+/datum/reagent/medicine/neurine/on_mob_life(mob/living/carbon/C)
+	if(C.has_reagent(/datum/reagent/consumable/ethanol/neurotoxin))
+		C.remove_reagent(/datum/reagent/consumable/ethanol/neurotoxin, 5)
+	if(prob(15))
+		C.cure_trauma_type(resilience = TRAUMA_RESILIENCE_BASIC)
+	..()
+
+/datum/reagent/medicine/corazone
+	// Heart attack code will not do damage if corazone is present
+	// because it's SPACE MAGIC ASPIRIN
+	name = "Corazone"
+	description = "A medication used to treat pain, fever, and inflammation, along with heart attacks. Can also be used to stabilize livers."
+	color = "#F49797"
+	self_consuming = TRUE
+
+/datum/reagent/medicine/corazone/on_mob_metabolize(mob/living/M)
+	..()
+	ADD_TRAIT(M, TRAIT_PAIN_RESIST, type)
+	ADD_TRAIT(M, TRAIT_STABLEHEART, type)
+	ADD_TRAIT(M, TRAIT_STABLELIVER, type)
+
+/datum/reagent/medicine/corazone/on_mob_end_metabolize(mob/living/M)
+	REMOVE_TRAIT(M, TRAIT_PAIN_RESIST, type)
+	REMOVE_TRAIT(M, TRAIT_STABLEHEART, type)
+	REMOVE_TRAIT(M, TRAIT_STABLELIVER, type)
+
+/datum/reagent/medicine/silibinin
+	name = "Silibinin"
+	description = "A thistle derrived hepatoprotective flavolignan mixture that help reverse damage to the liver."
+	reagent_state = SOLID
+	color = "#FFFFD0"
+	metabolization_rate = 1.5 * REAGENTS_METABOLISM
+
+/datum/reagent/medicine/silibinin/expose_mob(mob/living/carbon/M, method=INJECT, reac_volume)
+	if(method != INJECT)
+		return
+
+	M.adjustOrganLoss(ORGAN_SLOT_LIVER, -1)  //on injection, will heal the liver. This will (hopefully) fix dead livers.
+
+	..()
+
+/datum/reagent/medicine/silibinin/on_mob_life(mob/living/carbon/M)
+	M.adjustOrganLoss(ORGAN_SLOT_LIVER, -2)//Add a chance to cure liver trauma once implemented.
+	..()
+	. = 1
+
+
+
+/*
+*How this medicine works:
+*Penthrite if you are not in crit only stabilizes your heart.
+*As soon as you pass crit threshold it's special effects kick in. Penthrite forces your heart to beat preventing you from entering
+*soft and hard crit, but there is a catch. During this you will be healed and you will sustain
+*heart damage that will not imapct you as long as penthrite is in your system.
+*If you reach the threshold of -60 HP penthrite stops working and you get a heart attack, penthrite is flushed from your system in that very moment,
+*causing you to loose your soft crit, hard crit and heart stabilization effects.
+*Overdosing on penthrite also causes a heart failure.
+*/
+
+/datum/reagent/medicine/penthrite
+	name = "Penthrite"
+	description = "An expensive medicine that aids with pumping blood around the body even without a heart, and prevents the heart from slowing down. It reacts violently with other emergency medication."
+	color = "#F5F5F5"
+	overdose_threshold = 50
+
+
+/datum/reagent/medicine/penthrite/on_mob_add(mob/living/M)
+	. = ..()
+	to_chat(M,"<span class='notice'>Your heart begins to beat with great force!")
+	ADD_TRAIT(M, TRAIT_STABLEHEART, type)
+	ADD_TRAIT(M, TRAIT_NOHARDCRIT,type)
+	ADD_TRAIT(M, TRAIT_NOSOFTCRIT,type)
+	M.crit_threshold = M.crit_threshold + HEALTH_THRESHOLD_FULLCRIT*2 //your heart is still pumping!
+
+
+/datum/reagent/medicine/penthrite/on_mob_life(mob/living/carbon/human/H)
+	H.adjustOrganLoss(ORGAN_SLOT_STOMACH,0.25)
+	if(H.health <= HEALTH_THRESHOLD_CRIT && H.health > H.crit_threshold) //we cannot save someone above our raised crit threshold.
+
+		H.adjustToxLoss(-2 * REM, 0)
+		H.adjustBruteLoss(-2 * REM, 0)
+		H.adjustFireLoss(-2 * REM, 0)
+		H.adjustOxyLoss(-6 * REM, 0)
+
+		H.losebreath = 0
+
+		H.adjustOrganLoss(ORGAN_SLOT_HEART,max(1,volume/10)) // your heart is barely keeping up!
+
+		H.set_timed_status_effect(rand(0 SECONDS, 4 SECONDS) * REM, /datum/status_effect/jitter, only_if_higher = TRUE)
+		H.set_timed_status_effect(rand(0 SECONDS, 4 SECONDS) * REM, /datum/status_effect/dizziness, only_if_higher = TRUE)
+
+
+		if(prob(33))
+			to_chat(H,span_danger("Your body is trying to give up, but your heart is still beating!"))
+
+	if(H.health <= H.crit_threshold) //certain death above this threshold
+		REMOVE_TRAIT(H, TRAIT_STABLEHEART, type) //we have to remove the stable heart before we give him heart attack
+		to_chat(H,span_danger("You feel something rupturing inside your chest!"))
+		H.force_scream()
+		H.set_heartattack(TRUE)
+		volume = 0
+	. = ..()
+
+/datum/reagent/medicine/penthrite/on_mob_end_metabolize(mob/living/M)
+	M.crit_threshold = M.crit_threshold - HEALTH_THRESHOLD_FULLCRIT*2 //your heart is still pumping!
+	REMOVE_TRAIT(M, TRAIT_STABLEHEART, type)
+	REMOVE_TRAIT(M, TRAIT_NOHARDCRIT,type)
+	REMOVE_TRAIT(M, TRAIT_NOSOFTCRIT,type)
+	. = ..()
+
+/datum/reagent/medicine/penthrite/overdose_process(mob/living/carbon/human/H)
+	REMOVE_TRAIT(H, TRAIT_STABLEHEART, type)
+	H.adjustStaminaLoss(10)
+	H.adjustOrganLoss(ORGAN_SLOT_HEART,10)
+	H.set_heartattack(TRUE)
diff --git a/code/modules/reagents/chemistry/reagents/medical_reagents/pain_reagents.dm b/code/modules/reagents/chemistry/reagents/medical_reagents/pain_reagents.dm
new file mode 100644
index 0000000000..eb65838be3
--- /dev/null
+++ b/code/modules/reagents/chemistry/reagents/medical_reagents/pain_reagents.dm
@@ -0,0 +1,369 @@
+/* Tramal - low power and lasts over a long period of time. Space Ibuprofen
+** Morphine - Medium intensity and less duration. Makes you sleepy.
+** Dimorlin - high intensity low duration. Analgesia
+** Miner's Salve - High intensity with some
+*/
+
+/datum/reagent/medicine/tramal
+	name = "Tramal"
+	description = "A low intensity, high duration painkiller. Causes slight drowiness in extended use."
+	reagent_state = LIQUID
+	color = "#34eeee"
+	metabolization_rate = 0.2 * REAGENTS_METABOLISM
+	overdose_threshold = 35
+	addiction_threshold = 30
+
+/datum/reagent/medicine/tramal/on_mob_metabolize(mob/living/L)
+	..()
+	ADD_TRAIT(L, TRAIT_PAIN_RESIST, type)
+
+/datum/reagent/medicine/tramal/on_mob_end_metabolize(mob/living/L)
+	REMOVE_TRAIT(L, TRAIT_PAIN_RESIST, type)
+	..()
+
+/datum/reagent/medicine/tramal/on_mob_life(mob/living/carbon/M)
+	if(current_cycle >= 5)
+		SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "numb", /datum/mood_event/narcotic_light, name)
+	switch(current_cycle)
+		if(60)
+			to_chat(M, span_warning("You feel drowsy..."))
+		if(61 to INFINITY)
+			M.drowsyness += 1
+	..()
+
+/datum/reagent/medicine/tramal/overdose_start(mob/living/M)
+	. = ..()
+	ADD_TRAIT(M, TRAIT_PINPOINT_EYES, type)
+
+/datum/reagent/medicine/tramal/overdose_process(mob/living/M)
+	if(prob(33))
+		M.set_timed_status_effect(4 SECONDS * REM, /datum/status_effect/jitter, only_if_higher = TRUE)
+		M.set_timed_status_effect(4 SECONDS * REM, /datum/status_effect/dizziness, only_if_higher = TRUE)
+	..()
+
+/datum/reagent/medicine/tramal/addiction_act_stage1(mob/living/M)
+	if(prob(33))
+		M.set_timed_status_effect(4 SECONDS * REM, /datum/status_effect/dizziness, only_if_higher = TRUE)
+	..()
+
+/datum/reagent/medicine/tramal/addiction_act_stage2(mob/living/M)
+	if(prob(33))
+		M.set_timed_status_effect(4 SECONDS * REM, /datum/status_effect/jitter, only_if_higher = TRUE)
+		M.set_timed_status_effect(6 SECONDS * REM, /datum/status_effect/dizziness, only_if_higher = TRUE)
+	..()
+
+/datum/reagent/medicine/tramal/addiction_act_stage3(mob/living/M)
+	if(prob(33))
+		M.drop_all_held_items()
+		M.set_timed_status_effect(4 SECONDS * REM, /datum/status_effect/jitter, only_if_higher = TRUE)
+		M.set_timed_status_effect(8 SECONDS * REM, /datum/status_effect/dizziness, only_if_higher = TRUE)
+	..()
+
+/datum/reagent/medicine/tramal/addiction_act_stage4(mob/living/M)
+	if(prob(33))
+		M.drop_all_held_items()
+		M.adjustToxLoss(2*REM, 0)
+		. = 1
+		M.set_timed_status_effect(8 SECONDS * REM, /datum/status_effect/jitter, only_if_higher = TRUE)
+		M.set_timed_status_effect(10 SECONDS * REM, /datum/status_effect/dizziness, only_if_higher = TRUE)
+	..()
+
+
+/datum/reagent/medicine/morphine
+	name = "Morphine"
+	description = "A painkiller that allows the patient to move at full speed even in bulky objects. Causes drowsiness and eventually unconsciousness in high doses. Overdose will cause a variety of effects, ranging from minor to lethal."
+	reagent_state = LIQUID
+	color = "#A9FBFB"
+	metabolization_rate = 0.5 * REAGENTS_METABOLISM
+	overdose_threshold = 30
+	addiction_threshold = 25
+
+/datum/reagent/medicine/morphine/on_mob_metabolize(mob/living/L)
+	..()
+	ADD_TRAIT(L, TRAIT_PAIN_RESIST, type)
+	L.add_movespeed_mod_immunities(type, /datum/movespeed_modifier/damage_slowdown)
+	if(ishuman(L))
+		var/mob/living/carbon/human/drugged = L
+		drugged.physiology.damage_resistance += 5
+
+/datum/reagent/medicine/morphine/on_mob_end_metabolize(mob/living/L)
+	REMOVE_TRAIT(L, TRAIT_PAIN_RESIST, type)
+	L.remove_movespeed_mod_immunities(type, /datum/movespeed_modifier/damage_slowdown)
+	if(ishuman(L))
+		var/mob/living/carbon/human/drugged = L
+		drugged.physiology.damage_resistance -= 5
+	..()
+
+/datum/reagent/medicine/morphine/on_mob_life(mob/living/carbon/M)
+	if(current_cycle >= 5)
+		SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "numb", /datum/mood_event/narcotic_medium, name)
+	switch(current_cycle)
+		if(29)
+			to_chat(M, span_warning("You start to feel tired..."))
+		if(30 to 59)
+			M.drowsyness += 1
+		if(60 to INFINITY)
+			M.Sleeping(40)
+			. = 1
+	..()
+
+/datum/reagent/medicine/morphine/overdose_start(mob/living/M)
+	. = ..()
+	ADD_TRAIT(M, TRAIT_PINPOINT_EYES, type)
+
+/datum/reagent/medicine/morphine/overdose_process(mob/living/M)
+	if(prob(33))
+		M.drop_all_held_items()
+		M.set_timed_status_effect(4 SECONDS * REM, /datum/status_effect/jitter, only_if_higher = TRUE)
+		M.set_timed_status_effect(4 SECONDS * REM, /datum/status_effect/dizziness, only_if_higher = TRUE)
+	..()
+
+/datum/reagent/medicine/morphine/addiction_act_stage1(mob/living/M)
+	if(prob(33))
+		M.drop_all_held_items()
+		M.set_timed_status_effect(4 SECONDS * REM, /datum/status_effect/jitter, only_if_higher = TRUE)
+	..()
+
+/datum/reagent/medicine/morphine/addiction_act_stage2(mob/living/M)
+	if(prob(33))
+		M.drop_all_held_items()
+		M.adjustToxLoss(1*REM, 0)
+		. = 1
+		M.set_timed_status_effect(6 SECONDS * REM, /datum/status_effect/jitter, only_if_higher = TRUE)
+		M.set_timed_status_effect(6 SECONDS * REM, /datum/status_effect/dizziness, only_if_higher = TRUE)
+	..()
+
+/datum/reagent/medicine/morphine/addiction_act_stage3(mob/living/M)
+	if(prob(33))
+		M.drop_all_held_items()
+		M.adjustToxLoss(2*REM, 0)
+		. = 1
+		M.set_timed_status_effect(8 SECONDS * REM, /datum/status_effect/jitter, only_if_higher = TRUE)
+		M.set_timed_status_effect(8 SECONDS * REM, /datum/status_effect/dizziness, only_if_higher = TRUE)
+	..()
+
+/datum/reagent/medicine/morphine/addiction_act_stage4(mob/living/M)
+	if(prob(33))
+		M.drop_all_held_items()
+		M.adjustToxLoss(3*REM, 0)
+		. = 1
+		M.set_timed_status_effect(10 SECONDS * REM, /datum/status_effect/jitter, only_if_higher = TRUE)
+		M.set_timed_status_effect(10 SECONDS * REM, /datum/status_effect/dizziness, only_if_higher = TRUE)
+	..()
+
+/datum/reagent/medicine/dimorlin
+	name = "Dimorlin"
+	description = "A powerful opiate-derivative analgesiac. Extremely habit forming"
+	reagent_state = LIQUID
+	color = "#71adad"
+	metabolization_rate = 0.4 * REAGENTS_METABOLISM
+	overdose_threshold = 15
+	addiction_threshold = 11
+
+/datum/reagent/medicine/dimorlin/on_mob_metabolize(mob/living/L)
+	..()
+	ADD_TRAIT(L, TRAIT_ANALGESIA, type)
+	if(iscarbon(L))
+		var/mob/living/carbon/C = L
+		C.set_screwyhud(SCREWYHUD_HEALTHY)
+	L.add_movespeed_mod_immunities(type, /datum/movespeed_modifier/damage_slowdown)
+	if(ishuman(L))
+		var/mob/living/carbon/human/drugged = L
+		drugged.physiology.damage_resistance += 15
+
+/datum/reagent/medicine/dimorlin/on_mob_end_metabolize(mob/living/L)
+	REMOVE_TRAIT(L, TRAIT_ANALGESIA, type)
+	if(iscarbon(L))
+		var/mob/living/carbon/C = L
+		C.set_screwyhud(SCREWYHUD_NONE)
+	L.remove_movespeed_mod_immunities(type, /datum/movespeed_modifier/damage_slowdown)
+	if(ishuman(L))
+		var/mob/living/carbon/human/drugged = L
+		drugged.physiology.damage_resistance -= 15
+	..()
+
+/datum/reagent/medicine/dimorlin/on_mob_life(mob/living/carbon/C)
+	C.set_screwyhud(SCREWYHUD_HEALTHY)
+	if(current_cycle >= 3)
+		SEND_SIGNAL(C, COMSIG_ADD_MOOD_EVENT, "numb", /datum/mood_event/narcotic_heavy, name)
+	..()
+
+/datum/reagent/medicine/dimorlin/overdose_start(mob/living/M)
+	. = ..()
+	ADD_TRAIT(M, TRAIT_PINPOINT_EYES, type)
+
+/datum/reagent/medicine/dimorlin/overdose_process(mob/living/M)
+	if(prob(33))
+		M.losebreath++
+		M.adjustOxyLoss(4, 0)
+	if(prob(20))
+		M.AdjustUnconscious(20)
+	if(prob(5))
+		M.adjustOrganLoss(ORGAN_SLOT_EYES, 5)
+	..()
+
+/datum/reagent/medicine/dimorlin/addiction_act_stage1(mob/living/M)
+	if(prob(33))
+		M.drop_all_held_items()
+		M.set_timed_status_effect(4 SECONDS * REM, /datum/status_effect/dizziness, only_if_higher = TRUE)
+	..()
+
+/datum/reagent/medicine/dimorlin/addiction_act_stage2(mob/living/M)
+	if(prob(33))
+		M.drop_all_held_items()
+		M.adjustToxLoss(1*REM, 0)
+		. = 1
+		M.set_timed_status_effect(3 SECONDS * REM, /datum/status_effect/jitter, only_if_higher = TRUE)
+		M.set_timed_status_effect(6 SECONDS * REM, /datum/status_effect/dizziness, only_if_higher = TRUE)
+	..()
+
+/datum/reagent/medicine/dimorlin/addiction_act_stage3(mob/living/M)
+	if(prob(33))
+		M.drop_all_held_items()
+		M.adjustToxLoss(2*REM, 0)
+		. = 1
+		M.set_timed_status_effect(4 SECONDS * REM, /datum/status_effect/jitter, only_if_higher = TRUE)
+		M.set_timed_status_effect(8 SECONDS * REM, /datum/status_effect/dizziness, only_if_higher = TRUE)
+	..()
+
+/datum/reagent/medicine/dimorlin/addiction_act_stage4(mob/living/M)
+	if(prob(33))
+		M.drop_all_held_items()
+		M.adjustToxLoss(3*REM, 0)
+		. = 1
+		M.set_timed_status_effect(5 SECONDS * REM, /datum/status_effect/jitter, only_if_higher = TRUE)
+		M.set_timed_status_effect(10 SECONDS * REM, /datum/status_effect/dizziness, only_if_higher = TRUE)
+	..()
+
+/datum/reagent/medicine/mine_salve
+	name = "Miner's Salve"
+	description = "A powerful painkiller. Restores bruising and burns in addition to making the patient believe they are fully healed."
+	reagent_state = LIQUID
+	color = "#6D6374"
+	metabolization_rate = 0.4 * REAGENTS_METABOLISM
+
+/datum/reagent/medicine/mine_salve/on_mob_life(mob/living/carbon/C)
+	C.set_screwyhud(SCREWYHUD_HEALTHY)
+	C.adjustBruteLoss(-0.25*REM, 0)
+	C.adjustFireLoss(-0.25*REM, 0)
+	..()
+	return TRUE
+
+/datum/reagent/medicine/mine_salve/expose_mob(mob/living/M, method=TOUCH, reac_volume, show_message = 1)
+	if(iscarbon(M) && M.stat != DEAD)
+		if(method in list(INGEST, VAPOR, INJECT))
+			M.adjust_nutrition(-5)
+			if(show_message)
+				to_chat(M, span_warning("Your stomach feels empty and cramps!"))
+		else
+			var/mob/living/carbon/C = M
+			for(var/s in C.surgeries)
+				var/datum/surgery/S = s
+				S.speed_modifier = max(0.1, S.speed_modifier)
+
+			if(show_message)
+				to_chat(M, span_danger("You feel your wounds fade away to nothing!") )
+	..()
+
+/datum/reagent/medicine/mine_salve/on_mob_metabolize(mob/living/L)
+	..()
+	ADD_TRAIT(L, TRAIT_ANALGESIA, type)
+	if(iscarbon(L))
+		var/mob/living/carbon/C = L
+		C.set_screwyhud(SCREWYHUD_HEALTHY)
+
+/datum/reagent/medicine/mine_salve/on_mob_end_metabolize(mob/living/M)
+	if(iscarbon(M))
+		var/mob/living/carbon/N = M
+		REMOVE_TRAIT(N, TRAIT_ANALGESIA, type)
+		N.set_screwyhud(SCREWYHUD_NONE)
+	..()
+
+
+/datum/reagent/medicine/carfencadrizine
+	name = "Carfencadrizine"
+	description = "A highly potent synthetic painkiller held in a suspension of stimulating agents. Allows people to keep moving long beyond when they should stop."
+	color = "#859480"
+	overdose_threshold = 8
+	addiction_threshold = 7
+	metabolization_rate = 0.1
+
+/datum/reagent/medicine/carfencadrizine/on_mob_metabolize(mob/living/L)
+	. = ..()
+	ADD_TRAIT(L, TRAIT_HARDLY_WOUNDED, /datum/reagent/medicine/carfencadrizine)
+	ADD_TRAIT(L, TRAIT_PINPOINT_EYES, type)
+	ADD_TRAIT(L, TRAIT_NOSOFTCRIT, type)
+	ADD_TRAIT(L, TRAIT_NOHARDCRIT, type)
+
+/datum/reagent/medicine/carfencadrizine/on_mob_end_metabolize(mob/living/L)
+	. = ..()
+	REMOVE_TRAIT(L, TRAIT_HARDLY_WOUNDED, /datum/reagent/medicine/carfencadrizine)
+	REMOVE_TRAIT(L, TRAIT_PINPOINT_EYES, type)
+	REMOVE_TRAIT(L, TRAIT_NOSOFTCRIT, type)
+	REMOVE_TRAIT(L, TRAIT_NOHARDCRIT, type)
+
+/datum/reagent/medicine/carfencadrizine/on_mob_life(mob/living/carbon/M)
+	if(current_cycle >= 3)
+		SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "numb", /datum/mood_event/narcotic_heavy, name)
+
+	if(M.health <= M.crit_threshold)
+		if(prob(20))
+			M.adjustOrganLoss(ORGAN_SLOT_HEART, 4)
+		if(prob(40))
+			M.playsound_local(get_turf(M), 'sound/health/slowbeat2.ogg', 40,0, channel = CHANNEL_HEARTBEAT, use_reverb = FALSE)
+	..()
+
+/datum/reagent/medicine/carfencadrizine/overdose_process(mob/living/M)
+	if(prob(66))
+		M.losebreath++
+		M.adjustOxyLoss(4, 0)
+	if(prob(40))
+		M.AdjustUnconscious(20)
+	if(prob(10))
+		M.adjustOrganLoss(ORGAN_SLOT_EYES, 3)
+		M.adjustOrganLoss(ORGAN_SLOT_LUNGS, 7)
+	..()
+
+/datum/reagent/medicine/carfencadrizine/addiction_act_stage1(mob/living/M)
+	if(prob(33))
+		M.drop_all_held_items()
+		M.set_timed_status_effect(8 SECONDS * REM, /datum/status_effect/jitter, only_if_higher = TRUE)
+		M.adjustOrganLoss(ORGAN_SLOT_LUNGS, 1)
+	..()
+
+/datum/reagent/medicine/carfencadrizine/addiction_act_stage2(mob/living/M)
+	if(prob(33))
+		M.drop_all_held_items()
+		M.adjustToxLoss(1*REM, 0)
+		. = 1
+		M.set_timed_status_effect(6 SECONDS * REM, /datum/status_effect/dizziness, only_if_higher = TRUE)
+		M.set_timed_status_effect(6 SECONDS * REM, /datum/status_effect/jitter, only_if_higher = TRUE)
+	if(prob(15))
+		M.adjustOrganLoss(ORGAN_SLOT_LUNGS, 1)
+		M.adjustOrganLoss(ORGAN_SLOT_HEART, 1)
+	..()
+
+/datum/reagent/medicine/carfencadrizine/addiction_act_stage3(mob/living/M)
+	if(prob(50))
+		M.drop_all_held_items()
+		M.adjustToxLoss(1*REM, 0)
+		. = 1
+		M.set_timed_status_effect(8 SECONDS * REM, /datum/status_effect/dizziness, only_if_higher = TRUE)
+		M.set_timed_status_effect(8 SECONDS * REM, /datum/status_effect/jitter, only_if_higher = TRUE)
+	if(prob(30))
+		M.adjustOrganLoss(ORGAN_SLOT_LUNGS, 1)
+		M.adjustOrganLoss(ORGAN_SLOT_HEART, 2)
+	..()
+
+/datum/reagent/medicine/carfencadrizine/addiction_act_stage4(mob/living/M)
+	if(prob(60))
+		M.drop_all_held_items()
+		M.adjustToxLoss(1*REM, 0)
+		. = 1
+		M.set_timed_status_effect(8 SECONDS * REM, /datum/status_effect/dizziness, only_if_higher = TRUE)
+		M.set_timed_status_effect(8 SECONDS * REM, /datum/status_effect/jitter, only_if_higher = TRUE)
+	if(prob(40))
+		M.adjustOrganLoss(ORGAN_SLOT_LUNGS, 2)
+		M.adjustOrganLoss(ORGAN_SLOT_HEART, 2)
+	..()
+
diff --git a/code/modules/reagents/chemistry/reagents/medical_reagents/status_reagents.dm b/code/modules/reagents/chemistry/reagents/medical_reagents/status_reagents.dm
new file mode 100644
index 0000000000..d920ecf888
--- /dev/null
+++ b/code/modules/reagents/chemistry/reagents/medical_reagents/status_reagents.dm
@@ -0,0 +1,330 @@
+//reagents relating to status effects
+//i.e. jitter, drunk, dizzy
+
+//I consider disease a status
+/datum/reagent/medicine/spaceacillin
+	name = "Spaceacillin"
+	description = "Spaceacillin will prevent a patient from conventionally spreading any diseases they are currently infected with."
+	color = "#E1F2E6"
+	metabolization_rate = 0.1 * REAGENTS_METABOLISM
+
+/datum/reagent/medicine/mutadone
+	name = "Mutadone"
+	description = "Removes jitteriness and restores genetic defects."
+	color = "#5096C8"
+	taste_description = "acid"
+
+/datum/reagent/medicine/mutadone/on_mob_life(mob/living/carbon/M)
+	M.adjust_timed_status_effect(-100 SECONDS * REM, /datum/status_effect/jitter)
+	if(M.has_dna())
+		M.dna.remove_all_mutations(list(MUT_NORMAL, MUT_EXTRA), TRUE)
+	if(!QDELETED(M)) //We were a monkey, now a human
+		..()
+
+/datum/reagent/medicine/antihol
+	name = "Antihol"
+	description = "Purges alcoholic substance from the patient's body and eliminates its side effects."
+	color = "#00B4C8"
+	taste_description = "raw egg"
+
+/datum/reagent/medicine/antihol/on_mob_life(mob/living/carbon/M)
+	M.remove_status_effect(/datum/status_effect/dizziness)
+	M.drowsyness = 0
+	M.slurring = 0
+	M.confused = 0
+	M.reagents.remove_all_type(/datum/reagent/consumable/ethanol, 3*REM, 0, 1)
+	M.adjustToxLoss(-0.2*REM, 0)
+	if(ishuman(M))
+		var/mob/living/carbon/human/H = M
+		H.adjust_drunk_effect(-10)
+	..()
+	. = 1
+
+/datum/reagent/medicine/diphenhydramine
+	name = "Diphenhydramine"
+	description = "Rapidly purges the body of Histamine and reduces jitteriness. Slight chance of causing drowsiness."
+	reagent_state = LIQUID
+	color = "#64FFE6"
+	metabolization_rate = 0.5 * REAGENTS_METABOLISM
+
+/datum/reagent/medicine/diphenhydramine/on_mob_life(mob/living/carbon/M)
+	if(prob(10))
+		M.drowsyness += 1
+	M.adjust_timed_status_effect(-12 SECONDS, /datum/status_effect/jitter)
+	M.reagents.remove_reagent(/datum/reagent/toxin/histamine,3)
+	..()
+
+
+/datum/reagent/medicine/haloperidol
+	name = "Haloperidol"
+	description = "Increases depletion rates for most stimulating/hallucinogenic drugs. Reduces druggy effects and jitteriness. Severe stamina regeneration penalty, causes drowsiness. Small chance of brain damage."
+	reagent_state = LIQUID
+	color = "#27870a"
+	metabolization_rate = 0.4 * REAGENTS_METABOLISM
+
+/datum/reagent/medicine/haloperidol/on_mob_life(mob/living/carbon/M)
+	for(var/datum/reagent/drug/R in M.reagents.reagent_list)
+		M.reagents.remove_reagent(R.type,5)
+	M.drowsyness += 2
+	if(M.get_timed_status_effect_duration(/datum/status_effect/jitter) >= 6 SECONDS)
+		M.adjust_timed_status_effect(-6 SECONDS * REM, /datum/status_effect/jitter)
+	if (M.hallucination >= 5)
+		M.hallucination -= 5
+	if(prob(20))
+		M.adjustOrganLoss(ORGAN_SLOT_BRAIN, 1*REM, 50)
+	M.adjustStaminaLoss(2.5*REM, 0)
+	..()
+	return TRUE
+
+/datum/reagent/medicine/modafinil
+	name = "Modafinil"
+	description = "Long-lasting sleep suppressant that very slightly reduces stun and knockdown times. Overdosing has horrendous side effects and deals lethal oxygen damage, will knock you unconscious if not dealt with."
+	reagent_state = LIQUID
+	color = "#BEF7D8" // palish blue white
+	metabolization_rate = 0.1 * REAGENTS_METABOLISM
+	overdose_threshold = 20 // with the random effects this might be awesome or might kill you at less than 10u (extensively tested)
+	taste_description = "salt" // it actually does taste salty
+	var/overdose_progress = 0 // to track overdose progress
+
+/datum/reagent/medicine/modafinil/on_mob_metabolize(mob/living/M)
+	ADD_TRAIT(M, TRAIT_SLEEPIMMUNE, type)
+	..()
+
+/datum/reagent/medicine/modafinil/on_mob_end_metabolize(mob/living/M)
+	REMOVE_TRAIT(M, TRAIT_SLEEPIMMUNE, type)
+	..()
+
+/datum/reagent/medicine/modafinil/on_mob_life(mob/living/carbon/M)
+	if(!overdosed) // We do not want any effects on OD
+		overdose_threshold = overdose_threshold + rand(-10,10)/10 // for extra fun
+		M.AdjustAllImmobility(-5)
+		M.adjustStaminaLoss(-0.5*REM, 0)
+		M.adjust_timed_status_effect(2 SECONDS * REM, /datum/status_effect/jitter, max_duration = 20 SECONDS)
+		metabolization_rate = 0.01 * REAGENTS_METABOLISM * rand(5,20) // randomizes metabolism between 0.02 and 0.08 per tick
+		. = TRUE
+	..()
+
+/datum/reagent/medicine/modafinil/overdose_start(mob/living/M)
+	to_chat(M, span_userdanger("You feel awfully out of breath and jittery!"))
+	metabolization_rate = 0.025 * REAGENTS_METABOLISM // sets metabolism to 0.01 per tick on overdose
+
+/datum/reagent/medicine/modafinil/overdose_process(mob/living/M)
+	overdose_progress++
+	switch(overdose_progress)
+		if(1 to 40)
+			M.adjust_timed_status_effect(2 SECONDS * REM, /datum/status_effect/jitter, max_duration = 40 SECONDS)
+			M.stuttering = min(M.stuttering+1, 10)
+			M.set_timed_status_effect(10 SECONDS * REM, /datum/status_effect/dizziness, only_if_higher = TRUE)
+			if(prob(50))
+				M.losebreath++
+		if(41 to 80)
+			M.adjustOxyLoss(0.1*REM, 0)
+			M.adjustStaminaLoss(0.1*REM, 0)
+			M.adjust_timed_status_effect(2 SECONDS * REM, /datum/status_effect/jitter, max_duration = 40 SECONDS)
+			M.stuttering = min(M.stuttering+1, 20)
+			M.set_timed_status_effect(20 SECONDS * REM, /datum/status_effect/dizziness, only_if_higher = TRUE)
+			if(prob(50))
+				M.losebreath++
+			if(prob(20))
+				to_chat(M, span_userdanger("You have a sudden fit!"))
+				M.Paralyze(20) // you should be in a bad spot at this point unless epipen has been used
+		if(81)
+			to_chat(M, span_userdanger("You feel too exhausted to continue!")) // at this point you will eventually die unless you get charcoal
+			M.adjustOxyLoss(0.1*REM, 0)
+			M.adjustStaminaLoss(0.1*REM, 0)
+		if(82 to INFINITY)
+			M.Sleeping(100)
+			M.adjustOxyLoss(1.5*REM, 0)
+			M.adjustStaminaLoss(1.5*REM, 0)
+	..()
+	return TRUE
+
+/datum/reagent/medicine/synaptizine
+	name = "Synaptizine"
+	description = "Increases resistance to stuns as well as reducing drowsiness and hallucinations."
+	color = "#FF00FF"
+
+/datum/reagent/medicine/synaptizine/on_mob_life(mob/living/carbon/M)
+	M.drowsyness = max(M.drowsyness-5, 0)
+	M.AdjustStun(-20)
+	M.AdjustKnockdown(-20)
+	M.AdjustUnconscious(-20)
+	M.AdjustImmobilized(-20)
+	M.AdjustParalyzed(-20)
+	if(M.has_reagent(/datum/reagent/toxin/mindbreaker))
+		M.reagents.remove_reagent(/datum/reagent/toxin/mindbreaker, 5)
+	M.hallucination = max(0, M.hallucination - 10)
+	if(prob(30))
+		M.adjustToxLoss(1, 0)
+		. = 1
+	..()
+
+/datum/reagent/medicine/synaphydramine
+	name = "Diphen-Synaptizine"
+	description = "Reduces drowsiness, hallucinations, and Histamine from body."
+	color = "#EC536D" // rgb: 236, 83, 109
+
+/datum/reagent/medicine/synaphydramine/on_mob_life(mob/living/carbon/M)
+	M.drowsyness = max(M.drowsyness-5, 0)
+	if(M.has_reagent(/datum/reagent/toxin/mindbreaker))
+		M.remove_reagent(/datum/reagent/toxin/mindbreaker, 5)
+	if(M.has_reagent(/datum/reagent/toxin/histamine))
+		M.remove_reagent(/datum/reagent/toxin/histamine, 5)
+	M.hallucination = max(0, M.hallucination - 10)
+	if(prob(30))
+		M.adjustToxLoss(1, 0)
+		. = 1
+	..()
+
+
+//"Mood is status" declared Erika
+
+/datum/reagent/medicine/lithium_carbonate
+	name = "Lithium Carbonate"
+	description = "A mood stabilizer discovered by most spacefaring civilizations. Fairly widespread as a result."
+	color = "#b3acaa" //grey. boring.
+	reagent_state = SOLID
+	metabolization_rate = REAGENTS_METABOLISM * 0.5
+	overdose_threshold = 20
+
+/datum/reagent/medicine/lithium_carbonate/on_mob_life(mob/living/carbon/M)
+	var/datum/component/mood/mood = M.GetComponent(/datum/component/mood)
+	if(mood.sanity <= SANITY_GREAT)
+		mood.setSanity(min(mood.sanity+5, SANITY_GREAT))
+	..()
+	. = 1
+
+/datum/reagent/medicine/lithium_carbonate/overdose_process(mob/living/M)
+	if(prob(5))
+		M.set_timed_status_effect(10 SECONDS * REM, /datum/status_effect/jitter, only_if_higher = TRUE)
+		M.adjustOrganLoss(ORGAN_SLOT_BRAIN, 2*REM)
+	..()
+	. = 1
+
+/datum/reagent/medicine/psicodine
+	name = "Psicodine"
+	description = "Suppresses anxiety and other various forms of mental distress. Overdose causes hallucinations and minor toxin damage."
+	reagent_state = LIQUID
+	color = "#07E79E"
+	metabolization_rate = 0.25 * REAGENTS_METABOLISM
+	overdose_threshold = 30
+
+/datum/reagent/medicine/psicodine/on_mob_metabolize(mob/living/L)
+	..()
+	ADD_TRAIT(L, TRAIT_FEARLESS, type)
+
+/datum/reagent/medicine/psicodine/on_mob_end_metabolize(mob/living/L)
+	REMOVE_TRAIT(L, TRAIT_FEARLESS, type)
+	..()
+
+/datum/reagent/medicine/psicodine/on_mob_life(mob/living/carbon/M)
+	M.adjust_timed_status_effect(-6 SECONDS * REM, /datum/status_effect/jitter)
+	M.adjust_timed_status_effect(-12 SECONDS * REM, /datum/status_effect/dizziness)
+	M.confused = max(0, M.confused-6)
+	M.disgust = max(0, M.disgust-6)
+	var/datum/component/mood/mood = M.GetComponent(/datum/component/mood)
+	if(mood.sanity <= SANITY_NEUTRAL) // only take effect if in negative sanity and then...
+		mood.setSanity(min(mood.sanity+5, SANITY_NEUTRAL)) // set minimum to prevent unwanted spiking over neutral
+	..()
+	. = 1
+
+/datum/reagent/medicine/psicodine/overdose_process(mob/living/M)
+	M.hallucination = min(max(0, M.hallucination + 5), 60)
+	M.adjustToxLoss(1, 0)
+	..()
+	. = 1
+
+/datum/reagent/medicine/ephedrine
+	name = "Ephedrine"
+	description = "Increases stun resistance and movement speed, giving you hand cramps. Overdose deals toxin damage and inhibits breathing."
+	reagent_state = LIQUID
+	color = "#D2FFFA"
+	metabolization_rate = 0.5 * REAGENTS_METABOLISM
+	overdose_threshold = 30
+	addiction_threshold = 25
+
+/datum/reagent/medicine/ephedrine/on_mob_metabolize(mob/living/L)
+	..()
+	L.add_movespeed_modifier(/datum/movespeed_modifier/reagent/ephedrine)
+	ADD_TRAIT(L, TRAIT_STUNRESISTANCE, type)
+
+/datum/reagent/medicine/ephedrine/on_mob_end_metabolize(mob/living/L)
+	L.remove_movespeed_modifier(/datum/movespeed_modifier/reagent/ephedrine)
+	REMOVE_TRAIT(L, TRAIT_STUNRESISTANCE, type)
+	..()
+
+/datum/reagent/medicine/ephedrine/on_mob_life(mob/living/carbon/M)
+	if(prob(20) && iscarbon(M))
+		var/obj/item/I = M.get_active_held_item()
+		if(I && M.dropItemToGround(I))
+			to_chat(M, span_notice("Your hands spaz out and you drop what you were holding!"))
+			M.set_timed_status_effect(20 SECONDS * REM, /datum/status_effect/jitter, only_if_higher = TRUE)
+
+	M.AdjustAllImmobility(-20)
+	M.adjustStaminaLoss(-1*REM, FALSE)
+	..()
+	return TRUE
+
+/datum/reagent/medicine/ephedrine/overdose_process(mob/living/M)
+	if(prob(2) && iscarbon(M))
+		var/datum/disease/D = new /datum/disease/heart_failure
+		M.ForceContractDisease(D)
+		to_chat(M, span_userdanger("You're pretty sure you just felt your heart stop for a second there.."))
+		M.playsound_local(M, 'sound/effects/singlebeat.ogg', 100, 0)
+
+	if(prob(7))
+		to_chat(M, span_notice("[pick("Your head pounds.", "You feel a tight pain in your chest.", "You find it hard to stay still.", "You feel your heart practically beating out of your chest.")]"))
+
+	if(prob(33))
+		M.adjustToxLoss(1*REM, 0)
+		M.losebreath++
+		. = 1
+	return TRUE
+
+/datum/reagent/medicine/ephedrine/addiction_act_stage1(mob/living/M)
+	if(prob(3) && iscarbon(M))
+		M.visible_message(span_danger("[M] starts having a seizure!"), span_userdanger("You have a seizure!"))
+		M.Unconscious(100)
+		M.set_timed_status_effect(120 SECONDS, /datum/status_effect/jitter)
+
+	if(prob(33))
+		M.adjustToxLoss(2*REM, 0)
+		M.losebreath += 2
+		. = 1
+	..()
+
+/datum/reagent/medicine/ephedrine/addiction_act_stage2(mob/living/M)
+	if(prob(6) && iscarbon(M))
+		M.visible_message(span_danger("[M] starts having a seizure!"), span_userdanger("You have a seizure!"))
+		M.Unconscious(100)
+		M.set_timed_status_effect(240 SECONDS, /datum/status_effect/jitter)
+
+	if(prob(33))
+		M.adjustToxLoss(3*REM, 0)
+		M.losebreath += 3
+		. = 1
+	..()
+
+/datum/reagent/medicine/ephedrine/addiction_act_stage3(mob/living/M)
+	if(prob(12) && iscarbon(M))
+		M.visible_message(span_danger("[M] starts having a seizure!"), span_userdanger("You have a seizure!"))
+		M.Unconscious(100)
+		M.set_timed_status_effect(300 SECONDS, /datum/status_effect/jitter)
+
+	if(prob(33))
+		M.adjustToxLoss(4*REM, 0)
+		M.losebreath += 4
+		. = 1
+	..()
+
+/datum/reagent/medicine/ephedrine/addiction_act_stage4(mob/living/M)
+	if(prob(24) && iscarbon(M))
+		M.visible_message(span_danger("[M] starts having a seizure!"), span_userdanger("You have a seizure!"))
+		M.Unconscious(100)
+		M.set_timed_status_effect(300 SECONDS, /datum/status_effect/jitter)
+
+	if(prob(33))
+		M.adjustToxLoss(5*REM, 0)
+		M.losebreath += 5
+		. = 1
+	..()
diff --git a/code/modules/reagents/chemistry/reagents/medical_reagents/wound_reagents.dm b/code/modules/reagents/chemistry/reagents/medical_reagents/wound_reagents.dm
new file mode 100644
index 0000000000..fa644a7a25
--- /dev/null
+++ b/code/modules/reagents/chemistry/reagents/medical_reagents/wound_reagents.dm
@@ -0,0 +1,27 @@
+/* Medicines that interface with wounds first and foremost
+**
+*/
+
+/datum/reagent/medicine/bonefixingjuice
+	name = "C4L-Z1UM Agent"
+	description = "A peculiar substance capable of instantly regenerating live tissue."
+	taste_description = "milk"
+	metabolization_rate = 0
+
+/datum/reagent/medicine/bonefixingjuice/on_mob_life(mob/living/M)
+	var/mob/living/carbon/C = M
+	switch(current_cycle)
+		if(1 to 10)
+			if(C.drowsyness < 10)
+				C.drowsyness += 2
+		if(11 to 30)
+			C.adjustStaminaLoss(5)
+		if(31 to INFINITY)
+			C.AdjustSleeping(40)
+			//formerly everything-fixing juice
+			for(var/datum/wound/blunt/broken_bone in C.all_wounds)
+				broken_bone.remove_wound()
+			for(var/obj/item/organ/O in C.internal_organs)
+				O.damage = 0
+			holder.remove_reagent(/datum/reagent/medicine/bonefixingjuice, 10)
+	..()
diff --git a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm
deleted file mode 100644
index 4a7cda6927..0000000000
--- a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm
+++ /dev/null
@@ -1,2562 +0,0 @@
-#define PERF_BASE_DAMAGE 0.5
-
-//////////////////////////////////////////////////////////////////////////////////////////
-					// MEDICINE REAGENTS
-//////////////////////////////////////////////////////////////////////////////////////
-
-// where all the reagents related to medicine go.
-
-/datum/reagent/medicine
-	name = "Medicine"
-	taste_description = "bitterness"
-	category = "Medicine"
-
-/datum/reagent/medicine/on_mob_life(mob/living/carbon/M)
-	current_cycle++
-	holder.remove_reagent(type, metabolization_rate / M.metabolism_efficiency) //medicine reagents stay longer if you have a better metabolism
-
-/datum/reagent/medicine/leporazine
-	name = "Leporazine"
-	description = "Leporazine will effectively regulate a patient's body temperature, ensuring it never leaves safe levels."
-	color = "#DB90C6"
-
-/datum/reagent/medicine/leporazine/on_mob_life(mob/living/carbon/M)
-	if(M.bodytemperature > M.get_body_temp_normal(apply_change=FALSE))
-		M.adjust_bodytemperature(-4 * TEMPERATURE_DAMAGE_COEFFICIENT, M.get_body_temp_normal(apply_change=FALSE))
-	else if(M.bodytemperature < (M.get_body_temp_normal(apply_change=FALSE) + 1))
-		M.adjust_bodytemperature(4 * TEMPERATURE_DAMAGE_COEFFICIENT, 0, M.get_body_temp_normal(apply_change=FALSE))
-	..()
-
-/datum/reagent/medicine/adminordrazine //An OP chemical for admins
-	name = "Adminordrazine"
-	description = "It's magic. We don't have to explain it."
-	color = "#E0BB00" //golden for the gods
-	can_synth = FALSE
-	taste_description = "badmins"
-
-/datum/reagent/medicine/adminordrazine/on_mob_life(mob/living/carbon/M)
-	M.reagents.remove_all_type(/datum/reagent/toxin, 5*REM, 0, 1)
-	M.setCloneLoss(0, 0)
-	M.setOxyLoss(0, 0)
-	M.radiation = 0
-	M.heal_bodypart_damage(5,5)
-	M.adjustToxLoss(-5, 0, TRUE)
-	M.hallucination = 0
-	REMOVE_TRAITS_NOT_IN(M, list(SPECIES_TRAIT, ROUNDSTART_TRAIT, ORGAN_TRAIT))
-	M.set_blurriness(0)
-	M.set_blindness(0)
-	M.SetKnockdown(0)
-	M.SetStun(0)
-	M.SetUnconscious(0)
-	M.SetParalyzed(0)
-	M.SetImmobilized(0)
-	M.silent = FALSE
-	M.disgust = 0
-	M.drowsyness = 0
-	M.stuttering = 0
-	M.slurring = 0
-	M.confused = 0
-	M.set_sleeping(0)
-	M.remove_status_effect(/datum/status_effect/jitter)
-	M.remove_status_effect(/datum/status_effect/dizziness)
-	if(M.blood_volume < BLOOD_VOLUME_NORMAL)
-		M.blood_volume = BLOOD_VOLUME_NORMAL
-
-	M.cure_all_traumas(TRAUMA_RESILIENCE_MAGIC)
-	for(var/organ in M.internal_organs)
-		var/obj/item/organ/O = organ
-		O.setOrganDamage(0)
-	for(var/thing in M.diseases)
-		var/datum/disease/D = thing
-		if(D.severity == DISEASE_SEVERITY_POSITIVE)
-			continue
-		D.cure()
-	..()
-	. = 1
-
-/datum/reagent/medicine/adminordrazine/on_hydroponics_apply(obj/item/seeds/myseed, datum/reagents/chems, obj/machinery/hydroponics/mytray, mob/user)
-	. = ..()
-	if(chems.has_reagent(type, 1))
-		mytray.adjustWater(round(chems.get_reagent_amount(type) * 1))
-		mytray.adjustHealth(round(chems.get_reagent_amount(type) * 1))
-		mytray.adjustPests(-rand(1,5))
-		mytray.adjustWeeds(-rand(1,5))
-	if(chems.has_reagent(type, 3))
-		switch(rand(100))
-			if(66 to 100)
-				mytray.mutatespecie()
-			if(33 to 65)
-				mytray.mutateweed()
-			if(1 to 32)
-				mytray.mutatepest(user)
-			else
-				if(prob(20))
-					mytray.visible_message(span_warning("Nothing happens..."))
-
-/datum/reagent/medicine/adminordrazine/quantum_heal
-	name = "Quantum Medicine"
-	description = "Rare and experimental particles, that apparently swap the user's body with one from an alternate dimension where it's completely healthy."
-	taste_description = "science"
-
-/datum/reagent/medicine/synaptizine
-	name = "Synaptizine"
-	description = "Increases resistance to stuns as well as reducing drowsiness and hallucinations."
-	color = "#FF00FF"
-
-/datum/reagent/medicine/synaptizine/on_mob_life(mob/living/carbon/M)
-	M.drowsyness = max(M.drowsyness-5, 0)
-	M.AdjustStun(-20)
-	M.AdjustKnockdown(-20)
-	M.AdjustUnconscious(-20)
-	M.AdjustImmobilized(-20)
-	M.AdjustParalyzed(-20)
-	if(M.has_reagent(/datum/reagent/toxin/mindbreaker))
-		M.reagents.remove_reagent(/datum/reagent/toxin/mindbreaker, 5)
-	M.hallucination = max(0, M.hallucination - 10)
-	if(prob(30))
-		M.adjustToxLoss(1, 0)
-		. = 1
-	..()
-
-/datum/reagent/medicine/synaphydramine
-	name = "Diphen-Synaptizine"
-	description = "Reduces drowsiness, hallucinations, and Histamine from body."
-	color = "#EC536D" // rgb: 236, 83, 109
-
-/datum/reagent/medicine/synaphydramine/on_mob_life(mob/living/carbon/M)
-	M.drowsyness = max(M.drowsyness-5, 0)
-	if(M.has_reagent(/datum/reagent/toxin/mindbreaker))
-		M.remove_reagent(/datum/reagent/toxin/mindbreaker, 5)
-	if(M.has_reagent(/datum/reagent/toxin/histamine))
-		M.remove_reagent(/datum/reagent/toxin/histamine, 5)
-	M.hallucination = max(0, M.hallucination - 10)
-	if(prob(30))
-		M.adjustToxLoss(1, 0)
-		. = 1
-	..()
-
-/datum/reagent/medicine/cryoxadone
-	name = "Cryoxadone"
-	description = "A chemical mixture with almost magical healing powers. Its main limitation is that the patient's body temperature must be under 270K for it to metabolise correctly."
-	color = "#0000C8"
-	taste_description = "sludge"
-
-/datum/reagent/medicine/cryoxadone/on_mob_life(mob/living/carbon/M)
-	var/power = -0.00003 * (M.bodytemperature ** 2) + 3
-	if(M.bodytemperature < T0C)
-		M.adjustOxyLoss(-3 * power, 0)
-		M.adjustBruteLoss(-power, 0)
-		M.adjustFireLoss(-power, 0)
-		M.adjustToxLoss(-power, 0, TRUE) //heals TOXINLOVERs
-		M.adjustCloneLoss(-power, 0)
-		for(var/i in M.all_wounds)
-			var/datum/wound/iter_wound = i
-			iter_wound.on_xadone(power)
-		REMOVE_TRAIT(M, TRAIT_DISFIGURED, TRAIT_GENERIC) //fixes common causes for disfiguration
-		. = 1
-	metabolization_rate = REAGENTS_METABOLISM * (0.00001 * (M.bodytemperature ** 2) + 0.5)
-	..()
-
-/datum/reagent/medicine/clonexadone
-	name = "Clonexadone"
-	description = "A chemical that derives from Cryoxadone. It specializes in healing clone damage, but nothing else. Requires very cold temperatures to properly metabolize, and metabolizes quicker than cryoxadone."
-	color = "#3D3DC6"
-	taste_description = "muscle"
-	metabolization_rate = 1.5 * REAGENTS_METABOLISM
-
-/datum/reagent/medicine/clonexadone/on_mob_life(mob/living/carbon/M)
-	if(M.bodytemperature < T0C)
-		M.adjustCloneLoss(0.00006 * (M.bodytemperature ** 2) - 6, 0)
-		REMOVE_TRAIT(M, TRAIT_DISFIGURED, TRAIT_GENERIC)
-		. = 1
-	metabolization_rate = REAGENTS_METABOLISM * (0.000015 * (M.bodytemperature ** 2) + 0.75)
-	..()
-
-/datum/reagent/medicine/pyroxadone
-	name = "Pyroxadone"
-	description = "A mixture of cryoxadone and slime jelly, that apparently inverses the requirement for its activation."
-	color = "#f7832a"
-	taste_description = "spicy jelly"
-
-/datum/reagent/medicine/pyroxadone/on_mob_life(mob/living/carbon/M)
-	. = ..()
-
-	var/bodytemp = M.bodytemperature
-	var/heatlimit = M.dna.species.bodytemp_heat_damage_limit
-
-	if(bodytemp < heatlimit)
-		return .
-
-	var/power = 0
-
-	if(bodytemp < 400)
-		power = 2
-
-	else if(bodytemp < 460)
-		power = 3
-
-	else
-		power = 5
-
-	if(M.on_fire)
-		power *= 2
-
-	M.adjustOxyLoss(-2 * power, 0)
-	M.adjustBruteLoss(-power, 0)
-	M.adjustFireLoss(-1.5 * power, 0)
-	M.adjustToxLoss(-power, 0, TRUE)
-	M.adjustCloneLoss(-power, 0)
-	for(var/i in M.all_wounds)
-		var/datum/wound/iter_wound = i
-		iter_wound.on_xadone(power)
-	REMOVE_TRAIT(M, TRAIT_DISFIGURED, TRAIT_GENERIC)
-
-/datum/reagent/medicine/rezadone
-	name = "Rezadone"
-	description = "A powder derived from fish toxin, Rezadone can effectively treat genetic damage as well as restoring minor wounds. Overdose will cause intense nausea and minor toxin damage."
-	reagent_state = SOLID
-	color = "#669900" // rgb: 102, 153, 0
-	overdose_threshold = 30
-	taste_description = "fish"
-
-/datum/reagent/medicine/rezadone/on_mob_life(mob/living/carbon/M)
-	M.setCloneLoss(0) //Rezadone is almost never used in favor of cryoxadone. Hopefully this will change that.
-	M.heal_bodypart_damage(1,1)
-	REMOVE_TRAIT(M, TRAIT_DISFIGURED, TRAIT_GENERIC)
-	..()
-	. = 1
-
-/datum/reagent/medicine/rezadone/overdose_process(mob/living/M)
-	M.adjustToxLoss(1, 0)
-	M.set_timed_status_effect(10 SECONDS * REM, /datum/status_effect/jitter, only_if_higher = TRUE)
-	M.set_timed_status_effect(10 SECONDS * REM, /datum/status_effect/dizziness, only_if_higher = TRUE)
-	..()
-	. = 1
-
-/datum/reagent/medicine/rezadone/expose_mob(mob/living/M, method=TOUCH, reac_volume)
-	. = ..()
-	if(iscarbon(M))
-		var/mob/living/carbon/patient = M
-		if(reac_volume >= 5 && HAS_TRAIT_FROM(patient, TRAIT_HUSK, "burn") && patient.getFireLoss() < THRESHOLD_UNHUSK) //One carp yields 12u rezadone.
-			patient.cure_husk("burn")
-			patient.visible_message(span_nicegreen("[patient]'s body rapidly absorbs moisture from the enviroment, taking on a more healthy appearance."))
-
-/datum/reagent/medicine/spaceacillin
-	name = "Spaceacillin"
-	description = "Spaceacillin will prevent a patient from conventionally spreading any diseases they are currently infected with."
-	color = "#E1F2E6"
-	metabolization_rate = 0.1 * REAGENTS_METABOLISM
-
-//Goon Chems. Ported mainly from Goonstation. Easily mixable (or not so easily) and provide a variety of effects.
-/datum/reagent/medicine/silver_sulfadiazine
-	name = "Silver Sulfadiazine"
-	description = "If used in touch-based applications, immediately restores burn wounds as well as restoring more over time. If ingested through other means or overdosed, deals minor toxin damage."
-	reagent_state = LIQUID
-	color = "#C8A5DC"
-	overdose_threshold = 45
-
-/datum/reagent/medicine/silver_sulfadiazine/expose_mob(mob/living/M, method=TOUCH, reac_volume, show_message = 1)
-	if(iscarbon(M) && M.stat != DEAD)
-		if(method in list(INGEST, VAPOR, INJECT))
-			M.adjustToxLoss(0.5*reac_volume)
-			if(show_message)
-				to_chat(M, span_warning("You don't feel so good..."))
-		else if(M.getFireLoss())
-			M.adjustFireLoss(-reac_volume)
-			M.force_scream()
-			if(show_message && !HAS_TRAIT(M, TRAIT_ANALGESIA))
-				to_chat(M, span_danger("You feel your burns healing! It stings like hell!"))
-				SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "painful_medicine", /datum/mood_event/painful_medicine)
-			else
-				to_chat(M, span_notice("You feel your burns throbbing."))
-	..()
-
-/datum/reagent/medicine/silver_sulfadiazine/on_mob_life(mob/living/carbon/M)
-	M.adjustFireLoss(-2*REM, 0)
-	..()
-	. = 1
-
-/datum/reagent/medicine/silver_sulfadiazine/overdose_process(mob/living/M)
-	M.adjustFireLoss(2.5*REM, 0)
-	M.adjustToxLoss(0.5, 0)
-	..()
-	. = 1
-
-/datum/reagent/medicine/oxandrolone
-	name = "Oxandrolone"
-	description = "Stimulates the healing of severe burns. Extremely rapidly heals severe burns and slowly heals minor ones. Overdose will worsen existing burns."
-	reagent_state = LIQUID
-	color = "#1E8BFF"
-	metabolization_rate = 0.5 * REAGENTS_METABOLISM
-	overdose_threshold = 25
-
-/datum/reagent/medicine/oxandrolone/on_mob_life(mob/living/carbon/M)
-	if(M.getFireLoss() > 25)
-		M.adjustFireLoss(-4*REM, 0) //Twice as effective as AIURI for severe burns
-	else
-		M.adjustFireLoss(-0.5*REM, 0) //But only a quarter as effective for more minor ones
-	..()
-	. = 1
-
-/datum/reagent/medicine/oxandrolone/overdose_process(mob/living/M)
-	if(M.getFireLoss()) //It only makes existing burns worse
-		M.adjustFireLoss(4.5*REM, FALSE, FALSE, BODYTYPE_ORGANIC) // it's going to be healing either 4 or 0.5
-		. = 1
-	..()
-
-/datum/reagent/medicine/styptic_powder
-	name = "Styptic Powder"
-	description = "If used in touch-based applications, immediately restores bruising as well as restoring more over time. If ingested through other means or overdosed, deals minor toxin damage."
-	reagent_state = LIQUID
-	color = "#FF9696"
-	overdose_threshold = 45
-
-/datum/reagent/medicine/styptic_powder/expose_mob(mob/living/M, method=TOUCH, reac_volume, show_message = 1)
-	if(iscarbon(M) && M.stat != DEAD)
-		if(method in list(INGEST, VAPOR, INJECT))
-			M.adjustToxLoss(0.5*reac_volume)
-			if(show_message)
-				to_chat(M, span_warning("You don't feel so good..."))
-		else if(M.getBruteLoss())
-			M.adjustBruteLoss(-reac_volume)
-			M.force_scream()
-			if(show_message && !HAS_TRAIT(M, TRAIT_ANALGESIA))
-				to_chat(M, span_danger("You feel your bruises healing! It stings like hell!"))
-				SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "painful_medicine", /datum/mood_event/painful_medicine)
-			else
-				to_chat(M, span_notice("You feel your bruises throbbing."))
-	..()
-
-
-/datum/reagent/medicine/styptic_powder/on_mob_life(mob/living/carbon/M)
-	M.adjustBruteLoss(-2*REM, 0)
-	..()
-	. = 1
-
-/datum/reagent/medicine/styptic_powder/overdose_process(mob/living/M)
-	M.adjustBruteLoss(2.5*REM, 0)
-	M.adjustToxLoss(0.5, 0)
-	..()
-	. = 1
-
-/datum/reagent/medicine/salglu_solution
-	name = "Saline-Glucose Solution"
-	description = "Has a 33% chance per metabolism cycle to heal brute and burn damage. Can be used as a temporary blood substitute."
-	reagent_state = LIQUID
-	color = "#DCDCDC"
-	metabolization_rate = 0.5 * REAGENTS_METABOLISM
-	overdose_threshold = 60
-	taste_description = "sweetness and salt"
-	var/last_added = 0
-	var/maximum_reachable = BLOOD_VOLUME_NORMAL - 10	//So that normal blood regeneration can continue with salglu active
-	var/extra_regen = 0.25 // in addition to acting as temporary blood, also add this much to their actual blood per tick
-
-/datum/reagent/medicine/salglu_solution/on_mob_life(mob/living/carbon/M)
-	if(last_added)
-		M.blood_volume -= last_added
-		last_added = 0
-	if(M.blood_volume < maximum_reachable)	//Can only up to double your effective blood level.
-		var/amount_to_add = min(M.blood_volume, volume*5)
-		var/new_blood_level = min(M.blood_volume + amount_to_add, maximum_reachable)
-		last_added = new_blood_level - M.blood_volume
-		M.blood_volume = new_blood_level + extra_regen
-	if(prob(33))
-		M.adjustBruteLoss(-0.5*REM, 0)
-		M.adjustFireLoss(-0.5*REM, 0)
-		. = TRUE
-	..()
-
-/datum/reagent/medicine/salglu_solution/overdose_process(mob/living/M)
-	if(prob(3))
-		to_chat(M, span_warning("You feel salty."))
-		holder.add_reagent(/datum/reagent/consumable/sodiumchloride, 1)
-		holder.remove_reagent(/datum/reagent/medicine/salglu_solution, 0.5)
-	else if(prob(3))
-		to_chat(M, span_warning("You feel sweet."))
-		holder.add_reagent(/datum/reagent/consumable/sugar, 1)
-		holder.remove_reagent(/datum/reagent/medicine/salglu_solution, 0.5)
-	if(prob(33))
-		M.adjustBruteLoss(0.5*REM, FALSE, FALSE, BODYTYPE_ORGANIC)
-		M.adjustFireLoss(0.5*REM, FALSE, FALSE, BODYTYPE_ORGANIC)
-		. = TRUE
-	..()
-
-/datum/reagent/medicine/mine_salve
-	name = "Miner's Salve"
-	description = "A powerful painkiller. Restores bruising and burns in addition to making the patient believe they are fully healed."
-	reagent_state = LIQUID
-	color = "#6D6374"
-	metabolization_rate = 0.4 * REAGENTS_METABOLISM
-
-/datum/reagent/medicine/mine_salve/on_mob_life(mob/living/carbon/C)
-	C.set_screwyhud(SCREWYHUD_HEALTHY)
-	C.adjustBruteLoss(-0.25*REM, 0)
-	C.adjustFireLoss(-0.25*REM, 0)
-	..()
-	return TRUE
-
-/datum/reagent/medicine/mine_salve/expose_mob(mob/living/M, method=TOUCH, reac_volume, show_message = 1)
-	if(iscarbon(M) && M.stat != DEAD)
-		if(method in list(INGEST, VAPOR, INJECT))
-			M.adjust_nutrition(-5)
-			if(show_message)
-				to_chat(M, span_warning("Your stomach feels empty and cramps!"))
-		else
-			var/mob/living/carbon/C = M
-			for(var/s in C.surgeries)
-				var/datum/surgery/S = s
-				S.speed_modifier = max(0.1, S.speed_modifier)
-
-			if(show_message)
-				to_chat(M, span_danger("You feel your wounds fade away to nothing!") )
-	..()
-
-/datum/reagent/medicine/mine_salve/on_mob_metabolize(mob/living/L)
-	..()
-	ADD_TRAIT(L, TRAIT_ANALGESIA, type)
-	if(iscarbon(L))
-		var/mob/living/carbon/C = L
-		C.set_screwyhud(SCREWYHUD_HEALTHY)
-
-/datum/reagent/medicine/mine_salve/on_mob_end_metabolize(mob/living/M)
-	if(iscarbon(M))
-		var/mob/living/carbon/N = M
-		REMOVE_TRAIT(N, TRAIT_ANALGESIA, type)
-		N.set_screwyhud(SCREWYHUD_NONE)
-	..()
-
-/datum/reagent/medicine/synthflesh
-	name = "Synthflesh"
-	description = "Has a 100% chance of instantly healing brute and burn damage. One unit of the chemical will heal one point of damage. Touch application only."
-	reagent_state = LIQUID
-	color = "#FFEBEB"
-
-/datum/reagent/medicine/synthflesh/expose_mob(mob/living/M, method=TOUCH, reac_volume,show_message = 1)
-	if(iscarbon(M))
-		var/mob/living/carbon/carbies = M
-		if (carbies.stat == DEAD)
-			show_message = 0
-		if(method in list(PATCH, TOUCH, SMOKE))
-			var/harmies = min(carbies.getBruteLoss(),carbies.adjustBruteLoss(-1.25 * reac_volume)*-1)
-			var/burnies = min(carbies.getFireLoss(),carbies.adjustFireLoss(-1.25 * reac_volume)*-1)
-			for(var/i in carbies.all_wounds)
-				var/datum/wound/iter_wound = i
-				iter_wound.on_synthflesh(reac_volume)
-			carbies.adjustToxLoss((harmies+burnies)*0.66)
-			if(show_message)
-				to_chat(carbies, span_danger("You feel your burns and bruises healing! It stings like hell!"))
-			SEND_SIGNAL(carbies, COMSIG_ADD_MOOD_EVENT, "painful_medicine", /datum/mood_event/painful_medicine)
-			if(HAS_TRAIT_FROM(M, TRAIT_HUSK, "burn") && carbies.getFireLoss() < THRESHOLD_UNHUSK && (carbies.reagents.get_reagent_amount(/datum/reagent/medicine/synthflesh) + reac_volume >= 100))
-				carbies.cure_husk("burn")
-				carbies.visible_message("<span class='nicegreen'>A rubbery liquid coats [carbies]'s burns. [carbies] looks a lot healthier!") //we're avoiding using the phrases "burnt flesh" and "burnt skin" here because carbies could be a skeleton or something
-	..()
-	return TRUE
-
-/datum/reagent/medicine/charcoal
-	name = "Charcoal"
-	description = "Heals toxin damage as well as slowly removing any other chemicals the patient has in their bloodstream."
-	reagent_state = LIQUID
-	color = "#000000"
-	metabolization_rate = 0.5 * REAGENTS_METABOLISM
-	taste_description = "ash"
-	process_flags = ORGANIC //WS Edit - IPCs
-
-/datum/reagent/medicine/charcoal/on_mob_life(mob/living/carbon/M)
-	M.adjustToxLoss(-2*REM, 0)
-	. = 1
-	for(var/datum/reagent/R in M.reagents.reagent_list)
-		if(R != src)
-			M.reagents.remove_reagent(R.type,1)
-	..()
-
-/datum/reagent/medicine/charcoal/on_transfer(atom/A, method=TOUCH, volume)
-	if(method == INGEST || !iscarbon(A)) //the atom not the charcoal
-		return
-	A.reagents.remove_reagent(/datum/reagent/medicine/charcoal/, volume) //We really should not be injecting an insoluble granular material.
-	A.reagents.add_reagent(/datum/reagent/carbon, volume) // Its pores would get clogged with gunk anyway.
-	..()
-
-/datum/reagent/medicine/system_cleaner
-	name = "System Cleaner"
-	description = "Neutralizes harmful chemical compounds inside synthetic systems."
-	reagent_state = LIQUID
-	color = "#F1C40F"
-	metabolization_rate = 0.5 * REAGENTS_METABOLISM
-	process_flags = SYNTHETIC //WS Edit - IPCs
-
-/datum/reagent/medicine/system_cleaner/on_mob_life(mob/living/M)
-	M.adjustToxLoss(-2*REM, 0)
-	. = 1
-	for(var/datum/reagent/R in M.reagents.reagent_list)
-		if(R != src)
-			M.reagents.remove_reagent(R.type,1)
-	..()
-
-/datum/reagent/medicine/liquid_solder
-	name = "Liquid Solder"
-	description = "Repairs brain damage in synthetics."
-	color = "#727272"
-	taste_description = "metallic"
-	process_flags = SYNTHETIC //WS Edit - IPCs
-
-/datum/reagent/medicine/liquid_solder/on_mob_life(mob/living/M)
-	M.adjustOrganLoss(ORGAN_SLOT_BRAIN, -3*REM)
-	if(iscarbon(M))
-		var/mob/living/carbon/C = M
-		if(prob(30) && C.has_trauma_type(BRAIN_TRAUMA_SPECIAL))
-			C.cure_trauma_type(BRAIN_TRAUMA_SPECIAL)
-		if(prob(10) && C.has_trauma_type(BRAIN_TRAUMA_MILD))
-			C.cure_trauma_type(BRAIN_TRAUMA_MILD)
-	..()
-
-/datum/reagent/medicine/omnizine
-	name = "Omnizine"
-	description = "Slowly heals all damage types. Overdose will cause damage in all types instead."
-	reagent_state = LIQUID
-	color = "#DCDCDC"
-	metabolization_rate = 0.25 * REAGENTS_METABOLISM
-	overdose_threshold = 30
-	var/healing = 0.5
-
-/datum/reagent/medicine/omnizine/on_mob_life(mob/living/carbon/M)
-	M.adjustToxLoss(-healing*REM, 0)
-	M.adjustOxyLoss(-healing*REM, 0)
-	M.adjustBruteLoss(-healing*REM, 0)
-	M.adjustFireLoss(-healing*REM, 0)
-	..()
-	. = 1
-
-/datum/reagent/medicine/omnizine/overdose_process(mob/living/M)
-	M.adjustToxLoss(1.5*REM, 0)
-	M.adjustOxyLoss(1.5*REM, 0)
-	M.adjustBruteLoss(1.5*REM, FALSE, FALSE, BODYTYPE_ORGANIC)
-	M.adjustFireLoss(1.5*REM, FALSE, FALSE, BODYTYPE_ORGANIC)
-	..()
-	. = 1
-
-/datum/reagent/medicine/omnizine/protozine
-	name = "Protozine"
-	description = "A less environmentally friendly and somewhat weaker variant of omnizine."
-	color = "#d8c7b7"
-	healing = 0.2
-
-/datum/reagent/medicine/calomel
-	name = "Calomel"
-	description = "Quickly purges the body of all chemicals. Toxin damage is dealt if the patient is in good condition."
-	reagent_state = LIQUID
-	color = "#19C832"
-	metabolization_rate = 0.5 * REAGENTS_METABOLISM
-	taste_description = "acid"
-
-/datum/reagent/medicine/calomel/on_mob_life(mob/living/carbon/M)
-	for(var/datum/reagent/R in M.reagents.reagent_list)
-		if(R != src)
-			M.reagents.remove_reagent(R.type,3)
-	if(M.health > 20)
-		M.adjustToxLoss(1*REM, 0)
-		. = 1
-	..()
-
-/datum/reagent/medicine/potass_iodide
-	name = "Potassium Iodide"
-	description = "Efficiently restores low radiation damage."
-	reagent_state = LIQUID
-	color = "#BAA15D"
-	metabolization_rate = 2 * REAGENTS_METABOLISM
-
-/datum/reagent/medicine/potass_iodide/on_mob_life(mob/living/carbon/M)
-	if(M.radiation > 0)
-		M.radiation -= min(M.radiation, 8)
-	..()
-
-/datum/reagent/medicine/pen_acid
-	name = "Pentetic Acid"
-	description = "Reduces massive amounts of radiation and toxin damage while purging other chemicals from the body."
-	reagent_state = LIQUID
-	color = "#E6FFF0"
-	metabolization_rate = 0.5 * REAGENTS_METABOLISM
-
-/datum/reagent/medicine/pen_acid/on_mob_life(mob/living/carbon/M)
-	M.radiation -= max(M.radiation-RAD_MOB_SAFE, 0)/50
-	M.adjustToxLoss(-2*REM, 0)
-	for(var/datum/reagent/R in M.reagents.reagent_list)
-		if(R != src)
-			M.reagents.remove_reagent(R.type,2)
-	..()
-	. = 1
-
-/datum/reagent/medicine/anti_rad
-	name = "Emergency Radiation Purgant" //taking real names
-	description = "Rapidly purges radiation from the body."
-	reagent_state = LIQUID
-	color = "#E6FFF0"
-	metabolization_rate = 0.5 * REAGENTS_METABOLISM
-
-/datum/reagent/medicine/anti_rad/on_mob_metabolize(mob/living/L)
-	to_chat(L, span_warning("Your stomach starts to churn and cramp!"))
-	. = ..()
-
-/datum/reagent/medicine/anti_rad/on_mob_life(mob/living/carbon/M)
-	M.radiation -= M.radiation - rand(50,150)
-	M.adjust_disgust(4*REM)
-	..()
-	. = 1
-
-/datum/reagent/medicine/sal_acid
-	name = "Salicylic Acid"
-	description = "Stimulates the healing of severe bruises. Extremely rapidly heals severe bruising and slowly heals minor ones. Overdose will worsen existing bruising."
-	reagent_state = LIQUID
-	color = "#D2D2D2"
-	metabolization_rate = 0.5 * REAGENTS_METABOLISM
-	overdose_threshold = 25
-
-/datum/reagent/medicine/sal_acid/on_mob_life(mob/living/carbon/M)
-	if(M.getBruteLoss() > 25)
-		M.adjustBruteLoss(-4*REM, 0) //Twice as effective as styptic powder for severe bruising
-	else
-		M.adjustBruteLoss(-0.5*REM, 0) //But only a quarter as effective for more minor ones
-	..()
-	. = 1
-
-/datum/reagent/medicine/sal_acid/overdose_process(mob/living/M)
-	if(M.getBruteLoss()) //It only makes existing bruises worse
-		M.adjustBruteLoss(4.5*REM, FALSE, FALSE, BODYTYPE_ORGANIC) // it's going to be healing either 4 or 0.5
-		. = 1
-	..()
-
-/datum/reagent/medicine/salbutamol
-	name = "Salbutamol"
-	description = "Rapidly restores oxygen deprivation as well as preventing more of it to an extent."
-	reagent_state = LIQUID
-	color = "#00FFFF"
-	metabolization_rate = 0.25 * REAGENTS_METABOLISM
-
-/datum/reagent/medicine/salbutamol/on_mob_life(mob/living/carbon/M)
-	M.adjustOxyLoss(-3*REM, 0)
-	if(M.losebreath >= 4)
-		M.losebreath -= 2
-	..()
-	. = 1
-
-/datum/reagent/medicine/perfluorodecalin
-	name = "Perfluorodecalin"
-	description = "Restores oxygen deprivation while producing a lesser amount of toxic byproducts. Both scale with exposure to the drug and current amount of oxygen deprivation. Overdose causes toxic byproducts regardless of oxygen deprivation."
-	reagent_state = LIQUID
-	color = "#FF6464"
-	metabolization_rate = 0.25 * REAGENTS_METABOLISM
-	overdose_threshold = 35 // at least 2 full syringes +some, this stuff is nasty if left in for long
-
-/datum/reagent/medicine/perfluorodecalin/on_mob_life(mob/living/carbon/human/M)
-	var/oxycalc = 2.5*REM*current_cycle
-	if(!overdosed)
-		oxycalc = min(oxycalc,M.getOxyLoss()+PERF_BASE_DAMAGE) //if NOT overdosing, we lower our toxdamage to only the damage we actually healed with a minimum of 0.5. IE if we only heal 10 oxygen damage but we COULD have healed 20, we will only take toxdamage for the 10. We would take the toxdamage for the extra 10 if we were overdosing.
-	M.adjustOxyLoss(-oxycalc, 0)
-	M.adjustToxLoss(oxycalc/2.5, 0)
-	if(prob(current_cycle) && M.losebreath)
-		M.losebreath--
-	..()
-	return TRUE
-
-/datum/reagent/medicine/perfluorodecalin/overdose_process(mob/living/M)
-	metabolization_rate += 1
-	return ..()
-
-/datum/reagent/medicine/ephedrine
-	name = "Ephedrine"
-	description = "Increases stun resistance and movement speed, giving you hand cramps. Overdose deals toxin damage and inhibits breathing."
-	reagent_state = LIQUID
-	color = "#D2FFFA"
-	metabolization_rate = 0.5 * REAGENTS_METABOLISM
-	overdose_threshold = 30
-	addiction_threshold = 25
-
-/datum/reagent/medicine/ephedrine/on_mob_metabolize(mob/living/L)
-	..()
-	L.add_movespeed_modifier(/datum/movespeed_modifier/reagent/ephedrine)
-	ADD_TRAIT(L, TRAIT_STUNRESISTANCE, type)
-
-/datum/reagent/medicine/ephedrine/on_mob_end_metabolize(mob/living/L)
-	L.remove_movespeed_modifier(/datum/movespeed_modifier/reagent/ephedrine)
-	REMOVE_TRAIT(L, TRAIT_STUNRESISTANCE, type)
-	..()
-
-/datum/reagent/medicine/ephedrine/on_mob_life(mob/living/carbon/M)
-	if(prob(20) && iscarbon(M))
-		var/obj/item/I = M.get_active_held_item()
-		if(I && M.dropItemToGround(I))
-			to_chat(M, span_notice("Your hands spaz out and you drop what you were holding!"))
-			M.set_timed_status_effect(20 SECONDS * REM, /datum/status_effect/jitter, only_if_higher = TRUE)
-
-	M.AdjustAllImmobility(-20)
-	M.adjustStaminaLoss(-1*REM, FALSE)
-	..()
-	return TRUE
-
-/datum/reagent/medicine/ephedrine/overdose_process(mob/living/M)
-	if(prob(2) && iscarbon(M))
-		var/datum/disease/D = new /datum/disease/heart_failure
-		M.ForceContractDisease(D)
-		to_chat(M, span_userdanger("You're pretty sure you just felt your heart stop for a second there.."))
-		M.playsound_local(M, 'sound/effects/singlebeat.ogg', 100, 0)
-
-	if(prob(7))
-		to_chat(M, span_notice("[pick("Your head pounds.", "You feel a tight pain in your chest.", "You find it hard to stay still.", "You feel your heart practically beating out of your chest.")]"))
-
-	if(prob(33))
-		M.adjustToxLoss(1*REM, 0)
-		M.losebreath++
-		. = 1
-	return TRUE
-
-/datum/reagent/medicine/ephedrine/addiction_act_stage1(mob/living/M)
-	if(prob(3) && iscarbon(M))
-		M.visible_message(span_danger("[M] starts having a seizure!"), span_userdanger("You have a seizure!"))
-		M.Unconscious(100)
-		M.set_timed_status_effect(120 SECONDS, /datum/status_effect/jitter)
-
-	if(prob(33))
-		M.adjustToxLoss(2*REM, 0)
-		M.losebreath += 2
-		. = 1
-	..()
-
-/datum/reagent/medicine/ephedrine/addiction_act_stage2(mob/living/M)
-	if(prob(6) && iscarbon(M))
-		M.visible_message(span_danger("[M] starts having a seizure!"), span_userdanger("You have a seizure!"))
-		M.Unconscious(100)
-		M.set_timed_status_effect(240 SECONDS, /datum/status_effect/jitter)
-
-	if(prob(33))
-		M.adjustToxLoss(3*REM, 0)
-		M.losebreath += 3
-		. = 1
-	..()
-
-/datum/reagent/medicine/ephedrine/addiction_act_stage3(mob/living/M)
-	if(prob(12) && iscarbon(M))
-		M.visible_message(span_danger("[M] starts having a seizure!"), span_userdanger("You have a seizure!"))
-		M.Unconscious(100)
-		M.set_timed_status_effect(300 SECONDS, /datum/status_effect/jitter)
-
-	if(prob(33))
-		M.adjustToxLoss(4*REM, 0)
-		M.losebreath += 4
-		. = 1
-	..()
-
-/datum/reagent/medicine/ephedrine/addiction_act_stage4(mob/living/M)
-	if(prob(24) && iscarbon(M))
-		M.visible_message(span_danger("[M] starts having a seizure!"), span_userdanger("You have a seizure!"))
-		M.Unconscious(100)
-		M.set_timed_status_effect(300 SECONDS, /datum/status_effect/jitter)
-
-	if(prob(33))
-		M.adjustToxLoss(5*REM, 0)
-		M.losebreath += 5
-		. = 1
-	..()
-
-/datum/reagent/medicine/diphenhydramine
-	name = "Diphenhydramine"
-	description = "Rapidly purges the body of Histamine and reduces jitteriness. Slight chance of causing drowsiness."
-	reagent_state = LIQUID
-	color = "#64FFE6"
-	metabolization_rate = 0.5 * REAGENTS_METABOLISM
-
-/datum/reagent/medicine/diphenhydramine/on_mob_life(mob/living/carbon/M)
-	if(prob(10))
-		M.drowsyness += 1
-	M.adjust_timed_status_effect(-12 SECONDS, /datum/status_effect/jitter)
-	M.reagents.remove_reagent(/datum/reagent/toxin/histamine,3)
-	..()
-
-/datum/reagent/medicine/morphine
-	name = "Morphine"
-	description = "A painkiller that allows the patient to move at full speed even in bulky objects. Causes drowsiness and eventually unconsciousness in high doses. Overdose will cause a variety of effects, ranging from minor to lethal."
-	reagent_state = LIQUID
-	color = "#A9FBFB"
-	metabolization_rate = 0.5 * REAGENTS_METABOLISM
-	overdose_threshold = 30
-	addiction_threshold = 25
-
-/datum/reagent/medicine/morphine/on_mob_metabolize(mob/living/L)
-	..()
-	ADD_TRAIT(L, TRAIT_PAIN_RESIST, type)
-	L.add_movespeed_mod_immunities(type, /datum/movespeed_modifier/damage_slowdown)
-	if(ishuman(L))
-		var/mob/living/carbon/human/drugged = L
-		drugged.physiology.damage_resistance += 5
-
-/datum/reagent/medicine/morphine/on_mob_end_metabolize(mob/living/L)
-	REMOVE_TRAIT(L, TRAIT_PAIN_RESIST, type)
-	L.remove_movespeed_mod_immunities(type, /datum/movespeed_modifier/damage_slowdown)
-	if(ishuman(L))
-		var/mob/living/carbon/human/drugged = L
-		drugged.physiology.damage_resistance -= 5
-	..()
-
-/datum/reagent/medicine/morphine/on_mob_life(mob/living/carbon/M)
-	if(current_cycle >= 5)
-		SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "numb", /datum/mood_event/narcotic_medium, name)
-	switch(current_cycle)
-		if(29)
-			to_chat(M, span_warning("You start to feel tired..."))
-		if(30 to 59)
-			M.drowsyness += 1
-		if(60 to INFINITY)
-			M.Sleeping(40)
-			. = 1
-	..()
-
-/datum/reagent/medicine/morphine/overdose_start(mob/living/M)
-	. = ..()
-	ADD_TRAIT(M, TRAIT_PINPOINT_EYES, type)
-
-/datum/reagent/medicine/morphine/overdose_process(mob/living/M)
-	if(prob(33))
-		M.drop_all_held_items()
-		M.set_timed_status_effect(4 SECONDS * REM, /datum/status_effect/jitter, only_if_higher = TRUE)
-		M.set_timed_status_effect(4 SECONDS * REM, /datum/status_effect/dizziness, only_if_higher = TRUE)
-	..()
-
-/datum/reagent/medicine/morphine/addiction_act_stage1(mob/living/M)
-	if(prob(33))
-		M.drop_all_held_items()
-		M.set_timed_status_effect(4 SECONDS * REM, /datum/status_effect/jitter, only_if_higher = TRUE)
-	..()
-
-/datum/reagent/medicine/morphine/addiction_act_stage2(mob/living/M)
-	if(prob(33))
-		M.drop_all_held_items()
-		M.adjustToxLoss(1*REM, 0)
-		. = 1
-		M.set_timed_status_effect(6 SECONDS * REM, /datum/status_effect/jitter, only_if_higher = TRUE)
-		M.set_timed_status_effect(6 SECONDS * REM, /datum/status_effect/dizziness, only_if_higher = TRUE)
-	..()
-
-/datum/reagent/medicine/morphine/addiction_act_stage3(mob/living/M)
-	if(prob(33))
-		M.drop_all_held_items()
-		M.adjustToxLoss(2*REM, 0)
-		. = 1
-		M.set_timed_status_effect(8 SECONDS * REM, /datum/status_effect/jitter, only_if_higher = TRUE)
-		M.set_timed_status_effect(8 SECONDS * REM, /datum/status_effect/dizziness, only_if_higher = TRUE)
-	..()
-
-/datum/reagent/medicine/morphine/addiction_act_stage4(mob/living/M)
-	if(prob(33))
-		M.drop_all_held_items()
-		M.adjustToxLoss(3*REM, 0)
-		. = 1
-		M.set_timed_status_effect(10 SECONDS * REM, /datum/status_effect/jitter, only_if_higher = TRUE)
-		M.set_timed_status_effect(10 SECONDS * REM, /datum/status_effect/dizziness, only_if_higher = TRUE)
-	..()
-
-/datum/reagent/medicine/tramal
-	name = "Tramal"
-	description = "A low intensity, high duration painkiller. Causes slight drowiness in extended use."
-	reagent_state = LIQUID
-	color = "#34eeee"
-	metabolization_rate = 0.2 * REAGENTS_METABOLISM
-	overdose_threshold = 35
-	addiction_threshold = 30
-
-/datum/reagent/medicine/tramal/on_mob_metabolize(mob/living/L)
-	..()
-	ADD_TRAIT(L, TRAIT_PAIN_RESIST, type)
-
-/datum/reagent/medicine/tramal/on_mob_end_metabolize(mob/living/L)
-	REMOVE_TRAIT(L, TRAIT_PAIN_RESIST, type)
-	..()
-
-/datum/reagent/medicine/tramal/on_mob_life(mob/living/carbon/M)
-	if(current_cycle >= 5)
-		SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "numb", /datum/mood_event/narcotic_light, name)
-	switch(current_cycle)
-		if(60)
-			to_chat(M, span_warning("You feel drowsy..."))
-		if(61 to INFINITY)
-			M.drowsyness += 1
-	..()
-
-/datum/reagent/medicine/tramal/overdose_start(mob/living/M)
-	. = ..()
-	ADD_TRAIT(M, TRAIT_PINPOINT_EYES, type)
-
-/datum/reagent/medicine/tramal/overdose_process(mob/living/M)
-	if(prob(33))
-		M.set_timed_status_effect(4 SECONDS * REM, /datum/status_effect/jitter, only_if_higher = TRUE)
-		M.set_timed_status_effect(4 SECONDS * REM, /datum/status_effect/dizziness, only_if_higher = TRUE)
-	..()
-
-/datum/reagent/medicine/tramal/addiction_act_stage1(mob/living/M)
-	if(prob(33))
-		M.set_timed_status_effect(4 SECONDS * REM, /datum/status_effect/dizziness, only_if_higher = TRUE)
-	..()
-
-/datum/reagent/medicine/tramal/addiction_act_stage2(mob/living/M)
-	if(prob(33))
-		M.set_timed_status_effect(4 SECONDS * REM, /datum/status_effect/jitter, only_if_higher = TRUE)
-		M.set_timed_status_effect(6 SECONDS * REM, /datum/status_effect/dizziness, only_if_higher = TRUE)
-	..()
-
-/datum/reagent/medicine/tramal/addiction_act_stage3(mob/living/M)
-	if(prob(33))
-		M.drop_all_held_items()
-		M.set_timed_status_effect(4 SECONDS * REM, /datum/status_effect/jitter, only_if_higher = TRUE)
-		M.set_timed_status_effect(8 SECONDS * REM, /datum/status_effect/dizziness, only_if_higher = TRUE)
-	..()
-
-/datum/reagent/medicine/tramal/addiction_act_stage4(mob/living/M)
-	if(prob(33))
-		M.drop_all_held_items()
-		M.adjustToxLoss(2*REM, 0)
-		. = 1
-		M.set_timed_status_effect(8 SECONDS * REM, /datum/status_effect/jitter, only_if_higher = TRUE)
-		M.set_timed_status_effect(10 SECONDS * REM, /datum/status_effect/dizziness, only_if_higher = TRUE)
-	..()
-
-/datum/reagent/medicine/dimorlin
-	name = "Dimorlin"
-	description = "A powerful opiate-derivative analgesiac. Extremely habit forming"
-	reagent_state = LIQUID
-	color = "#71adad"
-	metabolization_rate = 0.4 * REAGENTS_METABOLISM
-	overdose_threshold = 15
-	addiction_threshold = 11
-
-/datum/reagent/medicine/dimorlin/on_mob_metabolize(mob/living/L)
-	..()
-	ADD_TRAIT(L, TRAIT_ANALGESIA, type)
-	if(iscarbon(L))
-		var/mob/living/carbon/C = L
-		C.set_screwyhud(SCREWYHUD_HEALTHY)
-	L.add_movespeed_mod_immunities(type, /datum/movespeed_modifier/damage_slowdown)
-	if(ishuman(L))
-		var/mob/living/carbon/human/drugged = L
-		drugged.physiology.damage_resistance += 15
-
-/datum/reagent/medicine/dimorlin/on_mob_end_metabolize(mob/living/L)
-	REMOVE_TRAIT(L, TRAIT_ANALGESIA, type)
-	if(iscarbon(L))
-		var/mob/living/carbon/C = L
-		C.set_screwyhud(SCREWYHUD_NONE)
-	L.remove_movespeed_mod_immunities(type, /datum/movespeed_modifier/damage_slowdown)
-	if(ishuman(L))
-		var/mob/living/carbon/human/drugged = L
-		drugged.physiology.damage_resistance -= 15
-	..()
-
-/datum/reagent/medicine/dimorlin/on_mob_life(mob/living/carbon/C)
-	C.set_screwyhud(SCREWYHUD_HEALTHY)
-	if(current_cycle >= 3)
-		SEND_SIGNAL(C, COMSIG_ADD_MOOD_EVENT, "numb", /datum/mood_event/narcotic_heavy, name)
-	..()
-
-/datum/reagent/medicine/dimorlin/overdose_start(mob/living/M)
-	. = ..()
-	ADD_TRAIT(M, TRAIT_PINPOINT_EYES, type)
-
-/datum/reagent/medicine/dimorlin/overdose_process(mob/living/M)
-	if(prob(33))
-		M.losebreath++
-		M.adjustOxyLoss(4, 0)
-	if(prob(20))
-		M.AdjustUnconscious(20)
-	if(prob(5))
-		M.adjustOrganLoss(ORGAN_SLOT_EYES, 5)
-	..()
-
-/datum/reagent/medicine/dimorlin/addiction_act_stage1(mob/living/M)
-	if(prob(33))
-		M.drop_all_held_items()
-		M.set_timed_status_effect(4 SECONDS * REM, /datum/status_effect/jitter, only_if_higher = TRUE)
-	..()
-
-/datum/reagent/medicine/dimorlin/addiction_act_stage2(mob/living/M)
-	if(prob(33))
-		M.drop_all_held_items()
-		M.adjustToxLoss(1*REM, 0)
-		. = 1
-		M.set_timed_status_effect(6 SECONDS * REM, /datum/status_effect/jitter, only_if_higher = TRUE)
-		M.set_timed_status_effect(6 SECONDS * REM, /datum/status_effect/jitter, only_if_higher = TRUE)
-	..()
-
-/datum/reagent/medicine/dimorlin/addiction_act_stage3(mob/living/M)
-	if(prob(33))
-		M.drop_all_held_items()
-		M.adjustToxLoss(2*REM, 0)
-		. = 1
-		M.set_timed_status_effect(8 SECONDS * REM, /datum/status_effect/jitter, only_if_higher = TRUE)
-		M.set_timed_status_effect(8 SECONDS * REM, /datum/status_effect/jitter, only_if_higher = TRUE)
-	..()
-
-/datum/reagent/medicine/dimorlin/addiction_act_stage4(mob/living/M)
-	if(prob(33))
-		M.drop_all_held_items()
-		M.adjustToxLoss(3*REM, 0)
-		. = 1
-		M.set_timed_status_effect(10 SECONDS * REM, /datum/status_effect/jitter, only_if_higher = TRUE)
-		M.set_timed_status_effect(10 SECONDS * REM, /datum/status_effect/jitter, only_if_higher = TRUE)
-	..()
-
-/datum/reagent/medicine/oculine
-	name = "Oculine"
-	description = "Quickly restores eye damage, cures nearsightedness, and has a chance to restore vision to the blind."
-	reagent_state = LIQUID
-	color = "#404040" //oculine is dark grey, inacusiate is light grey
-	metabolization_rate = 0.25 * REAGENTS_METABOLISM
-	taste_description = "dull toxin"
-
-/datum/reagent/medicine/oculine/on_mob_life(mob/living/carbon/M)
-	var/obj/item/organ/eyes/eyes = M.getorganslot(ORGAN_SLOT_EYES)
-	if (!eyes)
-		return
-	eyes.applyOrganDamage(-2)
-	if(HAS_TRAIT_FROM(M, TRAIT_BLIND, EYE_DAMAGE))
-		if(prob(20))
-			to_chat(M, span_warning("Your vision slowly returns..."))
-			M.cure_blind(EYE_DAMAGE)
-			M.cure_nearsighted(EYE_DAMAGE)
-			M.blur_eyes(35)
-
-	else if(HAS_TRAIT_FROM(M, TRAIT_NEARSIGHT, EYE_DAMAGE))
-		to_chat(M, span_warning("The blackness in your peripheral vision fades."))
-		M.cure_nearsighted(EYE_DAMAGE)
-		M.blur_eyes(10)
-	else if(M.eye_blind || M.eye_blurry)
-		M.set_blindness(0)
-		M.set_blurriness(0)
-	..()
-
-/datum/reagent/medicine/inacusiate
-	name = "Inacusiate"
-	description = "Instantly restores all hearing to the patient, but does not cure deafness."
-	color = "#606060" // ditto
-
-/datum/reagent/medicine/inacusiate/on_mob_life(mob/living/carbon/M)
-	M.restoreEars()
-	..()
-
-/datum/reagent/medicine/atropine
-	name = "Atropine"
-	description = "If a patient is in critical condition, rapidly heals all damage types as well as regulating oxygen in the body. Excellent for stabilizing wounded patients."
-	reagent_state = LIQUID
-	color = "#1D3535" //slightly more blue, like epinephrine
-	metabolization_rate = 0.25 * REAGENTS_METABOLISM
-	overdose_threshold = 35
-
-/datum/reagent/medicine/atropine/on_mob_life(mob/living/carbon/M)
-	if(M.health <= M.crit_threshold)
-		M.adjustToxLoss(-2*REM, 0)
-		M.adjustBruteLoss(-2*REM, 0)
-		M.adjustFireLoss(-2*REM, 0)
-		M.adjustOxyLoss(-5*REM, 0)
-		. = 1
-	M.losebreath = 0
-	if(prob(20))
-		M.set_timed_status_effect(10 SECONDS * REM, /datum/status_effect/jitter, only_if_higher = TRUE)
-		M.set_timed_status_effect(10 SECONDS * REM, /datum/status_effect/jitter, only_if_higher = TRUE)
-	..()
-
-/datum/reagent/medicine/atropine/overdose_process(mob/living/M)
-	M.adjustToxLoss(0.5*REM, 0)
-	. = 1
-	M.set_timed_status_effect(2 SECONDS * REM, /datum/status_effect/jitter, only_if_higher = TRUE)
-	M.adjust_timed_status_effect(2 SECONDS * REM, /datum/status_effect/dizziness, max_duration = 20 SECONDS)
-	..()
-
-/datum/reagent/medicine/epinephrine
-	name = "Epinephrine"
-	description = "Very minor boost to stun resistance. Slowly heals damage if a patient is in critical condition, as well as regulating oxygen loss. Overdose causes weakness and toxin damage."
-	reagent_state = LIQUID
-	color = "#D2FFFA"
-	metabolization_rate = 0.25 * REAGENTS_METABOLISM
-	overdose_threshold = 30
-
-/datum/reagent/medicine/epinephrine/on_mob_metabolize(mob/living/carbon/M)
-	..()
-	ADD_TRAIT(M, TRAIT_NOCRITDAMAGE, type)
-
-/datum/reagent/medicine/epinephrine/on_mob_end_metabolize(mob/living/carbon/M)
-	REMOVE_TRAIT(M, TRAIT_NOCRITDAMAGE, type)
-	..()
-
-/datum/reagent/medicine/epinephrine/on_mob_life(mob/living/carbon/M)
-	if(M.health <= M.crit_threshold)
-		M.adjustToxLoss(-0.5*REM, 0)
-		M.adjustBruteLoss(-0.5*REM, 0)
-		M.adjustFireLoss(-0.5*REM, 0)
-		M.adjustOxyLoss(-0.5*REM, 0)
-	if(M.losebreath >= 4)
-		M.losebreath -= 2
-	if(M.losebreath < 0)
-		M.losebreath = 0
-	M.adjustStaminaLoss(-0.5*REM, 0)
-	. = 1
-	if(prob(20))
-		M.AdjustAllImmobility(-20)
-	..()
-
-/datum/reagent/medicine/epinephrine/overdose_process(mob/living/M)
-	if(prob(33))
-		M.adjustStaminaLoss(2.5*REM, 0)
-		M.adjustToxLoss(1*REM, 0)
-		M.losebreath++
-		. = 1
-	..()
-
-/datum/reagent/medicine/strange_reagent
-	name = "Strange Reagent"
-	description = "A miracle drug capable of bringing the dead back to life. Works topically unless anotamically complex, in which case works orally. Only works if the target has less than 200 total brute and burn damage and hasn't been husked and requires more reagent depending on damage inflicted. Causes damage to the living."
-	reagent_state = LIQUID
-	color = "#A0E85E"
-	metabolization_rate = 1.25 * REAGENTS_METABOLISM
-	taste_description = "magnets"
-	harmful = TRUE
-
-/datum/reagent/medicine/strange_reagent/expose_mob(mob/living/M, method=TOUCH, reac_volume)
-	if(M.stat != DEAD)
-		return ..()
-	if(M.hellbound) //they are never coming back
-		M.visible_message(span_warning("[M]'s body does not react..."))
-		return
-	if(iscarbon(M) && method != INGEST) //simplemobs can still be splashed
-		return ..()
-	var/amount_to_revive = round((M.getBruteLoss()+M.getFireLoss())/20)
-	if(M.getBruteLoss()+M.getFireLoss() >= 200 || HAS_TRAIT(M, TRAIT_HUSK) || reac_volume < amount_to_revive) //body will die from brute+burn on revive or you haven't provided enough to revive.
-		M.visible_message(span_warning("[M]'s body convulses a bit, and then falls still once more."))
-		M.do_jitter_animation(10)
-		return
-	M.visible_message(span_warning("[M]'s body starts convulsing!"))
-	M.notify_ghost_cloning("Your body is being revived with Strange Reagent!")
-	M.do_jitter_animation(10)
-	var/excess_healing = 5*(reac_volume-amount_to_revive) //excess reagent will heal blood and organs across the board
-	addtimer(CALLBACK(M, TYPE_PROC_REF(/mob/living/carbon, do_jitter_animation), 10), 40) //jitter immediately, then again after 4 and 8 seconds
-	addtimer(CALLBACK(M, TYPE_PROC_REF(/mob/living/carbon, do_jitter_animation), 10), 80)
-	addtimer(CALLBACK(M, TYPE_PROC_REF(/mob/living, revive), FALSE, FALSE, excess_healing), 79)
-	..()
-
-/datum/reagent/medicine/strange_reagent/on_mob_life(mob/living/carbon/M)
-	var/damage_at_random = rand(0,250)/100 //0 to 2.5
-	M.adjustBruteLoss(damage_at_random*REM, FALSE)
-	M.adjustFireLoss(damage_at_random*REM, FALSE)
-	..()
-	. = TRUE
-
-/datum/reagent/medicine/strange_reagent/on_hydroponics_apply(obj/item/seeds/myseed, datum/reagents/chems, obj/machinery/hydroponics/mytray, mob/user)
-	. = ..()
-	if(chems.has_reagent(type, 5))
-		mytray.spawnplant()
-
-/datum/reagent/medicine/mannitol
-	name = "Mannitol"
-	description = "Efficiently restores brain damage."
-	color = "#A0A0A0" //mannitol is light grey, neurine is lighter grey
-
-/datum/reagent/medicine/mannitol/on_mob_life(mob/living/carbon/C)
-	C.adjustOrganLoss(ORGAN_SLOT_BRAIN, -2*REM)
-	..()
-
-/datum/reagent/medicine/neurine
-	name = "Neurine"
-	description = "Reacts with neural tissue, helping reform damaged connections. Can cure minor traumas."
-	color = "#C0C0C0" //ditto
-
-/datum/reagent/medicine/neurine/on_mob_life(mob/living/carbon/C)
-	if(C.has_reagent(/datum/reagent/consumable/ethanol/neurotoxin))
-		C.remove_reagent(/datum/reagent/consumable/ethanol/neurotoxin, 5)
-	if(prob(15))
-		C.cure_trauma_type(resilience = TRAUMA_RESILIENCE_BASIC)
-	..()
-
-/datum/reagent/medicine/mutadone
-	name = "Mutadone"
-	description = "Removes jitteriness and restores genetic defects."
-	color = "#5096C8"
-	taste_description = "acid"
-
-/datum/reagent/medicine/mutadone/on_mob_life(mob/living/carbon/M)
-	M.adjust_timed_status_effect(-100 SECONDS * REM, /datum/status_effect/jitter)
-	if(M.has_dna())
-		M.dna.remove_all_mutations(list(MUT_NORMAL, MUT_EXTRA), TRUE)
-	if(!QDELETED(M)) //We were a monkey, now a human
-		..()
-
-/datum/reagent/medicine/antihol
-	name = "Antihol"
-	description = "Purges alcoholic substance from the patient's body and eliminates its side effects."
-	color = "#00B4C8"
-	taste_description = "raw egg"
-
-/datum/reagent/medicine/antihol/on_mob_life(mob/living/carbon/M)
-	M.remove_status_effect(/datum/status_effect/dizziness)
-	M.drowsyness = 0
-	M.slurring = 0
-	M.confused = 0
-	M.reagents.remove_all_type(/datum/reagent/consumable/ethanol, 3*REM, 0, 1)
-	M.adjustToxLoss(-0.2*REM, 0)
-	if(ishuman(M))
-		var/mob/living/carbon/human/H = M
-		H.adjust_drunk_effect(-10)
-	..()
-	. = 1
-
-/datum/reagent/medicine/stimulants
-	name = "Indoril"
-	description = "Increases stun resistance and movement speed in addition to restoring minor damage and weakness. Overdose causes weakness and toxin damage."
-	color = "#78008C"
-	metabolization_rate = 0.5 * REAGENTS_METABOLISM
-	overdose_threshold = 60
-
-/datum/reagent/medicine/stimulants/on_mob_metabolize(mob/living/L)
-	..()
-	L.add_movespeed_modifier(/datum/movespeed_modifier/reagent/stimulants)
-	ADD_TRAIT(L, TRAIT_STUNRESISTANCE, type)
-
-/datum/reagent/medicine/stimulants/on_mob_end_metabolize(mob/living/L)
-	L.remove_movespeed_modifier(/datum/movespeed_modifier/reagent/stimulants)
-	REMOVE_TRAIT(L, TRAIT_STUNRESISTANCE, type)
-	..()
-
-/datum/reagent/medicine/stimulants/on_mob_life(mob/living/carbon/M)
-	if(M.health < 50 && M.health > 0)
-		M.adjustOxyLoss(-1*REM, 0)
-		M.adjustToxLoss(-1*REM, 0)
-		M.adjustBruteLoss(-1*REM, 0)
-		M.adjustFireLoss(-1*REM, 0)
-	M.AdjustAllImmobility(-60)
-	M.adjustStaminaLoss(-5*REM, 0)
-	..()
-	. = 1
-
-/datum/reagent/medicine/stimulants/overdose_process(mob/living/M)
-	if(prob(33))
-		M.adjustStaminaLoss(2.5*REM, 0)
-		M.adjustToxLoss(1*REM, 0)
-		M.losebreath++
-		. = 1
-	..()
-
-/datum/reagent/medicine/insulin
-	name = "Insulin"
-	description = "Increases sugar depletion rates."
-	reagent_state = LIQUID
-	color = "#FFFFF0"
-	metabolization_rate = 0.5 * REAGENTS_METABOLISM
-
-/datum/reagent/medicine/insulin/on_mob_life(mob/living/carbon/M)
-	if(M.AdjustSleeping(-20))
-		. = 1
-	M.reagents.remove_reagent(/datum/reagent/consumable/sugar, 3)
-	..()
-
-//Trek Chems, simple to mix but weak as healing. Second tier trekchems will heal faster.
-/datum/reagent/medicine/bicaridine
-	name = "Bicaridine"
-	description = "Restores bruising. Overdose causes it instead."
-	reagent_state = LIQUID
-	color = "#bf0000"
-	overdose_threshold = 30
-
-/datum/reagent/medicine/bicaridine/on_mob_life(mob/living/carbon/M)
-	M.adjustBruteLoss(-0.5*REM, 0)
-	..()
-	. = 1
-
-/datum/reagent/medicine/bicaridine/overdose_process(mob/living/M)
-	M.adjustBruteLoss(2*REM, FALSE, FALSE, BODYTYPE_ORGANIC)
-	..()
-	. = 1
-
-/datum/reagent/medicine/bicaridinep
-	name = "Bicaridine Plus"
-	description = "Restores bruising and slowly stems bleeding. Overdose causes it instead. More effective than standardized Bicaridine."
-	reagent_state = LIQUID
-	color = "#bf0000"
-	overdose_threshold = 25
-
-/datum/reagent/medicine/bicaridinep/on_mob_life(mob/living/carbon/M)
-	M.adjustBruteLoss(-2*REM, 0)
-	..()
-	. = 1
-
-/datum/reagent/medicine/bicaridinep/overdose_process(mob/living/M)
-	M.adjustBruteLoss(6*REM, FALSE, FALSE, BODYTYPE_ORGANIC)
-	..()
-	. = 1
-
-/datum/reagent/medicine/dexalin
-	name = "Dexalin"
-	description = "Restores oxygen loss. Overdose causes it instead."
-	reagent_state = LIQUID
-	color = "#0080FF"
-	overdose_threshold = 30
-
-/datum/reagent/medicine/dexalin/on_mob_life(mob/living/carbon/M)
-	M.adjustOxyLoss(-0.5*REM, 0)
-	..()
-	. = 1
-
-/datum/reagent/medicine/dexalin/overdose_process(mob/living/M)
-	M.adjustOxyLoss(2*REM, 0)
-	..()
-	. = 1
-
-/datum/reagent/medicine/dexalinp
-	name = "Dexalin Plus"
-	description = "Restores oxygen loss and purges Lexorin. Overdose causes it instead. More effective than standardized Dexalin."
-	reagent_state = LIQUID
-	color = "#0040FF"
-	overdose_threshold = 25
-
-/datum/reagent/medicine/dexalinp/on_mob_life(mob/living/carbon/M)
-	M.adjustOxyLoss(-2*REM, 0)
-	if(ishuman(M) && M.blood_volume < BLOOD_VOLUME_NORMAL)
-		M.blood_volume += 1
-	if(holder.has_reagent(/datum/reagent/toxin/lexorin))
-		holder.remove_reagent(/datum/reagent/toxin/lexorin, 3)
-	..()
-	. = 1
-
-/datum/reagent/medicine/dexalinp/overdose_process(mob/living/M)
-	M.adjustOxyLoss(6*REM, 0)
-	..()
-	. = 1
-
-/datum/reagent/medicine/kelotane
-	name = "Kelotane"
-	description = "Heals burn damage. Overdose causes it instead."
-	reagent_state = LIQUID
-	color = "#FFa800"
-	overdose_threshold = 30
-
-/datum/reagent/medicine/kelotane/on_mob_life(mob/living/carbon/M)
-	M.adjustFireLoss(-0.5*REM, 0)
-	..()
-	. = 1
-
-/datum/reagent/medicine/kelotane/overdose_process(mob/living/M)
-	M.adjustFireLoss(2*REM, FALSE, FALSE, BODYTYPE_ORGANIC)
-	..()
-	. = 1
-
-/datum/reagent/medicine/dermaline
-	name = "Dermaline"
-	description = "Heals burn damage. Overdose causes it instead. Superior to standardized Kelotane in healing capacity."
-	reagent_state = LIQUID
-	color = "#FF8000"
-	overdose_threshold = 25
-
-/datum/reagent/medicine/dermaline/on_mob_life(mob/living/carbon/M)
-	M.adjustFireLoss(-2*REM, 0)
-	..()
-	. = 1
-
-/datum/reagent/medicine/dermaline/overdose_process(mob/living/M)
-	M.adjustFireLoss(6*REM, FALSE, FALSE, BODYTYPE_ORGANIC)
-	..()
-	. = 1
-
-/datum/reagent/medicine/antitoxin
-	name = "Dylovene"
-	description = "Heals toxin damage and removes toxins in the bloodstream. Overdose causes toxin damage."
-	reagent_state = LIQUID
-	color = "#00a000"
-	overdose_threshold = 30
-	taste_description = "a roll of gauze"
-
-/datum/reagent/medicine/antitoxin/on_mob_life(mob/living/carbon/M)
-	M.adjustToxLoss(-0.5*REM, 0)
-	for(var/datum/reagent/toxin/R in M.reagents.reagent_list)
-		M.reagents.remove_reagent(R.type,1)
-	..()
-	. = 1
-
-/datum/reagent/medicine/antitoxin/on_hydroponics_apply(obj/item/seeds/myseed, datum/reagents/chems, obj/machinery/hydroponics/mytray, mob/user)
-	. = ..()
-	if(chems.has_reagent(type, 1))
-		mytray.adjustToxic(-round(chems.get_reagent_amount(type) * 2))
-
-/datum/reagent/medicine/antitoxin/overdose_process(mob/living/M)
-	M.adjustToxLoss(2*REM, 0) // End result is 1.5 toxin loss taken, because it heals 0.5 and then removes 2.
-	..()
-	. = 1
-
-/datum/reagent/medicine/inaprovaline
-	name = "Inaprovaline"
-	description = "Stabilizes the breathing of patients. Good for those in critical condition."
-	reagent_state = LIQUID
-	color = "#A4D8D8"
-
-/datum/reagent/medicine/inaprovaline/on_mob_life(mob/living/carbon/M)
-	if(M.losebreath >= 5)
-		M.losebreath -= 5
-	..()
-
-/datum/reagent/medicine/tricordrazine
-	name = "Tricordrazine"
-	description = "A weak dilutant that slowly heals brute, burn, and toxin damage."
-	reagent_state = LIQUID
-	color = "#C8A5DC"
-	taste_description = "water that has been standing still in a glass on a counter overnight"
-
-/datum/reagent/medicine/tricordrazine/on_mob_life(mob/living/carbon/M)
-	if(prob(80))
-		M.adjustBruteLoss(-0.25*REM, 0)
-		M.adjustFireLoss(-0.25*REM, 0)
-		M.adjustToxLoss(-0.25*REM, 0)
-		. = 1
-	..()
-/datum/reagent/medicine/tetracordrazine //WS edit: Yes
-	name = "Tetracordrazine"
-	description = "A weak dilutant similar to Tricordrazine that slowly heals all damage types."
-	reagent_state = LIQUID
-	color = "#C8A5DC"
-	taste_description = "bottled water that has been sitting out in the sun with a single chili flake in it"
-
-/datum/reagent/medicine/tetracordrazine/on_mob_life(mob/living/carbon/M)
-	if(prob(80))
-		M.adjustBruteLoss(-0.25*REM, 0)
-		M.adjustFireLoss(-0.25*REM, 0)
-		M.adjustToxLoss(-0.25*REM, 0)
-		M.adjustOxyLoss(-0.5*REM, 0)
-		. = 1
-	..()
-
-/datum/reagent/medicine/regen_jelly
-	name = "Regenerative Jelly"
-	description = "Gradually regenerates all types of damage, without harming slime anatomy."
-	reagent_state = LIQUID
-	color = "#CC23FF"
-	taste_description = "jelly"
-
-/datum/reagent/medicine/regen_jelly/expose_mob(mob/living/M, reac_volume)
-	if(M && ishuman(M) && reac_volume >= 0.5)
-		var/mob/living/carbon/human/H = M
-		H.hair_color = "C2F"
-		H.facial_hair_color = "C2F"
-		H.update_hair()
-
-/datum/reagent/medicine/regen_jelly/on_mob_life(mob/living/carbon/M)
-	M.adjustBruteLoss(-1.5*REM, 0)
-	M.adjustFireLoss(-1.5*REM, 0)
-	M.adjustOxyLoss(-1.5*REM, 0)
-	M.adjustToxLoss(-1.5*REM, 0, TRUE) //heals TOXINLOVERs
-	..()
-	. = 1
-
-/datum/reagent/medicine/syndicate_nanites //Used exclusively by Syndicate medical cyborgs
-	name = "Restorative Nanites"
-	description = "Miniature medical robots that swiftly restore bodily damage."
-	reagent_state = SOLID
-	color = "#555555"
-	overdose_threshold = 30
-	process_flags = ORGANIC | SYNTHETIC //WS Edit - IPCs //WS Edit - IPCs
-
-/datum/reagent/medicine/syndicate_nanites/on_mob_life(mob/living/carbon/M)
-	M.adjustBruteLoss(-5*REM, 0) //A ton of healing - this is a 50 telecrystal investment.
-	M.adjustFireLoss(-5*REM, 0)
-	M.adjustOxyLoss(-15, 0)
-	M.adjustToxLoss(-5*REM, 0)
-	M.adjustOrganLoss(ORGAN_SLOT_BRAIN, -15*REM)
-	M.adjustCloneLoss(-3*REM, 0)
-	..()
-	. = 1
-
-/datum/reagent/medicine/syndicate_nanites/overdose_process(mob/living/carbon/M) //wtb flavortext messages that hint that you're vomitting up robots
-	if(prob(25))
-		M.reagents.remove_reagent(type, metabolization_rate*15) // ~5 units at a rate of 0.4 but i wanted a nice number in code
-		M.vomit(20) // nanite safety protocols make your body expel them to prevent harmies
-	..()
-	. = 1
-
-/datum/reagent/medicine/earthsblood //Created by ambrosia gaia plants
-	name = "Earthsblood"
-	description = "Ichor from an extremely powerful plant. Great for restoring wounds, but it's a little heavy on the brain. For some strange reason, it also induces temporary pacifism in those who imbibe it and semi-permanent pacifism in those who overdose on it."
-	color = "#FFAF00"
-	metabolization_rate = 0.4 //Math is based on specific metab rate so we want this to be static AKA if define or medicine metab rate changes, we want this to stay until we can rework calculations.
-	overdose_threshold = 25
-
-/datum/reagent/medicine/earthsblood/on_mob_life(mob/living/carbon/M)
-	if(current_cycle <= 25) //10u has to be processed before u get into THE FUN ZONE
-		M.adjustBruteLoss(-1 * REM, 0)
-		M.adjustFireLoss(-1 * REM, 0)
-		M.adjustOxyLoss(-0.5 * REM, 0)
-		M.adjustToxLoss(-0.5 * REM, 0)
-		M.adjustCloneLoss(-0.1 * REM, 0)
-		M.adjustStaminaLoss(-0.5 * REM, 0)
-		M.adjustOrganLoss(ORGAN_SLOT_BRAIN, 1 * REM, 150) //This does, after all, come from ambrosia, and the most powerful ambrosia in existence, at that!
-	else
-		M.adjustBruteLoss(-5 * REM, 0) //slow to start, but very quick healing once it gets going
-		M.adjustFireLoss(-5 * REM, 0)
-		M.adjustOxyLoss(-3 * REM, 0)
-		M.adjustToxLoss(-3 * REM, 0)
-		M.adjustCloneLoss(-1 * REM, 0)
-		M.adjustStaminaLoss(-3 * REM, 0)
-		M.adjust_timed_status_effect(3 SECONDS, /datum/status_effect/jitter, 30 SECONDS)
-		M.adjustOrganLoss(ORGAN_SLOT_BRAIN, 2 * REM, 150)
-	M.druggy = min(max(0, M.druggy + 10), 15) //See above
-	..()
-	. = 1
-
-/datum/reagent/medicine/earthsblood/on_mob_metabolize(mob/living/L)
-	..()
-	ADD_TRAIT(L, TRAIT_PACIFISM, type)
-
-/datum/reagent/medicine/earthsblood/on_mob_end_metabolize(mob/living/L)
-	REMOVE_TRAIT(L, TRAIT_PACIFISM, type)
-	..()
-
-/datum/reagent/medicine/earthsblood/overdose_process(mob/living/M)
-	M.hallucination = min(max(0, M.hallucination + 5), 60)
-	if(current_cycle > 25)
-		M.adjustToxLoss(4 * REM, 0)
-		if(current_cycle > 100) //podpeople get out reeeeeeeeeeeeeeeeeeeee
-			M.adjustToxLoss(6 * REM, 0)
-	if(iscarbon(M))
-		var/mob/living/carbon/hippie = M
-		hippie.gain_trauma(/datum/brain_trauma/severe/pacifism)
-	..()
-	. = 1
-
-//Earthsblood is still a wonderdrug. Just... don't expect to be able to mutate something that makes plants so healthy.
-/datum/reagent/medicine/earthsblood/on_hydroponics_apply(obj/item/seeds/myseed, datum/reagents/chems, obj/machinery/hydroponics/mytray, mob/user)
-	. = ..()
-	if(chems.has_reagent(type, 1))
-		mytray.adjustHealth(round(chems.get_reagent_amount(type) * 1))
-		mytray.adjustPests(-rand(1,3))
-		mytray.adjustWeeds (-rand(1,3))
-		if(myseed)
-			myseed.adjust_instability(-round(chems.get_reagent_amount(type) * 1.3))
-			myseed.adjust_potency(round(chems.get_reagent_amount(type)))
-			myseed.adjust_yield(round(chems.get_reagent_amount(type)))
-			myseed.adjust_endurance(round(chems.get_reagent_amount(type) * 0.5))
-			myseed.adjust_production(-round(chems.get_reagent_amount(type) * 0.5))
-
-/datum/reagent/medicine/haloperidol
-	name = "Haloperidol"
-	description = "Increases depletion rates for most stimulating/hallucinogenic drugs. Reduces druggy effects and jitteriness. Severe stamina regeneration penalty, causes drowsiness. Small chance of brain damage."
-	reagent_state = LIQUID
-	color = "#27870a"
-	metabolization_rate = 0.4 * REAGENTS_METABOLISM
-
-/datum/reagent/medicine/haloperidol/on_mob_life(mob/living/carbon/M)
-	for(var/datum/reagent/drug/R in M.reagents.reagent_list)
-		M.reagents.remove_reagent(R.type,5)
-	M.drowsyness += 2
-	if(M.get_timed_status_effect_duration(/datum/status_effect/jitter) >= 6 SECONDS)
-		M.adjust_timed_status_effect(-6 SECONDS * REM, /datum/status_effect/jitter)
-	if (M.hallucination >= 5)
-		M.hallucination -= 5
-	if(prob(20))
-		M.adjustOrganLoss(ORGAN_SLOT_BRAIN, 1*REM, 50)
-	M.adjustStaminaLoss(2.5*REM, 0)
-	..()
-	return TRUE
-
-/*	WS edit begin - Lavaland rework
-/datum/reagent/medicine/lavaland_extract
-	name = "Lavaland Extract"
-	description = "An extract of lavaland atmospheric and mineral elements. Heals the user in small doses, but is extremely toxic otherwise."
-	color = "#6B372E" //dark and red like lavaland
-	overdose_threshold = 3 //To prevent people stacking massive amounts of a very strong healing reagent
-	can_synth = FALSE
-
-/datum/reagent/medicine/lavaland_extract/on_mob_life(mob/living/carbon/M)
-	M.heal_bodypart_damage(5,5)
-	..()
-	return TRUE
-
-/datum/reagent/medicine/lavaland_extract/overdose_process(mob/living/M)
-	M.adjustBruteLoss(3*REM, 0, FALSE, BODYTYPE_ORGANIC)
-	M.adjustFireLoss(3*REM, 0, FALSE, BODYTYPE_ORGANIC)
-	M.adjustToxLoss(3*REM, 0)
-	..()
-	return TRUE
-*/		//WS edit end
-
-//used for changeling's adrenaline power
-/datum/reagent/medicine/changelingadrenaline
-	name = "Changeling Adrenaline"
-	description = "Reduces the duration of unconciousness, knockdown and stuns. Restores stamina, but deals toxin damage when overdosed."
-	color = "#C1151D"
-	overdose_threshold = 30
-
-/datum/reagent/medicine/changelingadrenaline/on_mob_life(mob/living/carbon/M as mob)
-	..()
-	M.AdjustAllImmobility(-20)
-	M.adjustStaminaLoss(-10, 0)
-	M.set_timed_status_effect(20 SECONDS * REM, /datum/status_effect/jitter, only_if_higher = TRUE)
-	M.set_timed_status_effect(20 SECONDS * REM, /datum/status_effect/dizziness, only_if_higher = TRUE)
-	return TRUE
-
-/datum/reagent/medicine/changelingadrenaline/on_mob_metabolize(mob/living/L)
-	..()
-	ADD_TRAIT(L, TRAIT_SLEEPIMMUNE, type)
-	ADD_TRAIT(L, TRAIT_STUNRESISTANCE, type)
-	L.add_movespeed_mod_immunities(type, /datum/movespeed_modifier/damage_slowdown)
-
-/datum/reagent/medicine/changelingadrenaline/on_mob_end_metabolize(mob/living/L)
-	..()
-	REMOVE_TRAIT(L, TRAIT_SLEEPIMMUNE, type)
-	REMOVE_TRAIT(L, TRAIT_STUNRESISTANCE, type)
-	L.remove_movespeed_mod_immunities(type, /datum/movespeed_modifier/damage_slowdown)
-	L.remove_status_effect(/datum/status_effect/dizziness)
-	L.remove_status_effect(/datum/status_effect/jitter)
-
-/datum/reagent/medicine/changelingadrenaline/overdose_process(mob/living/M as mob)
-	M.adjustToxLoss(1, 0)
-	..()
-	return TRUE
-
-/datum/reagent/medicine/changelinghaste
-	name = "Changeling Haste"
-	description = "Drastically increases movement speed, but deals toxin damage."
-	color = "#AE151D"
-	metabolization_rate = 1
-
-/datum/reagent/medicine/changelinghaste/on_mob_metabolize(mob/living/L)
-	..()
-	L.add_movespeed_modifier(/datum/movespeed_modifier/reagent/changelinghaste)
-
-/datum/reagent/medicine/changelinghaste/on_mob_end_metabolize(mob/living/L)
-	L.remove_movespeed_modifier(/datum/movespeed_modifier/reagent/changelinghaste)
-	..()
-
-/datum/reagent/medicine/changelinghaste/on_mob_life(mob/living/carbon/M)
-	M.adjustToxLoss(2, 0)
-	..()
-	return TRUE
-
-/datum/reagent/medicine/corazone
-	// Heart attack code will not do damage if corazone is present
-	// because it's SPACE MAGIC ASPIRIN
-	name = "Corazone"
-	description = "A medication used to treat pain, fever, and inflammation, along with heart attacks. Can also be used to stabilize livers."
-	color = "#F49797"
-	self_consuming = TRUE
-
-/datum/reagent/medicine/corazone/on_mob_metabolize(mob/living/M)
-	..()
-	ADD_TRAIT(M, TRAIT_PAIN_RESIST, type)
-	ADD_TRAIT(M, TRAIT_STABLEHEART, type)
-	ADD_TRAIT(M, TRAIT_STABLELIVER, type)
-
-/datum/reagent/medicine/corazone/on_mob_end_metabolize(mob/living/M)
-	REMOVE_TRAIT(M, TRAIT_PAIN_RESIST, type)
-	REMOVE_TRAIT(M, TRAIT_STABLEHEART, type)
-	REMOVE_TRAIT(M, TRAIT_STABLELIVER, type)
-
-/datum/reagent/medicine/cordiolis_hepatico
-	name = "Cordiolis Hepatico"
-	description = "A strange, pitch-black reagent that seems to absorb all light. Effects unknown."
-	color = "#000000"
-	self_consuming = TRUE
-
-/datum/reagent/medicine/cordiolis_hepatico/on_mob_add(mob/living/M)
-	..()
-	ADD_TRAIT(M, TRAIT_STABLELIVER, type)
-	ADD_TRAIT(M, TRAIT_STABLEHEART, type)
-
-/datum/reagent/medicine/cordiolis_hepatico/on_mob_end_metabolize(mob/living/M)
-	..()
-	REMOVE_TRAIT(M, TRAIT_STABLEHEART, type)
-	REMOVE_TRAIT(M, TRAIT_STABLELIVER, type)
-
-/datum/reagent/medicine/muscle_stimulant
-	name = "Muscle Stimulant"
-	description = "A potent chemical that allows someone under its influence to be at full physical ability even when under massive amounts of pain."
-
-/datum/reagent/medicine/muscle_stimulant/on_mob_metabolize(mob/living/L)
-	. = ..()
-	L.add_movespeed_mod_immunities(type, /datum/movespeed_modifier/damage_slowdown)
-
-/datum/reagent/medicine/muscle_stimulant/on_mob_end_metabolize(mob/living/L)
-	. = ..()
-	L.remove_movespeed_mod_immunities(type, /datum/movespeed_modifier/damage_slowdown)
-
-/datum/reagent/medicine/modafinil
-	name = "Modafinil"
-	description = "Long-lasting sleep suppressant that very slightly reduces stun and knockdown times. Overdosing has horrendous side effects and deals lethal oxygen damage, will knock you unconscious if not dealt with."
-	reagent_state = LIQUID
-	color = "#BEF7D8" // palish blue white
-	metabolization_rate = 0.1 * REAGENTS_METABOLISM
-	overdose_threshold = 20 // with the random effects this might be awesome or might kill you at less than 10u (extensively tested)
-	taste_description = "salt" // it actually does taste salty
-	var/overdose_progress = 0 // to track overdose progress
-
-/datum/reagent/medicine/modafinil/on_mob_metabolize(mob/living/M)
-	ADD_TRAIT(M, TRAIT_SLEEPIMMUNE, type)
-	..()
-
-/datum/reagent/medicine/modafinil/on_mob_end_metabolize(mob/living/M)
-	REMOVE_TRAIT(M, TRAIT_SLEEPIMMUNE, type)
-	..()
-
-/datum/reagent/medicine/modafinil/on_mob_life(mob/living/carbon/M)
-	if(!overdosed) // We do not want any effects on OD
-		overdose_threshold = overdose_threshold + rand(-10,10)/10 // for extra fun
-		M.AdjustAllImmobility(-5)
-		M.adjustStaminaLoss(-0.5*REM, 0)
-		M.adjust_timed_status_effect(2 SECONDS * REM, /datum/status_effect/jitter, max_duration = 20 SECONDS)
-		metabolization_rate = 0.01 * REAGENTS_METABOLISM * rand(5,20) // randomizes metabolism between 0.02 and 0.08 per tick
-		. = TRUE
-	..()
-
-/datum/reagent/medicine/modafinil/overdose_start(mob/living/M)
-	to_chat(M, span_userdanger("You feel awfully out of breath and jittery!"))
-	metabolization_rate = 0.025 * REAGENTS_METABOLISM // sets metabolism to 0.01 per tick on overdose
-
-/datum/reagent/medicine/modafinil/overdose_process(mob/living/M)
-	overdose_progress++
-	switch(overdose_progress)
-		if(1 to 40)
-			M.adjust_timed_status_effect(2 SECONDS * REM, /datum/status_effect/jitter, max_duration = 40 SECONDS)
-			M.stuttering = min(M.stuttering+1, 10)
-			M.set_timed_status_effect(10 SECONDS * REM, /datum/status_effect/dizziness, only_if_higher = TRUE)
-			if(prob(50))
-				M.losebreath++
-		if(41 to 80)
-			M.adjustOxyLoss(0.1*REM, 0)
-			M.adjustStaminaLoss(0.1*REM, 0)
-			M.adjust_timed_status_effect(2 SECONDS * REM, /datum/status_effect/jitter, max_duration = 40 SECONDS)
-			M.stuttering = min(M.stuttering+1, 20)
-			M.set_timed_status_effect(20 SECONDS * REM, /datum/status_effect/dizziness, only_if_higher = TRUE)
-			if(prob(50))
-				M.losebreath++
-			if(prob(20))
-				to_chat(M, span_userdanger("You have a sudden fit!"))
-				M.Paralyze(20) // you should be in a bad spot at this point unless epipen has been used
-		if(81)
-			to_chat(M, span_userdanger("You feel too exhausted to continue!")) // at this point you will eventually die unless you get charcoal
-			M.adjustOxyLoss(0.1*REM, 0)
-			M.adjustStaminaLoss(0.1*REM, 0)
-		if(82 to INFINITY)
-			M.Sleeping(100)
-			M.adjustOxyLoss(1.5*REM, 0)
-			M.adjustStaminaLoss(1.5*REM, 0)
-	..()
-	return TRUE
-
-/datum/reagent/medicine/psicodine
-	name = "Psicodine"
-	description = "Suppresses anxiety and other various forms of mental distress. Overdose causes hallucinations and minor toxin damage."
-	reagent_state = LIQUID
-	color = "#07E79E"
-	metabolization_rate = 0.25 * REAGENTS_METABOLISM
-	overdose_threshold = 30
-
-/datum/reagent/medicine/psicodine/on_mob_metabolize(mob/living/L)
-	..()
-	ADD_TRAIT(L, TRAIT_FEARLESS, type)
-
-/datum/reagent/medicine/psicodine/on_mob_end_metabolize(mob/living/L)
-	REMOVE_TRAIT(L, TRAIT_FEARLESS, type)
-	..()
-
-/datum/reagent/medicine/psicodine/on_mob_life(mob/living/carbon/M)
-	M.adjust_timed_status_effect(-6 SECONDS * REM, /datum/status_effect/jitter)
-	M.adjust_timed_status_effect(-12 SECONDS * REM, /datum/status_effect/dizziness)
-	M.confused = max(0, M.confused-6)
-	M.disgust = max(0, M.disgust-6)
-	var/datum/component/mood/mood = M.GetComponent(/datum/component/mood)
-	if(mood.sanity <= SANITY_NEUTRAL) // only take effect if in negative sanity and then...
-		mood.setSanity(min(mood.sanity+5, SANITY_NEUTRAL)) // set minimum to prevent unwanted spiking over neutral
-	..()
-	. = 1
-
-/datum/reagent/medicine/psicodine/overdose_process(mob/living/M)
-	M.hallucination = min(max(0, M.hallucination + 5), 60)
-	M.adjustToxLoss(1, 0)
-	..()
-	. = 1
-
-/datum/reagent/medicine/metafactor
-	name = "Mitogen Metabolism Factor"
-	description = "This enzyme catalyzes the conversion of nutricious food into healing peptides."
-	metabolization_rate = 0.0625  * REAGENTS_METABOLISM //slow metabolism rate so the patient can self heal with food even after the troph has metabolized away for amazing reagent efficency.
-	reagent_state = SOLID
-	color = "#FFBE00"
-	overdose_threshold = 10
-
-/datum/reagent/medicine/metafactor/overdose_start(mob/living/carbon/M)
-	metabolization_rate = 2  * REAGENTS_METABOLISM
-
-/datum/reagent/medicine/metafactor/overdose_process(mob/living/carbon/M)
-	if(prob(25))
-		M.vomit()
-	..()
-
-/datum/reagent/medicine/silibinin
-	name = "Silibinin"
-	description = "A thistle derrived hepatoprotective flavolignan mixture that help reverse damage to the liver."
-	reagent_state = SOLID
-	color = "#FFFFD0"
-	metabolization_rate = 1.5 * REAGENTS_METABOLISM
-
-/datum/reagent/medicine/silibinin/expose_mob(mob/living/carbon/M, method=INJECT, reac_volume)
-	if(method != INJECT)
-		return
-
-	M.adjustOrganLoss(ORGAN_SLOT_LIVER, -1)  //on injection, will heal the liver. This will (hopefully) fix dead livers.
-
-	..()
-
-/datum/reagent/medicine/silibinin/on_mob_life(mob/living/carbon/M)
-	M.adjustOrganLoss(ORGAN_SLOT_LIVER, -2)//Add a chance to cure liver trauma once implemented.
-	..()
-	. = 1
-
-/datum/reagent/medicine/polypyr  //This is intended to be an ingredient in advanced chems.
-	name = "Polypyrylium Oligomers"
-	description = "A purple mixture of short polyelectrolyte chains not easily synthesized in the laboratory. It is valued as an intermediate in the synthesis of the cutting edge pharmaceuticals."
-	reagent_state = SOLID
-	color = "#9423FF"
-	metabolization_rate = 0.15 * REAGENTS_METABOLISM
-	overdose_threshold = 50
-	taste_description = "numbing bitterness"
-	/// While this reagent is in our bloodstream, we reduce all bleeding by this factor
-	var/passive_bleed_modifier = 0.55
-	/// For tracking when we tell the person we're no longer bleeding
-	var/was_working
-
-/datum/reagent/medicine/polypyr/on_mob_metabolize(mob/living/M)
-	ADD_TRAIT(M, TRAIT_COAGULATING, /datum/reagent/medicine/polypyr)
-	if(!ishuman(M))
-		return
-
-	var/mob/living/carbon/human/blood_boy = M
-	blood_boy.physiology?.bleed_mod *= passive_bleed_modifier
-	return ..()
-
-/datum/reagent/medicine/polypyr/on_mob_end_metabolize(mob/living/M)
-	REMOVE_TRAIT(M, TRAIT_COAGULATING, /datum/reagent/medicine/polypyr)
-	//should probably generic proc this at a later point. I'm probably gonna use it a bit
-	if(was_working)
-		to_chat(M, span_warning("The medicine thickening your blood loses its effect!"))
-	if(!ishuman(M))
-		return
-
-	var/mob/living/carbon/human/blood_boy = M
-	blood_boy.physiology?.bleed_mod /= passive_bleed_modifier
-
-	return ..()
-
-
-/datum/reagent/medicine/polypyr/on_mob_life(mob/living/carbon/M) //I wanted a collection of small positive effects, this is as hard to obtain as coniine after all.
-	M.adjustOrganLoss(ORGAN_SLOT_LUNGS, -0.25)
-	M.adjustBruteLoss(-0.5, 0)
-	..()
-	. = 1
-
-/datum/reagent/medicine/polypyr/expose_mob(mob/living/M, method=TOUCH, reac_volume)
-	if(method == TOUCH || method == SMOKE || method == VAPOR)
-		if(M && ishuman(M) && reac_volume >= 0.5)
-			var/mob/living/carbon/human/H = M
-			H.hair_color = "92f"
-			H.facial_hair_color = "92f"
-			H.update_hair()
-
-/datum/reagent/medicine/polypyr/overdose_process(mob/living/M)
-	M.adjustOrganLoss(ORGAN_SLOT_LUNGS, 0.5)
-	..()
-	. = 1
-
-/datum/reagent/medicine/carthatoline
-	name = "Carthatoline"
-	description = "An evacuant that induces vomiting and purges toxins, as well as healing toxin damage. Superior to Dylovene. Overdose causes toxin damage."
-	reagent_state = LIQUID
-	color = "#225722"
-	overdose_threshold = 25
-
-/datum/reagent/medicine/carthatoline/on_mob_life(mob/living/carbon/M)
-	M.adjustToxLoss(-2*REM, 0)
-	if(M.getToxLoss() && prob(10))
-		M.vomit(1)
-	for(var/datum/reagent/toxin/R in M.reagents.reagent_list)
-		M.reagents.remove_reagent(R.type,2)
-	..()
-	. = 1
-
-/datum/reagent/medicine/carthatoline/overdose_process(mob/living/M)
-	M.adjustToxLoss(6*REM, 0) // End result is 4 toxin loss taken. Do your own math.
-	..()
-	. = 1
-
-/datum/reagent/medicine/bonefixingjuice
-	name = "C4L-Z1UM Agent"
-	description = "A peculiar substance capable of instantly regenerating live tissue."
-	taste_description = "milk"
-	metabolization_rate = 0
-
-/datum/reagent/medicine/bonefixingjuice/on_mob_life(mob/living/M)
-	var/mob/living/carbon/C = M
-	switch(current_cycle)
-		if(1 to 10)
-			if(C.drowsyness < 10)
-				C.drowsyness += 2
-		if(11 to 30)
-			C.adjustStaminaLoss(5)
-		if(31 to INFINITY)
-			C.AdjustSleeping(40)
-			//formerly everything-fixing juice
-			for(var/datum/wound/blunt/broken_bone in C.all_wounds)
-				broken_bone.remove_wound()
-			for(var/obj/item/organ/O in C.internal_organs)
-				O.damage = 0
-			holder.remove_reagent(/datum/reagent/medicine/bonefixingjuice, 10)
-	..()
-
-/datum/reagent/medicine/converbital
-	name = "Converbital"
-	description = "A substance capable of regenerating torn flesh, however, due to its extremely exothermic nature, use may result in burns"
-	reagent_state = LIQUID
-	taste_description = "burning"
-	color = "#7a1f13"
-	metabolization_rate = REM * 1
-	overdose_threshold = 25
-
-/datum/reagent/medicine/converbital/expose_mob(mob/living/M, method=TOUCH, reac_volume, show_message = 1)
-	if(iscarbon(M) && M.stat != DEAD)
-		if(method in list(INGEST, VAPOR, INJECT))
-			M.adjustFireLoss(0.5*reac_volume)
-			if(show_message)
-				to_chat(M, span_warning("You feel a slight burning sensation..."))
-		else if(M.getBruteLoss())
-			M.adjustBruteLoss(-reac_volume)
-			M.adjustFireLoss(reac_volume)
-			M.force_scream()
-			if(show_message && !HAS_TRAIT(M, TRAIT_ANALGESIA))
-				to_chat(M, span_danger("You feel your skin bubble and burn as your flesh knits itself together!"))
-				SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "painful_medicine", /datum/mood_event/painful_medicine)
-			else
-				to_chat(M, span_notice("You feel your skin shifting around unnaturally."))
-	..()
-
-/datum/reagent/medicine/converbital/on_mob_life(mob/living/carbon/M)
-	M.adjustFireLoss(0.25*REM, 0)
-	..()
-	. = 1
-
-/datum/reagent/medicine/converbital/overdose_process(mob/living/M)
-	M.adjustFireLoss(2.5*REM, 0)
-	M.adjustToxLoss(0.5, 0)
-	..()
-	. = 1
-
-/datum/reagent/medicine/convuri
-	name = "Convuri"
-	description = "A substance capable of regenerating burnt skin with ease, however, the speed at which it does this has been known to cause muscular tearing"
-	reagent_state = SOLID
-	taste_description = "white-hot pain"
-	color = "#b85505"
-	metabolization_rate = REM * 1
-	overdose_threshold = 25
-
-/datum/reagent/medicine/convuri/expose_mob(mob/living/M, method=TOUCH, reac_volume, show_message = 1)
-	if(iscarbon(M) && M.stat != DEAD)
-		if(method in list(INGEST, VAPOR, INJECT))
-			M.adjustBruteLoss(0.5*reac_volume)
-			if(show_message)
-				to_chat(M, span_warning("You feel a slight tearing sensation..."))
-		else if(M.getBruteLoss())
-			M.adjustFireLoss(-reac_volume)
-			M.adjustBruteLoss(reac_volume)
-			M.force_scream()
-			if(show_message && !HAS_TRAIT(M, TRAIT_ANALGESIA))
-				to_chat(M, span_danger("You feel your skin tear as your flesh rapidly regenerates!"))
-				SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "painful_medicine", /datum/mood_event/painful_medicine)
-			else
-				to_chat(M, span_notice("You feel your skin shifting around unnaturally."))
-	..()
-
-/datum/reagent/medicine/convuri/on_mob_life(mob/living/carbon/M)
-	M.adjustBruteLoss(0.25*REM, 0)
-	..()
-	. = 1
-
-/datum/reagent/medicine/convuri/overdose_process(mob/living/M)
-	M.adjustBruteLoss(2.5*REM, 0)
-	M.adjustToxLoss(0.5, 0)
-	..()
-	. = 1
-
-/datum/reagent/medicine/trophazole
-	name = "Trophazole"
-	description = "Orginally developed as fitness supplement, this chemical accelerates wound healing and if ingested turns nutriment into healing peptides"
-	reagent_state = LIQUID
-	color = "#FFFF6B"
-	overdose_threshold = 20
-
-/datum/reagent/medicine/trophazole/on_mob_life(mob/living/carbon/M)
-	M.adjustBruteLoss(-1.5*REM, 0.) // heals 3 brute & 0.5 burn if taken with food. compared to 2.5 brute from bicard + nutriment
-	..()
-	. = 1
-
-/datum/reagent/medicine/trophazole/overdose_process(mob/living/M)
-	M.adjustBruteLoss(3*REM, 0)
-	..()
-	. = 1
-
-/datum/reagent/medicine/trophazole/on_transfer(atom/A, method=INGEST, trans_volume)
-	if(method != INGEST || !iscarbon(A))
-		return
-
-	A.reagents.remove_reagent(/datum/reagent/medicine/trophazole, trans_volume * 0.05)
-	A.reagents.add_reagent(/datum/reagent/medicine/metafactor, trans_volume * 0.25)
-
-	..()
-
-
-/datum/reagent/medicine/rhigoxane
-	name = "Rhigoxane"
-	description = "A second generation burn treatment agent exhibiting a cooling effect that is especially pronounced when deployed as a spray. Its high halogen content helps extinguish fires."
-	reagent_state = LIQUID
-	color = "#F7FFA5"
-	overdose_threshold = 25
-	reagent_weight = 0.6
-
-/datum/reagent/medicine/rhigoxane/on_mob_life(mob/living/carbon/M)
-	M.adjustFireLoss(-2*REM, 0.)
-	M.adjust_bodytemperature(-0.6 * TEMPERATURE_DAMAGE_COEFFICIENT, M.dna.species.bodytemp_normal)
-	..()
-	. = 1
-
-/datum/reagent/medicine/rhigoxane/expose_mob(mob/living/carbon/M, method=VAPOR, reac_volume)
-	if(method != VAPOR)
-		return
-
-	M.adjust_bodytemperature(-reac_volume * TEMPERATURE_DAMAGE_COEFFICIENT * 0.5, 200)
-	M.adjust_fire_stacks(-reac_volume / 2)
-	if(reac_volume >= metabolization_rate)
-		M.ExtinguishMob()
-
-	..()
-
-/datum/reagent/medicine/rhigoxane/overdose_process(mob/living/carbon/M)
-	M.adjustFireLoss(3*REM, 0.)
-	M.adjust_bodytemperature(-5 * TEMPERATURE_DAMAGE_COEFFICIENT, 50)
-	..()
-
-
-/datum/reagent/medicine/thializid
-	name = "Thializid"
-	description = "A potent antidote for intravenous use with a narrow therapeutic index, it is considered an active prodrug of oxalizid."
-	reagent_state = LIQUID
-	color = "#8CDF24" // heavy saturation to make the color blend better
-	metabolization_rate = 0.75 * REAGENTS_METABOLISM
-	overdose_threshold = 6
-	var/conversion_amount
-
-/datum/reagent/medicine/thializid/on_transfer(atom/A, method=INJECT, trans_volume)
-	if(method != INJECT || !iscarbon(A))
-		return
-	var/mob/living/carbon/C = A
-	if(trans_volume >= 0.6) //prevents cheesing with ultralow doses.
-		C.adjustToxLoss(-1.5 * min(2, trans_volume) * REM, 0)	  //This is to promote iv pole use for that chemotherapy feel.
-	var/obj/item/organ/liver/L = C.internal_organs_slot[ORGAN_SLOT_LIVER]
-	if((L.organ_flags & ORGAN_FAILING) || !L)
-		return
-	conversion_amount = trans_volume * (min(100 -C.getOrganLoss(ORGAN_SLOT_LIVER), 80) / 100) //the more damaged the liver the worse we metabolize.
-	C.reagents.remove_reagent(/datum/reagent/medicine/thializid, conversion_amount)
-	C.reagents.add_reagent(/datum/reagent/medicine/oxalizid, conversion_amount)
-	..()
-
-/datum/reagent/medicine/thializid/on_mob_life(mob/living/carbon/M)
-	M.adjustOrganLoss(ORGAN_SLOT_LIVER, 0.8)
-	M.adjustToxLoss(-1*REM, 0)
-	for(var/datum/reagent/toxin/R in M.reagents.reagent_list)
-		M.reagents.remove_reagent(R.type,1)
-
-	..()
-	. = 1
-
-/datum/reagent/medicine/thializid/overdose_process(mob/living/carbon/M)
-	M.adjustOrganLoss(ORGAN_SLOT_LIVER, 1.5)
-	M.adjust_disgust(3)
-	M.reagents.add_reagent(/datum/reagent/medicine/oxalizid, 0.225 * REM)
-	..()
-	. = 1
-
-/datum/reagent/medicine/oxalizid
-	name = "Oxalizid"
-	description = "The active metabolite of thializid. Causes muscle weakness on overdose"
-	reagent_state = LIQUID
-	color = "#DFD54E"
-	metabolization_rate = 0.25 * REAGENTS_METABOLISM
-	overdose_threshold = 25
-	var/datum/brain_trauma/mild/muscle_weakness/U
-
-/datum/reagent/medicine/oxalizid/on_mob_life(mob/living/carbon/M)
-	M.adjustOrganLoss(ORGAN_SLOT_LIVER, 0.1)
-	M.adjustToxLoss(-1*REM, 0)
-	for(var/datum/reagent/toxin/R in M.reagents.reagent_list)
-		M.reagents.remove_reagent(R.type,1)
-	..()
-	. = 1
-
-/datum/reagent/medicine/oxalizid/overdose_start(mob/living/carbon/M)
-	U = new()
-	M.gain_trauma(U, TRAUMA_RESILIENCE_ABSOLUTE)
-	..()
-
-/datum/reagent/medicine/oxalizid/on_mob_delete(mob/living/carbon/M)
-	if(U)
-		QDEL_NULL(U)
-	return ..()
-
-/datum/reagent/medicine/oxalizid/overdose_process(mob/living/carbon/M)
-	M.adjustOrganLoss(ORGAN_SLOT_LIVER, 1.5)
-	M.adjust_disgust(3)
-	..()
-	. = 1
-
-/datum/reagent/medicine/soulus
-	name = "Soulus Dust"
-	description = "Ground legion cores. The dust quickly seals wounds yet slowly causes the tissue to undergo necrosis."
-	reagent_state = SOLID
-	color = "#302f20"
-	metabolization_rate = REAGENTS_METABOLISM * 0.8
-	overdose_threshold = 50
-	var/tox_dam = 0.25
-
-/datum/reagent/medicine/soulus/expose_mob(mob/living/M, method=TOUCH, reac_volume, show_message = 1)
-	if(iscarbon(M) && M.stat != DEAD)
-		if(method in list(INGEST, INJECT))
-			M.set_timed_status_effect(reac_volume SECONDS * REM, /datum/status_effect/jitter, only_if_higher = TRUE)
-			if(M.getFireLoss())
-				M.adjustFireLoss(-reac_volume*1.2)
-			if(M.getBruteLoss())
-				M.adjustBruteLoss(-reac_volume*1.2)
-	if(prob(50))
-		SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "legion", /datum/mood_event/legion_good, name)
-	else
-		SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "legion", /datum/mood_event/legion_bad, name)
-	..()
-
-/datum/reagent/medicine/soulus/on_mob_life(mob/living/carbon/M)
-	M.adjustFireLoss(-0.1*REM, 0)
-	M.adjustBruteLoss(-0.1*REM, 0)
-	M.adjustToxLoss(tox_dam*REM, 0)
-	..()
-
-/datum/reagent/medicine/soulus/overdose_process(mob/living/M)
-	var/mob/living/carbon/C = M
-	if(!istype(C.getorganslot(ORGAN_SLOT_REGENERATIVE_CORE), /obj/item/organ/legion_skull))
-		var/obj/item/organ/legion_skull/spare_ribs = new()
-		spare_ribs.Insert(M)
-	..()
-
-/datum/reagent/medicine/soulus/on_mob_end_metabolize(mob/living/M)
-	SEND_SIGNAL(M, COMSIG_CLEAR_MOOD_EVENT, "legion")
-	..()
-
-/datum/reagent/medicine/soulus/pure
-	name = "Purified Soulus Dust"
-	description = "Ground legion cores."
-	reagent_state = SOLID
-	color = "#302f20"
-	metabolization_rate = REAGENTS_METABOLISM
-	overdose_threshold = 100
-	tox_dam = 0
-
-/datum/reagent/medicine/puce_essence		// P U C E
-	name = "Pucetylline Essence"
-	description = "Ground essence of puce crystals."
-	reagent_state = SOLID
-	color = "#CC8899"
-	metabolization_rate = 2.5 * REAGENTS_METABOLISM
-	overdose_threshold = 30
-
-/datum/reagent/medicine/puce_essence/on_mob_life(mob/living/carbon/M)
-	if(prob(80))
-		M.adjustToxLoss(-1*REM, 0)
-	else
-		M.adjustCloneLoss(-1*REM, 0)
-	for(var/datum/reagent/toxin/R in M.reagents.reagent_list)
-		M.reagents.remove_reagent(R.type, 0.25)
-	if(holder.has_reagent(/datum/reagent/medicine/soulus))				// No, you can't chemstack with soulus dust
-		holder.remove_reagent(/datum/reagent/medicine/soulus, 5)
-	M.add_atom_colour(color, TEMPORARY_COLOUR_PRIORITY)		// Changes color to puce
-	..()
-
-/datum/reagent/medicine/puce_essence/expose_atom(atom/A, volume)
-	if(!iscarbon(A))
-		A.add_atom_colour(color, WASHABLE_COLOUR_PRIORITY)
-	..()
-
-/datum/reagent/medicine/puce_essence/on_mob_end_metabolize(mob/living/M)
-	M.remove_atom_colour(TEMPORARY_COLOUR_PRIORITY, color)		// Removes temporary (not permanent) puce
-
-/datum/reagent/medicine/puce_essence/overdose_process(mob/living/M)
-	M.add_atom_colour(color, FIXED_COLOUR_PRIORITY)		// Eternal puce
-
-/datum/reagent/medicine/chartreuse		// C H A R T R E U S E
-	name = "Chartreuse Solution"
-	description = "Refined essence of puce crystals."
-	reagent_state = SOLID
-	color = "#DFFF00"
-	metabolization_rate = 2.5 * REAGENTS_METABOLISM
-	overdose_threshold = 30
-
-/datum/reagent/medicine/chartreuse/on_mob_life(mob/living/carbon/M)		// Yes, you can chemstack with soulus dust
-	if(prob(80))
-		M.adjustToxLoss(-2*REM, 0)
-		M.adjustCloneLoss(-1*REM, 0)
-	for(var/datum/reagent/toxin/R in M.reagents.reagent_list)
-		M.reagents.remove_reagent(R.type, 1)
-	M.add_atom_colour(color, TEMPORARY_COLOUR_PRIORITY)		// Changes color to chartreuse
-	..()
-
-/datum/reagent/medicine/chartreuse/expose_atom(atom/A, volume)
-	if(!iscarbon(A))
-		A.add_atom_colour(color, WASHABLE_COLOUR_PRIORITY)
-	..()
-
-/datum/reagent/medicine/chartreuse/on_mob_end_metabolize(mob/living/M)
-	M.remove_atom_colour(TEMPORARY_COLOUR_PRIORITY, color)		// Removes temporary (not permanent) chartreuse
-
-/datum/reagent/medicine/chartreuse/overdose_process(mob/living/M)
-	M.add_atom_colour(color, FIXED_COLOUR_PRIORITY)		// Eternal chartreuse
-	M.set_drugginess(15)		// Also druggy
-	..()
-
-/datum/reagent/medicine/lavaland_extract
-	name = "Lavaland Extract"
-	description = "An extract of lavaland atmospheric and mineral elements. Heals the user in small doses, but is extremely toxic otherwise."
-	color = "#6B372E" //dark and red like lavaland
-	metabolization_rate = REAGENTS_METABOLISM * 0.5
-	overdose_threshold = 10
-
-/datum/reagent/medicine/lavaland_extract/expose_mob(mob/living/M, method=TOUCH, reac_volume, show_message = 1)
-	ADD_TRAIT(M, TRAIT_NOLIMBDISABLE, TRAIT_GENERIC)
-	..()
-
-/datum/reagent/medicine/lavaland_extract/on_mob_end_metabolize(mob/living/M)
-	REMOVE_TRAIT(M, TRAIT_NOLIMBDISABLE, TRAIT_GENERIC)
-	..()
-
-/datum/reagent/medicine/lavaland_extract/on_mob_life(mob/living/carbon/M)
-	M.adjustFireLoss(-1*REM, 0)
-	M.adjustBruteLoss(-1*REM, 0)
-	M.adjustToxLoss(-1*REM, 0)
-	if(M.health <= M.crit_threshold)
-		M.adjustOxyLoss(-1*REM, 0)
-	..()
-	return TRUE
-
-/datum/reagent/medicine/lavaland_extract/overdose_process(mob/living/M)		// Thanks to actioninja
-	if(prob(2) && iscarbon(M))
-		var/selected_part = pick(BODY_ZONE_L_ARM, BODY_ZONE_R_ARM, BODY_ZONE_L_LEG, BODY_ZONE_R_LEG)
-		var/obj/item/bodypart/bp = M.get_bodypart(selected_part)
-		if(bp)
-			M.visible_message(span_warning("[M] feels a spike of pain!!"), span_danger("You feel a spike of pain!!"))
-			bp.receive_damage(0, 0, 200)
-		else	//SUCH A LUST FOR REVENGE!!!
-			to_chat(M, span_warning("A phantom limb hurts!"))
-	return ..()
-
-/datum/reagent/medicine/skeletons_boon
-	name = "Skeleton’s Boon"
-	description = "A robust solution of minerals that greatly strengthens the bones."
-	color = "#dbdfa2"
-	metabolization_rate = REAGENTS_METABOLISM * 0.125
-	overdose_threshold = 50
-	var/plasma_armor = 33
-	var/skele_armor = 20
-	var/added_armor = 0
-
-/datum/reagent/medicine/skeletons_boon/expose_mob(mob/living/M, method=TOUCH, reac_volume, show_message = 1)
-	ADD_TRAIT(M, TRAIT_NOBREAK, TRAIT_GENERIC)
-	if(isplasmaman(M))
-		var/mob/living/carbon/human/H = M
-		H.physiology.armor.melee += plasma_armor
-		H.physiology.armor.bullet += plasma_armor
-		added_armor = plasma_armor
-	if(isskeleton(M))
-		var/mob/living/carbon/human/H = M
-		H.physiology.armor.melee += skele_armor
-		H.physiology.armor.bullet += skele_armor
-		added_armor = skele_armor
-	..()
-
-/datum/reagent/medicine/skeletons_boon/on_mob_end_metabolize(mob/living/M)
-	REMOVE_TRAIT(M, TRAIT_NOBREAK, TRAIT_GENERIC)
-	REMOVE_TRAIT(M, TRAIT_ALLBREAK, TRAIT_GENERIC)
-	if(ishuman(M))
-		var/mob/living/carbon/human/H = M
-		H.physiology.armor.melee -= added_armor
-		H.physiology.armor.bullet -= added_armor		// No, you can't change species to get a permanant brute resist
-	..()
-
-/datum/reagent/medicine/skeletons_boon/overdose_process(mob/living/M)
-	ADD_TRAIT(M, TRAIT_ALLBREAK, TRAIT_GENERIC)
-	REMOVE_TRAIT(M, TRAIT_NOBREAK, TRAIT_GENERIC)
-	..()
-
-/datum/reagent/medicine/lithium_carbonate
-	name = "Lithium Carbonate"
-	description = "A mood stabilizer discovered by most spacefaring civilizations. Fairly widespread as a result."
-	color = "#b3acaa" //grey. boring.
-	reagent_state = SOLID
-	metabolization_rate = REAGENTS_METABOLISM * 0.5
-	overdose_threshold = 20
-
-/datum/reagent/medicine/lithium_carbonate/on_mob_life(mob/living/carbon/M)
-	var/datum/component/mood/mood = M.GetComponent(/datum/component/mood)
-	if(mood.sanity <= SANITY_GREAT)
-		mood.setSanity(min(mood.sanity+5, SANITY_GREAT))
-	..()
-	. = 1
-
-/datum/reagent/medicine/lithium_carbonate/overdose_process(mob/living/M)
-	if(prob(5))
-		M.set_timed_status_effect(10 SECONDS * REM, /datum/status_effect/jitter, only_if_higher = TRUE)
-		M.adjustOrganLoss(ORGAN_SLOT_BRAIN, 2*REM)
-	..()
-	. = 1
-
-/datum/reagent/medicine/melatonin
-	name = "Human Sleep Hormone"
-	description = "A compound typically found within Solarians. The exact effects vary on the species it is administered to."
-	color = "#e1b1e1" //very light pink ourple
-	overdose_threshold = 0
-	var/regenerating
-	var/rachnid_limb
-
-/datum/reagent/medicine/melatonin/on_mob_metabolize(mob/living/L)
-	. = ..()
-	if(iscarbon(L))
-		var/mob/living/carbon/imbiber = L
-		if(isspiderperson(imbiber))
-		//we check limbs, if one is missing, we break from the for loop after setting it to heal
-			for (var/limb in list(BODY_ZONE_L_ARM, BODY_ZONE_R_ARM, BODY_ZONE_L_LEG, BODY_ZONE_R_LEG))
-				if(!imbiber.get_bodypart(limb))
-					rachnid_limb = limb
-					break
-
-/datum/reagent/medicine/melatonin/on_mob_end_metabolize(mob/living/L)
-	. = ..()
-	if(isspiderperson(L) && regenerating)
-		var/mob/living/carbon/spider
-		spider.regenerate_limb(rachnid_limb, TRUE, FALSE)
-		return
-
-
-/datum/reagent/medicine/melatonin/on_mob_life(mob/living/carbon/M)
-	. = ..()
-	if(isvox(M))
-		M.adjustToxLoss(1)
-	if(islizard(M))
-		if(prob(10))
-			M.playsound_local(get_turf(M), 'sound/health/fastbeat2.ogg', 40,0, channel = CHANNEL_HEARTBEAT, use_reverb = FALSE)
-		M.adjustOrganLoss(ORGAN_SLOT_HEART, 0.5)
-	if(isspiderperson(M) && rachnid_limb)
-		if(prob(7))
-			to_chat(M, "Your body aches near [rachnid_limb]")
-		if(current_cycle > 20 && !regenerating)
-			regenerating = TRUE
-
-	else
-		if(M.IsSleeping())
-			if(M.getBruteLoss() && M.getFireLoss())
-				if(prob(50))
-					M.adjustBruteLoss(-0.5)
-				else
-					M.adjustFireLoss(-0.5)
-		else if(M.getBruteLoss())
-			M.adjustBruteLoss(-0.2)
-		else if(M.getFireLoss())
-			M.adjustFireLoss(-0.2)
-
-/datum/reagent/medicine/stasis
-	name = "Stasis"
-	description = "A liquid blue chemical that causes the body to enter a chemically induced stasis, irregardless of current state."
-	reagent_state = LIQUID
-	color = "#51b5cb" //a nice blue
-	overdose_threshold = 0
-
-/datum/reagent/medicine/stasis/expose_mob(mob/living/M, method=INJECT, reac_volume, show_message = 1)
-	if(method != INJECT)
-		return
-	if(iscarbon(M))
-		var/stasis_duration = min(20 SECONDS * reac_volume, 300 SECONDS)
-		to_chat(M, span_warning("Your body starts to slow down, sensation retreating from your limbs!"))
-		M.apply_status_effect(STATUS_EFFECT_STASIS, STASIS_DRUG_EFFECT)
-		addtimer(CALLBACK(M, TYPE_PROC_REF(/mob/living, remove_status_effect), STATUS_EFFECT_STASIS, STASIS_DRUG_EFFECT), stasis_duration, TIMER_UNIQUE)
-
-/datum/reagent/medicine/stasis/on_mob_life(mob/living/carbon/M)
-	M.adjustToxLoss(1)
-	..()
-	. = 1
-
-/datum/reagent/medicine/carfencadrizine
-	name = "Carfencadrizine"
-	description = "A highly potent synthetic painkiller held in a suspension of stimulating agents. Allows people to keep moving long beyond when they should stop."
-	color = "#859480"
-	overdose_threshold = 8
-	addiction_threshold = 7
-	metabolization_rate = 0.1
-
-/datum/reagent/medicine/carfencadrizine/on_mob_metabolize(mob/living/L)
-	. = ..()
-	ADD_TRAIT(L, TRAIT_HARDLY_WOUNDED, /datum/reagent/medicine/carfencadrizine)
-	ADD_TRAIT(L, TRAIT_PINPOINT_EYES, type)
-	ADD_TRAIT(L, TRAIT_NOSOFTCRIT, type)
-	ADD_TRAIT(L, TRAIT_NOHARDCRIT, type)
-
-/datum/reagent/medicine/carfencadrizine/on_mob_end_metabolize(mob/living/L)
-	. = ..()
-	REMOVE_TRAIT(L, TRAIT_HARDLY_WOUNDED, /datum/reagent/medicine/carfencadrizine)
-	REMOVE_TRAIT(L, TRAIT_PINPOINT_EYES, type)
-	REMOVE_TRAIT(L, TRAIT_NOSOFTCRIT, type)
-	REMOVE_TRAIT(L, TRAIT_NOHARDCRIT, type)
-
-/datum/reagent/medicine/carfencadrizine/on_mob_life(mob/living/carbon/M)
-	if(current_cycle >= 3)
-		SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "numb", /datum/mood_event/narcotic_heavy, name)
-
-	if(M.health <= M.crit_threshold)
-		if(prob(20))
-			M.adjustOrganLoss(ORGAN_SLOT_HEART, 4)
-		if(prob(40))
-			M.playsound_local(get_turf(M), 'sound/health/slowbeat2.ogg', 40,0, channel = CHANNEL_HEARTBEAT, use_reverb = FALSE)
-	..()
-
-/datum/reagent/medicine/carfencadrizine/overdose_process(mob/living/M)
-	if(prob(66))
-		M.losebreath++
-		M.adjustOxyLoss(4, 0)
-	if(prob(40))
-		M.AdjustUnconscious(20)
-	if(prob(10))
-		M.adjustOrganLoss(ORGAN_SLOT_EYES, 3)
-		M.adjustOrganLoss(ORGAN_SLOT_LUNGS, 7)
-	..()
-
-/datum/reagent/medicine/carfencadrizine/addiction_act_stage1(mob/living/M)
-	if(prob(33))
-		M.drop_all_held_items()
-		M.set_timed_status_effect(8 SECONDS * REM, /datum/status_effect/jitter, only_if_higher = TRUE)
-		M.adjustOrganLoss(ORGAN_SLOT_LUNGS, 1)
-	..()
-
-/datum/reagent/medicine/carfencadrizine/addiction_act_stage2(mob/living/M)
-	if(prob(33))
-		M.drop_all_held_items()
-		M.adjustToxLoss(1*REM, 0)
-		. = 1
-		M.set_timed_status_effect(6 SECONDS * REM, /datum/status_effect/dizziness, only_if_higher = TRUE)
-		M.set_timed_status_effect(6 SECONDS * REM, /datum/status_effect/jitter, only_if_higher = TRUE)
-	if(prob(15))
-		M.adjustOrganLoss(ORGAN_SLOT_LUNGS, 1)
-		M.adjustOrganLoss(ORGAN_SLOT_HEART, 1)
-	..()
-
-/datum/reagent/medicine/carfencadrizine/addiction_act_stage3(mob/living/M)
-	if(prob(50))
-		M.drop_all_held_items()
-		M.adjustToxLoss(1*REM, 0)
-		. = 1
-		M.set_timed_status_effect(8 SECONDS * REM, /datum/status_effect/dizziness, only_if_higher = TRUE)
-		M.set_timed_status_effect(8 SECONDS * REM, /datum/status_effect/jitter, only_if_higher = TRUE)
-	if(prob(30))
-		M.adjustOrganLoss(ORGAN_SLOT_LUNGS, 1)
-		M.adjustOrganLoss(ORGAN_SLOT_HEART, 2)
-	..()
-
-/datum/reagent/medicine/carfencadrizine/addiction_act_stage4(mob/living/M)
-	if(prob(60))
-		M.drop_all_held_items()
-		M.adjustToxLoss(1*REM, 0)
-		. = 1
-		M.set_timed_status_effect(8 SECONDS * REM, /datum/status_effect/dizziness, only_if_higher = TRUE)
-		M.set_timed_status_effect(8 SECONDS * REM, /datum/status_effect/jitter, only_if_higher = TRUE)
-	if(prob(40))
-		M.adjustOrganLoss(ORGAN_SLOT_LUNGS, 2)
-		M.adjustOrganLoss(ORGAN_SLOT_HEART, 2)
-	..()
-
-// helps bleeding wounds clot faster
-/datum/reagent/medicine/chitosan
-	name = "chitosan"
-	description = "Vastly improves the blood's natural ability to coagulate and stop bleeding by hightening platelet production and effectiveness. Overdosing will cause extreme blood clotting, resulting in potential brain damage."
-	reagent_state = LIQUID
-	color = "#bb2424"
-	metabolization_rate = 0.25 * REAGENTS_METABOLISM
-	overdose_threshold = 20
-	/// The bloodiest wound that the patient has will have its blood_flow reduced by this much each tick
-	var/clot_rate = 0.3
-	/// While this reagent is in our bloodstream, we reduce all bleeding by this factor
-	var/passive_bleed_modifier = 0.7
-	/// For tracking when we tell the person we're no longer bleeding
-	var/was_working
-
-/datum/reagent/medicine/chitosan/on_mob_metabolize(mob/living/M)
-	ADD_TRAIT(M, TRAIT_COAGULATING, /datum/reagent/medicine/chitosan)
-
-	if(!ishuman(M))
-		return
-
-	var/mob/living/carbon/human/blood_boy = M
-	blood_boy.physiology?.bleed_mod *= passive_bleed_modifier
-	return ..()
-
-/datum/reagent/medicine/chitosan/on_mob_end_metabolize(mob/living/M)
-	REMOVE_TRAIT(M, TRAIT_COAGULATING, /datum/reagent/medicine/chitosan)
-
-	if(was_working)
-		to_chat(M, span_warning("The medicine thickening your blood loses its effect!"))
-	if(!ishuman(M))
-		return
-
-	var/mob/living/carbon/human/blood_boy = M
-	blood_boy.physiology?.bleed_mod /= passive_bleed_modifier
-
-	return ..()
-
-/datum/reagent/medicine/chitosan/on_mob_life(mob/living/carbon/M)
-	. = ..()
-	if(!M.blood_volume || !M.all_wounds)
-		return
-
-	var/datum/wound/bloodiest_wound
-
-	for(var/i in M.all_wounds)
-		var/datum/wound/iter_wound = i
-		if(iter_wound.blood_flow)
-			if(iter_wound.blood_flow > bloodiest_wound?.blood_flow)
-				bloodiest_wound = iter_wound
-
-	if(bloodiest_wound)
-		if(!was_working)
-			to_chat(M, span_green("You can feel your flowing blood start thickening!"))
-			was_working = TRUE
-		bloodiest_wound.blood_flow = max(0, bloodiest_wound.blood_flow - clot_rate)
-	else if(was_working)
-		was_working = FALSE
-
-/datum/reagent/medicine/chitosan/overdose_process(mob/living/carbon/M)
-	. = ..()
-	if(!M.blood_volume)
-		return
-
-	if(prob(15))
-		M.losebreath += rand(2,4)
-		M.adjustOxyLoss(rand(1,3))
-		if(prob(30))
-			to_chat(M, span_danger("You can feel your blood clotting up in your veins!"))
-		else if(prob(10))
-			to_chat(M, span_userdanger("You feel like your blood has stopped moving!"))
-			M.adjustOxyLoss(rand(3,4))
-
-		if(prob(50))
-			var/obj/item/organ/lungs/our_lungs = M.getorganslot(ORGAN_SLOT_LUNGS)
-			our_lungs.applyOrganDamage(1)
-		else if(prob(25))
-			var/obj/item/organ/lungs/our_brain = M.getorganslot(ORGAN_SLOT_BRAIN)
-			our_brain.applyOrganDamage(1)
-		else
-			var/obj/item/organ/heart/our_heart = M.getorganslot(ORGAN_SLOT_HEART)
-			our_heart.applyOrganDamage(1)
diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm
index 722e37194f..13990f8167 100644
--- a/code/modules/reagents/chemistry/reagents/other_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm
@@ -292,51 +292,9 @@
 		M.adjustFireLoss(2, 0) // burns
 	..()
 
-/datum/reagent/fuel/unholywater		//if you somehow managed to extract this from someone, dont splash it on yourself and have a smoke
-	name = "Unholy Water"
-	description = "Something that shouldn't exist on this plane of existence."
-	taste_description = "suffering"
-
-/datum/reagent/fuel/unholywater/expose_mob(mob/living/M, method=TOUCH, reac_volume)
-	if((method == TOUCH || method == SMOKE) || method == VAPOR)
-		M.reagents.add_reagent(type,reac_volume/4)
-		return
-	return ..()
-
-/datum/reagent/fuel/unholywater/on_mob_life(mob/living/carbon/M)
-	// Will deal about 90 damage when 50 units are thrown
-	M.adjustOrganLoss(ORGAN_SLOT_BRAIN, 3, 150)
-	M.adjustToxLoss(2, 0)
-	M.adjustFireLoss(2, 0)
-	M.adjustOxyLoss(2, 0)
-	M.adjustBruteLoss(2, 0)
-	holder.remove_reagent(type, 1)
-	return TRUE
-
-/datum/reagent/hellwater			//if someone has this in their system they've really pissed off an eldrich god
-	name = "Hell Water"
-	description = "YOUR FLESH! IT BURNS!"
-	taste_description = "burning"
-	accelerant_quality = 20
-	process_flags = ORGANIC | SYNTHETIC
-
-/datum/reagent/hellwater/on_mob_life(mob/living/carbon/M)
-	M.fire_stacks = min(5,M.fire_stacks + 3)
-	M.IgniteMob()			//Only problem with igniting people is currently the commonly availible fire suits make you immune to being on fire
-	M.adjustToxLoss(1, 0)
-	M.adjustFireLoss(1, 0)		//Hence the other damages... ain't I a bastard?
-	M.adjustOrganLoss(ORGAN_SLOT_BRAIN, 5, 150)
-	holder.remove_reagent(type, 1)
-
-/datum/reagent/medicine/omnizine/godblood
-	name = "Godblood"
-	description = "Slowly heals all damage types. Has a rather high overdose threshold. Glows with mysterious power."
-	overdose_threshold = 150
-
-///Used for clownery
 /datum/reagent/lube
-	name = "Space Lube"
-	description = "Lubricant is a substance introduced between two moving surfaces to reduce the friction and wear between them. giggity."
+	name = "Industrial Lubricant"
+	description = "Lubricant is a substance introduced between two moving surfaces to reduce the friction and wear between them."
 	color = "#009CA8" // rgb: 0, 156, 168
 	taste_description = "cherry" // by popular demand
 	var/lube_kind = TURF_WET_LUBE ///What kind of slipperiness gets added to turfs.
@@ -347,12 +305,6 @@
 	if(reac_volume >= 1)
 		T.MakeSlippery(lube_kind, 15 SECONDS, min(reac_volume * 2 SECONDS, 120))
 
-///Stronger kind of lube. Applies TURF_WET_SUPERLUBE.
-/datum/reagent/lube/superlube
-	name = "Super Duper Lube"
-	description = "This \[REDACTED\] has been outlawed after the incident on \[DATA EXPUNGED\]."
-	lube_kind = TURF_WET_SUPERLUBE
-
 /datum/reagent/spraytan
 	name = "Spray Tan"
 	description = "A substance applied to the skin to darken the skin."
@@ -437,33 +389,6 @@
 	H.visible_message("<b>[H]</b> suddenly transforms!")
 	randomize_human(H)
 
-/datum/reagent/aslimetoxin
-	name = "Advanced Mutation Toxin"
-	description = "An advanced corruptive toxin produced by slimes."
-	color = "#13BC5E" // rgb: 19, 188, 94
-	taste_description = "slime"
-
-/datum/reagent/aslimetoxin/expose_mob(mob/living/L, method=TOUCH, reac_volume)
-	if(method != TOUCH && method != SMOKE)
-		L.ForceContractDisease(new /datum/disease/transformation/slime(), FALSE, TRUE)
-
-/datum/reagent/gluttonytoxin
-	name = "Gluttony's Blessing"
-	description = "An advanced corruptive toxin produced by something terrible."
-	color = "#5EFF3B" //RGB: 94, 255, 59
-	can_synth = FALSE
-	taste_description = "decay"
-
-/datum/reagent/gluttonytoxin/expose_mob(mob/living/L, method=TOUCH, reac_volume)
-	L.ForceContractDisease(new /datum/disease/transformation/morph(), FALSE, TRUE)
-
-/datum/reagent/serotrotium
-	name = "Serotrotium"
-	description = "A chemical compound that promotes concentrated production of the serotonin neurotransmitter in humans."
-	color = "#202040" // rgb: 20, 20, 40
-	metabolization_rate = 0.25 * REAGENTS_METABOLISM
-	taste_description = "bitterness"
-
 /datum/reagent/oxygen
 	name = "Oxygen"
 	description = "A colorless, odorless gas. Grows on trees but is still pretty valuable."
@@ -1491,13 +1416,8 @@
 		myseed.adjust_weed_chance(round(chems.get_reagent_amount(type) * 0.3))
 		myseed.adjust_production(-round(chems.get_reagent_amount(type) * 0.075))
 
-
-
-
 // GOON OTHERS
 
-
-
 /datum/reagent/fuel/oil
 	name = "Oil"
 	description = "Burns in a small smoky fire, can be used to get Ash."
@@ -2319,13 +2239,13 @@
 
 /datum/reagent/crystal_reagent
 	name = "Crystal Reagent"
-	description = "A strange crystal substance. Heals faster than omnizine."
+	description = "A strange crystalline substance with an impressive healing factor."
 	reagent_state = LIQUID
 	color = "#1B9681"
 	metabolization_rate = 0.5 * REAGENTS_METABOLISM
 	overdose_threshold = 20
-	taste_description = "rocks"
-	var/healing = 0.8
+	taste_description = "sharp rocks"
+	var/healing = 2
 
 /datum/reagent/crystal_reagent/on_mob_life(mob/living/carbon/M)
 	M.adjustToxLoss(-healing*REM, 0)
@@ -2395,12 +2315,11 @@
 	)
 /datum/reagent/three_eye/on_mob_metabolize(mob/living/L)
 	. = ..()
-	//addtimer(CALLBACK(L, TYPE_PROC_REF(/mob, add_client_colour), /datum/client_colour/thirdeye), 1.5 SECONDS)
 	L.add_client_colour(/datum/client_colour/thirdeye)
 	if(L.client?.holder) //You are worthy.
 		worthy = TRUE
-		L.visible_message(span_danger("<font size = 6>Grips their head and dances around, collapsing to the floor!</font>"), \
-		span_danger("<font size = 6>Visions of a realm BYOND your own flash across your eyes, before it all goes black...</font>"))
+		L.visible_message(span_danger("[L] grips their head and dances around, collapsing to the floor!"), \
+		span_danger("Visions of a realm BYOND your own flash across your eyes, before it all goes black..."))
 		addtimer(CALLBACK(L, TYPE_PROC_REF(/mob/living, set_sleeping), 40 SECONDS), 10 SECONDS)
 		addtimer(CALLBACK(L.reagents, TYPE_PROC_REF(/datum/reagents, remove_reagent), src.type, src.volume,), 10 SECONDS)
 		return
@@ -2420,7 +2339,7 @@
 		H.seizure()
 		H.adjustOrganLoss(ORGAN_SLOT_BRAIN, rand(2, 4))
 	if(prob(7))
-		to_chat(M, span_warning("<font size = [rand(1,3)]>[pick(dose_messages)]</font>"))
+		to_chat(M, span_warning("[pick(dose_messages)]"))
 
 /datum/reagent/three_eye/overdose_start(mob/living/M)
 	on_mob_metabolize(M) //set worthy
diff --git a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm
index bf425d2353..c4d68f26a3 100644
--- a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm
@@ -512,25 +512,6 @@
 	else
 		..()
 
-/datum/reagent/toxin/fentanyl
-	name = "Fentanyl"
-	description = "Fentanyl will inhibit brain function and cause toxin damage before eventually knocking out its victim."
-	reagent_state = LIQUID
-	color = "#64916E"
-	metabolization_rate = 0.5 * REAGENTS_METABOLISM
-	toxpwr = 0
-
-/datum/reagent/toxin/fentanyl/on_mob_life(mob/living/carbon/M)
-	M.adjustOrganLoss(ORGAN_SLOT_BRAIN, 3*REM, 150)
-	if(M.toxloss <= 60)
-		M.adjustToxLoss(1*REM, 0)
-	if(current_cycle >= 4)
-		SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "smacked out", /datum/mood_event/narcotic_heavy, name)
-	if(current_cycle >= 18)
-		M.Sleeping(40)
-	..()
-	return TRUE
-
 /datum/reagent/toxin/cyanide
 	name = "Cyanide"
 	description = "An infamous poison known for its use in assassination. Causes small amounts of toxin damage with a small chance of oxygen damage or a stun."
diff --git a/code/modules/reagents/chemistry/recipes/cat2_medicines.dm b/code/modules/reagents/chemistry/recipes/cat2_medicines.dm
deleted file mode 100644
index c68438fa73..0000000000
--- a/code/modules/reagents/chemistry/recipes/cat2_medicines.dm
+++ /dev/null
@@ -1,86 +0,0 @@
-
-
-/*****BRUTE*****/
-
-/datum/chemical_reaction/helbital
-	results = list(/datum/reagent/medicine/c2/helbital = 3)
-	required_reagents = list(/datum/reagent/consumable/sugar = 1, /datum/reagent/fluorine = 1, /datum/reagent/carbon = 1)
-	mix_message = "The mixture turns into a thick, yellow powder."
-
-/datum/chemical_reaction/libital
-	results = list(/datum/reagent/medicine/c2/libital = 3)
-	required_reagents = list(/datum/reagent/phenol = 1, /datum/reagent/oxygen = 1, /datum/reagent/nitrogen = 1)
-
-
-/*WS Begin - Fixes medicines
-
-/datum/chemical_reaction/probital
-	results = list(/datum/reagent/medicine/c2/probital = 4)
-	required_reagents = list(/datum/reagent/copper = 1, /datum/reagent/acetone = 2,  /datum/reagent/phosphorus = 1)
-
-WS End */
-
-/*****BURN*****/
-
-/*WS Begin - No CobbyChems
-
-/datum/chemical_reaction/lenturi
-	results = list(/datum/reagent/medicine/c2/lenturi = 5)
-	required_reagents = list(/datum/reagent/ammonia = 1, /datum/reagent/silver = 1, /datum/reagent/sulfur = 1, /datum/reagent/oxygen = 1, /datum/reagent/chlorine = 1)
-
-*/
-
-/datum/chemical_reaction/aiuri
-	results = list(/datum/reagent/medicine/c2/aiuri = 4)
-	required_reagents = list(/datum/reagent/ammonia = 1, /datum/reagent/toxin/acid = 1, /datum/reagent/hydrogen = 2)
-
-/*WS Begin - Fixes medicines
-
-/datum/chemical_reaction/hercuri
-	results = list(/datum/reagent/medicine/c2/hercuri = 5)
-	required_reagents = list(/datum/reagent/cryostylane = 3, /datum/reagent/bromine = 1, /datum/reagent/lye = 1)
-	required_temp = 47
-	is_cold_recipe = TRUE
-
-WS End */
-
-/*****OXY*****/
-
-/*WS Begin - No CobbyChems
-
-/datum/chemical_reaction/convermol
-	results = list(/datum/reagent/medicine/c2/convermol = 3)
-	required_reagents = list(/datum/reagent/hydrogen = 1, /datum/reagent/fluorine = 1, /datum/reagent/fuel/oil = 1)
-	required_temp = 370
-	mix_message = "The mixture rapidly turns into a dense pink liquid."
-
-*/
-
-/datum/chemical_reaction/tirimol
-	results = list(/datum/reagent/medicine/c2/tirimol = 5)
-	required_reagents = list(/datum/reagent/nitrogen = 3, /datum/reagent/acetone = 2)
-	required_catalysts = list(/datum/reagent/toxin/acid = 1)
-
-/*****TOX*****/
-
-/datum/chemical_reaction/seiver
-	results = list(/datum/reagent/medicine/c2/seiver = 3)
-	required_reagents = list(/datum/reagent/nitrogen = 1, /datum/reagent/potassium = 1, /datum/reagent/aluminium = 1)
-
-/*WS Begin - No CobbyChems
-
-/datum/chemical_reaction/multiver
-	results = list(/datum/reagent/medicine/c2/multiver = 2)
-	required_reagents = list(/datum/reagent/ash = 1, /datum/reagent/consumable/sodiumchloride = 1)
-	mix_message = "The mixture yields a fine black powder."
-	required_temp = 380
-
-/datum/chemical_reaction/syriniver
-	results = list(/datum/reagent/medicine/c2/syriniver = 5)
-	required_reagents = list(/datum/reagent/sulfur = 1, /datum/reagent/fluorine = 1, /datum/reagent/toxin = 1, /datum/reagent/nitrous_oxide = 2)
-
-*/
-
-/datum/chemical_reaction/penthrite
-	results = list(/datum/reagent/medicine/c2/penthrite = 3)
-	required_reagents = list(/datum/reagent/pentaerythritol = 1, /datum/reagent/acetone = 1,  /datum/reagent/toxin/acid/nitracid = 1 , /datum/reagent/wittel = 1)
diff --git a/code/modules/reagents/chemistry/recipes/drugs.dm b/code/modules/reagents/chemistry/recipes/drugs.dm
index ecfc31e5e7..36aa9d7347 100644
--- a/code/modules/reagents/chemistry/recipes/drugs.dm
+++ b/code/modules/reagents/chemistry/recipes/drugs.dm
@@ -59,3 +59,4 @@
 	required_catalysts = list(/datum/reagent/toxin/plasma = 5)
 	mix_message = "The mixture concentrates into itself, taking on a deep coloration!"
 	required_temp = 150
+	is_cold_recipe = TRUE
diff --git a/code/modules/reagents/chemistry/recipes/medical_consumables.dm b/code/modules/reagents/chemistry/recipes/medical_consumables.dm
new file mode 100644
index 0000000000..259a5efe40
--- /dev/null
+++ b/code/modules/reagents/chemistry/recipes/medical_consumables.dm
@@ -0,0 +1,11 @@
+/datum/chemical_reaction/medmesh
+	required_reagents = list(/datum/reagent/cellulose = 20, /datum/reagent/consumable/aloejuice = 20, /datum/reagent/space_cleaner/sterilizine = 10)
+	mob_react = FALSE
+
+/datum/chemical_reaction/medmesh/on_reaction(datum/reagents/holder, created_volume)
+	var/location = get_turf(holder.my_atom)
+	for(var/i in 1 to created_volume)
+		new /obj/item/stack/medical/mesh/advanced(location)
+
+/datum/chemical_reaction/medmesh/ash
+	required_reagents = list(/datum/reagent/ash_fibers = 20, /datum/reagent/consumable/aloejuice = 20, /datum/reagent/space_cleaner/sterilizine = 10)
diff --git a/code/modules/reagents/chemistry/recipes/medicine.dm b/code/modules/reagents/chemistry/recipes/medicine.dm
index d973ec4527..221c20ee2d 100644
--- a/code/modules/reagents/chemistry/recipes/medicine.dm
+++ b/code/modules/reagents/chemistry/recipes/medicine.dm
@@ -1,105 +1,58 @@
+// brute chems
 
-/datum/chemical_reaction/bicaridine
-	results = list(/datum/reagent/medicine/bicaridine = 3)
-	required_reagents = list(/datum/reagent/carbon = 1, /datum/reagent/oxygen = 1, /datum/reagent/consumable/sugar = 1)
-
-/datum/chemical_reaction/bicaridinep
-	results = list(/datum/reagent/medicine/bicaridinep = 3)
-	required_reagents = list(/datum/reagent/medicine/bicaridine = 1, /datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/sodiumchloride = 1)
-
-/datum/chemical_reaction/kelotane
-	results = list(/datum/reagent/medicine/kelotane = 2)
-	required_reagents = list(/datum/reagent/carbon = 1, /datum/reagent/silicon = 1)
-
-/datum/chemical_reaction/dermaline
-	results = list(/datum/reagent/medicine/dermaline = 3)
-	required_reagents = list(/datum/reagent/medicine/kelotane = 1, /datum/reagent/acetone = 1, /datum/reagent/phosphorus = 1)
-
-/datum/chemical_reaction/antitoxin
-	results = list(/datum/reagent/medicine/antitoxin = 3)
-	required_reagents = list(/datum/reagent/nitrogen = 1, /datum/reagent/silicon = 1, /datum/reagent/potassium = 1)
-
-/datum/chemical_reaction/dexalin
-	results = list(/datum/reagent/medicine/dexalin = 5)
-	required_reagents = list(/datum/reagent/oxygen = 5)
-	required_catalysts = list(/datum/reagent/toxin/plasma = 1)
-
-/datum/chemical_reaction/dexalinp
-	results = list(/datum/reagent/medicine/dexalinp = 3)
-	required_reagents = list(/datum/reagent/medicine/dexalin = 1, /datum/reagent/carbon = 1, /datum/reagent/iron = 1)
-
-/datum/chemical_reaction/tricordrazine
-	results = list(/datum/reagent/medicine/tricordrazine = 3)
-	required_reagents = list(/datum/reagent/medicine/bicaridine = 1, /datum/reagent/medicine/kelotane = 1, /datum/reagent/medicine/antitoxin = 1)
-
-/datum/chemical_reaction/tetracordrazine
-	results = list(/datum/reagent/medicine/tetracordrazine = 4)
-	required_reagents = list(/datum/reagent/medicine/tricordrazine = 3, /datum/reagent/medicine/dexalin = 1)
-/datum/chemical_reaction/synthflesh
-	results = list(/datum/reagent/medicine/synthflesh = 3)
-	required_reagents = list(/datum/reagent/blood = 1, /datum/reagent/carbon = 1, /datum/reagent/medicine/styptic_powder = 1)
+/datum/chemical_reaction/indomide
+	results = list(/datum/reagent/medicine/indomide = 4)
+	required_reagents = list(/datum/reagent/copper = 1, /datum/reagent/acetone = 2,  /datum/reagent/phosphorus = 1)
 
-/datum/chemical_reaction/styptic_powder
-	results = list(/datum/reagent/medicine/styptic_powder = 4)
-	required_reagents = list(/datum/reagent/aluminium = 1, /datum/reagent/hydrogen = 1, /datum/reagent/oxygen = 1, /datum/reagent/toxin/acid = 1)
+/datum/chemical_reaction/hadrakine
+	results = list(/datum/reagent/medicine/hadrakine = 4)
+	required_reagents = list(/datum/reagent/aluminium = 3, /datum/reagent/hydrogen = 1, /datum/reagent/oxygen = 1, /datum/reagent/toxin/acid = 1)
 	mix_message = "The solution yields an astringent powder."
 
-/datum/chemical_reaction/corazone
-	results = list(/datum/reagent/medicine/corazone = 3)
-	required_reagents = list(/datum/reagent/phenol = 2, /datum/reagent/lithium = 1)
-
-/datum/chemical_reaction/carthatoline
-	results = list(/datum/reagent/medicine/carthatoline = 3)
-	required_reagents = list(/datum/reagent/medicine/antitoxin = 1, /datum/reagent/carbon = 2)
-	required_catalysts = list(/datum/reagent/toxin/plasma = 1)
-
-/*/datum/chemical_reaction/hepanephrodaxon //WS edit: temporary removal of an overloaded chem
-	results = list(/datum/reagent/medicine/hepanephrodaxon = 5)
-	required_reagents = list(/datum/reagent/medicine/carthatoline = 2, /datum/reagent/carbon = 2, /datum/reagent/lithium = 1)
-	required_catalysts = list(/datum/reagent/toxin/plasma = 5)*/
-
-/datum/chemical_reaction/system_cleaner
-	results = list(/datum/reagent/medicine/system_cleaner = 4)
-	required_reagents = list(/datum/reagent/consumable/ethanol = 1, /datum/reagent/chlorine = 1, /datum/reagent/phenol = 2, /datum/reagent/potassium = 1)
-
-/datum/chemical_reaction/liquid_solder
-	results = list(/datum/reagent/medicine/liquid_solder = 3)
-	required_reagents = list(/datum/reagent/consumable/ethanol = 1, /datum/reagent/copper = 1, /datum/reagent/silver = 1)
-	required_temp = 370
-	mix_message = "The mixture becomes a metallic slurry."
+/datum/chemical_reaction/silfrine
+	results = list(/datum/reagent/medicine/silfrine = 5)
+	required_reagents = list(/datum/reagent/silver = 3, /datum/reagent/phenol = 1, /datum/reagent/carbon = 1, /datum/reagent/toxin/acid = 1)
+	required_catalysts = list(/datum/reagent/toxin/plasma = 2)
+	required_temp = 450
+	mix_message = "The solution rapidly bubbles, before yielding a dark blue compound"
 
-/datum/chemical_reaction/perfluorodecalin
-	results = list(/datum/reagent/medicine/perfluorodecalin = 3)
-	required_reagents = list(/datum/reagent/hydrogen = 1, /datum/reagent/fluorine = 1, /datum/reagent/fuel/oil = 1)
-	required_temp = 370
-	mix_message = "The mixture rapidly turns into a dense pink liquid."
+// burn chems
 
 /datum/chemical_reaction/leporazine
 	results = list(/datum/reagent/medicine/leporazine = 2)
 	required_reagents = list(/datum/reagent/silicon = 1, /datum/reagent/copper = 1)
 	required_catalysts = list(/datum/reagent/toxin/plasma = 5)
 
-/datum/chemical_reaction/rezadone
-	results = list(/datum/reagent/medicine/rezadone = 3)
-	required_reagents = list(/datum/reagent/toxin/carpotoxin = 1, /datum/reagent/cryptobiolin = 1, /datum/reagent/copper = 1)
+/datum/chemical_reaction/alvitane
+	results = list(/datum/reagent/medicine/alvitane = 4)
+	required_reagents = list(/datum/reagent/carbon = 1, /datum/reagent/silicon = 1, /datum/reagent/silver = 2)
+	required_catalysts = list(/datum/reagent/cryptobiolin = 5)
+	required_temp = 220
+	is_cold_recipe = TRUE
+	mix_message = "The solution quietly incorporates as the temperatures drop."
 
-/datum/chemical_reaction/spaceacillin
-	results = list(/datum/reagent/medicine/spaceacillin = 2)
-	required_reagents = list(/datum/reagent/cryptobiolin = 1, /datum/reagent/medicine/epinephrine = 1)
+/datum/chemical_reaction/quardexane
+	results = list(/datum/reagent/medicine/quardexane = 5)
+	required_reagents = list(/datum/reagent/cryostylane = 3, /datum/reagent/bromine = 1, /datum/reagent/lye = 1)
 
-/datum/chemical_reaction/oculine
-	results = list(/datum/reagent/medicine/oculine = 3)
-	required_reagents = list(/datum/reagent/medicine/charcoal = 1, /datum/reagent/carbon = 1, /datum/reagent/hydrogen = 1)
-	mix_message = "The mixture bubbles noticeably and becomes a dark grey color!"
+/datum/chemical_reaction/ysiltane
+	results = list(/datum/reagent/medicine/ysiltane = 5)
+	required_reagents = list(/datum/reagent/ammonia = 1, /datum/reagent/silver = 1, /datum/reagent/sulfur = 1, /datum/reagent/hydrogen = 1, /datum/reagent/chlorine = 1)
+	required_catalysts = list(/datum/reagent/toxin/plasma = 10)
+	mix_message = "The solution quickly fizzes, a small cloud of smoke coming out!"
 
-/datum/chemical_reaction/inacusiate
-	results = list(/datum/reagent/medicine/inacusiate = 2)
-	required_reagents = list(/datum/reagent/water = 1, /datum/reagent/carbon = 1, /datum/reagent/medicine/charcoal = 1)
-	mix_message = "The mixture sputters loudly and becomes a light grey color!"
+/datum/chemical_reaction/ysiltane/on_reaction(datum/reagents/holder, created_volume)
+	var/datum/effect_system/smoke_spread/bad/smoke = new (get_turf(holder.my_atom))
+	smoke.set_up(1, src)
+	smoke.start()
+	qdel(smoke)
 
-/datum/chemical_reaction/synaptizine
-	results = list(/datum/reagent/medicine/synaptizine = 3)
-	required_reagents = list(/datum/reagent/consumable/sugar = 1, /datum/reagent/lithium = 1, /datum/reagent/water = 1)
+// toxin chems
+
+/datum/chemical_reaction/calomel
+	results = list(/datum/reagent/medicine/calomel = 2)
+	required_reagents = list(/datum/reagent/mercury = 1, /datum/reagent/chlorine = 1)
+	required_temp = 374
 
 /datum/chemical_reaction/charcoal
 	results = list(/datum/reagent/medicine/charcoal = 2)
@@ -107,34 +60,29 @@
 	mix_message = "The mixture yields a fine black powder."
 	required_temp = 380
 
-/datum/chemical_reaction/silver_sulfadiazine
-	results = list(/datum/reagent/medicine/silver_sulfadiazine = 5)
-	required_reagents = list(/datum/reagent/ammonia = 1, /datum/reagent/silver = 1, /datum/reagent/sulfur = 1, /datum/reagent/oxygen = 1, /datum/reagent/chlorine = 1)
-
-/datum/chemical_reaction/salglu_solution
-	results = list(/datum/reagent/medicine/salglu_solution = 3)
-	required_reagents = list(/datum/reagent/consumable/sodiumchloride = 1, /datum/reagent/water = 1, /datum/reagent/consumable/sugar = 1)
-
-/datum/chemical_reaction/mine_salve
-	results = list(/datum/reagent/medicine/mine_salve = 3)
-	required_reagents = list(/datum/reagent/fuel/oil = 1, /datum/reagent/water = 1, /datum/reagent/iron = 1)
+/datum/chemical_reaction/pancrazine
+	results = list(/datum/reagent/medicine/pancrazine = 3)
+	required_reagents = list(/datum/reagent/nitrogen = 1, /datum/reagent/silicon = 1, /datum/reagent/potassium = 1)
+	required_catalysts = list(/datum/reagent/ammonia = 5)
 
-/datum/chemical_reaction/mine_salve2
-	results = list(/datum/reagent/medicine/mine_salve = 15)
-	required_reagents = list(/datum/reagent/toxin/plasma = 5, /datum/reagent/iron = 5, /datum/reagent/consumable/sugar = 1) // A sheet of plasma, a twinkie and a sheet of metal makes four of these
+/datum/chemical_reaction/gjalrazine
+	results = list(/datum/reagent/medicine/gjalrazine = 10)
+	required_reagents = list(/datum/reagent/medicine/pancrazine = 3, /datum/reagent/carbon = 4, /datum/reagent/diethylamine = 3)
+	required_catalysts = list(/datum/reagent/toxin/plasma = 1)
 
-/*WS Begin - No Cobbychmes
+// oxygen chems
 
-/datum/chemical_reaction/instabitaluri
-	results = list(/datum/reagent/medicine/c2/instabitaluri = 3)
-	required_reagents = list(/datum/reagent/blood = 1, /datum/reagent/carbon = 1, /datum/reagent/medicine/c2/libital = 1)
+/datum/chemical_reaction/dexalin
+	results = list(/datum/reagent/medicine/dexalin = 5)
+	required_reagents = list(/datum/reagent/oxygen = 5)
+	required_catalysts = list(/datum/reagent/toxin/plasma = 1)
 
-WS End */
+/datum/chemical_reaction/salbutamol
+	results = list(/datum/reagent/medicine/salbutamol = 5)
+	required_reagents = list(/datum/reagent/lithium = 1, /datum/reagent/aluminium = 1, /datum/reagent/bromine = 1, /datum/reagent/ammonia = 1)
+	required_catalysts = list(/datum/reagent/toxin/acid)
 
-/datum/chemical_reaction/calomel
-	results = list(/datum/reagent/medicine/calomel = 2)
-	required_reagents = list(/datum/reagent/mercury = 1, /datum/reagent/chlorine = 1)
-	required_temp = 374
+///radiation chems
 
 /datum/chemical_reaction/potass_iodide
 	results = list(/datum/reagent/medicine/potass_iodide = 2)
@@ -144,48 +92,63 @@ WS End */
 	results = list(/datum/reagent/medicine/pen_acid = 6)
 	required_reagents = list(/datum/reagent/fuel = 1, /datum/reagent/chlorine = 1, /datum/reagent/ammonia = 1, /datum/reagent/toxin/formaldehyde = 1, /datum/reagent/sodium = 1, /datum/reagent/toxin/cyanide = 1)
 
-/datum/chemical_reaction/sal_acid
-	results = list(/datum/reagent/medicine/sal_acid = 5)
-	required_reagents = list(/datum/reagent/sodium = 1, /datum/reagent/phenol = 1, /datum/reagent/carbon = 1, /datum/reagent/oxygen = 1, /datum/reagent/toxin/acid = 1)
 
-/datum/chemical_reaction/oxandrolone
-	results = list(/datum/reagent/medicine/oxandrolone = 6)
-	required_reagents = list(/datum/reagent/carbon = 3, /datum/reagent/phenol = 1, /datum/reagent/hydrogen = 1, /datum/reagent/oxygen = 1)
+///Multi-damage chems
 
-/datum/chemical_reaction/salbutamol
-	results = list(/datum/reagent/medicine/salbutamol = 5)
-	required_reagents = list(/datum/reagent/medicine/sal_acid = 1, /datum/reagent/lithium = 1, /datum/reagent/aluminium = 1, /datum/reagent/bromine = 1, /datum/reagent/ammonia = 1)
+/datum/chemical_reaction/synthflesh
+	results = list(/datum/reagent/medicine/synthflesh = 3)
+	required_reagents = list(/datum/reagent/blood = 1, /datum/reagent/carbon = 1, /datum/reagent/medicine/hadrakine = 1)
 
-/datum/chemical_reaction/ephedrine
-	results = list(/datum/reagent/medicine/ephedrine = 4)
-	required_reagents = list(/datum/reagent/consumable/sugar = 1, /datum/reagent/fuel/oil = 1, /datum/reagent/hydrogen = 1, /datum/reagent/diethylamine = 1)
-	mix_message = "The solution fizzes and gives off toxic fumes."
+/datum/chemical_reaction/cryoxadone
+	results = list(/datum/reagent/medicine/cryoxadone = 3)
+	required_reagents = list(/datum/reagent/stable_plasma = 1, /datum/reagent/acetone = 1, /datum/reagent/toxin/mutagen = 1)
 
-/datum/chemical_reaction/diphenhydramine
-	results = list(/datum/reagent/medicine/diphenhydramine = 4)
-	required_reagents = list(/datum/reagent/fuel/oil = 1, /datum/reagent/carbon = 1, /datum/reagent/bromine = 1, /datum/reagent/diethylamine = 1, /datum/reagent/consumable/ethanol = 1)
-	mix_message = "The mixture dries into a pale blue powder."
+/datum/chemical_reaction/cureall
+	results = list(/datum/reagent/medicine/cureall = 3)
+	required_reagents = list(/datum/reagent/medicine/alvitane = 1, /datum/reagent/medicine/indomide = 1, /datum/reagent/medicine/charcoal = 1)
 
-/datum/chemical_reaction/oculine
-	results = list(/datum/reagent/medicine/oculine = 3)
-	required_reagents = list(/datum/reagent/medicine/charcoal = 1, /datum/reagent/carbon = 1, /datum/reagent/hydrogen = 1)
-	mix_message = "The mixture sputters loudly and becomes a pale pink color."
+/datum/chemical_reaction/cureall_alternative
+	results = list(/datum/reagent/medicine/cureall = 5)
+	required_reagents = list(/datum/reagent/medicine/panacea/effluvial = 5, /datum/reagent/toxin/plasma = 1)
+	mix_message = "The plasma begins tinting the compound as it incorporates into the mix"
 
-/datum/chemical_reaction/atropine
-	results = list(/datum/reagent/medicine/atropine = 5)
-	required_reagents = list(/datum/reagent/consumable/ethanol = 1, /datum/reagent/acetone = 1, /datum/reagent/diethylamine = 1, /datum/reagent/phenol = 1, /datum/reagent/toxin/acid = 1)
+/datum/chemical_reaction/panacea
+	results = list(/datum/reagent/medicine/panacea = 5)
+	required_reagents = list(/datum/reagent/medicine/panacea/effluvial = 3, /datum/reagent/stable_plasma = 1, /datum/reagent/medicine/cryoxadone = 1)
+	required_temp = 78
+	is_cold_recipe = TRUE
 
-/datum/chemical_reaction/epinephrine
-	results = list(/datum/reagent/medicine/epinephrine = 6)
-	required_reagents = list(/datum/reagent/phenol = 1, /datum/reagent/acetone = 1, /datum/reagent/diethylamine = 1, /datum/reagent/oxygen = 1, /datum/reagent/chlorine = 1, /datum/reagent/hydrogen = 1)
+/datum/chemical_reaction/hunter_extract
+	results = list(/datum/reagent/medicine/hunter_extract = 5)
+	required_reagents = list(/datum/reagent/consumable/vitfro = 1, /datum/reagent/medicine/puce_essence = 2,  /datum/reagent/toxin/plasma = 2)
+
+///Blood chems
+
+/datum/chemical_reaction/chitosan
+	results = list(/datum/reagent/medicine/chitosan = 10)
+	required_reagents = list(/datum/reagent/silicon = 1, /datum/reagent/consumable/sugar = 2, /datum/reagent/cryptobiolin = 1)
+	required_temp = 380
+
+/datum/chemical_reaction/chitosan_failure
+	results = list(/datum/reagent/carbon = 1)
+	required_reagents = list(/datum/reagent/medicine/chitosan = 1)
+	required_temp = 405
+
+/datum/chemical_reaction/salglu_solution
+	results = list(/datum/reagent/medicine/salglu_solution = 3)
+	required_reagents = list(/datum/reagent/consumable/sodiumchloride = 1, /datum/reagent/water = 1, /datum/reagent/consumable/sugar = 1)
+
+///Organ chems
 
-/datum/chemical_reaction/strange_reagent
-	results = list(/datum/reagent/medicine/strange_reagent = 3)
-	required_reagents = list(/datum/reagent/medicine/omnizine = 1, /datum/reagent/water/holywater = 1, /datum/reagent/toxin/mutagen = 1)
+/datum/chemical_reaction/oculine
+	results = list(/datum/reagent/medicine/oculine = 3)
+	required_reagents = list(/datum/reagent/medicine/charcoal = 1, /datum/reagent/carbon = 1, /datum/reagent/hydrogen = 1)
+	mix_message = "The mixture bubbles noticeably and becomes a dark grey color!"
 
-/datum/chemical_reaction/strange_reagent/alt
-	results = list(/datum/reagent/medicine/strange_reagent = 2)
-	required_reagents = list(/datum/reagent/medicine/omnizine/protozine = 1, /datum/reagent/water/holywater = 1, /datum/reagent/toxin/mutagen = 1)
+/datum/chemical_reaction/inacusiate
+	results = list(/datum/reagent/medicine/inacusiate = 2)
+	required_reagents = list(/datum/reagent/water = 1, /datum/reagent/carbon = 1, /datum/reagent/medicine/charcoal = 1)
+	mix_message = "The mixture sputters loudly and becomes a light grey color!"
 
 /datum/chemical_reaction/mannitol
 	results = list(/datum/reagent/medicine/mannitol = 3)
@@ -196,49 +159,30 @@ WS End */
 	results = list(/datum/reagent/medicine/neurine = 3)
 	required_reagents = list(/datum/reagent/medicine/mannitol = 1, /datum/reagent/acetone = 1, /datum/reagent/oxygen = 1)
 
-/datum/chemical_reaction/mutadone
-	results = list(/datum/reagent/medicine/mutadone = 3)
-	required_reagents = list(/datum/reagent/toxin/mutagen = 1, /datum/reagent/acetone = 1, /datum/reagent/bromine = 1)
-
-/datum/chemical_reaction/antihol
-	results = list(/datum/reagent/medicine/antihol = 3)
-	required_reagents = list(/datum/reagent/consumable/ethanol = 1, /datum/reagent/medicine/charcoal = 1, /datum/reagent/copper = 1)
-
-/datum/chemical_reaction/cryoxadone
-	results = list(/datum/reagent/medicine/cryoxadone = 3)
-	required_reagents = list(/datum/reagent/stable_plasma = 1, /datum/reagent/acetone = 1, /datum/reagent/toxin/mutagen = 1)
-
-/datum/chemical_reaction/pyroxadone
-	results = list(/datum/reagent/medicine/pyroxadone = 2)
-	required_reagents = list(/datum/reagent/medicine/cryoxadone = 1, /datum/reagent/toxin/slimejelly = 1)
-
-/datum/chemical_reaction/clonexadone
-	results = list(/datum/reagent/medicine/clonexadone = 2)
-	required_reagents = list(/datum/reagent/medicine/cryoxadone = 1, /datum/reagent/sodium = 1)
-	required_catalysts = list(/datum/reagent/toxin/plasma = 5)
-
-/datum/chemical_reaction/haloperidol
-	results = list(/datum/reagent/medicine/haloperidol = 5)
-	required_reagents = list(/datum/reagent/chlorine = 1, /datum/reagent/fluorine = 1, /datum/reagent/aluminium = 1, /datum/reagent/medicine/potass_iodide = 1, /datum/reagent/fuel/oil = 1)
+/datum/chemical_reaction/corazone
+	results = list(/datum/reagent/medicine/corazone = 3)
+	required_reagents = list(/datum/reagent/phenol = 2, /datum/reagent/lithium = 1)
 
-/datum/chemical_reaction/regen_jelly
-	results = list(/datum/reagent/medicine/regen_jelly = 1)
-	required_reagents = list(/datum/reagent/medicine/tetracordrazine = 1, /datum/reagent/toxin/slimejelly = 1)
+///pain chems
 
-/datum/chemical_reaction/regen_jelly2
-	results = list(/datum/reagent/medicine/regen_jelly = 2)
-	required_reagents = list(/datum/reagent/medicine/omnizine = 1, /datum/reagent/toxin/slimejelly = 1)
+/datum/chemical_reaction/tramal
+	results = list(/datum/reagent/medicine/tramal = 2) // these make me kinda wish i knew irl chem so i could have better recipes.
+	required_reagents = list(/datum/reagent/carbon = 1, /datum/reagent/oxygen = 1)
+	required_catalysts = list(/datum/reagent/ammonia = 2)
+	required_temp = 340
 
 /datum/chemical_reaction/morphine
 	results = list(/datum/reagent/medicine/morphine = 2)
 	required_reagents = list(/datum/reagent/carbon = 2, /datum/reagent/hydrogen = 2, /datum/reagent/consumable/ethanol = 1, /datum/reagent/oxygen = 1)
 	required_temp = 480
 
-/datum/chemical_reaction/tramal
-	results = list(/datum/reagent/medicine/tramal = 2) // these make me kinda wish i knew irl chem so i could have better recipes.
-	required_reagents = list(/datum/reagent/carbon = 1, /datum/reagent/oxygen = 1)
-	required_catalysts = list(/datum/reagent/ammonia = 2)
-	required_temp = 340
+
+/datum/chemical_reaction/carfen
+	results = list(/datum/reagent/medicine/carfencadrizine = 4)
+	required_reagents = list(/datum/reagent/medicine/dimorlin = 1, /datum/reagent/medicine/synaptizine = 1, /datum/reagent/consumable/sugar = 2)
+	required_catalysts = list(/datum/reagent/toxin/plasma = 2)
+	required_temp = 127
+	is_cold_recipe = TRUE
 
 /datum/chemical_reaction/dimorlin
 	results = list(/datum/reagent/medicine/dimorlin = 2, /datum/reagent/hydrogen = 2)
@@ -246,6 +190,28 @@ WS End */
 	required_temp = 730
 	mix_message = "The mixture rapidly incorporates, leaving a layer of liquid hydrogen atop!"
 
+/// status chems
+
+/datum/chemical_reaction/spaceacillin
+	results = list(/datum/reagent/medicine/spaceacillin = 2)
+	required_reagents = list(/datum/reagent/cryptobiolin = 1, /datum/reagent/medicine/epinephrine = 1)
+
+/datum/chemical_reaction/synaptizine
+	results = list(/datum/reagent/medicine/synaptizine = 3)
+	required_reagents = list(/datum/reagent/consumable/sugar = 1, /datum/reagent/lithium = 1, /datum/reagent/water = 1)
+
+/datum/chemical_reaction/mutadone
+	results = list(/datum/reagent/medicine/mutadone = 3)
+	required_reagents = list(/datum/reagent/toxin/mutagen = 1, /datum/reagent/acetone = 1, /datum/reagent/bromine = 1)
+
+/datum/chemical_reaction/antihol
+	results = list(/datum/reagent/medicine/antihol = 3)
+	required_reagents = list(/datum/reagent/consumable/ethanol = 1, /datum/reagent/medicine/charcoal = 1, /datum/reagent/copper = 1)
+
+/datum/chemical_reaction/haloperidol
+	results = list(/datum/reagent/medicine/haloperidol = 5)
+	required_reagents = list(/datum/reagent/chlorine = 1, /datum/reagent/fluorine = 1, /datum/reagent/aluminium = 1, /datum/reagent/medicine/potass_iodide = 1, /datum/reagent/fuel/oil = 1)
+
 /datum/chemical_reaction/modafinil
 	results = list(/datum/reagent/medicine/modafinil = 5)
 	required_reagents = list(/datum/reagent/diethylamine = 1, /datum/reagent/ammonia = 1, /datum/reagent/phenol = 1, /datum/reagent/acetone = 1, /datum/reagent/toxin/acid = 1)
@@ -255,54 +221,68 @@ WS End */
 	results = list(/datum/reagent/medicine/psicodine = 5)
 	required_reagents = list(/datum/reagent/medicine/mannitol = 2, /datum/reagent/water = 2, /datum/reagent/impedrezene = 1)
 
-/datum/chemical_reaction/medmesh
-	required_reagents = list(/datum/reagent/cellulose = 20, /datum/reagent/consumable/aloejuice = 20, /datum/reagent/space_cleaner/sterilizine = 10)
-	mob_react = FALSE
+/datum/chemical_reaction/diphenhydramine
+	results = list(/datum/reagent/medicine/diphenhydramine = 4)
+	required_reagents = list(/datum/reagent/fuel/oil = 1, /datum/reagent/carbon = 1, /datum/reagent/bromine = 1, /datum/reagent/diethylamine = 1, /datum/reagent/consumable/ethanol = 1)
+	mix_message = "The mixture dries into a pale blue powder."
+
+/datum/chemical_reaction/lithium_carbonate
+	results = list(/datum/reagent/medicine/lithium_carbonate = 3)
+	required_reagents = list(/datum/reagent/lithium = 1, /datum/reagent/carbon = 1, /datum/reagent/water = 1)
 
-/datum/chemical_reaction/medmesh/on_reaction(datum/reagents/holder, created_volume)
-	var/location = get_turf(holder.my_atom)
-	for(var/i in 1 to created_volume)
-		new /obj/item/stack/medical/mesh/advanced(location)
+/datum/chemical_reaction/synaptizine
+	results = list(/datum/reagent/medicine/synaptizine = 3)
+	required_reagents = list(/datum/reagent/consumable/sugar = 1, /datum/reagent/lithium = 1, /datum/reagent/water = 1)
 
-/datum/chemical_reaction/converbital
-	results = list(/datum/reagent/medicine/converbital = 3)
-	required_reagents = list(/datum/reagent/fuel = 1, /datum/reagent/acetone = 1, /datum/reagent/medicine/kelotane = 1)
-	mix_message = "The mixture spits and steams as it settles into a reddish-black paste"
+/// crit chems
 
-/datum/chemical_reaction/convuri
-	results = list(/datum/reagent/medicine/convuri = 3)
-	required_reagents = list(/datum/reagent/fuel = 1, /datum/reagent/ash =1, /datum/reagent/medicine/bicaridine = 1)
-	mix_message = "the mixture rapidly dries into an orange powder"
+/datum/chemical_reaction/atropine
+	results = list(/datum/reagent/medicine/atropine = 5)
+	required_reagents = list(/datum/reagent/consumable/ethanol = 1, /datum/reagent/acetone = 1, /datum/reagent/diethylamine = 1, /datum/reagent/phenol = 1, /datum/reagent/toxin/acid = 1)
 
-/datum/chemical_reaction/trophazole
-	results = list(/datum/reagent/medicine/trophazole = 4)
-	required_reagents = list(/datum/reagent/copper = 1, /datum/reagent/acetone = 2,  /datum/reagent/phosphorus = 1)
+/datum/chemical_reaction/epinephrine
+	results = list(/datum/reagent/medicine/epinephrine = 6)
+	required_reagents = list(/datum/reagent/phenol = 1, /datum/reagent/acetone = 1, /datum/reagent/diethylamine = 1, /datum/reagent/oxygen = 1, /datum/reagent/chlorine = 1, /datum/reagent/hydrogen = 1)
 
-/datum/chemical_reaction/rhigoxane
-	results = list(/datum/reagent/medicine/rhigoxane/ = 5)
-	required_reagents = list(/datum/reagent/cryostylane = 3, /datum/reagent/bromine = 1, /datum/reagent/lye = 1)
+///things im not going to organize right now (This means they should be in another file)
 
-/datum/chemical_reaction/thializid
-	results = list(/datum/reagent/medicine/thializid = 5)
-	required_reagents = list(/datum/reagent/sulfur = 1, /datum/reagent/fluorine = 1, /datum/reagent/toxin = 1, /datum/reagent/nitrous_oxide = 2)
+/datum/chemical_reaction/rezadone
+	results = list(/datum/reagent/medicine/rezadone = 3)
+	required_reagents = list(/datum/reagent/toxin/carpotoxin = 1, /datum/reagent/cryptobiolin = 1, /datum/reagent/copper = 1)
 
-/datum/chemical_reaction/medsuture/ash
-	required_reagents = list(/datum/reagent/ash_fibers = 10, /datum/reagent/toxin/formaldehyde = 20, /datum/reagent/medicine/polypyr = 15)
+/datum/chemical_reaction/stasis
+	results = list(/datum/reagent/medicine/stasis = 5)
+	required_reagents = list(/datum/reagent/phenol = 1, /datum/reagent/copper = 1, /datum/reagent/medicine/salglu_solution = 3)
+	required_catalysts = list(/datum/reagent/toxin/plasma = 5)
+	required_temp = 207
+	is_cold_recipe = TRUE
 
-/datum/chemical_reaction/medmesh/ash
-	required_reagents = list(/datum/reagent/ash_fibers = 20, /datum/reagent/consumable/aloejuice = 20, /datum/reagent/space_cleaner/sterilizine = 10)
+/datum/chemical_reaction/system_cleaner
+	results = list(/datum/reagent/medicine/system_cleaner = 4)
+	required_reagents = list(/datum/reagent/consumable/ethanol = 1, /datum/reagent/chlorine = 1, /datum/reagent/phenol = 2, /datum/reagent/potassium = 1)
 
-/datum/chemical_reaction/lavaland_extract
-	results = list(/datum/reagent/medicine/lavaland_extract = 5)
-	required_reagents = list(/datum/reagent/consumable/vitfro = 1, /datum/reagent/medicine/puce_essence = 2,  /datum/reagent/toxin/plasma = 2)
+/datum/chemical_reaction/liquid_solder
+	results = list(/datum/reagent/medicine/liquid_solder = 3)
+	required_reagents = list(/datum/reagent/consumable/ethanol = 1, /datum/reagent/copper = 1, /datum/reagent/silver = 1)
+	required_temp = 370
+	mix_message = "The mixture becomes a metallic slurry."
 
 /datum/chemical_reaction/bonefixingjuice
 	results = list(/datum/reagent/medicine/bonefixingjuice = 3)
 	required_reagents = list(/datum/reagent/consumable/entpoly = 1, /datum/reagent/calcium = 1, /datum/reagent/toxin/plasma = 1)
 
-/datum/chemical_reaction/skele_boon
-	results = list(/datum/reagent/medicine/skeletons_boon = 5)
-	required_reagents = list(/datum/reagent/medicine/lavaland_extract = 1, /datum/reagent/medicine/bonefixingjuice = 1, /datum/reagent/titanium = 5)
+/datum/chemical_reaction/mine_salve
+	results = list(/datum/reagent/medicine/mine_salve = 3)
+	required_reagents = list(/datum/reagent/fuel/oil = 1, /datum/reagent/water = 1, /datum/reagent/iron = 1)
+
+/datum/chemical_reaction/mine_salve2
+	results = list(/datum/reagent/medicine/mine_salve = 15)
+	required_reagents = list(/datum/reagent/toxin/plasma = 5, /datum/reagent/iron = 5, /datum/reagent/consumable/sugar = 1) // A sheet of plasma, a twinkie and a sheet of metal makes four of these
+
+/datum/chemical_reaction/ephedrine
+	results = list(/datum/reagent/medicine/ephedrine = 4)
+	required_reagents = list(/datum/reagent/consumable/sugar = 1, /datum/reagent/fuel/oil = 1, /datum/reagent/hydrogen = 1, /datum/reagent/diethylamine = 1)
+	mix_message = "The solution fizzes and gives off toxic fumes."
 
 /datum/chemical_reaction/pure_soulus_dust_hollow
 	results = list(/datum/reagent/medicine/soulus/pure = 20,)
@@ -315,29 +295,3 @@ WS End */
 /datum/chemical_reaction/chartreuse
 	results = list(/datum/reagent/medicine/chartreuse = 10)
 	required_reagents = list(/datum/reagent/medicine/puce_essence = 5, /datum/reagent/consumable/tinlux = 5, /datum/reagent/consumable/entpoly = 1)
-
-/datum/chemical_reaction/lithium_carbonate
-	results = list(/datum/reagent/medicine/lithium_carbonate = 3)
-	required_reagents = list(/datum/reagent/lithium = 1, /datum/reagent/carbon = 1, /datum/reagent/water = 1)
-
-/datum/chemical_reaction/chitosan
-	results = list(/datum/reagent/medicine/chitosan = 10)
-	required_reagents = list(/datum/reagent/silicon = 1, /datum/reagent/consumable/sugar = 2, /datum/reagent/cryptobiolin = 1)
-	required_temp = 380
-
-/datum/chemical_reaction/chitosan_failure
-	results = list(/datum/reagent/carbon = 1)
-	required_reagents = list(/datum/reagent/medicine/chitosan = 1)
-	required_temp = 405
-
-/datum/chemical_reaction/stasis
-	results = list(/datum/reagent/medicine/stasis = 5)
-	required_reagents = list(/datum/reagent/phenol = 1, /datum/reagent/copper = 1, /datum/reagent/medicine/salglu_solution = 3)
-	required_catalysts = list(/datum/reagent/toxin/plasma = 5)
-	required_temp = 207
-
-/datum/chemical_reaction/carfen
-	results = list(/datum/reagent/medicine/carfencadrizine = 4)
-	required_reagents = list(/datum/reagent/medicine/dimorlin = 1, /datum/reagent/medicine/synaptizine = 1, /datum/reagent/consumable/sugar = 2)
-	required_catalysts = list(/datum/reagent/toxin/plasma = 2)
-	required_temp = 127
diff --git a/code/modules/reagents/chemistry/recipes/others.dm b/code/modules/reagents/chemistry/recipes/others.dm
index 3450e1f463..897c833214 100644
--- a/code/modules/reagents/chemistry/recipes/others.dm
+++ b/code/modules/reagents/chemistry/recipes/others.dm
@@ -7,14 +7,6 @@
 	results = list(/datum/reagent/lube = 4)
 	required_reagents = list(/datum/reagent/water = 1, /datum/reagent/silicon = 1, /datum/reagent/oxygen = 1)
 
-/datum/chemical_reaction/spraytan
-	results = list(/datum/reagent/spraytan = 2)
-	required_reagents = list(/datum/reagent/consumable/orangejuice = 1, /datum/reagent/fuel/oil = 1)
-
-/datum/chemical_reaction/spraytan2
-	results = list(/datum/reagent/spraytan = 2)
-	required_reagents = list(/datum/reagent/consumable/orangejuice = 1, /datum/reagent/consumable/cornoil = 1)
-
 /datum/chemical_reaction/impedrezene
 	results = list(/datum/reagent/impedrezene = 2)
 	required_reagents = list(/datum/reagent/mercury = 1, /datum/reagent/oxygen = 1, /datum/reagent/consumable/sugar = 1)
@@ -398,7 +390,7 @@
 
 /datum/chemical_reaction/carpet/purple
 	results = list(/datum/reagent/carpet/purple = 2)
-	required_reagents = list(/datum/reagent/carpet = 1, /datum/reagent/medicine/regen_jelly = 1)
+	required_reagents = list(/datum/reagent/carpet = 1, /datum/reagent/colorful_reagent/powder/purple = 1)
 	//slimes only party
 
 /datum/chemical_reaction/carpet/red
@@ -468,7 +460,7 @@
 
 //butterflium
 /datum/chemical_reaction/butterflium
-	required_reagents = list(/datum/reagent/colorful_reagent = 1, /datum/reagent/medicine/omnizine = 1, /datum/reagent/medicine/strange_reagent = 1, /datum/reagent/consumable/nutriment = 1)
+	required_reagents = list(/datum/reagent/colorful_reagent = 1, /datum/reagent/medicine/panacea = 1, /datum/reagent/medicine/strange_reagent = 1, /datum/reagent/consumable/nutriment = 1)
 
 /datum/chemical_reaction/butterflium/on_reaction(datum/reagents/holder, created_volume)
 	var/location = get_turf(holder.my_atom)
diff --git a/code/modules/reagents/chemistry/recipes/pyrotechnics.dm b/code/modules/reagents/chemistry/recipes/pyrotechnics.dm
index 94acf9d39c..7a8f006940 100644
--- a/code/modules/reagents/chemistry/recipes/pyrotechnics.dm
+++ b/code/modules/reagents/chemistry/recipes/pyrotechnics.dm
@@ -54,7 +54,7 @@
 	strengthdiv = 2
 
 /datum/chemical_reaction/reagent_explosion/rdx
-	results = list(/datum/reagent/rdx= 2)
+	results = list(/datum/reagent/rdx = 2)
 	required_reagents = list(/datum/reagent/phenol = 2, /datum/reagent/toxin/acid/nitracid = 1, /datum/reagent/acetone_oxide = 1)
 	required_temp = 404
 	strengthdiv = 6 //rdx deserves better than being just about equal to nitrous
@@ -133,11 +133,11 @@
 
 
 /datum/chemical_reaction/reagent_explosion/penthrite_explosion_epinephrine
-	required_reagents = list(/datum/reagent/medicine/c2/penthrite = 1, /datum/reagent/medicine/epinephrine = 1)
+	required_reagents = list(/datum/reagent/medicine/penthrite = 1, /datum/reagent/medicine/epinephrine = 1)
 	strengthdiv = 5
 
 /datum/chemical_reaction/reagent_explosion/penthrite_explosion_atropine
-	required_reagents = list(/datum/reagent/medicine/c2/penthrite = 1, /datum/reagent/medicine/atropine = 1)
+	required_reagents = list(/datum/reagent/medicine/penthrite = 1, /datum/reagent/medicine/atropine = 1)
 	strengthdiv = 5
 	modifier = 5
 
@@ -511,4 +511,4 @@
 	results = list(/datum/reagent/firefighting_foam = 3)
 	required_reagents = list(/datum/reagent/stabilizing_agent = 1,/datum/reagent/fluorosurfactant = 1,/datum/reagent/carbon = 1)
 	required_temp = 200
-	is_cold_recipe = 1
+	is_cold_recipe = TRUE
diff --git a/code/modules/reagents/chemistry/recipes/toxins.dm b/code/modules/reagents/chemistry/recipes/toxins.dm
index 0d6b1b8a66..d564913266 100644
--- a/code/modules/reagents/chemistry/recipes/toxins.dm
+++ b/code/modules/reagents/chemistry/recipes/toxins.dm
@@ -4,11 +4,6 @@
 	required_reagents = list(/datum/reagent/consumable/ethanol = 1, /datum/reagent/oxygen = 1, /datum/reagent/silver = 1)
 	required_temp = 420
 
-/datum/chemical_reaction/fentanyl
-	results = list(/datum/reagent/toxin/fentanyl = 1)
-	required_reagents = list(/datum/reagent/drug/space_drugs = 1)
-	required_temp = 674
-
 /datum/chemical_reaction/cyanide
 	results = list(/datum/reagent/toxin/cyanide = 3)
 	required_reagents = list(/datum/reagent/fuel/oil = 1, /datum/reagent/ammonia = 1, /datum/reagent/oxygen = 1)
@@ -81,7 +76,7 @@
 
 /datum/chemical_reaction/rotatium
 	results = list(/datum/reagent/toxin/rotatium = 3)
-	required_reagents = list(/datum/reagent/toxin/mindbreaker = 1, /datum/reagent/teslium = 1, /datum/reagent/toxin/fentanyl = 1)
+	required_reagents = list(/datum/reagent/toxin/mindbreaker = 1, /datum/reagent/teslium = 1, /datum/reagent/drug/methamphetamine = 1)
 	mix_message = span_danger("After sparks, fire, and the smell of mindbreaker, the mix is constantly spinning with no stop in sight.")
 
 /datum/chemical_reaction/anacea
diff --git a/code/modules/reagents/reagent_containers/borghydro.dm b/code/modules/reagents/reagent_containers/borghydro.dm
index 73f24c4aa3..fa8ca15b63 100644
--- a/code/modules/reagents/reagent_containers/borghydro.dm
+++ b/code/modules/reagents/reagent_containers/borghydro.dm
@@ -26,7 +26,7 @@ Borg Hypospray
 	var/bypass_protection = 0 //If the hypospray can go through armor or thick material
 
 	var/list/datum/reagents/reagent_list = list()
-	var/list/reagent_ids = list(/datum/reagent/medicine/dexalin, /datum/reagent/medicine/kelotane, /datum/reagent/medicine/bicaridine, /datum/reagent/medicine/antitoxin, /datum/reagent/medicine/epinephrine, /datum/reagent/medicine/spaceacillin, /datum/reagent/medicine/salglu_solution, /datum/reagent/medicine/morphine)
+	var/list/reagent_ids = list(/datum/reagent/medicine/dexalin, /datum/reagent/medicine/alvitane, /datum/reagent/medicine/indomide, /datum/reagent/medicine/pancrazine, /datum/reagent/medicine/epinephrine, /datum/reagent/medicine/spaceacillin, /datum/reagent/medicine/salglu_solution, /datum/reagent/medicine/morphine)
 	var/accepts_reagent_upgrades = TRUE //If upgrades can increase number of reagents dispensed.
 	var/list/modes = list() //Basically the inverse of reagent_ids. Instead of having numbers as "keys" and strings as values it has strings as keys and numbers as values.
 								//Used as list for input() in shakers.
@@ -154,7 +154,7 @@ Borg Hypospray
 	icon_state = "borghypo_s"
 	charge_cost = 20
 	recharge_time = 2
-	reagent_ids = list(/datum/reagent/medicine/syndicate_nanites, /datum/reagent/medicine/potass_iodide, /datum/reagent/medicine/morphine)
+	reagent_ids = list(/datum/reagent/medicine/panacea, /datum/reagent/medicine/potass_iodide, /datum/reagent/medicine/morphine)
 	bypass_protection = 1
 	accepts_reagent_upgrades = FALSE
 
@@ -249,7 +249,7 @@ Borg Shaker
 /obj/item/reagent_containers/borghypo/peace/hacked
 	desc = "Everything's peaceful in death!"
 	icon_state = "borghypo_s"
-	reagent_ids = list(/datum/reagent/peaceborg/confuse,/datum/reagent/peaceborg/tire,/datum/reagent/pax/peaceborg,/datum/reagent/toxin/staminatoxin,/datum/reagent/toxin/sulfonal,/datum/reagent/toxin/sodium_thiopental,/datum/reagent/toxin/cyanide,/datum/reagent/toxin/fentanyl)
+	reagent_ids = list(/datum/reagent/peaceborg/confuse,/datum/reagent/peaceborg/tire,/datum/reagent/pax/peaceborg,/datum/reagent/toxin/staminatoxin,/datum/reagent/toxin/sulfonal,/datum/reagent/toxin/sodium_thiopental,/datum/reagent/toxin/cyanide)
 	accepts_reagent_upgrades = FALSE
 
 /obj/item/reagent_containers/borghypo/epi
diff --git a/code/modules/reagents/reagent_containers/bottle.dm b/code/modules/reagents/reagent_containers/bottle.dm
index a0847a5b26..68c605cbc9 100644
--- a/code/modules/reagents/reagent_containers/bottle.dm
+++ b/code/modules/reagents/reagent_containers/bottle.dm
@@ -69,11 +69,6 @@
 	desc = "A small bottle of Mannitol. Useful for healing brain damage."
 	list_reagents = list(/datum/reagent/medicine/mannitol = 30)
 
-/obj/item/reagent_containers/glass/bottle/charcoal
-	name = "charcoal bottle"
-	desc = "A small bottle of charcoal, which removes toxins and other chemicals from the bloodstream."
-	list_reagents = list(/datum/reagent/medicine/charcoal = 30)
-
 /obj/item/reagent_containers/glass/bottle/mutagen
 	name = "unstable mutagen bottle"
 	desc = "A small bottle of unstable mutagen. Randomly changes the DNA structure of whoever comes in contact."
@@ -131,7 +126,7 @@
 
 /obj/item/reagent_containers/glass/bottle/traitor/Initialize()
 	. = ..()
-	extra_reagent = pick(/datum/reagent/toxin/polonium, /datum/reagent/toxin/histamine, /datum/reagent/toxin/formaldehyde, /datum/reagent/toxin/venom, /datum/reagent/toxin/fentanyl, /datum/reagent/toxin/cyanide)
+	extra_reagent = pick(/datum/reagent/toxin/polonium, /datum/reagent/toxin/histamine, /datum/reagent/toxin/formaldehyde, /datum/reagent/toxin/venom, /datum/reagent/toxin/cyanide)
 	reagents.add_reagent(extra_reagent, 3)
 
 /obj/item/reagent_containers/glass/bottle/polonium
@@ -149,11 +144,6 @@
 	desc = "A small bottle. Contains Venom."
 	list_reagents = list(/datum/reagent/toxin/venom = 30)
 
-/obj/item/reagent_containers/glass/bottle/fentanyl
-	name = "fentanyl bottle"
-	desc = "A small bottle. Contains Fentanyl."
-	list_reagents = list(/datum/reagent/toxin/fentanyl = 30)
-
 /obj/item/reagent_containers/glass/bottle/formaldehyde
 	name = "formaldehyde bottle"
 	desc = "A small bottle. Contains formaldehyde, a chemical that prevents organs from decaying."
@@ -407,23 +397,22 @@
 	volume = 50
 	list_reagents = list(/datum/reagent/medicine/epinephrine = 50)
 
-/obj/item/reagent_containers/glass/bottle/bicaridine
-	name = "bicaridine bottle"
-	desc = "A small bottle. Contains bicaridine, used to treat minor bruising."
+/obj/item/reagent_containers/glass/bottle/indomide
+	name = "indomide bottle"
+	desc = "A small bottle. Contains indomide, used to treat minor bruising."
 	volume = 50
-	list_reagents = list(/datum/reagent/medicine/bicaridine = 50)
+	list_reagents = list(/datum/reagent/medicine/indomide = 50)
 
-/obj/item/reagent_containers/glass/bottle/kelotane
-	name = "kelotane bottle"
-	desc = "A small bottle. Contains kelotane, used for minor burns and skin damage."
+/obj/item/reagent_containers/glass/bottle/alvitane
+	name = "alvitane bottle"
+	desc = "A small bottle. Contains alvitane, used for minor burns and skin damage. Best used as injection!"
 	volume = 50
-	list_reagents = list(/datum/reagent/medicine/kelotane = 50)
+	list_reagents = list(/datum/reagent/medicine/alvitane = 50)
 
-/obj/item/reagent_containers/glass/bottle/antitoxin
-	name = "dylovene bottle"
-	desc = "A small bottle. Contains dylovene, used to treat minor poisoning."
-	volume = 50
-	list_reagents = list(/datum/reagent/medicine/antitoxin = 50)
+/obj/item/reagent_containers/glass/bottle/charcoal
+	name = "charcoal bottle"
+	desc = "A small bottle of charcoal, which removes toxins and other chemicals from the bloodstream."
+	list_reagents = list(/datum/reagent/medicine/charcoal = 30)
 
 /obj/item/reagent_containers/glass/bottle/dexalin
 	name = "dexalin bottle"
@@ -431,16 +420,22 @@
 	volume = 50
 	list_reagents = list(/datum/reagent/medicine/dexalin = 50)
 
+/obj/item/reagent_containers/glass/bottle/gjalrazine
+	name = "gjalrazine bottle"
+	desc = "A small bottle. Contains gjalrazine, used to treat major toxic damage."
+	volume = 50
+	list_reagents = list(/datum/reagent/medicine/gjalrazine = 50)
+
 /obj/item/reagent_containers/glass/bottle/epinephrine/sleeper
 	cap_on = FALSE
 
-/obj/item/reagent_containers/glass/bottle/bicaridine/sleeper
+/obj/item/reagent_containers/glass/bottle/indomide/sleeper
 	cap_on = FALSE
 
-/obj/item/reagent_containers/glass/bottle/kelotane/sleeper
+/obj/item/reagent_containers/glass/bottle/alvitane/sleeper
 	cap_on = FALSE
 
-/obj/item/reagent_containers/glass/bottle/antitoxin/sleeper
+/obj/item/reagent_containers/glass/bottle/charcoal/sleeper
 	cap_on = FALSE
 
 /obj/item/reagent_containers/glass/bottle/dexalin/sleeper
diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm
index f661f39670..17d40765ed 100644
--- a/code/modules/reagents/reagent_containers/glass.dm
+++ b/code/modules/reagents/reagent_containers/glass.dm
@@ -197,13 +197,13 @@
 /obj/item/reagent_containers/glass/beaker/slime
 	list_reagents = list(/datum/reagent/toxin/slimejelly = 50)
 
-/obj/item/reagent_containers/glass/beaker/large/styptic
-	name = "styptic reserve tank"
-	list_reagents = list(/datum/reagent/medicine/styptic_powder = 50)
+/obj/item/reagent_containers/glass/beaker/large/hadrakine
+	name = "hadrakine reserve tank"
+	list_reagents = list(/datum/reagent/medicine/hadrakine = 50)
 
-/obj/item/reagent_containers/glass/beaker/large/silver_sulfadiazine
-	name = "silver sulfadiazine reserve tank"
-	list_reagents = list(/datum/reagent/medicine/silver_sulfadiazine = 50)
+/obj/item/reagent_containers/glass/beaker/large/quardexane
+	name = "quardexane reserve tank"
+	list_reagents = list(/datum/reagent/medicine/quardexane = 50)
 
 /obj/item/reagent_containers/glass/beaker/large/charcoal
 	name = "charcoal reserve tank"
diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm
index 8818fb8304..f299a595e5 100644
--- a/code/modules/reagents/reagent_containers/hypospray.dm
+++ b/code/modules/reagents/reagent_containers/hypospray.dm
@@ -75,7 +75,7 @@
 
 
 /obj/item/reagent_containers/hypospray/CMO
-	list_reagents = list(/datum/reagent/medicine/omnizine = 30)
+	list_reagents = list(/datum/reagent/medicine/panacea = 30)
 	resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF
 
 //combat
@@ -88,20 +88,7 @@
 	icon_state = "combat_hypo"
 	volume = 90
 	ignore_flags = 1 // So they can heal their comrades.
-	list_reagents = list(/datum/reagent/medicine/epinephrine = 30, /datum/reagent/medicine/omnizine = 30, /datum/reagent/medicine/leporazine = 15, /datum/reagent/medicine/atropine = 15)
-
-/obj/item/reagent_containers/hypospray/combat/nanites
-	name = "experimental combat stimulant injector"
-	desc = "A modified air-needle autoinjector for use in combat situations. Prefilled with experimental medical nanites and a stimulant for rapid healing and a combat boost."
-	item_state = "nanite_hypo"
-	icon_state = "nanite_hypo"
-	base_icon_state = "nanite_hypo"
-	volume = 100
-	list_reagents = list(/datum/reagent/medicine/adminordrazine/quantum_heal = 80, /datum/reagent/medicine/synaptizine = 20)
-
-/obj/item/reagent_containers/hypospray/combat/nanites/update_icon_state()
-	icon_state = "[base_icon_state][(reagents.total_volume > 0) ? null : 0]"
-	return ..()
+	list_reagents = list(/datum/reagent/medicine/epinephrine = 30, /datum/reagent/medicine/panacea = 30, /datum/reagent/medicine/leporazine = 15, /datum/reagent/medicine/atropine = 15)
 
 //MediPens
 
@@ -153,28 +140,13 @@
 	amount_per_transfer_from_this = 20
 	list_reagents = list(/datum/reagent/medicine/ephedrine = 10, /datum/reagent/consumable/coffee = 10)
 
-/obj/item/reagent_containers/hypospray/medipen/stimpack/traitor
-	desc = "A modified stimulants autoinjector for use in combat situations. Has a mild healing effect."
-	list_reagents = list(/datum/reagent/medicine/stimulants = 10, /datum/reagent/medicine/omnizine = 10)
-
-//watered down traitor stim
 /obj/item/reagent_containers/hypospray/medipen/stimpack/crisis
 	name = "crisis stimpack"
 	icon_state = "stimpen"
 	item_state = "stimpen"
 	base_icon_state = "stimpen"
 	desc = "A modified stimulant autoinjector, containing a cocktail of potent nerve excitants and long-release healing chemicals. Designed for use in emergency situations where medical help may be hours or days away."
-	list_reagents = list(/datum/reagent/medicine/stimulants = 5, /datum/reagent/medicine/ephedrine = 5, /datum/reagent/medicine/omnizine = 15)
-
-/obj/item/reagent_containers/hypospray/medipen/stimulants
-	name = "stimulant medipen"
-	desc = "Contains a very large amount of an incredibly powerful stimulant, vastly increasing your movement speed and reducing stuns by a very large amount for around five minutes. Do not take if pregnant."
-	icon_state = "syndipen"
-	item_state = "tbpen"
-	base_icon_state = "syndipen"
-	volume = 50
-	amount_per_transfer_from_this = 50
-	list_reagents = list(/datum/reagent/medicine/stimulants = 50)
+	list_reagents = list(/datum/reagent/medicine/stimulants = 5, /datum/reagent/medicine/ephedrine = 5, /datum/reagent/medicine/panacea = 15)
 
 /obj/item/reagent_containers/hypospray/medipen/morphine
 	name = "morphine medipen"
@@ -188,13 +160,29 @@
 	list_reagents = list(/datum/reagent/medicine/tramal = 10)
 	custom_price = 25
 
-/obj/item/reagent_containers/hypospray/medipen/oxandrolone
-	name = "oxandrolone medipen"
-	desc = "A autoinjector containing oxandrolone, used to treat severe burns."
+/obj/item/reagent_containers/hypospray/medipen/silfrine
+	name = "silfrine medipen"
+	desc = "A autoinjector containing silfrine, used to near-instantly reknit hewn flesh."
+	icon_state = "salpen"
+	item_state = "salpen"
+	base_icon_state = "salpen"
+	list_reagents = list(/datum/reagent/medicine/silfrine = 10)
+
+/obj/item/reagent_containers/hypospray/medipen/ysiltane
+	name = "ysiltane medipen"
+	desc = "A autoinjector containing ysiltane, used to rapidly clear up widespread surface-level burning."
 	icon_state = "oxapen"
 	item_state = "oxapen"
 	base_icon_state = "oxapen"
-	list_reagents = list(/datum/reagent/medicine/oxandrolone = 10)
+	list_reagents = list(/datum/reagent/medicine/ysiltane = 10)
+
+/obj/item/reagent_containers/hypospray/medipen/gjalrazine
+	name = "gjalrazine medipen"
+	desc = "A autoinjector containing Gjalrazine, used to purge the body of toxic after effects."
+	icon_state = "penacid"
+	item_state = "penacid"
+	base_icon_state = "penacid"
+	list_reagents = list(/datum/reagent/medicine/gjalrazine = 10)
 
 /obj/item/reagent_containers/hypospray/medipen/penacid
 	name = "pentetic acid medipen"
@@ -204,14 +192,6 @@
 	base_icon_state = "penacid"
 	list_reagents = list(/datum/reagent/medicine/pen_acid = 10)
 
-/obj/item/reagent_containers/hypospray/medipen/salacid
-	name = "salicylic acid medipen"
-	desc = "A autoinjector containing salicylic acid, used to treat severe brute damage."
-	icon_state = "salacid"
-	item_state = "salacid"
-	base_icon_state = "salacid"
-	list_reagents = list(/datum/reagent/medicine/sal_acid = 10)
-
 /obj/item/reagent_containers/hypospray/medipen/salbutamol
 	name = "salbutamol medipen"
 	desc = "A autoinjector containing salbutamol, used to heal oxygen damage quickly."
@@ -305,10 +285,10 @@
 	amount_per_transfer_from_this = 10
 	custom_price = 25
 
-/obj/item/reagent_containers/hypospray/medipen/tricord
-	name = "tricordrazine injector"
-	desc = "An injector filled with tricordrazine, a mildly effective healing agent."
-	list_reagents = list(/datum/reagent/medicine/tricordrazine = 15)
+/obj/item/reagent_containers/hypospray/medipen/cureall
+	name = "cureall injector"
+	desc = "An injector filled with cureall, a mildly effective healing agent."
+	list_reagents = list(/datum/reagent/medicine/cureall = 15)
 	volume = 15
 	amount_per_transfer_from_this = 15
 	icon_state = "morphen"
@@ -345,7 +325,7 @@
 /obj/item/reagent_containers/hypospray/medipen/combat_drug
 	name = "combat cocktail"
 	desc = "An injector filled with a potent combat drug mixture. Straight from the Shoal."
-	list_reagents = list(/datum/reagent/drug/combat_drug = 6, /datum/reagent/medicine/bicaridinep = 6, /datum/reagent/medicine/dermaline = 6)
+	list_reagents = list(/datum/reagent/drug/combat_drug = 6, /datum/reagent/medicine/silfrine = 6, /datum/reagent/medicine/ysiltane = 6)
 	volume = 18
 	amount_per_transfer_from_this = 18
 	icon_state = "syndipen"
@@ -371,6 +351,16 @@
 	base_icon_state = "syndipen"
 	item_state = "syndipen"
 
+/obj/item/reagent_containers/hypospray/medipen/netzach
+	name = "\improper Nesah injector"
+	desc = "A combat injector filled with a tightly curated mixture of regenerative compounds. \"The Fearlessness To Go Forward\" is etched in small text opposite the activator."
+	list_reagents = list(/datum/reagent/medicine/silfrine = 10, /datum/reagent/medicine/ysiltane = 10, /datum/reagent/drug/aranesp = 10, /datum/reagent/medicine/morphine = 10)
+	volume = 40
+	amount_per_transfer_from_this = 40
+	icon_state = "penacid"
+	base_icon_state = "penacid"
+	item_state = "penacid"
+
 /obj/item/reagent_containers/hypospray/medipen/placebatol
 	name = "prescription medipen"
 	desc = "An injector filled with some prescribed substance."
@@ -412,19 +402,19 @@
 	var/penetrates = TRUE
 
 /obj/item/hypospray/mkii/brute
-	start_vial = /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/bicaridine
+	start_vial = /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/indomide
 
 /obj/item/hypospray/mkii/toxin
-	start_vial = /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/antitoxin
+	start_vial = /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/pancrazine
 
 /obj/item/hypospray/mkii/oxygen
 	start_vial = /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/dexalin
 
 /obj/item/hypospray/mkii/burn
-	start_vial = /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/kelotane
+	start_vial = /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/alvitane
 
-/obj/item/hypospray/mkii/tricord
-	start_vial = /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/tricord
+/obj/item/hypospray/mkii/cureall
+	start_vial = /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/cureall
 
 /obj/item/hypospray/mkii/mkiii
 	name = "hypospray mk.III"
@@ -691,7 +681,7 @@
 	custom_price = 500
 	volume = 35
 	amount_per_transfer_from_this = 36
-	list_reagents = list(/datum/reagent/medicine/epinephrine = 5.5, /datum/reagent/medicine/lavaland_extract = 3, /datum/reagent/drug/methamphetamine = 2, /datum/reagent/medicine/morphine = 0.5, /datum/reagent/medicine/leporazine = 6, /datum/reagent/medicine/salglu_solution = 8, /datum/reagent/medicine/oxandrolone = 5, /datum/reagent/medicine/sal_acid = 5)
+	list_reagents = list(/datum/reagent/medicine/epinephrine = 5.5, /datum/reagent/medicine/hunter_extract = 3, /datum/reagent/drug/methamphetamine = 2, /datum/reagent/medicine/morphine = 0.5, /datum/reagent/medicine/leporazine = 6, /datum/reagent/medicine/salglu_solution = 8, /datum/reagent/medicine/ysiltane = 5, /datum/reagent/medicine/silfrine = 5)
 
 #undef HYPO_SPRAY
 #undef HYPO_INJECT
diff --git a/code/modules/reagents/reagent_containers/hypovial.dm b/code/modules/reagents/reagent_containers/hypovial.dm
index f776eae826..64d3fc1fd2 100644
--- a/code/modules/reagents/reagent_containers/hypovial.dm
+++ b/code/modules/reagents/reagent_containers/hypovial.dm
@@ -121,30 +121,30 @@
 	unique_reskin = null
 
 
-/obj/item/reagent_containers/glass/bottle/vial/small/preloaded/bicaridine
-	name = "red hypovial (bicaridine)"
+/obj/item/reagent_containers/glass/bottle/vial/small/preloaded/indomide
+	name = "red hypovial (indomide)"
 	icon_state = "hypovial-b"
-	comes_with = list(/datum/reagent/medicine/bicaridine = 60)
+	comes_with = list(/datum/reagent/medicine/indomide = 60)
 
-/obj/item/reagent_containers/glass/bottle/vial/small/preloaded/antitoxin
-	name = "green hypovial (Dylovene)"
+/obj/item/reagent_containers/glass/bottle/vial/small/preloaded/pancrazine
+	name = "green hypovial (pancrazine)"
 	icon_state = "hypovial-a"
-	comes_with = list(/datum/reagent/medicine/antitoxin = 60)
+	comes_with = list(/datum/reagent/medicine/pancrazine = 60)
 
-/obj/item/reagent_containers/glass/bottle/vial/small/preloaded/kelotane
-	name = "orange hypovial (kelotane)"
+/obj/item/reagent_containers/glass/bottle/vial/small/preloaded/alvitane
+	name = "orange hypovial (alvitane)"
 	icon_state = "hypovial-k"
-	comes_with = list(/datum/reagent/medicine/kelotane = 60)
+	comes_with = list(/datum/reagent/medicine/alvitane = 60)
 
 /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/dexalin
 	name = "blue hypovial (dexalin)"
 	icon_state = "hypovial-d"
 	comes_with = list(/datum/reagent/medicine/dexalin = 60)
 
-/obj/item/reagent_containers/glass/bottle/vial/small/preloaded/tricord
-	name = "hypovial (tricordrazine)"
+/obj/item/reagent_containers/glass/bottle/vial/small/preloaded/cureall
+	name = "hypovial (cureall)"
 	icon_state = "hypovial"
-	comes_with = list(/datum/reagent/medicine/tricordrazine = 60)
+	comes_with = list(/datum/reagent/medicine/cureall = 60)
 
 /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/morphine
 	name = "hypovial (morphine)"
@@ -176,7 +176,7 @@
 	name = "hypovial (shoal juice)"
 	icon_state = "hypovial-b"
 	amount_per_transfer_from_this = 10
-	comes_with = list(/datum/reagent/drug/combat_drug = 20, /datum/reagent/medicine/bicaridinep = 10, /datum/reagent/medicine/dermaline = 10, /datum/reagent/medicine/synaptizine = 20)
+	comes_with = list(/datum/reagent/drug/combat_drug = 20, /datum/reagent/medicine/silfrine = 20, /datum/reagent/medicine/ysiltane = 20)
 
 /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/stasis
 	name = "hypovial (stasis)"
@@ -187,37 +187,37 @@
 /obj/item/reagent_containers/glass/bottle/vial/large/preloaded/CMO
 	name = "deluxe hypovial"
 	icon_state = "hypoviallarge-cmos"
-	comes_with = list(/datum/reagent/medicine/omnizine = 40, /datum/reagent/medicine/leporazine = 40, /datum/reagent/medicine/atropine = 40)
+	comes_with = list(/datum/reagent/medicine/panacea = 40, /datum/reagent/medicine/leporazine = 40, /datum/reagent/medicine/atropine = 40)
 
-/obj/item/reagent_containers/glass/bottle/vial/large/preloaded/bicaridine
-	name = "large red hypovial (bicaridine plus)"
+/obj/item/reagent_containers/glass/bottle/vial/large/preloaded/silfrine
+	name = "large red hypovial (silfrine)"
 	icon_state = "hypoviallarge-b"
-	comes_with = list(/datum/reagent/medicine/bicaridinep = 120)
+	comes_with = list(/datum/reagent/medicine/silfrine = 120)
 
-/obj/item/reagent_containers/glass/bottle/vial/large/preloaded/antitoxin
-	name = "large green hypovial (carthatoline)"
+/obj/item/reagent_containers/glass/bottle/vial/large/preloaded/gjalrazine
+	name = "large green hypovial (gjalrazine)"
 	icon_state = "hypoviallarge-a"
-	comes_with = list(/datum/reagent/medicine/carthatoline = 120)
+	comes_with = list(/datum/reagent/medicine/gjalrazine = 120)
 
-/obj/item/reagent_containers/glass/bottle/vial/large/preloaded/kelotane
-	name = "large orange hypovial (dermaline)"
+/obj/item/reagent_containers/glass/bottle/vial/large/preloaded/ysiltane
+	name = "large orange hypovial (ysiltane)"
 	icon_state = "hypoviallarge-k"
-	comes_with = list(/datum/reagent/medicine/dermaline = 120)
+	comes_with = list(/datum/reagent/medicine/ysiltane = 120)
 
-/obj/item/reagent_containers/glass/bottle/vial/large/preloaded/dexalin
-	name = "large blue hypovial (dexalin plus)"
+/obj/item/reagent_containers/glass/bottle/vial/large/preloaded/salbutamol
+	name = "large blue hypovial (salbutamol)"
 	icon_state = "hypoviallarge-d"
-	comes_with = list(/datum/reagent/medicine/dexalinp = 120)
+	comes_with = list(/datum/reagent/medicine/salbutamol = 120)
 
 /obj/item/reagent_containers/glass/bottle/vial/large/preloaded/charcoal
 	name = "large black hypovial (charcoal)"
 	icon_state = "hypoviallarge-t"
 	comes_with = list(/datum/reagent/medicine/charcoal = 120)
 
-/obj/item/reagent_containers/glass/bottle/vial/large/preloaded/tricord
-	name = "large hypovial (tricord)"
+/obj/item/reagent_containers/glass/bottle/vial/large/preloaded/cureall
+	name = "large hypovial (cureall)"
 	icon_state = "hypoviallarge"
-	comes_with = list(/datum/reagent/medicine/tricordrazine = 120)
+	comes_with = list(/datum/reagent/medicine/cureall = 120)
 
 /obj/item/reagent_containers/glass/bottle/vial/large/preloaded/salglu
 	name = "large green hypovial (salglu)"
@@ -232,4 +232,4 @@
 /obj/item/reagent_containers/glass/bottle/vial/large/preloaded/combat
 	name = "combat hypovial"
 	icon_state = "hypoviallarge-t"
-	comes_with = list(/datum/reagent/medicine/epinephrine = 3, /datum/reagent/medicine/omnizine = 19, /datum/reagent/medicine/leporazine = 19, /datum/reagent/medicine/atropine = 19) //Epinephrine's main effect here is to kill suff damage, so we don't need much given atropine
+	comes_with = list(/datum/reagent/drug/combat_drug = 40, /datum/reagent/medicine/silfrine = 20, /datum/reagent/medicine/ysiltane = 20, /datum/reagent/medicine/synaptizine = 40)
diff --git a/code/modules/reagents/reagent_containers/medigel.dm b/code/modules/reagents/reagent_containers/medigel.dm
index 06f7840749..59ba90a1a6 100644
--- a/code/modules/reagents/reagent_containers/medigel.dm
+++ b/code/modules/reagents/reagent_containers/medigel.dm
@@ -74,17 +74,17 @@
 		reagents.trans_to(M, amount_per_transfer_from_this, transfered_by = user, method = apply_type)
 	return
 
-/obj/item/reagent_containers/medigel/styptic
-	name = "medical gel (styptic powder)"
-	desc = "A medical gel applicator bottle, designed for precision application, with an unscrewable cap. This one contains styptic powder, for treating cuts and bruises."
+/obj/item/reagent_containers/medigel/hadrakine
+	name = "medical gel (hadrakine powder)"
+	desc = "A medical gel applicator bottle, designed for precision application, with an unscrewable cap. This one contains hadrakine powder, for treating cuts and bruises."
 	icon_state = "brutegel"
-	list_reagents = list(/datum/reagent/medicine/styptic_powder = 60)
+	list_reagents = list(/datum/reagent/medicine/hadrakine = 60)
 
-/obj/item/reagent_containers/medigel/silver_sulf
-	name = "medical gel (silver sulfadiazine)"
-	desc = "A medical gel applicator bottle, designed for precision application, with an unscrewable cap. This one contains silver sulfadiazine, useful for treating burns."
+/obj/item/reagent_containers/medigel/quardexane
+	name = "medical gel (quardexane)"
+	desc = "A medical gel applicator bottle, designed for precision application, with an unscrewable cap. This one contains quardexane, useful for treating burns."
 	icon_state = "burngel"
-	list_reagents = list(/datum/reagent/medicine/silver_sulfadiazine = 60)
+	list_reagents = list(/datum/reagent/medicine/quardexane = 60)
 
 /obj/item/reagent_containers/medigel/synthflesh
 	name = "medical gel (synthflesh)"
diff --git a/code/modules/reagents/reagent_containers/patch.dm b/code/modules/reagents/reagent_containers/patch.dm
index af8baf074c..89b075e0c4 100644
--- a/code/modules/reagents/reagent_containers/patch.dm
+++ b/code/modules/reagents/reagent_containers/patch.dm
@@ -27,16 +27,16 @@
 		return 0
 	return 1 // Masks were stopping people from "eating" patches. Thanks, inheritance.
 
-/obj/item/reagent_containers/pill/patch/styptic
-	name = "brute patch"
+/obj/item/reagent_containers/pill/patch/indomide
+	name = "indomide patch"
 	desc = "Helps with brute injuries."
-	list_reagents = list(/datum/reagent/medicine/styptic_powder = 20)
+	list_reagents = list(/datum/reagent/medicine/indomide = 20)
 	icon_state = "bandaid_brute"
 
-/obj/item/reagent_containers/pill/patch/silver_sulf
-	name = "burn patch"
+/obj/item/reagent_containers/pill/patch/alvitane
+	name = "alvitane patch"
 	desc = "Helps with burn injuries."
-	list_reagents = list(/datum/reagent/medicine/silver_sulfadiazine = 20)
+	list_reagents = list(/datum/reagent/medicine/alvitane = 20)
 	icon_state = "bandaid_burn"
 
 /obj/item/reagent_containers/pill/patch/synthflesh
diff --git a/code/modules/reagents/reagent_containers/pill.dm b/code/modules/reagents/reagent_containers/pill.dm
index 068aeffcff..0a47719ab5 100644
--- a/code/modules/reagents/reagent_containers/pill.dm
+++ b/code/modules/reagents/reagent_containers/pill.dm
@@ -146,18 +146,18 @@
 	list_reagents = list(/datum/reagent/medicine/mutadone = 50)
 	rename_with_volume = TRUE
 
-/obj/item/reagent_containers/pill/salicylic
-	name = "salicylic acid pill"
-	desc = "Used to dull pain."
+/obj/item/reagent_containers/pill/silfrine
+	name = "silfrine pill"
+	desc = "Used to stimulate brute healing."
 	icon_state = "pill9"
-	list_reagents = list(/datum/reagent/medicine/sal_acid = 24)
+	list_reagents = list(/datum/reagent/medicine/silfrine = 15)
 	rename_with_volume = TRUE
 
-/obj/item/reagent_containers/pill/oxandrolone
-	name = "oxandrolone pill"
+/obj/item/reagent_containers/pill/ysiltane
+	name = "ysiltane pill"
 	desc = "Used to stimulate burn healing."
 	icon_state = "pill11"
-	list_reagents = list(/datum/reagent/medicine/oxandrolone = 24)
+	list_reagents = list(/datum/reagent/medicine/ysiltane = 15)
 	rename_with_volume = TRUE
 
 /obj/item/reagent_containers/pill/insulin
@@ -195,13 +195,6 @@
 	icon_state = "pill22"
 	rename_with_volume = TRUE
 
-/obj/item/reagent_containers/pill/hsh
-	name = "HSH pill"
-	desc = "A pill of Human Sleep Hormone."
-	list_reagents = list(/datum/reagent/medicine/melatonin = 10)
-	icon_state = "pill22"
-	rename_with_volume = TRUE
-
 ///////////////////////////////////////// Psychologist inventory pills
 /obj/item/reagent_containers/pill/happinesspsych
 	name = "mood stabilizer pill"
@@ -286,17 +279,6 @@
 	icon_state = "pill18"
 	list_reagents = list(/datum/reagent/drug/finobranc = 5)
 
-/*WS Begin - No Cobbychem
-
-/obj/item/reagent_containers/pill/c2/probital
-	name = "Probital pill"
-	desc = "Used to treat brute damage of minor and moderate severity.The carving in the pill says 'Eat before ingesting'. Causes fatigue and diluted with granibitaluri."
-	icon_state = "pill12"
-	list_reagents = list(/datum/reagent/medicine/c2/probital = 5, /datum/reagent/medicine/granibitaluri = 10)
-	rename_with_volume = TRUE
-
-WS End */
-
 /obj/item/reagent_containers/pill/iron
 	name = "iron pill"
 	desc = "Used to reduce bloodloss slowly."
@@ -304,11 +286,11 @@ WS End */
 	list_reagents = list(/datum/reagent/iron = 30)
 	rename_with_volume = TRUE
 
-/obj/item/reagent_containers/pill/trophazole
-	name = "Trophazole pill"
+/obj/item/reagent_containers/pill/indomide
+	name = "indomide pill"
 	desc = "Used to treat brute damage of minor and moderate severity.The carving in the pill says 'Eat before ingesting'."
 	icon_state = "pill12"
-	list_reagents = list(/datum/reagent/medicine/trophazole = 15)
+	list_reagents = list(/datum/reagent/medicine/indomide = 15)
 	rename_with_volume = TRUE
 
 /obj/item/reagent_containers/pill/stardrop
@@ -323,11 +305,11 @@ WS End */
 	icon_state = "pill11"
 	list_reagents = list(/datum/reagent/drug/stardrop/starlight = 10)
 
-/obj/item/reagent_containers/spray/rhigoxane
-	name = "medical spray (rhigoxane)"
-	desc = "A medical spray bottle.This one contains rhigoxane, it is used to treat burns and cool down temperature if applied with spray."
+/obj/item/reagent_containers/spray/quardexane
+	name = "medical spray (quardexane)"
+	desc = "A medical spray bottle.This one contains quardexane, it is used to treat burns and cool down temperature if applied with spray."
 	icon_state = "sprayer"
-	list_reagents = list(/datum/reagent/medicine/rhigoxane = 100)
+	list_reagents = list(/datum/reagent/medicine/quardexane = 100)
 
 /obj/item/reagent_containers/pill/placebatol
 	name = "prescription pill"
diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm
index d4d0e3d425..a94250c9c3 100644
--- a/code/modules/reagents/reagent_containers/syringes.dm
+++ b/code/modules/reagents/reagent_containers/syringes.dm
@@ -189,11 +189,6 @@
 	desc = "Contains charcoal."
 	list_reagents = list(/datum/reagent/medicine/charcoal = 15)
 
-/obj/item/reagent_containers/syringe/perfluorodecalin
-	name = "syringe (perfluorodecalin)"
-	desc = "Contains perfluorodecalin."
-	list_reagents = list(/datum/reagent/medicine/perfluorodecalin = 15)
-
 /obj/item/reagent_containers/syringe/antiviral
 	name = "syringe (spaceacillin)"
 	desc = "Contains antiviral agents."
@@ -233,13 +228,6 @@
 	volume = 1
 	list_reagents = list(/datum/reagent/mulligan = 1)
 
-/obj/item/reagent_containers/syringe/gluttony
-	name = "Gluttony's Blessing"
-	desc = "A syringe recovered from a dread place. It probably isn't wise to use."
-	amount_per_transfer_from_this = 1
-	volume = 1
-	list_reagents = list(/datum/reagent/gluttonytoxin = 1)
-
 /obj/item/reagent_containers/syringe/bluespace
 	name = "bluespace syringe"
 	desc = "An advanced syringe that can hold 60 units of chemicals."
@@ -256,20 +244,20 @@
 	volume = 10
 	proj_piercing = 1
 
-/obj/item/reagent_containers/syringe/spider_extract
-	name = "spider extract syringe"
-	desc = "Contains crikey juice - makes any gold core create the most deadly companions in the world."
-	list_reagents = list(/datum/reagent/spider_extract = 1)
+/obj/item/reagent_containers/syringe/dexalin
+	name = "syringe (dexalin)"
+	desc = "Contains dexalin."
+	list_reagents = list(/datum/reagent/medicine/dexalin = 15)
 
-/obj/item/reagent_containers/syringe/oxandrolone
-	name = "syringe (oxandrolone)"
-	desc = "Contains oxandrolone, used to treat severe burns."
-	list_reagents = list(/datum/reagent/medicine/oxandrolone = 15)
+/obj/item/reagent_containers/syringe/ysiltane
+	name = "syringe (ysiltane)"
+	desc = "Contains ysiltane, used to treat severe burns."
+	list_reagents = list(/datum/reagent/medicine/ysiltane = 15)
 
-/obj/item/reagent_containers/syringe/salacid
-	name = "syringe (salicylic acid)"
+/obj/item/reagent_containers/syringe/silfrine
+	name = "syringe (silfrine)"
 	desc = "Contains salicylic acid, used to treat severe brute damage."
-	list_reagents = list(/datum/reagent/medicine/sal_acid = 15)
+	list_reagents = list(/datum/reagent/medicine/silfrine = 15)
 
 /obj/item/reagent_containers/syringe/penacid
 	name = "syringe (pentetic acid)"
@@ -292,16 +280,13 @@
 /obj/item/reagent_containers/syringe/contraband/mammoth
 	list_reagents = list(/datum/reagent/drug/mammoth = 15)
 
-/obj/item/reagent_containers/syringe/contraband/fentanyl
-	list_reagents = list(/datum/reagent/toxin/fentanyl = 15)
-
 /obj/item/reagent_containers/syringe/contraband/morphine
 	list_reagents = list(/datum/reagent/medicine/morphine = 15)
 
-/obj/item/reagent_containers/syringe/thializid
-	name = "syringe (thializid)"
-	desc = "Contains thializid, used to treat toxins and purge chemicals. The tag on the syringe states 'Inject one time per minute'."
-	list_reagents = list(/datum/reagent/medicine/thializid = 15)
+/obj/item/reagent_containers/syringe/pancrazine
+	name = "syringe (pancrazine)"
+	desc = "Contains pancrazine, used to treat toxins and purge chemicals. The tag on the syringe states 'Heat before injection'."
+	list_reagents = list(/datum/reagent/medicine/pancrazine = 15)
 
 /obj/item/reagent_containers/syringe/charcoal
 	name = "syringe (charcoal)"
diff --git a/code/modules/ruins/objects_and_mobs/sin_ruins.dm b/code/modules/ruins/objects_and_mobs/sin_ruins.dm
index 8f19fd40d9..9f7d6093ce 100644
--- a/code/modules/ruins/objects_and_mobs/sin_ruins.dm
+++ b/code/modules/ruins/objects_and_mobs/sin_ruins.dm
@@ -1,81 +1,5 @@
 //These objects are used in the cardinal sin-themed ruins (i.e. Gluttony, Pride...)
 
-/obj/structure/cursed_slot_machine //Greed's slot machine: Used in the Greed ruin. Deals clone damage on each use, with a successful use giving a d20 of fate.
-	name = "greed's slot machine"
-	desc = "High stakes, high rewards."
-	icon = 'icons/obj/economy.dmi'
-	icon_state = "slots1"
-	anchored = TRUE
-	density = TRUE
-	var/win_prob = 5
-
-/obj/structure/cursed_slot_machine/interact(mob/living/carbon/human/user)
-	if(!istype(user))
-		return
-	if(obj_flags & IN_USE)
-		return
-	if(isipc(user))
-		user.visible_message(span_warning(" As [user] tries to pull \the [src]'s lever, the machine seems to hesitate a bit."), span_warning("You feel as if you are trying to put at stake something you don't even have...\ You suddenly feel your mind... Suboptimal?"))
-		user.adjustOrganLoss(ORGAN_SLOT_BRAIN, 10)
-	else
-		user.adjustCloneLoss(20)
-	obj_flags |= IN_USE
-
-	if(user.stat)
-		to_chat(user, span_userdanger("No... just one more try..."))
-		user.gib()
-	else
-		user.visible_message(span_warning("[user] pulls [src]'s lever with a glint in [user.p_their()] eyes!"), "<span class='warning'>You feel a draining as you pull the lever, but you \
-		know it'll be worth it.</span>")
-	icon_state = "slots2"
-	playsound(src, 'sound/lavaland/cursed_slot_machine.ogg', 50, FALSE)
-	addtimer(CALLBACK(src, PROC_REF(determine_victor), user), 50)
-
-/obj/structure/cursed_slot_machine/proc/determine_victor(mob/living/user)
-	icon_state = "slots1"
-	obj_flags &= ~IN_USE
-	if(prob(win_prob))
-		playsound(src, 'sound/lavaland/cursed_slot_machine_jackpot.ogg', 50, FALSE)
-		new/obj/structure/cursed_money(get_turf(src))
-		if(user)
-			to_chat(user, span_boldwarning("You've hit jackpot. Laughter echoes around you as your reward appears in the machine's place."))
-		qdel(src)
-	else
-		if(user)
-			to_chat(user, span_boldwarning("Fucking machine! Must be rigged. Still... one more try couldn't hurt, right?"))
-
-
-/obj/structure/cursed_money
-	name = "bag of money"
-	desc = "RICH! YES! YOU KNEW IT WAS WORTH IT! YOU'RE RICH! RICH! RICH!"
-	icon = 'icons/obj/storage.dmi'
-	icon_state = "moneybag"
-	anchored = FALSE
-	density = TRUE
-
-/obj/structure/cursed_money/Initialize()
-	. = ..()
-	addtimer(CALLBACK(src, PROC_REF(collapse)), 600)
-
-/obj/structure/cursed_money/proc/collapse()
-	visible_message("<span class='warning'>[src] falls in on itself, \
-		canvas rotting away and contents vanishing.</span>")
-	qdel(src)
-
-/obj/structure/cursed_money/attack_hand(mob/living/user)
-	. = ..()
-	if(.)
-		return
-	user.visible_message("<span class='warning'>[user] opens the bag and \
-		and removes a die. The bag then vanishes.</span>",
-		"[span_boldwarning("You open the bag...!")]\n\
-		<span class='danger'>And see a bag full of dice. Confused, \
-		you take one... and the bag vanishes.</span>")
-	var/turf/T = get_turf(user)
-	var/obj/item/dice/d20/fate/one_use/critical_fail = new(T)
-	user.put_in_hands(critical_fail)
-	qdel(src)
-
 /obj/structure/mirror/magic/pride //Pride's mirror: Used in the Pride ruin.
 	name = "pride's mirror"
 	desc = "Pride cometh before the..."
diff --git a/code/modules/ruins/rockplanet_ruin_code.dm b/code/modules/ruins/rockplanet_ruin_code.dm
index 970265ab50..79a2e12535 100644
--- a/code/modules/ruins/rockplanet_ruin_code.dm
+++ b/code/modules/ruins/rockplanet_ruin_code.dm
@@ -116,4 +116,4 @@
 /obj/item/paper/crumpled/muddy/fluff/distillery
 	name = "distillery instructions"
 	desc = "A crumpled note soaked in alcohol."
-	default_raw_text = "<center><h3>Moonshine Instructions</h3><BR>Alright, I know some of y'all ain't literate enough for this, but if I'm ever found dead or missing, <i>read this note.</i> Gotta keep the craft alive.</center><br><br>1. Fill the still with around 5 units of enzyme. We keep the whole supply in the green crate in the storeroom.<br>2. Grind a cob of corn into bits, and add the mash to the still.<br>3. Pour an equal amount of sugar into the still, and stir.<br>4. Now, you'll have to scoop the product out and filter it by hand. We used to have a better still that'd filter the product itself, until last year's incident. This has to do for now.<br>5. Evaluate your product. Good 'shine is clear like water, and burns blue. If it ain't good, dump it.<BR><BR><i>PS: If you've got some leftover sugar, mix it into bicaridine. Equal parts sugar, carbon, and oxygen makes a potent salve for your wounds.</i>"
+	default_raw_text = "<center><h3>Moonshine Instructions</h3><BR>Alright, I know some of y'all ain't literate enough for this, but if I'm ever found dead or missing, <i>read this note.</i> Gotta keep the craft alive.</center><br><br>1. Fill the still with around 5 units of enzyme. We keep the whole supply in the green crate in the storeroom.<br>2. Grind a cob of corn into bits, and add the mash to the still.<br>3. Pour an equal amount of sugar into the still, and stir.<br>4. Now, you'll have to scoop the product out and filter it by hand. We used to have a better still that'd filter the product itself, until last year's incident. This has to do for now.<br>5. Evaluate your product. Good 'shine is clear like water, and burns blue. If it ain't good, dump it.<BR><BR>."
diff --git a/code/modules/shuttle/on_move.dm b/code/modules/shuttle/on_move.dm
index fb768f77d9..8566efbd15 100644
--- a/code/modules/shuttle/on_move.dm
+++ b/code/modules/shuttle/on_move.dm
@@ -36,7 +36,7 @@ All ShuttleMove procs go here
 				M.visible_message(span_warning("[shuttle] slams into [M]!"))
 				SSblackbox.record_feedback("tally", "shuttle_gib", 1, M.type)
 				log_attack("[key_name(M)] was shuttle gibbed by [shuttle].")
-				if(isanimal(M))
+				if(isanimal(M) || isbasicmob(M))
 					qdel(M)
 				else
 					M.gib()
diff --git a/code/modules/surgery/bodyparts/bodyparts.dm b/code/modules/surgery/bodyparts/bodyparts.dm
index b310fc4813..477a00dc5f 100644
--- a/code/modules/surgery/bodyparts/bodyparts.dm
+++ b/code/modules/surgery/bodyparts/bodyparts.dm
@@ -559,7 +559,7 @@
 		if(updating_health)
 			owner.updatehealth()
 		if(owner.dna?.species && (REVIVESBYHEALING in owner.dna.species.species_traits))
-			if(owner.health > 0 && !owner.hellbound)
+			if(owner.health > 0)
 				owner.revive(FALSE)
 				owner.cure_husk() // If it has REVIVESBYHEALING, it probably can't be cloned. No husk cure.
 	cremation_progress = min(0, cremation_progress - ((brute_dam + burn_dam)*(100/max_damage)))
diff --git a/code/modules/surgery/organs/ears.dm b/code/modules/surgery/organs/ears.dm
index 46a52b12dd..dc742f411b 100644
--- a/code/modules/surgery/organs/ears.dm
+++ b/code/modules/surgery/organs/ears.dm
@@ -238,6 +238,25 @@
 		ear_owner.dna.species.mutant_bodyparts -= "ears"
 		ear_owner.update_body()
 
+/obj/item/organ/ears/horse
+	name = "horse ears"
+
+/obj/item/organ/ears/horse/Insert(mob/living/carbon/human/ear_owner, special = 0, drop_if_replaced = TRUE)
+	..()
+	if(istype(ear_owner))
+		color = ear_owner.hair_color
+		ear_owner.dna.species.mutant_bodyparts |= "ears"
+		ear_owner.dna.features["ears"] = "Horse"
+		ear_owner.update_body()
+
+/obj/item/organ/ears/horse/Remove(mob/living/carbon/human/ear_owner,  special = 0)
+	..()
+	if(istype(ear_owner))
+		color = ear_owner.hair_color
+		ear_owner.dna.features["ears"] = "None"
+		ear_owner.dna.species.mutant_bodyparts -= "ears"
+		ear_owner.update_body()
+
 /obj/item/organ/ears/elf
 	name = "elf ears"
 
diff --git a/code/modules/surgery/organs/tails.dm b/code/modules/surgery/organs/tails.dm
index be43bc99f6..62686d1379 100644
--- a/code/modules/surgery/organs/tails.dm
+++ b/code/modules/surgery/organs/tails.dm
@@ -194,3 +194,24 @@
 		H.dna.species.mutant_bodyparts -= "tail_human"
 		color = H.hair_color
 		H.update_body()
+
+/obj/item/organ/tail/horse
+	name = "horse tail"
+	desc = "A severed horse tail, not of the flora variety."
+	tail_type = "Horse"
+
+/obj/item/organ/tail/horse/Insert(mob/living/carbon/human/H, special = 0, drop_if_replaced = TRUE)
+	..()
+	if(istype(H))
+		if(!("tail_human" in H.dna.species.mutant_bodyparts))
+			H.dna.species.mutant_bodyparts |= "tail_human"
+			H.dna.features["tail_human"] = tail_type
+			H.update_body()
+
+/obj/item/organ/tail/horse/Remove(mob/living/carbon/human/H,  special = 0)
+	..()
+	if(istype(H))
+		H.dna.features["tail_human"] = "None"
+		H.dna.species.mutant_bodyparts -= "tail_human"
+		color = H.hair_color
+		H.update_body()
diff --git a/code/modules/surgery/revival.dm b/code/modules/surgery/revival.dm
index 40b24a82e4..1c9d9669b8 100644
--- a/code/modules/surgery/revival.dm
+++ b/code/modules/surgery/revival.dm
@@ -18,7 +18,7 @@
 		return FALSE
 	if(target.stat != DEAD)
 		return FALSE
-	if(target.hellbound || HAS_TRAIT(target, TRAIT_HUSK))
+	if(HAS_TRAIT(target, TRAIT_HUSK))
 		return FALSE
 	if(!is_valid_target(target)) //PENTEST CHANGE START
 		return FALSE
diff --git a/code/modules/uplink/uplink_items.dm b/code/modules/uplink/uplink_items.dm
index 913490368f..5c8900d812 100644
--- a/code/modules/uplink/uplink_items.dm
+++ b/code/modules/uplink/uplink_items.dm
@@ -1350,14 +1350,6 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
 	item = /obj/item/healthanalyzer/rad_laser
 	cost = 3
 
-/datum/uplink_item/device_tools/stimpack
-	name = "Stimpack"
-	desc = "Stimpacks, the tool of many great heroes, make you nearly immune to stuns and knockdowns for about \
-			5 minutes after injection."
-	item = /obj/item/reagent_containers/hypospray/medipen/stimulants
-	cost = 5
-	surplus = 90
-
 /datum/uplink_item/device_tools/medkit
 	name = "Syndicate Combat Medic Kit"
 	desc = "This first aid kit is a suspicious brown and red. Included is a combat stimulant injector \
@@ -1600,16 +1592,6 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
 	restricted_roles = list("Medical Doctor", "Chief Medical Officer", "Roboticist")
 	cost = 5
 
-/datum/uplink_item/role_restricted/spider_injector
-	name = "Australicus Slime Mutator"
-	desc = "Crikey mate, it's been a wild travel from the Australicus sector but we've managed to get \
-			some special spider extract from the giant spiders down there. Use this injector on a gold slime core \
-			to create a few of the same type of spiders we found on the planets over there. They're a bit tame until you \
-			also give them a bit of sentience though."
-	item = /obj/item/reagent_containers/syringe/spider_extract
-	cost = 10
-	restricted_roles = list("Research Director", "Scientist", "Roboticist")
-
 /datum/uplink_item/role_restricted/concealed_weapon_bay
 	name = "Concealed Weapon Bay"
 	desc = "A modification for civilian exosuits that allows them to equip one piece of equipment designed for combat exosuits. \
@@ -1635,15 +1617,6 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
 	cost = 14
 	item = /obj/vehicle/ridden/lawnmower/emagged
 
-/datum/uplink_item/role_restricted/explosive_hot_potato
-	name = "Exploding Hot Potato"
-	desc = "A potato rigged with explosives. On activation, a special mechanism is activated that prevents it from being dropped. \
-			The only way to get rid of it if you are holding it is to attack someone else with it, causing it to latch to that person instead."
-	item = /obj/item/hot_potato/syndicate
-	cost = 4
-	surplus = 0
-	restricted_roles = list("Cook", "Botanist")
-
 /datum/uplink_item/role_restricted/ez_clean_bundle
 	name = "EZ Clean Grenade Bundle"
 	desc = "A box with three cleaner grenades using the trademark Waffle Co. formula. Serves as a cleaner and causes acid damage to anyone standing nearby. \
@@ -1743,7 +1716,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
 
 /datum/uplink_item/badass/syndiecigs
 	name = "Syndicate Smokes"
-	desc = "Strong flavor, dense smoke, infused with omnizine."
+	desc = "Strong flavor, dense smoke, infused with panacea."
 	item = /obj/item/storage/fancy/cigarettes/cigpack_syndicate
 	cost = 2
 	illegal_tech = FALSE
diff --git a/code/modules/vending/clothesmate.dm b/code/modules/vending/clothesmate.dm
index 665ff77671..4d2a4b7aa4 100644
--- a/code/modules/vending/clothesmate.dm
+++ b/code/modules/vending/clothesmate.dm
@@ -106,6 +106,7 @@
 		/obj/item/clothing/shoes/laceup = 2,
 		/obj/item/clothing/shoes/sandal = 2,
 		/obj/item/clothing/shoes/jackboots = 2,
+		/obj/item/clothing/shoes/heels = 4,
 		/obj/item/clothing/suit/jacket/miljacket = 1,
 		/obj/item/clothing/suit/apron/purple_bartender = 2,
 		/obj/item/clothing/under/rank/civilian/bartender/purple = 2,
diff --git a/code/modules/vending/medical.dm b/code/modules/vending/medical.dm
index 26fe1f2c58..6f6986bda5 100644
--- a/code/modules/vending/medical.dm
+++ b/code/modules/vending/medical.dm
@@ -11,18 +11,17 @@
 		/obj/item/reagent_containers/syringe = 5,
 		/obj/item/reagent_containers/dropper = 2,
 		/obj/item/healthanalyzer = 2,
-		/obj/item/reagent_containers/pill/patch/styptic = 5,
-		/obj/item/reagent_containers/pill/patch/silver_sulf = 5,
+		/obj/item/reagent_containers/pill/patch/indomide = 5,
+		/obj/item/reagent_containers/pill/patch/alvitane = 5,
 		/obj/item/reagent_containers/hypospray/medipen = 3,
-		/obj/item/reagent_containers/syringe/perfluorodecalin = 2,
 		/obj/item/reagent_containers/syringe/antiviral = 1,
 		/obj/item/reagent_containers/glass/bottle/charcoal = 3,
 		/obj/item/reagent_containers/glass/bottle/epinephrine = 3,
 		/obj/item/reagent_containers/glass/bottle/morphine = 1,
 		/obj/item/reagent_containers/glass/bottle/potass_iodide = 1,
 		/obj/item/reagent_containers/glass/bottle/salglu_solution = 3,
-		/obj/item/reagent_containers/medigel/styptic = 1,
-		/obj/item/reagent_containers/medigel/silver_sulf = 1,
+		/obj/item/reagent_containers/medigel/hadrakine = 1,
+		/obj/item/reagent_containers/medigel/quardexane = 1,
 		/obj/item/reagent_containers/medigel/synthflesh = 1,
 		/obj/item/reagent_containers/medigel/sterilizine = 1,
 		/obj/item/sensor_device = 1,
diff --git a/code/modules/vending/medical_wall.dm b/code/modules/vending/medical_wall.dm
index 61a413a963..351388b1e6 100644
--- a/code/modules/vending/medical_wall.dm
+++ b/code/modules/vending/medical_wall.dm
@@ -25,7 +25,7 @@
 		/obj/item/reagent_containers/hypospray/medipen/psicodine = 6,
 		/obj/item/reagent_containers/hypospray/medipen/synap = 6,
 		/obj/item/reagent_containers/hypospray/medipen/mannitol = 10,
-		/obj/item/reagent_containers/hypospray/medipen/tricord = 6,
+		/obj/item/reagent_containers/hypospray/medipen/cureall = 6,
 		/obj/item/reagent_containers/hypospray/medipen/tramal = 6,
 		/obj/item/reagent_containers/hypospray/medipen/antihol = 10,
 		/obj/item/reagent_containers/hypospray/medipen/anti_rad = 10,
@@ -34,8 +34,8 @@
 		/obj/item/reagent_containers/syringe/antiviral = 4
 	)
 	premium = list(
-		/obj/item/reagent_containers/medigel/styptic = 3,
-		/obj/item/reagent_containers/medigel/silver_sulf = 3,
+		/obj/item/reagent_containers/medigel/hadrakine = 3,
+		/obj/item/reagent_containers/medigel/quardexane = 3,
 		/obj/item/storage/pill_bottle/stardrop = 5,
 	)
 
diff --git a/icons/mob/clothing/faction/gezena/back.dmi b/icons/mob/clothing/faction/gezena/back.dmi
deleted file mode 100644
index 1c5ef723b0..0000000000
Binary files a/icons/mob/clothing/faction/gezena/back.dmi and /dev/null differ
diff --git a/icons/mob/clothing/faction/gezena/belt.dmi b/icons/mob/clothing/faction/gezena/belt.dmi
index 754c9e68f2..4f205db654 100644
Binary files a/icons/mob/clothing/faction/gezena/belt.dmi and b/icons/mob/clothing/faction/gezena/belt.dmi differ
diff --git a/icons/mob/clothing/faction/gezena/eyes.dmi b/icons/mob/clothing/faction/gezena/eyes.dmi
new file mode 100644
index 0000000000..abe3fd51a3
Binary files /dev/null and b/icons/mob/clothing/faction/gezena/eyes.dmi differ
diff --git a/icons/mob/clothing/faction/gezena/feet.dmi b/icons/mob/clothing/faction/gezena/feet.dmi
index f0d1fb0a65..48709555c2 100644
Binary files a/icons/mob/clothing/faction/gezena/feet.dmi and b/icons/mob/clothing/faction/gezena/feet.dmi differ
diff --git a/icons/mob/clothing/faction/gezena/hands.dmi b/icons/mob/clothing/faction/gezena/hands.dmi
index 8e9a99d30d..629e1fb441 100644
Binary files a/icons/mob/clothing/faction/gezena/hands.dmi and b/icons/mob/clothing/faction/gezena/hands.dmi differ
diff --git a/icons/mob/clothing/faction/gezena/head.dmi b/icons/mob/clothing/faction/gezena/head.dmi
index 9ce4d05d3c..b5abfd33ab 100644
Binary files a/icons/mob/clothing/faction/gezena/head.dmi and b/icons/mob/clothing/faction/gezena/head.dmi differ
diff --git a/icons/mob/clothing/faction/gezena/kepori.dmi b/icons/mob/clothing/faction/gezena/kepori.dmi
index 5fde3592da..5b0af35ff7 100644
Binary files a/icons/mob/clothing/faction/gezena/kepori.dmi and b/icons/mob/clothing/faction/gezena/kepori.dmi differ
diff --git a/icons/mob/clothing/faction/gezena/mask.dmi b/icons/mob/clothing/faction/gezena/mask.dmi
new file mode 100644
index 0000000000..6c222c4584
Binary files /dev/null and b/icons/mob/clothing/faction/gezena/mask.dmi differ
diff --git a/icons/mob/clothing/faction/gezena/neck.dmi b/icons/mob/clothing/faction/gezena/neck.dmi
index 50b6d05fa9..2c93d822e4 100644
Binary files a/icons/mob/clothing/faction/gezena/neck.dmi and b/icons/mob/clothing/faction/gezena/neck.dmi differ
diff --git a/icons/mob/clothing/faction/gezena/suits.dmi b/icons/mob/clothing/faction/gezena/suits.dmi
index a5a6e864dd..c627657a25 100644
Binary files a/icons/mob/clothing/faction/gezena/suits.dmi and b/icons/mob/clothing/faction/gezena/suits.dmi differ
diff --git a/icons/mob/clothing/faction/gezena/uniforms.dmi b/icons/mob/clothing/faction/gezena/uniforms.dmi
index 4f3d45acbe..ff8336b542 100644
Binary files a/icons/mob/clothing/faction/gezena/uniforms.dmi and b/icons/mob/clothing/faction/gezena/uniforms.dmi differ
diff --git a/icons/mob/clothing/faction/gezena/vox.dmi b/icons/mob/clothing/faction/gezena/vox.dmi
index b8185d1d4b..c303096d1c 100644
Binary files a/icons/mob/clothing/faction/gezena/vox.dmi and b/icons/mob/clothing/faction/gezena/vox.dmi differ
diff --git a/icons/mob/clothing/faction/inteq/hats.dmi b/icons/mob/clothing/faction/inteq/hats.dmi
index 54e859e8c5..a09ab2adad 100644
Binary files a/icons/mob/clothing/faction/inteq/hats.dmi and b/icons/mob/clothing/faction/inteq/hats.dmi differ
diff --git a/icons/mob/clothing/faction/inteq/kepori.dmi b/icons/mob/clothing/faction/inteq/kepori.dmi
index 8b5a4cafaa..e7ec7d7a79 100644
Binary files a/icons/mob/clothing/faction/inteq/kepori.dmi and b/icons/mob/clothing/faction/inteq/kepori.dmi differ
diff --git a/icons/mob/clothing/faction/inteq/suits.dmi b/icons/mob/clothing/faction/inteq/suits.dmi
index cdd51a244a..0a6b4298ed 100644
Binary files a/icons/mob/clothing/faction/inteq/suits.dmi and b/icons/mob/clothing/faction/inteq/suits.dmi differ
diff --git a/icons/mob/clothing/faction/inteq/vox.dmi b/icons/mob/clothing/faction/inteq/vox.dmi
index 4095367087..30afd7b140 100644
Binary files a/icons/mob/clothing/faction/inteq/vox.dmi and b/icons/mob/clothing/faction/inteq/vox.dmi differ
diff --git a/icons/mob/clothing/faction/nanotrasen/vox.dmi b/icons/mob/clothing/faction/nanotrasen/vox.dmi
index c5793cc610..4bb36a51a8 100644
Binary files a/icons/mob/clothing/faction/nanotrasen/vox.dmi and b/icons/mob/clothing/faction/nanotrasen/vox.dmi differ
diff --git a/icons/mob/clothing/feet/color.dmi b/icons/mob/clothing/feet/color.dmi
index 52354a7db3..54a4a094ff 100644
Binary files a/icons/mob/clothing/feet/color.dmi and b/icons/mob/clothing/feet/color.dmi differ
diff --git a/icons/mob/clothing/hands.dmi b/icons/mob/clothing/hands.dmi
index 89d78cf7f9..1e9a49864a 100644
Binary files a/icons/mob/clothing/hands.dmi and b/icons/mob/clothing/hands.dmi differ
diff --git a/icons/mob/clothing/mask.dmi b/icons/mob/clothing/mask.dmi
index ef0ce35ba4..d5b4ca6727 100644
Binary files a/icons/mob/clothing/mask.dmi and b/icons/mob/clothing/mask.dmi differ
diff --git a/icons/mob/clothing/under/shorts_pants.dmi b/icons/mob/clothing/under/shorts_pants.dmi
index fe81cb426f..b42043fa50 100644
Binary files a/icons/mob/clothing/under/shorts_pants.dmi and b/icons/mob/clothing/under/shorts_pants.dmi differ
diff --git a/icons/mob/clothing/underwear/underwear_socks.dmi b/icons/mob/clothing/underwear/underwear_socks.dmi
index 7ce7442281..10be756d29 100644
Binary files a/icons/mob/clothing/underwear/underwear_socks.dmi and b/icons/mob/clothing/underwear/underwear_socks.dmi differ
diff --git a/icons/mob/clothing/underwear/underwear_torso.dmi b/icons/mob/clothing/underwear/underwear_torso.dmi
index 534f381afa..4e345525eb 100644
Binary files a/icons/mob/clothing/underwear/underwear_torso.dmi and b/icons/mob/clothing/underwear/underwear_torso.dmi differ
diff --git a/icons/mob/ethereal_parts.dmi b/icons/mob/ethereal_parts.dmi
index 4ffb84e662..04fcc1f33c 100644
Binary files a/icons/mob/ethereal_parts.dmi and b/icons/mob/ethereal_parts.dmi differ
diff --git a/icons/mob/human_face.dmi b/icons/mob/human_face.dmi
index 4d7df56e98..d79b945b80 100644
Binary files a/icons/mob/human_face.dmi and b/icons/mob/human_face.dmi differ
diff --git a/icons/mob/inhands/faction/gezena/gezena_lefthand.dmi b/icons/mob/inhands/faction/gezena/gezena_lefthand.dmi
index 002fd97daf..14a6c5bea4 100644
Binary files a/icons/mob/inhands/faction/gezena/gezena_lefthand.dmi and b/icons/mob/inhands/faction/gezena/gezena_lefthand.dmi differ
diff --git a/icons/mob/inhands/faction/gezena/gezena_righthand.dmi b/icons/mob/inhands/faction/gezena/gezena_righthand.dmi
index 0c2bd04790..0982c42025 100644
Binary files a/icons/mob/inhands/faction/gezena/gezena_righthand.dmi and b/icons/mob/inhands/faction/gezena/gezena_righthand.dmi differ
diff --git a/icons/mob/inhands/faction/inteq/inteq_lefthand.dmi b/icons/mob/inhands/faction/inteq/inteq_lefthand.dmi
new file mode 100644
index 0000000000..946d77cd07
Binary files /dev/null and b/icons/mob/inhands/faction/inteq/inteq_lefthand.dmi differ
diff --git a/icons/mob/inhands/faction/inteq/inteq_righthand.dmi b/icons/mob/inhands/faction/inteq/inteq_righthand.dmi
new file mode 100644
index 0000000000..bd0b9d7b64
Binary files /dev/null and b/icons/mob/inhands/faction/inteq/inteq_righthand.dmi differ
diff --git a/icons/mob/species/human/horse.dmi b/icons/mob/species/human/horse.dmi
new file mode 100644
index 0000000000..47423f5c38
Binary files /dev/null and b/icons/mob/species/human/horse.dmi differ
diff --git a/icons/mob/species/kepori/onmob_feet_kepori.dmi b/icons/mob/species/kepori/onmob_feet_kepori.dmi
index 2fef9cc06e..29a5c24b86 100644
Binary files a/icons/mob/species/kepori/onmob_feet_kepori.dmi and b/icons/mob/species/kepori/onmob_feet_kepori.dmi differ
diff --git a/icons/mob/species/kepori/onmob_head_kepori.dmi b/icons/mob/species/kepori/onmob_head_kepori.dmi
index 8a7299f5c7..75135e7ab5 100644
Binary files a/icons/mob/species/kepori/onmob_head_kepori.dmi and b/icons/mob/species/kepori/onmob_head_kepori.dmi differ
diff --git a/icons/mob/species/kepori/onmob_mask_kepori.dmi b/icons/mob/species/kepori/onmob_mask_kepori.dmi
index e821efaab9..25bbe0b4ab 100644
Binary files a/icons/mob/species/kepori/onmob_mask_kepori.dmi and b/icons/mob/species/kepori/onmob_mask_kepori.dmi differ
diff --git a/icons/mob/species/kepori/onmob_suit_kepori.dmi b/icons/mob/species/kepori/onmob_suit_kepori.dmi
index 77e67241a4..263f241c02 100644
Binary files a/icons/mob/species/kepori/onmob_suit_kepori.dmi and b/icons/mob/species/kepori/onmob_suit_kepori.dmi differ
diff --git a/icons/mob/species/lizard/frills.dmi b/icons/mob/species/lizard/frills.dmi
index beeb7887b8..a08be3fdb5 100644
Binary files a/icons/mob/species/lizard/frills.dmi and b/icons/mob/species/lizard/frills.dmi differ
diff --git a/icons/mob/species/lizard/markings.dmi b/icons/mob/species/lizard/markings.dmi
index 4d0ff37360..baf1872770 100644
Binary files a/icons/mob/species/lizard/markings.dmi and b/icons/mob/species/lizard/markings.dmi differ
diff --git a/icons/mob/species/misc/digitigrade.dmi b/icons/mob/species/misc/digitigrade.dmi
index 675b55a052..0ae5516421 100644
Binary files a/icons/mob/species/misc/digitigrade.dmi and b/icons/mob/species/misc/digitigrade.dmi differ
diff --git a/icons/mob/species/misc/digitigrade_shoes.dmi b/icons/mob/species/misc/digitigrade_shoes.dmi
index b87c2a15d3..ab09807817 100644
Binary files a/icons/mob/species/misc/digitigrade_shoes.dmi and b/icons/mob/species/misc/digitigrade_shoes.dmi differ
diff --git a/icons/mob/species/misc/digitigrade_suits.dmi b/icons/mob/species/misc/digitigrade_suits.dmi
index 7a4d49d2ab..01533ff870 100644
Binary files a/icons/mob/species/misc/digitigrade_suits.dmi and b/icons/mob/species/misc/digitigrade_suits.dmi differ
diff --git a/icons/mob/species/vox/onmob_feet_vox.dmi b/icons/mob/species/vox/onmob_feet_vox.dmi
index 0b06074851..cbd214fb76 100644
Binary files a/icons/mob/species/vox/onmob_feet_vox.dmi and b/icons/mob/species/vox/onmob_feet_vox.dmi differ
diff --git a/icons/obj/clothing/faction/gezena/belt.dmi b/icons/obj/clothing/faction/gezena/belt.dmi
index b076763862..f82956c080 100644
Binary files a/icons/obj/clothing/faction/gezena/belt.dmi and b/icons/obj/clothing/faction/gezena/belt.dmi differ
diff --git a/icons/obj/clothing/faction/gezena/eyes.dmi b/icons/obj/clothing/faction/gezena/eyes.dmi
new file mode 100644
index 0000000000..87f6050076
Binary files /dev/null and b/icons/obj/clothing/faction/gezena/eyes.dmi differ
diff --git a/icons/obj/clothing/faction/gezena/feet.dmi b/icons/obj/clothing/faction/gezena/feet.dmi
index f3a23a70de..48ac3796b1 100644
Binary files a/icons/obj/clothing/faction/gezena/feet.dmi and b/icons/obj/clothing/faction/gezena/feet.dmi differ
diff --git a/icons/obj/clothing/faction/gezena/hands.dmi b/icons/obj/clothing/faction/gezena/hands.dmi
index 3daa7c762d..36f0aaaf25 100644
Binary files a/icons/obj/clothing/faction/gezena/hands.dmi and b/icons/obj/clothing/faction/gezena/hands.dmi differ
diff --git a/icons/obj/clothing/faction/gezena/head.dmi b/icons/obj/clothing/faction/gezena/head.dmi
index faf3c7ac11..9011d17879 100644
Binary files a/icons/obj/clothing/faction/gezena/head.dmi and b/icons/obj/clothing/faction/gezena/head.dmi differ
diff --git a/icons/obj/clothing/faction/gezena/mask.dmi b/icons/obj/clothing/faction/gezena/mask.dmi
new file mode 100644
index 0000000000..4d1fbfeaca
Binary files /dev/null and b/icons/obj/clothing/faction/gezena/mask.dmi differ
diff --git a/icons/obj/clothing/faction/gezena/neck.dmi b/icons/obj/clothing/faction/gezena/neck.dmi
index 89617ced9b..5ee9c3a107 100644
Binary files a/icons/obj/clothing/faction/gezena/neck.dmi and b/icons/obj/clothing/faction/gezena/neck.dmi differ
diff --git a/icons/obj/clothing/faction/gezena/suits.dmi b/icons/obj/clothing/faction/gezena/suits.dmi
index f115778221..38d86f889c 100644
Binary files a/icons/obj/clothing/faction/gezena/suits.dmi and b/icons/obj/clothing/faction/gezena/suits.dmi differ
diff --git a/icons/obj/clothing/faction/gezena/uniforms.dmi b/icons/obj/clothing/faction/gezena/uniforms.dmi
index ed9a863e3d..67441d1b08 100644
Binary files a/icons/obj/clothing/faction/gezena/uniforms.dmi and b/icons/obj/clothing/faction/gezena/uniforms.dmi differ
diff --git a/icons/obj/clothing/faction/inteq/hats.dmi b/icons/obj/clothing/faction/inteq/hats.dmi
index 19100f555d..f854405617 100644
Binary files a/icons/obj/clothing/faction/inteq/hats.dmi and b/icons/obj/clothing/faction/inteq/hats.dmi differ
diff --git a/icons/obj/clothing/faction/inteq/suits.dmi b/icons/obj/clothing/faction/inteq/suits.dmi
index 0787bf36cd..a1f2a41857 100644
Binary files a/icons/obj/clothing/faction/inteq/suits.dmi and b/icons/obj/clothing/faction/inteq/suits.dmi differ
diff --git a/icons/obj/clothing/feet/color.dmi b/icons/obj/clothing/feet/color.dmi
index 37f3f50f21..5780b1d8d4 100644
Binary files a/icons/obj/clothing/feet/color.dmi and b/icons/obj/clothing/feet/color.dmi differ
diff --git a/icons/obj/clothing/gloves.dmi b/icons/obj/clothing/gloves.dmi
index e33074862f..d6ff4a1663 100644
Binary files a/icons/obj/clothing/gloves.dmi and b/icons/obj/clothing/gloves.dmi differ
diff --git a/icons/obj/clothing/masks.dmi b/icons/obj/clothing/masks.dmi
index 111b6557bd..6214774cda 100644
Binary files a/icons/obj/clothing/masks.dmi and b/icons/obj/clothing/masks.dmi differ
diff --git a/icons/obj/clothing/under/shorts_pants.dmi b/icons/obj/clothing/under/shorts_pants.dmi
index 18b249e962..616dcdba9d 100644
Binary files a/icons/obj/clothing/under/shorts_pants.dmi and b/icons/obj/clothing/under/shorts_pants.dmi differ
diff --git a/icons/obj/guns/manufacturer/inteq/48x32.dmi b/icons/obj/guns/manufacturer/inteq/48x32.dmi
index 7d8d882b8e..fac5127296 100644
Binary files a/icons/obj/guns/manufacturer/inteq/48x32.dmi and b/icons/obj/guns/manufacturer/inteq/48x32.dmi differ
diff --git a/icons/obj/guns/manufacturer/serene_outdoors/48x32.dmi b/icons/obj/guns/manufacturer/serene_outdoors/48x32.dmi
index ffbf1589af..e1c0bfca72 100644
Binary files a/icons/obj/guns/manufacturer/serene_outdoors/48x32.dmi and b/icons/obj/guns/manufacturer/serene_outdoors/48x32.dmi differ
diff --git a/icons/turf/decals/decals.dmi b/icons/turf/decals/decals.dmi
index 46d7a78e9c..87f6948c4f 100644
Binary files a/icons/turf/decals/decals.dmi and b/icons/turf/decals/decals.dmi differ
diff --git a/modular_pentest/master_files/code/modules/reagents/chemistry/reagents/medical_reagents/medicine_reagents.dm b/modular_pentest/master_files/code/modules/reagents/chemistry/reagents/medical_reagents/medicine_reagents.dm
new file mode 100644
index 0000000000..06476c39f1
--- /dev/null
+++ b/modular_pentest/master_files/code/modules/reagents/chemistry/reagents/medical_reagents/medicine_reagents.dm
@@ -0,0 +1,24 @@
+/datum/reagent/medicine/antihol
+	process_flags = ORGANIC | SYNTHETIC
+
+/datum/reagent/medicine/regen_jelly
+	name = "Regenerative Jelly"
+	description = "Gradually regenerates all types of damage, without harming slime anatomy."
+	reagent_state = LIQUID
+	color = "#CC23FF"
+	taste_description = "jelly"
+
+/datum/reagent/medicine/regen_jelly/expose_mob(mob/living/M, reac_volume)
+	if(M && ishuman(M) && reac_volume >= 0.5)
+		var/mob/living/carbon/human/H = M
+		H.hair_color = "C2F"
+		H.facial_hair_color = "C2F"
+		H.update_hair()
+
+/datum/reagent/medicine/regen_jelly/on_mob_life(mob/living/carbon/M)
+	M.adjustBruteLoss(-1.5*REM, 0)
+	M.adjustFireLoss(-1.5*REM, 0)
+	M.adjustOxyLoss(-1.5*REM, 0)
+	M.adjustToxLoss(-1.5*REM, 0, TRUE) //heals TOXINLOVERs
+	..()
+	. = 1
diff --git a/modular_pentest/master_files/code/modules/reagents/chemistry/reagents/medicine_reagents.dm b/modular_pentest/master_files/code/modules/reagents/chemistry/reagents/medicine_reagents.dm
deleted file mode 100644
index 666fc33f08..0000000000
--- a/modular_pentest/master_files/code/modules/reagents/chemistry/reagents/medicine_reagents.dm
+++ /dev/null
@@ -1,2 +0,0 @@
-/datum/reagent/medicine/antihol
-	process_flags = ORGANIC | SYNTHETIC
diff --git a/modular_pentest/master_files/code/modules/reagents/chemistry/reagents/other_reagents.dm b/modular_pentest/master_files/code/modules/reagents/chemistry/reagents/other_reagents.dm
index 180ca854af..c00a9f8c2e 100644
--- a/modular_pentest/master_files/code/modules/reagents/chemistry/reagents/other_reagents.dm
+++ b/modular_pentest/master_files/code/modules/reagents/chemistry/reagents/other_reagents.dm
@@ -34,3 +34,80 @@
 		return
 	holder.remove_reagent(type, 0.4)	//fixed consumption to prevent balancing going out of whack
 
+/datum/reagent/fuel/unholywater		//if you somehow managed to extract this from someone, dont splash it on yourself and have a smoke
+	name = "Unholy Water"
+	description = "Something that shouldn't exist on this plane of existence."
+	taste_description = "suffering"
+
+/datum/reagent/fuel/unholywater/expose_mob(mob/living/M, method=TOUCH, reac_volume)
+	if((method == TOUCH || method == SMOKE) || method == VAPOR)
+		M.reagents.add_reagent(type,reac_volume/4)
+		return
+	return ..()
+
+/datum/reagent/fuel/unholywater/on_mob_life(mob/living/carbon/M)
+	// Will deal about 90 damage when 50 units are thrown
+	M.adjustOrganLoss(ORGAN_SLOT_BRAIN, 3, 150)
+	M.adjustToxLoss(2, 0)
+	M.adjustFireLoss(2, 0)
+	M.adjustOxyLoss(2, 0)
+	M.adjustBruteLoss(2, 0)
+	holder.remove_reagent(type, 1)
+	return TRUE
+
+/datum/reagent/hellwater			//if someone has this in their system they've really pissed off an eldrich god
+	name = "Hell Water"
+	description = "YOUR FLESH! IT BURNS!"
+	taste_description = "burning"
+	accelerant_quality = 20
+	process_flags = ORGANIC | SYNTHETIC
+
+/datum/reagent/hellwater/on_mob_life(mob/living/carbon/M)
+	M.fire_stacks = min(5,M.fire_stacks + 3)
+	M.IgniteMob()			//Only problem with igniting people is currently the commonly availible fire suits make you immune to being on fire
+	M.adjustToxLoss(1, 0)
+	M.adjustFireLoss(1, 0)		//Hence the other damages... ain't I a bastard?
+	M.adjustOrganLoss(ORGAN_SLOT_BRAIN, 5, 150)
+	holder.remove_reagent(type, 1)
+
+/datum/reagent/medicine/omnizine/godblood
+	name = "Godblood"
+	description = "Slowly heals all damage types. Has a rather high overdose threshold. Glows with mysterious power."
+	overdose_threshold = 150
+
+/datum/reagent/lube
+	name = "Space Lube"
+	description = "Lubricant is a substance introduced between two moving surfaces to reduce the friction and wear between them. giggity."
+
+///Stronger kind of lube. Applies TURF_WET_SUPERLUBE.
+/datum/reagent/lube/superlube
+	name = "Super Duper Lube"
+	description = "This \[REDACTED\] has been outlawed after the incident on \[DATA EXPUNGED\]."
+	lube_kind = TURF_WET_SUPERLUBE
+
+/datum/reagent/aslimetoxin
+	name = "Advanced Mutation Toxin"
+	description = "An advanced corruptive toxin produced by slimes."
+	color = "#13BC5E" // rgb: 19, 188, 94
+	taste_description = "slime"
+
+/datum/reagent/aslimetoxin/expose_mob(mob/living/L, method=TOUCH, reac_volume)
+	if(method != TOUCH && method != SMOKE)
+		L.ForceContractDisease(new /datum/disease/transformation/slime(), FALSE, TRUE)
+
+/datum/reagent/gluttonytoxin
+	name = "Gluttony's Blessing"
+	description = "An advanced corruptive toxin produced by something terrible."
+	color = "#5EFF3B" //RGB: 94, 255, 59
+	can_synth = FALSE
+	taste_description = "decay"
+
+/datum/reagent/gluttonytoxin/expose_mob(mob/living/L, method=TOUCH, reac_volume)
+	L.ForceContractDisease(new /datum/disease/transformation/morph(), FALSE, TRUE)
+
+/datum/reagent/serotrotium
+	name = "Serotrotium"
+	description = "A chemical compound that promotes concentrated production of the serotonin neurotransmitter in humans."
+	color = "#202040" // rgb: 20, 20, 40
+	metabolization_rate = 0.25 * REAGENTS_METABOLISM
+	taste_description = "bitterness"
diff --git a/modular_pentest/master_files/code/modules/reagents/chemistry/reagents/toxin_reagents.dm b/modular_pentest/master_files/code/modules/reagents/chemistry/reagents/toxin_reagents.dm
index ee78568b2e..5ce0282a47 100644
--- a/modular_pentest/master_files/code/modules/reagents/chemistry/reagents/toxin_reagents.dm
+++ b/modular_pentest/master_files/code/modules/reagents/chemistry/reagents/toxin_reagents.dm
@@ -1,3 +1,22 @@
+/datum/reagent/toxin/fentanyl
+	name = "Fentanyl"
+	description = "Fentanyl will inhibit brain function and cause toxin damage before eventually knocking out its victim."
+	reagent_state = LIQUID
+	color = "#64916E"
+	metabolization_rate = 0.5 * REAGENTS_METABOLISM
+	toxpwr = 0
+
+/datum/reagent/toxin/fentanyl/on_mob_life(mob/living/carbon/M)
+	M.adjustOrganLoss(ORGAN_SLOT_BRAIN, 3*REM, 150)
+	if(M.toxloss <= 60)
+		M.adjustToxLoss(1*REM, 0)
+	if(current_cycle >= 4)
+		SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "smacked out", /datum/mood_event/narcotic_heavy, name)
+	if(current_cycle >= 18)
+		M.Sleeping(40)
+	..()
+	return TRUE
+
 /datum/reagent/toxin/mimesbane
 	name = "Mime's Bane"
 	description = "A nonlethal neurotoxin that interferes with the victim's ability to gesture."
diff --git a/modular_pentest/~pentest.dme b/modular_pentest/~pentest.dme
index 0f01ffcb89..5ba848ce5a 100644
--- a/modular_pentest/~pentest.dme
+++ b/modular_pentest/~pentest.dme
@@ -193,12 +193,12 @@
 #include "master_files\code\modules\reagents\chemistry\reagents\base_drinks.dm"
 #include "master_files\code\modules\reagents\chemistry\reagents\drink_reagents.dm"
 #include "master_files\code\modules\reagents\chemistry\reagents\ethanol.dm"
-#include "master_files\code\modules\reagents\chemistry\reagents\medicine_reagents.dm"
 #include "master_files\code\modules\reagents\chemistry\reagents\food_reagents.dm"
 #include "master_files\code\modules\reagents\chemistry\reagents\mixed_drinks.dm"
 //#include "master_files\code\modules\reagents\chemistry\reagents\other_reagents.dm"
 #include "master_files\code\modules\reagents\chemistry\reagents\toxin_reagents.dm"
 #include "master_files\code\modules\reagents\chemistry\reagents\trickwine_reagents.dm"
+#include "master_files\code\modules\reagents\chemistry\reagents\medical_reagents\medicine_reagents.dm"
 #include "master_files\code\modules\reagents\chemistry\recipes\drugs.dm"
 #include "master_files\code\modules\reagents\chemistry\recipes\medicine.dm"
 #include "master_files\code\modules\reagents\chemistry\recipes\others.dm"
diff --git a/shiptest.dme b/shiptest.dme
index e384448bc2..2e2b7e040e 100644
--- a/shiptest.dme
+++ b/shiptest.dme
@@ -693,7 +693,6 @@
 #include "code\datums\diseases\brainrot.dm"
 #include "code\datums\diseases\cold.dm"
 #include "code\datums\diseases\cold9.dm"
-#include "code\datums\diseases\decloning.dm"
 #include "code\datums\diseases\dna_spread.dm"
 #include "code\datums\diseases\fake_gbs.dm"
 #include "code\datums\diseases\flu.dm"
@@ -1365,7 +1364,6 @@
 #include "code\game\objects\items\gun_maint_kit.dm"
 #include "code\game\objects\items\handcuffs.dm"
 #include "code\game\objects\items\holosign_creator.dm"
-#include "code\game\objects\items\hot_potato.dm"
 #include "code\game\objects\items\hourglass.dm"
 #include "code\game\objects\items\inducer.dm"
 #include "code\game\objects\items\kitchen.dm"
@@ -1694,6 +1692,7 @@
 #include "code\game\objects\structures\crates_lockers\closets\wardrobe.dm"
 #include "code\game\objects\structures\crates_lockers\closets\secure\bar.dm"
 #include "code\game\objects\structures\crates_lockers\closets\secure\cargo.dm"
+#include "code\game\objects\structures\crates_lockers\closets\secure\clip.dm"
 #include "code\game\objects\structures\crates_lockers\closets\secure\engineering.dm"
 #include "code\game\objects\structures\crates_lockers\closets\secure\freezer.dm"
 #include "code\game\objects\structures\crates_lockers\closets\secure\hydroponics.dm"
@@ -2245,6 +2244,7 @@
 #include "code\modules\clothing\outfits\factions\syndicate.dm"
 #include "code\modules\clothing\shoes\_shoes.dm"
 #include "code\modules\clothing\shoes\colour.dm"
+#include "code\modules\clothing\shoes\heels.dm"
 #include "code\modules\clothing\shoes\magboots.dm"
 #include "code\modules\clothing\shoes\miscellaneous.dm"
 #include "code\modules\clothing\spacesuits\_spacesuits.dm"
@@ -3357,11 +3357,9 @@
 #include "code\modules\reagents\chemistry\machinery\pandemic.dm"
 #include "code\modules\reagents\chemistry\machinery\reagentgrinder.dm"
 #include "code\modules\reagents\chemistry\machinery\smoke_machine.dm"
-#include "code\modules\reagents\chemistry\reagents\cat2_medicine_reagents.dm"
 #include "code\modules\reagents\chemistry\reagents\drink_reagents.dm"
 #include "code\modules\reagents\chemistry\reagents\drug_reagents.dm"
 #include "code\modules\reagents\chemistry\reagents\food_reagents.dm"
-#include "code\modules\reagents\chemistry\reagents\medicine_reagents.dm"
 #include "code\modules\reagents\chemistry\reagents\other_reagents.dm"
 #include "code\modules\reagents\chemistry\reagents\pyrotechnic_reagents.dm"
 #include "code\modules\reagents\chemistry\reagents\toxin_reagents.dm"
@@ -3370,8 +3368,19 @@
 #include "code\modules\reagents\chemistry\reagents\alcohol_reagents\ethanol.dm"
 #include "code\modules\reagents\chemistry\reagents\alcohol_reagents\fruit_wine.dm"
 #include "code\modules\reagents\chemistry\reagents\alcohol_reagents\mixed_drinks.dm"
-#include "code\modules\reagents\chemistry\recipes\cat2_medicines.dm"
+#include "code\modules\reagents\chemistry\reagents\medical_reagents\_medicine_reagents.dm"
+#include "code\modules\reagents\chemistry\reagents\medical_reagents\blood_reagents.dm"
+#include "code\modules\reagents\chemistry\reagents\medical_reagents\fauna_reagents.dm"
+#include "code\modules\reagents\chemistry\reagents\medical_reagents\flora_reagents.dm"
+#include "code\modules\reagents\chemistry\reagents\medical_reagents\ipc_reagents.dm"
+#include "code\modules\reagents\chemistry\reagents\medical_reagents\medicine_reagents.dm"
+#include "code\modules\reagents\chemistry\reagents\medical_reagents\misc_reagents.dm"
+#include "code\modules\reagents\chemistry\reagents\medical_reagents\organ_reagents.dm"
+#include "code\modules\reagents\chemistry\reagents\medical_reagents\pain_reagents.dm"
+#include "code\modules\reagents\chemistry\reagents\medical_reagents\status_reagents.dm"
+#include "code\modules\reagents\chemistry\reagents\medical_reagents\wound_reagents.dm"
 #include "code\modules\reagents\chemistry\recipes\drugs.dm"
+#include "code\modules\reagents\chemistry\recipes\medical_consumables.dm"
 #include "code\modules\reagents\chemistry\recipes\medicine.dm"
 #include "code\modules\reagents\chemistry\recipes\others.dm"
 #include "code\modules\reagents\chemistry\recipes\pyrotechnics.dm"
diff --git a/strings/planet_names.txt b/strings/planet_names.txt
index 9a45239924..769795876d 100644
--- a/strings/planet_names.txt
+++ b/strings/planet_names.txt
@@ -1,104 +1,151 @@
+A Metaphor
 Aaru
 Abaddon
 Acheron
-Aelurus
 Adler
+Aelurus
 Aether
 Al Nar
-Amon
+All You Need
 Ambition
 Amigo
+Amon
 Amoral Persona
 Amritsar
 An
 Anarchy
 Anna
+Antimatter Saturate
 Anzu
 Anzug
-Arisen Glory
+Apple Seed
 Arch
+Arisen Glory
 Ark
 Ashtoreth
 Asmoday
 Asphodel
 Astante
 Atahsaya
+Atomic Temperance
 Attachment
+Authority
+Autoclave
 Azathoth
 Baal
-Bastard
+Balarant
 Baraq
+Bastard
 Bel
+Believe Me
 Beneath
 Berith
+Binary Constant
 Black Emperor
+Blake
+Blam
 Bloom
 Blost
-Bough
+Blue River
 Bob
+Boolean Expression
 Bored Bad Report
+Bough
+Bowman
 Buyan
 Bypass
 Cadmus
-Cast
+Canticle
 Carmine
+Cast
+Caution
+Chapter
 Chax
+Cohesion
+Comstock
+Consequences
 Contact Cold
+Contempt
 Crisp Valley
 Crux
 Dagon
 Dantalion
 Diecast Fortune
 Dis
+Discount Shoal
 Dismay
 Diyu
 Dodi-Si
 Dragonsbreath
+Durandal
 Durer's World
+Dyson
+Eden
 Eisheth
 Enki
-Eternal Haven
 Erin's Rest
 Erlig
+Eternal Haven
 Eudamonia
 Everyman's Future
+Faceless
+Faithless
 Fali-diso
 Fearsome Engine
+Foe
 Fortune
 Freedom
 Freyja
-Foe
+Friend Foe
+Fusion Cascade
 Gaap
+Gadget
 Gaia
 Gehenna
 Genbu
 General Malaise
 Gingolx
+Goldenbaum
 Gravitas
 Great Vacation
 Grif
 Gualichu
+Guilty Smile
 Habeaus Corpus
-Haddu
 Haddock
+Haddu
+Hang Brain
+Hardcode
 Harlock
 Haven
+Heaven
+Hegemonizing
 Hera
+Hero
+Holo
 Hul
 Hull Fracture
+Hunter
+IFF Ping
+Identify
+Impotent Wrath
 Infatuation Station
+Inferno
+Injection Aid
 Inoculation
+Input
 Inspector
 Inviting LZ
-Impotent Wrath
+In Dispute
+Isamu
 Ishkur
-Ishtar
 Ishmael
+Ishtar
 Jahannam
 Jahim
 Jailbird
-Jart
 Jannah
+Jart
 Jigoku
 Jotunheim
 Joyless Reality
@@ -106,93 +153,149 @@ Junction
 Junk
 Junkyard
 Kazon
+Khfiva
 Khthon
 Kigatilik
+Kill Kill Kill
 Kircheis
+Knave
 Komarov
 Kroni
+Lament
 Lamya
 Large Liki-hi
 Leng
-Lichen
-Liberty
 Liberation
+Liberty
+Lichen
 Lilith
+Locusts
 Longing For You
+Look Here!
 Maan-Emo
 Maderakka
+Magpie's Flight
 Maiden
 Mam
 Mangindusa
 Marax
 March Forth
+March To The Scaffold
 Marr-Adetta
+Masterful
 Memory
+Microchip
+Mindless
+Miner
 Mite
 Mnemosyne
 Mokosh
 Moloch
+Monolith
 Morganna
+Mourning
 Murmur
-Mystery
+Myomer
+My Temperance
 Myrkheim
+Mystery
+Myung
 Naacal
 Naka-risa
 Natural Disposition
+Needlenose
 Neter-hkertet
+Nothing Here Officer
 Oberon
 Oberstein
 Occam's Razor
+Oculus
 Okeus
+One Last Time
 Orbital Euphoria
 Orobas
+Outpost, The
+Output
 Pandemonium
+Pathless
+Pirates?
+Planet For Ditzes
+Plate
+Polymer Ringers
 Pontus
+Pouch
 Power Flux
+Promise Kept
 Qilin
+Quadro
+Quantum Choice
+Quill-les
+Quills R Us
 Rama
+Reaction
 Reality
-Samael
+Red Hat Short Stature
+Regina
+Revolutionary Heart
+Royalty Mind
+Rozinate
 Sa-Matra
+Samael
+Sandstorm
 Sawal
-Scarlet
 Scarf
-Snowglobe
+Scarlet
 Smok
-Stella Vitae
+Snowglobe
+Socket
+Something Here Officer
 Starflame
+Stella Vitae
 Stribog
 Surasa
 Svarog
 Swang
+Tahaaky's Lot
 Tartarus
-Thanatos
 Temporal Thrill
 Testificate
+Thanatos
+The Ditch
+The Path
 Thrial
+Thunderstorm
 Tiamat
 Tiptop Canopy
 Togar
+Tomorrow's Sunrise
 Tragedy
 Transaction Secure
+Transport When Ready
+Triangle
 Turpentine
 Ulgan
 Ulubis
+Understanding
+Universe's End
 Utopia
 Valefar
-Weaver
+Vidmaster
 We Got Here First
+Weaver
+What We See
 Wintery Display
 World Mill
 Wotan
+Wrench
 Xaphan
 Xerxes
 Xezbeth
 Yaqum
 Yaw
+You That Remains
 Zenerre
 Zenobia
-Zorp
 Zhu Que
 Zirnitra
 Zmey
+Zorp
diff --git a/strings/planet_prefixes.txt b/strings/planet_prefixes.txt
index 71394ca162..a12bd2b125 100644
--- a/strings/planet_prefixes.txt
+++ b/strings/planet_prefixes.txt
@@ -1,17 +1,29 @@
-The
 Big
+Dilapidated
+Entangled
+Envious
+Eternal
+Gloomy
+Gluttonous
 Great
-Small
-Little
+Greedy
 Hidden
-Shimmering
-Sacred
-Eternal
+Imbued
 Joyous
-Travelling
+Little
+Lively
+Lonely
+Lusty
+Many-eyed
+Prideful
 Quaint
-Imbued
 Quizzical
+Sacred
+Shimmering
+Slothful
+Small
+The
 Transitionary
-Dilapidated
-Many-eyed
+Travelling
+Visionary
+Wrathful
diff --git a/strings/star_names.txt b/strings/star_names.txt
index c289f6ea1f..d15f7a9dda 100644
--- a/strings/star_names.txt
+++ b/strings/star_names.txt
@@ -1,33 +1,47 @@
 Aaru
 Abaddon
 Acheron
+Aegis
 Aelurus
 Aether
 Al Nar
+Alcis
+Amlitzer
 Amon
 An
+Anubis
 Anzu
+Arcadia
 Archibald's Star
+Argo
+Artemis
 Ashtoreth
 Asmoday
 Asphodel
+Astante
 Atahsaya
 Azathoth
 Baal
 Baraq
+Bastet
+Beiowulf
 Bel
 Berith
 Black Emperor
 Blost
 Buyan
 Cadmus
+Carinae
 Chax
+Cu Chulainn
+Curtana
 Dagon
 Dalar's Star
 Damar's Star
 Dantalion
 Dis
 Diyu
+Durandal
 Durer's Star
 Eisheth
 Enki
@@ -40,26 +54,40 @@ Gingolx
 Gualichu
 Haddu
 Hera
+Hina
+Horus
 Hul
+Hyperion
+Idris
+Iserlohn
 Ishkur
 Ishtar
+Isis
 Jahannam
 Jahim
 Jannah
 Jigoku
 Jotunheim
+Kerberos
+Khonsu
 Khthon
 Kigatilik
+Kinunir
 Komarov
+Krishna
 Kroni
+Ku
 Lamya
 Leng
 Lilith
 Maan-Emo
 Maderakka
 Mam
+Mana
 Mangindusa
 Marax
+Meldar
+Melkia
 Mnemosyne
 Mokosh
 Moloch
@@ -67,25 +95,41 @@ Morganna
 Murmur
 Myrkheim
 Naacal
+Neith
+Nephthys
 Neter-hkertet
 Oberon
 Okeus
+Orion
 Orobas
+Oshosi
+Palamedes
 Pandemonium
+Perun
 Pontus
 Qilin
+Ra
+Rahn
 Rama
+Roland
+Rustam
 Samael
 Sawal
+Sekhmet
+Set
 Smok
+Sobek
 Stella Vitae
 Stribog
 Surasa
 Svarog
 Swang
+Taranil
 Tartarus
+Thalassa
 Thanatos
 The Incineration
+Thoth
 Thrial
 Tiamat
 Togar
@@ -94,12 +138,14 @@ Ulgan
 Ulubis
 Utopia
 Valefar
+Wadjet
 Weaver
 World Mill
 Wotan
 Xaphan
 Xezbeth
 Yaqum
+Yatagama
 Yaw
 Zenerre
 Zenobia
diff --git a/tools/UpdatePaths/Scripts/5162_chem_kill.txt b/tools/UpdatePaths/Scripts/5162_chem_kill.txt
new file mode 100644
index 0000000000..27898bacf5
--- /dev/null
+++ b/tools/UpdatePaths/Scripts/5162_chem_kill.txt
@@ -0,0 +1,12 @@
+/obj/item/reagent_containers/pill/patch/styptic : /obj/item/reagent_containers/pill/patch/indomide{@OLD}
+/obj/item/reagent_containers/pill/patch/silver_sulf : /obj/item/reagent_containers/pill/patch/alvitane{@OLD}
+/obj/item/reagent_containers/pill/patch/quardexane : /obj/item/reagent_containers/pill/patch/alvitane{@OLD}
+/obj/item/reagent_containers/pill/trophazole : /obj/item/reagent_containers/pill/indomide{@OLD}
+/obj/item/reagent_containers/syringe/contraband/fentanyl : /obj/item/reagent_containers/syringe/contraband/morphine{@OLD}
+/obj/item/reagent_containers/syringe/oxandrolone  : /obj/item/reagent_containers/syringe/ysiltane{@OLD}
+/obj/item/reagent_containers/glass/bottle/bicaridine : /obj/item/reagent_containers/glass/bottle/indomide{@OLD}
+/obj/item/reagent_containers/hypospray/medipen/stimulants : /obj/item/reagent_containers/hypospray/medipen/stimpack/crisis{@OLD}
+/obj/item/reagent_containers/hypospray/medipen/tricord : /obj/item/reagent_containers/hypospray/medipen/cureall{@OLD}
+/obj/item/hypospray/mkii/tricord : /obj/item/hypospray/mkii/cureall
+/obj/item/reagent_containers/glass/bottle/vial/small/preloaded/tricord : /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/cureall
+/obj/item/reagent_containers/glass/bottle/antitoxin : /obj/item/reagent_containers/glass/bottle/charcoal
\ No newline at end of file