From d75250d2c59b65fc68b74754eb5b9852c2eeafbb Mon Sep 17 00:00:00 2001 From: FoxxoTrystan Date: Sat, 6 Jul 2024 11:57:53 +0200 Subject: [PATCH 01/32] Xenowears --- .../Components/EmitsSoundOnMoveComponent.cs | 35 +++++++ .../EntitySystems/EmitsSoundOnMoveSystem.cs | 99 ++++++++++++++++++ .../interaction-popup-component.ftl | 1 + .../Inventories/clothesmate.yml | 3 + .../VendingMachines/Inventories/theater.yml | 2 + .../DeltaV/Entities/Mobs/Player/vulpkanin.yml | 4 +- .../Entities/Clothing/Neck/mantles.yml | 22 ++++ .../Entities/Clothing/Neck/misc.yml | 14 +++ .../Entities/Clothing/OuterClothing/misc.yml | 11 ++ .../Entities/Clothing/clothwarps.yml | 38 +++++++ Resources/Prototypes/Loadouts/neck.yml | 24 +++++ Resources/Prototypes/Loadouts/shoes.yml | 8 ++ .../Graphs/clothing/clothwarp.yml | 13 +++ .../Recipes/Construction/clothing.yml | 11 ++ .../Misc/bellcollar.rsi/equipped-NECK.png | Bin 0 -> 4691 bytes .../Neck/Misc/bellcollar.rsi/icon.png | Bin 0 -> 4596 bytes .../Neck/Misc/bellcollar.rsi/inhand-left.png | Bin 0 -> 5166 bytes .../Neck/Misc/bellcollar.rsi/inhand-right.png | Bin 0 -> 5175 bytes .../Neck/Misc/bellcollar.rsi/meta.json | 26 +++++ .../oldmantle.rsi/equipped-OUTERCLOTHING.png | Bin 0 -> 568 bytes .../Neck/mantles/oldmantle.rsi/icon.png | Bin 0 -> 671 bytes .../Neck/mantles/oldmantle.rsi/meta.json | 18 ++++ .../equipped-OUTERCLOTHING.png | Bin 0 -> 1076 bytes .../Neck/mantles/unathimantle.rsi/icon.png | Bin 0 -> 537 bytes .../Neck/mantles/unathimantle.rsi/meta.json | 18 ++++ .../unathirobe.rsi/equipped-OUTERCLOTHING.png | Bin 0 -> 1400 bytes .../Misc/unathirobe.rsi/icon.png | Bin 0 -> 582 bytes .../Misc/unathirobe.rsi/meta.json | 18 ++++ .../Misc/clothwarp.rsi/equipped-FEET.png | Bin 0 -> 315 bytes .../Misc/clothwarp.rsi/equipped-HAND.png | Bin 0 -> 469 bytes .../Shoes/Misc/clothwarp.rsi/icon.png | Bin 0 -> 704 bytes .../Shoes/Misc/clothwarp.rsi/meta.json | 1 + 32 files changed, 364 insertions(+), 2 deletions(-) create mode 100644 Content.Shared/Clothing/Components/EmitsSoundOnMoveComponent.cs create mode 100644 Content.Shared/Clothing/EntitySystems/EmitsSoundOnMoveSystem.cs create mode 100644 Resources/Prototypes/Entities/Clothing/clothwarps.yml create mode 100644 Resources/Prototypes/Recipes/Construction/Graphs/clothing/clothwarp.yml create mode 100644 Resources/Textures/Clothing/Neck/Misc/bellcollar.rsi/equipped-NECK.png create mode 100644 Resources/Textures/Clothing/Neck/Misc/bellcollar.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Neck/Misc/bellcollar.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/Neck/Misc/bellcollar.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/Neck/Misc/bellcollar.rsi/meta.json create mode 100644 Resources/Textures/Clothing/Neck/mantles/oldmantle.rsi/equipped-OUTERCLOTHING.png create mode 100644 Resources/Textures/Clothing/Neck/mantles/oldmantle.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Neck/mantles/oldmantle.rsi/meta.json create mode 100644 Resources/Textures/Clothing/Neck/mantles/unathimantle.rsi/equipped-OUTERCLOTHING.png create mode 100644 Resources/Textures/Clothing/Neck/mantles/unathimantle.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Neck/mantles/unathimantle.rsi/meta.json create mode 100644 Resources/Textures/Clothing/OuterClothing/Misc/unathirobe.rsi/equipped-OUTERCLOTHING.png create mode 100644 Resources/Textures/Clothing/OuterClothing/Misc/unathirobe.rsi/icon.png create mode 100644 Resources/Textures/Clothing/OuterClothing/Misc/unathirobe.rsi/meta.json create mode 100644 Resources/Textures/Clothing/Shoes/Misc/clothwarp.rsi/equipped-FEET.png create mode 100644 Resources/Textures/Clothing/Shoes/Misc/clothwarp.rsi/equipped-HAND.png create mode 100644 Resources/Textures/Clothing/Shoes/Misc/clothwarp.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Shoes/Misc/clothwarp.rsi/meta.json diff --git a/Content.Shared/Clothing/Components/EmitsSoundOnMoveComponent.cs b/Content.Shared/Clothing/Components/EmitsSoundOnMoveComponent.cs new file mode 100644 index 00000000000..095b0daf384 --- /dev/null +++ b/Content.Shared/Clothing/Components/EmitsSoundOnMoveComponent.cs @@ -0,0 +1,35 @@ +using Robust.Shared.Audio; +using Robust.Shared.GameStates; +using Robust.Shared.Map; + +namespace Content.Shared.Clothing.Components; + +/// +/// Indicates that the clothing entity emits sound when it moves. +/// +[RegisterComponent, NetworkedComponent, AutoGenerateComponentState] +public sealed partial class EmitsSoundOnMoveComponent : Component +{ + [ViewVariables(VVAccess.ReadWrite)] + [DataField(required: true), AutoNetworkedField] + public SoundSpecifier SoundCollection = default!; + + [ViewVariables(VVAccess.ReadWrite)] + [DataField("requiresGravity"), AutoNetworkedField] + public bool RequiresGravity = true; + + [ViewVariables(VVAccess.ReadOnly)] + public EntityCoordinates LastPosition = EntityCoordinates.Invalid; + + /// + /// The distance moved since the played sound. + /// + [ViewVariables(VVAccess.ReadOnly)] + public float SoundDistance = 0f; + + /// + /// Whether this item is equipped in a inventory item slot. + /// + [ViewVariables(VVAccess.ReadOnly)] + public bool IsSlotValid = true; +} diff --git a/Content.Shared/Clothing/EntitySystems/EmitsSoundOnMoveSystem.cs b/Content.Shared/Clothing/EntitySystems/EmitsSoundOnMoveSystem.cs new file mode 100644 index 00000000000..a60abd484d1 --- /dev/null +++ b/Content.Shared/Clothing/EntitySystems/EmitsSoundOnMoveSystem.cs @@ -0,0 +1,99 @@ +using System.Numerics; +using Content.Shared.Clothing.Components; +using Content.Shared.Gravity; +using Content.Shared.Inventory; +using Content.Shared.Inventory.Events; +using Content.Shared.Mobs.Components; +using Content.Shared.Movement.Components; +using Robust.Shared.Audio.Systems; +using Robust.Shared.Physics.Components; +using Robust.Shared.Timing; + +namespace Content.Shared.Clothing.Systems; + +public sealed class EmitsSoundOnMoveSystem : EntitySystem +{ + [Dependency] private readonly SharedAudioSystem _audio = default!; + [Dependency] private readonly SharedMapSystem _grid = default!; + [Dependency] private readonly SharedGravitySystem _gravity = default!; + [Dependency] private readonly IGameTiming _timing = default!; + + private EntityQuery _moverQuery; + private EntityQuery _physicsQuery; + private EntityQuery _xformQuery; + private EntityQuery _clothingQuery; + + public override void Initialize() + { + _moverQuery = GetEntityQuery(); + _physicsQuery = GetEntityQuery(); + _xformQuery = GetEntityQuery(); + _clothingQuery = GetEntityQuery(); + + SubscribeLocalEvent(OnEquipped); + SubscribeLocalEvent(OnUnequipped); + } + + private void OnEquipped(EntityUid uid, EmitsSoundOnMoveComponent component, GotEquippedEvent args) + { + component.IsSlotValid = !args.SlotFlags.HasFlag(SlotFlags.POCKET); + } + + private void OnUnequipped(EntityUid uid, EmitsSoundOnMoveComponent component, GotUnequippedEvent args) + { + component.IsSlotValid = true; + } + + public override void Update(float frameTime) + { + var query = EntityQueryEnumerator(); + while (query.MoveNext(out var uid, out var comp)) + { + UpdateSound(uid, comp); + } + query.Dispose(); + } + + private void UpdateSound(EntityUid uid, EmitsSoundOnMoveComponent component) + { + if (!_xformQuery.TryGetComponent(uid, out var xform) || + !_physicsQuery.TryGetComponent(uid, out var physics)) + return; + + // Space does not transmit sound + if (xform.GridUid == null) + return; + + if (component.RequiresGravity && _gravity.IsWeightless(uid, physics, xform)) + return; + + var parent = xform.ParentUid; + + var isWorn = parent is { Valid: true } && + _clothingQuery.TryGetComponent(uid, out var clothing) + && clothing.InSlot != null + && component.IsSlotValid; + // If this entity is worn by another entity, use that entity's coordinates + var coordinates = isWorn ? Transform(parent).Coordinates : xform.Coordinates; + var distanceNeeded = (isWorn && _moverQuery.TryGetComponent(parent, out var mover) && mover.Sprinting) + ? 1.5f // The parent is a mob that is currently sprinting + : 2f; // The parent is not a mob or is not sprinting + + if (!coordinates.TryDistance(EntityManager, component.LastPosition, out var distance) || distance > distanceNeeded) + component.SoundDistance = distanceNeeded; + else + component.SoundDistance += distance; + + component.LastPosition = coordinates; + if (component.SoundDistance < distanceNeeded) + return; + component.SoundDistance -= distanceNeeded; + + var sound = component.SoundCollection; + var audioParams = sound.Params + .WithVolume(sound.Params.Volume) + .WithVariation(sound.Params.Variation ?? 0f); + + _audio.PlayPredicted(sound, uid, uid, audioParams); + } +} diff --git a/Resources/Locale/en-US/interaction/interaction-popup-component.ftl b/Resources/Locale/en-US/interaction/interaction-popup-component.ftl index bb56233ff14..0106ba94b12 100644 --- a/Resources/Locale/en-US/interaction/interaction-popup-component.ftl +++ b/Resources/Locale/en-US/interaction/interaction-popup-component.ftl @@ -4,6 +4,7 @@ petting-success-generic = You pet {THE($target)} on {POSS-ADJ($target)} head. petting-success-soft-floofy = You pet {THE($target)} on {POSS-ADJ($target)} soft floofy head. +petting-success-generic-others = { CAPITALIZE(THE($user)) } pets {THE($target)}. petting-success-bingus = You pet {THE($target)} on {POSS-ADJ($target)} wrinkly little head. petting-success-bird = You pet {THE($target)} on {POSS-ADJ($target)} cute feathery head. diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml index 2c4c27137f0..bc7a5470b83 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml @@ -67,6 +67,7 @@ ClothingShoesColorOrange: 2 ClothingShoesColorRed: 2 ClothingShoesColorPurple: 2 + ClothingsClothwarp: 4 ClothingHeadHatGreysoft: 8 ClothingHeadHatMimesoft: 3 ClothingHeadHatBluesoft: 2 @@ -111,6 +112,8 @@ ClothingHandsGlovesColorOrange: 2 ClothingHandsGlovesColorPurple: 2 ClothingEyesGlassesCheapSunglasses: 3 + ClothingNeckOldMantle: 2 + ClothingNeckUnathiMantle: 2 contrabandInventory: ClothingMaskNeckGaiter: 2 ClothingUniformJumpsuitTacticool: 1 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml index bb21bc36d47..a4eb5229e6a 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml @@ -88,6 +88,8 @@ ClothingShoesBootsCowboyBlack: 1 ClothingShoesBootsCowboyWhite: 1 ClothingMaskNeckGaiterRed: 2 + ClothingNeckBellCollar: 2 + ClothingOuterUnathiRobe: 1 emaggedInventory: ClothingShoesBling: 1 ClothingShoesBootsCowboyFancy: 1 diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Player/vulpkanin.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Player/vulpkanin.yml index 06abe8c45fa..a50587039a4 100644 --- a/Resources/Prototypes/DeltaV/Entities/Mobs/Player/vulpkanin.yml +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Player/vulpkanin.yml @@ -7,9 +7,9 @@ - type: CombatMode - type: InteractionPopup successChance: 1 - interactSuccessString: hugging-success-generic + interactSuccessString: petting-success-generic interactSuccessSound: /Audio/Effects/thudswoosh.ogg - messagePerceivedByOthers: hugging-success-generic-others + messagePerceivedByOthers: petting-success-generic-others - type: MindContainer showExamineInfo: true - type: Input diff --git a/Resources/Prototypes/Entities/Clothing/Neck/mantles.yml b/Resources/Prototypes/Entities/Clothing/Neck/mantles.yml index 7b4ab078911..18976b9a34b 100644 --- a/Resources/Prototypes/Entities/Clothing/Neck/mantles.yml +++ b/Resources/Prototypes/Entities/Clothing/Neck/mantles.yml @@ -74,3 +74,25 @@ sprite: Clothing/Neck/mantles/qmmantle.rsi - type: Clothing sprite: Clothing/Neck/mantles/qmmantle.rsi + +- type: entity + parent: ClothingNeckBase + id: ClothingNeckOldMantle + name: old wrap + description: A tattered fabric wrap, faded over the years. Smells faintly of cigars. + components: + - type: Sprite + sprite: Clothing/Neck/Mantles/oldmantle.rsi + - type: Clothing + sprite: Clothing/Neck/Mantles/oldmantle.rsi + +- type: entity + parent: ClothingNeckBase + id: ClothingNeckUnathiMantle + name: hide mantle + description: A rather grisly selection of cured hides and skin, sewn together to form a ragged mantle. + components: + - type: Sprite + sprite: Clothing/Neck/Mantles/unathimantle.rsi + - type: Clothing + sprite: Clothing/Neck/Mantles/unathimantle.rsi diff --git a/Resources/Prototypes/Entities/Clothing/Neck/misc.yml b/Resources/Prototypes/Entities/Clothing/Neck/misc.yml index 6b4be3c9f84..4f8015367b1 100644 --- a/Resources/Prototypes/Entities/Clothing/Neck/misc.yml +++ b/Resources/Prototypes/Entities/Clothing/Neck/misc.yml @@ -93,3 +93,17 @@ - type: Construction graph: flowerwreath node: flowerwreath + +- type: entity + parent: ClothingNeckBase + id: ClothingNeckBellCollar + name: bell collar + description: A way to inform others about your presence, or just to annoy everyone around you! + components: + - type: Sprite + sprite: Clothing/Neck/Misc/bellcollar.rsi + - type: Clothing + sprite: Clothing/Neck/Misc/bellcollar.rsi + - type: EmitsSoundOnMove + soundCollection: + collection: FootstepJester diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml index d17fb275c13..4b2c3c9c3ff 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml @@ -377,3 +377,14 @@ sprite: Clothing/OuterClothing/Misc/red_racoon.rsi - type: Clothing sprite: Clothing/OuterClothing/Misc/red_racoon.rsi + +- type: entity + parent: ClothingOuterBase + id: ClothingOuterUnathiRobe + name: roughspun robes + description: A traditional Unathi garment. + components: + - type: Sprite + sprite: Clothing/OuterClothing/Misc/unathirobe.rsi + - type: Clothing + sprite: Clothing/OuterClothing/Misc/unathirobe.rsi diff --git a/Resources/Prototypes/Entities/Clothing/clothwarps.yml b/Resources/Prototypes/Entities/Clothing/clothwarps.yml new file mode 100644 index 00000000000..1a48c39a264 --- /dev/null +++ b/Resources/Prototypes/Entities/Clothing/clothwarps.yml @@ -0,0 +1,38 @@ +- type: entity + parent: Clothing + id: ClothingsClothwarp + name: clothwarps + description: A roll of treated canvas used for wrapping claws or paws. + components: + - type: Item + size: Small + storedRotation: -90 + - type: Sprite + state: icon + sprite: Clothing/Shoes/Misc/clothwarp.rsi + - type: Clothing + slots: + - gloves + - FEET + sprite: Clothing/Shoes/Misc/clothwarp.rsi + - type: Construction + graph: ClothingsClothwarp + node: shoes + - type: Butcherable + butcheringType: Knife + spawned: + - id: MaterialCloth1 + amount: 1 + - type: Food + requiresSpecialDigestion: true + - type: SolutionContainerManager + solutions: + food: + maxVol: 10 + reagents: + - ReagentId: Fiber + Quantity: 10 + - type: Tag + tags: + - ClothMade + - WhitelistChameleon diff --git a/Resources/Prototypes/Loadouts/neck.yml b/Resources/Prototypes/Loadouts/neck.yml index eb933de29ee..93093b08887 100644 --- a/Resources/Prototypes/Loadouts/neck.yml +++ b/Resources/Prototypes/Loadouts/neck.yml @@ -30,6 +30,30 @@ items: - ClothingNeckScarfStripedZebra +- type: loadout + id: LoadoutNeckBellCollar + category: Neck + cost: 1 + exclusive: true + items: + - ClothingNeckBellCollar + +- type: loadout + id: LoadoutNeckOldMantle + category: Neck + cost: 1 + exclusive: true + items: + - ClothingNeckOldMantle + +- type: loadout + id: LoadoutNeckUnathiMantle + category: Neck + cost: 1 + exclusive: true + items: + - ClothingNeckUnathiMantle + #Pride Accessories - type: loadout id: LoadoutItemsPrideLGBTPin diff --git a/Resources/Prototypes/Loadouts/shoes.yml b/Resources/Prototypes/Loadouts/shoes.yml index 3c2e21e631b..67dcaa0c96b 100644 --- a/Resources/Prototypes/Loadouts/shoes.yml +++ b/Resources/Prototypes/Loadouts/shoes.yml @@ -164,3 +164,11 @@ exclusive: true items: - ClothingShoesMiscWhite + +- type: loadout + id: LoadoutShoesClothwarp + category: Shoes + cost: 1 + exclusive: true + items: + - ClothingsClothwarp diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/clothing/clothwarp.yml b/Resources/Prototypes/Recipes/Construction/Graphs/clothing/clothwarp.yml new file mode 100644 index 00000000000..65bc8f9ae66 --- /dev/null +++ b/Resources/Prototypes/Recipes/Construction/Graphs/clothing/clothwarp.yml @@ -0,0 +1,13 @@ +- type: constructionGraph + id: ClothingsClothwarp + start: start + graph: + - node: start + edges: + - to: warps + steps: + - material: Cloth + amount: 2 + doAfter: 1 + - node: warps + entity: ClothingsClothwarp diff --git a/Resources/Prototypes/Recipes/Construction/clothing.yml b/Resources/Prototypes/Recipes/Construction/clothing.yml index f1eb270af73..99a6cfb13d3 100644 --- a/Resources/Prototypes/Recipes/Construction/clothing.yml +++ b/Resources/Prototypes/Recipes/Construction/clothing.yml @@ -96,3 +96,14 @@ description: Comfy, yet haunted by the ghosts of ducks you fed bread to as a child. icon: { sprite: Clothing/Shoes/Misc/duck-slippers.rsi, state: icon } objectType: Item + +- type: construction + name: clothwarps + id: ClothingsClothwarp + graph: ClothingsClothwarp + startNode: start + targetNode: warps + category: construction-category-clothing + description: A roll of treated canvas used for wrapping claws or paws. + icon: { sprite: Clothing/Shoes/Misc/clothwarp.rsi, state: icon } + objectType: Item diff --git a/Resources/Textures/Clothing/Neck/Misc/bellcollar.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Neck/Misc/bellcollar.rsi/equipped-NECK.png new file mode 100644 index 0000000000000000000000000000000000000000..2190dc844dba0dffd0b5b4050a7c3043c64205a0 GIT binary patch literal 4691 zcmeHLdsGzH8J`7>1Ou@x8hkX)88E1v*?H`XnX)|GMcByd78b!O>g>$y?&$8$usgtl zl{DHI`%q((iZP_NYSWWPQy;NSMM{fujEymzCZS10-GZ8EqUcFZ(U@rO%r48)=A0f* z>wgUAa=&};cYpW$e&2ULnE8=oacNrWj8q7M(rjhc3eXoRE#*G&`z4|79O!!Z8k^f@ zn-8Uc0npS;fHaB@Xqp5$Ns|mEgSkzheG|xvj?!jmCaV2Ufjl!NKLg~sF&$+Op-F<$ zK;H%$3FHjWzXY1_Wb~{*0aj-eZ=9eQDDM(8)9mjxu8wHESVY66ZDJZ%H9}hv{w)NZ1WygwUb+4-YH8OQluCwk9 z$Mc`=LAHMH3B;Llc)`o*kF>TFKfNityZgHmns@U+O}$jt``%xwrc5X-T2b4UQM>Q> z-8oN8BOabLG;p@##M$o@d7V4m^=~EZ3Osk2TX5>q((azzuFNiY&*s0LA}?jnn|S_4 z{WfUTV1NFbcl&nlUGmoQ2U0d4KXeNB_oww=wx5X{T{4TAvusX5&cmk58;);VQJvp1 zutHuIdG;H+r+<;Nb;?h=)0fgae_p;N{NubA*3cIxFWXjidU@O7N4Fflc5+qb=}&Us zT=5%fL-w=-6YfVc-gPXTXzYLO%D$SicUrnm6n^@}oZ!3*^EYm1HC5iHY71}9{_(gKV+nGCSl6T(9?l{-$DlNKel&+XLe$h41ZKWkolb>MT&8;NFBhCOa*e&5W<|f2;Y1g&4f`b}UQm8vSYp_$bI9d`G8c3ud70wTGZo0y{Fa`leX2dJY5{+Sv zjg8tyomLEbFoL2e3@0&?M1ckxY6{3q7!8E76o@E>l@GB&L6QYA04tb`ORSg82m;pO zVf*}&-5!SzgkmfJKCmz&VT2aP{C+HPM@TMd03b1gzII2**(C8;1s@XYgDhXtzz5{4 zLq#Ss*jJc3_RodV>II*eoEdQyGRr|NJl#`}0b01W~Ah*A2o;2t4slx@n2>Q15| z;J7&cDD7e2Rb`-Mx6@XUtyd1USkK-|pd%=fFyINhm-4|7NH_&kt&r+= zj-?j@LOAm;wgh=b7K2Vv^qG-((Ty+L!FA#o znXxi54^E4hVdroe&c$_f%rXVeE^>mq>Az_!mj})V`XJ*9Yu#e zLA^>atX>M5VWTdDm60Xzb(Kzgcwpy0V`1m}&`ZuIg>cmQE2L87GI ziIX5_Xgw7p47>L(>R7#z*O>^^$mLO}-laF7l*>SY3&V1pku>2rLyk83e{#|I?>P~3 zF&|UP;&4#&vHu8rR3V{`0&1djpgx0gkHzbKj583Dd-=rD?Oq-M!{djHiQjR$#_1Xp z17lJi&#rO0#>Bvwl*hB{|3+8p$QvUc0RQMUg7?9xmkYOmcgg!)i%PBPTP1YM(*78b z?w87zg&=71x0I%VcC}@K$w{)!UNY&U2c}P*K09msft%oaLAuRa>`Jj5PX5({}UnHe}(ARe*`}Ieci>);o#WOlg z-oc?mm-<3?CGzSc8D_mEGNR>uUf0svST4 zS-~eATi^AhZW=iGs_pdtVqa(3-aCJUsvkN(b8F73svT{UiQn#c+eMQ@cP7hNZQkyV zOk4B1^~RM2e}1g)z2x%q)h(UpI$8^(?n2NHs_9nkD+e$9Ay@AC-Glu{`wrJ#pTDRe zJ1u=^+h+%FtbfH=dgjRY{Zi=SYvQx*?n603hxuBwx2vJ$QnD{cHtQl^m4oju;Q9M) Z&51>e_Fs3;cu^VJN)}sRU9ft?zX0;DP$K{U literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Neck/Misc/bellcollar.rsi/icon.png b/Resources/Textures/Clothing/Neck/Misc/bellcollar.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..1790484039767872acd61f6aa8c7c32bde7b8669 GIT binary patch literal 4596 zcmeHKdr(tX8c$Fjg-QXTy5j03R6*qCac>fm3qfNN<&Fd?rVt-9c$3_OD|wMzNPs8} zqqZnz7YoH&XRX#wZL5~9yRxiSk%G3m(r%}s)}oZ@)V6d@eXLy_wR`SOcuhOA!_4+S zk~y63p7T4u^L@YbosZmx!h#huqUS_&IGh=Hp1KJ15YwU}z+ZPw&0WxaO6qYlj%RS9 zzym;Xr*pUr1~l$CJB&MxGYyPw11$mA42EfQxZ!Ny2<+sL-2&|N5QbSJ;)Zc%fPN2X z2(S}D{|;!>3&Fik0-O0nvEL7X6%N`+zXI15LI__Z$(u&-xf-xD#TSP$mw#JDJ#k0c=v2-R^)xSbZ&3yx;Hf$vBisq{f_nd>W?pdm$-WU?6Coi8}><8YyYiFySsi!`|hQtr?bN%j`?>CH!Tcs+p?G5#oM0z zxH(MxsF(NS=H=I0A|o9Blah{(d$|SkpUW^5{rSMvQt-J zTyOak4Lp#8UP`B@_1b*Q=&32T>*k zuSB91YMm;wjLNHVk*jM8bjF%;quj(>k{g}l#Q=egqzTAtv)bL5SHWX>F<>*p0v^Od z=yC;55AsOmaFLLhFXjtjjhCuIc)8I~j>}}miqy+P6yQn0E2C*ACJ=Z$9=-?VJ6sll zNG_KPgopq^V1R(#)pnZj!ghBmLlNXqlWwDna?+H;4l$gB!BI&ocswuO_ z#VQvCvXZcl_llu10V=7)ED|B87)FIz23Ra4P}m?fh+&zWG#I2JQI=e6VyT#Oz?6l! zf`{;hV8xNOh#-uU?f1|P&UFs3Y>NeJHZ?a27&>?5=@=~W_BFJf~j02K|5SJhr_DijaJ>! zX)U-;CW0o^1Wkh7M(eO{qz*3@f@&O$i=opxOq99$f1#Pn1LXibIPyHo4fd~Qhk`e1 zHCYjS3O-sX_9{UTdnqu&7!1KpRFOf20atL!SVq__B&Z&tbR8L|ekBzUBPv7)A`3Ri zP$@_S8At_E1T0b_MvM~X6cJX1QFgb(OnV3ysk8tcfmR?r+5b>bI(vePCZauMBy&7K zFj$1Zh-5@Cc}OrpC}06oGe#oL5&S}v92PLH$bfahF;KifEfkCv!;ogc-{0~RI*Z?O z3kaIpWK#N0$u%X{q!gGGcq+T5+H*;f@@$s(nc-%LO=LhNnH*Vd55*pOJ$j05p&Kq~} z_pyCX?~9My(oDzT12OszPeSOh;+~0P_p8QBT{rUU$wj+4wgKzKa(3c-c zb5HmR{yb-W6kViEcln-ceqnof`A0tdTGzl=OU;}87Z#ttO$=3ZzTvw5x7;u8t30*s z>9u9C|9&txkX$fOyWd>JU8G3yet#-6Qa|uz@us(%vHVs)y+nIl^YK5cRTs0n&zxJc zXgK2CI`32Xb}D0Ye`7CcKlZ!XM_$s+%Sb<8sxit>+Z!LPU`=@e{XxMzZdP$Njs)@z4nu&t++HJw!UL{<+5iI8Xg9Gk$3-bP}=`c RW(DWP!8HZyBg;0_{}o8PDQ1E>eCm0N8a7u%s@S7n_P`~<( z;T6eD$FqJSoARufoo%yZXKQ?ZuOPa3l`7b;_+p%;Tf4LRyIsq*?97P;&aon z$LHL=-f`qq#}6~h?c0T_b7A$K9XGiJXFpxu+Ln4^#tF@?jqjhuKTVh)arN`6&8k(s zU1?|TU)lNQl5qni3m&^f)rHScDj~j2UKe>5DaoW1;E2PrS z*B&Oe{W9sL*q^peSrR}?=>9U%KmU`IXScHIW#wB|X7t5<)zh9*P#Cma z3vc^ZmnrVe%<{*|+rNLK|59arQs&=gHeLAW->WBVzn5_2<90`0=6%Xn+0p)rxziuH zF@5H5<~J8@*=9Wr0pRN2yUB&I|chskC#d~LWcE-*~E&Au7^UZ6RHT`!B z-fD?!Eb|{~ekX}hsbb?rdx=zHEnrx$TL(C=gVzP!J~>{hw2Yt+uob+daqv#jW7hUI zw`esYXVw-Qtfy9H4+tW^K77`53*vrlv+$ zL+HGIryiqeT94v-97iAm3DkNd5JWtIxiUqFBZm*Le$gk1UXMoR1P*VNWY%ioyk>BH zZlBdUMDGa005n4L0*deifssam#swT3 zL9xUy!mI?Yk*kuaI7mfcm_Sk}hj0{1AS8uTh=T$g!UC3bm{68wNkO5KD6LMG>Xbf~LknCfm;g$?La!y)LtMXww~C^G&ldwwf2}eUs;H%WW#}pN z=n|Du(rA>TU;rC3Apoj*PFW}93Qe))z~kiM?lF+AgX7}Yqyh{Z03;w0k^?M4IxrS- z7zhJ`1B#+400bj$7|kB=3Q`U5^I1;lN9ZeA$LoR`A`9fn{yf|GU> zXD}0kVFM1+KX?;ak|#*iXh4jtQ9wum5Qqtw1cU|xz#IaO3OpFS=x=1A!4A)8+`t&9 z@6JRAM)MAb!GW-xz#$~c1B5mS7{VJkniMF&(nP3ghH~Van@E@#g81%C#Ap*s8e!N_ z+CU*B3jpGPTLMBmP$K|F0yj|9w-`n0zbktnQPcGD;Wk*BY5M;u-Vk8KX$TWMGzL#u zcxdZ~PVIrrhaq{8pMg!|L8{Pb#+8i8zvJ#2ch{IaFedPLc8$AhOdc2$cs#qlHFrf1 z|L*5K@Za?s_^ZC^8A`s2ddRUjFGsl>P~FRJ{xOs$`tnNyD%GT^a#O478)m@4NXcT& zjl3~==A*Ob75{!U0dIZgT5_`N!OOQVw=9~F6?^LQtH|^xQjaI0o65HK%*y@2{+Mfb z;xF7wX|IilpEJ+>;)gdci19yvChh6mNA#4gZ_oQ3`>zNsJ6G?RUH$xP*UF0Fb(H+s z^>Wjck}Dmq+e}>Hw%x7$=lV|X>-g;OPVcRg2d?&;n*J2tSbDzc^4sU%U9+g0Z z=2FjwW$LQM_m>>*eq-`HwR2C>sq`C*u1{^7Ij#5QJ86fiiz4=SeN{2Z<GK$ZG_tY49N3C^3y9hGn9{A%Di z_=yKL!;Z-ImHVO>|6=2c#x3z(T|f3Brkic~Ro=>;Ge_3MOiE5EENY%vw7YX~(dOCM z!q^)Z&L8YP|HG6rN0V6fcGxcWFZ=nG$3I@%bu#hjoTJclTmO6<|2TeW#7Cc1ZPyfE z=`+7I_`x$R*>4w2kKEe%@^RGFH>0oLey;bm>{xcu`b9|z3#tD4&h3Tk%o{Hh%IkY~ z-c2ak25`Gkn~ob?|ItN>zlGQ zY3}crcH};}CufP~O6fH_UD7-IpG8;e$}e5GrhPMK-3#-3dt>G#=6-(QM8^hZ!xuL) z_Z^PgUE({?@rMLPqlvjsa^%bT_DqKJxO6PtRTR$mJF|AEZ&L$0tArok52pX#uGkhm)cpvyT^wLts0Po6#B*|{Ek|$pwAWjo+=+Fq*V)U`To%q zN&yWsC?=IkF0X17aNd~3cy1Wyt@2f<7@pG$6@m+p`hkAf7`!ZrBhDJ5n=+%CGg=X_ z+%W$b^pNc;7@+KS#_Hj!ltpb;3#{nN@E%U$8C4_+9;ZYMLs*g`5CbXl2u+(W`S`X zIx><|!OEh?=d!?=lDjG}GU1S1LY~YjPQxgaFcLIL7>y)_Q>GEnTEXWB38!$XJES_p zbIdBh$b!U?Tx_YJ_qt2f2_-BHFa|i5Rq_-ttK+~HCe^=s9kU`6E#mBG8< zZH1(k5(KG5!LVG=1V39X@T#7GD>%iKvF=g<>>iTE&HDc--XLJqX$TTLI0jBx zaA@m?Pwi0V1AXu071}iJJ z|9-&@ey-PmfA!+D-@Xgp2~2kWDBY^Q8_?WJ?RXeSQ@t7M{Tj`*A1F<$+0{G;3{H`4 z_OvM%r_Y@=|E}pVZ!83FeU{s-D;$CMFTK~cIvk7b{;YWA0_)vTMTO^Dp|h73H$=ZQ zD=Y5xwt^dn>RSrZ<5HqOnKrZA{YpOsN7wIrwxqQ(O8$3N_SQdcOg?>N^QVJ@SF$; z&-+40dq8Mx*qOY%sOZF|qhZb0YhJn9ax6X5wnO^rRK%<1xWlV+JI;LY_FoUtH=pC8|1ubRBLCwAVB(x&3q{F5I&HTP_9L}cC6+J_HL ne_&JBk@^!QH*Ow_)WFvx8sf4qo^Ac8RUxvaWm#WZSyKOBo+#Gy literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Neck/Misc/bellcollar.rsi/meta.json b/Resources/Textures/Clothing/Neck/Misc/bellcollar.rsi/meta.json new file mode 100644 index 00000000000..25dc7b17c84 --- /dev/null +++ b/Resources/Textures/Clothing/Neck/Misc/bellcollar.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by mnemotechnician (GitHub, Frontier) for Frontier Station 14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-NECK", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Neck/mantles/oldmantle.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/Neck/mantles/oldmantle.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..d317412c9dd1a52e5f283dce4e6a55af629aa8bc GIT binary patch literal 568 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|VnL zPZ!6KiaBp*IeHxq5NNAE_~=knRJXS7BSse6Ht~Q9Tb1%+A_cB1U70E^7_0q))uye< zJs>dZQs~)<4y$kvs0TNTFjsSE>3@1*WHf?6VGbbDKRcrzp7Am??*<< z@%8K9e>idIXJV22)wvILl+E15a&P)aiRJPliaXUr1+^2(t8EhwCe3`D@vxotL zbK}#$eR0+LJoD7ksw8harsAjH_13*h`s``KtkMu&vCx27ZF1^Ey&#e4GE4uf9TNQ{ zzL9Cx+4CDNggrl5?Bf==qx(pitAV-F&SQew4f>}0Y8ILIs~Kd?U|+sFy5iFG!bPeR zp3b)AowVj_-HrbY8pl~2EY%oJ88V`K6jwWFyEfe^e*5%i>5IKiX0GB|pKY(p z$<5z$yCRM$;?Jd|rPX@UsyF7QHc#q3x#oAr8O1kY literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Neck/mantles/oldmantle.rsi/icon.png b/Resources/Textures/Clothing/Neck/mantles/oldmantle.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..4cf647611dcfd9c7110ec2321da9c381e628dc06 GIT binary patch literal 671 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Shoes/Misc/clothwarp.rsi/equipped-HAND.png b/Resources/Textures/Clothing/Shoes/Misc/clothwarp.rsi/equipped-HAND.png new file mode 100644 index 0000000000000000000000000000000000000000..b78a810df85f2ed9659b419c1dd8f095848db8f9 GIT binary patch literal 469 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|R5b zr;B4q#hkaZ4)!)12)NcSd8??tYeDZ4u1jtLTPB7usup^Q>exrE|CVATv3A10`sq&| ze4LTKf!{b@;5d^)AFG25cY}o(L!l1CqX>p08yPw#ix%v^|9sV|g57uhE_TZIAGh%p z{XR)1jDSqO(qu`kBeE%syllJG{zPd4zaZZZN@$DTPGUqLh>F;h| zd!_WRb-c;{`#)qN8SflaQ9Sgs=GfCB%{pcaca!p_!k+l#uL4h8uD>?@!dvvmfXA52 zlWB1}!|~5NKT?=CF>RBv>s+yA@8^1{*VzJ4XC*V@a4$r{FM`4QeC+jyTN;=R^*6}K zy>;i{OgLzG^{(ckB|j7WcZjX)lnxHPDzj3v?S8`*{R2Wj0u$s9y#9JC#EYNPBlYM_33+4a$43qcAz-t c6VpD%CkzX$9mdKI;Vst0A&@vMgRZ+ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Shoes/Misc/clothwarp.rsi/icon.png b/Resources/Textures/Clothing/Shoes/Misc/clothwarp.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..8f531e890c1a5d777b5a5ad2569bff2e68ba72d0 GIT binary patch literal 704 zcmV;x0zdtUP)Ox2pG(>|7;mh!O_z=dpGHQ%5RtX_ud_M@`Q7lLs zGzMs)mv-)47se&_5=`o%XFuosW-{l@h-@}XBg1HD^(LSRXafERfIM!3T<)!HgP|qW z-rf;?)b-+DO~TFf50x;~4j=$}Qo|z3x?`Qd_u@iM7=|mQY#Yg3ccruu0=$+4*{Aoz zD2T{_wbj=-X-bO4t+Rl*ICRg>S~CVTs($eV}^SXfx?vmG1H z^?;Dl?oU$bG#w{9F$@FS_7E5tritgp=sJ_)TmD_$Q-}n3^x$qdHg=svq7@-vduN;V z{2EJ(Ul=%l1!*}5@w<-J0a|N@E?=cs$k)wX7x3`Gov+tMM_E}}MyUYXu?Ry*#N(7o zB|-#B)u>i|0tJN$iO_WmDj?4bu9z%(V6Ws&Y5U}^DF zl-kh%p$=<1J3GW;F8TadGMNlohs@5*qIHedcngjfBbn@^H#LCkw$Rp|WPUCisSP6y zq9>2Y)+Eremx)_w}lZQ<3+XR3POo8775NMk-y7wqnq zDHIA!Ox~tcE|br%<2VlI`uj*E+F4%uveI_ruAFNo?Cj z1sWj)Qc6~rJ{OZ+m(Coe=%Ik=>1ktXYUXGf1n9y0-At^1AYOYhxx)Z$>N*<0000 Date: Sat, 6 Jul 2024 12:07:39 +0200 Subject: [PATCH 02/32] Oops --- ...equipped-OUTERCLOTHING.png => equipped-NECK.png} | Bin .../Clothing/Neck/mantles/oldmantle.rsi/meta.json | 2 +- ...equipped-OUTERCLOTHING.png => equipped-NECK.png} | Bin .../Neck/mantles/unathimantle.rsi/meta.json | 2 +- 4 files changed, 2 insertions(+), 2 deletions(-) rename Resources/Textures/Clothing/Neck/mantles/oldmantle.rsi/{equipped-OUTERCLOTHING.png => equipped-NECK.png} (100%) rename Resources/Textures/Clothing/Neck/mantles/unathimantle.rsi/{equipped-OUTERCLOTHING.png => equipped-NECK.png} (100%) diff --git a/Resources/Textures/Clothing/Neck/mantles/oldmantle.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/Neck/mantles/oldmantle.rsi/equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/Neck/mantles/oldmantle.rsi/equipped-OUTERCLOTHING.png rename to Resources/Textures/Clothing/Neck/mantles/oldmantle.rsi/equipped-NECK.png diff --git a/Resources/Textures/Clothing/Neck/mantles/oldmantle.rsi/meta.json b/Resources/Textures/Clothing/Neck/mantles/oldmantle.rsi/meta.json index 9c6fab40625..f66376a1475 100644 --- a/Resources/Textures/Clothing/Neck/mantles/oldmantle.rsi/meta.json +++ b/Resources/Textures/Clothing/Neck/mantles/oldmantle.rsi/meta.json @@ -11,7 +11,7 @@ "name": "icon" }, { - "name": "equipped-OUTERCLOTHING", + "name": "equipped-NECK", "directions": 4 } ] diff --git a/Resources/Textures/Clothing/Neck/mantles/unathimantle.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/Neck/mantles/unathimantle.rsi/equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/Neck/mantles/unathimantle.rsi/equipped-OUTERCLOTHING.png rename to Resources/Textures/Clothing/Neck/mantles/unathimantle.rsi/equipped-NECK.png diff --git a/Resources/Textures/Clothing/Neck/mantles/unathimantle.rsi/meta.json b/Resources/Textures/Clothing/Neck/mantles/unathimantle.rsi/meta.json index 9c6fab40625..f66376a1475 100644 --- a/Resources/Textures/Clothing/Neck/mantles/unathimantle.rsi/meta.json +++ b/Resources/Textures/Clothing/Neck/mantles/unathimantle.rsi/meta.json @@ -11,7 +11,7 @@ "name": "icon" }, { - "name": "equipped-OUTERCLOTHING", + "name": "equipped-NECK", "directions": 4 } ] From cc5414fc7456b1b4246f9d4a08187b908ab12a18 Mon Sep 17 00:00:00 2001 From: FoxxoTrystan <45297731+FoxxoTrystan@users.noreply.github.com> Date: Sat, 6 Jul 2024 12:14:22 +0200 Subject: [PATCH 03/32] Update mantles.yml --- Resources/Prototypes/Entities/Clothing/Neck/mantles.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Resources/Prototypes/Entities/Clothing/Neck/mantles.yml b/Resources/Prototypes/Entities/Clothing/Neck/mantles.yml index 18976b9a34b..efdec875e69 100644 --- a/Resources/Prototypes/Entities/Clothing/Neck/mantles.yml +++ b/Resources/Prototypes/Entities/Clothing/Neck/mantles.yml @@ -82,9 +82,9 @@ description: A tattered fabric wrap, faded over the years. Smells faintly of cigars. components: - type: Sprite - sprite: Clothing/Neck/Mantles/oldmantle.rsi + sprite: Clothing/Neck/mantles/oldmantle.rsi - type: Clothing - sprite: Clothing/Neck/Mantles/oldmantle.rsi + sprite: Clothing/Neck/mantles/oldmantle.rsi - type: entity parent: ClothingNeckBase @@ -93,6 +93,6 @@ description: A rather grisly selection of cured hides and skin, sewn together to form a ragged mantle. components: - type: Sprite - sprite: Clothing/Neck/Mantles/unathimantle.rsi + sprite: Clothing/Neck/mantles/unathimantle.rsi - type: Clothing - sprite: Clothing/Neck/Mantles/unathimantle.rsi + sprite: Clothing/Neck/mantles/unathimantle.rsi From a8524d75df9b41a8863ffce98f6c484c4eea59d8 Mon Sep 17 00:00:00 2001 From: FoxxoTrystan Date: Tue, 9 Jul 2024 13:44:17 +0200 Subject: [PATCH 04/32] Tailwag --- Content.Server/Wagging/WaggingSystem.cs | 2 + .../en-US/deltav/markings/vulpkanin.ftl | 32 ++------- Resources/Prototypes/Actions/types.yml | 4 +- .../Mobs/Customization/Markings/vulpkanin.yml | 66 +++++++++++------- .../Entities/Mobs/Species/vulpkanin.yml | 1 + ...l.png => Felinid_fluffy_tail_full_wag.png} | Bin .../Vulpkanin/tail_markings.rsi/corgi.png | Bin 0 -> 206 bytes .../Vulpkanin/tail_markings.rsi/dalmatian.png | Bin 0 -> 276 bytes .../Vulpkanin/tail_markings.rsi/meta.json | 8 +++ .../Interface/Actions/wagging.rsi/icon-on.png | Bin 0 -> 1783 bytes .../Interface/Actions/wagging.rsi/icon.png | Bin 0 -> 1283 bytes .../Interface/Actions/wagging.rsi/meta.json | 17 +++++ 12 files changed, 77 insertions(+), 53 deletions(-) rename Resources/Textures/DeltaV/Mobs/Customization/Felinid/felinid_tails.rsi/{Felinid_fluffy_tail_full.png => Felinid_fluffy_tail_full_wag.png} (100%) create mode 100644 Resources/Textures/DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi/corgi.png create mode 100644 Resources/Textures/DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi/dalmatian.png create mode 100644 Resources/Textures/Interface/Actions/wagging.rsi/icon-on.png create mode 100644 Resources/Textures/Interface/Actions/wagging.rsi/icon.png create mode 100644 Resources/Textures/Interface/Actions/wagging.rsi/meta.json diff --git a/Content.Server/Wagging/WaggingSystem.cs b/Content.Server/Wagging/WaggingSystem.cs index 7ccc19e20c6..ed2747da198 100644 --- a/Content.Server/Wagging/WaggingSystem.cs +++ b/Content.Server/Wagging/WaggingSystem.cs @@ -65,6 +65,8 @@ public bool TryToggleWagging(EntityUid uid, WaggingComponent? wagging = null, Hu wagging.Wagging = !wagging.Wagging; + _actions.SetToggled(wagging.ActionEntity, wagging.Wagging); + for (var idx = 0; idx < markings.Count; idx++) // Animate all possible tails { var currentMarkingId = markings[idx].MarkingId; diff --git a/Resources/Locale/en-US/deltav/markings/vulpkanin.ftl b/Resources/Locale/en-US/deltav/markings/vulpkanin.ftl index 857cc711570..d23dd4d346a 100644 --- a/Resources/Locale/en-US/deltav/markings/vulpkanin.ftl +++ b/Resources/Locale/en-US/deltav/markings/vulpkanin.ftl @@ -102,14 +102,6 @@ marking-VulpTailTip-vulp = Vulpkanin tail (base) marking-VulpTailTip-vulp-tip = Vulpkanin tail (tip) marking-VulpTailTip = Vulpkanin (tip) -marking-VulpTailWag-vulp_wag = Vulpkanin tail (base) -marking-VulpTailWag-vulp_wag-fade = Vulpkanin tail (fade) -marking-VulpTailWag = Vulpkanin (wag) - -marking-VulpTailWagTip-vulp_wag = Vulpkanin tail (base) -marking-VulpTailWagTip-vulp_wag-tip = Vulpkanin tail (tip) -marking-VulpTailWagTip = Vulpkanin (wag, tip) - marking-VulpTailAlt-vulp_alt = Vulpkanin tail (base) marking-VulpTailAlt-vulp_alt-fade = Vulpkanin tail (fade) marking-VulpTailAlt = Vulpkanin (alt) @@ -130,29 +122,12 @@ marking-VulpTailFoxTip-fox = Fox tail (base) marking-VulpTailFoxTip-fox-tip = Fox tail (fade) marking-VulpTailFoxTip = Vulpkanin Fox (tip) -marking-VulpTailFoxWag-fox_wag = Fox tail (base) -marking-VulpTailFoxWag-fox_wag-fade = Fox tail (fade) -marking-VulpTailFoxWag = Vulpkanin Fox (wag) - -marking-VulpTailFoxWagTip-fox_wag = Fox tail (base) -marking-VulpTailFoxWagTip-fox_wag-tip = Fox tail (tip) -marking-VulpTailFoxWagTip = Vulpkanin Fox (wag, tip) - marking-VulpTailBushy-bushfluff = Bush tail marking-VulpTailBushy = Vulpkanin Bush -marking-VulpTailBushyWag-bushfluff_wag = Bush tail -marking-VulpTailBushyWag = Vulpkanin Bush (wag) - marking-VulpTailCoyote-coyote = Coyote tail marking-VulpTailCoyote = Vulpkanin Coyote -marking-VulpTailCoyoteWag-coyote_wag = Coyote tail -marking-VulpTailCoyoteWag = Vulpkanin Coyote (wag) - -marking-VulpTailCorgiWag-corgi_wag = Crogi tail -marking-VulpTailCorgiWag = Vulpkanin Corgi (wag) - marking-VulpTailHusky-husky-inner = Husky tail (inner) marking-VulpTailHusky-husky-outer = Husky tail (outer) marking-VulpTailHusky = Vulpkanin Husky @@ -176,8 +151,11 @@ marking-VulpTailOtie = Vulpkanin Otie marking-VulpTailFluffy-fluffy = Fluffy tail marking-VulpTailFluffy = Vulpkanin Fluffy -marking-VulpTailDalmatianWag-dalmatian_wag = Dalmatian tail -marking-VulpTailDalmatianWag = Vulpkanin Dalmatian (wag) +marking-VulpTailCorgi-corgi = Crogi tail +marking-VulpTailCorgi = Vulpkanin Corgi + +marking-VulpTailDalmatian-dalmatian = Dalmatian tail +marking-VulpTailDalmatian = Vulpkanin Dalmatian marking-VulpBellyCrest-belly_crest = Belly diff --git a/Resources/Prototypes/Actions/types.yml b/Resources/Prototypes/Actions/types.yml index 22f16bd9568..a6575340c66 100644 --- a/Resources/Prototypes/Actions/types.yml +++ b/Resources/Prototypes/Actions/types.yml @@ -345,8 +345,8 @@ noSpawn: true components: - type: InstantAction - icon: { sprite: Mobs/Customization/reptilian_parts.rsi, state: tail_smooth_behind } - iconOn: { sprite: Mobs/Customization/reptilian_parts.rsi, state: tail_smooth_behind } + icon: { sprite: Interface/Actions/wagging.rsi, state: icon } + iconOn: { sprite: Interface/Actions/wagging.rsi, state: icon-on } itemIconStyle: NoItem useDelay: 1 # emote spam event: !type:ToggleActionEvent diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/vulpkanin.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/vulpkanin.yml index 502ddf35498..69bbb2bd96d 100644 --- a/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/vulpkanin.yml +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/vulpkanin.yml @@ -280,32 +280,32 @@ state: vulp-fade - type: marking - id: VulpTailTip + id: VulpTailAnimated bodyPart: Tail markingCategory: Tail - speciesRestriction: [Vulpkanin] + speciesRestriction: [] sprites: - sprite: DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi - state: vulp + state: vulp_wag - sprite: DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi - state: vulp-tip + state: vulp_wag-tip #fade - type: marking - id: VulpTailWag + id: VulpTailTip bodyPart: Tail markingCategory: Tail speciesRestriction: [Vulpkanin] sprites: - sprite: DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi - state: vulp_wag + state: vulp - sprite: DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi - state: vulp_wag-tip #fade + state: vulp-tip - type: marking - id: VulpTailWagTip + id: VulpTailTipAnimated bodyPart: Tail markingCategory: Tail - speciesRestriction: [Vulpkanin] + speciesRestriction: [] sprites: - sprite: DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi state: vulp_wag @@ -357,32 +357,32 @@ state: fox-fade - type: marking - id: VulpTailFoxTip + id: VulpTailFoxAnimated bodyPart: Tail markingCategory: Tail - speciesRestriction: [Vulpkanin] + speciesRestriction: [] sprites: - sprite: DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi - state: fox + state: fox_wag - sprite: DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi - state: fox-tip + state: fox_wag-fade - type: marking - id: VulpTailFoxWag + id: VulpTailFoxTip bodyPart: Tail markingCategory: Tail speciesRestriction: [Vulpkanin] sprites: - sprite: DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi - state: fox_wag + state: fox - sprite: DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi - state: fox_wag-fade + state: fox-tip - type: marking - id: VulpTailFoxWagTip + id: VulpTailFoxTipAnimated bodyPart: Tail markingCategory: Tail - speciesRestriction: [Vulpkanin] + speciesRestriction: [] sprites: - sprite: DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi state: fox_wag @@ -399,10 +399,10 @@ state: bushfluff - type: marking - id: VulpTailBushyWag + id: VulpTailBushyAnimated bodyPart: Tail markingCategory: Tail - speciesRestriction: [Vulpkanin] + speciesRestriction: [] sprites: - sprite: DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi state: bushfluff_wag @@ -417,19 +417,28 @@ state: coyote - type: marking - id: VulpTailCoyoteWag + id: VulpTailCoyoteAnimated bodyPart: Tail markingCategory: Tail - speciesRestriction: [Vulpkanin] + speciesRestriction: [] sprites: - sprite: DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi state: coyote_wag - type: marking - id: VulpTailCorgiWag + id: VulpTailCorgi bodyPart: Tail markingCategory: Tail speciesRestriction: [Vulpkanin] + sprites: + - sprite: DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi + state: corgi + +- type: marking + id: VulpTailCorgiAnimated + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [] sprites: - sprite: DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi state: corgi_wag @@ -502,10 +511,19 @@ state: fluffy - type: marking - id: VulpTailDalmatianWag + id: VulpTailDalmatian bodyPart: Tail markingCategory: Tail speciesRestriction: [Vulpkanin] + sprites: + - sprite: DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi + state: dalmatian + +- type: marking + id: VulpTailDalmatianAnimated + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [] sprites: - sprite: DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi state: dalmatian_wag diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/vulpkanin.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Species/vulpkanin.yml index 9e4f80bfb52..0bcd71fbadb 100644 --- a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/vulpkanin.yml +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Species/vulpkanin.yml @@ -97,6 +97,7 @@ Female: FemaleVulpkanin Unsexed: MaleVulpkanin - type: DogVision + - type: Wagging - type: LanguageKnowledge speaks: - GalacticCommon diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Felinid/felinid_tails.rsi/Felinid_fluffy_tail_full.png b/Resources/Textures/DeltaV/Mobs/Customization/Felinid/felinid_tails.rsi/Felinid_fluffy_tail_full_wag.png similarity index 100% rename from Resources/Textures/DeltaV/Mobs/Customization/Felinid/felinid_tails.rsi/Felinid_fluffy_tail_full.png rename to Resources/Textures/DeltaV/Mobs/Customization/Felinid/felinid_tails.rsi/Felinid_fluffy_tail_full_wag.png diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi/corgi.png b/Resources/Textures/DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi/corgi.png new file mode 100644 index 0000000000000000000000000000000000000000..fc9cb1c89179400b4e6faeed4de434731954098e GIT binary patch literal 206 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc!DLSt$B>G+x3?~G9#G(6b$A(b?v2R1t4b*i zZaInt?1~@tpM1XwRL9U@bWGy=s*1dwi>6k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`212l#}ze);kxD=X{%{rmg(?+1!K`JP`0q*zOW{DS`j0mJWYe8E5g&H|6f zVg?4j!ywFfJby(BP_Wk1#W5tp{q1x|z6Jvh7R?X;&83r;`mVTm)kWWWdQpSs9fv=v z^4v?lCNPvK+-hc#UHD{ilM%DlhJR`+7C11nGO~)Why(}(I5+}12jiOpzXdGVS@OQ= zsA8exJzjVAuB}Qtx2DhCTGTVg_^F@#?c8R+aOP`2nYc6x%I`CzmD}&T{Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D28>BWK~z{r?N>`o zQ&|{3wiHp3(pxAmpA-t{!U*^njZVT$9Vj^CLgQix%wFATOmtz?pr9L3qHD*&m|3_H z2tpJc6DQFKYJ7(l-(V>%#RretI^TD=t+y0(bS9b2e96guoO93l{?~WT760SE#x(W% zujAOUW4e)%k>qF3o{6JJk9yVDG5Bf%2M!!iaM6uFMIp3n*Dmkj!-o}v!EhrnF;RzW zNp*F#Q|*t!7ZcdOf4@@AsFE zj*j;3-Mcpn_nmj{-0|GHb*p5{mMu{v{x*Sw2M=b$o$WT8ExVwgK%}Lm33wug0IU~R zuU-}R@85U5diCnt+}vEB)oSg+cexiXTyWjKecO(?A|&Xt&w`7?_1Ow7s2N$Bb6DVsNMUgMM=KtfqC z0hz`u9twrTix)3MTU(p=+_`feHr~H{`7)&SL^wx)l(@J!1D~0w%oBhmtf8v`t%vKI z7cN|AWVUO;#h*WaE;>3ooG7;yj~+d;A;vabzqx$*@*ql29r-at0JS1IMyh^HN&rkP zaHj?C53`lvWV9R^?8oAzAliN8$Pr(CeZ3Dc?n5X-aCsyjXe}E+H%u&f>6#bjm(`iFMZ!uQ@&-?f91AJyb=K%&dB!&P6=&-06 z?LYyY7~rb#dz!D#fwEsN{aMa*jw-3z3cUQ zy#aWrsl2>gp;4$D_q}`f-26U<02ko|6BiGIeXugp3BtPR)2GXP!BxKF9JC&#hG_XK z)~;P^0Kp8-+11tM$M@x@PMwk-j3Jr5sSYgppYp+jEod{?eqaZ!xeu=9!T z?rtaU9gI8lB!jWtZdm#qNDN@%HtdK-?1C(;Fb zl&*E-#*GEgdox@|Qu@h4!3<}tVUY#>Qp>|22?`Uc#EL3ev17-MC)h*caIb?>_Mp$c zdGqF&0|^&nONM)su#dMaS+YbyoZZag@$h~GNl_c9kW@;o7YK%ALZ9o;{o-^5*x-hi@6eMi4g6ovPue?mf_?&e{pefIdXw2MMXyAPoF;3BUch2E|LVpLQfzUq$eOU>q|;Xn)!`7?Pn1ofWyQn1fvC3R$$}E zym;}V17T^re*O9|?tRFUUy%=|L8KH!;y@%Gc>o^cL`VW*G9f=42uCBrF|1DgNyMm4 zU0q#Ha&qzwHP+Vc+qZkvE{T2n_VI@#4QGZwacEIMQXbimxPny!74*RqHvFDNeK$FT Z_zPj&fN=@xoCN>?002ovPDHLkV1hR*VC(<@ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Interface/Actions/wagging.rsi/icon.png b/Resources/Textures/Interface/Actions/wagging.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..6dbb54fe2f2c11ae06b1277aedd7306a29214ca0 GIT binary patch literal 1283 zcmV+e1^oJnP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D1ei%gK~z{r?N?b# zD@hnF6Zb77Y6KTtB5`{jbr2QAxn!L2=cp)%ps1iP`WFV~7r5Yps3SPctEi}xsEGTL z822^abJ|L7$4)2Fd*5abG~KD{uJ3&3TdE@d$A2C%^8R7;_xD?HGrau@g0Hi)(=DGP z;==@bdwWd=gTb1Tk}`px8Mt1Qi8mN=oj*N2Ia*s=U2j9-@gV|3LqoQ>xVXvW@h+(aZn$s&TrA^A*2MMZI4U7g6t$Po0N1bFvf{0)UfPEL-v zzrQzMUS75|Ha3pW%*=S?QW``gpf+AxTPqS16XlFPVq;?!64%$)X1CkjjPL%Ko11%( z(?JN8#Q`wplwHp_ z0`aCXB@BMxdvSh#o{0Hh>+9?PoSmJ$lT!icDu9HtVu37r@!q)4=M($;`(k=}+C4ft zdd7>-2L}f}wG#du0a&gfZG{}9_mFLd+ni74j=t?FSd5=aAA1;|>sY4i67|Mn*mR*jGhTh8s6tKqE*Vl#D>pg+Ar*c?9Zf>p>V+M5ys1|btIOk73 zyoZJW7BIkQMtppHP(pEGcqw*vcHAhh=I-upubfh<1-)UiprF9wSB&o;A0IPZULJ3Rmy(hae*y&{J@R=x9(tspudmO7_b2hbt+KLGWM*atIwIA&y}dobcPH|7 z4KxI3gbTbk?g!`KWndD74G9SeO1|K(jByQmzrDTfg<8LLb#(>QdJhc&b<9J7(!#qy zR>K%$OD`3}=zId@C{|Zj#ogWADc;xhp3o2o2U*t!v)RnLRxmg?=tfdH78e(}`6vx( zWo1P;oz5+8%i+8yq9#CP7~jIeLQ7g&+5~%roD%Kr?Jh|E1)Gj@YHI2dJ;901=u0$b z0zCr8P@!OkGuG&kR?G+WcamUZLY3GM_v%j{NZQ)kEa-s$I2?|W{QP`PGCn>&3UoZ~ z_x~aRe~Kh=Bxn?1OtHZ<&(F_$4-XIJ=r^cUKuKoF;ZGxE2oS%Mi;Ig>c*$ou`UZx^ zYPAaP6Kp;_FUYA+A!M<``-i5crU_*C?7peBV`}r>95x zLxLtWjuVm002ovPDHLkV1kgDR_Xu% literal 0 HcmV?d00001 diff --git a/Resources/Textures/Interface/Actions/wagging.rsi/meta.json b/Resources/Textures/Interface/Actions/wagging.rsi/meta.json new file mode 100644 index 00000000000..022930052e5 --- /dev/null +++ b/Resources/Textures/Interface/Actions/wagging.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "Created by dootythefrooty (Discord 273243513800622090)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "icon-on" + } + ] +} From 28e345b45df35a16c9231725fe04528c7af846ce Mon Sep 17 00:00:00 2001 From: FoxxoTrystan Date: Tue, 9 Jul 2024 22:09:38 +0200 Subject: [PATCH 05/32] oops --- ...il_full_wag.png => Felinid_fluffy_tail_full.png} | Bin 1 file changed, 0 insertions(+), 0 deletions(-) rename Resources/Textures/DeltaV/Mobs/Customization/Felinid/felinid_tails.rsi/{Felinid_fluffy_tail_full_wag.png => Felinid_fluffy_tail_full.png} (100%) diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Felinid/felinid_tails.rsi/Felinid_fluffy_tail_full_wag.png b/Resources/Textures/DeltaV/Mobs/Customization/Felinid/felinid_tails.rsi/Felinid_fluffy_tail_full.png similarity index 100% rename from Resources/Textures/DeltaV/Mobs/Customization/Felinid/felinid_tails.rsi/Felinid_fluffy_tail_full_wag.png rename to Resources/Textures/DeltaV/Mobs/Customization/Felinid/felinid_tails.rsi/Felinid_fluffy_tail_full.png From 719bb420dbf4b2d0862d44d3fda4c9f00b011616 Mon Sep 17 00:00:00 2001 From: FoxxoTrystan <45297731+FoxxoTrystan@users.noreply.github.com> Date: Fri, 19 Jul 2024 19:13:11 +0200 Subject: [PATCH 06/32] Update neck.yml --- Resources/Prototypes/Loadouts/neck.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Loadouts/neck.yml b/Resources/Prototypes/Loadouts/neck.yml index 93093b08887..4d65adce1bd 100644 --- a/Resources/Prototypes/Loadouts/neck.yml +++ b/Resources/Prototypes/Loadouts/neck.yml @@ -33,7 +33,7 @@ - type: loadout id: LoadoutNeckBellCollar category: Neck - cost: 1 + cost: 2 exclusive: true items: - ClothingNeckBellCollar From 706ba96acdbf95567ac0ef17171faa2549df7907 Mon Sep 17 00:00:00 2001 From: FoxxoTrystan Date: Sat, 20 Jul 2024 16:35:34 +0200 Subject: [PATCH 07/32] Requested Changes --- .../Clothing/EntitySystems/EmitsSoundOnMoveSystem.cs | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/Content.Shared/Clothing/EntitySystems/EmitsSoundOnMoveSystem.cs b/Content.Shared/Clothing/EntitySystems/EmitsSoundOnMoveSystem.cs index a60abd484d1..2a98a562c49 100644 --- a/Content.Shared/Clothing/EntitySystems/EmitsSoundOnMoveSystem.cs +++ b/Content.Shared/Clothing/EntitySystems/EmitsSoundOnMoveSystem.cs @@ -56,25 +56,24 @@ public override void Update(float frameTime) private void UpdateSound(EntityUid uid, EmitsSoundOnMoveComponent component) { - if (!_xformQuery.TryGetComponent(uid, out var xform) || - !_physicsQuery.TryGetComponent(uid, out var physics)) + if (!_physicsQuery.TryGetComponent(uid, out var physics)) return; // Space does not transmit sound - if (xform.GridUid == null) + if (Transform(uid).GridUid == null) return; - if (component.RequiresGravity && _gravity.IsWeightless(uid, physics, xform)) + if (component.RequiresGravity && _gravity.IsWeightless(uid, physics, Transform(uid))) return; - var parent = xform.ParentUid; + var parent = Transform(uid).ParentUid; var isWorn = parent is { Valid: true } && _clothingQuery.TryGetComponent(uid, out var clothing) && clothing.InSlot != null && component.IsSlotValid; // If this entity is worn by another entity, use that entity's coordinates - var coordinates = isWorn ? Transform(parent).Coordinates : xform.Coordinates; + var coordinates = isWorn ? Transform(parent).Coordinates : Transform(uid).Coordinates; var distanceNeeded = (isWorn && _moverQuery.TryGetComponent(parent, out var mover) && mover.Sprinting) ? 1.5f // The parent is a mob that is currently sprinting : 2f; // The parent is not a mob or is not sprinting From bbe1ae70b3558e4f2f63ad8445e56bde95a7352a Mon Sep 17 00:00:00 2001 From: FoxxoTrystan <45297731+FoxxoTrystan@users.noreply.github.com> Date: Sat, 20 Jul 2024 16:46:08 +0200 Subject: [PATCH 08/32] Update EmitsSoundOnMoveSystem.cs --- Content.Shared/Clothing/EntitySystems/EmitsSoundOnMoveSystem.cs | 2 -- 1 file changed, 2 deletions(-) diff --git a/Content.Shared/Clothing/EntitySystems/EmitsSoundOnMoveSystem.cs b/Content.Shared/Clothing/EntitySystems/EmitsSoundOnMoveSystem.cs index 2a98a562c49..3224b5bca32 100644 --- a/Content.Shared/Clothing/EntitySystems/EmitsSoundOnMoveSystem.cs +++ b/Content.Shared/Clothing/EntitySystems/EmitsSoundOnMoveSystem.cs @@ -20,14 +20,12 @@ public sealed class EmitsSoundOnMoveSystem : EntitySystem private EntityQuery _moverQuery; private EntityQuery _physicsQuery; - private EntityQuery _xformQuery; private EntityQuery _clothingQuery; public override void Initialize() { _moverQuery = GetEntityQuery(); _physicsQuery = GetEntityQuery(); - _xformQuery = GetEntityQuery(); _clothingQuery = GetEntityQuery(); SubscribeLocalEvent(OnEquipped); From 7e2b6dd62001b050f0fbf7fc1726f1ed9657dbcc Mon Sep 17 00:00:00 2001 From: FoxxoTrystan Date: Thu, 1 Aug 2024 18:29:20 +0200 Subject: [PATCH 09/32] Removed TailWagging --- Content.Server/Wagging/WaggingSystem.cs | 6 +- .../en-US/deltav/markings/vulpkanin.ftl | 34 +- Resources/Prototypes/Actions/types.yml | 6 +- .../Mobs/Customization/Markings/vulpkanin.yml | 68 ++-- .../Entities/Mobs/Species/vulpkanin.yml | 1 - Resources/Prototypes/Loadouts/shoes.yml | 5 +- .../Vulpkanin/tail_markings.rsi/corgi.png | Bin 206 -> 0 bytes .../Vulpkanin/tail_markings.rsi/dalmatian.png | Bin 276 -> 0 bytes .../Vulpkanin/tail_markings.rsi/meta.json | 298 +++++++++--------- .../Interface/Actions/wagging.rsi/icon-on.png | Bin 1783 -> 0 bytes .../Interface/Actions/wagging.rsi/icon.png | Bin 1283 -> 0 bytes .../Interface/Actions/wagging.rsi/meta.json | 17 - 12 files changed, 205 insertions(+), 230 deletions(-) delete mode 100644 Resources/Textures/DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi/corgi.png delete mode 100644 Resources/Textures/DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi/dalmatian.png delete mode 100644 Resources/Textures/Interface/Actions/wagging.rsi/icon-on.png delete mode 100644 Resources/Textures/Interface/Actions/wagging.rsi/icon.png delete mode 100644 Resources/Textures/Interface/Actions/wagging.rsi/meta.json diff --git a/Content.Server/Wagging/WaggingSystem.cs b/Content.Server/Wagging/WaggingSystem.cs index ed2747da198..66aa19b53e1 100644 --- a/Content.Server/Wagging/WaggingSystem.cs +++ b/Content.Server/Wagging/WaggingSystem.cs @@ -1,4 +1,4 @@ -using Content.Server.Actions; +using Content.Server.Actions; using Content.Server.Humanoid; using Content.Shared.Humanoid; using Content.Shared.Humanoid.Markings; @@ -65,8 +65,6 @@ public bool TryToggleWagging(EntityUid uid, WaggingComponent? wagging = null, Hu wagging.Wagging = !wagging.Wagging; - _actions.SetToggled(wagging.ActionEntity, wagging.Wagging); - for (var idx = 0; idx < markings.Count; idx++) // Animate all possible tails { var currentMarkingId = markings[idx].MarkingId; @@ -101,4 +99,4 @@ public bool TryToggleWagging(EntityUid uid, WaggingComponent? wagging = null, Hu return true; } -} +} \ No newline at end of file diff --git a/Resources/Locale/en-US/deltav/markings/vulpkanin.ftl b/Resources/Locale/en-US/deltav/markings/vulpkanin.ftl index d23dd4d346a..8244b5f86bd 100644 --- a/Resources/Locale/en-US/deltav/markings/vulpkanin.ftl +++ b/Resources/Locale/en-US/deltav/markings/vulpkanin.ftl @@ -102,6 +102,14 @@ marking-VulpTailTip-vulp = Vulpkanin tail (base) marking-VulpTailTip-vulp-tip = Vulpkanin tail (tip) marking-VulpTailTip = Vulpkanin (tip) +marking-VulpTailWag-vulp_wag = Vulpkanin tail (base) +marking-VulpTailWag-vulp_wag-fade = Vulpkanin tail (fade) +marking-VulpTailWag = Vulpkanin (wag) + +marking-VulpTailWagTip-vulp_wag = Vulpkanin tail (base) +marking-VulpTailWagTip-vulp_wag-tip = Vulpkanin tail (tip) +marking-VulpTailWagTip = Vulpkanin (wag, tip) + marking-VulpTailAlt-vulp_alt = Vulpkanin tail (base) marking-VulpTailAlt-vulp_alt-fade = Vulpkanin tail (fade) marking-VulpTailAlt = Vulpkanin (alt) @@ -122,12 +130,29 @@ marking-VulpTailFoxTip-fox = Fox tail (base) marking-VulpTailFoxTip-fox-tip = Fox tail (fade) marking-VulpTailFoxTip = Vulpkanin Fox (tip) +marking-VulpTailFoxWag-fox_wag = Fox tail (base) +marking-VulpTailFoxWag-fox_wag-fade = Fox tail (fade) +marking-VulpTailFoxWag = Vulpkanin Fox (wag) + +marking-VulpTailFoxWagTip-fox_wag = Fox tail (base) +marking-VulpTailFoxWagTip-fox_wag-tip = Fox tail (tip) +marking-VulpTailFoxWagTip = Vulpkanin Fox (wag, tip) + marking-VulpTailBushy-bushfluff = Bush tail marking-VulpTailBushy = Vulpkanin Bush +marking-VulpTailBushyWag-bushfluff_wag = Bush tail +marking-VulpTailBushyWag = Vulpkanin Bush (wag) + marking-VulpTailCoyote-coyote = Coyote tail marking-VulpTailCoyote = Vulpkanin Coyote +marking-VulpTailCoyoteWag-coyote_wag = Coyote tail +marking-VulpTailCoyoteWag = Vulpkanin Coyote (wag) + +marking-VulpTailCorgiWag-corgi_wag = Crogi tail +marking-VulpTailCorgiWag = Vulpkanin Corgi (wag) + marking-VulpTailHusky-husky-inner = Husky tail (inner) marking-VulpTailHusky-husky-outer = Husky tail (outer) marking-VulpTailHusky = Vulpkanin Husky @@ -151,11 +176,8 @@ marking-VulpTailOtie = Vulpkanin Otie marking-VulpTailFluffy-fluffy = Fluffy tail marking-VulpTailFluffy = Vulpkanin Fluffy -marking-VulpTailCorgi-corgi = Crogi tail -marking-VulpTailCorgi = Vulpkanin Corgi - -marking-VulpTailDalmatian-dalmatian = Dalmatian tail -marking-VulpTailDalmatian = Vulpkanin Dalmatian +marking-VulpTailDalmatianWag-dalmatian_wag = Dalmatian tail +marking-VulpTailDalmatianWag = Vulpkanin Dalmatian (wag) marking-VulpBellyCrest-belly_crest = Belly @@ -229,4 +251,4 @@ marking-VulpHairSpike = Spike marking-VulpFacialHairRuff = Ruff marking-VulpFacialHairElder = Elder marking-VulpFacialHairElderChin = Elder Chin -marking-VulpFacialHairKita = Kita +marking-VulpFacialHairKita = Kita \ No newline at end of file diff --git a/Resources/Prototypes/Actions/types.yml b/Resources/Prototypes/Actions/types.yml index f5dff1f453a..3faad5618c2 100644 --- a/Resources/Prototypes/Actions/types.yml +++ b/Resources/Prototypes/Actions/types.yml @@ -345,8 +345,8 @@ noSpawn: true components: - type: InstantAction - icon: { sprite: Interface/Actions/wagging.rsi, state: icon } - iconOn: { sprite: Interface/Actions/wagging.rsi, state: icon-on } + icon: { sprite: Mobs/Customization/reptilian_parts.rsi, state: tail_smooth_behind } + iconOn: { sprite: Mobs/Customization/reptilian_parts.rsi, state: tail_smooth_behind } itemIconStyle: NoItem useDelay: 1 # emote spam event: !type:ToggleActionEvent @@ -375,4 +375,4 @@ useDelay: 40 event: !type:FabricateActionEvent - fabrication: FoodGumball + fabrication: FoodGumball \ No newline at end of file diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/vulpkanin.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/vulpkanin.yml index 69bbb2bd96d..e87685c8040 100644 --- a/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/vulpkanin.yml +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/vulpkanin.yml @@ -280,32 +280,32 @@ state: vulp-fade - type: marking - id: VulpTailAnimated + id: VulpTailTip bodyPart: Tail markingCategory: Tail - speciesRestriction: [] + speciesRestriction: [Vulpkanin] sprites: - sprite: DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi - state: vulp_wag + state: vulp - sprite: DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi - state: vulp_wag-tip #fade + state: vulp-tip - type: marking - id: VulpTailTip + id: VulpTailWag bodyPart: Tail markingCategory: Tail speciesRestriction: [Vulpkanin] sprites: - sprite: DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi - state: vulp + state: vulp_wag - sprite: DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi - state: vulp-tip + state: vulp_wag-tip #fade - type: marking - id: VulpTailTipAnimated + id: VulpTailWagTip bodyPart: Tail markingCategory: Tail - speciesRestriction: [] + speciesRestriction: [Vulpkanin] sprites: - sprite: DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi state: vulp_wag @@ -357,32 +357,32 @@ state: fox-fade - type: marking - id: VulpTailFoxAnimated + id: VulpTailFoxTip bodyPart: Tail markingCategory: Tail - speciesRestriction: [] + speciesRestriction: [Vulpkanin] sprites: - sprite: DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi - state: fox_wag + state: fox - sprite: DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi - state: fox_wag-fade + state: fox-tip - type: marking - id: VulpTailFoxTip + id: VulpTailFoxWag bodyPart: Tail markingCategory: Tail speciesRestriction: [Vulpkanin] sprites: - sprite: DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi - state: fox + state: fox_wag - sprite: DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi - state: fox-tip + state: fox_wag-fade - type: marking - id: VulpTailFoxTipAnimated + id: VulpTailFoxWagTip bodyPart: Tail markingCategory: Tail - speciesRestriction: [] + speciesRestriction: [Vulpkanin] sprites: - sprite: DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi state: fox_wag @@ -399,10 +399,10 @@ state: bushfluff - type: marking - id: VulpTailBushyAnimated + id: VulpTailBushyWag bodyPart: Tail markingCategory: Tail - speciesRestriction: [] + speciesRestriction: [Vulpkanin] sprites: - sprite: DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi state: bushfluff_wag @@ -417,28 +417,19 @@ state: coyote - type: marking - id: VulpTailCoyoteAnimated + id: VulpTailCoyoteWag bodyPart: Tail markingCategory: Tail - speciesRestriction: [] + speciesRestriction: [Vulpkanin] sprites: - sprite: DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi state: coyote_wag - type: marking - id: VulpTailCorgi + id: VulpTailCorgiWag bodyPart: Tail markingCategory: Tail speciesRestriction: [Vulpkanin] - sprites: - - sprite: DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi - state: corgi - -- type: marking - id: VulpTailCorgiAnimated - bodyPart: Tail - markingCategory: Tail - speciesRestriction: [] sprites: - sprite: DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi state: corgi_wag @@ -511,19 +502,10 @@ state: fluffy - type: marking - id: VulpTailDalmatian + id: VulpTailDalmatianWag bodyPart: Tail markingCategory: Tail speciesRestriction: [Vulpkanin] - sprites: - - sprite: DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi - state: dalmatian - -- type: marking - id: VulpTailDalmatianAnimated - bodyPart: Tail - markingCategory: Tail - speciesRestriction: [] sprites: - sprite: DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi state: dalmatian_wag @@ -884,4 +866,4 @@ speciesRestriction: [Vulpkanin] sprites: - sprite: DeltaV/Mobs/Customization/Vulpkanin/facial_hair.rsi - state: kita + state: kita \ No newline at end of file diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/vulpkanin.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Species/vulpkanin.yml index 0bcd71fbadb..9e4f80bfb52 100644 --- a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/vulpkanin.yml +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Species/vulpkanin.yml @@ -97,7 +97,6 @@ Female: FemaleVulpkanin Unsexed: MaleVulpkanin - type: DogVision - - type: Wagging - type: LanguageKnowledge speaks: - GalacticCommon diff --git a/Resources/Prototypes/Loadouts/shoes.yml b/Resources/Prototypes/Loadouts/shoes.yml index aaccbaa21eb..e67ca70b392 100644 --- a/Resources/Prototypes/Loadouts/shoes.yml +++ b/Resources/Prototypes/Loadouts/shoes.yml @@ -341,7 +341,6 @@ items: - ClothingUnderSocksCoder -# Socks - type: loadout id: LoadoutShoesUnderSocksBee category: Shoes @@ -357,9 +356,9 @@ - ClothingUnderSocksBee - type: loadout - id: LoadoutShoesClothwarp + id: LoadoutShoesClothWrap category: Shoes cost: 1 exclusive: true items: - - ClothingsClothwarp + - ClothingClothWrap diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi/corgi.png b/Resources/Textures/DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi/corgi.png deleted file mode 100644 index fc9cb1c89179400b4e6faeed4de434731954098e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 206 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc!DLSt$B>G+x3?~G9#G(6b$A(b?v2R1t4b*i zZaInt?1~@tpM1XwRL9U@bWGy=s*1dwi>6k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`212l#}ze);kxD=X{%{rmg(?+1!K`JP`0q*zOW{DS`j0mJWYe8E5g&H|6f zVg?4j!ywFfJby(BP_Wk1#W5tp{q1x|z6Jvh7R?X;&83r;`mVTm)kWWWdQpSs9fv=v z^4v?lCNPvK+-hc#UHD{ilM%DlhJR`+7C11nGO~)Why(}(I5+}12jiOpzXdGVS@OQ= zsA8exJzjVAuB}Qtx2DhCTGTVg_^F@#?c8R+aOP`2nYc6x%I`CzmD}&T{Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D28>BWK~z{r?N>`o zQ&|{3wiHp3(pxAmpA-t{!U*^njZVT$9Vj^CLgQix%wFATOmtz?pr9L3qHD*&m|3_H z2tpJc6DQFKYJ7(l-(V>%#RretI^TD=t+y0(bS9b2e96guoO93l{?~WT760SE#x(W% zujAOUW4e)%k>qF3o{6JJk9yVDG5Bf%2M!!iaM6uFMIp3n*Dmkj!-o}v!EhrnF;RzW zNp*F#Q|*t!7ZcdOf4@@AsFE zj*j;3-Mcpn_nmj{-0|GHb*p5{mMu{v{x*Sw2M=b$o$WT8ExVwgK%}Lm33wug0IU~R zuU-}R@85U5diCnt+}vEB)oSg+cexiXTyWjKecO(?A|&Xt&w`7?_1Ow7s2N$Bb6DVsNMUgMM=KtfqC z0hz`u9twrTix)3MTU(p=+_`feHr~H{`7)&SL^wx)l(@J!1D~0w%oBhmtf8v`t%vKI z7cN|AWVUO;#h*WaE;>3ooG7;yj~+d;A;vabzqx$*@*ql29r-at0JS1IMyh^HN&rkP zaHj?C53`lvWV9R^?8oAzAliN8$Pr(CeZ3Dc?n5X-aCsyjXe}E+H%u&f>6#bjm(`iFMZ!uQ@&-?f91AJyb=K%&dB!&P6=&-06 z?LYyY7~rb#dz!D#fwEsN{aMa*jw-3z3cUQ zy#aWrsl2>gp;4$D_q}`f-26U<02ko|6BiGIeXugp3BtPR)2GXP!BxKF9JC&#hG_XK z)~;P^0Kp8-+11tM$M@x@PMwk-j3Jr5sSYgppYp+jEod{?eqaZ!xeu=9!T z?rtaU9gI8lB!jWtZdm#qNDN@%HtdK-?1C(;Fb zl&*E-#*GEgdox@|Qu@h4!3<}tVUY#>Qp>|22?`Uc#EL3ev17-MC)h*caIb?>_Mp$c zdGqF&0|^&nONM)su#dMaS+YbyoZZag@$h~GNl_c9kW@;o7YK%ALZ9o;{o-^5*x-hi@6eMi4g6ovPue?mf_?&e{pefIdXw2MMXyAPoF;3BUch2E|LVpLQfzUq$eOU>q|;Xn)!`7?Pn1ofWyQn1fvC3R$$}E zym;}V17T^re*O9|?tRFUUy%=|L8KH!;y@%Gc>o^cL`VW*G9f=42uCBrF|1DgNyMm4 zU0q#Ha&qzwHP+Vc+qZkvE{T2n_VI@#4QGZwacEIMQXbimxPny!74*RqHvFDNeK$FT Z_zPj&fN=@xoCN>?002ovPDHLkV1hR*VC(<@ diff --git a/Resources/Textures/Interface/Actions/wagging.rsi/icon.png b/Resources/Textures/Interface/Actions/wagging.rsi/icon.png deleted file mode 100644 index 6dbb54fe2f2c11ae06b1277aedd7306a29214ca0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1283 zcmV+e1^oJnP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D1ei%gK~z{r?N?b# zD@hnF6Zb77Y6KTtB5`{jbr2QAxn!L2=cp)%ps1iP`WFV~7r5Yps3SPctEi}xsEGTL z822^abJ|L7$4)2Fd*5abG~KD{uJ3&3TdE@d$A2C%^8R7;_xD?HGrau@g0Hi)(=DGP z;==@bdwWd=gTb1Tk}`px8Mt1Qi8mN=oj*N2Ia*s=U2j9-@gV|3LqoQ>xVXvW@h+(aZn$s&TrA^A*2MMZI4U7g6t$Po0N1bFvf{0)UfPEL-v zzrQzMUS75|Ha3pW%*=S?QW``gpf+AxTPqS16XlFPVq;?!64%$)X1CkjjPL%Ko11%( z(?JN8#Q`wplwHp_ z0`aCXB@BMxdvSh#o{0Hh>+9?PoSmJ$lT!icDu9HtVu37r@!q)4=M($;`(k=}+C4ft zdd7>-2L}f}wG#du0a&gfZG{}9_mFLd+ni74j=t?FSd5=aAA1;|>sY4i67|Mn*mR*jGhTh8s6tKqE*Vl#D>pg+Ar*c?9Zf>p>V+M5ys1|btIOk73 zyoZJW7BIkQMtppHP(pEGcqw*vcHAhh=I-upubfh<1-)UiprF9wSB&o;A0IPZULJ3Rmy(hae*y&{J@R=x9(tspudmO7_b2hbt+KLGWM*atIwIA&y}dobcPH|7 z4KxI3gbTbk?g!`KWndD74G9SeO1|K(jByQmzrDTfg<8LLb#(>QdJhc&b<9J7(!#qy zR>K%$OD`3}=zId@C{|Zj#ogWADc;xhp3o2o2U*t!v)RnLRxmg?=tfdH78e(}`6vx( zWo1P;oz5+8%i+8yq9#CP7~jIeLQ7g&+5~%roD%Kr?Jh|E1)Gj@YHI2dJ;901=u0$b z0zCr8P@!OkGuG&kR?G+WcamUZLY3GM_v%j{NZQ)kEa-s$I2?|W{QP`PGCn>&3UoZ~ z_x~aRe~Kh=Bxn?1OtHZ<&(F_$4-XIJ=r^cUKuKoF;ZGxE2oS%Mi;Ig>c*$ou`UZx^ zYPAaP6Kp;_FUYA+A!M<``-i5crU_*C?7peBV`}r>95x zLxLtWjuVm002ovPDHLkV1kgDR_Xu% diff --git a/Resources/Textures/Interface/Actions/wagging.rsi/meta.json b/Resources/Textures/Interface/Actions/wagging.rsi/meta.json deleted file mode 100644 index 022930052e5..00000000000 --- a/Resources/Textures/Interface/Actions/wagging.rsi/meta.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "version": 1, - "license": "CC0-1.0", - "copyright": "Created by dootythefrooty (Discord 273243513800622090)", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" - }, - { - "name": "icon-on" - } - ] -} From bd8e17f144b5cbff341a9ac4705a64b76da8d0fd Mon Sep 17 00:00:00 2001 From: FoxxoTrystan <45297731+FoxxoTrystan@users.noreply.github.com> Date: Thu, 1 Aug 2024 18:34:14 +0200 Subject: [PATCH 10/32] Update WaggingSystem.cs --- Content.Server/Wagging/WaggingSystem.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Content.Server/Wagging/WaggingSystem.cs b/Content.Server/Wagging/WaggingSystem.cs index 66aa19b53e1..eed05896e86 100644 --- a/Content.Server/Wagging/WaggingSystem.cs +++ b/Content.Server/Wagging/WaggingSystem.cs @@ -1,4 +1,4 @@ -using Content.Server.Actions; +using Content.Server.Actions; using Content.Server.Humanoid; using Content.Shared.Humanoid; using Content.Shared.Humanoid.Markings; @@ -99,4 +99,4 @@ public bool TryToggleWagging(EntityUid uid, WaggingComponent? wagging = null, Hu return true; } -} \ No newline at end of file +} From 00136a80c9463f9d9de891937b6434e5e47ee898 Mon Sep 17 00:00:00 2001 From: FoxxoTrystan <45297731+FoxxoTrystan@users.noreply.github.com> Date: Thu, 1 Aug 2024 18:34:36 +0200 Subject: [PATCH 11/32] Update WaggingSystem.cs --- Content.Server/Wagging/WaggingSystem.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Content.Server/Wagging/WaggingSystem.cs b/Content.Server/Wagging/WaggingSystem.cs index eed05896e86..7ccc19e20c6 100644 --- a/Content.Server/Wagging/WaggingSystem.cs +++ b/Content.Server/Wagging/WaggingSystem.cs @@ -1,4 +1,4 @@ -using Content.Server.Actions; +using Content.Server.Actions; using Content.Server.Humanoid; using Content.Shared.Humanoid; using Content.Shared.Humanoid.Markings; From 61c52b6aea609c95daab2d7d8b33578c2052aacc Mon Sep 17 00:00:00 2001 From: FoxxoTrystan <45297731+FoxxoTrystan@users.noreply.github.com> Date: Thu, 1 Aug 2024 18:35:26 +0200 Subject: [PATCH 12/32] Update vulpkanin.yml --- .../DeltaV/Entities/Mobs/Customization/Markings/vulpkanin.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/vulpkanin.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/vulpkanin.yml index e87685c8040..502ddf35498 100644 --- a/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/vulpkanin.yml +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/vulpkanin.yml @@ -866,4 +866,4 @@ speciesRestriction: [Vulpkanin] sprites: - sprite: DeltaV/Mobs/Customization/Vulpkanin/facial_hair.rsi - state: kita \ No newline at end of file + state: kita From fe2e4c12bd559e455937d4eee2002a72562a5ecc Mon Sep 17 00:00:00 2001 From: FoxxoTrystan <45297731+FoxxoTrystan@users.noreply.github.com> Date: Thu, 1 Aug 2024 18:37:26 +0200 Subject: [PATCH 13/32] Apply suggestions from code review Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com> Signed-off-by: FoxxoTrystan <45297731+FoxxoTrystan@users.noreply.github.com> --- Resources/Prototypes/Entities/Clothing/clothwarps.yml | 4 ++-- .../Recipes/Construction/Graphs/clothing/clothwarp.yml | 6 +++--- Resources/Prototypes/Recipes/Construction/clothing.yml | 10 +++++----- .../Clothing/Neck/Misc/bellcollar.rsi/meta.json | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Resources/Prototypes/Entities/Clothing/clothwarps.yml b/Resources/Prototypes/Entities/Clothing/clothwarps.yml index 1a48c39a264..a6ba529f5c1 100644 --- a/Resources/Prototypes/Entities/Clothing/clothwarps.yml +++ b/Resources/Prototypes/Entities/Clothing/clothwarps.yml @@ -1,7 +1,7 @@ - type: entity parent: Clothing - id: ClothingsClothwarp - name: clothwarps + id: ClothingClothWrap + name: cloth wraps description: A roll of treated canvas used for wrapping claws or paws. components: - type: Item diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/clothing/clothwarp.yml b/Resources/Prototypes/Recipes/Construction/Graphs/clothing/clothwarp.yml index 65bc8f9ae66..7269ae77278 100644 --- a/Resources/Prototypes/Recipes/Construction/Graphs/clothing/clothwarp.yml +++ b/Resources/Prototypes/Recipes/Construction/Graphs/clothing/clothwarp.yml @@ -1,13 +1,13 @@ - type: constructionGraph - id: ClothingsClothwarp + id: ClothingClothWrap start: start graph: - node: start edges: - - to: warps + - to: wraps steps: - material: Cloth amount: 2 doAfter: 1 - node: warps - entity: ClothingsClothwarp + entity: ClothingClothWrap diff --git a/Resources/Prototypes/Recipes/Construction/clothing.yml b/Resources/Prototypes/Recipes/Construction/clothing.yml index 99a6cfb13d3..0100c59e527 100644 --- a/Resources/Prototypes/Recipes/Construction/clothing.yml +++ b/Resources/Prototypes/Recipes/Construction/clothing.yml @@ -98,12 +98,12 @@ objectType: Item - type: construction - name: clothwarps - id: ClothingsClothwarp - graph: ClothingsClothwarp + name: cloth wraps + id: ClothingClothWrap + graph: ClothingClothWrap startNode: start - targetNode: warps + targetNode: wraps category: construction-category-clothing description: A roll of treated canvas used for wrapping claws or paws. - icon: { sprite: Clothing/Shoes/Misc/clothwarp.rsi, state: icon } + icon: { sprite: Clothing/Shoes/Misc/clothWrap.rsi, state: icon } objectType: Item diff --git a/Resources/Textures/Clothing/Neck/Misc/bellcollar.rsi/meta.json b/Resources/Textures/Clothing/Neck/Misc/bellcollar.rsi/meta.json index 25dc7b17c84..464e2e4a352 100644 --- a/Resources/Textures/Clothing/Neck/Misc/bellcollar.rsi/meta.json +++ b/Resources/Textures/Clothing/Neck/Misc/bellcollar.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Made by mnemotechnician (GitHub, Frontier) for Frontier Station 14", + "copyright": "Made by mnemotechnician (GitHub)", "size": { "x": 32, "y": 32 From 991a5f4f24d4f97672322f3092b0e8a4eb2f34ed Mon Sep 17 00:00:00 2001 From: FoxxoTrystan <45297731+FoxxoTrystan@users.noreply.github.com> Date: Thu, 1 Aug 2024 18:37:33 +0200 Subject: [PATCH 14/32] Update meta.json --- .../Mobs/Customization/Vulpkanin/tail_markings.rsi/meta.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi/meta.json b/Resources/Textures/DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi/meta.json index eb60f950480..5920c05a3af 100644 --- a/Resources/Textures/DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi/meta.json +++ b/Resources/Textures/DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi/meta.json @@ -143,4 +143,4 @@ "delays": [[0.2, 0.2, 0.2, 0.2, 0.2, 0.2], [0.2, 0.2, 0.2, 0.2, 0.2, 0.2], [0.2, 0.2, 0.2, 0.2, 0.2, 0.2], [0.2, 0.2, 0.2, 0.2, 0.2, 0.2]] } ] - } \ No newline at end of file + } From 50aba46781cf2e0752d11267f581966bd1760ed2 Mon Sep 17 00:00:00 2001 From: FoxxoTrystan <45297731+FoxxoTrystan@users.noreply.github.com> Date: Thu, 1 Aug 2024 18:40:34 +0200 Subject: [PATCH 15/32] Update meta.json --- .../Vulpkanin/tail_markings.rsi/meta.json | 290 +++++++++--------- 1 file changed, 145 insertions(+), 145 deletions(-) diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi/meta.json b/Resources/Textures/DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi/meta.json index 5920c05a3af..15211a3bda6 100644 --- a/Resources/Textures/DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi/meta.json +++ b/Resources/Textures/DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi/meta.json @@ -1,146 +1,146 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/ParadiseSS13/Paradise edited by Floofers", - "size": {"x": 32, "y": 32}, - "states": [ - { - "name": "vulp", - "directions": 4 - }, - { - "name": "vulp-tip", - "directions": 4 - }, - { - "name": "vulp-fade", - "directions": 4 - }, - { - "name": "vulp_alt", - "directions": 4 - }, - { - "name": "vulp_alt-fade", - "directions": 4 - }, - { - "name": "vulp_alt-tip", - "directions": 4 - }, - { - "name": "vulp_wag", - "directions": 4, - "delays": [[0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2], [0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2], [0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2], [0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2]] - }, - { - "name": "vulp_wag-fade", - "directions": 4, - "delays": [[0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2], [0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2], [0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2], [0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2]] - }, - { - "name": "vulp_wag-tip", - "directions": 4, - "delays": [[0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2], [0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2], [0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2], [0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2]] - }, - { - "name": "long", - "directions": 4 - }, - { - "name": "long-tip", - "directions": 4 - }, - { - "name": "fox", - "directions": 4 - }, - { - "name": "fox-tip", - "directions": 4 - }, - { - "name": "fox-fade", - "directions": 4 - }, - { - "name": "fox_wag", - "directions": 4, - "delays": [[0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2], [0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2], [0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2], [0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2]] - }, - { - "name": "fox_wag-fade", - "directions": 4, - "delays": [[0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2], [0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2], [0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2], [0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2]] - }, - { - "name": "fox_wag-tip", - "directions": 4, - "delays": [[0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2], [0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2], [0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2], [0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2]] - }, - { - "name": "bushfluff", - "directions": 4 - }, - { - "name": "bushfluff_wag", - "directions": 4, - "delays": [[0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2], [0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2], [0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2], [0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2]] - }, - { - "name": "coyote", - "directions": 4 - }, - { - "name": "coyote_wag", - "directions": 4, - "delays": [[0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2], [0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2], [0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2], [0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2]] - }, - { - "name": "corgi_wag", - "directions": 4, - "delays": [[0.1, 0.1, 0.1, 0.1], [0.1, 0.1, 0.1, 0.1], [0.1, 0.1, 0.1, 0.1], [0.1, 0.1, 0.1, 0.1]] - }, - { - "name": "husky", - "directions": 4 - }, - { - "name": "husky-inner", - "directions": 4 - }, - { - "name": "husky-outer", - "directions": 4 - }, - { - "name": "fox2", - "directions": 4 - }, - { - "name": "fox3", - "directions": 4 - }, - { - "name": "fox3-tip", - "directions": 4 - }, - { - "name": "fennec", - "directions": 4 - }, - { - "name": "otie", - "directions": 4 - }, - { - "name": "fluffy", - "directions": 4 - }, - { - "name": "dalmatian_wag", - "directions": 4, - "delays": [[0.2, 0.2, 0.2, 0.2, 0.2, 0.2], [0.2, 0.2, 0.2, 0.2, 0.2, 0.2], [0.2, 0.2, 0.2, 0.2, 0.2, 0.2], [0.2, 0.2, 0.2, 0.2, 0.2, 0.2]] - } - ] - } + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/ParadiseSS13/Paradise edited by Floofers", + "size": {"x": 32, "y": 32}, + "states": [ + { + "name": "vulp", + "directions": 4 + }, + { + "name": "vulp-tip", + "directions": 4 + }, + { + "name": "vulp-fade", + "directions": 4 + }, + { + "name": "vulp_alt", + "directions": 4 + }, + { + "name": "vulp_alt-fade", + "directions": 4 + }, + { + "name": "vulp_alt-tip", + "directions": 4 + }, + { + "name": "vulp_wag", + "directions": 4, + "delays": [[0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2], [0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2], [0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2], [0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2]] + }, + { + "name": "vulp_wag-fade", + "directions": 4, + "delays": [[0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2], [0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2], [0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2], [0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2]] + }, + { + "name": "vulp_wag-tip", + "directions": 4, + "delays": [[0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2], [0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2], [0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2], [0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2]] + }, + { + "name": "long", + "directions": 4 + }, + { + "name": "long-tip", + "directions": 4 + }, + { + "name": "fox", + "directions": 4 + }, + { + "name": "fox-tip", + "directions": 4 + }, + { + "name": "fox-fade", + "directions": 4 + }, + { + "name": "fox_wag", + "directions": 4, + "delays": [[0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2], [0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2], [0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2], [0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2]] + }, + { + "name": "fox_wag-fade", + "directions": 4, + "delays": [[0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2], [0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2], [0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2], [0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2]] + }, + { + "name": "fox_wag-tip", + "directions": 4, + "delays": [[0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2], [0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2], [0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2], [0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2]] + }, + { + "name": "bushfluff", + "directions": 4 + }, + { + "name": "bushfluff_wag", + "directions": 4, + "delays": [[0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2], [0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2], [0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2], [0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2]] + }, + { + "name": "coyote", + "directions": 4 + }, + { + "name": "coyote_wag", + "directions": 4, + "delays": [[0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2], [0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2], [0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2], [0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2]] + }, + { + "name": "corgi_wag", + "directions": 4, + "delays": [[0.1, 0.1, 0.1, 0.1], [0.1, 0.1, 0.1, 0.1], [0.1, 0.1, 0.1, 0.1], [0.1, 0.1, 0.1, 0.1]] + }, + { + "name": "husky", + "directions": 4 + }, + { + "name": "husky-inner", + "directions": 4 + }, + { + "name": "husky-outer", + "directions": 4 + }, + { + "name": "fox2", + "directions": 4 + }, + { + "name": "fox3", + "directions": 4 + }, + { + "name": "fox3-tip", + "directions": 4 + }, + { + "name": "fennec", + "directions": 4 + }, + { + "name": "otie", + "directions": 4 + }, + { + "name": "fluffy", + "directions": 4 + }, + { + "name": "dalmatian_wag", + "directions": 4, + "delays": [[0.2, 0.2, 0.2, 0.2, 0.2, 0.2], [0.2, 0.2, 0.2, 0.2, 0.2, 0.2], [0.2, 0.2, 0.2, 0.2, 0.2, 0.2], [0.2, 0.2, 0.2, 0.2, 0.2, 0.2]] + } + ] +} From 657ef43003d1e51ed7100a008d9825c68caa62be Mon Sep 17 00:00:00 2001 From: FoxxoTrystan Date: Thu, 1 Aug 2024 18:40:37 +0200 Subject: [PATCH 16/32] format --- .../Shoes/Misc/clothwarp.rsi/meta.json | 23 ++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/Resources/Textures/Clothing/Shoes/Misc/clothwarp.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Misc/clothwarp.rsi/meta.json index a7542e75bb1..2ca7e39894a 100644 --- a/Resources/Textures/Clothing/Shoes/Misc/clothwarp.rsi/meta.json +++ b/Resources/Textures/Clothing/Shoes/Misc/clothwarp.rsi/meta.json @@ -1 +1,22 @@ -{"version": 1, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/ParadiseSS13/Paradise/", "size": {"x": 32, "y": 32}, "states": [{"name": "icon"}, {"name": "equipped-FEET", "directions": 4}, {"name": "equipped-HAND", "directions": 4}]} +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/ParadiseSS13/Paradise/", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-FEET", + "directions": 4 + }, + { + "name": "equipped-HAND", + "directions": 4 + } + ] +} \ No newline at end of file From 5e1ceb2682e118eb5b8ffbb920b4dab725796b20 Mon Sep 17 00:00:00 2001 From: FoxxoTrystan <45297731+FoxxoTrystan@users.noreply.github.com> Date: Thu, 1 Aug 2024 18:41:36 +0200 Subject: [PATCH 17/32] Update vulpkanin.ftl --- Resources/Locale/en-US/deltav/markings/vulpkanin.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Locale/en-US/deltav/markings/vulpkanin.ftl b/Resources/Locale/en-US/deltav/markings/vulpkanin.ftl index 8244b5f86bd..857cc711570 100644 --- a/Resources/Locale/en-US/deltav/markings/vulpkanin.ftl +++ b/Resources/Locale/en-US/deltav/markings/vulpkanin.ftl @@ -251,4 +251,4 @@ marking-VulpHairSpike = Spike marking-VulpFacialHairRuff = Ruff marking-VulpFacialHairElder = Elder marking-VulpFacialHairElderChin = Elder Chin -marking-VulpFacialHairKita = Kita \ No newline at end of file +marking-VulpFacialHairKita = Kita From 2909755955551bdcaba50c9f103df9d852cedac9 Mon Sep 17 00:00:00 2001 From: FoxxoTrystan <45297731+FoxxoTrystan@users.noreply.github.com> Date: Thu, 1 Aug 2024 18:42:19 +0200 Subject: [PATCH 18/32] Apply suggestions from code review Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com> Signed-off-by: FoxxoTrystan <45297731+FoxxoTrystan@users.noreply.github.com> --- .../Catalog/VendingMachines/Inventories/clothesmate.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml index bc7a5470b83..fac5117d8b3 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml @@ -67,7 +67,7 @@ ClothingShoesColorOrange: 2 ClothingShoesColorRed: 2 ClothingShoesColorPurple: 2 - ClothingsClothwarp: 4 + ClothingClothWrap: 4 ClothingHeadHatGreysoft: 8 ClothingHeadHatMimesoft: 3 ClothingHeadHatBluesoft: 2 From 8e25fb28013730db2fad58e91822b3e5e62789cd Mon Sep 17 00:00:00 2001 From: FoxxoTrystan <45297731+FoxxoTrystan@users.noreply.github.com> Date: Thu, 1 Aug 2024 18:46:54 +0200 Subject: [PATCH 19/32] Update neck.yml --- Resources/Prototypes/Loadouts/neck.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Loadouts/neck.yml b/Resources/Prototypes/Loadouts/neck.yml index 5f6c64e110c..3e0227d1dae 100644 --- a/Resources/Prototypes/Loadouts/neck.yml +++ b/Resources/Prototypes/Loadouts/neck.yml @@ -110,7 +110,7 @@ cost: 1 exclusive: true items: - - ClothingNeckOldMantle + - ClothingNeckTieRed - type: loadout id: LoadoutNeckTieWhite From 674d92e62fc0d55a2c742603246f8535edb38e56 Mon Sep 17 00:00:00 2001 From: FoxxoTrystan <45297731+FoxxoTrystan@users.noreply.github.com> Date: Thu, 1 Aug 2024 18:49:00 +0200 Subject: [PATCH 20/32] Update misc.yml --- .../Prototypes/Entities/Clothing/Neck/misc.yml | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/Resources/Prototypes/Entities/Clothing/Neck/misc.yml b/Resources/Prototypes/Entities/Clothing/Neck/misc.yml index 4f8015367b1..11921b9a50d 100644 --- a/Resources/Prototypes/Entities/Clothing/Neck/misc.yml +++ b/Resources/Prototypes/Entities/Clothing/Neck/misc.yml @@ -80,20 +80,6 @@ checkCanInteract: false priority: -1 -- type: entity - parent: ClothingNeckBase - id: ClothingNeckFlowerWreath - name: flower wreath - description: A wreath of colourful flowers. - components: - - type: Sprite - sprite: Clothing/Neck/Misc/flower-wreath.rsi - - type: Clothing - sprite: Clothing/Neck/Misc/flower-wreath.rsi - - type: Construction - graph: flowerwreath - node: flowerwreath - - type: entity parent: ClothingNeckBase id: ClothingNeckBellCollar From 6789498b5bb3dd039dcbd8a437dc3f8ad93c801c Mon Sep 17 00:00:00 2001 From: FoxxoTrystan <45297731+FoxxoTrystan@users.noreply.github.com> Date: Thu, 1 Aug 2024 18:56:45 +0200 Subject: [PATCH 21/32] Update clothwarps.yml --- Resources/Prototypes/Entities/Clothing/clothwarps.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Entities/Clothing/clothwarps.yml b/Resources/Prototypes/Entities/Clothing/clothwarps.yml index a6ba529f5c1..fffe1c5456e 100644 --- a/Resources/Prototypes/Entities/Clothing/clothwarps.yml +++ b/Resources/Prototypes/Entities/Clothing/clothwarps.yml @@ -9,12 +9,12 @@ storedRotation: -90 - type: Sprite state: icon - sprite: Clothing/Shoes/Misc/clothwarp.rsi + sprite: Clothing/Shoes/Misc/clothWrap.rsi - type: Clothing slots: - gloves - FEET - sprite: Clothing/Shoes/Misc/clothwarp.rsi + sprite: Clothing/Shoes/Misc/clothWrap.rsi - type: Construction graph: ClothingsClothwarp node: shoes From c83e991f27ac5aa6c59506f29c92aa98caeaca17 Mon Sep 17 00:00:00 2001 From: FoxxoTrystan Date: Thu, 1 Aug 2024 18:56:57 +0200 Subject: [PATCH 22/32] ye --- .../equipped-FEET.png | Bin .../equipped-HAND.png | Bin .../Misc/{clothwarp.rsi => clothWrap.rsi}/icon.png | Bin .../Misc/{clothwarp.rsi => clothWrap.rsi}/meta.json | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename Resources/Textures/Clothing/Shoes/Misc/{clothwarp.rsi => clothWrap.rsi}/equipped-FEET.png (100%) rename Resources/Textures/Clothing/Shoes/Misc/{clothwarp.rsi => clothWrap.rsi}/equipped-HAND.png (100%) rename Resources/Textures/Clothing/Shoes/Misc/{clothwarp.rsi => clothWrap.rsi}/icon.png (100%) rename Resources/Textures/Clothing/Shoes/Misc/{clothwarp.rsi => clothWrap.rsi}/meta.json (100%) diff --git a/Resources/Textures/Clothing/Shoes/Misc/clothwarp.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Shoes/Misc/clothWrap.rsi/equipped-FEET.png similarity index 100% rename from Resources/Textures/Clothing/Shoes/Misc/clothwarp.rsi/equipped-FEET.png rename to Resources/Textures/Clothing/Shoes/Misc/clothWrap.rsi/equipped-FEET.png diff --git a/Resources/Textures/Clothing/Shoes/Misc/clothwarp.rsi/equipped-HAND.png b/Resources/Textures/Clothing/Shoes/Misc/clothWrap.rsi/equipped-HAND.png similarity index 100% rename from Resources/Textures/Clothing/Shoes/Misc/clothwarp.rsi/equipped-HAND.png rename to Resources/Textures/Clothing/Shoes/Misc/clothWrap.rsi/equipped-HAND.png diff --git a/Resources/Textures/Clothing/Shoes/Misc/clothwarp.rsi/icon.png b/Resources/Textures/Clothing/Shoes/Misc/clothWrap.rsi/icon.png similarity index 100% rename from Resources/Textures/Clothing/Shoes/Misc/clothwarp.rsi/icon.png rename to Resources/Textures/Clothing/Shoes/Misc/clothWrap.rsi/icon.png diff --git a/Resources/Textures/Clothing/Shoes/Misc/clothwarp.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Misc/clothWrap.rsi/meta.json similarity index 100% rename from Resources/Textures/Clothing/Shoes/Misc/clothwarp.rsi/meta.json rename to Resources/Textures/Clothing/Shoes/Misc/clothWrap.rsi/meta.json From cb629b861213603d7cfc1ad13c1549b2dd870be1 Mon Sep 17 00:00:00 2001 From: FoxxoTrystan <45297731+FoxxoTrystan@users.noreply.github.com> Date: Thu, 1 Aug 2024 19:06:40 +0200 Subject: [PATCH 23/32] Update clothwarps.yml --- Resources/Prototypes/Entities/Clothing/clothwarps.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Clothing/clothwarps.yml b/Resources/Prototypes/Entities/Clothing/clothwarps.yml index fffe1c5456e..eadeaa0b286 100644 --- a/Resources/Prototypes/Entities/Clothing/clothwarps.yml +++ b/Resources/Prototypes/Entities/Clothing/clothwarps.yml @@ -16,7 +16,7 @@ - FEET sprite: Clothing/Shoes/Misc/clothWrap.rsi - type: Construction - graph: ClothingsClothwarp + graph: ClothingClothWrap node: shoes - type: Butcherable butcheringType: Knife From a2d944f90d6329c9c31da877adbf5bd4fa1f50fc Mon Sep 17 00:00:00 2001 From: FoxxoTrystan Date: Tue, 6 Aug 2024 20:01:19 +0200 Subject: [PATCH 24/32] fixes? --- .../Recipes/Construction/Graphs/clothing/clothwarp.yml | 4 ++-- Resources/Prototypes/Recipes/Construction/clothing.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/clothing/clothwarp.yml b/Resources/Prototypes/Recipes/Construction/Graphs/clothing/clothwarp.yml index 7269ae77278..864d8f18d20 100644 --- a/Resources/Prototypes/Recipes/Construction/Graphs/clothing/clothwarp.yml +++ b/Resources/Prototypes/Recipes/Construction/Graphs/clothing/clothwarp.yml @@ -4,10 +4,10 @@ graph: - node: start edges: - - to: wraps + - to: shoes steps: - material: Cloth amount: 2 doAfter: 1 - - node: warps + - node: shoes entity: ClothingClothWrap diff --git a/Resources/Prototypes/Recipes/Construction/clothing.yml b/Resources/Prototypes/Recipes/Construction/clothing.yml index 0100c59e527..54218d28226 100644 --- a/Resources/Prototypes/Recipes/Construction/clothing.yml +++ b/Resources/Prototypes/Recipes/Construction/clothing.yml @@ -102,7 +102,7 @@ id: ClothingClothWrap graph: ClothingClothWrap startNode: start - targetNode: wraps + targetNode: shoes category: construction-category-clothing description: A roll of treated canvas used for wrapping claws or paws. icon: { sprite: Clothing/Shoes/Misc/clothWrap.rsi, state: icon } From adb58d811ef0eb16e8d37dec5358dffb401cfee6 Mon Sep 17 00:00:00 2001 From: FoxxoTrystan Date: Tue, 6 Aug 2024 20:43:43 +0200 Subject: [PATCH 25/32] pain --- Resources/Prototypes/Catalog/Cargo/cargo_vending.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml index 7062b2eb155..e0b421f85db 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml @@ -43,7 +43,7 @@ sprite: Objects/Specific/Service/vending_machine_restock.rsi state: base product: CrateVendingMachineRestockAutoDrobeFilled - cost: 1700 + cost: 1676 category: cargoproduct-category-name-service group: market From 5df91d5b7e0f3dfaab8da3a357cdd2f826dbe3b5 Mon Sep 17 00:00:00 2001 From: FoxxoTrystan Date: Tue, 6 Aug 2024 20:45:55 +0200 Subject: [PATCH 26/32] stap! --- Resources/Prototypes/Catalog/Cargo/cargo_vending.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml index e0b421f85db..f7191df9ab4 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml @@ -43,7 +43,7 @@ sprite: Objects/Specific/Service/vending_machine_restock.rsi state: base product: CrateVendingMachineRestockAutoDrobeFilled - cost: 1676 + cost: 1730 category: cargoproduct-category-name-service group: market From 18617ff66b41b2cbdb550af73c98b2d195d137d3 Mon Sep 17 00:00:00 2001 From: FoxxoTrystan <45297731+FoxxoTrystan@users.noreply.github.com> Date: Mon, 12 Aug 2024 04:59:51 +0200 Subject: [PATCH 27/32] Update vulpkanin.yml --- .../Prototypes/DeltaV/Entities/Mobs/Player/vulpkanin.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Player/vulpkanin.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Player/vulpkanin.yml index a50587039a4..718dc3ca559 100644 --- a/Resources/Prototypes/DeltaV/Entities/Mobs/Player/vulpkanin.yml +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Player/vulpkanin.yml @@ -5,11 +5,6 @@ id: MobVulpkanin components: - type: CombatMode - - type: InteractionPopup - successChance: 1 - interactSuccessString: petting-success-generic - interactSuccessSound: /Audio/Effects/thudswoosh.ogg - messagePerceivedByOthers: petting-success-generic-others - type: MindContainer showExamineInfo: true - type: Input From 41067afb4df12e12112cf1e93fd460115f01702f Mon Sep 17 00:00:00 2001 From: FoxxoTrystan <45297731+FoxxoTrystan@users.noreply.github.com> Date: Mon, 12 Aug 2024 05:00:03 +0200 Subject: [PATCH 28/32] Update interaction-popup-component.ftl --- .../Locale/en-US/interaction/interaction-popup-component.ftl | 1 - 1 file changed, 1 deletion(-) diff --git a/Resources/Locale/en-US/interaction/interaction-popup-component.ftl b/Resources/Locale/en-US/interaction/interaction-popup-component.ftl index 5802e47b3ab..a6eacf13c5d 100644 --- a/Resources/Locale/en-US/interaction/interaction-popup-component.ftl +++ b/Resources/Locale/en-US/interaction/interaction-popup-component.ftl @@ -4,7 +4,6 @@ petting-success-generic = You pet {THE($target)} on {POSS-ADJ($target)} head. petting-success-soft-floofy = You pet {THE($target)} on {POSS-ADJ($target)} soft floofy head. -petting-success-generic-others = { CAPITALIZE(THE($user)) } pets {THE($target)}. petting-success-bingus = You pet {THE($target)} on {POSS-ADJ($target)} wrinkly little head. petting-success-bird = You pet {THE($target)} on {POSS-ADJ($target)} cute feathery head. From 0cce9cd29973a7f23177ab346c7cd72741e15bb1 Mon Sep 17 00:00:00 2001 From: FoxxoTrystan <45297731+FoxxoTrystan@users.noreply.github.com> Date: Tue, 13 Aug 2024 19:38:34 +0200 Subject: [PATCH 29/32] Update meta.json --- .../Textures/Clothing/Shoes/Misc/clothWrap.rsi/meta.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Textures/Clothing/Shoes/Misc/clothWrap.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Misc/clothWrap.rsi/meta.json index 2ca7e39894a..02cbb7ef9a0 100644 --- a/Resources/Textures/Clothing/Shoes/Misc/clothWrap.rsi/meta.json +++ b/Resources/Textures/Clothing/Shoes/Misc/clothWrap.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/ParadiseSS13/Paradise/", + "copyright": "Taken from https://github.com/ParadiseSS13/Paradise/blob/master/icons/mob/clothing/feet.dmi / https://github.com/ParadiseSS13/Paradise/blob/master/icons/mob/clothing/hands.dmi", "size": { "x": 32, "y": 32 @@ -19,4 +19,4 @@ "directions": 4 } ] -} \ No newline at end of file +} From dea0aaf7f26e9808a070e67302931d0ecb6e24e4 Mon Sep 17 00:00:00 2001 From: FoxxoTrystan <45297731+FoxxoTrystan@users.noreply.github.com> Date: Tue, 13 Aug 2024 19:39:23 +0200 Subject: [PATCH 30/32] Update meta.json --- .../Clothing/OuterClothing/Misc/unathirobe.rsi/meta.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/unathirobe.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Misc/unathirobe.rsi/meta.json index 9c6fab40625..d66d07b5d5e 100644 --- a/Resources/Textures/Clothing/OuterClothing/Misc/unathirobe.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Misc/unathirobe.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/ParadiseSS13/Paradise", + "copyright": "Taken from https://github.com/ParadiseSS13/Paradise/blob/master/icons/mob/clothing/suit.dmi", "size": { "x": 32, "y": 32 From 7e625501be3f2c96a7682388773b5cee86bfcd57 Mon Sep 17 00:00:00 2001 From: FoxxoTrystan <45297731+FoxxoTrystan@users.noreply.github.com> Date: Tue, 13 Aug 2024 19:39:35 +0200 Subject: [PATCH 31/32] Update meta.json --- .../Textures/Clothing/Neck/mantles/unathimantle.rsi/meta.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Textures/Clothing/Neck/mantles/unathimantle.rsi/meta.json b/Resources/Textures/Clothing/Neck/mantles/unathimantle.rsi/meta.json index f66376a1475..909b986cade 100644 --- a/Resources/Textures/Clothing/Neck/mantles/unathimantle.rsi/meta.json +++ b/Resources/Textures/Clothing/Neck/mantles/unathimantle.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/ParadiseSS13/Paradise", + "copyright": "Taken from https://github.com/ParadiseSS13/Paradise/blob/master/icons/mob/clothing/suit.dmi", "size": { "x": 32, "y": 32 From 34c5e0f9f6b0ec398592087cd99038ce9e7c4ebb Mon Sep 17 00:00:00 2001 From: FoxxoTrystan <45297731+FoxxoTrystan@users.noreply.github.com> Date: Tue, 13 Aug 2024 19:39:44 +0200 Subject: [PATCH 32/32] Update meta.json --- .../Textures/Clothing/Neck/mantles/oldmantle.rsi/meta.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Textures/Clothing/Neck/mantles/oldmantle.rsi/meta.json b/Resources/Textures/Clothing/Neck/mantles/oldmantle.rsi/meta.json index f66376a1475..909b986cade 100644 --- a/Resources/Textures/Clothing/Neck/mantles/oldmantle.rsi/meta.json +++ b/Resources/Textures/Clothing/Neck/mantles/oldmantle.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/ParadiseSS13/Paradise", + "copyright": "Taken from https://github.com/ParadiseSS13/Paradise/blob/master/icons/mob/clothing/suit.dmi", "size": { "x": 32, "y": 32