Mloc-Argent 64d2a69a32 Merge remote-tracking branch 'upstream/master' into dev ...

Signed-off-by: Mloc-Argent <colmohici@gmail.com>

Conflicts:
	code/modules/mob/living/carbon/human/human_damage.dm

2014-07-06 17:50:53 +01:00

..

dead

Improves the display of shuttle ETAs

2014-06-30 18:00:28 -04:00

living

Merge remote-tracking branch 'upstream/master' into dev

2014-07-06 17:50:53 +01:00

new_player

Added spawnpoint datum, moved existing latejoin spawn to datum setup.

2014-06-24 13:33:48 +09:30

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

Improves the implementation of non-verbal languages

2014-06-28 12:19:34 -04:00

holder.dm

Fixed some vox icons.

2014-07-01 07:29:30 +09:30

inventory.dm

…

language.dm

Removes taj whisker emote

2014-06-28 19:52:00 -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

Merge remote-tracking branch 'upstream/master' into dev

2014-07-06 17:50:53 +01:00

mob_transformation_simple.dm

…

mob.dm

Merge remote-tracking branch 'upstream/master' into dev

2014-07-06 17:50:53 +01:00

say.dm

Improves the implementation of non-verbal languages

2014-06-28 12:19:34 -04:00

transform_procs.dm

Merge branch 'master' into dev

2014-06-17 16:16:44 +04:00

update_icons.dm

…