Neerti 45f15930a0 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 11/6/2015_neerti_breaks_everything_bay_merge ...

Conflicts:
	.travis.yml
	code/_helpers/lists.dm
	code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
	code/global.dm
	code/modules/client/preferences.dm
	code/modules/client/preferences_savefile.dm
	code/modules/reagents/dispenser/dispenser2.dm
	polaris.dme

2015-11-06 17:41:18 -05:00

..

dead

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

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

freelook

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 9/6/2015_baymerge

2015-09-06 18:26:06 -04:00

language

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

2015-11-06 17:50:34 +01:00

living

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 11/6/2015_neerti_breaks_everything_bay_merge

2015-11-06 17:41:18 -05:00

new_player

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 11/6/2015_neerti_breaks_everything_bay_merge

2015-11-06 17:41:18 -05: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

Revert "Comments out clothing coverage."

2015-10-31 04:15:36 -04:00

login.dm

…

logout.dm

…

mob_cleanup.dm

…

mob_defines.dm

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into sync_to_bay_10/10/2015

2015-10-10 23:17:26 -04: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

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/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

…

transform_procs.dm

Cherrypicked xenophage-rewrite mechanics over.

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

typing_indicator.dm

…

update_icons.dm

…