From 0c16e5f07633d5b571ab05ca7434be9754cb1f0a Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Sun, 30 Apr 2023 17:16:15 +1000 Subject: [PATCH] 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. --- .../prototypes/catalog/cargo/cargo-food.ftl | 3 --- .../catalog/fills/crates/food-crates.ftl | 3 --- .../structures/storage/tanks/tanks.ftl | 6 ----- .../reagents/meta/consumable/drink/drinks.ftl | 2 -- Resources/Maps/Dungeon/lava_brig.yml | 6 ----- Resources/Maps/barratry.yml | 6 ----- Resources/Maps/centcomm.yml | 6 ----- Resources/Maps/fland.yml | 6 ----- Resources/Maps/omega.yml | 6 ----- .../Prototypes/Catalog/Cargo/cargo_food.yml | 11 --------- .../Objects/Consumable/Drinks/drinks.yml | 16 ------------- .../Structures/Storage/Tanks/tanks.yml | 22 ------------------ .../Reagents/Consumable/Drink/drinks.yml | 11 --------- .../Structures/Storage/kvass.rsi/kvass.png | Bin 2963 -> 0 bytes .../Structures/Storage/kvass.rsi/meta.json | 14 ----------- 15 files changed, 118 deletions(-) delete mode 100644 Resources/Textures/Structures/Storage/kvass.rsi/kvass.png delete mode 100644 Resources/Textures/Structures/Storage/kvass.rsi/meta.json 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 9053f51e969e88279422f065c642079cdfba252e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2963 zcmbVO3ve6N6+5T)=gz)mHi95?T{TV*{71DX&j8;_d;5P7M7Kn$tgNpP zWgkF2)ef|fwArjh2vT@hXl|w=>fKRrLv!=~gC#|?qjAqe4{h)?mmf~OmO6kK*8gGO zjEy>785+Cu-aCu+hR&GMbea;O2-HT9((*)v7uEq4^?`sCwj0k34I5EO zv>R75Zo(a@1T9icdlWRZ*LsEab%ISamY1QW2@V3(9~v&j48R@H8VNHZaXA~~~RB})?|3{UV8oHP+yNNGh;$mvB|qrtRuQNTeEgg{tT zpe~uyjkL(BthC5iFr5=$}z#W(MO~zZnC(m8V&jVFX~CuvQn9 z;6~?zQ>|*KL}-x`eS(iS157kqX^b?R35=)V%gQho)=&6pD+`RMRu~*K10nI+Zn7K6 z>|~=>W5L$Uq=h2j4=1&ER^D_C`J{MNSc0jbjHp&x8TK1sqk=5MXlN!oUoRyl1a)Y!mogdQDCtu**@do1KCkfD*HOTl;T=bfs4@0C}Rk}y2ng{ zYa|UpTh?y_xI2dcP48}w7c!Iz+QtH+F*_|?rm((R3NvQoEdVC(D!VPCrpSIZ&PPE- z0A_rm%SNPa9(6a<%V`&ldGd3Qx`e7m4ECPdxjE^OGs~He1I}v>jJ!}9J zMv`9A#*r+?z|Tyt_=f1S5h#S9oJYQ{_Uy_Y0HMFl0k9BH$&8)j5o^-Wl zN)5lX3e&PF$K^yx!!uYL<_>@Ok-I*CFr+F9F9)(eUJb8qJ6z5RZ{sVcw~@7aGQVm! zDC#u58+&R?cZ+q}kLTQ8+w<^7eSJffZN?0H{KOKodC|Rn@)sKdzNNQ2dOY{oUVNQC z{I@?hJ-xmEm!H=$flfN*(%thCv+3=KJhyeY=(O^4;oSZ_qO5daY{an$`TdCg8R?}t`OAJb5PHvz z42^tr{2yngb(T>(hw6~gmmm9fiFYm%JII0*{i`;^ie)Pe>Zh~N;^LzfeMf$n`grWn zb92T^PWDt+y!g)X4?q9+Tjv+1y7nAf`N*!G`AaVV=dBj~Gs|cHVqOs0<#_jrlR77~ zx_a15c>cb$cT4a+dotD-=s4)#J#chOH!^y<`VBgGe&CI+e;wJqWAFQ(wbPoh$7;pmq?;d{d-+_Ur8SlbP+6W0xOe6)Vm@;v0Wao_K196OZi;hX60r$7GArcH)M ZU3f*uC*}HIZ`Lk>uBuw+fTQ{T{{t!_`$zx) 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" - } - ] -} -- 2.51.2