Merge branch 'master' into shadowkin

.github/workflows/changelog.yml

@@ -1,4 +1,5 @@
 name: PR Changelogs
+concurrency: commit_action
 on:
   pull_request_target:
     types: [closed]
@@ -48,6 +49,7 @@ jobs:
 
       - name: Commit Changelog
         run: |
+          git pull origin master
           git add *.yml
           git commit -m "${{ vars.CHANGELOG_MESSAGE }} (#${{ env.PR_NUMBER }})"
           git push

README.md

@@ -18,7 +18,7 @@ We are happy to accept contributions from anybody. Get in Discord if you want to
 
 ## Building
 
-Refer to [the space wizards guide](https://docs.spacestation14.io/getting-started/dev-setup) for general information about setting up a dev environment but keep in mind that Parkstation is a distant fork of space wizards' SS14 and not everything applies. We provide some scripts for making the job easier.
+Refer to [the Space Wizards'](https://docs.spacestation14.com/en/general-development/setup/setting-up-a-development-environment.html) guide on setting up a def environment for general information, but keep in mind that Parkstation is a distant fork of space wizards' SS14 and not everything applies. We provide some scripts for making the job easier.
 
 ### Build dependencies
 

Resources/Locale/en-US/SimpleStation14/Content/RoundEndStats/slippedCountStats.ftl

@@ -1,4 +1,4 @@
-eorstats-slippedcount-totalslips = The crew slipped a {$timesSlipped} times this shift!
+eorstats-slippedcount-totalslips = The crew slipped a total of {$timesSlipped} times this shift!
 
 eorstats-slippedcount-none = The crew didn't slip at all this shift!
 

Resources/Prototypes/Maps/parkstation.yml

@@ -8,7 +8,7 @@
       stationProto: StandardNanotrasenStation
       components:
         - type: StationNameSetup
-          mapNameTemplate: '{0} Park Station {1}'
+          mapNameTemplate: '{0} Arborum {1}'
           nameGenerator:
             !type:NanotrasenNameGenerator
             prefixCreator: 'TG'