1592 Commits

Author	SHA1	Message	Date
BaerMitUmlaut	27916e8455	Merge branch 'medical-rewrite' of https://github.com/acemod/ACE3 into medical-rewrite	2016-11-13 18:03:12 +01:00
PabstMirror	5463e9dff8	Merge branch 'master' into medical-rewrite	2016-11-09 13:12:42 -06:00
Karan Singh	09b89a0bbc	Fix typo in Eden Options (#4615) ... * Fix typo in Eden Options This fixes a typo in line 25, ace_isMeidc_temp to ace_isMedic_temp * Fix L13	2016-11-09 13:07:29 -06:00
BaerMitUmlaut	dac4a4dc42	Merged instant death and execution into one setting	2016-11-09 19:01:55 +01:00
BaerMitUmlaut	08a378bb2d	Added execution system, improved instant death	2016-11-08 19:37:56 +01:00
BaerMitUmlaut	928ded0e66	Fixed instant death and PREP	2016-11-07 23:46:10 +01:00
BaerMitUmlaut	ba9fc9240c	Removed traces of old state machine	2016-11-07 23:44:33 +01:00
BaerMitUmlaut	0427814961	Started transition to CBA state machine, removed revive in favour of extended cardiac arrest	2016-11-07 22:21:07 +01:00
BaerMitUmlaut	a65f1d19fa	Added state machine debug functionality	2016-11-07 22:19:55 +01:00
commy2	fc39ac14b7	don't knock out if pain is removed	2016-10-20 13:49:52 +02:00
commy2	be56b4d806	knock out due to pain	2016-10-20 13:46:28 +02:00
commy2	370faf9b48	cleanup	2016-10-20 13:38:26 +02:00
commy2	7e498ab762	setting for basic/advanced syringes	2016-10-20 02:14:11 +02:00
commy2	f2dfc6dc0e	fixes, tweaks	2016-10-13 20:17:21 +02:00
commy2	bc4c1787f9	show tourniquets in 3d menu	2016-10-13 19:05:29 +02:00
commy2	fe2c6e8d85	basic <-> advanced	2016-10-13 17:14:43 +02:00
commy2	68d75beae6	manual merge	2016-10-13 16:56:57 +02:00
commy2	e1cbeeea16	fix tourniquets	2016-10-13 10:12:28 +02:00
commy2	18907adcd5	increase medical item mass to at least 100 grams	2016-10-13 09:48:58 +02:00
commy2	b1f0af7e1c	merge basic and adv. bandage actions	2016-10-13 09:10:08 +02:00
commy2	e38845bf45	add ace_kill event handler	2016-10-12 23:20:22 +02:00
commy2	92fc4ec14b	add a setting for 'basic' blood bags	2016-10-12 22:38:58 +02:00
commy2	a5d070f829	blood and unconsciousness fixes	2016-10-12 21:59:32 +02:00
commy2	be71e6fa7b	Merge branch 'medical-rewrite-blood' into medical-rewrite	2016-10-12 04:05:50 +02:00
commy2	b0b9037f24	simplify lost some/much blood macros	2016-10-11 19:44:20 +02:00
commy2	d1df47919d	support neg numbers to remove pain in addPain	2016-10-11 19:36:04 +02:00
commy2	1ea2a72f20	don't play scream by addPain function	2016-10-11 19:29:44 +02:00
commy2	d0df141cf7	add comment explaining why 6.0 were chosen	2016-10-10 18:22:46 +02:00
commy2	e2d174837a	move IV transufsion rate macro to blood config	2016-10-10 18:20:58 +02:00
commy2	c2f7366d32	blood volume unit vitals	2016-10-10 17:46:17 +02:00
commy2	3438ea0946	use liters for blood volume variable	2016-10-10 17:30:42 +02:00
commy2	fc079abd46	function header	2016-10-10 16:53:25 +02:00
commy2	2ad7c4c4ea	add addPain function, cap pain	2016-10-10 16:44:03 +02:00
commy2	4bc1c1db56	handle blood visuals	2016-10-07 04:21:01 +02:00
commy2	d4dd1626a5	delete some unused/moved functions from medical main component	2016-10-07 00:19:51 +02:00
commy2	50eeebd30d	add weapon sway by pain	2016-10-07 00:09:58 +02:00
commy2	e9586ebccc	use common header file for medical components	2016-10-06 22:40:36 +02:00
commy2	5613ec5d5a	treatment functions and unconsciousness rework	2016-10-06 00:54:57 +02:00
commy2	56882a9bcb	manual merge	2016-10-02 13:04:20 +02:00
commy2	f4d4c521d7	manual merge	2016-10-02 13:02:17 +02:00
commy2	05d30c5573	convert log macros to cba versions (#4282) ... * convert log macros to cba versions * Add changes to AB * remove obsolete macro	2016-10-02 12:55:31 +02:00
commy2	f185742e68	manual merge	2016-10-02 12:51:29 +02:00
PabstMirror	1bc5669c95	Merge branch 'master' into cba-log-macros	2016-09-30 11:18:58 -05:00
commy2	c93e9e3f3b	fix playSoundInjured wrong args	2016-09-30 13:03:43 +02:00
PabstMirror	60a7490b7e	Fix some moved funcs/strings	2016-09-29 15:08:36 -05:00
commy2	2c7864c02b	implement custom treatment sounds	2016-09-29 18:45:18 +02:00
commy2	0decd72063	manual merge	2016-09-28 08:37:39 +02:00
commy2	20d00d7cd9	make units scream when they're hit	2016-09-27 21:21:44 +02:00
KoffeinFlummi	72899643bd	Merge branch 'master' into japanesestringtables	2016-09-27 20:54:17 +02:00
commy2	a913054b57	fix error with out of bounds blood loss	2016-09-27 20:00:58 +02:00