PabstMirror
3a4a02e524
#1407 - Make Saline 500ml match mass blood/plasma
2015-05-27 16:23:25 -05:00
Glowbal
7dd01ebb69
Merge pull request #1389 from acemod/possibleFixMedicalUnloadPatient
...
Possible fix medical unload patient
2015-05-27 19:34:23 +02:00
Ivan Navarro Cabello
047a2ee736
added spansih translate
...
added spansih translate for (advanced_ballistics, ballistics, captives,
common, explosives, frag, hearing, interaction, map, medical, microdagr,
missileguidance, missionmodules, mk6mortar, nametags, optionsmenu,
respawn, switchunits, vehiclelock, weather, winddeflection).
I used the Pull request of #1251 for complete my commit, because #1251
is outdated now.
2015-05-27 15:27:04 +02:00
ViperMaul
388d6c3519
Change to the proper isAwake function
...
#1375
2015-05-25 20:47:28 -07:00
ViperMaul
3bdb27386c
removing obsolete drag code
...
#1375
2015-05-25 10:25:28 -07:00
ViperMaul
7141d251c7
create unloadPersonLocal
...
#1375
2015-05-25 09:41:24 -07:00
ViperMaul
cafaef9612
revert missing actionDragUnit file
...
#1375
2015-05-25 09:39:12 -07:00
ViperMaul
06932f0c03
Restore missing actionDragUnit function file
...
#1375
2015-05-24 15:14:11 -07:00
PabstMirror
d82fcd1f96
Advanced - Bloodbag lookup by treatment not item
2015-05-23 01:26:13 -05:00
PabstMirror
d752dd50d0
Basic - Bloodbag size matters
2015-05-23 01:16:18 -05:00
PabstMirror
8fd0aef7d4
Medical - Fix Handle Damage
...
{} were unmatched so nothing ran.
I think this is just leftover from a merge.
2015-05-22 16:35:48 -05:00
PabstMirror
537bba1382
Medical - Fix Unconscious Condition
2015-05-22 13:56:45 -05:00
jaynus
582ea318d4
Merge remote-tracking branch 'origin/superTime'
...
Conflicts:
addons/frag/functions/fnc_fired.sqf
addons/frag/functions/fnc_trackFragRound.sqf
2015-05-22 07:24:55 -07:00
jaynus
c924baefd7
All instances of time and diagTicktime changed to ACE_time / ACE_diagTime.
2015-05-21 09:42:44 -07:00
PabstMirror
1aa9520adb
Fix Script Error when treating with bincos
2015-05-20 23:24:44 -05:00
Alessandro Foresi
67319b6808
Fixed: Removed § at the end of EH call
2015-05-20 22:04:19 +02:00
KoffeinFlummi
f16f282abd
Merge remote-tracking branch 'origin/release' into master-fix
...
Conflicts:
addons/medical/functions/fnc_handleDamage.sqf
extensions/common/p3d/animation.cpp
extensions/common/p3d/compressed.cpp
extensions/common/p3d/compressed.hpp
extensions/common/pbo/archive.cpp
extensions/common/pbo/search.cpp
extensions/common/pbo/search.hpp
extensions/common/shared.hpp
extensions/common/simplepipe_win32.cpp
extensions/common/simplepipe_win32.hpp
extensions/common/simulation/object.cpp
extensions/common/simulation/object.hpp
extensions/common/targetver.h
extensions/common/vector.hpp
2015-05-20 19:31:55 +02:00
PabstMirror
0d00894d9f
#1318 - isInMedicalVehicle - medicClass is number
2015-05-20 17:17:09 +02:00
Glowbal
694a24c970
Only change the color if bleeding (adv)
2015-05-20 17:15:25 +02:00
Glowbal
0a2679846c
Changed: morphine works 15 minutes
2015-05-20 17:15:24 +02:00
Glowbal
e8d169248f
Made atropine less effective
2015-05-20 17:15:23 +02:00
Glowbal
82260e5090
Changed: Made Morphine suppress more pain
2015-05-20 17:15:23 +02:00
Glowbal
2b1468db24
Added pain suppression instead of removal
2015-05-20 17:15:22 +02:00
Glowbal
429c85c9f1
fixed missing parameters for non local unit
2015-05-20 17:15:22 +02:00
Glowbal
913c938a9d
Added force unconscious parameter #1205
2015-05-20 17:15:21 +02:00
Glowbal
6439bf4e3a
Adjusted item mass #1226
2015-05-20 17:15:20 +02:00
Glowbal
808bb6d048
fixes #1195 units do not display injuries
...
Is caused because the system thinks medical is disabled for basic units, while this obviously is not the case.
2015-05-20 17:15:20 +02:00
Glowbal
104fcdc589
fixes #1155
2015-05-20 17:15:19 +02:00
PabstMirror
4d877196e4
Missing Parenthesissies
2015-05-19 00:36:54 -05:00
Glowbal
572b46a473
fix for #1297 Being near Campfires messes up basic medical and causes large fps lag
...
Should only do a max of 1 PFH at a time. If new damage is received before the PFH is completed, it will reset.
2015-05-19 07:23:44 +02:00
Glowbal
5b65d4117d
fixed wrong macro for addEventhandler
2015-05-18 23:02:46 +02:00
Glowbal
539ed2dc79
Fix debug message and prevent Instant death inside vehicles
2015-05-18 22:22:57 +02:00
Glowbal
771b62ed04
Fix medical vehicle return value
...
Could fix #1142
2015-05-18 21:33:35 +02:00
PabstMirror
c6991fde54
re-add brackets
2015-05-18 21:33:24 +02:00
Glowbal
2621c5a36c
fixed incorrect private var name
2015-05-18 21:33:12 +02:00
Glowbal
c76e22463a
consistent usage of brackets
2015-05-18 21:32:58 +02:00
PabstMirror
5a4ef610ec
Use PFEH array instead of setVariable
2015-05-18 21:32:47 +02:00
PabstMirror
2c3a5b0603
Start vital tracking after treatment
2015-05-18 21:32:22 +02:00
PabstMirror
f511de0a49
Calculate vitals interval on first run
2015-05-18 21:32:05 +02:00
Glowbal
853c654b4d
fixes #1195 units do not display injuries
...
Is caused because the system thinks medical is disabled for basic units, while this obviously is not the case.
2015-05-18 21:00:32 +02:00
Glowbal
fc99d07f7c
fixes #1155
2015-05-18 21:00:18 +02:00
jaynus
c17df2acb8
Change to execNextFrame.
2015-05-18 21:00:06 +02:00
jaynus
1c69f4faa4
Fixed: Litter spawning at huge radius, floating litter over water. Fixes #1112
2015-05-18 20:59:56 +02:00
Glowbal
f02314e996
Merge pull request #1217 from acemod/medicalFixes2
...
Medical Vitals Fixes
2015-05-16 15:35:42 +02:00
PabstMirror
dabd11b9c5
MedicalStringtable - Fill missing languages
2015-05-15 16:01:39 -05:00
Grzegorz
1e552496d5
Missing strings
...
They need to be here otherwise few options are blank inside medical modules.
2015-05-15 19:23:49 +02:00
PabstMirror
1d64e5917f
re-add brackets
2015-05-15 02:32:19 -05:00
Glowbal
56aec85616
fixed incorrect private var name
2015-05-15 09:25:57 +02:00
Glowbal
4b245c0fc4
consistent usage of brackets
2015-05-15 09:25:00 +02:00
PabstMirror
39bc7d06be
Use PFEH array instead of setVariable
2015-05-15 02:15:03 -05:00