PsiOmegaDelta 070ca0adea Merge remote-tracking branch 'upstream/master' into dev-freeze ...

Conflicts:
	code/game/objects/items/weapons/tanks/tanks.dm
	code/modules/holodeck/HolodeckControl.dm
	code/modules/mob/living/carbon/breathe.dm
	code/modules/mob/living/carbon/human/life.dm
	code/setup.dm

2015-10-11 17:17:41 +02:00

..

HolodeckControl.dm

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

2015-10-11 17:17:41 +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