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 - Add medication dosage support & improve overdose #10393

Open
wants to merge 58 commits into
base: master
Choose a base branch
from
Open

Medical - Add medication dosage support & improve overdose #10393

wants to merge 58 commits into from

Commits on Oct 11, 2024

  1. Initial Commit

    @Cplhardcore
    Cplhardcore committed Oct 11, 2024
    Configuration menu
    Copy the full SHA
    28a1aa4 View commit details
    Browse the repository at this point in the history

  2. Small fix to get all medications

    @Cplhardcore
    Cplhardcore committed Oct 11, 2024
    Configuration menu
    Copy the full SHA
    e8551a1 View commit details
    Browse the repository at this point in the history

  3. Update launch.toml

    @Cplhardcore
    Cplhardcore committed Oct 11, 2024
    Configuration menu
    Copy the full SHA
    d8f0781 View commit details
    Browse the repository at this point in the history

  4. Small fix and removal of medication dose variables

    @Cplhardcore
    Cplhardcore committed Oct 11, 2024
    Configuration menu
    Copy the full SHA
    c3af223 View commit details
    Browse the repository at this point in the history

  5. Deleted old entries from stringtable

    @Cplhardcore
    Cplhardcore committed Oct 11, 2024
    Configuration menu
    Copy the full SHA
    d6de590 View commit details
    Browse the repository at this point in the history

  6. Update addons/medical_treatment/script_component.hpp 

    Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
    @Cplhardcore @LinkIsGrim
    Cplhardcore and LinkIsGrim authored Oct 11, 2024
    Configuration menu
    Copy the full SHA
    42e2097 View commit details
    Browse the repository at this point in the history

  7. Fixed newline

    @Cplhardcore
    Cplhardcore committed Oct 11, 2024
    Configuration menu
    Copy the full SHA
    e22e06b View commit details
    Browse the repository at this point in the history

  8. Merge branch 'Overdose-Rework' of https://github.com/Cplhardcore/ACE3 … 

    …into Overdose-Rework
    @Cplhardcore
    Cplhardcore committed Oct 11, 2024
    Configuration menu
    Copy the full SHA
    eaf2e3f View commit details
    Browse the repository at this point in the history

  9. Changes for backwards compatibility

    @Cplhardcore
    Cplhardcore committed Oct 11, 2024
    Configuration menu
    Copy the full SHA
    fff711a View commit details
    Browse the repository at this point in the history

Commits on Oct 12, 2024

  1. Update addons/medical_status/functions/fnc_addMedicationAdjustment.sqf 

    Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
    @Cplhardcore @LinkIsGrim
    Cplhardcore and LinkIsGrim authored Oct 12, 2024
    Configuration menu
    Copy the full SHA
    70f8f0d View commit details
    Browse the repository at this point in the history

  2. Update addons/medical_status/functions/fnc_getAllMedicationCount.sqf 

    Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
    @Cplhardcore @LinkIsGrim
    Cplhardcore and LinkIsGrim authored Oct 12, 2024
    Configuration menu
    Copy the full SHA
    8c5716b View commit details
    Browse the repository at this point in the history

  3. Update addons/medical_status/functions/fnc_getAllMedicationCount.sqf 

    Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
    @Cplhardcore @LinkIsGrim
    Cplhardcore and LinkIsGrim authored Oct 12, 2024
    Configuration menu
    Copy the full SHA
    684d8ec View commit details
    Browse the repository at this point in the history

  4. Fixes, maybe?

    @Cplhardcore
    Cplhardcore committed Oct 12, 2024
    Configuration menu
    Copy the full SHA
    2e22795 View commit details
    Browse the repository at this point in the history

  5. Overdose fixes

    @Cplhardcore
    Cplhardcore committed Oct 12, 2024
    Configuration menu
    Copy the full SHA
    40abd2a View commit details
    Browse the repository at this point in the history

  6. trailling comma

    @LinkIsGrim
    LinkIsGrim authored Oct 12, 2024
    Configuration menu
    Copy the full SHA
    7c895ba View commit details
    Browse the repository at this point in the history

  7. Update addons/medical_vitals/functions/fnc_handleUnitVitals.sqf

    @LinkIsGrim
    LinkIsGrim authored Oct 12, 2024
    Configuration menu
    Copy the full SHA
    768f9ab View commit details
    Browse the repository at this point in the history

