Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,930 Commits 73 Branches 88 Tags 752 MiB
2f763a2310
Commit Graph

684 Commits

Author SHA1 Message Date
KoffeinFlummi
59952441d8 Merge branch 'patch-2' of https://github.com/licht-im-Norden87/ACE3 into german-merge 2015-04-12 06:22:17 +02:00
KoffeinFlummi
c6efd4e546 Merge https://github.com/EpMAK/ACE3 into russian-merge 2015-04-12 05:39:46 +02:00
PabstMirror
3be70556ab Medical: adjustPainLevels from outside functions 2015-04-11 21:21:33 -05:00
Glowbal
e00f0ea4c3 No longer creates a new waitAndExec for every handleDamage call 2015-04-11 22:47:10 +02:00
Glowbal
97fa40b4c1 Make use of new global variables for selections and hitpoints 2015-04-11 22:31:38 +02:00
Glowbal
6cc115a628 We already determine the new damage in caching, so we will use that value instead of recalculating it here 2015-04-11 22:31:17 +02:00
Glowbal
e8d2a00994 Added GVAR(HITPOINTS) and GVAR(SELECTIONS) variables 
No longer have to recreate the selection and hitpoint arrays every time
 2015-04-11 22:30:52 +02:00
Glowbal
c69f71ba71 formatting 2015-04-11 22:29:32 +02:00
Glowbal
51906e341d Removed unused variables 2015-04-11 22:29:11 +02:00
Glowbal
082ab5155e Minor performance improvements 
Before avg: 0.0858495ms
After avg: 0.0701045ms
 2015-04-11 21:27:49 +02:00
EpMAK
21abff3713 Revert "Revert "Russian Translation"" 
This reverts commit ea04f4ab3e.
 2015-04-11 21:33:34 +03:00
EpMAK
ea04f4ab3e Revert "Russian Translation" 
This reverts commit 17a552bb80.
 2015-04-11 21:33:07 +03:00
Kllrt
38adfbcb70 Added missing CZ strings and made little revision 2015-04-11 16:33:00 +02:00
PabstMirror
adc7db9ae9 #456 - Fix AI rotating while dead (disableAI func) 
Still some small head movements, but I don't know how to fix that.
 2015-04-10 15:02:40 -05:00
FreeZbe
4a996bf147 Update stringtable.xml 2015-04-10 21:22:07 +02:00
esteldunedain
d6e70cfe6b Merge branch 'patch-3' of https://github.com/Legolasindar/ACE3 into Legolasindar-patch-3 
Conflicts:
	addons/common/stringtable.xml
	addons/explosives/stringtable.xml
	addons/frag/stringtable.xml
	addons/interact_menu/stringtable.xml
	addons/interaction/stringtable.xml
	addons/inventory/stringtable.xml
	addons/laser_selfdesignate/stringtable.xml
	addons/logistics_wirecutter/stringtable.xml
	addons/medical/stringtable.xml
 2015-04-10 16:20:18 -03:00
FreeZbe
e09a3b29d7 Update stringtable.xml 2015-04-10 21:20:09 +02:00
FreeZbe
4dbba270f9 Translations fixes 2015-04-10 21:07:38 +02:00
ruPaladin
8ea96b3086 Update stringtable.xml 2015-04-10 21:21:40 +03:00
EpMAK
17a552bb80 Russian Translation 
Russian translation of stringtables: new lines + old lines fixed a bit,
realistic names for armory are not yet filled.
 2015-04-10 19:55:57 +03:00
EpMAK
68d08b8c7b Revert "Translation" 
This reverts commit fab5605ad5.
 2015-04-10 19:46:18 +03:00
EpMAK
fab5605ad5 Translation 
Russian translation of the texts
 2015-04-10 17:51:48 +03:00
Asgar
16b2311376 Added German translation for a couple of things, 2015-04-10 14:21:55 +02:00
Legolasindar
52d476abd3 Update stringtable.xml 
Added spanisth translation, and two lines of english translation
 2015-04-10 12:29:44 +02:00
Jo David
c258c6c00d fixing translation 2015-04-10 09:05:37 +02:00
Jo David
33a14076fc Merge branch 'master' of https://github.com/acemod/ACE3 into translations 
Conflicts:
	addons/captives/stringtable.xml
	addons/medical/stringtable.xml
 2015-04-10 09:01:24 +02:00
