tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into up/drinks-yml

Browse Source 
# Conflicts:
#	Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_fun.yml
This commit is contained in:
iaada
2025-09-05 17:07:09 -05:00
parent 63b5f37c1b d8400c6520
commit 29dda7949f
1874 changed files with 122270 additions and 59095 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
Resources/Textures/Objects/Consumable/Drinks/beer_can.rsi/inhand-left.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 432 B

BIN
Resources/Textures/Objects/Consumable/Drinks/beer_can.rsi/inhand-right.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 463 B

10
Resources/Textures/Objects/Consumable/Drinks/beer_can.rsi/meta.json
View File

@@ -5,13 +5,21 @@
"y": 32
},
"license": "CC-BY-SA-3.0",
"copyright": "Github #DrMelon",
"copyright": "Github #DrMelon. Inhands by Tiniest Shark (Github)",
"states": [
{
"name": "icon"
},
{
"name": "icon_open"
},
{
"name": "inhand-right",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
}
]
}

BIN
Resources/Textures/Objects/Consumable/Drinks/cafe_latte.rsi/inhand-left.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 350 B

BIN
Resources/Textures/Objects/Consumable/Drinks/cafe_latte.rsi/inhand-right.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 381 B

10
Resources/Textures/Objects/Consumable/Drinks/cafe_latte.rsi/meta.json
View File

@@ -6,7 +6,7 @@
"y": 32
},
"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.",
"copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi. Fill levels by Tayrtahn on GitHub. Inhands by Tiniest Shark (Github)",
"states":
[
{
@@ -17,6 +17,14 @@
},
{
"name": "fill-1"
},
{
"name": "inhand-right",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
}
]
}

BIN
Resources/Textures/Objects/Consumable/Drinks/changelingsting.rsi/icon.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
Resources/Textures/Objects/Consumable/Drinks/changelingsting.rsi/icon_open.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
Resources/Textures/Objects/Consumable/Drinks/changelingsting.rsi/inhand-left.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
Resources/Textures/Objects/Consumable/Drinks/changelingsting.rsi/inhand-right.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.6 KiB

130
Resources/Textures/Objects/Consumable/Drinks/changelingsting.rsi/meta.json
View File

@@ -5,17 +5,22 @@
"y": 32
},
"license": "CC-BY-SA-3.0",
"copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi",
"copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi. Inhands by Tiniest Shark (Github)",
"states": [
{
"name": "icon",
"delays": [
[
10.0,
0.1,
10.0,
0.1,
10.0,
0.1,
10.0,
10.0
0.1,
10.0,
0.1
]
]
},
@@ -24,12 +29,125 @@
"delays": [
[
10.0,
0.1,
10.0,
0.1,
10.0,
0.1,
10.0,
10.0
0.1,
10.0,
0.1
]
]
}
]
}
},
{
"name": "inhand-right",
"directions": 4,
"delays": [
[
5.0,
0.1,
5.0,
0.1,
5.0,
0.1,
5.0,
0.1,
5.0,
0.1
],
[
5.0,
0.1,
5.0,
0.1,
5.0,
0.1,
5.0,
0.1,
5.0,
0.1
],
[
5.0,
0.1,
5.0,
0.1,
5.0,
0.1,
5.0,
0.1,
5.0,
0.1
],
[
5.0,
0.1,
5.0,
0.1,
5.0,
0.1,
5.0,
0.1,
5.0,
0.1
]
]
},
{
"name": "inhand-left",
"directions": 4,
"delays": [
[
5.0,
0.1,
5.0,
0.1,
5.0,
0.1,
5.0,
0.1,
5.0,
0.1
],
[
5.0,
0.1,
5.0,
0.1,
5.0,
0.1,
5.0,
0.1,
5.0,
0.1
],
[
5.0,
0.1,
5.0,
0.1,
5.0,
0.1,
5.0,
0.1,
5.0,
0.1
],
[
5.0,
0.1,
5.0,
0.1,
5.0,
0.1,
5.0,
0.1,
5.0,
0.1
]
]
}
]
}

BIN
Resources/Textures/Objects/Consumable/Drinks/coconutwater.rsi/inhand-left.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 520 B

