Hornygranny af3f1aa4d8 Merge remote-tracking branch 'remotes/upstream/master' into emagrefactor ...

Conflicts:
	code/game/machinery/deployable.dm
	code/game/objects/items/weapons/storage/lockbox.dm
	code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm
	code/modules/clothing/glasses/hud.dm
	code/modules/mob/living/silicon/robot/robot.dm

2014-12-09 16:03:45 -08:00

..

_DynamicAreaLighting_TG.dm

Fixes light going through walls

2014-11-21 17:16:54 +03:00

configuration.dm

Fixes the new AI lawcap config option

2014-12-02 18:27:06 -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

added a new proc for atmos machinery, nullifyPipenetwork(). As their name says, it will nullify the references of a pipenet network datum.

2014-09-02 19:22:27 -03:00

lighting_controller.dm

Absolute paths for the files in the Controllers folder

2014-08-16 12:57:38 +02:00

master_controller.dm

Merge branch 'PipenetRevamp' of https://github.com/Aranclanos/-tg-station into Aranclanos-PipenetRevamp

2014-11-13 18:55:53 -06:00

shuttle_controller.dm

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

2014-10-15 18:23:40 +02:00

supply_shuttle.dm

Merge remote-tracking branch 'remotes/upstream/master' into emagrefactor

2014-12-09 16:03:45 -08:00

verbs.dm

Initial pass to convert LF to CRLF

2014-03-24 08:53:40 +00:00

voting.dm

Absolute paths for the files in the Controllers folder

2014-08-16 12:57:38 +02:00