From c6bd16719bed007df7bf59b4da04fdf5062d4946 Mon Sep 17 00:00:00 2001 From: variarti <1.aaaaaa@mail.ru> Date: Mon, 9 Dec 2024 16:12:08 +0500 Subject: [PATCH 1/4] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB?= =?UTF-8?q?=20=D1=84=D0=B8=D0=B3=D1=83=D1=80=D0=BA=D1=83=20=D0=BA=D0=BE?= =?UTF-8?q?=D1=82=D0=B0=20=D0=B8=D0=B7=20=D0=BC=D0=B5=D0=BC=D0=B0=20"?= =?UTF-8?q?=D0=91=D1=83,=20=D0=B8=D1=81=D0=BF=D1=83=D0=B3=D0=B0=D0=BB?= =?UTF-8?q?=D1=81=D1=8F=3F"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Locale/en-US/datasets/figurines.ftl | 5 +++++ Resources/Locale/ru-RU/datasets/figurines.ftl | 4 ++++ .../prototypes/entities/objects/fun/figurines.ftl | 2 ++ Resources/Prototypes/Datasets/figurines.yml | 6 ++++++ .../Prototypes/Entities/Objects/Fun/figurines.yml | 11 +++++++++++ .../Objects/Fun/figurines.rsi/boo_cat.png | Bin 0 -> 650 bytes .../Textures/Objects/Fun/figurines.rsi/meta.json | 3 +++ 7 files changed, 31 insertions(+) create mode 100644 Resources/Textures/Objects/Fun/figurines.rsi/boo_cat.png diff --git a/Resources/Locale/en-US/datasets/figurines.ftl b/Resources/Locale/en-US/datasets/figurines.ftl index 183135a4be..8b443e8c33 100644 --- a/Resources/Locale/en-US/datasets/figurines.ftl +++ b/Resources/Locale/en-US/datasets/figurines.ftl @@ -1,6 +1,11 @@ figurines-hop-1 = Papers, please. figurines-hop-2 = You are fired. +figurines-boo-cat-1 = Boo! Are you scared? Don't be afraid, I'm a friend, I won't hurt you. +figurines-boo-cat-2 = Come here, come to me, sit next to me, look into my eyes. +figurines-boo-cat-3 = Do you see me? I can see you too. +figurines-boo-cat-4 = Don't you want to? Why? Is something wrong? + figurines-passenger-1 = Insuls please. figurines-passenger-2 = Call evac. diff --git a/Resources/Locale/ru-RU/datasets/figurines.ftl b/Resources/Locale/ru-RU/datasets/figurines.ftl index e354b5a64b..20b4802ba6 100644 --- a/Resources/Locale/ru-RU/datasets/figurines.ftl +++ b/Resources/Locale/ru-RU/datasets/figurines.ftl @@ -1,5 +1,9 @@ figurines-hop-1 = Бумаги, пожалуйста. figurines-hop-2 = Вы уволены. +figurines-boo-cat-1 = Бу! Испугался? Не бойся, я друг, я тебя не обижу. +figurines-boo-cat-2 = Иди сюда, иди ко мне, сядь рядом со мной, посмотри мне в глаза. +figurines-boo-cat-3 = Ты видишь меня? Я тоже тебя вижу. +figurines-boo-cat-4 = Ты не хочешь? Почему? Что-то не так? figurines-passenger-1 = Изоли пожалуйста. figurines-passenger-2 = Вызывайте эвак. figurines-greytider-1 = Чувак, эта вечеринка отстой. Я, бля, ненавижу этих людей. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/fun/figurines.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/fun/figurines.ftl index a0b8f744e5..8246ef8e02 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/fun/figurines.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/fun/figurines.ftl @@ -2,6 +2,8 @@ ent-BaseFigurine = фигурка .desc = Небольшая миниатюра. ent-ToyFigurineHeadOfPersonnel = фигурка главы персонала .desc = Фигурка, изображающая прославленного главу всея персонала, как обычно, отсутствующего в своём кабинете. +ent-ToyFigurineBooCat = фигурка зловещего кота + .desc = Фигурка, изображающая зловещего кота, который обычно обитает в темноте технических туннелей. ent-ToyFigurinePassenger = фигурка ассистента .desc = Фигурка, изображающая обычного заурядного ассистента. Никаких приколов. ent-ToyFigurineGreytider = фигурка грейтайдера diff --git a/Resources/Prototypes/Datasets/figurines.yml b/Resources/Prototypes/Datasets/figurines.yml index e312debd90..642e8681cb 100644 --- a/Resources/Prototypes/Datasets/figurines.yml +++ b/Resources/Prototypes/Datasets/figurines.yml @@ -4,6 +4,12 @@ prefix: figurines-hop- count: 2 +- type: localizedDataset + id: FigurinesBooCat + values: + prefix: figurines-boo-cat- + count: 4 + - type: localizedDataset id: FigurinesPassenger values: diff --git a/Resources/Prototypes/Entities/Objects/Fun/figurines.yml b/Resources/Prototypes/Entities/Objects/Fun/figurines.yml index 5f962b90c8..fe6c0736a4 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/figurines.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/figurines.yml @@ -33,6 +33,17 @@ - type: SpeakOnUse pack: FigurinesHoP +- type: entity + parent: BaseFigurine + id: ToyFigurineBooCat + name: sinister cat figure + description: A figurine depicting a sinister cat that usually lives in the darkness of technical tunnels. + components: + - type: Sprite + state: boo_cat + - type: SpeakOnUse + pack: FigurinesBooCat + - type: entity parent: BaseFigurine id: ToyFigurinePassenger diff --git a/Resources/Textures/Objects/Fun/figurines.rsi/boo_cat.png b/Resources/Textures/Objects/Fun/figurines.rsi/boo_cat.png new file mode 100644 index 0000000000000000000000000000000000000000..ae0123f33e73a85b8ac36d160938d0b108159492 GIT binary patch literal 650 zcmV;50(Jd~P)Px%L`g(JR9J=Wl|N`xQ5431YM!rRUYevdk%|@*YHeb9E`p$iCLN?}g$!9LPH*f| z!KH(X;N+%I5QoG~+NFrepo5YYp%B4@Xlo%#z)I6JO-W-6*CFsqAhz!YM1*|X`E$SX zy>srl54z~0i~kL?)04u8ghjiU5ebXg>B+XSKjC;MA_n?2jH&A_g^Wm8^xKa~bJ;o( zaIMixQu|5l@toK#m(Uzea_`?UW;;u=@#F6b21?Lu%ZqhT6qS0t275bFe3n~fL_@-N#%tQ?YzBQK&@@zV zD2h1Cycya1q94)QJXTI#^ec%WsbeyIUG^tG9>NI8wmO%^QMR5x>{Pd5;5!{WRtJueP}k#YVZZM}D(> kAVzf`DWZ!my7;H~4c0utLF@IpQ~&?~07*qoM6N<$f Date: Mon, 9 Dec 2024 16:49:56 +0500 Subject: [PATCH 2/4] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B8=D0=BB?= =?UTF-8?q?=20=D1=81=D0=BF=D1=80=D0=B0=D0=B9=D1=82=20=D0=BA=D0=BE=D1=82?= =?UTF-8?q?=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Locale/ru-RU/datasets/figurines.ftl | 2 +- .../Objects/Fun/figurines.rsi/boo_cat.png | Bin 650 -> 675 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Locale/ru-RU/datasets/figurines.ftl b/Resources/Locale/ru-RU/datasets/figurines.ftl index 20b4802ba6..8a888afc5b 100644 --- a/Resources/Locale/ru-RU/datasets/figurines.ftl +++ b/Resources/Locale/ru-RU/datasets/figurines.ftl @@ -1,7 +1,7 @@ figurines-hop-1 = Бумаги, пожалуйста. figurines-hop-2 = Вы уволены. figurines-boo-cat-1 = Бу! Испугался? Не бойся, я друг, я тебя не обижу. -figurines-boo-cat-2 = Иди сюда, иди ко мне, сядь рядом со мной, посмотри мне в глаза. +figurines-boo-cat-2 = Иди сюда, иди ко мне, посмотри мне в глаза. figurines-boo-cat-3 = Ты видишь меня? Я тоже тебя вижу. figurines-boo-cat-4 = Ты не хочешь? Почему? Что-то не так? figurines-passenger-1 = Изоли пожалуйста. diff --git a/Resources/Textures/Objects/Fun/figurines.rsi/boo_cat.png b/Resources/Textures/Objects/Fun/figurines.rsi/boo_cat.png index ae0123f33e73a85b8ac36d160938d0b108159492..bbe7ab73443a51f4f7123f13692007baa01fde90 100644 GIT binary patch delta 637 zcmV-@0)qXD1)~L!F@If2L_t(oh3%C)Xj4%b$A8hp+}k#xP19WapwLu^ul9mqsi8ve zAU4pUSg;T%)h#a4rHT$Nf}ma0!Mdn>1wj`pIyg8v2rUji&>=06#-@*$n8X`74p(m} z_HmC|T=JjpcfSAkIN#%3sGx!hBrrA-6Mv&$4?ARnAM-YB7=L6d{YG#*CHk~RST5W0 zwXqYT=&D5#%bXj3;9A3zfNN{YD#k`)LhtHi`sEBht&xVHpU(?fzRZ6@@9N~^>o;7Q zcqrx5aRmT;Rl6vcavadZsQyNLRbB#tAZA+&a1emybcFlmf-8(nc|MLWrvnl$U2RM49li|H5S$g))miwCrNY18Y zGDU**3e~DY z;ai!(Qx~NDNgIIG>rhqBmeXHrICK8yANi6tigmXN0DsjZD446}2M={Kers}jw;&NW zgkeM(>aDlW0(G?v_14oAR7u2*?c0Jx+z`6nK}fvi>GXH|_Qv5R(yj;qy51q3gwz%k z^D8`hzWU-BMwCSpJRUEmS%UnEj61+#1rl*Xgm-J0xe{RY--t%R67ex_e@FJTN>#y8 z1(b|QDt0qx1yE`LNWGe|_15!~1aH9NJB^NmEg0?HZ{Ma}s{{7v{gNxwgrce-v#7)|zh{>RXk`|#5!GvgQAxgkX(=<&GKeB1eRzw^Cw?zs=T=%S1N4YSje!ia=LyOT*3@82?hOKlU5Di5+iM!7O zfdBF((=UULMv!u(h%c1+mlB+xWea4RK>6(@>a1t7PUx3mqGJJ7RLr?B;{Y1E4J1BKNOX1oBPRu1wl z@>=S^%w2e(Wu|_w3y11BdDc;L)qMht@b!z|74Xf?5&3*Ts2{1Bd-I y<@&F-xemofxw1!ovwR>%bss6Bi!QqOr}z!lJi$Th^}1950000 Date: Mon, 9 Dec 2024 17:23:03 +0500 Subject: [PATCH 3/4] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB?= =?UTF-8?q?=20=D1=88=D0=B0=D0=BD=D1=81=20=D0=B2=D1=8B=D0=BF=D0=B0=D0=B4?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D1=8F,=20=D0=B2=20=D0=BA=D0=BE=D1=80=D0=BE?= =?UTF-8?q?=D0=B1=D0=BA=D0=B5=20=D1=81=20=D1=84=D0=B8=D0=B3=D1=83=D1=80?= =?UTF-8?q?=D0=BA=D0=B0=D0=BC=D0=B8=20=D0=B8=20=D0=B1=D0=B8=D0=B1=D0=BB?= =?UTF-8?q?=D0=B8=D0=BE=D1=82=D0=B5=D0=BA=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml | 3 ++- Resources/Prototypes/Entities/Objects/Fun/figurine_boxes.yml | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml index 48e8b1a178..625a5a465f 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml @@ -101,7 +101,7 @@ - ToyFigurineLawyer - ToyFigurineCargoTech - ToyFigurineSalvage - - ToyFigurineQuartermaster + - ToyFigurineQuartermaster - ToyFigurineChiefEngineer - ToyFigurineAtmosTech - ToyFigurineEngineer @@ -112,6 +112,7 @@ - ToyFigurineParamedic - ToyFigurineMedicalDoctor - ToyFigurineHeadOfPersonnel + - ToyFigurineBooCat - ToyFigurineLibrarian - ToyFigurineChaplain - ToyFigurineChef diff --git a/Resources/Prototypes/Entities/Objects/Fun/figurine_boxes.yml b/Resources/Prototypes/Entities/Objects/Fun/figurine_boxes.yml index dbbe86678f..6e9b4d9d56 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/figurine_boxes.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/figurine_boxes.yml @@ -118,6 +118,9 @@ - id: ToyFigurineRatKing prob: 0.30 orGroup: SpacemenFig + - id: ToyFigurineBooCat + prob: 0.50 + orGroup: SpacemenFig - id: ToyFigurineRatServant prob: 0.40 orGroup: SpacemenFig From d6bd41cb89f9e72270b576dd4150d1f391d59857 Mon Sep 17 00:00:00 2001 From: variarti <1.aaaaaa@mail.ru> Date: Mon, 9 Dec 2024 17:44:45 +0500 Subject: [PATCH 4/4] =?UTF-8?q?=D0=9A=D0=BE=D1=82=20=D1=81=D1=82=D0=B0?= =?UTF-8?q?=D0=BB=20=D0=BF=D0=BE=D1=85=D0=BE=D0=B6=20=D0=BD=D0=B0=20=D0=BA?= =?UTF-8?q?=D0=BE=D1=82=D0=B0,=20=D0=B0=20=D0=BD=D0=B5=20=D0=BD=D0=B0=20?= =?UTF-8?q?=D0=B7=D0=B0=D0=B9=D1=86=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Objects/Fun/figurines.rsi/boo_cat.png | Bin 675 -> 629 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/Resources/Textures/Objects/Fun/figurines.rsi/boo_cat.png b/Resources/Textures/Objects/Fun/figurines.rsi/boo_cat.png index bbe7ab73443a51f4f7123f13692007baa01fde90..e57841f7816ec7787a5c55e3b7dc0faea4fa1479 100644 GIT binary patch delta 591 zcmV-V0VnqiBXF)eDE@_D*HccB7U*fA=ho?`Z+UANy zg!iBBIrn`0?>YC}3l1DO_}_4DIwxfGn_-)5@?%QRx@5o8cYgx6tb>6IfXnAki=JqZ z4@-4EmfvIGBH-9sg_3N3xqmy59E_uR1bdSM+`TyqiVFAVnV8C=c?8M9xHJLjo;|#GMffz8rqN=l z+9DcJ@o6f?=QSoyUX+d}?EqGS3dbUbK%w>#gcZ)jU)ts<`Ed?5BCFyM!0@^ zc5A1gkk^H-r{J_ z8kQy@H3hBaDvzF5ZCTgTESuo*D41p&nyWJ5fDS8A$m?QoM;x=!2CV+;=`>g(0m}9| zxho-6g^ntqR!vIPMJs{o2cY!wwY_gWKSfZ&mVKw$>0k{*<%<)k{dzqnlh(s(%(C?#euKm(B=y6kTG$~f<7Kv}w=!Ap= d2M+!zz5+EsvVA2JVBi1%002ovPDHLkV1nX2Bdq`c delta 637 zcmV-@0)qYZ1fvCzF@If2L_t(oh3%C)Xj4%b$A8hp+}k#xP19WapwLu^ul9mqsi8ve zAU4pUSg;T%)h#a4rHT$Nf}ma0!Mdn>1wj`pIyg8v2rUji&>=06#-@*$n8X`74p(m} z_HmC|T=JjpcfSAkIN#%3sGx!hBrrA-6Mv&$4?ARnAM-YB7=L6d{YG#*CHk~RST5W0 zwXqYT=&D5#%bXj3;9A3zfNN{YD#k`)LhtHi`sEBht&xVHpU(?fzRZ6@@9N~^>o;7Q zcqrx5aRmT;Rl6vcavadZsQyNLRbB#tAZA+&a1emybcFlmf-8(nc|MLWrvnl$U2RM49li|H5S$g))miwCrNY18Y zGDU**3e~DY z;ai!(Qx~NDNgIIG>rhqBmeXHrICK8yANi6tigmXN0DsjZD446}2M={Kers}jw;&NW zgkeM(>aDlW0(G?v_14oAR7u2*?c0Jx+z`6nK}fvi>GXH|_Qv5R(yj;qy51q3gwz%k z^D8`hzWU-BMwCSpJRUEmS%UnEj61+#1rl*Xgm-J0xe{RY--t%R67ex_e@FJTN>#y8 z1(b|QDt0qx1yE`LNWGe|_15!~1aH9NJB^NmEg0?HZ{Ma}s{