From: Velcroboy <107660393+IamVelcroboy@users.noreply.github.com> Date: Sun, 19 Nov 2023 20:15:02 +0000 (-0600) Subject: Adds slices for banana cream pie and mime tart (#21043) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=808555ade6ae549c5ed210c7dbdc2c2a279ea095;p=space-station-14.git Adds slices for banana cream pie and mime tart (#21043) --- diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml index 4ec0434f0e..5d2a304f87 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml @@ -66,9 +66,9 @@ slice: FoodPieAppleSlice - type: Tag tags: - - Fruit - - Pie - + - Fruit + - Pie + - type: entity name: slice of apple pie parent: FoodPieSliceBase @@ -85,7 +85,7 @@ color: orange - type: Tag tags: - - Fruit + - Fruit - Pie # Tastes like pie, apple. @@ -153,8 +153,24 @@ path: /Audio/Weapons/Guns/Empty/empty.ogg - type: Tag tags: - - Fruit + - Fruit - Pie + - type: SliceableFood + slice: FoodPieBananaCreamSlice + +- type: entity + name: slice of banana cream pie + parent: FoodPieSliceBase + id: FoodPieBananaCreamSlice + description: Just like back home, on clown planet! HONK! + components: + - type: FlavorProfile + flavors: + - sweet + - banana + - creamy + - type: Sprite + state: bananapie-slice # Tastes like pie, cream, banana. - type: entity @@ -176,7 +192,7 @@ slice: FoodPieClafoutisSlice - type: Tag tags: - - Fruit + - Fruit - Pie - type: entity @@ -195,7 +211,7 @@ color: pink - type: Tag tags: - - Fruit + - Fruit - Pie # Tastes like pie, blackberries. @@ -216,7 +232,7 @@ slice: FoodPieCherrySlice - type: Tag tags: - - Fruit + - Fruit - Pie - type: entity @@ -234,7 +250,7 @@ color: red - type: Tag tags: - - Fruit + - Fruit - Pie # Tastes like pie, cherries. @@ -348,6 +364,37 @@ color: blue # Tastes like pie, mint. +- type: entity + name: mime tart + parent: FoodPieBase + id: FoodTartMime + description: "\" \"" + components: + - type: FlavorProfile + flavors: + - nothing + - type: Sprite + state: mime + - type: Item + heldPrefix: mime + - type: SliceableFood + slice: FoodTartMimeSlice + +- type: entity + name: slice of mime tart + parent: FoodPieSliceBase + id: FoodTartMimeSlice + components: + - type: FlavorProfile + flavors: + - nothing + - type: Sprite + layers: + - state: mimetart-slice + - type: Item + heldPrefix: mime +# Tastes like nothing. + # No Slice - type: entity @@ -402,23 +449,10 @@ state: grape - type: Tag tags: - - Fruit + - Fruit - Pie # Tastes like tart, grape. -- type: entity - name: mime tart - parent: FoodPieBase - id: FoodTartMime - description: "\" \"" - components: - - type: FlavorProfile - flavors: - - nothing - - type: Sprite - state: mime -# Tastes like nothing. - - type: entity name: golden apple streusel tart parent: FoodPieBase @@ -432,7 +466,7 @@ state: gapple - type: Tag tags: - - Fruit + - Fruit - Pie # Tastes like tart, apple, expensive metal. diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/pie.rsi/bananapie-slice.png b/Resources/Textures/Objects/Consumable/Food/Baked/pie.rsi/bananapie-slice.png new file mode 100644 index 0000000000..9f047756ec Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/pie.rsi/bananapie-slice.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/pie.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/Baked/pie.rsi/meta.json index 3d0e47f870..ced8d58373 100644 --- a/Resources/Textures/Objects/Consumable/Food/Baked/pie.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Food/Baked/pie.rsi/meta.json @@ -1,94 +1,108 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "alpha-slice-filling" - }, - { - "name": "alpha-tart" - }, - { - "name": "amanita" - }, - { - "name": "apple" - }, - { - "name": "baklava" - }, - { - "name": "baklava-slice" - }, - { - "name": "berryclafoutis" - }, - { - "name": "cherry" - }, - { - "name": "cocolava" - }, - { - "name": "frosty" - }, - { - "name": "gapple" - }, - { - "name": "grape" - }, - { - "name": "happy" - }, - { - "name": "meat" - }, - { - "name": "mime" - }, - { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "plain" - }, - { - "name": "plain-slice" - }, - { - "name": "plate" - }, - { - "name": "plate-slice-shading" - }, - { - "name": "plate-small" - }, - { - "name": "plate-tart" - }, - { - "name": "plump" - }, - { - "name": "tin" - }, - { - "name": "whippedcream" - }, - { - "name": "xeno" - } - ] + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24, mime tart slice and banana cream pie slice from rosysyntax under under CC BY-SA 4.0", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "alpha-slice-filling" + }, + { + "name": "alpha-tart" + }, + { + "name": "amanita" + }, + { + "name": "apple" + }, + { + "name": "baklava" + }, + { + "name": "baklava-slice" + }, + { + "name": "bananapie-slice" + }, + { + "name": "berryclafoutis" + }, + { + "name": "cherry" + }, + { + "name": "cocolava" + }, + { + "name": "frosty" + }, + { + "name": "gapple" + }, + { + "name": "grape" + }, + { + "name": "happy" + }, + { + "name": "meat" + }, + { + "name": "mime" + }, + { + "name": "mimetart-slice" + }, + { + "name": "mime-inhand-right", + "directions": 4 + }, + { + "name": "mime-inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "plain" + }, + { + "name": "plain-slice" + }, + { + "name": "plate" + }, + { + "name": "plate-slice-shading" + }, + { + "name": "plate-small" + }, + { + "name": "plate-tart" + }, + { + "name": "plump" + }, + { + "name": "tin" + }, + { + "name": "whippedcream" + }, + { + "name": "xeno" + } + ] } diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/pie.rsi/mime-inhand-left.png b/Resources/Textures/Objects/Consumable/Food/Baked/pie.rsi/mime-inhand-left.png new file mode 100644 index 0000000000..93036128a3 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/pie.rsi/mime-inhand-left.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/pie.rsi/mime-inhand-right.png b/Resources/Textures/Objects/Consumable/Food/Baked/pie.rsi/mime-inhand-right.png new file mode 100644 index 0000000000..8e8307b00f Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/pie.rsi/mime-inhand-right.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/pie.rsi/mimetart-slice.png b/Resources/Textures/Objects/Consumable/Food/Baked/pie.rsi/mimetart-slice.png new file mode 100644 index 0000000000..3f64bd6f26 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/pie.rsi/mimetart-slice.png differ