mirror of
https://github.com/acemod/ACE3.git
synced 2024-08-30 18:23:18 +00:00
Merge branch 'master' into release-3.17
This commit is contained in:
commit
c8eebf461b
@ -168,7 +168,7 @@ private _action = [
|
|||||||
// action display name will be overwritten in modifier function
|
// action display name will be overwritten in modifier function
|
||||||
QGVAR(takeWeapon), "take", "\A3\ui_f\data\igui\cfg\actions\take_ca.paa",
|
QGVAR(takeWeapon), "take", "\A3\ui_f\data\igui\cfg\actions\take_ca.paa",
|
||||||
{_player action ["TakeWeapon", _target, weaponCargo _target select 0]},
|
{_player action ["TakeWeapon", _target, weaponCargo _target select 0]},
|
||||||
{count weaponCargo _target == 1},
|
{(count weaponCargo _target == 1) && {[_player, objNull, []] call EFUNC(common,canInteractWith)}}, // Not checking if container is claimed
|
||||||
nil, nil, nil, nil, nil,
|
nil, nil, nil, nil, nil,
|
||||||
{
|
{
|
||||||
params ["_target", "", "", "_actionData"];
|
params ["_target", "", "", "_actionData"];
|
||||||
|
Loading…
Reference in New Issue
Block a user