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