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.

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

Added A new drink! #18

Merged
merged 2 commits into from
Jul 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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/Locale/en-US/flavors/flavor-profiles.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,7 @@ flavor-complex-milk = like milk
flavor-complex-tea = like tea
flavor-complex-ice = like ice
flavor-complex-mopwata = like stagnant, dirty water
flavor-complex-nikkonectar = like creamy blueberries.

## Cocktails
flavor-complex-long-island = suspiciously like iced tea
Expand Down
2 changes: 2 additions & 0 deletions Resources/Locale/en-US/reagents/floofstation/drinks.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
reagent-name-NNN = Nikko's Naughty Nectar
reagent-desc-NNN = A sticky, musky white liquid that tastes of blueberries.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
- type: vendingMachineInventory
- type: vendingMachineInventory
id: SodaInventory
startingInventory:
DrinkColaCan: 3
Expand All @@ -7,6 +7,7 @@
DrinkIcedTeaCan: 3
DrinkLemonLimeCan: 3
DrinkFourteenLokoCan: 3
DrinkNNNCan: 3 #Floofstation
emaggedInventory:
DrinkNukieCan: 3
DrinkChangelingStingCan: 3
Original file line number Diff line number Diff line change
Expand Up @@ -499,3 +499,22 @@
sprite: Objects/Consumable/Drinks/wine_can.rsi
- type: Item
sprite: Objects/Consumable/Drinks/wine_can.rsi

#Floof
- type: entity
parent: DrinkCanBaseFull
id: DrinkNNNCan
name: Nikkos Naughty Nectar
description: A can of Nikko's Naughty Nectar! Best not to ask how it's made...
components:
- type: SolutionContainerManager
solutions:
drink:
maxVol: 30
reagents:
- ReagentId: NikkosNaughtyNectar
Quantity: 30
- type: Sprite
sprite: Objects/Consumable/Drinks/nnn_can.rsi
- type: Item
sprite: Objects/Consumable/Drinks/nnn_can.rsi
4 changes: 4 additions & 0 deletions Resources/Prototypes/FloofStation/Flavors/flavors.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
- type: flavor
id: nikkonectar
flavorType: Complex
description: flavor-complex-nikkonectar
20 changes: 20 additions & 0 deletions Resources/Prototypes/FloofStation/Reagents/Drinks/drinks.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
- type: reagent
id: NikkosNaughtyNectar
name: reagent-name-NNN
parent: BaseDrink
desc: reagent-desc-NNN
physicalDesc: reagent-physical-desc-creamy
flavor: nikkonectar
color: "#deebff"
recognizable: true
viscosity: 0.15
metabolisms:
Drink:
effects:
- !type:SatiateThirst
factor: 2
#TO-DO Lust+
footstepSound:
collection: FootstepSticky
params:
volume: 3
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
@@ -0,0 +1,25 @@
{
"version": 1,
"size": {
"x": 32,
"y": 32
},
"license": "CC-BY-SA-3.0",
"copyright": "Originally Rootbeer, Edited by Memeji",
"states": [
{
"name": "icon"
},
{
"name": "icon_open"
},
{
"name": "inhand-right",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
}
]
}
Loading