From 241d25d35f3f2c9ebf674a767841e0c7d9a5e585 Mon Sep 17 00:00:00 2001
From: EttyKitty <20323032+EttyKitty@users.noreply.github.com>
Date: Thu, 23 Jan 2025 15:16:00 +0300
Subject: [PATCH 01/23] Create gobo_format.yml

---
 .github/workflows/gobo_format.yml | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 .github/workflows/gobo_format.yml

diff --git a/.github/workflows/gobo_format.yml b/.github/workflows/gobo_format.yml
new file mode 100644
index 0000000000..b8c68f4d94
--- /dev/null
+++ b/.github/workflows/gobo_format.yml
@@ -0,0 +1,24 @@
+name: Format Code
+
+on:
+  pull_request:
+
+jobs:
+  format:
+    runs-on: ubuntu-latest  # Or 'windows-latest' if using Windows runner
+
+    steps:
+      - name: Checkout the repository
+        uses: actions/checkout@v4
+
+      - name: Download Release
+        run: |
+          curl -LO https://github.com/Pizzaandy/Gobo/releases/download/v0.4.0/gobo-ubuntu.zip
+
+      - name: Extract ZIP
+        run: |
+          unzip gobo-ubuntu.zip
+
+      - name: Run Formatter
+        run: |
+          ./gobo.exe .

From b87295a5e0906af3b7a662d3f2abb54ec70d09c4 Mon Sep 17 00:00:00 2001
From: EttyKitty <20323032+EttyKitty@users.noreply.github.com>
Date: Thu, 23 Jan 2025 15:16:54 +0300
Subject: [PATCH 02/23] Update gobo_format.yml

---
 .github/workflows/gobo_format.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/gobo_format.yml b/.github/workflows/gobo_format.yml
index b8c68f4d94..2154908ca5 100644
--- a/.github/workflows/gobo_format.yml
+++ b/.github/workflows/gobo_format.yml
@@ -22,3 +22,7 @@ jobs:
       - name: Run Formatter
         run: |
           ./gobo.exe .
+
+      - name: Check for formatting changes
+        run: |
+          git diff --exit-code || exit 1

From 7fed5b34ed9b4765912a1656fa7ebb9d575fba5f Mon Sep 17 00:00:00 2001
From: EttyKitty <20323032+EttyKitty@users.noreply.github.com>
Date: Thu, 23 Jan 2025 15:17:45 +0300
Subject: [PATCH 03/23] Update gobo_format.yml

---
 .github/workflows/gobo_format.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/gobo_format.yml b/.github/workflows/gobo_format.yml
index 2154908ca5..6ece390328 100644
--- a/.github/workflows/gobo_format.yml
+++ b/.github/workflows/gobo_format.yml
@@ -2,6 +2,9 @@ name: Format Code
 
 on:
   pull_request:
+    types:
+      - opened
+      - edited
 
 jobs:
   format:

From eb757ac70f1a0970b46637550e02aa3d5e007352 Mon Sep 17 00:00:00 2001
From: EttyKitty <20323032+EttyKitty@users.noreply.github.com>
Date: Thu, 23 Jan 2025 15:19:11 +0300
Subject: [PATCH 04/23] test

---
 fg.txt | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 fg.txt

diff --git a/fg.txt b/fg.txt
new file mode 100644
index 0000000000..e69de29bb2

From 262896246e674a1257d3eac37719493ef21be325 Mon Sep 17 00:00:00 2001
From: EttyKitty <20323032+EttyKitty@users.noreply.github.com>
Date: Thu, 23 Jan 2025 15:21:00 +0300
Subject: [PATCH 05/23] Update gobo_format.yml

---
 .github/workflows/gobo_format.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/gobo_format.yml b/.github/workflows/gobo_format.yml
index 6ece390328..6e2981e4e9 100644
--- a/.github/workflows/gobo_format.yml
+++ b/.github/workflows/gobo_format.yml
@@ -24,7 +24,7 @@ jobs:
 
       - name: Run Formatter
         run: |
-          ./gobo.exe .
+          ./gobo .
 
       - name: Check for formatting changes
         run: |

From 4d69db342d28689057843a3e00c085f5aa878a6b Mon Sep 17 00:00:00 2001
From: EttyKitty <20323032+EttyKitty@users.noreply.github.com>
Date: Thu, 23 Jan 2025 15:22:18 +0300
Subject: [PATCH 06/23] test2

