skull132 7dc02be204 Merge branch 'master' into development ...

# Conflicts:
#	code/controllers/subsystems/initialization/misc_early.dm
#	config/example/config.txt
#	maps/aurora/aurora-1_centcomm.dmm
#	maps/aurora/aurora-4_mainlevel.dmm

2017-11-11 20:57:28 +02:00

..

antagonist

Runtime Map Loading (#3597)

2017-10-18 23:07:34 +03:00

civilian

Unbreaking computers (#3779)

2017-11-03 11:45:21 +02:00

command

Merge branch 'master' into development

2017-11-11 20:57:28 +02:00

engineering

Unbreaking computers (#3779)

2017-11-03 11:45:21 +02:00

games

Merge SSnanoui & Nanomanager (#2427)

2017-05-23 16:33:00 +03:00

generic

Merge SSnanoui & Nanomanager (#2427)

2017-05-23 16:33:00 +03:00

medical

Unbreaking computers (#3779)

2017-11-03 11:45:21 +02:00

research

Unbreaking computers (#3779)

2017-11-03 11:45:21 +02:00

security

Merge branch 'master' into development

2017-11-11 20:57:28 +02:00

system

Unbreaking computers (#3779)

2017-11-03 11:45:21 +02:00

_program.dm

Computer manager and more (#1406)

2017-01-20 21:45:53 +02:00

app_presets.dm

Unbreaking computers (#3779)

2017-11-03 11:45:21 +02:00