26 Commits

Author	SHA1	Message	Date
PabstMirror	a32478adfb	Merge branch 'master' into medical-rewrite	2017-01-17 13:10:18 -06:00
jtj5283449	d4855a7ff3	Korean Translation v1.0 (#4794) ... * Add files via upload * Add files via upload * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation japanese translation caused error while translating process, had to remove some duplicated keys in stringtable.xml. * Fix encoding	2017-01-02 17:52:01 -06:00
Skully71	9b22f94374	Ensure movingToInjured is false whenever _target no longer needs healing, fixes #4797 (#4800)	2017-01-02 14:02:43 +01:00
PabstMirror	c2f9010183	opps	2016-12-09 21:29:23 -06:00
PabstMirror	3907d2dc9f	Cleanup moved functions	2016-12-09 21:27:42 -06:00
ulteq	fa77fb7194	Various fixes: ... * Fixed medication (morphine, epinephrine, ...) * Fixed CPR * Improved heart rate simulation * Removed deprecated ace settings	2016-12-06 17:26:11 +01:00
ulteq	a5ce5b4a34	Medical Rewrite - Continued (#4744)	2016-12-05 21:34:20 +01:00
commy2	a83267b2ff	manual merge	2016-12-05 20:15:16 +01:00
PabstMirror	a3c50a6c76	Add dev macro to quickly recompile functions (#4699)	2016-11-23 13:35:25 -06:00
PabstMirror	0746264905	MedicalAI - Fix treatment animion with no weapon (#4633)	2016-11-04 00:01:58 +01:00
commy2	4a06d19ce4	merge basic and adv. bandage actions	2016-10-13 01:55:10 +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	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
commy2	5da11d5f79	remove obsolete macro	2016-10-02 12:17:48 +02:00
PabstMirror	60a7490b7e	Fix some moved funcs/strings	2016-09-29 15:08:36 -05:00
KoffeinFlummi	72899643bd	Merge branch 'master' into japanesestringtables	2016-09-27 20:54:17 +02:00
classicarma	188a1bf02b	translate medical_ai	2016-09-28 01:15:59 +09:00
BaerMitUmlaut	b1f6973772	Filter player medics (#4444)	2016-09-20 16:01:54 +02:00
commy2	3d422021ef	Merge pull request #4377 from acemod/sys-blood-port ... Add ace2 sys blood port	2016-09-19 17:35:32 +02:00
Grzegorz	a63dcb49d0	PL Translation 3.7.1 (#4395) ... * translate advanced fatigue * translate advanced throwing * translate cargo * translate chemlights * translate cookoff * translate explosives * translate fastroping * translate gforce * translate googles * translate grenades * translate gunbag * translate maptools * translate medical * translate medical_ai * translate minedetector * translate nametags * translate overheating * translate repair * translate tagging * translate ui * translate zeus	2016-09-18 22:00:13 +02:00
Glowbal	e8f55348d8	Add ACE2 sys_Blood port	2016-09-17 16:52:25 +02:00
BaerMitUmlaut	1601f6a7b7	Disable medical AI for remote controlled AI	2016-09-12 17:06:14 +02:00
PabstMirror	4781903be6	Add setting for medical ai	2016-09-06 21:48:46 +02:00
BaerMitUmlaut	278e7fa800	Add Medical AI implementation for basic medical (#4311) ... * Initial commit medical AI * Finished non-healing functions * Initial work on self healin * AI healing * Finished medical AI for basic medical * Finito * Fix for dead units, medic not being close enough * Make ace_medical required * Fixed double systemChat * Made AI units able to heal players * Fixed wound treatment * Fixed medic movement * Made units heal themselves earlier	2016-09-04 11:25:03 +02:00