Give mimes their french bread back (#40601)

* add the nutri-batard

* i missed this file smh

* add the proper accenting to "bâtard"

diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml b/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml
index b5b2fb90d84e7cd96d2a65aba83198bd551dc7d9..29f561c1b8670f8fe9d6bc9210c9ebd20786f253 100644 (file)
--- 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 bce7ace58af5a37f27bf9a0a5e1f65411519ee25..6edff6e98a8a3c4a5c94ac4a73bc420c5f6df7e4 100644 (file)
--- 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 (file)
index 0000000..d0ffbf4
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/batard-cotton-inhand-left.png differ

diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/batard-cotton-inhand-right.png b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/batard-cotton-inhand-right.png
new file mode 100644 (file)
index 0000000..ce48ffe
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/batard-cotton-inhand-right.png differ

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 (file)
index 0000000..a2b3f01
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/batard-cotton.png differ

diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/batard-inhand-left.png b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/batard-inhand-left.png
new file mode 100644 (file)
index 0000000..42794c2
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/batard-inhand-left.png differ

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 (file)
index 0000000..664a6cd
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/batard-inhand-right.png differ

diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/batard.png b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/batard.png
new file mode 100644 (file)
index 0000000..12ccfa8
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/batard.png differ

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 d9142f7cf190233b320d28ff06eb017c4489b6cb..6a74ec1684e4269b961bb4ed338bb5d097ebda05 100644 (file)
--- 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
+        }
+    ]
 }