Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add lemon juice and fix bad sprite allocation #27465

Merged
merged 10 commits into from
Jun 22, 2024
Merged

add lemon juice and fix bad sprite allocation #27465

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
f0d6f59
add lemon juice and fix bad sprite allocation
Shadowtheprotogen546 Apr 29, 2024
6319719
Merge branch 'space-wizards:master' into lemon-juice
Shadowtheprotogen546 Apr 29, 2024
00ea1e0
Updated sprites
Shadowtheprotogen546 Apr 29, 2024
d2999fb
Merge branch 'master' of https://github.com/Shadowtheprotogen546/spac…
Shadowtheprotogen546 Apr 29, 2024
653235c
Merge branch 'space-wizards:master' into lemon-juice
Shadowtheprotogen546 Apr 29, 2024
51d764b
Merge branch 'lemon-juice' of https://github.com/Shadowtheprotogen546…
Shadowtheprotogen546 Apr 29, 2024
e1039eb
git bugged out
Shadowtheprotogen546 Apr 29, 2024
01502c4
Changed sprites
Shadowtheprotogen546 Apr 29, 2024
92c5692
Merge branch 'space-wizards:master' into lemon-juice
Shadowtheprotogen546 Apr 29, 2024
7d4d874
Merge branch 'space-wizards:master' into lemon-juice
Shadowtheprotogen546 Apr 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
DrinkGildlagerBottleFull: 2 #if champagne gets less because its premium, then gildlager should match this and have two
DrinkGrenadineBottleFull: 2
DrinkJuiceLimeCarton: 3
DrinkJuiceLemonCarton: 3
DrinkJuiceOrangeCarton: 3
DrinkJuiceTomatoCarton: 3
DrinkCoffeeLiqueurBottleFull: 3
Expand Down
15 changes: 15 additions & 0 deletions Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,3 +193,18 @@
Quantity: 100
- type: Sprite
sprite: Objects/Consumable/Drinks/oatmilk.rsi

- type: entity
parent: [DrinkCartonVisualsOpenable, DrinkCartonBaseFull]
id: DrinkJuiceLemonCarton
name: lemon juice
description: First it's sour, then it's still sour.
components:
- type: SolutionContainerManager
solutions:
drink:
reagents:
- ReagentId: JuiceLemon
Quantity: 50
- type: Sprite
sprite: Objects/Consumable/Drinks/lemonjuice.rsi
2 changes: 1 addition & 1 deletion Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1170,7 +1170,7 @@
- ReagentId: JuiceLemon
Quantity: 30
- type: Icon
sprite: Objects/Consumable/Drinks/lemonjuice.rsi
sprite: Objects/Consumable/Drinks/lemonjuiceglass.rsi
state: icon

- type: entity
Expand Down
Binary file modified Resources/Textures/Objects/Consumable/Drinks/lemonjuice.rsi/icon.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Resources/Textures/Objects/Consumable/Drinks/lemonjuice.rsi/icon_open.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
18 changes: 17 additions & 1 deletion Resources/Textures/Objects/Consumable/Drinks/lemonjuice.rsi/meta.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,17 @@
{"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",
"states": [
{
"name": "icon"
},
{
"name": "icon_open"
}
]
}
Loading