From 5b629c3749d03d7bdbc89323e38fe423b289053e Mon Sep 17 00:00:00 2001 From: Schrodinger71 Date: Tue, 11 Jun 2024 00:11:05 +0300 Subject: [PATCH 1/2] add plushie pochita --- Resources/Locale/ru-RU/ADT/Fun/ADTtoys.ftl | 5 ++++- .../ADT/Entities/Objects/Fun/toys.yml | 21 +++++++++++++++--- .../ADT/Objects/Fun/toys.rsi/meta.json | 11 +++++++++ .../Objects/Fun/toys.rsi/plushie_pochita.png | Bin 0 -> 855 bytes .../Fun/toys.rsi/pochita-inhand-left.png | Bin 0 -> 843 bytes .../Fun/toys.rsi/pochita-inhand-right.png | Bin 0 -> 849 bytes 6 files changed, 33 insertions(+), 4 deletions(-) create mode 100644 Resources/Textures/ADT/Objects/Fun/toys.rsi/plushie_pochita.png create mode 100644 Resources/Textures/ADT/Objects/Fun/toys.rsi/pochita-inhand-left.png create mode 100644 Resources/Textures/ADT/Objects/Fun/toys.rsi/pochita-inhand-right.png diff --git a/Resources/Locale/ru-RU/ADT/Fun/ADTtoys.ftl b/Resources/Locale/ru-RU/ADT/Fun/ADTtoys.ftl index f6a06c81215..e33e14bc0b9 100644 --- a/Resources/Locale/ru-RU/ADT/Fun/ADTtoys.ftl +++ b/Resources/Locale/ru-RU/ADT/Fun/ADTtoys.ftl @@ -34,4 +34,7 @@ ent-ADTPlushieKoff = плюшевая Ксения .desc = Милая плюшевая игрушка одетая в костюм бармена. Ее причудливый котелок на голове добавляет ей особый шарм. ent-ADTPlushieUrs = плюшевый Урс - .desc = Милая плюшевая игрушка Урса. \ No newline at end of file + .desc = Милая плюшевая игрушка Урса. + +ent-ADTPlushiePochita = плюшевая Почита + .desc = Плюшевая игрушка-собака с торчащим из головы лезвием бензопилы. \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/ADT/Entities/Objects/Fun/toys.yml index cec5150dedf..92bbedd18ef 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Fun/toys.yml @@ -574,6 +574,23 @@ sprite: ADT/Objects/Fun/toys.rsi state: plusie_mio +- type: entity + parent: BasePlushie + id: ADTPlushiePochita + name: Plush pochita + description: A plush dog toy with a chainsaw blade sticking out of its head + components: + - type: Sprite + sprite: ADT/Objects/Fun/toys.rsi + state: plushie_pochita + - type: Item + sprite: ADT/Objects/Fun/toys.rsi + inhandVisuals: + left: + - state: pochita-inhand-left + right: + - state: pochita-inhand-right + - type: entity name: Suspicious gift description: A gift of suspicious appearance. A barely audible beeping sound comes from it. @@ -596,8 +613,6 @@ sound: path: /Audio/Effects/unwrap.ogg - - - type: entity parent: BaseItem id: toyC4 @@ -629,4 +644,4 @@ types: Blunt: 0 - type: UseDelay - delay: 28 + delay: 28 \ No newline at end of file diff --git a/Resources/Textures/ADT/Objects/Fun/toys.rsi/meta.json b/Resources/Textures/ADT/Objects/Fun/toys.rsi/meta.json index 9ff22d2188b..ff2bb719e46 100644 --- a/Resources/Textures/ADT/Objects/Fun/toys.rsi/meta.json +++ b/Resources/Textures/ADT/Objects/Fun/toys.rsi/meta.json @@ -170,6 +170,17 @@ }, { "name": "rainbowcarpplush" + }, + { + "name": "plushie_pochita" + }, + { + "name": "pochita-inhand-right", + "directions": 4 + }, + { + "name": "pochita-inhand-left", + "directions": 4 } ] } diff --git a/Resources/Textures/ADT/Objects/Fun/toys.rsi/plushie_pochita.png b/Resources/Textures/ADT/Objects/Fun/toys.rsi/plushie_pochita.png new file mode 100644 index 0000000000000000000000000000000000000000..487087aad7888e082476928e3f5cb4fa2396e714 GIT binary patch literal 855 zcmV-d1E~CoP)6vk)o!al+pwO~z*xRsTKiM5plrHO?P#1Ke?g$wJF*q9BKi4}>_YX1N$Lu0)* zwkAetC=8AG2tElcENB)u<~w)JICmezMS*C-O(rvQ@9ccP^PMxZO8pN{K3|{%)0E5VF0F3?9&F}P@rnQZ~ZJGnb2AG+7YMiK-ju1^{h$a=cw*!hC;_7oTL)mP0 zcMx_OAZ|A}AmY-$>G$aSNQyq)O4F;pV@3?(3j={OfXL-?JHtR65eh`3_-3iQ2>>8~ z_%fVkh}j!Q>Di?&7Jq#;C{l<=N(nY%i(5b-`gQyax)v6P6wTlCs5+XYnxCMxu>?be6?T{bVB!5@0HHUo zm%16EG4~KxO7VKBg^z3d@OLNV|Apt<{Aua%s#6iI+z%8e5I*8&y|KvhY zbTSuFyWh|$Sk(ZCUK}t{x&{WoD!NCf0&xJKVQ!1cc&n&rZ9GojMpAqPCHj}wk8=uK zy5?Ie02JNx%RzhLpD?FGgr#4f@EBl814#6H1~7N0htOJ`3`D=;cbMzg7RQxrB8)O% z7pxQ@LWoL}i0vNM17P-AC+8dhh#cb5N6|KG@DFALtiN9KP6KWgV+8A$b@X$60f240 z4Pyjc133XMi2Cgq)h6Op^*gBQ$7#ObqYs0zwiPcBE?xd6;;7(ui?LZ_UbiO|U%~j+ z?st*i!(x}XYm@D%jJbGR>-O~<9Q@M&_7&`K^Fs&zSqFXr^2Nj(eaGF%0000EWmrjO hO-%qQ00008000000002eQ^a=`*(lm)2ruhRPXGa zF*)p8)!X}@>mT2qeC}S(r^zgn9E3cWJQX-q8dWa1J$Ulu>;xpmu^;7VSiO3^HHYy*9=YV(c6kxT#qZu5O4{51H<=~Qa;xq8Y{MU~x1TRp ztD9$g`|4gnLpj}b@$cvLO)r1b{Pp+ek1ym{qzxPs4mEvXYkRl-^6rgc!UA!j8_*6-#=x zf7x;BzMOV$4b#5m_w8l+m-0qbv7D8T{XQ?KEm!mN>YrQ*EeR=6ON~OMdL1tKFEI7B zT@-k3|BqT-;caKHDNl}`yiKn+YWBR;naII40fS?q(YVu?nVt8X@y>Mn{mYae&yinY z+rQ0I-)i0J`uC2k)fJ1bH#ls2wMDInMdEM$e1)}@+s;KB2WD-3wW0hbYvWlCeU7q@ z8%E4b&!RW0ZQdHJ@#4Qlwb9P-jO4AQnQh)KHcmO+j17Me#XaT{l65?=W7`7_R>#^< zt$RnyCJLk&`5J^W9gv$dx+-v?xreVtVWuWx1_No-u*nFXX6{wBh>8>Sdw< z`l_Bl+4HmBDKorD>|AzIjcwzf%84Hru3PVXQ}%N;)pFL+!Y_K&6Ja)Z!|K&Ja z2H9CJ3Zwhh&UKm@{cqlqsh>mM@3n7^V%&OQ)uF~?pG3HdUrg$mwr}76ZiWe!{Su57 zzce3YXdX^IxyR`IpIu@&op0O1}z|)1BgN3 RQt)ID<>~6@vd$@?2>@hlbaMaz literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Fun/toys.rsi/pochita-inhand-right.png b/Resources/Textures/ADT/Objects/Fun/toys.rsi/pochita-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..2274418ad8c6160c8b769119121ff1aba7cf29e5 GIT binary patch literal 849 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEVEX6j;uuoF_;%LDE)hq8ws7Xj z-M&Y-YZ>JqIT_0z_~IbYbMDRyp<1@X-e+q0;t%|B5O8sn_<8K-@kMW9S65e+Kc5yQ zu`7Msu2uimuTD?gZ9e;tN~6jImPrmm9!#DJoL2;Q?5ME2(z`?XTK~EEZ$#7{UcdgH zP4Djd$b0`y&hGSYvt~@_`7nESzj8z6hh5gr5=>V6;_YTA)>IaneQOV&UAS%SkJYQU zuU_3Cum7Gu=E>=$e^x(lZpkIYiI(HX>gVN!DFJcbRA^7sEsS?11B#3nG$_x{^NyVo(3HnS(F=L$9?N*tTs zab)$=qlcF3UHu!u-O!$(ttfLdykU;P<1e|?YmLE$4IoPpC{?gA`II!3O5M;<(fL_Pdqq)N60tjF*VIT-{cYnrD4B zT6kLUvD<4aZ1Xc-pJUT-(6;2fe&%Gn_i4Q?tqS)8sQ!3{#90)f2aO?s`sZ&v6mi&N8g=jYxi`k$}=0WNw;OZ z_G~+qF;i2E;p0|SYxYvvYB5Eo22Mru=gZ!PJt}-<`{7L2a{op9LC zu63pS4An(TG;d6EwCZ#;d=dKKo(*&s3nl04PD9+ Date: Tue, 11 Jun 2024 00:14:01 +0300 Subject: [PATCH 2/2] minor Fix --- global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global.json b/global.json index b4262a6109a..2114078f500 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "8.0.x", + "version": "8.0.203", "rollForward": "disable" } }