Skip to content

Breathing - Add new option for make every goggle act as oxygen mask and Add compatibility #779

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Apricot-ale wants to merge 3 commits into
base: dev-Tomcat
Choose a base branch
from
Open

Breathing - Add new option for make every goggle act as oxygen mask and Add compatibility #779

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0ff8dda
Add new option - make any goggle to oxy mask
Apricot-ale Jun 21, 2025
ff62db5
Merge branch 'KAT-Advanced-Medical:dev-Tomcat' into add-make-everythi…
Apricot-ale Jul 15, 2025
74a65b1
Add Helmets compat
Apricot-ale Jul 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion addons/breathing/functions/fnc_checkOxygenMask.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

params ["_patient"];

if ((goggles _patient in (missionNamespace getVariable [QGVAR(availOxyMaskList), []])) || (headgear _patient in (missionNamespace getVariable [QGVAR(availOxyHelmetList), []]))) exitWith {
if (GVAR(enableEverythingOxymask) || (goggles _patient in (missionNamespace getVariable [QGVAR(availOxyMaskList), []])) || (headgear _patient in (missionNamespace getVariable [QGVAR(availOxyHelmetList), []]))) exitWith {
true
};

Expand Down
12 changes: 11 additions & 1 deletion addons/breathing/initSettings.inc.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"EDITBOX",
[LLSTRING(SETTING_AVAIL_OXYHELMET), LLSTRING(SETTING_AVAIL_OXYHELMET_DISC)],
[CBA_SETTINGS_CAT, ELSTRING(GUI,SubCategory_Basic)],
"'H_PilotHelmetFighter_B', 'H_PilotHelmetFighter_O', 'H_PilotHelmetFighter_I', 'H_PilotHelmetFighter_I_E'",
"'H_PilotHelmetFighter_B', 'H_PilotHelmetFighter_O', 'H_PilotHelmetFighter_I', 'H_PilotHelmetFighter_I_E', 'FIR_JHMCS', 'FIR_JHMCS_II', 'FIR_JHMCS_Type2', 'FIR_ScorpionHMCS', 'FIR_hgu26p', 'FIR_hgu26p_camo', 'FIR_HGU33P', 'FIR_HGU33P_VF1', 'FIR_HGU33P_VF111', 'FIR_HGU33P_VF84', 'FIR_USHelmetType2', 'FIR_USHelmetType2_USMC', 'FIR_USHelmetType2_Navy', 'FIR_USHelmetType2_USAF_80s', 'FIR_USHelmetType2_VF103', 'FIR_USHelmetType2_VF154', 'FIR_USHelmetType1', 'FIR_USHelmetType1_Navy', 'FIR_USHelmetType1_USMC', 'FIR_USHelmetType1_VF31', 'FIR_USHelmetType1_Agg', 'FIR_HGU55PJ', 'RHS_jetpilot_usaf', 'rhs_zsh7a', 'rhs_zsh7a_alt', 'UK3CB_ARD_B_H_zsh7a', 'UK3CB_ARD_B_H_zsh7a_alt', 'UK3CB_TKA_O_H_zsh7a_Des', 'UK3CB_TKA_O_H_zsh7a_Des_alt'",
1,
{
private _array = [_this, "CfgWeapons"] call EFUNC(chemical,getList);
Expand All @@ -39,6 +39,16 @@
true
] call CBA_fnc_addSetting;

//Ignore oxygen equipment list
[
QGVAR(enableEverythingOxymask),
"CHECKBOX",
[LLSTRING(SETTING_enableEverythingOxymask),LLSTRING(SETTING_enableEverythingOxymask_DESC)],
[CBA_SETTINGS_CAT, ELSTRING(GUI,SubCategory_Basic)],
[false],
true
] call CBA_fnc_addSetting;

//Enable Check Breathing medical action
[
QGVAR(enableCheckBreathing),
Expand Down
12 changes: 10 additions & 2 deletions addons/breathing/stringtable.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1044,7 +1044,7 @@
<French>Casques d'oxygène disponibles</French>
<Italian>Elmetto per ossigeno disponibile</Italian>
<German>Verfügbare Sauerstoffhelme</German>
<Japanese>利用可能な酸素供給ヘルメット</Japanese>
<Japanese>酸素供給可能なヘルメット</Japanese>
<Chinese>可用氧氣頭盔</Chinese>
<Dutch>Beschikbare zuurstofhelmen</Dutch>
</Key>
Expand All @@ -1064,7 +1064,7 @@
<French>Masques à oxygène disponibles</French>
<Italian>Maschera per ossigeno disponibile</Italian>
<German>Verfügbare Sauerstoffmasken</German>
<Japanese>利用可能な酸素供給マスク</Japanese>
<Japanese>酸素供給可能なマスク</Japanese>
<Chinese>可用氧氣面罩</Chinese>
<Chinesesimp>可用氧气面罩</Chinesesimp>
<Dutch>Beschikbare zuurstofmaskers</Dutch>
Expand Down Expand Up @@ -1248,6 +1248,14 @@
<Chinesesimp>设定当连接能够监测ETCo2的装置时，医务人员是否可以在生命体征监视器中查看患者的ETCo2和呼吸率</Chinesesimp>
<Dutch>Activeert het zien van ETCo2 en ademhalingstempo op de vitale waarden monitor wanneer een apparaat die ETCo2 kan monitoren is aangesloten</Dutch>
</Key>
<Key ID="STR_KAT_Breathing_SETTING_enableEverythingOxymask">
<English>Ignore oxygen equipment list</English>
<Japanese>酸素機器リストを無視</Japanese>
</Key>
<Key ID="STR_KAT_Breathing_SETTING_enableEverythingOxymask_DESC">
<English>Ignore the available oxygen equipment list and make all helmets and goggles can act as oxygen masks</English>
<Japanese>酸素供給可能な装備のリストを無視し、すべてのヘルメットとゴーグルを酸素マスクとして機能させます</Japanese>
</Key>
<Key ID="STR_KAT_Breathing_SETTING_HPTX_BleedAmount">
<English>Hemopneumothorax internal bleeding amount</English>
<Czech>Míra vnitřního krvácení při hemotoraxu</Czech>
Expand Down
Loading