just a small comit

.github/add_labels.py

@@ -1,19 +1,19 @@
 import os, re
-from github import Github
+from github import Github, GithubException
 
 # Format - Key: Array[Label, [StringsToIgnore]]
 changelogToPrefix = {
-	'fix': ["Fix", ["fixed a few things"]],
-	'qol': ["Quality of Life", ["made something easier to use"]],
-	'add': ["Feature", ["Added new mechanics or gameplay changes", "Added more things"]],
-	'del': ["Removal", ["Removed old things"]],
-	'spellcheck': ["Grammar and Formatting", ["fixed a few typos"]],
-	'balance': ["Balance", ["rebalanced something"]],
-	'code': ["Code Improvement", ["changed some code"]],
-	'refactor': ["Refactor", ["refactored some code"]],
-	'config': ["Config", ["changed some config setting"]],
-	'admin': ["Admin", ["messed with admin stuff"]],
-	'server': ["Server", ["something server ops should know"]],
+    'fix': ["Fix", ["fixed a few things"]],
+    'qol': ["Quality of Life", ["made something easier to use"]],
+    'add': ["Feature", ["Added new mechanics or gameplay changes", "Added more things"]],
+    'del': ["Removal", ["Removed old things"]],
+    'spellcheck': ["Grammar and Formatting", ["fixed a few typos"]],
+    'balance': ["Balance", ["rebalanced something"]],
+    'code': ["Code Improvement", ["changed some code"]],
+    'refactor': ["Refactor", ["refactored some code"]],
+    'config': ["Config", ["changed some config setting"]],
+    'admin': ["Admin", ["messed with admin stuff"]],
+    'server': ["Server", ["something server ops should know"]],
     'soundadd': ["Sound", ["added a new sound thingy"]],
     'sounddel': ["Sound", ["removed an old sound thingy"]],
     'imageadd': ["Sprites", ["added some icons and images"]],
@@ -24,78 +24,96 @@
 }
 
 fileToPrefix = {
-	'wav': 'Sound',
-	'ogg': 'Sound',
+    'wav': 'Sound',
+    'ogg': 'Sound',
     'mp3': 'Sound', ## Can't believe they forgot about the best sound format
-	'dmm': 'Mapping',
+    'dmm': 'Mapping',
 
-	'js': 'UI',
-	'tsx': 'UI',
-	'ts': 'UI',
-	'jsx': 'UI',
-	'scss': 'UI',
+    'js': 'UI',
+    'tsx': 'UI',
+    'ts': 'UI',
+    'jsx': 'UI',
+    'scss': 'UI',
 
-	'dmi': "Sprites",
+    'dmi': "Sprites",
 }
 
 githubLabel = "Github"
+missingLogLabel = "Missing Changelog"
 
 def get_labels(pr):
-	labels = {}
-
-	files = pr.get_files()
-	for file in files:
-		prefix = file.filename.split(".")[-1]
-		if file.filename.startswith(".github"):
-			labels[githubLabel] = True
-		if not prefix in fileToPrefix:
-			continue
-		labels[fileToPrefix[prefix]] = True
-
-	changelog_match = re.search(r"🆑(.*)/🆑", pr.body, re.S | re.M)
-	if changelog_match is None:
-		changelog_match = re.search(r":cl:(.*)/:cl:", pr.body, re.S | re.M)
-		if changelog_match is None:
-			return labels
-	lines = changelog_match.group(1).split('\n')
-	for line in lines:
-		line = line.strip()
-		if not line:
-			continue
-
-		contentSplit = line.split(":")
-
-		key = contentSplit.pop(0).strip()
-		content = ":".join(contentSplit).strip()
-
-		if not key in changelogToPrefix:
-			continue
-
-		if content in changelogToPrefix[key][1]:
-			continue
-
-		labels[changelogToPrefix[key][0]] = True
-
-	return list(labels)
+    labels = {}
+    failed = False
+
+    files = pr.get_files()
+    for file in files:
+        prefix = file.filename.split(".")[-1]
+        if file.filename.startswith(".github"):
+            labels[githubLabel] = True
+        if not prefix in fileToPrefix:
+            continue
+        labels[fileToPrefix[prefix]] = True
+
+    changelog_match = re.search(r"🆑(.*)/🆑", pr.body, re.S | re.M)
+    if changelog_match is None:
+        changelog_match = re.search(r":cl:(.*)/:cl:", pr.body, re.S | re.M)
+        if changelog_match is None:
+            print("::warning ::No changelog detected.")
+            labels[missingLogLabel] = True
+            return labels, False
+
+    lines = changelog_match.group(1).split('\n')
+    failed = len(lines) <= 2 # Make sure its not an empty changelog
+    if failed:
+        print("::error ::Empty changelog.")
+
+    for line in lines[1:-1]: # Skip first line with authors and last
+        line = line.strip()
+        if not line:
+            continue
+
+        contentSplit = line.split(":")
+
+        key = contentSplit.pop(0).strip()
+        content = ":".join(contentSplit).strip()
+
+        if not key in changelogToPrefix: # Some key that we didn't expect
+            print(f"::error ::Invalid changelog entry: {line}")
+            failed = True
+            continue
+
+        if content in changelogToPrefix[key][1]: # They left the template entry in
+            print(f"::error ::Invalid changelog entry: {line}")
+            failed = True
+            continue
+
+        labels[changelogToPrefix[key][0]] = True
+
+    return list(labels), failed
 
 def main():
