From 2bc475ec41f4731e632e98e2ac7a1f9f1d933b47 Mon Sep 17 00:00:00 2001 From: UristMcKerman Date: Mon, 26 May 2014 12:34:46 +0400 Subject: [PATCH] Created new turbine Created turbine which inputs from pipes and motor. Also slightly fixed currently existing turbine (still unbuildable though). --- baystation12.dme | 1 + code/modules/power/turbine.dm | 6 ++++++ icons/obj/pipeturbine.dmi | Bin 0 -> 5660 bytes 3 files changed, 7 insertions(+) create mode 100644 icons/obj/pipeturbine.dmi diff --git a/baystation12.dme b/baystation12.dme index 187127d978..7f99970aa3 100644 --- a/baystation12.dme +++ b/baystation12.dme @@ -61,6 +61,7 @@ #include "code\ATMOSPHERICS\components\binary_devices\circulator.dm" #include "code\ATMOSPHERICS\components\binary_devices\dp_vent_pump.dm" #include "code\ATMOSPHERICS\components\binary_devices\passive_gate.dm" +#include "code\ATMOSPHERICS\components\binary_devices\pipeturbine.dm" #include "code\ATMOSPHERICS\components\binary_devices\pump.dm" #include "code\ATMOSPHERICS\components\binary_devices\volume_pump.dm" #include "code\ATMOSPHERICS\components\trinary_devices\filter.dm" diff --git a/code/modules/power/turbine.dm b/code/modules/power/turbine.dm index 82e05e954b..d6dd157e81 100644 --- a/code/modules/power/turbine.dm +++ b/code/modules/power/turbine.dm @@ -50,6 +50,9 @@ turbine = locate() in get_step(src, get_dir(inturf, src)) if(!turbine) stat |= BROKEN + else + turbine.stat &= !BROKEN + turbine.compressor = src #define COMPFRICTION 5e5 @@ -104,6 +107,9 @@ compressor = locate() in get_step(src, get_dir(outturf, src)) if(!compressor) stat |= BROKEN + else + compressor.stat &= !BROKEN + compressor.turbine = src #define TURBPRES 9000000 diff --git a/icons/obj/pipeturbine.dmi b/icons/obj/pipeturbine.dmi new file mode 100644 index 0000000000000000000000000000000000000000..fccec4c9ddfdae476e0020b7d316ba6bc62bf492 GIT binary patch literal 5660 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 IwqxY~0FC|G*8l(j literal 0 HcmV?d00001