Zuhayr 305416d5c5 Merg resolution.

2014-10-02 02:33:06 +09:30

..

dead

Merge resolution, master into dev.

2014-08-21 12:01:38 +09:30

living

Merg resolution.

2014-10-02 02:33:06 +09:30

new_player

Merge resolution, using dev-freeze map due to unreconcilable conflicts.

2014-09-13 16:54:48 +09:30

abilities.dm

…

death.dm

…

emote.dm

…

hear_say.dm

Compromise on speach_sound, will check distance instead of just checking if ghost.

2014-07-23 01:48:48 -05:00

holder.dm

Updated borer icons slightly.

2014-07-30 21:51:17 +09:30

inventory.dm

Allows clicking (simulated) floors to drop pipes

2014-08-20 12:21:42 +02:00

language.dm

Remerged Siik'maas and siik'tajr together as per the tajara maintainer's request.

2014-07-24 17:01:52 -07:00

login.dm

…

logout.dm

…

mob_cleanup.dm

…

mob_defines.dm

Floating effect now uses animate() instead of pixel_y while loop thingy.

2014-09-30 22:37:48 +08:00

mob_grab.dm

…

mob_helpers.dm

Large merge resultion. Used remote for map conflicts.

2014-09-23 21:41:54 +09:30

mob_movement.dm

gravitychange() now makes all affected mobs have the floating animation unless magbooted, etc.

2014-09-30 23:18:04 +08:00

mob_transformation_simple.dm

…

mob.dm

Floating effect now uses animate() instead of pixel_y while loop thingy.

2014-09-30 22:37:48 +08:00

say.dm

Adds typing indicator.

2014-08-29 15:33:25 +04:00

transform_procs.dm

Cleaner version of previous commit.

2014-09-30 09:15:21 +02:00

typing_indicator.dm

Added tracking of inactivity in chatbar.

2014-08-29 21:12:55 +04:00

update_icons.dm

…