PsiOmegaDelta 5032350a0c Merge remote-tracking branch 'upstream/master' into dev-freeze ...

Conflicts:
	code/modules/mob/living/carbon/metroid/metroid.dm

2016-01-20 08:04:42 +01:00

..

dead

Merge pull request #11438 from Baystation12/master

2015-11-10 10:34:40 +01:00

freelook

…

language

Merge pull request #11376 from NullSnapshot/dev-freeze

2015-12-04 11:28:25 +03:00

living

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

2016-01-20 08:04:42 +01:00

new_player

Fixes #9197

2015-12-12 14:23:00 +03:00

animations.dm

…

death.dm

…

emote.dm

Fixes #11667

2015-12-12 13:57:26 +03:00

hear_say.dm

…

holder.dm

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

2015-08-31 16:17:24 +09:30

inventory.dm

put_in_hands() refactor.

2015-12-04 17:38:58 +10:30

login.dm

…

logout.dm

…

mob_cleanup.dm

…

mob_defines.dm

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

2015-09-27 13:36:56 +02:00

mob_grab_specials.dm

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

2015-12-08 08:09:37 +01:00

mob_grab.dm

…

mob_helpers.dm

When a diona splits, the main nymph inherits all known languages.

2015-11-04 17:50:51 +01:00

mob_movement.dm

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

2015-12-08 08:09:37 +01:00

mob_transformation_simple.dm

…

mob.dm

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

2015-12-20 11:22:08 +01:00

say.dm

…

transform_procs.dm

…

typing_indicator.dm

…

update_icons.dm

…