From ad47cee7f4895dc96cbcb15d2a5a1fd14a0966b5 Mon Sep 17 00:00:00 2001 From: Vordenburg <114301317+Vordenburg@users.noreply.github.com> Date: Fri, 4 Aug 2023 01:49:56 -0400 Subject: [PATCH] Replace THC with THCOil (#18617) Co-authored-by: Kevin Zheng --- .../Entities/Objects/Specific/Hydroponics/leaves.yml | 2 +- Resources/Prototypes/Reagents/narcotics.yml | 3 ++- Resources/Prototypes/Recipes/Reactions/drinks.yml | 3 +-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/leaves.yml b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/leaves.yml index 9a309ca48b..8e3f460e43 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/leaves.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/leaves.yml @@ -15,7 +15,7 @@ solutions: food: reagents: - - ReagentId: THCOil + - ReagentId: THC Quantity: 5 - type: entity diff --git a/Resources/Prototypes/Reagents/narcotics.yml b/Resources/Prototypes/Reagents/narcotics.yml index 83424dfad4..2a4d304da7 100644 --- a/Resources/Prototypes/Reagents/narcotics.yml +++ b/Resources/Prototypes/Reagents/narcotics.yml @@ -148,6 +148,7 @@ group: Narcotics desc: reagent-desc-thc flavor: bitter + flavorMinimum: 0.05 color: "#808080" physicalDesc: reagent-physical-desc-crystalline plantMetabolism: @@ -166,7 +167,7 @@ refresh: false - type: reagent - id: THCOil + id: THCOil # deprecated in favor of THC, preserved here for forks name: reagent-name-thc-oil group: Narcotics desc: reagent-desc-thc-oil diff --git a/Resources/Prototypes/Recipes/Reactions/drinks.yml b/Resources/Prototypes/Recipes/Reactions/drinks.yml index 831719d19d..6fe0cdecb2 100644 --- a/Resources/Prototypes/Recipes/Reactions/drinks.yml +++ b/Resources/Prototypes/Recipes/Reactions/drinks.yml @@ -335,9 +335,8 @@ reactants: GargleBlaster: amount: 1 - THCOil: + THC: amount: 1 - # TODO replace THCOil with Mushroom Hallucinogen once added products: HippiesDelight: 2