365 Commits

Author	SHA1	Message	Date
PabstMirror	8ad3571d19	Merge branch 'master' into medical-rewrite	2017-03-02 18:00:34 -06:00
sbng-PAPA	e2c04a80c4	More accurate Korean translate for medical (#4897)	2017-03-02 17:48:48 -06:00
PabstMirror	c7b60d1777	Merge branch 'master' into medical-rewrite	2017-02-18 18:17:37 -06:00
NorXAengell	1be278fbda	French translation to "Advanced throwing" and "Advanced fatigue" (#4415) ... * French translation of "Advanced fatigue" and "Advanced throwing" Full translation of "Advanced fatigue" and "Advanced throwing". * New batch of translation/correction	2017-02-11 15:16:56 -06:00
ViperMaul	567c9129b2	cleanup	2017-01-19 17:23:54 -06:00
ViperMaul	8db5d8f2ae	Change Setting from Basic to Normal and Stringtable moves	2017-01-19 15:46:44 -06:00
ViperMaul	1078913d2a	Stringtable changes.	2017-01-19 15:29:33 -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	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	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	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
ulteq	852f78b801	Classify the perceived pain intensity on all patient information outputs ... Fixes: #2117	2016-12-10 15:24:20 +01:00
PabstMirror	ee864b2c46	Fix medkit string, fix overpressure	2016-12-09 13:48:54 -06:00
ulteq	ada43148e9	Removed deprecated revive settings	2016-12-09 17:07:05 +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
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	5613ec5d5a	treatment functions and unconsciousness rework	2016-10-06 00:54:57 +02:00
commy2	0decd72063	manual merge	2016-09-28 08:37:39 +02:00
KoffeinFlummi	72899643bd	Merge branch 'master' into japanesestringtables	2016-09-27 20:54:17 +02:00
classicarma	eaf00c8340	translate medical	2016-09-28 01:15:38 +09:00
commy2	236d1f9669	Merge remote-tracking branch 'origin/medical-rewrite' into medical-rewrite	2016-09-19 18:23:37 +02:00
commy2	729ba9178b	Merge remote-tracking branch 'origin/master' into medical-rewrite	2016-09-19 18:23:26 +02:00
commy2	c2f8007d36	port litter settings to treatment	2016-09-19 18:05:49 +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	0c43c83b3d	Merge branch 'master' ... Conflicts: addons/medical/ACE_Settings.hpp addons/medical/XEH_postInit.sqf addons/medical/XEH_preInit.sqf addons/medical/functions/fnc_actionDiagnose.sqf addons/medical/functions/fnc_actionLoadUnit.sqf addons/medical/functions/fnc_addDamageToUnit.sqf addons/medical/functions/fnc_createLitter.sqf addons/medical/functions/fnc_displayPatientInformation.sqf addons/medical/functions/fnc_handleCreateLitter.sqf addons/medical/functions/fnc_handleDamage.sqf addons/medical/functions/fnc_handleDamage_advanced.sqf addons/medical/functions/fnc_handleDamage_airway.sqf addons/medical/functions/fnc_handleDamage_caching.sqf addons/medical/functions/fnc_handleDamage_internalInjuries.sqf addons/medical/functions/fnc_handleDamage_wounds.sqf addons/medical/functions/fnc_isBeingCarried.sqf addons/medical/functions/fnc_isBeingDragged.sqf addons/medical/functions/fnc_litterCleanupLoop.sqf addons/medical/functions/fnc_moduleAssignMedicRoles.sqf addons/medical/functions/fnc_moduleAssignMedicalVehicle.sqf addons/medical/functions/fnc_setCardiacArrest.sqf addons/medical/functions/fnc_showBloodEffect.sqf addons/medical/functions/fnc_treatmentAdvanced_fullHealLocal.sqf addons/medical/functions/fnc_treatmentAdvanced_surgicalKit_onProgress.sqf addons/medical/functions/fnc_treatmentBasic_epipen.sqf addons/medical/functions/fnc_treatmentIV.sqf addons/medical/functions/fnc_treatmentIVLocal.sqf	2016-09-18 11:51:21 +02:00
[OMCB]kaban	8fc2cbd0ef	Russian Translations - Update (#4217)	2016-08-13 11:25:43 +02:00
Glowbal	ddb4ef42f3	Add stringtables and items	2016-07-15 12:21:56 +02:00
Glowbal	3aa88c80bf	Add first step in medical rewrite ... Split up medical core and medical damage. Move out all other functionality	2016-06-30 17:33:29 +02:00
Josuan Albin	a04dec0c63	Update french translation	2016-06-19 15:16:43 +02:00
Josuan Albin	d26f133733	Add missing french entries in stringtables and update older ones ... Take changes from #3480 and completed empty entries	2016-06-19 01:18:12 +02:00
Butt4cak3	151d13244b	Improved misleading translation of german bandages (#3810) ... * Improved misleading translation of german bandages * Further improved german bandage names	2016-06-11 21:35:22 +02:00
PabstMirror	77baeda976	Merge branch 'master' into huehuehue	2016-06-03 00:01:13 -05:00
ProfessorCZ	7d0fcde9fa	CZ Translate - Update ... 04/30/2016	2016-04-30 00:57:24 +02:00
Alessandro Foresi	e97c7c0f65	Translation: IT completed (with BOM)	2016-03-27 21:22:15 +02:00
Alessandro Foresi	e5a7578f92	Translation: IT completed (no BOM)	2016-03-27 21:20:15 +02:00
Jonathan Pereira	309f48ee0b	Added remaining PT-BR translarions	2016-03-01 08:56:43 -03:00
jonpas	8d326a0a1b	Remove duplicate medical string	2016-02-28 22:54:24 +01:00
BlackWindowS	c61e7b5104	Tweaked & added translations ... Translation of almost every STR to French	2016-02-28 14:48:04 +01:00
jonpas	905586bddc	Make unused medical strings be used	2016-02-27 21:04:04 +01:00
System98	df3ec3a179	Fix length of a display name ... - Fix the length of a display name so it doesn't get cut off in the settings.	2016-02-27 12:51:32 +01:00
System98	05575538e4	Fix format errors in "medical" addon	2016-02-27 12:10:40 +01:00
System98	f7253edec8	Update german translations ... - Fix some german translations - Re-add strings in "medical" addon deleted in PR #3437 - Add german translations for previously deleted strings and update the english texts so the purpose of the function gets clearer	2016-02-27 12:07:57 +01:00
jonpas	0c79869d7a	Fix duplicated English strings	2016-02-27 01:43:57 +01:00