From 18333cf7392b8c4fd873f96e8cd282fd3885591b Mon Sep 17 00:00:00 2001
From: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
Date: Fri, 8 Sep 2023 14:29:42 +0200
Subject: [PATCH] Map Fixes and RD Office Tweaks (#17241)

* Map Fixes and RD Office Tweaks

* More Fixes

* Flaps Name

* RD Office Polishing

* RD Office Polishing

* Fix

* Cable Fix

* Medical Meeting Area Chairs Fix
---
 code/modules/multiz/structures.dm             |  20 +-
 .../SleepyGemmy-small_map_fixes.yml           |  13 +
 icons/obj/stairs.dmi                          | Bin 2643 -> 1380 bytes
 maps/away/ships/coc_ranger/coc_ship.dmm       | 290 ++++-----
 maps/sccv_horizon/sccv_horizon-1_deck_1.dmm   |  14 +-
 maps/sccv_horizon/sccv_horizon-2_deck_2.dmm   | 570 ++++++++----------
 maps/sccv_horizon/sccv_horizon-3_deck_3.dmm   |  69 ++-
 7 files changed, 453 insertions(+), 523 deletions(-)
 create mode 100644 html/changelogs/SleepyGemmy-small_map_fixes.yml

diff --git a/code/modules/multiz/structures.dm b/code/modules/multiz/structures.dm
index b9347c93151..26206e3d6e7 100644
--- a/code/modules/multiz/structures.dm
+++ b/code/modules/multiz/structures.dm
@@ -254,11 +254,11 @@
 	return (T == loc)
 
 /obj/structure/stairs/CanPass(obj/mover, turf/source, height, airflow)
-	if (airflow)
+	if(airflow)
 		return TRUE
 
 	// Disallow stepping onto the elevated part of the stairs.
-	if (isliving(mover) && z == mover.z && mover.loc != loc && get_step(mover, get_dir(mover, src)) == loc)
+	if(isliving(mover) && z == mover.z && mover.loc != loc && get_step(mover, get_dir(mover, src)) == loc)
 		return FALSE
 
 	return !density
@@ -268,11 +268,11 @@
 		return
 
 	L.Weaken(2)
-	if (L.lying)
+	if(L.lying)
 		L.visible_message(
-			"<span class='alert'>\The [L] steps off of [src] and faceplants onto [L.loc].</span>",
-			"<span class='danger'>You step off [src] and faceplant onto [L.loc].</span>",
-			"<span class='alert'>You hear a thump.</span>"
+			SPAN_ALERT("\The [L] steps off of [src] and faceplants onto [L.loc]."),
+			SPAN_DANGER("You step off [src] and faceplant onto [L.loc]."),
+			SPAN_ALERT("You hear a thump.")
 		)
 
 /obj/structure/stairs/north
@@ -286,24 +286,24 @@
 	bound_height = 64
 
 /obj/structure/stairs/east
-	icon_state = "east"
 	dir = EAST
 	bound_width = 64
+	bound_x = -32
+	pixel_x = -32
 
 /obj/structure/stairs/west
-	icon_state = "west"
 	dir = WEST
 	bound_width = 64
 
 /obj/structure/stairs/flat
-	icon_state = "flat"
+	icon_state = "stairs_flat"
 
 /// Snowflake railing object for 64x64 stairs.
 /obj/structure/stairs_railing
 	name = "railing"
 	desc = "A railing for stairs."
 	icon = 'icons/obj/stairs.dmi'
-	icon_state = "railing"
+	icon_state = "stairs_railing"
 	anchored = TRUE
 	density = TRUE
 
diff --git a/html/changelogs/SleepyGemmy-small_map_fixes.yml b/html/changelogs/SleepyGemmy-small_map_fixes.yml
new file mode 100644
index 00000000000..f30458f1b1c
--- /dev/null
+++ b/html/changelogs/SleepyGemmy-small_map_fixes.yml
@@ -0,0 +1,13 @@
+author: SleepyGemmy
+
+delete-after: True
+
+changes:
+  - maptweak: "Tweaked the research director's office to be more roomy and look more professional."
+  - bugfix: "Fixed some unrotated plastic flaps in the south-west part of the warehouse on D1."
+  - bugfix: "Fixed a light and sign overlapping in the mail room."
+  - bugfix: "Potentially fixed some issues with the CoC ranger ship's cockpit windows missing."
+  - bugfix: "Fixed the ATM outside operations on D2 being misrotated."
+  - bugfix: "Fixed east facing stairs not working."
+  - bugfix: "Fixed the engineering stairs and AI core stairs being mapped incorrectly."
+  - bugfix: "Fixed the medical meeting area chairs being plastic lawn chairs."
diff --git a/icons/obj/stairs.dmi b/icons/obj/stairs.dmi
index 2456ad91fd761a2e1c6b4e89ef8e250d47c601bc..0b83d89f43e3c41810308b9628d38cf38d34a04a 100644
GIT binary patch
delta 1346
zcmZuxeK^wz9RKYaX0p)2<5Xz6A9+7lTe{}QsD&`j%e=H$nYSAA5}x_pZ3^p}?CPOW
zH0oTn$Set=Qr@0p6Q|nYJQ{aSU3q8hR`=X<|J)znm(S;UKF{~_`R6-`okYWh0Y?w%
zqs`C&0O*qslPCayaMu)o+@xWgl=TamVISZd?A6}hZftCvnVCta(+LEENF=hgwe|M)
zwzArZ$K(Bcd?KmgAZYF8hIe*$0A)w88X+Q$ax@5VSB{+2fWqwHur$&MR%~iKGcEq~
zDF8TA9#mZ73hQ=t+1c{_d&zcz6BE9OdWhPDALJRaf}kYN&C+K!PjB^gJNnyOg`~to
zi1)nnMqjdA=Hw|hp&`r#79w8<K){sI3fX)Q03ZX%Bq;by`D{6KYS0~fuGP1s!7#@R
zH|$4Qv@|rY>_Hfm1D5G!H^N<G$UXXKlbTc{>@eWB7`3o@B;I$na4!0Qy5&rO+TYAD
zabh)ArAjpQCr9IPnCDz{ts)mYyGqWa9B&vRitC1oL{UTnLCnlxK(niV*f$sl`yAd{
zcNa<r8XRjHE0ZB<fmll#QS%HapnCK{T1pEvt1cZ<TCfcA2nCPLlcFvXy3CRAag4}G
zC&Gk|p-zp{U2+|z{ZG0{2};5UaeMBiSH17!{WSo;W8T|qjkz-4gnzr}*p{)z{VnMB
zj<Tuol?I}K+PJUvqA&|1;%HP4D?^?tISh>O7YiY`rZNljxN&5^P9UVD%{V_Xr(;}n
zu5kN4y7+jVjyVE1R)#5;U27b2u+Ph^`He$wisbjwF}W$m=M}MW_ogr8Bwgc9e<-7J
zhZ6^!hHo!BVM&FLw8dlG_OLdc?*e~xOWw-X_f}(r46Ikp=pVxbieR2ife~BZMJKS7
z3(AO{pCnhfpqh<2xkYyN#m^EQp9Fc+OX*rG{HIX9vT9UUOmiq1f@>>=T5&IVG|R@H
z)Wx_gW=DNw;F4exN*uWS`4;UbEo8x33tG==x+h&C1095H^I3sn>V%bD*cbb1FnzR=
zYE9<x9jT(~Ed94OjX`piO$Hnt3l_vgaqBA6F^@UJ1e6|i%EHd{U(fLWm=^Uz9w^H^
zgMV7roENoRkq94);N-k}m*`n1+j!)uw|8_b^DtDq&dxWQ*Q_Xr0atwW*T%ub@pbkm
z<z#r(`rch1Uh`KD3@s_(Nl60PV`j|Dp`?G&xf!P(o4Xk&$QyQqyRXvK(P&G&Ejj5|
zBk|Y?ieN??Yln+&HlnueS-Oieq1I(oH*C}^?(K@Rd|-Wj!6!9@vrSigOrU3ll7*|5
z@0UtvEK<{0IqNeyuZ=%D)ONa7O|my#M^Oy&I3SjE-2$x@2o`uiShOg>;Ou`?Dek;h
zDty0bJSK(31<mx7*@O+=O-@mEueFE)E?4J+LfwPE->?xeaAET1hs_T+Vf~Q3RV9<0
zLN#cH3YizA<r3Ta)$_rd9j2#m+>T^k&fcSKtdK{1%^&ZHaIT?Uh!#$AI^(u<e#?<&
zcURFS#HPN?{81uwtka$2ws3@#%Yz}LRx7WvC<X<Q`wj1W<7#qgK4FA%No!LJKe;-z
z3e?j!?Kqbm!JF9UnWW3OGX?U-+^C})k(^x*u8Ca-dta9SaMfOx^`L^-r+SlGzY@)A
zEtiURm!9lXJw@-8Y}+|3*}k$TRKiz<4lFH+r*a-uBal)t>y<UVK{6%T&tIIAuCtv{
zyk>cfp`xkHad*e7;_v;KJ}%xJylOFR{|soeX!0T?8F{Ph07LW10J7In(p?W4=WnjW
BWxxOc

literal 2643
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

diff --git a/maps/away/ships/coc_ranger/coc_ship.dmm b/maps/away/ships/coc_ranger/coc_ship.dmm
index f1eec5e2df2..1066e957b5a 100644
--- a/maps/away/ships/coc_ranger/coc_ship.dmm
+++ b/maps/away/ships/coc_ranger/coc_ship.dmm
@@ -51,7 +51,6 @@
 /area/ship/ranger_corvette/canteen)
 "ajL" = (
 /obj/machinery/atmospherics/unary/engine,
-/obj/structure/window/reinforced,
 /turf/simulated/floor,
 /area/ship/ranger_corvette/engine1)
 "aoI" = (
@@ -74,7 +73,6 @@
 /area/ship/ranger_corvette/bridge)
 "asD" = (
 /obj/machinery/atmospherics/unary/engine,
-/obj/structure/window/reinforced,
 /obj/effect/landmark/entry_point/aft{
 	name = "aft engines, starboard"
 	},
@@ -87,11 +85,11 @@
 /turf/simulated/floor/tiled/dark,
 /area/ship/ranger_corvette/brig)
 "awG" = (
-/obj/effect/map_effect/window_spawner/full/reinforced,
 /obj/effect/landmark/entry_point/aft{
 	name = "aft, airlock"
 	},
-/turf/template_noop,
+/obj/effect/map_effect/window_spawner/full/reinforced/firedoor,
+/turf/simulated/floor,
 /area/ship/ranger_corvette)
 "ayf" = (
 /obj/machinery/door/airlock/external{
@@ -759,9 +757,6 @@
 	},
 /turf/simulated/floor/wood,
 /area/ship/ranger_corvette/foyer)
-"ehv" = (
-/turf/simulated/wall/shuttle/space_ship/mercenary,
-/area/ship/ranger_corvette/leader)
 "eiR" = (
 /obj/machinery/door/airlock/hatch{
 	name = "Propulsion";
@@ -1463,9 +1458,6 @@
 /obj/machinery/door/firedoor/noid,
 /turf/simulated/floor/tiled/dark/full,
 /area/ship/ranger_corvette/engine2)
-"hqk" = (
-/turf/simulated/wall/shuttle/space_ship/mercenary,
-/area/ship/ranger_corvette/janitor)
 "hqB" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/universal{
 	dir = 4
@@ -1618,9 +1610,6 @@
 	},
 /turf/simulated/floor/carpet/rubber,
 /area/ship/ranger_corvette/crew)
-"iiC" = (
-/turf/simulated/wall/shuttle/space_ship/mercenary,
-/area/ship/ranger_corvette/bridge)
 "ilB" = (
 /obj/effect/floor_decal/corner/red/diagonal,
 /obj/structure/table/steel,
@@ -2096,14 +2085,12 @@
 /turf/simulated/floor/tiled/dark,
 /area/ship/ranger_corvette/engine2)
 "kyh" = (
-/obj/effect/map_effect/window_spawner/full/reinforced,
 /obj/machinery/door/blast/regular/open{
 	dir = 4;
 	id = "coc_bridge";
 	name = "blast door"
 	},
-/obj/machinery/door/firedoor/noid,
-/obj/structure/grille,
+/obj/effect/map_effect/window_spawner/full/reinforced/firedoor,
 /turf/simulated/floor,
 /area/ship/ranger_corvette/bridge)
 "kFU" = (
@@ -2126,9 +2113,6 @@
 /obj/machinery/portable_atmospherics/canister/carbon_dioxide,
 /turf/simulated/floor/tiled/dark/full,
 /area/ship/ranger_corvette/engine1)
-"kKC" = (
-/turf/simulated/wall/shuttle/space_ship/mercenary,
-/area/ship/ranger_corvette/cryo)
 "kLL" = (
 /obj/effect/floor_decal/industrial/outline/yellow,
 /obj/structure/railing/mapped{
@@ -2446,16 +2430,14 @@
 /turf/simulated/floor/tiled/dark,
 /area/ship/ranger_corvette/telecomms)
 "muQ" = (
-/obj/effect/map_effect/window_spawner/full/reinforced,
 /obj/machinery/door/blast/regular/open{
 	id = "coc_bridge";
 	name = "blast door"
 	},
-/obj/machinery/door/firedoor/noid,
-/obj/structure/grille,
 /obj/effect/landmark/entry_point/port{
 	name = "port, bridge"
 	},
+/obj/effect/map_effect/window_spawner/full/reinforced/firedoor,
 /turf/simulated/floor,
 /area/ship/ranger_corvette/bridge)
 "mvd" = (
@@ -2520,9 +2502,6 @@
 /obj/machinery/door/firedoor/noid,
 /turf/simulated/floor/tiled/white,
 /area/ship/ranger_corvette/canteen)
-"mGO" = (
-/turf/simulated/wall/shuttle/space_ship/mercenary,
-/area/ship/ranger_corvette/crew)
 "mHw" = (
 /obj/effect/floor_decal/corner/black/full,
 /obj/machinery/computer/ship/navigation{
@@ -2657,9 +2636,6 @@
 	},
 /turf/simulated/floor/tiled/dark/full,
 /area/ship/ranger_corvette/bridge)
-"nAQ" = (
-/turf/simulated/wall/shuttle/space_ship/mercenary,
-/area/ship/ranger_corvette/engine1)
 "nCd" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 1;
@@ -2884,9 +2860,6 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/ship/ranger_corvette/canteen)
-"oQn" = (
-/turf/simulated/wall/shuttle/space_ship/mercenary,
-/area/ship/ranger_corvette/brig)
 "oSw" = (
 /obj/effect/floor_decal/industrial/warning,
 /obj/structure/sign/securearea{
@@ -3128,13 +3101,6 @@
 /obj/structure/lattice/catwalk/indoor/grate,
 /turf/simulated/floor,
 /area/ship/ranger_corvette/foyer)
-"pOf" = (
-/obj/effect/floor_decal/corner_wide/blue/diagonal,
-/turf/simulated/floor/tiled/dark,
-/area/ship/ranger_corvette/telecomms)
-"pPC" = (
-/turf/simulated/wall/shuttle/space_ship/mercenary,
-/area/ship/ranger_corvette/engine2)
 "pPX" = (
 /obj/effect/floor_decal/corner/green/diagonal,
 /obj/structure/table/steel,
@@ -3626,7 +3592,6 @@
 /area/ship/ranger_corvette/medbay)
 "scs" = (
 /obj/machinery/atmospherics/unary/engine,
-/obj/structure/window/reinforced,
 /obj/effect/landmark/entry_point/aft{
 	name = "aft engines, port"
 	},
@@ -3687,9 +3652,6 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/tiled/dark/full,
 /area/ship/ranger_corvette/crew)
-"soa" = (
-/turf/simulated/wall/shuttle/space_ship/mercenary,
-/area/ship/ranger_corvette/canteen)
 "spv" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -3771,12 +3733,10 @@
 	id = "coc_bridge";
 	name = "blast door"
 	},
-/obj/effect/map_effect/window_spawner/full/reinforced,
-/obj/machinery/door/firedoor/noid,
-/obj/structure/grille,
 /obj/effect/landmark/entry_point/fore{
 	name = "fore, bridge"
 	},
+/obj/effect/map_effect/window_spawner/full/reinforced/firedoor,
 /turf/simulated/floor,
 /area/ship/ranger_corvette/bridge)
 "sLq" = (
@@ -3845,9 +3805,6 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/ship/ranger_corvette/crew)
-"sTK" = (
-/turf/simulated/wall/shuttle/space_ship/mercenary,
-/area/ship/ranger_corvette/munitions)
 "sXv" = (
 /obj/structure/ship_weapon_dummy{
 	is_barrel = 1
@@ -4338,16 +4295,14 @@
 /turf/simulated/floor/carpet/red,
 /area/ship/ranger_corvette/crew)
 "unz" = (
-/obj/effect/map_effect/window_spawner/full/reinforced,
 /obj/machinery/door/blast/regular/open{
 	id = "coc_bridge";
 	name = "blast door"
 	},
-/obj/machinery/door/firedoor/noid,
-/obj/structure/grille,
 /obj/effect/landmark/entry_point/starboard{
 	name = "starboard, bridge"
 	},
+/obj/effect/map_effect/window_spawner/full/reinforced/firedoor,
 /turf/simulated/floor,
 /area/ship/ranger_corvette/bridge)
 "uoa" = (
@@ -4471,17 +4426,15 @@
 /turf/simulated/floor/tiled/dark/full,
 /area/ship/ranger_corvette/leader)
 "uzX" = (
-/obj/effect/map_effect/window_spawner/full/reinforced,
-/turf/template_noop,
+/obj/effect/map_effect/window_spawner/full/reinforced/firedoor,
+/turf/simulated/floor,
 /area/ship/ranger_corvette)
 "uAk" = (
-/obj/effect/map_effect/window_spawner/full/reinforced,
 /obj/machinery/door/blast/regular/open{
 	id = "coc_bridge";
 	name = "blast door"
 	},
-/obj/machinery/door/firedoor/noid,
-/obj/structure/grille,
+/obj/effect/map_effect/window_spawner/full/reinforced/firedoor,
 /turf/simulated/floor,
 /area/ship/ranger_corvette/bridge)
 "uCz" = (
@@ -4738,9 +4691,6 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/ship/ranger_corvette/canteen)
-"wbK" = (
-/turf/simulated/wall/shuttle/space_ship/mercenary,
-/area/ship/ranger_corvette/medbay)
 "wdq" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/molten_item{
@@ -4991,8 +4941,7 @@
 /turf/simulated/floor/tiled/dark,
 /area/ship/ranger_corvette/foyer)
 "xnY" = (
-/obj/effect/map_effect/window_spawner/full/reinforced,
-/obj/machinery/door/firedoor/noid,
+/obj/effect/map_effect/window_spawner/full/reinforced/firedoor,
 /turf/simulated/floor,
 /area/ship/ranger_corvette/canteen)
 "xrl" = (
@@ -5053,7 +5002,6 @@
 /area/ship/ranger_corvette/munitions)
 "xuX" = (
 /obj/machinery/atmospherics/unary/engine,
-/obj/structure/window/reinforced,
 /turf/simulated/floor,
 /area/ship/ranger_corvette/engine2)
 "xzg" = (
@@ -33848,12 +33796,12 @@ xRX
 xRX
 xRX
 xRX
-sTK
-sTK
+rrQ
+rrQ
 okk
-sTK
-sTK
-sTK
+rrQ
+rrQ
+rrQ
 xRX
 xRX
 xRX
@@ -34100,12 +34048,12 @@ tWh
 dYC
 tWh
 boM
-nAQ
-nAQ
+tWh
+tWh
 xRX
 xRX
 xRX
-sTK
+rrQ
 swi
 uVR
 itk
@@ -34358,11 +34306,11 @@ iIr
 kFU
 iOe
 nGj
-nAQ
+tWh
 xRX
 xRX
 xRX
-sTK
+rrQ
 tOx
 vdX
 wpk
@@ -35401,13 +35349,13 @@ tLA
 tLA
 tLA
 tLA
-mGO
-mGO
+mAx
+mAx
 bNr
-mGO
-mGO
-mGO
-mGO
+mAx
+mAx
+mAx
+mAx
 mAx
 mAx
 xRX
@@ -35658,7 +35606,7 @@ fmF
 wsA
 bhp
 nFy
-mGO
+mAx
 umS
 aMc
 eRR
@@ -35668,10 +35616,10 @@ ttk
 sSQ
 hdp
 hdp
-oQn
-oQn
+hdp
+hdp
 brx
-oQn
+hdp
 hdp
 hdp
 tYR
@@ -35915,7 +35863,7 @@ tQJ
 bCt
 bhp
 gUN
-mGO
+mAx
 eJp
 aqe
 viF
@@ -35923,7 +35871,7 @@ cij
 fro
 doJ
 oAP
-oQn
+hdp
 gzc
 avV
 dun
@@ -35932,10 +35880,10 @@ rki
 fnq
 dNG
 dNG
-kKC
+dNG
 mDK
-kKC
-kKC
+dNG
+dNG
 eGi
 eGi
 xRX
@@ -36158,7 +36106,7 @@ lkY
 mzO
 dmm
 vFS
-pOf
+rQB
 uwG
 rQB
 rBK
@@ -36180,23 +36128,23 @@ smZ
 kji
 tGV
 dgw
-oQn
+hdp
 qXP
 vpx
 lyg
 gin
 oUG
 nRI
-kKC
+dNG
 uvJ
 xzq
 dMX
 oTC
-kKC
+dNG
 rwS
 eGi
 eGi
-iiC
+tas
 tas
 unz
 uAk
@@ -36429,7 +36377,7 @@ bVs
 niD
 cZV
 gEg
-mGO
+mAx
 vVv
 hjK
 jih
@@ -36437,23 +36385,23 @@ jVf
 mMP
 ieN
 stJ
-oQn
+hdp
 cjg
 ust
 tlC
 xKE
 plP
 hAt
-kKC
+dNG
 qQd
 dUu
 dBx
 tBK
-kKC
+dNG
 ndT
 gWX
 aRc
-iiC
+tas
 jyf
 qCZ
 lGr
@@ -36686,31 +36634,31 @@ jgn
 jgn
 jgn
 yfz
-mGO
-mGO
-mGO
-mGO
-mGO
+mAx
+mAx
+mAx
+mAx
+mAx
 hZi
-mGO
-mGO
-oQn
-oQn
-oQn
+mAx
+mAx
+hdp
+hdp
+hdp
 eue
-oQn
-oQn
-oQn
-kKC
-kKC
-kKC
+hdp
+hdp
+hdp
+dNG
+dNG
+dNG
 vZn
-kKC
-kKC
+dNG
+dNG
 bnz
-hqk
-hqk
-iiC
+eGi
+eGi
+tas
 mVV
 iTN
 eSB
@@ -36967,7 +36915,7 @@ wMK
 tQD
 bGA
 kkN
-iiC
+tas
 jjc
 qcP
 teP
@@ -37453,13 +37401,13 @@ qbp
 tVB
 mdX
 sLq
-soa
-soa
+fwA
+fwA
 aiD
 mFt
 mFt
-soa
-soa
+fwA
+fwA
 tEO
 vXi
 pBE
@@ -37481,7 +37429,7 @@ jCF
 jCF
 jCF
 jCF
-iiC
+tas
 lCo
 uYQ
 ntW
@@ -37710,18 +37658,18 @@ wUT
 wUT
 aKd
 sLq
-soa
+fwA
 tmL
 iwS
 lym
 lym
 fJE
-soa
-soa
-soa
+fwA
+fwA
+fwA
 mbp
-soa
-soa
+fwA
+fwA
 xJk
 kiF
 wrD
@@ -37738,7 +37686,7 @@ moB
 bYx
 sEf
 gor
-iiC
+tas
 qqG
 kTh
 rfo
@@ -37967,7 +37915,7 @@ xzl
 wUT
 pVQ
 sLq
-soa
+fwA
 paq
 qza
 lIp
@@ -37995,7 +37943,7 @@ lWH
 nDb
 epG
 gjg
-iiC
+tas
 dgH
 aZS
 vLy
@@ -38250,9 +38198,9 @@ iGg
 tXz
 aoI
 qSw
-ehv
-ehv
-iiC
+jCF
+jCF
+tas
 tas
 muQ
 uAk
@@ -38481,7 +38429,7 @@ uwT
 wUT
 xFA
 xFA
-soa
+fwA
 ioq
 waI
 mmT
@@ -38500,14 +38448,14 @@ qZS
 nnM
 xBz
 tHU
-ehv
-ehv
+jCF
+jCF
 jCF
 hUx
 jCF
 jCF
-ehv
-ehv
+jCF
+jCF
 xRX
 xRX
 xRX
@@ -38738,7 +38686,7 @@ wve
 wUT
 xFA
 xFA
-soa
+fwA
 fmB
 lXU
 nmy
@@ -38750,14 +38698,14 @@ ufB
 bXG
 bsL
 oOX
-wbK
-wbK
+xJk
+xJk
 xJk
 xJk
 euV
 xJk
-wbK
-ehv
+xJk
+jCF
 wmz
 xRX
 xRX
@@ -38975,8 +38923,8 @@ xRX
 xRX
 xRX
 xRX
-pPC
-pPC
+gJZ
+gJZ
 uOy
 uOy
 hFA
@@ -38996,16 +38944,16 @@ wUT
 imn
 xFA
 jXh
-soa
+fwA
 xnY
 xnY
 xnY
-soa
+fwA
 xrl
-soa
-soa
-soa
-soa
+fwA
+fwA
+fwA
+fwA
 fwA
 fwA
 xRX
@@ -39235,13 +39183,13 @@ xRX
 xuX
 oXn
 diy
-pPC
-pPC
-pPC
-pPC
-pPC
+gJZ
+gJZ
+gJZ
+gJZ
+gJZ
 hmX
-pPC
+gJZ
 xRX
 xRX
 xRX
@@ -39492,13 +39440,13 @@ xRX
 scs
 bex
 dul
-pPC
+gJZ
 ibp
 jMZ
 lvN
 mNJ
 ptP
-pPC
+gJZ
 xRX
 xRX
 xRX
@@ -39755,7 +39703,7 @@ kcS
 lxT
 mPM
 pzP
-pPC
+gJZ
 xRX
 xRX
 xRX
@@ -40006,7 +39954,7 @@ xRX
 xuX
 bld
 dHA
-pPC
+gJZ
 iCX
 kxo
 lTc
@@ -40260,14 +40208,14 @@ xRX
 xRX
 xRX
 xRX
-pPC
-pPC
-pPC
-pPC
-pPC
+gJZ
+gJZ
+gJZ
+gJZ
+gJZ
 omu
-pPC
-pPC
+gJZ
+gJZ
 gJZ
 gJZ
 xRX
diff --git a/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm b/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm
index 684cbf4c428..0e4908456bb 100644
--- a/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm
+++ b/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm
@@ -4869,7 +4869,6 @@
 /obj/structure/cable/green{
 	icon_state = "4-8"
 	},
-/obj/effect/floor_decal/spline/plain/corner,
 /obj/machinery/hologram/holopad,
 /turf/simulated/floor/tiled,
 /area/operations/storage)
@@ -19962,9 +19961,6 @@
 /turf/simulated/floor/plating,
 /area/horizon/custodial/disposals)
 "nYB" = (
-/obj/structure/plasticflaps{
-	name = "Delivery Chute to Mail Room"
-	},
 /obj/machinery/conveyor{
 	dir = 8;
 	id = "warehousetomail";
@@ -19972,6 +19968,10 @@
 	},
 /obj/machinery/door/firedoor,
 /obj/effect/floor_decal/industrial/hatch/yellow,
+/obj/structure/plasticflaps{
+	dir = 4;
+	name = "Delivery Chute to Mail Room"
+	},
 /turf/simulated/floor/tiled,
 /area/operations/storage)
 "nZb" = (
@@ -25175,6 +25175,7 @@
 	dir = 4;
 	pixel_y = -1
 	},
+/obj/structure/railing/mapped,
 /turf/simulated/floor/tiled/dark,
 /area/turret_protected/ai_upload)
 "rMm" = (
@@ -32920,6 +32921,7 @@
 /obj/machinery/light/small{
 	dir = 4
 	},
+/obj/structure/railing/mapped,
 /turf/simulated/floor/tiled/dark,
 /area/turret_protected/ai_upload)
 "xgm" = (
@@ -62290,7 +62292,7 @@ xiH
 pdC
 dEe
 rMf
-eTx
+oFy
 pdC
 moP
 xtK
@@ -62493,7 +62495,7 @@ xiH
 pdC
 dEe
 xgc
-oFy
+eTx
 pdC
 vnJ
 xtK
diff --git a/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm b/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm
index d5af0c9d563..64c33dd333b 100644
--- a/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm
+++ b/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm
@@ -1186,10 +1186,9 @@
 /obj/structure/window/reinforced{
 	dir = 8
 	},
-/obj/machinery/door/window/eastleft{
-	dir = 2;
-	name = "Pun Pun Chamber";
-	req_access = list(25)
+/obj/machinery/door/window/southright{
+	req_access = list(25);
+	name = "Pun Pun's Cage"
 	},
 /turf/simulated/floor/carpet,
 /area/horizon/bar/backroom)
@@ -2157,8 +2156,7 @@
 "aWA" = (
 /obj/structure/table/standard,
 /obj/item/folder/purple,
-/obj/structure/railing/mapped,
-/turf/simulated/floor/carpet/rubber,
+/turf/simulated/floor/carpet/purple,
 /area/crew_quarters/heads/hor)
 "aWE" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -2250,23 +2248,14 @@
 /turf/simulated/floor/wood,
 /area/chapel/office)
 "aYI" = (
-/obj/effect/floor_decal/corner/mauve/diagonal,
-/obj/structure/window/reinforced{
-	layer = 5;
-	name = "adjusted reinforced window"
+/obj/structure/bed/stool/chair/padded/purple{
+	dir = 1
 	},
-/obj/structure/window/reinforced{
-	dir = 8
+/obj/effect/floor_decal/spline/fancy/wood,
+/obj/structure/cable/green{
+	icon_state = "1-2"
 	},
-/obj/machinery/papershredder,
-/obj/effect/floor_decal/corner/white{
-	dir = 4
-	},
-/obj/effect/floor_decal/corner/grey{
-	dir = 8
-	},
-/obj/item/device/radio/intercom/south,
-/turf/simulated/floor/tiled/white,
+/turf/simulated/floor/wood,
 /area/crew_quarters/heads/hor)
 "aYO" = (
 /obj/machinery/atmospherics/pipe/simple/visible/universal,
@@ -4074,6 +4063,7 @@
 /obj/structure/platform_stairs/full/east_west_cap/half{
 	dir = 1
 	},
+/obj/structure/platform,
 /turf/simulated/floor/tiled/full,
 /area/hallway/engineering)
 "bQd" = (
@@ -6278,12 +6268,15 @@
 /obj/structure/cable/green{
 	icon_state = "4-8"
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+/obj/structure/disposalpipe/segment{
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
 /turf/simulated/floor/tiled,
 /area/rnd/hallway)
 "dbd" = (
@@ -7294,6 +7287,10 @@
 /obj/structure/reagent_dispensers/peppertank/spacecleaner{
 	pixel_y = -32
 	},
+/obj/machinery/camera/network/service{
+	c_tag = "Service - Auxiliary Custodial Closet";
+	dir = 1
+	},
 /turf/simulated/floor/tiled,
 /area/horizon/custodial/auxiliary)
 "dCB" = (
@@ -7612,9 +7609,6 @@
 /obj/structure/sign/drop{
 	pixel_y = 32
 	},
-/obj/machinery/light{
-	dir = 1
-	},
 /turf/simulated/floor/tiled/dark/full,
 /area/operations/mail_room)
 "dLo" = (
@@ -7818,7 +7812,7 @@
 /obj/machinery/orderterminal{
 	dir = 1;
 	pixel_y = 32;
-	pixel_x = -11
+	pixel_x = -9
 	},
 /turf/simulated/floor/lino,
 /area/horizon/crew_quarters/lounge/bar)
@@ -9515,13 +9509,18 @@
 /turf/simulated/floor/tiled,
 /area/horizon/security/hallway)
 "eKP" = (
-/obj/effect/floor_decal/industrial/warning{
-	dir = 1
+/obj/structure/flora/pottedplant{
+	desc = "A tag with the name 'Harvey, Ph.D.' has been taped to the rim of this strange fern's plant pot.";
+	icon_state = "plant-35";
+	name = "Harvey"
 	},
 /obj/structure/coatrack{
 	pixel_x = -9
 	},
-/turf/simulated/floor/tiled/dark,
+/obj/machinery/camera/network/research{
+	c_tag = "Research - Research Director's Office"
+	},
+/turf/simulated/floor/carpet/purple,
 /area/crew_quarters/heads/hor)
 "eMf" = (
 /obj/effect/floor_decal/corner/dark_blue{
@@ -10092,10 +10091,6 @@
 	dir = 10
 	},
 /obj/structure/table/steel,
-/obj/machinery/camera/network/service{
-	c_tag = "Service - Auxiliary Custodial Closet";
-	dir = 1
-	},
 /obj/item/storage/box/lights/mixed,
 /obj/machinery/requests_console/south{
 	department = "Custodial";
@@ -10322,14 +10317,24 @@
 /turf/simulated/floor/plating,
 /area/horizon/maintenance/deck_two/fore/starboard)
 "fer" = (
-/obj/effect/floor_decal/industrial/warning{
-	dir = 1
+/obj/structure/closet/secure_closet/RD,
+/obj/effect/floor_decal/industrial/outline/research,
+/obj/structure/platform{
+	dir = 4
 	},
-/obj/machinery/camera/network/research{
-	c_tag = "Research - Research Director's Office"
+/obj/item/aicard,
+/obj/item/device/paicard,
+/obj/item/storage/box/gloves,
+/obj/item/device/megaphone/sci,
+/obj/item/device/taperecorder,
+/obj/item/clothing/glasses/welding/superior,
+/obj/item/rig/hazmat/equipped,
+/obj/item/clothing/mask/gas/half,
+/obj/effect/floor_decal/spline/fancy/wood{
+	dir = 9
 	},
-/obj/structure/railing/mapped,
-/turf/simulated/floor/tiled/dark,
+/obj/item/storage/box/fancy/candle_box,
+/turf/simulated/floor/wood,
 /area/crew_quarters/heads/hor)
 "feu" = (
 /obj/machinery/door/airlock/service{
@@ -11896,22 +11901,13 @@
 /turf/simulated/floor/plating,
 /area/maintenance/wing/port/far)
 "fSw" = (
-/obj/effect/floor_decal/corner/mauve/diagonal,
 /obj/structure/cable/green{
 	icon_state = "1-2"
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/effect/floor_decal/corner/white{
-	dir = 4
-	},
-/obj/effect/floor_decal/corner/grey{
-	dir = 8
-	},
 /obj/structure/disposalpipe/segment,
-/obj/structure/platform{
-	dir = 4
-	},
-/turf/simulated/floor/tiled/white,
+/obj/machinery/hologram/holopad,
+/turf/simulated/floor/wood,
 /area/crew_quarters/heads/hor)
 "fSx" = (
 /obj/structure/table/standard,
@@ -12153,27 +12149,17 @@
 /turf/simulated/floor/tiled/white,
 /area/horizon/security/brig)
 "fZk" = (
-/obj/effect/floor_decal/corner/mauve/diagonal,
-/obj/structure/cable/green{
-	icon_state = "2-4"
-	},
-/obj/effect/floor_decal/corner/white{
-	dir = 4
-	},
-/obj/effect/floor_decal/corner/grey{
-	dir = 8
-	},
 /obj/structure/disposalpipe/segment{
 	dir = 4;
 	icon_state = "pipe-c"
 	},
-/obj/structure/platform_deco{
-	dir = 1
+/obj/structure/cable/green{
+	icon_state = "1-2"
 	},
-/obj/structure/platform_deco{
-	dir = 4
+/obj/structure/cable/green{
+	icon_state = "2-8"
 	},
-/turf/simulated/floor/tiled/white,
+/turf/simulated/floor/wood,
 /area/crew_quarters/heads/hor)
 "fZz" = (
 /obj/structure/cable{
@@ -12304,7 +12290,8 @@
 /area/horizon/security/armoury)
 "gbk" = (
 /obj/machinery/atm{
-	pixel_y = 28
+	pixel_y = 28;
+	dir = 1
 	},
 /obj/structure/railing/mapped{
 	dir = 8
@@ -14461,8 +14448,7 @@
 "gUA" = (
 /obj/machinery/door/airlock/multi_tile/glass{
 	dir = 2;
-	name = "Research Hallway";
-	req_access = list(47)
+	name = "Research Hallway"
 	},
 /obj/machinery/door/firedoor/multi_tile{
 	dir = 2
@@ -14580,23 +14566,15 @@
 /turf/simulated/floor/tiled/dark/full,
 /area/horizon/hydroponics)
 "gYm" = (
-/obj/effect/floor_decal/corner/mauve/diagonal,
-/obj/structure/window/reinforced{
-	layer = 5;
-	name = "adjusted reinforced window"
+/obj/structure/table/wood,
+/obj/effect/floor_decal/spline/fancy/wood{
+	dir = 6
 	},
-/obj/structure/window/reinforced{
-	dir = 4
+/obj/item/flame/candle{
+	pixel_x = 10;
+	pixel_y = 2
 	},
-/obj/structure/table/standard,
-/obj/effect/floor_decal/corner/white{
-	dir = 4
-	},
-/obj/effect/floor_decal/corner/grey{
-	dir = 8
-	},
-/obj/item/aicard,
-/turf/simulated/floor/tiled/white,
+/turf/simulated/floor/wood,
 /area/crew_quarters/heads/hor)
 "gYP" = (
 /obj/structure/cable/green{
@@ -15471,20 +15449,13 @@
 /turf/simulated/floor/tiled,
 /area/horizon/security/brig)
 "hva" = (
-/obj/effect/floor_decal/corner/mauve/diagonal,
-/obj/structure/window/reinforced{
-	dir = 4
-	},
-/obj/structure/bed/stool/chair/padded/black{
+/obj/structure/bed/stool/chair/padded/purple{
 	dir = 8
 	},
-/obj/effect/floor_decal/corner/white{
+/obj/effect/floor_decal/spline/fancy/wood{
 	dir = 4
 	},
-/obj/effect/floor_decal/corner/grey{
-	dir = 8
-	},
-/turf/simulated/floor/tiled/white,
+/turf/simulated/floor/wood,
 /area/crew_quarters/heads/hor)
 "hvf" = (
 /obj/machinery/camera/network/reactor{
@@ -15655,10 +15626,7 @@
 	pixel_x = -21;
 	pixel_y = 4
 	},
-/obj/effect/floor_decal/industrial/warning{
-	dir = 1
-	},
-/turf/simulated/floor/tiled/dark,
+/turf/simulated/floor/carpet/purple,
 /area/crew_quarters/heads/hor)
 "hzY" = (
 /obj/structure/disposalpipe/trunk{
@@ -16158,12 +16126,6 @@
 "hIj" = (
 /obj/structure/railing/mapped,
 /obj/structure/flora/ausbushes/ppflowers,
-/obj/machinery/light{
-	dir = 1
-	},
-/obj/structure/railing/mapped{
-	dir = 4
-	},
 /obj/effect/floor_decal/spline/fancy/wood/cee{
 	dir = 4
 	},
@@ -18549,7 +18511,10 @@
 /area/horizon/security/hallway)
 "iSG" = (
 /obj/structure/bed/stool/chair/office/dark,
-/turf/simulated/floor/carpet/rubber,
+/obj/structure/cable/green{
+	icon_state = "1-8"
+	},
+/turf/simulated/floor/carpet/purple,
 /area/crew_quarters/heads/hor)
 "iUg" = (
 /obj/structure/table/standard,
@@ -18559,10 +18524,7 @@
 	},
 /obj/item/paper/monitorkey,
 /obj/machinery/newscaster/north,
-/obj/effect/floor_decal/industrial/warning{
-	dir = 1
-	},
-/turf/simulated/floor/tiled/dark,
+/turf/simulated/floor/carpet/purple,
 /area/crew_quarters/heads/hor)
 "iUr" = (
 /obj/structure/closet/crate,
@@ -18585,19 +18547,15 @@
 /turf/simulated/open,
 /area/turbolift/primary/deck_2)
 "iVJ" = (
-/obj/effect/floor_decal/corner/mauve/diagonal,
 /obj/machinery/light{
 	dir = 8
 	},
-/obj/effect/floor_decal/corner/white{
-	dir = 4
-	},
-/obj/effect/floor_decal/corner/grey{
-	dir = 8
-	},
 /obj/structure/platform,
-/obj/structure/filingcabinet/chestdrawer,
-/turf/simulated/floor/tiled/white,
+/obj/machinery/papershredder,
+/obj/effect/floor_decal/spline/fancy/wood{
+	dir = 9
+	},
+/turf/simulated/floor/wood,
 /area/crew_quarters/heads/hor)
 "iVO" = (
 /obj/machinery/alarm/south,
@@ -18968,25 +18926,24 @@
 /turf/simulated/floor/tiled/white,
 /area/rnd/chemistry)
 "jeb" = (
-/obj/effect/floor_decal/corner/mauve/diagonal,
 /obj/structure/cable/green{
 	icon_state = "2-4"
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 6
 	},
-/obj/effect/floor_decal/corner/white{
-	dir = 4
-	},
-/obj/effect/floor_decal/corner/grey{
-	dir = 8
-	},
 /obj/structure/disposalpipe/segment{
 	dir = 4;
 	icon_state = "pipe-c"
 	},
 /obj/structure/platform,
-/turf/simulated/floor/tiled/white,
+/obj/effect/floor_decal/spline/fancy/wood{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 6
+	},
+/turf/simulated/floor/wood,
 /area/crew_quarters/heads/hor)
 "jeo" = (
 /obj/structure/lattice/catwalk/indoor/grate,
@@ -20740,7 +20697,7 @@
 /obj/machinery/vending/dinnerware/plastic{
 	density = 0;
 	pixel_y = 24;
-	pixel_x = -19
+	pixel_x = -17
 	},
 /obj/machinery/camera/network/service{
 	c_tag = "Dinner - Kitchen Service";
@@ -21447,6 +21404,20 @@
 /obj/effect/floor_decal/industrial/hatch/yellow,
 /turf/simulated/floor/tiled,
 /area/engineering/storage_eva)
+"koq" = (
+/obj/structure/window/reinforced{
+	dir = 4
+	},
+/obj/structure/window/reinforced{
+	dir = 8
+	},
+/obj/machinery/door/window/southright{
+	req_access = list(30);
+	name = "Ives' Pod"
+	},
+/mob/living/simple_animal/hostile/commanded/baby_harvester,
+/turf/simulated/floor/carpet,
+/area/crew_quarters/heads/hor)
 "kpd" = (
 /obj/machinery/power/breakerbox/activated{
 	RCon_tag = "Port Wing Substation"
@@ -23363,23 +23334,36 @@
 /turf/simulated/floor/reinforced,
 /area/horizon/grauwolf)
 "lpu" = (
-/obj/effect/floor_decal/corner/mauve/diagonal,
-/obj/structure/window/reinforced{
-	dir = 1
-	},
-/obj/structure/window/reinforced{
+/obj/structure/table/wood,
+/obj/effect/floor_decal/spline/fancy/wood{
 	dir = 4
 	},
-/obj/structure/bed/stool/chair/padded/black{
-	dir = 8
+/obj/item/device/radio/intercom/east,
+/obj/machinery/chemical_dispenser/coffeemaster/full{
+	pixel_y = 12;
+	dir = 0
 	},
-/obj/effect/floor_decal/corner/white{
-	dir = 4
+/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/rainbow{
+	pixel_x = 11;
+	pixel_y = -2
 	},
-/obj/effect/floor_decal/corner/grey{
-	dir = 8
+/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/sol{
+	pixel_x = 6;
+	pixel_y = -2
 	},
-/turf/simulated/floor/tiled/white,
+/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/black{
+	pixel_y = -2;
+	pixel_x = 1
+	},
+/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/zeng{
+	pixel_y = -2;
+	pixel_x = -4
+	},
+/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/nt{
+	pixel_x = -9;
+	pixel_y = -2
+	},
+/turf/simulated/floor/wood,
 /area/crew_quarters/heads/hor)
 "lpB" = (
 /obj/effect/decal/cleanable/dirt,
@@ -24055,21 +24039,14 @@
 /turf/simulated/floor/tiled,
 /area/horizon/custodial/auxiliary)
 "lJp" = (
-/obj/effect/floor_decal/industrial/warning{
+/obj/machinery/power/apc/north,
+/obj/structure/cable/green{
+	icon_state = "0-2"
+	},
+/obj/effect/floor_decal/spline/fancy/wood{
 	dir = 1
 	},
-/obj/structure/window/reinforced{
-	dir = 4
-	},
-/obj/structure/window/reinforced{
-	dir = 8
-	},
-/obj/machinery/door/window/brigdoor/northleft{
-	dir = 2;
-	req_access = list(30)
-	},
-/mob/living/simple_animal/hostile/commanded/baby_harvester,
-/turf/simulated/floor/tiled/dark,
+/turf/simulated/floor/wood,
 /area/crew_quarters/heads/hor)
 "lJv" = (
 /obj/effect/floor_decal/corner/grey/diagonal,
@@ -24413,8 +24390,7 @@
 	pixel_x = -2;
 	pixel_y = 4
 	},
-/obj/structure/railing/mapped,
-/turf/simulated/floor/carpet/rubber,
+/turf/simulated/floor/carpet/purple,
 /area/crew_quarters/heads/hor)
 "lRX" = (
 /obj/structure/cable/green{
@@ -24570,11 +24546,13 @@
 /turf/simulated/open/airless,
 /area/horizon/exterior)
 "lVe" = (
-/obj/structure/railing/mapped{
+/obj/structure/platform{
 	dir = 4
 	},
-/obj/structure/railing/mapped,
-/turf/simulated/floor/carpet/rubber,
+/obj/effect/floor_decal/spline/fancy/wood{
+	dir = 8
+	},
+/turf/simulated/floor/wood,
 /area/crew_quarters/heads/hor)
 "lVg" = (
 /obj/structure/shuttle_part/scc_space_ship{
@@ -25456,17 +25434,7 @@
 /turf/simulated/floor/plating,
 /area/engineering/engine_room)
 "mso" = (
-/obj/effect/floor_decal/corner/mauve/diagonal,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 6
-	},
-/obj/effect/floor_decal/corner/white{
-	dir = 4
-	},
-/obj/effect/floor_decal/corner/grey{
-	dir = 8
-	},
 /obj/structure/disposalpipe/segment,
 /obj/structure/cable/green{
 	icon_state = "1-8"
@@ -25477,7 +25445,9 @@
 /obj/structure/cable/green{
 	icon_state = "1-2"
 	},
-/turf/simulated/floor/tiled/white,
+/obj/effect/floor_decal/spline/fancy/wood,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/turf/simulated/floor/wood,
 /area/crew_quarters/heads/hor)
 "mst" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -25913,27 +25883,23 @@
 /turf/simulated/wall/shuttle/scc_space_ship/cardinal,
 /area/horizon/zta)
 "mCV" = (
-/obj/effect/floor_decal/corner/mauve/diagonal,
 /obj/structure/cable/green{
 	icon_state = "1-8"
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 9
 	},
-/obj/effect/floor_decal/corner/white{
-	dir = 4
-	},
-/obj/effect/floor_decal/corner/grey{
-	dir = 8
-	},
 /obj/structure/disposalpipe/segment{
 	dir = 8;
 	icon_state = "pipe-c"
 	},
-/obj/structure/platform_deco{
-	dir = 4
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+	dir = 8
 	},
-/turf/simulated/floor/tiled/white,
+/obj/structure/cable/green{
+	icon_state = "2-8"
+	},
+/turf/simulated/floor/wood,
 /area/crew_quarters/heads/hor)
 "mDa" = (
 /obj/machinery/door/airlock/service{
@@ -26690,10 +26656,10 @@
 	name = "Research Director RC";
 	pixel_y = -30
 	},
-/obj/structure/sign/nosmoking_1{
-	pixel_x = -32
+/obj/structure/cable/green{
+	icon_state = "4-8"
 	},
-/turf/simulated/floor/carpet/rubber,
+/turf/simulated/floor/carpet/purple,
 /area/crew_quarters/heads/hor)
 "mUe" = (
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
@@ -27786,8 +27752,8 @@
 /turf/simulated/floor/tiled,
 /area/horizon/hallway/deck_two/fore)
 "npL" = (
-/obj/structure/stairs/east,
 /obj/structure/railing/mapped,
+/obj/structure/stairs/east,
 /turf/simulated/floor/tiled,
 /area/engineering/atmos/storage)
 "nqm" = (
@@ -29333,11 +29299,10 @@
 "ohs" = (
 /obj/structure/table/standard,
 /obj/item/modular_computer/laptop/preset/research/rd,
-/obj/structure/railing/mapped,
 /obj/item/storage/slide_projector{
 	pixel_y = 12
 	},
-/turf/simulated/floor/carpet/rubber,
+/turf/simulated/floor/carpet/purple,
 /area/crew_quarters/heads/hor)
 "ohE" = (
 /obj/effect/floor_decal/corner/white/diagonal,
@@ -29357,27 +29322,14 @@
 /turf/simulated/floor/tiled/full,
 /area/hallway/primary/central_two)
 "oia" = (
-/obj/effect/floor_decal/corner/mauve/diagonal,
 /obj/machinery/light{
 	dir = 4
 	},
-/obj/structure/window/reinforced{
+/obj/structure/filingcabinet/chestdrawer,
+/obj/effect/floor_decal/spline/fancy/wood{
 	dir = 4
 	},
-/obj/structure/table/standard,
-/obj/item/device/taperecorder{
-	pixel_x = -3
-	},
-/obj/item/device/paicard{
-	pixel_x = 4
-	},
-/obj/effect/floor_decal/corner/white{
-	dir = 4
-	},
-/obj/effect/floor_decal/corner/grey{
-	dir = 8
-	},
-/turf/simulated/floor/tiled/white,
+/turf/simulated/floor/wood,
 /area/crew_quarters/heads/hor)
 "oif" = (
 /obj/structure/sign/examroom{
@@ -31368,6 +31320,7 @@
 /obj/structure/platform_stairs/full/east_west_cap/half{
 	dir = 8
 	},
+/obj/structure/platform,
 /turf/simulated/floor/tiled/full,
 /area/hallway/engineering)
 "pgD" = (
@@ -31524,6 +31477,18 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/rnd/xenobiology/xenoflora)
+"pkA" = (
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/turf/simulated/floor/tiled,
+/area/rnd/hallway)
 "pkH" = (
 /obj/effect/floor_decal/corner/dark_green/diagonal,
 /turf/simulated/floor/tiled,
@@ -31911,24 +31876,23 @@
 /turf/simulated/floor/tiled,
 /area/storage/primary)
 "pxt" = (
-/obj/effect/floor_decal/corner/mauve/diagonal,
 /obj/structure/cable/green{
 	icon_state = "4-8"
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
-/obj/effect/floor_decal/corner/white{
-	dir = 4
-	},
-/obj/effect/floor_decal/corner/grey{
-	dir = 8
-	},
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
 /obj/structure/platform,
-/turf/simulated/floor/tiled/white,
+/obj/effect/floor_decal/spline/fancy/wood{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 8
+	},
+/turf/simulated/floor/wood,
 /area/crew_quarters/heads/hor)
 "pxG" = (
 /obj/effect/floor_decal/corner/red/diagonal,
@@ -31942,7 +31906,7 @@
 	dir = 4;
 	pixel_x = -22
 	},
-/turf/simulated/floor/carpet/rubber,
+/turf/simulated/floor/carpet/purple,
 /area/crew_quarters/heads/hor)
 "pyc" = (
 /obj/structure/platform/ledge,
@@ -32632,8 +32596,10 @@
 /turf/simulated/floor/tiled,
 /area/engineering/storage_eva)
 "pPA" = (
-/obj/machinery/hologram/holopad,
-/turf/simulated/floor/carpet/rubber,
+/obj/structure/cable/green{
+	icon_state = "2-4"
+	},
+/turf/simulated/floor/carpet/purple,
 /area/crew_quarters/heads/hor)
 "pPM" = (
 /obj/structure/table/standard,
@@ -32709,23 +32675,15 @@
 /turf/simulated/floor/tiled/dark/full,
 /area/engineering/engine_room/tesla)
 "pRo" = (
-/obj/effect/floor_decal/corner/mauve/diagonal,
-/obj/structure/flora/pottedplant{
-	desc = "A tag with the name 'Harvey, Ph.D.' has been taped to the rim of this strange fern's plant pot.";
-	icon_state = "plant-35";
-	name = "Harvey"
-	},
 /obj/machinery/alarm/west,
-/obj/effect/floor_decal/corner/white{
-	dir = 4
-	},
-/obj/effect/floor_decal/corner/grey{
-	dir = 8
-	},
 /obj/structure/cable/green{
 	icon_state = "2-4"
 	},
-/turf/simulated/floor/tiled/white,
+/obj/machinery/photocopier,
+/obj/effect/floor_decal/spline/fancy/wood{
+	dir = 10
+	},
+/turf/simulated/floor/wood,
 /area/crew_quarters/heads/hor)
 "pRA" = (
 /obj/machinery/light/small/emergency,
@@ -38246,25 +38204,14 @@
 /turf/simulated/floor/tiled/dark/full,
 /area/hallway/primary/central_one)
 "sFk" = (
-/obj/effect/floor_decal/corner/mauve/diagonal,
-/obj/structure/cable/green{
-	icon_state = "0-8"
-	},
-/obj/machinery/power/apc/north,
-/obj/structure/table/rack,
-/obj/item/clothing/glasses/welding/superior,
-/obj/item/rig/hazmat/equipped,
-/obj/effect/floor_decal/corner/white{
-	dir = 4
-	},
-/obj/effect/floor_decal/corner/grey{
-	dir = 8
-	},
 /obj/structure/disposalpipe/trunk{
 	dir = 8
 	},
 /obj/machinery/disposal/small/west,
-/turf/simulated/floor/tiled/white,
+/obj/effect/floor_decal/spline/fancy/wood{
+	dir = 4
+	},
+/turf/simulated/floor/wood,
 /area/crew_quarters/heads/hor)
 "sGn" = (
 /obj/structure/closet/secure_closet/freezer,
@@ -39393,10 +39340,25 @@
 /turf/simulated/floor/tiled/dark/full,
 /area/engineering/engine_monitoring/tesla)
 "tiV" = (
-/obj/structure/railing/mapped{
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
-/turf/simulated/floor/carpet/rubber,
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/obj/structure/platform_deco{
+	dir = 4
+	},
+/obj/effect/floor_decal/spline/fancy/wood/corner{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 8
+	},
+/turf/simulated/floor/wood,
 /area/crew_quarters/heads/hor)
 "tje" = (
 /obj/effect/floor_decal/spline/fancy/wood{
@@ -39726,7 +39688,7 @@
 /obj/machinery/suit_cycler/hos,
 /obj/machinery/firealarm/north,
 /obj/effect/floor_decal/industrial/hatch/yellow,
-/obj/effect/floor_decal/spline/plain/full,
+/obj/effect/floor_decal/spline/plain/full/black,
 /turf/simulated/floor/tiled/dark/full,
 /area/horizon/security/head_of_security)
 "tux" = (
@@ -39918,15 +39880,19 @@
 /turf/simulated/floor/carpet/rubber,
 /area/rnd/xenobiology)
 "tzR" = (
-/obj/structure/platform_stairs/full/east_west_cap{
-	dir = 8
-	},
-/obj/structure/platform{
+/obj/structure/platform_deco{
 	dir = 1
 	},
-/obj/structure/platform/cutout,
-/obj/structure/railing/mapped,
-/turf/simulated/floor/tiled/white,
+/obj/structure/platform_deco{
+	dir = 4
+	},
+/obj/effect/floor_decal/spline/fancy/wood{
+	dir = 8
+	},
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
+/turf/simulated/floor/wood,
 /area/crew_quarters/heads/hor)
 "tAn" = (
 /obj/effect/floor_decal/spline/fancy/wood{
@@ -40556,20 +40522,11 @@
 /turf/simulated/floor/tiled/dark,
 /area/maintenance/aux_atmospherics/deck_2/starboard)
 "tNS" = (
-/obj/effect/floor_decal/corner/mauve/diagonal,
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
-	dir = 8
-	},
-/obj/effect/floor_decal/corner/white{
-	dir = 4
-	},
-/obj/effect/floor_decal/corner/grey{
-	dir = 8
-	},
 /obj/structure/cable/green{
 	icon_state = "2-8"
 	},
-/turf/simulated/floor/tiled/white,
+/obj/effect/floor_decal/spline/fancy/wood,
+/turf/simulated/floor/wood,
 /area/crew_quarters/heads/hor)
 "tNT" = (
 /obj/effect/landmark/start{
@@ -41893,6 +41850,7 @@
 /obj/effect/floor_decal/corner/brown{
 	dir = 10
 	},
+/obj/machinery/light,
 /turf/simulated/floor/tiled,
 /area/operations/mail_room)
 "usj" = (
@@ -43551,18 +43509,8 @@
 /turf/simulated/floor/reinforced,
 /area/horizon/grauwolf)
 "viR" = (
-/obj/structure/closet/secure_closet/RD,
-/obj/item/clothing/mask/gas/half,
-/obj/effect/floor_decal/corner/mauve/diagonal,
-/obj/item/device/megaphone/sci,
-/obj/effect/floor_decal/corner/white{
-	dir = 4
-	},
-/obj/effect/floor_decal/corner/grey{
-	dir = 8
-	},
-/obj/item/storage/box/gloves,
-/turf/simulated/floor/tiled/white,
+/obj/effect/floor_decal/spline/fancy/wood,
+/turf/simulated/floor/wood,
 /area/crew_quarters/heads/hor)
 "vja" = (
 /obj/effect/floor_decal/corner/dark_green{
@@ -45508,9 +45456,8 @@
 "wbV" = (
 /obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor,
 /obj/structure/cable/green{
-	icon_state = "1-4"
+	icon_state = "0-4"
 	},
-/obj/structure/cable/green,
 /turf/simulated/floor/tiled/dark/full,
 /area/crew_quarters/heads/hor)
 "wch" = (
@@ -46251,6 +46198,20 @@
 /obj/effect/floor_decal/industrial/outline/engineering,
 /turf/simulated/floor/tiled,
 /area/engineering/locker_room)
+"wrB" = (
+/obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor,
+/obj/structure/cable/green{
+	icon_state = "0-8"
+	},
+/obj/structure/cable/green{
+	icon_state = "1-8"
+	},
+/obj/structure/cable/green{
+	icon_state = "1-4"
+	},
+/obj/structure/cable/green,
+/turf/simulated/floor/tiled/dark/full,
+/area/crew_quarters/heads/hor)
 "wrK" = (
 /obj/machinery/appliance/cooker/oven,
 /obj/effect/floor_decal/industrial/outline/grey,
@@ -46498,8 +46459,7 @@
 /obj/structure/cable/green{
 	icon_state = "2-8"
 	},
-/obj/structure/lattice/catwalk/indoor/grate,
-/turf/simulated/floor/plating,
+/turf/simulated/floor/tiled,
 /area/rnd/hallway)
 "wzs" = (
 /obj/effect/floor_decal/industrial/warning/corner,
@@ -46748,8 +46708,7 @@
 	name = "RD Office";
 	sortType = "RD Office"
 	},
-/obj/structure/lattice/catwalk/indoor/grate,
-/turf/simulated/floor/plating,
+/turf/simulated/floor/tiled,
 /area/rnd/hallway)
 "wEs" = (
 /obj/structure/cable/green{
@@ -46864,6 +46823,16 @@
 /turf/simulated/floor/tiled/dark/full,
 /area/storage/secure)
 "wHs" = (
+/obj/structure/platform_stairs/full/east_west_cap{
+	dir = 8
+	},
+/obj/structure/platform/cutout,
+/obj/structure/platform{
+	dir = 1
+	},
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
 /turf/simulated/floor/carpet/rubber,
 /area/crew_quarters/heads/hor)
 "wId" = (
@@ -47781,8 +47750,7 @@
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply{
 	dir = 1
 	},
-/obj/structure/lattice/catwalk/indoor/grate,
-/turf/simulated/floor/plating,
+/turf/simulated/floor/tiled,
 /area/rnd/hallway)
 "xcS" = (
 /obj/effect/floor_decal/corner/dark_green{
@@ -48937,7 +48905,7 @@
 /obj/item/device/eftpos{
 	eftpos_name = "Research EFTPOS scanner"
 	},
-/turf/simulated/floor/carpet/rubber,
+/turf/simulated/floor/carpet/purple,
 /area/crew_quarters/heads/hor)
 "xEH" = (
 /obj/effect/map_effect/window_spawner/full/reinforced/firedoor,
@@ -48969,22 +48937,12 @@
 /turf/simulated/floor/carpet/red,
 /area/horizon/library)
 "xFR" = (
-/obj/effect/floor_decal/corner/mauve/diagonal,
 /obj/structure/cable/green{
 	icon_state = "1-2"
 	},
 /obj/machinery/atmospherics/unary/vent_pump/on,
-/obj/effect/floor_decal/corner/white{
-	dir = 4
-	},
-/obj/effect/floor_decal/corner/grey{
-	dir = 8
-	},
 /obj/structure/disposalpipe/segment,
-/obj/structure/platform{
-	dir = 4
-	},
-/turf/simulated/floor/tiled/white,
+/turf/simulated/floor/wood,
 /area/crew_quarters/heads/hor)
 "xFZ" = (
 /obj/structure/sink{
@@ -70763,7 +70721,7 @@ lnv
 ovz
 xPv
 tIt
-npL
+tUR
 wXF
 inc
 gzX
@@ -70965,7 +70923,7 @@ rcU
 gci
 ulg
 fnn
-tUR
+npL
 xrh
 bwU
 bPf
@@ -76027,7 +75985,7 @@ gxa
 mBB
 cer
 cer
-cer
+wbV
 cer
 cer
 cer
@@ -76637,9 +76595,9 @@ xEF
 lRR
 pxt
 tNS
-wbV
+qrx
 tcX
-nnr
+daM
 uPo
 uTr
 gnA
@@ -76835,11 +76793,11 @@ iYw
 mBB
 fer
 tzR
-tiV
 lVe
-pxt
+lVe
+tiV
 viR
-rbK
+wbV
 iRq
 wpb
 kZL
@@ -77041,7 +76999,7 @@ xFR
 fSw
 mCV
 aYI
-cer
+wrB
 gFa
 cda
 waD
@@ -77237,13 +77195,13 @@ hst
 gil
 bfF
 mBB
-cer
+koq
 sFk
 lpu
 oia
 hva
 gYm
-cer
+rbK
 hIj
 xSA
 fYi
@@ -78457,7 +78415,7 @@ weq
 weq
 txy
 idF
-nnr
+daM
 fYi
 hnH
 kpi
@@ -79063,7 +79021,7 @@ vPk
 rFn
 rFn
 ybp
-nnr
+daM
 rnA
 bSD
 jnF
@@ -79467,7 +79425,7 @@ mOp
 qen
 rFn
 mHj
-qNm
+pkA
 rnA
 bSD
 jnF
@@ -80073,7 +80031,7 @@ vId
 kZZ
 rFn
 kXY
-daM
+nTA
 lCI
 iwo
 iwo
diff --git a/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm b/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm
index 9b150a5b345..33905f18319 100644
--- a/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm
+++ b/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm
@@ -8074,9 +8074,6 @@
 /turf/simulated/floor/carpet/rubber,
 /area/bridge/controlroom)
 "grI" = (
-/obj/structure/bed/stool/chair/plastic{
-	dir = 8
-	},
 /obj/machinery/light{
 	dir = 4
 	},
@@ -8086,6 +8083,9 @@
 /obj/effect/landmark/start{
 	name = "Surgeon"
 	},
+/obj/structure/bed/stool/chair{
+	dir = 8
+	},
 /turf/simulated/floor/tiled/white,
 /area/hallway/medical/upper)
 "grY" = (
@@ -8941,9 +8941,6 @@
 /turf/simulated/wall/r_wall,
 /area/bridge/meeting_room)
 "hck" = (
-/obj/structure/bed/stool/chair/plastic{
-	dir = 8
-	},
 /obj/machinery/camera/network/medbay{
 	c_tag = "Medical - Hallway 4";
 	dir = 8
@@ -8954,6 +8951,9 @@
 /obj/effect/landmark/start{
 	name = "Medical Intern"
 	},
+/obj/structure/bed/stool/chair{
+	dir = 8
+	},
 /turf/simulated/floor/tiled/white,
 /area/hallway/medical/upper)
 "hco" = (
@@ -9246,9 +9246,6 @@
 /turf/template_noop,
 /area/template_noop)
 "hlt" = (
-/obj/structure/bed/stool/chair/plastic{
-	dir = 8
-	},
 /obj/machinery/newscaster/east{
 	pixel_y = 10
 	},
@@ -9258,12 +9255,12 @@
 /obj/effect/landmark/start{
 	name = "Pharmacist"
 	},
+/obj/structure/bed/stool/chair{
+	dir = 8
+	},
 /turf/simulated/floor/tiled/white,
 /area/hallway/medical/upper)
 "hlx" = (
-/obj/structure/bed/stool/chair/plastic{
-	dir = 8
-	},
 /obj/item/device/radio/intercom/east,
 /obj/effect/floor_decal/corner_wide/green{
 	dir = 6
@@ -9271,6 +9268,9 @@
 /obj/effect/landmark/start{
 	name = "Pharmacist"
 	},
+/obj/structure/bed/stool/chair{
+	dir = 8
+	},
 /turf/simulated/floor/tiled/white,
 /area/hallway/medical/upper)
 "hlE" = (
@@ -12338,12 +12338,12 @@
 /turf/simulated/floor/wood,
 /area/lawoffice/consular)
 "jFO" = (
-/obj/structure/bed/stool/chair/office/light{
-	dir = 4
-	},
 /obj/effect/landmark/start{
 	name = "Chief Medical Officer"
 	},
+/obj/structure/bed/stool/chair/office/bridge/generic{
+	dir = 4
+	},
 /turf/simulated/floor/tiled/white,
 /area/hallway/medical/upper)
 "jFW" = (
@@ -13609,9 +13609,6 @@
 /turf/simulated/floor/reinforced/airless,
 /area/horizon/exterior)
 "kDm" = (
-/obj/structure/bed/stool/chair/plastic{
-	dir = 8
-	},
 /obj/structure/disposalpipe/segment{
 	dir = 2;
 	icon_state = "pipe-c"
@@ -13628,6 +13625,9 @@
 /obj/structure/cable/green{
 	icon_state = "4-8"
 	},
+/obj/structure/bed/stool/chair{
+	dir = 8
+	},
 /turf/simulated/floor/tiled/white,
 /area/hallway/medical/upper)
 "kDt" = (
@@ -19720,15 +19720,15 @@
 /turf/simulated/floor/tiled/full,
 /area/bridge)
 "pcZ" = (
-/obj/structure/bed/stool/chair/plastic{
-	dir = 8
-	},
 /obj/effect/floor_decal/corner_wide/green{
 	dir = 6
 	},
 /obj/effect/landmark/start{
 	name = "Medical Intern"
 	},
+/obj/structure/bed/stool/chair{
+	dir = 8
+	},
 /turf/simulated/floor/tiled/white,
 /area/hallway/medical/upper)
 "pda" = (
@@ -21483,15 +21483,15 @@
 /turf/simulated/floor/tiled/dark,
 /area/bridge/controlroom)
 "qMs" = (
-/obj/structure/bed/stool/chair/plastic{
-	dir = 8
-	},
 /obj/effect/floor_decal/corner_wide/green/full{
 	dir = 1
 	},
 /obj/effect/landmark/start{
 	name = "Physician"
 	},
+/obj/structure/bed/stool/chair{
+	dir = 8
+	},
 /turf/simulated/floor/tiled/white,
 /area/hallway/medical/upper)
 "qNg" = (
@@ -26653,7 +26653,16 @@
 /turf/simulated/floor/reinforced/airless,
 /area/horizon/exterior)
 "uJm" = (
-/obj/structure/platform_deco/ledge,
+/obj/structure/platform/ledge{
+	dir = 4
+	},
+/obj/structure/platform/ledge{
+	dir = 1
+	},
+/obj/structure/platform_deco/ledge{
+	dir = 10
+	},
+/obj/structure/railing/mapped,
 /turf/simulated/open,
 /area/hallway/medical/upper)
 "uJu" = (
@@ -29443,15 +29452,15 @@
 /turf/simulated/floor,
 /area/maintenance/security_starboard)
 "wLL" = (
-/obj/structure/bed/stool/chair/plastic{
-	dir = 8
-	},
 /obj/effect/floor_decal/corner_wide/green{
 	dir = 6
 	},
 /obj/effect/landmark/start{
 	name = "Physician"
 	},
+/obj/structure/bed/stool/chair{
+	dir = 8
+	},
 /turf/simulated/floor/tiled/white,
 /area/hallway/medical/upper)
 "wMr" = (
@@ -45496,7 +45505,7 @@ sMd
 gcR
 xHj
 gcR
-gcR
+uJm
 rle
 ode
 jFO
@@ -45698,7 +45707,7 @@ umT
 dVW
 nHR
 dVW
-uJm
+rle
 iCT
 uGa
 dvD