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 000000000000..8a2730bb12c1 Binary files /dev/null and b/Resources/Textures/SS220/Clothing/Head/Hats/tophat_helm.rsi/equipped-HELMET-hamster.png differ diff --git a/Resources/Textures/SS220/Clothing/Head/Hats/tophat_helm.rsi/equipped-HELMET.png b/Resources/Textures/SS220/Clothing/Head/Hats/tophat_helm.rsi/equipped-HELMET.png new file mode 100644 index 000000000000..cafc0805be4b Binary files /dev/null and b/Resources/Textures/SS220/Clothing/Head/Hats/tophat_helm.rsi/equipped-HELMET.png differ 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 000000000000..f5f37c302aaa Binary files /dev/null and b/Resources/Textures/SS220/Clothing/Head/Hats/tophat_helm.rsi/icon.png differ 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 000000000000..393d94be82f1 Binary files /dev/null and b/Resources/Textures/SS220/Clothing/Head/Hats/tophat_helm.rsi/inhand-left.png differ diff --git a/Resources/Textures/SS220/Clothing/Head/Hats/tophat_helm.rsi/inhand-right.png b/Resources/Textures/SS220/Clothing/Head/Hats/tophat_helm.rsi/inhand-right.png new file mode 100644 index 000000000000..116a2df999dd Binary files /dev/null and b/Resources/Textures/SS220/Clothing/Head/Hats/tophat_helm.rsi/inhand-right.png differ 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 000000000000..b7c5e34fbb51 Binary files /dev/null and b/Resources/Textures/SS220/Clothing/Uniforms/Jumpsuit/bartender_helm.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/SS220/Clothing/Uniforms/Jumpsuit/bartender_helm.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/SS220/Clothing/Uniforms/Jumpsuit/bartender_helm.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 000000000000..09bfb535d8da Binary files /dev/null and b/Resources/Textures/SS220/Clothing/Uniforms/Jumpsuit/bartender_helm.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/SS220/Clothing/Uniforms/Jumpsuit/bartender_helm.rsi/icon.png b/Resources/Textures/SS220/Clothing/Uniforms/Jumpsuit/bartender_helm.rsi/icon.png new file mode 100644 index 000000000000..03ca1bd42527 Binary files /dev/null and b/Resources/Textures/SS220/Clothing/Uniforms/Jumpsuit/bartender_helm.rsi/icon.png differ 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 000000000000..ed6417c9a9a1 Binary files /dev/null and b/Resources/Textures/SS220/Clothing/Uniforms/Jumpsuit/bartender_helm.rsi/inhand-left.png differ 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 000000000000..f9f6a999cf6d Binary files /dev/null and b/Resources/Textures/SS220/Clothing/Uniforms/Jumpsuit/bartender_helm.rsi/inhand-right.png differ 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 000000000000..2df2e027fd48 Binary files /dev/null and b/Resources/Textures/SS220/Markers/jobs.rsi/bartender_helm.png differ 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 59f5f0d6d255..5064c292e09e 100644 Binary files a/Resources/Textures/SS220/Objects/Consumable/Drinks/beer_can.rsi/icon.png and b/Resources/Textures/SS220/Objects/Consumable/Drinks/beer_can.rsi/icon.png differ diff --git a/Resources/Textures/SS220/Objects/Consumable/Drinks/beer_can.rsi/icon_open.png b/Resources/Textures/SS220/Objects/Consumable/Drinks/beer_can.rsi/icon_open.png index 8752198ac46c..713f47aa97b7 100644 Binary files a/Resources/Textures/SS220/Objects/Consumable/Drinks/beer_can.rsi/icon_open.png and b/Resources/Textures/SS220/Objects/Consumable/Drinks/beer_can.rsi/icon_open.png differ diff --git a/Resources/Textures/SS220/Objects/Consumable/Drinks/beer_can.rsi/meta.json b/Resources/Textures/SS220/Objects/Consumable/Drinks/beer_can.rsi/meta.json index 07c1f6f6e9d5..d1011eb7cf20 100644 --- a/Resources/Textures/SS220/Objects/Consumable/Drinks/beer_can.rsi/meta.json +++ b/Resources/Textures/SS220/Objects/Consumable/Drinks/beer_can.rsi/meta.json @@ -1,17 +1,17 @@ { "version": 1, + "license": "EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt", + "copyright": "Sprited by Estkemran (Github) for SS220", "size": { "x": 32, "y": 32 }, - "license": "EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt", - "copyright": "Sprited by okroshka59 (Discord) for SS220", "states": [ { "name": "icon" }, - { - "name": "icon_open" + { + "name": "icon_open" } ] } diff --git a/Resources/Textures/SS220/Objects/Consumable/Drinks/space_beer.rsi/icon.png b/Resources/Textures/SS220/Objects/Consumable/Drinks/space_beer.rsi/icon.png new file mode 100644 index 000000000000..a120243f0956 Binary files /dev/null and b/Resources/Textures/SS220/Objects/Consumable/Drinks/space_beer.rsi/icon.png differ diff --git a/Resources/Textures/SS220/Objects/Consumable/Drinks/space_beer.rsi/icon_open.png b/Resources/Textures/SS220/Objects/Consumable/Drinks/space_beer.rsi/icon_open.png new file mode 100644 index 000000000000..b61faed6a28c Binary files /dev/null and b/Resources/Textures/SS220/Objects/Consumable/Drinks/space_beer.rsi/icon_open.png differ 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 000000000000..a279da60e57a Binary files /dev/null and b/Resources/Textures/SS220/Objects/Consumable/Drinks/space_beer_can.rsi/icon.png differ diff --git a/Resources/Textures/SS220/Objects/Consumable/Drinks/space_beer_can.rsi/icon_open.png b/Resources/Textures/SS220/Objects/Consumable/Drinks/space_beer_can.rsi/icon_open.png new file mode 100644 index 000000000000..215f1b117f01 Binary files /dev/null and b/Resources/Textures/SS220/Objects/Consumable/Drinks/space_beer_can.rsi/icon_open.png differ 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 0c3b936aaff0..59e4fed24d81 100644 Binary files a/Resources/Textures/SS220/Objects/Misc/6pack.rsi/6pack1.png and b/Resources/Textures/SS220/Objects/Misc/6pack.rsi/6pack1.png differ diff --git a/Resources/Textures/SS220/Objects/Misc/6pack.rsi/6pack2.png b/Resources/Textures/SS220/Objects/Misc/6pack.rsi/6pack2.png index 7cc5f40c1d83..7aaeba7abfbc 100644 Binary files a/Resources/Textures/SS220/Objects/Misc/6pack.rsi/6pack2.png and b/Resources/Textures/SS220/Objects/Misc/6pack.rsi/6pack2.png differ diff --git a/Resources/Textures/SS220/Objects/Misc/6pack.rsi/6pack3.png b/Resources/Textures/SS220/Objects/Misc/6pack.rsi/6pack3.png index 244753699050..7f03c27f4a6b 100644 Binary files a/Resources/Textures/SS220/Objects/Misc/6pack.rsi/6pack3.png and b/Resources/Textures/SS220/Objects/Misc/6pack.rsi/6pack3.png differ diff --git a/Resources/Textures/SS220/Objects/Misc/6pack.rsi/6pack4.png b/Resources/Textures/SS220/Objects/Misc/6pack.rsi/6pack4.png index 052e000151fc..ed9ec9b788e6 100644 Binary files a/Resources/Textures/SS220/Objects/Misc/6pack.rsi/6pack4.png and b/Resources/Textures/SS220/Objects/Misc/6pack.rsi/6pack4.png differ diff --git a/Resources/Textures/SS220/Objects/Misc/6pack.rsi/6pack5.png b/Resources/Textures/SS220/Objects/Misc/6pack.rsi/6pack5.png index b1904299d797..9a68afcffc5d 100644 Binary files a/Resources/Textures/SS220/Objects/Misc/6pack.rsi/6pack5.png and b/Resources/Textures/SS220/Objects/Misc/6pack.rsi/6pack5.png differ diff --git a/Resources/Textures/SS220/Objects/Misc/6pack.rsi/6pack6.png b/Resources/Textures/SS220/Objects/Misc/6pack.rsi/6pack6.png index fc111ff9b9d8..1f4e265c97ed 100644 Binary files a/Resources/Textures/SS220/Objects/Misc/6pack.rsi/6pack6.png and b/Resources/Textures/SS220/Objects/Misc/6pack.rsi/6pack6.png differ 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 c1ba9913b289..a16e32d86731 100644 Binary files a/Resources/Textures/SS220/Objects/Misc/6pack.rsi/plastic-thingy.png and b/Resources/Textures/SS220/Objects/Misc/6pack.rsi/plastic-thingy.png differ