diff --git a/Resources/Locale/en-US/deltav/flavors/flavor-profiles.ftl b/Resources/Locale/en-US/deltav/flavors/flavor-profiles.ftl index 6c93c98ed3c..51b345aa339 100644 --- a/Resources/Locale/en-US/deltav/flavors/flavor-profiles.ftl +++ b/Resources/Locale/en-US/deltav/flavors/flavor-profiles.ftl @@ -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}. diff --git a/Resources/Locale/en-US/deltav/reagents/meta/consumable/drink/soda.ftl b/Resources/Locale/en-US/deltav/reagents/meta/consumable/drink/soda.ftl new file mode 100644 index 00000000000..156f8aaa73a --- /dev/null +++ b/Resources/Locale/en-US/deltav/reagents/meta/consumable/drink/soda.ftl @@ -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. diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/gib.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/gib.yml index 98513a48a4a..171eb196f77 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/gib.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/gib.yml @@ -2,6 +2,7 @@ id: DrGibbInventory startingInventory: DrinkDrGibbCan: 4 + DrinkDrGibbBloodRedCan: 2 # Delta-V DrinkGrapeCan: 2 DrinkRootBeerCan: 2 DrinkIcedTeaCan: 2 diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Drinks/drinks_cans.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Drinks/drinks_cans.yml new file mode 100644 index 00000000000..a7e16b8c33c --- /dev/null +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Drinks/drinks_cans.yml @@ -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 diff --git a/Resources/Prototypes/DeltaV/Flavors/flavors.yml b/Resources/Prototypes/DeltaV/Flavors/flavors.yml index 8d0d01efa0b..9ed9b3003f4 100644 --- a/Resources/Prototypes/DeltaV/Flavors/flavors.yml +++ b/Resources/Prototypes/DeltaV/Flavors/flavors.yml @@ -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 diff --git a/Resources/Prototypes/DeltaV/Reagents/Consumable/Drink/soda.yml b/Resources/Prototypes/DeltaV/Reagents/Consumable/Drink/soda.yml new file mode 100644 index 00000000000..42db09785bd --- /dev/null +++ b/Resources/Prototypes/DeltaV/Reagents/Consumable/Drink/soda.yml @@ -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 diff --git a/Resources/Prototypes/DeltaV/Recipes/Reactions/drinks.yml b/Resources/Prototypes/DeltaV/Recipes/Reactions/drinks.yml index 60bb26eaa2f..e64c347e445 100644 --- a/Resources/Prototypes/DeltaV/Recipes/Reactions/drinks.yml +++ b/Resources/Prototypes/DeltaV/Recipes/Reactions/drinks.yml @@ -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 diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/drgibbbloodred.rsi/icon.png b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/drgibbbloodred.rsi/icon.png new file mode 100644 index 00000000000..9c45adab3b8 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/drgibbbloodred.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/drgibbbloodred.rsi/icon_open.png b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/drgibbbloodred.rsi/icon_open.png new file mode 100644 index 00000000000..3062fdb7bd9 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/drgibbbloodred.rsi/icon_open.png differ diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/drgibbbloodred.rsi/inhand-left.png b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/drgibbbloodred.rsi/inhand-left.png new file mode 100644 index 00000000000..aba54f1fbf7 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/drgibbbloodred.rsi/inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/drgibbbloodred.rsi/inhand-right.png b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/drgibbbloodred.rsi/inhand-right.png new file mode 100644 index 00000000000..e61f8c27269 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/drgibbbloodred.rsi/inhand-right.png differ diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/drgibbbloodred.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/drgibbbloodred.rsi/meta.json new file mode 100644 index 00000000000..27218dea25f --- /dev/null +++ b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/drgibbbloodred.rsi/meta.json @@ -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 + } + ] + }