From 62df545d96e020158716ac8debd9e368821e26a8 Mon Sep 17 00:00:00 2001 From: Shegare <147345753+Shegare@users.noreply.github.com> Date: Fri, 6 Dec 2024 01:08:22 +0300 Subject: [PATCH 1/8] add cat tail animated --- Resources/Locale/ru-RU/markings/cat.ftl | 1 + .../Mobs/Customization/Markings/cat_parts.yml | 20 +++++++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/Resources/Locale/ru-RU/markings/cat.ftl b/Resources/Locale/ru-RU/markings/cat.ftl index 01f2598338..15db875cc1 100644 --- a/Resources/Locale/ru-RU/markings/cat.ftl +++ b/Resources/Locale/ru-RU/markings/cat.ftl @@ -1,2 +1,3 @@ marking-CatEars = Кошачьи уши marking-CatTail = Кошачий хвост +marking-CatTailAnimated = Кошачий хвост (виляющий) diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/cat_parts.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/cat_parts.yml index 4afad3cd4c..a1fbdce4ee 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/cat_parts.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/cat_parts.yml @@ -38,3 +38,23 @@ sprites: - sprite: Mobs/Customization/cat_parts.rsi state: tail_cat + +# Stories-CatTailAnimated-Start +- type: marking + id: CatTailAnimated + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [Human] + coloring: + default: + type: + !type:CategoryColoring + category: Hair + fallbackTypes: + - !type:CategoryColoring + category: FacialHair + - !type:SkinColoring + sprites: + - sprite: Mobs/Customization/cat_parts.rsi + state: tail_cat_wag +# Stories-CatTailAnimated-End From 792300fb29e42e716f183136a6103d99a7ebc24f Mon Sep 17 00:00:00 2001 From: Shegare <147345753+Shegare@users.noreply.github.com> Date: Fri, 6 Dec 2024 01:12:24 +0300 Subject: [PATCH 2/8] add vulpkanin tail --- Resources/Locale/ru-RU/markings/vulpkanin.ftl | 3 + .../Customization/Markings/vulpkanin_tail.yml | 57 ++++++++++++++++++ .../Vulpkanin/tail_markings.rsi/fluffy.png | Bin 0 -> 657 bytes .../tail_markings.rsi/fox_wag-fade.png | Bin 0 -> 1711 bytes .../Vulpkanin/tail_markings.rsi/fox_wag.png | Bin 0 -> 1990 bytes .../Vulpkanin/tail_markings.rsi/meta.json | 32 ++++++++++ .../tail_markings.rsi/vulp_wag-tip.png | Bin 0 -> 2786 bytes .../Vulpkanin/tail_markings.rsi/vulp_wag.png | Bin 0 -> 2712 bytes 8 files changed, 92 insertions(+) create mode 100644 Resources/Locale/ru-RU/markings/vulpkanin.ftl create mode 100644 Resources/Prototypes/Stories/Entities/Mobs/Customization/Markings/vulpkanin_tail.yml create mode 100644 Resources/Textures/Stories/Mobs/Customization/Vulpkanin/tail_markings.rsi/fluffy.png create mode 100644 Resources/Textures/Stories/Mobs/Customization/Vulpkanin/tail_markings.rsi/fox_wag-fade.png create mode 100644 Resources/Textures/Stories/Mobs/Customization/Vulpkanin/tail_markings.rsi/fox_wag.png create mode 100644 Resources/Textures/Stories/Mobs/Customization/Vulpkanin/tail_markings.rsi/meta.json create mode 100644 Resources/Textures/Stories/Mobs/Customization/Vulpkanin/tail_markings.rsi/vulp_wag-tip.png create mode 100644 Resources/Textures/Stories/Mobs/Customization/Vulpkanin/tail_markings.rsi/vulp_wag.png diff --git a/Resources/Locale/ru-RU/markings/vulpkanin.ftl b/Resources/Locale/ru-RU/markings/vulpkanin.ftl new file mode 100644 index 0000000000..be54395e46 --- /dev/null +++ b/Resources/Locale/ru-RU/markings/vulpkanin.ftl @@ -0,0 +1,3 @@ +marking-TailFluffy= Пушистый хвост +marking-VulpTailAnimated= Вульпканин-хвост (виляющий) +marking-TailFoxAnimated= Лисий хвост (виляющий) \ No newline at end of file diff --git a/Resources/Prototypes/Stories/Entities/Mobs/Customization/Markings/vulpkanin_tail.yml b/Resources/Prototypes/Stories/Entities/Mobs/Customization/Markings/vulpkanin_tail.yml new file mode 100644 index 0000000000..fdcb3309ca --- /dev/null +++ b/Resources/Prototypes/Stories/Entities/Mobs/Customization/Markings/vulpkanin_tail.yml @@ -0,0 +1,57 @@ +- type: marking + id: TailFluffy + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [Human] + coloring: + default: + type: + !type:CategoryColoring + category: Hair + fallbackTypes: + - !type:CategoryColoring + category: FacialHair + - !type:SkinColoring + sprites: + - sprite: Stories/Mobs/Customization/Vulpkanin/tail_markings.rsi + state: fluffy + +- type: marking + id: VulpTailAnimated + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [Human] + coloring: + default: + type: + !type:CategoryColoring + category: Hair + fallbackTypes: + - !type:CategoryColoring + category: FacialHair + - !type:SkinColoring + sprites: + - sprite: Stories/Mobs/Customization/Vulpkanin/tail_markings.rsi + state: vulp_wag + - sprite: Stories/Mobs/Customization/Vulpkanin/tail_markings.rsi + state: vulp_wag-tip + +- type: marking + id: TailFoxAnimated + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [Human] + coloring: + default: + type: + !type:CategoryColoring + category: Hair + fallbackTypes: + - !type:CategoryColoring + category: FacialHair + - !type:SkinColoring + sprites: + - sprite: Stories/Mobs/Customization/Vulpkanin/tail_markings.rsi + state: fox_wag + - sprite: Stories/Mobs/Customization/Vulpkanin/tail_markings.rsi + state: fox_wag-fade diff --git a/Resources/Textures/Stories/Mobs/Customization/Vulpkanin/tail_markings.rsi/fluffy.png b/Resources/Textures/Stories/Mobs/Customization/Vulpkanin/tail_markings.rsi/fluffy.png new file mode 100644 index 0000000000000000000000000000000000000000..a5c11e0012fa6e5cf992b454c3676e22fb7223e2 GIT binary patch literal 657 zcmV;C0&e|@P)XJhHl z5cKEzL+mWX&O&T$g}gU`l})(ZUGjXmM`j@SbvbwDKC*E~SJ!nhWt7FlK>;WL1)u;F zfC5ke3P1rU00p1`6o3Lyfa$^I9Q^TkeE*zvI2_!hMh@g}w_E*sy_!RdF$wbL^SLF! zSP_!<0DOTZ5gw06aXOveukZK!-!?&?dU~2!B9Ha{d_G&m7mG!)-EMn%1O*5+K*v@A z!aBZCtbH6y-B~Uh3F6%CcFAqQtq+w}uPZ|6#BT#r-#6ku4xyP*bvsN|)~X0T4xtUQ z(l0KTOEH_xOs{)^Y=WV+58`MCPSLA?G(=~jm{xA=W#&K8jaSDhvjc6kSiPw**3Ejo z_I3)aRx4AfrjFM)%EAGkU9Z>PRM~YqMMv}byrtY`vuWBnXDi(n5s(xiW<4_yJKo1* z=sv-vTrc)|a~ai-c?LB3 z90f=bA?gpXSP)4?a_lj001iCQp?aJex4c)TdILfRgl_|X{lg)p@FAXoW(f=-hRUma zp*4*03{-ui>+=Rky=}Q%nqBilJp+|KF{WS+8{$yUz}p`X^9D$zwaK2G&0J`VXP}f5 zW8MI%wVO<5e+NVcWvFMMLb@nrX1&h!iPBhV?N))_NBftEqS=M4a){vI+K rSjq#2cm`Z7A=1dD);@&Cj{pMzleq!O08qnW00000NkvXXu0mjfi#Q${ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Stories/Mobs/Customization/Vulpkanin/tail_markings.rsi/fox_wag-fade.png b/Resources/Textures/Stories/Mobs/Customization/Vulpkanin/tail_markings.rsi/fox_wag-fade.png new file mode 100644 index 0000000000000000000000000000000000000000..b30f422ec1b957da9b76fecad5ed23e4b2e92828 GIT binary patch literal 1711 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 C$r*A0 literal 0 HcmV?d00001 From 02ccc0b890aa5070992f4e191aa1ed25bec71f8a Mon Sep 17 00:00:00 2001 From: Shegare <147345753+Shegare@users.noreply.github.com> Date: Fri, 6 Dec 2024 01:49:50 +0300 Subject: [PATCH 3/8] add vulp ear --- Resources/Locale/ru-RU/markings/vulpkanin.ftl | 7 +- .../Customization/Markings/vulpkanin_ear.yml | 112 ++++++++++++++++++ .../ear_markings.rsi/fennec-inner.png | Bin 0 -> 453 bytes .../Vulpkanin/ear_markings.rsi/fennec.png | Bin 0 -> 571 bytes .../Vulpkanin/ear_markings.rsi/fox.png | Bin 0 -> 491 bytes .../ear_markings.rsi/jackal-inner.png | Bin 0 -> 381 bytes .../Vulpkanin/ear_markings.rsi/jackal.png | Bin 0 -> 544 bytes .../Vulpkanin/ear_markings.rsi/meta.json | 47 ++++++++ .../Vulpkanin/ear_markings.rsi/otie-inner.png | Bin 0 -> 258 bytes .../Vulpkanin/ear_markings.rsi/otie.png | Bin 0 -> 437 bytes .../Vulpkanin/ear_markings.rsi/vulp-inner.png | Bin 0 -> 303 bytes .../Vulpkanin/ear_markings.rsi/vulp.png | Bin 0 -> 386 bytes 12 files changed, 165 insertions(+), 1 deletion(-) create mode 100644 Resources/Prototypes/Stories/Entities/Mobs/Customization/Markings/vulpkanin_ear.yml create mode 100644 Resources/Textures/Stories/Mobs/Customization/Vulpkanin/ear_markings.rsi/fennec-inner.png create mode 100644 Resources/Textures/Stories/Mobs/Customization/Vulpkanin/ear_markings.rsi/fennec.png create mode 100644 Resources/Textures/Stories/Mobs/Customization/Vulpkanin/ear_markings.rsi/fox.png create mode 100644 Resources/Textures/Stories/Mobs/Customization/Vulpkanin/ear_markings.rsi/jackal-inner.png create mode 100644 Resources/Textures/Stories/Mobs/Customization/Vulpkanin/ear_markings.rsi/jackal.png create mode 100644 Resources/Textures/Stories/Mobs/Customization/Vulpkanin/ear_markings.rsi/meta.json create mode 100644 Resources/Textures/Stories/Mobs/Customization/Vulpkanin/ear_markings.rsi/otie-inner.png create mode 100644 Resources/Textures/Stories/Mobs/Customization/Vulpkanin/ear_markings.rsi/otie.png create mode 100644 Resources/Textures/Stories/Mobs/Customization/Vulpkanin/ear_markings.rsi/vulp-inner.png create mode 100644 Resources/Textures/Stories/Mobs/Customization/Vulpkanin/ear_markings.rsi/vulp.png diff --git a/Resources/Locale/ru-RU/markings/vulpkanin.ftl b/Resources/Locale/ru-RU/markings/vulpkanin.ftl index be54395e46..82023dacd0 100644 --- a/Resources/Locale/ru-RU/markings/vulpkanin.ftl +++ b/Resources/Locale/ru-RU/markings/vulpkanin.ftl @@ -1,3 +1,8 @@ +marking-VulpEar = Уши вульпканина +marking-VulpEarJackal = Уши шакала +marking-VulpEarFennec = Уши фенека +marking-VulpEarFox = Лисьи уши +marking-VulpEarOtie = Уши Оти marking-TailFluffy= Пушистый хвост marking-VulpTailAnimated= Вульпканин-хвост (виляющий) -marking-TailFoxAnimated= Лисий хвост (виляющий) \ No newline at end of file +marking-TailFoxAnimated= Лисий хвост (виляющий) diff --git a/Resources/Prototypes/Stories/Entities/Mobs/Customization/Markings/vulpkanin_ear.yml b/Resources/Prototypes/Stories/Entities/Mobs/Customization/Markings/vulpkanin_ear.yml new file mode 100644 index 0000000000..180c32fd99 --- /dev/null +++ b/Resources/Prototypes/Stories/Entities/Mobs/Customization/Markings/vulpkanin_ear.yml @@ -0,0 +1,112 @@ +- type: marking + id: VulpEar + bodyPart: HeadTop + markingCategory: HeadTop + speciesRestriction: [Human] + coloring: + default: + type: + !type:CategoryColoring + category: Hair + fallbackTypes: + - !type:SkinColoring + layers: + ears_cat_inner: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: Stories/Mobs/Customization/Vulpkanin/ear_markings.rsi + state: vulp + - sprite: Stories/Mobs/Customization/Vulpkanin/ear_markings.rsi + state: vulp-inner + +- type: marking + id: VulpEarJackal + bodyPart: HeadTop + markingCategory: HeadTop + speciesRestriction: [Human] + coloring: + default: + type: + !type:CategoryColoring + category: Hair + fallbackTypes: + - !type:SkinColoring + layers: + ears_cat_inner: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: Stories/Mobs/Customization/Vulpkanin/ear_markings.rsi + state: jackal + - sprite: Stories/Mobs/Customization/Vulpkanin/ear_markings.rsi + state: jackal-inner + +- type: marking + id: VulpEarFennec + bodyPart: HeadTop + markingCategory: HeadTop + speciesRestriction: [Human] + coloring: + default: + type: + !type:CategoryColoring + category: Hair + fallbackTypes: + - !type:SkinColoring + layers: + ears_cat_inner: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: Stories/Mobs/Customization/Vulpkanin/ear_markings.rsi + state: fennec + - sprite: Stories/Mobs/Customization/Vulpkanin/ear_markings.rsi + state: fennec-inner + +- type: marking + id: VulpEarFox + bodyPart: HeadTop + markingCategory: HeadTop + speciesRestriction: [Human] + coloring: + default: + type: + !type:CategoryColoring + category: Hair + fallbackTypes: + - !type:SkinColoring + layers: + ears_cat_inner: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: Stories/Mobs/Customization/Vulpkanin/ear_markings.rsi + state: fox + +- type: marking + id: VulpEarOtie + bodyPart: HeadTop + markingCategory: HeadTop + speciesRestriction: [Human] + coloring: + default: + type: + !type:CategoryColoring + category: Hair + fallbackTypes: + - !type:SkinColoring + layers: + ears_cat_inner: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: Stories/Mobs/Customization/Vulpkanin/ear_markings.rsi + state: otie + - sprite: Stories/Mobs/Customization/Vulpkanin/ear_markings.rsi + state: otie-inner diff --git a/Resources/Textures/Stories/Mobs/Customization/Vulpkanin/ear_markings.rsi/fennec-inner.png b/Resources/Textures/Stories/Mobs/Customization/Vulpkanin/ear_markings.rsi/fennec-inner.png new file mode 100644 index 0000000000000000000000000000000000000000..522ba6b4ce132e923c10081d1fbc191a1c3e5913 GIT binary patch literal 453 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+7}Gsn978H@y}9MMs@XuGA@Q?D1#kJi1ADFeA5GlTTb=*l zT=tGlJ_&M_MxTVXW_*;_I4WTB`RbBP+3h;s-=6$9DJQr7ztx$~Z}KN*&iYdrInD20 zd*Y9`!J$*@<&R(duG@7;{(0rQLvMWxew#c2`Y<^PfD4wC#gp1XX&EoT*F$vwTy~Rmrc&STKqO$EnjtW z>AM+ryO$q`ySrLBEo;vv{ch#YbJsfpeGCIa+Ya5|^!_;?h;O%vzjOcUJjZ@F;kmVqGJ}*tkQ=@z^#$8?&D;Ob@IQ zoN!(C9fM?ZpSsV#E58`H6Ic5^=;Am&DQfhu20pLVW-1t@C3`7STX85GJ8@W-xU?frww%-?niEjjD?x90WU{cCehTF447 ze=Nm#O%TNpXT5UGjivuW6q7>a4bHKo21h@w z&#lUB(z}>; literal 0 HcmV?d00001 diff --git a/Resources/Textures/Stories/Mobs/Customization/Vulpkanin/ear_markings.rsi/jackal-inner.png b/Resources/Textures/Stories/Mobs/Customization/Vulpkanin/ear_markings.rsi/jackal-inner.png new file mode 100644 index 0000000000000000000000000000000000000000..fa773690674ef149fbac2f8547804601f35306c0 GIT binary patch literal 381 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|TSJ zr;B4q#hkY{4Z99GNF4nb9U{6_;^Msj8GDy(Vtlm0{<6v2XVsZ=zbPLw7Yj3UkohLy z^kZ{*wEUy@pBXQ0cx*B6dG+?M;$jhI4pQ54Z@;b4U%Pvqbz);G^B?(tH|t)`+{ZM3 z3WLKuVvyv4>iVK{qJ{E5PDP$!2n`i2mi>1s(ubk;zIeIlymMDfe7^-JFs*o9CF`_f z!GueZmuBkxH)Z5GT(C7`|LPzA^4It;)gTu{)k%AkeQbcHpEuUwceX?y>F#SF;udt$dP{V=UL?aiGGcY|fjXHRq1j&i=dj zqQ)(~2d}QbF3s6~J7!Mqv77pLS(O<7*2(X_`|cUvhrb(dzW;t=la6?{+3bk**B$q( z3q4S;uf29NE!QE%qHJf(xvTP%Y7A$ez4P^uO|!>=qMb+f>iTioFm;^xSg|KMqk3=L zg&#_c`{%x&@!bB}k4N>5|JyhlihLNRBr`3L5oUNggF)jsi-V;a!zn|?fIbu{7S0Ev zAzPz#pV%HS{t!3mdRpr}o{x5R-%5WN8?ZlfVpIewcy&F?bPxBLR?Aieu?M}AFF5`e zn(zFgPlWr!>iZcc_ZG1kw4Z+Zs3tGy2vfy1v)O0+-MQ8;3DHumkrNJLKf<)*Xp(&k y$HR+{d)-+?4~B>Ti*9+ABJYIe5FBot<9|P9)$PLV+dF|#&fw|l=d#Wzp$P!UBUA_x#W(T{Sk7|VY%m@wQ81n z*Mg1Lr2Ni_@|`zu&|GSF_3nK>h39uxZQn2J;I%R|zy7$a0Q>K04^DN?b3CsAG!YkQ zIKQTX`@^{}(g(WA88#dHGOnp$H?W?3KhawNmlg(w2NUiv@i6@RKSa^lvj5d@uj7IluJP@?Wv{Bpxqjs`>wDlg|G~ z8eNah?bk^+uOhI;=7&PzV%z;|BK%nOnk2z@T~g(V^8+vJzMexewD>X zv?};FE*6RWzJ6cYB0jPIZ@-+kVKsTrsLl`cGcI5e(Q^FBMaFA$jvnWc46aC#<8?Uq zX!WW|ukr*A8Rl+c*`#y(uF(m-liR8r4Aaaf#~V*u&Uk9mm1@RkN)4EW^*{~Lr@31ut)Pb zxmbO^*IF4*=1iaYc&m@x`*|k?H|E?9^HK})vfp{_M{MD?NxQWc=oH0XKO7@_{=Vho zyv9u@YVY$Gr|xMr=5dIv*;3}goxVg(Li}^`947bPckyT6XSw))*I9lb`0=#h1FjrE zXJ7{gst%P}^{0X>{?1;xAhgXbwR>?*;cGnDO^cotA-2kzyx*pZ~Qd$g1w8ZD!SLm1UVmTdR-P z)?C%H45_%iZOi-WUs>{Bx5obdY8;#%s_d@j zJFKp1_^@-zyT$Tb7iTlB@wZ Date: Fri, 6 Dec 2024 01:54:11 +0300 Subject: [PATCH 4/8] meta correction for vulpakin tail --- .../Mobs/Customization/Vulpkanin/tail_markings.rsi/meta.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Resources/Textures/Stories/Mobs/Customization/Vulpkanin/tail_markings.rsi/meta.json b/Resources/Textures/Stories/Mobs/Customization/Vulpkanin/tail_markings.rsi/meta.json index b372b8f3b5..3da4b9f7f3 100644 --- a/Resources/Textures/Stories/Mobs/Customization/Vulpkanin/tail_markings.rsi/meta.json +++ b/Resources/Textures/Stories/Mobs/Customization/Vulpkanin/tail_markings.rsi/meta.json @@ -2,7 +2,10 @@ "version": 1, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/ParadiseSS13/Paradise edited by Floofers", - "size": {"x": 32, "y": 32}, + "size": { + "x": 32, + "y": 32 + }, "states": [ { "name": "fluffy", From 78d4e7ab4ef6a49b485dec489073470030ca0fe8 Mon Sep 17 00:00:00 2001 From: Shegare <147345753+Shegare@users.noreply.github.com> Date: Fri, 6 Dec 2024 18:11:14 +0300 Subject: [PATCH 5/8] Return of the cap --- .../Catalog/Fills/Lockers/dressers.yml | 1 + .../Entities/Structures/Machines/lathe.yml | 1 + .../Prototypes/Loadouts/loadout_groups.yml | 1 + .../Stories/Entities/Clothing/Head/hats.yml | 11 ++++++++ .../Stories/Loadouts/head_of_security.yml | 5 ++++ .../Stories/Recipes/Lathes/clothing.yml | 5 ++++ .../Head/Hats/hoshat.rsi/equipped-HELMET.png | Bin 0 -> 502 bytes .../Clothing/Head/Hats/hoshat.rsi/icon.png | Bin 0 -> 336 bytes .../Head/Hats/hoshat.rsi/inhand-left.png | Bin 0 -> 432 bytes .../Head/Hats/hoshat.rsi/inhand-right.png | Bin 0 -> 458 bytes .../Clothing/Head/Hats/hoshat.rsi/meta.json | 26 ++++++++++++++++++ 11 files changed, 50 insertions(+) create mode 100644 Resources/Prototypes/Stories/Loadouts/head_of_security.yml create mode 100644 Resources/Prototypes/Stories/Recipes/Lathes/clothing.yml create mode 100644 Resources/Textures/Stories/Clothing/Head/Hats/hoshat.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/Stories/Clothing/Head/Hats/hoshat.rsi/icon.png create mode 100644 Resources/Textures/Stories/Clothing/Head/Hats/hoshat.rsi/inhand-left.png create mode 100644 Resources/Textures/Stories/Clothing/Head/Hats/hoshat.rsi/inhand-right.png create mode 100644 Resources/Textures/Stories/Clothing/Head/Hats/hoshat.rsi/meta.json diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml b/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml index febfe23ad1..aaddc3f460 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml @@ -61,6 +61,7 @@ components: - type: StorageFill contents: + - id: ClothingHeadHatCapHoS # Stories - id: ClothingHeadHatBeretHoS - id: ClothingHeadHatHoshat - id: ClothingUniformJumpskirtHoSAlt diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 066c6d1b8c..e9567b5cde 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -1016,6 +1016,7 @@ - ClothingUniformJumpsuitHoP - ClothingUniformJumpskirtHoP - ClothingHeadHatBeretHoS + - ClothingHeadHatCapHoS # Stories - ClothingHeadHatHoshat - ClothingUniformJumpsuitHoS - ClothingUniformJumpskirtHoS diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml index eb26d66a93..2c73097ef6 100644 --- a/Resources/Prototypes/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/Loadouts/loadout_groups.yml @@ -1242,6 +1242,7 @@ loadouts: - HeadofSecurityHead - HeadofSecurityBeret + - HeadofSecurityBeretHatCap # Stories - type: loadoutGroup id: HeadofSecurityJumpsuit diff --git a/Resources/Prototypes/Stories/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Stories/Entities/Clothing/Head/hats.yml index 682f0013a9..49975683d1 100644 --- a/Resources/Prototypes/Stories/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/Stories/Entities/Clothing/Head/hats.yml @@ -13,3 +13,14 @@ - ClothMade - HamsterWearable - WhitelistChameleon + +- type: entity + parent: ClothingHeadBase + id: ClothingHeadHatCapHoS + name: фуражка главы службы безопасности + description: Прочная форменная фуражка начальника службы безопасности. Напоминает рядовым офицерам, кто здесь главный. + components: + - type: Sprite + sprite: Stories/Clothing/Head/Hats/hoshat.rsi + - type: Clothing + sprite: Stories/Clothing/Head/Hats/hoshat.rsi diff --git a/Resources/Prototypes/Stories/Loadouts/head_of_security.yml b/Resources/Prototypes/Stories/Loadouts/head_of_security.yml new file mode 100644 index 0000000000..773f92ecfd --- /dev/null +++ b/Resources/Prototypes/Stories/Loadouts/head_of_security.yml @@ -0,0 +1,5 @@ +# Head +- type: loadout + id: HeadofSecurityBeretHatCap + equipment: + head: ClothingHeadHatCapHoS diff --git a/Resources/Prototypes/Stories/Recipes/Lathes/clothing.yml b/Resources/Prototypes/Stories/Recipes/Lathes/clothing.yml new file mode 100644 index 0000000000..b3d26dc6dc --- /dev/null +++ b/Resources/Prototypes/Stories/Recipes/Lathes/clothing.yml @@ -0,0 +1,5 @@ +# Hats +- type: latheRecipe + parent: BaseCommandHatRecipe + id: ClothingHeadHatCapHoS + result: ClothingHeadHatCapHoS diff --git a/Resources/Textures/Stories/Clothing/Head/Hats/hoshat.rsi/equipped-HELMET.png b/Resources/Textures/Stories/Clothing/Head/Hats/hoshat.rsi/equipped-HELMET.png new file mode 100644 index 0000000000000000000000000000000000000000..4fd140a7eb5ec906deb337471df419ad4880e84c GIT binary patch literal 502 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zH+Z@@hE&XX zd&|&U#!=$f$Ng0k4mU?0isC$UH&OLP;rs(eu2It72e0Y1PIZ-Pb(m%HlTB0T(vnl{ z97Swvn#2Xx%t>OO!dbD-^+u|Gl*Q(EoDY9a-CX{AkM*0J&-;p9ByxC)8%%sRUSl$_ zvYgkw^Lp`f_WvudzkR+p?*F}C6*b3xe2;uQ`@@x=pBFwnrt)-MeeHKChHTwqDqnW} zwb{~O^|RIL=h_MK)$c#vyPUWE=bvY)4D#i9m8BCN?&Uwr7k0K>@9+$k=bJu7^*jhq ztFF|Q*U{T>X{YA(bL*pe)~VO*vY2~P&_GSm_j1wMsP5v(D}o(bJ2VyvNb4yf0VC_J zw<2BV?_2fKvT^yjHFu@gm}x%DU%Y9hFVOj)+dnDnvzNRgr~m8y(Zkl$r@qZ>c&uN| zv)!)c+J}sDsWsL6Pd$6rzp^xW(#oF=6M8wMCae$(sx4@EpTE1MtzGL~?GD?&Vm2Y? zlU;jHNKD>P_LIHg;3Fmm?YYuGN51+0>*fpd2N|Wd`kNTst_w5xO^^ZJ8R{kzX;GcRq&%M(DNv~y!ff32z>FVdQ&MBb@09{Jv-v9sr literal 0 HcmV?d00001 diff --git a/Resources/Textures/Stories/Clothing/Head/Hats/hoshat.rsi/icon.png b/Resources/Textures/Stories/Clothing/Head/Hats/hoshat.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..f47dbe99dc4333c66428854112ca6bd4c545a72f GIT binary patch literal 336 zcmV-W0k8gvP)Px$3Q0skR9J=Wlrc`jPz;8@RwW>$zEq0Dh?71(@IDb3l>FDPoR2|rC*PVrD8NHSyan3HC*Ts`KXYgWK^-DI}^?p$aAf8u(=ZsReDodG|_CcM4%n?x)O;eiOH*5?2z$Erftf~A1gHrZHBSEIJ z;5QD3L^>xsm3eG1m_4_3>Yw^GACO4UR3ine*spl{~|Tf}g#gXY(AJ;q)^qT|lYf+RWc!tnb5Dl~?3U z-YdH$I#^t~SK33}*rxVtcomZq3&-ILN2df`uv-0uQ$P>_E-w2azINH3*nKC$cklVe z>R}bT`-VEpgI&k%ezk7ZZ|F(-{i~vD^XlzOcL*>t?0ENaSL+8W`GD3x3ETHRjb2dt zj4$5pZ9W6T9oe}z%CfsI{z#vrIQI+#!{6q+m(DNv#(Ls8t5{)J11L03&1OFLYibeO T%yJ806fk(Y`njxgN@xNA-BqQV`XE1@x>gu8y>jofl8Q0h;G`6 zMxljL?M14!0T;Gic=3L->YaoCALjj%?|^_4^_$IJr`M*Nvl<)|a1~^DyZYLht(E3e zLmsqe3bX`sThFz&`d+?M Date: Fri, 6 Dec 2024 18:55:01 +0300 Subject: [PATCH 6/8] add lizard neck --- .../Prototypes/Loadouts/loadout_groups.yml | 1 + .../Stories/Loadouts/cargo_technician.yml | 17 +++++++++++++++++ 2 files changed, 18 insertions(+) create mode 100644 Resources/Prototypes/Stories/Loadouts/cargo_technician.yml diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml index 2c73097ef6..9f38abbf28 100644 --- a/Resources/Prototypes/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/Loadouts/loadout_groups.yml @@ -11,6 +11,7 @@ - StoriesWristwatchGold - ClothingNeckCloakCollector - ClothingNeckCloakAnomalist + - NeckLizard - ClothingNeckCloakSnake - ToyFigurineColossus - ToyFigurineAshDragon diff --git a/Resources/Prototypes/Stories/Loadouts/cargo_technician.yml b/Resources/Prototypes/Stories/Loadouts/cargo_technician.yml new file mode 100644 index 0000000000..dd0dabea18 --- /dev/null +++ b/Resources/Prototypes/Stories/Loadouts/cargo_technician.yml @@ -0,0 +1,17 @@ +- type: loadoutEffectGroup + id: CargoTechnicianNeckLizard + effects: + - !type:JobRequirementLoadoutEffect + requirement: + !type:RoleTimeRequirement + role: JobCargoTechnician + time: 36000 #10 hrs + +- type: loadout + id: NeckLizard + effects: + - !type:GroupLoadoutEffect + proto: CargoTechnicianNeckLizard + storage: + back: + - ClothingNeckCloakAdmin From 9d82683f1059d1dc92fa619595dba9f3f96b9d63 Mon Sep 17 00:00:00 2001 From: Shegare <147345753+Shegare@users.noreply.github.com> Date: Fri, 6 Dec 2024 22:55:58 +0300 Subject: [PATCH 7/8] add dog ears in uplink --- .../Locale/ru-RU/_stories/store/uplink-catalog.ftl | 3 +++ .../Prototypes/Stories/Catalog/uplink_catalog.yml | 10 ++++++++++ 2 files changed, 13 insertions(+) create mode 100644 Resources/Locale/ru-RU/_stories/store/uplink-catalog.ftl diff --git a/Resources/Locale/ru-RU/_stories/store/uplink-catalog.ftl b/Resources/Locale/ru-RU/_stories/store/uplink-catalog.ftl new file mode 100644 index 0000000000..7ab1694fc2 --- /dev/null +++ b/Resources/Locale/ru-RU/_stories/store/uplink-catalog.ftl @@ -0,0 +1,3 @@ +# Pointless +uplink-dog-ears-name = Собачьи ушки +uplink-dog-ears-desc = Тяф! diff --git a/Resources/Prototypes/Stories/Catalog/uplink_catalog.yml b/Resources/Prototypes/Stories/Catalog/uplink_catalog.yml index 1735c90bda..13cb4571c8 100644 --- a/Resources/Prototypes/Stories/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Stories/Catalog/uplink_catalog.yml @@ -53,3 +53,13 @@ whitelist: tags: - NukeOpsUplink + +- type: listing + id: UplinkDogEars + name: uplink-dog-ears-name + description: uplink-dog-ears-desc + productEntity: ClothingHeadHatDogEars + cost: + Telecrystal: 26 + categories: + - UplinkPointless From 3f50351821e1eea7b1fca32236a9eaee12f340eb Mon Sep 17 00:00:00 2001 From: Shegare <147345753+Shegare@users.noreply.github.com> Date: Fri, 6 Dec 2024 23:02:50 +0300 Subject: [PATCH 8/8] moving ftl to a folder _stories --- Resources/Locale/ru-RU/_stories/markings/cat.ftl | 1 + Resources/Locale/ru-RU/{ => _stories}/markings/vulpkanin.ftl | 0 Resources/Locale/ru-RU/markings/cat.ftl | 1 - 3 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 Resources/Locale/ru-RU/_stories/markings/cat.ftl rename Resources/Locale/ru-RU/{ => _stories}/markings/vulpkanin.ftl (100%) diff --git a/Resources/Locale/ru-RU/_stories/markings/cat.ftl b/Resources/Locale/ru-RU/_stories/markings/cat.ftl new file mode 100644 index 0000000000..ed71c7efcd --- /dev/null +++ b/Resources/Locale/ru-RU/_stories/markings/cat.ftl @@ -0,0 +1 @@ +marking-CatTailAnimated = Кошачий хвост (виляющий) \ No newline at end of file diff --git a/Resources/Locale/ru-RU/markings/vulpkanin.ftl b/Resources/Locale/ru-RU/_stories/markings/vulpkanin.ftl similarity index 100% rename from Resources/Locale/ru-RU/markings/vulpkanin.ftl rename to Resources/Locale/ru-RU/_stories/markings/vulpkanin.ftl diff --git a/Resources/Locale/ru-RU/markings/cat.ftl b/Resources/Locale/ru-RU/markings/cat.ftl index 15db875cc1..01f2598338 100644 --- a/Resources/Locale/ru-RU/markings/cat.ftl +++ b/Resources/Locale/ru-RU/markings/cat.ftl @@ -1,3 +1,2 @@ marking-CatEars = Кошачьи уши marking-CatTail = Кошачий хвост -marking-CatTailAnimated = Кошачий хвост (виляющий)