PsiOmega 611a8113a6 Merge remote-tracking branch 'upstream/dev' into TheGreatEvents ...

Conflicts:
	code/modules/events/radiation_storm.dm

2014-11-05 14:37:20 +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

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 remote-tracking branch 'upstream/dev' into TheGreatEvents

2014-11-05 14:37:20 +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

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

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