Mloc-Argent 65f218ee63 Merge branch 'master' into dev-freeze ...

Conflicts:
	code/ZAS/Fire.dm
	html/changelog.html
	maps/tgstation2.dmm

Signed-off-by: Mloc-Argent <colmohici@gmail.com>

2013-10-08 22:01:16 +01: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

configuration.dm

Merge branch 'master' into dev-freeze

2013-10-08 22:01:16 +01:00

failsafe.dm

Changed some global_list stuff:

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

lighting_controller.dm

Replaced the master_controller with the WIP sequential version.

2012-08-31 04:14:26 +00:00

master_controller.dm

Merge resolution, using dev-freeze map.

2013-09-09 21:59:47 -07:00

shuttle_controller.dm

Absolute paths for shuttle controller

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

verbs.dm

Added a switch inside client/Topic which can direct the topic call to a few frequently used destinations.

2012-11-18 08:27:11 +00:00

voting.dm

Bugfix for gamemode vote delay

2013-09-29 11:57:28 -07:00