diff --git a/html/changelogs/courierbravo - scattershothorizonchanges3.yml b/html/changelogs/courierbravo - scattershothorizonchanges3.yml
new file mode 100644
index 00000000000..42a496137af
--- /dev/null
+++ b/html/changelogs/courierbravo - scattershothorizonchanges3.yml
@@ -0,0 +1,68 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes:
+# bugfix
+# - (fixes bugs)
+# wip
+# - (work in progress)
+# qol
+# - (quality of life)
+# soundadd
+# - (adds a sound)
+# sounddel
+# - (removes a sound)
+# rscadd
+# - (adds a feature)
+# rscdel
+# - (removes a feature)
+# imageadd
+# - (adds an image or sprite)
+# imagedel
+# - (removes an image or sprite)
+# spellcheck
+# - (fixes spelling or grammar)
+# experiment
+# - (experimental change)
+# balance
+# - (balance changes)
+# code_imp
+# - (misc internal code change)
+# refactor
+# - (refactors code)
+# config
+# - (makes a change to the config files)
+# admin
+# - (makes changes to administrator tools)
+# server
+# - (miscellaneous changes to server)
+#################################
+
+# Your name.
+author: CourierBravo
+
+# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made. See valid prefix list above.
+# INDENT WITH TWO SPACES. NOT TABS. SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit.
+# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog.
+changes:
+ - rscadd: "Changed and added floor decals to the area in front of Consular Office B. Moved a couple decals in front of Consular Office A as well."
+ - rscadd: "Added an engineering floor decal to the warehouse. Also, moved around the floor outline decals in the warehouse. Now it goes top to bottom: Medical, Engineering, Science, Security, Service, and Operations."
+ - rscadd: "Removed girder and angled section layered on a hull wall next to R&D office. Just makes it look a little nicer."
+ - rscadd: "Altered the outline decals in xenobiology. Made some full decals half decals, and changed the decals around water dispensing objects to be blue instead of yellow."
+ - bugfix: "Fixed out of place air alarm in the Intrepid. Also moved around some objects to prevent odd overlapping."
+ - bugfix: "Fixed a corner wall in Bluespace Drive being a reinforced wall instead of a spaceship hull wall."
+ - bugfix: "Fixed an overlapping wall light and medical cabinet in the gym."
+ - bugfix: "Removed outlining decals on grass in the animal pen."
+ - bugfix: "Added missing floor spline in Research Director's office."
+ - bugfix: "Fixed an odd flood decal in the shields room."
+
diff --git a/maps/sccv_horizon/sccv_horizon.dmm b/maps/sccv_horizon/sccv_horizon.dmm
index 59e3937f3a3..81be80e8c26 100644
--- a/maps/sccv_horizon/sccv_horizon.dmm
+++ b/maps/sccv_horizon/sccv_horizon.dmm
@@ -904,10 +904,6 @@
},
/turf/simulated/floor/shuttle/black,
/area/shuttle/syndicate_elite)
-"afM" = (
-/obj/machinery/light,
-/turf/simulated/floor/tiled,
-/area/horizon/hallway/deck_three/primary/central)
"afS" = (
/obj/structure/table/wood,
/obj/item/device/flashlight/lamp/green{
@@ -3601,14 +3597,13 @@
/obj/structure/railing/mapped{
dir = 4
},
-/obj/machinery/light{
- dir = 1;
- name = "adjusted light fixture"
- },
/obj/effect/floor_decal/spline/plain/grey{
dir = 5
},
/obj/random/dirt_75,
+/obj/structure/closet/walllocker/medical/firstaid{
+ pixel_y = 32
+ },
/turf/simulated/floor/reinforced,
/area/horizon/crew_quarters/fitness/gym)
"azl" = (
@@ -18578,6 +18573,9 @@
dir = 8;
pixel_x = -12
},
+/obj/effect/floor_decal/industrial/outline_corner/security{
+ dir = 4
+ },
/turf/simulated/floor/tiled/white,
/area/rnd/xenobiology)
"cEH" = (
@@ -20349,6 +20347,9 @@
dir = 4;
pixel_x = 12
},
+/obj/effect/floor_decal/industrial/outline_corner/security{
+ dir = 8
+ },
/turf/simulated/floor/tiled/white,
/area/rnd/xenobiology)
"cSO" = (
@@ -23570,12 +23571,6 @@
/obj/structure/lattice,
/turf/simulated/open/airless,
/area/horizon/exterior)
-"dqF" = (
-/obj/structure/shuttle_part/scc_space_ship{
- icon_state = "d3-5"
- },
-/turf/simulated/wall/shuttle/scc_space_ship/cardinal,
-/area/rnd/xenobiology/xenoflora)
"dqH" = (
/obj/random/dirt_75,
/turf/simulated/floor,
@@ -27430,7 +27425,6 @@
/turf/simulated/open,
/area/horizon/hallway/deck_three/primary/starboard)
"dUC" = (
-/obj/effect/floor_decal/industrial/outline/yellow,
/obj/machinery/camera/network/research{
c_tag = "Research - Xenobio Fore";
network = list("Research","Xeno_Bio")
@@ -27439,6 +27433,7 @@
density = 0;
pixel_y = 17
},
+/obj/effect/floor_decal/industrial/outline_corner/yellow,
/turf/simulated/floor/tiled/white,
/area/rnd/xenobiology)
"dUJ" = (
@@ -27667,15 +27662,11 @@
/turf/simulated/floor/plating,
/area/engineering/drone_fabrication)
"dWw" = (
-/obj/structure/flora/ausbushes/sparsegrass,
-/obj/structure/window/reinforced{
- dir = 1
+/obj/effect/floor_decal/corner/dark_blue{
+ dir = 10
},
-/obj/structure/flora/ausbushes/ywflowers,
-/obj/effect/floor_decal/spline/plain,
-/mob/living/simple_animal/chicken,
-/turf/simulated/floor/grass,
-/area/horizon/hydroponics/lower)
+/turf/simulated/floor/tiled,
+/area/horizon/hallway/deck_three/primary/central)
"dWD" = (
/obj/effect/floor_decal/corner/brown{
dir = 10
@@ -29618,12 +29609,6 @@
/obj/effect/floor_decal/industrial/hatch/yellow,
/turf/simulated/floor/tiled/dark/full,
/area/maintenance/research_port)
-"ekl" = (
-/obj/structure/shuttle_part/scc_space_ship{
- icon_state = "d3-3"
- },
-/turf/simulated/open/airless,
-/area/horizon/exterior)
"ekp" = (
/obj/structure/cable/green{
icon_state = "4-8"
@@ -34437,9 +34422,6 @@
name = "adjusted light fixture"
},
/obj/structure/table/steel,
-/obj/structure/closet/walllocker/medical/firstaid{
- pixel_y = 32
- },
/turf/simulated/floor/carpet/rubber,
/area/horizon/crew_quarters/fitness/gym)
"eVd" = (
@@ -35220,9 +35202,6 @@
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 4
},
-/obj/effect/floor_decal/spline/plain/corner{
- dir = 8
- },
/turf/simulated/floor/grass,
/area/horizon/hydroponics/lower)
"faM" = (
@@ -41575,12 +41554,13 @@
/turf/simulated/wall/shuttle/scc_space_ship/cardinal,
/area/horizon/security/firing_range)
"fXy" = (
-/obj/structure/flora/ausbushes/ppflowers,
-/obj/effect/floor_decal/spline/plain{
- dir = 8
+/obj/structure/bed/stool/chair/shuttle,
+/obj/effect/floor_decal/corner/lime/diagonal,
+/obj/machinery/alarm/north{
+ req_one_access = list(24,11,47,65,73)
},
-/turf/simulated/floor/grass,
-/area/horizon/hydroponics/lower)
+/turf/simulated/floor/tiled/white,
+/area/shuttle/intrepid/main_compartment)
"fXF" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 10
@@ -48166,9 +48146,6 @@
/area/antag/loner)
"gTU" = (
/obj/structure/flora/ausbushes/sparsegrass,
-/obj/effect/floor_decal/spline/plain{
- dir = 10
- },
/turf/simulated/floor/grass,
/area/horizon/hydroponics/lower)
"gTY" = (
@@ -64144,12 +64121,9 @@
/turf/simulated/floor/holofloor/grass,
/area/horizon/holodeck/source_picnicarea)
"jln" = (
-/obj/structure/shuttle_part/scc_space_ship{
- icon_state = "d3-6"
- },
-/obj/structure/girder,
-/turf/simulated/wall/shuttle/scc_space_ship/cardinal,
-/area/rnd/xenobiology/xenoflora)
+/obj/effect/floor_decal/industrial/outline/service,
+/turf/simulated/floor/tiled,
+/area/operations/storage)
"jlo" = (
/obj/effect/floor_decal/corner_wide/purple{
dir = 6
@@ -67606,10 +67580,10 @@
/turf/simulated/floor/exoplanet/grass/grove,
/area/centcom/shared_dream)
"jKv" = (
-/obj/effect/floor_decal/industrial/outline/yellow,
/obj/structure/sink{
pixel_y = 24
},
+/obj/effect/floor_decal/industrial/outline/security,
/turf/simulated/floor/tiled/dark/full,
/area/rnd/xenobiology)
"jKE" = (
@@ -80691,7 +80665,7 @@
icon_state = "1-2"
},
/obj/effect/floor_decal/corner_wide/yellow{
- dir = 8
+ dir = 10
},
/turf/simulated/floor/tiled/dark/full,
/area/storage/shields)
@@ -84849,10 +84823,10 @@
/turf/unsimulated/floor,
/area/centcom/legion)
"mkU" = (
-/obj/effect/floor_decal/industrial/outline/yellow,
/obj/machinery/shower{
pixel_y = 12
},
+/obj/effect/floor_decal/industrial/outline/security,
/turf/simulated/floor/tiled/dark/full,
/area/rnd/xenobiology)
"mkV" = (
@@ -101559,10 +101533,12 @@
pixel_x = -1;
pixel_y = 1
},
-/obj/effect/floor_decal/industrial/outline/yellow,
/obj/machinery/light/floor{
dir = 8
},
+/obj/effect/floor_decal/industrial/outline_corner/security{
+ dir = 4
+ },
/turf/simulated/floor/tiled/white,
/area/rnd/xenobiology)
"oLJ" = (
@@ -104900,9 +104876,12 @@
/turf/simulated/floor/tiled/dark/full,
/area/horizon/longbow)
"pme" = (
-/obj/effect/floor_decal/industrial/outline/research,
-/turf/simulated/floor/tiled,
-/area/operations/storage)
+/obj/structure/bed/stool/chair/shuttle{
+ dir = 1
+ },
+/obj/machinery/alarm/south,
+/turf/simulated/floor/tiled/dark/full,
+/area/shuttle/intrepid/main_compartment)
"pmk" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -112777,7 +112756,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
-/obj/effect/floor_decal/industrial/outline/service,
+/obj/effect/floor_decal/industrial/outline/research,
/turf/simulated/floor/tiled,
/area/operations/storage)
"qsE" = (
@@ -114432,12 +114411,15 @@
/turf/unsimulated/floor/plating,
/area/centcom/bar)
"qFf" = (
-/obj/machinery/alarm/north{
- req_one_access = list(24,11,47,65,73)
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
},
-/obj/effect/floor_decal/corner/lime/diagonal,
-/turf/simulated/floor/tiled/white,
-/area/shuttle/intrepid/main_compartment)
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/effect/floor_decal/industrial/outline/operations,
+/turf/simulated/floor/tiled,
+/area/operations/storage)
"qFj" = (
/obj/item/stack/cable_coil,
/obj/machinery/light,
@@ -122962,9 +122944,6 @@
/area/template_noop)
"rRi" = (
/mob/living/simple_animal/cow,
-/obj/effect/floor_decal/spline/plain/corner{
- dir = 8
- },
/turf/simulated/floor/grass,
/area/horizon/hydroponics/lower)
"rRj" = (
@@ -133568,9 +133547,6 @@
/obj/effect/floor_decal/industrial/warning/corner{
dir = 4
},
-/obj/machinery/alarm/east{
- req_one_access = list(11, 24, 47, 65)
- },
/obj/machinery/camera/network/intrepid{
dir = 8
},
@@ -139470,7 +139446,7 @@
/turf/simulated/floor/plating,
/area/engineering/atmos/propulsion)
"uoI" = (
-/obj/effect/floor_decal/industrial/outline/operations,
+/obj/effect/floor_decal/industrial/outline/engineering,
/turf/simulated/floor/tiled,
/area/operations/storage)
"uoJ" = (
@@ -149559,6 +149535,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 6
},
+/obj/effect/floor_decal/spline/fancy/wood,
/turf/simulated/floor/wood,
/area/crew_quarters/heads/hor)
"vPL" = (
@@ -153357,6 +153334,9 @@
dir = 4;
pixel_x = 12
},
+/obj/effect/floor_decal/industrial/outline_corner/security{
+ dir = 8
+ },
/turf/simulated/floor/tiled/white,
/area/rnd/xenobiology)
"wrk" = (
@@ -153701,6 +153681,9 @@
dir = 8;
pixel_x = -12
},
+/obj/effect/floor_decal/industrial/outline_corner/security{
+ dir = 4
+ },
/turf/simulated/floor/tiled/white,
/area/rnd/xenobiology)
"wtx" = (
@@ -188349,7 +188332,7 @@ gEd
gEd
dZV
gEd
-nVz
+gEd
nVz
nVz
nVz
@@ -189141,9 +189124,9 @@ ubg
kLu
uoI
qsC
-pme
qAY
-sWr
+jln
+qFf
njB
nCV
nCV
@@ -200982,7 +200965,7 @@ otE
aJI
jHp
uWc
-hwA
+lbo
sql
lgN
eEc
@@ -201239,13 +201222,13 @@ gZL
nar
jcD
eNa
-lbo
+pme
sql
uJi
mwR
sql
-oDE
-qFf
+fXy
+reg
reg
gKh
hlh
@@ -203563,7 +203546,7 @@ xzd
ifu
tlt
pAP
-dWw
+fKB
uAV
nLh
mdL
@@ -204079,7 +204062,7 @@ iqk
jGG
qIR
rRi
-fXy
+bpl
clG
ctz
eSV
@@ -276501,7 +276484,7 @@ kmD
wRk
wRk
wRk
-dqF
+gYL
pag
pDV
pag
@@ -276757,8 +276740,8 @@ eSV
wWR
krQ
qfo
-ekl
-jln
+qfo
+gYL
eTY
xmY
cYa
@@ -330245,7 +330228,7 @@ phb
bOb
qdj
nyY
-tQE
+dVW
fbv
cXh
cmD
@@ -330502,7 +330485,7 @@ phb
bOb
qdj
nyY
-dVW
+tQE
hvS
aEV
xMS
@@ -333072,7 +333055,7 @@ eYk
gOC
gOC
qGR
-afM
+qrj
tXk
tXk
tXk
@@ -333329,7 +333312,7 @@ qVM
caW
caW
umQ
-caW
+ggM
aVk
vot
gHa
@@ -333586,7 +333569,7 @@ caW
qJq
sZW
nps
-caW
+dWw
aVk
lUS
bjd
@@ -333843,7 +333826,7 @@ caW
lDD
uGl
sqS
-caW
+ggM
aVk
efF
cLW
@@ -334100,7 +334083,7 @@ caW
kLa
rmg
sqS
-caW
+ggM
tXk
fHN
jeD
@@ -334357,7 +334340,7 @@ fsh
caW
caW
fcp
-caW
+ggM
aVk
pik
kVk
@@ -334614,7 +334597,7 @@ sWi
imA
imA
fcp
-caW
+dWw
fON
otA
bXr
@@ -334871,7 +334854,7 @@ lkK
qBb
sEJ
eqQ
-caW
+ggM
fON
hBC
aaM
@@ -335128,7 +335111,7 @@ xDO
mWd
eFq
tpG
-qGk
+ggM
tXk
tXk
tXk