From 595d42659d2681b9d725e42bcb50281b0f897bb8 Mon Sep 17 00:00:00 2001 From: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> Date: Mon, 28 Aug 2023 14:30:16 -0400 Subject: [PATCH] Revert "Add peeled state for bananas (#19393)" (#19588) Using "spawn item on use" blatantly breaks botany mutations for bananas. --- .../Objects/Consumable/Food/produce.yml | 22 ++---------------- .../Specific/Hydroponics/banana.rsi/meta.json | 5 +--- .../Hydroponics/banana.rsi/peeled.png | Bin 348 -> 0 bytes 3 files changed, 3 insertions(+), 24 deletions(-) delete mode 100644 Resources/Textures/Objects/Specific/Hydroponics/banana.rsi/peeled.png diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml index b6e3dc4868..3dbff39133 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml @@ -147,6 +147,8 @@ - type: FlavorProfile flavors: - banana + - type: Food + trash: TrashBananaPeel - type: SolutionContainerManager solutions: food: @@ -165,26 +167,6 @@ reagents: - ReagentId: JuiceBanana Quantity: 10 - - type: SpawnItemsOnUse - items: - - id: FoodBananaPeeled - sound: - path: /Audio/Effects/unwrap.ogg - -- type: entity - name: banana - parent: FoodBanana - suffix: Peeled - id: FoodBananaPeeled - description: Rich in potassium. - components: - - type: Food - trash: TrashBananaPeel - - type: Sprite - sprite: Objects/Specific/Hydroponics/banana.rsi - state: peeled - - type: SpawnItemsOnUse - uses: 0 - type: entity name: banana peel diff --git a/Resources/Textures/Objects/Specific/Hydroponics/banana.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/banana.rsi/meta.json index db7aff4573..88c277fde7 100644 --- a/Resources/Textures/Objects/Specific/Hydroponics/banana.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Hydroponics/banana.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/6be7633abca9f1a51cab1020500cf0776ce78e5c, peeled by potato1234x", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/6be7633abca9f1a51cab1020500cf0776ce78e5c", "size": { "x": 32, "y": 32 @@ -25,9 +25,6 @@ { "name": "peel3" }, - { - "name": "peeled" - }, { "name": "peel-inhand-left", "directions": 4 diff --git a/Resources/Textures/Objects/Specific/Hydroponics/banana.rsi/peeled.png b/Resources/Textures/Objects/Specific/Hydroponics/banana.rsi/peeled.png deleted file mode 100644 index d6f7bcc9260deeb4a78e3863327b81a7ee3af1b6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 348 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCik#1AIbUU));p@B8)NAJ6^!_u}852RBdlub*#H883fnkHx*4o+p>S$}z$3Dlfr0NJ2s7@OnEe(g zIMvg|F~q|EZC{{}lOl)fRgr)jDxmuq7(8A5T-G@yGywp)sF2_Q