PabstMirror 5c4dbdcbda Merge branch 'master' into medical-rewrite ...

Conflicts:
	addons/medical/ACE_Settings.hpp
	addons/medical/XEH_postInit.sqf
	addons/medical/functions/fnc_adjustPainLevel.sqf
	addons/medical/functions/fnc_copyDeadBody.sqf
	addons/medical/functions/fnc_getTriageStatus.sqf
	addons/medical/functions/fnc_handleBandageOpening.sqf
	addons/medical/functions/fnc_handleCollisionDamage.sqf
	addons/medical/functions/fnc_handleDamage_fractures.sqf
	addons/medical/functions/fnc_handleDamage_woundsOld.sqf
	addons/medical/functions/fnc_init.sqf
	addons/medical/functions/fnc_moduleAssignMedicalFacility.sqf
	addons/medical/functions/fnc_parseConfigForInjuries.sqf
	addons/medical/functions/fnc_setDead.sqf
	addons/medical/functions/fnc_setHitPointDamage.sqf
	addons/medical/functions/fnc_setUnconscious.sqf
	addons/medical/functions/fnc_showBloodEffect.sqf
	addons/medical/functions/fnc_unconsciousPFH.sqf
	addons/medical/stringtable.xml
	addons/medical_ai/functions/fnc_healUnit.sqf
	addons/medical_ai/functions/fnc_isInjured.sqf
	addons/medical_menu/functions/fnc_handleUI_DisplayOptions.sqf

2017-10-24 16:13:12 -05:00

..

fnc_addDamageToUnit.sqf

Clenaup / Debug

2017-04-26 10:16:09 -05:00

fnc_addStateHandler.sqf

misc cleanup, 1 sec min delay for vital loop

2017-04-22 10:57:32 -05:00

fnc_adjustPainLevel.sqf

