-
Notifications
You must be signed in to change notification settings - Fork 381
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* NEW DRINKY!! * flavour is now not broken :) * AAAAAAAAAAAAAAAAAAAAAAAAAA * Milons annoyances :blunt: * "untouch" I dont like using the web interface, its also superfluous spaces Signed-off-by: Blitz <[email protected]> * Update drinks_cans.yml Signed-off-by: Blitz <[email protected]> * Update flavor-profiles.ftl Signed-off-by: Blitz <[email protected]> * Update meta.json Signed-off-by: Blitz <[email protected]> * deltanedas fix --------- Signed-off-by: Blitz <[email protected]> Co-authored-by: Milon <[email protected]>
- Loading branch information
1 parent
7200dfb
commit 9de9a17
Showing
12 changed files
with
83 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 2 additions & 0 deletions
2
Resources/Locale/en-US/deltav/reagents/meta/consumable/drink/soda.ftl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
reagent-name-dr-gibb-blood-red = Dr. Gibb Blood Red | ||
reagent-desc-dr-gibb-blood-red = A drink to quench YOUR blood thirst. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
15 changes: 15 additions & 0 deletions
15
Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Drinks/drinks_cans.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
- type: entity | ||
parent: DrinkCanBaseFull | ||
id: DrinkDrGibbBloodRedCan | ||
name: Dr. Gibb Blood Red can | ||
description: A drink to quench YOUR bloodthirst. | ||
components: | ||
- type: SolutionContainerManager | ||
solutions: | ||
drink: | ||
maxVol: 30 | ||
reagents: | ||
- ReagentId: DrGibbBloodRed | ||
Quantity: 30 | ||
- type: Sprite | ||
sprite: DeltaV/Objects/Consumable/Drinks/drgibbbloodred.rsi |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
22 changes: 22 additions & 0 deletions
22
Resources/Prototypes/DeltaV/Reagents/Consumable/Drink/soda.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
- type: reagent | ||
id: DrGibbBloodRed | ||
name: reagent-name-dr-gibb-blood-red | ||
parent: BaseSoda | ||
desc: reagent-desc-dr-gibb-blood-red | ||
physicalDesc: reagent-physical-desc-fizzy | ||
flavor: drgibbbloodred | ||
color: "#570303" | ||
metabolisms: | ||
Drink: | ||
effects: | ||
- !type:SatiateThirst | ||
factor: 2.0 | ||
conditions: | ||
- !type:OrganType | ||
type: Human | ||
shouldHave: false | ||
Food: | ||
effects: | ||
- !type:AdjustReagent | ||
reagent: UncookedAnimalProteins | ||
amount: 0.05 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file added
BIN
+463 Bytes
Resources/Textures/DeltaV/Objects/Consumable/Drinks/drgibbbloodred.rsi/icon.png
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
BIN
+493 Bytes
...rces/Textures/DeltaV/Objects/Consumable/Drinks/drgibbbloodred.rsi/icon_open.png
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
BIN
+435 Bytes
...es/Textures/DeltaV/Objects/Consumable/Drinks/drgibbbloodred.rsi/inhand-left.png
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
BIN
+462 Bytes
...s/Textures/DeltaV/Objects/Consumable/Drinks/drgibbbloodred.rsi/inhand-right.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
25 changes: 25 additions & 0 deletions
25
Resources/Textures/DeltaV/Objects/Consumable/Drinks/drgibbbloodred.rsi/meta.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi, Edit by Yuukitten", | ||
"states": [ | ||
{ | ||
"name": "icon" | ||
}, | ||
{ | ||
"name": "icon_open" | ||
}, | ||
{ | ||
"name": "inhand-right", | ||
"directions": 4 | ||
}, | ||
{ | ||
"name": "inhand-left", | ||
"directions": 4 | ||
} | ||
] | ||
} |