Merge remote-tracking branch 'upstream/master' into I-killed-bubblegu…

…m-on-hard-mode-and-all-I-got-was-this-stupid-medal

.github/CONTRIBUTING.md

@@ -385,7 +385,7 @@ Look for code examples on how to properly use it.
 
 //Good
 /datum/datum1/proc/proc1(target)
-    addtimer(CALLBACK(target, .proc/dothing, arg1, arg2, arg3), 5 SECONDS)
+    addtimer(CALLBACK(target, PROC_REF(dothing), arg1, arg2, arg3), 5 SECONDS)
 ```
 
 ### Operators
@@ -618,6 +618,8 @@ in the SQL/updates folder.
 
 * All new var/proc names should use the American English spelling of words. This is for consistency with BYOND.
 
+* All mentions of the company "Nanotrasen" should be written as such - 'Nanotrasen'. Use of CamelCase (NanoTrasen) is no longer proper.
+
 * If you are making a PR that adds a config option to change existing behaviour, said config option must default to as close to as current behaviour as possible.
 
 ### Dream Maker Quirks/Tricks
@@ -745,6 +747,7 @@ Each role inherits the lower role's responsibilities (IE: Headcoders also have c
 
 * [AffectedArc07](https://github.com/AffectedArc07)
 * [Charliminator](https://github.com/hal9000PR)
+* [lewcc](https://github.com/lewcc)
 * [S34N](https://github.com/S34NW)
 
 ---

.github/workflows/ci.yml

@@ -12,7 +12,7 @@ jobs:
     name: Run Linters
     runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Setup Cache
         uses: actions/cache@v3
         with:
@@ -48,7 +48,7 @@ jobs:
     name: Lint with OpenDream
     runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Setup OD
         run: |
           bash tools/ci/setup_od.sh
@@ -60,7 +60,7 @@ jobs:
     name: Compile All Maps
     runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Setup Cache
         uses: actions/cache@v3
         with:
@@ -90,7 +90,7 @@ jobs:
           - 3306
         options: --health-cmd "mariadb-admin ping" --health-interval 10s --health-timeout 5s --health-retries 10
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Setup Cache
         uses: actions/cache@v3
         with:
@@ -108,7 +108,7 @@ jobs:
           sudo apt install libssl1.1:i386
           ldd librust_g.so
       - name: Start Redis
-        uses: supercharge/redis-github-action@1.6.0
+        uses: supercharge/redis-github-action@1.7.0
         with:
           redis-version: 6
       - name: Compile & Run Unit Tests
@@ -123,7 +123,7 @@ jobs:
     name: Windows RUSTG Validation
     runs-on: windows-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - uses: actions/setup-python@v4
       with:
         python-version: '3.8.2' # Script was made for 3.8.2

.github/workflows/dmi5.yml

@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - uses: ParadiseSS13/DMI5Checker@v1
       with:
         icons-path: 'icons'

.github/workflows/generate_autodoc.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
     - name: 'Update Branch'
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         fetch-depth: 1
         ref: master
@@ -24,7 +24,7 @@ jobs:
       # Nojekyll is important to disable jeykll syntax, which can mess with files that start with underscores
 
     - name: 'Deploy Documentation'
-      uses: crazy-max/ghaction-github-pages@v3
+      uses: crazy-max/ghaction-github-pages@v4
       with:
         keep_history: false
         build_dir: dmdoc

.github/workflows/render_nanomaps.yml

@@ -21,7 +21,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
     - name: 'Update Branch'
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     - name: Branch
       run: |

SQL/paradise_schema.sql

@@ -117,6 +117,7 @@ CREATE TABLE `death` (
   `coord` text NOT NULL COMMENT 'X, Y, Z POD',
   `tod` datetime NOT NULL COMMENT 'Time of death',
   `death_rid` INT NULL,
+  `last_words` text NULL DEFAULT NULL,
   `server_id` TEXT NULL DEFAULT NULL,
   `job` text NOT NULL,
   `special` text NOT NULL,

SQL/updates/50-51.sql

@@ -0,0 +1,4 @@
+# Updating SQL from 50 to 51 -Edan52
+# Add last words to death table
+ALTER TABLE `death`
+	ADD COLUMN `last_words` text NULL DEFAULT NULL AFTER `death_rid`;