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

Medical Treatment - Settings cleanup #7973

Merged
merged 1 commit into from
Oct 31, 2020
Merged

Medical Treatment - Settings cleanup #7973

merged 1 commit into from
Oct 31, 2020

Conversation

mharis001
Copy link
Member

@mharis001 mharis001 commented Oct 29, 2020 •
edited
Loading

When merged this pull request will:

  • Clean up recently added treatment time settings
  • Title case and minor wording changes
    • Change syringe to autoinjector since all items are autoinjectors
  • Allow same range (0.1s to 60s) for all settings
  • Re-organize settings
    • Hard to review but, mainly move IV treatment time to other IV settings and move remaining ones below covert items setting

@mharis001 mharis001 added the kind/cleanup Release Notes: **CHANGED:** label Oct 29, 2020
@mharis001 mharis001 added this to the 3.13.5 milestone Oct 29, 2020
@mharis001 mharis001 requested a review from PabstMirror October 29, 2020 22:03
PabstMirror
PabstMirror reviewed Oct 30, 2020
View reviewed changes
addons/medical_treatment/initSettings.sqf
@@ -217,11 +207,11 @@
] call CBA_settings_fnc_init;

[
QGVAR(treatmentTimeStich),
QGVAR(woundStitchTime),
Copy link
Contributor

Choose a reason for hiding this comment

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

all other time settings are in format treatmentTimeX
but stitching works a little different

Copy link
Member Author

Choose a reason for hiding this comment

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

Different since this controls the amount of time to stitch a single wound. I thought this name implied that better but can revert if we want to keep the same format.

Copy link
Contributor

Choose a reason for hiding this comment

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

it makes sense, I just wanted to double check

@PabstMirror PabstMirror merged commit 171fbf1 into master Oct 31, 2020
@PabstMirror PabstMirror deleted the medical-settings-cleanup branch October 31, 2020 04:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@PabstMirror PabstMirror PabstMirror approved these changes

@jonpas jonpas jonpas approved these changes

Assignees
No one assigned
Labels
kind/cleanup Release Notes: **CHANGED:**
Projects
None yet
Milestone
3.13.5
Development

Successfully merging this pull request may close these issues.
3 participants
@mharis001 @jonpas @PabstMirror