From d77fab0e59ffefb537c3a5f76791f7e264a5cd26 Mon Sep 17 00:00:00 2001 From: MLGTASTICa <61350382+MLGTASTICa@users.noreply.github.com> Date: Sat, 25 Nov 2023 12:26:53 +0200 Subject: [PATCH 1/2] Tones down excel redirector requirements (#8373) * jj * the change * Revert "the change" This reverts commit 4dfab93a883cef45fb9663a6f9835293d65c6815. --- code/game/machinery/excelsior/ex_teleporter.dm | 2 +- .../items/weapons/circuitboards/machinery/excelsior.dm | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/game/machinery/excelsior/ex_teleporter.dm b/code/game/machinery/excelsior/ex_teleporter.dm index db337a1d4e..0cefb3855b 100644 --- a/code/game/machinery/excelsior/ex_teleporter.dm +++ b/code/game/machinery/excelsior/ex_teleporter.dm @@ -65,7 +65,7 @@ var/global/excelsior_last_draft = 0 /obj/item/electronics/circuitboard/excelsior_boombox = 150, /obj/item/electronics/circuitboard/excelsior_autodoc = 150, /// its expensive so they need to do a few mandates before they manage to get it - /obj/item/electronics/circuitboard/excelsior_navigation_cracker = 10000, + /obj/item/electronics/circuitboard/excelsior_navigation_cracker = 3000, /obj/item/electronics/circuitboard/diesel = 150 ) diff --git a/code/game/objects/items/weapons/circuitboards/machinery/excelsior.dm b/code/game/objects/items/weapons/circuitboards/machinery/excelsior.dm index 27fb3d285c..efdf458b5d 100755 --- a/code/game/objects/items/weapons/circuitboards/machinery/excelsior.dm +++ b/code/game/objects/items/weapons/circuitboards/machinery/excelsior.dm @@ -78,9 +78,9 @@ // Highly advanced and classified mechanism for the safe redirection to excelsior-controled space.. origin_tech = list(TECH_ENGINEERING = 12, TECH_COVERT = 6, TECH_COMBAT = 6, TECH_BLUESPACE = 10, TECH_DATA = 6, TECH_MAGNET = 4) req_components = list( - /obj/item/stock_parts/manipulator/excelsior = 3, - /obj/item/stock_parts/micro_laser/excelsior = 6, - /obj/item/stock_parts/scanning_module/excelsior = 3, + /obj/item/stock_parts/manipulator/excelsior = 1, + /obj/item/stock_parts/micro_laser/excelsior = 2, + /obj/item/stock_parts/scanning_module/excelsior = 1, /obj/item/computer_hardware/processor_unit/adv = 2, /obj/item/computer_hardware/hard_drive/advanced = 1, // bluespace bullshit From 81ab44adbb74f1759e7e153cf33ce17dea777b37 Mon Sep 17 00:00:00 2001 From: MLGTASTICa <61350382+MLGTASTICa@users.noreply.github.com> Date: Sat, 25 Nov 2023 12:42:17 +0200 Subject: [PATCH 2/2] Update food-Drinks.dm (#8374) --- code/modules/reagents/reagents/food-Drinks.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/modules/reagents/reagents/food-Drinks.dm b/code/modules/reagents/reagents/food-Drinks.dm index 688cb4829f..24536a8a8f 100644 --- a/code/modules/reagents/reagents/food-Drinks.dm +++ b/code/modules/reagents/reagents/food-Drinks.dm @@ -1185,7 +1185,6 @@ SEND_SIGNAL_OLD(L, COMSIG_CARBON_HAPPY, src, MOB_DELETE_DRUG) /datum/reagent/alcohol/affect_blood(mob/living/carbon/M, alien, effect_multiplier) - M.add_chemical_effect(CE_TOXIN, toxicity * (issmall(M) ? effect_multiplier * 2 : effect_multiplier)) M.add_chemical_effect(CE_PAINKILLER, max(35 - (strength / 2), 1)) //Vodka 32.5 painkiller, beer 15 /datum/reagent/alcohol/affect_ingest(mob/living/carbon/M, alien, effect_multiplier)