From 477e7fa5701afa8f031c0ca48c46fc3f72bd7403 Mon Sep 17 00:00:00 2001 From: beepbopbeepbop <98155621+beepbopbeepbop@users.noreply.github.com> Date: Fri, 15 Nov 2024 01:14:34 +1100 Subject: [PATCH] Security Disposal Pipe Fixes (#20167) quick bugfix for the disposal pipes outside of the armoury. --- .../notagonk_hos_quickfixes_changelog.yml | 58 ++++++++++++++++ maps/sccv_horizon/sccv_horizon.dmm | 69 +++++++++---------- 2 files changed, 92 insertions(+), 35 deletions(-) create mode 100644 html/changelogs/notagonk_hos_quickfixes_changelog.yml diff --git a/html/changelogs/notagonk_hos_quickfixes_changelog.yml b/html/changelogs/notagonk_hos_quickfixes_changelog.yml new file mode 100644 index 00000000000..10fbb6f88d5 --- /dev/null +++ b/html/changelogs/notagonk_hos_quickfixes_changelog.yml @@ -0,0 +1,58 @@ +################################ +# 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: notagonk + +# 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: + - bugfix: "Fixes the disposal pipes outside of the Armoury." diff --git a/maps/sccv_horizon/sccv_horizon.dmm b/maps/sccv_horizon/sccv_horizon.dmm index 9a9eb03aaad..2a9e68482c1 100644 --- a/maps/sccv_horizon/sccv_horizon.dmm +++ b/maps/sccv_horizon/sccv_horizon.dmm @@ -24797,9 +24797,6 @@ /turf/simulated/floor/tiled, /area/horizon/hallway/deck_three/primary/starboard) "dAp" = ( -/obj/structure/disposalpipe/junction{ - dir = 1 - }, /obj/effect/floor_decal/corner/dark_blue{ dir = 9 }, @@ -24810,6 +24807,9 @@ dir = 4 }, /obj/effect/floor_decal/industrial/outline/security, +/obj/structure/disposalpipe/junction{ + icon_state = "pipe-j2" + }, /turf/simulated/floor/tiled, /area/horizon/security/hallway) "dAv" = ( @@ -25339,10 +25339,6 @@ /turf/simulated/floor/tiled, /area/horizon/crew_quarters/fitness/changing) "dEf" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, /obj/effect/floor_decal/corner/dark_blue{ dir = 9 }, @@ -25350,6 +25346,10 @@ dir = 4 }, /obj/effect/floor_decal/industrial/outline/security, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled, /area/horizon/security/hallway) "dEi" = ( @@ -89259,16 +89259,15 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/floor_decal/corner/dark_blue{ dir = 6 }, /obj/machinery/firealarm/east, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled, /area/horizon/security/hallway) "mXQ" = ( @@ -108010,20 +108009,6 @@ }, /turf/simulated/floor/plating, /area/shuttle/canary) -"pLt" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, -/obj/effect/floor_decal/corner/dark_blue{ - dir = 9 - }, -/obj/structure/bed/stool/chair{ - dir = 4 - }, -/obj/effect/floor_decal/industrial/outline/security, -/turf/simulated/floor/tiled, -/area/horizon/security/hallway) "pLA" = ( /obj/structure/sign/staff_only{ pixel_x = -32 @@ -116916,10 +116901,6 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/disposal/small/west, -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/floor_decal/corner/dark_blue{ dir = 6 @@ -116930,6 +116911,10 @@ name = "\improper WARNING: ARMOURY sign"; pixel_x = 32 }, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/obj/machinery/disposal/small/west, /turf/simulated/floor/tiled, /area/horizon/security/hallway) "qYU" = ( @@ -140821,6 +140806,20 @@ }, /turf/simulated/floor/tiled/white, /area/centcom/shared_dream) +"uAx" = ( +/obj/effect/floor_decal/corner/dark_blue{ + dir = 9 + }, +/obj/structure/bed/stool/chair{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/outline/security, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/turf/simulated/floor/tiled, +/area/horizon/security/hallway) "uAy" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -162131,9 +162130,6 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/segment{ - icon_state = "pipe-c" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/floor_decal/corner/dark_blue{ dir = 6 @@ -162141,6 +162137,9 @@ /obj/effect/floor_decal/industrial/warning{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled, /area/horizon/security/hallway) "xCL" = ( @@ -270292,9 +270291,9 @@ uoa siC weL eTo -dEf +uAx dAp -pLt +dEf nBy amj efg