Give mimes their french bread back (#40601)

* add the nutri-batard

* i missed this file smh

* add the proper accenting to "bâtard"
This commit is contained in:
SurrealShibe
2025-10-07 03:08:00 -07:00
committed by GitHub
parent ce7558f3d2
commit 84f994f296
9 changed files with 236 additions and 160 deletions

View File

@@ -213,7 +213,7 @@
- id: EmergencyOxygenTankFilled - id: EmergencyOxygenTankFilled
- id: EmergencyMedipen - id: EmergencyMedipen
- id: Flare - id: Flare
- id: FoodSnackNutribrick - id: FoodBreadNutriBatard
- id: DrinkWaterBottleFull - id: DrinkWaterBottleFull
- type: entity - type: entity
@@ -227,7 +227,7 @@
- id: EmergencyNitrogenTankFilled - id: EmergencyNitrogenTankFilled
- id: EmergencyMedipen - id: EmergencyMedipen
- id: Flare - id: Flare
- id: FoodSnackNutribrick - id: FoodBreadNutriBatard
- id: DrinkWaterBottleFull - id: DrinkWaterBottleFull
- type: Sprite - type: Sprite
layers: layers:
@@ -247,7 +247,7 @@
- id: EmergencyOxygenTankFilled - id: EmergencyOxygenTankFilled
- id: EmergencyMedipen - id: EmergencyMedipen
- id: Flare - id: Flare
- id: FoodSnackNutribrick - id: FoodBreadCottonNutriBatard
- id: DrinkWaterBottleFull - id: DrinkWaterBottleFull
- type: entity - type: entity

View File

@@ -731,7 +731,7 @@
name: crostini name: crostini
parent: FoodBreadSliceBase parent: FoodBreadSliceBase
id: FoodBreadBaguetteSlice id: FoodBreadBaguetteSlice
description: Bon ap-petite! description: Bon ap-pétite!
components: components:
- type: Sprite - type: Sprite
state: crostini state: crostini
@@ -753,7 +753,7 @@
parent: FoodBreadBaguetteSlice parent: FoodBreadBaguetteSlice
id: FoodBreadBaguetteCottonSlice id: FoodBreadBaguetteCottonSlice
name: cotton crostini name: cotton crostini
description: Bon az-zetite! description: Bon az-zétite!
components: components:
- type: Sprite - type: Sprite
state: crostini-cotton state: crostini-cotton
@@ -1001,3 +1001,57 @@
damage: damage:
groups: groups:
Brute: 1 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

Binary file not shown.

After

Width:  |  Height:  |  Size: 338 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 329 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 409 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 336 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 319 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 238 B

View File

@@ -1,158 +1,180 @@
{ {
"version": 1, "version": 1,
"license": "CC-BY-SA-3.0", "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", "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": { "size": {
"x": 32, "x": 32,
"y": 32 "y": 32
},
"states": [
{
"name": "alpha"
}, },
{ "states": [
"name": "alpha2" {
}, "name": "alpha"
{ },
"name": "alpha-filling" {
}, "name": "alpha2"
{ },
"name": "alpha-filling2" {
}, "name": "alpha-filling"
{ },
"name": "alpha-slice" {
}, "name": "alpha-filling2"
{ },
"name": "alpha-slice2" {
}, "name": "alpha-slice"
{ },
"name": "alpha-slice-filling" {
}, "name": "alpha-slice2"
{ },
"name": "alpha-slice2-filling" {
}, "name": "alpha-slice-filling"
{ },
"name": "baguette" {
}, "name": "alpha-slice2-filling"
{ },
"name": "baguette-equipped-BELT", {
"directions": 4 "name": "baguette"
}, },
{ {
"name": "baguette-inhand-left", "name": "baguette-equipped-BELT",
"directions": 4 "directions": 4
}, },
{ {
"name": "baguette-inhand-right", "name": "baguette-inhand-left",
"directions": 4 "directions": 4
}, },
{ {
"name": "baguette-cotton" "name": "baguette-inhand-right",
}, "directions": 4
{ },
"name": "baguette-cotton-equipped-BELT", {
"directions": 4 "name": "baguette-cotton"
}, },
{ {
"name": "baguette-cotton-inhand-left", "name": "baguette-cotton-equipped-BELT",
"directions": 4 "directions": 4
}, },
{ {
"name": "baguette-cotton-inhand-right", "name": "baguette-cotton-inhand-left",
"directions": 4 "directions": 4
}, },
{ {
"name": "banana" "name": "baguette-cotton-inhand-right",
}, "directions": 4
{ },
"name": "banana-slice" {
}, "name": "banana"
{ },
"name": "buttered-toast" {
}, "name": "banana-slice"
{ },
"name": "cornbread" {
}, "name": "buttered-toast"
{ },
"name": "cornbread-slice" {
}, "name": "cornbread"
{ },
"name": "creamcheese" {
}, "name": "cornbread-slice"
{ },
"name": "creamcheese-slice" {
}, "name": "creamcheese"
{ },
"name": "crostini" {
}, "name": "creamcheese-slice"
{ },
"name": "crostini-cotton" {
}, "name": "crostini"
{ },
"name": "cotton" {
}, "name": "crostini-cotton"
{ },
"name": "cotton-slice" {
}, "name": "cotton"
{ },
"name": "french-toast" {
}, "name": "cotton-slice"
{ },
"name": "garlic-slice" {
}, "name": "french-toast"
{ },
"name": "jelly-toast" {
}, "name": "garlic-slice"
{ },
"name": "meat" {
}, "name": "jelly-toast"
{ },
"name": "meat-slice" {
}, "name": "meat"
{ },
"name": "mimana" {
}, "name": "meat-slice"
{ },
"name": "mimana-slice" {
}, "name": "mimana"
{ },
"name": "moldy-slice" {
}, "name": "mimana-slice"
{ },
"name": "plain" {
}, "name": "moldy-slice"
{ },
"name": "plain-slice" {
}, "name": "plain"
{ },
"name": "plate" {
}, "name": "plain-slice"
{ },
"name": "sausage" {
}, "name": "plate"
{ },
"name": "sausage-slice" {
}, "name": "sausage"
{ },
"name": "spidermeat" {
}, "name": "sausage-slice"
{ },
"name": "spidermeat-slice" {
}, "name": "spidermeat"
{ },
"name": "tofu" {
}, "name": "spidermeat-slice"
{ },
"name": "tofu-slice" {
}, "name": "tofu"
{ },
"name": "two-slice" {
}, "name": "tofu-slice"
{ },
"name": "xenomeat" {
}, "name": "two-slice"
{ },
"name": "xenomeat-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
}
]
} }