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 'release'

Browse Source
This commit is contained in:
PabstMirror
2016-03-12 13:47:57 -06:00
parent 7c2977ed47 1ffd23c193
commit e96c1a7dc6
3 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
addons/common/XEH_postInit.sqf
View File

@ -444,6 +444,11 @@ if (!isNil QGVAR(PreInit_playerChanged_PFHID)) then {
// Add various canInteractWith conditions // Add various canInteractWith conditions
////////////////////////////////////////////////// //////////////////////////////////////////////////
["isNotDead", {
params ["_unit", "_target"];
alive _unit
}] call FUNC(addCanInteractWithCondition);
["notOnMap", {!visibleMap}] call FUNC(addCanInteractWithCondition); ["notOnMap", {!visibleMap}] call FUNC(addCanInteractWithCondition);
["isNotInside", { ["isNotInside", {

2
addons/main/config.cpp
View File

@ -594,7 +594,7 @@ class CfgSettings {
class Versioning { class Versioning {
class ACE { class ACE {
class dependencies { class dependencies {
CBA[] = {"cba_main", REQUIRED_CBA_VERSION, "true"}; CBA[] = {"cba_main", REQUIRED_CBA_VERSION, "(true)"};
}; };
}; };
}; };

2
addons/medical/ACE_Medical_Treatments.hpp
View File

@ -1366,7 +1366,7 @@ class ACE_Medical_Advanced {
timeInSystem = 900; timeInSystem = 900;
maxDose = 4; maxDose = 4;
inCompatableMedication[] = {}; inCompatableMedication[] = {};
viscosityChange = 10; viscosityChange = -10;
}; };
class Epinephrine { class Epinephrine {
painReduce = 0; painReduce = 0;