Neerti 95240c989b Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 8/3/2015_bay_sync ...

Conflicts:
	polaris.dme

2015-08-03 22:13:18 -04:00

..

dead

Compilation/definition fixes.

2015-07-31 10:05:42 +02:00

freelook

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 8/3/2015_bay_sync

2015-08-03 22:13:18 -04:00

language

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

2015-08-01 19:45:42 +02:00

living

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 8/3/2015_bay_sync

2015-08-03 22:13:18 -04:00

new_player

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

2015-08-01 19:45:42 +02:00

animations.dm

…

death.dm

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

2015-07-27 10:20:20 +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-27 10:20:20 +02:00

mob_grab.dm

…

mob_helpers.dm

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

2015-07-30 10:49:37 +02:00

mob_movement.dm

mob/living/Life() now has basic gravity handling (no overrides).

2015-06-17 15:32:23 +02:00

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

Fixes #9326

2015-07-26 14:57:49 -04:00