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

..

diseases

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

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

expansions

Remove the datum pool (#2873)

2017-06-30 13:10:14 +03:00

helper_datums

Runtime Map Loading (#3597)

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

observation

Revert #3241 (#3670)

2017-10-17 20:39:50 -05:00

radio

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

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

repositories

Converts reagent containers to Initialize, fixes hand-chew cool down and moves suit sensor Z-level list (#3367)

2017-09-02 21:35:58 +03:00

trading

Merge branch 'master' into development

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

uplink

Runtime Map Loading (#3597)

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

wires

Minor Performance Tweaks (#3265)

2017-08-11 22:57:57 +03:00

ai_law_sets.dm

Runtime Map Loading (#3597)

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

ai_laws.dm

Fixes #10488.

2015-08-11 19:36:02 +02:00

api.dm

Runtime Map Loading (#3597)

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

beam.dm

Beam tweaks (#2852)

2017-06-28 14:35:51 +03:00

browser.dm

Merge voting controller into SSvote (#2183)

2017-05-13 12:37:43 +03:00

callback-usage.txt

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

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

callback.dm

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

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

cargo.dm

Cargo Overhaul (#3221)

2017-09-14 21:32:06 +03:00

category.dm

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

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

computerfiles.dm

…

datacore.dm

Baystation12 merchant port (#3155)

2017-08-04 21:36:04 +03:00

discord_bot.dm

Admin & Staff adjustments (#2529)

2017-06-13 01:37:44 +03:00

disease.dm

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

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

feedback.dm

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

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

mind.dm

Fixes #2939 (#2944)

2017-07-04 23:51:09 +03:00

mixed.dm

Fixes #2369 (#2372)

2017-05-21 17:20:22 +03:00

modules.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

progressbar.dm

Better action progress bars (#3175)

2017-07-31 20:23:47 +03:00

server_greeting.dm

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

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

statistic.dm

More stats (#3562)

2017-10-06 19:39:15 +02:00

supplypacks.dm

Fixes some things (#3197)

2017-07-31 21:56:48 +03:00

weakref.dm

Since < 511 is no longer supported, I nuked all of the refs to it. (#3037)

2017-07-15 17:03:24 +03:00