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
Phyma
ffaa195fe5
Conform function headers to coding guidelines ( #5255 )
...
* Fixed headers to work with silentspike python script
* Fixed rest of the files
* Fixed ace-team
2017-06-08 15:31:51 +02:00
ulteq
a5ce5b4a34
Medical Rewrite - Continued ( #4744 )
2016-12-05 21:34:20 +01:00
commy2
5613ec5d5a
treatment functions and unconsciousness rework
2016-10-06 00:54:57 +02:00
Glowbal
0c43c83b3d
Merge branch 'master'
...
Conflicts:
addons/medical/ACE_Settings.hpp
addons/medical/XEH_postInit.sqf
addons/medical/XEH_preInit.sqf
addons/medical/functions/fnc_actionDiagnose.sqf
addons/medical/functions/fnc_actionLoadUnit.sqf
addons/medical/functions/fnc_addDamageToUnit.sqf
addons/medical/functions/fnc_createLitter.sqf
addons/medical/functions/fnc_displayPatientInformation.sqf
addons/medical/functions/fnc_handleCreateLitter.sqf
addons/medical/functions/fnc_handleDamage.sqf
addons/medical/functions/fnc_handleDamage_advanced.sqf
addons/medical/functions/fnc_handleDamage_airway.sqf
addons/medical/functions/fnc_handleDamage_caching.sqf
addons/medical/functions/fnc_handleDamage_internalInjuries.sqf
addons/medical/functions/fnc_handleDamage_wounds.sqf
addons/medical/functions/fnc_isBeingCarried.sqf
addons/medical/functions/fnc_isBeingDragged.sqf
addons/medical/functions/fnc_litterCleanupLoop.sqf
addons/medical/functions/fnc_moduleAssignMedicRoles.sqf
addons/medical/functions/fnc_moduleAssignMedicalVehicle.sqf
addons/medical/functions/fnc_setCardiacArrest.sqf
addons/medical/functions/fnc_showBloodEffect.sqf
addons/medical/functions/fnc_treatmentAdvanced_fullHealLocal.sqf
addons/medical/functions/fnc_treatmentAdvanced_surgicalKit_onProgress.sqf
addons/medical/functions/fnc_treatmentBasic_epipen.sqf
addons/medical/functions/fnc_treatmentIV.sqf
addons/medical/functions/fnc_treatmentIVLocal.sqf
2016-09-18 11:51:21 +02:00
Glowbal
b489750d5b
Minor optimizations using private, params, and isEqualType ( #4323 )
...
* Optimizations with private, params, and isEqualType
* Fixed tab being used instead of space
* Fixed tabs inserted by notepad++
* More usage of new private syntax and params
- changed a few checks for an array being empty to `_arr isEqualTo []`
rather than `count _arr == 0`
- added more uses of `private` on the same line as the variable is
declared
- added more uses of params to assign variables passed as parameters
- removed unnecessary parentheses
- removed several unnecessary variable declarations with private array
syntax
* clean up and formatting
2016-09-04 16:44:22 +02:00
Glowbal
da661afe9b
Improve syntax
2016-07-07 17:22:08 +02:00
Glowbal
d0236a007a
Work done on medical states
2016-07-07 11:46:55 +02:00
Glowbal
3aa88c80bf
Add first step in medical rewrite
...
Split up medical core and medical damage. Move out all other functionality
2016-06-30 17:33:29 +02:00
commy2
da70854568
manual merge
2016-05-18 11:48:27 +02:00
commy2
467075ad67
replace timePFH with CBA_missionTime
2016-03-02 11:01:39 +01:00
esteldunedain
3bbabac2d7
Rename and add comments to the function that tracks the units vital loop. Use waitAndExecute instead of a pfh for better performance.
2016-02-28 20:12:56 -03:00
commy2
a9ebcf8543
fix setVariable and getVariable capitalization
2015-11-30 17:27:09 +01:00
jokoho48
d09ca9ec8b
Code Cleanup Medical Module (Part 1).
2015-08-22 16:25:10 +02:00
jaynus
c924baefd7
All instances of time and diagTicktime changed to ACE_time / ACE_diagTime.
2015-05-21 09:42:44 -07:00
PabstMirror
436e50411a
Medical - Fix Uncon PFEH argument changes
2015-05-01 22:42:43 -05:00
Glowbal
f7719f0e0a
tab
2015-04-20 22:08:31 +02:00
Glowbal
fa7bb5f9c6
Added unconscious state check
2015-04-17 21:28:47 +02:00
Glowbal
008c36ac76
fixes #699
2015-04-17 21:27:57 +02:00
Glowbal
85cbe5eb5f
Added support for locality switch and killed units
2015-03-08 17:50:06 +01:00
