From: Feluk6174 <77207907+Feluk6174@users.noreply.github.com> Date: Wed, 22 Nov 2023 01:08:53 +0000 (+0000) Subject: Added Bananadine (#21759) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=0da68ddc6c55ea8f953dc4b40a8ba6398af5a75b;p=space-station-14.git Added Bananadine (#21759) * added bananadine and its functionallity (and backed banana peel) * added baked banana peals sprites * fixed typos and changed the sprite used by backed banan peel to the right one * Changed the cooktime and now grinded baked banana leaves have carbon * Updated bananadine description * Ficed typo in ragent-desc-bananadine * Reverted actidental change to nocturine --- diff --git a/Resources/Locale/en-US/reagents/meta/narcotics.ftl b/Resources/Locale/en-US/reagents/meta/narcotics.ftl index e4b905bd3e..7e5e41037e 100644 --- a/Resources/Locale/en-US/reagents/meta/narcotics.ftl +++ b/Resources/Locale/en-US/reagents/meta/narcotics.ftl @@ -16,6 +16,9 @@ reagent-desc-thc = The main psychoactive compound in cannabis. reagent-name-thc-oil = THC oil reagent-desc-thc-oil = Pure THC oil, extracted from the leaves of the cannabis plant. Much stronger than its natural form and can be used to numb chronic pain in patients. +reagent-name-bananadine = Bananadine +reagent-desc-bananadine = A mild psychedelic that is found in small traces in banana peels. + reagent-name-nicotine = Nicotine reagent-desc-nicotine = Dangerous and highly addictive, but that's what the propaganda says. diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml index 8232a34b59..37177164d8 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml @@ -304,6 +304,28 @@ grindableSolutionName: food - type: SpaceGarbage +- type: entity + name: baked banana peel + parent: TrashBananaPeel + id: TrashBakedBananaPeel + components: + - type: Sprite + sprite: Objects/Specific/Hydroponics/banana.rsi + state: baked-peel + - type: Item + sprite: Objects/Specific/Hydroponics/banana.rsi + heldPrefix: baked-peel + - type: SolutionContainerManager + solutions: + food: + reagents: + - ReagentId: PulpedBananaPeel + Quantity: 1 + - ReagentId: Bananadine + Quantity: 1 + - ReagentId: Carbon + Quantity: 2 + - type: entity name: mimana peel parent: TrashBananaPeel diff --git a/Resources/Prototypes/Reagents/narcotics.yml b/Resources/Prototypes/Reagents/narcotics.yml index 77caafb647..2678f4cd71 100644 --- a/Resources/Prototypes/Reagents/narcotics.yml +++ b/Resources/Prototypes/Reagents/narcotics.yml @@ -250,6 +250,24 @@ time: 5 refresh: false +- type: reagent + id: Bananadine + name: reagent-name-bananadine + group: Narcotics + desc: reagent-desc-bananadine + physicalDesc: reagent-physical-desc-powdery + flavor: bitter + color: "#ffff00" + metabolisms: + Narcotic: + effects: + - !type:GenericStatusEffect + key: SeeingRainbows + component: SeeingRainbows + type: Add + time: 5 + refresh: false + # Probably replace this one with sleeping chem when putting someone in a comatose state is easier - type: reagent id: Nocturine diff --git a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml index 24cbc3cf79..8bc8c1a15b 100644 --- a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml +++ b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml @@ -1613,6 +1613,14 @@ Sigynate: 50 Dermaline: 50 +- type: microwaveMealRecipe + id: RecipeTrashBakedBananaPeel + name: baked banana peel recipe + result: TrashBakedBananaPeel + time: 5 + solids: + TrashBananaPeel: 1 + # Suppermatter - type: microwaveMealRecipe id: RecipeSuppermatter diff --git a/Resources/Textures/Objects/Specific/Hydroponics/banana.rsi/baked-peel-inhand-left.png b/Resources/Textures/Objects/Specific/Hydroponics/banana.rsi/baked-peel-inhand-left.png new file mode 100644 index 0000000000..63d83d1f83 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/banana.rsi/baked-peel-inhand-left.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/banana.rsi/baked-peel-inhand-right.png b/Resources/Textures/Objects/Specific/Hydroponics/banana.rsi/baked-peel-inhand-right.png new file mode 100644 index 0000000000..301c5f007c Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/banana.rsi/baked-peel-inhand-right.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/banana.rsi/baked-peel.png b/Resources/Textures/Objects/Specific/Hydroponics/banana.rsi/baked-peel.png new file mode 100644 index 0000000000..7bcdef6828 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/banana.rsi/baked-peel.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/banana.rsi/baked-peel2.png b/Resources/Textures/Objects/Specific/Hydroponics/banana.rsi/baked-peel2.png new file mode 100644 index 0000000000..16f795680e Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/banana.rsi/baked-peel2.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/banana.rsi/baked-peel3.png b/Resources/Textures/Objects/Specific/Hydroponics/banana.rsi/baked-peel3.png new file mode 100644 index 0000000000..5e0b4a5080 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/banana.rsi/baked-peel3.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/banana.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/banana.rsi/meta.json index 88c277fde7..27357cf18e 100644 --- a/Resources/Textures/Objects/Specific/Hydroponics/banana.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Hydroponics/banana.rsi/meta.json @@ -33,6 +33,23 @@ "name": "peel-inhand-right", "directions": 4 }, + { + "name": "baked-peel" + }, + { + "name": "baked-peel2" + }, + { + "name": "baked-peel3" + }, + { + "name": "baked-peel-inhand-left", + "directions": 4 + }, + { + "name": "baked-peel-inhand-right", + "directions": 4 + }, { "name": "seed" },