skull132 16d33365c2 Merge branch 'master' into development ...

# Conflicts:
#	code/modules/client/preference_setup/loadout/loadout_xeno.dm
#	code/modules/customitems/item_defines.dm

2017-09-09 21:38:02 +03:00

..

airflow.dm

…

calamity.dm

Removes some in worlds (#3227)

2017-08-06 19:50:53 +03:00

disease.dm

…

disposals.dm

…

fast_process.dm

…

modifiers.dm

…

nanoui.dm

SOFTREF macro (#2574)

2017-06-02 20:22:38 +03:00

pipenet.dm

Remove a whole bunch of in world loops and rework machinery global lists (#3053)

2017-07-16 20:32:33 +03:00

processing.dm

…

shuttle.dm

Adds the merchant station, the shuttle and the station's dock (#3254)

2017-08-13 23:31:50 +03:00