Merge pull request #1885 from yogstation13/upstream-merge-39118

[MIRROR] [Ready] Communal Resource Storage II
This commit is contained in:
Ling
2018-07-28 21:12:44 +02:00
committed by GitHub
26 changed files with 1133 additions and 640 deletions

View File

@@ -338,6 +338,7 @@
#include "code\datums\components\paintable.dm"
#include "code\datums\components\rad_insulation.dm"
#include "code\datums\components\radioactive.dm"
#include "code\datums\components\remote_materials.dm"
#include "code\datums\components\riding.dm"
#include "code\datums\components\rotation.dm"
#include "code\datums\components\signal_redirect.dm"
@@ -1748,6 +1749,7 @@
#include "code\modules\mining\fulton.dm"
#include "code\modules\mining\machine_processing.dm"
#include "code\modules\mining\machine_redemption.dm"
#include "code\modules\mining\machine_silo.dm"
#include "code\modules\mining\machine_stacking.dm"
#include "code\modules\mining\machine_unloading.dm"
#include "code\modules\mining\machine_vending.dm"