Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MIRROR] Fixes a bug with hash grinding #5270

Merged
merged 2 commits into from
Jan 8, 2025
Merged

[MIRROR] Fixes a bug with hash grinding #5270

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f70f0f3
Fixes a bug with hash grinding (#4716)
vinylspiders Dec 31, 2024
ac84cef
[MIRROR] Fixes a bug with hash grinding
Dec 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions code/modules/hydroponics/grown/cannabis.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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


Expand All @@ -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,
Expand Down
7 changes: 4 additions & 3 deletions modular_nova/modules/morenarcotics/code/thc.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
Loading