diff --git a/html/changelogs/mattatlas-paprefiller.yml b/html/changelogs/mattatlas-paprefiller.yml new file mode 100644 index 00000000000..6c4b611fb36 --- /dev/null +++ b/html/changelogs/mattatlas-paprefiller.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: MattAtlas, Omicega + +# 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: + - maptweak: "Added a PAP refiller west of the Atmospherics storage." diff --git a/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm b/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm index 52d8ed41c9a..5331d3d09ab 100644 --- a/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm +++ b/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm @@ -549,6 +549,9 @@ /obj/structure/window/reinforced{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/visible/supply{ + dir = 10 + }, /turf/simulated/floor/plating, /area/engineering/atmos/air) "aBl" = ( @@ -3587,6 +3590,9 @@ name = "Atmospheric Tanks"; req_access = list(24) }, +/obj/machinery/atmospherics/pipe/simple/visible/supply{ + dir = 5 + }, /turf/simulated/floor/plating, /area/engineering/atmos/air) "cPT" = ( @@ -4538,6 +4544,13 @@ /obj/effect/floor_decal/corner/black, /turf/simulated/floor/tiled/dark, /area/hangar/auxiliary) +"dIp" = ( +/obj/machinery/atmospherics/pipe/simple/visible/black, +/obj/machinery/atmospherics/pipe/zpipe/up/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/engineering/atmos) "dIS" = ( /obj/machinery/light{ dir = 4 @@ -4976,6 +4989,9 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/visible/supply{ + dir = 8 + }, /turf/simulated/floor/plating, /area/engineering/atmos/air) "ebK" = ( @@ -7702,6 +7718,19 @@ /obj/structure/railing/mapped, /turf/simulated/floor/tiled/dark, /area/janitor) +"gds" = ( +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 4 + }, +/obj/structure/lattice/catwalk/indoor, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/visible/supply{ + dir = 9 + }, +/turf/simulated/floor/plating, +/area/engineering/atmos/air) "gdJ" = ( /obj/structure/railing/mapped{ dir = 4 @@ -8073,6 +8102,9 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/visible/supply{ + dir = 8 + }, /turf/simulated/floor/plating, /area/engineering/atmos/air) "gqW" = ( @@ -10764,9 +10796,8 @@ /turf/simulated/floor/tiled/white, /area/medical/morgue/lower) "iEz" = ( -/obj/effect/floor_decal/industrial/hatch/yellow, -/obj/machinery/atmospherics/portables_connector{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/visible/supply{ + dir = 6 }, /turf/simulated/floor/plating, /area/engineering/atmos/air) @@ -15513,10 +15544,6 @@ /obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, /area/maintenance/operations) -"mBc" = ( -/obj/machinery/atmospherics/pipe/zpipe/up/black, -/turf/space/dynamic, -/area/horizon/exterior) "mBx" = ( /obj/machinery/door/airlock/multi_tile/glass{ dir = 1; @@ -16444,6 +16471,19 @@ /obj/effect/shuttle_landmark/horizon/deckone/fore, /turf/template_noop, /area/template_noop) +"nig" = ( +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 4 + }, +/obj/structure/lattice/catwalk/indoor, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/visible/supply{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/engineering/atmos/air) "niw" = ( /obj/structure/railing/mapped{ dir = 8 @@ -21864,6 +21904,9 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/visible/supply{ + dir = 8 + }, /turf/simulated/floor/plating, /area/engineering/atmos/air) "rRb" = ( @@ -28439,9 +28482,8 @@ /turf/simulated/floor/tiled/white, /area/rnd/eva) "xkx" = ( -/obj/machinery/atmospherics/binary/pump{ - dir = 8; - name = "Air to Connector" +/obj/machinery/atmospherics/pipe/simple/visible/universal{ + dir = 4 }, /turf/simulated/floor/plating, /area/engineering/atmos/air) @@ -51056,7 +51098,7 @@ wEY wEY pYB wEY -mBc +wEY wEY pYB wUo @@ -51674,7 +51716,7 @@ err sll kDF hVE -hVE +dIp xHX vgD nVb @@ -52079,7 +52121,7 @@ lcz qaK jvF kXr -rXn +nig wsS tIz eIE @@ -52281,7 +52323,7 @@ pZm vZr sKK cUJ -rXn +nig vpu ixm lBp @@ -52483,7 +52525,7 @@ bYq unm xjT dAI -rXn +nig oCl xUM hyD @@ -52685,7 +52727,7 @@ qZj qQk riL urr -rXn +nig oWT riL krm @@ -53493,7 +53535,7 @@ rZu eqs riL iEz -rXn +gds xpP riL lnG diff --git a/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm b/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm index b6226b10939..904c299665d 100644 --- a/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm +++ b/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm @@ -128,6 +128,12 @@ }, /turf/simulated/floor/tiled/white, /area/medical/gen_treatment) +"abR" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 10 + }, +/turf/simulated/floor/tiled, +/area/engineering/atmos/storage) "acw" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -589,6 +595,7 @@ icon_state = "1-4" }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/floor/tiled/dark, /area/engineering/atmos/storage) "apd" = ( @@ -922,6 +929,9 @@ name = "Atmospherics Locker Room"; req_access = list(24) }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/engineering/atmos/storage) "aww" = ( @@ -2988,6 +2998,9 @@ /turf/simulated/floor/plating, /area/maintenance/wing/starboard) "bwU" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/engineering/atmos/storage) "bxp" = ( @@ -3667,6 +3680,10 @@ }, /turf/simulated/floor/tiled/white, /area/medical/reception) +"bPf" = ( +/obj/machinery/atmospherics/binary/pump/high_power, +/turf/simulated/floor/tiled, +/area/engineering/atmos/storage) "bPh" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -9170,6 +9187,12 @@ }, /turf/simulated/floor/tiled/white, /area/medical/reception) +"fbT" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/universal{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, +/area/engineering/atmos/storage) "fco" = ( /turf/simulated/wall/shuttle/scc_space_ship/cardinal, /area/horizon/kitchen/hallway) @@ -10805,6 +10828,9 @@ icon_state = "4-8" }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 10 + }, /turf/simulated/floor/tiled/dark, /area/hallway/engineering/tesla) "fUc" = ( @@ -12086,6 +12112,13 @@ }, /turf/simulated/floor/tiled, /area/rnd/xenobiology) +"gzX" = ( +/obj/effect/floor_decal/corner_wide/yellow{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden, +/turf/simulated/floor/tiled/dark, +/area/hallway/engineering/tesla) "gAp" = ( /obj/machinery/light{ dir = 8 @@ -16074,6 +16107,9 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 8 + }, /turf/simulated/floor/tiled/dark, /area/hallway/engineering/tesla) "iKv" = ( @@ -16974,6 +17010,10 @@ "jkb" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/portable_atmospherics/powered/pump/filled, +/obj/machinery/atmospherics/portables_connector{ + dir = 1; + layer = 2.8 + }, /turf/simulated/floor/tiled, /area/engineering/atmos/storage) "jkc" = ( @@ -19214,6 +19254,7 @@ /area/horizon/stairwell/central) "kyV" = ( /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/floor/tiled/dark, /area/engineering/atmos/storage) "kyX" = ( @@ -21142,6 +21183,7 @@ c_tag = "Engineering - Hallway 5"; dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/floor/tiled/dark, /area/hallway/engineering/tesla) "lFE" = ( @@ -23023,6 +23065,9 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 6 + }, /turf/simulated/floor/tiled/dark, /area/hallway/engineering/tesla) "mGc" = ( @@ -23324,6 +23369,18 @@ /obj/effect/decal/cleanable/cobweb2, /turf/simulated/floor/tiled/dark, /area/maintenance/wing/port/far) +"mMn" = ( +/obj/effect/floor_decal/corner_wide/yellow{ + dir = 10 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, +/area/hallway/engineering/tesla) "mMz" = ( /obj/effect/floor_decal/corner_wide/yellow/full{ dir = 8 @@ -24757,6 +24814,10 @@ /obj/structure/railing/mapped{ dir = 8 }, +/obj/machinery/atmospherics/portables_connector{ + dir = 1; + layer = 2.8 + }, /turf/simulated/floor/tiled, /area/engineering/atmos/storage) "nxk" = ( @@ -27690,6 +27751,14 @@ }, /turf/simulated/floor/tiled, /area/security/brig) +"pdF" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/binary/pump/high_power/on{ + dir = 1; + name = "air tank to refiller" + }, +/turf/simulated/floor/tiled/dark, +/area/engineering/atmos/storage) "pea" = ( /turf/simulated/floor/wood, /area/horizon/library) @@ -28319,6 +28388,15 @@ }, /turf/simulated/floor/tiled, /area/security/brig) +"pwB" = ( +/obj/effect/floor_decal/corner_wide/yellow{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 5 + }, +/turf/simulated/floor/tiled/dark, +/area/hallway/engineering/tesla) "pwO" = ( /obj/machinery/shieldwallgen, /obj/effect/floor_decal/industrial/outline/yellow, @@ -29149,10 +29227,11 @@ /turf/simulated/open, /area/maintenance/wing/starboard) "pSl" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 4 +/obj/machinery/atmospherics/pipe/zpipe/down/supply{ + dir = 8 }, -/turf/simulated/floor/tiled/dark, +/obj/structure/lattice/catwalk/indoor, +/turf/simulated/open, /area/engineering/atmos/storage) "pSv" = ( /turf/simulated/wall/shuttle/scc_space_ship/cardinal, @@ -32129,6 +32208,8 @@ req_access = list(24) }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/visible, +/obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/floor/tiled/dark, /area/engineering/atmos/storage) "rvJ" = ( @@ -37161,6 +37242,9 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 8 + }, /turf/simulated/floor/tiled/dark, /area/hallway/engineering/tesla) "uln" = ( @@ -42870,6 +42954,9 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 8 + }, /turf/simulated/floor/tiled/dark, /area/hallway/engineering/tesla) "wZP" = ( @@ -44564,6 +44651,9 @@ dir = 8; icon_state = "pipe-c" }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 5 + }, /turf/simulated/floor/tiled/dark, /area/engineering/atmos/storage) "xWV" = ( @@ -65280,9 +65370,9 @@ lnv gci mFX lFn -oGy -oGy -oGy +gzX +gzX +pwB oGy xgG hjI @@ -65480,12 +65570,12 @@ ydI lMD hwH gci -xPv +mMn fnn npL aFm bwU -bwU +bPf nvW fnn aql @@ -65686,8 +65776,8 @@ iKg fnn tUR aFm -bwU -bwU +abR +bPf jkb fnn fqL @@ -66288,7 +66378,7 @@ uph inD lnv gci -xPv +mMn fnn aor sDz @@ -66494,7 +66584,7 @@ fTZ rvC aoQ kyV -kyV +pdF xWL gAt fnn @@ -66697,7 +66787,7 @@ fnn ayY bYT mqn -sDz +fbT bZu fnn lKI