Erthilo 3b61ba850f Merge branch 'master' of git://github.com/Baystation12/Baystation12 into dev ...

Conflicts:
	baystation12.dme
	code/modules/projectiles/ammunition/bullets.dm

2013-09-02 23:32:33 +01: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

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

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

Genericify this shit.

2013-09-01 21:17:09 +01:00

custom_items.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

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

Example of softcrit config

2013-08-29 09:52:42 +01: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

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

Genericify this shit.

2013-09-01 21:17:09 +01:00

rules.html

Genericify this shit.

2013-09-01 21:17:09 +01: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