BIN
Resources/Textures/Objects/Consumable/Drinks/coconutwater.rsi/inhand-right.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 546 B

10
Resources/Textures/Objects/Consumable/Drinks/coconutwater.rsi/meta.json
View File

@@ -5,13 +5,21 @@
"y": 32
},
"license": "CC0-1.0",
"copyright": "Original work by noctis on Discord",
"copyright": "Original work by noctis on Discord. Inhands by Tiniest Shark (Github)",
"states": [
{
"name": "icon"
},
{
"name": "icon_open"
},
{
"name": "inhand-right",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
}
]
}

BIN
Resources/Textures/Objects/Consumable/Drinks/cola.rsi/inhand-left.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 219 B

After

Width:  |  Height:  |  Size: 408 B

BIN
Resources/Textures/Objects/Consumable/Drinks/cola.rsi/inhand-right.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 239 B

After

Width:  |  Height:  |  Size: 420 B

72
Resources/Textures/Objects/Consumable/Drinks/cola.rsi/meta.json
View File

@@ -1,53 +1,25 @@
{
"version": 1,
"size": {
"x": 32,
"y": 32
},
"license": "CC-BY-SA-3.0",
"copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi",
"states": [
{
"name": "icon"
"version": 1,
"size": {
"x": 32,
"y": 32
},
{
"name": "icon_open"
},
{
"name": "inhand-right",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
},
{
"name": "inhand-left",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
}
]
"license": "CC-BY-SA-3.0",
"copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi, inhands by Tiniest Shark (Github)",
"states": [
{
"name": "icon"
},
{
"name": "icon_open"
},
{
"name": "inhand-right",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
}
]
}

BIN
Resources/Textures/Objects/Consumable/Drinks/cream.rsi/inhand-left.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 408 B

BIN
Resources/Textures/Objects/Consumable/Drinks/cream.rsi/inhand-right.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 404 B

10
Resources/Textures/Objects/Consumable/Drinks/cream.rsi/meta.json
View File

@@ -5,13 +5,21 @@
"y": 32
},
"license": "CC-BY-SA-3.0",
"copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi",
"copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi. Inhands by Tiniest Shark (Github)",
"states": [
{
"name": "icon"
},
{
"name": "icon_open"
},
{
"name": "inhand-right",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
}
]
}

BIN
Resources/Textures/Objects/Consumable/Drinks/dr_gibb.rsi/inhand-left.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 219 B

After

Width:  |  Height:  |  Size: 384 B

BIN
Resources/Textures/Objects/Consumable/Drinks/dr_gibb.rsi/inhand-right.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 224 B

After

Width:  |  Height:  |  Size: 404 B

72
Resources/Textures/Objects/Consumable/Drinks/dr_gibb.rsi/meta.json
View File

