Mloc-Hibernia 51d2451c01 Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

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

Conflicts:
	nano/templates/geoscanner.tmpl

2014-07-18 13:15:30 +00:00

..

dead

Improves the display of shuttle ETAs

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

living

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

2014-07-18 13:15:30 +00:00

new_player

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

2014-07-17 20:57:06 +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

Made Vox-Pidgin and Rootspeak untranslatable even by pAIs.

2014-07-15 15:57:28 +09:30

login.dm

…

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

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

2014-07-16 19:30:41 +09:30

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

Merging robot_modules.dm and master controller setup.

2014-07-14 09:10:02 +09:30

say.dm

Made Vox-Pidgin and Rootspeak untranslatable even by pAIs.

2014-07-15 15:57:28 +09:30

transform_procs.dm

Slime update

2014-07-13 17:37:30 +04:00

update_icons.dm

…