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

..

HolodeckControl.dm

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

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

HolodeckObjects.dm

Refactors duplicate parry code

2015-08-28 14:39:28 -04:00

HolodeckPrograms.dm

Makes it possible to define custom ambiance music for holodeck programs.

2015-04-25 10:53:14 +02:00