Merge branch 'master' into syndie_doors

.github/CONTRIBUTING.md

@@ -163,6 +163,22 @@ eg: `/datum/thing`, not `datum/thing`
 In DM, this is optional, but omitting it makes finding definitions harder. To be specific, you can declare the path `/arbitrary`, but it
 will still be, in actuality, `/datum/arbitrary`. Write your code to reflect this.
 
+### Do not use list operators in strings
+
+The use of list operators to augment strings is not allowed. This is roughly 10 times slower than using a list with a Join() Function.
+
+```dm
+//Bad
+var/text = "text"
+text += "More text"
+to_chat(world, text)
+
+//Good
+var/list/text = list("text")
+text += "More text"
+to_chat(world, text.Join(""))
+```
+
 ### Do not use text/string based type paths
 
 It is rarely allowed to put type paths in a text format, as there are no compile errors if the type path no longer exists. Here is an example:

.github/workflows/auto_translate.yml

@@ -53,6 +53,7 @@ jobs:
 
       - name: 'Push Translation'
         run: |
+          git fetch origin translate
           git checkout origin/translate
           git config --local user.email "[email protected]"
           git config --local user.name "ss220bot"

.github/workflows/ci.yml

@@ -10,7 +10,7 @@ on:
 jobs:
   run_linters:
     name: Run Linters
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
       - name: Setup Cache
@@ -22,7 +22,7 @@ jobs:
         run: |
           bash tools/ci/install_build_deps.sh
           bash tools/ci/install_dreamchecker.sh
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: '3.10'
           cache: 'pip'
@@ -47,7 +47,7 @@ jobs:
 
   odlint:
     name: Lint with OpenDream
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
       - name: Setup OD
@@ -59,7 +59,7 @@ jobs:
 
   compile_all_maps:
     name: Compile All Maps
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
       - name: Setup Cache
@@ -76,7 +76,7 @@ jobs:
 
   unit_tests_and_sql:
     name: Unit Tests + SQL Validation
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     strategy:
       fail-fast: false # Let all map tests run to completion
       matrix:
@@ -106,12 +106,8 @@ jobs:
         run: |
           sudo dpkg --add-architecture i386
           sudo apt update || true
-          sudo apt install libssl1.1:i386
-          ldd librust_g.so
-      - name: Start Redis
-        uses: supercharge/[email protected]
-        with:
-          redis-version: 6
+          sudo apt install zlib1g-dev:i386
+          tools/ci/install_rustg.sh
       - name: Compile & Run Unit Tests
         run: |
           tools/ci/install_byond.sh '${{ matrix.byondtype }}'
@@ -125,7 +121,7 @@ jobs:
     runs-on: windows-latest
     steps:
     - uses: actions/checkout@v4
-    - uses: actions/setup-python@v4
+    - uses: actions/setup-python@v5
       with:
         python-version: '3.8.2' # Script was made for 3.8.2
         architecture: 'x86' # This MUST be x86

.gitignore

@@ -58,5 +58,12 @@ __pycache__/
 dmm-tools.exe
 OpenDream
 paradise.json
+
+# Misc windows shenanigans
 $RECYCLE.BIN
