Baystation12/Baystation12 — pull request #7335 by PsiOmegaDelta (2014-12-09 08:36:08+00:00)
Title: Dev

Merge remote-tracking branch 'upstream/dev-freeze' into dev.
Mainly attempting to ensure some map consistency.

Conflicts:
code/game/gamemodes/cult/talisman.dm
maps/exodus-1.dmm