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

Merge sugar and glucose, touch up how some drinks metabolize. #7398

Merged
merged 5 commits into from
May 22, 2022
Merged

Merge sugar and glucose, touch up how some drinks metabolize. #7398

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f6b937d
Food chem adjustments
Elijahrane Apr 2, 2022
da73f2a
Touch up alcohol
Elijahrane Apr 3, 2022
df98fbf
Merge branch 'master' of https://github.com/space-wizards/space-stati…
Elijahrane Apr 26, 2022
e8b6093
Add all of glucose's old stuf to sugar
Elijahrane Apr 26, 2022
0974216
Merge branch 'master' of https://github.com/space-wizards/space-stati…
Elijahrane May 22, 2022
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
3 changes: 1 addition & 2 deletions Resources/Prototypes/Catalog/ReagentDispensers/chemical.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
- Copper
- Ethanol
- Fluorine
- Glucose
- Sugar
- Hydrogen
- Iodine
- Iron
Expand All @@ -20,7 +20,6 @@
- Radium
- Silicon
- Sodium
- Sugar
- Sulfur
- SulfuricAcid
- Uranium
Expand Down
12 changes: 3 additions & 9 deletions Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,7 @@
maxVol: 30
reagents:
- ReagentId: IcedTea
Quantity: 28
- ReagentId: Theobromine
Quantity: 2
Quantity: 30
- type: Sprite
sprite: Objects/Consumable/Drinks/ice_tea_can.rsi
- type: Item
Expand Down Expand Up @@ -238,9 +236,7 @@
maxVol: 30
reagents:
- ReagentId: FourteenLoko
Quantity: 28
- ReagentId: Theobromine
Quantity: 2
Quantity: 30
- type: Sprite
sprite: Objects/Consumable/Drinks/fourteen_loko.rsi
- type: Item
Expand Down Expand Up @@ -296,9 +292,7 @@
maxVol: 30
reagents:
- ReagentId: EnergyDrink
Quantity: 28
- ReagentId: Theobromine
Quantity: 2
Quantity: 30
- type: Drink
- type: Sprite
sprite: Objects/Consumable/Drinks/energy_drink.rsi
Expand Down
8 changes: 2 additions & 6 deletions Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,9 +170,7 @@
drink:
reagents:
- ReagentId: Coffee
Quantity: 19
- ReagentId: Theobromine
Quantity: 1
Quantity: 20
maxVol: 20
- type: Sprite
sprite: Objects/Consumable/Drinks/hot_coffee.rsi
Expand All @@ -188,9 +186,7 @@
drink:
reagents:
- ReagentId: Tea
Quantity: 19
- ReagentId: Theobromine
Quantity: 1
Quantity: 20
maxVol: 20
- type: Sprite
sprite: Objects/Consumable/Drinks/teacup.rsi
Expand Down
8 changes: 4 additions & 4 deletions Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -485,7 +485,7 @@
Quantity: 20
- ReagentId: Vitamin
Quantity: 5
- ReagentId: Glucose
- ReagentId: Sugar
Quantity: 15

- type: entity
Expand All @@ -510,7 +510,7 @@
Quantity: 4
- ReagentId: Vitamin
Quantity: 1
- ReagentId: Glucose
- ReagentId: Sugar
Quantity: 3
# Tastes like sweetness, cake, vanilla.

Expand All @@ -537,7 +537,7 @@
Quantity: 20
- ReagentId: Vitamin
Quantity: 5
- ReagentId: Glucose
- ReagentId: Sugar
Quantity: 15

- type: entity
Expand All @@ -562,7 +562,7 @@
Quantity: 4
- ReagentId: Vitamin
Quantity: 1
- ReagentId: Glucose
- ReagentId: Sugar
Quantity: 3
# Tastes like sweetness, cake, clown.

Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donkpocket.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@
Quantity: 10
- ReagentId: Omnizine
Quantity: 2
- ReagentId: Glucose
- ReagentId: Sugar
Quantity: 2

- type: entity
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
solutions:
food:
reagents:
- ReagentId: Glucose
- ReagentId: Sugar
Quantity: 10
- type: Produce
seedId: sugarcane
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,7 @@
Quantity: 3
- ReagentId: Milk ##This is probably a reference to something but I don't get it
Quantity: 5
- ReagentId: Glucose
- ReagentId: Sugar
Quantity: 5
# Tastes like rice, sweetness.

Expand Down
Loading