commy2
dea830441b
tweak turret functions
2015-03-26 14:10:53 +01:00
commy2
6b9b3bc6bd
remove idle animations for players with lowered weapon
2015-03-26 13:21:16 +01:00
Glowbal
6a1dfe00da
Merge branch 'master' of github.com:KoffeinFlummi/ACE3
2015-03-26 08:43:48 +01:00
Glowbal
9f540e0473
fixed Missing unconcious effects #253
2015-03-26 08:43:30 +01:00
PabstMirror
d4d0a0a6de
Make sure to remove animEH
2015-03-26 00:53:38 -05:00
PabstMirror
811530f180
Ensure captiveNum is reset for respawning unit
2015-03-26 00:53:02 -05:00
commy2
91b63fbb7d
tweaks
2015-03-26 03:20:17 +01:00
commy2
6a0ca8590f
speed up some debug functions by 99.99%
2015-03-26 02:26:09 +01:00
commy2
cb29f1a6c9
tweak, pushBack vs + Array
2015-03-26 01:58:49 +01:00
commy2
288c79fb46
Merge pull request #251 from KoffeinFlummi/turrettweak
...
tweak turret functions
2015-03-25 23:38:39 +01:00
commy2
b613ab8630
adjust functions to new syntax
2015-03-25 23:03:45 +01:00
commy2
80349658d6
tweak turret functions
2015-03-25 22:50:28 +01:00
Glowbal
eb80831525
fixed script error with medical display patient information after check response
2015-03-25 22:18:52 +01:00
commy2
e007a247d8
detach when entering a vehicle, don't mess up animation insidea vehicle
2015-03-25 21:51:50 +01:00
commy2
01b7d3b213
global setDir on attachTo
2015-03-25 20:45:47 +01:00
commy2
3634eaf568
tweak carry stance req., timeout certain PFH, exit PFH, debug
2015-03-25 20:18:23 +01:00
bux578
02141a2947
add microDAGR to weapons array
2015-03-25 18:23:01 +01:00
bux578
1f3c3ce34b
fixed spelling of engl. autoinjector
...
http://en.wikipedia.org/wiki/Epinephrine_autoinjector
2015-03-25 18:22:45 +01:00
commy2
39500110b5
remove disable command menu option - it does nothing
2015-03-25 15:14:22 +01:00
commy2
9b553c1134
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3
2015-03-25 15:07:42 +01:00
commy2
50c63b8fb9
don't overwrite input in weapon select, fix: weapon select didn't work in FFV
2015-03-25 15:06:47 +01:00
PabstMirror
a88908d795
Release autotrack when trying to drag map
2015-03-25 09:00:49 -05:00
PabstMirror
600c7aed97
Restore Interaction Icon
2015-03-25 08:57:44 -05:00
commy2
569a77d41b
logic
2015-03-25 14:34:19 +01:00
commy2
0c8e8236dd
logic
2015-03-25 14:32:36 +01:00
commy2
e1b5b96a7e
derped the file
2015-03-25 14:09:49 +01:00
commy2
20882ed694
properly remove fake weapon after carrying persons
2015-03-25 14:07:50 +01:00
commy2
ebe9d7ed5f
carrying unconscious persons
2015-03-25 13:32:59 +01:00
commy2
4ae3c22642
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into mediccarry
2015-03-25 11:08:13 +01:00
bux578
c44b944044
add missing icons
2015-03-25 06:32:08 +01:00
bux578
074bf4ba6d
tab to space
2015-03-25 06:06:04 +01:00
bux578
4fecc1372f
add microDAGR to ace misc box
2015-03-25 06:05:06 +01:00
Glowbal
b6133eb73e
removed diag_log calls
2015-03-24 23:10:03 +01:00
Glowbal
3b17cc68e1
medical_onUnconscious is now a globalEvent instead of targetEvent.
...
Feature request by commy.
2015-03-24 22:10:41 +01:00
Glowbal
975ad5a399
Merge branch 'master' into medical-fixes
...
Conflicts:
addons/medical/CfgVehicles.hpp
2015-03-24 22:07:15 +01:00
Glowbal
706e159815
Adjusted color of tourniquet message
2015-03-24 22:01:33 +01:00
Glowbal
2f729f67f1
Slightly increased the distance of medical actions
...
Removed sub menu medical on torso
2015-03-24 21:41:03 +01:00
commy2
655f23b53c
start carrying phase
2015-03-24 21:37:27 +01:00
Glowbal
7420f70020
Fixed #232
2015-03-24 21:26:20 +01:00
Glowbal
95489ed627
fixed missing handleDamage EH #235
2015-03-24 21:25:21 +01:00
Glowbal
53e7fe1ba5
fixed #227
2015-03-24 21:08:45 +01:00
Glowbal
f175467813
fixed #241 and #228
2015-03-24 21:08:13 +01:00
commy2
12062c0e25
deleting obsolete stuff in common
2015-03-24 20:32:13 +01:00
commy2
34df28d938
cleaning up common
2015-03-24 20:28:44 +01:00
commy2
53a61eb001
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into mediccarry
2015-03-24 20:10:11 +01:00
Nicolás Badano
77dc50f10f
Some more fixes for self interaction inside vehicles
2015-03-24 16:06:03 -03:00
Nicolás Badano
4fb50fa71e
Merge branch 'master' of github.com:KoffeinFlummi/ACE3
2015-03-24 15:44:10 -03:00
Nicolás Badano
8b3648cf8d
Configure exceptions for self actions inside vehicles
2015-03-24 15:43:49 -03:00
bux578
7744d5b5fb
fix authors #2
2015-03-24 19:43:06 +01:00
bux578
05896a55ea
fix authors
2015-03-24 19:40:48 +01:00
bux578
60c50e0daf
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into ModuleIcons
2015-03-24 19:12:23 +01:00
commy2
749352f0a8
animations, onUnconscious events
2015-03-24 19:07:39 +01:00
commy2
941d98a88d
disable all self actions inside vehicles on default
2015-03-24 16:45:10 +01:00
Nicolás Badano
a1d6c052ba
Refactored interaction key handling while boarded:
...
- Self-interaction key opens up your own self interaction menu
- Interaction key opens interaction options of the vehicle and passengers
2015-03-24 12:27:27 -03:00
commy2
43846970fa
init drag/carry options on persons
2015-03-24 16:12:46 +01:00
commy2
bdc60c074a
cleaning up in common
2015-03-24 16:01:53 +01:00
PabstMirror
82042f85f4
Wirecutters: fix error on end mission with keydown
2015-03-24 04:03:16 -05:00
PabstMirror
8346de8150
vehLock disable debug rpt spam
2015-03-24 04:01:20 -05:00
PabstMirror
3ab033065f
#233 - Clean up mDAGR interaction menu
...
Adds exception to use on map (also for base ACE_equipment)
selfInteract has 3 options [close, show minimap, show dialog] (only 2
possible shown at any time)
Keybinds are just toggle and close
2015-03-24 03:50:06 -05:00
Nicolás Badano
5e79970740
Switching nicknames
2015-03-24 01:18:00 -03:00
Nicolás Badano
bc0dae63ca
Fix #173
2015-03-24 00:57:03 -03:00
Nicolás Badano
58ea333b42
Fix #236
2015-03-24 00:34:41 -03:00
Nicolás Badano
8767a0d6ac
Fix #206
2015-03-24 00:30:15 -03:00
Nicolás Badano
a823fb2dca
Tweaks on action names to:
...
- Remove >> for submenus
- Split long action names in two lines
2015-03-24 00:16:32 -03:00
Nicolás Badano
17d0c0ae38
Various tweaks on interact_menu styling to improve usability
2015-03-24 00:15:22 -03:00
Nicolás Badano
70ffefde10
Possibly close multiple dialogs when interact_menu is opened
2015-03-23 21:26:40 -03:00
Nicolás Badano
65d3e312d1
Merge branch 'master' of github.com:KoffeinFlummi/ACE3
2015-03-23 20:03:08 -03:00
Nicolás Badano
f64092f09c
Close dialogs when pressing the interaction k
2015-03-23 20:02:30 -03:00
PabstMirror
ed3fc5919f
#231 - Close DAGR if player dead/null
2015-03-23 17:34:40 -05:00
Nicolás Badano
50f5e2c858
Change the interact_menu selector to be a control. Makes it work reliably when surrendered
2015-03-23 19:16:10 -03:00
Nicolás Badano
a432f74a6b
Make self interact_menu finally work on the map screen!!
2015-03-23 18:26:20 -03:00
Nicolás Badano
75a09357aa
Properly configure canInteractWith and exceptions for self interaction
2015-03-23 18:08:58 -03:00
Nicolás Badano
eb557bf777
Make interac_menu work in real 2D:
...
- Children positions are calculated directly on screen space
- Saves a lot of worldToScreen, ATLtoASL, etc calls
- Selector is now a control instead of a 3D icon
2015-03-23 18:08:31 -03:00
PabstMirror
20362e8dc9
Cleanup exception names
2015-03-23 15:22:26 -05:00
PabstMirror
ef3b411c6c
Close dagr when dropping item
2015-03-23 15:02:20 -05:00
Nicolás Badano
ba9fce8636
Merge branch 'master' of github.com:KoffeinFlummi/ACE3
2015-03-23 16:53:56 -03:00
Nicolás Badano
dbbfdd88df
Forgotten line
2015-03-23 16:53:28 -03:00
bux578
ba42ec831b
second batch of icons
2015-03-23 20:02:35 +01:00
PabstMirror
17eddb089b
Missing Semicolon
2015-03-23 13:57:16 -05:00
PabstMirror
2329212060
Medical Action Stringtable
2015-03-23 13:52:26 -05:00
PabstMirror
14d6db4596
Merge pull request #183 from KoffeinFlummi/microDAGR
...
MicroDAGR
2015-03-23 13:24:37 -05:00
bux578
cdb6a1f947
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into ModuleIcons
2015-03-23 18:43:00 +01:00
Nicolás Badano
c8b6f6dc78
Merge branch 'master' of github.com:KoffeinFlummi/ACE3
2015-03-23 14:02:06 -03:00
Nicolás Badano
bf1d808b82
Small optimizations on interact_menu
2015-03-23 14:01:38 -03:00
Nicolás Badano
1e5a194bf6
Optimize ace_common_fnc_toHex
2015-03-23 12:16:50 -03:00
bux578
1114e12186
add first batch of module icons, naming conventions
2015-03-23 13:56:59 +01:00
PabstMirror
d6ad0e15b4
Move wep_dragon to toMerge
...
Always throws error during compile
Has multiple references to Arma2 assets.
2015-03-22 17:34:28 -05:00
Glowbal
15edb0bff2
fixes
2015-03-22 23:24:24 +01:00
Glowbal
d7de92c60d
Merge branch 'master' into Medical_Dragging
...
Conflicts:
addons/medical/XEH_postInit.sqf
addons/medical/XEH_preInit.sqf
2015-03-22 22:41:36 +01:00
Glowbal
9e43ab5c25
Merge branch 'master' into medical-advanced
2015-03-22 22:37:37 +01:00
Glowbal
df43b7fd2d
Merge branch 'master' into medical-jip-fixes
...
Conflicts:
addons/medical/CfgVehicles.hpp
2015-03-22 22:35:32 +01:00
Glowbal
4ff849c2fd
Merge branch 'master' into medical-advanced
2015-03-22 22:34:07 +01:00
Glowbal
c7b505a31c
Merge pull request #218 from KoffeinFlummi/pre-postInit-module-exec
...
Pre-postInit module execution
2015-03-22 22:33:32 +01:00
Glowbal
1bb32dcfcb
fixed missing condition variable
2015-03-22 22:20:44 +01:00
Glowbal
1aa2425c1e
Merge branch 'master' into Medical_Dragging
2015-03-22 21:07:26 +01:00
Glowbal
4995016a66
Switched to canInteractConditions
2015-03-22 20:59:57 +01:00
Glowbal
7bc6fa3c3b
Disable interaction for objects
2015-03-22 20:39:22 +01:00
Glowbal
6eac193825
Replaced deleting of body by hiding it
2015-03-22 20:37:55 +01:00
commy2
84dbeb19d1
fix: timeout could cause being stuck with attached item
2015-03-22 17:35:26 +01:00
Glowbal
2d2687e759
Added self interact items
2015-03-22 17:28:48 +01:00
commy2
11bb1a050a
fix: could drag and carry object at the same time
2015-03-22 17:12:14 +01:00
Glowbal
dd7dad1b90
define base class
2015-03-22 17:05:31 +01:00
Glowbal
f252b2c96f
advanced medical JIP improvements
2015-03-22 17:04:42 +01:00
commy2
c243513227
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3
2015-03-22 16:38:38 +01:00
commy2
e1200f8753
fix: release action didn't show up
2015-03-22 16:38:21 +01:00
commy2
c155305299
Revert "drag carry exception in main action"
...
This reverts commit 72d40c3fda
.
2015-03-22 16:24:27 +01:00
commy2
72d40c3fda
drag carry exception in main action
2015-03-22 15:39:19 +01:00
Glowbal
694ab7d51e
Merge branch 'master' into pre-postInit-module-exec
2015-03-22 15:17:24 +01:00
Glowbal
8b4c0c0e36
fixed postInit depending on setting
2015-03-22 15:16:42 +01:00
commy2
8d8e2ec10b
manual merge
2015-03-22 14:58:29 +01:00
commy2
4607fd8605
localization
2015-03-22 14:42:47 +01:00
commy2
f734aeee95
reload launcher mag progress bar
2015-03-22 14:05:31 +01:00
Glowbal
be9c09b605
Added cfgPatches dependancy on ace_modules
2015-03-22 12:49:04 +01:00
Glowbal
7ceaf7907a
Indentation
2015-03-22 12:45:46 +01:00
Glowbal
281bad1e7e
Use of the ACE module instead of Module_F.
2015-03-22 12:44:26 +01:00
Glowbal
73489a7795
PBOPREFIX
2015-03-22 12:39:49 +01:00
Glowbal
d7e43ce28e
First draft
2015-03-22 12:39:26 +01:00
Glowbal
55e7e768ca
removed systemChat messages
2015-03-22 11:21:17 +01:00
Glowbal
5063e9cff9
fixed config duplicate entry
2015-03-22 11:21:08 +01:00
commy2
ae5fbaef86
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into reloadLaunchers
2015-03-22 10:48:54 +01:00
Glowbal
ac4309237b
Added drag/carry actions
2015-03-22 10:28:41 +01:00
Glowbal
0428a1d558
Added canDrag
2015-03-22 10:28:33 +01:00
Glowbal
7b519fc2e0
Merge branch 'master' into Medical_Dragging
...
Conflicts:
addons/medical/XEH_postInit.sqf
addons/medical/stringtable.xml
2015-03-22 09:46:58 +01:00
Nou
12cadc603f
Fragmentation enabled.
2015-03-21 21:22:16 -07:00
Nicolás Badano
08eb40a606
Merge pull request #209 from KoffeinFlummi/disposableCleanup
...
Disposable cleanup
2015-03-21 20:44:38 -03:00
Nicolás Badano
5dcf29ba80
Merge pull request #212 from KoffeinFlummi/interactivePelvis
...
Move main interactions to pelvis; leave torso for medical
2015-03-21 20:44:18 -03:00
Nicolás Badano
32be87806b
Clear the caches again after performing the action, cause it's very possible something changed as a result.
2015-03-21 20:37:01 -03:00
Nicolás Badano
6a83d0d9fc
clear canTreat caches before calling the last condition
2015-03-21 20:33:25 -03:00
Nicolás Badano
323aa156d1
Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into clearCacheOnEvents
2015-03-21 20:31:01 -03:00
Nicolás Badano
2beb1a289e
Ensure the condition of the action is always checked uncached before calling the statement.
2015-03-21 20:30:27 -03:00
Nicolás Badano
71c79e7785
Merge pull request #214 from KoffeinFlummi/clearCacheOnEvents
...
Added to cachedCall an option to clear the cache on an event
2015-03-21 20:15:10 -03:00
PabstMirror
3a6995fbec
Cleanup medical Item classnames
2015-03-21 18:07:50 -05:00
Felix Wiegand
be4f21ea2e
Merge pull request #215 from KoffeinFlummi/medical-itemcheck
...
Medical itemcheck
2015-03-21 22:41:06 +01:00
Glowbal
a7d8914884
Removed GVAR/QGVAR from items
2015-03-21 22:22:28 +01:00
commy2
1bf13cea34
remove obsolete camera eh from agm
2015-03-21 22:13:36 +01:00
Nicolás Badano
87b1458dc0
Fix debug stuff
2015-03-21 18:09:42 -03:00
Glowbal
b74eb550b0
Added advanced items
2015-03-21 22:08:42 +01:00
KoffeinFlummi
58237751b0
Woopsie
2015-03-21 22:01:20 +01:00
KoffeinFlummi
f6f910fb8a
Replace vanilla items with ours.
2015-03-21 21:59:08 +01:00
commy2
1b8a9290cd
remove obsolete custom eh from agm
2015-03-21 21:56:22 +01:00
commy2
cefd8d5c54
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3
2015-03-21 21:51:48 +01:00
commy2
1d4249a825
macros
2015-03-21 21:51:27 +01:00
Nicolás Badano
213b817947
Added to cachedCall an option to clear the cache on an event
2015-03-21 17:50:35 -03:00
Glowbal
d73f16861b
Merge pull request #213 from KoffeinFlummi/medical-advanced
...
Medical advanced
2015-03-21 21:02:35 +01:00
Nicolás Badano
ce3ed988a2
Removed debug traces
2015-03-21 16:33:59 -03:00
Glowbal
89daf840f6
fixed incorrect macro
2015-03-21 20:08:52 +01:00
Nicolás Badano
4e32e584be
Merge branch 'master' of github.com:KoffeinFlummi/ACE3
2015-03-21 15:33:36 -03:00
Nicolás Badano
f8ea603977
Added dynamic actions to unload patients (unconscious) from vehicles
2015-03-21 15:32:32 -03:00
PabstMirror
9578024693
Dupe stringtable entry
...
`Item STR_ACE_MEDICAL_BANDAGING listed twice`
2015-03-21 12:52:08 -05:00
Nicolás Badano
274dae9a02
Merge branch 'master' of github.com:KoffeinFlummi/ACE3
2015-03-21 14:28:33 -03:00
Nicolás Badano
dbb9765035
Fix isSubPath
2015-03-21 14:28:17 -03:00
PabstMirror
054f21eede
+2more
2015-03-21 12:18:19 -05:00
PabstMirror
8a9ac4147f
Update $PBOPREFIX$
...
Only getting error on server, not client
`Warning Message: Script z\ace\addons\gforces\XEH_preInit.sqf not found`
2015-03-21 12:14:38 -05:00
Glowbal
7d6afdf1a9
Added triage card option
2015-03-21 17:30:49 +01:00
Glowbal
82ec93b84e
Medical icons
2015-03-21 17:05:32 +01:00
Glowbal
7ae45fbeff
Fixed canTreatCached
2015-03-21 16:47:51 +01:00
PabstMirror
0e6f76b50b
Cannot drop attachements because of duplication
2015-03-21 10:35:21 -05:00
Glowbal
d0b14286ff
Wrong function name
2015-03-21 16:34:42 +01:00
Glowbal
1d63e94fff
canTreatCached
2015-03-21 16:33:14 +01:00
Glowbal
8de985d754
Added medical icons
2015-03-21 15:45:35 +01:00
Nicolás Badano
d7363a6dab
Move main interactions to pelvis; leave torso for medical
2015-03-21 11:01:38 -03:00
Glowbal
4bcfd1a0ba
Merge branch 'master' into medical-advanced
...
Conflicts:
addons/medical/functions/fnc_handleUnitVitals.sqf
2015-03-21 14:54:37 +01:00
Felix Wiegand
8fac4b5798
Merge pull request #192 from KoffeinFlummi/medical-basic
...
Basic Medical Tweaks
2015-03-21 14:41:46 +01:00
Glowbal
946ade63e5
Merge branch 'master' into medical-advanced
2015-03-21 14:40:59 +01:00
Glowbal
ff5c8e911d
Added InteractionMenuClosed event for closing the patient information display
2015-03-21 14:40:51 +01:00
Glowbal
77210581f5
Added corners to triage card
2015-03-21 14:40:26 +01:00
KoffeinFlummi
75517f7ce4
Replace setDamage with setDead
2015-03-21 14:40:23 +01:00
Nicolás Badano
f5f91c4802
Merge branch 'master' of github.com:KoffeinFlummi/ACE3
2015-03-21 10:24:01 -03:00
Nicolás Badano
83d9aa4bb6
Replace tap shoulder and check (others) ammo animations by PutDown
2015-03-21 10:23:36 -03:00
Nicolás Badano
9fd45fa707
Merge pull request #202 from KoffeinFlummi/vehLock-cleanup3
...
Vehicle Lock Cleanup
2015-03-21 09:51:47 -03:00
Nicolás Badano
4a8b5079a6
Fix #211
2015-03-21 09:37:01 -03:00
Nicolás Badano
4fe09034ff
Merge branch 'master' into dynamicInteractMenu
2015-03-21 08:55:05 -03:00
Glowbal
7c30127ffb
Disabled unimplemented medical systems
2015-03-21 10:55:40 +01:00
Glowbal
bc082783c9
check if unit is in a vehicle before checking the vehicle
2015-03-21 10:55:27 +01:00
Glowbal
b5c6e52416
fixed #201
2015-03-21 10:54:52 +01:00
Nicolás Badano
e7d7fa8e6c
Merge branch 'master' of github.com:KoffeinFlummi/ACE3
2015-03-21 00:27:41 -03:00
Nicolás Badano
14566c783b
Prevent canInteractWith from throwing errors if third parameter is not supplied
2015-03-21 00:27:19 -03:00
Nicolás Badano
4210b175c3
Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into dynamicInteractMenu
...
Conflicts:
addons/interact_menu/functions/fnc_compileMenu.sqf
addons/interact_menu/functions/fnc_compileMenuSelfAction.sqf
2015-03-21 00:16:52 -03:00
Nicolás Badano
3d6660b115
Debug stuff
2015-03-20 22:44:36 -03:00
Nicolás Badano
b3aa7c8970
Make collectActiveActionTree follow mounts correctly
2015-03-20 22:44:25 -03:00
KoffeinFlummi
a060e4bea5
Apply translations to epipen and morphine actions
2015-03-21 00:31:47 +01:00
KoffeinFlummi
b1ed80a23d
Remove trailing whitespace in medical stringtable
2015-03-21 00:28:19 +01:00
KoffeinFlummi
510538bc53
Remove superfluous todo
2015-03-21 00:26:14 +01:00
KoffeinFlummi
88fb2765e3
Standardize actions across basic and advanced
2015-03-21 00:21:30 +01:00
PabstMirror
7e383dc10e
#198 canInteractWith EGVAR -> EFUNC
2015-03-20 17:55:39 -05:00
KoffeinFlummi
6f8b5cc676
Fix missing dollar sign
2015-03-20 23:53:25 +01:00
KoffeinFlummi
fea63e597e
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into medical-basic
2015-03-20 23:48:42 +01:00
PabstMirror
8840284309
Fix progressBar
2015-03-20 17:46:21 -05:00
KoffeinFlummi
33d4bf2f5a
Add localization for basic treatments and actions
2015-03-20 18:21:03 +01:00
KoffeinFlummi
9082712ff7
Replace Original with English keys in stringtable
2015-03-20 17:54:26 +01:00
KoffeinFlummi
66078a047b
Wut.
2015-03-20 07:52:41 +01:00
Nicolás Badano
66731c9cdd
First rough implementation of the passengers menu, with mounted main actions
2015-03-20 00:53:58 -03:00
Nicolás Badano
b854db0195
Updated interact_menu api calls on ace_dragging
2015-03-19 23:33:11 -03:00
Nicolás Badano
84bf44e026
Refactoring of interact_menu:
...
- Reordering of action members
- Removed full path from actions, so they can be mounted under different paths if needed
- Added api for creating actions
- Api for adding actions for objects or classes
2015-03-19 23:32:44 -03:00
PabstMirror
ad12904ca4
minor formating
2015-03-19 20:37:36 -05:00
PabstMirror
0c88b92eba
Condense AI func, and drop attachements
2015-03-19 20:24:14 -05:00
PabstMirror
6e03bb6144
Merge branch 'master' into disposableCleanup
2015-03-19 19:37:10 -05:00
KoffeinFlummi
07570fccd4
Make isMedic even prettier
2015-03-19 22:34:12 +01:00
KoffeinFlummi
5589b80c70
Rewrite and fix isMedic
2015-03-19 22:27:12 +01:00
KoffeinFlummi
97082e4ce3
Simplify condition checking in canTreat.
2015-03-19 22:01:40 +01:00