Commit Graph

77 Commits

Author SHA1 Message Date
Glowbal
ecf84ae039 Updated module classname to be inline with others 2015-04-05 19:27:28 +02:00
Glowbal
cf1f641424 Moved selfActions to a separate hpp file 2015-04-05 13:02:55 +02:00
esteldunedain
f417fa2285 Add medical actions while boarded. 2015-04-04 19:41:12 -03:00
Glowbal
77d39877d2 Merge branch 'master' into medicalImprovements 2015-04-04 22:01:15 +02:00
Glowbal
a56e8745c3 fixed module settings 2015-04-04 21:59:18 +02:00
Glowbal
5c3ee0dd1a Added settings to modules & fixed medicalVehicle module 2015-04-04 21:51:18 +02:00
Glowbal
d81dcba543 Added more litter variants 2015-04-04 12:13:42 +02:00
PabstMirror
07dfe52133 Remove Duplicate Mortar Code (inherit from statics)
Before an action added to staticWeapon wouldn't be applied to mk6 mortar
2015-04-03 19:07:13 -05:00
Glowbal
83fbc1ff10 Added setting to toggle litter creation on/off 2015-04-04 01:47:56 +02:00
Glowbal
7f45d25ee5 Added litter for medical treatment 2015-04-04 01:42:13 +02:00
Glowbal
7230687ea2 corrected revive setting classes 2015-04-04 00:30:59 +02:00
Glowbal
4ddb496d8b Added max Revive lives 2015-04-03 23:56:32 +02:00
Glowbal
36288fce43 Updated medical action config.
Added bodybag action
Added Tourniquet action to basic.
Added more displayNameProgress entries.
Removed deadcode
2015-04-03 22:59:28 +02:00
Glowbal
05389e7e25 Implemented useItems for treatment (basic and adv)
Will remove items on treatment start. Add again on treatmentFailure.
Based upon consumeItem config setting.
2015-04-03 22:40:36 +02:00
Glowbal
ecf16ad9f1 fixed prevent instant death setting 2015-04-03 21:49:46 +02:00
Glowbal
d4a6dd1038 Removed the options to enable fractures and airway through mission module 2015-04-03 21:32:49 +02:00
Glowbal
635f3e31c9 Disable medical carry and drag 2015-04-01 19:56:00 +02:00
PabstMirror
2eefb1265d Medical - morphine icon for left leg 2015-03-26 15:16:28 -05:00
Glowbal
975ad5a399 Merge branch 'master' into medical-fixes
Conflicts:
	addons/medical/CfgVehicles.hpp
2015-03-24 22:07:15 +01:00
Glowbal
2f729f67f1 Slightly increased the distance of medical actions
Removed sub menu medical on torso
2015-03-24 21:41:03 +01:00
Glowbal
f175467813 fixed #241 and #228 2015-03-24 21:08:13 +01:00
Nicolás Badano
77dc50f10f Some more fixes for self interaction inside vehicles 2015-03-24 16:06:03 -03:00
Nicolás Badano
4fb50fa71e Merge branch 'master' of github.com:KoffeinFlummi/ACE3 2015-03-24 15:44:10 -03:00
Nicolás Badano
8b3648cf8d Configure exceptions for self actions inside vehicles 2015-03-24 15:43:49 -03:00
bux578
05896a55ea fix authors 2015-03-24 19:40:48 +01:00
bux578
60c50e0daf Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into ModuleIcons 2015-03-24 19:12:23 +01:00
bux578
ba42ec831b second batch of icons 2015-03-23 20:02:35 +01:00
PabstMirror
2329212060 Medical Action Stringtable 2015-03-23 13:52:26 -05:00
bux578
1114e12186 add first batch of module icons, naming conventions 2015-03-23 13:56:59 +01:00
Glowbal
15edb0bff2 fixes 2015-03-22 23:24:24 +01:00
Glowbal
d7de92c60d Merge branch 'master' into Medical_Dragging
Conflicts:
	addons/medical/XEH_postInit.sqf
	addons/medical/XEH_preInit.sqf
2015-03-22 22:41:36 +01:00
Glowbal
9e43ab5c25 Merge branch 'master' into medical-advanced 2015-03-22 22:37:37 +01:00
Glowbal
4ff849c2fd Merge branch 'master' into medical-advanced 2015-03-22 22:34:07 +01:00
Glowbal
2d2687e759 Added self interact items 2015-03-22 17:28:48 +01:00
Glowbal
dd7dad1b90 define base class 2015-03-22 17:05:31 +01:00
Glowbal
f252b2c96f advanced medical JIP improvements 2015-03-22 17:04:42 +01:00
Glowbal
281bad1e7e Use of the ACE module instead of Module_F. 2015-03-22 12:44:26 +01:00
Glowbal
ac4309237b Added drag/carry actions 2015-03-22 10:28:41 +01:00
Nicolás Badano
5dcf29ba80 Merge pull request #212 from KoffeinFlummi/interactivePelvis
Move main interactions to pelvis; leave torso for medical
2015-03-21 20:44:18 -03:00
Felix Wiegand
be4f21ea2e Merge pull request #215 from KoffeinFlummi/medical-itemcheck
Medical itemcheck
2015-03-21 22:41:06 +01:00
Glowbal
a7d8914884 Removed GVAR/QGVAR from items 2015-03-21 22:22:28 +01:00
Glowbal
d73f16861b Merge pull request #213 from KoffeinFlummi/medical-advanced
Medical advanced
2015-03-21 21:02:35 +01:00
Nicolás Badano
f8ea603977 Added dynamic actions to unload patients (unconscious) from vehicles 2015-03-21 15:32:32 -03:00
Glowbal
7d6afdf1a9 Added triage card option 2015-03-21 17:30:49 +01:00
Glowbal
82ec93b84e Medical icons 2015-03-21 17:05:32 +01:00
Glowbal
7ae45fbeff Fixed canTreatCached 2015-03-21 16:47:51 +01:00
Glowbal
1d63e94fff canTreatCached 2015-03-21 16:33:14 +01:00
Nicolás Badano
d7363a6dab Move main interactions to pelvis; leave torso for medical 2015-03-21 11:01:38 -03:00
KoffeinFlummi
a060e4bea5 Apply translations to epipen and morphine actions 2015-03-21 00:31:47 +01:00
KoffeinFlummi
510538bc53 Remove superfluous todo 2015-03-21 00:26:14 +01:00