DJSnapshot de282a4e2a Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze ...

Conflicts:
	code/modules/client/preferences.dm

2014-07-25 17:19:59 -07:00

..

_DynamicAreaLighting_TG.dm

lighting: fix + optimize colored lights

2014-06-30 23:23:46 +01:00

autotransfer.dm

…

configuration.dm

…

emergency_shuttle_controller.dm

Fixes status displays blanking out when escape shuttle is about to launch

2014-07-01 21:54:50 -04:00

failsafe.dm

…

hooks-defs.dm

…

hooks.dm

…

lighting_controller.dm

…

master_controller.dm

Merging robot_modules.dm and master controller setup.

2014-07-14 09:10:02 +09:30

shuttle_controller.dm

Allows escape pods to be armed from inside the pod

2014-07-01 21:55:37 -04:00

verbs.dm

Mining rework. Added ore scanner, adjusted values for spawn, added debug verbs.

2014-07-09 19:12:32 +09:30

voting.dm

Tweaks to previous commit.

2014-07-25 23:41:41 +09:30