ulteq
|
66803a4b4d
|
Fix damage coloring
|
2016-12-07 18:53:04 +01:00 |
|
ulteq
|
74fefb6f69
|
New body part colors:
* Red bleeding
* Blue tourniquet
* Yellow/Orange damage
|
2016-12-07 18:28:35 +01:00 |
|
ulteq
|
7f1678b7e6
|
Increased wake up chance
|
2016-12-07 18:19:35 +01:00 |
|
ulteq
|
03f7451c99
|
Fixed incorrect debug output
|
2016-12-07 11:41:58 +01:00 |
|
ulteq
|
5db75ac746
|
Fixed check blood pressure did not always account for tourniquets
|
2016-12-07 11:32:01 +01:00 |
|
ulteq
|
ab7af04530
|
Overhauled the medication system:
* Refactored the old code
* Introduced 'timeTillMaxEffect' config entry for medication
|
2016-12-06 20:42:10 +01:00 |
|
ulteq
|
02ac4c4084
|
Fixed minor bug in the heart rate calculation
|
2016-12-06 17:40:05 +01:00 |
|
ulteq
|
faa2b619ab
|
Removed overly verbose debug logs
|
2016-12-06 17:35:52 +01:00 |
|
ulteq
|
fa77fb7194
|
Various fixes:
* Fixed medication (morphine, epinephrine, ...)
* Fixed CPR
* Improved heart rate simulation
* Removed deprecated ace settings
|
2016-12-06 17:26:11 +01:00 |
|
ulteq
|
978a81fb0a
|
Removed dead code
|
2016-12-06 14:37:48 +01:00 |
|
ulteq
|
92da5c80a0
|
Partly fixed Medication
* Brings the heart rate adjustment (due to medication) back to life
* Restores the medication effect loop (needs testing)
|
2016-12-06 12:58:12 +01:00 |
|
ulteq
|
db547a53b7
|
Increased unconsciousness wake up interval
|
2016-12-06 10:58:43 +01:00 |
|
PabstMirror
|
c47772eddc
|
Fix stringtables
|
2016-12-05 19:40:26 -06:00 |
|
ulteq
|
a88be4f458
|
Fixed 'displayPatientInformation'
|
2016-12-05 23:00:02 +01:00 |
|
ulteq
|
a5ce5b4a34
|
Medical Rewrite - Continued (#4744)
|
2016-12-05 21:34:20 +01:00 |
|
commy2
|
9cba0baade
|
manual merge
|
2016-12-05 20:18:15 +01:00 |
|
commy2
|
a83267b2ff
|
manual merge
|
2016-12-05 20:15:16 +01:00 |
|
BaerMitUmlaut
|
ac28bce578
|
Fixed state machine not running for units
|
2016-11-29 12:35:26 +01:00 |
|
PabstMirror
|
a3c50a6c76
|
Add dev macro to quickly recompile functions (#4699)
|
2016-11-23 13:35:25 -06:00 |
|
SilentSpike
|
24ada4dab3
|
Clarify the maximumCardiacArrestTime setting
|
2016-11-13 21:45:38 +00:00 |
|
SilentSpike
|
27728172ed
|
Clarify the allowDeathMode setting
|
2016-11-13 21:27:40 +00:00 |
|
BaerMitUmlaut
|
b4569f0a96
|
Fix bracket
|
2016-11-13 18:11:18 +01:00 |
|
BaerMitUmlaut
|
27916e8455
|
Merge branch 'medical-rewrite' of https://github.com/acemod/ACE3 into medical-rewrite
|
2016-11-13 18:03:12 +01:00 |
|
PabstMirror
|
5463e9dff8
|
Merge branch 'master' into medical-rewrite
|
2016-11-09 13:12:42 -06:00 |
|
Karan Singh
|
09b89a0bbc
|
Fix typo in Eden Options (#4615)
* Fix typo in Eden Options
This fixes a typo in line 25, ace_isMeidc_temp to ace_isMedic_temp
* Fix L13
|
2016-11-09 13:07:29 -06:00 |
|
BaerMitUmlaut
|
dac4a4dc42
|
Merged instant death and execution into one setting
|
2016-11-09 19:01:55 +01:00 |
|
BaerMitUmlaut
|
08a378bb2d
|
Added execution system, improved instant death
|
2016-11-08 19:37:56 +01:00 |
|
BaerMitUmlaut
|
928ded0e66
|
Fixed instant death and PREP
|
2016-11-07 23:46:10 +01:00 |
|
BaerMitUmlaut
|
ba9fc9240c
|
Removed traces of old state machine
|
2016-11-07 23:44:33 +01:00 |
|
BaerMitUmlaut
|
0427814961
|
Started transition to CBA state machine, removed revive in favour of extended cardiac arrest
|
2016-11-07 22:21:07 +01:00 |
|
BaerMitUmlaut
|
a65f1d19fa
|
Added state machine debug functionality
|
2016-11-07 22:19:55 +01:00 |
|
commy2
|
fc39ac14b7
|
don't knock out if pain is removed
|
2016-10-20 13:49:52 +02:00 |
|
commy2
|
be56b4d806
|
knock out due to pain
|
2016-10-20 13:46:28 +02:00 |
|
commy2
|
370faf9b48
|
cleanup
|
2016-10-20 13:38:26 +02:00 |
|
commy2
|
7e498ab762
|
setting for basic/advanced syringes
|
2016-10-20 02:14:11 +02:00 |
|
commy2
|
f2dfc6dc0e
|
fixes, tweaks
|
2016-10-13 20:17:21 +02:00 |
|
commy2
|
bc4c1787f9
|
show tourniquets in 3d menu
|
2016-10-13 19:05:29 +02:00 |
|
commy2
|
fe2c6e8d85
|
basic <-> advanced
|
2016-10-13 17:14:43 +02:00 |
|
commy2
|
68d75beae6
|
manual merge
|
2016-10-13 16:56:57 +02:00 |
|
commy2
|
e1cbeeea16
|
fix tourniquets
|
2016-10-13 10:12:28 +02:00 |
|
commy2
|
18907adcd5
|
increase medical item mass to at least 100 grams
|
2016-10-13 09:48:58 +02:00 |
|
commy2
|
b1f0af7e1c
|
merge basic and adv. bandage actions
|
2016-10-13 09:10:08 +02:00 |
|
commy2
|
e38845bf45
|
add ace_kill event handler
|
2016-10-12 23:20:22 +02:00 |
|
commy2
|
92fc4ec14b
|
add a setting for 'basic' blood bags
|
2016-10-12 22:38:58 +02:00 |
|
commy2
|
a5d070f829
|
blood and unconsciousness fixes
|
2016-10-12 21:59:32 +02:00 |
|
commy2
|
be71e6fa7b
|
Merge branch 'medical-rewrite-blood' into medical-rewrite
|
2016-10-12 04:05:50 +02:00 |
|
commy2
|
b0b9037f24
|
simplify lost some/much blood macros
|
2016-10-11 19:44:20 +02:00 |
|
commy2
|
d1df47919d
|
support neg numbers to remove pain in addPain
|
2016-10-11 19:36:04 +02:00 |
|
commy2
|
1ea2a72f20
|
don't play scream by addPain function
|
2016-10-11 19:29:44 +02:00 |
|
commy2
|
d0df141cf7
|
add comment explaining why 6.0 were chosen
|
2016-10-10 18:22:46 +02:00 |
|