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

Conflicts:
	code/modules/client/preferences.dm

2014-07-25 17:19:59 -07:00

..

dead

Improves the display of shuttle ETAs

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

living

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

2014-07-25 17:19:59 -07: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

…

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

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

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

holder.dm

Fixed some vox icons.

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

inventory.dm

…

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

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

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

mob_grab.dm

…

mob_helpers.dm

Merging.

2014-07-25 22:50:35 +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

Positronic brains (and every other mob) using binary chat will no longer send their messages twice.

2014-07-22 19:32:52 -05:00

transform_procs.dm

Merge branch 'master' into dev

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

update_icons.dm

…