Merge branch 'master' into DetectiveSpySpiderFix

ss220club · Nov 22, 2024 · edcc294 · edcc294
2 parents 1549761 + 9d3c472
commit edcc294
Show file tree

Hide file tree

Showing 996 changed files with 27,560 additions and 12,991 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -14,7 +14,6 @@
 
 # CI + Tooling
 /.github/workflows/ @AffectedArc07
-/code/modules/unit_tests/ @AffectedArc07
 /tools/ci/ @AffectedArc07
 _build_dependencies.sh @AffectedArc07
 
@@ -24,10 +23,15 @@ _build_dependencies.sh @AffectedArc07
 
 # Executables that need to be security-cleared
 dreamchecker.exe @AffectedArc07
-milla.dll @AffectedArc07
+rustlibs.dll @AffectedArc07
+rustlibs_prod.dll @AffectedArc07
 rust_g.dll @AffectedArc07
 
 ### S34NW
 
 # TGUI stuff
 /tgui/bin @S34NW
+
+
+### Overrides for the above
+/tools/ci/check_grep2.py @ParadiseSS13/commit-access
diff --git a/.github/workflows/build_rust.yml b/.github/workflows/build_rust.yml
@@ -82,6 +82,10 @@ jobs:
           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
 
+          # Build the para-specific version
+          RUSTFLAGS='-C target-cpu=raptorlake' cargo build --release --target=i686-pc-windows-gnu
+          cp target/i686-pc-windows-gnu/release/rustlibs.dll ../rustlibs_prod.dll
+
           git commit -a -m "Build Rust library" --allow-empty
           git push origin
 

diff --git a/.gitignore b/.gitignore
@@ -74,6 +74,7 @@ $RECYCLE.BIN
 
 # Rust output.
 /rust/target/*
+rustlibs_panic.txt
 
 # mkdocs output.
 site

diff --git a/README.md b/README.md
@@ -23,7 +23,7 @@
 			<img width="15%" alt="Discord" hspace="3%" src=".github/assets/discord-dark.png">
 		</picture>
 	</a>
-	<a href="https://ss220club.github.io/Paradise-SS220">
+	<a href="https://devdocs.paradisestation.org">
 		<picture>
 			<source media="(prefers-color-scheme: dark)" srcset=".github/assets/book-light.png">
 			<source media="(prefers-color-scheme: light)" srcset=".github/assets/book-dark.png">
@@ -50,15 +50,15 @@
 
 Этот справочный сайт от создателей BYOND содержит подробную информацию о языке DM, используемом синтаксисе, функциональности нативных процедур (proc) и многом другом. Это всегда полезно иметь под рукой, когда вы вносите свой вклад.
 
-- ### [Autodocumentation Guide](./docs/references/autodoc.md)
+- ### [Autodocumentation Guide](https://devdocs.paradisestation.org/references/autodoc/)
 
 Это руководство покажет вам, как оставлять комментарии к коду, соответствующие "автодокументации" - системе, призванной облегчить всем жизнь при чтении и ревью кода!
 
-- ### [Code of Conduct](./docs/CODE_OF_CONDUCT.md)
+- ### [Code of Conduct](https://devdocs.paradisestation.org/code_of_conduct/)
 
 Все участники должны ознакомиться с нашим "Кодексом поведения", прежде чем принимать участие в жизни нашего сообщества.
 
-- ### [Contribution Guide](./docs/CONTRIBUTING.md)
+- ### [Contribution Guide](https://devdocs.paradisestation.org/contributing/)
 
 Не знаете, как принять участие и внести свой вклад? В этом руководстве дается обзор того, как делать комментарии, открывать Pull Requests и Issues.
 

diff --git a/SQL/paradise_schema.sql b/SQL/paradise_schema.sql
@@ -301,6 +301,7 @@ CREATE TABLE `player` (
   `server_region` VARCHAR(32) NULL DEFAULT NULL COLLATE 'utf8mb4_general_ci',
   `muted_adminsounds_ckeys` MEDIUMTEXT NULL DEFAULT NULL COLLATE 'utf8mb4_general_ci',
   `viewrange` VARCHAR(5) NOT NULL DEFAULT '19x15' COLLATE 'utf8mb4_general_ci',
+  `map_vote_pref_json` MEDIUMTEXT NULL DEFAULT NULL COLLATE 'utf8mb4_general_ci',
   PRIMARY KEY (`id`),
   UNIQUE KEY `ckey` (`ckey`),
   KEY `lastseen` (`lastseen`),

diff --git a/SQL/updates/60-61.sql b/SQL/updates/60-61.sql
@@ -0,0 +1,6 @@
+# Updates the DB from 60 to 61 ~Qwertytoforty
+# Makes a table for map picks
+
+# Adds the table for it.
+ALTER TABLE `player`
+	ADD COLUMN `map_vote_pref_json` MEDIUMTEXT NULL DEFAULT NULL AFTER `viewrange`;
diff --git a/_build_dependencies.sh b/_build_dependencies.sh
@@ -14,4 +14,4 @@ export STABLE_BYOND_MINOR=1633
 # Python version for mapmerge and other tools
 export PYTHON_VERSION=3.11.6
 # RUSTG version
-export RUSTG_VERSION=v3.0.0-P
+export RUSTG_VERSION=v3.4.0-P
diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_biodome_clown_planet.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_biodome_clown_planet.dmm
@@ -656,7 +656,7 @@
 /turf/simulated/floor/plasteel/lavaland_air,
 /area/ruin/powered/clownplanet)
 "bf" = (
-/turf/simulated/mineral/clown/volcanic,
+/turf/simulated/mineral/volcanic/clown,
 /area/ruin/powered/clownplanet)
 "bg" = (
 /obj/item/pickaxe,
@@ -1006,7 +1006,7 @@
 /obj/structure/disposalpipe/segment/corner{
 	dir = 8
 	},
-/turf/simulated/mineral/clown/volcanic,
+/turf/simulated/mineral/volcanic/clown,
 /area/ruin/powered/clownplanet)
 "pv" = (
 /obj/machinery/light{