diff --git a/GainStation13/code/game/donator.dm b/GainStation13/code/game/donator.dm
index f6ca08b5b6..d70fdde306 100644
--- a/GainStation13/code/game/donator.dm
+++ b/GainStation13/code/game/donator.dm
@@ -1,136 +1,6 @@
-//GS13: donator items and other ckey-locked junk
-
-//commented out everything here, it's bugged
-
-// /datum/gear/donator/gatobadge_employee //these are available only to admins with CC-related characters
-// 	name = "GATO Badge - Employee"
-// 	category = LOADOUT_CATEGORY_DONATOR
-// 	path = /obj/item/clothing/accessory/medal/gato_badge/employee
-// 	ckeywhitelist = list("sonoida", "yeeny")
-
-// /datum/gear/donator/gatobadge_middleman //these are available to players who were granted permission to have their characters to CC
-// 	name = "GATO Badge - Correspondent"
-// 	category = LOADOUT_CATEGORY_DONATOR
-// 	path = /obj/item/clothing/accessory/medal/gato_badge/middleman
-// 	ckeywhitelist = list("johnjimjim", "sonoida", "yeeny", "Not Number", "Not_Number", "NotNumber",)
-
-// /datum/gear/donator/halsey_overcoat
-// 	name = "Halsey's Commander Overcoat"
-// 	category = LOADOUT_CATEGORY_DONATOR
-// 	path = /obj/item/clothing/suit/chloe/halsey
-// 	ckeywhitelist = list("yeeny")
-
-// /datum/gear/donator/haydee_suit
-// 	name = "Haydee Suit"
-// 	category = LOADOUT_CATEGORY_DONATOR
-// 	path = /obj/item/clothing/suit/space/hardsuit/engine/haydee
-// 	ckeywhitelist = list("lumu", "sonoida")
-
-// /datum/gear/donator/haydee_pistol
-// 	name = "Haydee Pistol"
-// 	category = LOADOUT_CATEGORY_DONATOR
-// 	path = /obj/item/gun/ballistic/automatic/toy/pistol/haydee
-// 	ckeywhitelist = list("lumu", "sonoida")
-
-// /datum/gear/donator/rose_plush
-// 	name = "Dezir Rose Plush"
-// 	category = LOADOUT_CATEGORY_DONATOR
-// 	path = /obj/item/toy/plush/gs13/rose
-// 	ckeywhitelist = list("eremitanovem", "sonoida")
-
-// /datum/gear/donator/chloe_plush
-// 	name = "Chloe Plush"
-// 	category = LOADOUT_CATEGORY_DONATOR
-// 	path = /obj/item/toy/plush/gs13/chloe
-// 	ckeywhitelist = list("alphas0")
-
-// /datum/gear/donator/grimmy_coat
-// 	name = "Overcoat of the Destitute"
-// 	category = LOADOUT_CATEGORY_DONATOR
-// 	path = /obj/item/clothing/suit/storage/blueshield/grimmy
-// 	ckeywhitelist = list("bbgrimmy")
-
-// /datum/gear/donator/tarek_gps
-// 	name = "Tarek's GPS"
-// 	category = LOADOUT_CATEGORY_DONATOR
-// 	path = /obj/item/gps/mining
-// 	ckeywhitelist = list("e926user25")
-
-// /datum/gear/donator/milwaukee_crowbar
-// 	name = "Milwaukee Pocket Crowbar"
-// 	category = LOADOUT_CATEGORY_DONATOR
-// 	path = /obj/item/crowbar/bronze/glaug
-// 	ckeywhitelist = list("happytpr")
-
-// /datum/gear/donator/fatfang
-// 	name = "Fattening Fangs Injector"
-// 	category = LOADOUT_CATEGORY_DONATOR
-// 	path = /obj/item/dnainjector/fatfang
-// 	ckeywhitelist = list("sonoida")
-
-// /datum/gear/donator/toolbelt
-// 	name = "Empty Toolbelt"
-// 	category = LOADOUT_CATEGORY_DONATOR
-// 	path = /obj/item/storage/belt/utility
-// 	ckeywhitelist = list("killmewitha22", "Killmewitha22", "KILLMEWITHA22", "sonoida")
-
-// //metha rossi you fat hog
-
-// /datum/gear/donator/wgspell_add
-// 	name = "Weight Gain Spellbook"
-// 	category = LOADOUT_CATEGORY_DONATOR
-// 	path = /obj/item/book/granter/spell/fattening
-// 	ckeywhitelist = list("sonoida", "themrsky", "Not Number")
-
-// /datum/gear/donator/wgspell_transfer
-// 	name = "Weight Transfer Spellbook"
-// 	category = LOADOUT_CATEGORY_DONATOR
-// 	path = /obj/item/book/granter/spell/fattening/transfer
-// 	ckeywhitelist = list("sonoida", "themrsky", "Not Number")
-
-// /datum/gear/donator/wgspell_take
-// 	name = "Weight Steal Spellbook"
-// 	category = LOADOUT_CATEGORY_DONATOR
-// 	path = /obj/item/book/granter/spell/fattening/steal
-// 	ckeywhitelist = list("sonoida", "themrsky", "Not Number")
-
-// /datum/gear/donator/white_eyepatch_cabal
-// 	name = "Cabal's Eyepatch"
-// 	category = LOADOUT_CATEGORY_DONATOR
-// 	path = /obj/item/clothing/glasses/eyepatch/cabal
-// 	ckeywhitelist = list("spess_lizurd", "SPESS LIZURD", "spess lizurd", "SPESS_LIZURD", "spesslizurd", "sonoida")
-
-// /datum/gear/white_eyepatch //accessible to anyone, at donator's request
-// 	name = "White Eyepatch"
-// 	category = LOADOUT_CATEGORY_GLASSES
-// 	path = /obj/item/clothing/glasses/eyepatch/white
-
-// /datum/gear/donator/metis_plush
-// 	name = "Metis Plush"
-// 	category = LOADOUT_CATEGORY_DONATOR
-// 	path = /obj/item/toy/plush/gs13/metis
-// 	ckeywhitelist = list("paraillegal", "Paraillegal")
-
-// /datum/gear/donator/wheelys
-// 	name = "Wheely-Heels"
-// 	category = LOADOUT_CATEGORY_DONATOR
-// 	path = /obj/item/clothing/shoes/wheelys
-// 	ckeywhitelist = list("colorlessspy", "Colorlessspy")
-
-// /datum/gear/donator/crowbars_plush
-// 	name = "Crowbars Plush"
-// 	category = LOADOUT_CATEGORY_DONATOR
-// 	path = /obj/item/toy/plush/gs13/crowbars
-// 	ckeywhitelist = list("M16nPregnant", "m16npregnant" )
-
-// /datum/gear/donator/sams_welder
-// 	name = "Sam's Unlucky Welder"
-// 	category = LOADOUT_CATEGORY_DONATOR
-// 	path = /obj/item/weldingtool/bronze
-// 	ckeywhitelist = list("almaniak", "Almaniak", "AlManiak")
 
 //
-//item presets for donator items
+//item presets for donator items and other gunk
 //
 /obj/item/clothing/glasses/eyepatch/white
 	name = "White eyepatch"
@@ -158,9 +28,24 @@
 	desc = "A Ginormous red overcoat that looks fit for a commander. Has a tag on it that reads: 'Property of Halsey Harmonten. Please return if lost!'"
 	armor = list("melee" = 20, "bullet" = 20, "laser" = 0,"energy" = 20, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 20, "acid" = 0) //worn by a captain player, might as well recompensate not wearing the carapace
 
