Merge pull request #345 from nuke-ops/upstream

Upstream

.editorconfig

@@ -1,10 +1,12 @@
+# http://editorconfig.org
+root = true
+
 [*]
 indent_style = tab
-indent_size = 4
+end_of_line = lf
 charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
-end_of_line = lf
 
 [*.yml]
 indent_style = space
@@ -17,4 +19,4 @@ indent_style = space
 trim_trailing_whitespace = false
 
 [Dockerfile]
-indent_style = space
+indent_style = space

.github/workflows/ci_suite.yml

@@ -8,9 +8,9 @@ on:
     - master
 jobs:
   run_linters:
-    if: "!contains(github.event.head_commit.message, '[ci skip]')"
+    if: !contains(github.event.head_commit.message, '[ci skip]')
     name: Run Linters
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v2
       - name: Restore SpacemanDMM cache
@@ -51,13 +51,13 @@ jobs:
           outputFile: output-annotations.txt
 
   compile_all_maps:
-    if: "!contains(github.event.head_commit.message, '[ci skip]')"
+    if: !contains(github.event.head_commit.message, '[ci skip]')
     name: Compile Maps
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Restore BYOND cache
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ~/BYOND
           key: ${{ runner.os }}-byond-${{ secrets.CACHE_PURGE_KEY }}
@@ -66,11 +66,10 @@ jobs:
           bash tools/ci/install_byond.sh
           source $HOME/BYOND/byond/bin/byondsetup
           tools/build/build --ci dm -DCIBUILDING -DCITESTING -DALL_MAPS
-
   run_all_tests:
-    if: "!contains(github.event.head_commit.message, '[ci skip]')"
+    if: !contains(github.event.head_commit.message, '[ci skip]')
     name: Integration Tests
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     services:
       mysql:
         image: mysql:latest
@@ -80,14 +79,14 @@ jobs:
           - 3306
         options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Restore BYOND cache
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ~/BYOND
           key: ${{ runner.os }}-byond-${{ secrets.CACHE_PURGE_KEY }}
       - name: Restore Yarn cache
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: tgui/.yarn/cache
           key: ${{ runner.os }}-yarn-${{ secrets.CACHE_PURGE_KEY }}-${{ hashFiles('tgui/yarn.lock') }}
@@ -118,15 +117,14 @@ jobs:
           source $HOME/BYOND/byond/bin/byondsetup
           tools/build/build --ci -DCIBUILDING
           bash tools/ci/run_server.sh
-
   test_windows:
-    if: "!contains(github.event.head_commit.message, '[ci skip]')"
+    if: !contains(github.event.head_commit.message, '[ci skip]')
     name: Windows Build
     runs-on: windows-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Restore Yarn cache
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: tgui/.yarn/cache
           key: ${{ runner.os }}-yarn-${{ secrets.CACHE_PURGE_KEY }}-${{ hashFiles('tgui/yarn.lock') }}
@@ -143,7 +141,7 @@ jobs:
           md deploy
           bash tools/deploy.sh ./deploy
       - name: Deploy artifact
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: deploy
           path: deploy

.github/workflows/compile_changelogs.yml

@@ -1,10 +1,8 @@
 name: Compile changelogs
 
 on:
-  workflow_run:
-    workflows: [Make changelogs]
-    types:
-      - completed
+  schedule:
+  - cron: "0 0 * * *"
 
 jobs:
   compile:

.github/workflows/update_tgs_dmapi.yml

@@ -44,4 +44,4 @@ jobs:
         pr_body: "This pull request updates the TGS DMAPI to the latest version. Please note any breaking or unimplemented changes before merging."
         pr_label: "Tools"
         pr_allow_empty: false
-        github_token: ${{ secrets.GITHUB_TOKEN }}
+        github_token: ${{ secrets.TGS_UPDATER }}

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "secrets"]
+	path = secrets
+	url = https://github.com/Sandstorm-Station/secrets

.tgs.yml

@@ -3,7 +3,7 @@
 version: 1
 # The BYOND version to use (kept in sync with dependencies.sh by the "TGS Test Suite" CI job)
 # Must be interpreted as a string, keep quoted
-byond: "514.1589"
+byond: "515.1634"
 # Folders to create in "<instance_path>/Configuration/GameStaticFiles/"
 static_files:
   # Config directory should be static

_maps/RandomRuins/SpaceRuins/TheDerelict.dmm

@@ -4159,7 +4159,7 @@
 	dir = 2;
 	dwidth = 11;
 	height = 22;
-	id = "whiteship_z4";
+	shuttle_id = "whiteship_z4";
 	name = "KSS13: Derelict";
 	width = 35
 	},

_maps/RandomRuins/SpaceRuins/caravanambush.dmm

@@ -51,7 +51,7 @@
 	dir = 2;
 	dwidth = 14;
 	height = 13;
-	id = "caravanpirate_ambush";
+	shuttle_id = "caravanpirate_ambush";
 	name = "Trade Route";
 	roundstart_template = /datum/map_template/shuttle/ruin/pirate_cutter;
 	width = 22
@@ -1260,7 +1260,7 @@
 	dir = 2;
 	dwidth = 6;
 	height = 7;
-	id = "caravansyndicate3_ambush";
+	shuttle_id = "caravansyndicate3_ambush";
 	name = "Trade Route";
 	roundstart_template = /datum/map_template/shuttle/ruin/syndicate_dropship;
 	width = 15
@@ -1272,7 +1272,7 @@
 	dir = 4;
 	dwidth = 4;
 	height = 5;
-	id = "caravansyndicate1_ambush";
+	shuttle_id = "caravansyndicate1_ambush";
 	name = "Trade Route";
 	roundstart_template = /datum/map_template/shuttle/ruin/syndicate_fighter_shiv;
 	width = 9
