diff --git a/code/__DEFINES/pipe_construction.dm b/code/__DEFINES/pipe_construction.dm index 403c9a061f..f5b513312d 100644 --- a/code/__DEFINES/pipe_construction.dm +++ b/code/__DEFINES/pipe_construction.dm @@ -13,7 +13,6 @@ Construction breaks otherwise #define PIPE_HE_4WAYMANIFOLD /obj/machinery/atmospherics/pipe/heat_exchanging/manifold4w #define PIPE_JUNCTION /obj/machinery/atmospherics/pipe/heat_exchanging/junction #define PIPE_LAYER_MANIFOLD /obj/machinery/atmospherics/pipe/layer_manifold -#define PIPE_BLUESPACE /obj/machinery/atmospherics/pipe/bluespace //Unary #define PIPE_CONNECTOR /obj/machinery/atmospherics/components/unary/portables_connector #define PIPE_UVENT /obj/machinery/atmospherics/components/unary/vent_pump diff --git a/code/game/machinery/pipe/construction.dm b/code/game/machinery/pipe/construction.dm index 66b451725e..ac9dbf247e 100644 --- a/code/game/machinery/pipe/construction.dm +++ b/code/game/machinery/pipe/construction.dm @@ -32,7 +32,6 @@ Buildable meters PIPE_HE_MANIFOLD, \ PIPE_HE_4WAYMANIFOLD, \ PIPE_JUNCTION, \ - PIPE_BLUESPACE, \ \ PIPE_CONNECTOR, \ PIPE_UVENT, \ @@ -111,7 +110,6 @@ GLOBAL_LIST_INIT(pipeID2State, list( "[PIPE_HE_MANIFOLD]" = "he_manifold", \ "[PIPE_HE_4WAYMANIFOLD]" = "he_manifold4w", \ "[PIPE_JUNCTION]" = "junction", \ - "[PIPE_BLUESPACE]" = "bluespace", \ \ "[PIPE_CONNECTOR]" = "connector", \ "[PIPE_UVENT]" = "uvent", \ @@ -141,7 +139,6 @@ GLOBAL_LIST_INIT(pipeID2State, list( "[PIPE_HE_MANIFOLD]" = "h/e manifold", \ "[PIPE_HE_4WAYMANIFOLD]"= "h/e 4-way manifold", \ "[PIPE_JUNCTION]" = "junction", \ - "[PIPE_BLUESPACE]" = "bluespace pipe", \ \ "[PIPE_CONNECTOR]" = "connector", \ "[PIPE_UVENT]" = "vent", \ diff --git a/code/game/machinery/pipe/pipe_dispenser.dm b/code/game/machinery/pipe/pipe_dispenser.dm index 911a81c2fc..c224097b36 100644 --- a/code/game/machinery/pipe/pipe_dispenser.dm +++ b/code/game/machinery/pipe/pipe_dispenser.dm @@ -24,7 +24,6 @@ PIPING LAYER: --[piping_layer]< 4-Way Manifold
Manual Valve
Digital Valve
-Bluespace Pipe
Devices:
Connector
Vent
diff --git a/code/game/objects/items/RPD.dm b/code/game/objects/items/RPD.dm index 0151b0e9e1..e0890ee094 100644 --- a/code/game/objects/items/RPD.dm +++ b/code/game/objects/items/RPD.dm @@ -87,7 +87,6 @@ GLOBAL_LIST_INIT(RPD_recipes, list( "Digital Valve" = new /datum/pipe_info(PIPE_DVALVE, 1, PIPE_BINARY), "4-Way Manifold" = new /datum/pipe_info(PIPE_4WAYMANIFOLD, 1, PIPE_QUAD), "Layer Manifold" = new /datum/pipe_info(PIPE_LAYER_MANIFOLD, 1, PIPE_BINARY), - "Bluespace Pipe" = new /datum/pipe_info(PIPE_BLUESPACE, 1, PIPE_UNARY), ), "Devices"=list( "Connector" = new /datum/pipe_info(PIPE_CONNECTOR, 1, PIPE_UNARY), diff --git a/code/modules/atmospherics/machinery/pipes/bluespace_pipe.dm b/code/modules/atmospherics/machinery/pipes/bluespace_pipe.dm deleted file mode 100644 index 51e89950c1..0000000000 --- a/code/modules/atmospherics/machinery/pipes/bluespace_pipe.dm +++ /dev/null @@ -1,47 +0,0 @@ -GLOBAL_LIST_EMPTY(bluespace_pipes) - -/obj/machinery/atmospherics/pipe/bluespace - name = "bluespace pipe" - desc = "Transmits gas across large distances of space. Developed using bluespace technology." - icon = 'icons/obj/atmospherics/pipes/bluespace.dmi' - icon_state = "map" - dir = SOUTH - initialize_directions = SOUTH - device_type = UNARY - can_buckle = FALSE - -/obj/machinery/atmospherics/pipe/bluespace/New() - icon_state = "pipe" - GLOB.bluespace_pipes += src - ..() - -/obj/machinery/atmospherics/pipe/bluespace/Destroy() - GLOB.bluespace_pipes -= src - for(var/p in GLOB.bluespace_pipes) - var/obj/machinery/atmospherics/pipe/bluespace/P = p - QDEL_NULL(P.parent) - P.build_network() - return ..() - -/obj/machinery/atmospherics/pipe/bluespace/SetInitDirections() - initialize_directions = dir - -/obj/machinery/atmospherics/pipe/bluespace/pipeline_expansion() - return ..() + GLOB.bluespace_pipes - src - -/obj/machinery/atmospherics/pipe/bluespace/hide() - update_icon() - -/obj/machinery/atmospherics/pipe/bluespace/update_icon(showpipe) - underlays.Cut() - var/turf/T = loc - if(level != 2 && T.intact) - return //no need to update the pipes if they aren't showing - var/connected = 0 //Direction bitset - for(DEVICE_TYPE_LOOP) //adds intact pieces - if(NODE_I) - connected |= icon_addintact(NODE_I) - icon_addbroken(connected) //adds broken pieces - -/obj/machinery/atmospherics/pipe/bluespace/paint() - return FALSE diff --git a/icons/obj/atmospherics/pipes/bluespace.dmi b/icons/obj/atmospherics/pipes/bluespace.dmi deleted file mode 100644 index 866e6f9b84..0000000000 Binary files a/icons/obj/atmospherics/pipes/bluespace.dmi and /dev/null differ diff --git a/tgstation.dme b/tgstation.dme index af1858e179..a656ffb187 100755 --- a/tgstation.dme +++ b/tgstation.dme @@ -1191,7 +1191,6 @@ #include "code\modules\atmospherics\machinery\other\meter.dm" #include "code\modules\atmospherics\machinery\other\miner.dm" #include "code\modules\atmospherics\machinery\other\zvent.dm" -#include "code\modules\atmospherics\machinery\pipes\bluespace_pipe.dm" #include "code\modules\atmospherics\machinery\pipes\layermanifold.dm" #include "code\modules\atmospherics\machinery\pipes\manifold.dm" #include "code\modules\atmospherics\machinery\pipes\manifold4w.dm"