diff --git a/Resources/Locale/en-US/prototypes/catalog/cargo/cargo-food.ftl b/Resources/Locale/en-US/prototypes/catalog/cargo/cargo-food.ftl index ec9c36bb52779c..194d7768b48d70 100644 --- a/Resources/Locale/en-US/prototypes/catalog/cargo/cargo-food.ftl +++ b/Resources/Locale/en-US/prototypes/catalog/cargo/cargo-food.ftl @@ -15,3 +15,5 @@ ent-FoodBarSupply = { ent-CrateFoodBarSupply } ent-FoodCrateKvassTank = { ent-CrateFoodKvassTank } .desc = { ent-CrateFoodKvassTank.desc } +ent-FoodCrateBeerKeg = { ent-CrateFoodBeerKeg } + .desc = { ent-CrateFoodBeerKeg.desc } diff --git a/Resources/Locale/en-US/prototypes/catalog/fills/crates/food-crates.ftl b/Resources/Locale/en-US/prototypes/catalog/fills/crates/food-crates.ftl index 78ad45da927e22..c68bfd8ceb34cd 100644 --- a/Resources/Locale/en-US/prototypes/catalog/fills/crates/food-crates.ftl +++ b/Resources/Locale/en-US/prototypes/catalog/fills/crates/food-crates.ftl @@ -14,4 +14,6 @@ ent-CrateFoodBarSupply = Bartending supplies crate .desc = Extra Bar supplies, in case the clown was allowed in the bar unsupervised. ent-CrateFoodKvassTank = Kvass tank crate - .desc = A tank with refreshing kvass, which helps so much in the heat. \ No newline at end of file + .desc = A tank with refreshing kvass, which helps so much in the heat. +ent-CrateFoodBeerKeg = Beer Keg crate + .desc = A Keg with refreshing beer. diff --git a/Resources/Locale/en-US/prototypes/entities/structures/storage/tanks/tanks.ftl b/Resources/Locale/en-US/prototypes/entities/structures/storage/tanks/tanks.ftl index 877541d1953f33..bb7ec784a61169 100644 --- a/Resources/Locale/en-US/prototypes/entities/structures/storage/tanks/tanks.ftl +++ b/Resources/Locale/en-US/prototypes/entities/structures/storage/tanks/tanks.ftl @@ -24,3 +24,9 @@ ent-KvassTank = КВАС ent-KvassTankFull = { ent-KvassTank } .desc = { ent-KvassTank.desc } + +ent-BeerKeg = BEER + .desc = A cool refreshing drink with a taste of piss. + +ent-BeerKegFull = { ent-BeerKeg } + .desc = { ent-BeerKeg.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/storage/tanks/tanks.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/storage/tanks/tanks.ftl index 8d0ae3ff7b1675..c5b497f22023b1 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/storage/tanks/tanks.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/storage/tanks/tanks.ftl @@ -25,3 +25,10 @@ ent-KvassTank = { ent-StorageTank } ent-KvassTankFull = { ent-KvassTank } .suffix = Full .desc = { ent-KvassTank.desc } +ent-BeerKeg = { ent-StorageTank } + .suffix = Empty + .desc = { ent-StorageTank.desc } +ent-BeerKegFull = { ent-BeerKeg } + .suffix = Full + .desc = { ent-BeerKeg.desc } + diff --git a/Resources/Locale/ru-RU/prototypes/catalog/cargo/cargo-food.ftl b/Resources/Locale/ru-RU/prototypes/catalog/cargo/cargo-food.ftl index 23da31db6da1aa..354aedb5ad76a7 100644 --- a/Resources/Locale/ru-RU/prototypes/catalog/cargo/cargo-food.ftl +++ b/Resources/Locale/ru-RU/prototypes/catalog/cargo/cargo-food.ftl @@ -10,3 +10,5 @@ ent-FoodBarSupply = { ent-CrateFoodBarSupply } .desc = { ent-CrateFoodBarSupply.desc } ent-FoodCrateKvassTank = { ent-CrateFoodKvassTank } .desc = { ent-CrateFoodKvassTank.desc } +ent-FoodCrateBeerKeg = { ent-CrateFoodBeerKeg } + .desc = { ent-CrateFoodBeerKeg.desc } diff --git a/Resources/Locale/ru-RU/prototypes/catalog/fills/crates/food-crates.ftl b/Resources/Locale/ru-RU/prototypes/catalog/fills/crates/food-crates.ftl index de785598decea7..29aab83ea1c8f8 100644 --- a/Resources/Locale/ru-RU/prototypes/catalog/fills/crates/food-crates.ftl +++ b/Resources/Locale/ru-RU/prototypes/catalog/fills/crates/food-crates.ftl @@ -10,3 +10,5 @@ ent-CrateFoodBarSupply = ящик с припасами для бара .desc = Дополнительные припасы для бара на случай, если клоуна пустят в бар без присмотра. ent-CrateFoodKvassTank = ящик с бочкой кваса .desc = Цистерна с освежающим квасом, который так помогает в жару. +ent-CrateFoodBeerKeg = ящик с кегой Пива + .desc = Кега с напитком древней расы как-то связанной с древними чешуйчатыми diff --git a/Resources/Locale/ru-RU/prototypes/entities/structures/storage/tanks/tanks.ftl b/Resources/Locale/ru-RU/prototypes/entities/structures/storage/tanks/tanks.ftl index eb2fd9c1d1dc0a..c4fd66f11d45ca 100644 --- a/Resources/Locale/ru-RU/prototypes/entities/structures/storage/tanks/tanks.ftl +++ b/Resources/Locale/ru-RU/prototypes/entities/structures/storage/tanks/tanks.ftl @@ -16,3 +16,7 @@ ent-KvassTank = КВАС .desc = Прохладный освежающий напиток с привкусом социализма. ent-KvassTankFull = { ent-KvassTank } .desc = { ent-KvassTank.desc } +ent-BeerKeg = ПИВО + .desc = Напиток древней расы как-то связанной с древними чешуйчатыми. +ent-BeerKegFull = { ent-BeerKeg } + .desc = { ent-BeerKeg.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/storage/tanks/tanks.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/storage/tanks/tanks.ftl index 42508ab2d5daac..32a1395650898c 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/storage/tanks/tanks.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/storage/tanks/tanks.ftl @@ -25,3 +25,9 @@ ent-KvassTank = КВАС ent-KvassTankFull = { ent-KvassTank } .suffix = Полный .desc = { ent-KvassTank.desc } +ent-BeerKeg = ПИВО + .desc = Напиток древней расы как-то связанной с древними чешуйчатыми. + .suffix = Пустой +ent-BeerKegFull = { ent-BeerKeg } + .suffix = Полный + .desc = { ent-BeerKeg.desc } diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_food.yml b/Resources/Prototypes/Catalog/Cargo/cargo_food.yml index 3bafea1356e06c..aeffa0365a2d8e 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_food.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_food.yml @@ -68,6 +68,16 @@ category: Food group: market +- type: cargoProduct + id: FoodCrateBeerKeg + icon: + sprite: Structures/Storage/beerkeg.rsi + state: beerkeg + product: BeerKegFull + cost: 1500 + category: Food + group: market + - type: cargoProduct id: FoodSoftdrinks icon: diff --git a/Resources/Prototypes/WorkbenchTeam/Entities/Objects/Structure/beerkeg.yml b/Resources/Prototypes/WorkbenchTeam/Entities/Objects/Structure/beerkeg.yml new file mode 100644 index 00000000000000..10d39934f655ef --- /dev/null +++ b/Resources/Prototypes/WorkbenchTeam/Entities/Objects/Structure/beerkeg.yml @@ -0,0 +1,21 @@ +#BeerKeg +- type: entity + id: BeerKeg + parent: StorageTank + suffix: Empty + components: + - type: Sprite + sprite: Structures/Storage/beerkeg.rsi + state: beerkeg + +- type: entity + parent: BeerKeg + id: BeerKegFull + suffix: Full + components: + - type: SolutionContainerManager + solutions: + tank: + reagents: + - ReagentId: Beer + Quantity: 1000 diff --git a/Resources/Textures/Structures/Storage/beerkeg.rsi/beerkeg.png b/Resources/Textures/Structures/Storage/beerkeg.rsi/beerkeg.png new file mode 100644 index 00000000000000..487c06f0a384db Binary files /dev/null and b/Resources/Textures/Structures/Storage/beerkeg.rsi/beerkeg.png differ diff --git a/Resources/Textures/Structures/Storage/beerkeg.rsi/meta.json b/Resources/Textures/Structures/Storage/beerkeg.rsi/meta.json new file mode 100644 index 00000000000000..b825a63ec01454 --- /dev/null +++ b/Resources/Textures/Structures/Storage/beerkeg.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/tgstation/tgstation/blob/a79db0b16aa39d46104fe92fea09042214b9fc05/icons/obj/medical/chemical_tanks.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "beerkeg" + } + ] +}