From 1aeeb6827d1343e483b91c4960d46c505809e89d Mon Sep 17 00:00:00 2001 From: hazelrat <83198434+hazelrat@users.noreply.github.com> Date: Sat, 21 Sep 2024 13:45:44 +0100 Subject: [PATCH] Minor QoL Horizon tweaks (#19887) Resolves a couple of the odd quirks on the Horizon that have piled up, including: 1. Aligning the cafe stools in the direction of the counter. 2. Fixing a misaligned APC in engineering maintenance. 3. Pixel shifting the bar glasses vendor so it doesn't overlap with the coffee machine. 4. Giving missing custodial access to a few maintenance hatches. Access on maintenance airlocks seems very inconsistent so I'm sure this isn't comprehensive, but janitors can now access bar maintenance, the areas of maintenance behind the main lift on deck two and three, and the area of maintenance between the garden and security maintenance. Custodial access appears separate from generic maintenance access, so I think it's just been forgotten in some recent remaps. --- code/game/jobs/job/civilian.dm | 2 +- html/changelogs/hazelmouse-weirdquirks.yml | 58 ++++++++++++++++++++++ maps/sccv_horizon/sccv_horizon.dmm | 40 ++++++++------- 3 files changed, 80 insertions(+), 20 deletions(-) create mode 100644 html/changelogs/hazelmouse-weirdquirks.yml diff --git a/code/game/jobs/job/civilian.dm b/code/game/jobs/job/civilian.dm index 72a0ee87826..e19d0274286 100644 --- a/code/game/jobs/job/civilian.dm +++ b/code/game/jobs/job/civilian.dm @@ -167,7 +167,7 @@ supervisors = "the executive officer" selection_color = "#90524b" access = list(ACCESS_JANITOR, ACCESS_MAINT_TUNNELS, ACCESS_ENGINE, ACCESS_RESEARCH, ACCESS_SEC_DOORS, ACCESS_MEDICAL) - minimal_access = list(ACCESS_JANITOR, ACCESS_ENGINE, ACCESS_RESEARCH, ACCESS_SEC_DOORS, ACCESS_MEDICAL) + minimal_access = list(ACCESS_JANITOR, ACCESS_MAINT_TUNNELS, ACCESS_ENGINE, ACCESS_RESEARCH, ACCESS_SEC_DOORS, ACCESS_MEDICAL) outfit = /obj/outfit/job/janitor blacklisted_species = list(SPECIES_VAURCA_BREEDER) diff --git a/html/changelogs/hazelmouse-weirdquirks.yml b/html/changelogs/hazelmouse-weirdquirks.yml new file mode 100644 index 00000000000..17693bf63f4 --- /dev/null +++ b/html/changelogs/hazelmouse-weirdquirks.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: hazelmouse + +# 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: + - qol: "Resolves a few odd quirks of the Horizon's map, like misaligned objects. Patches a few holes in custodial access to maintenance, including to bar maintenance and behind the main lift." diff --git a/maps/sccv_horizon/sccv_horizon.dmm b/maps/sccv_horizon/sccv_horizon.dmm index 031d8bf2e80..e54fdd0c33d 100644 --- a/maps/sccv_horizon/sccv_horizon.dmm +++ b/maps/sccv_horizon/sccv_horizon.dmm @@ -9019,7 +9019,6 @@ /turf/simulated/floor/plating, /area/maintenance/wing/port/far) "bnn" = ( -/obj/effect/floor_decal/corner/teal/diagonal, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -23236,7 +23235,7 @@ /obj/machinery/door/airlock/maintenance{ dir = 1; name = "Bar Maintenance"; - req_one_access = list(12,25) + req_one_access = list(12, 25) }, /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -31715,7 +31714,9 @@ /turf/simulated/floor/tiled/full, /area/medical/smoking) "eGg" = ( -/obj/structure/bed/stool/bar/padded/teal, +/obj/structure/bed/stool/bar/padded/teal{ + dir = 4 + }, /obj/effect/floor_decal/corner/red/diagonal, /obj/effect/floor_decal/spline/plain{ dir = 4 @@ -39419,7 +39420,6 @@ /turf/unsimulated/floor, /area/antag/raider) "fQc" = ( -/obj/effect/floor_decal/corner/teal/diagonal, /obj/structure/cable/green{ icon_state = "1-8" }, @@ -48514,7 +48514,7 @@ }, /obj/machinery/door/airlock/maintenance_hatch{ dir = 4; - req_one_access = list(12,26) + req_one_access = list(12) }, /obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, @@ -49333,10 +49333,10 @@ dir = 10 }, /obj/machinery/alarm/north, -/obj/machinery/power/apc/west, /obj/structure/cable/green{ icon_state = "0-2" }, +/obj/machinery/power/apc/east, /turf/simulated/floor, /area/maintenance/engineering_ladder) "hnR" = ( @@ -55714,7 +55714,7 @@ /obj/structure/disposalpipe/segment, /obj/machinery/door/airlock/maintenance{ dir = 1; - req_access = list(12) + req_one_access = list(12, 25) }, /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -59262,7 +59262,7 @@ /obj/machinery/door/airlock/maintenance{ dir = 1; name = "Maintenance Passthrough"; - req_one_access = list(12,26,31,48,67) + req_one_access = list(12,31,48,67) }, /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -83781,7 +83781,6 @@ /turf/simulated/wall/shuttle/scc_space_ship/cardinal, /area/maintenance/hangar/starboard) "msz" = ( -/obj/effect/floor_decal/corner/teal/diagonal, /obj/effect/floor_decal/spline/plain{ dir = 8 }, @@ -86902,7 +86901,8 @@ pixel_y = 4 }, /obj/machinery/vending/dinnerware/bar{ - pixel_y = 16 + pixel_y = 16; + pixel_x = 6 }, /turf/simulated/floor/tiled/dark, /area/horizon/bar) @@ -91075,7 +91075,7 @@ }, /obj/machinery/door/airlock/maintenance{ dir = 4; - req_one_access = list(12,26,48) + req_one_access = list(12,48) }, /turf/simulated/floor/tiled/full, /area/hangar/intrepid) @@ -94926,7 +94926,7 @@ /obj/machinery/door/airlock/maintenance{ dir = 1; name = "Recharging Station Maintenance"; - req_one_access = list(12,26) + req_one_access = list(12) }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -102460,7 +102460,6 @@ }, /area/centcom/control) "pkj" = ( -/obj/effect/floor_decal/corner/teal/diagonal, /obj/structure/cable/green{ icon_state = "1-2" }, @@ -108966,7 +108965,9 @@ /turf/space/dynamic, /area/horizon/exterior) "qgw" = ( -/obj/structure/bed/stool/bar/padded/teal, +/obj/structure/bed/stool/bar/padded/teal{ + dir = 4 + }, /obj/effect/floor_decal/corner/red/diagonal, /obj/effect/floor_decal/spline/plain{ dir = 5 @@ -114943,8 +114944,7 @@ "raq" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/maintenance_hatch{ - dir = 1; - req_access = list(12) + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/floor/tiled/full, @@ -129180,7 +129180,7 @@ /obj/machinery/door/firedoor, /obj/machinery/door/airlock/maintenance{ dir = 4; - req_one_access = list(12,26) + req_one_access = list(12) }, /turf/simulated/floor/tiled/full, /area/maintenance/engineering) @@ -132531,7 +132531,9 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/structure/bed/stool/bar/padded/red, +/obj/structure/bed/stool/bar/padded/red{ + dir = 8 + }, /obj/effect/floor_decal/spline/fancy/wood{ dir = 8 }, @@ -151712,7 +151714,7 @@ /obj/structure/lattice/catwalk/indoor/grate, /obj/machinery/door/airlock/maintenance_hatch{ dir = 1; - req_one_access = list(12,26) + req_one_access = list(12) }, /turf/simulated/floor/plating, /area/maintenance/engineering)