Skip to content
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.

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

Airway/Breathing/Circulation/Misc/Pharma/Surgery - Add Ultrasound and REBOA Unit + H&Ts + Opioid Relief and Effectivness #452

Merged
merged 45 commits into from
Apr 19, 2024
Merged
Changes from 1 commit
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
aec5357
Ultrasound + REBOA Starter
mazinskihenry Dec 10, 2023
c736cdf
Cleanup to REBOA/Ultrasound Functions + H&Ts
mazinskihenry Dec 17, 2023
343b01f
Clearing pneumo conditions
mazinskihenry Dec 20, 2023
7841b4e
REBOA/Ultra Completion
mazinskihenry Dec 22, 2023
4a2c5f1
Update addons/breathing/functions/fnc_handleBreathing.sqf
mazinskihenry Dec 29, 2023
bfd33a0
Update addons/breathing/functions/fnc_handleBreathing.sqf
mazinskihenry Dec 29, 2023
c59ce7e
Update addons/breathing/functions/fnc_handlePulmoHit.sqf
mazinskihenry Dec 29, 2023
2723d7a
Update addons/breathing/functions/fnc_handlePulmoHit.sqf
mazinskihenry Dec 29, 2023
91e8375
Apply suggestions from code review
mazinskihenry Dec 29, 2023
3062199
Review pt.1
mazinskihenry Dec 29, 2023
f911749
Merge branch 'REBOA' of https://github.com/mazinskihenry/KAM into REBOA
mazinskihenry Dec 29, 2023
d03d180
Final review
mazinskihenry Dec 30, 2023
61e8557
Resolve Changes
mazinskihenry Jan 5, 2024
e850c77
Update fnc_handlePulmoHit.sqf
mazinskihenry Jan 6, 2024
727d630
Update addons/breathing/functions/fnc_handleBreathing.sqf
mazinskihenry Feb 1, 2024
6cdd90e
Merge of opioid PR
mazinskihenry Mar 9, 2024
60cbe43
Merge branch 'dev-Tomcat' into REBOA
mazinskihenry Mar 9, 2024
df331a1
Update fnc_pericardialTapLocal.sqf
mazinskihenry Mar 9, 2024
45ccb5a
Update fnc_pericardialTap.sqf
mazinskihenry Mar 9, 2024
ff815ef
Update fnc_treatmentAdvanced_FentanylLocal.sqf
mazinskihenry Mar 9, 2024
1afa52c
Update fnc_treatmentAdvanced_MorphineLocal.sqf
mazinskihenry Mar 9, 2024
575a39c
Update fnc_treatmentAdvanced_NalbuphineLocal.sqf
mazinskihenry Mar 9, 2024
0eea0b0
Update XEH_preInit.sqf
mazinskihenry Mar 9, 2024
09a5279
Update fnc_handleBreathing.sqf
mazinskihenry Mar 9, 2024
374db60
Update fnc_FAK_unpack.sqf
mazinskihenry Mar 9, 2024
7c7df0e
Update ACE_Medical_Treatment_Actions.hpp
mazinskihenry Mar 9, 2024
b5aaf7d
Merge branch 'dev-Tomcat' into pr/452
MiszczuZPolski Apr 2, 2024
59a39d7
update init
MiszczuZPolski Apr 2, 2024
fe9841d
2.14 Update
mazinskihenry Apr 2, 2024
ce16a2d
Spaces not tabs
mazinskihenry Apr 2, 2024
abd42f5
Update stringtable.xml
mazinskihenry Apr 2, 2024
c038c23
Merge branch 'dev-Tomcat' into REBOA
MiszczuZPolski Apr 2, 2024
7051b47
Final Fixes
mazinskihenry Apr 3, 2024
ea4d81a
Merge branch 'REBOA' of https://github.com/mazinskihenry/KAM into REBOA
mazinskihenry Apr 3, 2024
36b1dd8
Update fnc_reboaRemoveLocal.sqf
mazinskihenry Apr 3, 2024
89df00c
Update fnc_handlePulmoHit.sqf
mazinskihenry Apr 4, 2024
ee1a81d
Update fnc_fullHealLocal.sqf
mazinskihenry Apr 9, 2024
b831ca9
Update fnc_init.sqf
mazinskihenry Apr 9, 2024
0716744
Update stringtable.xml
mazinskihenry Apr 9, 2024
ea66d2a
Update ACE_Medical_Treatment.hpp
mazinskihenry Apr 9, 2024
8de7a41
Update ACE_Medical_Treatment_Actions.hpp
mazinskihenry Apr 9, 2024
93095fd
Merge branch 'dev-Tomcat' into REBOA
MiszczuZPolski Apr 15, 2024
604f13a
Fix frog issues
mazinskihenry Apr 17, 2024
ec42260
Finish review
mazinskihenry Apr 17, 2024
129c471
remove unused stuff
MiszczuZPolski Apr 19, 2024
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
Prev Previous commit
Next Next commit
Update ACE_Medical_Treatment_Actions.hpp
mazinskihenry authored Apr 9, 2024

Unverified

The committer email address is not verified.
commit 8de7a4172cd9316a65634628d2f0afb851cc592e
3 changes: 2 additions & 1 deletion addons/pharma/ACE_Medical_Treatment_Actions.hpp
Original file line number Diff line number Diff line change
@@ -242,7 +242,8 @@ class ACE_Medical_Treatment_Actions {
displayName = CSTRING(Take_Atropine);
allowedSelections[] = {"LeftArm", "RightArm", "LeftLeg", "RightLeg"};
allowSelfTreatment = 1;
treatmentTime = 5;
medicRequired = QGVAR(medLvl_Atropine);
treatmentTime = QGVAR(treatmentTime_Atropine);
condition = "";
items[] = {"kat_atropine"};
callbackSuccess = QFUNC(medication);