jack-fractal ce18d47778 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev ...

Conflicts:
	baystation12.int
	code/controllers/verbs.dm

2013-11-23 11:58:50 -05: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

The Ghost AntagHUD Feature.

2013-11-17 17:29:29 +00:00

failsafe.dm

…

lighting_controller.dm

…

master_controller.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

shuttle_controller.dm

Absolute paths for shuttle controller

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

verbs.dm

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

2013-11-23 11:58:50 -05:00

voting.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