Mloc-Argent 08393161c0 Merge branch 'master' into BEF-staging ...

Conflicts:
	config/config.txt

Signed-off-by: Mloc-Argent <colmohici@gmail.com>

2013-07-04 13:08:28 +01: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 'master' into BEF-staging

2013-07-04 13:08:28 +01:00

failsafe.dm

…

lighting_controller.dm

…

master_controller.dm

Merge branch 'bleeding-edge-freeze' of github.com:Baystation12/Baystation12 into loops

2013-07-01 19:49:29 +04:00

shuttle_controller.dm

Merge branch 'master' into BEF-staging

2013-07-04 13:08:28 +01:00

verbs.dm

…

voting.dm

Changed the vote sound as discussed by admins, and made it so that -all- votes (Not just crew transfer) automatically disable OOC.

2013-06-21 14:40:36 +01:00