From 3129f950fc3dbcfe58d56ee4dc07cbb5347cc947 Mon Sep 17 00:00:00 2001 From: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> Date: Mon, 5 Jun 2023 17:08:30 -0400 Subject: [PATCH] Give categories to some reagents (#17142) --- .../Reagents/Consumable/Drink/drinks.yml | 19 +++++++++++++++++++ .../Reagents/Consumable/Drink/juice.yml | 18 ------------------ .../Reagents/Consumable/Food/ingredients.yml | 1 + Resources/Prototypes/Reagents/toxins.yml | 6 ++++++ 4 files changed, 26 insertions(+), 18 deletions(-) diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml b/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml index 665cab7bd5..2c88dcb9c0 100644 --- a/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml +++ b/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml @@ -110,6 +110,25 @@ reagent: Theobromine amount: 0.05 +- type: reagent + id: JuiceBerryPoison + name: reagent-name-juice-berry-poison + group: Drinks + desc: reagent-desc-juice-berry-poison + physicalDesc: reagent-physical-desc-sickly + flavor: bitter + color: "#6600CC" + metabolisms: + Drink: + effects: + - !type:SatiateThirst + Poison: + effects: + - !type:HealthChange + damage: + types: + Poison: 1 + - type: reagent id: Lemonade name: reagent-name-lemonade diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/juice.yml b/Resources/Prototypes/Reagents/Consumable/Drink/juice.yml index b9d8463b7f..a77621cab5 100644 --- a/Resources/Prototypes/Reagents/Consumable/Drink/juice.yml +++ b/Resources/Prototypes/Reagents/Consumable/Drink/juice.yml @@ -26,24 +26,6 @@ flavor: juice color: "#660099" -- type: reagent - id: JuiceBerryPoison - name: reagent-name-juice-berry-poison - desc: reagent-desc-juice-berry-poison - physicalDesc: reagent-physical-desc-sickly - flavor: bitter - color: "#6600CC" - metabolisms: - Drink: - effects: - - !type:SatiateThirst - Poison: - effects: - - !type:HealthChange - damage: - types: - Poison: 1 - - type: reagent id: JuiceCarrot name: reagent-name-juice-carrot diff --git a/Resources/Prototypes/Reagents/Consumable/Food/ingredients.yml b/Resources/Prototypes/Reagents/Consumable/Food/ingredients.yml index 2e42a5258c..d2983799f9 100644 --- a/Resources/Prototypes/Reagents/Consumable/Food/ingredients.yml +++ b/Resources/Prototypes/Reagents/Consumable/Food/ingredients.yml @@ -165,6 +165,7 @@ - type: reagent id: CapsaicinOil name: reagent-name-capsaicin-oil + group: Foods desc: reagent-desc-capsaicin-oil physicalDesc: reagent-physical-desc-oily flavor: spicy diff --git a/Resources/Prototypes/Reagents/toxins.yml b/Resources/Prototypes/Reagents/toxins.yml index 43bb275c09..f4d85982cf 100644 --- a/Resources/Prototypes/Reagents/toxins.yml +++ b/Resources/Prototypes/Reagents/toxins.yml @@ -370,6 +370,7 @@ - type: reagent id: VentCrud name: reagent-name-vent-crud + group: Toxins desc: reagent-desc-vent-crud physicalDesc: reagent-physical-desc-sticky flavor: bitter @@ -385,6 +386,7 @@ - type: reagent id: Corpium name: reagent-name-corpium + group: Toxins desc: reagent-desc-corpium physicalDesc: reagent-physical-desc-necrotic flavor: bitter @@ -400,6 +402,7 @@ - type: reagent id: UncookedAnimalProteins name: reagent-name-uncooked-animal-proteins + group: Foods desc: reagent-desc-uncooked-animal-proteins physicalDesc: reagent-physical-desc-clumpy flavor: bitter @@ -424,6 +427,7 @@ - type: reagent id: Allicin name: reagent-name-allicin + group: Foods desc: reagent-desc-allicin physicalDesc: reagent-physical-desc-pungent flavor: bitter @@ -445,6 +449,7 @@ - type: reagent id: Pax name: reagent-name-pax + group: Narcotics desc: reagent-desc-pax physicalDesc: reagent-physical-desc-soothing color: "#AAAAAA" @@ -460,6 +465,7 @@ - type: reagent id: Honk name: reagent-name-honk + group: Toxins desc: reagent-desc-honk physicalDesc: reagent-physical-desc-pungent flavor: bitter