Merge branch 'arumoon-server' into mr0maks-server

Workbench-Team · Jul 5, 2023 · 998b5a9 · 998b5a9
2 parents 55d7dc6 + 287d53c
commit 998b5a9
Show file tree

Hide file tree

Showing 13 changed files with 84 additions and 1 deletion.
diff --git a/Resources/Changelog/ChangelogAruMoon.yml b/Resources/Changelog/ChangelogAruMoon.yml
@@ -667,3 +667,10 @@ Entries:
     type: Tweak
   id: 58
   time: '2023-07-01T15:57:59.0000000+00:00'
+- author: Cooderer
+  changes:
+  - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u043E \u041F\u0418\u0412\
+      \u041E(\u041A\u0435\u0433\u0430(\u0422\u0413))!"
+    type: Add
+  id: 59
+  time: '2023-07-05T10:55:52.0000000+00:00'
diff --git 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
@@ -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.
+    .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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git a/Resources/Textures/Structures/Storage/beerkeg.rsi/meta.json 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"
+    }
+ ]
+}