From 48338042ad9763bcee71c247829a682aad778ce9 Mon Sep 17 00:00:00 2001 From: BIGZi0348 <118811750+BIGZi0348@users.noreply.github.com> Date: Tue, 29 Oct 2024 21:25:30 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9A=D0=BE=D0=BD=D1=84=D0=B5=D1=82=D0=B0=20?= =?UTF-8?q?=D0=B8=D0=BB=D0=B8=20=D0=B6=D0=B8=D0=B7=D0=BD=D1=8C=20(#757)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Конфета или жизнь * gremlins invasion * Я ДОБАВИЛ БОЛЬШЕ МУСОРА НА СТАНЦИЮ!!! --- .../Locale/ru-RU/_white/object/candies.ftl | 16 +++ .../Objects/Consumable/Food/candies.yml | 127 ++++++++++++++++++ .../Food/candies.rsi/black-trash.png | Bin 0 -> 396 bytes .../Consumable/Food/candies.rsi/black.png | Bin 0 -> 270 bytes .../Food/candies.rsi/green-trash.png | Bin 0 -> 450 bytes .../Consumable/Food/candies.rsi/green.png | Bin 0 -> 430 bytes .../Consumable/Food/candies.rsi/meta.json | 35 +++++ .../Consumable/Food/candies.rsi/red-trash.png | Bin 0 -> 566 bytes .../Consumable/Food/candies.rsi/red.png | Bin 0 -> 502 bytes .../Food/candies.rsi/turquoise-trash.png | Bin 0 -> 425 bytes .../Consumable/Food/candies.rsi/turquoise.png | Bin 0 -> 415 bytes 11 files changed, 178 insertions(+) create mode 100644 Resources/Locale/ru-RU/_white/object/candies.ftl create mode 100644 Resources/Prototypes/_White/Entities/Objects/Consumable/Food/candies.yml create mode 100644 Resources/Textures/White/Objects/Consumable/Food/candies.rsi/black-trash.png create mode 100644 Resources/Textures/White/Objects/Consumable/Food/candies.rsi/black.png create mode 100644 Resources/Textures/White/Objects/Consumable/Food/candies.rsi/green-trash.png create mode 100644 Resources/Textures/White/Objects/Consumable/Food/candies.rsi/green.png create mode 100644 Resources/Textures/White/Objects/Consumable/Food/candies.rsi/meta.json create mode 100644 Resources/Textures/White/Objects/Consumable/Food/candies.rsi/red-trash.png create mode 100644 Resources/Textures/White/Objects/Consumable/Food/candies.rsi/red.png create mode 100644 Resources/Textures/White/Objects/Consumable/Food/candies.rsi/turquoise-trash.png create mode 100644 Resources/Textures/White/Objects/Consumable/Food/candies.rsi/turquoise.png diff --git a/Resources/Locale/ru-RU/_white/object/candies.ftl b/Resources/Locale/ru-RU/_white/object/candies.ftl new file mode 100644 index 0000000000..0b9c22a9f6 --- /dev/null +++ b/Resources/Locale/ru-RU/_white/object/candies.ftl @@ -0,0 +1,16 @@ +ent-FoodSnackCandyBlack = конфета + .desc = Сладкие конфеты минутных послаблений нейтрализуют горечь несбывшихся надежд. +ent-FoodSnackCandyGreen = { ent-FoodSnackCandyBlack } + .desc = { ent-FoodSnackCandyBlack.desc } +ent-FoodSnackCandyRed = { ent-FoodSnackCandyBlack } + .desc = { ent-FoodSnackCandyBlack.desc } +ent-FoodSnackCandyTurquoise = { ent-FoodSnackCandyBlack } + .desc = { ent-FoodSnackCandyBlack.desc } +ent-FoodPacketCandyBlackTrash = обёртка от конфеты + .desc = Фантик от конфеты, самой конфеты нигде нет. +ent-FoodPacketCandyGreenTrash = { ent-FoodSnackCandyBlackTrash } + .desc = { ent-FoodSnackCandyBlackTrash.desc } +ent-FoodPacketCandyRedTrash = { ent-FoodSnackCandyBlackTrash } + .desc = { ent-FoodSnackCandyBlackTrash.desc } +ent-FoodPacketCandyTurquoiseTrash = { ent-FoodSnackCandyBlackTrash } + .desc = { ent-FoodSnackCandyBlackTrash.desc } diff --git a/Resources/Prototypes/_White/Entities/Objects/Consumable/Food/candies.yml b/Resources/Prototypes/_White/Entities/Objects/Consumable/Food/candies.yml new file mode 100644 index 0000000000..1eed1d5951 --- /dev/null +++ b/Resources/Prototypes/_White/Entities/Objects/Consumable/Food/candies.yml @@ -0,0 +1,127 @@ +- type: entity + noSpawn: true + abstract: true + id: CandyBase + parent: FoodSnackBase + components: + - type: SolutionContainerManager + solutions: + food: + maxVol: 5 + reagents: + - ReagentId: Nutriment + Quantity: 5 + - type: FlavorProfile + flavors: + - sweet + - type: Sprite + sprite: White/Objects/Consumable/Food/candies.rsi + - type: Item + sprite: White/Objects/Consumable/Food/candies.rsi + - type: Tag + tags: + - FoodSnack + +- type: entity + name: candy + parent: CandyBase + id: FoodSnackCandyBlack + description: Sweet candies of momentary indulgences neutralize the bitterness of unfulfilled hopes. + components: + - type: Sprite + state: black + - type: Item + state: black + - type: Food + trash: FoodPacketCandyBlackTrash + +- type: entity + name: candy + parent: CandyBase + id: FoodSnackCandyGreen + description: Sweet candies of momentary indulgences neutralize the bitterness of unfulfilled hopes. + components: + - type: Sprite + state: green + - type: Item + state: green + - type: Food + trash: FoodPacketCandyGreenTrash + +- type: entity + name: candy + parent: CandyBase + id: FoodSnackCandyRed + description: Sweet candies of momentary indulgences neutralize the bitterness of unfulfilled hopes. + components: + - type: Sprite + state: red + - type: Item + state: red + - type: Food + trash: FoodPacketCandyRedTrash + +- type: entity + name: candy + parent: CandyBase + id: FoodSnackCandyTurquoise + description: Sweet candies of momentary indulgences neutralize the bitterness of unfulfilled hopes. + components: + - type: Sprite + state: turquoise + - type: Item + state: turquoise + - type: Food + trash: FoodPacketCandyTurquoiseTrash + +- type: entity + parent: FoodPacketTrash + id: FoodPacketCandyBlackTrash + name: candy wrapper + description: Candy wrapper, the candy is nowhere to be found. + components: + - type: Sprite + sprite: White/Objects/Consumable/Food/candies.rsi + state: black-trash + - type: Item + sprite: White/Objects/Consumable/Food/candies.rsi + state: black-trash + +- type: entity + parent: FoodPacketTrash + id: FoodPacketCandyGreenTrash + name: candy wrapper + description: Candy wrapper, the candy is nowhere to be found. + components: + - type: Sprite + sprite: White/Objects/Consumable/Food/candies.rsi + state: green-trash + - type: Item + sprite: White/Objects/Consumable/Food/candies.rsi + state: green-trash + +- type: entity + parent: FoodPacketTrash + id: FoodPacketCandyRedTrash + name: candy wrapper + description: Candy wrapper, the candy is nowhere to be found. + components: + - type: Sprite + sprite: White/Objects/Consumable/Food/candies.rsi + state: red-trash + - type: Item + sprite: White/Objects/Consumable/Food/candies.rsi + state: red-trash + +- type: entity + parent: FoodPacketTrash + id: FoodPacketCandyTurquoiseTrash + name: candy wrapper + description: Candy wrapper, the candy is nowhere to be found. + components: + - type: Sprite + sprite: White/Objects/Consumable/Food/candies.rsi + state: turquoise-trash + - type: Item + sprite: White/Objects/Consumable/Food/candies.rsi + state: turquoise-trash diff --git a/Resources/Textures/White/Objects/Consumable/Food/candies.rsi/black-trash.png b/Resources/Textures/White/Objects/Consumable/Food/candies.rsi/black-trash.png new file mode 100644 index 0000000000000000000000000000000000000000..140b876c394c4b7560dc8e7be32328dfac9a47bf GIT binary patch literal 396 zcmV;70dxL|P)Px$MoC0LR9J=WmBDU;KoEvM8VPA25!70YiLD1801t#iU!qUim*~NG@#Kkv?SVk4 ziYAc8*n}P$Xib_5OM2>lw;{VT|NgVHfJ7pZG{AMdylIXL(T#S0kdKyA?EavU2q6Kk z2K0AT1wBN4R)xQ>^PmQw%%&FA=jTlTT*u3|yG>bmsE@JQ7J=ro-ED-N zs4Sr9c~KZ3$W|o#grPnbcA~O?C=QiJ^8vM`5@ai^wgqq!2b#~zI;th2RtusyRMISE zc$l1={CjM*E$U21?MwKR6M^QJak5W<&*`Y*gwPm9aj106?$^l=lk#q;Efs(?OPMcb z%DG%;7yL#s6<6z9-fq@hKKFR-J&|T9Q5;svE&LJ!%oj7IV|Guzb$^4#J#@@EQzq;e}?xa)mtNQ{b;>-n%y{)3 literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Consumable/Food/candies.rsi/green-trash.png b/Resources/Textures/White/Objects/Consumable/Food/candies.rsi/green-trash.png new file mode 100644 index 0000000000000000000000000000000000000000..88057d971e72d134d417a1c22b26d7bb103b04ab GIT binary patch literal 450 zcmV;z0X_bSP)Px$d`Uz>R9J=Wm9c8VP!xv0me9~e=+=T%DEI)yty5h@926X+E**7qDs<|iQ@|-( zI<=FbL%|Liy14WuL{RV<3KA94>88mowf7oJhvuKcg`Dp{C;z#DRH;(^ckS(>NU>K9 zGP$GJ+3@;NskX5Tc)v7_opr|r<@XaA5b(KSg=eShTdf-VN#LDIo153OZA)x#K)?Yy zl{U8LY;8b0gi*K{_uR0sJ%@g2N_SjP4j^b|APN^?VdUie5^Hu0_&O!kKY;xhxz=z-DQ%SOh=3CP!Lzcj`69Oi}<>)c=Xtd^_Lgn4Kx z!9j5gM91B6flLktlOgqNIW~46e6~GD39e)ydauX!+a-|4uM3BSf5V2`3Zenjh3`ZS sw-vZ=&q1+QRZ9J@=uhFPQl(0&4+mGW=27A-a{vGU07*qoM6N<$f>hGaK>z>% literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Consumable/Food/candies.rsi/green.png b/Resources/Textures/White/Objects/Consumable/Food/candies.rsi/green.png new file mode 100644 index 0000000000000000000000000000000000000000..072fb4312aae6c837db9f695503bc969c7cc1f6d GIT binary patch literal 430 zcmV;f0a5;mP)Px$Xh}ptR9J=Wm9a|0P!xv$)+|Cz5UH3UP(?xL=vJf;;LvQLPjFu$&yZKh6NGLN zd;mjnvy&afLJAo=xY!aXN-$0*q-ombCIOfGPvKnd{r-E-$+>`#kkCJ?QRiWX!{WU7 zXlU=`NVUSxB$%?d5x4x_-hH(gFdP5j{NCRB0~MN(;I^a#09fQE-z`-^;LQ%gfs!R4 zc%FFRr3|ERZc92?an@b)y}I*-c$HC$ThwDZEb4A8GeP!_q#?bGnVddy{@ zP@QPV0D#u*AY3eyHG&iP`TU`9{ec1*$TnOsouj2HTkyx@dv5qa0|d`bx4@fi!Icx4 z8xC-eVj3>~Px$@JU2LR9J=WmA^~FKpe$i#iCNWq*oc}`Jc)xx&`Iw4Fa zgoT;ETb6*}5$G5OTLffo$S%8EY+YTM7#_aCIXm;2=Lv!1x?=s!Q@oRni--y zO$+9+)e-<<3QG-7OTS)6zNw;D9ieSm!gp?tqDrlnk~?79oU2$UpjaqOqT#xM7HwNr%A^#%>InI!3Shxe9Ee1tfk#RK z0Or^A&s-pnJ?*4wL zhfWBKTm#d((=_%-X~4XEq2cvu7pLdvKl;rlO7y?<32&hoz6^?hx&QzG07*qoM6N<$ Eg5B%>+yDRo literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Consumable/Food/candies.rsi/red.png b/Resources/Textures/White/Objects/Consumable/Food/candies.rsi/red.png new file mode 100644 index 0000000000000000000000000000000000000000..9e739a62f5eeddd8f3a57025199d6445fd3d9a81 GIT binary patch literal 502 zcmVPx$ut`KgR9J=Wls!wsP!xurSO?7)L2&5MQRrNp1<|cwsR%B15r0E}gnz@qMG6(% z`~!kGDHL4XGAJc&6KN&%I_M4k&~opsIOW-LlAQCN^WJkICnv{{rtgc{Si^Bd!*S-~ zi&!x&zU6sSA{ve(Dz3{;5d0|aH&#sqNVYtWv+-DrgrMTOMmdZoFpFvNr3E|>1^_(7 z@&5`q@As|e!GQCA-vYQu63bMCW%SoKP2U&Y@tBu1<#sr<_J0df=WdOh4i zfydE^+u=|<-%@MnRb93ZHce7wXs=<@_r>mMiQaok*p7Hg61EREDFd`Zp*sbwk7eg^ znr5-5B*85dvS(c@lr4~*d)4WkpS9rVu*m+}n(|GkBtUlFxqKsRM-*!T0L5Cs{q-y5 z>IMMi>IR*gu4-*S!2;QN=kjeTUaSR#?TGa~o6b#luDGfdN?z4%TO6O12;0%zyV)}U zUz50Mg?}etk%&nF(hAk$S^_3T0NGiH;*ZRNt5yi0wFTNYSKYP+fSiWB2Xwk#O2DL$ s$AT_A!Pyhe`07*qoM6N<$f>u-HrT_o{ literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Consumable/Food/candies.rsi/turquoise-trash.png b/Resources/Textures/White/Objects/Consumable/Food/candies.rsi/turquoise-trash.png new file mode 100644 index 0000000000000000000000000000000000000000..9535a4212d75d7395cd83a5bd3df9f0350670e6f GIT binary patch literal 425 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^T<$(}BbArY;~ z2@#r0p?JIjox2+!C0rZ1G!LvTp4iw&$01STPx$SxH1eR9J;$U>F6XU=)l3GJw{)ng6L}785y^|CN`dnj;v=u^a}NA3kTe7L-ns z8Du*^Yu(KMJ_{c+gvYOji>+K3%CIF~mLf+Gr4i=yWe-akqU5{b;xIlXAwe(=pa(n5 zVg?2VxML_u6D))jd^~iLf#1%Y!Dr!P28MVBxW&sJmNKkd7>cTR-OT@_h6GWHr3;e& z^V^v-z@h=!5$I78%TPp8bP%l&*%8#UTvB0t`15?C{z_R@Q+zVlhJ>s)fivSb*Wz%54n4p1*>H z9`zi6>Ih*0qJ2&^2f!S` zQ;