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

..

generic.dm

Fixes #10358, #10359 and #10257

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

language.dm

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

2015-08-15 10:52:17 +02:00

monkey.dm

…

outsider.dm

Merged with dev.

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

station.dm

Reworks character creation language selection

2015-07-06 10:07:35 +01:00

synthetic.dm

Updates files as necessary to adhere to the new standard.

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