Merge pull request DeltaV-Station#90 from leonardo-dabepis/branchy

Updated epi clothes, Sophic Grammateus sprite, and new cocktail Dulleavene

Resources/Locale/en-US/flavors/flavor-profiles.ftl

@@ -221,3 +221,4 @@ flavor-complex-lemondrop = refreshingly tart
 flavor-complex-greengrass = like a holiday in the sun
 flavor-complex-daiquiri = fashionable
 flavor-complex-arsonistsbrew = like ash and flame
+flavor-complex-dulleavene = ominous

Resources/Locale/en-US/reagents/meta/consumable/drink/alcohol.ftl

@@ -284,3 +284,6 @@ reagent-desc-daiquiri = A sweet rum and lime mix, a favourite of writers and pol
 
 reagent-name-arsonistsbrew = arsonist's brew
 reagent-desc-arsonistsbrew = Take a sip and laugh, while you watch your world burn.
+
+reagent-name-dulleavene = dulleavene
+reagent-desc-dulleavene = Allegedly it's a cocktail. The warning cone motif seems apt.

Resources/Prototypes/DeltaV/Entities/Clothing/Neck/cloaks.yml

@@ -0,0 +1,10 @@
+- type: entity
+  parent: ClothingNeckBase
+  id: ClothingNeckCloakMystagogue
+  name: mystagogue's cloak
+  description: A comfy white and purple cloak, perfect for those sleepless nights when you're haunted by the yet unsolved mysteries of the universe.
+  components:
+  - type: Sprite
+    sprite: DeltaV/Clothing/Neck/Cloaks/mystacloak.rsi
+  - type: Clothing
+    sprite: DeltaV/Clothing/Neck/Cloaks/mystacloak.rsi    

Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Drinks/drinks.yml

@@ -1,3 +1,19 @@
+- type: entity
+  parent: DrinkGlassBase
+  id: DrinkDulleaveneGlass
+  name: dulleavene glass
+  description: Allegedly it's a cocktail. The warning cone motif seems apt.
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: Dulleavene
+          Quantity: 30
+  - type: Sprite
+    sprite: DeltaV/Objects/Consumable/Drinks/dulleavene.rsi
+
 - type: entity
   parent: DrinkGlassBase
   id: DrinkGunmetalGlass

Resources/Prototypes/DeltaV/Flavors/flavors.yml

@@ -1,3 +1,8 @@
+- type: flavor
+  id: dulleavene
+  flavorType: Complex
+  description: flavor-complex-dulleavene
+
 - type: flavor
   id: gunmetal
   flavorType: Complex

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

@@ -1,3 +1,23 @@
+- type: reagent
+  id: Dulleavene
+  name: reagent-name-dulleavene
+  parent: BaseDrink
+  desc: reagent-desc-dulleavene
+  physicalDesc: reagent-physical-desc-strong-smelling
+  flavor: dulleavene
+  color: "#ff7f00"
+  metamorphicSprite:
+    sprite: DeltaV/Objects/Consumable/Drinks/dulleavene.rsi
+    state: icon
+  metabolisms:
+    Drink:
+      effects:
+      - !type:SatiateThirst
+        factor: 2
+      - !type:AdjustReagent
+        reagent: Ethanol
+        amount: 0.55
+
 - type: reagent
   id: Gunmetal #Credit to DinkusMcsplinkus for inspiring this drink. This could've also been called "Creamy Ignition"
   name: reagent-name-gunmetal

Resources/Prototypes/DeltaV/Recipes/Reactions/drinks.yml

@@ -1,3 +1,17 @@
+- type: reaction
+  id: Dulleavene
+  reactants:
+    GargleBlaster:
+      amount: 10
+    Moonshine:
+      amount: 6
+    VodkaMartini:
+      amount: 3
+    Vermouth:
+      amount: 1
+  products:
+    Dulleavene: 20
+
 - type: reaction
   id: Gunmetal
   reactants:

Resources/Prototypes/Nyanotrasen/Entities/Clothing/OuterClothing/robes.yml

@@ -1,13 +1,13 @@
 - type: entity
   parent: ClothingOuterBase
   id: ClothingOuterRobeWhite
-  name: white robe
-  description: This doesn't look creepy at all.
+  name: epistemics labcoat
+  description: A standard Epistemics labcoat.
   components:
   - type: Sprite
-    sprite: Nyanotrasen/Clothing/OuterClothing/Robes/white.rsi
+    sprite: DeltaV/Clothing/OuterClothing/Robes/white.rsi
   - type: Clothing
-    sprite: Nyanotrasen/Clothing/OuterClothing/Robes/white.rsi
+    sprite: DeltaV/Clothing/OuterClothing/Robes/white.rsi
   - type: TemperatureProtection
     coefficient: 0.2
 
@@ -27,13 +27,13 @@
 - type: entity
   parent: ClothingOuterBase
   id: ClothingOuterRobeMystic
