tkdrg 09c91e8f1e Merge remote-tracking branch 'upstream/master' into IllustriousImpeccableArcticwolf ...

Conflicts:
	code/controllers/subsystem/ticker.dm

2015-01-06 04:35:46 -03:00

..

names

Merged modified name files submitted by Fateweaver. See the following issues / patch submissions for details:

2011-11-27 07:09:44 +00:00

access levels.txt

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2 316c924e-a436-60f5-8080-3fe189b3f50e

2010-08-23 14:29:20 +00:00

admin_nicknames.txt

Updates admin nicknames, moves list to txt file

2014-08-16 19:14:17 +10:00

admin_ranks.txt

Fixes #1147 - type-mismatch

2013-08-14 18:10:26 +01:00

admins.txt

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

2015-01-03 07:07:03 -06:00

config.txt

Adds cfg option to let players see their own notes

2014-12-19 22:42:18 -03:00

dbconfig.txt

Defaults to no prefix now.

2014-09-19 21:54:48 -07:00

external_rsc_urls.txt

Remote resources support.

2013-06-25 07:44:57 +01:00

game_options.txt

adds RAGIN' MAGES to the default config

2014-12-31 22:01:59 -08:00

jobs.txt

Hurf durf using characters that can appear in job names as separators.

2011-10-09 08:42:40 +00:00

motd.txt

Change the default MOTD to say Git instead of SVN

2014-04-24 16:11:39 -07:00

silicon_laws.txt

Included silicon_laws.txt

2013-12-19 17:49:10 +01:00

tips.txt

Adds more tips to tips.txt

2015-01-03 18:45:53 -03:00