Ľuboš Lendáč
b91e892710
Merge branch 'medical-rewrite' into medical-rewrite-kill-ai
2017-06-05 22:54:03 +02:00
PabstMirror
f98b268419
Split setUnconscious func, add spontaneousWakeUpChance setting ( #5114 )
2017-06-05 11:42:46 -05:00
Arcanum
2e856063cb
Fix option in setting module
2017-05-22 22:43:03 +02:00
Arcanum
9895881ad9
Add options to disable AI going unconscious and for AI to die instantly
2017-05-22 22:16:18 +02:00
PabstMirror
97ec22bd9a
Switch heartbeat to waitAndExec, allow switching pain settings
2017-02-18 22:11:40 -06:00
ViperMaul
ba810a22e6
Tab clean up.
2017-01-19 18:38:51 -06:00
ViperMaul
567c9129b2
cleanup
2017-01-19 17:23:54 -06:00
ViperMaul
8db5d8f2ae
Change Setting from Basic to Normal and Stringtable moves
2017-01-19 15:46:44 -06:00
ViperMaul
6972af9d0b
Settings and string changes
2017-01-19 15:30:27 -06:00
ViperMaul
69dc3ba12e
Add Settings to Medical Settings Module
2017-01-19 11:48:34 -06:00
ulteq
c486f17539
Implemented Medkit (works like in ACE2)
2016-12-08 18:11:24 +01: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
Joko
927d8ead8f
add Hiddenselection camo to bodybag for Retexturing ( #4276 )
...
* add Hiddenselection camo to bodybag
* Add default texture
* Use macro
2016-08-24 12:42:32 -05:00
commy2
8a8bc6a336
remove hitpoint config from medical-main component
2016-07-30 17:23:08 +02:00
Glowbal
ddb4ef42f3
Add stringtables and items
2016-07-15 12:21:56 +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
Glowbal
a8831a0d16
Change split medical in two components
...
- medical component is responsible for the injuries and common functionality
- medical_treatment component is responsible for offering treatment functionality
2016-06-13 17:00:56 +02:00
jonpas
7a307393a4
Merge branch 'master' into useQuotedPathMacros
2016-05-30 21:14:17 +02:00
jonpas
ccaec31a90
Use new QFUNC and QEFUNC macros
2016-04-08 20:43:26 +02:00
jonpas
85b4366368
Use new QPATHTOF and QPATHTOEF macros
2016-04-08 20:34:50 +02:00
Thomas Kooi
60af0d3162
Merge pull request #3456 from acemod/StandardizeConfigArrayGVAR
...
Standardize GVAR array brackets in configs.
2016-03-08 18:19:50 +01:00
commy2
fa3913752b
replace XEH_ENABLED macro with actual class, fix #3482 , fix #3483
2016-03-01 17:05:00 +01:00
VKing
8bb7b072d4
Standardize grammar of GVAR arrays in configs to place the square brackets outside the GVAR macro.
...
This prevents any possible confusion when the GVARs are used in code.
2016-02-28 15:18:15 +01:00
Glowbal
575f362fb6
Add setting for limiting usage of Epinephrine in basic medical #1792
...
Part of focus feature medical #3134 . Default settings are inline with old default.
2016-02-07 13:10:38 +01:00
Glowbal
bfd90cd5d3
Add Adenosine to replace atropine #1573
2016-02-07 12:54:23 +01:00
PabstMirror
c2f780e95f
#1259 - Medical Locations Boost Training
2016-01-09 23:54:48 -06:00
commy2
5a1aae6028
manual merge
2015-11-30 17:44:15 +01:00
commy2
a9ebcf8543
fix setVariable and getVariable capitalization
2015-11-30 17:27:09 +01:00
Thomas Kooi
5282e95668
Merge pull request #2876 from acemod/medicalTranslateHP
...
Medical Fixes
2015-11-28 20:58:08 +01:00
ViperMaul
8d4364350c
Fix for "double semicolon detected" error
2015-11-27 10:43:30 -08:00
PabstMirror
988a5c76bb
Medical - 1.54 Changes
...
1.54 Armor
Translate selectiosn to hitpoints
Calc newDamage using hitIndex (because sel is translated)
Fix isFalling never being reset
Cache hitpointIndex to reset damage
Normalize Limb Armor to 1.54
Cleanup
Cleanup
2015-11-25 11:49:20 -06:00
PabstMirror
20bf90f3e9
Medical - Fix Hitpoints Macro when building
2015-11-24 16:30:09 -06:00
PabstMirror
c2564de5ef
Fix UBC for 1.54
...
Soldiers no longer inherit hitpoints from CaManBase
Adds a macro to deal with them
2015-11-20 23:27:29 -06:00
PabstMirror
64de91ed06
Add warning for duplicate setting modules.
2015-10-18 23:34:11 -05:00
SilentSpike
35d94e8d5c
Fix medical litter scopeCurator values
...
Solves #2526 where medical litter would appear in zeus with no name.
2015-09-19 19:37:38 +01:00
commy2
adb1a11211
increase leg and arm armor value, more TRACE debug
2015-09-06 11:49:08 +02:00
commy2
0bd92af072
fix variables not inited, csat armor scaleing
2015-09-03 17:17:54 +02:00
commy2
e753131f2d
arms and legs to vulnerable, better scaling for pilots and csat
2015-09-03 16:17:48 +02:00
commy2
7d2f1f52a4
remove protection, hitpoint config (fix ubc), some debug stuff
2015-09-02 20:13:51 +02:00
commy2
5a164c5cdc
fix UBC issues, simplify uniform hitpoint config
2015-08-31 23:36:59 +02:00
Glowbal
6796b3126d
Staged work on fixing updating base classes for hitpoints
2015-08-29 12:59:28 +02:00
SzwedzikPL
a8c11a249d
cargo sup for bodybag and concertina
2015-08-20 21:41:28 +02:00
jonpas
8e3a961ee3
Fixed missing string
2015-08-08 18:11:28 +02:00
jonpas
1aecd54fc3
Removed duplicated Enabled/Disabled/Yes/No/DoNotForce strings as they were moved to common
2015-08-08 18:02:20 +02:00
PabstMirror
6ab72e905c
#1807 - Clean bandages if no damage on hitpoint
2015-08-05 17:32:00 -05:00
SzwedzikPL
6258e73290
addX macro in confgis
2015-07-25 21:59:52 +02:00
Joko
9bdb192c8a
Add New LitterGloves
...
Add New Litter/packingbandage
Change all Litter Model and Texture to a nomenclature (littergeneric_name)
2015-07-19 15:31:15 +02:00
Joko
fa900452ea
Add DAGR (by Blackpixxel)
...
Add QuikClot to Medical (by Blackpixxel)
Add QuikClot Litter (by Blackpixxel)
Update Blackpixxel at Author
Fix IRStrobe Texture Path
2015-07-05 22:21:17 +02:00
Glowbal
fd649aee38
Changed default value for surgical kit. Should be use anytime
2015-07-03 22:17:31 +02:00
Glowbal
9edf1b1adf
Implemented use conditions for PAK and SurgicalKit
...
It is now possible to only have a treatment action show up for stable (not bleeding) patients
2015-07-03 22:16:18 +02:00
