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

..

access levels.txt

Moved every config file into an "example" directory, to help prevent git screwing with local testing environments.

2013-08-16 19:55:23 +01:00

admin_ranks.txt

Adds Mentors.

2014-05-04 23:12:06 -05:00

admins.txt

Moved every config file into an "example" directory, to help prevent git screwing with local testing environments.

2013-08-16 19:55:23 +01:00

alienwhitelist.txt

Moved every config file into an "example" directory, to help prevent git screwing with local testing environments.

2013-08-16 19:55:23 +01:00

config.txt

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

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

custom_items.txt

Cleanup of testing sprites and custom item defines.

2015-05-12 21:36:53 +09:30

custom_sprites.txt

Moved every config file into an "example" directory, to help prevent git screwing with local testing environments.

2013-08-16 19:55:23 +01:00

dbconfig.txt

Moved every config file into an "example" directory, to help prevent git screwing with local testing environments.

2013-08-16 19:55:23 +01:00

forumdbconfig.txt

Moved every config file into an "example" directory, to help prevent git screwing with local testing environments.

2013-08-16 19:55:23 +01:00

game_options.txt

Added in loyalty implant as a configuration...

2014-07-14 16:27:07 -04:00

jobs.txt

Moved every config file into an "example" directory, to help prevent git screwing with local testing environments.

2013-08-16 19:55:23 +01:00

mentors.txt

mentors.txt needed instructions.

2015-07-09 12:13:40 -07:00

moderators.txt

Moved every config file into an "example" directory, to help prevent git screwing with local testing environments.

2013-08-16 19:55:23 +01:00

motd.txt

Update motd.txt

2015-08-27 16:24:43 -04:00

rules.html

Updated old wiki link to a new one.

2015-08-11 17:20:55 +03:00

svndir.txt

Moved every config file into an "example" directory, to help prevent git screwing with local testing environments.

2013-08-16 19:55:23 +01:00