From 7311b977a02743d8cbf57bf7508b1622f1854aed Mon Sep 17 00:00:00 2001 From: Adrian16199 <144424013+Adrian16199@users.noreply.github.com> Date: Mon, 12 Feb 2024 22:10:43 +0100 Subject: [PATCH 1/4] Felinid changes. (#666) * Felinid changes. A plan * Just slappin it together for a friend to see and help * Somethin somethin Cos I could be at yours on friday Tonight's at the place we started It's a long way back from sorry But here I go .... How does it feel, how does it feel Just tell me something I don't know what to tell you I don't know what to say I got into my head, i'm sorry i threw it away But i'm so glad you came back, even through all the pain Let me try and mend it, i can promise that i have changed Oh, let me give you all of me Can we just sort it out for real * just makin this less messy.... I guess * Just tell me somethin. How does it feel, how does it feel. * . * cleaning.... * Makes it work. Yey. * just a small change tbh. * okay maybe just a bit. * Hm, maybe.... * This feels bit better. * hopefully fixes yaml linter * Update Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/felinid.yml Co-authored-by: Debug <49997488+DebugOk@users.noreply.github.com> Signed-off-by: Adrian16199 <144424013+Adrian16199@users.noreply.github.com> * Doin the changes. * Renaming. * Renaming notes. --------- Signed-off-by: Adrian16199 <144424013+Adrian16199@users.noreply.github.com> Co-authored-by: Debug <49997488+DebugOk@users.noreply.github.com> --- .../Component/NoShoesSilentFootstepsComponent.cs | 9 +++++++++ .../Movement/Systems/SharedMoverController.cs | 10 ++++++++++ .../Entities/Mobs/Species/felinid.yml | 16 +++++++++++----- 3 files changed, 30 insertions(+), 5 deletions(-) create mode 100644 Content.Shared/DeltaV/StepTrigger/Component/NoShoesSilentFootstepsComponent.cs diff --git a/Content.Shared/DeltaV/StepTrigger/Component/NoShoesSilentFootstepsComponent.cs b/Content.Shared/DeltaV/StepTrigger/Component/NoShoesSilentFootstepsComponent.cs new file mode 100644 index 00000000000..ae2697b0ef0 --- /dev/null +++ b/Content.Shared/DeltaV/StepTrigger/Component/NoShoesSilentFootstepsComponent.cs @@ -0,0 +1,9 @@ +using Robust.Shared.GameStates; + +namespace Content.Shared.StepTrigger.Components; + + +[RegisterComponent, NetworkedComponent] +public sealed partial class NoShoesSilentFootstepsComponent : Component +{ +} diff --git a/Content.Shared/Movement/Systems/SharedMoverController.cs b/Content.Shared/Movement/Systems/SharedMoverController.cs index 92b953aca98..31a05b2004c 100644 --- a/Content.Shared/Movement/Systems/SharedMoverController.cs +++ b/Content.Shared/Movement/Systems/SharedMoverController.cs @@ -23,6 +23,7 @@ using Robust.Shared.Timing; using Robust.Shared.Utility; using PullableComponent = Content.Shared.Movement.Pulling.Components.PullableComponent; +using Content.Shared.StepTrigger.Components; // Delta V-NoShoesSilentFootstepsComponent namespace Content.Shared.Movement.Systems { @@ -46,6 +47,7 @@ public abstract partial class SharedMoverController : VirtualController [Dependency] protected readonly SharedPhysicsSystem Physics = default!; [Dependency] private readonly SharedTransformSystem _transform = default!; [Dependency] private readonly TagSystem _tags = default!; + [Dependency] private readonly IEntityManager _entities = default!; // Delta V-NoShoesSilentFootstepsComponent protected EntityQuery MoverQuery; protected EntityQuery MobMoverQuery; @@ -438,6 +440,14 @@ private bool TryGetSound( sound = moverModifier.FootstepSoundCollection; return true; } + + // If got the component in yml and no shoes = no sound. Delta V + if (_entities.TryGetComponent(uid, out NoShoesSilentFootstepsComponent? _) & + !_inventory.TryGetSlotEntity(uid, "shoes", out var _)) + { + return false; + } + // Delta V NoShoesSilentFootsteps till here. if (_inventory.TryGetSlotEntity(uid, "shoes", out var shoes) && TryComp(shoes, out var modifier)) diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/felinid.yml b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/felinid.yml index d95014d1675..cf161269b71 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/felinid.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/felinid.yml @@ -24,17 +24,24 @@ prototype: Felinid - type: Damageable damageModifierSet: Felinid + - type: SlowOnDamage + speedModifierThresholds: + 60: 0.85 # 0.7 is base speed. + 80: 0.75 # 0.5 is base speed. - type: MeleeWeapon soundHit: collection: Punch animation: WeaponArcClaw damage: types: - Blunt: 3 - Slash: 2 + Slash: 4 + Piercing: 1 +# - type: DiseaseCarrier +# naturalImmunities: +# - OwOnavirus - type: Speech speechSounds: Alto - - type: DamageOnHighSpeedImpact + - type: DamageOnHighSpeedImpact # Landing on all fours! damage: types: Blunt: 1 @@ -54,6 +61,7 @@ - type: SizeAttributeWhitelist # Frontier tall: true tallscale: 1 + - type: NoShoesSilentFootsteps - type: entity save: false @@ -65,5 +73,3 @@ components: - type: HumanoidAppearance species: Felinid - -#Nya~~ From 38643fd15a6759fdf789985a2bab67b67ac25e3a Mon Sep 17 00:00:00 2001 From: Adrian16199 <144424013+Adrian16199@users.noreply.github.com> Date: Fri, 8 Mar 2024 00:00:16 +0100 Subject: [PATCH 2/4] Fixes the 2 pixels in the fluffy tail. (#865) It has bothered me and today felt like fixin it. --- .../felinid_fluffy_tail_rings.png | Bin 2040 -> 2041 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Felinid/felinid_tails.rsi/felinid_fluffy_tail_rings.png b/Resources/Textures/DeltaV/Mobs/Customization/Felinid/felinid_tails.rsi/felinid_fluffy_tail_rings.png index 4e6a6d8dc0de8e79a8724c266ee253a140694f63..31b402d3381095001841550fa457badc32941290 100644 GIT binary patch delta 1594 zcmV-A2F3aK5BU#}B!6#dLqkw$V`BgSD3NuMyGz4R6vlsT6~zYybr5mrpyJSi4-mmc zD(F%jY6V|QlP0au#*nl~aTQz~1P9T@*WiDktKh022#O%$=+=qus<#o<>;HQ- zS98j6b?`L`kLb3O7nW&=t>taSTf!ZBCYcgG6b?HwpzxK_wK6{|PM7&zv6F~TfM4|t zrK?!0Vm;&Jg!_eia@m6ZJCFL37Q>pGmD(k{8<#j!L57Dc)2Y)!4z>j^d z^!E0)na}6jxBmEi?elZTd{5*M*Q?Cq>FMb!hj`uG+{_k>MY==89_G>VSuU3)xkSIb zzrSz0Iy;Ze=c@%@tyW+E%I^H2f(dAIaZ0e`jXM+J1c8BGOrI$KvJK%hWC1#|%VxB|*vZCk2UdjMmq zR+aX!2UJl3wf(25?g7Pk$o?(lfZNqu2@oLgy}&^gQ04y1a1W^Ekv;pWfPNoLOrvstRaW{baSjssbLzbrNQIAwb})1@@|dqJ=%4gk@Ji;V@nWvVT|nT{&c}yyKDH zgGKDaR8&8eW1*@78n;;mbk=jfJ5i#NRZ>AV8p2AXcC8$y8=W)$wB`*tHU68C1t_6+oqdF;F)Kdl-LN_nJ5a z2oNAZfB*pk1PBlyK$C9*Ka(&58h>ysfq2s7@O7-~?t7j1Yx|Y)BhU61|63mW=6)&f zt89Nf>7uItUtV4|>-Bp3mDQgSH@-eTKEA%E_LZhurj^ZC4_|9_(jiNK#v zS>49Jy1GhPq+9IP_RqMpim@M6(CzK*w*A-F*C%cNNiUu;gI;nBkHNj<-qp4c=&}Ne z#44+x$_k)|VOiP!$_gm#qY|m8fLiSMKCA#wU4e|pn+m9hJFt@+R6w0{gfwymoP_;; z5|*pqN3`KdSawF0CtPYq5tXVp*qA!#>VD4YLQ7eRmxYZ&(2>mrH$hfStFV zhrrH3-NQ*(G43nIe#JN&#%%3>e0fn7KH!^6XL@AJwPXuR@QtU{Hme;e2194f1y%-GfauLAl{Km~Nf z6~?6q^e!;2f+kx5ZPx4U;#>85a8DIj_J8VMz4z0@{#RxHtAJEMy)RbsBXD#970~~r zm8(zn@Bh86{!x8pS76oqUp=W9v)Vsg@NfG+amnfKj{gIwA0coq0>dh(=RKg4 zPCzjOMu)9dtFL}rEEXq?Hy#|l#E-l_SHjud-Carhryjpz{0&cBv&Vf8ljOb=U_$B* z(F2Se2wb|rzBhjl4kwv_dZ|1rR=&3P)2fd6URC)-)ive#RsFB}`Sq#io`3!8VFH!| sfr}IP?t_09*H{fAlR*MB7)(dtCo{`rg=9_NDF6Tf07*qoM6N<$f~$ott^fc4 delta 1585 zcmV-12G05U5BLv|B!6ycLqkw$V`BgSD3NuMy-Pw-7{-5UQIru;LqxPy^-+)_yDfb2mmg81>F5u?C58S;!t%}Hke`^GE2MK;8v z%iExcDUK9r@qcw2wHKP^DCEJ-y!uvUNMWFW%I##P$ z)y_G4gz%R9qFXpPgb}&lz4i-QfoL=IsZx>v000SaNRy%g8!+Kc8#xdFU{2;vl zQvwnYArX$@&gpg=aT}D(IN2`}YIPTO#-F|R#E!Zb7haQ50$r0Z0%d>TU;@9UTl*O!|Eri{Z$q4IIfd0%L@SlCoM3k0*V&)coLRf0fobO707>H@pt8rwepTfdJh({ z4^vV7RE~wJ3TWJB70^k~{gNj@U~&c2V-*xRWq#|ma@89S)yfs{yF9Y1!QsAO_Bf~< z3zhxfL)B~ACP08dtw5|kHlz*PVKu_}BI;<42zDU;J-*OwIjV-dEZFc+y2x z|35!Je{43J?N3&JM%?&$e}Dh_$%;FU^YZet%^@p~y&g!r`sz#eyf05{5d}VdN}cAw?8VN#bQy?|51O1MBvY-tZw69US6gw z(k*st`_;#5S zS&gS0WH+!nezbR(LwnLdr9I9_Z2!^6Wz{OrodbHS>6 zNqhna6xem6-{0TQ_dc&&fyUKG#VS;}`nPdC&Y`mU$&6jy|0Twz>_K<@(M zDrmM9(8p%8U3{xP2lrHgWv_q!yY`>5bEvKWEBjvsqyp-Fv63HwgA1sD{v)kieX2kI z_i*}Ex%bms`>XcdoJS!%-%nUMi1@m9Oo6w5lWitg3vX>Y8)>s{U8~{QlN+&maGKn1JO#;Oqpx`{Li( jHCBU@0RlA`^AY$5Nm^iu5i87+00000NkvXXu0mjff`%`P From 3d02c8bed580d5907579abc54a2f989193d76194 Mon Sep 17 00:00:00 2001 From: Adrian16199 <144424013+Adrian16199@users.noreply.github.com> Date: Mon, 12 Feb 2024 22:11:43 +0100 Subject: [PATCH 3/4] Make felinids scream in agony when sprayed with water. (#556) * Make felinids scream in agony when sprayed with water. Their screams will be heard thro walls and halls. You will hear a felinid scream in a shift atleast once. Their sheer agony. * Giving probability as the best possible implementation as of now --------- Co-authored-by: Debug <49997488+DebugOk@users.noreply.github.com> --- .../Nyanotrasen/Entities/Mobs/Species/felinid.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/felinid.yml b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/felinid.yml index cf161269b71..628b62e2bb1 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/felinid.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/felinid.yml @@ -61,6 +61,21 @@ - type: SizeAttributeWhitelist # Frontier tall: true tallscale: 1 + - type: Reactive + groups: + Flammable: [ Touch ] + Extinguish: [ Touch ] + reactions: + - reagents: [ Water, SpaceCleaner ] + methods: [ Touch ] + effects: + - !type:WashCreamPieReaction + - reagents: [ Water ] + methods: [ Touch ] + effects: + - !type:Emote + emote: Scream + probability: 0.2 - type: NoShoesSilentFootsteps - type: entity From 5d3434b78351e62724f153435ff2feedaca0bec1 Mon Sep 17 00:00:00 2001 From: Dvir Date: Mon, 29 Apr 2024 20:06:48 +0300 Subject: [PATCH 4/4] "Fix felinid sprite shit" This PR https://github.com/DeltaV-Station/Delta-v/commit/89383ab646d6c6a00c4cd8e08964e0036c23901a --- .../Prototypes/DeltaV/typing_indicator.yml | 5 ++++ .../Entities/Mobs/Species/felinid.yml | 2 ++ .../DeltaV/Effects/speech.rsi/felinid0.png | Bin 0 -> 899 bytes .../DeltaV/Effects/speech.rsi/felinid1.png | Bin 0 -> 721 bytes .../DeltaV/Effects/speech.rsi/felinid2.png | Bin 0 -> 712 bytes .../DeltaV/Effects/speech.rsi/meta.json | 28 ++++++++++++++++++ 6 files changed, 35 insertions(+) create mode 100644 Resources/Prototypes/DeltaV/typing_indicator.yml create mode 100644 Resources/Textures/DeltaV/Effects/speech.rsi/felinid0.png create mode 100644 Resources/Textures/DeltaV/Effects/speech.rsi/felinid1.png create mode 100644 Resources/Textures/DeltaV/Effects/speech.rsi/felinid2.png create mode 100644 Resources/Textures/DeltaV/Effects/speech.rsi/meta.json diff --git a/Resources/Prototypes/DeltaV/typing_indicator.yml b/Resources/Prototypes/DeltaV/typing_indicator.yml new file mode 100644 index 00000000000..a3fc2fbcfb9 --- /dev/null +++ b/Resources/Prototypes/DeltaV/typing_indicator.yml @@ -0,0 +1,5 @@ +- type: typingIndicator + id: felinid + spritePath: /Textures/DeltaV/Effects/speech.rsi + typingState: felinid0 + offset: 0, 0.2 # 0625 diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/felinid.yml b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/felinid.yml index 628b62e2bb1..8e1242d2d7c 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/felinid.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/felinid.yml @@ -46,6 +46,8 @@ types: Blunt: 1 - type: Stamina + - type: TypingIndicator + proto: felinid - type: PseudoItem - type: Vocal wilhelm: "/Audio/Nyanotrasen/Voice/Felinid/cat_wilhelm.ogg" diff --git a/Resources/Textures/DeltaV/Effects/speech.rsi/felinid0.png b/Resources/Textures/DeltaV/Effects/speech.rsi/felinid0.png new file mode 100644 index 0000000000000000000000000000000000000000..586d1e6a343b2f9ed7f295291819c9f9905d7dc6 GIT binary patch literal 899 zcmV-}1AP36P)l(9dr-<1J{FO{Ay^ONFincozR8K8i!|56}a;_!ZCmgf#1*0;L`jS@Do}H1} zCA%AsBnjeZq$#jM9-jfJwq*9VZ}7)A&8m0|c{>zw#gQc^-hNRF($$oj5#5w0Pf_Lm zJ5Mh&JXG%98i&TmAb9P8@HTvvg5dKo2)>S>{sGSIs()2-8hsbNRMlep5Z!>&i>j91 zfwN8Mymxe0|B>othcX#>If1r$XupQYVmYhIImdU9T9;pR1-pCDEBB*I-_bc|^xxnq zzyJUM32;bRa{vGf5&!@T5&_cPe*6Fc0lY~>K~#8N?V7(!12Gteds5KNy_5JCh>MGx z|F45?Lig$-xC-JZZcc&<*EcnhnETOdxvwASb8y^|qbv=YZxT50R^W zKHr{XEbR69XsmVwP0R2{#xfXcrG@Bzn>ov(qw|^cus$`>)kNr2b52%I2!o@F+&*#1MdzTpU1FTkH`h@@lAOHafKmY;|fB*y_009U<00Izz00eeU ZUzcsbCj%Xe(HCX<|QwriLU%imTw_P;d}k z{2KfRx(coef}jW@j?R89QsTK*sEFQha~|G%-^0lp@J|&C(`g(Bv*_CKSX7%!&1=n1 z_z4iCow2mxSksBgB>%4W8+@u>M^vx>@BO)2mokn4z82vT!?ImrnTDxV*HXMG+-2m` zOTzoYVOs_izEHYe<44808ow&Glko}gtDai!2kSrB$lIpyfN;nxl#K6r)RzP^#o2_^ z9@)J(#EB6_L#M;4tVY4lC>N?i->LB~3roYysd z8%{T%`_4++=`X24wm+MN=VNF~LFW|&7HV02pL28z$u;>!m$0)7{c^u!@e>~qXc(-W zx)}ff010qNS#tmY3labT3lag+-G2N4009X}L_t(oN9~g_3&JoEg&QgAP;htj7l?y8 zxcPq_bQ9cL7eR0moQty{6rsM;JE3}%5Hw2wM9D-C;V zMg&8coXMC5<`c?TUyu&S5%yBd+uod6NC?b|!eop{U>aG5qox`t=@JDd;M?;}PY9GA zp2OAqH#9KXBF1bO%R4AG02;KM^4 zBuyQgYT%P@)%Wp>-qceGC;=s)1eAahPy$Ne4+z`=g0EB#V{wto00000NkvXXu0mjf DP!vS` literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Effects/speech.rsi/felinid2.png b/Resources/Textures/DeltaV/Effects/speech.rsi/felinid2.png new file mode 100644 index 0000000000000000000000000000000000000000..abb5f04373eeaeb41d4e7946340372195b52cfb1 GIT binary patch literal 712 zcmV;(0yq7MP)zcsbCj%Xe(HCX<|QwriLU%imTw_P;d}k z{2KfRx(coef}jW@j?R89QsTK*sEFQha~|G%-^0lp@J|&C(`g(Bv*_CKSX7%!&1=n1 z_z4iCow2mxSksBgB>%4W8+@u>M^vx>@BO)2mokn4z82vT!?ImrnTDxV*HXMG+-2m` zOTzoYVOs_izEHYe<44808ow&Glko}gtDai!2kSrB$lIpyfN;nxl#K6r)RzP^#o2_^ z9@)J(#EB6_L#M;4tVY4lC>N?i->LB~3roYysd z8%{T%`_4++=`X24wm+MN=VNF~LFW|&7HV02pL28z$u;>!m$0)7{c^u!@e>~qXc(-W zx)}ff010qNS#tmY3labT3lag+-G2N40096=L_t(oN9|KF3IZ_@yvTtTg1x0L5DT@i z^S>6_3HGOrU@KUQA2>LLIEz^c3DF!R2(k+yo9t$0ZZ0W`SL`uXCJ#+p6pmkdT9-TK zgwk3MkZ%GAYt%=r(IXC&rl-L?1WB!ws@!wfr+SuP2OdE0g1iA);SSnIoy4->WMWuA z36dKTb6`E=9Q%E&uUOxcF&iKju!sbnMD|6uu>kJ?zM5V}_Fw_t#j}5br6Tz=Q~*C< zObtn8-vjGDP&zm39p+^!Ye)dc1qr?Nw;L=5ZctATW1NcE#W@9l$q^F7qRzPle8Tna u$1g+(r#K)Ehy&t)I3Ny)1LDB{I`9Oll1NI}FYCwv0000