Merge branch 'master' into IssueSolver9004

Truls20 · Oct 23, 2024 · 59bb1cc · 59bb1cc
2 parents 5e0155b + cff9341
commit 59bb1cc
Show file tree

Hide file tree

Showing 261 changed files with 5,662 additions and 2,202 deletions.
diff --git a/.github/workflows/build_milla.yml → .github/workflows/build_rust.yml b/.github/workflows/build_milla.yml → .github/workflows/build_rust.yml
@@ -1,13 +1,13 @@
-name: Build MILLA
+name: Build Rust library
 on:
   issue_comment:
     types: created
 
 jobs:
-  build-milla:
+  build-rust:
     if: |
       github.event.issue.pull_request &&
-      (github.event.comment.body == '!build_milla') &&
+      (github.event.comment.body == '!build_rust') &&
       ((github.event.sender.id == github.event.issue.user.id) ||
       (github.event.comment.author_association == 'COLLABORATOR') ||
       (github.event.comment.author_association == 'MEMBER') ||
@@ -53,7 +53,7 @@ jobs:
           ref: ${{ env.PR_BRANCH }}
           token: ${{ env.GH_TOKEN }}
 
-      - name: Build MILLA
+      - name: Build rustlibs
         env:
           BASE_BRANCH: ${{ github.event.repository.default_branch }}
           BASE_REPOSITORY: ${{ github.repository }}
@@ -65,7 +65,7 @@ jobs:
           git pull origin "$PR_BRANCH" --depth=$((ahead_by + 1))
           git remote add upstream "https://github.com/$BASE_REPOSITORY.git"
           git fetch upstream "$BASE_BRANCH" --depth=$((behind_by + 1))
-          cd milla
+          cd rust
 
           # Get dependencies.
           rustup target add i686-unknown-linux-gnu
@@ -79,13 +79,13 @@ jobs:
           cargo build --release --target i686-pc-windows-gnu
 
           # Copy the built targets to their checked-in locations.
-          cp target/i686-unknown-linux-gnu/release/libmilla.so ../tools/ci/libmilla_ci.so
-          cp target/i686-pc-windows-gnu/release/milla.dll ../milla.dll
+          cp target/i686-unknown-linux-gnu/release/librustlibs.so ../tools/ci/librustlibs_ci.so
+          cp target/i686-pc-windows-gnu/release/rustlibs.dll ../rustlibs.dll
 
-          git commit -a -m "Build MILLA" --allow-empty
+          git commit -a -m "Build Rust library" --allow-empty
           git push origin
 
       - name: Notify Failure
         if: failure() && env.FAIL_NOTIFIED != 'true'
         run: |
-          gh pr comment ${{ github.event.issue.html_url }} -b 'Building MILLA failed, see the action run log for details: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}'
+          gh pr comment ${{ github.event.issue.html_url }} -b 'Building Rust library failed, see the action run log for details: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}'
diff --git a/.gitignore b/.gitignore
@@ -73,7 +73,7 @@ $RECYCLE.BIN
 *.swp
 
 # Rust output.
-/milla/target/*
+/rust/target/*
 
 # mkdocs output.
 site
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/abandoned_sec_shuttle.dmm b/_maps/map_files/RandomRuins/SpaceRuins/abandoned_sec_shuttle.dmm
@@ -9,10 +9,10 @@
 /turf/simulated/floor/plating/airless,
 /area/ruin/space/sec_shuttle)
 "c" = (
+/obj/effect/mapping_helpers/airlock/access/all/centcomm/specops,
 /obj/machinery/door/airlock/external{
 	id_tag = "s_docking_airlock";
-	name = "Shuttle Hatch";
-	req_access_txt = "109"
+	name = "Shuttle Hatch"
 	},
 /turf/simulated/floor/plasteel/airless{
 	icon_state = "dark"
@@ -176,10 +176,10 @@
 	},
 /area/ruin/space/sec_shuttle)
 "T" = (
+/obj/effect/mapping_helpers/airlock/access/all/centcomm/specops,
 /obj/machinery/door/airlock/external{
 	id_tag = "s_docking_airlock";
-	name = "Shuttle Hatch";
-	req_access_txt = "109"
+	name = "Shuttle Hatch"
 	},
 /turf/simulated/floor/plating/airless,
 /area/ruin/space/sec_shuttle)

diff --git a/_maps/map_files/RandomRuins/SpaceRuins/deepstorage.dmm b/_maps/map_files/RandomRuins/SpaceRuins/deepstorage.dmm
@@ -275,9 +275,8 @@
 /turf/simulated/floor/catwalk,
 /area/ruin/space/deepstorage)
 "aR" = (
-/obj/machinery/door/airlock/highsecurity{
-	req_access_txt = "512"
-	},
+/obj/effect/mapping_helpers/airlock/access/all/ruins/deepstorage,
+/obj/machinery/door/airlock/highsecurity,
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
@@ -771,9 +770,8 @@
 	},
 /area/ruin/space/deepstorage)
 "co" = (
-/obj/machinery/door/airlock/hatch{
-	req_access_txt = "512"
-	},
+/obj/effect/mapping_helpers/airlock/access/all/ruins/deepstorage,
+/obj/machinery/door/airlock/hatch,
 /obj/structure/barricade/wooden/crude{
 	layer = 4
 	},
@@ -1029,9 +1027,8 @@
 	},
 /area/ruin/space/deepstorage)
 "eq" = (
-/obj/machinery/door/airlock/maintenance_hatch{
-	req_access_txt = "512"
-	},
+/obj/effect/mapping_helpers/airlock/access/all/ruins/deepstorage,
+/obj/machinery/door/airlock/maintenance_hatch,
 /turf/simulated/floor/plating,
 /area/ruin/space/deepstorage)
 "es" = (
@@ -1440,8 +1437,8 @@
 /turf/simulated/floor/plating,
 /area/ruin/space/deepstorage)
 "hp" = (
+/obj/effect/mapping_helpers/airlock/access/all/ruins/deepstorage,
 /obj/machinery/door/airlock/hatch{
-	req_access_txt = "512";
 	name = "Guard Wing"
 	},
 /obj/structure/barricade/wooden/crude{
@@ -1692,8 +1689,8 @@
 /turf/simulated/floor/plasteel,
 /area/ruin/space/deepstorage)
 "jj" = (
+/obj/effect/mapping_helpers/airlock/access/all/ruins/deepstorage,
 /obj/machinery/door/airlock/highsecurity{
-	req_access_txt = "512";
 	name = "Guard Store Room"
 	},
 /obj/effect/decal/cleanable/dirt,
@@ -1856,9 +1853,9 @@
 /area/ruin/space/deepstorage)
 "jT" = (
 /obj/structure/fans/tiny,
+/obj/effect/mapping_helpers/airlock/access/all/ruins/deepstorage,
 /obj/machinery/door/airlock/vault{
-	locked = 1;
-	req_access_txt = "512"
+	locked = 1
 	},
 /turf/simulated/floor/catwalk,
 /area/ruin/space/deepstorage)
@@ -2170,9 +2167,8 @@
 /obj/structure/barricade/wooden/crude{
 	layer = 4
 	},
-/obj/machinery/door/airlock/centcom{
-	req_access_txt = "512"
-	},
+/obj/effect/mapping_helpers/airlock/access/all/ruins/deepstorage,
+/obj/machinery/door/airlock/centcom,
 /turf/simulated/floor/catwalk,
 /area/ruin/space/deepstorage)
 "mf" = (
@@ -2690,8 +2686,8 @@
 /turf/simulated/floor/plating/asteroid/basalt/airless,
 /area/ruin/space/unpowered)
 "pz" = (
+/obj/effect/mapping_helpers/airlock/access/all/ruins/deepstorage,
 /obj/machinery/door/airlock/command/glass{
-	req_access_txt = "512";
 	name = "Floor Administrator's Office"
 	},
 /obj/effect/mapping_helpers/airlock/polarized{
@@ -2743,9 +2739,8 @@
 /obj/structure/barricade/wooden/crude{
 	layer = 4
 	},
-/obj/machinery/door/airlock/hatch{
-	req_access_txt = "512"
-	},
+/obj/effect/mapping_helpers/airlock/access/all/ruins/deepstorage,
+/obj/machinery/door/airlock/hatch,
 /turf/simulated/floor/plasteel{
 	dir = 4;
 	icon_state = "podfloor"
@@ -2975,9 +2970,8 @@
 /area/ruin/space/deepstorage)
 "rK" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/door/airlock/hatch{
-	req_access_txt = "512"
-	},
+/obj/effect/mapping_helpers/airlock/access/all/ruins/deepstorage,
+/obj/machinery/door/airlock/hatch,
 /turf/simulated/floor/plasteel{
 	dir = 4;
 	icon_state = "podfloor"
@@ -3777,9 +3771,8 @@
 /turf/simulated/wall/indestructible/riveted,
 /area/ruin/space/deepstorage)
 "wH" = (
-/obj/machinery/door/airlock/hatch{
-	req_access_txt = "512"
-	},
+/obj/effect/mapping_helpers/airlock/access/all/ruins/deepstorage,
+/obj/machinery/door/airlock/hatch,
 /obj/machinery/door/poddoor/shutters/preopen{
 	dir = 2;
 	id_tag = "DS_Quartermaster"
@@ -3859,8 +3852,8 @@
 	},
 /area/ruin/space/deepstorage)
 "xC" = (
+/obj/effect/mapping_helpers/airlock/access/all/ruins/deepstorage,
 /obj/machinery/door/airlock/highsecurity{
-	req_access_txt = "512";
 	name = "Interrogation Room"
 	},
 /turf/simulated/floor/plasteel{
@@ -4111,9 +4104,9 @@
 /turf/simulated/floor/mineral/titanium,
 /area/ruin/space/deepstorage)
 "zh" = (
+/obj/effect/mapping_helpers/airlock/access/all/ruins/deepstorage,
 /obj/machinery/door/airlock/highsecurity{
-	name = "Incinerator";
-	req_access_txt = "512"
+	name = "Incinerator"
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "cult"
@@ -4172,9 +4165,9 @@
 /turf/simulated/floor/plating,
 /area/ruin/space/deepstorage)
 "zy" = (
+/obj/effect/mapping_helpers/airlock/access/all/ruins/deepstorage,
 /obj/machinery/door/airlock/vault{
-	locked = 1;
-	req_access_txt = "512"
+	locked = 1
 	},
 /obj/structure/fans/tiny,
 /turf/simulated/floor/catwalk,
@@ -4195,9 +4188,8 @@
 /obj/structure/barricade/wooden/crude{
 	layer = 4
 	},
-/obj/machinery/door/airlock/hatch{
-	req_access_txt = "512"
-	},
+/obj/effect/mapping_helpers/airlock/access/all/ruins/deepstorage,
+/obj/machinery/door/airlock/hatch,
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
@@ -4324,9 +4316,9 @@
 /area/ruin/space/deepstorage)
 "As" = (
 /obj/structure/fans/tiny,
+/obj/effect/mapping_helpers/airlock/access/all/ruins/deepstorage,
 /obj/machinery/door/airlock/vault{
-	name = "Auxiliary Power Room";
-	req_access_txt = "512"
+	name = "Auxiliary Power Room"
 	},
 /obj/machinery/door/poddoor/multi_tile/impassable{
 	id_tag = "DS_Engineering"
@@ -4359,8 +4351,8 @@
 	},
 /area/ruin/space/deepstorage)
 "AA" = (
+/obj/effect/mapping_helpers/airlock/access/all/ruins/deepstorage,
 /obj/machinery/door/airlock/highsecurity{
-	req_access_txt = "512";
 	name = "Evidence Storage"
 	},
 /turf/simulated/floor/plasteel{
@@ -5373,9 +5365,8 @@
 	},
 /area/ruin/space/deepstorage)
 "Hx" = (
-/obj/machinery/door/airlock/hatch{
-	req_access_txt = "512"
-	},
+/obj/effect/mapping_helpers/airlock/access/all/ruins/deepstorage,
+/obj/machinery/door/airlock/hatch,
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
@@ -6902,9 +6893,8 @@
 	},
 /area/ruin/space/deepstorage)
 "To" = (
-/obj/machinery/door/airlock/centcom{
-	req_access_txt = "512"
-	},
+/obj/effect/mapping_helpers/airlock/access/all/ruins/deepstorage,
+/obj/machinery/door/airlock/centcom,
 /turf/simulated/floor/catwalk,
 /area/ruin/space/deepstorage)
 "Tq" = (
@@ -6930,9 +6920,8 @@
 	},
 /area/ruin/space/deepstorage)
 "TK" = (
-/obj/machinery/door/airlock/highsecurity{
-	req_access_txt = "512"
-	},
+/obj/effect/mapping_helpers/airlock/access/all/ruins/deepstorage,
+/obj/machinery/door/airlock/highsecurity,
 /obj/machinery/door/poddoor/multi_tile/impassable{
 	id_tag = "DS_Storage"
 	},
@@ -7008,9 +6997,8 @@
 /obj/structure/barricade/wooden/crude{
 	layer = 4
 	},
-/obj/machinery/door/airlock/highsecurity{
-	req_access_txt = "512"
-	},
+/obj/effect/mapping_helpers/airlock/access/all/ruins/deepstorage,
+/obj/machinery/door/airlock/highsecurity,
 /obj/machinery/door/poddoor/multi_tile/impassable{
 	id_tag = "DS_Storage"
 	},
@@ -7925,9 +7913,8 @@
 /turf/simulated/floor/engine/airless,
 /area/ruin/space/unpowered)
 "ZW" = (
-/obj/machinery/door/airlock/hatch{
-	req_access_txt = "512"
-	},
+/obj/effect/mapping_helpers/airlock/access/all/ruins/deepstorage,
+/obj/machinery/door/airlock/hatch,
 /turf/simulated/floor/plasteel{
 	dir = 4;
 	icon_state = "podfloor"

diff --git a/_maps/map_files/RandomRuins/SpaceRuins/listeningpost.dmm b/_maps/map_files/RandomRuins/SpaceRuins/listeningpost.dmm
@@ -63,9 +63,9 @@
 /turf/simulated/floor/plating/airless,
 /area/ruin/space/syndicate_listening_station/asteroid)
 "kE" = (
+/obj/effect/mapping_helpers/airlock/access/all/syndicate,
 /obj/machinery/door/airlock/external{
-	id_tag = "sst_away";
-	req_access_txt = "150"
+	id_tag = "sst_away"
 	},
 /obj/structure/cable{
 	d1 = 4;
@@ -242,9 +242,9 @@
 /turf/simulated/floor/plasteel/dark,
 /area/ruin/space/syndicate_listening_station)
 "zb" = (
+/obj/effect/mapping_helpers/airlock/access/all/syndicate,
 /obj/machinery/door/airlock/external{
-	id_tag = "sst_away";
-	req_access_txt = "150"
+	id_tag = "sst_away"
 	},
 /obj/structure/fans/tiny,
 /obj/effect/decal/cleanable/dirt,
@@ -472,9 +472,9 @@
 /turf/simulated/floor/mineral/silver,
 /area/ruin/space/syndicate_listening_station)
 "Ow" = (
+/obj/effect/mapping_helpers/airlock/access/all/syndicate,
 /obj/machinery/door/airlock/external{
-	id_tag = "sst_away";
-	req_access_txt = "150"
+	id_tag = "sst_away"
 	},
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/plating,
@@ -513,9 +513,9 @@
 /turf/simulated/floor/plasteel/dark,
 /area/ruin/space/syndicate_listening_station)
 "TS" = (
+/obj/effect/mapping_helpers/airlock/access/all/syndicate,
 /obj/machinery/door/airlock/external{
-	id_tag = "sst_away";
-	req_access_txt = "150"
+	id_tag = "sst_away"
 	},
 /obj/structure/cable{
 	d1 = 4;