Commit Graph

958 Commits

Author SHA1 Message Date
Joko
fa900452ea Add DAGR (by Blackpixxel)
Add QuikClot to Medical (by Blackpixxel)
Add QuikClot Litter (by Blackpixxel)
Update Blackpixxel at Author
Fix IRStrobe Texture Path
2015-07-05 22:21:17 +02:00
Joko
0c099dc4d1 Add 3D Object IVBag Blood, Plasma and Saline with 1000ml, 500ml, 250ml(Made by PaxJaromeMalues)
Add PaxJaromeMalues to AUTHORS
2015-07-04 22:50:32 +02:00
ProfessorCZ
89a9218e59 CZ Translation - Update 2015-07-04 15:56:00 +02:00
Glowbal
57c4bc453a Merge pull request #1779 from SzwedzikPL/zeus_no_paineffect
disable pain effect in zeus camera
2015-07-03 23:20:33 +02:00
Glowbal
44de95ea81 Merge pull request #1790 from acemod/medicalImprovements
Medical improvements
2015-07-03 22:21:20 +02:00
Glowbal
fd649aee38 Changed default value for surgical kit. Should be use anytime 2015-07-03 22:17:31 +02: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
07303633e4 Merge pull request #1692 from acemod/fixVanillaDamageEffectsShowing
Fix vanilla damage effects
2015-07-03 21:41:26 +02:00
gienkov
70862c5de9 PL translation 2015-07-02 23:55:26 +02:00
SzwedzikPL
13999fdd31 finddisplay into curatorcamera 2015-07-02 19:36:34 +02:00
SzwedzikPL
c2e4ee431f no pain effect in zeus camera 2015-07-02 13:56:56 +02:00
ToasterBR
f4a51d57ef Translation to Brazilian Portuguese (PT-BR)
Made all remaining translations, including new ones like the sitting
module, for example.
2015-06-27 15:48:39 -03:00
ulteq
241e8acdd9 Merge pull request #1541 from jonpas/sitting
Sitting
2015-06-26 21:34:34 +02:00
Glowbal
e153e47bb2 Disabled litter on treatment failure. #1403
We give back the items, so litter does not make sense at the moment.

In the future we need to expand this with conditions for success/failure.
2015-06-20 12:54:00 +02:00
Glowbal
9e00fc479b CPR local is now also only executed when the target is still alive.
Otherwise it's quite useless
2015-06-20 12:51:42 +02:00
Glowbal
c4283404e8 Changed CPR to be available for all unconscious units
Including dead
2015-06-20 12:51:01 +02:00
Glowbal
ea0be1f563 Only execute the local handling of CPR when in a valid state 2015-06-20 12:46:26 +02:00
Glowbal
385baf1331 Using CPR while in revive state will extend the life timer 2015-06-20 12:44:52 +02:00
Glowbal
9795647d9c While in revive state, ensure vitals are never above 0 for adv medical 2015-06-20 12:44:29 +02:00
Glowbal
3f5a050745 Fixed #1693 2015-06-20 12:38:12 +02:00
Glowbal
c3e2d1bf9c Removed always unconscious for basic medical 2015-06-20 12:23:40 +02:00
Glowbal
5887c59c05 Made fix properly for advanced medical 2015-06-19 23:03:31 +02:00
Glowbal
300a33ea0a Initial work 2015-06-19 22:53:25 +02:00
ulteq
82d80359d1 Fixes: https://github.com/acemod/ACE3/issues/1646 2015-06-16 21:57:12 +02:00
Glowbal
f8aa9a3171 Merge pull request #1621 from acemod/hrIncrease
Medical - change hrIncrease random min/max
2015-06-15 10:42:43 +02:00
Ivan Navarro Cabello
76f7962dac Updated spanish stringatable
Updated spanish stringatable for (Common, Medical, Optionsmenu,
Tacticalladder).
2015-06-14 13:52:55 +02:00
PabstMirror
1c5788baab Medical - change hrIncrease random min/max 2015-06-14 03:54:50 -05:00
Glowbal
91b54bfc3a Adds a back up function in sqf to assign open wounds. 2015-06-13 23:20:01 +02:00
ViperMaul
1322da5537 Merge pull request #1587 from acemod/fixVehicleUnconcious
fix animation and consistently unload units from vehicle
2015-06-13 12:44:34 -07:00
jonpas
29ce8f635e Merge branch 'master' into sitting
Conflicts:
	addons/kestrel4500/CfgVehicles.hpp
	addons/microdagr/CfgVehicles.hpp
2015-06-13 21:43:42 +02:00
ulteq
c459a80bcb Merge pull request #1613 from ProfessorCZ/master
CZ - Translation (medical, tacticalladder)
2015-06-13 20:48:34 +02:00
Glowbal
5013254769 Merge pull request #1530 from legman/akalegman_zeus_unconscious
Fixed Zeus Unconscious
2015-06-13 20:48:18 +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
ProfessorCZ
c9f29aefa2 CZ - Translation (medical, tacticalladder) 2015-06-13 19:49:59 +02:00
ProfessorCZ
bf464ffe00 CZ - Translation (medical, tacticalladder) 2015-06-13 19:46:31 +02:00
ulteq
6d6c3a4285 Fixed function header 2015-06-13 19:17:26 +02:00
ViperMaul
cb1d016a39 Merge pull request #1592 from ProfessorCZ/master
CZ - Translation
2015-06-13 07:39:18 -07:00
Glowbal
e0bb3c0a4e Merge pull request #1602 from acemod/medicalFallingFix2
[Adv. Medical] Improved falling damage
2015-06-13 13:39:22 +02:00
Glowbal
ce908f0fb3 Merge pull request #1579 from acemod/medicalModuleOptions
[Adv. Medical]  New module options
2015-06-13 13:37:02 +02:00
ulteq
1c4566984f Removed debug output 2015-06-13 12:13:58 +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
234b62b409 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into medicalFallingFix2 2015-06-13 11:12:37 +02:00
PabstMirror
affe323435 Fix bodybag string macro 2015-06-12 23:19:17 -05:00
ViperMaul
1c0811aa31 Change from globalEvent to targetEvent
#1575 and #1577
2015-06-12 16:56:13 -07:00
ProfessorCZ
531372b2a3 CZ - Translation
Already in README
2015-06-12 14:50:50 +02:00
ulteq
604cd122d3 Experiment 2015-06-12 13:54:52 +02:00
ulteq
6ac2ca9208 Fixes _projectile not being updated 2015-06-12 11:48:49 +02:00
ulteq
46a73f3177 Added a function to calculate the PAK treatmentTime 2015-06-12 11:42:49 +02:00
ViperMaul
072f2cc3a7 fix animation and consistently unload units from vehicle
#1575 and #1577
2015-06-11 15:56:11 -07:00
ulteq
99b13a584a PAK treatment time based on total amount of damage. 2015-06-11 22:54:08 +02:00