Anthariel
95e53fd1bf Update stringtable.xml 
Added: French Translations (~85%)
 2015-04-10 06:20:04 +02:00
Grzegorz
bf6984400f medical PL translation 
like a boss
 2015-04-10 04:30:39 +02:00
licht-im-Norden87
6323a85f17 Update stringtable.xml 
<English>Field Dressing</English>
        <German>Notverband</German>
I dont know if a Notverband is the same as a Field Dressing.
 2015-04-10 00:23:20 +02:00
licht-im-Norden87
4522b45939 Update stringtable.xml 2015-04-10 00:03:46 +02:00
Glowbal
093d340ee7 Changed: Dragging/carrying now works for units with broken legs 
Added unload and load of unconscious units
 2015-04-09 21:23:10 +02:00
Glowbal
0926397ab4 Removed deadcode and obvious comments 2015-04-09 20:13:46 +02:00
Glowbal
39cbf21278 Removed deprecated carry functions 2015-04-09 20:12:30 +02:00
commy2
5ea35a01bb sorting out required addons for modularity 2015-04-09 13:23:29 +02:00
PabstMirror
c3564ee883 undef to Make PBO-Project Happy 2015-04-08 14:38:29 -05:00
Glowbal
3702679ee4 fixed wrong value for radio disabled on waking up 2015-04-08 21:31:59 +02:00
KoffeinFlummi
a209e49f1c Remove partname from patientInfoDisplay for basic. 2015-04-08 07:39:16 +02:00
KoffeinFlummi
1dcff94ec7 Remove hitpart from bandage action name 
Since the context of the interaction menu makes it clear what body part
you mean anyways, this is unnecessary.
 2015-04-08 07:35:31 +02:00
KoffeinFlummi
5bd1ee7ecd Do not use a treshold for unassigned damage. 2015-04-08 07:21:34 +02:00
Glowbal
ffbe9f0c71 Setting for getting rid of hitpoint damage after adv medical damage 2015-04-07 21:06:48 +02:00
Glowbal
c823826f17 Merge branch 'master' into medicalImprovements 2015-04-07 20:53:24 +02:00
Glowbal
2b341c2a8b left over CSE function calls removed 2015-04-07 20:50:44 +02:00
Glowbal
545014b073 missing return value 2015-04-07 20:47:36 +02:00
Glowbal
ac3bda3135 improvements to displayPatientInformation. Bandaged wounds should be more clear now 2015-04-07 20:19:32 +02:00
esteldunedain
765ae4ee64 Merge branch 'master' into tabCleanup 
Conflicts:
	addons/explosives/functions/fnc_addClacker.sqf
	addons/explosives/functions/fnc_detonateExplosive.sqf
	addons/explosives/functions/fnc_getPlacedExplosives.sqf
	addons/explosives/functions/fnc_openDetonateUI.sqf
	addons/explosives/functions/fnc_openPlaceUI.sqf
	addons/explosives/functions/fnc_openTransmitterUI.sqf
	addons/explosives/functions/fnc_openTriggerSelectionUI.sqf
	addons/explosives/functions/fnc_placeExplosive.sqf
	addons/explosives/functions/fnc_place_Approve.sqf
	addons/explosives/functions/fnc_setPosition.sqf
 2015-04-07 15:00:56 -03:00
Glowbal
526e24f133 formatting 2015-04-07 19:56:54 +02:00
Glowbal
3d82cb8eac Removed deprecated onTreatmentCompleted event 2015-04-07 19:54:24 +02:00
Glowbal
7fb3ac6740 Added _x_ca suffixes to all item pictures 2015-04-07 19:16:56 +02:00
Pierre Humberdroz (meat)
4c49765c8f translation changes 
#370
 2015-04-07 10:39:41 +02:00
bux578
92da20ce62 translations 
#367
 2015-04-07 10:02:33 +02:00
jaynus
99008ac729 Merge pull request #332 from KoffeinFlummi/medicalBox 
Added: Generic placeholder medical box.
 2015-04-06 19:09:16 -07:00
