Kelenius c9824f62df Conflict fix

2015-02-03 23:29:08 +03:00

..

hud

Fixes #7596

2015-01-02 19:55:50 +10:30

adjacent.dm

…

ai.dm

…

click.dm

Removed now-redundant buckle check.

2014-12-13 23:11:59 +10:30

cyborg.dm

…

drag_drop.dm

…

item_attack.dm

Fixes runtime error: pick() from empty list

2015-01-13 13:37:07 -08:00

observer.dm

…

oldcode.dm

refactor 'dir = ' into 'set_dir()'

2014-12-01 13:44:02 +00:00

other_mobs.dm

Update for the slimes

2015-01-09 02:44:02 +03:00

telekinesis.dm

refactor 'dir = ' into 'set_dir()'

2014-12-01 13:44:02 +00:00