Kitsune (#3175)

* old branch bad

* Stun transfer

* big bunch of needed yaml stuff

* minor fixes

* locale stuff

* lots of stuff, kitsunes are no longer just orange

* fixed license attribution thing

* maybe fix the linter fail

* more yaml fixes

* removes error.log stuff since not needed

* Fix fox sprite coloring

* Remove polymorph into fox from fox

* fail fix

* modifies damage set and light strength for direction

* Colors yippie

* Access transfer

* factions stuff

* minor fixes

* transfer factions

* modified foxfire sprite a little bit

* merge master and hope things don't break

* Revert "merge master and hope things don't break"

This reverts commit 2261ec8f5f.

* aaaaaaaaaaaaaa

* let's try this

* fix kitsune size

* fixes yaml stuff I hope

* Fish part 1

* move server KitsuneSystem.cs methods to SharedKitsuneSystem.cs

* fish part 2

* Made fox fires not an item, fix fox fire charges.

* unused

* comments

* more tails and ears

* make more markings available

* edit scale and height limits

* change some things, also removes holy damage for now, pending new damagecontainer stuff

* stuff like this I can just do here

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: AeraAulin <133451603+AeraAuling@users.noreply.github.com>

* same thing for this

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: AeraAulin <133451603+AeraAuling@users.noreply.github.com>

* fix foxfire name stuff

* so my dev env kinda hates me so this is genuinely the easiest way to fix the merge conflict

* readd kitsune to scars file

* and unambiguously CC licensed sounds, plus last Foxfire fix

* growl volume adjustment and typing indicator stuff

* fix scar stuff

* more delta changes

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* networking hell

* A tad broken

* fixed

* nicer comments, moving things into polymorph event

* oops

* remove extra empty line

Signed-off-by: AeraAulin <133451603+AeraAuling@users.noreply.github.com>

* readd taking holy damage

* meow

* BiologicalMetaphysical again

* a

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: AeraAulin <133451603+AeraAuling@users.noreply.github.com>

* aa

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: AeraAulin <133451603+AeraAuling@users.noreply.github.com>

* aaa

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: AeraAulin <133451603+AeraAuling@users.noreply.github.com>

* aaaa

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: AeraAulin <133451603+AeraAuling@users.noreply.github.com>

* aaaaa

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: AeraAulin <133451603+AeraAuling@users.noreply.github.com>

* aaaaaa

* newline stuff real quick

---------

Signed-off-by: AeraAulin <133451603+AeraAuling@users.noreply.github.com>
Co-authored-by: Sol <ewokgotswag222@gmail.com>
Co-authored-by: Tobias Berger <toby@tobot.dev>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: SolStar <44028047+ewokswagger@users.noreply.github.com>

Content.Client/_DV/Kitsune/KitsuneFoxSystem.cs

@@ -0,0 +1,19 @@
+using Content.Shared._DV.Abilities.Kitsune;
+using Robust.Client.GameObjects;
+
+namespace Content.Client._DV.Kitsune;
+
+public sealed class KitsuneFoxSystem : VisualizerSystem<KitsuneFoxComponent>
+{
+    protected override void OnAppearanceChange(EntityUid uid, KitsuneFoxComponent comp, ref AppearanceChangeEvent args)
+    {
+        if (args.Sprite is not { } sprite)
+            return;
+
+        if (!AppearanceSystem.TryGetData<Color>(uid, KitsuneColorVisuals.Color, out var color, args.Component))
+            return;
+
+        if (sprite.LayerMapTryGet(KitsuneColorVisuals.Layer, out var layer))
+            sprite.LayerSetColor(layer, color);
+    }
+}

Content.Server/_DV/Abilities/Kitsune/KitsuneFoxSystem.cs

@@ -0,0 +1,29 @@
+using Content.Server.Polymorph.Components;
+using Content.Server.Polymorph.Systems;
+using Content.Shared._DV.Abilities.Kitsune;
+using Content.Shared.Damage.Systems;
+using Content.Shared.Stunnable;
+
+namespace Content.Server._DV.Abilities.Kitsune;
+
+public sealed class KitsuneFoxSystem : EntitySystem
+{
+    [Dependency] private readonly PolymorphSystem _polymorph = default!;
+    [Dependency] private readonly StaminaSystem _stamina = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<KitsuneFoxComponent, StunnedEvent>(OnStunned);
+    }
+
+    private void OnStunned(Entity<KitsuneFoxComponent> ent, ref StunnedEvent args)
+    {
+        if (!TryComp<PolymorphedEntityComponent>(ent, out var polymorph))
+            return;
+        var staminaDamage = _stamina.GetStaminaDamage(ent);
+        _stamina.TakeStaminaDamage(polymorph.Parent, staminaDamage);
+        _polymorph.Revert(ent.Owner);
+    }
+}

Content.Server/_DV/Abilities/Kitsune/KitsuneSystem.cs

@@ -0,0 +1,75 @@
+using Content.Server.Access.Systems;
+using Content.Server.Actions;
+using Content.Server.Polymorph.Systems;
+using Content.Server.Popups;
+using Content.Shared._DV.Abilities.Kitsune;
+using Content.Shared.Access.Components;
+using Content.Shared.Access.Systems;
+using Content.Shared.NPC.Components;
+using Content.Shared.NPC.Systems;
+using Content.Shared.Polymorph;
+using Robust.Shared.Player;
+
+namespace Content.Server._DV.Abilities.Kitsune;
+
+public sealed class KitsuneSystem : SharedKitsuneSystem
+{
+    [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
+    [Dependency] private readonly PolymorphSystem _polymorph = default!;
+    [Dependency] private readonly PopupSystem _popup = default!;
+    [Dependency] private readonly AccessSystem _access = default!;
+    [Dependency] private readonly AccessReaderSystem _reader = default!;
+    [Dependency] private readonly NpcFactionSystem _faction = default!;
+    [Dependency] private readonly ActionsSystem _actions = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+        SubscribeLocalEvent<KitsuneComponent, MorphIntoKitsune>(OnMorphIntoKitsune);
+        SubscribeLocalEvent<KitsuneComponent, PolymorphedEvent>(OnPolymorphed);
+    }
+
+    private void OnPolymorphed(Entity<KitsuneComponent> ent, ref PolymorphedEvent args)
+    {
+        _appearance.SetData(args.NewEntity, KitsuneColorVisuals.Color, ent.Comp.Color ?? Color.Orange);
+
+        // Ensure that the fox fire action state is transferred properly.
+        if (!TryComp<KitsuneComponent>(args.NewEntity, out var newKitsune)
+            || !TryComp<KitsuneComponent>(ent, out var oldKitsune))
+            return;
+        newKitsune.ActiveFoxFires = oldKitsune.ActiveFoxFires;
+
+        _actions.SetCharges(newKitsune.FoxfireAction, _actions.GetCharges(oldKitsune.FoxfireAction));
+
+        foreach (var fireUid in newKitsune.ActiveFoxFires)
+        {
+            if (!TryComp<FoxfireComponent>(fireUid, out var foxfire))
+                continue;
+            foxfire.Kitsune = args.NewEntity;
+            Dirty(fireUid, foxfire);
+        }
+
+        //Transfer Accesses
+        var accessItems = _reader.FindPotentialAccessItems(ent);
+        var accesses = _reader.FindAccessTags(ent, accessItems);
+        EnsureComp<AccessComponent>(args.NewEntity);
+        _access.TrySetTags(args.NewEntity, accesses);
+
+        //Transfer factions
+        if (TryComp<NpcFactionMemberComponent>(ent, out var factions))
+        {
+            EnsureComp<NpcFactionMemberComponent>(args.NewEntity);
+            _faction.AddFactions(args.NewEntity, factions.Factions);
+        }
+
+        _popup.PopupEntity(Loc.GetString("kitsune-popup-morph-message-others", ("entity", args.NewEntity)), args.NewEntity, Filter.PvsExcept(args.NewEntity), true);
+        _popup.PopupEntity(Loc.GetString("kitsune-popup-morph-message-user"), args.NewEntity, args.NewEntity);
+    }
+
+    private void OnMorphIntoKitsune(Entity<KitsuneComponent> ent, ref MorphIntoKitsune args)
+    {
+        if (_polymorph.PolymorphEntity(ent, ent.Comp.KitsunePolymorphId) == null)
+            return;
+        args.Handled = true;
+    }
+}

Content.Shared/Actions/BaseActionComponent.cs

@@ -94,6 +94,11 @@ public abstract partial class BaseActionComponent : Component
     /// </summary>
     [DataField("charges")] public int? Charges;
 
+    /// <summary>
+    /// DeltaV: If disabled the action will not disable when no charges remain. Use if you want to handle no charges differently.
+    /// </summary>
+    [DataField] public bool DisableWhenEmpty = true;
+
     /// <summary>
     ///     The max charges this action has. If null, this is set automatically from <see cref="Charges"/> on mapinit.
     /// </summary>

Content.Shared/Actions/SharedActionsSystem.cs

@@ -709,7 +709,7 @@ public abstract class SharedActionsSystem : EntitySystem
         {
             dirty = true;
             action.Charges--;
-            if (action is { Charges: 0, RenewCharges: false })
+            if (action is { Charges: 0, RenewCharges: false, DisableWhenEmpty: true }) // DeltaV - check DisableWhenEmpty
                 action.Enabled = false;
         }
 

Content.Shared/_DV/Abilities/Kitsune/CreateFoxfireEvent.cs

@@ -0,0 +1,5 @@
+using Content.Shared.Actions;
+
+namespace Content.Shared._DV.Abilities.Kitsune;
+
+public sealed partial class CreateFoxfireActionEvent : InstantActionEvent;

