Commit Graph

1926 Commits

Author SHA1 Message Date
9578024693 Dupe stringtable entry
`Item STR_ACE_MEDICAL_BANDAGING listed twice`
2015-03-21 12:52:08 -05:00
7d6afdf1a9 Added triage card option 2015-03-21 17:30:49 +01:00
82ec93b84e Medical icons 2015-03-21 17:05:32 +01:00
7ae45fbeff Fixed canTreatCached 2015-03-21 16:47:51 +01:00
d0b14286ff Wrong function name 2015-03-21 16:34:42 +01:00
1d63e94fff canTreatCached 2015-03-21 16:33:14 +01:00
8de985d754 Added medical icons 2015-03-21 15:45:35 +01:00
d7363a6dab Move main interactions to pelvis; leave torso for medical 2015-03-21 11:01:38 -03:00
4bcfd1a0ba Merge branch 'master' into medical-advanced
Conflicts:
	addons/medical/functions/fnc_handleUnitVitals.sqf
2015-03-21 14:54:37 +01:00
946ade63e5 Merge branch 'master' into medical-advanced 2015-03-21 14:40:59 +01:00
ff5c8e911d Added InteractionMenuClosed event for closing the patient information display 2015-03-21 14:40:51 +01:00
77210581f5 Added corners to triage card 2015-03-21 14:40:26 +01:00
75517f7ce4 Replace setDamage with setDead 2015-03-21 14:40:23 +01:00
7c30127ffb Disabled unimplemented medical systems 2015-03-21 10:55:40 +01:00
bc082783c9 check if unit is in a vehicle before checking the vehicle 2015-03-21 10:55:27 +01:00
b5c6e52416 fixed #201 2015-03-21 10:54:52 +01:00
a060e4bea5 Apply translations to epipen and morphine actions 2015-03-21 00:31:47 +01:00
b1ed80a23d Remove trailing whitespace in medical stringtable 2015-03-21 00:28:19 +01:00
510538bc53 Remove superfluous todo 2015-03-21 00:26:14 +01:00
88fb2765e3 Standardize actions across basic and advanced 2015-03-21 00:21:30 +01:00
6f8b5cc676 Fix missing dollar sign 2015-03-20 23:53:25 +01:00
33d4bf2f5a Add localization for basic treatments and actions 2015-03-20 18:21:03 +01:00
9082712ff7 Replace Original with English keys in stringtable 2015-03-20 17:54:26 +01:00
66078a047b Wut. 2015-03-20 07:52:41 +01:00
07570fccd4 Make isMedic even prettier 2015-03-19 22:34:12 +01:00
5589b80c70 Rewrite and fix isMedic 2015-03-19 22:27:12 +01:00
97082e4ce3 Simplify condition checking in canTreat. 2015-03-19 22:01:40 +01:00
69e0ebf107 Add injury texts 2015-03-19 21:31:56 +01:00
102d86d7d1 Merge remote-tracking branch 'origin/master' into medical-basic 2015-03-19 21:30:27 +01:00
3dda70a4af fixed variable name 2015-03-19 21:14:42 +01:00
42de257c6e Merge branch 'master' into Medical_Dragging 2015-03-18 18:21:05 +01:00
be4ba6144f Removed unnecessary line 2015-03-18 18:17:42 +01:00
b470276f7f Close dialogs when falling unconscious. 2015-03-17 08:03:11 +01:00
8a3e3d4b52 Remove superfluous todo 2015-03-17 08:02:55 +01:00
056625f0fe Check leg/arm damage in setHitPointDamage as well. 2015-03-17 07:53:50 +01:00
17fd051c79 Rename Bloodbag action to BloodIV 2015-03-17 07:53:35 +01:00
99899d6562 Move advanced bloodloss handling to advanced 2015-03-15 03:26:10 +01:00
4cc1b08196 Add basic bleeding 2015-03-15 03:26:00 +01:00
d640367ff2 Add isInMedicalVehicle function 2015-03-15 03:25:31 +01:00
77ae997993 Don't handle unit vitals when game is paused 2015-03-15 01:48:50 +01:00
7f19ab7750 Only run JIP updates for wounds in advanced 2015-03-15 01:46:23 +01:00
62460e8b79 Fixes for animations and script error 2015-03-15 01:12:02 +01:00
2bee533a8c Added AGM stringtables for drag, carry, load & unload 2015-03-14 09:51:08 +01:00
dcf3a73518 Added copyDeadBody function 2015-03-14 09:48:16 +01:00
99b1986059 Added setting for allowing movement of dead bodies 2015-03-14 09:37:19 +01:00
93262f3b92 Use ace_isUnconscious in anim changed EH 2015-03-13 00:45:12 -05:00
55fcc60453 Merge branch 'master' into captivesMedicalInegration 2015-03-12 22:44:24 -05:00
4ce524ed3c First draft of carry and drop unit 2015-03-12 21:16:49 +01:00
82f73117f4 Merge branch 'master' into medical-basic 2015-03-12 07:35:57 +01:00
a3069e3356 Fix wrong pain variable in patient information 2015-03-12 07:35:29 +01:00