From 97308aa3d8c0bd4ffdb59b8ff27d23af3d9f96aa Mon Sep 17 00:00:00 2001 From: courierbravo <73250577+courierbravo@users.noreply.github.com> Date: Tue, 20 Aug 2024 07:00:48 -0700 Subject: [PATCH] Bugfix - Industrial outline (#19801) fixes me being a goober by not using the mapmerge tool. replaces engineering outlines with industrial outlines on maps I forgor to go back and fix after map conflicts. This is why we use the mapmerge tool, instead of being a goober. --- html/changelogs/courierbravo-gooberfix.yml | 58 ++++++++++++++++++ .../ships/freebooter/freebooter_ship_.dmm | 4 +- .../freebooter/freebooter_ship_submaps.dmm | 14 ++--- .../tarwa/unathi_pirate_tarwa.dmm | 26 ++++---- maps/sccv_horizon/sccv_horizon.dmm | 60 +++++++++---------- 5 files changed, 110 insertions(+), 52 deletions(-) create mode 100644 html/changelogs/courierbravo-gooberfix.yml diff --git a/html/changelogs/courierbravo-gooberfix.yml b/html/changelogs/courierbravo-gooberfix.yml new file mode 100644 index 00000000000..2b49956b060 --- /dev/null +++ b/html/changelogs/courierbravo-gooberfix.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: 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: + - bugfix: "Fixed brown industrial outlines being replaced with yellow outlines. Issued caused by me being a goober." diff --git a/maps/away/ships/freebooter/freebooter_ship_.dmm b/maps/away/ships/freebooter/freebooter_ship_.dmm index 3c86447e528..dbd97ccb091 100644 --- a/maps/away/ships/freebooter/freebooter_ship_.dmm +++ b/maps/away/ships/freebooter/freebooter_ship_.dmm @@ -4093,7 +4093,7 @@ /turf/simulated/floor/reinforced, /area/ship/freebooter_ship/gunnery) "pHN" = ( -/obj/effect/floor_decal/industrial/outline/engineering, +/obj/effect/floor_decal/industrial/outline/operations, /obj/structure/reagent_dispensers/fueltank, /turf/simulated/floor/tiled/dark/full, /area/ship/freebooter_ship/thruster1) @@ -5447,7 +5447,7 @@ /turf/simulated/floor/tiled/dark, /area/ship/freebooter_ship/foyer) "uoZ" = ( -/obj/effect/floor_decal/industrial/outline/engineering, +/obj/effect/floor_decal/industrial/outline/operations, /obj/structure/closet/radiation, /obj/machinery/light, /turf/simulated/floor/reinforced, diff --git a/maps/away/ships/freebooter/freebooter_ship_submaps.dmm b/maps/away/ships/freebooter/freebooter_ship_submaps.dmm index 38d2219817e..f3ba3e3fe4d 100644 --- a/maps/away/ships/freebooter/freebooter_ship_submaps.dmm +++ b/maps/away/ships/freebooter/freebooter_ship_submaps.dmm @@ -1401,7 +1401,7 @@ /obj/effect/floor_decal/corner/dark_blue/full{ dir = 1 }, -/obj/effect/floor_decal/industrial/outline/engineering, +/obj/effect/floor_decal/industrial/outline/operations, /obj/machinery/portable_atmospherics/canister/empty/phoron{ destroyed = 1 }, @@ -1492,7 +1492,7 @@ /obj/effect/floor_decal/corner/dark_blue{ dir = 10 }, -/obj/effect/floor_decal/industrial/outline/engineering, +/obj/effect/floor_decal/industrial/outline/operations, /obj/structure/bed/padded, /turf/simulated/floor/tiled/dark, /area/ship/freebooter_ship/pod8) @@ -1726,7 +1726,7 @@ /turf/simulated/floor/wood/walnut, /area/ship/freebooter_ship/pod7) "kkT" = ( -/obj/effect/floor_decal/industrial/outline/engineering, +/obj/effect/floor_decal/industrial/outline/operations, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -2188,7 +2188,7 @@ /obj/effect/floor_decal/corner/dark_blue/full{ dir = 4 }, -/obj/effect/floor_decal/industrial/outline/engineering, +/obj/effect/floor_decal/industrial/outline/operations, /obj/effect/decal/cleanable/dirt, /obj/structure/bed/padded, /turf/simulated/floor/tiled/dark, @@ -2230,7 +2230,7 @@ /obj/effect/floor_decal/corner/dark_blue{ dir = 6 }, -/obj/effect/floor_decal/industrial/outline/engineering, +/obj/effect/floor_decal/industrial/outline/operations, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, @@ -3569,7 +3569,7 @@ /turf/simulated/floor/tiled/dark/full, /area/ship/freebooter_ship/pod2) "uOr" = ( -/obj/effect/floor_decal/industrial/outline/engineering, +/obj/effect/floor_decal/industrial/outline/operations, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -3791,7 +3791,7 @@ /obj/effect/floor_decal/corner/dark_blue{ dir = 5 }, -/obj/effect/floor_decal/industrial/outline/engineering, +/obj/effect/floor_decal/industrial/outline/operations, /obj/machinery/light{ dir = 1; inserted_light = /obj/item/light/tube/colored/blue; diff --git a/maps/away/ships/unathi_pirate/tarwa/unathi_pirate_tarwa.dmm b/maps/away/ships/unathi_pirate/tarwa/unathi_pirate_tarwa.dmm index d4f995f3083..d7758eb6610 100644 --- a/maps/away/ships/unathi_pirate/tarwa/unathi_pirate_tarwa.dmm +++ b/maps/away/ships/unathi_pirate/tarwa/unathi_pirate_tarwa.dmm @@ -466,7 +466,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, -/obj/effect/floor_decal/industrial/outline/engineering, +/obj/effect/floor_decal/industrial/outline/operations, /turf/simulated/floor/tiled, /area/tarwa_ship/oldhangar) "dP" = ( @@ -809,7 +809,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/effect/floor_decal/industrial/outline/engineering, +/obj/effect/floor_decal/industrial/outline/operations, /obj/structure/closet/crate/loot, /turf/simulated/floor/tiled, /area/tarwa_ship/oldhangar) @@ -840,7 +840,7 @@ /turf/simulated/floor/tiled, /area/shuttle/tarwa) "hx" = ( -/obj/effect/floor_decal/industrial/outline/engineering, +/obj/effect/floor_decal/industrial/outline/operations, /obj/structure/closet/crate/loot, /turf/simulated/floor/tiled, /area/tarwa_ship/oldhangar) @@ -1028,8 +1028,8 @@ /turf/simulated/floor/reinforced/carbon_dioxide, /area/tarwa_ship/engineering2) "jg" = ( -/obj/effect/floor_decal/industrial/outline/engineering, -/obj/effect/floor_decal/industrial/outline/engineering, +/obj/effect/floor_decal/industrial/outline/operations, +/obj/effect/floor_decal/industrial/outline/operations, /obj/structure/reagent_dispensers/watertank, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled, @@ -1495,7 +1495,7 @@ /area/tarwa_ship/engineering2) "nK" = ( /obj/machinery/atmospherics/unary/vent_pump/on, -/obj/effect/floor_decal/industrial/outline/engineering, +/obj/effect/floor_decal/industrial/outline/operations, /obj/structure/closet/crate/loot, /turf/simulated/floor/tiled, /area/tarwa_ship/oldhangar) @@ -1922,7 +1922,7 @@ /turf/simulated/floor/diona, /area/tarwa_ship/cic) "sA" = ( -/obj/effect/floor_decal/industrial/outline/engineering, +/obj/effect/floor_decal/industrial/outline/operations, /turf/simulated/floor/tiled, /area/tarwa_ship/oldhangar) "sC" = ( @@ -2208,7 +2208,7 @@ /turf/simulated/floor/diona, /area/shuttle/tarwa) "wd" = ( -/obj/effect/floor_decal/industrial/outline/engineering, +/obj/effect/floor_decal/industrial/outline/operations, /obj/structure/reagent_dispensers/fueltank, /turf/simulated/floor/tiled, /area/tarwa_ship/oldhangar) @@ -2520,8 +2520,8 @@ }, /area/tarwa_ship/gun) "yL" = ( -/obj/effect/floor_decal/industrial/outline/engineering, -/obj/effect/floor_decal/industrial/outline/engineering, +/obj/effect/floor_decal/industrial/outline/operations, +/obj/effect/floor_decal/industrial/outline/operations, /obj/structure/closet/crate/loot, /turf/simulated/floor/tiled, /area/tarwa_ship/oldhangar) @@ -2785,7 +2785,7 @@ /obj/effect/floor_decal/corner_wide/paleblue{ dir = 1 }, -/obj/effect/floor_decal/industrial/outline/engineering, +/obj/effect/floor_decal/industrial/outline/operations, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/white, /area/tarwa_ship/medical) @@ -3671,7 +3671,7 @@ /turf/simulated/floor/tiled, /area/tarwa_ship) "Ih" = ( -/obj/effect/floor_decal/industrial/outline/engineering, +/obj/effect/floor_decal/industrial/outline/operations, /obj/structure/closet/crate/loot, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled, @@ -3904,7 +3904,7 @@ /turf/simulated/floor/diona, /area/tarwa_ship/bridge) "Kh" = ( -/obj/effect/floor_decal/industrial/outline/engineering, +/obj/effect/floor_decal/industrial/outline/operations, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled, /area/tarwa_ship/oldhangar) diff --git a/maps/sccv_horizon/sccv_horizon.dmm b/maps/sccv_horizon/sccv_horizon.dmm index bd23629960a..f631c3cbef4 100644 --- a/maps/sccv_horizon/sccv_horizon.dmm +++ b/maps/sccv_horizon/sccv_horizon.dmm @@ -1749,7 +1749,7 @@ /turf/simulated/floor/tiled/dark/full, /area/shuttle/hapt) "als" = ( -/obj/effect/floor_decal/industrial/outline/engineering, +/obj/effect/floor_decal/industrial/outline/operations, /obj/machinery/suit_cycler/engineering/prepared, /turf/simulated/floor/tiled/dark/full, /area/storage/eva) @@ -6687,7 +6687,7 @@ /obj/effect/floor_decal/corner/yellow{ dir = 6 }, -/obj/effect/floor_decal/industrial/outline/engineering, +/obj/effect/floor_decal/industrial/outline/operations, /turf/simulated/floor/tiled, /area/engineering/locker_room) "aWr" = ( @@ -7724,7 +7724,7 @@ /turf/simulated/floor/tiled/dark, /area/horizon/holodeck/source_pool) "bdc" = ( -/obj/effect/floor_decal/industrial/outline/engineering, +/obj/effect/floor_decal/industrial/outline/operations, /obj/machinery/pipedispenser/disposal, /obj/machinery/power/apc/north, /obj/structure/cable/green{ @@ -29724,7 +29724,7 @@ /area/turbolift/research/deck_1) "erM" = ( /obj/machinery/alarm/south, -/obj/effect/floor_decal/industrial/outline/engineering, +/obj/effect/floor_decal/industrial/outline/operations, /obj/structure/table/standard, /obj/item/device/suit_cooling_unit, /obj/item/device/suit_cooling_unit, @@ -39778,7 +39778,7 @@ /turf/simulated/floor/plating, /area/maintenance/research_port) "fUu" = ( -/obj/effect/floor_decal/industrial/outline/engineering, +/obj/effect/floor_decal/industrial/outline/operations, /obj/structure/closet/secure_closet/atmos_personal, /turf/simulated/floor/tiled/dark/full, /area/engineering/atmos/storage) @@ -48748,7 +48748,7 @@ /area/centcom/shared_dream) "hmn" = ( /obj/machinery/suit_cycler/engineering/prepared, -/obj/effect/floor_decal/industrial/outline/engineering, +/obj/effect/floor_decal/industrial/outline/operations, /turf/simulated/floor/tiled/dark/full, /area/storage/eva) "hmt" = ( @@ -50768,7 +50768,7 @@ dir = 8; name = "External Ports to Fuel Tank" }, -/obj/effect/floor_decal/industrial/outline/engineering, +/obj/effect/floor_decal/industrial/outline/operations, /obj/structure/cable/green{ icon_state = "4-8" }, @@ -60809,7 +60809,7 @@ dir = 4 }, /obj/structure/closet/emcloset, -/obj/effect/floor_decal/industrial/outline/engineering, +/obj/effect/floor_decal/industrial/outline/operations, /obj/machinery/alarm/north{ req_one_access = list(24,11,47,65) }, @@ -70360,7 +70360,7 @@ /turf/simulated/floor/tiled/white, /area/horizon/kitchen) "kwl" = ( -/obj/effect/floor_decal/industrial/outline/engineering, +/obj/effect/floor_decal/industrial/outline/operations, /obj/structure/fireaxecabinet/east, /obj/structure/closet/secure_closet/atmos_personal, /turf/simulated/floor/tiled/dark/full, @@ -74986,7 +74986,7 @@ dir = 1; name = "Fuel Tank to Thrusters" }, -/obj/effect/floor_decal/industrial/outline/engineering, +/obj/effect/floor_decal/industrial/outline/operations, /turf/simulated/floor/tiled/dark, /area/shuttle/mining) "lhQ" = ( @@ -78119,7 +78119,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/red{ dir = 8 }, -/obj/effect/floor_decal/industrial/outline/engineering, +/obj/effect/floor_decal/industrial/outline/operations, /turf/simulated/floor/tiled/dark/full, /area/engineering/atmos/propulsion/starboard) "lGb" = ( @@ -81562,7 +81562,7 @@ /obj/item/stack/cable_coil, /obj/item/circuitboard/unary_atmos/cooler, /obj/item/circuitboard/unary_atmos/heater, -/obj/effect/floor_decal/industrial/outline/engineering, +/obj/effect/floor_decal/industrial/outline/operations, /turf/simulated/floor/tiled/dark/full, /area/engineering/atmos/storage) "mhs" = ( @@ -84246,7 +84246,7 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/effect/floor_decal/industrial/outline/engineering, +/obj/effect/floor_decal/industrial/outline/operations, /obj/machinery/light{ dir = 8 }, @@ -96930,7 +96930,7 @@ /turf/simulated/floor/tiled/dark, /area/horizon/security/interrogation) "ozA" = ( -/obj/effect/floor_decal/industrial/outline/engineering, +/obj/effect/floor_decal/industrial/outline/operations, /obj/machinery/atmospherics/valve/digital{ dir = 4; name = "Airlock to Distribution Merge" @@ -99338,7 +99338,7 @@ /turf/unsimulated/floor/plating, /area/shuttle/legion) "oSy" = ( -/obj/effect/floor_decal/industrial/outline/engineering, +/obj/effect/floor_decal/industrial/outline/operations, /obj/machinery/pipedispenser, /obj/structure/cable/green{ icon_state = "4-8" @@ -105285,7 +105285,7 @@ /area/maintenance/wing/port/deck1) "pLV" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/fuel, -/obj/effect/floor_decal/industrial/outline/engineering, +/obj/effect/floor_decal/industrial/outline/operations, /obj/machinery/atmospherics/binary/pump{ name = "Air Reserve to Airlock Cycling" }, @@ -108791,7 +108791,7 @@ }, /obj/structure/closet/wardrobe/engineering_yellow, /obj/effect/floor_decal/corner/yellow/full, -/obj/effect/floor_decal/industrial/outline/engineering, +/obj/effect/floor_decal/industrial/outline/operations, /turf/simulated/floor/tiled, /area/engineering/locker_room) "qnn" = ( @@ -114118,7 +114118,7 @@ /obj/effect/floor_decal/corner/yellow{ dir = 9 }, -/obj/effect/floor_decal/industrial/outline/engineering, +/obj/effect/floor_decal/industrial/outline/operations, /turf/simulated/floor/tiled, /area/engineering/locker_room) "rbh" = ( @@ -121568,7 +121568,7 @@ /turf/simulated/floor/tiled/dark/full, /area/turret_protected/ai_upload) "skj" = ( -/obj/effect/floor_decal/industrial/outline/engineering, +/obj/effect/floor_decal/industrial/outline/operations, /obj/structure/closet/wardrobe/atmospherics_yellow, /obj/machinery/light{ dir = 4 @@ -127647,7 +127647,7 @@ c_tag = "Engineering - Atmos Locker Room"; dir = 1 }, -/obj/effect/floor_decal/industrial/outline/engineering, +/obj/effect/floor_decal/industrial/outline/operations, /obj/machinery/suit_cycler/engineering/prepared/atmos, /turf/simulated/floor/tiled/dark/full, /area/engineering/atmos/storage) @@ -127867,7 +127867,7 @@ /turf/unsimulated/floor, /area/antag/mercenary) "tim" = ( -/obj/effect/floor_decal/industrial/outline/engineering, +/obj/effect/floor_decal/industrial/outline/operations, /obj/machinery/suit_cycler/engineering/prepared/atmos, /turf/simulated/floor/tiled/dark/full, /area/engineering/atmos/storage) @@ -134075,7 +134075,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/floor_decal/industrial/outline/engineering, +/obj/effect/floor_decal/industrial/outline/operations, /obj/item/tent/big/scc, /turf/simulated/floor/carpet/rubber, /area/shuttle/intrepid/crew_compartment) @@ -135654,7 +135654,7 @@ /turf/simulated/floor/plating, /area/engineering/atmos/propulsion) "uoI" = ( -/obj/effect/floor_decal/industrial/outline/engineering, +/obj/effect/floor_decal/industrial/outline/operations, /turf/simulated/floor/tiled, /area/operations/storage) "uoJ" = ( @@ -135813,7 +135813,7 @@ /obj/effect/floor_decal/corner/yellow/full{ dir = 4 }, -/obj/effect/floor_decal/industrial/outline/engineering, +/obj/effect/floor_decal/industrial/outline/operations, /turf/simulated/floor/tiled, /area/engineering/locker_room) "upv" = ( @@ -137997,7 +137997,7 @@ /turf/simulated/floor/tiled/dark/full, /area/rnd/lab) "uFF" = ( -/obj/effect/floor_decal/industrial/outline/engineering, +/obj/effect/floor_decal/industrial/outline/operations, /obj/structure/dispenser, /obj/machinery/firealarm/south, /turf/simulated/floor/tiled/dark/full, @@ -138832,7 +138832,7 @@ /turf/simulated/floor/shuttle/black, /area/shuttle/specops) "uNp" = ( -/obj/effect/floor_decal/industrial/outline/engineering, +/obj/effect/floor_decal/industrial/outline/operations, /obj/structure/closet/secure_closet/atmos_personal, /obj/machinery/light{ dir = 4 @@ -139370,7 +139370,7 @@ /obj/effect/floor_decal/corner/yellow{ dir = 6 }, -/obj/effect/floor_decal/industrial/outline/engineering, +/obj/effect/floor_decal/industrial/outline/operations, /obj/machinery/cell_charger, /obj/structure/table/reinforced, /obj/random/powercell, @@ -155511,7 +155511,7 @@ /obj/machinery/light/small{ dir = 4 }, -/obj/effect/floor_decal/industrial/outline/engineering, +/obj/effect/floor_decal/industrial/outline/operations, /turf/simulated/floor/tiled/dark, /area/shuttle/mining) "xiq" = ( @@ -156305,7 +156305,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/red{ dir = 8 }, -/obj/effect/floor_decal/industrial/outline/engineering, +/obj/effect/floor_decal/industrial/outline/operations, /turf/simulated/floor/tiled/dark/full, /area/engineering/atmos/propulsion) "xnW" = ( @@ -162233,7 +162233,7 @@ /obj/effect/floor_decal/corner/yellow/full{ dir = 1 }, -/obj/effect/floor_decal/industrial/outline/engineering, +/obj/effect/floor_decal/industrial/outline/operations, /turf/simulated/floor/tiled, /area/engineering/locker_room) "yfw" = (