Update from original #2
Merged
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
Conflicts: addons/medical/functions/fnc_treatment_failure.sqf addons/medical/functions/fnc_treatment_success.sqf
This reverts commit 31e1e29.
Conflicts: addons/medical/functions/fnc_determineIfFatal.sqf addons/medical/functions/fnc_displayPatientInformation.sqf
* Bundle fire damage into bigger chunks Redo #4223 * Use same values * Decrease combine cuttoff to 0.1
* Tweak randomness for wound bleeding and pain * Scale damage to bodyPartDamage on multi part wounds
Conflicts: addons/medical/functions/fnc_actionCheckBloodPressure.sqf addons/medical/functions/fnc_actionCheckBloodPressureLocal.sqf addons/medical/functions/fnc_actionCheckPulse.sqf addons/medical/functions/fnc_actionCheckPulseLocal.sqf addons/medical/functions/fnc_actionDiagnose.sqf addons/medical/functions/fnc_actionRemoveTourniquet.sqf addons/medical/functions/fnc_addHeartRateAdjustment.sqf addons/medical/functions/fnc_addToInjuredCollection.sqf addons/medical/functions/fnc_addUnconsciousCondition.sqf addons/medical/functions/fnc_addVitalLoop.sqf addons/medical/functions/fnc_canTreat.sqf addons/medical/functions/fnc_copyDeadBody.sqf addons/medical/functions/fnc_createLitter.sqf addons/medical/functions/fnc_determineIfFatal.sqf addons/medical/functions/fnc_getBloodLoss.sqf addons/medical/functions/fnc_getBloodPressure.sqf addons/medical/functions/fnc_getBloodVolumeChange.sqf addons/medical/functions/fnc_getCardiacOutput.sqf addons/medical/functions/fnc_getHeartRateChange.sqf addons/medical/functions/fnc_getTriageStatus.sqf addons/medical/functions/fnc_getUnconsciousCondition.sqf addons/medical/functions/fnc_handleBandageOpening.sqf addons/medical/functions/fnc_handleCollisionDamage.sqf addons/medical/functions/fnc_handleDamage.sqf addons/medical/functions/fnc_handleDamage_advanced.sqf addons/medical/functions/fnc_handleDamage_advancedSetDamage.sqf addons/medical/functions/fnc_handleDamage_airway.sqf addons/medical/functions/fnc_handleDamage_caching.sqf addons/medical/functions/fnc_handleDamage_fractures.sqf addons/medical/functions/fnc_handleDamage_internalInjuries.sqf addons/medical/functions/fnc_handleDamage_wounds.sqf addons/medical/functions/fnc_handleDamage_woundsOld.sqf addons/medical/functions/fnc_hasMedicalEnabled.sqf addons/medical/functions/fnc_hasTourniquetAppliedTo.sqf addons/medical/functions/fnc_isInStableCondition.sqf addons/medical/functions/fnc_isMedicalVehicle.sqf addons/medical/functions/fnc_itemCheck.sqf addons/medical/functions/fnc_medicationEffectLoop.sqf addons/medical/functions/fnc_modifyMedicalAction.sqf addons/medical/functions/fnc_moduleAdvancedMedicalSettings.sqf addons/medical/functions/fnc_moduleAssignMedicalFacility.sqf addons/medical/functions/fnc_moduleBasicMedicalSettings.sqf addons/medical/functions/fnc_moduleReviveSettings.sqf addons/medical/functions/fnc_parseConfigForInjuries.sqf addons/medical/functions/fnc_playInjuredSound.sqf addons/medical/functions/fnc_reviveStateLoop.sqf addons/medical/functions/fnc_selectionNameToNumber.sqf addons/medical/functions/fnc_setDead.sqf addons/medical/functions/fnc_setHitPointDamage.sqf addons/medical/functions/fnc_setStructuralDamage.sqf addons/medical/functions/fnc_setUnconscious.sqf addons/medical/functions/fnc_showBloodEffect.sqf addons/medical/functions/fnc_treatment.sqf addons/medical/functions/fnc_treatmentAdvanced_CPR.sqf addons/medical/functions/fnc_treatmentAdvanced_CPRLocal.sqf addons/medical/functions/fnc_treatmentAdvanced_bandage.sqf addons/medical/functions/fnc_treatmentAdvanced_bandageLocal.sqf addons/medical/functions/fnc_treatmentAdvanced_fullHeal.sqf addons/medical/functions/fnc_treatmentAdvanced_fullHealLocal.sqf addons/medical/functions/fnc_treatmentAdvanced_medication.sqf addons/medical/functions/fnc_treatmentAdvanced_medicationLocal.sqf addons/medical/functions/fnc_treatmentBasic_bloodbag.sqf addons/medical/functions/fnc_treatmentBasic_bloodbagLocal.sqf addons/medical/functions/fnc_treatmentBasic_epipen.sqf addons/medical/functions/fnc_treatmentBasic_morphine.sqf addons/medical/functions/fnc_treatmentBasic_morphineLocal.sqf addons/medical/functions/fnc_treatmentIV.sqf addons/medical/functions/fnc_treatmentIVLocal.sqf addons/medical/functions/fnc_treatmentTourniquet.sqf addons/medical/functions/fnc_treatmentTourniquetLocal.sqf addons/medical/functions/fnc_treatment_failure.sqf addons/medical/functions/fnc_treatment_success.sqf addons/medical/functions/fnc_unconsciousPFH.sqf addons/medical/functions/fnc_useItem.sqf addons/medical/functions/fnc_vitalLoop.sqf addons/medical_blood/functions/fnc_hit.sqf addons/medical_treatment/functions/fnc_hasItem.sqf addons/medical_treatment/functions/fnc_useItems.sqf
- Add radial actions - Revert back to using 'ACE_isUnconscious'
* Added respawn transition * Removed respawn transition from statemachine and added manual transition comment * Changed transiton to manual. Added easy way to get current status as well * Updated event reference * Fixed manualTransition call * Minor headers changes
* Added condition canStitch * Update XEH_PREP.hpp * Update addons/medical_treatment/functions/fnc_canStitch.sqf Co-Authored-By: Katalam <39590058+Katalam@users.noreply.github.com> * Added example, removed arguments information and changed > to isEqualTo * Added example in canBandage too
* Zeus/Medical - Fix modules for rewrite * move wakeup logic to medical_treatment
* RHS Compat - Add 2 rnd hellfire pylon Close #5957 * change magwell name * gvar->addon
* Fastroping - Add user setting to confirm cutting ropes * always confirm * fix * Update stringtable.xml
compatibility with CBA scripted 2d optics framework
* Fixes medical events not appearing in MP (when unit is non local) Adds name to AUTHORS.txt (forgot to do this in other PRs) * Fixes missing oef line * Update addons/medical_treatment/XEH_postInit.sqf Co-Authored-By: redbery <rutger@meijering.me> * delete rogue character
Close #6924 Co-Authored-By: drofseh <drofseh@users.noreply.github.com>
* Medical Fedback - fix heart rate effect and limit setVar for acre/tfar * Apply suggestions from code review Co-Authored-By: PabstMirror <pabstmirror@gmail.com> * Update XEH_postInit.sqf * use "task_force_radio"
[ACE Arsenal] Fix NVGs not being subject to blacklisting in loadouts
compatibility with CBA disposable framework
* Refuel - Drop nozzle at unit's feet if no valid pos found Fix #6944 * Update fnc_dropNozzle.sqf * Update addons/refuel/functions/fnc_dropNozzle.sqf Co-Authored-By: PabstMirror <pabstmirror@gmail.com>
* Common - Don't add UAV AI to localUnits array * Update addons/common/functions/fnc_setupLocalUnitsHandler.sqf Co-Authored-By: PabstMirror <pabstmirror@gmail.com>
#6932) * fastroping_fnc_deequipFRIES, remove FRIES on vehicle deletion * Prevent FRIES from clipping into Ghost Hawk right door * UNequipFRIES * Remove fastroping checkVehicleThread * Document FRIES equip and unequip functions
* Medical Feedback - Fix DISABLE_VANILLA_DAMAGE_EFFECTS * Keep compatibilty with old ace_medical_lastDamageSource var name
…6910) * Improve adjustment calcs / wound blood loss / medications fix func descriptions Calc wound blood loss on events reorder includes so scritpmacroMed has global effect trivial optimization for getCardiacOutput Fix var Fix wounds not reopening (nil _category) Fix surgical kit inherting canBandage conditional debug hitpoints Update ACE_Medical_Treatment_Actions.hpp Use woundBleeding for IS_BLEEDING macro rework medication vars comments Reset var in init / fullHeal Update addons/medical_treatment/functions/fnc_onMedicationUsage.sqf Co-Authored-By: PabstMirror <pabstmirror@gmail.com> * Update addons/medical_treatment/functions/fnc_onMedicationUsage.sqf Co-Authored-By: PabstMirror <pabstmirror@gmail.com>
Automatically committed through Travis CI. [ci skip]
classicarma
pushed a commit
that referenced
this pull request
Dec 19, 2019
Merge pull request acemod#7287 from dfr1238/master
classicarma
pushed a commit
that referenced
this pull request
Aug 28, 2020
* Added Bandage Reopening Chance Modifier * Added Wound Reopen Chance Addon Setting * Fixed dumb error in localization setup * Credit! * Resolved issue with Addon Settings definition & removed testing values. * PR Feedback #1 - Removed unnecessary whitespace on LN 46 - Call global var directly at LN 87 - Updated Wound Reopen Chance localized name & description * PR Feedback #2 - Increased reopen coefficient upper limit from 2 to 5. * Changed author credit to reflect GitHub email.
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.
When merged this pull request will: