diff --git a/code/game/machinery/doors/brigdoors.dm b/code/game/machinery/doors/brigdoors.dm
index 0935dfa7248..7e25bb2df97 100644
--- a/code/game/machinery/doors/brigdoors.dm
+++ b/code/game/machinery/doors/brigdoors.dm
@@ -351,6 +351,12 @@
 	name = "Cell 6"
 	id = "Cell 6"
 
+
+/obj/machinery/door_timer/tactical_pet_storage //Vorestation Addition
+	name = "Tactical Pet Storage"
+	id = "tactical_pet_storage"
+	desc = "Opens and Closes on a timer. This one seals away a tactical boost in morale."
+
 #undef FONT_SIZE
 #undef FONT_COLOR
 #undef FONT_STYLE
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/pets/cat.dm b/code/modules/mob/living/simple_mob/subtypes/animal/pets/cat.dm
index 11d1c0e5045..0a4f254bbdc 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/pets/cat.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/pets/cat.dm
@@ -102,6 +102,7 @@
 	icon_state = "cat"
 	item_state = "cat"
 	named = TRUE
+	makes_dirt = 0 //Vorestation Edit
 
 /mob/living/simple_mob/animal/passive/cat/kitten
 	name = "kitten"
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/sif/fluffy_vr.dm b/code/modules/mob/living/simple_mob/subtypes/animal/sif/fluffy_vr.dm
index 8507480f01b..298cdffd84c 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/sif/fluffy_vr.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/sif/fluffy_vr.dm
@@ -14,6 +14,7 @@
 	health = 20
 
 	movement_cooldown = 5
+	makes_dirt = 0
 
 	see_in_dark = 5
 	mob_size = MOB_TINY
@@ -38,3 +39,12 @@
 	speak = list("Squee","Arf arf","Awoo","Squeak")
 	emote_hear = list("howls","squeals","squeaks", "barks")
 	emote_see = list("puffs its fur out", "shakes its fur", "stares directly at you")
+
+/mob/living/simple_mob/animal/sif/fluffy/silky
+	name = "Silky"
+	desc = "It's a blue Diyaab! It seems to be very tame and quiet."
+
+	icon_state = "diyaab"
+	icon_living = "diyaab"
+	icon_dead = "diyaab_dead"
+	icon = 'icons/jungle.dmi'
\ No newline at end of file
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/sif/shantak.dm b/code/modules/mob/living/simple_mob/subtypes/animal/sif/shantak.dm
index bb6a25604a9..a6948a3e00b 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/sif/shantak.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/sif/shantak.dm
@@ -95,5 +95,12 @@
 
 
 // These ones only retaliate. Used for a PoI.
-/mob/living/simple_mob/animal/sif/shantak/retaliate
-	ai_holder_type = /datum/ai_holder/simple_mob/retaliate
\ No newline at end of file
+/mob/living/simple_mob/animal/sif/shantak/retaliate
+	ai_holder_type = /datum/ai_holder/simple_mob/retaliate
+
+//Vorestation Addition
+/mob/living/simple_mob/animal/sif/shantak/scruffy
+	name = "Scruffy"
+	ai_holder_type = /datum/ai_holder/simple_mob/passive
+	makes_dirt = 0
+	faction = "neutral"
\ No newline at end of file
diff --git a/maps/tether/tether-02-surface2.dmm b/maps/tether/tether-02-surface2.dmm
index ac1b2eaf6d8..55c9fadd939 100644
--- a/maps/tether/tether-02-surface2.dmm
+++ b/maps/tether/tether-02-surface2.dmm
@@ -1051,12 +1051,11 @@
 /turf/simulated/floor/plating,
 /area/maintenance/lower/rnd)
 "cq" = (
-/obj/effect/decal/cleanable/dirt,
 /obj/machinery/alarm{
 	dir = 1;
 	pixel_y = -22
 	},
-/turf/simulated/floor/plating,
+/turf/simulated/floor,
 /area/maintenance/lower/rnd)
 "cr" = (
 /obj/structure/railing{
@@ -1226,6 +1225,14 @@
 /obj/effect/floor_decal/corner/mauve/border{
 	dir = 1
 	},
+/obj/structure/table/rack,
+/obj/item/weapon/rig/hazmat/equipped,
+/obj/machinery/light_switch{
+	dir = 2;
+	name = "light switch ";
+	pixel_x = 0;
+	pixel_y = 36
+	},
 /turf/simulated/floor/tiled,
 /area/rnd/rdoffice)
 "cP" = (
@@ -4379,8 +4386,6 @@
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/maintenance/lower/bar)
 "jv" = (
-/obj/structure/table/rack,
-/obj/item/weapon/rig/hazmat/equipped,
 /obj/effect/floor_decal/borderfloor{
 	dir = 8;
 	icon_state = "borderfloor";
@@ -4389,9 +4394,12 @@
 /obj/effect/floor_decal/corner/mauve/border{
 	dir = 8
 	},
-/obj/machinery/light_switch{
-	dir = 4;
-	pixel_x = -28
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	icon_state = "intact-scrubbers";
+	dir = 4
 	},
 /turf/simulated/floor/tiled,
 /area/rnd/rdoffice)
@@ -4453,7 +4461,7 @@
 /area/rnd/rdoffice)
 "jF" = (
 /mob/living/simple_mob/slime/xenobio/rainbow/kendrick,
-/turf/simulated/floor/tiled,
+/turf/simulated/floor/reinforced,
 /area/rnd/rdoffice)
 "jG" = (
 /obj/effect/decal/cleanable/dirt,
@@ -5119,8 +5127,9 @@
 /obj/machinery/photocopier/faxmachine{
 	department = "Research Director's Office"
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 10
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+	dir = 4
 	},
 /turf/simulated/floor/tiled,
 /area/rnd/rdoffice)
@@ -5429,10 +5438,10 @@
 /obj/machinery/computer/skills{
 	dir = 1
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 10
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+	dir = 4
+	},
 /turf/simulated/floor/tiled,
 /area/rnd/rdoffice)
 "lG" = (
@@ -12575,6 +12584,28 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/tiled/techmaint,
 /area/engineering/atmos)
+"yg" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	icon_state = "intact-scrubbers";
+	dir = 4
+	},
+/obj/machinery/door/window/eastleft{
+	name = "Kendrick's Pen";
+	req_access = list(30);
+	req_one_access = list(19)
+	},
+/obj/machinery/door/window/eastleft{
+	dir = 8;
+	icon_state = "left";
+	name = "Kendrick's Pen";
+	req_access = list(30);
+	req_one_access = list(19)
+	},
+/turf/simulated/floor/reinforced,
+/area/rnd/rdoffice)
 "yi" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -12658,6 +12689,30 @@
 	},
 /turf/simulated/floor/tiled/techfloor,
 /area/maintenance/asmaint2)
+"yr" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 10
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 10
+	},
+/turf/simulated/floor/tiled,
+/area/rnd/rdoffice)
+"yw" = (
+/obj/structure/grille,
+/obj/machinery/door/firedoor,
+/obj/structure/window/reinforced{
+	dir = 8
+	},
+/obj/structure/window/reinforced,
+/obj/structure/window/reinforced{
+	dir = 4
+	},
+/obj/structure/window/reinforced{
+	dir = 1
+	},
+/turf/simulated/floor/plating,
+/area/rnd/rdoffice)
 "yx" = (
 /obj/structure/cable/cyan{
 	d1 = 1;
@@ -13470,6 +13525,9 @@
 "Bw" = (
 /turf/simulated/floor/tiled/techmaint,
 /area/engineering/atmos)
+"BD" = (
+/turf/simulated/floor,
+/area/maintenance/lower/rnd)
 "BH" = (
 /obj/structure/catwalk,
 /obj/random/junk,
@@ -16421,6 +16479,13 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/plating,
 /area/maintenance/lower/atmos)
+"Jg" = (
+/obj/machinery/light{
+	dir = 1
+	},
+/obj/item/toy/plushie/farwa,
+/turf/simulated/floor/reinforced,
+/area/rnd/rdoffice)
 "Ji" = (
 /turf/simulated/wall/r_wall,
 /area/engineering/lower/lobby)
@@ -17068,6 +17133,16 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/plating,
 /area/maintenance/lower/south)
+"MK" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	icon_state = "intact-scrubbers";
+	dir = 4
+	},
+/turf/simulated/floor/tiled,
+/area/rnd/rdoffice)
 "MN" = (
 /obj/effect/floor_decal/borderfloor/shifted{
 	icon_state = "borderfloor_shifted";
@@ -17765,6 +17840,19 @@
 /obj/structure/catwalk,
 /turf/simulated/floor/plating,
 /area/maintenance/lower/south)
+"PN" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 5
+	},
+/obj/machinery/alarm{
+	dir = 1;
+	pixel_y = -22
+	},
+/turf/simulated/floor/reinforced,
+/area/rnd/rdoffice)
 "PP" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -18106,6 +18194,10 @@
 /obj/structure/simple_door/wood,
 /turf/simulated/floor/wood,
 /area/maintenance/lower/atmos)
+"RO" = (
+/obj/machinery/atmospherics/unary/vent_scrubber/on,
+/turf/simulated/floor/reinforced,
+/area/rnd/rdoffice)
 "RR" = (
 /obj/structure/catwalk,
 /obj/effect/floor_decal/rust,
@@ -18263,6 +18355,12 @@
 /obj/structure/disposalpipe/segment,
 /turf/simulated/floor/tiled/techmaint,
 /area/tether/surfacebase/east_stairs_two)
+"SQ" = (
+/obj/machinery/atmospherics/unary/vent_pump/on{
+	dir = 4
+	},
+/turf/simulated/floor/reinforced,
+/area/rnd/rdoffice)
 "SV" = (
 /obj/structure/bed/chair,
 /obj/effect/floor_decal/rust,
@@ -19577,6 +19675,10 @@
 /obj/structure/closet/secure_closet/personal,
 /turf/simulated/floor/wood,
 /area/vacant/vacant_bar_upper)
