Neerti a9dda6cf3f Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 9/6/2015_baymerge ...

Conflicts:
	.travis.yml
	code/game/gamemodes/cult/cult.dm
	code/game/gamemodes/heist/heist.dm
	code/game/gamemodes/ninja/ninja.dm
	code/game/gamemodes/nuclear/nuclear.dm
	code/game/gamemodes/traitor/traitor.dm
	code/game/gamemodes/wizard/wizard.dm
	code/game/jobs/job/civilian.dm
	code/game/jobs/job/medical.dm
	code/game/jobs/job/security.dm
	code/game/objects/structures/lattice.dm
	code/global.dm
	code/modules/projectiles/ammunition/boxes.dm
	code/modules/reagents/Chemistry-Recipes.dm
	config/example/config.txt
	polaris.dme

2015-09-06 18:26:06 -04:00

..

debug.dm

Changes tables to rotate correctly with client.dir

2015-08-02 15:03:42 +01:00

flipping.dm

Fixes, improvements, suggestions.

2015-05-15 00:06:47 +01:00

interactions.dm

Begins work on new ling.

2015-08-20 11:38:48 -04:00

presets.dm

More material renames

2015-08-07 17:10:35 -04:00

rack.dm

…

tables.dm

improve defines in table code

2015-08-28 00:12:18 +01:00

update_triggers.dm

…