@@ -1,53 +1,25 @@
{
"version": 1,
"size": {
"x": 32,
"y": 32
},
"license": "CC-BY-SA-3.0",
"copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi",
"states": [
{
"name": "icon"
"version": 1,
"size": {
"x": 32,
"y": 32
},
{
"name": "icon_open"
},
{
"name": "inhand-right",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
},
{
"name": "inhand-left",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
}
]
"license": "CC-BY-SA-3.0",
"copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi. Inhands by Tiniest Shark (Github)",
"states": [
{
"name": "icon"
},
{
"name": "icon_open"
},
{
"name": "inhand-right",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
}
]
}

BIN
Resources/Textures/Objects/Consumable/Drinks/energy_drink.rsi/inhand-left.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 225 B

After

Width:  |  Height:  |  Size: 382 B

BIN
Resources/Textures/Objects/Consumable/Drinks/energy_drink.rsi/inhand-right.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 238 B

After

Width:  |  Height:  |  Size: 388 B

72
Resources/Textures/Objects/Consumable/Drinks/energy_drink.rsi/meta.json
View File

@@ -1,53 +1,25 @@
{
"version": 1,
"size": {
"x": 32,
"y": 32
},
"license": "CC-BY-SA-3.0",
"copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi",
"states": [
{
"name": "icon"
"version": 1,
"size": {
"x": 32,
"y": 32
},
{
"name": "icon_open"
},
{
"name": "inhand-right",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
},
{
"name": "inhand-left",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
}
]
"license": "CC-BY-SA-3.0",
"copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi. Inhands by Tiniest Shark (Github)",
"states": [
{
"name": "icon"
},
{
"name": "icon_open"
},
{
"name": "inhand-right",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
}
]
}

BIN
Resources/Textures/Objects/Consumable/Drinks/fourteen_loko.rsi/inhand-left.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 247 B

After

Width:  |  Height:  |  Size: 408 B

BIN
Resources/Textures/Objects/Consumable/Drinks/fourteen_loko.rsi/inhand-right.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 249 B

After

Width:  |  Height:  |  Size: 425 B

72
Resources/Textures/Objects/Consumable/Drinks/fourteen_loko.rsi/meta.json
View File

@@ -1,53 +1,25 @@
{
"version": 1,
"size": {
"x": 32,
"y": 32
},
"license": "CC-BY-SA-3.0",
"copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi",
"states": [
{
"name": "icon"
"version": 1,
"size": {
"x": 32,
"y": 32
},
{
"name": "icon_open"
},
{
"name": "inhand-right",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
},
{
"name": "inhand-left",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
}
]
"license": "CC-BY-SA-3.0",
"copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi. Inhands by Tiniest Shark (Github)",
"states": [
{
"name": "icon"
},
{
"name": "icon_open"
},
{
"name": "inhand-right",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
}
]
}

BIN
Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/inhand-left-fill-1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 135 B

BIN
Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/inhand-left-fill-2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 197 B

BIN
Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/inhand-left-fill-3.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 203 B

BIN
Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/inhand-left.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 358 B

BIN
Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/inhand-right-fill-1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 135 B

BIN
Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/inhand-right-fill-2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 200 B

BIN
Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/inhand-right-fill-3.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 209 B

BIN
Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/inhand-right.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 354 B

34
Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/meta.json
View File

@@ -5,7 +5,7 @@
"y": 32
},
"license": "CC-BY-NC-SA-4.0",
"copyright": "Created by discord: brainfood#7460 / github: brainfood1183.",
"copyright": "Created by discord: brainfood#7460 / github: brainfood1183. Inhands by Tiniest Shark (Github)",
"states": [
{
"name": "icon"
@@ -33,6 +33,38 @@
},
{
"name": "fill6"
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-left-fill-1",
"directions": 4
},
{
"name": "inhand-left-fill-2",
"directions": 4
},
{
"name": "inhand-left-fill-3",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
},
{
"name": "inhand-right-fill-1",
"directions": 4
},
{
"name": "inhand-right-fill-2",
"directions": 4
},
{
"name": "inhand-right-fill-3",
"directions": 4
}
]
}

BIN
Resources/Textures/Objects/Consumable/Drinks/golden_cup.rsi/inhand-left.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 692 B

BIN
Resources/Textures/Objects/Consumable/Drinks/golden_cup.rsi/inhand-right.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 792 B

24
Resources/Textures/Objects/Consumable/Drinks/golden_cup.rsi/meta.json
View File

@@ -1 +1,23 @@
{"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": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi. Inhands by Tiniest Shark (Github)",
"states":
[
{
"name": "icon"
},
{
"name": "inhand-right",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
}
]
}

BIN
Resources/Textures/Objects/Consumable/Drinks/ice_tea_can.rsi/inhand-left.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 443 B

BIN
Resources/Textures/Objects/Consumable/Drinks/ice_tea_can.rsi/inhand-right.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 430 B

14
Resources/Textures/Objects/Consumable/Drinks/ice_tea_can.rsi/meta.json
View File

@@ -5,13 +5,21 @@
"y": 32
},
"license": "CC-BY-SA-3.0",
"copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi",
"copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi. Inhands by Tiniest Shark (Github)",
"states": [
{
"name": "icon"
},
{
"name": "icon_open"
}
},
{
"name": "inhand-right",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
}
]
}
}

BIN
Resources/Textures/Objects/Consumable/Drinks/lean.rsi/inhand-left.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 211 B

After