Content.Shared/_DV/Abilities/Kitsune/FoxFireComponent.cs

@@ -0,0 +1,17 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared._DV.Abilities.Kitsune;
+
+/// <summary>
+/// This component is needed on fox fires so that the owner can properly update upon its destruction.
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+[AutoGenerateComponentState]
+public sealed partial class FoxfireComponent : Component
+{
+    /// <summary>
+    /// The kitsune that created this fox fire.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public EntityUid? Kitsune;
+}

Content.Shared/_DV/Abilities/Kitsune/KitsuneComponent.cs

@@ -0,0 +1,40 @@
+using Content.Shared.Polymorph;
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared._DV.Abilities.Kitsune;
+
+/// <summary>
+/// This component assigns the entity with a polymorph action
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+[AutoGenerateComponentState]
+public sealed partial class KitsuneComponent : Component
+{
+    [DataField] public ProtoId<PolymorphPrototype> KitsunePolymorphId = "KitsuneMorph";
+
+    [DataField] public EntProtoId KitsuneAction = "ActionKitsuneMorph";
+
+    [DataField, AutoNetworkedField] public EntityUid? KitsuneActionEntity;
+
+    /// <summary>
+    /// The foxfire prototype to use.
+    /// </summary>
+    [DataField] public EntProtoId FoxfirePrototype = "Foxfire";
+
+    [DataField] public EntProtoId FoxfireActionId = "ActionFoxfire";
+
+    [DataField, AutoNetworkedField] public EntityUid? FoxfireAction;
+
+    [DataField, AutoNetworkedField] public List<EntityUid> ActiveFoxFires = [];
+
+    [DataField, AutoNetworkedField] public Color? Color;
+}
+
+[Serializable, NetSerializable]
+public enum KitsuneColorVisuals : byte
+{
+    Color,
+    Layer
+}

Content.Shared/_DV/Abilities/Kitsune/KitsuneFoxComponent.cs

@@ -0,0 +1,7 @@
+namespace Content.Shared._DV.Abilities.Kitsune;
+
+/// <summary>
+/// A component that denotes polymorphed kitsune.
+/// </summary>
+[RegisterComponent]
+public sealed partial class KitsuneFoxComponent : Component;

Content.Shared/_DV/Abilities/Kitsune/SharedKitsuneSystem.cs

@@ -0,0 +1,92 @@
+using Content.Shared._Shitmed.Humanoid.Events;
+using Content.Shared.Actions;
+using Content.Shared.Hands.Components;
+using Content.Shared.Humanoid;
+using Content.Shared.Popups;
+
+namespace Content.Shared._DV.Abilities.Kitsune;
+
+public abstract class SharedKitsuneSystem : EntitySystem
+{
+    [Dependency] private readonly SharedPointLightSystem _light = default!;
+    [Dependency] private readonly SharedActionsSystem _actions = default!;
+    [Dependency] private readonly SharedPopupSystem _popup = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<KitsuneComponent, CreateFoxfireActionEvent>(OnCreateFoxfire);
+        SubscribeLocalEvent<FoxfireComponent, ComponentShutdown>(OnFoxfireShutdown);
+        SubscribeLocalEvent<KitsuneComponent, MapInitEvent>(OnMapInit);
+        SubscribeLocalEvent<KitsuneComponent, ProfileLoadFinishedEvent>(OnProfileLoadFinished);
+    }
+
+    private void OnProfileLoadFinished(Entity<KitsuneComponent> ent, ref ProfileLoadFinishedEvent args)
+    {
+        // Eye color is stored on component to be used for fox fire/fox form color.
+        if (TryComp<HumanoidAppearanceComponent>(ent, out var humanComp))
+        {
+            ent.Comp.Color = humanComp.EyeColor;
+        }
+    }
+
+    private void OnMapInit(Entity<KitsuneComponent> ent, ref MapInitEvent args)
+    {
+        // Kitsune Fox form should not have action to transform into fox form.
+        if (!HasComp<KitsuneFoxComponent>(ent))
+            _actions.AddAction(ent, ref ent.Comp.KitsuneActionEntity, ent.Comp.KitsuneAction);
+        ent.Comp.FoxfireAction = _actions.AddAction(ent, ent.Comp.FoxfireActionId);
+    }
+
+    private void OnCreateFoxfire(Entity<KitsuneComponent> ent, ref CreateFoxfireActionEvent args)
+    {
+        // Kitsune fox can make fox fires from their mouth otherwise they need hands.
+        if ((!TryComp<HandsComponent>(ent, out var hands) || hands.Count < 1) && !HasComp<KitsuneFoxComponent>(ent))
+        {
+            _popup.PopupEntity(Loc.GetString("fox-no-hands"), ent, ent);
+            return;
+        }
+
+        // This caps the amount of fox fire summons at a time to the charge count, deleting the oldest fire when exceeded.
+        if (_actions.GetCharges(ent.Comp.FoxfireAction) < 1)
+        {
+            QueueDel(ent.Comp.ActiveFoxFires[0]);
+            ent.Comp.ActiveFoxFires.RemoveAt(0);
+        }
+
+        var fireEnt = Spawn(ent.Comp.FoxfirePrototype, Transform(ent).Coordinates);
+        var fireComp = EnsureComp<FoxfireComponent>(fireEnt);
+        fireComp.Kitsune = ent;
+        ent.Comp.ActiveFoxFires.Add(fireEnt);
+        Dirty(fireEnt, fireComp);
+        Dirty(ent);
+
+        _light.SetColor(fireEnt, ent.Comp.Color ?? Color.Purple);
+
+        args.Handled = true;
+    }
+
+    private void OnFoxfireShutdown(Entity<FoxfireComponent> ent, ref ComponentShutdown args)
+    {
+        if (ent.Comp.Kitsune is not { } kitsune || !TryComp<KitsuneComponent>(kitsune, out var kitsuneComp))
+            return;
+
+        // Stop tracking the removed fox fire
+        kitsuneComp.ActiveFoxFires.Remove(ent);
+
+        // Refund the fox fire charge
+        _actions.AddCharges(kitsuneComp.FoxfireAction, 1);
+
+        // If charges exceeds the maximum then set charges to max
+        var foxfireAction = kitsuneComp.FoxfireAction;
+        if (!TryComp<InstantActionComponent>(foxfireAction, out var instantActionComp))
+            return;
+        if (_actions.GetCharges(foxfireAction) > instantActionComp.MaxCharges)
+            _actions.SetCharges(foxfireAction, instantActionComp.MaxCharges);
+
+        Dirty(kitsune, kitsuneComp);
+    }
+}
+
+public sealed partial class MorphIntoKitsune : InstantActionEvent;

Resources/Audio/_DV/Voice/Kitsune/attributions.yml

@@ -0,0 +1,14 @@
+- files: ["fox_scream1.ogg"]
+  license: "CC0-1.0"
+  copyright: "Original sound by https://pixabay.com/users/l3hrja-38345766/"
+  source: "https://pixabay.com/sound-effects/fox-calling-243999/"
+
+- files: ["fox_growl1"]
+  license: "CC0-1.0"
+  copyright: "Original sound by https://freesound.org/people/wingz/sounds/13789/"
+  source: "https://freesound.org/people/wingz/sounds/13789/"
+
+- files: ["fox_squeal1.off"]
+  license: "CC-BY-4.0"
+  copyright: "Original sound by https://freesound.org/people/Motion_S/sounds/178412/"
+  source: "https://freesound.org/people/Motion_S/sounds/178412/"

Resources/Locale/en-US/_DV/actions/kitsune.ftl

@@ -0,0 +1,4 @@
+petting-success-soft-floofy-kitsune = You gently pat {THE($target)}
+kitsune-popup-morph-message-other = {$target} shifts their form
+kitsune-popup-morph-message-user = You shift your form
+fox-no-hands = You can't make a wisp without a hand

Resources/Locale/en-US/_DV/chat/managers/chat_manager.ftl

@@ -28,6 +28,12 @@ chat-speech-verb-chitinid-2 = chitters
 chat-speech-verb-chitinid-3 = hisses
 chat-speech-verb-chitinid-4 = buzzes
 
+chat-speech-verb-name-kitsune = Kitsune
+chat-speech-verb-kitsune-1 = yelps
+chat-speech-verb-kitsune-2 = barks
+chat-speech-verb-kitsune-3 = whines
+chat-speech-verb-kitsune-4 = yips
+
 chat-speech-verb-name-feroxi = Feroxi
 chat-speech-verb-feroxi-1 = blubs
 chat-speech-verb-feroxi-2 = swishes

Resources/Locale/en-US/_DV/markings/kitsune.ftl

@@ -0,0 +1,22 @@
+## ear markings
+
+marking-KitsuneEarsDefault = Kitsune Ears
+marking-KitsuneEarsDefault-kitsune_fluffy_ears = Kitsune Ears
+marking-KitsuneEarsDefault-kitsune_fluffy_fluff = Kitsune fluff
+marking-KitsuneEarsFox = Kitsune Fox Ears
+marking-KitsuneEarsFox-foxears = Kitsune Fox Ears
+
+## tail markings
+
+marking-KitsuneTailDefault = Kitsune Tail
+marking-KitsuneTailDefault-kitsune_primary = Kitsune tail
+marking-KitsuneTailDefault-kitsune_secondary = Kitsune tail tip
+marking-KitsuneTailsNine = Kitsune Ninetails
+marking-KitsuneTailsNine-foxninetailstone1 = Kitsune Ninetails
+marking-KitsuneTailsNine-foxninetailstone2 = Kitsune Ninetails tip
+marking-KitsuneTailsThree = Kitsune Three tails
+marking-KitsuneTailsThree-foxthreetailstone1 = Kitsune Three Tails
+marking-KitsuneTailsThree-foxthreetailstone2 = Kitsune Three Tails tip
+marking-KitsuneTailsTwo = Kitsune Two Tails
+marking-KitsuneTailsTwo-foxtwotailstone1 = Kitsune Two Tails
+marking-KitsuneTailsTwo-foxtwotailstone2 = Kitsune Two Tails tip

