Skip to content

Commit f112866

Browse files
committed
Merge branch 'development-ArsenalCleanUp' into development-dedicatedTesting
2 parents 42bb99b + 35116f4 commit f112866

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+14
-5511
lines changed

source/INIT.sqf

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,9 @@ if (isMultiplayer) then {
2727
_revive_activated = paramsArray select 0; // Revives, true or false
2828
DUWSMP_CP_death_cost = paramsArray select 1;
2929
if (support_armory_available) then {
30-
hq_blu1 addaction ["<t color='#ff0066'>Armory 1 (VAS)</t>","VAS\open.sqf", "", 0, true, true, "", "_this == player"];
31-
hq_blu1 addaction ["<t color='#ff0066'>Armory 2 (VA)</t>","bisArsenal.sqf", "", 0, true, true, "", "_this == player"];
30+
hq_blu1 addaction ["<t color='#ff0066'>Armory (VA)</t>","bisArsenal.sqf", "", 0, true, true, "", "_this == player"];
3231
{
33-
_x addaction ["<t color='#ff0066'>Armory 1 (VAS)</t>","VAS\open.sqf", "", 0, true, true, "", "_this == player"];
34-
_x addaction ["<t color='#ff0066'>Armory 2 (VA)</t>","bisArsenal.sqf", "", 0, true, true, "", "_this == player"];
32+
_x addaction ["<t color='#ff0066'>Armory (VA)</t>","bisArsenal.sqf", "", 0, true, true, "", "_this == player"];
3533
} forEach (Array_of_FOBS);
3634
};
3735

source/VAS/cfgfunctions.hpp

Lines changed: 0 additions & 48 deletions
This file was deleted.

0 commit comments

Comments
 (0)