PsiOmegaDelta 5fbe0819b7 Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs ...

Conflicts:
	code/game/machinery/Sleeper.dm

2015-08-17 13:05:58 +02:00

..

dead

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

2015-08-15 11:06:03 +02:00

freelook

Misc.

2015-08-11 17:33:03 +02:00

language

Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs

2015-08-17 13:05:58 +02:00

living

Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs

2015-08-17 13:05:58 +02:00

new_player

Merge pull request #10030 from GinjaNinja32/languages

2015-08-13 07:23:44 +03:00

animations.dm

Refactors floating and magboot checks. Fixes #10256

2015-08-03 23:19:04 +10:00

death.dm

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

2015-07-27 10:20:20 +02:00

emote.dm

…

gender.dm

…

hear_say.dm

…

holder.dm

Minor holder refactor.

2015-08-13 17:31:42 +09:30

inventory.dm

…

login.dm

Updates files as necessary to adhere to the new standard.

2015-07-27 09:32:51 +02:00

logout.dm

…

mob_cleanup.dm

…

mob_defines.dm

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

2015-08-15 10:52:17 +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

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

2015-08-06 08:12:38 +02:00

mob_transformation_simple.dm

…

mob.dm

Merge corrections.

2015-08-13 10:17:03 +02:00

say.dm

…

transform_procs.dm

…

typing_indicator.dm

…

update_icons.dm

Fixes #9326

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