SilentSpike
|
895f08a215
|
Reset triage card on full heal (#6243)
|
2018-04-11 20:34:32 +01:00 |
|
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 |
|
PabstMirror
|
3907d2dc9f
|
Cleanup moved functions
|
2016-12-09 21:27:42 -06:00 |
|
ulteq
|
a88be4f458
|
Fixed 'displayPatientInformation'
|
2016-12-05 23:00:02 +01: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 |
|
Glowbal
|
38cdd523f0
|
Clean up medical function private declares
|
2016-06-13 14:27:43 +02:00 |
|
commy2
|
a9ebcf8543
|
fix setVariable and getVariable capitalization
|
2015-11-30 17:27:09 +01:00 |
|
commy2
|
b3950bd7f0
|
fix forEach capitalization
|
2015-11-30 17:23:48 +01:00 |
|
commy2
|
2b05f6f451
|
fix isNil capitalization
|
2015-11-30 17:22:16 +01:00 |
|
commy2
|
5e41643cff
|
fix pushBack capitalization
|
2015-11-30 17:21:28 +01:00 |
|
commy2
|
34d351c652
|
fix exitWith capitalization
|
2015-11-30 17:14:05 +01:00 |
|
commy2
|
b737f42777
|
fix error when opening triage card
|
2015-09-03 18:30:29 +02:00 |
|
jokoho48
|
d09ca9ec8b
|
Code Cleanup Medical Module (Part 1).
|
2015-08-22 16:25:10 +02:00 |
|
jonpas
|
763cb07629
|
Macro STRING to LSTRING
|
2015-05-28 21:59:04 +02:00 |
|
jonpas
|
6072e14077
|
Changed all strings to macros (except external)
|
2015-05-27 19:04:25 +02:00 |
|
KoffeinFlummi
|
85669a9e92
|
Convert Medical stringtable key names to lowercase
|
2015-04-30 22:01:09 +02:00 |
|
PabstMirror
|
eb5af0cd89
|
Medical Private Variables
|
2015-04-30 01:17:26 -05:00 |
|
bux578
|
171cea998e
|
add most of the translations
|
2015-04-26 09:36:51 +02:00 |
|
Glowbal
|
4c6dad69f9
|
Should fix #347. Could not reproduce but this at least fixes some issues (which most likely caused the error)
|
2015-04-06 19:43:27 +02:00 |
|
Glowbal
|
9e3bb8ac95
|
fixed triage card
|
2015-04-05 22:07:38 +02:00 |
|
Glowbal
|
1da67d7b48
|
First draft of triage card
|
2015-03-10 21:12:35 +01:00 |
|