inhands for CAKE + sprite fixes (#37819)

caek
This commit is contained in:
mubururu_
2025-05-27 18:47:58 -05:00
committed by GitHub
parent a65c43c866
commit 7c9a031f99
46 changed files with 639 additions and 11 deletions

View File

@@ -85,6 +85,16 @@
tags:
- Cake
- Fruit
- type: Item
inhandVisuals:
left:
- state: plain-inhand-left
- state: alpha-filling-inhand-left
color: blue
right:
- state: plain-inhand-right
- state: alpha-filling-inhand-right
color: blue
- type: entity
name: blueberry slice
@@ -102,6 +112,16 @@
- Cake
- Fruit
- Slice
- type: Item
inhandVisuals:
left:
- state: plain-slice-inhand-left
- state: alpha-slice-filling-inhand-left
color: blue
right:
- state: plain-slice-inhand-right
- state: alpha-slice-filling-inhand-right
color: blue
# Cake
@@ -124,6 +144,8 @@
Quantity: 20
- ReagentId: Vitamin
Quantity: 5
- type: Item
heldPrefix: plain
# Added in type lines above
@@ -143,6 +165,8 @@
Quantity: 4
- ReagentId: Vitamin
Quantity: 1
- type: Item
heldPrefix: plain-slice
# Tastes like sweetness, cake.
- type: entity
@@ -170,6 +194,18 @@
tags:
- Cake
- Vegetable
- type: Item
inhandVisuals:
left:
- state: plain-inhand-left
color: "#f8e0af"
- state: alpha-filling-inhand-left
color: "#ffbd2f"
right:
- state: plain-inhand-right
color: "#f8e0af"
- state: alpha-filling-inhand-right
color: "#ffbd2f"
- type: entity
name: slice of carrot cake
@@ -195,6 +231,18 @@
- Cake
- Vegetable
- Slice
- type: Item
inhandVisuals:
left:
- state: plain-slice-inhand-left
color: "#f8e0af"
- state: alpha-slice-filling-inhand-left
color: "#ffbd2f"
right:
- state: plain-slice-inhand-right
color: "#f8e0af"
- state: alpha-slice-filling-inhand-right
color: "#ffbd2f"
# Tastes like sweetness, cake, carrot.
@@ -212,6 +260,18 @@
tags:
- Cake
- Meat
- type: Item
inhandVisuals:
left:
- state: alpha-inhand-left
color: "#ff5b7a"
- state: alpha-filling-inhand-left
color: "#ff5b7a"
right:
- state: alpha-inhand-right
color: "#ff5b7a"
- state: alpha-filling-inhand-right
color: "#ff5b7a"
- type: entity
name: slice of brain cake
@@ -226,6 +286,18 @@
- Cake
- Meat
- Slice
- type: Item
inhandVisuals:
left:
- state: alpha-slice-inhand-left
color: "#ff5b7a"
- state: alpha-slice-filling-inhand-left
color: "#ff5b7a"
right:
- state: alpha-slice-inhand-right
color: "#ff5b7a"
- state: alpha-slice-filling-inhand-right
color: "#ff5b7a"
# Tastes like sweetness, cake, brains.
- type: entity
@@ -238,6 +310,16 @@
state: cheese
- type: SliceableFood
slice: FoodCakeCheeseSlice
- type: Item
inhandVisuals:
left:
- state: plain-inhand-left
- state: alpha-filling-inhand-left
color: "#ffffff"
right:
- state: plain-inhand-right
- state: alpha-filling-inhand-right
color: "#ffffff"
- type: entity
name: slice of cheese cake
@@ -247,6 +329,16 @@
components:
- type: Sprite
state: cheese-slice
- type: Item
inhandVisuals:
left:
- state: plain-slice-inhand-left
- state: alpha-filling-inhand-left
color: "#ffffff"
right:
- state: plain-inhand-right
- state: alpha-slice-filling-inhand-right
color: "#ffffff"
# Tastes like sweetness, cream cheese.
- type: entity
@@ -256,13 +348,26 @@
description: A cake with added orange.
components:
- type: Sprite
state: orange
layers:
- state: plain
- state: alpha-filling
color: "#ff9900"
- type: SliceableFood
slice: FoodCakeOrangeSlice
- type: Tag
tags:
- Cake
- Fruit
- type: Item
inhandVisuals:
left:
- state: plain-inhand-left
- state: alpha-filling-inhand-left
color: "#ff9900"
right:
- state: plain-inhand-right
- state: alpha-filling-inhand-right
color: "#ff9900"
- type: entity
name: slice of orange cake
@@ -270,12 +375,25 @@
id: FoodCakeOrangeSlice
components:
- type: Sprite
state: orange-slice
layers:
- state: plain-slice
- state: alpha-slice-filling
color: "#ff9900"
- type: Tag
tags:
- Cake
- Fruit
- Slice
- type: Item
inhandVisuals:
left:
- state: plain-slice-inhand-left
- state: alpha-slice-filling-inhand-left
color: "#ff9900"
right:
- state: plain-slice-inhand-right
- state: alpha-slice-filling-inhand-right
color: "#ff9900"
# Tastes like sweetness, cake, oranges.
- type: entity
@@ -285,13 +403,26 @@
description: A cake with added lime.
components:
- type: Sprite
state: lime
layers:
- state: plain
- state: alpha-filling
color: "#00ff00"
- type: SliceableFood
slice: FoodCakeLimeSlice
- type: Tag
tags:
- Cake
- Fruit
- type: Item
inhandVisuals:
left:
- state: plain-inhand-left
- state: alpha-filling-inhand-left
color: "#00ff00"
right:
- state: plain-inhand-right
- state: alpha-filling-inhand-right
color: "#00ff00"
- type: entity
name: slice of lime cake
@@ -299,12 +430,25 @@
id: FoodCakeLimeSlice
components:
- type: Sprite
state: lime-slice
layers:
- state: plain-slice
- state: alpha-slice-filling
color: "#00ff00"
- type: Tag
tags:
- Cake
- Fruit
- Slice
- type: Item
inhandVisuals:
left:
- state: plain-slice-inhand-left
- state: alpha-slice-filling-inhand-left
color: "#00ff00"
right:
- state: plain-slice-inhand-right
- state: alpha-slice-filling-inhand-right
color: "#00ff00"
# Tastes like sweetness, cake, limes.
- type: entity
@@ -314,13 +458,26 @@
description: A cake with added lemon.
components:
- type: Sprite
state: lemon
layers:
- state: plain
- state: alpha-filling
color: "#ffff00"
- type: SliceableFood
slice: FoodCakeLemonSlice
- type: Tag
tags:
- Cake
- Fruit
- type: Item
inhandVisuals:
left:
- state: plain-inhand-left
- state: alpha-filling-inhand-left
color: "#ffff00"
right:
- state: plain-inhand-right
- state: alpha-filling-inhand-right
color: "#ffff00"
- type: entity
name: slice of lemon cake
@@ -328,12 +485,25 @@
id: FoodCakeLemonSlice
components:
- type: Sprite
state: lemon-slice
layers:
- state: plain-slice
- state: alpha-slice-filling
color: "#ffff00"
- type: Tag
tags:
- Cake
- Fruit
- Slice
- type: Item
inhandVisuals:
left:
- state: plain-slice-inhand-left
- state: alpha-slice-filling-inhand-left
color: "#ffff00"
right:
- state: plain-slice-inhand-right
- state: alpha-slice-filling-inhand-right
color: "#ffff00"
# Tastes like sweetness, cake, lemons.
- type: entity
@@ -365,6 +535,8 @@
tags:
- Cake
- Fruit
- type: Item
heldPrefix: lemoon
- type: entity
name: shard of lemoon cake
@@ -394,6 +566,18 @@
- Cake
- Fruit
- Slice
- type: Item
inhandVisuals:
left:
- state: alpha-slice-inhand-left
color: "#fffead"
- state: alpha-slice-filling-inhand-left
color: "#fffead"
right:
- state: alpha-slice-inhand-right
color: "#fffead"
- state: alpha-slice-filling-inhand-right
color: "#fffead"
- type: entity
name: chocolate cake
@@ -402,7 +586,9 @@
description: A cake with added chocolate.
components:
- type: Sprite
state: chocolate
layers:
- state: alpha
color: "#ba672e"
- type: SliceableFood
slice: FoodCakeChocolateSlice
- type: SolutionContainerManager
@@ -416,6 +602,14 @@
Quantity: 5
- ReagentId: Vitamin
Quantity: 5
- type: Item
inhandVisuals:
left:
- state: alpha-inhand-left
color: "#ba672e"
right:
- state: alpha-inhand-right
color: "#ba672e"
- type: entity
name: slice of chocolate cake
@@ -423,7 +617,9 @@
id: FoodCakeChocolateSlice
components:
- type: Sprite
state: chocolate-slice
layers:
- state: alpha-slice
color: "#ba672e"
- type: SolutionContainerManager
solutions:
food:
@@ -435,6 +631,14 @@
Quantity: 1
- ReagentId: Vitamin
Quantity: 2
- type: Item
inhandVisuals:
left:
- state: alpha-slice-inhand-left
color: "#ba672e"
right:
- state: alpha-slice-inhand-right
color: "#ba672e"
# Tastes like sweetness, cake, chocolate.
- type: entity
@@ -444,13 +648,26 @@
description: A cake centred with apple.
components:
- type: Sprite
state: apple
layers:
- state: plain
- state: alpha-filling
color: "#ff4300"
- type: SliceableFood
slice: FoodCakeAppleSlice
- type: Tag
tags:
- Cake
- Fruit
- type: Item
inhandVisuals:
left:
- state: plain-inhand-left
- state: alpha-filling-inhand-left
color: "#ff4300"
right:
- state: plain-inhand-right
- state: alpha-filling-inhand-right
color: "#ff4300"
- type: entity
name: slice of apple cake
@@ -459,12 +676,26 @@
description: A slice of heavenly cake.
components:
- type: Sprite
state: apple-slice
layers:
- state: plain-slice
- state: alpha-slice-filling
color: "#ff4300"
- type: Tag
tags:
- Cake
- Fruit
- Slice
- type: Item
inhandVisuals:
left:
- state: plain-slice-inhand-left
- state: alpha-slice-filling-inhand-left
color: "#ff4300"
right:
- state: plain-slice-inhand-right
- state: alpha-slice-filling-inhand-right
color: "#ff4300"
# Tastes like sweetness, cake, slime.
- type: entity
@@ -481,6 +712,18 @@
tags:
- Cake
- Meat
- type: Item
inhandVisuals:
left:
- state: alpha-inhand-left
color: "#00ffff"
- state: alpha-filling-inhand-left
color: "#00ffff"
right:
- state: alpha-inhand-right
color: "#00ffff"
- state: alpha-filling-inhand-right
color: "#00ffff"
- type: entity
name: slice of slime cake
@@ -495,6 +738,18 @@
- Cake
- Meat
- Slice
- type: Item
inhandVisuals:
left:
- state: alpha-slice-inhand-left
color: "#00ffff"
- state: alpha-slice-filling-inhand-left
color: "#00ffff"
right:
- state: alpha-slice-inhand-right
color: "#00ffff"
- state: alpha-slice-filling-inhand-right
color: "#00ffff"
# Tastes like sweetness, cake, slime.
- type: entity
@@ -520,6 +775,16 @@
tags:
- Cake
- Fruit
- type: Item
inhandVisuals:
left:
- state: plain-inhand-left
- state: alpha-filling-inhand-left
color: "#ffffff"
right:
- state: plain-inhand-right
- state: alpha-filling-inhand-right
color: "#ffffff"
- type: entity
name: slice of pumpkin-spice cake
@@ -543,6 +808,16 @@
- Cake
- Fruit
- Slice
- type: Item
inhandVisuals:
left:
- state: plain-slice-inhand-left
- state: alpha-slice-filling-inhand-left
color: "#ffffff"
right:
- state: plain-slice-inhand-right
- state: alpha-slice-filling-inhand-right
color: "#ffffff"
# Tastes like sweetness, cake, pumpkin.
- type: entity
@@ -559,6 +834,14 @@
tags:
- Cake
- Fruit
- type: Item
inhandVisuals:
left:
- state: alpha-inhand-left
color: "#ab5012"
right:
- state: alpha-inhand-right
color: "#ab5012"
- type: entity
name: slice of christmas cake
@@ -572,6 +855,14 @@
- Cake
- Fruit
- Slice
- type: Item
inhandVisuals:
left:
- state: alpha-slice-inhand-left
color: "#ab5012"
right:
- state: alpha-slice-inhand-right
color: "#ab5012"
# Tastes like sweetness, cake, christmas.
- type: entity
@@ -584,6 +875,8 @@
state: birthday
- type: SliceableFood
slice: FoodCakeBirthdaySlice
- type: Item
heldPrefix: birthday
- type: entity
name: slice of birthday cake
@@ -593,6 +886,8 @@
components:
- type: Sprite
state: birthday-slice
- type: Item
heldPrefix: birthday-slice
# Tastes like sweetness, cake, christmas.
- type: entity
@@ -616,6 +911,8 @@
Quantity: 5
- ReagentId: Sugar
Quantity: 15
- type: Item
heldPrefix: vanilla
- type: entity
name: slice of vanilla cake
@@ -636,6 +933,14 @@
Quantity: 2
- ReagentId: Sugar
Quantity: 5
- type: Item
inhandVisuals:
left:
- state: plain-slice-inhand-left
- state: alpha-slice-filling-inhand-left
right:
- state: plain-slice-inhand-right
- state: alpha-slice-filling-inhand-right
# Tastes like sweetness, cake, vanilla.
- type: entity
@@ -659,6 +964,8 @@
Quantity: 5
- ReagentId: Sugar
Quantity: 15
- type: Item
heldPrefix: clown
- type: entity
name: slice of clown cake
@@ -679,6 +986,8 @@
Quantity: 1
- ReagentId: Sugar
Quantity: 5
- type: Item
heldPrefix: clown-slice
# Tastes like sweetness, cake, clown.
- type: entity
@@ -702,6 +1011,8 @@
Quantity: 5
- ReagentId: PolypyryliumOligomers
Quantity: 15
- type: Item
heldPrefix: trumpet
- type: entity
name: slice of spaceman's cake
@@ -722,6 +1033,8 @@
Quantity: 1
- ReagentId: PolypyryliumOligomers
Quantity: 3
- type: Item
heldPrefix: trumpet-slice
# Tastes like sweetness, cake, jam.
- type: entity
@@ -839,6 +1152,7 @@
transferAmount: 12
- type: Item
size: Normal
heldPrefix: suppermatter
- type: PointLight
color: "#FFFF00"
radius: 2
@@ -874,3 +1188,5 @@
entries:
Taco: Suppermatter
Burger: SuppermatterBurger
- type: Item
heldPrefix: suppermatter-shard

Binary file not shown.

After

Width:  |  Height:  |  Size: 197 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 201 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 430 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 434 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 144 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 145 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 250 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 267 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 539 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 893 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 378 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 407 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 245 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 245 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 399 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 680 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 407 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 408 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 234 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 239 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 466 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 854 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 491 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 865 B

View File

@@ -1 +1,313 @@
{"version": 1, "license": "CC-BY-SA-3.0", "copyright": "Taken from tgstation and modified by Swept at https://github.com/tgstation/tgstation/commit/40d75cc340c63582fb66ce15bf75a36115f6bdaa", "size": {"x": 32, "y": 32}, "states": [{"name": "alpha"}, {"name": "alpha-filling"}, {"name": "alpha-slice"}, {"name": "alpha-slice-filling"}, {"name": "apple"}, {"name": "apple-slice"}, {"name": "birthday"}, {"name": "birthday-slice"}, {"name": "brain"}, {"name": "brain-large"}, {"name": "brain-slice"}, {"name": "carrot"}, {"name": "carrot-slice"}, {"name": "cheese"}, {"name": "cheese-slice"}, {"name": "chocolate"}, {"name": "chocolate-slice"}, {"name": "lemon"}, {"name": "lemon-slice"}, {"name": "lime"}, {"name": "lime-slice"}, {"name": "orange"}, {"name": "orange-slice"}, {"name": "plain"}, {"name": "plain-slice"}, {"name": "clown"}, {"name": "clown-slice"}, {"name": "plate"}, {"name": "plate-small"}, {"name": "plate-plastic"}, {"name": "plate-small-plastic"}, {"name": "plate-slice-shading"}, {"name": "pumpkinspice"}, {"name": "pumpkinspice-slice"}, {"name": "slime"}, {"name": "slime-slice"}, {"name": "christmas"}, {"name": "christmas-slice"}, {"name": "vanilla"}, {"name": "vanilla-slice"}, {"name": "trumpet"}, {"name": "trumpet-slice"}, {"name": "suppermatter", "directions": 1, "delays": [[1.0]]}, {"name": "suppermatter-shard", "directions": 1, "delays": [[1.0]]},{"name": "lemoon","delays": [ [ 0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15 ] ]},{"name": "lemoon-slice"}]}
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation and modified by Swept at https://github.com/tgstation/tgstation/commit/40d75cc340c63582fb66ce15bf75a36115f6bdaa, inhands by mubururu_ (github)",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "alpha"
},
{
"name": "alpha-inhand-left",
"directions": 4
},
{
"name": "alpha-inhand-right",
"directions": 4
},
{
"name": "alpha-filling"
},
{
"name": "alpha-filling-inhand-left",
"directions": 4
},
{
"name": "alpha-filling-inhand-right",
"directions": 4
},
{
"name": "alpha-slice"
},
{
"name": "alpha-slice-inhand-left",
"directions": 4
},
{
"name": "alpha-slice-inhand-right",
"directions": 4
},
{
"name": "alpha-slice-filling"
},
{
"name": "alpha-slice-filling-inhand-left",
"directions": 4
},
{
"name": "alpha-slice-filling-inhand-right",
"directions": 4
},
{
"name": "birthday"
},
{
"name": "birthday-inhand-left",
"directions": 4
},
{
"name": "birthday-inhand-right",
"directions": 4
},
{
"name": "birthday-slice"
},
{
"name": "birthday-slice-inhand-left",
"directions": 4
},
{
"name": "birthday-slice-inhand-right",
"directions": 4
},
{
"name": "brain"
},
{
"name": "brain-large"
},
{
"name": "brain-slice"
},
{
"name": "carrot"
},
{
"name": "carrot-slice"
},
{
"name": "cheese"
},
{
"name": "cheese-slice"
},
{
"name": "plain"
},
{
"name": "plain-inhand-left",
"directions": 4
},
{
"name": "plain-inhand-right",
"directions": 4
},
{
"name": "plain-slice"
},
{
"name": "plain-slice-inhand-left",
"directions": 4
},
{
"name": "plain-slice-inhand-right",
"directions": 4
},
{
"name": "clown"
},
{
"name": "clown-inhand-left",
"directions": 4
},
{
"name": "clown-inhand-right",
"directions": 4
},
{
"name": "clown-slice"
},
{
"name": "clown-slice-inhand-left",
"directions": 4
},
{
"name": "clown-slice-inhand-right",
"directions": 4
},
{
"name": "plate"
},
{
"name": "plate-small"
},
{
"name": "plate-plastic"
},
{
"name": "plate-small-plastic"
},
{
"name": "plate-slice-shading"
},
{
"name": "pumpkinspice"
},
{
"name": "pumpkinspice-slice"
},
{
"name": "slime"
},
{
"name": "slime-slice"
},
{
"name": "christmas"
},
{
"name": "christmas-slice"
},
{
"name": "vanilla"
},
{
"name": "vanilla-inhand-left",
"directions": 4
},
{
"name": "vanilla-inhand-right",
"directions": 4
},
{
"name": "vanilla-slice"
},
{
"name": "trumpet"
},
{
"name": "trumpet-inhand-left",
"directions": 4
},
{
"name": "trumpet-inhand-right",
"directions": 4
},
{
"name": "trumpet-slice"
},
{
"name": "trumpet-slice-inhand-left",
"directions": 4
},
{
"name": "trumpet-slice-inhand-right",
"directions": 4
},
{
"name": "suppermatter"
},
{
"name": "suppermatter-inhand-left",
"directions": 4
},
{
"name": "suppermatter-inhand-right",
"directions": 4
},
{
"name": "suppermatter-shard"
},
{
"name": "suppermatter-shard-inhand-left",
"directions": 4
},
{
"name": "suppermatter-shard-inhand-right",
"directions": 4
},
{
"name": "lemoon",
"delays": [
[
0.15,
0.15,
0.15,
0.15,
0.15,
0.15,
0.15,
0.15
]
]
},
{
"name": "lemoon-inhand-left",
"directions": 4,
"delays": [
[
0.20,
0.20,
0.20,
0.20
],
[
0.20,
0.20,
0.20,
0.20
],
[
0.20,
0.20,
0.20,
0.20
],
[
0.20,
0.20,
0.20,
0.20
]
]
},
{
"name": "lemoon-inhand-right",
"directions": 4,
"delays": [
[
0.20,
0.20,
0.20,
0.20
],
[
0.20,
0.20,
0.20,
0.20
],
[
0.20,
0.20,
0.20,
0.20
],
[
0.20,
0.20,
0.20,
0.20
]
]
},
{
"name": "lemoon-slice"
}
]
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 484 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 829 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 465 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 456 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 269 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 281 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 538 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 561 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 289 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 277 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 455 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 455 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 252 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 258 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 433 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 435 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 235 B

After

Width:  |  Height:  |  Size: 526 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 547 B

After

Width:  |  Height:  |  Size: 708 B