-	g = Github(os.environ["TOKEN"])
-	repo = g.get_repo(os.environ['REPO'])
+    g = Github(os.environ["TOKEN"])
+    repo = g.get_repo(os.environ['REPO'])
 
-	pr = repo.get_pull(int(os.environ["PR_NUMBER"]))
-	if not pr:
-		print("Not a PR.")
-		return
+    pr = repo.get_pull(int(os.environ["PR_NUMBER"]))
+    if not pr:
+        print("::warning ::Not a PR.")
+        return
 
-	labels = get_labels(pr)
+    labels, failed = get_labels(pr)
 
-	if labels is None: # no labels to add
-		print("No labels to add.")
-		return
+    if not missingLogLabel in labels:
+        try:
+            pr.remove_from_labels(missingLogLabel)
+        except GithubException as e:
+            if e.status == 404:
+                pass # 404 if we try to remove a label that isn't set
 
-	for label in labels:
-		pr.add_to_labels(label)
+    for label in labels:
+        pr.add_to_labels(label)
 
+    if failed:
+        exit(1)
 
 if __name__ == '__main__':
-	main()
+    main()

.github/alternate_byond_versions.txt

@@ -5,5 +5,3 @@
 # Format is version: map
 # Example:
 # 500.1337: runtimestation
-
-515.1610: lv624

.github/workflows/ci_suite.yml

@@ -1,5 +1,4 @@
 name: CI Suite
-permissions: write-all
 on:
   pull_request:
     branches:
@@ -64,30 +63,16 @@ jobs:
 
   odlint:
     name: Lint with OpenDream
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v3
-      - name: Get OpenDream Version
-        run: |
-          source dependencies.sh
-          echo "OPENDREAM_VERSION=$OPENDREAM_VERSION" >> $GITHUB_ENV
-      - name: Restore OpenDream cache
-        uses: actions/cache@v3
-        id: cache-od
+      - uses: actions/checkout@v4
+      - uses: robinraju/[email protected]
         with:
-          path: ~/OpenDream
-          key: ${{ runner.os }}-opendream-${{ env.OPENDREAM_VERSION }}
-      - name: Download OpenDream
-        if: steps.cache-od.outputs.cache-hit != 'true'
-        run: |
-          bash tools/ci/download_od.sh
-      - name: Setup OpenDream
-        if: steps.cache-od.outputs.cache-hit != 'true'
-        run: |
-          bash tools/ci/setup_od.sh
-      - name: Run OpenDream
-        run: |
-          bash tools/ci/run_od.sh
+          repository: "OpenDreamProject/OpenDream"
+          tag: "latest"
+          fileName: "DMCompiler_linux-x64.tar.gz"
+          extract: true
+      - run: ./DMCompiler_linux-x64/DMCompiler --suppress-unimplemented colonialmarines.dme
 
   compile_all_maps:
     if: "!contains(github.event.head_commit.message, '[ci skip]')"

.github/workflows/generate_documentation.yml

@@ -1,7 +1,4 @@
 name: Generate documentation
-permissions:
-  contents: write
-  pull-requests: write
 on:
   push:
     branches:
@@ -24,6 +21,7 @@ jobs:
         run: |
           ~/dmdoc
           touch dmdoc/.nojekyll
+          echo docs.cm-ss13.com > dmdoc/CNAME
       - name: Deploy
         uses: JamesIves/[email protected]
         with:

.github/workflows/labeler.yml

@@ -1,7 +1,7 @@
-name: Labeling
+name: Labeling and Verification
 on:
   pull_request_target:
-    types: [opened]
+    types: [opened, edited]
 jobs:
   label:
     runs-on: ubuntu-latest
@@ -13,7 +13,7 @@ jobs:
         run: |
           unset SECRET_EXISTS
           if [ -n "$ENABLER_SECRET" ]; then SECRET_EXISTS=true ; fi
