Commit Graph

113 Commits

Author SHA1 Message Date
Thomas Kooi
61f1959109 Fix morphine increasing viscosity
Morphine should decrease viscosity instead of increase. Closes #3579
2016-03-12 18:55:42 +01:00
Glowbal
ea113b8e61 Fix duplicate { 2016-02-21 01:04:12 +01:00
Glowbal
7d063d4dee Merge branch 'master' into medical-focus-feature
Conflicts:
	addons/medical/functions/fnc_treatmentAdvanced_CPR.sqf
2016-02-21 00:37:30 +01:00
PabstMirror
f1797feead Make wound assignment consistent for dll/sqf
Dll now exits on first match for threshold damage (exitWith)
Remove random wound in sqf to match dll
Fix backblast threshold order
Add lower vehiclecrash threshold
Add dll version logging
2016-02-16 12:19:18 -06:00
Glowbal
575f362fb6 Add setting for limiting usage of Epinephrine in basic medical #1792
Part of focus feature medical #3134. Default settings are inline with old default.
2016-02-07 13:10:38 +01:00
Glowbal
bfd90cd5d3 Add Adenosine to replace atropine #1573 2016-02-07 12:54:23 +01:00
Glowbal
39cf11367f improve medical bandage configuration 2016-02-07 12:37:00 +01:00
Glowbal
34613b42f2 Increase heart rate increase speed #3134 2016-01-20 11:49:10 +01:00
Glowbal
86158ac45b Stage improvements bandage effectiveness 2016-01-17 14:09:22 +01:00
PabstMirror
a501c7e1c3 Remove new models and just combine existing litter 2015-12-11 19:47:40 -06:00
PabstMirror
e9be05209a Fix litter for adv - Add bloody p3d for Pack/qClot
Fix #2950
Get correct bloodLossOnSelection for both basic and advanced
Adds bloody versions of packing bandage and quickClot
2015-12-10 22:58:44 -06:00
PabstMirror
6031eb8c6e Add all wound types to bandage treatment configs
Fix by adding all config entries;
instead of trying to modify classname
2015-11-27 14:19:26 -06:00
Glowbal
f15a1c033d Added allowSelfTreatment attribute to treatment actions 2015-09-05 13:20:19 +02:00
Glowbal
39ff82e764 fixes for CPR condition in basic medical and improvements to lethalDamage 2015-09-05 11:52:12 +02:00
Glowbal
a25f640614 fixes #2114 No CPR available in basic medical when revive is enabled 2015-09-05 11:07:10 +02:00
Glowbal
4bde554854 Merge branch 'master' into medical-adjustments
Conflicts:
	addons/medical/functions/fnc_actionCheckBloodPressure.sqf
	addons/medical/functions/fnc_actionCheckBloodPressureLocal.sqf
	addons/medical/functions/fnc_actionCheckPulse.sqf
	addons/medical/functions/fnc_actionCheckPulseLocal.sqf
2015-08-29 23:49:58 +02:00
Glowbal
602ef690fc Allow diagnose on torso #1879 2015-08-29 22:54:51 +02:00
Grzegorz
5ad0e192c3 Fix being able to TQ torso 2015-08-26 11:18:54 +02:00
Glowbal
ad7716a25e Merge pull request #2233 from gienkov/patch-27
Increase "load in bodybag" action time to 15s
2015-08-26 08:36:06 +02:00
Grzegorz
5280ded680 Bandage and tourniquet on adv. medical change proposal
Make bandaging longer as it is not very fast process.
Make putting on tourniquet faster cause it's should be easy to put one on limb, so it's actually useful now and with above change (putting it on before was longer than bandagin).
2015-08-25 20:05:05 +02:00
Grzegorz
33889fa46b Increase "load in bodybag" action time
Around 15 seconds seems optimal (for dead bodies that are left in **one** piece).
2015-08-23 00:13:09 +02:00
Grzegorz
07019ed928 Fix stitching action progress bar 2015-08-22 22:20:20 +02:00
Glowbal
58fc69c2a6 Updated litter configuration. Closes #2002 2015-08-09 08:59:04 +02:00
PabstMirror
95d88b920e #2079 - RemoveTourniquet doesn't require any items 2015-08-08 21:25:36 -05:00
Glowbal
696546de5c Finalized ACE medical menu settings 2015-08-08 20:22:19 +02:00
Glowbal
364e0455ee Merge branch 'master' into medical-menu 2015-08-08 17:55:43 +02:00
Glowbal
65c06551a5 Merge pull request #1652 from gienkov/patch-22
Fix checking vitals anim
2015-08-08 14:32:36 +02:00
Glowbal
abaf43be11 Selection restrictions 2015-08-07 00:09:40 +02:00
Glowbal
4b5632a8f6 Added categories and missing displayName entries 2015-08-06 23:50:23 +02:00
PabstMirror
6ab72e905c #1807 - Clean bandages if no damage on hitpoint 2015-08-05 17:32:00 -05:00
Glowbal
9edf1b1adf Implemented use conditions for PAK and SurgicalKit
It is now possible to only have a treatment action show up for stable (not bleeding) patients
2015-07-03 22:16:18 +02:00
Glowbal
c4283404e8 Changed CPR to be available for all unconscious units
Including dead
2015-06-20 12:51:01 +02:00
Grzegorz
1de569656d Fix checking vitals anim
It uses animations that don't match at all what you are doing anyway so I think it's better to just disable anim for that actions which are:
* Checking pulse
* Checking BP
* Checking response
2015-06-17 14:58:35 +02:00
Glowbal
1c066a0b3f Merge pull request #1586 from acemod/dynamicPAKtreatmentTime
PAK treatment time based on total amount of damage.
2015-06-13 20:14:57 +02:00
ulteq
84d20f9794 Further improved the handling of falling damage:
* Makes sure _projectile is always "falling"
* Enables the creation of wounds in multiple body parts at once
* Caches the initial impact velocity for later damage calculation
* Adjusts the maxDamage value of Large Abrasions
2015-06-13 11:53:30 +02:00
ulteq
46a73f3177 Added a function to calculate the PAK treatmentTime 2015-06-12 11:42:49 +02:00
ulteq
99b13a584a PAK treatment time based on total amount of damage. 2015-06-11 22:54:08 +02:00
jonpas
5496333c26 Merge branch 'master' into macroSTR
Conflicts:
	addons/nametags/ACE_Settings.hpp
	addons/nametags/CfgVehicles.hpp
	addons/nametags/stringtable.xml
2015-06-02 22:22:51 +02:00
ulteq
048e5b6f6d Body bag cleanup:
* Increased the treatment time to match the animation duration
* Fixed the body bag alignment with the dead unit
2015-06-01 22:33:25 +02:00
jonpas
d934c25b78 Merge branch 'master' into macroSTR
Conflicts:
	addons/interact_menu/ACE_Settings.hpp
2015-05-30 19:54:32 +02:00
Glowbal
9135d956f0 Merge branch 'surgicalkit' 2015-05-28 20:54:52 +02:00
jonpas
6072e14077 Changed all strings to macros (except external) 2015-05-27 19:04:25 +02:00
BaerMitUmlaut
30df0e8dc9 Switched to callbackPogress for treatment 2015-05-27 00:45:50 +02:00
PabstMirror
d752dd50d0 Basic - Bloodbag size matters 2015-05-23 01:16:18 -05:00
Glowbal
0a2679846c Changed: morphine works 15 minutes 2015-05-20 17:15:24 +02:00
Glowbal
e8d169248f Made atropine less effective 2015-05-20 17:15:23 +02:00
Glowbal
82260e5090 Changed: Made Morphine suppress more pain 2015-05-20 17:15:23 +02:00
Josuan Albin
dd2ea99d15 pak
pak anim
2015-05-05 19:26:11 +02:00
Josuan Albin
f063e45e60 medical advanced added
animations added for advanced
2015-05-05 19:04:08 +02:00
Josuan Albin
b781264212 New anim update
new healing animation added to animationCaller, animationCallerSelf
stays the same
2015-05-05 18:53:17 +02:00