Commit Graph

1116 Commits

Author SHA1 Message Date
Glowbal
a4e406658f Reduced initial knockdown time for basic medical 2015-09-05 13:02:19 +02:00
Glowbal
17ad7ecb8c replaced diag_logs by trace 2015-09-05 12:59:09 +02:00
Glowbal
9c0288cd3f Removed debug message 2015-09-05 12:55:49 +02:00
Glowbal
c828544d02 Added init stacking 2015-09-05 12:50:32 +02:00
Glowbal
c673ea2cbb Restored uniqueIds 2015-09-05 12:38:12 +02:00
Glowbal
17648739dd Removed more deprecated wound sync code 2015-09-05 12:37:01 +02:00
Glowbal
6b73eafcce Allow users to disable medical 3d interaction. 2015-09-05 12:31:52 +02:00
Glowbal
268220bbae Possible fix for weird unconscious behavior in basic medical 2015-09-05 12:20:40 +02:00
Glowbal
4122b32dba Removed deprecated wound sync code 2015-09-05 12:02:09 +02:00
Glowbal
e0db571e13 Minor adjustment to fatality change on torso damage 2015-09-05 12:00:45 +02:00
Glowbal
130569c485 Made basic medical bleeding information work with new damage system 2015-09-05 11:57:17 +02:00
Glowbal
39ff82e764 fixes for CPR condition in basic medical and improvements to lethalDamage 2015-09-05 11:52:12 +02:00
Glowbal
4514812523 Basic bandaging now works with new damage system 2015-09-05 11:51:46 +02:00
Glowbal
cd9e5df782 Clean up of handleDamage. Fixes some debug code 2015-09-05 11:25:56 +02:00
Glowbal
df3dbc9772 Removed deprecated fire handling 2015-09-05 11:25:31 +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
3d342ece20 Fixes #2156 Animation is still played even if you cancel any treatment 2015-09-05 11:04:11 +02:00
ViperMaul
4c0c7bc290 debug change 2015-09-04 10:21:10 -07:00
ViperMaul
7f58d5a94d Revert "Adding same ADV special case to BASIC handle damage." -Not Needed
This reverts commit bf267246bf.
2015-09-04 10:20:34 -07:00
ViperMaul
bf267246bf Adding same ADV special case to BASIC handle damage. 2015-09-04 07:48:16 -07:00
ViperMaul
2bc20501bc Adding more debug 2015-09-04 07:46:35 -07:00
ViperMaul
813e54a668 Fixing Debug for object variable hasPain 2015-09-04 07:37:20 -07:00
ViperMaul
89b0c05929 Fixed a debug statement. 2015-09-03 13:17:59 -07:00
commy2
b737f42777 fix error when opening triage card 2015-09-03 18:30:29 +02:00
commy2
795b7a893f Merge branch 'medical-adjustments2' of https://github.com/acemod/ACE3 into medical-adjustments2 2015-09-03 17:18:32 +02:00
ViperMaul
6d28214287 Add some debug values. 2015-09-03 08:18:37 -07:00
commy2
0bd92af072 fix variables not inited, csat armor scaleing 2015-09-03 17:17:54 +02:00
commy2
e753131f2d arms and legs to vulnerable, better scaling for pilots and csat 2015-09-03 16:17:48 +02:00
commy2
a84be46ed4 fix errors from cleanup 2015-09-03 15:49:49 +02:00
Glowbal
f38d245771 fixed bloodloss for basic medical 2015-09-02 21:56:00 +02:00
commy2
f939f9215e stop flickering of wounds, fix #346 2015-09-02 20:49:17 +02:00
commy2
7d2f1f52a4 remove protection, hitpoint config (fix ubc), some debug stuff 2015-09-02 20:13:51 +02:00
commy2
dc5e6b7c3c Merge branch '323medicalstrcturaldamage' into medical-adjustments 2015-09-02 20:02:19 +02:00
commy2
9665f73fa3 Merge branch 'master' of https://github.com/acemod/ACE3 into medical-adjustments 2015-09-02 17:03:36 +02:00
commy2
5a164c5cdc fix UBC issues, simplify uniform hitpoint config 2015-08-31 23:36:59 +02:00
commy2
f15805d1f3 setStructuralDamage function 2015-08-31 20:05:38 +02:00
Glowbal
8c6f896164 fixed script error when canceling treatment actions 2015-08-31 13:00:17 +02:00
KoffeinFlummi
5f63290508 Merge branch 'ptbr' 2015-08-30 00:42:31 +02:00
KoffeinFlummi
a7f2a7fefc Merge branch 'translate-hu' of https://github.com/Harakhti/ACE3 2015-08-30 00:35:11 +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
2fd30ba20c fixes #2274 2015-08-29 22:57:52 +02:00
Glowbal
602ef690fc Allow diagnose on torso #1879 2015-08-29 22:54:51 +02:00
Glowbal
ce42f5864f fix #2155 2015-08-29 22:53:08 +02:00
Glowbal
b291141d11 Should Be a better fix for #2298 2015-08-29 22:51:42 +02:00
Glowbal
183e872f1f Possible fix for #2298 2015-08-29 22:44:52 +02:00
PabstMirror
321ca815a2 semi-colon 2015-08-29 09:52:28 -05:00
jokoho48
8916b70fe1 Improve some Code 2015-08-29 15:29:02 +02:00
Glowbal
6796b3126d Staged work on fixing updating base classes for hitpoints 2015-08-29 12:59:28 +02:00
Glowbal
1e08244f21 Removed debug output 2015-08-29 12:59:11 +02:00
Glowbal
1a4736e663 Clean up 2015-08-29 12:01:00 +02:00