1651 Commits

Author	SHA1	Message	Date
ViperMaul	1078913d2a	Stringtable changes.	2017-01-19 15:29:33 -06:00
ViperMaul	69dc3ba12e	Add Settings to Medical Settings Module	2017-01-19 11:48:34 -06:00
jonpas	3ac00f2e21	Fix medical typo 'to' -> 'too' (#4824)	2017-01-17 15:26:07 -06:00
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
ulteq	1e79f35e43	Always visualize bandaged wounds ... * Even when GVAR(advancedBandages) or GVAR(woundReopening) are disabled	2016-12-15 15:01:02 +01:00
ulteq	0ddfd5eb16	Disable wound reopening when advanced bandages are disabled	2016-12-15 14:51:24 +01:00
ulteq	70a2dc30e7	Refactored 'showPainInMenu' setting ... * showPainInMenu -> on/off switch * medicSetting_PainVisualization -> 3 way switch on who can see it	2016-12-15 14:45:58 +01:00
ulteq	91cbc0e4d4	Added new setting 'advancedDiagnose' ... * Which allows to choose between the old basic- and advanced diagnose actions	2016-12-15 14:00:09 +01:00
ulteq	0de405fe2a	Fix morphine when advanced medication is disabled	2016-12-15 12:58:06 +01:00
ulteq	65f0f56474	Implemented 'showPainInMenu'	2016-12-14 21:30:28 +01:00
ulteq	8146cb427e	Revert "Implemented 'showPainInMenu' logic" ... This reverts commit 964711a38b.	2016-12-14 21:23:26 +01:00
ulteq	964711a38b	Implemented 'showPainInMenu' logic	2016-12-14 20:55:03 +01:00
ulteq	196a3999a4	Merge branch 'medical-rewrite' of https://github.com/acemod/ACE3 into medical-rewrite	2016-12-14 20:44:22 +01:00
ulteq	151d4a4bfe	Settings overhaul ... New settings: * allowSelfIV * showPainInMenu Converted CBA -> ACE Settings: * advancedBandages * advancedMedication * fatalInjuryCondition * cardiacArrestTime Fixed settings: * useLocation_Epi * medicSetting_Epi * painCoefficient	2016-12-14 20:44:06 +01:00
PabstMirror	af4b3e31e1	Minor iv optimization	2016-12-14 11:50:31 -06:00
ulteq	a2b964a993	Fixed bandage config lookup	2016-12-14 18:04:56 +01:00
ulteq	5d3f97ace7	Fix IV Bags work on limbs with a tourniquet applied	2016-12-14 12:36:51 +01:00
ulteq	852f78b801	Classify the perceived pain intensity on all patient information outputs ... Fixes: #2117	2016-12-10 15:24:20 +01:00
PabstMirror	a451ad356e	Close patient display when interaction menu closes	2016-12-09 21:35:26 -06:00
PabstMirror	3907d2dc9f	Cleanup moved functions	2016-12-09 21:27:42 -06:00
PabstMirror	b87bdfe14a	Fix body-bag action / cleanup	2016-12-09 21:03:52 -06:00
PabstMirror	ee864b2c46	Fix medkit string, fix overpressure	2016-12-09 13:48:54 -06:00
ulteq	05b9208d3c	Change debug	2016-12-09 18:43:32 +01:00
ulteq	03f9ba1bad	Improved simulation of tourniquet pain: ... * Made use of the new pain level helper function	2016-12-09 17:48:27 +01:00
ulteq	ada43148e9	Removed deprecated revive settings	2016-12-09 17:07:05 +01:00
ulteq	bfda932384	Different max. bleeding rates for different body parts	2016-12-09 15:54:33 +01:00
ulteq	a809047ac4	Merge branch 'medical-rewrite' of https://github.com/acemod/ACE3 into medical-rewrite	2016-12-09 12:57:42 +01:00
ulteq	82e88061fc	Added 'DEFAULT_HEART_RATE' constant	2016-12-09 12:57:27 +01:00
PabstMirror	cc6150303f	Add setting for blood bag flow rate (#4751)	2016-12-09 11:33:01 +01:00
ulteq	c486f17539	Implemented Medkit (works like in ACE2)	2016-12-08 18:11:24 +01:00
BaerMitUmlaut	a48d271368	Merge pull request #4668 from acemod/medical-rewrite-cardiacArrestLimits ... Introduce small variation to length of cardiac arrest	2016-12-08 14:22:11 +01:00
ulteq	3b82510751	Merge new wounds into existing wounds whenever possible ... * Todo: separate 'amountOf' into two variables (wound count and bandage percentage)	2016-12-08 12:59:30 +01:00
ulteq	78bfc0c26d	Simplified damage storage	2016-12-08 11:38:43 +01:00
ulteq	627ea0ebdc	Dynamically translate different wound types ... * Brings back minor, medium, large wounds	2016-12-07 21:56:13 +01:00
ulteq	89c68364ef	Fix pain suppression not affecting 'setCustomAimCoef'	2016-12-07 19:51:28 +01:00
ulteq	66803a4b4d	Fix damage coloring	2016-12-07 18:53:04 +01:00
ulteq	74fefb6f69	New body part colors: ... * Red bleeding * Blue tourniquet * Yellow/Orange damage	2016-12-07 18:28:35 +01:00
ulteq	7f1678b7e6	Increased wake up chance	2016-12-07 18:19:35 +01:00
ulteq	03f7451c99	Fixed incorrect debug output	2016-12-07 11:41:58 +01:00
ulteq	5db75ac746	Fixed check blood pressure did not always account for tourniquets	2016-12-07 11:32:01 +01:00
ulteq	ab7af04530	Overhauled the medication system: ... * Refactored the old code * Introduced 'timeTillMaxEffect' config entry for medication	2016-12-06 20:42:10 +01:00
ulteq	02ac4c4084	Fixed minor bug in the heart rate calculation	2016-12-06 17:40:05 +01:00
ulteq	faa2b619ab	Removed overly verbose debug logs	2016-12-06 17:35:52 +01: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	978a81fb0a	Removed dead code	2016-12-06 14:37:48 +01:00
ulteq	92da5c80a0	Partly fixed Medication ... * Brings the heart rate adjustment (due to medication) back to life * Restores the medication effect loop (needs testing)	2016-12-06 12:58:12 +01:00
ulteq	db547a53b7	Increased unconsciousness wake up interval	2016-12-06 10:58:43 +01:00
PabstMirror	c47772eddc	Fix stringtables	2016-12-05 19:40:26 -06:00
ulteq	a88be4f458	Fixed 'displayPatientInformation'	2016-12-05 23:00:02 +01:00