+
+# Linux libs
+/*.so
+
+# SS220 EDIT
 sound/tts_cache/*

.tgs.yml

@@ -1,6 +1,9 @@
-# This file is stolen from tg
+# This file is used by TGS (https://github.com/tgstation/tgstation-server) clients to quickly initialize a server instance for the codebase
+# The format isn't documented anywhere but hopefully we never have to change it. If there are questions, contact the TGS maintainer Cyberboss/@Dominion#0444
 version: 1
-byond: "515.1619"
+# The BYOND version to use
+# Must be interpreted as a string, keep quoted
+byond: "515.1620"
 # Folders to create in "<instance_path>/Configuration/GameStaticFiles/"
 static_files:
   # Config directory should be static
@@ -9,8 +12,7 @@ static_files:
     populate: true
   # Data directory must be static
   - name: data
-# String dictionary. The value is the location of the file in the repo to upload to TGS. The key is the name of the file to upload to "<instance_path>/Configuration/EventScripts/"
-# This one is for Linux hosted servers
+# Scripts linux needs
 linux_scripts:
   PreCompile.sh: tools/tgs_scripts/PreCompile.sh
   WatchdogLaunch.sh: tools/tgs_scripts/WatchdogLaunch.sh

README.md

@@ -1,4 +1,5 @@
-# Paradise
+# Paradise WyccStation SS220
+
 [![CI](https://github.com/ParadiseSS13/Paradise/workflows/CI/badge.svg)](https://github.com/ParadiseSS13/Paradise/actions?query=workflow%3ACI)
 [![Render Nanomaps](https://github.com/ParadiseSS13/Paradise/workflows/Render%20Nanomaps/badge.svg)](https://github.com/ParadiseSS13/Paradise/actions?query=workflow%3A%22Render+Nanomaps%22)
 [![Average time to resolve an issue](http://isitmaintained.com/badge/resolution/paradisess13/paradise.svg)](http://isitmaintained.com/project/paradisess13/paradise "Average time to resolve an issue")
@@ -8,13 +9,13 @@
 [![forthebadge](http://forthebadge.com/images/badges/contains-technical-debt.svg)](http://forthebadge.com)
 [![forthebadge](http://forthebadge.com/images/badges/fuck-it-ship-it.svg)](http://forthebadge.com)
 
-# Useful Links
+# Полезные ссылки
 
-- [Discord](https://discordapp.com/invite/YJDsXFE)
-- [Documentation](https://codedocs.paradisestation.org)
-- [Website](https://www.paradisestation.org/)
+- [Discord](https://discord.com/invite/ss220)
+- [Wiki](https://wiki.ss220.club/)
+- [Documentation](https://ss220club.github.io/Paradise-SS220/)
 
-# Useful Documents
+# Полезные материалы
 
 - [Autodocumentation Guide](.github/AUTODOC_GUIDE.md)
 - [Code of Conduct](./CODE_OF_CONDUCT.md)
@@ -23,7 +24,6 @@
 
 ---
 
-
 ### LICENSE
 
 Paradise is licensed under the GNU Affero General Public License version 3.
@@ -44,8 +44,8 @@ Any files located in the
 `Paradise/sound/goonstation`
 directories, or any subdirectories of mentioned directories are licensed under the
 Creative Commons 3.0 BY-NC-SA license
-(https://creativecommons.org/licenses/by-nc-sa/3.0)
+(<https://creativecommons.org/licenses/by-nc-sa/3.0>)
 
 All other assets including icons and sound files are licensed under the
-Creative Commons 3.0 BY-SA license (https://creativecommons.org/licenses/by-sa/3.0/),
+Creative Commons 3.0 BY-SA license (<https://creativecommons.org/licenses/by-sa/3.0/>),
 unless otherwise indicated.

SQL/paradise_schema.sql

@@ -297,6 +297,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',
+  `species_whitelist` LONGTEXT COLLATE utf8mb4_unicode_ci NOT NULL,
   PRIMARY KEY (`id`),
   UNIQUE KEY `ckey` (`ckey`),
   KEY `lastseen` (`lastseen`),

SQL/updates220/53.220.5-53.220.6.sql

@@ -0,0 +1,4 @@
+# Updating DB from 53.220.5 to 53.220.6
+# Adds species whitelist ~legendaxe
+
+ALTER TABLE `player` ADD `species_whitelist` LONGTEXT COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '["human"]';

_build_dependencies.sh

@@ -6,10 +6,12 @@ export NODE_VERSION=18
 # Stable Byond Major
 export STABLE_BYOND_MAJOR=515
 # Stable Byond Minor
-export STABLE_BYOND_MINOR=1619
+export STABLE_BYOND_MINOR=1620
 # Beta Byond Major
 export BETA_BYOND_MAJOR=515
 # Beta Byond Minor
-export BETA_BYOND_MINOR=1619
+export BETA_BYOND_MINOR=1620
 # Python version for mapmerge and other tools
 export PYTHON_VERSION=3.11.6
+# RUSTG version
+export RUSTG_VERSION=v3.0.0-P

_maps/map_files/MetaStation/MetaStation.dmm

@@ -55190,13 +55190,12 @@
 	d2 = 8;
 	icon_state = "4-8"
 	},
-/obj/effect/mapping_helpers/airlock/access/all/engineering/general,
+/obj/effect/mapping_helpers/airlock/access/any/engineering/general,
 /obj/machinery/door/airlock/engineering/glass{
 	heat_proof = 1;
 	name = "Supermatter Chamber"
 	},
 /obj/effect/mapping_helpers/airlock/access/any/engineering/atmos,
-/obj/effect/mapping_helpers/airlock/access/any/engineering/general,
 /turf/simulated/floor/engine,
 /area/station/engineering/engine/supermatter)
 "gvN" = (
@@ -74829,13 +74828,12 @@
 /turf/simulated/floor/plating,
 /area/station/maintenance/xenobio_south)
 "peF" = (
-/obj/effect/mapping_helpers/airlock/access/all/engineering/general,
+/obj/effect/mapping_helpers/airlock/access/any/engineering/general,
 /obj/machinery/door/airlock/engineering/glass{
 	heat_proof = 1;
 	name = "Supermatter Chamber"
 	},
 /obj/effect/mapping_helpers/airlock/access/any/engineering/atmos,
-/obj/effect/mapping_helpers/airlock/access/any/engineering/general,
 /turf/simulated/floor/engine,
 /area/station/engineering/engine/supermatter)
 "pfh" = (