mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00

History

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

functions

Merge branch 'master' into medical-rewrite

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

Add garrison zeus modules (#4555 )

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

$PBOPREFIX$

added zeus changes module

2015-05-09 20:24:39 +01:00

ACE_Settings.hpp

Rewrite global AI skill zeus module

2016-05-16 15:16:53 +01:00