From 60907482389c3c259ab94cc3aebe0d7b54392cb9 Mon Sep 17 00:00:00 2001 From: Pierson Arnold Date: Tue, 13 Aug 2024 22:58:04 -0500 Subject: [PATCH 01/38] Fixed cum/milk generation --- .../Traits/Components/CumProducerComponent.cs | 14 +-- .../Components/MilkProducerComponent.cs | 16 ++-- .../FloofStation/Traits/LewdTraitSystem.cs | 94 +++++++++++-------- .../{FloofStation => Floof}/Traits/lewd.yml | 8 +- 4 files changed, 72 insertions(+), 60 deletions(-) rename Resources/Prototypes/{FloofStation => Floof}/Traits/lewd.yml (92%) diff --git a/Content.Server/FloofStation/Traits/Components/CumProducerComponent.cs b/Content.Server/FloofStation/Traits/Components/CumProducerComponent.cs index aa7ed3fc009..c9400ea1384 100644 --- a/Content.Server/FloofStation/Traits/Components/CumProducerComponent.cs +++ b/Content.Server/FloofStation/Traits/Components/CumProducerComponent.cs @@ -13,7 +13,7 @@ namespace Content.Server.FloofStation.Traits; public sealed partial class CumProducerComponent : Component { [DataField("solutionname"), ViewVariables(VVAccess.ReadWrite)] - public string SolutionName; + public string SolutionName = "penis"; [DataField, ViewVariables(VVAccess.ReadWrite)] public ProtoId ReagentId = "Cum"; @@ -24,15 +24,15 @@ public sealed partial class CumProducerComponent : Component [DataField] public Entity? Solution = null; - [DataField, ViewVariables(VVAccess.ReadOnly)] - public FixedPoint2 QuantityPerUpdate = 25; + [DataField, ViewVariables(VVAccess.ReadWrite)] + public FixedPoint2 QuantityPerUpdate = 5; - [DataField] + [DataField, ViewVariables(VVAccess.ReadWrite)] public float HungerUsage = 10f; - [DataField] - public TimeSpan GrowthDelay = TimeSpan.FromMinutes(1); + [DataField, ViewVariables(VVAccess.ReadWrite)] + public TimeSpan GrowthDelay = TimeSpan.FromSeconds(10); - [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))] + [DataField(customTypeSerializer: typeof(TimeOffsetSerializer)), ViewVariables(VVAccess.ReadWrite)] public TimeSpan NextGrowth = TimeSpan.FromSeconds(0); } diff --git a/Content.Server/FloofStation/Traits/Components/MilkProducerComponent.cs b/Content.Server/FloofStation/Traits/Components/MilkProducerComponent.cs index f557394c94c..a964211b96b 100644 --- a/Content.Server/FloofStation/Traits/Components/MilkProducerComponent.cs +++ b/Content.Server/FloofStation/Traits/Components/MilkProducerComponent.cs @@ -13,26 +13,26 @@ namespace Content.Server.FloofStation.Traits; public sealed partial class MilkProducerComponent : Component { [DataField("solutionname"), ViewVariables(VVAccess.ReadWrite)] - public string SolutionName; + public string SolutionName = "breasts"; [DataField, ViewVariables(VVAccess.ReadWrite)] public ProtoId ReagentId = "Milk"; [DataField] - public FixedPoint2 MaxVolume = FixedPoint2.New(25); + public FixedPoint2 MaxVolume = FixedPoint2.New(50); [DataField] public Entity? Solution = null; - [DataField, ViewVariables(VVAccess.ReadOnly)] - public FixedPoint2 QuantityPerUpdate = 25; + [DataField, ViewVariables(VVAccess.ReadWrite)] + public FixedPoint2 QuantityPerUpdate = 5; - [DataField] + [DataField, ViewVariables(VVAccess.ReadWrite)] public float HungerUsage = 10f; - [DataField] - public TimeSpan GrowthDelay = TimeSpan.FromMinutes(1); + [DataField, ViewVariables(VVAccess.ReadWrite)] + public TimeSpan GrowthDelay = TimeSpan.FromSeconds(10); - [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))] + [DataField(customTypeSerializer: typeof(TimeOffsetSerializer)), ViewVariables(VVAccess.ReadWrite)] public TimeSpan NextGrowth = TimeSpan.FromSeconds(0); } diff --git a/Content.Server/FloofStation/Traits/LewdTraitSystem.cs b/Content.Server/FloofStation/Traits/LewdTraitSystem.cs index 1429488a47a..5c5f084ce08 100644 --- a/Content.Server/FloofStation/Traits/LewdTraitSystem.cs +++ b/Content.Server/FloofStation/Traits/LewdTraitSystem.cs @@ -268,61 +268,73 @@ private void AttemptMilk(Entity lewd, EntityUid userUid, public override void Update(float frameTime) { base.Update(frameTime); - + var queryCum = EntityQueryEnumerator(); //SquirtProducerComponent -unused , + var queryMilk = EntityQueryEnumerator(); var now = _timing.CurTime; - var query = AllEntityQuery(); //SquirtProducerComponent -unused - while (query.MoveNext(out var uid, out var containerCum, out var containerMilk)) // out var containerSquirt -unused + while (queryCum.MoveNext(out var uid, out var containerCum)) { + if (now < containerCum.NextGrowth) + continue; + + containerCum.NextGrowth = now + containerCum.GrowthDelay; + if (_mobState.IsDead(uid)) continue; - if (!(now < containerCum.NextGrowth)) + if (EntityManager.TryGetComponent(uid, out HungerComponent? hunger)) { - containerCum.NextGrowth = now + containerCum.GrowthDelay; - - // Actually there is food digestion so no problem with instant reagent generation "OnFeed" - if (EntityManager.TryGetComponent(uid, out HungerComponent? hunger)) - { - // Is there enough nutrition to produce reagent? - if (!(_hunger.GetHungerThreshold(hunger) < HungerThreshold.Okay)) - _hunger.ModifyHunger(uid, -containerCum.HungerUsage, hunger); - } - - if (_solutionContainer.ResolveSolution(uid, containerCum.SolutionName, ref containerCum.Solution)) - _solutionContainer.TryAddReagent(containerCum.Solution.Value, containerCum.ReagentId, containerCum.QuantityPerUpdate, out _); + if (_hunger.GetHungerThreshold(hunger) < HungerThreshold.Okay) + continue; + + _hunger.ModifyHunger(uid, -containerCum.HungerUsage, hunger); } - if (!(now < containerMilk.NextGrowth)) - { - containerMilk.NextGrowth = now + containerMilk.GrowthDelay; + if (!_solutionContainer.ResolveSolution(uid, containerCum.SolutionName, ref containerCum.Solution)) + continue; + + _solutionContainer.TryAddReagent(containerCum.Solution.Value, containerCum.ReagentId, containerCum.QuantityPerUpdate, out _); + } + + while (queryMilk.MoveNext(out var uid, out var containerMilk)) + { + if (now < containerMilk.NextGrowth) + continue; + + containerMilk.NextGrowth = now + containerMilk.GrowthDelay; + + if (_mobState.IsDead(uid)) + continue; - if (EntityManager.TryGetComponent(uid, out HungerComponent? hunger)) - { - if (!(_hunger.GetHungerThreshold(hunger) < HungerThreshold.Okay)) - _hunger.ModifyHunger(uid, -containerMilk.HungerUsage, hunger); - } + if (EntityManager.TryGetComponent(uid, out HungerComponent? hunger)) + { + if (_hunger.GetHungerThreshold(hunger) < HungerThreshold.Okay) + continue; - if (_solutionContainer.ResolveSolution(uid, containerMilk.SolutionName, ref containerMilk.Solution)) - _solutionContainer.TryAddReagent(containerMilk.Solution.Value, containerMilk.ReagentId, containerMilk.QuantityPerUpdate, out _); + _hunger.ModifyHunger(uid, -containerMilk.HungerUsage, hunger); } - //if (!(now < containerSquirt.NextGrowth)) //Unused-Trait is WIP - //{ - // containerSquirt.NextGrowth = now + containerSquirt.GrowthDelay; - - // - // if (EntityManager.TryGetComponent(uid, out HungerComponent? hunger)) - // { - // - // if (!(_hunger.GetHungerThreshold(hunger) < HungerThreshold.Okay)) - // _hunger.ModifyHunger(uid, -containerSquirt.HungerUsage, hunger); - // } - - // if (_solutionContainer.ResolveSolution(uid, containerSquirt.SolutionName, ref containerSquirt.Solution)) - // _solutionContainer.TryAddReagent(containerSquirt.Solution.Value, containerSquirt.ReagentId, containerSquirt.QuantityPerUpdate, out _); - //} + if (!_solutionContainer.ResolveSolution(uid, containerMilk.SolutionName, ref containerMilk.Solution)) + continue; + + _solutionContainer.TryAddReagent(containerMilk.Solution.Value, containerMilk.ReagentId, containerMilk.QuantityPerUpdate, out _); } + + //if (!(now < containerSquirt.NextGrowth)) //Unused-Trait is WIP + //{ + // containerSquirt.NextGrowth = now + containerSquirt.GrowthDelay; + + // + // if (EntityManager.TryGetComponent(uid, out HungerComponent? hunger)) + // { + // + // if (!(_hunger.GetHungerThreshold(hunger) < HungerThreshold.Okay)) + // _hunger.ModifyHunger(uid, -containerSquirt.HungerUsage, hunger); + // } + + // if (_solutionContainer.ResolveSolution(uid, containerSquirt.SolutionName, ref containerSquirt.Solution)) + // _solutionContainer.TryAddReagent(containerSquirt.Solution.Value, containerSquirt.ReagentId, containerSquirt.QuantityPerUpdate, out _); + //} } #endregion } diff --git a/Resources/Prototypes/FloofStation/Traits/lewd.yml b/Resources/Prototypes/Floof/Traits/lewd.yml similarity index 92% rename from Resources/Prototypes/FloofStation/Traits/lewd.yml rename to Resources/Prototypes/Floof/Traits/lewd.yml index d3cd1304479..fb05c082657 100644 --- a/Resources/Prototypes/FloofStation/Traits/lewd.yml +++ b/Resources/Prototypes/Floof/Traits/lewd.yml @@ -13,10 +13,10 @@ - type: SolutionContainerManager solutions: penis: - maxVol: 250 + maxVol: 25 reagents: - ReagentId: Cum - Quantity: 30 + Quantity: 25 - type: trait id: MilkProducer @@ -33,10 +33,10 @@ - type: SolutionContainerManager solutions: breasts: - maxVol: 250 + maxVol: 50 reagents: - ReagentId: Milk - Quantity: 30 + Quantity: 50 # WIP - Needs a Reagent # - type: trait From a405f638a7a67870ab5ef98a0b451682924cd728 Mon Sep 17 00:00:00 2001 From: Dakota Haven Date: Wed, 14 Aug 2024 19:43:17 -0600 Subject: [PATCH 02/38] Adding in new clothes for testing --- .../Floof/Entities/Clothing/Uniforms/misc.yml | 30 ++++++++++++++++++ .../equipped-INNERCLOTHING.png | Bin 0 -> 384 bytes .../Uniforms/loinclothblack.rsi/icon.png | Bin 0 -> 250 bytes .../loinclothblack.rsi/inhand-left.png | Bin 0 -> 269 bytes .../loinclothblack.rsi/inhand-right.png | Bin 0 -> 266 bytes .../Uniforms/loinclothblack.rsi/meta.json | 26 +++++++++++++++ .../equipped-INNERCLOTHING.png | Bin 0 -> 374 bytes .../Uniforms/loinclothwhite.rsi/icon.png | Bin 0 -> 241 bytes .../loinclothwhite.rsi/inhand-left.png | Bin 0 -> 300 bytes .../loinclothwhite.rsi/inhand-right.png | Bin 0 -> 295 bytes .../Uniforms/loinclothwhite.rsi/meta.json | 26 +++++++++++++++ 11 files changed, 82 insertions(+) create mode 100644 Resources/Textures/Floof/Clothing/Uniforms/loinclothblack.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/Floof/Clothing/Uniforms/loinclothblack.rsi/icon.png create mode 100644 Resources/Textures/Floof/Clothing/Uniforms/loinclothblack.rsi/inhand-left.png create mode 100644 Resources/Textures/Floof/Clothing/Uniforms/loinclothblack.rsi/inhand-right.png create mode 100644 Resources/Textures/Floof/Clothing/Uniforms/loinclothblack.rsi/meta.json create mode 100644 Resources/Textures/Floof/Clothing/Uniforms/loinclothwhite.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/Floof/Clothing/Uniforms/loinclothwhite.rsi/icon.png create mode 100644 Resources/Textures/Floof/Clothing/Uniforms/loinclothwhite.rsi/inhand-left.png create mode 100644 Resources/Textures/Floof/Clothing/Uniforms/loinclothwhite.rsi/inhand-right.png create mode 100644 Resources/Textures/Floof/Clothing/Uniforms/loinclothwhite.rsi/meta.json diff --git a/Resources/Prototypes/Floof/Entities/Clothing/Uniforms/misc.yml b/Resources/Prototypes/Floof/Entities/Clothing/Uniforms/misc.yml index cb2be73256a..a7d7c0dff62 100644 --- a/Resources/Prototypes/Floof/Entities/Clothing/Uniforms/misc.yml +++ b/Resources/Prototypes/Floof/Entities/Clothing/Uniforms/misc.yml @@ -12,3 +12,33 @@ sprite: Floof/Clothing/Uniforms/loincloth.rsi equipDelay: 0 unequipDelay: 0 + + type: entity + parent: ClothingUniformBase + id: ClothingUniformLoinClothBlack + name: black loin cloth + description: A piece of cloth wrapped around the waist. + components: + - type: Item + size: Small + - type: Sprite + sprite: Floof/Clothing/Uniforms/loinclothblack.rsi + - type: Clothing + sprite: Floof/Clothing/Uniforms/loinclothblack.rsi + equipDelay: 0 + unequipDelay: 0 + + type: entity + parent: ClothingUniformBase + id: ClothingUniformLoinClothWhite + name: white loin cloth + description: A piece of cloth wrapped around the waist. + components: + - type: Item + size: Small + - type: Sprite + sprite: Floof/Clothing/Uniforms/loinclothwhite.rsi + - type: Clothing + sprite: Floof/Clothing/Uniforms/loinclothblack.rsi + equipDelay: 0 + unequipDelay: 0 diff --git a/Resources/Textures/Floof/Clothing/Uniforms/loinclothblack.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Floof/Clothing/Uniforms/loinclothblack.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..0d14beea01b32ed1778e44d3dbd10b1c3306ab9e GIT binary patch literal 384 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5`$3q|f;CtLC@5Xx z8c`CQpH@F!Z*Lh2H5mxB zK6DrM7nIfrDipL?7uV8t$mE&Gvd+1!#v(^jxc_cX)`f`QHmG1S&Pf@0--XqN2c9&uXwaW9`(N z|JRp1&`43MsbWbJTXo90<-5cVYvYH@8I%qMPn~X^-1C~zd+q$Hw|}b`4g_guzh^Li t^Eq-zTd6>u0V9CJHaE(DcW1;wj SW&$chC^2kcXJ9apdcbIYKzxGc R%4;zo8BbR~mvv4FO#p<4O-29! literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/Uniforms/loinclothblack.rsi/meta.json b/Resources/Textures/Floof/Clothing/Uniforms/loinclothblack.rsi/meta.json new file mode 100644 index 00000000000..ef52845d5fa --- /dev/null +++ b/Resources/Textures/Floof/Clothing/Uniforms/loinclothblack.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprited by Dakota Haven", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Floof/Clothing/Uniforms/loinclothwhite.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Floof/Clothing/Uniforms/loinclothwhite.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..02eccc8d6c39d2259c1f29d141433eb197064eaa GIT binary patch literal 374 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5`$3q|f;CtLC@5Xx z8c`CQpH@F!Z*Lj$wI~R* zK2+y@s8e?A_xy$%m10iJw{tgkwp#dX{C8Qh`*@9HkK43+yYIzt1C7T5V#3eueE)l2 z&%OF6<4^hi2SQK0d6xc^KeusCalfHf%YtjOvetgesB`;g;K1Q%=yo;gYE&`%hEwuv z9-6i5y*1x4g#A3sFlkCqkf!UTJB({S%>>!e(EebuYlV6K-1El;u-FL_DpX|VCSUobC^z>f)syeRC#IM!O8GIm0=GT c^N0Aaj7J_b&W{)FNCU}wy85}Sb4q9e00HcSrT_o{ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/Uniforms/loinclothwhite.rsi/icon.png b/Resources/Textures/Floof/Clothing/Uniforms/loinclothwhite.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..7bb3ac34663d4e2c162d571d0ccf908234b8c96a GIT binary patch literal 241 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oArNM~bhqvgP*A$W zHKHUqKdq!Zu_%?nIW?!avREOwq%VKQA>;=m}&{W7@#Mh;9@Tzd~Ta z_c%|Z%MV!?82Fjal$kL<5Z`~m{thq026hI94JHS;m!1)y5GJG)0Mg{?>gTe~DWM4f D1Ho5F literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/Uniforms/loinclothwhite.rsi/inhand-right.png b/Resources/Textures/Floof/Clothing/Uniforms/loinclothwhite.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..7e78e7fc79fff0d36e61a529dca82cc9d4dca2ef GIT binary patch literal 295 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5`$3q|f;CtLC@5Xx z8c`CQpH@vM&LvSIw#61u8}d4L@J+z5dze?fz%AvI#wb-)rY{ z8XQ}p63Kd@dcDd`z68-jSpf|7Uzz*ZD(-Jz_d09!rb#KG_sST$1kg=F;d?&&&dk7& v!)LHtp5X&GgYoN$ZyD2$OH=_Br8CzsluQ?&@b~(s9UwiPu6{1-oD!M<7#3Tw literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/Uniforms/loinclothwhite.rsi/meta.json b/Resources/Textures/Floof/Clothing/Uniforms/loinclothwhite.rsi/meta.json new file mode 100644 index 00000000000..ef52845d5fa --- /dev/null +++ b/Resources/Textures/Floof/Clothing/Uniforms/loinclothwhite.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprited by Dakota Haven", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} From 49fe11b2ec76b12dff19875bbab0cd468f6e2657 Mon Sep 17 00:00:00 2001 From: Dakota Haven Date: Wed, 14 Aug 2024 20:05:35 -0600 Subject: [PATCH 03/38] Typooos Signed-off-by: Dakota Haven --- .../Floof/Entities/Clothing/Under/under.yml | 22 +++++++++++++ .../Floof/Entities/Clothing/Uniforms/misc.yml | 29 ++++++++++-------- .../Gloves/plainwarmer.rsi/equipped-HAND.png | Bin 0 -> 387 bytes .../Under/Gloves/plainwarmer.rsi/icon.png | Bin 0 -> 229 bytes .../Socks/plainsocks.rsi/equipped-FEET.png | Bin 0 -> 367 bytes .../Under/Socks/plainsocks.rsi/icon.png | Bin 0 -> 239 bytes .../plainthong.rsi/equipped-INNERCLOTHING.png | Bin 0 -> 344 bytes .../Clothing/Uniforms/plainthong.rsi/icon.png | Bin 0 -> 227 bytes .../Uniforms/plainthong.rsi/inhand-left.png | Bin 0 -> 371 bytes .../Uniforms/plainthong.rsi/inhand-right.png | Bin 0 -> 399 bytes .../equipped-INNERCLOTHING.png | Bin 0 -> 437 bytes .../Uniforms/plainthongbra.rsi/icon.png | Bin 0 -> 263 bytes .../plainthongbra.rsi/inhand-left.png | Bin 0 -> 371 bytes .../plainthongbra.rsi/inhand-right.png | Bin 0 -> 399 bytes 14 files changed, 38 insertions(+), 13 deletions(-) create mode 100644 Resources/Textures/Floof/Clothing/Under/Gloves/plainwarmer.rsi/equipped-HAND.png create mode 100644 Resources/Textures/Floof/Clothing/Under/Gloves/plainwarmer.rsi/icon.png create mode 100644 Resources/Textures/Floof/Clothing/Under/Socks/plainsocks.rsi/equipped-FEET.png create mode 100644 Resources/Textures/Floof/Clothing/Under/Socks/plainsocks.rsi/icon.png create mode 100644 Resources/Textures/Floof/Clothing/Uniforms/plainthong.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/Floof/Clothing/Uniforms/plainthong.rsi/icon.png create mode 100644 Resources/Textures/Floof/Clothing/Uniforms/plainthong.rsi/inhand-left.png create mode 100644 Resources/Textures/Floof/Clothing/Uniforms/plainthong.rsi/inhand-right.png create mode 100644 Resources/Textures/Floof/Clothing/Uniforms/plainthongbra.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/Floof/Clothing/Uniforms/plainthongbra.rsi/icon.png create mode 100644 Resources/Textures/Floof/Clothing/Uniforms/plainthongbra.rsi/inhand-left.png create mode 100644 Resources/Textures/Floof/Clothing/Uniforms/plainthongbra.rsi/inhand-right.png diff --git a/Resources/Prototypes/Floof/Entities/Clothing/Under/under.yml b/Resources/Prototypes/Floof/Entities/Clothing/Under/under.yml index 9222edade62..17f91574f72 100644 --- a/Resources/Prototypes/Floof/Entities/Clothing/Under/under.yml +++ b/Resources/Prototypes/Floof/Entities/Clothing/Under/under.yml @@ -8,3 +8,25 @@ sprite: Floof/Clothing/Under/Socks/codervalid.rsi - type: Clothing sprite: Floof/Clothing/Under/Socks/codervalid.rsi + + - type: entity + parent: ClothingShoesBase + id: ClothingUnderSocksPlain + name: plain thigh-high socks + description: Just a plain pair of thigh-high socks. + components: + - type: Sprite + sprite: Floof/Clothing/Under/Socks/plainsocks.rsi + - type: Clothing + sprite: Floof/Clothing/Under/Socks/plainsocks.rsi + +- type: entity + parent: ClothingHandsBase + id: ClothingUnderWarmersPlain + name: plain arm-warmers + description: Just a plain pair of arm warmers. + components: + - type: Sprite + sprite: Floof/Clothing/Under/Gloves/plainwarmer.rsi + - type: Clothing + sprite: Floof/Clothing/Under/Gloves/plainwarmer.rsi diff --git a/Resources/Prototypes/Floof/Entities/Clothing/Uniforms/misc.yml b/Resources/Prototypes/Floof/Entities/Clothing/Uniforms/misc.yml index a7d7c0dff62..dbdc9b08b8c 100644 --- a/Resources/Prototypes/Floof/Entities/Clothing/Uniforms/misc.yml +++ b/Resources/Prototypes/Floof/Entities/Clothing/Uniforms/misc.yml @@ -13,32 +13,35 @@ equipDelay: 0 unequipDelay: 0 - type: entity +- type: entity parent: ClothingUniformBase id: ClothingUniformLoinClothBlack - name: black loin cloth + name: black loin-cloth description: A piece of cloth wrapped around the waist. components: - - type: Item - size: Small - type: Sprite sprite: Floof/Clothing/Uniforms/loinclothblack.rsi - type: Clothing sprite: Floof/Clothing/Uniforms/loinclothblack.rsi - equipDelay: 0 - unequipDelay: 0 - type: entity +- type: entity parent: ClothingUniformBase id: ClothingUniformLoinClothWhite - name: white loin cloth + name: white loin-cloth description: A piece of cloth wrapped around the waist. components: - - type: Item - size: Small - type: Sprite sprite: Floof/Clothing/Uniforms/loinclothwhite.rsi - type: Clothing - sprite: Floof/Clothing/Uniforms/loinclothblack.rsi - equipDelay: 0 - unequipDelay: 0 + sprite: Floof/Clothing/Uniforms/loinclothwhite.rsi + + - type: entity + parent: ClothingUniformBase + id: ClothingUniformThongPlain + name: plain thong + description: Is this even considered a piece of clothing? + components: + - type: Sprite + sprite: Floof/Clothing/Uniforms/plainthong.rsi + - type: Clothing + sprite: Floof/Clothing/Uniforms/plainthong.rsi diff --git a/Resources/Textures/Floof/Clothing/Under/Gloves/plainwarmer.rsi/equipped-HAND.png b/Resources/Textures/Floof/Clothing/Under/Gloves/plainwarmer.rsi/equipped-HAND.png new file mode 100644 index 0000000000000000000000000000000000000000..db958515ecdf8bf03ec2ba362291a41bf5a6d2f7 GIT binary patch literal 387 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5`$3q|f;CtLC@5Xx z8c`CQpH@F!Z*OhnYgQ0w zcv$?6^-T`D+~ITI3SY;_H#^Rwp)EGTB9aaayZd^WT=`nSI8M(}hgg{xb` zvl`ZxGBOfr~%E`mR2lo;czAzg$K|mb=%lvK-Xf&!xb7 zviZ{?9lxg3I@1P~rS7`#4=>Gk|6bo+lh=gHE}-~_%BRMaC%?rur1I`&tm-+u?`nY5 zR7Q}7IZPKe3+Ko_2x+KMyB~BU?oaO4Ifs^2J4AIH-Q6H}lRu~3V}9zopr0OI$23IG5A literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/Under/Socks/plainsocks.rsi/icon.png b/Resources/Textures/Floof/Clothing/Under/Socks/plainsocks.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..992a3d65b0b09d2742ada06b1ec1b19ca6391e1d GIT binary patch literal 239 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oArNM~bhqvgP*A$W zHKHUqKdq!Zu_%?nIW?!avREOwq%|ofnqt#T0(J`&=Y5wGWAy-yv{nK%0U}O<+U|`f{5Uk`~KIM+a zZ7z#s7KRv0dxqJ94hO^ceCA> g#KfV{&@eNrCG+mVhh5hf0bRl1>FVdQ&MBb@0Hoki6#xJL literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/Uniforms/plainthong.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Floof/Clothing/Uniforms/plainthong.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..57edc2a527a77801bea828bdd7c50d132809cd9c GIT binary patch literal 344 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5`$3q|f;CtLC@5Xx z8c`CQpH@h0|MJM-?+_e*v-;B$@+g*tj!O<6Ra%8leNQv`mlh8vX!f*206X| zzS&gy|7*UC)-(71togG}dBG~NyN_$Ek5YXuv*-M~ z6@P-AFRXr>{_L|j7GqI_8qU9({=K=r*nCEi(R=Affin-wdDvXLI`8(grVFQvDitqH l`u?VAVs-)t6HMFmwdM<^TTXc4JjEO&@6dc3%Jh literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/Uniforms/plainthong.rsi/icon.png b/Resources/Textures/Floof/Clothing/Uniforms/plainthong.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..7fcff5579aea108cf425cac8b447c471a89e648b GIT binary patch literal 227 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oArNM~bhqvgP*A$W zHKHUqKdq!Zu_%?nIW?!avREOwq%mV8Fq0 z;pmd(3#6w0p0CUm>vvHiD_hIUT6lBBk$n%9XLe3iWf5>-V1y8R7-vN8+8y$Hzt02B zB|>p=jWd_7O3LPaKBt2tItG2m%^ zIK5ioo9cIa-VWJ9et+|`Cd~^xf5f^^{1jOfW0Rg%Rcr~=g9ZFpt8+T%e!2Lm#h+}p z=ia`P%n+{EBeX!rd-9Uh$R-Dku0txBvEk*?3)a1U- literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/Uniforms/plainthong.rsi/inhand-right.png b/Resources/Textures/Floof/Clothing/Uniforms/plainthong.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..ba71aea082070d3c2d882a1ba2b79289f5daff35 GIT binary patch literal 399 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5`$3q|f;CtLC@5Xx z8c`CQpH@F!Z*QIKZ8Z>J zxvOK!WH|6YTjvzxlqi4Q)%>o;hiA*PDljl|I502?G%&CrGaH_- z*WkMSeeT9jpKP{&wwcM(@crJl+-h})$Z2d0uXnjg-mpw(D3EcNVo+rHeKuxVtKl|I zhNQeJ?u@T?{o|gq?B&M`p`ntVXFkt4Cx5}Dm+^o_-yi?Tc;<}T*V+;j*61*FO#Lp} zu`m855ond&eOK+c8gUUNIk4fwW=OjJvyj4-F!Z*N%(H5mvr zJY0G)_=p?#syj_y{i{W{FIaTp*c_+XTQ4QfNK84j>Bo=l&1sYKZ{(;g3<&-CTmxtg z3`j_(MrPgKcJ#*gYl(B^8|DbTQ2#vZkIc`_jKALRVO;YmeX0Y8}b zU(Z>~H1}j**ZRN2^+GkbjeFfLnBAzf@}o-2olgp9T&>vm%jZH8&t&fe&z61*k+=7* zRy#&Kn-jyN*m8aIan{aKzsY(RWJ6-FZ)OS!T{`W?7Du4XJ%M}kJJuG>`m0cQ zIEw>`{$@$avGQ~3hD1KUfj zH}!p$TXgBA{=7zs#rs_hW+^Te$&)-ZN%)MZN&^GawI~K3j=cv>KDA~7UB}?*>gTe~ HDWM4feMDr{ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/Uniforms/plainthongbra.rsi/inhand-left.png b/Resources/Textures/Floof/Clothing/Uniforms/plainthongbra.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..bdbf35325f54089b6c158805e5ddc9220e737c5a GIT binary patch literal 371 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5`$3q|f;CtLC@5Xx z8c`CQpH@ItG2m%^ zIK5ioo9cIa-VWJ9et+|`Cd~^xf5f^^{1jOfW0Rg%Rcr~=g9ZFpt8+T%e!2Lm#h+}p z=ia`P%n+{EBeX!rd-9Uh$R-Dku0txBvEk*?3)a1U- literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/Uniforms/plainthongbra.rsi/inhand-right.png b/Resources/Textures/Floof/Clothing/Uniforms/plainthongbra.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..ba71aea082070d3c2d882a1ba2b79289f5daff35 GIT binary patch literal 399 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5`$3q|f;CtLC@5Xx z8c`CQpH@F!Z*QIKZ8Z>J zxvOK!WH|6YTjvzxlqi4Q)%>o;hiA*PDljl|I502?G%&CrGaH_- z*WkMSeeT9jpKP{&wwcM(@crJl+-h})$Z2d0uXnjg-mpw(D3EcNVo+rHeKuxVtKl|I zhNQeJ?u@T?{o|gq?B&M`p`ntVXFkt4Cx5}Dm+^o_-yi?Tc;<}T*V+;j*61*FO#Lp} zu`m855ond&eOK+c8gUUNIk4fwW=OjJvyj4- Date: Wed, 14 Aug 2024 20:20:04 -0600 Subject: [PATCH 04/38] ClothingTests Signed-off-by: Dakota Haven --- .../Floof/Entities/Clothing/Hands/miscgloves.yml | 14 ++++++++++++++ .../Floof/Entities/Clothing/Under/under.yml | 11 ----------- 2 files changed, 14 insertions(+), 11 deletions(-) create mode 100644 Resources/Prototypes/Floof/Entities/Clothing/Hands/miscgloves.yml diff --git a/Resources/Prototypes/Floof/Entities/Clothing/Hands/miscgloves.yml b/Resources/Prototypes/Floof/Entities/Clothing/Hands/miscgloves.yml new file mode 100644 index 00000000000..692ec157d75 --- /dev/null +++ b/Resources/Prototypes/Floof/Entities/Clothing/Hands/miscgloves.yml @@ -0,0 +1,14 @@ +- type: entity + parent: ClothingHandsBase + id: ClothingHandsPlainWarmers + name: plain arm-warmers + description: A pair of rather plain arm-warmers + components: + - type: Sprite + sprite: Floof/Clothing/Under/Gloves/plainwarmer.rsi + - type: Clothing + sprite: Floof/Clothing/Under/Gloves/plainwarmer.rsi + - type: Fiber + fiberMaterial: fibers-synthetic + fiberColor: fibers-black + - type: FingerprintMask diff --git a/Resources/Prototypes/Floof/Entities/Clothing/Under/under.yml b/Resources/Prototypes/Floof/Entities/Clothing/Under/under.yml index 17f91574f72..a0eaf3150dd 100644 --- a/Resources/Prototypes/Floof/Entities/Clothing/Under/under.yml +++ b/Resources/Prototypes/Floof/Entities/Clothing/Under/under.yml @@ -19,14 +19,3 @@ sprite: Floof/Clothing/Under/Socks/plainsocks.rsi - type: Clothing sprite: Floof/Clothing/Under/Socks/plainsocks.rsi - -- type: entity - parent: ClothingHandsBase - id: ClothingUnderWarmersPlain - name: plain arm-warmers - description: Just a plain pair of arm warmers. - components: - - type: Sprite - sprite: Floof/Clothing/Under/Gloves/plainwarmer.rsi - - type: Clothing - sprite: Floof/Clothing/Under/Gloves/plainwarmer.rsi From 7970b6e83ff534ac3bf82f16df2ce73307d2a7e4 Mon Sep 17 00:00:00 2001 From: Dakota Haven Date: Wed, 14 Aug 2024 20:29:52 -0600 Subject: [PATCH 05/38] Clothing testing Signed-off-by: Dakota Haven --- Resources/Prototypes/Floof/Entities/Clothing/Under/under.yml | 2 +- Resources/Prototypes/Floof/Entities/Clothing/Uniforms/misc.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Floof/Entities/Clothing/Under/under.yml b/Resources/Prototypes/Floof/Entities/Clothing/Under/under.yml index a0eaf3150dd..e5d5e542260 100644 --- a/Resources/Prototypes/Floof/Entities/Clothing/Under/under.yml +++ b/Resources/Prototypes/Floof/Entities/Clothing/Under/under.yml @@ -9,7 +9,7 @@ - type: Clothing sprite: Floof/Clothing/Under/Socks/codervalid.rsi - - type: entity +- type: entity parent: ClothingShoesBase id: ClothingUnderSocksPlain name: plain thigh-high socks diff --git a/Resources/Prototypes/Floof/Entities/Clothing/Uniforms/misc.yml b/Resources/Prototypes/Floof/Entities/Clothing/Uniforms/misc.yml index dbdc9b08b8c..392800e436c 100644 --- a/Resources/Prototypes/Floof/Entities/Clothing/Uniforms/misc.yml +++ b/Resources/Prototypes/Floof/Entities/Clothing/Uniforms/misc.yml @@ -35,7 +35,7 @@ - type: Clothing sprite: Floof/Clothing/Uniforms/loinclothwhite.rsi - - type: entity +- type: entity parent: ClothingUniformBase id: ClothingUniformThongPlain name: plain thong From c0c28bb52c5286f8434b09180937e48a1e389bdc Mon Sep 17 00:00:00 2001 From: Dakota Haven Date: Wed, 14 Aug 2024 20:38:51 -0600 Subject: [PATCH 06/38] More dumb clothing testing Signed-off-by: Dakota Haven --- .../Under/Gloves/plainwarmer.rsi/meta.json | 26 +++++++++++++++++++ .../Under/Socks/plainsocks.rsi/meta.json | 26 +++++++++++++++++++ .../Uniforms/plainthong.rsi/meta.json | 26 +++++++++++++++++++ .../Uniforms/plainthongbra.rsi/meta.json | 26 +++++++++++++++++++ 4 files changed, 104 insertions(+) create mode 100644 Resources/Textures/Floof/Clothing/Under/Gloves/plainwarmer.rsi/meta.json create mode 100644 Resources/Textures/Floof/Clothing/Under/Socks/plainsocks.rsi/meta.json create mode 100644 Resources/Textures/Floof/Clothing/Uniforms/plainthong.rsi/meta.json create mode 100644 Resources/Textures/Floof/Clothing/Uniforms/plainthongbra.rsi/meta.json diff --git a/Resources/Textures/Floof/Clothing/Under/Gloves/plainwarmer.rsi/meta.json b/Resources/Textures/Floof/Clothing/Under/Gloves/plainwarmer.rsi/meta.json new file mode 100644 index 00000000000..ef52845d5fa --- /dev/null +++ b/Resources/Textures/Floof/Clothing/Under/Gloves/plainwarmer.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprited by Dakota Haven", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Floof/Clothing/Under/Socks/plainsocks.rsi/meta.json b/Resources/Textures/Floof/Clothing/Under/Socks/plainsocks.rsi/meta.json new file mode 100644 index 00000000000..ef52845d5fa --- /dev/null +++ b/Resources/Textures/Floof/Clothing/Under/Socks/plainsocks.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprited by Dakota Haven", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Floof/Clothing/Uniforms/plainthong.rsi/meta.json b/Resources/Textures/Floof/Clothing/Uniforms/plainthong.rsi/meta.json new file mode 100644 index 00000000000..ef52845d5fa --- /dev/null +++ b/Resources/Textures/Floof/Clothing/Uniforms/plainthong.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprited by Dakota Haven", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Floof/Clothing/Uniforms/plainthongbra.rsi/meta.json b/Resources/Textures/Floof/Clothing/Uniforms/plainthongbra.rsi/meta.json new file mode 100644 index 00000000000..ef52845d5fa --- /dev/null +++ b/Resources/Textures/Floof/Clothing/Uniforms/plainthongbra.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprited by Dakota Haven", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} From f6bac8e7f342194cc84534335a8326af54b8768c Mon Sep 17 00:00:00 2001 From: Dakota Haven Date: Wed, 14 Aug 2024 21:00:01 -0600 Subject: [PATCH 07/38] Signed-off-by: Dakota Haven --- .../Clothing/Under/Gloves/plainwarmer.rsi/meta.json | 10 +--------- .../Clothing/Under/Socks/plainsocks.rsi/meta.json | 10 +--------- 2 files changed, 2 insertions(+), 18 deletions(-) diff --git a/Resources/Textures/Floof/Clothing/Under/Gloves/plainwarmer.rsi/meta.json b/Resources/Textures/Floof/Clothing/Under/Gloves/plainwarmer.rsi/meta.json index ef52845d5fa..37f776f6ebb 100644 --- a/Resources/Textures/Floof/Clothing/Under/Gloves/plainwarmer.rsi/meta.json +++ b/Resources/Textures/Floof/Clothing/Under/Gloves/plainwarmer.rsi/meta.json @@ -11,16 +11,8 @@ "name": "icon" }, { - "name": "equipped-INNERCLOTHING", + "name": "equipped-HANDS", "directions": 4 }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } ] } diff --git a/Resources/Textures/Floof/Clothing/Under/Socks/plainsocks.rsi/meta.json b/Resources/Textures/Floof/Clothing/Under/Socks/plainsocks.rsi/meta.json index ef52845d5fa..49ecbcbacbf 100644 --- a/Resources/Textures/Floof/Clothing/Under/Socks/plainsocks.rsi/meta.json +++ b/Resources/Textures/Floof/Clothing/Under/Socks/plainsocks.rsi/meta.json @@ -11,16 +11,8 @@ "name": "icon" }, { - "name": "equipped-INNERCLOTHING", + "name": "equipped-FEET", "directions": 4 }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } ] } From 9f046a9a4227a4a2cc787fc20567c437a133880a Mon Sep 17 00:00:00 2001 From: Dakota Haven Date: Wed, 14 Aug 2024 21:08:24 -0600 Subject: [PATCH 08/38] Signed-off-by: Dakota Haven --- .../Floof/Clothing/Under/Gloves/plainwarmer.rsi/meta.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Textures/Floof/Clothing/Under/Gloves/plainwarmer.rsi/meta.json b/Resources/Textures/Floof/Clothing/Under/Gloves/plainwarmer.rsi/meta.json index 37f776f6ebb..6ed762f478d 100644 --- a/Resources/Textures/Floof/Clothing/Under/Gloves/plainwarmer.rsi/meta.json +++ b/Resources/Textures/Floof/Clothing/Under/Gloves/plainwarmer.rsi/meta.json @@ -13,6 +13,6 @@ { "name": "equipped-HANDS", "directions": 4 - }, + } ] } From 1a0b5a6e55999fb834d294700773fbb12ffe7dd5 Mon Sep 17 00:00:00 2001 From: Dakota Haven Date: Wed, 14 Aug 2024 21:13:48 -0600 Subject: [PATCH 09/38] Signed-off-by: Dakota Haven --- .../Floof/Clothing/Under/Gloves/plainwarmer.rsi/meta.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Textures/Floof/Clothing/Under/Gloves/plainwarmer.rsi/meta.json b/Resources/Textures/Floof/Clothing/Under/Gloves/plainwarmer.rsi/meta.json index 6ed762f478d..f6904e7bf3e 100644 --- a/Resources/Textures/Floof/Clothing/Under/Gloves/plainwarmer.rsi/meta.json +++ b/Resources/Textures/Floof/Clothing/Under/Gloves/plainwarmer.rsi/meta.json @@ -11,7 +11,7 @@ "name": "icon" }, { - "name": "equipped-HANDS", + "name": "equipped-HAND", "directions": 4 } ] From a976777adf70614ca64f01898eea2c31e2861500 Mon Sep 17 00:00:00 2001 From: Dakota Haven Date: Wed, 14 Aug 2024 21:39:15 -0600 Subject: [PATCH 10/38] Signed-off-by: Dakota Haven --- .../Entities/Clothing/Hands/miscgloves.yml | 45 ++++++++++++++++++ .../Floof/Entities/Clothing/Uniforms/misc.yml | 33 +++++++++++++ .../Gloves/beewarmer.rsi/equipped-HAND.png | Bin 0 -> 591 bytes .../Under/Gloves/beewarmer.rsi/icon.png | Bin 0 -> 309 bytes .../Under/Gloves/beewarmer.rsi/meta.json | 18 +++++++ .../codervalidwarmer.rsi/equipped-HAND.png | Bin 0 -> 468 bytes .../Gloves/codervalidwarmer.rsi/icon.png | Bin 0 -> 282 bytes .../Gloves/codervalidwarmer.rsi/meta.json | 18 +++++++ .../Gloves/coderwarmer.rsi/equipped-HAND.png | Bin 0 -> 468 bytes .../Under/Gloves/coderwarmer.rsi/icon.png | Bin 0 -> 286 bytes .../Under/Gloves/coderwarmer.rsi/meta.json | 18 +++++++ .../Under/Socks/plainsocks.rsi/meta.json | 2 +- .../beethong.rsi/equipped-INNERCLOTHING.png | Bin 0 -> 382 bytes .../Clothing/Uniforms/beethong.rsi/icon.png | Bin 0 -> 238 bytes .../Uniforms/beethong.rsi/inhand-left.png | Bin 0 -> 372 bytes .../Uniforms/beethong.rsi/inhand-right.png | Bin 0 -> 380 bytes .../Clothing/Uniforms/beethong.rsi/meta.json | 26 ++++++++++ .../coderthong.rsi/equipped-INNERCLOTHING.png | Bin 0 -> 517 bytes .../Clothing/Uniforms/coderthong.rsi/icon.png | Bin 0 -> 323 bytes .../Uniforms/coderthong.rsi/inhand-left.png | Bin 0 -> 381 bytes .../Uniforms/coderthong.rsi/inhand-right.png | Bin 0 -> 367 bytes .../Uniforms/coderthong.rsi/meta.json | 26 ++++++++++ .../equipped-INNERCLOTHING.png | Bin 0 -> 367 bytes .../Uniforms/codervalidthong.rsi/icon.png | Bin 0 -> 241 bytes .../codervalidthong.rsi/inhand-left.png | Bin 0 -> 355 bytes .../codervalidthong.rsi/inhand-right.png | Bin 0 -> 343 bytes .../Uniforms/codervalidthong.rsi/meta.json | 26 ++++++++++ 27 files changed, 211 insertions(+), 1 deletion(-) create mode 100644 Resources/Textures/Floof/Clothing/Under/Gloves/beewarmer.rsi/equipped-HAND.png create mode 100644 Resources/Textures/Floof/Clothing/Under/Gloves/beewarmer.rsi/icon.png create mode 100644 Resources/Textures/Floof/Clothing/Under/Gloves/beewarmer.rsi/meta.json create mode 100644 Resources/Textures/Floof/Clothing/Under/Gloves/codervalidwarmer.rsi/equipped-HAND.png create mode 100644 Resources/Textures/Floof/Clothing/Under/Gloves/codervalidwarmer.rsi/icon.png create mode 100644 Resources/Textures/Floof/Clothing/Under/Gloves/codervalidwarmer.rsi/meta.json create mode 100644 Resources/Textures/Floof/Clothing/Under/Gloves/coderwarmer.rsi/equipped-HAND.png create mode 100644 Resources/Textures/Floof/Clothing/Under/Gloves/coderwarmer.rsi/icon.png create mode 100644 Resources/Textures/Floof/Clothing/Under/Gloves/coderwarmer.rsi/meta.json create mode 100644 Resources/Textures/Floof/Clothing/Uniforms/beethong.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/Floof/Clothing/Uniforms/beethong.rsi/icon.png create mode 100644 Resources/Textures/Floof/Clothing/Uniforms/beethong.rsi/inhand-left.png create mode 100644 Resources/Textures/Floof/Clothing/Uniforms/beethong.rsi/inhand-right.png create mode 100644 Resources/Textures/Floof/Clothing/Uniforms/beethong.rsi/meta.json create mode 100644 Resources/Textures/Floof/Clothing/Uniforms/coderthong.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/Floof/Clothing/Uniforms/coderthong.rsi/icon.png create mode 100644 Resources/Textures/Floof/Clothing/Uniforms/coderthong.rsi/inhand-left.png create mode 100644 Resources/Textures/Floof/Clothing/Uniforms/coderthong.rsi/inhand-right.png create mode 100644 Resources/Textures/Floof/Clothing/Uniforms/coderthong.rsi/meta.json create mode 100644 Resources/Textures/Floof/Clothing/Uniforms/codervalidthong.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/Floof/Clothing/Uniforms/codervalidthong.rsi/icon.png create mode 100644 Resources/Textures/Floof/Clothing/Uniforms/codervalidthong.rsi/inhand-left.png create mode 100644 Resources/Textures/Floof/Clothing/Uniforms/codervalidthong.rsi/inhand-right.png create mode 100644 Resources/Textures/Floof/Clothing/Uniforms/codervalidthong.rsi/meta.json diff --git a/Resources/Prototypes/Floof/Entities/Clothing/Hands/miscgloves.yml b/Resources/Prototypes/Floof/Entities/Clothing/Hands/miscgloves.yml index 692ec157d75..75da4e22a9c 100644 --- a/Resources/Prototypes/Floof/Entities/Clothing/Hands/miscgloves.yml +++ b/Resources/Prototypes/Floof/Entities/Clothing/Hands/miscgloves.yml @@ -12,3 +12,48 @@ fiberMaterial: fibers-synthetic fiberColor: fibers-black - type: FingerprintMask + +- type: entity + parent: ClothingHandsBase + id: ClothingHandsBeeWarmers + name: bee arm-warmers + description: A pair of rather buzzy arm-warmers + components: + - type: Sprite + sprite: Floof/Clothing/Under/Gloves/beewarmer.rsi + - type: Clothing + sprite: Floof/Clothing/Under/Gloves/beewarmer.rsi + - type: Fiber + fiberMaterial: fibers-synthetic + fiberColor: fibers-yellow + - type: FingerprintMask + +- type: entity + parent: ClothingHandsBase + id: ClothingHandsCoderWarmers + name: coder arm-warmers + description: A pair of rather nice arm-warmers + components: + - type: Sprite + sprite: Floof/Clothing/Under/Gloves/coderwarmer.rsi + - type: Clothing + sprite: Floof/Clothing/Under/Gloves/coderwarmer.rsi + - type: Fiber + fiberMaterial: fibers-synthetic + fiberColor: fibers-white + - type: FingerprintMask + +- type: entity + parent: ClothingHandsBase + id: ClothingHandsCoderValidWarmers + name: coder valid arm-warmers + description: A pair of rather nice arm-warmers + components: + - type: Sprite + sprite: Floof/Clothing/Under/Gloves/codervalidwarmer.rsi + - type: Clothing + sprite: Floof/Clothing/Under/Gloves/codervalidwarmer.rsi + - type: Fiber + fiberMaterial: fibers-synthetic + fiberColor: fibers-red + - type: FingerprintMask diff --git a/Resources/Prototypes/Floof/Entities/Clothing/Uniforms/misc.yml b/Resources/Prototypes/Floof/Entities/Clothing/Uniforms/misc.yml index 392800e436c..cebf8136b47 100644 --- a/Resources/Prototypes/Floof/Entities/Clothing/Uniforms/misc.yml +++ b/Resources/Prototypes/Floof/Entities/Clothing/Uniforms/misc.yml @@ -45,3 +45,36 @@ sprite: Floof/Clothing/Uniforms/plainthong.rsi - type: Clothing sprite: Floof/Clothing/Uniforms/plainthong.rsi + +- type: entity + parent: ClothingUniformBase + id: ClothingUniformThongBee + name: bee thong + description: Is this even considered a piece of clothing? + components: + - type: Sprite + sprite: Floof/Clothing/Uniforms/beethong.rsi + - type: Clothing + sprite: Floof/Clothing/Uniforms/beethong.rsi + +- type: entity + parent: ClothingUniformBase + id: ClothingUniformThongCoder + name: coder thong + description: Is this even considered a piece of clothing? + components: + - type: Sprite + sprite: Floof/Clothing/Uniforms/coderthong.rsi + - type: Clothing + sprite: Floof/Clothing/Uniforms/coderthong.rsi + +- type: entity + parent: ClothingUniformBase + id: ClothingUniformThongCoderValid + name: coder valid thong + description: Is this even considered a piece of clothing? + components: + - type: Sprite + sprite: Floof/Clothing/Uniforms/codervalidthong.rsi + - type: Clothing + sprite: Floof/Clothing/Uniforms/codervalidthong.rsi diff --git a/Resources/Textures/Floof/Clothing/Under/Gloves/beewarmer.rsi/equipped-HAND.png b/Resources/Textures/Floof/Clothing/Under/Gloves/beewarmer.rsi/equipped-HAND.png new file mode 100644 index 0000000000000000000000000000000000000000..dbac4c347630415973dafab89a7fccec13ed8085 GIT binary patch literal 591 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5`$3q|f;CtLC@5Xx z8c`CQpH@Bbk^t#;r1^XcjNGwXx|Wj1LtDKMZTgBw}bPO#6pSGRIg!@9@L$BSk6%RB56_*>Gb z5$CL)>+*3|jpNMo6@6>ho3qT_qS|jfkNNDvO`lGF+WO%pw}X1_%OkNeE5$oH{yK39 zFVdQ&MBb@0ACp7>i_@% literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/Under/Gloves/beewarmer.rsi/icon.png b/Resources/Textures/Floof/Clothing/Under/Gloves/beewarmer.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..123c63ff8221004dc4989fd6b78afb8d92dd66fd GIT binary patch literal 309 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oArNM~bhqvgP*A$W zHKHUqKdq!Zu_%?nIW?!avREOwq%YMU-|t9JrhTER47(&>X;7k^g({lehs>gTe~DWM4fx?ptx literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/Under/Gloves/beewarmer.rsi/meta.json b/Resources/Textures/Floof/Clothing/Under/Gloves/beewarmer.rsi/meta.json new file mode 100644 index 00000000000..342a11922db --- /dev/null +++ b/Resources/Textures/Floof/Clothing/Under/Gloves/beewarmer.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprited by Dakota Haven", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HAND", + "directions": 4 + }, + ] +} diff --git a/Resources/Textures/Floof/Clothing/Under/Gloves/codervalidwarmer.rsi/equipped-HAND.png b/Resources/Textures/Floof/Clothing/Under/Gloves/codervalidwarmer.rsi/equipped-HAND.png new file mode 100644 index 0000000000000000000000000000000000000000..80080f541ee5e19208d33dd152ddc9506a6d9e7b GIT binary patch literal 468 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5`$3q|f;CtLC@5Xx z8c`CQpH@F!Z*T3+J!~M- z`f#z@36{76nt2NkeULh*GSexzVp2t~f-9HkH>Q~i9>u|&6A}+SGS>TYf0oip|Mn>i z8;i@=?z95hhXR;V)BbI``>JMVhRpH2m4~l<+xpu(w_ZG9!#(r!{*#uxpC8Zr_o+h?2a;~sNVfQq-@@OoA*m)`SJ;y^5jkJ)ZsZ~0fu z7nHJ>_1STMmAe_UXKwd$Taj;E?0L%4Yci{Wech&0EN6lzth&3(>)GLU0k~ZUqF(dQ WF8wv(&r^;`AVE)8KbLh*2~7a*WVbf} literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/Under/Gloves/codervalidwarmer.rsi/icon.png b/Resources/Textures/Floof/Clothing/Under/Gloves/codervalidwarmer.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..d44dc4379d4a644865ce361b64fa030cd24a5d67 GIT binary patch literal 282 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oArNM~bhqvgP*A$W zHKHUqKdq!Zu_%?nIW?!avREOwq%GH9_y9vY2i@`wT)vp$$0Tc{Bc5Z z0uWSueJt*LxL2EnS0$7`j{QK*;R6Q_Y)E|_=9bia_4w`I_RP%8feRfF!Z*Tc#9X1eX zdw5=2e$kfS0bZJWo%w?1E1#aX*skN9fRo12-_zurX1~-*=;-`vtaM?|=IL%W#?x4X z($jW5eF3x%1w?d6EcU$gh`Sli!gdN>!&``lrZD%S!+Kn@9}=uaQ3%ZCF5ni8RhI-PR+l=xKea(|Hn5C zlWY%cWe#%ve^t)l|Fo!3g;M>AQ|81^3i{r6_5On`+|!~@28$N$yPf^?xdID{i_kba zZO`}4PrtH8oBP1$d*_X_uDP;bU=)>An0x<*9DjB8RY~vS=l9sc|Fb?@udgyUvpsQ3 z*xZdKwWy{lB5x=L*?rw-{CPC03nhT(0+F$N%pgv%VGxFv0EGarFoD X`kXHl>Mpl6fdoBW{an^LB{Ts5$zr#4 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/Under/Gloves/coderwarmer.rsi/icon.png b/Resources/Textures/Floof/Clothing/Under/Gloves/coderwarmer.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..e5f1df3dae912835d1b41185e0b0210431a0d055 GIT binary patch literal 286 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oArNM~bhqvgP*A$W zHKHUqKdq!Zu_%?nIW?!avREOwq%gTe~DWM4flRIc= literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/Under/Gloves/coderwarmer.rsi/meta.json b/Resources/Textures/Floof/Clothing/Under/Gloves/coderwarmer.rsi/meta.json new file mode 100644 index 00000000000..342a11922db --- /dev/null +++ b/Resources/Textures/Floof/Clothing/Under/Gloves/coderwarmer.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprited by Dakota Haven", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HAND", + "directions": 4 + }, + ] +} diff --git a/Resources/Textures/Floof/Clothing/Under/Socks/plainsocks.rsi/meta.json b/Resources/Textures/Floof/Clothing/Under/Socks/plainsocks.rsi/meta.json index 49ecbcbacbf..bbd45032fef 100644 --- a/Resources/Textures/Floof/Clothing/Under/Socks/plainsocks.rsi/meta.json +++ b/Resources/Textures/Floof/Clothing/Under/Socks/plainsocks.rsi/meta.json @@ -13,6 +13,6 @@ { "name": "equipped-FEET", "directions": 4 - }, + } ] } diff --git a/Resources/Textures/Floof/Clothing/Uniforms/beethong.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Floof/Clothing/Uniforms/beethong.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..2ca46217a259f0d684126ec8ec9a8babdb408b47 GIT binary patch literal 382 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5`$3q|f;CtLC@5Xx z8c`CQpH@F!Z*Lj$9Wvl? z2z2+6VbE+(OiIzp@rhyTG%o1z%QD^s+`|EWaG)_>aUC=88<4m<=M?#?*7?weuG!WlD%(_ zhJXDXwcw{-Q%6lv_|`9(cG+wz)?8_I{`hQnzRmWZZxk!+&y`eG?b^sT!?o@o6Besb zgg!)Xncn;BZRwQ1j@@_Ev=ew(R?jJ8SK(4RQuNhw$wzaC9PeFE!gi+e@;JiuC2ac0 X#9L%I;n(JU3qWF?u6{1-oD!MhL0xIZH)P{-{ncR+pIPQJ?|46 z=Sib{J~@ b6b6QvgrbP0l+XkK0(Muo literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/Uniforms/beethong.rsi/inhand-left.png b/Resources/Textures/Floof/Clothing/Uniforms/beethong.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..65f714bdc81eceefe347ec5f90a04a68414cdd96 GIT binary patch literal 372 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5`$3q|f;CtLC@5Xx z8c`CQpH@kCYY5{a0?yQ^h2pFl{gW9E_@lTI%E|FGfn^3!uw;|+}e z7PA0N!2%*WQ;oJde<;$pe6dMxp_D_{+^^5KOE*la*{rQ_SHGw^V8VMfprB_^{jQUz z^Cu*w@BEn;e!%FjT?V@+S6tNrZ9DDohQ)FQ{k@)-9{%FITGg;zGhi!w#T=%X7A)2w z3$5UMkej~1%;BW;A3a8|dk1!;)r*4J1pH{s>I QOKu>pr>mdKI;Vst0NH7M$^ZZW literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/Uniforms/beethong.rsi/inhand-right.png b/Resources/Textures/Floof/Clothing/Uniforms/beethong.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..d70c59c52842335f662370c2971310e4793b2a79 GIT binary patch literal 380 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5`$3q|f;CtLC@5Xx z8c`CQpH@F!Z*OhnJruyx z^3XVhN1!utg~rN^l@Uyxk`m2Yy1bd05^6%WD=!2(h;jIRJn^1!-Wq@P*PdlJu1(Pf z+JprtEZlW0Do5#~t9Mrt!>wJPioSbfTPWr1=3&Tw`-0EQ$Kig0BIgUK?bG*8yIsuX z6dgWo$r+bkt`EKYZ|ypjxhva__u08Ah3O71H_m5!UH<;~&ZI3?drvX$kbizItKt(w zO$!z~QG^}@|Fx=npth@`p-y&vBfH2^=7{X`kCrV|H&JPj{2suv)78&qol`;+0GD2Vy#N3J literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/Uniforms/beethong.rsi/meta.json b/Resources/Textures/Floof/Clothing/Uniforms/beethong.rsi/meta.json new file mode 100644 index 00000000000..ef52845d5fa --- /dev/null +++ b/Resources/Textures/Floof/Clothing/Uniforms/beethong.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprited by Dakota Haven", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Floof/Clothing/Uniforms/coderthong.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Floof/Clothing/Uniforms/coderthong.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..651618d7655a3283303dbd86b1cfbe405dfc21c3 GIT binary patch literal 517 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5`$3q|f;CtLC@5Xx z8c`CQpH@bg?*PQcQxMRyLeb3R}2#qyBjH@<19kz%5}9nLw%no91|T5}`Pj&J<5ou#vX zURrwihR%)$_WdmkED8*a91aXj0u2nx?cd`rnfM-yyDoR@=VZoLmrlN}n%c8>o$Z#- z&C3q#EW2zn>3L;R=(bru9T`erE_rLMBQAMsA2Y+6eRgLVOg=YPIn>^G{PHJj;(LBkmV3*MAMWx?rXycfyM` z4sWt9oC}F$eRb)tol2RgOnpa2YN4bG1EXBI>$v3 z-z-dV$+WFEwL&>|HnSI=Pn=nNr1_1ki%W{ObSnSGvr9NKU4$OT3#6Tz`E2&g@ADLt z{%mGpHeg^jIPi{P&vy})Mv2?;G6$Bmo%a%2~!ZTPiEIU1Lf{ zEIUJoeCG`x=56Z=EaoXJtzo<>%J86Q@7mu?i;bBYG^R9vzE)}<-&C9s&yYItviic> z+4@C{i;bm(ZY^^R5wrZ7YjLz`vq?gU+k1ssQcjy)EuKElab`F!Z*OhnJ!Bxz z`mlI1mtt1RtPq_^jtPBJ&M-Dtu(zxT+R13xGJ7!>tH{QKXIt-=c1`!6-o4a%`KnLn zk23=8!UPANdunE0HaU07d+L+3OcK8q+;&c9TcDCJ=Fk(k_j}S(F0W61Ogyz0Za>zW zy;WR0RN$NX*|XN16N0L26P7X^J9Aab!R1I4|B176?lRxnX389}mA&VFNco+aj1QDp zFs(xtad2&T{d7(DQ!kyfJgb>{s+q5)x5YD0IrAVrno()nH?|jyTmLf^-;n;ndEnMR fh3_D(5B}OPa>d9_IQ;qGOAz1F)z4*}Q$iB}al3;1 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/Uniforms/coderthong.rsi/inhand-right.png b/Resources/Textures/Floof/Clothing/Uniforms/coderthong.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..c37d5a3fb5f6fe248bafdd09ea1a518e883e274c GIT binary patch literal 367 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5`$3q|f;CtLC@5Xx z8c`CQpH@#nc$JxsagU_DkE3hx$wRcO}s>(>lJ>Rp|P7P5v zSMHg2DXw4b=*#7&esMc+Jd~cXh}*96=vfBAi6ZxNPpwhPZ+w*I@NVTFVdQ&MBb@0GHKu>i_@% literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/Uniforms/coderthong.rsi/meta.json b/Resources/Textures/Floof/Clothing/Uniforms/coderthong.rsi/meta.json new file mode 100644 index 00000000000..ef52845d5fa --- /dev/null +++ b/Resources/Textures/Floof/Clothing/Uniforms/coderthong.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprited by Dakota Haven", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Floof/Clothing/Uniforms/codervalidthong.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Floof/Clothing/Uniforms/codervalidthong.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..1c232c48f5eeed0e409a53a89ed9e75584ea59db GIT binary patch literal 367 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5`$3q|f;CtLC@5Xx z8c`CQpH@Luau8^H zc#}=olKHRMx{X(@C9ATlAJ5%ln&f<5(qLkm%|W$4Z~P8htBS~1&XDXnx^mT;oiacZ zuz(|{tJmk=-nH}l^sv4^CuIxnvF@#xGXGZf%4@EDHp`yxQK3_Fx}53`E5u&+JZC=N zxc(d8itp^Yr`LY@8=m)m`sR6eLwzopr07UV9BLDyZ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/Uniforms/codervalidthong.rsi/icon.png b/Resources/Textures/Floof/Clothing/Uniforms/codervalidthong.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..47ca60df4bfd887b1437ffa9548957eee40a4476 GIT binary patch literal 241 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oArNM~bhqvgP*A$W zHKHUqKdq!Zu_%?nIW?!avREOwq%z zg()`l^$xv1CjU=!xwyc}azJ+mmPQuQ|_LG~JfMZhU#7JJ0|u zpy9sZm%XviEh~PmnDjG^(I+>3`t3(-3sUyoWLG97? zGu|EaW}Gx7_@Lea_s<_#D}J+wXdig2Cy=})`0^D^he^jO%=BN+Zx+B}6|&G&Mz6et z|3U{IuQg;1U|_v+mvzrxxz&6R-ah4c4pR4^dJp5?a)k-g`eKIQC#0acB>S#v zg7xOZY6`!u#T9*9Ve*$}!HqXhKj&>qWK+aq1F{es>xx?IH*yQUsm@}Vz#w#?o++!Y k|Bow(G+<|7IB Date: Wed, 14 Aug 2024 21:49:21 -0600 Subject: [PATCH 11/38] Signed-off-by: Dakota Haven --- .../Floof/Clothing/Under/Gloves/beewarmer.rsi/meta.json | 2 +- .../Floof/Clothing/Under/Gloves/codervalidwarmer.rsi/meta.json | 2 +- .../Floof/Clothing/Under/Gloves/coderwarmer.rsi/meta.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Resources/Textures/Floof/Clothing/Under/Gloves/beewarmer.rsi/meta.json b/Resources/Textures/Floof/Clothing/Under/Gloves/beewarmer.rsi/meta.json index 342a11922db..f6904e7bf3e 100644 --- a/Resources/Textures/Floof/Clothing/Under/Gloves/beewarmer.rsi/meta.json +++ b/Resources/Textures/Floof/Clothing/Under/Gloves/beewarmer.rsi/meta.json @@ -13,6 +13,6 @@ { "name": "equipped-HAND", "directions": 4 - }, + } ] } diff --git a/Resources/Textures/Floof/Clothing/Under/Gloves/codervalidwarmer.rsi/meta.json b/Resources/Textures/Floof/Clothing/Under/Gloves/codervalidwarmer.rsi/meta.json index 342a11922db..f6904e7bf3e 100644 --- a/Resources/Textures/Floof/Clothing/Under/Gloves/codervalidwarmer.rsi/meta.json +++ b/Resources/Textures/Floof/Clothing/Under/Gloves/codervalidwarmer.rsi/meta.json @@ -13,6 +13,6 @@ { "name": "equipped-HAND", "directions": 4 - }, + } ] } diff --git a/Resources/Textures/Floof/Clothing/Under/Gloves/coderwarmer.rsi/meta.json b/Resources/Textures/Floof/Clothing/Under/Gloves/coderwarmer.rsi/meta.json index 342a11922db..f6904e7bf3e 100644 --- a/Resources/Textures/Floof/Clothing/Under/Gloves/coderwarmer.rsi/meta.json +++ b/Resources/Textures/Floof/Clothing/Under/Gloves/coderwarmer.rsi/meta.json @@ -13,6 +13,6 @@ { "name": "equipped-HAND", "directions": 4 - }, + } ] } From be46a14db4e922d4736e87af478bbcc12fa8331c Mon Sep 17 00:00:00 2001 From: Dakota Haven Date: Wed, 14 Aug 2024 22:01:56 -0600 Subject: [PATCH 12/38] Signed-off-by: Dakota Haven --- .../coderthong.rsi/equipped-INNERCLOTHING.png | Bin 517 -> 371 bytes .../Clothing/Uniforms/coderthong.rsi/icon.png | Bin 323 -> 247 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/Resources/Textures/Floof/Clothing/Uniforms/coderthong.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Floof/Clothing/Uniforms/coderthong.rsi/equipped-INNERCLOTHING.png index 651618d7655a3283303dbd86b1cfbe405dfc21c3..e6d6d4c09c71357156011a7a6e05c6056f16464c 100644 GIT binary patch delta 285 zcmZo=`OGvSzMkQqr;B4q#jUru4EYWzh#V`7n9);cw!>QTv22wKKOLf&Y)|z%746F74)v=)Sm~EK!s-6tL4@&m%24k zX0Cv8{UrgP+GoX2K8s_s23f4({;JnjhR6Oqtut^do5FYEtC@o9vkZp&y*cOnKBS&~ m)OupO&iz{wO$a^AVpo|Ls~JyV<^CuO67_WTb6Mw<&;$U@q-&l4 delta 432 zcmey&)XFj;zMgS{r;B4q#jUru4D*^D1XwTlJBzxm)V&k1v}@6wgY2Bo7ksfizjP+10#n61Cu}lgL3=# zxJxF!$KtNb-TFD1@ztf1udAl^>|JNO<#Y4013Swun@oCMnG{;TZPrgmhSHZy-dgL3 zOWxYY%&=yk-B|{c&&^d1wKpEW{K*t(6#STrg7{QlDUrxh4E4EP^}E#}O1`F>`84C8dE-m7jN*7g}(Z?;KW#f;TMCpMQ%xEK z7C-m*y0Jl$O87i2#SPY(|LU(-c1ldUv*PC8_{B%3PSgu5czI~&f14U69wQ?ofz#__ z6BVvL7g^qT*YorL(_SYHZ0f$XFh+M=P!*gc{Cx4v0*D Date: Wed, 14 Aug 2024 23:40:21 -0600 Subject: [PATCH 13/38] Signed-off-by: Dakota Haven --- .../Entities/Clothing/Hands/miscgloves.yml | 75 ++++++++++++++++++ .../Floof/Entities/Clothing/Head/misc.yml | 11 +++ .../Clothing/OuterClothing/MiscOuterwear.yml | 43 ++++++++++ .../Floof/Entities/Clothing/Under/under.yml | 55 +++++++++++++ .../Floof/Entities/Clothing/Uniforms/misc.yml | 55 +++++++++++++ .../sexcompcirclet.rsi/equipped-HELMET.png | Bin 0 -> 318 bytes .../Clothing/Head/sexcompcirclet.rsi/icon.png | Bin 0 -> 210 bytes .../Head/sexcompcirclet.rsi/meta.json | 18 +++++ .../equipped-OUTERCLOTHING.png | Bin 0 -> 1718 bytes .../Misc/beltedouterwear.rsi/icon.png | Bin 0 -> 686 bytes .../Misc/beltedouterwear.rsi/inhand-left.png | Bin 0 -> 342 bytes .../Misc/beltedouterwear.rsi/inhand-right.png | Bin 0 -> 345 bytes .../Misc/beltedouterwear.rsi/meta.json | 26 ++++++ .../equipped-OUTERCLOTHING.png | Bin 0 -> 508 bytes .../Misc/sexcompbeltbronze.rsi/icon.png | Bin 0 -> 285 bytes .../sexcompbeltbronze.rsi/inhand-left.png | Bin 0 -> 433 bytes .../sexcompbeltbronze.rsi/inhand-right.png | Bin 0 -> 439 bytes .../Misc/sexcompbeltbronze.rsi/meta.json | 26 ++++++ .../equipped-OUTERCLOTHING.png | Bin 0 -> 496 bytes .../Misc/sexcompbeltgold.rsi/icon.png | Bin 0 -> 282 bytes .../Misc/sexcompbeltgold.rsi/inhand-left.png | Bin 0 -> 422 bytes .../Misc/sexcompbeltgold.rsi/inhand-right.png | Bin 0 -> 429 bytes .../Misc/sexcompbeltgold.rsi/meta.json | 26 ++++++ .../equipped-OUTERCLOTHING.png | Bin 0 -> 506 bytes .../Misc/sexcompbeltsilver.rsi/icon.png | Bin 0 -> 284 bytes .../sexcompbeltsilver.rsi/inhand-left.png | Bin 0 -> 424 bytes .../sexcompbeltsilver.rsi/inhand-right.png | Bin 0 -> 432 bytes .../Misc/sexcompbeltsilver.rsi/meta.json | 26 ++++++ .../sexcompbluegloves.rsi/equipped-HAND.png | Bin 0 -> 902 bytes .../Gloves/sexcompbluegloves.rsi/icon.png | Bin 0 -> 391 bytes .../Gloves/sexcompbluegloves.rsi/meta.json | 18 +++++ .../sexcompredgloves.rsi/equipped-HAND.png | Bin 0 -> 851 bytes .../Gloves/sexcompredgloves.rsi/icon.png | Bin 0 -> 368 bytes .../Gloves/sexcompredgloves.rsi/meta.json | 18 +++++ .../stripewarmerpurple.rsi/equipped-HAND.png | Bin 0 -> 502 bytes .../Gloves/stripewarmerpurple.rsi/icon.png | Bin 0 -> 274 bytes .../Gloves/stripewarmerpurple.rsi/meta.json | 18 +++++ .../stripewarmerrainbow.rsi/equipped-HAND.png | Bin 0 -> 655 bytes .../Gloves/stripewarmerrainbow.rsi/icon.png | Bin 0 -> 365 bytes .../Gloves/stripewarmerrainbow.rsi/meta.json | 18 +++++ .../stripewarmerwhite.rsi/equipped-HAND.png | Bin 0 -> 456 bytes .../Gloves/stripewarmerwhite.rsi/icon.png | Bin 0 -> 257 bytes .../Gloves/stripewarmerwhite.rsi/meta.json | 18 +++++ .../sexcompblueboots.rsi/equipped-FEET.png | Bin 0 -> 1143 bytes .../Under/Socks/sexcompblueboots.rsi/icon.png | Bin 0 -> 453 bytes .../Socks/sexcompblueboots.rsi/meta.json | 18 +++++ .../sexcompredboots.rsi/equipped-FEET.png | Bin 0 -> 1064 bytes .../Under/Socks/sexcompredboots.rsi/icon.png | Bin 0 -> 430 bytes .../Under/Socks/sexcompredboots.rsi/meta.json | 18 +++++ .../stripesockspurple.rsi/equipped-FEET.png | Bin 0 -> 421 bytes .../Socks/stripesockspurple.rsi/icon.png | Bin 0 -> 272 bytes .../Socks/stripesockspurple.rsi/meta.json | 18 +++++ .../stripesocksrainbow.rsi/equipped-FEET.png | Bin 0 -> 666 bytes .../Socks/stripesocksrainbow.rsi/icon.png | Bin 0 -> 383 bytes .../Socks/stripesocksrainbow.rsi/meta.json | 18 +++++ .../stripesockswhite.rsi/equipped-FEET.png | Bin 0 -> 403 bytes .../Under/Socks/stripesockswhite.rsi/icon.png | Bin 0 -> 255 bytes .../Socks/stripesockswhite.rsi/meta.json | 18 +++++ .../equipped-INNERCLOTHING.png | Bin 0 -> 757 bytes .../Uniforms/sexcompblue.rsi/icon.png | Bin 0 -> 340 bytes .../Uniforms/sexcompblue.rsi/inhand-left.png | Bin 0 -> 271 bytes .../Uniforms/sexcompblue.rsi/inhand-right.png | Bin 0 -> 270 bytes .../Uniforms/sexcompblue.rsi/meta.json | 26 ++++++ .../sexcompred.rsi/equipped-INNERCLOTHING.png | Bin 0 -> 693 bytes .../Clothing/Uniforms/sexcompred.rsi/icon.png | Bin 0 -> 330 bytes .../Uniforms/sexcompred.rsi/inhand-left.png | Bin 0 -> 269 bytes .../Uniforms/sexcompred.rsi/inhand-right.png | Bin 0 -> 267 bytes .../Uniforms/sexcompred.rsi/meta.json | 26 ++++++ .../equipped-INNERCLOTHING.png | Bin 0 -> 368 bytes .../Uniforms/stripethongpurple.rsi/icon.png | Bin 0 -> 237 bytes .../stripethongpurple.rsi/inhand-left.png | Bin 0 -> 441 bytes .../stripethongpurple.rsi/inhand-right.png | Bin 0 -> 451 bytes .../Uniforms/stripethongpurple.rsi/meta.json | 26 ++++++ .../equipped-INNERCLOTHING.png | Bin 0 -> 401 bytes .../Uniforms/stripethongrainbow.rsi/icon.png | Bin 0 -> 253 bytes .../stripethongrainbow.rsi/inhand-left.png | Bin 0 -> 437 bytes .../stripethongrainbow.rsi/inhand-right.png | Bin 0 -> 443 bytes .../Uniforms/stripethongrainbow.rsi/meta.json | 26 ++++++ .../equipped-INNERCLOTHING.png | Bin 0 -> 345 bytes .../Uniforms/stripethongwhite.rsi/icon.png | Bin 0 -> 227 bytes .../stripethongwhite.rsi/inhand-left.png | Bin 0 -> 382 bytes .../stripethongwhite.rsi/inhand-right.png | Bin 0 -> 381 bytes .../Uniforms/stripethongwhite.rsi/meta.json | 26 ++++++ 83 files changed, 671 insertions(+) create mode 100644 Resources/Prototypes/Floof/Entities/Clothing/OuterClothing/MiscOuterwear.yml create mode 100644 Resources/Textures/Floof/Clothing/Head/sexcompcirclet.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/Floof/Clothing/Head/sexcompcirclet.rsi/icon.png create mode 100644 Resources/Textures/Floof/Clothing/Head/sexcompcirclet.rsi/meta.json create mode 100644 Resources/Textures/Floof/Clothing/OuterClothing/Misc/beltedouterwear.rsi/equipped-OUTERCLOTHING.png create mode 100644 Resources/Textures/Floof/Clothing/OuterClothing/Misc/beltedouterwear.rsi/icon.png create mode 100644 Resources/Textures/Floof/Clothing/OuterClothing/Misc/beltedouterwear.rsi/inhand-left.png create mode 100644 Resources/Textures/Floof/Clothing/OuterClothing/Misc/beltedouterwear.rsi/inhand-right.png create mode 100644 Resources/Textures/Floof/Clothing/OuterClothing/Misc/beltedouterwear.rsi/meta.json create mode 100644 Resources/Textures/Floof/Clothing/OuterClothing/Misc/sexcompbeltbronze.rsi/equipped-OUTERCLOTHING.png create mode 100644 Resources/Textures/Floof/Clothing/OuterClothing/Misc/sexcompbeltbronze.rsi/icon.png create mode 100644 Resources/Textures/Floof/Clothing/OuterClothing/Misc/sexcompbeltbronze.rsi/inhand-left.png create mode 100644 Resources/Textures/Floof/Clothing/OuterClothing/Misc/sexcompbeltbronze.rsi/inhand-right.png create mode 100644 Resources/Textures/Floof/Clothing/OuterClothing/Misc/sexcompbeltbronze.rsi/meta.json create mode 100644 Resources/Textures/Floof/Clothing/OuterClothing/Misc/sexcompbeltgold.rsi/equipped-OUTERCLOTHING.png create mode 100644 Resources/Textures/Floof/Clothing/OuterClothing/Misc/sexcompbeltgold.rsi/icon.png create mode 100644 Resources/Textures/Floof/Clothing/OuterClothing/Misc/sexcompbeltgold.rsi/inhand-left.png create mode 100644 Resources/Textures/Floof/Clothing/OuterClothing/Misc/sexcompbeltgold.rsi/inhand-right.png create mode 100644 Resources/Textures/Floof/Clothing/OuterClothing/Misc/sexcompbeltgold.rsi/meta.json create mode 100644 Resources/Textures/Floof/Clothing/OuterClothing/Misc/sexcompbeltsilver.rsi/equipped-OUTERCLOTHING.png create mode 100644 Resources/Textures/Floof/Clothing/OuterClothing/Misc/sexcompbeltsilver.rsi/icon.png create mode 100644 Resources/Textures/Floof/Clothing/OuterClothing/Misc/sexcompbeltsilver.rsi/inhand-left.png create mode 100644 Resources/Textures/Floof/Clothing/OuterClothing/Misc/sexcompbeltsilver.rsi/inhand-right.png create mode 100644 Resources/Textures/Floof/Clothing/OuterClothing/Misc/sexcompbeltsilver.rsi/meta.json create mode 100644 Resources/Textures/Floof/Clothing/Under/Gloves/sexcompbluegloves.rsi/equipped-HAND.png create mode 100644 Resources/Textures/Floof/Clothing/Under/Gloves/sexcompbluegloves.rsi/icon.png create mode 100644 Resources/Textures/Floof/Clothing/Under/Gloves/sexcompbluegloves.rsi/meta.json create mode 100644 Resources/Textures/Floof/Clothing/Under/Gloves/sexcompredgloves.rsi/equipped-HAND.png create mode 100644 Resources/Textures/Floof/Clothing/Under/Gloves/sexcompredgloves.rsi/icon.png create mode 100644 Resources/Textures/Floof/Clothing/Under/Gloves/sexcompredgloves.rsi/meta.json create mode 100644 Resources/Textures/Floof/Clothing/Under/Gloves/stripewarmerpurple.rsi/equipped-HAND.png create mode 100644 Resources/Textures/Floof/Clothing/Under/Gloves/stripewarmerpurple.rsi/icon.png create mode 100644 Resources/Textures/Floof/Clothing/Under/Gloves/stripewarmerpurple.rsi/meta.json create mode 100644 Resources/Textures/Floof/Clothing/Under/Gloves/stripewarmerrainbow.rsi/equipped-HAND.png create mode 100644 Resources/Textures/Floof/Clothing/Under/Gloves/stripewarmerrainbow.rsi/icon.png create mode 100644 Resources/Textures/Floof/Clothing/Under/Gloves/stripewarmerrainbow.rsi/meta.json create mode 100644 Resources/Textures/Floof/Clothing/Under/Gloves/stripewarmerwhite.rsi/equipped-HAND.png create mode 100644 Resources/Textures/Floof/Clothing/Under/Gloves/stripewarmerwhite.rsi/icon.png create mode 100644 Resources/Textures/Floof/Clothing/Under/Gloves/stripewarmerwhite.rsi/meta.json create mode 100644 Resources/Textures/Floof/Clothing/Under/Socks/sexcompblueboots.rsi/equipped-FEET.png create mode 100644 Resources/Textures/Floof/Clothing/Under/Socks/sexcompblueboots.rsi/icon.png create mode 100644 Resources/Textures/Floof/Clothing/Under/Socks/sexcompblueboots.rsi/meta.json create mode 100644 Resources/Textures/Floof/Clothing/Under/Socks/sexcompredboots.rsi/equipped-FEET.png create mode 100644 Resources/Textures/Floof/Clothing/Under/Socks/sexcompredboots.rsi/icon.png create mode 100644 Resources/Textures/Floof/Clothing/Under/Socks/sexcompredboots.rsi/meta.json create mode 100644 Resources/Textures/Floof/Clothing/Under/Socks/stripesockspurple.rsi/equipped-FEET.png create mode 100644 Resources/Textures/Floof/Clothing/Under/Socks/stripesockspurple.rsi/icon.png create mode 100644 Resources/Textures/Floof/Clothing/Under/Socks/stripesockspurple.rsi/meta.json create mode 100644 Resources/Textures/Floof/Clothing/Under/Socks/stripesocksrainbow.rsi/equipped-FEET.png create mode 100644 Resources/Textures/Floof/Clothing/Under/Socks/stripesocksrainbow.rsi/icon.png create mode 100644 Resources/Textures/Floof/Clothing/Under/Socks/stripesocksrainbow.rsi/meta.json create mode 100644 Resources/Textures/Floof/Clothing/Under/Socks/stripesockswhite.rsi/equipped-FEET.png create mode 100644 Resources/Textures/Floof/Clothing/Under/Socks/stripesockswhite.rsi/icon.png create mode 100644 Resources/Textures/Floof/Clothing/Under/Socks/stripesockswhite.rsi/meta.json create mode 100644 Resources/Textures/Floof/Clothing/Uniforms/sexcompblue.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/Floof/Clothing/Uniforms/sexcompblue.rsi/icon.png create mode 100644 Resources/Textures/Floof/Clothing/Uniforms/sexcompblue.rsi/inhand-left.png create mode 100644 Resources/Textures/Floof/Clothing/Uniforms/sexcompblue.rsi/inhand-right.png create mode 100644 Resources/Textures/Floof/Clothing/Uniforms/sexcompblue.rsi/meta.json create mode 100644 Resources/Textures/Floof/Clothing/Uniforms/sexcompred.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/Floof/Clothing/Uniforms/sexcompred.rsi/icon.png create mode 100644 Resources/Textures/Floof/Clothing/Uniforms/sexcompred.rsi/inhand-left.png create mode 100644 Resources/Textures/Floof/Clothing/Uniforms/sexcompred.rsi/inhand-right.png create mode 100644 Resources/Textures/Floof/Clothing/Uniforms/sexcompred.rsi/meta.json create mode 100644 Resources/Textures/Floof/Clothing/Uniforms/stripethongpurple.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/Floof/Clothing/Uniforms/stripethongpurple.rsi/icon.png create mode 100644 Resources/Textures/Floof/Clothing/Uniforms/stripethongpurple.rsi/inhand-left.png create mode 100644 Resources/Textures/Floof/Clothing/Uniforms/stripethongpurple.rsi/inhand-right.png create mode 100644 Resources/Textures/Floof/Clothing/Uniforms/stripethongpurple.rsi/meta.json create mode 100644 Resources/Textures/Floof/Clothing/Uniforms/stripethongrainbow.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/Floof/Clothing/Uniforms/stripethongrainbow.rsi/icon.png create mode 100644 Resources/Textures/Floof/Clothing/Uniforms/stripethongrainbow.rsi/inhand-left.png create mode 100644 Resources/Textures/Floof/Clothing/Uniforms/stripethongrainbow.rsi/inhand-right.png create mode 100644 Resources/Textures/Floof/Clothing/Uniforms/stripethongrainbow.rsi/meta.json create mode 100644 Resources/Textures/Floof/Clothing/Uniforms/stripethongwhite.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/Floof/Clothing/Uniforms/stripethongwhite.rsi/icon.png create mode 100644 Resources/Textures/Floof/Clothing/Uniforms/stripethongwhite.rsi/inhand-left.png create mode 100644 Resources/Textures/Floof/Clothing/Uniforms/stripethongwhite.rsi/inhand-right.png create mode 100644 Resources/Textures/Floof/Clothing/Uniforms/stripethongwhite.rsi/meta.json diff --git a/Resources/Prototypes/Floof/Entities/Clothing/Hands/miscgloves.yml b/Resources/Prototypes/Floof/Entities/Clothing/Hands/miscgloves.yml index 75da4e22a9c..bc3cde0b85f 100644 --- a/Resources/Prototypes/Floof/Entities/Clothing/Hands/miscgloves.yml +++ b/Resources/Prototypes/Floof/Entities/Clothing/Hands/miscgloves.yml @@ -57,3 +57,78 @@ fiberMaterial: fibers-synthetic fiberColor: fibers-red - type: FingerprintMask + +- type: entity + parent: ClothingHandsBase + id: ClothingHandsStripeWhiteWarmers + name: striped white arm-warmers + description: A pair of rather nice arm-warmers + components: + - type: Sprite + sprite: Floof/Clothing/Under/Gloves/stripewarmerwhite.rsi + - type: Clothing + sprite: Floof/Clothing/Under/Gloves/stripewarmerwhite.rsi + - type: Fiber + fiberMaterial: fibers-cotton + fiberColor: fibers-white + - type: FingerprintMask + +- type: entity + parent: ClothingHandsBase + id: ClothingHandsStripePurpleWarmers + name: striped purple arm-warmers + description: A pair of rather nice arm-warmers + components: + - type: Sprite + sprite: Floof/Clothing/Under/Gloves/stripewarmerpurple.rsi + - type: Clothing + sprite: Floof/Clothing/Under/Gloves/stripewarmerpurple.rsi + - type: Fiber + fiberMaterial: fibers-cotton + fiberColor: fibers-purple + - type: FingerprintMask + +- type: entity + parent: ClothingHandsBase + id: ClothingHandsStripeRainbowWarmers + name: striped rainbow arm-warmers + description: A pair of rather nice arm-warmers + components: + - type: Sprite + sprite: Floof/Clothing/Under/Gloves/stripewarmerrainbow.rsi + - type: Clothing + sprite: Floof/Clothing/Under/Gloves/stripewarmerrainbow.rsi + - type: Fiber + fiberMaterial: fibers-cotton + fiberColor: fibers-colorful + - type: FingerprintMask + +- type: entity + parent: ClothingHandsBase + id: ClothingHandsSexCompGlovesRed + name: red sex competition gloves + description: It looks like it should be part of a competition. + components: + - type: Sprite + sprite: Floof/Clothing/Under/Gloves/sexcompredgloves.rsi + - type: Clothing + sprite: Floof/Clothing/Under/Gloves/sexcompredgloves.rsi + - type: Fiber + fiberMaterial: fibers-synthetic + fiberColor: fibers-red + - type: FingerprintMask + +- type: entity + parent: ClothingHandsBase + id: ClothingHandsSexCompGlovesBlue + name: blue sex competition gloves + description: It looks like it should be part of a competition. + components: + - type: Sprite + sprite: Floof/Clothing/Under/Gloves/sexcompbluegloves.rsi + - type: Clothing + sprite: Floof/Clothing/Under/Gloves/sexcompbluegloves.rsi + - type: Fiber + fiberMaterial: fibers-synthetic + fiberColor: fibers-blue + - type: FingerprintMask diff --git a/Resources/Prototypes/Floof/Entities/Clothing/Head/misc.yml b/Resources/Prototypes/Floof/Entities/Clothing/Head/misc.yml index a3d2f4d0cfa..4fac780b8fb 100644 --- a/Resources/Prototypes/Floof/Entities/Clothing/Head/misc.yml +++ b/Resources/Prototypes/Floof/Entities/Clothing/Head/misc.yml @@ -19,3 +19,14 @@ sprite: Clothing/Head/Hats/dogears.rsi - type: Clothing sprite: Clothing/Head/Hats/dogears.rsi + +- type: entity + parent: ClothingHeadBase + id: ClothingHeadSexCompCirclet + name: sex competition circlet + description: It looks like it should be part of a competition. + components: + - type: Sprite + sprite: Floof/Clothing/Head/sexcompcirclet.rsi + - type: Clothing + sprite: Floof/Clothing/Head/sexcompcirclet.rsi diff --git a/Resources/Prototypes/Floof/Entities/Clothing/OuterClothing/MiscOuterwear.yml b/Resources/Prototypes/Floof/Entities/Clothing/OuterClothing/MiscOuterwear.yml new file mode 100644 index 00000000000..d134889254f --- /dev/null +++ b/Resources/Prototypes/Floof/Entities/Clothing/OuterClothing/MiscOuterwear.yml @@ -0,0 +1,43 @@ +- type: entity + parent: ClothingOuterBase + id: ClothingOuterSexCompBeltBronze + name: bronze sex competition belt + description: Looks like you came third in a competion. + components: + - type: Sprite + sprite: Floof/Clothing/OtherClothing/Misc/sexcompbeltbronze.rsi + - type: Clothing + sprite: Floof/Clothing/OtherClothing/Misc/sexcompbeltbronze.rsi + +- type: entity + parent: ClothingOuterBase + id: ClothingOuterSexCompBeltSilver + name: silver sex competition belt + description: Looks like you came second in a competion. + components: + - type: Sprite + sprite: Floof/Clothing/OtherClothing/Misc/sexcompbeltsilver.rsi + - type: Clothing + sprite: Floof/Clothing/OtherClothing/Misc/sexcompbeltsilver.rsi + +- type: entity + parent: ClothingOuterBase + id: ClothingOuterSexCompBeltGold + name: gold sex competition belt + description: Looks like you came in first in a competion. + components: + - type: Sprite + sprite: Floof/Clothing/OtherClothing/Misc/sexcompbeltgold.rsi + - type: Clothing + sprite: Floof/Clothing/OtherClothing/Misc/sexcompbeltgold.rsi + +- type: entity + parent: ClothingOuterBase + id: ClothingOuterBeltedOutfit + name: belted outerwear + description: What? Do you think youre an anime protagonist or something? + components: + - type: Sprite + sprite: Floof/Clothing/OtherClothing/Misc/beltedouterwear.rsi + - type: Clothing + sprite: Floof/Clothing/OtherClothing/Misc/beltedouterwear.rsi diff --git a/Resources/Prototypes/Floof/Entities/Clothing/Under/under.yml b/Resources/Prototypes/Floof/Entities/Clothing/Under/under.yml index e5d5e542260..7ee823f49ad 100644 --- a/Resources/Prototypes/Floof/Entities/Clothing/Under/under.yml +++ b/Resources/Prototypes/Floof/Entities/Clothing/Under/under.yml @@ -19,3 +19,58 @@ sprite: Floof/Clothing/Under/Socks/plainsocks.rsi - type: Clothing sprite: Floof/Clothing/Under/Socks/plainsocks.rsi + +- type: entity + parent: ClothingShoesBase + id: ClothingUnderSocksStripedWhite + name: striped white thigh-high socks + description: Just a plain pair of thigh-high socks. + components: + - type: Sprite + sprite: Floof/Clothing/Under/Socks/stripesockswhite.rsi + - type: Clothing + sprite: Floof/Clothing/Under/Socks/stripesockswhite.rsi + +- type: entity + parent: ClothingShoesBase + id: ClothingUnderSocksStripedPurple + name: striped purple thigh-high socks + description: Just a plain pair of thigh-high socks. + components: + - type: Sprite + sprite: Floof/Clothing/Under/Socks/stripesockspurple.rsi + - type: Clothing + sprite: Floof/Clothing/Under/Socks/stripesockspurple.rsi + +- type: entity + parent: ClothingShoesBase + id: ClothingUnderSocksStripedRainbow + name: striped rainbow thigh-high socks + description: Just a plain pair of thigh-high socks. + components: + - type: Sprite + sprite: Floof/Clothing/Under/Socks/stripesocksrainbow.rsi + - type: Clothing + sprite: Floof/Clothing/Under/Socks/stripesocksrainbow.rsi + +- type: entity + parent: ClothingShoesBase + id: ClothingUnderSexCompBootsRed + name: red sex competition boots + description: It looks like it should be part of a competition. + components: + - type: Sprite + sprite: Floof/Clothing/Under/Socks/sexcompredboots.rsi + - type: Clothing + sprite: Floof/Clothing/Under/Socks/sexcompredboots.rsi + +- type: entity + parent: ClothingShoesBase + id: ClothingUnderSexCompBootsBlue + name: blue sex competition boots + description: It looks like it should be part of a competition. + components: + - type: Sprite + sprite: Floof/Clothing/Under/Socks/sexcompblueboots.rsi + - type: Clothing + sprite: Floof/Clothing/Under/Socks/sexcompblueboots.rsi diff --git a/Resources/Prototypes/Floof/Entities/Clothing/Uniforms/misc.yml b/Resources/Prototypes/Floof/Entities/Clothing/Uniforms/misc.yml index cebf8136b47..1938a2a03aa 100644 --- a/Resources/Prototypes/Floof/Entities/Clothing/Uniforms/misc.yml +++ b/Resources/Prototypes/Floof/Entities/Clothing/Uniforms/misc.yml @@ -78,3 +78,58 @@ sprite: Floof/Clothing/Uniforms/codervalidthong.rsi - type: Clothing sprite: Floof/Clothing/Uniforms/codervalidthong.rsi + +- type: entity + parent: ClothingUniformBase + id: ClothingUniformStripedThongWhite + name: striped white thong + description: Is this even considered a piece of clothing? + components: + - type: Sprite + sprite: Floof/Clothing/Uniforms/stripethongwhite.rsi + - type: Clothing + sprite: Floof/Clothing/Uniforms/stripethongwhite.rsi + +- type: entity + parent: ClothingUniformBase + id: ClothingUniformStripedThongPurple + name: striped purple thong + description: Is this even considered a piece of clothing? + components: + - type: Sprite + sprite: Floof/Clothing/Uniforms/stripethongpurple.rsi + - type: Clothing + sprite: Floof/Clothing/Uniforms/stripethongpurple.rsi + +- type: entity + parent: ClothingUniformBase + id: ClothingUniformStripedThongRainbow + name: striped rainbow thong + description: Is this even considered a piece of clothing? + components: + - type: Sprite + sprite: Floof/Clothing/Uniforms/stripethongrainbow.rsi + - type: Clothing + sprite: Floof/Clothing/Uniforms/stripethongrainbow.rsi + +- type: entity + parent: ClothingUniformBase + id: ClothingUniformSexCompRed + name: red sex competition outfit + description: It looks like it should be part of a competition, but wheres the rest? + components: + - type: Sprite + sprite: Floof/Clothing/Uniforms/sexcompred.rsi + - type: Clothing + sprite: Floof/Clothing/Uniforms/sexcompred.rsi + +- type: entity + parent: ClothingUniformBase + id: ClothingUniformSexCompBlue + name: blue sex competition outfit + description: It looks like it should be part of a competition, but wheres the rest? + components: + - type: Sprite + sprite: Floof/Clothing/Uniforms/sexcompblue.rsi + - type: Clothing + sprite: Floof/Clothing/Uniforms/sexcompblue.rsi diff --git a/Resources/Textures/Floof/Clothing/Head/sexcompcirclet.rsi/equipped-HELMET.png b/Resources/Textures/Floof/Clothing/Head/sexcompcirclet.rsi/equipped-HELMET.png new file mode 100644 index 0000000000000000000000000000000000000000..e1009f7a82617f912b03db8283ab3157f8a83803 GIT binary patch literal 318 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5`$3q|f;CtLC@5Xx z8c`CQpH@>6}VD$h1 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/Head/sexcompcirclet.rsi/icon.png b/Resources/Textures/Floof/Clothing/Head/sexcompcirclet.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..e4e4346a6ee164f526b66bc70089444880e6e58a GIT binary patch literal 210 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4j{UFR}!5XXr6qGJ; zjVKAuPb(=;EJ|f?PR%KKZ3 z>~&6(6p6jS9UI{BYJtG7j^srjR`@gS;7Iy*=9apiD~s)P77hUghlU0gTe~DWM4fSocB< literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/Head/sexcompcirclet.rsi/meta.json b/Resources/Textures/Floof/Clothing/Head/sexcompcirclet.rsi/meta.json new file mode 100644 index 00000000000..e5c7e8bcc30 --- /dev/null +++ b/Resources/Textures/Floof/Clothing/Head/sexcompcirclet.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprited by Dakota Haven", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Floof/Clothing/OuterClothing/Misc/beltedouterwear.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Floof/Clothing/OuterClothing/Misc/beltedouterwear.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..fcb2ee3e0f3d95689e1a8e4eac28650e97a8dd06 GIT binary patch literal 1718 zcmV;n21)seP)YAX9X8WNB|8RBvx=!KdMT000I- zNkl$=pcGKYC;JiOU5J;9~R`494)oO`|kVqt!+kp)LTJVSWpdf^n&`v#%@-2DBTnwqGyvy&}es3o8;?j|%}Wd#iZ zgTX-2Xmr`Cr^|2I!xYHURc5hRC>#zmj^k*tLg#W+!9pPZ%?=n^yAh2>Swlku5fS`; zKgPRX0~{w9e%nWU^X~wFImvSzM~TxLp>6Zz6#^EEg~IpRAZ|E~P$hk*4|%Lu@#YwQ^HljZn6dDh`diQ zeY7mY#=hPRwA^4gx0SeKo@JE+cMcOapUoe_<-LR#ep&9nV=M6THHOQ3$t%(P)q>=ye0&IF1ruJ_*C|dl_HWYPHhDy*7xor=Ubv$n!kK zzTE-q(Z4eG{1%Ia!q=K%c=|$Ci=loFuNQz;tEKq&J7GQ2i|XoXM59sk_xCfm+f6o` z4L+X_qZfCdj(g38Ow5sSqTZhs28{Wnms zMo3jadW`*h3{u@W*zIsMOLd7UauDuXX>GA>4Xx^k=bmf$^N%cwYeRV zBq1CQV_;x_iK0jjhXbKd2)<98;E&wSs{2$GuwDRyAdr0NSv<186Lz~Dqobn;1OlwG zvXWdb7rb6C#!k4w9l4Es+tU?$lAePQw{)PQq5_df1c5++>GgVYI-QuEokjl#Cg|S2 zo0Wf60V)6$fC@kbpaM_o<|@5qVYs(zn5lMk5ttC}Pc*U$g;|?N)rw0}^xBRaI4Fx7#7hGJ?UN;!`3#&r?}h z8JtchB9X}aDHX7AV5)o$`1?)56JITH-82z4H*X_29FcmCyO&70%SflQtD`Y zEg!j#$K+iFOePZvf&i1rgrT7!L_VznTDz51!TCngwRs>(5)1|dd_Et>#>R5?xo!ZW zD9-;e)O!fR#xuxuE=P&H5c}eBaK}8*Xf()XVl6KP2!cS>)zyf{;}{(sMeOVr;MG5r zh0=YH%+Fs2$8m5t90&vg$S3#Y3?Nf17J4oqlV!^E`Q)D50Gw|m9Jt9=E00QA`n(bV z;A%5r_eEu^0Aq~G%gdMSyYoCxvG1C&>Ikh8*1navwxxp^q9{^090n07(+I6J5Rq|3 z6t3hrdM;5_K(+uxQKVEVg~YAX9X8WNB|8RBvx=!KdMT0006x zNklH)5a)D2hU#&xd?I-v&}um1ARLs8lLq;1+0_ z##*f=5{U$}*({pPCaTq{2nK`P-Q5*`r3aG9Br};z8|+WPyAn_og(Ts+?k~ktsT5aN zSC1s1swzpM(P)U{EAZ?*ar4Dd|2w z17&ujPZo5Uh=B*up4{nlnzn6YXJ<$JF1M7D0N}c=P*s)ndc99QP`Xd}A9QqhePIHa z{vfb;j&g3JV^Z+tE-~>`9E*Tq7%UcxhZd1ivIF=4<@(+Ou~>|)RtwwP+d|VcdORNN zpOAqhp_G#Dqto!-+d2@;Fbo#AW)X}%L@%j0JkPPBC~UmA2xI0m#>dCuI1V;9H$^lW zWhfLvHk(E6)n$0EEcIl^@F)-n1o-{y98Sg;5s5@lC=_5>mM~3|hGD?6EEJ!dg*Lr{ zUcza36wq~@<)y1QadQQcNCdfD4*7gugu`K)rU}ckP?(QG&V0gA*)aMQ|91p_0Cj6< U&^iLO;{X5v07*qoM6N<$g3hfl$N&HU literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/OuterClothing/Misc/beltedouterwear.rsi/inhand-left.png b/Resources/Textures/Floof/Clothing/OuterClothing/Misc/beltedouterwear.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..3c9a0580f73b81d6c92335eab49502edee2da76e GIT binary patch literal 342 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9GGLLkg|>2BR0prCY# zYeY$Kep*R+Vo@rCb81d;WwAnVNoh)EzCuWTe$K(=4{LzR9(uYshE&{od+Q)4v!VcN zz;^c4o`RYRu1jW!Ok@gjS+$Y9xO2lBLq7%K`O{ewAAAnDcy;afxUf8Fpk55H|7zCS zy<4{}WtqVnpZ)f2q2|{b{rgToqz>f#Xe|G;jG=>rKcTeY)1GfdyPmRiaO88zWZz$* z$!N!!&+;bAJ>IKf=7+_0_mw0h>Rztha99Ate2~C5-AD72qZ(FhXVzp?%I{@hII)9` zWuL48(?7<9XKxz>C&(szS-X{E+K$)d(GRckJL~^66q>JI9CH|?+0)g}Wt~$(699Hh BbPE6g literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/OuterClothing/Misc/beltedouterwear.rsi/inhand-right.png b/Resources/Textures/Floof/Clothing/OuterClothing/Misc/beltedouterwear.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..7bbf756657abdc214f4e8db40c7cc22c09adce28 GIT binary patch literal 345 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9GGLLkg|>2BR0prCY# zYeY$Kep*R+Vo@rCb81d;WwAnVNoh)EzCuWTe$K(=4{LzRo_M-AhE&{od-EXgAq5eJ zfL+X&En1i@S`LHB%Nv;Gc&4jebE7R1w`raD|6Q#WwQWmH|FA^NUhsVG{Q7X_D=G{O3l3M@FWzBui!n=RMFS(lsWvla z9n}EFxy(~GrZv=aR=H_>UT4puEwqEHnuihH1|YwHt6}jU{TwEVou&IE6Mh`i1p4)S z!@=n1S_%0L7o&ibe}hrkI%fl!#ij4G-WY!AF!Z*M93A9j#n zd$9f0r4&i&GZ$DIe+a2`Bt@hh{J_3U;fJP-M?vssmMi}l*xoR;bt!tP38)JRHpBhzlMk)k3Y5BjG2@BYgWZt^-P`TUyB~-jiU0R+C$A8~ zRwM_YGVQxNGOk^|dHXR@ z(-b(q?A-Z!&kvJBzdq{z`n%8EJljElW!CYAw7cTl9bw@jW>$8; zVgKIVgxSeCq8rcI7R`-O{JudfIQOAq4s+%u|5cpcC8c79iXXPi{j29WZ6SD2f4*`9 z0~3eBgY}HZcTJ4GzjHnFp6^TyZ+|viE@fe85xBFCLHFvTMQa!s&L5X`ja;~o=lxBY zGg=CIepAmYu9@KK5VJ1v<1f)gN9P-h9nm=;w81Rd)rZ0I*PQyvr@ZnKvUi$xPoDs? cprJwhXZ)Ij@w>mb0Nu>s>FVdQ&MBb@05GX*RsaA1 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/OuterClothing/Misc/sexcompbeltbronze.rsi/inhand-left.png b/Resources/Textures/Floof/Clothing/OuterClothing/Misc/sexcompbeltbronze.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..cb0bdd042c1abca314b9804db8200bf33ba4bf5a GIT binary patch literal 433 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9GGLLkg|>2BR0prCY# zYeY$Kep*R+Vo@rCb81d;WwAnVNoh)EzCuWTe$K(=4{I107;QXV978H@y}hNFci2GW z*vIo4Dk@PK>jhRm*eIKjkr1wNld-HvHX$XaV#khG0SA`EB$|YJdQNE9>OHqDYxm#T z^+A6=PfmS)v+{lE>BEdbdoh8-E<>K?{8?^~Eq2NLe8Z6TY|axAb_uj(&F{UhgIdw3|BY`Dyl!N{MC9j>_FM(OLsp%f6KTeZ&n!RhwY_u(X3aQ vmQ2BR0prCY# zYeY$Kep*R+Vo@rCb81d;WwAnVNoh)EzCuWTe$K(=4{I107@a&_978H@y}hNFci2GW z*hhU06_u!r^#Yj>Hp(TeNC?-s$yn7Rw;&~_V#khG0S-%J5>0|VJtuUp5?kYGGjq?^ z_rf**j&6IiXL_r^mlMj&K#MU!!|N5Vt)5h_Tb5~*FFbozt-ygZPWQiO-M%J!;L00@ z9!8I%ovh2!_H!qsCGMW{^6B5(vJO7q92@?=id>%joKI2h_j(5LgNxRvcz*tRkk=vS z+iozo#HuW+rsUVH_eTEl^?W-k_l!9<5;Z`-S3*+)o>C?qvTUmcaT! z1{7eJpkd;}pYe%C4C`x|8I~~oxVeX|zn0lE{6LxI<;%C9KW41Zo2ACQL)X4Kp0%Fs t!wsv+UwA%5Sv^;p@=7Zwjj^Ggp@6M7_UMEbPZd*;;hwI3F6*2UngDN!r^f&Q literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/OuterClothing/Misc/sexcompbeltbronze.rsi/meta.json b/Resources/Textures/Floof/Clothing/OuterClothing/Misc/sexcompbeltbronze.rsi/meta.json new file mode 100644 index 00000000000..af8d1329fc8 --- /dev/null +++ b/Resources/Textures/Floof/Clothing/OuterClothing/Misc/sexcompbeltbronze.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprited by Dakota Haven", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Floof/Clothing/OuterClothing/Misc/sexcompbeltgold.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Floof/Clothing/OuterClothing/Misc/sexcompbeltgold.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..8e1489c7f0f8667edf6bc67fc5cbf39473f2ad71 GIT binary patch literal 496 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5`$3q|f;CtLC@5Xx z8c`CQpH@F!Z*LiTA2E<% zdte@{*&#CL%!`i?AF0h1ad#}dc2-_N=1y66o?ae1`#%QrxvU2ROSJOzgi6*-4sg+! zX~({?#G>7+c;2_#=}umr`<7=KEpZFI_*8;Ppn-u!fq{|3fdRp6P>YPde_{7+>C2W4 zCcdH!n?A~1`e)6caN6ked&XC-i_QP!)L1cAIWM{Geo)cHWwJ`+cR2HGHE9T8R{*^bJ5 zkS-{gTV?h8cI_561*KPd-y5Dj-oU=Jzg^4vc?S1FQ3k=l@~!+f{S9ZYZ(z92-L;f4 z<@FlTmSYTGH8qs39)9h6a6#txqq!5HVbbvK8MEaE_X+Ar@oRyx#o+1c=d#Wzp$P!CF9CzfH$F^ytLXf({If zECK~t2bS)5wK)6keMY543=iH*E~#Q-*z^6}@`eDZu8G$lFWb*p$*VcL(u{R8cZAsS zQ`-f?PPiX9y>j`6r(fAUH0tJWR4`+l*05JnJBiifqWa$19${bD_UUd<`>3wcz`(?z bkif7=XXU}N##RoXgBd(s{an^LB{Ts5j!b7p literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/OuterClothing/Misc/sexcompbeltgold.rsi/inhand-left.png b/Resources/Textures/Floof/Clothing/OuterClothing/Misc/sexcompbeltgold.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..70fcb1d44c98f91efddae69905f4bdcb2e8be037 GIT binary patch literal 422 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9GGLLkg|>2BR0prCY# zYeY$Kep*R+Vo@rCb81d;WwAnVNoh)EzCuWTe$K(=4{I107!5sL978H@y}hOA$6_dQ z?Bn{ZH`Yg91@74_V8O(-QK<7s?k4w!0$!%9fW;es+zNEfZMwT{q3-YX|0lg%ukUNU zUUBIXZ#hPweOSP&-pYBGO?;!Ksct!8&R+0+OYZDzrM$YI7``wlXzp(D{_M+m$5!^c z^p=d-$+%z4EO<&0VluMM!c2PpJMxM9|Ru6EWH zU-K9m1R1AYpB=I~-Xe!p=DYRJucx0fUdfxq$N6D*XFVdQ&MBb@0B9nbP5=M^ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/OuterClothing/Misc/sexcompbeltgold.rsi/inhand-right.png b/Resources/Textures/Floof/Clothing/OuterClothing/Misc/sexcompbeltgold.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..17e436e66e310847dbc25b25bd40a7a3c96a84c3 GIT binary patch literal 429 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9GGLLkg|>2BR0prCY# zYeY$Kep*R+Vo@rCb81d;WwAnVNoh)EzCuWTe$K(=4{I107%ez!`PT=k6fbj3}B0++FN=BB!s{VZ)-etweM zr@YC<*L3?quE7HSxm_>anH&AJ_P)#P8<*ZpW_UO6c;OWTo`($6(%2LD9D+{hZZP>B z$xwcN_g63f_4gk#cy01$+LQZkN)T6jz@)z_2LdmgQSt28k56Rq+B~1tf@{{yAg`)> z|6Y84e8J_{FK?h~53cR3UYpO$HKmDVaZgE`Z_BdScb|#%cZPdRYZ&Go#^NfVkb$w% zf9*AF0$cML8l)Kh{!?^+BfVl5Q`zgOfByab#-JqbyPENjzP)=qt2nbu&fJw%Y%aQU liv?Geik5xnIUvgLhpDab=!E2(E&?F)Jzf1=);T3K0RXBynJNGP literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/OuterClothing/Misc/sexcompbeltgold.rsi/meta.json b/Resources/Textures/Floof/Clothing/OuterClothing/Misc/sexcompbeltgold.rsi/meta.json new file mode 100644 index 00000000000..af8d1329fc8 --- /dev/null +++ b/Resources/Textures/Floof/Clothing/OuterClothing/Misc/sexcompbeltgold.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprited by Dakota Haven", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Floof/Clothing/OuterClothing/Misc/sexcompbeltsilver.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Floof/Clothing/OuterClothing/Misc/sexcompbeltsilver.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..368aaefaf657c34fc98633e68ca3739895979ddf GIT binary patch literal 506 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5`$3q|f;CtLC@5Xx z8c`CQpH@F!Z*Oh%IvgOv z_Q1YmM~czx0(RXKj4u^Lctk`BC;0_^5S6K6V3$95kiFo8XiMKCl|=z70ty5aIbI1A zbO-NfmQiKPftQ)t_AlR_ zS!KvL$QI6!{d(@KfW_OJ#>4n7{h~~51HTkasR!0!@8v-L&UY<93w-I z;Zf7)GM{YRC#f`sH)I~2E?C3dk{BWKZcek|GK;jxXW|cb>&-ZNdH!zK58RLR_y51c z#))P%k}F`$hWV~8TV7qid0%d^8H3=(?$0dR*&nz*l<>cO&-uz}1*?P0m!cUDR8MZO z?byQ5|uJ@9DKeZGq7Ry)6Y8|!z(&Cx!8{5QYQ z<)pP&PilOPtC3uId$Y%7lNqy34@9jl^~t!FTqvyq4VVQxf3g_)`A)dn^Cc1(Zw#KU KelF{r5}E*>$8; zVSj~S_U~2)mC{vn4l6(5uxxtH$#v-4%HoLzVanc*Ug#Zp1ICpC3gPM<*bNJFk z1;m%1dM*%lLPc=3vYZmu)~NGkCiCxvX2BR0prCY# zYeY$Kep*R+Vo@rCb81d;WwAnVNoh)EzCuWTe$K(=4{I107>zw$978H@y}hOA$6_dQ z?Bn{ZH`XV2Jm1Nbeq+J|&JIxzmf2rbSdKF8U{YLg?5t;&yXaQVY1d*i&c0U4tNV%J3xk5@?iTOQzKnNl z-+p7?YjY>fcY(=$)&plBZ%*oooUC!yoYi9OyqTVp`pU!i&vMAz$K7!G)y$bmJyo{% zUcdgV{Ks{lG=pcPYRs(nS;8ip*9hsIE#J)ftga?=UNJ*CqgKOf11#2BR0prCY# zYeY$Kep*R+Vo@rCb81d;WwAnVNoh)EzCuWTe$K(=4{I107_B{B978H@y}f1Vci2GW z*hl@~Yvq%2@}G0fS?HAHZcy^#gu~UnL03DO3s_qcPEDI!aW-WcSDRVq#Odz;?G8SV z&pCar+V@=KbsH(5omjvR$=K^px8+{_UMrlNn$pCwxTmDew`E!EyU)b>JHtJuH4O6(V{sKw z$iP_XzxEn7fvx!r4N?rhw||$}n7`l^SH#-wyY}zhY1eSV^>P-&{?q3#h98{IsI=`| rh%NJ?Y3FuwT;0XByPEBRJVOohn#Q9O0x!>44zj@0)z4*}Q$iB}ora%8 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/OuterClothing/Misc/sexcompbeltsilver.rsi/meta.json b/Resources/Textures/Floof/Clothing/OuterClothing/Misc/sexcompbeltsilver.rsi/meta.json new file mode 100644 index 00000000000..af8d1329fc8 --- /dev/null +++ b/Resources/Textures/Floof/Clothing/OuterClothing/Misc/sexcompbeltsilver.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprited by Dakota Haven", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Floof/Clothing/Under/Gloves/sexcompbluegloves.rsi/equipped-HAND.png b/Resources/Textures/Floof/Clothing/Under/Gloves/sexcompbluegloves.rsi/equipped-HAND.png new file mode 100644 index 0000000000000000000000000000000000000000..a61bfc956b55e7b3e761a5f662d8653f96a6bda5 GIT binary patch literal 902 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5`$3q|f;CtLC@5Xx z8c`CQpH@F!Z*Tc}ganGP zfB0W({Q1u*x8o*<1x0xe=>&4S3onjR5saAVHanmoSgd1q#|aj5*FH0R@*x4ZuNobS88&ntfz>*x}3%GrQ{ z866#%pZrDaU;UNLDbc!} z6P_{%#@y}waD&}sJ&Wac0ncS24jdD*#m==K-+OG5Zo8+8sv`%dNpkz=lbLU|9qxs= zzPiCtah}EmO|-4F+VNbbh5Xg3^ZTE&IQBK{-p?BJMry~eSxm1PH!Yo{prWBKRZ}N; zGsyEoyF+D|e1WpblJ{zYVoxuB`)#`4DzW+Z+)$P)%s&*4Fz_58fV_nhR`l)repSKd z5=)AS!{?)&Kjr$unjSN%{XTzihmxR&J@*5}RbhnC|9uHNQ3|6=t6rW2L!&))GYdD48WZ9z$FWB|kATed1Qiyv;ZZ5NsT z?7MvCf5xIyo-WG|*=Dqg%x1g(dNwzgf_TW}R}yXK=J1x*{8(Sr^ht7xd5C~Rz%D6q zS9^||bzK>sgs1dbP0l+XkKtoC=N literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/Under/Gloves/sexcompbluegloves.rsi/icon.png b/Resources/Textures/Floof/Clothing/Under/Gloves/sexcompbluegloves.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..16ff6f6a41ec0215714e10e3d7a838cfeb50c3f8 GIT binary patch literal 391 zcmV;20eJq2P)YAX9X8WNB|8RBvx=!KdMT0003J zNkl%3AZ#+#7Vc}r?6Lg+4CI0t7UpW8 zjlr-B(>_X^%3Ir}cw+#GsC|g|qdWWw+@%KX=NocU3$VQoqKC6&!0Hxd#K+*}5{@6h z+#F;8EH>!)B@CV}AfpqA?oN^cE1QhpACaG4hV8$?wDz-w&@I;qabT|ZejGx#Tqp7# l%+;>wCscp}6rg~l`UYd%vcaDed`$oV002ovPDHLkV1h=QqAvgd literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/Under/Gloves/sexcompbluegloves.rsi/meta.json b/Resources/Textures/Floof/Clothing/Under/Gloves/sexcompbluegloves.rsi/meta.json new file mode 100644 index 00000000000..f6904e7bf3e --- /dev/null +++ b/Resources/Textures/Floof/Clothing/Under/Gloves/sexcompbluegloves.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprited by Dakota Haven", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HAND", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Floof/Clothing/Under/Gloves/sexcompredgloves.rsi/equipped-HAND.png b/Resources/Textures/Floof/Clothing/Under/Gloves/sexcompredgloves.rsi/equipped-HAND.png new file mode 100644 index 0000000000000000000000000000000000000000..389c43130822c5707179c67d34a8e0e9809eb0e8 GIT binary patch literal 851 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5`$3q|f;CtLC@5Xx z8c`CQpH@~yw@;Ik21`6G%=Y8e0e z_Qry}Z^BDU~F1iIdgZ*-aC{MIR7Hu-bzsb4kw zRwwenBbAkb37M<`ALlG#PvHt!Wh!4L6TvWl&C$7?om+MnoGZ1Q z&%v|c?&k~7e@o79d3>y3V~_&F<1;%Z_$)hnHGyaS+?dG;ZpE`qjhW_{=zZUOlyB|D z$G=~E+Ovh#WS5@4;-Sq``juQWcpJX$zwzE8W|>J`q03ip@(hL;{*Ovuk8R*~I_+Zg+HJ@2!W|777ry@f{WE@sAb&y9 zQckW01`a~Vr~9AUznj%^-Jg>kGP#Z9=FE8OaYV9HUE=43o~Be+hm)ZTHngS5FWBDa z{_9piK}Y7kcWJK_3sX+}E_fmF^a)qZdzHSc=i(bK{yvh(rfKwwarTyHw@%J%WXvwi zKIMK|`=W+%nI^gHc)s+*J^!a-3l2)W+uq}~_Tx<5ThAmC);})T zd8y*zZ;e2$FXAsRFu3?qLo zusm;PbSMjFqtFj_-vAFDu5cSRo@GL;)8;oYIdUi_Y*6v_xWM5OsE}nagR3New{^sw zqO}Z@B<&}s@1MD5h1UMaBnD=Q0}N~i2kx`g+|hW-q?70U_~hb!la6h;GW8|n`PkG- z_OS1>ncLJ)Jr~ZobNY?8#MiBXT>90gel7j;U;2f`^4+PPOmV@FcCFjI-s)Riw30@F zC{w$N%bncZ;>hlk68V@+2@YKY7J{Qg;2p+Pjxafx*Dw M>FVdQ&MBb@06Aff00000 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/Under/Gloves/sexcompredgloves.rsi/meta.json b/Resources/Textures/Floof/Clothing/Under/Gloves/sexcompredgloves.rsi/meta.json new file mode 100644 index 00000000000..f6904e7bf3e --- /dev/null +++ b/Resources/Textures/Floof/Clothing/Under/Gloves/sexcompredgloves.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprited by Dakota Haven", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HAND", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Floof/Clothing/Under/Gloves/stripewarmerpurple.rsi/equipped-HAND.png b/Resources/Textures/Floof/Clothing/Under/Gloves/stripewarmerpurple.rsi/equipped-HAND.png new file mode 100644 index 0000000000000000000000000000000000000000..3032a385af1eeefb1983ed26e3f31a586665147b GIT binary patch literal 502 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5`$3q|f;CtLC@5Xx z8c`CQpH@F!Z*MIuJZ!+w z`Y>JK32RKi6Quz45C*lga99S4(w0U;U2T z{l09|LCfFn4N+r(BM{=wdxyKc<|`(PT|A`RZfZMeE;q1-@Scp z$$ci`cHQ6eJ3S0vYd=^&KO(zSqRsx+_t#s0-*~^7p=WDuPoa6}(oH(5M`M@HWCg1* zfQ74vESB$+&zo!~CaF(y<^xPgg&ebxsLQ0O)zZ AI{*Lx literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/Under/Gloves/stripewarmerpurple.rsi/icon.png b/Resources/Textures/Floof/Clothing/Under/Gloves/stripewarmerpurple.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..787a379c6cef09ea45ec90db2a10137768098e6f GIT binary patch literal 274 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oArNM~bhqvgP*A$W zHKHUqKdq!Zu_%?nIW?!avREOwq%XmWJTx7v2EexvXi9{+g`3`_zI3@i!< zUNa{3TIci!Lk-3s#-DU2${6wr3&<{>%*C=MJte^*G6}LuUuC z&(p_jKaSm;CH+C|*ZRz?1G8UjlU#APNsaB>_b+(|E;gm-{SX!c8_mCDgTe~DWM4fCJbdZ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/Under/Gloves/stripewarmerpurple.rsi/meta.json b/Resources/Textures/Floof/Clothing/Under/Gloves/stripewarmerpurple.rsi/meta.json new file mode 100644 index 00000000000..f6904e7bf3e --- /dev/null +++ b/Resources/Textures/Floof/Clothing/Under/Gloves/stripewarmerpurple.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprited by Dakota Haven", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HAND", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Floof/Clothing/Under/Gloves/stripewarmerrainbow.rsi/equipped-HAND.png b/Resources/Textures/Floof/Clothing/Under/Gloves/stripewarmerrainbow.rsi/equipped-HAND.png new file mode 100644 index 0000000000000000000000000000000000000000..75ca5c50c3b5fcd7a0b334a8f3350dcc4b1a51d9 GIT binary patch literal 655 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5`$3q|f;CtLC@5Xx z8c`CQpH@F!Z*SRW-*%8- z``~^ft8=>3Le(p5th#rj)+M}f-|%w6!6_-PCK$#mJ#jWkZu8T1b#8xD!{WSf(cMiQ zawil`1Wru4bnDq!0oBqZ#rscH)F(VQn_d0?PW}bXxJsp_-+OGB1R5Av6c`ve92g)> zhjW*_I_29WR5_b0zCBajayP!r?)KkShN|e!|0*mDJ$*tf(QLeT6rP#A7H6&rdSq|q z|80%1r2LbF_38`;R-OWDEE#kb)EOS|SN(T*P2+Ph-Z$yIe|!b@6fi_M{B>ej8m_u# zyI#HeW0ArSOAQ{D^qj1_9K#@BdcWGtQ0;3sBU{v=rN8PM?30hIZ%%4hDKYu)vYiYH zRX4xnB>B7&XWp{4MLTj+eDaa|&*Yz}8E%iPe`oq*qxqD_DLrRz{86y>I{kP<-`5o{ zYk0$A=j%J6cn!&yP^Ln8=F)XJdddIdj}^T<&9~sl&H9xLe6=?jea^m)P5-}?$>K{Y zyMgKY^0|Mfb3M2)UG%`$o7N38e^#5{oluv(U1-LhJ6`L#7-GJpe&TJstb5_Np$LP; zTn@hfzG=_i-+jOGOZ?VVj3-X6Ws907f91l8x&L#4>ZA|c=6MiO@T1zuxc>b<&!zvj zDmBcxvubVX&rIH4H?|KulNcC&T<~ONxc7GJyCcR2mdfwr5Jbe%o$IA+?+qE|uiVJ2 Q3`|T6p00i_>zopr0B?5<=>Px# literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/Under/Gloves/stripewarmerrainbow.rsi/icon.png b/Resources/Textures/Floof/Clothing/Under/Gloves/stripewarmerrainbow.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..95033fbc38e2e199e8a30774eed173b2e68fa42f GIT binary patch literal 365 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oArNM~bhqvgP*A$W zHKHUqKdq!Zu_%?nIW?!avREOwq%AVL?O6OYp#}yP1qMcr2lttqwyx=Qd~JKea;mh&7JE((^J!lv zGBRwj=HI2qz;k8^^WfyBc_j^(85^GSeR%2E zEyy6PcO&HU{H^`b7F8a6Z_>SfU2Z5%C=U3`WT$k;aw+3pAJ2NJ0<-D%r& z+`wdVZCm+Q?f11urY?SDU69S}@7o$`9Q;X`%YlJOz+v4!hWI7N4rX0)PXmSlgQu&X J%Q~loCIA_F!Z*LhEH5&-D zK6F3J`sS8a2~Ujm@!r=zBt(jG;~T1i4Igv*T;OsvdR(t9zCcv|e3Rsr88h$glmgm= z0@AdOWjrhi+I9cx_u9=S3%>uj^|-SCzo^2}6vdX0+nqSNnWxR!9QyyGR5zoWujj8l zahvs@JT5ZyTphf@{r?*l9nXIntLHYX{gtk+5dP)soLQVFd>gm#S7(e|^gok##Vm&R zS~1p)(O=_hc$Q7^ne^Ik+MLhfe=7xocDv*z#3x;CqFB7@Kd zJ;qBVkDE?zpLy_h{iXM*dY`_P*|Q#dtA5zv#m5@IE$3s?v<`xyz2bV4@xX>J3p-Z%G>bq%LLsOY4#vNPgg&e IbxsLQ06^KUe*gdg literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/Under/Gloves/stripewarmerwhite.rsi/icon.png b/Resources/Textures/Floof/Clothing/Under/Gloves/stripewarmerwhite.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..a26ce447cd31d891fe03206392191e463307afb8 GIT binary patch literal 257 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oArNM~bhqvgP*A$W zHKHUqKdq!Zu_%?nIW?!avREOwq%b-XEv8Rx2LZ`a(HP=H{bzd20(LrX@F{1;hkxcKR?d2{bUUC^TGWo)UCudTW`? zm8iGt9=`bL-Eb{xNA>;3@3!;0XX`OmNj2o&*IoT}^E$>QI!kyN%nG&|-gPj$xHD~A zW5}ZYdmArm&PZCI&J-m4!MnH4iIKyBf$0ZROV@#evP}^Sf$n1PboFyt=akR{0P_Z2 A_5c6? literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/Under/Gloves/stripewarmerwhite.rsi/meta.json b/Resources/Textures/Floof/Clothing/Under/Gloves/stripewarmerwhite.rsi/meta.json new file mode 100644 index 00000000000..f6904e7bf3e --- /dev/null +++ b/Resources/Textures/Floof/Clothing/Under/Gloves/stripewarmerwhite.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprited by Dakota Haven", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HAND", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Floof/Clothing/Under/Socks/sexcompblueboots.rsi/equipped-FEET.png b/Resources/Textures/Floof/Clothing/Under/Socks/sexcompblueboots.rsi/equipped-FEET.png new file mode 100644 index 0000000000000000000000000000000000000000..41f7b2bb8a3f4ac7db147afd3c3b2e34d4a3fff4 GIT binary patch literal 1143 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5`$3q|f;CtLC@5Xx z8c`CQpH@F!Z*O_$h=xiW z`1pV3&hotM4gArUxR)$+VAb7nVsS**RV}Xr65gQ`GL*R2_DXcBsLj%gnUIlu#lbu) z)iFxGvB}I(&7^SQx73W_tUbEN*rMM2&h+-?E`N6KXUrWjb3Kvj_1x#CpGli!`TR-w zK1<`1-!%mvmhmlRG-+VFz#!$ooWa1m04L`|dEzf~uOGi-C+rf=&X+B_T=-O5XYzxY z?1>M!dk$6IS$RKni&*xuH4{G^No7rVI<4bwl~d$xucLV@Lm1LtMRE3*uUx@+W=>$y z^JnFXiNQ~fUAo(KF<+Va&o8lXz0ye^7rF2@9Me72_59#$p1tY{`y(%Yn<607w!}ul zhP9t>l}4IFU(5d6e46};Z?li)SuI=BWPZdhnn8Ab;=AvgHaG{KYyPr;;&EO?z@iw%jy}pyLVQRTY&lA%HN{>&U5jfcP{XY}Kk$FdD zIUlfOiOC+kRTt5-Wa`A9t_ADAC7Fk7WWV-a6m)$dkMK^rR_m+Hm;cR-3SoG^*S{-x zGtZx+M`ZU{%x84I!Og&_&9EbIFJoKwM?3RYVT-*P9QW2F8D6^9tS`8f=g3UwWxqE@ zYfYURt)%rdZ^}c*I|4?w4QG5G{Q0vp%BEq>-bZu%x*7Id=)5z-Wf}X1+kRTv$6qh9 z`PgCG{rBu+gP876ss6h)H6Ix^eeeFH+VGw4$|RGNUGg($AK{!6bngxGBB5yuA59Lt zCZv+1eBEus?7o$*_RL@UClHYg3Vt(I6!UQ`6W{*c#;r=uuX?LefL2QQsu^p3#q6m# z{jG7wj=lDYKZ*|+6k45Ib%P;Av~y#L?Tk1lS<@LWD{sj2A3PPVuvTLiM{_(^qw|kb z@v3*Ox6O>?$g>DqY4txahe2X>w@pg_!TkKgcSJpI@ytwpP;a%1;cz_XT=yMT_uL;% zTRdR~cSC4Mx%bl@(We`H*^hon7k-s_C}y8v`6lV*f3k1X>YA-T&@X+Y{EOri{lrb9uQkgo!H@3$xT$sJk(IKFhW6UDcV;p9%5m5r!=P z9(mjkFiBqHC$UcT-Puxx|G{iI)sct(uAQ-3o~>GplT}&Q=xU+M-(U$1(fbcg1k8&V o7p^Ow@p9)4-TD7s@BGhV)t5N`D(99YV4=a_>FVdQ&MBb@00{Z@vH$=8 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/Under/Socks/sexcompblueboots.rsi/icon.png b/Resources/Textures/Floof/Clothing/Under/Socks/sexcompblueboots.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..653860e791b171d06e0e18326c1012c4917162e3 GIT binary patch literal 453 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oArNM~bhqvgP*A$W zHKHUqKdq!Zu_%?nIW?!avREOwq%b@u6 q_(bm79O+uQfM--8xy`aoPM--@iVV z>64<~aAiNeZehkS*HPj3;R`vuOfPwznJ*-)^$}UG&h+7VyW6VSRS!;uwl-#8m-ds@ zvw6@iK4XqV`cLIa5)8*@wf@q55YHN1{qWp+p8I)XpDb7GW!}X8U|voUL+`ayH_H1D zU0s_KfA8o!gZ#23mp?tb!fxbd&o{r_yyZ&uvqMb#`~?znPfh#m45r8jfJU3VSZ! zNXB>HYb}j7iM}%1n4S51Kf^Q;#<)3lEISpgW>rb*C?8_pr@y^I&h%J9!)K)wmlwKB zCKYmG9gRK3a|A6mIJB@b=6tBNjA3~ZdFx!H;3lOntqWiBT?$HlFoz>Q-LCD9z}>UI zZwR-gGT(UfJ1Cc@yW!}u34#xMIGO`ftZL$?N%TiChf6rC6nM4VO}sbdFV6*eMb-cY zyr|(c{{zSS;_`>D>pd$wZzRy#b}{$Rsd69Ju)i;rDtG9*H9Xc^wlPA|D#Xcjl}ZEe zK7I3QIlF>_ygsq)m)2$CG2dBq?#<9~Dszyio%HxOY?W-SZ*Rhs6thR&PzYd+2rJf5`>L98c8FCtLJI zzODT8sO6uA$yA#?aem>R2|E}Jln=fB$;Ei)I~UJ!!|XLrQ#OXhdp68lrDZ6>a4qU| zreNG!kpnfG4?Qn7T&sC{4TtUh5~sV%obCrqGAs@`!MkzwQ`-miryABNOqghq*6Uly zr^w>6pnggB5&PD~x1apH{Y|++o3GZ)+T z?Bn@I4~0n9Z~A+@IEQ*1Mpg?(l?1Pnov# zPv|9JMT&26c>YZ#8I{yL_0=W5nL#x~zzp=F#0HgiPxEe=YIR#I$bh&=z;O5;G1 zh0flE0`af!Gcw34O{tlmd_K6IYsLm0%l$K&*JYY5>XdJI$CmK-A6}m+JC*15r9}^7Tkf8c4Ee0m{_W(Bb(h?iFiI_8l)B(!$9QM| W^@CYT9KV5K&EVfZ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/Under/Socks/sexcompredboots.rsi/meta.json b/Resources/Textures/Floof/Clothing/Under/Socks/sexcompredboots.rsi/meta.json new file mode 100644 index 00000000000..bbd45032fef --- /dev/null +++ b/Resources/Textures/Floof/Clothing/Under/Socks/sexcompredboots.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprited by Dakota Haven", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-FEET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Floof/Clothing/Under/Socks/stripesockspurple.rsi/equipped-FEET.png b/Resources/Textures/Floof/Clothing/Under/Socks/stripesockspurple.rsi/equipped-FEET.png new file mode 100644 index 0000000000000000000000000000000000000000..05d8e9417cc61f01c5231a2f9915c177a2015791 GIT binary patch literal 421 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5`$3q|f;CtLC@5Xx z8c`CQpH@F!Z*T48J!Bxz z_ORG-Dyvg&*PBB@kzKJt52W-bbR9C0kUZ`1@0?~u>@1IT+kY2acg+xJ`t#WcXbUb7 z5ck~q|F;iM@6En6?^>eitMg1RcInMoBPuv?b+Hjov*z1O#*8cT=Q8}(c{Zo|uEW0N zGaJ^vp3ETRz;r0(@3!2fnX~%M4f+;Wybldp5Lz$fuu6ve?w5}o%B&(1q z>kM=K+=V9EDvT-(EN><^%$loE)(|T^;rx^9cMe_pa&)U&>*{;VIYk1!@0qf$)G?T= VdCV6ndUph5pQo#z%Q~loCIG3AoG}0Z literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/Under/Socks/stripesockspurple.rsi/icon.png b/Resources/Textures/Floof/Clothing/Under/Socks/stripesockspurple.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..4380a2272dabbe4544a3261ec6eaae933c892496 GIT binary patch literal 272 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oArNM~bhqvgP*A$W zHKHUqKdq!Zu_%?nIW?!avREOwq%v@Z;HG(hLkPrcwND`O2lun^+e%`3oKl_?3OxydaV5B4A1_UJ_aTZg$4$u zG=|rc?D_7`yZJS1Ib)DlS+5{Nfw-gQQ6N`M;Qm>c6#oYi$xQ!e9@v$_t$3jNziDHX zc1WpKtD-~o>9rS~OZ^{QI*>M5f+?qdZ|&>HGB4g1iU>O}FtYTl5kH)G_h56_L3W@s O89ZJ6T-G@yGywpn{$m>e literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/Under/Socks/stripesockspurple.rsi/meta.json b/Resources/Textures/Floof/Clothing/Under/Socks/stripesockspurple.rsi/meta.json new file mode 100644 index 00000000000..bbd45032fef --- /dev/null +++ b/Resources/Textures/Floof/Clothing/Under/Socks/stripesockspurple.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprited by Dakota Haven", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-FEET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Floof/Clothing/Under/Socks/stripesocksrainbow.rsi/equipped-FEET.png b/Resources/Textures/Floof/Clothing/Under/Socks/stripesocksrainbow.rsi/equipped-FEET.png new file mode 100644 index 0000000000000000000000000000000000000000..3648893bb74310f1e09441dfe1fdaeef6d7ea06d GIT binary patch literal 666 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5`$3q|f;CtLC@5Xx z8c`CQpH@F!Z*Mtf-F6UR zdr+^Vt>~4xP;sL;qp0ixgKmfXi>dD?7_)dOq@R%8^hTE}lIID7Qj^}BX)Hlmtw*NC zi;H#2xE+-Gv*+acx$ejQKaP%Q`YtVaFnS*kBZmV6lRyIlivj}{=D*b&%3hvcS$wQ~ zndut0I`f8L?T>YA3^V?noLE;56l7a4;Xdz!LtcLt^6fr7u@0mTB6P}YPi(vG6Aydq z$JW8j0Vm$GBy_Kz^p&5H;pZFim|ur~oZG@+@@Y5YA03t3FZB<-OD~8If~bs_JRm1( zWYaN0rThN*_2~uES8jA~O_?voJY{LZm)%XfW9*y4{&_Jx-!`E?^8d@vk6k|G$2`2T z^w}M;Pk91~+21Wco6UcCV=cd3*V#)4ngVQ*QtoE6wBzhL`bZiPLw1=ud!IC*}# zaLCh$t>PEVoTuY){%Pr*YAX9X8WNB|8RBvx=!KdMT0003B zNkl3bEcAXNMr2q{^Ba0dl<;m|#F4T1=+p?h%XE`$y)xPZ`r z1AkBuw4%Op9lVDk1c`&-$vg<37Nh2&J-efOFP*qbqv~a7RL^tQ_EqwO;AU-U8gdP%0}1;CQIM+5-TD<{IKI zD3z51Tt@Y)Ra^GjKn@(GvLXN;N8R1-VK8XV5Ay~xbHwAQe$)aM3&qXd5;Dt2WC5le zb?B?F`TL9F`F4qkIGS?Q^_?F2Yu}xZp}|D*5Ltl8X9@td-)t{icF!Z*OkoYgQ0A z_A&Vz>zg;c`~F|Hcn}kRU?yMhHK8OHOR@hxyqQJQ<>R?t?i6UUsk8)IfD3r&zyEuG zdg#@q-`339x?(=7L0|HP#2;qH=Z$2uhf5>X6$%cu8W~>@~p>GmZ>_}2x`rB6IEYu)MkS#ze)qkgofXo z8FQOveeD(&IRE7R9H-1*+e+12uij%^dyjc*c0EH^z50C5u!f@`dpuqJT-G@yGywpb CUXS1a literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/Under/Socks/stripesockswhite.rsi/icon.png b/Resources/Textures/Floof/Clothing/Under/Socks/stripesockswhite.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..6137bf24b5e60796d1329992594c8dffd3c0b92f GIT binary patch literal 255 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oArNM~bhqvgP*A$W zHKHUqKdq!Zu_%?nIW?!avREOwq%+Qd~cy;cpVFBs_finzqiu+HW(TUoe z%8=}nwAR1pd&*kTwKp#@otblfse`R^W4+jk`0DisW^*|={Eik9JSvgNzfk1H6eZ24 qtur(XSyuf2dQWb~UG|8hVDs3gU%GPeo_>xoi0A3*=d#Wzp$P!gHCv?s literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/Under/Socks/stripesockswhite.rsi/meta.json b/Resources/Textures/Floof/Clothing/Under/Socks/stripesockswhite.rsi/meta.json new file mode 100644 index 00000000000..bbd45032fef --- /dev/null +++ b/Resources/Textures/Floof/Clothing/Under/Socks/stripesockswhite.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprited by Dakota Haven", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-FEET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Floof/Clothing/Uniforms/sexcompblue.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Floof/Clothing/Uniforms/sexcompblue.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..2ec184f35214210ed5095c67673180a105451f61 GIT binary patch literal 757 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5`$3q|f;CtLC@5Xx z8c`CQpH@F!Z*Tc~OfHmQ z|L}hE-uL&)Co5gkJe=g=;;8M_)TDSxEVzkp@rsTK3SWX0zqDIPybZXbw9rq;gMIUb z79)?B{7TJ!sX{3#Yw{dh+}hvX-TnRS^1}u$yqDhAivQd*eWUERzkBC@|6N^Y-7`b- z^iL&50R{y6aoYQCVbfak@{D)SZ_QJgt$+LEOV-u1`8S!~v$nUNmGb%MqtDZ?Fs%K@ zG+Q~mzMVD7&Ek5bf1a&r?t4+Q`LR0Q|0Zp35c4+_Y;01L_%8IMtaNKd7h}U0(G&Jr zs^RHCsg0H;)6(Kr`|W%7=B-uH=V$59*`qGadEK+)GQ--1bI(3hIUC2p5HeTl>6^80 z`;;?yr{9p-XQO|=eo24tJmz!f7*s`)e}68X^;;$F-tV&Qg%3m9lR3O{m2b~HX#Z^W zY@wXm7wX|@2b{Q99Ffs5t)Ix-VYJ7tV)bE%gwl`PBC_*d8Ql26SG|S(+V8mMQUYCu ztW6)*+~umclC*E1&^^;=1KXL6rq|f3lMd`)l4acPC$lExJ&Sd0%clbo5 z-jek@n;vw}dF=G7Dst1QDlQG_@04U8$!9h&aG;?BMSJQPkCe}uP(ELf513>bJYD@< J);T3K0RTa(LAd|` literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/Uniforms/sexcompblue.rsi/icon.png b/Resources/Textures/Floof/Clothing/Uniforms/sexcompblue.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..5b99287e14b6fc327753ce6b3505cc0a37d13884 GIT binary patch literal 340 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oArNM~bhqvgP*A$W zHKHUqKdq!Zu_%?nIW?!avREOwq%zPAbd!J7mWn?9px5ChYw)T8?u7+r a3=C(*mmXX#keUhfDubu1pUXO@geCwg1e0z6 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/Uniforms/sexcompblue.rsi/inhand-left.png b/Resources/Textures/Floof/Clothing/Uniforms/sexcompblue.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..519ac5b5f1d1c1b714627d643c0a08dd4131f3e9 GIT binary patch literal 271 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5`$3q|f;CtLC@5Xx z8c`CQpH@5dsE+3Xd;|fcVS)G1c#oW=P;;U|3*sfR+7% U_=Gi8$C5x&p00i_>zopr0L{fnA^-pY literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/Uniforms/sexcompblue.rsi/inhand-right.png b/Resources/Textures/Floof/Clothing/Uniforms/sexcompblue.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..8f3c88dbed6b1f32e606528c55a763cc5e9dea8f GIT binary patch literal 270 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5`$3q|f;CtLC@5Xx z8c`CQpH@rIiiOg?j>bb`UGCrZYVPZTB!#5zakFA37+5_F!Z*T3+773JK z{qXthotf5~o6RQ0ov;^Bc_0;FqQEh&iC^G!hwlZqqasNg_emXfyVTin&`F#1pgLDm zLbh^5R7cYEH_69r#ol>EDDPO`Iiq-X>T=8S`tP&f>)pv#**LMC(}96Wpn-u!fq{|Z zf&TG}7SHB}ovxZc|MNWY*}l@>TfVys%0K;?Z^?acvzfy`2hoC4)p60H-xf_OJb!A_ z)U8?1YY%asJ+^+&^Qk?XnV<3h;kq)Zg~1@R?eN!KQ)74C{o~8 z{(hR|cKzw$jC+6TYfF|-4`p1w_xV-7pXKTd4DUDfTvk<>^KoAIwG;7P!E%xdgnl#4 zDD2DcI#dXfYLrr zp5Vj=&fha%Gv;tJ)i4)mpZ~bwyy%PcHwAssXAERpI;=EjGy1eD+HJWVaf;hU*J};K zUttkw2p|Op67#`-cAzt&br0O#lluQq|BUYBx*Xy2U3a|JHk|f6w0Z90mCS)>eycXh zbS2$;oua!;v!B1v#{P@;hXp|o!-a}f?+fmjqB3U-1N&?3ZSQO!l+F4Sagt%N)ePB4 zVVjq>>!%mEb1*#H`@B~$wYNn4#%m=z%}*PZ-jwvM55F6D!EDDohS28`yv{x|9&&en zzkgezob}AEj;jU^X>I3K?6!6$mdS@=I6vpeN9HWA*%N+$jB5cVIR;NxKbLh*2~7a3 CG9k18 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/Uniforms/sexcompred.rsi/icon.png b/Resources/Textures/Floof/Clothing/Uniforms/sexcompred.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..b0270e89c6a332f43b0c3ef50723417bb53abf6a GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oArNM~bhqvgP*A$W zHKHUqKdq!Zu_%?nIW?!avREOwq%U6)MDbm&!*G3m8A1-OZxFz{v67IfL^3=ee_jKGrQW)t}U&<(aU^biG{H+t<_Br%%wzbxh!4 zc9_g@SYwe_x`IL5^Fp7Wbz7$GPITq;+4}6M?LQd?2KDTnpIH`(ELblhzp1Co^U3p# z>nrC@lRh$iUZUWKk78e@Br!X!ezwqY`z|Sm+n)>AHWcz%KYy{`UWt*zfq_Y&f#KfX Zb?Ur}54Km;-v)Y+!PC{xWt~$(698~%fCm5o literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/Uniforms/sexcompred.rsi/inhand-left.png b/Resources/Textures/Floof/Clothing/Uniforms/sexcompred.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..0ef48da807efa2cb62505928cddc3ee19c44d722 GIT binary patch literal 269 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5`$3q|f;CtLC@5Xx z8c`CQpH@aSP85n>*VTfjqIk-`L T!YtDnm{r-UW|I*dz> literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/Uniforms/sexcompred.rsi/inhand-right.png b/Resources/Textures/Floof/Clothing/Uniforms/sexcompred.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..d03b7cfaf3f15d5d0e32fb4ad553686954336c05 GIT binary patch literal 267 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5`$3q|f;CtLC@5Xx z8c`CQpH@{qR2opQ5kcpU2PHBN9?y=uo!DWFOW@Y&Sp^~=3~x5_unWl-L%q!h*)clW(< zL+C=rIcyuOzHDT;ey-te@NFd)44nvp2SE)tZ!3cMGW-UgyBQA1F)$ps%Ah~tg7}2O RX?6!eGM=t}F6*2UngG~vOq&1z literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/Uniforms/sexcompred.rsi/meta.json b/Resources/Textures/Floof/Clothing/Uniforms/sexcompred.rsi/meta.json new file mode 100644 index 00000000000..ef52845d5fa --- /dev/null +++ b/Resources/Textures/Floof/Clothing/Uniforms/sexcompred.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprited by Dakota Haven", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Floof/Clothing/Uniforms/stripethongpurple.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Floof/Clothing/Uniforms/stripethongpurple.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..3dc91222962d0680b58f068e728a477beb1d74f6 GIT binary patch literal 368 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5`$3q|f;CtLC@5Xx z8c`CQpH@72e4W9U|i#cy`|?R%_YnZEMp zv+QT$?;9>Z%rkU5X?gl}G4I;+>)Q2Kh1S@9*8OD3ip6vkp@g`tzjWfXZ!cy3wQqZ( z#4M$X)LnlS3NJ3Vy|k0_P)L}kyAIooN%=Qf=bb+w!~)Z57G1xs-Ex9#>f3)HAx~F7 Jmvv4FO#tZyds+Yh literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/Uniforms/stripethongpurple.rsi/icon.png b/Resources/Textures/Floof/Clothing/Uniforms/stripethongpurple.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..c4c26636d55bbf9f62026d3c7905db601f0451a9 GIT binary patch literal 237 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oArNM~bhqvgP*A$W zHKHUqKdq!Zu_%?nIW?!avREOwq%qzZ9R%uvfhi0jSA)G`qW`Bb zC5zWuE8Cy_zlkZdRB)jki&c@D@#0J8;_n|Y(a}>%N!#+y*xd5athtYQ85tNFs$F!Z*SRpF$anq z{rI1CbN7T4CeF>w-WvrD<{T2`C=+W^j<~@Y**H5ufO}&JyD`s`?whTLHg4YNdBQ}$ zIPY&)b^X!W?G}oidf^fW7}yLN7 zMhv^Z>=r#xVIy`RX`=^|;%OsBo$04wR+kd}!itohdnAAu$<_XVtGHiSKQ-QID zLlT#p;4WR@+EBM&zhPPCqR9-$3pE?`ZOerd3?w)bHs34}eqgeW^~1vDc}#C69kRF) upKwikN>I^~(gtS^zaM-+zwYAwz+G}te1hJyNg}{tXYh3Ob6Mw<&;$Ttw4aUu literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/Uniforms/stripethongpurple.rsi/inhand-right.png b/Resources/Textures/Floof/Clothing/Uniforms/stripethongpurple.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..011d8c64366ec1339d16f8d0c2531842b0c421a8 GIT binary patch literal 451 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5`$3q|f;CtLC@5Xx z8c`CQpH@F!Z*LiTF*{1I zKKOp9s)vPbnqs&BrR5ltpj=Q-{^mM z`FqpXOSf$T`B~?cPCYLzkSxLw5_^w6^>?2~(nU7UZw$(PSDhPOtvzotw+OfhmBy9}C$ukD z+F2m2THPSA_|_KpP3$+~XTNw@d?}WpzJ({DA?!2rnR2NK@rtk9fDypp>FVdQ&MBb@ E0QkwE!TF!Z*M8`9WoF( z_Hmj3kHv=1!QLKXeGTyz%wCL}h|bUe~@`vM+b%iS@NiO_f?dpIRR=$&)=;RJT}r0?SID zy&I+a*j|0DSsnc|;P#!r&tjjLzhjJ)IDKUH%IeC{i6{pT#0oBNcdrQ7G+@)f}>(KEL)PEweF!Z*ST99d;0C zdzjDPyhplDS7{=j*8`CPCaVQLoF$fwbC@(1atoahwEq?*lcv$5v7j);y!-yj?LVGr zrY)C9Pm?OL1X_s&{D{6fb9;egtd?)+^Mi+6pZ;Rr!70|as)S+MiQ8NXc57#;{G8jb zBJil@%9FWM))^nDviVc_;aUD$8TmYh53iHdI7W)%iAxka9rUe9~a zH=$p;;gO|x8e2}T`Al*BnXgmX&V0J%*HyxhR>^!ptysIkYJOCh&t%2~K_)D&LK0fw z-tej9s7hwZ*OzUa1%G)9Yyujx=FL=T^|bYA2)twNsrC1-0pqlthkk6|?_jr1cj@Vg j_ZWkA%OvuH45_;=&SN7!LEPYwJBaJ)>gTe~DWM4f*F!Z*Mv3IR}ay z`}jU@+53C$TYV&y*ph_bIP^$(CLeLRB)fr2h_lVq(YyNn=9$SCjxp_7{;}wPI%E94 zKWysh1#@O>M?r&#Kcx(BW#cx~f+e@qcPtIA= zFMEHU?1kGad?p=R-}>7>(wkZ0o3?db{<04n?AbH4@--Q*{yNaL{os6&X97%E+=L{g z5Zqw#O6MQ@zL;qYb9bcs`Gr=T5I$hC)xDjf ukGtdlD{ZM~ugKS2TEl43!oaZLS`Bk!faCW&p4qdi^yT-G@yGywoU&!O}H literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/Uniforms/stripethongrainbow.rsi/meta.json b/Resources/Textures/Floof/Clothing/Uniforms/stripethongrainbow.rsi/meta.json new file mode 100644 index 00000000000..ef52845d5fa --- /dev/null +++ b/Resources/Textures/Floof/Clothing/Uniforms/stripethongrainbow.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprited by Dakota Haven", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Floof/Clothing/Uniforms/stripethongwhite.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Floof/Clothing/Uniforms/stripethongwhite.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..b25a2a9c0e15bdd4cc1f0f0ac5e86672a96ee8d1 GIT binary patch literal 345 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5`$3q|f;CtLC@5Xx z8c`CQpH@gtvx6^8?=PMY^Z)@Mb6WpA`~PP-8?N7N=s1_vVEgsC&F}2UT?%hXOLr_fDdqDsI literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/Uniforms/stripethongwhite.rsi/icon.png b/Resources/Textures/Floof/Clothing/Uniforms/stripethongwhite.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..d6c2b5baa6372cfb4deb13e1904224c19cc8f0bb GIT binary patch literal 227 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oArNM~bhqvgP*A$W zHKHUqKdq!Zu_%?nIW?!avREOwq%UVqo5QN z`t;>*b!~&qYqmbpU`>CYu{P1{=WFR5!pce;Ce@r4T=!F!Z*SRl9Wmf( zd+2X|g3;-p!olzMzD^4DPZ;(!Zo8#h)^*Y#Z_b`ou_yQs2}L}6S5+hdv;hm);}&~; z-}~K9i&ienthsIG%_fliWs$}v#vdy8y%}P!?^Mw}J&D!n_BK7w*Sl_AXD~drpLu7< z!TfXKpK7@cc$&Q@&CHy&Oo!puzH-l5&n;tFpL}CeSv*lTGN+2wph{N&Q!ChweYrHLHpju^$bO~ fWfJ*7`u-i~XEqR@5F#ou9mMr?^>bP0l+XkKOLl>p literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/Uniforms/stripethongwhite.rsi/inhand-right.png b/Resources/Textures/Floof/Clothing/Uniforms/stripethongwhite.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..8c0a897ca10db5bac4a231fb8d11d2b0467d95c9 GIT binary patch literal 381 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5`$3q|f;CtLC@5Xx z8c`CQpH@F!Z*Sf1Z86|! zefXF!gP~~$$FKElEKV^}9_;s)&t+;mld<`a=7STzl3b@H6_?xolmMEK1>CVOjs3mv z{WPuhtF-LTU*5#nVOSL?@-6(c9oGeuUhhlWay_~D6nCh|9-qkW(DPAr#-nR>pEtd1 z*!MoZ@${xUdb@I?&5hT-o^@UN!wtR(OA;k&=B0a2RrOr?X&;k8-(vsEUnVw5wqUUs zS*Sw8A#$3Y=k?N?%8c*+$))oPI29OQ-fit!;_!|k_WI75d-wK!(zkkW?wiLqhVto# fGng3|9^7QGKM^B7p}_9eT##9wu6{1-oD!M Date: Thu, 15 Aug 2024 00:35:14 -0600 Subject: [PATCH 14/38] Signed-off-by: Dakota Haven --- .../Entities/Clothing/Hands/miscgloves.yml | 15 ++++++++++ .../Floof/Entities/Clothing/Head/misc.yml | 11 +++++++ .../Clothing/OuterClothing/MiscOuterwear.yml | 28 +++++++++++++----- .../Floof/Entities/Clothing/Under/under.yml | 11 +++++++ .../Floof/Entities/Clothing/Uniforms/misc.yml | 12 ++++++++ .../hoodmarshoodie.rsi/equipped-HELMET.png | Bin 0 -> 1036 bytes .../Clothing/Head/hoodmarshoodie.rsi/icon.png | Bin 0 -> 325 bytes .../Head/hoodmarshoodie.rsi/meta.json | 18 +++++++++++ .../marshoodie.rsi/equipped-OUTERCLOTHING.png | Bin 0 -> 1923 bytes .../Misc/marshoodie.rsi/icon.png | Bin 0 -> 708 bytes .../Misc/marshoodie.rsi/inhand-left.png | Bin 0 -> 1014 bytes .../Misc/marshoodie.rsi/inhand-right.png | Bin 0 -> 1017 bytes .../Misc/marshoodie.rsi/meta.json | 26 ++++++++++++++++ .../Gloves/captwarmer.rsi/equipped-HAND.png | Bin 0 -> 569 bytes .../Under/Gloves/captwarmer.rsi/icon.png | Bin 0 -> 297 bytes .../Under/Gloves/captwarmer.rsi/meta.json | 18 +++++++++++ .../Socks/captsocks.rsi/equipped-FEET.png | Bin 0 -> 656 bytes .../Under/Socks/captsocks.rsi/icon.png | Bin 0 -> 292 bytes .../Under/Socks/captsocks.rsi/meta.json | 18 +++++++++++ .../captthong.rsi/equipped-INNERCLOTHING.png | Bin 0 -> 413 bytes .../Clothing/Uniforms/captthong.rsi/icon.png | Bin 0 -> 215 bytes .../Uniforms/captthong.rsi/inhand-left.png | Bin 0 -> 371 bytes .../Uniforms/captthong.rsi/inhand-right.png | Bin 0 -> 399 bytes .../Clothing/Uniforms/captthong.rsi/meta.json | 26 ++++++++++++++++ 24 files changed, 175 insertions(+), 8 deletions(-) create mode 100644 Resources/Textures/Floof/Clothing/Head/hoodmarshoodie.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/Floof/Clothing/Head/hoodmarshoodie.rsi/icon.png create mode 100644 Resources/Textures/Floof/Clothing/Head/hoodmarshoodie.rsi/meta.json create mode 100644 Resources/Textures/Floof/Clothing/OuterClothing/Misc/marshoodie.rsi/equipped-OUTERCLOTHING.png create mode 100644 Resources/Textures/Floof/Clothing/OuterClothing/Misc/marshoodie.rsi/icon.png create mode 100644 Resources/Textures/Floof/Clothing/OuterClothing/Misc/marshoodie.rsi/inhand-left.png create mode 100644 Resources/Textures/Floof/Clothing/OuterClothing/Misc/marshoodie.rsi/inhand-right.png create mode 100644 Resources/Textures/Floof/Clothing/OuterClothing/Misc/marshoodie.rsi/meta.json create mode 100644 Resources/Textures/Floof/Clothing/Under/Gloves/captwarmer.rsi/equipped-HAND.png create mode 100644 Resources/Textures/Floof/Clothing/Under/Gloves/captwarmer.rsi/icon.png create mode 100644 Resources/Textures/Floof/Clothing/Under/Gloves/captwarmer.rsi/meta.json create mode 100644 Resources/Textures/Floof/Clothing/Under/Socks/captsocks.rsi/equipped-FEET.png create mode 100644 Resources/Textures/Floof/Clothing/Under/Socks/captsocks.rsi/icon.png create mode 100644 Resources/Textures/Floof/Clothing/Under/Socks/captsocks.rsi/meta.json create mode 100644 Resources/Textures/Floof/Clothing/Uniforms/captthong.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/Floof/Clothing/Uniforms/captthong.rsi/icon.png create mode 100644 Resources/Textures/Floof/Clothing/Uniforms/captthong.rsi/inhand-left.png create mode 100644 Resources/Textures/Floof/Clothing/Uniforms/captthong.rsi/inhand-right.png create mode 100644 Resources/Textures/Floof/Clothing/Uniforms/captthong.rsi/meta.json diff --git a/Resources/Prototypes/Floof/Entities/Clothing/Hands/miscgloves.yml b/Resources/Prototypes/Floof/Entities/Clothing/Hands/miscgloves.yml index bc3cde0b85f..7f5c032d2c5 100644 --- a/Resources/Prototypes/Floof/Entities/Clothing/Hands/miscgloves.yml +++ b/Resources/Prototypes/Floof/Entities/Clothing/Hands/miscgloves.yml @@ -132,3 +132,18 @@ fiberMaterial: fibers-synthetic fiberColor: fibers-blue - type: FingerprintMask + +- type: entity + parent: ClothingHandsBase + id: ClothingHandsCaptainWarmers + name: captains arm-warmers + description: A pair of rather nice arm-warmers + components: + - type: Sprite + sprite: Floof/Clothing/Under/Gloves/captwarmer.rsi + - type: Clothing + sprite: Floof/Clothing/Under/Gloves/captwarmer.rsi + - type: Fiber + fiberMaterial: fibers-durathread + fiberColor: fibers-regal-blue + - type: FingerprintMask diff --git a/Resources/Prototypes/Floof/Entities/Clothing/Head/misc.yml b/Resources/Prototypes/Floof/Entities/Clothing/Head/misc.yml index 4fac780b8fb..6c5822a89df 100644 --- a/Resources/Prototypes/Floof/Entities/Clothing/Head/misc.yml +++ b/Resources/Prototypes/Floof/Entities/Clothing/Head/misc.yml @@ -30,3 +30,14 @@ sprite: Floof/Clothing/Head/sexcompcirclet.rsi - type: Clothing sprite: Floof/Clothing/Head/sexcompcirclet.rsi + +- type: entity + parent: ClothingHeadHatHoodWinterBase + id: ClothingHeadHatHoodMarsHoodieHood + noSpawn: true + name: mars hoodie hood + components: + - type: Sprite + sprite: Floof/Clothing/Head/hoodmarshoodie.rsi + - type: Clothing + sprite: Floof/Clothing/Head/hoodmarshoodie.rsi diff --git a/Resources/Prototypes/Floof/Entities/Clothing/OuterClothing/MiscOuterwear.yml b/Resources/Prototypes/Floof/Entities/Clothing/OuterClothing/MiscOuterwear.yml index d134889254f..c6da36e2c3a 100644 --- a/Resources/Prototypes/Floof/Entities/Clothing/OuterClothing/MiscOuterwear.yml +++ b/Resources/Prototypes/Floof/Entities/Clothing/OuterClothing/MiscOuterwear.yml @@ -5,9 +5,9 @@ description: Looks like you came third in a competion. components: - type: Sprite - sprite: Floof/Clothing/OtherClothing/Misc/sexcompbeltbronze.rsi + sprite: Floof/Clothing/OuterClothing/Misc/sexcompbeltbronze.rsi - type: Clothing - sprite: Floof/Clothing/OtherClothing/Misc/sexcompbeltbronze.rsi + sprite: Floof/Clothing/OuterClothing/Misc/sexcompbeltbronze.rsi - type: entity parent: ClothingOuterBase @@ -16,9 +16,9 @@ description: Looks like you came second in a competion. components: - type: Sprite - sprite: Floof/Clothing/OtherClothing/Misc/sexcompbeltsilver.rsi + sprite: Floof/Clothing/OuterClothing/Misc/sexcompbeltsilver.rsi - type: Clothing - sprite: Floof/Clothing/OtherClothing/Misc/sexcompbeltsilver.rsi + sprite: Floof/Clothing/OuterClothing/Misc/sexcompbeltsilver.rsi - type: entity parent: ClothingOuterBase @@ -27,9 +27,9 @@ description: Looks like you came in first in a competion. components: - type: Sprite - sprite: Floof/Clothing/OtherClothing/Misc/sexcompbeltgold.rsi + sprite: Floof/Clothing/OuterClothing/Misc/sexcompbeltgold.rsi - type: Clothing - sprite: Floof/Clothing/OtherClothing/Misc/sexcompbeltgold.rsi + sprite: Floof/Clothing/OuterClothing/Misc/sexcompbeltgold.rsi - type: entity parent: ClothingOuterBase @@ -38,6 +38,18 @@ description: What? Do you think youre an anime protagonist or something? components: - type: Sprite - sprite: Floof/Clothing/OtherClothing/Misc/beltedouterwear.rsi + sprite: Floof/Clothing/OuterClothing/Misc/beltedouterwear.rsi - type: Clothing - sprite: Floof/Clothing/OtherClothing/Misc/beltedouterwear.rsi + sprite: Floof/Clothing/OuterClothing/Misc/beltedouterwear.rsi + +- type: entity + parent: ClothingOuterWinterCoatToggleable + id: ClothingOuterMarsHoodie + name: mars pink hoodie + components: + - type: Sprite + sprite: Floof/Clothing/OuterClothing/Misc/marshoodie.rsi + - type: Clothing + sprite: Floof/Clothing/OuterClothing/Misc/marshoodie.rsi + - type: ToggleableClothing + clothingPrototype: ClothingHeadHatHoodMarsHoodieHood diff --git a/Resources/Prototypes/Floof/Entities/Clothing/Under/under.yml b/Resources/Prototypes/Floof/Entities/Clothing/Under/under.yml index 7ee823f49ad..443ab81b15c 100644 --- a/Resources/Prototypes/Floof/Entities/Clothing/Under/under.yml +++ b/Resources/Prototypes/Floof/Entities/Clothing/Under/under.yml @@ -74,3 +74,14 @@ sprite: Floof/Clothing/Under/Socks/sexcompblueboots.rsi - type: Clothing sprite: Floof/Clothing/Under/Socks/sexcompblueboots.rsi + +- type: entity + parent: ClothingShoesBase + id: ClothingUnderSocksCaptain + name: captains thigh-high socks + description: Just a plain pair of thigh-high socks. + components: + - type: Sprite + sprite: Floof/Clothing/Under/Socks/captsocks.rsi + - type: Clothing + sprite: Floof/Clothing/Under/Socks/captsocks.rsi diff --git a/Resources/Prototypes/Floof/Entities/Clothing/Uniforms/misc.yml b/Resources/Prototypes/Floof/Entities/Clothing/Uniforms/misc.yml index 1938a2a03aa..65c11da772e 100644 --- a/Resources/Prototypes/Floof/Entities/Clothing/Uniforms/misc.yml +++ b/Resources/Prototypes/Floof/Entities/Clothing/Uniforms/misc.yml @@ -133,3 +133,15 @@ sprite: Floof/Clothing/Uniforms/sexcompblue.rsi - type: Clothing sprite: Floof/Clothing/Uniforms/sexcompblue.rsi + + +- type: entity + parent: ClothingUniformBase + id: ClothingUniformCaptainThong + name: captains thong + description: Is this even considered a piece of clothing? + components: + - type: Sprite + sprite: Floof/Clothing/Uniforms/captthong.rsi + - type: Clothing + sprite: Floof/Clothing/Uniforms/captthong.rsi diff --git a/Resources/Textures/Floof/Clothing/Head/hoodmarshoodie.rsi/equipped-HELMET.png b/Resources/Textures/Floof/Clothing/Head/hoodmarshoodie.rsi/equipped-HELMET.png new file mode 100644 index 0000000000000000000000000000000000000000..5382dfba01f7e2be9420b01c662621ed3466c3c1 GIT binary patch literal 1036 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5`$3q|f;CtLC@5Xx z8c`CQpH@Ngx~R;my@>g|~EpW)(jzAN7qtKwwWt5DWjm1MkwxH*cPKX3yj&Uk%~JtJrqw|^1uVTJ>1>g2o-^5x`q4YCg(?atGnFNso{E7k2 z`9~KTC!A+^&pbt{A-(yPdVHJh2JQvFRzycTUvCOw+;omXN?Yo>7sDE+Ele-64L)zU z=c+kX*Wve_(7o5?$?MxNx;cS3_Ib6x#!@-fXJ-K3%_@cT?EPSKH^+^nGI2Ph$&M9rE?k#pyR3 zcNl*y>j>)lRW8rJm%({Hb6EQHuX&FDKAv*_b&)^*+#eZ`%0CY;|Cej<;>)tO3HVSX zBF4ZdfCn|y_N=&fWv(ClWfMk@riSl%X2!W)cWi-9t$W-lyki}=gUoS}ZdblbQ>CO1 ztdG4sEp_7g=jC~FER5dv@$#Aue^)*)j4e+WWNT*hTG?amyk0N+L}1+?!2sJwewX@~ zBL2MWp2#$({+9~FyyuBxxf^({)&HMex8D8dr+>SHf3s!m{kHR4+OmyupAMX8mKV$~ z`A}QGyejZ-_F-`5D(E-zix0@#&y>`}q=8g)j*oJ?Hcw-Clzd!9(Tcgf!@R^x--H#j{ z2JZ874$jq5W$2r@$K;{Jiv4CA#rl?VU#R{aom=5I>EArwwG9=Eon?+Evl{ps-()Ih zSSE92eRf25Ci9v4#l0_;M2b3p+%hXvSK>LmF^}tUe{#bF!^ugKJ zw>J2`DersxEAM~>gOvNZN#~y%zK?qQ?&q?1?uJXd)i1N|xSw*2al$cMex3){*S)mp rJN`+0hFX&iH%9{lc65N*>>p!DMfUtV845|joXp_q>gTe~DWM4fJm%8L literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/Head/hoodmarshoodie.rsi/icon.png b/Resources/Textures/Floof/Clothing/Head/hoodmarshoodie.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..e874f8fd660a3a11c924f4677a79c2437697a544 GIT binary patch literal 325 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4j{UFR}!5XXr6qGJ; zjVKAuPb(=;EJ|f?PR%KOafSFSwOIZ==AN5qbA_U!EJ%phQ`uYUOa`TLR*Kv4JR$H4>l z<9+*B?(-h%@E>{`Z*s)%>Z^|2J>1Hoj!S@*&FMK%+@H!&&DC$q#S+ z|M6(XGd_*7&R_S_q|P>+odi-DJ~!^vh280rZ)HAMRsa0oH+%NRsGv7OU-vuRo$gqY zrK0S6y7BtW)BlqMh7k0oCQ3-w)N1-iBLzzSwJS%Wz;3=E>O+YUbOS78DA Ojlt8^&t;ucLK6VV%7{Y% literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/Head/hoodmarshoodie.rsi/meta.json b/Resources/Textures/Floof/Clothing/Head/hoodmarshoodie.rsi/meta.json new file mode 100644 index 00000000000..e5c7e8bcc30 --- /dev/null +++ b/Resources/Textures/Floof/Clothing/Head/hoodmarshoodie.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprited by Dakota Haven", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Floof/Clothing/OuterClothing/Misc/marshoodie.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Floof/Clothing/OuterClothing/Misc/marshoodie.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..61a6ff99aacaeed16f71406f3597bca1efe102a6 GIT binary patch literal 1923 zcmV-}2YmR6P)YAX9X8WNB|8RBvx=!KdMT000LL zNkl~97YBPN3euzEtsm@v=$Yn z1}92sM*&Mq>7cdLAPN==MQ&E0RT*xjfp#pH7AVL7l8}&rBrKcDZnB%bJ*O`;sVOs+ zO!8p``EoW%vKa( zAg(5<3f`ik@fK5eFVhxa+x!)BvTG>Ku@5&7IG_z&R$nh7yPbi6-J? znA1r!n)zehKWY743xv&cUY0|YZd|Fm!6yx6jCBpdVl)v~la$t7rofxeU{7!U+;p`= z`F91-+Ih+6ZO@jTBzMdR;>kD`qlvSnCmB9=R9pM5Mrh5Ct4V5_>Zl6(ITW}EfKgGH z)GePrj!Yb8D+1A>{I3M~a=1U-fYoTG{BIY?9W#QaSOi zF&4oeZp3A=btwP80<`K!5;1Ou0z?u~JZTQRRww0^8RYmHD64eRw|70|4b@x^`pLF= z=HK0mKRqz(Ot531~!;PY9(eGr2IlW5& zrn>W}3i=uR&iBPj6P}QBePifp^N?at+5ub&RI%~uQQkhjM_hU4U73~c?izrJj=|J4 z*O9wnfq3)LVmZm3i`!yH5r%d*a3d7pgPOndqkV6QPoI8UX4yP^Tz{d{00kMjT)cgq z(OVXaWd%>knOP&rN_Ug0q_nkDrKG%}nk^N_dHu+CarnDGm&3d{9B91Qd4QI9lu$HG z(e5`yNnx@4mg`OcRZ41_>)2EC50>mL5vyk`l&&;8X{qK;1H_XFDgxCk|7fFFHSJkB zC36@((p{JoW4rvy##(mXIKj&On?%w0LOCEa8>hwAIe`DHwXc^s}$_3_tn!H`=@i z0j!*|Ku&NE;Y7HSiLSv21VRY*2QDz&)RO~&3mv|Jj?~Jj3*-Z~9GvF#FP1%!QX-Mu z4hK0D_>@%#wrB^Se-7&aI)DzK1Ly!cfDWJo=m0u^4xj_*06KsUpabXtI>5aH&{Vuv zN+h+-4fKC&zW874%)!E+$(Wj8h{t!=hb1}$5RSL7v7(d$Pab`oUKC;IlKsEVRO?Zh z=6DMmt{r8N;$fgGoBVg5?OK4q;@$F{YeyNK-j|*>4_>PiRZ0?Sl2j!H+nO0)D@3Sx zkCYOG0D(Z2k{hAhY^o^b+dW2b|8I*#m(Kxq?5a6MzOe^BhZjpqYFisE5n4OnHX33P&eWE1I((gl{U^{6ZKCALL0&uj zo^~VPheN01Fk5-=<_Sicd*O3<+wIhTU4H?9xSHg={~CX)yTpQ=@ifPyth;iM*N<%1 z2H?eqo{-NEdKkOO%C?)IFw)W+pWTZ&#rTZ?B&EuwKouX|I>&;X2WgJC@aE+MtUbC* z8-O1_JWtN;GltAGC)=w}aG$vsJ#B7mscGNX2)KB=lKuYkJlFprLa_+zuO8x;M|Nlf z@cTzzmQ{ujbFv>G6bs`knIp=d+blg6N847p*2|&4XqS{yB`H-xu?Pd#KP3(n{!|Y0 z=CHH+BtF&7wD*^51F&QIQdzjS{RDUB$r9-_r?(xU>$h&6rU2)^w_YaHBr1|nG|aed zFSX12aMr7G@~&630a!9&wp@L1YrBiT_Q(&UVo*?o0i%+_Guu~d3b1z83(_D2ia|k@ zDhqe4X_xoPq$lO89XO+)e+=mWI)DzK1Ly!cfDWJo=m7U<{R_A4>8^GWX~zHn002ov JPDHLkV1fu>lpg>9 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/OuterClothing/Misc/marshoodie.rsi/icon.png b/Resources/Textures/Floof/Clothing/OuterClothing/Misc/marshoodie.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..0bea265b93ccfe92a1c73fb20bc965e68842cd0d GIT binary patch literal 708 zcmV;#0z3VQP)YAX9X8WNB|8RBvx=!KdMT0006{ zNklAc85!rM&b1P|m`W~e)C4IAq+L>}*`f`QGI@59j^8XK{{@ zQu04br~nn90#v|K0Ub4`Wqs!bv2guvZHqj1r&X*dptG)3R@e%enwci+%F+2|<0tP+ zlU7f!GEB|w7O^6L&bn5)-(F0wGE9Z75G4{M8joSsr(x9Uc{K5k#QstcNdXegCBL&n z{R245N{P+JFlcoQ^$$?8YsY+kDTqY@iRQ7nS$yFDCaoU#3m49^Qhv@vNKZBJ{@H8t zcNPp%Ef!L{fk%dl5<`glBS`wMGk3{}%GH{e1jvCV%rJBOWWM)=wyrAi0)I z%sLYQX_u;(2S`jGiO=vYq!5WmaTv|4Gg)wZtmI_}81Y!h+2qF^7~@OO$A)wVIhIVc znv|q&VNpP(t%x6yNpi2%infD|vTDsX90oHQAsF#k$jc5eCncl7?{tm5;_Ty_V)Vp4 zY1OCw8$h|a0PoZU&W;9g^>CBiYj^Erv+Ye=En`-U^U*TskW8!{{1L7(5X ze86-pN+=qpv8zqAA8C?%Y<~mhq{KTlL67$>%@5ke#RJEs&6t5PRlhvI!n%Cul-y@8 z;(6FjwW9>_=jd+VAlr2tdFUIWxu;#M*h_f6vO(^)Z{=m!L%FR0fj|hs6U9Y|Zaq&G q7w7tJiPilXsQ?wA0#v}N1N;JX;!@CbHXrx^00002BR0prCY# zYeY$Kep*R+Vo@rCb81d;WwAnVNoh)EzCuWTe$K(=4{I10m>WG^978H@y}gy45u7f; z{^5W1xy)HJmUWtKJZicA1v_tUs;FeNAj|Wmi??|R>UTJ9i7kC)67fu2T;|1+E{#|1 zx3<1`B)WA`*dB!t!JO3JAJ8d@-3BlpWifZ&RL**Z2@oPyz}oHpZ}cu z{nLTpTuM$#?FkHQ*ii$c2xB@gqk~svV~2J_m+Sq@Mc=1=_xg45RCCHT>4kz1H}03^ z-+gOhea++!?uK<=)nB^q5IX)&Mv zwW&lN%ZV0qo7sM7k^jNW_jgw)+FKlW{iJzfTt%MA!FjWp86RBFHaDy~<+4Ogy71Zh z>U`Y;ZwoH^oMu@ui%U_Z9H6qN1fu*iPld-=xOg21{cHJ_)gNr%I`GZ*g_IAvcy*Wt(E z-x8BohjmYzalcKyp< zhRWu*8{W)NH+!nP*z|F_qq=r&!@P6pC)VkRP8ZKv`ux|01I$0lZGJ49wT|6ZV}oCl zz=4x}w=+Ih2bN{|hj`{|$GCdi{blmp#MH~-A|?0JdP4Bm+!~o?Uhne2+6|({Z9WYu zDs#S@Ewp`b_}Q)bi?tpc|C99V*0fd?&pK9yL-QT&m&s~%^E2eNN;WV`;6+J7!1VHV zS3P6pHJ_eMOAha;UFV^}@V@-`%9W25?F=I)=50|}v#-T3EI~_OgmW`XU3{S9VV}&3 zl`CI#wj^9!{-7+@wn+N^-%zg@rY-Ai9GrR7WU{ke_L)kvxw13-b?WeLP+wiAxcOd( zv;XVBDf2Fuci)*`&RocOAt=bxnLV=LN2D!R&P{`tY^q`h&Mn%yCFRHT7kumsC$X(Q z$fI~+eXqg0-wkg+hfUTwc|qH1ip)RFj|@A6Q-JBe;d|$PM!ibD`T9|L+kttO!PC{x JWt~$(697x}y;cAK literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/OuterClothing/Misc/marshoodie.rsi/inhand-right.png b/Resources/Textures/Floof/Clothing/OuterClothing/Misc/marshoodie.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..4fc8a3e71397298bce150e770145b94148f07189 GIT binary patch literal 1017 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9GGLLkg|>2BR0prCY# zYeY$Kep*R+Vo@rCb81d;WwAnVNoh)EzCuWTe$K(=4{I10m|Hwu978H@y}ecM6C5tW z{^5P?`@kr#%!y(h=Q{P?@aM7^iEXw>N?P>0F>!%nTC(D#)Kd+Ovt5k;C#I z@$W%_O_7Dh!X2kJ_39*^p2QekGC9XN`7pmS$7?OtuH4%9KiW4(PIc)}+wyJB{`|am zf9Dk6w>`PLsYBqbqC^8DcJx5A^W>{AriLH8Y7EmGel6;M5qmsNaOG@yo&QZ|s+3KX zcq-j4+S_&QF*Z%Q#_-ts+@&f1&BWwty%`RiU3K}&!qo~RP@>W$mAS)nt0JG`kincMd= zoT`sh7x-7k`|#*7ufnBU8mnrqJ71Gyny_%mp}76N7N=)voSeWA>2c7rFYYhj?%Q^v z@A&sGD=W{x!T3b&R-)w=&nr*%IftI#&o*}r%jD;KOnc6>8D0GN%x>4p?`L^F{NM2{ zPWbPeQlY{SRz8uCfRB%^c1#q_a8bBq@IunL?D6l-``LDH zmszOyo*^!BgUqA}A9`1dFP@xNbE!`04db^bxr=$X@f`8^WXmA%?_<@5Z&%jcWG>J? z!@zR@FKPfL7ptPL(NChnmCjCL`h2igX%$0^{G5gNHrDAFMNUlGa$xBb97F9pF#{AKhUOkazDeV6bwS7K4QJt#*7@m_J>tx8ibK0jXtQH$n!YHG6$M5L* zJw2TJ#kDdwNSzU268x=Lv&QbhgJoWmR3)oi+b=!)dy)OXTm@zW248KbLh*2~7Z_M!kCg literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/OuterClothing/Misc/marshoodie.rsi/meta.json b/Resources/Textures/Floof/Clothing/OuterClothing/Misc/marshoodie.rsi/meta.json new file mode 100644 index 00000000000..af8d1329fc8 --- /dev/null +++ b/Resources/Textures/Floof/Clothing/OuterClothing/Misc/marshoodie.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprited by Dakota Haven", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Floof/Clothing/Under/Gloves/captwarmer.rsi/equipped-HAND.png b/Resources/Textures/Floof/Clothing/Under/Gloves/captwarmer.rsi/equipped-HAND.png new file mode 100644 index 0000000000000000000000000000000000000000..4fa52bb7efa22b5d43275725853731d086be461f GIT binary patch literal 569 zcmV-90>=G`P)Px$^GQTORCt{2+CNJpK^O+`$E=kbuvo;(1Qr4^7&#$W9@>gvAy_EdSojevto;mD zR$e8D-L-<{A*WnqKmrk_6G>q)c5y9a;}X~1c{MTdcz#tN^Zv=OGb!E$h=_=Yh=_>Z z@WNVDUEYekuom@W{h;d?@{%c~T=Kl3l)`5>p}W2p*1ohp>WA}D^mikwAI^&seKc+m z^+&V5{IUN8r91%B0RA{PuzorXoB~=uImZmDe&!Jyq*B$zK7$S__xEzzb_oO2Jy|k~Y`Muc=Ob-}jwjeBbZXkK?ms9)X?G4VHe6q29Q| z=J7;svUc+V8o<%oJ*t&S{62rgu2b8+sSf~J>z>sI@bXBH&n}2Aq4C*;p8gFEvOW&ph}jXSLWbB`50!r|g-6i;cbwP>E548;*h z_NBEJ9Ra8Dc$!wLl{&MR4l*UuawmVhF-CkZi8i2lb}|yr-h&`Wo!Q5CL_ehEPQDKi z1c5lG=neq#XZFSzaTBi6a`*gw02jkHe;>Afh=_=Y=sS1@s&3|F=K4^`00000NkvXX Hu0mjf=vxQk literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/Under/Gloves/captwarmer.rsi/icon.png b/Resources/Textures/Floof/Clothing/Under/Gloves/captwarmer.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..63b61d20c4cb59fd524eae464c84f5460353302e GIT binary patch literal 297 zcmV+^0oMMBP)Px#<4Ht8R9J=W)3FM|Fc1ddU*qJ`N!%<1q;k;W5FEu>oE;QheFUGt$LQqd;^qT5 zintUCBDjll+%!&#AZ=2??Y=3H%W=tF0LB<&j9Cb&OgNYtA(i<@eA$+ah+Oh~AtJaI zktvBg#vH~bi93Z76**VQ+iWi$AQAvt0Cvs=jMgn+4W#MA8k^e!-}m2ZA(aV&zPx%N=ZaPRCt{2n!Rq~Koo^Phzq1~M{gHsn^6)ekto>**gEAFd5$2ZNI?-PZ;@x< z0Z5s`C_}Pw?JmYPm&q0y`xR;*Lgh5JsiekiE}{^1VIo4K@bE%5ClOG z1VIqK3^kicS(X71wA$J0@t4VC?a)|h>UMCcU#r>4sJn{LTBEi8aI7lIuJ3HXXCrW# zJnYsvK3g$L#`K#@0D7GzKfeFs`0N{_q*_0#sPB9RztA{_b1hBdiPvTJ7w9cFyFk0YI9jTle$p$z6l{ z*}1a_oBCR7lu`gZ-K-dP*V2dGI!`w%0F+W_t)1#y?*L;Aqht)gbUNL-mtT*PF~%6% zC7pP^ZgBBTf3N_cKUff4JRh8AgVQ1SKOu*pC1QYY0lpCfd<*c67~orgZ^QuK0(>I| z_!i(BF~GL~--rRe1^7k`@GZbMVt{V}z7Yd_3-HaCH^3Rj`82)u{f;<96KD3?5FX#`JW$Uuku-`A>N}*^h4=d9&Wj32J zpU=IV0bv-@Y&KC!<(XhDe?%*f#?mz1q_sX#O6{f9E)+Ik@5?7Y|6PK*Q!Ce!|N1Tz zGN9L4ZZi2OiWqk5oL(Q5-WPC)pw-S!ua6jZ>qJomtosFeonmJ|Ap@=+8k=4LSZDNA q^#vTl7_;dQfOTKO)kCAuTE795P4WYUiYA=^0000Px#-bqA3R9J=WlRXN;KoEt$NQ(3xV2fb0XrW-K2k;c$!`>p`Ej)vlu!u!igpeW! zNExtD)+| zwAN^?Uuv$j4)AUKHs;-;Lw|T8iBmS+0|3j(f!TCVf7m05+n=ZP4pdidjJfW>y#_zr zfp6m+Aes-XQmWCTlp>lBY@_L&0Dd^O>taN<3IHg}vevKaY!$FBMi1Zh;{b4Z-y}`} q$n(6`tLh|9F~+!#6a+yK05}7L3r#(>US;h70000l<%bzexyjG)>T(n*QUU(vO^w zZ70_6NtrA-lmAlAv@?I4w?zpm!N8}T`|qq+)%E_@+kaEEeY)l6|1Yh-#&~FpK<=uC zLcU9Hg>07j_hCZwPv5U|^F<@}tyv|My42?Wnv&ho-ZIA@&6)i7=;}H5_OaK7&*qN! z`N{mce`AM-z>K~W`3DO+o>l7Q-uAkGb=wu?4^N}nBYJf&l$So3(=7Ava^NTT{fzZj zlkyMLA7s41dclHW7lRbLgSf+Eh8Ij3G7PZ{z03=^7Zfs-Fq-f+=rtU}R5Y2rW78)I z+XOZKg7SZCKlkgL@~Yfn6=`<+%lyB0rmGi!1NuUOr>@c_I)^1bY=+n~)-(2vDxPfi q_upN+=HC14^ruo~U??nNl=oU7p)RvP@eDA$89ZJ6T-G@yGywpN)Uap( literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/Uniforms/captthong.rsi/icon.png b/Resources/Textures/Floof/Clothing/Uniforms/captthong.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..d5ec7f1ccc57753d891f517ddd3c71914df99920 GIT binary patch literal 215 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}6FprVLn2y} z6C_v{Cy4Yk1sZU<9n_Fub>=KN_WIBN|Nrfo_3lWn|2%&gUqYBs;*WYgsol!wT>t;C z*PE4MEa@2tR8!9;mKxl~ebwjx-{~ie3W|%3YySS4nwWehnXUO+eNX+nd1(nLDknWI zF>LCeIo0Ri>t9FyriU3hath93`jQY{#B;2p4`Q!^C<8-DPr;MUXk8DW;}|?${an^L HB{Ts5WPwth literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/Uniforms/captthong.rsi/inhand-left.png b/Resources/Textures/Floof/Clothing/Uniforms/captthong.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..bdbf35325f54089b6c158805e5ddc9220e737c5a GIT binary patch literal 371 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5`$3q|f;CtLC@5Xx z8c`CQpH@ItG2m%^ zIK5ioo9cIa-VWJ9et+|`Cd~^xf5f^^{1jOfW0Rg%Rcr~=g9ZFpt8+T%e!2Lm#h+}p z=ia`P%n+{EBeX!rd-9Uh$R-Dku0txBvEk*?3)a1U- literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/Uniforms/captthong.rsi/inhand-right.png b/Resources/Textures/Floof/Clothing/Uniforms/captthong.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..ba71aea082070d3c2d882a1ba2b79289f5daff35 GIT binary patch literal 399 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5`$3q|f;CtLC@5Xx z8c`CQpH@F!Z*QIKZ8Z>J zxvOK!WH|6YTjvzxlqi4Q)%>o;hiA*PDljl|I502?G%&CrGaH_- z*WkMSeeT9jpKP{&wwcM(@crJl+-h})$Z2d0uXnjg-mpw(D3EcNVo+rHeKuxVtKl|I zhNQeJ?u@T?{o|gq?B&M`p`ntVXFkt4Cx5}Dm+^o_-yi?Tc;<}T*V+;j*61*FO#Lp} zu`m855ond&eOK+c8gUUNIk4fwW=OjJvyj4- Date: Thu, 15 Aug 2024 08:00:38 -0500 Subject: [PATCH 15/38] DataField usage for components --- .../Traits/Components/CumProducerComponent.cs | 12 ++++++------ .../Traits/Components/MilkProducerComponent.cs | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Content.Server/FloofStation/Traits/Components/CumProducerComponent.cs b/Content.Server/FloofStation/Traits/Components/CumProducerComponent.cs index c9400ea1384..0eb0d8a0e1c 100644 --- a/Content.Server/FloofStation/Traits/Components/CumProducerComponent.cs +++ b/Content.Server/FloofStation/Traits/Components/CumProducerComponent.cs @@ -12,10 +12,10 @@ namespace Content.Server.FloofStation.Traits; [RegisterComponent, Access(typeof(LewdTraitSystem))] public sealed partial class CumProducerComponent : Component { - [DataField("solutionname"), ViewVariables(VVAccess.ReadWrite)] + [DataField("solutionname")] public string SolutionName = "penis"; - [DataField, ViewVariables(VVAccess.ReadWrite)] + [DataField] public ProtoId ReagentId = "Cum"; [DataField] @@ -24,15 +24,15 @@ public sealed partial class CumProducerComponent : Component [DataField] public Entity? Solution = null; - [DataField, ViewVariables(VVAccess.ReadWrite)] + [DataField] public FixedPoint2 QuantityPerUpdate = 5; - [DataField, ViewVariables(VVAccess.ReadWrite)] + [DataField] public float HungerUsage = 10f; - [DataField, ViewVariables(VVAccess.ReadWrite)] + [DataField] public TimeSpan GrowthDelay = TimeSpan.FromSeconds(10); - [DataField(customTypeSerializer: typeof(TimeOffsetSerializer)), ViewVariables(VVAccess.ReadWrite)] + [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))] public TimeSpan NextGrowth = TimeSpan.FromSeconds(0); } diff --git a/Content.Server/FloofStation/Traits/Components/MilkProducerComponent.cs b/Content.Server/FloofStation/Traits/Components/MilkProducerComponent.cs index a964211b96b..8b159e3921b 100644 --- a/Content.Server/FloofStation/Traits/Components/MilkProducerComponent.cs +++ b/Content.Server/FloofStation/Traits/Components/MilkProducerComponent.cs @@ -12,10 +12,10 @@ namespace Content.Server.FloofStation.Traits; [RegisterComponent, Access(typeof(LewdTraitSystem))] public sealed partial class MilkProducerComponent : Component { - [DataField("solutionname"), ViewVariables(VVAccess.ReadWrite)] + [DataField("solutionname")] public string SolutionName = "breasts"; - [DataField, ViewVariables(VVAccess.ReadWrite)] + [DataField] public ProtoId ReagentId = "Milk"; [DataField] @@ -24,15 +24,15 @@ public sealed partial class MilkProducerComponent : Component [DataField] public Entity? Solution = null; - [DataField, ViewVariables(VVAccess.ReadWrite)] + [DataField] public FixedPoint2 QuantityPerUpdate = 5; - [DataField, ViewVariables(VVAccess.ReadWrite)] + [DataField] public float HungerUsage = 10f; - [DataField, ViewVariables(VVAccess.ReadWrite)] + [DataField] public TimeSpan GrowthDelay = TimeSpan.FromSeconds(10); - [DataField(customTypeSerializer: typeof(TimeOffsetSerializer)), ViewVariables(VVAccess.ReadWrite)] + [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))] public TimeSpan NextGrowth = TimeSpan.FromSeconds(0); } From e52c7172a0e86c0fa88715258b76ae897ea57ea4 Mon Sep 17 00:00:00 2001 From: FoxxoTrystan <45297731+FoxxoTrystan@users.noreply.github.com> Date: Thu, 15 Aug 2024 23:06:01 +0200 Subject: [PATCH 16/38] Update CODEOWNERS --- .github/CODEOWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 5e591c88a31..b2547ec7343 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1,3 +1,3 @@ # Floofstation CODEOWNERS -* @Fansana @FoxxoTrystan +* @Memeji @FoxxoTrystan From 956296b0b2618b806b659551cf5971e659033fd8 Mon Sep 17 00:00:00 2001 From: FloofStation Changelogs <175611579+Floof-Station-Bot@users.noreply.github.com> Date: Thu, 15 Aug 2024 21:27:20 +0000 Subject: [PATCH 17/38] Automatic Changelog Update (#106) --- Resources/Changelog/Floof.yml | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/Resources/Changelog/Floof.yml b/Resources/Changelog/Floof.yml index e16fd80eb78..e2aa1f1a9ac 100644 --- a/Resources/Changelog/Floof.yml +++ b/Resources/Changelog/Floof.yml @@ -502,3 +502,27 @@ Entries: message: Added way to make Double Cream Blaster with all natural creams id: 70 time: '2024-08-15T00:10:40.0000000+00:00' +- author: Memeji + changes: + - type: Tweak + message: Tweaked starting max milk amount. 25u -> 50u + - type: Tweak + message: Gave cumProducer a default SolutionName ("penis"). + - type: Tweak + message: Gave milkProducer a default SolutionName ("breasts"). + - type: Tweak + message: cumProducer takes less time to generate, but generates less per growth. + - type: Tweak + message: milkProducer takes less time to generate, but generates less per growth. + - type: Fix + message: >- + Cum generation - When you eat something, your tank will refill and use + hunger. + - type: Fix + message: >- + Milk generation - When you eat something, your tank will refill and use + hunger. + - type: Remove + message: Duplicate "Floof" folder. + id: 71 + time: '2024-08-15T21:26:49.0000000+00:00' From 0efef1c47575e2e1eec073d9cdaf15add89b44a1 Mon Sep 17 00:00:00 2001 From: fenndragon Date: Thu, 15 Aug 2024 18:52:55 -0600 Subject: [PATCH 18/38] Rouny Sprite Update --- .../Mobs/Aliens/Xenos/rouny.rsi/running.png | Bin 8252 -> 13752 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/Resources/Textures/Mobs/Aliens/Xenos/rouny.rsi/running.png b/Resources/Textures/Mobs/Aliens/Xenos/rouny.rsi/running.png index 3ba69b444206f4924f70a383293f7e8885aab398..c8203e4a39b5323511b2e062037e1396ce472740 100644 GIT binary patch literal 13752 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 From 01e434a1ae1049239422b80c29c270f697095ed1 Mon Sep 17 00:00:00 2001 From: Pierson Arnold Date: Thu, 15 Aug 2024 22:49:15 -0500 Subject: [PATCH 19/38] Disable hunger mechanic for now --- Content.Server/FloofStation/Traits/LewdTraitSystem.cs | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/Content.Server/FloofStation/Traits/LewdTraitSystem.cs b/Content.Server/FloofStation/Traits/LewdTraitSystem.cs index 5c5f084ce08..a3702b7beb3 100644 --- a/Content.Server/FloofStation/Traits/LewdTraitSystem.cs +++ b/Content.Server/FloofStation/Traits/LewdTraitSystem.cs @@ -279,15 +279,12 @@ public override void Update(float frameTime) containerCum.NextGrowth = now + containerCum.GrowthDelay; - if (_mobState.IsDead(uid)) - continue; - if (EntityManager.TryGetComponent(uid, out HungerComponent? hunger)) { if (_hunger.GetHungerThreshold(hunger) < HungerThreshold.Okay) continue; - _hunger.ModifyHunger(uid, -containerCum.HungerUsage, hunger); + //_hunger.ModifyHunger(uid, -containerCum.HungerUsage, hunger); } if (!_solutionContainer.ResolveSolution(uid, containerCum.SolutionName, ref containerCum.Solution)) @@ -303,15 +300,12 @@ public override void Update(float frameTime) containerMilk.NextGrowth = now + containerMilk.GrowthDelay; - if (_mobState.IsDead(uid)) - continue; - if (EntityManager.TryGetComponent(uid, out HungerComponent? hunger)) { if (_hunger.GetHungerThreshold(hunger) < HungerThreshold.Okay) continue; - _hunger.ModifyHunger(uid, -containerMilk.HungerUsage, hunger); + //_hunger.ModifyHunger(uid, -containerMilk.HungerUsage, hunger); } if (!_solutionContainer.ResolveSolution(uid, containerMilk.SolutionName, ref containerMilk.Solution)) From 6784811c49de0695aacaf3ade52f4ef6011e25a4 Mon Sep 17 00:00:00 2001 From: FloofStation Changelogs <175611579+Floof-Station-Bot@users.noreply.github.com> Date: Fri, 16 Aug 2024 06:53:18 +0000 Subject: [PATCH 20/38] Automatic Changelog Update (#112) --- Resources/Changelog/Floof.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Resources/Changelog/Floof.yml b/Resources/Changelog/Floof.yml index e2aa1f1a9ac..a9aa7e963f0 100644 --- a/Resources/Changelog/Floof.yml +++ b/Resources/Changelog/Floof.yml @@ -526,3 +526,9 @@ Entries: message: Duplicate "Floof" folder. id: 71 time: '2024-08-15T21:26:49.0000000+00:00' +- author: fenndragon + changes: + - type: Tweak + message: Updated the Rouny Sprite + id: 72 + time: '2024-08-16T06:52:50.0000000+00:00' From 02ca60fa4ea556b90ee62082d785d0a6bd6d143a Mon Sep 17 00:00:00 2001 From: ShatteredSwords <135023515+ShatteredSwords@users.noreply.github.com> Date: Fri, 16 Aug 2024 19:06:32 -0400 Subject: [PATCH 21/38] Cherry-pick own commits to own branch --- Resources/Migrations/migration.yml | 4 ++++ .../DeltaV/Entities/Mobs/NPCs/pets.yml | 6 +++--- .../Objects/Consumable/Drinks/drinks_cans.yml | 18 ----------------- .../Floof/Entities/Markers/Spawners/mobs.yml | 12 +++++++++++ .../Floof/Entities/Mobs/NPCs/pets.yml | 20 +++++++++++++++++++ .../Objects/Consumable/Drinks/drinks_cans.yml | 18 +++++++++++++++++ .../Floof/Entities/Objects/Fun/toys.yml | 18 +++++++++++++++++ 7 files changed, 75 insertions(+), 21 deletions(-) create mode 100644 Resources/Prototypes/Floof/Entities/Markers/Spawners/mobs.yml create mode 100644 Resources/Prototypes/Floof/Entities/Mobs/NPCs/pets.yml create mode 100644 Resources/Prototypes/Floof/Entities/Objects/Consumable/Drinks/drinks_cans.yml create mode 100644 Resources/Prototypes/Floof/Entities/Objects/Fun/toys.yml diff --git a/Resources/Migrations/migration.yml b/Resources/Migrations/migration.yml index 7f19699ad8a..b8c34c6406a 100644 --- a/Resources/Migrations/migration.yml +++ b/Resources/Migrations/migration.yml @@ -254,3 +254,7 @@ BriefcaseSyndieBase: null # 2024-04-08 BodyBag_Container: BodyBag BodyBag_Folded: BodyBagFolded + +# 2024-08-16 Floof Only Please message @FracturedSwords on discord if there are any merge conflicts upcoming +SpawnMobArcticFoxSiobhan: SpawnMobArcticFoxSeb +MobArcticFoxSiobhan: MobArcticFoxSeb diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/pets.yml index e3859bf32ae..2d1a1d72c48 100644 --- a/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/pets.yml +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/pets.yml @@ -1,8 +1,8 @@ - type: entity - name: Seb + name: Siobhan parent: MobArcticFox id: MobArcticFoxSiobhan - description: His name is "Sebastien de Lys", but he is known as Seb by his friends. A fluffy, adorable arctic fox. + description: Her name is pronounced "Shivahn", but she is known as Shivs by her associates. A fluffy, adorable arctic fox. components: - type: InteractionPopup successChance: 1 @@ -13,7 +13,7 @@ - type: Grammar attributes: proper: true - gender: male + gender: female - type: Tag tags: - CannotSuicide diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml index 862dc88343f..5a07bdd659d 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml @@ -533,21 +533,3 @@ tags: - Wine -#Floof -- type: entity - parent: DrinkCanBaseFull - id: DrinkNNNCan - name: Nikkos Naughty Nectar - description: A can of Nikko's Naughty Nectar! Best not to ask how it's made... - components: - - type: SolutionContainerManager - solutions: - drink: - maxVol: 30 - reagents: - - ReagentId: NikkosNaughtyNectar - Quantity: 30 - - type: Sprite - sprite: Objects/Consumable/Drinks/nnn_can.rsi - - type: Item - sprite: Objects/Consumable/Drinks/nnn_can.rsi diff --git a/Resources/Prototypes/Floof/Entities/Markers/Spawners/mobs.yml b/Resources/Prototypes/Floof/Entities/Markers/Spawners/mobs.yml new file mode 100644 index 00000000000..cf4825b6783 --- /dev/null +++ b/Resources/Prototypes/Floof/Entities/Markers/Spawners/mobs.yml @@ -0,0 +1,12 @@ +- type: entity + name: Arctic Fox Seb Spawner + id: SpawnMobArcticFoxSeb + parent: MarkerBase + components: + - type: Sprite + layers: + - state: green + - state: ai + - type: ConditionalSpawner + prototypes: + - MobArcticFoxSeb diff --git a/Resources/Prototypes/Floof/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/Floof/Entities/Mobs/NPCs/pets.yml new file mode 100644 index 00000000000..c292d61f739 --- /dev/null +++ b/Resources/Prototypes/Floof/Entities/Mobs/NPCs/pets.yml @@ -0,0 +1,20 @@ +- type: entity + name: Seb + parent: MobArcticFox + id: MobArcticFoxSeb + description: His name is "Sebastien de Lys", but he is known as Seb by his friends. A fluffy, adorable arctic fox. + components: + - type: InteractionPopup + successChance: 1 + - type: Butcherable + spawned: + - id: FoodMeat + amount: 3 + - type: Grammar + attributes: + proper: true + gender: male + - type: Tag + tags: + - CannotSuicide + - VimPilot diff --git a/Resources/Prototypes/Floof/Entities/Objects/Consumable/Drinks/drinks_cans.yml b/Resources/Prototypes/Floof/Entities/Objects/Consumable/Drinks/drinks_cans.yml new file mode 100644 index 00000000000..f1a0be549b7 --- /dev/null +++ b/Resources/Prototypes/Floof/Entities/Objects/Consumable/Drinks/drinks_cans.yml @@ -0,0 +1,18 @@ +#Floof +- type: entity + parent: DrinkCanBaseFull + id: DrinkNNNCan + name: Nikkos Naughty Nectar + description: A can of Nikko's Naughty Nectar! Best not to ask how it's made... + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: NikkosNaughtyNectar + Quantity: 30 + - type: Sprite + sprite: Objects/Consumable/Drinks/nnn_can.rsi + - type: Item + sprite: Objects/Consumable/Drinks/nnn_can.rsi diff --git a/Resources/Prototypes/Floof/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Floof/Entities/Objects/Fun/toys.yml new file mode 100644 index 00000000000..4088caa15f8 --- /dev/null +++ b/Resources/Prototypes/Floof/Entities/Objects/Fun/toys.yml @@ -0,0 +1,18 @@ +- type: entity + parent: BasePlushie + id: ToySeb + name: seb toy + description: Nearly as fluffy as the real Seb! + components: + - type: Sprite + sprite: DeltaV/Objects/Fun/Toys/siobhantoy.rsi + state: base + - type: EmitSoundOnUse + sound: + path: /Audio/Animals/fox_squeak.ogg + - type: EmitSoundOnTrigger + sound: + path: /Audio/Animals/fox_squeak.ogg + - type: MeleeWeapon + soundHit: + path: /Audio/Animals/fox_squeak.ogg From 271e2be8c922737056de3ab532a2c42c336c6d9b Mon Sep 17 00:00:00 2001 From: ShatteredSwords <135023515+ShatteredSwords@users.noreply.github.com> Date: Fri, 16 Aug 2024 19:31:13 -0400 Subject: [PATCH 22/38] No more Seb toy for now --- .../Floof/Entities/Objects/Fun/toys.yml | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/Resources/Prototypes/Floof/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Floof/Entities/Objects/Fun/toys.yml index 4088caa15f8..8b137891791 100644 --- a/Resources/Prototypes/Floof/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/Floof/Entities/Objects/Fun/toys.yml @@ -1,18 +1 @@ -- type: entity - parent: BasePlushie - id: ToySeb - name: seb toy - description: Nearly as fluffy as the real Seb! - components: - - type: Sprite - sprite: DeltaV/Objects/Fun/Toys/siobhantoy.rsi - state: base - - type: EmitSoundOnUse - sound: - path: /Audio/Animals/fox_squeak.ogg - - type: EmitSoundOnTrigger - sound: - path: /Audio/Animals/fox_squeak.ogg - - type: MeleeWeapon - soundHit: - path: /Audio/Animals/fox_squeak.ogg + From e2aa68845efd17e6f771484b91870b2246ead50a Mon Sep 17 00:00:00 2001 From: ShatteredSwords <135023515+ShatteredSwords@users.noreply.github.com> Date: Fri, 16 Aug 2024 19:35:57 -0400 Subject: [PATCH 23/38] Yoink --- Resources/Migrations/migration.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Resources/Migrations/migration.yml b/Resources/Migrations/migration.yml index b8c34c6406a..7f19699ad8a 100644 --- a/Resources/Migrations/migration.yml +++ b/Resources/Migrations/migration.yml @@ -254,7 +254,3 @@ BriefcaseSyndieBase: null # 2024-04-08 BodyBag_Container: BodyBag BodyBag_Folded: BodyBagFolded - -# 2024-08-16 Floof Only Please message @FracturedSwords on discord if there are any merge conflicts upcoming -SpawnMobArcticFoxSiobhan: SpawnMobArcticFoxSeb -MobArcticFoxSiobhan: MobArcticFoxSeb From bb8e316c25b120e43f832685097773cd1313ad3b Mon Sep 17 00:00:00 2001 From: ShatteredSwords <135023515+ShatteredSwords@users.noreply.github.com> Date: Fri, 16 Aug 2024 19:38:06 -0400 Subject: [PATCH 24/38] Move Seb to Migrations --- Resources/Migrations/floofmigration.yml | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 Resources/Migrations/floofmigration.yml diff --git a/Resources/Migrations/floofmigration.yml b/Resources/Migrations/floofmigration.yml new file mode 100644 index 00000000000..5e4e0419c7c --- /dev/null +++ b/Resources/Migrations/floofmigration.yml @@ -0,0 +1,3 @@ +# 2024-08-16 Floof Only Please message @FracturedSwords on discord if there are any merge conflicts upcoming +SpawnMobArcticFoxSiobhan: SpawnMobArcticFoxSeb +MobArcticFoxSiobhan: MobArcticFoxSeb From 24fc4b53f807fbd066e00c008da4afaf2f686c98 Mon Sep 17 00:00:00 2001 From: Dakota Haven Date: Fri, 16 Aug 2024 17:56:30 -0600 Subject: [PATCH 25/38] So. Many. Socks. Signed-off-by: Dakota Haven --- .../Catalog/Fills/Lockers/heads.yml | 6 + .../Inventories/cargodrobe.yml | 3 + .../VendingMachines/Inventories/chapel.yml | 4 + .../VendingMachines/Inventories/engidrobe.yml | 3 + .../VendingMachines/Inventories/janidrobe.yml | 3 + .../VendingMachines/Inventories/medidrobe.yml | 3 + .../VendingMachines/Inventories/scidrobe.yml | 3 + .../VendingMachines/Inventories/secdrobe.yml | 3 + .../Entities/Clothing/Hands/miscgloves.yml | 14 - .../Floof/Entities/Clothing/Under/under.yml | 10 - .../Clothing/Uniforms/base_uniform.yml | 24 + .../Floof/Entities/Clothing/Uniforms/misc.yml | 18 +- .../Clothing/departmental_clothes.yml | 443 +++++++++++++++++ .../Floof/Loadouts/departmentalloadouts.yml | 469 ++++++++++++++++++ .../Command/captsocks.rsi/equipped-FEET.png | Bin 0 -> 656 bytes .../Command/captsocks.rsi/icon.png | Bin 0 -> 292 bytes .../Command/captsocks.rsi/meta.json | 18 + .../captthong.rsi/equipped-INNERCLOTHING.png | Bin 0 -> 413 bytes .../Command/captthong.rsi/icon.png | Bin 0 -> 215 bytes .../Command/captthong.rsi/inhand-left.png | Bin 0 -> 371 bytes .../Command/captthong.rsi/inhand-right.png | Bin 0 -> 399 bytes .../Command/captthong.rsi/meta.json | 26 + .../Command/captwarmer.rsi/equipped-HAND.png | Bin 0 -> 569 bytes .../Command/captwarmer.rsi/icon.png | Bin 0 -> 297 bytes .../Command/captwarmer.rsi/meta.json | 18 + .../commandsocks.rsi/equipped-FEET.png | Bin 0 -> 516 bytes .../Command/commandsocks.rsi/icon.png | Bin 0 -> 302 bytes .../Command/commandsocks.rsi/meta.json | 18 + .../equipped-INNERCLOTHING.png | Bin 0 -> 420 bytes .../Command/commandthong.rsi/icon.png | Bin 0 -> 247 bytes .../Command/commandthong.rsi/inhand-left.png | Bin 0 -> 272 bytes .../Command/commandthong.rsi/inhand-right.png | Bin 0 -> 269 bytes .../Command/commandthong.rsi/meta.json | 26 + .../commandwarmer.rsi/equipped-HAND.png | Bin 0 -> 538 bytes .../Command/commandwarmer.rsi/icon.png | Bin 0 -> 291 bytes .../Command/commandwarmer.rsi/meta.json | 18 + .../engisocks.rsi/equipped-FEET.png | Bin 0 -> 531 bytes .../Engineering/engisocks.rsi/icon.png | Bin 0 -> 317 bytes .../Engineering/engisocks.rsi/meta.json | 18 + .../engithong.rsi/equipped-INNERCLOTHING.png | Bin 0 -> 390 bytes .../Engineering/engithong.rsi/icon.png | Bin 0 -> 260 bytes .../Engineering/engithong.rsi/inhand-left.png | Bin 0 -> 270 bytes .../engithong.rsi/inhand-right.png | Bin 0 -> 269 bytes .../Engineering/engithong.rsi/meta.json | 26 + .../engiwarmer.rsi/equipped-HAND.png | Bin 0 -> 502 bytes .../Engineering/engiwarmer.rsi/icon.png | Bin 0 -> 302 bytes .../Engineering/engiwarmer.rsi/meta.json | 18 + .../equipped-OUTERCLOTHING.png | Bin 0 -> 584 bytes .../Epistemics/chaplainmantle.rsi/icon.png | Bin 0 -> 326 bytes .../Epistemics/chaplainmantle.rsi/meta.json | 18 + .../equipped-HELMET.png | Bin 0 -> 647 bytes .../chaplainmantlehood.rsi/icon.png | Bin 0 -> 347 bytes .../chaplainmantlehood.rsi/meta.json | 18 + .../chaplainsocks.rsi/equipped-FEET.png | Bin 0 -> 498 bytes .../Epistemics/chaplainsocks.rsi/icon.png | Bin 0 -> 304 bytes .../Epistemics/chaplainsocks.rsi/meta.json | 18 + .../equipped-INNERCLOTHING.png | Bin 0 -> 431 bytes .../Epistemics/chaplainthong.rsi/icon.png | Bin 0 -> 272 bytes .../chaplainthong.rsi/inhand-left.png | Bin 0 -> 371 bytes .../chaplainthong.rsi/inhand-right.png | Bin 0 -> 399 bytes .../Epistemics/chaplainthong.rsi/meta.json | 26 + .../chaplainwarmer.rsi/equipped-HAND.png | Bin 0 -> 594 bytes .../Epistemics/chaplainwarmer.rsi/icon.png | Bin 0 -> 349 bytes .../Epistemics/chaplainwarmer.rsi/meta.json | 18 + .../Epistemics/episocks.rsi/equipped-FEET.png | Bin 0 -> 636 bytes .../Epistemics/episocks.rsi/icon.png | Bin 0 -> 375 bytes .../Epistemics/episocks.rsi/meta.json | 18 + .../epithong.rsi/equipped-INNERCLOTHING.png | Bin 0 -> 367 bytes .../Epistemics/epithong.rsi/icon.png | Bin 0 -> 229 bytes .../Epistemics/epithong.rsi/inhand-left.png | Bin 0 -> 271 bytes .../Epistemics/epithong.rsi/inhand-right.png | Bin 0 -> 268 bytes .../Epistemics/epithong.rsi/meta.json | 26 + .../epiwarmer.rsi/equipped-HAND.png | Bin 0 -> 518 bytes .../Epistemics/epiwarmer.rsi/icon.png | Bin 0 -> 296 bytes .../Epistemics/epiwarmer.rsi/meta.json | 18 + .../Logistics/logisocks.rsi/equipped-FEET.png | Bin 0 -> 585 bytes .../Logistics/logisocks.rsi/icon.png | Bin 0 -> 337 bytes .../Logistics/logisocks.rsi/meta.json | 18 + .../logithong.rsi/equipped-INNERCLOTHING.png | Bin 0 -> 419 bytes .../Logistics/logithong.rsi/icon.png | Bin 0 -> 259 bytes .../Logistics/logithong.rsi/inhand-left.png | Bin 0 -> 274 bytes .../Logistics/logithong.rsi/inhand-right.png | Bin 0 -> 272 bytes .../Logistics/logithong.rsi/meta.json | 26 + .../logiwarmer.rsi/equipped-HAND.png | Bin 0 -> 548 bytes .../Logistics/logiwarmer.rsi/icon.png | Bin 0 -> 322 bytes .../Logistics/logiwarmer.rsi/meta.json | 18 + .../medicalsocks.rsi/equipped-FEET.png | Bin 0 -> 603 bytes .../Medical/medicalsocks.rsi/icon.png | Bin 0 -> 337 bytes .../Medical/medicalsocks.rsi/meta.json | 18 + .../equipped-INNERCLOTHING.png | Bin 0 -> 375 bytes .../Medical/medicalthong.rsi/icon.png | Bin 0 -> 239 bytes .../Medical/medicalthong.rsi/inhand-left.png | Bin 0 -> 271 bytes .../Medical/medicalthong.rsi/inhand-right.png | Bin 0 -> 268 bytes .../Medical/medicalthong.rsi/meta.json | 26 + .../medicalwarmer.rsi/equipped-HAND.png | Bin 0 -> 510 bytes .../Medical/medicalwarmer.rsi/icon.png | Bin 0 -> 277 bytes .../Medical/medicalwarmer.rsi/meta.json | 18 + .../Security/secsocks.rsi/equipped-FEET.png | Bin 0 -> 695 bytes .../Security/secsocks.rsi/icon.png | Bin 0 -> 391 bytes .../Security/secsocks.rsi/meta.json | 18 + .../secthong.rsi/equipped-INNERCLOTHING.png | Bin 0 -> 474 bytes .../Security/secthong.rsi/icon.png | Bin 0 -> 259 bytes .../Security/secthong.rsi/inhand-left.png | Bin 0 -> 371 bytes .../Security/secthong.rsi/inhand-right.png | Bin 0 -> 399 bytes .../Security/secthong.rsi/meta.json | 26 + .../Security/secwarmer.rsi/equipped-HAND.png | Bin 0 -> 694 bytes .../Security/secwarmer.rsi/icon.png | Bin 0 -> 396 bytes .../Security/secwarmer.rsi/meta.json | 18 + .../janitorsocks.rsi/equipped-FEET.png | Bin 0 -> 522 bytes .../Service/janitorsocks.rsi/icon.png | Bin 0 -> 303 bytes .../Service/janitorsocks.rsi/meta.json | 18 + .../equipped-INNERCLOTHING.png | Bin 0 -> 344 bytes .../Service/janitorthong.rsi/icon.png | Bin 0 -> 230 bytes .../Service/janitorthong.rsi/inhand-left.png | Bin 0 -> 272 bytes .../Service/janitorthong.rsi/inhand-right.png | Bin 0 -> 270 bytes .../Service/janitorthong.rsi/meta.json | 26 + .../janitorwarmer.rsi/equipped-HAND.png | Bin 0 -> 481 bytes .../Service/janitorwarmer.rsi/icon.png | Bin 0 -> 279 bytes .../Service/janitorwarmer.rsi/meta.json | 18 + .../servicesocks.rsi/equipped-FEET.png | Bin 0 -> 698 bytes .../Service/servicesocks.rsi/icon.png | Bin 0 -> 380 bytes .../Service/servicesocks.rsi/meta.json | 18 + .../equipped-INNERCLOTHING.png | Bin 0 -> 390 bytes .../Service/servicethong.rsi/icon.png | Bin 0 -> 243 bytes .../Service/servicethong.rsi/inhand-left.png | Bin 0 -> 269 bytes .../Service/servicethong.rsi/inhand-right.png | Bin 0 -> 267 bytes .../Service/servicethong.rsi/meta.json | 26 + .../servicewarmer.rsi/equipped-HAND.png | Bin 0 -> 617 bytes .../Service/servicewarmer.rsi/icon.png | Bin 0 -> 361 bytes .../Service/servicewarmer.rsi/meta.json | 18 + .../Clothing/Uniforms/beethong.rsi/icon.png | Bin 238 -> 237 bytes .../Clothing/Uniforms/captthong.rsi/icon.png | Bin 215 -> 251 bytes .../Uniforms/captthong.rsi/inhand-left.png | Bin 371 -> 275 bytes .../Uniforms/captthong.rsi/inhand-right.png | Bin 399 -> 273 bytes .../Clothing/Uniforms/coderthong.rsi/icon.png | Bin 247 -> 246 bytes .../Uniforms/codervalidthong.rsi/icon.png | Bin 241 -> 241 bytes .../equipped-OUTERCLOTHING.png | Bin 0 -> 384 bytes .../Uniforms/loinclothblack.rsi/meta.json | 4 + .../equipped-OUTERCLOTHING.png | Bin 0 -> 374 bytes .../Uniforms/loinclothwhite.rsi/meta.json | 4 + .../Clothing/Uniforms/plainthong.rsi/icon.png | Bin 227 -> 227 bytes .../reotasuit.rsi/equipped-INNERCLOTHING.png | Bin 0 -> 1364 bytes .../Clothing/Uniforms/reotasuit.rsi/icon.png | Bin 0 -> 486 bytes .../Uniforms/reotasuit.rsi/inhand-left.png | Bin 0 -> 706 bytes .../Uniforms/reotasuit.rsi/inhand-right.png | Bin 0 -> 715 bytes .../Clothing/Uniforms/reotasuit.rsi/meta.json | 26 + .../Uniforms/stripethongpurple.rsi/icon.png | Bin 237 -> 237 bytes .../Uniforms/stripethongrainbow.rsi/icon.png | Bin 253 -> 252 bytes .../Uniforms/stripethongwhite.rsi/icon.png | Bin 227 -> 228 bytes 149 files changed, 1663 insertions(+), 33 deletions(-) create mode 100644 Resources/Prototypes/Floof/Entities/Clothing/Uniforms/base_uniform.yml create mode 100644 Resources/Prototypes/Floof/Entities/Clothing/departmental_clothes.yml create mode 100644 Resources/Prototypes/Floof/Loadouts/departmentalloadouts.yml create mode 100644 Resources/Textures/Floof/Clothing/Departmental/Command/captsocks.rsi/equipped-FEET.png create mode 100644 Resources/Textures/Floof/Clothing/Departmental/Command/captsocks.rsi/icon.png create mode 100644 Resources/Textures/Floof/Clothing/Departmental/Command/captsocks.rsi/meta.json create mode 100644 Resources/Textures/Floof/Clothing/Departmental/Command/captthong.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/Floof/Clothing/Departmental/Command/captthong.rsi/icon.png create mode 100644 Resources/Textures/Floof/Clothing/Departmental/Command/captthong.rsi/inhand-left.png create mode 100644 Resources/Textures/Floof/Clothing/Departmental/Command/captthong.rsi/inhand-right.png create mode 100644 Resources/Textures/Floof/Clothing/Departmental/Command/captthong.rsi/meta.json create mode 100644 Resources/Textures/Floof/Clothing/Departmental/Command/captwarmer.rsi/equipped-HAND.png create mode 100644 Resources/Textures/Floof/Clothing/Departmental/Command/captwarmer.rsi/icon.png create mode 100644 Resources/Textures/Floof/Clothing/Departmental/Command/captwarmer.rsi/meta.json create mode 100644 Resources/Textures/Floof/Clothing/Departmental/Command/commandsocks.rsi/equipped-FEET.png create mode 100644 Resources/Textures/Floof/Clothing/Departmental/Command/commandsocks.rsi/icon.png create mode 100644 Resources/Textures/Floof/Clothing/Departmental/Command/commandsocks.rsi/meta.json create mode 100644 Resources/Textures/Floof/Clothing/Departmental/Command/commandthong.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/Floof/Clothing/Departmental/Command/commandthong.rsi/icon.png create mode 100644 Resources/Textures/Floof/Clothing/Departmental/Command/commandthong.rsi/inhand-left.png create mode 100644 Resources/Textures/Floof/Clothing/Departmental/Command/commandthong.rsi/inhand-right.png create mode 100644 Resources/Textures/Floof/Clothing/Departmental/Command/commandthong.rsi/meta.json create mode 100644 Resources/Textures/Floof/Clothing/Departmental/Command/commandwarmer.rsi/equipped-HAND.png create mode 100644 Resources/Textures/Floof/Clothing/Departmental/Command/commandwarmer.rsi/icon.png create mode 100644 Resources/Textures/Floof/Clothing/Departmental/Command/commandwarmer.rsi/meta.json create mode 100644 Resources/Textures/Floof/Clothing/Departmental/Engineering/engisocks.rsi/equipped-FEET.png create mode 100644 Resources/Textures/Floof/Clothing/Departmental/Engineering/engisocks.rsi/icon.png create mode 100644 Resources/Textures/Floof/Clothing/Departmental/Engineering/engisocks.rsi/meta.json create mode 100644 Resources/Textures/Floof/Clothing/Departmental/Engineering/engithong.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/Floof/Clothing/Departmental/Engineering/engithong.rsi/icon.png create mode 100644 Resources/Textures/Floof/Clothing/Departmental/Engineering/engithong.rsi/inhand-left.png create mode 100644 Resources/Textures/Floof/Clothing/Departmental/Engineering/engithong.rsi/inhand-right.png create mode 100644 Resources/Textures/Floof/Clothing/Departmental/Engineering/engithong.rsi/meta.json create mode 100644 Resources/Textures/Floof/Clothing/Departmental/Engineering/engiwarmer.rsi/equipped-HAND.png create mode 100644 Resources/Textures/Floof/Clothing/Departmental/Engineering/engiwarmer.rsi/icon.png create mode 100644 Resources/Textures/Floof/Clothing/Departmental/Engineering/engiwarmer.rsi/meta.json create mode 100644 Resources/Textures/Floof/Clothing/Departmental/Epistemics/chaplainmantle.rsi/equipped-OUTERCLOTHING.png create mode 100644 Resources/Textures/Floof/Clothing/Departmental/Epistemics/chaplainmantle.rsi/icon.png create mode 100644 Resources/Textures/Floof/Clothing/Departmental/Epistemics/chaplainmantle.rsi/meta.json create mode 100644 Resources/Textures/Floof/Clothing/Departmental/Epistemics/chaplainmantlehood.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/Floof/Clothing/Departmental/Epistemics/chaplainmantlehood.rsi/icon.png create mode 100644 Resources/Textures/Floof/Clothing/Departmental/Epistemics/chaplainmantlehood.rsi/meta.json create mode 100644 Resources/Textures/Floof/Clothing/Departmental/Epistemics/chaplainsocks.rsi/equipped-FEET.png create mode 100644 Resources/Textures/Floof/Clothing/Departmental/Epistemics/chaplainsocks.rsi/icon.png create mode 100644 Resources/Textures/Floof/Clothing/Departmental/Epistemics/chaplainsocks.rsi/meta.json create mode 100644 Resources/Textures/Floof/Clothing/Departmental/Epistemics/chaplainthong.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/Floof/Clothing/Departmental/Epistemics/chaplainthong.rsi/icon.png create mode 100644 Resources/Textures/Floof/Clothing/Departmental/Epistemics/chaplainthong.rsi/inhand-left.png create mode 100644 Resources/Textures/Floof/Clothing/Departmental/Epistemics/chaplainthong.rsi/inhand-right.png create mode 100644 Resources/Textures/Floof/Clothing/Departmental/Epistemics/chaplainthong.rsi/meta.json create mode 100644 Resources/Textures/Floof/Clothing/Departmental/Epistemics/chaplainwarmer.rsi/equipped-HAND.png create mode 100644 Resources/Textures/Floof/Clothing/Departmental/Epistemics/chaplainwarmer.rsi/icon.png create mode 100644 Resources/Textures/Floof/Clothing/Departmental/Epistemics/chaplainwarmer.rsi/meta.json create mode 100644 Resources/Textures/Floof/Clothing/Departmental/Epistemics/episocks.rsi/equipped-FEET.png create mode 100644 Resources/Textures/Floof/Clothing/Departmental/Epistemics/episocks.rsi/icon.png create mode 100644 Resources/Textures/Floof/Clothing/Departmental/Epistemics/episocks.rsi/meta.json create mode 100644 Resources/Textures/Floof/Clothing/Departmental/Epistemics/epithong.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/Floof/Clothing/Departmental/Epistemics/epithong.rsi/icon.png create mode 100644 Resources/Textures/Floof/Clothing/Departmental/Epistemics/epithong.rsi/inhand-left.png create mode 100644 Resources/Textures/Floof/Clothing/Departmental/Epistemics/epithong.rsi/inhand-right.png create mode 100644 Resources/Textures/Floof/Clothing/Departmental/Epistemics/epithong.rsi/meta.json create mode 100644 Resources/Textures/Floof/Clothing/Departmental/Epistemics/epiwarmer.rsi/equipped-HAND.png create mode 100644 Resources/Textures/Floof/Clothing/Departmental/Epistemics/epiwarmer.rsi/icon.png create mode 100644 Resources/Textures/Floof/Clothing/Departmental/Epistemics/epiwarmer.rsi/meta.json create mode 100644 Resources/Textures/Floof/Clothing/Departmental/Logistics/logisocks.rsi/equipped-FEET.png create mode 100644 Resources/Textures/Floof/Clothing/Departmental/Logistics/logisocks.rsi/icon.png create mode 100644 Resources/Textures/Floof/Clothing/Departmental/Logistics/logisocks.rsi/meta.json create mode 100644 Resources/Textures/Floof/Clothing/Departmental/Logistics/logithong.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/Floof/Clothing/Departmental/Logistics/logithong.rsi/icon.png create mode 100644 Resources/Textures/Floof/Clothing/Departmental/Logistics/logithong.rsi/inhand-left.png create mode 100644 Resources/Textures/Floof/Clothing/Departmental/Logistics/logithong.rsi/inhand-right.png create mode 100644 Resources/Textures/Floof/Clothing/Departmental/Logistics/logithong.rsi/meta.json create mode 100644 Resources/Textures/Floof/Clothing/Departmental/Logistics/logiwarmer.rsi/equipped-HAND.png create mode 100644 Resources/Textures/Floof/Clothing/Departmental/Logistics/logiwarmer.rsi/icon.png create mode 100644 Resources/Textures/Floof/Clothing/Departmental/Logistics/logiwarmer.rsi/meta.json create mode 100644 Resources/Textures/Floof/Clothing/Departmental/Medical/medicalsocks.rsi/equipped-FEET.png create mode 100644 Resources/Textures/Floof/Clothing/Departmental/Medical/medicalsocks.rsi/icon.png create mode 100644 Resources/Textures/Floof/Clothing/Departmental/Medical/medicalsocks.rsi/meta.json create mode 100644 Resources/Textures/Floof/Clothing/Departmental/Medical/medicalthong.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/Floof/Clothing/Departmental/Medical/medicalthong.rsi/icon.png create mode 100644 Resources/Textures/Floof/Clothing/Departmental/Medical/medicalthong.rsi/inhand-left.png create mode 100644 Resources/Textures/Floof/Clothing/Departmental/Medical/medicalthong.rsi/inhand-right.png create mode 100644 Resources/Textures/Floof/Clothing/Departmental/Medical/medicalthong.rsi/meta.json create mode 100644 Resources/Textures/Floof/Clothing/Departmental/Medical/medicalwarmer.rsi/equipped-HAND.png create mode 100644 Resources/Textures/Floof/Clothing/Departmental/Medical/medicalwarmer.rsi/icon.png create mode 100644 Resources/Textures/Floof/Clothing/Departmental/Medical/medicalwarmer.rsi/meta.json create mode 100644 Resources/Textures/Floof/Clothing/Departmental/Security/secsocks.rsi/equipped-FEET.png create mode 100644 Resources/Textures/Floof/Clothing/Departmental/Security/secsocks.rsi/icon.png create mode 100644 Resources/Textures/Floof/Clothing/Departmental/Security/secsocks.rsi/meta.json create mode 100644 Resources/Textures/Floof/Clothing/Departmental/Security/secthong.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/Floof/Clothing/Departmental/Security/secthong.rsi/icon.png create mode 100644 Resources/Textures/Floof/Clothing/Departmental/Security/secthong.rsi/inhand-left.png create mode 100644 Resources/Textures/Floof/Clothing/Departmental/Security/secthong.rsi/inhand-right.png create mode 100644 Resources/Textures/Floof/Clothing/Departmental/Security/secthong.rsi/meta.json create mode 100644 Resources/Textures/Floof/Clothing/Departmental/Security/secwarmer.rsi/equipped-HAND.png create mode 100644 Resources/Textures/Floof/Clothing/Departmental/Security/secwarmer.rsi/icon.png create mode 100644 Resources/Textures/Floof/Clothing/Departmental/Security/secwarmer.rsi/meta.json create mode 100644 Resources/Textures/Floof/Clothing/Departmental/Service/janitorsocks.rsi/equipped-FEET.png create mode 100644 Resources/Textures/Floof/Clothing/Departmental/Service/janitorsocks.rsi/icon.png create mode 100644 Resources/Textures/Floof/Clothing/Departmental/Service/janitorsocks.rsi/meta.json create mode 100644 Resources/Textures/Floof/Clothing/Departmental/Service/janitorthong.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/Floof/Clothing/Departmental/Service/janitorthong.rsi/icon.png create mode 100644 Resources/Textures/Floof/Clothing/Departmental/Service/janitorthong.rsi/inhand-left.png create mode 100644 Resources/Textures/Floof/Clothing/Departmental/Service/janitorthong.rsi/inhand-right.png create mode 100644 Resources/Textures/Floof/Clothing/Departmental/Service/janitorthong.rsi/meta.json create mode 100644 Resources/Textures/Floof/Clothing/Departmental/Service/janitorwarmer.rsi/equipped-HAND.png create mode 100644 Resources/Textures/Floof/Clothing/Departmental/Service/janitorwarmer.rsi/icon.png create mode 100644 Resources/Textures/Floof/Clothing/Departmental/Service/janitorwarmer.rsi/meta.json create mode 100644 Resources/Textures/Floof/Clothing/Departmental/Service/servicesocks.rsi/equipped-FEET.png create mode 100644 Resources/Textures/Floof/Clothing/Departmental/Service/servicesocks.rsi/icon.png create mode 100644 Resources/Textures/Floof/Clothing/Departmental/Service/servicesocks.rsi/meta.json create mode 100644 Resources/Textures/Floof/Clothing/Departmental/Service/servicethong.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/Floof/Clothing/Departmental/Service/servicethong.rsi/icon.png create mode 100644 Resources/Textures/Floof/Clothing/Departmental/Service/servicethong.rsi/inhand-left.png create mode 100644 Resources/Textures/Floof/Clothing/Departmental/Service/servicethong.rsi/inhand-right.png create mode 100644 Resources/Textures/Floof/Clothing/Departmental/Service/servicethong.rsi/meta.json create mode 100644 Resources/Textures/Floof/Clothing/Departmental/Service/servicewarmer.rsi/equipped-HAND.png create mode 100644 Resources/Textures/Floof/Clothing/Departmental/Service/servicewarmer.rsi/icon.png create mode 100644 Resources/Textures/Floof/Clothing/Departmental/Service/servicewarmer.rsi/meta.json create mode 100644 Resources/Textures/Floof/Clothing/Uniforms/loinclothblack.rsi/equipped-OUTERCLOTHING.png create mode 100644 Resources/Textures/Floof/Clothing/Uniforms/loinclothwhite.rsi/equipped-OUTERCLOTHING.png create mode 100644 Resources/Textures/Floof/Clothing/Uniforms/reotasuit.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/Floof/Clothing/Uniforms/reotasuit.rsi/icon.png create mode 100644 Resources/Textures/Floof/Clothing/Uniforms/reotasuit.rsi/inhand-left.png create mode 100644 Resources/Textures/Floof/Clothing/Uniforms/reotasuit.rsi/inhand-right.png create mode 100644 Resources/Textures/Floof/Clothing/Uniforms/reotasuit.rsi/meta.json diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml index 4db37d5f7a8..5b937516c6f 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml @@ -63,6 +63,9 @@ contents: - id: ClothingOuterArmorCaptainCarapace - id: ClothingLongcoatCap # Floofstation + - id: ClothingHandsCaptainWarmers # Floofstation + - id: ClothingUnderSocksCaptain # Floofstation + - id: ClothingUniformCaptainThong # Floofstation - id: NukeDisk - id: PinpointerNuclear # - id: CaptainIDCard # DeltaV - Replaced by the spare ID system @@ -122,6 +125,9 @@ contents: - id: HoPIDCard - id: ClothingLongcoatHoP # Floofstation + - id: ClothingHandsCommandWarmers # Floofstation + - id: ClothingUnderSocksCommand # Floofstation + - id: ClothingUniformCommandThong # Floofstation - id: ClothingHeadsetAltService # DeltaV - HoP is now a service role, replaces their all channels headset. - id: BoxPDA - id: BoxID diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cargodrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cargodrobe.yml index 82e53018c41..b611fa56026 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cargodrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cargodrobe.yml @@ -16,3 +16,6 @@ ClothingNeckScarfStripedBrown: 3 ClothingShoesBootsWinterCargo: 2 ClothingNeckCollarLogi: 1 # Floofstation - Collar addition + ClothingHandsLogisWarmers: 1 # Floofstation + ClothingUnderSocksLogis: 1 # Floofstation + ClothingUniformLogisThong: 1 # Floofstation diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chapel.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chapel.yml index 6f1b813a8f5..437f2011e76 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chapel.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chapel.yml @@ -16,6 +16,10 @@ ClothingHeadHatWitch1: 1 ClothingOuterPlagueSuit: 1 ClothingMaskPlague: 1 + ClothingHandsChaplainWarmers: 1 # Floofstation + ClothingUnderSocksChaplain: 1 # Floofstation + ClothingUniformChaplainThong: 1 # Floofstation + ClothingOuterEpiChaplainMantle: 1 # Floofstation #ClothingHeadsetService: 2 # Delta-V - Chaplain is no longer service dept BoxCandle: 2 BoxCandleSmall: 2 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/engidrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/engidrobe.yml index a6b77477d3e..310905f1863 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/engidrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/engidrobe.yml @@ -17,3 +17,6 @@ ClothingNeckScarfStripedOrange: 3 ClothingShoesBootsWinterEngi: 2 ClothingNeckCollarEngi: 1 # Floofstation - Collar addition + ClothingHandsEngiWarmers: 1 # Floofstation + ClothingUnderSocksEngi: 1 # Floofstation + ClothingUniformEngiThong: 1 # Floofstation diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/janidrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/janidrobe.yml index a1c15cf9b09..75de610b60e 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/janidrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/janidrobe.yml @@ -13,6 +13,9 @@ ClothingShoesBootsWinterJani: 2 #Delta V: Add departmental winter boots ClothingUniformJumpskirtJanimaid: 2 # Delta V: the maiden outfits no longer require emagging. ClothingUniformJumpskirtJanimaidmini: 1 + ClothingHandsJanitorWarmers: 1 # Floofstation + ClothingUnderSocksJanitor: 1 # Floofstation + ClothingUniformJanitorThong: 1 # Floofstation emaggedInventory: # Delta V: tactical maid outfit set is now the emagg reward. ClothingHandsTacticalMaidGloves: 1 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/medidrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/medidrobe.yml index d269645ad9a..a01102a7e76 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/medidrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/medidrobe.yml @@ -23,6 +23,9 @@ ClothingHeadHatSurgcapPurple: 4 ClothingShoesBootsWinterMed: 2 ClothingNeckCollarMed: 1 # Floofstation - Collar addition + ClothingHandsMedicWarmers: 1 # Floofstation + ClothingUnderSocksMedic: 1 # Floofstation + ClothingUniformMedicThong: 1 # Floofstation contrabandInventory: #DeltaV UniformScrubsColorCybersun: 1 #DeltaV ClothingHeadHatSurgcapCybersun: 1 #DeltaV diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/scidrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/scidrobe.yml index 426288ce044..d4caa01afc8 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/scidrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/scidrobe.yml @@ -15,5 +15,8 @@ ClothingOuterWinterSci: 2 ClothingNeckScarfStripedPurple: 3 ClothingNeckCollarEpi: 1 # Floofstation - Collar addition + ClothingHandsEpiWarmers: 1 # Floofstation + ClothingUnderSocksEpi: 1 # Floofstation + ClothingUniformEpiThong: 1 # Floofstation ClothingHeadTinfoil: 2 # Nyanotrasen - Tinfoil hats for Epistemics ClothingShoesBootsWinterSci: 2 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml index 685feb15736..88410e5f99f 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml @@ -24,6 +24,9 @@ ClothingNeckScarfStripedRed: 3 ClothingEyesBlindfold: 1 ClothingNeckCollarSec: 1 # Floofstation - Collar addition + ClothingHandsSecurityWarmers: 1 # Floofstation + ClothingUnderSocksSecurity: 1 # Floofstation + ClothingUniformSecurityThong: 1 # Floofstation ClothingShoesBootsCombat: 1 ClothingShoesBootsWinterSec: 2 ClothingShoesBootsCowboyBlack: 1 diff --git a/Resources/Prototypes/Floof/Entities/Clothing/Hands/miscgloves.yml b/Resources/Prototypes/Floof/Entities/Clothing/Hands/miscgloves.yml index 7f5c032d2c5..a4a74c3d754 100644 --- a/Resources/Prototypes/Floof/Entities/Clothing/Hands/miscgloves.yml +++ b/Resources/Prototypes/Floof/Entities/Clothing/Hands/miscgloves.yml @@ -133,17 +133,3 @@ fiberColor: fibers-blue - type: FingerprintMask -- type: entity - parent: ClothingHandsBase - id: ClothingHandsCaptainWarmers - name: captains arm-warmers - description: A pair of rather nice arm-warmers - components: - - type: Sprite - sprite: Floof/Clothing/Under/Gloves/captwarmer.rsi - - type: Clothing - sprite: Floof/Clothing/Under/Gloves/captwarmer.rsi - - type: Fiber - fiberMaterial: fibers-durathread - fiberColor: fibers-regal-blue - - type: FingerprintMask diff --git a/Resources/Prototypes/Floof/Entities/Clothing/Under/under.yml b/Resources/Prototypes/Floof/Entities/Clothing/Under/under.yml index 443ab81b15c..3c4ce322175 100644 --- a/Resources/Prototypes/Floof/Entities/Clothing/Under/under.yml +++ b/Resources/Prototypes/Floof/Entities/Clothing/Under/under.yml @@ -75,13 +75,3 @@ - type: Clothing sprite: Floof/Clothing/Under/Socks/sexcompblueboots.rsi -- type: entity - parent: ClothingShoesBase - id: ClothingUnderSocksCaptain - name: captains thigh-high socks - description: Just a plain pair of thigh-high socks. - components: - - type: Sprite - sprite: Floof/Clothing/Under/Socks/captsocks.rsi - - type: Clothing - sprite: Floof/Clothing/Under/Socks/captsocks.rsi diff --git a/Resources/Prototypes/Floof/Entities/Clothing/Uniforms/base_uniform.yml b/Resources/Prototypes/Floof/Entities/Clothing/Uniforms/base_uniform.yml new file mode 100644 index 00000000000..9b494e2a90c --- /dev/null +++ b/Resources/Prototypes/Floof/Entities/Clothing/Uniforms/base_uniform.yml @@ -0,0 +1,24 @@ +- type: entity + abstract: true + parent: ClothingUniformBase + id: ClothingUniformBaseSwitch + components: + - type: Clothing + slots: [innerclothing, outerClothing] + femaleMask: UniformTop + - type: Tag + tags: + - ClothMade # Delta-V - allows moths to eat this + +- type: entity + abstract: true + parent: ClothingUniformBase + id: ClothingUniformSkirtBaseSwitch + components: + - type: Clothing + slots: [innerclothing, outerClothing] + femaleMask: UniformTop + - type: Tag #DeltaV, needed for species with nonhuman legs/can only wear skirts + tags: + - Skirt + - ClothMade # Delta-V - allows moths to eat this diff --git a/Resources/Prototypes/Floof/Entities/Clothing/Uniforms/misc.yml b/Resources/Prototypes/Floof/Entities/Clothing/Uniforms/misc.yml index 65c11da772e..044db308312 100644 --- a/Resources/Prototypes/Floof/Entities/Clothing/Uniforms/misc.yml +++ b/Resources/Prototypes/Floof/Entities/Clothing/Uniforms/misc.yml @@ -1,5 +1,5 @@ - type: entity - parent: ClothingUniformSkirtBase + parent: ClothingUniformBase id: ClothingUniformLoinCloth name: loin cloth description: A piece of cloth wrapped around the waist. @@ -14,7 +14,7 @@ unequipDelay: 0 - type: entity - parent: ClothingUniformBase + parent: ClothingUniformBaseSwitch id: ClothingUniformLoinClothBlack name: black loin-cloth description: A piece of cloth wrapped around the waist. @@ -25,7 +25,7 @@ sprite: Floof/Clothing/Uniforms/loinclothblack.rsi - type: entity - parent: ClothingUniformBase + parent: ClothingUniformBaseSwitch id: ClothingUniformLoinClothWhite name: white loin-cloth description: A piece of cloth wrapped around the waist. @@ -134,14 +134,14 @@ - type: Clothing sprite: Floof/Clothing/Uniforms/sexcompblue.rsi - - type: entity parent: ClothingUniformBase - id: ClothingUniformCaptainThong - name: captains thong - description: Is this even considered a piece of clothing? + id: ClothingUniforReotaSuit + name: casual suit + description: A rather casual looking suit components: - type: Sprite - sprite: Floof/Clothing/Uniforms/captthong.rsi + sprite: Floof/Clothing/Uniforms/reotasuit.rsi - type: Clothing - sprite: Floof/Clothing/Uniforms/captthong.rsi + sprite: Floof/Clothing/Uniforms/reotasuit.rsi + diff --git a/Resources/Prototypes/Floof/Entities/Clothing/departmental_clothes.yml b/Resources/Prototypes/Floof/Entities/Clothing/departmental_clothes.yml new file mode 100644 index 00000000000..2b333d70220 --- /dev/null +++ b/Resources/Prototypes/Floof/Entities/Clothing/departmental_clothes.yml @@ -0,0 +1,443 @@ +#Command Outfits +# +#Captain + +- type: entity + parent: ClothingHandsBase + id: ClothingHandsCaptainWarmers + name: captain's arm-warmers + description: A pair of rather nice arm-warmers, styled for a captain. + components: + - type: Sprite + sprite: Floof/Clothing/Departmental/Command/captwarmer.rsi + - type: Clothing + sprite: Floof/Clothing/Departmental/Command/captwarmer.rsi + - type: Fiber + fiberMaterial: fibers-durathread + fiberColor: fibers-regal-blue + - type: FingerprintMask + +- type: entity + parent: ClothingShoesBase + id: ClothingUnderSocksCaptain + name: captain's thigh-high socks + description: A pair of thigh-high socks, styled for a captain. + components: + - type: Sprite + sprite: Floof/Clothing/Departmental/Command/captsocks.rsi + - type: Clothing + sprite: Floof/Clothing/Departmental/Command/captsocks.rsi + +- type: entity + parent: ClothingUniformBase + id: ClothingUniformCaptainThong + name: captain's thong + description: Styled for a captain, but is this even considered a piece of clothing? + components: + - type: Sprite + sprite: Floof/Clothing/Departmental/Command/captthong.rsi + - type: Clothing + sprite: Floof/Clothing/Departmental/Command/captthong.rsi + +#General Command + +- type: entity + parent: ClothingHandsBase + id: ClothingHandsCommandWarmers + name: command's arm-warmers + description: A pair of rather nice arm-warmers, styled for command roles. + components: + - type: Sprite + sprite: Floof/Clothing/Departmental/Command/commandwarmer.rsi + - type: Clothing + sprite: Floof/Clothing/Departmental/Command/commandwarmer.rsi + - type: Fiber + fiberMaterial: fibers-durathread + fiberColor: fibers-blue + - type: FingerprintMask + +- type: entity + parent: ClothingShoesBase + id: ClothingUnderSocksCommand + name: command's thigh-high socks + description: A pair of thigh-high socks, styled for command roles. + components: + - type: Sprite + sprite: Floof/Clothing/Departmental/Command/commandsocks.rsi + - type: Clothing + sprite: Floof/Clothing/Departmental/Command/commandsocks.rsi + +- type: entity + parent: ClothingUniformBase + id: ClothingUniformCommandThong + name: command's thong + description: Styled for a commanding officer, but is this even considered a piece of clothing? + components: + - type: Sprite + sprite: Floof/Clothing/Departmental/Command/commandthong.rsi + - type: Clothing + sprite: Floof/Clothing/Departmental/Command/commandthong.rsi + +#Engineering Outfits +# +#General Engineering +- type: entity + parent: ClothingHandsBase + id: ClothingHandsEngiWarmers + name: engineering arm-warmers + description: A pair of rather nice arm-warmers, styled for Engineering roles. + components: + - type: Sprite + sprite: Floof/Clothing/Departmental/Engineering/engiwarmer.rsi + - type: Clothing + sprite: Floof/Clothing/Departmental/Engineering/engiwarmer.rsi + - type: Fiber + fiberMaterial: fibers-synthetic + fiberColor: fibers-yellow-and-orange + - type: FingerprintMask + +- type: entity + parent: ClothingShoesBase + id: ClothingUnderSocksEngi + name: engineering thigh-high socks + description: A pair of thigh-high socks, styled for Engineering roles. + components: + - type: Sprite + sprite: Floof/Clothing/Departmental/Engineering/engisocks.rsi + - type: Clothing + sprite: Floof/Clothing/Departmental/Engineering/engisocks.rsi + +- type: entity + parent: ClothingUniformBase + id: ClothingUniformEngiThong + name: engineering thong + description: Styled for a engineering, but is this even considered a piece of clothing? + components: + - type: Sprite + sprite: Floof/Clothing/Departmental/Engineering/engithong.rsi + - type: Clothing + sprite: Floof/Clothing/Departmental/Engineering/engithong.rsi + + +#Epistemics Outfits +# +#General Epistemics +- type: entity + parent: ClothingHandsBase + id: ClothingHandsEpiWarmers + name: epistemics arm-warmers + description: A pair of rather nice arm-warmers, styled for Epistemic roles. + components: + - type: Sprite + sprite: Floof/Clothing/Departmental/Epistemics/epiwarmer.rsi + - type: Clothing + sprite: Floof/Clothing/Departmental/Epistemics/epiwarmer.rsi + - type: Fiber + fiberMaterial: fibers-synthetic + fiberColor: fibers-white-and-purple + - type: FingerprintMask + +- type: entity + parent: ClothingShoesBase + id: ClothingUnderSocksEpi + name: epistemics thigh-high socks + description: A pair of thigh-high socks, styled for Epistemic roles. + components: + - type: Sprite + sprite: Floof/Clothing/Departmental/Epistemics/episocks.rsi + - type: Clothing + sprite: Floof/Clothing/Departmental/Epistemics/episocks.rsi + +- type: entity + parent: ClothingUniformBase + id: ClothingUniformEpiThong + name: epistemics thong + description: Styled for a Epistemics, but is this even considered a piece of clothing? + components: + - type: Sprite + sprite: Floof/Clothing/Departmental/Epistemics/epithong.rsi + - type: Clothing + sprite: Floof/Clothing/Departmental/Epistemics/epithong.rsi + +#Chaplain +- type: entity + parent: ClothingHandsBase + id: ClothingHandsChaplainWarmers + name: chaplain arm-warmers + description: A pair of rather nice arm-warmers, oddly, styled for a Chaplain. + components: + - type: Sprite + sprite: Floof/Clothing/Departmental/Epistemics/chaplainwarmer.rsi + - type: Clothing + sprite: Floof/Clothing/Departmental/Epistemics/chaplainwarmer.rsi + - type: Fiber + fiberMaterial: fibers-synthetic + fiberColor: fibers-black + - type: FingerprintMask + +- type: entity + parent: ClothingShoesBase + id: ClothingUnderSocksChaplain + name: chaplain thigh-high socks + description: A pair of thigh-high socks, oddly, styled for a Chaplain. + components: + - type: Sprite + sprite: Floof/Clothing/Departmental/Epistemics/chaplainsocks.rsi + - type: Clothing + sprite: Floof/Clothing/Departmental/Epistemics/chaplainsocks.rsi + +- type: entity + parent: ClothingUniformBase + id: ClothingUniformChaplainThong + name: chaplain thong + description: Oddly, styled for a Chaplain, but is this even considered a piece of clothing? + components: + - type: Sprite + sprite: Floof/Clothing/Departmental/Epistemics/chaplainthong.rsi + - type: Clothing + sprite: Floof/Clothing/Departmental/Epistemics/chaplainthong.rsi + +- type: entity + parent: ClothingOuterWinterCoatToggleable + id: ClothingOuterEpiChaplainMantle + name: chaplain mantle + components: + - type: Sprite + sprite: Floof/Clothing/Departmental/Epistemics/chaplainmantle.rsi + - type: Clothing + sprite: Floof/Clothing/Departmental/Epistemics/chaplainmantle.rsi + - type: ToggleableClothing + clothingPrototype: ClothingHeadHatHoodEpiChaplainHood + +- type: entity + parent: ClothingHeadHatHoodWinterBase + id: ClothingHeadHatHoodEpiChaplainHood + noSpawn: true + name: chaplain mantle hood + components: + - type: Sprite + sprite: Floof/Clothing/Departmental/Epistemics/chaplainmantlehood.rsi + - type: Clothing + sprite: Floof/Clothing/Departmental/Epistemics/chaplainmantlehood.rsi + +#Logistics Outfits +# +#General Logistics +- type: entity + parent: ClothingHandsBase + id: ClothingHandsLogisWarmers + name: logistics arm-warmers + description: A pair of rather nice arm-warmers, styled for Logistic roles. + components: + - type: Sprite + sprite: Floof/Clothing/Departmental/Logistics/logiwarmer.rsi + - type: Clothing + sprite: Floof/Clothing/Departmental/Logistics/logiwarmer.rsi + - type: Fiber + fiberMaterial: fibers-synthetic + fiberColor: fibers-brown-and-yellow + - type: FingerprintMask + +- type: entity + parent: ClothingShoesBase + id: ClothingUnderSocksLogis + name: logistics thigh-high socks + description: A pair of thigh-high socks, styled for Logistic roles. + components: + - type: Sprite + sprite: Floof/Clothing/Departmental/Logistics/logisocks.rsi + - type: Clothing + sprite: Floof/Clothing/Departmental/Logistics/logisocks.rsi + +- type: entity + parent: ClothingUniformBase + id: ClothingUniformLogisThong + name: logistics thong + description: Styled for a Logistics, but is this even considered a piece of clothing? + components: + - type: Sprite + sprite: Floof/Clothing/Departmental/Logistics/logithong.rsi + - type: Clothing + sprite: Floof/Clothing/Departmental/Logistics/logithong.rsi + +#Medical Outfits +# +#General Medical +- type: entity + parent: ClothingHandsBase + id: ClothingHandsMedicWarmers + name: medical arm-warmers + description: A pair of rather nice arm-warmers, styled for Medic roles. + components: + - type: Sprite + sprite: Floof/Clothing/Departmental/Medical/medicalwarmer.rsi + - type: Clothing + sprite: Floof/Clothing/Departmental/Medical/medicalwarmer.rsi + - type: Fiber + fiberMaterial: fibers-synthetic + fiberColor: fibers-white-and-blue + - type: FingerprintMask + +- type: entity + parent: ClothingShoesBase + id: ClothingUnderSocksMedic + name: medical thigh-high socks + description: A pair of thigh-high socks, styled for Medic roles. + components: + - type: Sprite + sprite: Floof/Clothing/Departmental/Medical/medicalsocks.rsi + - type: Clothing + sprite: Floof/Clothing/Departmental/Medical/medicalsocks.rsi + +- type: entity + parent: ClothingUniformBase + id: ClothingUniformMedicThong + name: medical thong + description: Styled for a Medics, but is this even considered a piece of clothing? + components: + - type: Sprite + sprite: Floof/Clothing/Departmental/Medical/medicalthong.rsi + - type: Clothing + sprite: Floof/Clothing/Departmental/Medical/medicalthong.rsi + +#Security Outfits +# +#General Security +- type: entity + parent: ClothingHandsBase + id: ClothingHandsSecurityWarmers + name: security arm-warmers + description: A pair of rather nice arm-warmers, styled for Security roles. + components: + - type: Sprite + sprite: Floof/Clothing/Departmental/Security/secwarmer.rsi + - type: Clothing + sprite: Floof/Clothing/Departmental/Security/secwarmer.rsi + - type: Fiber + fiberMaterial: fibers-durathread + fiberColor: fibers-black-and-red + - type: FingerprintMask + - type: Armor + modifiers: + coefficients: + Blunt: 0.1 + Slash: 0.1 + Piercing: 0.1 + Heat: 0.3 + - type: GroupExamine + +- type: entity + parent: ClothingShoesBase + id: ClothingUnderSocksSecurity + name: security thigh-high socks + description: A pair of thigh-high socks, styled for Security roles. + components: + - type: Sprite + sprite: Floof/Clothing/Departmental/Security/secsocks.rsi + - type: Clothing + sprite: Floof/Clothing/Departmental/Security/secsocks.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.1 + Slash: 0.1 + Piercing: 0.1 + Heat: 0.3 + - type: GroupExamine + +- type: entity + parent: ClothingUniformBase + id: ClothingUniformSecurityThong + name: security thong + description: Styled for a Security, but is this even considered a piece of clothing? + components: + - type: Sprite + sprite: Floof/Clothing/Departmental/Security/secthong.rsi + - type: Clothing + sprite: Floof/Clothing/Departmental/Security/secthong.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.1 + Slash: 0.1 + Piercing: 0.1 + Heat: 0.3 + - type: GroupExamine + +#Service Outfits +# +#General Service +- type: entity + parent: ClothingHandsBase + id: ClothingHandsServiceWarmers + name: service arm-warmers + description: A pair of rather nice arm-warmers, styled for Service workers. + components: + - type: Sprite + sprite: Floof/Clothing/Departmental/Service/servicewarmer.rsi + - type: Clothing + sprite: Floof/Clothing/Departmental/Service/servicewarmer.rsi + - type: Fiber + fiberMaterial: fibers-synthetic + fiberColor: fibers-grey-and-green + - type: FingerprintMask + +- type: entity + parent: ClothingShoesBase + id: ClothingUnderSocksService + name: service thigh-high socks + description: A pair of thigh-high socks, styled for Service workers. + components: + - type: Sprite + sprite: Floof/Clothing/Departmental/Service/servicesocks.rsi + - type: Clothing + sprite: Floof/Clothing/Departmental/Service/servicesocks.rsi + +- type: entity + parent: ClothingUniformBase + id: ClothingUniformServiceThong + name: service thong + description: Styled for a Service workers, but is this even considered a piece of clothing? + components: + - type: Sprite + sprite: Floof/Clothing/Departmental/Service/servicethong.rsi + - type: Clothing + sprite: Floof/Clothing/Departmental/Service/servicethong.rsi + +#Janitorial +- type: entity + parent: ClothingHandsBase + id: ClothingHandsJanitorWarmers + name: rubber arm-warmers + description: A pair of rather nice arm-warmers, styled for Janitorial. + components: + - type: Sprite + sprite: Floof/Clothing/Departmental/Service/janitorwarmer.rsi + - type: Clothing + sprite: Floof/Clothing/Departmental/Service/janitorwarmer.rsi + - type: Fiber + fiberMaterial: fibers-rubber + fiberColor: fibers-yellow + - type: FingerprintMask + +- type: entity + parent: ClothingShoesBase + id: ClothingUnderSocksJanitor + name: rubber thigh-high socks + description: A pair of thigh-high socks, styled for Janitorial. + components: + - type: Sprite + sprite: Floof/Clothing/Departmental/Service/janitorsocks.rsi + - type: Clothing + sprite: Floof/Clothing/Departmental/Service/janitorsocks.rsi + +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJanitorThong + name: rubber thong + description: Styled for a Janitorial, but is this even considered a piece of clothing? + components: + - type: Sprite + sprite: Floof/Clothing/Departmental/Service/janitorthong.rsi + - type: Clothing + sprite: Floof/Clothing/Departmental/Service/janitorthong.rsi diff --git a/Resources/Prototypes/Floof/Loadouts/departmentalloadouts.yml b/Resources/Prototypes/Floof/Loadouts/departmentalloadouts.yml new file mode 100644 index 00000000000..198da9ad7a5 --- /dev/null +++ b/Resources/Prototypes/Floof/Loadouts/departmentalloadouts.yml @@ -0,0 +1,469 @@ +#Command Outfits +# +#Captain +- type: loadout + id: LoadoutClothingHandsCaptainWarmers + category: Jobs + cost: 2 + exclusive: true + items: + - ClothingHandsCaptainWarmers + requirements: + - !type:CharacterJobRequirement + jobs: + - Captain + +- type: loadout + id: LoadoutClothingUnderSocksCaptain + category: Jobs + cost: 2 + exclusive: true + items: + - ClothingUnderSocksCaptain + requirements: + - !type:CharacterJobRequirement + jobs: + - Captain + +- type: loadout + id: LoadoutClothingUniformCaptainThong + category: Jobs + cost: 2 + exclusive: true + items: + - ClothingUniformCaptainThong + requirements: + - !type:CharacterJobRequirement + jobs: + - Captain + +#General Command + +- type: loadout + id: LoadoutClothingHandsCommandWarmers + category: Jobs + cost: 2 + exclusive: true + items: + - ClothingHandsCommandWarmers + requirements: + - !type:CharacterJobRequirement + jobs: + - Captain + - ChiefEngineer + - ChiefMedicalOfficer + - HeadOfPersonnel + - HeadOfSecurity + - Quartermaster + - ResearchDirector + +- type: loadout + id: LoadoutClothingUnderSocksCommand + category: Jobs + cost: 2 + exclusive: true + items: + - ClothingUnderSocksCommand + requirements: + - !type:CharacterJobRequirement + jobs: + - Captain + - ChiefEngineer + - ChiefMedicalOfficer + - HeadOfPersonnel + - HeadOfSecurity + - Quartermaster + - ResearchDirector + +- type: loadout + id: LoadoutClothingUniformCommandThong + category: Jobs + cost: 2 + exclusive: true + items: + - ClothingUniformCommandThong + requirements: + - !type:CharacterJobRequirement + jobs: + - Captain + - ChiefEngineer + - ChiefMedicalOfficer + - HeadOfPersonnel + - HeadOfSecurity + - Quartermaster + - ResearchDirector + +#Engineering Outfits +# +#General Engineering + +- type: loadout + id: LoadoutClothingHandsEngiWarmers + category: Jobs + cost: 2 + exclusive: true + items: + - ClothingHandsEngiWarmers + requirements: + - !type:CharacterJobRequirement + jobs: + - StationEngineer + - AtmosphericTechnician + - ChiefEngineer + +- type: loadout + id: LoadoutClothingUnderSocksEngi + category: Jobs + cost: 2 + exclusive: true + items: + - ClothingUnderSocksEngi + requirements: + - !type:CharacterJobRequirement + jobs: + - StationEngineer + - AtmosphericTechnician + - ChiefEngineer + +- type: loadout + id: LoadoutClothingUniformEngiThong + category: Jobs + cost: 2 + exclusive: true + items: + - ClothingUniformEngiThong + requirements: + - !type:CharacterJobRequirement + jobs: + - StationEngineer + - AtmosphericTechnician + - ChiefEngineer + +#Epistemics Outfits +# +#General Epistemics + +- type: loadout + id: LoadoutClothingHandsEpiWarmers + category: Jobs + cost: 2 + exclusive: true + items: + - ClothingHandsEpiWarmers + requirements: + - !type:CharacterJobRequirement + jobs: + - Scientist + - ResearchAssistant + - ResearchDirector + +- type: loadout + id: LoadoutClothingUnderSocksEpi + category: Jobs + cost: 2 + exclusive: true + items: + - ClothingUnderSocksEpi + requirements: + - !type:CharacterJobRequirement + jobs: + - Scientist + - ResearchAssistant + - ResearchDirector + + +- type: loadout + id: LoadoutClothingUniformEpiThong + category: Jobs + cost: 2 + exclusive: true + items: + - ClothingUniformEpiThong + requirements: + - !type:CharacterJobRequirement + jobs: + - Scientist + - ResearchAssistant + - ResearchDirector + +#Chaplain + +- type: loadout + id: LoadoutClothingHandChaplainWarmers + category: Jobs + cost: 2 + exclusive: true + items: + - ClothingHandsChaplainWarmers + requirements: + - !type:CharacterJobRequirement + jobs: + - Chaplain + +- type: loadout + id: LoadoutClothingUnderSocksChaplain + category: Jobs + cost: 2 + exclusive: true + items: + - ClothingUnderSocksChaplain + requirements: + - !type:CharacterJobRequirement + jobs: + - Chaplain + +- type: loadout + id: LoadoutClothingUniformChaplainThong + category: Jobs + cost: 2 + exclusive: true + items: + - ClothingUniformChaplainThong + requirements: + - !type:CharacterJobRequirement + jobs: + - Chaplain + +- type: loadout + id: LoadoutClothingChaplainEpiMantle + category: Jobs + cost: 2 + exclusive: true + items: + - ClothingOuterEpiChaplainMantle + requirements: + - !type:CharacterJobRequirement + jobs: + - Chaplain + +#Logistics Outfits +# +#General Logistics +- type: loadout + id: LoadoutClothingHandsLogisWarmers + category: Jobs + cost: 2 + exclusive: true + items: + - ClothingHandsLogisWarmers + requirements: + - !type:CharacterJobRequirement + jobs: + - CargoTechnician + +- type: loadout + id: LoadoutClothingUnderSocksLogis + category: Jobs + cost: 2 + exclusive: true + items: + - ClothingUnderSocksLogis + requirements: + - !type:CharacterJobRequirement + jobs: + - CargoTechnician + +- type: loadout + id: LoadoutClothingUniformLogisThong + category: Jobs + cost: 2 + exclusive: true + items: + - ClothingUniformLogisThong + requirements: + - !type:CharacterJobRequirement + jobs: + - CargoTechnician + +#Medical Outfits +# +#General Medical +- type: loadout + id: LoadoutClothingHandsMedicWarmers + category: Jobs + cost: 2 + exclusive: true + items: + - ClothingHandsMedicWarmers + requirements: + - !type:CharacterJobRequirement + jobs: + - MedicalDoctor + - Paramedic + - ChiefMedicalOfficer + - MedicalIntern + - Chemist + +- type: loadout + id: LoadoutClothingUnderSocksMedic + category: Jobs + cost: 2 + exclusive: true + items: + - ClothingUnderSocksMedic + requirements: + - !type:CharacterJobRequirement + jobs: + - MedicalDoctor + - Paramedic + - ChiefMedicalOfficer + - MedicalIntern + - Chemist + +- type: loadout + id: LoadoutClothingUniformMedicThong + category: Jobs + cost: 2 + exclusive: true + items: + - ClothingUniformMedicThong + requirements: + - !type:CharacterJobRequirement + jobs: + - MedicalDoctor + - Paramedic + - ChiefMedicalOfficer + - MedicalIntern + - Chemist + +#Security Outfits +# +#General Security +- type: loadout + id: LoadoutClothingHandsSecurityWarmers + category: Jobs + cost: 2 + exclusive: true + items: + - ClothingHandsSecurityWarmers + requirements: + - !type:CharacterJobRequirement + jobs: + - SecurityOfficer + - SecurityCadet + - Warden + - Detective + - HeadOfSecurity + +- type: loadout + id: LoadoutClothingUnderSocksSecurity + category: Jobs + cost: 2 + exclusive: true + items: + - ClothingUnderSocksSecurity + requirements: + - !type:CharacterJobRequirement + jobs: + - SecurityOfficer + - SecurityCadet + - Warden + - Detective + - HeadOfSecurity + +- type: loadout + id: LoadoutClothingUniformSecurityThong + category: Jobs + cost: 2 + exclusive: true + items: + - ClothingUniformSecurityThong + requirements: + - !type:CharacterJobRequirement + jobs: + - SecurityOfficer + - SecurityCadet + - Warden + - Detective + - HeadOfSecurity + +#Service Outfits +# +#General Service +- type: loadout + id: LoadoutClothingHandsServiceWarmers + category: Jobs + cost: 2 + exclusive: true + items: + - ClothingHandsServiceWarmers + requirements: + - !type:CharacterJobRequirement + jobs: + - Bartender + - Botanist + - Reporter + - Musician + - Chef + - ServiceWorker + +- type: loadout + id: LoadoutClothingUnderSocksService + category: Jobs + cost: 2 + exclusive: true + items: + - ClothingUnderSocksService + requirements: + - !type:CharacterJobRequirement + jobs: + - Bartender + - Botanist + - Reporter + - Musician + - Chef + - ServiceWorker + +- type: loadout + id: LoadoutClothingUniformServiceThong + category: Jobs + cost: 2 + exclusive: true + items: + - ClothingUniformServiceThong + requirements: + - !type:CharacterJobRequirement + jobs: + - Bartender + - Botanist + - Reporter + - Musician + - Chef + - ServiceWorker + +#Janitorial +- type: loadout + id: LoadoutClothingHandsJanitorWarmers + category: Jobs + cost: 2 + exclusive: true + items: + - ClothingHandsJanitorWarmers + requirements: + - !type:CharacterJobRequirement + jobs: + - Janitor + +- type: loadout + id: LoadoutClothingUnderSocksJanitor + category: Jobs + cost: 2 + exclusive: true + items: + - ClothingUnderSocksJanitor + requirements: + - !type:CharacterJobRequirement + jobs: + - Janitor + +- type: loadout + id: LoadoutClothingUniformJanitorThong + category: Jobs + cost: 2 + exclusive: true + items: + - ClothingUniformJanitorThong + requirements: + - !type:CharacterJobRequirement + jobs: + - Janitor diff --git a/Resources/Textures/Floof/Clothing/Departmental/Command/captsocks.rsi/equipped-FEET.png b/Resources/Textures/Floof/Clothing/Departmental/Command/captsocks.rsi/equipped-FEET.png new file mode 100644 index 0000000000000000000000000000000000000000..b5a37513713b3599ffb7c10af17fa5947b91ffec GIT binary patch literal 656 zcmV;B0&o3^P)Px%N=ZaPRCt{2n!Rq~Koo^Phzq1~M{gHsn^6)ekto>**gEAFd5$2ZNI?-PZ;@x< z0Z5s`C_}Pw?JmYPm&q0y`xR;*Lgh5JsiekiE}{^1VIo4K@bE%5ClOG z1VIqK3^kicS(X71wA$J0@t4VC?a)|h>UMCcU#r>4sJn{LTBEi8aI7lIuJ3HXXCrW# zJnYsvK3g$L#`K#@0D7GzKfeFs`0N{_q*_0#sPB9RztA{_b1hBdiPvTJ7w9cFyFk0YI9jTle$p$z6l{ z*}1a_oBCR7lu`gZ-K-dP*V2dGI!`w%0F+W_t)1#y?*L;Aqht)gbUNL-mtT*PF~%6% zC7pP^ZgBBTf3N_cKUff4JRh8AgVQ1SKOu*pC1QYY0lpCfd<*c67~orgZ^QuK0(>I| z_!i(BF~GL~--rRe1^7k`@GZbMVt{V}z7Yd_3-HaCH^3Rj`82)u{f;<96KD3?5FX#`JW$Uuku-`A>N}*^h4=d9&Wj32J zpU=IV0bv-@Y&KC!<(XhDe?%*f#?mz1q_sX#O6{f9E)+Ik@5?7Y|6PK*Q!Ce!|N1Tz zGN9L4ZZi2OiWqk5oL(Q5-WPC)pw-S!ua6jZ>qJomtosFeonmJ|Ap@=+8k=4LSZDNA q^#vTl7_;dQfOTKO)kCAuTE795P4WYUiYA=^0000Px#-bqA3R9J=WlRXN;KoEt$NQ(3xV2fb0XrW-K2k;c$!`>p`Ej)vlu!u!igpeW! zNExtD)+| zwAN^?Uuv$j4)AUKHs;-;Lw|T8iBmS+0|3j(f!TCVf7m05+n=ZP4pdidjJfW>y#_zr zfp6m+Aes-XQmWCTlp>lBY@_L&0Dd^O>taN<3IHg}vevKaY!$FBMi1Zh;{b4Z-y}`} q$n(6`tLh|9F~+!#6a+yK05}7L3r#(>US;h70000l<%bzexyjG)>T(n*QUU(vO^w zZ70_6NtrA-lmAlAv@?I4w?zpm!N8}T`|qq+)%E_@+kaEEeY)l6|1Yh-#&~FpK<=uC zLcU9Hg>07j_hCZwPv5U|^F<@}tyv|My42?Wnv&ho-ZIA@&6)i7=;}H5_OaK7&*qN! z`N{mce`AM-z>K~W`3DO+o>l7Q-uAkGb=wu?4^N}nBYJf&l$So3(=7Ava^NTT{fzZj zlkyMLA7s41dclHW7lRbLgSf+Eh8Ij3G7PZ{z03=^7Zfs-Fq-f+=rtU}R5Y2rW78)I z+XOZKg7SZCKlkgL@~Yfn6=`<+%lyB0rmGi!1NuUOr>@c_I)^1bY=+n~)-(2vDxPfi q_upN+=HC14^ruo~U??nNl=oU7p)RvP@eDA$89ZJ6T-G@yGywpN)Uap( literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/Departmental/Command/captthong.rsi/icon.png b/Resources/Textures/Floof/Clothing/Departmental/Command/captthong.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..d5ec7f1ccc57753d891f517ddd3c71914df99920 GIT binary patch literal 215 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}6FprVLn2y} z6C_v{Cy4Yk1sZU<9n_Fub>=KN_WIBN|Nrfo_3lWn|2%&gUqYBs;*WYgsol!wT>t;C z*PE4MEa@2tR8!9;mKxl~ebwjx-{~ie3W|%3YySS4nwWehnXUO+eNX+nd1(nLDknWI zF>LCeIo0Ri>t9FyriU3hath93`jQY{#B;2p4`Q!^C<8-DPr;MUXk8DW;}|?${an^L HB{Ts5WPwth literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/Departmental/Command/captthong.rsi/inhand-left.png b/Resources/Textures/Floof/Clothing/Departmental/Command/captthong.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..bdbf35325f54089b6c158805e5ddc9220e737c5a GIT binary patch literal 371 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5`$3q|f;CtLC@5Xx z8c`CQpH@ItG2m%^ zIK5ioo9cIa-VWJ9et+|`Cd~^xf5f^^{1jOfW0Rg%Rcr~=g9ZFpt8+T%e!2Lm#h+}p z=ia`P%n+{EBeX!rd-9Uh$R-Dku0txBvEk*?3)a1U- literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/Departmental/Command/captthong.rsi/inhand-right.png b/Resources/Textures/Floof/Clothing/Departmental/Command/captthong.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..ba71aea082070d3c2d882a1ba2b79289f5daff35 GIT binary patch literal 399 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5`$3q|f;CtLC@5Xx z8c`CQpH@F!Z*QIKZ8Z>J zxvOK!WH|6YTjvzxlqi4Q)%>o;hiA*PDljl|I502?G%&CrGaH_- z*WkMSeeT9jpKP{&wwcM(@crJl+-h})$Z2d0uXnjg-mpw(D3EcNVo+rHeKuxVtKl|I zhNQeJ?u@T?{o|gq?B&M`p`ntVXFkt4Cx5}Dm+^o_-yi?Tc;<}T*V+;j*61*FO#Lp} zu`m855ond&eOK+c8gUUNIk4fwW=OjJvyj4-=G`P)Px$^GQTORCt{2+CNJpK^O+`$E=kbuvo;(1Qr4^7&#$W9@>gvAy_EdSojevto;mD zR$e8D-L-<{A*WnqKmrk_6G>q)c5y9a;}X~1c{MTdcz#tN^Zv=OGb!E$h=_=Yh=_>Z z@WNVDUEYekuom@W{h;d?@{%c~T=Kl3l)`5>p}W2p*1ohp>WA}D^mikwAI^&seKc+m z^+&V5{IUN8r91%B0RA{PuzorXoB~=uImZmDe&!Jyq*B$zK7$S__xEzzb_oO2Jy|k~Y`Muc=Ob-}jwjeBbZXkK?ms9)X?G4VHe6q29Q| z=J7;svUc+V8o<%oJ*t&S{62rgu2b8+sSf~J>z>sI@bXBH&n}2Aq4C*;p8gFEvOW&ph}jXSLWbB`50!r|g-6i;cbwP>E548;*h z_NBEJ9Ra8Dc$!wLl{&MR4l*UuawmVhF-CkZi8i2lb}|yr-h&`Wo!Q5CL_ehEPQDKi z1c5lG=neq#XZFSzaTBi6a`*gw02jkHe;>Afh=_=Y=sS1@s&3|F=K4^`00000NkvXX Hu0mjf=vxQk literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/Departmental/Command/captwarmer.rsi/icon.png b/Resources/Textures/Floof/Clothing/Departmental/Command/captwarmer.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..63b61d20c4cb59fd524eae464c84f5460353302e GIT binary patch literal 297 zcmV+^0oMMBP)Px#<4Ht8R9J=W)3FM|Fc1ddU*qJ`N!%<1q;k;W5FEu>oE;QheFUGt$LQqd;^qT5 zintUCBDjll+%!&#AZ=2??Y=3H%W=tF0LB<&j9Cb&OgNYtA(i<@eA$+ah+Oh~AtJaI zktvBg#vH~bi93Z76**VQ+iWi$AQAvt0Cvs=jMgn+4W#MA8k^e!-}m2ZA(aV&zF!Z*LiT9}W;< zeNg=J*#m`=^Km8F)0(=PypQ;nf7IugyDDQ@Q@!JzQsLbkU0kuZd|%Gn`{2O?wd*G@ z*ab^XzH|NHWkX+!_I~NO2eyHsf1b}5XkcJbU|{5MU|_<+GI+WQ>|oeO0|F#RO8RoMqzcDcrXDYC-I&`U&xoE}$QIo%nN0h3{uK21y__M6LZ&i3hgp2>T z+b>z>#BJj)eW2~o(8W-*j^!oS1`mdE|9w84i+*J0b!zH-l{F~MIQSr@q5n<(t$!i& U|M2GN17ncE)78&qol`;+0J@~jAOHXW literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/Departmental/Command/commandsocks.rsi/icon.png b/Resources/Textures/Floof/Clothing/Departmental/Command/commandsocks.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..64ce4fda9aedda946b28e72bfa1c8a52312a4ff1 GIT binary patch literal 302 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oArNM~bhqvgP*A$W zHKHUqKdq!Zu_%?nIW?!avREOwq%10+*^AZ|v+{u;6Le@{L#=aj+ zGUnNDR&h;!%itXCafNfwp=ql&2?dIOov)oCt8h%KN^+9lck>5z%%`#i4si$Y7dFR4 vyinQ0$PggEwVHj_y^1bQg$4$unpd1spPwA8){A@%^aO*atDnm{r-UW|b{lb& literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/Departmental/Command/commandsocks.rsi/meta.json b/Resources/Textures/Floof/Clothing/Departmental/Command/commandsocks.rsi/meta.json new file mode 100644 index 00000000000..bbd45032fef --- /dev/null +++ b/Resources/Textures/Floof/Clothing/Departmental/Command/commandsocks.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprited by Dakota Haven", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-FEET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Floof/Clothing/Departmental/Command/commandthong.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Floof/Clothing/Departmental/Command/commandthong.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..42e9f6a57e57d7eda2ea4696ac1feae3928a50d2 GIT binary patch literal 420 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5`$3q|f;CtLC@5Xx z8c`CQpH@F!Z*T4QJ?tQI z{Nwj0N=c0U4n_>Sn3T0+xxR;`HAt>7Vm{OGBKCq}OK=2_gHe-shsGj#?jssM&If+j zd+plabMkj>#oxzF`uqGL&|)m$!{O5lC(Jta+fIJZ4bD&Xdzp7RE&KOl<)>=d#$8;y zDz(BO@IIT)TTurGj5xSY^vOlQkHmpee=zA8~6R#o89ny>8tbMr^UQ4-`?zQ zzq@kflTWAme)l{6Z0>q+EcW}P|B;N+4{v-F$6_~%P=m30#}%>pTGdlz1Hv5*Z$C~> z>nn3in!RjS-fazz*vP`Xjweg~zCM<}TPnRW^xo8~Tg|!@;3gdC{K#85)nY=T408ZT N(9_k=Wt~$(698GJo_GKN literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/Departmental/Command/commandthong.rsi/icon.png b/Resources/Textures/Floof/Clothing/Departmental/Command/commandthong.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..10a9c4378b658f712f211d842dc555e89993e06c GIT binary patch literal 247 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oArNM~bhqvgP*A$W zHKHUqKdq!Zu_%?nIW?!avREOwq%5mtNZp@f44_IJX=um zJcKR#drq6OV6^0#z5a%mOnD7%wf?oQdd$$gwT=1kf9KT_>?(q0#zz0v|NTF|&_ucq g$#^$e2Tlftd%i6P=T4JZ19T08r>mdKI;Vst0M4jcp8x;= literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/Departmental/Command/commandthong.rsi/inhand-left.png b/Resources/Textures/Floof/Clothing/Departmental/Command/commandthong.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..1a8221a109600ed0be709adb10278ce3d5adebc0 GIT binary patch literal 272 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5`$3q|f;CtLC@5Xx z8c`CQpH@s5*P*xm^8O<_*FLF~-VDtGL3S z*RlnKN*%~#xVp5THN%>@%s;nV07EB2pkW!q>iTvNzrg0eDP1OpY9MnhW1Q^<@d+D^ R#m<6cJYD@<);T3K0RZ`4N0$Hq literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/Departmental/Command/commandthong.rsi/meta.json b/Resources/Textures/Floof/Clothing/Departmental/Command/commandthong.rsi/meta.json new file mode 100644 index 00000000000..ef52845d5fa --- /dev/null +++ b/Resources/Textures/Floof/Clothing/Departmental/Command/commandthong.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprited by Dakota Haven", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Floof/Clothing/Departmental/Command/commandwarmer.rsi/equipped-HAND.png b/Resources/Textures/Floof/Clothing/Departmental/Command/commandwarmer.rsi/equipped-HAND.png new file mode 100644 index 0000000000000000000000000000000000000000..3f2c96c79bd6e4df2fb647dd9bef058389e4a9da GIT binary patch literal 538 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5`$3q|f;CtLC@5Xx z8c`CQpH@ z|M1^+;abHDKWiIr)i^gb_I3qtaj$D$5~Xx#>5+Yo7v+2x<$7|Oy-16HaF&ZV*Rg8W zy#U)+vU{&9{V%tBKd-ocPWAoPY!{Yp8y-du2L>jA1_l-d1_)C@>wvyTQZDo3gUm~= z8`=A<=-F;N-|C-rLxB;)D<+fsJ5Je4-buc++ccQ5BzoVL?%JGXK_{kaRqVdezjs2) zPPMsivgL~fKb_^-)H+WpG45w_sl)QXpWc?Ln00*|M~yl{;&hn zu|W17tAs0zi}@r<53FEj+siC*cF%v~*Efy->@At_@c+uSJuJK`p|*DH2Y8Yb5)^JS z9(i@}Wy9j=v;W?IwmkblN9$C=^YB9-()}crHy%7S>C)H#7naGj?Oh*lY>{i2y5XDM zQI9|lnOj#5CwzS+dXdjUP3_zLbL(3+2{`ckEoz<;6=?86#^Jk5$D9QnTV?JF9#Oe- eaZ&-?Jq*WxoIh9*!~G8Eat2RVKbLh*2~7Y7tatbT literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/Departmental/Command/commandwarmer.rsi/meta.json b/Resources/Textures/Floof/Clothing/Departmental/Command/commandwarmer.rsi/meta.json new file mode 100644 index 00000000000..f6904e7bf3e --- /dev/null +++ b/Resources/Textures/Floof/Clothing/Departmental/Command/commandwarmer.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprited by Dakota Haven", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HAND", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Floof/Clothing/Departmental/Engineering/engisocks.rsi/equipped-FEET.png b/Resources/Textures/Floof/Clothing/Departmental/Engineering/engisocks.rsi/equipped-FEET.png new file mode 100644 index 0000000000000000000000000000000000000000..2b757899a3b304378e2ac67a3491fc252d2eacc6 GIT binary patch literal 531 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5`$3q|f;CtLC@5Xx z8c`CQpH@uG4#-Kfj^jlcaV zDO_(drKvhQrnNNif4;1M)ata@Nh1BqSFNrciA~N<@2-||33|bI!1eDNhJ_pX{V#o8 zx+LvydV}MVFFUze+`qnLuxj8t!6s1N`}NemRdK1w4JY6DZvMV9Ywjb#n5*YmHZ0l` zmSKD2dx7h|J*$7sWK_}Q6zo^_^kUAb3R7uV{p$@2BQDo6FeLo;+IMt%+oe4l=UkOH zswmP^IH~Y-w(Ao%54K5@weR1w$O&g#|7P_si&)8Na(oXWUz(WhyAa6Gb;5!D0%M7T zAw%W=*3bL)sK|;Q(Ek1Fg}>;Q>BYYnooCHC`af!M+>*&*|Mc!u%L{CI{j#yux#Zxf j_3uMXUb$AkWwv9il1P~UxoF)EkmEdE{an^LB{Ts5dYjZ) literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/Departmental/Engineering/engisocks.rsi/icon.png b/Resources/Textures/Floof/Clothing/Departmental/Engineering/engisocks.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..a4c217ca26c8ff475cf1cbd19ef663d2389725ac GIT binary patch literal 317 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oArNM~bhqvgP*A$W zHKHUqKdq!Zu_%?nIW?!avREOwq%w`X5b)rpiZqydgWp*b4efOy3F!Z*Lj$H5o{> zJ^a^RkSw~VarQ@+c?S+^TkP6sS;flk_kgo!w)ur!n<_izAJkC0)#B8xw&(s0p?zOG zgW0rJWwpsL0&TYD=+@^tlcS?83{1OR^^i9P@T literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/Departmental/Engineering/engithong.rsi/icon.png b/Resources/Textures/Floof/Clothing/Departmental/Engineering/engithong.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..a9aef799a583433440b63929330496be03911c3d GIT binary patch literal 260 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oArNM~bhqvgP*A$W zHKHUqKdq!Zu_%?nIW?!avREOwq%qLj=In6m3`)^@x3rl{}W#!l=x$&W=yV|kleub&e1a=C9R~75vUp+9B`J2K33Of6zcng`+>28%M`~M zC%(%*sN-=cZ^*JukaW1Jc0=lb0t>o6Bz}UT!_lRhAOW4ftaSzE3mhe`c&M4Ran}hMK;6*KecA#o>ppf{iqwMbA?Uf8=OlLl_rHP(9 z_nSvywMoNehE3k`+yQ0mIrnbyDWYpb=7%zh-RENjiae-kXx-1ja0keq!dAgB=>g+} Sv$oN>Ahn*ZelF{r5}E)$bV#lM literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/Departmental/Engineering/engithong.rsi/meta.json b/Resources/Textures/Floof/Clothing/Departmental/Engineering/engithong.rsi/meta.json new file mode 100644 index 00000000000..ef52845d5fa --- /dev/null +++ b/Resources/Textures/Floof/Clothing/Departmental/Engineering/engithong.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprited by Dakota Haven", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Floof/Clothing/Departmental/Engineering/engiwarmer.rsi/equipped-HAND.png b/Resources/Textures/Floof/Clothing/Departmental/Engineering/engiwarmer.rsi/equipped-HAND.png new file mode 100644 index 0000000000000000000000000000000000000000..e9a4b5a088d3e9b6d153bd694125d4aa931cecb2 GIT binary patch literal 502 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5`$3q|f;CtLC@5Xx z8c`CQpH@F!Z*ML1V|Elc z_Ay_Whl!Dw(>Fjg*OcEuAcBSMsPzY~?_7HhYv$-KTB+)IxHDKqRWYE^fv?R>)$+x= z(p$pc<@av4{=R$XUf*X;GgqD!1lo=QR&*%wU$d86QBfK8|JI>ZoWaMd&ri4d7vJzR zWzr;JkDbd-e*MpOqRCfo>1E-Sb3FIn{voZI-}Lp{(w|>XWhvxj{$0T}qi)~I>W^}B z50qTl`0n1qY}OZVH0$Plyl_W5;rky2u0*R>H?IF}zoY%2NT4;~$-y!?mFrv)E@y&& zT>O5IIqCZM+ssk>IrVHWUXhMenfU3R*%mu?MHDxpaTXYL+5C}ubMgQ8j?zzFY#*|! zE19pH)s{A4#?}WC^mO%eS?83{ F1OPdN#xei^ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/Departmental/Engineering/engiwarmer.rsi/icon.png b/Resources/Textures/Floof/Clothing/Departmental/Engineering/engiwarmer.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..540fd9225283ed49eff5e2c7877b1bc6e85d40fe GIT binary patch literal 302 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oArNM~bhqvgP*A$W zHKHUqKdq!Zu_%?nIW?!avREOwq%UwPc&sz3vCyL5~5!v?lH4yT+F4hSnw q>hIVpb6C)&<{Ajv*Dd-rh3wVs;c^ zdr%)~xIkb7H;3Mm6P#;w_Bd?W>hYdc$HcuuvxxDx$hKMB5lcR?XfkPYykv1qJes=Z zo`!JQOwVs?z5Zn$N^!n7JHPCt!@m;}&AxJij2sROOacuIED8*aHg2o08ZlhRFqyV4 zHIj`XLPu<3*k-A(dl@IG7&1(FzO(jy;*RFWr^~JTA4@PySeE&eBkF7OyM~`TlKb@H z-u`*{PlR2)yv$D4^y0g-SKcvf|5tLQ#hQPuJj;iV6?xnE^A`bC-r5^!BB`?Mw*T9h zb=iz3zI)$Yv{R}f`o*`b({p0$^-LGBK4{v#e)Sc8rU|UOTT}F|Z)NB@aF;jmzhnt_ zrv9C^dv|Z|&$HjkFxfHbUfjHmUi|+*$tXN{_u5UiWmSZYe-p?bNM1r`E-3g@=HRrr zeJhhtp^WnRV(E|zJRUo2|EziWP2`gE2W16oh20ZUXYzVwu&Xq@pU`q;id@PH*OXKL zs^irc2w2r@;!w0?%x~CqRP-sENt?fzVv6z}MwQmUZ!@imnCwhzszMomXgjkm=)1l9 v)$t`k4OYnpr8a6doI;QghB{|9?*~>@Ded{9&KFh!QvrjgtDnm{r-UW|X)fO| literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/Departmental/Epistemics/chaplainmantle.rsi/icon.png b/Resources/Textures/Floof/Clothing/Departmental/Epistemics/chaplainmantle.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..7afd8f445e468119574c7d60d047be5ef6afd9b5 GIT binary patch literal 326 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oArNM~bhqvgP*A$W zHKHUqKdq!Zu_%?nIW?!avREOwq%4ZLn00*|M~yl{;&hn zu|W17tAs0zi}@r<53FGJC~RnHIa1FC1Z8DqJUi#x*BcoC!JdkbO%v7lCQP6H|NMai z2R?j%AHUOd+Q4(^mf7uJw!Mx&5t2rxl)WmON*F z?fCHpBBk9E(*i%d_IXurHu+``NL6^(uA@7)I{({We$?4QUd`W_{eVtOF!Z*LiTA9fI7 z{~*53P(b6T;)8;K7Z216%BJi2$(9H@%9I3c_{*_&!DK$Aj&8oWF4o&RBa>B(KXaxnkaQ z%YW+`w_N*E@+vs>_0g9mr(<%z%=!M@HZE$n-?O{FL*wi@T?KqTE-P3XvPtZCA=5-r zMPY~UiOtilty|7z{u!upU5;HBv&Pa%i+J5+j(=hZZ|_>w8y8fuJMKYL_M|h`XN}&+ zAK6*bklVpDLuFs}5C7MbI5vye3m+)3SaLDLM081nPSMJcMfJQ5{EEPU#RJ6nAFMym ze#W?c<~jByIJn@t)Dv|6YOHCBmm}{-YnIaO|>C?aGfxsb{y=Phr l$O8vfFuTbbykdxAU@+0ScyNk;A1L@3JYD@<);T3K0RRrvljHyZ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/Departmental/Epistemics/chaplainmantlehood.rsi/meta.json b/Resources/Textures/Floof/Clothing/Departmental/Epistemics/chaplainmantlehood.rsi/meta.json new file mode 100644 index 00000000000..e5c7e8bcc30 --- /dev/null +++ b/Resources/Textures/Floof/Clothing/Departmental/Epistemics/chaplainmantlehood.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprited by Dakota Haven", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Floof/Clothing/Departmental/Epistemics/chaplainsocks.rsi/equipped-FEET.png b/Resources/Textures/Floof/Clothing/Departmental/Epistemics/chaplainsocks.rsi/equipped-FEET.png new file mode 100644 index 0000000000000000000000000000000000000000..29d07b0dcb090b0fa70ccd4d313529d301c296b1 GIT binary patch literal 498 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5`$3q|f;CtLC@5Xx z8c`CQpH@F!Z*N(99SIOQ z_EFzwMnmc~xc0N5A8oE-WOXd7$gZbyDAFp^Xyn2J!*X?X4Hu-cP zbt;WLT|M98xzns=v(BbzoxUWK@ZwiA+EuYg%*($6i_pP@-%b@e>GNU2Gq-jU5 zhc@PR+qA7Y+rWt>h=})xf8ZlgfnQf zoc^_!QDtTAdeirJe1Esq{g1x#+*<&bdx7F+>%Yy3`!)A!zhuqV{S2CUVuHLEe6nho+X)#vjpBMT>H?Z8~!L>{N7f09beN8)lJMcLzf2V8vsN}d}nBPW@Nj;tl@|FVdQ&MBb@0HM8dg8%>k literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/Departmental/Epistemics/chaplainsocks.rsi/meta.json b/Resources/Textures/Floof/Clothing/Departmental/Epistemics/chaplainsocks.rsi/meta.json new file mode 100644 index 00000000000..bbd45032fef --- /dev/null +++ b/Resources/Textures/Floof/Clothing/Departmental/Epistemics/chaplainsocks.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprited by Dakota Haven", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-FEET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Floof/Clothing/Departmental/Epistemics/chaplainthong.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Floof/Clothing/Departmental/Epistemics/chaplainthong.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..7249693b448a94b9d56799003bd5bbbcdf994b87 GIT binary patch literal 431 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5`$3q|f;CtLC@5Xx z8c`CQpH@F!Z*SRh9WszO z_L0S^vWcg)srmQ^rguv3;v8+8_^iQKBxYbcwBv6??^-?OOIP z)FQS$Gu!M^b@_^=L*#zFZ!*u9J9MZXFyz4E03@LU;tcopPAd!4+cft~L%za}Q#m{V zrOMJmihao^H@$gj>oh@J>HEX=2Y#$jdc8~Dv+T~QzYmxEDqg+%*tg5GA1r?_Xu%3K c?Lqx(wo|WjCUk7BH~4ZkqkdE{WjW&vItG2m%^ zIK5ioo9cIa-VWJ9et+|`Cd~^xf5f^^{1jOfW0Rg%Rcr~=g9ZFpt8+T%e!2Lm#h+}p z=ia`P%n+{EBeX!rd-9Uh$R-Dku0txBvEk*?3)a1U- literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/Departmental/Epistemics/chaplainthong.rsi/inhand-right.png b/Resources/Textures/Floof/Clothing/Departmental/Epistemics/chaplainthong.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..ba71aea082070d3c2d882a1ba2b79289f5daff35 GIT binary patch literal 399 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5`$3q|f;CtLC@5Xx z8c`CQpH@F!Z*QIKZ8Z>J zxvOK!WH|6YTjvzxlqi4Q)%>o;hiA*PDljl|I502?G%&CrGaH_- z*WkMSeeT9jpKP{&wwcM(@crJl+-h})$Z2d0uXnjg-mpw(D3EcNVo+rHeKuxVtKl|I zhNQeJ?u@T?{o|gq?B&M`p`ntVXFkt4Cx5}Dm+^o_-yi?Tc;<}T*V+;j*61*FO#Lp} zu`m855ond&eOK+c8gUUNIk4fwW=OjJvyj4--w@HABVZl~60hVCls(I-$#~B$kmVPMP+jXe!xRlcB zU&4(0Znvww*s`H?-GV8bs%8gyDYqPW-P#bYlf1MfpLas&-%f_Jv$9w9+O!B5=R0V& zR;4!FJ-yJ>A?)k_H;jo&YfTxB*flXcu;}}G?Em6Aod$!dz4xy0{@7>lHABQ<*4Jd_ zGq+kMF?p=6dvkulTUno9#xufd|8ZdY0Le2P4h<(J1W8>l74(aH)U#?+M}f?;t;Y&1 zwn#0CV7{WwJjZtJS=(=3Mu!A%UA?Eis<);J*S60W=X&rsmECc9>$mFb zSu**xOmcoKeeX9+P=D}^!(vC^%ecmmaspS`Ywnw8er;QE=kenYSE>)>x2%|0dX3?s zMa{JK`O*m!{T$L56qy=YUomce*KY5G6x^q!?0+6sn7>4YIR}^?7(8A5T-G@yGywqK C(C+a7 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/Departmental/Epistemics/chaplainwarmer.rsi/icon.png b/Resources/Textures/Floof/Clothing/Departmental/Epistemics/chaplainwarmer.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..6f8f0e660c057d74dfca16bb5e2acc66b085cc03 GIT binary patch literal 349 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oArNM~bhqvgP*A$W zHKHUqKdq!Zu_%?nIW?!avREOwq%y~PuSF8UKdS`EwFdH|UvAC7*H?a~`d{*tGtXSut+8|EchVI&~R;+z#ajGl?FV;jPsr^ZIovXkv$aE r@Fr^N+{Rnk8ukkrSQHxeGwxw9tv`9t{!vaI(9aB>u6{1-oD!MF!Z*T4Qb21cR z`>>vQwXy2Og|l7=Pnglozo74oPv0&FCjLU-go_tX&J3(&$ndFP@}0sceCo}sfa$kq zYcsZZSIhpf`k4O1uU z5-7rR;OYFm(+ti%(O&vthH-sv!|u7AzDxz%jXe*?1d7kEz7VBc`9@YTQgK3``mXpfCNwUqTtk0<|ef!X0+j_XdCA6wGCIK1KK zS$%Bo>(|_IXubD(0*4VpR ze^Y_E_=7BlPj_9PuoZ+~y1Dw55@XHP3ET^G*|wS5HcSyZCQ+iD@3`(r_X@>w_8pF` zZ??EylzpJ)e5b%AQ8qw)qc5A_1uj uxpD{YGwo2?)Y>99apv*z54RuGGndThpZ~#)wE&oM7(8A5T-G@yGywpHUja@4 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/Departmental/Epistemics/episocks.rsi/icon.png b/Resources/Textures/Floof/Clothing/Departmental/Epistemics/episocks.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..26a9bdec3b9f024a3fbb9cf23df0fe02eb7dfa7f GIT binary patch literal 375 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oArNM~bhqvgP*A$W zHKHUqKdq!Zu_%?nIW?!avREOwq%*9 z_{aAgZ(eGjRP1U{&u|ixYfxAn=n>-i!g)%I))UQ=r>*P_yq@zJSVY~O{F4QnGo=+Q zEl%VbY|i@M@iXPwbkWeK_R}Q}Ft8akF!FqmcF<~_ch{2P)h@NuMw+LCCaW+$D7qh< zsdtd!UUjX-oPsYq4hCO-Fh}_P-n`?6o9CLB<k2RF0HqEfr`{K}4wm|y$g~tB!gH{*P zAE-NQ;Q5j$?S3)nz@pstf_0)Fw*D|W5HFz3+~EKD{kczfXV)GDJ95LRD)w*hz8qvq SJueRoGzL#sKbLh*2~7a*rJ6nf literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/Departmental/Epistemics/episocks.rsi/meta.json b/Resources/Textures/Floof/Clothing/Departmental/Epistemics/episocks.rsi/meta.json new file mode 100644 index 00000000000..bbd45032fef --- /dev/null +++ b/Resources/Textures/Floof/Clothing/Departmental/Epistemics/episocks.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprited by Dakota Haven", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-FEET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Floof/Clothing/Departmental/Epistemics/epithong.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Floof/Clothing/Departmental/Epistemics/epithong.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..e2261ef4d8a82743fde0a8438f287a2857b8af9c GIT binary patch literal 367 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5`$3q|f;CtLC@5Xx z8c`CQpH@FJO~(N-tnp{=uM4GiO6tV|r@34QFM-!+P(am`|)8jk9L{DHZ`5 zfd#Zp4%#HKc$(e(*;0QehaZSrU$&{YPxkw{%EIk;ik*3;F`Wt~$(69BOrN_GGM literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/Departmental/Epistemics/epithong.rsi/inhand-right.png b/Resources/Textures/Floof/Clothing/Departmental/Epistemics/epithong.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..b2d7472491e5ff52d3f6594f768bc326d87761b3 GIT binary patch literal 268 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5`$3q|f;CtLC@5Xx z8c`CQpH@7Fi*Ar-gY-nz(pK!JnR z;m)FW_H*(a+XZGz^)sG0T`M4zF;mh!oEfMT9VG01Ch_yjy??j(5BN1$y1BW8u&#Ue zUD6>mgJC&iNV}cbgIkgtsH%xdeDMj} S>K|o+)Ox!5xvXTw_Oj$3pWD_m*B*DPG{R{=&%s{ZDh=)XGXZYcieQ z_D1Z}-pFf{>muqOcy@A}vlL@ypy37vBF< zvS+MekjiE}@LSwwD=(WtYTbKVg<#bpPiyuGD}#zWo8L1AKmE>hBBYZm|K9F`rtBw^ z*qCP+)jv1P=$UwY>&wz5xmWz&eXqLm?M$4W#;D3r7 z6T`KrkkG5E6^tbka&Bs;Y*95~5=d}sm|tsgZSkyvwYxthPP2Vr?j(41UAxC-CXqnh z+lR9*JYi?vv&Oz~>y9J8KOX*?kr>wCGxbv6)3SO)TZRv@_3Q#qBx5=xjOF55kOJ(S b={|-XM}+5pyOOE_j6()bS3j3^P6}3|Ln02py|R&)$&iQj z!h6OS`nu5ylUXw|XE1B>II28burRezU?c0=%f=1sAF5~x?U>APa^>6k>PPujYVE5$ z!N6wFz{r!(FrR%*=K9q)*`EIvRKFXj`{C}d=?!x>8yPb!=vYv^PAbA>OL5){cH_$# z4&E1**ZybJP-3|7ho%44O9lo34aHUKnV3|2UoD^8=)h?nGkbeNAM2uD9~&48Bc3fg nJzwxPxB1!Lzb#;^E-+u1b?%_Zt7RHM=QDV^`njxgN@xNABol8z literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/Departmental/Epistemics/epiwarmer.rsi/meta.json b/Resources/Textures/Floof/Clothing/Departmental/Epistemics/epiwarmer.rsi/meta.json new file mode 100644 index 00000000000..f6904e7bf3e --- /dev/null +++ b/Resources/Textures/Floof/Clothing/Departmental/Epistemics/epiwarmer.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprited by Dakota Haven", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HAND", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Floof/Clothing/Departmental/Logistics/logisocks.rsi/equipped-FEET.png b/Resources/Textures/Floof/Clothing/Departmental/Logistics/logisocks.rsi/equipped-FEET.png new file mode 100644 index 0000000000000000000000000000000000000000..3159a29d8b655e0c65a054cd8a1fb95d3345cddf GIT binary patch literal 585 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5`$3q|f;CtLC@5Xx z8c`CQpH@D}s-FaWud-CV6(~G4h1$%3@{;$zt5@=vxQD9)?aA3f~oHjpfv*7(dkJ&4JOGS&T zmzF-+`O&ud;fYCH+JW}w4rhx6TLhPV766K5nM$vUDtusNrdFrG7f|;13`5lZ>hgw< z`7L?&UCbr7%wDydS?!$}A^zgmY=%$Q&hr#h-U|`7zag>U+0Keu`DuI#q5A{a861|I zcQdQ3pZS7;p>X%>jTf#Tu~M*Xe$6zaf_+M)eK`AzuxL?*o3n)Y^#kpN9d`X##Sp|X z>8mmGlIQ;CZ|%CT@_hfAUw_m+u=xeYDoUN2P_=L@gCq?7K(xbCpxEV1p?%_gTK zC4Ll{Z9JIEovM0#}%!G^P16H-+_Xfj@ZXfekq z&4iJmV^S33mw6jmzL+yOoc$eo{)Y66MemqjEdHta;O7Us1LhqE85k}sewX$)uXkS( glRyIli$oCr_up?0E;(ql73fa}Pgg&ebxsLQ04n~4-v9sr literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/Departmental/Logistics/logisocks.rsi/meta.json b/Resources/Textures/Floof/Clothing/Departmental/Logistics/logisocks.rsi/meta.json new file mode 100644 index 00000000000..bbd45032fef --- /dev/null +++ b/Resources/Textures/Floof/Clothing/Departmental/Logistics/logisocks.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprited by Dakota Haven", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-FEET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Floof/Clothing/Departmental/Logistics/logithong.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Floof/Clothing/Departmental/Logistics/logithong.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..9057e8950fcd5999c8865b2040fedd96135e55bc GIT binary patch literal 419 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5`$3q|f;CtLC@5Xx z8c`CQpH@F!Z*OkoJLn*D z{NsOD*BcQ>6kaAh5IkenpCG#af#ja12-~K!Zv-WDgqkC6bgY=O@}!`8Xu0W+f6JcT zdQ$%V|Ll6^ zt*G*h?*8Mak2dYN!@KQYkX=PY&8&ax?V9%8|EcrqCpQ*Hpa?l^N-5QOxBB);z8|bj ztIzc_o)M1xY~|hJw|L$2*K4cHo?!iC+KWB84VKi MboFyt=akR{06syTe*gdg literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/Departmental/Logistics/logithong.rsi/icon.png b/Resources/Textures/Floof/Clothing/Departmental/Logistics/logithong.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..dd4775fbac9e4fc6e6a361cb94481eaef135b699 GIT binary patch literal 259 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oArNM~bhqvgP*A$W zHKHUqKdq!Zu_%?nIW?!avREOwq%|5dsHX8hX5gLHrrNxc@xNV`#8sU}(6+ YAYSPxK4CrUVOfxrr>mdKI;Vst0I7OW0ssI2 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/Departmental/Logistics/logithong.rsi/inhand-right.png b/Resources/Textures/Floof/Clothing/Departmental/Logistics/logithong.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..ba73e5d295d46e9827fd75d01951db84558960fd GIT binary patch literal 272 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5`$3q|f;CtLC@5Xx z8c`CQpH@1`(mA(vAMrW~%H(}u%@do>{E=~v>>Qa|7I$^_ba@9B@xpJcGBPZd1pzU6yOm?S z<^)+CG4q{VQ1CzB@AK0AD)HR$i>4e>b9Z835@=vxQD9)?aDXrkjx3P~WsXa~?|Hi= z_W194>tFwfoDF35 z7;3s@RcklD+jC>fs-%{@cFxG8jg#ii(zwR3%U3le(p0Xtq^`zg{#HvyoiHKw+L@TaxcAP%_oh@RyumJCZIPPmJ*>mdKI;Vst E0K9_Hvj6}9 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/Departmental/Logistics/logiwarmer.rsi/icon.png b/Resources/Textures/Floof/Clothing/Departmental/Logistics/logiwarmer.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..5546dbde1d46e2e7fe3a8f9221e7c5f8a69a0373 GIT binary patch literal 322 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oArNM~bhqvgP*A$W zHKHUqKdq!Zu_%?nIW?!avREOwq%y3$m{}}uc79^rccJ?KU-h4S4U(TepN|I_yJ&GkBM{7Oow-TFfsa+))`!HFLaKE6#Eb(V=9&s^z`1h-)(#-4I-ELL^<+{gQ6M`Q3X79-{ zn-HYtrCF@Wa&C95#?nRM4O4`ovU9XPwhFwcI+o8eLHC-P{I@K|O-H4EZV=}^aBMyE zhtB&F3=E$V&u8A=K1uhQ#(Y;+4%z#wnNAhm@mx@I&x^ICr{2I}>y_6+EA)CLUf-Wq z75nGaB@V8H{aeEJ>oNWob9&Ea_*kBYf#Gw`lcw9Y*WaBr>on01ILFH+pl$b`g%h7o zS$@=p{Qh#FeEq(&N9yNsGyFNHR>2rj{mJ1^F{5Gehjk3Mmw$eFyj5ah(Fe8-x-UKV z7l$;w%-VffFQ50p!^cNr@6W4~V^whBThp+g;l{$P$L>B3&Xzx9qJQS^*{#;v0nbWe zfXZ*5%1hY)Z*tx99Slw!<+;M1pBITTRQow(zkT;x@31~^XWD$O^>beX69$8)tDnm{ Hr-UW|a+~q_ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/Departmental/Medical/medicalsocks.rsi/icon.png b/Resources/Textures/Floof/Clothing/Departmental/Medical/medicalsocks.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..53e55e380c1cbb74c2e2d8ef74750d8a257e7c52 GIT binary patch literal 337 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oArNM~bhqvgP*A$W zHKHUqKdq!Zu_%?nIW?!avREOwq%xsv=94s+?QlxJ)uyW4m~!^a>YVsX>;Gr3 zUbFSb^8hA+1_l-d21Xf1gJKQ2HpbG})ypz-<~?87))8XjkZM)E>kb3M>Cb&((_h_= zxx&)HvA*(H@+=3Ju946j#gXLx<>kH~}kUG{&)4lFNtV)}-S!D0334Lj>U|I7c-ajK+XtJl6H gMh*uCrW?lh6oj4~RM)z%2J|O`r>mdKI;Vst0IxfQ{Qv*} literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/Departmental/Medical/medicalsocks.rsi/meta.json b/Resources/Textures/Floof/Clothing/Departmental/Medical/medicalsocks.rsi/meta.json new file mode 100644 index 00000000000..bbd45032fef --- /dev/null +++ b/Resources/Textures/Floof/Clothing/Departmental/Medical/medicalsocks.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprited by Dakota Haven", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-FEET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Floof/Clothing/Departmental/Medical/medicalthong.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Floof/Clothing/Departmental/Medical/medicalthong.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..06f025f614a9b42a431746378d66da1cbdafa2ad GIT binary patch literal 375 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5`$3q|f;CtLC@5Xx z8c`CQpH@F!Z*MLXJY*np z?4$TWz9$7oH#?X+B+Xbj&2htA#^#h}ordLo+|~+mTp|xMK1s3s_uqE?_oevBAxBoO z`co_ev%)O}YZ$u{%T z>E*wk-#e{)Y|+0rwhOH1#`AxBJ$3coviTfKf4I(mu+9F}!rLMBm8Wgnf&L=^YUV~A ze>Axy`fNkI!ijA>#{Q P5lGC_)z4*}Q$iB}(?^0@ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/Departmental/Medical/medicalthong.rsi/icon.png b/Resources/Textures/Floof/Clothing/Departmental/Medical/medicalthong.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..2140cc984319a8e713251763197b508ea9c4a4a6 GIT binary patch literal 239 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oArNM~bhqvgP*A$W zHKHUqKdq!Zu_%?nIW?!avREOwq%J*7z z^EMfYc>Yh@QT<+yd8OTQ3*MBx-7MEF?t1qZItV5H_)_{mJdMq;FYPe0!7G^CwlFgs Yx?O#6k@_rWpeqOV literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/Departmental/Medical/medicalthong.rsi/inhand-left.png b/Resources/Textures/Floof/Clothing/Departmental/Medical/medicalthong.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..547c76b04331aa0be086f045b9c314d702a4c858 GIT binary patch literal 271 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5`$3q|f;CtLC@5Xx z8c`CQpH@k*3;F`Wt~$(69BOrN_GGM literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/Departmental/Medical/medicalthong.rsi/inhand-right.png b/Resources/Textures/Floof/Clothing/Departmental/Medical/medicalthong.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..b2d7472491e5ff52d3f6594f768bc326d87761b3 GIT binary patch literal 268 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5`$3q|f;CtLC@5Xx z8c`CQpH@7Fi*Ar-gY-nz(pK!JnR z;m)FW_H*(a+XZGz^)sG0T`M4zF;mh!oEfMT9VG01Ch_yjy??j(5BN1$y1BW8u&#Ue zUD6>mgJC&iNV}cbgIkgtsH%xdeDMj} S>K|o+)Ox!5xvXF!Z*LlUF*}MJ z`qB>48IZ7wJ)T-m>U=d#DEGNKL2YTkWKI-bw+;a>YD z9aT?nW8OL0u?3l8Z0D|i4xN^2bV%=0Ia9}9#g(7GO{`aT$g+HH#kTvz{gq79(k5Nm z$x?qTZFPg)=j~w!N@D&>-A}x~(6IhB*9&X==?S;*FZgcf(Y3E7>G>ONdwxX}hoEs1 zaOnX0q~}sCJChgawVpj!H+%YyW@wl506b@|{g10~3cr z0|V1PxeMR&t8LF!Z*QH?yX+vq z_91^MiVe?|B?~9-1CFbd8nYj>XsBHJmU5kQ z$EW?Jd^OdblOkrF)VEId-t3g!`@fQtNuYs&MS+2l!+`+{^WWZ_(_VV-zRN#8{ImMv z+me#iSH0G89txP@WhPs{H7apmL`Yw}goCEIV?nD1mtf1n4Z7amnFqI3f7sJm*s$xd zIFp5#)BG>rK2*s)eEo_4+!nFpPA}?y%k}LNS{{DCVA)nf2H}sz%zJ7KFU>PQnDK>6 zT>N?cUuJgpc8UJ`Kx6ao_h!2rh}xSsNZDNt6milN5BwtQ_&}ZW#x`b6`GcR;CR}PV z{~Kf7u=2-F#yjcfO9g%eoMLTQa_`Zu9{bI??34ZFv)MuV9d_MJQJs+IrzZ8_-#_6k zx8I)mar&vy^y%?jN6)iPSZ93yyRmSAO!`{8*Z)2?A7t3~K7CrlV~ZJQ(^>_Jm>D8& z*L}48zV7|2egBVtt^fO5YJc57k4N@5YCGosw)T|Q5Ss7bggX#HL3?NKrQ)gwWnuSI z9?gEv)KIj!;}XNi8E2kYtm%~TVqB8`iJ@mc_lZ*vmuzQe$bQZ$b(b+vM5*rXHNF+I zoK+hh7IeHU*%jKb$}%LYX=BYzwh++;eKKCmM=mEY^qLYAX9X8WNB|8RBvx=!KdMT0003J zNklTF$ zDN!m^1X3cFyV1Vk)7@_qGvhyt1Rwwb2tWV=_zS>j-8N_09_|-+G#-sONs_k5hd_e@ ztj*#53NZ%w5XflFN@*A~fpgWcfEf{AOm=bg9`W+|fjKkHh&bEY#`##`a`lQi^DuzZ zlY*VAP!wlaE*IY>Fr6NwEU#g0j+@((dI#A31CBAk+8i;y!TY)e7?VP&9XMA(DGm4h z)IT6UJYw%_SepYtyYD6!&6zPNs>g@^0o|}|0(8UKE1I(zF^})(f&jJ7d002ovPDHLkV1ka%oh<+W literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/Departmental/Security/secsocks.rsi/meta.json b/Resources/Textures/Floof/Clothing/Departmental/Security/secsocks.rsi/meta.json new file mode 100644 index 00000000000..bbd45032fef --- /dev/null +++ b/Resources/Textures/Floof/Clothing/Departmental/Security/secsocks.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprited by Dakota Haven", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-FEET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Floof/Clothing/Departmental/Security/secthong.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Floof/Clothing/Departmental/Security/secthong.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..df6cdf3084fcff292cb0052678a480674e337da8 GIT binary patch literal 474 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5`$3q|f;CtLC@5Xx z8c`CQpH@F!Z*T4QIvgN! z{A009kjVcfM`nu`1T5TP$#Lo6qX!B%4yp^(XdF~82q-9+U?p zJ%1|SWSR;`)}&?5FTbwidM>_?`PQm3;+*LR$8n`oVZsBx Q(%m3IPgg&ebxsLQ0NQ`EnE(I) literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/Departmental/Security/secthong.rsi/icon.png b/Resources/Textures/Floof/Clothing/Departmental/Security/secthong.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..66bf80aa2e47284c25f86afbd13b693b7a81736f GIT binary patch literal 259 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oArNM~bhqvgP*A$W zHKHUqKdq!Zu_%?nIW?!avREOwq%;GnPDbVdSC^!o2ItG2m%^ zIK5ioo9cIa-VWJ9et+|`Cd~^xf5f^^{1jOfW0Rg%Rcr~=g9ZFpt8+T%e!2Lm#h+}p z=ia`P%n+{EBeX!rd-9Uh$R-Dku0txBvEk*?3)a1U- literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/Departmental/Security/secthong.rsi/inhand-right.png b/Resources/Textures/Floof/Clothing/Departmental/Security/secthong.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..ba71aea082070d3c2d882a1ba2b79289f5daff35 GIT binary patch literal 399 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5`$3q|f;CtLC@5Xx z8c`CQpH@F!Z*QIKZ8Z>J zxvOK!WH|6YTjvzxlqi4Q)%>o;hiA*PDljl|I502?G%&CrGaH_- z*WkMSeeT9jpKP{&wwcM(@crJl+-h})$Z2d0uXnjg-mpw(D3EcNVo+rHeKuxVtKl|I zhNQeJ?u@T?{o|gq?B&M`p`ntVXFkt4Cx5}Dm+^o_-yi?Tc;<}T*V+;j*61*FO#Lp} zu`m855ond&eOK+c8gUUNIk4fwW=OjJvyj4-F!Z*OkQyBr|G z_P}0fdu-FjlmG%Fc4N(iMsQI+@=z_W)%xry;$i^xPl$H`W$d`J44AG7w9 zNKR00Tk^3~#ysf1@$K(2^>%jGFRk^^ES$R7iGfL=fq_MVfsw-j!i*4VTc@wbk-quV zF4oZX`c<}9Uxzc<@)qmdW3ibMrVI{M|Cc+)OD0FQ}NyXY6a@&0p_OW3kEKQOKTS{l8Uq zf(ob1@z%^)3=QV_@#}RL+r zTg6#(HVIFeX#d%4#V3WzcRSbo`6H-=@G+9-5lrvH7fM%VTJbDqyKG`C8#-0+uAe`f zV}rpQrLHuuc8!^gcb-kWvPHUM(fp3b9G;UziarIqNbJ&U6<85wy2O;vU47~yMg|?B zmc$Lg3~h;eS#_>X#lU;kL{@0%a1bztu8_Dh@I#4r~m yH^jbbxWo{|!eDL6^7-0fc|}C5HmsJaXVh-7pD)AVa1EH|7(8A5T-G@yGywn-&<->J literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/Departmental/Security/secwarmer.rsi/icon.png b/Resources/Textures/Floof/Clothing/Departmental/Security/secwarmer.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..bdc8d9e934dd2bea9b550ef521d3f7bfda17394a GIT binary patch literal 396 zcmV;70dxL|P)YAX9X8WNB|8RBvx=!KdMT0003O zNkl`Y*0{}qV|Bz>5X+V3EG(ALFmUw!86uzL!XuE(!)O?0~o*n27CiGK+?fy6A5Ji0000peoo3(OY}uv0cf+#viN8a`iZ&w2l@mNl0lLTBms?XPNH z6n%bYS#G(N;a8nq373LrW>D+y|1srfc_*ITT`&LPv+TdBy1StfK5oi)qMFm~;_GzJBc1EGQSj1FA?%@&#-5ZLR+&DUHHs+l>mG0$F~cJi6`hMC{8uC=hYB?!+>h`G8T!Se87Ge;Kne~deq-#hr8 z`TL#DRi93)vl%on@+2@YUt!!4a_ZStsb$7fkH(aktf^YmdCHwJkfV}s_g?^WY?pV%nbk1zu7h5VhEMy+mtonC6nvo&! xg|pf1tmoag7Q8RiTV2loMnw7m1DnAC(fcRw9aKlrD-)nEK`|J4m2KT-#KLUbw#aU1Nt*+bnctY}SKTW;WQ_Q!Q>|1u_)7kBB=I>$O z!*=oa!|dyKj4=9(<8*rgk9vcR2Z_k{E7T%8H)!tU#WO!9Q~b6Mw<&;$Sm5pt&h literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/Departmental/Service/janitorthong.rsi/icon.png b/Resources/Textures/Floof/Clothing/Departmental/Service/janitorthong.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..be1e978231508328567c071bf824f24f3b33d1e8 GIT binary patch literal 230 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oArNM~bhqvgP*A$W zHKHUqKdq!Zu_%?nIW?!avREOwq%`hYEcab U`)(;E04-zopr06^zP*Z=?k literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/Departmental/Service/janitorthong.rsi/inhand-right.png b/Resources/Textures/Floof/Clothing/Departmental/Service/janitorthong.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..ac9f1c546cb5b661c806846e14f103bd638c6b5f GIT binary patch literal 270 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5`$3q|f;CtLC@5Xx z8c`CQpH@s2Ck2?3*{S^zPL9x9kb(2aGov=85k}|Jz(W9 V7oWg<-e@97#?#f$Wt~$(69E4MN`wFa literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/Departmental/Service/janitorthong.rsi/meta.json b/Resources/Textures/Floof/Clothing/Departmental/Service/janitorthong.rsi/meta.json new file mode 100644 index 00000000000..ef52845d5fa --- /dev/null +++ b/Resources/Textures/Floof/Clothing/Departmental/Service/janitorthong.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprited by Dakota Haven", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Floof/Clothing/Departmental/Service/janitorwarmer.rsi/equipped-HAND.png b/Resources/Textures/Floof/Clothing/Departmental/Service/janitorwarmer.rsi/equipped-HAND.png new file mode 100644 index 0000000000000000000000000000000000000000..6cf8b441d4ee5b163242279b6a9347d34b685c0b GIT binary patch literal 481 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5`$3q|f;CtLC@5Xx z8c`CQpH@F!Z*T6+I&2_t z;N$M2b9ZTbYqsulR-CZb|FNClUz2-WZTp-TOwqeGZ)M~Z$HMk2S0;VEsQ7<&j`Hg@ z@|#pFO3$4%ZD#^ni3|*co!8s*ZaeQc-Kr;d{_g!ZzST4F?A`Tt^8RgMM{M-UGrqs- zvE2WEUR!{2y@10Thim)3%l~BLVBB!+e!HKepkVSR#wlmyx3QV5J+V=EC$GdA$GcbT zZc7Ci{5Lvqu3T&{hv{0L{8%f8hkp*ilK_WGA4r4Wymdzk3*$Qmkjs zK6O>rk%Qt+ZrYzdN`|{c@=l2Qep)h^SFj}H(weg=;`X`vd$@?2>{gxxxfGb literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/Departmental/Service/janitorwarmer.rsi/icon.png b/Resources/Textures/Floof/Clothing/Departmental/Service/janitorwarmer.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..224c1cee5d026abf32eef875eda16b8d2cc83e0e GIT binary patch literal 279 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oArNM~bhqvgP*A$W zHKHUqKdq!Zu_%?nIW?!avREOwq%|FyabZ^ZQ_Bve8; zrGGp!dtA@Sx#FL2i>%`m<_^P-m|EwF!Z*OhPmP(X3 z{_(xw7d`Q{6&))}Ch159y@*K?v*u{jTe!IRSl>U+rOC(7$##1yURW5L^g<@1O=n?n zX0q$fSu?Dc#;~sz6mFKgxAnq(>wB`_tKS_yefr>M2}gks_WI5YOacuIED8*a91fVw zhTGvQw;0#$xcsu9=+n&`x2hykHsAbc+Hzo>o6y`5&8^3RE3YLumc|K%U^%9#&r(fM;$?|pn-4^P6B z_m%f}8MIUOl^s~b(D#_(Lf-b{tUmGGLJ2p2GR+WQ5Twm6qi&#^oyNHD`N74GD$gC3 zhVeB$X1ON&bKdhrof-DxAc0FeMOI64e?K5!_hvqGdWivJN}2DvnEt%iNh>)5pPlDr zm~j8ZL%APYZs%T;Q$NNUQz!Mnf^TN**OF*{pvhKFgwPRw`eXDzKynQ({i$G>&Lnf?V~yy3q+<@We~{Cbmh z_4?l*nR=owO6dWxs1$zpRd5n9acp450%4KlMrMe{RTc__Rn`|3HfSxBPbv zFY`7sJYthjln^}2dS~0Rbk-#H8E;N9t88z7AMq{bz?wHDdaMrrUs!3qX$Z?`DA7B5 zp8s%S>({+J3}-io=`j54m0@^ZD&A1-f9ArE{fsC7G|qnz8+a6$?if5>{an^LB{Ts5 DJw_um literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/Departmental/Service/servicesocks.rsi/icon.png b/Resources/Textures/Floof/Clothing/Departmental/Service/servicesocks.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..12039036e1bc5bb5ff6973b1b799f9dec45a05d2 GIT binary patch literal 380 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oArNM~bhqvgP*A$W zHKHUqKdq!Zu_%?nIW?!avREOwq%`ygP8M3?Mwx9lB^W^8N)a?x>-g7G61V{d6R#>vcDz2!w^7bR{3|Z@? zA`Hi7NPXCQ-Opi`YTs`@r&IBaQ@0lEx~aw9%aA#3$G?R6djo>}R`sXOZ~V=r=3pVV zXX>=4kG2{vGGs`oFj+7sL?Zdc+|sNAukxCMx(ak=*y}R<6MGQ9k-egUeT&owJ~gqA V2RHpsiUNilgQu&X%Q~loCIC5vnGOH| literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/Departmental/Service/servicesocks.rsi/meta.json b/Resources/Textures/Floof/Clothing/Departmental/Service/servicesocks.rsi/meta.json new file mode 100644 index 00000000000..bbd45032fef --- /dev/null +++ b/Resources/Textures/Floof/Clothing/Departmental/Service/servicesocks.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprited by Dakota Haven", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-FEET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Floof/Clothing/Departmental/Service/servicethong.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Floof/Clothing/Departmental/Service/servicethong.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..c6db5254ab2e17fba779fcefddf9c9d31391de58 GIT binary patch literal 390 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5`$3q|f;CtLC@5Xx z8c`CQpH@F!Z*Lm%F*=GI z`)JOps3^r=$guii&T^r-mv~doE95P>(&@GQVg!4EK<@;BuH~0HeACL)+#mj*y8Ed4 z@6)qyCiSd3Wq%xKCl=sPwrIuj%w6WL_jfPr`FBUyAg-sxGE(yP^L>wZ@4q0{F?pZa zZQe?mo{-&I(=Uf^+dP-kbldxXRjbvuf4;kN{|89{_1dY)u1h}i{Q5YbW8DwG_Jo_& z_t*}K&Ifvy0Jx!gWot#`-8i)e;vD;|ikVaHo@jHCILE$gUS7}JTYH#(=;+T{vu@4S fLJlUlNi`?AxvyAE(3G}y2Z?#Q`njxgN@xNAUzdi~ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/Departmental/Service/servicethong.rsi/icon.png b/Resources/Textures/Floof/Clothing/Departmental/Service/servicethong.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..daf484fd0f18aae02aa0b9911aa35e19eea3fc39 GIT binary patch literal 243 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oArNM~bhqvgP*A$W zHKHUqKdq!Zu_%?nIW?!avREOwq%8<(70bQ;1dW>AC-v zt`!n>vWY1Pn}44F@bj#Ao9x_b$(OU(Y);MnZyb}5nqct5ciU4Db*G|7H73%1NM^gq cHt;e0-r9WdN!i>RK$kFhy85}Sb4q9e0I>^Np#T5? literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/Departmental/Service/servicethong.rsi/inhand-left.png b/Resources/Textures/Floof/Clothing/Departmental/Service/servicethong.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..bb249c504e0e93ca321285680634c952c53f6a5a GIT binary patch literal 269 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5`$3q|f;CtLC@5Xx z8c`CQpH@gnp|vd$@?2>^ssO)~%h literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/Departmental/Service/servicethong.rsi/meta.json b/Resources/Textures/Floof/Clothing/Departmental/Service/servicethong.rsi/meta.json new file mode 100644 index 00000000000..ef52845d5fa --- /dev/null +++ b/Resources/Textures/Floof/Clothing/Departmental/Service/servicethong.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprited by Dakota Haven", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Floof/Clothing/Departmental/Service/servicewarmer.rsi/equipped-HAND.png b/Resources/Textures/Floof/Clothing/Departmental/Service/servicewarmer.rsi/equipped-HAND.png new file mode 100644 index 0000000000000000000000000000000000000000..507f508961a2622b62029d2c9125f0fbc6eb34af GIT binary patch literal 617 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5`$3q|f;CtLC@5Xx z8c`CQpH@E=~8hiIbXoe`3sxeYZ1W|1&J%F)g5{lH`;e>l(4#; zYPGgKBF4Qu{NVfdYG=;ne>2`MD_%D{$SZNCvMU3VKm!Ad0s|w51BA)Jaa*s4t;EWI z1K7+Ti@Sa;GA3QF1d_zb;^UcpK8@wR6g~y7QAvz z-IH?R_17(VN49Z$aWLjD@Beo5@f8NoC-YY@m6R9Vdi`voy@&$`qrX?mH=daJX3pY; zHF05o+4P6b{?bp(9nW}f+&IU? z(6(+)1$&sTFvEwhx90xj>9DSUaeqOuz7|82xzSnE&!^6dE24V{$!{R0fCSJp(d@5( z)cPINk`&&$YEnnk;zf6+wNH(0?cbfhwrq}>gVo$)&nB7{KQ}-1p}J$fxgJ}y;~s`O z)-$($_Z$6r&mpv$!MN#K`4v%xmWC-t|F}LdGO)~Je)?%)mRWvsBj>E!_5T=;@PGI( z!;uxK&ii2d;r4Yd`+qO~8%8JuOD1H5V4RD b`Ivuyugd&Ab?vIaWWwO->gTe~DWM4fd+77s literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/Departmental/Service/servicewarmer.rsi/icon.png b/Resources/Textures/Floof/Clothing/Departmental/Service/servicewarmer.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..071fa3c0e20af3698b02cbce820e16aa04758574 GIT binary patch literal 361 zcmV-v0ha!WP)YAX9X8WNB|8RBvx=!KdMT0002= zNkl76n}1jRl}thW3DR z(wD=NE&!j6Pfp+0EGYU0qp^hU;%iMVI6OVmIJHNz$nhi%CFzSF&2aGyk d)B!`<0RWJQg29N)pp*ar002ovPDHLkV1i^=IEDZK delta 124 zcmV-?0E7SS0qy~iU;%lNVI6Qr9Wd&EQ3sIZfbZM>GjMt_;*x%`T=c(0QjV|1yqd!%+u} eI$+cRlmGx+V1mI!S=Jl?0000q9iy!t)x7$D3!rEHK(|;SRuHi zG$k`%AtXOP=iu^(H9%!;o-U3d5r>oi{Qqx%*n#O-AbXEh!WG8Fd=jMxRxr0sVcsQF z@_)MSjx!$XY)YLT)SRhjJFME{(tTNpYuy>+|L^y^Op9ooJ$v@U*VotcNGHn~zfhT* zvLst7A<*pa`lU;c7QDS>+GbzwZ_MYR6jH|Zv%dVk)Uk^>7Oxr*HeKRlVCWNQI@tYD RGZx^prw85kHQdb&7GAH-q>Q3i&Ro`NTx(YhW$*D-jy`njxgN@xNAmJCo* diff --git a/Resources/Textures/Floof/Clothing/Uniforms/captthong.rsi/inhand-left.png b/Resources/Textures/Floof/Clothing/Uniforms/captthong.rsi/inhand-left.png index bdbf35325f54089b6c158805e5ddc9220e737c5a..13c746ee51709be3e158a8218c42ec535e2ca84f 100644 GIT binary patch delta 150 zcmV;H0BQg80+RxeU@o3XL_t(|+U?rG4S+BR06@Bsn>d5BIfI+HP<{FGp-uWhjsY6D z2PJ{ldymS|k&zTBc*e4B{XF)TrKpj70el6Bh{%F4lJ6_P{TP7i0NHxLG=Qv4urz={ z2$7K%k)Q=Fz(jzIOH%*<005Z!3;f}30Dw6F0D#f}7oyP@kbcJS{Qv*}07*qoM6N<$ Ef~4<4!!08P`FB#q;EAHaKWlGOKoFf*X* zI+OHQ!~U89-g^rP;7Ze?1Yi*YkO&XL%)>E00000NkvXXu0mjfMhbP0l+XkKrF1xl delta 313 zcmbQp)XzL2zMfIa)5S5Q;?~<+Cwp5B1XwPtayTGyW>US$n`{N!xoTg7#{4> z+b7nb^3Kd-5_`cpNzXfPRaE&O>@}aXUEA`c5p#<`&y%-iUY{6zFW;E_&Epe;|7nR` g%q$8G<;;H=Ha1I5ICnACmH`MnUHx3vIVCg!0H`l`r~m)} diff --git a/Resources/Textures/Floof/Clothing/Uniforms/coderthong.rsi/icon.png b/Resources/Textures/Floof/Clothing/Uniforms/coderthong.rsi/icon.png index a248c12a1ef8e2a1f2cd3f2bdd5e308347b1a345..8d4bd07e769e68766c33b31567b3c0c116e1577d 100644 GIT binary patch delta 132 zcmV-~0DJ%U0rmlqU;%-VVI6pelmjkZIQL)Az=)Atd8&lK?xgwuUFRiYSaPFg_kWER zS4O%-!KDl5{`2q&Fv!TrKrFv@g@II`Q=A5NC(ZvaD<#A5_}LQ%Y#~CIL`Y7Yk7mPB m2aGyk)B&Ro7B71HJbVHSGBPp{%dcHwAl2s-r-9u`^Z(0A$uK;A_Jjdjh|nbw nk`w2n*>KbWqYfB#06G8wLfC=9Ib@=Q00000NkvXXu0mjfDxy0k diff --git a/Resources/Textures/Floof/Clothing/Uniforms/codervalidthong.rsi/icon.png b/Resources/Textures/Floof/Clothing/Uniforms/codervalidthong.rsi/icon.png index 47ca60df4bfd887b1437ffa9548957eee40a4476..0820047f4f6b3f2d5b23a2956ecba3e516e9db86 100644 GIT binary patch delta 144 zcmey!_>pl!X1y&}g8>iQg_M;G(qGJTJ=)#rE~u~e>eAly6$`xgG=(kYia(Z8`7=3m z>6C*E5b!~}p<_jHU-IjIp9Q+wveRase-xLlv-Z@V=lFRzcS-{#K6gMz)I=390J@5Y?pa3U>r>mdKI;Vst08kq~3jhEB delta 144 zcmey!_>pl!X1y+7g8>iQg=;-6a})QmafmC+v=$gL&G!$B8bg=d#Wzp$Pz3>NxrU diff --git a/Resources/Textures/Floof/Clothing/Uniforms/loinclothblack.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Floof/Clothing/Uniforms/loinclothblack.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..0d14beea01b32ed1778e44d3dbd10b1c3306ab9e GIT binary patch literal 384 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5`$3q|f;CtLC@5Xx z8c`CQpH@F!Z*Lh2H5mxB zK6DrM7nIfrDipL?7uV8t$mE&Gvd+1!#v(^jxc_cX)`F!Z*Lj$wI~R* zK2+y@s8e?A_xy$%m10iJw{tgkwp#dX{C8Qh`*@9HkK43+yYIzt1C7T5V#3eueE)l2 z&%OF6<4^hi2SQK0d6xc^KeusCalfHf%YtjOvetgesB`;g;K1Q%=yo;gYE&`%hEwuv z9-6i5y*1x4g#A3sFlkCqkf!UTJB({S%>>!e(EebuYlV6K-1El;u-FL_DpX|VCSUobC^z>f)syeRC#IM!O8GIm0=GT c^N0Aaj7J_b&W{)FNCU}wy85}Sb4q9e00HcSrT_o{ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/Uniforms/loinclothwhite.rsi/meta.json b/Resources/Textures/Floof/Clothing/Uniforms/loinclothwhite.rsi/meta.json index ef52845d5fa..0fb71d5a706 100644 --- a/Resources/Textures/Floof/Clothing/Uniforms/loinclothwhite.rsi/meta.json +++ b/Resources/Textures/Floof/Clothing/Uniforms/loinclothwhite.rsi/meta.json @@ -13,6 +13,10 @@ { "name": "equipped-INNERCLOTHING", "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 }, { "name": "inhand-left", diff --git a/Resources/Textures/Floof/Clothing/Uniforms/plainthong.rsi/icon.png b/Resources/Textures/Floof/Clothing/Uniforms/plainthong.rsi/icon.png index 7fcff5579aea108cf425cac8b447c471a89e648b..2b875eb6a5d0b116c1c218fd21ef7239f325ecfb 100644 GIT binary patch delta 129 zcmaFN_?U4*X4P)q0|p!{7Zw*TQ!o|%eg5I8(iuv5Cs;B)RManB47wvMf6`}-j$#7? z6Nf@WLpcXTN&%epCCu;U?bhn!_;N4xq+rzopr0N;N!f&c&j delta 129 zcmaFN_?U4*W|g+k0Rs+}3rCkMUm!L0_k3lpSig%BS=m}%*20@3j_iA=JhOAEDvN*v z10#gk!#E>y*Y1$t`+Xj0E)j~0Yn-`sRZ=$Z^En+HA&2bmI=r_n50w#=NIo%1c}?Hk fd=H?$JFl6JUTitI@!P+*3_#%N>gTe~DWM4fP&GA4 diff --git a/Resources/Textures/Floof/Clothing/Uniforms/reotasuit.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Floof/Clothing/Uniforms/reotasuit.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..7be4089034339b5bb9c7915bbcfad8c63474cc61 GIT binary patch literal 1364 zcmV-a1*`grP)YAX9X8WNB|8RBvx=!KdMT000Ev zNklK7cbmiuXQ&_dbd+mi2+G~ zwEnXJ*7IvLr{n+tl}4qn&|~{X*}PNZu?SlKSpe(#HM*2t#L?9;rczT60$jE(u`oH0 z{p!I;5uEz|=o%X0l01+PQvXQ+r+C-UP-#>k2tpr%w|UF5kW+GqOY+DN{72r~upgjn zXn|+KvjB2R4wXg)0GAQ0N_6roaUWv zCq{vAUwtAHC`kozNp=CchK5GF0o~LC*MAa#hy=Q+_Z{uHB;)An7z>m0?qBB=aX#n$ z-b(=d^}VyeI|H1fAGH3X0E=pYewbUr-<5qF)DHUq0JzONgK+@--y0U-zWV7z8kwXr z08no?(Cjn=*AM(Vz_}pZckv197U->?PNXp=jScL(HEvyiP=5${ugK0dVAy-`FaU|M z1Vll+cYo*r9LG^bQIO4Mp{go={B{#xe6xjGt%ho~ibkUWN@-{SnM{TPKsK92wOV!a z-tBt59v;Bz>MBhn67IIH>mY=<+nT1KTrP(OP%4$EVHn;60`K@GNeWy)5J0I^qOvTz z%^QXRNs?TIC;)h#N3Yid09cjpE=PcJn;XgAfuKfGCR4_5bhr zgb4x3|aL zmtzk_82|%d01SWuFaQR?02lxRU;qqY)Bu}>4XWuHOsj`f`~v{PFHU%AI143O-G3ko zF~~#?JeI%!E7NbN-qXQzcMl_pC}CxK8Q=fDKy7MabKzq*_xAXY$Pv8FZ_Iz>=C_W11J4P8UdIIjSebr9i?gc$fR@(6(d7vi zrt+|C3#ZrTFM1CcBo@^Iotv0}zzgmeQgR9auzj`@XchzpSX2ujB0>3V2LMp|59G3S zg`anSi3H%Yl~3tZY7zkY#-W=!4r+(t0?cHlk&;s=pY32eokKb??(QG;(wL{32Y_bh z1{ci=O0%nIX)T=BFTw>dtsXK-1@(3V`H4C3Jm*for~z793${&ha((KKNfct?132&A z0U$py=gxwt0h*l~oLrv*fIFs80gAILR5uOeC+7O{vNQ%Fl1Kq`Q-@~U_U${lJ_Qja zY@h9h2cV|ZfxL4XL+` z!vg^BUPXJuSu=2Ra}%ieFi|WP>G=5FHK)_*^zCzAn}-Gf+%1yeIL<|gviZjlhG~B2 z{|1Z2B8|mjuhRTO2)$l!s4*~rmjalkiEg+1Dgg0#9HJ<`9)KiC=ytn9oqMAIpp+t! zNWd_R*8xZ-lV~=ZuL__j3fk><^Z?#%!!WSFzaJ^U($W%@B&jbK8Nhq}OppP*WAQIo W*qpt4l0>oq0000@P)YAX9X8WNB|8RBvx=!KdMT0004T zNklZ-YQqb4A9Q5lOl zU5!K`jZI=osk4!DoZ zj^KqJG)>DOcEgh-fiMN?x=|QW2p~)WFZ2N5AOHZ={F4FsZ~(|3g$h@-8buKY0sM+X ze#*>l>$-vEW`%CElRniEsd>BWjt2Ct9^HrmUcDLS!6E|ykcI=u0P^e3`W;Z$O(9hH zF<0;;fC|jlr2-gZWSS;y+lFOXczl@P?tY3O2;loZ!Y~98l?NCOhty~^(ppLh&Uso# zQ3Tg@%L6!$Lxy3b;c*;8*Yy-}F@Tg3+wC^(*J?Fz&MyyeU6(nILlxkE0d{Kz$oHzh c;y(rW0_4-E&<9Suv;Y7A07*qoM6N<$g5%xDwEzGB literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/Uniforms/reotasuit.rsi/inhand-left.png b/Resources/Textures/Floof/Clothing/Uniforms/reotasuit.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..c4cc60dcb3e47d5483bf623ef16266fd90407181 GIT binary patch literal 706 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5he4R}c>anMprCY# zYeY$Kep*R+Vo@rCb81d;WwAnVNoh)EzCuWTe$K(=4{I10n0!55978H@y}fxq`*MH? z`-k_cw$LYrCiRt)o$*Z^SR{xPW|UKJEj+K2sEgjKE_|}zjtih&?0=kH8r~62WOtN z=$i=JH+6TDBb(BGi2_akxO;Al|L<>;SQ!%jHnK zQQ4Tr7O?ti%c4K~)-Ars(dxvwN#}5B?2Kh6&qxKs|$UZ84p1Y4>pS8V# zg`LIc^OttAJ+Nzk{a5BW+i~`vOcJ}CT`tc5y5I2rQ|1M6>$w>UWYXtwH!mdKI;Vst0BcDcDgXcg literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/Uniforms/reotasuit.rsi/inhand-right.png b/Resources/Textures/Floof/Clothing/Uniforms/reotasuit.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..cead6d9649a006e58e3092faca602271318cfa86 GIT binary patch literal 715 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5he4R}c>anMprCY# zYeY$Kep*R+Vo@rCb81d;WwAnVNoh)EzCuWTe$K(=4{I10n8G|=978H@y}cQqeK|nl z_{aPeW?P)R6PGgHyux+sT&@z=QSHPt+6TWs?*7=yk=*f%?N(Iu^52(BH?5GqI8ATf zwwE8Bf>v$4y!3(5XPa9XF#VUC~t zSR-b|U)dPZ6E9sg@A&I$vo9#JoV6BB$W0ApzR_o!_2B&4a5E=%0h9ME2QK|tbnf}O zjeiTlS$s}F_D#_MfU3L22vq>{$OmpPk6{hAjKAzY8 z_D0E7!|Q8pqQ9A0&oArUT=y;gWc4GxgjAhB;-`NUMwB-yR4!+dXj^DJlV@j4->=K< zHWfk3qSijL;EQ^Fff3|^1ra*0Tpk_&eC1_H$MMHAmUX_~b>;O}klb%~hNU8h9||XfyCG_A+KRjKmi~;{YOndZn_KJOvA}ejJ${Xt6FmJhQc0OBw zG3$q=zo%ZiSeH>Z;a@Pr)$kpA^B3;~^0zSD%A5W0!}IL8EAg((3qrIq8}hbW&ywb0 zGm+}eU=ZPAo$I&!qaa%|qeBV9F~ORK&wG9xU^tmFDQ>;EFT+m>AqK`D>t9(<@2Z_| Ud}YN(U_xZ@boFyt=akR{0A=hx*8l(j literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/Uniforms/reotasuit.rsi/meta.json b/Resources/Textures/Floof/Clothing/Uniforms/reotasuit.rsi/meta.json new file mode 100644 index 00000000000..ef52845d5fa --- /dev/null +++ b/Resources/Textures/Floof/Clothing/Uniforms/reotasuit.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprited by Dakota Haven", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Floof/Clothing/Uniforms/stripethongpurple.rsi/icon.png b/Resources/Textures/Floof/Clothing/Uniforms/stripethongpurple.rsi/icon.png index c4c26636d55bbf9f62026d3c7905db601f0451a9..a59972e2e73bb9ddd95e301e7511a84e5b945ebe 100644 GIT binary patch delta 89 zcmaFM_?B_P>>vkDhfv$4N49?TS2HNPxZU{E=7&t00000NkvXXu0mjf5IrHz diff --git a/Resources/Textures/Floof/Clothing/Uniforms/stripethongrainbow.rsi/icon.png b/Resources/Textures/Floof/Clothing/Uniforms/stripethongrainbow.rsi/icon.png index 805bd054665e5101446a57a1b9b672ea2297dcab..c06c4e77e23d65b8ea0a63b44b7633495f69d0bb 100644 GIT binary patch delta 138 zcmV;50CoTU0sH}wU;&4bVI6*klmql;ul;{1HJFiHd8&kfp5fa6m(F8af=iqxQBbb8 z_P?+!HvspKiFC^;N(1Xn^8WM4iZFb6{DvX$%p}GENrW028vk$H sxWPD@4M!a?>VQ!Pj5=V{0YlmW04ZmL!I3+1;{X5v07*qoM6N<$f_wcx^8f$< delta 139 zcmV;60CfNS0sR4xU;&7cVI6-)9Wd&EQ3sIX0KM63|6fWCW+YdhDj}d}xc2|0^O%<4 z5~oQNl?A= z-S5J3uf~aikww6PfpI_6jL0q5RDSPY!u(EdYuL=S_C`#`+@VLqxV{-)s6Kx6$@cOG sK0M{_YCk8bo;foo-2<%ez;gz6-QO(-UkJTpV*mnAS3g#lbxsLQ0NrdjS^xk5 delta 139 zcmaFD_?U4*LVcd6i(^Q{;kTC+r4A@?us(1vT)shY$Nx+Y6MsW)ZSQ3-?`;3n5%iB; zV`itlH-|z40~3Up!8jvw*X}jnw)-e31%*C+`CDDvVDp--k2F}*-)F2%H2e8ldWW#G p(uPSjrv=x&nR9;vP@}|aruUUC2Y==?K4Aa?Pgg$|mUT`EO#m<=I}-o^ From d1ebc457e057c7c271e8910f05c70ece36dde2ab Mon Sep 17 00:00:00 2001 From: ShatteredSwords <135023515+ShatteredSwords@users.noreply.github.com> Date: Sat, 17 Aug 2024 12:59:08 -0400 Subject: [PATCH 26/38] I ate the file, it tasted like paper --- Resources/Prototypes/Floof/Entities/Objects/Fun/toys.yml | 1 - 1 file changed, 1 deletion(-) delete mode 100644 Resources/Prototypes/Floof/Entities/Objects/Fun/toys.yml diff --git a/Resources/Prototypes/Floof/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Floof/Entities/Objects/Fun/toys.yml deleted file mode 100644 index 8b137891791..00000000000 --- a/Resources/Prototypes/Floof/Entities/Objects/Fun/toys.yml +++ /dev/null @@ -1 +0,0 @@ - From 92c4d5f0dd1c27d3f7a01f771049798a0963fca9 Mon Sep 17 00:00:00 2001 From: Dakota Haven Date: Sat, 17 Aug 2024 11:20:20 -0600 Subject: [PATCH 27/38] Signed-off-by: Dakota Haven --- .../Entities/Structures/Machines/lathe.yml | 44 ++++ .../Floof/Loadouts/departmentalloadouts.yml | 57 +++++ .../Prototypes/Floof/Loadouts/sockect.yml | 71 ++++++ .../Floof/Recipes/Lathes/sockoutfits.yml | 89 +++++++ .../Floof/Recipes/Lathes/uniformssocksect.yml | 231 ++++++++++++++++++ 5 files changed, 492 insertions(+) create mode 100644 Resources/Prototypes/Floof/Loadouts/sockect.yml create mode 100644 Resources/Prototypes/Floof/Recipes/Lathes/sockoutfits.yml create mode 100644 Resources/Prototypes/Floof/Recipes/Lathes/uniformssocksect.yml diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 46251740b22..a42fb14d31f 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -1144,6 +1144,50 @@ - CarpetWhite # Floofstation - Collars - ClothingNeckCollarCmd + # Floofstation - Socks, Armwarmers ect + - ClothingHandsPlainWarmers + - ClothingUnderSocksPlain + - ClothingUniformThongPlain + - ClothingHandsStripeRainbowWarmers + - ClothingUnderSocksStripedRainbow + - ClothingUniformStripedThongRainbow + - ClothingHandsStripePurpleWarmers + - ClothingUnderSocksStripedPurple + - ClothingUniformStripedThongPurple + - ClothingHandsStripeWhiteWarmers + - ClothingUnderSocksStripedWhite + - ClothingUniformStripedThongWhite + # Floofstation - Department Socks, Armwarmers ect + - ClothingHandsCaptainWarmers + - ClothingUnderSocksCaptain + - ClothingUniformCaptainThong + - ClothingHandsCommandWarmers + - ClothingUnderSocksCommand + - ClothingUniformCommandThong + - ClothingHandsEngiWarmers + - ClothingUnderSocksEngi + - ClothingUniformEngiThong + - ClothingHandsEpiWarmers + - ClothingUnderSocksEpi + - ClothingUniformEpiThong + - ClothingHandsChaplainWarmers + - ClothingUnderSocksChaplain + - ClothingUniformChaplainThong + - ClothingHandsLogisWarmers + - ClothingUnderSocksLogis + - ClothingUniformLogisThong + - ClothingHandsMedicWarmers + - ClothingUnderSocksMedic + - ClothingUniformMedicThong + - ClothingHandsSecurityWarmers + - ClothingUnderSocksSecurity + - ClothingUniformSecurityThong + - ClothingHandsServiceWarmers + - ClothingUnderSocksService + - ClothingUniformServiceThong + - ClothingHandsJanitorWarmers + - ClothingUnderSocksJanitor + - ClothingUniformJanitorThong - type: EmagLatheRecipes emagStaticRecipes: - ClothingHeadHatCentcomcap diff --git a/Resources/Prototypes/Floof/Loadouts/departmentalloadouts.yml b/Resources/Prototypes/Floof/Loadouts/departmentalloadouts.yml index 198da9ad7a5..9c47dcc57f5 100644 --- a/Resources/Prototypes/Floof/Loadouts/departmentalloadouts.yml +++ b/Resources/Prototypes/Floof/Loadouts/departmentalloadouts.yml @@ -139,6 +139,8 @@ - AtmosphericTechnician - ChiefEngineer +#TO BE ADDED - ChiefEngineer + #Epistemics Outfits # #General Epistemics @@ -236,6 +238,8 @@ jobs: - Chaplain +#TO BE ADDED - ResearchDirector + #Logistics Outfits # #General Logistics @@ -275,6 +279,8 @@ jobs: - CargoTechnician +#TO BE ADDED - Quartermaster + #Medical Outfits # #General Medical @@ -326,6 +332,9 @@ - MedicalIntern - Chemist +#TO BE ADDED - Chemist +#TO BE ADDED - ChiefMedicalOfficer + #Security Outfits # #General Security @@ -377,6 +386,9 @@ - Detective - HeadOfSecurity +#TO BE ADDED - Detective +#TO BE ADDED - HeadOfSecurity + #Service Outfits # #General Service @@ -431,6 +443,10 @@ - Chef - ServiceWorker +#TO BE ADDED - Bartender +#TO BE ADDED - Chef +#TO BE ADDED - Musician + #Janitorial - type: loadout id: LoadoutClothingHandsJanitorWarmers @@ -467,3 +483,44 @@ - !type:CharacterJobRequirement jobs: - Janitor + +# Misc +# Mime + +- type: loadout + id: LoadoutClothingHandsStripeWhiteWarmers + category: Jobs + cost: 2 + exclusive: true + items: + - ClothingHandsStripeWhiteWarmers + requirements: + - !type:CharacterJobRequirement + jobs: + - Mime + +- type: loadout + id: LoadoutClothingUnderSocksStripedWhite + category: Jobs + cost: 2 + exclusive: true + items: + - ClothingUnderSocksStripedWhite + requirements: + - !type:CharacterJobRequirement + jobs: + - Mime + +- type: loadout + id: LoadoutClothingUniformStripedThongWhite + category: Jobs + cost: 2 + exclusive: true + items: + - ClothingClothingUniformStripedThongWhite + requirements: + - !type:CharacterJobRequirement + jobs: + - Mime + +#TO BE ADDED - Clown diff --git a/Resources/Prototypes/Floof/Loadouts/sockect.yml b/Resources/Prototypes/Floof/Loadouts/sockect.yml new file mode 100644 index 00000000000..f2c7fcde1aa --- /dev/null +++ b/Resources/Prototypes/Floof/Loadouts/sockect.yml @@ -0,0 +1,71 @@ +#Plain Outfit +- type: loadout + id: LoadoutClothingHandsPlainWarmers + category: Hands + cost: 1 + exclusive: true + items: + - ClothingHandsPlainWarmers + +- type: loadout + id: LoadoutClothingUnderSocksPlain + category: Shoes + cost: 1 + exclusive: true + items: + - ClothingUnderSocksPlain + +- type: loadout + id: LoadoutClothingUniformThongPlain + category: Uniform + exclusive: true + items: + - ClothingUniformThongPlain + +#Striped Purple Outfit +- type: loadout + id: LoadoutClothingHandsStripePurpleWarmers + category: Hands + cost: 1 + exclusive: true + items: + - ClothingHandsStripePurpleWarmers + +- type: loadout + id: LoadoutClothingUnderSocksStripedPurple + category: Shoes + cost: 1 + exclusive: true + items: + - ClothingUnderSocksStripedPurple + +- type: loadout + id: LoadoutClothingUniformStripedThongPurple + category: Uniform + exclusive: true + items: + - ClothingUniformStripedThongPurple + +#Striped Purple Outfit +- type: loadout + id: LoadoutClothingHandsStripeRainbowWarmers + category: Hands + cost: 1 + exclusive: true + items: + - ClothingHandsStripeRainbowWarmers + +- type: loadout + id: LoadoutClothingUnderSocksStripedRainbow + category: Shoes + cost: 1 + exclusive: true + items: + - ClothingUnderSocksStripedRainbow + +- type: loadout + id: LoadoutClothingUniformStripedThongRainbow + category: Uniform + exclusive: true + items: + - ClothingUniformStripedThongRainbow diff --git a/Resources/Prototypes/Floof/Recipes/Lathes/sockoutfits.yml b/Resources/Prototypes/Floof/Recipes/Lathes/sockoutfits.yml new file mode 100644 index 00000000000..aa4bc5d0b07 --- /dev/null +++ b/Resources/Prototypes/Floof/Recipes/Lathes/sockoutfits.yml @@ -0,0 +1,89 @@ +#Arm-Warmers + +- type: latheRecipe + id: ClothingHandsPlainWarmers + result: ClothingHandsPlainWarmers + completetime: 2 + materials: + Cloth: 200 + +- type: latheRecipe + id: ClothingHandsStripeRainbowWarmers + result: ClothingHandsStripeRainbowWarmers + completetime: 2 + materials: + Cloth: 200 + +- type: latheRecipe + id: ClothingHandsStripePurpleWarmers + result: ClothingHandsStripePurpleWarmers + completetime: 2 + materials: + Cloth: 200 + +- type: latheRecipe + id: ClothingHandsStripeWhiteWarmers + result: ClothingHandsStripeWhiteWarmers + completetime: 2 + materials: + Cloth: 200 + +#Socks + +- type: latheRecipe + id: ClothingUnderSocksPlain + result: ClothingUnderSocksPlain + completetime: 2 + materials: + Cloth: 200 + +- type: latheRecipe + id: ClothingUnderSocksStripedRainbow + result: ClothingUnderSocksStripedRainbow + completetime: 2 + materials: + Cloth: 200 + +- type: latheRecipe + id: ClothingUnderSocksStripedPurple + result: ClothingUnderSocksStripedPurple + completetime: 2 + materials: + Cloth: 200 + +- type: latheRecipe + id: ClothingUnderSocksStripedWhite + result: ClothingUnderSocksStripedWhite + completetime: 2 + materials: + Cloth: 200 + +#Thongs + +- type: latheRecipe + id: ClothingUniformThongPlain + result: ClothingUniformThongPlain + completetime: 2 + materials: + Cloth: 200 + +- type: latheRecipe + id: ClothingUniformStripedThongRainbow + result: ClothingUniformStripedThongRainbow + completetime: 2 + materials: + Cloth: 200 + +- type: latheRecipe + id: ClothingUniformStripedThongPurple + result: ClothingUniformStripedThongPurple + completetime: 2 + materials: + Cloth: 200 + +- type: latheRecipe + id: ClothingUniformStripedThongWhite + result: ClothingUniformStripedThongWhite + completetime: 2 + materials: + Cloth: 200 diff --git a/Resources/Prototypes/Floof/Recipes/Lathes/uniformssocksect.yml b/Resources/Prototypes/Floof/Recipes/Lathes/uniformssocksect.yml new file mode 100644 index 00000000000..5b21d142033 --- /dev/null +++ b/Resources/Prototypes/Floof/Recipes/Lathes/uniformssocksect.yml @@ -0,0 +1,231 @@ +#Captain + +- type: latheRecipe + id: ClothingHandsCaptainWarmers + result: ClothingHandsCaptainWarmers + completetime: 2 + materials: + Cloth: 300 + Durathread: 100 + +- type: latheRecipe + id: ClothingUnderSocksCaptain + result: ClothingUnderSocksCaptain + completetime: 2 + materials: + Cloth: 300 + Durathread: 100 + +- type: latheRecipe + id: ClothingUniformCaptainThong + result: ClothingUniformCaptainThong + completetime: 2 + materials: + Cloth: 100 + Durathread: 100 + +#Command + +- type: latheRecipe + id: ClothingHandsCommandWarmers + result: ClothingHandsCommandWarmers + completetime: 2 + materials: + Cloth: 300 + Durathread: 100 + +- type: latheRecipe + id: ClothingUnderSocksCommand + result: ClothingUnderSocksCommand + completetime: 2 + materials: + Cloth: 300 + Durathread: 100 + +- type: latheRecipe + id: ClothingUniformCommandThong + result: ClothingUniformCommandThong + completetime: 2 + materials: + Cloth: 100 + Durathread: 100 + +#Engineering + +- type: latheRecipe + id: ClothingHandsEngiWarmers + result: ClothingHandsEngiWarmers + completetime: 2 + materials: + Cloth: 300 + +- type: latheRecipe + id: ClothingUnderSocksEngi + result: ClothingUnderSocksEngi + completetime: 2 + materials: + Cloth: 300 + +- type: latheRecipe + id: ClothingUniformEngiThong + result: ClothingUniformEngiThong + completetime: 2 + materials: + Cloth: 100 + +#Epistemics +- type: latheRecipe + id: ClothingHandsEpiWarmers + result: ClothingHandsEpiWarmers + completetime: 2 + materials: + Cloth: 300 + +- type: latheRecipe + id: ClothingUnderSocksEpi + result: ClothingUnderSocksEpi + completetime: 2 + materials: + Cloth: 300 + +- type: latheRecipe + id: ClothingUniformEpiThong + result: ClothingUniformEpiThong + completetime: 2 + materials: + Cloth: 100 + +#Chaplain +- type: latheRecipe + id: ClothingHandsChaplainWarmers + result: ClothingHandsChaplainWarmers + completetime: 2 + materials: + Cloth: 300 + +- type: latheRecipe + id: ClothingUnderSocksChaplain + result: ClothingUnderSocksChaplain + completetime: 2 + materials: + Cloth: 300 + +- type: latheRecipe + id: ClothingUniformChaplainThong + result: ClothingUniformChaplainThong + completetime: 2 + materials: + Cloth: 100 + +#Logistics +- type: latheRecipe + id: ClothingHandsLogisWarmers + result: ClothingHandsLogisWarmers + completetime: 2 + materials: + Cloth: 300 + +- type: latheRecipe + id: ClothingUnderSocksLogis + result: ClothingUnderSocksLogis + completetime: 2 + materials: + Cloth: 300 + +- type: latheRecipe + id: ClothingUniformLogisThong + result: ClothingUniformLogisThong + completetime: 2 + materials: + Cloth: 100 + +#Medical +- type: latheRecipe + id: ClothingHandsMedicWarmers + result: ClothingHandsMedicWarmers + completetime: 2 + materials: + Cloth: 300 + +- type: latheRecipe + id: ClothingUnderSocksMedic + result: ClothingUnderSocksMedic + completetime: 2 + materials: + Cloth: 300 + +- type: latheRecipe + id: ClothingUniformMedicThong + result: ClothingUniformMedicThong + completetime: 2 + materials: + Cloth: 100 + +#Security +- type: latheRecipe + id: ClothingHandsSecurityWarmers + result: ClothingHandsSecurityWarmers + completetime: 2 + materials: + Cloth: 200 + Durathread: 100 + +- type: latheRecipe + id: ClothingUnderSocksSecurity + result: ClothingUnderSocksSecurity + completetime: 2 + materials: + Cloth: 200 + Durathread: 100 + +- type: latheRecipe + id: ClothingUniformSecurityThong + result: ClothingUniformSecurityThong + completetime: 2 + materials: + Cloth: 100 + Durathread: 50 + +#Service +- type: latheRecipe + id: ClothingHandsServiceWarmers + result: ClothingHandsServiceWarmers + completetime: 2 + materials: + Cloth: 300 + +- type: latheRecipe + id: ClothingUnderSocksService + result: ClothingUnderSocksService + completetime: 2 + materials: + Cloth: 300 + +- type: latheRecipe + id: ClothingUniformServiceThong + result: ClothingUniformServiceThong + completetime: 2 + materials: + Cloth: 100 + +#Janitor +- type: latheRecipe + id: ClothingHandsJanitorWarmers + result: ClothingHandsJanitorWarmers + completetime: 2 + materials: + Cloth: 300 + +- type: latheRecipe + id: ClothingUnderSocksJanitor + result: ClothingUnderSocksJanitor + completetime: 2 + materials: + Cloth: 300 + +- type: latheRecipe + id: ClothingUniformJanitorThong + result: ClothingUniformJanitorThong + completetime: 2 + materials: + Cloth: 100 From 6210c0b42c3406cf0175b11947e4ff1c2792ecd0 Mon Sep 17 00:00:00 2001 From: Dakota Haven Date: Sat, 17 Aug 2024 13:48:50 -0600 Subject: [PATCH 28/38] - Fixed Meta file Copyright - Removed added locker inventory - Added the Skirt tag to loincloths - Renamed uniform and hood to make it generic Signed-off-by: Dakota Haven --- .../Catalog/Fills/Lockers/heads.yml | 6 ---- .../Floof/Entities/Clothing/Head/misc.yml | 2 +- .../Clothing/OuterClothing/MiscOuterwear.yml | 2 +- .../Floof/Entities/Clothing/Uniforms/misc.yml | 11 ++++++++ .../Floof/Loadouts/departmentalloadouts.yml | 2 ++ .../Command/captsocks.rsi/meta.json | 2 +- .../Command/captthong.rsi/meta.json | 2 +- .../Command/captwarmer.rsi/meta.json | 2 +- .../Command/commandsocks.rsi/meta.json | 2 +- .../Command/commandthong.rsi/meta.json | 2 +- .../Command/commandwarmer.rsi/meta.json | 2 +- .../Engineering/engisocks.rsi/meta.json | 2 +- .../Engineering/engithong.rsi/meta.json | 2 +- .../Engineering/engiwarmer.rsi/meta.json | 2 +- .../Epistemics/chaplainmantle.rsi/meta.json | 2 +- .../chaplainmantlehood.rsi/meta.json | 2 +- .../Epistemics/chaplainsocks.rsi/meta.json | 2 +- .../Epistemics/chaplainthong.rsi/meta.json | 2 +- .../Epistemics/chaplainwarmer.rsi/meta.json | 2 +- .../Epistemics/episocks.rsi/meta.json | 2 +- .../Epistemics/epithong.rsi/meta.json | 2 +- .../Epistemics/epiwarmer.rsi/meta.json | 2 +- .../Logistics/logisocks.rsi/meta.json | 2 +- .../Logistics/logithong.rsi/meta.json | 2 +- .../Logistics/logiwarmer.rsi/meta.json | 2 +- .../Medical/medicalsocks.rsi/meta.json | 2 +- .../Medical/medicalthong.rsi/meta.json | 2 +- .../Medical/medicalwarmer.rsi/meta.json | 2 +- .../Security/secsocks.rsi/meta.json | 2 +- .../Security/secthong.rsi/meta.json | 2 +- .../Security/secwarmer.rsi/meta.json | 2 +- .../Service/janitorsocks.rsi/meta.json | 2 +- .../Service/janitorthong.rsi/meta.json | 2 +- .../Service/janitorwarmer.rsi/meta.json | 2 +- .../Service/servicesocks.rsi/meta.json | 2 +- .../Service/servicethong.rsi/meta.json | 2 +- .../Service/servicewarmer.rsi/meta.json | 2 +- .../hoodmarshoodie.rsi/equipped-HELMET.png | Bin 1036 -> 994 bytes .../Head/hoodmarshoodie.rsi/meta.json | 2 +- .../Head/sexcompcirclet.rsi/meta.json | 2 +- .../Misc/beltedouterwear.rsi/meta.json | 2 +- .../Misc/marshoodie.rsi/meta.json | 2 +- .../Misc/sexcompbeltbronze.rsi/meta.json | 2 +- .../Misc/sexcompbeltgold.rsi/meta.json | 2 +- .../Misc/sexcompbeltsilver.rsi/meta.json | 2 +- .../equipped-OUTERCLOTHING.png | Bin 0 -> 1221 bytes .../Misc/transparentouterwear.rsi/icon.png | Bin 0 -> 542 bytes .../Misc/transparentouterwear.rsi}/meta.json | 6 ++-- .../Under/Gloves/beewarmer.rsi/meta.json | 2 +- .../Gloves/captwarmer.rsi/equipped-HAND.png | Bin 569 -> 0 bytes .../Under/Gloves/captwarmer.rsi/icon.png | Bin 297 -> 0 bytes .../Under/Gloves/captwarmer.rsi/meta.json | 18 ------------ .../Gloves/codervalidwarmer.rsi/meta.json | 2 +- .../Under/Gloves/coderwarmer.rsi/meta.json | 2 +- .../Gloves/sexcompbluegloves.rsi/meta.json | 2 +- .../Gloves/sexcompredgloves.rsi/meta.json | 2 +- .../Gloves/stripewarmerpurple.rsi/meta.json | 2 +- .../Gloves/stripewarmerrainbow.rsi/meta.json | 2 +- .../Gloves/stripewarmerwhite.rsi/meta.json | 2 +- .../Socks/captsocks.rsi/equipped-FEET.png | Bin 656 -> 0 bytes .../Under/Socks/captsocks.rsi/icon.png | Bin 292 -> 0 bytes .../Under/Socks/captsocks.rsi/meta.json | 18 ------------ .../Under/Socks/plainsocks.rsi/meta.json | 2 +- .../Socks/sexcompblueboots.rsi/meta.json | 2 +- .../Under/Socks/sexcompredboots.rsi/meta.json | 2 +- .../Socks/stripesockspurple.rsi/meta.json | 2 +- .../Socks/stripesocksrainbow.rsi/meta.json | 2 +- .../Socks/stripesockswhite.rsi/meta.json | 2 +- .../Clothing/Uniforms/beethong.rsi/icon.png | Bin 237 -> 238 bytes .../Clothing/Uniforms/beethong.rsi/meta.json | 2 +- .../captthong.rsi/equipped-INNERCLOTHING.png | Bin 413 -> 0 bytes .../Clothing/Uniforms/captthong.rsi/icon.png | Bin 251 -> 0 bytes .../Uniforms/captthong.rsi/inhand-left.png | Bin 275 -> 0 bytes .../Uniforms/captthong.rsi/inhand-right.png | Bin 273 -> 0 bytes .../Clothing/Uniforms/coderthong.rsi/icon.png | Bin 246 -> 247 bytes .../Uniforms/coderthong.rsi/meta.json | 2 +- .../Uniforms/codervalidthong.rsi/icon.png | Bin 241 -> 241 bytes .../Uniforms/codervalidthong.rsi/meta.json | 2 +- .../Uniforms/loinclothblack.rsi/meta.json | 6 +--- .../Uniforms/loinclothwhite.rsi/meta.json | 6 +--- .../Clothing/Uniforms/plainthong.rsi/icon.png | Bin 227 -> 227 bytes .../Uniforms/plainthong.rsi/meta.json | 2 +- .../equipped-INNERCLOTHING.png | Bin 437 -> 0 bytes .../Uniforms/plainthongbra.rsi/icon.png | Bin 263 -> 0 bytes .../plainthongbra.rsi/inhand-left.png | Bin 371 -> 0 bytes .../plainthongbra.rsi/inhand-right.png | Bin 399 -> 0 bytes .../Uniforms/plainthongbra.rsi/meta.json | 26 ------------------ .../Clothing/Uniforms/reotasuit.rsi/meta.json | 2 +- .../Uniforms/sexcompblue.rsi/meta.json | 2 +- .../Uniforms/sexcompred.rsi/meta.json | 2 +- .../Uniforms/stripethongpurple.rsi/icon.png | Bin 237 -> 237 bytes .../Uniforms/stripethongpurple.rsi/meta.json | 2 +- .../Uniforms/stripethongrainbow.rsi/icon.png | Bin 252 -> 253 bytes .../Uniforms/stripethongrainbow.rsi/meta.json | 2 +- .../Uniforms/stripethongwhite.rsi/icon.png | Bin 228 -> 227 bytes .../Uniforms/stripethongwhite.rsi/meta.json | 2 +- 96 files changed, 83 insertions(+), 146 deletions(-) create mode 100644 Resources/Textures/Floof/Clothing/OuterClothing/Misc/transparentouterwear.rsi/equipped-OUTERCLOTHING.png create mode 100644 Resources/Textures/Floof/Clothing/OuterClothing/Misc/transparentouterwear.rsi/icon.png rename Resources/Textures/Floof/Clothing/{Uniforms/captthong.rsi => OuterClothing/Misc/transparentouterwear.rsi}/meta.json (72%) delete mode 100644 Resources/Textures/Floof/Clothing/Under/Gloves/captwarmer.rsi/equipped-HAND.png delete mode 100644 Resources/Textures/Floof/Clothing/Under/Gloves/captwarmer.rsi/icon.png delete mode 100644 Resources/Textures/Floof/Clothing/Under/Gloves/captwarmer.rsi/meta.json delete mode 100644 Resources/Textures/Floof/Clothing/Under/Socks/captsocks.rsi/equipped-FEET.png delete mode 100644 Resources/Textures/Floof/Clothing/Under/Socks/captsocks.rsi/icon.png delete mode 100644 Resources/Textures/Floof/Clothing/Under/Socks/captsocks.rsi/meta.json delete mode 100644 Resources/Textures/Floof/Clothing/Uniforms/captthong.rsi/equipped-INNERCLOTHING.png delete mode 100644 Resources/Textures/Floof/Clothing/Uniforms/captthong.rsi/icon.png delete mode 100644 Resources/Textures/Floof/Clothing/Uniforms/captthong.rsi/inhand-left.png delete mode 100644 Resources/Textures/Floof/Clothing/Uniforms/captthong.rsi/inhand-right.png delete mode 100644 Resources/Textures/Floof/Clothing/Uniforms/plainthongbra.rsi/equipped-INNERCLOTHING.png delete mode 100644 Resources/Textures/Floof/Clothing/Uniforms/plainthongbra.rsi/icon.png delete mode 100644 Resources/Textures/Floof/Clothing/Uniforms/plainthongbra.rsi/inhand-left.png delete mode 100644 Resources/Textures/Floof/Clothing/Uniforms/plainthongbra.rsi/inhand-right.png delete mode 100644 Resources/Textures/Floof/Clothing/Uniforms/plainthongbra.rsi/meta.json diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml index 5b937516c6f..4db37d5f7a8 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml @@ -63,9 +63,6 @@ contents: - id: ClothingOuterArmorCaptainCarapace - id: ClothingLongcoatCap # Floofstation - - id: ClothingHandsCaptainWarmers # Floofstation - - id: ClothingUnderSocksCaptain # Floofstation - - id: ClothingUniformCaptainThong # Floofstation - id: NukeDisk - id: PinpointerNuclear # - id: CaptainIDCard # DeltaV - Replaced by the spare ID system @@ -125,9 +122,6 @@ contents: - id: HoPIDCard - id: ClothingLongcoatHoP # Floofstation - - id: ClothingHandsCommandWarmers # Floofstation - - id: ClothingUnderSocksCommand # Floofstation - - id: ClothingUniformCommandThong # Floofstation - id: ClothingHeadsetAltService # DeltaV - HoP is now a service role, replaces their all channels headset. - id: BoxPDA - id: BoxID diff --git a/Resources/Prototypes/Floof/Entities/Clothing/Head/misc.yml b/Resources/Prototypes/Floof/Entities/Clothing/Head/misc.yml index 6c5822a89df..13416d334cf 100644 --- a/Resources/Prototypes/Floof/Entities/Clothing/Head/misc.yml +++ b/Resources/Prototypes/Floof/Entities/Clothing/Head/misc.yml @@ -35,7 +35,7 @@ parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodMarsHoodieHood noSpawn: true - name: mars hoodie hood + name: pink hoodie hood components: - type: Sprite sprite: Floof/Clothing/Head/hoodmarshoodie.rsi diff --git a/Resources/Prototypes/Floof/Entities/Clothing/OuterClothing/MiscOuterwear.yml b/Resources/Prototypes/Floof/Entities/Clothing/OuterClothing/MiscOuterwear.yml index c6da36e2c3a..695c78b167a 100644 --- a/Resources/Prototypes/Floof/Entities/Clothing/OuterClothing/MiscOuterwear.yml +++ b/Resources/Prototypes/Floof/Entities/Clothing/OuterClothing/MiscOuterwear.yml @@ -45,7 +45,7 @@ - type: entity parent: ClothingOuterWinterCoatToggleable id: ClothingOuterMarsHoodie - name: mars pink hoodie + name: pink hoodie components: - type: Sprite sprite: Floof/Clothing/OuterClothing/Misc/marshoodie.rsi diff --git a/Resources/Prototypes/Floof/Entities/Clothing/Uniforms/misc.yml b/Resources/Prototypes/Floof/Entities/Clothing/Uniforms/misc.yml index 044db308312..118be1b2ddd 100644 --- a/Resources/Prototypes/Floof/Entities/Clothing/Uniforms/misc.yml +++ b/Resources/Prototypes/Floof/Entities/Clothing/Uniforms/misc.yml @@ -12,6 +12,9 @@ sprite: Floof/Clothing/Uniforms/loincloth.rsi equipDelay: 0 unequipDelay: 0 + - type: Tag #DeltaV, needed for species with nonhuman legs/can only wear skirts + tags: + - Skirt - type: entity parent: ClothingUniformBaseSwitch @@ -23,6 +26,10 @@ sprite: Floof/Clothing/Uniforms/loinclothblack.rsi - type: Clothing sprite: Floof/Clothing/Uniforms/loinclothblack.rsi + unequipDelay: 0 + - type: Tag #DeltaV, needed for species with nonhuman legs/can only wear skirts + tags: + - Skirt - type: entity parent: ClothingUniformBaseSwitch @@ -34,6 +41,10 @@ sprite: Floof/Clothing/Uniforms/loinclothwhite.rsi - type: Clothing sprite: Floof/Clothing/Uniforms/loinclothwhite.rsi + unequipDelay: 0 + - type: Tag #DeltaV, needed for species with nonhuman legs/can only wear skirts + tags: + - Skirt - type: entity parent: ClothingUniformBase diff --git a/Resources/Prototypes/Floof/Loadouts/departmentalloadouts.yml b/Resources/Prototypes/Floof/Loadouts/departmentalloadouts.yml index 9c47dcc57f5..1476918de0f 100644 --- a/Resources/Prototypes/Floof/Loadouts/departmentalloadouts.yml +++ b/Resources/Prototypes/Floof/Loadouts/departmentalloadouts.yml @@ -280,6 +280,7 @@ - CargoTechnician #TO BE ADDED - Quartermaster +#TO BE ADDED - Courier #Medical Outfits # @@ -334,6 +335,7 @@ #TO BE ADDED - Chemist #TO BE ADDED - ChiefMedicalOfficer +#TO BE ADDED - Paramedic #Security Outfits # diff --git a/Resources/Textures/Floof/Clothing/Departmental/Command/captsocks.rsi/meta.json b/Resources/Textures/Floof/Clothing/Departmental/Command/captsocks.rsi/meta.json index bbd45032fef..2de704c3dc9 100644 --- a/Resources/Textures/Floof/Clothing/Departmental/Command/captsocks.rsi/meta.json +++ b/Resources/Textures/Floof/Clothing/Departmental/Command/captsocks.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Sprited by Dakota Haven", + "copyright": "Sprited by Dakota Haven - DiscordID '56038550335922176'", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Floof/Clothing/Departmental/Command/captthong.rsi/meta.json b/Resources/Textures/Floof/Clothing/Departmental/Command/captthong.rsi/meta.json index ef52845d5fa..a32446e05b1 100644 --- a/Resources/Textures/Floof/Clothing/Departmental/Command/captthong.rsi/meta.json +++ b/Resources/Textures/Floof/Clothing/Departmental/Command/captthong.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Sprited by Dakota Haven", + "copyright": "Sprited by Dakota Haven - DiscordID '56038550335922176'", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Floof/Clothing/Departmental/Command/captwarmer.rsi/meta.json b/Resources/Textures/Floof/Clothing/Departmental/Command/captwarmer.rsi/meta.json index f6904e7bf3e..bdafa708837 100644 --- a/Resources/Textures/Floof/Clothing/Departmental/Command/captwarmer.rsi/meta.json +++ b/Resources/Textures/Floof/Clothing/Departmental/Command/captwarmer.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Sprited by Dakota Haven", + "copyright": "Sprited by Dakota Haven - DiscordID '56038550335922176'", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Floof/Clothing/Departmental/Command/commandsocks.rsi/meta.json b/Resources/Textures/Floof/Clothing/Departmental/Command/commandsocks.rsi/meta.json index bbd45032fef..2de704c3dc9 100644 --- a/Resources/Textures/Floof/Clothing/Departmental/Command/commandsocks.rsi/meta.json +++ b/Resources/Textures/Floof/Clothing/Departmental/Command/commandsocks.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Sprited by Dakota Haven", + "copyright": "Sprited by Dakota Haven - DiscordID '56038550335922176'", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Floof/Clothing/Departmental/Command/commandthong.rsi/meta.json b/Resources/Textures/Floof/Clothing/Departmental/Command/commandthong.rsi/meta.json index ef52845d5fa..a32446e05b1 100644 --- a/Resources/Textures/Floof/Clothing/Departmental/Command/commandthong.rsi/meta.json +++ b/Resources/Textures/Floof/Clothing/Departmental/Command/commandthong.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Sprited by Dakota Haven", + "copyright": "Sprited by Dakota Haven - DiscordID '56038550335922176'", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Floof/Clothing/Departmental/Command/commandwarmer.rsi/meta.json b/Resources/Textures/Floof/Clothing/Departmental/Command/commandwarmer.rsi/meta.json index f6904e7bf3e..bdafa708837 100644 --- a/Resources/Textures/Floof/Clothing/Departmental/Command/commandwarmer.rsi/meta.json +++ b/Resources/Textures/Floof/Clothing/Departmental/Command/commandwarmer.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Sprited by Dakota Haven", + "copyright": "Sprited by Dakota Haven - DiscordID '56038550335922176'", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Floof/Clothing/Departmental/Engineering/engisocks.rsi/meta.json b/Resources/Textures/Floof/Clothing/Departmental/Engineering/engisocks.rsi/meta.json index bbd45032fef..2de704c3dc9 100644 --- a/Resources/Textures/Floof/Clothing/Departmental/Engineering/engisocks.rsi/meta.json +++ b/Resources/Textures/Floof/Clothing/Departmental/Engineering/engisocks.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Sprited by Dakota Haven", + "copyright": "Sprited by Dakota Haven - DiscordID '56038550335922176'", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Floof/Clothing/Departmental/Engineering/engithong.rsi/meta.json b/Resources/Textures/Floof/Clothing/Departmental/Engineering/engithong.rsi/meta.json index ef52845d5fa..a32446e05b1 100644 --- a/Resources/Textures/Floof/Clothing/Departmental/Engineering/engithong.rsi/meta.json +++ b/Resources/Textures/Floof/Clothing/Departmental/Engineering/engithong.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Sprited by Dakota Haven", + "copyright": "Sprited by Dakota Haven - DiscordID '56038550335922176'", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Floof/Clothing/Departmental/Engineering/engiwarmer.rsi/meta.json b/Resources/Textures/Floof/Clothing/Departmental/Engineering/engiwarmer.rsi/meta.json index f6904e7bf3e..bdafa708837 100644 --- a/Resources/Textures/Floof/Clothing/Departmental/Engineering/engiwarmer.rsi/meta.json +++ b/Resources/Textures/Floof/Clothing/Departmental/Engineering/engiwarmer.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Sprited by Dakota Haven", + "copyright": "Sprited by Dakota Haven - DiscordID '56038550335922176'", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Floof/Clothing/Departmental/Epistemics/chaplainmantle.rsi/meta.json b/Resources/Textures/Floof/Clothing/Departmental/Epistemics/chaplainmantle.rsi/meta.json index f94ad5acfdc..395a75355e0 100644 --- a/Resources/Textures/Floof/Clothing/Departmental/Epistemics/chaplainmantle.rsi/meta.json +++ b/Resources/Textures/Floof/Clothing/Departmental/Epistemics/chaplainmantle.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Sprited by Dakota Haven", + "copyright": "Sprited by Dakota Haven - DiscordID '56038550335922176'", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Floof/Clothing/Departmental/Epistemics/chaplainmantlehood.rsi/meta.json b/Resources/Textures/Floof/Clothing/Departmental/Epistemics/chaplainmantlehood.rsi/meta.json index e5c7e8bcc30..4415b3c3a12 100644 --- a/Resources/Textures/Floof/Clothing/Departmental/Epistemics/chaplainmantlehood.rsi/meta.json +++ b/Resources/Textures/Floof/Clothing/Departmental/Epistemics/chaplainmantlehood.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Sprited by Dakota Haven", + "copyright": "Sprited by Dakota Haven - DiscordID '56038550335922176'", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Floof/Clothing/Departmental/Epistemics/chaplainsocks.rsi/meta.json b/Resources/Textures/Floof/Clothing/Departmental/Epistemics/chaplainsocks.rsi/meta.json index bbd45032fef..2de704c3dc9 100644 --- a/Resources/Textures/Floof/Clothing/Departmental/Epistemics/chaplainsocks.rsi/meta.json +++ b/Resources/Textures/Floof/Clothing/Departmental/Epistemics/chaplainsocks.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Sprited by Dakota Haven", + "copyright": "Sprited by Dakota Haven - DiscordID '56038550335922176'", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Floof/Clothing/Departmental/Epistemics/chaplainthong.rsi/meta.json b/Resources/Textures/Floof/Clothing/Departmental/Epistemics/chaplainthong.rsi/meta.json index ef52845d5fa..a32446e05b1 100644 --- a/Resources/Textures/Floof/Clothing/Departmental/Epistemics/chaplainthong.rsi/meta.json +++ b/Resources/Textures/Floof/Clothing/Departmental/Epistemics/chaplainthong.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Sprited by Dakota Haven", + "copyright": "Sprited by Dakota Haven - DiscordID '56038550335922176'", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Floof/Clothing/Departmental/Epistemics/chaplainwarmer.rsi/meta.json b/Resources/Textures/Floof/Clothing/Departmental/Epistemics/chaplainwarmer.rsi/meta.json index f6904e7bf3e..bdafa708837 100644 --- a/Resources/Textures/Floof/Clothing/Departmental/Epistemics/chaplainwarmer.rsi/meta.json +++ b/Resources/Textures/Floof/Clothing/Departmental/Epistemics/chaplainwarmer.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Sprited by Dakota Haven", + "copyright": "Sprited by Dakota Haven - DiscordID '56038550335922176'", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Floof/Clothing/Departmental/Epistemics/episocks.rsi/meta.json b/Resources/Textures/Floof/Clothing/Departmental/Epistemics/episocks.rsi/meta.json index bbd45032fef..2de704c3dc9 100644 --- a/Resources/Textures/Floof/Clothing/Departmental/Epistemics/episocks.rsi/meta.json +++ b/Resources/Textures/Floof/Clothing/Departmental/Epistemics/episocks.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Sprited by Dakota Haven", + "copyright": "Sprited by Dakota Haven - DiscordID '56038550335922176'", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Floof/Clothing/Departmental/Epistemics/epithong.rsi/meta.json b/Resources/Textures/Floof/Clothing/Departmental/Epistemics/epithong.rsi/meta.json index ef52845d5fa..a32446e05b1 100644 --- a/Resources/Textures/Floof/Clothing/Departmental/Epistemics/epithong.rsi/meta.json +++ b/Resources/Textures/Floof/Clothing/Departmental/Epistemics/epithong.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Sprited by Dakota Haven", + "copyright": "Sprited by Dakota Haven - DiscordID '56038550335922176'", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Floof/Clothing/Departmental/Epistemics/epiwarmer.rsi/meta.json b/Resources/Textures/Floof/Clothing/Departmental/Epistemics/epiwarmer.rsi/meta.json index f6904e7bf3e..bdafa708837 100644 --- a/Resources/Textures/Floof/Clothing/Departmental/Epistemics/epiwarmer.rsi/meta.json +++ b/Resources/Textures/Floof/Clothing/Departmental/Epistemics/epiwarmer.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Sprited by Dakota Haven", + "copyright": "Sprited by Dakota Haven - DiscordID '56038550335922176'", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Floof/Clothing/Departmental/Logistics/logisocks.rsi/meta.json b/Resources/Textures/Floof/Clothing/Departmental/Logistics/logisocks.rsi/meta.json index bbd45032fef..2de704c3dc9 100644 --- a/Resources/Textures/Floof/Clothing/Departmental/Logistics/logisocks.rsi/meta.json +++ b/Resources/Textures/Floof/Clothing/Departmental/Logistics/logisocks.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Sprited by Dakota Haven", + "copyright": "Sprited by Dakota Haven - DiscordID '56038550335922176'", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Floof/Clothing/Departmental/Logistics/logithong.rsi/meta.json b/Resources/Textures/Floof/Clothing/Departmental/Logistics/logithong.rsi/meta.json index ef52845d5fa..a32446e05b1 100644 --- a/Resources/Textures/Floof/Clothing/Departmental/Logistics/logithong.rsi/meta.json +++ b/Resources/Textures/Floof/Clothing/Departmental/Logistics/logithong.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Sprited by Dakota Haven", + "copyright": "Sprited by Dakota Haven - DiscordID '56038550335922176'", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Floof/Clothing/Departmental/Logistics/logiwarmer.rsi/meta.json b/Resources/Textures/Floof/Clothing/Departmental/Logistics/logiwarmer.rsi/meta.json index f6904e7bf3e..bdafa708837 100644 --- a/Resources/Textures/Floof/Clothing/Departmental/Logistics/logiwarmer.rsi/meta.json +++ b/Resources/Textures/Floof/Clothing/Departmental/Logistics/logiwarmer.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Sprited by Dakota Haven", + "copyright": "Sprited by Dakota Haven - DiscordID '56038550335922176'", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Floof/Clothing/Departmental/Medical/medicalsocks.rsi/meta.json b/Resources/Textures/Floof/Clothing/Departmental/Medical/medicalsocks.rsi/meta.json index bbd45032fef..2de704c3dc9 100644 --- a/Resources/Textures/Floof/Clothing/Departmental/Medical/medicalsocks.rsi/meta.json +++ b/Resources/Textures/Floof/Clothing/Departmental/Medical/medicalsocks.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Sprited by Dakota Haven", + "copyright": "Sprited by Dakota Haven - DiscordID '56038550335922176'", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Floof/Clothing/Departmental/Medical/medicalthong.rsi/meta.json b/Resources/Textures/Floof/Clothing/Departmental/Medical/medicalthong.rsi/meta.json index ef52845d5fa..a32446e05b1 100644 --- a/Resources/Textures/Floof/Clothing/Departmental/Medical/medicalthong.rsi/meta.json +++ b/Resources/Textures/Floof/Clothing/Departmental/Medical/medicalthong.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Sprited by Dakota Haven", + "copyright": "Sprited by Dakota Haven - DiscordID '56038550335922176'", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Floof/Clothing/Departmental/Medical/medicalwarmer.rsi/meta.json b/Resources/Textures/Floof/Clothing/Departmental/Medical/medicalwarmer.rsi/meta.json index f6904e7bf3e..bdafa708837 100644 --- a/Resources/Textures/Floof/Clothing/Departmental/Medical/medicalwarmer.rsi/meta.json +++ b/Resources/Textures/Floof/Clothing/Departmental/Medical/medicalwarmer.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Sprited by Dakota Haven", + "copyright": "Sprited by Dakota Haven - DiscordID '56038550335922176'", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Floof/Clothing/Departmental/Security/secsocks.rsi/meta.json b/Resources/Textures/Floof/Clothing/Departmental/Security/secsocks.rsi/meta.json index bbd45032fef..2de704c3dc9 100644 --- a/Resources/Textures/Floof/Clothing/Departmental/Security/secsocks.rsi/meta.json +++ b/Resources/Textures/Floof/Clothing/Departmental/Security/secsocks.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Sprited by Dakota Haven", + "copyright": "Sprited by Dakota Haven - DiscordID '56038550335922176'", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Floof/Clothing/Departmental/Security/secthong.rsi/meta.json b/Resources/Textures/Floof/Clothing/Departmental/Security/secthong.rsi/meta.json index ef52845d5fa..a32446e05b1 100644 --- a/Resources/Textures/Floof/Clothing/Departmental/Security/secthong.rsi/meta.json +++ b/Resources/Textures/Floof/Clothing/Departmental/Security/secthong.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Sprited by Dakota Haven", + "copyright": "Sprited by Dakota Haven - DiscordID '56038550335922176'", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Floof/Clothing/Departmental/Security/secwarmer.rsi/meta.json b/Resources/Textures/Floof/Clothing/Departmental/Security/secwarmer.rsi/meta.json index f6904e7bf3e..bdafa708837 100644 --- a/Resources/Textures/Floof/Clothing/Departmental/Security/secwarmer.rsi/meta.json +++ b/Resources/Textures/Floof/Clothing/Departmental/Security/secwarmer.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Sprited by Dakota Haven", + "copyright": "Sprited by Dakota Haven - DiscordID '56038550335922176'", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Floof/Clothing/Departmental/Service/janitorsocks.rsi/meta.json b/Resources/Textures/Floof/Clothing/Departmental/Service/janitorsocks.rsi/meta.json index bbd45032fef..2de704c3dc9 100644 --- a/Resources/Textures/Floof/Clothing/Departmental/Service/janitorsocks.rsi/meta.json +++ b/Resources/Textures/Floof/Clothing/Departmental/Service/janitorsocks.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Sprited by Dakota Haven", + "copyright": "Sprited by Dakota Haven - DiscordID '56038550335922176'", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Floof/Clothing/Departmental/Service/janitorthong.rsi/meta.json b/Resources/Textures/Floof/Clothing/Departmental/Service/janitorthong.rsi/meta.json index ef52845d5fa..a32446e05b1 100644 --- a/Resources/Textures/Floof/Clothing/Departmental/Service/janitorthong.rsi/meta.json +++ b/Resources/Textures/Floof/Clothing/Departmental/Service/janitorthong.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Sprited by Dakota Haven", + "copyright": "Sprited by Dakota Haven - DiscordID '56038550335922176'", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Floof/Clothing/Departmental/Service/janitorwarmer.rsi/meta.json b/Resources/Textures/Floof/Clothing/Departmental/Service/janitorwarmer.rsi/meta.json index f6904e7bf3e..bdafa708837 100644 --- a/Resources/Textures/Floof/Clothing/Departmental/Service/janitorwarmer.rsi/meta.json +++ b/Resources/Textures/Floof/Clothing/Departmental/Service/janitorwarmer.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Sprited by Dakota Haven", + "copyright": "Sprited by Dakota Haven - DiscordID '56038550335922176'", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Floof/Clothing/Departmental/Service/servicesocks.rsi/meta.json b/Resources/Textures/Floof/Clothing/Departmental/Service/servicesocks.rsi/meta.json index bbd45032fef..2de704c3dc9 100644 --- a/Resources/Textures/Floof/Clothing/Departmental/Service/servicesocks.rsi/meta.json +++ b/Resources/Textures/Floof/Clothing/Departmental/Service/servicesocks.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Sprited by Dakota Haven", + "copyright": "Sprited by Dakota Haven - DiscordID '56038550335922176'", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Floof/Clothing/Departmental/Service/servicethong.rsi/meta.json b/Resources/Textures/Floof/Clothing/Departmental/Service/servicethong.rsi/meta.json index ef52845d5fa..a32446e05b1 100644 --- a/Resources/Textures/Floof/Clothing/Departmental/Service/servicethong.rsi/meta.json +++ b/Resources/Textures/Floof/Clothing/Departmental/Service/servicethong.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Sprited by Dakota Haven", + "copyright": "Sprited by Dakota Haven - DiscordID '56038550335922176'", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Floof/Clothing/Departmental/Service/servicewarmer.rsi/meta.json b/Resources/Textures/Floof/Clothing/Departmental/Service/servicewarmer.rsi/meta.json index f6904e7bf3e..bdafa708837 100644 --- a/Resources/Textures/Floof/Clothing/Departmental/Service/servicewarmer.rsi/meta.json +++ b/Resources/Textures/Floof/Clothing/Departmental/Service/servicewarmer.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Sprited by Dakota Haven", + "copyright": "Sprited by Dakota Haven - DiscordID '56038550335922176'", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Floof/Clothing/Head/hoodmarshoodie.rsi/equipped-HELMET.png b/Resources/Textures/Floof/Clothing/Head/hoodmarshoodie.rsi/equipped-HELMET.png index 5382dfba01f7e2be9420b01c662621ed3466c3c1..9ea288046176db428ef87de5d1dd10ad62cf0495 100644 GIT binary patch delta 972 zcmV;-12g=L2;v8jB!2;OQb$4nuFf3k000A=NklA#+_seJR9f@^F zKmiSks3?&l(S%f-f`kx7(oi9aSfJ!26kin~T_TW9R8*;uk{l>HC5@>f{(z)HNNH$j zXs{yU+}F<2Ddv|Bv-~9Z}?8xteoOqm13K za;|V+$EAIFT|Cdj^E|>Z1R%Ka?nr#4ipeRN2Jc+i5WTsJ-rNOX@VRqkW89P(@W*HO zB#I(D&m*ocD6yGQVbh9N%lCbdg2V?Dyx;8D+l^-Ms0(c=BzxMlcwARFH z?<<&52840t(0>7jH z&3rSoeEyPLfAhor4Nxs2-AZUay3N|dyTkZJAA^(a1pfuhY$y0%!x>;(fNh)swguS6 z8DLw0ZGW5rwguS68DLw0ZJYtN1=z+JU|WD~oB_54*v1)PTYznx0k#F$#+#&(Znk85 zdmG>P0od8u;j3R-BY#WJlI8Q4kU)hgl5CFA(U88E2B$8k&)MU=~B z%H^_YH^*iWH;N+SI3Cevf{_93#=0b06V_w=YJXmsNRot7>EvfpsZ<))D*b9mSdYoN zd$b$tMkW+i{`AxDWnr<-;v28#<>_F5_N+d6aAN5Xu=en-T7B|h|3u(H#pm>EFEL*~ zMZ57`VG{})5Y?&#^K+2y*Z4c=ytos zqfMD%?7o)#q>#TkQH;U{=-mYU^f@%nD)q@*D&0yDkztwI20;)2{TC-1XBAi9R=dBp zNp)JdkHQX+{gS9uXZDWwj3TjZorN<|?eBQHr-R{NWwwJ8S^k&$D-)pst+->;q2 uaa3%F!{Kl^91e%W;cz${4u`{WAb$c&%Bpor*h`E60000JD+HI6 zrex+TgyiSv99;gehJk^3x~Gd{NX4zUx6XG9$@?-K?Y=_v+;21?z&mmP*z0M}6ZD5ZKcZ#KQmYz`L~a z&6{VQ*)#dcSA(}vZ+6|)F+REQe6@F*!TZmZ^S__8wwZi6>a#-s90nPd1sjXr_dlC= zwm0k2>dmKb8SwBNKCms9Va>6RcRUzwJztk~ypUnTUT2p&@dg8)nKl1g&j^~u?O()u znBl$5X?O}}s5ro+8#PWAe`x0JdTEfj1! z-Egeyp7zznRl&Et)i<$LR4Dxn*tF2RK_)@u0KZ~@bNr5@jA zyMcSbuNBeJ&exkl7&o0`kkXdA?!~Z%X$#YfY=h4m?zw7C)phuNCv@+1xq5ld2B`zd zlLd~P6nnuh)bmwu-~04v=B%l!@?b_6cFX!D9w(`~Xc{P2X*!9!c0#=87y>xN<4aXhEU&}gzx_*_*^Y3MFp3fYX zKK*N+&JfC zgps4E;d`E$acEG_)-)tFszwP{%wrr!^rvoRN)q9wV`apNE%!OjA2(bij1s z?dD1KN3Wf=pShz#E4Ja^A>P=6{O?b@)z+vp9DHUbUiTwMhk^V2oP%?}?47&e(r)$3tUKgWW&wTzwEc)I$ztaD0e0s!u>(-i;! diff --git a/Resources/Textures/Floof/Clothing/Head/hoodmarshoodie.rsi/meta.json b/Resources/Textures/Floof/Clothing/Head/hoodmarshoodie.rsi/meta.json index e5c7e8bcc30..4415b3c3a12 100644 --- a/Resources/Textures/Floof/Clothing/Head/hoodmarshoodie.rsi/meta.json +++ b/Resources/Textures/Floof/Clothing/Head/hoodmarshoodie.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Sprited by Dakota Haven", + "copyright": "Sprited by Dakota Haven - DiscordID '56038550335922176'", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Floof/Clothing/Head/sexcompcirclet.rsi/meta.json b/Resources/Textures/Floof/Clothing/Head/sexcompcirclet.rsi/meta.json index e5c7e8bcc30..4415b3c3a12 100644 --- a/Resources/Textures/Floof/Clothing/Head/sexcompcirclet.rsi/meta.json +++ b/Resources/Textures/Floof/Clothing/Head/sexcompcirclet.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Sprited by Dakota Haven", + "copyright": "Sprited by Dakota Haven - DiscordID '56038550335922176'", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Floof/Clothing/OuterClothing/Misc/beltedouterwear.rsi/meta.json b/Resources/Textures/Floof/Clothing/OuterClothing/Misc/beltedouterwear.rsi/meta.json index af8d1329fc8..1063f482890 100644 --- a/Resources/Textures/Floof/Clothing/OuterClothing/Misc/beltedouterwear.rsi/meta.json +++ b/Resources/Textures/Floof/Clothing/OuterClothing/Misc/beltedouterwear.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Sprited by Dakota Haven", + "copyright": "Sprited by Dakota Haven - DiscordID '56038550335922176'", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Floof/Clothing/OuterClothing/Misc/marshoodie.rsi/meta.json b/Resources/Textures/Floof/Clothing/OuterClothing/Misc/marshoodie.rsi/meta.json index af8d1329fc8..1063f482890 100644 --- a/Resources/Textures/Floof/Clothing/OuterClothing/Misc/marshoodie.rsi/meta.json +++ b/Resources/Textures/Floof/Clothing/OuterClothing/Misc/marshoodie.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Sprited by Dakota Haven", + "copyright": "Sprited by Dakota Haven - DiscordID '56038550335922176'", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Floof/Clothing/OuterClothing/Misc/sexcompbeltbronze.rsi/meta.json b/Resources/Textures/Floof/Clothing/OuterClothing/Misc/sexcompbeltbronze.rsi/meta.json index af8d1329fc8..1063f482890 100644 --- a/Resources/Textures/Floof/Clothing/OuterClothing/Misc/sexcompbeltbronze.rsi/meta.json +++ b/Resources/Textures/Floof/Clothing/OuterClothing/Misc/sexcompbeltbronze.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Sprited by Dakota Haven", + "copyright": "Sprited by Dakota Haven - DiscordID '56038550335922176'", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Floof/Clothing/OuterClothing/Misc/sexcompbeltgold.rsi/meta.json b/Resources/Textures/Floof/Clothing/OuterClothing/Misc/sexcompbeltgold.rsi/meta.json index af8d1329fc8..1063f482890 100644 --- a/Resources/Textures/Floof/Clothing/OuterClothing/Misc/sexcompbeltgold.rsi/meta.json +++ b/Resources/Textures/Floof/Clothing/OuterClothing/Misc/sexcompbeltgold.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Sprited by Dakota Haven", + "copyright": "Sprited by Dakota Haven - DiscordID '56038550335922176'", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Floof/Clothing/OuterClothing/Misc/sexcompbeltsilver.rsi/meta.json b/Resources/Textures/Floof/Clothing/OuterClothing/Misc/sexcompbeltsilver.rsi/meta.json index af8d1329fc8..1063f482890 100644 --- a/Resources/Textures/Floof/Clothing/OuterClothing/Misc/sexcompbeltsilver.rsi/meta.json +++ b/Resources/Textures/Floof/Clothing/OuterClothing/Misc/sexcompbeltsilver.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Sprited by Dakota Haven", + "copyright": "Sprited by Dakota Haven - DiscordID '56038550335922176'", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Floof/Clothing/OuterClothing/Misc/transparentouterwear.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Floof/Clothing/OuterClothing/Misc/transparentouterwear.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..e10b779a7a82bbf5c01e38af526cc9fc6e30967e GIT binary patch literal 1221 zcmV;$1UmbPP)YAX9X8WNB|8RBvx=!KdMT000C~ zNklc4l0II+d~E`dDA z%>3S$dGoy)E*g!(V-Ai1FaQR?02lxRU;qr@{}zAk0!9HqE(gdEz?d)q&zpBBmn(te zWFV7qAmae!3J#JL0I6wmBkh5U-hEUgsUagP*>Uk*=o?%ri@q!`FO!Oj3VHw|BO}<}-rjKA-~r(I%E}5UD=VW0FgZDi z&CSh{0Mpacq_MG)9zah|5BB%>Uk8ZA{QNwrsi~m`Fg7-Zt*xyNsp~^SL!`5_lO8}< zR~HTr4oY?a5sA@gqy}KO+tFk)NzOqQi-lONR(b#yiv_J#t7HaDO-+%erY33tGcz+- zUtcc?(A(Qf`uh5)&jGhhf&c(8J3CA2>guQgEG;czWo4yg2HI>kVm6y;J_WAafg9m; zI!SqXIW>Uw^>r*NDw52Axw$z~TU$#H;Kd6kK7Cp)nE`IMo5cGZjwg0^cQHFVTeAJN zwKY;wQbG>^0N{_^J^Um)>&83~4j&VhDuwz=@a*gylagdN+84bd5%dDxmEc9}@10|M z*1w%N4n;`{&ru)zrHEbzh=hPB`McEvcP@r}JAk?zXo!TsrR1SF(Z$ePA7JzhKqd!B z&q`o1#L8g?zyKHk17H9QfB`T72EYIq00UqE41fVJ00!^~0S*G^czOb$)ys_kg+c7R z2_cts2HAP3#)M{o=eGcIoD7u8WKi+Rkd~oH2#EjBb38pgg~&-5jw50C%<%Dpz7#Em z4;vN1!y{gks-}t%I*1~l#$DbV`R<|TfYJ}2tHEHyg>2y>x z;OOWG)oOJt1MYGt;@$vECKKB2_85TI>vie%db$9?5UMqN3}AG0l(e1K@VM@%r}n`1m-sw6r(?VAb#UyR=#@ zRe*!QIi_X)voX8&%ddRN7oT70kJIVIc+M!q1+cxnjk&qGSAKk9VF9bFs~Z4d!sGGq zd3kwMC&7RSm??k*09N1n4_z7B)GOc{8yi?ySV#vT7!0CDqcPshj7>Bc3LN`^Ba)s; zcO9^|1DKTq4squ_5pr&xOcg~D<2kH(Z?(X_KZ5C6WkObhzTW|LpTfPg#fl*YzyKHk j17H9QfB`Uo#~ObFZl!Xck}b$M00000NkvXXu0mjfYL6Gl literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/OuterClothing/Misc/transparentouterwear.rsi/icon.png b/Resources/Textures/Floof/Clothing/OuterClothing/Misc/transparentouterwear.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..93ce309a0ec9163b42b95e7ac9b7fab13b2748c2 GIT binary patch literal 542 zcmV+(0^$9MP)YAX9X8WNB|8RBvx=!KdMT00050 zNkl zfd3Bga&aZ(^V>vGPA(V8MdVu|TU%(~l}}Oy+`soQoH%)G1_!Z#b>z^256jETaiLI1 zQUg>fS3I<4!%Me6}-bKe8a{0`T4k5ET#t- z9v%*3V`B?Ak4soY5j${Wc6K)I?d?quFf=q2#>dC+q7yZ&VJEg=C4>+sNs=C5WMm|a zj*i~M;b!+s*n_WFotm182L=XG-+?Ml;~DN?KictPdV2b7UteFEzn~Jz=G`P)Px$^GQTORCt{2+CNJpK^O+`$E=kbuvo;(1Qr4^7&#$W9@>gvAy_EdSojevto;mD zR$e8D-L-<{A*WnqKmrk_6G>q)c5y9a;}X~1c{MTdcz#tN^Zv=OGb!E$h=_=Yh=_>Z z@WNVDUEYekuom@W{h;d?@{%c~T=Kl3l)`5>p}W2p*1ohp>WA}D^mikwAI^&seKc+m z^+&V5{IUN8r91%B0RA{PuzorXoB~=uImZmDe&!Jyq*B$zK7$S__xEzzb_oO2Jy|k~Y`Muc=Ob-}jwjeBbZXkK?ms9)X?G4VHe6q29Q| z=J7;svUc+V8o<%oJ*t&S{62rgu2b8+sSf~J>z>sI@bXBH&n}2Aq4C*;p8gFEvOW&ph}jXSLWbB`50!r|g-6i;cbwP>E548;*h z_NBEJ9Ra8Dc$!wLl{&MR4l*UuawmVhF-CkZi8i2lb}|yr-h&`Wo!Q5CL_ehEPQDKi z1c5lG=neq#XZFSzaTBi6a`*gw02jkHe;>Afh=_=Y=sS1@s&3|F=K4^`00000NkvXX Hu0mjf=vxQk diff --git a/Resources/Textures/Floof/Clothing/Under/Gloves/captwarmer.rsi/icon.png b/Resources/Textures/Floof/Clothing/Under/Gloves/captwarmer.rsi/icon.png deleted file mode 100644 index 63b61d20c4cb59fd524eae464c84f5460353302e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 297 zcmV+^0oMMBP)Px#<4Ht8R9J=W)3FM|Fc1ddU*qJ`N!%<1q;k;W5FEu>oE;QheFUGt$LQqd;^qT5 zintUCBDjll+%!&#AZ=2??Y=3H%W=tF0LB<&j9Cb&OgNYtA(i<@eA$+ah+Oh~AtJaI zktvBg#vH~bi93Z76**VQ+iWi$AQAvt0Cvs=jMgn+4W#MA8k^e!-}m2ZA(aV&zPx%N=ZaPRCt{2n!Rq~Koo^Phzq1~M{gHsn^6)ekto>**gEAFd5$2ZNI?-PZ;@x< z0Z5s`C_}Pw?JmYPm&q0y`xR;*Lgh5JsiekiE}{^1VIo4K@bE%5ClOG z1VIqK3^kicS(X71wA$J0@t4VC?a)|h>UMCcU#r>4sJn{LTBEi8aI7lIuJ3HXXCrW# zJnYsvK3g$L#`K#@0D7GzKfeFs`0N{_q*_0#sPB9RztA{_b1hBdiPvTJ7w9cFyFk0YI9jTle$p$z6l{ z*}1a_oBCR7lu`gZ-K-dP*V2dGI!`w%0F+W_t)1#y?*L;Aqht)gbUNL-mtT*PF~%6% zC7pP^ZgBBTf3N_cKUff4JRh8AgVQ1SKOu*pC1QYY0lpCfd<*c67~orgZ^QuK0(>I| z_!i(BF~GL~--rRe1^7k`@GZbMVt{V}z7Yd_3-HaCH^3Rj`82)u{f;<96KD3?5FX#`JW$Uuku-`A>N}*^h4=d9&Wj32J zpU=IV0bv-@Y&KC!<(XhDe?%*f#?mz1q_sX#O6{f9E)+Ik@5?7Y|6PK*Q!Ce!|N1Tz zGN9L4ZZi2OiWqk5oL(Q5-WPC)pw-S!ua6jZ>qJomtosFeonmJ|Ap@=+8k=4LSZDNA q^#vTl7_;dQfOTKO)kCAuTE795P4WYUiYA=^0000Px#-bqA3R9J=WlRXN;KoEt$NQ(3xV2fb0XrW-K2k;c$!`>p`Ej)vlu!u!igpeW! zNExtD)+| zwAN^?Uuv$j4)AUKHs;-;Lw|T8iBmS+0|3j(f!TCVf7m05+n=ZP4pdidjJfW>y#_zr zfp6m+Aes-XQmWCTlp>lBY@_L&0Dd^O>taN<3IHg}vevKaY!$FBMi1Zh;{b4Z-y}`} q$n(6`tLh|9F~+!#6a+yK05}7L3r#(>US;h70000GjMt_;*x%`T=c(0QjV|1yqd!%+u} eI$+cRlmGx+V1mI!S=Jl?00000EGYU0qp^hU;%iMVI6OVmIJHNz$nhi%CFzSF&2aGyk d)B!`<0RWJQg29N)pp*ar002ovPDHLkV1i^=IEDZK diff --git a/Resources/Textures/Floof/Clothing/Uniforms/beethong.rsi/meta.json b/Resources/Textures/Floof/Clothing/Uniforms/beethong.rsi/meta.json index ef52845d5fa..a32446e05b1 100644 --- a/Resources/Textures/Floof/Clothing/Uniforms/beethong.rsi/meta.json +++ b/Resources/Textures/Floof/Clothing/Uniforms/beethong.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Sprited by Dakota Haven", + "copyright": "Sprited by Dakota Haven - DiscordID '56038550335922176'", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Floof/Clothing/Uniforms/captthong.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Floof/Clothing/Uniforms/captthong.rsi/equipped-INNERCLOTHING.png deleted file mode 100644 index 20617957050faf106dd062a813d7a333d52208ba..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 413 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%z!#!ObLn`LH zy=mxmBteAb!F1nUa}qgKVj~VJZT!qr-N4axeM8s<>l<%bzexyjG)>T(n*QUU(vO^w zZ70_6NtrA-lmAlAv@?I4w?zpm!N8}T`|qq+)%E_@+kaEEeY)l6|1Yh-#&~FpK<=uC zLcU9Hg>07j_hCZwPv5U|^F<@}tyv|My42?Wnv&ho-ZIA@&6)i7=;}H5_OaK7&*qN! z`N{mce`AM-z>K~W`3DO+o>l7Q-uAkGb=wu?4^N}nBYJf&l$So3(=7Ava^NTT{fzZj zlkyMLA7s41dclHW7lRbLgSf+Eh8Ij3G7PZ{z03=^7Zfs-Fq-f+=rtU}R5Y2rW78)I z+XOZKg7SZCKlkgL@~Yfn6=`<+%lyB0rmGi!1NuUOr>@c_I)^1bY=+n~)-(2vDxPfi q_upN+=HC14^ruo~U??nNl=oU7p)RvP@eDA$89ZJ6T-G@yGywpN)Uap( diff --git a/Resources/Textures/Floof/Clothing/Uniforms/captthong.rsi/icon.png b/Resources/Textures/Floof/Clothing/Uniforms/captthong.rsi/icon.png deleted file mode 100644 index 1f8c869b19ad9561ae9ecc578d7fafe4d5278a52..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 251 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oArNM~bhqvgP*A$W zHKHUqKdq!Zu_%?nIW?!avREOwq%ugG$9@LzvXFIIg+GbzwZ_MYR6jH|Zv%dVk l)Uk^>7Oxr*7G2_FVCWNQI@tYDi{{Oi&9ip|)c*Xm(D#>PAEVR`cGbpf)%~X~0ySWOiesDd{@Q$-wsghB8payd zj*b&e29w@vANVWL@QUGP)d7=+HNG268XP$=bRq-}xHR;52ZQ)CesTYKn8(my$-vNX ai9vkPMezxB$3FZ8NqM^ZxvXB71HJbVHSGBPp{%dcHwAl2s-r-9u`^Z(0A$uK;A_Jjdjh|nbw nk`w2n*>KbWqYfB#06G8wLfC=9Ib@=Q00000NkvXXu0mjfDxy0k delta 132 zcmV-~0DJ%U0rmlqU;%-VVI6pelmjkZIQL)Az=)Atd8&lK?xgwuUFRiYSaPFg_kWER zS4O%-!KDl5{`2q&Fv!TrKrFv@g@II`Q=A5NC(ZvaD<#A5_}LQ%Y#~CIL`Y7Yk7mPB m2aGyk)B&Ro7pl!X1y+7g8>iQg=;-6a})QmafmC+v=$gL&G!$B8bg=d#Wzp$Pz3>NxrU delta 144 zcmey!_>pl!X1y&}g8>iQg_M;G(qGJTJ=)#rE~u~e>eAly6$`xgG=(kYia(Z8`7=3m z>6C*E5b!~}p<_jHU-IjIp9Q+wveRase-xLlv-Z@V=lFRzcS-{#K6gMz)I=390J@5Y?pa3U>r>mdKI;Vst08kq~3jhEB diff --git a/Resources/Textures/Floof/Clothing/Uniforms/codervalidthong.rsi/meta.json b/Resources/Textures/Floof/Clothing/Uniforms/codervalidthong.rsi/meta.json index ef52845d5fa..a32446e05b1 100644 --- a/Resources/Textures/Floof/Clothing/Uniforms/codervalidthong.rsi/meta.json +++ b/Resources/Textures/Floof/Clothing/Uniforms/codervalidthong.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Sprited by Dakota Haven", + "copyright": "Sprited by Dakota Haven - DiscordID '56038550335922176'", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Floof/Clothing/Uniforms/loinclothblack.rsi/meta.json b/Resources/Textures/Floof/Clothing/Uniforms/loinclothblack.rsi/meta.json index 0fb71d5a706..a32446e05b1 100644 --- a/Resources/Textures/Floof/Clothing/Uniforms/loinclothblack.rsi/meta.json +++ b/Resources/Textures/Floof/Clothing/Uniforms/loinclothblack.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Sprited by Dakota Haven", + "copyright": "Sprited by Dakota Haven - DiscordID '56038550335922176'", "size": { "x": 32, "y": 32 @@ -13,10 +13,6 @@ { "name": "equipped-INNERCLOTHING", "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 }, { "name": "inhand-left", diff --git a/Resources/Textures/Floof/Clothing/Uniforms/loinclothwhite.rsi/meta.json b/Resources/Textures/Floof/Clothing/Uniforms/loinclothwhite.rsi/meta.json index 0fb71d5a706..a32446e05b1 100644 --- a/Resources/Textures/Floof/Clothing/Uniforms/loinclothwhite.rsi/meta.json +++ b/Resources/Textures/Floof/Clothing/Uniforms/loinclothwhite.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Sprited by Dakota Haven", + "copyright": "Sprited by Dakota Haven - DiscordID '56038550335922176'", "size": { "x": 32, "y": 32 @@ -13,10 +13,6 @@ { "name": "equipped-INNERCLOTHING", "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 }, { "name": "inhand-left", diff --git a/Resources/Textures/Floof/Clothing/Uniforms/plainthong.rsi/icon.png b/Resources/Textures/Floof/Clothing/Uniforms/plainthong.rsi/icon.png index 2b875eb6a5d0b116c1c218fd21ef7239f325ecfb..7fcff5579aea108cf425cac8b447c471a89e648b 100644 GIT binary patch delta 129 zcmaFN_?U4*W|g+k0Rs+}3rCkMUm!L0_k3lpSig%BS=m}%*20@3j_iA=JhOAEDvN*v z10#gk!#E>y*Y1$t`+Xj0E)j~0Yn-`sRZ=$Z^En+HA&2bmI=r_n50w#=NIo%1c}?Hk fd=H?$JFl6JUTitI@!P+*3_#%N>gTe~DWM4fP&GA4 delta 129 zcmaFN_?U4*X4P)q0|p!{7Zw*TQ!o|%eg5I8(iuv5Cs;B)RManB47wvMf6`}-j$#7? z6Nf@WLpcXTN&%epCCu;U?bhn!_;N4xq+rzopr0N;N!f&c&j diff --git a/Resources/Textures/Floof/Clothing/Uniforms/plainthong.rsi/meta.json b/Resources/Textures/Floof/Clothing/Uniforms/plainthong.rsi/meta.json index ef52845d5fa..a32446e05b1 100644 --- a/Resources/Textures/Floof/Clothing/Uniforms/plainthong.rsi/meta.json +++ b/Resources/Textures/Floof/Clothing/Uniforms/plainthong.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Sprited by Dakota Haven", + "copyright": "Sprited by Dakota Haven - DiscordID '56038550335922176'", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Floof/Clothing/Uniforms/plainthongbra.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Floof/Clothing/Uniforms/plainthongbra.rsi/equipped-INNERCLOTHING.png deleted file mode 100644 index 84b256636a8bc366e827e2526ecbb8f0ae2ae570..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 437 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5`$3q|f;CtLC@5Xx z8c`CQpH@F!Z*N%(H5mvr zJY0G)_=p?#syj_y{i{W{FIaTp*c_+XTQ4QfNK84j>Bo=l&1sYKZ{(;g3<&-CTmxtg z3`j_(MrPgKcJ#*gYl(B^8|DbTQ2#vZkIc`_jKALRVO;YmeX0Y8}b zU(Z>~H1}j**ZRN2^+GkbjeFfLnBAzf@}o-2olgp9T&>vm%jZH8&t&fe&z61*k+=7* zRy#&Kn-jyN*m8aIan{aKzsY(RWJ6-FZ)OS!T{`W?7Du4XJ%M}kJJuG>`m0cQ zIEw>`{$@$avGQ~3hD1KUfj zH}!p$TXgBA{=7zs#rs_hW+^Te$&)-ZN%)MZN&^GawI~K3j=cv>KDA~7UB}?*>gTe~ HDWM4feMDr{ diff --git a/Resources/Textures/Floof/Clothing/Uniforms/plainthongbra.rsi/inhand-left.png b/Resources/Textures/Floof/Clothing/Uniforms/plainthongbra.rsi/inhand-left.png deleted file mode 100644 index bdbf35325f54089b6c158805e5ddc9220e737c5a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 371 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5`$3q|f;CtLC@5Xx z8c`CQpH@ItG2m%^ zIK5ioo9cIa-VWJ9et+|`Cd~^xf5f^^{1jOfW0Rg%Rcr~=g9ZFpt8+T%e!2Lm#h+}p z=ia`P%n+{EBeX!rd-9Uh$R-Dku0txBvEk*?3)a1U- diff --git a/Resources/Textures/Floof/Clothing/Uniforms/plainthongbra.rsi/inhand-right.png b/Resources/Textures/Floof/Clothing/Uniforms/plainthongbra.rsi/inhand-right.png deleted file mode 100644 index ba71aea082070d3c2d882a1ba2b79289f5daff35..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 399 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5`$3q|f;CtLC@5Xx z8c`CQpH@F!Z*QIKZ8Z>J zxvOK!WH|6YTjvzxlqi4Q)%>o;hiA*PDljl|I502?G%&CrGaH_- z*WkMSeeT9jpKP{&wwcM(@crJl+-h})$Z2d0uXnjg-mpw(D3EcNVo+rHeKuxVtKl|I zhNQeJ?u@T?{o|gq?B&M`p`ntVXFkt4Cx5}Dm+^o_-yi?Tc;<}T*V+;j*61*FO#Lp} zu`m855ond&eOK+c8gUUNIk4fwW=OjJvyj4-=7&t00000NkvXXu0mjf5IrHz delta 89 zcmaFM_?B_P>>vkDhfv$4N49?TS2HNPxZU{EspKiFC^;N(1Xn^8WM4iZFb6{DvX$%p}GENrW028vk$H sxWPD@4M!a?>VQ!Pj5=V{0YlmW04ZmL!I3+1;{X5v07*qoM6N<$f_wcx^8f$< diff --git a/Resources/Textures/Floof/Clothing/Uniforms/stripethongrainbow.rsi/meta.json b/Resources/Textures/Floof/Clothing/Uniforms/stripethongrainbow.rsi/meta.json index ef52845d5fa..a32446e05b1 100644 --- a/Resources/Textures/Floof/Clothing/Uniforms/stripethongrainbow.rsi/meta.json +++ b/Resources/Textures/Floof/Clothing/Uniforms/stripethongrainbow.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Sprited by Dakota Haven", + "copyright": "Sprited by Dakota Haven - DiscordID '56038550335922176'", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Floof/Clothing/Uniforms/stripethongwhite.rsi/icon.png b/Resources/Textures/Floof/Clothing/Uniforms/stripethongwhite.rsi/icon.png index 9ca60579f648a854b0a36d75417a6cef501446e7..d6c2b5baa6372cfb4deb13e1904224c19cc8f0bb 100644 GIT binary patch delta 139 zcmaFD_?U4*LVcd6i(^Q{;kTC+r4A@?us(1vT)shY$Nx+Y6MsW)ZSQ3-?`;3n5%iB; zV`itlH-|z40~3Up!8jvw*X}jnw)-e31%*C+`CDDvVDp--k2F}*-)F2%H2e8ldWW#G p(uPSjrv=x&nR9;vP@}|aruUUC2Y==?K4Aa?Pgg$|mUT`EO#m<=I}-o^ delta 140 zcmaFN_=IsnLVdoci(^Q{;kTEyg&GWaST6KxF7H@<;;(?A= z-S5J3uf~aikww6PfpI_6jL0q5RDSPY!u(EdYuL=S_C`#`+@VLqxV{-)s6Kx6$@cOG sK0M{_YCk8bo;foo-2<%ez;gz6-QO(-UkJTpV*mnAS3g#lbxsLQ0NrdjS^xk5 diff --git a/Resources/Textures/Floof/Clothing/Uniforms/stripethongwhite.rsi/meta.json b/Resources/Textures/Floof/Clothing/Uniforms/stripethongwhite.rsi/meta.json index ef52845d5fa..a32446e05b1 100644 --- a/Resources/Textures/Floof/Clothing/Uniforms/stripethongwhite.rsi/meta.json +++ b/Resources/Textures/Floof/Clothing/Uniforms/stripethongwhite.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Sprited by Dakota Haven", + "copyright": "Sprited by Dakota Haven - DiscordID '56038550335922176'", "size": { "x": 32, "y": 32 From 5c20bc39a022ed353ab0e44de807cd7ad4b54508 Mon Sep 17 00:00:00 2001 From: Dakota Haven Date: Sat, 17 Aug 2024 14:22:53 -0600 Subject: [PATCH 29/38] Fixes -Fixed the RSI error due to a Metafile inconsistency. Signed-off-by: Dakota Haven --- .../OuterClothing/Misc/transparentouterwear.rsi/meta.json | 8 -------- .../Floof/Clothing/Uniforms/loinclothblack.rsi/meta.json | 4 ++++ .../Floof/Clothing/Uniforms/loinclothwhite.rsi/meta.json | 4 ++++ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Resources/Textures/Floof/Clothing/OuterClothing/Misc/transparentouterwear.rsi/meta.json b/Resources/Textures/Floof/Clothing/OuterClothing/Misc/transparentouterwear.rsi/meta.json index 1063f482890..395a75355e0 100644 --- a/Resources/Textures/Floof/Clothing/OuterClothing/Misc/transparentouterwear.rsi/meta.json +++ b/Resources/Textures/Floof/Clothing/OuterClothing/Misc/transparentouterwear.rsi/meta.json @@ -13,14 +13,6 @@ { "name": "equipped-OUTERCLOTHING", "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 } ] } \ No newline at end of file diff --git a/Resources/Textures/Floof/Clothing/Uniforms/loinclothblack.rsi/meta.json b/Resources/Textures/Floof/Clothing/Uniforms/loinclothblack.rsi/meta.json index a32446e05b1..73b61e293fe 100644 --- a/Resources/Textures/Floof/Clothing/Uniforms/loinclothblack.rsi/meta.json +++ b/Resources/Textures/Floof/Clothing/Uniforms/loinclothblack.rsi/meta.json @@ -21,6 +21,10 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 } ] } diff --git a/Resources/Textures/Floof/Clothing/Uniforms/loinclothwhite.rsi/meta.json b/Resources/Textures/Floof/Clothing/Uniforms/loinclothwhite.rsi/meta.json index a32446e05b1..73b61e293fe 100644 --- a/Resources/Textures/Floof/Clothing/Uniforms/loinclothwhite.rsi/meta.json +++ b/Resources/Textures/Floof/Clothing/Uniforms/loinclothwhite.rsi/meta.json @@ -21,6 +21,10 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 } ] } From 5fa7f4e644cecfb5de1385ffffa3609aa63b1331 Mon Sep 17 00:00:00 2001 From: fenndragon Date: Sat, 17 Aug 2024 16:15:34 -0600 Subject: [PATCH 30/38] Rouny sprite recenter fixed the offset of the lower two sprites for side to side movement --- .../Mobs/Aliens/Xenos/rouny.rsi/running.png | Bin 13752 -> 13736 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/Resources/Textures/Mobs/Aliens/Xenos/rouny.rsi/running.png b/Resources/Textures/Mobs/Aliens/Xenos/rouny.rsi/running.png index c8203e4a39b5323511b2e062037e1396ce472740..7710b9b8692c06f0032f30e34107aec02147df39 100644 GIT binary patch delta 13613 zcmb80WmHsO)c=Q+?rxNrp}Rx6ySt=8T0-E0lynUvp+gSc4N40LD2*TpgCgAxO8n=y z{;!_3o;T0DoActXbNAW%d-ne9eLFoXJu}<^*G8MgpzYh0e}8=Ex_%AET!YZql%re0 zmhGFF&g#lfX;?T`HdtOCywY1t`6ydowO3W;rx&_xGbhT-5!6-V(mk4(<)uNvp7|8Q zZ9dlQtWl<%*b2^iic7{eIB~ohuD5jVP9J=JsOy30Yx=1G ze0HQ}Am7jlN|5!IKNjd+mo-|yGaqUx?|&@OgCD1Qugt^XaMidj+fXC0ollxndZGv^>j4|EE>tRHjnu%k(g3UZmkDN?5iBAS~vQyA# z7$3>pW9HD;pGS0a@CLZIn>x1JZe91CUT+5(i7#Xipi$vQ{K=MYVp+1{$zDgJ0iyfv zKC1xK6Z;s`OJW;>d^hK8`*VHPy!28Y(Qh$G*$$D(uw) zf(s>UDUl_u{T~c!^U=!{sfUC@y%0kth9pvA8d+qf=q0MD+l66hiveyrqIo~WB4)nz zL(l|vEe>cJnw+c0K5Ubg1BYpjq8tI1WHNppgdjSQgX9aZPh(5-dNBTz0kEkNI)@T* z*`Jv(fSW*6$0Y zw+ogihq*{t^u0vSvj2iW!aYfSQfibQH`{7U8(S8Gbb0z`DigcY0Fr%rgY zGo724c7-=TYU_%RHNStx&*1Da!A9=4zkL;PCyeaQy$;d@X@^p+?6I!6a!zSsfPUH( znoel0;|>!EkA{DnB2*%SDc(&#(-PLqAv-;oAD}EthVYG0wEMYE^&>fy3Nw?bsfN*6Cm)}VI8E9RR?;bFnZ z%>sY;<|mM^S%f7P8Ikjw4tmMV@JmryWa(NhE5bh1J*O#=qwluue1l<4ySc&s!G&$! zE1Ts4cLJ^c*#4G}SmumEINrY2^r?p_#6+tT%i!vvud_22nASjRrmJ7UuP)DtLO$D2KebxKk~H~TD{xtsqkQD%10c~ieg5s~ z>*Nneo+bGS0pAE$3=r)}sw?r_mw>0pVoP3wYE)FnMXo!1yi#$-*29bHF{ow0ZRypq zCd~cd;di|a^akpR|F;1ZaBS?Yc2N}lSAvckkqIGp9TCVoCHTWkfH`dJ^E}PBQ|ykl z>vbzS%#Wq!srYW7Vh{!iI>FrMS3Eo`j!>7oqE#nr2s$ec#=Ax`5*WsttaR#-&fXYk z)(7CB3I9P(R}0hIpP(GQAn#PFtw-2V^#xllijmihne*wk0fOH@vhFM(0E$)*c14NdF zzyA_N?vTU6@0!z@!)~J0;5GP6l<%oPnUGw6oe`yXI;Rq8`|pF48>N#LIPlTY6d?}~ zO5n4ipz|M`B4fN~3T2#{rKSA*w ztFjg2-Sz9BJN5OMu99km$*0pBNV&^DRxeM3)td52?9tUIw5jR(v3XXWlAp}86cdFE zUt?w9M|&4Ql|EpYn;-hUcuC7WRfW14)EDvQElK%h?$L!;#Qe60wkIc<_#3Q<8#$9q z<|ve5WnP--D`f|-G1&p)#egO+{2>7W0*nc@V^eHeb$eBm#NfSKfL~Y zf@-~@p-r#A7FGI%7cIb6P63^xFaldoZN}5r4_q?5inyuEp<6@Qx&V@?cw(F-$Xmo` zANw8WSy6+1`7|EUGBZisYJ;(swhz3&QClddWp=kktS{-A!X}_!9VhenN1)Umg1|&m#Er$A6Kmq7UkUKlL_-31v`qUhDYST2 zcrFDds^`fm1lfjdvBw`%u$7psc23q3@!GvxLRSbvVZS;jRZheCVL!=+JraC2tT+JV z5&2dUn$$mPe4uBgaLgfj8W{j#P@MQoY&~v}x24Ru(nM-#PlK(9m-XxI0z#~2!h4H& zO1R1WO6B?N4 z`r{$&T6-Yu6)dQeZOC3`$So{3^Jnx4adz-)ZSC|-Hh?xB;@*BS0a_z_-YJ^2U^>w+ zM8L$%k*g_aaPSI4qB2l6DjB=K8@tiVvy`Jqj*1i-0ZZe3RyK_#T>QP2d%`>N;&VW2 zzKP44*l;R!Ke5C{e!r}W8#xXFO+Wk)zfEDU_Rq}e-0P;lfO_58R52K)a;4~r2znEK5a-6ZqAV!0rii@R8Sa=VUSq{_YPjts z347MrtEGQd^?gFQj?Pf?VRxoNKQ!%75;~5yS*dMKg!MGAB!KVOpe|Hm| zY+(%4gH5sXPm`ladcN#0AKeb(5+oJIskDNyKr&C{FK}vDQ=91OkI!y80QHX5(N+Q( zBzrBiQj{B7!>agJoCvhv%$cM@)WvPDxMiGX70%k<%o9sdOF(9bpnjY&7UH19?<(?8 z7g`w<))A{BjXwVUnr}9PtrUp8b;1WD+TLz|)E?f@{-*6nv%K>u?|Gwm(rc;^onnm- z>z%_-LR8&_*Gm(N8>cghK0IFx5NmxNQL9=-clIZ^(52}Fi)UpJ|0f|KDJ({u38epm z2vGuQlW&Yv3o9%HCwJLv;I`9Bc9B4}Ohn zn4Xc(f?!JWP-MWkvo7eU0O!`=XPGqHzE^XT2h?UsJ;Yv`^J)pjO=M^ryA7d{J7^BqdZ7- z+$`28tOmd8$oS&8-Q7D>Jn&ZOP|i6}VyED!pzP2d|OO5pDFC8`ga&E1L8^t})#LFZ?FX>M*ro)>e{3{*0dRtb-!FT%AJomqZ>+!?>YwkXviL$w zl*Zf0(&bMX61L6!K658%fCl~hKYx`VFR=7U!A2zrVwDNjl>{gN$Lt{&DC~l0Ug_F3gWu?-Tr|G06U>SfXNj(I4tz2C2CHPBHPw8`~z-^@~`?8CO)p%;!df5Tb1C zho@V_pzmp{e*Qi^d;|As@jiZd>uw`sa?>uA@XGJ=YElVK&_ToK`18fTX0d~0z-SGp zMwjIvaX5_HETlyuWy8s)8vOU^uqX$X@;-|I!CoC#LBo%fL-U^@ zQ(f-S0qFg`VYTJXx^?z<-y3*hS$MFFJ)C1HKHUvEoH@Re&!Y>RmI=||@}j_C_l%tDcbTLq@f#CDS}GA61Lf5uThnxSZY7K8Yh3=B8myWtFk zh!&CN;BvFxKV%F|F{{#LZ7Ii8T5K-e30=zu6EVM?2@4PuAoq$Y0#< zykm0U`_`qo*C&b@yP1)wZ zn#f^HEtf-$+EgI>#l|s8)`J-R*P9ktV|bjBiv{9Je!tF*o(kStspX)BM|sEd(dFoe z%(63uIN;K&8122=#*1@ztCp-@Txt!)n`q~Q;Jl(#DJ;N*$|hL0Xhzh=Gye^LtfIah z(ZbIsf{~3bqyXyt35bWNWj~kx?VOmB*^J!s=r%O;^r8c!>iF2rsL|egHtv84dP{Mf z2$v3@5;;?8PF`PA(2~``gNNUwk8E0-SF(q(0$mpJ-;tAJFhz~UGfoow5?@6Bwas`= z#%&uD(rUM+m~4=O#1gv+SMN&L5OE)!um70?%5!+A2l&AMykmOELRGipXId&p_3JMma9zjza2gDgE_iU+o%T6Qa%7Ja=xw}l z?0pC(v*EE+%~o9N<{&|bu*bXGOLC;ubfL+IW8oNT_MYb)qY@ZYB=RnPoz3^M4hPkW zhnNG~cM8W3{)n&TymPtnr^3N9H@C+JX^u(?9+dLI?AAtCx!xwXuE@J9h>t%C8FbJ} zPHmB~W6sqNr>Q1}G~a$%B?eAc_xXLYGmYerm>3ov{KHaq^EA$69?v6~|9$l-JWQ6L zMn$HFVSfs1m6?_Z$5T4;AY*vI+&)F?5x|$Fw(y3MAOs7u9K?!8vXswkPE6d>zw%a~ z49de`qllx>W+43X)3(#?ZhfebWI{fuycYOqREb0|C8#Z27OeafMD zkP=-kEPB&iqP_(!K4{kM-ZOd~u}yqVZ}<4ICG1KVyC0R01y#{x;~h&}66+^(d9C)w zt;pSHpw1cZJGX6XbsB-fOS(H|fWPOYTf75RLPEb*(ZBgN$BVtnv=Zz!B%*T_aWLly z6vvgM{)}1jeO@7^BP90Y#j%|Yovr=-`sfxqXu*XN8QirWU?;J$e+*e$4143&W4Xj- zu1AO&?Y#FQ!`oeIwN-~_<#W3>&*;FZmke_Fk};Mfe4Suu5Jls347})oc=Zv&x3PnU z-Q{)^0DY|7oN%`Gl=j*2(c|mGuSFm7vwQ;lteBs0<*V`kg#n-e@8&TK>sh<@pqj;Y%>1s35W$KhmXz)qP%b z-pa%>n~-5NFXT~{Sw0Ma6(Xzy)9htMtbqg$OZr?zdyPbA^{;~#tvW^+Lt;%4^vLrQ zO+JNnVTQEM+w2OTPeG_+1^M1!4zBV-<3(0R1uZrnd7PsC5><|6UQPQqFNQ6Yku{4n z3KJ&nf7x;GOAiUM6@FOEce10Xp*2c)LnT1=rrL=dn@=NuMhh_1EFLvkaS_)Z8HUOl z+{v3_KJKSPo%%mV*t&#Gu$8;Rn`lGoe%hv+*zNB07vtne>e8PinF?Sn89Ek_Aw^E{ z$i^;%HtHJ5vRrAO9LZlwrY&OiGp3s7V7%j9AVEfTy()ZmA4_XwaAr+(ttO$#>YaQV z7FQ#t*ZkNZ9{~*5Jv@Zfj_@idDOOWxLSWDr$v#4&Yh{c3!pI}x2Fw*JQ5VjqD25Yo z?CD$XUnFsjY}OffF7&TU*;xLoZnoZZEu-0STsf*?)v_K!G5O0+o|>XnU>#S%O;fX7 zV}0qSKGp6FVuJ29y45}<6FB=%f*16%L2tW#MsFna&Z;|KB!OJF|?A65uExBgl+8-223|&Nf0fn zv0nQ32k=jwYQK(hrxVeXGt&{vt&HDm*OLvL$>%vhG1}ib09O&imojAwj%d$w=E9Ex zobRucn=D<47fWMFr63n@`uZ(1xqn?|d28KKOG0^-J6Eqa3M@Ijy8<*pKYzYASgDb- z%BS4hjLI3NWD5NSR-`jWWCV{meXiqzUym@X{iih<(-&T1D&3izKWDIr_-oI+>gOir z7BYe-(@w1bAi&RPWdCzo^ja~;$@=V%f3gjnuS;*z18$TItVgr5R_c)>eK)@or#e0s zRdwWI&uxg7i|hTyI@|M_mcMOi zFL3*~J*z+=ni21q#LBN%VTs7wk7mJ?T~6UG%W_PBU&PNpM^m=8_iq(q>l|KgwJBfI1YQdu?Eyv zidp9G4(|1tyw^(o$Uf!6I&)vp4>Wr-iW+w`E2VdNd43#XsUI=~W%s?-y}#+~#pemu z7tn41SKtm5A^&pM$2`ZGT7=0tFEJ*onAX$Rf@1!b z9>Y6V*1)&xOD;i5!VLEXoJ_&Cj~)EXKg`%_UWwFv^GnD^yPK)n0WiXm=i zSnc?QGUI5Fu7z+27RX2Nhuu7Bc>6l-mADH5MA;)hE6H1kHcZ=0afHrU)AhNE9a_JY z@xx68vQ8CGW@S)}Abj-c86#J8g7dgAUq%ml)P!|CXkF+XH>mULCLV|{pzFUS;D1^B zKP(lhgJi<5qgDEU0>}3`_&0eq&$}Pj{_Rum2_p&4$T6a>)tbWWdOmNtP`cxw8WES) z3`pn4o^844i(em!D;<1*{vvr64Z}0-)4Mx7J3FuQoMd0nh2exACI}S>VHMNQEVU>4 z+j)5w2d`!Crc23kx(-Ebgml@78I~GM-+kW+`g;);k)<%`2F>80mBmVj+zeVVVEVX& z4tOR9?KlIcdNx$3lpv{DQz0#yo;<%{dWE+ZBTsz#RK77<{oVoY@GL$ijQgK0eyVZC zk_W2}gkSRF#S(&K0vEkC-=@0W1phnkc|?A42oA#bcbds9M$=|qd{EF#WR}2z>^dh^ zJbC64kx;WiWzaJIu;`wTd2(XYQH8jrgiDEx4ys@|b6f4w0O0hz7kzF$P?*AV0K*~<6r0pFE^SIbSQO(nZqN3N;9 z=kom%u}&_^b!zSI9C6DKQ0#DRimsqc!M&L&SYne2`3LZNxclYAOfbUtuV`J8x;i+Dg9bE!2H8vp>E}f=yRu4(CmyAjMBixsq53+BLdN2l1`_ z=j@B+U(^d1A({Q}l|Q(Y4%z_c!$xv*oY#k@=lC_@$6ubpx2N%J=-@Hh!hcuMJSV*W zmO|5Jb%6Y8GF#Iy9A&G4^pNwsn14P!8a;t0IC{*sf1V_nNj7j^qFt#p{iR)b@yaD- z>qU$eQaOJ;4Ydyhi%KSBr-YuT9{dC01}>cd)oZ{fVOJg6n}(2uh0>?u;GO% zKTcT~Mvk`L(t#}5BIfr!iE|2n4LuWY=<3Kuw|Awe+4qj&t)r`JdTS_pS95>8_UQTU zpk9wvy42i;(?RG$Ju77m?7(W4g1-Y6fF9{fk)U(?R&|P%y9*#08-=uS2*yn6xV|;f z0l|?+%DlcvosSE5P0nz*RdKah zql;UGhplOJVr0a6>0!=f!z9X+ySkiv#m99!8;n%Z`sUsn`1nBG7r0Sas3UyuGh;y2 z=6A5^;tGcWd(qa)t*+IbGGlvvV$TKOf|vA=p1yEB`!JAOhC79#N(t% zq;S%LNv{q`XW(lksZyvdY{o=@_X4EK?<>eaUqL36mGuN39__8DuRyxYfoRsNBAdvykSL^E{5L-m6Ld5G4S2mUdxxh+WqMn&z{f1DG5XyIef6UjkKMde+gQL!c*3Ob=VdUWz~x2POWRd4uN3<>2HEHd-rMj$Po@ksgxk%rFSGO@ z7jC*@og1ClX@$#uX5W}?i&l4AmX1!Xvzk2U?*0Z@(X_rM_@|WRFbEWh+fOqKnTfcI zl(7g9j<;*+>BJ)?!`fg3X*yblgKPNz9SaQY?$HeO?O$GCIu;7># z(eH8$LVOc149)Y(C3!7|$WjZ23W?JQY73W<+!&tRJB-uNVX`azmJ)j<*ezNcfA@p@ zNgjwJJOQ9zlN)M?IQ0>SZ(s66FdLZMa_9uRcx{Ki~{Cg-o?WxE9D1@y9jUDhthN1Dyh3_|#SXd%`Soq7x)Zj%enfBRD zVA8YWIy6S!T^l zQMOZPWAjBjH+L>?uCq9dx6n4kVHPJi(0~zNTHcF%`!bs%GjWRkuJKRycG3%I1{(w= z_b}KB!#D*$$WBhp?sqiCzlA{q!YITmAU$RXn*JUFdZl`5WQA#_V}-qtrH4SZm%n%3 z7q=X@cX21Fke}6|mti7N4YmNM_Ih`#7aHTsn)E{=0@@gmO>7XZLtn{Wu>t%%3RqwQR)RehYzJwevP@Coh@$BT?+rZ72)9?nYXYh z#(l`d&rUl9fj{ic7T2Ud_5em_AT!)t5yHXgRZ#y2S3z7Sn+FqFQ?%|x|2G_Zu_W}* zX3L6A?6b=LbS>wC(Dxse;O^v24^z$B*c#&wnD8ilO+^TfOoC>qB77T+Nj~>2Rcu#W zwFxg;5c#WTMf|jwKjJplwaaz!$-H>v#naI+C8)_1q+$)wgA$d#O)gVn!tZb zQe7q4+ZUADCBD4bA{usirElTr*iuqhaqxFl7cWj7P5t4UFD%MkdANr2!-uZKb8tdXpcDpC1+88U`E4RfKRwXMM<(181Ph7c)GWDvo!N<^ z9%+x9eB){rw1R}sxGIVCpQ`gK|Yh|eS^^31RA{iH{MiP7MQ=e+#2)3%2w)so2C zlnE*afo|%;YF*e-Ej)9gN@eyE(?h83-_x@~pOB8d){ktZP?;$UCN>_I+mWTf36T>e z;>BP=0u7R|6jcbn+&>{t%_$P3n#jm!cf8XXLhj&=)EJkSJ(DG$6KlMmGj~+^@9MZZ$kZuJ>wfJyey5r!&|at5&;SmC z;=MPJJ{lQh0j{WRytpEh<3W0RbMs_&<&s*rv_;R__l*-J#;nhz4rFs^W`OkYBnojPdg(=jb_2bJ7`ad@( z0-K=A-K^Kx?F|Jp>-W4$ztXfykQy@Ma?LVObj>*NDsJXhOc(dF{y2?J6z^b9L$(+o zaq-h3Y!yurhd>Je>@<}M@Req@gnGMX5s)HB_3?PN#*|b@0Vv_xd4b+)`EOcS0HkB?(*k>ya z+KYr2afi$o@fT8m&;M#RRbPl?bl~FHFjDy#OG!#8^O*ozH|&p?{zt;7#~&`#e>X*? zpR022^*0F&y@6t&CEDRV%VJJFw?CmMO|_ei!RHj)2SUY2ydZ_4?Fd+{)2mi!&a+5;QZ6DL11cu8KH&@kJiA zvGq&^z*e`eV3>&z9f$Eg<{vkM{{Dvvow_E`R0{38S9s~rx>UXZ8H9nLuT7*!wtHkCH7nJ1FV>j=g zVWf-uh_65yl2M2*t@W9;GD>oit?T9LXEmbM*xD1lS904E-FJUPm%Fo&l(~=lR?+hDdyheAjke)}e3!BML-QNJH=Q}2-+`@kS^>=>3#W&kRFO6?icghAX|LXB zD!v|yckoJ439|n76N|l26zdu_ZzUFHKT8pYxvEH{SK0yuDa|(P4E7IQdU=hmg|PM< zMImpm;^@gvE9B2x#`z70#=r~K&jIC%71x*0X7k*rnyC2L%-O)xOh-Zai#apEh-%vV znkKasb`bmomA%!GLixb%+~&%}Wof$p*Za=}l0p;XA%X;nh7`(1nprz-`gmzu75s*w zt0mJtD#LYVcU@OwY>ImlHju!dA8NAs!ii+E_Y=-$EQ^x9qeovI3-Gq&hE*x7-x4jj zr1t$=c3O)6<2eMy@g{$l%=Q&vXtcoFYu8{8JdL0powKx`rg!{7#r$_foR0={6ngyH zL`c&&LhbnBA;Z?E-@~>4H+b{bdPY$?R1|HB%N#v&Mv&H7vhO7M_=R(1UZmbOId%`) z{aTcW##pjVpJ`+2v!aAGo|Q5pMmz3&)$cLoi;D`IN!FXS{O)~~)(>}p`_g9=DMgjC zI`%d8PNv6s4Lnmi>sm0l%sk)OmD7vGDNYGbi-uG;KjyA3(-F%mqNpmU)ss9$E z#TXt47Ug463_xosFQW{buVzg<&e%+P*)i4k_u-l^MC?fZZvK)BM}`1Ga~03i5SY7v zA(^{n&3^HQnfGZfldl#)G0U7nlV%uswcX(C_cBqzN4;-xQ8L~^(Uc-LFlnz`@}m3{ zb3Q3p;@O3?3_Wc%A;)R!FvQiEs#iG41k;N&Y(|$8&m6)BFJ;Vo8GW#;Xd;`rsqB_Y zLa{t7#0GQv^@J&MeTF9eX0jvlt*2E8T!$tM>dF2vcU|aIGwlr6my@K#7C98OTAFC4 z;@O4nkvt-kr>t9z59C)`b$TB6a<2xt0s^>sQVhKi>NzDbkw?ITk(IgC%emc)-D@=h zRovr;AD-qC-O3Fs6^n=21ms!TEpKfQXf2orVC{V^3*EL5dE~_9$PccI*3-q;ooR2j z@dz)%ax`4S`RoDLneuQvMq12IgZ|O&q31iAt8KquTgA3J>p_-WXrbuopVW`S#S_Su zVNarXMRBZ=2xB7JbgS^~0zLa>j^2Hec&3F)|?O&h5j~6N1FFT9C455$|5ytl&pIhArENNI7`OJxUwcZo{a?8)qdqS zGlPkM!eUr=!JDhcKL%!$0$LZP2*NP3cwC|THu4RD7PlYSP+}}Xu)Hca#YSs}e<&?$ z#$!Zl6a7>9pK_77rL9}W@Zj|qiI(Qp7CD;cmfTF&)A9G8Fzc=)j!OPx0(PJ8HKV9Q z%*z$>0hijKzcQKB<HZ`A%a-CNo?^qXc z8VS1`o}wcW-)qmffqyy4?f(`xoy2?Xc&8es4++JL@4yqc#cz^c+1^w4BfSYtdhvJmD>z@Ds!|@l;U|EPwo4n-)ddINwNBX zrl70`d*zSPMXQS`JEf9$*UTZ*Q;$0=6X)DG5Yl+Iv4D9nf|!1HtA;SzbA`q*gCk$t zlRM;s!td^OTm_^52pt5cpea|VE-G;OR7=5bt3e=%^^rYl#$Fk|*;-z3cdo`vDxEwh zZ>AN!VQDP$1le}`XChe}-HMG%z(3SMZPAe8iLcsd7S*0aOeQD89q6cnrAa6{7!QXq z(V6Z~=%h!LU=yQ5-H8zlrdGNp*AG9_62>CPg+QO zqu9=QBgoSzapm6D(r3EFP=McjQRIod+uGy;Y7C8#w%vZ?Fw z%dCb@Y=&VW5nc~|2_aMOzo+Q3zA_}VJwlpECL$NAYdSJetrVD(csFhOldjMJn4rv4pgEekV zt1C-C4Ej6JX-_EQ4ERbYLT*aq=H!=p!KOaqn9)w85>$nDNB%d|ZbWn1H+LFqoYu^$T;-b2FW;i46Vy<$KMnS$gcXm(N%FZcBa_LjM_T-{-+!n?=yt5-ddd z*xTGN(VYc-Cp_#hX|3}(CS7mz!Nf*daNHj@U6Cr^8=`&(AkB{T-Lr(aG)K;4wku~7 z^!cH*okgG!fTE_5k46c?t}rmQxJMbeU+~BhDZF-Nb?bYvZDgTqPup3qqkr|^+__@X zt#LC7nVGh7?B-*4IoRiBQA=akdOrR1#v&y@M_7vL!E$Ewv)S(T-;38na9)9hLS zFJPo)v^4-;f_tcwojeoZW1Lc z%$eJgN?7UE&xL&lMEi+~agzvW@MQ?l>OGBoRG{?Ea(}-ulcgHw!^#*sCDL@Ns`d8X zC-%t6VNZf@a99I(gJ1!l5`7uyrviLs3%-Zk*G>YW|Dkn{qn)QQ4{sxZO5y~jir+!J zrB98LFux^!g5gVkK(!RmBFNkkL%tG@b<*~7V;0Rik%zL2jqQ!)RT~3uwFjDBGGpj; z%AUF`fTT-9(xax*OSQVitgxx@Aehnn0@Bix4Zx-6?>_j?l5q>wp#{nCIk7}K6Ry

n{@pi$e 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 Q1o%f)@vTC=oO$^F1FLW%x&QzG From 0a996fa240b123aec1674f95b345116c2b525fd7 Mon Sep 17 00:00:00 2001 From: Memeji Dankiri <39416235+Memeji@users.noreply.github.com> Date: Sat, 17 Aug 2024 18:11:29 -0500 Subject: [PATCH 31/38] Added dead-check back --- Content.Server/FloofStation/Traits/LewdTraitSystem.cs | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Content.Server/FloofStation/Traits/LewdTraitSystem.cs b/Content.Server/FloofStation/Traits/LewdTraitSystem.cs index a3702b7beb3..6a5a927d417 100644 --- a/Content.Server/FloofStation/Traits/LewdTraitSystem.cs +++ b/Content.Server/FloofStation/Traits/LewdTraitSystem.cs @@ -279,6 +279,9 @@ public override void Update(float frameTime) containerCum.NextGrowth = now + containerCum.GrowthDelay; + if (_mobState.IsDead(uid)) + continue; + if (EntityManager.TryGetComponent(uid, out HungerComponent? hunger)) { if (_hunger.GetHungerThreshold(hunger) < HungerThreshold.Okay) @@ -300,6 +303,9 @@ public override void Update(float frameTime) containerMilk.NextGrowth = now + containerMilk.GrowthDelay; + if (_mobState.IsDead(uid)) + continue; + if (EntityManager.TryGetComponent(uid, out HungerComponent? hunger)) { if (_hunger.GetHungerThreshold(hunger) < HungerThreshold.Okay) From 73823ccfbcb33aa3c970e87e99b646bf98a263a4 Mon Sep 17 00:00:00 2001 From: FloofStation Changelogs <175611579+Floof-Station-Bot@users.noreply.github.com> Date: Sat, 17 Aug 2024 23:21:43 +0000 Subject: [PATCH 32/38] Automatic Changelog Update (#113) --- Resources/Changelog/Floof.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Resources/Changelog/Floof.yml b/Resources/Changelog/Floof.yml index a9aa7e963f0..392dfbcec5f 100644 --- a/Resources/Changelog/Floof.yml +++ b/Resources/Changelog/Floof.yml @@ -532,3 +532,9 @@ Entries: message: Updated the Rouny Sprite id: 72 time: '2024-08-16T06:52:50.0000000+00:00' +- author: Memeji + changes: + - type: Tweak + message: Cum/Milk regeneration doesn't use hunger. + id: 73 + time: '2024-08-17T23:21:19.0000000+00:00' From be97fc444185870df8a83f108b2c71399c1c6312 Mon Sep 17 00:00:00 2001 From: Dakota Haven Date: Sat, 17 Aug 2024 17:29:36 -0600 Subject: [PATCH 33/38] Fixes -Fixed a code error typo Signed-off-by: Dakota Haven --- Resources/Prototypes/Floof/Loadouts/departmentalloadouts.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Floof/Loadouts/departmentalloadouts.yml b/Resources/Prototypes/Floof/Loadouts/departmentalloadouts.yml index 1476918de0f..c9f438f2eaa 100644 --- a/Resources/Prototypes/Floof/Loadouts/departmentalloadouts.yml +++ b/Resources/Prototypes/Floof/Loadouts/departmentalloadouts.yml @@ -519,7 +519,7 @@ cost: 2 exclusive: true items: - - ClothingClothingUniformStripedThongWhite + - ClothingUniformStripedThongWhite requirements: - !type:CharacterJobRequirement jobs: From 60b457d005ffe7005da67c379ef90007a4aa29d9 Mon Sep 17 00:00:00 2001 From: DakoDemon <62726358+DakoDemon@users.noreply.github.com> Date: Sat, 17 Aug 2024 17:50:16 -0600 Subject: [PATCH 34/38] Update miscgloves.yml Fixed some fiber type errors --- .../Prototypes/Floof/Entities/Clothing/Hands/miscgloves.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Resources/Prototypes/Floof/Entities/Clothing/Hands/miscgloves.yml b/Resources/Prototypes/Floof/Entities/Clothing/Hands/miscgloves.yml index a4a74c3d754..a62a27e6ef3 100644 --- a/Resources/Prototypes/Floof/Entities/Clothing/Hands/miscgloves.yml +++ b/Resources/Prototypes/Floof/Entities/Clothing/Hands/miscgloves.yml @@ -69,7 +69,7 @@ - type: Clothing sprite: Floof/Clothing/Under/Gloves/stripewarmerwhite.rsi - type: Fiber - fiberMaterial: fibers-cotton + fiberMaterial: fibers-synthetic fiberColor: fibers-white - type: FingerprintMask @@ -84,7 +84,7 @@ - type: Clothing sprite: Floof/Clothing/Under/Gloves/stripewarmerpurple.rsi - type: Fiber - fiberMaterial: fibers-cotton + fiberMaterial: fibers-synthetic fiberColor: fibers-purple - type: FingerprintMask @@ -99,7 +99,7 @@ - type: Clothing sprite: Floof/Clothing/Under/Gloves/stripewarmerrainbow.rsi - type: Fiber - fiberMaterial: fibers-cotton + fiberMaterial: fibers-synthetic fiberColor: fibers-colorful - type: FingerprintMask From 59365ac93b3e7e7be08d573da9d377f01fbf8896 Mon Sep 17 00:00:00 2001 From: Pierson Arnold Date: Sun, 18 Aug 2024 10:42:20 -0500 Subject: [PATCH 35/38] Added coder arms and pink collar --- .../Inventories/clothesmate.yml | 1 + .../VendingMachines/Inventories/pride.yml | 3 +- .../Floof/Entities/Clothing/Hands/gloves.yml | 12 ++++++++ .../Floof/Entities/Clothing/Neck/collars.yml | 11 ++++++++ Resources/Prototypes/Floof/Loadouts/hands.yml | 8 ++++++ Resources/Prototypes/Floof/Loadouts/neck.yml | 8 ++++++ .../Hands/coderarms.rsi/equipped-HAND.png | Bin 0 -> 733 bytes .../Clothing/Hands/coderarms.rsi/icon.png | Bin 0 -> 884 bytes .../Hands/coderarms.rsi/inhand-left.png | Bin 0 -> 617 bytes .../Hands/coderarms.rsi/inhand-right.png | Bin 0 -> 634 bytes .../Clothing/Hands/coderarms.rsi/meta.json | 26 ++++++++++++++++++ .../Neck/collar_pink.rsi/equipped-NECK.png | Bin 0 -> 314 bytes .../Clothing/Neck/collar_pink.rsi/icon.png | Bin 0 -> 252 bytes .../Clothing/Neck/collar_pink.rsi/meta.json | 18 ++++++++++++ 14 files changed, 86 insertions(+), 1 deletion(-) create mode 100644 Resources/Prototypes/Floof/Entities/Clothing/Hands/gloves.yml create mode 100644 Resources/Textures/Floof/Clothing/Hands/coderarms.rsi/equipped-HAND.png create mode 100644 Resources/Textures/Floof/Clothing/Hands/coderarms.rsi/icon.png create mode 100644 Resources/Textures/Floof/Clothing/Hands/coderarms.rsi/inhand-left.png create mode 100644 Resources/Textures/Floof/Clothing/Hands/coderarms.rsi/inhand-right.png create mode 100644 Resources/Textures/Floof/Clothing/Hands/coderarms.rsi/meta.json create mode 100644 Resources/Textures/Floof/Clothing/Neck/collar_pink.rsi/equipped-NECK.png create mode 100644 Resources/Textures/Floof/Clothing/Neck/collar_pink.rsi/icon.png create mode 100644 Resources/Textures/Floof/Clothing/Neck/collar_pink.rsi/meta.json diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml index b8398008d41..9f5362af5bb 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml @@ -23,6 +23,7 @@ ClothingUniformLoinCloth: 5 # FloofStation ClothingNeckCollarBlue: 1 # Floofstation - Collar addition ClothingNeckCollarBlack: 1 # Floofstation - Collar addition + ClothingNeckCollarPink: 1 # Floofstation - Collar addition ClothingLongcoatNT: 2 # Floofstation ClothingLongcoatAL: 2 # Floofstation ClothingLongcoatBrown: 2 # Floofstation diff --git a/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Inventories/pride.yml b/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Inventories/pride.yml index 28d2fbc1af2..f2db0a081c8 100644 --- a/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Inventories/pride.yml +++ b/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Inventories/pride.yml @@ -26,7 +26,8 @@ BedsheetRainbow: 2 ClothingUniformColorRainbow: 2 ClothingUnderSocksCoder: 1 + ClothingHandsCoderArms: 1 # Floofstation ClothingUnderSocksBee: 1 emaggedInventory: # 3 for more friends! - ClothingUnderSocksCoderValid: 3 # Floofstation \ No newline at end of file + ClothingUnderSocksCoderValid: 3 # Floofstation diff --git a/Resources/Prototypes/Floof/Entities/Clothing/Hands/gloves.yml b/Resources/Prototypes/Floof/Entities/Clothing/Hands/gloves.yml new file mode 100644 index 00000000000..bb62055ff86 --- /dev/null +++ b/Resources/Prototypes/Floof/Entities/Clothing/Hands/gloves.yml @@ -0,0 +1,12 @@ +- type: entity + parent: ClothingHandsBase + id: ClothingHandsCoderArms + name: Coder Armwarmers + description: A pair of armwarmers that provide some protection during those long nights at the keyboard. + components: + - type: Sprite + sprite: Floof/Clothing/Hands/coderarms.rsi + - type: Clothing + sprite: Floof/Clothing/Hands/coderarms.rsi + - type: Fiber + fiberColor: fibers-white diff --git a/Resources/Prototypes/Floof/Entities/Clothing/Neck/collars.yml b/Resources/Prototypes/Floof/Entities/Clothing/Neck/collars.yml index a0d64910eb9..5ce31b6f691 100644 --- a/Resources/Prototypes/Floof/Entities/Clothing/Neck/collars.yml +++ b/Resources/Prototypes/Floof/Entities/Clothing/Neck/collars.yml @@ -20,6 +20,17 @@ - type: Clothing sprite: Floof/Clothing/Neck/collar_black.rsi +- type: entity + parent: ClothingNeckBase + id: ClothingNeckCollarPink + name: pink collar + description: A cute pink collar. + components: + - type: Sprite + sprite: Floof/Clothing/Neck/collar_pink.rsi + - type: Clothing + sprite: Floof/Clothing/Neck/collar_pink.rsi + - type: entity parent: ClothingNeckBase id: ClothingNeckCollarEpi diff --git a/Resources/Prototypes/Floof/Loadouts/hands.yml b/Resources/Prototypes/Floof/Loadouts/hands.yml index 5cc25557ed0..3b2705b64f6 100644 --- a/Resources/Prototypes/Floof/Loadouts/hands.yml +++ b/Resources/Prototypes/Floof/Loadouts/hands.yml @@ -5,3 +5,11 @@ exclusive: true items: - ClothingHandsTacticalMaidGloves + +- type: loadout #FloofStation + id: LoadoutHandsGlovesCoderArms + category: Hands + cost: 1 + exclusive: true + items: + - ClothingHandsCoderArms diff --git a/Resources/Prototypes/Floof/Loadouts/neck.yml b/Resources/Prototypes/Floof/Loadouts/neck.yml index e75b8560268..c227a7b0ad5 100644 --- a/Resources/Prototypes/Floof/Loadouts/neck.yml +++ b/Resources/Prototypes/Floof/Loadouts/neck.yml @@ -101,6 +101,14 @@ items: - ClothingNeckCollarBlack +- type: loadout + id: LoadoutItemsNeckPinkCollar + category: Neck + cost: 1 + exclusive: true + items: + - ClothingNeckCollarPink + - type: loadout id: LoadoutItemsNeckSyndieCollar category: Neck diff --git a/Resources/Textures/Floof/Clothing/Hands/coderarms.rsi/equipped-HAND.png b/Resources/Textures/Floof/Clothing/Hands/coderarms.rsi/equipped-HAND.png new file mode 100644 index 0000000000000000000000000000000000000000..853944c1828d3974ded0071a314894fb989c246d GIT binary patch literal 733 zcmV<30wVp1P)g_{?7I>sm%{BB?82>lU6>RIMm1(-7P$swVFV4=R~h zLij}3tI2@Ex27Jq_|4?B#a||Cku73%eb}JMgR3*xN59KL7v#0000&RnJN&gQJ zT7+-jTtT@4q6Y5Vum>Hz=%z+dnQgYu{E>_maf P00000NkvXXu0mjfWCdUO literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/Hands/coderarms.rsi/icon.png b/Resources/Textures/Floof/Clothing/Hands/coderarms.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..81f0bded3a1053a92dee02eecb0fb6d28ac5ee0f GIT binary patch literal 884 zcmV-)1B?8LP)tcQZ4b|w|aH1Ya6}El%ayHM|ein^rEm#Lujk0S-dAaq-Ntu z;S*t>E&~eRT6&_+Zx(0j{AIBo4bOw!>ZxQ}IMKptR?iDh2z&FnlG>QZ`Vx1lupE&* zB4-qXFhK$+Bq*^#jv{`^1=(49-(=0V#HM&ud25u>#gQQ^UZ1EX>6((97Cj|Tj;{~n@P5-9sY4%(6N>lS5gJ%aWZ<<=- z0Iqgn_*skV@tWk2V^62y;{y6(FnABHwfe3a_nbdLbX$JW9ULCPxYT>r{{X@uXYD?p zx(5IN0l`T`K~z|U?N&Q(!axvxiE@KZrUys!ZCDzJSMH{vy)w!R z4CQQFVa=4(_j?WiK+at3cUufcV*vI8Y4v9z9P{=0frrN@0Dzu{0D$k8`;0&v5>^D1 z7nsOb*$&|LD=%o(hQ{Co8u=fe z>ln*PfI1>)3FLrv3^{XgI3+m}hf{*#Xbi1mgwsVfm^?UBOvc zpw4dh?KSrd0O52|DQLgjBAhPjogg*J3;s-d(TT`cxgAiZnsx=L=l7-Hk*_ja2|#&4 z<@EEl1jLcsUWOU3*5*LbA4a*zjDD09VWf@q8l!Mdf8y zmpMRSWqGS_2CkHp7Yml<&jHi{pM7c2qT-9?s-I$AbkRi@mxv$NUyqrnju{dF0000< KMNUMnLSTXjrI6SF literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/Hands/coderarms.rsi/inhand-left.png b/Resources/Textures/Floof/Clothing/Hands/coderarms.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..7994331ab6df664095baf957d6122da9d2a27966 GIT binary patch literal 617 zcmV-v0+#)WP)tcQZ4b|w|aH1Ya6}El%ayHM|ein^rEm#Lujk0S-dAaq-Ntu z;S*t>E&~eRT6&_+Zx(0j{AIBo4bOw!>ZxQ}IMKptR?iDh2z&FnlG>QZ`Vx1lupE&* zB4-qXFhK$+Bq*^#jv{`^1=(49-(=0V#HM&ud25u>#gQQ^UZ1EX>6((97Cj|Tj;{~n@P5-9sY4%(6N>lS5gJ%aWZ<<=- z0Iqgn_*skV@tWk2V^62y;{y6(FnABHwfe3a_nbdLbX$JW9ULCPxYT>r{{X@uXYD?p zx(5IN0Jcd)K~#90?b^W!0x=Lq;aL%jSaxd=u?PEzC0Rf`d9#AtEFgr`pe%T>fSj_Y ztss+N;C%%=0&~nS0ssI2000001!C~Ir|wQO=8VmU=TDrms*kPJRTYEJDWx2P&)V18 znpUbTvLtfw`cKzR&$Tg4K@P+02EmPHvMs1=qpj>00000NkvXXu0mjf D_naAT literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/Hands/coderarms.rsi/inhand-right.png b/Resources/Textures/Floof/Clothing/Hands/coderarms.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..992c269e5ce4d5bde03001d6b199fac7086620ae GIT binary patch literal 634 zcmV-=0)_pFP)tcQZ4b|w|aH1Ya6}El%ayHM|ein^rEm#Lujk0S-dAaq-Ntu z;S*t>E&~eRT6&_+Zx(0j{AIBo4bOw!>ZxQ}IMKptR?iDh2z&FnlG>QZ`Vx1lupE&* zB4-qXFhK$+Bq*^#jv{`^1=(49-(=0V#HM&ud25u>#gQQ^UZ1EX>6((97Cj|Tj;{~n@P5-9sY4%(6N>lS5gJ%aWZ<<=- z0Iqgn_*skV@tWk2V^62y;{y6(FnABHwfe3a_nbdLbX$JW9ULCPxYT>r{{X@uXYD?p zx(5IN0LMv0K~#90?b@*ogD?<<;UkI|0>KOju|xJCRpwy;QqeI19RpaFXGnxZ!2ncF zn}WiiSm5aY>XZC*y3S7o00000000117_IEl8C-15d2t!)tH#FNEPd6SdI{cg8m+9+ z$}Y=d&w2^p`L<-dx(rRVkt|7N7+bkL@6rC4{^Ug&^;KiDB$e0r{`~`6H+zH-G6Dbq z000000000X`iFlwr+&biP&xzNgwPpqvHJq1+DP2ZGCW$zi}IA60q^*a2LK>wA49Tn US_pw@bpQYW07*qoM6N<$f)(E&)Bpeg literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/Hands/coderarms.rsi/meta.json b/Resources/Textures/Floof/Clothing/Hands/coderarms.rsi/meta.json new file mode 100644 index 00000000000..e6321f48aea --- /dev/null +++ b/Resources/Textures/Floof/Clothing/Hands/coderarms.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprited by bribrooo (Discord), original from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HAND", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Floof/Clothing/Neck/collar_pink.rsi/equipped-NECK.png b/Resources/Textures/Floof/Clothing/Neck/collar_pink.rsi/equipped-NECK.png new file mode 100644 index 0000000000000000000000000000000000000000..b295e5862416d48990b6a05c98d04350d1570bf5 GIT binary patch literal 314 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|zIeJghE&XX zdrOh;kb%gtkNqr%ML8B6Ea>6XYmj4Ca9n&*MJC}zEW<_S0tTMX(PgYDfw5f*k=_z4 z|Lm{ly{%rq`u1d?F&EC2X6KyvWBq8hNp(l+r8CEly>H!e>d#b`lV+bqj-!wtExZR{qH_s=9yk7?W&i3ev|7uzjgn@ zf4zRh2s9iF8sx8s$~*MTxbtfv_o-dK{;bdJpWl7o_(E98r*-}Z@@Kp_E9^V{WA(Pc zC!4+{&DyAKwar}d2b)EmL%GD{$~Sq5ak^3vgMK8J-+z_3Vn$8^Gf2SG)z4*}Q$iB} D*dm15 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/Neck/collar_pink.rsi/icon.png b/Resources/Textures/Floof/Clothing/Neck/collar_pink.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..70dd83c7259732499e4c45cacb3fe20bb86f4183 GIT binary patch literal 252 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|6a#!hTp9i| z>`I(>@%-7JKYw1Y-sR}%2$Xp@<>KVYlW(kKD2QNK?mN2+D8yY7e|G45ROX ztJhMuvfuG>y>WF$cOt7=`u)pnX=xmd4*TXZ&g@z6bmp$hjH~ls Date: Sun, 18 Aug 2024 21:20:38 +0000 Subject: [PATCH 36/38] Automatic Changelog Update (#115) --- Resources/Changelog/Floof.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Resources/Changelog/Floof.yml b/Resources/Changelog/Floof.yml index 392dfbcec5f..fe3c726dc48 100644 --- a/Resources/Changelog/Floof.yml +++ b/Resources/Changelog/Floof.yml @@ -538,3 +538,11 @@ Entries: message: Cum/Milk regeneration doesn't use hunger. id: 73 time: '2024-08-17T23:21:19.0000000+00:00' +- author: ShatteredSwords + changes: + - type: Add + message: Adds Seb themselves as their own thing! + - type: Tweak + message: Seb will always spawn instead of Siobhan in Floof maps. + id: 74 + time: '2024-08-18T21:19:51.0000000+00:00' From c9b45c20d1c56a8367d131aa86536abf7bf25605 Mon Sep 17 00:00:00 2001 From: Pierson Arnold Date: Sun, 18 Aug 2024 16:37:11 -0500 Subject: [PATCH 37/38] removed coder arms --- .../VendingMachines/Inventories/pride.yml | 1 - .../Floof/Entities/Clothing/Hands/gloves.yml | 12 -------- Resources/Prototypes/Floof/Loadouts/hands.yml | 8 ------ .../Hands/coderarms.rsi/equipped-HAND.png | Bin 733 -> 0 bytes .../Clothing/Hands/coderarms.rsi/icon.png | Bin 884 -> 0 bytes .../Hands/coderarms.rsi/inhand-left.png | Bin 617 -> 0 bytes .../Hands/coderarms.rsi/inhand-right.png | Bin 634 -> 0 bytes .../Clothing/Hands/coderarms.rsi/meta.json | 26 ------------------ 8 files changed, 47 deletions(-) delete mode 100644 Resources/Prototypes/Floof/Entities/Clothing/Hands/gloves.yml delete mode 100644 Resources/Textures/Floof/Clothing/Hands/coderarms.rsi/equipped-HAND.png delete mode 100644 Resources/Textures/Floof/Clothing/Hands/coderarms.rsi/icon.png delete mode 100644 Resources/Textures/Floof/Clothing/Hands/coderarms.rsi/inhand-left.png delete mode 100644 Resources/Textures/Floof/Clothing/Hands/coderarms.rsi/inhand-right.png delete mode 100644 Resources/Textures/Floof/Clothing/Hands/coderarms.rsi/meta.json diff --git a/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Inventories/pride.yml b/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Inventories/pride.yml index f2db0a081c8..d909cb12d44 100644 --- a/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Inventories/pride.yml +++ b/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Inventories/pride.yml @@ -26,7 +26,6 @@ BedsheetRainbow: 2 ClothingUniformColorRainbow: 2 ClothingUnderSocksCoder: 1 - ClothingHandsCoderArms: 1 # Floofstation ClothingUnderSocksBee: 1 emaggedInventory: # 3 for more friends! diff --git a/Resources/Prototypes/Floof/Entities/Clothing/Hands/gloves.yml b/Resources/Prototypes/Floof/Entities/Clothing/Hands/gloves.yml deleted file mode 100644 index bb62055ff86..00000000000 --- a/Resources/Prototypes/Floof/Entities/Clothing/Hands/gloves.yml +++ /dev/null @@ -1,12 +0,0 @@ -- type: entity - parent: ClothingHandsBase - id: ClothingHandsCoderArms - name: Coder Armwarmers - description: A pair of armwarmers that provide some protection during those long nights at the keyboard. - components: - - type: Sprite - sprite: Floof/Clothing/Hands/coderarms.rsi - - type: Clothing - sprite: Floof/Clothing/Hands/coderarms.rsi - - type: Fiber - fiberColor: fibers-white diff --git a/Resources/Prototypes/Floof/Loadouts/hands.yml b/Resources/Prototypes/Floof/Loadouts/hands.yml index 3b2705b64f6..5cc25557ed0 100644 --- a/Resources/Prototypes/Floof/Loadouts/hands.yml +++ b/Resources/Prototypes/Floof/Loadouts/hands.yml @@ -5,11 +5,3 @@ exclusive: true items: - ClothingHandsTacticalMaidGloves - -- type: loadout #FloofStation - id: LoadoutHandsGlovesCoderArms - category: Hands - cost: 1 - exclusive: true - items: - - ClothingHandsCoderArms diff --git a/Resources/Textures/Floof/Clothing/Hands/coderarms.rsi/equipped-HAND.png b/Resources/Textures/Floof/Clothing/Hands/coderarms.rsi/equipped-HAND.png deleted file mode 100644 index 853944c1828d3974ded0071a314894fb989c246d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 733 zcmV<30wVp1P)g_{?7I>sm%{BB?82>lU6>RIMm1(-7P$swVFV4=R~h zLij}3tI2@Ex27Jq_|4?B#a||Cku73%eb}JMgR3*xN59KL7v#0000&RnJN&gQJ zT7+-jTtT@4q6Y5Vum>Hz=%z+dnQgYu{E>_maf P00000NkvXXu0mjfWCdUO diff --git a/Resources/Textures/Floof/Clothing/Hands/coderarms.rsi/icon.png b/Resources/Textures/Floof/Clothing/Hands/coderarms.rsi/icon.png deleted file mode 100644 index 81f0bded3a1053a92dee02eecb0fb6d28ac5ee0f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 884 zcmV-)1B?8LP)tcQZ4b|w|aH1Ya6}El%ayHM|ein^rEm#Lujk0S-dAaq-Ntu z;S*t>E&~eRT6&_+Zx(0j{AIBo4bOw!>ZxQ}IMKptR?iDh2z&FnlG>QZ`Vx1lupE&* zB4-qXFhK$+Bq*^#jv{`^1=(49-(=0V#HM&ud25u>#gQQ^UZ1EX>6((97Cj|Tj;{~n@P5-9sY4%(6N>lS5gJ%aWZ<<=- z0Iqgn_*skV@tWk2V^62y;{y6(FnABHwfe3a_nbdLbX$JW9ULCPxYT>r{{X@uXYD?p zx(5IN0l`T`K~z|U?N&Q(!axvxiE@KZrUys!ZCDzJSMH{vy)w!R z4CQQFVa=4(_j?WiK+at3cUufcV*vI8Y4v9z9P{=0frrN@0Dzu{0D$k8`;0&v5>^D1 z7nsOb*$&|LD=%o(hQ{Co8u=fe z>ln*PfI1>)3FLrv3^{XgI3+m}hf{*#Xbi1mgwsVfm^?UBOvc zpw4dh?KSrd0O52|DQLgjBAhPjogg*J3;s-d(TT`cxgAiZnsx=L=l7-Hk*_ja2|#&4 z<@EEl1jLcsUWOU3*5*LbA4a*zjDD09VWf@q8l!Mdf8y zmpMRSWqGS_2CkHp7Yml<&jHi{pM7c2qT-9?s-I$AbkRi@mxv$NUyqrnju{dF0000< KMNUMnLSTXjrI6SF diff --git a/Resources/Textures/Floof/Clothing/Hands/coderarms.rsi/inhand-left.png b/Resources/Textures/Floof/Clothing/Hands/coderarms.rsi/inhand-left.png deleted file mode 100644 index 7994331ab6df664095baf957d6122da9d2a27966..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 617 zcmV-v0+#)WP)tcQZ4b|w|aH1Ya6}El%ayHM|ein^rEm#Lujk0S-dAaq-Ntu z;S*t>E&~eRT6&_+Zx(0j{AIBo4bOw!>ZxQ}IMKptR?iDh2z&FnlG>QZ`Vx1lupE&* zB4-qXFhK$+Bq*^#jv{`^1=(49-(=0V#HM&ud25u>#gQQ^UZ1EX>6((97Cj|Tj;{~n@P5-9sY4%(6N>lS5gJ%aWZ<<=- z0Iqgn_*skV@tWk2V^62y;{y6(FnABHwfe3a_nbdLbX$JW9ULCPxYT>r{{X@uXYD?p zx(5IN0Jcd)K~#90?b^W!0x=Lq;aL%jSaxd=u?PEzC0Rf`d9#AtEFgr`pe%T>fSj_Y ztss+N;C%%=0&~nS0ssI2000001!C~Ir|wQO=8VmU=TDrms*kPJRTYEJDWx2P&)V18 znpUbTvLtfw`cKzR&$Tg4K@P+02EmPHvMs1=qpj>00000NkvXXu0mjf D_naAT diff --git a/Resources/Textures/Floof/Clothing/Hands/coderarms.rsi/inhand-right.png b/Resources/Textures/Floof/Clothing/Hands/coderarms.rsi/inhand-right.png deleted file mode 100644 index 992c269e5ce4d5bde03001d6b199fac7086620ae..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 634 zcmV-=0)_pFP)tcQZ4b|w|aH1Ya6}El%ayHM|ein^rEm#Lujk0S-dAaq-Ntu z;S*t>E&~eRT6&_+Zx(0j{AIBo4bOw!>ZxQ}IMKptR?iDh2z&FnlG>QZ`Vx1lupE&* zB4-qXFhK$+Bq*^#jv{`^1=(49-(=0V#HM&ud25u>#gQQ^UZ1EX>6((97Cj|Tj;{~n@P5-9sY4%(6N>lS5gJ%aWZ<<=- z0Iqgn_*skV@tWk2V^62y;{y6(FnABHwfe3a_nbdLbX$JW9ULCPxYT>r{{X@uXYD?p zx(5IN0LMv0K~#90?b@*ogD?<<;UkI|0>KOju|xJCRpwy;QqeI19RpaFXGnxZ!2ncF zn}WiiSm5aY>XZC*y3S7o00000000117_IEl8C-15d2t!)tH#FNEPd6SdI{cg8m+9+ z$}Y=d&w2^p`L<-dx(rRVkt|7N7+bkL@6rC4{^Ug&^;KiDB$e0r{`~`6H+zH-G6Dbq z000000000X`iFlwr+&biP&xzNgwPpqvHJq1+DP2ZGCW$zi}IA60q^*a2LK>wA49Tn US_pw@bpQYW07*qoM6N<$f)(E&)Bpeg diff --git a/Resources/Textures/Floof/Clothing/Hands/coderarms.rsi/meta.json b/Resources/Textures/Floof/Clothing/Hands/coderarms.rsi/meta.json deleted file mode 100644 index e6321f48aea..00000000000 --- a/Resources/Textures/Floof/Clothing/Hands/coderarms.rsi/meta.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Sprited by bribrooo (Discord), original from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" - }, - { - "name": "equipped-HAND", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] -} From 83162d51fe45276eab041ce76d3402825f82ce8b Mon Sep 17 00:00:00 2001 From: FloofStation Changelogs <175611579+Floof-Station-Bot@users.noreply.github.com> Date: Mon, 19 Aug 2024 05:33:29 +0000 Subject: [PATCH 38/38] Automatic Changelog Update (#119) --- Resources/Changelog/Floof.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Resources/Changelog/Floof.yml b/Resources/Changelog/Floof.yml index fe3c726dc48..838e7a55f60 100644 --- a/Resources/Changelog/Floof.yml +++ b/Resources/Changelog/Floof.yml @@ -546,3 +546,9 @@ Entries: message: Seb will always spawn instead of Siobhan in Floof maps. id: 74 time: '2024-08-18T21:19:51.0000000+00:00' +- author: Memeji + changes: + - type: Add + message: Pink Collar + id: 75 + time: '2024-08-19T05:33:04.0000000+00:00'