@@ -1284,7 +1284,7 @@
 	dir = 2;
 	dwidth = 11;
 	height = 11;
-	id = "caravantrade1_ambush";
+	shuttle_id = "caravantrade1_ambush";
 	name = "Trade Route";
 	roundstart_template = /datum/map_template/shuttle/ruin/caravan_victim;
 	width = 27

_maps/RandomRuins/SpaceRuins/listeningstation.dmm

@@ -1152,15 +1152,15 @@
 	dir = 4;
 	dwidth = 6;
 	height = 7;
-	id = "caravansyndicate3_listeningpost";
+	shuttle_id = "caravansyndicate3_listeningpost";
 	name = "Syndicate Listening Post";
 	width = 15
 	},
 /obj/docking_port/stationary{
 	dir = 4;
 	dwidth = 4;
 	height = 5;
-	id = "caravansyndicate1_listeningpost";
+	shuttle_id = "caravansyndicate1_listeningpost";
 	name = "Syndicate Listening Post";
 	width = 9
 	},

_maps/RandomRuins/StationRuins/Lavaland/Mining_Station/Mining_Station_Public_01.dmm

@@ -703,7 +703,7 @@
 	dir = 8;
 	dwidth = 2;
 	height = 5;
-	id = "laborcamp_away";
+	shuttle_id = "laborcamp_away";
 	name = "labor camp";
 	width = 9
 	},
@@ -1560,7 +1560,7 @@
 	dir = 8;
 	dwidth = 3;
 	height = 7;
-	id = "lavaland_common_away";
+	shuttle_id = "lavaland_common_away";
 	name = "Lavaland Mining Public Wing";
 	width = 7
 	},
@@ -2400,7 +2400,7 @@
 	dir = 8;
 	dwidth = 3;
 	height = 10;
-	id = "mining_away";
+	shuttle_id = "mining_away";
 	name = "lavaland mine";
 	width = 7
 	},

_maps/RandomZLevels/VR/snowdin_VR.dmm

@@ -10371,7 +10371,7 @@
 	dir = 4;
 	dwidth = 3;
 	height = 6;
-	id = "snowdin_excavation_top";
+	shuttle_id = "snowdin_excavation_top";
 	name = "snowdin excavation top";
 	roundstart_template = /datum/map_template/shuttle/snowdin/excavation;
 	width = 6
@@ -10414,7 +10414,7 @@
 	dir = 4;
 	dwidth = 3;
 	height = 6;
-	id = "snowdin_excavation_down";
+	shuttle_id = "snowdin_excavation_down";
 	name = "snowdin excavation down";
 	width = 6
 	},
@@ -15303,7 +15303,7 @@
 	dir = 4;
 	dwidth = 2;
 	height = 5;
-	id = "snowdin_mining_top";
+	shuttle_id = "snowdin_mining_top";
 	name = "snowdin mining top";
 	roundstart_template = /datum/map_template/shuttle/snowdin/mining;
 	width = 5
@@ -15361,7 +15361,7 @@
 	dir = 4;
 	dwidth = 2;
 	height = 5;
-	id = "snowdin_mining_down";
+	shuttle_id = "snowdin_mining_down";
 	name = "snowdin mining bottom";
 	width = 5
 	},

_maps/RandomZLevels/away_mission/SnowCabin.dmm

@@ -3166,7 +3166,7 @@
 	},
 /area/awaymission/cabin/caves/sovietcave)
 "il" = (
-/obj/item/toy/prize/deathripley{
+/obj/item/toy/mecha/deathripley{
 	desc = "The mining mecha of the exploration team.";
 	name = "exploraton squad Ripley";
 	pixel_y = 15

_maps/RandomZLevels/away_mission/snowdin.dmm

@@ -10374,7 +10374,7 @@
 	dir = 4;
 	dwidth = 3;
 	height = 6;
-	id = "snowdin_excavation_top";
+	shuttle_id = "snowdin_excavation_top";
 	name = "snowdin excavation top";
 	roundstart_template = /datum/map_template/shuttle/snowdin/excavation;
 	width = 6
@@ -10417,7 +10417,7 @@
 	dir = 4;
 	dwidth = 3;
 	height = 6;
-	id = "snowdin_excavation_down";
+	shuttle_id = "snowdin_excavation_down";
 	name = "snowdin excavation down";
 	width = 6
 	},
@@ -15304,7 +15304,7 @@
 	dir = 4;
 	dwidth = 2;
 	height = 5;
-	id = "snowdin_mining_top";
+	shuttle_id = "snowdin_mining_top";
 	name = "snowdin mining top";
 	roundstart_template = /datum/map_template/shuttle/snowdin/mining;
 	width = 5
@@ -15362,7 +15362,7 @@
 	dir = 4;
 	dwidth = 2;
 	height = 5;
-	id = "snowdin_mining_down";
+	shuttle_id = "snowdin_mining_down";
 	name = "snowdin mining bottom";
 	width = 5
 	},

_maps/lambdastation.json

@@ -1,22 +1,23 @@
 {
     "map_name": "Lambda Station",
     "map_path": "map_files/LambdaStation",
-    "map_file":[
+    "map_file": [
         "lambda_nostra.dmm",
         "dorms_nostra.dmm"
-	],
+    ],
     "shuttles": {
         "emergency": "emergency_meta",
         "ferry": "ferry_fancy",
         "cargo": "cargo_box",
         "whiteship": "whiteship_meta"
     },
-    "traits":[
+    "traits": [
         {
-            "Up":1
+            "Up": 1,
+            "Baseturf": "/turf/open/openspace"
         },
         {
-            "Down":-1
+            "Down": -1
         }
     ]
-}
+}