Commits on Oct 13, 2024

  1. aa

    @Cplhardcore
    Cplhardcore committed Oct 13, 2024
    Configuration menu
    Copy the full SHA
    8216db1 View commit details
    Browse the repository at this point in the history

  2. there we go

    @Cplhardcore
    Cplhardcore committed Oct 13, 2024
    Configuration menu
    Copy the full SHA
    b5c3c5d View commit details
    Browse the repository at this point in the history

  3. Update addons/medical_treatment/functions/fnc_onMedicationUsage.sqf 

    Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
    @Cplhardcore @rautamiekka
    Cplhardcore and rautamiekka authored Oct 13, 2024
    Configuration menu
    Copy the full SHA
    8443181 View commit details
    Browse the repository at this point in the history

  4. Update addons/medical_treatment/functions/fnc_onMedicationUsage.sqf 

    Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
    @Cplhardcore @rautamiekka
    Cplhardcore and rautamiekka authored Oct 13, 2024
    Configuration menu
    Copy the full SHA
    9abb145 View commit details
    Browse the repository at this point in the history

  5. Update XEH_PREP.hpp

    @Cplhardcore
    Cplhardcore committed Oct 13, 2024
    Configuration menu
    Copy the full SHA
    01504ea View commit details
    Browse the repository at this point in the history

  6. Merge branch 'Overdose-Rework' of https://github.com/Cplhardcore/ACE3 … 

    …into Overdose-Rework
    @Cplhardcore
    Cplhardcore committed Oct 13, 2024
    Configuration menu
    Copy the full SHA
    eaa8702 View commit details
    Browse the repository at this point in the history

  7. Update addons/medical_status/functions/fnc_getAllMedicationCount.sqf 

    Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
    @Cplhardcore @LinkIsGrim
    Cplhardcore and LinkIsGrim authored Oct 13, 2024
    Configuration menu
    Copy the full SHA
    2ab49a4 View commit details
    Browse the repository at this point in the history

  8. Grim Misc Fixes

    @Cplhardcore
    Cplhardcore committed Oct 13, 2024
    Configuration menu
    Copy the full SHA
    594d02b View commit details
    Browse the repository at this point in the history

  9. Merge branch 'Overdose-Rework' of https://github.com/Cplhardcore/ACE3 … 

    …into Overdose-Rework
    @Cplhardcore
    Cplhardcore committed Oct 13, 2024
    Configuration menu
    Copy the full SHA
    194bf50 View commit details
    Browse the repository at this point in the history

  10. Remove debug

    @Cplhardcore
    Cplhardcore committed Oct 13, 2024
    Configuration menu
    Copy the full SHA
    8e916cd View commit details
    Browse the repository at this point in the history

  11. Small fixes

    @Cplhardcore
    Cplhardcore committed Oct 13, 2024
    Configuration menu
    Copy the full SHA
    d0a14d8 View commit details
    Browse the repository at this point in the history

Commits on Oct 19, 2024

  1. newline

    @LinkIsGrim
    LinkIsGrim authored Oct 19, 2024
    Configuration menu
    Copy the full SHA
    5283456 View commit details
    Browse the repository at this point in the history

  2. headers

    @LinkIsGrim
    LinkIsGrim authored Oct 19, 2024
    Configuration menu
    Copy the full SHA
    383a87b View commit details
    Browse the repository at this point in the history

  3. code cleanup

    @LinkIsGrim
    LinkIsGrim authored Oct 19, 2024
    Configuration menu
    Copy the full SHA
    90dbb85 View commit details
    Browse the repository at this point in the history

  4. more headers

    @LinkIsGrim
    LinkIsGrim authored Oct 19, 2024
    Configuration menu
    Copy the full SHA
    522a496 View commit details
    Browse the repository at this point in the history

  5. drop unneeded _dose

    @LinkIsGrim
    LinkIsGrim authored Oct 19, 2024
    Configuration menu
    Copy the full SHA
    a5b6522 View commit details
    Browse the repository at this point in the history

  6. last header

    @LinkIsGrim
    LinkIsGrim authored Oct 19, 2024
    Configuration menu
    Copy the full SHA
    7703596 View commit details
    Browse the repository at this point in the history

  7. fix getting overdose func/code

    @LinkIsGrim
    LinkIsGrim authored Oct 19, 2024
    Configuration menu
    Copy the full SHA
    7e1e45f View commit details
    Browse the repository at this point in the history

  8. whitespace

    @LinkIsGrim
    LinkIsGrim authored Oct 19, 2024
    Configuration menu
    Copy the full SHA
    85a5105 View commit details
    Browse the repository at this point in the history

  9. now the last header

    @LinkIsGrim
    LinkIsGrim authored Oct 19, 2024
    Configuration menu
    Copy the full SHA
    31afab7 View commit details
    Browse the repository at this point in the history

  10. Update addons/medical_treatment/functions/fnc_overDose.sqf 

    Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
    @Cplhardcore @LinkIsGrim
    Cplhardcore and LinkIsGrim authored Oct 19, 2024
    Configuration menu
    Copy the full SHA
    b6d1635 View commit details
    Browse the repository at this point in the history

Commits on Oct 20, 2024

  1. fix compiling nil

    @LinkIsGrim
    LinkIsGrim authored Oct 20, 2024
    Configuration menu
    Copy the full SHA
    cc0f116 View commit details
    Browse the repository at this point in the history

