From 84f994f296e7a88bcbf10dbce46669e61cd2ffc4 Mon Sep 17 00:00:00 2001 From: SurrealShibe <77357653+SurrealShibe@users.noreply.github.com> Date: Tue, 7 Oct 2025 03:08:00 -0700 Subject: [PATCH] Give mimes their french bread back (#40601) MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit * add the nutri-batard * i missed this file smh * add the proper accenting to "bâtard" --- .../Catalog/Fills/Boxes/emergency.yml | 6 +- .../Objects/Consumable/Food/Baked/bread.yml | 58 ++- .../bread.rsi/batard-cotton-inhand-left.png | Bin 0 -> 338 bytes .../bread.rsi/batard-cotton-inhand-right.png | Bin 0 -> 329 bytes .../Food/Baked/bread.rsi/batard-cotton.png | Bin 0 -> 409 bytes .../Baked/bread.rsi/batard-inhand-left.png | Bin 0 -> 336 bytes .../Baked/bread.rsi/batard-inhand-right.png | Bin 0 -> 319 bytes .../Food/Baked/bread.rsi/batard.png | Bin 0 -> 238 bytes .../Consumable/Food/Baked/bread.rsi/meta.json | 334 ++++++++++-------- 9 files changed, 237 insertions(+), 161 deletions(-) create mode 100644 Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/batard-cotton-inhand-left.png create mode 100644 Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/batard-cotton-inhand-right.png create mode 100644 Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/batard-cotton.png create mode 100644 Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/batard-inhand-left.png create mode 100644 Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/batard-inhand-right.png create mode 100644 Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/batard.png diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml b/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml index b5b2fb90d8..29f561c1b8 100644 --- a/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml +++ b/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml @@ -213,7 +213,7 @@ - id: EmergencyOxygenTankFilled - id: EmergencyMedipen - id: Flare - - id: FoodSnackNutribrick + - id: FoodBreadNutriBatard - id: DrinkWaterBottleFull - type: entity @@ -227,7 +227,7 @@ - id: EmergencyNitrogenTankFilled - id: EmergencyMedipen - id: Flare - - id: FoodSnackNutribrick + - id: FoodBreadNutriBatard - id: DrinkWaterBottleFull - type: Sprite layers: @@ -247,7 +247,7 @@ - id: EmergencyOxygenTankFilled - id: EmergencyMedipen - id: Flare - - id: FoodSnackNutribrick + - id: FoodBreadCottonNutriBatard - id: DrinkWaterBottleFull - type: entity diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml index bce7ace58a..6edff6e98a 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml @@ -731,7 +731,7 @@ name: crostini parent: FoodBreadSliceBase id: FoodBreadBaguetteSlice - description: Bon ap-petite! + description: Bon ap-pétite! components: - type: Sprite state: crostini @@ -753,7 +753,7 @@ parent: FoodBreadBaguetteSlice id: FoodBreadBaguetteCottonSlice name: cotton crostini - description: Bon az-zetite! + description: Bon az-zétite! components: - type: Sprite state: crostini-cotton @@ -1001,3 +1001,57 @@ damage: groups: Brute: 1 + +- type: entity + parent: FoodBreadBase + id: FoodBreadNutriBatard + name: nutri-bâtard + description: bon 'pétite! + components: + - type: Sprite + sprite: Objects/Consumable/Food/Baked/bread.rsi + state: batard + - type: Item + size: Small + storedOffset: -1,0 + heldPrefix: batard + - type: Tag + tags: + - ReptilianFood + - type: FlavorProfile + flavors: + - nutribrick + - peppery + - salty + - bread + +- type: entity + parent: FoodBreadNutriBatard + id: FoodBreadCottonNutriBatard + name: cotton nutri-bâtard + description: bon 'pétite! + components: + - type: Edible + requiresSpecialDigestion: true + - type: Sprite + sprite: Objects/Consumable/Food/Baked/bread.rsi + state: batard-cotton + - type: FlavorProfile + flavors: + - peppery + - salty + - bread + - type: Tag + tags: + - ClothMade + - type: Item + size: Small + storedOffset: -1,0 + heldPrefix: batard-cotton + - type: SolutionContainerManager + solutions: + food: + maxVol: 45 + reagents: + - ReagentId: Fiber + Quantity: 40 diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/batard-cotton-inhand-left.png b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/batard-cotton-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..d0ffbf40198b1391debeaefcbb05798b84fe08a8 GIT binary patch literal 338 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zc|2VlLn`LH zy``9U*g>H6;q+CLd~3Sy96EF1LeNqfm8W4l9M4bS7IAY--Ra7`_>h;H*{!B)flQb8 zb&CA_&u0*KeqGy{$v{IH7-r0ET^$fT-E&fx&E?OpXRpoM!k)fS>HL;B-K(adMb~;$ zvJa${M|?TFqW`@9*TXNgs*B8hb6*?XJ)5}L=d(lG?C!i}rEETCyPHcn_U*T6HC0@~ zIC-1i<@)E2_C2@W^=~s~1X}|n&V-$i+n>GavfGKhYLhLy6XJVIeWzYqy|l}wc>2Bv zr<86;7t9mv*ik!kGe`fn;J;d*d~W|WeDhr0{_AOxzn9jP&Ewti^?RE9nIGQFPM;aK hKRKZUG&I3)ALF#O8GNP-vx-3$dAjgn~l`J>(SULUbk&lvq@6AvBOUhi&e?Bx&` zW)-_m>(r^AuhKnZqB(cX^4rD#X47>azK;)m{hKaoKlrt=zC7l95BE1iM%PH*O`j%h zxjFahpN$~%!QjJ%T~AZ1^A^1HYi(TrwCsLm&Ek6x)N9Z3wluCkYP0Fmue_-ZcF))@ z{durAZh7`&v)P9aTu&?CcF%U-@%dN$d{+D^$~(}Rw{@!E6!~Ajqz#_zWCR-f;3eB4 V&TKx{2q$NdC7!N+F6*2UngChnj3xj8 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/batard-cotton.png b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/batard-cotton.png new file mode 100644 index 0000000000000000000000000000000000000000..a2b3f0162f567f52db3ad4101d62ed56dd49d7ce GIT binary patch literal 409 zcmV;K0cQS*P)Px$Q%OWYR9J=Wls`*CQ5c6GHIVKQ8V%A7AqQ~~8Vb4yQHxTvHQaBYw6rwnX0-MN z?hrIYeuV-X0|%q6L4yPZ=?qdAjNlG(8bqrhxaZo|dA4&7ywC5v=MQK!8qI$v^jC!( z+md1!2H^Cj;k)k40UXgiCKA5nbUs z#9UB$CT+5ljnlcipznE5I3rar11_TLzg9SiJYT7@c6<&%DiOnI)`-{33^$AP22!b> z(h)eeB@Yj>06Zr5F*Dn|U6!Wns_h4esL0ogC5){j=AUnQZ{PD8U0``*mydQMkQ~1q zaBNE!ax0_~v0r!Idg>#FVI?^#mvDTxE{3Sl2aInmcfC;{xl#bp6+mJz%ewChcF1&NEBinNx1;n|?s2>|_bYwC!`Fh2!>cz5cA~6FKS9 zBdK6MsZA=ey#659gTV$Tz3M+3!)KZwxt47tnJ##yyg7OOrhazQub)b9lt-iro{|1A zL-50nT9BOdg)5$iQ(u4ky!pn`tQ|Rb<8SrbrZLz3u3pWbrjyy=?eIwd&Ss8pH&uW} a{|Pr|F-ltII&EzO$RbZyKbLh*2~7YiIg394 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/batard-inhand-right.png b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/batard-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..664a6cda2b912c0efef6a23b1c2bc00f881af5f8 GIT binary patch literal 319 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|etNn%hE&XX zd&`io$v~p*A-}m2C*R#3^ABu$r!Qt!F8^Rr#KacEak-(ff9Sq0kWn4rbjY4IBUezkfz$>zz9>({sZOnhfp!u_^UQU143VylGj6 z@WHUKZncJ(tFt_XJKn{q?qpqYHRu*w!1?k!q6@yrY&grh!$a=RXUBwU`(yXq|9+G< YKhVW^zrgeScc5Jip00i_>zopr09JHg)&Kwi literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/meta.json index d9142f7cf1..6a74ec1684 100644 --- a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/meta.json @@ -1,158 +1,180 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation and modified by potato1234x at https://github.com/tgstation/tgstation/commit/0631fe5bde73a68b4c12bdfa633c30b2cee442d5. Crostini created by Github user deathride58, baguette taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7ffd61b6fa6a6183daa8900f9a490f46f7a81955, cotton made by mlexf (discord 1143460554963427380). Cotton baguette and crostini variants by JuneSzalkowska", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "alpha" - }, - { - "name": "alpha2" - }, - { - "name": "alpha-filling" - }, - { - "name": "alpha-filling2" - }, - { - "name": "alpha-slice" - }, - { - "name": "alpha-slice2" - }, - { - "name": "alpha-slice-filling" - }, - { - "name": "alpha-slice2-filling" - }, - { - "name": "baguette" - }, - { - "name": "baguette-equipped-BELT", - "directions": 4 - }, - { - "name": "baguette-inhand-left", - "directions": 4 - }, - { - "name": "baguette-inhand-right", - "directions": 4 - }, - { - "name": "baguette-cotton" - }, - { - "name": "baguette-cotton-equipped-BELT", - "directions": 4 - }, - { - "name": "baguette-cotton-inhand-left", - "directions": 4 - }, - { - "name": "baguette-cotton-inhand-right", - "directions": 4 - }, - { - "name": "banana" - }, - { - "name": "banana-slice" - }, - { - "name": "buttered-toast" - }, - { - "name": "cornbread" - }, - { - "name": "cornbread-slice" - }, - { - "name": "creamcheese" - }, - { - "name": "creamcheese-slice" - }, - { - "name": "crostini" - }, - { - "name": "crostini-cotton" - }, - { - "name": "cotton" - }, - { - "name": "cotton-slice" - }, - { - "name": "french-toast" - }, - { - "name": "garlic-slice" - }, - { - "name": "jelly-toast" - }, - { - "name": "meat" - }, - { - "name": "meat-slice" - }, - { - "name": "mimana" - }, - { - "name": "mimana-slice" - }, - { - "name": "moldy-slice" - }, - { - "name": "plain" - }, - { - "name": "plain-slice" - }, - { - "name": "plate" - }, - { - "name": "sausage" - }, - { - "name": "sausage-slice" - }, - { - "name": "spidermeat" - }, - { - "name": "spidermeat-slice" - }, - { - "name": "tofu" - }, - { - "name": "tofu-slice" - }, - { - "name": "two-slice" - }, - { - "name": "xenomeat" - }, - { - "name": "xenomeat-slice" - } - ] + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation and modified by potato1234x at https://github.com/tgstation/tgstation/commit/0631fe5bde73a68b4c12bdfa633c30b2cee442d5. Crostini created by Github user deathride58, baguette taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7ffd61b6fa6a6183daa8900f9a490f46f7a81955, cotton made by mlexf (discord 1143460554963427380). Cotton baguette and crostini variants by JuneSzalkowska. Batard by SurrealShibe (GitHub)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "alpha" + }, + { + "name": "alpha2" + }, + { + "name": "alpha-filling" + }, + { + "name": "alpha-filling2" + }, + { + "name": "alpha-slice" + }, + { + "name": "alpha-slice2" + }, + { + "name": "alpha-slice-filling" + }, + { + "name": "alpha-slice2-filling" + }, + { + "name": "baguette" + }, + { + "name": "baguette-equipped-BELT", + "directions": 4 + }, + { + "name": "baguette-inhand-left", + "directions": 4 + }, + { + "name": "baguette-inhand-right", + "directions": 4 + }, + { + "name": "baguette-cotton" + }, + { + "name": "baguette-cotton-equipped-BELT", + "directions": 4 + }, + { + "name": "baguette-cotton-inhand-left", + "directions": 4 + }, + { + "name": "baguette-cotton-inhand-right", + "directions": 4 + }, + { + "name": "banana" + }, + { + "name": "banana-slice" + }, + { + "name": "buttered-toast" + }, + { + "name": "cornbread" + }, + { + "name": "cornbread-slice" + }, + { + "name": "creamcheese" + }, + { + "name": "creamcheese-slice" + }, + { + "name": "crostini" + }, + { + "name": "crostini-cotton" + }, + { + "name": "cotton" + }, + { + "name": "cotton-slice" + }, + { + "name": "french-toast" + }, + { + "name": "garlic-slice" + }, + { + "name": "jelly-toast" + }, + { + "name": "meat" + }, + { + "name": "meat-slice" + }, + { + "name": "mimana" + }, + { + "name": "mimana-slice" + }, + { + "name": "moldy-slice" + }, + { + "name": "plain" + }, + { + "name": "plain-slice" + }, + { + "name": "plate" + }, + { + "name": "sausage" + }, + { + "name": "sausage-slice" + }, + { + "name": "spidermeat" + }, + { + "name": "spidermeat-slice" + }, + { + "name": "tofu" + }, + { + "name": "tofu-slice" + }, + { + "name": "two-slice" + }, + { + "name": "xenomeat" + }, + { + "name": "xenomeat-slice" + }, + { + "name": "batard" + }, + { + "name": "batard-inhand-left", + "directions": 4 + }, + { + "name": "batard-inhand-right", + "directions": 4 + }, + { + "name": "batard-cotton" + }, + { + "name": "batard-cotton-inhand-left", + "directions": 4 + }, + { + "name": "batard-cotton-inhand-right", + "directions": 4 + } + ] } -- 2.51.2