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

Conversation

mazinskihenry
Copy link
Contributor

@mazinskihenry mazinskihenry commented Dec 10, 2023

When merged this pull request will:

  • Adding a handheld ultrasound unit to immediately diagnose cardiac and thoracic conditions
  • Adding a simple REBOA unit to stop bleeding from lower extremities and chest
  • Adding H&T conditions to drop patients into cardiac arrest and better track those conditions from a single variable

IMPORTANT

  • Development Guidelines are read, understood and applied.
  • Title of this PR uses our standard template Component - Add|Fix|Improve|Change|Make|Remove {changes}.

@mazinskihenry mazinskihenry changed the title Surgery - Add Ultrasound and REBOA Unit Airway/Breathing/Misc/Surgery - Add Ultrasound and REBOA Unit Dec 10, 2023
@mazinskihenry mazinskihenry changed the title Airway/Breathing/Misc/Surgery - Add Ultrasound and REBOA Unit Airway/Breathing/Circulation/Misc/Surgery - Add Ultrasound and REBOA Unit + H&Ts Dec 17, 2023
@MiszczuZPolski MiszczuZPolski added this to the Ongoing milestone Dec 21, 2023
@MiszczuZPolski MiszczuZPolski added the kind/feature request Release Notes: **ADDED:** label Dec 21, 2023
Copy link
Collaborator

@MiszczuZPolski MiszczuZPolski left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All for now, maybe i omitted some mistakes in file header but it can be changed anytime

addons/breathing/functions/fnc_handleBreathing.sqf Outdated Show resolved Hide resolved
addons/breathing/functions/fnc_handleBreathing.sqf Outdated Show resolved Hide resolved
addons/breathing/functions/fnc_handleBreathing.sqf Outdated Show resolved Hide resolved
addons/breathing/functions/fnc_handlePulmoHit.sqf Outdated Show resolved Hide resolved
addons/breathing/functions/fnc_handlePulmoHit.sqf Outdated Show resolved Hide resolved
addons/surgery/functions/fnc_reboaApplyLocal.sqf Outdated Show resolved Hide resolved
addons/surgery/functions/fnc_reboaApplyLocal.sqf Outdated Show resolved Hide resolved
addons/surgery/functions/fnc_reboaDeepApplyLocal.sqf Outdated Show resolved Hide resolved
addons/surgery/functions/fnc_ultraAssessmentLocal.sqf Outdated Show resolved Hide resolved
mazinskihenry and others added 8 commits December 29, 2023 13:27
Co-authored-by: MiszczuZPolski <71414303+MiszczuZPolski@users.noreply.github.com>
Co-authored-by: MiszczuZPolski <71414303+MiszczuZPolski@users.noreply.github.com>
Co-authored-by: MiszczuZPolski <71414303+MiszczuZPolski@users.noreply.github.com>
Co-authored-by: MiszczuZPolski <71414303+MiszczuZPolski@users.noreply.github.com>
Co-authored-by: MiszczuZPolski <71414303+MiszczuZPolski@users.noreply.github.com>
Copy link
Collaborator

@MiszczuZPolski MiszczuZPolski left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Quick review but its not done yet

addons/breathing/XEH_preInit.sqf Outdated Show resolved Hide resolved
addons/breathing/functions/fnc_handleBreathing.sqf Outdated Show resolved Hide resolved
addons/gui/functions/fnc_updateInjuryList.sqf Outdated Show resolved Hide resolved
Copy link
Collaborator

@MiszczuZPolski MiszczuZPolski left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Small changes. i will have to review surgery things yet and check it ingame

addons/breathing/functions/fnc_handleBreathing.sqf Outdated Show resolved Hide resolved
_patient setVariable [QEGVAR(circulation,effusion), 0, true];
_patient setVariable [QGVAR(imaging), false, true];

[_patient, "quick_view", LSTRING(Pericardial_Tap_Log), [[_medic] call ACEFUNC(common,getName)]] call ACEFUNC(medical_treatment,addToLog);
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

move it to function "above" aka pericardialTap

Co-authored-by: MiszczuZPolski <71414303+MiszczuZPolski@users.noreply.github.com>
@mazinskihenry
Copy link
Contributor Author

MERGE MY PR COWARD!

Copy link
Collaborator

@MiszczuZPolski MiszczuZPolski left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I hate you for merging both PRs into one

addons/airway/stringtable.xml Outdated Show resolved Hide resolved
addons/breathing/functions/fnc_handleBreathing.sqf Outdated Show resolved Hide resolved
@@ -83,5 +83,23 @@
<Finnish>Merkitse potilaan sivut</Finnish>
<Russian>Маркировка сторон пациента</Russian>
</Key>
<Key ID="STR_KAT_GUI_Bleed_Rate1">
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

use ACELSTRING if you need, dont copy paste them from ace

addons/main/script_macros.hpp Outdated Show resolved Hide resolved
addons/surgery/XEH_postInit.sqf Show resolved Hide resolved
@MiszczuZPolski MiszczuZPolski modified the milestones: 2.14.1, 2.14.2 Apr 15, 2024
@mazinskihenry
Copy link
Contributor Author

Complete

Copy link
Contributor

@YetheSamartaka YetheSamartaka left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM - Let's Gamble, Try Merging

@MiszczuZPolski MiszczuZPolski modified the milestones: 2.14.2, 2.15.0 Apr 19, 2024
@MiszczuZPolski MiszczuZPolski merged commit e640048 into KAT-Advanced-Medical:dev-Tomcat Apr 19, 2024
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kind/feature request Release Notes: **ADDED:**
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants