diff --git a/gamedir/Data-1.13/Ja2_Options.INI b/gamedir/Data-1.13/Ja2_Options.INI index 316a07c87..b249c62ef 100644 --- a/gamedir/Data-1.13/Ja2_Options.INI +++ b/gamedir/Data-1.13/Ja2_Options.INI @@ -1207,6 +1207,13 @@ USE_SCOPE_MODES = TRUE ; Allow display of scope modes on weapon DISPLAY_SCOPE_MODES = TRUE +;------------------------------------------------------------------------------------------------------------------------------ +; external feeding +;------------------------------------------------------------------------------------------------------------------------------ + +; determines wether we can allow to feed guns externally. 0 = no external feeding 1= only fro other mercs 2 = from other mercs and dedicated slots from ourself +EXTERNAL_FEEDING = 2 + ;------------------------------------------------------------------------------------------------------------------------------ ; Set the grid number for the initial merc arrival location. ; The JA2 default grid number is 4870 (Sector A9 Omerta). diff --git a/gamedir/Data-1.13/TableData/Items.xml b/gamedir/Data-1.13/TableData/Items.xml index f0504e216..92911ec42 100644 --- a/gamedir/Data-1.13/TableData/Items.xml +++ b/gamedir/Data-1.13/TableData/Items.xml @@ -3789,6 +3789,7 @@ 1 1 100.0 + 256 @@ -3813,6 +3814,7 @@ 1 1 100.0 + 256 @@ -13185,6 +13187,7 @@ 1 1 100.0 + 256 @@ -13212,6 +13215,7 @@ 2 6 100.0 + 256 @@ -13237,6 +13241,7 @@ 120 10 100.0 + 256 @@ -13262,6 +13267,7 @@ 40 -20 100.0 + 256 @@ -13287,6 +13293,7 @@ 40 -20 100.0 + 256 @@ -18464,6 +18471,7 @@ 950 209 100.0 + 128 @@ -32776,6 +32784,7 @@ 1000 209 100.0 + 128 @@ -37113,6 +37122,7 @@ 1 5 100.0 + 512