Commit Graph

151 Commits

Author SHA1 Message Date
60af0d3162 Merge pull request #3456 from acemod/StandardizeConfigArrayGVAR
Standardize GVAR array brackets in configs.
2016-03-08 18:19:50 +01:00
fa3913752b replace XEH_ENABLED macro with actual class, fix #3482, fix #3483 2016-03-01 17:05:00 +01:00
8bb7b072d4 Standardize grammar of GVAR arrays in configs to place the square brackets outside the GVAR macro.
This prevents any possible confusion when the GVARs are used in code.
2016-02-28 15:18:15 +01:00
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
bfd90cd5d3 Add Adenosine to replace atropine #1573 2016-02-07 12:54:23 +01:00
c2f780e95f #1259 - Medical Locations Boost Training 2016-01-09 23:54:48 -06:00
5a1aae6028 manual merge 2015-11-30 17:44:15 +01:00
a9ebcf8543 fix setVariable and getVariable capitalization 2015-11-30 17:27:09 +01:00
5282e95668 Merge pull request #2876 from acemod/medicalTranslateHP
Medical Fixes
2015-11-28 20:58:08 +01:00
8d4364350c Fix for "double semicolon detected" error 2015-11-27 10:43:30 -08:00
988a5c76bb Medical - 1.54 Changes
1.54 Armor
Translate selectiosn to hitpoints
Calc newDamage using hitIndex (because sel is translated)
Fix isFalling never being reset

Cache hitpointIndex to reset damage

Normalize Limb Armor to 1.54

Cleanup

Cleanup
2015-11-25 11:49:20 -06:00
20bf90f3e9 Medical - Fix Hitpoints Macro when building 2015-11-24 16:30:09 -06:00
c2564de5ef Fix UBC for 1.54
Soldiers no longer inherit hitpoints from CaManBase
Adds a macro to deal with them
2015-11-20 23:27:29 -06:00
64de91ed06 Add warning for duplicate setting modules. 2015-10-18 23:34:11 -05:00
35d94e8d5c Fix medical litter scopeCurator values
Solves #2526 where medical litter would appear in zeus with no name.
2015-09-19 19:37:38 +01:00
adb1a11211 increase leg and arm armor value, more TRACE debug 2015-09-06 11:49:08 +02:00
0bd92af072 fix variables not inited, csat armor scaleing 2015-09-03 17:17:54 +02:00
e753131f2d arms and legs to vulnerable, better scaling for pilots and csat 2015-09-03 16:17:48 +02:00
7d2f1f52a4 remove protection, hitpoint config (fix ubc), some debug stuff 2015-09-02 20:13:51 +02:00
5a164c5cdc fix UBC issues, simplify uniform hitpoint config 2015-08-31 23:36:59 +02:00
6796b3126d Staged work on fixing updating base classes for hitpoints 2015-08-29 12:59:28 +02:00
a8c11a249d cargo sup for bodybag and concertina 2015-08-20 21:41:28 +02:00
8e3a961ee3 Fixed missing string 2015-08-08 18:11:28 +02:00
1aecd54fc3 Removed duplicated Enabled/Disabled/Yes/No/DoNotForce strings as they were moved to common 2015-08-08 18:02:20 +02:00
6ab72e905c #1807 - Clean bandages if no damage on hitpoint 2015-08-05 17:32:00 -05:00
6258e73290 addX macro in confgis 2015-07-25 21:59:52 +02:00
9bdb192c8a Add New LitterGloves
Add New Litter/packingbandage
Change all Litter Model and Texture to a nomenclature (littergeneric_name)
2015-07-19 15:31:15 +02:00
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
fd649aee38 Changed default value for surgical kit. Should be use anytime 2015-07-03 22:17:31 +02:00
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
5013254769 Merge pull request #1530 from legman/akalegman_zeus_unconscious
Fixed Zeus Unconscious
2015-06-13 20:48:18 +02:00
ce908f0fb3 Merge pull request #1579 from acemod/medicalModuleOptions
[Adv. Medical]  New module options
2015-06-13 13:37:02 +02:00
affe323435 Fix bodybag string macro 2015-06-12 23:19:17 -05:00
eef7c1295a Added new adv. medical module option 'painIsOnlySuppressed' 2015-06-11 17:36:18 +02:00
0c40c1b439 Added Adv. Medical module option 'healHitPointAfterAdvBandage':
* Changed the default value to '0'
2015-06-11 15:30:39 +02:00
5431ab5e01 fixed conflicts 2015-06-10 20:03:00 +01:00
1ae8e29ac2 updated isPlayer v2 2015-06-08 19:12:16 +01:00
32ce0aa6fd Macroize all stringtables 2015-06-05 21:02:24 -05:00
e01ba64683 Fix Missing Strings 2015-06-04 22:51:40 -05:00
0b0f7274d7 Applied ESTRING and ECSTRING macros 2015-05-27 22:04:41 +02:00
1c58ff823d Stringtable fixes medical 2015-05-27 21:58:35 +02:00
6072e14077 Changed all strings to macros (except external) 2015-05-27 19:04:25 +02:00
44466e8be8 Remove tabs and repair errors @Glowbal found
Conflicts:
	addons/map/CfgVehicles.hpp
	addons/medical/CfgVehicles.hpp

Conflicts:
	addons/map/CfgVehicles.hpp
	addons/medical/CfgVehicles.hpp
	addons/optionsmenu/stringtable.xml
2015-05-12 18:27:27 +02:00
156bba3321 Yes/No to BOOL
Conflicts:
	addons/common/CfgVehicles.hpp
	addons/common/stringtable.xml
	addons/explosives/stringtable.xml
	addons/hearing/CfgVehicles.hpp
	addons/hearing/stringtable.xml
	addons/interaction/stringtable.xml
	addons/map/CfgVehicles.hpp
	addons/map/stringtable.xml
	addons/medical/CfgVehicles.hpp
	addons/medical/stringtable.xml
	addons/nametags/stringtable.xml
	addons/respawn/stringtable.xml
	addons/switchunits/CfgVehicles.hpp
	addons/switchunits/stringtable.xml

Conflicts:
	addons/common/CfgVehicles.hpp
	addons/common/stringtable.xml
	addons/explosives/stringtable.xml
	addons/hearing/stringtable.xml
	addons/interaction/stringtable.xml
	addons/map/CfgVehicles.hpp
	addons/map/stringtable.xml
	addons/medical/CfgVehicles.hpp
	addons/medical/stringtable.xml
	addons/nametags/stringtable.xml
	addons/respawn/stringtable.xml
	addons/switchunits/CfgVehicles.hpp
	addons/switchunits/stringtable.xml
2015-05-12 18:26:24 +02:00
6a821715a0 Stringtable modules
Conflicts:
	addons/missionmodules/CfgVehicles.hpp
	addons/respawn/CfgVehicles.hpp
2015-05-12 18:25:40 +02:00
09a0158fa4 This should not be 1 2015-05-01 22:49:13 +02:00
722c459c1e added APL pbo 2015-05-01 19:37:17 +02:00
80162627ec Fixed spelling of enableUnconsciousnessAI 2015-05-01 18:49:59 +02:00
53835605ea Merge remote-tracking branch 'origin/master' into basic-med-options
Conflicts:
	addons/medical/functions/fnc_getBloodLoss.sqf
	addons/medical/functions/fnc_handleDamage_basic.sqf
2015-05-01 01:25:16 +02:00
965a976daf Reorganize AI unconsciousness 2015-04-30 22:16:45 +02:00