Beer Update

Resources/Locale/ru-RU/ss220/clothing/Head/hats.ftl

@@ -61,3 +61,6 @@ ent-ClothingHeadHatInterdyneFlipped = кепка парамедика Interdyne
     .desc = { ent-ClothingHeadHatInterdyneFlipped.desc }
 ent-ClothingHeadHatNewYearsCap = новогодний колпак
     .desc = Яркий новогодний колпак с пушистым помпоном, добавляющий волшебства и праздничного настроения!
+ent-ClothingHeadHatTophatHelmCorp = цилиндр Helm Corp
+    .suffix = Helm Corp
+    .desc = Стильный пивной цилиндр.

Resources/Locale/ru-RU/ss220/clothing/Uniforms/jumpsuit.ftl

@@ -50,3 +50,7 @@ ent-ClothingUniformJumpsuitInterdyne = форма парамедика Interdyne
 
 ent-ClothingUniformJumpsuitUssp = униформа СССП
     .desc = Форма, пропитанная кровью, потом и ненавистью к капитализму.
+
+ent-ClothingUniformJumpsuitBartenderHelmCorp = униформа бармена Helm Corp.
+    .desc = Специальная экипировка для подачи пива.
+    .suffix = Helm Corp.

Resources/Locale/ru-RU/ss220/flavors/flavor-profiles.ftl

@@ -0,0 +1 @@
+flavor-complex-spacebeer = как хмель и космическая пыль

Resources/Locale/ru-RU/ss220/job/job-name.ftl

@@ -18,3 +18,5 @@ job-name-ussp = СССП
 job-name-dq-operative = оперативник Эскадрона Смерти
 job-name-dq-commander = командир Эскадрона Смерти
 job-name-dq-specialist = специалист Эскадрона Смерти
+
+job-name-bartender-helm = бармен Helm Corp.

Resources/Locale/ru-RU/ss220/prototypes/entities/mobs/player/shuttleroles/roles.ftl

@@ -0,0 +1,2 @@
+ent-RandomHumanoidVisitorHelmBartender = посетитель бармен Helm Corp роль призрака
+    .desc = { "" }

Resources/Locale/ru-RU/ss220/prototypes/entities/objects/consumable/drinks/drinks.ftl

@@ -10,5 +10,7 @@ ent-DrinkEggnogGlass = { ent-DrinkGlass }
 ent-DrinkBacchusGlass = { ent-DrinkGlass }
     .suffix = благославение бахуса
     .desc = { ent-DrinkGlass.desc }
-ent-DrinkBeerCan = банка пива
-    .desc = Маленькая радость, великолепный вкус, никаких забот!
+ent-DrinkSpaceBeerCan = банка космического пива
+    .desc = Маленькая радость в бескрайней вселенной.
+ent-DrinkSpaceBeerBottleFull = бутылка космического пива
+    .desc = Великолепный вкус космической пыли без каких-либо дополнительных преимуществ.

Resources/Locale/ru-RU/ss220/prototypes/entities/structures/dispensers/beer.ftl

@@ -0,0 +1,6 @@
+ent-BeerDispenser = раздатчик пива
+    .desc = Дозатор пивных напитков. Имеет один слот для ёмкостей.
+    .suffix = Заполненный
+ent-BeerDispenserEmpty = { ent-BeerDispenser }
+    .suffix = Пустой
+    .desc = { ent-BeerDispenser.desc }

Resources/Locale/ru-RU/ss220/reagents/meta/drinks.ftl

@@ -20,3 +20,5 @@ reagent-name-ReaperSauce = соус "Тёмный жнец"
 reagent-desc-ReaperSauce = Этот соус оправдывает своё название. Используйте в блюдах на свой страх и риск.
 reagent-name-bacchus = благословение бахуса
 reagent-desc-bacchus = Ты был предупреждён.
+reagent-name-spacebeer = космическое пиво
+reagent-desc-spacebeer = Вкус — как у Большого взрыва, только хмельнее.

Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml

@@ -1983,4 +1983,4 @@
           factor: 1
         - !type:AdjustReagent
           reagent: Ethanol
-          amount: 0.25
+          amount: 0.25

Resources/Prototypes/SS220/Catalog/ReagentDispensers/beverage.yml

@@ -0,0 +1,7 @@
+- type: reagentDispenserInventory
+  id: BeerDispenserInventory
+  inventory:
+  - DrinkBeerGrowler
+  - DrinkAleBottleFullGrowler
+  - DrinkMeadJug
+  - DrinkSpaceBeerBottleFull

Resources/Prototypes/SS220/Entities/Clothing/Head/hats.yml

@@ -597,3 +597,15 @@
     sprite: SS220/Clothing/Head/Hats/newyears_cap.rsi
   - type: Clothing
     sprite: SS220/Clothing/Head/Hats/newyears_cap.rsi
+
+- type: entity
+  parent: ClothingHeadHatTophat
+  id: ClothingHeadHatTophatHelmCorp
+  name: helm corp tophat
+  description: A stylish beer tophat.
+  suffix: Helm Corp.
+  components:
+  - type: Sprite
+    sprite: SS220/Clothing/Head/Hats/tophat_helm.rsi
+  - type: Clothing
+    sprite: SS220/Clothing/Head/Hats/tophat_helm.rsi

Resources/Prototypes/SS220/Entities/Clothing/Uniforms/Jumpsuit/jumpsuits.yml

@@ -758,3 +758,15 @@
     sprite: SS220/Clothing/Uniforms/Jumpsuit/ussp_uniform.rsi
   - type: Clothing
     sprite: SS220/Clothing/Uniforms/Jumpsuit/ussp_uniform.rsi
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitBartenderHelmCorp
+  name: helm corp. bartender's uniform
+  description: Special equipment for serving beer
+  suffix: Helm Corp.
+  components:
+  - type: Sprite
+    sprite: SS220/Clothing/Uniforms/Jumpsuit/bartender_helm.rsi
+  - type: Clothing
+    sprite: SS220/Clothing/Uniforms/Jumpsuit/bartender_helm.rsi

Resources/Prototypes/SS220/Entities/Mobs/Player/ShuttleRoles/roles.yml

@@ -6,4 +6,14 @@
       sprite: Markers/jobs.rsi
       state: passenger
     - type: RandomHumanoidSpawner
-      settings: VisitorTourist
+      settings: VisitorTourist
+
+- type: entity
+  id: RandomHumanoidVisitorBartenderHelm
+  name: visiting bartender ghost role
+  components:
+    - type: Sprite
+      sprite: SS220/Markers/jobs.rsi
+      state: bartender_helm
+    - type: RandomHumanoidSpawner
+      settings: VisitorBartenderHelm

Resources/Prototypes/SS220/Entities/Mobs/Player/ShuttleRoles/settings.yml

@@ -8,3 +8,14 @@
     - type: Loadout
       prototypes: [ VisitorTourist ]
       roleLoadout: [ RoleSurvivalStandard ]
+
+- type: randomHumanoidSettings
+  id: VisitorBartenderHelm
+  speciesBlacklist: [ Arachnid, Skeleton, Felinid, Tajaran, Diona, Moth, Reptilian, Slime, Vox]
+  parent: VisitorCivilian
+  components:
+    - type: GhostRole
+      name: job-name-bartender-helm
+    - type: Loadout
+      prototypes: [ VisitorBartenderHelm ]
+      roleLoadout: [ RoleSurvivalStandard ]

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

@@ -94,4 +94,22 @@
           Quantity: 30
   - type: Icon
     sprite: SS220/Objects/Consumable/Drinks/bacchus_blessing.rsi
-    state: icon
+    state: icon
+
+- type: entity
+  parent: [DrinkBottleVisualsOpenable, DrinkBottleGlassBaseFull]
+  id: DrinkSpaceBeerBottleFull
+  name: space beer bottle
+  description: Great taste of cosmic dust without any additional benefits.
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        reagents:
+        - ReagentId: SpaceBeer
+          Quantity: 100
+  - type: Label
+    currentLabel: reagent-name-spacebeer
+  - type: Sprite
+    sprite: SS220/Objects/Consumable/Drinks/space_beer.rsi
+  - type: Sealable

Resources/Prototypes/SS220/Entities/Objects/Consumable/Drinks/drinks_cans.yml

@@ -1,37 +1,13 @@
 - type: entity
   id: DrinkCanPackBeer
-  parent: BaseStorageItem
+  parent: DrinkCanPack
   name: держатель для напитков
   suffix: Пиво
   description: Служит для удобного хранения сразу нескольких банок пива.
   components:
   - type: Sprite
     sprite: SS220/Objects/Misc/6pack.rsi
-    layers:
-      - state: plastic-thingy
-      - state: 6pack1
-        map: ["6pack1"]
-        visible: false
-      - state: 6pack2
-        map: ["6pack2"]
-        visible: false
-      - state: 6pack3
-        map: ["6pack3"]
-        visible: false
-      - state: 6pack4
-        map: ["6pack4"]
-        visible: false
-      - state: 6pack5
-        map: ["6pack5"]
-        visible: false
-      - state: 6pack6
-        map: ["6pack6"]
-        visible: false
-  - type: Item
-    size: Normal
   - type: Storage
-    grid:
-    - 0,0,2,3
     whitelist:
       tags:
       - Beer
@@ -43,11 +19,25 @@
   - type: ItemCounter
     count:
       tags: [Beer]
