Merge branch 'master' into release-3.17

This commit is contained in:
jonpas 2024-04-01 15:48:07 +02:00
commit c8eebf461b

View File

@ -168,7 +168,7 @@ private _action = [
// action display name will be overwritten in modifier function
QGVAR(takeWeapon), "take", "\A3\ui_f\data\igui\cfg\actions\take_ca.paa",
{_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,
{
params ["_target", "", "", "_actionData"];