MrPerson 3c58091437 Merge branch 'master' of https://github.com/tgstation/-tg-station into qdel ...

Hopefully nothing went wrong but you never know.

Conflicts:
	code/FEA/FEA_fire.dm
	code/controllers/supply_shuttle.dm
	code/game/gamemodes/changeling/changeling_powers.dm
	code/game/machinery/autolathe.dm
	code/game/machinery/drying_rack.dm
	code/modules/hydroponics/hydroponics.dm
	code/modules/projectiles/projectile/magic.dm
	code/modules/reagents/Chemistry-Recipes.dm
	code/modules/reagents/reagent_dispenser.dm

2014-03-02 21:39:27 -08:00

..

_DynamicAreaLighting_TG.dm

First pass at a qdel() garbage collection system for tgstation

2014-02-23 14:55:12 -08:00

configuration.dm

Changed the default number of changeling scaling coefficient from 10 to 7 in the configuration files.

2014-03-01 20:59:03 -03:00

failsafe.dm

Disabled the game using set background by making all instances of it use a define, which can be changed in code/_compile_options.dm

2014-01-10 18:32:28 +00:00

garbage.dm

Tweak that useless loop test. It doesn't tell me anything :(

2014-02-27 09:36:57 -08:00

lighting_controller.dm

Disabled the game using set background by making all instances of it use a define, which can be changed in code/_compile_options.dm

2014-01-10 18:32:28 +00:00

master_controller.dm

Make GC'd objects super invisible to help unreference them more.

2014-02-23 18:07:33 -08:00

shuttle_controller.dm

Fixes a bug that prevents killing AIs before roundstart

2014-01-13 12:35:30 +13:00

supply_shuttle.dm

Merge branch 'master' of https://github.com/tgstation/-tg-station into qdel

2014-03-02 21:39:27 -08:00

verbs.dm

First pass at a qdel() garbage collection system for tgstation

2014-02-23 14:55:12 -08:00

voting.dm

Removed percentages and added a "Did not vote" count for custom votes. (Non-voters get automatically added to status quo option in non-custom votes)

2013-12-08 11:34:12 -07:00