Resources/Locale/en-US/_DV/species/species.ftl

@@ -7,3 +7,4 @@ species-name-harpy = Harpy
 species-name-rodentia = Rodentia
 species-name-chitinid = Chitinid
 species-name-feroxi = Feroxi
+species-name-kitsune = Kitsune

Resources/Prototypes/Entities/Mobs/Customization/Markings/gauze.yml

@@ -100,7 +100,7 @@
   id: GauzeUpperArmRight
   bodyPart: RArm
   markingCategory: Overlay
-  speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin, Rodentia, Thaven, Feroxi] # Delta V - Felinid, Oni, Vulpkanin, Rodentia, Thaven, Feroxi
+  speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin, Rodentia, Thaven, Feroxi, Kitsune] # DeltaV - Felinid-Kitsune
   coloring:
     default:
       type:
@@ -114,7 +114,7 @@
   id: GauzeLowerArmRight
   bodyPart: RArm, RHand
   markingCategory: Overlay
-  speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin, Rodentia, Thaven, Feroxi] # Delta V - Felinid, Oni, Vulpkanin, Rodentia, Thaven, Feroxi
+  speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin, Rodentia, Thaven, Feroxi, Kitsune] # DeltaV - Felinid-Kitsune
   coloring:
     default:
       type:
@@ -128,7 +128,7 @@
   id: GauzeLeftArm
   bodyPart: LArm, LHand
   markingCategory: Overlay
-  speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin, Rodentia, Thaven, Feroxi] # Delta V - Felinid, Oni, Vulpkanin, Rodentia, Thaven, Feroxi
+  speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin, Rodentia, Thaven, Feroxi, Kitsune] # DeltaV - Felinid-Kitsune
   coloring:
     default:
       type:
@@ -142,7 +142,7 @@
   id: GauzeLowerLegLeft
   bodyPart: LFoot
   markingCategory: Overlay
-  speciesRestriction: [Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, Rodentia, Thaven, Feroxi] # Delta V - Felinid, Oni, Vulpkanin, Rodentia, Thaven, Feroxi
+  speciesRestriction: [Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, Rodentia, Thaven, Feroxi, Kitsune] # DeltaV - Felinid-Kitsune
   coloring:
     default:
       type:
@@ -156,7 +156,7 @@
   id: GauzeUpperLegLeft
   bodyPart: LLeg
   markingCategory: Overlay
-  speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin, Rodentia, Thaven, Feroxi] # Delta V - Felinid, Oni, Vulpkanin, Rodentia, Thaven, Feroxi
+  speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin, Rodentia, Thaven, Feroxi, Kitsune] # DeltaV - Felinid-Kitsune
   coloring:
     default:
       type:
@@ -170,7 +170,7 @@
   id: GauzeUpperLegRight
   bodyPart: RLeg
   markingCategory: Overlay
-  speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin, Rodentia, Thaven, Feroxi] # Delta V - Felinid, Oni, Vulpkanin, Rodentia, Thaven, Feroxi
+  speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin, Rodentia, Thaven, Feroxi, Kitsune] # DeltaV - Felinid-Kitsune
   coloring:
     default:
       type:
@@ -184,7 +184,7 @@
   id: GauzeLowerLegRight
   bodyPart: RFoot
   markingCategory: Overlay
-  speciesRestriction: [Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, Rodentia, Thaven, Feroxi] # Delta V - Felinid, Oni, Vulpkanin, Rodentia, Thaven, Feroxi
+  speciesRestriction: [Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, Rodentia, Thaven, Feroxi, Kitsune] # DeltaV - Felinid-Kitsune
   coloring:
     default:
       type:
@@ -198,7 +198,7 @@
   id: GauzeBoxerWrapRight
   bodyPart: RHand
   markingCategory: Overlay
-  speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin, Rodentia, Thaven, Feroxi] # Delta V - Felinid, Oni, Vulpkanin, Rodentia, Thaven, Feroxi
+  speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin, Rodentia, Thaven, Feroxi, Kitsune] # DeltaV - Felinid-Kitsune
   coloring:
     default:
       type:
@@ -212,7 +212,7 @@
   id: GauzeBoxerWrapLeft
   bodyPart: LHand
   markingCategory: Overlay
-  speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin, Rodentia, Thaven, Feroxi] # Delta V - Felinid, Oni, Vulpkanin, Rodentia, Thaven, Feroxi
+  speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin, Rodentia, Thaven, Feroxi, Kitsune] # DeltaV - Felinid-Kitsune
   coloring:
     default:
       type:

Resources/Prototypes/Entities/Mobs/Customization/Markings/human_noses.yml

@@ -4,7 +4,7 @@
   markingCategory: Snout
   followSkinColor: true
   forcedColoring: true
-  speciesRestriction: [Human, Dwarf, Felinid, Oni, Harpy] #Einstein Engines - Felinid, Oni, Harpy # DeltaV - Thaven
+  speciesRestriction: [Human, Dwarf, Felinid, Oni, Harpy, Kitsune] # DeltaV - Felinid-Kitsune
   sprites:
   - sprite: Mobs/Customization/human_noses.rsi
     state: schnozz
@@ -15,7 +15,7 @@
   markingCategory: Snout
   followSkinColor: true
   forcedColoring: true
-  speciesRestriction: [Human, Dwarf, Felinid, Oni, Harpy] #Einstein Engines - Felinid, Oni, Harpy # DeltaV - Thaven
+  speciesRestriction: [Human, Dwarf, Felinid, Oni, Harpy, Kitsune] # DeltaV - Felinid-Kitsune
   sprites:
   - sprite: Mobs/Customization/human_noses.rsi
     state: nubby
@@ -26,7 +26,7 @@
   markingCategory: Snout
   followSkinColor: true
   forcedColoring: true
-  speciesRestriction: [Human, Dwarf, Felinid, Oni, Harpy] #Einstein Engines - Felinid, Oni, Harpy # DeltaV - Thaven
+  speciesRestriction: [Human, Dwarf, Felinid, Oni, Harpy, Kitsune] # DeltaV - Felinid-Kitsune
   sprites:
   - sprite: Mobs/Customization/human_noses.rsi
     state: droop
@@ -37,7 +37,7 @@
   markingCategory: Snout
   followSkinColor: true
   forcedColoring: true
-  speciesRestriction: [Human, Dwarf, Felinid, Oni, Harpy] #Einstein Engines - Felinid, Oni, Harpy # DeltaV - Thaven
+  speciesRestriction: [Human, Dwarf, Felinid, Oni, Harpym Kitsune] # DeltaV - Felinid-Kitsune
   sprites:
   - sprite: Mobs/Customization/human_noses.rsi
     state: blob
@@ -48,7 +48,7 @@
   markingCategory: Snout
   followSkinColor: true
   forcedColoring: true
-  speciesRestriction: [Human, Dwarf, Felinid, Oni, Harpy] #Einstein Engines - Felinid, Oni, Harpy # DeltaV - Thaven
+  speciesRestriction: [Human, Dwarf, Felinid, Oni, Harpy, Kitsune] # DeltaV - Felinid-Kitsune
   sprites:
   - sprite: Mobs/Customization/human_noses.rsi
     state: uppie

Resources/Prototypes/Entities/Mobs/Customization/Markings/scars.yml

@@ -2,7 +2,7 @@
   id: ScarEyeRight
   bodyPart: Head
   markingCategory: Head
-  speciesRestriction: [Human, Dwarf, Felinid, Harpy, Oni, Rodentia, Feroxi, Vulpkanin]  # DeltaV - Felinid-Vulpkanin
+  speciesRestriction: [Human, Dwarf, Felinid, Harpy, Oni, Rodentia, Feroxi, Vulpkanin, Kitsune] # DeltaV - Felinid-Kitsune
   followSkinColor: true
   sprites:
   - sprite: Mobs/Customization/scars.rsi
@@ -12,7 +12,7 @@
   id: ScarEyeLeft
   bodyPart: Head
   markingCategory: Head
-  speciesRestriction: [Human, Dwarf, Felinid, Harpy, Oni, Rodentia, Feroxi, Vulpkanin] # DeltaV - Felinid-Vulpkanin
+  speciesRestriction: [Human, Dwarf, Felinid, Harpy, Oni, Rodentia, Feroxi, Vulpkanin, Kitsune] # DeltaV - Felinid-Kitsune
   followSkinColor: true
   sprites:
   - sprite: Mobs/Customization/scars.rsi
@@ -22,7 +22,7 @@
   id: ScarTopSurgeryShort
   bodyPart: Chest
   markingCategory: Chest
-  speciesRestriction: [Human, Dwarf, Felinid, Oni, Feroxi, Vulpkanin] # DeltaV - Felinid-Vulpkanin
+  speciesRestriction: [Human, Dwarf, Felinid, Oni, Feroxi, Vulpkanin, Kitsune] # DeltaV - Felinid-Kitsune
   sexRestriction: [Male]
   followSkinColor: true
   sprites:
