diff --git a/Content.Client/PDA/PdaVisualizerSystem.cs b/Content.Client/PDA/PdaVisualizerSystem.cs
index 0d7685d6ae9..13086c600b0 100644
--- a/Content.Client/PDA/PdaVisualizerSystem.cs
+++ b/Content.Client/PDA/PdaVisualizerSystem.cs
@@ -27,4 +27,4 @@ public enum PdaVisualLayers : byte
Flashlight,
IdLight
}
-}
+}
\ No newline at end of file
diff --git a/Content.Inky.Client/Content.Inky.Client.csproj b/Content.Inky.Client/Content.Inky.Client.csproj
index 0a66f80cc80..acae8d9a7e1 100644
--- a/Content.Inky.Client/Content.Inky.Client.csproj
+++ b/Content.Inky.Client/Content.Inky.Client.csproj
@@ -11,11 +11,9 @@
-
+
-
-
-
+
diff --git a/Content.Inky.Common/Events/Werewolf/WerewolfEvents.cs b/Content.Inky.Common/Events/Werewolf/WerewolfEvents.cs
new file mode 100644
index 00000000000..e728822372c
--- /dev/null
+++ b/Content.Inky.Common/Events/Werewolf/WerewolfEvents.cs
@@ -0,0 +1,3 @@
+namespace Content.Inky.Common.Events.Werewolf;
+
+public readonly record struct SelectFirstMartialArtEvent(EntityUid Entity);
diff --git a/Content.Inky.Server/Administration/Systems/InkyAdminVerbSystem.Antag.cs b/Content.Inky.Server/Administration/Systems/InkyAdminVerbSystem.Antag.cs
new file mode 100644
index 00000000000..643fc3e09a0
--- /dev/null
+++ b/Content.Inky.Server/Administration/Systems/InkyAdminVerbSystem.Antag.cs
@@ -0,0 +1,40 @@
+using Content.Goobstation.Common.Blob;
+using Content.Goobstation.Server.Changeling.GameTicking.Rules;
+using Content.Inky.Shared.Werewolf.Components;
+using Content.Server.Administration.Managers;
+using Content.Server.Administration.Systems;
+using Content.Server.Antag;
+using Content.Shared.Database;
+using Content.Shared.Mind.Components;
+using Content.Shared.Verbs;
+using Content.Trauma.Common.Silicon;
+using Robust.Shared.Player;
+using Robust.Shared.Utility;
+
+namespace Content.Inky.Server.Administration.Systems;
+
+public sealed partial class InkyAdminVerbSystem
+{
+ [Dependency] private readonly AntagSelectionSystem _antag = default!;
+
+ private void OnGetAntagVerbs(ref GetAntagVerbsEvent args)
+ {
+ if (!HasComp(args.Target) || !TryComp(args.Target, out var targetActor))
+ return;
+
+ var targetPlayer = targetActor.PlayerSession;
+
+ args.Verbs.Verbs.Add(new()
+ {
+ Text = Loc.GetString("admin-verb-text-make-werewolf"),
+ Category = VerbCategory.Antag,
+ Icon = new SpriteSpecifier.Rsi(new ResPath("/Textures/_Inky/Actions/Werewolf/werewolf.rsi"), "howl"),
+ Act = () =>
+ {
+ _antag.ForceMakeAntag(targetPlayer, "Werewolf");
+ },
+ Impact = LogImpact.High,
+ Message = Loc.GetString("admin-verb-make-werewolf"),
+ });
+ }
+}
diff --git a/Content.Inky.Server/Administration/Systems/InkyAdminVerbSystem.cs b/Content.Inky.Server/Administration/Systems/InkyAdminVerbSystem.cs
new file mode 100644
index 00000000000..6862932bca5
--- /dev/null
+++ b/Content.Inky.Server/Administration/Systems/InkyAdminVerbSystem.cs
@@ -0,0 +1,13 @@
+using Content.Server.Administration.Systems;
+
+namespace Content.Inky.Server.Administration.Systems;
+
+public sealed partial class InkyAdminVerbSystem : EntitySystem
+{
+ public override void Initialize()
+ {
+ base.Initialize();
+
+ SubscribeLocalEvent(OnGetAntagVerbs);
+ }
+}
diff --git a/Content.Inky.Server/Content.Inky.Server.csproj b/Content.Inky.Server/Content.Inky.Server.csproj
index c7879a225b6..91a810bcc6c 100644
--- a/Content.Inky.Server/Content.Inky.Server.csproj
+++ b/Content.Inky.Server/Content.Inky.Server.csproj
@@ -16,13 +16,11 @@
-
-
-
-
+
+
-
+
diff --git a/Content.Inky.Server/Werewolf/Systems/WerewolfAbilitiesSystem.Black.cs b/Content.Inky.Server/Werewolf/Systems/WerewolfAbilitiesSystem.Black.cs
new file mode 100644
index 00000000000..268dfad7dd0
--- /dev/null
+++ b/Content.Inky.Server/Werewolf/Systems/WerewolfAbilitiesSystem.Black.cs
@@ -0,0 +1,27 @@
+using Content.Inky.Shared.Werewolf;
+using Content.Inky.Shared.Werewolf.Components;
+using Content.Shared.Chat;
+using Robust.Shared.Utility;
+
+namespace Content.Inky.Server.Werewolf.Systems;
+
+public sealed partial class WerewolfAbilitiesSystem
+{
+ ///
+ public void InitializeBlack()
+ {
+ SubscribeLocalEvent(OnBeckon);
+ }
+
+ private void OnBeckon(EntityUid uid, WerewolfAbilitiesComponent comp, WerewolfBeckonEvent args)
+ {
+ var locationName = FormattedMessage.RemoveMarkupOrThrow(_navMap.GetNearestBeaconString(uid));
+
+ var message = Loc.GetString("werewolf-beckon-message",
+ ("name", MetaData(uid).EntityName),
+ ("location", locationName));
+
+ _chat.TrySendInGameICMessage(uid, $"+l {message}", InGameICChatType.CollectiveMind, ChatTransmitRange.Normal); // holy goida IF ANYONE CHANGES LUNARMIND KEY LETTER CHANGE IT HERE TOO
+ args.Handled = true;
+ }
+}
diff --git a/Content.Inky.Server/Werewolf/Systems/WerewolfAbilitiesSystem.Side.cs b/Content.Inky.Server/Werewolf/Systems/WerewolfAbilitiesSystem.Side.cs
new file mode 100644
index 00000000000..d07ddae9450
--- /dev/null
+++ b/Content.Inky.Server/Werewolf/Systems/WerewolfAbilitiesSystem.Side.cs
@@ -0,0 +1,211 @@
+using System.Linq;
+using Content.Goobstation.Shared.Changeling.Components;
+using Content.Inky.Shared.Werewolf;
+using Content.Inky.Shared.Werewolf.Components;
+using Content.Medical.Shared.Wounds;
+using Content.Shared.Body;
+using Content.Shared.Body.Components;
+using Content.Shared.Chemistry.Components;
+using Content.Shared.Damage;
+using Content.Shared.Damage.Prototypes;
+using Content.Shared.DoAfter;
+using Content.Shared.FixedPoint;
+using Content.Shared.Popups;
+using Robust.Shared.Prototypes;
+
+namespace Content.Inky.Server.Werewolf.Systems;
+
+///
+/// Handles side abilities and helpers for the werewolf
+///
+public sealed partial class WerewolfAbilitiesSystem
+{
+ public void InitializeWerewolfSide()
+ {
+ SubscribeLocalEvent(TryDevour);
+ SubscribeLocalEvent(DoDevour);
+ SubscribeLocalEvent(TryGut);
+ SubscribeLocalEvent(DoGut);
+ }
+ # region devour
+ private void TryDevour(EntityUid uid, WerewolfAbilitiesComponent component, EventWerewolfDevour args)
+ {
+ var target = args.Target;
+
+ if (HasComp(target))
+ {
+ _popup.PopupPredictedCursor(Loc.GetString("werewolf-devour-fail-devoured"), uid);
+ return;
+ }
+ if (!HasComp(target)) // i mean... it works? also less wizden files changes
+ {
+ _popup.PopupPredicted(Loc.GetString("changeling-absorb-fail-unabsorbable"), uid, uid);
+ return;
+ }
+
+ if (HasComp(target))
+ {
+ _popup.PopupPredicted(Loc.GetString("werewolf-devour-fail-werewolf"), uid, uid); // no to eating each other
+ return;
+ }
+
+ var popupOthers = Loc.GetString("werewolf-devour-start", ("user", uid), ("target", target));
+ _popup.PopupPredicted(popupOthers, uid, uid, PopupType.LargeCaution);
+
+ var dargs = new DoAfterArgs(EntityManager, uid, TimeSpan.FromSeconds(4), new WerewolfDevourDoAfterEvent(), uid, target) // todo werewolf unhardcode duration
+ {
+ DistanceThreshold = 1.5f,
+ BreakOnDamage = true,
+ BreakOnHandChange = false,
+ BreakOnMove = true,
+ BreakOnWeightlessMove = true,
+ AttemptFrequency = AttemptFrequency.StartAndEnd,
+ MultiplyDelay = false,
+ };
+ _doAfter.TryStartDoAfter(dargs);
+ }
+
+ public ProtoId DevourDamage = "Brute"; // bro
+ private void DoDevour(EntityUid uid, WerewolfAbilitiesComponent comp, WerewolfDevourDoAfterEvent args)
+ {
+ if (args.Args.Target == null)
+ return;
+
+ var target = args.Args.Target.Value;
+
+ if (args.Cancelled
+ || HasComp(target)
+ || !TryComp(target, out var body))
+ return;
+
+ var dmg = new DamageSpecifier(_proto.Index(DevourDamage), 35); // todo werewolf unhardcode this
+ _damage.TryChangeDamage(target, dmg, true, true);
+ RipLimb(target, body);
+
+ var targetComp = EnsureComp(target);
+
+ if (!_mind.TryGetMind(uid, out var mindId, out _)
+ || !TryComp(mindId, out var mindComp))
+ return;
+
+ mindComp.Currency += comp.AmountDevour;
+ mindComp.BittenPeople.Add(args.Args.Target.Value);
+ targetComp.BittenBy = mindComp;
+
+ _hunger.ModifyHunger(uid, +80); // todo werewolf maybe put as a var inside a comp or sdome shit
+ _audio.PlayPvs(comp.RipSound, uid);
+ }
+
+ private void TryGut(EntityUid uid, WerewolfAbilitiesComponent comp, EventWerewolfGut args)
+ {
+ var target = args.Target;
+
+ if (!HasComp(target))
+ {
+ _popup.PopupEntity(Loc.GetString("changeling-absorb-fail-unabsorbable"), uid, uid);
+ return;
+ }
+
+ _mind.TryGetMind(target, out var mindId, out var mind);
+
+ if (mind == null)
+ {
+ // _popup.PopupEntity(Loc.GetString("werewolf-gut-fail-mind"), uid, uid); // todo werewolf locale
+ // return; // todo werewolf uncomment before release
+ }
+
+ var popupOthers = Loc.GetString("werewolf-gut-start", ("user", uid), ("target", target)); // todo locale
+ _popup.PopupPredicted(popupOthers, uid, uid, PopupType.LargeCaution);
+
+ var dargs = new DoAfterArgs(EntityManager, uid, TimeSpan.FromSeconds(4), new WerewolfGutDoAfterEvent(), uid, target)// todo werewolf unhardcode duration
+ {
+ DistanceThreshold = 1.5f,
+ BreakOnDamage = true,
+ BreakOnHandChange = false,
+ BreakOnMove = true,
+ BreakOnWeightlessMove = true,
+ AttemptFrequency = AttemptFrequency.StartAndEnd,
+ MultiplyDelay = false,
+ };
+ _doAfter.TryStartDoAfter(dargs);
+ }
+
+ #endregion
+ #region helpers
+ private void DoGut(EntityUid uid, WerewolfAbilitiesComponent comp, WerewolfGutDoAfterEvent args)
+ {
+ if (args.Args.Target == null)
+ return;
+
+ var target = args.Args.Target.Value;
+
+ if (args.Cancelled
+ || !TryComp(target, out var body))
+ return;
+
+ if (!TryRemoveOrgan(uid, target, out var removedOrgan))
+ return;
+
+ _blood.SpillAllSolutions(target);
+ if (_mind.TryGetMind(uid, out var mindId, out _) && TryComp(mindId, out var mindComp))
+ mindComp.Currency += comp.AmountGut;
+
+ _hunger.ModifyHunger(uid, +20); // todo werewolf maybe put this inside comp
+ _audio.PlayPvs(comp.RipSound, uid);
+ }
+
+ private bool TryRemoveOrgan(EntityUid user, EntityUid target, out EntityUid? removedOrgan) // shit was originally taken from devil shitcode but upstream broke a shitton of stuff
+ {
+ removedOrgan = null;
+
+ if (!TryComp(target, out var body))
+ return false;
+
+ var organs = _body.GetInternalOrgans((target, body))
+ .Where(organ => !HasComp(organ.Owner))
+ .ToList();
+
+ if (organs.Count < 1)
+ {
+ _popup.PopupEntity(Loc.GetString("werewolf-gut-no-organs-left"), user, user);
+ return false;
+ }
+
+ var nextOrgan = _gambling.Next(organs.Count); // idk
+ var picked = organs[nextOrgan];
+ removedOrgan = picked.Owner;
+
+ if (TryComp(picked.Owner, out var organComp))
+ _body.RemoveOrgan((target, body), new Entity(picked.Owner, organComp)); // this is horrible
+ QueueDel(picked.Owner);
+
+ _popup.PopupEntity(Loc.GetString("werewolf-gut-success"), user, user);
+
+ return true;
+ }
+
+ private void RipLimb(EntityUid target, BodyComponent body)
+ {
+ var allOrgans = _body.GetOrgans((target, body));
+ var limbs = allOrgans // limbs are considered organs for some reason
+ .Where(organ =>
+ {
+ var category = _body.GetCategory(new Entity(organ.Owner, organ.Comp));
+ return category == "ArmLeft" || category == "ArmRight"; // TODO WEREWOLF: DESHITCODE
+ })// i have PTSD from shitmed and inkymed looking at this shit above
+ .ToList();
+
+ if (limbs.Count <= 0)
+ return;
+
+ var nextOrgan = _gambling.Next(limbs.Count); // boo copypaste from TryRemoveOrgan
+ var picked = limbs[nextOrgan];
+
+ if (!TryComp(picked.Owner, out var woundable)
+ || !woundable.ParentWoundable.HasValue)
+ return;
+
+ _wound.AmputateWoundableSafely(woundable.ParentWoundable.Value, picked.Owner, woundable);
+ }
+ # endregion
+}
diff --git a/Content.Inky.Server/Werewolf/Systems/WerewolfAbilitiesSystem.cs b/Content.Inky.Server/Werewolf/Systems/WerewolfAbilitiesSystem.cs
new file mode 100644
index 00000000000..08b6de6ff66
--- /dev/null
+++ b/Content.Inky.Server/Werewolf/Systems/WerewolfAbilitiesSystem.cs
@@ -0,0 +1,162 @@
+using Content.Inky.Common.Events.Werewolf;
+using Content.Inky.Shared.Werewolf;
+using Content.Inky.Shared.Werewolf.Components;
+using Content.Inky.Shared.Werewolf.Systems;
+using Content.Medical.Shared.Wounds;
+using Content.Server.Chat.Systems;
+using Content.Server.Mind;
+using Content.Server.Pinpointer;
+using Content.Server.Polymorph.Systems;
+using Content.Server.Popups;
+using Content.Server.Store.Systems;
+using Content.Shared.Body;
+using Content.Shared.Body.Systems;
+using Content.Shared.Chemistry.EntitySystems;
+using Content.Shared.Damage.Systems;
+using Content.Shared.DoAfter;
+using Content.Shared.FixedPoint;
+using Content.Shared.Fluids;
+using Content.Shared.Nutrition.Components;
+using Content.Shared.Nutrition.EntitySystems;
+using Content.Shared.Polymorph;
+using Content.Shared.Store.Components;
+using Robust.Server.GameObjects;
+using Robust.Shared.Audio.Systems;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Random;
+
+namespace Content.Inky.Server.Werewolf.Systems;
+
+public sealed partial class WerewolfAbilitiesSystem : EntitySystem
+{
+ [Dependency] private PolymorphSystem _polymorph = default!;
+ [Dependency] private StoreSystem _store = default!;
+ [Dependency] private PopupSystem _popup = default!;
+ [Dependency] private MindSystem _mind = default!;
+ [Dependency] private SharedWerewolfAbilitiesSystem _werewolf = default!; // hell.
+ [Dependency] private HungerSystem _hunger = default!;
+
+ // holy fuck
+ [Dependency] private SharedDoAfterSystem _doAfter = default!;
+ [Dependency] private IPrototypeManager _proto = default!;
+ [Dependency] private DamageableSystem _damage = default!;
+ [Dependency] private SharedBloodstreamSystem _blood = default!;
+ [Dependency] private BodySystem _body = default!;
+ [Dependency] private IRobustRandom _gambling = default!;
+ [Dependency] private WoundSystem _wound = default!;
+ [Dependency] private SharedAudioSystem _audio = default!;
+ [Dependency] private NavMapSystem _navMap = default!;
+ [Dependency] private ChatSystem _chat = default!;
+
+ public override void Initialize()
+ {
+ base.Initialize();
+
+ SubscribeLocalEvent(TryTransfurm);
+ SubscribeLocalEvent(OnChangeType);
+ SubscribeLocalEvent(OnOpenStore);
+ SubscribeLocalEvent(OnPolymorphed);
+
+ InitializeWerewolfSide();
+ InitializeBlack();
+ }
+
+ # region basic handlers
+ private void TryTransfurm(EntityUid uid,
+ WerewolfAbilitiesComponent component,
+ TransfurmEvent args)
+ {
+ if (!_mind.TryGetMind(uid, out var mindId, out _)
+ || !TryComp(mindId, out var mindComp))
+ return;
+
+ if (mindComp.BlockTransfurm)
+ {
+ _popup.PopupEntity(Loc.GetString("werewolf-transfurm-block"), uid, uid);
+ args.Handled = true;
+ return;
+ }
+
+ if (!args.Forced && mindComp.Accumulator < mindComp.TransfurmOnCommandDelay)
+ {
+ _popup.PopupEntity(Loc.GetString("werewolf-transfurm-cooldown"), uid, uid); // todo werewolf locale & timeLeft
+ args.Handled = true;
+ return;
+ }
+
+ if (component.Transfurmed)
+ {
+ component.Transfurmed = false;
+ mindComp.TransfurmReady = false;
+ _polymorph.Revert(uid);
+ // _sharedWerewolf.SyncActions(uid, component);
+ args.Handled = true;
+ mindComp.Accumulator = 0f;
+ return;
+ }
+
+ component.Transfurmed = true;
+ mindComp.TransfurmReady = false;
+ _polymorph.PolymorphEntity(uid, component.CurrentMutation);
+ component.Transfurmed = false; // trust this is really important, the fucking polymorph is shit!!!!
+ mindComp.Accumulator = 0f;
+ args.Handled = true;
+ }
+
+ private void OnPolymorphed(EntityUid uid, WerewolfAbilitiesComponent comp, PolymorphedEvent args)
+ {
+ if (!comp.Transfurmed)
+ {
+ _polymorph.CopyPolymorphComponent(uid, args.NewEntity);
+
+ if (TryComp(uid, out var oldHunger)) // Transfer hunger value
+ _hunger.SetHunger(args.NewEntity, _hunger.GetHunger(oldHunger));
+ return;
+ }
+ _polymorph.CopyPolymorphComponent(uid, args.NewEntity);
+ _polymorph.CopyPolymorphComponent(uid, args.NewEntity);
+
+ if (TryComp(uid, out var oldHungerTakeTwo)) // Transfer hunger value
+ _hunger.SetHunger(args.NewEntity, _hunger.GetHunger(oldHungerTakeTwo));
+
+ // _sharedWerewolf.SyncActions(args.NewEntity, Comp(args.NewEntity)); // todo
+ var werewolf = Comp(args.NewEntity);
+ // werewolf.ActionEntities.Clear();
+ _werewolf.SyncActions(args.NewEntity, werewolf);
+
+ var ev = new SelectFirstMartialArtEvent(args.NewEntity); // when you polymorph, it resets your current selected martial art
+ RaiseLocalEvent(ev); // this is a very lazy solution but hey it works
+ }
+
+ private void OnOpenStore(Entity ent, ref EventWerewolfOpenStore args)
+ {
+ if (!TryComp(ent, out var store)
+ || ent.Comp.Transfurmed == true)
+ return;
+
+ // ok hear me out
+ // when you do shit in the WW form that gives you points, it saves in mind and then the next time you open store it adds up
+ // you HAVE to do ts because why? POLYMORPH IS FUCKING SHIT OF COURSE! ig you can store the old uid for store and shit but whatever
+ if (_mind.TryGetMind(ent, out var mindId, out _) && TryComp(mindId, out var mindComp))
+ {
+ if (mindComp.Currency > 0)
+ {
+ _store.TryAddCurrency(new Dictionary {{ "Fury", mindComp.Currency }}, ent);
+ mindComp.Currency = 0;
+ }
+ }
+
+ _store.ToggleUi(ent, ent, store);
+ ent.Comp.StoreOpened = true;
+ }
+
+ private void OnChangeType(EntityUid uid, WerewolfAbilitiesComponent comp, EventWerewolfChangeType args)
+ {
+ comp.CurrentMutation = args.WerewolfType;
+ _popup.PopupEntity(Loc.GetString("werewolf-mutation-changed", ("mutation", args.WerewolfType)), uid, uid); // todo locale
+
+ args.Handled = true;
+ }
+
+ #endregion
+}
diff --git a/Content.Inky.Server/Werewolf/Systems/WerewolfRuleSystem.cs b/Content.Inky.Server/Werewolf/Systems/WerewolfRuleSystem.cs
new file mode 100644
index 00000000000..64eb89b6f4e
--- /dev/null
+++ b/Content.Inky.Server/Werewolf/Systems/WerewolfRuleSystem.cs
@@ -0,0 +1,121 @@
+using System.Linq;
+using Content.Inky.Shared.Werewolf;
+using Content.Inky.Shared.Werewolf.Components;
+using Content.Inky.Shared.Werewolf.Systems;
+using Content.Server.Antag;
+using Content.Server.GameTicking.Rules;
+using Content.Server.Mind;
+using Content.Shared.EntityEffects;
+using Content.Shared.EntityEffects.Effects;
+using Content.Shared.Roles;
+using Content.Shared.Roles.Components;
+using Content.Shared.Store;
+using Content.Shared.Store.Components;
+using Robust.Shared.Audio;
+using Robust.Shared.Prototypes;
+
+namespace Content.Inky.Server.Werewolf.Systems;
+
+public sealed class WerewolfRuleSystem : GameRuleSystem
+{
+ [Dependency] private readonly MindSystem _mind = default!;
+ [Dependency] private readonly AntagSelectionSystem _antag = default!;
+ [Dependency] private readonly SharedRoleSystem _role = default!;
+ [Dependency] private readonly SharedWerewolfAbilitiesSystem _werewolf = default!; // hell.
+ [Dependency] private readonly SharedEntityEffectsSystem _effects = default!;
+
+ public readonly SoundSpecifier BriefingSound = new SoundPathSpecifier("/Audio/_Inky/Antag/Werewolf/werewolf_start.ogg");
+
+ public readonly ProtoId WerewolfPrototypeId = "Werewolf";
+
+ public readonly ProtoId Currency = "Fury";
+
+ public readonly int StartingCurrency = 2; // to buy either regen or ambush, choose your game
+
+ [ValidatePrototypeId] EntProtoId mindRole = "MindRoleWerewolf";
+
+ public readonly ProtoId WerewolfSkills = "WerewolfSkills";
+
+ public override void Initialize()
+ {
+ base.Initialize();
+
+ SubscribeLocalEvent(OnSelectAntag);
+ // SubscribeLocalEvent(OnTextPrepend);
+
+ SubscribeLocalEvent(OnInfectionFinished); // goida
+ }
+
+ private void OnSelectAntag(EntityUid uid, WerewolfRuleComponent comp, ref AfterAntagEntitySelectedEvent args)
+ {
+ MakeWerewolf(args.EntityUid, comp);
+ }
+
+ ///
+ /// Makes the entity into a werewolf.
+ ///
+ /// EntityUid of an entity that is going to become a werewolf
+ /// WerewolfRule
+ /// Can this werewolf evolve into other werewolf types?
+ /// Should this werewolf have access to the blackappentice category? // todo werewolf UNFUCK ME
+ ///
+ public bool MakeWerewolf(EntityUid target,
+ WerewolfRuleComponent rule,
+ bool evolution = true, // todo werewolf maybe rename? first thing that came into my mind
+ bool apprentice = false)
+ {
+ if (!_mind.TryGetMind(target, out var mindId, out var mind))
+ return false;
+
+ _role.MindAddRole(mindId, mindRole.Id, mind, true);
+
+ var briefing = Loc.GetString("werewolf-role-greeting");
+ var briefingShort = Loc.GetString("werewolf-role-greeting-short");
+
+ if (_role.MindHasRole(mindId, out var mr))
+ AddComp(mr.Value, new RoleBriefingComponent { Briefing = briefingShort }, overwrite: true);
+
+ EnsureComp(target, out var werewolfComp);
+ EnsureComp(mindId, out var werewolfMind);
+
+ werewolfMind.UnlockedActions = werewolfComp.WerewolfActions.Select(id => (string)id).ToList(); // add the actions to the werewolf mind (polymorph shitcode)
+ _werewolf.SyncActions(target, werewolfComp);
+
+ // add store
+
+ var store = EnsureComp(target);
+ if (evolution)
+ {
+ foreach (var category in rule.StoreCategories)
+ store.Categories.Add(category);
+ }
+
+ if (apprentice)
+ store.Categories.Add(rule.StoreApprentice);
+
+ store.Categories.Add(rule.StoreSide); // maybe its better to make its own bool for it too? but if both evo & side is off, then its no point in adding a store at all
+ store.CurrencyWhitelist.Add(Currency);
+ store.Balance.Add(Currency, StartingCurrency);
+
+ rule.WerewolfMinds.Add(mindId);
+ _antag.SendBriefing(target, briefing, Color.Brown, BriefingSound);
+ return true;
+ }
+
+ private void OnInfectionFinished(ref WerewolfInfectionFinishedEvent ev)
+ {
+ var query = QueryActiveRules();
+ while (query.MoveNext(out _, out var rule, out _))
+ {
+ RemComp(ev.Entity);
+ EnsureComp(ev.Entity);
+ MakeWerewolf(ev.Entity, rule, false, true);
+
+ _effects.ApplyEffects(ev.Entity, [new NestedEffect { Proto = WerewolfSkills }], predicted: false); // :face_holding_back_tears:
+
+ return;
+ }
+ }
+
+ // todo OnTextPrepend
+}
diff --git a/Content.Inky.Shared/Content.Inky.Shared.csproj b/Content.Inky.Shared/Content.Inky.Shared.csproj
index 24af3e80b9f..f95273a5a42 100644
--- a/Content.Inky.Shared/Content.Inky.Shared.csproj
+++ b/Content.Inky.Shared/Content.Inky.Shared.csproj
@@ -8,7 +8,7 @@
-
+
diff --git a/Content.Inky.Shared/Werewolf/Components/WerewolfAbilitiesComponent.cs b/Content.Inky.Shared/Werewolf/Components/WerewolfAbilitiesComponent.cs
new file mode 100644
index 00000000000..7fe4d233629
--- /dev/null
+++ b/Content.Inky.Shared/Werewolf/Components/WerewolfAbilitiesComponent.cs
@@ -0,0 +1,49 @@
+using Content.Shared.Polymorph;
+using Robust.Shared.Audio;
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+
+namespace Content.Inky.Shared.Werewolf.Components;
+
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class WerewolfAbilitiesComponent : Component
+{
+ [DataField] public SoundSpecifier ShriekSound = new SoundPathSpecifier("/Audio/_Goobstation/Changeling/Effects/changeling_shriek.ogg"); // todo werewolf
+ [DataField] public SoundSpecifier DistantSound = new SoundPathSpecifier("/Audio/_Goobstation/Changeling/Effects/changeling_shriek.ogg"); // todo werewolf
+ [DataField] public SoundSpecifier RipSound = new SoundPathSpecifier("/Audio/Effects/gib1.ogg");
+
+ public readonly List WerewolfActions = new()
+ {
+ "ActionWerewolfTransfurm",
+ "ActionWerewolfOpenMutationStore",
+ "ActionWerewolfAbsorb",
+ "ActionWerewolfHowl"
+ };
+
+ [DataField, AutoNetworkedField]
+ public Dictionary ActionEntities = new();
+
+ [DataField, AutoNetworkedField]
+ public bool Transfurmed;
+
+ [DataField]
+ public bool StoreOpened = true; // todo werewolf ungoida it, tie it to the mind and not the body you chud i fucking hate you future me raagh
+ // fuck you piece of shit previous me, why the fuck are half of the shit broken
+ // fuck you both why the fuck did the ww use changeling rule?? why did you let that pass you fucking chud previous me - dr. autism APR 28 2026
+
+ [ViewVariables]
+ public ProtoId CurrentMutation;
+
+ ///
+ /// Amount of points given per devour action performed of a person
+ ///
+ [DataField]
+ public int AmountDevour = 2;
+
+ ///
+ /// Amount of points given per gut action performed
+ ///
+ [DataField]
+ public int AmountGut = 1;
+
+}
diff --git a/Content.Inky.Shared/Werewolf/Components/WerewolfActionComponent.cs b/Content.Inky.Shared/Werewolf/Components/WerewolfActionComponent.cs
new file mode 100644
index 00000000000..e3a09dab214
--- /dev/null
+++ b/Content.Inky.Shared/Werewolf/Components/WerewolfActionComponent.cs
@@ -0,0 +1,20 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Inky.Shared.Werewolf.Components;
+
+[RegisterComponent, NetworkedComponent]
+public sealed partial class WerewolfActionComponent : Component
+{
+
+ [DataField]
+ public float HungerCost = 30f;
+
+ [DataField]
+ public bool RequireTransfurmed = false;
+
+ [DataField]
+ public LocId NotTransfurmedPopup = "werewolf-action-fail-transfurmed";
+
+ [DataField]
+ public LocId NoHungerPopup = "werewolf-action-fail-hunger";
+}
diff --git a/Content.Inky.Shared/Werewolf/Components/WerewolfBequeathedComponent.cs b/Content.Inky.Shared/Werewolf/Components/WerewolfBequeathedComponent.cs
new file mode 100644
index 00000000000..69881258fc9
--- /dev/null
+++ b/Content.Inky.Shared/Werewolf/Components/WerewolfBequeathedComponent.cs
@@ -0,0 +1,14 @@
+using Content.Shared.Store;
+using Robust.Shared.Prototypes;
+
+namespace Content.Inky.Shared.Werewolf.Components;
+
+///
+/// On death, entity with this component will be force-mutated into a black wolf.
+///
+[RegisterComponent]
+public sealed partial class WerewolfBequeathedComponent : Component
+{
+ [DataField] public WerewolfMindComponent? OriginalLeader;
+ public readonly ProtoId Store = new("WerewolfBlack"); // goida
+}
diff --git a/Content.Inky.Shared/Werewolf/Components/WerewolfBitComponent.cs b/Content.Inky.Shared/Werewolf/Components/WerewolfBitComponent.cs
new file mode 100644
index 00000000000..d08f7f34d6d
--- /dev/null
+++ b/Content.Inky.Shared/Werewolf/Components/WerewolfBitComponent.cs
@@ -0,0 +1,27 @@
+namespace Content.Inky.Shared.Werewolf.Components;
+
+///
+/// Marks the person as bitten by a werewolf
+/// this is given when an entity is a target for the werewolfdevour & other path specific bitings
+///
+[RegisterComponent]
+public sealed partial class WerewolfBitComponent : Component // todo loc strings for popups?
+{
+ [DataField] public WerewolfMindComponent? BittenBy;
+
+ ///
+ /// If the entity is in the proccess of turning into a werewolf
+ ///
+ [DataField]
+ public bool Infected;
+
+ [ViewVariables]
+ public float Accumulator = 0f;
+
+ ///
+ /// After what time should the entity become a werewolf if bitten
+ ///
+ [ViewVariables(VVAccess.ReadWrite)]
+ [DataField]
+ public float LycTimer = 30f; // todo 600
+}
diff --git a/Content.Inky.Shared/Werewolf/Components/WerewolfInfectionImmuneComponent.cs b/Content.Inky.Shared/Werewolf/Components/WerewolfInfectionImmuneComponent.cs
new file mode 100644
index 00000000000..f73daa31b89
--- /dev/null
+++ b/Content.Inky.Shared/Werewolf/Components/WerewolfInfectionImmuneComponent.cs
@@ -0,0 +1,10 @@
+namespace Content.Inky.Shared.Werewolf.Components;
+
+///
+/// This is used for...
+///
+[RegisterComponent]
+public sealed partial class WerewolfInfectionImmuneComponent : Component
+{
+
+}
diff --git a/Content.Inky.Shared/Werewolf/Components/WerewolfMarkedComponent.cs b/Content.Inky.Shared/Werewolf/Components/WerewolfMarkedComponent.cs
new file mode 100644
index 00000000000..8dac045a843
--- /dev/null
+++ b/Content.Inky.Shared/Werewolf/Components/WerewolfMarkedComponent.cs
@@ -0,0 +1,11 @@
+namespace Content.Inky.Shared.Werewolf.Components;
+
+///
+/// Marks a werewolf that it is being hunted by another
+///
+[RegisterComponent]
+public sealed partial class WerewolfMarkedComponent : Component
+{
+ [DataField]
+ public EntityUid MarkedBy;
+}
diff --git a/Content.Inky.Shared/Werewolf/Components/WerewolfMindComponent.cs b/Content.Inky.Shared/Werewolf/Components/WerewolfMindComponent.cs
new file mode 100644
index 00000000000..f4d8f1516f2
--- /dev/null
+++ b/Content.Inky.Shared/Werewolf/Components/WerewolfMindComponent.cs
@@ -0,0 +1,79 @@
+namespace Content.Inky.Shared.Werewolf.Components;
+
+// fucking KILL YOURSELF!!!!
+[RegisterComponent]
+public sealed partial class WerewolfMindComponent : Component // todo werewolf debloat?
+{
+ [DataField]
+ public List BittenPeople = new(); // would be used in the manifest TODO WEREWOLF
+
+ ///
+ /// Used by the black wolf to show which entities were turned into werewolves by him.
+ /// Stores MIND ent uids, not body uids, bodies change on polymorph, minds dont.
+ ///
+ [DataField]
+ public List PackMembers = new();
+
+ ///
+ /// The ent currently being hunted by this werewolf
+ ///
+ [DataField]
+ public EntityUid? CurrentMarkedVictim;
+
+ ///
+ /// If true, this werewolf wouldnt be counted for marking by other wolves
+ ///
+ [DataField]
+ public bool MarkImmune; // also holy shit this is starting to look like a bloated comp
+
+ [DataField]
+ public List UnlockedActions = new();
+
+ [DataField]
+ public int Currency; // needed becasue polymorph & store shitcode
+
+ #region transform
+
+ ///
+ /// Transforms the werewolf automatically after the timer passes
+ ///
+ [DataField]
+ public float TransfurmCycle = 90; // todo werewolf 600
+
+ ///
+ /// After what time should the warning popup appear
+ ///
+ [DataField]
+ public float TransfurmWarnDelay = 60f;
+
+ ///
+ /// After what amount of time can the entity transfurm on command again
+ ///
+ [DataField]
+ public float TransfurmOnCommandDelay = 30f;
+
+ ///
+ /// Can you transfurm right now
+ ///
+ [DataField]
+ public bool TransfurmReady;
+
+ [DataField]
+ public bool BlockTransfurm;
+
+ [DataField]
+ public bool HasWarned; // to not spam shit
+
+ [ViewVariables]
+ public LocId TransfurmPopup = "werewolf-transfurm-warn";
+
+ [ViewVariables]
+ public LocId TransfurmReadyPopup = "werewolf-transfurm-ready";
+
+ [ViewVariables]
+ public float Accumulator = 0f;
+
+ [ViewVariables] // supriisngly used for marked guys
+ public float AccumulatorPopup = 0f;
+ #endregion
+}
diff --git a/Content.Inky.Shared/Werewolf/Components/WerewolfRoleComponent.cs b/Content.Inky.Shared/Werewolf/Components/WerewolfRoleComponent.cs
new file mode 100644
index 00000000000..64d428542b4
--- /dev/null
+++ b/Content.Inky.Shared/Werewolf/Components/WerewolfRoleComponent.cs
@@ -0,0 +1,4 @@
+namespace Content.Inky.Shared.Werewolf.Components;
+
+[RegisterComponent]
+public sealed partial class WerewolfRoleComponent : Component {}
diff --git a/Content.Inky.Shared/Werewolf/Components/WerewolfRuleComponent.cs b/Content.Inky.Shared/Werewolf/Components/WerewolfRuleComponent.cs
new file mode 100644
index 00000000000..73191ecb062
--- /dev/null
+++ b/Content.Inky.Shared/Werewolf/Components/WerewolfRuleComponent.cs
@@ -0,0 +1,21 @@
+using Content.Shared.Store;
+using Robust.Shared.Prototypes;
+
+namespace Content.Inky.Shared.Werewolf.Components;
+
+[RegisterComponent]
+public sealed partial class WerewolfRuleComponent : Component
+{
+ public readonly List WerewolfMinds = new();
+
+ public readonly List> StoreCategories = new()
+ {
+ "WerewolfChoose",
+ "WerewolfDire",
+ "WerewolfWhite",
+ "WerewolfBlack"
+ };
+
+ public readonly ProtoId StoreSide = new("WerewolfSide");
+ public readonly ProtoId StoreApprentice = new("WerewolfBlackApprentice"); // goida
+}
diff --git a/Content.Inky.Shared/Werewolf/EntityEffects/AmputateLimb.cs b/Content.Inky.Shared/Werewolf/EntityEffects/AmputateLimb.cs
new file mode 100644
index 00000000000..6afd698a71a
--- /dev/null
+++ b/Content.Inky.Shared/Werewolf/EntityEffects/AmputateLimb.cs
@@ -0,0 +1,56 @@
+using System.Linq;
+using Content.Medical.Shared.Wounds;
+using Content.Shared.Body;
+using Content.Shared.EntityEffects;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Random;
+
+namespace Content.Inky.Shared.Werewolf.EntityEffects;
+
+///
+/// Amputates a limb from an entity if it has one.
+///
+public sealed partial class AmputateLimb : EntityEffectBase
+{
+ [DataField(required: true)]
+ public string LimbName { get; set; } = string.Empty;
+
+ public override string? EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+ => null;
+}
+
+public sealed class AmputateLimbEffectSystem : EntityEffectSystem
+{
+ [Dependency] private readonly BodySystem _body = default!;
+ [Dependency] private readonly WoundSystem _wound = default!;
+ [Dependency] private readonly IRobustRandom _random = default!;
+
+ protected override void Effect(Entity ent, ref EntityEffectEvent args) // yes this is a copypaste from sharedwerewolfbasicabilitiessystem kill me todo werewolf
+ {
+ if (!TryComp(ent, out var body))
+ return;
+
+ var targetLimb = args.Effect.LimbName;
+
+ var allOrgans = _body.GetOrgans((ent, body));
+ var limbs = allOrgans
+ .Where(organ =>
+ {
+ var category = _body.GetCategory(new Entity(organ.Owner, organ.Comp));
+ return category == targetLimb;
+ })
+ .ToList();
+
+ if (limbs.Count <= 0)
+ return;
+
+ var pick = _random.Next(limbs.Count); // in case if someone has two or more of this bodypart, remove a random one
+ var picked = limbs[pick];
+
+ if (!TryComp(picked.Owner, out var wound)
+ || !wound.ParentWoundable.HasValue)
+ return;
+
+ _wound.AmputateWoundableSafely(wound.ParentWoundable.Value, picked.Owner, wound);
+ }
+}
diff --git a/Content.Inky.Shared/Werewolf/EntityEffects/ThrowDirection.cs b/Content.Inky.Shared/Werewolf/EntityEffects/ThrowDirection.cs
new file mode 100644
index 00000000000..195fff7c469
--- /dev/null
+++ b/Content.Inky.Shared/Werewolf/EntityEffects/ThrowDirection.cs
@@ -0,0 +1,51 @@
+using Content.Shared.EntityEffects;
+using Content.Shared.Movement.Pulling.Components;
+using Content.Shared.Movement.Pulling.Systems;
+using Content.Shared.Throwing;
+using Robust.Shared.Prototypes;
+
+namespace Content.Inky.Shared.Werewolf.EntityEffects;
+
+///
+/// Throws the target entity away related to the user into the oposite dirrection
+///
+public sealed partial class ThrowDirection : EntityEffectBase
+{
+ [DataField]
+ public float Speed = 10f;
+
+ [DataField]
+ public bool Predicted = true;
+
+ [DataField]
+ public bool StopPull = true;
+
+ public override string? EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+ => null;
+}
+
+public sealed class ThrowDirectionEffectSystem : EntityEffectSystem
+{
+ [Dependency] private readonly ThrowingSystem _JOHNCENA = default!;
+ [Dependency] private readonly PullingSystem _pulling = default!;
+
+ protected override void Effect(Entity ent, ref EntityEffectEvent args)
+ {
+ if (args.User is null)
+ return;
+
+ var userPos = Transform(args.User.Value).WorldPosition;
+ var victimPos = Transform(ent).WorldPosition;
+
+ var target = (victimPos - userPos).Normalized();
+
+ var effect = args.Effect;
+ _JOHNCENA.TryThrow(ent,
+ target,
+ baseThrowSpeed: effect.Speed,
+ user: args.User,
+ predicted: effect.Predicted);
+ if (effect.StopPull && TryComp(ent, out var pullable))
+ _pulling.TryStopPull(ent, pullable);
+ }
+}
diff --git a/Content.Inky.Shared/Werewolf/Systems/SharedWerewolfAbilitiesSystem.Black.cs b/Content.Inky.Shared/Werewolf/Systems/SharedWerewolfAbilitiesSystem.Black.cs
new file mode 100644
index 00000000000..eb5e94c1cf0
--- /dev/null
+++ b/Content.Inky.Shared/Werewolf/Systems/SharedWerewolfAbilitiesSystem.Black.cs
@@ -0,0 +1,168 @@
+using Content.Inky.Shared.Werewolf.Components;
+using Content.Shared.Body;
+using Content.Shared.DoAfter;
+using Content.Shared.Mind;
+using Content.Shared.Mobs;
+using Content.Shared.Mobs.Components;
+using Content.Shared.Popups;
+using Content.Shared.Store.Components;
+using Robust.Shared.Random;
+
+namespace Content.Inky.Shared.Werewolf.Systems;
+
+public sealed partial class SharedWerewolfAbilitiesSystem
+{
+ public void InitializeBlack()
+ {
+ SubscribeLocalEvent(TryBite);
+ SubscribeLocalEvent(DoBite);
+
+ SubscribeLocalEvent(OnBequeath);
+ SubscribeLocalEvent(OnLeaderDied);
+ }
+
+ private void TryBite(EntityUid uid, WerewolfAbilitiesComponent comp, EventWerewolfBlackBite args)
+ {
+ if (TryComp(args.Target, out var mobState) && mobState.CurrentState == MobState.Dead)
+ {
+ _popup.PopupEntity(Loc.GetString("werewolf-bite-fail-state"), uid, uid, PopupType.Large);
+ return;
+ }
+ if (TryComp(args.Target, out var bit))
+ {
+ _popup.PopupEntity(Loc.GetString("werewolf-bite-fail-bit"), uid, uid, PopupType.Large);
+ return;
+ }
+ if (TryComp(args.Target, out var immune)) // todo werewolf use for chaplain and holy stuff
+ {
+ _popup.PopupEntity(Loc.GetString("werewolf-bite-fail-immune"), uid, uid, PopupType.Large);
+ return;
+ }
+ if (HasComp(args.Target))
+ {
+ _popup.PopupPredicted(Loc.GetString("werewolf-devour-fail-werewolf"), uid, uid); // no to eating each other
+ return;
+ }
+
+ _popup.PopupEntity(Loc.GetString("werewolf-bite-start", ("user", uid), ("target", args.Target)), uid, uid, PopupType.LargeCaution); // todo locale
+
+ _doAfter.TryStartDoAfter(new DoAfterArgs(EntityManager, uid, TimeSpan.FromSeconds(1), new WerewolfBlackBiteDoAfterEvent(), uid, args.Target)
+ {
+ DistanceThreshold = 1.5f,
+ BreakOnDamage = true,
+ BreakOnMove = true,
+ BreakOnWeightlessMove = true,
+ AttemptFrequency = AttemptFrequency.StartAndEnd
+ });
+
+ args.Handled = true;
+ }
+
+ private void DoBite(EntityUid uid, WerewolfAbilitiesComponent comp, WerewolfBlackBiteDoAfterEvent args)
+ {
+ if (args.Cancelled || args.Target == null
+ || HasComp(args.Target)
+ || !TryComp(args.Target, out var body))
+ return;
+
+ SpillBloodPercentage(args.Target.Value, 30); // todo werewolf unhardcode
+ args.Handled = true;
+
+ var targetComp = EnsureComp(args.Target.Value);
+
+ if (!_mind.TryGetMind(uid, out var mindId, out _)
+ || !TryComp(mindId, out var mindComp))
+ return;
+
+ mindComp.Currency += comp.AmountDevour;
+ mindComp.BittenPeople.Add(args.Target.Value);
+ targetComp.BittenBy = mindComp;
+
+ targetComp.Infected = _gambling.Prob(0.5f); // todo werewolf unhardcode the 50% chance?
+
+ _audio.PlayPvs(comp.RipSound, uid);
+ }
+
+ private void OnBequeath(EntityUid uid, WerewolfAbilitiesComponent comp, EventWerewolfBequeath args)
+ {
+ if (!_mind.TryGetMind(uid, out var leadMind, out _)
+ || !TryComp(leadMind, out var leadMindComp))
+ return;
+
+ if (!_mind.TryGetMind(args.Target, out var targetMindId, out _))
+ return;
+
+ if (!leadMindComp.PackMembers.Contains(targetMindId))
+ {
+ _popup.PopupEntity(Loc.GetString("werewolf-bequeath-fail-not-pack"), uid, uid, PopupType.Large);
+ return;
+ }
+
+ var qthead = EnsureComp(targetMindId);
+ qthead.OriginalLeader = leadMindComp;
+
+ _popup.PopupEntity(Loc.GetString("werewolf-bequeath-success"), uid, uid, PopupType.Medium);
+ args.Handled = true;
+
+ RaiseLocalEvent(uid, new WerewolfActionRemoveEvent(args.Action)); // one time use FUCK THEM PROPER ECS INFRASTRUCTURE NO comp.OneTimeUse
+ }
+
+ private void OnLeaderDied(EntityUid uid, WerewolfAbilitiesComponent comp, MobStateChangedEvent args)
+ {
+ if (args.NewMobState != MobState.Dead)
+ return;
+
+ if (!_mind.TryGetMind(uid, out var leaderMindId, out _)
+ || !TryComp(leaderMindId, out var leaderMindComp))
+ return;
+
+ var eqe = EntityQueryEnumerator();
+ while (eqe.MoveNext(out var mindEnt, out var quComp))
+ {
+ if (quComp.OriginalLeader != leaderMindComp)
+ continue;
+
+ if (!TryComp(mindEnt, out var mindComponent)
+ || mindComponent.OwnedEntity is not { } quEnt)
+ continue;
+
+ if (!TryComp(quEnt, out var wComp))
+ continue;
+
+ wComp.CurrentMutation = "WerewolfTransformBlack";
+
+ var store = EnsureComp(quEnt);
+ store.Categories.Add(quComp.Store);
+
+ RemComp(mindEnt);
+
+ _popup.PopupEntity(Loc.GetString("werewolf-bequeath-triggered"), quEnt, quEnt, PopupType.LargeCaution);
+ }
+ }
+
+ #region infection
+ public void UpdateBlack(float frameTime) // not frametime but who carews
+ {
+ var query = EntityQueryEnumerator();
+ while (query.MoveNext(out var uid, out var bit))
+ {
+ if (!bit.Infected)
+ continue;
+
+ bit.Accumulator += frameTime;
+
+ if (bit.Accumulator < bit.LycTimer)
+ continue;
+
+ RemComp(uid);
+
+ if (bit.BittenBy != null && _mind.TryGetMind(uid, out var mind, out _))
+ bit.BittenBy.PackMembers.Add(mind);
+
+ var ev = new WerewolfInfectionFinishedEvent(uid);
+ RaiseLocalEvent(ref ev);
+ }
+ }
+
+ #endregion
+}
diff --git a/Content.Inky.Shared/Werewolf/Systems/SharedWerewolfAbilitiesSystem.Dire.cs b/Content.Inky.Shared/Werewolf/Systems/SharedWerewolfAbilitiesSystem.Dire.cs
new file mode 100644
index 00000000000..2696d60c550
--- /dev/null
+++ b/Content.Inky.Shared/Werewolf/Systems/SharedWerewolfAbilitiesSystem.Dire.cs
@@ -0,0 +1,66 @@
+using Content.Inky.Shared.Werewolf.Components;
+using Content.Shared.Body.Components;
+using Content.Shared.DoAfter;
+using Content.Shared.FixedPoint;
+using Content.Shared.Mobs;
+using Content.Shared.Mobs.Components;
+using Content.Shared.Popups;
+
+namespace Content.Inky.Shared.Werewolf.Systems;
+
+public partial class SharedWerewolfAbilitiesSystem
+{
+ public void InitializeDire()
+ {
+ SubscribeLocalEvent(TryBite);
+ SubscribeLocalEvent(DoBite);
+ }
+
+ private void TryBite(EntityUid uid, WerewolfAbilitiesComponent component, EventWerewolfBleedingBite args)
+ {
+ if (TryComp(args.Target, out var mobState) && mobState.CurrentState == MobState.Dead) // to prevent wolves from biting corpses for heals and whatnot
+ {
+ _popup.PopupEntity(Loc.GetString("werewolf-bite-fail-state"), uid, uid, PopupType.Large);
+ return;
+ }
+ // also intentionally no check for WerewolfAbilitiesComponent so you can actually fight other werewolf for health and shit
+
+ _popup.PopupEntity(Loc.GetString("werewolf-bite-start", ("user", uid), ("target", args.Target)), uid, uid, PopupType.LargeCaution); // todo locale
+
+ _doAfter.TryStartDoAfter(new DoAfterArgs(EntityManager, uid, TimeSpan.FromSeconds(1), new WerewolfBleedingBiteDoAfterEvent(), uid, args.Target)
+ {
+ DistanceThreshold = 1.5f,
+ BreakOnDamage = true,
+ BreakOnMove = true,
+ BreakOnWeightlessMove = true,
+ AttemptFrequency = AttemptFrequency.StartAndEnd
+ });
+
+ args.Handled = true;
+ }
+
+ private void DoBite(EntityUid uid, WerewolfAbilitiesComponent comp, WerewolfBleedingBiteDoAfterEvent args)
+ {
+ if (args.Cancelled || args.Target == null)
+ return;
+
+ SpillBloodPercentage(args.Target.Value, 30); // todo werewolf unhardcode
+ TryRegen(uid, comp, new EventWerewolfRegen()); // goida
+
+ args.Handled = true;
+ }
+
+ private void SpillBloodPercentage(EntityUid uid, int percentage) // if you make the number be negative or above 100 i will be very sad.
+ {
+ if (!TryComp(uid, out var stream))
+ return;
+
+ if (!_solution.ResolveSolution(uid, stream.BloodSolutionName, ref stream.BloodSolution, out var solution))
+ return;
+
+ var blood = _solution.SplitSolution(stream.BloodSolution.Value, solution.Volume * (percentage / 100f));
+
+ if (blood.Volume > FixedPoint2.Zero)
+ _puddle.TrySpillAt(uid, blood, out _);
+ }
+}
diff --git a/Content.Inky.Shared/Werewolf/Systems/SharedWerewolfAbilitiesSystem.White.cs b/Content.Inky.Shared/Werewolf/Systems/SharedWerewolfAbilitiesSystem.White.cs
new file mode 100644
index 00000000000..a50ab1bf4e0
--- /dev/null
+++ b/Content.Inky.Shared/Werewolf/Systems/SharedWerewolfAbilitiesSystem.White.cs
@@ -0,0 +1,228 @@
+using System.Linq;
+using System.Numerics;
+using Content.Inky.Shared.Werewolf.Components;
+using Content.Shared.Localizations;
+using Content.Shared.Mind.Components;
+using Content.Shared.Mobs;
+using Content.Shared.Mobs.Components;
+using Content.Shared.Popups;
+using Content.Trauma.Common.CollectiveMind;
+
+namespace Content.Inky.Shared.Werewolf.Systems;
+
+public sealed partial class SharedWerewolfAbilitiesSystem
+{
+ private const float MarkNotificationInterval = 15f; // in seconds todo werewolf unhardcode?
+ public void InitializeWhite()
+ {
+ SubscribeLocalEvent(TryTransfurmWhite);
+ SubscribeLocalEvent(OnPosQuery);
+ SubscribeLocalEvent(OnCollectiveMindBuy);
+ SubscribeLocalEvent(OnRevelation);
+ }
+
+ private void TryTransfurmWhite(EntityUid uid, WerewolfAbilitiesComponent comp, TransfurmWhiteEvent args)
+ {
+ if (!_mind.TryGetMind(uid, out var mindId, out _)
+ || !TryComp(mindId, out var mindComp))
+ return;
+
+ if (mindComp.Accumulator < mindComp.TransfurmOnCommandDelay)
+ {
+ args.Handled = true;
+ return;
+ }
+
+ var victimMindUid = Calc(uid, comp, args);
+
+ RaiseLocalEvent(uid, new TransfurmEvent());
+
+ if (mindComp.CurrentMarkedVictim != null)
+ {
+ var oldVictimEntity = GetMindShit(mindComp.CurrentMarkedVictim.Value);
+ if (oldVictimEntity != null)
+ RemComp(oldVictimEntity.Value);
+ mindComp.CurrentMarkedVictim = null;
+ }
+
+ if (victimMindUid != null)
+ mindComp.CurrentMarkedVictim = victimMindUid;
+
+ args.Handled = true;
+ }
+
+ private void OnPosQuery(EntityUid uid, WerewolfAbilitiesComponent comp, WerewolfPositionQueryEvent args)
+ {
+ var pos = Transform(uid).MapPosition;
+ args.Positions[uid] = pos.Position;
+ }
+
+ ///
+ /// Calculates the closest werewolf to the hunter wolf (the mind)
+ ///
+ private EntityUid? Calc(EntityUid uid, WerewolfAbilitiesComponent comp, TransfurmWhiteEvent args)
+ {
+ var entMapCoords = _transform.GetMapCoordinates(uid);
+ EntityUid? closestUid = null;
+ EntityUid? closestMindId = null;
+ var minDistanceSq = args.Radius * args.Radius;
+
+ if (_mind.TryGetMind(uid, out var initMind, out _) && TryComp(initMind, out var initMindComp))
+ initMindComp.MarkImmune = true; // :trol:
+
+ var eqe = EntityQueryEnumerator();
+ while (eqe.MoveNext(out var otherUid, out var mindContainer))
+ {
+ if (mindContainer.Mind is not { } mind
+ || !TryComp(mind, out var otherMind))
+ continue;
+
+ if (otherUid == uid || otherMind.MarkImmune)
+ continue;
+
+ var otherMapCoords = _transform.GetMapCoordinates(otherUid);
+
+ if (otherMapCoords.MapId != entMapCoords.MapId)
+ continue;
+
+ var distSq = Vector2.DistanceSquared(entMapCoords.Position, otherMapCoords.Position);
+ if (distSq < minDistanceSq)
+ {
+ minDistanceSq = distSq;
+ closestUid = otherUid;
+ closestMindId = mind; // fuck!
+ }
+ }
+
+ if (closestUid == null)
+ return null;
+
+ var mark = EnsureComp(closestUid.Value);
+ mark.MarkedBy = uid;
+
+ _popup.PopupEntity(Loc.GetString("werewolf-marked-popup"),
+ closestUid.Value,
+ closestUid.Value,
+ PopupType.LargeCaution);
+
+ return closestMindId;
+ }
+
+ public void UpdateMark(float frameTime) // its not frameTime but who cares lmao
+ {
+ var eqe = EntityQueryEnumerator();
+ while (eqe.MoveNext(out var uid, out var comp))
+ {
+ if (!_mind.TryGetMind(uid, out var mindId, out _)
+ || !TryComp(mindId, out var mindComp))
+ continue;
+ // partially copied from heretic living heart todo werewolf replace with the vampire thingy when thats around bcuz this right here is a horrible piece of crap
+ if (mindComp.CurrentMarkedVictim == null)
+ continue;
+
+ var victimEnt = GetMindShit(mindComp.CurrentMarkedVictim.Value);
+ if (victimEnt == null)
+ {
+ mindComp.CurrentMarkedVictim = null;
+ continue;
+ }
+
+ var victim = victimEnt.Value;
+
+ if (TryComp(uid, out var hunterState) && hunterState.CurrentState == MobState.Dead)
+ {
+ if (TryComp(victim, out _))
+ RemComp(victim);
+ mindComp.CurrentMarkedVictim = null;
+ continue;
+ }
+ if (TryComp(victim, out var victimState) && victimState.CurrentState == MobState.Dead)
+ {
+ RemComp(victim);
+ mindComp.CurrentMarkedVictim = null;
+ continue;
+ }
+
+ mindComp.AccumulatorPopup -= frameTime;
+ if (mindComp.AccumulatorPopup > 0)
+ continue;
+
+ if (victimState == null)
+ return;
+ if (mindComp.AccumulatorPopup <= 0)
+ {
+ mindComp.AccumulatorPopup = MarkNotificationInterval;
+ string loc;
+
+ var state = victimState.CurrentState;
+ var locstate = state.ToString().ToLower();
+
+ var ourMapCoords = _transform.GetMapCoordinates(uid);
+ var targetMapCoords = _transform.GetMapCoordinates(victim);
+
+ if (_map.IsPaused(targetMapCoords.MapId))
+ loc = Loc.GetString("heretic-livingheart-unknown"); // todo werewolf
+ else if (targetMapCoords.MapId != ourMapCoords.MapId)
+ loc = Loc.GetString("heretic-livingheart-faraway", ("state", locstate));
+ else
+ {
+ var targetStation = _station.GetOwningStation(victim);
+ var ownStation = _station.GetOwningStation(uid);
+
+ var isOnStation = targetStation != null && targetStation == ownStation;
+
+ var ang = Angle.Zero;
+ if (_mapMan.TryFindGridAt(_transform.GetMapCoordinates(Transform(uid)), out var grid, out var _))
+ ang = Transform(grid).LocalRotation;
+
+ var vector = targetMapCoords.Position - ourMapCoords.Position;
+ var direction = (vector.ToWorldAngle() - ang).GetDir();
+
+ var locdir = ContentLocalizationManager.FormatDirection(direction).ToLower();
+
+ loc = Loc.GetString(isOnStation ? "heretic-livingheart-onstation" : "heretic-livingheart-offstation",
+ ("state", locstate),
+ ("direction", locdir));
+ }
+
+ _popup.PopupEntity(loc, uid, uid, PopupType.Medium);
+ }
+ }
+ }
+
+ private void OnCollectiveMindBuy(EntityUid uid,
+ WerewolfAbilitiesComponent comp,
+ WerewolfAddCollectivemind args)
+ {
+ EnsureComp(uid, out var m);
+ m.Channels.Add(args.NewChannel);
+ if (args.Popup != null)
+ _popup.PopupEntity(Loc.GetString(args.Popup), uid, uid, PopupType.Medium);
+ }
+
+ private void OnRevelation(EntityUid uid,
+ WerewolfAbilitiesComponent comp,
+ WerewolfRevelationEvent args)
+ {
+ if (!_mind.TryGetMind(uid, out var mindId, out _)
+ || !TryComp(mindId, out var mindComp))
+ return;
+
+ RaiseLocalEvent(uid, new TransfurmWhiteEvent());
+ mindComp.BlockTransfurm = true;
+ }
+
+
+ private EntityUid? GetMindShit(EntityUid targetMind)
+ {
+ var eqe = EntityQueryEnumerator();
+ while (eqe.MoveNext(out var entityUid, out var mindContainer))
+ {
+ if (mindContainer.Mind == targetMind)
+ return entityUid;
+ }
+ return null;
+ }
+
+
+}
diff --git a/Content.Inky.Shared/Werewolf/Systems/SharedWerewolfAbilitiesSystem.cs b/Content.Inky.Shared/Werewolf/Systems/SharedWerewolfAbilitiesSystem.cs
new file mode 100644
index 00000000000..d3c88bb0eeb
--- /dev/null
+++ b/Content.Inky.Shared/Werewolf/Systems/SharedWerewolfAbilitiesSystem.cs
@@ -0,0 +1,330 @@
+using System.Numerics;
+using Content.Inky.Shared.Werewolf.Components;
+using Content.Medical.Shared.Wounds;
+using Content.Shared.Actions;
+using Content.Shared.Body;
+using Content.Shared.Body.Systems;
+using Content.Shared.Camera;
+using Content.Shared.Chat;
+using Content.Shared.Chemistry.Components;
+using Content.Shared.Chemistry.EntitySystems;
+using Content.Shared.Damage.Systems;
+using Content.Shared.DoAfter;
+using Content.Shared.FixedPoint;
+using Content.Shared.Fluids;
+using Content.Shared.Mind;
+using Content.Shared.Nutrition.EntitySystems;
+using Content.Shared.Pinpointer;
+using Content.Shared.Popups;
+using Content.Shared.Station;
+using Content.Shared.Stunnable;
+using Content.Shared.Tag;
+using Content.Shared.Throwing;
+using Robust.Shared.Audio.Systems;
+using Robust.Shared.Containers;
+using Robust.Shared.Map;
+using Robust.Shared.Player;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Random;
+
+namespace Content.Inky.Shared.Werewolf.Systems;
+
+public sealed partial class SharedWerewolfAbilitiesSystem : EntitySystem
+{
+ [Dependency] private SharedAudioSystem _audio = default!;
+ [Dependency] private SharedMindSystem _mind = default!;
+ [Dependency] private ISharedPlayerManager _player = default!;
+ [Dependency] private SharedCameraRecoilSystem _recoil = default!;
+ [Dependency] private SharedActionsSystem _actions = default!;
+ [Dependency] private EntityLookupSystem _entityLookup = default!;
+ [Dependency] private SharedStunSystem _stun = default!;
+ [Dependency] private SharedPopupSystem _popup = default!;
+ [Dependency] private TagSystem _tag = default!;
+
+ [Dependency] private ThrownItemSystem _throwingItem = default!;
+ [Dependency] private ThrowingSystem _throwing = default!;
+ [Dependency] private SharedContainerSystem _container = default!;
+ [Dependency] private SharedDoAfterSystem _doAfter = default!;
+ [Dependency] private SharedSolutionContainerSystem _solution = default!;
+ [Dependency] private SharedPuddleSystem _puddle = default!;
+ [Dependency] private SharedTransformSystem _transform = default!;
+ [Dependency] private SharedStationSystem _station = default!;
+ [Dependency] private IMapManager _mapMan = default!;
+ [Dependency] private SharedMapSystem _map = default!;
+ [Dependency] private IRobustRandom _gambling = default!;
+
+ private float _updateTimer = 0f;
+ /*
+ * transfurmevent triggers polymorph shitcode that alters WerewolfAbilitiesComponent
+ * which makes the eqe shit itself and crash the server
+ * so we are collecting ents that need to transform to proccess them after
+ */
+ private List _transfurmQueue = new();
+
+ public override void Initialize()
+ {
+ SubscribeLocalEvent(DoHowl);
+ SubscribeLocalEvent(OnStartup);
+ SubscribeLocalEvent(OnUpgradeAbility);
+
+ SubscribeLocalEvent(OnAmbush);
+ SubscribeLocalEvent(OnHit);
+
+ SubscribeLocalEvent(TryRegen);
+ SubscribeLocalEvent(WerewolfActionRemoveEvent);
+
+ InitializeDire();
+ InitializeWhite();
+ InitializeBlack();
+ }
+
+ public override void Update(float frameTime)
+ {
+ base.Update(frameTime);
+ _updateTimer += frameTime;
+ if (_updateTimer < 0.5f)
+ return;
+
+ var timePassed = _updateTimer;
+ _updateTimer = 0f;
+
+ _transfurmQueue.Clear();
+
+ var eqe = EntityQueryEnumerator();
+ while (eqe.MoveNext(out var uid, out var comp))
+ {
+ if (!_mind.TryGetMind(uid, out var mindId, out _)
+ || !TryComp(mindId, out var mindComp)
+ || mindComp.BlockTransfurm)
+ continue;
+
+ mindComp.Accumulator += timePassed;
+
+ if (mindComp.Accumulator >= mindComp.TransfurmWarnDelay && !mindComp.HasWarned)
+ {
+ _popup.PopupEntity(Loc.GetString(mindComp.TransfurmPopup), uid, uid, PopupType.LargeCaution);
+ mindComp.HasWarned = true;
+ }
+
+ if (mindComp.Accumulator >= mindComp.TransfurmOnCommandDelay && !mindComp.TransfurmReady)
+ {
+ _popup.PopupEntity(Loc.GetString(mindComp.TransfurmReadyPopup), uid, uid, PopupType.Medium);
+ mindComp.TransfurmReady = true;
+ }
+
+ if (mindComp.Accumulator >= mindComp.TransfurmCycle)
+ {
+ mindComp.TransfurmReady = false;
+ mindComp.HasWarned = false;
+ _transfurmQueue.Add(uid);
+ }
+ }
+
+ foreach (var uid in _transfurmQueue)
+ RaiseLocalEvent(uid, new TransfurmEvent());
+
+ UpdateMark(timePassed);
+ UpdateBlack(timePassed); // if there would ever be an infection cure for this, use same shit as _transfurmQueue because it'll probably make eqe shit itself too
+ }
+
+ private const string DogTag = "VulpEmotes";
+ public void OnStartup(EntityUid uid, WerewolfAbilitiesComponent comp, ref ComponentStartup args)
+ {
+ if (_tag.HasTag(uid, DogTag))
+ {
+ comp.CurrentMutation = "WerewolfTransformWerehuman"; // TODO WEREWOLF unshit CurrentMutation to not use fucking string??? are you fucking retarded?????
+ return;
+ }
+ comp.CurrentMutation = "WerewolfTransformBasic"; // goida
+ }
+
+ # region action handlers
+ private void DoHowl(EntityUid uid, WerewolfAbilitiesComponent comp, ref HowlEvent args) //kill me for copying changeling system please
+ {
+ _audio.PlayPredicted(comp.ShriekSound, uid, uid);
+
+ var center = Transform(uid).MapPosition;
+ var gamers = Filter.Empty();
+ gamers.AddInRange(center, args.ShriekPower, _player, EntityManager);
+
+ foreach (var gamer in gamers.Recipients)
+ {
+ if (gamer.AttachedEntity == null)
+ continue;
+
+ var pos = Transform(gamer.AttachedEntity!.Value).WorldPosition;
+ var delta = center.Position - pos;
+
+ if (delta.EqualsApprox(Vector2.Zero))
+ delta = new(.01f, 0);
+
+ _recoil.KickCamera(uid, -delta.Normalized());
+ foreach (var entity in _entityLookup.GetEntitiesInRange(uid, args.ShriekPower))
+ {
+ _stun.TryUpdateStunDuration(entity, TimeSpan.FromSeconds(args.StunDuration));
+ _stun.TryKnockdown(entity, TimeSpan.FromSeconds(args.StunDuration), true);
+ }
+ }
+
+ if (args.ForceTransfurm || args.HealNearby)
+ {
+ List? pack = null;
+ if (args.PackOnly)
+ {
+ if (!_mind.TryGetMind(uid, out var mindId, out _)
+ || !TryComp(mindId, out var mindComp))
+ return;
+
+ pack = mindComp.PackMembers;
+ }
+
+ foreach (var wolf in _entityLookup.GetEntitiesInRange(uid, args.ShriekPower))
+ {
+ if (!HasComp(wolf))
+ continue;
+
+ if (pack != null)
+ {
+ if (!_mind.TryGetMind(wolf, out var mind, out _)
+ || !pack.Contains(mind))
+ continue;
+ }
+
+ if (args.ForceTransfurm)
+ RaiseLocalEvent(wolf, new TransfurmEvent(true));
+
+ if (args.HealNearby)
+ RaiseLocalEvent(wolf, new EventWerewolfRegen());
+ }
+ }
+ // _audio.PlayGlobal(comp.DistantSound, uid); // when you howl, everyone on the station hears a quiet distant howl, which breaks the metashield for the chaplain, "allegedly" todo uncomment when better sound is found
+ args.Handled = true;
+ }
+ private void OnAmbush(EntityUid uid, WerewolfAbilitiesComponent comp, WerewolfAmbushActionEvent args) // partially taken from xenos jump
+ {
+ if (args.Handled
+ || _container.IsEntityInContainer(uid))
+ return;
+
+ _throwing.TryThrow(uid, args.Target, args.JumpSpeed, uid, 10F);
+ // todo PlayPVS
+ args.Handled = true;
+ }
+
+ private void OnHit(EntityUid uid, WerewolfAbilitiesComponent comp, ThrowDoHitEvent args)
+ {
+ // if (args.Handled)
+ // return;
+
+ _throwingItem.StopThrow(uid, args.Component);
+
+ if (Transform(args.Target).Anchored)
+ _stun.TryUpdateParalyzeDuration(uid, TimeSpan.FromSeconds(1));
+ else
+ _stun.TryKnockdown(args.Target, TimeSpan.FromSeconds(1), true);
+
+ // args.Handled = true;
+ }
+ #endregion
+
+ #region store related shit
+ ///
+ /// Deletes and replaces the args.OldActionId with the args.NewActionId, also adding it to the mind
+ ///
+ private void OnUpgradeAbility(EntityUid uid, WerewolfAbilitiesComponent comp, EventWerewolfUpgradeAbility args)
+ {
+ if (!_mind.TryGetMind(uid, out var mindId, out _)
+ || !TryComp(mindId, out var mindComp))
+ return;
+
+ // update the mind to have those new actions
+ if (args.OldActionId != null)
+ mindComp.UnlockedActions.Remove(args.OldActionId);
+ if (!mindComp.UnlockedActions.Contains(args.NewActionId))
+ mindComp.UnlockedActions.Add(args.NewActionId);
+
+ SyncActions(uid, comp);
+
+ _popup.PopupEntity(Loc.GetString("werewolf-ability-upgraded"), uid, uid);
+ args.Handled = true;
+ }
+
+ // used for polymorph ent recieving actions from the mind
+ public void SyncActions(EntityUid uid, WerewolfAbilitiesComponent comp) // todo the SERVER gives out an error when you polymorph, tries to remove shit that isnt there, fix before merg Attempted to remove an action Howl (9413/n9413, ActionWerewolfHowl) from an entity that it was never attached to: wolf
+ {
+ // foreach (var actionEnt in comp.ActionEntities.Values)
+ // if (TryComp(actionEnt, out var actComp) && actComp.AttachedEntity == uid) // dont remove stuff from the wolf if it doesnt exist
+ // _actions.RemoveAction(uid, actionEnt);
+ foreach (var actionEnt in comp.ActionEntities.Values)
+ _actions.RemoveAction(uid, actionEnt);
+ comp.ActionEntities.Clear();
+
+ // if the mind has unlocked actions, use those
+ if (_mind.TryGetMind(uid, out var mindId, out _) && TryComp(mindId, out var mindComp))
+ {
+ foreach (var actionId in mindComp.UnlockedActions)
+ {
+ var actionEnt = _actions.AddAction(uid, actionId);
+ if (actionEnt != null)
+ comp.ActionEntities[actionId] = actionEnt.Value;
+ }
+ }
+ else
+ {// if for some reason not, use starting actions
+ foreach (var actionId in comp.WerewolfActions)
+ {
+ var actionEnt = _actions.AddAction(uid, actionId);
+ if (actionEnt != null)
+ comp.ActionEntities[actionId] = actionEnt.Value;
+ }
+ }
+ }
+
+ private void WerewolfActionRemoveEvent(EntityUid uid, WerewolfAbilitiesComponent comp, WerewolfActionRemoveEvent args)
+ {
+ string? protoId = null;
+ foreach (var (id, ent) in comp.ActionEntities)
+ {
+ if (ent != args.ActionEnt)
+ continue;
+ protoId = id;
+ break;
+ }
+
+ if (protoId == null)
+ return;
+
+ if (_mind.TryGetMind(uid, out var mindId, out _)
+ && TryComp(mindId, out var mindComp))
+ mindComp.UnlockedActions.Remove(protoId);
+
+ SyncActions(uid, comp);
+ }
+ #endregion
+
+
+ public bool TryInjectReagents(EntityUid uid, Dictionary reagents)
+ {
+ var solution = new Solution();
+ foreach (var (reagentId, quantity) in reagents)
+ solution.AddReagent(reagentId, quantity);
+
+ if (!_solution.TryGetInjectableSolution(uid, out var targetSolution, out _))
+ return false;
+
+ return _solution.TryAddSolution(targetSolution.Value, solution);
+ }
+
+ private void TryRegen(EntityUid uid, WerewolfAbilitiesComponent comp, EventWerewolfRegen args)
+ {
+ var reagents = new Dictionary // i hate fixedpoint bru // todo werewolf unhardcode, put into a comp idk
+ {
+ ["Ichor"] = FixedPoint2.New(10),
+ ["TranexamicAcid"] = FixedPoint2.New(5)
+ };
+
+ if (TryInjectReagents(uid, reagents))
+ _popup.PopupPredicted(Loc.GetString("werewolf-action-regen-success"), uid, uid);
+ args.Handled = true;
+ }
+}
diff --git a/Content.Inky.Shared/Werewolf/Systems/SharedWerewolfActionSystem.cs b/Content.Inky.Shared/Werewolf/Systems/SharedWerewolfActionSystem.cs
new file mode 100644
index 00000000000..6866a2d2c3a
--- /dev/null
+++ b/Content.Inky.Shared/Werewolf/Systems/SharedWerewolfActionSystem.cs
@@ -0,0 +1,54 @@
+using Content.Inky.Shared.Werewolf.Components;
+using Content.Shared.Actions.Events;
+using Content.Shared.Nutrition.Components;
+using Content.Shared.Nutrition.EntitySystems;
+using Content.Shared.Popups;
+
+namespace Content.Inky.Shared.Werewolf.Systems;
+
+public sealed class SharedWerewolfActionSystem : EntitySystem
+{
+ [Dependency] private readonly SharedPopupSystem _popup = default!;
+ [Dependency] private readonly HungerSystem _hunger = default!;
+
+ public override void Initialize()
+ {
+ base.Initialize();
+
+ SubscribeLocalEvent(OnActionAttempt);
+ }
+
+ private void OnActionAttempt(Entity ent, ref ActionAttemptEvent args)
+ {
+ if (args.Cancelled)
+ return;
+
+ var user = args.User;
+ var comp = ent.Comp;
+
+ if (comp.RequireTransfurmed)
+ {
+ if (!TryComp(user, out var wolf) || !wolf.Transfurmed)
+ {
+ _popup.PopupClient(Loc.GetString(comp.NotTransfurmedPopup), user, user);
+ args.Cancelled = true;
+ return;
+ }
+ }
+
+ if (comp.HungerCost > 0)
+ {
+ if (!TryComp(user, out var hunger))
+ return;
+
+ if (_hunger.GetHunger(hunger) < comp.HungerCost)
+ {
+ _popup.PopupClient(Loc.GetString(comp.NoHungerPopup), user, user);
+ args.Cancelled = true;
+ return;
+ }
+ }
+
+ _hunger.ModifyHunger(user, -comp.HungerCost);
+ }
+}
diff --git a/Content.Inky.Shared/Werewolf/WerewolfEvents.cs b/Content.Inky.Shared/Werewolf/WerewolfEvents.cs
new file mode 100644
index 00000000000..3aff4ad7954
--- /dev/null
+++ b/Content.Inky.Shared/Werewolf/WerewolfEvents.cs
@@ -0,0 +1,112 @@
+using System.Numerics;
+using Content.Shared.Actions;
+using Content.Shared.DoAfter;
+using Robust.Shared.Serialization;
+
+namespace Content.Inky.Shared.Werewolf;
+
+public sealed partial class HowlEvent : InstantActionEvent
+{
+ [DataField] public float ShriekPower = 2.5f;
+ [DataField] public int StunDuration = 1;
+
+ ///
+ /// Transforms every werewolf in radius if true
+ ///
+ [DataField] public bool ForceTransfurm; // fucking goida bro
+ ///
+ /// Raises EventWerewolfRegen on every werewolf in radius if true
+ ///
+ [DataField] public bool HealNearby;
+
+ ///
+ /// whether or not should healing & transforms work only on your pack
+ ///
+ [DataField] public bool PackOnly = true;
+}
+
+public sealed partial class TransfurmEvent : InstantActionEvent
+{
+ [DataField] public bool Forced;
+
+ public TransfurmEvent() {}
+ public TransfurmEvent(bool forced)
+ {
+ Forced = forced;
+ }
+}
+
+public sealed partial class TransfurmWhiteEvent : InstantActionEvent
+{
+ ///
+ /// Searching radius, when any one werewolf but the entity is in that radius, they will be marked
+ ///
+ [DataField] public float Radius = 50f;
+}
+public sealed partial class EventWerewolfOpenStore : InstantActionEvent {}
+public sealed partial class EventWerewolfDevour : EntityTargetActionEvent {}
+public sealed partial class EventWerewolfGut : EntityTargetActionEvent {}
+public sealed partial class EventWerewolfBleedingBite : EntityTargetActionEvent {}
+public sealed partial class EventWerewolfBlackBite : EntityTargetActionEvent {}
+public sealed partial class EventWerewolfChangeType : InstantActionEvent
+{
+ [DataField] public string WerewolfType;
+}
+
+public sealed partial class EventWerewolfRegen : InstantActionEvent {}
+
+public sealed partial class WerewolfAmbushActionEvent : WorldTargetActionEvent
+{
+ [DataField]
+ public float JumpSpeed = 15f;
+}
+
+[Serializable, NetSerializable]
+public sealed partial class WerewolfDevourDoAfterEvent : SimpleDoAfterEvent { }
+
+[Serializable, NetSerializable]
+public sealed partial class WerewolfGutDoAfterEvent : SimpleDoAfterEvent { }
+[Serializable, NetSerializable]
+public sealed partial class WerewolfBleedingBiteDoAfterEvent : SimpleDoAfterEvent { }
+[Serializable, NetSerializable]
+public sealed partial class WerewolfBlackBiteDoAfterEvent : SimpleDoAfterEvent { }
+
+// upgrade events idk
+// event raised when any werewolf ability is upgraded
+// yes this is horrible and probably would be better to replace this with ProductUpgradeId but its kinda shit
+public sealed partial class EventWerewolfUpgradeAbility : InstantActionEvent
+{
+ ///
+ /// The prototype ID of the action to be replaced
+ ///
+ [DataField]
+ public string? OldActionId;
+
+ ///
+ /// The prototype ID of the new upgraded action
+ ///
+ [DataField]
+ public string NewActionId;
+}
+
+public sealed class WerewolfPositionQueryEvent : EntityEventArgs
+{
+ public Dictionary Positions { get; } = new();
+}
+
+public sealed partial class WerewolfAddCollectivemind : InstantActionEvent
+{
+ [DataField] public string NewChannel = "LunarMind";
+ [DataField] public string? Popup;
+}
+
+public sealed partial class WerewolfRevelationEvent : InstantActionEvent;
+[ByRefEvent]
+public readonly record struct WerewolfInfectionFinishedEvent(EntityUid Entity);
+public sealed partial class WerewolfBeckonEvent : InstantActionEvent;
+public sealed partial class EventWerewolfBequeath : EntityTargetActionEvent {}
+public sealed class WerewolfActionRemoveEvent : EntityEventArgs
+{
+ public readonly EntityUid ActionEnt;
+ public WerewolfActionRemoveEvent(EntityUid actionEnt) => ActionEnt = actionEnt;
+}
diff --git a/Content.Shared/Movement/Components/CursorOffsetRequiresWieldComponent.Trauma.cs b/Content.Shared/Movement/Components/CursorOffsetRequiresWieldComponent.Trauma.cs
index c9be9f78e05..ad376c1b82a 100644
--- a/Content.Shared/Movement/Components/CursorOffsetRequiresWieldComponent.Trauma.cs
+++ b/Content.Shared/Movement/Components/CursorOffsetRequiresWieldComponent.Trauma.cs
@@ -6,5 +6,5 @@ public sealed partial class CursorOffsetRequiresWieldComponent
/// Multiplies your viewcone angle by this number when wielded.
///
[DataField]
- public float ViewAngleMultiplier = 0.3f;
+ public float ViewAngleMultiplier = 1f; // inky edit
}
diff --git a/Content.Shared/PDA/PdaComponent.cs b/Content.Shared/PDA/PdaComponent.cs
index 8f0f91df1eb..63da8fa0a4c 100644
--- a/Content.Shared/PDA/PdaComponent.cs
+++ b/Content.Shared/PDA/PdaComponent.cs
@@ -38,4 +38,4 @@ public sealed partial class PdaComponent : Component
[ViewVariables] public string? StationAlertLevel;
[ViewVariables] public Color StationAlertColor = Color.White;
}
-}
+}
\ No newline at end of file
diff --git a/Content.Shared/PDA/PdaVisuals.cs b/Content.Shared/PDA/PdaVisuals.cs
index e3daa8e575e..25c294f7828 100644
--- a/Content.Shared/PDA/PdaVisuals.cs
+++ b/Content.Shared/PDA/PdaVisuals.cs
@@ -15,4 +15,4 @@ public enum PdaUiKey
Key
}
-}
+}
\ No newline at end of file
diff --git a/Content.Shared/PDA/SharedPdaSystem.cs b/Content.Shared/PDA/SharedPdaSystem.cs
index 6eb665747d3..b92b28ad0ff 100644
--- a/Content.Shared/PDA/SharedPdaSystem.cs
+++ b/Content.Shared/PDA/SharedPdaSystem.cs
@@ -85,4 +85,4 @@ public virtual void UpdatePdaUi(EntityUid uid, PdaComponent? pda = null)
// Overriden by the server
}
}
-}
+}
\ No newline at end of file
diff --git a/Content.Trauma.Shared/Knowledge/Systems/SharedKnowledgeSystem.Inky.cs b/Content.Trauma.Shared/Knowledge/Systems/SharedKnowledgeSystem.Inky.cs
new file mode 100644
index 00000000000..c855344d69b
--- /dev/null
+++ b/Content.Trauma.Shared/Knowledge/Systems/SharedKnowledgeSystem.Inky.cs
@@ -0,0 +1,30 @@
+using Content.Inky.Common.Events.Werewolf;
+
+namespace Content.Trauma.Shared.Knowledge.Systems;
+
+public abstract partial class SharedKnowledgeSystem
+{
+ private void InitializeInky()
+ {
+ SubscribeLocalEvent(OnSelectFirstMartialArt);
+ }
+ ///
+ /// selects the first martial art from the known martial arts
+ ///
+ private void OnSelectFirstMartialArt(SelectFirstMartialArtEvent args)
+ {
+ if (GetContainer(args.Entity) is not { } container
+ || container.Comp.ActiveMartialArt != null)
+ return;
+
+ foreach (var knowledgeUid in container.Comp.KnowledgeDict.Values)
+ {
+ if (!_artQuery.HasComp(knowledgeUid)
+ || !Exists(knowledgeUid))
+ continue;
+
+ ChangeMartialArts(container, args.Entity, knowledgeUid);
+ return;
+ }
+ }
+}
diff --git a/Content.Trauma.Shared/Knowledge/Systems/SharedKnowledgeSystem.cs b/Content.Trauma.Shared/Knowledge/Systems/SharedKnowledgeSystem.cs
index 04bdd8bec0f..3b3cf3916e9 100644
--- a/Content.Trauma.Shared/Knowledge/Systems/SharedKnowledgeSystem.cs
+++ b/Content.Trauma.Shared/Knowledge/Systems/SharedKnowledgeSystem.cs
@@ -80,6 +80,10 @@ public override void Initialize()
Subs.CVar(_cfg, TraumaCVars.SkillGain, x => _skillGain = x, true);
LoadSkillPrototypes();
+
+ // inky
+ InitializeInky();
+ // /inky
}
public override void Update(float frameTime)
diff --git a/README.md b/README.md
index 8ccb298b696..28d8a944d82 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@ If you want to host or create content for SS14, go to the [Space Station 14 repo
## Links
-no discord server sadly right now | [Devbus Discord Server](https://discord.gg/f3rJaCuK) | [SS14 Forums](https://forum.spacestation14.com/) | [SS14 Website](https://spacestation14.com/)
+[Inky Station Discord Server](https://discord.gg/Tmjfu6Mt9p) | [Devbus Discord Server](https://discord.gg/f3rJaCuK) | [SS14 Forums](https://forum.spacestation14.com/) | [SS14 Website](https://spacestation14.com/)
## Documentation/Wiki
diff --git a/Resources/Audio/_Inky/Antag/Werewolf/attributions.yml b/Resources/Audio/_Inky/Antag/Werewolf/attributions.yml
new file mode 100644
index 00000000000..6e7ecb71b64
--- /dev/null
+++ b/Resources/Audio/_Inky/Antag/Werewolf/attributions.yml
@@ -0,0 +1,7 @@
+- files: ["werewolf_start.ogg"]
+ license: "CC-BY-SA-3.0"
+ copyright: "Made by @LuciferEOS"
+ source: "https://github.com/LuciferEOS"
+
+
+
diff --git a/Resources/Audio/_Inky/Antag/Werewolf/werewolf_start.ogg b/Resources/Audio/_Inky/Antag/Werewolf/werewolf_start.ogg
new file mode 100644
index 00000000000..da783f88b36
Binary files /dev/null and b/Resources/Audio/_Inky/Antag/Werewolf/werewolf_start.ogg differ
diff --git a/Resources/Locale/en-US/_Goobstation/loadouts/loadout-groups.ftl b/Resources/Locale/en-US/_Goobstation/loadouts/loadout-groups.ftl
index 4158970715c..d86fc417a98 100644
--- a/Resources/Locale/en-US/_Goobstation/loadouts/loadout-groups.ftl
+++ b/Resources/Locale/en-US/_Goobstation/loadouts/loadout-groups.ftl
@@ -216,3 +216,7 @@ loadout-group-boxer-envirosuit = Boxer envirosuit
# Misc
loadout-group-plasma-tank = Plasma tank
+
+# Salvage/Shaft Miner
+loadout-group-salvage-specialist-jumpsuit = Salvage Specialist Jumpsuit
+loadout-group-shaft-miner-jumpsuit = Shaft Miner Jumpsuit
\ No newline at end of file
diff --git a/Resources/Locale/en-US/_Inky/Werewolf/werewolf.ftl b/Resources/Locale/en-US/_Inky/Werewolf/werewolf.ftl
new file mode 100644
index 00000000000..46e231ad8d7
--- /dev/null
+++ b/Resources/Locale/en-US/_Inky/Werewolf/werewolf.ftl
@@ -0,0 +1,11 @@
+# im too fucking lazy to make 65 new files for each thing so the most that you will get is path-specific ftl files and one ginormous shared one
+collective-mind-lunarmind = LunarMind
+werewolf-beckon-message = {$name} beckons the pack to {$location}.
+
+role-subtype-werewolf = Werewolf
+roles-antag-werewolf-name = Werewolf
+roles-antag-werewolf-desc = Whether by infection or hereditary genes, you’ve been given the curse and/or gift of Lycanthropy! Aren’t you special?
+werewolf-role-greeting = I am the Werewolf. Unbeknownst to my employers, I have been cursed with Lycanthropy. I must ensure my survival on this station, and keep well fed. Secrecy is my weapon, I must ensure that nobody finds out my real identity.
+
+werewolf-action-fail-hunger = You are too hungry to do that right now.
+werewolf-action-fail-transfurmed = You cant use it while being in inferior form.
diff --git a/Resources/Maps/Shuttles/trading_outpost.yml b/Resources/Maps/Shuttles/trading_outpost.yml
index 76613c66b1a..9fea224e09f 100644
--- a/Resources/Maps/Shuttles/trading_outpost.yml
+++ b/Resources/Maps/Shuttles/trading_outpost.yml
@@ -3213,7 +3213,7 @@ entities:
- type: Transform
pos: 6.5,-16.5
parent: 2
-- proto: ClothingNeckCloakCe
+- proto: ClothingNeckCloakWhiteCe
entities:
- uid: 1096
components:
diff --git a/Resources/Maps/_Trauma/lambda.yml b/Resources/Maps/_Trauma/lambda.yml
index 18febf80df4..d5289c7d532 100644
--- a/Resources/Maps/_Trauma/lambda.yml
+++ b/Resources/Maps/_Trauma/lambda.yml
@@ -98163,7 +98163,7 @@ entities:
linearDamping: 0
canCollide: False
- type: InsideEntityStorage
-- proto: ClothingNeckCloakCe
+- proto: ClothingNeckCloakWhiteCe
entities:
- uid: 15161
components:
@@ -98247,7 +98247,7 @@ entities:
linearDamping: 0
canCollide: False
- type: InsideEntityStorage
-- proto: ClothingNeckMantleCE
+- proto: ClothingNeckMantleWhiteCE
entities:
- uid: 15162
components:
diff --git a/Resources/Maps/_Trauma/origin.yml b/Resources/Maps/_Trauma/origin.yml
index 0cd3876e585..33ea4fe86d4 100644
--- a/Resources/Maps/_Trauma/origin.yml
+++ b/Resources/Maps/_Trauma/origin.yml
@@ -79226,7 +79226,7 @@ entities:
- type: Transform
pos: -10.776614,43.48699
parent: 2
-- proto: ClothingNeckMantleCE
+- proto: ClothingNeckMantleWhiteCE
entities:
- uid: 12814
components:
diff --git a/Resources/Prototypes/Body/Species/vox.yml b/Resources/Prototypes/Body/Species/vox.yml
index 6fbe8b7304c..864024eee1a 100644
--- a/Resources/Prototypes/Body/Species/vox.yml
+++ b/Resources/Prototypes/Body/Species/vox.yml
@@ -259,7 +259,7 @@
damage:
types:
Slash: 5 # Reduce?
- - type: Wagging
+# - type: Wagging - trauma changes wag to be on the tail organ
- type: entity
parent: OrganBaseFleshy # Shitmed - Fleshy
@@ -357,16 +357,22 @@
id: OrganVoxFootRight
- type: entity
- parent: [ OrganBaseBrain, OrganSpriteHumanInternal, OrganVoxInternal ]
+ parent: [ OrganBaseBrain, OrganVoxInternal ]
id: OrganVoxBrain
+ name: cortical stack
+ description: A stack containing all the memories and experiences of a vox with some mushy brains still sticking to it.
+ components:
+ - type: Edible
+ destroyOnEmpty: false
+ - type: BorgBrain
- type: entity
parent: [ OrganVoxVisual, OrganBaseEyes, OrganVoxInternal ]
id: OrganVoxEyes
- #
- components:
- - type: ViewconeModifier
- angleModifier: 1.1 # prey vision for tasty chicken...
+ # - INKY - fov disabled
+ #components:
+ #- type: ViewconeModifier
+ # angleModifier: 1.1 # prey vision for tasty chicken...
#
- type: entity
@@ -374,24 +380,30 @@
id: OrganVoxTongue
- type: entity
- parent: [ OrganBaseAppendix, OrganSpriteHumanInternal, OrganVoxInternal ]
+ parent: [ OrganBaseAppendix, OrganVoxInternal ]
id: OrganVoxAppendix
- type: entity
- parent: [ OrganBaseEars, OrganSpriteHumanInternal, OrganVoxInternal ]
+ parent: [ OrganBaseEars, OrganVoxInternal ]
id: OrganVoxEars
- type: entity
parent: [ OrganBaseLungs, OrganVoxInternal, OrganVoxMetabolizer ]
id: OrganVoxLungs
+ name: gas exchange sacks
+ description: The organ responsible for gas exchange within a Vox.
- type: entity
parent: [ OrganBaseHeart, OrganVoxInternal, OrganVoxMetabolizer ]
id: OrganVoxHeart
+ name: circulatory pump
+ description: A strange purple organ that pumps circulatory fluid through the body of a Vox.
- type: entity
parent: [ OrganBaseStomach, OrganVoxInternal, OrganVoxMetabolizer ]
id: OrganVoxStomach
+ name: material processor
+ description: The organ responsible for processing materials intaken by a Vox.
components:
- type: Stomach
specialDigestible:
@@ -400,9 +412,13 @@
isSpecialDigestibleExclusive: false
- type: entity
- parent: [ OrganBaseLiver, OrganSpriteHumanInternal, OrganVoxInternal, OrganVoxMetabolizer ]
+ parent: [ OrganBaseLiver, OrganVoxInternal, OrganVoxMetabolizer ]
id: OrganVoxLiver
+ name: primary toxin filter
+ description: One of two organs responsible for filtering toxins from the bloodstream of a Vox.
- type: entity
- parent: [ OrganBaseKidneys, OrganSpriteHumanInternal, OrganVoxInternal, OrganVoxMetabolizer ]
+ parent: [ OrganBaseKidneys, OrganVoxInternal, OrganVoxMetabolizer ]
id: OrganVoxKidneys
+ name: auxiliary toxin filter
+ description: One of two organs responsible for filtering toxins from the bloodstream of a Vox.
\ No newline at end of file
diff --git a/Resources/Prototypes/Body/species_appearance.yml b/Resources/Prototypes/Body/species_appearance.yml
index d793093fdfd..e070c30edb4 100644
--- a/Resources/Prototypes/Body/species_appearance.yml
+++ b/Resources/Prototypes/Body/species_appearance.yml
@@ -39,9 +39,9 @@
- map: [ "shoes" ]
- map: [ "ears" ]
- map: [ "eyes" ]
- - map: [ "belt" ]
- map: [ "id" ]
- map: [ "outerClothing" ]
+ - map: [ "belt" ] #inky - belts over outerwear. was a goobchange that was skipped on trauma.
- map: [ "back" ]
- map: [ "neck" ]
- map: [ "suitstorage" ]
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml b/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml
index b164b49cd47..ca4bee4a766 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml
@@ -28,7 +28,7 @@
- id: ClothingUniformJumpskirtChiefEngineerTurtle
- id: ClothingHeadHatBeretEngineering
- id: ClothingOuterWinterCE
- - id: ClothingNeckCloakCe
+ - id: ClothingNeckCloakWhiteCe
- type: entity
id: DresserChiefMedicalOfficerFilled
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/centdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/centdrobe.yml
index f00774b74c5..d484fa0181c 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/centdrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/centdrobe.yml
@@ -25,7 +25,6 @@
ClothingUniformJumpsuitCentcomAgent: 3
ClothingUniformJumpsuitCentcomFormal: 3
ClothingUniformJumpskirtCentcomFormalDress: 3
- ClothingUniformJumpsuitCasualCentcom: 3 # Goobstation
ClothingHeadHatCentcom: 3
ClothingHeadHatCentcomcap: 3
ClothingMaskGasCentcom: 3
@@ -34,9 +33,24 @@
ClothingOuterCoatExpensive: 1
ClothingNeckScarfStripedCentcom: 3
ClothingNeckCloakCentcom: 3
+ #
+ ClothingUniformJumpsuitCasualCentcom: 3
+ ClothingOuterArmoredJacketCentralCommand: 2
+ ClothingUniformJumpskirtCentcomPencilSkirt: 3
+ ClothingNeckCloakHighCommand: 3
+ ClothingNeckCloakHighCommandCape: 2
+ ClothingNeckCloakCentComPoncho: 3
+ ClothingNeckMantleEpaulettes: 1
+ #
contrabandInventory:
+ #
+ ClothingUniformJumpsuitGoldenLiaison: 2
+ ClothingNeckCloakGoldenCentComm: 2
+ ClothingHeadHatGoldCentcom: 2
+ #
ToyFigurineCaptain: 1
ToyFigurineHeadOfPersonnel: 1
+
#
emaggedInventory:
PenCentcom: 1
diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml
index 67a27a74cf0..54a1ee048b4 100644
--- a/Resources/Prototypes/Catalog/uplink_catalog.yml
+++ b/Resources/Prototypes/Catalog/uplink_catalog.yml
@@ -1593,8 +1593,8 @@
id: UplinkChameleon
name: uplink-chameleon-name
description: uplink-chameleon-desc
- productEntity: ClothingBackpackChameleonFillAgent
- icon: { sprite: /Textures/Clothing/Uniforms/Jumpsuit/rainbow.rsi, state: icon }
+ productEntity: ClothingBackpackChameleonFill # goob
+ icon: { sprite: /Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/rainbow.rsi, state: icon } # Goob
cost:
Telecrystal: 25 # Trauma - was 4, 5x and more expensive due to how much fucking value it has
categories:
diff --git a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml
index 56376dfe9bd..cfedd598496 100644
--- a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml
+++ b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml
@@ -204,7 +204,7 @@
description: A robust backpack for stealing cargo's loot.
components:
- type: Sprite
- sprite: Clothing/Back/Backpacks/cargo.rsi
+ sprite: _Goobstation/Clothing/Back/Backpacks/cargo.rsi
- type: entity
parent: ClothingBackpack
diff --git a/Resources/Prototypes/Entities/Clothing/Back/duffel.yml b/Resources/Prototypes/Entities/Clothing/Back/duffel.yml
index 3d8b3142dc3..f1e6171400d 100644
--- a/Resources/Prototypes/Entities/Clothing/Back/duffel.yml
+++ b/Resources/Prototypes/Entities/Clothing/Back/duffel.yml
@@ -143,7 +143,6 @@
components:
- type: Sprite
sprite: Clothing/Back/Duffels/hydroponics.rsi
-
- type: entity
parent: ClothingBackpackDuffel
id: ClothingBackpackDuffelCargo
@@ -151,8 +150,7 @@
description: A large duffel bag for stealing cargo's precious loot.
components:
- type: Sprite
- sprite: Clothing/Back/Duffels/cargo.rsi
-
+ sprite: _Goobstation/Clothing/Back/Duffels/cargo.rsi # Goob
- type: entity
parent: ClothingBackpackDuffel
id: ClothingBackpackDuffelSalvage
diff --git a/Resources/Prototypes/Entities/Clothing/Back/satchel.yml b/Resources/Prototypes/Entities/Clothing/Back/satchel.yml
index b8e81dd37f3..0ececb01fcb 100644
--- a/Resources/Prototypes/Entities/Clothing/Back/satchel.yml
+++ b/Resources/Prototypes/Entities/Clothing/Back/satchel.yml
@@ -157,8 +157,7 @@
description: A robust satchel for stealing cargo's loot.
components:
- type: Sprite
- sprite: Clothing/Back/Satchels/cargo.rsi
-
+ sprite: _Goobstation/Clothing/Back/Satchels/cargo.rsi
- type: entity
parent: ClothingBackpackSatchel
id: ClothingBackpackSatchelSalvage
diff --git a/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml b/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml
index b0ecab41b8a..5fddb2f7898 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml
@@ -110,7 +110,7 @@
- type: entity
abstract: true
- parent: [ClothingHeadBase, BaseClothingViewconeSmall] # Trauma
+ parent: [ClothingHeadBase] # Trauma # inky edit removed BaseClothingViewconeSmall
id: ClothingHeadEVAHelmetBase
name: base space helmet
components:
diff --git a/Resources/Prototypes/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Entities/Clothing/Head/hats.yml
index 9ba6e90c95c..28e2e9561bf 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/hats.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/hats.yml
@@ -53,7 +53,7 @@
# TODO: Make a single ClothingHeadHatArmoreredBeret in goob namespace so all these items dont need to have armor values listed seperately, since they wont have seperate armor values ANYWAY!
- type: entity
- parent: [ClothingHeadHatBeret, BaseSecurityContraband, BaseClothingViewconeSmallIncrease] #goobstation - contraband marking
+ parent: [ClothingHeadHatBeret, BaseSecurityContraband] #goobstation - contraband marking # inky edit removed BaseClothingViewconeSmallIncrease
id: ClothingHeadHatBeretSecurity
name: security beret
description: A beret with the security department's insignia. For officers that are more inclined towards style than safety.
@@ -178,9 +178,9 @@
description: A beret with the cargo department's insignia.
components:
- type: Sprite
- sprite: Clothing/Head/Hats/beret_qm.rsi
+ sprite: _Goobstation/Clothing/Head/Hats/beret_qm.rsi # Goob Station - beret edit
- type: Clothing
- sprite: Clothing/Head/Hats/beret_qm.rsi
+ sprite: _Goobstation/Clothing/Head/Hats/beret_qm.rsi # Goob Station - beret edit
- type: Tag
tags:
- PetWearable
@@ -191,7 +191,7 @@
- WhitelistChameleon
- type: entity
- parent: [ClothingHeadHatBeretRND, BaseSecurityCommandContraband, BaseClothingViewconeSmallIncrease] # Goob / Trauma edit
+ parent: [ClothingHeadHatBeretRND, BaseSecurityCommandContraband] # Goob / Trauma edit # inky edit removed BaseClothingViewconeSmallIncrease
id: ClothingHeadHatBeretHoS
name: head of security's beret
description: A black beret with a commander's rank emblem. For officers that are more inclined towards style than safety.
@@ -297,7 +297,7 @@
- CorgiWearable
- type: entity
- parent: [ ClothingHeadBase, BaseClothingViewconeSmallIncrease ] # Trauma
+ parent: [ ClothingHeadBase ] # Trauma # inky edit removed BaseClothingViewconeSmallIncrease
id: ClothingHeadHatBeretMerc
name: mercenary beret
description: An olive beret with a badge depicting a jackal on a rock.
@@ -874,7 +874,7 @@
- WhitelistChameleon
- type: entity
- parent: [ClothingHeadBase, BaseSecurityContraband, BaseClothingViewconeSmallIncrease] # Goob / Trauma edit
+ parent: [ClothingHeadBase, BaseSecurityContraband] # Goob / Trauma edit # inky edit removed BaseClothingViewconeSmallIncrease
id: ClothingHeadHatWarden
name: warden's cap
description: This hat emphasizes that you are THE LAW.
diff --git a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml
index 625ed2bafad..2ae7bf4913a 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml
@@ -328,7 +328,7 @@
#Fire Helmet
- type: entity
- parent: [ClothingHeadLightBase, BaseClothingViewconeSmall]
+ parent: [ClothingHeadLightBase] # inky edit removed BaseClothingViewconeSmall
id: ClothingHeadHelmetFire
name: fire helmet
description: An atmos tech's best friend. Provides some heat resistance and looks cool.
@@ -368,7 +368,7 @@
#Atmos Fire Helmet
- type: entity
- parent: [ClothingHeadLightBase, BaseEngineeringContraband, BaseClothingViewconeSmall] # Trauma
+ parent: [ClothingHeadLightBase, BaseEngineeringContraband] # Trauma # inky edit removed BaseClothingViewconeSmall
id: ClothingHeadHelmetAtmosFire
name: atmos fire helmet
description: An atmos fire helmet, able to keep the user cool in any situation.
diff --git a/Resources/Prototypes/Entities/Clothing/Head/soft.yml b/Resources/Prototypes/Entities/Clothing/Head/soft.yml
index e5f4cf2beca..59769a45fce 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/soft.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/soft.yml
@@ -63,9 +63,9 @@
description: A baseball cap colored to match cargo's uniforms.
components:
- type: Sprite
- sprite: Clothing/Head/Soft/cargosoft.rsi
+ sprite: _Goobstation/Clothing/Head/Soft/cargosoft.rsi
- type: Clothing
- sprite: Clothing/Head/Soft/cargosoft.rsi
+ sprite: _Goobstation/Clothing/Head/Soft/cargosoft.rsi
- type: Tag
tags:
- ClothMade
diff --git a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml
index 302ab8d9c64..e6353e6c205 100644
--- a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml
+++ b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml
@@ -1,5 +1,5 @@
- type: entity
- parent: [ClothingMaskPullableBase, BaseClothingViewconeSmall] # Trauma
+ parent: [ClothingMaskPullableBase] # Trauma # inky edit removed BaseClothingViewconeSmall
id: ClothingMaskGas
name: gas mask
description: A face-covering mask that can be connected to an air supply.
@@ -967,7 +967,7 @@
- IPCMaskWearable # EE - IPCs
- type: entity
- parent: [ClothingMaskBase, BaseClothingViewconeSmall]
+ parent: [ClothingMaskBase] # inky edit removed BaseClothingViewconeSmall
id: ClothingMaskWeldingGas
name: welding gas mask
description: A gas mask with built in welding goggles and face shield. Looks like a skull, clearly designed by a nerd.
diff --git a/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml b/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml
index 4937356f89e..fe77d11f370 100644
--- a/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml
+++ b/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml
@@ -67,7 +67,7 @@
description: A pompous and comfy blue cloak with a nice gold trim, while not particularly valuable as your other possessions, it sure is fancy.
components:
- type: Sprite
- sprite: Clothing/Neck/Cloaks/cap.rsi
+ sprite: _Goobstation/Clothing/Neck/Cloaks/cap.rsi # Goob Station - cloak resprite
- type: StealTarget
stealGroup: HeadCloak
@@ -78,18 +78,29 @@
description: An exquisite dark and red cloak fitting for those who can assert dominance over wrongdoers. Take a stab at being civil in prosecution!
components:
- type: Sprite
- sprite: Clothing/Neck/Cloaks/hos.rsi
+ sprite: _Goobstation/Clothing/Neck/Cloaks/hos.rsi # Goob Station - cloak resprite
- type: StealTarget
stealGroup: HeadCloak
- type: entity
parent: [ClothingNeckBase, BaseCommandContraband]
- id: ClothingNeckCloakCe
- name: chief engineer's cloak
- description: A dark green cloak with light blue ornaments, given to those who proved themselves to master the precise art of engineering.
+ id: ClothingNeckCloakWhiteCe
+ name: chief engineer's white cloak
+ description: A white cloak with orange adornments, given to those who proved themselves to master the precise art of engineering.
components:
- type: Sprite
- sprite: Clothing/Neck/Cloaks/ce.rsi
+ sprite: _Goobstation/Clothing/Neck/Cloaks/ChiefEngineer/whitece.rsi # Goob Station - cloak resprite
+ - type: StealTarget
+ stealGroup: HeadCloak
+
+- type: entity
+ parent: [ClothingNeckBase, BaseCommandContraband]
+ id: ClothingNeckCloakGreenCe
+ name: chief engineer's green cloak
+ description: A green cloak with yellow and blue adornments, given to those who proved themselves to master the precise art of engineering.
+ components:
+ - type: Sprite
+ sprite: _Goobstation/Clothing/Neck/Cloaks/ChiefEngineer/greence.rsi # Goob Station - cloak resprite
- type: StealTarget
stealGroup: HeadCloak
@@ -100,7 +111,7 @@
description: A sterile blue cloak with a green cross, radiating with a sense of duty and willingness to help others.
components:
- type: Sprite
- sprite: Clothing/Neck/Cloaks/cmo.rsi
+ sprite: _Goobstation/Clothing/Neck/Cloaks/cmo.rsi # Goob Station - cloak resprite
- type: StealTarget
stealGroup: HeadCloak
@@ -111,7 +122,7 @@
description: A white cloak with violet stripes, showing your status as the arbiter of cutting-edge technology.
components:
- type: Sprite
- sprite: Clothing/Neck/Cloaks/rd.rsi
+ sprite: _Goobstation/Clothing/Neck/Cloaks/rd.rsi # Goob Station - cloak resprite
- type: StealTarget
stealGroup: HeadCloak
@@ -122,7 +133,7 @@
description: A strong brown cloak with a reflective stripe, while not as fancy as others, it does show your managing skills.
components:
- type: Sprite
- sprite: Clothing/Neck/Cloaks/qm.rsi
+ sprite: _Goobstation/Clothing/Neck/Cloaks/qm.rsi # Goob Station - cloak resprite
- type: StealTarget
stealGroup: HeadCloak
@@ -133,7 +144,7 @@
description: A blue cloak with red shoulders and gold buttons, proving you are the gatekeeper to any airlock on the station.
components:
- type: Sprite
- sprite: Clothing/Neck/Cloaks/hop.rsi
+ sprite: _Goobstation/Clothing/Neck/Cloaks/hop.rsi # Goob Station - cloak resprite
- type: StealTarget
stealGroup: HeadCloak
diff --git a/Resources/Prototypes/Entities/Clothing/Neck/mantles.yml b/Resources/Prototypes/Entities/Clothing/Neck/mantles.yml
index 2aa62b50f21..64fe3ef85ad 100644
--- a/Resources/Prototypes/Entities/Clothing/Neck/mantles.yml
+++ b/Resources/Prototypes/Entities/Clothing/Neck/mantles.yml
@@ -19,20 +19,31 @@
description: A comfortable and chique mantle befitting of only the most experienced captain.
components:
- type: Sprite
- sprite: Clothing/Neck/mantles/capmantle.rsi
+ sprite: _Goobstation/Clothing/Neck/Mantle/capmantle.rsi # Goob Station - mantle resprite
- type: Clothing
- sprite: Clothing/Neck/mantles/capmantle.rsi
+ sprite: _Goobstation/Clothing/Neck/Mantle/capmantle.rsi # Goob Station - mantle resprite
- type: entity
parent: [ClothingNeckBase, BaseCommandContraband]
- id: ClothingNeckMantleCE
- name: chief engineer's mantle
+ id: ClothingNeckMantleWhiteCE
+ name: chief engineer's white mantle
description: High visibility, check. RIG system, check. High capacity cell, check. Everything a chief engineer could need in a stylish mantle.
components:
- type: Sprite
- sprite: Clothing/Neck/mantles/cemantle.rsi
+ sprite: _Goobstation/Clothing/Neck/Mantle/ChiefEngineer/whitecemantle.rsi # Goob Station - mantle resprite
- type: Clothing
- sprite: Clothing/Neck/mantles/cemantle.rsi
+ sprite: _Goobstation/Clothing/Neck/Mantle/ChiefEngineer/whitecemantle.rsi # Goob Station - mantle resprite
+
+- type: entity
+ parent: [ClothingNeckBase, BaseCommandContraband]
+ id: ClothingNeckMantleOrangeCE
+ name: chief engineer's orange mantle
+ description: High visibility, check. RIG system, check. High capacity cell, check. Everything a chief engineer could need in a stylish mantle.
+ components:
+ - type: Sprite
+ sprite: _Goobstation/Clothing/Neck/Mantle/ChiefEngineer/orangecemantle.rsi # Goob Station - mantle resprite
+ - type: Clothing
+ sprite: _Goobstation/Clothing/Neck/Mantle/ChiefEngineer/orangecemantle.rsi # Goob Station - mantle resprite
- type: entity
parent: [ClothingNeckBase, BaseCommandContraband]
@@ -41,9 +52,9 @@
description: For a CMO that has been in enough medbays to know that more PPE means less central command dry cleaning visits when the shift is over.
components:
- type: Sprite
- sprite: Clothing/Neck/mantles/cmomantle.rsi
+ sprite: _Goobstation/Clothing/Neck/Mantle/cmomantle.rsi # Goob Station - mantle resprite
- type: Clothing
- sprite: Clothing/Neck/mantles/cmomantle.rsi
+ sprite: _Goobstation/Clothing/Neck/Mantle/cmomantle.rsi # Goob Station - mantle resprite
- type: entity
parent: [ClothingNeckBase, BaseCommandContraband]
@@ -52,9 +63,9 @@
description: A good HOP knows that paper pushing is only half the job... petting your dog and looking fashionable is the other half.
components:
- type: Sprite
- sprite: Clothing/Neck/mantles/hopmantle.rsi
+ sprite: _Goobstation/Clothing/Neck/Mantle/hopmantle.rsi # Goob Station - mantle resprite
- type: Clothing
- sprite: Clothing/Neck/mantles/hopmantle.rsi
+ sprite: _Goobstation/Clothing/Neck/Mantle/hopmantle.rsi # Goob Station - mantle resprite
- type: entity
parent: [ClothingNeckBase, BaseCommandContraband]
@@ -63,9 +74,9 @@
description: Shootouts with syndicate agents are just another Tuesday for this HoS. This mantle is a symbol of commitment to the station.
components:
- type: Sprite
- sprite: Clothing/Neck/mantles/hosmantle.rsi
+ sprite: _Goobstation/Clothing/Neck/Mantle/hosmantle.rsi # Goob Station - mantle resprite
- type: Clothing
- sprite: Clothing/Neck/mantles/hosmantle.rsi
+ sprite: _Goobstation/Clothing/Neck/Mantle/hosmantle.rsi # Goob Station - mantle resprite
- type: entity
parent: [ClothingNeckBase, BaseCommandContraband]
@@ -74,9 +85,9 @@
description: For when long days in the office consist of explosives, poisonous gas, murder robots, and a fresh pizza from cargo; this mantle will keep you comfy.
components:
- type: Sprite
- sprite: Clothing/Neck/mantles/rdmantle.rsi
+ sprite: _Goobstation/Clothing/Neck/Mantle/rdmantle.rsi # Goob Station - mantle resprite
- type: Clothing
- sprite: Clothing/Neck/mantles/rdmantle.rsi
+ sprite: _Goobstation/Clothing/Neck/Mantle/rdmantle.rsi # Goob Station - mantle resprite
- type: entity
parent: [ClothingNeckBase, BaseCommandContraband]
@@ -85,9 +96,9 @@
description: For the master of goods and materials to rule over the department, a befitting mantle to show off superiority!
components:
- type: Sprite
- sprite: Clothing/Neck/mantles/qmmantle.rsi
+ sprite: _Goobstation/Clothing/Neck/Mantle/qmmantle.rsi # Goob Station - mantle resprite
- type: Clothing
- sprite: Clothing/Neck/mantles/qmmantle.rsi
+ sprite: _Goobstation/Clothing/Neck/Mantle/qmmantle.rsi # Goob Station - mantle resprite
- type: entity
parent: ClothingNeckBase
diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml b/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml
index 58aa41cb9d0..f354de9f015 100644
--- a/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml
+++ b/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml
@@ -226,10 +226,9 @@
name: cargo winter boots
components:
- type: Sprite
- sprite: Clothing/Shoes/Boots/winterbootscargo.rsi
+ sprite: _Goobstation/Clothing/Shoes/Boots/winterbootscargo.rsi # Goob
- type: Clothing
- sprite: Clothing/Shoes/Boots/winterbootscargo.rsi
-
+ sprite: _Goobstation/Clothing/Shoes/Boots/winterbootscargo.rsi # Goob
- type: entity
parent: ClothingShoesBaseWinterBoots
id: ClothingShoesBootsWinterEngi
diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml
index d41422f7823..2c4b6a9223b 100644
--- a/Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml
+++ b/Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml
@@ -114,8 +114,11 @@
- ClothMade
- WhitelistChameleon
+# Goobstation
+
- type: entity
abstract: true
+ parent: BaseFoldable
id: ClothingUniformFoldableBase
components:
- type: Foldable
diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/color_jumpskirts.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/color_jumpskirts.yml
index fc212ee38f8..e1da344f3c0 100644
--- a/Resources/Prototypes/Entities/Clothing/Uniforms/color_jumpskirts.yml
+++ b/Resources/Prototypes/Entities/Clothing/Uniforms/color_jumpskirts.yml
@@ -1,509 +1,401 @@
# SPDX-FileCopyrightText: 2024 Boaz1111 <149967078+Boaz1111@users.noreply.github.com>
# SPDX-FileCopyrightText: 2024 Flareguy <78941145+Flareguy@users.noreply.github.com>
-# SPDX-FileCopyrightText: 2024 lzk <124214523+lzk228@users.noreply.github.com>
# SPDX-FileCopyrightText: 2025 Aiden <28298836+Aidenkrz@users.noreply.github.com>
+# SPDX-FileCopyrightText: 2025 Froffy025
+# SPDX-FileCopyrightText: 2025 GoobBot
+# SPDX-FileCopyrightText: 2025 SX-7
+# SPDX-FileCopyrightText: 2025 VMSolidus
#
# SPDX-License-Identifier: AGPL-3.0-or-later
+# Goobstation here is everything ClothingUniformFoldableBase and Sprites. Take ours here if upstreaming im lazy cant be bothered to webedit comment all this.
# White Jumpskirt
- type: entity
- parent: ClothingUniformSkirtBase
+ parent: [ClothingUniformSkirtBase, ClothingUniformFoldableBase]
id: ClothingUniformJumpskirtColorWhite
name: white jumpskirt
description: A generic white jumpskirt with no rank markings.
components:
- type: Sprite
- sprite: Clothing/Uniforms/Jumpskirt/color.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/color/color.rsi
layers:
- state: icon
- - state: trinkets-icon
- type: Item
inhandVisuals:
left:
- state: inhand-left
- - state: trinkets-inhand-left
right:
- state: inhand-right
- - state: trinkets-inhand-right
- type: Clothing
- sprite: Clothing/Uniforms/Jumpskirt/color.rsi
- clothingVisuals:
- jumpsuit:
- - state: equipped-INNERCLOTHING
- - state: trinkets-equipped-INNERCLOTHING
+ sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/color/white.rsi
+
# Grey Jumpskirt
- type: entity
- parent: ClothingUniformSkirtBase
+ parent: [ClothingUniformSkirtBase, ClothingUniformFoldableBase]
id: ClothingUniformJumpskirtColorGrey
name: grey jumpskirt
description: A tasteful grey jumpskirt that reminds you of the good old days.
components:
- type: Sprite
- sprite: Clothing/Uniforms/Jumpskirt/color.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/color/color.rsi
layers:
- state: icon
color: "#b3b3b3"
- - state: trinkets-icon
- type: Item
inhandVisuals:
left:
- state: inhand-left
color: "#b3b3b3"
- - state: trinkets-inhand-left
right:
- state: inhand-right
color: "#b3b3b3"
- - state: trinkets-inhand-right
- type: Clothing
- sprite: Clothing/Uniforms/Jumpskirt/color.rsi
- clothingVisuals:
- jumpsuit:
- - state: equipped-INNERCLOTHING
- color: "#b3b3b3"
- - state: trinkets-equipped-INNERCLOTHING
+ sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/color/grey.rsi
# Black Jumpskirt
- type: entity
- parent: ClothingUniformSkirtBase
+ parent: [ClothingUniformSkirtBase, ClothingUniformFoldableBase]
id: ClothingUniformJumpskirtColorBlack
name: black jumpskirt
description: A generic black jumpskirt with no rank markings.
components:
- type: Sprite
- sprite: Clothing/Uniforms/Jumpskirt/color.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/color/color.rsi
layers:
- state: icon
color: "#3f3f3f"
- - state: trinkets-icon
- type: Item
inhandVisuals:
left:
- state: inhand-left
color: "#3f3f3f"
- - state: trinkets-inhand-left
right:
- state: inhand-right
color: "#3f3f3f"
- - state: trinkets-inhand-right
- type: Clothing
- sprite: Clothing/Uniforms/Jumpskirt/color.rsi
- clothingVisuals:
- jumpsuit:
- - state: equipped-INNERCLOTHING
- color: "#3f3f3f"
- - state: trinkets-equipped-INNERCLOTHING
+ sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/color/black.rsi
+
# Blue Jumpskirt
- type: entity
- parent: ClothingUniformSkirtBase
+ parent: [ClothingUniformSkirtBase, ClothingUniformFoldableBase]
id: ClothingUniformJumpskirtColorBlue
name: blue jumpskirt
description: A generic blue jumpskirt with no rank markings.
components:
- type: Sprite
- sprite: Clothing/Uniforms/Jumpskirt/color.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/color/color.rsi
layers:
- state: icon
color: "#52aecc"
- - state: trinkets-icon
- type: Item
inhandVisuals:
left:
- state: inhand-left
color: "#52aecc"
- - state: trinkets-inhand-left
right:
- state: inhand-right
color: "#52aecc"
- - state: trinkets-inhand-right
- type: Clothing
- sprite: Clothing/Uniforms/Jumpskirt/color.rsi
- clothingVisuals:
- jumpsuit:
- - state: equipped-INNERCLOTHING
- color: "#52aecc"
- - state: trinkets-equipped-INNERCLOTHING
+ sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/color/blue.rsi
+
# Dark Blue Jumpskirt
- type: entity
- parent: ClothingUniformSkirtBase
+ parent: [ClothingUniformSkirtBase, ClothingUniformFoldableBase]
id: ClothingUniformJumpskirtColorDarkBlue
name: dark blue jumpskirt
description: A generic dark blue jumpskirt with no rank markings.
components:
- type: Sprite
- sprite: Clothing/Uniforms/Jumpskirt/color.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/color/color.rsi
layers:
- state: icon
color: "#3285ba"
- - state: trinkets-icon
- type: Item
inhandVisuals:
left:
- state: inhand-left
color: "#3285ba"
- - state: trinkets-inhand-left
right:
- state: inhand-right
color: "#3285ba"
- - state: trinkets-inhand-right
- type: Clothing
- sprite: Clothing/Uniforms/Jumpskirt/color.rsi
- clothingVisuals:
- jumpsuit:
- - state: equipped-INNERCLOTHING
- color: "#3285ba"
- - state: trinkets-equipped-INNERCLOTHING
+ sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/color/darkblue.rsi
+
# Teal Jumpskirt
- type: entity
- parent: ClothingUniformSkirtBase
+ parent: [ClothingUniformSkirtBase, ClothingUniformFoldableBase]
id: ClothingUniformJumpskirtColorTeal
name: teal jumpskirt
description: A generic teal jumpskirt with no rank markings.
components:
- type: Sprite
- sprite: Clothing/Uniforms/Jumpskirt/color.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/color/color.rsi
layers:
- state: icon
color: "#77f3b7"
- - state: trinkets-icon
- type: Item
inhandVisuals:
left:
- state: inhand-left
color: "#77f3b7"
- - state: trinkets-inhand-left
right:
- state: inhand-right
color: "#77f3b7"
- - state: trinkets-inhand-right
- type: Clothing
- sprite: Clothing/Uniforms/Jumpskirt/color.rsi
- clothingVisuals:
- jumpsuit:
- - state: equipped-INNERCLOTHING
- color: "#77f3b7"
- - state: trinkets-equipped-INNERCLOTHING
+ sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/color/aqua.rsi
+
# Green Jumpskirt
- type: entity
- parent: ClothingUniformSkirtBase
+ parent: [ClothingUniformSkirtBase, ClothingUniformFoldableBase]
id: ClothingUniformJumpskirtColorGreen
name: green jumpskirt
description: A generic green jumpskirt with no rank markings.
components:
- type: Sprite
- sprite: Clothing/Uniforms/Jumpskirt/color.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/color/color.rsi
layers:
- state: icon
color: "#9ed63a"
- - state: trinkets-icon
- type: Item
inhandVisuals:
left:
- state: inhand-left
color: "#9ed63a"
- - state: trinkets-inhand-left
right:
- state: inhand-right
color: "#9ed63a"
- - state: trinkets-inhand-right
- type: Clothing
- sprite: Clothing/Uniforms/Jumpskirt/color.rsi
- clothingVisuals:
- jumpsuit:
- - state: equipped-INNERCLOTHING
- color: "#9ed63a"
- - state: trinkets-equipped-INNERCLOTHING
+ sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/color/green.rsi
+
# Dark Green Jumpskirt
- type: entity
- parent: ClothingUniformSkirtBase
+ parent: [ClothingUniformSkirtBase, ClothingUniformFoldableBase]
id: ClothingUniformJumpskirtColorDarkGreen
name: dark green jumpskirt
description: A generic dark green jumpskirt with no rank markings.
components:
- type: Sprite
- sprite: Clothing/Uniforms/Jumpskirt/color.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/color/color.rsi
layers:
- state: icon
color: "#007923"
- - state: trinkets-icon
- type: Item
inhandVisuals:
left:
- state: inhand-left
color: "#007923"
- - state: trinkets-inhand-left
right:
- state: inhand-right
color: "#007923"
- - state: trinkets-inhand-right
- type: Clothing
- sprite: Clothing/Uniforms/Jumpskirt/color.rsi
- clothingVisuals:
- jumpsuit:
- - state: equipped-INNERCLOTHING
- color: "#007923"
- - state: trinkets-equipped-INNERCLOTHING
+ sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/color/darkgreen.rsi
+
# Orange Jumpskirt
- type: entity
- parent: ClothingUniformSkirtBase
+ parent: [ClothingUniformSkirtBase, ClothingUniformFoldableBase]
id: ClothingUniformJumpskirtColorOrange
name: orange jumpskirt
description: Don't wear this near paranoid security officers.
components:
- type: Sprite
- sprite: Clothing/Uniforms/Jumpskirt/color.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/color/color.rsi
layers:
- state: icon
color: "#ff8c19"
- - state: trinkets-icon
- type: Item
inhandVisuals:
left:
- state: inhand-left
color: "#ff8c19"
- - state: trinkets-inhand-left
right:
- state: inhand-right
color: "#ff8c19"
- - state: trinkets-inhand-right
- type: Clothing
- sprite: Clothing/Uniforms/Jumpskirt/color.rsi
- clothingVisuals:
- jumpsuit:
- - state: equipped-INNERCLOTHING
- color: "#ff8c19"
- - state: trinkets-equipped-INNERCLOTHING
+ sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/color/orange.rsi
+
# Pink Jumpskirt
- type: entity
- parent: ClothingUniformSkirtBase
+ parent: [ClothingUniformSkirtBase, ClothingUniformFoldableBase]
id: ClothingUniformJumpskirtColorPink
name: pink jumpskirt
description: Just looking at this makes you feel fabulous.
components:
- type: Sprite
- sprite: Clothing/Uniforms/Jumpskirt/color.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/color/color.rsi
layers:
- state: icon
color: "#ffa69b"
- - state: trinkets-icon
- type: Item
inhandVisuals:
left:
- state: inhand-left
color: "#ffa69b"
- - state: trinkets-inhand-left
right:
- state: inhand-right
color: "#ffa69b"
- - state: trinkets-inhand-right
- type: Clothing
- sprite: Clothing/Uniforms/Jumpskirt/color.rsi
- clothingVisuals:
- jumpsuit:
- - state: equipped-INNERCLOTHING
- color: "#ffa69b"
- - state: trinkets-equipped-INNERCLOTHING
+ sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/color/pink.rsi
+
# Red Jumpskirt
- type: entity
- parent: ClothingUniformSkirtBase
+ parent: [ClothingUniformSkirtBase, ClothingUniformFoldableBase]
id: ClothingUniformJumpskirtColorRed
name: red jumpskirt
description: A generic red jumpskirt with no rank markings.
components:
- type: Sprite
- sprite: Clothing/Uniforms/Jumpskirt/color.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/color/color.rsi
layers:
- state: icon
color: "#eb0c07"
- - state: trinkets-icon
- type: Item
inhandVisuals:
left:
- state: inhand-left
color: "#eb0c07"
- - state: trinkets-inhand-left
right:
- state: inhand-right
color: "#eb0c07"
- - state: trinkets-inhand-right
- type: Clothing
- sprite: Clothing/Uniforms/Jumpskirt/color.rsi
- clothingVisuals:
- jumpsuit:
- - state: equipped-INNERCLOTHING
- color: "#eb0c07"
- - state: trinkets-equipped-INNERCLOTHING
+ sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/color/lightred.rsi
+
# Yellow Jumpskirt
- type: entity
- parent: ClothingUniformSkirtBase
+ parent: [ClothingUniformSkirtBase, ClothingUniformFoldableBase]
id: ClothingUniformJumpskirtColorYellow
name: yellow jumpskirt
description: A generic yellow jumpskirt with no rank markings.
components:
- type: Sprite
- sprite: Clothing/Uniforms/Jumpskirt/color.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/color/color.rsi
layers:
- state: icon
color: "#ffe14d"
- - state: trinkets-icon
- type: Item
inhandVisuals:
left:
- state: inhand-left
color: "#ffe14d"
- - state: trinkets-inhand-left
right:
- state: inhand-right
color: "#ffe14d"
- - state: trinkets-inhand-right
- type: Clothing
- sprite: Clothing/Uniforms/Jumpskirt/color.rsi
- clothingVisuals:
- jumpsuit:
- - state: equipped-INNERCLOTHING
- color: "#ffe14d"
- - state: trinkets-equipped-INNERCLOTHING
+ sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/color/yellow.rsi
+
# Purple Jumpskirt
- type: entity
- parent: ClothingUniformSkirtBase
+ parent: [ClothingUniformSkirtBase, ClothingUniformFoldableBase]
id: ClothingUniformJumpskirtColorPurple
name: purple jumpskirt
description: A generic light purple jumpskirt with no rank markings.
components:
- type: Sprite
- sprite: Clothing/Uniforms/Jumpskirt/color.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/color/color.rsi
layers:
- state: icon
color: "#9f70cc"
- - state: trinkets-icon
- type: Item
inhandVisuals:
left:
- state: inhand-left
color: "#9f70cc"
- - state: trinkets-inhand-left
right:
- state: inhand-right
color: "#9f70cc"
- - state: trinkets-inhand-right
- type: Clothing
- sprite: Clothing/Uniforms/Jumpskirt/color.rsi
- clothingVisuals:
- jumpsuit:
- - state: equipped-INNERCLOTHING
- color: "#9f70cc"
- - state: trinkets-equipped-INNERCLOTHING
+ sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/color/purple.rsi
+
# Light Brown Jumpskirt
- type: entity
- parent: ClothingUniformSkirtBase
+ parent: [ClothingUniformSkirtBase, ClothingUniformFoldableBase]
id: ClothingUniformJumpskirtColorLightBrown
name: light brown jumpskirt
description: A generic light brown jumpskirt with no rank markings.
components:
- type: Sprite
- sprite: Clothing/Uniforms/Jumpskirt/color.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/color/color.rsi
layers:
- state: icon
color: "#c59431"
- - state: trinkets-icon
- type: Item
inhandVisuals:
left:
- state: inhand-left
color: "#c59431"
- - state: trinkets-inhand-left
right:
- state: inhand-right
color: "#c59431"
- - state: trinkets-inhand-right
- type: Clothing
- sprite: Clothing/Uniforms/Jumpskirt/color.rsi
- clothingVisuals:
- jumpsuit:
- - state: equipped-INNERCLOTHING
- color: "#c59431"
- - state: trinkets-equipped-INNERCLOTHING
+ sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/color/lightbrown.rsi
+
# Brown Jumpskirt
- type: entity
- parent: ClothingUniformSkirtBase
+ parent: [ClothingUniformSkirtBase, ClothingUniformFoldableBase]
id: ClothingUniformJumpskirtColorBrown
name: brown jumpskirt
description: A generic brown jumpskirt with no rank markings.
components:
- type: Sprite
- sprite: Clothing/Uniforms/Jumpskirt/color.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/color/color.rsi
layers:
- state: icon
color: "#a17229"
- - state: trinkets-icon
- type: Item
inhandVisuals:
left:
- state: inhand-left
color: "#a17229"
- - state: trinkets-inhand-left
right:
- state: inhand-right
color: "#a17229"
- - state: trinkets-inhand-right
- type: Clothing
- sprite: Clothing/Uniforms/Jumpskirt/color.rsi
- clothingVisuals:
- jumpsuit:
- - state: equipped-INNERCLOTHING
- color: "#a17229"
- - state: trinkets-equipped-INNERCLOTHING
+ sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/color/brown.rsi
+
# Maroon Jumpskirt
- type: entity
- parent: ClothingUniformSkirtBase
+ parent: [ClothingUniformSkirtBase, ClothingUniformFoldableBase]
id: ClothingUniformJumpskirtColorMaroon
name: maroon jumpskirt
description: A generic maroon jumpskirt with no rank markings.
components:
- type: Sprite
- sprite: Clothing/Uniforms/Jumpskirt/color.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/color/color.rsi
layers:
- state: icon
color: "#cc295f"
- - state: trinkets-icon
- type: Item
inhandVisuals:
left:
- state: inhand-left
color: "#cc295f"
- - state: trinkets-inhand-left
right:
- state: inhand-right
color: "#cc295f"
- - state: trinkets-inhand-right
- type: Clothing
- sprite: Clothing/Uniforms/Jumpskirt/color.rsi
- clothingVisuals:
- jumpsuit:
- - state: equipped-INNERCLOTHING
- color: "#cc295f"
- - state: trinkets-equipped-INNERCLOTHING
+ sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/color/red.rsi
+
# Rainbow Jumpskirt
- type: entity
- parent: ClothingUniformBase
+ parent: ClothingUniformSkirtBase # Goob
id: ClothingUniformJumpskirtColorRainbow
name: rainbow jumpskirt
description: A multi-colored jumpskirt!
components:
- type: Sprite
- sprite: Clothing/Uniforms/Jumpskirt/rainbow.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/color/rainbow.rsi
- type: Clothing
- sprite: Clothing/Uniforms/Jumpskirt/rainbow.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/color/rainbow.rsi
diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/color_jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/color_jumpsuits.yml
index 4e995188648..403fa41f7e0 100644
--- a/Resources/Prototypes/Entities/Clothing/Uniforms/color_jumpsuits.yml
+++ b/Resources/Prototypes/Entities/Clothing/Uniforms/color_jumpsuits.yml
@@ -7,497 +7,390 @@
# SPDX-FileCopyrightText: 2025 VMSolidus
#
# SPDX-License-Identifier: AGPL-3.0-or-later
+#
+# SPDX-License-Identifier: AGPL-3.0-or-later
+
+# Goobstation here is everything ClothingUniformFoldableBase and Sprites. Take ours here if upstreaming im lazy cant be bothered to webedit comment all this.
+
# White Jumpsuit
- type: entity
- parent: ClothingUniformBase
+ parent: [ClothingUniformBase, ClothingUniformFoldableBase]
id: ClothingUniformJumpsuitColorWhite
name: white jumpsuit
description: A generic white jumpsuit with no rank markings.
components:
- type: Sprite
- sprite: Clothing/Uniforms/Jumpsuit/color.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/color/color.rsi
layers:
- state: icon
- - state: trinkets-icon
- type: Item
inhandVisuals:
left:
- state: inhand-left
- - state: trinkets-inhand-left
right:
- state: inhand-right
- - state: trinkets-inhand-right
- type: Clothing
- sprite: Clothing/Uniforms/Jumpsuit/color.rsi
- clothingVisuals:
- jumpsuit:
- - state: equipped-INNERCLOTHING
- - state: trinkets-equipped-INNERCLOTHING
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/color/white.rsi
+
# Grey Jumpsuit
- type: entity
- parent: ClothingUniformBase
+ parent: [ClothingUniformBase, ClothingUniformFoldableBase]
id: ClothingUniformJumpsuitColorGrey
name: grey jumpsuit
description: A tasteful grey jumpsuit that reminds you of the good old days.
components:
- type: Sprite
- sprite: Clothing/Uniforms/Jumpsuit/color.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/color/color.rsi
layers:
- state: icon
color: "#b3b3b3"
- - state: trinkets-icon
- type: Item
inhandVisuals:
left:
- state: inhand-left
color: "#b3b3b3"
- - state: trinkets-inhand-left
right:
- state: inhand-right
color: "#b3b3b3"
- - state: trinkets-inhand-right
- type: Clothing
- sprite: Clothing/Uniforms/Jumpsuit/color.rsi
- clothingVisuals:
- jumpsuit:
- - state: equipped-INNERCLOTHING
- color: "#b3b3b3"
- - state: trinkets-equipped-INNERCLOTHING
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/color/grey.rsi
# Black Jumpsuit
- type: entity
- parent: ClothingUniformBase
+ parent: [ClothingUniformBase, ClothingUniformFoldableBase]
id: ClothingUniformJumpsuitColorBlack
name: black jumpsuit
description: A generic black jumpsuit with no rank markings.
components:
- type: Sprite
- sprite: Clothing/Uniforms/Jumpsuit/color.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/color/color.rsi
layers:
- state: icon
color: "#3f3f3f"
- - state: trinkets-icon
- type: Item
inhandVisuals:
left:
- state: inhand-left
color: "#3f3f3f"
- - state: trinkets-inhand-left
right:
- state: inhand-right
color: "#3f3f3f"
- - state: trinkets-inhand-right
- type: Clothing
- sprite: Clothing/Uniforms/Jumpsuit/color.rsi
- clothingVisuals:
- jumpsuit:
- - state: equipped-INNERCLOTHING
- color: "#3f3f3f"
- - state: trinkets-equipped-INNERCLOTHING
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/color/black.rsi
+
# Blue Jumpsuit
- type: entity
- parent: ClothingUniformBase
+ parent: [ClothingUniformBase, ClothingUniformFoldableBase]
id: ClothingUniformJumpsuitColorBlue
name: blue jumpsuit
description: A generic blue jumpsuit with no rank markings.
components:
- type: Sprite
- sprite: Clothing/Uniforms/Jumpsuit/color.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/color/color.rsi
layers:
- state: icon
color: "#52aecc"
- - state: trinkets-icon
- type: Item
inhandVisuals:
left:
- state: inhand-left
color: "#52aecc"
- - state: trinkets-inhand-left
right:
- state: inhand-right
color: "#52aecc"
- - state: trinkets-inhand-right
- type: Clothing
- sprite: Clothing/Uniforms/Jumpsuit/color.rsi
- clothingVisuals:
- jumpsuit:
- - state: equipped-INNERCLOTHING
- color: "#52aecc"
- - state: trinkets-equipped-INNERCLOTHING
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/color/blue.rsi
+
# Dark Blue Jumpsuit
- type: entity
- parent: ClothingUniformBase
+ parent: [ClothingUniformBase, ClothingUniformFoldableBase]
id: ClothingUniformJumpsuitColorDarkBlue
name: dark blue jumpsuit
description: A generic dark blue jumpsuit with no rank markings.
components:
- type: Sprite
- sprite: Clothing/Uniforms/Jumpsuit/color.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/color/color.rsi
layers:
- state: icon
color: "#3285ba"
- - state: trinkets-icon
- type: Item
inhandVisuals:
left:
- state: inhand-left
color: "#3285ba"
- - state: trinkets-inhand-left
right:
- state: inhand-right
color: "#3285ba"
- - state: trinkets-inhand-right
- type: Clothing
- sprite: Clothing/Uniforms/Jumpsuit/color.rsi
- clothingVisuals:
- jumpsuit:
- - state: equipped-INNERCLOTHING
- color: "#3285ba"
- - state: trinkets-equipped-INNERCLOTHING
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/color/darkblue.rsi
+
# Teal Jumpsuit
- type: entity
- parent: ClothingUniformBase
+ parent: [ClothingUniformBase, ClothingUniformFoldableBase]
id: ClothingUniformJumpsuitColorTeal
name: teal jumpsuit
description: A generic teal jumpsuit with no rank markings.
components:
- type: Sprite
- sprite: Clothing/Uniforms/Jumpsuit/color.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/color/color.rsi
layers:
- state: icon
color: "#77f3b7"
- - state: trinkets-icon
- type: Item
inhandVisuals:
left:
- state: inhand-left
color: "#77f3b7"
- - state: trinkets-inhand-left
right:
- state: inhand-right
color: "#77f3b7"
- - state: trinkets-inhand-right
- type: Clothing
- sprite: Clothing/Uniforms/Jumpsuit/color.rsi
- clothingVisuals:
- jumpsuit:
- - state: equipped-INNERCLOTHING
- color: "#77f3b7"
- - state: trinkets-equipped-INNERCLOTHING
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/color/aqua.rsi
+
# Green Jumpsuit
- type: entity
- parent: ClothingUniformBase
+ parent: [ClothingUniformBase, ClothingUniformFoldableBase]
id: ClothingUniformJumpsuitColorGreen
name: green jumpsuit
description: A generic green jumpsuit with no rank markings.
components:
- type: Sprite
- sprite: Clothing/Uniforms/Jumpsuit/color.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/color/color.rsi
layers:
- state: icon
color: "#9ed63a"
- - state: trinkets-icon
- type: Item
inhandVisuals:
left:
- state: inhand-left
color: "#9ed63a"
- - state: trinkets-inhand-left
right:
- state: inhand-right
color: "#9ed63a"
- - state: trinkets-inhand-right
- type: Clothing
- sprite: Clothing/Uniforms/Jumpsuit/color.rsi
- clothingVisuals:
- jumpsuit:
- - state: equipped-INNERCLOTHING
- color: "#9ed63a"
- - state: trinkets-equipped-INNERCLOTHING
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/color/green.rsi
+
# Dark Green Jumpsuit
- type: entity
- parent: ClothingUniformBase
+ parent: [ClothingUniformBase, ClothingUniformFoldableBase]
id: ClothingUniformJumpsuitColorDarkGreen
name: dark green jumpsuit
description: A generic dark green jumpsuit with no rank markings.
components:
- type: Sprite
- sprite: Clothing/Uniforms/Jumpsuit/color.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/color/color.rsi
layers:
- state: icon
color: "#007923"
- - state: trinkets-icon
- type: Item
inhandVisuals:
left:
- state: inhand-left
color: "#007923"
- - state: trinkets-inhand-left
right:
- state: inhand-right
color: "#007923"
- - state: trinkets-inhand-right
- type: Clothing
- sprite: Clothing/Uniforms/Jumpsuit/color.rsi
- clothingVisuals:
- jumpsuit:
- - state: equipped-INNERCLOTHING
- color: "#007923"
- - state: trinkets-equipped-INNERCLOTHING
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/color/darkgreen.rsi
+
# Orange Jumpsuit
- type: entity
- parent: ClothingUniformBase
+ parent: [ClothingUniformBase, ClothingUniformFoldableBase]
id: ClothingUniformJumpsuitColorOrange
name: orange jumpsuit
description: Don't wear this near paranoid security officers.
components:
- type: Sprite
- sprite: Clothing/Uniforms/Jumpsuit/color.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/color/color.rsi
layers:
- state: icon
color: "#ff8c19"
- - state: trinkets-icon
- type: Item
inhandVisuals:
left:
- state: inhand-left
color: "#ff8c19"
- - state: trinkets-inhand-left
right:
- state: inhand-right
color: "#ff8c19"
- - state: trinkets-inhand-right
- type: Clothing
- sprite: Clothing/Uniforms/Jumpsuit/color.rsi
- clothingVisuals:
- jumpsuit:
- - state: equipped-INNERCLOTHING
- color: "#ff8c19"
- - state: trinkets-equipped-INNERCLOTHING
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/color/orange.rsi
+
# Pink Jumpsuit
- type: entity
- parent: ClothingUniformBase
+ parent: [ClothingUniformBase, ClothingUniformFoldableBase]
id: ClothingUniformJumpsuitColorPink
name: pink jumpsuit
description: Just looking at this makes you feel fabulous.
components:
- type: Sprite
- sprite: Clothing/Uniforms/Jumpsuit/color.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/color/color.rsi
layers:
- state: icon
color: "#ffa69b"
- - state: trinkets-icon
- type: Item
inhandVisuals:
left:
- state: inhand-left
color: "#ffa69b"
- - state: trinkets-inhand-left
right:
- state: inhand-right
color: "#ffa69b"
- - state: trinkets-inhand-right
- type: Clothing
- sprite: Clothing/Uniforms/Jumpsuit/color.rsi
- clothingVisuals:
- jumpsuit:
- - state: equipped-INNERCLOTHING
- color: "#ffa69b"
- - state: trinkets-equipped-INNERCLOTHING
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/color/pink.rsi
+
# Red Jumpsuit
- type: entity
- parent: ClothingUniformBase
+ parent: [ClothingUniformBase, ClothingUniformFoldableBase]
id: ClothingUniformJumpsuitColorRed
name: red jumpsuit
description: A generic red jumpsuit with no rank markings.
components:
- type: Sprite
- sprite: Clothing/Uniforms/Jumpsuit/color.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/color/color.rsi
layers:
- state: icon
color: "#eb0c07"
- - state: trinkets-icon
- type: Item
inhandVisuals:
left:
- state: inhand-left
color: "#eb0c07"
- - state: trinkets-inhand-left
right:
- state: inhand-right
color: "#eb0c07"
- - state: trinkets-inhand-right
- type: Clothing
- sprite: Clothing/Uniforms/Jumpsuit/color.rsi
- clothingVisuals:
- jumpsuit:
- - state: equipped-INNERCLOTHING
- color: "#eb0c07"
- - state: trinkets-equipped-INNERCLOTHING
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/color/lightred.rsi
+
# Yellow Jumpsuit
- type: entity
- parent: ClothingUniformBase
+ parent: [ClothingUniformBase, ClothingUniformFoldableBase]
id: ClothingUniformJumpsuitColorYellow
name: yellow jumpsuit
description: A generic yellow jumpsuit with no rank markings.
components:
- type: Sprite
- sprite: Clothing/Uniforms/Jumpsuit/color.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/color/color.rsi
layers:
- state: icon
color: "#ffe14d"
- - state: trinkets-icon
- type: Item
inhandVisuals:
left:
- state: inhand-left
color: "#ffe14d"
- - state: trinkets-inhand-left
right:
- state: inhand-right
color: "#ffe14d"
- - state: trinkets-inhand-right
- type: Clothing
- sprite: Clothing/Uniforms/Jumpsuit/color.rsi
- clothingVisuals:
- jumpsuit:
- - state: equipped-INNERCLOTHING
- color: "#ffe14d"
- - state: trinkets-equipped-INNERCLOTHING
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/color/yellow.rsi
+
# Purple Jumpsuit
- type: entity
- parent: ClothingUniformBase
+ parent: [ClothingUniformBase, ClothingUniformFoldableBase]
id: ClothingUniformJumpsuitColorPurple
name: purple jumpsuit
description: A generic light purple jumpsuit with no rank markings.
components:
- type: Sprite
- sprite: Clothing/Uniforms/Jumpsuit/color.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/color/color.rsi
layers:
- state: icon
color: "#9f70cc"
- - state: trinkets-icon
- type: Item
inhandVisuals:
left:
- state: inhand-left
color: "#9f70cc"
- - state: trinkets-inhand-left
right:
- state: inhand-right
color: "#9f70cc"
- - state: trinkets-inhand-right
- type: Clothing
- sprite: Clothing/Uniforms/Jumpsuit/color.rsi
- clothingVisuals:
- jumpsuit:
- - state: equipped-INNERCLOTHING
- color: "#9f70cc"
- - state: trinkets-equipped-INNERCLOTHING
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/color/purple.rsi
+
# Light Brown Jumpsuit
- type: entity
- parent: ClothingUniformBase
+ parent: [ClothingUniformBase, ClothingUniformFoldableBase]
id: ClothingUniformJumpsuitColorLightBrown
name: light brown jumpsuit
description: A generic light brown jumpsuit with no rank markings.
components:
- type: Sprite
- sprite: Clothing/Uniforms/Jumpsuit/color.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/color/color.rsi
layers:
- state: icon
color: "#c59431"
- - state: trinkets-icon
- type: Item
inhandVisuals:
left:
- state: inhand-left
color: "#c59431"
- - state: trinkets-inhand-left
right:
- state: inhand-right
color: "#c59431"
- - state: trinkets-inhand-right
- type: Clothing
- sprite: Clothing/Uniforms/Jumpsuit/color.rsi
- clothingVisuals:
- jumpsuit:
- - state: equipped-INNERCLOTHING
- color: "#c59431"
- - state: trinkets-equipped-INNERCLOTHING
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/color/lightbrown.rsi
+
# Brown Jumpsuit
- type: entity
- parent: ClothingUniformBase
+ parent: [ClothingUniformBase, ClothingUniformFoldableBase]
id: ClothingUniformJumpsuitColorBrown
name: brown jumpsuit
description: A generic brown jumpsuit with no rank markings.
components:
- type: Sprite
- sprite: Clothing/Uniforms/Jumpsuit/color.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/color/color.rsi
layers:
- state: icon
color: "#a17229"
- - state: trinkets-icon
- type: Item
inhandVisuals:
left:
- state: inhand-left
color: "#a17229"
- - state: trinkets-inhand-left
right:
- state: inhand-right
color: "#a17229"
- - state: trinkets-inhand-right
- type: Clothing
- sprite: Clothing/Uniforms/Jumpsuit/color.rsi
- clothingVisuals:
- jumpsuit:
- - state: equipped-INNERCLOTHING
- color: "#a17229"
- - state: trinkets-equipped-INNERCLOTHING
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/color/brown.rsi
+
# Maroon Jumpsuit
- type: entity
- parent: ClothingUniformBase
+ parent: [ClothingUniformBase, ClothingUniformFoldableBase]
id: ClothingUniformJumpsuitColorMaroon
name: maroon jumpsuit
description: A generic maroon jumpsuit with no rank markings.
components:
- type: Sprite
- sprite: Clothing/Uniforms/Jumpsuit/color.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/color/color.rsi
layers:
- state: icon
color: "#cc295f"
- - state: trinkets-icon
- type: Item
inhandVisuals:
left:
- state: inhand-left
color: "#cc295f"
- - state: trinkets-inhand-left
right:
- state: inhand-right
color: "#cc295f"
- - state: trinkets-inhand-right
- type: Clothing
- sprite: Clothing/Uniforms/Jumpsuit/color.rsi
- clothingVisuals:
- jumpsuit:
- - state: equipped-INNERCLOTHING
- color: "#cc295f"
- - state: trinkets-equipped-INNERCLOTHING
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/color/red.rsi
+
# Rainbow Jumpsuit
- type: entity
@@ -507,6 +400,12 @@
description: A multi-colored jumpsuit!
components:
- type: Sprite
- sprite: Clothing/Uniforms/Jumpsuit/rainbow.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/color/rainbow.rsi
+ - type: Item
+ inhandVisuals:
+ left:
+ - state: inhand-left
+ right:
+ - state: inhand-right
- type: Clothing
- sprite: Clothing/Uniforms/Jumpsuit/rainbow.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/color/rainbow.rsi
diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml
index 60ab0118be4..e4cdd70d759 100644
--- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml
+++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml
@@ -116,6 +116,8 @@
#
# SPDX-License-Identifier: AGPL-3.0-or-later
+# Hey idiot, the sprites under _Goobstation/ are goobstation duh.
+
- type: entity
parent: ClothingUniformSkirtBase
id: ClothingUniformJumpskirtBartender
@@ -128,37 +130,45 @@
sprite: Clothing/Uniforms/Jumpskirt/bartender.rsi
- type: entity
- parent: [ClothingUniformSkirtBase, BaseCommandContraband]
+ parent: [ClothingUniformSkirtBase, ClothingUniformFoldableBase, BaseCommandContraband] # Goob
id: ClothingUniformJumpskirtCaptain
name: captain's jumpskirt
description: It's a blue jumpskirt with some gold markings denoting the rank of "Captain".
components:
- type: Sprite
- sprite: Clothing/Uniforms/Jumpskirt/captain.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/captain.rsi # Goob
- type: Clothing
- sprite: Clothing/Uniforms/Jumpskirt/captain.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/captain.rsi # Goob
- type: entity
- parent: ClothingUniformSkirtBase
+ parent: [ClothingUniformSkirtBase, ClothingUniformFoldableBase] # Goob
id: ClothingUniformJumpskirtCargo
name: cargo tech jumpskirt
description: A sturdy jumpskirt, issued to members of the Cargo department.
components:
- type: Sprite
- sprite: Clothing/Uniforms/Jumpskirt/cargotech.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/Cargo/cargotech.rsi # Goob
+ - type: Item # Goob
+ inhandVisuals:
+ left:
+ - state: inhand-left
+ color: "#b7793d"
+ right:
+ - state: inhand-right
+ color: "#b7793d"
- type: Clothing
- sprite: Clothing/Uniforms/Jumpskirt/cargotech.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/Cargo/cargotech.rsi # Goob
- type: entity
- parent: [ClothingUniformSkirtBase, BaseCommandContraband]
+ parent: [ClothingUniformSkirtBase, ClothingUniformFoldableBase, BaseCommandContraband] # Goob
id: ClothingUniformJumpskirtChiefEngineer
name: chief engineer's jumpskirt
description: It's a high visibility jumpskirt given to those engineers insane enough to achieve the rank of Chief Engineer.
components:
- type: Sprite
- sprite: Clothing/Uniforms/Jumpskirt/ce.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/Engineering/ce.rsi # Goob
- type: Clothing
- sprite: Clothing/Uniforms/Jumpskirt/ce.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/Engineering/ce.rsi # Goob
- type: entity
parent: [ClothingUniformSkirtBase, BaseCommandContraband]
@@ -194,48 +204,48 @@
sprite: Clothing/Uniforms/Jumpskirt/chef.rsi
- type: entity
- parent: ClothingUniformSkirtBase
+ parent: [ClothingUniformSkirtBase, ClothingUniformFoldableBase] # Goob
id: ClothingUniformJumpskirtChemistry
name: chemistry jumpskirt
description: There's some odd stains on this jumpskirt. Hm.
components:
- type: Sprite
- sprite: Clothing/Uniforms/Jumpskirt/chemistry.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/Medical/chemistry.rsi # Goob
- type: Clothing
- sprite: Clothing/Uniforms/Jumpskirt/chemistry.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/Medical/chemistry.rsi # Goob
- type: entity
- parent: ClothingUniformSkirtBase
+ parent: [ClothingUniformSkirtBase, ClothingUniformFoldableBase] # Goob
id: ClothingUniformJumpskirtVirology
name: virology jumpskirt
description: It's made of a special fiber that gives special protection against biohazards. It has a virologist rank stripe on it.
components:
- type: Sprite
- sprite: Clothing/Uniforms/Jumpskirt/virology.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/Medical/virology.rsi # Goob
- type: Clothing
- sprite: Clothing/Uniforms/Jumpskirt/virology.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/Medical/virology.rsi # Goob
- type: entity
- parent: ClothingUniformSkirtBase
+ parent: [ClothingUniformSkirtBase, ClothingUniformFoldableBase] # Goob
id: ClothingUniformJumpskirtGenetics
name: genetics jumpskirt
description: It's made of a special fiber that gives special protection against biohazards. It has a geneticist rank stripe on it.
components:
- type: Sprite
- sprite: Clothing/Uniforms/Jumpskirt/genetics.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/Medical/genetics.rsi # Goob
- type: Clothing
- sprite: Clothing/Uniforms/Jumpskirt/genetics.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/Medical/genetics.rsi # Goob
- type: entity
- parent: [ClothingUniformSkirtBase, BaseCommandContraband]
+ parent: [ClothingUniformSkirtBase, ClothingUniformFoldableBase, BaseCommandContraband] # Goob
id: ClothingUniformJumpskirtCMO
name: chief medical officer's jumpskirt
description: It's a jumpskirt worn by those with the experience to be Chief Medical Officer. It provides minor biological protection.
components:
- type: Sprite
- sprite: Clothing/Uniforms/Jumpskirt/cmo.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/Medical/cmo.rsi # Goob
- type: Clothing
- sprite: Clothing/Uniforms/Jumpskirt/cmo.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/Medical/cmo.rsi # Goob
- type: entity
parent: [ClothingUniformSkirtBase, BaseCommandContraband]
@@ -249,84 +259,84 @@
sprite: Clothing/Uniforms/Jumpskirt/cmo_turtle.rsi
- type: entity
- parent: ClothingUniformSkirtBase
+ parent: [ClothingUniformSkirtBase, ClothingUniformFoldableBase, BaseSecurityContraband] # Goob
id: ClothingUniformJumpskirtDetective
name: hard-worn suitskirt
description: Someone who wears this means business.
components:
- type: Sprite
- sprite: Clothing/Uniforms/Jumpskirt/detective.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/Security/detective.rsi # Goob
- type: Clothing
- sprite: Clothing/Uniforms/Jumpskirt/detective.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/Security/detective.rsi # Goob
- type: entity
- parent: ClothingUniformSkirtBase
+ parent: [ClothingUniformSkirtBase, ClothingUniformFoldableBase, BaseSecurityContraband] # Goob
id: ClothingUniformJumpskirtDetectiveGrey
name: noir suitskirt
description: A hard-boiled private investigator's grey suit, complete with tie clip.
components:
- type: Sprite
- sprite: Clothing/Uniforms/Jumpskirt/detective_grey.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/Security/detective_grey.rsi # Goob
- type: Clothing
- sprite: Clothing/Uniforms/Jumpskirt/detective_grey.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/Security/detective_grey.rsi # Goob
- type: entity
- parent: ClothingUniformSkirtBase
+ parent: [ClothingUniformSkirtBase, ClothingUniformFoldableBase] # Goob
id: ClothingUniformJumpskirtEngineering
name: engineering jumpskirt
description: If this suit was non-conductive, maybe engineers would actually do their damn job.
components:
- type: Sprite
- sprite: Clothing/Uniforms/Jumpskirt/engineering.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/Engineering/engineering.rsi # Goob
- type: Clothing
- sprite: Clothing/Uniforms/Jumpskirt/engineering.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/Engineering/engineering.rsi # Goob
- type: entity
- parent: [ClothingUniformSkirtBase, BaseCommandContraband]
+ parent: [ClothingUniformSkirtBase, ClothingUniformFoldableBase, BaseCommandContraband] # Goob
id: ClothingUniformJumpskirtHoP
name: head of personnel's jumpskirt
description: Rather bland and inoffensive. Perfect for vanishing off the face of the universe.
components:
- type: Sprite
- sprite: Clothing/Uniforms/Jumpskirt/hop.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/hop.rsi # Goob
- type: Clothing
- sprite: Clothing/Uniforms/Jumpskirt/hop.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/hop.rsi # Goob
- type: entity
- parent: [ClothingUniformSkirtBase, BaseCommandContraband]
+ parent: [ClothingUniformSkirtBase, ClothingUniformFoldableBase, BaseCommandContraband] # Goob
id: ClothingUniformJumpskirtHoS
name: head of security's jumpskirt
description: It's bright red and rather crisp, much like security's victims tend to be.
components:
- type: Sprite
- sprite: Clothing/Uniforms/Jumpskirt/hos.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/Security/hos.rsi # Goob
- type: Clothing
- sprite: Clothing/Uniforms/Jumpskirt/hos.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/Security/hos.rsi # Goob
- type: Item
inhandVisuals:
left:
- state: inhand-left
color: "#C12D30"
- sprite: Clothing/Uniforms/Jumpskirt/color.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/color/color.rsi # Goob
- state: overlay-inhand-left
- sprite: Clothing/Uniforms/Jumpsuit/hos.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/Security/hos.rsi # Goob
right:
- state: inhand-right
color: "#C12D30"
- sprite: Clothing/Uniforms/Jumpskirt/color.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/color/color.rsi # Goob
- state: overlay-inhand-right
- sprite: Clothing/Uniforms/Jumpsuit/hos.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/Security/hos.rsi # Goob
- type: entity
- parent: [ClothingUniformSkirtBase, BaseCommandContraband]
+ parent: [ClothingUniformSkirtBase, ClothingUniformFoldableBase, BaseCommandContraband] # Goob
id: ClothingUniformJumpskirtHoSAlt
name: head of security's turtleneck
description: It's a turtleneck worn by those strong and disciplined enough to achieve the position of Head of Security.
components:
- type: Sprite
- sprite: Clothing/Uniforms/Jumpskirt/hos_alt.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/Security/hos_alt.rsi # Goob
- type: Clothing
- sprite: Clothing/Uniforms/Jumpskirt/hos_alt.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/Security/hos_alt.rsi # Goob
- type: entity
parent: [ClothingUniformSkirtBase, BaseCommandContraband]
@@ -351,59 +361,67 @@
sprite: Clothing/Uniforms/Jumpskirt/commandgeneric.rsi
- type: entity
- parent: ClothingUniformSkirtBase
+ parent: [ClothingUniformSkirtBase, ClothingUniformFoldableBase] # Goob
id: ClothingUniformJumpskirtHydroponics
name: hydroponics jumpskirt
description: Has a strong earthy smell to it. Hopefully it's merely dirty as opposed to soiled.
components:
- type: Sprite
- sprite: Clothing/Uniforms/Jumpskirt/hydro.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/hydro.rsi # Goob
- type: Clothing
- sprite: Clothing/Uniforms/Jumpskirt/hydro.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/hydro.rsi # Goob
- type: entity
- parent: ClothingUniformSkirtBase
+ parent: [ClothingUniformSkirtBase, ClothingUniformFoldableBase] # Goob
id: ClothingUniformJumpskirtJanitor
name: janitor jumpskirt
description: The jumpskirt for the poor sop with a mop.
components:
- type: Sprite
- sprite: Clothing/Uniforms/Jumpskirt/janitor.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/janitor.rsi # Goob
- type: Clothing
- sprite: Clothing/Uniforms/Jumpskirt/janitor.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/janitor.rsi # Goob
- type: entity
- parent: ClothingUniformSkirtBase
+ parent: [ClothingUniformSkirtBase, ClothingUniformFoldableBase] # Goob
id: ClothingUniformJumpskirtMedicalDoctor
name: medical doctor jumpskirt
description: It's made of a special fiber that provides minor protection against biohazards. It has a cross on the chest denoting that the wearer is trained medical personnel.
components:
- type: Sprite
- sprite: Clothing/Uniforms/Jumpskirt/medical.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/Medical/medical.rsi # Goob
- type: Clothing
- sprite: Clothing/Uniforms/Jumpskirt/medical.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/Medical/medical.rsi # Goob
- type: entity
- parent: ClothingUniformSkirtBase
+ parent: [ClothingUniformSkirtBase, ClothingUniformFoldableBase] # Goob
id: ClothingUniformJumpskirtMime
name: mime jumpskirt
description: ...
components:
- type: Sprite
- sprite: Clothing/Uniforms/Jumpskirt/mime.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/mime.rsi # Goob
- type: Clothing
- sprite: Clothing/Uniforms/Jumpskirt/mime.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/mime.rsi # Goob
- type: entity
- parent: ClothingUniformSkirtBase
+ parent: [ClothingUniformSkirtBase, ClothingUniformFoldableBase] # Goob
id: ClothingUniformJumpskirtParamedic
name: paramedic jumpskirt
description: It's got a plus on it, that's a good thing right?
components:
- type: Sprite
- sprite: Clothing/Uniforms/Jumpskirt/paramedic.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/Medical/paramedic.rsi # Goob
+ - type: Item # Goob
+ inhandVisuals:
+ left:
+ - state: inhand-left
+ color: "#364660"
+ right:
+ - state: inhand-right
+ color: "#364660"
- type: Clothing
- sprite: Clothing/Uniforms/Jumpskirt/paramedic.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/Medical/paramedic.rsi # Goob
- type: entity
parent: ClothingUniformSkirtBase
@@ -417,34 +435,34 @@
sprite: Clothing/Uniforms/Jumpskirt/brigmedic.rsi
- type: entity
- parent: ClothingUniformBase
+ parent: [ClothingUniformSkirtBase, ClothingUniformFoldableBase] # Goob
id: ClothingUniformJumpskirtPrisoner
name: prisoner jumpskirt
description: A jumpskirt used for prisoners. It has suit sensors automatically enabled at all times.
components:
- type: Sprite
- sprite: Clothing/Uniforms/Jumpskirt/color.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/color/prisoner.rsi # Goob
layers:
- state: icon
- color: "#ff8300"
- - state: prisoner-icon
+ # color: "#ff8300" # Goob
+ #- state: prisoner-icon
- type: Item
inhandVisuals:
left:
- state: inhand-left
- color: "#ff8300"
- - state: prisoner-inhand-left
+ # color: "#ff8300" # Goob
+ # - state: prisoner-inhand-left
right:
- state: inhand-right
- color: "#ff8300"
- - state: prisoner-inhand-right
+ # color: "#ff8300" # Goob
+ # - state: prisoner-inhand-right
- type: Clothing
- sprite: Clothing/Uniforms/Jumpskirt/color.rsi
- clothingVisuals:
- jumpsuit:
- - state: equipped-INNERCLOTHING
- color: "#ff8300"
- - state: prisoner-equipped-INNERCLOTHING
+ sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/color/prisoner.rsi # Goob
+ #clothingVisuals: # Goob
+ # jumpsuit:
+ # - state: equipped-INNERCLOTHING
+ # color: "#ff8300"
+ # - state: prisoner-equipped-INNERCLOTHING
- type: SuitSensor
controlsLocked: true
randomMode: false
@@ -458,26 +476,42 @@
- Skirt
- type: entity
- parent: [ClothingUniformSkirtBase, BaseCommandContraband]
+ parent: [ClothingUniformSkirtBase, ClothingUniformFoldableBase, BaseCommandContraband] # Goob
id: ClothingUniformJumpskirtQM
name: quartermaster's jumpskirt
description: 'What can brown do for you?'
components:
- type: Sprite
- sprite: Clothing/Uniforms/Jumpskirt/qm.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/Cargo/qm.rsi # Goob
+ - type: Item # Goob
+ inhandVisuals:
+ left:
+ - state: inhand-left
+ color: "#b7793d"
+ right:
+ - state: inhand-right
+ color: "#b7793d"
- type: Clothing
- sprite: Clothing/Uniforms/Jumpskirt/qm.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/Cargo/qm.rsi # Goob
- type: entity
- parent: [ClothingUniformSkirtBase, BaseCommandContraband]
+ parent: [ClothingUniformSkirtBase, ClothingUniformFoldableBase, BaseCommandContraband] # Goob
id: ClothingUniformJumpskirtQMTurtleneck
name: quartermasters's turtleneck
description: A sharp turtleneck made for the hardy work environment of supply.
components:
- type: Sprite
- sprite: Clothing/Uniforms/Jumpskirt/qmturtleskirt.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/Cargo/qmturtleskirt.rsi # Goob
+ - type: Item # Goob
+ inhandVisuals:
+ left:
+ - state: inhand-left
+ color: "#b7793d"
+ right:
+ - state: inhand-right
+ color: "#b7793d"
- type: Clothing
- sprite: Clothing/Uniforms/Jumpskirt/qmturtleskirt.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/Cargo/qmturtleskirt.rsi # Goob
- type: entity
parent: [ClothingUniformSkirtBase, BaseCommandContraband]
@@ -486,82 +520,82 @@
description: It's a turtleneck worn by those with the know-how to achieve the position of Research Director. Its fabric provides minor protection from biological contaminants.
components:
- type: Sprite
- sprite: Clothing/Uniforms/Jumpskirt/rnd.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/RND/rnd.rsi # Goob
- type: Clothing
- sprite: Clothing/Uniforms/Jumpskirt/rnd.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/RND/rnd.rsi # Goob
- type: entity
- parent: ClothingUniformSkirtBase
+ parent: [ClothingUniformSkirtBase, ClothingUniformFoldableBase] # Goob
id: ClothingUniformJumpskirtScientist
name: scientist jumpskirt
description: It's made of a special fiber that increases perceived intelligence and decreases personal ethics. It has markings that denote the wearer as a scientist.
components:
- type: Sprite
- sprite: Clothing/Uniforms/Jumpskirt/scientist.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/RND/scientist.rsi # Goob
- type: Clothing
- sprite: Clothing/Uniforms/Jumpskirt/scientist.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/RND/scientist.rsi # Goob
- type: entity
- parent: ClothingUniformSkirtBase
+ parent: [ClothingUniformSkirtBase, ClothingUniformFoldableBase] # Goob
id: ClothingUniformJumpskirtRoboticist
name: roboticist jumpskirt
description: It's a slimming black with reinforced seams; great for industrial work.
components:
- type: Sprite
- sprite: Clothing/Uniforms/Jumpskirt/roboticist.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/RND/roboticist.rsi # Goob
- type: Clothing
- sprite: Clothing/Uniforms/Jumpskirt/roboticist.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/RND/roboticist.rsi # Goob
- type: entity
- parent: [ClothingUniformSkirtBase, BaseSecurityContraband]
+ parent: [ClothingUniformSkirtBase, ClothingUniformFoldableBase, BaseSecurityContraband] # Goob
id: ClothingUniformJumpskirtSec
name: security jumpskirt
description: A jumpskirt made of strong material, providing robust protection.
components:
- type: Sprite
- sprite: Clothing/Uniforms/Jumpskirt/security.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/Security/security.rsi # Goob
- type: Clothing
- sprite: Clothing/Uniforms/Jumpskirt/security.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/Security/security.rsi # Goob
- type: Item
inhandVisuals:
left:
- state: inhand-left
color: "#C12D30"
- sprite: Clothing/Uniforms/Jumpskirt/color.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/color/color.rsi # Goob
- state: overlay-inhand-left
- sprite: Clothing/Uniforms/Jumpsuit/security.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/Security/security.rsi # Goob
right:
- state: inhand-right
color: "#C12D30"
- sprite: Clothing/Uniforms/Jumpskirt/color.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/color/color.rsi # Goob
- state: overlay-inhand-right
- sprite: Clothing/Uniforms/Jumpsuit/security.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/Security/security.rsi # Goob
- type: entity
- parent: [ClothingUniformSkirtBase, BaseSecurityContraband]
+ parent: [ClothingUniformSkirtBase, ClothingUniformFoldableBase, BaseSecurityContraband]
id: ClothingUniformJumpskirtWarden
name: warden's uniform
- description: A formal security suit for officers complete with Nanotrasen belt buckle.
+ description: A formal security suit for officers complete with Nanotrasen belt buckle. # Goob
components:
- type: Sprite
- sprite: Clothing/Uniforms/Jumpskirt/warden.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/Security/warden.rsi # Goob
- type: Clothing
- sprite: Clothing/Uniforms/Jumpskirt/warden.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/Security/warden.rsi # Goob
- type: Item
inhandVisuals:
left:
- state: inhand-left
color: "#C12D30"
- sprite: Clothing/Uniforms/Jumpskirt/color.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/color/color.rsi # Goob
- state: overlay-inhand-left
- sprite: Clothing/Uniforms/Jumpsuit/warden.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/Security/warden.rsi # Goob
right:
- state: inhand-right
color: "#C12D30"
- sprite: Clothing/Uniforms/Jumpskirt/color.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/color/color.rsi # Goob
- state: overlay-inhand-right
- sprite: Clothing/Uniforms/Jumpsuit/warden.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/Security/warden.rsi # Goob
- type: entity
@@ -593,9 +627,9 @@
description: Hi, I'm Scott, president of Donk Pizza. Have you heard of [FAMOUS VIRTUAL PERFORMER]?
components:
- type: Sprite
- sprite: Clothing/Uniforms/Jumpskirt/performer.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/performer.rsi
- type: Clothing
- sprite: Clothing/Uniforms/Jumpskirt/performer.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/performer.rsi
- type: entity
parent: ClothingUniformSkirtBase
@@ -631,15 +665,15 @@
sprite: Clothing/Uniforms/Jumpskirt/hosformaldress.rsi
- type: entity
- parent: [UnsensoredClothingUniformSkirtBase, BaseSyndicateContraband]
+ parent: [UnsensoredClothingUniformSkirtBase,ClothingUniformFoldableBase, BaseSyndicateContraband] # Goob
id: ClothingUniformJumpskirtOperative
name: operative jumpskirt
description: Uniform for elite syndicate operatives performing tactical operations in deep space.
components:
- type: Sprite
- sprite: Clothing/Uniforms/Jumpskirt/operative_s.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/Syndicate/operative_s.rsi # Goob
- type: Clothing
- sprite: Clothing/Uniforms/Jumpskirt/operative_s.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/Syndicate/operative_s.rsi # Goob
- type: StaticPrice
price: 500
@@ -659,15 +693,15 @@
mode: SensorOff
- type: entity
- parent: ClothingUniformSkirtBase
+ parent: [ClothingUniformSkirtBase, ClothingUniformFoldableBase] # Goob
id: ClothingUniformJumpskirtAtmos
name: atmospheric technician jumpskirt
description: I am at work. I can't leave work. Work is breathing. I am testing air quality.
components:
- type: Sprite
- sprite: Clothing/Uniforms/Jumpskirt/atmosf.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/Engineering/atmosf.rsi # Goob
- type: Clothing
- sprite: Clothing/Uniforms/Jumpskirt/atmosf.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/Engineering/atmosf.rsi # Goob
- type: entity
parent: ClothingUniformSkirtBase
@@ -780,59 +814,59 @@
sprite: Clothing/Uniforms/Jumpskirt/skirtoflife.rsi
- type: entity
- parent: ClothingUniformSkirtBase
+ parent: [ClothingUniformSkirtBase, ClothingUniformFoldableBase] # Goob
id: ClothingUniformJumpskirtSeniorEngineer
name: senior engineer jumpskirt
description: A sign of skill and prestige within the engineering department.
components:
- type: Sprite
- sprite: Clothing/Uniforms/Jumpskirt/senior_engineer.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/Engineering/senior_engineer.rsi # Goob
- type: Clothing
- sprite: Clothing/Uniforms/Jumpskirt/senior_engineer.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/Engineering/senior_engineer.rsi # Goob
- type: entity
- parent: ClothingUniformSkirtBase
+ parent: [ClothingUniformSkirtBase, ClothingUniformFoldableBase] # Goob
id: ClothingUniformJumpskirtSeniorResearcher
name: senior researcher jumpskirt
description: A sign of skill and prestige within the science department.
components:
- type: Sprite
- sprite: Clothing/Uniforms/Jumpskirt/senior_researcher.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/RND/senior_researcher.rsi # Goob
- type: Clothing
- sprite: Clothing/Uniforms/Jumpskirt/senior_researcher.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/RND/senior_researcher.rsi # Goob
- type: entity
- parent: ClothingUniformSkirtBase
+ parent: [ClothingUniformSkirtBase, ClothingUniformFoldableBase] # Goob
id: ClothingUniformJumpskirtSeniorPhysician
name: senior physician jumpskirt
description: A sign of skill and prestige within the medical department.
components:
- type: Sprite
- sprite: Clothing/Uniforms/Jumpskirt/senior_physician.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/Medical/senior_physician.rsi # Goob
- type: Clothing
- sprite: Clothing/Uniforms/Jumpskirt/senior_physician.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/Medical/senior_physician.rsi # Goob
- type: entity
- parent: [ClothingUniformSkirtBase, BaseSecurityContraband]
+ parent: [ClothingUniformSkirtBase, ClothingUniformFoldableBase, BaseSecurityContraband] # Goob
id: ClothingUniformJumpskirtSeniorOfficer
name: senior officer jumpskirt
description: A sign of skill and prestige within the security department.
components:
- type: Sprite
- sprite: Clothing/Uniforms/Jumpskirt/senior_officer.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/Security/senior_officer.rsi # Goob
- type: Clothing
- sprite: Clothing/Uniforms/Jumpskirt/senior_officer.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/Security/senior_officer.rsi # Goob
- type: entity
- parent: [ClothingUniformSkirtBase, BaseSecurityContraband]
+ parent: [ClothingUniformSkirtBase, ClothingUniformFoldableBase, BaseSecurityContraband] # Goob
id: ClothingUniformJumpskirtSecGrey
name: grey security jumpskirt
description: A tactical relic of years past before Nanotrasen decided it was cheaper to dye the suits red instead of washing out the blood.
components:
- type: Sprite
- sprite: Clothing/Uniforms/Jumpskirt/security_grey.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/Security/security_grey.rsi # Goob
- type: Clothing
- sprite: Clothing/Uniforms/Jumpskirt/security_grey.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/Security/security_grey.rsi # Goob
- type: entity
parent: ClothingUniformSkirtBase
diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
index 20c6407fd57..c2858ac3131 100644
--- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
+++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
@@ -12,24 +12,27 @@
tags: [] # ignore "WhitelistChameleon" tag
- type: entity
- parent: ClothingUniformBase
+ parent: [ClothingUniformBase, ClothingUniformFoldableBase] # Goob
id: ClothingUniformJumpsuitAncient
name: ancient jumpsuit
description: A terribly ragged and frayed grey jumpsuit. It looks like it hasn't been washed in over a decade.
components:
- type: Sprite
- sprite: Clothing/Uniforms/Jumpsuit/ancient.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/color/color.rsi # Goob
+ layers:
+ - state: icon
+ color: "#b3b3b3"
- type: Clothing
- sprite: Clothing/Uniforms/Jumpsuit/ancient.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/color/ancient.rsi
- type: entity
- parent: ClothingUniformBase
+ parent: [ClothingUniformBase, ClothingUniformFoldableBase] # Goob
id: ClothingUniformJumpsuitBartender
name: bartender's uniform
description: A nice and tidy uniform. Shame about the bar though.
components:
- type: Sprite
- sprite: Clothing/Uniforms/Jumpsuit/bartender.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/bartender.rsi # Goob
- type: entity
parent: ClothingUniformBase
@@ -58,44 +61,52 @@
sprite: Clothing/Uniforms/Jumpsuit/bartender_purple.rsi
- type: entity
- parent: [ClothingUniformBase, BaseCommandContraband]
+ parent: [ClothingUniformBase, ClothingUniformFoldableBase, BaseCommandContraband] # Goob
id: ClothingUniformJumpsuitCaptain
name: captain's jumpsuit
description: It's a blue jumpsuit with some gold markings denoting the rank of "Captain".
components:
- type: Sprite
- sprite: Clothing/Uniforms/Jumpsuit/captain.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/captain.rsi # Goob
- type: Clothing
- sprite: Clothing/Uniforms/Jumpsuit/captain.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/captain.rsi # Goob
- type: entity
- parent: ClothingUniformBase
+ parent: [ClothingUniformBase, ClothingUniformFoldableBase] # Goob
id: ClothingUniformJumpsuitCargo
name: cargo tech jumpsuit
description: A sturdy jumpsuit, issued to members of the Cargo department.
components:
- type: Sprite
- sprite: Clothing/Uniforms/Jumpsuit/cargotech.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/Cargo/cargotech.rsi # Goob
+ - type: Item # Goob
+ inhandVisuals:
+ left:
+ - state: inhand-left
+ color: "#b7793d"
+ right:
+ - state: inhand-right
+ color: "#b7793d"
- type: entity
- parent: ClothingUniformBase
+ parent: [ClothingUniformBase, ClothingUniformFoldableBase] # Goob
id: ClothingUniformJumpsuitSalvageSpecialist
name: salvage specialist's jumpsuit
description: It's a snappy jumpsuit with a sturdy set of overalls. It's very dirty.
components:
- type: Sprite
- sprite: Clothing/Uniforms/Jumpsuit/salvage.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/Cargo/salvage.rsi # Goob
- type: Clothing
- sprite: Clothing/Uniforms/Jumpsuit/salvage.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/Cargo/salvage.rsi # Goob
- type: entity
- parent: [ClothingUniformBase, BaseCommandContraband]
+ parent: [ClothingUniformBase, ClothingUniformFoldableBase, BaseCommandContraband] # Goob
id: ClothingUniformJumpsuitChiefEngineer
name: chief engineer's jumpsuit
description: It's a high visibility jumpsuit given to those engineers insane enough to achieve the rank of Chief Engineer.
components:
- type: Sprite
- sprite: Clothing/Uniforms/Jumpsuit/ce.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/Engineering/ce.rsi # Goob
- type: entity
parent: [ClothingUniformBase, BaseCommandContraband]
@@ -153,46 +164,46 @@
sprite: Clothing/Uniforms/Jumpsuit/centcom_officer.rsi
- type: entity
- parent: ClothingUniformBase
+ parent: [ClothingUniformBase, ClothingUniformFoldableBase] # Goob
id: ClothingUniformJumpsuitChef
name: chef uniform
description: Can't cook without this.
components:
- type: Sprite
- sprite: Clothing/Uniforms/Jumpsuit/chef.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/chef.rsi # Goob
- type: Clothing
- sprite: Clothing/Uniforms/Jumpsuit/chef.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/chef.rsi # Goob
- type: entity
- parent: ClothingUniformBase
+ parent: [ClothingUniformBase, ClothingUniformFoldableBase] # Goob
id: ClothingUniformJumpsuitChemistry
name: chemistry jumpsuit
description: There's some odd stains on this jumpsuit. Hm.
components:
- type: Sprite
- sprite: Clothing/Uniforms/Jumpsuit/chemistry.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/Medical/chemistry.rsi # Goob
- type: entity
- parent: ClothingUniformBase
+ parent: [ClothingUniformBase, ClothingUniformFoldableBase] # Goob
id: ClothingUniformJumpsuitVirology
name: virology jumpsuit
description: It's made of a special fiber that gives special protection against biohazards. It has a virologist rank stripe on it.
components:
- type: Sprite
- sprite: Clothing/Uniforms/Jumpsuit/virology.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/Medical/virology.rsi # Goob
- type: Clothing
- sprite: Clothing/Uniforms/Jumpsuit/virology.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/Medical/virology.rsi # Goob
- type: entity
- parent: ClothingUniformBase
+ parent: [ClothingUniformBase, ClothingUniformFoldableBase] # Goob
id: ClothingUniformJumpsuitGenetics
name: genetics jumpsuit
description: It's made of a special fiber that gives special protection against biohazards. It has a geneticist rank stripe on it.
components:
- type: Sprite
- sprite: Clothing/Uniforms/Jumpsuit/genetics.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/Medical/genetics.rsi # Goob
- type: Clothing
- sprite: Clothing/Uniforms/Jumpsuit/genetics.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/Medical/genetics.rsi # Goob
- type: entity
parent: ClothingUniformBase
@@ -251,13 +262,13 @@
sprite: Clothing/Uniforms/Jumpsuit/jester2.rsi
- type: entity
- parent: [ClothingUniformBase, BaseCommandContraband]
+ parent: [ClothingUniformBase, ClothingUniformFoldableBase, BaseCommandContraband] # Goob
id: ClothingUniformJumpsuitCMO
name: chief medical officer's jumpsuit
description: It's a jumpsuit worn by those with the experience to be Chief Medical Officer. It provides minor biological protection.
components:
- type: Sprite
- sprite: Clothing/Uniforms/Jumpsuit/cmo.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/Medical/cmo.rsi # Goob
- type: entity
parent: [ClothingUniformBase, BaseCommandContraband]
@@ -271,109 +282,109 @@
sprite: Clothing/Uniforms/Jumpsuit/cmo_turtle.rsi
- type: entity
- parent: ClothingUniformBase
+ parent: [ClothingUniformBase, ClothingUniformFoldableBase, BaseSecurityContraband] # Goob
id: ClothingUniformJumpsuitDetective
name: hard-worn suit
description: Someone who wears this means business.
components:
- type: Sprite
- sprite: Clothing/Uniforms/Jumpsuit/detective.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/Security/detective.rsi # Goob
- type: Clothing
- sprite: Clothing/Uniforms/Jumpsuit/detective.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/Security/detective.rsi # Goob
- type: entity
- parent: ClothingUniformBase
+ parent: [ClothingUniformBase, ClothingUniformFoldableBase, BaseSecurityContraband] # Goob
id: ClothingUniformJumpsuitDetectiveGrey
name: noir suit
description: A hard-boiled private investigator's grey suit, complete with tie clip.
components:
- type: Sprite
- sprite: Clothing/Uniforms/Jumpsuit/detective_grey.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/Security/detective_grey.rsi # Goob
- type: Clothing
- sprite: Clothing/Uniforms/Jumpsuit/detective_grey.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/Security/detective_grey.rsi # Goob
- type: entity
- parent: ClothingUniformBase
+ parent: [ClothingUniformBase, ClothingUniformFoldableBase] # Goob
id: ClothingUniformJumpsuitEngineering
name: engineering jumpsuit
description: If this suit was non-conductive, maybe engineers would actually do their damn job.
components:
- type: Sprite
- sprite: Clothing/Uniforms/Jumpsuit/engineering.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/Engineering/engineering.rsi # Goob
- type: entity
- parent: ClothingUniformBase
+ parent: [ClothingUniformBase, ClothingUniformFoldableBase] # Goob
id: ClothingUniformJumpsuitEngineeringHazard
name: hazard jumpsuit
description: Woven in a grungy, warm orange. Lets others around you know that you really mean business when it comes to work.
components:
- type: Sprite
- sprite: Clothing/Uniforms/Jumpsuit/engineering_hazard.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/Engineering/engineering_hazard.rsi # Goob
- type: entity
- parent: [ClothingUniformBase, BaseCommandContraband]
+ parent: [ClothingUniformBase, ClothingUniformFoldableBase, BaseCommandContraband] # Goob
id: ClothingUniformJumpsuitHoP
name: head of personnel's jumpsuit
description: Rather bland and inoffensive. Perfect for vanishing off the face of the universe.
components:
- type: Sprite
- sprite: Clothing/Uniforms/Jumpsuit/hop.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/hop.rsi # Goob
- type: entity
- parent: [ClothingUniformBase, BaseCommandContraband]
+ parent: [ClothingUniformBase, ClothingUniformFoldableBase, BaseCommandContraband] # Goob
id: ClothingUniformJumpsuitHoS
name: head of security's jumpsuit
description: It's bright red and rather crisp, much like security's victims tend to be.
components:
- type: Sprite
- sprite: Clothing/Uniforms/Jumpsuit/hos.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/Security/hos.rsi # Goob
- type: Clothing
- sprite: Clothing/Uniforms/Jumpsuit/hos.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/Security/hos.rsi # Goob
- type: Item
inhandVisuals:
left:
- state: inhand-left
color: "#C12D30"
- sprite: Clothing/Uniforms/Jumpsuit/color.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/color/color.rsi # Goob
- state: overlay-inhand-left
right:
- state: inhand-right
color: "#C12D30"
- sprite: Clothing/Uniforms/Jumpsuit/color.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/color/color.rsi # Goob
- state: overlay-inhand-right
- type: entity
- parent: [ClothingUniformBase, BaseCommandContraband]
+ parent: [ClothingUniformBase, ClothingUniformFoldableBase, BaseCommandContraband] # Goob
id: ClothingUniformJumpsuitHoSAlt
name: head of security's turtleneck
description: It's a turtleneck worn by those strong and disciplined enough to achieve the position of Head of Security.
components:
- type: Sprite
- sprite: Clothing/Uniforms/Jumpsuit/hos_alt.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/Security/hos_alt.rsi # Goob
- type: Clothing
- sprite: Clothing/Uniforms/Jumpsuit/hos_alt.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/Security/hos_alt.rsi # Goob
- type: entity
- parent: [ClothingUniformBase, BaseCommandContraband]
+ parent: [ClothingUniformBase, ClothingUniformFoldableBase, BaseCommandContraband] # Goob
id: ClothingUniformJumpsuitHoSBlue
name: head of security's blue jumpsuit
description: A blue jumpsuit of Head of Security.
components:
- type: Sprite
- sprite: Clothing/Uniforms/Jumpsuit/hos_blue.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/Security/hos_blue.rsi # Goob
- type: Clothing
- sprite: Clothing/Uniforms/Jumpsuit/hos_blue.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/Security/hos_blue.rsi # Goob
- type: entity
- parent: [ClothingUniformBase, BaseCommandContraband]
+ parent: [ClothingUniformBase, ClothingUniformFoldableBase, BaseCommandContraband] # Goob
id: ClothingUniformJumpsuitHoSGrey
name: head of security's grey jumpsuit
description: A grey jumpsuit of Head of Security, which make him look somewhat like a passenger.
components:
- type: Sprite
- sprite: Clothing/Uniforms/Jumpsuit/hos_grey.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/Security/hos_grey.rsi # Goob
- type: Clothing
- sprite: Clothing/Uniforms/Jumpsuit/hos_grey.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/Security/hos_grey.rsi # Goob
- type: entity
parent: [ClothingUniformBase, BaseCommandContraband]
@@ -398,22 +409,22 @@
sprite: Clothing/Uniforms/Jumpsuit/commandgeneric.rsi
- type: entity
- parent: ClothingUniformBase
+ parent: [ClothingUniformBase, ClothingUniformFoldableBase] # Goob
id: ClothingUniformJumpsuitHydroponics
name: hydroponics jumpsuit
description: Has a strong earthy smell to it. Hopefully it's merely dirty as opposed to soiled.
components:
- type: Sprite
- sprite: Clothing/Uniforms/Jumpsuit/hydro.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/hydro.rsi # Goob
- type: entity
- parent: ClothingUniformBase
+ parent: [ClothingUniformBase, ClothingUniformFoldableBase] # Goob
id: ClothingUniformJumpsuitJanitor
name: janitor jumpsuit
description: The jumpsuit for the poor sop with a mop.
components:
- type: Sprite
- sprite: Clothing/Uniforms/Jumpsuit/janitor.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/janitor.rsi # Goob
- type: entity
parent: ClothingUniformBase
@@ -422,40 +433,48 @@
description: Traditional chinese clothing.
components:
- type: Sprite
- sprite: Clothing/Uniforms/Jumpsuit/kimono.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/kimono.rsi # Goob
- type: Clothing
- sprite: Clothing/Uniforms/Jumpsuit/kimono.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/kimono.rsi # Goob
- type: entity
- parent: ClothingUniformBase
+ parent: [ClothingUniformBase, ClothingUniformFoldableBase] # Goob
id: ClothingUniformJumpsuitMedicalDoctor
name: medical doctor jumpsuit
description: It's made of a special fiber that provides minor protection against biohazards. It has a cross on the chest denoting that the wearer is trained medical personnel.
components:
- type: Sprite
- sprite: Clothing/Uniforms/Jumpsuit/medical.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/Medical/medical.rsi # Goob
- type: entity
- parent: ClothingUniformBase
+ parent: [ClothingUniformBase, ClothingUniformFoldableBase] # Goob
id: ClothingUniformJumpsuitMime
name: mime suit
description: ...
components:
- type: Sprite
- sprite: Clothing/Uniforms/Jumpsuit/mime.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/mime.rsi # Goob
- type: Clothing
- sprite: Clothing/Uniforms/Jumpsuit/mime.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/mime.rsi # Goob
- type: entity
- parent: ClothingUniformBase
+ parent: [ClothingUniformBase, ClothingUniformFoldableBase] # Goob
id: ClothingUniformJumpsuitParamedic
name: paramedic jumpsuit
description: It's got a plus on it, that's a good thing right?
components:
- type: Sprite
- sprite: Clothing/Uniforms/Jumpsuit/paramedic.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/Medical/paramedic.rsi # Goob
+ - type: Item
+ inhandVisuals:
+ left:
+ - state: inhand-left
+ color: "#364660"
+ right:
+ - state: inhand-right
+ color: "#364660"
- type: Clothing
- sprite: Clothing/Uniforms/Jumpsuit/paramedic.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/Medical/paramedic.rsi # Goob
- type: entity
parent: ClothingUniformBase
@@ -469,34 +488,29 @@
sprite: Clothing/Uniforms/Jumpsuit/brigmedic.rsi
- type: entity
- parent: ClothingUniformBase
+ parent: [ClothingUniformBase, ClothingUniformFoldableBase] # Goob
id: ClothingUniformJumpsuitPrisoner
name: prisoner jumpsuit
description: A jumpsuit used for prisoners. It has suit sensors automatically enabled at all times.
components:
- type: Sprite
- sprite: Clothing/Uniforms/Jumpsuit/color.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/color/prisoner.rsi # Goob
layers:
- state: icon
- color: "#ff8300"
- - state: prisoner-icon
+ # color: "#ff8300"
+ #- state: prisoner-icon
- type: Item
inhandVisuals:
left:
- state: inhand-left
- color: "#ff8300"
- - state: prisoner-inhand-left
+ # color: "#ff8300"
+ # - state: prisoner-inhand-left
right:
- state: inhand-right
- color: "#ff8300"
- - state: prisoner-inhand-right
+ # color: "#ff8300"
+ # - state: prisoner-inhand-right
- type: Clothing
- sprite: Clothing/Uniforms/Jumpsuit/color.rsi
- clothingVisuals:
- jumpsuit:
- - state: equipped-INNERCLOTHING
- color: "#ff8300"
- - state: prisoner-equipped-INNERCLOTHING
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/color/prisoner.rsi # Goob
- type: SuitSensor
controlsLocked: true
randomMode: false
@@ -509,26 +523,42 @@
- WhitelistChameleon
- type: entity
- parent: [ClothingUniformBase, BaseCommandContraband]
+ parent: [ClothingUniformBase, ClothingUniformFoldableBase, BaseCommandContraband] # Goob
id: ClothingUniformJumpsuitQM
name: quartermaster's jumpsuit
description: 'What can brown do for you?'
components:
- type: Sprite
- sprite: Clothing/Uniforms/Jumpsuit/qm.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/Cargo/qm.rsi # Goob
+ - type: Item # Goob
+ inhandVisuals:
+ left:
+ - state: inhand-left
+ color: "#b7793d"
+ right:
+ - state: inhand-right
+ color: "#b7793d"
- type: Clothing
- sprite: Clothing/Uniforms/Jumpsuit/qm.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/Cargo/qm.rsi # Goob
- type: entity
- parent: [ClothingUniformBase, BaseCommandContraband]
+ parent: [ClothingUniformBase, ClothingUniformFoldableBase, BaseCommandContraband] # Goob
id: ClothingUniformJumpsuitQMTurtleneck
name: quartermasters's turtleneck
description: A sharp turtleneck made for the hardy work environment of supply.
components:
- type: Sprite
- sprite: Clothing/Uniforms/Jumpsuit/qmturtle.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/Cargo/qmturtle.rsi # Goob
+ - type: Item # Goob
+ inhandVisuals:
+ left:
+ - state: inhand-left
+ color: "#b7793d"
+ right:
+ - state: inhand-right
+ color: "#b7793d"
- type: Clothing
- sprite: Clothing/Uniforms/Jumpsuit/qmturtle.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/Cargo/qmturtle.rsi # Goob
- type: entity
parent: [ClothingUniformBase, BaseCommandContraband]
@@ -548,18 +578,18 @@
description: It's a turtleneck worn by those with the know-how to achieve the position of Research Director. Its fabric provides minor protection from biological contaminants.
components:
- type: Sprite
- sprite: Clothing/Uniforms/Jumpsuit/rnd.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/RND/rnd.rsi # Goob
- type: Clothing
- sprite: Clothing/Uniforms/Jumpsuit/rnd.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/RND/rnd.rsi # Goob
- type: entity
- parent: ClothingUniformBase
+ parent: [ClothingUniformBase, ClothingUniformFoldableBase] # Goob
id: ClothingUniformJumpsuitScientist
name: scientist jumpsuit
description: It's made of a special fiber that increases perceived intelligence and decreases personal ethics. It has markings that denote the wearer as a scientist.
components:
- type: Sprite
- sprite: Clothing/Uniforms/Jumpsuit/scientist.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/RND/scientist.rsi
- type: entity
parent: ClothingUniformBase
@@ -573,39 +603,39 @@
sprite: Clothing/Uniforms/Jumpsuit/scientist_formal.rsi
- type: entity
- parent: ClothingUniformBase
+ parent: [ClothingUniformBase, ClothingUniformFoldableBase] # Goob
id: ClothingUniformJumpsuitRoboticist
name: roboticist jumpsuit
description: It's a slimming black with reinforced seams; great for industrial work.
components:
- type: Sprite
- sprite: Clothing/Uniforms/Jumpsuit/roboticist.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/RND/roboticist.rsi # Goob
- type: entity
- parent: [ClothingUniformBase, BaseSecurityContraband]
+ parent: [ClothingUniformBase, ClothingUniformFoldableBase, BaseSecurityContraband] # Goob
id: ClothingUniformJumpsuitSec
name: security jumpsuit
description: A jumpsuit made of strong material, providing robust protection.
components:
- type: Sprite
- sprite: Clothing/Uniforms/Jumpsuit/security.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/Security/security.rsi # Goob
- type: Clothing
- sprite: Clothing/Uniforms/Jumpsuit/security.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/Security/security.rsi # Goob
- type: Item
inhandVisuals:
left:
- state: inhand-left
color: "#C12D30"
- sprite: Clothing/Uniforms/Jumpsuit/color.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/color/color.rsi # Goob
- state: overlay-inhand-left
right:
- state: inhand-right
color: "#C12D30"
- sprite: Clothing/Uniforms/Jumpsuit/color.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/color/color.rsi # Goob
- state: overlay-inhand-right
- type: entity
- parent: ClothingUniformBase
+ parent: [ClothingUniformBase, BaseSecurityContraband] # Goob
id: ClothingUniformJumpsuitSecBlue
name: blue shirt and tie
description: I'm a little busy right now, Calhoun.
@@ -616,15 +646,15 @@
sprite: Clothing/Uniforms/Jumpsuit/security_blue.rsi
- type: entity
- parent: [ClothingUniformBase, BaseSecurityContraband]
+ parent: [ClothingUniformBase, ClothingUniformFoldableBase, BaseSecurityContraband] # Goob
id: ClothingUniformJumpsuitSecGrey
name: grey security jumpsuit
description: A tactical relic of years past before Nanotrasen decided it was cheaper to dye the suits red instead of washing out the blood.
components:
- type: Sprite
- sprite: Clothing/Uniforms/Jumpsuit/security_grey.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/Security/security_grey.rsi # Goob
- type: Clothing
- sprite: Clothing/Uniforms/Jumpsuit/security_grey.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/Security/security_grey.rsi # Goob
- type: entity
parent: [ClothingUniformBase, BaseSecurityContraband]
@@ -638,26 +668,26 @@
sprite: Clothing/Uniforms/Jumpsuit/security_trooper.rsi
- type: entity
- parent: [ClothingUniformBase, BaseSecurityContraband]
+ parent: [ClothingUniformBase, ClothingUniformFoldableBase, BaseSecurityContraband] # Goob
id: ClothingUniformJumpsuitWarden
name: warden's uniform
description: A formal security suit for officers complete with Nanotrasen belt buckle.
components:
- type: Sprite
- sprite: Clothing/Uniforms/Jumpsuit/warden.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/Security/warden.rsi # Goob
- type: Clothing
- sprite: Clothing/Uniforms/Jumpsuit/warden.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/Security/warden.rsi # Goob
- type: Item
inhandVisuals:
left:
- state: inhand-left
color: "#C12D30"
- sprite: Clothing/Uniforms/Jumpsuit/color.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/color/color.rsi # Goob
- state: overlay-inhand-left
right:
- state: inhand-right
color: "#C12D30"
- sprite: Clothing/Uniforms/Jumpsuit/color.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/color/color.rsi # Goob
- state: overlay-inhand-right
- type: entity
@@ -832,15 +862,15 @@
sprite: Clothing/Uniforms/Jumpsuit/hosformal.rsi
- type: entity
- parent: [UnsensoredClothingUniformBase, BaseSyndicateContraband]
+ parent: [UnsensoredClothingUniformBase, ClothingUniformFoldableBase, BaseSyndicateContraband] # Goob
id: ClothingUniformJumpsuitOperative
name: operative jumpsuit
description: Uniform for elite syndicate operatives performing tactical operations in deep space.
components:
- type: Sprite
- sprite: Clothing/Uniforms/Jumpsuit/operative.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/Syndicate/operative.rsi # Goob
- type: Clothing
- sprite: Clothing/Uniforms/Jumpsuit/operative.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/Syndicate/operative.rsi # Goob
- type: StaticPrice
price: 500
@@ -860,15 +890,15 @@
mode: SensorOff
- type: entity
- parent: [ ClothingUniformBase ]
+ parent: ClothingUniformBase
id: ClothingUniformJumpsuitMercenary
name: mercenary jumpsuit
description: Clothing for real mercenaries who have gone through fire, water and the jungle of planets flooded with dangerous monsters or targets for which a reward has been assigned.
components:
- type: Sprite
- sprite: Clothing/Uniforms/Jumpsuit/mercenary.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/Syndicate/mercenary.rsi # Goob
- type: Clothing
- sprite: Clothing/Uniforms/Jumpsuit/mercenary.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/Syndicate/mercenary.rsi # Goob
- type: entity
parent: UnsensoredClothingUniformBase
@@ -882,13 +912,13 @@
sprite: Clothing/Uniforms/Jumpsuit/ninja.rsi
- type: entity
- parent: ClothingUniformBase
+ parent: [ClothingUniformBase, ClothingUniformFoldableBase] # Goob
id: ClothingUniformJumpsuitAtmos
name: atmospheric technician jumpsuit
description: I am at work. I can't leave work. Work is breathing. I am testing air quality.
components:
- type: Sprite
- sprite: Clothing/Uniforms/Jumpsuit/atmos.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/Engineering/atmos.rsi # Goob
- type: entity
parent: ClothingUniformBase
@@ -900,15 +930,15 @@
sprite: Clothing/Uniforms/Jumpsuit/atmos_casual.rsi
- type: entity
- parent: ClothingUniformBase
+ parent: [ClothingUniformBase, ClothingUniformFoldableBase] # Goob
id: ClothingUniformJumpsuitPsychologist
name: psychologist suit
description: I don't lose things. I place things in locations which later elude me.
components:
- type: Sprite
- sprite: Clothing/Uniforms/Jumpsuit/psychologist.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/Medical/psychologist.rsi # Goob
- type: Clothing
- sprite: Clothing/Uniforms/Jumpsuit/psychologist.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/Medical/psychologist.rsi # Goob
- type: entity
parent: ClothingUniformBase
@@ -1157,48 +1187,48 @@
sprite: Clothing/Uniforms/Jumpsuit/flannel.rsi
- type: entity
- parent: ClothingUniformBase
+ parent: [ClothingUniformBase, ClothingUniformFoldableBase] # Goob
id: ClothingUniformJumpsuitSeniorEngineer
name: senior engineer jumpsuit
description: A sign of skill and prestige within the engineering department.
components:
- type: Sprite
- sprite: Clothing/Uniforms/Jumpsuit/senior_engineer.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/Engineering/senior_engineer.rsi # Goob
- type: Clothing
- sprite: Clothing/Uniforms/Jumpsuit/senior_engineer.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/Engineering/senior_engineer.rsi # Goob
- type: entity
- parent: ClothingUniformBase
+ parent: [ClothingUniformBase, ClothingUniformFoldableBase] # Goob
id: ClothingUniformJumpsuitSeniorResearcher
name: senior researcher jumpsuit
description: A sign of skill and prestige within the science department.
components:
- type: Sprite
- sprite: Clothing/Uniforms/Jumpsuit/senior_researcher.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/RND/senior_researcher.rsi # Goob
- type: Clothing
- sprite: Clothing/Uniforms/Jumpsuit/senior_researcher.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/RND/senior_researcher.rsi # Goob
- type: entity
- parent: ClothingUniformBase
+ parent: [ClothingUniformBase, ClothingUniformFoldableBase] # goob
id: ClothingUniformJumpsuitSeniorPhysician
name: senior physician jumpsuit
description: A sign of skill and prestige within the medical department.
components:
- type: Sprite
- sprite: Clothing/Uniforms/Jumpsuit/senior_physician.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/Medical/senior_physician.rsi # goob
- type: Clothing
- sprite: Clothing/Uniforms/Jumpsuit/senior_physician.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/Medical/senior_physician.rsi # goob
- type: entity
- parent: [ClothingUniformBase, BaseSecurityContraband]
+ parent: [ClothingUniformBase, ClothingUniformFoldableBase, BaseSecurityContraband] # Goob
id: ClothingUniformJumpsuitSeniorOfficer
name: senior officer jumpsuit
description: A sign of skill and prestige within the security department.
components:
- type: Sprite
- sprite: Clothing/Uniforms/Jumpsuit/senior_officer.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/Security/senior_officer.rsi # goob
- type: Clothing
- sprite: Clothing/Uniforms/Jumpsuit/senior_officer.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/Security/senior_officer.rsi # goob
- type: entity
parent: ClothingUniformBase
diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/scrubs.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/scrubs.yml
index 3a2320c75c2..b80bbb9b250 100644
--- a/Resources/Prototypes/Entities/Clothing/Uniforms/scrubs.yml
+++ b/Resources/Prototypes/Entities/Clothing/Uniforms/scrubs.yml
@@ -6,34 +6,34 @@
# SPDX-License-Identifier: MIT
- type: entity
- parent: ClothingUniformBase
+ parent: [ClothingUniformBase, ClothingUniformFoldableBase] # Goob
id: UniformScrubsColorPurple
name: purple scrubs
description: A combination of comfort and utility intended to make removing every last organ someone has and selling them to a space robot much more official looking.
components:
- type: Sprite
- sprite: Clothing/Uniforms/Scrubs/purple.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Scrubs/purple.rsi # Goob
- type: Clothing
- sprite: Clothing/Uniforms/Scrubs/purple.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Scrubs/purple.rsi # Goob
- type: entity
- parent: ClothingUniformBase
+ parent: [ClothingUniformBase, ClothingUniformFoldableBase] # Goob
id: UniformScrubsColorGreen
name: green scrubs
description: A combination of comfort and utility intended to make removing every last organ someone has and selling them to a space robot much more official looking.
components:
- type: Sprite
- sprite: Clothing/Uniforms/Scrubs/green.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Scrubs/green.rsi # Goob
- type: Clothing
- sprite: Clothing/Uniforms/Scrubs/green.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Scrubs/green.rsi # Goob
- type: entity
- parent: ClothingUniformBase
+ parent: [ClothingUniformBase, ClothingUniformFoldableBase] # Goob
id: UniformScrubsColorBlue
name: blue scrubs
description: A combination of comfort and utility intended to make removing every last organ someone has and selling them to a space robot much more official looking.
components:
- type: Sprite
- sprite: Clothing/Uniforms/Scrubs/blue.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Scrubs/blue.rsi # Goob
- type: Clothing
- sprite: Clothing/Uniforms/Scrubs/blue.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Scrubs/blue.rsi # Goob
diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/specific.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/specific.yml
index 69ce46155ea..c33ebf0967e 100644
--- a/Resources/Prototypes/Entities/Clothing/Uniforms/specific.yml
+++ b/Resources/Prototypes/Entities/Clothing/Uniforms/specific.yml
@@ -11,21 +11,21 @@
- Recyclable
- Skirt # Goobstation
- type: Sprite
- sprite: Clothing/Uniforms/Jumpsuit/color.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/color/color.rsi
layers:
- state: icon
color: "#3f3f3f"
- - state: trinkets-icon
+
- type: Item
inhandVisuals:
left:
- state: inhand-left
color: "#3f3f3f"
- - state: trinkets-inhand-left
+
right:
- state: inhand-right
color: "#3f3f3f"
- - state: trinkets-inhand-right
+
- type: Clothing
sprite: Clothing/Shoes/color.rsi
clothingVisuals:
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/human.yml b/Resources/Prototypes/Entities/Markers/Spawners/human.yml
index 5608d502ddd..564e034f8e2 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/human.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/human.yml
@@ -16,7 +16,7 @@
state: full
- sprite: Clothing/Shoes/Boots/combatboots.rsi
state: equipped-FEET
- - sprite: Clothing/Uniforms/Jumpsuit/operative.rsi
+ - sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/Syndicate/operative.rsi
state: equipped-INNERCLOTHING
- sprite: Clothing/OuterClothing/Armor/security.rsi
state: equipped-OUTERCLOTHING
diff --git a/Resources/Prototypes/Loadouts/Jobs/Cargo/cargo_technician.yml b/Resources/Prototypes/Loadouts/Jobs/Cargo/cargo_technician.yml
index 5e7e5d8fbe6..a048e7ac6ef 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Cargo/cargo_technician.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Cargo/cargo_technician.yml
@@ -37,7 +37,6 @@
equipment:
jumpsuit: ClothingUniformJumpskirtCargo
-
- type: loadout # goob
id: CargoTechMJ
equipment:
diff --git a/Resources/Prototypes/Loadouts/Jobs/Cargo/salvage_specialist.yml b/Resources/Prototypes/Loadouts/Jobs/Cargo/salvage_specialist.yml
index dc81b187e66..5875c1041bb 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Cargo/salvage_specialist.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Cargo/salvage_specialist.yml
@@ -74,6 +74,7 @@
# SPDX-FileCopyrightText: 2025 Aiden <28298836+Aidenkrz@users.noreply.github.com>
#
# SPDX-License-Identifier: AGPL-3.0-or-later
+
# Back
- type: loadout
id: SalvageSpecialistBackpack
diff --git a/Resources/Prototypes/Loadouts/Jobs/Engineering/chief_engineer.yml b/Resources/Prototypes/Loadouts/Jobs/Engineering/chief_engineer.yml
index 936fa0749c9..415b5b60bac 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Engineering/chief_engineer.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Engineering/chief_engineer.yml
@@ -130,22 +130,34 @@
# Neck
- type: loadout
- id: ChiefEngineerCloak
+ id: ClothingNeckCloakWhiteCe
equipment:
- neck: ClothingNeckCloakCe
+ neck: ClothingNeckCloakWhiteCe
+ groupBy: "cecloak"
- type: loadout
- id: ChiefEngineerMantle
+ id: ClothingNeckCloakGreenCe
equipment:
- neck: ClothingNeckMantleCE
+ neck: ClothingNeckCloakGreenCe
+ groupBy: "cecloak"
+
+- type: loadout
+ id: ClothingNeckMantleWhiteCE
+ equipment:
+ neck: ClothingNeckMantleWhiteCE # Goob edit
effects:
- !type:GroupLoadoutEffect
proto: MasterCE
+ groupBy: "cemantle"
-- type: startingGear
- id: ChiefEngineerMantle
+- type: loadout
+ id: ClothingNeckMantleOrangeCE
equipment:
- neck: ClothingNeckMantleCE
+ neck: ClothingNeckMantleOrangeCE # Goob edit
+ effects:
+ - !type:GroupLoadoutEffect
+ proto: MasterCE
+ groupBy: "cemantle"
# OuterClothing
- type: loadout
diff --git a/Resources/Prototypes/Loadouts/Jobs/Science/research_director.yml b/Resources/Prototypes/Loadouts/Jobs/Science/research_director.yml
index 98cf2e2437e..c1695f75fb3 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Science/research_director.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Science/research_director.yml
@@ -121,6 +121,19 @@
equipment:
jumpsuit: ClothingUniformJumpskirtResearchDirector
+# Goob start
+
+- type: loadout
+ id: ResearchDirectorJumpsuitAlt
+ equipment:
+ jumpsuit: ClothingUniformJumpsuitResearchDirectorAlt
+
+- type: loadout
+ id: ResearchDirectorJumpskirtAlt
+ equipment:
+ jumpsuit: ClothingUniformJumpskirtResearchDirectorAlt
+
+# Goob end
- type: loadout # goob
id: ResearchDirectorMJ
diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/detective.yml b/Resources/Prototypes/Loadouts/Jobs/Security/detective.yml
index b0330f8c537..1bbdfe7262f 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Security/detective.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Security/detective.yml
@@ -57,3 +57,49 @@
id: DetectiveCoatGrey
equipment:
outerClothing: ClothingOuterCoatDetectiveLoadoutGrey
+
+# === LARP OUTFIT AND YOU KNOW THE THING === # inky start
+- type: loadout
+ id: LoadoutClothingOuterCoatDiscoBlazer
+ equipment:
+ outerClothing: ClothingOuterCoatDiscoBlazer
+ effects:
+ - !type:JobRequirementLoadoutEffect
+ requirement:
+ !type:DepartmentTimeRequirement
+ department: Security
+ time: 90000
+
+- type: loadout
+ id: LoadoutClothingUniformJumpsuitElysium
+ equipment:
+ jumpsuit: ClothingUniformJumpsuitElysium
+ effects:
+ - !type:JobRequirementLoadoutEffect
+ requirement:
+ !type:DepartmentTimeRequirement
+ department: Security
+ time: 90000
+
+- type: loadout
+ id: LoadoutClothingNeckTieElysium
+ equipment:
+ neck: ClothingNeckTieElysium
+ effects:
+ - !type:JobRequirementLoadoutEffect
+ requirement:
+ !type:DepartmentTimeRequirement
+ department: Security
+ time: 90000
+
+- type: loadout
+ id: LoadoutClothingShoesElysiumShoes
+ equipment:
+ shoes: ClothingShoesElysiumShoes
+ effects:
+ - !type:JobRequirementLoadoutEffect
+ requirement:
+ !type:DepartmentTimeRequirement
+ department: Security
+ time: 90000
+# /inky
diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml b/Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml
index 08b484e56c5..93c9be04157 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml
@@ -11,7 +11,17 @@
requirement:
!type:DepartmentTimeRequirement
department: Security
- time: 60h
+ time: 60h # 60 hrs
+
+#Security Star
+- type: loadoutEffectGroup
+ id: SecurityStarWorthy
+ effects:
+ - !type:JobRequirementLoadoutEffect
+ requirement:
+ !type:DepartmentTimeRequirement
+ department: Security
+ time: 100h
# Head
- type: loadout
diff --git a/Resources/Prototypes/Loadouts/LoadoutGroups/loadout_groups.yml b/Resources/Prototypes/Loadouts/LoadoutGroups/loadout_groups.yml
index 91d6a1f26c5..40afbae3714 100644
--- a/Resources/Prototypes/Loadouts/LoadoutGroups/loadout_groups.yml
+++ b/Resources/Prototypes/Loadouts/LoadoutGroups/loadout_groups.yml
@@ -833,6 +833,7 @@
loadouts:
- CargoTechnicianJumpsuit
- CargoTechnicianJumpskirt
+ - CargoTechnicianOveralls #Goob
- CargoTechnicianJumpsuitMail # Goob/DeltaV - Mail
- CargoTechnicianJumpskirtMail # Goob/DeltaV - Mail
- CargoTechMJ # goob
@@ -928,8 +929,10 @@
name: loadout-group-chief-engineer-neck
minLimit: 0
loadouts:
- - ChiefEngineerCloak
- - ChiefEngineerMantle
+ - ClothingNeckCloakWhiteCe # goob
+ - ClothingNeckCloakGreenCe # goob
+ - ClothingNeckMantleWhiteCE # goob
+ - ClothingNeckMantleOrangeCE # goob
- type: loadoutGroup
id: ChiefEngineerOuterClothing
@@ -1100,7 +1103,9 @@
name: loadout-group-research-director-jumpsuit
loadouts:
- ResearchDirectorJumpsuit
+ - ResearchDirectorJumpsuitAlt # goob
- ResearchDirectorJumpskirt
+ - ResearchDirectorJumpskirtAlt # goob
- ResearchDirectorMJ # goob
- RDSummerShirt # goob
@@ -1321,6 +1326,7 @@
- TrooperUniform
- SergeantUniform # Trauma
- SergeantSkirt # Trauma
+ - VeteranOfficerBlackJumpsuit # Goobstation
- type: loadoutGroup
id: SecurityBackpack
@@ -1346,11 +1352,15 @@
- ArmorVestSlim
- SecurityOfficerWintercoat
- WinterCoatSeniorSecArmored # Goobstation
+ - VeteranOfficerArmor # Goobstation
- type: loadoutGroup
id: SecurityShoes
name: loadout-group-security-shoes
loadouts:
+ # inky
+ - LoadoutClothingShoesElysiumShoes # ts shoooould only appear in the det loadout now idk
+ # /inky
- JackBoots
- CombatBoots # Goobstation
- SecurityWinterBoots
@@ -1382,6 +1392,9 @@
name: loadout-group-detective-neck
minLimit: 0
loadouts:
+ # inky
+ - LoadoutClothingNeckTieElysium
+ # /inky
- DetectiveTie
- Bodycam # Goobstation - Body cameras
@@ -1389,6 +1402,10 @@
id: DetectiveJumpsuit
name: loadout-group-detective-jumpsuit
loadouts:
+ # inky
+ - LoadoutClothingUniformJumpsuitElysium
+ - LoadoutClothingShoesElysiumShoes
+ # /inky
- DetectiveJumpsuit
- DetectiveJumpskirt
- NoirJumpsuit
@@ -1398,6 +1415,9 @@
id: DetectiveOuterClothing
name: loadout-group-detective-outerclothing
loadouts:
+ # inky
+ - LoadoutClothingOuterCoatDiscoBlazer
+ # /inky
- DetectiveArmorVest
- DetectiveCoat
- DetectiveCoatGrey
diff --git a/Resources/Prototypes/Loadouts/RoleLoadouts/role_loadouts.yml b/Resources/Prototypes/Loadouts/RoleLoadouts/role_loadouts.yml
index 59739c47588..2a906241217 100644
--- a/Resources/Prototypes/Loadouts/RoleLoadouts/role_loadouts.yml
+++ b/Resources/Prototypes/Loadouts/RoleLoadouts/role_loadouts.yml
@@ -341,6 +341,7 @@
- GroupTankHarness
- SalvageSpecialistNeck # Goobstation
- SalvageSpecialistBackpack
+ - SalvageSpecialistJumpsuit # Goobstation
- SalvageSpecialistOuterClothing
- SalvageSpecialistShoes
- Glasses
diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml b/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml
index ec08b80b50a..62f03614201 100644
--- a/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml
+++ b/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml
@@ -22,7 +22,6 @@
- !type:AddObjectiveSpecial
objectives:
- SalvageMineObjective
-
- type: startingGear
id: SalvageSpecialistGear
equipment:
@@ -32,7 +31,6 @@
storage: # DeltaV: Add mining voucher
back:
- MiningVoucher
-
- type: chameleonOutfit
id: SalvageSpecialistChameleonOutfit
job: SalvageSpecialist
@@ -42,4 +40,4 @@
mask: ClothingMaskGasExplorer
outerClothing: ClothingOuterWinterMiner
neck: ClothingNeckScarfStripedBrown
- gloves: ClothingHandsGlovesColorBlack
+ gloves: ClothingHandsGlovesColorBlack
\ No newline at end of file
diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml b/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml
index 1606e65c911..89985386d63 100644
--- a/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml
+++ b/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml
@@ -57,7 +57,7 @@
equipment:
head: ClothingHeadHatBeretEngineering
mask: ClothingMaskBreath
- neck: ClothingNeckCloakCe
+ neck: ClothingNeckCloakWhiteCe
outerClothing: ClothingOuterWinterCE
gloves: ClothingHandsGlovesColorYellow
shoes: ClothingShoesBootsMagAdv
diff --git a/Resources/Prototypes/Roles/Jobs/Fun/visitors_startinggear.yml b/Resources/Prototypes/Roles/Jobs/Fun/visitors_startinggear.yml
index 0746324d2c6..36739019784 100644
--- a/Resources/Prototypes/Roles/Jobs/Fun/visitors_startinggear.yml
+++ b/Resources/Prototypes/Roles/Jobs/Fun/visitors_startinggear.yml
@@ -40,7 +40,7 @@
jumpsuit: ClothingUniformJumpsuitChiefEngineer
shoes: ClothingShoesColorWhite
head: ClothingHeadHatBeretEngineering
- neck: ClothingNeckCloakCe
+ neck: ClothingNeckCloakWhiteCe
id: VisitorPDA
belt: ClothingBeltChiefEngineerFilled
back: ClothingBackpackDuffelEngineering
@@ -54,7 +54,7 @@
jumpsuit: ClothingUniformJumpsuitChiefEngineerTurtle
shoes: ClothingShoesColorWhite
head: ClothingHeadHatBeretEngineering
- neck: ClothingNeckMantleCE
+ neck: ClothingNeckMantleWhiteCE
id: VisitorPDA
belt: ClothingBeltChiefEngineerFilled
back: ClothingBackpackSatchelEngineering
@@ -1690,7 +1690,7 @@
jumpsuit: ClothingUniformJumpsuitChiefEngineer
shoes: ClothingShoesColorWhite
head: ClothingHeadHatBeretEngineering
- neck: ClothingNeckCloakCe
+ neck: ClothingNeckCloakWhiteCe
id: VisitorPDA
#belt: ClothingBeltChiefEngineerFilled # probably too strong?
back: ClothingBackpackDuffelEngineering
@@ -1704,7 +1704,7 @@
jumpsuit: ClothingUniformJumpsuitChiefEngineerTurtle
shoes: ClothingShoesColorWhite
head: ClothingHeadHatBeretEngineering
- neck: ClothingNeckMantleCE
+ neck: ClothingNeckMantleWhiteCE
id: VisitorPDA
belt: ClothingBeltChiefEngineerFilled
back: ClothingBackpackSatchelEngineering
diff --git a/Resources/Prototypes/_Goobstation/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/_Goobstation/Entities/Clothing/Head/hats.yml
index 407adb223c3..22e5128ac38 100644
--- a/Resources/Prototypes/_Goobstation/Entities/Clothing/Head/hats.yml
+++ b/Resources/Prototypes/_Goobstation/Entities/Clothing/Head/hats.yml
@@ -153,7 +153,7 @@
- Hair
- type: entity
- parent: [ClothingHeadBase, BaseCommandContraband, BaseClothingViewconeSmallIncrease] # Trauma
+ parent: [ClothingHeadBase, BaseCommandContraband] # Trauma # inky edit removed BaseClothingViewconeSmallIncrease
id: ClothingHeadHatBeretHeadOfSecurityAdvanced
name: head of security's parade beret
description: A particularly gilded beret, designed for the Head of Security.
@@ -251,3 +251,27 @@
- type: ClothingGrantComponent
component:
- type: PossessionImmune
+
+- type: entity
+ parent: ClothingHeadHatCentcomcap
+ id: ClothingHeadHatGoldCentcom
+ name: golden Centcom cap
+ description: A gold-and-white gilded cap worn by the highest-ranking members of Central Command.
+ components:
+ - type: Sprite
+ sprite: _Goobstation/Clothing/Head/Hats/golden_centcom.rsi
+ - type: Clothing
+ sprite: _Goobstation/Clothing/Head/Hats/golden_centcom.rsi
+ - type: Item
+ sprite: _Goobstation/Clothing/Head/Hats/golden_centcom.rsi
+
+- type: entity
+ parent: [ ClothingHeadBase, BaseCentcommContraband ]
+ id: ClothingHeadHatCowboyCentcom
+ name: centcom cowboy hat
+ description: A black and green cowboy hat with a gold band, worn by 'southerner' Central Command officers.
+ components:
+ - type: Sprite
+ sprite: _Goobstation/Clothing/Head/Hats/cowboyhat_centcom.rsi
+ - type: Clothing
+ sprite: _Goobstation/Clothing/Head/Hats/cowboyhat_centcom.rsi
diff --git a/Resources/Prototypes/_Goobstation/Entities/Clothing/Head/modsuit.yml b/Resources/Prototypes/_Goobstation/Entities/Clothing/Head/modsuit.yml
index 6ad834473ac..0f7f15ad31d 100644
--- a/Resources/Prototypes/_Goobstation/Entities/Clothing/Head/modsuit.yml
+++ b/Resources/Prototypes/_Goobstation/Entities/Clothing/Head/modsuit.yml
@@ -3,7 +3,7 @@
- type: entity
abstract: true
# Used to put pressureProtection, layers blocker and etc components into ComponentToggler
- parent: [BaseItem, BaseClothingViewconeSmall] # Trauma
+ parent: [BaseItem] # Trauma # inky edit removed BaseClothingViewconeSmall
id: BaseClothingModsuitHelmet
name: base modsuit helmet
categories: [ HideSpawnMenu ]
diff --git a/Resources/Prototypes/_Goobstation/Entities/Clothing/Neck/cloaks.yml b/Resources/Prototypes/_Goobstation/Entities/Clothing/Neck/cloaks.yml
index b295e50bcc0..4f2b4157deb 100644
--- a/Resources/Prototypes/_Goobstation/Entities/Clothing/Neck/cloaks.yml
+++ b/Resources/Prototypes/_Goobstation/Entities/Clothing/Neck/cloaks.yml
@@ -95,3 +95,51 @@
sprite:
sprite: _Goobstation/Clothing/Neck/Cloaks/Veterancap.rsi
state: icon
+
+# High command cloak
+- type: entity
+ parent: [ClothingNeckBase, BaseCentcommContraband]
+ id: ClothingNeckCloakHighCommand
+ name: high central command cloak
+ description: A magnificent green cloak featuring luxurious gold-lined edges.
+ components:
+ - type: Sprite
+ sprite: _Goobstation/Clothing/Neck/Cloaks/cchighcommand.rsi
+ - type: Clothing
+ sprite: _Goobstation/Clothing/Neck/Cloaks/cchighcommand.rsi
+
+# High command CAPE
+- type: entity
+ parent: [ClothingNeckBase, BaseCentcommContraband]
+ id: ClothingNeckCloakHighCommandCape
+ name: high central command cape
+ description: A lavish green-and-red cape decorated with gold trim and ornate epaulettes.
+ components:
+ - type: Sprite
+ sprite: _Goobstation/Clothing/Neck/Cloaks/highcmdcape.rsi
+ - type: Clothing
+ sprite: _Goobstation/Clothing/Neck/Cloaks/highcmdcape.rsi
+
+# Golden central command cloak
+- type: entity
+ parent: [ClothingNeckBase, BaseCentcommContraband]
+ id: ClothingNeckCloakGoldenCentComm
+ name: gilded central command cloak
+ description: A luxurious gold-gilded cloak worn by the highest-ranking officials.
+ components:
+ - type: Sprite
+ sprite: _Goobstation/Clothing/Neck/Cloaks/goldcentcom.rsi
+ - type: Clothing
+ sprite: _Goobstation/Clothing/Neck/Cloaks/goldcentcom.rsi
+
+# Central command poncho
+- type: entity
+ parent: [ClothingNeckBase, BaseCentcommContraband]
+ id: ClothingNeckCloakCentComPoncho
+ name: central command poncho
+ description: A regal green-and-black poncho embellished with rich golden accents.
+ components:
+ - type: Sprite
+ sprite: _Goobstation/Clothing/Neck/Cloaks/centcom_poncho.rsi
+ - type: Clothing
+ sprite: _Goobstation/Clothing/Neck/Cloaks/centcom_poncho.rsi
\ No newline at end of file
diff --git a/Resources/Prototypes/_Goobstation/Entities/Clothing/Neck/mantles.yml b/Resources/Prototypes/_Goobstation/Entities/Clothing/Neck/mantles.yml
new file mode 100644
index 00000000000..22a8cfd27a0
--- /dev/null
+++ b/Resources/Prototypes/_Goobstation/Entities/Clothing/Neck/mantles.yml
@@ -0,0 +1,33 @@
+# SPDX-FileCopyrightText: 2024 BombasterDS <115770678+BombasterDS@users.noreply.github.com>
+# SPDX-FileCopyrightText: 2024 Piras314
+# SPDX-FileCopyrightText: 2025 Aiden <28298836+Aidenkrz@users.noreply.github.com>
+# SPDX-FileCopyrightText: 2025 BloodfiendishOperator <141253729+Diggy0@users.noreply.github.com>
+# SPDX-FileCopyrightText: 2025 GoobBot
+# SPDX-FileCopyrightText: 2025 SX-7
+# SPDX-FileCopyrightText: 2025 Solstice
+#
+# SPDX-License-Identifier: AGPL-3.0-or-later
+
+#Senior Security mantle
+- type: entity
+ parent: [ ClothingNeckBase ]
+ id: ClothingNeckMantleVeteranSecurity
+ name: veteran security's mantle
+ description: Personally awarded by CC for service to the station.
+ components:
+ - type: Sprite
+ sprite: _Goobstation/Clothing/Neck/Mantle/veteran_security.rsi
+ - type: Clothing
+ sprite: _Goobstation/Clothing/Neck/Mantle/veteran_security.rsi
+
+#Central command epaulettes
+- type: entity
+ parent: [ ClothingNeckBase, BaseCentcommContraband ]
+ id: ClothingNeckMantleEpaulettes
+ name: golden epaulettes
+ description: Exquisitely-crafted gold epaulettes symbolizing admiralty within Central Command.
+ components:
+ - type: Sprite
+ sprite: _Goobstation/Clothing/Neck/Mantle/epaulettes.rsi
+ - type: Clothing
+ sprite: _Goobstation/Clothing/Neck/Mantle/epaulettes.rsi
diff --git a/Resources/Prototypes/_Goobstation/Entities/Clothing/OuterClothing/armour.yml b/Resources/Prototypes/_Goobstation/Entities/Clothing/OuterClothing/armour.yml
index 7eb3143020d..47cd6369915 100644
--- a/Resources/Prototypes/_Goobstation/Entities/Clothing/OuterClothing/armour.yml
+++ b/Resources/Prototypes/_Goobstation/Entities/Clothing/OuterClothing/armour.yml
@@ -429,3 +429,14 @@
sprite: _ShitChap/Clothing/OuterClothing/Misc/bishop.rsi
- type: Clothing
sprite: _ShitChap/Clothing/OuterClothing/Misc/bishop.rsi
+#senior security
+- type: entity
+ parent: ClothingOuterArmorBase
+ id: ClothingOuterArmorVeteranSecurity
+ name: Veteran security's old armor
+ description: An old version of the standard NanoTrasen bulletproof vest, its design provides better protection against surprise attacks by clowns, it still meets NT's protection standards
+ components:
+ - type: Sprite
+ sprite: _Goobstation/Clothing/Armor/veteran_security.rsi
+ - type: Clothing
+ sprite: _Goobstation/Clothing/Armor/veteran_security.rsi
\ No newline at end of file
diff --git a/Resources/Prototypes/_Goobstation/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/_Goobstation/Entities/Clothing/OuterClothing/coats.yml
index b241119b017..d68a701012a 100644
--- a/Resources/Prototypes/_Goobstation/Entities/Clothing/OuterClothing/coats.yml
+++ b/Resources/Prototypes/_Goobstation/Entities/Clothing/OuterClothing/coats.yml
@@ -132,3 +132,27 @@
- type: Clothing
sprite: _Goobstation/Clothing/OuterClothing/Coats/hoplongcoat.rsi
#cap prestige coat gets storage so this one does too. Fuck it we ball.
+
+#central command jacket
+- type: entity
+ parent: [ ClothingOuterArmorCaptainCarapace, ClothingOuterStorageBase, BaseCentcommContraband ]
+ id: ClothingOuterArmoredJacketCentralCommand
+ name: central command jacket
+ description: A formal green coat-like jacket accented with gilded shoulder armor and a high collar.
+ components:
+ - type: Sprite
+ sprite: _Goobstation/Clothing/OuterClothing/Coats/centcommjacket.rsi
+ - type: Clothing
+ sprite: _Goobstation/Clothing/OuterClothing/Coats/centcommjacket.rsi
+
+#central command ike
+- type: entity
+ parent: [ ClothingOuterStorageBase, BaseCentcommContraband ]
+ id: ClothingOuterJacketCentralCommandIke
+ name: central command ike jacket
+ description: A utilitarian green-and-black jacket featuring a sharp, military-inspired design, worn within Central Command.
+ components:
+ - type: Sprite
+ sprite: _Goobstation/Clothing/OuterClothing/Coats/centcom_ike.rsi
+ - type: Clothing
+ sprite: _Goobstation/Clothing/OuterClothing/Coats/centcom_ike.rsi
diff --git a/Resources/Prototypes/_Goobstation/Entities/Clothing/Shoes/boots.yml b/Resources/Prototypes/_Goobstation/Entities/Clothing/Shoes/boots.yml
index e77379bc2d9..c71302b9644 100644
--- a/Resources/Prototypes/_Goobstation/Entities/Clothing/Shoes/boots.yml
+++ b/Resources/Prototypes/_Goobstation/Entities/Clothing/Shoes/boots.yml
@@ -301,4 +301,4 @@
- type: ClothingSlowOnDamageModifier
modifier: 0.5
- type: ModifyStandingUpTime
- multiplier: 0.5
+ multiplier: 0.5
\ No newline at end of file
diff --git a/Resources/Prototypes/_Goobstation/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/_Goobstation/Entities/Clothing/Uniforms/jumpskirts.yml
index ad8c9f908ed..308c05f3e28 100644
--- a/Resources/Prototypes/_Goobstation/Entities/Clothing/Uniforms/jumpskirts.yml
+++ b/Resources/Prototypes/_Goobstation/Entities/Clothing/Uniforms/jumpskirts.yml
@@ -16,9 +16,9 @@
description: A skirt worn by CentComs legal team. Smells of burnt coffee.
components:
- type: Sprite
- sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/centcom_agent.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/Centcom/centcom_agent.rsi
- type: Clothing
- sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/centcom_agent.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/Centcom/centcom_agent.rsi
- type: entity
parent: ClothingUniformSkirtBase
@@ -27,9 +27,9 @@
description: A black skirt worn by officials.
components:
- type: Sprite
- sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/nanotrasen_representative.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/Centcom/nanotrasen_representative.rsi
- type: Clothing
- sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/nanotrasen_representative.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/Centcom/nanotrasen_representative.rsi
- type: entity
parent: ClothingUniformSkirtBase
@@ -38,10 +38,68 @@
description: Enemy of dogs everywhere.
components:
- type: Sprite
- sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/mailman.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/Cargo/mailman.rsi
- type: Clothing
- sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/mailman.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/Cargo/mailman.rsi
+- type: entity
+ parent: ClothingUniformBase
+ id: ClothingUniformJumpskirtCommandMaid
+ name: command maid uniform
+ description: A stylish maid uniform specially designed for elite Command Maids. Combines professionalism with a touch of elegance.
+ components:
+ - type: Sprite
+ sprite: _Goobstation/Clothing/Uniforms/Other/command_maid.rsi
+ - type: Clothing
+ sprite: _Goobstation/Clothing/Uniforms/Other/command_maid.rsi
+
+# Cargo
+
+- type: entity
+ parent: ClothingUniformBase
+ id: ClothingUniformJumpskirtSalvageSpecialist
+ name: salvage specialist's jumpskirt
+ description: It's a snappy jumpskirt with a sturdy set of overalls. It's very dirty.
+ components:
+ - type: Sprite
+ sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/Cargo/salvage.rsi
+ - type: Clothing
+ sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/Cargo/salvage.rsi
+
+- type: entity
+ parent: [ClothingUniformBase, ClothingUniformFoldableBase]
+ id: ClothingUniformJumpskirtShaftMiner
+ name: shaft miner's jumpskirt
+ description: It's a snappy jumpskirt with a sturdy set of overalls. It looks burnt.
+ components:
+ - type: Sprite
+ sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/Cargo/shaft_miner.rsi
+ - type: Clothing
+ sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/Cargo/shaft_miner.rsi
+
+# RND
+
+- type: entity
+ parent: [ClothingUniformBase, ClothingUniformFoldableBase, BaseCommandContraband]
+ id: ClothingUniformJumpskirtResearchDirectorAlt
+ name: research director's turtleneck
+ description: It's a turtleneck worn by those with the know-how to achieve the position of Research Director. Its fabric provides minor protection from biological contaminants.
+ components:
+ - type: Sprite
+ sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/RND/rndturtle.rsi
+ - type: Clothing
+ sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/RND/rndturtle.rsi
+ - type: Item
+ inhandVisuals:
+ left:
+ - state: inhand-left
+ color: "#620b73"
+ sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/color/color.rsi
+ right:
+ - state: inhand-right
+ color: "#620b73"
+ sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/color/color.rsi
+
- type: entity
parent: ClothingUniformSkirtBase
id: ClothingUniformJumpskirtReporter
@@ -49,17 +107,18 @@
description: An extravagant black dress designed to catch the attention of as many people as possible.
components:
- type: Sprite
- sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/reporter_dress.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/reporter_dress.rsi # goob
- type: Clothing
- sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/reporter_dress.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/reporter_dress.rsi # goob
+# Central Command pencil skirt
- type: entity
- parent: ClothingUniformBase
- id: ClothingUniformJumpskirtCommandMaid
- name: command maid uniform
- description: A stylish maid uniform specially designed for elite Command Maids. Combines professionalism with a touch of elegance.
+ parent: [ ClothingUniformSkirtBase, BaseCentcommContraband ]
+ id: ClothingUniformJumpskirtCentcomPencilSkirt
+ name: centcom pencil skirt
+ description: An elegant green formal blouse paired with a sleek black pencil skirt, decorated with exquisite golden detailing.
components:
- type: Sprite
- sprite: _Goobstation/Clothing/Uniforms/Other/command_maid.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/Centcom/centcomm_pencilskirt.rsi
- type: Clothing
- sprite: _Goobstation/Clothing/Uniforms/Other/command_maid.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpskirt/Centcom/centcomm_pencilskirt.rsi
diff --git a/Resources/Prototypes/_Goobstation/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/_Goobstation/Entities/Clothing/Uniforms/jumpsuits.yml
index 1dbe5df76a1..b6a74b74fde 100644
--- a/Resources/Prototypes/_Goobstation/Entities/Clothing/Uniforms/jumpsuits.yml
+++ b/Resources/Prototypes/_Goobstation/Entities/Clothing/Uniforms/jumpsuits.yml
@@ -28,9 +28,9 @@
description: A loose worn durathread shirt with a grey pants, its resilient fibres provide some protection to the wearer.
components:
- type: Sprite
- sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/durathread_jumpsuit.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/durathread_jumpsuit.rsi
- type: Clothing
- sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/durathread_jumpsuit.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/durathread_jumpsuit.rsi
- type: Armor
coverage:
- Torso
@@ -50,9 +50,9 @@
description: Lets not play too rough. Neither you nor I can reach it just yet…
components:
- type: Sprite
- sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/breverb.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/Syndicate/breverb.rsi
- type: Clothing
- sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/breverb.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/Syndicate/breverb.rsi
- type: entity
parent: [ClothingUniformJumpsuitResonant, BaseMajorContraband]
@@ -79,9 +79,9 @@
description: A black suit worn by officials.
components:
- type: Sprite
- sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/nanotrasen_representative.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/Centcom/nanotrasen_representative.rsi
- type: Clothing
- sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/nanotrasen_representative.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/Centcom/nanotrasen_representative.rsi
- type: entity
parent: ClothingUniformBase
@@ -90,9 +90,9 @@
description: A fancy black suit worn by officials, embellished with more golden threads than Normal.
components:
- type: Sprite
- sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/fancy_nanotrasen_representative.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/Centcom/fancy_nanotrasen_representative.rsi
- type: Clothing
- sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/fancy_nanotrasen_representative.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/Centcom/fancy_nanotrasen_representative.rsi
- type: entity
parent: ClothingUniformBase
@@ -101,9 +101,9 @@
description: Short sleeves, short temper.
components:
- type: Sprite
- sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/casualsyndicate.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/Casual/casualsyndicate.rsi
- type: Clothing
- sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/casualsyndicate.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/Casual/casualsyndicate.rsi
- type: entity
parent: ClothingUniformBase
@@ -112,9 +112,9 @@
description: Paperwork's tough.
components:
- type: Sprite
- sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/casualcentcom.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/Casual/casualcentcom.rsi
- type: Clothing
- sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/casualcentcom.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/Casual/casualcentcom.rsi
- type: entity
parent: ClothingUniformBase
@@ -123,9 +123,9 @@
description: Wait, where's my PDA?.
components:
- type: Sprite
- sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/casualcommand.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/Casual/casualcommand.rsi
- type: Clothing
- sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/casualcommand.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/Casual/casualcommand.rsi
- type: entity
parent: ClothingUniformBase
@@ -134,9 +134,9 @@
description: Sparks? Fiberglass? What about 'em?
components:
- type: Sprite
- sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/casualengineer.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/Casual/casualengineer.rsi
- type: Clothing
- sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/casualengineer.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/Casual/casualengineer.rsi
- type: entity
parent: ClothingUniformBase
@@ -145,9 +145,9 @@
description: Enemy of dogs everywhere.
components:
- type: Sprite
- sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/mailman.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/Cargo/mailman.rsi
- type: Clothing
- sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/mailman.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/Cargo/mailman.rsi
- type: entity
parent: ClothingUniformBase
@@ -156,9 +156,9 @@
description: Hunt down the Freeman.
components:
- type: Sprite
- sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/hecu.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/Centcom/hecu.rsi
- type: Clothing
- sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/hecu.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/Centcom/hecu.rsi
- type: entity
parent: [ClothingUniformBase, BaseCentcommContraband]
@@ -167,9 +167,9 @@
description: A suit worn by high-ranking Central Command members. The rest is classified.
components:
- type: Sprite
- sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/navy_gold.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/Centcom/navy_gold.rsi
- type: Clothing
- sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/navy_gold.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/Centcom/navy_gold.rsi
- type: Armor
coverage:
- Torso
@@ -191,9 +191,9 @@
description: A suit worn by high-ranking spec ops officers. The rest is classified.
components:
- type: Sprite
- sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/specialoperations.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/Centcom/specialoperations.rsi
- type: Clothing
- sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/specialoperations.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/Centcom/specialoperations.rsi
- type: Armor
coverage:
- Torso
@@ -215,9 +215,9 @@
description: A suit worn by diplomacy focused Central Command workers.
components:
- type: Sprite
- sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/diplomat.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/Centcom/diplomat.rsi
- type: Clothing
- sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/diplomat.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/Centcom/diplomat.rsi
- type: Armor
coverage:
- Torso
@@ -269,9 +269,9 @@
description: Only someone who would try to run away with Earth's deadliest bioweapon would want to wear this.
components:
- type: Sprite
- sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/mercer.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/mercer.rsi
- type: Clothing
- sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/mercer.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/mercer.rsi
- type: entity
parent: [ClothingUniformBase, BaseCommandContraband]
@@ -280,9 +280,9 @@
description: The head of security's custom-commissioned summer outfit, for when chasing tiders gets hot.
components:
- type: Sprite
- sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/casualshirt_hos.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/Casual/casualshirt_hos.rsi
- type: Clothing
- sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/casualshirt_hos.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/Casual/casualshirt_hos.rsi
- type: entity
parent: [ClothingUniformBase, BaseCommandContraband]
@@ -291,9 +291,9 @@
description: The research director's custom-commissioned summer outfit, for when those fire anomalies are making you sweat.
components:
- type: Sprite
- sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/casualshirt_rd.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/Casual/casualshirt_rd.rsi
- type: Clothing
- sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/casualshirt_rd.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/Casual/casualshirt_rd.rsi
- type: entity
parent: [ClothingUniformBase, BaseCommandContraband]
@@ -302,9 +302,9 @@
description: The quartermaster's custom-commissioned summer outfit, for when you want to show off your cash to the other departments.
components:
- type: Sprite
- sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/casualshirt_qm.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/Casual/casualshirt_qm.rsi
- type: Clothing
- sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/casualshirt_qm.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/Casual/casualshirt_qm.rsi
- type: entity
parent: [ClothingUniformBase, BaseCommandContraband]
@@ -313,9 +313,9 @@
description: The captain's custom-commissioned summer outfit, for when you've been in the green for a while.
components:
- type: Sprite
- sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/casualshirt_captain.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/Casual/casualshirt_captain.rsi
- type: Clothing
- sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/casualshirt_captain.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/Casual/casualshirt_captain.rsi
- type: entity
parent: [ClothingUniformBase, BaseCommandContraband]
@@ -324,9 +324,9 @@
description: The head of personnel's custom-commissioned summer outfit, for when you want to comfortably do paperwork.
components:
- type: Sprite
- sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/casualshirt_hop.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/Casual/casualshirt_hop.rsi
- type: Clothing
- sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/casualshirt_hop.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/Casual/casualshirt_hop.rsi
- type: entity
parent: [ClothingUniformBase, BaseCommandContraband]
@@ -335,9 +335,9 @@
description: The chief engineer's custom-commissioned summer outfit, for when you just want to lay down and look at the tesla.
components:
- type: Sprite
- sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/casualshirt_ce.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/Casual/casualshirt_ce.rsi
- type: Clothing
- sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/casualshirt_ce.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/Casual/casualshirt_ce.rsi
- type: entity
parent: ClothingUniformBase
@@ -346,9 +346,9 @@
description: A quarterzip for the sophisticated assistant.
components:
- type: Sprite
- sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/passenger_quarterzip.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/passenger_quarterzip.rsi
- type: Clothing
- sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/passenger_quarterzip.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/passenger_quarterzip.rsi
- type: entity
parent: ClothingUniformJumpsuitAncient
@@ -356,3 +356,95 @@
suffix: Unremoveable
components:
- type: Unremoveable
+# Cargo
+
+- type: entity
+ parent: [ClothingUniformBase, ClothingUniformFoldableBase]
+ id: ClothingUniformJumpsuitShaftMiner
+ name: shaft miner's jumpsuit
+ description: It's a snappy jumpsuit, looks a bit burnt.
+ components:
+ - type: Sprite
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/Cargo/shaft_miner.rsi
+ - type: Clothing
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/Cargo/shaft_miner.rsi
+
+- type: entity
+ parent: ClothingUniformBase
+ id: ClothingUniformOverallsCargo
+ name: cargo tech's overalls
+ description: It's a sturdy set of overalls. It's a bit dusty.
+ components:
+ - type: Sprite
+ sprite: _Goobstation/Clothing/Uniforms/Other/Overalls/Cargo/cargotech.rsi
+ - type: Clothing
+ sprite: _Goobstation/Clothing/Uniforms/Other/Overalls/Cargo/cargotech.rsi
+
+- type: entity
+ parent: ClothingUniformBase
+ id: ClothingUniformOverallsSalvageSpecialist
+ name: salvage specialist's overalls
+ description: It's a sturdy set of overalls. It's very dirty.
+ components:
+ - type: Sprite
+ sprite: _Goobstation/Clothing/Uniforms/Other/Overalls/Cargo/salvage.rsi
+ - type: Clothing
+ sprite: _Goobstation/Clothing/Uniforms/Other/Overalls/Cargo/salvage.rsi
+
+- type: entity
+ parent: ClothingUniformBase
+ id: ClothingUniformOverallsShaftMiner
+ name: shaft miner's overalls
+ description: It's a sturdy set of overalls, looks a bit burnt.
+ components:
+ - type: Sprite
+ sprite: _Goobstation/Clothing/Uniforms/Other/Overalls/Cargo/shaft_miner.rsi
+ - type: Clothing
+ sprite: _Goobstation/Clothing/Uniforms/Other/Overalls/Cargo/shaft_miner.rsi
+
+# RND
+
+- type: entity
+ parent: [ClothingUniformBase, ClothingUniformFoldableBase, BaseCommandContraband]
+ id: ClothingUniformJumpsuitResearchDirectorAlt
+ name: research director's turtleneck
+ description: It's a turtleneck worn by those with the know-how to achieve the position of Research Director. Its fabric provides minor protection from biological contaminants.
+ components:
+ - type: Sprite
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/RND/rndturtle.rsi
+ - type: Clothing
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/RND/rndturtle.rsi
+ - type: Item
+ inhandVisuals:
+ left:
+ - state: inhand-left
+ color: "#620b73"
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/color/color.rsi
+ right:
+ - state: inhand-right
+ color: "#620b73"
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/color/color.rsi
+
+#senior sec
+- type: entity
+ parent: ClothingUniformBase
+ id: ClothingUniformJumpsuitVeteranSecurity
+ name: Airy Security Jumpsuit
+ description: An airy version of the standard security jumpsuit, normally given on shifts with a lacking atmos department
+ components:
+ - type: Sprite
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/Security/security_black.rsi
+ - type: Clothing
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/Security/security_black.rsi
+
+# Golden liaison jumpsuit
+- type: entity
+ parent: [ ClothingUniformBase, BaseCentcommContraband ]
+ id: ClothingUniformJumpsuitGoldenLiaison
+ name: Golden Liaison CentCom Jumpsuit
+ description: A finely-tailored white-and-gold uniform worn by senior officials of Central Command.
+ components:
+ - type: Sprite
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/Centcom/golden_liaison.rsi
+ - type: Clothing
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/Centcom/golden_liaison.rsi
\ No newline at end of file
diff --git a/Resources/Prototypes/_Goobstation/Entities/Mobs/Player/admeme.yml b/Resources/Prototypes/_Goobstation/Entities/Mobs/Player/admeme.yml
index 4d5261af703..0118cbb07b1 100644
--- a/Resources/Prototypes/_Goobstation/Entities/Mobs/Player/admeme.yml
+++ b/Resources/Prototypes/_Goobstation/Entities/Mobs/Player/admeme.yml
@@ -23,7 +23,7 @@
suffix: CentComm
components:
- type: Sprite
- sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/navy_gold.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/Centcom/navy_gold.rsi
state: icon
- type: RandomMetadata
nameSegments:
@@ -63,7 +63,7 @@
suffix: ADMIN ONLY, DO FUCKING NOT
components:
- type: Sprite
- sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/navy_gold.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/Centcom/navy_gold.rsi
state: icon
- type: RandomMetadata
nameSegments:
@@ -103,7 +103,7 @@
suffix: CentComm
components:
- type: Sprite
- sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/navy_gold.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/Centcom/navy_gold.rsi
state: icon
- type: RandomMetadata
nameSegments:
@@ -143,7 +143,7 @@
suffix: CentComm
components:
- type: Sprite
- sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/diplomat.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/Centcom/navy_gold.rsi
state: icon
- type: RandomMetadata
nameSegments:
@@ -183,7 +183,7 @@
suffix: CentComm
components:
- type: Sprite
- sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/navy_gold.rsi
+ sprite: _Goobstation/Clothing/Uniforms/Jumpsuit/Centcom/navy_gold.rsi
state: icon
- type: RandomMetadata
nameSegments:
diff --git a/Resources/Prototypes/_Goobstation/Loadouts/Jobs/Cargo/cargo_technician.yml b/Resources/Prototypes/_Goobstation/Loadouts/Jobs/Cargo/cargo_technician.yml
index 19452ae2b09..d015af779c0 100644
--- a/Resources/Prototypes/_Goobstation/Loadouts/Jobs/Cargo/cargo_technician.yml
+++ b/Resources/Prototypes/_Goobstation/Loadouts/Jobs/Cargo/cargo_technician.yml
@@ -73,3 +73,8 @@
- !type:SpeciesLoadoutEffect # Goobstation - EE Plasmeme Change.
species:
- Plasmaman
+
+- type: loadout
+ id: CargoTechnicianOveralls
+ equipment:
+ jumpsuit: ClothingUniformOverallsCargo
\ No newline at end of file
diff --git a/Resources/Prototypes/_Goobstation/Loadouts/Jobs/Cargo/salvage.yml b/Resources/Prototypes/_Goobstation/Loadouts/Jobs/Cargo/salvage.yml
index 00172d36161..b3e90793a5f 100644
--- a/Resources/Prototypes/_Goobstation/Loadouts/Jobs/Cargo/salvage.yml
+++ b/Resources/Prototypes/_Goobstation/Loadouts/Jobs/Cargo/salvage.yml
@@ -60,3 +60,35 @@
- !type:SpeciesLoadoutEffect # Goobstation - EE Plasmeme Change.
species:
- Plasmaman
+
+# Salvage
+- type: loadout
+ id: SalvageSpecialistJumpsuit
+ equipment:
+ jumpsuit: ClothingUniformJumpsuitSalvageSpecialist
+
+- type: loadout
+ id: SalvageSpecialistJumpskirt
+ equipment:
+ jumpsuit: ClothingUniformJumpskirtSalvageSpecialist
+
+- type: loadout
+ id: SalvageSpecialistOveralls
+ equipment:
+ jumpsuit: ClothingUniformOverallsSalvageSpecialist
+
+# Shaft Miner
+- type: loadout
+ id: ShaftMinerJumpsuit
+ equipment:
+ jumpsuit: ClothingUniformJumpsuitShaftMiner
+
+- type: loadout
+ id: ShaftMinerJumpskirt
+ equipment:
+ jumpsuit: ClothingUniformJumpskirtShaftMiner
+
+- type: loadout
+ id: ShaftMinerOveralls
+ equipment:
+ jumpsuit: ClothingUniformOverallsShaftMiner
diff --git a/Resources/Prototypes/_Goobstation/Loadouts/Jobs/Security/security_officer.yml b/Resources/Prototypes/_Goobstation/Loadouts/Jobs/Security/security_officer.yml
index 3053ada4b76..8719a71ebcb 100644
--- a/Resources/Prototypes/_Goobstation/Loadouts/Jobs/Security/security_officer.yml
+++ b/Resources/Prototypes/_Goobstation/Loadouts/Jobs/Security/security_officer.yml
@@ -10,6 +10,15 @@
#
# SPDX-License-Identifier: AGPL-3.0-or-later
+- type: loadoutEffectGroup
+ id: VeteranOfficer
+ effects:
+ - !type:JobRequirementLoadoutEffect
+ requirement:
+ !type:DepartmentTimeRequirement
+ department: Security
+ time: 100h # 100 hrs
+
- type: loadout
id: WinterCoatSeniorSecArmored
effects:
@@ -54,3 +63,27 @@
id: SecurityHelmetAlt
equipment:
head: ClothingHeadHelmetBasicAlt
+
+- type: loadout
+ id: ClothingNeckMantleVeteranSecurity
+ effects:
+ - !type:GroupLoadoutEffect
+ proto: VeteranOfficer
+ equipment:
+ neck: ClothingNeckMantleVeteranSecurity
+
+- type: loadout
+ id: VeteranOfficerArmor
+ effects:
+ - !type:GroupLoadoutEffect
+ proto: VeteranOfficer
+ equipment:
+ outerClothing: ClothingOuterArmorVeteranSecurity
+
+- type: loadout
+ id: VeteranOfficerBlackJumpsuit
+ effects:
+ - !type:GroupLoadoutEffect
+ proto: VeteranOfficer
+ equipment:
+ jumpsuit: ClothingUniformJumpsuitVeteranSecurity
\ No newline at end of file
diff --git a/Resources/Prototypes/_Goobstation/Loadouts/loadout_groups.yml b/Resources/Prototypes/_Goobstation/Loadouts/loadout_groups.yml
index bb7575771e1..5ecdd027614 100644
--- a/Resources/Prototypes/_Goobstation/Loadouts/loadout_groups.yml
+++ b/Resources/Prototypes/_Goobstation/Loadouts/loadout_groups.yml
@@ -1015,6 +1015,7 @@
loadouts:
- Bodycam
- ClothingNeckCWPSec
+ - ClothingNeckMantleVeteranSecurity
#honkops
@@ -1374,3 +1375,21 @@
- JumpsuitHawaiBlue
- JumpsuitHawaiRed
- JumpsuitHawaiYellow
+
+# Salvage/Shaft Miner
+
+- type: loadoutGroup
+ id: SalvageSpecialistJumpsuit
+ name: loadout-group-salvage-specialist-jumpsuit
+ loadouts:
+ - SalvageSpecialistJumpsuit
+ - SalvageSpecialistJumpskirt
+ - SalvageSpecialistOveralls
+
+- type: loadoutGroup
+ id: ShaftMinerJumpsuit
+ name: loadout-group-shaft-miner-jumpsuit
+ loadouts:
+ - ShaftMinerJumpsuit
+ - ShaftMinerJumpskirt
+ - ShaftMinerOveralls
diff --git a/Resources/Prototypes/_Inky/CollectiveMind/lunar.yml b/Resources/Prototypes/_Inky/CollectiveMind/lunar.yml
new file mode 100644
index 00000000000..78356de5f7d
--- /dev/null
+++ b/Resources/Prototypes/_Inky/CollectiveMind/lunar.yml
@@ -0,0 +1,5 @@
+- type: collectiveMind
+ id: LunarMind
+ name: collective-mind-lunarmind
+ keycode: 'l'
+ color: "#B56328"
diff --git a/Resources/Prototypes/_Inky/Entities/Clothing/Neck/ties.yml b/Resources/Prototypes/_Inky/Entities/Clothing/Neck/ties.yml
new file mode 100644
index 00000000000..f24687effb0
--- /dev/null
+++ b/Resources/Prototypes/_Inky/Entities/Clothing/Neck/ties.yml
@@ -0,0 +1,11 @@
+- type: entity
+ parent: ClothingNeckBase
+ id: ClothingNeckTieElysium
+ name: horrowing necktie
+ description: Adorned with a garish pattern. Its disturbingly vivid. Somehow you feel as if it would be wrong to ever take it off. Its your friend now. You will betray it if you change it for some boring scarf.
+ components:
+ - type: Sprite
+ sprite: _Inky/Clothing/Neck/Ties/elysiumtie.rsi
+ state: icon
+ - type: Clothing
+ sprite: _Inky/Clothing/Neck/Ties/elysiumtie.rsi
\ No newline at end of file
diff --git a/Resources/Prototypes/_Inky/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/_Inky/Entities/Clothing/OuterClothing/coats.yml
new file mode 100644
index 00000000000..cb2d49227a4
--- /dev/null
+++ b/Resources/Prototypes/_Inky/Entities/Clothing/OuterClothing/coats.yml
@@ -0,0 +1,11 @@
+- type: entity
+ parent: ClothingOuterCoatDetectiveLoadout
+ id: ClothingOuterCoatDiscoBlazer
+ name: Disco Blazer
+ description: Looks like someone skinned this blazer off some long extinct disco-animal.
+ components:
+ - type: Sprite
+ sprite: _Inky/Clothing/OuterClothing/Coats/ElysiumCoat.rsi
+ state: icon
+ - type: Clothing
+ sprite: _Inky/Clothing/OuterClothing/Coats/ElysiumCoat.rsi
\ No newline at end of file
diff --git a/Resources/Prototypes/_Inky/Entities/Clothing/Shoes/specific.yml b/Resources/Prototypes/_Inky/Entities/Clothing/Shoes/specific.yml
new file mode 100644
index 00000000000..525409c397f
--- /dev/null
+++ b/Resources/Prototypes/_Inky/Entities/Clothing/Shoes/specific.yml
@@ -0,0 +1,13 @@
+- type: entity
+ parent: ClothingShoesMilitaryBase
+ id: ClothingShoesElysiumShoes
+ name: Snake-skin shoes
+ description: They may have lost some of their lustre over the years, but these green crocodile leather shoes fit you perfectly.
+ components:
+ - type: Sprite
+ sprite: _Inky/Clothing/Shoes/Specific/elysiumshoes.rsi
+ state: icon
+ - type: Clothing
+ sprite: _Inky/Clothing/Shoes/Specific/elysiumshoes.rsi
+ - type: ClothingSlowOnDamageModifier
+ modifier: 0.5
\ No newline at end of file
diff --git a/Resources/Prototypes/_Inky/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/_Inky/Entities/Clothing/Uniforms/jumpsuits.yml
new file mode 100644
index 00000000000..eef11a96684
--- /dev/null
+++ b/Resources/Prototypes/_Inky/Entities/Clothing/Uniforms/jumpsuits.yml
@@ -0,0 +1,11 @@
+- type: entity
+ parent: ClothingUniformBase
+ id: ClothingUniformJumpsuitElysium
+ name: satin shirt and bell-bottom pants
+ description: The white satin shirt used to be fancy and theres the golden-brown trousers are flare-cut.
+ components:
+ - type: Sprite
+ sprite: _Inky/Clothing/Uniforms/Jumpsuit/Elysium.rsi
+ state: icon
+ - type: Clothing
+ sprite: _Inky/Clothing/Uniforms/Jumpsuit/Elysium.rsi
diff --git a/Resources/Prototypes/_Inky/GameRules/roundstart.yml b/Resources/Prototypes/_Inky/GameRules/roundstart.yml
new file mode 100644
index 00000000000..7ede8aa316e
--- /dev/null
+++ b/Resources/Prototypes/_Inky/GameRules/roundstart.yml
@@ -0,0 +1,19 @@
+- type: entity
+ parent: BaseGameRule
+ id: Werewolf
+ components:
+ - type: WerewolfRule
+ - type: GameRule
+ minPlayers: 20 # Trauma, was 20
+ - type: AntagPlayerEffects
+ effects:
+ - !type:NestedEffect
+ proto: WerewolfSkills
+ - type: AntagSelection
+ antags:
+ - !type:LinearAntagCount
+ proto: Werewolf
+ range:
+ min: 2
+ max: 5
+ playerRatio: 12
diff --git a/Resources/Prototypes/_Inky/Roles/mind_roles.yml b/Resources/Prototypes/_Inky/Roles/mind_roles.yml
new file mode 100644
index 00000000000..370c942e66c
--- /dev/null
+++ b/Resources/Prototypes/_Inky/Roles/mind_roles.yml
@@ -0,0 +1,12 @@
+# Werewolf
+- type: entity
+ parent: BaseMindRoleAntag
+ id: MindRoleWerewolf
+ name: Werewolf Role
+ components:
+ - type: MindRole
+ antagPrototype: Werewolf
+ exclusiveAntag: true
+ roleType: SoloAntagonist
+ subtype: role-subtype-werewolf
+ - type: WerewolfRole
diff --git a/Resources/Prototypes/_Inky/Werewolf/Mutations/base_werewolf.yml b/Resources/Prototypes/_Inky/Werewolf/Mutations/base_werewolf.yml
new file mode 100644
index 00000000000..9f387fcc7b0
--- /dev/null
+++ b/Resources/Prototypes/_Inky/Werewolf/Mutations/base_werewolf.yml
@@ -0,0 +1,181 @@
+- type: entity
+ parent:
+# - SimpleMobBase
+ - MobBloodstream
+ - MobRespirator
+ - MobAtmosStandard
+ - MobFlammable
+ - BaseSimpleMob
+ - MobAtmosExposed
+ - MobCombat
+ - BaseMobAnimal
+ id: BaseWerewolf
+ name: wolf
+ description: Let's hope he doesnt bite.
+ abstract: true
+ components:
+ # inky
+ - type: ConcussionThreshold
+ thresholds:
+ 0: Sane
+ 5: Minor
+ 50: Hard
+ 100: Overwhelmed
+ healRate: 1 # lower than humans because this guy is already so fucking fast, people may ask sec fo flashbangs if the chaplain is a bitch
+ speedModifierThresholds:
+ Hard: 0.7
+ # /inky
+ - type: Perishable
+ - type: Climbing
+ - type: NameIdentifier
+ group: GenericNumber
+ - type: SlowOnDamage
+ speedModifierThresholds:
+ 60: 0.7
+ 80: 0.5
+ - type: Hunger
+ thresholds: # only animals and rats are derived from this prototype so let's override it here and in rats' proto
+ Overfed: 100
+ Okay: 50
+ Peckish: 25
+ Starving: 10
+ Dead: 0
+ baseDecayRate: 0.00925925925926 # it is okay for animals to eat and drink less than humans, but more frequently
+ - type: Thirst
+ thresholds:
+ OverHydrated: 200
+ Okay: 150
+ Thirsty: 100
+ Parched: 50
+ Dead: 0
+ baseDecayRate: 0.04
+ - type: StatusEffects
+ allowed:
+ - Electrocution
+ - TemporaryBlindness
+ - Pacified
+ - Flashed
+ - Adrenaline
+ - type: Bloodstream
+ bloodReferenceSolution:
+ reagents:
+ - ReagentId: Blood
+ Quantity: 150
+ - type: MobPrice
+ price: 150
+ - type: FloatingVisuals
+ - type: Sprite
+ sprite: _Inky/Mobs/Werewolf/Mutations/base.rsi
+ state: werewolf
+ - type: Fixtures
+ fixtures:
+ fix1:
+ shape:
+ !type:PhysShapeCircle
+ radius: 0.45
+ density: 250 # 5 times more than a hueman
+ mask:
+ - MobMask
+ layer:
+ - MobLayer
+ - type: Body
+ - type: MobState
+ - type: MobThresholds
+ thresholds:
+ 0: Alive
+ 100: Critical
+ 200: Dead
+ - type: MobStateActions
+ actions:
+ Critical:
+ - ActionCritSuccumb
+ - ActionCritFakeDeath
+ - ActionCritLastWords
+ - type: Deathgasp
+ - type: HealthExaminable
+ examinableTypes:
+ - Blunt
+ - Slash
+ - Piercing
+ - Heat
+ - Shock
+ - Cold
+ - Caustic
+ - type: MeleeWeapon
+ hidden: true
+ soundHit:
+ path: /Audio/Weapons/pierce.ogg
+ angle: 30
+ animation: WeaponArcClaw
+ damage:
+ types:
+ Blunt: 5
+ Slash: 10
+ - type: Pullable
+ - type: Puller
+ - type: MovementSpeedModifier
+ baseSprintSpeed: 6.5
+ baseWalkSpeed: 4.5
+ - type: Tag
+ tags:
+ - FootstepSound
+ - DoorBumpOpener
+ - type: Insulated
+ - type: ThermalVision
+ flashDurationMultiplier: 3 # counter to werewolves and their insane speed - flashes.
+ pulseTime: 10
+ isEquipment: false
+ toggleAction: PulseThermalVisionWerewolf
+ - type: Prying
+ speedModifier: 4 # cmon a fucking 11 foot wolf
+ pryPowered: true
+ - type: Hands # also dont worry you cant pick up anything
+ hands:
+ hand_right:
+ location: Right
+ sortedHands:
+ - hand_left # martial art requires at least 1 hand to work properly for some fuckass unknown reason
+ - type: NightVision
+ color: "#808080"
+ activateSound: null
+ deactivateSound: null
+ - type: Alerts # idk to show the guys hunger since it doesnt for some reason???
+ - type: NpcFactionMember
+ factions:
+ - Wizard # too lazy to make a separate faction just for werewolf, its fine trust
+ - type: Injurable
+ damageContainer: Biological
+ - type: Damageable
+ damageModifierSet: WerewolfBase
+ - type: NoSlip
+ - type: Targeting
+ - type: Internals
+
+- type: entity
+ id: BaseWerewolfUnholy
+ abstract: true
+ components:
+ - type: ShouldTakeHoly
+ - type: Injurable
+ damageContainer: BiologicalMetaphysical
+ - type: Damageable
+ damageModifierSet: WerewolfBase
+
+- type: damageModifierSet # todo werewolf its own file
+ id: WerewolfBase
+ coefficients:
+ Blunt: 0.15 # GO KILL HIM WITH HOLY DAMAGE YOU BUMS
+ Slash: 0.15
+ Piercing: 0.15
+ Heat: 0.35 # mfw lasersec
+ Cold: 0.85 # fur
+ Holy: 1.0
+
+- type: entityEffect
+ id: WerewolfSkills
+ effects:
+ - !type:GrantSkills
+ skills:
+ MartialArtLyCqc: 65
+ StrengthKnowledge: 65
+ AthleticsKnowledge: 65
diff --git a/Resources/Prototypes/_Inky/Werewolf/Mutations/blackwolf.yml b/Resources/Prototypes/_Inky/Werewolf/Mutations/blackwolf.yml
new file mode 100644
index 00000000000..ef6cd608d8e
--- /dev/null
+++ b/Resources/Prototypes/_Inky/Werewolf/Mutations/blackwolf.yml
@@ -0,0 +1,14 @@
+- type: entity
+ id: WerewolfBlackwolf
+ parent:
+ - BaseWerewolf
+ - BaseWerewolfUnholy
+ # todo description i cant come up with anything
+ name: black wolf
+ components:
+ - type: Sprite
+ sprite: _Inky/Mobs/Werewolf/Mutations/black.rsi
+ state: wolf
+ - type: MovementSpeedModifier
+ baseSprintSpeed: 4.5
+ baseWalkSpeed: 2.5
diff --git a/Resources/Prototypes/_Inky/Werewolf/Mutations/direwolf.yml b/Resources/Prototypes/_Inky/Werewolf/Mutations/direwolf.yml
new file mode 100644
index 00000000000..7d5d224aa3c
--- /dev/null
+++ b/Resources/Prototypes/_Inky/Werewolf/Mutations/direwolf.yml
@@ -0,0 +1,39 @@
+- type: entity
+ id: WerewolfDirewolf
+ parent:
+ - BaseWerewolf
+ - BaseWerewolfUnholy
+ name: dire wolf
+ description: A dark, forboding feeling overtakes you. You know what will come, you can feel his intentions.
+ components:
+ - type: Sprite
+ sprite: _Inky/Mobs/Werewolf/Mutations/direwolf.rsi
+ state: direwolf
+ - type: Barotrauma
+ damage:
+ types:
+ Blunt: 0.35
+ Heat: 0.1
+# - type: GrantWerewolfMoves // TODO WEREWOLF MA
+# - type: LanguageSpeaker
+# speaks:
+# - Draconic
+# understands:
+# - TauCetiBasic
+# - Draconic
+ - type: MeleeWeapon
+ hidden: true
+ soundHit:
+ path: /Audio/Weapons/pierce.ogg
+ angle: 30
+ animation: WeaponArcClaw
+ damage:
+ types:
+ Slash: 17
+ - type: MovementSpeedModifier
+ baseSprintSpeed: 7.5
+ baseWalkSpeed: 4.5
+ - type: Prying
+ speedModifier: 6 # a bit faster than a base wolf
+ pryPowered: true
+
diff --git a/Resources/Prototypes/_Inky/Werewolf/Mutations/werewolf.yml b/Resources/Prototypes/_Inky/Werewolf/Mutations/werewolf.yml
new file mode 100644
index 00000000000..5b2f5c19a78
--- /dev/null
+++ b/Resources/Prototypes/_Inky/Werewolf/Mutations/werewolf.yml
@@ -0,0 +1,35 @@
+- type: entity
+ id: WerewolfWerewolf
+ parent:
+ - BaseWerewolf
+ - BaseWerewolfUnholy
+ components:
+ - type: Sprite
+ sprite: _Inky/Mobs/Werewolf/Mutations/base.rsi
+ state: werewolf
+ - type: Barotrauma
+ damage:
+ types:
+ Blunt: 0.35
+ Heat: 0.1
+# - type: LanguageKnowledge # Einstein Engines - Languages
+# speaks:
+# - Draconic # the furry vulp language (swapped to draconic cuz trauma were based enough to get rid of it)
+# understands:
+# - TauCetiBasic
+# - Draconic
+
+- type: entity
+ id: WerewolfWerehuman
+ parent: WerewolfWerewolf # should be identical to the average werewolf because memes
+ name: human
+ description: Lord have mercy.
+ components:
+ - type: Sprite
+ sprite: _Inky/Mobs/Werewolf/Mutations/werehuman.rsi
+ state: werehuman
+# - type: LanguageSpeaker
+# speaks:
+# - TauCetiBasic
+# understands:
+# - TauCetiBasic
diff --git a/Resources/Prototypes/_Inky/Werewolf/Mutations/whitewolf.yml b/Resources/Prototypes/_Inky/Werewolf/Mutations/whitewolf.yml
new file mode 100644
index 00000000000..bba50824c6f
--- /dev/null
+++ b/Resources/Prototypes/_Inky/Werewolf/Mutations/whitewolf.yml
@@ -0,0 +1,49 @@
+- type: entity
+ id: WerewolfWhite
+ parent:
+ - BaseWerewolf
+ name: white wolf
+ categories: [ HideSpawnMenu ] # goida
+ description: Let's hope you haven't sinned.
+ components:
+ - type: Sprite
+ sprite: _Inky/Mobs/Werewolf/Mutations/white.rsi
+ state: wolf
+ - type: Barotrauma
+ damage:
+ types:
+ Blunt: 0.35
+ Heat: 0.1
+ # - type: GrantWerewolfMoves // TODO WEREWOLF MA
+ # - type: LanguageSpeaker
+ # speaks:
+ # - Draconic
+ # understands:
+ # - TauCetiBasic
+ # - Draconic
+ - type: MeleeWeapon
+ hidden: true
+ soundHit:
+ path: /Audio/Weapons/pierce.ogg
+ angle: 30
+ animation: WeaponArcClaw
+ damage:
+ types:
+ Blunt: 5
+ Slash: 12
+
+- type: entity
+ id: WerewolfWhiteClaws # holy goida
+ parent: WerewolfWhite
+ components:
+ - type: MeleeWeapon
+ hidden: true
+ soundHit:
+ path: /Audio/Weapons/pierce.ogg
+ angle: 30
+ animation: WeaponArcClaw
+ damage:
+ types:
+ Blunt: 5
+ Slash: 12
+ Holy: 8 # thats actually insane
diff --git a/Resources/Prototypes/_Inky/Werewolf/Store/black.yml b/Resources/Prototypes/_Inky/Werewolf/Store/black.yml
new file mode 100644
index 00000000000..f59ef58f46c
--- /dev/null
+++ b/Resources/Prototypes/_Inky/Werewolf/Store/black.yml
@@ -0,0 +1,166 @@
+- type: listing
+ id: WerewolfBlack
+ name: werewolf-store-choose-black-name
+ description: werewolf-store-choose-black-desc
+ icon:
+ sprite: _Inky/Mobs/Werewolf/Mutations/black.rsi
+ state: icon
+ productEvent: !type:EventWerewolfChangeType
+ werewolfType: WerewolfTransformBlack
+ raiseProductEventOnUser: true
+ cost:
+ Fury: 15
+ categories:
+ - WerewolfChoose
+ conditions:
+ - !type:ListingLimitedStockCondition
+ stock: 1
+ - !type:BuyBeforeCondition
+ blacklist:
+ - WerewolfWhite
+ - WerewolfDirewolf
+
+- type: listing
+ id: WerewolfBiteBlack
+ name: werewolf-store-bite-black-name
+ description: werewolf-store-bite-black-desc
+ icon:
+ sprite: _Inky/Actions/Werewolf/werewolf.rsi
+ state: black-bite
+ productEvent: !type:EventWerewolfUpgradeAbility
+ newActionId: ActionWerewolfBiteBlack
+ oldActionId: ActionWerewolfAbsorb
+ raiseProductEventOnUser: true
+ cost:
+ Fury: 10
+ categories:
+ - WerewolfBlack
+ conditions:
+ - !type:ListingLimitedStockCondition
+ stock: 1
+ - !type:BuyBeforeCondition
+ whitelist:
+ - WerewolfBlack
+ blacklist:
+ - WerewolfWhite
+ - WerewolfDirewolf
+
+- type: listing
+ id: WerewolfBlackLunar
+ name: werewolf-store-black-lunar-name
+ description: werewolf-store-lunar-black-desc
+ icon:
+ sprite: _Inky/Actions/Werewolf/werewolf.rsi
+ state: lunar-black
+ productEvent: !type:WerewolfAddCollectivemind
+ popup: werewolf-black-lunar-popup
+ raiseProductEventOnUser: true
+ cost:
+ Fury: 6
+ categories:
+ - WerewolfBlack
+ conditions:
+ - !type:ListingLimitedStockCondition
+ stock: 1
+ - !type:BuyBeforeCondition
+ whitelist:
+ - WerewolfBlack
+ blacklist:
+ - WerewolfDirewolf
+ - WerewolfWhite
+
+- type: listing
+ id: WerewolfBlackOrder
+ name: werewolf-store-black-order-name
+ description: werewolf-store-lunar-order-desc
+ icon:
+ sprite: _Inky/Actions/Werewolf/werewolf.rsi
+ state: howl-green
+ productEvent: !type:EventWerewolfUpgradeAbility
+ oldActionId: ActionWerewolfHowl
+ newActionId: ActionWerewolfHowlBlack
+ raiseProductEventOnUser: true
+ cost:
+ Fury: 6
+ categories:
+ - WerewolfBlack
+ conditions:
+ - !type:ListingLimitedStockCondition
+ stock: 1
+ - !type:BuyBeforeCondition
+ whitelist:
+ - WerewolfBlack
+ blacklist:
+ - WerewolfDirewolf
+ - WerewolfWhite
+
+- type: listing
+ id: WerewolfBlackBequeath
+ name: werewolf-store-black-bequeath-name
+ description: werewolf-store-bequeath-desc
+ icon:
+ sprite: _Inky/Actions/Werewolf/werewolf.rsi
+ state: bequeath
+ productEvent: !type:EventWerewolfUpgradeAbility
+ newActionId: ActionWerewolfBequeath
+ raiseProductEventOnUser: true
+ cost:
+ Fury: 15
+ categories:
+ - WerewolfBlack
+ conditions:
+ - !type:ListingLimitedStockCondition
+ stock: 1
+ - !type:BuyBeforeCondition
+ whitelist:
+ - WerewolfBiteBlack
+ blacklist:
+ - WerewolfDirewolf
+ - WerewolfWhite
+
+- type: listing
+ id: WerewolfBlackBeckon
+ name: werewolf-store-black-beckon-name
+ description: werewolf-store-beckon-desc
+ icon:
+ sprite: _Inky/Actions/Werewolf/werewolf.rsi
+ state: beckon
+ productEvent: !type:EventWerewolfUpgradeAbility
+ newActionId: ActionWerewolfBeckon
+ raiseProductEventOnUser: true
+ cost:
+ Fury: 10
+ categories:
+ - WerewolfBlack
+ conditions:
+ - !type:ListingLimitedStockCondition
+ stock: 1
+ - !type:BuyBeforeCondition
+ whitelist:
+ - WerewolfBlackLunar
+ blacklist:
+ - WerewolfDirewolf
+ - WerewolfWhite
+
+- type: listing
+ id: WerewolfBlackLunarApprentice
+ name: werewolf-store-black-lunar-name
+ description: werewolf-store-lunar-black-desc
+ icon:
+ sprite: _Inky/Actions/Werewolf/werewolf.rsi
+ state: lunar-black
+ productEvent: !type:WerewolfAddCollectivemind
+ popup: werewolf-black-lunar-popup
+ raiseProductEventOnUser: true
+ cost:
+ Fury: 2
+ categories:
+ - WerewolfBlackApprentice
+ conditions:
+ - !type:ListingLimitedStockCondition
+ stock: 1
+ - !type:BuyBeforeCondition
+ blacklist:
+ - WerewolfDirewolf
+ - WerewolfWhite
+ - WerewolfBlack
diff --git a/Resources/Prototypes/_Inky/Werewolf/Store/dire.yml b/Resources/Prototypes/_Inky/Werewolf/Store/dire.yml
new file mode 100644
index 00000000000..c81b85324f6
--- /dev/null
+++ b/Resources/Prototypes/_Inky/Werewolf/Store/dire.yml
@@ -0,0 +1,70 @@
+- type: listing
+ id: WerewolfDirewolf
+ name: werewolf-store-choose-direwolf-name
+ description: werewolf-store-choose-direwolf-desc
+ icon:
+ sprite: _Inky/Mobs/Werewolf/Mutations/direwolf.rsi
+ state: icon
+ productEvent: !type:EventWerewolfChangeType
+ werewolfType: WerewolfTransformDirewolf
+ raiseProductEventOnUser: true
+ cost:
+ Fury: 15
+ categories:
+ - WerewolfChoose
+ conditions:
+ - !type:ListingLimitedStockCondition
+ stock: 1
+ - !type:BuyBeforeCondition
+ blacklist:
+ - WerewolfWhite
+ - WerewolfBlack
+
+- type: listing
+ id: WerewolfHowlUpgrade
+ name: werewolf-store-howl-direwolf-name
+ description: werewolf-store-howl-direwolf-desc
+ icon:
+ sprite: _Inky/Actions/Werewolf/werewolf.rsi
+ state: howl-red
+ productEvent: !type:EventWerewolfUpgradeAbility
+ oldActionId: ActionWerewolfHowl
+ newActionId: ActionWerewolfHowlDire
+ raiseProductEventOnUser: true
+ cost:
+ Fury: 5
+ categories:
+ - WerewolfDire
+ conditions:
+ - !type:ListingLimitedStockCondition
+ stock: 1
+ - !type:BuyBeforeCondition
+ whitelist:
+ - WerewolfDirewolf
+ blacklist:
+ - WerewolfWhite
+ - WerewolfBlack
+
+- type: listing
+ id: WerewolfBiteDire
+ name: werewolf-store-bite-direwolf-name
+ description: werewolf-store-bite-direwolf-desc
+ icon:
+ sprite: _Inky/Actions/Werewolf/werewolf.rsi
+ state: bleeding-bite
+ productEvent: !type:EventWerewolfUpgradeAbility
+ newActionId: ActionWerewolfBiteDire
+ raiseProductEventOnUser: true
+ cost:
+ Fury: 10
+ categories:
+ - WerewolfDire
+ conditions:
+ - !type:ListingLimitedStockCondition
+ stock: 1
+ - !type:BuyBeforeCondition
+ whitelist:
+ - WerewolfDirewolf
+ blacklist:
+ - WerewolfWhite
+ - WerewolfBlack
diff --git a/Resources/Prototypes/_Inky/Werewolf/Store/side.yml b/Resources/Prototypes/_Inky/Werewolf/Store/side.yml
new file mode 100644
index 00000000000..c3d2d5c86c9
--- /dev/null
+++ b/Resources/Prototypes/_Inky/Werewolf/Store/side.yml
@@ -0,0 +1,53 @@
+- type: listing
+ id: WerewolfSideRegen
+ name: werewolf-store-regen-name
+ description: werewolf-store-regen-desc
+ icon:
+ sprite: _Inky/Actions/Werewolf/werewolf.rsi
+ state: regen
+ productEvent: !type:EventWerewolfUpgradeAbility # holy goida
+ newActionId: ActionWerewolfRegen
+ raiseProductEventOnUser: true
+ cost:
+ Fury: 2
+ categories:
+ - WerewolfSide
+ conditions:
+ - !type:ListingLimitedStockCondition
+ stock: 1
+
+- type: listing
+ id: WerewolfSideAmbush
+ name: werewolf-store-jump-name
+ description: werewolf-store-jump-desc
+ icon:
+ sprite: _Inky/Actions/Werewolf/werewolf.rsi
+ state: ambush
+ productEvent: !type:EventWerewolfUpgradeAbility
+ newActionId: ActionWerewolfJump
+ raiseProductEventOnUser: true
+ cost:
+ Fury: 2
+ categories:
+ - WerewolfSide
+ conditions:
+ - !type:ListingLimitedStockCondition
+ stock: 1
+
+- type: listing
+ id: WerewolfSideGut
+ name: werewolf-store-gut-name
+ description: werewolf-store-gut-desc
+ icon:
+ sprite: _Inky/Actions/Werewolf/werewolf.rsi
+ state: gut
+ productEvent: !type:EventWerewolfUpgradeAbility
+ newActionId: ActionWerewolfGut
+ raiseProductEventOnUser: true
+ cost:
+ Fury: 2
+ categories:
+ - WerewolfSide
+ conditions:
+ - !type:ListingLimitedStockCondition
+ stock: 1
diff --git a/Resources/Prototypes/_Inky/Werewolf/Store/store.yml b/Resources/Prototypes/_Inky/Werewolf/Store/store.yml
new file mode 100644
index 00000000000..887e8a39200
--- /dev/null
+++ b/Resources/Prototypes/_Inky/Werewolf/Store/store.yml
@@ -0,0 +1,36 @@
+# all the store shit is here (or maybe not, todo idk)
+
+- type: currency
+ id: Fury
+ displayName: store-currency-display-fury
+ canWithdraw: false
+
+- type: storeCategory
+ id: WerewolfChoose
+ name: werewolf-store-choose
+ priority: 0
+
+- type: storeCategory
+ id: WerewolfDire
+ name: werewolf-store-dire
+ priority: 1
+
+- type: storeCategory
+ id: WerewolfWhite
+ name: werewolf-store-white
+ priority: 2
+
+- type: storeCategory
+ id: WerewolfBlack
+ name: werewolf-store-black
+ priority: 3
+
+- type: storeCategory
+ id: WerewolfBlackApprentice
+ name: werewolf-store-black-apprentice
+ priority: 98
+
+- type: storeCategory
+ id: WerewolfSide
+ name: werewolf-store-side
+ priority: 99
diff --git a/Resources/Prototypes/_Inky/Werewolf/Store/white.yml b/Resources/Prototypes/_Inky/Werewolf/Store/white.yml
new file mode 100644
index 00000000000..4941ab6f273
--- /dev/null
+++ b/Resources/Prototypes/_Inky/Werewolf/Store/white.yml
@@ -0,0 +1,141 @@
+- type: listing
+ id: WerewolfWhite
+ name: werewolf-store-choose-white-name
+ description: werewolf-store-choose-white-desc
+ icon:
+ sprite: _Inky/Mobs/Werewolf/Mutations/white.rsi
+ state: icon
+ productEvent: !type:EventWerewolfChangeType
+ werewolfType: WerewolfTransformWhite
+ raiseProductEventOnUser: true
+ cost:
+ Fury: 15
+ categories:
+ - WerewolfChoose
+ conditions:
+ - !type:ListingLimitedStockCondition
+ stock: 1
+ - !type:BuyBeforeCondition
+ blacklist:
+ - WerewolfDirewolf
+ - WerewolfBlack
+
+- type: listing
+ id: WerewolfWhiteClaws
+ name: werewolf-store-white-dmg-name
+ description: werewolf-store-white-dmg-desc
+ icon:
+ sprite: _Inky/Actions/Werewolf/werewolf.rsi
+ state: claws
+ productEvent: !type:EventWerewolfChangeType
+ werewolfType: WerewolfTransformWhiteClaws # holy goida
+ raiseProductEventOnUser: true
+ cost:
+ Fury: 10
+ categories:
+ - WerewolfWhite
+ conditions:
+ - !type:ListingLimitedStockCondition
+ stock: 1
+ - !type:BuyBeforeCondition
+ whitelist:
+ - WerewolfWhite
+ blacklist:
+ - WerewolfDirewolf
+ - WerewolfBlack
+
+
+- type: listing
+ id: WerewolfWhiteBloodhound1 # todo werewolf
+ name: werewolf-store-white-track-name
+ description: werewolf-store-white-track-desc
+ icon:
+ sprite: _Inky/Actions/Werewolf/werewolf.rsi
+ state: bloodhound
+ productEvent: !type:EventWerewolfUpgradeAbility
+ oldActionId: ActionWerewolfTransfurm
+ newActionId: ActionWerewolfTransfurmWhite
+ raiseProductEventOnUser: true
+ cost:
+ Fury: 6
+ categories:
+ - WerewolfWhite
+ conditions:
+ - !type:ListingLimitedStockCondition
+ stock: 1
+ - !type:BuyBeforeCondition
+ whitelist:
+ - WerewolfWhite
+ blacklist:
+ - WerewolfDirewolf
+ - WerewolfBlack
+
+#- type: listing
+# id: WerewolfWhiteBloodhound
+# name: werewolf-store-white-track-name
+# description: werewolf-store-white-track-desc
+# icon:
+# sprite: _Inky/Actions/Werewolf/werewolf.rsi
+# state: bloodhound
+# productEvent: !type:EventWerewolfUpgradeAbility
+# newActionId: ActionWerewolfBloodhound
+# raiseProductEventOnUser: true
+# cost:
+# Fury: 6
+# categories:
+# - WerewolfWhite
+# conditions:
+# - !type:ListingLimitedStockCondition
+# stock: 1
+# - !type:BuyBeforeCondition
+# whitelist:
+# - WerewolfWhite
+# blacklist:
+# - WerewolfDirewolf
+
+- type: listing
+ id: WerewolfWhiteLunar
+ name: werewolf-store-white-lunar-name
+ description: werewolf-store-lunar-desc
+ icon:
+ sprite: _Inky/Actions/Werewolf/werewolf.rsi
+ state: lunar-white
+ productEvent: !type:WerewolfAddCollectivemind
+ popup: werewolf-white-lunar-popup
+ raiseProductEventOnUser: true
+ cost:
+ Fury: 15
+ categories:
+ - WerewolfWhite
+ conditions:
+ - !type:ListingLimitedStockCondition
+ stock: 1
+ - !type:BuyBeforeCondition
+ whitelist:
+ - WerewolfWhite
+ blacklist:
+ - WerewolfDirewolf
+ - WerewolfBlack
+
+- type: listing
+ id: WerewolfWhiteRevelation
+ name: werewolf-store-white-revelation-name
+ description: werewolf-store-revelation-desc # todo werewolf dont forget to say that it blocks you from buying new shit
+ icon:
+ sprite: _Inky/Actions/Werewolf/werewolf.rsi
+ state: revelation
+ productEvent: !type:WerewolfRevelationEvent
+ raiseProductEventOnUser: true
+ cost:
+ Fury: 20
+ categories:
+ - WerewolfWhite
+ conditions:
+ - !type:ListingLimitedStockCondition
+ stock: 1
+ - !type:BuyBeforeCondition
+ whitelist:
+ - WerewolfWhite
+ blacklist:
+ - WerewolfDirewolf
+ - WerewolfBlack
diff --git a/Resources/Prototypes/_Inky/Werewolf/actions.yml b/Resources/Prototypes/_Inky/Werewolf/actions.yml
new file mode 100644
index 00000000000..e7d212d1de9
--- /dev/null
+++ b/Resources/Prototypes/_Inky/Werewolf/actions.yml
@@ -0,0 +1,306 @@
+- type: entity
+ parent: BaseAction
+ id: ActionWerewolfHowl
+ name: Howl
+ description: Scream as loud as you can, stunning everyone in radius.
+ categories: [ HideSpawnMenu ]
+ components:
+ - type: Action
+ useDelay: 30
+ itemIconStyle: NoItem
+ icon:
+ sprite: _Inky/Actions/Werewolf/werewolf.rsi
+ state: howl
+ - type: InstantAction
+ event: !type:HowlEvent {}
+ - type: WerewolfAction
+ hungerCost: 30
+ requireTransfurmed: true
+
+- type: entity
+ parent: BaseAction
+ id: ActionWerewolfTransfurm
+ name: Transfurm
+ description: Transfurm into a werewolf. Be warned as you can transfurm back only after 2 minutes.
+ categories: [ HideSpawnMenu ]
+ components:
+ - type: Action
+ itemIconStyle: NoItem
+ icon:
+ sprite: _Inky/Actions/Werewolf/werewolf.rsi
+ state: transfurm
+ - type: InstantAction
+ event: !type:TransfurmEvent {}
+
+- type: entity
+ parent: BaseAction
+ id: ActionWerewolfOpenMutationStore
+ name: Open mutation store
+ description: Open the mutation menu.
+ categories: [ HideSpawnMenu ]
+ components:
+ - type: Action
+ itemIconStyle: NoItem
+ icon:
+ sprite: _Inky/Actions/Werewolf/werewolf.rsi
+ state: store
+ - type: InstantAction
+ event: !type:EventWerewolfOpenStore {}
+
+- type: entity
+ id: PulseThermalVisionWerewolf
+ parent: ToggleThermalVision
+ name: Heightened Senses
+ description: Gives you 10 seconds of thermal vision
+ categories: [ HideSpawnMenu ]
+ components:
+ - type: Action
+ useDelay: 30
+ icon:
+ sprite: _Inky/Actions/Werewolf/werewolf.rsi
+ state: senses
+
+- type: entity
+ parent: BaseAction
+ id: ActionWerewolfAbsorb
+ name: Bite
+ description: Bite and rip a limb from your fellow comrade for points.
+ categories: [ HideSpawnMenu ]
+ components:
+ - type: Action
+ useDelay: 5
+ itemIconStyle: NoItem
+ icon:
+ sprite: _Inky/Actions/Werewolf/werewolf.rsi
+ state: bite
+ - type: TargetAction
+ interactOnMiss: false
+ - type: EntityTargetAction
+ whitelist:
+ components:
+ - Body
+ canTargetSelf: false
+ event: !type:EventWerewolfDevour {}
+
+- type: entity
+ parent: BaseAction
+ id: ActionWerewolfGut
+ name: Gut
+ description: Spills one of the chest organs of a deceased crew member onto the floor. Organs that are produced from this ability grant you Fury.
+ categories: [ HideSpawnMenu ]
+ components:
+ - type: Action
+ itemIconStyle: NoItem
+ icon:
+ sprite: _Inky/Actions/Werewolf/werewolf.rsi
+ state: gut
+ - type: TargetAction
+ interactOnMiss: false
+ - type: EntityTargetAction
+ whitelist:
+ components:
+ - Body
+ canTargetSelf: false
+ event: !type:EventWerewolfGut {}
+ - type: WerewolfAction
+ hungerCost: 0
+ requireTransfurmed: true
+
+- type: entity
+ parent: BaseAction
+ id: ActionWerewolfRegen
+ name: increased metabolism
+ description: Increase your metabolism, providing healing at the cost of a lot of hunger.
+ categories: [ HideSpawnMenu ]
+ components:
+ - type: Action
+ useDelay: 10
+ itemIconStyle: NoItem
+ icon:
+ sprite: _Inky/Actions/Werewolf/werewolf.rsi
+ state: regen
+ - type: InstantAction
+ event: !type:EventWerewolfRegen
+ - type: WerewolfAction
+ hungerCost: 65
+# requireTransfurmed: true
+
+- type: entity
+ id: ActionWerewolfJump
+ parent: BaseAction
+ name: Jump
+ description: Stun your enemies with a quick jump. Costs 30 hunger.
+ components:
+ - type: Action
+ checkCanInteract: false
+ priority: 0
+ useDelay: 20
+ icon:
+ sprite: _Inky/Actions/Werewolf/werewolf.rsi
+ state: ambush
+ - type: TargetAction
+ checkCanAccess: false
+ range: 10
+ - type: WorldTargetAction
+ event: !type:WerewolfAmbushActionEvent
+ - type: WerewolfAction
+ hungerCost: 30
+ requireTransfurmed: true
+
+# direwolf specific
+
+- type: entity
+ parent: BaseAction
+ id: ActionWerewolfHowlDire
+ name: Roar
+ description: Scream as loud as you can, stunning everyone in radius.
+ categories: [ HideSpawnMenu ]
+ components:
+ - type: Action
+ useDelay: 30
+ itemIconStyle: NoItem
+ icon:
+ sprite: _Inky/Actions/Werewolf/werewolf.rsi
+ state: howl-red
+ - type: InstantAction
+ event: !type:HowlEvent
+ shriekPower: 4
+ stunDuration: 2
+ - type: WerewolfAction
+ hungerCost: 45 # since its more powerful
+ requireTransfurmed: true
+
+- type: entity
+ parent: BaseAction
+ id: ActionWerewolfBiteDire
+ name: Bleeding bite
+ description: Sink your canines into a victim, and steal 30% of their blood. This will heal you slightly.
+ categories: [ HideSpawnMenu ]
+ components:
+ - type: Action
+ useDelay: 30
+ itemIconStyle: NoItem
+ icon:
+ sprite: _Inky/Actions/Werewolf/werewolf.rsi
+ state: bleeding-bite
+ - type: TargetAction
+ interactOnMiss: false
+ - type: EntityTargetAction
+ whitelist:
+ components:
+ - Body
+ canTargetSelf: false
+ event: !type:EventWerewolfBleedingBite { }
+ - type: WerewolfAction
+ hungerCost: 20
+ requireTransfurmed: true
+
+# white specific
+
+
+- type: entity
+ parent: BaseAction
+ id: ActionWerewolfTransfurmWhite
+ name: Transfurm
+ description: Transfurm into a werewolf. Be warned as you can transfurm back only after 2 minutes.
+ categories: [ HideSpawnMenu ]
+ components:
+ - type: Action
+ itemIconStyle: NoItem
+ icon:
+ sprite: _Inky/Actions/Werewolf/werewolf.rsi
+ state: transfurm
+ - type: InstantAction
+ event: !type:TransfurmWhiteEvent {}
+
+# black specific
+
+- type: entity
+ parent: BaseAction
+ id: ActionWerewolfBiteBlack
+ name: Bleeding bite
+ description: Bite a victim, causing massive blood loss. Has a 50% chance to infect the victim into a Werewolf under your rule.
+ categories: [ HideSpawnMenu ]
+ components:
+ - type: Action
+ useDelay: 30
+ itemIconStyle: NoItem
+ icon:
+ sprite: _Inky/Actions/Werewolf/werewolf.rsi
+ state: black-bite
+ - type: TargetAction
+ interactOnMiss: false
+ - type: EntityTargetAction
+ whitelist:
+ components:
+ - Body
+ canTargetSelf: false
+ event: !type:EventWerewolfBlackBite { }
+ - type: WerewolfAction
+ hungerCost: -30
+ requireTransfurmed: true
+
+- type: entity
+ parent: BaseAction
+ id: ActionWerewolfHowlBlack
+ name: Alpha order
+ description: Howl and command every werewolf in radius to transform into their superior form, and heal those who already are transformed.
+ categories: [ HideSpawnMenu ]
+ components:
+ - type: Action
+ useDelay: 30
+ itemIconStyle: NoItem
+ icon:
+ sprite: _Inky/Actions/Werewolf/werewolf.rsi
+ state: howl-green
+ - type: InstantAction
+ event: !type:HowlEvent
+ shriekPower: 4
+ stunDuration: 1
+ forceTransfurm: true
+ healNearby: true
+ - type: WerewolfAction
+ hungerCost: 30
+ requireTransfurmed: true
+
+- type: entity
+ parent: BaseAction
+ id: ActionWerewolfBeckon
+ name: Beckon
+ description: Silently transmits your location to your allied Werewolves
+ categories: [ HideSpawnMenu ]
+ components:
+ - type: Action
+ useDelay: 30
+ itemIconStyle: NoItem
+ icon:
+ sprite: _Inky/Actions/Werewolf/werewolf.rsi
+ state: beckon
+ - type: InstantAction
+ event: !type:WerewolfBeckonEvent
+ - type: WerewolfAction
+ hungerCost: 0
+
+- type: entity
+ parent: BaseAction
+ id: ActionWerewolfBequeath
+ name: Bequeath
+ description: Crown an Unmutated Werewolf in your pack to become the next Black Wolf in case of your death.
+ categories: [ HideSpawnMenu ]
+ components:
+ - type: Action
+ itemIconStyle: NoItem
+ icon:
+ sprite: _Inky/Actions/Werewolf/werewolf.rsi
+ state: bequeath
+ - type: TargetAction
+ interactOnMiss: false
+ - type: EntityTargetAction
+ whitelist:
+ components:
+ - WerewolfAbilities
+ canTargetSelf: false
+ event: !type:EventWerewolfBequeath {}
+ - type: WerewolfAction
+ hungerCost: 0
+ requireTransfurmed: true
diff --git a/Resources/Prototypes/_Inky/Werewolf/lycqc.yml b/Resources/Prototypes/_Inky/Werewolf/lycqc.yml
new file mode 100644
index 00000000000..3b74bdc6d58
--- /dev/null
+++ b/Resources/Prototypes/_Inky/Werewolf/lycqc.yml
@@ -0,0 +1,61 @@
+- type: entity
+ parent: BaseMartialArtsKnowledge
+ id: MartialArtLyCqc
+ name: LyCqc
+ components:
+ - type: CanPerformCombo
+ roundstartCombos:
+ - OpenVein
+ - ViciousToss
+ - Dismemberment
+ - type: SneakAttack
+ secondsTillHidden: 2
+
+- type: combo
+ id: OpenVein
+ attacks:
+ - Grab
+ - Harm
+ - Harm
+ userEffects:
+ - !type:PlaySoundEffect
+ sound: /Audio/Weapons/genhit3.ogg
+ opponentEffects:
+ - !type:ModifyBleed
+ amount: 30
+ - !type:HealthChange
+ damage:
+ types:
+ Slash: 30
+ levelRequired: 10
+
+- type: combo
+ id: ViciousToss
+ attacks:
+ - Disarm
+ - Grab
+ - Disarm
+ userEffects:
+ - !type:PlaySoundEffect
+ sound: /Audio/Weapons/genhit3.ogg
+ opponentEffects:
+ - !type:ThrowDirection
+ speed: 20
+ - !type:ModifyKnockdown
+ time: 3
+ levelRequired: 10
+
+- type: combo
+ id: Dismemberment
+ attacks:
+ - Disarm
+ - Harm
+ - Disarm
+ - Harm
+ userEffects:
+ - !type:PlaySoundEffect
+ sound: /Audio/Weapons/genhit2.ogg
+ opponentEffects:
+ - !type:AmputateLimb
+ limbName: ArmLeft # GOIDA!!
+ levelRequired: 10
diff --git a/Resources/Prototypes/_Inky/Werewolf/polymorphs.yml b/Resources/Prototypes/_Inky/Werewolf/polymorphs.yml
new file mode 100644
index 00000000000..08704c9fd63
--- /dev/null
+++ b/Resources/Prototypes/_Inky/Werewolf/polymorphs.yml
@@ -0,0 +1,113 @@
+- type: polymorph
+ id: WerewolfTransformBasic
+ configuration:
+ entity: WerewolfWerewolf
+ forced: true
+ inventory: None
+ transferName: false
+ transferDamage: true
+ revertOnCrit: true
+ revertOnDeath: false
+ duration: 480
+ polymorphSound: /Audio/_Goobstation/Changeling/Effects/armour_transform.ogg # goida
+ componentsToTransfer:
+ - component: WerewolfAbilities
+ - component: Store
+ - component: CollectiveMind
+ - component: WerewolfBit
+ - component: WerewolfInfectionImmune
+
+- type: polymorph
+ id: WerewolfTransformWerehuman
+ configuration:
+ entity: WerewolfWerehuman
+ forced: true
+ inventory: None
+ revertOnCrit: true
+ revertOnDeath: false
+ transferName: false
+ transferDamage: true
+ duration: 480
+ polymorphSound: /Audio/_Goobstation/Changeling/Effects/armour_transform.ogg # goida
+ componentsToTransfer:
+ - component: WerewolfAbilities
+ - component: Store
+ - component: CollectiveMind
+ - component: WerewolfBit
+ - component: WerewolfInfectionImmune
+
+- type: polymorph
+ id: WerewolfTransformDirewolf
+ configuration:
+ entity: WerewolfDirewolf
+ forced: true
+ revertOnCrit: true
+ revertOnDeath: false
+ inventory: None
+ transferName: false
+ transferDamage: true
+ duration: 480
+ polymorphSound: /Audio/_Goobstation/Changeling/Effects/armour_transform.ogg
+ componentsToTransfer:
+ - component: WerewolfAbilities
+ - component: Store
+ - component: CollectiveMind
+ - component: WerewolfBit
+ - component: WerewolfInfectionImmune
+
+- type: polymorph
+ id: WerewolfTransformWhite
+ configuration:
+ entity: WerewolfWhite
+ forced: true
+ revertOnCrit: true
+ revertOnDeath: false
+ inventory: None
+ transferName: false
+ transferDamage: true
+ duration: 480
+ polymorphSound: /Audio/_Goobstation/Changeling/Effects/armour_transform.ogg
+ componentsToTransfer:
+ - component: WerewolfAbilities
+ - component: Store
+ - component: CollectiveMind
+ - component: WerewolfBit
+ - component: WerewolfInfectionImmune
+
+- type: polymorph
+ id: WerewolfTransformWhiteClaws # goida
+ configuration:
+ entity: WerewolfWhiteClaws
+ forced: true
+ revertOnCrit: true
+ revertOnDeath: false
+ inventory: None
+ transferName: false
+ transferDamage: true
+ duration: 480
+ polymorphSound: /Audio/_Goobstation/Changeling/Effects/armour_transform.ogg
+ componentsToTransfer:
+ - component: WerewolfAbilities
+ - component: Store
+ - component: CollectiveMind
+ - component: WerewolfBit
+ - component: WerewolfInfectionImmune
+
+- type: polymorph
+ id: WerewolfTransformBlack
+ configuration:
+ entity: WerewolfBlackwolf
+ forced: true
+ revertOnCrit: true
+ revertOnDeath: false
+ inventory: None
+ transferName: false
+ transferDamage: true
+ duration: 480
+ polymorphSound: /Audio/_Goobstation/Changeling/Effects/armour_transform.ogg
+ componentsToTransfer:
+ - component: WerewolfAbilities
+ - component: Store
+ - component: CollectiveMind
+ - component: WerewolfBit
+ - component: WerewolfInfectionImmune
diff --git a/Resources/Prototypes/_Inky/Werewolf/werewolf.yml b/Resources/Prototypes/_Inky/Werewolf/werewolf.yml
new file mode 100644
index 00000000000..9ab9f3878fa
--- /dev/null
+++ b/Resources/Prototypes/_Inky/Werewolf/werewolf.yml
@@ -0,0 +1,30 @@
+- type: antag
+ id: Werewolf
+ name: roles-antag-werewolf-name
+ antagonist: true
+ setPreference: true
+ objective: roles-antag-werewolf-desc
+ requirements:
+ - !type:SpeciesRequirement
+ inverted: true
+ species:
+ - IPC
+ - Plasmaman
+ guides: [ ]
+ creditImage: /Textures/_Trauma/EndCredits/Antags/zombies.png # todo werewolf
+
+- type: antagSpecifier
+ id: Werewolf
+ blacklist:
+ components:
+ - AntagImmune
+ - Changeling
+ prefRoles:
+ - Werewolf
+ briefing:
+ text: werewolf-role-greeting
+ color: Brown
+ sound: "/Audio/_Inky/Antag/Werewolf/werewolf_start.ogg"
+# components:
+ mindRoles:
+ - MindRoleWerewolf
diff --git a/Resources/Prototypes/_Lavaland/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/_Lavaland/Entities/Clothing/Uniforms/jumpsuits.yml
deleted file mode 100644
index 3920aba8186..00000000000
--- a/Resources/Prototypes/_Lavaland/Entities/Clothing/Uniforms/jumpsuits.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-- type: entity
- parent: ClothingUniformBase
- id: ClothingUniformJumpsuitShaftMiner
- name: shaft miner's jumpsuit
- description: It's a snappy jumpsuit with a sturdy set of overalls. Looks a bit burnt.
- components:
- - type: Sprite
- sprite: _Lavaland/Clothing/Uniforms/Jumpsuit/shaft_miner.rsi
- - type: Clothing
- sprite: _Lavaland/Clothing/Uniforms/Jumpsuit/shaft_miner.rsi
diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Back/messenger.yml b/Resources/Prototypes/_NF/Entities/Clothing/Back/messenger.yml
index 3d025ecbd91..4fc74a7a010 100644
--- a/Resources/Prototypes/_NF/Entities/Clothing/Back/messenger.yml
+++ b/Resources/Prototypes/_NF/Entities/Clothing/Back/messenger.yml
@@ -160,9 +160,9 @@
- type: Sprite
layers:
- state: icon-base
- color: "#c99840"
+ color: "#b7793d" # Goob
- state: icon-base-top
- color: "#aaaaaa"
+ color: "#494b4e" # Goob
- state: icon-sling
color: "#776756"
- state: icon-clasp
diff --git a/Resources/Prototypes/_Trauma/Body/Species/vox.yml b/Resources/Prototypes/_Trauma/Body/Species/vox.yml
index f092038496c..018ae6a81ff 100644
--- a/Resources/Prototypes/_Trauma/Body/Species/vox.yml
+++ b/Resources/Prototypes/_Trauma/Body/Species/vox.yml
@@ -8,3 +8,7 @@
data:
sprite: _Trauma/empty.rsi
state: empty # no sprite since the markings actually control it
+ - type: OrganComponents
+ onAdd:
+ - type: Wagging
+ organ: Tail
diff --git a/Resources/Prototypes/_Trauma/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/_Trauma/Entities/Clothing/Head/hats.yml
index 842b74c1c8c..ba9c7a10269 100644
--- a/Resources/Prototypes/_Trauma/Entities/Clothing/Head/hats.yml
+++ b/Resources/Prototypes/_Trauma/Entities/Clothing/Head/hats.yml
@@ -1,5 +1,5 @@
- type: entity
- parent: [ClothingHeadHatBeret, BaseSecurityContraband, BaseClothingViewconeSmallIncrease]
+ parent: [ClothingHeadHatBeret, BaseSecurityContraband] # inky edit removed BaseClothingViewconeSmallIncrease
id: ClothingHeadHatBeretSergeant
name: sergeant beret
description: The beret of a security member who has seen more than anyone. Make sure you salute them, they're probably the reason why you're alive today.
diff --git a/Resources/Prototypes/_Trauma/Entities/Clothing/Head/welding.yml b/Resources/Prototypes/_Trauma/Entities/Clothing/Head/welding.yml
index b6f65d9a011..7e1fa4f07f9 100644
--- a/Resources/Prototypes/_Trauma/Entities/Clothing/Head/welding.yml
+++ b/Resources/Prototypes/_Trauma/Entities/Clothing/Head/welding.yml
@@ -1,4 +1,4 @@
- type: entity
abstract: true
- parent: [ BaseClothingViewconeLarge, WeldingMaskBaseNoBlind ]
+ parent: [WeldingMaskBaseNoBlind ] # inky edit removed BaseClothingViewconeLarge
id: WeldingMaskBase
diff --git a/Resources/Prototypes/_Trauma/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/_Trauma/Entities/Clothing/Uniforms/jumpsuits.yml
index 9fe001a5ac4..a0e2d37bd8f 100644
--- a/Resources/Prototypes/_Trauma/Entities/Clothing/Uniforms/jumpsuits.yml
+++ b/Resources/Prototypes/_Trauma/Entities/Clothing/Uniforms/jumpsuits.yml
@@ -56,7 +56,7 @@
Heat: 0.85
- type: entity
- parent: [ ClothingUniformBase, ClothingUniformFoldableBase ]
+ parent: [ ClothingUniformBase ]
id: ClothingUniformJumpsuitOliveDrabs
name: olive drabs
description: Standard-issue military uniform in a plain olive pattern. Lacks a good camo index.
@@ -69,7 +69,7 @@
foldedEquippedPrefix: naked
- type: entity
- parent: [ ClothingUniformBase, ClothingUniformFoldableBase ]
+ parent: [ ClothingUniformBase ]
id: ClothingUniformJumpsuitTigerStripes
name: tiger stripes
description: A military uniform used in special covert operations. Boons a good camo index.
diff --git a/Resources/Prototypes/_Trauma/Loadouts/Jobs/Security/security_officer.yml b/Resources/Prototypes/_Trauma/Loadouts/Jobs/Security/security_officer.yml
index c00c2b9626e..6734476340f 100644
--- a/Resources/Prototypes/_Trauma/Loadouts/Jobs/Security/security_officer.yml
+++ b/Resources/Prototypes/_Trauma/Loadouts/Jobs/Security/security_officer.yml
@@ -1,12 +1,3 @@
-- type: loadoutEffectGroup
- id: VeteranOfficer
- effects:
- - !type:JobRequirementLoadoutEffect
- requirement:
- !type:DepartmentTimeRequirement
- department: Security
- time: 360000 # 100 hrs
-
- type: loadout
id: SergeantUniform
effects:
diff --git a/Resources/Textures/Clothing/Back/Backpacks/captain.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Backpacks/captain.rsi/equipped-BACKPACK.png
index cc1afccae54..6b889f44f56 100644
Binary files a/Resources/Textures/Clothing/Back/Backpacks/captain.rsi/equipped-BACKPACK.png and b/Resources/Textures/Clothing/Back/Backpacks/captain.rsi/equipped-BACKPACK.png differ
diff --git a/Resources/Textures/Clothing/Back/Backpacks/captain.rsi/icon.png b/Resources/Textures/Clothing/Back/Backpacks/captain.rsi/icon.png
index 6050ab8de79..afef91d81f5 100644
Binary files a/Resources/Textures/Clothing/Back/Backpacks/captain.rsi/icon.png and b/Resources/Textures/Clothing/Back/Backpacks/captain.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Back/Backpacks/captain.rsi/inhand-left.png b/Resources/Textures/Clothing/Back/Backpacks/captain.rsi/inhand-left.png
index 432b2bb5a5b..afcf7469f98 100644
Binary files a/Resources/Textures/Clothing/Back/Backpacks/captain.rsi/inhand-left.png and b/Resources/Textures/Clothing/Back/Backpacks/captain.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Back/Backpacks/captain.rsi/inhand-right.png b/Resources/Textures/Clothing/Back/Backpacks/captain.rsi/inhand-right.png
index ceb964c9588..a5cc2708b6b 100644
Binary files a/Resources/Textures/Clothing/Back/Backpacks/captain.rsi/inhand-right.png and b/Resources/Textures/Clothing/Back/Backpacks/captain.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Back/Duffels/captain.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Duffels/captain.rsi/equipped-BACKPACK.png
index bbdf579a940..5f30a6f4d3d 100644
Binary files a/Resources/Textures/Clothing/Back/Duffels/captain.rsi/equipped-BACKPACK.png and b/Resources/Textures/Clothing/Back/Duffels/captain.rsi/equipped-BACKPACK.png differ
diff --git a/Resources/Textures/Clothing/Back/Duffels/captain.rsi/icon.png b/Resources/Textures/Clothing/Back/Duffels/captain.rsi/icon.png
index a3a5b515aa6..d7d78530e54 100644
Binary files a/Resources/Textures/Clothing/Back/Duffels/captain.rsi/icon.png and b/Resources/Textures/Clothing/Back/Duffels/captain.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Back/Duffels/captain.rsi/inhand-left.png b/Resources/Textures/Clothing/Back/Duffels/captain.rsi/inhand-left.png
index b723b23bce9..dc9bec8396b 100644
Binary files a/Resources/Textures/Clothing/Back/Duffels/captain.rsi/inhand-left.png and b/Resources/Textures/Clothing/Back/Duffels/captain.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Back/Duffels/captain.rsi/inhand-right.png b/Resources/Textures/Clothing/Back/Duffels/captain.rsi/inhand-right.png
index 912d2a7bb38..7cc4731420d 100644
Binary files a/Resources/Textures/Clothing/Back/Duffels/captain.rsi/inhand-right.png and b/Resources/Textures/Clothing/Back/Duffels/captain.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Back/Satchels/captain.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Satchels/captain.rsi/equipped-BACKPACK.png
index ae70111e1e7..8c0108b3f64 100644
Binary files a/Resources/Textures/Clothing/Back/Satchels/captain.rsi/equipped-BACKPACK.png and b/Resources/Textures/Clothing/Back/Satchels/captain.rsi/equipped-BACKPACK.png differ
diff --git a/Resources/Textures/Clothing/Back/Satchels/captain.rsi/icon.png b/Resources/Textures/Clothing/Back/Satchels/captain.rsi/icon.png
index 3b0bd0547c8..4c26e72631d 100644
Binary files a/Resources/Textures/Clothing/Back/Satchels/captain.rsi/icon.png and b/Resources/Textures/Clothing/Back/Satchels/captain.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Back/Satchels/captain.rsi/inhand-left.png b/Resources/Textures/Clothing/Back/Satchels/captain.rsi/inhand-left.png
index 32cc456a077..cc9ea2bce27 100644
Binary files a/Resources/Textures/Clothing/Back/Satchels/captain.rsi/inhand-left.png and b/Resources/Textures/Clothing/Back/Satchels/captain.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Back/Satchels/captain.rsi/inhand-right.png b/Resources/Textures/Clothing/Back/Satchels/captain.rsi/inhand-right.png
index 0df9cc21c1c..8bb0697ade1 100644
Binary files a/Resources/Textures/Clothing/Back/Satchels/captain.rsi/inhand-right.png and b/Resources/Textures/Clothing/Back/Satchels/captain.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Ears/Headsets/cargo.rsi/alt-equipped-EARS-vox.png b/Resources/Textures/Clothing/Ears/Headsets/cargo.rsi/alt-equipped-EARS-vox.png
new file mode 100644
index 00000000000..d101c3dd8e5
Binary files /dev/null and b/Resources/Textures/Clothing/Ears/Headsets/cargo.rsi/alt-equipped-EARS-vox.png differ
diff --git a/Resources/Textures/Clothing/Ears/Headsets/cargo.rsi/meta.json b/Resources/Textures/Clothing/Ears/Headsets/cargo.rsi/meta.json
index 84f02032366..6b8d6f93078 100644
--- a/Resources/Textures/Clothing/Ears/Headsets/cargo.rsi/meta.json
+++ b/Resources/Textures/Clothing/Ears/Headsets/cargo.rsi/meta.json
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
- "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428 // Icon edited by FoxxoTrystan and Taken from Paradise at https://github.com/Henri215/Paradise/blob/27087670280de99e2fceb47194aad29a7b99b280/icons/obj/radio.dmi",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428, vox sprite by AreYouconfused (github) // Icon edited by FoxxoTrystan and Taken from Paradise at https://github.com/Henri215/Paradise/blob/27087670280de99e2fceb47194aad29a7b99b280/icons/obj/radio.dmi",
"size": {
"x": 32,
"y": 32
@@ -20,6 +20,10 @@
{
"name": "alt-equipped-EARS",
"directions": 4
+ },
+ {
+ "name": "alt-equipped-EARS-vox",
+ "directions": 4
}
]
}
diff --git a/Resources/Textures/Clothing/Ears/Headsets/centcom.rsi/alt-equipped-EARS-vox.png b/Resources/Textures/Clothing/Ears/Headsets/centcom.rsi/alt-equipped-EARS-vox.png
new file mode 100644
index 00000000000..c9837ac57a4
Binary files /dev/null and b/Resources/Textures/Clothing/Ears/Headsets/centcom.rsi/alt-equipped-EARS-vox.png differ
diff --git a/Resources/Textures/Clothing/Ears/Headsets/centcom.rsi/meta.json b/Resources/Textures/Clothing/Ears/Headsets/centcom.rsi/meta.json
index 84f02032366..6b8d6f93078 100644
--- a/Resources/Textures/Clothing/Ears/Headsets/centcom.rsi/meta.json
+++ b/Resources/Textures/Clothing/Ears/Headsets/centcom.rsi/meta.json
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
- "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428 // Icon edited by FoxxoTrystan and Taken from Paradise at https://github.com/Henri215/Paradise/blob/27087670280de99e2fceb47194aad29a7b99b280/icons/obj/radio.dmi",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428, vox sprite by AreYouconfused (github) // Icon edited by FoxxoTrystan and Taken from Paradise at https://github.com/Henri215/Paradise/blob/27087670280de99e2fceb47194aad29a7b99b280/icons/obj/radio.dmi",
"size": {
"x": 32,
"y": 32
@@ -20,6 +20,10 @@
{
"name": "alt-equipped-EARS",
"directions": 4
+ },
+ {
+ "name": "alt-equipped-EARS-vox",
+ "directions": 4
}
]
}
diff --git a/Resources/Textures/Clothing/Ears/Headsets/command.rsi/alt-equipped-EARS-vox.png b/Resources/Textures/Clothing/Ears/Headsets/command.rsi/alt-equipped-EARS-vox.png
new file mode 100644
index 00000000000..8c4dcf115b9
Binary files /dev/null and b/Resources/Textures/Clothing/Ears/Headsets/command.rsi/alt-equipped-EARS-vox.png differ
diff --git a/Resources/Textures/Clothing/Ears/Headsets/command.rsi/meta.json b/Resources/Textures/Clothing/Ears/Headsets/command.rsi/meta.json
index 4a16d0c71f6..5eabc8ab638 100644
--- a/Resources/Textures/Clothing/Ears/Headsets/command.rsi/meta.json
+++ b/Resources/Textures/Clothing/Ears/Headsets/command.rsi/meta.json
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
- "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428 // Icon Taken from Paradise at https://github.com/Henri215/Paradise/blob/27087670280de99e2fceb47194aad29a7b99b280/icons/obj/radio.dmi",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428, vox sprite by AreYouconfused (github) // Icon Taken from Paradise at https://github.com/Henri215/Paradise/blob/27087670280de99e2fceb47194aad29a7b99b280/icons/obj/radio.dmi",
"size": {
"x": 32,
"y": 32
@@ -20,6 +20,10 @@
{
"name": "alt-equipped-EARS",
"directions": 4
+ },
+ {
+ "name": "alt-equipped-EARS-vox",
+ "directions": 4
}
]
}
diff --git a/Resources/Textures/Clothing/Ears/Headsets/engineering.rsi/alt-equipped-EARS-vox.png b/Resources/Textures/Clothing/Ears/Headsets/engineering.rsi/alt-equipped-EARS-vox.png
new file mode 100644
index 00000000000..8202b5f87f4
Binary files /dev/null and b/Resources/Textures/Clothing/Ears/Headsets/engineering.rsi/alt-equipped-EARS-vox.png differ
diff --git a/Resources/Textures/Clothing/Ears/Headsets/engineering.rsi/meta.json b/Resources/Textures/Clothing/Ears/Headsets/engineering.rsi/meta.json
index 84f02032366..6b8d6f93078 100644
--- a/Resources/Textures/Clothing/Ears/Headsets/engineering.rsi/meta.json
+++ b/Resources/Textures/Clothing/Ears/Headsets/engineering.rsi/meta.json
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
- "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428 // Icon edited by FoxxoTrystan and Taken from Paradise at https://github.com/Henri215/Paradise/blob/27087670280de99e2fceb47194aad29a7b99b280/icons/obj/radio.dmi",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428, vox sprite by AreYouconfused (github) // Icon edited by FoxxoTrystan and Taken from Paradise at https://github.com/Henri215/Paradise/blob/27087670280de99e2fceb47194aad29a7b99b280/icons/obj/radio.dmi",
"size": {
"x": 32,
"y": 32
@@ -20,6 +20,10 @@
{
"name": "alt-equipped-EARS",
"directions": 4
+ },
+ {
+ "name": "alt-equipped-EARS-vox",
+ "directions": 4
}
]
}
diff --git a/Resources/Textures/Clothing/Ears/Headsets/freelance.rsi/alt-equipped-EARS-vox.png b/Resources/Textures/Clothing/Ears/Headsets/freelance.rsi/alt-equipped-EARS-vox.png
new file mode 100644
index 00000000000..62f10094ac5
Binary files /dev/null and b/Resources/Textures/Clothing/Ears/Headsets/freelance.rsi/alt-equipped-EARS-vox.png differ
diff --git a/Resources/Textures/Clothing/Ears/Headsets/freelance.rsi/meta.json b/Resources/Textures/Clothing/Ears/Headsets/freelance.rsi/meta.json
index 8e58bce368e..9dad8cb6569 100644
--- a/Resources/Textures/Clothing/Ears/Headsets/freelance.rsi/meta.json
+++ b/Resources/Textures/Clothing/Ears/Headsets/freelance.rsi/meta.json
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
- "copyright": "Sprite modified by PursuitInAshes (Github) for SS14, original sprite taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428 // Icon edited by FoxxoTrystan and Taken from Paradise at https://github.com/Henri215/Paradise/blob/27087670280de99e2fceb47194aad29a7b99b280/icons/obj/radio.dmi",
+ "copyright": "Sprite modified by PursuitInAshes (Github) for SS14, original sprite taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428, vox sprite by AreYouconfused (github) // Icon edited by FoxxoTrystan and Taken from Paradise at https://github.com/Henri215/Paradise/blob/27087670280de99e2fceb47194aad29a7b99b280/icons/obj/radio.dmi",
"size": {
"x": 32,
"y": 32
@@ -20,6 +20,10 @@
{
"name": "alt-equipped-EARS",
"directions": 4
+ },
+ {
+ "name": "alt-equipped-EARS-vox",
+ "directions": 4
}
]
}
diff --git a/Resources/Textures/Clothing/Ears/Headsets/medical.rsi/alt-equipped-EARS-vox.png b/Resources/Textures/Clothing/Ears/Headsets/medical.rsi/alt-equipped-EARS-vox.png
new file mode 100644
index 00000000000..6e0e8f00076
Binary files /dev/null and b/Resources/Textures/Clothing/Ears/Headsets/medical.rsi/alt-equipped-EARS-vox.png differ
diff --git a/Resources/Textures/Clothing/Ears/Headsets/medical.rsi/meta.json b/Resources/Textures/Clothing/Ears/Headsets/medical.rsi/meta.json
index 4a16d0c71f6..5eabc8ab638 100644
--- a/Resources/Textures/Clothing/Ears/Headsets/medical.rsi/meta.json
+++ b/Resources/Textures/Clothing/Ears/Headsets/medical.rsi/meta.json
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
- "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428 // Icon Taken from Paradise at https://github.com/Henri215/Paradise/blob/27087670280de99e2fceb47194aad29a7b99b280/icons/obj/radio.dmi",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428, vox sprite by AreYouconfused (github) // Icon Taken from Paradise at https://github.com/Henri215/Paradise/blob/27087670280de99e2fceb47194aad29a7b99b280/icons/obj/radio.dmi",
"size": {
"x": 32,
"y": 32
@@ -20,6 +20,10 @@
{
"name": "alt-equipped-EARS",
"directions": 4
+ },
+ {
+ "name": "alt-equipped-EARS-vox",
+ "directions": 4
}
]
}
diff --git a/Resources/Textures/Clothing/Ears/Headsets/science.rsi/alt-equipped-EARS-vox.png b/Resources/Textures/Clothing/Ears/Headsets/science.rsi/alt-equipped-EARS-vox.png
new file mode 100644
index 00000000000..ea560c916a6
Binary files /dev/null and b/Resources/Textures/Clothing/Ears/Headsets/science.rsi/alt-equipped-EARS-vox.png differ
diff --git a/Resources/Textures/Clothing/Ears/Headsets/science.rsi/meta.json b/Resources/Textures/Clothing/Ears/Headsets/science.rsi/meta.json
index 50f9fe3394b..cb59a9a9e0e 100644
--- a/Resources/Textures/Clothing/Ears/Headsets/science.rsi/meta.json
+++ b/Resources/Textures/Clothing/Ears/Headsets/science.rsi/meta.json
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
- "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428 // Icon Edited by FoxxoTrystan and Taken from Paradise at https://github.com/Henri215/Paradise/blob/27087670280de99e2fceb47194aad29a7b99b280/icons/obj/radio.dmi",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428, vox sprite by AreYouconfused (github) // Icon Edited by FoxxoTrystan and Taken from Paradise at https://github.com/Henri215/Paradise/blob/27087670280de99e2fceb47194aad29a7b99b280/icons/obj/radio.dmi",
"size": {
"x": 32,
"y": 32
@@ -20,6 +20,10 @@
{
"name": "alt-equipped-EARS",
"directions": 4
+ },
+ {
+ "name": "alt-equipped-EARS-vox",
+ "directions": 4
}
]
}
diff --git a/Resources/Textures/Clothing/Ears/Headsets/security.rsi/alt-equipped-EARS-vox.png b/Resources/Textures/Clothing/Ears/Headsets/security.rsi/alt-equipped-EARS-vox.png
new file mode 100644
index 00000000000..7b0fe74daf4
Binary files /dev/null and b/Resources/Textures/Clothing/Ears/Headsets/security.rsi/alt-equipped-EARS-vox.png differ
diff --git a/Resources/Textures/Clothing/Ears/Headsets/security.rsi/meta.json b/Resources/Textures/Clothing/Ears/Headsets/security.rsi/meta.json
index 4a16d0c71f6..5eabc8ab638 100644
--- a/Resources/Textures/Clothing/Ears/Headsets/security.rsi/meta.json
+++ b/Resources/Textures/Clothing/Ears/Headsets/security.rsi/meta.json
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
- "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428 // Icon Taken from Paradise at https://github.com/Henri215/Paradise/blob/27087670280de99e2fceb47194aad29a7b99b280/icons/obj/radio.dmi",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428, vox sprite by AreYouconfused (github) // Icon Taken from Paradise at https://github.com/Henri215/Paradise/blob/27087670280de99e2fceb47194aad29a7b99b280/icons/obj/radio.dmi",
"size": {
"x": 32,
"y": 32
@@ -20,6 +20,10 @@
{
"name": "alt-equipped-EARS",
"directions": 4
+ },
+ {
+ "name": "alt-equipped-EARS-vox",
+ "directions": 4
}
]
}
diff --git a/Resources/Textures/Clothing/Ears/Headsets/syndicate.rsi/alt-equipped-EARS-vox.png b/Resources/Textures/Clothing/Ears/Headsets/syndicate.rsi/alt-equipped-EARS-vox.png
new file mode 100644
index 00000000000..110f85f1c4d
Binary files /dev/null and b/Resources/Textures/Clothing/Ears/Headsets/syndicate.rsi/alt-equipped-EARS-vox.png differ
diff --git a/Resources/Textures/Clothing/Ears/Headsets/syndicate.rsi/meta.json b/Resources/Textures/Clothing/Ears/Headsets/syndicate.rsi/meta.json
index 9a2c8fdc0e9..afa7cb67c90 100644
--- a/Resources/Textures/Clothing/Ears/Headsets/syndicate.rsi/meta.json
+++ b/Resources/Textures/Clothing/Ears/Headsets/syndicate.rsi/meta.json
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
- "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428 // Icon Taken from Paradise at https://github.com/Henri215/Paradise/blob/27087670280de99e2fceb47194aad29a7b99b280/icons/obj/radio.dmi",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428, vox sprite by AreYouconfused (github) // Icon Taken from Paradise at https://github.com/Henri215/Paradise/blob/27087670280de99e2fceb47194aad29a7b99b280/icons/obj/radio.dmi",
"size": {
"x": 32,
"y": 32
@@ -13,6 +13,10 @@
{
"name": "alt-equipped-EARS",
"directions": 4
+ },
+ {
+ "name": "alt-equipped-EARS-vox",
+ "directions": 4
}
]
}
diff --git a/Resources/Textures/Clothing/Ears/Headsets/wizard.rsi/alt-equipped-EARS-vox.png b/Resources/Textures/Clothing/Ears/Headsets/wizard.rsi/alt-equipped-EARS-vox.png
new file mode 100644
index 00000000000..b224dc1068f
Binary files /dev/null and b/Resources/Textures/Clothing/Ears/Headsets/wizard.rsi/alt-equipped-EARS-vox.png differ
diff --git a/Resources/Textures/Clothing/Ears/Headsets/wizard.rsi/meta.json b/Resources/Textures/Clothing/Ears/Headsets/wizard.rsi/meta.json
index 44781277854..e0bbd41283a 100644
--- a/Resources/Textures/Clothing/Ears/Headsets/wizard.rsi/meta.json
+++ b/Resources/Textures/Clothing/Ears/Headsets/wizard.rsi/meta.json
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
- "copyright": "Sprite recoloured from Freelance Headsets by Entvari (Github). Sprite modified by PursuitInAshes (Github) for SS14, original sprite taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428",
+ "copyright": "Sprite recoloured from Freelance Headsets by Entvari (Github). Sprite modified by PursuitInAshes (Github) for SS14, original sprite taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428, vox sprite by AreYouconfused (github)",
"size": {
"x": 32,
"y": 32
@@ -20,6 +20,10 @@
{
"name": "alt-equipped-EARS",
"directions": 4
+ },
+ {
+ "name": "alt-equipped-EARS-vox",
+ "directions": 4
}
]
}
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/icon-flash.png b/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/icon-flash.png
index 05f8fa3cb32..bdb5c533dec 100644
Binary files a/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/icon-flash.png and b/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/icon-flash.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/icon.png
index cee0d6f0293..c472388d410 100644
Binary files a/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/off-equipped-HELMET-dog.png b/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/off-equipped-HELMET-dog.png
index dde1bc35955..3b3f42dd30e 100644
Binary files a/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/off-equipped-HELMET-dog.png and b/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/off-equipped-HELMET-dog.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/off-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/off-equipped-HELMET-vox.png
index f02e33c6584..a0951d59145 100644
Binary files a/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/off-equipped-HELMET-vox.png and b/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/off-equipped-HELMET-vox.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/off-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/off-equipped-HELMET.png
index 7079528ae69..c457979f2ef 100644
Binary files a/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/off-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/off-equipped-HELMET.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/on-equipped-HELMET-dog.png b/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/on-equipped-HELMET-dog.png
index e67744a67b6..3d878ae8883 100644
Binary files a/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/on-equipped-HELMET-dog.png and b/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/on-equipped-HELMET-dog.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/on-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/on-equipped-HELMET-vox.png
index 9a0101f09a2..813fe9257c4 100644
Binary files a/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/on-equipped-HELMET-vox.png and b/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/on-equipped-HELMET-vox.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/on-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/on-equipped-HELMET.png
index 6f4caecb989..4845d6ed22a 100644
Binary files a/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/on-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/on-equipped-HELMET.png differ
diff --git a/Resources/Textures/Clothing/Head/Helmets/bone_helmet.rsi/equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Helmets/bone_helmet.rsi/equipped-HELMET-vox.png
new file mode 100644
index 00000000000..1e3a38f149c
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/bone_helmet.rsi/equipped-HELMET-vox.png differ
diff --git a/Resources/Textures/Clothing/Head/Helmets/bone_helmet.rsi/meta.json b/Resources/Textures/Clothing/Head/Helmets/bone_helmet.rsi/meta.json
index a470e009443..e25bfb78fe3 100644
--- a/Resources/Textures/Clothing/Head/Helmets/bone_helmet.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Helmets/bone_helmet.rsi/meta.json
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
- "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, Vox refit by 10KE",
"size": {
"x": 32,
"y": 32
@@ -14,6 +14,10 @@
"name": "equipped-HELMET",
"directions": 4
},
+ {
+ "name": "equipped-HELMET-vox",
+ "directions": 4
+ },
{
"name": "inhand-left",
"directions": 4
diff --git a/Resources/Textures/Clothing/Neck/mantles/capmantle.rsi/equipped-NECK-vox.png b/Resources/Textures/Clothing/Neck/mantles/capmantle.rsi/equipped-NECK-vox.png
index 5afccfddb49..40e7b57aeaf 100644
Binary files a/Resources/Textures/Clothing/Neck/mantles/capmantle.rsi/equipped-NECK-vox.png and b/Resources/Textures/Clothing/Neck/mantles/capmantle.rsi/equipped-NECK-vox.png differ
diff --git a/Resources/Textures/Clothing/Neck/mantles/capmantle.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Neck/mantles/capmantle.rsi/equipped-NECK.png
index ee9a05fcdbc..917e411c556 100644
Binary files a/Resources/Textures/Clothing/Neck/mantles/capmantle.rsi/equipped-NECK.png and b/Resources/Textures/Clothing/Neck/mantles/capmantle.rsi/equipped-NECK.png differ
diff --git a/Resources/Textures/Clothing/Neck/mantles/capmantle.rsi/icon.png b/Resources/Textures/Clothing/Neck/mantles/capmantle.rsi/icon.png
index 5264b993e46..ac3e49fe83c 100644
Binary files a/Resources/Textures/Clothing/Neck/mantles/capmantle.rsi/icon.png and b/Resources/Textures/Clothing/Neck/mantles/capmantle.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/bone_armor.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Armor/bone_armor.rsi/equipped-OUTERCLOTHING-vox.png
new file mode 100644
index 00000000000..2d70fa1afee
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Armor/bone_armor.rsi/equipped-OUTERCLOTHING-vox.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/bone_armor.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Armor/bone_armor.rsi/meta.json
index e482264df5f..df91a63ac31 100644
--- a/Resources/Textures/Clothing/OuterClothing/Armor/bone_armor.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Armor/bone_armor.rsi/meta.json
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
- "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, Vox refit by 10KE",
"size": {
"x": 32,
"y": 32
@@ -14,6 +14,10 @@
"name": "equipped-OUTERCLOTHING",
"directions": 4
},
+ {
+ "name": "equipped-OUTERCLOTHING-vox",
+ "directions": 4
+ },
{
"name": "inhand-left",
"directions": 4
diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/equipped-OUTERCLOTHING-dog.png b/Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/equipped-OUTERCLOTHING-dog.png
index 31832de13b9..52874ad4046 100644
Binary files a/Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/equipped-OUTERCLOTHING-dog.png and b/Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/equipped-OUTERCLOTHING-dog.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/equipped-OUTERCLOTHING-vox.png
index e0bfdfbc389..2b4eb16f0c4 100644
Binary files a/Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/equipped-OUTERCLOTHING-vox.png and b/Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/equipped-OUTERCLOTHING-vox.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/equipped-OUTERCLOTHING.png
index e32e244a890..5c72623081d 100644
Binary files a/Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/equipped-OUTERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/icon.png
index d6a7cdfb32a..160f35bf522 100644
Binary files a/Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/inhand-left.png
index 48a1145be14..2c06e675c39 100644
Binary files a/Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/inhand-right.png
index adb8622ebf2..c771fd3bc88 100644
Binary files a/Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/equipped-OUTERCLOTHING-dog.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/equipped-OUTERCLOTHING-dog.png
index 287bfc57013..ea187ee5c3d 100644
Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/equipped-OUTERCLOTHING-dog.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/equipped-OUTERCLOTHING-dog.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/equipped-OUTERCLOTHING-reptilian.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/equipped-OUTERCLOTHING-reptilian.png
index c870e6f354e..dd4951cd08b 100644
Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/equipped-OUTERCLOTHING-reptilian.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/equipped-OUTERCLOTHING-reptilian.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/equipped-OUTERCLOTHING-vox.png
index 644c67846b1..bfc54821814 100644
Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/equipped-OUTERCLOTHING-vox.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/equipped-OUTERCLOTHING-vox.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/equipped-OUTERCLOTHING.png
index 7ac2fbde5e3..a1be37510b9 100644
Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/equipped-OUTERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/icon.png
index 77e0426ef48..584929bfaf7 100644
Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/inhand-left.png
index 1c5a054bbae..184e9f66efb 100644
Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/inhand-right.png
index 60c4c9631ef..86aa47edd0d 100644
Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/atmos_firesuit.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Suits/atmos_firesuit.rsi/equipped-OUTERCLOTHING-vox.png
new file mode 100644
index 00000000000..c093278ad39
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Suits/atmos_firesuit.rsi/equipped-OUTERCLOTHING-vox.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/atmos_firesuit.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Suits/atmos_firesuit.rsi/meta.json
index c6858ce9016..acbf298f7a3 100644
--- a/Resources/Textures/Clothing/OuterClothing/Suits/atmos_firesuit.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Suits/atmos_firesuit.rsi/meta.json
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
- "copyright": "Taken from tgstation https://github.com/tgstation/tgstation/blob/master/icons/mob/clothing/suit.dmi. equipped-OUTERCLOTHING-dog modified from equipped-OUTERCLOTHING by @Aisfae(facebook).",
+ "copyright": "Taken from tgstation https://github.com/tgstation/tgstation/blob/master/icons/mob/clothing/suit.dmi. equipped-OUTERCLOTHING-dog modified from equipped-OUTERCLOTHING by @Aisfae(facebook). Harpy edit by VMSolidus, equipped-OUTERCLOTHING-resomi made by svarshiksatanist (Discord), Vox Sprite taken from https://github.com/ParadiseSS13/Paradise/blob/980bbb489d27baa168d30d044d573d017845015b/icons/mob/clothing/species/vox/suit.dmi modified by @areyouconfused(github)",
"size": {
"x": 32,
"y": 32
@@ -18,6 +18,10 @@
"name": "equipped-OUTERCLOTHING-dog",
"directions": 4
},
+ {
+ "name": "equipped-OUTERCLOTHING-vox",
+ "directions": 4
+ },
{
"name": "equipped-OUTERCLOTHING-reptilian",
"directions": 4
diff --git a/Resources/Textures/Clothing/OuterClothing/Vests/elitevest.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Vests/elitevest.rsi/equipped-OUTERCLOTHING.png
index 1ca03449f8a..350f6a288ba 100644
Binary files a/Resources/Textures/Clothing/OuterClothing/Vests/elitevest.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Vests/elitevest.rsi/equipped-OUTERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Vests/elitevest.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Vests/elitevest.rsi/icon.png
index 7fadd0c88b5..65c104d1c75 100644
Binary files a/Resources/Textures/Clothing/OuterClothing/Vests/elitevest.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Vests/elitevest.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Vests/elitevest.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Vests/elitevest.rsi/inhand-left.png
index 00083227489..520d5c63408 100644
Binary files a/Resources/Textures/Clothing/OuterClothing/Vests/elitevest.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Vests/elitevest.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Vests/elitevest.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Vests/elitevest.rsi/inhand-right.png
index 8dd5db16693..e2842ac2743 100644
Binary files a/Resources/Textures/Clothing/OuterClothing/Vests/elitevest.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Vests/elitevest.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Vests/mercwebvest.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Vests/mercwebvest.rsi/equipped-OUTERCLOTHING.png
index 4f08ace7129..b9273f213f2 100644
Binary files a/Resources/Textures/Clothing/OuterClothing/Vests/mercwebvest.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Vests/mercwebvest.rsi/equipped-OUTERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Vests/mercwebvest.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Vests/mercwebvest.rsi/icon.png
index 61811311f75..aac777b0f95 100644
Binary files a/Resources/Textures/Clothing/OuterClothing/Vests/mercwebvest.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Vests/mercwebvest.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Vests/mercwebvest.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Vests/mercwebvest.rsi/inhand-left.png
index 0aca74f6b6d..8ecff94859b 100644
Binary files a/Resources/Textures/Clothing/OuterClothing/Vests/mercwebvest.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Vests/mercwebvest.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Vests/mercwebvest.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Vests/mercwebvest.rsi/inhand-right.png
index 0ecd48a486b..3abdad08570 100644
Binary files a/Resources/Textures/Clothing/OuterClothing/Vests/mercwebvest.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Vests/mercwebvest.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Vests/webvest.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Vests/webvest.rsi/equipped-OUTERCLOTHING.png
index 4b453046379..a6947e22780 100644
Binary files a/Resources/Textures/Clothing/OuterClothing/Vests/webvest.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Vests/webvest.rsi/equipped-OUTERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Vests/webvest.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Vests/webvest.rsi/icon.png
index 8edafea2ee4..c208aba1f8c 100644
Binary files a/Resources/Textures/Clothing/OuterClothing/Vests/webvest.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Vests/webvest.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Vests/webvest.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Vests/webvest.rsi/inhand-left.png
index 910c02b87f2..bb043734cdc 100644
Binary files a/Resources/Textures/Clothing/OuterClothing/Vests/webvest.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Vests/webvest.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Vests/webvest.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Vests/webvest.rsi/inhand-right.png
index 7b3ddbcc1f3..36c7711a7df 100644
Binary files a/Resources/Textures/Clothing/OuterClothing/Vests/webvest.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Vests/webvest.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/equipped-OUTERCLOTHING-vox.png
index 0fca4396ea0..797ba3f02da 100644
Binary files a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/equipped-OUTERCLOTHING-vox.png and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/equipped-OUTERCLOTHING-vox.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/equipped-OUTERCLOTHING.png
index 0b3086ac587..58b562947c4 100644
Binary files a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/equipped-OUTERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/icon.png
index dd14ac0a8a8..e6820eff62f 100644
Binary files a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/inhand-left.png
index b663f23d36f..c67935422f9 100644
Binary files a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/inhand-right.png
index 567058cda94..3646c5df1bb 100644
Binary files a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/capformaldress.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/capformaldress.rsi/equipped-INNERCLOTHING-monkey.png
index 55c01ba665f..a0800e8a178 100644
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/capformaldress.rsi/equipped-INNERCLOTHING-monkey.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/capformaldress.rsi/equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/capformaldress.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/capformaldress.rsi/equipped-INNERCLOTHING.png
index 8651ad10e70..a3dc4027c7e 100644
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/capformaldress.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/capformaldress.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/capformaldress.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/capformaldress.rsi/icon.png
index 50641b757b6..a0b0bd63ed2 100644
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/capformaldress.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/capformaldress.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/capformaldress.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/capformaldress.rsi/inhand-left.png
index 46bc66d25f4..53f12ca4e61 100644
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/capformaldress.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/capformaldress.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/capformaldress.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/capformaldress.rsi/inhand-right.png
index db345a7434e..a46a582a1d8 100644
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/capformaldress.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/capformaldress.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/equipped-INNERCLOTHING-monkey.png
index a49fbd18d0f..60dab9e97f7 100644
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/equipped-INNERCLOTHING-monkey.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/inhand-left.png
index 45020687309..b5b6558fb5b 100644
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/inhand-right.png
index f6bcc2b1437..e82caa7e47c 100644
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/equipped-INNERCLOTHING.png
index 210107b305f..b9ef525b325 100644
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/inhand-left.png
index c591079d53f..602d2181f0a 100644
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/inhand-right.png
index e8d24fd2676..cdf9359be32 100644
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/equipped-INNERCLOTHING.png
index efa8c60bd55..c815d729e7f 100644
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/Mobs/Customization/vox_parts.rsi/tail_big_animated.png b/Resources/Textures/Mobs/Customization/vox_parts.rsi/tail_big_animated.png
index ae57470971b..d900aef404e 100644
Binary files a/Resources/Textures/Mobs/Customization/vox_parts.rsi/tail_big_animated.png and b/Resources/Textures/Mobs/Customization/vox_parts.rsi/tail_big_animated.png differ
diff --git a/Resources/Textures/Mobs/Species/Vox/organs.rsi/appendix-inflamed.png b/Resources/Textures/Mobs/Species/Vox/organs.rsi/appendix-inflamed.png
new file mode 100644
index 00000000000..4def8359bfa
Binary files /dev/null and b/Resources/Textures/Mobs/Species/Vox/organs.rsi/appendix-inflamed.png differ
diff --git a/Resources/Textures/Mobs/Species/Vox/organs.rsi/appendix.png b/Resources/Textures/Mobs/Species/Vox/organs.rsi/appendix.png
new file mode 100644
index 00000000000..d51b4ac4152
Binary files /dev/null and b/Resources/Textures/Mobs/Species/Vox/organs.rsi/appendix.png differ
diff --git a/Resources/Textures/Mobs/Species/Vox/organs.rsi/brain-inhand-left.png b/Resources/Textures/Mobs/Species/Vox/organs.rsi/brain-inhand-left.png
new file mode 100644
index 00000000000..54987fa5737
Binary files /dev/null and b/Resources/Textures/Mobs/Species/Vox/organs.rsi/brain-inhand-left.png differ
diff --git a/Resources/Textures/Mobs/Species/Vox/organs.rsi/brain-inhand-right.png b/Resources/Textures/Mobs/Species/Vox/organs.rsi/brain-inhand-right.png
new file mode 100644
index 00000000000..ab4208d928f
Binary files /dev/null and b/Resources/Textures/Mobs/Species/Vox/organs.rsi/brain-inhand-right.png differ
diff --git a/Resources/Textures/Mobs/Species/Vox/organs.rsi/brain.png b/Resources/Textures/Mobs/Species/Vox/organs.rsi/brain.png
new file mode 100644
index 00000000000..e0aa1da0013
Binary files /dev/null and b/Resources/Textures/Mobs/Species/Vox/organs.rsi/brain.png differ
diff --git a/Resources/Textures/Mobs/Species/Vox/organs.rsi/ears.png b/Resources/Textures/Mobs/Species/Vox/organs.rsi/ears.png
new file mode 100644
index 00000000000..5371711202e
Binary files /dev/null and b/Resources/Textures/Mobs/Species/Vox/organs.rsi/ears.png differ
diff --git a/Resources/Textures/Mobs/Species/Vox/organs.rsi/meta.json b/Resources/Textures/Mobs/Species/Vox/organs.rsi/meta.json
index 3f5b58707ba..0c88e19423d 100644
--- a/Resources/Textures/Mobs/Species/Vox/organs.rsi/meta.json
+++ b/Resources/Textures/Mobs/Species/Vox/organs.rsi/meta.json
@@ -7,6 +7,26 @@
"y": 32
},
"states": [
+ {
+ "name": "appendix"
+ },
+ {
+ "name": "appendix-inflamed"
+ },
+ {
+ "name": "ears"
+ },
+ {
+ "name": "brain"
+ },
+ {
+ "name": "brain-inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "brain-inhand-right",
+ "directions": 4
+ },
{
"name": "eyeballs-inhand-left",
"directions": 4
@@ -91,6 +111,15 @@
},
{
"name": "tongue"
+ },
+ {
+ "name": "muscle"
+ },
+ {
+ "name": "nerve"
+ },
+ {
+ "name": "vessel"
}
]
}
diff --git a/Resources/Textures/Mobs/Species/Vox/organs.rsi/muscle.png b/Resources/Textures/Mobs/Species/Vox/organs.rsi/muscle.png
new file mode 100644
index 00000000000..0c84af45f21
Binary files /dev/null and b/Resources/Textures/Mobs/Species/Vox/organs.rsi/muscle.png differ
diff --git a/Resources/Textures/Mobs/Species/Vox/organs.rsi/nerve.png b/Resources/Textures/Mobs/Species/Vox/organs.rsi/nerve.png
new file mode 100644
index 00000000000..fa4e452aea7
Binary files /dev/null and b/Resources/Textures/Mobs/Species/Vox/organs.rsi/nerve.png differ
diff --git a/Resources/Textures/Mobs/Species/Vox/organs.rsi/vessel.png b/Resources/Textures/Mobs/Species/Vox/organs.rsi/vessel.png
new file mode 100644
index 00000000000..5a617e00e44
Binary files /dev/null and b/Resources/Textures/Mobs/Species/Vox/organs.rsi/vessel.png differ
diff --git a/Resources/Textures/_EinsteinEngines/Clothing/Head/Envirohelms/captain.rsi/equipped-HELMET.png b/Resources/Textures/_EinsteinEngines/Clothing/Head/Envirohelms/captain.rsi/equipped-HELMET.png
index 2988ab5d966..1e5c22a6799 100644
Binary files a/Resources/Textures/_EinsteinEngines/Clothing/Head/Envirohelms/captain.rsi/equipped-HELMET.png and b/Resources/Textures/_EinsteinEngines/Clothing/Head/Envirohelms/captain.rsi/equipped-HELMET.png differ
diff --git a/Resources/Textures/_EinsteinEngines/Clothing/Head/Envirohelms/captain.rsi/icon.png b/Resources/Textures/_EinsteinEngines/Clothing/Head/Envirohelms/captain.rsi/icon.png
index 4e39d2d54bb..d1c9fe45427 100644
Binary files a/Resources/Textures/_EinsteinEngines/Clothing/Head/Envirohelms/captain.rsi/icon.png and b/Resources/Textures/_EinsteinEngines/Clothing/Head/Envirohelms/captain.rsi/icon.png differ
diff --git a/Resources/Textures/_EinsteinEngines/Clothing/Uniforms/Envirosuits/captain.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_EinsteinEngines/Clothing/Uniforms/Envirosuits/captain.rsi/equipped-INNERCLOTHING.png
index 93329394221..9dfa4a5dd44 100644
Binary files a/Resources/Textures/_EinsteinEngines/Clothing/Uniforms/Envirosuits/captain.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/_EinsteinEngines/Clothing/Uniforms/Envirosuits/captain.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_EinsteinEngines/Clothing/Uniforms/Envirosuits/captain.rsi/icon.png b/Resources/Textures/_EinsteinEngines/Clothing/Uniforms/Envirosuits/captain.rsi/icon.png
index 594ba5a9e41..2dd291e1743 100644
Binary files a/Resources/Textures/_EinsteinEngines/Clothing/Uniforms/Envirosuits/captain.rsi/icon.png and b/Resources/Textures/_EinsteinEngines/Clothing/Uniforms/Envirosuits/captain.rsi/icon.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Armor/veteran_security.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Armor/veteran_security.rsi/equipped-OUTERCLOTHING.png
new file mode 100644
index 00000000000..8ba62021cad
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Armor/veteran_security.rsi/equipped-OUTERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Armor/veteran_security.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Armor/veteran_security.rsi/icon.png
new file mode 100644
index 00000000000..57eed703912
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Armor/veteran_security.rsi/icon.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Armor/veteran_security.rsi/inhand-left.png b/Resources/Textures/_Goobstation/Clothing/Armor/veteran_security.rsi/inhand-left.png
new file mode 100644
index 00000000000..61a7d0e3902
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Armor/veteran_security.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Armor/veteran_security.rsi/inhand-right.png b/Resources/Textures/_Goobstation/Clothing/Armor/veteran_security.rsi/inhand-right.png
new file mode 100644
index 00000000000..79329c4c3de
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Armor/veteran_security.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Armor/veteran_security.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Armor/veteran_security.rsi/meta.json
new file mode 100644
index 00000000000..b4ce7bc2364
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Armor/veteran_security.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Made by Vlagded (Telegram) ",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "equipped-OUTERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Back/Backpacks/cargo.rsi/equipped-BACKPACK.png b/Resources/Textures/_Goobstation/Clothing/Back/Backpacks/cargo.rsi/equipped-BACKPACK.png
new file mode 100644
index 00000000000..99b1f00eb91
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Back/Backpacks/cargo.rsi/equipped-BACKPACK.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Back/Backpacks/cargo.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Back/Backpacks/cargo.rsi/icon.png
new file mode 100644
index 00000000000..0ec635f397c
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Back/Backpacks/cargo.rsi/icon.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Back/Backpacks/cargo.rsi/inhand-left.png b/Resources/Textures/_Goobstation/Clothing/Back/Backpacks/cargo.rsi/inhand-left.png
new file mode 100644
index 00000000000..53cbfec902c
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Back/Backpacks/cargo.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Back/Backpacks/cargo.rsi/inhand-right.png b/Resources/Textures/_Goobstation/Clothing/Back/Backpacks/cargo.rsi/inhand-right.png
new file mode 100644
index 00000000000..dac3f1968a6
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Back/Backpacks/cargo.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Back/Backpacks/cargo.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Back/Backpacks/cargo.rsi/meta.json
new file mode 100644
index 00000000000..223d29a3a54
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Back/Backpacks/cargo.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Modified from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1 by potato1234x (Github) for SS14, resprite by mureixlol, recolor by Jvne",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "equipped-BACKPACK",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Back/Duffels/cargo.rsi/equipped-BACKPACK.png b/Resources/Textures/_Goobstation/Clothing/Back/Duffels/cargo.rsi/equipped-BACKPACK.png
new file mode 100644
index 00000000000..8bc9d807148
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Back/Duffels/cargo.rsi/equipped-BACKPACK.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Back/Duffels/cargo.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Back/Duffels/cargo.rsi/icon.png
new file mode 100644
index 00000000000..08ed37fdeda
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Back/Duffels/cargo.rsi/icon.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Back/Duffels/cargo.rsi/inhand-left.png b/Resources/Textures/_Goobstation/Clothing/Back/Duffels/cargo.rsi/inhand-left.png
new file mode 100644
index 00000000000..72bda037756
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Back/Duffels/cargo.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Back/Duffels/cargo.rsi/inhand-right.png b/Resources/Textures/_Goobstation/Clothing/Back/Duffels/cargo.rsi/inhand-right.png
new file mode 100644
index 00000000000..09637bc35d2
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Back/Duffels/cargo.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Back/Duffels/cargo.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Back/Duffels/cargo.rsi/meta.json
new file mode 100644
index 00000000000..223d29a3a54
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Back/Duffels/cargo.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Modified from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1 by potato1234x (Github) for SS14, resprite by mureixlol, recolor by Jvne",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "equipped-BACKPACK",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Back/Modsuits/captain.rsi/control.png b/Resources/Textures/_Goobstation/Clothing/Back/Modsuits/captain.rsi/control.png
index c8ff51bbf46..6dab33033d4 100644
Binary files a/Resources/Textures/_Goobstation/Clothing/Back/Modsuits/captain.rsi/control.png and b/Resources/Textures/_Goobstation/Clothing/Back/Modsuits/captain.rsi/control.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Back/Modsuits/captain.rsi/equipped-BACKPACK.png b/Resources/Textures/_Goobstation/Clothing/Back/Modsuits/captain.rsi/equipped-BACKPACK.png
index 6f197cc69a4..7755bb4d52a 100644
Binary files a/Resources/Textures/_Goobstation/Clothing/Back/Modsuits/captain.rsi/equipped-BACKPACK.png and b/Resources/Textures/_Goobstation/Clothing/Back/Modsuits/captain.rsi/equipped-BACKPACK.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Back/Satchels/cargo.rsi/equipped-BACKPACK.png b/Resources/Textures/_Goobstation/Clothing/Back/Satchels/cargo.rsi/equipped-BACKPACK.png
new file mode 100644
index 00000000000..25e749d8efd
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Back/Satchels/cargo.rsi/equipped-BACKPACK.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Back/Satchels/cargo.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Back/Satchels/cargo.rsi/icon.png
new file mode 100644
index 00000000000..2ce8edaed5e
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Back/Satchels/cargo.rsi/icon.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Back/Satchels/cargo.rsi/inhand-left.png b/Resources/Textures/_Goobstation/Clothing/Back/Satchels/cargo.rsi/inhand-left.png
new file mode 100644
index 00000000000..552b15b58a2
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Back/Satchels/cargo.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Back/Satchels/cargo.rsi/inhand-right.png b/Resources/Textures/_Goobstation/Clothing/Back/Satchels/cargo.rsi/inhand-right.png
new file mode 100644
index 00000000000..f73783e5dd7
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Back/Satchels/cargo.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Back/Satchels/cargo.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Back/Satchels/cargo.rsi/meta.json
new file mode 100644
index 00000000000..223d29a3a54
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Back/Satchels/cargo.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Modified from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1 by potato1234x (Github) for SS14, resprite by mureixlol, recolor by Jvne",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "equipped-BACKPACK",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Hands/Modsuits/captain.rsi/equipped-HAND-sealed-vox.png b/Resources/Textures/_Goobstation/Clothing/Hands/Modsuits/captain.rsi/equipped-HAND-sealed-vox.png
index 0afd1e5c0d7..b068421a2fa 100644
Binary files a/Resources/Textures/_Goobstation/Clothing/Hands/Modsuits/captain.rsi/equipped-HAND-sealed-vox.png and b/Resources/Textures/_Goobstation/Clothing/Hands/Modsuits/captain.rsi/equipped-HAND-sealed-vox.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Hands/Modsuits/captain.rsi/equipped-HAND-sealed.png b/Resources/Textures/_Goobstation/Clothing/Hands/Modsuits/captain.rsi/equipped-HAND-sealed.png
index 8a2e2fac871..8cc2eb3f320 100644
Binary files a/Resources/Textures/_Goobstation/Clothing/Hands/Modsuits/captain.rsi/equipped-HAND-sealed.png and b/Resources/Textures/_Goobstation/Clothing/Hands/Modsuits/captain.rsi/equipped-HAND-sealed.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Hands/Modsuits/captain.rsi/equipped-HAND-vox.png b/Resources/Textures/_Goobstation/Clothing/Hands/Modsuits/captain.rsi/equipped-HAND-vox.png
index 17ba6ebba02..4bb91dd7ab2 100644
Binary files a/Resources/Textures/_Goobstation/Clothing/Hands/Modsuits/captain.rsi/equipped-HAND-vox.png and b/Resources/Textures/_Goobstation/Clothing/Hands/Modsuits/captain.rsi/equipped-HAND-vox.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Hands/Modsuits/captain.rsi/equipped-HAND.png b/Resources/Textures/_Goobstation/Clothing/Hands/Modsuits/captain.rsi/equipped-HAND.png
index 938b53eb646..a71b2009f54 100644
Binary files a/Resources/Textures/_Goobstation/Clothing/Hands/Modsuits/captain.rsi/equipped-HAND.png and b/Resources/Textures/_Goobstation/Clothing/Hands/Modsuits/captain.rsi/equipped-HAND.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Hands/Modsuits/captain.rsi/gauntlets-sealed.png b/Resources/Textures/_Goobstation/Clothing/Hands/Modsuits/captain.rsi/gauntlets-sealed.png
index 8f7c310c9c8..e7ca44d01bc 100644
Binary files a/Resources/Textures/_Goobstation/Clothing/Hands/Modsuits/captain.rsi/gauntlets-sealed.png and b/Resources/Textures/_Goobstation/Clothing/Hands/Modsuits/captain.rsi/gauntlets-sealed.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Hands/Modsuits/captain.rsi/gauntlets.png b/Resources/Textures/_Goobstation/Clothing/Hands/Modsuits/captain.rsi/gauntlets.png
index 0eaa25ddb77..07c50331fa2 100644
Binary files a/Resources/Textures/_Goobstation/Clothing/Hands/Modsuits/captain.rsi/gauntlets.png and b/Resources/Textures/_Goobstation/Clothing/Hands/Modsuits/captain.rsi/gauntlets.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Head/Hats/beret_qm.rsi/equipped-HELMET-hamster.png b/Resources/Textures/_Goobstation/Clothing/Head/Hats/beret_qm.rsi/equipped-HELMET-hamster.png
new file mode 100644
index 00000000000..7a70196100b
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Head/Hats/beret_qm.rsi/equipped-HELMET-hamster.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Head/Hats/beret_qm.rsi/equipped-HELMET.png b/Resources/Textures/_Goobstation/Clothing/Head/Hats/beret_qm.rsi/equipped-HELMET.png
new file mode 100644
index 00000000000..0cc3419213e
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Head/Hats/beret_qm.rsi/equipped-HELMET.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Head/Hats/beret_qm.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Head/Hats/beret_qm.rsi/icon.png
new file mode 100644
index 00000000000..ee1997cc965
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Head/Hats/beret_qm.rsi/icon.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Head/Hats/beret_qm.rsi/inhand-left.png b/Resources/Textures/_Goobstation/Clothing/Head/Hats/beret_qm.rsi/inhand-left.png
new file mode 100644
index 00000000000..ac68efc617e
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Head/Hats/beret_qm.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Head/Hats/beret_qm.rsi/inhand-right.png b/Resources/Textures/_Goobstation/Clothing/Head/Hats/beret_qm.rsi/inhand-right.png
new file mode 100644
index 00000000000..1f8ff310244
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Head/Hats/beret_qm.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Head/Hats/beret_qm.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Head/Hats/beret_qm.rsi/meta.json
new file mode 100644
index 00000000000..93352db987d
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Head/Hats/beret_qm.rsi/meta.json
@@ -0,0 +1,30 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, recoloured by Hanzdegloker and edited by @seyriix",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "equipped-HELMET-hamster",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Head/Hats/cowboyhat_centcom.rsi/equipped-HELMET.png b/Resources/Textures/_Goobstation/Clothing/Head/Hats/cowboyhat_centcom.rsi/equipped-HELMET.png
new file mode 100644
index 00000000000..a2c1d2577f8
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Head/Hats/cowboyhat_centcom.rsi/equipped-HELMET.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Head/Hats/cowboyhat_centcom.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Head/Hats/cowboyhat_centcom.rsi/icon.png
new file mode 100644
index 00000000000..0b9ebb215ef
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Head/Hats/cowboyhat_centcom.rsi/icon.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Head/Hats/cowboyhat_centcom.rsi/inhand-left.png b/Resources/Textures/_Goobstation/Clothing/Head/Hats/cowboyhat_centcom.rsi/inhand-left.png
new file mode 100644
index 00000000000..90cac5a0fe1
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Head/Hats/cowboyhat_centcom.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Head/Hats/cowboyhat_centcom.rsi/inhand-right.png b/Resources/Textures/_Goobstation/Clothing/Head/Hats/cowboyhat_centcom.rsi/inhand-right.png
new file mode 100644
index 00000000000..f0ddcf3930d
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Head/Hats/cowboyhat_centcom.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Head/Hats/cowboyhat_centcom.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Head/Hats/cowboyhat_centcom.rsi/meta.json
new file mode 100644
index 00000000000..88e882a4023
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Head/Hats/cowboyhat_centcom.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "in-hand sprites taken from tgstation at https://github.com/tgstation/tgstation/commit/8703eac50de6379c26f7eadb47b4f016854d1dcd, sprites by @seyriix",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Head/Hats/golden_centcom.rsi/equipped-HELMET-hamster.png b/Resources/Textures/_Goobstation/Clothing/Head/Hats/golden_centcom.rsi/equipped-HELMET-hamster.png
new file mode 100644
index 00000000000..b273d432bf7
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Head/Hats/golden_centcom.rsi/equipped-HELMET-hamster.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Head/Hats/golden_centcom.rsi/equipped-HELMET.png b/Resources/Textures/_Goobstation/Clothing/Head/Hats/golden_centcom.rsi/equipped-HELMET.png
new file mode 100644
index 00000000000..71a316a1851
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Head/Hats/golden_centcom.rsi/equipped-HELMET.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Head/Hats/golden_centcom.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Head/Hats/golden_centcom.rsi/icon.png
new file mode 100644
index 00000000000..f4cb5118e85
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Head/Hats/golden_centcom.rsi/icon.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Head/Hats/golden_centcom.rsi/inhand-left.png b/Resources/Textures/_Goobstation/Clothing/Head/Hats/golden_centcom.rsi/inhand-left.png
new file mode 100644
index 00000000000..fde355a362b
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Head/Hats/golden_centcom.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Head/Hats/golden_centcom.rsi/inhand-right.png b/Resources/Textures/_Goobstation/Clothing/Head/Hats/golden_centcom.rsi/inhand-right.png
new file mode 100644
index 00000000000..287dc9d18a6
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Head/Hats/golden_centcom.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Head/Hats/golden_centcom.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Head/Hats/golden_centcom.rsi/meta.json
new file mode 100644
index 00000000000..f0fb1bf96d9
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Head/Hats/golden_centcom.rsi/meta.json
@@ -0,0 +1,30 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/0671297bb1c1b31d5885f2768aecbe9dc51d39e7 , edited by Skarletto (github), inhand sprites by SeamLesss (GitHub), recoloured by @seyriix",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ },
+ {
+ "name": "equipped-HELMET-hamster",
+ "directions": 4
+ },
+ {
+ "name": "equipped-HELMET",
+ "directions": 4
+ }
+ ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/_Goobstation/Clothing/Head/Modsuits/captain.rsi/equipped-HEAD-sealed-vox.png b/Resources/Textures/_Goobstation/Clothing/Head/Modsuits/captain.rsi/equipped-HEAD-sealed-vox.png
index 3650eb23af6..4cf93111e22 100644
Binary files a/Resources/Textures/_Goobstation/Clothing/Head/Modsuits/captain.rsi/equipped-HEAD-sealed-vox.png and b/Resources/Textures/_Goobstation/Clothing/Head/Modsuits/captain.rsi/equipped-HEAD-sealed-vox.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Head/Modsuits/captain.rsi/equipped-HEAD-sealed.png b/Resources/Textures/_Goobstation/Clothing/Head/Modsuits/captain.rsi/equipped-HEAD-sealed.png
index e00e4bb0423..33db9f44b00 100644
Binary files a/Resources/Textures/_Goobstation/Clothing/Head/Modsuits/captain.rsi/equipped-HEAD-sealed.png and b/Resources/Textures/_Goobstation/Clothing/Head/Modsuits/captain.rsi/equipped-HEAD-sealed.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Head/Modsuits/captain.rsi/equipped-HEAD-vox.png b/Resources/Textures/_Goobstation/Clothing/Head/Modsuits/captain.rsi/equipped-HEAD-vox.png
index 665586a6d03..dd80ffbc2c2 100644
Binary files a/Resources/Textures/_Goobstation/Clothing/Head/Modsuits/captain.rsi/equipped-HEAD-vox.png and b/Resources/Textures/_Goobstation/Clothing/Head/Modsuits/captain.rsi/equipped-HEAD-vox.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Head/Modsuits/captain.rsi/equipped-HEAD.png b/Resources/Textures/_Goobstation/Clothing/Head/Modsuits/captain.rsi/equipped-HEAD.png
index 37b3ee71b73..8434072d409 100644
Binary files a/Resources/Textures/_Goobstation/Clothing/Head/Modsuits/captain.rsi/equipped-HEAD.png and b/Resources/Textures/_Goobstation/Clothing/Head/Modsuits/captain.rsi/equipped-HEAD.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Head/Modsuits/captain.rsi/helmet-sealed.png b/Resources/Textures/_Goobstation/Clothing/Head/Modsuits/captain.rsi/helmet-sealed.png
index e1f5e6308d9..24d27765f41 100644
Binary files a/Resources/Textures/_Goobstation/Clothing/Head/Modsuits/captain.rsi/helmet-sealed.png and b/Resources/Textures/_Goobstation/Clothing/Head/Modsuits/captain.rsi/helmet-sealed.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Head/Modsuits/captain.rsi/helmet.png b/Resources/Textures/_Goobstation/Clothing/Head/Modsuits/captain.rsi/helmet.png
index 6701696b764..083b7db5ddd 100644
Binary files a/Resources/Textures/_Goobstation/Clothing/Head/Modsuits/captain.rsi/helmet.png and b/Resources/Textures/_Goobstation/Clothing/Head/Modsuits/captain.rsi/helmet.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Head/Soft/cargosoft.rsi/equipped-HELMET-hamster.png b/Resources/Textures/_Goobstation/Clothing/Head/Soft/cargosoft.rsi/equipped-HELMET-hamster.png
new file mode 100644
index 00000000000..13254b83a34
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Head/Soft/cargosoft.rsi/equipped-HELMET-hamster.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Head/Soft/cargosoft.rsi/equipped-HELMET.png b/Resources/Textures/_Goobstation/Clothing/Head/Soft/cargosoft.rsi/equipped-HELMET.png
new file mode 100644
index 00000000000..7fa3ec75f29
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Head/Soft/cargosoft.rsi/equipped-HELMET.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Head/Soft/cargosoft.rsi/flipped-equipped-HELMET-hamster.png b/Resources/Textures/_Goobstation/Clothing/Head/Soft/cargosoft.rsi/flipped-equipped-HELMET-hamster.png
new file mode 100644
index 00000000000..b5cbf99a6fa
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Head/Soft/cargosoft.rsi/flipped-equipped-HELMET-hamster.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Head/Soft/cargosoft.rsi/flipped-equipped-HELMET.png b/Resources/Textures/_Goobstation/Clothing/Head/Soft/cargosoft.rsi/flipped-equipped-HELMET.png
new file mode 100644
index 00000000000..762ea5ef45e
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Head/Soft/cargosoft.rsi/flipped-equipped-HELMET.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Head/Soft/cargosoft.rsi/flipped-inhand-left.png b/Resources/Textures/_Goobstation/Clothing/Head/Soft/cargosoft.rsi/flipped-inhand-left.png
new file mode 100644
index 00000000000..dfcd7603654
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Head/Soft/cargosoft.rsi/flipped-inhand-left.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Head/Soft/cargosoft.rsi/flipped-inhand-right.png b/Resources/Textures/_Goobstation/Clothing/Head/Soft/cargosoft.rsi/flipped-inhand-right.png
new file mode 100644
index 00000000000..ab86b806a9d
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Head/Soft/cargosoft.rsi/flipped-inhand-right.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Head/Soft/cargosoft.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Head/Soft/cargosoft.rsi/icon.png
new file mode 100644
index 00000000000..db2f795480b
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Head/Soft/cargosoft.rsi/icon.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Head/Soft/cargosoft.rsi/icon_flipped.png b/Resources/Textures/_Goobstation/Clothing/Head/Soft/cargosoft.rsi/icon_flipped.png
new file mode 100644
index 00000000000..5bb64e8c38c
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Head/Soft/cargosoft.rsi/icon_flipped.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Head/Soft/cargosoft.rsi/inhand-left.png b/Resources/Textures/_Goobstation/Clothing/Head/Soft/cargosoft.rsi/inhand-left.png
new file mode 100644
index 00000000000..ab4e2458334
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Head/Soft/cargosoft.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Head/Soft/cargosoft.rsi/inhand-right.png b/Resources/Textures/_Goobstation/Clothing/Head/Soft/cargosoft.rsi/inhand-right.png
new file mode 100644
index 00000000000..b12d7269e84
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Head/Soft/cargosoft.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Head/Soft/cargosoft.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Head/Soft/cargosoft.rsi/meta.json
new file mode 100644
index 00000000000..3513e2f23a7
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Head/Soft/cargosoft.rsi/meta.json
@@ -0,0 +1,49 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "taken from paradise at commit https://github.com/ParadiseSS13/Paradise/commit/0db4c22804184aa6df58a23c55f6f27eeb69badd , inhands by Jvne",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "icon_flipped"
+ },
+ {
+ "name": "equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "flipped-equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "equipped-HELMET-hamster",
+ "directions": 4
+ },
+ {
+ "name": "flipped-equipped-HELMET-hamster",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "flipped-inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ },
+ {
+ "name": "flipped-inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/ChiefEngineer/greence.rsi/equipped-NECK.png b/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/ChiefEngineer/greence.rsi/equipped-NECK.png
new file mode 100644
index 00000000000..4e434476193
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/ChiefEngineer/greence.rsi/equipped-NECK.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/ChiefEngineer/greence.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/ChiefEngineer/greence.rsi/icon.png
new file mode 100644
index 00000000000..21f61ebb722
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/ChiefEngineer/greence.rsi/icon.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/ChiefEngineer/greence.rsi/inhand-left.png b/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/ChiefEngineer/greence.rsi/inhand-left.png
new file mode 100644
index 00000000000..c0d90dee6e5
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/ChiefEngineer/greence.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/ChiefEngineer/greence.rsi/inhand-right.png b/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/ChiefEngineer/greence.rsi/inhand-right.png
new file mode 100644
index 00000000000..4e4d7a2a7c5
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/ChiefEngineer/greence.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/ChiefEngineer/greence.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/ChiefEngineer/greence.rsi/meta.json
new file mode 100644
index 00000000000..fde00d61167
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/ChiefEngineer/greence.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da, sprites in hand by PuroSlavKing (Github) and RudeyCoolLeet#3875",
+ "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/_Goobstation/Clothing/Neck/Cloaks/ChiefEngineer/whitece.rsi/equipped-NECK.png b/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/ChiefEngineer/whitece.rsi/equipped-NECK.png
new file mode 100644
index 00000000000..1a78f864765
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/ChiefEngineer/whitece.rsi/equipped-NECK.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/ChiefEngineer/whitece.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/ChiefEngineer/whitece.rsi/icon.png
new file mode 100644
index 00000000000..d10bfe821fa
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/ChiefEngineer/whitece.rsi/icon.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/ChiefEngineer/whitece.rsi/inhand-left.png b/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/ChiefEngineer/whitece.rsi/inhand-left.png
new file mode 100644
index 00000000000..b1c1ebec4df
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/ChiefEngineer/whitece.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/ChiefEngineer/whitece.rsi/inhand-right.png b/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/ChiefEngineer/whitece.rsi/inhand-right.png
new file mode 100644
index 00000000000..060c84e6601
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/ChiefEngineer/whitece.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/ChiefEngineer/whitece.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/ChiefEngineer/whitece.rsi/meta.json
new file mode 100644
index 00000000000..fde00d61167
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/ChiefEngineer/whitece.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da, sprites in hand by PuroSlavKing (Github) and RudeyCoolLeet#3875",
+ "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/_Goobstation/Clothing/Neck/Cloaks/cap.rsi/equipped-NECK.png b/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/cap.rsi/equipped-NECK.png
new file mode 100644
index 00000000000..21c76503afd
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/cap.rsi/equipped-NECK.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/cap.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/cap.rsi/icon.png
new file mode 100644
index 00000000000..04e7cf9bedb
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/cap.rsi/icon.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/cap.rsi/inhand-left.png b/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/cap.rsi/inhand-left.png
new file mode 100644
index 00000000000..f3b7790d540
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/cap.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/cap.rsi/inhand-right.png b/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/cap.rsi/inhand-right.png
new file mode 100644
index 00000000000..a0832b25b19
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/cap.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/cap.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/cap.rsi/meta.json
new file mode 100644
index 00000000000..c67e6b97cc4
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/cap.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Sprites by @seyriix, in-hand sprites by PuroSlavKing (Github) and RudeyCoolLeet#3875",
+ "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/_Goobstation/Clothing/Neck/Cloaks/cchighcommand.rsi/equipped-NECK.png b/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/cchighcommand.rsi/equipped-NECK.png
new file mode 100644
index 00000000000..cbcb131feab
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/cchighcommand.rsi/equipped-NECK.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/cchighcommand.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/cchighcommand.rsi/icon.png
new file mode 100644
index 00000000000..80284bc0b7c
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/cchighcommand.rsi/icon.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/cchighcommand.rsi/inhand-left.png b/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/cchighcommand.rsi/inhand-left.png
new file mode 100644
index 00000000000..4d43e410aa8
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/cchighcommand.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/cchighcommand.rsi/inhand-right.png b/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/cchighcommand.rsi/inhand-right.png
new file mode 100644
index 00000000000..e65bcd33540
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/cchighcommand.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/cchighcommand.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/cchighcommand.rsi/meta.json
new file mode 100644
index 00000000000..16f725d1d3d
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/cchighcommand.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "sprites by @seyriix, in-hand sprites by PuroSlavKing (Github) and RudeyCoolLeet#3875",
+ "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/_Goobstation/Clothing/Neck/Cloaks/centcom_poncho.rsi/equipped-NECK.png b/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/centcom_poncho.rsi/equipped-NECK.png
new file mode 100644
index 00000000000..e0e0e49c5e9
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/centcom_poncho.rsi/equipped-NECK.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/centcom_poncho.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/centcom_poncho.rsi/icon.png
new file mode 100644
index 00000000000..eb2a78eaeaa
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/centcom_poncho.rsi/icon.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/centcom_poncho.rsi/inhand-left.png b/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/centcom_poncho.rsi/inhand-left.png
new file mode 100644
index 00000000000..4d43e410aa8
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/centcom_poncho.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/centcom_poncho.rsi/inhand-right.png b/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/centcom_poncho.rsi/inhand-right.png
new file mode 100644
index 00000000000..e65bcd33540
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/centcom_poncho.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/centcom_poncho.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/centcom_poncho.rsi/meta.json
new file mode 100644
index 00000000000..16f725d1d3d
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/centcom_poncho.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "sprites by @seyriix, in-hand sprites by PuroSlavKing (Github) and RudeyCoolLeet#3875",
+ "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/_Goobstation/Clothing/Neck/Cloaks/cmo.rsi/equipped-NECK.png b/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/cmo.rsi/equipped-NECK.png
new file mode 100644
index 00000000000..b53751dc1c5
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/cmo.rsi/equipped-NECK.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/cmo.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/cmo.rsi/icon.png
new file mode 100644
index 00000000000..abba233b0af
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/cmo.rsi/icon.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/cmo.rsi/inhand-left.png b/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/cmo.rsi/inhand-left.png
new file mode 100644
index 00000000000..571c9fbe178
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/cmo.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/cmo.rsi/inhand-right.png b/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/cmo.rsi/inhand-right.png
new file mode 100644
index 00000000000..a0dcdc62cd1
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/cmo.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/cmo.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/cmo.rsi/meta.json
new file mode 100644
index 00000000000..02a747dbc3a
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/cmo.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+ "version": 2,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Sprites by @seyriix, in-hand sprites by PuroSlavKing (Github) and RudeyCoolLeet#3875 and fixed by @mishutka09",
+ "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/_Goobstation/Clothing/Neck/Cloaks/goldcentcom.rsi/equipped-NECK.png b/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/goldcentcom.rsi/equipped-NECK.png
new file mode 100644
index 00000000000..65b77d89576
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/goldcentcom.rsi/equipped-NECK.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/goldcentcom.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/goldcentcom.rsi/icon.png
new file mode 100644
index 00000000000..51b350be373
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/goldcentcom.rsi/icon.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/goldcentcom.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/goldcentcom.rsi/meta.json
new file mode 100644
index 00000000000..7d9256f45eb
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/goldcentcom.rsi/meta.json
@@ -0,0 +1,47 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "sprites by @seyriix",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "delays": [
+ [
+ 0.2,
+ 0.2,
+ 0.2
+ ]
+ ]
+ },
+ {
+ "name": "equipped-NECK",
+ "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
+ ]
+ ]
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/highcmdcape.rsi/equipped-NECK.png b/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/highcmdcape.rsi/equipped-NECK.png
new file mode 100644
index 00000000000..fbba02f688d
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/highcmdcape.rsi/equipped-NECK.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/highcmdcape.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/highcmdcape.rsi/icon.png
new file mode 100644
index 00000000000..33d99bf029c
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/highcmdcape.rsi/icon.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/highcmdcape.rsi/inhand-left.png b/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/highcmdcape.rsi/inhand-left.png
new file mode 100644
index 00000000000..4d43e410aa8
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/highcmdcape.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/highcmdcape.rsi/inhand-right.png b/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/highcmdcape.rsi/inhand-right.png
new file mode 100644
index 00000000000..e65bcd33540
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/highcmdcape.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/highcmdcape.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/highcmdcape.rsi/meta.json
new file mode 100644
index 00000000000..16f725d1d3d
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/highcmdcape.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "sprites by @seyriix, in-hand sprites by PuroSlavKing (Github) and RudeyCoolLeet#3875",
+ "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/_Goobstation/Clothing/Neck/Cloaks/hop.rsi/equipped-NECK.png b/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/hop.rsi/equipped-NECK.png
new file mode 100644
index 00000000000..f5c17a26379
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/hop.rsi/equipped-NECK.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/hop.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/hop.rsi/icon.png
new file mode 100644
index 00000000000..f353e104fa4
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/hop.rsi/icon.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/hop.rsi/inhand-left.png b/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/hop.rsi/inhand-left.png
new file mode 100644
index 00000000000..aea84228d88
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/hop.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/hop.rsi/inhand-right.png b/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/hop.rsi/inhand-right.png
new file mode 100644
index 00000000000..7c736b2eb6e
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/hop.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/hop.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/hop.rsi/meta.json
new file mode 100644
index 00000000000..cde4f3c2570
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/hop.rsi/meta.json
@@ -0,0 +1,27 @@
+
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da, sprites in hand by PuroSlavKing (Github) and RudeyCoolLeet#3875, sprites updated by JORJ949",
+ "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/_Goobstation/Clothing/Neck/Cloaks/hos.rsi/equipped-NECK.png b/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/hos.rsi/equipped-NECK.png
new file mode 100644
index 00000000000..290d66c9893
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/hos.rsi/equipped-NECK.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/hos.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/hos.rsi/icon.png
new file mode 100644
index 00000000000..0bd1aca6241
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/hos.rsi/icon.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/hos.rsi/inhand-left.png b/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/hos.rsi/inhand-left.png
new file mode 100644
index 00000000000..a31bdf536bc
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/hos.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/hos.rsi/inhand-right.png b/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/hos.rsi/inhand-right.png
new file mode 100644
index 00000000000..a9641cd4c61
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/hos.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/hos.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/hos.rsi/meta.json
new file mode 100644
index 00000000000..ecca7c9662b
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/hos.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da, sprites in hand by PuroSlavKing (Github) and RudeyCoolLeet#3875, sprites updated by JORJ949",
+ "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/_Goobstation/Clothing/Neck/Cloaks/qm.rsi/equipped-NECK.png b/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/qm.rsi/equipped-NECK.png
new file mode 100644
index 00000000000..ea047ee8924
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/qm.rsi/equipped-NECK.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/qm.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/qm.rsi/icon.png
new file mode 100644
index 00000000000..e96ff5372ae
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/qm.rsi/icon.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/qm.rsi/inhand-left.png b/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/qm.rsi/inhand-left.png
new file mode 100644
index 00000000000..f073d573849
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/qm.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/qm.rsi/inhand-right.png b/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/qm.rsi/inhand-right.png
new file mode 100644
index 00000000000..228a4d48480
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/qm.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/qm.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/qm.rsi/meta.json
new file mode 100644
index 00000000000..c67e6b97cc4
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/qm.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Sprites by @seyriix, in-hand sprites by PuroSlavKing (Github) and RudeyCoolLeet#3875",
+ "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/_Goobstation/Clothing/Neck/Cloaks/rd.rsi/equipped-NECK.png b/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/rd.rsi/equipped-NECK.png
new file mode 100644
index 00000000000..1b2dd69350a
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/rd.rsi/equipped-NECK.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/rd.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/rd.rsi/icon.png
new file mode 100644
index 00000000000..8a8a8245212
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/rd.rsi/icon.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/rd.rsi/inhand-left.png b/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/rd.rsi/inhand-left.png
new file mode 100644
index 00000000000..094adddf3db
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/rd.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/rd.rsi/inhand-right.png b/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/rd.rsi/inhand-right.png
new file mode 100644
index 00000000000..afb201b3b2c
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/rd.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/rd.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/rd.rsi/meta.json
new file mode 100644
index 00000000000..fde00d61167
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Neck/Cloaks/rd.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da, sprites in hand by PuroSlavKing (Github) and RudeyCoolLeet#3875",
+ "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/_Goobstation/Clothing/Neck/Mantle/ChiefEngineer/orangecemantle.rsi/equipped-NECK-vox.png b/Resources/Textures/_Goobstation/Clothing/Neck/Mantle/ChiefEngineer/orangecemantle.rsi/equipped-NECK-vox.png
new file mode 100644
index 00000000000..8737fbd0ffb
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Neck/Mantle/ChiefEngineer/orangecemantle.rsi/equipped-NECK-vox.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Neck/Mantle/ChiefEngineer/orangecemantle.rsi/equipped-NECK.png b/Resources/Textures/_Goobstation/Clothing/Neck/Mantle/ChiefEngineer/orangecemantle.rsi/equipped-NECK.png
new file mode 100644
index 00000000000..4d3f738a209
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Neck/Mantle/ChiefEngineer/orangecemantle.rsi/equipped-NECK.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Neck/Mantle/ChiefEngineer/orangecemantle.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Neck/Mantle/ChiefEngineer/orangecemantle.rsi/icon.png
new file mode 100644
index 00000000000..e0ef6307f60
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Neck/Mantle/ChiefEngineer/orangecemantle.rsi/icon.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Neck/Mantle/ChiefEngineer/orangecemantle.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Neck/Mantle/ChiefEngineer/orangecemantle.rsi/meta.json
new file mode 100644
index 00000000000..21b31e043d3
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Neck/Mantle/ChiefEngineer/orangecemantle.rsi/meta.json
@@ -0,0 +1,22 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "sprites by @seyriix",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "equipped-NECK",
+ "directions": 4
+ },
+ {
+ "name": "equipped-NECK-vox",
+ "directions": 4
+ }
+ ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/_Goobstation/Clothing/Neck/Mantle/ChiefEngineer/whitecemantle.rsi/equipped-NECK-vox.png b/Resources/Textures/_Goobstation/Clothing/Neck/Mantle/ChiefEngineer/whitecemantle.rsi/equipped-NECK-vox.png
new file mode 100644
index 00000000000..8c2317f46de
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Neck/Mantle/ChiefEngineer/whitecemantle.rsi/equipped-NECK-vox.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Neck/Mantle/ChiefEngineer/whitecemantle.rsi/equipped-NECK.png b/Resources/Textures/_Goobstation/Clothing/Neck/Mantle/ChiefEngineer/whitecemantle.rsi/equipped-NECK.png
new file mode 100644
index 00000000000..1d7d589576e
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Neck/Mantle/ChiefEngineer/whitecemantle.rsi/equipped-NECK.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Neck/Mantle/ChiefEngineer/whitecemantle.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Neck/Mantle/ChiefEngineer/whitecemantle.rsi/icon.png
new file mode 100644
index 00000000000..42b4ad64f9b
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Neck/Mantle/ChiefEngineer/whitecemantle.rsi/icon.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Neck/Mantle/ChiefEngineer/whitecemantle.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Neck/Mantle/ChiefEngineer/whitecemantle.rsi/meta.json
new file mode 100644
index 00000000000..21b31e043d3
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Neck/Mantle/ChiefEngineer/whitecemantle.rsi/meta.json
@@ -0,0 +1,22 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "sprites by @seyriix",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "equipped-NECK",
+ "directions": 4
+ },
+ {
+ "name": "equipped-NECK-vox",
+ "directions": 4
+ }
+ ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/_Goobstation/Clothing/Neck/Mantle/capmantle.rsi/equipped-NECK-vox.png b/Resources/Textures/_Goobstation/Clothing/Neck/Mantle/capmantle.rsi/equipped-NECK-vox.png
new file mode 100644
index 00000000000..5afccfddb49
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Neck/Mantle/capmantle.rsi/equipped-NECK-vox.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Neck/Mantle/capmantle.rsi/equipped-NECK.png b/Resources/Textures/_Goobstation/Clothing/Neck/Mantle/capmantle.rsi/equipped-NECK.png
new file mode 100644
index 00000000000..e978e9b9b6e
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Neck/Mantle/capmantle.rsi/equipped-NECK.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Neck/Mantle/capmantle.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Neck/Mantle/capmantle.rsi/icon.png
new file mode 100644
index 00000000000..eee0eb60e39
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Neck/Mantle/capmantle.rsi/icon.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Neck/Mantle/capmantle.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Neck/Mantle/capmantle.rsi/meta.json
new file mode 100644
index 00000000000..568d51f1b7c
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Neck/Mantle/capmantle.rsi/meta.json
@@ -0,0 +1,22 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "main sprite by @seyriix, vox sprite by Emisse (github) for ss14 and vox sprite edited by Skarletto (github)",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "equipped-NECK",
+ "directions": 4
+ },
+ {
+ "name": "equipped-NECK-vox",
+ "directions": 4
+ }
+ ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/_Goobstation/Clothing/Neck/Mantle/cmomantle.rsi/equipped-NECK-vox.png b/Resources/Textures/_Goobstation/Clothing/Neck/Mantle/cmomantle.rsi/equipped-NECK-vox.png
new file mode 100644
index 00000000000..a84b076ad44
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Neck/Mantle/cmomantle.rsi/equipped-NECK-vox.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Neck/Mantle/cmomantle.rsi/equipped-NECK.png b/Resources/Textures/_Goobstation/Clothing/Neck/Mantle/cmomantle.rsi/equipped-NECK.png
new file mode 100644
index 00000000000..035a6a0e990
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Neck/Mantle/cmomantle.rsi/equipped-NECK.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Neck/Mantle/cmomantle.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Neck/Mantle/cmomantle.rsi/icon.png
new file mode 100644
index 00000000000..4e816fc66f8
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Neck/Mantle/cmomantle.rsi/icon.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Neck/Mantle/cmomantle.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Neck/Mantle/cmomantle.rsi/meta.json
new file mode 100644
index 00000000000..26243e9acdc
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Neck/Mantle/cmomantle.rsi/meta.json
@@ -0,0 +1,22 @@
+{
+ "version": 2,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Sprites by @seyriix, vox sprite made by emisse for ss14",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "equipped-NECK",
+ "directions": 4
+ },
+ {
+ "name": "equipped-NECK-vox",
+ "directions": 4
+ }
+ ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/_Goobstation/Clothing/Neck/Mantle/epaulettes.rsi/equipped-NECK.png b/Resources/Textures/_Goobstation/Clothing/Neck/Mantle/epaulettes.rsi/equipped-NECK.png
new file mode 100644
index 00000000000..d458a6e052f
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Neck/Mantle/epaulettes.rsi/equipped-NECK.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Neck/Mantle/epaulettes.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Neck/Mantle/epaulettes.rsi/icon.png
new file mode 100644
index 00000000000..bb81090e3b5
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Neck/Mantle/epaulettes.rsi/icon.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Neck/Mantle/epaulettes.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Neck/Mantle/epaulettes.rsi/meta.json
new file mode 100644
index 00000000000..9c41ab18323
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Neck/Mantle/epaulettes.rsi/meta.json
@@ -0,0 +1,18 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "sprites by @seyriix",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "equipped-NECK",
+ "directions": 4
+ }
+ ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/_Goobstation/Clothing/Neck/Mantle/hopmantle.rsi/equipped-NECK-vox.png b/Resources/Textures/_Goobstation/Clothing/Neck/Mantle/hopmantle.rsi/equipped-NECK-vox.png
new file mode 100644
index 00000000000..687d147bab4
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Neck/Mantle/hopmantle.rsi/equipped-NECK-vox.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Neck/Mantle/hopmantle.rsi/equipped-NECK.png b/Resources/Textures/_Goobstation/Clothing/Neck/Mantle/hopmantle.rsi/equipped-NECK.png
new file mode 100644
index 00000000000..3a05f03cef2
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Neck/Mantle/hopmantle.rsi/equipped-NECK.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Neck/Mantle/hopmantle.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Neck/Mantle/hopmantle.rsi/icon.png
new file mode 100644
index 00000000000..c51babd7a28
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Neck/Mantle/hopmantle.rsi/icon.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Neck/Mantle/hopmantle.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Neck/Mantle/hopmantle.rsi/meta.json
new file mode 100644
index 00000000000..66142e112a3
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Neck/Mantle/hopmantle.rsi/meta.json
@@ -0,0 +1,22 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "made by emisse for ss14",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "equipped-NECK",
+ "directions": 4
+ },
+ {
+ "name": "equipped-NECK-vox",
+ "directions": 4
+ }
+ ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/_Goobstation/Clothing/Neck/Mantle/hosmantle.rsi/equipped-NECK-vox.png b/Resources/Textures/_Goobstation/Clothing/Neck/Mantle/hosmantle.rsi/equipped-NECK-vox.png
new file mode 100644
index 00000000000..3d6959c4df5
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Neck/Mantle/hosmantle.rsi/equipped-NECK-vox.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Neck/Mantle/hosmantle.rsi/equipped-NECK.png b/Resources/Textures/_Goobstation/Clothing/Neck/Mantle/hosmantle.rsi/equipped-NECK.png
new file mode 100644
index 00000000000..78d8d80402b
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Neck/Mantle/hosmantle.rsi/equipped-NECK.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Neck/Mantle/hosmantle.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Neck/Mantle/hosmantle.rsi/icon.png
new file mode 100644
index 00000000000..6f183b7e1bf
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Neck/Mantle/hosmantle.rsi/icon.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Neck/Mantle/hosmantle.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Neck/Mantle/hosmantle.rsi/meta.json
new file mode 100644
index 00000000000..66142e112a3
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Neck/Mantle/hosmantle.rsi/meta.json
@@ -0,0 +1,22 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "made by emisse for ss14",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "equipped-NECK",
+ "directions": 4
+ },
+ {
+ "name": "equipped-NECK-vox",
+ "directions": 4
+ }
+ ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/_Goobstation/Clothing/Neck/Mantle/qmmantle.rsi/equipped-NECK-vox.png b/Resources/Textures/_Goobstation/Clothing/Neck/Mantle/qmmantle.rsi/equipped-NECK-vox.png
new file mode 100644
index 00000000000..0c5ce7464da
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Neck/Mantle/qmmantle.rsi/equipped-NECK-vox.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Neck/Mantle/qmmantle.rsi/equipped-NECK.png b/Resources/Textures/_Goobstation/Clothing/Neck/Mantle/qmmantle.rsi/equipped-NECK.png
new file mode 100644
index 00000000000..32da7e39d0b
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Neck/Mantle/qmmantle.rsi/equipped-NECK.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Neck/Mantle/qmmantle.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Neck/Mantle/qmmantle.rsi/icon.png
new file mode 100644
index 00000000000..9f5319f2990
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Neck/Mantle/qmmantle.rsi/icon.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Neck/Mantle/qmmantle.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Neck/Mantle/qmmantle.rsi/meta.json
new file mode 100644
index 00000000000..356ecf8bc99
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Neck/Mantle/qmmantle.rsi/meta.json
@@ -0,0 +1,22 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "drawn by Ubaser, edited by @seyriix",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "equipped-NECK",
+ "directions": 4
+ },
+ {
+ "name": "equipped-NECK-vox",
+ "directions": 4
+ }
+ ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/_Goobstation/Clothing/Neck/Mantle/rdmantle.rsi/equipped-NECK-vox.png b/Resources/Textures/_Goobstation/Clothing/Neck/Mantle/rdmantle.rsi/equipped-NECK-vox.png
new file mode 100644
index 00000000000..6c4171211a8
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Neck/Mantle/rdmantle.rsi/equipped-NECK-vox.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Neck/Mantle/rdmantle.rsi/equipped-NECK.png b/Resources/Textures/_Goobstation/Clothing/Neck/Mantle/rdmantle.rsi/equipped-NECK.png
new file mode 100644
index 00000000000..e23bc7a2232
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Neck/Mantle/rdmantle.rsi/equipped-NECK.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Neck/Mantle/rdmantle.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Neck/Mantle/rdmantle.rsi/icon.png
new file mode 100644
index 00000000000..ef267430b31
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Neck/Mantle/rdmantle.rsi/icon.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Neck/Mantle/rdmantle.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Neck/Mantle/rdmantle.rsi/meta.json
new file mode 100644
index 00000000000..5105f87d729
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Neck/Mantle/rdmantle.rsi/meta.json
@@ -0,0 +1,22 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Sprites by @seyriix, vox sprite made by emisse for ss14",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "equipped-NECK",
+ "directions": 4
+ },
+ {
+ "name": "equipped-NECK-vox",
+ "directions": 4
+ }
+ ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/_Goobstation/Clothing/Neck/Mantle/veteran_security.rsi/equipped-NECK.png b/Resources/Textures/_Goobstation/Clothing/Neck/Mantle/veteran_security.rsi/equipped-NECK.png
new file mode 100644
index 00000000000..f644673dba5
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Neck/Mantle/veteran_security.rsi/equipped-NECK.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Neck/Mantle/veteran_security.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Neck/Mantle/veteran_security.rsi/icon.png
new file mode 100644
index 00000000000..e7d9c2a58fd
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Neck/Mantle/veteran_security.rsi/icon.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Neck/Mantle/veteran_security.rsi/inhand-left.png b/Resources/Textures/_Goobstation/Clothing/Neck/Mantle/veteran_security.rsi/inhand-left.png
new file mode 100644
index 00000000000..e272091a66d
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Neck/Mantle/veteran_security.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Neck/Mantle/veteran_security.rsi/inhand-right.png b/Resources/Textures/_Goobstation/Clothing/Neck/Mantle/veteran_security.rsi/inhand-right.png
new file mode 100644
index 00000000000..2358db17fdc
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Neck/Mantle/veteran_security.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Neck/Mantle/veteran_security.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Neck/Mantle/veteran_security.rsi/meta.json
new file mode 100644
index 00000000000..eacbee9ed56
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Neck/Mantle/veteran_security.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Made by Vlagded (Telegram) ",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "equipped-NECK",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/OuterClothing/Armor/captain_jacket.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/OuterClothing/Armor/captain_jacket.rsi/equipped-OUTERCLOTHING.png
index 131cc6da3b7..d8fca457726 100644
Binary files a/Resources/Textures/_Goobstation/Clothing/OuterClothing/Armor/captain_jacket.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/_Goobstation/Clothing/OuterClothing/Armor/captain_jacket.rsi/equipped-OUTERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/OuterClothing/Coats/centcom_ike.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/OuterClothing/Coats/centcom_ike.rsi/equipped-OUTERCLOTHING.png
new file mode 100644
index 00000000000..bdc3975f4df
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/OuterClothing/Coats/centcom_ike.rsi/equipped-OUTERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/OuterClothing/Coats/centcom_ike.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/OuterClothing/Coats/centcom_ike.rsi/icon.png
new file mode 100644
index 00000000000..db0b72f29c6
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/OuterClothing/Coats/centcom_ike.rsi/icon.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/OuterClothing/Coats/centcom_ike.rsi/inhand-left.png b/Resources/Textures/_Goobstation/Clothing/OuterClothing/Coats/centcom_ike.rsi/inhand-left.png
new file mode 100644
index 00000000000..4d43e410aa8
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/OuterClothing/Coats/centcom_ike.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/OuterClothing/Coats/centcom_ike.rsi/inhand-right.png b/Resources/Textures/_Goobstation/Clothing/OuterClothing/Coats/centcom_ike.rsi/inhand-right.png
new file mode 100644
index 00000000000..e65bcd33540
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/OuterClothing/Coats/centcom_ike.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/OuterClothing/Coats/centcom_ike.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/OuterClothing/Coats/centcom_ike.rsi/meta.json
new file mode 100644
index 00000000000..b4fe949d841
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/OuterClothing/Coats/centcom_ike.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Sprites by @seyriix, in-hand sprites by PuroSlavKing (Github) and RudeyCoolLeet#3875",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "equipped-OUTERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/OuterClothing/Coats/centcommjacket.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/OuterClothing/Coats/centcommjacket.rsi/equipped-OUTERCLOTHING.png
new file mode 100644
index 00000000000..6fb9331f30a
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/OuterClothing/Coats/centcommjacket.rsi/equipped-OUTERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/OuterClothing/Coats/centcommjacket.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/OuterClothing/Coats/centcommjacket.rsi/icon.png
new file mode 100644
index 00000000000..29be3df71d6
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/OuterClothing/Coats/centcommjacket.rsi/icon.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/OuterClothing/Coats/centcommjacket.rsi/inhand-left.png b/Resources/Textures/_Goobstation/Clothing/OuterClothing/Coats/centcommjacket.rsi/inhand-left.png
new file mode 100644
index 00000000000..7d251bbca40
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/OuterClothing/Coats/centcommjacket.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/OuterClothing/Coats/centcommjacket.rsi/inhand-right.png b/Resources/Textures/_Goobstation/Clothing/OuterClothing/Coats/centcommjacket.rsi/inhand-right.png
new file mode 100644
index 00000000000..b7d6b688c77
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/OuterClothing/Coats/centcommjacket.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/OuterClothing/Coats/centcommjacket.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/OuterClothing/Coats/centcommjacket.rsi/meta.json
new file mode 100644
index 00000000000..72998574f92
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/OuterClothing/Coats/centcommjacket.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+ "version": 1,
+ "license": "CC-BY-NC-SA-4.0",
+ "copyright": "sprites by @seyriix",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ },
+ {
+ "name": "equipped-OUTERCLOTHING",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/OuterClothing/Modsuits/captain.rsi/chestplate-sealed.png b/Resources/Textures/_Goobstation/Clothing/OuterClothing/Modsuits/captain.rsi/chestplate-sealed.png
index c10eb685e8a..da63a31577e 100644
Binary files a/Resources/Textures/_Goobstation/Clothing/OuterClothing/Modsuits/captain.rsi/chestplate-sealed.png and b/Resources/Textures/_Goobstation/Clothing/OuterClothing/Modsuits/captain.rsi/chestplate-sealed.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/OuterClothing/Modsuits/captain.rsi/chestplate.png b/Resources/Textures/_Goobstation/Clothing/OuterClothing/Modsuits/captain.rsi/chestplate.png
index 16a84ce7fea..926757f25e4 100644
Binary files a/Resources/Textures/_Goobstation/Clothing/OuterClothing/Modsuits/captain.rsi/chestplate.png and b/Resources/Textures/_Goobstation/Clothing/OuterClothing/Modsuits/captain.rsi/chestplate.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/OuterClothing/Modsuits/captain.rsi/equipped-OUTERCLOTHING-sealed-vox.png b/Resources/Textures/_Goobstation/Clothing/OuterClothing/Modsuits/captain.rsi/equipped-OUTERCLOTHING-sealed-vox.png
index 6ec4c8d6144..666d5a7f139 100644
Binary files a/Resources/Textures/_Goobstation/Clothing/OuterClothing/Modsuits/captain.rsi/equipped-OUTERCLOTHING-sealed-vox.png and b/Resources/Textures/_Goobstation/Clothing/OuterClothing/Modsuits/captain.rsi/equipped-OUTERCLOTHING-sealed-vox.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/OuterClothing/Modsuits/captain.rsi/equipped-OUTERCLOTHING-sealed.png b/Resources/Textures/_Goobstation/Clothing/OuterClothing/Modsuits/captain.rsi/equipped-OUTERCLOTHING-sealed.png
index 5ca5f835ddc..63077a2da0b 100644
Binary files a/Resources/Textures/_Goobstation/Clothing/OuterClothing/Modsuits/captain.rsi/equipped-OUTERCLOTHING-sealed.png and b/Resources/Textures/_Goobstation/Clothing/OuterClothing/Modsuits/captain.rsi/equipped-OUTERCLOTHING-sealed.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/OuterClothing/Modsuits/captain.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/_Goobstation/Clothing/OuterClothing/Modsuits/captain.rsi/equipped-OUTERCLOTHING-vox.png
index 8bc09b889d7..4021475cb1b 100644
Binary files a/Resources/Textures/_Goobstation/Clothing/OuterClothing/Modsuits/captain.rsi/equipped-OUTERCLOTHING-vox.png and b/Resources/Textures/_Goobstation/Clothing/OuterClothing/Modsuits/captain.rsi/equipped-OUTERCLOTHING-vox.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/OuterClothing/Modsuits/captain.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/OuterClothing/Modsuits/captain.rsi/equipped-OUTERCLOTHING.png
index be4efa9d5a7..ed22b45760f 100644
Binary files a/Resources/Textures/_Goobstation/Clothing/OuterClothing/Modsuits/captain.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/_Goobstation/Clothing/OuterClothing/Modsuits/captain.rsi/equipped-OUTERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/OuterClothing/Wintercoats/cap_armored_winter_coat.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/_Goobstation/Clothing/OuterClothing/Wintercoats/cap_armored_winter_coat.rsi/equipped-OUTERCLOTHING-vox.png
index 758c8df068a..07a98e9ac34 100644
Binary files a/Resources/Textures/_Goobstation/Clothing/OuterClothing/Wintercoats/cap_armored_winter_coat.rsi/equipped-OUTERCLOTHING-vox.png and b/Resources/Textures/_Goobstation/Clothing/OuterClothing/Wintercoats/cap_armored_winter_coat.rsi/equipped-OUTERCLOTHING-vox.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/OuterClothing/Wintercoats/cap_armored_winter_coat.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/OuterClothing/Wintercoats/cap_armored_winter_coat.rsi/equipped-OUTERCLOTHING.png
index d8a254e1530..c691a79f111 100644
Binary files a/Resources/Textures/_Goobstation/Clothing/OuterClothing/Wintercoats/cap_armored_winter_coat.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/_Goobstation/Clothing/OuterClothing/Wintercoats/cap_armored_winter_coat.rsi/equipped-OUTERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/OuterClothing/Wintercoats/cap_armored_winter_coat.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/OuterClothing/Wintercoats/cap_armored_winter_coat.rsi/icon.png
index e97782afacf..b8b12c648e6 100644
Binary files a/Resources/Textures/_Goobstation/Clothing/OuterClothing/Wintercoats/cap_armored_winter_coat.rsi/icon.png and b/Resources/Textures/_Goobstation/Clothing/OuterClothing/Wintercoats/cap_armored_winter_coat.rsi/icon.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/OuterClothing/Wintercoats/cap_armored_winter_coat.rsi/inhand-left.png b/Resources/Textures/_Goobstation/Clothing/OuterClothing/Wintercoats/cap_armored_winter_coat.rsi/inhand-left.png
index 94e19229b52..6b8e01f59b1 100644
Binary files a/Resources/Textures/_Goobstation/Clothing/OuterClothing/Wintercoats/cap_armored_winter_coat.rsi/inhand-left.png and b/Resources/Textures/_Goobstation/Clothing/OuterClothing/Wintercoats/cap_armored_winter_coat.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/OuterClothing/Wintercoats/cap_armored_winter_coat.rsi/inhand-right.png b/Resources/Textures/_Goobstation/Clothing/OuterClothing/Wintercoats/cap_armored_winter_coat.rsi/inhand-right.png
index 360011e431d..b1246773072 100644
Binary files a/Resources/Textures/_Goobstation/Clothing/OuterClothing/Wintercoats/cap_armored_winter_coat.rsi/inhand-right.png and b/Resources/Textures/_Goobstation/Clothing/OuterClothing/Wintercoats/cap_armored_winter_coat.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Shoes/Boots/winterbootscargo.rsi/equipped-FEET.png b/Resources/Textures/_Goobstation/Clothing/Shoes/Boots/winterbootscargo.rsi/equipped-FEET.png
new file mode 100644
index 00000000000..bc400e670df
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Shoes/Boots/winterbootscargo.rsi/equipped-FEET.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Shoes/Boots/winterbootscargo.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Shoes/Boots/winterbootscargo.rsi/icon.png
new file mode 100644
index 00000000000..f7acb14800f
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Shoes/Boots/winterbootscargo.rsi/icon.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Shoes/Boots/winterbootscargo.rsi/inhand-left.png b/Resources/Textures/_Goobstation/Clothing/Shoes/Boots/winterbootscargo.rsi/inhand-left.png
new file mode 100644
index 00000000000..573d3bef75b
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Shoes/Boots/winterbootscargo.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Shoes/Boots/winterbootscargo.rsi/inhand-right.png b/Resources/Textures/_Goobstation/Clothing/Shoes/Boots/winterbootscargo.rsi/inhand-right.png
new file mode 100644
index 00000000000..e74e1931112
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Shoes/Boots/winterbootscargo.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Shoes/Boots/winterbootscargo.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Shoes/Boots/winterbootscargo.rsi/meta.json
new file mode 100644
index 00000000000..5ec9543b20e
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Shoes/Boots/winterbootscargo.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Sprited by @mishutka09, fix digi sprites by DreamlyJack, Recolor by Jvne" ,
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "equipped-FEET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Shoes/Modsuits/captain.rsi/boots-sealed.png b/Resources/Textures/_Goobstation/Clothing/Shoes/Modsuits/captain.rsi/boots-sealed.png
index be1caef30cf..94b66048293 100644
Binary files a/Resources/Textures/_Goobstation/Clothing/Shoes/Modsuits/captain.rsi/boots-sealed.png and b/Resources/Textures/_Goobstation/Clothing/Shoes/Modsuits/captain.rsi/boots-sealed.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Shoes/Modsuits/captain.rsi/boots.png b/Resources/Textures/_Goobstation/Clothing/Shoes/Modsuits/captain.rsi/boots.png
index 55f3c7b30a3..179e32477e2 100644
Binary files a/Resources/Textures/_Goobstation/Clothing/Shoes/Modsuits/captain.rsi/boots.png and b/Resources/Textures/_Goobstation/Clothing/Shoes/Modsuits/captain.rsi/boots.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Shoes/Modsuits/captain.rsi/equipped-FEET-sealed-vox.png b/Resources/Textures/_Goobstation/Clothing/Shoes/Modsuits/captain.rsi/equipped-FEET-sealed-vox.png
index 398edd848f6..6e6f50fa0c2 100644
Binary files a/Resources/Textures/_Goobstation/Clothing/Shoes/Modsuits/captain.rsi/equipped-FEET-sealed-vox.png and b/Resources/Textures/_Goobstation/Clothing/Shoes/Modsuits/captain.rsi/equipped-FEET-sealed-vox.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Shoes/Modsuits/captain.rsi/equipped-FEET-sealed.png b/Resources/Textures/_Goobstation/Clothing/Shoes/Modsuits/captain.rsi/equipped-FEET-sealed.png
index 07c70cd28c4..8eff77e2ff4 100644
Binary files a/Resources/Textures/_Goobstation/Clothing/Shoes/Modsuits/captain.rsi/equipped-FEET-sealed.png and b/Resources/Textures/_Goobstation/Clothing/Shoes/Modsuits/captain.rsi/equipped-FEET-sealed.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Shoes/Modsuits/captain.rsi/equipped-FEET-vox.png b/Resources/Textures/_Goobstation/Clothing/Shoes/Modsuits/captain.rsi/equipped-FEET-vox.png
index f4b5615c3b8..f57dd1142ce 100644
Binary files a/Resources/Textures/_Goobstation/Clothing/Shoes/Modsuits/captain.rsi/equipped-FEET-vox.png and b/Resources/Textures/_Goobstation/Clothing/Shoes/Modsuits/captain.rsi/equipped-FEET-vox.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Shoes/Modsuits/captain.rsi/equipped-FEET.png b/Resources/Textures/_Goobstation/Clothing/Shoes/Modsuits/captain.rsi/equipped-FEET.png
index 962e516dcb7..92a2f919b3b 100644
Binary files a/Resources/Textures/_Goobstation/Clothing/Shoes/Modsuits/captain.rsi/equipped-FEET.png and b/Resources/Textures/_Goobstation/Clothing/Shoes/Modsuits/captain.rsi/equipped-FEET.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Cargo/cargotech.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Cargo/cargotech.rsi/equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..328dba17ebc
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Cargo/cargotech.rsi/equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Cargo/cargotech.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Cargo/cargotech.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..a4c1f82640a
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Cargo/cargotech.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Cargo/cargotech.rsi/folded-equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Cargo/cargotech.rsi/folded-equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..328dba17ebc
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Cargo/cargotech.rsi/folded-equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Cargo/cargotech.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Cargo/cargotech.rsi/folded-equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..84b5c2610ae
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Cargo/cargotech.rsi/folded-equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Cargo/cargotech.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Cargo/cargotech.rsi/icon.png
new file mode 100644
index 00000000000..d53cda86de6
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Cargo/cargotech.rsi/icon.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Cargo/cargotech.rsi/inhand-left.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Cargo/cargotech.rsi/inhand-left.png
new file mode 100644
index 00000000000..265b1f6f8bd
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Cargo/cargotech.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Cargo/cargotech.rsi/inhand-right.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Cargo/cargotech.rsi/inhand-right.png
new file mode 100644
index 00000000000..8e272ea03a8
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Cargo/cargotech.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Cargo/cargotech.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Cargo/cargotech.rsi/meta.json
new file mode 100644
index 00000000000..288dca2bc76
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Cargo/cargotech.rsi/meta.json
@@ -0,0 +1,38 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from paradise at commit https://github.com/ParadiseSS13/Paradise/commit/207695cbdab4cb8f81a25cdbb201a88a6851d78b , In hand sprite scaled down by potato1234_x, monkey made by SonicHDC (github) for ss14",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/mailman.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Cargo/mailman.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/mailman.rsi/equipped-INNERCLOTHING.png
rename to Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Cargo/mailman.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/mailman.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Cargo/mailman.rsi/icon.png
similarity index 100%
rename from Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/mailman.rsi/icon.png
rename to Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Cargo/mailman.rsi/icon.png
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/mailman.rsi/inhand-left.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Cargo/mailman.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/mailman.rsi/inhand-left.png
rename to Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Cargo/mailman.rsi/inhand-left.png
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/mailman.rsi/inhand-right.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Cargo/mailman.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/mailman.rsi/inhand-right.png
rename to Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Cargo/mailman.rsi/inhand-right.png
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/mailman.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Cargo/mailman.rsi/meta.json
similarity index 100%
rename from Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/mailman.rsi/meta.json
rename to Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Cargo/mailman.rsi/meta.json
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Cargo/qm.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Cargo/qm.rsi/equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..176108f3e00
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Cargo/qm.rsi/equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Cargo/qm.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Cargo/qm.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..1b3dc8b71c1
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Cargo/qm.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Cargo/qm.rsi/folded-equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Cargo/qm.rsi/folded-equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..176108f3e00
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Cargo/qm.rsi/folded-equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Cargo/qm.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Cargo/qm.rsi/folded-equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..5da02a5e890
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Cargo/qm.rsi/folded-equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Cargo/qm.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Cargo/qm.rsi/icon.png
new file mode 100644
index 00000000000..8b1f68b6221
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Cargo/qm.rsi/icon.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Cargo/qm.rsi/inhand-left.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Cargo/qm.rsi/inhand-left.png
new file mode 100644
index 00000000000..265b1f6f8bd
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Cargo/qm.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Cargo/qm.rsi/inhand-right.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Cargo/qm.rsi/inhand-right.png
new file mode 100644
index 00000000000..8e272ea03a8
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Cargo/qm.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Cargo/qm.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Cargo/qm.rsi/meta.json
new file mode 100644
index 00000000000..cf8d07947a2
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Cargo/qm.rsi/meta.json
@@ -0,0 +1,38 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from paradise at commit https://github.com/ParadiseSS13/Paradise/commit/207695cbdab4cb8f81a25cdbb201a88a6851d78b , In hand sprite scaled down by potato1234_x, monkey made by SonicHDC (github) for ss14",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Cargo/qmturtleskirt.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Cargo/qmturtleskirt.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..b8df4fb3edd
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Cargo/qmturtleskirt.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Cargo/qmturtleskirt.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Cargo/qmturtleskirt.rsi/folded-equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..795f7e59c9d
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Cargo/qmturtleskirt.rsi/folded-equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Cargo/qmturtleskirt.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Cargo/qmturtleskirt.rsi/icon.png
new file mode 100644
index 00000000000..74e412ff0bf
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Cargo/qmturtleskirt.rsi/icon.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Cargo/qmturtleskirt.rsi/inhand-left.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Cargo/qmturtleskirt.rsi/inhand-left.png
new file mode 100644
index 00000000000..265b1f6f8bd
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Cargo/qmturtleskirt.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Cargo/qmturtleskirt.rsi/inhand-right.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Cargo/qmturtleskirt.rsi/inhand-right.png
new file mode 100644
index 00000000000..8e272ea03a8
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Cargo/qmturtleskirt.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Cargo/qmturtleskirt.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Cargo/qmturtleskirt.rsi/meta.json
new file mode 100644
index 00000000000..f472914cbf1
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Cargo/qmturtleskirt.rsi/meta.json
@@ -0,0 +1,30 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from paradise at commit https://github.com/ParadiseSS13/Paradise/commit/207695cbdab4cb8f81a25cdbb201a88a6851d78b , In hand sprite scaled down by potato1234_x, monkey made by SonicHDC (github) for ss14",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Cargo/salvage.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Cargo/salvage.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..fc746228f87
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Cargo/salvage.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Cargo/salvage.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Cargo/salvage.rsi/icon.png
new file mode 100644
index 00000000000..aa35066447d
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Cargo/salvage.rsi/icon.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Cargo/salvage.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Cargo/salvage.rsi/meta.json
new file mode 100644
index 00000000000..91b3bda4e3d
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Cargo/salvage.rsi/meta.json
@@ -0,0 +1,18 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from paradise at commit https://github.com/ParadiseSS13/Paradise/commit/207695cbdab4cb8f81a25cdbb201a88a6851d78b , In hand sprite scaled down by potato1234_x, monkey made by SonicHDC (github) for ss14",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Lavaland/Clothing/Uniforms/Jumpsuit/shaft_miner.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Cargo/shaft_miner.rsi/equipped-INNERCLOTHING-monkey.png
similarity index 100%
rename from Resources/Textures/_Lavaland/Clothing/Uniforms/Jumpsuit/shaft_miner.rsi/equipped-INNERCLOTHING-monkey.png
rename to Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Cargo/shaft_miner.rsi/equipped-INNERCLOTHING-monkey.png
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Cargo/shaft_miner.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Cargo/shaft_miner.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..435d91cd801
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Cargo/shaft_miner.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Cargo/shaft_miner.rsi/folded-equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Cargo/shaft_miner.rsi/folded-equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..49970c3495f
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Cargo/shaft_miner.rsi/folded-equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Cargo/shaft_miner.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Cargo/shaft_miner.rsi/folded-equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..d435e81168c
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Cargo/shaft_miner.rsi/folded-equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Cargo/shaft_miner.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Cargo/shaft_miner.rsi/icon.png
new file mode 100644
index 00000000000..ccb3493cd00
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Cargo/shaft_miner.rsi/icon.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Cargo/shaft_miner.rsi/inhand-left.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Cargo/shaft_miner.rsi/inhand-left.png
new file mode 100644
index 00000000000..d456f94f0f8
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Cargo/shaft_miner.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Cargo/shaft_miner.rsi/inhand-right.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Cargo/shaft_miner.rsi/inhand-right.png
new file mode 100644
index 00000000000..24602b7b37c
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Cargo/shaft_miner.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Cargo/shaft_miner.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Cargo/shaft_miner.rsi/meta.json
new file mode 100644
index 00000000000..cf8d07947a2
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Cargo/shaft_miner.rsi/meta.json
@@ -0,0 +1,38 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from paradise at commit https://github.com/ParadiseSS13/Paradise/commit/207695cbdab4cb8f81a25cdbb201a88a6851d78b , In hand sprite scaled down by potato1234_x, monkey made by SonicHDC (github) for ss14",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/centcom_agent.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Centcom/centcom_agent.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/centcom_agent.rsi/equipped-INNERCLOTHING.png
rename to Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Centcom/centcom_agent.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/centcom_agent.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Centcom/centcom_agent.rsi/icon.png
similarity index 100%
rename from Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/centcom_agent.rsi/icon.png
rename to Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Centcom/centcom_agent.rsi/icon.png
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/centcom_agent.rsi/inhand-left.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Centcom/centcom_agent.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/centcom_agent.rsi/inhand-left.png
rename to Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Centcom/centcom_agent.rsi/inhand-left.png
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/centcom_agent.rsi/inhand-right.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Centcom/centcom_agent.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/centcom_agent.rsi/inhand-right.png
rename to Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Centcom/centcom_agent.rsi/inhand-right.png
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/centcom_agent.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Centcom/centcom_agent.rsi/meta.json
similarity index 100%
rename from Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/centcom_agent.rsi/meta.json
rename to Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Centcom/centcom_agent.rsi/meta.json
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Centcom/centcomm_pencilskirt.rsi/equipped-INNERCLOTHING-vox.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Centcom/centcomm_pencilskirt.rsi/equipped-INNERCLOTHING-vox.png
new file mode 100644
index 00000000000..221612114b7
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Centcom/centcomm_pencilskirt.rsi/equipped-INNERCLOTHING-vox.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Centcom/centcomm_pencilskirt.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Centcom/centcomm_pencilskirt.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..41011334ceb
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Centcom/centcomm_pencilskirt.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Centcom/centcomm_pencilskirt.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Centcom/centcomm_pencilskirt.rsi/icon.png
new file mode 100644
index 00000000000..97d30bc8a1b
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Centcom/centcomm_pencilskirt.rsi/icon.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Centcom/centcomm_pencilskirt.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Centcom/centcomm_pencilskirt.rsi/meta.json
new file mode 100644
index 00000000000..a8de98311ab
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Centcom/centcomm_pencilskirt.rsi/meta.json
@@ -0,0 +1,22 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "sprited by @seyriix",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "equipped-INNERCLOTHING-vox",
+ "directions": 4
+ }
+ ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/nanotrasen_representative.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Centcom/nanotrasen_representative.rsi/equipped-INNERCLOTHING-monkey.png
similarity index 100%
rename from Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/nanotrasen_representative.rsi/equipped-INNERCLOTHING-monkey.png
rename to Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Centcom/nanotrasen_representative.rsi/equipped-INNERCLOTHING-monkey.png
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/nanotrasen_representative.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Centcom/nanotrasen_representative.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/nanotrasen_representative.rsi/equipped-INNERCLOTHING.png
rename to Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Centcom/nanotrasen_representative.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/nanotrasen_representative.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Centcom/nanotrasen_representative.rsi/icon.png
similarity index 100%
rename from Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/nanotrasen_representative.rsi/icon.png
rename to Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Centcom/nanotrasen_representative.rsi/icon.png
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/nanotrasen_representative.rsi/inhand-left.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Centcom/nanotrasen_representative.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/nanotrasen_representative.rsi/inhand-left.png
rename to Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Centcom/nanotrasen_representative.rsi/inhand-left.png
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/nanotrasen_representative.rsi/inhand-right.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Centcom/nanotrasen_representative.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/nanotrasen_representative.rsi/inhand-right.png
rename to Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Centcom/nanotrasen_representative.rsi/inhand-right.png
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/nanotrasen_representative.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Centcom/nanotrasen_representative.rsi/meta.json
similarity index 100%
rename from Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/nanotrasen_representative.rsi/meta.json
rename to Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Centcom/nanotrasen_representative.rsi/meta.json
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/captain.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/captain.rsi/equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..a49fbd18d0f
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/captain.rsi/equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/captain.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/captain.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..032be6c35fc
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/captain.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/captain.rsi/folded-equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/captain.rsi/folded-equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..a49fbd18d0f
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/captain.rsi/folded-equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/captain.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/captain.rsi/folded-equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..b5c43fd94fc
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/captain.rsi/folded-equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/captain.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/captain.rsi/icon.png
new file mode 100644
index 00000000000..2575dc3ac1c
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/captain.rsi/icon.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/captain.rsi/inhand-left.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/captain.rsi/inhand-left.png
new file mode 100644
index 00000000000..45020687309
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/captain.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/captain.rsi/inhand-right.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/captain.rsi/inhand-right.png
new file mode 100644
index 00000000000..f6bcc2b1437
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/captain.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/captain.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/captain.rsi/meta.json
new file mode 100644
index 00000000000..a7703187da7
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/captain.rsi/meta.json
@@ -0,0 +1,38 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "monkey derivative derived by brainfood1183 (github) for ss14 from tgstation at commit https://github.com/tgstation/tgstation/commit/dd97a0e45d904fffadd9d2caad22aedd0d09f3ab then edited by Skarletto (github) and Ghagliiarghii (github). Other sprites taken from tgstation at https://github.com/tgstation/tgstation/pull/69842/commits/d8138946b0ed06fced522729ac8eaa0596864329 and edited by Skarletto (github), edited by Emisse for ss14",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/hop.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/hop.rsi/equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..d554bbb6561
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/hop.rsi/equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/hop.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/hop.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..3359a44239e
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/hop.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/hop.rsi/folded-equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/hop.rsi/folded-equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..d554bbb6561
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/hop.rsi/folded-equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/hop.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/hop.rsi/folded-equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..1191bc35b3b
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/hop.rsi/folded-equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/hop.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/hop.rsi/icon.png
new file mode 100644
index 00000000000..d9e02bac63e
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/hop.rsi/icon.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/hop.rsi/inhand-left.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/hop.rsi/inhand-left.png
new file mode 100644
index 00000000000..1328f0e2203
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/hop.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/hop.rsi/inhand-right.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/hop.rsi/inhand-right.png
new file mode 100644
index 00000000000..b2998354a75
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/hop.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/hop.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/hop.rsi/meta.json
new file mode 100644
index 00000000000..c8aa1606f78
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/hop.rsi/meta.json
@@ -0,0 +1,38 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey derivative made by brainfood1183 (github) for ss14",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/hydro.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/hydro.rsi/equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..26e322a8447
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/hydro.rsi/equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/hydro.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/hydro.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..31e526f0970
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/hydro.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/hydro.rsi/folded-equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/hydro.rsi/folded-equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..26e322a8447
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/hydro.rsi/folded-equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/hydro.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/hydro.rsi/folded-equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..1817f5eeac8
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/hydro.rsi/folded-equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/hydro.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/hydro.rsi/icon.png
new file mode 100644
index 00000000000..52022a8dde7
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/hydro.rsi/icon.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/hydro.rsi/inhand-left.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/hydro.rsi/inhand-left.png
new file mode 100644
index 00000000000..34e4c4b3c1e
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/hydro.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/hydro.rsi/inhand-right.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/hydro.rsi/inhand-right.png
new file mode 100644
index 00000000000..a9ba861650e
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/hydro.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/hydro.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/hydro.rsi/meta.json
new file mode 100644
index 00000000000..c8aa1606f78
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/hydro.rsi/meta.json
@@ -0,0 +1,38 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey derivative made by brainfood1183 (github) for ss14",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/janitor.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/janitor.rsi/equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..dd34047b306
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/janitor.rsi/equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/janitor.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/janitor.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..88bbd843978
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/janitor.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/janitor.rsi/folded-equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/janitor.rsi/folded-equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..dd34047b306
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/janitor.rsi/folded-equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/janitor.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/janitor.rsi/folded-equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..9117585083e
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/janitor.rsi/folded-equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/janitor.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/janitor.rsi/icon.png
new file mode 100644
index 00000000000..b0144410741
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/janitor.rsi/icon.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/janitor.rsi/inhand-left.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/janitor.rsi/inhand-left.png
new file mode 100644
index 00000000000..333d7bae8d3
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/janitor.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/janitor.rsi/inhand-right.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/janitor.rsi/inhand-right.png
new file mode 100644
index 00000000000..5db9b849d47
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/janitor.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/janitor.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/janitor.rsi/meta.json
new file mode 100644
index 00000000000..6771695f977
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/janitor.rsi/meta.json
@@ -0,0 +1,38 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039, monkey derivative made by brainfood1183 (github) for ss14",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/mime.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/mime.rsi/equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..41ae7beb1cc
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/mime.rsi/equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/mime.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/mime.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..074f5eb50cc
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/mime.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/mime.rsi/folded-equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/mime.rsi/folded-equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..41ae7beb1cc
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/mime.rsi/folded-equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/mime.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/mime.rsi/folded-equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..12670911863
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/mime.rsi/folded-equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/mime.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/mime.rsi/icon.png
new file mode 100644
index 00000000000..f86b2ad0e64
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/mime.rsi/icon.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/mime.rsi/inhand-left.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/mime.rsi/inhand-left.png
new file mode 100644
index 00000000000..dccaf261df1
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/mime.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/mime.rsi/inhand-right.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/mime.rsi/inhand-right.png
new file mode 100644
index 00000000000..770188d6f1f
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/mime.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/mime.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/mime.rsi/meta.json
new file mode 100644
index 00000000000..67346884b77
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/mime.rsi/meta.json
@@ -0,0 +1,38 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8, monkey made by brainfood1183 (github) for ss14, Resprited by github:DreamlyJack(624946166152298517)",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/performer.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/performer.rsi/equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..f9fcc3cdc39
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/performer.rsi/equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/performer.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/performer.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..5e9d6585467
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/performer.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/performer.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/performer.rsi/icon.png
new file mode 100644
index 00000000000..55b1b73ecf2
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/performer.rsi/icon.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/performer.rsi/inhand-left.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/performer.rsi/inhand-left.png
new file mode 100644
index 00000000000..c772cdb27d8
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/performer.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/performer.rsi/inhand-right.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/performer.rsi/inhand-right.png
new file mode 100644
index 00000000000..90eacc81a8a
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/performer.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/performer.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/performer.rsi/meta.json
new file mode 100644
index 00000000000..1143276ea0f
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/performer.rsi/meta.json
@@ -0,0 +1,30 @@
+{
+ "version": 1,
+ "license": "CC-BY-NC-3.0",
+ "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a. This sprite features an adaptation of Hatsune Miku, © Crypton Future Media, Inc. 2007, licensed under a CC BY-NC: https://creativecommons.org/licenses/by-nc/3.0/. In hand sprite scaled down by potato1234_x, monkey derivative made by brainfood1183 (github) for ss14",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/reporter_dress.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/reporter_dress.rsi/equipped-INNERCLOTHING-monkey.png
similarity index 100%
rename from Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/reporter_dress.rsi/equipped-INNERCLOTHING-monkey.png
rename to Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/reporter_dress.rsi/equipped-INNERCLOTHING-monkey.png
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/reporter_dress.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/reporter_dress.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/reporter_dress.rsi/equipped-INNERCLOTHING.png
rename to Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/reporter_dress.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/reporter_dress.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/reporter_dress.rsi/icon.png
similarity index 100%
rename from Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/reporter_dress.rsi/icon.png
rename to Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/reporter_dress.rsi/icon.png
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/reporter_dress.rsi/inhand-left.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/reporter_dress.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/reporter_dress.rsi/inhand-left.png
rename to Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/reporter_dress.rsi/inhand-left.png
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/reporter_dress.rsi/inhand-right.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/reporter_dress.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/reporter_dress.rsi/inhand-right.png
rename to Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/reporter_dress.rsi/inhand-right.png
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/reporter_dress.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/reporter_dress.rsi/meta.json
similarity index 100%
rename from Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/reporter_dress.rsi/meta.json
rename to Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Civilian/reporter_dress.rsi/meta.json
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Engineering/atmosf.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Engineering/atmosf.rsi/equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..1103d8bc6c0
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Engineering/atmosf.rsi/equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Engineering/atmosf.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Engineering/atmosf.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..205ff59c34a
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Engineering/atmosf.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Engineering/atmosf.rsi/folded-equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Engineering/atmosf.rsi/folded-equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..1103d8bc6c0
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Engineering/atmosf.rsi/folded-equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Engineering/atmosf.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Engineering/atmosf.rsi/folded-equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..2e95358a401
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Engineering/atmosf.rsi/folded-equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Engineering/atmosf.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Engineering/atmosf.rsi/icon.png
new file mode 100644
index 00000000000..5632c57eb31
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Engineering/atmosf.rsi/icon.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Engineering/atmosf.rsi/inhand-left.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Engineering/atmosf.rsi/inhand-left.png
new file mode 100644
index 00000000000..5f31602b187
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Engineering/atmosf.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Engineering/atmosf.rsi/inhand-right.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Engineering/atmosf.rsi/inhand-right.png
new file mode 100644
index 00000000000..c5df8b73fbc
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Engineering/atmosf.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Engineering/atmosf.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Engineering/atmosf.rsi/meta.json
new file mode 100644
index 00000000000..dd7f179e9ce
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Engineering/atmosf.rsi/meta.json
@@ -0,0 +1,38 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8, monkey made by brainfood1183 (github) for ss14",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Engineering/ce.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Engineering/ce.rsi/equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..a7646e15118
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Engineering/ce.rsi/equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Engineering/ce.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Engineering/ce.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..0b9a452a711
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Engineering/ce.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Engineering/ce.rsi/folded-equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Engineering/ce.rsi/folded-equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..a7646e15118
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Engineering/ce.rsi/folded-equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Engineering/ce.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Engineering/ce.rsi/folded-equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..b375b96b41b
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Engineering/ce.rsi/folded-equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Engineering/ce.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Engineering/ce.rsi/icon.png
new file mode 100644
index 00000000000..38f77ef6fab
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Engineering/ce.rsi/icon.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Engineering/ce.rsi/inhand-left.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Engineering/ce.rsi/inhand-left.png
new file mode 100644
index 00000000000..be8f306df13
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Engineering/ce.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Engineering/ce.rsi/inhand-right.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Engineering/ce.rsi/inhand-right.png
new file mode 100644
index 00000000000..d4536558313
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Engineering/ce.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Engineering/ce.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Engineering/ce.rsi/meta.json
new file mode 100644
index 00000000000..52f29f02ce0
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Engineering/ce.rsi/meta.json
@@ -0,0 +1,38 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey derivative made by brainfood1183 (github), modified by KingFroozy (github) for ss14",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Engineering/engineering.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Engineering/engineering.rsi/equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..bce4ee2c5be
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Engineering/engineering.rsi/equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Engineering/engineering.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Engineering/engineering.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..3426f0eb924
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Engineering/engineering.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Engineering/engineering.rsi/folded-equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Engineering/engineering.rsi/folded-equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..bce4ee2c5be
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Engineering/engineering.rsi/folded-equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Engineering/engineering.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Engineering/engineering.rsi/folded-equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..7d798e3521e
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Engineering/engineering.rsi/folded-equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Engineering/engineering.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Engineering/engineering.rsi/icon.png
new file mode 100644
index 00000000000..6190e526fdd
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Engineering/engineering.rsi/icon.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Engineering/engineering.rsi/inhand-left.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Engineering/engineering.rsi/inhand-left.png
new file mode 100644
index 00000000000..cf69e2e3cb4
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Engineering/engineering.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Engineering/engineering.rsi/inhand-right.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Engineering/engineering.rsi/inhand-right.png
new file mode 100644
index 00000000000..2ff1950af25
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Engineering/engineering.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Engineering/engineering.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Engineering/engineering.rsi/meta.json
new file mode 100644
index 00000000000..7fb089faaea
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Engineering/engineering.rsi/meta.json
@@ -0,0 +1,38 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8, monkey made by brainfood1183 (github) for ss14",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Engineering/senior_engineer.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Engineering/senior_engineer.rsi/equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..7bb070857d3
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Engineering/senior_engineer.rsi/equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Engineering/senior_engineer.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Engineering/senior_engineer.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..172fbdda6a3
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Engineering/senior_engineer.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Engineering/senior_engineer.rsi/folded-equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Engineering/senior_engineer.rsi/folded-equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..7bb070857d3
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Engineering/senior_engineer.rsi/folded-equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Engineering/senior_engineer.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Engineering/senior_engineer.rsi/folded-equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..68ffc8e1ed1
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Engineering/senior_engineer.rsi/folded-equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Engineering/senior_engineer.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Engineering/senior_engineer.rsi/icon.png
new file mode 100644
index 00000000000..7e5897e662b
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Engineering/senior_engineer.rsi/icon.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Engineering/senior_engineer.rsi/inhand-left.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Engineering/senior_engineer.rsi/inhand-left.png
new file mode 100644
index 00000000000..db387dfe419
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Engineering/senior_engineer.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Engineering/senior_engineer.rsi/inhand-right.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Engineering/senior_engineer.rsi/inhand-right.png
new file mode 100644
index 00000000000..d8194eaab57
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Engineering/senior_engineer.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Engineering/senior_engineer.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Engineering/senior_engineer.rsi/meta.json
new file mode 100644
index 00000000000..e3455271544
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Engineering/senior_engineer.rsi/meta.json
@@ -0,0 +1,38 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Edit of hazard from tgstation at commit https://github.com/tgstation/tgstation/pull/67000, resprite by muriexlol",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/chemistry.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/chemistry.rsi/equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..1ea38200088
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/chemistry.rsi/equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/chemistry.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/chemistry.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..f36a0ad7812
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/chemistry.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/chemistry.rsi/folded-equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/chemistry.rsi/folded-equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..1ea38200088
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/chemistry.rsi/folded-equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/chemistry.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/chemistry.rsi/folded-equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..1802d16c150
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/chemistry.rsi/folded-equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/chemistry.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/chemistry.rsi/icon.png
new file mode 100644
index 00000000000..3fb69dcac15
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/chemistry.rsi/icon.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/chemistry.rsi/inhand-left.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/chemistry.rsi/inhand-left.png
new file mode 100644
index 00000000000..bad4e867d62
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/chemistry.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/chemistry.rsi/inhand-right.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/chemistry.rsi/inhand-right.png
new file mode 100644
index 00000000000..e6544dfb69c
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/chemistry.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/chemistry.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/chemistry.rsi/meta.json
new file mode 100644
index 00000000000..c8aa1606f78
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/chemistry.rsi/meta.json
@@ -0,0 +1,38 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey derivative made by brainfood1183 (github) for ss14",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/cmo.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/cmo.rsi/equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..8ecc76ed92a
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/cmo.rsi/equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/cmo.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/cmo.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..31d07ff06f4
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/cmo.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/cmo.rsi/folded-equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/cmo.rsi/folded-equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..8ecc76ed92a
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/cmo.rsi/folded-equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/cmo.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/cmo.rsi/folded-equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..9a952c1a0fe
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/cmo.rsi/folded-equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/cmo.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/cmo.rsi/icon.png
new file mode 100644
index 00000000000..944f6fec68c
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/cmo.rsi/icon.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/cmo.rsi/inhand-left.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/cmo.rsi/inhand-left.png
new file mode 100644
index 00000000000..534669eacd2
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/cmo.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/cmo.rsi/inhand-right.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/cmo.rsi/inhand-right.png
new file mode 100644
index 00000000000..24c4ea8575c
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/cmo.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/cmo.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/cmo.rsi/meta.json
new file mode 100644
index 00000000000..c8aa1606f78
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/cmo.rsi/meta.json
@@ -0,0 +1,38 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey derivative made by brainfood1183 (github) for ss14",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/genetics.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/genetics.rsi/equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..be6b1c9297c
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/genetics.rsi/equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/genetics.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/genetics.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..8e177170996
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/genetics.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/genetics.rsi/folded-equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/genetics.rsi/folded-equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..be6b1c9297c
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/genetics.rsi/folded-equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/genetics.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/genetics.rsi/folded-equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..7616312dd12
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/genetics.rsi/folded-equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/genetics.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/genetics.rsi/icon.png
new file mode 100644
index 00000000000..0ec620df97a
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/genetics.rsi/icon.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/genetics.rsi/inhand-left.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/genetics.rsi/inhand-left.png
new file mode 100644
index 00000000000..46beecc032e
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/genetics.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/genetics.rsi/inhand-right.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/genetics.rsi/inhand-right.png
new file mode 100644
index 00000000000..50324f3fded
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/genetics.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/genetics.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/genetics.rsi/meta.json
new file mode 100644
index 00000000000..e10cb4825ec
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/genetics.rsi/meta.json
@@ -0,0 +1,38 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey derivative made by brainfood1183 (github) for ss14, Resprited by Mureixlol",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/medical.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/medical.rsi/equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..bd2b2275f33
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/medical.rsi/equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/medical.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/medical.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..ba9ea65cec9
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/medical.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/medical.rsi/folded-equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/medical.rsi/folded-equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..bd2b2275f33
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/medical.rsi/folded-equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/medical.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/medical.rsi/folded-equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..fa9e7ef10b5
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/medical.rsi/folded-equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/medical.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/medical.rsi/icon.png
new file mode 100644
index 00000000000..715401b683e
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/medical.rsi/icon.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/medical.rsi/inhand-left.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/medical.rsi/inhand-left.png
new file mode 100644
index 00000000000..e154ff0120e
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/medical.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/medical.rsi/inhand-right.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/medical.rsi/inhand-right.png
new file mode 100644
index 00000000000..a3b9583c232
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/medical.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/medical.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/medical.rsi/meta.json
new file mode 100644
index 00000000000..c8aa1606f78
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/medical.rsi/meta.json
@@ -0,0 +1,38 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey derivative made by brainfood1183 (github) for ss14",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/paramedic.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/paramedic.rsi/equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..9615f685657
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/paramedic.rsi/equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/paramedic.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/paramedic.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..4ffd00da3e6
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/paramedic.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/paramedic.rsi/folded-equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/paramedic.rsi/folded-equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..9615f685657
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/paramedic.rsi/folded-equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/paramedic.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/paramedic.rsi/folded-equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..05792bc380e
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/paramedic.rsi/folded-equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/paramedic.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/paramedic.rsi/icon.png
new file mode 100644
index 00000000000..64e9375ab61
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/paramedic.rsi/icon.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/paramedic.rsi/inhand-left.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/paramedic.rsi/inhand-left.png
new file mode 100644
index 00000000000..265b1f6f8bd
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/paramedic.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/paramedic.rsi/inhand-right.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/paramedic.rsi/inhand-right.png
new file mode 100644
index 00000000000..8e272ea03a8
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/paramedic.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/paramedic.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/paramedic.rsi/meta.json
new file mode 100644
index 00000000000..c8aa1606f78
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/paramedic.rsi/meta.json
@@ -0,0 +1,38 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey derivative made by brainfood1183 (github) for ss14",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/senior_physician.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/senior_physician.rsi/equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..57486af7c2e
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/senior_physician.rsi/equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/senior_physician.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/senior_physician.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..3ff0643c8bc
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/senior_physician.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/senior_physician.rsi/folded-equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/senior_physician.rsi/folded-equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..57486af7c2e
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/senior_physician.rsi/folded-equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/senior_physician.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/senior_physician.rsi/folded-equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..d549640e8b5
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/senior_physician.rsi/folded-equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/senior_physician.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/senior_physician.rsi/icon.png
new file mode 100644
index 00000000000..4015f8a5f06
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/senior_physician.rsi/icon.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/senior_physician.rsi/inhand-left.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/senior_physician.rsi/inhand-left.png
new file mode 100644
index 00000000000..3671b2a450f
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/senior_physician.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/senior_physician.rsi/inhand-right.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/senior_physician.rsi/inhand-right.png
new file mode 100644
index 00000000000..b0b494d5f5e
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/senior_physician.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/senior_physician.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/senior_physician.rsi/meta.json
new file mode 100644
index 00000000000..03793e91abb
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/senior_physician.rsi/meta.json
@@ -0,0 +1,38 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Edit by Nairodian (github) of paramedic_skirt from tgstation at pull request https://github.com/tgstation/tgstation/pull/48236, resprite by muriexlol",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/virology.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/virology.rsi/equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..23e89143dbc
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/virology.rsi/equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/virology.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/virology.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..fb496caefb5
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/virology.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/virology.rsi/folded-equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/virology.rsi/folded-equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..23e89143dbc
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/virology.rsi/folded-equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/virology.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/virology.rsi/folded-equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..167e3a85c6f
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/virology.rsi/folded-equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/virology.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/virology.rsi/icon.png
new file mode 100644
index 00000000000..60f99acdb8b
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/virology.rsi/icon.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/virology.rsi/inhand-left.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/virology.rsi/inhand-left.png
new file mode 100644
index 00000000000..00810b8b8ba
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/virology.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/virology.rsi/inhand-right.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/virology.rsi/inhand-right.png
new file mode 100644
index 00000000000..d157d36e8d9
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/virology.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/virology.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/virology.rsi/meta.json
new file mode 100644
index 00000000000..e10cb4825ec
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Medical/virology.rsi/meta.json
@@ -0,0 +1,38 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey derivative made by brainfood1183 (github) for ss14, Resprited by Mureixlol",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/RND/rnd.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/RND/rnd.rsi/equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..70f85c55404
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/RND/rnd.rsi/equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/RND/rnd.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/RND/rnd.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..cd45fcf5e17
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/RND/rnd.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/RND/rnd.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/RND/rnd.rsi/icon.png
new file mode 100644
index 00000000000..d02067b2f36
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/RND/rnd.rsi/icon.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/RND/rnd.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/RND/rnd.rsi/meta.json
new file mode 100644
index 00000000000..ab18400bc6a
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/RND/rnd.rsi/meta.json
@@ -0,0 +1,22 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey derivative made by brainfood1183 (github) for ss14, resprited from https://github.com/space-syndicate/space-station-14/commit/ea49d33ef6875a9cac4a328dc24d39771d61debd by Deenkaide (github)",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/RND/rndturtle.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/RND/rndturtle.rsi/equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..70f85c55404
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/RND/rndturtle.rsi/equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/RND/rndturtle.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/RND/rndturtle.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..ca17ce2b3de
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/RND/rndturtle.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/RND/rndturtle.rsi/folded-equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/RND/rndturtle.rsi/folded-equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..70f85c55404
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/RND/rndturtle.rsi/folded-equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/RND/rndturtle.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/RND/rndturtle.rsi/folded-equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..92047190167
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/RND/rndturtle.rsi/folded-equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/RND/rndturtle.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/RND/rndturtle.rsi/icon.png
new file mode 100644
index 00000000000..5e06ef8c592
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/RND/rndturtle.rsi/icon.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/RND/rndturtle.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/RND/rndturtle.rsi/meta.json
new file mode 100644
index 00000000000..0b58af5cae3
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/RND/rndturtle.rsi/meta.json
@@ -0,0 +1,30 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey derivative made by brainfood1183 (github) for ss14, resprited from https://github.com/space-syndicate/space-station-14/commit/ea49d33ef6875a9cac4a328dc24d39771d61debd by Deenkaide (github)",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/RND/roboticist.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/RND/roboticist.rsi/equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..33915a8dda4
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/RND/roboticist.rsi/equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/RND/roboticist.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/RND/roboticist.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..3bd9281ac04
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/RND/roboticist.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/RND/roboticist.rsi/folded-equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/RND/roboticist.rsi/folded-equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..33915a8dda4
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/RND/roboticist.rsi/folded-equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/RND/roboticist.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/RND/roboticist.rsi/folded-equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..a52ff0e1774
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/RND/roboticist.rsi/folded-equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/RND/roboticist.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/RND/roboticist.rsi/icon.png
new file mode 100644
index 00000000000..861539fab81
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/RND/roboticist.rsi/icon.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/RND/roboticist.rsi/inhand-left.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/RND/roboticist.rsi/inhand-left.png
new file mode 100644
index 00000000000..bacc6c39de6
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/RND/roboticist.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/RND/roboticist.rsi/inhand-right.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/RND/roboticist.rsi/inhand-right.png
new file mode 100644
index 00000000000..d107c18c8da
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/RND/roboticist.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/RND/roboticist.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/RND/roboticist.rsi/meta.json
new file mode 100644
index 00000000000..7064b07eb5b
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/RND/roboticist.rsi/meta.json
@@ -0,0 +1,38 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Sprite by DreamlyJack, monkey derivative made by brainfood1183 (github)",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/RND/scientist.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/RND/scientist.rsi/equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..c561710a78f
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/RND/scientist.rsi/equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/RND/scientist.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/RND/scientist.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..728945f66a0
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/RND/scientist.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/RND/scientist.rsi/folded-equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/RND/scientist.rsi/folded-equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..c561710a78f
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/RND/scientist.rsi/folded-equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/RND/scientist.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/RND/scientist.rsi/folded-equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..225051ede49
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/RND/scientist.rsi/folded-equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/RND/scientist.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/RND/scientist.rsi/icon.png
new file mode 100644
index 00000000000..9a860aeda10
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/RND/scientist.rsi/icon.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/RND/scientist.rsi/inhand-left.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/RND/scientist.rsi/inhand-left.png
new file mode 100644
index 00000000000..2f1666048ff
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/RND/scientist.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/RND/scientist.rsi/inhand-right.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/RND/scientist.rsi/inhand-right.png
new file mode 100644
index 00000000000..8540677f193
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/RND/scientist.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/RND/scientist.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/RND/scientist.rsi/meta.json
new file mode 100644
index 00000000000..5ef13ebed3e
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/RND/scientist.rsi/meta.json
@@ -0,0 +1,38 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Sprite by DreamlyJack, monkey derivative made by brainfood1183 (github) for ss14",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/RND/senior_researcher.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/RND/senior_researcher.rsi/equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..afe9c8e187e
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/RND/senior_researcher.rsi/equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/RND/senior_researcher.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/RND/senior_researcher.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..763776e4afe
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/RND/senior_researcher.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/RND/senior_researcher.rsi/folded-equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/RND/senior_researcher.rsi/folded-equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..afe9c8e187e
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/RND/senior_researcher.rsi/folded-equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/RND/senior_researcher.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/RND/senior_researcher.rsi/folded-equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..d747099c8a2
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/RND/senior_researcher.rsi/folded-equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/RND/senior_researcher.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/RND/senior_researcher.rsi/icon.png
new file mode 100644
index 00000000000..8bfc4cf7b0e
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/RND/senior_researcher.rsi/icon.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/RND/senior_researcher.rsi/inhand-left.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/RND/senior_researcher.rsi/inhand-left.png
new file mode 100644
index 00000000000..5c985b11edd
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/RND/senior_researcher.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/RND/senior_researcher.rsi/inhand-right.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/RND/senior_researcher.rsi/inhand-right.png
new file mode 100644
index 00000000000..06595802ae7
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/RND/senior_researcher.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/RND/senior_researcher.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/RND/senior_researcher.rsi/meta.json
new file mode 100644
index 00000000000..dfd0267e33e
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/RND/senior_researcher.rsi/meta.json
@@ -0,0 +1,38 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Edited by Nairodian (github) from the formal scientist jumpsuit by Flareguy, resprite by muriexlol",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/detective.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/detective.rsi/equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..c8bf8b76c3c
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/detective.rsi/equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/detective.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/detective.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..308c762f867
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/detective.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/detective.rsi/folded-equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/detective.rsi/folded-equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..c8bf8b76c3c
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/detective.rsi/folded-equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/detective.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/detective.rsi/folded-equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..183f4fb6897
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/detective.rsi/folded-equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/detective.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/detective.rsi/icon.png
new file mode 100644
index 00000000000..eaf6e0c36a1
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/detective.rsi/icon.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/detective.rsi/inhand-left.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/detective.rsi/inhand-left.png
new file mode 100644
index 00000000000..aa9b5112d94
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/detective.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/detective.rsi/inhand-right.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/detective.rsi/inhand-right.png
new file mode 100644
index 00000000000..5e1581b51ab
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/detective.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/detective.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/detective.rsi/meta.json
new file mode 100644
index 00000000000..cbb07380de4
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/detective.rsi/meta.json
@@ -0,0 +1,38 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5ea6d8b4422027d0c22cb415d1f05a08bf39aaa0, monkey made by brainfood1183 (github) for ss14",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/detective_grey.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/detective_grey.rsi/equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..699f79f42eb
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/detective_grey.rsi/equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/detective_grey.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/detective_grey.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..019cd7a87a5
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/detective_grey.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/detective_grey.rsi/folded-equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/detective_grey.rsi/folded-equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..699f79f42eb
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/detective_grey.rsi/folded-equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/detective_grey.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/detective_grey.rsi/folded-equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..af6623a9710
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/detective_grey.rsi/folded-equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/detective_grey.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/detective_grey.rsi/icon.png
new file mode 100644
index 00000000000..ca669d32300
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/detective_grey.rsi/icon.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/detective_grey.rsi/inhand-left.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/detective_grey.rsi/inhand-left.png
new file mode 100644
index 00000000000..d5ca96c85f6
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/detective_grey.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/detective_grey.rsi/inhand-right.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/detective_grey.rsi/inhand-right.png
new file mode 100644
index 00000000000..0fcbfbaf67a
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/detective_grey.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/detective_grey.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/detective_grey.rsi/meta.json
new file mode 100644
index 00000000000..cbb07380de4
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/detective_grey.rsi/meta.json
@@ -0,0 +1,38 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5ea6d8b4422027d0c22cb415d1f05a08bf39aaa0, monkey made by brainfood1183 (github) for ss14",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/hos.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/hos.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..01eeaf15ebc
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/hos.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/hos.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/hos.rsi/folded-equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..5be518099f5
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/hos.rsi/folded-equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/hos.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/hos.rsi/icon.png
new file mode 100644
index 00000000000..f12ce8739e5
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/hos.rsi/icon.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/hos.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/hos.rsi/meta.json
new file mode 100644
index 00000000000..5116dcfa7c0
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/hos.rsi/meta.json
@@ -0,0 +1,22 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Created by Flareguy using sprites from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039 & the jumpskirt base found in color.rsi.",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/hos_alt.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/hos_alt.rsi/equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..d1d1ddeca8b
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/hos_alt.rsi/equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/hos_alt.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/hos_alt.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..9d4db54b214
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/hos_alt.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/hos_alt.rsi/folded-equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/hos_alt.rsi/folded-equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..d1d1ddeca8b
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/hos_alt.rsi/folded-equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/hos_alt.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/hos_alt.rsi/folded-equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..fda0353d3b2
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/hos_alt.rsi/folded-equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/hos_alt.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/hos_alt.rsi/icon.png
new file mode 100644
index 00000000000..1229c1cc35d
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/hos_alt.rsi/icon.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/hos_alt.rsi/inhand-left.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/hos_alt.rsi/inhand-left.png
new file mode 100644
index 00000000000..6162151b80f
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/hos_alt.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/hos_alt.rsi/inhand-right.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/hos_alt.rsi/inhand-right.png
new file mode 100644
index 00000000000..6bbce7a0aab
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/hos_alt.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/hos_alt.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/hos_alt.rsi/meta.json
new file mode 100644
index 00000000000..129fb88c089
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/hos_alt.rsi/meta.json
@@ -0,0 +1,38 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/28d0be60aa8bbe1ca87a5d129487bb6f60839ac4, monkey made by brainfood1183 (github) for ss14, edited by Deenkaide (github)",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/security.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/security.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..06e7d40beb4
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/security.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/security.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/security.rsi/folded-equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..62bc6b159c7
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/security.rsi/folded-equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/security.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/security.rsi/icon.png
new file mode 100644
index 00000000000..3c8d603ced1
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/security.rsi/icon.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/security.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/security.rsi/meta.json
new file mode 100644
index 00000000000..5116dcfa7c0
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/security.rsi/meta.json
@@ -0,0 +1,22 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Created by Flareguy using sprites from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039 & the jumpskirt base found in color.rsi.",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/security_grey.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/security_grey.rsi/equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..c36b706329c
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/security_grey.rsi/equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/security_grey.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/security_grey.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..b01c1dd2fd7
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/security_grey.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/security_grey.rsi/folded-equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/security_grey.rsi/folded-equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..c36b706329c
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/security_grey.rsi/folded-equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/security_grey.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/security_grey.rsi/folded-equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..0aea8c23c4a
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/security_grey.rsi/folded-equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/security_grey.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/security_grey.rsi/icon.png
new file mode 100644
index 00000000000..8e6d9f2537c
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/security_grey.rsi/icon.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/security_grey.rsi/inhand-left.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/security_grey.rsi/inhand-left.png
new file mode 100644
index 00000000000..30c9a42f81c
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/security_grey.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/security_grey.rsi/inhand-right.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/security_grey.rsi/inhand-right.png
new file mode 100644
index 00000000000..777b44893b0
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/security_grey.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/security_grey.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/security_grey.rsi/meta.json
new file mode 100644
index 00000000000..2ea4d74634e
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/security_grey.rsi/meta.json
@@ -0,0 +1,38 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/28d0be60aa8bbe1ca87a5d129487bb6f60839ac4. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for , reptilian made by kuro(388673708753027083)",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/senior_officer.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/senior_officer.rsi/equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..d4764e3503d
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/senior_officer.rsi/equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/senior_officer.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/senior_officer.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..668c7ce84c2
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/senior_officer.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/senior_officer.rsi/folded-equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/senior_officer.rsi/folded-equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..d4764e3503d
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/senior_officer.rsi/folded-equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/senior_officer.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/senior_officer.rsi/folded-equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..41b89794e10
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/senior_officer.rsi/folded-equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/senior_officer.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/senior_officer.rsi/icon.png
new file mode 100644
index 00000000000..ec7433d2349
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/senior_officer.rsi/icon.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/senior_officer.rsi/inhand-left.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/senior_officer.rsi/inhand-left.png
new file mode 100644
index 00000000000..d331c0b8e58
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/senior_officer.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/senior_officer.rsi/inhand-right.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/senior_officer.rsi/inhand-right.png
new file mode 100644
index 00000000000..e1fb6de9ec6
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/senior_officer.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/senior_officer.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/senior_officer.rsi/meta.json
new file mode 100644
index 00000000000..7d66b283fe6
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/senior_officer.rsi/meta.json
@@ -0,0 +1,38 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Edit by Nairodian (github) of secskirt taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7779930358ba4776575975690d2c952f0d05c6cc, resprite by muriexlol",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/warden.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/warden.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..f2677d659d6
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/warden.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/warden.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/warden.rsi/folded-equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..ddfdae77c67
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/warden.rsi/folded-equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/warden.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/warden.rsi/icon.png
new file mode 100644
index 00000000000..1bde5e2f241
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/warden.rsi/icon.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/warden.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/warden.rsi/meta.json
new file mode 100644
index 00000000000..7afc1f47444
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/warden.rsi/meta.json
@@ -0,0 +1,22 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/28d0be60aa8bbe1ca87a5d129487bb6f60839ac4. In hand sprite scaled down by potato1234_x, monkey derivative made by brainfood1183 (github) for ss14",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Syndicate/operative_s.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Syndicate/operative_s.rsi/equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..af77e0b5746
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Syndicate/operative_s.rsi/equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Syndicate/operative_s.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Syndicate/operative_s.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..05de5d50b13
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Syndicate/operative_s.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Syndicate/operative_s.rsi/folded-equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Syndicate/operative_s.rsi/folded-equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..af77e0b5746
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Syndicate/operative_s.rsi/folded-equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Syndicate/operative_s.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Syndicate/operative_s.rsi/folded-equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..012314dc1eb
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Syndicate/operative_s.rsi/folded-equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Syndicate/operative_s.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Syndicate/operative_s.rsi/icon.png
new file mode 100644
index 00000000000..5c91d2e37e6
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Syndicate/operative_s.rsi/icon.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Syndicate/operative_s.rsi/inhand-left.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Syndicate/operative_s.rsi/inhand-left.png
new file mode 100644
index 00000000000..ebb3b515aab
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Syndicate/operative_s.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Syndicate/operative_s.rsi/inhand-right.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Syndicate/operative_s.rsi/inhand-right.png
new file mode 100644
index 00000000000..cb143902bd1
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Syndicate/operative_s.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Syndicate/operative_s.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Syndicate/operative_s.rsi/meta.json
new file mode 100644
index 00000000000..7fb089faaea
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Syndicate/operative_s.rsi/meta.json
@@ -0,0 +1,38 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8, monkey made by brainfood1183 (github) for ss14",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/aqua.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/aqua.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..270008a4902
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/aqua.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/aqua.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/aqua.rsi/folded-equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..b08cb157ed4
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/aqua.rsi/folded-equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/aqua.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/aqua.rsi/meta.json
new file mode 100644
index 00000000000..da7f588e50c
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/aqua.rsi/meta.json
@@ -0,0 +1,19 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from paradise at commit https://github.com/ParadiseSS13/Paradise/commit/ade220d0cb13fab206f75e91ecfb31890937572a modified for SS14 by Jvne",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/black.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/black.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..91c38fa4ab8
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/black.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/black.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/black.rsi/folded-equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..5c1305021ad
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/black.rsi/folded-equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/black.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/black.rsi/meta.json
new file mode 100644
index 00000000000..da7f588e50c
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/black.rsi/meta.json
@@ -0,0 +1,19 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from paradise at commit https://github.com/ParadiseSS13/Paradise/commit/ade220d0cb13fab206f75e91ecfb31890937572a modified for SS14 by Jvne",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/blue.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/blue.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..f08cf3629c0
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/blue.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/blue.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/blue.rsi/folded-equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..01d76a88455
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/blue.rsi/folded-equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/blue.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/blue.rsi/meta.json
new file mode 100644
index 00000000000..da7f588e50c
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/blue.rsi/meta.json
@@ -0,0 +1,19 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from paradise at commit https://github.com/ParadiseSS13/Paradise/commit/ade220d0cb13fab206f75e91ecfb31890937572a modified for SS14 by Jvne",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/brown.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/brown.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..e23ddb4fe7b
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/brown.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/brown.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/brown.rsi/folded-equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..33d6ab375e2
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/brown.rsi/folded-equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/brown.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/brown.rsi/meta.json
new file mode 100644
index 00000000000..da7f588e50c
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/brown.rsi/meta.json
@@ -0,0 +1,19 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from paradise at commit https://github.com/ParadiseSS13/Paradise/commit/ade220d0cb13fab206f75e91ecfb31890937572a modified for SS14 by Jvne",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/color.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/color.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..c47e27d31f7
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/color.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/color.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/color.rsi/folded-equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..eaca71fc22a
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/color.rsi/folded-equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/color.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/color.rsi/icon.png
new file mode 100644
index 00000000000..29d37b3d7d3
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/color.rsi/icon.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/color.rsi/inhand-left.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/color.rsi/inhand-left.png
new file mode 100644
index 00000000000..265b1f6f8bd
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/color.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/color.rsi/inhand-right.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/color.rsi/inhand-right.png
new file mode 100644
index 00000000000..8e272ea03a8
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/color.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/color.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/color.rsi/meta.json
new file mode 100644
index 00000000000..b88f466246b
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/color.rsi/meta.json
@@ -0,0 +1,30 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/993de554ecfc30cc45f8340819c5a60ef1eee7e1 and modified by Flareguy & P3MOIRA, with the lower half of the jumpskirt taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039 and modified by Flareguy for SS14.",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/darkblue.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/darkblue.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..1dd0f74b8ad
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/darkblue.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/darkblue.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/darkblue.rsi/folded-equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..2bbc1f3f2db
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/darkblue.rsi/folded-equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/darkblue.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/darkblue.rsi/meta.json
new file mode 100644
index 00000000000..da7f588e50c
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/darkblue.rsi/meta.json
@@ -0,0 +1,19 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from paradise at commit https://github.com/ParadiseSS13/Paradise/commit/ade220d0cb13fab206f75e91ecfb31890937572a modified for SS14 by Jvne",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/darkgreen.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/darkgreen.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..c0000e5c9a3
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/darkgreen.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/darkgreen.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/darkgreen.rsi/folded-equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..00fcebc4e32
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/darkgreen.rsi/folded-equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/darkgreen.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/darkgreen.rsi/meta.json
new file mode 100644
index 00000000000..da7f588e50c
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/darkgreen.rsi/meta.json
@@ -0,0 +1,19 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from paradise at commit https://github.com/ParadiseSS13/Paradise/commit/ade220d0cb13fab206f75e91ecfb31890937572a modified for SS14 by Jvne",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/darkred.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/darkred.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..71ea1b3cc90
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/darkred.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/darkred.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/darkred.rsi/folded-equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..5a99607ca58
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/darkred.rsi/folded-equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/darkred.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/darkred.rsi/meta.json
new file mode 100644
index 00000000000..da7f588e50c
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/darkred.rsi/meta.json
@@ -0,0 +1,19 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from paradise at commit https://github.com/ParadiseSS13/Paradise/commit/ade220d0cb13fab206f75e91ecfb31890937572a modified for SS14 by Jvne",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/green.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/green.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..f3b419a2676
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/green.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/green.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/green.rsi/folded-equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..32f56a821db
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/green.rsi/folded-equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/green.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/green.rsi/meta.json
new file mode 100644
index 00000000000..da7f588e50c
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/green.rsi/meta.json
@@ -0,0 +1,19 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from paradise at commit https://github.com/ParadiseSS13/Paradise/commit/ade220d0cb13fab206f75e91ecfb31890937572a modified for SS14 by Jvne",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/grey.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/grey.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..e2416749aed
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/grey.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/grey.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/grey.rsi/folded-equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..22496f3d093
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/grey.rsi/folded-equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/grey.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/grey.rsi/meta.json
new file mode 100644
index 00000000000..da7f588e50c
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/grey.rsi/meta.json
@@ -0,0 +1,19 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from paradise at commit https://github.com/ParadiseSS13/Paradise/commit/ade220d0cb13fab206f75e91ecfb31890937572a modified for SS14 by Jvne",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/lightblue.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/lightblue.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..21189d318e6
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/lightblue.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/lightblue.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/lightblue.rsi/folded-equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..6dd92d45ac9
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/lightblue.rsi/folded-equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/lightblue.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/lightblue.rsi/meta.json
new file mode 100644
index 00000000000..da7f588e50c
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/lightblue.rsi/meta.json
@@ -0,0 +1,19 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from paradise at commit https://github.com/ParadiseSS13/Paradise/commit/ade220d0cb13fab206f75e91ecfb31890937572a modified for SS14 by Jvne",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/lightbrown.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/lightbrown.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..14ccdacbfc7
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/lightbrown.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/lightbrown.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/lightbrown.rsi/folded-equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..6176603795e
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/lightbrown.rsi/folded-equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/lightbrown.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/lightbrown.rsi/meta.json
new file mode 100644
index 00000000000..da7f588e50c
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/lightbrown.rsi/meta.json
@@ -0,0 +1,19 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from paradise at commit https://github.com/ParadiseSS13/Paradise/commit/ade220d0cb13fab206f75e91ecfb31890937572a modified for SS14 by Jvne",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/lightpurple.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/lightpurple.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..711d2ae7651
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/lightpurple.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/lightpurple.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/lightpurple.rsi/folded-equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..9ce5636a1ec
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/lightpurple.rsi/folded-equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/lightpurple.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/lightpurple.rsi/meta.json
new file mode 100644
index 00000000000..da7f588e50c
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/lightpurple.rsi/meta.json
@@ -0,0 +1,19 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from paradise at commit https://github.com/ParadiseSS13/Paradise/commit/ade220d0cb13fab206f75e91ecfb31890937572a modified for SS14 by Jvne",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/lightred.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/lightred.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..41d4213a6af
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/lightred.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/lightred.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/lightred.rsi/folded-equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..ff8089f0e43
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/lightred.rsi/folded-equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/lightred.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/lightred.rsi/meta.json
new file mode 100644
index 00000000000..da7f588e50c
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/lightred.rsi/meta.json
@@ -0,0 +1,19 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from paradise at commit https://github.com/ParadiseSS13/Paradise/commit/ade220d0cb13fab206f75e91ecfb31890937572a modified for SS14 by Jvne",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/orange.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/orange.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..6105d5950c2
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/orange.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/orange.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/orange.rsi/folded-equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..0575822a93f
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/orange.rsi/folded-equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/orange.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/orange.rsi/meta.json
new file mode 100644
index 00000000000..da7f588e50c
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/orange.rsi/meta.json
@@ -0,0 +1,19 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from paradise at commit https://github.com/ParadiseSS13/Paradise/commit/ade220d0cb13fab206f75e91ecfb31890937572a modified for SS14 by Jvne",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/pink.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/pink.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..3e91b01cce9
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/pink.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/pink.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/pink.rsi/folded-equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..8e58f8234ea
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/pink.rsi/folded-equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/pink.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/pink.rsi/meta.json
new file mode 100644
index 00000000000..da7f588e50c
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/pink.rsi/meta.json
@@ -0,0 +1,19 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from paradise at commit https://github.com/ParadiseSS13/Paradise/commit/ade220d0cb13fab206f75e91ecfb31890937572a modified for SS14 by Jvne",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/prisoner.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/prisoner.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..e6d417d67a1
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/prisoner.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/prisoner.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/prisoner.rsi/folded-equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..1992d555606
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/prisoner.rsi/folded-equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/prisoner.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/prisoner.rsi/icon.png
new file mode 100644
index 00000000000..2b1fb4f4c73
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/prisoner.rsi/icon.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/prisoner.rsi/inhand-left.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/prisoner.rsi/inhand-left.png
new file mode 100644
index 00000000000..2eefc71652d
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/prisoner.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/prisoner.rsi/inhand-right.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/prisoner.rsi/inhand-right.png
new file mode 100644
index 00000000000..664d109aac3
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/prisoner.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/prisoner.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/prisoner.rsi/meta.json
new file mode 100644
index 00000000000..f19cb27d3b4
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/prisoner.rsi/meta.json
@@ -0,0 +1,30 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from paradise at commit https://github.com/ParadiseSS13/Paradise/commit/ade220d0cb13fab206f75e91ecfb31890937572a modified for SS14 by Jvne",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ },
+ {
+ "name": "icon"
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/purple.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/purple.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..11e3ee73ec3
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/purple.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/purple.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/purple.rsi/folded-equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..ac9ce79dd67
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/purple.rsi/folded-equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/purple.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/purple.rsi/meta.json
new file mode 100644
index 00000000000..da7f588e50c
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/purple.rsi/meta.json
@@ -0,0 +1,19 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from paradise at commit https://github.com/ParadiseSS13/Paradise/commit/ade220d0cb13fab206f75e91ecfb31890937572a modified for SS14 by Jvne",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/rainbow.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/rainbow.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..21adb80172c
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/rainbow.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/rainbow.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/rainbow.rsi/icon.png
new file mode 100644
index 00000000000..2871f9a84df
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/rainbow.rsi/icon.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/rainbow.rsi/inhand-left.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/rainbow.rsi/inhand-left.png
new file mode 100644
index 00000000000..471a06d82b5
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/rainbow.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/rainbow.rsi/inhand-right.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/rainbow.rsi/inhand-right.png
new file mode 100644
index 00000000000..361d13f0fc6
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/rainbow.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/rainbow.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/rainbow.rsi/meta.json
new file mode 100644
index 00000000000..0b813d5196a
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/rainbow.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from paradise at commit https://github.com/ParadiseSS13/Paradise/commit/ade220d0cb13fab206f75e91ecfb31890937572a modified for SS14 by Jvne",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ },
+ {
+ "name": "icon"
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/red.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/red.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..2e0afdfef34
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/red.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/red.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/red.rsi/folded-equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..3697223dd7d
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/red.rsi/folded-equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/red.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/red.rsi/meta.json
new file mode 100644
index 00000000000..da7f588e50c
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/red.rsi/meta.json
@@ -0,0 +1,19 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from paradise at commit https://github.com/ParadiseSS13/Paradise/commit/ade220d0cb13fab206f75e91ecfb31890937572a modified for SS14 by Jvne",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/white.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/white.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..3662800a7bc
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/white.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/white.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/white.rsi/folded-equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..20b02b371fd
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/white.rsi/folded-equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/white.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/white.rsi/meta.json
new file mode 100644
index 00000000000..da7f588e50c
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/white.rsi/meta.json
@@ -0,0 +1,19 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from paradise at commit https://github.com/ParadiseSS13/Paradise/commit/ade220d0cb13fab206f75e91ecfb31890937572a modified for SS14 by Jvne",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/yellow.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/yellow.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..8b4d40fd5cc
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/yellow.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/yellow.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/yellow.rsi/folded-equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..0ef21ccbf92
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/yellow.rsi/folded-equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/yellow.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/yellow.rsi/meta.json
new file mode 100644
index 00000000000..da7f588e50c
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/color/yellow.rsi/meta.json
@@ -0,0 +1,19 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from paradise at commit https://github.com/ParadiseSS13/Paradise/commit/ade220d0cb13fab206f75e91ecfb31890937572a modified for SS14 by Jvne",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Cargo/cargotech.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Cargo/cargotech.rsi/equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..5a4dfcc3a91
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Cargo/cargotech.rsi/equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Cargo/cargotech.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Cargo/cargotech.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..1b2ffb1731f
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Cargo/cargotech.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Cargo/cargotech.rsi/folded-equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Cargo/cargotech.rsi/folded-equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..5a4dfcc3a91
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Cargo/cargotech.rsi/folded-equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Cargo/cargotech.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Cargo/cargotech.rsi/folded-equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..6fd40b7e96f
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Cargo/cargotech.rsi/folded-equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Cargo/cargotech.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Cargo/cargotech.rsi/icon.png
new file mode 100644
index 00000000000..f71ebdda5f8
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Cargo/cargotech.rsi/icon.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Cargo/cargotech.rsi/inhand-left.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Cargo/cargotech.rsi/inhand-left.png
new file mode 100644
index 00000000000..29ed754ec1d
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Cargo/cargotech.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Cargo/cargotech.rsi/inhand-right.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Cargo/cargotech.rsi/inhand-right.png
new file mode 100644
index 00000000000..3ea39f3463e
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Cargo/cargotech.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Cargo/cargotech.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Cargo/cargotech.rsi/meta.json
new file mode 100644
index 00000000000..dd05d69f0be
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Cargo/cargotech.rsi/meta.json
@@ -0,0 +1,38 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from paradise at commit https://github.com/ParadiseSS13/Paradise/commit/207695cbdab4cb8f81a25cdbb201a88a6851d78b , In hand sprite scaled down by potato1234_x, monkey made by SonicHDC (github) for ss14",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/mailman.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Cargo/mailman.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/mailman.rsi/equipped-INNERCLOTHING.png
rename to Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Cargo/mailman.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/mailman.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Cargo/mailman.rsi/icon.png
similarity index 100%
rename from Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/mailman.rsi/icon.png
rename to Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Cargo/mailman.rsi/icon.png
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/mailman.rsi/inhand-left.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Cargo/mailman.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/mailman.rsi/inhand-left.png
rename to Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Cargo/mailman.rsi/inhand-left.png
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/mailman.rsi/inhand-right.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Cargo/mailman.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/mailman.rsi/inhand-right.png
rename to Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Cargo/mailman.rsi/inhand-right.png
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/mailman.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Cargo/mailman.rsi/meta.json
similarity index 100%
rename from Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/mailman.rsi/meta.json
rename to Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Cargo/mailman.rsi/meta.json
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Cargo/qm.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Cargo/qm.rsi/equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..c133a884ada
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Cargo/qm.rsi/equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Cargo/qm.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Cargo/qm.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..6a491124fae
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Cargo/qm.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Cargo/qm.rsi/folded-equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Cargo/qm.rsi/folded-equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..c133a884ada
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Cargo/qm.rsi/folded-equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Cargo/qm.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Cargo/qm.rsi/folded-equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..eaaa68f9bfd
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Cargo/qm.rsi/folded-equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Cargo/qm.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Cargo/qm.rsi/icon.png
new file mode 100644
index 00000000000..5a6efa53bbc
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Cargo/qm.rsi/icon.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Cargo/qm.rsi/inhand-left.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Cargo/qm.rsi/inhand-left.png
new file mode 100644
index 00000000000..29ed754ec1d
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Cargo/qm.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Cargo/qm.rsi/inhand-right.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Cargo/qm.rsi/inhand-right.png
new file mode 100644
index 00000000000..3ea39f3463e
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Cargo/qm.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Cargo/qm.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Cargo/qm.rsi/meta.json
new file mode 100644
index 00000000000..dd05d69f0be
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Cargo/qm.rsi/meta.json
@@ -0,0 +1,38 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from paradise at commit https://github.com/ParadiseSS13/Paradise/commit/207695cbdab4cb8f81a25cdbb201a88a6851d78b , In hand sprite scaled down by potato1234_x, monkey made by SonicHDC (github) for ss14",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Cargo/qmturtle.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Cargo/qmturtle.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..a3ebf6237a3
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Cargo/qmturtle.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Cargo/qmturtle.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Cargo/qmturtle.rsi/folded-equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..bf67dff1026
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Cargo/qmturtle.rsi/folded-equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Cargo/qmturtle.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Cargo/qmturtle.rsi/icon.png
new file mode 100644
index 00000000000..31e649c1da5
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Cargo/qmturtle.rsi/icon.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Cargo/qmturtle.rsi/inhand-left.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Cargo/qmturtle.rsi/inhand-left.png
new file mode 100644
index 00000000000..29ed754ec1d
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Cargo/qmturtle.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Cargo/qmturtle.rsi/inhand-right.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Cargo/qmturtle.rsi/inhand-right.png
new file mode 100644
index 00000000000..3ea39f3463e
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Cargo/qmturtle.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Cargo/qmturtle.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Cargo/qmturtle.rsi/meta.json
new file mode 100644
index 00000000000..f472914cbf1
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Cargo/qmturtle.rsi/meta.json
@@ -0,0 +1,30 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from paradise at commit https://github.com/ParadiseSS13/Paradise/commit/207695cbdab4cb8f81a25cdbb201a88a6851d78b , In hand sprite scaled down by potato1234_x, monkey made by SonicHDC (github) for ss14",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Cargo/salvage.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Cargo/salvage.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..b58aadbd42b
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Cargo/salvage.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Cargo/salvage.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Cargo/salvage.rsi/icon.png
new file mode 100644
index 00000000000..7e20d24c7aa
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Cargo/salvage.rsi/icon.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Cargo/salvage.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Cargo/salvage.rsi/meta.json
new file mode 100644
index 00000000000..91b3bda4e3d
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Cargo/salvage.rsi/meta.json
@@ -0,0 +1,18 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from paradise at commit https://github.com/ParadiseSS13/Paradise/commit/207695cbdab4cb8f81a25cdbb201a88a6851d78b , In hand sprite scaled down by potato1234_x, monkey made by SonicHDC (github) for ss14",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Cargo/shaft_miner.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Cargo/shaft_miner.rsi/equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..49970c3495f
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Cargo/shaft_miner.rsi/equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Cargo/shaft_miner.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Cargo/shaft_miner.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..c1d663387b4
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Cargo/shaft_miner.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Cargo/shaft_miner.rsi/folded-equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Cargo/shaft_miner.rsi/folded-equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..49970c3495f
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Cargo/shaft_miner.rsi/folded-equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Cargo/shaft_miner.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Cargo/shaft_miner.rsi/folded-equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..d99878fea5f
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Cargo/shaft_miner.rsi/folded-equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Cargo/shaft_miner.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Cargo/shaft_miner.rsi/icon.png
new file mode 100644
index 00000000000..64a2cecdefe
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Cargo/shaft_miner.rsi/icon.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Cargo/shaft_miner.rsi/inhand-left.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Cargo/shaft_miner.rsi/inhand-left.png
new file mode 100644
index 00000000000..d456f94f0f8
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Cargo/shaft_miner.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Cargo/shaft_miner.rsi/inhand-right.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Cargo/shaft_miner.rsi/inhand-right.png
new file mode 100644
index 00000000000..24602b7b37c
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Cargo/shaft_miner.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Cargo/shaft_miner.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Cargo/shaft_miner.rsi/meta.json
new file mode 100644
index 00000000000..8d62ee87eb9
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Cargo/shaft_miner.rsi/meta.json
@@ -0,0 +1,38 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from paradise at commit https://github.com/ParadiseSS13/Paradise/commit/207695cbdab4cb8f81a25cdbb201a88a6851d78b , In hand sprite scaled down by potato1234_x, monkey made by SonicHDC (github) for ss14",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/casualcentcom.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Casual/casualcentcom.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/casualcentcom.rsi/equipped-INNERCLOTHING.png
rename to Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Casual/casualcentcom.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/casualcentcom.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Casual/casualcentcom.rsi/icon.png
similarity index 100%
rename from Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/casualcentcom.rsi/icon.png
rename to Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Casual/casualcentcom.rsi/icon.png
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/casualcentcom.rsi/inhand-left.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Casual/casualcentcom.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/casualcentcom.rsi/inhand-left.png
rename to Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Casual/casualcentcom.rsi/inhand-left.png
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/casualcentcom.rsi/inhand-right.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Casual/casualcentcom.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/casualcentcom.rsi/inhand-right.png
rename to Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Casual/casualcentcom.rsi/inhand-right.png
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/casualcentcom.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Casual/casualcentcom.rsi/meta.json
similarity index 100%
rename from Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/casualcentcom.rsi/meta.json
rename to Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Casual/casualcentcom.rsi/meta.json
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/casualcommand.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Casual/casualcommand.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/casualcommand.rsi/equipped-INNERCLOTHING.png
rename to Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Casual/casualcommand.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/casualcommand.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Casual/casualcommand.rsi/icon.png
similarity index 100%
rename from Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/casualcommand.rsi/icon.png
rename to Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Casual/casualcommand.rsi/icon.png
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/casualcommand.rsi/inhand-left.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Casual/casualcommand.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/casualcommand.rsi/inhand-left.png
rename to Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Casual/casualcommand.rsi/inhand-left.png
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/casualcommand.rsi/inhand-right.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Casual/casualcommand.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/casualcommand.rsi/inhand-right.png
rename to Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Casual/casualcommand.rsi/inhand-right.png
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/casualcommand.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Casual/casualcommand.rsi/meta.json
similarity index 100%
rename from Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/casualcommand.rsi/meta.json
rename to Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Casual/casualcommand.rsi/meta.json
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/casualengineer.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Casual/casualengineer.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/casualengineer.rsi/equipped-INNERCLOTHING.png
rename to Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Casual/casualengineer.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/casualengineer.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Casual/casualengineer.rsi/icon.png
similarity index 100%
rename from Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/casualengineer.rsi/icon.png
rename to Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Casual/casualengineer.rsi/icon.png
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/casualengineer.rsi/inhand-left.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Casual/casualengineer.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/casualengineer.rsi/inhand-left.png
rename to Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Casual/casualengineer.rsi/inhand-left.png
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/casualengineer.rsi/inhand-right.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Casual/casualengineer.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/casualengineer.rsi/inhand-right.png
rename to Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Casual/casualengineer.rsi/inhand-right.png
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/casualengineer.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Casual/casualengineer.rsi/meta.json
similarity index 100%
rename from Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/casualengineer.rsi/meta.json
rename to Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Casual/casualengineer.rsi/meta.json
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/casualshirt_captain.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Casual/casualshirt_captain.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/casualshirt_captain.rsi/equipped-INNERCLOTHING.png
rename to Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Casual/casualshirt_captain.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/casualshirt_captain.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Casual/casualshirt_captain.rsi/icon.png
similarity index 100%
rename from Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/casualshirt_captain.rsi/icon.png
rename to Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Casual/casualshirt_captain.rsi/icon.png
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/casualshirt_captain.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Casual/casualshirt_captain.rsi/meta.json
similarity index 100%
rename from Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/casualshirt_captain.rsi/meta.json
rename to Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Casual/casualshirt_captain.rsi/meta.json
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/casualshirt_ce.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Casual/casualshirt_ce.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/casualshirt_ce.rsi/equipped-INNERCLOTHING.png
rename to Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Casual/casualshirt_ce.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/casualshirt_ce.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Casual/casualshirt_ce.rsi/icon.png
similarity index 100%
rename from Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/casualshirt_ce.rsi/icon.png
rename to Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Casual/casualshirt_ce.rsi/icon.png
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/casualshirt_ce.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Casual/casualshirt_ce.rsi/meta.json
similarity index 100%
rename from Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/casualshirt_ce.rsi/meta.json
rename to Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Casual/casualshirt_ce.rsi/meta.json
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/casualshirt_hop.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Casual/casualshirt_hop.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/casualshirt_hop.rsi/equipped-INNERCLOTHING.png
rename to Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Casual/casualshirt_hop.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/casualshirt_hop.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Casual/casualshirt_hop.rsi/icon.png
similarity index 100%
rename from Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/casualshirt_hop.rsi/icon.png
rename to Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Casual/casualshirt_hop.rsi/icon.png
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/casualshirt_hop.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Casual/casualshirt_hop.rsi/meta.json
similarity index 100%
rename from Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/casualshirt_hop.rsi/meta.json
rename to Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Casual/casualshirt_hop.rsi/meta.json
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/casualshirt_hos.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Casual/casualshirt_hos.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/casualshirt_hos.rsi/equipped-INNERCLOTHING.png
rename to Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Casual/casualshirt_hos.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/casualshirt_hos.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Casual/casualshirt_hos.rsi/icon.png
similarity index 100%
rename from Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/casualshirt_hos.rsi/icon.png
rename to Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Casual/casualshirt_hos.rsi/icon.png
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/casualshirt_hos.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Casual/casualshirt_hos.rsi/meta.json
similarity index 100%
rename from Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/casualshirt_hos.rsi/meta.json
rename to Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Casual/casualshirt_hos.rsi/meta.json
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/casualshirt_qm.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Casual/casualshirt_qm.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/casualshirt_qm.rsi/equipped-INNERCLOTHING.png
rename to Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Casual/casualshirt_qm.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/casualshirt_qm.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Casual/casualshirt_qm.rsi/icon.png
similarity index 100%
rename from Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/casualshirt_qm.rsi/icon.png
rename to Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Casual/casualshirt_qm.rsi/icon.png
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/casualshirt_qm.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Casual/casualshirt_qm.rsi/meta.json
similarity index 100%
rename from Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/casualshirt_qm.rsi/meta.json
rename to Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Casual/casualshirt_qm.rsi/meta.json
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/casualshirt_rd.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Casual/casualshirt_rd.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/casualshirt_rd.rsi/equipped-INNERCLOTHING.png
rename to Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Casual/casualshirt_rd.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/casualshirt_rd.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Casual/casualshirt_rd.rsi/icon.png
similarity index 100%
rename from Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/casualshirt_rd.rsi/icon.png
rename to Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Casual/casualshirt_rd.rsi/icon.png
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/casualshirt_rd.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Casual/casualshirt_rd.rsi/meta.json
similarity index 100%
rename from Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/casualshirt_rd.rsi/meta.json
rename to Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Casual/casualshirt_rd.rsi/meta.json
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/casualsyndicate.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Casual/casualsyndicate.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/casualsyndicate.rsi/equipped-INNERCLOTHING.png
rename to Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Casual/casualsyndicate.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/casualsyndicate.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Casual/casualsyndicate.rsi/icon.png
similarity index 100%
rename from Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/casualsyndicate.rsi/icon.png
rename to Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Casual/casualsyndicate.rsi/icon.png
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/casualsyndicate.rsi/inhand-left.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Casual/casualsyndicate.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/casualsyndicate.rsi/inhand-left.png
rename to Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Casual/casualsyndicate.rsi/inhand-left.png
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/casualsyndicate.rsi/inhand-right.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Casual/casualsyndicate.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/casualsyndicate.rsi/inhand-right.png
rename to Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Casual/casualsyndicate.rsi/inhand-right.png
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/casualsyndicate.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Casual/casualsyndicate.rsi/meta.json
similarity index 100%
rename from Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/casualsyndicate.rsi/meta.json
rename to Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Casual/casualsyndicate.rsi/meta.json
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/diplomat.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Centcom/diplomat.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/diplomat.rsi/equipped-INNERCLOTHING.png
rename to Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Centcom/diplomat.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/diplomat.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Centcom/diplomat.rsi/icon.png
similarity index 100%
rename from Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/diplomat.rsi/icon.png
rename to Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Centcom/diplomat.rsi/icon.png
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/diplomat.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Centcom/diplomat.rsi/meta.json
similarity index 100%
rename from Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/diplomat.rsi/meta.json
rename to Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Centcom/diplomat.rsi/meta.json
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/fancy_nanotrasen_representative.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Centcom/fancy_nanotrasen_representative.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/fancy_nanotrasen_representative.rsi/equipped-INNERCLOTHING.png
rename to Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Centcom/fancy_nanotrasen_representative.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/fancy_nanotrasen_representative.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Centcom/fancy_nanotrasen_representative.rsi/icon.png
similarity index 100%
rename from Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/fancy_nanotrasen_representative.rsi/icon.png
rename to Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Centcom/fancy_nanotrasen_representative.rsi/icon.png
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/fancy_nanotrasen_representative.rsi/inhand-left.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Centcom/fancy_nanotrasen_representative.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/fancy_nanotrasen_representative.rsi/inhand-left.png
rename to Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Centcom/fancy_nanotrasen_representative.rsi/inhand-left.png
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/fancy_nanotrasen_representative.rsi/inhand-right.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Centcom/fancy_nanotrasen_representative.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/fancy_nanotrasen_representative.rsi/inhand-right.png
rename to Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Centcom/fancy_nanotrasen_representative.rsi/inhand-right.png
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/fancy_nanotrasen_representative.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Centcom/fancy_nanotrasen_representative.rsi/meta.json
similarity index 100%
rename from Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/fancy_nanotrasen_representative.rsi/meta.json
rename to Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Centcom/fancy_nanotrasen_representative.rsi/meta.json
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Centcom/golden_liaison.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Centcom/golden_liaison.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..4f828b9cdce
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Centcom/golden_liaison.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Centcom/golden_liaison.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Centcom/golden_liaison.rsi/icon.png
new file mode 100644
index 00000000000..72f7dc39114
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Centcom/golden_liaison.rsi/icon.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Centcom/golden_liaison.rsi/inhand-left.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Centcom/golden_liaison.rsi/inhand-left.png
new file mode 100644
index 00000000000..c7e64842b35
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Centcom/golden_liaison.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Centcom/golden_liaison.rsi/inhand-right.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Centcom/golden_liaison.rsi/inhand-right.png
new file mode 100644
index 00000000000..805577442cb
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Centcom/golden_liaison.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Centcom/golden_liaison.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Centcom/golden_liaison.rsi/meta.json
new file mode 100644
index 00000000000..2b88fd3f715
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Centcom/golden_liaison.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+ "version": 1,
+ "license": "CC-BY-NC-SA-4.0",
+ "copyright": "original sprites by discord: Valniae (bbalint105), recoloured by @seyriix",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/hecu.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Centcom/hecu.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/hecu.rsi/equipped-INNERCLOTHING.png
rename to Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Centcom/hecu.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/hecu.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Centcom/hecu.rsi/icon.png
similarity index 100%
rename from Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/hecu.rsi/icon.png
rename to Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Centcom/hecu.rsi/icon.png
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/hecu.rsi/inhand-left.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Centcom/hecu.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/hecu.rsi/inhand-left.png
rename to Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Centcom/hecu.rsi/inhand-left.png
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/hecu.rsi/inhand-right.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Centcom/hecu.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/hecu.rsi/inhand-right.png
rename to Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Centcom/hecu.rsi/inhand-right.png
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/hecu.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Centcom/hecu.rsi/meta.json
similarity index 100%
rename from Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/hecu.rsi/meta.json
rename to Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Centcom/hecu.rsi/meta.json
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/nanotrasen_representative.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Centcom/nanotrasen_representative.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/nanotrasen_representative.rsi/equipped-INNERCLOTHING.png
rename to Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Centcom/nanotrasen_representative.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/nanotrasen_representative.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Centcom/nanotrasen_representative.rsi/icon.png
similarity index 100%
rename from Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/nanotrasen_representative.rsi/icon.png
rename to Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Centcom/nanotrasen_representative.rsi/icon.png
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/nanotrasen_representative.rsi/inhand-left.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Centcom/nanotrasen_representative.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/nanotrasen_representative.rsi/inhand-left.png
rename to Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Centcom/nanotrasen_representative.rsi/inhand-left.png
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/nanotrasen_representative.rsi/inhand-right.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Centcom/nanotrasen_representative.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/nanotrasen_representative.rsi/inhand-right.png
rename to Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Centcom/nanotrasen_representative.rsi/inhand-right.png
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/nanotrasen_representative.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Centcom/nanotrasen_representative.rsi/meta.json
similarity index 100%
rename from Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/nanotrasen_representative.rsi/meta.json
rename to Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Centcom/nanotrasen_representative.rsi/meta.json
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/navy_gold.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Centcom/navy_gold.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/navy_gold.rsi/equipped-INNERCLOTHING.png
rename to Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Centcom/navy_gold.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/navy_gold.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Centcom/navy_gold.rsi/icon.png
similarity index 100%
rename from Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/navy_gold.rsi/icon.png
rename to Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Centcom/navy_gold.rsi/icon.png
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/navy_gold.rsi/inhand-left.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Centcom/navy_gold.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/navy_gold.rsi/inhand-left.png
rename to Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Centcom/navy_gold.rsi/inhand-left.png
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/navy_gold.rsi/inhand-right.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Centcom/navy_gold.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/navy_gold.rsi/inhand-right.png
rename to Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Centcom/navy_gold.rsi/inhand-right.png
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/navy_gold.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Centcom/navy_gold.rsi/meta.json
similarity index 100%
rename from Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/navy_gold.rsi/meta.json
rename to Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Centcom/navy_gold.rsi/meta.json
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/specialoperations.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Centcom/specialoperations.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/specialoperations.rsi/equipped-INNERCLOTHING.png
rename to Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Centcom/specialoperations.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/specialoperations.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Centcom/specialoperations.rsi/icon.png
similarity index 100%
rename from Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/specialoperations.rsi/icon.png
rename to Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Centcom/specialoperations.rsi/icon.png
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/specialoperations.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Centcom/specialoperations.rsi/meta.json
similarity index 100%
rename from Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/specialoperations.rsi/meta.json
rename to Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Centcom/specialoperations.rsi/meta.json
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/bartender.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/bartender.rsi/equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..44d3b646c33
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/bartender.rsi/equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/bartender.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/bartender.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..1a17a1843df
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/bartender.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/bartender.rsi/folded-equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/bartender.rsi/folded-equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..44d3b646c33
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/bartender.rsi/folded-equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/bartender.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/bartender.rsi/folded-equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..dd9015ae2fa
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/bartender.rsi/folded-equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/bartender.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/bartender.rsi/icon.png
new file mode 100644
index 00000000000..a403b7442f2
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/bartender.rsi/icon.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/bartender.rsi/inhand-left.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/bartender.rsi/inhand-left.png
new file mode 100644
index 00000000000..f367313cf9b
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/bartender.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/bartender.rsi/inhand-right.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/bartender.rsi/inhand-right.png
new file mode 100644
index 00000000000..33aac693c47
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/bartender.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/bartender.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/bartender.rsi/meta.json
new file mode 100644
index 00000000000..e587169cb45
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/bartender.rsi/meta.json
@@ -0,0 +1,38 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039, monkey made by brainfood1183 (github), monkey made by brainfood1183 (github) for ss14, default suit edit by Skarletto (github)",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/captain.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/captain.rsi/equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..0134f44da2f
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/captain.rsi/equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/captain.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/captain.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..efa8c60bd55
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/captain.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/captain.rsi/folded-equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/captain.rsi/folded-equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..0134f44da2f
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/captain.rsi/folded-equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/captain.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/captain.rsi/folded-equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..266ea66e250
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/captain.rsi/folded-equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/captain.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/captain.rsi/icon.png
new file mode 100644
index 00000000000..e0c9f86274a
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/captain.rsi/icon.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/captain.rsi/inhand-left.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/captain.rsi/inhand-left.png
new file mode 100644
index 00000000000..aebf621ff9c
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/captain.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/captain.rsi/inhand-right.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/captain.rsi/inhand-right.png
new file mode 100644
index 00000000000..56f5030f2a9
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/captain.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/captain.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/captain.rsi/meta.json
new file mode 100644
index 00000000000..aca8baed093
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/captain.rsi/meta.json
@@ -0,0 +1,38 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d8138946b0ed06fced522729ac8eaa0596864329. In hand sprite scaled down by SonicHDC, monkey made by SonicHDC (github) for ss14, reptilian made by kuro(388673708753027083)",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/chef.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/chef.rsi/equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..cd0c5c8e798
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/chef.rsi/equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/chef.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/chef.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..6f8254b6fd6
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/chef.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/chef.rsi/folded-equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/chef.rsi/folded-equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..cd0c5c8e798
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/chef.rsi/folded-equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/chef.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/chef.rsi/folded-equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..dd9015ae2fa
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/chef.rsi/folded-equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/chef.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/chef.rsi/icon.png
new file mode 100644
index 00000000000..1f93c8160f0
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/chef.rsi/icon.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/chef.rsi/inhand-left.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/chef.rsi/inhand-left.png
new file mode 100644
index 00000000000..84e5e83e3fa
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/chef.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/chef.rsi/inhand-right.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/chef.rsi/inhand-right.png
new file mode 100644
index 00000000000..69ad696a104
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/chef.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/chef.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/chef.rsi/meta.json
new file mode 100644
index 00000000000..6986d7c78a7
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/chef.rsi/meta.json
@@ -0,0 +1,38 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8, monkey made by SonicHDC (github) for ss14, reptilian made by kuro(388673708753027083)",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/durathread_jumpsuit.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/durathread_jumpsuit.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/durathread_jumpsuit.rsi/equipped-INNERCLOTHING.png
rename to Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/durathread_jumpsuit.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/durathread_jumpsuit.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/durathread_jumpsuit.rsi/icon.png
similarity index 100%
rename from Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/durathread_jumpsuit.rsi/icon.png
rename to Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/durathread_jumpsuit.rsi/icon.png
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/durathread_jumpsuit.rsi/inhand-left.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/durathread_jumpsuit.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/durathread_jumpsuit.rsi/inhand-left.png
rename to Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/durathread_jumpsuit.rsi/inhand-left.png
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/durathread_jumpsuit.rsi/inhand-right.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/durathread_jumpsuit.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/durathread_jumpsuit.rsi/inhand-right.png
rename to Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/durathread_jumpsuit.rsi/inhand-right.png
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/durathread_jumpsuit.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/durathread_jumpsuit.rsi/meta.json
similarity index 100%
rename from Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/durathread_jumpsuit.rsi/meta.json
rename to Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/durathread_jumpsuit.rsi/meta.json
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/hop.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/hop.rsi/equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..29f255cef0b
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/hop.rsi/equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/hop.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/hop.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..4482c7ecc3c
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/hop.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/hop.rsi/folded-equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/hop.rsi/folded-equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..29f255cef0b
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/hop.rsi/folded-equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/hop.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/hop.rsi/folded-equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..8f8af0b0cc1
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/hop.rsi/folded-equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/hop.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/hop.rsi/icon.png
new file mode 100644
index 00000000000..72cd698b807
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/hop.rsi/icon.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/hop.rsi/inhand-left.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/hop.rsi/inhand-left.png
new file mode 100644
index 00000000000..1328f0e2203
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/hop.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/hop.rsi/inhand-right.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/hop.rsi/inhand-right.png
new file mode 100644
index 00000000000..b2998354a75
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/hop.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/hop.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/hop.rsi/meta.json
new file mode 100644
index 00000000000..b71c0e1d3aa
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/hop.rsi/meta.json
@@ -0,0 +1,38 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey made by SonicHDC (github) for ss14, reptilian made by kuro(388673708753027083)",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/hydro.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/hydro.rsi/equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..102ab3dc26b
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/hydro.rsi/equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/hydro.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/hydro.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..b31ecbc2f51
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/hydro.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/hydro.rsi/folded-equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/hydro.rsi/folded-equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..102ab3dc26b
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/hydro.rsi/folded-equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/hydro.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/hydro.rsi/folded-equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..925778c1d96
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/hydro.rsi/folded-equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/hydro.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/hydro.rsi/icon.png
new file mode 100644
index 00000000000..b95c9d63995
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/hydro.rsi/icon.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/hydro.rsi/inhand-left.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/hydro.rsi/inhand-left.png
new file mode 100644
index 00000000000..34e4c4b3c1e
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/hydro.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/hydro.rsi/inhand-right.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/hydro.rsi/inhand-right.png
new file mode 100644
index 00000000000..a9ba861650e
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/hydro.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/hydro.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/hydro.rsi/meta.json
new file mode 100644
index 00000000000..b0f280c4c24
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/hydro.rsi/meta.json
@@ -0,0 +1,38 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14, reptilian made by kuro(388673708753027083)",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/janitor.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/janitor.rsi/equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..892ed0d3b6c
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/janitor.rsi/equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/janitor.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/janitor.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..fe9d9fd9bb4
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/janitor.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/janitor.rsi/folded-equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/janitor.rsi/folded-equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..e2defeba0c1
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/janitor.rsi/folded-equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/janitor.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/janitor.rsi/folded-equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..80c393cdab1
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/janitor.rsi/folded-equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/janitor.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/janitor.rsi/icon.png
new file mode 100644
index 00000000000..1a0adb6f1a3
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/janitor.rsi/icon.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/janitor.rsi/inhand-left.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/janitor.rsi/inhand-left.png
new file mode 100644
index 00000000000..333d7bae8d3
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/janitor.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/janitor.rsi/inhand-right.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/janitor.rsi/inhand-right.png
new file mode 100644
index 00000000000..5db9b849d47
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/janitor.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/janitor.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/janitor.rsi/meta.json
new file mode 100644
index 00000000000..e32a280d135
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/janitor.rsi/meta.json
@@ -0,0 +1,38 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039, monkey taken from goonstation modified for ss14 by Jvne",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/kimono.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/kimono.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..aef80a61370
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/kimono.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/kimono.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/kimono.rsi/icon.png
new file mode 100644
index 00000000000..41453b3054d
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/kimono.rsi/icon.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/kimono.rsi/inhand-left.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/kimono.rsi/inhand-left.png
new file mode 100644
index 00000000000..ac6e7ace079
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/kimono.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/kimono.rsi/inhand-right.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/kimono.rsi/inhand-right.png
new file mode 100644
index 00000000000..274ba63b29a
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/kimono.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/kimono.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/kimono.rsi/meta.json
new file mode 100644
index 00000000000..541eeb740f1
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/kimono.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Sprite by joestarguy, code by kxvvv",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/mercer.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/mercer.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/mercer.rsi/equipped-INNERCLOTHING.png
rename to Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/mercer.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/mercer.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/mercer.rsi/icon.png
similarity index 100%
rename from Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/mercer.rsi/icon.png
rename to Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/mercer.rsi/icon.png
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/mercer.rsi/inhand-left.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/mercer.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/mercer.rsi/inhand-left.png
rename to Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/mercer.rsi/inhand-left.png
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/mercer.rsi/inhand-right.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/mercer.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/mercer.rsi/inhand-right.png
rename to Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/mercer.rsi/inhand-right.png
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/mercer.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/mercer.rsi/meta.json
similarity index 100%
rename from Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/mercer.rsi/meta.json
rename to Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/mercer.rsi/meta.json
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/mime.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/mime.rsi/equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..1a896d09372
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/mime.rsi/equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/mime.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/mime.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..b803ac61001
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/mime.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/mime.rsi/folded-equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/mime.rsi/folded-equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..1a896d09372
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/mime.rsi/folded-equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/mime.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/mime.rsi/folded-equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..4a8652c493f
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/mime.rsi/folded-equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/mime.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/mime.rsi/icon.png
new file mode 100644
index 00000000000..0cb59c1979b
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/mime.rsi/icon.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/mime.rsi/inhand-left.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/mime.rsi/inhand-left.png
new file mode 100644
index 00000000000..9808c1255d4
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/mime.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/mime.rsi/inhand-right.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/mime.rsi/inhand-right.png
new file mode 100644
index 00000000000..37b205768e0
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/mime.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/mime.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/mime.rsi/meta.json
new file mode 100644
index 00000000000..03a70cfcafa
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/mime.rsi/meta.json
@@ -0,0 +1,38 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8, monkey made by brainfood1183 (github) for ss14, reptilian made by kuro(388673708753027083), Resprited by github:DreamlyJack(624946166152298517)",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/passenger_quarterzip.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/passenger_quarterzip.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/passenger_quarterzip.rsi/equipped-INNERCLOTHING.png
rename to Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/passenger_quarterzip.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/passenger_quarterzip.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/passenger_quarterzip.rsi/icon.png
similarity index 100%
rename from Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/passenger_quarterzip.rsi/icon.png
rename to Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/passenger_quarterzip.rsi/icon.png
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/passenger_quarterzip.rsi/inhand-left.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/passenger_quarterzip.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/passenger_quarterzip.rsi/inhand-left.png
rename to Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/passenger_quarterzip.rsi/inhand-left.png
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/passenger_quarterzip.rsi/inhand-right.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/passenger_quarterzip.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/passenger_quarterzip.rsi/inhand-right.png
rename to Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/passenger_quarterzip.rsi/inhand-right.png
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/passenger_quarterzip.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/passenger_quarterzip.rsi/meta.json
similarity index 100%
rename from Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/passenger_quarterzip.rsi/meta.json
rename to Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Civilian/passenger_quarterzip.rsi/meta.json
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Engineering/atmos.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Engineering/atmos.rsi/equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..4fd9e0a298a
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Engineering/atmos.rsi/equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Engineering/atmos.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Engineering/atmos.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..82418208272
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Engineering/atmos.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Engineering/atmos.rsi/folded-equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Engineering/atmos.rsi/folded-equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..4fd9e0a298a
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Engineering/atmos.rsi/folded-equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Engineering/atmos.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Engineering/atmos.rsi/folded-equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..7ab1758bbc7
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Engineering/atmos.rsi/folded-equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Engineering/atmos.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Engineering/atmos.rsi/icon.png
new file mode 100644
index 00000000000..2929d360927
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Engineering/atmos.rsi/icon.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Engineering/atmos.rsi/inhand-left.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Engineering/atmos.rsi/inhand-left.png
new file mode 100644
index 00000000000..5f31602b187
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Engineering/atmos.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Engineering/atmos.rsi/inhand-right.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Engineering/atmos.rsi/inhand-right.png
new file mode 100644
index 00000000000..c5df8b73fbc
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Engineering/atmos.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Engineering/atmos.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Engineering/atmos.rsi/meta.json
new file mode 100644
index 00000000000..a438581472d
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Engineering/atmos.rsi/meta.json
@@ -0,0 +1,38 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8, monkey made by SonicHDC (github) for ss14, reptilian made by kuro(388673708753027083)",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Engineering/ce.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Engineering/ce.rsi/equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..15e8e1f912c
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Engineering/ce.rsi/equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Engineering/ce.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Engineering/ce.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..4dfc92de50b
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Engineering/ce.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Engineering/ce.rsi/folded-equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Engineering/ce.rsi/folded-equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..15e8e1f912c
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Engineering/ce.rsi/folded-equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Engineering/ce.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Engineering/ce.rsi/folded-equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..998a9326e66
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Engineering/ce.rsi/folded-equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Engineering/ce.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Engineering/ce.rsi/icon.png
new file mode 100644
index 00000000000..fcbdc143b1d
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Engineering/ce.rsi/icon.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Engineering/ce.rsi/inhand-left.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Engineering/ce.rsi/inhand-left.png
new file mode 100644
index 00000000000..be8f306df13
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Engineering/ce.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Engineering/ce.rsi/inhand-right.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Engineering/ce.rsi/inhand-right.png
new file mode 100644
index 00000000000..d4536558313
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Engineering/ce.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Engineering/ce.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Engineering/ce.rsi/meta.json
new file mode 100644
index 00000000000..c1215567dfa
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Engineering/ce.rsi/meta.json
@@ -0,0 +1,38 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github), modified by KingFroozy (github) for ss14",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Engineering/engineering.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Engineering/engineering.rsi/equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..bc138205b5e
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Engineering/engineering.rsi/equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Engineering/engineering.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Engineering/engineering.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..b71c63fd6e3
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Engineering/engineering.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Engineering/engineering.rsi/folded-equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Engineering/engineering.rsi/folded-equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..bc138205b5e
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Engineering/engineering.rsi/folded-equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Engineering/engineering.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Engineering/engineering.rsi/folded-equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..ade8c2c6ea0
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Engineering/engineering.rsi/folded-equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Engineering/engineering.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Engineering/engineering.rsi/icon.png
new file mode 100644
index 00000000000..3c6420e675e
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Engineering/engineering.rsi/icon.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Engineering/engineering.rsi/inhand-left.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Engineering/engineering.rsi/inhand-left.png
new file mode 100644
index 00000000000..cf69e2e3cb4
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Engineering/engineering.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Engineering/engineering.rsi/inhand-right.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Engineering/engineering.rsi/inhand-right.png
new file mode 100644
index 00000000000..2ff1950af25
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Engineering/engineering.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Engineering/engineering.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Engineering/engineering.rsi/meta.json
new file mode 100644
index 00000000000..6986d7c78a7
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Engineering/engineering.rsi/meta.json
@@ -0,0 +1,38 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8, monkey made by SonicHDC (github) for ss14, reptilian made by kuro(388673708753027083)",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Engineering/engineering_hazard.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Engineering/engineering_hazard.rsi/equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..bd4559830e6
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Engineering/engineering_hazard.rsi/equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Engineering/engineering_hazard.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Engineering/engineering_hazard.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..abc09c9ecd2
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Engineering/engineering_hazard.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Engineering/engineering_hazard.rsi/folded-equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Engineering/engineering_hazard.rsi/folded-equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..bd4559830e6
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Engineering/engineering_hazard.rsi/folded-equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Engineering/engineering_hazard.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Engineering/engineering_hazard.rsi/folded-equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..ffceaceabcf
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Engineering/engineering_hazard.rsi/folded-equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Engineering/engineering_hazard.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Engineering/engineering_hazard.rsi/icon.png
new file mode 100644
index 00000000000..2b14937536c
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Engineering/engineering_hazard.rsi/icon.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Engineering/engineering_hazard.rsi/inhand-left.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Engineering/engineering_hazard.rsi/inhand-left.png
new file mode 100644
index 00000000000..cf69e2e3cb4
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Engineering/engineering_hazard.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Engineering/engineering_hazard.rsi/inhand-right.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Engineering/engineering_hazard.rsi/inhand-right.png
new file mode 100644
index 00000000000..2ff1950af25
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Engineering/engineering_hazard.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Engineering/engineering_hazard.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Engineering/engineering_hazard.rsi/meta.json
new file mode 100644
index 00000000000..5ac62570c8e
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Engineering/engineering_hazard.rsi/meta.json
@@ -0,0 +1,38 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039, monkey made by brainfood1183 (github) for ss14, reptilian made by kuro(388673708753027083)",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Engineering/senior_engineer.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Engineering/senior_engineer.rsi/equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..d2bf1add194
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Engineering/senior_engineer.rsi/equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Engineering/senior_engineer.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Engineering/senior_engineer.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..b3139003b02
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Engineering/senior_engineer.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Engineering/senior_engineer.rsi/folded-equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Engineering/senior_engineer.rsi/folded-equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..d2bf1add194
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Engineering/senior_engineer.rsi/folded-equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Engineering/senior_engineer.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Engineering/senior_engineer.rsi/folded-equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..d2fef18792e
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Engineering/senior_engineer.rsi/folded-equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Engineering/senior_engineer.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Engineering/senior_engineer.rsi/icon.png
new file mode 100644
index 00000000000..27505e30808
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Engineering/senior_engineer.rsi/icon.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Engineering/senior_engineer.rsi/inhand-left.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Engineering/senior_engineer.rsi/inhand-left.png
new file mode 100644
index 00000000000..b0fc8982f64
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Engineering/senior_engineer.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Engineering/senior_engineer.rsi/inhand-right.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Engineering/senior_engineer.rsi/inhand-right.png
new file mode 100644
index 00000000000..cd00bfd1a66
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Engineering/senior_engineer.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Engineering/senior_engineer.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Engineering/senior_engineer.rsi/meta.json
new file mode 100644
index 00000000000..8f5c25580a0
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Engineering/senior_engineer.rsi/meta.json
@@ -0,0 +1,38 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Edit of hazard from tgstation at commit https://github.com/tgstation/tgstation/pull/67000, resprite by muriexlol, reptilian made by kuro(388673708753027083)",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/chemistry.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/chemistry.rsi/equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..86336106db7
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/chemistry.rsi/equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/chemistry.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/chemistry.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..097f3a4be89
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/chemistry.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/chemistry.rsi/folded-equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/chemistry.rsi/folded-equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..86336106db7
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/chemistry.rsi/folded-equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/chemistry.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/chemistry.rsi/folded-equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..984f5cd4c11
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/chemistry.rsi/folded-equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/chemistry.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/chemistry.rsi/icon.png
new file mode 100644
index 00000000000..f83d6a7246e
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/chemistry.rsi/icon.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/chemistry.rsi/inhand-left.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/chemistry.rsi/inhand-left.png
new file mode 100644
index 00000000000..bad4e867d62
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/chemistry.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/chemistry.rsi/inhand-right.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/chemistry.rsi/inhand-right.png
new file mode 100644
index 00000000000..e6544dfb69c
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/chemistry.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/chemistry.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/chemistry.rsi/meta.json
new file mode 100644
index 00000000000..ad4ba1870fd
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/chemistry.rsi/meta.json
@@ -0,0 +1,38 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey made by SonicHDC (github) for ss14, reptilian made by kuro(388673708753027083)",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/cmo.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/cmo.rsi/equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..f3799a3754a
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/cmo.rsi/equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/cmo.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/cmo.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..45024ef6d42
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/cmo.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/cmo.rsi/folded-equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/cmo.rsi/folded-equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..f3799a3754a
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/cmo.rsi/folded-equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/cmo.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/cmo.rsi/folded-equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..aa7735c3512
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/cmo.rsi/folded-equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/cmo.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/cmo.rsi/icon.png
new file mode 100644
index 00000000000..9ba01fecafe
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/cmo.rsi/icon.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/cmo.rsi/inhand-left.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/cmo.rsi/inhand-left.png
new file mode 100644
index 00000000000..534669eacd2
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/cmo.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/cmo.rsi/inhand-right.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/cmo.rsi/inhand-right.png
new file mode 100644
index 00000000000..24c4ea8575c
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/cmo.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/cmo.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/cmo.rsi/meta.json
new file mode 100644
index 00000000000..ad4ba1870fd
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/cmo.rsi/meta.json
@@ -0,0 +1,38 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey made by SonicHDC (github) for ss14, reptilian made by kuro(388673708753027083)",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/genetics.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/genetics.rsi/equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..e1a4bd41051
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/genetics.rsi/equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/genetics.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/genetics.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..df1dd306242
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/genetics.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/genetics.rsi/folded-equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/genetics.rsi/folded-equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..e1a4bd41051
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/genetics.rsi/folded-equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/genetics.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/genetics.rsi/folded-equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..f021e144367
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/genetics.rsi/folded-equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/genetics.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/genetics.rsi/icon.png
new file mode 100644
index 00000000000..e255080f43a
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/genetics.rsi/icon.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/genetics.rsi/inhand-left.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/genetics.rsi/inhand-left.png
new file mode 100644
index 00000000000..301465e828c
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/genetics.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/genetics.rsi/inhand-right.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/genetics.rsi/inhand-right.png
new file mode 100644
index 00000000000..c414199341d
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/genetics.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/genetics.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/genetics.rsi/meta.json
new file mode 100644
index 00000000000..16ab5bbe04d
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/genetics.rsi/meta.json
@@ -0,0 +1,38 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14, reptilian made by kuro(388673708753027083), Resprited by Mureixlol",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/medical.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/medical.rsi/equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..517e523f1ea
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/medical.rsi/equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/medical.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/medical.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..f2ac23c9486
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/medical.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/medical.rsi/folded-equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/medical.rsi/folded-equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..517e523f1ea
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/medical.rsi/folded-equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/medical.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/medical.rsi/folded-equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..dfeaea1d311
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/medical.rsi/folded-equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/medical.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/medical.rsi/icon.png
new file mode 100644
index 00000000000..662450d980d
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/medical.rsi/icon.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/medical.rsi/inhand-left.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/medical.rsi/inhand-left.png
new file mode 100644
index 00000000000..e154ff0120e
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/medical.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/medical.rsi/inhand-right.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/medical.rsi/inhand-right.png
new file mode 100644
index 00000000000..a3b9583c232
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/medical.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/medical.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/medical.rsi/meta.json
new file mode 100644
index 00000000000..b71c0e1d3aa
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/medical.rsi/meta.json
@@ -0,0 +1,38 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey made by SonicHDC (github) for ss14, reptilian made by kuro(388673708753027083)",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/paramedic.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/paramedic.rsi/equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..81c2e530360
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/paramedic.rsi/equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/paramedic.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/paramedic.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..4ffc827b1de
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/paramedic.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/paramedic.rsi/folded-equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/paramedic.rsi/folded-equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..81c2e530360
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/paramedic.rsi/folded-equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/paramedic.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/paramedic.rsi/folded-equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..c2c97c0b727
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/paramedic.rsi/folded-equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/paramedic.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/paramedic.rsi/icon.png
new file mode 100644
index 00000000000..a5433674ec1
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/paramedic.rsi/icon.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/paramedic.rsi/inhand-left.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/paramedic.rsi/inhand-left.png
new file mode 100644
index 00000000000..29ed754ec1d
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/paramedic.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/paramedic.rsi/inhand-right.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/paramedic.rsi/inhand-right.png
new file mode 100644
index 00000000000..3ea39f3463e
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/paramedic.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/paramedic.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/paramedic.rsi/meta.json
new file mode 100644
index 00000000000..ad4ba1870fd
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/paramedic.rsi/meta.json
@@ -0,0 +1,38 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey made by SonicHDC (github) for ss14, reptilian made by kuro(388673708753027083)",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/psychologist.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/psychologist.rsi/equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..f687086be98
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/psychologist.rsi/equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/psychologist.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/psychologist.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..c7acb2b4a05
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/psychologist.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/psychologist.rsi/folded-equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/psychologist.rsi/folded-equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..f687086be98
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/psychologist.rsi/folded-equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/psychologist.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/psychologist.rsi/folded-equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..02be1a1f803
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/psychologist.rsi/folded-equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/psychologist.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/psychologist.rsi/icon.png
new file mode 100644
index 00000000000..31a1a06958d
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/psychologist.rsi/icon.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/psychologist.rsi/inhand-left.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/psychologist.rsi/inhand-left.png
new file mode 100644
index 00000000000..3d5d498bbac
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/psychologist.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/psychologist.rsi/inhand-right.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/psychologist.rsi/inhand-right.png
new file mode 100644
index 00000000000..73e19be6581
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/psychologist.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/psychologist.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/psychologist.rsi/meta.json
new file mode 100644
index 00000000000..538255211c0
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/psychologist.rsi/meta.json
@@ -0,0 +1,38 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8 and inhand modified by emisse, monkey made by brainfood1183 (github) for ss14, reptilian made by kuro(388673708753027083)",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/senior_physician.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/senior_physician.rsi/equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..75e83bb3fac
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/senior_physician.rsi/equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/senior_physician.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/senior_physician.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..512cacf5f38
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/senior_physician.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/senior_physician.rsi/folded-equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/senior_physician.rsi/folded-equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..75e83bb3fac
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/senior_physician.rsi/folded-equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/senior_physician.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/senior_physician.rsi/folded-equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..56c2d27397a
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/senior_physician.rsi/folded-equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/senior_physician.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/senior_physician.rsi/icon.png
new file mode 100644
index 00000000000..6ce569e9ee0
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/senior_physician.rsi/icon.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/senior_physician.rsi/inhand-left.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/senior_physician.rsi/inhand-left.png
new file mode 100644
index 00000000000..e00bcbbd507
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/senior_physician.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/senior_physician.rsi/inhand-right.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/senior_physician.rsi/inhand-right.png
new file mode 100644
index 00000000000..5a38a8333dd
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/senior_physician.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/senior_physician.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/senior_physician.rsi/meta.json
new file mode 100644
index 00000000000..c1ce70300a7
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/senior_physician.rsi/meta.json
@@ -0,0 +1,38 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Edit by Nairodian (github) of paramedic from tgstation at pull request https://github.com/tgstation/tgstation/pull/48236, reptilian made by kuro(388673708753027083)",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/virology.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/virology.rsi/equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..c6eba7571ba
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/virology.rsi/equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/virology.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/virology.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..648b3c1a691
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/virology.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/virology.rsi/folded-equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/virology.rsi/folded-equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..c6eba7571ba
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/virology.rsi/folded-equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/virology.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/virology.rsi/folded-equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..292dfff4709
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/virology.rsi/folded-equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/virology.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/virology.rsi/icon.png
new file mode 100644
index 00000000000..8f8111aadf8
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/virology.rsi/icon.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/virology.rsi/inhand-left.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/virology.rsi/inhand-left.png
new file mode 100644
index 00000000000..5b2a90226dd
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/virology.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/virology.rsi/inhand-right.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/virology.rsi/inhand-right.png
new file mode 100644
index 00000000000..b18e7d4d8e3
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/virology.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/virology.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/virology.rsi/meta.json
new file mode 100644
index 00000000000..16ab5bbe04d
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Medical/virology.rsi/meta.json
@@ -0,0 +1,38 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14, reptilian made by kuro(388673708753027083), Resprited by Mureixlol",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/RND/rnd.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/RND/rnd.rsi/equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..e3165ae3874
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/RND/rnd.rsi/equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/RND/rnd.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/RND/rnd.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..66eb60b4929
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/RND/rnd.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/RND/rnd.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/RND/rnd.rsi/icon.png
new file mode 100644
index 00000000000..6c30c2cae6e
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/RND/rnd.rsi/icon.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/RND/rnd.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/RND/rnd.rsi/meta.json
new file mode 100644
index 00000000000..681241c6c7b
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/RND/rnd.rsi/meta.json
@@ -0,0 +1,22 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14, reptilian made by kuro(388673708753027083), resprited from https://github.com/space-syndicate/space-station-14/commit/ea49d33ef6875a9cac4a328dc24d39771d61debd by Deenkaide (github)",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/RND/rndturtle.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/RND/rndturtle.rsi/equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..e3165ae3874
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/RND/rndturtle.rsi/equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/RND/rndturtle.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/RND/rndturtle.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..404b75f43d9
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/RND/rndturtle.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/RND/rndturtle.rsi/folded-equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/RND/rndturtle.rsi/folded-equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..e3165ae3874
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/RND/rndturtle.rsi/folded-equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/RND/rndturtle.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/RND/rndturtle.rsi/folded-equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..deb0f83542f
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/RND/rndturtle.rsi/folded-equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/RND/rndturtle.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/RND/rndturtle.rsi/icon.png
new file mode 100644
index 00000000000..963ba61f180
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/RND/rndturtle.rsi/icon.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/RND/rndturtle.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/RND/rndturtle.rsi/meta.json
new file mode 100644
index 00000000000..e2613e4183e
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/RND/rndturtle.rsi/meta.json
@@ -0,0 +1,30 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14, reptilian made by kuro(388673708753027083), resprited from https://github.com/space-syndicate/space-station-14/commit/ea49d33ef6875a9cac4a328dc24d39771d61debd by Deenkaide (github)",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/RND/roboticist.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/RND/roboticist.rsi/equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..697b620bc7b
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/RND/roboticist.rsi/equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/RND/roboticist.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/RND/roboticist.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..de508115e69
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/RND/roboticist.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/RND/roboticist.rsi/folded-equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/RND/roboticist.rsi/folded-equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..697b620bc7b
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/RND/roboticist.rsi/folded-equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/RND/roboticist.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/RND/roboticist.rsi/folded-equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..29c667c13d9
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/RND/roboticist.rsi/folded-equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/RND/roboticist.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/RND/roboticist.rsi/icon.png
new file mode 100644
index 00000000000..ab39a7e17e4
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/RND/roboticist.rsi/icon.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/RND/roboticist.rsi/inhand-left.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/RND/roboticist.rsi/inhand-left.png
new file mode 100644
index 00000000000..d0bd2174369
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/RND/roboticist.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/RND/roboticist.rsi/inhand-right.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/RND/roboticist.rsi/inhand-right.png
new file mode 100644
index 00000000000..a20d35709d5
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/RND/roboticist.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/RND/roboticist.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/RND/roboticist.rsi/meta.json
new file mode 100644
index 00000000000..7064b07eb5b
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/RND/roboticist.rsi/meta.json
@@ -0,0 +1,38 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Sprite by DreamlyJack, monkey derivative made by brainfood1183 (github)",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/RND/scientist.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/RND/scientist.rsi/equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..215a7020d9b
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/RND/scientist.rsi/equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/RND/scientist.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/RND/scientist.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..e3bb19bb803
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/RND/scientist.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/RND/scientist.rsi/folded-equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/RND/scientist.rsi/folded-equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..215a7020d9b
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/RND/scientist.rsi/folded-equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/RND/scientist.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/RND/scientist.rsi/folded-equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..9818fa4b3d0
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/RND/scientist.rsi/folded-equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/RND/scientist.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/RND/scientist.rsi/icon.png
new file mode 100644
index 00000000000..5d69bc0ab7d
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/RND/scientist.rsi/icon.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/RND/scientist.rsi/inhand-left.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/RND/scientist.rsi/inhand-left.png
new file mode 100644
index 00000000000..d4c4b224fba
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/RND/scientist.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/RND/scientist.rsi/inhand-right.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/RND/scientist.rsi/inhand-right.png
new file mode 100644
index 00000000000..bc3dfb1b494
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/RND/scientist.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/RND/scientist.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/RND/scientist.rsi/meta.json
new file mode 100644
index 00000000000..31e1ffe0128
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/RND/scientist.rsi/meta.json
@@ -0,0 +1,38 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Sprite by DreamlyJack, monkey made by SonicHDC (github) for ss14",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/RND/senior_researcher.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/RND/senior_researcher.rsi/equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..872add5ae2a
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/RND/senior_researcher.rsi/equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/RND/senior_researcher.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/RND/senior_researcher.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..857c3c6f706
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/RND/senior_researcher.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/RND/senior_researcher.rsi/folded-equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/RND/senior_researcher.rsi/folded-equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..872add5ae2a
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/RND/senior_researcher.rsi/folded-equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/RND/senior_researcher.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/RND/senior_researcher.rsi/folded-equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..887e85e4c3b
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/RND/senior_researcher.rsi/folded-equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/RND/senior_researcher.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/RND/senior_researcher.rsi/icon.png
new file mode 100644
index 00000000000..e49f7c1cc34
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/RND/senior_researcher.rsi/icon.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/RND/senior_researcher.rsi/inhand-left.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/RND/senior_researcher.rsi/inhand-left.png
new file mode 100644
index 00000000000..2b5f21e6e6c
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/RND/senior_researcher.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/RND/senior_researcher.rsi/inhand-right.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/RND/senior_researcher.rsi/inhand-right.png
new file mode 100644
index 00000000000..921304fe757
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/RND/senior_researcher.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/RND/senior_researcher.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/RND/senior_researcher.rsi/meta.json
new file mode 100644
index 00000000000..34b50856a4e
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/RND/senior_researcher.rsi/meta.json
@@ -0,0 +1,38 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Edited by Nairodian (github) from the formal scientist jumpsuit by Flareguy for Space Station 14, reptilian made by kuro(388673708753027083), resprite by muriexlol",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/detective.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/detective.rsi/equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..f52412e54e2
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/detective.rsi/equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/detective.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/detective.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..a16eaacb452
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/detective.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/detective.rsi/folded-equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/detective.rsi/folded-equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..f52412e54e2
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/detective.rsi/folded-equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/detective.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/detective.rsi/folded-equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..bf9ea8453a5
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/detective.rsi/folded-equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/detective.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/detective.rsi/icon.png
new file mode 100644
index 00000000000..0825f3ab225
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/detective.rsi/icon.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/detective.rsi/inhand-left.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/detective.rsi/inhand-left.png
new file mode 100644
index 00000000000..7df372e3c8a
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/detective.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/detective.rsi/inhand-right.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/detective.rsi/inhand-right.png
new file mode 100644
index 00000000000..5e1581b51ab
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/detective.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/detective.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/detective.rsi/meta.json
new file mode 100644
index 00000000000..df9e0014778
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/detective.rsi/meta.json
@@ -0,0 +1,38 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5ea6d8b4422027d0c22cb415d1f05a08bf39aaa0, monkey made by SonicHDC (github) for ss14, reptilian made by kuro(388673708753027083)",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/detective_grey.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/detective_grey.rsi/equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..383232e5a19
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/detective_grey.rsi/equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/detective_grey.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/detective_grey.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..11efa63d450
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/detective_grey.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/detective_grey.rsi/folded-equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/detective_grey.rsi/folded-equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..383232e5a19
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/detective_grey.rsi/folded-equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/detective_grey.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/detective_grey.rsi/folded-equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..de73044fae1
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/detective_grey.rsi/folded-equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/detective_grey.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/detective_grey.rsi/icon.png
new file mode 100644
index 00000000000..bc8588057a9
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/detective_grey.rsi/icon.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/detective_grey.rsi/inhand-left.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/detective_grey.rsi/inhand-left.png
new file mode 100644
index 00000000000..d5ca96c85f6
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/detective_grey.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/detective_grey.rsi/inhand-right.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/detective_grey.rsi/inhand-right.png
new file mode 100644
index 00000000000..0fcbfbaf67a
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/detective_grey.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/detective_grey.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/detective_grey.rsi/meta.json
new file mode 100644
index 00000000000..df9e0014778
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/detective_grey.rsi/meta.json
@@ -0,0 +1,38 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5ea6d8b4422027d0c22cb415d1f05a08bf39aaa0, monkey made by SonicHDC (github) for ss14, reptilian made by kuro(388673708753027083)",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/hos.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/hos.rsi/equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..834be00c19a
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/hos.rsi/equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/hos.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/hos.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..0c1fab7c7bc
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/hos.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/hos.rsi/folded-equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/hos.rsi/folded-equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..834be00c19a
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/hos.rsi/folded-equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/hos.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/hos.rsi/folded-equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..8c337e5e223
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/hos.rsi/folded-equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/hos.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/hos.rsi/icon.png
new file mode 100644
index 00000000000..d806293ab2e
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/hos.rsi/icon.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/hos.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/hos.rsi/meta.json
new file mode 100644
index 00000000000..5913182389f
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/hos.rsi/meta.json
@@ -0,0 +1,38 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey made by SonicHDC (github) for ss14, reptilian made by kuro(388673708753027083)",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "overlay-inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "overlay-inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/hos.rsi/overlay-inhand-left.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/hos.rsi/overlay-inhand-left.png
new file mode 100644
index 00000000000..cedb1942e7c
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/hos.rsi/overlay-inhand-left.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/hos.rsi/overlay-inhand-right.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/hos.rsi/overlay-inhand-right.png
new file mode 100644
index 00000000000..8a353cc390f
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/hos.rsi/overlay-inhand-right.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/hos_alt.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/hos_alt.rsi/equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..f19b069d96f
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/hos_alt.rsi/equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/hos_alt.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/hos_alt.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..610f2ea2146
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/hos_alt.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/hos_alt.rsi/folded-equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/hos_alt.rsi/folded-equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..f19b069d96f
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/hos_alt.rsi/folded-equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/hos_alt.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/hos_alt.rsi/folded-equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..b37ec050746
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/hos_alt.rsi/folded-equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/hos_alt.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/hos_alt.rsi/icon.png
new file mode 100644
index 00000000000..f5759701b4e
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/hos_alt.rsi/icon.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/hos_alt.rsi/inhand-left.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/hos_alt.rsi/inhand-left.png
new file mode 100644
index 00000000000..8057d345ce8
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/hos_alt.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/hos_alt.rsi/inhand-right.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/hos_alt.rsi/inhand-right.png
new file mode 100644
index 00000000000..e8b3d206596
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/hos_alt.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/hos_alt.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/hos_alt.rsi/meta.json
new file mode 100644
index 00000000000..8d942faadc7
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/hos_alt.rsi/meta.json
@@ -0,0 +1,38 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8, monkey made by SonicHDC (github) for ss14, edited by Deenkaide (github)",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/hos_blue.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/hos_blue.rsi/equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..53892503a09
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/hos_blue.rsi/equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/hos_blue.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/hos_blue.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..6c5aa4a64bc
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/hos_blue.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/hos_blue.rsi/folded-equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/hos_blue.rsi/folded-equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..53892503a09
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/hos_blue.rsi/folded-equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/hos_blue.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/hos_blue.rsi/folded-equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..2df0159765e
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/hos_blue.rsi/folded-equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/hos_blue.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/hos_blue.rsi/icon.png
new file mode 100644
index 00000000000..f4f23bf01c4
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/hos_blue.rsi/icon.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/hos_blue.rsi/inhand-left.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/hos_blue.rsi/inhand-left.png
new file mode 100644
index 00000000000..b65924044ac
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/hos_blue.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/hos_blue.rsi/inhand-right.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/hos_blue.rsi/inhand-right.png
new file mode 100644
index 00000000000..b8c0df6b66a
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/hos_blue.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/hos_blue.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/hos_blue.rsi/meta.json
new file mode 100644
index 00000000000..7669eb3f37b
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/hos_blue.rsi/meta.json
@@ -0,0 +1,38 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/28d0be60aa8bbe1ca87a5d129487bb6f60839ac4. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14, reptilian made by kuro(388673708753027083)",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/hos_grey.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/hos_grey.rsi/equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..cfd09a38a3e
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/hos_grey.rsi/equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/hos_grey.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/hos_grey.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..72988492b25
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/hos_grey.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/hos_grey.rsi/folded-equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/hos_grey.rsi/folded-equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..cfd09a38a3e
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/hos_grey.rsi/folded-equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/hos_grey.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/hos_grey.rsi/folded-equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..a7469a91436
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/hos_grey.rsi/folded-equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/hos_grey.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/hos_grey.rsi/icon.png
new file mode 100644
index 00000000000..438da17f585
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/hos_grey.rsi/icon.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/hos_grey.rsi/inhand-left.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/hos_grey.rsi/inhand-left.png
new file mode 100644
index 00000000000..30cb457ba01
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/hos_grey.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/hos_grey.rsi/inhand-right.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/hos_grey.rsi/inhand-right.png
new file mode 100644
index 00000000000..cda7720c458
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/hos_grey.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/hos_grey.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/hos_grey.rsi/meta.json
new file mode 100644
index 00000000000..7669eb3f37b
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/hos_grey.rsi/meta.json
@@ -0,0 +1,38 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/28d0be60aa8bbe1ca87a5d129487bb6f60839ac4. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14, reptilian made by kuro(388673708753027083)",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/security.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/security.rsi/equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..5b0e222fb35
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/security.rsi/equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/security.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/security.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..aaa7f655f9a
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/security.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/security.rsi/folded-equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/security.rsi/folded-equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..5b0e222fb35
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/security.rsi/folded-equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/security.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/security.rsi/folded-equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..47a81dac0dd
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/security.rsi/folded-equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/security.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/security.rsi/icon.png
new file mode 100644
index 00000000000..8728919a7e7
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/security.rsi/icon.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/security.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/security.rsi/meta.json
new file mode 100644
index 00000000000..5913182389f
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/security.rsi/meta.json
@@ -0,0 +1,38 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey made by SonicHDC (github) for ss14, reptilian made by kuro(388673708753027083)",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "overlay-inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "overlay-inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/security.rsi/overlay-inhand-left.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/security.rsi/overlay-inhand-left.png
new file mode 100644
index 00000000000..f6bb7be725d
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/security.rsi/overlay-inhand-left.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/security.rsi/overlay-inhand-right.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/security.rsi/overlay-inhand-right.png
new file mode 100644
index 00000000000..139eaee057d
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/security.rsi/overlay-inhand-right.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/security_black.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/security_black.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..4a2b11e90de
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/security_black.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/security_black.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/security_black.rsi/icon.png
new file mode 100644
index 00000000000..5ceca9ebd9b
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/security_black.rsi/icon.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/security_black.rsi/inhand-left.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/security_black.rsi/inhand-left.png
new file mode 100644
index 00000000000..a9c9507c913
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/security_black.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/security_black.rsi/inhand-right.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/security_black.rsi/inhand-right.png
new file mode 100644
index 00000000000..a36ecf2943d
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/security_black.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/security_black.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/security_black.rsi/meta.json
new file mode 100644
index 00000000000..0b3c9e53e61
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/security_black.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Made by Vlagded (Telegram) ",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/security_grey.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/security_grey.rsi/equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..86e323724bc
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/security_grey.rsi/equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/security_grey.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/security_grey.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..cbd34f89ac0
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/security_grey.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/security_grey.rsi/folded-equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/security_grey.rsi/folded-equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..86e323724bc
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/security_grey.rsi/folded-equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/security_grey.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/security_grey.rsi/folded-equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..ba064325832
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/security_grey.rsi/folded-equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/security_grey.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/security_grey.rsi/icon.png
new file mode 100644
index 00000000000..473145cf071
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/security_grey.rsi/icon.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/security_grey.rsi/inhand-left.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/security_grey.rsi/inhand-left.png
new file mode 100644
index 00000000000..8e8c24e31d0
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/security_grey.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/security_grey.rsi/inhand-right.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/security_grey.rsi/inhand-right.png
new file mode 100644
index 00000000000..c4762dcd586
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/security_grey.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/security_grey.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/security_grey.rsi/meta.json
new file mode 100644
index 00000000000..7669eb3f37b
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/security_grey.rsi/meta.json
@@ -0,0 +1,38 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/28d0be60aa8bbe1ca87a5d129487bb6f60839ac4. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14, reptilian made by kuro(388673708753027083)",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/senior_officer.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/senior_officer.rsi/equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..ceb7ef07d0a
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/senior_officer.rsi/equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/senior_officer.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/senior_officer.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..b640ef1beee
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/senior_officer.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/senior_officer.rsi/folded-equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/senior_officer.rsi/folded-equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..ceb7ef07d0a
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/senior_officer.rsi/folded-equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/senior_officer.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/senior_officer.rsi/folded-equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..b708fe2a11b
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/senior_officer.rsi/folded-equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/senior_officer.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/senior_officer.rsi/icon.png
new file mode 100644
index 00000000000..4aa45edab3c
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/senior_officer.rsi/icon.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/senior_officer.rsi/inhand-left.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/senior_officer.rsi/inhand-left.png
new file mode 100644
index 00000000000..d75e52eda9d
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/senior_officer.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/senior_officer.rsi/inhand-right.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/senior_officer.rsi/inhand-right.png
new file mode 100644
index 00000000000..c96f2f1007d
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/senior_officer.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/senior_officer.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/senior_officer.rsi/meta.json
new file mode 100644
index 00000000000..a6e94e4dedf
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/senior_officer.rsi/meta.json
@@ -0,0 +1,38 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Edit by Nairodian (github) of secred_s taken from tgstation at pull request https://github.com/tgstation/tgstation/pull/2984, resprite by muriexlol, reptilian made by kuro(388673708753027083)",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/warden.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/warden.rsi/equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..7e81fa87f4e
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/warden.rsi/equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/warden.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/warden.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..0cdd0b35971
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/warden.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/warden.rsi/folded-equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/warden.rsi/folded-equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..7e81fa87f4e
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/warden.rsi/folded-equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/warden.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/warden.rsi/folded-equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..b76cc7e0ec9
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/warden.rsi/folded-equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/warden.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/warden.rsi/icon.png
new file mode 100644
index 00000000000..2ea7068b003
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/warden.rsi/icon.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/warden.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/warden.rsi/meta.json
new file mode 100644
index 00000000000..5913182389f
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/warden.rsi/meta.json
@@ -0,0 +1,38 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey made by SonicHDC (github) for ss14, reptilian made by kuro(388673708753027083)",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "overlay-inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "overlay-inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/warden.rsi/overlay-inhand-left.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/warden.rsi/overlay-inhand-left.png
new file mode 100644
index 00000000000..d3a01e1a6cc
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/warden.rsi/overlay-inhand-left.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/warden.rsi/overlay-inhand-right.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/warden.rsi/overlay-inhand-right.png
new file mode 100644
index 00000000000..ffe5f93eba5
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Security/warden.rsi/overlay-inhand-right.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/breverb.rsi/equipped-INNERCLOTHING-vox.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Syndicate/breverb.rsi/equipped-INNERCLOTHING-vox.png
similarity index 100%
rename from Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/breverb.rsi/equipped-INNERCLOTHING-vox.png
rename to Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Syndicate/breverb.rsi/equipped-INNERCLOTHING-vox.png
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/breverb.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Syndicate/breverb.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/breverb.rsi/equipped-INNERCLOTHING.png
rename to Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Syndicate/breverb.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/breverb.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Syndicate/breverb.rsi/icon.png
similarity index 100%
rename from Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/breverb.rsi/icon.png
rename to Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Syndicate/breverb.rsi/icon.png
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/breverb.rsi/inhand-left.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Syndicate/breverb.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/breverb.rsi/inhand-left.png
rename to Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Syndicate/breverb.rsi/inhand-left.png
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/breverb.rsi/inhand-right.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Syndicate/breverb.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/breverb.rsi/inhand-right.png
rename to Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Syndicate/breverb.rsi/inhand-right.png
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/breverb.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Syndicate/breverb.rsi/meta.json
similarity index 100%
rename from Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/breverb.rsi/meta.json
rename to Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Syndicate/breverb.rsi/meta.json
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Syndicate/mercenary.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Syndicate/mercenary.rsi/equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..56e74d57e12
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Syndicate/mercenary.rsi/equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Syndicate/mercenary.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Syndicate/mercenary.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..a43d5f5acca
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Syndicate/mercenary.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Syndicate/mercenary.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Syndicate/mercenary.rsi/icon.png
new file mode 100644
index 00000000000..c13950ac48c
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Syndicate/mercenary.rsi/icon.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Syndicate/mercenary.rsi/inhand-left.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Syndicate/mercenary.rsi/inhand-left.png
new file mode 100644
index 00000000000..deeceae816e
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Syndicate/mercenary.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Syndicate/mercenary.rsi/inhand-right.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Syndicate/mercenary.rsi/inhand-right.png
new file mode 100644
index 00000000000..225759fb4ae
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Syndicate/mercenary.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Syndicate/mercenary.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Syndicate/mercenary.rsi/meta.json
new file mode 100644
index 00000000000..c5682d0a198
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Syndicate/mercenary.rsi/meta.json
@@ -0,0 +1,30 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "modified sprite from Jackal298 based on the sprite from tgstation at commit https://github.com/tgstation/tgstation/commit/d7e905e4d5ab2b0a8ce210c6ad686aeeebbab426, monkey made by Jackal298 for ss14",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Syndicate/operative.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Syndicate/operative.rsi/equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..5e4d0b0867b
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Syndicate/operative.rsi/equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Syndicate/operative.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Syndicate/operative.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..a017df53e3f
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Syndicate/operative.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Syndicate/operative.rsi/folded-equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Syndicate/operative.rsi/folded-equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..5e4d0b0867b
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Syndicate/operative.rsi/folded-equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Syndicate/operative.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Syndicate/operative.rsi/folded-equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..b78d6986066
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Syndicate/operative.rsi/folded-equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Syndicate/operative.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Syndicate/operative.rsi/icon.png
new file mode 100644
index 00000000000..5f8f62440c4
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Syndicate/operative.rsi/icon.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Syndicate/operative.rsi/inhand-left.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Syndicate/operative.rsi/inhand-left.png
new file mode 100644
index 00000000000..81b43846cb0
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Syndicate/operative.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Syndicate/operative.rsi/inhand-right.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Syndicate/operative.rsi/inhand-right.png
new file mode 100644
index 00000000000..18756ef6a09
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Syndicate/operative.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Syndicate/operative.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Syndicate/operative.rsi/meta.json
new file mode 100644
index 00000000000..98e764bca2e
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Syndicate/operative.rsi/meta.json
@@ -0,0 +1,38 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8, monkey made by brainfood1183 (github) for ss14, reptilian made by kuro(388673708753027083)",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/ancient.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/ancient.rsi/equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..b349e53aace
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/ancient.rsi/equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/ancient.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/ancient.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..3fad51040a0
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/ancient.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/ancient.rsi/folded-equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/ancient.rsi/folded-equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..b349e53aace
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/ancient.rsi/folded-equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/ancient.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/ancient.rsi/folded-equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..e332e038f3b
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/ancient.rsi/folded-equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/ancient.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/ancient.rsi/meta.json
new file mode 100644
index 00000000000..80790e8123e
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/ancient.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from paradise at commit https://github.com/ParadiseSS13/Paradise/commit/ade220d0cb13fab206f75e91ecfb31890937572a modified for SS14 by Jvne, monkey made by brainfood1183 (github) for ss14",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/aqua.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/aqua.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..968753efa28
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/aqua.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/aqua.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/aqua.rsi/folded-equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..1bcf75f6a4b
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/aqua.rsi/folded-equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/aqua.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/aqua.rsi/meta.json
new file mode 100644
index 00000000000..da7f588e50c
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/aqua.rsi/meta.json
@@ -0,0 +1,19 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from paradise at commit https://github.com/ParadiseSS13/Paradise/commit/ade220d0cb13fab206f75e91ecfb31890937572a modified for SS14 by Jvne",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/black.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/black.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..88815d2324e
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/black.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/black.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/black.rsi/folded-equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..86d48c8eee1
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/black.rsi/folded-equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/black.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/black.rsi/meta.json
new file mode 100644
index 00000000000..da7f588e50c
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/black.rsi/meta.json
@@ -0,0 +1,19 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from paradise at commit https://github.com/ParadiseSS13/Paradise/commit/ade220d0cb13fab206f75e91ecfb31890937572a modified for SS14 by Jvne",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/blue.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/blue.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..fbf66488e7f
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/blue.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/blue.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/blue.rsi/folded-equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..7a8ea4a5eb5
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/blue.rsi/folded-equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/blue.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/blue.rsi/meta.json
new file mode 100644
index 00000000000..da7f588e50c
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/blue.rsi/meta.json
@@ -0,0 +1,19 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from paradise at commit https://github.com/ParadiseSS13/Paradise/commit/ade220d0cb13fab206f75e91ecfb31890937572a modified for SS14 by Jvne",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/brown.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/brown.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..065dab7e3bc
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/brown.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/brown.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/brown.rsi/folded-equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..fcbea44f931
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/brown.rsi/folded-equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/brown.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/brown.rsi/meta.json
new file mode 100644
index 00000000000..da7f588e50c
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/brown.rsi/meta.json
@@ -0,0 +1,19 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from paradise at commit https://github.com/ParadiseSS13/Paradise/commit/ade220d0cb13fab206f75e91ecfb31890937572a modified for SS14 by Jvne",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/color.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/color.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..70ce0935493
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/color.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/color.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/color.rsi/folded-equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..c4f8b44b0a1
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/color.rsi/folded-equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/color.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/color.rsi/icon.png
new file mode 100644
index 00000000000..02499c42a65
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/color.rsi/icon.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/color.rsi/inhand-left.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/color.rsi/inhand-left.png
new file mode 100644
index 00000000000..29ed754ec1d
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/color.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/color.rsi/inhand-right.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/color.rsi/inhand-right.png
new file mode 100644
index 00000000000..3ea39f3463e
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/color.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/color.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/color.rsi/meta.json
new file mode 100644
index 00000000000..bbbc3b726f1
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/color.rsi/meta.json
@@ -0,0 +1,30 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/993de554ecfc30cc45f8340819c5a60ef1eee7e1 and modified for SS14 by Flareguy & P3MOIRA",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/darkblue.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/darkblue.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..e1bf45ae010
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/darkblue.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/darkblue.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/darkblue.rsi/folded-equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..5c6ec8b1e62
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/darkblue.rsi/folded-equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/darkblue.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/darkblue.rsi/meta.json
new file mode 100644
index 00000000000..da7f588e50c
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/darkblue.rsi/meta.json
@@ -0,0 +1,19 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from paradise at commit https://github.com/ParadiseSS13/Paradise/commit/ade220d0cb13fab206f75e91ecfb31890937572a modified for SS14 by Jvne",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/darkgreen.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/darkgreen.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..5f7c32023f4
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/darkgreen.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/darkgreen.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/darkgreen.rsi/folded-equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..6477c9d6888
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/darkgreen.rsi/folded-equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/darkgreen.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/darkgreen.rsi/meta.json
new file mode 100644
index 00000000000..da7f588e50c
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/darkgreen.rsi/meta.json
@@ -0,0 +1,19 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from paradise at commit https://github.com/ParadiseSS13/Paradise/commit/ade220d0cb13fab206f75e91ecfb31890937572a modified for SS14 by Jvne",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/darkred.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/darkred.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..e5869361db1
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/darkred.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/darkred.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/darkred.rsi/folded-equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..a25d62d6fa1
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/darkred.rsi/folded-equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/darkred.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/darkred.rsi/meta.json
new file mode 100644
index 00000000000..da7f588e50c
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/darkred.rsi/meta.json
@@ -0,0 +1,19 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from paradise at commit https://github.com/ParadiseSS13/Paradise/commit/ade220d0cb13fab206f75e91ecfb31890937572a modified for SS14 by Jvne",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/green.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/green.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..3aea2cdfb42
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/green.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/green.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/green.rsi/folded-equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..70f01b76098
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/green.rsi/folded-equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/green.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/green.rsi/meta.json
new file mode 100644
index 00000000000..da7f588e50c
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/green.rsi/meta.json
@@ -0,0 +1,19 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from paradise at commit https://github.com/ParadiseSS13/Paradise/commit/ade220d0cb13fab206f75e91ecfb31890937572a modified for SS14 by Jvne",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/grey.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/grey.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..f0c4f7fbc65
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/grey.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/grey.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/grey.rsi/folded-equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..3e77233c83f
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/grey.rsi/folded-equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/grey.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/grey.rsi/meta.json
new file mode 100644
index 00000000000..da7f588e50c
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/grey.rsi/meta.json
@@ -0,0 +1,19 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from paradise at commit https://github.com/ParadiseSS13/Paradise/commit/ade220d0cb13fab206f75e91ecfb31890937572a modified for SS14 by Jvne",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/lightblue.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/lightblue.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..3644d162e26
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/lightblue.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/lightblue.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/lightblue.rsi/folded-equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..73fa95bddee
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/lightblue.rsi/folded-equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/lightblue.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/lightblue.rsi/meta.json
new file mode 100644
index 00000000000..da7f588e50c
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/lightblue.rsi/meta.json
@@ -0,0 +1,19 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from paradise at commit https://github.com/ParadiseSS13/Paradise/commit/ade220d0cb13fab206f75e91ecfb31890937572a modified for SS14 by Jvne",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/lightbrown.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/lightbrown.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..5827e0275fa
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/lightbrown.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/lightbrown.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/lightbrown.rsi/folded-equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..cac2a20bce7
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/lightbrown.rsi/folded-equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/lightbrown.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/lightbrown.rsi/meta.json
new file mode 100644
index 00000000000..da7f588e50c
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/lightbrown.rsi/meta.json
@@ -0,0 +1,19 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from paradise at commit https://github.com/ParadiseSS13/Paradise/commit/ade220d0cb13fab206f75e91ecfb31890937572a modified for SS14 by Jvne",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/lightpurple.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/lightpurple.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..d10ab54ff3c
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/lightpurple.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/lightpurple.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/lightpurple.rsi/folded-equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..9d9f78b5ab7
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/lightpurple.rsi/folded-equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/lightpurple.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/lightpurple.rsi/meta.json
new file mode 100644
index 00000000000..da7f588e50c
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/lightpurple.rsi/meta.json
@@ -0,0 +1,19 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from paradise at commit https://github.com/ParadiseSS13/Paradise/commit/ade220d0cb13fab206f75e91ecfb31890937572a modified for SS14 by Jvne",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/lightred.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/lightred.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..c30c7686e5e
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/lightred.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/lightred.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/lightred.rsi/folded-equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..62eb0aeb70e
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/lightred.rsi/folded-equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/lightred.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/lightred.rsi/meta.json
new file mode 100644
index 00000000000..da7f588e50c
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/lightred.rsi/meta.json
@@ -0,0 +1,19 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from paradise at commit https://github.com/ParadiseSS13/Paradise/commit/ade220d0cb13fab206f75e91ecfb31890937572a modified for SS14 by Jvne",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/orange.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/orange.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..cc771340d3a
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/orange.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/orange.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/orange.rsi/folded-equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..910c9bd9543
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/orange.rsi/folded-equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/orange.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/orange.rsi/meta.json
new file mode 100644
index 00000000000..da7f588e50c
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/orange.rsi/meta.json
@@ -0,0 +1,19 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from paradise at commit https://github.com/ParadiseSS13/Paradise/commit/ade220d0cb13fab206f75e91ecfb31890937572a modified for SS14 by Jvne",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/pink.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/pink.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..8a0483ec5ea
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/pink.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/pink.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/pink.rsi/folded-equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..e20d236fc50
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/pink.rsi/folded-equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/pink.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/pink.rsi/meta.json
new file mode 100644
index 00000000000..da7f588e50c
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/pink.rsi/meta.json
@@ -0,0 +1,19 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from paradise at commit https://github.com/ParadiseSS13/Paradise/commit/ade220d0cb13fab206f75e91ecfb31890937572a modified for SS14 by Jvne",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/prisoner.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/prisoner.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..38d47ca2de4
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/prisoner.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/prisoner.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/prisoner.rsi/folded-equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..136be8c75c0
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/prisoner.rsi/folded-equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/prisoner.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/prisoner.rsi/icon.png
new file mode 100644
index 00000000000..74aa3f31007
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/prisoner.rsi/icon.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/prisoner.rsi/inhand-left.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/prisoner.rsi/inhand-left.png
new file mode 100644
index 00000000000..2eefc71652d
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/prisoner.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/prisoner.rsi/inhand-right.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/prisoner.rsi/inhand-right.png
new file mode 100644
index 00000000000..664d109aac3
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/prisoner.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/prisoner.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/prisoner.rsi/meta.json
new file mode 100644
index 00000000000..f19cb27d3b4
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/prisoner.rsi/meta.json
@@ -0,0 +1,30 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from paradise at commit https://github.com/ParadiseSS13/Paradise/commit/ade220d0cb13fab206f75e91ecfb31890937572a modified for SS14 by Jvne",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ },
+ {
+ "name": "icon"
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/purple.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/purple.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..39e6240264e
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/purple.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/purple.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/purple.rsi/folded-equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..83920b1a018
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/purple.rsi/folded-equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/purple.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/purple.rsi/meta.json
new file mode 100644
index 00000000000..da7f588e50c
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/purple.rsi/meta.json
@@ -0,0 +1,19 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from paradise at commit https://github.com/ParadiseSS13/Paradise/commit/ade220d0cb13fab206f75e91ecfb31890937572a modified for SS14 by Jvne",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/rainbow.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/rainbow.rsi/equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..249b3dd2c01
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/rainbow.rsi/equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/rainbow.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/rainbow.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..e17d3ba1a89
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/rainbow.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/rainbow.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/rainbow.rsi/icon.png
new file mode 100644
index 00000000000..231336f54cf
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/rainbow.rsi/icon.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/rainbow.rsi/inhand-left.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/rainbow.rsi/inhand-left.png
new file mode 100644
index 00000000000..471a06d82b5
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/rainbow.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/rainbow.rsi/inhand-right.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/rainbow.rsi/inhand-right.png
new file mode 100644
index 00000000000..361d13f0fc6
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/rainbow.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/rainbow.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/rainbow.rsi/meta.json
new file mode 100644
index 00000000000..7f7c2e12801
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/rainbow.rsi/meta.json
@@ -0,0 +1,30 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from paradise at commit https://github.com/ParadiseSS13/Paradise/commit/ade220d0cb13fab206f75e91ecfb31890937572a modified for SS14 by Jvne",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ },
+ {
+ "name": "icon"
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/red.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/red.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..db4fd32e79b
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/red.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/red.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/red.rsi/folded-equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..b939192f62b
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/red.rsi/folded-equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/red.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/red.rsi/meta.json
new file mode 100644
index 00000000000..da7f588e50c
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/red.rsi/meta.json
@@ -0,0 +1,19 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from paradise at commit https://github.com/ParadiseSS13/Paradise/commit/ade220d0cb13fab206f75e91ecfb31890937572a modified for SS14 by Jvne",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/white.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/white.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..eab4c98e860
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/white.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/white.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/white.rsi/folded-equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..610b62a0bbe
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/white.rsi/folded-equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/white.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/white.rsi/meta.json
new file mode 100644
index 00000000000..da7f588e50c
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/white.rsi/meta.json
@@ -0,0 +1,19 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from paradise at commit https://github.com/ParadiseSS13/Paradise/commit/ade220d0cb13fab206f75e91ecfb31890937572a modified for SS14 by Jvne",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/yellow.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/yellow.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..954d7db9098
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/yellow.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/yellow.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/yellow.rsi/folded-equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..781d7323559
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/yellow.rsi/folded-equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/yellow.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/yellow.rsi/meta.json
new file mode 100644
index 00000000000..da7f588e50c
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/color/yellow.rsi/meta.json
@@ -0,0 +1,19 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from paradise at commit https://github.com/ParadiseSS13/Paradise/commit/ade220d0cb13fab206f75e91ecfb31890937572a modified for SS14 by Jvne",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Other/Overalls/Cargo/cargotech.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Other/Overalls/Cargo/cargotech.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..9db0f6efe16
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Other/Overalls/Cargo/cargotech.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Other/Overalls/Cargo/cargotech.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Other/Overalls/Cargo/cargotech.rsi/icon.png
new file mode 100644
index 00000000000..0ad8078e50f
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Other/Overalls/Cargo/cargotech.rsi/icon.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Other/Overalls/Cargo/cargotech.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Other/Overalls/Cargo/cargotech.rsi/meta.json
new file mode 100644
index 00000000000..8f7d33233ce
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Uniforms/Other/Overalls/Cargo/cargotech.rsi/meta.json
@@ -0,0 +1,18 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from paradise at commit https://github.com/ParadiseSS13/Paradise/commit/207695cbdab4cb8f81a25cdbb201a88a6851d78b",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Other/Overalls/Cargo/salvage.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Other/Overalls/Cargo/salvage.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..c50a1ef536c
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Other/Overalls/Cargo/salvage.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Other/Overalls/Cargo/salvage.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Other/Overalls/Cargo/salvage.rsi/icon.png
new file mode 100644
index 00000000000..564aec33e9d
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Other/Overalls/Cargo/salvage.rsi/icon.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Other/Overalls/Cargo/salvage.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Other/Overalls/Cargo/salvage.rsi/meta.json
new file mode 100644
index 00000000000..8f7d33233ce
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Uniforms/Other/Overalls/Cargo/salvage.rsi/meta.json
@@ -0,0 +1,18 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from paradise at commit https://github.com/ParadiseSS13/Paradise/commit/207695cbdab4cb8f81a25cdbb201a88a6851d78b",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Other/Overalls/Cargo/shaft_miner.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Other/Overalls/Cargo/shaft_miner.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..e34c9860f8c
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Other/Overalls/Cargo/shaft_miner.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Other/Overalls/Cargo/shaft_miner.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Other/Overalls/Cargo/shaft_miner.rsi/icon.png
new file mode 100644
index 00000000000..22bd6f16640
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Other/Overalls/Cargo/shaft_miner.rsi/icon.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Other/Overalls/Cargo/shaft_miner.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Other/Overalls/Cargo/shaft_miner.rsi/meta.json
new file mode 100644
index 00000000000..8f7d33233ce
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Uniforms/Other/Overalls/Cargo/shaft_miner.rsi/meta.json
@@ -0,0 +1,18 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from paradise at commit https://github.com/ParadiseSS13/Paradise/commit/207695cbdab4cb8f81a25cdbb201a88a6851d78b",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Scrubs/blue.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Scrubs/blue.rsi/equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..e3e3a4a0917
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Scrubs/blue.rsi/equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Scrubs/blue.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Scrubs/blue.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..5e9883f3852
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Scrubs/blue.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Scrubs/blue.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Scrubs/blue.rsi/folded-equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..29d1e4ba610
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Scrubs/blue.rsi/folded-equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Scrubs/blue.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Scrubs/blue.rsi/icon.png
new file mode 100644
index 00000000000..91cad641b2e
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Scrubs/blue.rsi/icon.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Scrubs/blue.rsi/inhand-left.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Scrubs/blue.rsi/inhand-left.png
new file mode 100644
index 00000000000..5d472ec6900
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Scrubs/blue.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Scrubs/blue.rsi/inhand-right.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Scrubs/blue.rsi/inhand-right.png
new file mode 100644
index 00000000000..477643c9328
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Scrubs/blue.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_Lavaland/Clothing/Uniforms/Jumpsuit/shaft_miner.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Scrubs/blue.rsi/meta.json
similarity index 65%
rename from Resources/Textures/_Lavaland/Clothing/Uniforms/Jumpsuit/shaft_miner.rsi/meta.json
rename to Resources/Textures/_Goobstation/Clothing/Uniforms/Scrubs/blue.rsi/meta.json
index 390849c1a54..ac071696d4b 100644
--- a/Resources/Textures/_Lavaland/Clothing/Uniforms/Jumpsuit/shaft_miner.rsi/meta.json
+++ b/Resources/Textures/_Goobstation/Clothing/Uniforms/Scrubs/blue.rsi/meta.json
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
- "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/52678d41b527120f13f585eb64e9c659ef1426e0, inhands made by thebiggestbruh (discord), monkey made by brainfood1183 (github) for ss14",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, derivative monkey made by brainfood1183 (github) for ss14",
"size": {
"x": 32,
"y": 32
@@ -13,6 +13,10 @@
{
"name": "equipped-INNERCLOTHING",
"directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING",
+ "directions": 4
},
{
"name": "equipped-INNERCLOTHING-monkey",
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Scrubs/green.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Scrubs/green.rsi/equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..225d1bb3a56
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Scrubs/green.rsi/equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Scrubs/green.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Scrubs/green.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..85b7920533c
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Scrubs/green.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Scrubs/green.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Scrubs/green.rsi/folded-equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..78621d41800
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Scrubs/green.rsi/folded-equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Scrubs/green.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Scrubs/green.rsi/icon.png
new file mode 100644
index 00000000000..688b52822e0
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Scrubs/green.rsi/icon.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Scrubs/green.rsi/inhand-left.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Scrubs/green.rsi/inhand-left.png
new file mode 100644
index 00000000000..409a0548728
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Scrubs/green.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Scrubs/green.rsi/inhand-right.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Scrubs/green.rsi/inhand-right.png
new file mode 100644
index 00000000000..2d5175903de
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Scrubs/green.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Scrubs/green.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Scrubs/green.rsi/meta.json
new file mode 100644
index 00000000000..ac071696d4b
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Uniforms/Scrubs/green.rsi/meta.json
@@ -0,0 +1,34 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, derivative monkey made by brainfood1183 (github) for ss14",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Scrubs/purple.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Scrubs/purple.rsi/equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..b2128c597a6
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Scrubs/purple.rsi/equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Scrubs/purple.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Scrubs/purple.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..d9f7fd81e57
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Scrubs/purple.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Scrubs/purple.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Scrubs/purple.rsi/folded-equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..e6c386b80ac
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Scrubs/purple.rsi/folded-equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Scrubs/purple.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Scrubs/purple.rsi/icon.png
new file mode 100644
index 00000000000..078c780eebb
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Scrubs/purple.rsi/icon.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Scrubs/purple.rsi/inhand-left.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Scrubs/purple.rsi/inhand-left.png
new file mode 100644
index 00000000000..759d32a4a4e
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Scrubs/purple.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Scrubs/purple.rsi/inhand-right.png b/Resources/Textures/_Goobstation/Clothing/Uniforms/Scrubs/purple.rsi/inhand-right.png
new file mode 100644
index 00000000000..3e8970526c7
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Uniforms/Scrubs/purple.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Uniforms/Scrubs/purple.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Uniforms/Scrubs/purple.rsi/meta.json
new file mode 100644
index 00000000000..ac071696d4b
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Uniforms/Scrubs/purple.rsi/meta.json
@@ -0,0 +1,34 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, derivative monkey made by brainfood1183 (github) for ss14",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "equipped-INNERCLOTHING-monkey",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Goobstation/Objects/Devices/pda.rsi/insert_overlay.png b/Resources/Textures/_Goobstation/Objects/Devices/pda.rsi/insert_overlay.png
new file mode 100644
index 00000000000..61ba781c1ff
Binary files /dev/null and b/Resources/Textures/_Goobstation/Objects/Devices/pda.rsi/insert_overlay.png differ
diff --git a/Resources/Textures/_Goobstation/Objects/Devices/pda.rsi/meta.json b/Resources/Textures/_Goobstation/Objects/Devices/pda.rsi/meta.json
index a6bfeda11c2..8dd8e433652 100644
--- a/Resources/Textures/_Goobstation/Objects/Devices/pda.rsi/meta.json
+++ b/Resources/Textures/_Goobstation/Objects/Devices/pda.rsi/meta.json
@@ -15,6 +15,9 @@
},
{
"name": "id_overlay"
+ },
+ {
+ "name": "insert_overlay"
},
{
"name": "light_overlay"
diff --git a/Resources/Textures/_Inky/Actions/Werewolf/werewolf.rsi/ambush.png b/Resources/Textures/_Inky/Actions/Werewolf/werewolf.rsi/ambush.png
new file mode 100644
index 00000000000..7f1160c6c08
Binary files /dev/null and b/Resources/Textures/_Inky/Actions/Werewolf/werewolf.rsi/ambush.png differ
diff --git a/Resources/Textures/_Inky/Actions/Werewolf/werewolf.rsi/beckon.png b/Resources/Textures/_Inky/Actions/Werewolf/werewolf.rsi/beckon.png
new file mode 100644
index 00000000000..f4d3f0c8238
Binary files /dev/null and b/Resources/Textures/_Inky/Actions/Werewolf/werewolf.rsi/beckon.png differ
diff --git a/Resources/Textures/_Inky/Actions/Werewolf/werewolf.rsi/bequeath.png b/Resources/Textures/_Inky/Actions/Werewolf/werewolf.rsi/bequeath.png
new file mode 100644
index 00000000000..79a779cf315
Binary files /dev/null and b/Resources/Textures/_Inky/Actions/Werewolf/werewolf.rsi/bequeath.png differ
diff --git a/Resources/Textures/_Inky/Actions/Werewolf/werewolf.rsi/bite.png b/Resources/Textures/_Inky/Actions/Werewolf/werewolf.rsi/bite.png
new file mode 100644
index 00000000000..cb45f1a76ac
Binary files /dev/null and b/Resources/Textures/_Inky/Actions/Werewolf/werewolf.rsi/bite.png differ
diff --git a/Resources/Textures/_Inky/Actions/Werewolf/werewolf.rsi/black-bite.png b/Resources/Textures/_Inky/Actions/Werewolf/werewolf.rsi/black-bite.png
new file mode 100644
index 00000000000..3aee530faac
Binary files /dev/null and b/Resources/Textures/_Inky/Actions/Werewolf/werewolf.rsi/black-bite.png differ
diff --git a/Resources/Textures/_Inky/Actions/Werewolf/werewolf.rsi/bleeding-bite.png b/Resources/Textures/_Inky/Actions/Werewolf/werewolf.rsi/bleeding-bite.png
new file mode 100644
index 00000000000..153902d7940
Binary files /dev/null and b/Resources/Textures/_Inky/Actions/Werewolf/werewolf.rsi/bleeding-bite.png differ
diff --git a/Resources/Textures/_Inky/Actions/Werewolf/werewolf.rsi/bloodhound.png b/Resources/Textures/_Inky/Actions/Werewolf/werewolf.rsi/bloodhound.png
new file mode 100644
index 00000000000..f27ccc9e768
Binary files /dev/null and b/Resources/Textures/_Inky/Actions/Werewolf/werewolf.rsi/bloodhound.png differ
diff --git a/Resources/Textures/_Inky/Actions/Werewolf/werewolf.rsi/claws.png b/Resources/Textures/_Inky/Actions/Werewolf/werewolf.rsi/claws.png
new file mode 100644
index 00000000000..4ca95116987
Binary files /dev/null and b/Resources/Textures/_Inky/Actions/Werewolf/werewolf.rsi/claws.png differ
diff --git a/Resources/Textures/_Inky/Actions/Werewolf/werewolf.rsi/empty.png b/Resources/Textures/_Inky/Actions/Werewolf/werewolf.rsi/empty.png
new file mode 100644
index 00000000000..cfd488422e8
Binary files /dev/null and b/Resources/Textures/_Inky/Actions/Werewolf/werewolf.rsi/empty.png differ
diff --git a/Resources/Textures/_Inky/Actions/Werewolf/werewolf.rsi/gut.png b/Resources/Textures/_Inky/Actions/Werewolf/werewolf.rsi/gut.png
new file mode 100644
index 00000000000..31f3d090e9d
Binary files /dev/null and b/Resources/Textures/_Inky/Actions/Werewolf/werewolf.rsi/gut.png differ
diff --git a/Resources/Textures/_Inky/Actions/Werewolf/werewolf.rsi/howl-green.png b/Resources/Textures/_Inky/Actions/Werewolf/werewolf.rsi/howl-green.png
new file mode 100644
index 00000000000..271a9a78252
Binary files /dev/null and b/Resources/Textures/_Inky/Actions/Werewolf/werewolf.rsi/howl-green.png differ
diff --git a/Resources/Textures/_Inky/Actions/Werewolf/werewolf.rsi/howl-red.png b/Resources/Textures/_Inky/Actions/Werewolf/werewolf.rsi/howl-red.png
new file mode 100644
index 00000000000..c70095f9550
Binary files /dev/null and b/Resources/Textures/_Inky/Actions/Werewolf/werewolf.rsi/howl-red.png differ
diff --git a/Resources/Textures/_Inky/Actions/Werewolf/werewolf.rsi/howl.png b/Resources/Textures/_Inky/Actions/Werewolf/werewolf.rsi/howl.png
new file mode 100644
index 00000000000..1dad340bc52
Binary files /dev/null and b/Resources/Textures/_Inky/Actions/Werewolf/werewolf.rsi/howl.png differ
diff --git a/Resources/Textures/_Inky/Actions/Werewolf/werewolf.rsi/lunar-black.png b/Resources/Textures/_Inky/Actions/Werewolf/werewolf.rsi/lunar-black.png
new file mode 100644
index 00000000000..a5c5affd008
Binary files /dev/null and b/Resources/Textures/_Inky/Actions/Werewolf/werewolf.rsi/lunar-black.png differ
diff --git a/Resources/Textures/_Inky/Actions/Werewolf/werewolf.rsi/lunar-white.png b/Resources/Textures/_Inky/Actions/Werewolf/werewolf.rsi/lunar-white.png
new file mode 100644
index 00000000000..a7ac0d8204c
Binary files /dev/null and b/Resources/Textures/_Inky/Actions/Werewolf/werewolf.rsi/lunar-white.png differ
diff --git a/Resources/Textures/_Inky/Actions/Werewolf/werewolf.rsi/meta.json b/Resources/Textures/_Inky/Actions/Werewolf/werewolf.rsi/meta.json
new file mode 100644
index 00000000000..833d0425818
--- /dev/null
+++ b/Resources/Textures/_Inky/Actions/Werewolf/werewolf.rsi/meta.json
@@ -0,0 +1,71 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Made by TechnoSpaghetti(192358052710711299) on discord for Goob Station",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "empty"
+ },
+ {
+ "name": "howl"
+ },
+ {
+ "name": "howl-red"
+ },
+ {
+ "name": "howl-green"
+ },
+ {
+ "name": "transfurm"
+ },
+ {
+ "name": "senses"
+ },
+ {
+ "name": "bite"
+ },
+ {
+ "name": "store"
+ },
+ {
+ "name": "regen"
+ },
+ {
+ "name": "ambush"
+ },
+ {
+ "name": "gut"
+ },
+ {
+ "name": "bleeding-bite"
+ },
+ {
+ "name": "claws"
+ },
+ {
+ "name": "bloodhound"
+ },
+ {
+ "name": "lunar-white"
+ },
+ {
+ "name": "lunar-black"
+ },
+ {
+ "name": "revelation"
+ },
+ {
+ "name": "black-bite"
+ },
+ {
+ "name": "beckon"
+ },
+ {
+ "name": "bequeath"
+ }
+ ]
+}
diff --git a/Resources/Textures/_Inky/Actions/Werewolf/werewolf.rsi/regen.png b/Resources/Textures/_Inky/Actions/Werewolf/werewolf.rsi/regen.png
new file mode 100644
index 00000000000..d8d3e151a7f
Binary files /dev/null and b/Resources/Textures/_Inky/Actions/Werewolf/werewolf.rsi/regen.png differ
diff --git a/Resources/Textures/_Inky/Actions/Werewolf/werewolf.rsi/revelation.png b/Resources/Textures/_Inky/Actions/Werewolf/werewolf.rsi/revelation.png
new file mode 100644
index 00000000000..680ee42b758
Binary files /dev/null and b/Resources/Textures/_Inky/Actions/Werewolf/werewolf.rsi/revelation.png differ
diff --git a/Resources/Textures/_Inky/Actions/Werewolf/werewolf.rsi/senses.png b/Resources/Textures/_Inky/Actions/Werewolf/werewolf.rsi/senses.png
new file mode 100644
index 00000000000..dfb2a800826
Binary files /dev/null and b/Resources/Textures/_Inky/Actions/Werewolf/werewolf.rsi/senses.png differ
diff --git a/Resources/Textures/_Inky/Actions/Werewolf/werewolf.rsi/store.png b/Resources/Textures/_Inky/Actions/Werewolf/werewolf.rsi/store.png
new file mode 100644
index 00000000000..56db4b71b0a
Binary files /dev/null and b/Resources/Textures/_Inky/Actions/Werewolf/werewolf.rsi/store.png differ
diff --git a/Resources/Textures/_Inky/Actions/Werewolf/werewolf.rsi/transfurm.png b/Resources/Textures/_Inky/Actions/Werewolf/werewolf.rsi/transfurm.png
new file mode 100644
index 00000000000..d98fdca10e8
Binary files /dev/null and b/Resources/Textures/_Inky/Actions/Werewolf/werewolf.rsi/transfurm.png differ
diff --git a/Resources/Textures/_Inky/Clothing/Neck/Ties/elysiumtie.rsi/equipped-NECK.png b/Resources/Textures/_Inky/Clothing/Neck/Ties/elysiumtie.rsi/equipped-NECK.png
new file mode 100644
index 00000000000..5ad255be696
Binary files /dev/null and b/Resources/Textures/_Inky/Clothing/Neck/Ties/elysiumtie.rsi/equipped-NECK.png differ
diff --git a/Resources/Textures/_Inky/Clothing/Neck/Ties/elysiumtie.rsi/icon.png b/Resources/Textures/_Inky/Clothing/Neck/Ties/elysiumtie.rsi/icon.png
new file mode 100644
index 00000000000..a296ff1562e
Binary files /dev/null and b/Resources/Textures/_Inky/Clothing/Neck/Ties/elysiumtie.rsi/icon.png differ
diff --git a/Resources/Textures/_Inky/Clothing/Neck/Ties/elysiumtie.rsi/meta.json b/Resources/Textures/_Inky/Clothing/Neck/Ties/elysiumtie.rsi/meta.json
new file mode 100644
index 00000000000..59e0824529e
--- /dev/null
+++ b/Resources/Textures/_Inky/Clothing/Neck/Ties/elysiumtie.rsi/meta.json
@@ -0,0 +1,18 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Made by Naiko",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "equipped-NECK",
+ "directions": 4
+ }
+ ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/_Inky/Clothing/OuterClothing/Coats/ElysiumCoat.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_Inky/Clothing/OuterClothing/Coats/ElysiumCoat.rsi/equipped-OUTERCLOTHING.png
new file mode 100644
index 00000000000..4f643738533
Binary files /dev/null and b/Resources/Textures/_Inky/Clothing/OuterClothing/Coats/ElysiumCoat.rsi/equipped-OUTERCLOTHING.png differ
diff --git a/Resources/Textures/_Inky/Clothing/OuterClothing/Coats/ElysiumCoat.rsi/icon.png b/Resources/Textures/_Inky/Clothing/OuterClothing/Coats/ElysiumCoat.rsi/icon.png
new file mode 100644
index 00000000000..a4403454980
Binary files /dev/null and b/Resources/Textures/_Inky/Clothing/OuterClothing/Coats/ElysiumCoat.rsi/icon.png differ
diff --git a/Resources/Textures/_Inky/Clothing/OuterClothing/Coats/ElysiumCoat.rsi/inhand-left.png b/Resources/Textures/_Inky/Clothing/OuterClothing/Coats/ElysiumCoat.rsi/inhand-left.png
new file mode 100644
index 00000000000..59432a35ed8
Binary files /dev/null and b/Resources/Textures/_Inky/Clothing/OuterClothing/Coats/ElysiumCoat.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_Inky/Clothing/OuterClothing/Coats/ElysiumCoat.rsi/inhand-right.png b/Resources/Textures/_Inky/Clothing/OuterClothing/Coats/ElysiumCoat.rsi/inhand-right.png
new file mode 100644
index 00000000000..8848f8b23eb
Binary files /dev/null and b/Resources/Textures/_Inky/Clothing/OuterClothing/Coats/ElysiumCoat.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_Inky/Clothing/OuterClothing/Coats/ElysiumCoat.rsi/meta.json b/Resources/Textures/_Inky/Clothing/OuterClothing/Coats/ElysiumCoat.rsi/meta.json
new file mode 100644
index 00000000000..ea645f2ea9a
--- /dev/null
+++ b/Resources/Textures/_Inky/Clothing/OuterClothing/Coats/ElysiumCoat.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Made by naiko",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "equipped-OUTERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/_Inky/Clothing/Shoes/Specific/elysiumshoes.rsi/equipped-FEET.png b/Resources/Textures/_Inky/Clothing/Shoes/Specific/elysiumshoes.rsi/equipped-FEET.png
new file mode 100644
index 00000000000..ba777d81a10
Binary files /dev/null and b/Resources/Textures/_Inky/Clothing/Shoes/Specific/elysiumshoes.rsi/equipped-FEET.png differ
diff --git a/Resources/Textures/_Inky/Clothing/Shoes/Specific/elysiumshoes.rsi/icon.png b/Resources/Textures/_Inky/Clothing/Shoes/Specific/elysiumshoes.rsi/icon.png
new file mode 100644
index 00000000000..b3cb7b1bf43
Binary files /dev/null and b/Resources/Textures/_Inky/Clothing/Shoes/Specific/elysiumshoes.rsi/icon.png differ
diff --git a/Resources/Textures/_Inky/Clothing/Shoes/Specific/elysiumshoes.rsi/meta.json b/Resources/Textures/_Inky/Clothing/Shoes/Specific/elysiumshoes.rsi/meta.json
new file mode 100644
index 00000000000..c67d6749cb0
--- /dev/null
+++ b/Resources/Textures/_Inky/Clothing/Shoes/Specific/elysiumshoes.rsi/meta.json
@@ -0,0 +1,18 @@
+{
+ "version": 1,
+ "license": "CC-BY-NC-SA-3.0",
+ "copyright": "\u0022Taken from DesertRose https://github.com/DesertRose2/desertrose/commit/704aa5e9e3b86d6e1dbf64a29ba976f7ef53a4ab\u0022",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "equipped-FEET",
+ "directions": 4
+ }
+ ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/_Inky/Clothing/Uniforms/Jumpsuit/Elysium.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Inky/Clothing/Uniforms/Jumpsuit/Elysium.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..c6a929b8584
Binary files /dev/null and b/Resources/Textures/_Inky/Clothing/Uniforms/Jumpsuit/Elysium.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Inky/Clothing/Uniforms/Jumpsuit/Elysium.rsi/icon.png b/Resources/Textures/_Inky/Clothing/Uniforms/Jumpsuit/Elysium.rsi/icon.png
new file mode 100644
index 00000000000..462880cc71f
Binary files /dev/null and b/Resources/Textures/_Inky/Clothing/Uniforms/Jumpsuit/Elysium.rsi/icon.png differ
diff --git a/Resources/Textures/_Inky/Clothing/Uniforms/Jumpsuit/Elysium.rsi/inhand-left.png b/Resources/Textures/_Inky/Clothing/Uniforms/Jumpsuit/Elysium.rsi/inhand-left.png
new file mode 100644
index 00000000000..e61b5f78e32
Binary files /dev/null and b/Resources/Textures/_Inky/Clothing/Uniforms/Jumpsuit/Elysium.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_Inky/Clothing/Uniforms/Jumpsuit/Elysium.rsi/inhand-right.png b/Resources/Textures/_Inky/Clothing/Uniforms/Jumpsuit/Elysium.rsi/inhand-right.png
new file mode 100644
index 00000000000..e27ff382cb2
Binary files /dev/null and b/Resources/Textures/_Inky/Clothing/Uniforms/Jumpsuit/Elysium.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_Inky/Clothing/Uniforms/Jumpsuit/Elysium.rsi/meta.json b/Resources/Textures/_Inky/Clothing/Uniforms/Jumpsuit/Elysium.rsi/meta.json
new file mode 100644
index 00000000000..023bece90a2
--- /dev/null
+++ b/Resources/Textures/_Inky/Clothing/Uniforms/Jumpsuit/Elysium.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Made by Naiko",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/_Inky/Mobs/Werewolf/Mutations/base.rsi/icon.png b/Resources/Textures/_Inky/Mobs/Werewolf/Mutations/base.rsi/icon.png
new file mode 100644
index 00000000000..593168a7915
Binary files /dev/null and b/Resources/Textures/_Inky/Mobs/Werewolf/Mutations/base.rsi/icon.png differ
diff --git a/Resources/Textures/_Inky/Mobs/Werewolf/Mutations/base.rsi/meta.json b/Resources/Textures/_Inky/Mobs/Werewolf/Mutations/base.rsi/meta.json
new file mode 100644
index 00000000000..146ecd17aca
--- /dev/null
+++ b/Resources/Textures/_Inky/Mobs/Werewolf/Mutations/base.rsi/meta.json
@@ -0,0 +1,20 @@
+{
+ "version": 1,
+ "size":
+ {
+ "x": 64,
+ "y": 64
+ },
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Sprited by TechnoSpaghetti(192358052710711299) on discord for Goobstation",
+ "states":
+ [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "werewolf",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Inky/Mobs/Werewolf/Mutations/base.rsi/werewolf.png b/Resources/Textures/_Inky/Mobs/Werewolf/Mutations/base.rsi/werewolf.png
new file mode 100644
index 00000000000..99883d19257
Binary files /dev/null and b/Resources/Textures/_Inky/Mobs/Werewolf/Mutations/base.rsi/werewolf.png differ
diff --git a/Resources/Textures/_Inky/Mobs/Werewolf/Mutations/black.rsi/icon.png b/Resources/Textures/_Inky/Mobs/Werewolf/Mutations/black.rsi/icon.png
new file mode 100644
index 00000000000..c9d9849cb43
Binary files /dev/null and b/Resources/Textures/_Inky/Mobs/Werewolf/Mutations/black.rsi/icon.png differ
diff --git a/Resources/Textures/_Inky/Mobs/Werewolf/Mutations/black.rsi/meta.json b/Resources/Textures/_Inky/Mobs/Werewolf/Mutations/black.rsi/meta.json
new file mode 100644
index 00000000000..617bd33dc39
--- /dev/null
+++ b/Resources/Textures/_Inky/Mobs/Werewolf/Mutations/black.rsi/meta.json
@@ -0,0 +1,20 @@
+{
+ "version": 1,
+ "size":
+ {
+ "x": 64,
+ "y": 64
+ },
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Sprited by TechnoSpaghetti(192358052710711299) on discord for Goobstation",
+ "states":
+ [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "wolf",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Inky/Mobs/Werewolf/Mutations/black.rsi/wolf.png b/Resources/Textures/_Inky/Mobs/Werewolf/Mutations/black.rsi/wolf.png
new file mode 100644
index 00000000000..72fcd01cb2d
Binary files /dev/null and b/Resources/Textures/_Inky/Mobs/Werewolf/Mutations/black.rsi/wolf.png differ
diff --git a/Resources/Textures/_Inky/Mobs/Werewolf/Mutations/direwolf.rsi/direwolf.png b/Resources/Textures/_Inky/Mobs/Werewolf/Mutations/direwolf.rsi/direwolf.png
new file mode 100644
index 00000000000..03b501df94e
Binary files /dev/null and b/Resources/Textures/_Inky/Mobs/Werewolf/Mutations/direwolf.rsi/direwolf.png differ
diff --git a/Resources/Textures/_Inky/Mobs/Werewolf/Mutations/direwolf.rsi/icon.png b/Resources/Textures/_Inky/Mobs/Werewolf/Mutations/direwolf.rsi/icon.png
new file mode 100644
index 00000000000..7effab8ad6f
Binary files /dev/null and b/Resources/Textures/_Inky/Mobs/Werewolf/Mutations/direwolf.rsi/icon.png differ
diff --git a/Resources/Textures/_Inky/Mobs/Werewolf/Mutations/direwolf.rsi/meta.json b/Resources/Textures/_Inky/Mobs/Werewolf/Mutations/direwolf.rsi/meta.json
new file mode 100644
index 00000000000..28f9a683eda
--- /dev/null
+++ b/Resources/Textures/_Inky/Mobs/Werewolf/Mutations/direwolf.rsi/meta.json
@@ -0,0 +1,20 @@
+{
+ "version": 1,
+ "size":
+ {
+ "x": 64,
+ "y": 64
+ },
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Sprited by TechnoSpaghetti(192358052710711299) on discord for Goobstation",
+ "states":
+ [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "direwolf",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Inky/Mobs/Werewolf/Mutations/werehuman.rsi/icon.png b/Resources/Textures/_Inky/Mobs/Werewolf/Mutations/werehuman.rsi/icon.png
new file mode 100644
index 00000000000..d4551937286
Binary files /dev/null and b/Resources/Textures/_Inky/Mobs/Werewolf/Mutations/werehuman.rsi/icon.png differ
diff --git a/Resources/Textures/_Inky/Mobs/Werewolf/Mutations/werehuman.rsi/meta.json b/Resources/Textures/_Inky/Mobs/Werewolf/Mutations/werehuman.rsi/meta.json
new file mode 100644
index 00000000000..cc8b87ffa79
--- /dev/null
+++ b/Resources/Textures/_Inky/Mobs/Werewolf/Mutations/werehuman.rsi/meta.json
@@ -0,0 +1,20 @@
+{
+ "version": 1,
+ "size":
+ {
+ "x": 64,
+ "y": 64
+ },
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Sprited by TechnoSpaghetti(192358052710711299) on discord for Goobstation",
+ "states":
+ [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "werehuman",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Inky/Mobs/Werewolf/Mutations/werehuman.rsi/werehuman.png b/Resources/Textures/_Inky/Mobs/Werewolf/Mutations/werehuman.rsi/werehuman.png
new file mode 100644
index 00000000000..1f22fc1c067
Binary files /dev/null and b/Resources/Textures/_Inky/Mobs/Werewolf/Mutations/werehuman.rsi/werehuman.png differ
diff --git a/Resources/Textures/_Inky/Mobs/Werewolf/Mutations/white.rsi/icon.png b/Resources/Textures/_Inky/Mobs/Werewolf/Mutations/white.rsi/icon.png
new file mode 100644
index 00000000000..6ad4ff9f117
Binary files /dev/null and b/Resources/Textures/_Inky/Mobs/Werewolf/Mutations/white.rsi/icon.png differ
diff --git a/Resources/Textures/_Inky/Mobs/Werewolf/Mutations/white.rsi/meta.json b/Resources/Textures/_Inky/Mobs/Werewolf/Mutations/white.rsi/meta.json
new file mode 100644
index 00000000000..617bd33dc39
--- /dev/null
+++ b/Resources/Textures/_Inky/Mobs/Werewolf/Mutations/white.rsi/meta.json
@@ -0,0 +1,20 @@
+{
+ "version": 1,
+ "size":
+ {
+ "x": 64,
+ "y": 64
+ },
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Sprited by TechnoSpaghetti(192358052710711299) on discord for Goobstation",
+ "states":
+ [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "wolf",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Inky/Mobs/Werewolf/Mutations/white.rsi/wolf.png b/Resources/Textures/_Inky/Mobs/Werewolf/Mutations/white.rsi/wolf.png
new file mode 100644
index 00000000000..6d07ba99602
Binary files /dev/null and b/Resources/Textures/_Inky/Mobs/Werewolf/Mutations/white.rsi/wolf.png differ
diff --git a/Resources/Textures/_Lavaland/Clothing/Uniforms/Jumpsuit/shaft_miner.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Lavaland/Clothing/Uniforms/Jumpsuit/shaft_miner.rsi/equipped-INNERCLOTHING.png
deleted file mode 100644
index 119fbdc2b3e..00000000000
Binary files a/Resources/Textures/_Lavaland/Clothing/Uniforms/Jumpsuit/shaft_miner.rsi/equipped-INNERCLOTHING.png and /dev/null differ
diff --git a/Resources/Textures/_Lavaland/Clothing/Uniforms/Jumpsuit/shaft_miner.rsi/icon.png b/Resources/Textures/_Lavaland/Clothing/Uniforms/Jumpsuit/shaft_miner.rsi/icon.png
deleted file mode 100644
index d096818c8db..00000000000
Binary files a/Resources/Textures/_Lavaland/Clothing/Uniforms/Jumpsuit/shaft_miner.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/_Lavaland/Clothing/Uniforms/Jumpsuit/shaft_miner.rsi/inhand-left.png b/Resources/Textures/_Lavaland/Clothing/Uniforms/Jumpsuit/shaft_miner.rsi/inhand-left.png
deleted file mode 100644
index e9f65959f11..00000000000
Binary files a/Resources/Textures/_Lavaland/Clothing/Uniforms/Jumpsuit/shaft_miner.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_Lavaland/Clothing/Uniforms/Jumpsuit/shaft_miner.rsi/inhand-right.png b/Resources/Textures/_Lavaland/Clothing/Uniforms/Jumpsuit/shaft_miner.rsi/inhand-right.png
deleted file mode 100644
index 6ebbd5c5a85..00000000000
Binary files a/Resources/Textures/_Lavaland/Clothing/Uniforms/Jumpsuit/shaft_miner.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_Lavaland/Objects/Devices/pda.rsi/insert_overlay.png b/Resources/Textures/_Lavaland/Objects/Devices/pda.rsi/insert_overlay.png
new file mode 100644
index 00000000000..61ba781c1ff
Binary files /dev/null and b/Resources/Textures/_Lavaland/Objects/Devices/pda.rsi/insert_overlay.png differ
diff --git a/Resources/Textures/_Lavaland/Objects/Devices/pda.rsi/meta.json b/Resources/Textures/_Lavaland/Objects/Devices/pda.rsi/meta.json
index c0a1cb97eb9..dc5605e094b 100644
--- a/Resources/Textures/_Lavaland/Objects/Devices/pda.rsi/meta.json
+++ b/Resources/Textures/_Lavaland/Objects/Devices/pda.rsi/meta.json
@@ -12,6 +12,9 @@
},
{
"name": "id_overlay"
+ },
+ {
+ "name": "insert_overlay"
},
{
"name": "light_overlay"
diff --git a/Resources/migration.yml b/Resources/migration.yml
index 08bddc43195..ffb3f38d036 100644
--- a/Resources/migration.yml
+++ b/Resources/migration.yml
@@ -1184,3 +1184,6 @@ FoodMeatSnail: MobSnail
CratePartsT3: null
CratePartsT3T4: null
CratePartsT4: null
+
+# 2026-06-02, inky
+ClothingNeckCloakCe: ClothingNeckCloakWhiteCe
\ No newline at end of file