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

Conflicts:
	code/game/antagonist/outsider/ert.dm

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

..

generic.dm

Cleans up living/say broadcast and verb logic

2015-09-09 03:04:18 -04:00

language.dm

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

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

monkey.dm

Readded monkey scooping.

2015-08-31 07:01:56 +09:30

outsider.dm

Tries to relocate Cult/Occult languages to unused keys.

2015-08-24 17:35:56 +02:00

station.dm

Resomi language tweaks, fixes every species' names being generated in Galcom

2015-09-06 22:10:39 +01:00

synthetic.dm

Updates files as necessary to adhere to the new standard.

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