Commit Graph

18 Commits

Author SHA1 Message Date
jokoho48
b2d2bec2cf Merge branch 'master' of https://github.com/acemod/ACE3 into delayUnconCaptiv
# Conflicts:
#	addons/medical/functions/fnc_setUnconscious.sqf
2016-02-23 15:31:38 +01:00
PabstMirror
c2f780e95f #1259 - Medical Locations Boost Training 2016-01-09 23:54:48 -06:00
jokoho48
6d49bbda28 add delay to Unconsciousness Captivity(posible fix for #3121) 2016-01-06 17:46:59 +01:00
jokoho48
d09ca9ec8b Code Cleanup Medical Module (Part 1). 2015-08-22 16:25:10 +02:00
AKALegman
1ae8e29ac2 updated isPlayer v2 2015-06-08 19:12:16 +01:00
Glowbal
80162627ec Fixed spelling of enableUnconsciousnessAI 2015-05-01 18:49:59 +02:00
KoffeinFlummi
965a976daf Reorganize AI unconsciousness 2015-04-30 22:16:45 +02:00
KoffeinFlummi
f28a806938 Remove max unconsciousness time again 2015-04-30 22:15:40 +02:00
KoffeinFlummi
fd152c580b Merge branch 'master' into basic-med-options
Conflicts:
	addons/medical/ACE_Settings.hpp
	addons/medical/functions/fnc_setUnconscious.sqf
2015-04-30 18:39:33 +02:00
Glowbal
11d86248a7 Reorganised module and settings #809 2015-04-25 22:20:28 +02:00
KoffeinFlummi
d1c95ba8a1 Add maximum unconsciousness time option 2015-04-23 11:31:27 +02:00
KoffeinFlummi
f6eeb5e3ba Add pain coefficient 2015-04-22 22:29:31 +02:00
Glowbal
147bb92541 Added setting to disable variable sync (recommended on) 2015-04-05 20:23:07 +02:00
Glowbal
a56e8745c3 fixed module settings 2015-04-04 21:59:18 +02:00
Glowbal
83fbc1ff10 Added setting to toggle litter creation on/off 2015-04-04 01:47:56 +02:00
Glowbal
d4a6dd1038 Removed the options to enable fractures and airway through mission module 2015-04-03 21:32:49 +02:00
Glowbal
d016874583 Expanded the medical settings 2015-03-08 12:05:52 +01:00
Glowbal
1c05f3578c Added moduleMedicalSettings 2015-03-07 13:06:33 +01:00