PsiOmega ba240cb768 Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	code/game/antagonist/station/rogue_ai.dm
	code/game/machinery/atmoalter/portable_atmospherics.dm
	code/game/machinery/spaceheater.dm
	code/modules/clothing/head/soft_caps.dm
	maps/exodus-5.dmm

2015-08-12 21:18:18 +02:00

..

HolodeckControl.dm

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

2015-08-06 08:12:38 +02:00

HolodeckObjects.dm

Holodeck stool icon fix.

2015-08-12 08:33:57 +02:00

HolodeckPrograms.dm

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

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