From: FlipBrooke <87075384+FlipBrooke@users.noreply.github.com> Date: Thu, 17 Jul 2025 16:29:36 +0000 (-0600) Subject: Wearable banana peels (#38868) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=89fa7c2914962af6ca3a43194d9d3f46a25c6b09;p=space-station-14.git Wearable banana peels (#38868) * Add wearable helmet sprites for banana and mimana peels Made it so banana peels and their variants can be worn as head gear. The sprites were done by myself, so feel free to change or update them! Includes hamster compatibility. * fixed a minor state bug * Review fixes - Removed blank space - Added "FlipBrooke" to all modified meta.jsons, with the added note of which sprites I got the colors from/referenced. * I forgot a comma adds a comma and some periods --- diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml index 2cdd881510..60a4ae9406 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml @@ -437,6 +437,8 @@ - Recyclable - Trash - BananaPeel + - WhitelistChameleon + - HamsterWearable - type: SolutionContainerManager solutions: food: @@ -449,12 +451,21 @@ - type: SpaceGarbage - type: Food requiresSpecialDigestion: true + - type: Clothing + sprite: Objects/Specific/Hydroponics/banana.rsi + equippedState: peel-equipped-HELMET + slots: + - HEAD + quickEquip: false - type: entity name: baked banana peel parent: TrashBananaPeel id: TrashBakedBananaPeel components: + - type: Clothing + sprite: Objects/Specific/Hydroponics/banana.rsi + equippedState: baked-peel-equipped-HELMET - type: Sprite sprite: Objects/Specific/Hydroponics/banana.rsi state: baked-peel @@ -483,6 +494,9 @@ - type: Item sprite: Objects/Specific/Hydroponics/mimana.rsi heldPrefix: peel + - type: Clothing + sprite: Objects/Specific/Hydroponics/mimana.rsi + equippedState: equipped-HELMET - type: Slippery slipSound: path: /Audio/Effects/slip.ogg @@ -501,6 +515,9 @@ sprite: Objects/Materials/materials.rsi heldPrefix: peel - type: Slippery + - type: Clothing + sprite: Objects/Materials/materials.rsi + equippedState: peel-equipped-HELMET - type: entity name: carrot diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/funny.yml b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/funny.yml index 27a6188584..73c021748c 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/funny.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/funny.yml @@ -102,6 +102,11 @@ - !type:TriggerBehavior - !type:DoActsBehavior acts: ["Destruction"] + - type: Tag + tags: + - Recyclable + - Trash + - BananaPeel - type: entity parent: BaseItem diff --git a/Resources/Textures/Objects/Materials/materials.rsi/meta.json b/Resources/Textures/Objects/Materials/materials.rsi/meta.json index 9fbad41e48..d49eb61b76 100644 --- a/Resources/Textures/Objects/Materials/materials.rsi/meta.json +++ b/Resources/Textures/Objects/Materials/materials.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24 , bear pelt remade by Alekshhh, wood sprite modified by MisterMecky, wood_2 and wood_3 made by MisterMecky based on wood sprite, cardboard sprites made by MisterMecky, bananium, bananium_1 and peel made by brainfood1183 (github) for ss14. Pyrotton sprites are drawn by Ubaser, using the cotton material sprites as a base. Bananium, cardboard, corgihide, cloth, cotton, pyrotton, bones and durathread inhands by mubururu_ (github).", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24 , bear pelt remade by Alekshhh, wood sprite modified by MisterMecky, wood_2 and wood_3 made by MisterMecky based on wood sprite, cardboard sprites made by MisterMecky, bananium, bananium_1 and peel made by brainfood1183 (github) for ss14. Pyrotton sprites are drawn by Ubaser, using the cotton material sprites as a base. Bananium, cardboard, corgihide, cloth, cotton, pyrotton, bones and durathread inhands by mubururu_ (github). Bananium peel's on-head sprite by FlipBrooke, based on the bananaium peel sprite.", "size": { "x": 32, "y": 32 @@ -193,6 +193,14 @@ { "name": "peel" }, + { + "name": "peel-equipped-HELMET", + "directions": 4 + }, + { + "name": "peel-equipped-HELMET-hamster", + "directions": 4 + }, { "name": "phoron_gem_spent" }, diff --git a/Resources/Textures/Objects/Materials/materials.rsi/peel-equipped-HELMET-hamster.png b/Resources/Textures/Objects/Materials/materials.rsi/peel-equipped-HELMET-hamster.png new file mode 100644 index 0000000000..e607cf252f Binary files /dev/null and b/Resources/Textures/Objects/Materials/materials.rsi/peel-equipped-HELMET-hamster.png differ diff --git a/Resources/Textures/Objects/Materials/materials.rsi/peel-equipped-HELMET.png b/Resources/Textures/Objects/Materials/materials.rsi/peel-equipped-HELMET.png new file mode 100644 index 0000000000..b15646a01f Binary files /dev/null and b/Resources/Textures/Objects/Materials/materials.rsi/peel-equipped-HELMET.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/banana.rsi/baked-peel-equipped-HELMET-hamster.png b/Resources/Textures/Objects/Specific/Hydroponics/banana.rsi/baked-peel-equipped-HELMET-hamster.png new file mode 100644 index 0000000000..0f587c924e Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/banana.rsi/baked-peel-equipped-HELMET-hamster.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/banana.rsi/baked-peel-equipped-HELMET.png b/Resources/Textures/Objects/Specific/Hydroponics/banana.rsi/baked-peel-equipped-HELMET.png new file mode 100644 index 0000000000..ac69dd5d60 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/banana.rsi/baked-peel-equipped-HELMET.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 064ed98da3..64523fe470 100644 --- a/Resources/Textures/Objects/Specific/Hydroponics/banana.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Hydroponics/banana.rsi/meta.json @@ -1,7 +1,8 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/6be7633abca9f1a51cab1020500cf0776ce78e5c, inhands by mubururu_ (github), Growth stages, harvest, dead, and produce created by Chaoticaa (GitHub), inhands modified by Prole0 (GitHub)", + + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/6be7633abca9f1a51cab1020500cf0776ce78e5c, inhands by mubururu_ (github), Growth stages, harvest, dead, and produce created by Chaoticaa (GitHub), inhands modified by Prole0 (GitHub), On-head sprites by FlipBrooke,.", "size": { "x": 32, "y": 32 @@ -42,6 +43,14 @@ { "name": "baked-peel3" }, + { + "name": "baked-peel-equipped-HELMET", + "directions": 4 + }, + { + "name": "baked-peel-equipped-HELMET-hamster", + "directions": 4 + }, { "name": "baked-peel-inhand-left", "directions": 4 @@ -71,6 +80,14 @@ { "name": "stage-6" }, + { + "name": "peel-equipped-HELMET", + "directions": 4 + }, + { + "name": "peel-equipped-HELMET-hamster", + "directions": 4 + }, { "name": "produce-inhand-left", "directions": 4 diff --git a/Resources/Textures/Objects/Specific/Hydroponics/banana.rsi/peel-equipped-HELMET-hamster.png b/Resources/Textures/Objects/Specific/Hydroponics/banana.rsi/peel-equipped-HELMET-hamster.png new file mode 100644 index 0000000000..e01ef05a5d Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/banana.rsi/peel-equipped-HELMET-hamster.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/banana.rsi/peel-equipped-HELMET.png b/Resources/Textures/Objects/Specific/Hydroponics/banana.rsi/peel-equipped-HELMET.png new file mode 100644 index 0000000000..225f0db6da Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/banana.rsi/peel-equipped-HELMET.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/mimana.rsi/equipped-HELMET-hamster.png b/Resources/Textures/Objects/Specific/Hydroponics/mimana.rsi/equipped-HELMET-hamster.png new file mode 100644 index 0000000000..16c89bff2b Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/mimana.rsi/equipped-HELMET-hamster.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/mimana.rsi/equipped-HELMET.png b/Resources/Textures/Objects/Specific/Hydroponics/mimana.rsi/equipped-HELMET.png new file mode 100644 index 0000000000..842e1c02e9 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/mimana.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/mimana.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/mimana.rsi/meta.json index 25ec879674..9bc2def611 100644 --- a/Resources/Textures/Objects/Specific/Hydroponics/mimana.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Hydroponics/mimana.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, inhands by mubururu_ (github)", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/6be7633abca9f1a51cab1020500cf0776ce78e5c, inhands by mubururu_ (github). Mimana peel on-head sprite by FlipBrooke, based on the mimana item sprite.", "size": { "x": 32, "y": 32 @@ -10,6 +10,14 @@ { "name": "dead" }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "equipped-HELMET-hamster", + "directions": 4 + }, { "name": "harvest" },