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

Sync changes #3

Merged
merged 29 commits into from
Jan 12, 2024
Merged

Sync changes #3

merged 29 commits into from
Jan 12, 2024

Commits on Oct 24, 2023

  1. Translation - Update Spanish (KAT-Advanced-Medical#430)

    Not finished, just bored. Maybe tomorrow I finish it.
    
    General spanish translation.
    
    ### IMPORTANT
    
    - [Development Guidelines](https://ace3.acemod.org/wiki/development/)
    are read, understood and applied.
    - Title of this PR uses our standard template `Component -
    Add|Fix|Improve|Change|Make|Remove {changes}`.
    Gilfor authored Oct 24, 2023
    Configuration menu
    Copy the full SHA
    2103795 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    cc9d089 View commit details
    Browse the repository at this point in the history
  3. Translation - Improve French translations and corrections (KAT-Advanc…

    …ed-Medical#436)
    
    Latest translations and correction/adjustements of some details
    
    **When merged this pull request will:**
    - Add the latest translations
    - Fix some errors
    - Not help me follow my course of Ceramic and colloidal processing
    
    ### IMPORTANT
    
    - [Development Guidelines](https://ace3.acemod.org/wiki/development/)
    are read, understood and applied.
    - Title of this PR uses our standard template `Component -
    Add|Fix|Improve|Change|Make|Remove {changes}`.
    
    Co-authored-by: MiszczuZPolski <[email protected]>
    Fanrod-Bones and MiszczuZPolski authored Oct 24, 2023
    Configuration menu
    Copy the full SHA
    2a84671 View commit details
    Browse the repository at this point in the history
  4. Translation - Fix German grammar & inconsistencies (KAT-Advanced-Medi…

    …cal#432)
    
    **When merged this pull request will:**
    - Fix inconsistencies between stringtables for medlvl
    - Remove left over strings from debribement
    
    ### IMPORTANT
    
    - [Development Guidelines](https://ace3.acemod.org/wiki/development/)
    are read, understood and applied.
    - Title of this PR uses our standard template `Component -
    Add|Fix|Improve|Change|Make|Remove {changes}`.
    MissHeda authored Oct 24, 2023
    Configuration menu
    Copy the full SHA
    fadb3ad View commit details
    Browse the repository at this point in the history
  5. Translation - Portuguese spellchecking (KAT-Advanced-Medical#437)

    This should fix grammatical errors I've made in the past. It also
    includes a fix for an English typo of Lorazepam.
    enricomfg authored Oct 24, 2023
    Configuration menu
    Copy the full SHA
    7e2e1b2 View commit details
    Browse the repository at this point in the history

Commits on Oct 27, 2023

  1. Translation - Improve Norwegian translations and grammar (KAT-Advance…

    …d-Medical#438)
    
    **When merged this pull request will:**
    - Fix grammatical errors in Norwegian translations
    - Fix inconsistences in Norwegian translations
    - Fix bad translations to Norwegian
    - Improve readability for Norwegian translations
    
    ### IMPORTANT
    
    - [Development Guidelines](https://ace3.acemod.org/wiki/development/)
    are read, understood and applied.
    - Title of this PR uses our standard template `Component -
    Add|Fix|Improve|Change|Make|Remove {changes}`.
    Tapawingo authored Oct 27, 2023
    Configuration menu
    Copy the full SHA
    62a2aa7 View commit details
    Browse the repository at this point in the history

Commits on Oct 30, 2023

  1. Circulation - Fix random deteriorate time for advanced rhythm (KAT-Ad…

    …vanced-Medical#440)
    
    Changed ''AdvRhythm_deteriorateTimeWeight'' to
    ''AdvRhythm_deteriorateTimeMax'' when applicable. This should fix the
    bell curve to implement both values instead of just the setting
    regarding ''AdvRhythm_deteriorateTimeWeight''.
    
    **When merged this pull request will:**
    - _Describe what this pull request will do_
    - _Each change in a separate line_
    
    ### IMPORTANT
    
    - [Development Guidelines](https://ace3.acemod.org/wiki/development/)
    are read, understood and applied.
    - Title of this PR uses our standard template `Component -
    Add|Fix|Improve|Change|Make|Remove {changes}`.
    Serrager authored Oct 30, 2023
    Configuration menu
    Copy the full SHA
    5467a86 View commit details
    Browse the repository at this point in the history

Commits on Nov 2, 2023

  1. Circulation/GUI/Pharmacy/Surgery - Various fixes (KAT-Advanced-Medica…

    …l#433)
    
    **When merged this pull request will:**
    - Prevent being able to manually charge AED-X without pads attached
    - Fix onOverDose not working
    - Make medical menu item count hint include magazine items
    - Fix NPWT treatment time, closes KAT-Advanced-Medical#429 
    - Make TXA/EACA work wound by wound like before
    - Move IV/IO retrieval action to advanced treatment tab
    
    ### IMPORTANT
    
    - [Development Guidelines](https://ace3.acemod.org/wiki/development/)
    are read, understood and applied.
    - Title of this PR uses our standard template `Component -
    Add|Fix|Improve|Change|Make|Remove {changes}`.
    BlueTheKing authored Nov 2, 2023
    Configuration menu
    Copy the full SHA
    ee34b2f View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    9897ae3 View commit details
    Browse the repository at this point in the history

Commits on Nov 15, 2023

  1. Translation - Improve Japanese (KAT-Advanced-Medical#441)

    **When merged this pull request will:**
    - _Update Japanese localization_
    
    ### IMPORTANT
    
    - [Development Guidelines](https://ace3.acemod.org/wiki/development/)
    are read, understood and applied.
    - Title of this PR uses our standard template `Component -
    Add|Fix|Improve|Change|Make|Remove {changes}`.
    Apricot-ale authored Nov 15, 2023
    Configuration menu
    Copy the full SHA
    2d2c6bd View commit details
    Browse the repository at this point in the history
  2. HEMTT - Fix warnings regarding macro redefinition (KAT-Advanced-Medic…

    …al#434)
    
    **When merged this pull request will:**
    - Title
    
    ### IMPORTANT
    
    - [Development Guidelines](https://ace3.acemod.org/wiki/development/)
    are read, understood and applied.
    - Title of this PR uses our standard template `Component -
    Add|Fix|Improve|Change|Make|Remove {changes}`.
    
    ---------
    
    Co-authored-by: Blue <[email protected]>
    MiszczuZPolski and BlueTheKing authored Nov 15, 2023
    Configuration menu
    Copy the full SHA
    dc680d6 View commit details
    Browse the repository at this point in the history

Commits on Nov 16, 2023

  1. Missing Korean translation added (KAT-Advanced-Medical#442)

    - Added BVM using to Korean translation
    
    ---------
    
    Co-authored-by: MiszczuZPolski <[email protected]>
    Psycool3695 and MiszczuZPolski authored Nov 16, 2023
    Configuration menu
    Copy the full SHA
    f95b28c View commit details
    Browse the repository at this point in the history
  2. Misc - Add - IFAK, AFAK, MFAK (KAT-Advanced-Medical#417)

    **When merged this pull request will:**
    - Add new items: IFAK, AFAK, MFAK
    
    ![image](https://github.com/KAT-Advanced-Medical/KAM/assets/95135995/edc8107f-501d-4215-9216-f100f70c15e0)
    
    - Add according addon settings to configure everything to your liking.
    
    ![image](https://github.com/KAT-Advanced-Medical/KAM/assets/95135995/54633cc4-c8f7-4852-80c0-a1f5f68585e5)
    
    - Add individual unpack & repack options to not unpack the whole FAK.
    
    ![image](https://github.com/KAT-Advanced-Medical/KAM/assets/95135995/6ee4e21e-b1a4-4e22-972a-42c788a679a0)
    
    ![image](https://github.com/KAT-Advanced-Medical/KAM/assets/95135995/d1d4f15c-3c5e-4c88-a035-694c41538d70)
    
    
    
    - [Development Guidelines](https://ace3.acemod.org/wiki/development/)
    are read, understood and applied.
    - Title of this PR uses our standard template `Component -
    Add|Fix|Improve|Change|Make|Remove {changes}`.
    
    ---------
    
    Co-authored-by: Blue <[email protected]>
    Co-authored-by: Julian | DiGii <[email protected]>
    Co-authored-by: MiszczuZPolski <[email protected]>
    4 people authored Nov 16, 2023
    Configuration menu
    Copy the full SHA
    c4fcbfa View commit details
    Browse the repository at this point in the history
  3. Update script_version.hpp

    Bump version for DEV update
    MiszczuZPolski authored Nov 16, 2023
    Configuration menu
    Copy the full SHA
    7e405a7 View commit details
    Browse the repository at this point in the history

Commits on Dec 1, 2023

  1. Airway/Breathing/Circulation/Surgery/Misc - Various fixes (KAT-Advanc…

    …ed-Medical#444)
    
    **When merged this pull request will:**
    - Fix hardcore deterioration not working as intended
    - Fix continuous actions cancelling if patient instantly died
    - Fix IFAK not consuming contents properly
    - Add hints when continuous actions have started
    - Fix surgery option not working as intended
    - Fix continuous actions cancelling when in vehicles
    - Reword pneumothorax setting description
    - Fix while loop in gasAI function causing server stutter
    
    ### IMPORTANT
    
    - [Development Guidelines](https://ace3.acemod.org/wiki/development/)
    are read, understood and applied.
    - Title of this PR uses our standard template `Component -
    Add|Fix|Improve|Change|Make|Remove {changes}`.
    
    ---------
    
    Co-authored-by: MiszczuZPolski <[email protected]>
    BlueTheKing and MiszczuZPolski authored Dec 1, 2023
    Configuration menu
    Copy the full SHA
    79d0760 View commit details
    Browse the repository at this point in the history

Commits on Dec 5, 2023

  1. Misc - Add tourniquet side effects (KAT-Advanced-Medical#446)

    **When merged this pull request will:**
    - Make tourniquets cause side effects that worsen over time
    - Tourniquets on legs hinder movement, getting worse over time down to
    limping
      - Tourniquets on arms increase weapon sway over time
      - Removed tourniquets do not immediately return perfect limb function
    
    ### IMPORTANT
    
    - [Development Guidelines](https://ace3.acemod.org/wiki/development/)
    are read, understood and applied.
    - Title of this PR uses our standard template `Component -
    Add|Fix|Improve|Change|Make|Remove {changes}`.
    BlueTheKing authored Dec 5, 2023
    Configuration menu
    Copy the full SHA
    fa4efd8 View commit details
    Browse the repository at this point in the history
  2. Airway - Change recovery position & reword check airway hints (KAT-Ad…

    …vanced-Medical#445)
    
    **When merged this pull request will:**
    - Make recovery position clear occlusions over time
    - Make it so an established recovery position is cancelled when
    attempting to do actions that are incompatible with it
    - Reword check airway hints
    
    ### IMPORTANT
    
    - [Development Guidelines](https://ace3.acemod.org/wiki/development/)
    are read, understood and applied.
    - Title of this PR uses our standard template `Component -
    Add|Fix|Improve|Change|Make|Remove {changes}`.
    BlueTheKing authored Dec 5, 2023
    Configuration menu
    Copy the full SHA
    9ee306d View commit details
    Browse the repository at this point in the history
  3. Circulation - Fix blood poisoning not causing cardiac arrest (KAT-Adv…

    …anced-Medical#449)
    
    **When merged this pull request will:**
    - Make it so blood poisoning always causes cardiac arrest, either due to
    low HR or forcefully within 2.5 minutes.
    
    ### IMPORTANT
    
    - [Development Guidelines](https://ace3.acemod.org/wiki/development/)
    are read, understood and applied.
    - Title of this PR uses our standard template `Component -
    Add|Fix|Improve|Change|Make|Remove {changes}`.
    BlueTheKing authored Dec 5, 2023
    Configuration menu
    Copy the full SHA
    8d1b1f0 View commit details
    Browse the repository at this point in the history
  4. Circulation - AED fixes (KAT-Advanced-Medical#448)

    **When merged this pull request will:**
    - Fix text scaling of AED-X monitor when using interface size other than
    small
    - Prevent connecting AED if patient is not in same vehicle as medic
    - Fix pulse rate visual in AED-X monitor not resetting after ROSC
    - Add missing stringtable entries
    
    ### IMPORTANT
    
    - [Development Guidelines](https://ace3.acemod.org/wiki/development/)
    are read, understood and applied.
    - Title of this PR uses our standard template `Component -
    Add|Fix|Improve|Change|Make|Remove {changes}`.
    BlueTheKing authored Dec 5, 2023
    Configuration menu
    Copy the full SHA
    1932563 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    4309e62 View commit details
    Browse the repository at this point in the history

Commits on Dec 6, 2023

  1. Translation - Improve Japanese for 2.13.3 (KAT-Advanced-Medical#443)

    **When merged this pull request will:**
    - _Update Japanese localization_
    
    ### IMPORTANT
    
    - [Development Guidelines](https://ace3.acemod.org/wiki/development/)
    are read, understood and applied.
    - Title of this PR uses our standard template `Component -
    Add|Fix|Improve|Change|Make|Remove {changes}`.
    Apricot-ale authored Dec 6, 2023
    Configuration menu
    Copy the full SHA
    ee44294 View commit details
    Browse the repository at this point in the history

Commits on Dec 15, 2023

  1. Airway - Norwegian translation update (KAT-Advanced-Medical#454)

    **When merged this pull request will:**
    - Add missing entries for Norwegian (partial credits to @DevEskild)
    - Replace KAT-Advanced-Medical#451
    
    ### IMPORTANT
    
    - [Development Guidelines](https://ace3.acemod.org/wiki/development/)
    are read, understood and applied.
    - Title of this PR uses our standard template `Component -
    Add|Fix|Improve|Change|Make|Remove {changes}`.
    Tapawingo authored Dec 15, 2023
    Configuration menu
    Copy the full SHA
    4bf241a View commit details
    Browse the repository at this point in the history

Commits on Dec 21, 2023

  1. Breathing - Add BVM and O2Tank to Supply Crates (KAT-Advanced-Medical…

    …#450)
    
    **When merged this pull request will:**
    - _Add BVM and oxygenTank to KAM General Items / ACE Advanced Medical
    Supply Crate_
    - _Add missing scopeCurator & scopeArsenal config to BVM and oxygenTank_
    
    ### IMPORTANT
    
    - [Development Guidelines](https://ace3.acemod.org/wiki/development/)
    are read, understood and applied.
    - Title of this PR uses our standard template `Component -
    Add|Fix|Improve|Change|Make|Remove {changes}`.
    Apricot-ale authored Dec 21, 2023
    Configuration menu
    Copy the full SHA
    e824485 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    4758923 View commit details
    Browse the repository at this point in the history

Commits on Jan 5, 2024

  1. Translation - Improve french translation (KAT-Advanced-Medical#461)

    Latest french translations
    
    **When merged this pull request will:**
    - Add the latest french translations (IFAK, continuous airways savin,
    tourniquet settings, etc..)
    - Not make me work on my exams
    
    ### IMPORTANT
    
    - [Development Guidelines](https://ace3.acemod.org/wiki/development/)
    are read, understood and applied.
    - Title of this PR uses our standard template `Component -
    Add|Fix|Improve|Change|Make|Remove {changes}`.
    Fanrod-Bones authored Jan 5, 2024
    Configuration menu
    Copy the full SHA
    cf2a873 View commit details
    Browse the repository at this point in the history

Commits on Jan 11, 2024

  1. Fix - Category, Unpacking & Repacking of IFAK, AFAK & MFAK (KAT-Advan…

    …ced-Medical#455)
    
    - Add IFAK / AFAK / MFAK to medical category
    - Adds FAK magazine stays in the same place now instead of moving around
    in the inventory when un/repacking.
    - Fixes repacking bug:
    https://ptb.discord.com/channels/528955370941579265/1187420825066938528
    - Fixes wrong FAK being deleted.
    MissHeda authored Jan 11, 2024
    Configuration menu
    Copy the full SHA
    22794ef View commit details
    Browse the repository at this point in the history
  2. Airway/Misc - Fixes for surgical kit autoclosing menu, weapon sway, r…

    …ecovery position (KAT-Advanced-Medical#457)
    
    **When merged this pull request will:**
    - Modify treatmentSuccess extra check to make it work as intended with
    callbackProgress, prevent surgical kit finishing from closing medical
    menu
    - Fix tourniquet sway factor multiplier removing all sway when
    tourniquet wasn't applied
    - Fix recovery position not clearing occlusion as intended
    
    ### IMPORTANT
    
    - [Development Guidelines](https://ace3.acemod.org/wiki/development/)
    are read, understood and applied.
    - Title of this PR uses our standard template `Component -
    Add|Fix|Improve|Change|Make|Remove {changes}`.
    BlueTheKing authored Jan 11, 2024
    Configuration menu
    Copy the full SHA
    25d0cf2 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    56fef50 View commit details
    Browse the repository at this point in the history

Commits on Jan 12, 2024

  1. Configuration menu
    Copy the full SHA
    210395c View commit details
    Browse the repository at this point in the history