From 46a78bc3dd356565bd3ec1c1e9c45670c88940c2 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Fri, 20 Oct 2017 01:40:15 -0500 Subject: [PATCH] [MIRROR] Reverts bluespace pipes (#3513) * Revert bluespace pipes while keeping fixes from the original PR (#31866) These are absurdely overpowered given that they have no research or material gate * Reverts bluespace pipes --- code/__DEFINES/pipe_construction.dm | 1 - code/game/machinery/pipe/construction.dm | 3 -- code/game/machinery/pipe/pipe_dispenser.dm | 1 - code/game/objects/items/RPD.dm | 1 - .../machinery/pipes/bluespace_pipe.dm | 47 ------------------ icons/obj/atmospherics/pipes/bluespace.dmi | Bin 677 -> 0 bytes tgstation.dme | 1 - 7 files changed, 54 deletions(-) delete mode 100644 code/modules/atmospherics/machinery/pipes/bluespace_pipe.dm delete mode 100644 icons/obj/atmospherics/pipes/bluespace.dmi 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 866e6f9b844f4f4a9c987755618f0d3ca5a9087f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 677 zcmV;W0$TlvP)V!Y0R8_htE;PQY;6CPVgJl#eSLkvz`zX+ z4PIVegM)*(xVRY^86O`X8X6k4wY41`9b#f)x3{;3hK3s(8(CRdw6wG%F=jRZ0004W zQchCV=-0C=2JR&a84_w-Y6@%7{?OD!tS%+FJ> zRWQ*r;NmRLOex6#a*U0*I5Sc+(=$pSoZ^zil2jm5sUWi;Rf&r;C9|j)$Tj5ROe;#v zO$D*dfTF26iIpH>9g-lz^xVV(?1me1DJ!`8xqzJv05#Dr#k$KneEa!CT?#h!$R^WZnO?Z6-nypoZd+G38!XgQfoq6@ci9H62}G(+w9DyIQ0_?@P`l4G z5M2s_ra$GMmx8vH225?6X&^ew3KX5iA!PKlf-bF)x-PfEj?)4ZJrL6_qYv-Uv;L0# zoip4mXY(DrW^FiQc^8sh|G2gR3A4q>z=LcoJ z81j9J->l?+89!8=QvTQH15)RMw8Nn4vH*2HkP1EjhkLqq1~wnqd|()cVHl6W;R>dI zjQvQA5QjsYa}CI#pYwf>GMMr`%3#j-D1$lQ!*(#`d)yiP