-          echo "::set-output name=ACTIONS_ENABLED::$SECRET_EXISTS"
+          echo "ACTIONS_ENABLED=$SECRET_EXISTS" >> $GITHUB_OUTPUT
       - name: Get The Script
         if: steps.value_holder.outputs.ACTIONS_ENABLED
         run: |
@@ -29,7 +29,7 @@ jobs:
           python -m pip install --upgrade pip
           python -m pip install pygithub
           sudo apt-get install dos2unix
-      - name: Add Labels
+      - name: Add and verify labels
         if: steps.value_holder.outputs.ACTIONS_ENABLED
         run: |
           python add_labels.py

.tgs.yml

@@ -1,5 +1,5 @@
 version: 1
-byond: "514.1588"
+byond: "515.1627"
 static_files:
   - name: config
   - name: data

.vscode/tasks.json

@@ -89,6 +89,19 @@
             ],
             "group": "build",
             "label": "tgui: sonar"
+        },
+        {
+            "type": "shell",
+            "command": "bin/tgfont",
+            "windows": {
+                "command": ".\\bin\\tgfont.cmd"
+            },
+            "problemMatcher": [
+                "$tsc",
+                "$eslint-stylish"
+            ],
+            "group": "build",
+            "label": "tgui: rebuild tgfont"
         }
     ]
 }

bin/tgfont.cmd

@@ -0,0 +1,2 @@
+@echo off
+call "%~dp0\..\tools\build\build.bat" --wait-on-error tg-font %*

code/__DEFINES/ARES.dm

@@ -1,21 +1,22 @@
+#define ARES_ACCESS_LOGOUT 0
 /// Generic access for 1:1 conversations with ARES and unrestricted commands.
-#define ARES_ACCESS_BASIC 0
+#define ARES_ACCESS_BASIC 1
 /// Secure Access, can read ARES Announcements and Bioscans.
-#define ARES_ACCESS_COMMAND 1
-#define ARES_ACCESS_JOE 2
+#define ARES_ACCESS_COMMAND 2
+#define ARES_ACCESS_JOE 3
 /// CL, can read Apollo Log and also Delete Announcements.
-#define ARES_ACCESS_CORPORATE 3
+#define ARES_ACCESS_CORPORATE 4
 /// Senior Command, can Delete Bioscans.
-#define ARES_ACCESS_SENIOR 4
+#define ARES_ACCESS_SENIOR 5
 /// Synth, CE & Commanding Officer, can read the access log.
-#define ARES_ACCESS_CE 5
-#define ARES_ACCESS_SYNTH 6
-#define ARES_ACCESS_CO 7
+#define ARES_ACCESS_CE 6
+#define ARES_ACCESS_SYNTH 7
+#define ARES_ACCESS_CO 8
 /// High Command, can read the deletion log.
-#define ARES_ACCESS_HIGH 8
-#define ARES_ACCESS_WY_COMMAND 9
-/// Debugging. Allows me to view everything without using a high command rank. Unlikely to stay in a full merge.
-#define ARES_ACCESS_DEBUG 10
+#define ARES_ACCESS_HIGH 9
+#define ARES_ACCESS_WY_COMMAND 10
+/// Debugging. Allows me to view everything without using a high command rank.
+#define ARES_ACCESS_DEBUG 11
 
 #define ARES_RECORD_ANNOUNCE "Announcement Record"
 #define ARES_RECORD_ANTIAIR "AntiAir Control Log"
@@ -27,6 +28,7 @@
 #define ARES_RECORD_MAINTENANCE "Maintenance Ticket"
 #define ARES_RECORD_ACCESS "Access Ticket"
 #define ARES_RECORD_FLIGHT "Flight Record"
+#define ARES_RECORD_TECH "Tech Control Record"
 
 /// Not by ARES logged through marine_announcement()
 #define ARES_LOG_NONE 0
@@ -67,6 +69,16 @@
 #define TICKET_OPEN "OPEN"
 #define TICKET_CLOSED "CLOSED"
 
+// Priority status changes.
+/// Upgraded to Priority
+#define TICKET_PRIORITY "priority"
+/// Downgraded from Priority
+#define TICKET_NON_PRIORITY "non-priority"
+
 /// Cooldowns
 #define COOLDOWN_ARES_SENSOR 60 SECONDS
 #define COOLDOWN_ARES_ACCESS_CONTROL 20 SECONDS
+#define COOLDOWN_ARES_VENT 60 SECONDS
+
+/// Time until someone can respawn as Working Joe
+#define JOE_JOIN_DEAD_TIME (15 MINUTES)