From 41c294799376ed415a76df2f634a1b11df2a5a6e Mon Sep 17 00:00:00 2001 From: HardexZ <33863785+HardexZ@users.noreply.github.com> Date: Fri, 14 Jun 2024 20:30:54 +0500 Subject: [PATCH 01/11] kvas --- modular_bandastation/drinks/_drinks.dm | 4 +++ modular_bandastation/drinks/_drinks.dme | 3 ++ modular_bandastation/drinks/code/drinks.dm | 31 ++++++++++++++++++ .../drinks/icons/chemical_tanks.dmi | Bin 0 -> 1529 bytes modular_bandastation/drinks/icons/drinks.dmi | Bin 0 -> 569 bytes modular_bandastation/modular_bandastation.dme | 1 + 6 files changed, 39 insertions(+) create mode 100644 modular_bandastation/drinks/_drinks.dm create mode 100644 modular_bandastation/drinks/_drinks.dme create mode 100644 modular_bandastation/drinks/code/drinks.dm create mode 100644 modular_bandastation/drinks/icons/chemical_tanks.dmi create mode 100644 modular_bandastation/drinks/icons/drinks.dmi diff --git a/modular_bandastation/drinks/_drinks.dm b/modular_bandastation/drinks/_drinks.dm new file mode 100644 index 0000000000000..0c396f65d2f02 --- /dev/null +++ b/modular_bandastation/drinks/_drinks.dm @@ -0,0 +1,4 @@ +/datum/modpack/drinks + name = "Напитки" + desc = "Добавляет новые напитки" + author = "Massmeta(code+sprite), HardexZ(модуль)" diff --git a/modular_bandastation/drinks/_drinks.dme b/modular_bandastation/drinks/_drinks.dme new file mode 100644 index 0000000000000..fc01683b4c707 --- /dev/null +++ b/modular_bandastation/drinks/_drinks.dme @@ -0,0 +1,3 @@ +#include "_drinks.dm" + +#include "code/drinks.dm" diff --git a/modular_bandastation/drinks/code/drinks.dm b/modular_bandastation/drinks/code/drinks.dm new file mode 100644 index 0000000000000..534782ab65bc6 --- /dev/null +++ b/modular_bandastation/drinks/code/drinks.dm @@ -0,0 +1,31 @@ +/datum/reagent/consumable/kvass + name = "Квас" + description = "Напиток, приготовленный путем брожения хлеба, ржи или ячменя, который обладает освежающим и слегка кисловатым вкусом." + color = "#351300" + taste_description = "приятную кислинку с легкой сладостью и хлебным послевкусием." + +/datum/glass_style/drinking_glass/kvass + required_drink_type = /datum/reagent/consumable/kvass + name = "Стакан кваса" + desc = "Стакан с квасом." + icon = 'modular_bandastation/drinks/icons/drinks.dmi' + icon_state = "kvass" + +/datum/reagent/consumable/kvass/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) + affected_mob.adjustToxLoss(-0.5, FALSE, required_biotype = affected_biotype) + affected_mob.adjustOrganLoss(ORGAN_SLOT_LIVER, -0.5 * REM * delta_time, required_organ_flag = ORGAN_ORGANIC) + for(var/datum/reagent/toxin/R in affected_mob.reagents.reagent_list) + affected_mob.reagents.remove_reagent(R.type, 2.5 * REM * delta_time) + ..() + +/datum/export/large/reagent_dispenser/kvass + unit_name = "kvasstank" + export_types = list(/obj/structure/reagent_dispensers/kvasstank) + +/obj/structure/reagent_dispensers/kvasstank + name = "бочка кваса" + desc = "Желтая бочка с напитком богов." + icon = 'modular_bandastation/drinks/icons/chemical_tanks.dmi' + icon_state = "kvass" + reagent_id = /datum/reagent/consumable/kvass + openable = TRUE diff --git a/modular_bandastation/drinks/icons/chemical_tanks.dmi b/modular_bandastation/drinks/icons/chemical_tanks.dmi new file mode 100644 index 0000000000000000000000000000000000000000..349c27623f815dd3cf18fa82ceaf5c71f2f5b212 GIT binary patch literal 1529 zcmVnMdsXeovKJCab<-jf1xHa6mGtst1(YsNzoHNq4L*3fS+`l)|wm-n9 zKe4WzyPYV~&%oTeE~ArDxSukzoHEU$R0ITs4-9P%3t1Qz)w)YS3<^aF2eg8g00ad|L_t(oh2@rgd(uc0#S_99DoUj1=4q#GI^u%gGEOqe%UY* zgdd3jgtb=Ad1OtkIPI zBZm$UAf8`YL7q=OBHwXZj8z^#2Dean^7JVH7*-f-IgTJ~kwB<}u|nx0@_drpuG?bI zo;`og5l#s&d-kT`}I1)MGPFL^8(Z4c7tw~*NFw(1`o{3dm9p!$Y~t@`bEzrP~_R}UBMu!7iEr21F^ zmQMo^dh|zQACqZcmEs$19|s@3#~16oPfe=BSlUUtX=MJp723B=|6X(YH}yUI=gV*Z z(G$d19x!sBFJuY14-mYBoB~*mzUIaGYPH5{s`!-vM3;(Lt*QjX(OIZH#S&LcbS;gE z2>W&b?C|gq?S5bm&B2iR{Kzzqjzr66@+E5`#1eqxKZXO7)|sOZ=Fw<$tO7J<1Q-*5 zZ!$3L!O*rx_6Pe2WhN`gngkdNz+^)23rp<5Xc(;#?^eEO%*iATzy<>wYyQ*$vStV{ z#v$P2P^`fwqYNNx0x&j000_qe`y;BPw@Ihbu?osXI^%T0)cZhVMu73@ zDVt6;x4Zl?u$u0-P^(R+?DTZZ^8}dwU%-?DK==!qQBR)#jYEh=jON6zk&jX~&CMul z`~%HgY01tchw;xfo(pZrol(~K7n((Jmy|}t*Q!0A&nOH3)7jZMG!MGxUT|@F;d=Zs zB8ULZc`oe0JMRYk^6c!B*kR7kX!d?^admxt5%5MBmrQw@fqi{_1zSEB$Y3b+df&Ue z`h0cig`Jc$WSRhxEuIU~+BZD8g{QL(vU!1?q0RFx0{$j5z5GAfatV%{0#E|C7vzcH fFWz9GeItDVYHS%oG%y-D00000NkvXXu0mjfq>svc literal 0 HcmV?d00001 diff --git a/modular_bandastation/drinks/icons/drinks.dmi b/modular_bandastation/drinks/icons/drinks.dmi new file mode 100644 index 0000000000000000000000000000000000000000..27a103cd597551f0f34e00eef3ba1d1a13470ab2 GIT binary patch literal 569 zcmV-90>=G`P)V=-0C=1w$Gr-GAQT4B+4~e9x<`MjOBmsh?;vO?QGr+L^&8sGQJCh%I+)ec z6AS12g2vdiB;Fiqg2vF3NHOoJ{^9CtgoZpG&n!uVTo@W1iLLlE{#KZsfmtnmI?Ng~ z#--Np0004qNklFr8*cLfFunjpJKkBa)^U5Nm1@PosyJ3aL?rt+JRS{AG#N;*0YV&x*amuP9 zG?|wHM9K4d4tYHX0H|43TilUf6(Hi%Q6%F1&5wEeXBK5A^almnaGWwPflo&OfFawa z+?dxF_t6R2+uxX45@`?E2kT46mygBOl^0zUWmiq_u-+U3U#9{9ps~&F!)s@n29_b;Vy1QC)=6YS5-^Z}A)_10Ya|i? z07f?15=tc?0UK*C3uEFP(e?b;Q=lY(f3=a-Kmvx4l4wl4BjS=P3lMi;l39|9B=!J+ z`I@kP^)#G}g_MB*gk({=j(L0Z5mtK7y%z7wZhuNj%D> Date: Fri, 14 Jun 2024 20:34:34 +0500 Subject: [PATCH 02/11] Revert "kvas" This reverts commit 41c294799376ed415a76df2f634a1b11df2a5a6e. --- modular_bandastation/drinks/_drinks.dm | 4 --- modular_bandastation/drinks/_drinks.dme | 3 -- modular_bandastation/drinks/code/drinks.dm | 31 ------------------ .../drinks/icons/chemical_tanks.dmi | Bin 1529 -> 0 bytes modular_bandastation/drinks/icons/drinks.dmi | Bin 569 -> 0 bytes modular_bandastation/modular_bandastation.dme | 1 - 6 files changed, 39 deletions(-) delete mode 100644 modular_bandastation/drinks/_drinks.dm delete mode 100644 modular_bandastation/drinks/_drinks.dme delete mode 100644 modular_bandastation/drinks/code/drinks.dm delete mode 100644 modular_bandastation/drinks/icons/chemical_tanks.dmi delete mode 100644 modular_bandastation/drinks/icons/drinks.dmi diff --git a/modular_bandastation/drinks/_drinks.dm b/modular_bandastation/drinks/_drinks.dm deleted file mode 100644 index 0c396f65d2f02..0000000000000 --- a/modular_bandastation/drinks/_drinks.dm +++ /dev/null @@ -1,4 +0,0 @@ -/datum/modpack/drinks - name = "Напитки" - desc = "Добавляет новые напитки" - author = "Massmeta(code+sprite), HardexZ(модуль)" diff --git a/modular_bandastation/drinks/_drinks.dme b/modular_bandastation/drinks/_drinks.dme deleted file mode 100644 index fc01683b4c707..0000000000000 --- a/modular_bandastation/drinks/_drinks.dme +++ /dev/null @@ -1,3 +0,0 @@ -#include "_drinks.dm" - -#include "code/drinks.dm" diff --git a/modular_bandastation/drinks/code/drinks.dm b/modular_bandastation/drinks/code/drinks.dm deleted file mode 100644 index 534782ab65bc6..0000000000000 --- a/modular_bandastation/drinks/code/drinks.dm +++ /dev/null @@ -1,31 +0,0 @@ -/datum/reagent/consumable/kvass - name = "Квас" - description = "Напиток, приготовленный путем брожения хлеба, ржи или ячменя, который обладает освежающим и слегка кисловатым вкусом." - color = "#351300" - taste_description = "приятную кислинку с легкой сладостью и хлебным послевкусием." - -/datum/glass_style/drinking_glass/kvass - required_drink_type = /datum/reagent/consumable/kvass - name = "Стакан кваса" - desc = "Стакан с квасом." - icon = 'modular_bandastation/drinks/icons/drinks.dmi' - icon_state = "kvass" - -/datum/reagent/consumable/kvass/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) - affected_mob.adjustToxLoss(-0.5, FALSE, required_biotype = affected_biotype) - affected_mob.adjustOrganLoss(ORGAN_SLOT_LIVER, -0.5 * REM * delta_time, required_organ_flag = ORGAN_ORGANIC) - for(var/datum/reagent/toxin/R in affected_mob.reagents.reagent_list) - affected_mob.reagents.remove_reagent(R.type, 2.5 * REM * delta_time) - ..() - -/datum/export/large/reagent_dispenser/kvass - unit_name = "kvasstank" - export_types = list(/obj/structure/reagent_dispensers/kvasstank) - -/obj/structure/reagent_dispensers/kvasstank - name = "бочка кваса" - desc = "Желтая бочка с напитком богов." - icon = 'modular_bandastation/drinks/icons/chemical_tanks.dmi' - icon_state = "kvass" - reagent_id = /datum/reagent/consumable/kvass - openable = TRUE diff --git a/modular_bandastation/drinks/icons/chemical_tanks.dmi b/modular_bandastation/drinks/icons/chemical_tanks.dmi deleted file mode 100644 index 349c27623f815dd3cf18fa82ceaf5c71f2f5b212..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1529 zcmVnMdsXeovKJCab<-jf1xHa6mGtst1(YsNzoHNq4L*3fS+`l)|wm-n9 zKe4WzyPYV~&%oTeE~ArDxSukzoHEU$R0ITs4-9P%3t1Qz)w)YS3<^aF2eg8g00ad|L_t(oh2@rgd(uc0#S_99DoUj1=4q#GI^u%gGEOqe%UY* zgdd3jgtb=Ad1OtkIPI zBZm$UAf8`YL7q=OBHwXZj8z^#2Dean^7JVH7*-f-IgTJ~kwB<}u|nx0@_drpuG?bI zo;`og5l#s&d-kT`}I1)MGPFL^8(Z4c7tw~*NFw(1`o{3dm9p!$Y~t@`bEzrP~_R}UBMu!7iEr21F^ zmQMo^dh|zQACqZcmEs$19|s@3#~16oPfe=BSlUUtX=MJp723B=|6X(YH}yUI=gV*Z z(G$d19x!sBFJuY14-mYBoB~*mzUIaGYPH5{s`!-vM3;(Lt*QjX(OIZH#S&LcbS;gE z2>W&b?C|gq?S5bm&B2iR{Kzzqjzr66@+E5`#1eqxKZXO7)|sOZ=Fw<$tO7J<1Q-*5 zZ!$3L!O*rx_6Pe2WhN`gngkdNz+^)23rp<5Xc(;#?^eEO%*iATzy<>wYyQ*$vStV{ z#v$P2P^`fwqYNNx0x&j000_qe`y;BPw@Ihbu?osXI^%T0)cZhVMu73@ zDVt6;x4Zl?u$u0-P^(R+?DTZZ^8}dwU%-?DK==!qQBR)#jYEh=jON6zk&jX~&CMul z`~%HgY01tchw;xfo(pZrol(~K7n((Jmy|}t*Q!0A&nOH3)7jZMG!MGxUT|@F;d=Zs zB8ULZc`oe0JMRYk^6c!B*kR7kX!d?^admxt5%5MBmrQw@fqi{_1zSEB$Y3b+df&Ue z`h0cig`Jc$WSRhxEuIU~+BZD8g{QL(vU!1?q0RFx0{$j5z5GAfatV%{0#E|C7vzcH fFWz9GeItDVYHS%oG%y-D00000NkvXXu0mjfq>svc diff --git a/modular_bandastation/drinks/icons/drinks.dmi b/modular_bandastation/drinks/icons/drinks.dmi deleted file mode 100644 index 27a103cd597551f0f34e00eef3ba1d1a13470ab2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 569 zcmV-90>=G`P)V=-0C=1w$Gr-GAQT4B+4~e9x<`MjOBmsh?;vO?QGr+L^&8sGQJCh%I+)ec z6AS12g2vdiB;Fiqg2vF3NHOoJ{^9CtgoZpG&n!uVTo@W1iLLlE{#KZsfmtnmI?Ng~ z#--Np0004qNklFr8*cLfFunjpJKkBa)^U5Nm1@PosyJ3aL?rt+JRS{AG#N;*0YV&x*amuP9 zG?|wHM9K4d4tYHX0H|43TilUf6(Hi%Q6%F1&5wEeXBK5A^almnaGWwPflo&OfFawa z+?dxF_t6R2+uxX45@`?E2kT46mygBOl^0zUWmiq_u-+U3U#9{9ps~&F!)s@n29_b;Vy1QC)=6YS5-^Z}A)_10Ya|i? z07f?15=tc?0UK*C3uEFP(e?b;Q=lY(f3=a-Kmvx4l4wl4BjS=P3lMi;l39|9B=!J+ z`I@kP^)#G}g_MB*gk({=j(L0Z5mtK7y%z7wZhuNj%D> Date: Fri, 14 Jun 2024 20:37:34 +0500 Subject: [PATCH 03/11] Kvas --- modular_bandastation/drinks/_drinks.dm | 4 +++ modular_bandastation/drinks/_drinks.dme | 14 ++++++++ modular_bandastation/drinks/code/drinks.dm | 31 ++++++++++++++++++ .../drinks/icons/chemical_tanks.dmi | Bin 0 -> 1529 bytes modular_bandastation/drinks/icons/drinks.dmi | Bin 0 -> 569 bytes modular_bandastation/modular_bandastation.dme | 1 + 6 files changed, 50 insertions(+) create mode 100644 modular_bandastation/drinks/_drinks.dm create mode 100644 modular_bandastation/drinks/_drinks.dme create mode 100644 modular_bandastation/drinks/code/drinks.dm create mode 100644 modular_bandastation/drinks/icons/chemical_tanks.dmi create mode 100644 modular_bandastation/drinks/icons/drinks.dmi diff --git a/modular_bandastation/drinks/_drinks.dm b/modular_bandastation/drinks/_drinks.dm new file mode 100644 index 0000000000000..0c396f65d2f02 --- /dev/null +++ b/modular_bandastation/drinks/_drinks.dm @@ -0,0 +1,4 @@ +/datum/modpack/drinks + name = "Напитки" + desc = "Добавляет новые напитки" + author = "Massmeta(code+sprite), HardexZ(модуль)" diff --git a/modular_bandastation/drinks/_drinks.dme b/modular_bandastation/drinks/_drinks.dme new file mode 100644 index 0000000000000..e4d0fcf8f4788 --- /dev/null +++ b/modular_bandastation/drinks/_drinks.dme @@ -0,0 +1,14 @@ +#include "_drinks.dm" + +#include "code/drinks.dm" +// BEGIN_INTERNALS +// END_INTERNALS +// BEGIN_FILE_DIR +#define FILE_DIR . +// END_FILE_DIR +// BEGIN_PREFERENCES +// END_PREFERENCES +// BEGIN_INCLUDE +#include "_drinks.dm" +#include "code\drinks.dm" +// END_INCLUDE diff --git a/modular_bandastation/drinks/code/drinks.dm b/modular_bandastation/drinks/code/drinks.dm new file mode 100644 index 0000000000000..534782ab65bc6 --- /dev/null +++ b/modular_bandastation/drinks/code/drinks.dm @@ -0,0 +1,31 @@ +/datum/reagent/consumable/kvass + name = "Квас" + description = "Напиток, приготовленный путем брожения хлеба, ржи или ячменя, который обладает освежающим и слегка кисловатым вкусом." + color = "#351300" + taste_description = "приятную кислинку с легкой сладостью и хлебным послевкусием." + +/datum/glass_style/drinking_glass/kvass + required_drink_type = /datum/reagent/consumable/kvass + name = "Стакан кваса" + desc = "Стакан с квасом." + icon = 'modular_bandastation/drinks/icons/drinks.dmi' + icon_state = "kvass" + +/datum/reagent/consumable/kvass/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) + affected_mob.adjustToxLoss(-0.5, FALSE, required_biotype = affected_biotype) + affected_mob.adjustOrganLoss(ORGAN_SLOT_LIVER, -0.5 * REM * delta_time, required_organ_flag = ORGAN_ORGANIC) + for(var/datum/reagent/toxin/R in affected_mob.reagents.reagent_list) + affected_mob.reagents.remove_reagent(R.type, 2.5 * REM * delta_time) + ..() + +/datum/export/large/reagent_dispenser/kvass + unit_name = "kvasstank" + export_types = list(/obj/structure/reagent_dispensers/kvasstank) + +/obj/structure/reagent_dispensers/kvasstank + name = "бочка кваса" + desc = "Желтая бочка с напитком богов." + icon = 'modular_bandastation/drinks/icons/chemical_tanks.dmi' + icon_state = "kvass" + reagent_id = /datum/reagent/consumable/kvass + openable = TRUE diff --git a/modular_bandastation/drinks/icons/chemical_tanks.dmi b/modular_bandastation/drinks/icons/chemical_tanks.dmi new file mode 100644 index 0000000000000000000000000000000000000000..349c27623f815dd3cf18fa82ceaf5c71f2f5b212 GIT binary patch literal 1529 zcmVnMdsXeovKJCab<-jf1xHa6mGtst1(YsNzoHNq4L*3fS+`l)|wm-n9 zKe4WzyPYV~&%oTeE~ArDxSukzoHEU$R0ITs4-9P%3t1Qz)w)YS3<^aF2eg8g00ad|L_t(oh2@rgd(uc0#S_99DoUj1=4q#GI^u%gGEOqe%UY* zgdd3jgtb=Ad1OtkIPI zBZm$UAf8`YL7q=OBHwXZj8z^#2Dean^7JVH7*-f-IgTJ~kwB<}u|nx0@_drpuG?bI zo;`og5l#s&d-kT`}I1)MGPFL^8(Z4c7tw~*NFw(1`o{3dm9p!$Y~t@`bEzrP~_R}UBMu!7iEr21F^ zmQMo^dh|zQACqZcmEs$19|s@3#~16oPfe=BSlUUtX=MJp723B=|6X(YH}yUI=gV*Z z(G$d19x!sBFJuY14-mYBoB~*mzUIaGYPH5{s`!-vM3;(Lt*QjX(OIZH#S&LcbS;gE z2>W&b?C|gq?S5bm&B2iR{Kzzqjzr66@+E5`#1eqxKZXO7)|sOZ=Fw<$tO7J<1Q-*5 zZ!$3L!O*rx_6Pe2WhN`gngkdNz+^)23rp<5Xc(;#?^eEO%*iATzy<>wYyQ*$vStV{ z#v$P2P^`fwqYNNx0x&j000_qe`y;BPw@Ihbu?osXI^%T0)cZhVMu73@ zDVt6;x4Zl?u$u0-P^(R+?DTZZ^8}dwU%-?DK==!qQBR)#jYEh=jON6zk&jX~&CMul z`~%HgY01tchw;xfo(pZrol(~K7n((Jmy|}t*Q!0A&nOH3)7jZMG!MGxUT|@F;d=Zs zB8ULZc`oe0JMRYk^6c!B*kR7kX!d?^admxt5%5MBmrQw@fqi{_1zSEB$Y3b+df&Ue z`h0cig`Jc$WSRhxEuIU~+BZD8g{QL(vU!1?q0RFx0{$j5z5GAfatV%{0#E|C7vzcH fFWz9GeItDVYHS%oG%y-D00000NkvXXu0mjfq>svc literal 0 HcmV?d00001 diff --git a/modular_bandastation/drinks/icons/drinks.dmi b/modular_bandastation/drinks/icons/drinks.dmi new file mode 100644 index 0000000000000000000000000000000000000000..27a103cd597551f0f34e00eef3ba1d1a13470ab2 GIT binary patch literal 569 zcmV-90>=G`P)V=-0C=1w$Gr-GAQT4B+4~e9x<`MjOBmsh?;vO?QGr+L^&8sGQJCh%I+)ec z6AS12g2vdiB;Fiqg2vF3NHOoJ{^9CtgoZpG&n!uVTo@W1iLLlE{#KZsfmtnmI?Ng~ z#--Np0004qNklFr8*cLfFunjpJKkBa)^U5Nm1@PosyJ3aL?rt+JRS{AG#N;*0YV&x*amuP9 zG?|wHM9K4d4tYHX0H|43TilUf6(Hi%Q6%F1&5wEeXBK5A^almnaGWwPflo&OfFawa z+?dxF_t6R2+uxX45@`?E2kT46mygBOl^0zUWmiq_u-+U3U#9{9ps~&F!)s@n29_b;Vy1QC)=6YS5-^Z}A)_10Ya|i? z07f?15=tc?0UK*C3uEFP(e?b;Q=lY(f3=a-Kmvx4l4wl4BjS=P3lMi;l39|9B=!J+ z`I@kP^)#G}g_MB*gk({=j(L0Z5mtK7y%z7wZhuNj%D> Date: Fri, 14 Jun 2024 20:39:47 +0500 Subject: [PATCH 04/11] Update _drinks.dme --- modular_bandastation/drinks/_drinks.dme | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/modular_bandastation/drinks/_drinks.dme b/modular_bandastation/drinks/_drinks.dme index e4d0fcf8f4788..fc01683b4c707 100644 --- a/modular_bandastation/drinks/_drinks.dme +++ b/modular_bandastation/drinks/_drinks.dme @@ -1,14 +1,3 @@ #include "_drinks.dm" #include "code/drinks.dm" -// BEGIN_INTERNALS -// END_INTERNALS -// BEGIN_FILE_DIR -#define FILE_DIR . -// END_FILE_DIR -// BEGIN_PREFERENCES -// END_PREFERENCES -// BEGIN_INCLUDE -#include "_drinks.dm" -#include "code\drinks.dm" -// END_INCLUDE From 190b888606601c3b1a84fe3c9d847203d66be6e3 Mon Sep 17 00:00:00 2001 From: HardexZ <33863785+HardexZ@users.noreply.github.com> Date: Fri, 14 Jun 2024 21:10:37 +0500 Subject: [PATCH 05/11] test fix --- modular_bandastation/drinks/code/drinks.dm | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/modular_bandastation/drinks/code/drinks.dm b/modular_bandastation/drinks/code/drinks.dm index 534782ab65bc6..3ece68a928622 100644 --- a/modular_bandastation/drinks/code/drinks.dm +++ b/modular_bandastation/drinks/code/drinks.dm @@ -2,6 +2,7 @@ name = "Квас" description = "Напиток, приготовленный путем брожения хлеба, ржи или ячменя, который обладает освежающим и слегка кисловатым вкусом." color = "#351300" + nutriment_factor = 1 taste_description = "приятную кислинку с легкой сладостью и хлебным послевкусием." /datum/glass_style/drinking_glass/kvass @@ -11,13 +12,6 @@ icon = 'modular_bandastation/drinks/icons/drinks.dmi' icon_state = "kvass" -/datum/reagent/consumable/kvass/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) - affected_mob.adjustToxLoss(-0.5, FALSE, required_biotype = affected_biotype) - affected_mob.adjustOrganLoss(ORGAN_SLOT_LIVER, -0.5 * REM * delta_time, required_organ_flag = ORGAN_ORGANIC) - for(var/datum/reagent/toxin/R in affected_mob.reagents.reagent_list) - affected_mob.reagents.remove_reagent(R.type, 2.5 * REM * delta_time) - ..() - /datum/export/large/reagent_dispenser/kvass unit_name = "kvasstank" export_types = list(/obj/structure/reagent_dispensers/kvasstank) From 4b8ba702c074e84cde3bf59ea78c1be849b49fc8 Mon Sep 17 00:00:00 2001 From: HardexZ <33863785+HardexZ@users.noreply.github.com> Date: Sat, 15 Jun 2024 14:11:14 +0500 Subject: [PATCH 06/11] Update modular_bandastation/drinks/code/drinks.dm Co-authored-by: PhantornRU <41479614+PhantornRU@users.noreply.github.com> --- modular_bandastation/drinks/code/drinks.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modular_bandastation/drinks/code/drinks.dm b/modular_bandastation/drinks/code/drinks.dm index 3ece68a928622..0621f55b25389 100644 --- a/modular_bandastation/drinks/code/drinks.dm +++ b/modular_bandastation/drinks/code/drinks.dm @@ -7,7 +7,7 @@ /datum/glass_style/drinking_glass/kvass required_drink_type = /datum/reagent/consumable/kvass - name = "Стакан кваса" + name = "стакан кваса" desc = "Стакан с квасом." icon = 'modular_bandastation/drinks/icons/drinks.dmi' icon_state = "kvass" From a778e4fa98eeb099142b1b5b71fa4f87ed807484 Mon Sep 17 00:00:00 2001 From: HardexZ <33863785+HardexZ@users.noreply.github.com> Date: Sat, 15 Jun 2024 14:11:20 +0500 Subject: [PATCH 07/11] Update modular_bandastation/drinks/_drinks.dm Co-authored-by: PhantornRU <41479614+PhantornRU@users.noreply.github.com> --- modular_bandastation/drinks/_drinks.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modular_bandastation/drinks/_drinks.dm b/modular_bandastation/drinks/_drinks.dm index 0c396f65d2f02..945a7494fff9b 100644 --- a/modular_bandastation/drinks/_drinks.dm +++ b/modular_bandastation/drinks/_drinks.dm @@ -1,4 +1,4 @@ /datum/modpack/drinks name = "Напитки" desc = "Добавляет новые напитки" - author = "Massmeta(code+sprite), HardexZ(модуль)" + author = "HardexZ" From 4eac27704d8d9d15223c855cdec6ab3255e62b21 Mon Sep 17 00:00:00 2001 From: HardexZ <33863785+HardexZ@users.noreply.github.com> Date: Sat, 15 Jun 2024 14:13:36 +0500 Subject: [PATCH 08/11] Update drinks.dm --- modular_bandastation/drinks/code/drinks.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modular_bandastation/drinks/code/drinks.dm b/modular_bandastation/drinks/code/drinks.dm index 0621f55b25389..caefe05bd3aa8 100644 --- a/modular_bandastation/drinks/code/drinks.dm +++ b/modular_bandastation/drinks/code/drinks.dm @@ -8,7 +8,7 @@ /datum/glass_style/drinking_glass/kvass required_drink_type = /datum/reagent/consumable/kvass name = "стакан кваса" - desc = "Стакан с квасом." + desc = "В стакане кристально чистая жидкость насыщенного темно-коричневого цвета, которая кажется почти янтарной при определенном угле освещения." icon = 'modular_bandastation/drinks/icons/drinks.dmi' icon_state = "kvass" From 13a26e40775cd1eae821a4655e6fc2acc689ec73 Mon Sep 17 00:00:00 2001 From: HardexZ <33863785+HardexZ@users.noreply.github.com> Date: Sat, 15 Jun 2024 14:14:26 +0500 Subject: [PATCH 09/11] Update drinks.dm --- modular_bandastation/drinks/code/drinks.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modular_bandastation/drinks/code/drinks.dm b/modular_bandastation/drinks/code/drinks.dm index caefe05bd3aa8..f607ab8c63021 100644 --- a/modular_bandastation/drinks/code/drinks.dm +++ b/modular_bandastation/drinks/code/drinks.dm @@ -18,7 +18,7 @@ /obj/structure/reagent_dispensers/kvasstank name = "бочка кваса" - desc = "Желтая бочка с напитком богов." + desc = "Ярко-желтая бочка с квасом, которая сразу привлекает внимание своим насыщенным цветом. Она выполнена в классическом стиле, из толстого, прочного металла с гладкой, блестящей поверхностью. Бочка имеет цилиндрическую форму, слегка расширяясь к середине и снова сужаясь к краям." icon = 'modular_bandastation/drinks/icons/chemical_tanks.dmi' icon_state = "kvass" reagent_id = /datum/reagent/consumable/kvass From 3a3c1fcefb540b637bdc01af00cc949c92e9169e Mon Sep 17 00:00:00 2001 From: HardexZ <33863785+HardexZ@users.noreply.github.com> Date: Sat, 15 Jun 2024 16:19:37 +0500 Subject: [PATCH 10/11] Update drinks.dm --- modular_bandastation/drinks/code/drinks.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modular_bandastation/drinks/code/drinks.dm b/modular_bandastation/drinks/code/drinks.dm index f607ab8c63021..048c84b68df57 100644 --- a/modular_bandastation/drinks/code/drinks.dm +++ b/modular_bandastation/drinks/code/drinks.dm @@ -3,7 +3,7 @@ description = "Напиток, приготовленный путем брожения хлеба, ржи или ячменя, который обладает освежающим и слегка кисловатым вкусом." color = "#351300" nutriment_factor = 1 - taste_description = "приятную кислинку с легкой сладостью и хлебным послевкусием." + taste_description = "a pleasant tartness with a hint of sweetness and a bread-like aftertaste." /datum/glass_style/drinking_glass/kvass required_drink_type = /datum/reagent/consumable/kvass From 3cb86b022b57a4154bf45aab11ac53bbd4cfb79f Mon Sep 17 00:00:00 2001 From: HardexZ <33863785+HardexZ@users.noreply.github.com> Date: Sun, 23 Jun 2024 00:35:36 +0500 Subject: [PATCH 11/11] New Icon --- .../drinks/icons/chemical_tanks.dmi | Bin 1529 -> 921 bytes modular_bandastation/drinks/icons/drinks.dmi | Bin 569 -> 508 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/modular_bandastation/drinks/icons/chemical_tanks.dmi b/modular_bandastation/drinks/icons/chemical_tanks.dmi index 349c27623f815dd3cf18fa82ceaf5c71f2f5b212..4ef5653be309aeecf0058221d09de3a9d88e1fa2 100644 GIT binary patch delta 770 zcmV+d1O5E@3z-LyBVGVhP)t-sz`(%z*gf;f2>;|6|K@YhtOLQRJ;y*m?Z_~yPENsZ zJt86^u!I1Gg@rUUG_#yDUrkLyLPF8MXjoWS)X0mf`cinx|nDQ?U z2!58s@T*N?NiQZa#)Xhl2)>f>B!NkuIhQXaFsM0fPf#saoq^JIg68CyBcTkNDu60`GGV z-h*;(3&#uiT;9+TSIM6cy`+45u$@|^_ zFQNqsf17*g435Xc0heJ^^&A>?95WjAIE+23 zA3%^vx(lCl5aqC~S+4LVIrCoo!G--Thd0~*>N`kM^%QbDPMU4_L6H{V{VhM(@!YaY4JzcY@3tJ3Me=NcfR=C&)ovG#uMeivaif0Z{=LlnX z!;zlL+>{imo=Q{(QdR~x9K$@Fu^K4Z=)b~z3lCDx=LZJq79h>RMc{V9f8n^cb8v0o zCCveZ_6#b6vZXlys0_-MC^il4A-t&-br25PxQg%Z1o^dwXpkT};1O$z(i}G(emU3I ze}zEDQ?h!2q+USgE#l#n2jKVU40U8Q?&GYK>_X3sC!Sfw3K@ zSxn4fQJJG+K$^q8ifvd&lZctqW#eYtL#8R%HFz!nMdsXeovKJCab<-jf1xHa6m zGtst1(YsNzoHNq4L*3fS+`l)|wm-n9Ke4WzyPYV~&%oTeE~ArDxSukzoHEU~QBgB9Gf+@QKRY{KQc*lTJH^GfuCA!q*w|ZJTWx1&Mn*tEK|w1kE7`q1IXO8g zDJfq~O}?ZpSy@$MV>V4qA0HhZGc7GpP*B{#QB(v3gbxgD4hvZr7S*~-Knw~+2?w;8 zB;CPHN+Ka#2RH?%kSox*P0Fr1+QC)6r$|CVLQzRc+{0DKuuxc7SV>1mKtMRKsj0HE zvbnjr#>U2eetz0|o;;C(g?|JENkl96U>PMW1{7-1*Q5iiudgqtz^DrXzfsmQd86@zMMorl z*)S4>ABg~jwN}pLjfS`r6Jjyo{>J@{&H4jOmbrL-bECP@6n?YWVAZmS{Zx4PkPj-X z(UkrphYk=Ro?lr(o=-j^-*H-uRUSVEw@`TU^eF%sRv2qJj(;F*kwB<}u|nx0@_drp zuG?bIo;`og5l#s&d-kT`}I1)MGPFL^8(Z4c7twkJSidn6y1jNx?u%%V+W>Ya+xFfa5=g1C!R7qYviMXmqRs zG-d=C6M%0rFzvz6wnz2{`v_$wE6ADz7z@B;LhlPp?7?Ultr725zG%$JBn`j@0~>4p z)B&<)2!AlfA>iXstidLu3?OR)Fg8K}2*(5aBdVmgNvF}V3ecF7G=QDhI8JOj<8;E* z`#@txfbr=mn@%;iyZkY*n(ntyt4*iu^mNSg1epF`z?1_(_zRj*PoDpcLx@I<=ESd& zk5V?x%_wX91I=7%$<8E)@y|7$3vI}qQP%huntw%cmy|}t*Q!0A&nOH3)7jZMG!MGx zUT|@F;d=ZsB8ULZc`oe0JMRYk^6c!B*kR7kX!d?^admxt5%5MBmrQw@fqi{_1zSEB z$Y3b+df&Ue`h0cig`Jc$WSRhxEuIU~+BZD8g{QL(vU!1?q0RFx0{$j5z5GAfatV%{ o0wYiYw-@Az;4j`_p?xEL0cva+LNqWMIRF3v07*qoM6N<$f2gkc{{Pp?@cjgv*Ga&D)2=Xgq1D z%ym@_gr1BOk^ektrFbH8LQlr3bG0%s?DsY=uUh~vn|`5}h#Y{^lR)|O0G^HkfQtq+ z&pS+K^Flr9b`YyMndUrg0|0(a5_LOAHDNGIIRn7=Zu6akUz3F=-#LYMRMGwq9CA>; zf$40ny?-!VL1NUc&cG_&XwUl9449ymfdlDsag>2{xiB)IeFLEDd|U=Tvs z2eI+FEz~ksKY(Dkg3)-=a_WAZxdE9Q;MD!tMBHMrSOC5NiS>OLa!aOL00000NkvXX Hu0mjfqTsE~ delta 423 zcmV;Y0a*V01Gxl{oPUT(L_t(oh3%EGO2a@H$N#3b4uOC=vyjpKmrBOYTm`r;X?8t7>aP{^$|9r%@Z?*&VSk0k?rt+JRS{AG#N;*0 zYV&x*amuP9G?|wHM9K4d4tYHX0H|43TilUf6(Hi%Q6%F1&5wEeXBK5A^almnaGWwP zflo&OfFawa+?dxF_t6R2+uxX45@`?E2kT46mygBOl^0zUWmiq_u-+U3U#9{9ps~&F z!)s@n2^J zV3JvqiX`>`fccuRe)Tk*jD?hd|Ab^wx{i5!^buBi&mg@P@5^p~N=nMV;1fhMrcU0w R?#KWD002ovPDHLkV1hO%$YuZl