From a8036ab767cff155f64b2a793056cee3f0afee8d Mon Sep 17 00:00:00 2001 From: KIBORG04 Date: Thu, 23 Jun 2022 18:08:53 +0300 Subject: [PATCH 1/6] add kvass --- Content.Server/Rotatable/RotatableSystem.cs | 2 ++ .../reagents/meta/consumable/drink/drinks.ftl | 3 ++ .../Prototypes/Catalog/Cargo/cargo_food.yml | 14 +++++++++- .../Prototypes/Catalog/Fills/Crates/food.yml | 10 +++++++ .../Objects/Consumable/Drinks/drinks.yml | 15 ++++++++++ .../Structures/Storage/Tanks/tanks.yml | 26 ++++++++++++++++++ .../Reagents/Consumable/Drink/drinks.yml | 9 ++++++ .../Consumable/Drinks/kvass.rsi/icon.png | Bin 0 -> 219 bytes .../Consumable/Drinks/kvass.rsi/meta.json | 1 + .../Structures/Storage/kvass.rsi/kvass.png | Bin 0 -> 3754 bytes .../Structures/Storage/kvass.rsi/meta.json | 15 ++++++++++ 11 files changed, 94 insertions(+), 1 deletion(-) create mode 100644 Resources/Textures/Objects/Consumable/Drinks/kvass.rsi/icon.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/kvass.rsi/meta.json create mode 100644 Resources/Textures/Structures/Storage/kvass.rsi/kvass.png create mode 100644 Resources/Textures/Structures/Storage/kvass.rsi/meta.json diff --git a/Content.Server/Rotatable/RotatableSystem.cs b/Content.Server/Rotatable/RotatableSystem.cs index 2db571a27b55..008ad34794ec 100644 --- a/Content.Server/Rotatable/RotatableSystem.cs +++ b/Content.Server/Rotatable/RotatableSystem.cs @@ -39,7 +39,9 @@ private void AddRotateVerbs(EntityUid uid, RotatableComponent component, GetVerb if (!component.RotateWhileAnchored && EntityManager.TryGetComponent(component.Owner, out IPhysBody? physics) && physics.BodyType == BodyType.Static) + { return; + } Verb resetRotation = new () { 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 f1b00cdf1c37..09099d96fa44 100644 --- a/Resources/Locale/en-US/reagents/meta/consumable/drink/drinks.ftl +++ b/Resources/Locale/en-US/reagents/meta/consumable/drink/drinks.ftl @@ -72,3 +72,6 @@ reagent-desc-hot-ramen = Hot noodles. reagent-name-pilk = pilk reagent-desc-pilk = A sickening mixture of milk and cola. + +reagent-name-kvass = kvass +reagent-desc-kvass = A cool refreshing drink with a taste of socialism. diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_food.yml b/Resources/Prototypes/Catalog/Cargo/cargo_food.yml index 23b3ee55ade3..0527f852dc87 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_food.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_food.yml @@ -33,4 +33,16 @@ cost: 5000 category: Food group: market - + +- type: cargoProduct + name: kvass tank crate + id: FoodCrateKvassTank + description: A tank with refreshing kvass, which helps so much in the heat. + icon: + sprite: Structures/Storage/kvass.rsi + state: kvass + product: CrateFoodKvassTank + cost: 2000 + category: Food + group: market + diff --git a/Resources/Prototypes/Catalog/Fills/Crates/food.yml b/Resources/Prototypes/Catalog/Fills/Crates/food.yml index 85ce07d8d348..681881fc8e5e 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/food.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/food.yml @@ -44,3 +44,13 @@ amount: 3 - id: KitchenKnife amount: 1 + +- type: entity + id: CrateFoodKvassTank + name: kvass tank crate + parent: CrateGenericSteel + components: + - type: StorageFill + contents: + - id: KvassTankFull + amount: 1 diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml index 6b952d07a2b6..98e4e5043212 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml @@ -2117,3 +2117,18 @@ - 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: 50 + reagents: + - ReagentId: Kvass + Quantity: 50 + - 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 d974a642057a..864e0ec0c1dd 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/Tanks/tanks.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/Tanks/tanks.yml @@ -99,3 +99,29 @@ - type: ReagentTank transferAmount: 100 +# Kvass +- type: entity + id: KvassTank + parent: StorageTank + name: KBAC # these are english letters + suffix: Empty + description: A cool refreshing drink with a taste of socialism. + components: + - type: Sprite + sprite: Structures/Storage/kvass.rsi + state: kvass + - type: Rotatable + - type: Transform + noRot: false + +- 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 f082374c9927..5c5c82af83a6 100644 --- a/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml +++ b/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml @@ -317,3 +317,12 @@ physicalDesc: strong-smelling color: "#485000" spritePath: rewriter.rsi + +- type: reagent + id: Kvass + name: reagent-name-kvass + parent: BaseDrink + desc: reagent-desc-kvas + physicalDesc: reagent-physical-desc-bubbly + color: "#381600" + spritePath: kvass.rsi diff --git a/Resources/Textures/Objects/Consumable/Drinks/kvass.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/kvass.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..58a6f2157621e53c398a386d9100cca4be13cadd GIT binary patch literal 219 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 JKPY9{{{aO6Wl8`5 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Storage/kvass.rsi/meta.json b/Resources/Textures/Structures/Storage/kvass.rsi/meta.json new file mode 100644 index 000000000000..05445d35ed51 --- /dev/null +++ b/Resources/Textures/Structures/Storage/kvass.rsi/meta.json @@ -0,0 +1,15 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/TauCetiStation/TauCetiClassic/commit/c449d65dff642f44f3e0d8a312f70aec43ab2eae", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "kvass", + "directions": 4 + } + ] +} From f34e35fe6b5db129d83954ff6eed7663f3b89d57 Mon Sep 17 00:00:00 2001 From: KIBORG04 Date: Thu, 23 Jun 2022 18:10:51 +0300 Subject: [PATCH 2/6] nevermind --- Content.Server/Rotatable/RotatableSystem.cs | 2 -- Resources/Textures/Structures/Storage/kvass.rsi/meta.json | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/Content.Server/Rotatable/RotatableSystem.cs b/Content.Server/Rotatable/RotatableSystem.cs index 008ad34794ec..2db571a27b55 100644 --- a/Content.Server/Rotatable/RotatableSystem.cs +++ b/Content.Server/Rotatable/RotatableSystem.cs @@ -39,9 +39,7 @@ private void AddRotateVerbs(EntityUid uid, RotatableComponent component, GetVerb if (!component.RotateWhileAnchored && EntityManager.TryGetComponent(component.Owner, out IPhysBody? physics) && physics.BodyType == BodyType.Static) - { return; - } Verb resetRotation = new () { diff --git a/Resources/Textures/Structures/Storage/kvass.rsi/meta.json b/Resources/Textures/Structures/Storage/kvass.rsi/meta.json index 05445d35ed51..c85212728101 100644 --- a/Resources/Textures/Structures/Storage/kvass.rsi/meta.json +++ b/Resources/Textures/Structures/Storage/kvass.rsi/meta.json @@ -9,7 +9,7 @@ "states": [ { "name": "kvass", - "directions": 4 + "directions": 4 } ] } From 68f8124997dd9eb05b72d2e798a90910435fa520 Mon Sep 17 00:00:00 2001 From: KIBORG04 Date: Thu, 23 Jun 2022 19:07:28 +0300 Subject: [PATCH 3/6] forgot about double 's' --- Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml b/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml index 5c5c82af83a6..9415d67a7557 100644 --- a/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml +++ b/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml @@ -322,7 +322,7 @@ id: Kvass name: reagent-name-kvass parent: BaseDrink - desc: reagent-desc-kvas + desc: reagent-desc-kvass physicalDesc: reagent-physical-desc-bubbly color: "#381600" spritePath: kvass.rsi From 0b571d578d15c3cf76770ddf40a76327e8047a09 Mon Sep 17 00:00:00 2001 From: KIBORG04 Date: Fri, 24 Jun 2022 19:28:59 +0300 Subject: [PATCH 4/6] Update tanks.yml --- .../Prototypes/Entities/Structures/Storage/Tanks/tanks.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Structures/Storage/Tanks/tanks.yml b/Resources/Prototypes/Entities/Structures/Storage/Tanks/tanks.yml index 864e0ec0c1dd..a498c071a4c1 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/Tanks/tanks.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/Tanks/tanks.yml @@ -103,7 +103,7 @@ - type: entity id: KvassTank parent: StorageTank - name: KBAC # these are english letters + name: КВАС suffix: Empty description: A cool refreshing drink with a taste of socialism. components: From 5b31b6f4c2693d388580f8f16e21f83da1fc4a14 Mon Sep 17 00:00:00 2001 From: KIBORG04 Date: Sun, 10 Jul 2022 15:45:12 +0300 Subject: [PATCH 5/6] gotovo --- .../Structures/Storage/Tanks/tanks.yml | 3 --- .../Structures/Storage/kvass.rsi/kvass.png | Bin 3754 -> 2963 bytes .../Structures/Storage/kvass.rsi/meta.json | 1 - 3 files changed, 4 deletions(-) diff --git a/Resources/Prototypes/Entities/Structures/Storage/Tanks/tanks.yml b/Resources/Prototypes/Entities/Structures/Storage/Tanks/tanks.yml index a498c071a4c1..ac0402b158ed 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/Tanks/tanks.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/Tanks/tanks.yml @@ -110,9 +110,6 @@ - type: Sprite sprite: Structures/Storage/kvass.rsi state: kvass - - type: Rotatable - - type: Transform - noRot: false - type: entity parent: KvassTank diff --git a/Resources/Textures/Structures/Storage/kvass.rsi/kvass.png b/Resources/Textures/Structures/Storage/kvass.rsi/kvass.png index ea4a3dfa95cea32fd7f1f8101040932a418c1a2b..9053f51e969e88279422f065c642079cdfba252e 100644 GIT binary patch delta 646 zcmZ1_J6T+@Gr-TCmrII^fq{Y7)59eQNGpIa2OE$quB!U7QBj+P*Id`oAjHtr%Glh> z)O>OzivpTR8%w3KK~iFhp_#dEih*g0uBoMonQl^Al98^7fswhXVRDjXqM7k#CDtR% z?nEe5QYbEQEi17q&q&R)RWdR#GSW3baf7yj@#OjJ29skstLyXA%H0_l80UMsIEF+V zemmXJkJ(Vbb$hC2gWj#OrBf$lSTI%dsQ69n>SGQFcC}<>wJm?3W?~{;wPkNHN ziqpiP8q00Rjn6;68@YVuvXwvmP175U4|p=x>@}Ty^&o@I^Dz7Q$!b0N&#!y#c3Sq} z)djZ35o47)G9yYc!xQ-ht+g5CZM_YTdH)ehlhC_8JGdcb&1C0o6hLm*qp zcTNQ@t!s`;E=3>s{QTTzo)_9rC%QXsyLsc)&rer=Ngim~cRjFo{X{YK->EJ#=FBVH zxEAu|FsygFwdg6M3((l`{U!!MFV$yE&ADycSQe39dp2$Rx@%J>Fx-3Ve%d(a*Sga! zA1`g6fACIF3{%2~NmuUue&G_SaqoXyqTP%3 q52yLX?)ycJCoKOgKY21+1Y@38?N@u|wNrpei^0>?&t;ucLK6U?D*{9S delta 1443 zcma)6X*kq*0RGK?#*qv|HFS(-#zvT7jG@esy9w(|m>lcK-8vFuv}^t-r8ewNQY532 zoQd2m!lsCI-;L2ej3IKq%JZ0|q zMUB5gQv3@S21N*-5j0R}Ju+3tN&6U`rcbBp@>nSRf085=M_ETtNBbO&O7^Buy~*Bw zU!Av)KH0}#kE%=2qv`6=yeo)etw`qoC=&6J7cHVM(%FH2p@u{%g-Rt;{5kI5t085!PFc4DAsGRmfhH0lPfNuo`556i=gDN8Ns855&iFss>= zxaZIcs9Yz3!=pyq=wB$F zKx;yLW&9p5#FItY)!F;p666aJI|9YWhhd*c=^p_~$W=v02xb9VwYaboiX_7IVN!6m zTm8#gpw58|yWWcN*@^D9Qt-@T=|VUS&GAi>@al?o4XAJjE()m`HG=5l!D1ndw@^;@ zriKpZ@j=3<43lARU4N%v8--UfZGEs1j!hZAepJDa3Ah`EAvtnq1Y?YjKXS8uGjh_<=NGESYu62sR z2#gIk(bLEsXmLr-sTVzr)lbhY|B28Zh8SL=(39B|S8? z6SA*On4SV0LhmlMvm(|A@k6&tFRlF*_w1Fq@rEcZ)ls#scubH_j^N78`3;%Old8>1 zpko8m$7s5TB=kPYbz?4hQU}zlrJF_N)oVai#QJ`KTgWQ0FG&StG($H`pQY6M0c3 zgEL2)7$J~QQ#KYUZ1CqlptR&ymEiwM*2q~(kTB$sGs z)E6u3@`F})5{6mPWC1<195}g6+<@#(uf4jKFRH;!|4E?;pnyx~<7An==LNM0=QzQN zuI^;jYdPbp!!r!MtuDK&Pc!Y#ope`Gzmqs%-u?I)mv8OXqf%hjrwknEb6Z(O(Z95!C>-0rd3KFMLQy#&1KUzQv%#n&FX13(Saic)Mi}fdSpDVi7O*K YW=4;2yk1!p`{j3mrG>3|si{}OKl*`hP5=M^ diff --git a/Resources/Textures/Structures/Storage/kvass.rsi/meta.json b/Resources/Textures/Structures/Storage/kvass.rsi/meta.json index c85212728101..09c72cbe986c 100644 --- a/Resources/Textures/Structures/Storage/kvass.rsi/meta.json +++ b/Resources/Textures/Structures/Storage/kvass.rsi/meta.json @@ -9,7 +9,6 @@ "states": [ { "name": "kvass", - "directions": 4 } ] } From e07a67f5e1bb95502c8f7018ab85423a9c11cb5c Mon Sep 17 00:00:00 2001 From: KIBORG04 Date: Sun, 10 Jul 2022 15:55:04 +0300 Subject: [PATCH 6/6] Update meta.json --- Resources/Textures/Structures/Storage/kvass.rsi/meta.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Textures/Structures/Storage/kvass.rsi/meta.json b/Resources/Textures/Structures/Storage/kvass.rsi/meta.json index 09c72cbe986c..52432bc6e220 100644 --- a/Resources/Textures/Structures/Storage/kvass.rsi/meta.json +++ b/Resources/Textures/Structures/Storage/kvass.rsi/meta.json @@ -8,7 +8,7 @@ }, "states": [ { - "name": "kvass", + "name": "kvass" } ] }