Glowbal
12493f8595 Improved wounds configuration (missing maxDamage values added) 2015-04-07 00:57:05 +02:00
Glowbal
c7549a13a4 Improved pain reduction 2015-04-07 00:41:53 +02:00
Glowbal
bdb5c8e728 Merge pull request #349 from KoffeinFlummi/medicalBugFixes 
Exit displayPatientInformation PFH when a different selection is selected.
 2015-04-06 19:49:12 +02:00
Glowbal
4c6dad69f9 Should fix #347. Could not reproduce but this at least fixes some issues (which most likely caused the error) 2015-04-06 19:43:27 +02:00
jaynus
1bb6be5654 Cleaning up of all tabs in source code files. 2015-04-06 09:22:43 -07:00
PabstMirror
c1abb2669d #340 - Fix stringtables 2015-04-06 11:03:04 -05:00
Glowbal
76ad6b8294 Added missing main actions 2015-04-06 15:46:50 +02:00
Glowbal
ce4cdd3722 staged bodybag fixes 2015-04-06 15:11:54 +02:00
Glowbal
661d93e82c Working commit 2015-04-06 14:51:17 +02:00
Glowbal
8e176eff55 Fixed treatment locations 2015-04-06 14:32:37 +02:00
Glowbal
43b3190202 config fix 2015-04-06 14:14:00 +02:00
Glowbal
10a1108aae Added support for customizable treatment location limitation 2015-04-06 14:11:10 +02:00
Glowbal
2657677bd8 Added support for TFR/ACRE on unconscious 2015-04-06 14:09:59 +02:00
jaynus
c87f2f8bcc Added: Generic placeholder medical box. 2015-04-05 15:16:32 -07:00
jaynus
e3ad83e109 Merge pull request #286 from KoffeinFlummi/lasers 
Self designating lasers, Javelin Guidance, DAGR laser guidance, Comanche updated HUDS
 2015-04-05 13:26:54 -07:00
Glowbal
9e3bb8ac95 fixed triage card 2015-04-05 22:07:38 +02:00
Glowbal
12d10b8bf7 Blood loss for basic (from AGM medical) 2015-04-05 21:38:15 +02:00
Glowbal
147bb92541 Added setting to disable variable sync (recommended on) 2015-04-05 20:23:07 +02:00
Glowbal
7ffd690a71 Changed: IVs are now synced and medics can see a unit is receiving an IV 2015-04-05 20:11:54 +02:00
Glowbal
89015c94d4 Removed rouge system chat and diag_log messages 2015-04-05 19:42:55 +02:00
Glowbal
ae2adc17b9 changed all medical items to inherit from ACE_ItemCore 2015-04-05 19:37:07 +02:00
Glowbal
2c0bec2b07 disabled injury visualization for bandaged wounds 2015-04-05 19:36:40 +02:00
Glowbal
171ebf827a No litter created when in vehicle 2015-04-05 19:28:57 +02:00
Glowbal
a0bbbdb0b7 fixed place in bodybag 2015-04-05 19:27:53 +02:00
Glowbal
f52891436a oops 2015-04-05 19:27:40 +02:00
Glowbal
ecf84ae039 Updated module classname to be inline with others 2015-04-05 19:27:28 +02:00
Glowbal
0f52059249 Fixed CPR script error 2015-04-05 19:27:09 +02:00
Glowbal
dca75c5557 Implemented bandaged wounds setting (adv) 2015-04-05 19:26:33 +02:00
Glowbal
e3e17d8fcb Merge branch 'master' of github.com:KoffeinFlummi/ACE3 2015-04-05 15:51:42 +02:00
Glowbal
c210efcef0 fixed #312 Error occurred with undefined damageTypes. In this case; getting run over by a vehicle. 2015-04-05 15:51:28 +02:00
Glowbal
32625b446b fixed animation being reset even when inside a vehicle 2015-04-05 13:03:09 +02:00
Glowbal
cf1f641424 Moved selfActions to a separate hpp file 2015-04-05 13:02:55 +02:00
jaynus
ab0d289762 Merge remote-tracking branch 'origin/master' into lasers 2015-04-04 16:56:03 -07:00
esteldunedain
f417fa2285 Add medical actions while boarded. 2015-04-04 19:41:12 -03:00
Glowbal
7f9043897c wake up by epinephrine in revive state 2015-04-04 22:50:38 +02:00
Glowbal
551c36d690 fixed treatment didnt work inside vehicles 2015-04-04 22:48:52 +02:00
Glowbal
77d39877d2 Merge branch 'master' into medicalImprovements 2015-04-04 22:01:15 +02:00
Glowbal
a56e8745c3 fixed module settings 2015-04-04 21:59:18 +02:00
Glowbal
d37094dc7a Work around for self treatment when cursorMenu from interact is used. 
Executing it one frame later works fine, but otherwise the loading bar will fail.
 2015-04-04 21:52:00 +02:00
Glowbal
5c3ee0dd1a Added settings to modules & fixed medicalVehicle module 2015-04-04 21:51:18 +02:00
Glowbal
89ec817ce3 Added setting for litter cleanup delay 2015-04-04 21:26:41 +02:00
Glowbal
1d33ce52b3 added support for adjustable settings for consumeItem and medicalLevel 2015-04-04 21:20:24 +02:00
Glowbal
93d9088410 fixed cardiac arrest 2015-04-04 21:20:03 +02:00
Glowbal
e3aaac7005 Only select primary weapon if no current weapon is selected 2015-04-04 20:49:30 +02:00
Nicolás Badano
5f4030469f Merge pull request #309 from KoffeinFlummi/closeInteractMenu 
Close interact menu when knocked out
 2015-04-04 15:35:00 -03:00
Glowbal
e78fc55b45 changed; When standing before treatment, the caller will now move into crouch instead of standing up again. 2015-04-04 20:21:52 +02:00
Glowbal
ddb01e7865 Improved unconscious wakeup animations 2015-04-04 20:21:06 +02:00
Glowbal
2420db78a1 CreateLitter now supports conditions and is selection specific. 
Format:
litter[] = {
   {"SelectionName", "Condition", {"litterClassname"} },
   ...
};

The array with litter classnames also support 2d arrays. ie:
{"SelectionName", "Condition", {{"litterClassname"}} }
Of array entries it will select a random classname.
 2015-04-04 20:20:29 +02:00
Glowbal
08e1949078 Improved patient unconscious animation 2015-04-04 18:08:41 +02:00
Glowbal
31b7ade057 Support unconscious animation for patient upon treatment 2015-04-04 17:33:20 +02:00
esteldunedain
d090b3328c - Close interact_menu when the player falls unconscious 
- Prevent all types of interactions while unconscious
 2015-04-04 12:25:49 -03:00
Glowbal
48758ff0e3 fixed incorrect typeNames 2015-04-04 16:59:52 +02:00
Glowbal
b54179696a fixed basic revive 2 2015-04-04 16:28:09 +02:00
Glowbal
18900cb82c fixed revive for basic 2015-04-04 16:27:44 +02:00
Glowbal
3a117e9b4d fixed incorrect unit used for fullheal (was healing caller) 2015-04-04 16:26:49 +02:00
Glowbal
914c5ffd0f fixed bandage optional parameter 2015-04-04 12:14:21 +02:00
Glowbal
7c296c413d Litter has a more random spread 2015-04-04 12:13:55 +02:00
Glowbal
d81dcba543 Added more litter variants 2015-04-04 12:13:42 +02:00
Glowbal
2645b102f0 Replaced waitAndExec for single PFH with 30s delay 2015-04-04 02:28:14 +02:00
PabstMirror
07dfe52133 Remove Duplicate Mortar Code (inherit from statics) 
Before an action added to staticWeapon wouldn't be applied to mk6 mortar
 2015-04-03 19:07:13 -05:00
Glowbal
83fbc1ff10 Added setting to toggle litter creation on/off 2015-04-04 01:47:56 +02:00
Glowbal
7f45d25ee5 Added litter for medical treatment 2015-04-04 01:42:13 +02:00
Glowbal
4ac77bceab Model fixes and imports 2015-04-04 01:09:44 +02:00
Glowbal
5e0f5b8b94 Added full heal/PAK for basic 2015-04-04 00:31:12 +02:00
Glowbal
7230687ea2 corrected revive setting classes 2015-04-04 00:30:59 +02:00
Nou
6541600d44 Switch everything to use modelToWorldVisual instead of modelToWorld. 2015-04-03 15:26:27 -07:00
Glowbal
d3c9d111e1 fullHeal now resets reviveState 2015-04-03 23:58:46 +02:00
Glowbal
4ddb496d8b Added max Revive lives 2015-04-03 23:56:32 +02:00
Glowbal
36288fce43 Updated medical action config. 
Added bodybag action
Added Tourniquet action to basic.
Added more displayNameProgress entries.
Removed deadcode
 2015-04-03 22:59:28 +02:00
Glowbal
a6ce961ca1 Usage of isBeingCarried and isBeingDragged 2015-04-03 22:45:16 +02:00
Glowbal
244bac8562 Merge branch 'master' into medicalAdvanced 2015-04-03 22:42:09 +02:00
Glowbal
05389e7e25 Implemented useItems for treatment (basic and adv) 
Will remove items on treatment start. Add again on treatmentFailure.
Based upon consumeItem config setting.
 2015-04-03 22:40:36 +02:00
Glowbal
038ed5f23e Removed deprecated returnDamage parameters 2015-04-03 21:59:47 +02:00
Glowbal
1ef262c119 Support for enableOverdosing setting in advanced 2015-04-03 21:53:58 +02:00
Glowbal
c3ddbb4be7 Prevent the usage of the blood loss coefficient to increase blood volume on bleeding 2015-04-03 21:51:44 +02:00
Glowbal
ecf16ad9f1 fixed prevent instant death setting 2015-04-03 21:49:46 +02:00
PabstMirror
604e851423 Medical - isBeingCarried 2015-04-03 14:37:04 -05:00
Glowbal
d4a6dd1038 Removed the options to enable fractures and airway through mission module 2015-04-03 21:32:49 +02:00
Glowbal
1b02cb2e82 examine actions now use activity log 2015-04-03 21:03:39 +02:00
Glowbal
43efc21f27 Only display the activity log in the activity list. 2015-04-03 21:03:22 +02:00
Glowbal
8881de4a07 Removed activity log background, made wider. Added shadow to text. 2015-04-03 21:02:56 +02:00
Glowbal
8d7ac1f930 Added selected bodypart text 
Changed "No injuries on bodypart" to still display if the generic messages have entries
 2015-04-03 20:26:24 +02:00
PabstMirror
254a25b139 Medical - isBeingDragged func 2015-04-03 13:16:48 -05:00
Glowbal
b92978fb80 Now resets the proper hasMovedOut value 2015-04-03 20:11:20 +02:00
Glowbal
e68e487769 fixed units not moving out of unconscious animation 2015-04-03 20:07:39 +02:00
Glowbal
d5f0cf5cbd Incorrect value for airwayStatus 2015-04-03 20:06:53 +02:00
Glowbal
14e00940cd fixed incorrect airwayStatus values for initialization (adv medical) 2015-04-03 18:59:22 +02:00
Glowbal
368002cc79 fixed undefined _selectionName variable #289 2015-04-03 08:48:10 +02:00
Glowbal
045ea02da0 Changed: CPR is now only possible when a unit is in cardiac arrest (Adv) 2015-04-03 00:10:12 +02:00
Glowbal
b399768798 Changed postInit wound sync to playerChanged eventhandler. 2015-04-03 00:04:41 +02:00
Glowbal
c174ccf396 fixed script error when performing treatment with secondary weapon selected 2015-04-02 22:58:00 +02:00
Glowbal
57b093f845 Added minimum lethal damage for injury types in adv medical 2015-04-02 22:57:35 +02:00
Glowbal
b267a52ec6 Fixed support for custom damage types 2015-04-02 22:57:02 +02:00
Glowbal
6f630d4c03 Changed setUnconscious contract to support a minimum unconscious time 2015-04-02 22:55:23 +02:00
Glowbal
7252966a78 Replaced advanced wounds event sync by regular setvariable public 2015-04-01 20:03:44 +02:00
Glowbal
635f3e31c9 Disable medical carry and drag 2015-04-01 19:56:00 +02:00
PabstMirror
559f0dbaea Unconc - dropping object handled in dragging 2015-03-26 16:32:44 -05:00
PabstMirror
6a71a04ad9 opps 2015-03-26 15:52:30 -05:00
PabstMirror
de644ba9b0 Medical - Reset captive status for respawning unit 2015-03-26 15:49:08 -05:00
PabstMirror
048be00a0f Medical - QGVAR(isUnconscious) -> "ACE_isUnconscious" 2015-03-26 15:47:08 -05:00
PabstMirror
2eefb1265d Medical - morphine icon for left leg 2015-03-26 15:16:28 -05:00
PabstMirror
3f137d357d Medical - carryObj func moved 2015-03-26 15:05:50 -05:00
commy2
9a0f0cb47b stuff from medical 2015-03-26 16:58:41 +01:00
Glowbal
9f540e0473 fixed Missing unconcious effects #253 2015-03-26 08:43:30 +01:00
Glowbal
eb80831525 fixed script error with medical display patient information after check response 2015-03-25 22:18:52 +01:00
bux578
1f3c3ce34b fixed spelling of engl. autoinjector 
http://en.wikipedia.org/wiki/Epinephrine_autoinjector
 2015-03-25 18:22:45 +01:00
Glowbal
b6133eb73e removed diag_log calls 2015-03-24 23:10:03 +01:00
Glowbal
3b17cc68e1 medical_onUnconscious is now a globalEvent instead of targetEvent. 
Feature request by commy.
 2015-03-24 22:10:41 +01:00
Glowbal
975ad5a399 Merge branch 'master' into medical-fixes 
Conflicts:
	addons/medical/CfgVehicles.hpp
 2015-03-24 22:07:15 +01:00
Glowbal
706e159815 Adjusted color of tourniquet message 2015-03-24 22:01:33 +01:00
Glowbal
2f729f67f1 Slightly increased the distance of medical actions 
Removed sub menu medical on torso
 2015-03-24 21:41:03 +01:00
Glowbal
7420f70020 Fixed #232 2015-03-24 21:26:20 +01:00
Glowbal
95489ed627 fixed missing handleDamage EH #235 2015-03-24 21:25:21 +01:00
Glowbal
53e7fe1ba5 fixed #227 2015-03-24 21:08:45 +01:00
Glowbal
f175467813 fixed #241 and #228 2015-03-24 21:08:13 +01:00
Nicolás Badano
77dc50f10f Some more fixes for self interaction inside vehicles 2015-03-24 16:06:03 -03:00
Nicolás Badano
4fb50fa71e Merge branch 'master' of github.com:KoffeinFlummi/ACE3 2015-03-24 15:44:10 -03:00
Nicolás Badano
8b3648cf8d Configure exceptions for self actions inside vehicles 2015-03-24 15:43:49 -03:00
bux578
05896a55ea fix authors 2015-03-24 19:40:48 +01:00
bux578
60c50e0daf Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into ModuleIcons 2015-03-24 19:12:23 +01:00
Nicolás Badano
5e79970740 Switching nicknames 2015-03-24 01:18:00 -03:00
Nicolás Badano
a823fb2dca Tweaks on action names to: 
- Remove >> for submenus
- Split long action names in two lines
 2015-03-24 00:16:32 -03:00
bux578
ba42ec831b second batch of icons 2015-03-23 20:02:35 +01:00
PabstMirror
2329212060 Medical Action Stringtable 2015-03-23 13:52:26 -05:00
bux578
1114e12186 add first batch of module icons, naming conventions 2015-03-23 13:56:59 +01:00
Glowbal
15edb0bff2 fixes 2015-03-22 23:24:24 +01:00
Glowbal
d7de92c60d Merge branch 'master' into Medical_Dragging 
Conflicts:
	addons/medical/XEH_postInit.sqf
	addons/medical/XEH_preInit.sqf
 2015-03-22 22:41:36 +01:00
Glowbal
9e43ab5c25 Merge branch 'master' into medical-advanced 2015-03-22 22:37:37 +01:00
Glowbal
4ff849c2fd Merge branch 'master' into medical-advanced 2015-03-22 22:34:07 +01:00
Glowbal
1bb32dcfcb fixed missing condition variable 2015-03-22 22:20:44 +01:00
Glowbal
4995016a66 Switched to canInteractConditions 2015-03-22 20:59:57 +01:00
Glowbal
7bc6fa3c3b Disable interaction for objects 2015-03-22 20:39:22 +01:00
Glowbal
6eac193825 Replaced deleting of body by hiding it 2015-03-22 20:37:55 +01:00
Glowbal
2d2687e759 Added self interact items 2015-03-22 17:28:48 +01:00
Glowbal
dd7dad1b90 define base class 2015-03-22 17:05:31 +01:00
Glowbal
f252b2c96f advanced medical JIP improvements 2015-03-22 17:04:42 +01:00
Glowbal
8b4c0c0e36 fixed postInit depending on setting 2015-03-22 15:16:42 +01:00
Glowbal
be9c09b605 Added cfgPatches dependancy on ace_modules 2015-03-22 12:49:04 +01:00
Glowbal
281bad1e7e Use of the ACE module instead of Module_F. 2015-03-22 12:44:26 +01:00
Glowbal
55e7e768ca removed systemChat messages 2015-03-22 11:21:17 +01:00
Glowbal
5063e9cff9 fixed config duplicate entry 2015-03-22 11:21:08 +01:00
Glowbal
ac4309237b Added drag/carry actions 2015-03-22 10:28:41 +01:00
Glowbal
0428a1d558 Added canDrag 2015-03-22 10:28:33 +01:00
Glowbal
7b519fc2e0 Merge branch 'master' into Medical_Dragging 
Conflicts:
	addons/medical/XEH_postInit.sqf
	addons/medical/stringtable.xml
 2015-03-22 09:46:58 +01:00
Nicolás Badano
5dcf29ba80 Merge pull request #212 from KoffeinFlummi/interactivePelvis 
Move main interactions to pelvis; leave torso for medical
 2015-03-21 20:44:18 -03:00
Nicolás Badano
6a83d0d9fc clear canTreat caches before calling the last condition 2015-03-21 20:33:25 -03:00
PabstMirror
3a6995fbec Cleanup medical Item classnames 2015-03-21 18:07:50 -05:00
Felix Wiegand
be4f21ea2e Merge pull request #215 from KoffeinFlummi/medical-itemcheck 
Medical itemcheck
 2015-03-21 22:41:06 +01:00
Glowbal
a7d8914884 Removed GVAR/QGVAR from items 2015-03-21 22:22:28 +01:00
Glowbal
b74eb550b0 Added advanced items 2015-03-21 22:08:42 +01:00
KoffeinFlummi
58237751b0 Woopsie 2015-03-21 22:01:20 +01:00
KoffeinFlummi
f6f910fb8a Replace vanilla items with ours. 2015-03-21 21:59:08 +01:00
Glowbal
d73f16861b Merge pull request #213 from KoffeinFlummi/medical-advanced 
Medical advanced
 2015-03-21 21:02:35 +01:00
Nicolás Badano
ce3ed988a2 Removed debug traces 2015-03-21 16:33:59 -03:00
Glowbal
89daf840f6 fixed incorrect macro 2015-03-21 20:08:52 +01:00
Nicolás Badano
4e32e584be Merge branch 'master' of github.com:KoffeinFlummi/ACE3 2015-03-21 15:33:36 -03:00
Nicolás Badano
f8ea603977 Added dynamic actions to unload patients (unconscious) from vehicles 2015-03-21 15:32:32 -03:00
PabstMirror
9578024693 Dupe stringtable entry 
`Item STR_ACE_MEDICAL_BANDAGING listed twice`
 2015-03-21 12:52:08 -05:00
Glowbal
7d6afdf1a9 Added triage card option 2015-03-21 17:30:49 +01:00
Glowbal
82ec93b84e Medical icons 2015-03-21 17:05:32 +01:00
Glowbal
7ae45fbeff Fixed canTreatCached 2015-03-21 16:47:51 +01:00
Glowbal
d0b14286ff Wrong function name 2015-03-21 16:34:42 +01:00
Glowbal
1d63e94fff canTreatCached 2015-03-21 16:33:14 +01:00
Glowbal
8de985d754 Added medical icons 2015-03-21 15:45:35 +01:00
Nicolás Badano
d7363a6dab Move main interactions to pelvis; leave torso for medical 2015-03-21 11:01:38 -03:00
Glowbal
4bcfd1a0ba Merge branch 'master' into medical-advanced 
Conflicts:
	addons/medical/functions/fnc_handleUnitVitals.sqf
 2015-03-21 14:54:37 +01:00