+/obj/item/clothing/suit/storage/blueshield //Look man I don't know, this is the file it was in on Oracle. Don't shoot me. Please.
+	name = "blueshield coat"
+	desc = "An armored coat often worn by bodyguards. Tough because everyone knows deep down you're a softie."
+	icon = 'GainStation13/icons/obj/clothing/suits.dmi'
+	mob_overlay_icon = 'GainStation13/icons/mob/suit.dmi'
+	icon_state = "blueshieldcoat"
+	item_state = "blueshieldcoat"
+	body_parts_covered = CHEST|LEGS|ARMS
+	allowed = list(/obj/item/gun/energy, /obj/item/reagent_containers/spray/pepper, /obj/item/ammo_box, /obj/item/ammo_casing,/obj/item/melee/baton, /obj/item/restraints/handcuffs, /obj/item/flashlight/seclite, /obj/item/melee/classic_baton)
+	armor = list(melee = 25, bullet = 10, laser = 25, energy = 10, bomb = 0, bio = 0, rad = 0)
+	cold_protection = CHEST|LEGS|ARMS
+	heat_protection = CHEST|LEGS|ARMS
+	mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON
+
 /obj/item/clothing/suit/storage/blueshield/grimmy
 	name = "Overcoat of the Destitute"
 	desc = "Welcome all to the everlasting all-time low. Please put your hands together for the ever-failing one man show: Domino!"
+	armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0)
 
 /obj/item/crowbar/bronze/glaug
 	name = "Milwaukee Pocket Crowbar"
diff --git a/GainStation13/code/modules/client/loadout/uniform.dm b/GainStation13/code/modules/client/loadout/uniform.dm
index f7b572108a..8f68d36e8e 100644
--- a/GainStation13/code/modules/client/loadout/uniform.dm
+++ b/GainStation13/code/modules/client/loadout/uniform.dm
@@ -1,3 +1,4 @@
 /datum/gear/uniform/modularjumpsuit
 	name = "Grey jumpsuit (Modular)"
 	path = /obj/item/clothing/under/color/grey
+	cost = 0
diff --git a/GainStation13/code/modules/mod/modules/modules_fat.dm b/GainStation13/code/modules/mod/modules/modules_fat.dm
index 2f8631be11..0d0ab89806 100644
--- a/GainStation13/code/modules/mod/modules/modules_fat.dm
+++ b/GainStation13/code/modules/mod/modules/modules_fat.dm
@@ -212,4 +212,4 @@
 	name = "MOD exoskeleton"
 	category = LOADOUT_CATEGORY_HANDS
 	path = /obj/item/mod/control/pre_equipped/exoskeleton
-	cost = 4
+	cost = 3
diff --git a/GainStation13/icons/mob/markings/mam_snouts.dmi b/GainStation13/icons/mob/markings/mam_snouts.dmi
index 78adeedc40..b63e724f22 100644
Binary files a/GainStation13/icons/mob/markings/mam_snouts.dmi and b/GainStation13/icons/mob/markings/mam_snouts.dmi differ
diff --git a/GainStation13/icons/mob/modclothes/modular_grey.dmi b/GainStation13/icons/mob/modclothes/modular_grey.dmi
index 94fb401c91..06d915f760 100644
Binary files a/GainStation13/icons/mob/modclothes/modular_grey.dmi and b/GainStation13/icons/mob/modclothes/modular_grey.dmi differ
diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_hotsprings.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_hotsprings.dmm
index 3657995118..a66b1b04d3 100644
--- a/_maps/RandomRuins/LavaRuins/lavaland_surface_hotsprings.dmm
+++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_hotsprings.dmm
@@ -9,6 +9,15 @@
 /obj/structure/bed/double,
 /turf/open/floor/plating/beach/sand,
 /area/lavaland/surface/outdoors)
+"o" = (
+/obj/structure/bed/double,
+/obj/item/reagent_containers/rag/towel,
+/turf/open/floor/plating/beach/sand,
+/area/lavaland/surface/outdoors)
+"u" = (
+/obj/structure/fans/tiny/invisible,
+/turf/open/floor/plating/beach/sand,
+/area/lavaland/surface/outdoors)
 "I" = (
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
 /area/lavaland/surface/outdoors)
@@ -19,6 +28,10 @@
 "U" = (
 /turf/open/floor/plating/beach/sand,
 /area/lavaland/surface/outdoors)
