From 52cb72c131d1db46652f83e909a070c8e42baf13 Mon Sep 17 00:00:00 2001 From: Bizzonium Date: Wed, 28 Dec 2022 22:05:35 +0600 Subject: [PATCH] Revert "Feat: add kvas and related dishes (#36)" This reverts commit 276669482eabc5738afa503f2aa247bebd16892a. --- code/modules/cargo/packs/kvas_crate.dm | 7 ----- .../recipes/drinks/kvas_recipe.dm | 4 --- .../recipes/tablecraft/recipe_okroshka.dm | 10 ------- .../chemistry/reagents/kvas_okroshka.dm | 26 ------------------ .../reagents/chemistry/reagents/okroshka.dm | 9 ------ code/modules/reagents/kvas_tank.dm | 8 ------ .../reagent_containers/cups/kvas_bottle.dm | 7 ----- icons/obj/food/okroshka.dmi | Bin 352 -> 0 bytes icons/obj/kvas_bottle.dmi | Bin 1236 -> 0 bytes icons/obj/medical/kvas_tank.dmi | Bin 735 -> 0 bytes tgstation.dme | 6 ---- 11 files changed, 77 deletions(-) delete mode 100644 code/modules/cargo/packs/kvas_crate.dm delete mode 100644 code/modules/food_and_drinks/recipes/drinks/kvas_recipe.dm delete mode 100644 code/modules/food_and_drinks/recipes/tablecraft/recipe_okroshka.dm delete mode 100644 code/modules/reagents/chemistry/reagents/kvas_okroshka.dm delete mode 100644 code/modules/reagents/chemistry/reagents/okroshka.dm delete mode 100644 code/modules/reagents/kvas_tank.dm delete mode 100644 code/modules/reagents/reagent_containers/cups/kvas_bottle.dm delete mode 100644 icons/obj/food/okroshka.dmi delete mode 100644 icons/obj/kvas_bottle.dmi delete mode 100644 icons/obj/medical/kvas_tank.dmi diff --git a/code/modules/cargo/packs/kvas_crate.dm b/code/modules/cargo/packs/kvas_crate.dm deleted file mode 100644 index 8cc6a6f1f14fd..0000000000000 --- a/code/modules/cargo/packs/kvas_crate.dm +++ /dev/null @@ -1,7 +0,0 @@ -/datum/supply_pack/materials/kvastank - name = "Kvass Barrel Crate" - desc = "Contains a classic kvass barrel" - cost = CARGO_CRATE_VALUE * 1.6 - contains = list(/obj/structure/reagent_dispensers/kvastank) - crate_name = "kvass barrel crate" - crate_type = /obj/structure/closet/crate/large \ No newline at end of file diff --git a/code/modules/food_and_drinks/recipes/drinks/kvas_recipe.dm b/code/modules/food_and_drinks/recipes/drinks/kvas_recipe.dm deleted file mode 100644 index 2a51ba946bf82..0000000000000 --- a/code/modules/food_and_drinks/recipes/drinks/kvas_recipe.dm +++ /dev/null @@ -1,4 +0,0 @@ -/datum/chemical_reaction/drink/kvas - results = list(/datum/reagent/consumable/kvas = 3) - required_reagents = list(/datum/reagent/consumable/ethanol/beer = 2, /datum/reagent/consumable/sugar = 1) - required_catalysts = list(/datum/reagent/consumable/enzyme = 5) \ No newline at end of file diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipe_okroshka.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipe_okroshka.dm deleted file mode 100644 index 34015e39917c3..0000000000000 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipe_okroshka.dm +++ /dev/null @@ -1,10 +0,0 @@ -/datum/crafting_recipe/food/oksroshka - name = "Okroshka" - reqs = list( - /datum/reagent/consumable/kvas = 20, - /obj/item/reagent_containers/cup/bowl = 1, - /obj/item/food/grown/cucumber = 1, - /obj/item/food/meat/rawcutlet = 1, - ) - result = /obj/item/food/soup/okroshka - subcategory = CAT_SOUP \ No newline at end of file diff --git a/code/modules/reagents/chemistry/reagents/kvas_okroshka.dm b/code/modules/reagents/chemistry/reagents/kvas_okroshka.dm deleted file mode 100644 index 4ec5a9b9513a6..0000000000000 --- a/code/modules/reagents/chemistry/reagents/kvas_okroshka.dm +++ /dev/null @@ -1,26 +0,0 @@ -/datum/reagent/consumable/kvas - name = "Kvass" - description = "Ancient slavic drink" - nutriment_factor = 0 - quality = DRINK_GOOD - taste_description = "sweet" - glass_icon_state = "fernetpuro" - glass_name = "stakan of kvass" - glass_desc = "Very vkusno." - chemical_flags = REAGENT_CAN_BE_SYNTHESIZED - -/datum/reagent/consumable/kvas/on_mob_life(mob/living/carbon/M, delta_time, times_fired) - if(M.getToxLoss() && DT_PROB(10, delta_time)) - M.adjustToxLoss(-1, 0) - ..() - . = TRUE - -/obj/item/food/soup/okroshka - name = "okroshka" - desc = "Kvas is good. Kvas soup is even better." - icon = 'icons/obj/food/okroshka.dmi' - icon_state = "okroshka" - food_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/protein = 8, /datum/reagent/consumable/kvas = 5, /datum/reagent/consumable/nutriment/vitamin = 4) - tastes = list("okroshka" = 1) - foodtypes = VEGETABLES | MEAT - venue_value = FOOD_PRICE_NORMAL \ No newline at end of file diff --git a/code/modules/reagents/chemistry/reagents/okroshka.dm b/code/modules/reagents/chemistry/reagents/okroshka.dm deleted file mode 100644 index e520fa6f418a1..0000000000000 --- a/code/modules/reagents/chemistry/reagents/okroshka.dm +++ /dev/null @@ -1,9 +0,0 @@ -/obj/item/food/soup/okroshka - name = "okroshka" - desc = "Kvas is good. Kvas soup is even better." - icon = 'icons/obj/food/okroshka.dmi' - icon_state = "okroshka" - food_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/protein = 8, /datum/reagent/consumable/kvas = 5, /datum/reagent/consumable/nutriment/vitamin = 4) - tastes = list("okroshka" = 1) - foodtypes = VEGETABLES | MEAT - venue_value = FOOD_PRICE_NORMAL \ No newline at end of file diff --git a/code/modules/reagents/kvas_tank.dm b/code/modules/reagents/kvas_tank.dm deleted file mode 100644 index e32851a8c41ed..0000000000000 --- a/code/modules/reagents/kvas_tank.dm +++ /dev/null @@ -1,8 +0,0 @@ -/obj/structure/reagent_dispensers/kvastank - name = "barrel of kvass" - desc = "A yellow barrel full of kvass. No there is no worms inside." - icon = 'icons/obj/medical/kvas_tank.dmi' - icon_state = "kvas_tank" - reagent_id = /datum/reagent/consumable/kvas - tank_volume = 1000 - openable = TRUE \ No newline at end of file diff --git a/code/modules/reagents/reagent_containers/cups/kvas_bottle.dm b/code/modules/reagents/reagent_containers/cups/kvas_bottle.dm deleted file mode 100644 index 5194e4fda68ca..0000000000000 --- a/code/modules/reagents/reagent_containers/cups/kvas_bottle.dm +++ /dev/null @@ -1,7 +0,0 @@ -/obj/item/reagent_containers/cup/kvas - name = "kvass bottle" - desc = "A bottled cheap kvas." - volume = 50 - icon = 'icons/obj/kvas_bottle.dmi' - icon_state = "kvas_bottle" - list_reagents = list(/datum/reagent/consumable/kvas = 50) \ No newline at end of file diff --git a/icons/obj/food/okroshka.dmi b/icons/obj/food/okroshka.dmi deleted file mode 100644 index 714e08efae83bcfa5a79a34657b03ecd8c39b378..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 352 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfvxd5LK*Z=?jA3Ju8!DJGU@%;I7 zGj)ki2R?WwFj#srOqnuekGcj(D`QEJUoeBivm0qZPEJ)wM2SmkadJ^+K}lwQ9s@(g zoZzs6qSEhQf(t%=eWK;9t99jJaWn(XeIgchC znG~WBtZBbnW50#6bzo<=vFhd(5*jHdj?N65GGjJZqPF&qUppIo*%;>Tl+K;?P5M31 z-U?3_#}JK)$q5pb4gxGJ6Ly?ZSim7HWMWk0tKZLIYGlOHZ7^$vTZ`Kk*DY{)<9*k01-saZgx+S!wHO+}faE@hhR(4fp)zdSb0*r2siYI3}7I@(yTm+)U|`mcPFuflLNZS3j3^P6V=-0C=2JR&a84_w-Y6@%7{?OD!tS%+FJ>RWQ*r;NmRLOex7wuvIWN;^NFm z%}mcIfpCgT5=&AQY!#HU%My#@lk!VSa#EGJI8!o{DMXS7r( zR;0QRr7J18Dn$@%3vNomZtT*Ph<||#5yWZ{1YHSk+VO!4rKOZn+S+-vww?FAbLYM$ zImvmtDDIn)*aIP(lTSW;^ZUXHF~;C&F8jYceCO*oEjwST)DFGF>W5FnyJ67XzWmme z&yHy=??uA?ZilJrZaKS7fX!dYe>zL|`Q=XU?3vBN|0qYT1PLubb}D56!>`V zI39kviHS2|YM3!5)irzRV`8qqde$tt>!weQT7ePQ_dbwwADsL1>g7UOUg`ukw)u%) zZdw;PooQ@t5%Ac+bFB%`n-^)N&|6r$^v%iBXP>xQsRTay@DqP^dGl?y6C7@}a+tey z4^Dmv`zH>f;(Jp;eff=o+xqq7X{U; zbhngyW|~GU#Divn%Jd9s`z*M@B18-ZLb4M8Ol-+(mB_Pca11!Yd<1?I*DL8VD1w#px zHZTU@oYyTv4rVIQ>9l<*lWE6sAOr`20YDIQjzJVwxZu;73M4$Kh2dbzwk@!jL#f9D z≻wP9UWUzWU;FDKmjbYb*IEPV!PHB#8jDhHYEWN&`m280d&4sSc>A1Y*V%i(@I2 zgw_%ufJNxzJGH?%SIzczssvKiFlOPvD8;0Z(AvOg^LPrV4MGf96gt~&noq+_l>ld9 zGl@dBGw8t>4N55h0?uQ!+FPJ7;hy0d%S>SQ>i4~bg>rRm1zYWwp_D=@rJJoS)85#? zSYz}~xl-Ot!%TfFpPrui$+oP(&N*ylZS{HA%{QUVeKF{F0)Ob+^Y5KYl|X8N*IzsS yxk!>98Rzlx>T-`z(!TxIoJ!02caf+4d;Slc6jB!M%k0$v0000V=-0C=1w$Gr-GAQT4B+4~e9wMT!eODN$`uMk3(5*g^lUcaI3oEnp!%?h;` zDlX;lL`aNHOX3YXdq@mD3Gc$``A=rc4ieQ>Y~I+$t0J+7lp)cPIFh~H?;3hlP>Z1t zz49B)FjW450006iNklG<%;wpFp1ga3+n@e&fzL;QZQVX9u7(Drc}alhc-dB#D)_0s~HR zfVIuePhb!@n>3K*orG^+&&D2$moE5=_xa0V8#n+i5@TbP2g?$qJc0=1(>VQKO&Ba| z5~THYy~am|MeT)}nm}4)0A{8qBb%>Yt{su<<(f|)W*24?NgxjDwMId@%Mne!3y zuAT2*`(qIZCXdo3fpg_E0B=^`N!^Tty9?9BDR&rRA3<2c;E{OItp^l2OKDUFJd^OW zZ-F9b$!SYcPX>`9XI=T!3E0WMJ8R$g>U=vqaRPRZ!E0A@M+v-KE}b}m#f5oZJ-K<~ zOy}vd=jdt?quD}Ni$PlpFoCZTJO+TvK$gJIi4)Igws`#LA&m{=&-4{SVE2Kj zOiif2RRZUI+y@Z4TFl$=3&FU)e?m!;gb+e<-jOv=h;DIx1iZ%oD*4~y{sM2_G0_}J RE-L^4002ovPDHLkV1ihsQ