diff --git a/Resources/Locale/en-US/_Impstation/flavors/flavor-profiles.ftl b/Resources/Locale/en-US/_Impstation/flavors/flavor-profiles.ftl index d731eeee04cb..285d05325d0a 100644 --- a/Resources/Locale/en-US/_Impstation/flavors/flavor-profiles.ftl +++ b/Resources/Locale/en-US/_Impstation/flavors/flavor-profiles.ftl @@ -28,3 +28,5 @@ flavor-complex-secticket = like rotten eggs flavor-complex-medium = like your vision expanded flavor-complex-rodent = like rodents + +flavor-complex-orangecoffee = excitingly acidic \ No newline at end of file diff --git a/Resources/Locale/en-US/_Impstation/reagents/meta/consumable/drink/drinks.ftl b/Resources/Locale/en-US/_Impstation/reagents/meta/consumable/drink/drinks.ftl index 36ebcb4ceeb2..f6b99944b2ac 100644 --- a/Resources/Locale/en-US/_Impstation/reagents/meta/consumable/drink/drinks.ftl +++ b/Resources/Locale/en-US/_Impstation/reagents/meta/consumable/drink/drinks.ftl @@ -5,4 +5,7 @@ reagent-name-horsepussy = the horsepussy reagent-desc-horsepussy = Two-thirds apple martini Crystal Liteā„¢, one-third methadone. They are going to drink this after me when I die. reagent-name-raktaccino = raktaccino -reagent-desc-raktaccino = Piping hot, achingly bitter, and absolutely delicious. \ No newline at end of file +reagent-desc-raktaccino = Piping hot, achingly bitter, and absolutely delicious. + +reagent-name-orangecoffee = orange coffee +reagent-desc-orangecoffee = Slide me a drink, Barfriend. \ No newline at end of file diff --git a/Resources/Prototypes/_Impstation/Entities/Objects/Consumable/Drinks/drinks.yml b/Resources/Prototypes/_Impstation/Entities/Objects/Consumable/Drinks/drinks.yml index 45501b159add..7bb658c5a54a 100644 --- a/Resources/Prototypes/_Impstation/Entities/Objects/Consumable/Drinks/drinks.yml +++ b/Resources/Prototypes/_Impstation/Entities/Objects/Consumable/Drinks/drinks.yml @@ -431,3 +431,19 @@ - type: Icon sprite: _Impstation/Objects/Consumable/Drinks/lovepotion.rsi state: icon + +- type: entity + parent: DrinkGlass + id: DrinkOrangeCoffeeGlass + suffix: orange coffee + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: OrangeCoffee + Quantity: 30 + - type: Icon + sprite: _Impstation/Objects/Consumable/Drinks/orangecoffee.rsi + state: icon diff --git a/Resources/Prototypes/_Impstation/Flavors/flavors.yml b/Resources/Prototypes/_Impstation/Flavors/flavors.yml index 56d0ea1f0c42..6a4f430b9c79 100644 --- a/Resources/Prototypes/_Impstation/Flavors/flavors.yml +++ b/Resources/Prototypes/_Impstation/Flavors/flavors.yml @@ -122,3 +122,8 @@ id: lovepotion flavorType: Complex description: flavor-complex-lovepotion + +- type: flavor + id: orangecoffee + flavorType: Complex + description: flavor-complex-orangecoffee diff --git a/Resources/Prototypes/_Impstation/Reagents/Consumable/Drink/drinks.yml b/Resources/Prototypes/_Impstation/Reagents/Consumable/Drink/drinks.yml index 16fa2f8d499d..4f852966cb6d 100644 --- a/Resources/Prototypes/_Impstation/Reagents/Consumable/Drink/drinks.yml +++ b/Resources/Prototypes/_Impstation/Reagents/Consumable/Drink/drinks.yml @@ -44,4 +44,29 @@ - !type:AdjustReagent reagent: Theobromine amount: 0.1 - fizziness: 0.1 \ No newline at end of file + fizziness: 0.1 + +- type: reagent + id: OrangeCoffee + name: reagent-name-orangecoffee + parent: BaseDrink + desc: reagent-desc-orangecoffee + physicalDesc: reagent-physical-desc-citric + flavor: orangecoffee + color: "#f8af41" + metamorphicSprite: + sprite: _Impstation/Objects/Consumable/Drinks/orangecoffee.rsi + state: icon_empty + metamorphicMaxFillLevels: 6 + metamorphicFillBaseName: fill- + metamorphicChangeColor: true + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 + - !type:GenericStatusEffect + key: Drowsiness + time: 2.0 + type: Remove + fizziness: 0.1 diff --git a/Resources/Prototypes/_Impstation/Recipes/Reactions/drinks.yml b/Resources/Prototypes/_Impstation/Recipes/Reactions/drinks.yml index 2a781bbba6be..ecc067cb8335 100644 --- a/Resources/Prototypes/_Impstation/Recipes/Reactions/drinks.yml +++ b/Resources/Prototypes/_Impstation/Recipes/Reactions/drinks.yml @@ -403,3 +403,15 @@ amount: 1 products: LovePotion: 4 + +- type: reaction + id: OrangeCoffee + requiredMixerCategories: + - Shake + reactants: + JuiceOrange: + amount: 1 + Coffee: + amount: 1 + products: + OrangeCoffee: 2 diff --git a/Resources/Textures/_Impstation/Objects/Consumable/Drinks/orangecoffee.rsi/fill-1.png b/Resources/Textures/_Impstation/Objects/Consumable/Drinks/orangecoffee.rsi/fill-1.png new file mode 100644 index 000000000000..f1149277511c Binary files /dev/null and b/Resources/Textures/_Impstation/Objects/Consumable/Drinks/orangecoffee.rsi/fill-1.png differ diff --git a/Resources/Textures/_Impstation/Objects/Consumable/Drinks/orangecoffee.rsi/fill-2.png b/Resources/Textures/_Impstation/Objects/Consumable/Drinks/orangecoffee.rsi/fill-2.png new file mode 100644 index 000000000000..4da9f3db3804 Binary files /dev/null and b/Resources/Textures/_Impstation/Objects/Consumable/Drinks/orangecoffee.rsi/fill-2.png differ diff --git a/Resources/Textures/_Impstation/Objects/Consumable/Drinks/orangecoffee.rsi/fill-3.png b/Resources/Textures/_Impstation/Objects/Consumable/Drinks/orangecoffee.rsi/fill-3.png new file mode 100644 index 000000000000..1787d0692e4b Binary files /dev/null and b/Resources/Textures/_Impstation/Objects/Consumable/Drinks/orangecoffee.rsi/fill-3.png differ diff --git a/Resources/Textures/_Impstation/Objects/Consumable/Drinks/orangecoffee.rsi/fill-4.png b/Resources/Textures/_Impstation/Objects/Consumable/Drinks/orangecoffee.rsi/fill-4.png new file mode 100644 index 000000000000..86198caf29ef Binary files /dev/null and b/Resources/Textures/_Impstation/Objects/Consumable/Drinks/orangecoffee.rsi/fill-4.png differ diff --git a/Resources/Textures/_Impstation/Objects/Consumable/Drinks/orangecoffee.rsi/fill-5.png b/Resources/Textures/_Impstation/Objects/Consumable/Drinks/orangecoffee.rsi/fill-5.png new file mode 100644 index 000000000000..a342d33bf85b Binary files /dev/null and b/Resources/Textures/_Impstation/Objects/Consumable/Drinks/orangecoffee.rsi/fill-5.png differ diff --git a/Resources/Textures/_Impstation/Objects/Consumable/Drinks/orangecoffee.rsi/fill-6.png b/Resources/Textures/_Impstation/Objects/Consumable/Drinks/orangecoffee.rsi/fill-6.png new file mode 100644 index 000000000000..cad517fe629d Binary files /dev/null and b/Resources/Textures/_Impstation/Objects/Consumable/Drinks/orangecoffee.rsi/fill-6.png differ diff --git a/Resources/Textures/_Impstation/Objects/Consumable/Drinks/orangecoffee.rsi/icon.png b/Resources/Textures/_Impstation/Objects/Consumable/Drinks/orangecoffee.rsi/icon.png new file mode 100644 index 000000000000..9c871a38e0db Binary files /dev/null and b/Resources/Textures/_Impstation/Objects/Consumable/Drinks/orangecoffee.rsi/icon.png differ diff --git a/Resources/Textures/_Impstation/Objects/Consumable/Drinks/orangecoffee.rsi/icon_empty.png b/Resources/Textures/_Impstation/Objects/Consumable/Drinks/orangecoffee.rsi/icon_empty.png new file mode 100644 index 000000000000..18d066202951 Binary files /dev/null and b/Resources/Textures/_Impstation/Objects/Consumable/Drinks/orangecoffee.rsi/icon_empty.png differ diff --git a/Resources/Textures/_Impstation/Objects/Consumable/Drinks/orangecoffee.rsi/meta.json b/Resources/Textures/_Impstation/Objects/Consumable/Drinks/orangecoffee.rsi/meta.json new file mode 100644 index 000000000000..412e5b2cf825 --- /dev/null +++ b/Resources/Textures/_Impstation/Objects/Consumable/Drinks/orangecoffee.rsi/meta.json @@ -0,0 +1,35 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Sprited by kipdotnet(github) for Impstation", + "states": [ + { + "name": "icon" + }, + { + "name": "icon_empty" + }, + { + "name": "fill-1" + }, + { + "name": "fill-2" + }, + { + "name": "fill-3" + }, + { + "name": "fill-4" + }, + { + "name": "fill-5" + }, + { + "name": "fill-6" + } + ] +}