+"YV" = (
+/obj/machinery/camera/network/research,
+/turf/simulated/floor/reinforced,
+/area/rnd/rdoffice)
 "YX" = (
 /obj/structure/catwalk,
 /obj/effect/decal/cleanable/dirt,
@@ -26078,7 +26180,7 @@ ka
 cM
 ka
 ka
-kb
+ka
 ks
 ks
 ks
@@ -26218,9 +26320,9 @@ ho
 jy
 bz
 cp
-il
-jy
-jy
+ii
+ac
+ac
 ks
 lk
 lI
@@ -26358,11 +26460,11 @@ um
 vO
 ho
 jy
-jy
-il
-jy
-jy
-jy
+BD
+cF
+cF
+cF
+cF
 ks
 ll
 lM
@@ -26501,10 +26603,10 @@ hq
 ho
 jy
 bz
-il
-jy
-jy
-jy
+cF
+YV
+jF
+SQ
 ks
 lm
 ma
@@ -26643,10 +26745,10 @@ vW
 vA
 jx
 bz
-il
-jy
-jy
-jy
+cF
+Jg
+RO
+PN
 ks
 lC
 mb
@@ -26785,10 +26887,10 @@ hq
 ho
 jy
 bz
-il
-cF
 cF
 cF
+yw
+yg
 cF
 cF
 cF
@@ -26926,7 +27028,7 @@ hq
 ho
 ho
 jy
-jy
+BD
 cq
 cF
 cN
@@ -27072,7 +27174,7 @@ il
 il
 cF
 cO
-jE
+MK
 kK
 lE
 jE
@@ -27214,7 +27316,7 @@ il
 bz
 cF
 dP
-jE
+yr
 la
 lF
 md
@@ -27356,7 +27458,7 @@ bz
 bz
 cF
 fQ
-jF
+jE
 kq
 lG
 me
diff --git a/maps/tether/tether-05-station1.dmm b/maps/tether/tether-05-station1.dmm
index e2fdc2a8675..568fbb90746 100644
--- a/maps/tether/tether-05-station1.dmm
+++ b/maps/tether/tether-05-station1.dmm
@@ -11111,7 +11111,7 @@
 /turf/simulated/floor/tiled,
 /area/hallway/station/docks)
 "aBg" = (
-/obj/structure/flora/pottedplant/stoutbush,
+/obj/structure/closet/secure_closet/engineering_chief,
 /turf/simulated/floor/tiled,
 /area/crew_quarters/heads/chief)
 "aBh" = (
@@ -11210,7 +11210,6 @@
 /turf/simulated/floor/tiled,
 /area/engineering/engine_eva)
 "aBr" = (
-/obj/structure/table/reinforced,
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 1
 	},
@@ -11220,6 +11219,7 @@
 /obj/machinery/keycard_auth{
 	pixel_x = -28
 	},
+/obj/machinery/photocopier,
 /turf/simulated/floor/tiled,
 /area/crew_quarters/heads/hop)
 "aBt" = (
@@ -15387,8 +15387,11 @@
 	pixel_x = 25;
 	pixel_y = 0
 	},
-/obj/structure/closet/secure_closet/engineering_chief,
-/turf/simulated/floor/tiled,
+/obj/structure/window/reinforced{
+	dir = 1
+	},
+/obj/item/weapon/reagent_containers/food/snacks/snakesnack,
+/turf/simulated/floor/outdoors/grass/forest,
 /area/crew_quarters/heads/chief)
 "aTX" = (
 /obj/machinery/computer/general_air_control{
@@ -15599,11 +15602,10 @@
 /turf/simulated/floor/tiled,
 /area/crew_quarters/heads/chief)
 "aVG" = (
-/obj/machinery/light_switch{
-	dir = 1;
-	pixel_y = -24
+/obj/structure/window/reinforced{
+	dir = 8
 	},
-/turf/simulated/floor/tiled,
+/turf/simulated/floor/outdoors/grass/forest,
 /area/crew_quarters/heads/chief)
 "aVH" = (
 /obj/effect/floor_decal/industrial/warning/corner{
@@ -15932,6 +15934,12 @@
 /area/hallway/station/atrium)
 "aYE" = (
 /obj/structure/table/reinforced,
+/obj/machinery/light_switch{
+	dir = 2;
+	name = "light switch ";
+	pixel_x = 10;
+	pixel_y = 36
+	},
 /turf/simulated/floor/tiled,
 /area/crew_quarters/heads/chief)
 "aYF" = (
@@ -17210,7 +17218,6 @@
 /area/hallway/station/atrium)
 "bfT" = (
 /obj/structure/disposalpipe/segment,
-/mob/living/simple_mob/animal/passive/snake/noodle,
 /turf/simulated/floor/carpet/oracarpet,
 /area/crew_quarters/heads/chief)
 "bfW" = (
@@ -17490,6 +17497,11 @@
 /obj/structure/disposalpipe/trunk{
 	dir = 4
 	},
+/obj/machinery/alarm{
+	dir = 4;
+	pixel_x = -23;
+	pixel_y = 0
+	},
 /turf/simulated/floor/tiled,
 /area/crew_quarters/heads/chief)
 "bhr" = (
@@ -18976,7 +18988,6 @@
 /turf/simulated/floor/tiled/monotile,
 /area/bridge_hallway)
 "bsO" = (
-/obj/structure/table/reinforced,
 /obj/machinery/power/apc{
 	dir = 2;
 	name = "south bump";
@@ -18986,6 +18997,7 @@
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
 	dir = 1
 	},
+/obj/machinery/papershredder,
 /turf/simulated/floor/tiled,
 /area/crew_quarters/heads/hop)
 "bsP" = (
@@ -19002,11 +19014,11 @@
 /turf/simulated/floor/tiled,
 /area/crew_quarters/heads/hop)
 "bsR" = (
-/obj/structure/flora/pottedplant,
 /obj/machinery/camera/network/command{
 	c_tag = "Head of Personnel Office";
 	dir = 9
 	},
+/obj/structure/table/reinforced,
 /turf/simulated/floor/tiled,
 /area/crew_quarters/heads/hop)
 "bti" = (
@@ -22350,6 +22362,13 @@
 /obj/random/junk,
 /turf/simulated/floor,
 /area/maintenance/station/eng_lower)
+"klO" = (
+/obj/structure/window/reinforced{
+	dir = 8
+	},
+/obj/machinery/door/window/northleft,
+/turf/simulated/floor/outdoors/grass/forest,
+/area/crew_quarters/heads/chief)
 "kCH" = (
 /obj/machinery/door/firedoor/glass,
 /obj/structure/grille,
@@ -22493,6 +22512,10 @@
 /obj/structure/window/reinforced,
 /turf/simulated/floor/plating,
 /area/tether/station/dock_one)
+"vyI" = (
+/mob/living/simple_mob/animal/passive/snake/noodle,
+/turf/simulated/floor/outdoors/grass/forest,
+/area/crew_quarters/heads/chief)
 "wlD" = (
 /obj/machinery/door/firedoor/glass,
 /obj/structure/grille,
@@ -27979,7 +28002,7 @@ agc
 aRV
 aQh
 aRV
-aRV
+klO
 aVG
 aRb
 bYi
@@ -28122,7 +28145,7 @@ aZg
 aQl
 aSu
 aTW
-aBg
+vyI
 aRb
 bYj
 bYj
diff --git a/maps/tether/tether-06-station2.dmm b/maps/tether/tether-06-station2.dmm
index eccdca65607..83d924e86b0 100644
--- a/maps/tether/tether-06-station2.dmm
+++ b/maps/tether/tether-06-station2.dmm
@@ -16167,6 +16167,9 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
+/obj/machinery/light_switch{
+	pixel_y = -26
+	},
 /turf/simulated/floor/tiled,
 /area/bridge/meeting_room)
 "yO" = (
@@ -16868,29 +16871,6 @@
 	},
 /turf/simulated/floor/wood,
 /area/bridge/meeting_room)
-"zH" = (
-/obj/machinery/photocopier,
-/turf/simulated/floor/wood,
-/area/bridge/meeting_room)
-"zI" = (
-/obj/machinery/alarm{
-	dir = 1;
-	icon_state = "alarm0";
-	pixel_y = -22
-	},
-/obj/structure/table/woodentable,
-/turf/simulated/floor/wood,
-/area/bridge/meeting_room)
-"zJ" = (
-/obj/machinery/light,
-/turf/simulated/floor/wood,
-/area/bridge/meeting_room)
-"zK" = (
-/obj/machinery/light_switch{
-	pixel_y = -26
-	},
-/turf/simulated/floor/wood,
-/area/bridge/meeting_room)
 "zL" = (
 /obj/structure/cable/green{
 	d1 = 1;
@@ -20082,6 +20062,13 @@
 	},
 /turf/simulated/floor,
 /area/maintenance/station/sec_lower)
+"Hg" = (
+/obj/machinery/keycard_auth{
+	pixel_y = -28
+	},
+/obj/structure/flora/pottedplant,
+/turf/simulated/floor/wood,
+/area/bridge/meeting_room)
 "Hq" = (
 /obj/structure/grille,
 /obj/structure/window/reinforced/full,
@@ -20155,12 +20142,6 @@
 	},
 /turf/simulated/floor,
 /area/maintenance/station/sec_lower)
-"HU" = (
-/obj/machinery/keycard_auth{
-	pixel_y = -28
-	},
-/turf/simulated/floor/wood,
-/area/bridge/meeting_room)
 "Ik" = (
 /obj/machinery/light/small{
 	dir = 8
@@ -20257,6 +20238,15 @@
 /obj/structure/railing,
 /turf/simulated/open,
 /area/engineering/shaft)
+"Jn" = (
+/obj/machinery/alarm{
+	dir = 1;
+	icon_state = "alarm0";
+	pixel_y = -22
+	},
+/obj/machinery/photocopier,
+/turf/simulated/floor/wood,
+/area/bridge/meeting_room)
 "Jp" = (
 /obj/machinery/alarm{
 	dir = 4;
@@ -21154,6 +21144,10 @@
 	},
 /turf/simulated/floor,
 /area/maintenance/station/sec_lower)
+"Ry" = (
+/obj/structure/table/woodentable,
+/turf/simulated/floor/wood,
+/area/bridge/meeting_room)
 "RB" = (
 /obj/structure/grille,
 /obj/structure/window/reinforced/full,
@@ -21324,6 +21318,11 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/tiled/white,
 /area/maintenance/station/sec_lower)
+"Tc" = (
+/obj/machinery/light,
+/obj/structure/filingcabinet/filingcabinet,
+/turf/simulated/floor/wood,
+/area/bridge/meeting_room)
 "Tj" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/closet,
@@ -34758,7 +34757,7 @@ yN
 wo
 wo
 wo
-ac
+wo
 ac
 aP
 aP
@@ -34897,11 +34896,11 @@ xs
 xK
 ym
 yO
-wV
+Ry
+Ry
 zG
 wo
-ac
-ac
+aP
 aP
 aP
 aP
@@ -35040,10 +35039,10 @@ wV
 yn
 yO
 wV
-zH
+wV
+Ry
 wo
-ac
-ac
+aP
 aP
 aP
 aP
@@ -35182,10 +35181,10 @@ wV
 yn
 yO
 wV
-zI
+wV
+Jn
 wo
-ac
-ac
+aP
 aP
 aP
 aP
@@ -35324,10 +35323,10 @@ xL
 yo
 yP
 xN
-zJ
+wV
+Tc
 wo
-ac
-ac
+aP
 aP
 aP
 aP
@@ -35466,10 +35465,10 @@ xM
 yp
 yQ
 zc
-zK
+wV
+wV
 wo
-ac
-ac
+aP
 aP
 aP
 aP
@@ -35609,9 +35608,9 @@ yq
 yR
 zc
 wV
+wV
 wo
-ac
-ac
+aP
 aP
 aP
 aP
@@ -35751,9 +35750,9 @@ yr
 yS
 xN
 wV
+wV
 wo
-ac
-ac
+aP
 aP
 aP
 aP
@@ -35886,16 +35885,16 @@ pB
 qg
 vK
 wo
-wX
 wV
 wV
-ys
 wV
 wV
-HU
+wV
+wV
+wV
+wV
 wo
-ac
-ac
+aP
 aP
 aP
 aP
@@ -36028,16 +36027,16 @@ uH
 vk
 vL
 wo
-wY
-wY
-wY
-wY
-wY
-wY
-wY
+wX
+wV
+wV
+ys
+wV
+wV
+wV
+Hg
 wo
-ac
-ac
+aP
 aP
 aP
 aP
@@ -36170,6 +36169,15 @@ uI
 tD
 oY
 oY
+wY
+wY
+wY
+wY
+wY
+wY
+wY
+wY
+wo
 aP
 aP
 aP
@@ -36178,15 +36186,6 @@ aP
 aP
 aP
 aP
-ac
-ac
-aP
-aP
-aP
-aP
-aP
-aP
-aP
 aP
 aP
 aP
@@ -36320,8 +36319,8 @@ aP
 aP
 aP
 aP
-ac
-ac
+aP
+aP
 aP
 aP
 aP
@@ -36454,6 +36453,13 @@ uK
 vl
 oY
 oY
+aa
+aa
+aa
+aa
+aa
+aa
+aa
 aP
 aP
 aP
@@ -36463,13 +36469,6 @@ aP
 aP
 aP
 aP
-ac
-aP
-aP
-aP
-aP
-aP
-aP
 aP
 aP
 aP
@@ -36602,8 +36601,8 @@ aa
 aa
 aa
 aa
-aP
-aP
+aa
+aa
 aP
 aP
 aP
diff --git a/maps/tether/tether-07-station3.dmm b/maps/tether/tether-07-station3.dmm
index a93c3fb555c..ba709438530 100644
--- a/maps/tether/tether-07-station3.dmm
+++ b/maps/tether/tether-07-station3.dmm
@@ -2704,6 +2704,9 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
+/obj/effect/floor_decal/carpet{
+	dir = 4
+	},
 /turf/simulated/floor/carpet,
 /area/crew_quarters/heads/hos)
 "eu" = (
@@ -2963,6 +2966,14 @@
 	},
 /turf/simulated/floor/lino,
 /area/security/detectives_office)
