Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,070 Commits 73 Branches 88 Tags 752 MiB
5f4a7d7b46
Commit Graph

111 Commits

Author SHA1 Message Date
Glowbal
7b519fc2e0 Merge branch 'master' into Medical_Dragging 
Conflicts:
	addons/medical/XEH_postInit.sqf
	addons/medical/stringtable.xml
 2015-03-22 09:46:58 +01:00
Felix Wiegand
be4f21ea2e Merge pull request #215 from KoffeinFlummi/medical-itemcheck 
Medical itemcheck
 2015-03-21 22:41:06 +01:00
KoffeinFlummi
f6f910fb8a Replace vanilla items with ours. 2015-03-21 21:59:08 +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
1d63e94fff canTreatCached 2015-03-21 16:33:14 +01:00
Glowbal
dcf3a73518 Added copyDeadBody function 2015-03-14 09:48:16 +01:00
Glowbal
4ce524ed3c First draft of carry and drop unit 2015-03-12 21:16:49 +01:00
Glowbal
1da67d7b48 First draft of triage card 2015-03-10 21:12:35 +01:00
Glowbal
85cbe5eb5f Added support for locality switch and killed units 2015-03-08 17:50:06 +01:00
Glowbal
d016874583 Expanded the medical settings 2015-03-08 12:05:52 +01:00
Glowbal
5718649639 Added medic, medical vehicle and medical facility modules 2015-03-07 13:25:28 +01:00
Glowbal
1c05f3578c Added moduleMedicalSettings 2015-03-07 13:06:33 +01:00
Glowbal
a724fb406a Added triage status 2015-03-05 20:55:38 +01:00
Glowbal
f690e54af3 Added displayPatientInformation draft 2015-03-01 16:04:53 +01:00
Glowbal
91a52a4b76 Added support for JIP injury synchronizing 
Enabled heart beat sounds
 2015-03-01 12:33:05 +01:00
Glowbal
fb763a9d57 Added load and unload actions 2015-03-01 10:44:08 +01:00
KoffeinFlummi
309d42f2e6 God damnit 2015-02-28 21:02:15 +01:00
KoffeinFlummi
46cb963630 Merge branch 'medical-rewrite' of https://github.com/KoffeinFlummi/ACE3 into medical-rewrite 
Conflicts:
	addons/medical/XEH_preInit.sqf
 2015-02-28 20:58:19 +01:00
KoffeinFlummi
f5fe57232c Derp 2: The Rederpening 2015-02-28 20:56:55 +01:00
KoffeinFlummi
7f9daeb2f6 Merge branch 'medical-rewrite' of https://github.com/KoffeinFlummi/ACE3 into medical-rewrite 
Conflicts:
	addons/medical/XEH_preInit.sqf
	addons/medical/functions/fnc_init.sqf
	addons/medical/functions/fnc_treatmentAdvanced_fullHealLocal.sqf
 2015-02-28 20:50:59 +01:00
Glowbal
18998bb619 Split up the openWounds through the ACE event system 
Based upon the suggestions from Jaynus
 2015-02-28 20:48:34 +01:00
KoffeinFlummi
424f156977 Various Cleanups 2015-02-28 20:46:36 +01:00
Glowbal
451f8b6d0b Fixed advanced medical handleDamage chain. Now supports killing units. 2015-02-28 19:22:46 +01:00
Glowbal
f1445a4c45 Fixed script errors 2015-02-28 18:59:37 +01:00
Glowbal
05d2d9de6b Merge branch 'medical-rewrite' of github.com:KoffeinFlummi/ACE3 into medical-rewrite 
Conflicts:
	addons/medical/XEH_preInit.sqf
 2015-02-28 11:43:38 +01:00
Glowbal
49e04ae7bb Added more treatment options and variables to init 2015-02-28 11:41:27 +01:00
KoffeinFlummi
daff184f75 More work on basic callbacks. 2015-02-24 22:09:31 +01:00
Glowbal
65eb69fece Added examine actions 2015-02-23 20:35:36 +01:00
Glowbal
df710235d5 Added useItems 
Fixed header on hasItems
 2015-02-22 19:50:14 +01:00