Refactor private ARRAY to private keyword (#5598)

2017-10-10 09:39:59 -05:00

fnc_bodyCleanupLoop.sqf

Conform function headers to coding guidelines (#5255)

2017-06-08 15:31:51 +02:00

fnc_conditionCardiacArrestTimer.sqf

Add 10% variation to cardiac arrest time

2016-11-15 17:00:22 +00:00

fnc_conditionExecutionDeath.sqf

Clarify the allowDeathMode setting

2016-11-13 21:27:40 +00:00

fnc_dev_watchMedicalStats.sqf

Reset isLimping var

2017-09-26 17:43:54 -05:00

fnc_displayPatientInformation.sqf

Merge branch 'master' into medical-rewrite

2017-10-24 16:13:12 -05:00

fnc_displayTriageCard.sqf

Merge branch 'master' into medical-rewrite

2017-06-10 10:21:18 -05:00

fnc_enteredStateCardiacArrest.sqf

Merge pull request #4668 from acemod/medical-rewrite-cardiacArrestLimits

2016-12-08 14:22:11 +01:00

fnc_enteredStateFatalInjury.sqf

Fixed instant death and PREP

2016-11-07 23:46:10 +01:00

fnc_getBloodLoss.sqf

Merge branch 'master' into medical-rewrite

2017-06-10 10:21:18 -05:00

fnc_getBloodPressure.sqf

Merge branch 'master' into medical-rewrite

2017-06-10 10:21:18 -05:00

fnc_getBloodVolumeChange.sqf

Merge branch 'master' into medical-rewrite

2017-06-10 10:21:18 -05:00

fnc_getCardiacOutput.sqf

Merge branch 'master' into medical-rewrite

2017-06-10 10:21:18 -05:00

fnc_getPainLevel.sqf

Various fixes:

2016-12-06 17:26:11 +01:00

fnc_getUnitState.sqf

[Medical Rewrite] Adding respawn compatibility (#5020)

2017-06-17 18:28:16 -05:00

fnc_handleIncapacitation.sqf

Clenaup / Debug

2017-04-26 10:16:09 -05:00

fnc_handleKilled.sqf

Merge branch 'master' into medical-rewrite

2017-06-10 10:21:18 -05:00

fnc_handleLocal.sqf

Merge branch 'master' into medical-rewrite

2017-06-10 10:21:18 -05:00

fnc_handleRespawn.sqf

Add respawn/state logging

2017-09-27 12:06:03 -05:00

fnc_handleStateDefault.sqf

Added 'DEFAULT_HEART_RATE' constant

2016-12-09 12:57:27 +01:00

fnc_handleStateInjured.sqf

Added 'DEFAULT_HEART_RATE' constant

2016-12-09 12:57:27 +01:00

fnc_handleStateUnconscious.sqf

Split setUnconscious func, add spontaneousWakeUpChance setting (#5114)

2017-06-05 11:42:46 -05:00

fnc_handleUnitVitals.sqf

Merge branch 'master' into medical-rewrite

2017-06-10 10:21:18 -05:00

fnc_hasStableVitals.sqf

misc cleanup, 1 sec min delay for vital loop

2017-04-22 10:57:32 -05:00

fnc_hasTourniquetAppliedTo.sqf

Merge branch 'master' into medical-rewrite

2017-06-10 10:21:18 -05:00

fnc_init.sqf

Merge branch 'master' into medical-rewrite

2017-10-24 16:13:12 -05:00

fnc_install.sqf

Add first step in medical rewrite

2016-06-30 17:33:29 +02:00

fnc_isBeingCarried.sqf

Minor optimizations using private, params, and isEqualType (#4323)

2016-09-04 16:44:22 +02:00

fnc_isBeingDragged.sqf

Minor optimizations using private, params, and isEqualType (#4323)

2016-09-04 16:44:22 +02:00

fnc_isInMedicalFacility.sqf

Conform function headers to coding guidelines (#5255)

2017-06-08 15:31:51 +02:00

fnc_isInMedicalVehicle.sqf

misc cleanup, 1 sec min delay for vital loop

2017-04-22 10:57:32 -05:00

fnc_isInStableCondition.sqf

Add load,unload and radial actions (#5270)

2017-06-15 14:35:33 -05:00

fnc_isMedic.sqf

Use getUnitTrait for medics, engineers and EOD (#5246)

2017-06-10 11:41:01 +01:00

fnc_isMedicalVehicle.sqf

Merge branch 'master' into medical-rewrite

2017-06-10 10:21:18 -05:00

fnc_leftStateCardiacArrest.sqf

Various fixes:

2016-12-06 17:26:11 +01:00

fnc_moduleAssignMedicalVehicle.sqf

Conform function headers to coding guidelines (#5255)

2017-06-08 15:31:51 +02:00

fnc_moduleAssignMedicRoles.sqf

Conform function headers to coding guidelines (#5255)

2017-06-08 15:31:51 +02:00

fnc_moduleMedicalSettings.sqf

Merge branch 'master' into medical-rewrite

2017-06-10 10:21:18 -05:00

fnc_serverRemoveBody.sqf

Conform function headers to coding guidelines (#5255)

2017-06-08 15:31:51 +02:00

fnc_setCardiacArrest.sqf

Remove legacy code (#4960)

2017-06-17 14:01:59 -05:00

fnc_setDead.sqf

Priority ERROR units never die possibility (#5526)

2017-10-10 11:06:07 -05:00

fnc_setUnconscious.sqf

fix the delay timing when a unit switch to Captive (#5338)

2017-10-10 11:30:31 -05:00

fnc_setUnconsciousStatemachine.sqf

Add load,unload and radial actions (#5270)

2017-06-15 14:35:33 -05:00

fnc_transitionSecondChance.sqf

Merged instant death and execution into one setting

2016-11-09 19:01:55 +01:00

fnc_updateHeartRate.sqf

misc cleanup, 1 sec min delay for vital loop

2017-04-22 10:57:32 -05:00

fnc_updatePainSuppress.sqf

Fix bad var names

2017-05-14 15:14:22 -05:00

fnc_updatePeripheralResistance.sqf

misc cleanup, 1 sec min delay for vital loop

2017-04-22 10:57:32 -05:00

script_component.hpp

Add first step in medical rewrite

2016-06-30 17:33:29 +02:00