From e5967a3fb9ffbdc57172ad2c159e1e447a6c6f35 Mon Sep 17 00:00:00 2001 From: Iajret Creature <122297233+Steals-The-PRs@users.noreply.github.com> Date: Sat, 9 Dec 2023 12:48:56 +0300 Subject: [PATCH] [Modular] Hash is no longer recursive (#1024) Unhashed Co-authored-by: SomeRandomOwl <2568378+SomeRandomOwl@users.noreply.github.com> --- modular_skyrat/modules/morenarcotics/code/thc.dm | 4 ++++ modular_skyrat/modules/morenarcotics/code/thc_item.dm | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/modular_skyrat/modules/morenarcotics/code/thc.dm b/modular_skyrat/modules/morenarcotics/code/thc.dm index 74bdc3c637d..69d1418a99b 100644 --- a/modular_skyrat/modules/morenarcotics/code/thc.dm +++ b/modular_skyrat/modules/morenarcotics/code/thc.dm @@ -46,6 +46,10 @@ ph = 6 taste_description = "skunk" +/datum/reagent/drug/thc/concentrated + name = "Concentrated THC" + description = "TCH in pure concentrated form" + /datum/reagent/drug/thc/on_mob_life(mob/living/carbon/M, seconds_per_tick, times_fired) var/high_message = pick("You feel relaxed.", "You feel fucked up.", "You feel totally wrecked...") if(M.hud_used!=null) diff --git a/modular_skyrat/modules/morenarcotics/code/thc_item.dm b/modular_skyrat/modules/morenarcotics/code/thc_item.dm index 6f4cdd26a26..b948c8a9cd4 100644 --- a/modular_skyrat/modules/morenarcotics/code/thc_item.dm +++ b/modular_skyrat/modules/morenarcotics/code/thc_item.dm @@ -14,7 +14,7 @@ icon_state = "dab" volume = 40 has_variable_transfer_amount = FALSE - list_reagents = list(/datum/reagent/drug/thc = 40) //horrendously powerful + list_reagents = list(/datum/reagent/drug/thc/concentrated = 40) //horrendously powerful /obj/item/reagent_containers/hashbrick name = "hash brick"