From c94b8fe8152bb0dd92449dbc71bc527298bc8d21 Mon Sep 17 00:00:00 2001 From: 1Altius Date: Sun, 31 Dec 2023 03:29:16 +0300 Subject: [PATCH 1/5] =?UTF-8?q?=D0=98=D0=B3=D1=80=D1=83=D1=88=D0=BA=D0=B8.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Locale/ru-RU/ADT/Fun/ADTtoys.ftl | 9 +++++ .../ADT/Entities/Objects/Fun/toys.yml | 31 +++++++++++++++++- .../ADT/Objects/Fun/toys.rsi/meta.json | 10 ++++++ .../Objects/Fun/toys.rsi/plushie_jungar.png | Bin 0 -> 256 bytes .../Objects/Fun/toys.rsi/plushie_migel.png | Bin 0 -> 412 bytes .../ADT/Objects/Fun/toys.rsi/plushie_teo.png | Bin 0 -> 432 bytes RobustToolbox | 2 +- 7 files changed, 50 insertions(+), 2 deletions(-) create mode 100644 Resources/Textures/ADT/Objects/Fun/toys.rsi/plushie_jungar.png create mode 100644 Resources/Textures/ADT/Objects/Fun/toys.rsi/plushie_migel.png create mode 100644 Resources/Textures/ADT/Objects/Fun/toys.rsi/plushie_teo.png diff --git a/Resources/Locale/ru-RU/ADT/Fun/ADTtoys.ftl b/Resources/Locale/ru-RU/ADT/Fun/ADTtoys.ftl index 0ae4bea95fc..414ecb196c8 100644 --- a/Resources/Locale/ru-RU/ADT/Fun/ADTtoys.ftl +++ b/Resources/Locale/ru-RU/ADT/Fun/ADTtoys.ftl @@ -7,3 +7,12 @@ ent-ADTPlushieJessie = плюшевая Джесси ent-ADTCrateFunAdminPlushie = Ящик милых плюшевых игрушек .desc = Куча мягких милых плюшевых игрушек. Разложите их повсюду, а потом подумайте, как вы объясните эту покупку NT. + +ent-ADTPlushieJungar = плюшевый Джунгарик + .desc = Джунгарский плюшевый хомячок, маленький, пушистый и пузатенький! В его крохотных лапках виднеется кусочек сыра, который пахнет как сырные шарики. На его мордочке застыло выражение удивления. Этикетка, висящая у него под ножкой, имеет надпись: "Джунга-джунга, джунгарёк, принеси-ка мне сырок!". + +ent-ADTPlushieMigel = плюшевый Мигель + .desc = Плюшевый Мига, Мигеля, Мигелюшка. О-о да, этот загорелый парень будто сошёл с обложки всеми любимого приключенческого сай-фай фильма. Он красив, смел, харизматичен и добр. Верность друзьям и жажда справедливости – два главных его имени. А также "Мать вашу, как это работает?" и "Господи, прошу, дай мне сил.." + +ent-ADTPlushieTeo = плюшевый Тео + .desc = Он мрачен, как грозовая туча. diff --git a/Resources/Prototypes/ADT/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/ADT/Entities/Objects/Fun/toys.yml index 3a9b404ee24..9f34cd3495a 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Fun/toys.yml @@ -83,7 +83,7 @@ heldPrefix: garbagerama - type: ItemCooldown - + - type: entity parent: BasePlushie id: ADTPlushieJessie @@ -444,3 +444,32 @@ sprite: ADT/Objects/Fun/toys.rsi state: plushie_ma +- type: entity + parent: BasePlushie + id: ADTPlushieJungar + name: Djessie plushie + description: It looks like a soft and cute blondie. + components: + - type: Sprite + sprite: ADT/Objects/Fun/toys.rsi + state: plushie_jungar + +- type: entity + parent: BasePlushie + id: ADTPlushieMigel + name: Djessie plushie + description: It looks like a soft and cute blondie. + components: + - type: Sprite + sprite: ADT/Objects/Fun/toys.rsi + state: plushie_migel + +- type: entity + parent: BasePlushie + id: ADTPlushieTeo + name: Djessie plushie + description: It looks like a soft and cute blondie. + components: + - type: Sprite + sprite: ADT/Objects/Fun/toys.rsi + state: plushie_teo diff --git a/Resources/Textures/ADT/Objects/Fun/toys.rsi/meta.json b/Resources/Textures/ADT/Objects/Fun/toys.rsi/meta.json index 8d504082ea2..ca4a9ba0344 100644 --- a/Resources/Textures/ADT/Objects/Fun/toys.rsi/meta.json +++ b/Resources/Textures/ADT/Objects/Fun/toys.rsi/meta.json @@ -114,7 +114,17 @@ }, { "name": "plushie_ma" + }, + { "name": "plushie_jungar" + + }, + { "name": "plushie_migel" + + }, + { "name": "plushie_teo" + } + ] } diff --git a/Resources/Textures/ADT/Objects/Fun/toys.rsi/plushie_jungar.png b/Resources/Textures/ADT/Objects/Fun/toys.rsi/plushie_jungar.png new file mode 100644 index 0000000000000000000000000000000000000000..40e3da9e3775c18e7251cb600667b4caaa056fef GIT binary patch literal 256 zcmV+b0ssC|Nk&Ha00012MM6+kP&iEN0000lAHW9?cc3Veq~?AZ5Wp8#7{O{bfQ4j3 zZ6sUC*9bbGA^OhQQc{pJi2d!;Y|!VqW=>> z{!}9&MwG!Cf--}thXAqyOj>%B`FWVS_#p8KFv-v*p5;()=lP9VUMWq9FrCNy-Q8m# zFAwB_hX|QerC?TsC|Wd=Oh|wTfvN<+Ll{Hy0Avvc8icH|A^O&*nY@Lr2y#kDpE8)w GDf!WsA$6tz literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Fun/toys.rsi/plushie_migel.png b/Resources/Textures/ADT/Objects/Fun/toys.rsi/plushie_migel.png new file mode 100644 index 0000000000000000000000000000000000000000..271641b12a6990aeed4e52a70bf0a80eb39ff827 GIT binary patch literal 412 zcmV;N0b~ABNk&GL0RRA3MM6+kP&iD70RR9mAHW9?=fI}6wl+V#j%~#TdQpK4Mhx_1 z%^DkQBiU;61~Qvc4gE(@h4&znN^D}=YIFxWhAIaKRCvb(KJu=M`40d99KZnTk8bfs zG;cr<(krd>`(A)6tk5)52$iCaFcGAg^5|B1c6nC5R=IY0_ILeiD5r6#6tHaDYTJN= zT)|CUX#NwmgGl|p@7{?1Pk{SZju<2X)zGsGMpCuJuFWuV7%K>X*oHN?9Y+H&l!@$G zh4yV2&5TqLNOtWQ@(KkT%t($!2C}pEQzOaIZG;N();7nFg*)CC?x-lMs1K4lk(6+$ zafT#3Pm%zuVdp2{%>bOp8Y@pv55RCbudZUq15X|X1C_(Jp=;Hg{p-0A4z@)-yK&k# z-mF0wyJI+P7>AyiAejUU#PPsNctN0!YgvAoAx#p9UI?*F>o{PZAP7b%hq#u76qS^* zD!q+DC`%9B;`L4vkfa>o%H!jfysjh^AG$>(x8;`PV*(WIaZ53|%~9UH_qU|zzSK+Z GHw6GVU%Y7m literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Fun/toys.rsi/plushie_teo.png b/Resources/Textures/ADT/Objects/Fun/toys.rsi/plushie_teo.png new file mode 100644 index 0000000000000000000000000000000000000000..5a109b022442220d7ac60e43c2467b2e4f05d261 GIT binary patch literal 432 zcmV;h0Z;x?Nk&Gf0RRA3MM6+kP&iDR0RR9mAHW9?kHI#wZ6)`9_xu+i6ks9r-wP3; zw!t<4z%p@dbM(f4dU>9x$u_cWCHK2a`hRL<^g@4RG)56*I{yIx07wX$N?O_@uy3e4&ZtO3D_b_=zE| zw~tBzVL}$&_7+gPNX%UPh0V8%t<{Au^vtZckJ|VAv5BKhH_sNH937K#Up`q)#B+=? zy3Ll>&UuxNiIQNn8>w1$yk4i;VqLO8WY0T7JH)uscyTE^s?mw6of7NCr3zSfdN0dj zyfA=zqeEuHtV5Q1p;OgGt7Ze+95Ar9Ve3v+H%x7-wkK6dQngxa?H3QKwSxknfsnMi aCzVL!5Y^xU&T}^=;e68Nr{Dt4Zwde_t Date: Sun, 31 Dec 2023 03:44:37 +0300 Subject: [PATCH 2/5] =?UTF-8?q?Revert=20"=D0=98=D0=B3=D1=80=D1=83=D1=88?= =?UTF-8?q?=D0=BA=D0=B8."?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit c94b8fe8152bb0dd92449dbc71bc527298bc8d21. --- Resources/Locale/ru-RU/ADT/Fun/ADTtoys.ftl | 9 ----- .../ADT/Entities/Objects/Fun/toys.yml | 31 +----------------- .../ADT/Objects/Fun/toys.rsi/meta.json | 10 ------ .../Objects/Fun/toys.rsi/plushie_jungar.png | Bin 256 -> 0 bytes .../Objects/Fun/toys.rsi/plushie_migel.png | Bin 412 -> 0 bytes .../ADT/Objects/Fun/toys.rsi/plushie_teo.png | Bin 432 -> 0 bytes RobustToolbox | 2 +- 7 files changed, 2 insertions(+), 50 deletions(-) delete mode 100644 Resources/Textures/ADT/Objects/Fun/toys.rsi/plushie_jungar.png delete mode 100644 Resources/Textures/ADT/Objects/Fun/toys.rsi/plushie_migel.png delete mode 100644 Resources/Textures/ADT/Objects/Fun/toys.rsi/plushie_teo.png diff --git a/Resources/Locale/ru-RU/ADT/Fun/ADTtoys.ftl b/Resources/Locale/ru-RU/ADT/Fun/ADTtoys.ftl index 414ecb196c8..0ae4bea95fc 100644 --- a/Resources/Locale/ru-RU/ADT/Fun/ADTtoys.ftl +++ b/Resources/Locale/ru-RU/ADT/Fun/ADTtoys.ftl @@ -7,12 +7,3 @@ ent-ADTPlushieJessie = плюшевая Джесси ent-ADTCrateFunAdminPlushie = Ящик милых плюшевых игрушек .desc = Куча мягких милых плюшевых игрушек. Разложите их повсюду, а потом подумайте, как вы объясните эту покупку NT. - -ent-ADTPlushieJungar = плюшевый Джунгарик - .desc = Джунгарский плюшевый хомячок, маленький, пушистый и пузатенький! В его крохотных лапках виднеется кусочек сыра, который пахнет как сырные шарики. На его мордочке застыло выражение удивления. Этикетка, висящая у него под ножкой, имеет надпись: "Джунга-джунга, джунгарёк, принеси-ка мне сырок!". - -ent-ADTPlushieMigel = плюшевый Мигель - .desc = Плюшевый Мига, Мигеля, Мигелюшка. О-о да, этот загорелый парень будто сошёл с обложки всеми любимого приключенческого сай-фай фильма. Он красив, смел, харизматичен и добр. Верность друзьям и жажда справедливости – два главных его имени. А также "Мать вашу, как это работает?" и "Господи, прошу, дай мне сил.." - -ent-ADTPlushieTeo = плюшевый Тео - .desc = Он мрачен, как грозовая туча. diff --git a/Resources/Prototypes/ADT/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/ADT/Entities/Objects/Fun/toys.yml index 9f34cd3495a..3a9b404ee24 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Fun/toys.yml @@ -83,7 +83,7 @@ heldPrefix: garbagerama - type: ItemCooldown - + - type: entity parent: BasePlushie id: ADTPlushieJessie @@ -444,32 +444,3 @@ sprite: ADT/Objects/Fun/toys.rsi state: plushie_ma -- type: entity - parent: BasePlushie - id: ADTPlushieJungar - name: Djessie plushie - description: It looks like a soft and cute blondie. - components: - - type: Sprite - sprite: ADT/Objects/Fun/toys.rsi - state: plushie_jungar - -- type: entity - parent: BasePlushie - id: ADTPlushieMigel - name: Djessie plushie - description: It looks like a soft and cute blondie. - components: - - type: Sprite - sprite: ADT/Objects/Fun/toys.rsi - state: plushie_migel - -- type: entity - parent: BasePlushie - id: ADTPlushieTeo - name: Djessie plushie - description: It looks like a soft and cute blondie. - components: - - type: Sprite - sprite: ADT/Objects/Fun/toys.rsi - state: plushie_teo diff --git a/Resources/Textures/ADT/Objects/Fun/toys.rsi/meta.json b/Resources/Textures/ADT/Objects/Fun/toys.rsi/meta.json index ca4a9ba0344..8d504082ea2 100644 --- a/Resources/Textures/ADT/Objects/Fun/toys.rsi/meta.json +++ b/Resources/Textures/ADT/Objects/Fun/toys.rsi/meta.json @@ -114,17 +114,7 @@ }, { "name": "plushie_ma" - }, - { "name": "plushie_jungar" - - }, - { "name": "plushie_migel" - - }, - { "name": "plushie_teo" - } - ] } diff --git a/Resources/Textures/ADT/Objects/Fun/toys.rsi/plushie_jungar.png b/Resources/Textures/ADT/Objects/Fun/toys.rsi/plushie_jungar.png deleted file mode 100644 index 40e3da9e3775c18e7251cb600667b4caaa056fef..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 256 zcmV+b0ssC|Nk&Ha00012MM6+kP&iEN0000lAHW9?cc3Veq~?AZ5Wp8#7{O{bfQ4j3 zZ6sUC*9bbGA^OhQQc{pJi2d!;Y|!VqW=>> z{!}9&MwG!Cf--}thXAqyOj>%B`FWVS_#p8KFv-v*p5;()=lP9VUMWq9FrCNy-Q8m# zFAwB_hX|QerC?TsC|Wd=Oh|wTfvN<+Ll{Hy0Avvc8icH|A^O&*nY@Lr2y#kDpE8)w GDf!WsA$6tz diff --git a/Resources/Textures/ADT/Objects/Fun/toys.rsi/plushie_migel.png b/Resources/Textures/ADT/Objects/Fun/toys.rsi/plushie_migel.png deleted file mode 100644 index 271641b12a6990aeed4e52a70bf0a80eb39ff827..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 412 zcmV;N0b~ABNk&GL0RRA3MM6+kP&iD70RR9mAHW9?=fI}6wl+V#j%~#TdQpK4Mhx_1 z%^DkQBiU;61~Qvc4gE(@h4&znN^D}=YIFxWhAIaKRCvb(KJu=M`40d99KZnTk8bfs zG;cr<(krd>`(A)6tk5)52$iCaFcGAg^5|B1c6nC5R=IY0_ILeiD5r6#6tHaDYTJN= zT)|CUX#NwmgGl|p@7{?1Pk{SZju<2X)zGsGMpCuJuFWuV7%K>X*oHN?9Y+H&l!@$G zh4yV2&5TqLNOtWQ@(KkT%t($!2C}pEQzOaIZG;N();7nFg*)CC?x-lMs1K4lk(6+$ zafT#3Pm%zuVdp2{%>bOp8Y@pv55RCbudZUq15X|X1C_(Jp=;Hg{p-0A4z@)-yK&k# z-mF0wyJI+P7>AyiAejUU#PPsNctN0!YgvAoAx#p9UI?*F>o{PZAP7b%hq#u76qS^* zD!q+DC`%9B;`L4vkfa>o%H!jfysjh^AG$>(x8;`PV*(WIaZ53|%~9UH_qU|zzSK+Z GHw6GVU%Y7m diff --git a/Resources/Textures/ADT/Objects/Fun/toys.rsi/plushie_teo.png b/Resources/Textures/ADT/Objects/Fun/toys.rsi/plushie_teo.png deleted file mode 100644 index 5a109b022442220d7ac60e43c2467b2e4f05d261..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 432 zcmV;h0Z;x?Nk&Gf0RRA3MM6+kP&iDR0RR9mAHW9?kHI#wZ6)`9_xu+i6ks9r-wP3; zw!t<4z%p@dbM(f4dU>9x$u_cWCHK2a`hRL<^g@4RG)56*I{yIx07wX$N?O_@uy3e4&ZtO3D_b_=zE| zw~tBzVL}$&_7+gPNX%UPh0V8%t<{Au^vtZckJ|VAv5BKhH_sNH937K#Up`q)#B+=? zy3Ll>&UuxNiIQNn8>w1$yk4i;VqLO8WY0T7JH)uscyTE^s?mw6of7NCr3zSfdN0dj zyfA=zqeEuHtV5Q1p;OgGt7Ze+95Ar9Ve3v+H%x7-wkK6dQngxa?H3QKwSxknfsnMi aCzVL!5Y^xU&T}^=;e68Nr{Dt4Zwde_t Date: Sun, 31 Dec 2023 04:23:13 +0300 Subject: [PATCH 3/5] =?UTF-8?q?=D0=98=D0=B3=D1=80=D1=83=D1=88=D0=BA=D0=B8.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Locale/ru-RU/ADT/Fun/ADTtoys.ftl | 9 +++++ .../ADT/Entities/Objects/Fun/toys.yml | 31 +++++++++++++++++- .../ADT/Objects/Fun/toys.rsi/meta.json | 16 +++++++-- .../Objects/Fun/toys.rsi/plushie_jungar.png | Bin 0 -> 256 bytes .../Objects/Fun/toys.rsi/plushie_migel.png | Bin 0 -> 412 bytes .../ADT/Objects/Fun/toys.rsi/plushie_teo.png | Bin 0 -> 432 bytes 6 files changed, 52 insertions(+), 4 deletions(-) create mode 100644 Resources/Textures/ADT/Objects/Fun/toys.rsi/plushie_jungar.png create mode 100644 Resources/Textures/ADT/Objects/Fun/toys.rsi/plushie_migel.png create mode 100644 Resources/Textures/ADT/Objects/Fun/toys.rsi/plushie_teo.png diff --git a/Resources/Locale/ru-RU/ADT/Fun/ADTtoys.ftl b/Resources/Locale/ru-RU/ADT/Fun/ADTtoys.ftl index 0ae4bea95fc..878f49bc7c3 100644 --- a/Resources/Locale/ru-RU/ADT/Fun/ADTtoys.ftl +++ b/Resources/Locale/ru-RU/ADT/Fun/ADTtoys.ftl @@ -7,3 +7,12 @@ ent-ADTPlushieJessie = плюшевая Джесси ent-ADTCrateFunAdminPlushie = Ящик милых плюшевых игрушек .desc = Куча мягких милых плюшевых игрушек. Разложите их повсюду, а потом подумайте, как вы объясните эту покупку NT. + +ent-ADTPlushieJungar = плюшевый Джунгарик + .desc = Джунгарский плюшевый хомячок, маленький, пушистый и пузатенький! В его крохотных лапках виднеется кусочек сыра, который пахнет как сырные шарики. На его мордочке застыло выражение удивления. Этикетка, висящая у него под ножкой, имеет надпись: "Джунга-джунга, джунгарёк, принеси-ка мне сырок!". + +ent-ADTPlushieMigel = плюшевый Мигель + .desc = Плюшевый Мига, Мигеля, Мигелюшка. О-о да, этот загорелый парень будто сошёл с обложки всеми любимого приключенческого сай-фай фильма. Он красив, смел, харизматичен и добр. Верность друзьям и жажда справедливости – два главных его имени. А также "Мать вашу, как это работает?" и "Господи, прошу, дай мне сил.." + +ent-ADTPlushieTeo = плюшевый Тео + .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 3a9b404ee24..9f34cd3495a 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Fun/toys.yml @@ -83,7 +83,7 @@ heldPrefix: garbagerama - type: ItemCooldown - + - type: entity parent: BasePlushie id: ADTPlushieJessie @@ -444,3 +444,32 @@ sprite: ADT/Objects/Fun/toys.rsi state: plushie_ma +- type: entity + parent: BasePlushie + id: ADTPlushieJungar + name: Djessie plushie + description: It looks like a soft and cute blondie. + components: + - type: Sprite + sprite: ADT/Objects/Fun/toys.rsi + state: plushie_jungar + +- type: entity + parent: BasePlushie + id: ADTPlushieMigel + name: Djessie plushie + description: It looks like a soft and cute blondie. + components: + - type: Sprite + sprite: ADT/Objects/Fun/toys.rsi + state: plushie_migel + +- type: entity + parent: BasePlushie + id: ADTPlushieTeo + name: Djessie plushie + description: It looks like a soft and cute blondie. + components: + - type: Sprite + sprite: ADT/Objects/Fun/toys.rsi + state: plushie_teo diff --git a/Resources/Textures/ADT/Objects/Fun/toys.rsi/meta.json b/Resources/Textures/ADT/Objects/Fun/toys.rsi/meta.json index 8d504082ea2..6899bf06512 100644 --- a/Resources/Textures/ADT/Objects/Fun/toys.rsi/meta.json +++ b/Resources/Textures/ADT/Objects/Fun/toys.rsi/meta.json @@ -114,7 +114,17 @@ }, { "name": "plushie_ma" - } - ] -} + }, + { "name": "plushie_jungar" + + }, + { "name": "plushie_migel" + + }, + { "name": "plushie_teo" + + } + +] +} diff --git a/Resources/Textures/ADT/Objects/Fun/toys.rsi/plushie_jungar.png b/Resources/Textures/ADT/Objects/Fun/toys.rsi/plushie_jungar.png new file mode 100644 index 0000000000000000000000000000000000000000..40e3da9e3775c18e7251cb600667b4caaa056fef GIT binary patch literal 256 zcmV+b0ssC|Nk&Ha00012MM6+kP&iEN0000lAHW9?cc3Veq~?AZ5Wp8#7{O{bfQ4j3 zZ6sUC*9bbGA^OhQQc{pJi2d!;Y|!VqW=>> z{!}9&MwG!Cf--}thXAqyOj>%B`FWVS_#p8KFv-v*p5;()=lP9VUMWq9FrCNy-Q8m# zFAwB_hX|QerC?TsC|Wd=Oh|wTfvN<+Ll{Hy0Avvc8icH|A^O&*nY@Lr2y#kDpE8)w GDf!WsA$6tz literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Fun/toys.rsi/plushie_migel.png b/Resources/Textures/ADT/Objects/Fun/toys.rsi/plushie_migel.png new file mode 100644 index 0000000000000000000000000000000000000000..271641b12a6990aeed4e52a70bf0a80eb39ff827 GIT binary patch literal 412 zcmV;N0b~ABNk&GL0RRA3MM6+kP&iD70RR9mAHW9?=fI}6wl+V#j%~#TdQpK4Mhx_1 z%^DkQBiU;61~Qvc4gE(@h4&znN^D}=YIFxWhAIaKRCvb(KJu=M`40d99KZnTk8bfs zG;cr<(krd>`(A)6tk5)52$iCaFcGAg^5|B1c6nC5R=IY0_ILeiD5r6#6tHaDYTJN= zT)|CUX#NwmgGl|p@7{?1Pk{SZju<2X)zGsGMpCuJuFWuV7%K>X*oHN?9Y+H&l!@$G zh4yV2&5TqLNOtWQ@(KkT%t($!2C}pEQzOaIZG;N();7nFg*)CC?x-lMs1K4lk(6+$ zafT#3Pm%zuVdp2{%>bOp8Y@pv55RCbudZUq15X|X1C_(Jp=;Hg{p-0A4z@)-yK&k# z-mF0wyJI+P7>AyiAejUU#PPsNctN0!YgvAoAx#p9UI?*F>o{PZAP7b%hq#u76qS^* zD!q+DC`%9B;`L4vkfa>o%H!jfysjh^AG$>(x8;`PV*(WIaZ53|%~9UH_qU|zzSK+Z GHw6GVU%Y7m literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Fun/toys.rsi/plushie_teo.png b/Resources/Textures/ADT/Objects/Fun/toys.rsi/plushie_teo.png new file mode 100644 index 0000000000000000000000000000000000000000..5a109b022442220d7ac60e43c2467b2e4f05d261 GIT binary patch literal 432 zcmV;h0Z;x?Nk&Gf0RRA3MM6+kP&iDR0RR9mAHW9?kHI#wZ6)`9_xu+i6ks9r-wP3; zw!t<4z%p@dbM(f4dU>9x$u_cWCHK2a`hRL<^g@4RG)56*I{yIx07wX$N?O_@uy3e4&ZtO3D_b_=zE| zw~tBzVL}$&_7+gPNX%UPh0V8%t<{Au^vtZckJ|VAv5BKhH_sNH937K#Up`q)#B+=? zy3Ll>&UuxNiIQNn8>w1$yk4i;VqLO8WY0T7JH)uscyTE^s?mw6of7NCr3zSfdN0dj zyfA=zqeEuHtV5Q1p;OgGt7Ze+95Ar9Ve3v+H%x7-wkK6dQngxa?H3QKwSxknfsnMi aCzVL!5Y^xU&T}^=;e68Nr{Dt4Zwde_t Date: Sun, 31 Dec 2023 04:29:17 +0300 Subject: [PATCH 4/5] Update meta.json --- Resources/Textures/ADT/Objects/Fun/toys.rsi/meta.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Resources/Textures/ADT/Objects/Fun/toys.rsi/meta.json b/Resources/Textures/ADT/Objects/Fun/toys.rsi/meta.json index 4fa8fe5e2f0..027d286736f 100644 --- a/Resources/Textures/ADT/Objects/Fun/toys.rsi/meta.json +++ b/Resources/Textures/ADT/Objects/Fun/toys.rsi/meta.json @@ -133,6 +133,5 @@ { "name": "plushie_teo" } - -] + ] } From ccc31d98ad4a22100c14f8632081fd49f91d99a5 Mon Sep 17 00:00:00 2001 From: Schrodinger71 <132720404+Schrodinger71@users.noreply.github.com> Date: Sun, 31 Dec 2023 04:44:38 +0300 Subject: [PATCH 5/5] Update toys.yml --- .../ADT/Entities/Objects/Fun/toys.yml | 61 ++++++++++--------- 1 file changed, 31 insertions(+), 30 deletions(-) diff --git a/Resources/Prototypes/ADT/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/ADT/Entities/Objects/Fun/toys.yml index 0d9aed2cbe7..23b11fc6889 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Fun/toys.yml @@ -83,6 +83,37 @@ heldPrefix: garbagerama - type: ItemCooldown +- type: entity + parent: BasePlushie + id: ADTPlushieMiniPinkShark + name: mini shark plushie + description: A pretty old plushie, that got a refresh. Looks well-groomed and washed. There is a label on it that says "My luck will be always with you. Timri.K." + components: + - type: Sprite + sprite: ADT/Objects/Fun/toys.rsi + state: shark_mini_pink + - type: Item + size: Tiny + sprite: ADT/Objects/Fun/toys.rsi + heldPrefix: shark + - type: EmitSoundOnUse + sound: + path: /Audio/ADT/Items/Toys/soundshark.ogg + - type: EmitSoundOnActivate + sound: + path: /Audio/ADT/Items/Toys/soundshark.ogg + - type: EmitSoundOnCollide + sound: + path: /Audio/ADT/Items/Toys/soundshark.ogg + - type: EmitSoundOnLand + sound: + path: /Audio/ADT/Items/Toys/soundshark.ogg + - type: MeleeWeapon + soundHit: + path: /Audio/ADT/Items/Toys/soundshark.ogg + damage: + types: + Blunt: 0 - type: entity parent: BasePlushie @@ -444,36 +475,6 @@ sprite: ADT/Objects/Fun/toys.rsi state: plushie_ma - id: ADTPlushieMiniPinkShark - name: mini shark plushie - description: A pretty old plushie, that got a refresh. Looks well-groomed and washed. There is a label on it that says "My luck will be always with you. Timri.K." - components: - - type: Sprite - sprite: ADT/Objects/Fun/toys.rsi - state: shark_mini_pink - - type: Item - size: Tiny - sprite: ADT/Objects/Fun/toys.rsi - heldPrefix: shark - - type: EmitSoundOnUse - sound: - path: /Audio/ADT/Items/Toys/soundshark.ogg - - type: EmitSoundOnActivate - sound: - path: /Audio/ADT/Items/Toys/soundshark.ogg - - type: EmitSoundOnCollide - sound: - path: /Audio/ADT/Items/Toys/soundshark.ogg - - type: EmitSoundOnLand - sound: - path: /Audio/ADT/Items/Toys/soundshark.ogg - - type: MeleeWeapon - soundHit: - path: /Audio/ADT/Items/Toys/soundshark.ogg - damage: - types: - Blunt: 0 - - type: entity parent: BasePlushie id: ADTPlushieJungar