---
 dd.txt | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 dd.txt

diff --git a/dd.txt b/dd.txt
new file mode 100644
index 0000000000..e69de29bb2

From 6d3798c101545724be50800d6b55df977d1ad1ff Mon Sep 17 00:00:00 2001
From: EttyKitty <20323032+EttyKitty@users.noreply.github.com>
Date: Thu, 23 Jan 2025 15:23:47 +0300
Subject: [PATCH 07/23] Update gobo_format.yml

---
 .github/workflows/gobo_format.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/gobo_format.yml b/.github/workflows/gobo_format.yml
index 6e2981e4e9..cecf2de5b0 100644
--- a/.github/workflows/gobo_format.yml
+++ b/.github/workflows/gobo_format.yml
@@ -5,6 +5,8 @@ on:
     types:
       - opened
       - edited
+      - ready_for_review
+      - synchronize
 
 jobs:
   format:

From 82cba146f51f4a8caf7fd500b461fcf25453ff97 Mon Sep 17 00:00:00 2001
From: EttyKitty <20323032+EttyKitty@users.noreply.github.com>
Date: Thu, 23 Jan 2025 15:25:51 +0300
Subject: [PATCH 08/23] Update gobo_format.yml

---
 .github/workflows/gobo_format.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/gobo_format.yml b/.github/workflows/gobo_format.yml
index cecf2de5b0..a6e17c18c0 100644
--- a/.github/workflows/gobo_format.yml
+++ b/.github/workflows/gobo_format.yml
@@ -24,6 +24,10 @@ jobs:
         run: |
           unzip gobo-ubuntu.zip
 
+      - name: Ensure executable permissions
+        run: |
+          chmod +x ./gobo
+
       - name: Run Formatter
         run: |
           ./gobo .

From da3f83e15aad4b74cf2cf28a97d2d79dfbb6cbce Mon Sep 17 00:00:00 2001
From: EttyKitty <20323032+EttyKitty@users.noreply.github.com>
Date: Thu, 23 Jan 2025 15:32:40 +0300
Subject: [PATCH 09/23] Update gobo_format.yml

---
 .github/workflows/gobo_format.yml | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/gobo_format.yml b/.github/workflows/gobo_format.yml
index a6e17c18c0..4831ecc0a6 100644
--- a/.github/workflows/gobo_format.yml
+++ b/.github/workflows/gobo_format.yml
@@ -28,9 +28,25 @@ jobs:
         run: |
           chmod +x ./gobo
 
-      - name: Run Formatter
+      - name: Get Changed Files
+        id: changed_files
         run: |
-          ./gobo .
+          changed_files=$(git diff --name-only origin/main...HEAD | grep '\.rs$' || true)
+          echo "changed_files=$changed_files" >> $GITHUB_ENV
+
+      - name: Run Formatter on Changed Files
+        run: |
+          if [ -n "$changed_files" ]; then
+            for file in $changed_files; do
+              ./gobo $file
+            done
+          else
+            echo "No Rust files changed, skipping formatting."
+          fi
+
+      - name: Clean up Gobo Files
+        run: |
+          rm -rf gobo-ubuntu.zip gobo  # Clean up Gobo files to avoid affecting the diff
 
       - name: Check for formatting changes
         run: |

From a583980bb2740f4c618f463d5b56830b1181d57b Mon Sep 17 00:00:00 2001
From: EttyKitty <20323032+EttyKitty@users.noreply.github.com>
Date: Thu, 23 Jan 2025 15:34:27 +0300
Subject: [PATCH 10/23] Update gobo_format.yml

---
 .github/workflows/gobo_format.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/gobo_format.yml b/.github/workflows/gobo_format.yml
index 4831ecc0a6..affa1d4258 100644
--- a/.github/workflows/gobo_format.yml
+++ b/.github/workflows/gobo_format.yml
@@ -41,12 +41,12 @@ jobs:
               ./gobo $file
             done
           else
-            echo "No Rust files changed, skipping formatting."
+            echo "No files changed, skipping formatting."
           fi
 
       - name: Clean up Gobo Files
         run: |
-          rm -rf gobo-ubuntu.zip gobo  # Clean up Gobo files to avoid affecting the diff
+          rm -rf gobo-ubuntu.zip gobo
 
       - name: Check for formatting changes
         run: |

From 0b34bea4f357cfa7c71545a0f143cadce3c986be Mon Sep 17 00:00:00 2001
From: EttyKitty <20323032+EttyKitty@users.noreply.github.com>
Date: Thu, 23 Jan 2025 15:35:10 +0300
Subject: [PATCH 11/23] test3

---
 dd.txt                              | 0
 fg.txt                              | 0
 scripts/scr_add_man/scr_add_man.gml | 2 +-
 3 files changed, 1 insertion(+), 1 deletion(-)
 delete mode 100644 dd.txt
 delete mode 100644 fg.txt

diff --git a/dd.txt b/dd.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/fg.txt b/fg.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/scripts/scr_add_man/scr_add_man.gml b/scripts/scr_add_man/scr_add_man.gml
index 42aa6ddb43..ddd6c8f1b3 100644
--- a/scripts/scr_add_man/scr_add_man.gml
+++ b/scripts/scr_add_man/scr_add_man.gml
@@ -50,7 +50,7 @@ function scr_add_man(man_role, target_company, spawn_exp, spawn_name, corruption
 			*/
 			/* TODO - add "serf" and the related stuff
 			case "Serf":
-				obj_ini.wep1[target_company][good] = "Bolt Pistol";
+				obj_ini.wep1[target_company][good] = "Bolt Pisto";
 				obj_ini.wep2[target_company][good] = "Combat Knife";
 				obj_ini.armour[target_company][good] = "Scout Armour";
 				obj_ini.race[target_company][good] = 1;

From 7a0ba8afb55b8290e525b1848f4c66fb95ebc026 Mon Sep 17 00:00:00 2001
From: EttyKitty <20323032+EttyKitty@users.noreply.github.com>
Date: Thu, 23 Jan 2025 15:40:22 +0300
Subject: [PATCH 12/23] Update gobo_format.yml

---
 .github/workflows/gobo_format.yml | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/gobo_format.yml b/.github/workflows/gobo_format.yml
index affa1d4258..b47ed903d4 100644
--- a/.github/workflows/gobo_format.yml
+++ b/.github/workflows/gobo_format.yml
@@ -31,14 +31,18 @@ jobs:
       - name: Get Changed Files
         id: changed_files
         run: |
+          # Get list of changed Rust files in the PR
           changed_files=$(git diff --name-only origin/main...HEAD | grep '\.rs$' || true)
-          echo "changed_files=$changed_files" >> $GITHUB_ENV
+          echo "$changed_files"  # Output to debug
+          echo "changed_files=$changed_files" >> $GITHUB_ENV  # Persist to environment variable for later steps
 
       - name: Run Formatter on Changed Files
         run: |
           if [ -n "$changed_files" ]; then
+            # Iterate over changed files
             for file in $changed_files; do
-              ./gobo $file
+              echo "Formatting $file"
+              ./gobo-linux $file  # Run formatter on each changed file
             done
           else
             echo "No files changed, skipping formatting."
@@ -50,4 +54,4 @@ jobs:
 
       - name: Check for formatting changes
         run: |
-          git diff --exit-code || exit 1
+          git diff --quiet --exit-code || exit 1

From b9173cfae77dac6fbf372046f68f01bac2ed9249 Mon Sep 17 00:00:00 2001
From: EttyKitty <20323032+EttyKitty@users.noreply.github.com>
Date: Thu, 23 Jan 2025 15:45:13 +0300
Subject: [PATCH 13/23] Update gobo_format.yml

---
 .github/workflows/gobo_format.yml | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/gobo_format.yml b/.github/workflows/gobo_format.yml
index b47ed903d4..f497f74c0f 100644
--- a/.github/workflows/gobo_format.yml
+++ b/.github/workflows/gobo_format.yml
@@ -31,18 +31,17 @@ jobs:
       - name: Get Changed Files
         id: changed_files
         run: |
-          # Get list of changed Rust files in the PR
-          changed_files=$(git diff --name-only origin/main...HEAD | grep '\.rs$' || true)
-          echo "$changed_files"  # Output to debug
-          echo "changed_files=$changed_files" >> $GITHUB_ENV  # Persist to environment variable for later steps
+          # Use PR diff base for GitHub Actions
+          changed_files=$(git diff --name-only refs/pull/${{ github.event.pull_request.number }}/merge | grep '\.rs$' || true)
+          echo "changed_files=$changed_files" >> $GITHUB_ENV
 
       - name: Run Formatter on Changed Files
         run: |
           if [ -n "$changed_files" ]; then
-            # Iterate over changed files
+            # Iterate over each file using a for loop
             for file in $changed_files; do
               echo "Formatting $file"
-              ./gobo-linux $file  # Run formatter on each changed file
+              ./gobo-linux "$file"  # Run formatter on each changed file
             done
           else
             echo "No files changed, skipping formatting."

From fef76f204a529fbd2c2917c725bc2c716a7d589f Mon Sep 17 00:00:00 2001
From: EttyKitty <20323032+EttyKitty@users.noreply.github.com>
Date: Thu, 23 Jan 2025 15:46:51 +0300
Subject: [PATCH 14/23] Update gobo_format.yml

---
 .github/workflows/gobo_format.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/gobo_format.yml b/.github/workflows/gobo_format.yml
index f497f74c0f..6f86639b39 100644
--- a/.github/workflows/gobo_format.yml
+++ b/.github/workflows/gobo_format.yml
@@ -16,6 +16,10 @@ jobs:
       - name: Checkout the repository
         uses: actions/checkout@v4
 
+      - name: Fetch
+        run: |
+          git fetch --all
+
       - name: Download Release
         run: |
           curl -LO https://github.com/Pizzaandy/Gobo/releases/download/v0.4.0/gobo-ubuntu.zip

From 1315cc5f75ee533b457d6f75ba4065db9942f5a8 Mon Sep 17 00:00:00 2001
From: EttyKitty <20323032+EttyKitty@users.noreply.github.com>
Date: Thu, 23 Jan 2025 15:53:31 +0300
Subject: [PATCH 15/23] Update gobo_format.yml

---
 .github/workflows/gobo_format.yml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/gobo_format.yml b/.github/workflows/gobo_format.yml
index 6f86639b39..2188498e32 100644
--- a/.github/workflows/gobo_format.yml
+++ b/.github/workflows/gobo_format.yml
@@ -35,8 +35,12 @@ jobs:
       - name: Get Changed Files
         id: changed_files
         run: |
-          # Use PR diff base for GitHub Actions
-          changed_files=$(git diff --name-only refs/pull/${{ github.event.pull_request.number }}/merge | grep '\.rs$' || true)
+          # Get the target branch from GitHub Actions context
+          target_branch="${{ github.event.pull_request.base.ref }}"
+          echo "Target branch is $target_branch"
+
+          # Compare the PR branch with the target branch (e.g., main)
+          changed_files=$(git diff --name-only origin/$target_branch...HEAD | grep '\.rs$' || true)
           echo "changed_files=$changed_files" >> $GITHUB_ENV
 
       - name: Run Formatter on Changed Files

From 91fac78bc55c5c1ab861a917deb8906f0bb71d3e Mon Sep 17 00:00:00 2001
From: EttyKitty <20323032+EttyKitty@users.noreply.github.com>
Date: Thu, 23 Jan 2025 15:55:23 +0300
Subject: [PATCH 16/23] Update gobo_format.yml

---
 .github/workflows/gobo_format.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/gobo_format.yml b/.github/workflows/gobo_format.yml
index 2188498e32..036d419009 100644
--- a/.github/workflows/gobo_format.yml
+++ b/.github/workflows/gobo_format.yml
@@ -40,7 +40,7 @@ jobs:
           echo "Target branch is $target_branch"
 
           # Compare the PR branch with the target branch (e.g., main)
-          changed_files=$(git diff --name-only origin/$target_branch...HEAD | grep '\.rs$' || true)
+          changed_files=$(git diff --name-only HEAD...origin/$target_branch | grep '\.rs$' || true)
           echo "changed_files=$changed_files" >> $GITHUB_ENV
 
       - name: Run Formatter on Changed Files

From a7257077ab73165b8ddb16026b98641e2d24c458 Mon Sep 17 00:00:00 2001
From: EttyKitty <20323032+EttyKitty@users.noreply.github.com>
Date: Thu, 23 Jan 2025 15:57:06 +0300
Subject: [PATCH 17/23] Update gobo_format.yml

---
 .github/workflows/gobo_format.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/gobo_format.yml b/.github/workflows/gobo_format.yml
index 036d419009..b4dbb9a5ff 100644
--- a/.github/workflows/gobo_format.yml
+++ b/.github/workflows/gobo_format.yml
@@ -40,7 +40,7 @@ jobs:
           echo "Target branch is $target_branch"
 
           # Compare the PR branch with the target branch (e.g., main)
-          changed_files=$(git diff --name-only HEAD...origin/$target_branch | grep '\.rs$' || true)
+          changed_files=$(git diff --name-only HEAD..origin/$target_branch | grep '\.rs$' || true)
           echo "changed_files=$changed_files" >> $GITHUB_ENV
 
       - name: Run Formatter on Changed Files

From 24dcc951b393af78580acdd887570401a47c2cb6 Mon Sep 17 00:00:00 2001
From: EttyKitty <20323032+EttyKitty@users.noreply.github.com>
Date: Thu, 23 Jan 2025 16:00:22 +0300
Subject: [PATCH 18/23] Update gobo_format.yml

---
 .github/workflows/gobo_format.yml | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/gobo_format.yml b/.github/workflows/gobo_format.yml
index b4dbb9a5ff..8b66c2041e 100644
--- a/.github/workflows/gobo_format.yml
+++ b/.github/workflows/gobo_format.yml
@@ -16,10 +16,6 @@ jobs:
       - name: Checkout the repository
         uses: actions/checkout@v4
 
-      - name: Fetch
-        run: |
-          git fetch --all
-
       - name: Download Release
         run: |
           curl -LO https://github.com/Pizzaandy/Gobo/releases/download/v0.4.0/gobo-ubuntu.zip
@@ -37,10 +33,16 @@ jobs:
         run: |
           # Get the target branch from GitHub Actions context
           target_branch="${{ github.event.pull_request.base.ref }}"
+          pr_branch="${{ github.event.pull_request.head.ref }}"
           echo "Target branch is $target_branch"
+          echo "PR branch is $pr_branch"
+
+          # Fetch the latest state of both the base and head branches
+          git fetch origin $target_branch:$target_branch
+          git fetch origin $pr_branch:$pr_branch
 
-          # Compare the PR branch with the target branch (e.g., main)
-          changed_files=$(git diff --name-only HEAD..origin/$target_branch | grep '\.rs$' || true)
+          # Get the changed files between the PR branch and the target branch
+          changed_files=$(git diff --name-only origin/$target_branch..origin/$pr_branch | grep '\.rs$' || true)
           echo "changed_files=$changed_files" >> $GITHUB_ENV
 
       - name: Run Formatter on Changed Files

From f40b197a39ccc8c6e7672a57c7358c8f83b6e25c Mon Sep 17 00:00:00 2001
From: EttyKitty <20323032+EttyKitty@users.noreply.github.com>
Date: Thu, 23 Jan 2025 16:02:14 +0300
Subject: [PATCH 19/23] Update gobo_format.yml

---
 .github/workflows/gobo_format.yml | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/gobo_format.yml b/.github/workflows/gobo_format.yml
index 8b66c2041e..31fea40ec8 100644
--- a/.github/workflows/gobo_format.yml
+++ b/.github/workflows/gobo_format.yml
@@ -31,20 +31,23 @@ jobs:
       - name: Get Changed Files
         id: changed_files
         run: |
-          # Get the target branch from GitHub Actions context
           target_branch="${{ github.event.pull_request.base.ref }}"
           pr_branch="${{ github.event.pull_request.head.ref }}"
           echo "Target branch is $target_branch"
           echo "PR branch is $pr_branch"
 
-          # Fetch the latest state of both the base and head branches
+          # Fetch the base branch and PR branch commit refs
           git fetch origin $target_branch:$target_branch
           git fetch origin $pr_branch:$pr_branch
 
-          # Get the changed files between the PR branch and the target branch
-          changed_files=$(git diff --name-only origin/$target_branch..origin/$pr_branch | grep '\.rs$' || true)
+          # Now compare with the correct commit hash
+          git diff --name-only origin/$target_branch...origin/$pr_branch | grep '\.rs$' || true
+
+          # Store the result of the diff in the environment variable
+          changed_files=$(git diff --name-only origin/$target_branch...origin/$pr_branch | grep '\.rs$' || true)
           echo "changed_files=$changed_files" >> $GITHUB_ENV
 
+
       - name: Run Formatter on Changed Files
         run: |
           if [ -n "$changed_files" ]; then

From 02ca971bccf5d942d22154ddf4ce94afc219512e Mon Sep 17 00:00:00 2001
From: EttyKitty <20323032+EttyKitty@users.noreply.github.com>
Date: Thu, 23 Jan 2025 16:06:30 +0300
Subject: [PATCH 20/23] Update gobo_format.yml

---
 .github/workflows/gobo_format.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/gobo_format.yml b/.github/workflows/gobo_format.yml
index 31fea40ec8..c137960ab7 100644
--- a/.github/workflows/gobo_format.yml
+++ b/.github/workflows/gobo_format.yml
@@ -46,6 +46,9 @@ jobs:
           # Store the result of the diff in the environment variable
           changed_files=$(git diff --name-only origin/$target_branch...origin/$pr_branch | grep '\.rs$' || true)
           echo "changed_files=$changed_files" >> $GITHUB_ENV
+          
+          # Echo the contents of the changed_files variable
+          echo "Changed files: $changed_files"
 
 
       - name: Run Formatter on Changed Files

From 8d763bd4a40663989348cdef72763725d8bfff8c Mon Sep 17 00:00:00 2001
From: EttyKitty <20323032+EttyKitty@users.noreply.github.com>
Date: Mon, 17 Feb 2025 08:03:47 +0300
Subject: [PATCH 21/23] Update gobo_format.yml

---
 .github/workflows/gobo_format.yml | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/gobo_format.yml b/.github/workflows/gobo_format.yml
index c137960ab7..2ff997814a 100644
--- a/.github/workflows/gobo_format.yml
+++ b/.github/workflows/gobo_format.yml
@@ -40,11 +40,8 @@ jobs:
           git fetch origin $target_branch:$target_branch
           git fetch origin $pr_branch:$pr_branch
 
-          # Now compare with the correct commit hash
-          git diff --name-only origin/$target_branch...origin/$pr_branch | grep '\.rs$' || true
-
           # Store the result of the diff in the environment variable
-          changed_files=$(git diff --name-only origin/$target_branch...origin/$pr_branch | grep '\.rs$' || true)
+          changed_files=$(git diff --name-only origin/$target_branch...origin/$pr_branch)
           echo "changed_files=$changed_files" >> $GITHUB_ENV
           
           # Echo the contents of the changed_files variable
@@ -57,7 +54,7 @@ jobs:
             # Iterate over each file using a for loop
             for file in $changed_files; do
               echo "Formatting $file"
-              ./gobo-linux "$file"  # Run formatter on each changed file
+              ./gobo "$file"  # Run formatter on each changed file
             done
           else
             echo "No files changed, skipping formatting."

From 1998683d123ed66c60d1376b499d9f8188c47afb Mon Sep 17 00:00:00 2001
From: EttyKitty <20323032+EttyKitty@users.noreply.github.com>
Date: Mon, 17 Feb 2025 08:10:15 +0300
Subject: [PATCH 22/23] Discard changes to scripts/scr_add_man/scr_add_man.gml

---
 scripts/scr_add_man/scr_add_man.gml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/scr_add_man/scr_add_man.gml b/scripts/scr_add_man/scr_add_man.gml
index ddd6c8f1b3..42aa6ddb43 100644
--- a/scripts/scr_add_man/scr_add_man.gml
+++ b/scripts/scr_add_man/scr_add_man.gml
@@ -50,7 +50,7 @@ function scr_add_man(man_role, target_company, spawn_exp, spawn_name, corruption
 			*/
 			/* TODO - add "serf" and the related stuff
 			case "Serf":
-				obj_ini.wep1[target_company][good] = "Bolt Pisto";
+				obj_ini.wep1[target_company][good] = "Bolt Pistol";
 				obj_ini.wep2[target_company][good] = "Combat Knife";
 				obj_ini.armour[target_company][good] = "Scout Armour";
 				obj_ini.race[target_company][good] = 1;

From 259997b5a5a6f3156a159ddd25eb57b598766adb Mon Sep 17 00:00:00 2001
From: EttyKitty <20323032+EttyKitty@users.noreply.github.com>
Date: Mon, 17 Feb 2025 08:28:08 +0300
Subject: [PATCH 23/23] Update gobo_format.yml

---
 .github/workflows/gobo_format.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/workflows/gobo_format.yml b/.github/workflows/gobo_format.yml
index 2ff997814a..535e1418d3 100644
--- a/.github/workflows/gobo_format.yml
+++ b/.github/workflows/gobo_format.yml
@@ -45,8 +45,6 @@ jobs:
           echo "changed_files=$changed_files" >> $GITHUB_ENV
           
           # Echo the contents of the changed_files variable
-          echo "Changed files: $changed_files"
-
 
       - name: Run Formatter on Changed Files
         run: |