@@ -33,7 +33,7 @@
   id: ScarTopSurgeryLong
   bodyPart: Chest
   markingCategory: Chest
-  speciesRestriction: [Human, Dwarf, Felinid, Oni, Feroxi, Vulpkanin] # DeltaV - Felinid-Vulpkanin
+  speciesRestriction: [Human, Dwarf, Felinid, Oni, Feroxi, Vulpkanin, Kitsune] # DeltaV - Felinid-Kitsune
   sexRestriction: [Male]
   followSkinColor: true
   sprites:
@@ -44,7 +44,7 @@
   id: ScarChest
   bodyPart: Chest
   markingCategory: Chest
-  speciesRestriction: [Human, Dwarf, Felinid, Oni, Feroxi, Vulpkanin] # DeltaV - Felinid-Vulpkanin
+  speciesRestriction: [Human, Dwarf, Felinid, Oni, Feroxi, Vulpkanin, Kitsune] # DeltaV - Felinid-Kitsune
   followSkinColor: true
   sprites:
   - sprite: Mobs/Customization/scars.rsi
@@ -54,7 +54,7 @@
   id: ScarNeck
   bodyPart: Head
   markingCategory: Head
-  speciesRestriction: [Human, Dwarf, Felinid, Oni, Feroxi, Vulpkanin] # DeltaV - Felinid-Vulpkanin
+  speciesRestriction: [Human, Dwarf, Felinid, Oni, Feroxi, Vulpkanin, Kitsune] # DeltaV - Felinid-Kitsune
   followSkinColor: true
   sprites:
   - sprite: Mobs/Customization/scars.rsi
@@ -64,7 +64,7 @@
   id: ScarChestBullets
   bodyPart: Chest
   markingCategory: Chest
-  speciesRestriction: [Human, Dwarf, Felinid, Oni, Feroxi, Vulpkanin] # DeltaV - Felinid-Vulpkanin
+  speciesRestriction: [Human, Dwarf, Felinid, Oni, Feroxi, Vulpkanin, Kitsune] # DeltaV - Felinid-Kitsune
   followSkinColor: true
   sprites:
   - sprite: Mobs/Customization/scars.rsi
@@ -74,7 +74,7 @@
   id: ScarStomachBullets
   bodyPart: Chest
   markingCategory: Chest
-  speciesRestriction: [Human, Dwarf, Felinid, Oni, Feroxi, Vulpkanin] # DeltaV - Felinid-Vulpkanin
+  speciesRestriction: [Human, Dwarf, Felinid, Oni, Feroxi, Vulpkanin, Kitsune] # DeltaV - Felinid-Kitsune
   followSkinColor: true
   sprites:
   - sprite: Mobs/Customization/scars.rsi
@@ -84,8 +84,7 @@
   id: ScarFace1
   bodyPart: Head
   markingCategory: Head
-  speciesRestriction: [Human, Dwarf, Felinid, Oni, Feroxi, Vulpkanin] # DeltaV - Felinid-Vulpkanin
-  followSkinColor: true
+  speciesRestriction: [Human, Dwarf, Felinid, Oni, Feroxi, Vulpkanin, Kitsune] # DeltaV - Felinid-Kitsune
   sprites:
   - sprite: Mobs/Customization/scars.rsi
     state: scar_face_1
@@ -94,7 +93,7 @@
   id: ScarFace2
   bodyPart: Head
   markingCategory: Head
-  speciesRestriction: [Human, Dwarf, Felinid, Oni, Feroxi, Vulpkanin] # DeltaV - Felinid-Vulpkanin
+  speciesRestriction: [Human, Dwarf, Felinid, Oni, Feroxi, Vulpkanin, Kitsune] # DeltaV - Felinid-Kitsune
   followSkinColor: true
   sprites:
   - sprite: Mobs/Customization/scars.rsi

Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml

@@ -2,7 +2,7 @@
   id: TattooHiveChest
   bodyPart: Chest
   markingCategory: Chest
-  speciesRestriction: [Human, Dwarf, SlimePerson, Felinid, Oni] # Delta V - SlimePerson, Felinid, Oni
+  speciesRestriction: [Human, Dwarf, SlimePerson, Felinid, Oni, Kitsune] # DeltaV - SlimePerson-Kitsune
   sexRestriction: [Male] # DeltaV: Splitting the scars and tattoos
   coloring:
     default:
@@ -17,7 +17,7 @@
   id: TattooNightlingChest
   bodyPart: Chest
   markingCategory: Chest
-  speciesRestriction: [Human, Dwarf, SlimePerson, Felinid, Oni] # Delta V - SlimePerson, Felinid, Oni
+  speciesRestriction: [Human, Dwarf, SlimePerson, Felinid, Oni, Kitsune] # DeltaV - SlimePerson-Kitsune
   sexRestriction: [Male] # DeltaV: Splitting the scars and tattoos
   coloring:
     default:
@@ -32,7 +32,7 @@
   id: TattooSilverburghLeftLeg
   bodyPart: LLeg
   markingCategory: Legs
-  speciesRestriction: [Human, Dwarf, Felinid, Oni] # Delta V - Felinid, Oni
+  speciesRestriction: [Human, Dwarf, Felinid, Oni, Kitsune] # DeltaV - Felinid-Kitsune
   coloring:
     default:
       type:
@@ -46,7 +46,7 @@
   id: TattooSilverburghRightLeg
   bodyPart: RLeg
   markingCategory: Legs
-  speciesRestriction: [Human, Dwarf, Felinid, Oni] # Delta V - Felinid, Oni
+  speciesRestriction: [Human, Dwarf, Felinid, Oni, Kitsune] # DeltaV - Felinid-Kitsune
   coloring:
     default:
       type:
@@ -60,7 +60,7 @@
   id: TattooCampbellLeftArm
   bodyPart: LArm
   markingCategory: Arms
-  speciesRestriction: [Human, Dwarf, Felinid, Oni] # Delta V - Felinid, Oni
+  speciesRestriction: [Human, Dwarf, Felinid, Oni, Kitsune] # DeltaV - Felinid-Kitsune
   coloring:
     default:
       type:
@@ -74,7 +74,7 @@
   id: TattooCampbellRightArm
   bodyPart: RArm
   markingCategory: Arms
-  speciesRestriction: [Human, Dwarf, Felinid, Oni] # Delta V - Felinid, Oni
+  speciesRestriction: [Human, Dwarf, Felinid, Oni, Kitsune] # DeltaV - Felinid-Kitsune
   coloring:
     default:
       type:
@@ -88,7 +88,7 @@
   id: TattooCampbellLeftLeg
   bodyPart: LLeg
   markingCategory: Legs
-  speciesRestriction: [Human, Dwarf, Felinid, Oni] # Delta V - Felinid, Oni
+  speciesRestriction: [Human, Dwarf, Felinid, Oni, Kitsune] # DeltaV - Felinid-Kitsune
   coloring:
     default:
       type:
@@ -102,7 +102,7 @@
   id: TattooCampbellRightLeg
   bodyPart: RLeg
   markingCategory: Legs
-  speciesRestriction: [Human, Dwarf, Felinid, Oni] # Delta V - Felinid, Oni
+  speciesRestriction: [Human, Dwarf, Felinid, Oni, Kitsune] # DeltaV - Felinid-Kitsune
   coloring:
     default:
       type:
@@ -116,7 +116,7 @@
   id: TattooEyeRight
   bodyPart: Eyes
   markingCategory: Head
-  speciesRestriction: [Human, SlimePerson, Reptilian, Dwarf, Felinid, Vulpkanin, Oni, Harpy, Rodentia, Feroxi] # Delta V - Felinid, Vulpkanin, Oni, Harpy, Rodentia
+  speciesRestriction: [Human, SlimePerson, Reptilian, Dwarf, Felinid, Vulpkanin, Oni, Harpy, Rodentia, Feroxi, Kitsune] # DeltaV - Felinid-Kitsune
   coloring:
     default:
       type:
@@ -130,7 +130,7 @@
   id: TattooEyeLeft
   bodyPart: Eyes
   markingCategory: Head
-  speciesRestriction: [Human, SlimePerson, Reptilian, Dwarf, Felinid, Vulpkanin, Oni, Harpy, Rodentia, Feroxi] # Delta V - Felinid, Vulpkanin, Oni, Harpy, Rodentia
+  speciesRestriction: [Human, SlimePerson, Reptilian, Dwarf, Felinid, Vulpkanin, Oni, Harpy, Rodentia, Feroxi, Kitsune] # DeltaV - Felinid-Kitsune
   coloring:
     default:
       type:

Resources/Prototypes/Guidebook/species.yml

@@ -20,6 +20,7 @@
     - Chitinid
     - IPC
     - Feroxi
+    - Kitsune
     # ImpStation additions
     - Thaven
 

Resources/Prototypes/Loadouts/Miscellaneous/survival.yml

@@ -26,6 +26,7 @@
     - Rodentia
     - Chitinid
     - Thaven
+    - Kitsune
     # End DeltaV additions
 
 - type: loadoutEffectGroup

Resources/Prototypes/_DV/Actions/kitsune.yml

@@ -0,0 +1,20 @@
+- type: entity
+  id: ActionFoxfire
+  name: Create Foxfire
+  description: Form a cool, gently glowing wisp of flame
+  components:
+  - type: InstantAction
+    charges: 3
+    disableWhenEmpty: false
+    icon: { sprite: _DV/Structures/Specific/Species/Kitsune/foxfire.rsi, state: icon }
+    event: !type:CreateFoxfireActionEvent
+
+- type: entity
+  id: ActionKitsuneMorph
+  name: Kitsune Shapeshift
+  description: Shift into your fox form
+  components:
+  - type: InstantAction
+    icon: { sprite: Mobs/Animals/fox.rsi, state: fox }
+    useDelay: 2
+    event: !type:MorphIntoKitsune