-  name: mystic robe
-  description: The mystagogue's flashy robe.
+  name: mystagogue labcoat
+  description: The mystagogue's flashy labcoat.
   components:
   - type: Sprite
-    sprite: Nyanotrasen/Clothing/OuterClothing/Robes/mystic.rsi
+    sprite: DeltaV/Clothing/OuterClothing/Robes/mystic.rsi
   - type: Clothing
-    sprite: Nyanotrasen/Clothing/OuterClothing/Robes/mystic.rsi
+    sprite: DeltaV/Clothing/OuterClothing/Robes/mystic.rsi
   - type: TemperatureProtection
     coefficient: 0.2
 

Resources/Prototypes/Nyanotrasen/Entities/Structures/Research/oracle.yml

@@ -8,7 +8,7 @@
     noRot: true
     drawdepth: Mobs
     offset: "0.0,0.5"
-    sprite: Nyanotrasen/Structures/Decoration/statues.rsi
+    sprite: DeltaV/Structures/Decoration/statues.rsi
     layers:
       - state: oracle-0
       - map: ["enum.SolutionContainerLayers.Fill"]

Resources/Prototypes/Nyanotrasen/Entities/Structures/Research/sophicscribe.yml

@@ -1,16 +1,18 @@
 - type: entity
   parent: BaseStructure
   id: SophicScribe
-  name: Sophia
+  name: sophic grammateus
+
   description: Latest reports on the Noösphere!
   components:
   - type: Sprite
     noRot: true
     drawdepth: Mobs
     offset: "0.0,0.5"
-    sprite: Nyanotrasen/Structures/Decoration/statues.rsi
+    sprite: DeltaV/Structures/Decoration/statues.rsi
     layers:
-      - state: sophia
+      - state: sophie
+
       - map: ["enum.SolutionContainerLayers.Fill"]
   - type: SophicScribe
   - type: Speech

Resources/Textures/DeltaV/Clothing/Neck/Cloaks/mystacloak.rsi/meta.json

@@ -0,0 +1,18 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Artwork by Leonardo_DaBepis. https://leonardo-dabepis.tumblr.com/",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-NECK",
+      "directions": 4
+    }
+  ]
+}

Resources/Textures/DeltaV/Clothing/OuterClothing/Robes/mystic.rsi/meta.json

@@ -0,0 +1,18 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Art by Leonardo_DaBepis. https://leonardo-dabepis.tumblr.com/",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-OUTERCLOTHING",
+      "directions": 4
+    }
+  ]
+}

Resources/Textures/DeltaV/Clothing/OuterClothing/Robes/white.rsi/meta.json

@@ -0,0 +1,18 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Art by Leonardo_DaBepis. https://leonardo-dabepis.tumblr.com/",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-OUTERCLOTHING",
+      "directions": 4
+    }
+  ]
+}

Resources/Textures/DeltaV/Objects/Consumable/Drinks/dulleavene.rsi/meta.json

@@ -0,0 +1,14 @@
+{
+  "version": 1,
+  "license": "CC0-1.0",
+  "copyright": "Artwork by Leonardo_DaBepis. https://leonardo-dabepis.tumblr.com/",
+  "size": {
+    "x": 13,
+    "y": 17
+  },
+  "states": [
+    {
+      "name": "icon"
+    }
+  ]
+}

Resources/Textures/DeltaV/Structures/Decoration/statues.rsi/meta.json

@@ -0,0 +1,87 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "leonardo_dabepis (232229415176634368) on Discord for the Oracle and Sophie, @Vordenburg for the liquid",
+  "size": {
+    "x": 32,
+    "y": 64
+  },
+  "states": [
+    {
+      "name": "sophie"
+    },
+    {
+      "name": "oracle-0"
+    },
+    {
+      "name": "oracle-1"
+    },
+    {
+      "name": "oracle-2"
+    },
+    {
+      "name": "oracle-3"
+    },
+    {
+      "name": "oracle-4"
+    },
+    {
+      "name": "oracle-5"
+    },
+    {
+      "name": "oracle-6",
+      "delays": [
+        [
+          0.20,
+          0.20,
+          0.20,
+          0.20
+        ]
+      ]
+    },
+    {
+      "name": "oracle-7",
+      "delays": [
+        [
+          0.20,
+          0.20,
+          0.20,
+          0.20
+        ]
+      ]
+    },
+    {
+      "name": "oracle-8",
+      "delays": [
+        [
+          0.20,
+          0.20,
+          0.20,
+          0.20
+        ]
+      ]
+    },
+    {
+      "name": "oracle-9",
+      "delays": [
+        [
+          0.20,
+          0.20,
+          0.20,
+          0.20
+        ]
+      ]
+    },
+    {
+      "name": "oracle-10",
+      "delays": [
+        [
+          0.20,
+          0.20,
+          0.20,
+          0.20
+        ]
+      ]
+    }
+  ]
+}