Cael_Aislinn 56f5cb9e4e Merge tgstation r4633 into bs12_with_tgport ...

Conflicts:
	code/defines/obj/costume.dm
	code/game/gamemodes/cult/runes.dm
	code/game/machinery/computer/communications.dm
	code/game/machinery/telecomms/broadcaster.dm
	code/game/objects/structures/crates_lockers/closets/fitness.dm
	code/modules/mob/living/simple_animal/life.dm
	code/modules/mob/living/simple_animal/parrot.dm
	code/modules/power/power.dm
	code/modules/power/switch.dm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>

2012-09-06 13:13:57 +10:00

..

_DynamicAreaLighting_TG.dm

Replaced the master_controller with the WIP sequential version.

2012-08-31 04:14:26 +00:00

configuration.dm

Merge remote-tracking branch 'remotes/git-svn' into bs12_with_tgport (r4618)

2012-09-04 22:19:03 +10:00

lighting_controller.dm

Replaced the master_controller with the WIP sequential version.

2012-08-31 04:14:26 +00:00

master_controller.dm

Merge tgstation r4633 into bs12_with_tgport

2012-09-06 13:13:57 +10:00

shuttle_controller.dm

…

tensioner.dm

…

verbs.dm

Replaced the master_controller with the WIP sequential version.

2012-08-31 04:14:26 +00:00