Resources/Prototypes/_DV/Body/Prototypes/kitsune.yml

@@ -0,0 +1,50 @@
+- type: body
+  id: Kitsune
+  name: "kitsune"
+  root: torso
+  slots:
+    head:
+      part: HeadHuman
+      connections:
+      - torso
+      organs:
+        brain: OrganHumanBrain
+        eyes: OrganHumanEyes
+    torso:
+      part: TorsoHuman
+      connections:
+      - right arm
+      - left arm
+      - right leg
+      - left leg
+      - head
+      organs:
+        heart: OrganAnimalHeart
+        lungs: OrganHumanLungs
+        stomach: OrganHumanStomach
+        liver:  OrganAnimalLiver
+        kidneys: OrganHumanKidneys
+    right arm:
+      part: RightArmHuman
+      connections:
+      - right hand
+    left arm:
+      part: LeftArmHuman
+      connections:
+      - left hand
+    right hand:
+      part: RightHandHuman
+    left hand:
+      part: LeftHandHuman
+    right leg:
+      part: RightLegHuman
+      connections:
+      - right foot
+    left leg:
+      part: LeftLegHuman
+      connections:
+      - left foot
+    right foot:
+      part: RightFootHuman
+    left foot:
+      part: LeftFootHuman

Resources/Prototypes/_DV/Damage/modifier_sets.yml

@@ -47,6 +47,26 @@
     Shock: 1.15
     Radiation: 0.2
 
+- type: damageModifierSet
+  id: Kitsune
+  coefficients:
+    Blunt: 1.2
+    Slash: 1.05
+    Piercing: 1.05
+    Radiation: 1.5
+    Heat: 0.75
+    Cold: 0.75
+    Holy: 0.5
+
+- type: damageModifierSet
+  id: KitsuneFox
+  coefficients:
+    Blunt: 1.3
+    Piercing: 1.2
+    Slash: 1.2
+    Radiation: 1.5
+    Holy: 0.5
+
 # Represents which damage types should be modified
 # in relation to how they cause bleed rate.
 - type: damageModifierSet

Resources/Prototypes/_DV/Entities/Mobs/Customization/Markings/kitsune.yml

@@ -0,0 +1,110 @@
+# All the Kitsune customization
+
+# Tail Markings
+- type: marking
+  id: KitsuneTailDefault
+  bodyPart: Tail
+  markingCategory: Tail
+  speciesRestriction: [Kitsune]
+  coloring:
+    default:
+      type: !type:CategoryColoring
+        category: Hair
+      fallbackTypes:
+      - !type:SimpleColoring
+        color: "#fffafa"
+  sprites:
+  - sprite: _DV/Mobs/Customization/kitsune/tails.rsi
+    state: kitsune_primary
+  - sprite: _DV/Mobs/Customization/kitsune/tails.rsi
+    state: kitsune_secondary
+
+- type: marking
+  id: KitsuneTailsNine
+  bodyPart: Tail
+  markingCategory: Tail
+  speciesRestriction: [Kitsune]
+  coloring:
+    default:
+      type: !type:CategoryColoring
+        category: Hair
+      fallbackTypes:
+      - !type:SimpleColoring
+        color: "#fffafa"
+  sprites:
+  - sprite: _DV/Mobs/Customization/kitsune/tails.rsi
+    state: foxninetailstone1
+  - sprite: _DV/Mobs/Customization/kitsune/tails.rsi
+    state: foxninetailstone2
+
+- type: marking
+  id: KitsuneTailsThree
+  bodyPart: Tail
+  markingCategory: Tail
+  speciesRestriction: [Kitsune]
+  coloring:
+    default:
+      type: !type:CategoryColoring
+        category: Hair
+      fallbackTypes:
+      - !type:SimpleColoring
+        color: "#fffafa"
+  sprites:
+  - sprite: _DV/Mobs/Customization/kitsune/tails.rsi
+    state: foxthreetailstone1
+  - sprite: _DV/Mobs/Customization/kitsune/tails.rsi
+    state: foxthreetailstone2
+
+- type: marking
+  id: KitsuneTailsTwo
+  bodyPart: Tail
+  markingCategory: Tail
+  speciesRestriction: [Kitsune]
+  coloring:
+    default:
+      type: !type:CategoryColoring
+        category: Hair
+      fallbackTypes:
+      - !type:SimpleColoring
+        color: "#fffafa"
+  sprites:
+  - sprite: _DV/Mobs/Customization/kitsune/tails.rsi
+    state: foxtwotailstone1
+  - sprite: _DV/Mobs/Customization/kitsune/tails.rsi
+    state: foxtwotailstone2
+
+# Ear Markings
+
+- type: marking
+  id: KitsuneEarsDefault
+  bodyPart: Head
+  markingCategory: HeadTop
+  speciesRestriction: [Kitsune]
+  coloring:
+    default:
+      type: !type:CategoryColoring
+        category: Hair
+      fallbackTypes:
+      - !type:SimpleColoring
+        color: "#fffafa"
+  sprites:
+  - sprite: _DV/Mobs/Customization/kitsune/ears.rsi
+    state: kitsune_fluffy_ears
+  - sprite: _DV/Mobs/Customization/kitsune/ears.rsi
+    state: kitsune_fluffy_fluff
+
+- type: marking
+  id: KitsuneEarsFox
+  bodyPart: Head
+  markingCategory: HeadTop
+  speciesRestriction: [Kitsune]
+  coloring:
+    default:
+      type: !type:CategoryColoring
+        category: Hair
+      fallbackTypes:
+      - !type:SimpleColoring
+        color: "#fffafa"
+  sprites:
+  - sprite: _DV/Mobs/Customization/kitsune/ears.rsi
+    state: foxears

Resources/Prototypes/_DV/Entities/Mobs/Customization/Markings/makeup.yml

@@ -2,7 +2,7 @@
   id: MakeupLips
   bodyPart: Head
   markingCategory: Head
-  speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy] # Delta V - Felinid, Oni, Harpy
+  speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Kitsune]
   coloring:
     default:
       type:
@@ -16,7 +16,7 @@
   id: MakeupBlush
   bodyPart: Head
   markingCategory: Head
-  speciesRestriction: [Dwarf, Human, Reptilian, SlimePerson, Felinid, Oni, Vulpkanin, Harpy, Rodentia, Feroxi] # Delta V - Felinid, Oni, Vulpkanin, Rodentia, Feroxi
+  speciesRestriction: [Dwarf, Human, Reptilian, SlimePerson, Felinid, Oni, Vulpkanin, Harpy, Rodentia, Feroxi, Kitsune]
   coloring:
     default:
       type:
@@ -30,7 +30,7 @@
   id: MakeupNailPolishRight
   bodyPart: RHand
   markingCategory: Overlay
-  speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin, Rodentia, Feroxi] # Delta V - Felinid, Oni, Vulpkanin, Rodentia, Feroxi
+  speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin, Rodentia, Feroxi, Kitsune]
   coloring:
     default:
       type:
@@ -44,7 +44,7 @@
   id: MakeupNailPolishLeft
   bodyPart: LHand
   markingCategory: Overlay
-  speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin, Rodentia, Feroxi] # Delta V - Felinid, Oni, Vulpkanin, Rodentia, Feroxi
+  speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin, Rodentia, Feroxi, Kitsune]
   coloring:
     default:
       type:

Resources/Prototypes/_DV/Entities/Mobs/Customization/Markings/scars.yml

@@ -1,9 +1,9 @@
 - type: marking
-  id: ScarChestFemale # DeltaV: Splitting the scars and tattoos
+  id: ScarChestFemale
   bodyPart: Chest
   markingCategory: Chest
-  speciesRestriction: [Human, Dwarf, Felinid, Oni, Feroxi] #Einstein Engines - Felinid, Oni
-  sexRestriction: [Female] # DeltaV: Splitting the scars and tattoos
+  speciesRestriction: [Human, Dwarf, Felinid, Oni, Feroxi, Kitsune]
+  sexRestriction: [Female]
   followSkinColor: true
   sprites:
   - sprite: _DV/Mobs/Customization/scars.rsi

Resources/Prototypes/_DV/Entities/Mobs/Customization/Markings/tattoos.yml

@@ -1,9 +1,9 @@
 - type: marking
-  id: TattooHiveChestFemale # DeltaV: Splitting the scars and tattoos
+  id: TattooHiveChestFemale
   bodyPart: Chest
   markingCategory: Chest
-  speciesRestriction: [Human, Dwarf, SlimePerson, Felinid, Oni] # Delta V - SlimePerson, Felinid, Oni
-  sexRestriction: [Female] # DeltaV: Splitting the scars and tattoos
+  speciesRestriction: [Human, Dwarf, SlimePerson, Felinid, Oni, Kitsune]
+  sexRestriction: [Female]
   coloring:
     default:
       type:
@@ -14,11 +14,11 @@
     state: tattoo_hive_chest_female
 
 - type: marking
-  id: TattooNightlingChestFemale # DeltaV: Splitting the scars and tattoos
+  id: TattooNightlingChestFemale
   bodyPart: Chest
   markingCategory: Chest