Width:  |  Height:  |  Size: 356 B

BIN
Resources/Textures/Objects/Consumable/Drinks/lean.rsi/inhand-right.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 227 B

After

Width:  |  Height:  |  Size: 348 B

66
Resources/Textures/Objects/Consumable/Drinks/lean.rsi/meta.json
View File

@@ -1,50 +1,22 @@
{
"version": 1,
"size": {
"x": 32,
"y": 32
},
"license": "CC-BY-SA-3.0",
"copyright": "https://github.com/tgstation/tgstation/blob/master/icons/obj/drinks.dmi",
"states": [
{
"name": "icon"
"version": 1,
"size": {
"x": 32,
"y": 32
},
{
"name": "inhand-right",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
},
{
"name": "inhand-left",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
}
]
"license": "CC-BY-SA-3.0",
"copyright": "https://github.com/tgstation/tgstation/blob/master/icons/obj/drinks.dmi. Inhands by Tiniest Shark (Github)",
"states": [
{
"name": "icon"
},
{
"name": "inhand-right",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
}
]
}

BIN
Resources/Textures/Objects/Consumable/Drinks/lemon-lime-cranberry.rsi/inhand-left.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 268 B

After

Width:  |  Height:  |  Size: 447 B

BIN
Resources/Textures/Objects/Consumable/Drinks/lemon-lime-cranberry.rsi/inhand-right.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 278 B

After

Width:  |  Height:  |  Size: 447 B

44
Resources/Textures/Objects/Consumable/Drinks/lemon-lime-cranberry.rsi/meta.json
View File

@@ -1,25 +1,25 @@
{
"version": 1,
"size": {
"x": 32,
"y": 32
},
"license": "CC-BY-SA-3.0",
"copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi; modified by AugustSun",
"states": [
{
"name": "icon"
"version": 1,
"size": {
"x": 32,
"y": 32
},
{
"name": "icon_open"
},
{
"name": "inhand-right",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
}
]
"license": "CC-BY-SA-3.0",
"copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi; modified by AugustSun. Inhands by Tiniest Shark (Github)",
"states": [
{
"name": "icon"
},
{
"name": "icon_open"
},
{
"name": "inhand-right",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
}
]
}

BIN
Resources/Textures/Objects/Consumable/Drinks/lemon-lime.rsi/inhand-left.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 213 B

After

Width:  |  Height:  |  Size: 423 B

BIN
Resources/Textures/Objects/Consumable/Drinks/lemon-lime.rsi/inhand-right.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 223 B

After

Width:  |  Height:  |  Size: 430 B

72
Resources/Textures/Objects/Consumable/Drinks/lemon-lime.rsi/meta.json
View File

@@ -1,53 +1,25 @@
{
"version": 1,
"size": {
"x": 32,
"y": 32
},
"license": "CC-BY-SA-3.0",
"copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi",
"states": [
{
"name": "icon"
"version": 1,
"size": {
"x": 32,
"y": 32
},
{
"name": "icon_open"
},
{
"name": "inhand-right",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
},
{
"name": "inhand-left",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
}
]
"license": "CC-BY-SA-3.0",
"copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi. Inhands by Tiniest Shark (Github)",
"states": [
{
"name": "icon"
},
{
"name": "icon_open"
},
{
"name": "inhand-right",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
}
]
}

BIN
Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/inhand-left-fill-1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 135 B

BIN
Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/inhand-left-fill-2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 197 B

BIN
Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/inhand-left-fill-3.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 203 B

BIN
Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/inhand-left.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 354 B

BIN
Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/inhand-right-fill-1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 135 B

BIN
Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/inhand-right-fill-2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 200 B

BIN
Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/inhand-right-fill-3.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 209 B

BIN
Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/inhand-right.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 359 B

34
Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/meta.json
View File

@@ -5,7 +5,7 @@
"y": 32
},
"license": "CC-BY-NC-SA-4.0",
"copyright": "Created by discord: brainfood#7460 / github: brainfood1183.",
"copyright": "Created by discord: brainfood#7460 / github: brainfood1183. Inhands by Tiniest Shark (Github)",
"states": [
{
"name": "icon"
@@ -33,6 +33,38 @@
},
{
"name": "fill6"
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-left-fill-1",
"directions": 4
},
{
"name": "inhand-left-fill-2",
"directions": 4
},
{
"name": "inhand-left-fill-3",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
},
{
"name": "inhand-right-fill-1",
"directions": 4
},
{
"name": "inhand-right-fill-2",
"directions": 4
},
{
"name": "inhand-right-fill-3",
"directions": 4
}
]
}

BIN
Resources/Textures/Objects/Consumable/Drinks/milk.rsi/inhand-left.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 559 B

BIN
Resources/Textures/Objects/Consumable/Drinks/milk.rsi/inhand-right.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 569 B

10
Resources/Textures/Objects/Consumable/Drinks/milk.rsi/meta.json
View File

@@ -5,13 +5,21 @@
"y": 32
},
"license": "CC-BY-SA-3.0",
"copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi",
"copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi. Inhands by Tiniest Shark (Github)",
"states": [
{
"name": "icon"
},
{
"name": "icon_open"
},
{
"name": "inhand-right",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
}
]
}

