Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into release-3.13.4

Browse Source
This commit is contained in:
PabstMirror 2020-08-30 21:57:02 -05:00
commit 530b24e893
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.github/ISSUE_TEMPLATE/config.yml vendored Normal file
View File

@ -0,0 +1 @@
blank_issues_enabled: false

4
addons/arsenal/functions/fnc_sortPanel.sqf
View File

@ -33,8 +33,8 @@ if (_rightSort) then {
case IDC_buttonThrow;
case IDC_buttonPut;
case IDC_buttonMag;
case IDC_buttonMagALL: { "CfgMagazines" };
default { "CfgWeapons" };
case IDC_buttonMagALL: { configFile >> "CfgMagazines" };
default { configFile >> "CfgWeapons" };
},
GVAR(sortListRightPanel) select (
switch (GVAR(currentRightPanel)) do {

2
addons/medical_treatment/CfgVehicles.hpp
View File

@ -267,6 +267,8 @@ class CfgVehicles {
MACRO_ADDITEM(ACE_bloodIV,15);
MACRO_ADDITEM(ACE_bloodIV_500,15);
MACRO_ADDITEM(ACE_bloodIV_250,15);
MACRO_ADDITEM(ACE_tourniquet,10);
MACRO_ADDITEM(ACE_splint,10);
MACRO_ADDITEM(ACE_bodyBag,10);
};
class AnimationSources {