Skip to content

Commit 2d8f9ab

Browse files
committed
Merge branch 'master' of https://github.com/sfall-team/sfall
2 parents ef0b313 + 5c847b6 commit 2d8f9ab

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

docs/Gemfile.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -216,15 +216,15 @@ GEM
216216
minitest (5.24.1)
217217
net-http (0.4.1)
218218
uri
219-
nokogiri (1.16.6-x86_64-linux)
219+
nokogiri (1.18.3-x86_64-linux-gnu)
220220
racc (~> 1.4)
221221
octokit (4.25.1)
222222
faraday (>= 1, < 3)
223223
sawyer (~> 0.9)
224224
pathutil (0.16.2)
225225
forwardable-extended (~> 2.6)
226226
public_suffix (4.0.7)
227-
racc (1.8.0)
227+
racc (1.8.1)
228228
rb-fsevent (0.11.2)
229229
rb-inotify (0.11.1)
230230
ffi (~> 1.0)

sfall/Modules/BugFixes.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4341,6 +4341,9 @@ void BugFixes::init() {
43414341
// Fix to prevent the game from hanging when reloading a weapon overloaded with ammo via the interface bar
43424342
SafeWrite8(0x4787A2, 0x8D); // jz > jge (item_w_try_reload_)
43434343
SafeWrite8(0x45F5BD, 0x7E); // jz > jle (intface_toggle_item_state_)
4344+
4345+
// Fix for the incorrect message when attempting to repair dead robots
4346+
SafeWrite32(0x4AB1BE, 601); // skill_use_ (was 1101 in skill.msg)
43444347
}
43454348

43464349
}

0 commit comments

Comments
 (0)