-    composite: true
-    layerStates:
-    - 6pack1
-    - 6pack2
-    - 6pack3
-    - 6pack4
-    - 6pack5
-  - type: Appearance
+
+- type: entity
+  parent: DrinkCanBaseFull
+  id: DrinkSpaceBeerCan
+  name: space beer can
+  description: A small joy in the boundless universe.
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: SpaceBeer
+          Quantity: 30
+  - type: Drink
+  - type: Sprite
+    sprite: SS220/Objects/Consumable/Drinks/space_beer_can.rsi
+  - type: Item
+    sprite: SS220/Objects/Consumable/Drinks/space_beer_can.rsi
+  - type: Tag
+    tags:
+    - Beer

Resources/Prototypes/SS220/Entities/Structures/Dispensers/beer.yml

@@ -0,0 +1,34 @@
+- type: entity
+  id: BeerDispenser
+  name: beer dispenser
+  suffix: Filled
+  description: A beer dispenser with a single slot for a container to be filled.
+  parent: ReagentDispenserBase
+  components:
+  - type: Rotatable
+  - type: Sprite
+    sprite: Structures/smalldispensers.rsi
+    drawdepth: SmallObjects
+    state: booze
+  - type: ReagentDispenser
+    storageWhitelist:
+      tags:
+      - DrinkBottle
+    pack: BeerDispenserInventory
+  - type: Transform
+    noRot: false
+  - type: GuideHelp
+    guides:
+    - Bartender
+    - Drinks
+
+- type: entity
+  id: BeerDispenserEmpty
+  suffix: Empty
+  parent: BeerDispenser
+  components:
+  - type: ReagentDispenser
+    storageWhitelist:
+      tags:
+      - DrinkBottle
+    pack: EmptyInventory

Resources/Prototypes/SS220/Flavors/flavors.yml

@@ -51,4 +51,9 @@
 - type: flavor
   id: Bacchus
   flavorType: Complex
-  description: flavor-complex-bacchus
+  description: flavor-complex-bacchus
+
+- type: flavor
+  id: spacebeer
+  flavorType: Complex
+  description: flavor-complex-spacebeer

Resources/Prototypes/SS220/Reagents/Consumable/Drink/alcohol.yml

@@ -2,7 +2,7 @@
 
 - type: reagent
   id: Glintwine
-  name: reagent-name-glintwine 
+  name: reagent-name-glintwine
   parent: BaseAlcohol
   desc: reagent-desc-glintwine
   physicalDesc: reagent-physical-desc-piquant
@@ -126,3 +126,31 @@
           types:
             Poison: 2
   fizziness: 0.2
+
+- type: reagent
+  id: SpaceBeer
+  name: reagent-name-spacebeer
+  parent: BaseAlcohol
+  desc: reagent-desc-spacebeer
+  physicalDesc: reagent-physical-desc-bubbly
+  flavor: beer
+  color: "#154e96"
+  recognizable: true
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/beerglass.rsi
+    state: icon_empty
+  metamorphicMaxFillLevels: 6
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: true
+  fizziness: 0.6
+  metabolisms:
+    Drink:
+      effects:
+      - !type:SatiateThirst
+        factor: 2
+      - !type:AdjustReagent
+        reagent: Ethanol
+        amount: 0.08
+      - !type:AdjustReagent
+        reagent: Cryoxadone
+        amount: 0.03

Resources/Prototypes/SS220/Roles/Jobs/Fun/visitors_startinggear.yml

@@ -21,4 +21,19 @@
     back: ClothingBackpack
     ears: ClothingHeadsetGrey
     pocket1: TapeRecorder
-    pocket2: CassetteTape
+    pocket2: CassetteTape
+
+- type: startingGear
+  id: VisitorBartenderHelm
+  equipment:
+    jumpsuit: ClothingUniformJumpsuitBartenderHelmCorp
+    shoes: ClothingShoesBootsLaceup
+    head: ClothingHeadHatTophatHelmCorp
+    id: VisitorPDA
+    back: ClothingBackpack
+    suitstorage: WeaponShotgunDoubleBarreledRubber
+    ears: ClothingHeadsetService
+    eyes: ClothingEyesHudBeer
+    outerClothing: ClothingOuterArmorBasicSlim
+    pocket1: DrinkBeerGrowler
+    pocket2: BarSpoon

Resources/Textures/SS220/Clothing/Head/Hats/tophat_helm.rsi/meta.json

@@ -0,0 +1,30 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, resprited by vimenant2 (discord), color editor by Estkemran (Github)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-HELMET",
+      "directions": 4
+    },
+    {
+      "name": "equipped-HELMET-hamster",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}

Resources/Textures/SS220/Clothing/Uniforms/Jumpsuit/bartender_helm.rsi/meta.json

@@ -0,0 +1,30 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, resprited by vimenant2 (discord), color editor by Estkemran (Github)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-INNERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "equipped-INNERCLOTHING-monkey",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}