From b5f012e21094083270d8dee24d76fd31a6348208 Mon Sep 17 00:00:00 2001 From: BIGZi0348 Date: Thu, 2 Jan 2025 20:18:55 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9F=D1=80=D0=B0=D0=B2=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prototypes/Catalog/Fills/Lockers/misc.yml | 6 ++- .../Entities/Objects/CargoCrates/misc.yml | 4 +- .../Entities/Objects/Misc/packed_soil.yml | 4 +- Resources/Prototypes/_White/tags.yml | 3 ++ Resources/Prototypes/tags.yml | 3 -- .../White/Structures/growingpot.rsi/meta.json | 36 +++++++++--------- .../Structures/growingpot.rsi/packed_soil.png | Bin 646 -> 1934 bytes 7 files changed, 29 insertions(+), 27 deletions(-) diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml b/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml index d78bf4c8eb..eb0d6fac72 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml @@ -123,8 +123,6 @@ components: - type: StorageFill contents: - - id: PackedSoil - prob: 0.10 - id: Lantern prob: 0.20 - id: Wirecutter @@ -188,6 +186,8 @@ prob: 0.10 - id: BarberScissors prob: 0.05 + - id: PackedSoil # WD + prob: 0.05 # Syndicate loot - id: null prob: 0.95 @@ -596,6 +596,8 @@ prob: 0.10 - id: BarberScissors prob: 0.05 + - id: PackedSoil # WD + prob: 0.05 # Syndicate loot - id: null prob: 0.95 diff --git a/Resources/Prototypes/_White/Entities/Objects/CargoCrates/misc.yml b/Resources/Prototypes/_White/Entities/Objects/CargoCrates/misc.yml index a2cb16f2ed..986229067a 100644 --- a/Resources/Prototypes/_White/Entities/Objects/CargoCrates/misc.yml +++ b/Resources/Prototypes/_White/Entities/Objects/CargoCrates/misc.yml @@ -2,9 +2,9 @@ parent: CrateHydroponics id: CratePackedSoil name: ящик с почвой - description: Ящик, содержащий три упаковки с почвой + description: Ящик, содержащий пять упаковок с почвой. components: - type: StorageFill contents: - id: PackedSoil - amount: 5 \ No newline at end of file + amount: 5 diff --git a/Resources/Prototypes/_White/Entities/Objects/Misc/packed_soil.yml b/Resources/Prototypes/_White/Entities/Objects/Misc/packed_soil.yml index fca3f60b0c..74b9712e62 100644 --- a/Resources/Prototypes/_White/Entities/Objects/Misc/packed_soil.yml +++ b/Resources/Prototypes/_White/Entities/Objects/Misc/packed_soil.yml @@ -5,7 +5,7 @@ parent: BaseItem components: - type: Item - size: Small + size: Normal - type: Sprite sprite: White/Structures/growingpot.rsi state: packed_soil @@ -13,4 +13,4 @@ tags: - PackedSoilTag - type: StaticPrice - price: 50 \ No newline at end of file + price: 10 diff --git a/Resources/Prototypes/_White/tags.yml b/Resources/Prototypes/_White/tags.yml index de4f84d435..7fd259942a 100644 --- a/Resources/Prototypes/_White/tags.yml +++ b/Resources/Prototypes/_White/tags.yml @@ -150,3 +150,6 @@ - type: Tag id: MagazineKalashLightRifleBox + +- type: Tag + id: PackedSoilTag diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml index 60979abde5..baea3b07c5 100644 --- a/Resources/Prototypes/tags.yml +++ b/Resources/Prototypes/tags.yml @@ -948,9 +948,6 @@ - type: Tag id: Ore -- type: Tag - id: PackedSoilTag # WD edit - - type: Tag id: Packet diff --git a/Resources/Textures/White/Structures/growingpot.rsi/meta.json b/Resources/Textures/White/Structures/growingpot.rsi/meta.json index 3104bcb7f2..cc817e7473 100644 --- a/Resources/Textures/White/Structures/growingpot.rsi/meta.json +++ b/Resources/Textures/White/Structures/growingpot.rsi/meta.json @@ -1,20 +1,20 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "dosharus", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "pot_filled" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "dosharus", + "size": { + "x": 32, + "y": 32 }, - { - "name": "pot_empty" - }, - { - "name": "packed_soil" - } - ] -} + "states": [ + { + "name": "pot_filled" + }, + { + "name": "pot_empty" + }, + { + "name": "packed_soil" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/White/Structures/growingpot.rsi/packed_soil.png b/Resources/Textures/White/Structures/growingpot.rsi/packed_soil.png index 4ed659ebbe932e0fb8eb845ce81962be1b50899a..9368408eebe88e9e6d681dce5c388439c18212c2 100644 GIT binary patch literal 1934 zcmbVN3s4kg9A8uzj)yve$YANRP=a{3d&}Ly?QjZm=v{HB$E9e7F1vfj!rkq0yLb=8 z2bh_ejU$$Ts0r%e6sb*-5L#K;*cc85>NrW}gM45qiUw+Z%i~5HtI3_&-EVh)-|zqb z{a^d$+^pH5K~X^v1cmB#S|hl_;u#nKuDsWK2iznM-9jFMg2Tkq531T02|=T7vZfp% z$B;=-oJ~g3TplBH+Z+H5K`Arb4w5Ql1UQeeuyzgdTk{bFW@!zwKxx1Xj&vrU)p?yv zwl~W}c?&5ujm(%1r??3~U}FRlcH69Wo^WfB0bT;E#n&hT4?u)M4U#4rgmVmY;dIW) zz-pOXN@18BP68{13Qtz6r@=UeC!&}N#g$SVBQQCkRKi0C0?avSGhx)u8Zri+G)TT6 zI0zJVxm+?=qKtD|P`O&IMll@4aVbDZd5>Kn-BLRrGt8i6c*@B-1eUYIA|si{6$=^! zxH_o8=J3(l`Jp(0h@o!Mfy!l=sA&L5Q$C!d*l8UwPE#mjWo(RH-~m?d!#eUgf#dVJ zf1vh#e!>8Vt-;{4@l;=IHlGPz$XEts3utWmG z2B8LyX3d_bLX!yv{sa`%3{48;e}ZX>Fmp~D2?Vn?(!!t)y9I%LVI`m zUKk97-p&i8onrJ_4FWXFSe7PmGo?`GB?8}-3ZQ{e$fe101ui9Nm0F1@R0=hP5AWA< zRI!-Z;r;ag+&{<3g4QCf&&(q>oLCZsj^#nJJVPCk%@hr-tSmfG1q4Zn)vZA&F|7=Z z483NbIRb;Uu6zcN{!6+CVLWFRT%?mpvw&#*XE~w3c~tDfK^^GdB@TRhtY?SeU=WB) z-v|N^z9Gig!Q^s+5jF98Su_NVn5EaInQ~tL>Alv%u(a@FGhWRI-+f5GYr@Oku&9HF zf+h7+=6OfwUSD!DaC?gX8gE3!q=d80GbP{4E}5IE5AM#5JvS-n>}DO}jb~EUyq44* z+aFU<)_E$VzsA#<)N{VNasAjbPafOQF(K`X_EoVO~Y2>1=UA5tX`* zztE(CZvWA)JKP%D!+b>r@9!>sf8W%0<0fNo)S)fP8|cl*uFKVp#?=kyVs+p(^sf}am`d?hX z+TJ*E9pvuYKeKl&T+%gta%N3i%ehPQJATg^?YVpF)S0I4?$cIVJKA0OYf#A1I%E9E zo%;&va*krdg1d+FBMmG zO<$gyJdxg765aQwzjpkGm7`2cQkL=`MQk_)e+pGj@z$Ow>aRG_66LL}c`22SS~P$5 zqPXR)t2YG}e3?A$+v1Xtfb_mnv<6z0X;w$hA+BBQy&5@XTAu6P!>?N?N#Nuo=kv3r z&Z@h4=I;8&NRC8Q?k?wxfBT4y$1826JJV+qh{Pbh* z27WURO9&{B-gq(d1HZ9}0d1<;qc>Nm>P< zR9ZSSYxmoQG+9>9mt`4Msi9QPvU2?<{m)L!=IP5%SYU!3wU3@0igBw68#DT01O6$5CY)god%Wj zK9$Qicxz}V*MBY{-MTw;-gmA(d-oys+}76fM4!1{fvy`g8g&3ktwG_*0EWV{F?_?ExUT2ZC&}`g+tBz_x9= zT`jc)g=PSPI)>?2PE<*+Cu$Gr^)Ccq+jeYTtybp-n|-F+)#kYea(ol+?7SBGA=%&m zgzI{lnV;&!=odMC>i{SzkYE4+01jnXNoGw=04e|g00;m8000000Mb*F00000NkvXX Hu0mjfY$_wq