BIN
Resources/Textures/Objects/Consumable/Drinks/oatmilk.rsi/inhand-left.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 546 B

BIN
Resources/Textures/Objects/Consumable/Drinks/oatmilk.rsi/inhand-right.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 584 B

10
Resources/Textures/Objects/Consumable/Drinks/oatmilk.rsi/meta.json
View File

@@ -5,13 +5,21 @@
"y": 32
},
"license": "CC-BY-SA-3.0",
"copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi",
"copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi. Inhands by Tiniest Shark (Github)",
"states": [
{
"name": "icon"
},
{
"name": "icon_open"
},
{
"name": "inhand-right",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
}
]
}

BIN
Resources/Textures/Objects/Consumable/Drinks/orangejuice.rsi/inhand-left.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 586 B

BIN
Resources/Textures/Objects/Consumable/Drinks/orangejuice.rsi/inhand-right.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 580 B

10
Resources/Textures/Objects/Consumable/Drinks/orangejuice.rsi/meta.json
View File

@@ -5,13 +5,21 @@
"y": 32
},
"license": "CC-BY-SA-3.0",
"copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi",
"copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi. Inhands by Tiniest Shark (Github)",
"states": [
{
"name": "icon"
},
{
"name": "icon_open"
},
{
"name": "inhand-right",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
}
]
}

BIN
Resources/Textures/Objects/Consumable/Drinks/pineapplejuice.rsi/inhand-left.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 599 B

BIN
Resources/Textures/Objects/Consumable/Drinks/pineapplejuice.rsi/inhand-right.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 657 B

10
Resources/Textures/Objects/Consumable/Drinks/pineapplejuice.rsi/meta.json
View File

@@ -5,13 +5,21 @@
"y": 32
},
"license": "CC-BY-SA-3.0",
"copyright": "GrownSamoyedDog on Github. A variant of orangejuice carton from: https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi",
"copyright": "GrownSamoyedDog on Github. A variant of orangejuice carton from: https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi. Inhands by Tiniest Shark (Github)",
"states": [
{
"name": "icon"
},
{
"name": "icon_open"
},
{
"name": "inhand-right",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
}
]
}

BIN
Resources/Textures/Objects/Consumable/Drinks/purple_can.rsi/inhand-left.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 262 B

After

Width:  |  Height:  |  Size: 371 B

BIN
Resources/Textures/Objects/Consumable/Drinks/purple_can.rsi/inhand-right.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 268 B

After

Width:  |  Height:  |  Size: 409 B

72
Resources/Textures/Objects/Consumable/Drinks/purple_can.rsi/meta.json
View File

