From 515885a3c21a0a591f5963a2ee599d4d2b58e981 Mon Sep 17 00:00:00 2001 From: EstKemran <157578255+EstKemran@users.noreply.github.com> Date: Mon, 3 Mar 2025 23:49:43 +0300 Subject: [PATCH] Beer Update --- .../Locale/ru-RU/ss220/clothing/Head/hats.ftl | 3 + .../ss220/clothing/Uniforms/jumpsuit.ftl | 4 ++ .../ru-RU/ss220/flavors/flavor-profiles.ftl | 1 + Resources/Locale/ru-RU/ss220/job/job-name.ftl | 2 + .../mobs/player/shuttleroles/roles.ftl | 2 + .../objects/consumable/drinks/drinks.ftl | 6 +- .../entities/structures/dispensers/beer.ftl | 6 ++ .../ru-RU/ss220/reagents/meta/drinks.ftl | 2 + .../Reagents/Consumable/Drink/alcohol.yml | 2 +- .../Catalog/ReagentDispensers/beverage.yml | 7 +++ .../SS220/Entities/Clothing/Head/hats.yml | 12 ++++ .../Clothing/Uniforms/Jumpsuit/jumpsuits.yml | 12 ++++ .../Mobs/Player/ShuttleRoles/roles.yml | 12 +++- .../Mobs/Player/ShuttleRoles/settings.yml | 11 ++++ .../Objects/Consumable/Drinks/drinks.yml | 20 ++++++- .../Objects/Consumable/Drinks/drinks_cans.yml | 56 +++++++----------- .../Entities/Structures/Dispensers/beer.yml | 34 +++++++++++ .../Prototypes/SS220/Flavors/flavors.yml | 7 ++- .../Reagents/Consumable/Drink/alcohol.yml | 30 +++++++++- .../Roles/Jobs/Fun/visitors_startinggear.yml | 17 +++++- .../equipped-HELMET-hamster.png | Bin 0 -> 740 bytes .../Hats/tophat_helm.rsi/equipped-HELMET.png | Bin 0 -> 726 bytes .../Head/Hats/tophat_helm.rsi/icon.png | Bin 0 -> 507 bytes .../Head/Hats/tophat_helm.rsi/inhand-left.png | Bin 0 -> 289 bytes .../Hats/tophat_helm.rsi/inhand-right.png | Bin 0 -> 298 bytes .../Head/Hats/tophat_helm.rsi/meta.json | 30 ++++++++++ .../equipped-INNERCLOTHING-monkey.png | Bin 0 -> 1688 bytes .../equipped-INNERCLOTHING.png | Bin 0 -> 1947 bytes .../Jumpsuit/bartender_helm.rsi/icon.png | Bin 0 -> 886 bytes .../bartender_helm.rsi/inhand-left.png | Bin 0 -> 1019 bytes .../bartender_helm.rsi/inhand-right.png | Bin 0 -> 1053 bytes .../Jumpsuit/bartender_helm.rsi/meta.json | 30 ++++++++++ .../SS220/Markers/jobs.rsi/bartender_helm.png | Bin 0 -> 1063 bytes .../Textures/SS220/Markers/jobs.rsi/meta.json | 3 + .../Consumable/Drinks/beer_can.rsi/icon.png | Bin 474 -> 446 bytes .../Drinks/beer_can.rsi/icon_open.png | Bin 493 -> 454 bytes .../Consumable/Drinks/beer_can.rsi/meta.json | 8 +-- .../Consumable/Drinks/space_beer.rsi/icon.png | Bin 0 -> 547 bytes .../Drinks/space_beer.rsi/icon_open.png | Bin 0 -> 515 bytes .../Drinks/space_beer.rsi/meta.json | 17 ++++++ .../Drinks/space_beer_can.rsi/icon.png | Bin 0 -> 490 bytes .../Drinks/space_beer_can.rsi/icon_open.png | Bin 0 -> 499 bytes .../Drinks/space_beer_can.rsi/meta.json | 17 ++++++ .../SS220/Objects/Misc/6pack.rsi/6pack1.png | Bin 391 -> 432 bytes .../SS220/Objects/Misc/6pack.rsi/6pack2.png | Bin 394 -> 438 bytes .../SS220/Objects/Misc/6pack.rsi/6pack3.png | Bin 389 -> 432 bytes .../SS220/Objects/Misc/6pack.rsi/6pack4.png | Bin 163 -> 259 bytes .../SS220/Objects/Misc/6pack.rsi/6pack5.png | Bin 161 -> 266 bytes .../SS220/Objects/Misc/6pack.rsi/6pack6.png | Bin 238 -> 266 bytes .../SS220/Objects/Misc/6pack.rsi/meta.json | 2 +- .../Objects/Misc/6pack.rsi/plastic-thingy.png | Bin 199 -> 193 bytes 51 files changed, 307 insertions(+), 46 deletions(-) create mode 100644 Resources/Locale/ru-RU/ss220/flavors/flavor-profiles.ftl create mode 100644 Resources/Locale/ru-RU/ss220/prototypes/entities/mobs/player/shuttleroles/roles.ftl create mode 100644 Resources/Locale/ru-RU/ss220/prototypes/entities/structures/dispensers/beer.ftl create mode 100644 Resources/Prototypes/SS220/Catalog/ReagentDispensers/beverage.yml create mode 100644 Resources/Prototypes/SS220/Entities/Structures/Dispensers/beer.yml create mode 100644 Resources/Textures/SS220/Clothing/Head/Hats/tophat_helm.rsi/equipped-HELMET-hamster.png create mode 100644 Resources/Textures/SS220/Clothing/Head/Hats/tophat_helm.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/SS220/Clothing/Head/Hats/tophat_helm.rsi/icon.png create mode 100644 Resources/Textures/SS220/Clothing/Head/Hats/tophat_helm.rsi/inhand-left.png create mode 100644 Resources/Textures/SS220/Clothing/Head/Hats/tophat_helm.rsi/inhand-right.png create mode 100644 Resources/Textures/SS220/Clothing/Head/Hats/tophat_helm.rsi/meta.json create mode 100644 Resources/Textures/SS220/Clothing/Uniforms/Jumpsuit/bartender_helm.rsi/equipped-INNERCLOTHING-monkey.png create mode 100644 Resources/Textures/SS220/Clothing/Uniforms/Jumpsuit/bartender_helm.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/SS220/Clothing/Uniforms/Jumpsuit/bartender_helm.rsi/icon.png create mode 100644 Resources/Textures/SS220/Clothing/Uniforms/Jumpsuit/bartender_helm.rsi/inhand-left.png create mode 100644 Resources/Textures/SS220/Clothing/Uniforms/Jumpsuit/bartender_helm.rsi/inhand-right.png create mode 100644 Resources/Textures/SS220/Clothing/Uniforms/Jumpsuit/bartender_helm.rsi/meta.json create mode 100644 Resources/Textures/SS220/Markers/jobs.rsi/bartender_helm.png create mode 100644 Resources/Textures/SS220/Objects/Consumable/Drinks/space_beer.rsi/icon.png create mode 100644 Resources/Textures/SS220/Objects/Consumable/Drinks/space_beer.rsi/icon_open.png create mode 100644 Resources/Textures/SS220/Objects/Consumable/Drinks/space_beer.rsi/meta.json create mode 100644 Resources/Textures/SS220/Objects/Consumable/Drinks/space_beer_can.rsi/icon.png create mode 100644 Resources/Textures/SS220/Objects/Consumable/Drinks/space_beer_can.rsi/icon_open.png create mode 100644 Resources/Textures/SS220/Objects/Consumable/Drinks/space_beer_can.rsi/meta.json diff --git a/Resources/Locale/ru-RU/ss220/clothing/Head/hats.ftl b/Resources/Locale/ru-RU/ss220/clothing/Head/hats.ftl index 16978cc429c3..5824cc4959df 100644 --- a/Resources/Locale/ru-RU/ss220/clothing/Head/hats.ftl +++ b/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 = Стильный пивной цилиндр. diff --git a/Resources/Locale/ru-RU/ss220/clothing/Uniforms/jumpsuit.ftl b/Resources/Locale/ru-RU/ss220/clothing/Uniforms/jumpsuit.ftl index 65b8d5a41e62..77b0dcd5b80b 100644 --- a/Resources/Locale/ru-RU/ss220/clothing/Uniforms/jumpsuit.ftl +++ b/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. diff --git a/Resources/Locale/ru-RU/ss220/flavors/flavor-profiles.ftl b/Resources/Locale/ru-RU/ss220/flavors/flavor-profiles.ftl new file mode 100644 index 000000000000..dbc2fe0e39c7 --- /dev/null +++ b/Resources/Locale/ru-RU/ss220/flavors/flavor-profiles.ftl @@ -0,0 +1 @@ +flavor-complex-spacebeer = как хмель и космическая пыль diff --git a/Resources/Locale/ru-RU/ss220/job/job-name.ftl b/Resources/Locale/ru-RU/ss220/job/job-name.ftl index fd5b13bb8946..54c252fbee05 100644 --- a/Resources/Locale/ru-RU/ss220/job/job-name.ftl +++ b/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. diff --git a/Resources/Locale/ru-RU/ss220/prototypes/entities/mobs/player/shuttleroles/roles.ftl b/Resources/Locale/ru-RU/ss220/prototypes/entities/mobs/player/shuttleroles/roles.ftl new file mode 100644 index 000000000000..a7f72f5ca384 --- /dev/null +++ b/Resources/Locale/ru-RU/ss220/prototypes/entities/mobs/player/shuttleroles/roles.ftl @@ -0,0 +1,2 @@ +ent-RandomHumanoidVisitorHelmBartender = посетитель бармен Helm Corp роль призрака + .desc = { "" } diff --git a/Resources/Locale/ru-RU/ss220/prototypes/entities/objects/consumable/drinks/drinks.ftl b/Resources/Locale/ru-RU/ss220/prototypes/entities/objects/consumable/drinks/drinks.ftl index be98c0eb1f7c..4266cd3a7758 100644 --- a/Resources/Locale/ru-RU/ss220/prototypes/entities/objects/consumable/drinks/drinks.ftl +++ b/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 = Великолепный вкус космической пыли без каких-либо дополнительных преимуществ. diff --git a/Resources/Locale/ru-RU/ss220/prototypes/entities/structures/dispensers/beer.ftl b/Resources/Locale/ru-RU/ss220/prototypes/entities/structures/dispensers/beer.ftl new file mode 100644 index 000000000000..317b087796d4 --- /dev/null +++ b/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 } diff --git a/Resources/Locale/ru-RU/ss220/reagents/meta/drinks.ftl b/Resources/Locale/ru-RU/ss220/reagents/meta/drinks.ftl index 6a3b9625c405..f83d17bfb693 100644 --- a/Resources/Locale/ru-RU/ss220/reagents/meta/drinks.ftl +++ b/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 = Вкус — как у Большого взрыва, только хмельнее. diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml index ba3f637ab262..5b4706781f34 100644 --- a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml +++ b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml @@ -1983,4 +1983,4 @@ factor: 1 - !type:AdjustReagent reagent: Ethanol - amount: 0.25 \ No newline at end of file + amount: 0.25 diff --git a/Resources/Prototypes/SS220/Catalog/ReagentDispensers/beverage.yml b/Resources/Prototypes/SS220/Catalog/ReagentDispensers/beverage.yml new file mode 100644 index 000000000000..1453643f73e1 --- /dev/null +++ b/Resources/Prototypes/SS220/Catalog/ReagentDispensers/beverage.yml @@ -0,0 +1,7 @@ +- type: reagentDispenserInventory + id: BeerDispenserInventory + inventory: + - DrinkBeerGrowler + - DrinkAleBottleFullGrowler + - DrinkMeadJug + - DrinkSpaceBeerBottleFull diff --git a/Resources/Prototypes/SS220/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/SS220/Entities/Clothing/Head/hats.yml index 6c78edb8e1b9..dc0ce827f26c 100644 --- a/Resources/Prototypes/SS220/Entities/Clothing/Head/hats.yml +++ b/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 diff --git a/Resources/Prototypes/SS220/Entities/Clothing/Uniforms/Jumpsuit/jumpsuits.yml b/Resources/Prototypes/SS220/Entities/Clothing/Uniforms/Jumpsuit/jumpsuits.yml index fb9d343c023f..e75c9b1958f7 100644 --- a/Resources/Prototypes/SS220/Entities/Clothing/Uniforms/Jumpsuit/jumpsuits.yml +++ b/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 diff --git a/Resources/Prototypes/SS220/Entities/Mobs/Player/ShuttleRoles/roles.yml b/Resources/Prototypes/SS220/Entities/Mobs/Player/ShuttleRoles/roles.yml index 7a8a01c4535d..51b3d4cbc540 100644 --- a/Resources/Prototypes/SS220/Entities/Mobs/Player/ShuttleRoles/roles.yml +++ b/Resources/Prototypes/SS220/Entities/Mobs/Player/ShuttleRoles/roles.yml @@ -6,4 +6,14 @@ sprite: Markers/jobs.rsi state: passenger - type: RandomHumanoidSpawner - settings: VisitorTourist \ No newline at end of file + 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 diff --git a/Resources/Prototypes/SS220/Entities/Mobs/Player/ShuttleRoles/settings.yml b/Resources/Prototypes/SS220/Entities/Mobs/Player/ShuttleRoles/settings.yml index 8ba267c45937..1240b0666249 100644 --- a/Resources/Prototypes/SS220/Entities/Mobs/Player/ShuttleRoles/settings.yml +++ b/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 ] diff --git a/Resources/Prototypes/SS220/Entities/Objects/Consumable/Drinks/drinks.yml b/Resources/Prototypes/SS220/Entities/Objects/Consumable/Drinks/drinks.yml index 8985767ab812..de45483122b7 100644 --- a/Resources/Prototypes/SS220/Entities/Objects/Consumable/Drinks/drinks.yml +++ b/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 \ No newline at end of file + 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 diff --git a/Resources/Prototypes/SS220/Entities/Objects/Consumable/Drinks/drinks_cans.yml b/Resources/Prototypes/SS220/Entities/Objects/Consumable/Drinks/drinks_cans.yml index 53f2b1ce7bb5..2f70fb4b982a 100644 --- a/Resources/Prototypes/SS220/Entities/Objects/Consumable/Drinks/drinks_cans.yml +++ b/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 diff --git a/Resources/Prototypes/SS220/Entities/Structures/Dispensers/beer.yml b/Resources/Prototypes/SS220/Entities/Structures/Dispensers/beer.yml new file mode 100644 index 000000000000..97138f9af728 --- /dev/null +++ b/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 diff --git a/Resources/Prototypes/SS220/Flavors/flavors.yml b/Resources/Prototypes/SS220/Flavors/flavors.yml index bd234bb96e0d..d8e71a2585cc 100644 --- a/Resources/Prototypes/SS220/Flavors/flavors.yml +++ b/Resources/Prototypes/SS220/Flavors/flavors.yml @@ -51,4 +51,9 @@ - type: flavor id: Bacchus flavorType: Complex - description: flavor-complex-bacchus \ No newline at end of file + description: flavor-complex-bacchus + +- type: flavor + id: spacebeer + flavorType: Complex + description: flavor-complex-spacebeer diff --git a/Resources/Prototypes/SS220/Reagents/Consumable/Drink/alcohol.yml b/Resources/Prototypes/SS220/Reagents/Consumable/Drink/alcohol.yml index afbb70548cb3..1db56ca2992f 100644 --- a/Resources/Prototypes/SS220/Reagents/Consumable/Drink/alcohol.yml +++ b/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 diff --git a/Resources/Prototypes/SS220/Roles/Jobs/Fun/visitors_startinggear.yml b/Resources/Prototypes/SS220/Roles/Jobs/Fun/visitors_startinggear.yml index d571b9de36ea..4d4571cdf5d3 100644 --- a/Resources/Prototypes/SS220/Roles/Jobs/Fun/visitors_startinggear.yml +++ b/Resources/Prototypes/SS220/Roles/Jobs/Fun/visitors_startinggear.yml @@ -21,4 +21,19 @@ back: ClothingBackpack ears: ClothingHeadsetGrey pocket1: TapeRecorder - pocket2: CassetteTape \ No newline at end of file + 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 diff --git a/Resources/Textures/SS220/Clothing/Head/Hats/tophat_helm.rsi/equipped-HELMET-hamster.png b/Resources/Textures/SS220/Clothing/Head/Hats/tophat_helm.rsi/equipped-HELMET-hamster.png new file mode 100644 index 0000000000000000000000000000000000000000..8a2730bb12c1c4df20ea9e4a7cebf73b4c1d8582 GIT binary patch literal 740 zcmVVLLewHIXO5f001bFV_;x1aCC8UWfEXu$jvJ$3UYT+h=`0*U_Z~m#=y(~28qeV z1&#p$J|K2peqJgA2KaW3fe}Ps)&-e`DUTO$B^MNx0O>zKY?P8(oXo($XaHnqmzNX( z#Tn-S*&<2VVD<(OyC@{c8OS~YWb>s%*jGU8BnbNnh+PEq1d#m&q&^+YX5s*w17XX6 z*d?hIAbS~{^9w4AGSf3k6bvmbEfpM7@{>{(f-8$lQge$HJoA$Ciwg3K5=&B3fNCM` z0|P;bLQsfl05w`@lIU-O02B`p*5^QQ_%e!}L5Lwha%oW+l*!0sOqh=_V~zv^ga1+n z29`evF_T^fh6Oqd4E$3OVrqsA3c1c7*RCt{2+ObZ; zKpe;MZyO8_#o02*rU?U*sPBO0Md4+Xf}^IX|+g_gw<-r$8yPf{Rt2)=Chij;yiv7Io}p> zZAlM=3a}1ft>OED+nb!;c|^aPGoHND@5YQL8?tH6{o_#`8EYNid9^rA&kEOT7xS6> zD�_cbvz6Tf91t?=u4`zbPL+rRpi*!TUYn5NHN?2)+RC$6y&gQ}Q=;{0xJi0V=>c zfHf6h9l)9junu7DPu>Im^J{eQGe8Ac2e76BtOHn60oDPmsQ~K$)>MFX0BgY)Q0mXn z?jAj`-KPhlEPJXj-o9S%8lc!2b9+9Z%$8j6Ge8Ac2e4LZ4fxrkhc*3f%*Eh=m(dlC z%TdMg_6_fbd_51gV~!^q0J3Rb>ifJlM_u>m>o^|(?q>vi&IgEyh=_=Yh=_pXdswU3d}PN6KW zE>4S??MGQ}qo7OtHP)G}n*HJhs^TJ38D82uC>l+FdUV9&Tv!7 z^Jc;~Hi6w5DkmgQ*fFJiUg~@!+~JK1$8XM#Se7p=6aKO;v6DTM_K0CNbK>cS8>%Zs z6{;oYeCF2bHo9!=CBmbtt1BuK{AqHKXp?rgcTjP+sLkg|pS!s}bqje11vg|VzGG%~ z>~IR`$Yd~$%9!*bzllMFU*Otvhk_qQU2`2f6dj5(10|=NJdxrvqu(I8kA=DUe-Inn zGv3aNwB#-z%S#ynun0;pyTSQZeW4t&M(% z0wh=;6mzn*Kgy9zDNb0y^Gohm(-HFv-!Cv)8EkmyAUkJCvv2QpM@6A&|IKp!ea@RF zzyDZJocSr9UHQE&gMwV|--Lp$%?||vMHJ5$@5$e;(Z$bDa5F8pHbr&X*SW>do`03{ z{^h@dp^RZ$-3$3Ucc*yh$u65L^!cguvdMDKPU|mOEyVAy?wgWRQu{fxP%ggWb^7MB zx9Yegk1pO=`S<#pqkHO3@U8eepGz=kRUIqSmQQQn-BY}^NLIjsbp!K;l|XaNL=W&C zxb~Cj%=$yQ`_F7y`q>&)Y8lfF#v36F)(o?`64(=7*DxO3?D(L-jX%MDIs1c4Uv?g= zI6mo#6vLnSrr*Cauj+YXwVxTJI(n&bg85?huKPd#oS(C={%b_>p5)EHCGEtwvzIe7 zD8x>kIxpSMWY70!lC{F$nHhe|Hct4>sDuPAiQZqOT>1TCo%n2EdS&o*^>bP0l+XkK Dp*blY literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Clothing/Head/Hats/tophat_helm.rsi/icon.png b/Resources/Textures/SS220/Clothing/Head/Hats/tophat_helm.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..f5f37c302aaa3d15c986c2d2b2e161f9bfe1a6ee GIT binary patch literal 507 zcmVVLLewHIXO5f001bFV_;x1aCC8UWfEXu$jvJ$3UYT+h=`0*U_Z~m#=y(~28qeV z1&#p$J|K2peqJgA2KaW3fe}Ps)&-e`DUTO$B^MNx0O>zKY?P8(oXo($XaHnqmzNX( z#Tn-S*&<2VVD<(OyC@{c8OS~YWb>s%*jGU8BnbNnh+PEq1d#m&q&^+YX5s*w17XX6 z*d?hIAbS~{^9w4AGSf3k6bvmbEfpM7@{>{(f-8$lQge$HJoA$Ciwg3K5=&B3fNCM` z0|P;bLQsfl05w`@lIU-O02B`p*5^QQ_%e!}L5Lwha%oW+l*!0sOqh=_V~zv^ga1+n z29`evF_T^fh6Oqd4E$3OVrqsA33J_B21G<;W+pZm zLI9xL?n9ohSQiD>TAXuyhJk4s0ZjkAV@&j0ved@^rUHx9gVWJd9}G?9X}dQ~mC<%z xt~by5vP>=zy_QY63$fW(|A=3qh=_>H?FawXAn;G6HC6xs002ovPDHLkV1iX_!c_nO literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Clothing/Head/Hats/tophat_helm.rsi/inhand-left.png b/Resources/Textures/SS220/Clothing/Head/Hats/tophat_helm.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..393d94be82f1716d74ae62ec7896c4a5a480174d GIT binary patch literal 289 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|ZhN{ohE&XX zdut=_AqSq;hwP!-944M#b3~%#${C00U9m=vr`}BLTI?`QK-BAvhWfw!hVp&tv8B_1 zS{WD)M8#g8I;*IEVq#j@k{^k-=RYg2)jQC>E8fp_(zD8GBH>NXE7r{y4n3x*bfmp9 zX1>+^dvncvl|7}77k-qyKmGri`O7p@z8R#2oms}TeUmpTu}{br{LOJyRA6uahV}N}*eOV8!Me(u-4`Fp<4Uej{BCN$J@(yn#Y_RGK9ZSj?zQ>-{$-9GK+tz~?k`@${x z^CzX9sjZl-lCF7p_N7luU>g}28knYRGB!xPR(HU5=^GxK&q0hk-}4;l_*Wix>YPK7 s>Kh)F?JpiKHM;+^Kk~~5pq~E^n3f$(?ad5%9||(T)78&qol`;+0G*?Ni2wiq literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Clothing/Head/Hats/tophat_helm.rsi/meta.json b/Resources/Textures/SS220/Clothing/Head/Hats/tophat_helm.rsi/meta.json new file mode 100644 index 000000000000..64c5b1e349a1 --- /dev/null +++ b/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 + } + ] +} diff --git a/Resources/Textures/SS220/Clothing/Uniforms/Jumpsuit/bartender_helm.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/SS220/Clothing/Uniforms/Jumpsuit/bartender_helm.rsi/equipped-INNERCLOTHING-monkey.png new file mode 100644 index 0000000000000000000000000000000000000000..b7c5e34fbb511bd6949e835efa875bd7b0acb603 GIT binary patch literal 1688 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 M07*qoM6N<$f;yv$O#lD@ literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Clothing/Uniforms/Jumpsuit/bartender_helm.rsi/inhand-left.png b/Resources/Textures/SS220/Clothing/Uniforms/Jumpsuit/bartender_helm.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..ed6417c9a9a1ccad36ace515d554bf7eab390a0e GIT binary patch literal 1019 zcmVVLLewHIXO5f001bFV_;x1aCC8UWfEXu$jvJ$3UYT+h=`0*U_Z~m#=y(~28qeV z1&#p$J|K2peqJgA2KaW3fe}Ps)&-e`DUTO$B^MNx0O>zKY?P8(oXo($XaHnqmzNX( z#Tn-S*&<2VVD<(OyC@{c8OS~YWb>s%*jGU8BnbNnh+PEq1d#m&q&^+YX5s*w17XX6 z*d?hIAbS~{^9w4AGSf3k6bvmbEfpM7@{>{(f-8$lQge$HJoA$Ciwg3K5=&B3fNCM` z0|P;bLQsfl05w`@lIU-O02B`p*5^QQ_%e!}L5Lwha%oW+l*!0sOqh=_V~zv^ga1+n z29`evF_T^fh6Oqd4E$3OVrqsA39lLv%6+yGad7Ouw(+0|GfFL@9k`O06`E0K@bE%5ClOG1hH5! zkssfGbQhgw7YQqdJUif(+7NrrGP@p&;d8f(&D;;3O-FFV3(TGO>c!isdJi7old1;* zjCpVI(o8#_U~B!5+od?N=?DOD_sXUtuuE}ltsiogdR_<{V6U}#A{9Lym*OxD1GiV} zFbxBCDGmTgq@u9b+JS=eO3cP=v;)zrgokkBwAAgPl+F8DJ#+QLrM_@;1;ZN$6tFx<$BW)G9YPXkhC(mvfM|d z_9v*x@oF?OnmbRuAPD8qjbs|f-@mzEIRHF;@)DbN5qrD)c=r6^nRU#SYiKpAQ}vQo zMyej*Uj&5>7=xRJf#Z`COn#29<7a?OJz!1;A)OI2z%-1})oNB501O6wI8K=j2B(j* zRHt(j2B;1|HDrM508~Q;s186i3vYn% ze}ZA+_aY;Mg}(#nb$Cv3Tv*5e)d8qx;SIRZkHJZ1=^yYz%R4}3|A2M|$nGD|>Krgj z|G=G{hUXr&ssS_g5A1~4AfW=;{R7(702f*P16mmnM*o0TMR1n>fp)9rsi~a- pAMi6ks}u+Wtqf4nKS2EN`~vnh##@j!tLgv%002ovPDHLkV1na1vXKA) literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Clothing/Uniforms/Jumpsuit/bartender_helm.rsi/inhand-right.png b/Resources/Textures/SS220/Clothing/Uniforms/Jumpsuit/bartender_helm.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..f9f6a999cf6dc03686682fdc7b8f56a66f16b82d GIT binary patch literal 1053 zcmV+&1mgRNP)VLLewHIXO5f001bFV_;x1aCC8UWfEXu$jvJ$3UYT+h=`0*U_Z~m#=y(~28qeV z1&#p$J|K2peqJgA2KaW3fe}Ps)&-e`DUTO$B^MNx0O>zKY?P8(oXo($XaHnqmzNX( z#Tn-S*&<2VVD<(OyC@{c8OS~YWb>s%*jGU8BnbNnh+PEq1d#m&q&^+YX5s*w17XX6 z*d?hIAbS~{^9w4AGSf3k6bvmbEfpM7@{>{(f-8$lQge$HJoA$Ciwg3K5=&B3fNCM` z0|P;bLQsfl05w`@lIU-O02B`p*5^QQ_%e!}L5Lwha%oW+l*!0sOqh=_V~zv^ga1+n z29`evF_T^fh6Oqd4E$3OVrqsA3wcJEho8sTnHYlQc}r%=GQc%-7QS0D>S0f*=TjAP9mW2x7Tl z)}1@|Z=u`jA*shvV28X~A7S5IWmn>HeD3wImH)wWnFx+~k&WxUc=~2`=Zww#P8QDj z)Umq{ZcFQZ`RuLG$2q5yZEqZLqnto469E7|-g21;jB*0o8%NV>6f%$ADFcl44o{|I zXXSDNQBA{*wFaV^2BVw+03_2f80(#dFkxQ3!We!3D$SGW7`n|qjz9jKbg=jClTa>P zKaX*};!Y#DaW2W>>ub__Z|*h)y(`w8;!cC*^P9Y+4*&p$!%3_45vuhO4q5}4rn-v< zeCpj5C9l{Um}Z6L^P4E?eco;MC!G|2mjU3zmrKkvD*;}Lf9BQe7z6=~1Bzq$YkxGi z@SyRlS1=%@XOYsgxUf1vwf?7(y}TBSOzNs62))9DxSGn~DUPilB3-FTUNa9rd$GX^XR zf&o!Yn{4e?jRC-LIDlzZ*l>7ut7*4t%vw(+LFg5xfYbB#|Azhl2~7dj0#ri=s1~3a zGC;Ke)sO+I1*nD$P%S_;WPoY`s#$sire2By|9(Yhk)RRaba2sswIEsg5kLm07N8o( z7+}TE8vNgK1{Mv^BOq)!177iDK-h8yWN>{g?q>~NWzK*b_J=&z7!bCc0a;uP0K%6u zAcNFxFl;#kUT`%aY&iq6xCTK#Yw#+U%-ygDK~Dx)t1NoXfE%X&n00000NkvXXu0mjf4qVA7 literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Clothing/Uniforms/Jumpsuit/bartender_helm.rsi/meta.json b/Resources/Textures/SS220/Clothing/Uniforms/Jumpsuit/bartender_helm.rsi/meta.json new file mode 100644 index 000000000000..98e81ec89ad6 --- /dev/null +++ b/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 + } + ] +} diff --git a/Resources/Textures/SS220/Markers/jobs.rsi/bartender_helm.png b/Resources/Textures/SS220/Markers/jobs.rsi/bartender_helm.png new file mode 100644 index 0000000000000000000000000000000000000000..2df2e027fd48c0de1c66fac9c0a15abeb6cab268 GIT binary patch literal 1063 zcmV+?1laqDP)Px&;Ymb6R9J=WmS1RFRUF4ZH%m=g?~Q}vmNc~{&1j$yt&D*KOA#MU9uyx$@kLRX z&wUs}kPYgC`XDk}m{5mB_PEJP*~XaQv{_fhxJn?US<*I5Lf3YX+-^5Z)8j+DcgeIj z_eS^T7Y^r~-|zhSp5OVM-}y;cgb)G%U(d6`<#OXu6l7UORaHvmGL?!3AQkeIiY2EeSK`DSH;q$8Br~5i?!MLrh4hpjMz%A3a_sZA%sy{!Ilr)&)=>$sx=OT z!#I^L4ur!{tu^ayz%qeiVFmy2h;(Nq%l(bJ0OaGp)HmL^%bk@h{^1d+SXe=lB%?eQ z#LtY2Qfk>K@iXI={o_&CdIb}s0dexXU8bhTc&9-=H9dyc*C#%H+rhEVv$l?HnLvCp zBzi+$#xH9`1~z%~lP~D;`N$Uv9Dk#O>zQt%F*iel`^3?A)0RnC@_~ubfanc*0gz>x zXv~jCQF!6$B|M5kH0DQ^WdM3ZUM5BZman8Gf%s%dL}Pw(=_1n?*9`g0X*ZF94rWff z4cYX?HFD`9(U_n3WXKW;QvyN=63H65bdf}|#=>H?N&ip%#__MdKJxDf-1z2@h{pU) zo2ja5=pzFUL$5B^$3kOBY#KtQu_{H`n(| zQx~+R`DQSE1>={y`Sxcg`NESxmB>pST+ckzH(EgNfA#$z1cG6HJMKhPyMb)`1kQi? zDbGBA1c&DjJDojYP6WWT3-n|CN%_>G6@dcBN^4+XOcAIks1e^hOSo zn!C!m*$Q2Xn-gbMN(WCd{N4|g4xZw~S(Pru&AHhMsky84Mh>&RT4XbyYe}GG#M0yZ zi|-$k0>QBGC<;(FxkpiqT9;)rDe1=769VAq2OqXvzvY0&KRpl(iyoiP$b=gS$g)hn zP#~L0*-A!iGk8Vkz@sPKOa7k|s8lpcCgd6&(kfbBfu3CU2ScLM<;1}b_tY&U zu~XNHdf&kgoh~Q+!H}?%kXo`pFwieNo~N2*s#>?j&dvj5*+Zi~80Z(7>}^X7ED_K& h4NcqIysh+R_!FI2;TA)BmC*nI002ovPDHLkV1ix{|5*S4 literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Markers/jobs.rsi/meta.json b/Resources/Textures/SS220/Markers/jobs.rsi/meta.json index b592ff832f2e..9bd8c85a1ca0 100644 --- a/Resources/Textures/SS220/Markers/jobs.rsi/meta.json +++ b/Resources/Textures/SS220/Markers/jobs.rsi/meta.json @@ -7,6 +7,9 @@ "y": 32 }, "states": [ + { + "name": "bartender_helm" + }, { "name": "centcommoperativebs" }, diff --git a/Resources/Textures/SS220/Objects/Consumable/Drinks/beer_can.rsi/icon.png b/Resources/Textures/SS220/Objects/Consumable/Drinks/beer_can.rsi/icon.png index 59f5f0d6d255d9ddcbbb37302b9b008a21451cae..5064c292e09e7dc57701d92ad11eb6cf91366227 100644 GIT binary patch delta 407 zcmV;I0cif(1HJ>0F@JbTL_t(oh3%C+NJ3Ekf9T%zo6G^nvnFbb1K$tkG$$}OZEqB6O-Nt2twZ7^?{4xMAxa^K~g^PO|w_vQP} zxgXfDVdJ0CA@kAH^t|~!c72tU;_8$UUkNS)@O5lv>L=)u6@Lelfx&)j^!Yu!mfp4t zFZVkloWdFKOpIA`J#*VM-ZleXzZ>^xpCxva$<~Q`{cd3cLKo-c?84MEorAp~0NLk~ zwHJ$>;~W}hEwm)W*)4LooC~wKa7t+Ns9`S<@Ns#(B|;}|06;NRBI|cNg;sFp%8)Rs+1l>o4W6+;F7 zxCAxf-^hTF0f#GU&1-j{nt>|DXI9&5K+|+8&h*DCQ0v4Ut|&&aAZ$Rmg~k&pb8dFB z;Xj~hI*0ok!hBLaJf28dt+&>YWW;UQuwet>9f!Spmk@K+(z5^n002ovPDHLkV1fmh BzykmP delta 435 zcmV;k0ZjhB1KIX2bE51o@mO*j0Q)%0)PJuVu#1Nyp^4F{32_J3 zR)g04P3vyv{GS;JM?!>FmMpQ`R(nEx+zkn$72`FEIuY%W-%kS2et5BB%o+`8K}>U{|O#{MyEmhgI&E4s9TrUDC#t5k3S>+ z5{lPADNrYOzdX_YH{jSP!k{B9Co_f|*t0xQmO6i-b=l-YkgJ^qTE}0000EWmrjOO-%qQ d00008000000002eQC;Drn3|axsiQG0fM0bfkod4#ISiV6mS+G z99~0@rwJ_j5T74ZYYnQk1^}7NE$ZC7G{Ce>aJz1>vwe*oPyYyae|6$40Dxj@Bo3c> zYns;H%WI2v-G2aPoCg4CH&0Q_++bawwUY+0c@cRR5_Hr&9W`&;cq{rYwp{yWgEKv&Bf2hIYNN)3&QP) zT#}Zkp$>FYvPf)5B+$VhP+NmkG)GQhLq$y?3U7uO{R{$e(u=SPDP^Dx{HM&P68WVGKS8f`20DlsR#^k3teIE-xxW{Ua4vTnZDOn;DX@7hhZos|Ch2 zgA1qAK%UIbI`Z+%-NW-Bc5-swi;qyC({56%nLyqVE7lTp+L_S`0CYdDDAp2=KIzuf z#a#*5i}sQ3lYiSZ?gjQ9mjQSM4gxvX0_#B|w(lrz1*_l2N5X_ZB_@bJ z)RL)Sb#P1ua$rkJXNQ*m9XJf+pxxA_(+MP3eH@*^cBu93TaaA! zk+pOJx{o(dD%T~s(Q&+bYw;JdR$84;{X=3H2BmU+a6hlF8@B*tt+dgPdw6(wX!ryP weVDGo!)4Y0000hUSV?A0O#mtY000O800000007cclK=n!07*qoM6N<$f}17EPx$-AP12R9J=WmOV&YVHAd+1f#_gtO@~thD0bfb&y(w4ni_i5kd!ppslnWI%taE zEI0}lI(0G~3NG4;kflVFW{8lX68{FR(kS=BMTbDEMN-HQ*A6xp!Rb4(S(d3U}6+Z(zT7{2LSNBeL?f!qf#tN1Gou^0HTv) z*LMB<@Ke!APzH!jj$OFDu4~`#cq=B*Ts(ZOW8{qpj$iU zB&p+j`G)51FegbJfSu(OuHQeD0hC9Of44~6^b)CWm*HRL66pJB9_CKTzM4`75RJgT zw$1(5&$+d?%P0`bWO2?$;Oj;EoQ;$Rz%emot&8DB)qI%#_W(&xi?s(l(S$XE^H5OqDvD0Q zYHuf@XHTf#+r13WWZA5)msqKHATSfQ>HBG71722pJ9*#Q#8JB&fRRrhmH#nC9SF>X lZN(Sy?CPx$y-7qtR9J=WmOn@vVHCiB3AL6&h@lXucE|~~Nf!~35(s2Um(am1^$*fQ5seg_ zG6)?5x;mK-g)X+0LY9((=x~7ym9!*7G+>lFC^`g+2_ZrhybfuO5U1~prpx`NtVqo7H9S5y0P|Ya0BkaO?6Lv?da=yN zv&Y?}=uRN?IzVaf@c#+i1X2R2l|`d7wmCI@Ep{scsg*_Z^0hOdIHe?{wjlWSIU`x! zod1C0#N%_5*Q&y~gaszF6Hc=_!B=YxP9!+Z>Hy@wmvEo|5f%_0!R7iE!||__4w}Vx zK4#F1WyUYgXuNqREFd)kdpgI{r8(~H7gzvx>kS+mN%--zHv#~aPv1Dxegoh*I+0By zw}w~2F#xo104*EnlvKtXK`k1geE)&4fYcUjhenCcyuh_zXcn(G_;uGMlS;e;;njpqFP7Pz^syZp z<^7|F96#{@F#F}R@K1?U2g0ifTkDHh`S<>pDQ;l_@E3kSj+EpnYLox~002ovPDHLk FV1f-m=Ys$M literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Objects/Consumable/Drinks/space_beer.rsi/meta.json b/Resources/Textures/SS220/Objects/Consumable/Drinks/space_beer.rsi/meta.json new file mode 100644 index 000000000000..aba9955f9ebc --- /dev/null +++ b/Resources/Textures/SS220/Objects/Consumable/Drinks/space_beer.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from Aurora Station at https://github.com/Aurorastation/Aurora.3/blob/HEAD/icons/obj/item/reagent_containers/food/drinks/bottle.dmi", + "states": [ + { + "name": "icon" + }, + { + "name": "icon_open" + } + ] +} diff --git a/Resources/Textures/SS220/Objects/Consumable/Drinks/space_beer_can.rsi/icon.png b/Resources/Textures/SS220/Objects/Consumable/Drinks/space_beer_can.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..a279da60e57a3bbec1f2702b2f1158b6786f4fe4 GIT binary patch literal 490 zcmVPx$q)9|UR9J=WmOCs2Q51&1ML|R~5|3mPua-4370pUiRwxOH#*$ep3WZLrpb~Vp z*q~BKghU}a6H$&=mPR~QCW1sKBC65YvCJ0EvNZEIckVqW|M~B^XYRS+!i9@}hDYM8 z>pB3D$*A?!7MTcn0Q`QxNI;Ir`#pHS)(1f9m`>DpkSlRc+`QPq!J@pP%pMz69}9C! zkwoHbQoesKuC8rchH=FFlme05XtgNG|3cX!zBF;RC^S%~h=JJTq@uO0g_dDH#{v0y*?)18P@)(f;@ z$Ig?%_q7m;HY}k7GI)@f56{-?zz_#t8hL(jkj_A}NBSTU*MPUQ&|}6Ht)};RvL$y0 gnnjy&;lf1{Z(Xi|g@cGfPx$tw}^dR9J=WmOU&4Q4q&}i-L$~2#QO5wN6g%8k)UCM_hTL(D=x5A|as>Dpx6V zK5`+Vyab6#XNmHB9gz^C*a!-hNT{CXaF>4+Q=00)#>>jL$6NZ>U7Q zK9Rn-BzKaD38T>@CBK+Qa0aa zZGiI87|c$(2LSN0zr}+uXxlGYU4*l9X*xLoK(&?P=GOYOudeT$q;U=aa2o!4-z5qA zop2ohpm}#2_+1Aa&4Q2O*_9fHrc9o literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Objects/Consumable/Drinks/space_beer_can.rsi/meta.json b/Resources/Textures/SS220/Objects/Consumable/Drinks/space_beer_can.rsi/meta.json new file mode 100644 index 000000000000..8afcd36e76c1 --- /dev/null +++ b/Resources/Textures/SS220/Objects/Consumable/Drinks/space_beer_can.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from Aurora Station at https://github.com/Aurorastation/Aurora.3/blob/HEAD/icons/obj/item/reagent_containers/food/drinks/soda.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "icon_open" + } + ] +} diff --git a/Resources/Textures/SS220/Objects/Misc/6pack.rsi/6pack1.png b/Resources/Textures/SS220/Objects/Misc/6pack.rsi/6pack1.png index 0c3b936aaff05c9d4fd4e05a4b55d5eeed632f40..59e4fed24d81628f530e58b89b6232090d020152 100644 GIT binary patch delta 393 zcmV;40e1d}1F!>-F@I`FL_t(og=1hC1*2dTjDk@x(g7p7fW1T5e{`{f2UcOIqZVL7 zw>&u`j)8%JfdQGu<|t|bW^9%-F#Knbl#+ncMke|U@80}rc=+IIBeflX5(4_VDsc9> zGZ(Om)64;eCVC8dN+NK}&Y!u2V!5G-9?cv92L&Z9|Nnn~^MC*U_c#A9UcCXw1tl#s zO9L!0#>{%{|LKi2j0_A67?w@wsbNg=G5tSp%W10T1{P$_g$+{w4FYN~ESXua{r}`y zYFmxP0SpWb43Ewh{D1d&6`X(aydZ6Ch5{yZ0UpIVhTpQ=8Gg%dr>Vs_9l*fAz`*+0 zlY#ZICtVzY5q|{?3=D9KSs!~cFfhBm^Kp+c}T64mf@K z9K&zf?F?V;H^D;y*>R7bKBS2QQ1bku6XvE6Yd0pa1|*godz@K4QuM00009G delta 351 zcmV-l0igb{1BU~UF@HfxL_t(oh3%6uNPLcKvQUFRR>P?ef(yqBKet(>RZE>R}U`HsC`rWP` z0-;1oHU_PlqW$v=EzJR%zb6KEBa%Idb9(1+Aq5@l2Ms&TfXr#%V1T z$REWTClJqM0qE-Ouf(3&d2IqUE12*v)8S|#x)ZL%PtPyf1ga*m7!1_Nd@!;yr(Yl) zjWO)=0kE+8DOl4!Gs$)2P>Vnn9?L7+XE`al+){M8CGB)b+Ubz><5TfiUM*j->IS^8 x_bR!zDMa6|{;^yJAh)$g@ZnD7br=}_nl~d)V_scbO7s8#002ovPDHLkV1ndkohJYQ diff --git a/Resources/Textures/SS220/Objects/Misc/6pack.rsi/6pack2.png b/Resources/Textures/SS220/Objects/Misc/6pack.rsi/6pack2.png index 7cc5f40c1d83018402330086a23a9829ceb1a159..7aaeba7abfbca0f24c7fb3336ebd3ee5a872a13e 100644 GIT binary patch delta 399 zcmV;A0dW3`1GWQ@F@JDLL_t(og=1hC1*2dTjDk@x(g7p68tomz{-cW>Jg|yn^O(rB zJUJtdfq{X60hz|;C_;dl63ZDF{xe8QNx*3%6McqvZ~inqd~mgqSo6pV0exK+IQ!h0 z3s}Wz<^V$zJqA4`5x8aN&s;*W+|WdiWJiz;3QAi3|Ns8x|9}7QZ~kArdIOFNN?J%x z11zL!m|3s=KfSSrk%55$!?FoIHH=9~?aEpv(ab z3=9mck3AV!AAfsNUj~=PASK)8`l_ t^k9|`RCfT(5imBaLL$}jQ7|X~07&76urY}hIsgCw00>D%PDHLkV1fj;u*v`c delta 354 zcmV-o0iFJ~1BwHXF@Ho!L_t(oh3%6uNP9fGo{XnGBi4O(zV+0cE{z2n}!k9Y6D zU@#aA2E%{HQaLOlwRQ9$Emt=s#_WDV!6^&CvXrg^phY?3i+|#}Xm_CDWzFh9BOMMa8^nrb9vgkdKey` zz*#9#JW4cAAeqYp(A_ssi@me++5*Z?;14d->1ZRq6RpKh&o9~nN*!1Xhw5ZL7+snB zeSvH|!AKwgz+1xVr%cDpB-gP+EdeFGwokUt3Q~4^r0n)c*5#0_%OUH>r{cAJT3=CV z27IsgR(fqyh`&$$W3>uEVQY`@!<|*sF);i!Z@O$_UIrY;T>t<807*qoM6N<$g0UQ< AvH$=8 diff --git a/Resources/Textures/SS220/Objects/Misc/6pack.rsi/6pack3.png b/Resources/Textures/SS220/Objects/Misc/6pack.rsi/6pack3.png index 244753699050391ec3f2f388b1eb17da6899969e..7f03c27f4a6b6fd7dac2328dd48081a502ac8c1a 100644 GIT binary patch delta 393 zcmV;40e1d{1F!>-F@I`FL_t(oh3%FxNW(xBhX1J9x(E(h=%6?mY^~JAML`e(9h@8; zbkIpMbS&0NH#>Cg;?SvdatL(Qv7}9_P!LgS4c$T~p+kh{5OStAj;{#jhj1_NhVSRy zy}JWKg$fla)PI-64cOT|q@TI_yPDw6aKlf|jsO7u(Qj&Y8h>zruoPVs<7O&>q5XN; zf9vL1E09=U6|vdu1m@WcBvWz3R~7`U-FzH_CsT1Q^tZH3foNnCjcj`8K8a7u6vQ5w z68Pae9kxbVFh@005oaC~X{MCtAInQ>f8$V^#wI@ZQpBXw}4j zqdh-1&)Nk55Pw;|fD^03iPZz=*$n`IY^jhfHP8h65&#fj*-`;ac?mr5ZxvuO5Lvqx zv9|}@3b<1C&UpT|KF@@ zj3GW}_W_(i!$M65FfcGMXwI1SfA8w03>S~=XJBApV2}$-#eb`w>QNy0><+`y?RyzS zq+}TMZ5$Z{pWR_NwtNx&9I$lzUIqpR1_o&*RXE=&G7hJDsz-rWayo+;7YDJ{t$TN!&`&5Be_10FwLF|MuZ{LioelIq{R vf6u_cz`(G-dlp0C+Z&9>sA<_KpcViCQJ7<1qG#T`00000NkvXXu0mjfDL_t(og=1hC1tT3Wq6^qNg#AYsJ9uCfhB|5iCUnb_GvXK+ z7#J9kX>5+77GTC^IRnFg21zLiIBjI2&+zWepN5AIt~OHJ0VpA$ud4!QpF48_t2oUZ zU}&Pppr<4Px9t3xODL8bn&{EY5pYmY((?cR_c#Cle}D7;;#1Wda9mK*LbEi0k-D*2 zHle46G0DgD|GX`yX_gxpX4Y%t^<|QeDNRCwiLjDUFbYP&C>RB!U=)mkQ83H_01Wv< UP}Y6;%m4rY07*qoM6N<$g3ZNXasU7T delta 121 zcmZo>TFf}Xuqf8k#W5tJH90|ob#a17PZJ|s&kvRV|NoyiD13M8|MGM95)F*Q5>NQ^ zrKO}CS>2j)pv7P4Zqce+Jgh9v49?89&JA)6D(q)&)-o7-xE<7hni6Qh<;K{`!0>0f Vxcq+Qr(O&|;OXk;vd$@?2>{hIE-C;3 diff --git a/Resources/Textures/SS220/Objects/Misc/6pack.rsi/6pack5.png b/Resources/Textures/SS220/Objects/Misc/6pack.rsi/6pack5.png index b1904299d797e33679e7e3bb1af01bc402f5ad5e..9a68afcffc5df7e08a28490f5e45d38da1142a0d 100644 GIT binary patch delta 225 zcmV<703QFL0g3{UF@MBKL_t(og=1hC1tT3WlB?0)A?!c8*uevpxXm?^QGf#E-cq?81lHZsv?c=zT{!@~zx8;LcKtPs%GRe`h5owru=LV7;fNUALdXWKHiEtE*f>AIEM!_f;1*2dT b3@ZQt80td{2bsx400000NkvXXu0mjfO0i~! delta 119 zcmeBTTF5xTuprvg#W5tJH90|ob#a17PZJ|s&y_A$Vh0bdg4@ePYs-@};}{qi z7#NUgWJfX6!}9-({~4sDB;d4>sXoKI*MAxwKD^pU(-6?tRe`h5p1FWkoMsL%Fx6ww zQxbt&cH#6T6w3`v^=M@^0_2yp{Qv*`&Hw-3-~7LL^#&a0ms+&I(*O&tET37g{Xf02 zhLM4R0V5Yo?5Ux7?qir)uZ>|bGDz|<{m;Na<7|iz%-eFB_MtEeM!_f;1*2dTjDk@x b3Wxy!wai7b&t{MG00000NkvXXu0mjf{~~Rn delta 197 zcmV;$06PDQ0`38jF@LB@L_t(og=1hC1*2dTjDi6MjI=cT|Ns9C6X&k|f9mWV1~X$7 zhWzAUMg|5321Z7NwM?{h05;3f0nI}ItEKb`0c@aV<$4rX(cA&ZzMZrC07j6|)B!Nd z85tQ-96~n-po3I5M+{fcJq-+~17`2qPv10v4VY%d(A!D`*ghb{^}l+>I_!l5JwWw} zb^oo5JqFGJR>mIxS1TwCnEj(*6pVsVFgO7K?A9v5bB-|o00000NkvXXu0mjf;_*~7 diff --git a/Resources/Textures/SS220/Objects/Misc/6pack.rsi/meta.json b/Resources/Textures/SS220/Objects/Misc/6pack.rsi/meta.json index 76280403d4a7..d5e2c451cf30 100644 --- a/Resources/Textures/SS220/Objects/Misc/6pack.rsi/meta.json +++ b/Resources/Textures/SS220/Objects/Misc/6pack.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432 and modified by Swept", + "copyright": "Sprited by Estkemran (Github) for SS220", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/SS220/Objects/Misc/6pack.rsi/plastic-thingy.png b/Resources/Textures/SS220/Objects/Misc/6pack.rsi/plastic-thingy.png index c1ba9913b289f6c848880f0290b0988e28c0dbdf..a16e32d867318d74494aae27d96df48608cd9cb6 100644 GIT binary patch delta 153 zcmV;K0A~Nk0l@)~7#0Wv0000)q>9D>0004VQb$4nuFf3kks%v+1awkPQvm<}|FbPX zhyVZpQ%OWYR5*?8kUI_lAP7SN?|)}4@tYJE6XRfq_7S>($Q>mpq{7`9HAgZU`;g8H zqLtMM!Rn;FJCS*q-)sSu+U5^B_LvCW{sX1e8F@k>eZ8U#Mlb;@iZL&m00000NkvXX Hu0mjfxCc6T delta 160 zcmV;R0AK&X0mlK57zqLc0000E6q09=E*pOVbW%=J06^y0W&i*HX-PyuR2Y?GU?2}L zhJqlF!M4f`2pt$0r2o$b!U;eI^K2jlGIIDp5Ga-Z4+Mb>sg+Sc2-FoC0)jwB)>0r` z0yJ;`PY?t$Hduln(BK2lfba>B@&6eR0vU{}CIaCEkah