Remove kvass (#15939)

- Sprite looks bad.
- I don't think I've ever seen it ordered.
- There's no reason to have one drink in a tank.
- Adding region-specific things is cringe.

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 ec9c36bb52779cd30743b662e3b353a913ea916e..78f3c279ae22a7be4a950be9575731918ca6361f 100644 (file)
--- a/Resources/Locale/en-US/prototypes/catalog/cargo/cargo-food.ftl
+++ b/Resources/Locale/en-US/prototypes/catalog/cargo/cargo-food.ftl
@@ -12,6 +12,3 @@ ent-FoodDinnerware = { ent-CrateFoodDinnerware }
 
 ent-FoodBarSupply = { ent-CrateFoodBarSupply }
     .desc = { ent-CrateFoodBarSupply.desc }
-
-ent-FoodCrateKvassTank = { ent-CrateFoodKvassTank }
-    .desc = { ent-CrateFoodKvassTank.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 78ad45da927e22b52497ab8b5dac19bcc315380e..de1accdeae16230e04ac7f7bc9485856e4090b1b 100644 (file)
--- a/Resources/Locale/en-US/prototypes/catalog/fills/crates/food-crates.ftl
+++ b/Resources/Locale/en-US/prototypes/catalog/fills/crates/food-crates.ftl
@@ -12,6 +12,3 @@ ent-CrateFoodDinnerware = Kitchen dinnerware crate
 
 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

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 877541d1953f33ed0ea94eb0af75481f29222af7..49ffcdae55adf65360099c37ea442b48aab25179 100644 (file)
--- a/Resources/Locale/en-US/prototypes/entities/structures/storage/tanks/tanks.ftl
+++ b/Resources/Locale/en-US/prototypes/entities/structures/storage/tanks/tanks.ftl
@@ -18,9 +18,3 @@ ent-WaterCooler = water cooler
 
 ent-WaterTankHighCapacity = high-capacity water tank
     .desc = A highly pressurized water tank made to hold gargantuan amounts of water.
-
-ent-KvassTank = КВАС
-    .desc = A cool refreshing drink with a taste of socialism.
-
-ent-KvassTankFull = { ent-KvassTank }
-    .desc = { ent-KvassTank.desc }

diff --git a/Resources/Locale/en-US/reagents/meta/consumable/drink/drinks.ftl b/Resources/Locale/en-US/reagents/meta/consumable/drink/drinks.ftl
index ec5562641aaf02346fea759b02bedff19a835fa6..cbe8ec99d19c4cdc589a09efffbdd50ab88f85bf 100644 (file)
--- a/Resources/Locale/en-US/reagents/meta/consumable/drink/drinks.ftl
+++ b/Resources/Locale/en-US/reagents/meta/consumable/drink/drinks.ftl
@@ -76,5 +76,3 @@ reagent-desc-pilk = A sickening mixture of milk and cola.
 reagent-name-posca = posca
 reagent-desc-posca = Poor warriors' drink from a forgotten era.
 
-reagent-name-kvass = kvass
-reagent-desc-kvass = A cool refreshing drink with a taste of socialism.

diff --git a/Resources/Maps/Dungeon/lava_brig.yml b/Resources/Maps/Dungeon/lava_brig.yml
index e93c3b444d54069984944aa1a0ae5d4707266e56..d4130f13a66fc9a95889215e04b2f4bccd5cf32a 100644 (file)
--- a/Resources/Maps/Dungeon/lava_brig.yml
+++ b/Resources/Maps/Dungeon/lava_brig.yml
@@ -6386,12 +6386,6 @@ entities:
   - pos: 4.5,16.5
     parent: 0
     type: Transform
-- uid: 588
-  type: KvassTankFull
-  components:
-  - pos: 0.5,16.5
-    parent: 0
-    type: Transform
 - uid: 589
   type: Grille
   components:

diff --git a/Resources/Maps/barratry.yml b/Resources/Maps/barratry.yml
index fb969c53c7bec6be297d6ef89659dbbc3a858cab..aeb4cd7c2bf39f62eeb72df6e0663f8dac316e30 100644 (file)
--- a/Resources/Maps/barratry.yml
+++ b/Resources/Maps/barratry.yml
@@ -75668,12 +75668,6 @@ entities:
     pos: -76.5,50.5
     parent: 1
     type: Transform
-- uid: 9263
-  type: KvassTankFull
-  components:
-  - pos: -77.5,51.5
-    parent: 1
-    type: Transform
 - uid: 9264
   type: WallReinforced
   components:

diff --git a/Resources/Maps/centcomm.yml b/Resources/Maps/centcomm.yml
index f475f274891e692930aa5d5d798328433119b67a..203865463f885885bb18a11b169455c01bb54db0 100644 (file)
--- a/Resources/Maps/centcomm.yml
+++ b/Resources/Maps/centcomm.yml
@@ -46889,12 +46889,6 @@ entities:
       - port: Pressed\r
         uid: 6442\r
     type: SignalReceiver\r
-- uid: 6526\r
-  type: KvassTankFull\r
-  components:\r
-  - pos: -7.5,17.5\r
-    parent: 0\r
-    type: Transform\r
 - uid: 6527\r
   type: CrateHydroponicsSeedsExotic\r
   components:\r

diff --git a/Resources/Maps/fland.yml b/Resources/Maps/fland.yml
index 055a3a14e6183a278da93e7785465d86f67f1334..8bacbac249fe71e4c3a0ff4c09fc8c66aa0e8bf6 100644 (file)
--- a/Resources/Maps/fland.yml
+++ b/Resources/Maps/fland.yml
@@ -215982,12 +215982,6 @@ entities:
   - pos: 103.5,-15.5\r
     parent: 0\r
     type: Transform\r
-- uid: 26860\r
-  type: KvassTankFull\r
-  components:\r
-  - pos: 104.5,-15.5\r
-    parent: 0\r
-    type: Transform\r
 - uid: 26861\r
   type: SurveillanceCameraEngineering\r
   components:\r

diff --git a/Resources/Maps/omega.yml b/Resources/Maps/omega.yml
index 7c1afb1594a6c3db7a75e6059568d6bab15ac9bc..60e8bdf6de463b8da1dc114677ce3c47d2a229ff 100644 (file)
--- a/Resources/Maps/omega.yml
+++ b/Resources/Maps/omega.yml
@@ -59651,12 +59651,6 @@ entities:
   - pos: -24.5,22.5\r
     parent: 0\r
     type: Transform\r
-- uid: 7655\r
-  type: KvassTankFull\r
-  components:\r
-  - pos: -17.5,33.5\r
-    parent: 0\r
-    type: Transform\r
 - uid: 7656\r
   type: WallReinforced\r
   components:\r

diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_food.yml b/Resources/Prototypes/Catalog/Cargo/cargo_food.yml
index 7a8d3eca87925d51fbf5569c43fe7706d0920be0..f757080fb76d55f52c0b5b79b4db408754e3ecfd 100644 (file)
--- a/Resources/Prototypes/Catalog/Cargo/cargo_food.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_food.yml
@@ -47,14 +47,3 @@
   cost: 750
   category: Food
   group: market
-
-- type: cargoProduct
-  id: FoodCrateKvassTank
-  icon:
-    sprite: Structures/Storage/kvass.rsi
-    state: kvass
-  product: KvassTankFull
-  cost: 2000
-  category: Food
-  group: market
-

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml
index e8e62f3cced7bec382a9f63c1612a7509ae22b17..3967314342056dddae3359fb9ad7a325fa6570dd 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml
@@ -2201,19 +2201,3 @@
           Quantity: 30
         - ReagentId: CapsaicinOil
           Quantity: 5
-
-- type: entity
-  parent: DrinkGlassBase
-  id: DrinkKvassGlass
-  name: kvass glass
-  description: A cool refreshing drink with a taste of socialism.
-  components:
-    - type: SolutionContainerManager
-      solutions:
-        drink:
-          maxVol: 30
-          reagents:
-            - ReagentId: Kvass
-              Quantity: 30
-    - type: Sprite
-      sprite: Objects/Consumable/Drinks/kvass.rsi

diff --git a/Resources/Prototypes/Entities/Structures/Storage/Tanks/tanks.yml b/Resources/Prototypes/Entities/Structures/Storage/Tanks/tanks.yml
index af41730eb48bb4aa2a14a67229e6f08d4d81c48d..d76c978bedc5e9ce828312ef10736c32dc3a5e67 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Storage/Tanks/tanks.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Tanks/tanks.yml
@@ -113,25 +113,3 @@
 #   It's pressurized...
   - type: ReagentTank
     transferAmount: 100
-
-# Kvass
-- type: entity
-  id: KvassTank
-  parent: StorageTank
-  suffix: Empty
-  components:
-    - type: Sprite
-      sprite: Structures/Storage/kvass.rsi
-      state: kvass
-
-- type: entity
-  parent: KvassTank
-  id: KvassTankFull
-  suffix: Full
-  components:
-    - type: SolutionContainerManager
-      solutions:
-        tank:
-          reagents:
-            - ReagentId: Kvass
-              Quantity: 1500

diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml b/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml
index 66f3abdca8a5e93282338a8132dd7204d60d5412..453e538dc36cdf39e7f83d8a690b2fec33cb3543 100644 (file)
--- a/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml
+++ b/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml
@@ -382,14 +382,3 @@
     sprite: Objects/Consumable/Drinks/rewriter.rsi
     state: icon
 
-- type: reagent
-  id: Kvass
-  name: reagent-name-kvass
-  parent: BaseDrink
-  desc: reagent-desc-kvass
-  physicalDesc: reagent-physical-desc-bubbly
-  flavor: bread
-  color: "#381600"
-  metamorphicSprite:
-    sprite: Objects/Consumable/Drinks/kvass.rsi
-    state: icon

diff --git a/Resources/Textures/Structures/Storage/kvass.rsi/kvass.png b/Resources/Textures/Structures/Storage/kvass.rsi/kvass.png
deleted file mode 100644 (file)
index 9053f51..0000000
Binary files a/Resources/Textures/Structures/Storage/kvass.rsi/kvass.png and /dev/null differ

diff --git a/Resources/Textures/Structures/Storage/kvass.rsi/meta.json b/Resources/Textures/Structures/Storage/kvass.rsi/meta.json
deleted file mode 100644 (file)
index 52432bc..0000000
--- a/Resources/Textures/Structures/Storage/kvass.rsi/meta.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "https://github.com/TauCetiStation/TauCetiClassic/commit/c449d65dff642f44f3e0d8a312f70aec43ab2eae",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "kvass"
-    }
- ]
-}