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

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

autotransfer.dm

Fix for reported issue with the transfer_controller causing a runtime error. Also included is a debug controller for the transfer_controller

2013-11-21 17:44:31 -08:00

configuration.dm

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

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

failsafe.dm

Changed some global_list stuff:

2012-10-24 20:11:39 +00:00

hooks-defs.dm

Fix for the roundstart hook "runtime".

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

hooks.dm

Hmm hmm, it could help to actually commit the hooks.dm file, couldn't it?

2013-11-25 21:19:58 +00:00

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

Absolute paths for shuttle controller

2013-08-04 00:19:37 -04:00

verbs.dm

Revert "Merge pull request #3965 from jack-fractal/dev"

2013-11-25 11:59:57 +00:00

voting.dm

Gamemode autovote.

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