Skip to content

Commit

Permalink
draft
Browse files Browse the repository at this point in the history
help
  • Loading branch information
VividPups committed Jan 7, 2025
1 parent ac42961 commit 3c01608
Show file tree
Hide file tree
Showing 23 changed files with 144 additions and 28 deletions.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# TODO: Find remaining cans and move to drinks_cans
# TODO: Find remaining cans and move to drinks_cans b-52
# TODO: Find empty containers (e.g. mug, pitcher) and move to their own yml
# When adding new drinks also add to random spawner located in Resources\Prototypes\Entities\Markers\Spawners\Random\Food_Drinks\drinks_glass.yml
- type: entity
Expand Down Expand Up @@ -312,6 +312,16 @@
reagents:
- ReagentId: ArnoldPalmer
Quantity: 30
- type: Sprite
sprite: Objects/Consumable/Drinks/arnoldpalmer.rsi
layers:
- state: icon_empty
- state: fill-1
map: ["enum.SolutionContainerLayers.Fill"]
- type: SolutionContainerVisuals
maxFillLevels: 5
fillBaseName: fill-
changeColor: false
- type: Icon
sprite: Objects/Consumable/Drinks/arnoldpalmer.rsi
state: icon
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -1,14 +1,34 @@
{
"version": 1,
"size": {
"size":
{
"x": 32,
"y": 32
},
"license": "CC-BY-SA-3.0",
"copyright": "Modified from https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi",
"states": [
"copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi. Fill levels by Tayrtahn on GitHub.",
"states":
[
{
"name": "icon"
},
{
"name": "icon_empty"
},
{
"name": "fill-1"
},
{
"name": "fill-2"
},
{
"name": "fill-3"
},
{
"name": "fill-4"
},
{
"name": "fill-5"
}
]
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
104 changes: 85 additions & 19 deletions Resources/Textures/Objects/Consumable/Drinks/royrogers.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -1,22 +1,88 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Modified from https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi",
"size": {
"x": 32,
"y": 32
"size":
{
"x": 32,
"y": 32
},
"states": [
{
"name": "icon",
"delays": [
[
1,
1,
1,
1
]
]
}
]
}
"license": "CC-BY-SA-3.0",
"copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi. Fill levels by Tayrtahn on GitHub.",
"states":
[
{
"name": "icon",
"delays":
[
[
1.0,
1.0,
1.0,
1.0
]
]
},
{
"name": "icon_empty"
},
{
"name": "fill-1",
"delays":
[
[
1.0,
1.0,
1.0,
1.0
]
]
},
{
"name": "fill-2",
"delays":
[
[
1.0,
1.0,
1.0,
1.0
]
]
},
{
"name": "fill-3",
"delays":
[
[
1.0,
1.0,
1.0,
1.0
]
]
},
{
"name": "fill-4",
"delays":
[
[
1.0,
1.0,
1.0,
1.0
]
]
},
{
"name": "fill-5",
"delays":
[
[
1.0,
1.0,
1.0,
1.0
]
]
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -1,14 +1,34 @@
{
"version": 1,
"size": {
"size":
{
"x": 32,
"y": 32
},
"license": "CC-BY-SA-3.0",
"copyright": "Modified from https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi",
"states": [
"copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi. Fill levels by Tayrtahn on GitHub.",
"states":
[
{
"name": "icon"
},
{
"name": "icon_empty"
},
{
"name": "fill-1"
},
{
"name": "fill-2"
},
{
"name": "fill-3"
},
{
"name": "fill-4"
},
{
"name": "fill-5"
}
]
}
}

0 comments on commit 3c01608

Please sign in to comment.