Merged dedi support into VA cleanup

Author: ultranoobian

source/support/ammobox.sqf

@@ -2,7 +2,7 @@ _target = _this select 0;
 
 _location = getpos _target;
 
-if (commandpointsblu1<2) exitWith
+if (commandpointsblu1<2) exitWith  
 {
   ["info",["Not enough command points","Not enough Command Points (2CP required)"]] call bis_fnc_showNotification;
 };
@@ -32,11 +32,12 @@ _ammo addMagazineCargo ["Chemlight_green", 70];
 
 _ammo addBackpackCargo ["B_AssaultPack_khk",10];
 
-if (support_armory_available) then {_ammo addaction ["<t color='#ff1111'>Armory (VA)</t>","bisArsenal.sqf", "", 0, true, true, "", "_this == player"]};
+if (support_armory_available) then {[[_ammo,["<t color='#ff1111'>Armory</t>","bisArsenal.sqf",[], 0, false, false, "", "_this distance _target < 4"]],"addAction",true,true] call BIS_fnc_MP;};
 
+ 
 // magazines[] = {"1Rnd_HE_Grenade_shell","UGL_FlareWhite_F","UGL_FlareGreen_F","UGL_FlareRed_F","UGL_FlareYellow_F","UGL_FlareCIR_F","1Rnd_Smoke_Grenade_shell","1Rnd_SmokeRed_Grenade_shell","1Rnd_SmokeGreen_Grenade_shell","1Rnd_SmokeYellow_Grenade_shell","1Rnd_SmokePurple_Grenade_shell","1Rnd_SmokeBlue_Grenade_shell","1Rnd_SmokeOrange_Grenade_shell","3Rnd_HE_Grenade_shell","3Rnd_UGL_FlareWhite_F","3Rnd_UGL_FlareGreen_F","3Rnd_UGL_FlareRed_F","3Rnd_UGL_FlareYellow_F","3Rnd_UGL_FlareCIR_F","3Rnd_Smoke_Grenade_shell","3Rnd_SmokeRed_Grenade_shell","3Rnd_SmokeGreen_Grenade_shell","3Rnd_SmokeYellow_Grenade_shell","3Rnd_SmokePurple_Grenade_shell","3Rnd_SmokeBlue_Grenade_shell","3Rnd_SmokeOrange_Grenade_shell"};
 
-
+                                                                          
 waitUntil {sleep 1; getpos _ammo select 2<0.2};
 _smoke = "SmokeShellGreen" CreateVehicle (getpos _ammo);
 ["info",["Supply delivered","The supply crate has been marked with green smokes"]] call bis_fnc_showNotification;

source/support/fob_ammobox.sqf

@@ -2,7 +2,7 @@ _target = _this select 0;
 
 _location = getpos _target;
 
-if (commandpointsblu1<2) exitWith
+if (commandpointsblu1<2) exitWith  
 {
   ["info",["Not enough command points","Not enough Command Points (2CP required)"]] call bis_fnc_showNotification;
 };
@@ -32,11 +32,11 @@ _ammo addMagazineCargo ["Chemlight_green", 70];
 
 _ammo addBackpackCargo ["B_AssaultPack_khk",10];
 
-if (support_armory_available) then {_ammo addaction ["<t color='#ff1111'>Armory (VA)</t>","bisArsenal.sqf", "", 0, true, true, "", "_this == player"]};
-
+if (support_armory_available) then {[[_ammo,["<t color='#ff1111'>Armory</t>","bisArsenal.sqf",[], 0, false, false, "", "_this distance _target < 4"]],"addAction",true,true] call BIS_fnc_MP;};
+ 
 // magazines[] = {"1Rnd_HE_Grenade_shell","UGL_FlareWhite_F","UGL_FlareGreen_F","UGL_FlareRed_F","UGL_FlareYellow_F","UGL_FlareCIR_F","1Rnd_Smoke_Grenade_shell","1Rnd_SmokeRed_Grenade_shell","1Rnd_SmokeGreen_Grenade_shell","1Rnd_SmokeYellow_Grenade_shell","1Rnd_SmokePurple_Grenade_shell","1Rnd_SmokeBlue_Grenade_shell","1Rnd_SmokeOrange_Grenade_shell","3Rnd_HE_Grenade_shell","3Rnd_UGL_FlareWhite_F","3Rnd_UGL_FlareGreen_F","3Rnd_UGL_FlareRed_F","3Rnd_UGL_FlareYellow_F","3Rnd_UGL_FlareCIR_F","3Rnd_Smoke_Grenade_shell","3Rnd_SmokeRed_Grenade_shell","3Rnd_SmokeGreen_Grenade_shell","3Rnd_SmokeYellow_Grenade_shell","3Rnd_SmokePurple_Grenade_shell","3Rnd_SmokeBlue_Grenade_shell","3Rnd_SmokeOrange_Grenade_shell"};
 
-
+                                                                          
 waitUntil {sleep 1; getpos _ammo select 2<0.2};
 _smoke = "SmokeShellGreen" CreateVehicle (getpos _ammo);
 ["info",["Supply delivered","The supply crate has been marked with green smokes"]] call bis_fnc_showNotification;