298 Commits

Author	SHA1	Message	Date
Glowbal	1bb32dcfcb	fixed missing condition variable	2015-03-22 22:20:44 +01:00
Glowbal	4995016a66	Switched to canInteractConditions	2015-03-22 20:59:57 +01:00
Glowbal	7bc6fa3c3b	Disable interaction for objects	2015-03-22 20:39:22 +01:00
Glowbal	6eac193825	Replaced deleting of body by hiding it	2015-03-22 20:37:55 +01:00
Glowbal	55e7e768ca	removed systemChat messages	2015-03-22 11:21:17 +01:00
Glowbal	5063e9cff9	fixed config duplicate entry	2015-03-22 11:21:08 +01:00
Glowbal	ac4309237b	Added drag/carry actions	2015-03-22 10:28:41 +01:00
Glowbal	0428a1d558	Added canDrag	2015-03-22 10:28:33 +01:00
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
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
Nicolás Badano	6a83d0d9fc	clear canTreat caches before calling the last condition	2015-03-21 20:33:25 -03:00
PabstMirror	3a6995fbec	Cleanup medical Item classnames	2015-03-21 18:07:50 -05: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	b74eb550b0	Added advanced items	2015-03-21 22:08:42 +01:00
KoffeinFlummi	58237751b0	Woopsie	2015-03-21 22:01:20 +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	ce3ed988a2	Removed debug traces	2015-03-21 16:33:59 -03:00
Glowbal	89daf840f6	fixed incorrect macro	2015-03-21 20:08:52 +01:00
Nicolás Badano	4e32e584be	Merge branch 'master' of github.com:KoffeinFlummi/ACE3	2015-03-21 15:33:36 -03:00
Nicolás Badano	f8ea603977	Added dynamic actions to unload patients (unconscious) from vehicles	2015-03-21 15:32:32 -03:00
PabstMirror	9578024693	Dupe stringtable entry ... `Item STR_ACE_MEDICAL_BANDAGING listed twice`	2015-03-21 12:52:08 -05: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	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
Nicolás Badano	d7363a6dab	Move main interactions to pelvis; leave torso for medical	2015-03-21 11:01:38 -03: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