From 1f7b15d8f8d7f51026c9de24f6047768e402363e Mon Sep 17 00:00:00 2001 From: kappa-sama Date: Fri, 22 Jan 2021 11:45:30 -0500 Subject: [PATCH] clonwops --- .../components/crafting/recipes/recipes_misc.dm | 12 ++++++++++++ code/modules/cargo/blackmarket/blackmarket_uplink.dm | 11 ----------- config/respawns.txt | 2 +- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/code/datums/components/crafting/recipes/recipes_misc.dm b/code/datums/components/crafting/recipes/recipes_misc.dm index d85df8c010..032dd0ea90 100644 --- a/code/datums/components/crafting/recipes/recipes_misc.dm +++ b/code/datums/components/crafting/recipes/recipes_misc.dm @@ -336,6 +336,18 @@ subcategory = CAT_TOOL category = CAT_MISC +/datum/crafting_recipe/blackmarket_uplink + name = "Black Market Uplink" + result = /obj/item/blackmarket_uplink + time = 20 + tools = list(TOOL_SCREWDRIVER, TOOL_WIRECUTTER) + reqs = list(/obj/item/stock_parts/subspace/amplifier = 1, + /obj/item/stack/cable_coil = 15, + /obj/item/radio = 1, + /obj/item/analyzer = 1) + subcategory = CAT_MISCELLANEOUS + category = CAT_MISC + /datum/crafting_recipe/heretic/codex name = "Codex Cicatrix" result = /obj/item/forbidden_book diff --git a/code/modules/cargo/blackmarket/blackmarket_uplink.dm b/code/modules/cargo/blackmarket/blackmarket_uplink.dm index a1f94629f1..e31d2521d5 100644 --- a/code/modules/cargo/blackmarket/blackmarket_uplink.dm +++ b/code/modules/cargo/blackmarket/blackmarket_uplink.dm @@ -139,14 +139,3 @@ market.purchase(selected_item, viewing_category, params["method"], src, usr) buying = FALSE selected_item = null - -/datum/crafting_recipe/blackmarket_uplink - name = "Black Market Uplink" - result = /obj/item/blackmarket_uplink - time = 30 - tools = list(TOOL_SCREWDRIVER, TOOL_WIRECUTTER, TOOL_MULTITOOL) - reqs = list(/obj/item/stock_parts/subspace/amplifier = 1, - /obj/item/stack/cable_coil = 15, - /obj/item/radio = 1, - /obj/item/analyzer = 1) - category = CAT_MISC diff --git a/config/respawns.txt b/config/respawns.txt index 804a856a93..2b7f89b30b 100644 --- a/config/respawns.txt +++ b/config/respawns.txt @@ -26,4 +26,4 @@ RESPAWN_MINIMUM_DELAY_ROUNDSTART 30.0 RESPAWN_CHAOS_GAMEMODES WIZARD RESPAWN_CHAOS_GAMEMODES NUCLEAR RESPAWN_CHAOS_GAMEMODES CLOWNOPS -RESPAWN_CHAOS_GAMEMODES REVOLUTION +RESPAWN_CHOAS_GAMEMODES REVOLUTION