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

Conflicts:
	code/game/machinery/computer/computer.dm
	html/changelogs/.all_changelog.yml

2015-10-11 17:37:01 +02:00

..

bombspawner.dm

Updates changelog, fixes comment

2015-10-09 11:39:22 -04:00

gibspawner.dm

…