Merge branch 'master' into upstream-merge-9510

.github/workflows/autochangelog.yml

@@ -1,6 +1,6 @@
 name: Autochangelog
 on: 
-    pull_request:
+    pull_request_target:
         types: closed
         branches:
             - master
@@ -15,16 +15,10 @@ jobs:
         if: github.event.pull_request.merged == true
         steps:
           - uses: /actions/checkout@v2
-<<<<<<< HEAD
-||||||| parent of 2ee78f6369... Merge pull request #9510 from VOREStation/upstream-merge-7809
-            with:
-                ref: master
-=======
             with:
                 ref: master
           - name: Update repository to master
             run: git pull "origin" master
->>>>>>> 2ee78f6369... Merge pull request #9510 from VOREStation/upstream-merge-7809
           - name: Ensure +x on CI directory
             run: |
                 chmod -R +x ./tools/ci

tools/GenerateChangelog/ss13_autochangelog.py

@@ -63,13 +63,7 @@ new = 0
 print('Reading changelogs...')
 for line in args.pr_body.splitlines():
 	print(f"Checking line '{line}'")
-<<<<<<< HEAD
-	if line[0] == "🆑": # Find the start of the changelog
-||||||| parent of 2ee78f6369... Merge pull request #9510 from VOREStation/upstream-merge-7809
-	if line[:1] == "??": # Find the start of the changelog
-=======
 	if line[:1] == "🆑": # Find the start of the changelog
->>>>>>> 2ee78f6369... Merge pull request #9510 from VOREStation/upstream-merge-7809
 		print("Found opening :cl: tag")
 		if incltag == True: # If we're already reading logs, skip
 			continue
@@ -87,7 +81,7 @@ for line in args.pr_body.splitlines():
 		continue
 		
 	# If we hit a /cl, we're no longer reading logs
-	elif line == "/🆑":
+	elif line == "/??":
 		print("Found closing /:cl: tag")
 		incltag = False