Sprites for drinks without sprite (attempt 2) (#27227)

* A beer can and a wine can

* fix wrong file locations


---------

Signed-off-by: c4llv07e <kseandi@gmail.com>
Co-authored-by: c4llv07e <kseandi@gmail.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
This commit is contained in:
RumiTiger
2024-04-28 01:43:45 -03:00
committed by GitHub
parent f88b6f6154
commit f5b8b5fbdc
130 changed files with 579 additions and 37 deletions

View File

@@ -346,7 +346,7 @@
metamorphicSprite:
sprite: Objects/Consumable/Drinks/tequillaglass.rsi
state: icon_empty
metamorphicMaxFillLevels: 4
metamorphicMaxFillLevels: 3
metamorphicFillBaseName: fill-
metamorphicChangeColor: false
metabolisms:
@@ -1289,6 +1289,12 @@
physicalDesc: reagent-physical-desc-strong-smelling
flavor: moonshine
color: "#d1d7d155"
metamorphicSprite:
sprite: Objects/Consumable/Drinks/moonshineglass.rsi
state: icon_empty
metamorphicMaxFillLevels: 6
metamorphicFillBaseName: fill-
metamorphicChangeColor: false
metabolisms:
Drink:
effects:

View File

@@ -15,6 +15,12 @@
- !type:AdjustReagent
reagent: Theobromine
amount: 0.05
metamorphicSprite:
sprite: Objects/Consumable/Drinks/coffeeglass.rsi
state: icon_empty
metamorphicMaxFillLevels: 4
metamorphicFillBaseName: fill-
metamorphicChangeColor: false
- type: reagent
id: HotCocoa
@@ -100,9 +106,9 @@
flavor: tea
color: "#7EB626"
metamorphicSprite:
sprite: Objects/Consumable/Drinks/glass_green.rsi
sprite: Objects/Consumable/Drinks/greenteaglass.rsi
state: icon_empty
metamorphicMaxFillLevels: 5
metamorphicMaxFillLevels: 4
metamorphicFillBaseName: fill-
metamorphicChangeColor: false
@@ -149,7 +155,7 @@
flavor: icedtea
color: "#5B821B"
metamorphicSprite:
sprite: Objects/Consumable/Drinks/glass_green.rsi
sprite: Objects/Consumable/Drinks/icedgreenteaglass.rsi
state: icon_empty
metamorphicMaxFillLevels: 5
metamorphicFillBaseName: fill-
@@ -366,6 +372,12 @@
- !type:AdjustReagent
reagent: Theobromine
amount: 0.05
metamorphicSprite:
sprite: Objects/Consumable/Drinks/teaglass.rsi
state: icon_empty
metamorphicMaxFillLevels: 4
metamorphicFillBaseName: fill-
metamorphicChangeColor: false
- type: reagent
id: TonicWater
@@ -376,6 +388,12 @@
flavor: tonicwater
color: "#0064C8"
fizziness: 0.4
metamorphicSprite:
sprite: Objects/Consumable/Drinks/tonicglass.rsi
state: icon_empty
metamorphicMaxFillLevels: 5
metamorphicFillBaseName: fill-
metamorphicChangeColor: false
- type: reagent
id: Water
@@ -408,6 +426,12 @@
plantMetabolism:
- !type:PlantAdjustWater
amount: 1
metamorphicSprite:
sprite: Objects/Consumable/Drinks/iceglass.rsi
state: icon_empty
metamorphicMaxFillLevels: 3
metamorphicFillBaseName: fill-
metamorphicChangeColor: false
- type: reagent
id: DryRamen

View File

@@ -63,6 +63,12 @@
physicalDesc: reagent-physical-desc-citric
flavor: sour
color: "#fff690"
metamorphicSprite:
sprite: Objects/Consumable/Drinks/lemonjuiceglass.rsi
state: icon_empty
metamorphicMaxFillLevels: 5
metamorphicFillBaseName: fill-
metamorphicChangeColor: false
- type: reagent
id: JuiceLime
@@ -89,6 +95,12 @@
physicalDesc: reagent-physical-desc-citric
flavor: orange
color: "#E78108"
metamorphicSprite:
sprite: Objects/Consumable/Drinks/orangejuiceglass.rsi
state: icon_empty
metamorphicMaxFillLevels: 5
metamorphicFillBaseName: fill-
metamorphicChangeColor: false
- type: reagent
id: JuicePineapple
@@ -125,3 +137,9 @@
physicalDesc: reagent-physical-desc-sweet
flavor: watermelon
color: "#EF3520"
metamorphicSprite:
sprite: Objects/Consumable/Drinks/watermelonglass.rsi
state: icon_empty
metamorphicMaxFillLevels: 4
metamorphicFillBaseName: fill-
metamorphicChangeColor: false

View File

@@ -7,6 +7,12 @@
flavor: soda
color: "#6c2828"
recognizable: true
metamorphicSprite:
sprite: Objects/Consumable/Drinks/colaglass.rsi
state: icon_empty
metamorphicMaxFillLevels: 5
metamorphicFillBaseName: fill-
metamorphicChangeColor: false
- type: reagent
id: RoyRogers
@@ -42,6 +48,12 @@
physicalDesc: reagent-physical-desc-fizzy
flavor: drgibb
color: "#102000"
metamorphicSprite:
sprite: Objects/Consumable/Drinks/dr_gibb_glass.rsi
state: icon_empty
metamorphicMaxFillLevels: 5
metamorphicFillBaseName: fill-
metamorphicChangeColor: false
- type: reagent
id: EnergyDrink
@@ -174,6 +186,12 @@
physicalDesc: reagent-physical-desc-fizzy
flavor: sodacitrus
color: "#a6fa5a"
metamorphicSprite:
sprite: Objects/Consumable/Drinks/space_mountain_wind_glass.rsi
state: icon_empty
metamorphicMaxFillLevels: 5
metamorphicFillBaseName: fill-
metamorphicChangeColor: false
- type: reagent
id: SpaceUp
@@ -183,6 +201,12 @@
physicalDesc: reagent-physical-desc-fizzy
flavor: spaceup
color: "#e3e3e37d"
metamorphicSprite:
sprite: Objects/Consumable/Drinks/space-up_glass.rsi
state: icon_empty
metamorphicMaxFillLevels: 6
metamorphicFillBaseName: fill-
metamorphicChangeColor: false
- type: reagent
id: Starkist

View File

@@ -93,6 +93,12 @@
amount: 2
- !type:PlantAdjustPests
amount: 2
metamorphicSprite:
sprite: Objects/Consumable/Drinks/sugarglass.rsi
state: icon_empty
metamorphicMaxFillLevels: 7
metamorphicFillBaseName: fill-
metamorphicChangeColor: false
- type: reagent
id: PumpkinFlesh #Just so pumpkins spill orange stuff when smashed
@@ -100,4 +106,4 @@
name: reagent-name-pumpkin-flesh
desc: reagent-desc-pumpkin-flesh
flavor: pumpkin
color: "#fc9300"
color: "#fc9300"

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.0 KiB

View File

@@ -0,0 +1,29 @@
{
"version": 1,
"size": {
"x": 32,
"y": 32
},
"license": "CC-BY-SA-3.0",
"copyright": "Made by borkroman. Fill levels by RumiTiger",
"states": [
{
"name": "icon"
},
{
"name": "icon_empty"
},
{
"name": "fill-1"
},
{
"name": "fill-2"
},
{
"name": "fill-3"
},
{
"name": "fill-4"
}
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.1 KiB

View File

@@ -0,0 +1,32 @@
{
"version": 1,
"size": {
"x": 32,
"y": 32
},
"license": "CC-BY-SA-3.0",
"copyright": "Made by RumiTiger",
"states": [
{
"name": "icon"
},
{
"name": "icon_empty"
},
{
"name": "fill-1"
},
{
"name": "fill-2"
},
{
"name": "fill-3"
},
{
"name": "fill-4"
},
{
"name": "fill-5"
}
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 305 B

After

Width:  |  Height:  |  Size: 3.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.0 KiB

View File

@@ -1 +1,32 @@
{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", "states": [{"name": "icon"}]}
{
"version": 1,
"size": {
"x": 32,
"y": 32
},
"license": "CC-BY-SA-3.0",
"copyright": "Made by RumiTiger",
"states": [
{
"name": "icon"
},
{
"name": "icon_empty"
},
{
"name": "fill-1"
},
{
"name": "fill-2"
},
{
"name": "fill-3"
},
{
"name": "fill-4"
},
{
"name": "fill-5"
}
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.0 KiB

View File

@@ -0,0 +1,29 @@
{
"version": 1,
"size": {
"x": 32,
"y": 32
},
"license": "CC-BY-SA-3.0",
"copyright": "Made by borkroman. Fill levels by RumiTiger",
"states": [
{
"name": "icon"
},
{
"name": "icon_empty"
},
{
"name": "fill-1"
},
{
"name": "fill-2"
},
{
"name": "fill-3"
},
{
"name": "fill-4"
}
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.0 KiB

View File

@@ -0,0 +1,32 @@
{
"version": 1,
"size": {
"x": 32,
"y": 32
},
"license": "CC-BY-SA-3.0",
"copyright": "Made by RumiTiger",
"states": [
{
"name": "icon"
},
{
"name": "icon_empty"
},
{
"name": "fill-1"
},
{
"name": "fill-2"
},
{
"name": "fill-3"
},
{
"name": "fill-4"
},
{
"name": "fill-5"
}
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 363 B

After

Width:  |  Height:  |  Size: 3.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.0 KiB

View File

@@ -1 +1,26 @@
{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", "states": [{"name": "icon"}]}
{
"version": 1,
"size": {
"x": 32,
"y": 32
},
"license": "CC-BY-SA-3.0",
"copyright": "Made by borkroman. Fill levels by RumiTiger",
"states": [
{
"name": "icon"
},
{
"name": "icon_empty"
},
{
"name": "fill-1"
},
{
"name": "fill-2"
},
{
"name": "fill-3"
}
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.2 KiB

View File

@@ -0,0 +1,32 @@
{
"version": 1,
"size": {
"x": 32,
"y": 32
},
"license": "CC-BY-SA-3.0",
"copyright": "Made by RumiTiger",
"states": [
{
"name": "icon"
},
{
"name": "icon_empty"
},
{
"name": "fill-1"
},
{
"name": "fill-2"
},
{
"name": "fill-3"
},
{
"name": "fill-4"
},
{
"name": "fill-5"
}
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

View File

@@ -0,0 +1,35 @@
{
"version": 1,
"size": {
"x": 32,
"y": 32
},
"license": "CC-BY-SA-3.0",
"copyright": "Made by RumiTiger",
"states": [
{
"name": "icon"
},
{
"name": "icon_empty"
},
{
"name": "fill-1"
},
{
"name": "fill-2"
},
{
"name": "fill-3"
},
{
"name": "fill-4"
},
{
"name": "fill-5"
},
{
"name": "fill-6"
}
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.0 KiB

View File

@@ -0,0 +1,32 @@
{
"version": 1,
"size": {
"x": 32,
"y": 32
},
"license": "CC-BY-SA-3.0",
"copyright": "Made by RumiTiger",
"states": [
{
"name": "icon"
},
{
"name": "icon_empty"
},
{
"name": "fill-1"
},
{
"name": "fill-2"
},
{
"name": "fill-3"
},
{
"name": "fill-4"
},
{
"name": "fill-5"
}
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 320 B

After

Width:  |  Height:  |  Size: 3.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.0 KiB

View File

@@ -1 +1,35 @@
{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", "states": [{"name": "icon"}]}
{
"version": 1,
"size": {
"x": 32,
"y": 32
},
"license": "CC-BY-SA-3.0",
"copyright": "Made by RumiTiger",
"states": [
{
"name": "icon"
},
{
"name": "icon_empty"
},
{
"name": "fill-1"
},
{
"name": "fill-2"
},
{
"name": "fill-3"
},
{
"name": "fill-4"
},
{
"name": "fill-5"
},
{
"name": "fill-6"
}
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 404 B

After

Width:  |  Height:  |  Size: 3.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.0 KiB

View File

@@ -1 +1,32 @@
{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", "states": [{"name": "icon"}]}
{
"version": 1,
"size": {
"x": 32,
"y": 32
},
"license": "CC-BY-SA-3.0",
"copyright": "Made by RumiTiger",
"states": [
{
"name": "icon"
},
{
"name": "icon_empty"
},
{
"name": "fill-1"
},
{
"name": "fill-2"
},
{
"name": "fill-3"
},
{
"name": "fill-4"
},
{
"name": "fill-5"
}
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

Some files were not shown because too many files have changed in this diff Show More