Merge pull request #1632 from kipdotnet/sipulacrum

sipulacrum

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

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.
+reagent-desc-raktaccino = Piping hot, achingly bitter, and absolutely delicious.
+
+reagent-name-orangecoffee = orange coffee
+reagent-desc-orangecoffee = Slide me a drink, Barfriend.

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

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

Resources/Prototypes/_Impstation/Reagents/Consumable/Drink/drinks.yml

@@ -44,4 +44,29 @@
       - !type:AdjustReagent
         reagent: Theobromine
         amount: 0.1
-  fizziness: 0.1
+  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

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

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"
+        }
+    ]
+}