Commit Graph

602 Commits

Author SHA1 Message Date
07570fccd4 Make isMedic even prettier 2015-03-19 22:34:12 +01:00
5589b80c70 Rewrite and fix isMedic 2015-03-19 22:27:12 +01:00
97082e4ce3 Simplify condition checking in canTreat. 2015-03-19 22:01:40 +01:00
69e0ebf107 Add injury texts 2015-03-19 21:31:56 +01:00
102d86d7d1 Merge remote-tracking branch 'origin/master' into medical-basic 2015-03-19 21:30:27 +01:00
3dda70a4af fixed variable name 2015-03-19 21:14:42 +01:00
42de257c6e Merge branch 'master' into Medical_Dragging 2015-03-18 18:21:05 +01:00
be4ba6144f Removed unnecessary line 2015-03-18 18:17:42 +01:00
b470276f7f Close dialogs when falling unconscious. 2015-03-17 08:03:11 +01:00
8a3e3d4b52 Remove superfluous todo 2015-03-17 08:02:55 +01:00
056625f0fe Check leg/arm damage in setHitPointDamage as well. 2015-03-17 07:53:50 +01:00
17fd051c79 Rename Bloodbag action to BloodIV 2015-03-17 07:53:35 +01:00
99899d6562 Move advanced bloodloss handling to advanced 2015-03-15 03:26:10 +01:00
4cc1b08196 Add basic bleeding 2015-03-15 03:26:00 +01:00
d640367ff2 Add isInMedicalVehicle function 2015-03-15 03:25:31 +01:00
77ae997993 Don't handle unit vitals when game is paused 2015-03-15 01:48:50 +01:00
7f19ab7750 Only run JIP updates for wounds in advanced 2015-03-15 01:46:23 +01:00
62460e8b79 Fixes for animations and script error 2015-03-15 01:12:02 +01:00
2bee533a8c Added AGM stringtables for drag, carry, load & unload 2015-03-14 09:51:08 +01:00
dcf3a73518 Added copyDeadBody function 2015-03-14 09:48:16 +01:00
99b1986059 Added setting for allowing movement of dead bodies 2015-03-14 09:37:19 +01:00
93262f3b92 Use ace_isUnconscious in anim changed EH 2015-03-13 00:45:12 -05:00
55fcc60453 Merge branch 'master' into captivesMedicalInegration 2015-03-12 22:44:24 -05:00
4ce524ed3c First draft of carry and drop unit 2015-03-12 21:16:49 +01:00
82f73117f4 Merge branch 'master' into medical-basic 2015-03-12 07:35:57 +01:00
a3069e3356 Fix wrong pain variable in patient information 2015-03-12 07:35:29 +01:00
ef491a7c76 Add basic information to dialog 2015-03-12 07:34:29 +01:00
809f6754cc Add pain & painkiller reduction over time 2015-03-12 07:33:44 +01:00
dd026cea0f Medical - add tourniquet p3d and other missing tex
Ported tourniquet from cse
add missing textures for other items
fix paths in rvmats
2015-03-11 23:52:58 -05:00
5ab9ad87f9 QGVAR typo 2015-03-11 13:33:45 -05:00
fabecdd0d3 Merge branch 'master' into medical-basic 2015-03-11 18:20:16 +01:00
a641a5db8b Make use of fnc_setUnconscious 2015-03-11 18:08:29 +01:00
8d22b61a2d Assign structural damage to torso 2015-03-11 18:08:00 +01:00
c573b1048d Made medical diagnosis statements run on hover 2015-03-11 00:38:31 -03:00
1da67d7b48 First draft of triage card 2015-03-10 21:12:35 +01:00
a4d73e1b01 DEFUNC -> DFUNC 2015-03-10 19:51:51 +01:00
93a1cdaab6 setCaptivityStatus in setUnconsicous 2015-03-10 10:35:00 -05:00
e741c8a12b Config stuff 2015-03-09 22:36:25 +01:00
4b171f9507 Indentation 2015-03-09 22:27:01 +01:00
6b91cefb90 Minor fixes and added pain status 2015-03-09 22:23:37 +01:00
8cc0361cb4 localization and displayText fixes 2015-03-09 22:08:43 +01:00
8a3eac2aa0 Added medical actions to sub menu
Added statements
2015-03-09 22:08:32 +01:00
f62335f71c Fixed custom conditions 2015-03-09 21:42:09 +01:00
5afc651519 fixed incorrect tourniquet classname 2015-03-09 21:41:58 +01:00
6aae11944b config fixes 2015-03-09 21:41:43 +01:00
a37afec70e fixed inheritance of treatment classes 2015-03-09 21:14:39 +01:00
9b856ea38b Merge branch 'master' into Medical_Improvements 2015-03-09 21:08:18 +01:00
f7159084c3 Made the menu slightly wider 2015-03-09 21:05:11 +01:00
aeb4c91792 Added interaction menu actions for advanced medical 2015-03-09 21:05:01 +01:00
f6fbef980a Added support for bandaging a specific injury class on a selection 2015-03-09 20:03:17 +01:00