Skip to content

Commit

Permalink
Merge branch '2.4_Lite' into bgforge-rpu-24
Browse files Browse the repository at this point in the history
  • Loading branch information
NovaRain committed Jan 14, 2025
2 parents ef36e7a + ffb6130 commit f537785
Show file tree
Hide file tree
Showing 52 changed files with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion scripts_src/epa/epai17.ssl
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ end
* Fixes the terminal if `skill_level >= MIN_REPAIR_LEVEL`
*/
procedure repair_self(variable skill_level) begin
script_overrides;
if (skill_level >= MIN_REPAIR_LEVEL) then begin
if (local_var(LVAR_Problem) == 1) then begin
set_global_var(GVAR_MAGNETIC_FIELD, 1);
Expand Down Expand Up @@ -71,7 +72,6 @@ procedure use_obj_on_p_proc begin
variable bonus = 0;
if (tool == PID_MULTI_TOOL) then bonus = 20;
if (tool == PID_SUPER_TOOL_KIT) then bonus = 40;
script_overrides;
call repair_self(skill + bonus);
end
end
Expand Down
Binary file modified translations/czech/art/intrface/barter.frm
Binary file not shown.
Binary file added translations/czech/art/intrface/barter_e.frm
Binary file not shown.
Binary file added translations/czech/art/intrface/invbox_e.frm
Binary file not shown.
Binary file added translations/czech/art/intrface/loot_e.frm
Binary file not shown.
Binary file added translations/czech/art/intrface/trade_e.frm
Binary file not shown.
Binary file added translations/czech/art/intrface/use_e.frm
Binary file not shown.
Binary file modified translations/czech/art/intrface/wmapbox.frm
Binary file not shown.
Binary file modified translations/czech/art/intrface/wminfce2.frm
Binary file not shown.
Binary file added translations/czech/art/intrface/worldmap.frm
Binary file not shown.
Binary file added translations/french/art/intrface/barter_e.frm
Binary file not shown.
Binary file modified translations/french/art/intrface/chadn.frm
Binary file not shown.
Binary file modified translations/french/art/intrface/chaup.frm
Binary file not shown.
Binary file modified translations/french/art/intrface/hr_iface_800.frm
Binary file not shown.
Binary file modified translations/french/art/intrface/iface.frm
Binary file not shown.
Binary file added translations/french/art/intrface/invbox_e.frm
Binary file not shown.
Binary file removed translations/french/art/intrface/invbutdn.frm
Binary file not shown.
Binary file removed translations/french/art/intrface/invbutup.frm
Binary file not shown.
Binary file added translations/french/art/intrface/loot_e.frm
Binary file not shown.
Binary file modified translations/french/art/intrface/mapdn.frm
Binary file not shown.
Binary file modified translations/french/art/intrface/mapup.frm
Binary file not shown.
Binary file removed translations/french/art/intrface/optidn.frm
Binary file not shown.
Binary file removed translations/french/art/intrface/optiup.frm
Binary file not shown.
Binary file added translations/french/art/intrface/trade_e.frm
Binary file not shown.
Binary file added translations/french/art/intrface/use_e.frm
Binary file not shown.
Binary file added translations/french/art/intrface/worldmap.frm
Binary file not shown.
Binary file added translations/german/art/intrface/barter_e.frm
Binary file not shown.
Binary file added translations/german/art/intrface/invbox_e.frm
Binary file not shown.
Binary file added translations/german/art/intrface/loot_e.frm
Binary file not shown.
Binary file added translations/german/art/intrface/trade_e.frm
Binary file not shown.
Binary file added translations/german/art/intrface/use_e.frm
Binary file not shown.
Binary file added translations/german/art/intrface/worldmap.frm
Binary file not shown.
Binary file modified translations/italian/art/intrface/barter.frm
Binary file not shown.
Binary file added translations/italian/art/intrface/barter_e.frm
Binary file not shown.
Binary file added translations/italian/art/intrface/invbox_e.frm
Binary file not shown.
Binary file added translations/italian/art/intrface/loot_e.frm
Binary file not shown.
Binary file modified translations/italian/art/intrface/trade.frm
Binary file not shown.
Binary file added translations/italian/art/intrface/trade_e.frm
Binary file not shown.
Binary file added translations/italian/art/intrface/worldmap.frm
Binary file not shown.
Binary file added translations/russian/art/intrface/barter_e.frm
Binary file not shown.
Binary file added translations/russian/art/intrface/invbox_e.frm
Binary file not shown.
Binary file added translations/russian/art/intrface/loot_e.frm
Binary file not shown.
Binary file added translations/russian/art/intrface/trade_e.frm
Binary file not shown.
Binary file added translations/russian/art/intrface/use_e.frm
Binary file not shown.
Binary file added translations/russian/art/intrface/worldmap.frm
Binary file not shown.
Binary file added translations/spanish/art/intrface/barter_e.frm
Binary file not shown.
Binary file added translations/spanish/art/intrface/invbox_e.frm
Binary file not shown.
Binary file added translations/spanish/art/intrface/loot_e.frm
Binary file not shown.
Binary file added translations/spanish/art/intrface/trade_e.frm
Binary file not shown.
Binary file added translations/spanish/art/intrface/use.frm
Binary file not shown.
Binary file added translations/spanish/art/intrface/use_e.frm
Binary file not shown.
Binary file added translations/spanish/art/intrface/worldmap.frm
Binary file not shown.

0 comments on commit f537785

Please sign in to comment.