+"eP" = (
+/obj/machinery/door/airlock/engineering{
+	name = "Cargo Substation";
+	req_one_access = list(11,24,50)
+	},
+/obj/machinery/door/firedoor/glass,
+/turf/simulated/floor,
+/area/maintenance/substation/cargo)
 "eS" = (
 /obj/item/frame,
 /obj/effect/floor_decal/rust,
@@ -6041,6 +6052,9 @@
 /turf/simulated/floor/tiled,
 /area/security/observation)
 "jM" = (
+/obj/effect/floor_decal/carpet{
+	dir = 1
+	},
 /turf/simulated/floor/carpet,
 /area/crew_quarters/heads/hos)
 "jN" = (
@@ -6134,7 +6148,6 @@
 /turf/simulated/floor/tiled,
 /area/security/hallwayaux)
 "jV" = (
-/obj/structure/disposalpipe/segment,
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/alarm{
 	dir = 4;
@@ -6142,6 +6155,11 @@
 	pixel_x = -22;
 	pixel_y = 0
 	},
+/obj/structure/cable{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
 /turf/simulated/floor,
 /area/maintenance/station/cargo)
 "jW" = (
@@ -7812,9 +7830,6 @@
 /turf/simulated/floor/tiled/dark,
 /area/security/security_lockerroom)
 "my" = (
-/obj/structure/closet/secure_closet/hos,
-/obj/item/clothing/suit/space/void/security/fluff/hos,
-/obj/item/clothing/head/helmet/space/void/security/fluff/hos,
 /turf/simulated/floor/wood,
 /area/crew_quarters/heads/hos)
 "mz" = (
@@ -8482,6 +8497,9 @@
 	pixel_x = -32;
 	pixel_y = 0
 	},
+/obj/structure/closet/secure_closet/hos,
+/obj/item/clothing/head/helmet/space/void/security/fluff/hos,
+/obj/item/clothing/suit/space/void/security/fluff/hos,
 /turf/simulated/floor/wood,
 /area/crew_quarters/heads/hos)
 "nE" = (
@@ -8504,6 +8522,9 @@
 	pixel_y = 7
 	},
 /obj/item/weapon/pen/multi,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
 /turf/simulated/floor/carpet,
 /area/crew_quarters/heads/hos)
 "nF" = (
@@ -8511,9 +8532,6 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 10
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 6
-	},
 /obj/machinery/button/windowtint{
 	id = "hos_office";
 	pixel_x = -36;
@@ -8536,6 +8554,9 @@
 /obj/effect/landmark/start{
 	name = "Head of Security"
 	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+	dir = 1
+	},
 /turf/simulated/floor/carpet,
 /area/crew_quarters/heads/hos)
 "nG" = (
@@ -8750,6 +8771,7 @@
 	icon_state = "tube1";
 	dir = 8
 	},
+/obj/structure/closet/secure_closet/hos2,
 /turf/simulated/floor/wood,
 /area/crew_quarters/heads/hos)
 "nX" = (
@@ -8758,6 +8780,9 @@
 	d2 = 2;
 	icon_state = "1-2"
 	},
+/obj/effect/floor_decal/carpet{
+	dir = 8
+	},
 /turf/simulated/floor/carpet,
 /area/crew_quarters/heads/hos)
 "nY" = (
@@ -9028,10 +9053,12 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/effect/floor_decal/carpet,
 /turf/simulated/floor/carpet,
 /area/crew_quarters/heads/hos)
 "ow" = (
 /obj/machinery/hologram/holopad,
+/obj/effect/floor_decal/carpet,
 /turf/simulated/floor/carpet,
 /area/crew_quarters/heads/hos)
 "ox" = (
@@ -12109,41 +12136,12 @@
 /turf/simulated/floor/tiled,
 /area/security/hallway)
 "tc" = (
-/obj/structure/bed/chair/office/light{
-	dir = 4
-	},
-/obj/effect/landmark/start{
-	name = "Chief Medical Officer"
-	},
-/obj/machinery/button/remote/airlock{
-	desc = "A remote control switch for the CMO's office.";
-	id = "cmodoor";
-	name = "CMO Office Door Control";
-	pixel_x = -8;
-	pixel_y = -36
-	},
-/obj/machinery/button/remote/blast_door{
-	desc = "A remote control-switch for shutters.";
-	id = "virologyquar";
-	name = "Virology Emergency Lockdown Control";
-	pixel_x = 0;
-	pixel_y = -28;
-	req_access = list(5)
-	},
-/obj/machinery/button/remote/blast_door{
-	desc = "A remote control-switch for shutters.";
-	id = "medbayquar";
-	name = "Medbay Emergency Lockdown Control";
-	pixel_x = 0;
-	pixel_y = -36;
-	req_access = list(5)
-	},
-/obj/machinery/button/windowtint{
-	id = "cmo_office_int";
-	pixel_x = -6;
-	pixel_y = -28
-	},
-/turf/simulated/floor/tiled/white,
+/obj/structure/table/glass,
+/obj/item/weapon/paper_bin,
+/obj/item/weapon/pen,
+/obj/item/weapon/folder/white_cmo,
+/obj/item/weapon/stamp/cmo,
+/turf/simulated/floor/wood,
 /area/crew_quarters/heads/cmo)
 "td" = (
 /obj/effect/floor_decal/borderfloor{
@@ -14102,21 +14100,6 @@
 "we" = (
 /turf/space/cracked_asteroid,
 /area/mine/explored/upper_level)
-"wf" = (
-/obj/effect/floor_decal/borderfloorwhite{
-	dir = 10
-	},
-/obj/effect/floor_decal/corner/paleblue/border{
-	dir = 10
-	},
-/obj/machinery/button/windowtint{
-	id = "cmo_office_ext";
-	pixel_x = -20;
-	pixel_y = -25
-	},
-/obj/structure/flora/pottedplant/stoutbush,
-/turf/simulated/floor/tiled/white,
-/area/crew_quarters/heads/cmo)
 "wg" = (
 /obj/effect/floor_decal/spline/plain{
 	icon_state = "spline_plain";
@@ -16868,24 +16851,6 @@
 	},
 /turf/simulated/floor/tiled,
 /area/hallway/station/upper)
-"Ai" = (
-/obj/effect/floor_decal/borderfloor{
-	dir = 1
-	},
-/obj/effect/floor_decal/corner/red/border{
-	dir = 1
-	},
-/obj/effect/floor_decal/steeldecal/steel_decals7,
-/obj/effect/floor_decal/steeldecal/steel_decals7{
-	dir = 4
-	},
-/obj/item/device/radio/intercom{
-	dir = 1;
-	pixel_y = 24;
-	req_access = list()
-	},
-/turf/simulated/floor/tiled,
-/area/hallway/station/upper)
 "Aj" = (
 /obj/machinery/camera/network/tether,
 /obj/effect/floor_decal/borderfloor{
@@ -17242,7 +17207,7 @@
 /area/maintenance/station/cargo)
 "AI" = (
 /obj/structure/filingcabinet,
-/turf/simulated/floor/tiled,
+/turf/simulated/floor/wood,
 /area/quartermaster/qm)
 "AJ" = (
 /obj/machinery/requests_console{
@@ -17251,7 +17216,8 @@
 	pixel_x = 32;
 	pixel_y = 30
 	},
-/turf/simulated/floor/tiled,
+/obj/machinery/computer/security/mining,
+/turf/simulated/floor/wood,
 /area/quartermaster/qm)
 "AK" = (
 /obj/structure/table/standard,
@@ -17260,7 +17226,8 @@
 	pixel_y = 7
 	},
 /obj/item/device/megaphone,
-/turf/simulated/floor/tiled,
+/obj/machinery/camera/network/cargo,
+/turf/simulated/floor/wood,
 /area/quartermaster/qm)
 "AL" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -17271,12 +17238,12 @@
 /obj/effect/floor_decal/steeldecal/steel_decals4{
 	dir = 9
 	},
-/turf/simulated/floor/tiled,
+/turf/simulated/floor/wood,
 /area/quartermaster/qm)
 "AM" = (
 /obj/machinery/disposal,
 /obj/structure/disposalpipe/trunk,
-/turf/simulated/floor/tiled,
+/turf/simulated/floor/wood,
 /area/quartermaster/qm)
 "AN" = (
 /obj/machinery/status_display/supply_display,
@@ -17525,7 +17492,7 @@
 	icon_state = "4-8"
 	},
 /turf/simulated/floor/tiled,
-/area/hallway/station/upper)
+/area/space)
 "Bi" = (
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply{
 	dir = 1
@@ -17891,15 +17858,6 @@
 /obj/structure/reagent_dispensers/watertank,
 /turf/simulated/floor/tiled,
 /area/maintenance/station/cargo)
-"BL" = (
-/obj/machinery/camera/network/cargo{
-	dir = 4
-	},
-/obj/machinery/computer/supplycomp/control{
-	dir = 4
-	},
-/turf/simulated/floor/tiled,
-/area/quartermaster/qm)
 "BM" = (
 /obj/structure/bed/chair/office/dark{
 	dir = 8
@@ -17912,7 +17870,7 @@
 	pixel_x = 26;
 	pixel_y = 8
 	},
-/turf/simulated/floor/tiled,
+/turf/simulated/floor/wood,
 /area/quartermaster/qm)
 "BN" = (
 /obj/structure/table/standard,
@@ -17925,7 +17883,7 @@
 	pixel_x = 2;
 	pixel_y = 6
 	},
-/turf/simulated/floor/tiled,
+/turf/simulated/floor/wood,
 /area/quartermaster/qm)
 "BO" = (
 /obj/structure/bed/chair{
@@ -17933,7 +17891,7 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/turf/simulated/floor/tiled,
+/turf/simulated/floor/wood,
 /area/quartermaster/qm)
 "BP" = (
 /obj/structure/cable/green{
@@ -17946,7 +17904,7 @@
 	pixel_x = 28
 	},
 /obj/structure/disposalpipe/segment,
-/turf/simulated/floor/tiled,
+/turf/simulated/floor/wood,
 /area/quartermaster/qm)
 "BQ" = (
 /obj/effect/floor_decal/industrial/hatch/yellow,
@@ -18372,9 +18330,8 @@
 /turf/simulated/floor/tiled/white,
 /area/medical/patient_b)
 "CA" = (
-/obj/effect/floor_decal/rust,
-/turf/simulated/floor/tiled,
-/area/maintenance/station/cargo)
+/turf/simulated/floor/outdoors/grass/forest,
+/area/quartermaster/qm)
 "CB" = (
 /obj/machinery/light_switch{
 	pixel_y = -25
@@ -18384,14 +18341,8 @@
 /obj/item/weapon/storage/box/lights/mixed,
 /turf/simulated/floor/tiled,
 /area/maintenance/station/cargo)
-"CC" = (
-/obj/machinery/computer/security/mining{
-	dir = 4
-	},
-/turf/simulated/floor/tiled,
-/area/quartermaster/qm)
 "CD" = (
-/turf/simulated/floor/tiled,
+/turf/simulated/floor/wood,
 /area/quartermaster/qm)
 "CE" = (
 /obj/structure/table/standard,
@@ -18400,16 +18351,14 @@
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 4
 	},
-/turf/simulated/floor/tiled,
+/turf/simulated/floor/wood,
 /area/quartermaster/qm)
 "CF" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 9;
