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

Medical - Add option to prevent scripted injuries on invulnerable units #8599

Merged
merged 14 commits into from
Nov 8, 2021

Conversation

mjc4wilton
Copy link
Contributor

@mjc4wilton mjc4wilton commented Oct 24, 2021

When merged this pull request will:

@mharis001
Copy link
Member

I am unsure if this should be a setting. At most, I can see adding an extra parameter to ace_medical_fnc_addDamageToUnit but I feel like the calling code should deal with disabled damage accordingly.

Co-authored-by: jonpas <jonpas33@gmail.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
@mjc4wilton
Copy link
Contributor Author

Apologies for messy Git. VS Code has a stroke for some reason.

@jonpas jonpas added this to the 3.14.1 milestone Nov 7, 2021
@jonpas jonpas added the kind/bug-fix Release Notes: **FIXED:** label Nov 7, 2021
@PabstMirror PabstMirror merged commit 5bad689 into acemod:master Nov 8, 2021
@mjc4wilton mjc4wilton deleted the MedicalInvulnDamageFix branch November 11, 2021 20:14
AndreasBrostrom pushed a commit to AndreasBrostrom/ACE3 that referenced this pull request Dec 3, 2021
…ts (acemod#8599)

* Medical - Add option to prevent scripted injuries on invulnerable units

* Update docs

* Change from CBA setting to optional parameter

* Update header arguments to follow coding guidelines

Co-authored-by: jonpas <jonpas33@gmail.com>

* Update addons/medical/functions/fnc_addDamageToUnit.sqf

Co-authored-by: PabstMirror <pabstmirror@gmail.com>

* Increase readibility

* Fix trace macro

* Update addons/medical/functions/fnc_addDamageToUnit.sqf

* Update addons/medical/functions/fnc_addDamageToUnit.sqf

Co-authored-by: jonpas <jonpas33@gmail.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: BaerMitUmlaut <BaerMitUmlaut@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

ace_medical_fnc_addDamageToUnit not taking "isDamageAllowed" into account
6 participants