623 Commits

Author	SHA1	Message	Date
ViperMaul	6d28214287	Add some debug values.	2015-09-03 08:18:37 -07:00
commy2	a84be46ed4	fix errors from cleanup	2015-09-03 15:49:49 +02:00
Glowbal	f38d245771	fixed bloodloss for basic medical	2015-09-02 21:56:00 +02:00
commy2	f939f9215e	stop flickering of wounds, fix #346	2015-09-02 20:49:17 +02:00
commy2	7d2f1f52a4	remove protection, hitpoint config (fix ubc), some debug stuff	2015-09-02 20:13:51 +02:00
commy2	dc5e6b7c3c	Merge branch '323medicalstrcturaldamage' into medical-adjustments	2015-09-02 20:02:19 +02:00
commy2	f15805d1f3	setStructuralDamage function	2015-08-31 20:05:38 +02:00
Glowbal	8c6f896164	fixed script error when canceling treatment actions	2015-08-31 13:00:17 +02:00
Glowbal	4bde554854	Merge branch 'master' into medical-adjustments ... Conflicts: addons/medical/functions/fnc_actionCheckBloodPressure.sqf addons/medical/functions/fnc_actionCheckBloodPressureLocal.sqf addons/medical/functions/fnc_actionCheckPulse.sqf addons/medical/functions/fnc_actionCheckPulseLocal.sqf	2015-08-29 23:49:58 +02:00
Glowbal	2fd30ba20c	fixes #2274	2015-08-29 22:57:52 +02:00
Glowbal	ce42f5864f	fix #2155	2015-08-29 22:53:08 +02:00
Glowbal	b291141d11	Should Be a better fix for #2298	2015-08-29 22:51:42 +02:00
Glowbal	183e872f1f	Possible fix for #2298	2015-08-29 22:44:52 +02:00
PabstMirror	321ca815a2	semi-colon	2015-08-29 09:52:28 -05:00
jokoho48	8916b70fe1	Improve some Code	2015-08-29 15:29:02 +02:00
Glowbal	1e08244f21	Removed debug output	2015-08-29 12:59:11 +02:00
Glowbal	1a4736e663	Clean up	2015-08-29 12:01:00 +02:00
Glowbal	d56f3cea81	Added pain and unconsciousness handling for new basic medical code	2015-08-29 11:58:03 +02:00
Glowbal	0cfb492916	Fixes and removal of duplicate code	2015-08-26 10:04:51 +02:00
Glowbal	7a48f595be	Merge branch 'basic-medical-test' into medical-adjustments	2015-08-26 09:13:12 +02:00
gienkov	6a123020d2	fail to find BP on limbs with TQ on	2015-08-26 08:55:50 +02:00
Grzegorz	b8a29bfd44	@jokoho482 suggestion	2015-08-26 03:00:43 +02:00
gienkov	cae5f828fb	run check only on arms	2015-08-26 02:51:05 +02:00
gienkov	c3af5e81e7	fix my error	2015-08-26 02:41:12 +02:00
gienkov	5a9817322b	remove tabs	2015-08-26 02:39:34 +02:00
gienkov	8498589920	pulse zero on limb with TQ on	2015-08-26 02:37:51 +02:00
jokoho48	260b048da4	some more Improvements	2015-08-23 14:13:55 +02:00
jokoho48	fab4c6a67f	fix Spelling Issues	2015-08-22 21:32:36 +02:00
jokoho48	19dd55147a	Code Cleanup Medical Module (Part 4).	2015-08-22 19:47:23 +02:00
jokoho48	2d4ef16429	fix CTD	2015-08-22 18:54:51 +02:00
jokoho48	ff6c8a31be	Code Cleanup Medical Module (Part 3).	2015-08-22 18:33:06 +02:00
jokoho48	10127ed957	Fix Typo	2015-08-22 17:10:19 +02:00
jokoho48	d09ca9ec8b	Code Cleanup Medical Module (Part 1).	2015-08-22 16:25:10 +02:00
Glowbal	bf8318530e	Merge pull request #2081 from acemod/close-med-menus-distance ... Fixed #1893 - Menu closes when patient is more as 10 meters away	2015-08-21 14:20:41 +02:00
Glowbal	20918f2c70	Merge pull request #2183 from acemod/treatmentWhileDeployed ... Fix treatment when weapon deployed	2015-08-21 14:04:51 +02:00
SilentSpike	33ef60266b	Fix medical CPR code and log message ... Performing CPR would never succeed when the patient was in revive state because the code was accidentally using `exitWith` instead of `then`. The log message string was also incorrect.	2015-08-19 23:30:13 +01:00
PabstMirror	dd58eef415	Fix double weapon switch for standing treatment	2015-08-16 14:12:26 -05:00
PabstMirror	21f46f4401	#2178 - Fix treatment when weapon deployed	2015-08-16 13:58:58 -05:00
Glowbal	17115b8846	test switch to adv medical handleDamage	2015-08-11 20:58:00 +02:00
Glowbal	9c8a03b0b3	fixes #2070 - medication is not translated on activity log	2015-08-09 20:12:31 +02:00
Glowbal	298f64a7bf	fixes #2078 ... 1. Fixed incorrect activity string for tourniquet 2. Fixed incorrect macro usage, should have grabbed variables from medical module.	2015-08-09 20:07:06 +02:00
Glowbal	3cac137851	Fixed #1893 - Menu closes when patient is more as 10 meters away	2015-08-09 09:14:42 +02:00
Glowbal	364e0455ee	Merge branch 'master' into medical-menu	2015-08-08 17:55:43 +02:00
Glowbal	be00f7ffe4	Merge pull request #2000 from acemod/treatmentResetWeaponMode ... Treatment reset weapon mode	2015-08-08 14:20:10 +02:00
Glowbal	f21023b4ee	Added logs for quick view and activity view separate from the activity log for medical menu	2015-08-07 19:11:57 +02:00
Glowbal	f21da3ead6	Merge pull request #2026 from acemod/cleanBandages ... Clean bandages if no damage on hitpoint	2015-08-07 15:46:44 +02:00
Glowbal	abaf43be11	Selection restrictions	2015-08-07 00:09:40 +02:00
Glowbal	5ac2972573	Added local event upon successful treatment.	2015-08-06 23:50:44 +02:00
PabstMirror	e45bd43e5e	CreateLitter / syncEvents performance fixes	2015-08-06 00:28:43 -05:00
PabstMirror	6ab72e905c	#1807 - Clean bandages if no damage on hitpoint	2015-08-05 17:32:00 -05:00