mwerezak 549270c73c Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into item-color ...

Conflicts:
	code/game/machinery/washing_machine.dm
	code/modules/mob/living/carbon/human/update_icons.dm

2015-04-26 14:53:01 -04:00

..

HolodeckControl.dm

Merge pull request #8975 from PsiOmegaDelta/Thunderdome

2015-04-26 20:05:58 +03:00

HolodeckObjects.dm

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into item-color

2015-04-26 14:53:01 -04:00

HolodeckPrograms.dm

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

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