+"Z" = (
+/obj/item/flashlight/lantern,
+/turf/open/floor/plating/beach/sand,
+/area/lavaland/surface/outdoors)
 
 (1,1,1) = {"
 I
@@ -88,27 +101,27 @@ I
 (6,1,1) = {"
 I
 a
-U
+Z
 c
 c
 c
 c
 c
-U
+Z
 a
 I
 "}
 (7,1,1) = {"
 I
-U
+u
 U
 k
-k
+o
 U
 k
-k
-U
+o
 U
+u
 I
 "}
 (8,1,1) = {"
@@ -143,7 +156,7 @@ I
 I
 a
 a
-U
+u
 a
 a
 I
diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_wizard.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_wizard.dmm
index 88b906b467..f808582835 100644
--- a/_maps/RandomRuins/LavaRuins/lavaland_surface_wizard.dmm
+++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_wizard.dmm
@@ -473,13 +473,13 @@ c
 a
 a
 a
-a
-a
-a
-a
-a
-a
-a
+D
+D
+D
+D
+D
+D
+D
 D
 b
 b
@@ -495,7 +495,7 @@ c
 a
 a
 a
-a
+D
 e
 j
 o
@@ -517,7 +517,7 @@ c
 a
 a
 a
-a
+D
 f
 k
 p
@@ -539,7 +539,7 @@ c
 a
 a
 a
-a
+D
 g
 l
 q
@@ -561,7 +561,7 @@ c
 a
 a
 a
-a
+D
 h
 m
 r
@@ -583,7 +583,7 @@ c
 a
 a
 a
-a
+D
 i
 n
 s
@@ -605,13 +605,13 @@ c
 c
 a
 a
-a
-a
-a
-a
-a
-a
-a
+D
+D
+D
+D
+D
+D
+D
 D
 b
 b
diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm
index 3aa2c228f3..5ac8be98df 100644
--- a/_maps/map_files/KiloStation/KiloStation.dmm
+++ b/_maps/map_files/KiloStation/KiloStation.dmm
@@ -8145,7 +8145,6 @@
 	pixel_x = 4;
 	pixel_y = 4
 	},
-/obj/item/storage/briefcase,
 /obj/effect/turf_decal/tile/neutral{
 	dir = 8
 	},
@@ -8153,6 +8152,8 @@
 /obj/machinery/airalarm{
 	pixel_y = 22
 	},
+/obj/item/book/manual/gato_spacelaw,
+/obj/item/storage/briefcase,
 /turf/open/floor/plasteel/dark,
 /area/service/lawoffice)
 "aol" = (
@@ -8237,7 +8238,6 @@
 /obj/effect/turf_decal/tile/neutral{
 	dir = 8
 	},
-/obj/item/book/manual/wiki/security_space_law,
 /obj/item/taperecorder{
 	pixel_x = 5
 	},
@@ -8309,14 +8309,14 @@
 /obj/effect/turf_decal/tile/neutral{
 	dir = 8
 	},
-/obj/item/book/manual/wiki/security_space_law,
-/obj/item/taperecorder{
-	pixel_x = 5
-	},
 /obj/structure/table,
 /obj/machinery/newscaster{
 	pixel_y = 30
 	},
+/obj/item/book/manual/gato_spacelaw,
+/obj/item/taperecorder{
+	pixel_x = 5
+	},
 /turf/open/floor/plasteel/dark,
 /area/security/courtroom)
 "aox" = (
diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm
index 5e24f74886..500a24e5eb 100644
--- a/_maps/map_files/MetaStation/MetaStation.dmm
+++ b/_maps/map_files/MetaStation/MetaStation.dmm
@@ -2483,8 +2483,7 @@
 "aiL" = (
 /obj/machinery/door/window/westleft{
 	base_state = "right";
-	dir = 2;
-	icon_state = "right";
+	dir = 1;
 	name = "Shooting Range"
 	},
 /obj/effect/turf_decal/stripes/line,
@@ -15021,14 +15020,17 @@
 	dir = 4
 	},
 /obj/machinery/door/firedoor,
+/obj/effect/turf_decal/loading_area{
+	icon_state = "steel_decals5"
+	},
 /obj/machinery/door/airlock/public/glass{
 	dir = 8;
 	name = "Starboard Primary Hallway"
 	},
-/obj/effect/turf_decal/tile/yellow{
-	dir = 1
+/turf/open/floor/plasteel{
+	dir = 1;
+	icon_state = "floor_trim"
 	},
-/turf/open/floor/plasteel,
 /area/hallway/primary/starboard)
 "bhE" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -15112,13 +15114,6 @@
 	},
 /turf/open/floor/plasteel,
 /area/hallway/primary/starboard)
-"bhO" = (
-/obj/effect/turf_decal/tile/yellow{
-	dir = 1
-	},
-/obj,
-/turf/open/floor/plasteel,
-/area/hallway/primary/starboard)
 "bhP" = (
 /obj/structure/sign/warning/securearea{
 	pixel_y = 32
@@ -15417,7 +15412,10 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel{
+	dir = 8;
+	icon_state = "floor_whole"
+	},
 /area/hallway/primary/starboard)
 "bjq" = (
 /obj/structure/cable/yellow{
@@ -15873,10 +15871,13 @@
 	dir = 8;
 	name = "Starboard Primary Hallway"
 	},
-/obj/effect/turf_decal/tile/yellow{
-	dir = 8
+/obj/effect/turf_decal/loading_area{
+	dir = 1;
+	icon_state = "steel_decals5"
+	},
+/turf/open/floor/plasteel{
+	icon_state = "floor_trim"
 	},
-/turf/open/floor/plasteel,
 /area/hallway/primary/starboard)
 "bkX" = (
 /obj/item/radio/intercom{
@@ -17237,6 +17238,9 @@
 	dir = 10
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1,
+/obj/structure/cable/yellow{
+	icon_state = "2-4"
+	},
 /turf/open/floor/plasteel,
 /area/hallway/primary/port)
 "bqp" = (
@@ -17298,12 +17302,11 @@
 /turf/open/floor/plasteel,
 /area/hallway/primary/port)
 "bqv" = (
-/obj/machinery/power/apc/highcap/five_k{
-	areastring = "/area/maintenance/aft";
-	name = "Aft Maintenance APC";
-	pixel_y = -24
-	},
 /obj/effect/turf_decal/stripes/line,
+/obj/structure/sign/warning/vacuum{
+	pixel_x = 32;
+	pixel_y = -32
+	},
 /turf/open/floor/catwalk_floor,
 /area/maintenance/aft)
 "bqw" = (
@@ -17778,6 +17781,9 @@
 	dir = 1
 	},
 /obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer1,
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
 /turf/open/floor/plasteel,
 /area/hallway/primary/port)
 "bsA" = (
@@ -18010,8 +18016,8 @@
 /obj/effect/turf_decal/tile/yellow{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer3,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{
+/obj/machinery/atmospherics/pipe/simple/supply/visible/layer3,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer1{
 	dir = 10
 	},
 /turf/open/floor/plasteel/dark/corner,
@@ -19146,8 +19152,8 @@
 /obj/structure/disposalpipe/segment,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer3,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer3{
-	dir = 8
+/obj/machinery/atmospherics/pipe/simple/supply/visible/layer3{
+	dir = 4
 	},
 /turf/open/floor/plasteel,
 /area/hallway/primary/starboard)
@@ -19155,8 +19161,8 @@
 /obj/effect/turf_decal/tile/yellow{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer3{
-	dir = 10
+/obj/machinery/atmospherics/pipe/simple/supply/visible/layer3{
+	dir = 9
 	},
 /turf/open/floor/plasteel/dark/corner,
 /area/hallway/primary/starboard)
@@ -19445,7 +19451,7 @@
 /obj/effect/turf_decal/tile/yellow{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer3{
+/obj/machinery/atmospherics/pipe/manifold/supply/visible/layer3{
 	dir = 4
 	},
 /turf/open/floor/plasteel/dark/corner,
@@ -19897,10 +19903,10 @@
 	},
 /obj/structure/disposalpipe/segment,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer3,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer1{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer3,
 /turf/open/floor/plasteel,
 /area/hallway/primary/starboard)
 "bEf" = (
@@ -20458,10 +20464,10 @@
 	dir = 5
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer3,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer1{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer3,
 /turf/open/floor/plasteel,
 /area/hallway/primary/starboard)
 "bFE" = (
@@ -20471,10 +20477,10 @@
 /obj/effect/turf_decal/tile/yellow{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer3{
+/obj/machinery/atmospherics/pipe/simple/supply/visible/layer3{
 	dir = 5
 	},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1,
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible/layer1,
 /turf/open/floor/plasteel/dark/corner,
 /area/hallway/primary/starboard)
 "bFY" = (
@@ -24056,10 +24062,6 @@
 /obj/effect/turf_decal/stripes/corner{
 	dir = 1
 	},
-/obj/machinery/door/airlock/maintenance/abandoned{
-	name = "Storage Room";
-	req_access_txt = "12"
-	},
 /turf/open/floor/plating,
 /area/maintenance/starboard)
 "bZA" = (
@@ -26353,10 +26355,6 @@
 /turf/open/floor/catwalk_floor,
 /area/maintenance/port)
 "cfa" = (
-/obj/structure/noticeboard{
-	dir = 1;
-	pixel_y = -32
-	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer3{
 	dir = 4
 	},
@@ -27423,13 +27421,9 @@
 /obj/effect/turf_decal/tile/red{
 	dir = 1
 	},
-/obj/effect/turf_decal/tile/red,
 /obj/effect/turf_decal/tile/red{
 	dir = 4
 	},
-/obj/effect/turf_decal/tile/red{
-	dir = 8
-	},
 /obj/structure/cable/yellow{
 	icon_state = "1-2"
 	},
@@ -27439,7 +27433,7 @@
 	name = "Security Post - Research Division";
 	req_access_txt = "63"
 	},
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/dark/side,
 /area/security/checkpoint/science/research)
 "chr" = (
 /obj/machinery/hydroponics/constructable,
@@ -28366,6 +28360,9 @@
 /obj/structure/sign/warning/nosmoking{
 	pixel_x = 30
 	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer3{
+	dir = 1
+	},
 /turf/open/floor/plasteel,
 /area/science/lab)
 "ckd" = (
@@ -33023,12 +33020,13 @@
 /turf/open/floor/plasteel,
 /area/hallway/primary/central)
 "cuG" = (
-/obj/machinery/light/small{
-	dir = 1
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 5
 	},
+/obj/machinery/light/small{
+	dir = 1;
+	pixel_y = 12
+	},
 /turf/open/floor/plasteel,
 /area/science/misc_lab/range)
 "cuH" = (
@@ -33411,7 +33409,8 @@
 /area/maintenance/aft)
 "cvJ" = (
 /obj/machinery/light/small{
-	dir = 1
+	dir = 1;
+	pixel_y = 12
 	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 9
@@ -34628,10 +34627,19 @@
 /turf/open/floor/circuit,
 /area/science/robotics/mechbay)
 "cyt" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
-/turf/open/floor/plating,
-/area/science/misc_lab/range)
+/obj/machinery/holopad,
+/obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
+/area/engineering/atmos)
 "cyu" = (
+/obj/structure/table/reinforced,
+/obj/machinery/door/window/westleft{
+	base_state = "right";
+	dir = 1;
+	name = "Shooting Range"
+	},
+/obj/item/clothing/ears/earmuffs,
+/obj/item/gun/energy/laser/practice,
 /turf/open/floor/plating,
 /area/science/misc_lab/range)
 "cyv" = (
@@ -34663,6 +34671,7 @@
 /area/science/research)
 "cyy" = (
 /obj/machinery/holopad,
+/obj/effect/turf_decal/bot,
 /turf/open/floor/plasteel,
 /area/engineering/break_room)
 "cyA" = (
@@ -35121,55 +35130,38 @@
 /turf/open/floor/circuit,
 /area/science/robotics/mechbay)
 "czl" = (
-/obj/structure/table/reinforced,
-/obj/structure/window/reinforced{
-	dir = 1
-	},
-/obj/structure/extinguisher_cabinet{
-	pixel_x = -27
-	},
-/obj/item/folder/white{
-	pixel_x = 4;
-	pixel_y = -3
-	},
-/obj/item/paper/guides/jobs/security/range{
-	pixel_x = 2;
-	pixel_y = 2
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /obj/effect/turf_decal/stripes/line{
-	dir = 8
+	dir = 9
 	},
+/obj/structure/rack/shelf,
+/obj/item/target/syndicate,
+/obj/item/target/syndicate,
+/obj/item/target/clown,
+/obj/item/target/clown,
+/obj/item/target/alien,
+/obj/item/target/alien,
+/obj/item/target,
+/obj/item/target,
 /turf/open/floor/plasteel,
 /area/science/misc_lab/range)
 "czm" = (
-/obj/machinery/door/window/westleft{
-	base_state = "right";
-	dir = 1;
-	icon_state = "right";
-	name = "door"
-	},
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1,
-/turf/open/floor/engine{
-	dir = 9;
-	icon_state = "floor"
-	},
-/area/science/misc_lab/range)
-"czn" = (
-/obj/structure/table/reinforced,
-/obj/machinery/magnetic_controller{
-	autolink = 1;
-	pixel_y = 3
-	},
-/obj/structure/window/reinforced{
+/obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
-/obj/item/clothing/ears/earmuffs,
-/obj/effect/turf_decal/stripes/line{
-	dir = 4
+/obj/machinery/magnetic_controller{
+	autolink = 1;
+	pixel_y = 24;
+	pixel_x = -24
 	},
 /turf/open/floor/plasteel,
 /area/science/misc_lab/range)
+"czn" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 5
+	},
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer3,
+/turf/open/floor/plasteel,
+/area/science/misc_lab/range)
 "czo" = (
 /obj/effect/turf_decal/tile/purple{
 	dir = 8
@@ -35706,32 +35698,23 @@
 /turf/open/floor/plasteel,
 /area/science/robotics/mechbay)
 "cAp" = (
-/obj/structure/rack,
-/obj/item/target,
-/obj/item/target,
-/obj/item/target/alien,
-/obj/item/target/alien,
-/obj/item/target/clown,
-/obj/item/target/clown,
-/obj/item/target/syndicate,
-/obj/item/target/syndicate,
-/obj/machinery/light_switch{
-	pixel_x = -25
-	},
 /obj/effect/turf_decal/stripes/line{
-	dir = 9
+	dir = 8
+	},
+/obj/structure/table,
+/obj/item/paper/guides/jobs/security/range{
+	pixel_x = 2;
+	pixel_y = 2
+	},
+/obj/item/folder/white{
+	pixel_x = 4;
+	pixel_y = -3
 	},
 /turf/open/floor/plasteel,
 /area/science/misc_lab/range)
 "cAq" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{
-	dir = 5
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer3{
-	dir = 6
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{
+	dir = 4
 	},
 /turf/open/floor/plasteel,
 /area/science/misc_lab/range)
@@ -35739,15 +35722,25 @@
 /obj/structure/cable/yellow{
 	icon_state = "2-4"
 	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 5
-	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer3{
+/obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/obj/machinery/light_switch{
+	pixel_x = 24;
+	pixel_y = 24
+	},
+/obj/machinery/button/door{
+	id = "researchrangeshutters";
+	name = "Blast Door Control";
+	pixel_y = 32;
+	pixel_x = 24
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer3{
+	dir = 5
+	},
 /turf/open/floor/plasteel,
 /area/science/misc_lab/range)
 "cAs" = (
@@ -36293,26 +36286,16 @@
 /obj/machinery/recharger{
 	pixel_y = 4
 	},
-/obj/machinery/button/door{
-	id = "researchrangeshutters";
-	name = "Blast Door Control";
-	pixel_y = -24
-	},
 /obj/machinery/light,
 /obj/effect/turf_decal/stripes/line,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer3{
-	dir = 1
-	},
 /turf/open/floor/plasteel,
 /area/science/misc_lab/range)
 "cBl" = (
-/obj/item/gun/energy/laser/practice,
 /obj/machinery/power/apc{
 	areastring = "/area/science/misc_lab/range";
 	name = "Research Firing Range APC";
 	pixel_y = -28
 	},
-/obj/structure/table,
 /obj/structure/cable/yellow,
 /obj/effect/turf_decal/stripes/line{
 	dir = 6
@@ -36320,13 +36303,16 @@
 /turf/open/floor/plasteel,
 /area/science/misc_lab/range)
 "cBm" = (
-/obj/machinery/door/poddoor/preopen{
-	dir = 4;
-	id = "researchrangeshutters"
+/obj/effect/turf_decal/loading_area{
+	dir = 5;
+	icon_state = "steel_decals4"
 	},
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating,
-/area/science/misc_lab/range)
+/obj/effect/turf_decal/loading_area{
+	dir = 6;
+	icon_state = "steel_decals6"
+	},
+/turf/open/floor/plasteel,
+/area/engineering/break_room)
 "cBn" = (
 /obj/structure/chair/stool{
 	pixel_y = 8
@@ -37542,23 +37528,20 @@
 /obj/structure/disposalpipe/segment{
 	dir = 5
 	},
-/obj/structure/cable/yellow{
-	icon_state = "1-4"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer3,
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
 /turf/open/floor/plasteel,
 /area/science/robotics/lab)
 "cEm" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/obj/structure/cable/yellow{
-	icon_state = "4-8"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
@@ -37568,9 +37551,6 @@
 /obj/structure/disposalpipe/segment{
 	dir = 10
 	},
-/obj/structure/cable/yellow{
-	icon_state = "2-8"
-	},
 /obj/structure/cable/yellow{
 	icon_state = "1-2"
 	},
@@ -37977,6 +37957,9 @@
 "cFe" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer3,
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
 /turf/open/floor/plasteel,
 /area/science/robotics/lab)
 "cFf" = (
@@ -38423,16 +38406,19 @@
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer3{
 	dir = 4
 	},
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
 /turf/open/floor/plasteel,
 /area/science/robotics/lab)
 "cGd" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer3{
-	dir = 8
-	},
 /obj/structure/cable/yellow{
 	icon_state = "1-4"
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{
+/obj/machinery/atmospherics/pipe/simple/supply/visible/layer3{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer1{
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer3,
@@ -39018,12 +39004,6 @@
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer3{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{
-	dir = 4
-	},
 /obj/machinery/button/door{
 	id = "atmos";
 	name = "Atmospherics Lockdown";
@@ -39031,22 +39011,25 @@
 	pixel_y = -24;
 	req_access_txt = "24"
 	},
+/obj/machinery/atmospherics/pipe/simple/supply/visible/layer3{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer1{
+	dir = 4
+	},
 /turf/open/floor/plasteel,
 /area/engineering/atmos)
 "cGX" = (
-/obj/structure/cable/yellow{
-	icon_state = "1-4"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1,
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
 /turf/open/floor/plasteel,
 /area/science/robotics/lab)
 "cGY" = (
-/obj/structure/cable/yellow{
-	icon_state = "4-8"
-	},
 /obj/structure/rack,
 /obj/item/storage/firstaid/regular{
 	empty = 1;
@@ -39079,34 +39062,15 @@
 /turf/open/floor/plasteel,
 /area/science/robotics/lab)
 "cGZ" = (
-/obj/structure/cable/yellow{
-	icon_state = "4-8"
+/obj/machinery/atmospherics/components/trinary/mixer/airmix{
+	dir = 4
 	},
-/obj/effect/spawner/structure/window,
-/turf/open/floor/plating,
-/area/science/robotics/lab)
+/turf/open/floor/plasteel,
+/area/engineering/atmos)
 "cHa" = (
-/obj/structure/cable/yellow{
-	icon_state = "4-8"
-	},
-/obj/effect/turf_decal/tile/purple{
-	dir = 8
-	},
-/turf/open/floor/plasteel/white,
-/area/science/research)
-"cHb" = (
-/obj/structure/cable/yellow{
-	icon_state = "1-2"
-	},
-/obj/structure/cable/yellow{
-	icon_state = "1-8"
-	},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer3,
-/turf/open/floor/plasteel/white,
-/area/science/research)
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
+/turf/open/floor/plasteel,
+/area/engineering/atmos)
 "cHc" = (
 /obj/effect/turf_decal/tile/blue,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{
@@ -39571,6 +39535,9 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer3{
 	dir = 5
 	},
+/obj/structure/cable/yellow{
+	icon_state = "1-4"
+	},
 /turf/open/floor/plasteel,
 /area/science/robotics/lab)
 "cHS" = (
@@ -39581,6 +39548,9 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer3{
 	dir = 8
 	},
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
 /turf/open/floor/plasteel,
 /area/science/robotics/lab)
 "cHT" = (
@@ -39591,6 +39561,12 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer3{
 	dir = 8
 	},
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/obj/structure/cable/yellow{
+	icon_state = "1-4"
+	},
 /turf/open/floor/plasteel,
 /area/science/robotics/lab)
 "cHU" = (
@@ -39601,6 +39577,9 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer3{
 	dir = 8
 	},
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
 /turf/open/floor/plasteel,
 /area/science/robotics/lab)
 "cHV" = (
@@ -39620,6 +39599,9 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer3{
 	dir = 8
 	},
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
 /turf/open/floor/plasteel/white/side{
 	dir = 4
 	},
@@ -39637,6 +39619,9 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer3{
 	dir = 8
 	},
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
 /turf/open/floor/plasteel/white,
 /area/science/research)
 "cHX" = (
@@ -39652,6 +39637,9 @@
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer3{
 	dir = 4
 	},
+/obj/structure/cable/yellow{
+	icon_state = "1-8"
+	},
 /turf/open/floor/plasteel/white,
 /area/science/research)
 "cHY" = (
@@ -42467,6 +42455,10 @@
 /turf/open/floor/plasteel,
 /area/hallway/secondary/exit/departure_lounge)
 "cNT" = (
+/obj/effect/turf_decal/stripes/end{
+	dir = 8
+	},
+/obj/structure/closet/emcloset,
 /turf/open/floor/plating,
 /area/maintenance/aft)
 "cNU" = (
@@ -48806,7 +48798,6 @@
 /turf/open/floor/plasteel/dark,
 /area/ai_monitored/command/storage/eva)
 "dIo" = (
-/obj/structure/window/reinforced,
 /obj/machinery/light/small,
 /obj/machinery/camera{
 	c_tag = "MiniSat Exterior Access";
@@ -49237,10 +49228,10 @@
 /obj/effect/turf_decal/loading_area{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer3{
-	dir = 8
+/obj/machinery/atmospherics/pipe/simple/supply/visible/layer3{
+	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{
+/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer1{
 	dir = 4
 	},
 /turf/open/floor/plasteel,
@@ -49930,17 +49921,17 @@
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{
 	dir = 8
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer1,
 /turf/open/floor/plasteel,
 /area/engineering/atmos)
 "elE" = (
-/obj/machinery/atmospherics/components/binary/pump/on{
-	dir = 1;
-	name = "O2 to Airmix"
-	},
 /obj/machinery/atmospherics/pipe/simple/green/visible{
 	dir = 4
 	},
+/obj/machinery/atmospherics/components/binary/pump/on/layer3{
+	dir = 1;
+	name = "O2 to Air Mix"
+	},
 /turf/open/floor/plasteel/dark,
 /area/engineering/atmos)
 "emj" = (
@@ -49998,8 +49989,8 @@
 /turf/open/floor/plasteel/dark,
 /area/engineering/storage/tech)
 "eqq" = (
-/obj/machinery/computer/security/telescreen/circuitry{
-	pixel_y = 30
+/obj/structure/sign/poster/official/random{
+	pixel_y = 32
 	},
 /turf/open/floor/plasteel/white,
 /area/science/circuit)
@@ -51254,6 +51245,9 @@
 	name = "Station Intercom (General)";
 	pixel_y = 21
 	},
+/obj/structure/cable/white{
+	icon_state = "2-8"
+	},
 /turf/open/floor/engine,
 /area/engineering/main)
 "eXu" = (
@@ -52390,10 +52384,10 @@
 /turf/open/floor/plasteel,
 /area/cargo/miningoffice)
 "fFA" = (
-/obj/structure/sign/warning/vacuum{
-	pixel_x = 32
-	},
 /obj/effect/turf_decal/stripes/line,
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
 /turf/open/floor/plating,
 /area/maintenance/aft)
 "fFM" = (
@@ -53574,6 +53568,10 @@
 	dir = 1;
 	network = list("ss13","rd")
 	},
+/obj/structure/noticeboard{
+	dir = 1;
+	pixel_y = -32
+	},
 /turf/open/floor/plasteel/white,
 /area/science/circuit)
 "goF" = (
@@ -53665,8 +53663,10 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
 	dir = 6
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer3,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1,
+/obj/machinery/atmospherics/pipe/simple/supply/visible/layer3{
+	dir = 3
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer1,
 /turf/open/floor/plasteel,
 /area/engineering/atmos)
 "gsp" = (
@@ -53774,6 +53774,10 @@
 	dir = 1
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1,
+/obj/machinery/airalarm{
+	dir = 8;
+	pixel_x = 24
+	},
 /turf/open/floor/plasteel/dark,
 /area/ai_monitored/aisat/exterior)
 "guR" = (
@@ -53788,11 +53792,11 @@
 /obj/effect/turf_decal/tile/blue{
 	dir = 8
 	},
-/obj/machinery/atmospherics/components/trinary/mixer/airmix{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/cyan/visible/layer3{
-	dir = 8
+/obj/machinery/atmospherics/components/trinary/mixer/on/layer3{
+	dir = 4;
+	node1_concentration = 0.79;
+	node2_concentration = 0.21;
+	target_pressure = 4500
 	},
 /turf/open/floor/plasteel,
 /area/engineering/atmos)
@@ -53961,6 +53965,7 @@
 	id = "ceprivacy";
 	name = "privacy shutter"
 	},
+/obj/effect/spawner/structure/window/reinforced,
 /turf/open/floor/plating,
 /area/command/heads_quarters/ce)
 "gzN" = (
@@ -54310,9 +54315,6 @@
 /turf/open/floor/plasteel/dark,
 /area/service/chapel/office)
 "gLc" = (
-/obj/structure/cable/white{
-	icon_state = "1-4"
-	},
 /obj/effect/turf_decal/stripes/line,
 /obj/machinery/meter,
 /obj/machinery/light,
@@ -55034,12 +55036,12 @@
 	dir = 1;
 	name = "Gas to Mix"
 	},
-/obj/structure/cable/white{
-	icon_state = "2-8"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/obj/structure/cable/white{
+	icon_state = "4-8"
+	},
 /turf/open/floor/engine,
 /area/engineering/main)
 "hiR" = (
@@ -55233,10 +55235,10 @@
 /area/medical/surgery)
 "hop" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/visible,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer3{
+/obj/machinery/atmospherics/pipe/simple/supply/visible/layer3{
 	dir = 5
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer1,
 /turf/open/floor/plasteel,
 /area/engineering/atmos)
 "hoq" = (
@@ -55596,6 +55598,9 @@
 	network = list("ss13","rd");
 	pixel_y = -22
 	},
+/obj/machinery/door/window/westright{
+	dir = 1
+	},
 /turf/open/floor/plating,
 /area/science/misc_lab/range)
 "hvy" = (
@@ -56073,7 +56078,9 @@
 /obj/effect/turf_decal/tile/blue{
 	dir = 8
 	},
-/obj/machinery/atmospherics/pipe/layer_manifold,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer1{
+	dir = 6
+	},
 /turf/open/floor/plasteel/white/corner{
 	dir = 1
 	},
@@ -57743,10 +57750,10 @@
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer3{
+/obj/machinery/atmospherics/pipe/simple/supply/visible/layer3{
 	dir = 8
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{
+/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer1{
 	dir = 4
 	},
 /turf/open/floor/plasteel,
@@ -57826,15 +57833,9 @@
 /turf/open/floor/plasteel,
 /area/security/prison)
 "iDz" = (
-/obj/structure/window/reinforced{
-	dir = 1;
-	pixel_y = 1
-	},
 /obj/machinery/light/small{
-	dir = 1
-	},
-/obj/machinery/airalarm{
-	pixel_y = 28
+	dir = 1;
+	pixel_y = 12
 	},
 /obj/effect/turf_decal/tile/blue{
 	dir = 1
@@ -57844,7 +57845,8 @@
 /area/ai_monitored/aisat/exterior)
 "iDK" = (
 /obj/machinery/atmospherics/components/unary/thermomachine/heater/on{
-	dir = 1
+	dir = 1;
+	piping_layer = 3
 	},
 /turf/open/floor/plasteel,
 /area/engineering/atmos)
@@ -59021,6 +59023,9 @@
 /obj/effect/mapping_helpers/airlock/cyclelink_helper{
 	dir = 1
 	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
 /turf/open/floor/plating,
 /area/maintenance/aft)
 "jlc" = (
@@ -59449,10 +59454,7 @@
 /turf/closed/wall/r_wall,
 /area/ai_monitored/command/storage/eva)
 "jxw" = (
-/obj/machinery/atmospherics/components/binary/pump/on{
-	dir = 0;
-	name = "External to Filter"
-	},
+/obj/machinery/atmospherics/pipe/layer_manifold,
 /turf/open/floor/plasteel/white/corner{
 	dir = 1
 	},
@@ -59466,10 +59468,10 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{
+/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer1{
 	dir = 9
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer3{
+/obj/machinery/atmospherics/pipe/simple/supply/visible/layer3{
 	dir = 9
 	},
 /turf/open/floor/plasteel,
@@ -59528,12 +59530,9 @@
 /obj/structure/table/reinforced,
 /obj/item/stock_parts/cell/high,
 /obj/item/stock_parts/cell/high,
-/obj/machinery/computer/security/telescreen/circuitry{
-	pixel_x = 30
-	},
 /obj/item/stack/sheet/metal/ten,
-/obj/structure/sign/poster/official/random{
-	pixel_y = 32
+/obj/machinery/computer/security/telescreen/circuitry{
+	pixel_y = 30
 	},
 /turf/open/floor/plasteel/white,
 /area/science/circuit)
@@ -61820,9 +61819,7 @@
 /area/engineering/atmos)
 "kKa" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/visible,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{
-	dir = 9
-	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer1,
 /turf/open/floor/plasteel,
 /area/engineering/atmos)
 "kKl" = (
@@ -62215,10 +62212,13 @@
 /turf/open/floor/plasteel,
 /area/hallway/secondary/exit/departure_lounge)
 "kTS" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/machinery/atmospherics/pipe/simple/yellow/visible,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer3,
+/obj/machinery/door/airlock/maintenance/abandoned{
+	name = "Storage Room";
+	req_access_txt = "12"
+	},
 /turf/open/floor/plating,
-/area/engineering/atmos)
+/area/maintenance/starboard)
 "kUx" = (
 /obj/machinery/camera{
 	c_tag = "Council Chamber"
@@ -62357,9 +62357,6 @@
 /turf/open/floor/wood,
 /area/commons/vacant_room/office)
 "kXS" = (
-/obj/machinery/light_switch{
-	pixel_y = 25
-	},
 /obj/machinery/suit_storage_unit/rd,
 /obj/effect/turf_decal/delivery,
 /turf/open/floor/plasteel{
@@ -62456,6 +62453,9 @@
 /obj/item/stock_parts/cell/high,
 /obj/item/stock_parts/cell/high,
 /obj/machinery/cell_charger,
+/obj/machinery/computer/security/telescreen/circuitry{
+	pixel_y = -30
+	},
 /turf/open/floor/plasteel/white,
 /area/science/circuit)
 "kYY" = (
@@ -62637,7 +62637,9 @@
 /area/commons/locker)
 "ldI" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/visible,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1,
+/obj/machinery/atmospherics/components/binary/pump/on/layer1{
+	name = "External to Filter"
+	},
 /turf/open/floor/plasteel,
 /area/engineering/atmos)
 "lep" = (
@@ -63835,9 +63837,6 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/obj/structure/cable/yellow{
-	icon_state = "4-8"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
@@ -63966,9 +63965,6 @@
 /turf/open/floor/plasteel,
 /area/hallway/primary/central)
 "lQV" = (
-/obj/structure/cable/yellow{
-	icon_state = "1-2"
-	},
 /obj/structure/disposalpipe/segment,
 /obj/effect/turf_decal/tile/neutral{
 	dir = 1
@@ -63981,6 +63977,9 @@
 	dir = 8
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1,
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
 /turf/open/floor/plasteel/dark,
 /area/command/heads_quarters/ce)
 "lRj" = (
@@ -64085,7 +64084,6 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/obj/structure/plasticflaps/opaque,
 /obj/machinery/navbeacon{
 	codes_txt = "delivery;dir=4";
 	dir = 4;
@@ -64100,10 +64098,11 @@
 /obj/machinery/door/window/westleft{
 	req_access_txt = "24"
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer3{
-	dir = 8
+/obj/machinery/atmospherics/pipe/simple/supply/visible/layer3{
+	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{
+/obj/structure/plasticflaps/opaque,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer1{
 	dir = 4
 	},
 /turf/open/floor/plasteel,
@@ -64243,10 +64242,6 @@
 /obj/structure/cable/yellow{
 	icon_state = "1-2"
 	},
-/obj/machinery/door/airlock/command{
-	name = "Chief Engineer's Office";
-	req_access_txt = "56"
-	},
 /obj/effect/turf_decal/bot{
 	dir = 1
 	},
@@ -64255,6 +64250,10 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer3,
+/obj/machinery/door/airlock/command{
+	name = "Chief Engineer's Office";
+	req_access_txt = "56"
+	},
 /turf/open/floor/plasteel{
 	dir = 1
 	},
@@ -64266,7 +64265,7 @@
 /obj/effect/turf_decal/tile/yellow{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/manifold/supply/visible/layer3{
+/obj/machinery/atmospherics/pipe/manifold/cyan/visible/layer3{
 	dir = 1
 	},
 /turf/open/floor/plasteel/dark/corner{
@@ -64768,6 +64767,14 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{
 	dir = 4
 	},
+/obj/effect/turf_decal/loading_area{
+	dir = 1;
+	icon_state = "steel_decals3"
+	},
+/obj/effect/turf_decal/loading_area{
+	dir = 10;
+	icon_state = "steel_decals3"
+	},
 /turf/open/floor/plasteel,
 /area/engineering/break_room)
 "mmH" = (
@@ -65023,7 +65030,10 @@
 /turf/open/floor/plasteel/dark,
 /area/engineering/break_room)
 "mtM" = (
-/obj/machinery/atmospherics/pipe/simple/green/visible/layer3,
+/obj/machinery/atmospherics/components/binary/pump/layer3{
+	dir = 1;
+	name = "Pure to Mix"
+	},
 /turf/open/floor/plasteel,
 /area/engineering/atmos)
 "muJ" = (
@@ -68677,7 +68687,9 @@
 	},
 /area/engineering/main)
 "oxn" = (
-/obj/machinery/door/window/westright,
+/obj/machinery/door/window/westright{
+	dir = 1
+	},
 /turf/open/floor/wood,
 /area/command/heads_quarters/captain/private)
 "oxr" = (
@@ -70824,10 +70836,10 @@
 /turf/open/floor/carpet/red,
 /area/commons/locker)
 "pCS" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{
+/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer1{
 	dir = 6
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer3{
+/obj/machinery/atmospherics/pipe/simple/supply/visible/layer3{
 	dir = 6
 	},
 /turf/open/floor/plasteel,
@@ -71397,7 +71409,9 @@
 	},
 /area/engineering/main)
 "pUB" = (
-/obj/machinery/atmospherics/components/unary/thermomachine/heater/on,
+/obj/machinery/atmospherics/components/unary/thermomachine/heater/on{
+	piping_layer = 3
+	},
 /obj/effect/turf_decal/tile/yellow{
 	dir = 4
 	},
@@ -71463,6 +71477,10 @@
 	},
 /turf/open/floor/plasteel,
 /area/engineering/atmos)
+"pVp" = (
+/obj/effect/spawner/structure/window/reinforced,
+/turf/open/floor/plating,
+/area/maintenance/aft)
 "pVL" = (
 /obj/structure/cable/yellow{
 	icon_state = "1-2"
@@ -73271,11 +73289,11 @@
 /obj/effect/turf_decal/tile/yellow{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer3,
 /obj/machinery/camera{
 	c_tag = "Atmospherics - Distro Loop";
 	pixel_y = 12
 	},
+/obj/machinery/atmospherics/pipe/manifold4w/supply/visible/layer3,
 /turf/open/floor/plasteel/dark/corner{
 	dir = 1
 	},
@@ -73890,9 +73908,11 @@
 /turf/open/floor/engine,
 /area/engineering/main)
 "rid" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/machinery/atmospherics/pipe/layer_manifold,
-/turf/open/floor/plating,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/visible,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer1{
+	dir = 9
+	},
+/turf/open/floor/plasteel,
 /area/engineering/atmos)
 "rif" = (
 /obj/machinery/door/airlock/public/glass{
@@ -74311,10 +74331,14 @@
 /turf/open/floor/plasteel,
 /area/engineering/main)
 "rwh" = (
+/obj/effect/mapping_helpers/airlock/cyclelink_helper,
 /obj/machinery/door/airlock/external{
 	name = "Auxiliary Escape Airlock"
 	},
-/obj/effect/mapping_helpers/airlock/cyclelink_helper,
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/obj/effect/turf_decal/stripes/line,
 /turf/open/floor/plating,
 /area/maintenance/aft)
 "rwk" = (
@@ -74877,7 +74901,7 @@
 	dir = 8;
 	name = "Distro to Waste"
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer3,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
 /turf/open/floor/plasteel/dark/corner{
 	dir = 1
 	},
@@ -76327,10 +76351,10 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer3{
 	dir = 9
 	},
+/obj/machinery/vending/assist,
 /obj/structure/sign/poster/official/random{
 	pixel_y = -32
 	},
-/obj/machinery/vending/assist,
 /turf/open/floor/plasteel/white,
 /area/science/circuit)
 "sBz" = (
@@ -77357,9 +77381,8 @@
 /turf/open/floor/wood,
 /area/service/bar)
 "tfk" = (
-/obj/machinery/atmospherics/components/binary/pump/layer3{
-	dir = 1;
-	name = "Mix to Distro"
+/obj/machinery/atmospherics/components/unary/thermomachine/freezer{
+	piping_layer = 3
 	},
 /turf/open/floor/plasteel,
 /area/engineering/atmos)
@@ -77957,10 +77980,10 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer3{
-	dir = 8
+/obj/machinery/atmospherics/pipe/simple/supply/visible/layer3{
+	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{
+/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer1{
 	dir = 4
 	},
 /turf/open/floor/plasteel,
@@ -78115,9 +78138,6 @@
 /obj/effect/turf_decal/tile/blue{
 	dir = 8
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{
-	dir = 6
-	},
 /turf/open/floor/plasteel/white/corner{
 	dir = 1
 	},
@@ -80200,15 +80220,15 @@
 /turf/open/floor/plasteel/dark,
 /area/engineering/break_room)
 "uLv" = (
-/obj/structure/cable/white{
-	icon_state = "4-8"
-	},
 /obj/effect/turf_decal/stripes/corner{
 	dir = 1
 	},
 /obj/machinery/atmospherics/pipe/simple/cyan/visible{
 	dir = 10
 	},
+/obj/structure/cable/white{
+	icon_state = "1-4"
+	},
 /turf/open/floor/engine,
 /area/engineering/main)
 "uLG" = (
@@ -82334,13 +82354,13 @@
 /area/command/heads_quarters/rd)
 "vXi" = (
 /obj/effect/landmark/event_spawn,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer3{
-	dir = 10
-	},
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{
+/obj/machinery/atmospherics/pipe/simple/supply/visible/layer3{
+	dir = 10
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer1{
 	dir = 10
 	},
 /turf/open/floor/plasteel,
@@ -82624,9 +82644,6 @@
 	pixel_x = 28
 	},
 /obj/structure/cable/yellow,
-/obj/structure/cable/yellow{
-	icon_state = "0-2"
-	},
 /obj/machinery/light_switch{
 	pixel_x = 26;
 	pixel_y = 26
@@ -82645,6 +82662,9 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer3{
 	dir = 9
 	},
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
 /turf/open/floor/plasteel/dark,
 /area/command/heads_quarters/ce)
 "wdQ" = (
@@ -116516,7 +116536,7 @@ ctL
 cvJ
 cwK
 cxH
-cyt
+cvL
 czl
 cAp
 cBj
@@ -117048,7 +117068,7 @@ bSt
 cMl
 cJl
 bTs
-bTs
+pVp
 bTs
 aaf
 aaa
@@ -117288,15 +117308,15 @@ vAQ
 cvL
 vAQ
 cvL
-cBm
+cvL
 cAs
-cBm
+cvL
 cCq
 cDi
 cDi
 cDi
 cDi
-cGZ
+cIP
 cHV
 cIP
 cCq
@@ -117553,7 +117573,7 @@ ohK
 caw
 ohK
 cGg
-cHa
+czo
 cHW
 oVa
 cJO
@@ -117810,7 +117830,7 @@ fLC
 dDy
 fLC
 cGh
-cHb
+cGh
 cHX
 cIR
 cJP
@@ -124485,7 +124505,7 @@ gGT
 cxO
 dGH
 cfa
-cuZ
+noG
 aaf
 aaa
 aaf
@@ -124742,7 +124762,7 @@ cxO
 cxO
 cxO
 kSF
-cuZ
+noG
 aaa
 aaa
 aaa
@@ -125977,7 +125997,7 @@ snM
 fEm
 lkU
 nmz
-bhO
+psM
 bjC
 blg
 bmV
@@ -127029,7 +127049,7 @@ bQQ
 bSe
 bTh
 bUx
-bSe
+kTS
 bXc
 bZz
 bZE
@@ -127520,7 +127540,7 @@ nmz
 nmz
 nmz
 vsF
-tMN
+cBm
 cyy
 mmy
 pTr
@@ -127531,7 +127551,7 @@ qxd
 jJw
 usM
 woN
-lzQ
+cyt
 tyC
 mMn
 gmD
@@ -128822,7 +128842,7 @@ hop
 ldI
 elC
 kKa
-ooB
+rid
 ooB
 cRg
 diP
@@ -129552,7 +129572,7 @@ ocS
 ocS
 uuf
 ocS
-ghb
+tZi
 ocS
 xtF
 iBm
@@ -129600,7 +129620,7 @@ mMn
 mMn
 mMn
 mMn
-mMn
+cGZ
 mMn
 tSa
 pUZ
@@ -129862,7 +129882,7 @@ mMn
 tSa
 guR
 elE
-kTS
+vxg
 cfw
 mTL
 ygg
@@ -130099,10 +130119,10 @@ wBE
 fHh
 flE
 rMA
-nJr
+cHa
 pPS
 esR
-hfg
+tfk
 uED
 hfg
 tac
@@ -130119,7 +130139,7 @@ mMn
 kdB
 eCq
 nYm
-rid
+vxg
 cfx
 dPI
 dPI
@@ -130870,7 +130890,7 @@ iYP
 iod
 qxd
 lYe
-tfk
+mtM
 vms
 vOz
 wAs
diff --git a/code/modules/events/prison_break.dm b/code/modules/events/prison_break.dm
index e49e699338..b1e5e864f4 100644
--- a/code/modules/events/prison_break.dm
+++ b/code/modules/events/prison_break.dm
@@ -1,7 +1,7 @@
 /datum/round_event_control/grey_tide
 	name = "Grey Tide"
 	typepath = /datum/round_event/grey_tide
-	max_occurrences = 2
+	max_occurrences = 0 //GS13 - disabling for now
 	min_players = 12
 	category = EVENT_CATEGORY_ENGINEERING
 	description = "Bolts open all doors in one or more departments."
diff --git a/code/modules/mob/living/carbon/human/innate_abilities/coiling.dm b/code/modules/mob/living/carbon/human/innate_abilities/coiling.dm
index 4df77a489b..6ec1f997b5 100644
--- a/code/modules/mob/living/carbon/human/innate_abilities/coiling.dm
+++ b/code/modules/mob/living/carbon/human/innate_abilities/coiling.dm
@@ -9,6 +9,8 @@
 	var/currently_coiling = FALSE
 	var/mob/living/carbon/human/currently_coiled
 	var/mutable_appearance/tracked_overlay
+	//GS13 Edit
+	var/stored_tail
 
 /datum/action/innate/ability/coiling/Activate()
 	// make sure they meet the mobility/check flags
@@ -56,6 +58,8 @@
 
 	// set our overlay to new image
 	var/mob/living/carbon/human/user = owner
+	//GS13 Edit
+	stored_tail = user.dna.features["taur"]
 	user.dna.species.mutant_bodyparts["taur"] = "Naga (coiled)"
 	user.dna.features["taur"] = "Naga (coiled)"
 	user.update_mutant_bodyparts()
@@ -79,8 +83,9 @@
 	UnregisterSignal(owner, COMSIG_ATOM_DIR_CHANGE)
 
 	// change overlay back to original image
-	H.dna.species.mutant_bodyparts["taur"] = "Naga"
-	H.dna.features["taur"] = "Naga"
+	//GS13 Edit
+	H.dna.species.mutant_bodyparts["taur"] = stored_tail
+	H.dna.features["taur"] = stored_tail
 	H.update_mutant_bodyparts()
 
 	H.update_body()
diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm
index 550d179583..16244bef14 100644
--- a/code/modules/mob/living/carbon/human/species.dm
+++ b/code/modules/mob/living/carbon/human/species.dm
@@ -925,10 +925,12 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
 		if(A.type == /datum/action/innate/ability/coiling)
 			found_action = A
 
-	if(found_action && (!tauric || (H.dna.features["taur"] != "Naga" && H.dna.features["taur"] != "Naga (coiled)")))
+	//GS13 Edit - Adding action for other naga tails
+	if(found_action && (!tauric || ((H.dna.features["taur"] != "Naga" && H.dna.features["taur"] != "Fat Naga" && H.dna.features["taur"] != "Alt Naga") && H.dna.features["taur"] != "Naga (coiled)")))
 		found_action.Remove(H)
 
-	if(!found_action && tauric && H.dna.features["taur"] == "Naga")
+	//GS13 Edit - Adding action for other naga tails
+	if(!found_action && tauric && (H.dna.features["taur"] == "Naga" || H.dna.features["taur"] == "Fat Naga" || H.dna.features["taur"] == "Alt Naga"))
 		found_action = new /datum/action/innate/ability/coiling()
 		found_action.Grant(H)
 
diff --git a/modular_citadel/code/modules/client/loadout/__donator.dm b/modular_citadel/code/modules/client/loadout/__donator.dm
index cf5c74a38d..b4df686711 100644
--- a/modular_citadel/code/modules/client/loadout/__donator.dm
+++ b/modular_citadel/code/modules/client/loadout/__donator.dm
@@ -39,7 +39,7 @@
 	ckeywhitelist = list("lumu", "sonoida")
 
 /datum/gear/donator/rose_plush
-	name = "Dezir Rose Plush"
+	name = "Dezir Rose Plussh"
 	category = LOADOUT_CATEGORY_DONATOR
 	path = /obj/item/toy/plush/gs13/rose
 	ckeywhitelist = list("eremitanovem", "sonoida", "Absolutely_Free", "absolutely_free", "ABSOLUTELY_FREE")
@@ -54,7 +54,13 @@
 	name = "Overcoat of the Destitute"
 	category = LOADOUT_CATEGORY_DONATOR
 	path = /obj/item/clothing/suit/storage/blueshield/grimmy
-	ckeywhitelist = list("bbgrimmy")
+	ckeywhitelist = list("bbgrimmy", "BBGrimmy", "Bbgrimmy")
+
+/datum/gear/donator/cosmic_coat
+	name = "Cosmic Coat"
+	category = LOADOUT_CATEGORY_DONATOR
+	path = /obj/item/clothing/suit/hooded/wintercoat/cosmic
+	ckeywhitelist = list("Neun", "neun", "NEUN")
 
 /datum/gear/donator/tarek_gps
 	name = "Tarek's GPS"
diff --git a/modular_citadel/icons/mob/mam_snouts.dmi b/modular_citadel/icons/mob/mam_snouts.dmi
index e838e97f68..a5762f1ce3 100644
Binary files a/modular_citadel/icons/mob/mam_snouts.dmi and b/modular_citadel/icons/mob/mam_snouts.dmi differ