From d02c9f442fef82eb05daef23c4ce12d80c436a99 Mon Sep 17 00:00:00 2001 From: "Wowzewow (Wezzy)" <42310821+alsoandanswer@users.noreply.github.com> Date: Fri, 13 Oct 2023 05:19:33 +0800 Subject: [PATCH] Medbay Floor Decal Fix (#17572) --- html/changelogs/wezzy_medbaymapfix.yml | 41 ++++++++++++++ maps/sccv_horizon/sccv_horizon-2_deck_2.dmm | 59 +++++++++++++++------ 2 files changed, 84 insertions(+), 16 deletions(-) create mode 100644 html/changelogs/wezzy_medbaymapfix.yml diff --git a/html/changelogs/wezzy_medbaymapfix.yml b/html/changelogs/wezzy_medbaymapfix.yml new file mode 100644 index 00000000000..f3e60d31e3b --- /dev/null +++ b/html/changelogs/wezzy_medbaymapfix.yml @@ -0,0 +1,41 @@ +################################ +# 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 +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: Wowzewow (Wezzy) + +# 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, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - bugfix: "Fixes floor decals around the body scanners and sleepers in the Medbay." diff --git a/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm b/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm index 70156766ed0..ce82fc1e02f 100644 --- a/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm +++ b/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm @@ -12014,6 +12014,7 @@ /obj/machinery/camera/network/medbay{ c_tag = "Medical - Aft Treatment Room" }, +/obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/tiled/white, /area/medical/icu) "fMQ" = ( @@ -18786,6 +18787,9 @@ dir = 6 }, /obj/structure/disposalpipe/segment, +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 1 + }, /turf/simulated/floor/tiled/white, /area/medical/icu) "iSi" = ( @@ -19471,6 +19475,9 @@ }, /obj/structure/disposalpipe/segment, /obj/effect/floor_decal/sign/icu, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, /turf/simulated/floor/tiled/white, /area/medical/icu) "jkb" = ( @@ -23418,8 +23425,10 @@ /obj/machinery/bodyscanner{ dir = 4 }, -/obj/effect/floor_decal/industrial/hatch/yellow, -/turf/simulated/floor/tiled/white, +/obj/effect/floor_decal/corner/beige{ + dir = 5 + }, +/turf/simulated/floor/tiled/dark, /area/medical/icu) "lhP" = ( /obj/effect/floor_decal/spline/fancy/wood/cee{ @@ -27077,6 +27086,7 @@ /area/engineering/engine_monitoring/rust) "mRr" = ( /obj/machinery/iv_drip, +/obj/effect/floor_decal/industrial/warning, /obj/effect/floor_decal/industrial/outline/red, /obj/machinery/light{ dir = 1 @@ -30247,6 +30257,9 @@ name = "O- Blood Locker"; pixel_x = -32 }, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, /obj/effect/floor_decal/industrial/hatch/red, /obj/machinery/light, /obj/item/reagent_containers/blood/OMinus, @@ -31499,6 +31512,9 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, /turf/simulated/floor/tiled/white, /area/medical/icu) "oZh" = ( @@ -37469,8 +37485,10 @@ /obj/machinery/sleeper{ dir = 4 }, -/obj/effect/floor_decal/industrial/hatch/yellow, -/turf/simulated/floor/tiled/white, +/obj/effect/floor_decal/corner/beige{ + dir = 10 + }, +/turf/simulated/floor/tiled/dark, /area/medical/icu) "rTC" = ( /obj/effect/floor_decal/spline/fancy/wood/corner, @@ -37821,7 +37839,7 @@ /obj/machinery/computer/general_air_control/large_tank_control{ input_tag = "fusion_injector_air"; name = "INDRA Chamber Monitor"; - sensors = list("fusion_sensor"="INDRA Chamber") + sensors = list("fusion_sensor"="INDRA Chamber") }, /turf/simulated/floor/tiled/dark/full, /area/engineering/engine_monitoring/rust) @@ -38214,6 +38232,9 @@ /obj/effect/floor_decal/corner_wide/green{ dir = 9 }, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, /turf/simulated/floor/tiled/white, /area/medical/icu) "soA" = ( @@ -40154,10 +40175,10 @@ /obj/machinery/body_scanconsole{ dir = 8 }, -/obj/effect/floor_decal/corner_wide/green{ - dir = 9 +/obj/effect/floor_decal/corner/beige/full{ + dir = 1 }, -/turf/simulated/floor/tiled/white, +/turf/simulated/floor/tiled/dark, /area/medical/icu) "tnv" = ( /obj/machinery/light{ @@ -40935,9 +40956,6 @@ /obj/effect/floor_decal/industrial/loading/yellow{ dir = 4 }, -/obj/effect/floor_decal/industrial/warning{ - dir = 4 - }, /turf/simulated/floor/tiled/dark, /area/medical/gen_treatment) "tHI" = ( @@ -43065,6 +43083,9 @@ /obj/effect/floor_decal/corner_wide/green{ dir = 5 }, +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 8 + }, /turf/simulated/floor/tiled/white, /area/medical/icu) "uFm" = ( @@ -44112,6 +44133,15 @@ /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled, /area/security/checkpoint2) +"vff" = ( +/obj/effect/floor_decal/corner/beige/full{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/loading/yellow{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, +/area/medical/icu) "vfi" = ( /obj/structure/foamedmetal, /obj/structure/shuttle_part/scc_space_ship{ @@ -44283,9 +44313,6 @@ /obj/effect/floor_decal/industrial/warning{ dir = 1 }, -/obj/effect/floor_decal/industrial/warning{ - dir = 4 - }, /turf/simulated/floor/tiled/white, /area/medical/gen_treatment) "vmv" = ( @@ -45697,7 +45724,7 @@ input_tag = "cooling_in"; name = "Engine Cooling Control"; output_tag = "cooling_out"; - sensors = list("engine_sensor"="Engine Core") + sensors = list("engine_sensor"="Engine Core") }, /obj/machinery/camera/network/engineering{ c_tag = "Engineering - Supermatter Reactor Monitoring"; @@ -68174,7 +68201,7 @@ guQ wia fME tnq -sog +vff sog laF lNb