PsiOmegaDelta e37394e8fa Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	code/modules/mob/living/carbon/human/human_helpers.dm
	code/modules/reagents/reagent_containers/food/snacks.dm

2015-10-25 20:28:48 +01:00

..

dead

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

2015-10-14 08:41:38 +02:00

freelook

…

language

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

2015-10-07 08:14:30 +02:00

living

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

2015-10-25 20:28:48 +01:00

new_player

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

2015-10-16 13:02:59 +02:00

animations.dm

Merge pull request #10420 from Kearel/sbike

2015-09-07 13:58:25 +09:30

death.dm

…

emote.dm

…

gender.dm

…

hear_say.dm

…

holder.dm

Added the Resomi.

2015-09-04 08:57:03 +09:30

inventory.dm

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

2015-09-15 20:31:59 +02:00

login.dm

…

logout.dm

…

mob_cleanup.dm

…

mob_defines.dm

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

2015-09-27 13:48:33 +02:00

mob_grab_specials.dm

Mob size tweaks.

2015-09-20 17:12:07 +02:00

mob_grab.dm

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

2015-09-02 14:58:13 +02:00

mob_helpers.dm

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

2015-10-25 20:28:48 +01:00

mob_movement.dm

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

2015-09-15 20:31:59 +02:00

mob_transformation_simple.dm

…

mob.dm

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

2015-09-15 20:31:59 +02:00

say.dm

Languages now use alternative prefix keys.

2015-08-26 13:17:57 +02:00

transform_procs.dm

Cherrypicked xenophage-rewrite mechanics over.

2015-09-21 20:36:45 +09:30

typing_indicator.dm

…

update_icons.dm

…