diff --git a/addons/cargo/functions/fnc_canLoad.sqf b/addons/cargo/functions/fnc_canLoad.sqf
index da41d93358..f5d1304a95 100644
--- a/addons/cargo/functions/fnc_canLoad.sqf
+++ b/addons/cargo/functions/fnc_canLoad.sqf
@@ -18,6 +18,8 @@
params ["_player", "_object"];
+if (!([_player, _object, []] call EFUNC(common,canInteractWith))) exitWith {false};
+
private ["_nearestVehicle"];
_nearestVehicle = [_player] call FUNC(findNearestVehicle);
diff --git a/addons/cargo/functions/fnc_initVehicle.sqf b/addons/cargo/functions/fnc_initVehicle.sqf
index 06f8fbcbbc..b817688336 100644
--- a/addons/cargo/functions/fnc_initVehicle.sqf
+++ b/addons/cargo/functions/fnc_initVehicle.sqf
@@ -39,7 +39,10 @@ SETMVAR(GVAR(initializedClasses),_initializedClasses);
if (getNumber (configFile >> "CfgVehicles" >> _type >> QGVAR(hasCargo)) != 1) exitWith {};
private ["_text", "_condition", "_statement", "_icon", "_action"];
-_condition = {GVAR(enable)};
+_condition = {
+ params ["_target", "_player"];
+ GVAR(enable) && {[_player, _target, []] call EFUNC(common,canInteractWith)}
+};
_text = localize LSTRING(openMenu);
_statement = {GVAR(interactionVehicle) = _target; createDialog QGVAR(menu);};
_icon = "";
diff --git a/addons/common/XEH_postInit.sqf b/addons/common/XEH_postInit.sqf
index 00831b60f5..4188950736 100644
--- a/addons/common/XEH_postInit.sqf
+++ b/addons/common/XEH_postInit.sqf
@@ -327,7 +327,7 @@ GVAR(OldIsCamera) = false;
// Lastly, do JIP events
// JIP Detection and event trigger. Run this at the very end, just in case anything uses it
-if(isMultiplayer && { ACE_time > 0 || isNull player } ) then {
+if (didJip) then {
// We are jipping! Get ready and wait, and throw the event
[{
if(!(isNull player)) then {
diff --git a/addons/concertina_wire/CfgVehicles.hpp b/addons/concertina_wire/CfgVehicles.hpp
index d0514aa700..81304da853 100644
--- a/addons/concertina_wire/CfgVehicles.hpp
+++ b/addons/concertina_wire/CfgVehicles.hpp
@@ -74,6 +74,7 @@ class CfgVehicles {
scope = 2;
displayName = $STR_ACE_CONCERTINA_WIRE;
model = PATHTOF(data\ACE_ConcertinaWire.p3d);
+ EGVAR(logistics_wirecutter,isFence) = 1;
class ACE_Actions {
class ACE_MainActions {
selection = "";
diff --git a/addons/hearing/ACE_Settings.hpp b/addons/hearing/ACE_Settings.hpp
index 867914b857..262c3edc34 100644
--- a/addons/hearing/ACE_Settings.hpp
+++ b/addons/hearing/ACE_Settings.hpp
@@ -19,4 +19,10 @@ class ACE_Settings {
isClientSettable = 1;
displayName = CSTRING(DisableEarRinging);
};
+ class GVAR(enabledForZeusUnits) {
+ value = 1;
+ typeName = "BOOL";
+ displayName = CSTRING(enabledForZeusUnits_DisplayName);
+ description = CSTRING(enabledForZeusUnits_Description);
+ };
};
diff --git a/addons/hearing/CfgVehicles.hpp b/addons/hearing/CfgVehicles.hpp
index 44ea8f734f..2273653c3a 100644
--- a/addons/hearing/CfgVehicles.hpp
+++ b/addons/hearing/CfgVehicles.hpp
@@ -130,6 +130,12 @@ class CfgVehicles {
};
};
};
+ class enabledForZeusUnits {
+ displayName = CSTRING(enabledForZeusUnits_DisplayName);
+ description = CSTRING(enabledForZeusUnits_Description);
+ typeName = "BOOL";
+ defaultValue = 1;
+ };
};
class ModuleDescription {
description = CSTRING(Module_Description);
diff --git a/addons/hearing/CfgWeapons.hpp b/addons/hearing/CfgWeapons.hpp
index 2806ef9970..7c21baaed2 100644
--- a/addons/hearing/CfgWeapons.hpp
+++ b/addons/hearing/CfgWeapons.hpp
@@ -47,5 +47,16 @@ class CfgWeapons {
GVAR(lowerVolume) = 0.60;
};
class H_Cap_marshal: H_Cap_headphones {};
-};
+ class H_HelmetB_light: H_HelmetB {
+ GVAR(protection) = 0.8;
+ GVAR(lowerVolume) = 0.20;
+ };
+
+ class H_HelmetB_plain_mcamo;
+ class H_HelmetSpecB: H_HelmetB_plain_mcamo {
+ GVAR(protection) = 0.8;
+ GVAR(lowerVolume) = 0.20;
+ };
+
+};
diff --git a/addons/hearing/functions/fnc_earRinging.sqf b/addons/hearing/functions/fnc_earRinging.sqf
index 6a896c1820..de70c4f860 100644
--- a/addons/hearing/functions/fnc_earRinging.sqf
+++ b/addons/hearing/functions/fnc_earRinging.sqf
@@ -21,6 +21,7 @@ PARAMS_2(_unit,_strength);
if (_unit != ACE_player) exitWith {};
if (_strength < 0.05) exitWith {};
if (!isNull curatorCamera) exitWith {};
+if ((!GVAR(enabledForZeusUnits)) && {player != ACE_player}) exitWith {};
if (_unit getVariable ["ACE_hasEarPlugsin", false]) then {
_strength = _strength / 4;
diff --git a/addons/hearing/functions/fnc_moduleHearing.sqf b/addons/hearing/functions/fnc_moduleHearing.sqf
index 0c720ba278..b7213cec3a 100644
--- a/addons/hearing/functions/fnc_moduleHearing.sqf
+++ b/addons/hearing/functions/fnc_moduleHearing.sqf
@@ -21,4 +21,5 @@ if ((_logic getVariable "DisableEarRinging") != -1) then {
[_logic, QGVAR(DisableEarRinging), "DisableEarRinging"] call EFUNC(common,readSettingFromModule);
};
+[_logic, QGVAR(enabledForZeusUnits), "enabledForZeusUnits"] call EFUNC(common,readSettingFromModule);
ACE_LOGINFO("Hearing Module Initialized.");
diff --git a/addons/hearing/stringtable.xml b/addons/hearing/stringtable.xml
index a3af102580..403434cf4f 100644
--- a/addons/hearing/stringtable.xml
+++ b/addons/hearing/stringtable.xml
@@ -118,7 +118,7 @@
Audição
- Enable combat deafness?
+ Combat Deafness
Wł. głuchotę bojową
¿Habilitar sordera de combate?
Aktiviere Taubheit im Gefecht?
@@ -140,5 +140,11 @@
Ztráta sluchu je možná ve chvíly, kdy se v bezprostřední blízkosti střílí z velkorážní zbraně nebo při bombardování a osoba je bez ochrany sluchu (např. špunty). Tento modul umožňuje tuto věc povolit nebo zakázat.
Este módulo ativa / desativa surdez em combate. Quando ativado, os jogadores podem ficar surdos quando uma arma é disparada ao seu redor ou uma explosão ocorre sem proteção auditiva.
+
+ Effect Zeus RC
+
+
+ Allow zeus remote controlled units to be able to take hearing damage.
+
\ No newline at end of file
diff --git a/addons/huntir/functions/fnc_cam.sqf b/addons/huntir/functions/fnc_cam.sqf
index bcc553fff0..9eb22b9fb5 100644
--- a/addons/huntir/functions/fnc_cam.sqf
+++ b/addons/huntir/functions/fnc_cam.sqf
@@ -7,13 +7,13 @@
* 0: HuntIR