Neerti 94a2ec5bf1 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 7/26/2015_bay_merge_2 ...

Conflicts:
	.travis.yml
	polaris.dme

2015-07-26 16:01:27 -04:00

..

dead

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

2015-07-14 08:21:12 +02:00

freelook

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 7/16/2015_bay_merge_2

2015-07-16 22:46:53 -04:00

language

…

living

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 7/26/2015_bay_merge_2

2015-07-26 16:01:27 -04:00

new_player

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

2015-07-09 08:45:49 +02:00

animations.dm

…

death.dm

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

2015-07-14 08:21:12 +02:00

emote.dm

…

hear_say.dm

…

holder.dm

…

inventory.dm

Fixes issues with raider equipping

2015-07-04 16:32:35 -04:00

login.dm

…

logout.dm

…

mob_cleanup.dm

…

mob_defines.dm

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

2015-07-14 08:21:12 +02:00

mob_grab.dm

…

mob_helpers.dm

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

2015-07-17 23:19:34 +02:00

mob_movement.dm

…

mob_transformation_simple.dm

…

mob.dm

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

2015-07-20 08:28:32 +02:00

say.dm

…

transform_procs.dm

…

typing_indicator.dm

…

update_icons.dm

Makes suits usable with the icon state system.

2015-06-30 12:15:06 +09:30