Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Small bug fixes and tweaks on reagents and food/drinks content (#5146)

Browse Source 
* Update Can Sizes, Fill cans with correct reagents, rename brownstar reagent to its can name starkist

* Update drinks.yml

* add energy drink

* Update soda.yml

* Potato Juice

* Fix Yaml

* Add energy drink to vending
This commit is contained in:
ZeroDayDaemon
2021-11-04 00:31:21 -04:00
committed by GitHub
parent 1b5b32c8a6
commit b8f12f4424
8 changed files with 107 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Resources/Prototypes/Body/Mechanisms/human.yml
View File

@@ -447,9 +447,6 @@
BraveBull:
effects:
- !type:SatiateThirst
BrownStar:
effects:
- !type:SatiateThirst
CubaLibre:
effects:
- !type:SatiateThirst
@@ -534,7 +531,7 @@
Moonshine:
effects:
- !type:SatiateThirst
Neurotoxin: #This should be moved out of alcohol eventually
Neurotoxin:
effects:
- !type:SatiateThirst
- !type:HealthChange
@@ -565,6 +562,9 @@
SnowWhite:
effects:
- !type:SatiateThirst
Starkist:
effects:
- !type:SatiateThirst
SuiDream:
effects:
- !type:SatiateThirst

1
Resources/Prototypes/Catalog/VendingMachines/Inventories/cola.yml
View File

@@ -5,6 +5,7 @@
spriteName: cola
startingInventory:
DrinkColaCan: 10
DrinkEnergyDrinkCan: 10
DrinkGrapeCan: 10
DrinkIcedTeaCan: 10
DrinkLemonLimeCan: 10

5
Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
View File

@@ -250,6 +250,11 @@
sprite: Objects/Specific/Hydroponics/potato.rsi
- type: Produce
seed: potato
- type: Extractable
juiceSolution:
reagents:
- ReagentId: JuicePotato
Quantity: 10
- type: entity
name: tomato

17
Resources/Prototypes/Entities/Objects/Consumable/drinks.yml
View File

@@ -451,23 +451,6 @@
- type: Sprite
sprite: Objects/Consumable/Drinks/bravebullglass.rsi
- type: entity
parent: DrinkGlassBase
id: DrinkBrownStar
name: brown star
description: It's not what it sounds like...
components:
- type: Drink
- type: SolutionContainerManager
solutions:
drink:
maxVol: 50
reagents:
- ReagentId: BrownStar
Quantity: 50
- type: Sprite
sprite: Objects/Consumable/Drinks/brownstar.rsi
- type: entity
parent: DrinkGlassBase
id: DrinkCarrotJuice

69
Resources/Prototypes/Entities/Objects/Consumable/drinks_cans.yml
View File

@@ -12,11 +12,11 @@
drink:
reagents:
- ReagentId: Cola
Quantity: 20
maxVol: 20
Quantity: 30
maxVol: 30
- type: SolutionTransfer
canChangeTransferAmount: true
maxTransferAmount: 10
maxTransferAmount: 15
- type: UserInterface
interfaces:
- key: enum.TransferAmountUiKey.Key
@@ -44,10 +44,10 @@
- type: SolutionContainerManager
solutions:
drink:
maxVol: 20
maxVol: 30
reagents:
- ReagentId: Cola
Quantity: 20
Quantity: 30
- type: Tag
tags:
- Cola
@@ -65,10 +65,10 @@
- type: SolutionContainerManager
solutions:
drink:
maxVol: 20
maxVol: 30
reagents:
- ReagentId: IcedTea
Quantity: 20
Quantity: 30
- type: Sprite
sprite: Objects/Consumable/Drinks/ice_tea_can.rsi
- type: Item
@@ -83,10 +83,10 @@
- type: SolutionContainerManager
solutions:
drink:
maxVol: 20
maxVol: 30
reagents:
- ReagentId: LemonLime
Quantity: 20
Quantity: 30
- type: Sprite
sprite: Objects/Consumable/Drinks/lemon-lime.rsi
- type: Item
@@ -98,6 +98,13 @@
name: grape soda can
description: Sweetened drink with a grape flavor and a deep purple color.
components:
- type: SolutionContainerManager
solutions:
drink:
maxVol: 30
reagents:
- ReagentId: GrapeSoda
Quantity: 30
- type: Sprite
sprite: Objects/Consumable/Drinks/purple_can.rsi
- type: Item
@@ -112,10 +119,10 @@
- type: SolutionContainerManager
solutions:
drink:
maxVol: 20
maxVol: 50
reagents:
- ReagentId: SodaWater
Quantity: 20
Quantity: 50
- type: Drink
- type: Sprite
sprite: Objects/Consumable/Drinks/sodawater.rsi
@@ -129,10 +136,10 @@
- type: SolutionContainerManager
solutions:
drink:
maxVol: 20
maxVol: 30
reagents:
- ReagentId: SpaceMountainWind
Quantity: 20
Quantity: 30
- type: Sprite
sprite: Objects/Consumable/Drinks/space_mountain_wind.rsi
- type: Item
@@ -147,10 +154,10 @@
- type: SolutionContainerManager
solutions:
drink:
maxVol: 20
maxVol: 30
reagents:
- ReagentId: SpaceUp
Quantity: 20
Quantity: 30
- type: Sprite
sprite: Objects/Consumable/Drinks/space-up.rsi
- type: Item
@@ -162,6 +169,13 @@
name: starkist can
description: The taste of a star in liquid form. And, a bit of tuna...?
components:
- type: SolutionContainerManager
solutions:
drink:
maxVol: 30
reagents:
- ReagentId: Starkist
Quantity: 30
- type: Sprite
sprite: Objects/Consumable/Drinks/starkist.rsi
- type: Item
@@ -176,10 +190,10 @@
- type: SolutionContainerManager
solutions:
drink:
maxVol: 20
maxVol: 50
reagents:
- ReagentId: TonicWater
Quantity: 20
Quantity: 50
- type: Drink
- type: Sprite
sprite: Objects/Consumable/Drinks/tonic.rsi
@@ -193,10 +207,10 @@
- type: SolutionContainerManager
solutions:
drink:
maxVol: 20
maxVol: 30
reagents:
- ReagentId: FourteenLoko
Quantity: 20
Quantity: 30
- type: Sprite
sprite: Objects/Consumable/Drinks/fourteen_loko.rsi
- type: Item
@@ -211,10 +225,10 @@
- type: SolutionContainerManager
solutions:
drink:
maxVol: 20
maxVol: 30
reagents:
- ReagentId: ChangelingSting
Quantity: 20
Quantity: 30
- type: Drink
- type: Sprite
sprite: Objects/Consumable/Drinks/changelingsting.rsi
@@ -230,10 +244,10 @@
- type: SolutionContainerManager
solutions:
drink:
maxVol: 20
maxVol: 30
reagents:
- ReagentId: DrGibb
Quantity: 20
Quantity: 30
- type: Drink
- type: Sprite
sprite: Objects/Consumable/Drinks/dr_gibb.rsi
@@ -242,10 +256,17 @@
- type: entity
parent: DrinkCanBaseFull
id: DrinkEnergyDrink
id: DrinkEnergyDrinkCan
name: red bool energy drink
description: A can of Red Bool, with enough caffeine to kill a horse.
components:
- type: SolutionContainerManager
solutions:
drink:
maxVol: 30
reagents:
- ReagentId: EnergyDrink
Quantity: 30
- type: Drink
- type: Sprite
sprite: Objects/Consumable/Drinks/energy_drink.rsi

8
Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml
View File

@@ -286,14 +286,6 @@
color: "#664300"
spritePath: bravebullglass.rsi
- type: reagent
id: BrownStar
name: brown star
desc: It's not what it sounds like...
physicalDesc: strong-smelling
color: "#9F3400"
spritePath: brownstar.rsi
- type: reagent
id: CubaLibre
name: cuba libre

42
Resources/Prototypes/Reagents/Consumable/Drink/soda.yml
View File

@@ -40,6 +40,34 @@
- !type:AdjustHealth
amount: 0.1
- type: reagent
id: EnergyDrink
name: Energy Drink
desc: A dose of energy! Nanotrasen is not responsible if you grow avian appendages.
physicalDesc: fizzy
color: "#ffffbf"
plantMetabolism:
- !type:AdjustNutrition
amount: 0.1
- !type:AdjustWater
amount: 1
- !type:AdjustHealth
amount: 0.1
- type: reagent
id: GrapeSoda
name: grape soda
desc: It's Graaaaaape!
physicalDesc: fizzy
color: "#ae94a6"
plantMetabolism:
- !type:AdjustNutrition
amount: 0.1
- !type:AdjustWater
amount: 1
- !type:AdjustHealth
amount: 0.1
- type: reagent
id: LemonLime
name: lemon-lime
@@ -97,6 +125,20 @@
- !type:AdjustHealth
amount: 0.1
- type: reagent
id: Starkist
name: starkist
desc: A sweet, orange flavored soft drink.
physicalDesc: fizzy
color: "#9F3400"
plantMetabolism:
- !type:AdjustNutrition
amount: 0.1
- !type:AdjustWater
amount: 1
- !type:AdjustHealth
amount: 0.1
- type: reagent
id: FourteenLoko
name: Fourteen Loko

20
Resources/Prototypes/Recipes/Reactions/drinks.yml
View File

@@ -112,16 +112,6 @@
products:
BraveBull: 3
- type: reaction
id: BrownStar
reactants:
Cola:
amount: 1
JuiceOrange:
amount: 2
products:
BrownStar: 3
- type: reaction
id: CafeLatte
reactants:
@@ -470,6 +460,16 @@
products:
SoyLatte: 2
- type: reaction
id: Starkist
reactants:
Cola:
amount: 1
JuiceOrange:
amount: 2
products:
Starkist: 3
- type: reaction
id: SyndicateBomb
reactants: