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.

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

Jump to bottom

Pharma - Change KAM Painkillers to CWMP #548

Merged
merged 14 commits into from
Jun 26, 2024
Merged

Pharma - Change KAM Painkillers to CWMP #548

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
d4810fe
Painkiller Treatment renaming
Apricot-ale Jun 7, 2024
d19846a
revert the treatmentAdvanced name change
Apricot-ale Jun 9, 2024
e1d2645
*THIS COMMIT IS TEST* TriageCard check
Apricot-ale Jun 9, 2024
0f2c66c
Revert "*THIS COMMIT IS TEST* TriageCard check"
Apricot-ale Jun 9, 2024
1a6d6ea
change tylenol to CWMP from TCCC guidelines
MiszczuZPolski Jun 14, 2024
e18e5e9
Update XEH_PREP.hpp
MiszczuZPolski Jun 14, 2024
0081879
change painkiller name to CWMP
Apricot-ale Jun 14, 2024
940e77e
Change wording "Combat Pill Pack"
Apricot-ale Jun 14, 2024
86d09fb
add Japanese...
Apricot-ale Jun 14, 2024
4fa31ed
add "pill" to descshort
Apricot-ale Jun 14, 2024
a204a2a
Change item icon
Apricot-ale Jun 14, 2024
98b111d
change suppress pain wording
Apricot-ale Jun 14, 2024
a80b4a0
Merge branch 'dev-Tomcat' into PainkillerRename-Jun24-01
MiszczuZPolski Jun 19, 2024
2d5f0b9
remove line
MiszczuZPolski Jun 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
2 changes: 1 addition & 1 deletion addons/pharma/ACE_Medical_Treatment.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ class ACE_ADDON(Medical_Treatment) {
onOverDose = "";
opioidRelief = 1.2;
};
class Painkillers {
class KAT_Painkillers {
painReduce = 0.2;
hrIncreaseLow[] = {0, 5};
hrIncreaseNormal[] = {5, 10};
Expand Down
4 changes: 2 additions & 2 deletions addons/pharma/ACE_Medical_Treatment_Actions.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,13 @@ class ACE_Medical_Treatment_Actions {
class Epinephrine: Morphine {
callbackSuccess = QFUNC(medication);
};
class Painkillers: Morphine {
class KAT_Painkillers: Morphine {
displayName = CSTRING(Inject_Box_Painkillers);
displayNameProgress = CSTRING(Using);
allowedSelections[] = {"Head"};
items[] = {"kat_Painkiller"};
condition = QUOTE(!(_patient getVariable [ARR_2(QQEGVAR(airway,recovery),false)]));
callbackSuccess = QFUNC(treatmentAdvanced_Painkillers);
callbackSuccess = QFUNC(treatmentAdvanced_KAT_Painkillers);
icon = QPATHTOF(ui\icon_painkillers_action.paa);
animationPatient = "";
animationPatientUnconscious = "AinjPpneMstpSnonWrflDnon_rolltoback";
Expand Down
2 changes: 1 addition & 1 deletion addons/pharma/XEH_PREP.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ PREP(treatmentAdvanced_MorphineLocal);
PREP(treatmentAdvanced_NalbuphineLocal);
PREP(treatmentAdvanced_Naloxone);
PREP(treatmentAdvanced_NaloxoneLocal);
PREP(treatmentAdvanced_Painkillers);
PREP(treatmentAdvanced_KAT_Painkillers);
Apricot-ale marked this conversation as resolved.
Show resolved Hide resolved
PREP(treatmentAdvanced_Penthrox);
PREP(treatmentAdvanced_Pervitin);
PREP(treatmentAdvanced_PervitinLocal);
Expand Down
2 changes: 1 addition & 1 deletion addons/pharma/functions/fnc_treatmentAdvanced_Carbonate.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* None
*
* Example:
* [player, cursorObject, "RightArm", "Painkillers", objNull, "kat_Carbonate"] call kat_pharma_fnc_treatmentAdvanced_Carbonate;
* [player, cursorObject, "RightArm", "Carbonate", objNull, "kat_Carbonate"] call kat_pharma_fnc_treatmentAdvanced_Carbonate;
*
* Public: No
*/
Expand Down
2 changes: 1 addition & 1 deletion ...ons/fnc_treatmentAdvanced_Painkillers.sqf → ...fnc_treatmentAdvanced_KAT_Painkillers.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* None
*
* Example:
* [player, cursorObject, "RightArm", classname, objNull, "kat_Painkiller"] call kat_pharma_fnc_treatmentAdvanced_Painkillers;
* [player, cursorObject, "RightArm", "KAT_Painkillers", objNull, "kat_Painkiller"] call kat_pharma_fnc_treatmentAdvanced_KAT_Painkillers;
*
* Public: No
*/
Expand Down
Loading