Cael_Aislinn 06809c3651 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze ...

Conflicts:
	code/controllers/master_controller.dm
	code/modules/mob/new_player/sprite_accessories.dm
	code/modules/reagents/Chemistry-Reagents.dm
	code/setup.dm
	icons/mob/human_face.dmi

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

2013-02-01 23:45:13 +10:00

..

_DynamicAreaLighting_TG.dm

copmile fixes, rework a few things to better fit tg code structure, replace tgstation.2.0.9.1.dmm with tgstation.2.1.0.dmm (kept old map file), tgstation.2.0.9.1.dmm has 1233 errors

2013-01-14 21:07:16 +10:00

configuration.dm

Merge branch 'incremental_tg' r5600 into bs12_with_tgport

2013-01-23 00:23:37 +10:00

failsafe.dm

Changed some global_list stuff:

2012-10-24 20:11:39 +00: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 branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze

2013-02-01 23:45:13 +10:00

shuttle_controller.dm

Merge branch 'incremental_tg' r5514 (11/1/2013) into bs12_with_tgport

2013-01-11 22:12:31 +10:00

verbs.dm

Added a switch inside client/Topic which can direct the topic call to a few frequently used destinations.

2012-11-18 08:27:11 +00:00

voting.dm

Merge branch 'incremental_tg' r5514 (11/1/2013) into bs12_with_tgport

2013-01-11 22:12:31 +10:00