Glowbal
946ade63e5 Merge branch 'master' into medical-advanced 2015-03-21 14:40:59 +01:00
Glowbal
ff5c8e911d Added InteractionMenuClosed event for closing the patient information display 2015-03-21 14:40:51 +01:00
Glowbal
77210581f5 Added corners to triage card 2015-03-21 14:40:26 +01:00
KoffeinFlummi
75517f7ce4 Replace setDamage with setDead 2015-03-21 14:40:23 +01:00
Glowbal
7c30127ffb Disabled unimplemented medical systems 2015-03-21 10:55:40 +01:00
Glowbal
bc082783c9 check if unit is in a vehicle before checking the vehicle 2015-03-21 10:55:27 +01:00
Glowbal
b5c6e52416 fixed #201 2015-03-21 10:54:52 +01:00
KoffeinFlummi
a060e4bea5 Apply translations to epipen and morphine actions 2015-03-21 00:31:47 +01:00
KoffeinFlummi
b1ed80a23d Remove trailing whitespace in medical stringtable 2015-03-21 00:28:19 +01:00
KoffeinFlummi
510538bc53 Remove superfluous todo 2015-03-21 00:26:14 +01:00
KoffeinFlummi
88fb2765e3 Standardize actions across basic and advanced 2015-03-21 00:21:30 +01:00
KoffeinFlummi
6f8b5cc676 Fix missing dollar sign 2015-03-20 23:53:25 +01:00
KoffeinFlummi
33d4bf2f5a Add localization for basic treatments and actions 2015-03-20 18:21:03 +01:00
KoffeinFlummi
9082712ff7 Replace Original with English keys in stringtable 2015-03-20 17:54:26 +01:00
KoffeinFlummi
66078a047b Wut. 2015-03-20 07:52:41 +01:00
KoffeinFlummi
07570fccd4 Make isMedic even prettier 2015-03-19 22:34:12 +01:00
KoffeinFlummi
5589b80c70 Rewrite and fix isMedic 2015-03-19 22:27:12 +01:00
KoffeinFlummi
97082e4ce3 Simplify condition checking in canTreat. 2015-03-19 22:01:40 +01:00
KoffeinFlummi
69e0ebf107 Add injury texts 2015-03-19 21:31:56 +01:00
KoffeinFlummi
102d86d7d1 Merge remote-tracking branch 'origin/master' into medical-basic 2015-03-19 21:30:27 +01:00
Glowbal
3dda70a4af fixed variable name 2015-03-19 21:14:42 +01:00
Glowbal
42de257c6e Merge branch 'master' into Medical_Dragging 2015-03-18 18:21:05 +01:00
Glowbal
be4ba6144f Removed unnecessary line 2015-03-18 18:17:42 +01:00
KoffeinFlummi
b470276f7f Close dialogs when falling unconscious. 2015-03-17 08:03:11 +01:00
KoffeinFlummi
8a3e3d4b52 Remove superfluous todo 2015-03-17 08:02:55 +01:00
KoffeinFlummi
056625f0fe Check leg/arm damage in setHitPointDamage as well. 2015-03-17 07:53:50 +01:00
KoffeinFlummi
17fd051c79 Rename Bloodbag action to BloodIV 2015-03-17 07:53:35 +01:00
KoffeinFlummi
99899d6562 Move advanced bloodloss handling to advanced 2015-03-15 03:26:10 +01:00
KoffeinFlummi
4cc1b08196 Add basic bleeding 2015-03-15 03:26:00 +01:00
KoffeinFlummi
d640367ff2 Add isInMedicalVehicle function 2015-03-15 03:25:31 +01:00
KoffeinFlummi
77ae997993 Don't handle unit vitals when game is paused 2015-03-15 01:48:50 +01:00
KoffeinFlummi
7f19ab7750 Only run JIP updates for wounds in advanced 2015-03-15 01:46:23 +01:00
Glowbal
62460e8b79 Fixes for animations and script error 2015-03-15 01:12:02 +01:00