Segrain 35621466e1 Merge conflict fix.

2013-09-14 22:49:11 +03: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

Uncomments books. Generifies mentions of tg or baystation.

2013-09-02 18:24:11 +01:00

failsafe.dm

…

lighting_controller.dm

…

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

…

voting.dm

Fix for announcing gamemode ties.

2013-09-13 19:42:54 +03:00