-  speciesRestriction: [Human, Dwarf, SlimePerson, Felinid, Oni] # Delta V - SlimePerson, Felinid, Oni
-  sexRestriction: [Female] # DeltaV: Splitting the scars and tattoos
+  speciesRestriction: [Human, Dwarf, SlimePerson, Felinid, Oni, Kitsune]
+  sexRestriction: [Female]
   coloring:
     default:
       type:

Resources/Prototypes/_DV/Entities/Mobs/Customization/Markings/vulpkanin.yml

@@ -71,7 +71,7 @@
   id: VulpEarFennec
   bodyPart: HeadTop
   markingCategory: HeadTop
-  speciesRestriction: [Vulpkanin, Felinid]
+  speciesRestriction: [Vulpkanin, Felinid, Kitsune]
   sprites:
     - sprite: _DV/Mobs/Customization/Vulpkanin/ear_markings.rsi
       state: fennec
@@ -82,7 +82,7 @@
   id: VulpEarFox
   bodyPart: HeadTop
   markingCategory: HeadTop
-  speciesRestriction: [Vulpkanin, Felinid]
+  speciesRestriction: [Vulpkanin, Felinid, Kitsune]
   sprites:
     - sprite: _DV/Mobs/Customization/Vulpkanin/ear_markings.rsi
       state: fox
@@ -274,7 +274,7 @@
   id: VulpTail
   bodyPart: Tail
   markingCategory: Tail
-  speciesRestriction: [Vulpkanin, Felinid]
+  speciesRestriction: [Vulpkanin, Felinid, Kitsune]
   sprites:
     - sprite: _DV/Mobs/Customization/Vulpkanin/tail_markings.rsi
       state: vulp
@@ -285,7 +285,7 @@
   id: VulpTailTip
   bodyPart: Tail
   markingCategory: Tail
-  speciesRestriction: [Vulpkanin, Felinid]
+  speciesRestriction: [Vulpkanin, Felinid, Kitsune]
   sprites:
     - sprite: _DV/Mobs/Customization/Vulpkanin/tail_markings.rsi
       state: vulp
@@ -296,7 +296,7 @@
   id: VulpTailWag
   bodyPart: Tail
   markingCategory: Tail
-  speciesRestriction: [Vulpkanin, Felinid]
+  speciesRestriction: [Vulpkanin, Felinid, Kitsune]
   sprites:
     - sprite: _DV/Mobs/Customization/Vulpkanin/tail_markings.rsi
       state: vulp_wag
@@ -307,7 +307,7 @@
   id: VulpTailWagTip
   bodyPart: Tail
   markingCategory: Tail
-  speciesRestriction: [Vulpkanin, Felinid]
+  speciesRestriction: [Vulpkanin, Felinid, Kitsune]
   sprites:
     - sprite: _DV/Mobs/Customization/Vulpkanin/tail_markings.rsi
       state: vulp_wag
@@ -351,7 +351,7 @@
   id: VulpTailFox
   bodyPart: Tail
   markingCategory: Tail
-  speciesRestriction: [Vulpkanin, Felinid]
+  speciesRestriction: [Vulpkanin, Felinid, Kitsune]
   sprites:
     - sprite: _DV/Mobs/Customization/Vulpkanin/tail_markings.rsi
       state: fox
@@ -362,7 +362,7 @@
   id: VulpTailFoxTip
   bodyPart: Tail
   markingCategory: Tail
-  speciesRestriction: [Vulpkanin, Felinid]
+  speciesRestriction: [Vulpkanin, Felinid, Kitsune]
   sprites:
     - sprite: _DV/Mobs/Customization/Vulpkanin/tail_markings.rsi
       state: fox
@@ -373,7 +373,7 @@
   id: VulpTailFoxWag
   bodyPart: Tail
   markingCategory: Tail
-  speciesRestriction: [Vulpkanin, Felinid]
+  speciesRestriction: [Vulpkanin, Felinid, Kitsune]
   sprites:
     - sprite: _DV/Mobs/Customization/Vulpkanin/tail_markings.rsi
       state: fox_wag
@@ -384,7 +384,7 @@
   id: VulpTailFoxWagTip
   bodyPart: Tail
   markingCategory: Tail
-  speciesRestriction: [Vulpkanin, Felinid]
+  speciesRestriction: [Vulpkanin, Felinid, Kitsune]
   sprites:
     - sprite: _DV/Mobs/Customization/Vulpkanin/tail_markings.rsi
       state: fox_wag
@@ -460,7 +460,7 @@
   id: VulpTailFox2
   bodyPart: Tail
   markingCategory: Tail
-  speciesRestriction: [Vulpkanin, Felinid]
+  speciesRestriction: [Vulpkanin, Felinid, Kitsune]
   sprites:
     - sprite: _DV/Mobs/Customization/Vulpkanin/tail_markings.rsi
       state: fox2
@@ -469,7 +469,7 @@
   id: VulpTailFox3
   bodyPart: Tail
   markingCategory: Tail
-  speciesRestriction: [Vulpkanin, Felinid]
+  speciesRestriction: [Vulpkanin, Felinid, Kitsune]
   sprites:
     - sprite: _DV/Mobs/Customization/Vulpkanin/tail_markings.rsi
       state: fox3
@@ -480,7 +480,7 @@
   id: VulpTailFennec
   bodyPart: Tail
   markingCategory: Tail
-  speciesRestriction: [Vulpkanin, Felinid]
+  speciesRestriction: [Vulpkanin, Felinid, Kitsune]
   sprites:
     - sprite: _DV/Mobs/Customization/Vulpkanin/tail_markings.rsi
       state: fennec

Resources/Prototypes/_DV/Entities/Mobs/Player/kitsune.yml

@@ -0,0 +1,22 @@
+- type: entity
+  save: false
+  parent: [BaseMobKitsune, BaseMobHuman]
+  id: MobKitsune
+  name: Urist McKitsune
+  components:
+  - type: HumanoidAppearance
+    species: Kitsune
+  - type: InteractionPopup
+    successChance: 0.5
+    interactSuccessString: petting-success-soft-floofy-kitsune
+    interactFailureString: petting-failure-generic
+    interactSuccessSpawn: EffectHearts
+    interactSuccessSound:
+      path: /Audio/Animals/fox_squeak.ogg
+  - type: MeleeWeapon
+    soundHit:
+      path: /Audio/Items/hiss.ogg
+    animation: WeaponArcClaw
+    damage:
+      types:
+        Heat: 5

Resources/Prototypes/_DV/Entities/Mobs/Player/kitsunefox.yml

@@ -0,0 +1,58 @@
+- type: entity
+  name: Kitsune
+  parent: [SimpleMobBase, StripableInventoryBase, BaseMobKitsune]
+  id: MobKitsuneFox
+  description: A Kitsune's fox from
+  components:
+  - type: KitsuneFox
+  - type: MovementSpeedModifier
+    baseWalkSpeed: 4.5
+    baseSprintSpeed: 6
+  - type: Sprite
+    sprite: _DV/Mobs/Customization/kitsune/foxform.rsi
+    layers:
+    - state: kitsune_fox_body
+      map: ["enum.KitsuneColorVisuals.Layer"]
+    - state: kitsune_fox_innerear
+  - type: MobThresholds
+    thresholds:
+      0: Alive
+      100: Critical
+      200: Dead
+  - type: Damageable
+    damageContainer: BiologicalMetaphysical
+    damageModifierSet: KitsuneFox
+  - type: Inventory
+    speciesId: fox
+    templateId: pet
+  - type: DamageStateVisuals
+    states:
+      Alive:
+        Base: fox
+      Critical:
+        Base: fox_dead
+      Dead:
+        Base: fox_dead
+  - type: Butcherable
+    spawned:
+    - id: FoodMeat
+      amount: 3
+  - type: Bloodstream
+    bloodMaxVolume: 100
+  - type: MeleeWeapon
+    angle: 0
+    animation: WeaponArcBite
+    soundHit:
+      path: /Audio/Effects/bite.ogg
+    damage:
+      types:
+        Heat: 8
+  - type: Tag
+    tags:
+    - VimPilot
+    - DoorBumpOpener
+  - type: HTN
+    rootTask:
+      task: IdleCompound
+  - type: MindContainer
+    showExamineInfo: true

Resources/Prototypes/_DV/Entities/Mobs/Species/kitsune.yml

@@ -0,0 +1,63 @@
+- type: entity
+  save: false
+  id: BaseMobKitsune
+  name: Urist McKitsune
+  abstract: true
+  components:
+  - type: Physics
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape: !type:PhysShapeCircle
+          radius: 0.35
+        density: 50
+        restitution: 0.0
+        mask:
+        - MobMask
+        layer:
+        - MobLayer
+  - type: Body
+    prototype: Kitsune
+  - type: Damageable
+    damageContainer: BiologicalMetaphysical
+    damageModifierSet: Kitsune
+  - type: Speech
+    speechSounds: Alto
+    allowedEmotes: ['Growl', 'Squeak']
+  - type: Vocal
+    sounds:
+      Male: MaleKitsune
+      Female: FemaleKitsune
+      Unsexed: MaleKitsune
+  - type: Carriable
+  - type: TypingIndicator
+    proto: kitsune
+  - type: InteractionPopup
+    successChance: 0.5
+    interactSuccessString: petting-success-soft-floofy-kitsune
+    interactFailureString: petting-failure-generic
+    interactSuccessSpawn: EffectHearts
+    interactSuccessSound:
+      path: /Audio/Animals/fox_squeak.ogg
+  - type: Kitsune
+  - type: PsionicBonusChance
+    flatBonus: 1
+  - type: LightweightDrunk
+    boozeStrengthMultiplier: 3
+  - type: PseudoItem
+    storedOffset: "0,17"
+    shape:
+      - 0,0,1,4
+      - 0,2,3,4
+      - 4,0,5,4
+
+- type: entity
+  save: false
+  parent: MobHumanDummy
+  id: MobKitsuneDummy
+  categories: [ HideSpawnMenu ]
+  name: Urist McHands
+  description: A dummy kitsune meant to be used in character setup.
+  components:
+  - type: HumanoidAppearance
+    species: Kitsune