-	pixel_y = 0
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+	dir = 4
 	},
-/mob/living/simple_mob/animal/sif/fluffy,
-/turf/simulated/floor/tiled,
+/turf/simulated/floor/wood,
 /area/quartermaster/qm)
 "CG" = (
 /obj/structure/cable/green{
@@ -18425,7 +18374,7 @@
 /obj/effect/floor_decal/steeldecal/steel_decals4{
 	dir = 10
 	},
-/turf/simulated/floor/tiled,
+/turf/simulated/floor/wood,
 /area/quartermaster/qm)
 "CH" = (
 /obj/machinery/door/airlock/mining{
@@ -18846,16 +18795,23 @@
 /turf/simulated/floor/wood,
 /area/medical/psych)
 "Dv" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 6
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
 	},
-/turf/simulated/floor/tiled,
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+	dir = 1
+	},
+/turf/simulated/floor/wood,
 /area/quartermaster/qm)
 "Dw" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 9
 	},
-/turf/simulated/floor/tiled,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 9;
+	pixel_y = 0
+	},
+/turf/simulated/floor/wood,
 /area/quartermaster/qm)
 "Dx" = (
 /obj/structure/cable/green{
@@ -19321,32 +19277,6 @@
 	},
 /turf/simulated/floor,
 /area/maintenance/station/cargo)
-"El" = (
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/structure/disposalpipe/segment{
-	dir = 4
-	},
-/turf/simulated/floor,
-/area/maintenance/station/cargo)
-"Em" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable{
-	icon_state = "2-8"
-	},
-/obj/structure/disposalpipe/segment{
-	dir = 4
-	},
-/turf/simulated/floor,
-/area/maintenance/station/cargo)
-"En" = (
-/obj/structure/disposalpipe/segment{
-	dir = 2;
-	icon_state = "pipe-c"
-	},
-/turf/simulated/floor,
-/area/maintenance/station/cargo)
 "Eo" = (
 /obj/structure/closet,
 /obj/random/maintenance/cargo,
@@ -19361,7 +19291,7 @@
 /obj/machinery/photocopier/faxmachine{
 	department = "Quartermaster-Office"
 	},
-/turf/simulated/floor/tiled,
+/turf/simulated/floor/wood,
 /area/quartermaster/qm)
 "Eq" = (
 /obj/structure/table/standard,
@@ -19385,16 +19315,16 @@
 	pixel_y = 7
 	},
 /obj/item/weapon/cartridge/quartermaster,
-/turf/simulated/floor/tiled,
+/turf/simulated/floor/wood,
 /area/quartermaster/qm)
 "Er" = (
 /obj/structure/closet/secure_closet/quartermaster,
-/turf/simulated/floor/tiled,
+/turf/simulated/floor/wood,
 /area/quartermaster/qm)
 "Es" = (
 /obj/structure/closet,
 /obj/item/weapon/storage/backpack/dufflebag,
-/turf/simulated/floor/tiled,
+/turf/simulated/floor/wood,
 /area/quartermaster/qm)
 "Et" = (
 /obj/effect/floor_decal/industrial/outline/yellow,
@@ -19747,11 +19677,6 @@
 /obj/machinery/door/firedoor/glass,
 /turf/simulated/floor,
 /area/medical/psych)
-"Fe" = (
-/obj/structure/disposalpipe/segment,
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor,
-/area/maintenance/station/cargo)
 "Ff" = (
 /obj/structure/reagent_dispensers/fueltank,
 /turf/simulated/floor,
@@ -19760,30 +19685,6 @@
 /obj/random/trash_pile,
 /turf/simulated/floor,
 /area/maintenance/station/cargo)
-"Fh" = (
-/obj/structure/cable{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2";
-	pixel_y = 0
-	},
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor,
-/area/maintenance/station/cargo)
-"Fi" = (
-/obj/structure/cable/green{
-	d2 = 2;
-	icon_state = "0-2"
-	},
-/obj/machinery/power/apc{
-	dir = 4;
-	name = "east bump";
-	pixel_x = 28
-	},
-/obj/structure/disposalpipe/segment,
-/turf/simulated/floor,
-/area/maintenance/station/cargo)
 "Fj" = (
 /turf/simulated/wall,
 /area/quartermaster/warehouse)
