From 5c7b219f161ba5289b82d4fbdeb0e5104680c206 Mon Sep 17 00:00:00 2001 From: rhailrake <49613070+rhailrake@users.noreply.github.com> Date: Thu, 11 May 2023 07:08:04 +0600 Subject: [PATCH] [Fluff] shit happens --- Content.Server/Bible/BibleSystem.cs | 2 +- .../merkka}/EarsSpawnComponent.cs | 2 +- .../merkka}/EarsSpawnSystem.cs | 2 +- .../Fluff/HSKveez/hope.rsi/equipped-NECK.png | Bin 215 -> 616 bytes .../White/Fluff/HSKveez/hope.rsi/icon.png | Bin 552 -> 584 bytes .../White/Fluff/HSKveez/hope.rsi/meta.json | 74 +++++++++++------- 6 files changed, 50 insertions(+), 30 deletions(-) rename Content.Server/White/Other/{Lazy => CustomFluffSystems/merkka}/EarsSpawnComponent.cs (92%) rename Content.Server/White/Other/{Lazy => CustomFluffSystems/merkka}/EarsSpawnSystem.cs (98%) diff --git a/Content.Server/Bible/BibleSystem.cs b/Content.Server/Bible/BibleSystem.cs index 6e7467483f..ae990ff80d 100644 --- a/Content.Server/Bible/BibleSystem.cs +++ b/Content.Server/Bible/BibleSystem.cs @@ -2,7 +2,7 @@ using Content.Server.Bible.Components; using Content.Server.Ghost.Roles.Components; using Content.Server.Ghost.Roles.Events; using Content.Server.Popups; -using Content.Server.White.Other.Lazy; +using Content.Server.White.Other.CustomFluffSystems.merkka; using Content.Shared.ActionBlocker; using Content.Shared.Actions; using Content.Shared.Bible; diff --git a/Content.Server/White/Other/Lazy/EarsSpawnComponent.cs b/Content.Server/White/Other/CustomFluffSystems/merkka/EarsSpawnComponent.cs similarity index 92% rename from Content.Server/White/Other/Lazy/EarsSpawnComponent.cs rename to Content.Server/White/Other/CustomFluffSystems/merkka/EarsSpawnComponent.cs index 021fed01b5..ef9210b845 100644 --- a/Content.Server/White/Other/Lazy/EarsSpawnComponent.cs +++ b/Content.Server/White/Other/CustomFluffSystems/merkka/EarsSpawnComponent.cs @@ -1,7 +1,7 @@ using Robust.Shared.Prototypes; using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; -namespace Content.Server.White.Other.Lazy; +namespace Content.Server.White.Other.CustomFluffSystems.merkka; [RegisterComponent] public sealed partial class EarsSpawnComponent : Component diff --git a/Content.Server/White/Other/Lazy/EarsSpawnSystem.cs b/Content.Server/White/Other/CustomFluffSystems/merkka/EarsSpawnSystem.cs similarity index 98% rename from Content.Server/White/Other/Lazy/EarsSpawnSystem.cs rename to Content.Server/White/Other/CustomFluffSystems/merkka/EarsSpawnSystem.cs index 5b6119109e..0b410e6072 100644 --- a/Content.Server/White/Other/Lazy/EarsSpawnSystem.cs +++ b/Content.Server/White/Other/CustomFluffSystems/merkka/EarsSpawnSystem.cs @@ -8,7 +8,7 @@ using Content.Shared.White.Events; using Robust.Server.GameObjects; using Robust.Shared.Player; -namespace Content.Server.White.Other.Lazy; +namespace Content.Server.White.Other.CustomFluffSystems.merkka; public sealed class EarsSpawnSystem : EntitySystem { diff --git a/Resources/Textures/White/Fluff/HSKveez/hope.rsi/equipped-NECK.png b/Resources/Textures/White/Fluff/HSKveez/hope.rsi/equipped-NECK.png index 04673e30c4d53607b0078aff9f7e4ddf027cced7..a793bb82132ec948fd080dede49804f286f7ade3 100644 GIT binary patch literal 616 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSoCO|{#S9F5M?jcysy3fA0|S$k zr;B4q#hkY{F6Q1!U~mhZu*)I+BvySR4)2n$q5o&3(5xevM7- z&!@?WKeh#1F+5@v;BTm4IKr$T$MBJ%gWbV~;n7{z2NgE+ju+mk|Mva=xqn5!%Nb`J zdvD36^xk}Cj*h?^ THTK`Yq{HCp>gTe~DWM4fB{uda delta 202 zcmaFCa-C7JGr-TCmrII^fq{Y7)59eQNGkxb0|y(BtnMpaH&Ic%o}tsz#WAE}&f6Os zc^eFPSOb*}+iz;Rw)q_N`>5oo8FMM&Kv&7T74JAT&)!%43Dn4t;Omf`dnIc7?)T>z zjh|ig_+xlLaFtY7JA?7PwWk*zH`x6D|A8L2$BGTgDizsw&LAyt;K9Cu-$JQY-eRry l$vf;^zYi#IvqL34*kd%fe5OTiV%P){@pScbS?83{1OR^lLPh`p diff --git a/Resources/Textures/White/Fluff/HSKveez/hope.rsi/icon.png b/Resources/Textures/White/Fluff/HSKveez/hope.rsi/icon.png index bdbc89844924cb8d142b9d24b64d6ac798d0134c..94d8f165ff13bead374550e9beca190e4d532fff 100644 GIT binary patch delta 538 zcmV+#0_FXv1jq!CIe+>|L_t(|ob8%FPQx%5#XlsD!2zH{RW-dq8Ms6lyO)I?0T#;2 z2)zVIu#mMdFd#TcSxXa<%1Pb$-)C3odv9rKOa9rcQ)WZ&$doZ2G}?obM|BKjeiEHj++|3nm@A-J~qGA z09QAACr4!`rlV696H@S74JhDkoj9M|l(X|NyV%rUj)p``CV260-T2-spn%`cCgpW! z-d%mZf0Wlxi*M=?&q^@zUp4$YH~vloYzJTIZx&YSY*hEJ&%R(g_)tFENw9*gJFqFM zz$wlJzI?3#u74da@4G@7&tRST`I?{m@xxa@ru@EbS4W@yCO@lJoA~|)G(ZKs*npCq z40ZgmJ6~&n>G9L)cj>zSvQ<7E)OTIq*|*{o58rDAa2<4f#mV1kfN2)m6!Q2>&9^!U z+BU{9@YH-&5zDIc)Ze4ign$p(^b07*qoM6N<$f?m4&jQ{`u delta 505 zcmV|W|9iLBI#|Jc7>RsVa76DRd&Kf8(5zI{?I7(mJe14y|<448lX zuI%%(>Cql#R181b00Zv=U3IAx%O7pPF3+}0qYU6Un{xJ3@PEAq*pB-ezI%EXAAD;5 zpaEmuJUKq7I&ph-Dq=zo{-6N{KGcb3cI@jvU*BRT zlrX{1UqxkzJ|X&{N>vjI{6b4*$4PuKSpM-uFu)$ zp|j89Pek}ZDa&j7pe zZTu#XijRjNDHjYN<$?jETrhx?3kHyK!2nV&7$DKeE^_~4jC?={&_3U#*>(x}01mV{ zMn1qJW08%a(K+5$G-{FO36wlTs00000NkvXXu0mjf>k;RV diff --git a/Resources/Textures/White/Fluff/HSKveez/hope.rsi/meta.json b/Resources/Textures/White/Fluff/HSKveez/hope.rsi/meta.json index a9524d2503..fcba7ab495 100644 --- a/Resources/Textures/White/Fluff/HSKveez/hope.rsi/meta.json +++ b/Resources/Textures/White/Fluff/HSKveez/hope.rsi/meta.json @@ -1,30 +1,50 @@ { - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon", - "delays": [ - [ - 0.5, - 0.5, - 0.5, - 0.5 - ] - ] + "version": 1, + "size": { + "x": 32, + "y": 32 }, - { - "name": "equipped-NECK", - "directions": 1, - "delays": [ - [ - 0.1, - 0.1 - ] - ] - } - ] + "states": [ + { + "name": "icon", + "delays": [ + [ + 0.16, + 0.16, + 0.16, + 0.16 + ] + ] + }, + { + "name": "equipped-NECK", + "directions": 4, + "delays": [ + [ + 0.16, + 0.16, + 0.16, + 0.16 + ], + [ + 0.16, + 0.16, + 0.16, + 0.16 + ], + [ + 0.16, + 0.16, + 0.16, + 0.16 + ], + [ + 0.16, + 0.16, + 0.16, + 0.16 + ] + ] + } + ] }