Ccomp5950 56ef5c165c Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze ...

Conflicts:
	code/modules/reagents/reagent_containers/food/cans.dm

2014-03-28 18:46:04 -05:00

..

_DynamicAreaLighting_TG.dm

…

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

*NIX Log files part 2.

2014-03-26 18:51:37 -05:00

failsafe.dm

Revert "Merge pull request #4478 from Aryn/master"

2014-03-24 13:55:41 +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

Revert "Merge pull request #4478 from Aryn/master"

2014-03-24 13:55:41 +00:00

shuttle_controller.dm

Absolute paths for shuttle controller

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

verbs.dm

Revert "Merge pull request #4478 from Aryn/master"

2014-03-24 13:55:41 +00:00

voting.dm

Gamemode autovote.

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