From 94dbdb0e963aa83c8e7adf3bf4aa911944b6c608 Mon Sep 17 00:00:00 2001 From: Alberyk Date: Wed, 7 Dec 2022 07:55:26 -0300 Subject: [PATCH] Database and scrapper fixes (#15235) * Fixes * Fixes pipe * Fixes these airflaps --- code/game/objects/structures/plasticflaps.dm | 9 ++-- html/changelogs/alberyk-moreandmorefixes.yml | 7 +++ .../away_site/tajara/scrapper/scrapper.dmm | 46 +++++++++---------- .../database_freighter/database_freighter.dmm | 8 ++-- 4 files changed, 38 insertions(+), 32 deletions(-) create mode 100644 html/changelogs/alberyk-moreandmorefixes.yml diff --git a/code/game/objects/structures/plasticflaps.dm b/code/game/objects/structures/plasticflaps.dm index c104dd525ea..878daae16b8 100644 --- a/code/game/objects/structures/plasticflaps.dm +++ b/code/game/objects/structures/plasticflaps.dm @@ -68,11 +68,12 @@ name = "airtight plastic flaps" desc = "Heavy duty, airtight, plastic flaps." -/obj/structure/plasticflaps/mining/New() //set the turf below the flaps to block air +/obj/structure/plasticflaps/mining/Initialize() //set the turf below the flaps to block air + ..() var/turf/T = get_turf(loc) if(T) T.blocks_air = 1 - ..() + /obj/structure/plasticflaps/mining/Destroy() //lazy hack to set the turf to allow air to pass if it's a simulated floor var/turf/T = get_turf(loc) @@ -88,11 +89,11 @@ desc = "Heavy duty, airtight, plastic flaps." layer = 3 -/obj/structure/plasticflaps/airtight/New() //set the turf below the flaps to block air +/obj/structure/plasticflaps/airtight/Initialize() //set the turf below the flaps to block air + ..() var/turf/T = get_turf(loc) if(T) T.blocks_air = 1 - ..() /obj/structure/plasticflaps/airtight/Destroy() //lazy hack to set the turf to allow air to pass if it's a simulated floor var/turf/T = get_turf(loc) diff --git a/html/changelogs/alberyk-moreandmorefixes.yml b/html/changelogs/alberyk-moreandmorefixes.yml new file mode 100644 index 00000000000..e945e8fe9e2 --- /dev/null +++ b/html/changelogs/alberyk-moreandmorefixes.yml @@ -0,0 +1,7 @@ +author: Alberyk + +delete-after: True + +changes: + - bugfix: "Fixed some messed up pipes in the scrapper ship." + - bugfix: "Fixed a window with the wrong access at the pra database ship." diff --git a/maps/away/away_site/tajara/scrapper/scrapper.dmm b/maps/away/away_site/tajara/scrapper/scrapper.dmm index 83d14b9b05f..0ba5d1342db 100644 --- a/maps/away/away_site/tajara/scrapper/scrapper.dmm +++ b/maps/away/away_site/tajara/scrapper/scrapper.dmm @@ -144,14 +144,14 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/blue{ - dir = 1 - }, /obj/structure/cable/green{ d1 = 4; d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, /turf/simulated/floor/tiled/dark, /area/scrapper_base) "bF" = ( @@ -265,7 +265,7 @@ dir = 4; icon_state = "map-scrubbers" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/blue{ +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, /turf/simulated/floor/tiled/dark, @@ -1107,9 +1107,6 @@ }, /area/shuttle/scrapper_ship/port_engines) "nr" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/blue{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 1 }, @@ -1118,6 +1115,9 @@ d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plating{ temperature = 278.15 }, @@ -1187,7 +1187,6 @@ /turf/simulated/floor/tiled/dark, /area/scrapper_base/quarters) "ov" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/blue, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8; icon_state = "map-scrubbers" @@ -1202,6 +1201,7 @@ d2 = 8; icon_state = "1-8" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/plating{ temperature = 278.15 }, @@ -1308,15 +1308,15 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/blue{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green{ d1 = 2; d2 = 4; icon_state = "2-4" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, /turf/simulated/floor/plating{ temperature = 278.15 }, @@ -1551,9 +1551,6 @@ /turf/simulated/floor/tiled/dark, /area/shuttle/scrapper_ship/bridge) "tf" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/blue{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, @@ -1562,6 +1559,9 @@ d2 = 4; icon_state = "2-4" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, /turf/simulated/floor/plating{ temperature = 278.15 }, @@ -1754,7 +1754,6 @@ }, /area/shuttle/scrapper_ship/atmos) "vD" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/blue, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -1763,6 +1762,7 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/tiled/dark, /area/shuttle/scrapper_ship/bridge) "vI" = ( @@ -1948,13 +1948,13 @@ /turf/simulated/floor/tiled/dark, /area/scrapper_base) "xN" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/blue{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4; icon_state = "map-scrubbers" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/scrapper_base) "xQ" = ( @@ -2906,7 +2906,7 @@ icon_state = "1-4" }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/blue, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/tiled/dark, /area/scrapper_base) "Kl" = ( @@ -3167,15 +3167,15 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/blue{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green{ d1 = 1; d2 = 4; icon_state = "1-4" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plating{ temperature = 278.15 }, @@ -3757,12 +3757,12 @@ icon_state = "1-4" }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/blue, /obj/structure/cable/green{ d1 = 4; d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/tiled/dark, /area/scrapper_base) "UF" = ( diff --git a/maps/away/ships/pra/database_freighter/database_freighter.dmm b/maps/away/ships/pra/database_freighter/database_freighter.dmm index e930e0c10e6..d3b49d0c4b9 100644 --- a/maps/away/ships/pra/database_freighter/database_freighter.dmm +++ b/maps/away/ships/pra/database_freighter/database_freighter.dmm @@ -2024,7 +2024,7 @@ }, /area/database_freighter/bridge) "jV" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ +/obj/machinery/atmospherics/pipe/simple/visible{ dir = 4 }, /turf/simulated/floor{ @@ -3678,9 +3678,7 @@ dir = 4 }, /obj/machinery/portable_atmospherics/canister/air/airlock, -/obj/machinery/door/window{ - req_one_access = "112" - }, +/obj/machinery/door/window, /obj/structure/window/reinforced{ dir = 8 }, @@ -4037,7 +4035,7 @@ }, /area/database_freighter) "Lu" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ +/obj/machinery/atmospherics/pipe/simple/visible{ dir = 9 }, /turf/simulated/floor{