Sync changes #3
Merged
Sync changes #3
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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}`.
…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]>
…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}`.
This should fix grammatical errors I've made in the past. It also includes a fix for an English typo of Lorazepam.
…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}`.
…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}`.
…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}`.
**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}`.
…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]>
- Added BVM using to Korean translation --------- Co-authored-by: MiszczuZPolski <[email protected]>
**When merged this pull request will:** - Add new items: IFAK, AFAK, MFAK  - Add according addon settings to configure everything to your liking.  - Add individual unpack & repack options to not unpack the whole FAK.   - [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]>
Bump version for DEV update
…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]>
**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}`.
…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}`.
…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}`.
**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}`.
**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}`.
**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}`.
…#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}`.
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}`.
…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.
…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}`.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
update