PsiOmega f8d86900a5 Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	code/modules/mob/new_player/preferences_setup.dm
	code/setup.dm

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

..

generic.dm

Fixes #10358, #10359 and #10257

2015-08-01 23:17:27 +09:30

language.dm

Observers can now only follow hivespeech as long as the speaker uses its real identity or antagHUD is enabled.

2015-06-12 17:19:29 +02:00

monkey.dm

Finalized monkey species definitions and icons.

2015-03-26 14:45:41 +10:30

outsider.dm

Merged with dev.

2015-03-31 11:17:13 +10:30

station.dm

Merge pull request #9780 from Baystation12/dev-freeze

2015-06-10 11:15:45 +02:00

synthetic.dm

All the span-corrected dm files.

2015-06-14 22:08:14 +02:00