From cc2d5bfc0725e6174b884f58a06a7b56bfc179fc Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sun, 4 Feb 2018 23:18:18 -0600 Subject: [PATCH] [MIRROR] Fixes attackby in expressconsole.dm, moves bluespace pod upgrade further down the line in techwebs (#5283) * Fixes attackby in expressconsole.dm, moves bluespace pod upgrade further down the line in techwebs (#35249) * yaga * node change * okay cobby * Fixes attackby in expressconsole.dm, moves bluespace pod upgrade further down the line in techwebs --- code/modules/cargo/expressconsole.dm | 4 ++-- code/modules/research/techweb/all_nodes.dm | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/modules/cargo/expressconsole.dm b/code/modules/cargo/expressconsole.dm index b8ed56413d..6c4d691d0f 100644 --- a/code/modules/cargo/expressconsole.dm +++ b/code/modules/cargo/expressconsole.dm @@ -20,16 +20,16 @@ /obj/machinery/computer/cargo/express/attackby(obj/item/W, mob/living/user, params) - ..() if((istype(W, /obj/item/card/id) || istype(W, /obj/item/device/pda)) && allowed(user)) locked = !locked to_chat(user, "You [locked ? "lock" : "unlock"] the interface.") - + return else if(istype(W, /obj/item/disk/cargo/bluespace_pod)) podID = 1//doesnt effect circuit board, so that reversal is possible to_chat(user, "You insert the disk into [src], allowing for advanced supply delivery vehicles.") qdel(W) return TRUE + ..() /obj/machinery/computer/cargo/express/emag_act(mob/living/user) if(obj_flags & EMAGGED) diff --git a/code/modules/research/techweb/all_nodes.dm b/code/modules/research/techweb/all_nodes.dm index e4c89e8139..5aa71f478e 100644 --- a/code/modules/research/techweb/all_nodes.dm +++ b/code/modules/research/techweb/all_nodes.dm @@ -111,7 +111,7 @@ description = "Deeper understanding of how the Bluespace dimension works" prereq_ids = list("practical_bluespace", "high_efficiency") design_ids = list("bluespace_matter_bin", "femto_mani", "triphasic_scanning", "tele_station", "tele_hub", "quantumpad", "launchpad", "launchpad_console", - "teleconsole", "bag_holding", "bluespace_crystal", "wormholeprojector") + "teleconsole", "bag_holding", "bluespace_crystal", "wormholeprojector", "bluespace_pod") research_cost = 2500 export_price = 5000 @@ -432,7 +432,7 @@ display_name = "Advanced Mining Technology" description = "Efficiency Level 127" //dumb mc references prereq_ids = list("basic_mining", "adv_engi", "adv_power", "adv_plasma") - design_ids = list("drill_diamond", "jackhammer", "hypermod", "plasmacutter", "plasmacutter_adv", "bluespace_pod") + design_ids = list("drill_diamond", "jackhammer", "hypermod", "plasmacutter", "plasmacutter_adv") research_cost = 2500 export_price = 5000