Merge branch 'master' into pr/784

.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

@@ -6,6 +6,7 @@ on:
   pull_request:
     branches:
     - master
+    - upstream-merge
 jobs:
   run_linters:
     if: "!contains(github.event.head_commit.message, '[ci skip]')"

.gitignore

@@ -198,3 +198,6 @@ Temporary Items
 /tools/LinuxOneShot/TGS_Logs
 tools/UnstandardnessTestForDM/UnstandardnessTestForDM/obj/x86/Debug/UnstandardnessTestForDM.csproj.AssemblyReference.cache
 tools/UnstandardnessTestForDM/UnstandardnessTestForDM/obj/x86/Debug/.NETFramework,Version=v4.0,Profile=Client.AssemblyAttributes.cs
+
+#Tracy profiler DLL
+/prof.dll

.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

SpacemanDMM.toml

@@ -1,3 +1,5 @@
+environment = "tgstation.dme"
+
 [langserver]
 dreamchecker = true
 

_maps/RandomRuins/SpaceRuins/miracle.dmm

@@ -1,7 +1,6 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
 "a" = (
 /obj/item/storage/backpack/satchel/flat/secret/miracle_ruin,
-/obj/machinery/spaceship_navigation_beacon/invion,
 /turf/open/floor/fakespace{
 	initial_gas_mix = "TEMP=2.7"
 	},

_maps/RandomRuins/SpaceRuins/skelter.dmm

@@ -3257,7 +3257,7 @@
 	},
 /obj/structure/closet,
 /obj/effect/turf_decal/bot,
-/obj/item/circlegame,
+/obj/item/hand_item/circlegame,
 /turf/open/floor/plasteel/dark,
 /area/ruin/space/has_grav/skelter/storage)
 "hE" = (

_maps/RandomRuins/SpaceRuins/spacehermit.dmm

@@ -245,7 +245,7 @@
 /area/template_noop)
 "aY" = (
 /obj/effect/mob_spawn/human/hermit{
-	flavour_text = "<span class='big bold'>You've been late to awaken from your cryo slumber. Blasted machine, you set it to 10 days not 10 weeks!</span><b> Where have the others gone while we were out? Did they manage to survive? These thoughts are dispelled by yet another recollection of how you got here... ";
+	flavour_text = "<span class='big bold'>You've been late to awaken from your cryo slumber. Blasted machine, you set it to 10 days not 10 weeks!</span><b> Where have the others gone while we were out? Did they manage to survive? These thoughts are dispelled by yet another recollection of how you got here...</b> ";
 	job_description = "Space Hermit"
 	},
 /turf/open/floor/mineral/titanium,

_maps/layeniastation.json

@@ -12,7 +12,7 @@
 	"traits": [
 		{
 			"Up": 1,
-			"Baseturf": "/area/space",
+			"Baseturf": "/turf/space",
 			"Linkage": "Cross"
 		},
 		{