Merge branch 'master' into pr/1416

Yawn-Wider · Jan 31, 2024 · f5c4313 · f5c4313
2 parents 8b3fd69 + 174bfa5
commit f5c4313
Show file tree

Hide file tree

Showing 3 changed files with 359 additions and 89 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -21,7 +21,7 @@ jobs:
           bash tools/ci/install_build_deps.sh
       - name: Restore Yarn cache
         if: "${{ contains(github.event.pull_request.labels.*.name, 'Type: TGUI Bundle') }}"
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: tgui/.yarn/cache
           key: ${{ runner.os }}-yarn-${{ secrets.CACHE_PURGE_KEY }}-${{ hashFiles('tgui/yarn.lock') }}
@@ -41,7 +41,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Cache SpacemanDMM
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/SpacemanDMM
           key: ${{ runner.os }}-dreamchecker-${{ hashFiles('dependencies.sh')}}
@@ -78,7 +78,7 @@ jobs:
         run: |
           chmod -R +x ./tools/ci
       - name: Setup Cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: $HOME/BYOND
           key: ${{ runner.os }}-byond

diff --git a/code/ATMOSPHERICS/components/unary/vent_pump.dm b/code/ATMOSPHERICS/components/unary/vent_pump.dm
@@ -79,6 +79,14 @@
 	pressure_checks = 2
 	pressure_checks_default = 2
 
+/obj/machinery/atmospherics/unary/vent_pump/siphon/on/atmos/relief // YW ADDITION relief vent, that connects to the waste line as a subtype to make it easier to map in
+	name = "Relief vent"
+	external_pressure_bound = ONE_ATMOSPHERE+2
+	external_pressure_bound_default = ONE_ATMOSPHERE+2
+	pressure_checks = 1
+	pressure_checks_default = 1
+	connect_types = CONNECT_TYPE_REGULAR|CONNECT_TYPE_SCRUBBER
+
 /obj/machinery/atmospherics/unary/vent_pump/Initialize()
 	. = ..()
 	//soundloop = new(list(src), FALSE)