From f70f0f36f8c63419e39f13d474bc3c447e655d2e Mon Sep 17 00:00:00 2001 From: Bloop <13398309+vinylspiders@users.noreply.github.com> Date: Mon, 30 Dec 2024 23:54:33 -0500 Subject: [PATCH 1/2] Fixes a bug with hash grinding (#4716) Fixes hash grinding --- code/modules/hydroponics/grown/cannabis.dm | 8 ++++---- modular_nova/modules/morenarcotics/code/thc.dm | 7 ++++--- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/code/modules/hydroponics/grown/cannabis.dm b/code/modules/hydroponics/grown/cannabis.dm index e83bfc3e9b7..76af152cf30 100644 --- a/code/modules/hydroponics/grown/cannabis.dm +++ b/code/modules/hydroponics/grown/cannabis.dm @@ -20,7 +20,7 @@ /obj/item/seeds/cannabis/white, /obj/item/seeds/cannabis/ultimate, ) - reagents_add = list(/datum/reagent/drug/thc = 0.15) //NOVA EDIT - MORENARCOTICS - axed lipolicide, replaced space drugs with thc + reagents_add = list(/datum/reagent/drug/thc = 0.15) // NOVA EDIT - CHANGE - MORENARCOTICS - ORIGINAL: reagents_add = list(/datum/reagent/drug/cannabis = 0.15) /obj/item/seeds/cannabis/rainbow @@ -44,7 +44,7 @@ plantname = "Deathweed" product = /obj/item/food/grown/cannabis/death mutatelist = null - reagents_add = list(/datum/reagent/toxin/cyanide = 0.35, /datum/reagent/drug/thc = 0.15) //NOVA EDIT - MORENARCOTICS + reagents_add = list(/datum/reagent/toxin/cyanide = 0.35, /datum/reagent/drug/thc = 0.15) // NOVA EDIT CHANGE - MORENARCOTICS - ORIGINAL: agents_add = list(/datum/reagent/toxin/cyanide = 0.35, /datum/reagent/drug/cannabis = 0.15) rarity = 40 /obj/item/seeds/cannabis/white @@ -57,7 +57,7 @@ instability = 30 product = /obj/item/food/grown/cannabis/white mutatelist = null - reagents_add = list(/datum/reagent/medicine/omnizine = 0.35, /datum/reagent/drug/thc = 0.15) //NOVA EDIT - MORENARCOTICS + reagents_add = list(/datum/reagent/medicine/omnizine = 0.35, /datum/reagent/drug/thc = 0.15) // NOVA EDIT CHANGE - MORENARCOTICS - ORIGINAL: reagents_add = list(/datum/reagent/medicine/omnizine = 0.35, /datum/reagent/drug/cannabis = 0.15) rarity = 40 @@ -72,7 +72,7 @@ product = /obj/item/food/grown/cannabis/ultimate genes = list(/datum/plant_gene/trait/repeated_harvest, /datum/plant_gene/trait/glow/green, /datum/plant_gene/trait/modified_volume/omega_weed) mutatelist = null - reagents_add = list(/datum/reagent/drug/thc = 0.3, //NOVA EDIT CHANGE - MORE NARCOTICS - ORIGINAL: reagents_add = list(/datum/reagent/drug/cannabis = 0.3, + reagents_add = list(/datum/reagent/drug/thc = 0.3, // NOVA EDIT CHANGE - MORE NARCOTICS - ORIGINAL: reagents_add = list(/datum/reagent/drug/cannabis = 0.3, /datum/reagent/toxin/mindbreaker = 0.3, /datum/reagent/mercury = 0.15, /datum/reagent/lithium = 0.15, diff --git a/modular_nova/modules/morenarcotics/code/thc.dm b/modular_nova/modules/morenarcotics/code/thc.dm index b08ce009f72..925ce3a02a5 100644 --- a/modular_nova/modules/morenarcotics/code/thc.dm +++ b/modular_nova/modules/morenarcotics/code/thc.dm @@ -1,8 +1,9 @@ /obj/item/food/grown/cannabis/on_grind() - . = ..() if(HAS_TRAIT(src, TRAIT_DRIED)) - grind_results = list(/datum/reagent/drug/thc/hash = 0.15*src.seed.potency) - reagents.clear_reagents() //prevents anything else from coming out + if(!reagents) + return ..() + reagents.convert_reagent(/datum/reagent/drug/thc, /datum/reagent/drug/thc/hash, 1, include_source_subtypes = FALSE) + return ..() /datum/chemical_reaction/hash required_reagents = list(/datum/reagent/drug/thc/hash = 10) From ac84cefd474514906d70163d45565cd5dfde6c34 Mon Sep 17 00:00:00 2001 From: StealsThePRs Date: Tue, 31 Dec 2024 07:55:33 +0300 Subject: [PATCH 2/2] [MIRROR] Fixes a bug with hash grinding