[pull] master from tgstation:master

.gitattributes

@@ -1,50 +1,37 @@
-# merger hooks, run tools/hooks/install.bat or install.sh to set up
-*.dmm merge=dmm
-*.dmi merge=dmi
-
-
 # force line endings
 * text eol=lf
 
-# dm stuff
+# text
+*.bat text eol=lf
+*.cjs text eol=lf
 *.dm text eol=lf
-*.dmm text eol=lf
 *.dme text eol=lf
 *.dmf text eol=lf
-
+*.js text eol=lf
 *.json text eol=lf
-*.txt text eol=lf
-
-# tools
-*.sh text eol=lf
-*.bat text eol=lf
-*.yml text eol=lf
-*.toml text eol=lf
-*.py text eol=lf
 *.md text eol=lf
-
-# tgui
-*.js text eol=lf
-*.scss text eol=lf
-*.cjs text eol=lf
 *.ps1 text eol=lf
+*.py text eol=lf
+*.scss text eol=lf
+*.sh text eol=lf
+*.toml text eol=lf
+*.txt text eol=lf
+*.yml text eol=lf
 
-# definitely don't convert these
-*.dmi binary
-
+# binary
+*.dll binary
+*.eot binary
+*.exe binary
+*.jpeg binary
+*.jpg binary
 *.ogg binary
-*.wav binary
-
+*.pdb binary
 *.png binary
-*.jpg binary
-*.jpeg binary
-
-*.eot binary
-*.woff binary
 *.ttf binary
+*.wav binary
+*.woff binary
 *.woff2 binary
 
-*.dll binary
-*.pdb binary
-
-*.exe binary
+# merger hooks, run tools/hooks/install.bat or install.sh to set up
+*.dmm text eol=lf merge=dmm
+*.dmi binary merge=dmi

.github/HARDDEL_GUIDE.md

@@ -38,7 +38,7 @@ This of course means they can store that location in memory in another object's
     var/reference
 /proc/someshit(mem_location)
     var/datum/some_obj = new()
-    some_obj.reference = mem_location 
+    some_obj.reference = mem_location
 ```
 
 But what happens when you get rid of the object we're passing around references to? If we just cleared it out from memory, everything that holds a reference to it would suddenly be pointing to nowhere, or worse, something totally different!
@@ -127,7 +127,7 @@ You can read more about what each of these do in that file, but the long and sho
 
 It'll tell you what object is holding the ref if it's in an object, or what pattern of list transversal was required to find the ref if it's hiding in a list of some sort
 
-## Techniques For Fixing Hard Deletes 
+## Techniques For Fixing Hard Deletes
 
 Once you've found the issue, it becomes a matter of making sure the ref is cleared as a part of Destroy(). I'm gonna walk you through a few patterns and discuss how you might go about fixing them
 
@@ -220,7 +220,7 @@ So then, we want to temporarily remember to clear a reference when it's deleted
 
 This is where I might lose you, but we're gonna use signals
 
-`qdel()`, the proc that sets off this whole deletion business, sends a signal called `COMSIG_PARENT_QDELETING`
+`qdel()`, the proc that sets off this whole deletion business, sends a signal called `COMSIG_QDELETING`
 
 We can listen for that signal, and if we hear it clear whatever reference we may have
 
@@ -231,10 +231,10 @@ Here's an example
     var/mob/target
 /somemob/proc/set_target(new_target)
     if(target)
-        UnregisterSignal(target, COMSIG_PARENT_QDELETING) //We need to make sure any old signals are cleared
+        UnregisterSignal(target, COMSIG_QDELETING) //We need to make sure any old signals are cleared
     target = new_target
     if(target)
-        RegisterSignal(target, COMSIG_PARENT_QDELETING, PROC_REF(clear_target)) //Call clear_target if target is ever qdel()'d
+        RegisterSignal(target, COMSIG_QDELETING, PROC_REF(clear_target)) //Call clear_target if target is ever qdel()'d
 /somemob/proc/clear_target(datum/source)
     SIGNAL_HANDLER
     set_target(null)

.github/PULL_REQUEST_TEMPLATE.md

@@ -11,7 +11,11 @@
 
 ## Changelog
 
-<!-- If your PR modifies aspects of the game that can be concretely observed by players or admins you should add a changelog. If your change does NOT meet this description, remove this section. Be sure to properly mark your PRs to prevent unnecessary GBP loss. You can read up on GBP and it's effects on PRs in the tgstation guides for contributors. Please note that maintainers freely reserve the right to remove and add tags should they deem it appropriate. You can attempt to finagle the system all you want, but it's best to shoot for clear communication right off the bat. -->
+<!-- If your PR modifies aspects of the game that can be concretely observed by players or admins you should add a changelog. If your change does NOT meet this description, remove this section. Be sure to properly mark your PRs. Please note that maintainers freely reserve the right to remove and add tags should they deem it appropriate. You can attempt to manipulate the system all you want, but it's best to shoot for clear communication right off the bat. -->
+
+<!--Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. -->
+
+<!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents, don't be too verbose. -->
 
 :cl:
 add: Added new mechanics or gameplay changes
@@ -31,6 +35,3 @@ config: changed some config setting
 admin: messed with admin stuff
 server: something server ops should know
 /:cl:
-
-<!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. -->
-<!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. -->

.github/alternate_byond_versions.txt

@@ -0,0 +1,7 @@
+# This file contains extra tests to run for specific BYOND versions.
+# This is useful for making sure we maintain compatibility with both older and newer versions,
+# while still having our main tests run on a guaranteed pinned version.
+
+# Format is version: map
+# Example:
+# 500.1337: runtimestation

.github/max_required_byond_client.txt

@@ -0,0 +1,8 @@
+# Highest byond client version allowed to be required by the byond world. Set to 9999 to disable the check flat out.
+# If the compiled world requires clients use a version higher than this, ci will fail.
+#   for instance: if this is set to 514, and a pr uses a 515 client feature, an alert will trigger
+# If you have to update this number for your pr, you should make it VERY CLEAR in the pr body that you did so.
+#   (Requiring clients update to connect to the game server is not something we like to spring on them with no notice, 
+#   especially for beta builds where the pager/updater won't let them update without additional configuration.)
+
+514