@@ -1,53 +1,25 @@
{
"version": 1,
"size": {
"x": 32,
"y": 32
},
"license": "CC-BY-SA-3.0",
"copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi",
"states": [
{
"name": "icon"
"version": 1,
"size": {
"x": 32,
"y": 32
},
{
"name": "icon_open"
},
{
"name": "inhand-right",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
},
{
"name": "inhand-left",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
}
]
"license": "CC-BY-SA-3.0",
"copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi. Inhands by Tiniest Shark (Github)",
"states": [
{
"name": "icon"
},
{
"name": "icon_open"
},
{
"name": "inhand-right",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
}
]
}

BIN
Resources/Textures/Objects/Consumable/Drinks/pwrgame.rsi/inhand-left.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 287 B

After

Width:  |  Height:  |  Size: 396 B

BIN
Resources/Textures/Objects/Consumable/Drinks/pwrgame.rsi/inhand-right.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 291 B

After

Width:  |  Height:  |  Size: 438 B

72
Resources/Textures/Objects/Consumable/Drinks/pwrgame.rsi/meta.json
View File

@@ -1,53 +1,25 @@
{
"version": 1,
"size": {
"x": 32,
"y": 32
},
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/70ccd0f2305286a1312425a85365881fac16fcac. Modified by potato1234x (github) for SS14",
"states": [
{
"name": "icon"
"version": 1,
"size": {
"x": 32,
"y": 32
},
{
"name": "icon_open"
},
{
"name": "inhand-right",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
},
{
"name": "inhand-left",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
}
]
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/70ccd0f2305286a1312425a85365881fac16fcac. Modified by potato1234x (github) for SS14. Inhands by Tiniest Shark (Github)",
"states": [
{
"name": "icon"
},
{
"name": "icon_open"
},
{
"name": "inhand-right",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
}
]
}

BIN
Resources/Textures/Objects/Consumable/Drinks/robustnukie.rsi/inhand-left.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 277 B

After

Width:  |  Height:  |  Size: 341 B

BIN
Resources/Textures/Objects/Consumable/Drinks/robustnukie.rsi/inhand-right.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 279 B

After

Width:  |  Height:  |  Size: 334 B

44
Resources/Textures/Objects/Consumable/Drinks/robustnukie.rsi/meta.json
View File

@@ -1,25 +1,25 @@
{
"version": 1,
"size": {
"x": 32,
"y": 32
},
"license": "CC-BY-SA-3.0",
"copyright": "Made by Potato1234x (github) for SS14",
"states": [
{
"name": "icon"
"version": 1,
"size": {
"x": 32,
"y": 32
},
{
"name": "icon_open"
},
{
"name": "inhand-right",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
}
]
"license": "CC-BY-SA-3.0",
"copyright": "Made by Potato1234x (github) for SS14. Inhands by Tiniest Shark (Github)",
"states": [
{
"name": "icon"
},
{
"name": "icon_open"
},
{
"name": "inhand-right",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
}
]
}

BIN
Resources/Textures/Objects/Consumable/Drinks/rootbeer.rsi/inhand-left.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 399 B

After

Width:  |  Height:  |  Size: 391 B

BIN
Resources/Textures/Objects/Consumable/Drinks/rootbeer.rsi/inhand-right.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 420 B

After

Width:  |  Height:  |  Size: 384 B

44
Resources/Textures/Objects/Consumable/Drinks/rootbeer.rsi/meta.json
View File

@@ -1,25 +1,25 @@
{
"version": 1,
"size": {
"x": 32,
"y": 32
},
"license": "CC-BY-SA-3.0",
"copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi (EDITED BY Plasmaguy#6148 [Discord, liable to change] / jrjr3000 [Steam])",
"states": [
{
"name": "icon"
"version": 1,
"size": {
"x": 32,
"y": 32
},
{
"name": "icon_open"
},
{
"name": "inhand-right",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
}
]
"license": "CC-BY-SA-3.0",
"copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi (EDITED BY Plasmaguy#6148 [Discord, liable to change] / jrjr3000 [Steam]). Inhands by Tiniest Shark (Github)",
"states": [
{
"name": "icon"
},
{
"name": "icon_open"
},
{
"name": "inhand-right",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
}
]
}

BIN
Resources/Textures/Objects/Consumable/Drinks/shamblersjuice.rsi/inhand-left.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 281 B

After

Width:  |  Height:  |  Size: 392 B

BIN
Resources/Textures/Objects/Consumable/Drinks/shamblersjuice.rsi/inhand-right.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 284 B

After

Width:  |  Height:  |  Size: 396 B

72
Resources/Textures/Objects/Consumable/Drinks/shamblersjuice.rsi/meta.json
View File

@@ -1,53 +1,25 @@
{
"version": 1,
"size": {
"x": 32,
"y": 32
},
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/70ccd0f2305286a1312425a85365881fac16fcac. Modified by potato1234x (github) for SS14",
"states": [
{
"name": "icon"
"version": 1,
"size": {
"x": 32,
"y": 32
},
{
"name": "icon_open"
},
{
"name": "inhand-right",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
},
{
"name": "inhand-left",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
}
]
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/70ccd0f2305286a1312425a85365881fac16fcac. Modified by potato1234x (github) for SS14. Inhands by Tiniest Shark (Github)",
"states": [
{
"name": "icon"
},
{
"name": "icon_open"
},
{
"name": "inhand-right",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
}
]
}

BIN
Resources/Textures/Objects/Consumable/Drinks/sodawater.rsi/inhand-left.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 229 B

After

Width:  |  Height:  |  Size: 412 B

BIN
Resources/Textures/Objects/Consumable/Drinks/sodawater.rsi/inhand-right.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 232 B

After

Width:  |  Height:  |  Size: 435 B

72
Resources/Textures/Objects/Consumable/Drinks/sodawater.rsi/meta.json
View File

@@ -1,53 +1,25 @@
{
"version": 1,
"size": {
"x": 32,
"y": 32
},
"license": "CC-BY-SA-3.0",
"copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi",
"states": [
{
"name": "icon"
"version": 1,
"size": {
"x": 32,
"y": 32
},
{
"name": "icon_open"
},
{
"name": "inhand-right",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
},
{
"name": "inhand-left",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
}
]
"license": "CC-BY-SA-3.0",
"copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi. Inhands by Tiniest Shark (Github)",
"states": [
{
"name": "icon"
},
{
"name": "icon_open"
},
{
"name": "inhand-right",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
}
]
}

BIN
Resources/Textures/Objects/Consumable/Drinks/sol_dry.rsi/inhand-left.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.5 KiB

After

Width:  |  Height:  |  Size: 392 B

BIN
Resources/Textures/Objects/Consumable/Drinks/sol_dry.rsi/inhand-right.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.5 KiB

After

Width:  |  Height:  |  Size: 416 B

72
Resources/Textures/Objects/Consumable/Drinks/sol_dry.rsi/meta.json
View File

@@ -1,53 +1,25 @@
{
"version": 1,
"size": {
"x": 32,
"y": 32
},
"license": "CC-BY-SA-3.0",
"copyright": "Modified from https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi, Sol Dry from /tg/.",
"states": [
{
"name": "icon"
"version": 1,
"size": {
"x": 32,
"y": 32
},
{
"name": "icon_open"
},
{
"name": "inhand-right",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
},
{
"name": "inhand-left",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
}
]
"license": "CC-BY-SA-3.0",
"copyright": "Modified from https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi, Sol Dry from /tg/. Inhands by Tiniest Shark (Github)",
"states": [
{
"name": "icon"
},
{
"name": "icon_open"
},
{
"name": "inhand-right",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
}
]
}

BIN
Resources/Textures/Objects/Consumable/Drinks/soymilk.rsi/inhand-left.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 443 B

BIN
Resources/Textures/Objects/Consumable/Drinks/soymilk.rsi/inhand-right.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 477 B

10
Resources/Textures/Objects/Consumable/Drinks/soymilk.rsi/meta.json
View File

@@ -5,13 +5,21 @@
"y": 32
},
"license": "CC-BY-SA-3.0",
"copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi",
"copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi. Inhands by Tiniest Shark (Github)",
"states": [
{
"name": "icon"
},
{
"name": "icon_open"
},
{
"name": "inhand-right",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
}
]
}

BIN
Resources/Textures/Objects/Consumable/Drinks/space-up.rsi/inhand-left.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 215 B

After

Width:  |  Height:  |  Size: 331 B

BIN
Resources/Textures/Objects/Consumable/Drinks/space-up.rsi/inhand-right.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 219 B

After

Width:  |  Height:  |  Size: 338 B

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