diff --git a/Resources/Locale/en-US/flavors/flavor-profiles.ftl b/Resources/Locale/en-US/flavors/flavor-profiles.ftl index 286977aead..ec0d369abe 100644 --- a/Resources/Locale/en-US/flavors/flavor-profiles.ftl +++ b/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 \ No newline at end of file diff --git a/Resources/Locale/en-US/reagents/meta/consumable/drink/alcohol.ftl b/Resources/Locale/en-US/reagents/meta/consumable/drink/alcohol.ftl index 52dd16cc18..3477587a35 100644 --- a/Resources/Locale/en-US/reagents/meta/consumable/drink/alcohol.ftl +++ b/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. \ No newline at end of file diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Neck/cloaks.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Neck/cloaks.yml new file mode 100644 index 0000000000..d40a6fe1ec --- /dev/null +++ b/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 diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Drinks/drinks.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Drinks/drinks.yml index 8379c2b35a..ecfe46df16 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Drinks/drinks.yml +++ b/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 diff --git a/Resources/Prototypes/DeltaV/Flavors/flavors.yml b/Resources/Prototypes/DeltaV/Flavors/flavors.yml index 3663feb237..152d7fea68 100644 --- a/Resources/Prototypes/DeltaV/Flavors/flavors.yml +++ b/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 diff --git a/Resources/Prototypes/DeltaV/Reagents/Consumable/Drink/drinks.yml b/Resources/Prototypes/DeltaV/Reagents/Consumable/Drink/drinks.yml index efdcdb6794..819c4de37d 100644 --- a/Resources/Prototypes/DeltaV/Reagents/Consumable/Drink/drinks.yml +++ b/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 diff --git a/Resources/Prototypes/DeltaV/Recipes/Reactions/drinks.yml b/Resources/Prototypes/DeltaV/Recipes/Reactions/drinks.yml index a704456c91..00f8297016 100644 --- a/Resources/Prototypes/DeltaV/Recipes/Reactions/drinks.yml +++ b/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: diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/OuterClothing/robes.yml b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/OuterClothing/robes.yml index 8c9fecde95..291f2c5c4e 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/OuterClothing/robes.yml +++ b/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 diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Research/oracle.yml b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Research/oracle.yml index f0135e345e..e73b9bf766 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Research/oracle.yml +++ b/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"] diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Research/sophicscribe.yml b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Research/sophicscribe.yml index 1195c4610e..a4f76b4890 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Research/sophicscribe.yml +++ b/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 diff --git a/Resources/Textures/DeltaV/Clothing/Neck/Cloaks/mystacloak.rsi/equipped-NECK.png b/Resources/Textures/DeltaV/Clothing/Neck/Cloaks/mystacloak.rsi/equipped-NECK.png new file mode 100644 index 0000000000..f78ae36579 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Neck/Cloaks/mystacloak.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Neck/Cloaks/mystacloak.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/Neck/Cloaks/mystacloak.rsi/icon.png new file mode 100644 index 0000000000..09a589e921 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Neck/Cloaks/mystacloak.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Neck/Cloaks/mystacloak.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Neck/Cloaks/mystacloak.rsi/meta.json new file mode 100644 index 0000000000..aee208ea76 --- /dev/null +++ b/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 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Robes/mystic.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/Robes/mystic.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000..4eccfc580f Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/OuterClothing/Robes/mystic.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Robes/mystic.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/Robes/mystic.rsi/icon.png new file mode 100644 index 0000000000..cdae6ea609 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/OuterClothing/Robes/mystic.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Robes/mystic.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/OuterClothing/Robes/mystic.rsi/meta.json new file mode 100644 index 0000000000..6f8c68ae51 --- /dev/null +++ b/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 + } + ] +} diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Robes/white.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/Robes/white.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000..ce5e23432f Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/OuterClothing/Robes/white.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Robes/white.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/Robes/white.rsi/icon.png new file mode 100644 index 0000000000..3ff890bfe2 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/OuterClothing/Robes/white.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Robes/white.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/OuterClothing/Robes/white.rsi/meta.json new file mode 100644 index 0000000000..6f8c68ae51 --- /dev/null +++ b/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 + } + ] +} diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/dulleavene.rsi/icon.png b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/dulleavene.rsi/icon.png new file mode 100644 index 0000000000..49aa80be1d Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/dulleavene.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/dulleavene.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/dulleavene.rsi/meta.json new file mode 100644 index 0000000000..86851510b0 --- /dev/null +++ b/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" + } + ] +} diff --git a/Resources/Textures/DeltaV/Structures/Decoration/statues.rsi/meta.json b/Resources/Textures/DeltaV/Structures/Decoration/statues.rsi/meta.json new file mode 100644 index 0000000000..bc9e6981c9 --- /dev/null +++ b/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 + ] + ] + } + ] +} diff --git a/Resources/Textures/DeltaV/Structures/Decoration/statues.rsi/oracle-0.png b/Resources/Textures/DeltaV/Structures/Decoration/statues.rsi/oracle-0.png new file mode 100644 index 0000000000..6a84162a1b Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Decoration/statues.rsi/oracle-0.png differ diff --git a/Resources/Textures/DeltaV/Structures/Decoration/statues.rsi/oracle-1.png b/Resources/Textures/DeltaV/Structures/Decoration/statues.rsi/oracle-1.png new file mode 100644 index 0000000000..20cc52d35a Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Decoration/statues.rsi/oracle-1.png differ diff --git a/Resources/Textures/DeltaV/Structures/Decoration/statues.rsi/oracle-10.png b/Resources/Textures/DeltaV/Structures/Decoration/statues.rsi/oracle-10.png new file mode 100644 index 0000000000..6c72c0224c Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Decoration/statues.rsi/oracle-10.png differ diff --git a/Resources/Textures/DeltaV/Structures/Decoration/statues.rsi/oracle-2.png b/Resources/Textures/DeltaV/Structures/Decoration/statues.rsi/oracle-2.png new file mode 100644 index 0000000000..f69bf747ab Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Decoration/statues.rsi/oracle-2.png differ diff --git a/Resources/Textures/DeltaV/Structures/Decoration/statues.rsi/oracle-3.png b/Resources/Textures/DeltaV/Structures/Decoration/statues.rsi/oracle-3.png new file mode 100644 index 0000000000..0185801cde Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Decoration/statues.rsi/oracle-3.png differ diff --git a/Resources/Textures/DeltaV/Structures/Decoration/statues.rsi/oracle-4.png b/Resources/Textures/DeltaV/Structures/Decoration/statues.rsi/oracle-4.png new file mode 100644 index 0000000000..ee891e5acb Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Decoration/statues.rsi/oracle-4.png differ diff --git a/Resources/Textures/DeltaV/Structures/Decoration/statues.rsi/oracle-5.png b/Resources/Textures/DeltaV/Structures/Decoration/statues.rsi/oracle-5.png new file mode 100644 index 0000000000..ffad4b363a Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Decoration/statues.rsi/oracle-5.png differ diff --git a/Resources/Textures/DeltaV/Structures/Decoration/statues.rsi/oracle-6.png b/Resources/Textures/DeltaV/Structures/Decoration/statues.rsi/oracle-6.png new file mode 100644 index 0000000000..9b286f5acf Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Decoration/statues.rsi/oracle-6.png differ diff --git a/Resources/Textures/DeltaV/Structures/Decoration/statues.rsi/oracle-7.png b/Resources/Textures/DeltaV/Structures/Decoration/statues.rsi/oracle-7.png new file mode 100644 index 0000000000..e175919e6d Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Decoration/statues.rsi/oracle-7.png differ diff --git a/Resources/Textures/DeltaV/Structures/Decoration/statues.rsi/oracle-8.png b/Resources/Textures/DeltaV/Structures/Decoration/statues.rsi/oracle-8.png new file mode 100644 index 0000000000..20889a8908 Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Decoration/statues.rsi/oracle-8.png differ diff --git a/Resources/Textures/DeltaV/Structures/Decoration/statues.rsi/oracle-9.png b/Resources/Textures/DeltaV/Structures/Decoration/statues.rsi/oracle-9.png new file mode 100644 index 0000000000..eb58ced7d9 Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Decoration/statues.rsi/oracle-9.png differ diff --git a/Resources/Textures/DeltaV/Structures/Decoration/statues.rsi/sophie.png b/Resources/Textures/DeltaV/Structures/Decoration/statues.rsi/sophie.png new file mode 100644 index 0000000000..c75d5d97e4 Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Decoration/statues.rsi/sophie.png differ