Resources/Prototypes/_DV/Entities/Objects/Specific/Species/kitsune.yml

@@ -0,0 +1,44 @@
+- type: entity
+  parent: BaseStructureDynamic
+  id: Foxfire
+  name: foxfire
+  description: An oddly cool wisp of flame giving off a comfortable glow.
+  components:
+  - type: Foxfire
+  - type: Sprite
+    noRot: true
+    drawdepth: Effects
+    sprite: _DV/Structures/Specific/Species/Kitsune/foxfire.rsi
+    state: foxfire
+  - type: PointLight
+    radius: 3
+    energy: 2
+    color: "#ffffff87"
+    castShadows: false
+  - type: Transform
+    anchored: false
+  - type: Physics
+    canCollide: False
+    bodyType: Static
+    bodyStatus: InAir
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape: !type:PhysShapeCircle
+          radius: 0.35
+        density: 50
+        mask:
+        - MobMask
+        layer:
+        - MobLayer
+  - type: Damageable
+    damageContainer: Biological
+    damageModifierSet: KitsuneFox
+  - type: Destructible
+    thresholds:
+    - trigger: !type:DamageTrigger
+        damage: 5
+      behaviors:
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+  - type: InteractionOutline

Resources/Prototypes/_DV/Guidebook/species.yml

@@ -32,3 +32,8 @@
   id: Feroxi
   name: species-name-feroxi
   text: "/ServerInfo/Guidebook/Mobs/_DV/Feroxi.xml"
+
+- type: guideEntry
+  id: Kitsune
+  name: species-name-kitsune
+  text: "/ServerInfo/Guidebook/Mobs/_DV/Kitsune.xml"

Resources/Prototypes/_DV/Polymorphs/polymorph.yml

@@ -0,0 +1,9 @@
+- type: polymorph
+  id: KitsuneMorph
+  configuration:
+    entity: MobKitsuneFox
+    inventory: None
+    transferName: true
+    transferDamage: true
+    revertOnCrit: true
+    revertOnDeath: true

Resources/Prototypes/_DV/QuickPhrases/Species/crew.yml

@@ -73,3 +73,8 @@
   id: SpeciesFeroxiPhrase
   parent: BaseCrewSpeciesPhrase
   text: species-name-feroxi
+
+- type: quickPhrase
+  id: SpeciesKitsunePhrase
+  parent: BaseCrewSpeciesPhrase
+  text: species-name-kitsune

Resources/Prototypes/_DV/SoundCollections/kitsune.yml

@@ -0,0 +1,14 @@
+- type: soundCollection
+  id: KitsuneScream
+  files:
+  - /Audio/_DV/Voice/Kitsune/fox_scream1.ogg
+
+- type: soundCollection
+  id: KitsuneSqueal
+  files:
+  - /Audio/_DV/Voice/Kitsune/fox_squeal1.ogg
+
+- type: soundCollection
+  id: KitsuneGrowl
+  files:
+  - /Audio/_DV/Voice/Kitsune/fox_growl1.ogg

Resources/Prototypes/_DV/Species/kitsune.yml

@@ -0,0 +1,48 @@
+- type: species
+  id: Kitsune
+  name: Kitsune
+  roundStart: true
+  prototype: MobKitsune
+  sprites: MobHumanSprites
+  markingLimits: MobKitsuneMarkingLimits
+  dollPrototype: MobKitsuneDummy
+  skinColoration: HumanToned
+  baseScale: 1, 1
+  minHeight: .85
+  maxHeight: 1.05
+
+- type: markingPoints
+  id: MobKitsuneMarkingLimits
+  points:
+    Hair:
+      points: 1
+      required: false
+    FacialHair:
+      points: 1
+      required: false
+    Snout:
+      points: 1
+      required: false
+    Tail:
+      points: 1
+      required: true
+      defaultMarkings: [ KitsuneTailDefault ]
+    HeadTop:
+      points: 1
+      required: true
+      defaultMarkings: [ KitsuneEarsDefault ]
+    UndergarmentTop:
+      points: 1
+      required: false
+    UndergarmentBottom:
+      points: 1
+      required: false
+    Chest:
+      points: 1
+      required: false
+    Legs:
+      points: 2
+      required: false
+    Arms:
+      points: 2
+      required: false

Resources/Prototypes/_DV/Voice/speech_emote_sounds.yml

@@ -354,3 +354,75 @@
       collection: FemaleGasp
     DefaultDeathgasp:
       collection: FemaleDeathGasp
+
+- type: emoteSounds
+  id: MaleKitsune
+  params:
+    variation: 0.125
+  sounds:
+    Scream:
+      collection: KitsuneScream
+    Laugh:
+      collection: MaleLaugh
+    Sneeze:
+      collection: MaleSneezes
+    Cough:
+      collection: MaleCoughs
+    Yawn:
+      collection: MaleYawn
+    Snore:
+      collection: Snores
+    Honk:
+      collection: BikeHorn
+    Sigh:
+      collection: MaleSigh
+    Crying:
+      collection: MaleCry
+    Whistle:
+      collection: Whistles
+    Weh:
+      collection: Weh
+    Squeak:
+      collection: KitsuneSqueal
+    Growl:
+      collection: KitsuneGrowl
+    Gasp:
+      collection: MaleGasp
+    DefaultDeathgasp:
+      collection: MaleDeathGasp
+
+- type: emoteSounds
+  id: FemaleKitsune
+  params:
+    variation: 0.125
+  sounds:
+    Scream:
+      collection: KitsuneScream
+    Laugh:
+      collection: FemaleLaugh
+    Sneeze:
+      collection: FemaleSneezes
+    Cough:
+      collection: FemaleCoughs
+    Yawn:
+      collection: FemaleYawn
+    Snore:
+      collection: Snores
+    Honk:
+      collection: BikeHorn
+    Sigh:
+      collection: FemaleSigh
+    Crying:
+      collection: FemaleCry
+    Whistle:
+      collection: Whistles
+    Weh:
+      collection: Weh
+    Squeak:
+      collection: KitsuneSqueal
+    Growl:
+      collection: KitsuneGrowl
+    Gasp:
+      collection: FemaleGasp
+    DefaultDeathgasp:
+      collection: FemaleDeathGasp

Resources/Prototypes/_DV/typing_indicator.yml

@@ -26,3 +26,9 @@
   id: feroxi
   spritePath: /Textures/_DV/Effects/speech.rsi
   typingState: feroxi0
+
+- type: typingIndicator
+  id: kitsune
+  spritePath: /Textures/_DV/Effects/speech.rsi
+  typingState: kitsune0
+  offset: 0, 0.25

Resources/Prototypes/_EE/Entities/Mobs/Customization/cyberlimbs/comp1.yml

@@ -2,7 +2,7 @@
   id: CyberLimbsMarkingComp1LArm
   bodyPart: LArm
   markingCategory: Arms
-  speciesRestriction: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia, Feroxi] # DeltaV - Feroxi
+  speciesRestriction: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia, Feroxi, Kitsune] # DeltaV - Feroxi, Kitsune
   sprites:
   - sprite: _EE/Mobs/Customization/cyberlimbs/comp1/comp1_main.rsi
     state: l_arm-primary
@@ -15,7 +15,7 @@
   id: CyberLimbsMarkingComp1LHand
   bodyPart: LHand
   markingCategory: Arms
-  speciesRestriction: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia, Feroxi] # DeltaV - Feroxi
+  speciesRestriction: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia, Feroxi, Kitsune] # DeltaV - Feroxi, Kitsune
   sprites:
   - sprite: _EE/Mobs/Customization/cyberlimbs/comp1/comp1_main.rsi
     state: l_hand
@@ -24,7 +24,7 @@
   id: CyberLimbsMarkingComp1LLeg
   bodyPart: LLeg
   markingCategory: Legs
-  speciesRestriction: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia, Feroxi] # DeltaV - Feroxi
+  speciesRestriction: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia, Feroxi, Kitsune] # DeltaV - Feroxi, Kitsune
   sprites:
   - sprite: _EE/Mobs/Customization/cyberlimbs/comp1/comp1_main.rsi
     state: l_leg-primary
@@ -36,7 +36,7 @@
   id: CyberLimbsMarkingComp1LFoot
   bodyPart: LFoot
   markingCategory: Legs
-  speciesRestriction: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia, Feroxi] # DeltaV - Feroxi
+  speciesRestriction: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia, Feroxi, Kitsune] # DeltaV - Feroxi, Kitsune
   sprites:
   - sprite: _EE/Mobs/Customization/cyberlimbs/comp1/comp1_main.rsi
     state: l_foot
@@ -47,7 +47,7 @@
   id: CyberLimbsMarkingComp1RArm
   bodyPart: RArm
   markingCategory: Arms
-  speciesRestriction: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia, Feroxi] # DeltaV - Feroxi
+  speciesRestriction: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia, Feroxi, Kitsune] # DeltaV - Feroxi, Kitsune
   sprites:
   - sprite: _EE/Mobs/Customization/cyberlimbs/comp1/comp1_main.rsi
     state: r_arm-primary
@@ -61,7 +61,7 @@
   id: CyberLimbsMarkingComp1RHand
   bodyPart: RHand
   markingCategory: Arms
