Chris 8a3e9b2428 Merge remote-tracking branch 'origin/Bleeding-Edge' into bay_hydro_port ...

Conflicts:
	code/modules/projectiles/guns/energy/special.dm
	maps/tgstation.dmm

2014-10-31 12:02:10 -05:00

..

_DynamicAreaLighting_TG.dm

SUPERMATTER CASCADE

2014-08-10 03:01:32 -07:00

configuration.dm

Framework for nerfing emags flexibly.

2014-10-28 16:54:48 -07:00

failsafe.dm

Revert gc from its controller to main controller.

2014-07-03 10:25:54 -08:00

garbage.dm

Add Destroy for /datum/reagent.

2014-07-16 04:39:31 -08:00

hooks-defs.dm

This is a cursory glace through the files and dealing with some conflicts.

2014-09-27 18:05:34 -04:00

hooks.dm

Add planning frame and some shit from bay

2014-01-18 14:38:27 -08:00

lighting_controller.dm

Seperate GC from the main controller this prevents to run it extensively.

2014-06-18 11:53:14 -08:00

master_controller.dm

shitty workaround

2014-10-14 12:47:37 -05:00

shuttle_controller.dm

Merge pull request #1711 from DeityLink/some-more-cult-stuff

2014-10-26 10:51:34 -05:00

verbs.dm

Revert gc from its controller to main controller.

2014-07-03 10:25:54 -08:00

voting.dm

Add OnReboot hook, turn off media with it.

2014-08-18 16:31:41 -07:00