Glowbal
8b3e5ac8e2 Added hasItems function 2015-02-22 18:38:06 +01:00
Glowbal
ab6bc998c2 Added canAccessMedicalEquipment check 2015-02-22 15:01:31 +01:00
Glowbal
bdaec01112 Added medication overdose and wearoff. 2015-02-22 10:27:57 +01:00
Glowbal
e091ba1fd1 Added hasMedicalEnabled 2015-02-22 00:49:38 +01:00
Glowbal
1781629c13 Added isMedic, isMedicalVehicle, isInMedicalFacility and hasTourniquetAppliedTo functions. 2015-02-22 00:44:11 +01:00
Glowbal
b9213e8abc Added use and has item functions for medical 2015-02-22 00:34:16 +01:00
Glowbal
e5941e55fc Added reactionToDamage and onTreatmentCompleted event 2015-02-21 23:14:21 +01:00
Glowbal
925aa094c7 Added place in bodybag function 2015-02-21 21:53:07 +01:00
Glowbal
46f28763b6 Added triage card and activity log 2015-02-21 21:47:10 +01:00
Glowbal
95ff4b151c Added addHeartRateAdjustment function 2015-02-21 21:32:25 +01:00
Glowbal
909a87fdd3 Added tourniquet treatment functions 2015-02-21 21:26:39 +01:00
Glowbal
ead5f2ee79 Added new injury and treatment systems for advanced medical 2015-02-21 21:10:57 +01:00
Glowbal
b3e7431e67 Added new treatment framework 2015-02-21 21:09:57 +01:00
KoffeinFlummi
3482633fb1 Basic treatment structure 2015-02-20 22:04:01 +01:00
Glowbal
4896198ec2 Merge branch 'medical-rewrite' of github.com:KoffeinFlummi/ACE3 into medical-rewrite 
Conflicts:
	addons/medical/functions/fnc_handleDamage.sqf
 2015-02-13 22:57:43 +01:00
Glowbal
a609d00730 Implemented a setDead function. Allows for interception of all kills and using a revive script instead. 
Added playInjuredSound for damaged units.
Fixed some mistakes with variable names.
 2015-02-08 13:18:08 +01:00
Glowbal
a3c4c60b7f Added possibility to add unconscious conditions. 2015-02-08 13:06:44 +01:00
Glowbal
0a161319d2 Added initial draft of setUnconscious 2015-02-08 10:25:03 +01:00
Glowbal
35de875382 Added cardiac arrest 2015-02-08 00:08:36 +01:00
KoffeinFlummi
35386f19d6 Merge branch 'medical-rewrite' of https://github.com/KoffeinFlummi/ACE3 into medical-rewrite 
Conflicts:
	addons/medical/XEH_preInit.sqf
	addons/medical/functions/fnc_handleDamage.sqf
 2015-02-06 13:48:28 +01:00
KoffeinFlummi
a2ee41f01d First draft of basic damage handling. 2015-02-06 13:47:17 +01:00
Glowbal
596d018f45 Added function PREPs. 2015-02-03 21:48:53 +01:00
KoffeinFlummi
930fb51a20 Medical: First Draft 2015-02-03 20:09:25 +01:00
Thomas Kooi
95cfe5ce3a Minor code refactor 2015-01-24 21:16:51 +01:00
Thomas Kooi
8d34f98909 Moved relevant functions from common to medical. 
Removed unnecessary event function.
 2015-01-24 17:18:38 +01:00
Thomas Kooi
e06c5010bb Moved GUI functionality to medical 2015-01-24 16:34:39 +01:00
Thomas Kooi
dce0b61d57 Added damage threshold module 
Removed debug prints
 2015-01-22 23:29:18 +01:00
Thomas Kooi
68ab7b5143 Added AGM handleDamage caching 2015-01-22 22:00:04 +01:00
Thomas Kooi
7e5806b834 Improved drag and carry actions. 2015-01-21 15:52:59 +01:00
Thomas Kooi
9a0b73bf3a Changed drag/carry to event driven architecture 2015-01-20 18:57:33 +01:00
Thomas Kooi
e468832324 Added initial port of CSE medical (CMS) 2015-01-18 22:16:35 +01:00