-  speciesRestriction: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia, Feroxi] # DeltaV - Feroxi
+  speciesRestriction: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia, Feroxi, Kitsune] # DeltaV - Feroxi, Kitsune
   sprites:
   - sprite: _EE/Mobs/Customization/cyberlimbs/comp1/comp1_main.rsi
     state: r_hand
@@ -70,7 +70,7 @@
   id: CyberLimbsMarkingComp1RLeg
   bodyPart: RLeg
   markingCategory: Legs
-  speciesRestriction: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia, Feroxi] # DeltaV - Feroxi
+  speciesRestriction: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia, Feroxi, Kitsune] # DeltaV - Feroxi, Kitsune
   sprites:
   - sprite: _EE/Mobs/Customization/cyberlimbs/comp1/comp1_main.rsi
     state: r_leg-primary
@@ -82,7 +82,7 @@
   id: CyberLimbsMarkingComp1RFoot
   bodyPart: RFoot
   markingCategory: Legs
-  speciesRestriction: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia, Feroxi] # DeltaV - Feroxi
+  speciesRestriction: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia, Feroxi, Kitsune] # DeltaV - Feroxi, Kitsune
   sprites:
   - sprite: _EE/Mobs/Customization/cyberlimbs/comp1/comp1_main.rsi
     state: r_foot

Resources/Prototypes/_EE/Entities/Mobs/Customization/cyberlimbs/comp2.yml

@@ -2,7 +2,7 @@
   id: CyberLimbsMarkingComp2LArm
   bodyPart: LArm
   markingCategory: Arms
-  speciesRestriction: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia, Feroxi] # DeltaV - Feroxi
+  speciesRestriction: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia, Feroxi, Kitsune] # DeltaV - Feroxi, Kitsune
   sprites:
   - sprite: _EE/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi
     state: l_arm-1
@@ -13,7 +13,7 @@
   id: CyberLimbsMarkingComp2LHand
   bodyPart: LHand
   markingCategory: Arms
-  speciesRestriction: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia, Feroxi] # DeltaV - Feroxi
+  speciesRestriction: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia, Feroxi, Kitsune] # DeltaV - Feroxi, Kitsune
   sprites:
   - sprite: _EE/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi
     state: l_hand-1
@@ -24,7 +24,7 @@
   id: CyberLimbsMarkingComp2LLeg
   bodyPart: LLeg
   markingCategory: Legs
-  speciesRestriction: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia, Feroxi] # DeltaV - Feroxi
+  speciesRestriction: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia, Feroxi, Kitsune] # DeltaV - Feroxi, Kitsune
   sprites:
   - sprite: _EE/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi
     state: l_leg-1
@@ -36,7 +36,7 @@
   id: CyberLimbsMarkingComp2LFoot
   bodyPart: LFoot
   markingCategory: Legs
-  speciesRestriction: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia, Feroxi] # DeltaV - Feroxi
+  speciesRestriction: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia, Feroxi, Kitsune] # DeltaV - Feroxi, Kitsune
   sprites:
   - sprite: _EE/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi
     state: l_foot-1
@@ -49,7 +49,7 @@
   id: CyberLimbsMarkingComp2RArm
   bodyPart: RArm
   markingCategory: Arms
-  speciesRestriction: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia, Feroxi] # DeltaV - Feroxi
+  speciesRestriction: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia, Feroxi, Kitsune] # DeltaV - Feroxi, Kitsune
   sprites:
   - sprite: _EE/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi
     state: r_arm-1
@@ -61,7 +61,7 @@
   id: CyberLimbsMarkingComp2RHand
   bodyPart: RHand
   markingCategory: Arms
-  speciesRestriction: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia, Feroxi] # DeltaV - Feroxi
+  speciesRestriction: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia, Feroxi, Kitsune] # DeltaV - Feroxi, Kitsune
   sprites:
   - sprite: _EE/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi
     state: r_hand-1
@@ -73,7 +73,7 @@
   id: CyberLimbsMarkingComp2RLeg
   bodyPart: RLeg
   markingCategory: Legs
-  speciesRestriction: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia, Feroxi] # DeltaV - Feroxi
+  speciesRestriction: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia, Feroxi, Kitsune] # DeltaV - Feroxi, Kitsune
   sprites:
   - sprite: _EE/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi
     state: r_leg-1
@@ -85,7 +85,7 @@
   id: CyberLimbsMarkingComp2RFoot
   bodyPart: RFoot
   markingCategory: Legs
-  speciesRestriction: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia, Feroxi] # DeltaV - Feroxi
+  speciesRestriction: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia, Feroxi, Kitsune] # DeltaV - Feroxi, Kitsune
   sprites:
   - sprite: _EE/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi
     state: r_foot-1

Resources/ServerInfo/Guidebook/Mobs/Species.xml

@@ -27,6 +27,7 @@
   <GuideEntityEmbed Entity="MobRodentia" Caption="Rodentia"/>
   <GuideEntityEmbed Entity="MobChitinid" Caption="Chitinid"/>
   <GuideEntityEmbed Entity="MobFeroxi" Caption="Feroxi"/>
+  <GuideEntityEmbed Entity="MobKitsune" Caption="Kitsune"/>
   </Box>
 
 </Document>

Resources/ServerInfo/Guidebook/Mobs/_DV/Kitsune.xml

@@ -0,0 +1,33 @@
+<Document>
+  # Kitsune
+
+  <Box>
+    <GuideEntityEmbed Entity="MobKitsuneDummy" Caption=""/>
+  </Box>
+
+  Graceful and mysterious fox people. They have the ability to shapeshift into a fox, and have a strange connection to the Noösphere.
+
+  ## Diet
+
+  - Can eat raw meat.
+  - Will get poisoned by Theobromine (Chocolate, Tea, Coffee) and Allicin (Onion, Garlic).
+
+  ## Benefits
+
+  - They are smaller than Humans, making them harder to hit.
+  - Can fit in duffelbags.
+  - Have the ability to shapeshift into a fox form, which grants them greater speed at the cost of fragility.
+  - Uses their claws to do heat damage.
+  - Can summon a small wisp of flame to light up dark places.
+  - Take 25% less heat and cold damage.
+  - Greater chance of obtaining psionics.
+
+  ## Drawbacks
+
+  - Takes 20% more blunt damage, 5% more slash and piercing, and 50% more radiation damage.
+  - Takes 30% more blunt damage, and 20% more piercing and slash damage in fox form.
+  - Capable of taking holy damage, but at a reduced amount
+  - Get drunk more easily then other species
+  - They are weaker and struggle to carry and pull things due to their small size.
+
+</Document>

Resources/Textures/_DV/Effects/speech.rsi/meta.json

@@ -91,6 +91,23 @@
         },
         {
             "name": "feroxi2"
+        },
+        {
+            "name": "kitsune0",
+            "delays": [
+                [
+                    0.2,
+                    0.3,
+                    0.3,
+                    0.5
+                ]
+            ]
+        },
+        {
+            "name": "kitsune1"
+        },
+        {
+            "name": "kitsune2"
         }
     ]
 }

Resources/Textures/_DV/Mobs/Customization/kitsune/ears.rsi/meta.json

@@ -0,0 +1,23 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "kitsune_fluffy_ears and kitsune_fluffy_fluff and made by AeraAulin(discord) for ss14, foxears.png made by @Kilath",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "kitsune_fluffy_ears",
+            "directions": 4
+        },
+        {
+            "name": "kitsune_fluffy_fluff",
+            "directions": 4
+        },
+        {
+            "name": "foxears",
+            "directions": 4
+        }
+    ]
+}

Resources/Textures/_DV/Mobs/Customization/kitsune/foxform.rsi/meta.json

@@ -0,0 +1,19 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "taken from commit at https://github.com/tgstation/tgstation/commit/53d1f1477d22a11a99c6c6924977cd431075761b and modified by @absolis",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "kitsune_fox_body",
+            "directions": 4
+        },
+        {
+            "name": "kitsune_fox_innerear",
+            "directions": 4
+        }
+    ]
+}

Resources/Textures/_DV/Mobs/Customization/kitsune/tails.rsi/meta.json

@@ -0,0 +1,43 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "kitsune_primary and kitsune_secondary Taken from S.P.L.U.R.T at commit https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13/commit/96703f76bccd8fe6a96b78524efb97a9af661767, foxninetails, foxthreetails, foxtwotails, and fluffytail by @Kilath",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "kitsune_primary",
+            "directions": 4
+        },
+        {
+            "name": "kitsune_secondary",
+            "directions": 4
+        },
+        {
+            "name": "foxninetailstone1",
+            "directions": 4
+        },
+        {
+            "name": "foxninetailstone2",
+            "directions": 4
+        },
+        {
+            "name": "foxthreetailstone1",
+            "directions": 4
+        },
+        {
+            "name": "foxthreetailstone2",
+            "directions": 4
+        },
+        {
+            "name": "foxtwotailstone1",
+            "directions": 4
+        },
+        {
+            "name": "foxtwotailstone2",
+            "directions": 4
+        }
+    ]
+}

Resources/Textures/_DV/Structures/Specific/Species/Kitsune/foxfire.rsi/meta.json

@@ -0,0 +1,27 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "by AeraAulin",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "foxfire",
+            "directions": 1,
+            "delays": [
+                [
+                    0.1,
+                    0.2,
+                    0.2,
+                    0.2
+                ]
+            ]
+        },
+        {
+            "name": "icon",
+            "directions": 1
+        }
+    ]
+}