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

..

programs

Merge branch 'master' into development

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

computer_file.dm

Newmap - SMC, Openturf, Arrivals Controller, and Mine Turf Improvements (#1958)

2017-05-02 14:40:40 -04:00

data.dm

Computer tweaks (#1285)

2016-12-25 14:19:50 +02:00

news_article.dm

Computer tweaks (#1285)

2016-12-25 14:19:50 +02:00

program_events.dm

Computer tweaks (#1285)

2016-12-25 14:19:50 +02:00

program.dm

Simpler lighting process, bug fixes, & modular computer tweaks (#1809)

2017-02-24 20:24:31 +02:00