mwerezak 25bcdfa39e Merge remote-tracking branch 'upstream/dev' into emergency-shuttle ...

Conflicts:
	code/setup.dm

2014-06-24 00:09:17 -04:00

..

_DynamicAreaLighting_TG.dm

Fix for a runtime.

2014-06-22 22:17:56 +04:00

autotransfer.dm

…

configuration.dm

Fixes config.continous_rounds and adds check

2014-06-01 15:49:13 -04:00

emergency_shuttle_controller.dm

Adds direction arg for area/move_contents_to()

2014-06-23 23:51:47 -04:00

failsafe.dm

…

hooks-defs.dm

Mutiny Mode

2014-05-11 15:03:50 -05:00

hooks.dm

Mutiny Mode

2014-05-11 15:03:50 -05:00

lighting_controller.dm

…

master_controller.dm

Adds shuttle controller

2014-06-23 22:00:57 -04:00

shuttle_controller.dm

Adds direction arg for area/move_contents_to()

2014-06-23 23:51:47 -04:00

verbs.dm

Adds shuttle controller

2014-06-23 22:00:57 -04:00

voting.dm

voting: failed gamemode votes will undelay too

2014-04-07 19:42:06 +01:00