Tigercat2000 625dbb5295 Merge remote-tracking branch 'upstream/master' into LightShit ...

Conflicts:
	code/modules/hydroponics/trays/tray.dm
	code/modules/hydroponics/vines.dm

2015-05-10 13:56:28 -07:00

..

Processes

Lighting overhaul.

2015-05-10 12:03:27 -07:00

ProcessScheduler

Goon process scheduler

2015-02-22 15:24:46 -05:00

communications.dm

Revert "Revert "Emergency communications hotfix""

2015-02-20 17:59:07 +01:00

configuration.dm

Ports VG's DeityLink's new explosion method

2015-05-09 01:56:25 -04:00

emergency_shuttle_controller.dm

Escape Pod Fixes

2015-03-16 02:18:35 -04:00

failsafe.dm

Lighting overhaul.

2015-05-10 12:03:27 -07:00

garbage.dm

Remove qdel from ghost images, clarify qdel debug, nanoUI runtime fix

2015-03-04 15:09:12 +01:00

hooks-defs.dm

Final Nations patch before live testing. This is going to be painful.

2014-05-27 20:09:10 -04:00

hooks.dm

Mutiny Mode

2014-05-15 01:01:54 -04:00

master_controller.dm

Botany / Xenobotany Update

2015-05-09 06:00:24 -04:00

shuttle_controller.dm

Escape Pod Fixes

2015-03-16 02:18:35 -04:00

verbs.dm

Lighting overhaul.

2015-05-10 12:03:27 -07:00

voting.dm

GC fixes

2015-02-25 10:58:56 -05:00