PabstMirror
356a8f640a
Merge branch 'master' into medical-rewrite
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
2017-06-10 10:21:18 -05:00
..
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2016-09-04 16:44:22 +02:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2016-10-02 12:55:31 +02:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2015-12-12 16:48:54 +01:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2017-03-15 10:11:37 -05:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2016-10-02 12:55:31 +02:00
2017-06-08 15:31:51 +02:00
2016-04-08 20:34:50 +02:00
2016-10-02 12:55:31 +02:00
2017-06-08 15:31:51 +02:00
2016-09-04 16:44:22 +02:00
2017-06-08 15:31:51 +02:00
2016-06-09 14:28:31 +02:00
2017-06-08 11:47:52 -05:00
2016-10-06 00:54:57 +02:00
2016-07-13 11:00:31 +02:00
2017-06-08 15:31:51 +02:00
2017-05-26 16:07:33 +01:00
2017-05-18 12:42:02 -05:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2017-05-18 12:42:02 -05:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2016-10-06 00:54:57 +02:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2015-12-12 16:48:54 +01:00
2015-12-12 16:48:54 +01:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2017-05-14 14:48:05 -05:00
2015-12-12 16:48:54 +01:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2015-12-12 16:48:54 +01:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2015-12-12 16:48:54 +01:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2015-12-12 16:48:54 +01:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2017-06-10 10:21:18 -05:00
2017-06-10 11:41:01 +01:00
2017-06-10 11:41:01 +01:00
2015-09-19 22:27:23 +02:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2015-12-18 11:08:10 -06:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2016-09-30 15:51:03 +02:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2016-10-02 12:55:31 +02:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2016-06-18 11:50:41 +02:00
2016-01-06 15:57:09 +01:00
2017-06-08 15:31:51 +02:00
2016-06-02 20:13:09 -05:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2016-05-20 11:23:14 -05:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2016-10-27 19:54:58 +02:00
2017-06-08 15:31:51 +02:00
2016-10-02 12:55:31 +02:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2017-05-18 12:42:02 -05:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2016-01-19 09:39:06 -06:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2016-09-30 15:51:03 +02:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2017-05-14 14:48:05 -05:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2016-06-03 22:39:43 +01:00
2017-06-08 15:31:51 +02:00
2016-05-31 22:36:08 +02:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2017-06-08 15:31:51 +02:00
2016-10-04 05:29:37 +02:00