Merge branch 'master' of https://github.com/sfall-team/sfall

BGforgeNet · Feb 20, 2025 · 2d8f9ab · 2d8f9ab
2 parents ef0b313 + 5c847b6
commit 2d8f9ab
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/docs/Gemfile.lock b/docs/Gemfile.lock
@@ -216,15 +216,15 @@ GEM
     minitest (5.24.1)
     net-http (0.4.1)
       uri
-    nokogiri (1.16.6-x86_64-linux)
+    nokogiri (1.18.3-x86_64-linux-gnu)
       racc (~> 1.4)
     octokit (4.25.1)
       faraday (>= 1, < 3)
       sawyer (~> 0.9)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
     public_suffix (4.0.7)
-    racc (1.8.0)
+    racc (1.8.1)
     rb-fsevent (0.11.2)
     rb-inotify (0.11.1)
       ffi (~> 1.0)

diff --git a/sfall/Modules/BugFixes.cpp b/sfall/Modules/BugFixes.cpp
@@ -4341,6 +4341,9 @@ void BugFixes::init() {
 	// Fix to prevent the game from hanging when reloading a weapon overloaded with ammo via the interface bar
 	SafeWrite8(0x4787A2, 0x8D); // jz > jge (item_w_try_reload_)
 	SafeWrite8(0x45F5BD, 0x7E); // jz > jle (intface_toggle_item_state_)
+
+	// Fix for the incorrect message when attempting to repair dead robots
+	SafeWrite32(0x4AB1BE, 601); // skill_use_ (was 1101 in skill.msg)
 }
 
 }