From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Sun, 30 Apr 2023 07:16:15 +0000 (+1000) Subject: Remove kvass (#15939) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=0c16e5f07633d5b571ab05ca7434be9754cb1f0a;p=space-station-14.git 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 ec9c36bb52..78f3c279ae 100644 --- 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 78ad45da92..de1accdeae 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 @@ -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 877541d195..49ffcdae55 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 @@ -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 ec5562641a..cbe8ec99d1 100644 --- 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 e93c3b444d..d4130f13a6 100644 --- 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 fb969c53c7..aeb4cd7c2b 100644 --- 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 f475f27489..203865463f 100644 --- a/Resources/Maps/centcomm.yml +++ b/Resources/Maps/centcomm.yml @@ -46889,12 +46889,6 @@ entities: - port: Pressed uid: 6442 type: SignalReceiver -- uid: 6526 - type: KvassTankFull - components: - - pos: -7.5,17.5 - parent: 0 - type: Transform - uid: 6527 type: CrateHydroponicsSeedsExotic components: diff --git a/Resources/Maps/fland.yml b/Resources/Maps/fland.yml index 055a3a14e6..8bacbac249 100644 --- a/Resources/Maps/fland.yml +++ b/Resources/Maps/fland.yml @@ -215982,12 +215982,6 @@ entities: - pos: 103.5,-15.5 parent: 0 type: Transform -- uid: 26860 - type: KvassTankFull - components: - - pos: 104.5,-15.5 - parent: 0 - type: Transform - uid: 26861 type: SurveillanceCameraEngineering components: diff --git a/Resources/Maps/omega.yml b/Resources/Maps/omega.yml index 7c1afb1594..60e8bdf6de 100644 --- a/Resources/Maps/omega.yml +++ b/Resources/Maps/omega.yml @@ -59651,12 +59651,6 @@ entities: - pos: -24.5,22.5 parent: 0 type: Transform -- uid: 7655 - type: KvassTankFull - components: - - pos: -17.5,33.5 - parent: 0 - type: Transform - uid: 7656 type: WallReinforced components: diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_food.yml b/Resources/Prototypes/Catalog/Cargo/cargo_food.yml index 7a8d3eca87..f757080fb7 100644 --- 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 e8e62f3cce..3967314342 100644 --- 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 af41730eb4..d76c978bed 100644 --- 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 66f3abdca8..453e538dc3 100644 --- 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 index 9053f51e96..0000000000 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 index 52432bc6e2..0000000000 --- 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" - } - ] -}