diff --git a/code/controllers/subsystem/processing/conveyors.dm b/code/controllers/subsystem/processing/conveyors.dm new file mode 100644 index 00000000000..51df126071a --- /dev/null +++ b/code/controllers/subsystem/processing/conveyors.dm @@ -0,0 +1,3 @@ +PROCESSING_SUBSYSTEM_DEF(conveyors) + name = "Conveyor Belts" + wait = 0.2 SECONDS diff --git a/code/modules/recycling/conveyor2.dm b/code/modules/recycling/conveyor.dm similarity index 98% rename from code/modules/recycling/conveyor2.dm rename to code/modules/recycling/conveyor.dm index 424eb8eed6a..b7052a97571 100644 --- a/code/modules/recycling/conveyor2.dm +++ b/code/modules/recycling/conveyor.dm @@ -1,5 +1,3 @@ -//conveyor2 is pretty much like the original, except it supports corners, but not diverters. -//note that corner pieces transfer stuff clockwise when running forward, and anti-clockwise backwards. #define MAX_CONVEYOR_ITEMS_MOVE 30 GLOBAL_LIST_EMPTY(conveyors_by_id) @@ -11,7 +9,7 @@ GLOBAL_LIST_EMPTY(conveyors_by_id) desc = "A conveyor belt." layer = BELOW_OPEN_DOOR_LAYER processing_flags = START_PROCESSING_MANUALLY - subsystem_type = /datum/controller/subsystem/processing/fastprocess + subsystem_type = /datum/controller/subsystem/processing/conveyors var/operating = 0 // 1 if running forward, -1 if backwards, 0 if off var/operable = 1 // true if can operate (no broken segments in this belt run) var/forwards // this is the default (forward) direction, set by the map dir diff --git a/tgstation.dme b/tgstation.dme index f52c4484013..d4cec7d1b60 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -422,6 +422,7 @@ #include "code\controllers\subsystem\processing\antag_hud.dm" #include "code\controllers\subsystem\processing\aura_healing.dm" #include "code\controllers\subsystem\processing\clock_component.dm" +#include "code\controllers\subsystem\processing\conveyors.dm" #include "code\controllers\subsystem\processing\fastprocess.dm" #include "code\controllers\subsystem\processing\fields.dm" #include "code\controllers\subsystem\processing\fluids.dm" @@ -3497,7 +3498,7 @@ #include "code\modules\reagents\reagent_containers\syringes.dm" #include "code\modules\reagents\withdrawal\_addiction.dm" #include "code\modules\reagents\withdrawal\generic_addictions.dm" -#include "code\modules\recycling\conveyor2.dm" +#include "code\modules\recycling\conveyor.dm" #include "code\modules\recycling\sortingmachinery.dm" #include "code\modules\recycling\disposal\bin.dm" #include "code\modules\recycling\disposal\construction.dm"