DJSnapshot 64ff444fa7 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into antag ...

Conflicts:
	icons/mob/uniform.dmi

2014-02-04 23:55:27 -08:00

..

_DynamicAreaLighting_TG.dm

…

autotransfer.dm

…

configuration.dm

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into antag

2014-02-04 23:55:27 -08:00

failsafe.dm

…

hooks-defs.dm

Fix for the roundstart hook "runtime".

2014-01-01 19:10:55 +00:00

hooks.dm

…

lighting_controller.dm

…

master_controller.dm

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

2014-01-09 17:42:30 +00:00

shuttle_controller.dm

…

verbs.dm

…

voting.dm

Gamemode autovote.

2014-02-03 04:43:38 +03:00