Commits on Oct 23, 2024

  1. Update addons/medical_status/functions/fnc_addMedicationAdjustment.sqf 

    Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
    @Cplhardcore @johnb432
    Cplhardcore and johnb432 authored Oct 23, 2024
    Configuration menu
    Copy the full SHA
    0898ae9 View commit details
    Browse the repository at this point in the history

  2. Fixes

    @Cplhardcore
    Cplhardcore committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    8453797 View commit details
    Browse the repository at this point in the history

  3. Update addons/medical_treatment/functions/fnc_overDose.sqf 

    Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
    @Cplhardcore @johnb432
    Cplhardcore and johnb432 authored Oct 23, 2024
    Configuration menu
    Copy the full SHA
    47c155f View commit details
    Browse the repository at this point in the history

  4. Update fnc_overDose.sqf

    @Cplhardcore
    Cplhardcore committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    b653251 View commit details
    Browse the repository at this point in the history

Commits on Oct 24, 2024

  1. Update addons/medical_status/functions/fnc_addMedicationAdjustment.sqf 

    Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
    @Cplhardcore @johnb432
    Cplhardcore and johnb432 authored Oct 24, 2024
    Configuration menu
    Copy the full SHA
    d0e5ab4 View commit details
    Browse the repository at this point in the history

  2. Update addons/medical_treatment/functions/fnc_overDose.sqf 

    Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
    @Cplhardcore @johnb432
    Cplhardcore and johnb432 authored Oct 24, 2024
    Configuration menu
    Copy the full SHA
    6f1a5d9 View commit details
    Browse the repository at this point in the history

  3. Update addons/medical_treatment/functions/fnc_onMedicationUsage.sqf 

    Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
    @Cplhardcore @johnb432
    Cplhardcore and johnb432 authored Oct 24, 2024
    Configuration menu
    Copy the full SHA
    e21c4b9 View commit details
    Browse the repository at this point in the history

  4. Update addons/medical_status/functions/fnc_addMedicationAdjustment.sqf 

    Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
    @Cplhardcore @johnb432
    Cplhardcore and johnb432 authored Oct 24, 2024
    Configuration menu
    Copy the full SHA
    abe46c4 View commit details
    Browse the repository at this point in the history

  5. Update addons/medical_status/functions/fnc_getMedicationCount.sqf 

    Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
    @Cplhardcore @johnb432
    Cplhardcore and johnb432 authored Oct 24, 2024
    Configuration menu
    Copy the full SHA
    fd78fd7 View commit details
    Browse the repository at this point in the history

  6. Fixes

    @Cplhardcore
    Cplhardcore committed Oct 24, 2024
    Configuration menu
    Copy the full SHA
    d951f22 View commit details
    Browse the repository at this point in the history

  7. Moving med settings to different PR

    @Cplhardcore
    Cplhardcore committed Oct 24, 2024
    Configuration menu
    Copy the full SHA
    91a36ae View commit details
    Browse the repository at this point in the history

  8. oopps

    @Cplhardcore
    Cplhardcore committed Oct 24, 2024
    Configuration menu
    Copy the full SHA
    5ff69a7 View commit details
    Browse the repository at this point in the history

  9. Stringtable

    @Cplhardcore
    Cplhardcore committed Oct 24, 2024
    Configuration menu
    Copy the full SHA
    f692271 View commit details
    Browse the repository at this point in the history

  10. Misc fixes & cleanup

    @johnb432
    johnb432 committed Oct 24, 2024
    Configuration menu
    Copy the full SHA
    876485d View commit details
    Browse the repository at this point in the history

  11. Update fnc_onMedicationUsage.sqf

    @johnb432
    johnb432 committed Oct 24, 2024
    Configuration menu
    Copy the full SHA
    bb3da04 View commit details
    Browse the repository at this point in the history

  12. Fix nonsensical code

    @johnb432
    johnb432 committed Oct 24, 2024
    Configuration menu
    Copy the full SHA
    4cfbc8a View commit details
    Browse the repository at this point in the history

Commits on Oct 25, 2024

  1. add API event and doc

    @LinkIsGrim
    LinkIsGrim committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    7f2fa8a View commit details
    Browse the repository at this point in the history

Commits on Oct 26, 2024

  1. Misc fixes

    @Cplhardcore
    Cplhardcore committed Oct 26, 2024
    Configuration menu
    Copy the full SHA
    ec44aab View commit details
    Browse the repository at this point in the history

  2. Update ACE_Medical_Treatment.hpp

    @johnb432
    johnb432 committed Oct 26, 2024
    Configuration menu
    Copy the full SHA
    de9ac5d View commit details
    Browse the repository at this point in the history

  3. Update watchVariable.sqf

    @johnb432
    johnb432 committed Oct 26, 2024
    Configuration menu
    Copy the full SHA
    dd81004 View commit details
    Browse the repository at this point in the history