Skip to content

Commit

Permalink
New Blood Based Soda! (#2250)
Browse files Browse the repository at this point in the history
* 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
BlitzTheSquishy and MilonPL authored Dec 18, 2024
1 parent 7200dfb commit 9de9a17
Show file tree
Hide file tree
Showing 12 changed files with 83 additions and 0 deletions.
1 change: 1 addition & 0 deletions Resources/Locale/en-US/deltav/flavors/flavor-profiles.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ flavor-complex-blellow = like an impossible color
flavor-complex-candy-strawberry = like strawberries
flavor-complex-candy-bubblegum = like bubble gum
flavor-complex-double-ice-cream = like ice cream, twice
flavor-complex-drgibbbloodred = like severe malpractice
candy-flavor-profile = This one is supposed to taste {$flavor}.
candy-flavor-profile-multiple = This one is supposed to taste {$flavors} and {$lastFlavor}.
Expand Down
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.
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
id: DrGibbInventory
startingInventory:
DrinkDrGibbCan: 4
DrinkDrGibbBloodRedCan: 2 # Delta-V
DrinkGrapeCan: 2
DrinkRootBeerCan: 2
DrinkIcedTeaCan: 2
Expand Down
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
5 changes: 5 additions & 0 deletions Resources/Prototypes/DeltaV/Flavors/flavors.yml
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,11 @@
flavorType: Complex
description: flavor-complex-blellow

- type: flavor
id: drgibbbloodred
flavorType: Complex
description: flavor-complex-drgibbbloodred

# this is prefixed with "candy" to avoid clashes with potential future strawberries upstream
- type: flavor
id: candystrawberry
Expand Down
22 changes: 22 additions & 0 deletions Resources/Prototypes/DeltaV/Reagents/Consumable/Drink/soda.yml
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
12 changes: 12 additions & 0 deletions Resources/Prototypes/DeltaV/Recipes/Reactions/drinks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -100,3 +100,15 @@
amount: 1
products:
DoubleIceCream: 3

- type: reaction
id: DrGibbBloodRed
reactants:
DrGibb:
amount: 3
Blood:
amount: 2
Sugar:
amount: 1
products:
DrGibbBloodRed: 6
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": "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
}
]
}

0 comments on commit 9de9a17

Please sign in to comment.