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
1,382 Commits 73 Branches 88 Tags 752 MiB
7ae45fbeff
Commit Graph

265 Commits

Author SHA1 Message Date
Glowbal
7ae45fbeff Fixed canTreatCached 2015-03-21 16:47:51 +01:00
Glowbal
d0b14286ff Wrong function name 2015-03-21 16:34:42 +01:00
Glowbal
1d63e94fff canTreatCached 2015-03-21 16:33:14 +01:00
Glowbal
8de985d754 Added medical icons 2015-03-21 15:45:35 +01:00
Glowbal
4bcfd1a0ba Merge branch 'master' into medical-advanced 
Conflicts:
	addons/medical/functions/fnc_handleUnitVitals.sqf
 2015-03-21 14:54:37 +01:00
Glowbal
946ade63e5 Merge branch 'master' into medical-advanced 2015-03-21 14:40:59 +01:00
Glowbal
ff5c8e911d Added InteractionMenuClosed event for closing the patient information display 2015-03-21 14:40:51 +01:00
Glowbal
77210581f5 Added corners to triage card 2015-03-21 14:40:26 +01:00
KoffeinFlummi
75517f7ce4 Replace setDamage with setDead 2015-03-21 14:40:23 +01:00
Glowbal
7c30127ffb Disabled unimplemented medical systems 2015-03-21 10:55:40 +01:00
Glowbal
bc082783c9 check if unit is in a vehicle before checking the vehicle 2015-03-21 10:55:27 +01:00
Glowbal
b5c6e52416 fixed #201 2015-03-21 10:54:52 +01:00
KoffeinFlummi
a060e4bea5 Apply translations to epipen and morphine actions 2015-03-21 00:31:47 +01:00
KoffeinFlummi
b1ed80a23d Remove trailing whitespace in medical stringtable 2015-03-21 00:28:19 +01:00
KoffeinFlummi
510538bc53 Remove superfluous todo 2015-03-21 00:26:14 +01:00
KoffeinFlummi
88fb2765e3 Standardize actions across basic and advanced 2015-03-21 00:21:30 +01:00
KoffeinFlummi
6f8b5cc676 Fix missing dollar sign 2015-03-20 23:53:25 +01:00
KoffeinFlummi
33d4bf2f5a Add localization for basic treatments and actions 2015-03-20 18:21:03 +01:00
KoffeinFlummi
9082712ff7 Replace Original with English keys in stringtable 2015-03-20 17:54:26 +01:00
KoffeinFlummi
66078a047b Wut. 2015-03-20 07:52:41 +01:00
KoffeinFlummi
07570fccd4 Make isMedic even prettier 2015-03-19 22:34:12 +01:00
KoffeinFlummi
5589b80c70 Rewrite and fix isMedic 2015-03-19 22:27:12 +01:00
KoffeinFlummi
97082e4ce3 Simplify condition checking in canTreat. 2015-03-19 22:01:40 +01:00
KoffeinFlummi
69e0ebf107 Add injury texts 2015-03-19 21:31:56 +01:00
KoffeinFlummi
102d86d7d1 Merge remote-tracking branch 'origin/master' into medical-basic 2015-03-19 21:30:27 +01:00
Glowbal
3dda70a4af fixed variable name 2015-03-19 21:14:42 +01:00
KoffeinFlummi
b470276f7f Close dialogs when falling unconscious. 2015-03-17 08:03:11 +01:00
KoffeinFlummi
8a3e3d4b52 Remove superfluous todo 2015-03-17 08:02:55 +01:00
KoffeinFlummi
056625f0fe Check leg/arm damage in setHitPointDamage as well. 2015-03-17 07:53:50 +01:00
KoffeinFlummi
17fd051c79 Rename Bloodbag action to BloodIV 2015-03-17 07:53:35 +01:00
KoffeinFlummi
99899d6562 Move advanced bloodloss handling to advanced 2015-03-15 03:26:10 +01:00
KoffeinFlummi
4cc1b08196 Add basic bleeding 2015-03-15 03:26:00 +01:00
KoffeinFlummi
d640367ff2 Add isInMedicalVehicle function 2015-03-15 03:25:31 +01:00
KoffeinFlummi
77ae997993 Don't handle unit vitals when game is paused 2015-03-15 01:48:50 +01:00
KoffeinFlummi
7f19ab7750 Only run JIP updates for wounds in advanced 2015-03-15 01:46:23 +01:00
PabstMirror
93262f3b92 Use ace_isUnconscious in anim changed EH 2015-03-13 00:45:12 -05:00
PabstMirror
55fcc60453 Merge branch 'master' into captivesMedicalInegration 2015-03-12 22:44:24 -05:00
KoffeinFlummi
82f73117f4 Merge branch 'master' into medical-basic 2015-03-12 07:35:57 +01:00
KoffeinFlummi
a3069e3356 Fix wrong pain variable in patient information 2015-03-12 07:35:29 +01:00
KoffeinFlummi
ef491a7c76 Add basic information to dialog 2015-03-12 07:34:29 +01:00
KoffeinFlummi
809f6754cc Add pain & painkiller reduction over time 2015-03-12 07:33:44 +01:00
PabstMirror
dd026cea0f Medical - add tourniquet p3d and other missing tex 
Ported tourniquet from cse
add missing textures for other items
fix paths in rvmats
 2015-03-11 23:52:58 -05:00
PabstMirror
5ab9ad87f9 QGVAR typo 2015-03-11 13:33:45 -05:00
KoffeinFlummi
fabecdd0d3 Merge branch 'master' into medical-basic 2015-03-11 18:20:16 +01:00
KoffeinFlummi
a641a5db8b Make use of fnc_setUnconscious 2015-03-11 18:08:29 +01:00
KoffeinFlummi
8d22b61a2d Assign structural damage to torso 2015-03-11 18:08:00 +01:00
Nicolás Badano
c573b1048d Made medical diagnosis statements run on hover 2015-03-11 00:38:31 -03:00
Glowbal
1da67d7b48 First draft of triage card 2015-03-10 21:12:35 +01:00
Glowbal
a4d73e1b01 DEFUNC -> DFUNC 2015-03-10 19:51:51 +01:00
PabstMirror
93a1cdaab6 setCaptivityStatus in setUnconsicous 2015-03-10 10:35:00 -05:00