skull132 9b094ad0eb Merge branch 'upstream/development' into development ...

# Conflicts:
#	code/_helpers/time.dm
#	code/game/objects/items/devices/floor_painter.dm
#	code/game/objects/items/stacks/medical.dm
#	code/global.dm
#	code/modules/cargo/randomstock.dm
#	code/modules/mob/living/carbon/human/human_defense.dm
#	code/modules/mob/living/simple_animal/simple_animal.dm
#	code/modules/mob/mob_movement.dm
#	code/modules/paperwork/faxmachine.dm

2016-12-18 01:06:45 +02:00

..

access levels.txt

…

admin_ranks.txt

Adds Mentors.

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

admins.txt

…

age_restrictions.txt

Config Age Restrictions (#437)

2016-06-23 02:13:43 +03:00

alienwhitelist.txt

…

config.txt

Merge branch 'upstream/development' into development

2016-12-18 01:06:45 +02:00

custom_items.txt

Cleanup of testing sprites and custom item defines.

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

custom_sprites.txt

…

dbconfig.txt

Remove dbcon_old

2016-01-13 15:56:57 +02:00

discord.txt

BOREALIS 2 Implementation (#938)

2016-09-18 23:28:01 +03:00

game_options.txt

Development Fixes - 06NOV2016 (#1120)

2016-11-06 20:14:38 +02:00

jobs.txt

…

mentors.txt

mentors.txt needed instructions.

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

moderators.txt

…

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

…