@@ -20230,83 +20131,11 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/medical/reception)
-"FU" = (
-/obj/structure/sign/securearea{
-	desc = "A warning sign which reads 'HIGH VOLTAGE'";
-	icon_state = "shock";
-	name = "HIGH VOLTAGE";
-	pixel_y = 0
-	},
-/turf/simulated/wall,
-/area/maintenance/station/cargo)
-"FV" = (
-/obj/structure/cable{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2";
-	pixel_y = 0
-	},
-/obj/effect/floor_decal/rust,
-/turf/simulated/floor,
-/area/maintenance/station/cargo)
-"FW" = (
-/obj/structure/cable/green{
-	d1 = 2;
-	d2 = 4;
-	icon_state = "2-4"
-	},
-/obj/structure/cable/green{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
-	},
-/obj/structure/disposalpipe/segment{
-	dir = 1;
-	icon_state = "pipe-c"
-	},
-/turf/simulated/floor,
-/area/maintenance/station/cargo)
-"FX" = (
-/obj/structure/cable/green{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
-/obj/machinery/door/firedoor/glass,
-/obj/structure/disposalpipe/segment{
-	dir = 4
-	},
-/obj/machinery/door/airlock/maintenance/cargo{
-	req_access = list(50);
-	req_one_access = list(48)
-	},
-/turf/simulated/floor,
-/area/quartermaster/warehouse)
 "FY" = (
-/obj/structure/cable/green{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
-/obj/structure/cable/green{
-	d1 = 2;
-	d2 = 8;
-	icon_state = "2-8"
-	},
-/obj/structure/disposalpipe/segment{
-	dir = 4
-	},
+/obj/structure/closet/crate,
 /turf/simulated/floor/tiled,
 /area/quartermaster/warehouse)
 "FZ" = (
-/obj/structure/cable/green{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
-/obj/structure/disposalpipe/segment{
-	dir = 4
-	},
 /obj/machinery/light_switch{
 	dir = 2;
 	name = "light switch ";
@@ -20319,15 +20148,6 @@
 /obj/machinery/light/small{
 	dir = 1
 	},
-/obj/structure/cable/green{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
-/obj/structure/disposalpipe/segment{
-	dir = 2;
-	icon_state = "pipe-c"
-	},
 /turf/simulated/floor/tiled,
 /area/quartermaster/warehouse)
 "Gb" = (
@@ -20339,11 +20159,6 @@
 /obj/item/weapon/cell{
 	maxcharge = 2000
 	},
-/obj/structure/cable/green{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
 /turf/simulated/floor/tiled/steel,
 /area/quartermaster/warehouse)
 "Gc" = (
@@ -20351,11 +20166,6 @@
 	dir = 8;
 	layer = 2.9
 	},
-/obj/structure/cable/green{
-	d1 = 2;
-	d2 = 8;
-	icon_state = "2-8"
-	},
 /obj/machinery/camera/network/cargo{
 	c_tag = "CRG - Cargo Warehouse";
 	dir = 9
@@ -20662,42 +20472,8 @@
 "GC" = (
 /turf/simulated/wall,
 /area/maintenance/substation/cargo)
-"GD" = (
-/obj/structure/cable{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2";
-	pixel_y = 0
-	},
-/obj/machinery/door/firedoor/glass,
-/obj/machinery/door/airlock/engineering{
-	name = "Cargo Substation";
-	req_one_access = list(11,24,50)
-	},
-/turf/simulated/floor,
-/area/maintenance/substation/cargo)
-"GE" = (
-/obj/structure/cable/green{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
-	},
-/obj/machinery/door/firedoor/glass,
-/obj/machinery/door/airlock/engineering{
-	name = "Cargo Substation";
-	req_one_access = list(11,24,50)
-	},
-/turf/simulated/floor,
-/area/maintenance/substation/cargo)
 "GF" = (
 /obj/structure/closet/crate,
-/obj/structure/cable/green,
-/obj/machinery/power/apc{
-	cell_type = /obj/item/weapon/cell/super;
-	dir = 8;
-	name = "west bump";
-	pixel_x = -28
-	},
 /obj/effect/floor_decal/industrial/outline/yellow,
 /turf/simulated/floor/tiled,
 /area/quartermaster/warehouse)
@@ -20705,7 +20481,6 @@
 /turf/simulated/floor/tiled,
 /area/quartermaster/warehouse)
 "GH" = (
-/obj/structure/disposalpipe/segment,
 /obj/machinery/atmospherics/unary/vent_pump/on,
 /turf/simulated/floor/tiled,
 /area/quartermaster/warehouse)
@@ -20713,10 +20488,13 @@
 /turf/simulated/floor/tiled/steel,
 /area/quartermaster/warehouse)
 "GJ" = (
+/obj/machinery/power/apc{
+	dir = 4;
+	name = "east bump";
+	pixel_x = 28
+	},
 /obj/structure/cable/green{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
+	icon_state = "0-8"
 	},
 /turf/simulated/floor/tiled,
 /area/quartermaster/warehouse)
@@ -21066,67 +20844,77 @@
 /turf/simulated/floor,
 /area/maintenance/station/cargo)
 "Hs" = (
-/obj/structure/cable/green{
-	d2 = 4;
-	icon_state = "0-4"
-	},
-/obj/machinery/power/apc{
-	cell_type = /obj/item/weapon/cell/super;
-	dir = 8;
-	name = "west bump";
-	pixel_x = -28
-	},
 /obj/machinery/light/small{
 	dir = 1
 	},
 /obj/effect/decal/cleanable/dirt,
+/obj/machinery/power/apc{
+	dir = 1;
+	name = "north bump";
+	pixel_x = 0;
+	pixel_y = 24
+	},
+/obj/structure/cable{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
 /turf/simulated/floor,
 /area/maintenance/substation/cargo)
 "Ht" = (
+/obj/effect/decal/cleanable/dirt,
 /obj/structure/cable{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2";
+	d1 = 2;
+	d2 = 8;
+	icon_state = "2-8"
+	},
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/turf/simulated/floor,
+/area/maintenance/substation/cargo)
+"Hu" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/obj/structure/cable/green{
+	d1 = 2;
+	d2 = 4;
+	icon_state = "2-4"
+	},
+/turf/simulated/floor,
+/area/maintenance/substation/cargo)
+"Hv" = (
+/obj/machinery/light/small{
+	dir = 8;
 	pixel_y = 0
 	},
+/obj/effect/floor_decal/industrial/outline/yellow,
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
 /obj/structure/cable/green{
 	d1 = 4;
 	d2 = 8;
 	icon_state = "4-8"
 	},
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor,
-/area/maintenance/substation/cargo)
-"Hu" = (
-/obj/structure/cable/green{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
-	},
-/obj/structure/cable/green{
-	d1 = 2;
-	d2 = 8;
-	icon_state = "2-8"
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor,
-/area/maintenance/substation/cargo)
-"Hv" = (
-/obj/structure/closet/crate,
-/obj/machinery/light/small{
-	dir = 8;
-	pixel_y = 0
-	},
-/obj/effect/floor_decal/industrial/outline/yellow,
 /turf/simulated/floor/tiled,
 /area/quartermaster/warehouse)
 "Hw" = (
-/obj/structure/disposalpipe/segment{
-	dir = 1;
-	icon_state = "pipe-c"
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/effect/floor_decal/industrial/outline/yellow,
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/obj/structure/cable/green{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
 /turf/simulated/floor/tiled,
 /area/quartermaster/warehouse)
 "Hx" = (
@@ -21134,14 +20922,19 @@
 	dir = 4
 	},
 /obj/effect/floor_decal/industrial/outline/yellow,
+/obj/structure/cable/green{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
+/obj/structure/cable/green{
+	d1 = 1;
+	d2 = 8;
+	icon_state = "1-8"
+	},
 /turf/simulated/floor/tiled,
 /area/quartermaster/warehouse)
 "Hy" = (
-/obj/structure/cable/green{
-	d1 = 1;
-	d2 = 4;
-	icon_state = "1-4"
-	},
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
@@ -21149,6 +20942,11 @@
 /obj/effect/floor_decal/steeldecal/steel_decals6{
 	dir = 4
 	},
+/obj/structure/cable/green{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
 /turf/simulated/floor/tiled,
 /area/quartermaster/warehouse)
 "Hz" = (
@@ -21162,9 +20960,6 @@
 	d2 = 8;
 	icon_state = "4-8"
 	},
-/obj/structure/disposalpipe/segment{
-	dir = 4
-	},
 /obj/machinery/door/firedoor/glass,
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -21641,10 +21436,10 @@
 /obj/structure/cable{
 	icon_state = "0-8"
 	},
-/obj/structure/cable,
 /obj/effect/floor_decal/industrial/warning,
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/floor_decal/rust,
+/obj/structure/cable,
 /turf/simulated/floor,
 /area/maintenance/substation/cargo)
 "Il" = (
@@ -22611,6 +22406,11 @@
 /obj/machinery/door/airlock/maintenance/common,
 /obj/machinery/door/firedoor/glass,
 /obj/structure/disposalpipe/segment,
+/obj/structure/cable/green{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
 /turf/simulated/floor,
 /area/maintenance/station/medbay)
 "JH" = (
@@ -23017,6 +22817,11 @@
 	dir = 1;
 	icon_state = "pipe-c"
 	},
+/obj/structure/cable/green{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
 /turf/simulated/floor,
 /area/maintenance/station/medbay)
 "Kv" = (
@@ -23385,10 +23190,30 @@
 	pixel_x = -22;
 	pixel_y = 0
 	},
+/obj/structure/cable/green{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
+/obj/structure/cable/green{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
+/obj/structure/cable/green{
+	d1 = 2;
+	d2 = 4;
+	icon_state = "2-4"
+	},
 /turf/simulated/floor,
 /area/maintenance/station/medbay)
 "KX" = (
 /obj/structure/ladder,
+/obj/structure/cable/green{
+	d1 = 1;
+	d2 = 8;
+	icon_state = "1-8"
+	},
 /turf/simulated/floor,
 /area/maintenance/station/medbay)
 "KY" = (
@@ -23653,18 +23478,20 @@
 /turf/simulated/floor/tiled/white,
 /area/medical/surgery_hallway)
 "Lw" = (
-/obj/machinery/disposal,
 /obj/effect/floor_decal/borderfloorwhite{
-	dir = 1
+	dir = 9
 	},
 /obj/effect/floor_decal/corner/paleblue/border{
-	dir = 1
+	dir = 9
 	},
-/obj/structure/disposalpipe/trunk,
-/obj/item/device/radio/intercom{
+/obj/machinery/power/apc{
 	dir = 1;
-	pixel_y = 24;
-	req_access = list()
+	name = "north bump";
+	pixel_x = 0;
+	pixel_y = 24
+	},
+/obj/structure/cable/green{
+	icon_state = "0-2"
 	},
 /turf/simulated/floor/tiled/white,
 /area/crew_quarters/heads/cmo)
@@ -24337,51 +24164,20 @@
 /turf/simulated/open,
 /area/medical/surgery_hallway)
 "My" = (
-/obj/effect/floor_decal/borderfloorwhite{
-	dir = 9
-	},
-/obj/effect/floor_decal/corner/paleblue/border{
-	dir = 9
-	},
-/obj/machinery/light_switch{
-	dir = 2;
-	name = "light switch ";
-	pixel_x = 0;
-	pixel_y = 26
-	},
-/obj/machinery/camera/network/medbay{
-	dir = 4
-	},
-/obj/item/modular_computer/console/preset/command,
-/turf/simulated/floor/tiled/white,
-/area/crew_quarters/heads/cmo)
-"Mz" = (
 /obj/structure/filingcabinet/chestdrawer{
 	dir = 1
 	},
-/obj/effect/floor_decal/borderfloorwhite{
-	dir = 1
-	},
-/obj/effect/floor_decal/corner/paleblue/border{
-	dir = 1
-	},
 /obj/machinery/alarm{
 	pixel_y = 22
 	},
-/turf/simulated/floor/tiled/white,
+/turf/simulated/floor/wood,
 /area/crew_quarters/heads/cmo)
-"MA" = (
+"Mz" = (
 /obj/structure/table/glass,
 /obj/machinery/computer/med_data/laptop{
 	pixel_x = 6;
 	pixel_y = 4
 	},
-/obj/effect/floor_decal/borderfloorwhite{
-	dir = 1
-	},
-/obj/effect/floor_decal/corner/paleblue/border{
-	dir = 1
-	},
 /obj/machinery/computer/skills{
 	pixel_x = -6;
 	pixel_y = -3
@@ -24394,7 +24190,17 @@
 	pixel_x = 0;
 	pixel_y = 30
 	},
-/turf/simulated/floor/tiled/white,
+/turf/simulated/floor/wood,
+/area/crew_quarters/heads/cmo)
+"MA" = (
+/obj/machinery/disposal,
+/obj/structure/disposalpipe/trunk,
+/obj/item/device/radio/intercom{
+	dir = 1;
+	pixel_y = 24;
+	req_access = list()
+	},
+/turf/simulated/floor/wood,
 /area/crew_quarters/heads/cmo)
 "MB" = (
 /obj/structure/bed/padded,
@@ -24444,6 +24250,7 @@
 /obj/effect/floor_decal/corner/paleblue/bordercorner2{
 	dir = 5
 	},
+/obj/structure/flora/pottedplant/stoutbush,
 /turf/simulated/floor/tiled/white,
 /area/crew_quarters/heads/cmo)
 "ME" = (
@@ -24586,18 +24393,41 @@
 /turf/simulated/floor,
 /area/maintenance/station/medbay)
 "MN" = (
-/obj/effect/floor_decal/borderfloorwhite{
-	dir = 8
+/obj/structure/bed/chair/office/light{
+	dir = 4
 	},
-/obj/effect/floor_decal/corner/paleblue/border{
-	dir = 8
+/obj/effect/landmark/start{
+	name = "Chief Medical Officer"
 	},
-/obj/machinery/newscaster{
-	layer = 3.3;
-	pixel_x = -27;
-	pixel_y = 0
+/obj/machinery/button/remote/airlock{
+	desc = "A remote control switch for the CMO's office.";
+	id = "cmodoor";
+	name = "CMO Office Door Control";
+	pixel_x = -8;
+	pixel_y = -36
 	},
-/turf/simulated/floor/tiled/white,
+/obj/machinery/button/remote/blast_door{
+	desc = "A remote control-switch for shutters.";
+	id = "virologyquar";
+	name = "Virology Emergency Lockdown Control";
+	pixel_x = 0;
+	pixel_y = -28;
+	req_access = list(5)
+	},
+/obj/machinery/button/remote/blast_door{
+	desc = "A remote control-switch for shutters.";
+	id = "medbayquar";
+	name = "Medbay Emergency Lockdown Control";
+	pixel_x = 0;
+	pixel_y = -36;
+	req_access = list(5)
+	},
+/obj/machinery/button/windowtint{
+	id = "cmo_office_int";
+	pixel_x = -6;
+	pixel_y = -28
+	},
+/turf/simulated/floor/wood,
 /area/crew_quarters/heads/cmo)
 "MO" = (
 /obj/structure/table/glass,
@@ -24619,14 +24449,6 @@
 /turf/simulated/floor/tiled/white,
 /area/medical/patient_c)
 "MP" = (
-/obj/structure/table/glass,
-/obj/item/weapon/paper_bin,
-/obj/item/weapon/pen,
-/obj/item/weapon/folder/white_cmo,
-/obj/item/weapon/stamp/cmo,
-/turf/simulated/floor/tiled/white,
-/area/crew_quarters/heads/cmo)
-"MQ" = (
 /obj/structure/bed/chair{
 	dir = 8
 	},
@@ -24634,14 +24456,26 @@
 	dir = 1;
 	icon_state = "pipe-c"
 	},
+/turf/simulated/floor/wood,
+/area/crew_quarters/heads/cmo)
+"MQ" = (
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/obj/effect/floor_decal/borderfloorwhite{
+	dir = 8
+	},
+/obj/effect/floor_decal/corner/paleblue/border{
+	dir = 8
+	},
+/obj/structure/cable/green{
+	d1 = 1;
+	d2 = 4;
+	icon_state = "1-4"
+	},
 /turf/simulated/floor/tiled/white,
 /area/crew_quarters/heads/cmo)
 "MR" = (
-/obj/structure/cable/green{
-	d1 = 2;
-	d2 = 4;
-	icon_state = "2-4"
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 5
 	},
@@ -24651,6 +24485,11 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
+/obj/structure/cable/green{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
 /turf/simulated/floor/tiled/white,
 /area/crew_quarters/heads/cmo)
 "MS" = (
@@ -25180,31 +25019,30 @@
 /area/crew_quarters/heads/cmo)
 "Ny" = (
 /obj/structure/table/glass,
-/turf/simulated/floor/tiled/white,
-/area/crew_quarters/heads/cmo)
-"Nz" = (
-/obj/structure/table/glass,
-/obj/machinery/photocopier/faxmachine{
-	department = "CMO's Office"
-	},
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 4
 	},
-/turf/simulated/floor/tiled/white,
+/turf/simulated/floor/wood,
+/area/crew_quarters/heads/cmo)
+"Nz" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/turf/simulated/floor/wood,
 /area/crew_quarters/heads/cmo)
 "NA" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
-/mob/living/simple_mob/animal/passive/cat/runtime,
+/obj/effect/floor_decal/borderfloorwhite{
+	dir = 8
+	},
+/obj/effect/floor_decal/corner/paleblue/border{
+	dir = 8
+	},
 /turf/simulated/floor/tiled/white,
 /area/crew_quarters/heads/cmo)
 "NB" = (
-/obj/structure/cable/green{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 9;
 	pixel_y = 0
@@ -25328,39 +25166,17 @@
 /obj/machinery/atmospherics/unary/vent_pump/on,
 /turf/simulated/floor/bluegrid,
 /area/ai_core_foyer)
-"NP" = (
-/obj/effect/floor_decal/borderfloorwhite,
-/obj/effect/floor_decal/corner/paleblue/border,
-/turf/simulated/floor/tiled/white,
-/area/crew_quarters/heads/cmo)
-"NQ" = (
-/obj/effect/floor_decal/borderfloorwhite,
-/obj/effect/floor_decal/corner/paleblue/border,
-/obj/machinery/light,
-/turf/simulated/floor/tiled/white,
-/area/crew_quarters/heads/cmo)
 "NR" = (
-/obj/effect/floor_decal/borderfloorwhite,
-/obj/effect/floor_decal/corner/paleblue/border,
-/obj/structure/cable/green,
-/obj/machinery/power/apc{
-	dir = 2;
-	name = "south bump";
-	pixel_y = -32
-	},
 /turf/simulated/floor/tiled/white,
 /area/crew_quarters/heads/cmo)
 "NS" = (
 /obj/effect/floor_decal/borderfloorwhite{
-	dir = 6
+	dir = 4
 	},
 /obj/effect/floor_decal/corner/paleblue/border{
-	dir = 6
-	},
-/obj/machinery/photocopier,
-/obj/machinery/keycard_auth{
-	pixel_y = -28
+	dir = 4
 	},
+/obj/structure/flora/pottedplant/stoutbush,
 /turf/simulated/floor/tiled/white,
 /area/crew_quarters/heads/cmo)
 "NT" = (
@@ -25371,7 +25187,9 @@
 	dir = 10
 	},
 /obj/structure/extinguisher_cabinet{
-	pixel_x = -27
+	dir = 1;
+	icon_state = "extinguisher_closed";
+	pixel_y = -32
 	},
 /turf/simulated/floor/tiled/white,
 /area/medical/sleeper)
@@ -28458,6 +28276,14 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/security/security_bathroom)
+"SV" = (
+/obj/machinery/newscaster{
+	layer = 3.3;
+	pixel_x = -27;
+	pixel_y = 0
+	},
+/turf/simulated/floor/wood,
+/area/crew_quarters/heads/cmo)
 "SX" = (
 /obj/machinery/door/airlock/security{
 	name = "Security Restroom";
@@ -28488,6 +28314,13 @@
 	},
 /turf/simulated/floor/carpet,
 /area/security/breakroom)
+"Te" = (
+/obj/structure/table/glass,
+/obj/machinery/photocopier/faxmachine{
+	department = "CMO's Office"
+	},
+/turf/simulated/floor/wood,
+/area/crew_quarters/heads/cmo)
 "Ti" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -28506,6 +28339,9 @@
 /obj/item/clothing/head/helmet/space/void/pilot,
 /turf/simulated/floor/tiled,
 /area/shuttle/excursion/tether)
+"To" = (
+/turf/simulated/floor,
+/area/maintenance/station/cargo)
 "Tp" = (
 /obj/structure/cable{
 	d1 = 1;
@@ -28538,6 +28374,16 @@
 	},
 /turf/simulated/floor/tiled,
 /area/shuttle/excursion/tether)
+"Tv" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 10
+	},
+/obj/structure/window/reinforced{
+	dir = 4
+	},
+/obj/item/toy/plushie/squid/blue,
+/turf/simulated/floor/outdoors/grass/forest,
+/area/quartermaster/qm)
 "TD" = (
 /obj/structure/table/woodentable,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -28549,6 +28395,14 @@
 	},
 /turf/simulated/floor/carpet,
 /area/crew_quarters/heads/hos)
+"TF" = (
+/obj/structure/cable/green{
+	d1 = 1;
+	d2 = 4;
+	icon_state = "1-4"
+	},
+/turf/simulated/floor,
+/area/maintenance/station/cargo)
 "TG" = (
 /obj/effect/floor_decal/industrial/warning,
 /obj/machinery/atmospherics/unary/vent_pump/high_volume{
@@ -28570,6 +28424,19 @@
 /obj/effect/floor_decal/industrial/outline/red,
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/shuttle/excursion/tether)
+"TL" = (
+/obj/machinery/light_switch{
+	dir = 2;
+	name = "light switch ";
+	pixel_x = 0;
+	pixel_y = 26
+	},
+/obj/machinery/camera/network/medbay{
+	dir = 4
+	},
+/obj/item/modular_computer/console/preset/command,
+/turf/simulated/floor/wood,
+/area/crew_quarters/heads/cmo)
 "TO" = (
 /obj/structure/table/woodentable,
 /obj/item/weapon/storage/secure/safe{
@@ -28599,6 +28466,33 @@
 /obj/machinery/door/firedoor/glass,
 /turf/simulated/floor/tiled/steel_ridged,
 /area/shuttle/excursion/tether)
+"TU" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 5
+	},
+/obj/structure/window/reinforced{
+	dir = 4
+	},
+/turf/simulated/floor/outdoors/grass/forest,
+/area/quartermaster/qm)
+"TW" = (
+/obj/structure/cable/green{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
+/obj/effect/floor_decal/carpet,
+/obj/effect/floor_decal/carpet{
+	dir = 8
+	},
+/obj/effect/floor_decal/carpet{
+	dir = 10
+	},
+/turf/simulated/floor/carpet,
+/area/crew_quarters/heads/hos)
 "TX" = (
 /obj/machinery/alarm{
 	dir = 8;
@@ -28619,12 +28513,38 @@
 /obj/machinery/light,
 /turf/simulated/floor/tiled,
 /area/shuttle/excursion/tether)
+"TZ" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 10
+	},
+/obj/machinery/door/window/brigdoor/southright{
+	id = "tactical_pet_storage"
+	},
+/turf/simulated/floor/carpet,
+/area/crew_quarters/heads/hos)
+"Ua" = (
+/obj/machinery/light{
+	icon_state = "tube1";
+	dir = 8
+	},
+/turf/simulated/floor/outdoors/grass/forest,
+/area/quartermaster/qm)
 "Ub" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 5
 	},
 /turf/simulated/floor/tiled/white,
 /area/security/security_bathroom)
+"Ue" = (
+/obj/structure/sign/securearea{
+	desc = "A warning sign which reads 'HIGH VOLTAGE'";
+	icon_state = "shock";
+	name = "HIGH VOLTAGE";
+	pixel_y = 0
+	},
+/turf/simulated/wall,
+/area/quartermaster/qm)
 "Uf" = (
 /obj/machinery/atmospherics/unary/vent_pump/high_volume{
 	dir = 8;
@@ -28637,6 +28557,27 @@
 /obj/effect/floor_decal/industrial/warning/full,
 /turf/simulated/floor/plating,
 /area/shuttle/excursion/tether)
+"Ui" = (
+/obj/machinery/atmospherics/unary/vent_scrubber/on,
+/obj/item/weapon/bone,
+/obj/machinery/alarm{
+	dir = 8;
+	icon_state = "alarm0";
+	pixel_x = 24
+	},
+/turf/simulated/floor/carpet,
+/area/crew_quarters/heads/hos)
+"Uj" = (
+/obj/machinery/papershredder,
+/turf/simulated/floor/wood,
+/area/crew_quarters/heads/cmo)
+"Uk" = (
+/obj/machinery/atmospherics/unary/vent_pump/on{
+	dir = 4
+	},
+/obj/structure/window/reinforced,
+/turf/simulated/floor/carpet,
+/area/crew_quarters/heads/hos)
 "Ul" = (
 /obj/machinery/light,
 /obj/structure/stasis_cage,
@@ -28713,6 +28654,18 @@
 	},
 /turf/simulated/floor/tiled,
 /area/shuttle/excursion/tether)
+"Ut" = (
+/obj/structure/cable/green{
+	icon_state = "0-2"
+	},
+/obj/machinery/power/apc{
+	dir = 1;
+	name = "north bump";
+	pixel_x = 0;
+	pixel_y = 24
+	},
+/turf/simulated/floor,
+/area/maintenance/station/cargo)
 "Uu" = (
 /obj/machinery/computer/security,
 /turf/simulated/floor/wood,
@@ -28725,6 +28678,12 @@
 /obj/random/soap,
 /turf/simulated/floor/tiled/white,
 /area/security/security_bathroom)
+"Ux" = (
+/obj/structure/bed/psych{
+	name = "couch"
+	},
+/turf/simulated/floor/wood,
+/area/crew_quarters/heads/cmo)
 "Uy" = (
 /obj/machinery/requests_console{
 	announcementConsole = 1;
@@ -28750,6 +28709,17 @@
 /obj/machinery/atmospherics/pipe/simple/hidden,
 /turf/simulated/floor/tiled,
 /area/shuttle/excursion/tether)
+"UA" = (
+/obj/machinery/button/windowtint{
+	id = "cmo_office_ext";
+	pixel_x = -20;
+	pixel_y = 25
+	},
+/obj/machinery/keycard_auth{
+	pixel_y = 28
+	},
+/turf/simulated/floor/wood,
+/area/crew_quarters/heads/cmo)
 "UB" = (
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
 	dir = 4
@@ -28928,14 +28898,19 @@
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/shuttle/excursion/tether)
 "Ve" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
 /obj/structure/cable/green{
 	d1 = 1;
 	d2 = 2;
 	icon_state = "1-2"
 	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	icon_state = "intact-supply";
+	dir = 5
+	},
+/obj/effect/floor_decal/carpet{
+	dir = 8
+	},
 /turf/simulated/floor/carpet,
 /area/crew_quarters/heads/hos)
 "Vf" = (
@@ -28977,6 +28952,13 @@
 	},
 /turf/simulated/wall/rshull,
 /area/shuttle/excursion/tether)
+"Vl" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/door/window/westleft{
+	dir = 4
+	},
+/turf/simulated/floor/outdoors/grass/forest,
+/area/quartermaster/qm)
 "Vm" = (
 /obj/structure/bed/chair/shuttle{
 	icon_state = "shuttle_chair";
@@ -29005,6 +28987,17 @@
 	d2 = 8;
 	icon_state = "2-8"
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/effect/floor_decal/carpet{
+	dir = 1
+	},
+/obj/effect/floor_decal/carpet{
+	dir = 8
+	},
+/obj/effect/floor_decal/carpet{
+	dir = 9
+	},
 /turf/simulated/floor/carpet,
 /area/crew_quarters/heads/hos)
 "Vu" = (
@@ -29034,6 +29027,10 @@
 /obj/machinery/door/firedoor/glass,
 /turf/simulated/floor/plating,
 /area/shuttle/excursion/tether)
+"VC" = (
+/obj/machinery/photocopier,
+/turf/simulated/floor/wood,
+/area/crew_quarters/heads/cmo)
 "VD" = (
 /obj/machinery/atmospherics/binary/pump,
 /obj/machinery/atmospherics/pipe/simple/hidden/universal{
@@ -29047,6 +29044,20 @@
 	},
 /turf/simulated/floor/tiled,
 /area/shuttle/excursion/tether)
+"VF" = (
+/obj/machinery/atmospherics/unary/vent_pump/on{
+	dir = 4
+	},
+/obj/structure/dogbed,
+/obj/item/toy/plushie/squid/pink,
+/turf/simulated/floor/outdoors/grass/forest,
+/area/quartermaster/qm)
+"VG" = (
+/obj/structure/filingcabinet/chestdrawer{
+	dir = 1
+	},
+/turf/simulated/floor/wood,
+/area/crew_quarters/heads/cmo)
 "VI" = (
 /obj/machinery/light{
 	dir = 4
@@ -29093,6 +29104,15 @@
 "VM" = (
 /turf/simulated/open,
 /area/ai_core_foyer)
+"VN" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/camera/network/security{
+	icon_state = "camera";
+	dir = 8
+	},
+/obj/item/weapon/bone/skull/unathi,
+/turf/simulated/floor/carpet,
+/area/crew_quarters/heads/hos)
 "VQ" = (
 /obj/machinery/atmospherics/pipe/manifold/hidden{
 	dir = 8;
@@ -29125,10 +29145,29 @@
 	},
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/shuttle/excursion/tether)
+"VW" = (
+/obj/effect/floor_decal/borderfloorwhite{
+	dir = 6
+	},
+/obj/effect/floor_decal/corner/paleblue/border{
+	dir = 6
+	},
+/mob/living/simple_mob/animal/passive/cat/runtime,
+/turf/simulated/floor/tiled/white,
+/area/crew_quarters/heads/cmo)
 "VX" = (
 /obj/machinery/hologram/holopad,
 /turf/simulated/floor/tiled/monotile,
 /area/tether/exploration)
+"Wb" = (
+/obj/structure/sign/securearea{
+	desc = "A warning sign which reads 'HIGH VOLTAGE'";
+	icon_state = "shock";
+	name = "HIGH VOLTAGE";
+	pixel_y = 0
+	},
+/turf/simulated/wall,
+/area/maintenance/substation/cargo)
 "Wd" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/universal{
 	dir = 4
@@ -29140,6 +29179,32 @@
 "Wg" = (
 /turf/simulated/floor/tiled,
 /area/shuttle/excursion/tether)
+"Wh" = (
+/obj/effect/floor_decal/carpet,
+/obj/effect/floor_decal/carpet{
+	dir = 4
+	},
+/obj/effect/floor_decal/carpet{
+	dir = 6
+	},
+/turf/simulated/floor/carpet,
+/area/crew_quarters/heads/hos)
+"Wi" = (
+/obj/machinery/door/airlock/engineering{
+	name = "Cargo Substation";
+	req_one_access = list(11,24,50)
+	},
+/obj/machinery/door/firedoor/glass,
+/obj/structure/cable{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/turf/simulated/floor,
+/area/maintenance/substation/cargo)
 "Wk" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -29150,6 +29215,31 @@
 	},
 /turf/simulated/floor/tiled/monotile,
 /area/tether/exploration)
+"Wl" = (
+/obj/effect/floor_decal/borderfloorwhite{
+	dir = 4
+	},
+/obj/effect/floor_decal/corner/paleblue/border{
+	dir = 4
+	},
+/obj/structure/window/reinforced{
+	dir = 1
+	},
+/obj/structure/dogbed{
+	desc = "Runtime's bed. Some of her disappointment seems to have rubbed off on it.";
+	name = "cat bed"
+	},
+/obj/item/toy/plushie/mouse/fluff,
+/turf/simulated/floor/tiled/white,
+/area/crew_quarters/heads/cmo)
+"Wm" = (
+/obj/structure/cable{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
+/turf/simulated/floor,
+/area/maintenance/station/cargo)
 "Wn" = (
 /obj/structure/disposalpipe/segment,
 /obj/machinery/shuttle_sensor{
@@ -29186,6 +29276,15 @@
 /obj/machinery/door/firedoor/glass,
 /turf/simulated/floor/plating,
 /area/shuttle/excursion/tether)
+"Wy" = (
+/obj/structure/disposalpipe/segment,
+/obj/structure/cable/green{
+	d1 = 2;
+	d2 = 8;
+	icon_state = "2-8"
+	},
+/turf/simulated/floor,
+/area/maintenance/station/cargo)
 "WB" = (
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
 	dir = 8
@@ -29214,6 +29313,26 @@
 	},
 /turf/simulated/floor/plating,
 /area/shuttle/excursion/tether)
+"WH" = (
+/obj/machinery/light{
+	icon_state = "tube1";
+	dir = 8
+	},
+/obj/structure/dogbed,
+/turf/simulated/floor/carpet,
+/area/crew_quarters/heads/hos)
+"WN" = (
+/obj/effect/floor_decal/carpet{
+	dir = 4
+	},
+/obj/effect/floor_decal/carpet{
+	dir = 1
+	},
+/obj/effect/floor_decal/carpet{
+	dir = 5
+	},
+/turf/simulated/floor/carpet,
+/area/crew_quarters/heads/hos)
 "WR" = (
 /obj/effect/floor_decal/industrial/outline/yellow,
 /turf/simulated/floor/tiled/techfloor/grid,
@@ -29277,6 +29396,14 @@
 	},
 /turf/simulated/floor/wood,
 /area/security/breakroom)
+"Xh" = (
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+	dir = 4
+	},
+/obj/structure/dogbed,
+/mob/living/simple_mob/animal/sif/fluffy,
+/turf/simulated/floor/outdoors/grass/forest,
+/area/quartermaster/qm)
 "Xi" = (
 /obj/machinery/atmospherics/pipe/simple/hidden{
 	dir = 5;
@@ -29284,6 +29411,22 @@
 	},
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/shuttle/excursion/tether)
+"Xj" = (
+/obj/machinery/door/airlock/maintenance/cargo{
+	req_access = list(50);
+	req_one_access = list(48)
+	},
+/obj/machinery/door/firedoor/glass,
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/obj/structure/cable/green{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
+/turf/simulated/wall,
+/area/quartermaster/warehouse)
 "Xk" = (
 /obj/structure/cable/cyan{
 	d2 = 4;
@@ -29375,6 +29518,10 @@
 /obj/machinery/hologram/holopad,
 /turf/simulated/floor/tiled,
 /area/security/eva)
+"XM" = (
+/obj/structure/table/glass,
+/turf/simulated/floor/wood,
+/area/crew_quarters/heads/cmo)
 "XN" = (
 /obj/structure/shuttle/engine/heater,
 /obj/structure/window/reinforced{
@@ -29385,6 +29532,20 @@
 	},
 /turf/simulated/floor/reinforced,
 /area/shuttle/excursion/tether)
+"XO" = (
+/obj/structure/cable/green{
+	d1 = 2;
+	d2 = 4;
+	icon_state = "2-4"
+	},
+/turf/simulated/floor/tiled/steel,
+/area/quartermaster/warehouse)
+"XQ" = (
+/obj/structure/bed/chair/comfy/brown{
+	dir = 1
+	},
+/turf/simulated/floor/wood,
+/area/crew_quarters/heads/cmo)
 "XR" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -29428,6 +29589,21 @@
 	},
 /turf/simulated/floor/tiled,
 /area/shuttle/excursion/tether)
+"Yb" = (
+/turf/simulated/floor/wood,
+/area/crew_quarters/heads/cmo)
+"Ye" = (
+/obj/structure/cable/green{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
+/turf/simulated/floor,
+/area/maintenance/station/cargo)
+"Yf" = (
+/obj/machinery/computer/supplycomp/control,
+/turf/simulated/floor/wood,
+/area/quartermaster/qm)
 "Yg" = (
 /obj/machinery/atmospherics/pipe/manifold/visible/yellow{
 	dir = 8
@@ -29466,6 +29642,9 @@
 	},
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/shuttle/excursion/tether)
+"Yl" = (
+/turf/simulated/wall,
+/area/space)
 "Ym" = (
 /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,
 /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,
@@ -29483,7 +29662,12 @@
 /turf/simulated/floor/tiled,
 /area/shuttle/excursion/tether)
 "Yu" = (
-/obj/structure/closet/secure_closet/hos2,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/door_timer/tactical_pet_storage{
+	pixel_x = 32;
+	pixel_y = 34
+	},
 /turf/simulated/floor/wood,
 /area/crew_quarters/heads/hos)
 "Yw" = (
@@ -29494,6 +29678,16 @@
 	},
 /turf/simulated/floor/reinforced,
 /area/tether/exploration)
+"Yx" = (
+/obj/effect/floor_decal/carpet{
+	dir = 4
+	},
+/turf/simulated/floor/carpet,
+/area/crew_quarters/heads/hos)
+"YC" = (
+/obj/effect/floor_decal/carpet,
+/turf/simulated/floor/carpet,
+/area/crew_quarters/heads/hos)
 "YD" = (
 /obj/effect/floor_decal/borderfloor{
 	dir = 8
@@ -29508,6 +29702,16 @@
 	},
 /turf/simulated/floor/tiled/monotile,
 /area/tether/exploration)
+"YG" = (
+/obj/machinery/light,
+/obj/effect/floor_decal/borderfloorwhite{
+	dir = 10
+	},
+/obj/effect/floor_decal/corner/paleblue/border{
+	dir = 10
+	},
+/turf/simulated/floor/tiled/white,
+/area/crew_quarters/heads/cmo)
 "YH" = (
 /obj/structure/table/woodentable,
 /obj/machinery/microwave,
@@ -29524,6 +29728,10 @@
 /obj/machinery/light,
 /turf/simulated/floor/tiled,
 /area/shuttle/excursion/tether)
+"YO" = (
+/mob/living/simple_mob/animal/sif/shantak/scruffy,
+/turf/simulated/floor/carpet,
+/area/crew_quarters/heads/hos)
 "YQ" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
@@ -29564,6 +29772,9 @@
 /obj/machinery/atmospherics/pipe/simple/hidden,
 /turf/simulated/floor/tiled/steel_ridged,
 /area/shuttle/excursion/tether)
+"Zc" = (
+/turf/simulated/floor/tiled,
+/area/maintenance/station/cargo)
 "Zd" = (
 /obj/machinery/conveyor{
 	dir = 4;
@@ -29572,6 +29783,17 @@
 /obj/structure/plasticflaps,
 /turf/simulated/floor/plating,
 /area/shuttle/excursion/tether)
+"Zi" = (
+/obj/machinery/alarm{
+	dir = 1;
+	icon_state = "alarm0";
+	pixel_y = -22
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/turf/simulated/floor/outdoors/grass/forest,
+/area/quartermaster/qm)
 "Zk" = (
 /obj/effect/floor_decal/industrial/outline/yellow,
 /obj/effect/floor_decal/industrial/warning/corner{
@@ -29580,6 +29802,13 @@
 	},
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/shuttle/excursion/tether)
+"Zn" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/mob/living/simple_mob/animal/sif/fluffy/silky,
+/turf/simulated/floor/outdoors/grass/forest,
+/area/quartermaster/qm)
 "Zo" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 9
@@ -29590,6 +29819,23 @@
 	},
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/shuttle/excursion/tether)
+"Zp" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	icon_state = "intact-scrubbers";
+	dir = 4
+	},
+/turf/simulated/floor/outdoors/grass/forest,
+/area/quartermaster/qm)
+"Zr" = (
+/obj/effect/floor_decal/borderfloorwhite,
+/obj/effect/floor_decal/corner/paleblue/border,
+/obj/machinery/door/window/westright,
+/turf/simulated/floor/tiled/white,
+/area/crew_quarters/heads/cmo)
+"Zs" = (
+/obj/structure/bookcase,
+/turf/simulated/floor/wood,
+/area/crew_quarters/heads/cmo)
 "Zy" = (
 /obj/structure/disposaloutlet{
 	dir = 8
@@ -29637,6 +29883,20 @@
 	},
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/shuttle/excursion/tether)
+"ZF" = (
+/turf/simulated/mineral/vacuum,
+/area/crew_quarters/heads/hos)
+"ZJ" = (
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/obj/structure/cable/green{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
+/turf/simulated/floor/tiled,
+/area/quartermaster/warehouse)
 "ZL" = (
 /obj/machinery/door/airlock/hatch{
 	req_one_access = list(67)
@@ -29660,6 +29920,20 @@
 /obj/machinery/atmospherics/unary/vent_scrubber/on,
 /turf/simulated/floor/tiled,
 /area/security/eva)
+"ZS" = (
+/obj/structure/window/reinforced{
+	dir = 8
+	},
+/obj/structure/window/reinforced{
+	dir = 1
+	},
+/obj/item/weapon/storage/box,
+/obj/item/weapon/storage/box{
+	pixel_x = 5;
+	pixel_y = -2
+	},
+/turf/simulated/floor/tiled/white,
+/area/crew_quarters/heads/cmo)
 "ZT" = (
 /obj/effect/floor_decal/industrial/hatch/yellow,
 /obj/machinery/alarm{
@@ -29681,6 +29955,16 @@
 	},
 /turf/simulated/floor/tiled,
 /area/shuttle/excursion/tether)
+"ZV" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	icon_state = "intact-scrubbers";
+	dir = 4
+	},
+/turf/simulated/floor/wood,
+/area/quartermaster/qm)
 "ZW" = (
 /obj/machinery/atmospherics/pipe/simple/hidden{
 	dir = 4
@@ -33155,12 +33439,12 @@ aa
 aa
 aa
 aa
-aa
-aa
-aa
 VL
 ae
 ad
+aa
+gm
+aa
 ad
 ad
 ae
@@ -33297,13 +33581,13 @@ aa
 aa
 aa
 aa
-aa
-aa
-aa
 VL
 aa
 ae
 aa
+ae
+aa
+aa
 aa
 ae
 aa
@@ -33439,9 +33723,6 @@ aa
 aa
 aa
 aa
-aa
-aa
-aa
 VL
 YW
 ae
@@ -33451,6 +33732,9 @@ ae
 ae
 ae
 ae
+ae
+ae
+ae
 YW
 ae
 ae
@@ -33581,10 +33865,10 @@ aa
 aa
 aa
 aa
-aa
-aa
-ab
-ab
+ZF
+je
+je
+je
 je
 lj
 lu
@@ -33723,11 +34007,11 @@ aa
 aa
 aa
 ab
-ab
-ab
-ab
-ab
+ZF
 je
+YO
+WH
+Uk
 my
 kv
 nD
@@ -33865,16 +34149,16 @@ ab
 ab
 ab
 ab
-ab
-ab
-ab
-ab
+ZF
 je
+Ui
+VN
+TZ
 Yu
 Vp
 Ve
 nX
-nX
+TW
 oX
 Sc
 mE
@@ -34007,16 +34291,16 @@ ab
 ab
 ab
 ab
-ab
-ab
-ab
-ab
+ZF
+je
+je
+je
 je
 Uu
 jM
 nE
 Rq
-jM
+YC
 kv
 SP
 mF
@@ -34439,10 +34723,10 @@ ab
 ab
 je
 ar
-jM
+WN
 et
-jM
-jM
+Yx
+Wh
 pa
 Sz
 mE
@@ -34901,15 +35185,15 @@ ab
 ab
 ab
 ab
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+gm
+ae
+ad
+ad
+ae
+ad
+ad
+ae
+gm
 aa
 aa
 aa
@@ -35036,7 +35320,7 @@ vt
 ab
 GT
 GT
-GT
+Yl
 GT
 GT
 GT
@@ -35045,18 +35329,18 @@ ab
 ab
 aa
 aa
-ad
-ad
-ae
-ad
-ad
-ae
 aa
 aa
 aa
 aa
 aa
 aa
+gm
+aa
+aa
+aa
+aa
+aa
 aa
 aa
 aa
@@ -35184,16 +35468,16 @@ HJ
 GT
 ab
 ab
-ab
-ab
-ab
-aa
-aa
-ae
-aa
-aa
-ad
+Me
+Me
+Me
+uK
+uK
+uK
+uK
+Me
 aa
+gm
 aa
 aa
 aa
@@ -35326,18 +35610,18 @@ JP
 GT
 ab
 ab
-ab
-ab
-ab
-aa
+Me
+TL
+SV
+Uj
+VC
+VG
+Te
+xh
 aa
 ae
 aa
 aa
-ad
-aa
-aa
-aa
 aa
 aa
 aa
@@ -35469,15 +35753,15 @@ Ix
 Ix
 Ix
 Me
-Me
-Me
-uK
-uK
-Me
-ae
-ae
-ad
+UA
+Yb
+Yb
+Yb
+Yb
+XM
+xh
 aa
+ad
 aa
 aa
 aa
@@ -35613,13 +35897,13 @@ LF
 Me
 My
 MN
-Nx
-wf
+XM
+Yb
+Yb
+Ux
 xh
 aa
-aa
-ae
-aa
+ad
 aa
 aa
 aa
@@ -35756,10 +36040,11 @@ Me
 Mz
 tc
 Ny
-NP
+Yb
+Yb
+XQ
 xh
 aa
-aa
 ad
 aa
 aa
@@ -35804,7 +36089,6 @@ aa
 aa
 aa
 aa
-aa
 "}
 (44,1,1) = {"
 aa
@@ -35898,12 +36182,12 @@ Me
 MA
 MP
 Nz
-NP
+Yb
+Yb
+Zs
 xh
 aa
-aa
-ad
-aa
+ae
 aa
 aa
 aa
@@ -36040,9 +36324,10 @@ Me
 Lw
 MQ
 NA
-NQ
-Me
-ab
+Nx
+Nx
+YG
+xh
 aa
 ad
 aa
@@ -36088,7 +36373,6 @@ aa
 aa
 aa
 aa
-aa
 "}
 (46,1,1) = {"
 aa
@@ -36183,11 +36467,11 @@ LB
 MR
 NB
 NR
+ZS
+Zr
 Me
-ab
-ab
-aa
 aa
+ad
 aa
 aa
 aa
@@ -36325,11 +36609,11 @@ MD
 MS
 NC
 NS
+Wl
+VW
 Me
-ab
-ab
-aa
 aa
+ad
 aa
 aa
 aa
@@ -36466,11 +36750,11 @@ Me
 rC
 MT
 rC
+rC
 Me
 Me
-ab
-ab
-ab
+Me
+aa
 aa
 aa
 aa
@@ -37440,7 +37724,7 @@ wT
 xK
 yu
 zq
-Ai
+Ae
 Bs
 Cm
 Dl
@@ -40572,10 +40856,10 @@ Ei
 Fc
 Hp
 zD
-ab
-ab
-ab
-ab
+Eo
+Ff
+Fg
+AH
 ab
 ab
 ab
@@ -40714,9 +40998,9 @@ ou
 Ef
 HL
 zD
-ab
-ab
-ab
+To
+To
+To
 JF
 JF
 JF
@@ -40856,9 +41140,9 @@ zD
 Fd
 zD
 zD
-AH
-AH
-AH
+Ut
+Ye
+TF
 JF
 Kt
 KW
@@ -40994,13 +41278,13 @@ AG
 BH
 BH
 BH
-Ek
-Fe
+Wm
+BH
 jV
-Fe
-Hr
-Hr
+Wm
+Ek
 Hr
+Wy
 JG
 Ku
 KX
@@ -41132,17 +41416,17 @@ xg
 xR
 yQ
 zF
-AH
-AH
+zL
+zL
+zL
+zL
+Ue
 jJ
 AH
-El
-Ff
 AH
-GC
-GC
-GC
-GC
+Wi
+eP
+Wb
 GC
 Kv
 KY
@@ -41274,14 +41558,14 @@ fa
 xR
 yQ
 zG
-AH
-BI
+zL
+Xh
+Ua
+VF
+zL
+Zc
 jO
 AH
-El
-Fg
-FU
-GC
 Hs
 Ij
 IO
@@ -41416,14 +41700,14 @@ xi
 xW
 yQ
 zH
-AH
-BJ
+zL
+Zp
 CA
+Zi
+zL
+BJ
+BI
 AH
-Em
-Fh
-FV
-GD
 Ht
 Ik
 IP
@@ -41558,14 +41842,14 @@ xj
 xX
 yQ
 zI
-AH
+zL
+Zp
+CA
+Zn
+zL
 BK
 CB
 AH
-En
-Fi
-FW
-GE
 Hu
 Il
 IQ
@@ -41701,14 +41985,14 @@ xY
 yR
 zJ
 zL
+Tv
+Vl
+TU
 zL
 zL
-zL
-Eo
-Fj
-FX
 Fj
 Fj
+Xj
 Fj
 Fj
 Fj
@@ -41842,11 +42126,11 @@ xl
 xZ
 yS
 zK
+Yf
+CD
+CD
+ZV
 AI
-BL
-CC
-zL
-zL
 zL
 FY
 GF
@@ -41987,12 +42271,12 @@ zK
 AJ
 BM
 CD
-CD
+ZV
 Ep
 zL
 FZ
 GG
-GG
+ZJ
 GG
 GI
 JH
@@ -42275,7 +42559,7 @@ Dw
 Er
 zK
 Gb
-GI
+XO
 Hx
 Io
 GG