Zuhayr 1e135f91af Merge resolution with master.

2014-06-02 12:05:12 +09:30

..

dead

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into phoron

2014-04-16 22:13:48 -07:00

living

Merge resolution with master.

2014-06-02 12:05:12 +09:30

new_player

Merge branch 'dev' into mutiny

2014-05-25 14:22:16 -05:00

abilities.dm

…

death.dm

Fixes #4744

2014-05-10 00:40:20 +09:30

emote.dm

Cleaned up holders a bit, added show_message() proc to them, added loops in custom_emote to show emotes to things in inventories with the right flag.

2014-05-18 10:59:47 +09:30

hear_say.dm

Removed verb assignment from hear_say()

2014-05-17 08:51:13 -04:00

holder.dm

Cleaned up holders a bit, added show_message() proc to them, added loops in custom_emote to show emotes to things in inventories with the right flag.

2014-05-18 10:59:47 +09:30

inventory.dm

…

language.dm

Reverted verb, adjusted color

2014-05-22 16:34:45 -04:00

login.dm

Crash fix attempt: Moving NanoUI resource file sending away from client/New()

2014-04-25 17:47:27 -05:00

logout.dm

…

mob_cleanup.dm

…

mob_defines.dm

Revert "Merge pull request #4985 from jack-fractal/dev"

2014-05-31 00:25:56 +01:00

mob_grab.dm

…

mob_helpers.dm

Revert "Merge pull request #4985 from jack-fractal/dev"

2014-05-31 00:25:56 +01:00

mob_movement.dm

Revert "Merge pull request #4985 from jack-fractal/dev"

2014-05-31 00:25:56 +01:00

mob_transformation_simple.dm

…

mob.dm

Merge resolution with master.

2014-06-02 12:05:12 +09:30

say.dm

Merge resolution with master.

2014-06-02 12:05:12 +09:30

transform_procs.dm

Merge resolution with master.

2014-06-02 12:05:12 +09:30

update_icons.dm

…