From 571e28b60f8455e111b4ab251fd59e46f32c9c38 Mon Sep 17 00:00:00 2001 From: Fansana Date: Sun, 3 Nov 2024 14:53:12 +0100 Subject: [PATCH 1/2] update changelog --- .github/workflows/changelog.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml index 85c70a52d7d..990e294e0e6 100644 --- a/.github/workflows/changelog.yml +++ b/.github/workflows/changelog.yml @@ -47,7 +47,7 @@ jobs: - name: Commit Changelog run: | - git pull origin master + git pull origin ${{ vars.CHANGELOG_BRANCH }} git add *.yml git commit -m "${{ vars.CHANGELOG_MESSAGE }} (#${{ env.PR_NUMBER }})" git push From 6638b6b16701a5ee046f5ded360a6aa81ccf26e5 Mon Sep 17 00:00:00 2001 From: FoxxoTrystan <45297731+FoxxoTrystan@users.noreply.github.com> Date: Mon, 4 Nov 2024 17:16:16 +0100 Subject: [PATCH 2/2] Update psionicPowers.yml --- Resources/Prototypes/Nyanotrasen/psionicPowers.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Nyanotrasen/psionicPowers.yml b/Resources/Prototypes/Nyanotrasen/psionicPowers.yml index 5c34bf99d90..56c7721b9c6 100644 --- a/Resources/Prototypes/Nyanotrasen/psionicPowers.yml +++ b/Resources/Prototypes/Nyanotrasen/psionicPowers.yml @@ -15,4 +15,4 @@ RevivifyPower: 0.1 ShadeskipPower: 0.15 TelekineticPulsePower: 0.15 - HypnosisPower: 0.15 # Floofstation +# HypnosisPower: 0.15 # Floofstation