diff --git a/.github/workflows/publish-stable.yml b/.github/workflows/publish-stable.yml index 18ce423a461..d1857697a18 100644 --- a/.github/workflows/publish-stable.yml +++ b/.github/workflows/publish-stable.yml @@ -2,9 +2,11 @@ name: Publish stable concurrency: group: publish - on: - workflow_dispatch: + push: + branches: + - stable # or the branch where merge requests are being merged into (e.g., 'master') + jobs: build: diff --git a/.github/workflows/publish-testing.yml b/.github/workflows/publish-testing.yml index dcbc74a3dd6..44ef248fc08 100644 --- a/.github/workflows/publish-testing.yml +++ b/.github/workflows/publish-testing.yml @@ -4,9 +4,9 @@ concurrency: group: publish on: - workflow_dispatch: - schedule: - - cron: '0 6 * * *' + push: + branches: + - master jobs: build: diff --git a/Content.Client/Clothing/ClientClothingSystem.cs b/Content.Client/Clothing/ClientClothingSystem.cs index dd69521f483..96bbcc54f2a 100644 --- a/Content.Client/Clothing/ClientClothingSystem.cs +++ b/Content.Client/Clothing/ClientClothingSystem.cs @@ -1,9 +1,12 @@ using System.Diagnostics.CodeAnalysis; using System.Linq; +using System.Numerics; +using Content.Client.DisplacementMap; using Content.Client.Inventory; using Content.Shared.Clothing; using Content.Shared.Clothing.Components; using Content.Shared.Clothing.EntitySystems; +using Content.Shared.DisplacementMap; using Content.Shared.Humanoid; using Content.Shared.Inventory; using Content.Shared.Inventory.Events; @@ -49,6 +52,7 @@ public sealed class ClientClothingSystem : ClothingSystem [Dependency] private readonly IResourceCache _cache = default!; [Dependency] private readonly ISerializationManager _serialization = default!; [Dependency] private readonly InventorySystem _inventorySystem = default!; + [Dependency] private readonly DisplacementMapSystem _displacement = default!; public override void Initialize() { @@ -63,15 +67,14 @@ public override void Initialize() private void OnAppearanceUpdate(EntityUid uid, InventoryComponent component, ref AppearanceChangeEvent args) { - // May need to update jumpsuit stencils if the sex changed. Also required to properly set the stencil on init + // May need to update displacement maps if the sex changed. Also required to properly set the stencil on init if (args.Sprite == null) return; - if (_inventorySystem.TryGetSlotEntity(uid, Jumpsuit, out var suit, component) - && TryComp(suit, out ClothingComponent? clothing)) + var enumerator = _inventorySystem.GetSlotEnumerator((uid, component)); + while (enumerator.NextItem(out var item, out var slot)) { - SetGenderedMask(uid, args.Sprite, clothing); - return; + RenderEquipment(uid, item, slot.Name, component); } // No clothing equipped -> make sure the layer is hidden, though this should already be handled by on-unequip. @@ -113,6 +116,7 @@ private void OnGetVisuals(EntityUid uid, ClothingComponent item, GetEquipmentVis i++; } + item.MappedLayer = key; args.Layers.Add((key, layer)); } } @@ -153,13 +157,9 @@ private bool TryGetDefaultVisuals(EntityUid uid, ClothingComponent clothing, str // species specific if (speciesId != null && rsi.TryGetState($"{state}-{speciesId}", out _)) - { state = $"{state}-{speciesId}"; - } else if (!rsi.TryGetState(state, out _)) - { return false; - } var layer = new PrototypeLayerData(); layer.RsiPath = rsi.Path.ToString(); @@ -181,14 +181,6 @@ private void OnVisualsChanged(EntityUid uid, InventoryComponent component, Visua private void OnDidUnequip(EntityUid uid, SpriteComponent component, DidUnequipEvent args) { - // Hide jumpsuit mask layer. - if (args.Slot == Jumpsuit - && TryComp(uid, out SpriteComponent? sprite) - && sprite.LayerMapTryGet(HumanoidVisualLayers.StencilMask, out var maskLayer)) - { - sprite.LayerSetVisible(maskLayer, false); - } - if (!TryComp(uid, out InventorySlotsComponent? inventorySlots)) return; @@ -233,9 +225,6 @@ private void RenderEquipment(EntityUid equipee, EntityUid equipment, string slot return; } - if (slot == Jumpsuit) - SetGenderedMask(equipee, sprite, clothingComponent); - if (!_inventorySystem.TryGetSlot(equipee, slot, out var slotDef, inventory)) return; @@ -267,7 +256,25 @@ private void RenderEquipment(EntityUid equipee, EntityUid equipment, string slot // temporary, until layer draw depths get added. Basically: a layer with the key "slot" is being used as a // bookmark to determine where in the list of layers we should insert the clothing layers. bool slotLayerExists = sprite.LayerMapTryGet(slot, out var index); - var displacementData = inventory.Displacements.GetValueOrDefault(slot); + + // Select displacement maps + var displacementData = inventory.Displacements.GetValueOrDefault(slot); //Default unsexed map + + var equipeeSex = CompOrNull(equipee)?.Sex; + if (equipeeSex != null) + { + switch (equipeeSex) + { + case Sex.Male: + if (inventory.MaleDisplacements.Count > 0) + displacementData = inventory.MaleDisplacements.GetValueOrDefault(slot); + break; + case Sex.Female: + if (inventory.FemaleDisplacements.Count > 0) + displacementData = inventory.FemaleDisplacements.GetValueOrDefault(slot); + break; + } + } // add the new layers foreach (var (key, layerData) in ev.Layers) @@ -287,12 +294,14 @@ private void RenderEquipment(EntityUid equipee, EntityUid equipment, string slot if (layerData.Color != null) sprite.LayerSetColor(key, layerData.Color.Value); + if (layerData.Scale != null) + sprite.LayerSetScale(key, layerData.Scale.Value); } else index = sprite.LayerMapReserveBlank(key); if (sprite[index] is not Layer layer) - return; + continue; // In case no RSI is given, use the item's base RSI as a default. This cuts down on a lot of unnecessary yaml entries. if (layerData.RsiPath == null @@ -303,78 +312,19 @@ private void RenderEquipment(EntityUid equipee, EntityUid equipment, string slot layer.SetRsi(clothingSprite.BaseRSI); } - // Another "temporary" fix for clothing stencil masks. - // Sprite layer redactor when - // Sprite "redactor" just a week away. - if (slot == Jumpsuit) - layerData.Shader ??= "StencilDraw"; - sprite.LayerSetData(index, layerData); layer.Offset += slotDef.Offset; - if (displacementData != null) + if (displacementData is not null) { - if (displacementData.ShaderOverride != null) - sprite.LayerSetShader(index, displacementData.ShaderOverride); - - var displacementKey = $"{key}-displacement"; - if (!revealedLayers.Add(displacementKey)) - { - Log.Warning($"Duplicate key for clothing visuals DISPLACEMENT: {displacementKey}."); + //Checking that the state is not tied to the current race. In this case we don't need to use the displacement maps. + if (layerData.State is not null && inventory.SpeciesId is not null && layerData.State.EndsWith(inventory.SpeciesId)) continue; - } - - var displacementLayer = _serialization.CreateCopy(displacementData.Layer, notNullableOverride: true); - displacementLayer.CopyToShaderParameters!.LayerKey = key; - - // Add before main layer for this item. - sprite.AddLayer(displacementLayer, index); - sprite.LayerMapSet(displacementKey, index); - revealedLayers.Add(displacementKey); + _displacement.TryAddDisplacement(displacementData, sprite, index, key, revealedLayers); } } RaiseLocalEvent(equipment, new EquipmentVisualsUpdatedEvent(equipee, slot, revealedLayers), true); } - - - /// - /// Sets a sprite's gendered mask based on gender (obviously). - /// - /// Sprite to modify - /// Humanoid, to get gender from - /// Clothing component, to get mask sprite type - private void SetGenderedMask(EntityUid uid, SpriteComponent sprite, ClothingComponent clothing) - { - if (!sprite.LayerMapTryGet(HumanoidVisualLayers.StencilMask, out var layer)) - return; - - ClothingMask mask; - string prefix; - - switch (CompOrNull(uid)?.Sex) - { - case Sex.Male: - mask = clothing.MaleMask; - prefix = "male_"; - break; - case Sex.Female: - mask = clothing.FemaleMask; - prefix = "female_"; - break; - default: - mask = clothing.UnisexMask; - prefix = "unisex_"; - break; - } - - sprite.LayerSetState(layer, mask switch - { - ClothingMask.NoMask => $"{prefix}none", - ClothingMask.UniformTop => $"{prefix}top", - _ => $"{prefix}full", - }); - sprite.LayerSetVisible(layer, true); - } } diff --git a/Content.Client/Consent/UI/Windows/ConsentWindow.xaml.cs b/Content.Client/Consent/UI/Windows/ConsentWindow.xaml.cs index 3a8bceccd67..2f15b08ce49 100644 --- a/Content.Client/Consent/UI/Windows/ConsentWindow.xaml.cs +++ b/Content.Client/Consent/UI/Windows/ConsentWindow.xaml.cs @@ -37,6 +37,14 @@ public ConsentWindow() ConsentFreetext.OnTextChanged += _ => UnsavedChanges(); } + protected override void Dispose(bool disposing) + { + base.Dispose(disposing); + + if (disposing) + _consentManager.OnServerDataLoaded -= UpdateUi; + } + private PlayerConsentSettings GetSettings() { var text = Rope.Collapse(ConsentFreetext.TextRope); @@ -145,8 +153,8 @@ public void UpdateUi() ConsentFreetext.TextRope = new Rope.Leaf(consent.Freetext); - if (ConsentList.ChildCount > 0) - ConsentList.RemoveAllChildren(); + ConsentList.RemoveAllChildren(); + _entries.Clear(); var consentprototypelist = _protoManager.EnumeratePrototypes(); diff --git a/Content.Client/DisplacementMap/DisplacementMapSystem.cs b/Content.Client/DisplacementMap/DisplacementMapSystem.cs new file mode 100644 index 00000000000..6db164a09f0 --- /dev/null +++ b/Content.Client/DisplacementMap/DisplacementMapSystem.cs @@ -0,0 +1,65 @@ +using Content.Shared.DisplacementMap; +using Robust.Client.GameObjects; +using Robust.Client.Graphics; +using Robust.Shared.Serialization.Manager; + +namespace Content.Client.DisplacementMap; + +public sealed class DisplacementMapSystem : EntitySystem +{ + [Dependency] private readonly ISerializationManager _serialization = default!; + + public bool TryAddDisplacement(DisplacementData data, SpriteComponent sprite, int index, string key, HashSet revealedLayers) + { + if (data.ShaderOverride != null) + sprite.LayerSetShader(index, data.ShaderOverride); + + var displacementKey = $"{key}-displacement"; + if (!revealedLayers.Add(displacementKey)) + { + Log.Warning($"Duplicate key for DISPLACEMENT: {displacementKey}."); + return false; + } + + //allows you not to write it every time in the YML + foreach (var pair in data.SizeMaps) + { + pair.Value.CopyToShaderParameters??= new() + { + LayerKey = "dummy", + ParameterTexture = "displacementMap", + ParameterUV = "displacementUV", + }; + } + + if (!data.SizeMaps.ContainsKey(32)) + { + Log.Error($"DISPLACEMENT: {displacementKey} don't have 32x32 default displacement map"); + return false; + } + + // We choose a displacement map from the possible ones, matching the size with the original layer size. + // If there is no such a map, we use a standard 32 by 32 one + var displacementDataLayer = data.SizeMaps[EyeManager.PixelsPerMeter]; + var actualRSI = sprite.LayerGetActualRSI(index); + if (actualRSI is not null) + { + if (actualRSI.Size.X != actualRSI.Size.Y) + Log.Warning($"DISPLACEMENT: {displacementKey} has a resolution that is not 1:1, things can look crooked"); + + var layerSize = actualRSI.Size.X; + if (data.SizeMaps.ContainsKey(layerSize)) + displacementDataLayer = data.SizeMaps[layerSize]; + } + + var displacementLayer = _serialization.CreateCopy(displacementDataLayer, notNullableOverride: true); + displacementLayer.CopyToShaderParameters!.LayerKey = key; + + sprite.AddLayer(displacementLayer, index); + sprite.LayerMapSet(displacementKey, index); + + revealedLayers.Add(displacementKey); + + return true; + } +} diff --git a/Content.Client/Floofstation/VoredSystem.cs b/Content.Client/Floofstation/VoredSystem.cs new file mode 100644 index 00000000000..c39a4c9fe25 --- /dev/null +++ b/Content.Client/Floofstation/VoredSystem.cs @@ -0,0 +1,47 @@ +using Content.Shared.FloofStation; +using Robust.Shared.Audio.Systems; +using Robust.Shared.Player; + +namespace Content.Client.Floofstation; + +public sealed partial class VoredSystem : EntitySystem +{ + [Dependency] private readonly SharedAudioSystem _audio = default!; + [Dependency] private readonly ISharedPlayerManager _playerMan = default!; + + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent(OnInit); + SubscribeLocalEvent(Onhutdown); + SubscribeLocalEvent(OnPlayerAttached); + SubscribeLocalEvent(OnPlayerDetached); + } + + private void OnInit(EntityUid uid, VoredComponent component, ComponentInit args) + { + if (uid != _playerMan.LocalEntity) + return; + + component.Stream = _audio.PlayGlobal(component.SoundBelly, Filter.Local(), false)?.Entity; + } + + private void Onhutdown(EntityUid uid, VoredComponent component, ComponentShutdown args) + { + if (uid != _playerMan.LocalEntity) + return; + + QueueDel(component.Stream); + } + + private void OnPlayerAttached(EntityUid uid, VoredComponent component, LocalPlayerAttachedEvent args) + { + component.Stream = _audio.PlayGlobal(component.SoundBelly, Filter.Local(), false)?.Entity; + } + + private void OnPlayerDetached(EntityUid uid, VoredComponent component, LocalPlayerDetachedEvent args) + { + QueueDel(component.Stream); + } +} diff --git a/Content.Client/Hands/Systems/HandsSystem.cs b/Content.Client/Hands/Systems/HandsSystem.cs index 7319b97b42b..ffa6dfd29d6 100644 --- a/Content.Client/Hands/Systems/HandsSystem.cs +++ b/Content.Client/Hands/Systems/HandsSystem.cs @@ -1,5 +1,6 @@ using System.Diagnostics.CodeAnalysis; using System.Linq; +using Content.Client.DisplacementMap; using Content.Client.Examine; using Content.Client.Strip; using Content.Client.Verbs.UI; @@ -28,6 +29,7 @@ public sealed class HandsSystem : SharedHandsSystem [Dependency] private readonly SharedContainerSystem _containerSystem = default!; [Dependency] private readonly StrippableSystem _stripSys = default!; [Dependency] private readonly ExamineSystem _examine = default!; + [Dependency] private readonly DisplacementMapSystem _displacement = default!; public event Action? OnPlayerAddHand; public event Action? OnPlayerRemoveHand; @@ -345,6 +347,10 @@ private void UpdateHandVisuals(EntityUid uid, EntityUid held, Hand hand, HandsCo } sprite.LayerSetData(index, layerData); + + //Add displacement maps + if (handComp.HandDisplacement is not null) + _displacement.TryAddDisplacement(handComp.HandDisplacement, sprite, index, key, revealedLayers); } RaiseLocalEvent(held, new HeldVisualsUpdatedEvent(uid, revealedLayers), true); diff --git a/Content.Client/Jittering/JitteringSystem.cs b/Content.Client/Jittering/JitteringSystem.cs index 185bd490d3b..e143f50d484 100644 --- a/Content.Client/Jittering/JitteringSystem.cs +++ b/Content.Client/Jittering/JitteringSystem.cs @@ -45,7 +45,8 @@ private void OnShutdown(EntityUid uid, JitteringComponent jittering, ComponentSh private void OnAnimationCompleted(EntityUid uid, JitteringComponent jittering, AnimationCompletedEvent args) { - if(args.Key != _jitterAnimationKey) + // FLoofstation - avoid restarting the jittering animation on entites that already stopped jittering + if(args.Key != _jitterAnimationKey || jittering.LifeStage >= ComponentLifeStage.Stopping) return; if (TryComp(uid, out AnimationPlayerComponent? animationPlayer) diff --git a/Content.Server/Carrying/CarryingSystem.cs b/Content.Server/Carrying/CarryingSystem.cs index 857c3861a74..ed5bb36ea5b 100644 --- a/Content.Server/Carrying/CarryingSystem.cs +++ b/Content.Server/Carrying/CarryingSystem.cs @@ -162,11 +162,17 @@ private void OnMobStateChanged(EntityUid uid, CarryingComponent component, MobSt /// private void OnInteractionAttempt(EntityUid uid, BeingCarriedComponent component, InteractionAttemptEvent args) { - if (args.Target == null) + // Floofstation - function body reviewed + Predicate isChildOfCarrier = null!; // C# doesn't have local functions eugh + isChildOfCarrier = (childXForm) => childXForm.ParentUid == component.Carrier + || (childXForm.ParentUid is {Valid: true} parent && isChildOfCarrier(Transform(parent))); + + if (args.Target == null // Allow self-interacts + || isChildOfCarrier(Transform(args.Target.Value))) // Allow interacting with everything on the carriee return; + // Also check if the interacted-with entity is on the carrier and cancel the event if not var targetParent = Transform(args.Target.Value).ParentUid; - if (args.Target.Value != component.Carrier && targetParent != component.Carrier && targetParent != uid) args.Cancel(); } @@ -201,8 +207,9 @@ private void OnStandAttempt(EntityUid uid, BeingCarriedComponent component, Stan private void OnInteractedWith(EntityUid uid, BeingCarriedComponent component, GettingInteractedWithAttemptEvent args) { - if (args.Uid != component.Carrier) - args.Cancel(); + // Floofstation - why. + // if (args.Uid != component.Carrier) + // args.Cancel(); } private void OnPullAttempt(EntityUid uid, BeingCarriedComponent component, PullAttemptEvent args) diff --git a/Content.Server/Chat/Systems/ChatSystem.cs b/Content.Server/Chat/Systems/ChatSystem.cs index 3648cf24e10..899ae778bd9 100644 --- a/Content.Server/Chat/Systems/ChatSystem.cs +++ b/Content.Server/Chat/Systems/ChatSystem.cs @@ -43,7 +43,7 @@ namespace Content.Server.Chat.Systems; // Dear contributor. When I was introducing changes to this system only god and I knew what I was doing. // Now only god knows. Please don't touch this code ever again. If you do have to, increment this counter as a warning for others: -// TOTAL_HOURS_WASTED_HERE_EE = 17 +// TOTAL_HOURS_WASTED_HERE_EE = 18 // TODO refactor whatever active warzone this class and chatmanager have become /// diff --git a/Content.Server/FloofStation/Abilities/Psionics/Abilities/PsionicHypnoSystem.cs b/Content.Server/FloofStation/Abilities/Psionics/Abilities/PsionicHypnoSystem.cs index d2c2c63749d..57a91e8a868 100644 --- a/Content.Server/FloofStation/Abilities/Psionics/Abilities/PsionicHypnoSystem.cs +++ b/Content.Server/FloofStation/Abilities/Psionics/Abilities/PsionicHypnoSystem.cs @@ -15,10 +15,9 @@ using Content.Shared.Administration.Logs; using Content.Shared.Mobs.Systems; using Content.Shared.Mobs.Components; -using Content.Shared.Mindshield.Components; using Content.Shared.Psionics; -using Content.Shared.Tag; -using Content.Shared.Implants; +using Content.Server.Consent; +using Content.Shared.Mind.Components; namespace Content.Server.Abilities.Psionics @@ -32,7 +31,7 @@ public sealed class PsionicHypnoSystem : EntitySystem [Dependency] private readonly IPlayerManager _playerManager = default!; [Dependency] private readonly ISharedAdminLogManager _adminLog = default!; [Dependency] private readonly MobStateSystem _mobState = default!; - [Dependency] private readonly TagSystem _tag = default!; + [Dependency] private readonly ConsentSystem _consent = default!; public override void Initialize() { @@ -42,8 +41,8 @@ public override void Initialize() SubscribeLocalEvent(OnDispelledHypnotized); SubscribeLocalEvent(OnDispelled); SubscribeLocalEvent(OnDoAfter); + SubscribeLocalEvent>(BreakHypnoVerb); SubscribeLocalEvent(OnMindbreak); - SubscribeLocalEvent(OnMindShield); SubscribeLocalEvent((uid, _, args) => OnExamine(uid, args)); } @@ -55,15 +54,9 @@ private void OnPowerUsed(EntityUid uid, PsionicHypnoComponent component, HypnoPo || _mobState.IsCritical(args.Target, mob)) return; - if (component.Subjects >= component.MaxSubjects) + if (!_consent.HasConsent(args.Target, "Hypno")) { - _popups.PopupEntity(Loc.GetString("hypno-max-subject"), uid, uid, PopupType.Large); - return; - } - - if (!component.ByPassMindShield && HasComp(args.Target)) - { - _popups.PopupEntity(Loc.GetString("has-mindshield"), uid, uid, PopupType.Large); + _popups.PopupEntity(Loc.GetString("has-no-consent"), uid, uid, PopupType.Large); return; } @@ -87,7 +80,7 @@ private void OnPowerUsed(EntityUid uid, PsionicHypnoComponent component, HypnoPo _popups.PopupEntity(Loc.GetString("hypno-phase-1", ("target", uid)), args.Target, args.Target, PopupType.Small); args.Handled = true; - _psionics.LogPowerUsed(args.Performer, "hypno"); + _psionics.LogPowerUsed(args.Performer, "hypno", 0, 0); } private void OnDispelled(EntityUid uid, PsionicHypnoComponent component, DispelledEvent args) @@ -110,19 +103,6 @@ private void OnMindbreak(EntityUid uid, HypnotizedComponent component, ref OnMin StopHypno(uid, component); } - private void OnMindShield(EntityUid uid, HypnotizedComponent component, ref ImplantImplantedEvent ev) - { - if (_tag.HasTag(ev.Implant, "MindShield") && ev.Implanted != null) - { - if (component.Master is not null - && TryComp(component.Master, out var hypnotist) - && hypnotist.ByPassMindShield) - return; - - StopHypno(uid, component); - } - } - private void ReleaseSubjectVerb(EntityUid uid, PsionicHypnoComponent component, GetVerbsEvent args) { if (args.User == args.Target @@ -140,6 +120,21 @@ private void ReleaseSubjectVerb(EntityUid uid, PsionicHypnoComponent component, args.Verbs.Add(verbReleaseHypno); } + private void BreakHypnoVerb(EntityUid uid, HypnotizedComponent component, GetVerbsEvent args) + { + if (args.User != args.Target) + return; + + InnateVerb verbBreakHypno = new() + { + Act = () => StopHypno(args.User), + Text = Loc.GetString("hypno-break"), + Icon = new SpriteSpecifier.Texture(new ResPath("/Textures/Floof/Interface/Actions/hypno.png")), + Priority = 1 + }; + args.Verbs.Add(verbBreakHypno); + } + private void OnDoAfter(EntityUid uid, PsionicHypnoComponent component, PsionicHypnosisDoAfterEvent args) { if (component is null) @@ -195,14 +190,25 @@ public void Hypnotize(EntityUid uid, EntityUid target, PsionicHypnoComponent? co Dirty(target, hypnotized); - component.Subjects += 1; - - _adminLog.Add(LogType.Action, LogImpact.High, $"{ToPrettyString(uid)} hypnotized {ToPrettyString(target)}"); + _adminLog.Add(LogType.Action, LogImpact.Low, $"{ToPrettyString(uid)} hypnotized {ToPrettyString(target)}"); RaiseLocalEvent(target, new MoodEffectEvent("BeingHypnotized")); - if (_playerManager.TryGetSessionByEntity(target, out var session) - || session is not null) + if (_playerManager.TryGetSessionByEntity(uid, out var sessionmaster) + || sessionmaster is not null) + { + var message = Loc.GetString("hypnotist", ("entity", target)); + _chatManager.ChatMessageToOne( + ChatChannel.Emotes, + message, + message, + EntityUid.Invalid, + false, + sessionmaster.Channel); + } + + if (_playerManager.TryGetSessionByEntity(target, out var sessionsubject) + || sessionsubject is not null) { var message = Loc.GetString("hypnotized", ("entity", uid)); _chatManager.ChatMessageToOne( @@ -211,7 +217,7 @@ public void Hypnotize(EntityUid uid, EntityUid target, PsionicHypnoComponent? co message, EntityUid.Invalid, false, - session.Channel); + sessionsubject.Channel); } } @@ -220,32 +226,32 @@ public void StopHypno(EntityUid uid, HypnotizedComponent? component = null) if (!Resolve(uid, ref component)) return; - _adminLog.Add(LogType.Action, LogImpact.High, $"{ToPrettyString(uid)} is not longer hypnotized."); + _adminLog.Add(LogType.Action, LogImpact.Low, $"{ToPrettyString(uid)} is not longer hypnotized."); _popups.PopupEntity(Loc.GetString("hypno-free"), uid, uid, PopupType.LargeCaution); RaiseLocalEvent(uid, new MoodEffectEvent("LostHypnosis")); - if (_playerManager.TryGetSessionByEntity(uid, out var session) - || session is not null) - { - var message = Loc.GetString("stophypno", ("entity", uid)); - _chatManager.ChatMessageToOne( - ChatChannel.Emotes, - message, - message, - EntityUid.Invalid, - false, - session.Channel); - } - if (component.Master is not null && TryComp(component.Master, out var hypnotist)) { - hypnotist.Subjects -= 1; _popups.PopupEntity(Loc.GetString("lost-subject"), hypnotist.Owner, hypnotist.Owner, PopupType.LargeCaution); + + if (_playerManager.TryGetSessionByEntity(uid, out var session) + || session is not null) + { + var message = Loc.GetString("stophypno", ("entity", hypnotist.Owner)); + _chatManager.ChatMessageToOne( + ChatChannel.Emotes, + message, + message, + EntityUid.Invalid, + false, + session.Channel); + } } + RemComp(uid, component); } diff --git a/Content.Server/FloofStation/VoreSystem.cs b/Content.Server/FloofStation/VoreSystem.cs new file mode 100644 index 00000000000..88f41787cf3 --- /dev/null +++ b/Content.Server/FloofStation/VoreSystem.cs @@ -0,0 +1,445 @@ +using Content.Shared.Verbs; +using Robust.Shared.Containers; +using Robust.Shared.Utility; +using Robust.Shared.Audio.Systems; +using Content.Server.Body.Components; +using Content.Server.Consent; +using Content.Shared.Mobs.Components; +using Content.Shared.Examine; +using Content.Server.Atmos.Components; +using Content.Server.Temperature.Components; +using Content.Shared.Eye.Blinding.Systems; +using Content.Shared.Damage; +using Content.Shared.Administration.Logs; +using Content.Shared.Database; +using Content.Server.Chat.Managers; +using Content.Server.DoAfter; +using Content.Shared.Popups; +using Robust.Server.Player; +using Content.Shared.Mobs.Systems; +using Content.Shared.Chat; +using Content.Shared.DoAfter; +using Content.Shared.FloofStation; +using Robust.Shared.Random; +using Content.Shared.Inventory; +using Robust.Shared.Physics.Components; +using Content.Shared.Nutrition.Components; +using Content.Shared.Nutrition.EntitySystems; +using Content.Server.Power.EntitySystems; +using Content.Server.Silicon.Charge; +using Content.Shared.PowerCell.Components; +using System.Linq; +using Content.Shared.Forensics; +using Content.Server.Forensics; +using Content.Shared.Contests; +using Content.Shared.Standing; +using Content.Server.Power.Components; +using Content.Shared.PowerCell; +using Content.Server.Nutrition.EntitySystems; + +namespace Content.Server.FloofStation; + +public sealed class VoreSystem : EntitySystem +{ + [Dependency] private readonly SharedContainerSystem _containerSystem = default!; + [Dependency] private readonly SharedAudioSystem _audioSystem = default!; + [Dependency] private readonly ConsentSystem _consent = default!; + [Dependency] private readonly BlindableSystem _blindableSystem = default!; + [Dependency] private readonly DamageableSystem _damageable = default!; + [Dependency] private readonly ISharedAdminLogManager _adminLog = default!; + [Dependency] private readonly IChatManager _chatManager = default!; + [Dependency] private readonly DoAfterSystem _doAfterSystem = default!; + [Dependency] private readonly SharedPopupSystem _popups = default!; + [Dependency] private readonly IPlayerManager _playerManager = default!; + [Dependency] private readonly MobStateSystem _mobState = default!; + [Dependency] private readonly IRobustRandom _random = default!; + [Dependency] private readonly InventorySystem _inventorySystem = default!; + [Dependency] private readonly HungerSystem _hunger = default!; + [Dependency] private readonly BatterySystem _battery = default!; + [Dependency] private readonly ContestsSystem _contests = default!; + [Dependency] private readonly StandingStateSystem _standingState = default!; + [Dependency] private readonly SharedTransformSystem _transform = default!; + [Dependency] private readonly FoodSystem _food = default!; + + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent(OnInit); + SubscribeLocalEvent>(AddVerbs); + SubscribeLocalEvent(OnGibContents); + SubscribeLocalEvent((uid, _, args) => OnExamine(uid, args)); + SubscribeLocalEvent(OnDoAfter); + + SubscribeLocalEvent(OnRelease); + SubscribeLocalEvent(OnSeeAttempt); + } + + private void OnInit(EntityUid uid, VoreComponent component, MapInitEvent args) + { + component.Stomach = _containerSystem.EnsureContainer(uid, "stomach"); + } + + private void AddVerbs(EntityUid uid, VoreComponent component, GetVerbsEvent args) + { + DevourVerb(uid, component, args); + VoreVerb(uid, component, args); + } + + private void DevourVerb(EntityUid uid, VoreComponent component, GetVerbsEvent args) + { + if (!args.CanInteract + || !args.CanAccess + || args.User == args.Target + || !HasComp(args.Target) + || !_consent.HasConsent(args.Target, "Vore") + || HasComp(args.User)) + return; + + InnateVerb verbDevour = new() + { + Act = () => TryDevour(uid, args.Target, component), + Text = Loc.GetString("vore-devour"), + Category = VerbCategory.Vore, + Icon = new SpriteSpecifier.Rsi(new ResPath("Interface/Actions/devour.rsi"), "icon-on"), + Priority = -1 + }; + args.Verbs.Add(verbDevour); + } + + private void VoreVerb(EntityUid uid, VoreComponent component, GetVerbsEvent args) + { + if (args.User != args.Target) + return; + + foreach (var prey in component.Stomach.ContainedEntities) + { + InnateVerb verbRelease = new() + { + Act = () => _containerSystem.TryRemoveFromContainer(prey, true), + Text = Loc.GetString("vore-release", ("entity", prey)), + Category = VerbCategory.Vore, + Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/VerbIcons/eject.svg.192dpi.png")), + Priority = 2 + }; + args.Verbs.Add(verbRelease); + + if (!TryComp(prey, out var vored)) + return; + + if (_consent.HasConsent(prey, "Digestion") + && HasComp(args.Target) + && !vored.Digesting) + { + InnateVerb verbDigest = new() + { + Act = () => Digest(prey), + Text = Loc.GetString("vore-digest", ("entity", prey)), + Category = VerbCategory.Vore, + Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/VerbIcons/cutlery.svg.192dpi.png")), + Priority = 1, + ConfirmationPopup = true + }; + args.Verbs.Add(verbDigest); + } + else if (vored.Digesting) + { + InnateVerb verbStopDigest = new() + { + Act = () => StopDigest(prey), + Text = Loc.GetString("vore-stop-digest", ("entity", prey)), + Category = VerbCategory.Vore, + Priority = 1, + }; + args.Verbs.Add(verbStopDigest); + } + } + } + + public void TryDevour(EntityUid uid, EntityUid target, VoreComponent? component = null) + { + if (!Resolve(uid, ref component)) + return; + + if (_food.IsMouthBlocked(uid, uid)) + return; + + _popups.PopupEntity(Loc.GetString("vore-attempt-devour", ("entity", uid), ("prey", target)), uid, PopupType.LargeCaution); + + if (!TryComp(uid, out var predPhysics) + || !TryComp(target, out var preyPhysics)) + return; + + var length = TimeSpan.FromSeconds(component.Delay + * _contests.MassContest(preyPhysics, predPhysics, false, 4f) + * _contests.StaminaContest(uid, target) + * (_standingState.IsDown(target) ? 0.5f : 1)); + + _doAfterSystem.TryStartDoAfter(new DoAfterArgs(EntityManager, uid, length, new VoreDoAfterEvent(), uid, target: target) + { + BreakOnTargetMove = true, + BreakOnDamage = true, + BreakOnUserMove = true, + RequireCanInteract = true + }); + } + + private void OnDoAfter(EntityUid uid, VoreComponent component, VoreDoAfterEvent args) + { + if (component is null) + return; + + if (args.Target is null + || args.Cancelled) + return; + + Devour(uid, args.Target.Value, component); + } + + public void Devour(EntityUid uid, EntityUid target, VoreComponent? component = null) + { + if (!Resolve(uid, ref component)) + return; + + var vored = EnsureComp(target); + vored.Pred = uid; + EnsureComp(target); + EnsureComp(target); + _blindableSystem.UpdateIsBlind(target); + if (TryComp(target, out var temp)) + temp.AtmosTemperatureTransferEfficiency = 0; + + _containerSystem.Insert(target, component.Stomach); + _audioSystem.PlayPvs(component.SoundDevour, uid); + + _popups.PopupEntity(Loc.GetString("vore-devoured", ("entity", uid), ("prey", target)), uid, PopupType.LargeCaution); + + _adminLog.Add(LogType.Action, LogImpact.High, $"{ToPrettyString(uid)} vored {ToPrettyString(target)}"); + } + + private void OnRelease(EntityUid uid, VoredComponent component, EntGotRemovedFromContainerMessage args) + { + if (!TryComp(component.Pred, out var predvore) + || predvore.Stomach != args.Container) + return; + + _transform.AttachToGridOrMap(uid); + + RemComp(uid); + RemComp(uid); + RemComp(uid); + _blindableSystem.UpdateIsBlind(uid); + if (TryComp(uid, out var temp)) + temp.AtmosTemperatureTransferEfficiency = 0.1f; + + _audioSystem.PlayPvs(component.SoundRelease, args.Container.Owner); + + _popups.PopupEntity(Loc.GetString("vore-released", ("entity", uid), ("pred", args.Container.Owner)), uid, PopupType.Large); + + _adminLog.Add(LogType.Action, LogImpact.Medium, $"{ToPrettyString(uid)} got released from {ToPrettyString(args.Container.Owner)} belly"); + } + + public void Digest(EntityUid uid, VoredComponent? component = null) + { + if (!Resolve(uid, ref component)) + return; + + _adminLog.Add(LogType.Action, LogImpact.High, $"{ToPrettyString(component.Pred)} started digesting {ToPrettyString(uid)}"); + + component.Digesting = true; + + _popups.PopupEntity(Loc.GetString("vore-digest-start", ("entity", component.Pred)), component.Pred, component.Pred, PopupType.LargeCaution); + if (_playerManager.TryGetSessionByEntity(component.Pred, out var sessionpred) + || sessionpred is not null) + { + var message = Loc.GetString("vore-digest-start-chat", ("entity", component.Pred)); + _chatManager.ChatMessageToOne( + ChatChannel.Emotes, + message, + message, + EntityUid.Invalid, + false, + sessionpred.Channel); + } + + _popups.PopupEntity(Loc.GetString("vore-digest-start", ("entity", component.Pred)), component.Pred, uid, PopupType.LargeCaution); + if (_playerManager.TryGetSessionByEntity(uid, out var sessionprey) + || sessionprey is not null) + { + var message = Loc.GetString("vore-digest-start-chat", ("entity", component.Pred)); + _chatManager.ChatMessageToOne( + ChatChannel.Emotes, + message, + message, + EntityUid.Invalid, + false, + sessionprey.Channel); + } + } + + public void StopDigest(EntityUid uid, VoredComponent? component = null) + { + if (!Resolve(uid, ref component)) + return; + + _adminLog.Add(LogType.Action, LogImpact.High, $"{ToPrettyString(component.Pred)} stopped digesting {ToPrettyString(uid)}"); + + component.Digesting = false; + + _popups.PopupEntity(Loc.GetString("vore-digest-stop", ("entity", component.Pred)), component.Pred, component.Pred, PopupType.Large); + if (_playerManager.TryGetSessionByEntity(component.Pred, out var sessionpred) + || sessionpred is not null) + { + var message = Loc.GetString("vore-digest-stop", ("entity", component.Pred)); + _chatManager.ChatMessageToOne( + ChatChannel.Emotes, + message, + message, + EntityUid.Invalid, + false, + sessionpred.Channel); + } + + _popups.PopupEntity(Loc.GetString("vore-digest-stop", ("entity", component.Pred)), component.Pred, uid, PopupType.Large); + if (_playerManager.TryGetSessionByEntity(uid, out var sessionprey) + || sessionprey is not null) + { + var message = Loc.GetString("vore-digest-stop", ("entity", component.Pred)); + _chatManager.ChatMessageToOne( + ChatChannel.Emotes, + message, + message, + EntityUid.Invalid, + false, + sessionprey.Channel); + } + } + + private void FullyDigest(EntityUid uid, EntityUid prey) + { + _adminLog.Add(LogType.Action, LogImpact.Extreme, $"{ToPrettyString(uid)} fully digested {ToPrettyString(prey)}"); + + var digestedmessage = _random.Next(1, 8); + + if (_playerManager.TryGetSessionByEntity(uid, out var sessionpred) + || sessionpred is not null) + { + var message = Loc.GetString("vore-digested-owner-" + digestedmessage, ("entity", prey)); + _chatManager.ChatMessageToOne( + ChatChannel.Emotes, + message, + message, + EntityUid.Invalid, + false, + sessionpred.Channel); + } + + if (_playerManager.TryGetSessionByEntity(prey, out var sessionprey) + || sessionprey is not null) + { + var message = Loc.GetString("vore-digested-prey-" + digestedmessage, ("entity", uid)); + _chatManager.ChatMessageToOne( + ChatChannel.Emotes, + message, + message, + EntityUid.Invalid, + false, + sessionprey.Channel); + } + + if (TryComp(prey, out var inventoryComponent) && _inventorySystem.TryGetSlots(uid, out var slots)) + foreach (var slot in slots) + { + if (_inventorySystem.TryGetSlotEntity(prey, slot.Name, out var item, inventoryComponent)) + { + if (TryComp(uid, out var dna)) + { + var partComp = EnsureComp(item.Value); + partComp.DNAs.Add(dna.DNA); + Dirty(item.Value, partComp); + } + _transform.AttachToGridOrMap(item.Value); + } + } + + if (TryComp(prey, out var preyvore)) + _containerSystem.EmptyContainer(preyvore.Stomach); + + QueueDel(prey); + } + + private void OnExamine(EntityUid uid, ExaminedEvent args) + { + if (!_containerSystem.TryGetContainer(uid, "stomach", out var stomach) + || stomach.ContainedEntities.Count < 1) + return; + + args.PushMarkup(Loc.GetString("vore-examine", ("count", stomach.ContainedEntities.Count)), -1); + } + + private void OnSeeAttempt(EntityUid uid, VoredComponent component, CanSeeAttemptEvent args) + { + if (component.LifeStage <= ComponentLifeStage.Running) + args.Cancel(); + } + + private void OnGibContents(EntityUid uid, VoreComponent component, ref BeingGibbedEvent args) + { + _containerSystem.EmptyContainer(component.Stomach); + } + + public override void Update(float frameTime) + { + base.Update(frameTime); + + var query = EntityQueryEnumerator(); + while (query.MoveNext(out var uid, out var vored)) + { + if (!vored.Digesting) + continue; + + vored.Accumulator += frameTime; + + if (vored.Accumulator <= 1) + continue; + + vored.Accumulator -= 1; + + if (!_consent.HasConsent(uid, "Digestion")) + { + StopDigest(uid, vored); + continue; + } + + if (_mobState.IsDead(uid)) + { + FullyDigest(vored.Pred, uid); + continue; + } + else + { + DamageSpecifier damage = new(); + damage.DamageDict.Add("Caustic", 1); + _damageable.TryChangeDamage(uid, damage, true, false); + + // Give 1 Hunger per 1 Caustic Damage. + if (TryComp(vored.Pred, out var hunger)) + _hunger.ModifyHunger(vored.Pred, 1, hunger); + + // Give 2 Power per 1 Caustic Damage. + if (TryComp(vored.Pred, out var internalbattery)) + _battery.SetCharge(vored.Pred, internalbattery.CurrentCharge + 2, internalbattery); + + // Give 2 Power per 1 Caustic Damage. + if (TryComp(vored.Pred, out var batterySlot) + && _containerSystem.TryGetContainer(vored.Pred, batterySlot.CellSlotId, out var container) + && container.ContainedEntities.Count > 0) + { + var battery = container.ContainedEntities.First(); + if (TryComp(battery, out var batterycomp)) + _battery.SetCharge(battery, batterycomp.CurrentCharge + 2, batterycomp); + } + } + } + } +} diff --git a/Content.Server/Hands/Systems/HandsSystem.cs b/Content.Server/Hands/Systems/HandsSystem.cs index 289c440ab7f..b589d362747 100644 --- a/Content.Server/Hands/Systems/HandsSystem.cs +++ b/Content.Server/Hands/Systems/HandsSystem.cs @@ -206,7 +206,7 @@ hands.ActiveHandEntity is not { } throwEnt || var distance = Math.Clamp(length, minDistance, hands.ThrowRange); direction *= distance/length; - var throwStrength = hands.ThrowForceMultiplier; + var throwStrength = hands.BaseThrowspeed; // Let other systems change the thrown entity (useful for virtual items) // or the throw strength. diff --git a/Content.Server/Medical/VomitSystem.cs b/Content.Server/Medical/VomitSystem.cs index dc049b2a1d6..0dbb66907cf 100644 --- a/Content.Server/Medical/VomitSystem.cs +++ b/Content.Server/Medical/VomitSystem.cs @@ -14,6 +14,8 @@ using Content.Shared.Mood; using Robust.Shared.Audio; using Robust.Shared.Prototypes; +using Content.Shared.FloofStation; +using Robust.Shared.Containers; namespace Content.Server.Medical { @@ -29,12 +31,17 @@ public sealed class VomitSystem : EntitySystem [Dependency] private readonly StunSystem _stun = default!; [Dependency] private readonly ThirstSystem _thirst = default!; [Dependency] private readonly ForensicsSystem _forensics = default!; + [Dependency] private readonly SharedContainerSystem _containerSystem = default!; /// /// Make an entity vomit, if they have a stomach. /// public void Vomit(EntityUid uid, float thirstAdded = -40f, float hungerAdded = -40f) { + // Floofstation - Vore + if (TryComp(uid, out var vore)) + _containerSystem.EmptyContainer(vore.Stomach); + // Main requirement: You have a stomach var stomachList = _body.GetBodyOrganComponents(uid); if (stomachList.Count == 0) diff --git a/Content.Server/Polymorph/Components/PolymorphProviderComponent.cs b/Content.Server/Polymorph/Components/PolymorphProviderComponent.cs new file mode 100644 index 00000000000..351f5d24e43 --- /dev/null +++ b/Content.Server/Polymorph/Components/PolymorphProviderComponent.cs @@ -0,0 +1,13 @@ +using Content.Server.Polymorph.Systems; +using Content.Shared.Polymorph; +using Robust.Shared.Prototypes; + +namespace Content.Server.Polymorph.Components; + +[RegisterComponent] +[Access(typeof(PolymorphSystem))] +public sealed partial class PolymorphProviderComponent : Component +{ + [DataField] + public ProtoId Polymorph; +} diff --git a/Content.Server/Polymorph/Systems/PolymorphSystem.Provider.cs b/Content.Server/Polymorph/Systems/PolymorphSystem.Provider.cs new file mode 100644 index 00000000000..03921350f27 --- /dev/null +++ b/Content.Server/Polymorph/Systems/PolymorphSystem.Provider.cs @@ -0,0 +1,31 @@ +using Content.Server.Actions; +using Content.Server.Polymorph.Components; +using Content.Shared.Actions; +using Content.Shared.Inventory.Events; +using Content.Shared.Polymorph; +using Robust.Shared.Prototypes; +using Robust.Shared.Utility; + +namespace Content.Server.Polymorph.Systems; + +public sealed partial class PolymorphSystem +{ + private void InitializeProvider() + { + SubscribeLocalEvent(OnEquipped); + SubscribeLocalEvent(OnUnEquipped); + } + + private void OnUnEquipped(EntityUid uid, PolymorphProviderComponent component, ref GotUnequippedEvent args) + { + if (TryComp(args.Equipee, out var polymorphable)) + RemovePolymorphAction(component.Polymorph, (args.Equipee, polymorphable)); + } + + private void OnEquipped(EntityUid uid, PolymorphProviderComponent component, ref GotEquippedEvent args) + { + var polymorphable = EnsureComp(args.Equipee); + CreatePolymorphAction(component.Polymorph, (args.Equipee, polymorphable)); + } + +} diff --git a/Content.Server/Polymorph/Systems/PolymorphSystem.cs b/Content.Server/Polymorph/Systems/PolymorphSystem.cs index e6ba1d02afd..23f4eb7d7b1 100644 --- a/Content.Server/Polymorph/Systems/PolymorphSystem.cs +++ b/Content.Server/Polymorph/Systems/PolymorphSystem.cs @@ -20,6 +20,7 @@ using Robust.Server.GameObjects; using Robust.Shared.Map; using Robust.Shared.Prototypes; +using Robust.Shared.Serialization.Manager; using Robust.Shared.Timing; using Robust.Shared.Utility; @@ -31,6 +32,7 @@ public sealed partial class PolymorphSystem : EntitySystem [Dependency] private readonly IMapManager _mapManager = default!; [Dependency] private readonly IPrototypeManager _proto = default!; [Dependency] private readonly IGameTiming _gameTiming = default!; + [Dependency] private readonly ISerializationManager _serialization = default!; [Dependency] private readonly ActionsSystem _actions = default!; [Dependency] private readonly AudioSystem _audio = default!; [Dependency] private readonly SharedBuckleSystem _buckle = default!; @@ -62,6 +64,7 @@ public override void Initialize() InitializeCollide(); InitializeMap(); + InitializeProvider(); } public override void Update(float frameTime) @@ -201,6 +204,19 @@ private void OnDestruction(Entity ent, ref Destructi var child = Spawn(configuration.Entity, _transform.GetMapCoordinates(uid, targetTransformComp), rotation: _transform.GetWorldRotation(uid)); + // Copy specified components over + foreach (var compName in configuration.CopiedComponents) + { + if (!_compFact.TryGetRegistration(compName, out var reg) + || !EntityManager.TryGetComponent(uid, reg.Idx, out var comp)) + continue; + + var copy = _serialization.CreateCopy(comp, notNullableOverride: true); + copy.Owner = child; + AddComp(child, copy, true); + } + + // Ensure the resulting entity is sentient (why? this sucks) MakeSentientCommand.MakeSentient(child, EntityManager); var polymorphedComp = _compFact.GetComponent(); @@ -350,8 +366,11 @@ private void OnDestruction(Entity ent, ref Destructi public void CreatePolymorphAction(ProtoId id, Entity target) { target.Comp.PolymorphActions ??= new(); - if (target.Comp.PolymorphActions.ContainsKey(id)) + if (target.Comp.PolymorphActions.TryGetValue(id, out var actionBla)) + { + _actions.AddAction(target, actionBla, target); return; + } if (!_proto.TryIndex(id, out var polyProto)) return; diff --git a/Content.Server/Resist/EscapeInventorySystem.cs b/Content.Server/Resist/EscapeInventorySystem.cs index 2e060b1b42d..610a7a7774c 100644 --- a/Content.Server/Resist/EscapeInventorySystem.cs +++ b/Content.Server/Resist/EscapeInventorySystem.cs @@ -17,6 +17,8 @@ using Content.Shared.Storage; using Robust.Shared.Containers; using Robust.Shared.Prototypes; +using Content.Server.FloofStation; +using Content.Shared.FloofStation; // Floofstation namespace Content.Server.Resist; @@ -30,6 +32,7 @@ public sealed class EscapeInventorySystem : EntitySystem [Dependency] private readonly CarryingSystem _carryingSystem = default!; // Carrying system from Nyanotrasen. [Dependency] private readonly SharedActionsSystem _actions = default!; [Dependency] private readonly ContestsSystem _contests = default!; + [Dependency] private readonly VoreSystem _vore = default!; /// /// You can't escape the hands of an entity this many times more massive than you. @@ -56,7 +59,8 @@ private void OnRelayMovement(EntityUid uid, CanEscapeInventoryComponent componen if (!args.HasDirectionalMovement) return; - if (!_containerSystem.TryGetContainingContainer(uid, out var container) || !_actionBlockerSystem.CanInteract(uid, container.Owner)) + if (!_containerSystem.TryGetContainingContainer(uid, out var container) + || !_actionBlockerSystem.CanInteract(uid, container.Owner)) return; // Make sure there's nothing stopped the removal (like being glued) @@ -74,6 +78,13 @@ private void OnRelayMovement(EntityUid uid, CanEscapeInventoryComponent componen return; } + // Vore - Floofstation + if (HasComp(uid)) + { + AttemptEscape(uid, container.Owner, component, 5f); + return; + } + // Uncontested if (HasComp(container.Owner) || HasComp(container.Owner) || HasComp(container.Owner)) AttemptEscape(uid, container.Owner, component); @@ -120,7 +131,6 @@ private void OnEscape(EntityUid uid, CanEscapeInventoryComponent component, Esca return; } // End of carrying system of nyanotrasen. - _containerSystem.AttachParentToContainerOrGrid((uid, Transform(uid))); args.Handled = true; } diff --git a/Content.Shared/Clothing/Components/ClothingComponent.cs b/Content.Shared/Clothing/Components/ClothingComponent.cs index 6d7226e767d..581125d4fe3 100644 --- a/Content.Shared/Clothing/Components/ClothingComponent.cs +++ b/Content.Shared/Clothing/Components/ClothingComponent.cs @@ -16,9 +16,14 @@ namespace Content.Shared.Clothing.Components; public sealed partial class ClothingComponent : Component { [DataField("clothingVisuals")] - [Access(typeof(ClothingSystem), typeof(InventorySystem), Other = AccessPermissions.ReadExecute)] // TODO remove execute permissions. public Dictionary> ClothingVisuals = new(); + /// + /// The name of the layer in the user that this piece of clothing will map to + /// + [DataField] + public string? MappedLayer; + [ViewVariables(VVAccess.ReadWrite)] [DataField("quickEquip")] public bool QuickEquip = true; @@ -54,18 +59,6 @@ public sealed partial class ClothingComponent : Component [DataField("sprite")] public string? RsiPath; - [ViewVariables(VVAccess.ReadWrite)] - [DataField("maleMask")] - public ClothingMask MaleMask = ClothingMask.UniformFull; - - [ViewVariables(VVAccess.ReadWrite)] - [DataField("femaleMask")] - public ClothingMask FemaleMask = ClothingMask.UniformFull; - - [ViewVariables(VVAccess.ReadWrite)] - [DataField("unisexMask")] - public ClothingMask UnisexMask = ClothingMask.UniformFull; - /// /// Name of the inventory slot the clothing is in. /// @@ -121,4 +114,3 @@ public ClothingUnequipDoAfterEvent(string slot) public override DoAfterEvent Clone() => this; } - diff --git a/Content.Shared/Clothing/EntitySystems/ClothingSystem.cs b/Content.Shared/Clothing/EntitySystems/ClothingSystem.cs index 2f650a19066..17129ce8b23 100644 --- a/Content.Shared/Clothing/EntitySystems/ClothingSystem.cs +++ b/Content.Shared/Clothing/EntitySystems/ClothingSystem.cs @@ -248,7 +248,6 @@ public void CopyVisuals(EntityUid uid, ClothingComponent otherClothing, Clothing clothing.ClothingVisuals = otherClothing.ClothingVisuals; clothing.EquippedPrefix = otherClothing.EquippedPrefix; clothing.RsiPath = otherClothing.RsiPath; - clothing.FemaleMask = otherClothing.FemaleMask; _itemSys.VisualsChanged(uid); Dirty(uid, clothing); @@ -288,4 +287,4 @@ public void SetLayerState(ClothingComponent clothing, string slot, string mapKey } #endregion -} \ No newline at end of file +} diff --git a/Content.Shared/DisplacementMap/DisplacementData.cs b/Content.Shared/DisplacementMap/DisplacementData.cs new file mode 100644 index 00000000000..7bd5b580e14 --- /dev/null +++ b/Content.Shared/DisplacementMap/DisplacementData.cs @@ -0,0 +1,14 @@ +namespace Content.Shared.DisplacementMap; + +[DataDefinition] +public sealed partial class DisplacementData +{ + /// + /// allows you to attach different maps for layers of different sizes. + /// + [DataField(required: true)] + public Dictionary SizeMaps = new(); + + [DataField] + public string? ShaderOverride = "DisplacedStencilDraw"; +} diff --git a/Content.Shared/Floofstation/Hypno/PsionicHypnoComponent.cs b/Content.Shared/Floofstation/Hypno/PsionicHypnoComponent.cs index c3c390af3d5..70e0beffdea 100644 --- a/Content.Shared/Floofstation/Hypno/PsionicHypnoComponent.cs +++ b/Content.Shared/Floofstation/Hypno/PsionicHypnoComponent.cs @@ -11,15 +11,6 @@ public sealed partial class PsionicHypnoComponent : Component [DataField] public float UseDelay = 10f; - [DataField] - public float Subjects = 0; - - [DataField] - public float MaxSubjects = 1; - - [DataField] - public bool ByPassMindShield = false; - [DataField] public DoAfterId? DoAfter; diff --git a/Content.Shared/Floofstation/VoreComponent.cs b/Content.Shared/Floofstation/VoreComponent.cs new file mode 100644 index 00000000000..e551f482851 --- /dev/null +++ b/Content.Shared/Floofstation/VoreComponent.cs @@ -0,0 +1,28 @@ +using Robust.Shared.Containers; +using Robust.Shared.Audio; +using Content.Shared.DoAfter; +using Robust.Shared.Serialization; + +namespace Content.Shared.FloofStation; + +[RegisterComponent] +public sealed partial class VoreComponent : Component +{ + [DataField] + public float Delay = 5f; + + [DataField] + public SoundSpecifier? SoundDevour = new SoundPathSpecifier("/Audio/Floof/Vore/gulp.ogg") + { + Params = AudioParams.Default.WithVolume(-3f), + }; + public Container Stomach = default!; +} + +[Serializable, NetSerializable] +public sealed partial class VoreDoAfterEvent : DoAfterEvent +{ + public VoreDoAfterEvent(int phase) { } + + public override DoAfterEvent Clone() => this; +} diff --git a/Content.Shared/Floofstation/VoredComponent.cs b/Content.Shared/Floofstation/VoredComponent.cs new file mode 100644 index 00000000000..92a7b251d13 --- /dev/null +++ b/Content.Shared/Floofstation/VoredComponent.cs @@ -0,0 +1,29 @@ +using Robust.Shared.Audio; +using Robust.Shared.GameStates; + +namespace Content.Shared.FloofStation; + +[RegisterComponent, NetworkedComponent, AutoGenerateComponentState] +public sealed partial class VoredComponent : Component +{ + public EntityUid? Stream; + public float Accumulator; + + [DataField, AutoNetworkedField] + public EntityUid Pred; + + [DataField] + public bool Digesting = false; + + [DataField, AutoNetworkedField] + public SoundSpecifier? SoundBelly = new SoundPathSpecifier("/Audio/Floof/Vore/stomach_loop.ogg") + { + Params = AudioParams.Default.WithLoop(true).WithVolume(-3f), + }; + + [DataField] + public SoundSpecifier? SoundRelease = new SoundPathSpecifier("/Audio/Effects/Fluids/splat.ogg") + { + Params = AudioParams.Default.WithVolume(-3f), + }; +} diff --git a/Content.Shared/Hands/Components/HandsComponent.cs b/Content.Shared/Hands/Components/HandsComponent.cs index 919d55f294a..f218455c0bb 100644 --- a/Content.Shared/Hands/Components/HandsComponent.cs +++ b/Content.Shared/Hands/Components/HandsComponent.cs @@ -1,3 +1,4 @@ +using Content.Shared.DisplacementMap; using Content.Shared.Hands.EntitySystems; using Robust.Shared.Containers; using Robust.Shared.GameStates; @@ -38,11 +39,11 @@ public sealed partial class HandsComponent : Component public bool DisableExplosionRecursion = false; /// - /// The amount of throw impulse per distance the player is from the throw target. + /// Modifies the speed at which items are thrown. /// - [DataField("throwForceMultiplier")] + [DataField] [ViewVariables(VVAccess.ReadWrite)] - public float ThrowForceMultiplier { get; set; } = 10f; //should be tuned so that a thrown item lands about under the player's cursor + public float BaseThrowspeed { get; set; } = 11f; /// /// Distance after which longer throw targets stop increasing throw impulse. @@ -76,6 +77,9 @@ public sealed partial class HandsComponent : Component /// [DataField, ViewVariables(VVAccess.ReadWrite)] public TimeSpan ThrowCooldown = TimeSpan.FromSeconds(0.5f); + + [DataField] + public DisplacementData? HandDisplacement; } [Serializable, NetSerializable] diff --git a/Content.Shared/Inventory/InventoryComponent.cs b/Content.Shared/Inventory/InventoryComponent.cs index 02b3a5b2583..b7a42fec53c 100644 --- a/Content.Shared/Inventory/InventoryComponent.cs +++ b/Content.Shared/Inventory/InventoryComponent.cs @@ -1,4 +1,5 @@ -using Robust.Shared.Containers; +using Content.Shared.DisplacementMap; +using Robust.Shared.Containers; using Robust.Shared.GameStates; using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; @@ -13,18 +14,21 @@ public sealed partial class InventoryComponent : Component [DataField("speciesId")] public string? SpeciesId { get; set; } - [DataField] public Dictionary Displacements = []; - public SlotDefinition[] Slots = Array.Empty(); public ContainerSlot[] Containers = Array.Empty(); - [DataDefinition] - public sealed partial class SlotDisplacementData - { - [DataField(required: true)] - public PrototypeLayerData Layer = default!; + [DataField] + public Dictionary Displacements = new(); + + /// + /// Alternate displacement maps, which if available, will be selected for the player of the appropriate gender. + /// + [DataField] + public Dictionary FemaleDisplacements = new(); - [DataField] - public string? ShaderOverride = "DisplacedStencilDraw"; - } + /// + /// Alternate displacement maps, which if available, will be selected for the player of the appropriate gender. + /// + [DataField] + public Dictionary MaleDisplacements = new(); } diff --git a/Content.Shared/Polymorph/PolymorphPrototype.cs b/Content.Shared/Polymorph/PolymorphPrototype.cs index 6d010711d2e..e1bc3b0ba03 100644 --- a/Content.Shared/Polymorph/PolymorphPrototype.cs +++ b/Content.Shared/Polymorph/PolymorphPrototype.cs @@ -115,6 +115,17 @@ public sealed partial record PolymorphConfiguration [DataField(serverOnly: true)] [ViewVariables(VVAccess.ReadWrite)] public TimeSpan Cooldown = TimeSpan.Zero; + + /// + /// The exact names of components to copy over when this polymorph is applied. + /// + [DataField(serverOnly: true)] + public HashSet CopiedComponents = new() + { + "LanguageKnowledge", + "LanguageSpeaker", + "Grammar" + }; } public enum PolymorphInventoryChange : byte diff --git a/Content.Shared/Throwing/ThrowingSystem.cs b/Content.Shared/Throwing/ThrowingSystem.cs index 7d94ada924d..61a62670515 100644 --- a/Content.Shared/Throwing/ThrowingSystem.cs +++ b/Content.Shared/Throwing/ThrowingSystem.cs @@ -142,7 +142,7 @@ public void TryThrow(EntityUid uid, // TODO: This is a bandaid, don't do this. // if you want to force landtime have the caller handle it or add a new method. // did we launch this with something stronger than our hands? - if (TryComp(comp.Thrower, out var hands) && strength > hands.ThrowForceMultiplier) + if (TryComp(comp.Thrower, out var hands) && strength > hands.BaseThrowspeed) comp.LandTime = comp.ThrownTime + TimeSpan.FromSeconds(time); else comp.LandTime = time < FlyTime ? default : comp.ThrownTime + TimeSpan.FromSeconds(time - FlyTime); diff --git a/Content.Shared/Verbs/VerbCategory.cs b/Content.Shared/Verbs/VerbCategory.cs index 3331cad30b0..2d2a6044dfc 100644 --- a/Content.Shared/Verbs/VerbCategory.cs +++ b/Content.Shared/Verbs/VerbCategory.cs @@ -87,5 +87,7 @@ public VerbCategory(string text, string? icon, bool iconsOnly = false) public static readonly VerbCategory PowerLevel = new("verb-categories-power-level", null); public static readonly VerbCategory Interaction = new("verb-categories-interaction", null); + + public static readonly VerbCategory Vore = new("verb-categories-vore", null); // Floofstation } } diff --git a/Resources/Audio/Announcements/RoundEnd/oney.ogg b/Resources/Audio/Announcements/RoundEnd/oney.ogg new file mode 100644 index 00000000000..ef8626ffdf9 Binary files /dev/null and b/Resources/Audio/Announcements/RoundEnd/oney.ogg differ diff --git a/Resources/Audio/Floof/Announcements/RoundEnd/TimeForANewRound.ogg b/Resources/Audio/Floof/Announcements/RoundEnd/TimeForANewRound.ogg new file mode 100644 index 00000000000..7c6d85ad274 Binary files /dev/null and b/Resources/Audio/Floof/Announcements/RoundEnd/TimeForANewRound.ogg differ diff --git a/Resources/Audio/Floof/Announcements/RoundEnd/bangindonk.ogg b/Resources/Audio/Floof/Announcements/RoundEnd/bangindonk.ogg new file mode 100644 index 00000000000..686461b0f6c Binary files /dev/null and b/Resources/Audio/Floof/Announcements/RoundEnd/bangindonk.ogg differ diff --git a/Resources/Audio/Floof/Announcements/RoundEnd/dotheballsgo.ogg b/Resources/Audio/Floof/Announcements/RoundEnd/dotheballsgo.ogg new file mode 100644 index 00000000000..5a1dd608f19 Binary files /dev/null and b/Resources/Audio/Floof/Announcements/RoundEnd/dotheballsgo.ogg differ diff --git a/Resources/Audio/Floof/Announcements/RoundEnd/filledwith.ogg b/Resources/Audio/Floof/Announcements/RoundEnd/filledwith.ogg new file mode 100644 index 00000000000..8b81b4f8b5f Binary files /dev/null and b/Resources/Audio/Floof/Announcements/RoundEnd/filledwith.ogg differ diff --git a/Resources/Audio/Floof/Announcements/RoundEnd/haveabeautifultime.ogg b/Resources/Audio/Floof/Announcements/RoundEnd/haveabeautifultime.ogg new file mode 100644 index 00000000000..15733ecc251 Binary files /dev/null and b/Resources/Audio/Floof/Announcements/RoundEnd/haveabeautifultime.ogg differ diff --git a/Resources/Audio/Floof/Announcements/RoundEnd/iknowwhat.ogg b/Resources/Audio/Floof/Announcements/RoundEnd/iknowwhat.ogg new file mode 100644 index 00000000000..850881d5576 Binary files /dev/null and b/Resources/Audio/Floof/Announcements/RoundEnd/iknowwhat.ogg differ diff --git a/Resources/Audio/Floof/Announcements/RoundEnd/iwishtherewassomethingmore.ogg b/Resources/Audio/Floof/Announcements/RoundEnd/iwishtherewassomethingmore.ogg new file mode 100644 index 00000000000..bb42124906b Binary files /dev/null and b/Resources/Audio/Floof/Announcements/RoundEnd/iwishtherewassomethingmore.ogg differ diff --git a/Resources/Audio/Floof/Announcements/RoundEnd/lottawords.ogg b/Resources/Audio/Floof/Announcements/RoundEnd/lottawords.ogg new file mode 100644 index 00000000000..9401627c68a Binary files /dev/null and b/Resources/Audio/Floof/Announcements/RoundEnd/lottawords.ogg differ diff --git a/Resources/Audio/Floof/Announcements/RoundEnd/newroundsexy.ogg b/Resources/Audio/Floof/Announcements/RoundEnd/newroundsexy.ogg new file mode 100644 index 00000000000..f5ba46ae36c Binary files /dev/null and b/Resources/Audio/Floof/Announcements/RoundEnd/newroundsexy.ogg differ diff --git a/Resources/Audio/Floof/Announcements/RoundEnd/pissesonme.ogg b/Resources/Audio/Floof/Announcements/RoundEnd/pissesonme.ogg new file mode 100644 index 00000000000..b8969412b5f Binary files /dev/null and b/Resources/Audio/Floof/Announcements/RoundEnd/pissesonme.ogg differ diff --git a/Resources/Audio/Floof/Announcements/RoundEnd/seeyoulaterokay.ogg b/Resources/Audio/Floof/Announcements/RoundEnd/seeyoulaterokay.ogg new file mode 100644 index 00000000000..5af96ae4541 Binary files /dev/null and b/Resources/Audio/Floof/Announcements/RoundEnd/seeyoulaterokay.ogg differ diff --git a/Resources/Audio/Floof/Announcements/RoundEnd/theballsgothard.ogg b/Resources/Audio/Floof/Announcements/RoundEnd/theballsgothard.ogg new file mode 100644 index 00000000000..0379d94f484 Binary files /dev/null and b/Resources/Audio/Floof/Announcements/RoundEnd/theballsgothard.ogg differ diff --git a/Resources/Audio/Floof/Announcements/RoundEnd/whatashame.ogg b/Resources/Audio/Floof/Announcements/RoundEnd/whatashame.ogg new file mode 100644 index 00000000000..4cc40c8260f Binary files /dev/null and b/Resources/Audio/Floof/Announcements/RoundEnd/whatashame.ogg differ diff --git a/Resources/Audio/Floof/Voice/Avali/attributions.yml b/Resources/Audio/Floof/Voice/Avali/attributions.yml new file mode 100644 index 00000000000..45c20bc8c35 --- /dev/null +++ b/Resources/Audio/Floof/Voice/Avali/attributions.yml @@ -0,0 +1,9 @@ +- files: ["avali_scream"] + license: "CC-BY-NC-SA-3.0" + copyright: "Taken from Steam mod / Starbound. Made by Steam user: https://steamcommunity.com/id/wonky2 with permission." + source: "https://steamcommunity.com/sharedfiles/filedetails/?id=3001955034" + +- files: ["avali_1, avali_1_ask, avali_1_exclaim, avali_2, avali_2_ask, avali_2_exclaim"] + license: "CC-BY-NC-SA-3.0" + copyright: "Taken from Steam 'Avali sounds' mod / Starbound. Made by Steam user: https://steamcommunity.com/id/Nefuki with permission." + source: "https://steamcommunity.com/sharedfiles/filedetails/?id=3164757879" \ No newline at end of file diff --git a/Resources/Audio/Floof/Voice/Avali/avali_1.ogg b/Resources/Audio/Floof/Voice/Avali/avali_1.ogg new file mode 100644 index 00000000000..b9519c6356f Binary files /dev/null and b/Resources/Audio/Floof/Voice/Avali/avali_1.ogg differ diff --git a/Resources/Audio/Floof/Voice/Avali/avali_1_ask.ogg b/Resources/Audio/Floof/Voice/Avali/avali_1_ask.ogg new file mode 100644 index 00000000000..0f0f5129aed Binary files /dev/null and b/Resources/Audio/Floof/Voice/Avali/avali_1_ask.ogg differ diff --git a/Resources/Audio/Floof/Voice/Avali/avali_1_exclaim.ogg b/Resources/Audio/Floof/Voice/Avali/avali_1_exclaim.ogg new file mode 100644 index 00000000000..5c127a557b2 Binary files /dev/null and b/Resources/Audio/Floof/Voice/Avali/avali_1_exclaim.ogg differ diff --git a/Resources/Audio/Floof/Voice/Avali/avali_2.ogg b/Resources/Audio/Floof/Voice/Avali/avali_2.ogg new file mode 100644 index 00000000000..dfbfc77b49a Binary files /dev/null and b/Resources/Audio/Floof/Voice/Avali/avali_2.ogg differ diff --git a/Resources/Audio/Floof/Voice/Avali/avali_2_ask.ogg b/Resources/Audio/Floof/Voice/Avali/avali_2_ask.ogg new file mode 100644 index 00000000000..64ff60aee43 Binary files /dev/null and b/Resources/Audio/Floof/Voice/Avali/avali_2_ask.ogg differ diff --git a/Resources/Audio/Floof/Voice/Avali/avali_2_exclaim.ogg b/Resources/Audio/Floof/Voice/Avali/avali_2_exclaim.ogg new file mode 100644 index 00000000000..29b8c9bf3b7 Binary files /dev/null and b/Resources/Audio/Floof/Voice/Avali/avali_2_exclaim.ogg differ diff --git a/Resources/Audio/Floof/Voice/Avali/avali_scream.ogg b/Resources/Audio/Floof/Voice/Avali/avali_scream.ogg new file mode 100644 index 00000000000..ef15c3bf51f Binary files /dev/null and b/Resources/Audio/Floof/Voice/Avali/avali_scream.ogg differ diff --git a/Resources/Audio/Floof/Vore/gulp.ogg b/Resources/Audio/Floof/Vore/gulp.ogg new file mode 100644 index 00000000000..7d521d2d18d Binary files /dev/null and b/Resources/Audio/Floof/Vore/gulp.ogg differ diff --git a/Resources/Audio/Floof/Vore/stomach_loop.ogg b/Resources/Audio/Floof/Vore/stomach_loop.ogg new file mode 100644 index 00000000000..cb3652d8932 Binary files /dev/null and b/Resources/Audio/Floof/Vore/stomach_loop.ogg differ diff --git a/Resources/Changelog/Floof.yml b/Resources/Changelog/Floof.yml index 2c92169b0be..6431ac16e9a 100644 --- a/Resources/Changelog/Floof.yml +++ b/Resources/Changelog/Floof.yml @@ -1607,3 +1607,143 @@ Entries: id: 213 time: '2024-11-25T20:18:26.0000000+00:00' url: https://github.com/Fansana/floofstation1/pull/346 +- author: Fansana + changes: + - type: Add + message: Added captain whitelist + id: 214 + time: '2024-11-25T20:36:44.0000000+00:00' + url: https://github.com/Fansana/floofstation1/pull/381 +- author: FoxxoTrystan + changes: + - type: Remove + message: MassMindSwap Event + id: 215 + time: '2024-11-26T21:59:58.0000000+00:00' + url: https://github.com/Fansana/floofstation1/pull/382 +- author: FoxxoTrystan + changes: + - type: Add + message: Added Psionic Hypnosis. + id: 216 + time: '2024-12-02T19:05:23.0000000+00:00' + url: https://github.com/Fansana/floofstation1/pull/327 +- author: Mnemotechnician + changes: + - type: Add + message: >- + The heads of logistics, service, and engineering can now find brand-new + department-specific techfab boards in their lockers. + - type: Add + message: >- + The list of things the medical and security techfabs can produce has + been expanded. + id: 217 + time: '2024-12-02T19:10:34.0000000+00:00' + url: https://github.com/Fansana/floofstation1/pull/342 +- author: FoxxoTrystan + changes: + - type: Add + message: Resomi Specie. + id: 218 + time: '2024-12-02T19:21:30.0000000+00:00' + url: https://github.com/Fansana/floofstation1/pull/372 +- author: FoxxoTrystan + changes: + - type: Add + message: Vore... + id: 219 + time: '2024-12-02T20:51:57.0000000+00:00' + url: https://github.com/Fansana/floofstation1/pull/387 +- author: FoxxoTrystan + changes: + - type: Remove + message: Removed SyndicateBomb, ChinaLake, ZombieBundle + id: 220 + time: '2024-12-02T20:52:51.0000000+00:00' + url: https://github.com/Fansana/floofstation1/pull/388 +- author: FoxxoTrystan + changes: + - type: Tweak + message: Replace the loin cloth with the nudity permit. + id: 221 + time: '2024-12-02T21:36:29.0000000+00:00' + url: https://github.com/Fansana/floofstation1/pull/389 +- author: Memeji + changes: + - type: Add + message: Repeater, Argenti, and 45 magnum rubber box to Bartender's loadout. + - type: Add + message: Red cloak to loadout + - type: Add + message: Witch Robes to loadout + - type: Add + message: Sawed-off PKA + - type: Add + message: More end-round sounds. + - type: Add + message: Some contraband to the maintenance lockers. + - type: Tweak + message: Salvage Restock crate price raised to 1300 + id: 222 + time: '2024-12-02T22:39:21.0000000+00:00' + url: https://github.com/Fansana/floofstation1/pull/390 +- author: FoxxoTrystan + changes: + - type: Fix + message: Resomi Damage Sprites + Sprite Support + id: 223 + time: '2024-12-03T16:25:05.0000000+00:00' + url: https://github.com/Fansana/floofstation1/pull/392 +- author: Mnemotechnician + changes: + - type: Tweak + message: >- + You can now interact with carried entities, and carried entities + themselves can freely interact with items inside their + bags/clothing/etc. + - type: Fix + message: Jittering should no longer leave your character visually off-set. + id: 224 + time: '2024-12-05T16:33:52.0000000+00:00' + url: https://github.com/Fansana/floofstation1/pull/393 +- author: Mnemotechnician + changes: + - type: Tweak + message: >- + Added languages to certain entities that lacked them, including MMIs and + positronic brains. + - type: Add + message: >- + Polymorphing into another entity now preserves your languages and + grammar. + - type: Tweak + message: Cherry-picked some changes to languages made upstream. + id: 225 + time: '2024-12-07T02:43:21.0000000+00:00' + url: https://github.com/Fansana/floofstation1/pull/395 +- author: fenndragon + changes: + - type: Fix + message: 'Fixed mining drill ' + id: 226 + time: '2024-12-07T06:16:59.0000000+00:00' + url: https://github.com/Fansana/floofstation1/pull/383 +- author: VividPups + changes: + - type: Add + message: 'brass-knuckles to the oni loadout ' + - type: Add + message: can now craft brass knuckles as a stun weapon + - type: Add + message: 'the crass-knuckles ' + id: 227 + time: '2024-12-07T15:04:35.0000000+00:00' + url: https://github.com/Fansana/floofstation1/pull/371 +- author: fenndragon + changes: + - type: Fix + message: 'Fixed Irregular Extended ' + id: 228 + time: '2024-12-07T15:06:13.0000000+00:00' + url: https://github.com/Fansana/floofstation1/pull/385 diff --git a/Resources/Locale/en-US/Blep/consent.ftl b/Resources/Locale/en-US/Blep/consent.ftl index be26d55de7b..80bc6b08cd6 100644 --- a/Resources/Locale/en-US/Blep/consent.ftl +++ b/Resources/Locale/en-US/Blep/consent.ftl @@ -18,5 +18,11 @@ consent-examine-verb = Consent Info consent-examine-not-set = This player has no consent preferences set. Ask for consent first before engaging in any erotic roleplay. # Consent toggles -consent-Example-name = Example Consent Toggle -consent-Example-desc = This is just here as an example for how to add consent toggles. +consent-Vore-name = Vore +consent-Vore-desc = Allow yourself to be devoured by anyone... or anything. + +consent-Digestion-name = Digestion +consent-Digestion-desc = Allow yourself to be digested. WARNING: BEING DIGESTED WILL ROUND-REMOVE YOU. + +consent-Hypno-name = Hypnosis +consent-Hypno-desc = Allow yourself to be hypnotized. diff --git a/Resources/Locale/en-US/Floof/accessories/resomi-hair.ftl b/Resources/Locale/en-US/Floof/accessories/resomi-hair.ftl new file mode 100644 index 00000000000..46305c26412 --- /dev/null +++ b/Resources/Locale/en-US/Floof/accessories/resomi-hair.ftl @@ -0,0 +1,18 @@ +marking-HairResomiBackstrafe = Resomi Backstrafe +marking-HairResomiBurstShort = Resomi Burst Short +marking-HairResomiDefault = Resomi Default +marking-HairResomiDroopy = Resomi Droopy +marking-HairResomiEars = Resomi Ears +marking-HairResomiFluffymohawk = Resomi Fluffymohawk +marking-HairResomiHedge = Resomi Hedge +marking-HairResomiLongway = Resomi Longway +marking-HairResomiMane = Resomi Mane +marking-HairResomiManeBeardless = Resomi Mane (Beardless) +marking-HairResomiMohawk = Resomi Mohawk +marking-HairResomiMushroom = Resomi Mushroom +marking-HairResomiNotree = Resomi Notree +marking-HairResomiSpiky = Resomi Spiky +marking-HairResomiPointy = ResomiPointy +marking-HairResomiTwies = Resomi Twies +marking-HairResomiUpright = Resomi Upright +marking-HairResomiLong = Resomi Long diff --git a/Resources/Locale/en-US/Floof/hypno.ftl b/Resources/Locale/en-US/Floof/hypno.ftl index 00abd5314b7..fff095e5644 100644 --- a/Resources/Locale/en-US/Floof/hypno.ftl +++ b/Resources/Locale/en-US/Floof/hypno.ftl @@ -4,26 +4,37 @@ action-description-hypno = You are capable to hypnotize people and make them do hypnosis-power-initialization-feedback = I am able to hypnotize and make people do my bidding, reaching them in the deepest parts of their mind. hypnosis-power-feedback = {CAPITALIZE($entity)} wields the power to control minds. -hypno-max-subject = I cannot take more subjects. hypno-already-under = {CAPITALIZE($target)} is already hypnotized. examined-hypno = Looks mindless, happy... lost-subject = I lost control of one of my subjects. hypno-free = I feel able to make my own toughts again. hypno-release = Release Subject +hypno-break = Break Hypnosis hypno-start = You stare into {POSS-ADJ($target)} eyes... hypno-phase-1 = {CAPITALIZE($target)} eyes glows in such pretty colors... it's hard to look away... hypno-phase-2 = The more you stare at {POSS-ADJ($target)} eyes... the more its i's hard to think... to have a thought... hypno-phase-3 = What was I doing... again? It's so hard to think... maybe I don't need to anymore, just stare... its just... so pretty... -hypno-success = {CAPITALIZE(SUBJECT($target))} stares into your eyes, lost in them, lost in you. +hypno-success = {CAPITALIZE($target)} stares into your eyes, lost in them, lost in you. mood-effect-BeingHypnotized = It's nice to not think, to be mindless... I love to obey. mood-effect-LostHypnosis = It was nice to not think, I miss that. -hypnotized = [bold][color=red]You are hypnotized! - You are now completely loyal to {CAPITALIZE($entity)}.[/color][/bold] +hypnotized = [bold][color=red]You have been HYPNOTISED by {CAPITALIZE($entity)}! + Warning: You are not an antag, and still cannot help antags. THIS IS NOT AN ANTAGONIST ROLE. + Standard server rules apply, this is just for ROLEPLAY intents + If this was done against your preferences, AHELP "Adminhelp", otherwise, enjoy![/color][/bold] + +hypnotist = [bold][color=red]You have enthralled {CAPITALIZE($entity)}! + Have then serve your will, and do what you desire! + "in accordinace to server rules, of course."[/color][/bold] stophypno = [bold][color=red]You are no longer hypnotized! - You are no longer loyal to {CAPITALIZE($entity)}, you are now thinking properly again.[/color][/bold] + You are no longer hypnotized by {CAPITALIZE($entity)}, you are now thinking properly again.[/color][/bold] + +has-no-consent = I cannot enter his mind. -has-mindshield = I cannot enter his mind. +trait-name-HypnoticGaze = Hypnotic Gaze +trait-description-HypnoticGaze = + Your eyes pretty colors to enters peoples minds, you are capable of hypnotizing peoples, regardless of + whether or not you possess any notable psychic powers. diff --git a/Resources/Locale/en-US/floofstation/interaction/verbs/noop.ftl b/Resources/Locale/en-US/Floof/interaction/verbs/noop.ftl similarity index 100% rename from Resources/Locale/en-US/floofstation/interaction/verbs/noop.ftl rename to Resources/Locale/en-US/Floof/interaction/verbs/noop.ftl diff --git a/Resources/Locale/en-US/floofstation/leash/leash-verbs.ftl b/Resources/Locale/en-US/Floof/leash/leash-verbs.ftl similarity index 100% rename from Resources/Locale/en-US/floofstation/leash/leash-verbs.ftl rename to Resources/Locale/en-US/Floof/leash/leash-verbs.ftl diff --git a/Resources/Locale/en-US/floofstation/leash/leash.ftl b/Resources/Locale/en-US/Floof/leash/leash.ftl similarity index 100% rename from Resources/Locale/en-US/floofstation/leash/leash.ftl rename to Resources/Locale/en-US/Floof/leash/leash.ftl diff --git a/Resources/Locale/en-US/Floof/markings/resomi.ftl b/Resources/Locale/en-US/Floof/markings/resomi.ftl new file mode 100644 index 00000000000..2a02f7dc4d8 --- /dev/null +++ b/Resources/Locale/en-US/Floof/markings/resomi.ftl @@ -0,0 +1,18 @@ +marking-ResomiTail = Resomi tail +marking-ResomiTail-tail = Resomi tail +marking-ResomiTailFeathers = Tail feathers +marking-ResomiTailFeathers-tail_feathers = Tail feathers +marking-ResomiLArmFeathers = Resomi left arm Feathers +marking-ResomiLArmFeathers-l_hand_feathers = Resomi left arm Feathers +marking-ResomiLLegFeathers = Resomi left leg Feathers +marking-ResomiLLegFeathers-l_foot_feathers = Resomi left leg Feathers +marking-ResomiRArmFeathers = Resomi right arm Feathers +marking-ResomiRArmFeathers-r_hand_feathers = Resomi right arm Feathers +marking-ResomiRLegFeathers = Resomi right leg Feathers +marking-ResomiRLegFeathers-r_foot_feathers = Resomi right leg Feathers +marking-ResomiFluff = Resomi under fluff +marking-ResomiFluff-fluff = Resomi under fluff +marking-ResomiFluffHead = Resomi head fluff +marking-ResomiFluffHead-fluff_head = Resomi head fluff +marking-ResomiFluffHeadUp = Resomi head fluff (up) +marking-ResomiFluffHeadUp-fluff_head_up = Resomi head fluff (up) diff --git a/Resources/Locale/en-US/Floof/species/species.ftl b/Resources/Locale/en-US/Floof/species/species.ftl new file mode 100644 index 00000000000..aa3d3fa3933 --- /dev/null +++ b/Resources/Locale/en-US/Floof/species/species.ftl @@ -0,0 +1 @@ +species-name-resomi = Resomi diff --git a/Resources/Locale/en-US/Floof/vore.ftl b/Resources/Locale/en-US/Floof/vore.ftl new file mode 100644 index 00000000000..3a46118c0ee --- /dev/null +++ b/Resources/Locale/en-US/Floof/vore.ftl @@ -0,0 +1,33 @@ +verb-categories-vore = Vore + +vore-devour = [color=red]Devour[/color] +vore-release = Release {CAPITALIZE($entity)} +vore-digest = Digest {CAPITALIZE($entity)} +vore-stop-digest = Stop digesting {CAPITALIZE($entity)} + +vore-attempt-devour = {CAPITALIZE($entity)} is trying to devour {CAPITALIZE($prey)}! +vore-devoured = {CAPITALIZE($entity)} devoured {CAPITALIZE($prey)} +vore-digest-start = {CAPITALIZE($entity)} belly begins to get more active... +vore-digest-start-chat = [color=red]{CAPITALIZE($entity)} belly begins to get more active...[/color] +vore-digest-stop = {CAPITALIZE($entity)} belly seems to calm down... +vore-released = {CAPITALIZE($entity)} is released from {CAPITALIZE($pred)} belly. + +vore-digested-owner-1 = [color=red]You feel {CAPITALIZE($entity)} body succumb to your digestive system, which breaks it apart into soft slurry.[/color] +vore-digested-owner-2 = [color=red]You hear a lewd glorp as your belly muscles grind {CAPITALIZE($entity)} into a warm pulp.[/color] +vore-digested-owner-3 = [color=red]Your belly lets out a rumble as it melts {CAPITALIZE($entity)} into sludge.[/color] +vore-digested-owner-4 = [color=red]You feel a soft gurgle as {CAPITALIZE($entity)} body loses form in your belly. They're nothing but a soft mass of churning slop now.[/color] +vore-digested-owner-5 = [color=red]Your belly begins gushing {CAPITALIZE($entity)} remains through your system, adding some extra weight to your belly.[/color] +vore-digested-owner-6 = [color=red]Your belly groans as {CAPITALIZE($entity)} falls apart into a thick soup. You can feel their remains soon flowing deeper into your body to be absorbed.[/color] +vore-digested-owner-7 = [color=red]Your belly kneads on every fiber of {CAPITALIZE($entity)}, softening them down into mush to fuel your next hunt.[/color] +vore-digested-owner-8 = [color=red]Your belly churns {CAPITALIZE($entity)} down into a hot slush. You can feel the nutrients coursing through your digestive track with a series of long, wet glorps.[/color] + +vore-digested-prey-1 = [color=red]Your body succumbs to {CAPITALIZE($entity)} digestive system, which breaks you apart into soft slurry.[/color] +vore-digested-prey-2 = [color=red]{CAPITALIZE($entity)} belly lets out a lewd glorp as their muscles grind you into a warm pulp.[/color] +vore-digested-prey-3 = [color=red]{CAPITALIZE($entity)} belly lets out a rumble as it melts you into sludge.[/color] +vore-digested-prey-4 = [color=red]{CAPITALIZE($entity)} feels a soft gurgle as your body loses form in their belly. You're nothing but a soft mass of churning slop now.[/color] +vore-digested-prey-5 = [color=red]{CAPITALIZE($entity)} belly begins gushing your remains through their system, adding some extra weight to {CAPITALIZE($entity)} belly.[/color] +vore-digested-prey-6 = [color=red]{CAPITALIZE($entity)} belly groans as you fall apart into a thick soup. Your remains soon flow deeper into {CAPITALIZE($entity)} body to be absorbed.[/color] +vore-digested-prey-7 = [color=red]{CAPITALIZE($entity)} belly kneads on every fiber of your body, softening you down into mush to fuel their next hunt.[/color] +vore-digested-prey-8 = [color=red]{CAPITALIZE($entity)} belly churns you down into a hot slush. Your nutrient-rich remains course through their digestive track with a series of long, wet glorps.[/color] + +vore-examine = Their belly is larger, you can see {$count} shapes. diff --git a/Resources/Maps/Floof/NTNFships/ntnfhummingbird.yml b/Resources/Maps/Floof/NTNFships/ntnfhummingbird.yml index 72a59adb0c8..bc57684a74f 100644 --- a/Resources/Maps/Floof/NTNFships/ntnfhummingbird.yml +++ b/Resources/Maps/Floof/NTNFships/ntnfhummingbird.yml @@ -19,7 +19,7 @@ entities: - type: MetaData name: N.T.N.F. Hummingbird - type: Transform - pos: 78.053764,-9.11257 + pos: 103.053764,15.88743 parent: invalid - type: MapGrid chunks: @@ -950,6 +950,20 @@ entities: rot: 1.5707963267948966 rad pos: 4.5,15.5 parent: 1 +- proto: ChairPilotSeat + entities: + - uid: 430 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 0.5,17.5 + parent: 1 + - uid: 431 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 1.5,17.5 + parent: 1 - proto: ComputerCrewMonitoring entities: - uid: 149 diff --git a/Resources/Maps/Floof/NTNFships/ntnfscarab.yml b/Resources/Maps/Floof/NTNFships/ntnfscarab.yml index d856689fc49..f7365a016f4 100644 --- a/Resources/Maps/Floof/NTNFships/ntnfscarab.yml +++ b/Resources/Maps/Floof/NTNFships/ntnfscarab.yml @@ -30,7 +30,7 @@ entities: version: 6 0,1: ind: 0,1 - tiles: WQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAggAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAWQAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAggAAAAAAWAAAAAAAWAAAAAAAggAAAAAAVwAAAAAAVwAAAAAAggAAAAAAggAAAAAAggAAAAAAgQAAAAAAggAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAggAAAAAAWAAAAAAAWAAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAggAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAggAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAggAAAAAAWAAAAAAAWAAAAAAAggAAAAAAVwAAAAAAVwAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAWQAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAWAAAAAAAWAAAAAAAggAAAAAAVwAAAAAAVwAAAAAAggAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAggAAAAAAggAAAAAAggAAAAAAWAAAAAAAWAAAAAAAWAAAAAAAWAAAAAAAWAAAAAAAWAAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAgQAAAAAAAAAAAAAAXAAAAAAAXAAAAAAAWAAAAAAAWAAAAAAAWAAAAAAAWAAAAAAAWAAAAAAAWAAAAAAAWAAAAAAAWAAAAAAAWAAAAAAAXAAAAAAAXAAAAAAAXAAAAAAAggAAAAAAAAAAAAAAXAAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAWAAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAXAAAAAAAXAAAAAAAggAAAAAAAAAAAAAAXAAAAAAAggAAAAAAgQAAAAAAggAAAAAAggAAAAAAWAAAAAAAWAAAAAAAWAAAAAAAggAAAAAAggAAAAAAgQAAAAAAggAAAAAAXAAAAAAAXAAAAAAAggAAAAAAAAAAAAAAXAAAAAAAggAAAAAAAAAAAAAAAAAAAAAAggAAAAAAWAAAAAAAWAAAAAAAWAAAAAAAggAAAAAAAAAAAAAAAAAAAAAAggAAAAAAXAAAAAAAXAAAAAAAggAAAAAAAAAAAAAAggAAAAAAggAAAAAAAAAAAAAAAAAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAAAAAAAAAAAAAAAAAggAAAAAAXAAAAAAAXAAAAAAAggAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: WQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAggAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAWQAAAAAAggAAAAAAWAAAAAAAWAAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAggAAAAAAWAAAAAAAWAAAAAAAggAAAAAAVwAAAAAAVwAAAAAAggAAAAAAggAAAAAAggAAAAAAgQAAAAAAggAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAggAAAAAAWAAAAAAAWAAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAggAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAggAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAggAAAAAAWAAAAAAAWAAAAAAAggAAAAAAVwAAAAAAVwAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAWQAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAWAAAAAAAWAAAAAAAggAAAAAAVwAAAAAAVwAAAAAAggAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAggAAAAAAggAAAAAAggAAAAAAWAAAAAAAWAAAAAAAWAAAAAAAWAAAAAAAWAAAAAAAWAAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAgQAAAAAAAAAAAAAAXAAAAAAAXAAAAAAAWAAAAAAAWAAAAAAAWAAAAAAAWAAAAAAAWAAAAAAAWAAAAAAAWAAAAAAAWAAAAAAAWAAAAAAAXAAAAAAAXAAAAAAAXAAAAAAAggAAAAAAAAAAAAAAXAAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAWAAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAXAAAAAAAXAAAAAAAggAAAAAAAAAAAAAAXAAAAAAAggAAAAAAgQAAAAAAggAAAAAAggAAAAAAWAAAAAAAWAAAAAAAWAAAAAAAggAAAAAAggAAAAAAgQAAAAAAggAAAAAAXAAAAAAAXAAAAAAAggAAAAAAAAAAAAAAXAAAAAAAggAAAAAAAAAAAAAAAAAAAAAAggAAAAAAWAAAAAAAWAAAAAAAWAAAAAAAggAAAAAAAAAAAAAAAAAAAAAAggAAAAAAXAAAAAAAXAAAAAAAggAAAAAAAAAAAAAAggAAAAAAggAAAAAAAAAAAAAAAAAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAAAAAAAAAAAAAAAAAggAAAAAAXAAAAAAAXAAAAAAAggAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 0,-1: ind: 0,-1 @@ -417,120 +417,122 @@ entities: rot: 1.5707963267948966 rad pos: 6.5,25.5 parent: 1 -- proto: AirlockCentralCommandLocked +- proto: AirlockCentralCommandGlassLocked entities: - - uid: 10 + - uid: 16 components: - type: Transform - pos: 9.5,20.5 + pos: -0.5,15.5 parent: 1 - - uid: 11 + - uid: 17 components: - type: Transform - pos: 5.5,6.5 + pos: -0.5,17.5 parent: 1 -- proto: AirlockChemistryGlassLocked - entities: - - uid: 12 + - uid: 18 components: - type: Transform - pos: 4.5,3.5 + pos: 6.5,16.5 parent: 1 -- proto: AirlockCommandGlassLocked - entities: - - uid: 13 + - uid: 19 components: - type: Transform - pos: 7.5,18.5 + pos: 6.5,17.5 parent: 1 - - uid: 14 + - uid: 22 components: - type: Transform - pos: 8.5,18.5 + pos: 13.5,17.5 parent: 1 -- proto: AirlockEngineeringGlassLocked - entities: - - uid: 15 + - uid: 23 components: - type: Transform - pos: 7.5,3.5 + pos: 13.5,5.5 parent: 1 -- proto: AirlockGlass - entities: - - uid: 16 + - uid: 24 components: - type: Transform - pos: -0.5,17.5 + pos: 13.5,3.5 parent: 1 - - uid: 17 + - uid: 25 components: - type: Transform - pos: -0.5,15.5 + pos: 6.5,4.5 parent: 1 - - uid: 18 + - uid: 26 components: - type: Transform - pos: 6.5,16.5 + pos: 6.5,5.5 parent: 1 - - uid: 19 + - uid: 27 components: - type: Transform - pos: 6.5,17.5 + pos: 9.5,5.5 parent: 1 - - uid: 20 + - uid: 28 components: - type: Transform - pos: 9.5,17.5 + pos: 9.5,4.5 parent: 1 - - uid: 21 + - uid: 29 components: - type: Transform - pos: 9.5,16.5 + pos: -0.5,3.5 parent: 1 - - uid: 22 + - uid: 30 components: - type: Transform - pos: 13.5,17.5 + pos: -0.5,5.5 parent: 1 - - uid: 23 +- proto: AirlockCentralCommandLocked + entities: + - uid: 10 components: - type: Transform - pos: 13.5,5.5 + pos: 9.5,20.5 parent: 1 - - uid: 24 + - uid: 11 components: - type: Transform - pos: 13.5,3.5 + pos: 5.5,6.5 parent: 1 - - uid: 25 +- proto: AirlockChemistryGlassLocked + entities: + - uid: 12 components: - type: Transform - pos: 9.5,5.5 + pos: 4.5,3.5 parent: 1 - - uid: 26 +- proto: AirlockCommandGlassLocked + entities: + - uid: 13 components: - type: Transform - pos: 9.5,4.5 + pos: 7.5,18.5 parent: 1 - - uid: 27 + - uid: 14 components: - type: Transform - pos: 6.5,4.5 + pos: 8.5,18.5 parent: 1 - - uid: 28 +- proto: AirlockEngineeringGlassLocked + entities: + - uid: 15 components: - type: Transform - pos: 6.5,5.5 + pos: 7.5,3.5 parent: 1 - - uid: 29 +- proto: AirlockGlass + entities: + - uid: 20 components: - type: Transform - pos: -0.5,3.5 + pos: 9.5,17.5 parent: 1 - - uid: 30 + - uid: 21 components: - type: Transform - pos: -0.5,5.5 + pos: 9.5,16.5 parent: 1 - proto: AirlockGlassShuttle entities: @@ -759,7 +761,7 @@ entities: parent: 1 - type: DeviceLinkSink links: - - 838 + - 839 - uid: 67 components: - type: Transform @@ -768,7 +770,7 @@ entities: parent: 1 - type: DeviceLinkSink links: - - 838 + - 839 - uid: 68 components: - type: Transform @@ -777,7 +779,7 @@ entities: parent: 1 - type: DeviceLinkSink links: - - 838 + - 839 - uid: 69 components: - type: Transform @@ -786,7 +788,7 @@ entities: parent: 1 - type: DeviceLinkSink links: - - 838 + - 839 - uid: 70 components: - type: Transform @@ -795,7 +797,7 @@ entities: parent: 1 - type: DeviceLinkSink links: - - 838 + - 839 - uid: 71 components: - type: Transform @@ -804,7 +806,7 @@ entities: parent: 1 - type: DeviceLinkSink links: - - 839 + - 840 - uid: 72 components: - type: Transform @@ -813,7 +815,7 @@ entities: parent: 1 - type: DeviceLinkSink links: - - 839 + - 840 - uid: 73 components: - type: Transform @@ -822,7 +824,7 @@ entities: parent: 1 - type: DeviceLinkSink links: - - 839 + - 840 - uid: 74 components: - type: Transform @@ -831,7 +833,7 @@ entities: parent: 1 - type: DeviceLinkSink links: - - 839 + - 840 - uid: 75 components: - type: Transform @@ -840,7 +842,7 @@ entities: parent: 1 - type: DeviceLinkSink links: - - 840 + - 841 - uid: 76 components: - type: Transform @@ -849,7 +851,7 @@ entities: parent: 1 - type: DeviceLinkSink links: - - 840 + - 841 - uid: 77 components: - type: Transform @@ -858,7 +860,7 @@ entities: parent: 1 - type: DeviceLinkSink links: - - 840 + - 841 - uid: 78 components: - type: Transform @@ -867,7 +869,7 @@ entities: parent: 1 - type: DeviceLinkSink links: - - 840 + - 841 - uid: 79 components: - type: Transform @@ -876,7 +878,7 @@ entities: parent: 1 - type: DeviceLinkSink links: - - 842 + - 843 - uid: 80 components: - type: Transform @@ -885,7 +887,7 @@ entities: parent: 1 - type: DeviceLinkSink links: - - 842 + - 843 - proto: BluespaceBeaker entities: - uid: 81 @@ -2022,268 +2024,268 @@ entities: - type: Transform pos: -0.5,19.5 parent: 1 - - uid: 1159 + - uid: 311 components: - type: Transform pos: 9.5,15.5 parent: 1 - proto: CableHV entities: - - uid: 311 + - uid: 312 components: - type: Transform pos: 9.5,-1.5 parent: 1 - - uid: 312 + - uid: 313 components: - type: Transform pos: 10.5,-1.5 parent: 1 - - uid: 313 + - uid: 314 components: - type: Transform pos: 9.5,-0.5 parent: 1 - - uid: 314 + - uid: 315 components: - type: Transform pos: 9.5,0.5 parent: 1 - - uid: 315 + - uid: 316 components: - type: Transform pos: 9.5,1.5 parent: 1 - - uid: 316 + - uid: 317 components: - type: Transform pos: 9.5,2.5 parent: 1 - - uid: 317 + - uid: 318 components: - type: Transform pos: 11.5,1.5 parent: 1 - - uid: 318 + - uid: 319 components: - type: Transform pos: 11.5,0.5 parent: 1 - - uid: 319 + - uid: 320 components: - type: Transform pos: 11.5,-0.5 parent: 1 - - uid: 320 + - uid: 321 components: - type: Transform pos: 10.5,0.5 parent: 1 - - uid: 321 + - uid: 322 components: - type: Transform pos: 10.5,2.5 parent: 1 - - uid: 322 + - uid: 323 components: - type: Transform pos: 10.5,1.5 parent: 1 - - uid: 323 + - uid: 324 components: - type: Transform pos: 10.5,-0.5 parent: 1 - - uid: 324 + - uid: 325 components: - type: Transform pos: 8.5,-0.5 parent: 1 - proto: CableMV entities: - - uid: 325 + - uid: 326 components: - type: Transform pos: 9.5,2.5 parent: 1 - - uid: 326 + - uid: 327 components: - type: Transform pos: 8.5,2.5 parent: 1 - - uid: 327 + - uid: 328 components: - type: Transform pos: 7.5,2.5 parent: 1 - - uid: 328 + - uid: 329 components: - type: Transform pos: 7.5,1.5 parent: 1 - - uid: 329 + - uid: 330 components: - type: Transform pos: 7.5,0.5 parent: 1 - - uid: 330 + - uid: 331 components: - type: Transform pos: 7.5,-0.5 parent: 1 - - uid: 331 + - uid: 332 components: - type: Transform pos: 7.5,-1.5 parent: 1 - - uid: 332 + - uid: 333 components: - type: Transform pos: 6.5,-1.5 parent: 1 - - uid: 333 + - uid: 334 components: - type: Transform pos: 7.5,3.5 parent: 1 - - uid: 334 + - uid: 335 components: - type: Transform pos: 7.5,4.5 parent: 1 - - uid: 335 + - uid: 336 components: - type: Transform pos: 7.5,5.5 parent: 1 - - uid: 336 + - uid: 337 components: - type: Transform pos: 7.5,6.5 parent: 1 - - uid: 337 + - uid: 338 components: - type: Transform pos: 8.5,6.5 parent: 1 - - uid: 338 + - uid: 339 components: - type: Transform pos: 9.5,6.5 parent: 1 - - uid: 339 + - uid: 340 components: - type: Transform pos: 7.5,6.5 parent: 1 - - uid: 340 + - uid: 341 components: - type: Transform pos: 7.5,7.5 parent: 1 - - uid: 341 + - uid: 342 components: - type: Transform pos: 7.5,8.5 parent: 1 - - uid: 342 + - uid: 343 components: - type: Transform pos: 7.5,9.5 parent: 1 - - uid: 343 + - uid: 344 components: - type: Transform pos: 7.5,10.5 parent: 1 - - uid: 344 + - uid: 345 components: - type: Transform pos: 7.5,11.5 parent: 1 - - uid: 345 + - uid: 346 components: - type: Transform pos: 7.5,12.5 parent: 1 - - uid: 346 + - uid: 347 components: - type: Transform pos: 7.5,13.5 parent: 1 - - uid: 347 + - uid: 348 components: - type: Transform pos: 7.5,14.5 parent: 1 - - uid: 348 + - uid: 349 components: - type: Transform pos: 7.5,15.5 parent: 1 - - uid: 349 + - uid: 350 components: - type: Transform pos: 7.5,16.5 parent: 1 - - uid: 350 + - uid: 351 components: - type: Transform pos: 8.5,15.5 parent: 1 - - uid: 351 + - uid: 352 components: - type: Transform pos: 9.5,15.5 parent: 1 - - uid: 352 + - uid: 353 components: - type: Transform pos: 7.5,17.5 parent: 1 - - uid: 353 + - uid: 354 components: - type: Transform pos: 7.5,18.5 parent: 1 - - uid: 354 + - uid: 355 components: - type: Transform pos: 7.5,19.5 parent: 1 - - uid: 355 + - uid: 356 components: - type: Transform pos: 7.5,20.5 parent: 1 - - uid: 356 + - uid: 357 components: - type: Transform pos: 7.5,21.5 parent: 1 - - uid: 357 + - uid: 358 components: - type: Transform pos: 7.5,22.5 parent: 1 - - uid: 358 + - uid: 359 components: - type: Transform pos: 7.5,23.5 parent: 1 - - uid: 359 + - uid: 360 components: - type: Transform pos: 7.5,24.5 parent: 1 - - uid: 360 + - uid: 361 components: - type: Transform pos: 6.5,22.5 parent: 1 - proto: ChairPilotSeat entities: - - uid: 361 + - uid: 362 components: - type: Transform rot: 3.141592653589793 rad @@ -2291,21 +2293,21 @@ entities: parent: 1 - proto: chem_master entities: - - uid: 362 + - uid: 363 components: - type: Transform pos: 2.5,-0.5 parent: 1 - proto: ChemDispenser entities: - - uid: 363 + - uid: 364 components: - type: Transform pos: 1.5,-0.5 parent: 1 - proto: ChemistryHotplate entities: - - uid: 364 + - uid: 365 components: - type: Transform pos: 3.5,-0.5 @@ -2317,17 +2319,17 @@ entities: isPlaceable: False - proto: ClothingEyesGlassesChemical entities: - - uid: 365 + - uid: 366 components: - type: Transform pos: 3.7270064,-0.59045506 parent: 1 - proto: ClothingHeadHatCentcomcap entities: - - uid: 367 + - uid: 368 components: - type: Transform - parent: 366 + parent: 367 - type: Physics angularDamping: 0 linearDamping: 0 @@ -2335,10 +2337,10 @@ entities: - type: InsideEntityStorage - proto: ClothingHeadsetAltCentCom entities: - - uid: 368 + - uid: 369 components: - type: Transform - parent: 366 + parent: 367 - type: Physics angularDamping: 0 linearDamping: 0 @@ -2346,10 +2348,10 @@ entities: - type: InsideEntityStorage - proto: ClothingHeadsetCentCom entities: - - uid: 369 + - uid: 370 components: - type: Transform - parent: 366 + parent: 367 - type: Physics angularDamping: 0 linearDamping: 0 @@ -2357,10 +2359,10 @@ entities: - type: InsideEntityStorage - proto: ClothingLongcoatCC entities: - - uid: 370 + - uid: 371 components: - type: Transform - parent: 366 + parent: 367 - type: Physics angularDamping: 0 linearDamping: 0 @@ -2368,10 +2370,10 @@ entities: - type: InsideEntityStorage - proto: ClothingNeckCloakCentcom entities: - - uid: 371 + - uid: 372 components: - type: Transform - parent: 366 + parent: 367 - type: Physics angularDamping: 0 linearDamping: 0 @@ -2379,10 +2381,10 @@ entities: - type: InsideEntityStorage - proto: ClothingOuterHardsuitERTCentcomm entities: - - uid: 372 + - uid: 373 components: - type: Transform - parent: 366 + parent: 367 - type: Physics angularDamping: 0 linearDamping: 0 @@ -2390,10 +2392,10 @@ entities: - type: InsideEntityStorage - proto: ClothingOuterHardsuitERTEngineer entities: - - uid: 381 + - uid: 382 components: - type: Transform - parent: 380 + parent: 381 - type: Physics angularDamping: 0 linearDamping: 0 @@ -2401,10 +2403,10 @@ entities: - type: InsideEntityStorage - proto: ClothingOuterHardsuitERTLeader entities: - - uid: 382 + - uid: 383 components: - type: Transform - parent: 380 + parent: 381 - type: Physics angularDamping: 0 linearDamping: 0 @@ -2412,10 +2414,10 @@ entities: - type: InsideEntityStorage - proto: ClothingOuterHardsuitERTMedical entities: - - uid: 383 + - uid: 384 components: - type: Transform - parent: 380 + parent: 381 - type: Physics angularDamping: 0 linearDamping: 0 @@ -2423,19 +2425,19 @@ entities: - type: InsideEntityStorage - proto: ClothingOuterHardsuitERTSecurity entities: - - uid: 384 + - uid: 385 components: - type: Transform - parent: 380 + parent: 381 - type: Physics angularDamping: 0 linearDamping: 0 canCollide: False - type: InsideEntityStorage - - uid: 385 + - uid: 386 components: - type: Transform - parent: 380 + parent: 381 - type: Physics angularDamping: 0 linearDamping: 0 @@ -2443,7 +2445,7 @@ entities: - type: InsideEntityStorage - proto: ComfyChair entities: - - uid: 386 + - uid: 387 components: - type: Transform rot: 3.141592653589793 rad @@ -2451,14 +2453,14 @@ entities: parent: 1 - proto: ComputerCrewMonitoring entities: - - uid: 387 + - uid: 388 components: - type: Transform pos: 5.5,27.5 parent: 1 - proto: ComputerCriminalRecords entities: - - uid: 388 + - uid: 389 components: - type: Transform rot: -1.5707963267948966 rad @@ -2466,7 +2468,7 @@ entities: parent: 1 - proto: ComputerIFFSyndicate entities: - - uid: 389 + - uid: 390 components: - type: Transform rot: 1.5707963267948966 rad @@ -2474,14 +2476,14 @@ entities: parent: 1 - proto: ComputerShuttle entities: - - uid: 390 + - uid: 391 components: - type: Transform pos: 6.5,27.5 parent: 1 - proto: ComputerSurveillanceCameraMonitor entities: - - uid: 391 + - uid: 392 components: - type: Transform pos: 7.5,27.5 @@ -2514,7 +2516,7 @@ entities: ent: null - proto: CrateEmergencyExplosive entities: - - uid: 392 + - uid: 393 components: - type: Transform pos: 13.5,25.5 @@ -2525,68 +2527,68 @@ entities: showEnts: False occludes: True ents: - - 399 - 400 - - 393 - 401 - 394 + - 402 - 395 - 396 - 397 - 398 + - 399 paper_label: !type:ContainerSlot showEnts: False occludes: True ent: null - proto: CrateEngineeringAMEControl entities: - - uid: 402 + - uid: 403 components: - type: Transform pos: 8.5,-0.5 parent: 1 - proto: CrateEngineeringAMEJar entities: - - uid: 403 + - uid: 404 components: - type: Transform pos: 10.5,0.5 parent: 1 - - uid: 404 + - uid: 405 components: - type: Transform pos: 10.5,-0.5 parent: 1 - proto: CrateEngineeringAMEShielding entities: - - uid: 405 + - uid: 406 components: - type: Transform - pos: 10.5,1.5 + pos: 9.515734,0.45908332 parent: 1 - proto: CryoPod entities: - - uid: 406 + - uid: 407 components: - type: Transform pos: 1.5,1.5 parent: 1 - proto: CryoxadoneBeakerSmall entities: - - uid: 407 + - uid: 408 components: - type: Transform pos: 3.2407064,2.4430451 parent: 1 - proto: CurtainsBlue entities: - - uid: 408 + - uid: 409 components: - type: Transform rot: 1.5707963267948966 rad pos: 2.5,12.5 parent: 1 - - uid: 409 + - uid: 410 components: - type: Transform rot: 1.5707963267948966 rad @@ -2594,42 +2596,33 @@ entities: parent: 1 - proto: CurtainsCyan entities: - - uid: 410 + - uid: 411 components: - type: Transform rot: 1.5707963267948966 rad pos: 4.5,10.5 parent: 1 - - uid: 411 + - uid: 412 components: - type: Transform rot: 1.5707963267948966 rad pos: 4.5,11.5 parent: 1 - - uid: 412 + - uid: 413 components: - type: Transform rot: 1.5707963267948966 rad pos: 5.5,12.5 parent: 1 - type: Door - secondsUntilStateChange: -2010.5782 + secondsUntilStateChange: -2172.5474 state: Opening - proto: DoubleEmergencyOxygenTankFilled entities: - - uid: 414 - components: - - type: Transform - parent: 413 - - type: Physics - angularDamping: 0 - linearDamping: 0 - canCollide: False - - type: InsideEntityStorage - uid: 415 components: - type: Transform - parent: 413 + parent: 414 - type: Physics angularDamping: 0 linearDamping: 0 @@ -2638,7 +2631,7 @@ entities: - uid: 416 components: - type: Transform - parent: 413 + parent: 414 - type: Physics angularDamping: 0 linearDamping: 0 @@ -2647,7 +2640,7 @@ entities: - uid: 417 components: - type: Transform - parent: 413 + parent: 414 - type: Physics angularDamping: 0 linearDamping: 0 @@ -2656,7 +2649,7 @@ entities: - uid: 418 components: - type: Transform - parent: 413 + parent: 414 - type: Physics angularDamping: 0 linearDamping: 0 @@ -2665,7 +2658,7 @@ entities: - uid: 419 components: - type: Transform - parent: 413 + parent: 414 - type: Physics angularDamping: 0 linearDamping: 0 @@ -2674,7 +2667,7 @@ entities: - uid: 420 components: - type: Transform - parent: 413 + parent: 414 - type: Physics angularDamping: 0 linearDamping: 0 @@ -2683,7 +2676,16 @@ entities: - uid: 421 components: - type: Transform - parent: 413 + parent: 414 + - type: Physics + angularDamping: 0 + linearDamping: 0 + canCollide: False + - type: InsideEntityStorage + - uid: 422 + components: + - type: Transform + parent: 414 - type: Physics angularDamping: 0 linearDamping: 0 @@ -2691,39 +2693,39 @@ entities: - type: InsideEntityStorage - proto: Dresser entities: - - uid: 430 + - uid: 431 components: - type: Transform pos: 4.5,12.5 parent: 1 - - uid: 431 + - uid: 432 components: - type: Transform pos: 1.5,22.5 parent: 1 - - uid: 432 + - uid: 433 components: - type: Transform pos: 1.5,19.5 parent: 1 - - uid: 433 + - uid: 434 components: - type: Transform pos: 2.5,19.5 parent: 1 - - uid: 434 + - uid: 435 components: - type: Transform pos: 3.5,19.5 parent: 1 - - uid: 435 + - uid: 436 components: - type: Transform pos: 4.5,19.5 parent: 1 - proto: FaxMachineCentcom entities: - - uid: 436 + - uid: 437 components: - type: MetaData name: N.T.N.F long range fax machine @@ -2732,16 +2734,32 @@ entities: parent: 1 - type: FaxMachine name: NTNF +- proto: FloorDrain + entities: + - uid: 1167 + components: + - type: Transform + pos: 5.5,11.5 + parent: 1 + - type: Fixtures + fixtures: {} + - uid: 1168 + components: + - type: Transform + pos: 5.5,10.5 + parent: 1 + - type: Fixtures + fixtures: {} - proto: GasFilterFlipped entities: - - uid: 437 + - uid: 438 components: - type: Transform pos: 3.5,0.5 parent: 1 - proto: GasMinerNitrogen entities: - - uid: 438 + - uid: 439 components: - type: Transform rot: 1.5707963267948966 rad @@ -2749,7 +2767,7 @@ entities: parent: 1 - proto: GasMinerOxygen entities: - - uid: 439 + - uid: 440 components: - type: Transform rot: 1.5707963267948966 rad @@ -2757,7 +2775,7 @@ entities: parent: 1 - proto: GasMixer entities: - - uid: 440 + - uid: 441 components: - type: Transform rot: 1.5707963267948966 rad @@ -2768,25 +2786,25 @@ entities: inletOneConcentration: 0.21 - proto: GasPassiveVent entities: - - uid: 441 + - uid: 442 components: - type: Transform rot: 3.141592653589793 rad pos: 4.5,-5.5 parent: 1 - - uid: 442 + - uid: 443 components: - type: Transform rot: 3.141592653589793 rad pos: 8.5,-5.5 parent: 1 - - uid: 443 + - uid: 444 components: - type: Transform rot: 3.141592653589793 rad pos: 3.5,-5.5 parent: 1 - - uid: 444 + - uid: 445 components: - type: Transform rot: 3.141592653589793 rad @@ -2794,112 +2812,112 @@ entities: parent: 1 - proto: GasPipeBend entities: - - uid: 445 + - uid: 446 components: - type: Transform rot: 1.5707963267948966 rad pos: 4.5,-3.5 parent: 1 - - uid: 446 + - uid: 447 components: - type: Transform rot: -1.5707963267948966 rad pos: 9.5,-3.5 parent: 1 - - uid: 447 + - uid: 448 components: - type: Transform pos: 9.5,-2.5 parent: 1 - - uid: 448 + - uid: 449 components: - type: Transform rot: 3.141592653589793 rad pos: 1.5,-3.5 parent: 1 - - uid: 449 + - uid: 450 components: - type: Transform pos: 3.5,-3.5 parent: 1 - - uid: 450 + - uid: 451 components: - type: Transform rot: 3.141592653589793 rad pos: 0.5,24.5 parent: 1 - - uid: 451 + - uid: 452 components: - type: Transform rot: -1.5707963267948966 rad pos: 12.5,24.5 parent: 1 - - uid: 452 + - uid: 453 components: - type: Transform rot: 3.141592653589793 rad pos: 3.5,-0.5 parent: 1 - - uid: 453 + - uid: 454 components: - type: Transform rot: 1.5707963267948966 rad pos: 6.5,-6.5 parent: 1 - - uid: 454 + - uid: 455 components: - type: Transform rot: -1.5707963267948966 rad pos: 7.5,-6.5 parent: 1 - - uid: 455 + - uid: 456 components: - type: Transform rot: -1.5707963267948966 rad pos: 10.5,-4.5 parent: 1 - - uid: 456 + - uid: 457 components: - type: Transform pos: 10.5,3.5 parent: 1 - - uid: 457 + - uid: 458 components: - type: Transform rot: -1.5707963267948966 rad pos: 6.5,1.5 parent: 1 - - uid: 458 + - uid: 459 components: - type: Transform rot: 1.5707963267948966 rad pos: 8.5,6.5 parent: 1 - - uid: 459 + - uid: 460 components: - type: Transform rot: 3.141592653589793 rad pos: 4.5,12.5 parent: 1 - - uid: 460 + - uid: 461 components: - type: Transform rot: 1.5707963267948966 rad pos: 9.5,19.5 parent: 1 - - uid: 461 + - uid: 462 components: - type: Transform rot: 3.141592653589793 rad pos: 1.5,0.5 parent: 1 - - uid: 462 + - uid: 463 components: - type: Transform rot: 1.5707963267948966 rad pos: 3.5,2.5 parent: 1 - - uid: 463 + - uid: 464 components: - type: Transform rot: 3.141592653589793 rad @@ -2907,730 +2925,730 @@ entities: parent: 1 - proto: GasPipeFourway entities: - - uid: 464 + - uid: 465 components: - type: Transform pos: 7.5,4.5 parent: 1 - - uid: 465 + - uid: 466 components: - type: Transform pos: 7.5,16.5 parent: 1 - - uid: 466 + - uid: 467 components: - type: Transform pos: 5.5,16.5 parent: 1 - proto: GasPipeStraight entities: - - uid: 467 + - uid: 468 components: - type: Transform rot: 3.141592653589793 rad pos: 9.5,4.5 parent: 1 - - uid: 468 + - uid: 469 components: - type: Transform rot: 3.141592653589793 rad pos: 4.5,-4.5 parent: 1 - - uid: 469 + - uid: 470 components: - type: Transform rot: -1.5707963267948966 rad pos: 5.5,-3.5 parent: 1 - - uid: 470 + - uid: 471 components: - type: Transform rot: -1.5707963267948966 rad pos: 6.5,-3.5 parent: 1 - - uid: 471 + - uid: 472 components: - type: Transform rot: -1.5707963267948966 rad pos: 7.5,-3.5 parent: 1 - - uid: 472 + - uid: 473 components: - type: Transform rot: 3.141592653589793 rad pos: 8.5,-4.5 parent: 1 - - uid: 473 + - uid: 474 components: - type: Transform rot: 1.5707963267948966 rad pos: 6.5,-2.5 parent: 1 - - uid: 474 + - uid: 475 components: - type: Transform rot: 1.5707963267948966 rad pos: 5.5,-2.5 parent: 1 - - uid: 475 + - uid: 476 components: - type: Transform pos: 3.5,-4.5 parent: 1 - - uid: 476 + - uid: 477 components: - type: Transform rot: 3.141592653589793 rad pos: 7.5,-1.5 parent: 1 - - uid: 477 + - uid: 478 components: - type: Transform rot: 3.141592653589793 rad pos: 7.5,-0.5 parent: 1 - - uid: 478 + - uid: 479 components: - type: Transform pos: 7.5,1.5 parent: 1 - - uid: 479 + - uid: 480 components: - type: Transform pos: 7.5,2.5 parent: 1 - - uid: 480 + - uid: 481 components: - type: Transform pos: 7.5,3.5 parent: 1 - - uid: 481 + - uid: 482 components: - type: Transform pos: 7.5,5.5 parent: 1 - - uid: 482 + - uid: 483 components: - type: Transform pos: 7.5,6.5 parent: 1 - - uid: 483 + - uid: 484 components: - type: Transform pos: 7.5,8.5 parent: 1 - - uid: 484 + - uid: 485 components: - type: Transform pos: 7.5,9.5 parent: 1 - - uid: 485 + - uid: 486 components: - type: Transform pos: 7.5,10.5 parent: 1 - - uid: 486 + - uid: 487 components: - type: Transform pos: 7.5,12.5 parent: 1 - - uid: 487 + - uid: 488 components: - type: Transform pos: 7.5,13.5 parent: 1 - - uid: 488 + - uid: 489 components: - type: Transform pos: 7.5,14.5 parent: 1 - - uid: 489 + - uid: 490 components: - type: Transform pos: 7.5,15.5 parent: 1 - - uid: 490 + - uid: 491 components: - type: Transform rot: 3.141592653589793 rad pos: 7.5,17.5 parent: 1 - - uid: 491 + - uid: 492 components: - type: Transform rot: 3.141592653589793 rad pos: 7.5,18.5 parent: 1 - - uid: 492 + - uid: 493 components: - type: Transform rot: 3.141592653589793 rad pos: 7.5,19.5 parent: 1 - - uid: 493 + - uid: 494 components: - type: Transform rot: 1.5707963267948966 rad pos: 8.5,20.5 parent: 1 - - uid: 494 + - uid: 495 components: - type: Transform rot: 1.5707963267948966 rad pos: 9.5,20.5 parent: 1 - - uid: 495 + - uid: 496 components: - type: Transform rot: 1.5707963267948966 rad pos: 10.5,20.5 parent: 1 - - uid: 496 + - uid: 497 components: - type: Transform pos: 7.5,21.5 parent: 1 - - uid: 497 + - uid: 498 components: - type: Transform pos: 7.5,22.5 parent: 1 - - uid: 498 + - uid: 499 components: - type: Transform pos: 7.5,23.5 parent: 1 - - uid: 499 + - uid: 500 components: - type: Transform rot: -1.5707963267948966 rad pos: 4.5,24.5 parent: 1 - - uid: 500 + - uid: 501 components: - type: Transform rot: -1.5707963267948966 rad pos: 3.5,24.5 parent: 1 - - uid: 501 + - uid: 502 components: - type: Transform rot: -1.5707963267948966 rad pos: 2.5,24.5 parent: 1 - - uid: 502 + - uid: 503 components: - type: Transform rot: -1.5707963267948966 rad pos: 1.5,24.5 parent: 1 - - uid: 503 + - uid: 504 components: - type: Transform rot: 1.5707963267948966 rad pos: 8.5,24.5 parent: 1 - - uid: 504 + - uid: 505 components: - type: Transform rot: 1.5707963267948966 rad pos: 9.5,24.5 parent: 1 - - uid: 505 + - uid: 506 components: - type: Transform rot: 1.5707963267948966 rad pos: 10.5,24.5 parent: 1 - - uid: 506 + - uid: 507 components: - type: Transform rot: 1.5707963267948966 rad pos: 11.5,24.5 parent: 1 - - uid: 507 + - uid: 508 components: - type: Transform rot: 3.141592653589793 rad pos: 12.5,25.5 parent: 1 - - uid: 508 + - uid: 509 components: - type: Transform rot: 3.141592653589793 rad pos: 0.5,25.5 parent: 1 - - uid: 509 + - uid: 510 components: - type: Transform rot: 3.141592653589793 rad pos: 6.5,25.5 parent: 1 - - uid: 510 + - uid: 511 components: - type: Transform rot: 1.5707963267948966 rad pos: 6.5,16.5 parent: 1 - - uid: 511 + - uid: 512 components: - type: Transform rot: 1.5707963267948966 rad pos: 8.5,16.5 parent: 1 - - uid: 512 + - uid: 513 components: - type: Transform rot: 1.5707963267948966 rad pos: 9.5,16.5 parent: 1 - - uid: 513 + - uid: 514 components: - type: Transform rot: 1.5707963267948966 rad pos: 11.5,16.5 parent: 1 - - uid: 514 + - uid: 515 components: - type: Transform rot: 1.5707963267948966 rad pos: 12.5,16.5 parent: 1 - - uid: 515 + - uid: 516 components: - type: Transform rot: 1.5707963267948966 rad pos: 13.5,16.5 parent: 1 - - uid: 516 + - uid: 517 components: - type: Transform rot: 1.5707963267948966 rad pos: 3.5,16.5 parent: 1 - - uid: 517 + - uid: 518 components: - type: Transform rot: 1.5707963267948966 rad pos: 2.5,16.5 parent: 1 - - uid: 518 + - uid: 519 components: - type: Transform rot: 1.5707963267948966 rad pos: 1.5,16.5 parent: 1 - - uid: 519 + - uid: 520 components: - type: Transform rot: 1.5707963267948966 rad pos: 0.5,16.5 parent: 1 - - uid: 520 + - uid: 521 components: - type: Transform rot: 1.5707963267948966 rad pos: -0.5,16.5 parent: 1 - - uid: 521 + - uid: 522 components: - type: Transform rot: 1.5707963267948966 rad pos: 8.5,4.5 parent: 1 - - uid: 522 + - uid: 523 components: - type: Transform rot: 1.5707963267948966 rad pos: 6.5,4.5 parent: 1 - - uid: 523 + - uid: 524 components: - type: Transform rot: 1.5707963267948966 rad pos: 8.5,11.5 parent: 1 - - uid: 524 + - uid: 525 components: - type: Transform rot: 1.5707963267948966 rad pos: 9.5,11.5 parent: 1 - - uid: 525 + - uid: 526 components: - type: Transform rot: 1.5707963267948966 rad pos: 9.5,4.5 parent: 1 - - uid: 526 + - uid: 527 components: - type: Transform rot: 1.5707963267948966 rad pos: 11.5,4.5 parent: 1 - - uid: 527 + - uid: 528 components: - type: Transform rot: 1.5707963267948966 rad pos: 12.5,4.5 parent: 1 - - uid: 528 + - uid: 529 components: - type: Transform rot: 1.5707963267948966 rad pos: 13.5,4.5 parent: 1 - - uid: 529 + - uid: 530 components: - type: Transform rot: 1.5707963267948966 rad pos: 2.5,4.5 parent: 1 - - uid: 530 + - uid: 531 components: - type: Transform rot: 1.5707963267948966 rad pos: 1.5,4.5 parent: 1 - - uid: 531 + - uid: 532 components: - type: Transform rot: 1.5707963267948966 rad pos: 0.5,4.5 parent: 1 - - uid: 532 + - uid: 533 components: - type: Transform rot: 1.5707963267948966 rad pos: -0.5,4.5 parent: 1 - - uid: 533 + - uid: 534 components: - type: Transform pos: 5.5,5.5 parent: 1 - - uid: 534 + - uid: 535 components: - type: Transform pos: 5.5,6.5 parent: 1 - - uid: 535 + - uid: 536 components: - type: Transform pos: 4.5,3.5 parent: 1 - - uid: 536 + - uid: 537 components: - type: Transform pos: 4.5,2.5 parent: 1 - - uid: 537 + - uid: 538 components: - type: Transform pos: 4.5,1.5 parent: 1 - - uid: 538 + - uid: 539 components: - type: Transform rot: 3.141592653589793 rad pos: 4.5,0.5 parent: 1 - - uid: 539 + - uid: 540 components: - type: Transform rot: 3.141592653589793 rad pos: 5.5,17.5 parent: 1 - - uid: 540 + - uid: 541 components: - type: Transform rot: 3.141592653589793 rad pos: 5.5,18.5 parent: 1 - - uid: 541 + - uid: 542 components: - type: Transform rot: 3.141592653589793 rad pos: 5.5,19.5 parent: 1 - - uid: 542 + - uid: 543 components: - type: Transform rot: 3.141592653589793 rad pos: 5.5,15.5 parent: 1 - - uid: 543 + - uid: 544 components: - type: Transform rot: 3.141592653589793 rad pos: 5.5,14.5 parent: 1 - - uid: 544 + - uid: 545 components: - type: Transform rot: 3.141592653589793 rad pos: 7.5,-5.5 parent: 1 - - uid: 545 + - uid: 546 components: - type: Transform rot: -1.5707963267948966 rad pos: 8.5,-4.5 parent: 1 - - uid: 546 + - uid: 547 components: - type: Transform rot: -1.5707963267948966 rad pos: 9.5,-4.5 parent: 1 - - uid: 547 + - uid: 548 components: - type: Transform rot: 3.141592653589793 rad pos: 10.5,-3.5 parent: 1 - - uid: 548 + - uid: 549 components: - type: Transform rot: 3.141592653589793 rad pos: 10.5,-2.5 parent: 1 - - uid: 549 + - uid: 550 components: - type: Transform rot: 3.141592653589793 rad pos: 10.5,-1.5 parent: 1 - - uid: 550 + - uid: 551 components: - type: Transform rot: 3.141592653589793 rad pos: 10.5,-0.5 parent: 1 - - uid: 551 + - uid: 552 components: - type: Transform rot: 3.141592653589793 rad pos: 10.5,0.5 parent: 1 - - uid: 552 + - uid: 553 components: - type: Transform rot: 3.141592653589793 rad pos: 10.5,1.5 parent: 1 - - uid: 553 + - uid: 554 components: - type: Transform rot: 3.141592653589793 rad pos: 10.5,2.5 parent: 1 - - uid: 554 + - uid: 555 components: - type: Transform rot: 1.5707963267948966 rad pos: 8.5,3.5 parent: 1 - - uid: 555 + - uid: 556 components: - type: Transform rot: 1.5707963267948966 rad pos: 7.5,3.5 parent: 1 - - uid: 556 + - uid: 557 components: - type: Transform rot: 3.141592653589793 rad pos: 9.5,5.5 parent: 1 - - uid: 557 + - uid: 558 components: - type: Transform pos: 9.5,7.5 parent: 1 - - uid: 558 + - uid: 559 components: - type: Transform pos: 9.5,8.5 parent: 1 - - uid: 559 + - uid: 560 components: - type: Transform pos: 9.5,9.5 parent: 1 - - uid: 560 + - uid: 561 components: - type: Transform pos: 6.5,4.5 parent: 1 - - uid: 561 + - uid: 562 components: - type: Transform pos: 6.5,5.5 parent: 1 - - uid: 562 + - uid: 563 components: - type: Transform pos: 6.5,6.5 parent: 1 - - uid: 563 + - uid: 564 components: - type: Transform pos: 6.5,7.5 parent: 1 - - uid: 564 + - uid: 565 components: - type: Transform pos: 6.5,8.5 parent: 1 - - uid: 565 + - uid: 566 components: - type: Transform pos: 6.5,9.5 parent: 1 - - uid: 566 + - uid: 567 components: - type: Transform pos: 6.5,10.5 parent: 1 - - uid: 567 + - uid: 568 components: - type: Transform pos: 6.5,11.5 parent: 1 - - uid: 568 + - uid: 569 components: - type: Transform rot: 1.5707963267948966 rad pos: 5.5,12.5 parent: 1 - - uid: 569 + - uid: 570 components: - type: Transform rot: 3.141592653589793 rad pos: 9.5,11.5 parent: 1 - - uid: 570 + - uid: 571 components: - type: Transform rot: 3.141592653589793 rad pos: 9.5,12.5 parent: 1 - - uid: 571 + - uid: 572 components: - type: Transform rot: 3.141592653589793 rad pos: 9.5,13.5 parent: 1 - - uid: 572 + - uid: 573 components: - type: Transform rot: 3.141592653589793 rad pos: 9.5,14.5 parent: 1 - - uid: 573 + - uid: 574 components: - type: Transform rot: 3.141592653589793 rad pos: 9.5,15.5 parent: 1 - - uid: 574 + - uid: 575 components: - type: Transform rot: 3.141592653589793 rad pos: 9.5,16.5 parent: 1 - - uid: 575 + - uid: 576 components: - type: Transform rot: 3.141592653589793 rad pos: 9.5,18.5 parent: 1 - - uid: 576 + - uid: 577 components: - type: Transform rot: 3.141592653589793 rad pos: 6.5,13.5 parent: 1 - - uid: 577 + - uid: 578 components: - type: Transform rot: 3.141592653589793 rad pos: 6.5,14.5 parent: 1 - - uid: 578 + - uid: 579 components: - type: Transform rot: 3.141592653589793 rad pos: 6.5,15.5 parent: 1 - - uid: 579 + - uid: 580 components: - type: Transform rot: 3.141592653589793 rad pos: 6.5,16.5 parent: 1 - - uid: 580 + - uid: 581 components: - type: Transform rot: 3.141592653589793 rad pos: 6.5,17.5 parent: 1 - - uid: 581 + - uid: 582 components: - type: Transform rot: 3.141592653589793 rad pos: 6.5,19.5 parent: 1 - - uid: 582 + - uid: 583 components: - type: Transform rot: 3.141592653589793 rad pos: 6.5,20.5 parent: 1 - - uid: 583 + - uid: 584 components: - type: Transform rot: 3.141592653589793 rad pos: 6.5,21.5 parent: 1 - - uid: 584 + - uid: 585 components: - type: Transform rot: 3.141592653589793 rad pos: 6.5,22.5 parent: 1 - - uid: 585 + - uid: 586 components: - type: Transform rot: 3.141592653589793 rad pos: 3.5,1.5 parent: 1 - - uid: 586 + - uid: 587 components: - type: Transform rot: -1.5707963267948966 rad pos: 4.5,2.5 parent: 1 - - uid: 587 + - uid: 588 components: - type: Transform rot: -1.5707963267948966 rad pos: 5.5,2.5 parent: 1 - - uid: 588 + - uid: 589 components: - type: Transform rot: -1.5707963267948966 rad pos: 4.5,18.5 parent: 1 - - uid: 589 + - uid: 590 components: - type: Transform rot: 3.141592653589793 rad pos: 3.5,19.5 parent: 1 - - uid: 590 + - uid: 591 components: - type: Transform rot: -1.5707963267948966 rad @@ -3638,152 +3656,152 @@ entities: parent: 1 - proto: GasPipeTJunction entities: - - uid: 591 + - uid: 592 components: - type: Transform rot: 3.141592653589793 rad pos: 7.5,-2.5 parent: 1 - - uid: 592 + - uid: 593 components: - type: Transform pos: 4.5,-2.5 parent: 1 - - uid: 593 + - uid: 594 components: - type: Transform rot: 1.5707963267948966 rad pos: 7.5,0.5 parent: 1 - - uid: 594 + - uid: 595 components: - type: Transform rot: 1.5707963267948966 rad pos: 7.5,7.5 parent: 1 - - uid: 595 + - uid: 596 components: - type: Transform rot: 1.5707963267948966 rad pos: 7.5,11.5 parent: 1 - - uid: 596 + - uid: 597 components: - type: Transform rot: 3.141592653589793 rad pos: 4.5,16.5 parent: 1 - - uid: 597 + - uid: 598 components: - type: Transform rot: 1.5707963267948966 rad pos: 7.5,20.5 parent: 1 - - uid: 598 + - uid: 599 components: - type: Transform pos: 7.5,24.5 parent: 1 - - uid: 599 + - uid: 600 components: - type: Transform rot: 3.141592653589793 rad pos: 6.5,24.5 parent: 1 - - uid: 600 + - uid: 601 components: - type: Transform pos: 5.5,24.5 parent: 1 - - uid: 601 + - uid: 602 components: - type: Transform rot: 3.141592653589793 rad pos: 10.5,16.5 parent: 1 - - uid: 602 + - uid: 603 components: - type: Transform pos: 4.5,4.5 parent: 1 - - uid: 603 + - uid: 604 components: - type: Transform rot: 3.141592653589793 rad pos: 5.5,4.5 parent: 1 - - uid: 604 + - uid: 605 components: - type: Transform rot: 3.141592653589793 rad pos: 3.5,4.5 parent: 1 - - uid: 605 + - uid: 606 components: - type: Transform rot: 3.141592653589793 rad pos: 10.5,4.5 parent: 1 - - uid: 606 + - uid: 607 components: - type: Transform rot: 3.141592653589793 rad pos: 4.5,-0.5 parent: 1 - - uid: 607 + - uid: 608 components: - type: Transform pos: 7.5,-4.5 parent: 1 - - uid: 608 + - uid: 609 components: - type: Transform rot: 3.141592653589793 rad pos: 9.5,3.5 parent: 1 - - uid: 609 + - uid: 610 components: - type: Transform rot: 1.5707963267948966 rad pos: 6.5,3.5 parent: 1 - - uid: 610 + - uid: 611 components: - type: Transform rot: 3.141592653589793 rad pos: 2.5,0.5 parent: 1 - - uid: 611 + - uid: 612 components: - type: Transform rot: -1.5707963267948966 rad pos: 9.5,6.5 parent: 1 - - uid: 612 + - uid: 613 components: - type: Transform rot: 1.5707963267948966 rad pos: 9.5,10.5 parent: 1 - - uid: 613 + - uid: 614 components: - type: Transform rot: -1.5707963267948966 rad pos: 6.5,12.5 parent: 1 - - uid: 614 + - uid: 615 components: - type: Transform rot: -1.5707963267948966 rad pos: 9.5,17.5 parent: 1 - - uid: 615 + - uid: 616 components: - type: Transform rot: -1.5707963267948966 rad pos: 6.5,18.5 parent: 1 - - uid: 616 + - uid: 617 components: - type: Transform rot: -1.5707963267948966 rad @@ -3791,32 +3809,32 @@ entities: parent: 1 - proto: GasPort entities: - - uid: 617 + - uid: 618 components: - type: Transform rot: 1.5707963267948966 rad pos: 2.5,-2.5 parent: 1 - - uid: 618 + - uid: 619 components: - type: Transform pos: 1.5,-2.5 parent: 1 - proto: GasPressurePump entities: - - uid: 619 + - uid: 620 components: - type: Transform rot: -1.5707963267948966 rad pos: 8.5,-2.5 parent: 1 - - uid: 620 + - uid: 621 components: - type: Transform rot: -1.5707963267948966 rad pos: 3.5,-2.5 parent: 1 - - uid: 621 + - uid: 622 components: - type: Transform rot: -1.5707963267948966 rad @@ -3824,125 +3842,125 @@ entities: parent: 1 - proto: GasThermoMachineFreezer entities: - - uid: 622 + - uid: 623 components: - type: Transform pos: 2.5,1.5 parent: 1 - proto: GasVentPump entities: - - uid: 623 + - uid: 624 components: - type: Transform rot: 3.141592653589793 rad pos: 4.5,-3.5 parent: 1 - - uid: 624 + - uid: 625 components: - type: Transform rot: -1.5707963267948966 rad pos: 5.5,-0.5 parent: 1 - - uid: 625 + - uid: 626 components: - type: Transform rot: -1.5707963267948966 rad pos: 14.5,4.5 parent: 1 - - uid: 626 + - uid: 627 components: - type: Transform rot: -1.5707963267948966 rad pos: 10.5,11.5 parent: 1 - - uid: 627 + - uid: 628 components: - type: Transform rot: -1.5707963267948966 rad pos: 8.5,7.5 parent: 1 - - uid: 628 + - uid: 629 components: - type: Transform pos: 10.5,5.5 parent: 1 - - uid: 629 + - uid: 630 components: - type: Transform pos: 5.5,7.5 parent: 1 - - uid: 630 + - uid: 631 components: - type: Transform pos: 3.5,5.5 parent: 1 - - uid: 631 + - uid: 632 components: - type: Transform rot: -1.5707963267948966 rad pos: 8.5,0.5 parent: 1 - - uid: 632 + - uid: 633 components: - type: Transform rot: 3.141592653589793 rad pos: 5.5,13.5 parent: 1 - - uid: 633 + - uid: 634 components: - type: Transform pos: 10.5,17.5 parent: 1 - - uid: 634 + - uid: 635 components: - type: Transform rot: -1.5707963267948966 rad pos: 14.5,16.5 parent: 1 - - uid: 635 + - uid: 636 components: - type: Transform rot: 1.5707963267948966 rad pos: -1.5,16.5 parent: 1 - - uid: 636 + - uid: 637 components: - type: Transform pos: 4.5,17.5 parent: 1 - - uid: 637 + - uid: 638 components: - type: Transform pos: 5.5,20.5 parent: 1 - - uid: 638 + - uid: 639 components: - type: Transform rot: -1.5707963267948966 rad pos: 11.5,20.5 parent: 1 - - uid: 639 + - uid: 640 components: - type: Transform pos: 12.5,26.5 parent: 1 - - uid: 640 + - uid: 641 components: - type: Transform pos: 6.5,26.5 parent: 1 - - uid: 641 + - uid: 642 components: - type: Transform pos: 0.5,26.5 parent: 1 - - uid: 642 + - uid: 643 components: - type: Transform rot: 3.141592653589793 rad pos: 5.5,23.5 parent: 1 - - uid: 643 + - uid: 644 components: - type: Transform rot: 1.5707963267948966 rad @@ -3950,46 +3968,46 @@ entities: parent: 1 - proto: GasVentScrubber entities: - - uid: 644 + - uid: 645 components: - type: Transform rot: 1.5707963267948966 rad pos: 6.5,-4.5 parent: 1 - - uid: 645 + - uid: 646 components: - type: Transform rot: 1.5707963267948966 rad pos: 5.5,1.5 parent: 1 - - uid: 646 + - uid: 647 components: - type: Transform pos: 4.5,13.5 parent: 1 - - uid: 647 + - uid: 648 components: - type: Transform rot: -1.5707963267948966 rad pos: 10.5,10.5 parent: 1 - - uid: 648 + - uid: 649 components: - type: Transform pos: 3.5,20.5 parent: 1 - - uid: 649 + - uid: 650 components: - type: Transform rot: 1.5707963267948966 rad pos: 8.5,17.5 parent: 1 - - uid: 650 + - uid: 651 components: - type: Transform pos: 6.5,23.5 parent: 1 - - uid: 651 + - uid: 652 components: - type: Transform rot: 3.141592653589793 rad @@ -3997,235 +4015,240 @@ entities: parent: 1 - proto: GeneratorBasic15kW entities: - - uid: 652 + - uid: 653 components: - type: Transform pos: 11.5,-0.5 parent: 1 - - uid: 653 + - uid: 654 components: - type: Transform pos: 11.5,0.5 parent: 1 - - uid: 654 + - uid: 655 components: - type: Transform pos: 11.5,1.5 parent: 1 - - uid: 655 + - uid: 656 components: - type: Transform pos: 9.5,1.5 parent: 1 - - uid: 656 + - uid: 657 components: - type: Transform pos: 9.5,-0.5 parent: 1 + - uid: 1169 + components: + - type: Transform + pos: 10.5,1.5 + parent: 1 - proto: GeneratorWallmountAPU entities: - - uid: 657 + - uid: 658 components: - type: Transform pos: 10.5,-1.5 parent: 1 - - uid: 658 + - uid: 659 components: - type: Transform pos: 10.5,2.5 parent: 1 - - uid: 659 + - uid: 660 components: - type: Transform pos: 9.5,-1.5 parent: 1 - proto: GravityGeneratorMini entities: - - uid: 660 + - uid: 661 components: - type: Transform pos: -0.5,-3.5 parent: 1 - proto: Grille entities: - - uid: 661 + - uid: 662 components: - type: Transform rot: -1.5707963267948966 rad pos: 16.5,2.5 parent: 1 - - uid: 662 + - uid: 663 components: - type: Transform rot: -1.5707963267948966 rad pos: 15.5,2.5 parent: 1 - - uid: 663 + - uid: 664 components: - type: Transform pos: 9.5,13.5 parent: 1 - - uid: 664 + - uid: 665 components: - type: Transform pos: 1.5,27.5 parent: 1 - - uid: 665 + - uid: 666 components: - type: Transform pos: 4.5,27.5 parent: 1 - - uid: 666 + - uid: 667 components: - type: Transform pos: -1.5,27.5 parent: 1 - - uid: 667 + - uid: 668 components: - type: Transform pos: 5.5,28.5 parent: 1 - - uid: 668 + - uid: 669 components: - type: Transform pos: 9.5,14.5 parent: 1 - - uid: 669 + - uid: 670 components: - type: Transform pos: 0.5,28.5 parent: 1 - - uid: 670 + - uid: 671 components: - type: Transform pos: 3.5,6.5 parent: 1 - - uid: 671 + - uid: 672 components: - type: Transform pos: 6.5,28.5 parent: 1 - - uid: 672 + - uid: 673 components: - type: Transform pos: -0.5,28.5 parent: 1 - - uid: 673 + - uid: 674 components: - type: Transform pos: 9.5,9.5 parent: 1 - - uid: 674 + - uid: 675 components: - type: Transform pos: 7.5,28.5 parent: 1 - - uid: 675 + - uid: 676 components: - type: Transform pos: 8.5,27.5 parent: 1 - - uid: 676 + - uid: 677 components: - type: Transform pos: 11.5,27.5 parent: 1 - - uid: 677 + - uid: 678 components: - type: Transform pos: 14.5,27.5 parent: 1 - - uid: 678 + - uid: 679 components: - type: Transform rot: -1.5707963267948966 rad pos: 16.5,6.5 parent: 1 - - uid: 679 + - uid: 680 components: - type: Transform rot: -1.5707963267948966 rad pos: 15.5,6.5 parent: 1 - - uid: 680 + - uid: 681 components: - type: Transform rot: -1.5707963267948966 rad pos: -3.5,6.5 parent: 1 - - uid: 681 + - uid: 682 components: - type: Transform rot: -1.5707963267948966 rad pos: -2.5,6.5 parent: 1 - - uid: 682 + - uid: 683 components: - type: Transform rot: -1.5707963267948966 rad pos: -3.5,2.5 parent: 1 - - uid: 683 + - uid: 684 components: - type: Transform rot: -1.5707963267948966 rad pos: -2.5,2.5 parent: 1 - - uid: 684 + - uid: 685 components: - type: Transform rot: -1.5707963267948966 rad pos: 3.5,-4.5 parent: 1 - - uid: 685 + - uid: 686 components: - type: Transform rot: -1.5707963267948966 rad pos: 4.5,-4.5 parent: 1 - - uid: 686 + - uid: 687 components: - type: Transform rot: -1.5707963267948966 rad pos: 8.5,-4.5 parent: 1 - - uid: 687 + - uid: 688 components: - type: Transform rot: -1.5707963267948966 rad pos: 9.5,-4.5 parent: 1 - - uid: 688 + - uid: 689 components: - type: Transform rot: 3.141592653589793 rad pos: -2.5,18.5 parent: 1 - - uid: 689 + - uid: 690 components: - type: Transform rot: 3.141592653589793 rad pos: -2.5,14.5 parent: 1 - - uid: 690 + - uid: 691 components: - type: Transform rot: 3.141592653589793 rad pos: 15.5,14.5 parent: 1 - - uid: 691 + - uid: 692 components: - type: Transform rot: 3.141592653589793 rad pos: 15.5,18.5 parent: 1 - - uid: 692 + - uid: 693 components: - type: Transform rot: 3.141592653589793 rad pos: 12.5,21.5 parent: 1 - - uid: 693 + - uid: 694 components: - type: Transform rot: 3.141592653589793 rad @@ -4233,56 +4256,56 @@ entities: parent: 1 - proto: GrilleDiagonal entities: - - uid: 694 + - uid: 695 components: - type: Transform rot: -1.5707963267948966 rad pos: 1.5,28.5 parent: 1 - - uid: 695 + - uid: 696 components: - type: Transform pos: 4.5,28.5 parent: 1 - - uid: 696 + - uid: 697 components: - type: Transform rot: -1.5707963267948966 rad pos: 8.5,28.5 parent: 1 - - uid: 697 + - uid: 698 components: - type: Transform pos: -1.5,28.5 parent: 1 - - uid: 698 + - uid: 699 components: - type: Transform pos: 11.5,28.5 parent: 1 - - uid: 699 + - uid: 700 components: - type: Transform rot: -1.5707963267948966 rad pos: 14.5,28.5 parent: 1 - - uid: 700 + - uid: 701 components: - type: Transform pos: 2.5,-4.5 parent: 1 - - uid: 701 + - uid: 702 components: - type: Transform pos: 7.5,-4.5 parent: 1 - - uid: 702 + - uid: 703 components: - type: Transform rot: -1.5707963267948966 rad pos: 5.5,-4.5 parent: 1 - - uid: 703 + - uid: 704 components: - type: Transform rot: -1.5707963267948966 rad @@ -4318,7 +4341,7 @@ entities: showEnts: False occludes: True ent: null - - uid: 704 + - uid: 705 components: - type: Transform pos: 1.5,7.5 @@ -4329,39 +4352,39 @@ entities: showEnts: False occludes: True ents: - - 708 - - 705 + - 709 - 706 - 707 - - 711 - - 709 + - 708 - 712 - 710 + - 713 + - 711 paper_label: !type:ContainerSlot showEnts: False occludes: True ent: null - proto: Gyroscope entities: - - uid: 713 + - uid: 714 components: - type: Transform rot: -1.5707963267948966 rad pos: 11.5,-5.5 parent: 1 - - uid: 714 + - uid: 715 components: - type: Transform rot: -1.5707963267948966 rad pos: 12.5,-4.5 parent: 1 - - uid: 715 + - uid: 716 components: - type: Transform rot: -1.5707963267948966 rad pos: 13.5,-3.5 parent: 1 - - uid: 716 + - uid: 717 components: - type: Transform rot: -1.5707963267948966 rad @@ -4369,36 +4392,27 @@ entities: parent: 1 - proto: hydroponicsTray entities: - - uid: 717 + - uid: 718 components: - type: Transform pos: 11.5,11.5 parent: 1 - - uid: 718 + - uid: 719 components: - type: Transform pos: 11.5,12.5 parent: 1 - - uid: 719 + - uid: 720 components: - type: Transform pos: 11.5,13.5 parent: 1 - proto: JetpackVoidFilled entities: - - uid: 422 - components: - - type: Transform - parent: 413 - - type: Physics - angularDamping: 0 - linearDamping: 0 - canCollide: False - - type: InsideEntityStorage - uid: 423 components: - type: Transform - parent: 413 + parent: 414 - type: Physics angularDamping: 0 linearDamping: 0 @@ -4407,7 +4421,7 @@ entities: - uid: 424 components: - type: Transform - parent: 413 + parent: 414 - type: Physics angularDamping: 0 linearDamping: 0 @@ -4416,7 +4430,7 @@ entities: - uid: 425 components: - type: Transform - parent: 413 + parent: 414 - type: Physics angularDamping: 0 linearDamping: 0 @@ -4425,7 +4439,7 @@ entities: - uid: 426 components: - type: Transform - parent: 413 + parent: 414 - type: Physics angularDamping: 0 linearDamping: 0 @@ -4434,7 +4448,7 @@ entities: - uid: 427 components: - type: Transform - parent: 413 + parent: 414 - type: Physics angularDamping: 0 linearDamping: 0 @@ -4443,7 +4457,7 @@ entities: - uid: 428 components: - type: Transform - parent: 413 + parent: 414 - type: Physics angularDamping: 0 linearDamping: 0 @@ -4452,7 +4466,16 @@ entities: - uid: 429 components: - type: Transform - parent: 413 + parent: 414 + - type: Physics + angularDamping: 0 + linearDamping: 0 + canCollide: False + - type: InsideEntityStorage + - uid: 430 + components: + - type: Transform + parent: 414 - type: Physics angularDamping: 0 linearDamping: 0 @@ -4460,24 +4483,24 @@ entities: - type: InsideEntityStorage - proto: KitchenKnife entities: - - uid: 720 + - uid: 721 components: - type: Transform pos: 11.624599,8.560317 parent: 1 - proto: KitchenMicrowave entities: - - uid: 721 + - uid: 722 components: - type: Transform pos: 10.5,7.5 parent: 1 - proto: MagazineBoxCaselessRifleBig entities: - - uid: 373 + - uid: 374 components: - type: Transform - parent: 366 + parent: 367 - type: Physics angularDamping: 0 linearDamping: 0 @@ -4525,74 +4548,74 @@ entities: - type: InsideEntityStorage - proto: MagazineCaselessRifle10x24 entities: - - uid: 374 + - uid: 375 components: - type: Transform - parent: 366 + parent: 367 - type: Physics angularDamping: 0 linearDamping: 0 canCollide: False - type: InsideEntityStorage - - uid: 376 + - uid: 377 components: - type: Transform - parent: 375 + parent: 376 - type: Physics angularDamping: 0 linearDamping: 0 canCollide: False - proto: MagazineGrenadeBlast entities: - - uid: 393 + - uid: 394 components: - type: Transform - parent: 392 + parent: 393 - type: Physics angularDamping: 0 linearDamping: 0 canCollide: False - type: InsideEntityStorage - - uid: 394 + - uid: 395 components: - type: Transform - parent: 392 + parent: 393 - type: Physics angularDamping: 0 linearDamping: 0 canCollide: False - type: InsideEntityStorage - - uid: 395 + - uid: 396 components: - type: Transform - parent: 392 + parent: 393 - type: Physics angularDamping: 0 linearDamping: 0 canCollide: False - type: InsideEntityStorage - - uid: 396 + - uid: 397 components: - type: Transform - parent: 392 + parent: 393 - type: Physics angularDamping: 0 linearDamping: 0 canCollide: False - type: InsideEntityStorage - - uid: 397 + - uid: 398 components: - type: Transform - parent: 392 + parent: 393 - type: Physics angularDamping: 0 linearDamping: 0 canCollide: False - type: InsideEntityStorage - - uid: 398 + - uid: 399 components: - type: Transform - parent: 392 + parent: 393 - type: Physics angularDamping: 0 linearDamping: 0 @@ -4600,28 +4623,28 @@ entities: - type: InsideEntityStorage - proto: MagazineGrenadeEMP entities: - - uid: 399 + - uid: 400 components: - type: Transform - parent: 392 + parent: 393 - type: Physics angularDamping: 0 linearDamping: 0 canCollide: False - type: InsideEntityStorage - - uid: 400 + - uid: 401 components: - type: Transform - parent: 392 + parent: 393 - type: Physics angularDamping: 0 linearDamping: 0 canCollide: False - type: InsideEntityStorage - - uid: 401 + - uid: 402 components: - type: Transform - parent: 392 + parent: 393 - type: Physics angularDamping: 0 linearDamping: 0 @@ -4629,38 +4652,38 @@ entities: - type: InsideEntityStorage - proto: MedicalBed entities: - - uid: 722 + - uid: 723 components: - type: Transform pos: 5.5,-0.5 parent: 1 - proto: MedkitAdvancedFilled entities: - - uid: 723 + - uid: 724 components: - type: Transform pos: 3.176877,2.7621942 parent: 1 - - uid: 724 + - uid: 725 components: - type: Transform pos: 3.3258133,2.7621942 parent: 1 - - uid: 725 + - uid: 726 components: - type: Transform pos: 3.3683662,2.7621942 parent: 1 - proto: OxygenCanister entities: - - uid: 726 + - uid: 727 components: - type: Transform pos: 1.5,-2.5 parent: 1 - proto: PaperBin20 entities: - - uid: 727 + - uid: 728 components: - type: Transform rot: 3.141592653589793 rad @@ -4668,19 +4691,19 @@ entities: parent: 1 - proto: PowerCageHigh entities: - - uid: 728 + - uid: 729 components: - type: Transform rot: -1.5707963267948966 rad pos: -0.71673393,26.761541 parent: 1 - - uid: 729 + - uid: 730 components: - type: Transform rot: -1.5707963267948966 rad pos: -0.7535,26.688011 parent: 1 - - uid: 730 + - uid: 731 components: - type: Transform rot: -1.5707963267948966 rad @@ -4688,7 +4711,7 @@ entities: parent: 1 - proto: PowerCageRecharger entities: - - uid: 731 + - uid: 732 components: - type: Transform rot: -1.5707963267948966 rad @@ -4698,10 +4721,10 @@ entities: enabled: False - proto: PowerCellMicroreactor entities: - - uid: 377 + - uid: 378 components: - type: Transform - parent: 366 + parent: 367 - type: Physics angularDamping: 0 linearDamping: 0 @@ -4709,226 +4732,226 @@ entities: - type: InsideEntityStorage - proto: Poweredlight entities: - - uid: 732 + - uid: 733 components: - type: Transform pos: -1.5,17.5 parent: 1 - - uid: 733 + - uid: 734 components: - type: Transform rot: 3.141592653589793 rad pos: 9.5,-6.5 parent: 1 - - uid: 734 + - uid: 735 components: - type: Transform rot: 3.141592653589793 rad pos: 3.5,-6.5 parent: 1 - - uid: 735 + - uid: 736 components: - type: Transform rot: 3.141592653589793 rad pos: 1.5,-5.5 parent: 1 - - uid: 736 + - uid: 737 components: - type: Transform rot: 3.141592653589793 rad pos: 6.5,-5.5 parent: 1 - - uid: 737 + - uid: 738 components: - type: Transform rot: 3.141592653589793 rad pos: 11.5,-5.5 parent: 1 - - uid: 738 + - uid: 739 components: - type: Transform pos: 0.5,-2.5 parent: 1 - - uid: 739 + - uid: 740 components: - type: Transform pos: 11.5,-2.5 parent: 1 - - uid: 740 + - uid: 741 components: - type: Transform pos: 6.5,-2.5 parent: 1 - - uid: 741 + - uid: 742 components: - type: Transform rot: -1.5707963267948966 rad pos: 11.5,0.5 parent: 1 - - uid: 742 + - uid: 743 components: - type: Transform rot: 1.5707963267948966 rad pos: 7.5,1.5 parent: 1 - - uid: 743 + - uid: 744 components: - type: Transform rot: 1.5707963267948966 rad pos: 1.5,0.5 parent: 1 - - uid: 744 + - uid: 745 components: - type: Transform rot: -1.5707963267948966 rad pos: 5.5,1.5 parent: 1 - - uid: 745 + - uid: 746 components: - type: Transform pos: 1.5,5.5 parent: 1 - - uid: 746 + - uid: 747 components: - type: Transform rot: 3.141592653589793 rad pos: -1.5,3.5 parent: 1 - - uid: 747 + - uid: 748 components: - type: Transform pos: -1.5,5.5 parent: 1 - - uid: 748 + - uid: 749 components: - type: Transform pos: 4.5,5.5 parent: 1 - - uid: 749 + - uid: 750 components: - type: Transform pos: 3.5,8.5 parent: 1 - - uid: 750 + - uid: 751 components: - type: Transform rot: -1.5707963267948966 rad pos: 11.5,10.5 parent: 1 - - uid: 751 + - uid: 752 components: - type: Transform rot: -1.5707963267948966 rad pos: 11.5,13.5 parent: 1 - - uid: 752 + - uid: 753 components: - type: Transform pos: 14.5,5.5 parent: 1 - - uid: 753 + - uid: 754 components: - type: Transform rot: 3.141592653589793 rad pos: 14.5,3.5 parent: 1 - - uid: 754 + - uid: 755 components: - type: Transform pos: 11.5,5.5 parent: 1 - - uid: 755 + - uid: 756 components: - type: Transform rot: -1.5707963267948966 rad pos: 8.5,6.5 parent: 1 - - uid: 756 + - uid: 757 components: - type: Transform rot: 1.5707963267948966 rad pos: 7.5,6.5 parent: 1 - - uid: 757 + - uid: 758 components: - type: Transform rot: 1.5707963267948966 rad pos: 7.5,12.5 parent: 1 - - uid: 758 + - uid: 759 components: - type: Transform rot: -1.5707963267948966 rad pos: 8.5,12.5 parent: 1 - - uid: 759 + - uid: 760 components: - type: Transform rot: 1.5707963267948966 rad pos: 7.5,21.5 parent: 1 - - uid: 760 + - uid: 761 components: - type: Transform rot: -1.5707963267948966 rad pos: 8.5,21.5 parent: 1 - - uid: 761 + - uid: 762 components: - type: Transform pos: 4.5,24.5 parent: 1 - - uid: 762 + - uid: 763 components: - type: Transform pos: 9.5,24.5 parent: 1 - - uid: 763 + - uid: 764 components: - type: Transform rot: 1.5707963267948966 rad pos: -0.5,25.5 parent: 1 - - uid: 764 + - uid: 765 components: - type: Transform rot: -1.5707963267948966 rad pos: 13.5,25.5 parent: 1 - - uid: 765 + - uid: 766 components: - type: Transform rot: 3.141592653589793 rad pos: 5.5,26.5 parent: 1 - - uid: 766 + - uid: 767 components: - type: Transform pos: 1.5,17.5 parent: 1 - - uid: 767 + - uid: 768 components: - type: Transform rot: 3.141592653589793 rad pos: -1.5,15.5 parent: 1 - - uid: 768 + - uid: 769 components: - type: Transform pos: 11.5,17.5 parent: 1 - - uid: 769 + - uid: 770 components: - type: Transform rot: 3.141592653589793 rad pos: 14.5,15.5 parent: 1 - - uid: 770 + - uid: 771 components: - type: Transform pos: 14.5,17.5 parent: 1 - - uid: 771 + - uid: 772 components: - type: Transform rot: 1.5707963267948966 rad @@ -4936,42 +4959,42 @@ entities: parent: 1 - proto: PoweredSmallLight entities: - - uid: 772 + - uid: 773 components: - type: Transform rot: 3.141592653589793 rad pos: 5.5,10.5 parent: 1 - - uid: 773 + - uid: 774 components: - type: Transform rot: 3.141592653589793 rad pos: 1.5,10.5 parent: 1 - - uid: 774 + - uid: 775 components: - type: Transform pos: 1.5,12.5 parent: 1 - - uid: 775 + - uid: 776 components: - type: Transform rot: 1.5707963267948966 rad pos: 1.5,20.5 parent: 1 - - uid: 776 + - uid: 777 components: - type: Transform rot: -1.5707963267948966 rad pos: 5.5,20.5 parent: 1 - - uid: 777 + - uid: 778 components: - type: Transform rot: -1.5707963267948966 rad pos: 11.5,20.5 parent: 1 - - uid: 778 + - uid: 779 components: - type: Transform rot: 1.5707963267948966 rad @@ -4979,18 +5002,18 @@ entities: parent: 1 - proto: Rack entities: - - uid: 779 + - uid: 780 components: - type: Transform rot: -1.5707963267948966 rad pos: -0.5,26.5 parent: 1 - - uid: 780 + - uid: 781 components: - type: Transform pos: 3.5,2.5 parent: 1 - - uid: 781 + - uid: 782 components: - type: Transform rot: 3.141592653589793 rad @@ -4998,7 +5021,7 @@ entities: parent: 1 - proto: ReinforcedUraniumWindow entities: - - uid: 782 + - uid: 783 components: - type: Transform rot: 3.141592653589793 rad @@ -5006,17 +5029,17 @@ entities: parent: 1 - proto: RollingPin entities: - - uid: 783 + - uid: 784 components: - type: Transform pos: 11.477535,8.63385 parent: 1 - proto: Screwdriver entities: - - uid: 378 + - uid: 379 components: - type: Transform - parent: 366 + parent: 367 - type: Physics angularDamping: 0 linearDamping: 0 @@ -5024,14 +5047,14 @@ entities: - type: InsideEntityStorage - proto: SeedExtractor entities: - - uid: 784 + - uid: 785 components: - type: Transform pos: 11.5,10.5 parent: 1 - proto: Shower entities: - - uid: 785 + - uid: 786 components: - type: Transform rot: -1.5707963267948966 rad @@ -5039,7 +5062,7 @@ entities: parent: 1 - type: Fixtures fixtures: {} - - uid: 786 + - uid: 787 components: - type: Transform rot: -1.5707963267948966 rad @@ -5049,33 +5072,33 @@ entities: fixtures: {} - proto: ShuttersNormal entities: - - uid: 787 + - uid: 788 components: - type: Transform pos: 2.5,6.5 parent: 1 - type: DeviceLinkSink links: - - 841 - - uid: 788 + - 842 + - uid: 789 components: - type: Transform pos: 3.5,6.5 parent: 1 - type: DeviceLinkSink links: - - 841 - - uid: 789 + - 842 + - uid: 790 components: - type: Transform pos: 5.5,6.5 parent: 1 - type: DeviceLinkSink links: - - 841 + - 842 - proto: ShuttleGunDuster entities: - - uid: 790 + - uid: 791 components: - type: Transform rot: 3.141592653589793 rad @@ -5083,8 +5106,8 @@ entities: parent: 1 - type: DeviceLinkSink links: - - 837 - - uid: 791 + - 838 + - uid: 792 components: - type: Transform rot: 3.141592653589793 rad @@ -5092,10 +5115,10 @@ entities: parent: 1 - type: DeviceLinkSink links: - - 837 + - 838 - proto: ShuttleGunPerforator entities: - - uid: 792 + - uid: 793 components: - type: Transform rot: 3.141592653589793 rad @@ -5103,8 +5126,8 @@ entities: parent: 1 - type: DeviceLinkSink links: - - 836 - - uid: 793 + - 837 + - uid: 794 components: - type: Transform rot: 3.141592653589793 rad @@ -5112,189 +5135,189 @@ entities: parent: 1 - type: DeviceLinkSink links: - - 836 + - 837 - proto: ShuttleWindow entities: - - uid: 794 + - uid: 795 components: - type: Transform rot: 1.5707963267948966 rad pos: 12.5,21.5 parent: 1 - - uid: 795 + - uid: 796 components: - type: Transform rot: 1.5707963267948966 rad pos: 12.5,22.5 parent: 1 - - uid: 796 + - uid: 797 components: - type: Transform rot: 1.5707963267948966 rad pos: 4.5,27.5 parent: 1 - - uid: 797 + - uid: 798 components: - type: Transform rot: 1.5707963267948966 rad pos: 5.5,28.5 parent: 1 - - uid: 798 + - uid: 799 components: - type: Transform rot: 1.5707963267948966 rad pos: 6.5,28.5 parent: 1 - - uid: 799 + - uid: 800 components: - type: Transform rot: 1.5707963267948966 rad pos: 7.5,28.5 parent: 1 - - uid: 800 + - uid: 801 components: - type: Transform rot: 1.5707963267948966 rad pos: 8.5,27.5 parent: 1 - - uid: 801 + - uid: 802 components: - type: Transform rot: 1.5707963267948966 rad pos: 0.5,28.5 parent: 1 - - uid: 802 + - uid: 803 components: - type: Transform rot: 1.5707963267948966 rad pos: -0.5,28.5 parent: 1 - - uid: 803 + - uid: 804 components: - type: Transform rot: 1.5707963267948966 rad pos: -2.5,6.5 parent: 1 - - uid: 804 + - uid: 805 components: - type: Transform rot: 1.5707963267948966 rad pos: -2.5,18.5 parent: 1 - - uid: 805 + - uid: 806 components: - type: Transform rot: 1.5707963267948966 rad pos: -3.5,6.5 parent: 1 - - uid: 806 + - uid: 807 components: - type: Transform rot: 1.5707963267948966 rad pos: -3.5,2.5 parent: 1 - - uid: 807 + - uid: 808 components: - type: Transform rot: 1.5707963267948966 rad pos: -2.5,2.5 parent: 1 - - uid: 808 + - uid: 809 components: - type: Transform rot: 1.5707963267948966 rad pos: 15.5,2.5 parent: 1 - - uid: 809 + - uid: 810 components: - type: Transform rot: 1.5707963267948966 rad pos: 16.5,2.5 parent: 1 - - uid: 810 + - uid: 811 components: - type: Transform rot: 1.5707963267948966 rad pos: 15.5,6.5 parent: 1 - - uid: 811 + - uid: 812 components: - type: Transform rot: 1.5707963267948966 rad pos: 16.5,6.5 parent: 1 - - uid: 812 + - uid: 813 components: - type: Transform rot: 1.5707963267948966 rad pos: 15.5,14.5 parent: 1 - - uid: 813 + - uid: 814 components: - type: Transform rot: 1.5707963267948966 rad pos: 15.5,18.5 parent: 1 - - uid: 814 + - uid: 815 components: - type: Transform rot: 1.5707963267948966 rad pos: -2.5,14.5 parent: 1 - - uid: 815 + - uid: 816 components: - type: Transform pos: -1.5,27.5 parent: 1 - - uid: 816 + - uid: 817 components: - type: Transform pos: 1.5,27.5 parent: 1 - - uid: 817 + - uid: 818 components: - type: Transform pos: 11.5,27.5 parent: 1 - - uid: 818 + - uid: 819 components: - type: Transform pos: 14.5,27.5 parent: 1 - - uid: 819 + - uid: 820 components: - type: Transform pos: 9.5,14.5 parent: 1 - - uid: 820 + - uid: 821 components: - type: Transform pos: 9.5,13.5 parent: 1 - - uid: 821 + - uid: 822 components: - type: Transform pos: 9.5,9.5 parent: 1 - - uid: 822 + - uid: 823 components: - type: Transform rot: -1.5707963267948966 rad pos: 3.5,-4.5 parent: 1 - - uid: 823 + - uid: 824 components: - type: Transform rot: -1.5707963267948966 rad pos: 4.5,-4.5 parent: 1 - - uid: 824 + - uid: 825 components: - type: Transform rot: -1.5707963267948966 rad pos: 8.5,-4.5 parent: 1 - - uid: 825 + - uid: 826 components: - type: Transform rot: -1.5707963267948966 rad @@ -5302,56 +5325,56 @@ entities: parent: 1 - proto: ShuttleWindowDiagonal entities: - - uid: 826 + - uid: 827 components: - type: Transform rot: -1.5707963267948966 rad pos: 1.5,28.5 parent: 1 - - uid: 827 + - uid: 828 components: - type: Transform pos: -1.5,28.5 parent: 1 - - uid: 828 + - uid: 829 components: - type: Transform pos: 11.5,28.5 parent: 1 - - uid: 829 + - uid: 830 components: - type: Transform rot: -1.5707963267948966 rad pos: 14.5,28.5 parent: 1 - - uid: 830 + - uid: 831 components: - type: Transform rot: -1.5707963267948966 rad pos: 8.5,28.5 parent: 1 - - uid: 831 + - uid: 832 components: - type: Transform pos: 4.5,28.5 parent: 1 - - uid: 832 + - uid: 833 components: - type: Transform pos: 2.5,-4.5 parent: 1 - - uid: 833 + - uid: 834 components: - type: Transform pos: 7.5,-4.5 parent: 1 - - uid: 834 + - uid: 835 components: - type: Transform rot: -1.5707963267948966 rad pos: 5.5,-4.5 parent: 1 - - uid: 835 + - uid: 836 components: - type: Transform rot: -1.5707963267948966 rad @@ -5359,33 +5382,33 @@ entities: parent: 1 - proto: SignalButtonDirectional entities: - - uid: 836 + - uid: 837 components: - type: Transform pos: 6.5,27.5 parent: 1 - type: DeviceLinkSource linkedPorts: - 792: - - Pressed: Toggle 793: - Pressed: Toggle - - uid: 837 + 794: + - Pressed: Toggle + - uid: 838 components: - type: Transform pos: 7.5,27.5 parent: 1 - type: DeviceLinkSource linkedPorts: - 790: - - Pressed: Trigger 791: - Pressed: Trigger - - uid: 838 + 792: + - Pressed: Trigger + - uid: 839 components: - type: Transform rot: -1.5707963267948966 rad - pos: 8.5,26.5 + pos: 7.569807,26.49084 parent: 1 - type: DeviceLinkSource linkedPorts: @@ -5399,7 +5422,7 @@ entities: - Pressed: Toggle 66: - Pressed: Toggle - - uid: 839 + - uid: 840 components: - type: Transform rot: 1.5707963267948966 rad @@ -5415,7 +5438,7 @@ entities: - Pressed: Toggle 74: - Pressed: Toggle - - uid: 840 + - uid: 841 components: - type: Transform rot: -1.5707963267948966 rad @@ -5431,7 +5454,7 @@ entities: - Pressed: Toggle 78: - Pressed: Toggle - - uid: 841 + - uid: 842 components: - type: Transform rot: 1.5707963267948966 rad @@ -5439,13 +5462,13 @@ entities: parent: 1 - type: DeviceLinkSource linkedPorts: + 790: + - Pressed: Toggle 789: - Pressed: Toggle 788: - Pressed: Toggle - 787: - - Pressed: Toggle - - uid: 842 + - uid: 843 components: - type: Transform rot: -1.5707963267948966 rad @@ -5459,19 +5482,19 @@ entities: - Pressed: Toggle - proto: Sink entities: - - uid: 843 + - uid: 844 components: - type: Transform pos: 3.5,14.5 parent: 1 - - uid: 844 + - uid: 845 components: - type: Transform pos: 4.5,14.5 parent: 1 - proto: SinkStemlessWater entities: - - uid: 845 + - uid: 846 components: - type: Transform rot: 3.141592653589793 rad @@ -5479,21 +5502,21 @@ entities: parent: 1 - proto: StasisBed entities: - - uid: 846 + - uid: 847 components: - type: Transform pos: 5.5,0.5 parent: 1 - proto: SubstationBasic entities: - - uid: 847 + - uid: 848 components: - type: Transform pos: 9.5,2.5 parent: 1 - proto: SuitStorageBase entities: - - uid: 366 + - uid: 367 components: - type: Transform pos: 10.5,19.5 @@ -5504,19 +5527,19 @@ entities: showEnts: False occludes: True ents: - - 378 - - 368 - - 374 - - 375 - 379 - - 377 - - 373 - - 371 - 369 + - 375 + - 376 + - 380 + - 378 + - 374 - 372 - - 367 - 370 - - uid: 380 + - 373 + - 368 + - 371 + - uid: 381 components: - type: Transform pos: 5.5,8.5 @@ -5527,12 +5550,12 @@ entities: showEnts: False occludes: True ents: - - 384 - 385 - - 381 + - 386 - 382 - 383 - - uid: 413 + - 384 + - uid: 414 components: - type: Transform pos: 4.5,8.5 @@ -5543,47 +5566,47 @@ entities: showEnts: False occludes: True ents: - - 422 - 423 - - 414 - 424 - 415 - 425 - 416 - 426 + - 417 - 427 - 428 - 429 - - 417 + - 430 - 418 - 419 - 420 - 421 + - 422 - proto: Table entities: - - uid: 848 + - uid: 849 components: - type: Transform pos: 11.5,8.5 parent: 1 - - uid: 849 + - uid: 850 components: - type: Transform pos: 11.5,7.5 parent: 1 - - uid: 850 + - uid: 851 components: - type: Transform pos: 10.5,7.5 parent: 1 - proto: TableCounterMetal entities: - - uid: 851 + - uid: 852 components: - type: Transform pos: 9.5,8.5 parent: 1 - - uid: 852 + - uid: 853 components: - type: Transform rot: 3.141592653589793 rad @@ -5591,24 +5614,24 @@ entities: parent: 1 - proto: TableFancyGreen entities: - - uid: 853 + - uid: 854 components: - type: Transform pos: 10.5,22.5 parent: 1 - - uid: 854 + - uid: 855 components: - type: Transform pos: 11.5,22.5 parent: 1 - proto: TableGlass entities: - - uid: 855 + - uid: 856 components: - type: Transform pos: 3.5,-0.5 parent: 1 - - uid: 856 + - uid: 857 components: - type: Transform rot: 3.141592653589793 rad @@ -5616,295 +5639,295 @@ entities: parent: 1 - proto: Thruster entities: - - uid: 857 + - uid: 858 components: - type: Transform rot: 3.141592653589793 rad pos: -1.5,0.5 parent: 1 - - uid: 858 + - uid: 859 components: - type: Transform rot: 3.141592653589793 rad pos: -0.5,0.5 parent: 1 - - uid: 859 + - uid: 860 components: - type: Transform rot: 1.5707963267948966 rad pos: -0.5,8.5 parent: 1 - - uid: 860 + - uid: 861 components: - type: Transform rot: 3.141592653589793 rad pos: -2.5,1.5 parent: 1 - - uid: 861 + - uid: 862 components: - type: Transform rot: 3.141592653589793 rad pos: -3.5,1.5 parent: 1 - - uid: 862 + - uid: 863 components: - type: Transform rot: 3.141592653589793 rad pos: -1.5,-5.5 parent: 1 - - uid: 863 + - uid: 864 components: - type: Transform rot: 3.141592653589793 rad pos: -0.5,-6.5 parent: 1 - - uid: 864 + - uid: 865 components: - type: Transform rot: 3.141592653589793 rad pos: 0.5,-7.5 parent: 1 - - uid: 865 + - uid: 866 components: - type: Transform rot: 3.141592653589793 rad pos: 1.5,-7.5 parent: 1 - - uid: 866 + - uid: 867 components: - type: Transform rot: 1.5707963267948966 rad pos: 2.5,-8.5 parent: 1 - - uid: 867 + - uid: 868 components: - type: Transform rot: 3.141592653589793 rad pos: 3.5,-9.5 parent: 1 - - uid: 868 + - uid: 869 components: - type: Transform rot: 3.141592653589793 rad pos: 4.5,-9.5 parent: 1 - - uid: 869 + - uid: 870 components: - type: Transform rot: -1.5707963267948966 rad pos: 5.5,-8.5 parent: 1 - - uid: 870 + - uid: 871 components: - type: Transform rot: 1.5707963267948966 rad pos: 7.5,-8.5 parent: 1 - - uid: 871 + - uid: 872 components: - type: Transform rot: 3.141592653589793 rad pos: 6.5,-7.5 parent: 1 - - uid: 872 + - uid: 873 components: - type: Transform rot: 3.141592653589793 rad pos: 8.5,-9.5 parent: 1 - - uid: 873 + - uid: 874 components: - type: Transform rot: 3.141592653589793 rad pos: 9.5,-9.5 parent: 1 - - uid: 874 + - uid: 875 components: - type: Transform rot: -1.5707963267948966 rad pos: 10.5,-8.5 parent: 1 - - uid: 875 + - uid: 876 components: - type: Transform rot: 3.141592653589793 rad pos: 11.5,-7.5 parent: 1 - - uid: 876 + - uid: 877 components: - type: Transform rot: 3.141592653589793 rad pos: 12.5,-7.5 parent: 1 - - uid: 877 + - uid: 878 components: - type: Transform rot: 3.141592653589793 rad pos: 13.5,-6.5 parent: 1 - - uid: 878 + - uid: 879 components: - type: Transform rot: 3.141592653589793 rad pos: 14.5,-5.5 parent: 1 - - uid: 879 + - uid: 880 components: - type: Transform rot: 3.141592653589793 rad pos: 13.5,0.5 parent: 1 - - uid: 880 + - uid: 881 components: - type: Transform rot: 3.141592653589793 rad pos: 14.5,0.5 parent: 1 - - uid: 881 + - uid: 882 components: - type: Transform rot: 3.141592653589793 rad pos: 15.5,1.5 parent: 1 - - uid: 882 + - uid: 883 components: - type: Transform rot: 3.141592653589793 rad pos: 16.5,1.5 parent: 1 - - uid: 883 + - uid: 884 components: - type: Transform rot: -1.5707963267948966 rad pos: 13.5,8.5 parent: 1 - - uid: 884 + - uid: 885 components: - type: Transform rot: -1.5707963267948966 rad pos: 13.5,9.5 parent: 1 - - uid: 885 + - uid: 886 components: - type: Transform rot: -1.5707963267948966 rad pos: 13.5,10.5 parent: 1 - - uid: 886 + - uid: 887 components: - type: Transform rot: -1.5707963267948966 rad pos: 13.5,11.5 parent: 1 - - uid: 887 + - uid: 888 components: - type: Transform rot: -1.5707963267948966 rad pos: 13.5,12.5 parent: 1 - - uid: 888 + - uid: 889 components: - type: Transform rot: 1.5707963267948966 rad pos: -0.5,9.5 parent: 1 - - uid: 889 + - uid: 890 components: - type: Transform rot: 1.5707963267948966 rad pos: -0.5,10.5 parent: 1 - - uid: 890 + - uid: 891 components: - type: Transform rot: 1.5707963267948966 rad pos: -0.5,11.5 parent: 1 - - uid: 891 + - uid: 892 components: - type: Transform rot: 1.5707963267948966 rad pos: -0.5,12.5 parent: 1 - - uid: 892 + - uid: 893 components: - type: Transform pos: -2.5,19.5 parent: 1 - - uid: 893 + - uid: 894 components: - type: Transform pos: -1.5,20.5 parent: 1 - - uid: 894 + - uid: 895 components: - type: Transform pos: -0.5,20.5 parent: 1 - - uid: 895 + - uid: 896 components: - type: Transform pos: 2.5,26.5 parent: 1 - - uid: 896 + - uid: 897 components: - type: Transform pos: 10.5,26.5 parent: 1 - - uid: 897 + - uid: 898 components: - type: Transform pos: 13.5,20.5 parent: 1 - - uid: 898 + - uid: 899 components: - type: Transform pos: 14.5,20.5 parent: 1 - - uid: 899 + - uid: 900 components: - type: Transform pos: 15.5,19.5 parent: 1 - - uid: 900 + - uid: 901 components: - type: Transform pos: 14.5,-1.5 parent: 1 - - uid: 901 + - uid: 902 components: - type: Transform pos: 15.5,7.5 parent: 1 - - uid: 902 + - uid: 903 components: - type: Transform pos: 16.5,7.5 parent: 1 - - uid: 903 + - uid: 904 components: - type: Transform pos: -2.5,7.5 parent: 1 - - uid: 904 + - uid: 905 components: - type: Transform pos: -3.5,7.5 parent: 1 - - uid: 905 + - uid: 906 components: - type: Transform pos: -1.5,-1.5 parent: 1 - proto: ToiletEmpty entities: - - uid: 906 + - uid: 907 components: - type: Transform rot: 1.5707963267948966 rad pos: 1.5,10.5 parent: 1 - - uid: 907 + - uid: 908 components: - type: Transform rot: 1.5707963267948966 rad @@ -5912,14 +5935,14 @@ entities: parent: 1 - proto: TurboItemRecharger entities: - - uid: 1160 + - uid: 909 components: - type: Transform pos: 2.5,6.5 parent: 1 - proto: UraniumWindoorSecureCentralCommandLocked entities: - - uid: 908 + - uid: 910 components: - type: Transform rot: 3.141592653589793 rad @@ -5927,14 +5950,14 @@ entities: parent: 1 - proto: VendingMachineChefvend entities: - - uid: 909 + - uid: 911 components: - type: Transform pos: 11.5,9.5 parent: 1 - proto: VendingMachineCoffee entities: - - uid: 910 + - uid: 912 components: - type: Transform rot: 3.141592653589793 rad @@ -5942,14 +5965,14 @@ entities: parent: 1 - proto: VendingMachineDrGibb entities: - - uid: 911 + - uid: 913 components: - type: Transform pos: 3.5,23.5 parent: 1 - proto: VendingMachineEngivend entities: - - uid: 912 + - uid: 914 components: - type: Transform rot: 3.141592653589793 rad @@ -5957,35 +5980,35 @@ entities: parent: 1 - proto: VendingMachineMedical entities: - - uid: 913 + - uid: 915 components: - type: Transform pos: 5.5,2.5 parent: 1 - proto: VendingMachineNutri entities: - - uid: 915 + - uid: 916 components: - type: Transform pos: 10.5,14.5 parent: 1 - proto: VendingMachineSec entities: - - uid: 914 + - uid: 917 components: - type: Transform pos: 1.5,8.5 parent: 1 - proto: VendingMachineSeedsUnlocked entities: - - uid: 916 + - uid: 918 components: - type: Transform pos: 11.5,14.5 parent: 1 - proto: VendingMachineSnackOrange entities: - - uid: 917 + - uid: 919 components: - type: Transform rot: 3.141592653589793 rad @@ -5993,7 +6016,7 @@ entities: parent: 1 - proto: VendingMachineYouTool entities: - - uid: 918 + - uid: 920 components: - type: Transform rot: 3.141592653589793 rad @@ -6001,1323 +6024,1323 @@ entities: parent: 1 - proto: WallShuttle entities: - - uid: 919 + - uid: 921 components: - type: Transform pos: -3.5,16.5 parent: 1 - - uid: 920 + - uid: 922 components: - type: Transform pos: -3.5,18.5 parent: 1 - - uid: 921 + - uid: 923 components: - type: Transform pos: -3.5,14.5 parent: 1 - - uid: 922 + - uid: 924 components: - type: Transform pos: -4.5,6.5 parent: 1 - - uid: 923 + - uid: 925 components: - type: Transform pos: -4.5,4.5 parent: 1 - - uid: 924 + - uid: 926 components: - type: Transform pos: -4.5,2.5 parent: 1 - - uid: 925 + - uid: 927 components: - type: Transform pos: 17.5,6.5 parent: 1 - - uid: 926 + - uid: 928 components: - type: Transform pos: 17.5,4.5 parent: 1 - - uid: 927 + - uid: 929 components: - type: Transform pos: 17.5,2.5 parent: 1 - - uid: 928 + - uid: 930 components: - type: Transform pos: 16.5,16.5 parent: 1 - - uid: 929 + - uid: 931 components: - type: Transform pos: 16.5,14.5 parent: 1 - - uid: 930 + - uid: 932 components: - type: Transform pos: 16.5,18.5 parent: 1 - - uid: 931 + - uid: 933 components: - type: Transform pos: 5.5,25.5 parent: 1 - - uid: 932 + - uid: 934 components: - type: Transform pos: 8.5,25.5 parent: 1 - - uid: 933 + - uid: 935 components: - type: Transform pos: 9.5,25.5 parent: 1 - - uid: 934 + - uid: 936 components: - type: Transform pos: 9.5,26.5 parent: 1 - - uid: 935 + - uid: 937 components: - type: Transform pos: 3.5,26.5 parent: 1 - - uid: 936 + - uid: 938 components: - type: Transform pos: 3.5,25.5 parent: 1 - - uid: 937 + - uid: 939 components: - type: Transform pos: 2.5,25.5 parent: 1 - - uid: 938 + - uid: 940 components: - type: Transform pos: 1.5,25.5 parent: 1 - - uid: 939 + - uid: 941 components: - type: Transform pos: 1.5,26.5 parent: 1 - - uid: 940 + - uid: 942 components: - type: Transform pos: -1.5,26.5 parent: 1 - - uid: 941 + - uid: 943 components: - type: Transform pos: -1.5,25.5 parent: 1 - - uid: 942 + - uid: 944 components: - type: Transform pos: -1.5,24.5 parent: 1 - - uid: 943 + - uid: 945 components: - type: Transform pos: -0.5,23.5 parent: 1 - - uid: 944 + - uid: 946 components: - type: Transform pos: 0.5,22.5 parent: 1 - - uid: 945 + - uid: 947 components: - type: Transform pos: 0.5,21.5 parent: 1 - - uid: 946 + - uid: 948 components: - type: Transform pos: 0.5,20.5 parent: 1 - - uid: 947 + - uid: 949 components: - type: Transform pos: 0.5,19.5 parent: 1 - - uid: 948 + - uid: 950 components: - type: Transform pos: 13.5,23.5 parent: 1 - - uid: 949 + - uid: 951 components: - type: Transform pos: 12.5,20.5 parent: 1 - - uid: 950 + - uid: 952 components: - type: Transform pos: 12.5,19.5 parent: 1 - - uid: 951 + - uid: 953 components: - type: Transform pos: 13.5,19.5 parent: 1 - - uid: 952 + - uid: 954 components: - type: Transform pos: -0.5,13.5 parent: 1 - - uid: 953 + - uid: 955 components: - type: Transform pos: 14.5,24.5 parent: 1 - - uid: 954 + - uid: 956 components: - type: Transform pos: 14.5,25.5 parent: 1 - - uid: 955 + - uid: 957 components: - type: Transform pos: 14.5,26.5 parent: 1 - - uid: 956 + - uid: 958 components: - type: Transform pos: 0.5,23.5 parent: 1 - - uid: 957 + - uid: 959 components: - type: Transform pos: 12.5,23.5 parent: 1 - - uid: 958 + - uid: 960 components: - type: Transform pos: 10.5,25.5 parent: 1 - - uid: 959 + - uid: 961 components: - type: Transform pos: 11.5,25.5 parent: 1 - - uid: 960 + - uid: 962 components: - type: Transform pos: 11.5,26.5 parent: 1 - - uid: 961 + - uid: 963 components: - type: Transform pos: 11.5,23.5 parent: 1 - - uid: 962 + - uid: 964 components: - type: Transform pos: 1.5,23.5 parent: 1 - - uid: 963 + - uid: 965 components: - type: Transform pos: -0.5,19.5 parent: 1 - - uid: 964 + - uid: 966 components: - type: Transform pos: 0.5,13.5 parent: 1 - - uid: 965 + - uid: 967 components: - type: Transform pos: 0.5,12.5 parent: 1 - - uid: 966 + - uid: 968 components: - type: Transform pos: 0.5,11.5 parent: 1 - - uid: 967 + - uid: 969 components: - type: Transform pos: 0.5,10.5 parent: 1 - - uid: 968 + - uid: 970 components: - type: Transform pos: 0.5,9.5 parent: 1 - - uid: 969 + - uid: 971 components: - type: Transform pos: 0.5,8.5 parent: 1 - - uid: 970 + - uid: 972 components: - type: Transform pos: 0.5,7.5 parent: 1 - - uid: 971 + - uid: 973 components: - type: Transform pos: -0.5,7.5 parent: 1 - - uid: 972 + - uid: 974 components: - type: Transform pos: 13.5,13.5 parent: 1 - - uid: 973 + - uid: 975 components: - type: Transform pos: 12.5,13.5 parent: 1 - - uid: 974 + - uid: 976 components: - type: Transform pos: 12.5,12.5 parent: 1 - - uid: 975 + - uid: 977 components: - type: Transform pos: 12.5,11.5 parent: 1 - - uid: 976 + - uid: 978 components: - type: Transform pos: 12.5,10.5 parent: 1 - - uid: 977 + - uid: 979 components: - type: Transform pos: 12.5,9.5 parent: 1 - - uid: 978 + - uid: 980 components: - type: Transform pos: 12.5,8.5 parent: 1 - - uid: 979 + - uid: 981 components: - type: Transform pos: 12.5,7.5 parent: 1 - - uid: 980 + - uid: 982 components: - type: Transform pos: 13.5,7.5 parent: 1 - - uid: 981 + - uid: 983 components: - type: Transform pos: -0.5,1.5 parent: 1 - - uid: 982 + - uid: 984 components: - type: Transform pos: 0.5,1.5 parent: 1 - - uid: 983 + - uid: 985 components: - type: Transform pos: 0.5,0.5 parent: 1 - - uid: 984 + - uid: 986 components: - type: Transform pos: 0.5,-0.5 parent: 1 - - uid: 985 + - uid: 987 components: - type: Transform pos: 0.5,-1.5 parent: 1 - - uid: 986 + - uid: 988 components: - type: Transform pos: -0.5,-1.5 parent: 1 - - uid: 987 + - uid: 989 components: - type: Transform pos: -1.5,-2.5 parent: 1 - - uid: 988 + - uid: 990 components: - type: Transform pos: -1.5,-3.5 parent: 1 - - uid: 989 + - uid: 991 components: - type: Transform pos: -1.5,-4.5 parent: 1 - - uid: 990 + - uid: 992 components: - type: Transform rot: 3.141592653589793 rad pos: -0.5,-5.5 parent: 1 - - uid: 991 + - uid: 993 components: - type: Transform rot: 3.141592653589793 rad pos: 0.5,-5.5 parent: 1 - - uid: 992 + - uid: 994 components: - type: Transform rot: 3.141592653589793 rad pos: 0.5,-6.5 parent: 1 - - uid: 993 + - uid: 995 components: - type: Transform rot: 3.141592653589793 rad pos: 1.5,-6.5 parent: 1 - - uid: 994 + - uid: 996 components: - type: Transform rot: 3.141592653589793 rad pos: 2.5,-6.5 parent: 1 - - uid: 995 + - uid: 997 components: - type: Transform rot: 3.141592653589793 rad pos: 2.5,-7.5 parent: 1 - - uid: 996 + - uid: 998 components: - type: Transform rot: 3.141592653589793 rad pos: 3.5,-8.5 parent: 1 - - uid: 997 + - uid: 999 components: - type: Transform rot: 3.141592653589793 rad pos: 4.5,-8.5 parent: 1 - - uid: 998 + - uid: 1000 components: - type: Transform rot: 3.141592653589793 rad pos: 4.5,-7.5 parent: 1 - - uid: 999 + - uid: 1001 components: - type: Transform rot: 3.141592653589793 rad pos: 3.5,-7.5 parent: 1 - - uid: 1000 + - uid: 1002 components: - type: Transform rot: 3.141592653589793 rad pos: 5.5,-7.5 parent: 1 - - uid: 1001 + - uid: 1003 components: - type: Transform rot: 3.141592653589793 rad pos: 5.5,-6.5 parent: 1 - - uid: 1002 + - uid: 1004 components: - type: Transform rot: 3.141592653589793 rad pos: 6.5,-6.5 parent: 1 - - uid: 1003 + - uid: 1005 components: - type: Transform rot: 3.141592653589793 rad pos: 7.5,-6.5 parent: 1 - - uid: 1004 + - uid: 1006 components: - type: Transform rot: 3.141592653589793 rad pos: 7.5,-7.5 parent: 1 - - uid: 1005 + - uid: 1007 components: - type: Transform rot: 3.141592653589793 rad pos: 8.5,-7.5 parent: 1 - - uid: 1006 + - uid: 1008 components: - type: Transform rot: 3.141592653589793 rad pos: 8.5,-8.5 parent: 1 - - uid: 1007 + - uid: 1009 components: - type: Transform rot: 3.141592653589793 rad pos: 9.5,-8.5 parent: 1 - - uid: 1008 + - uid: 1010 components: - type: Transform rot: 3.141592653589793 rad pos: 9.5,-7.5 parent: 1 - - uid: 1009 + - uid: 1011 components: - type: Transform rot: 3.141592653589793 rad pos: 10.5,-7.5 parent: 1 - - uid: 1010 + - uid: 1012 components: - type: Transform rot: 3.141592653589793 rad pos: 10.5,-6.5 parent: 1 - - uid: 1011 + - uid: 1013 components: - type: Transform rot: 3.141592653589793 rad pos: 11.5,-6.5 parent: 1 - - uid: 1012 + - uid: 1014 components: - type: Transform rot: 3.141592653589793 rad pos: 12.5,-6.5 parent: 1 - - uid: 1013 + - uid: 1015 components: - type: Transform rot: 3.141592653589793 rad pos: 12.5,-5.5 parent: 1 - - uid: 1014 + - uid: 1016 components: - type: Transform rot: 3.141592653589793 rad pos: 13.5,-5.5 parent: 1 - - uid: 1015 + - uid: 1017 components: - type: Transform pos: 14.5,-4.5 parent: 1 - - uid: 1016 + - uid: 1018 components: - type: Transform pos: 14.5,-3.5 parent: 1 - - uid: 1017 + - uid: 1019 components: - type: Transform pos: 14.5,-2.5 parent: 1 - - uid: 1018 + - uid: 1020 components: - type: Transform rot: 1.5707963267948966 rad pos: 13.5,-1.5 parent: 1 - - uid: 1019 + - uid: 1021 components: - type: Transform rot: 1.5707963267948966 rad pos: 12.5,-1.5 parent: 1 - - uid: 1020 + - uid: 1022 components: - type: Transform rot: 1.5707963267948966 rad pos: 12.5,-0.5 parent: 1 - - uid: 1021 + - uid: 1023 components: - type: Transform rot: 1.5707963267948966 rad pos: 12.5,0.5 parent: 1 - - uid: 1022 + - uid: 1024 components: - type: Transform rot: 1.5707963267948966 rad pos: 12.5,1.5 parent: 1 - - uid: 1023 + - uid: 1025 components: - type: Transform rot: 1.5707963267948966 rad pos: 13.5,1.5 parent: 1 - - uid: 1024 + - uid: 1026 components: - type: Transform rot: 1.5707963267948966 rad pos: 13.5,2.5 parent: 1 - - uid: 1025 + - uid: 1027 components: - type: Transform rot: 1.5707963267948966 rad pos: 13.5,6.5 parent: 1 - - uid: 1026 + - uid: 1028 components: - type: Transform rot: 1.5707963267948966 rad pos: 13.5,4.5 parent: 1 - - uid: 1027 + - uid: 1029 components: - type: Transform rot: 1.5707963267948966 rad pos: -0.5,2.5 parent: 1 - - uid: 1028 + - uid: 1030 components: - type: Transform rot: 1.5707963267948966 rad pos: -0.5,6.5 parent: 1 - - uid: 1029 + - uid: 1031 components: - type: Transform rot: 1.5707963267948966 rad pos: -0.5,4.5 parent: 1 - - uid: 1030 + - uid: 1032 components: - type: Transform rot: 1.5707963267948966 rad pos: 5.5,22.5 parent: 1 - - uid: 1031 + - uid: 1033 components: - type: Transform rot: 1.5707963267948966 rad pos: 6.5,22.5 parent: 1 - - uid: 1032 + - uid: 1034 components: - type: Transform rot: 1.5707963267948966 rad pos: 6.5,21.5 parent: 1 - - uid: 1033 + - uid: 1035 components: - type: Transform rot: 1.5707963267948966 rad pos: 6.5,20.5 parent: 1 - - uid: 1034 + - uid: 1036 components: - type: Transform rot: 1.5707963267948966 rad pos: 6.5,19.5 parent: 1 - - uid: 1035 + - uid: 1037 components: - type: Transform rot: 1.5707963267948966 rad pos: 0.5,18.5 parent: 1 - - uid: 1036 + - uid: 1038 components: - type: Transform rot: 1.5707963267948966 rad pos: 6.5,15.5 parent: 1 - - uid: 1037 + - uid: 1039 components: - type: Transform rot: 1.5707963267948966 rad pos: 6.5,14.5 parent: 1 - - uid: 1038 + - uid: 1040 components: - type: Transform rot: 1.5707963267948966 rad pos: 6.5,13.5 parent: 1 - - uid: 1039 + - uid: 1041 components: - type: Transform rot: 1.5707963267948966 rad pos: 6.5,12.5 parent: 1 - - uid: 1040 + - uid: 1042 components: - type: Transform rot: 1.5707963267948966 rad pos: 6.5,11.5 parent: 1 - - uid: 1041 + - uid: 1043 components: - type: Transform rot: 1.5707963267948966 rad pos: 6.5,10.5 parent: 1 - - uid: 1042 + - uid: 1044 components: - type: Transform rot: 1.5707963267948966 rad pos: 6.5,9.5 parent: 1 - - uid: 1043 + - uid: 1045 components: - type: Transform rot: 1.5707963267948966 rad pos: 6.5,8.5 parent: 1 - - uid: 1044 + - uid: 1046 components: - type: Transform rot: 1.5707963267948966 rad pos: 6.5,7.5 parent: 1 - - uid: 1045 + - uid: 1047 components: - type: Transform rot: 1.5707963267948966 rad pos: -0.5,16.5 parent: 1 - - uid: 1046 + - uid: 1048 components: - type: Transform rot: 1.5707963267948966 rad pos: 6.5,6.5 parent: 1 - - uid: 1047 + - uid: 1049 components: - type: Transform rot: 1.5707963267948966 rad pos: 6.5,3.5 parent: 1 - - uid: 1048 + - uid: 1050 components: - type: Transform rot: 1.5707963267948966 rad pos: 6.5,2.5 parent: 1 - - uid: 1049 + - uid: 1051 components: - type: Transform rot: 1.5707963267948966 rad pos: 6.5,1.5 parent: 1 - - uid: 1050 + - uid: 1052 components: - type: Transform rot: 1.5707963267948966 rad pos: 6.5,0.5 parent: 1 - - uid: 1051 + - uid: 1053 components: - type: Transform rot: 1.5707963267948966 rad pos: 6.5,-0.5 parent: 1 - - uid: 1052 + - uid: 1054 components: - type: Transform rot: 1.5707963267948966 rad pos: 6.5,-1.5 parent: 1 - - uid: 1053 + - uid: 1055 components: - type: Transform rot: 1.5707963267948966 rad pos: 5.5,-1.5 parent: 1 - - uid: 1054 + - uid: 1056 components: - type: Transform rot: 1.5707963267948966 rad pos: 4.5,-1.5 parent: 1 - - uid: 1055 + - uid: 1057 components: - type: Transform rot: 1.5707963267948966 rad pos: 3.5,-1.5 parent: 1 - - uid: 1056 + - uid: 1058 components: - type: Transform rot: 1.5707963267948966 rad pos: 2.5,-1.5 parent: 1 - - uid: 1057 + - uid: 1059 components: - type: Transform rot: 1.5707963267948966 rad pos: 1.5,-1.5 parent: 1 - - uid: 1058 + - uid: 1060 components: - type: Transform rot: 1.5707963267948966 rad pos: 9.5,-1.5 parent: 1 - - uid: 1059 + - uid: 1061 components: - type: Transform rot: 1.5707963267948966 rad pos: 10.5,-1.5 parent: 1 - - uid: 1060 + - uid: 1062 components: - type: Transform rot: 1.5707963267948966 rad pos: 11.5,-1.5 parent: 1 - - uid: 1061 + - uid: 1063 components: - type: Transform rot: 1.5707963267948966 rad pos: 1.5,2.5 parent: 1 - - uid: 1062 + - uid: 1064 components: - type: Transform rot: 1.5707963267948966 rad pos: 2.5,2.5 parent: 1 - - uid: 1063 + - uid: 1065 components: - type: Transform rot: 1.5707963267948966 rad pos: 2.5,3.5 parent: 1 - - uid: 1064 + - uid: 1066 components: - type: Transform rot: 1.5707963267948966 rad pos: 3.5,3.5 parent: 1 - - uid: 1065 + - uid: 1067 components: - type: Transform rot: 1.5707963267948966 rad pos: 12.5,2.5 parent: 1 - - uid: 1066 + - uid: 1068 components: - type: Transform rot: 1.5707963267948966 rad pos: 11.5,2.5 parent: 1 - - uid: 1067 + - uid: 1069 components: - type: Transform rot: 1.5707963267948966 rad pos: 10.5,2.5 parent: 1 - - uid: 1068 + - uid: 1070 components: - type: Transform rot: 1.5707963267948966 rad pos: 10.5,3.5 parent: 1 - - uid: 1069 + - uid: 1071 components: - type: Transform rot: 1.5707963267948966 rad pos: 9.5,3.5 parent: 1 - - uid: 1070 + - uid: 1072 components: - type: Transform rot: 1.5707963267948966 rad pos: 13.5,16.5 parent: 1 - - uid: 1071 + - uid: 1073 components: - type: Transform rot: 1.5707963267948966 rad pos: 13.5,14.5 parent: 1 - - uid: 1072 + - uid: 1074 components: - type: Transform rot: 1.5707963267948966 rad pos: 13.5,18.5 parent: 1 - - uid: 1073 + - uid: 1075 components: - type: Transform rot: 1.5707963267948966 rad pos: -0.5,14.5 parent: 1 - - uid: 1074 + - uid: 1076 components: - type: Transform rot: 1.5707963267948966 rad pos: -0.5,18.5 parent: 1 - - uid: 1075 + - uid: 1077 components: - type: Transform rot: 1.5707963267948966 rad pos: 4.5,22.5 parent: 1 - - uid: 1076 + - uid: 1078 components: - type: Transform rot: 1.5707963267948966 rad pos: 3.5,22.5 parent: 1 - - uid: 1077 + - uid: 1079 components: - type: Transform rot: 1.5707963267948966 rad pos: 2.5,22.5 parent: 1 - - uid: 1078 + - uid: 1080 components: - type: Transform rot: 1.5707963267948966 rad pos: 2.5,23.5 parent: 1 - - uid: 1079 + - uid: 1081 components: - type: Transform rot: 1.5707963267948966 rad pos: 9.5,22.5 parent: 1 - - uid: 1080 + - uid: 1082 components: - type: Transform rot: 1.5707963267948966 rad pos: 9.5,23.5 parent: 1 - - uid: 1081 + - uid: 1083 components: - type: Transform rot: 1.5707963267948966 rad pos: 10.5,23.5 parent: 1 - - uid: 1082 + - uid: 1084 components: - type: Transform rot: 1.5707963267948966 rad pos: 9.5,21.5 parent: 1 - - uid: 1083 + - uid: 1085 components: - type: Transform rot: 1.5707963267948966 rad pos: 6.5,18.5 parent: 1 - - uid: 1084 + - uid: 1086 components: - type: Transform rot: 1.5707963267948966 rad pos: 1.5,18.5 parent: 1 - - uid: 1085 + - uid: 1087 components: - type: Transform rot: 1.5707963267948966 rad pos: 2.5,18.5 parent: 1 - - uid: 1086 + - uid: 1088 components: - type: Transform rot: 1.5707963267948966 rad pos: 3.5,18.5 parent: 1 - - uid: 1087 + - uid: 1089 components: - type: Transform rot: 1.5707963267948966 rad pos: 4.5,18.5 parent: 1 - - uid: 1088 + - uid: 1090 components: - type: Transform rot: -1.5707963267948966 rad pos: 3.5,15.5 parent: 1 - - uid: 1089 + - uid: 1091 components: - type: Transform rot: -1.5707963267948966 rad pos: 2.5,15.5 parent: 1 - - uid: 1090 + - uid: 1092 components: - type: Transform rot: -1.5707963267948966 rad pos: 2.5,14.5 parent: 1 - - uid: 1091 + - uid: 1093 components: - type: Transform rot: -1.5707963267948966 rad pos: 1.5,14.5 parent: 1 - - uid: 1092 + - uid: 1094 components: - type: Transform rot: -1.5707963267948966 rad pos: 0.5,14.5 parent: 1 - - uid: 1093 + - uid: 1095 components: - type: Transform rot: 1.5707963267948966 rad pos: 1.5,9.5 parent: 1 - - uid: 1094 + - uid: 1096 components: - type: Transform rot: 1.5707963267948966 rad pos: 2.5,9.5 parent: 1 - - uid: 1095 + - uid: 1097 components: - type: Transform rot: 1.5707963267948966 rad pos: 3.5,9.5 parent: 1 - - uid: 1096 + - uid: 1098 components: - type: Transform rot: 1.5707963267948966 rad pos: 4.5,9.5 parent: 1 - - uid: 1097 + - uid: 1099 components: - type: Transform rot: 1.5707963267948966 rad pos: 5.5,9.5 parent: 1 - - uid: 1098 + - uid: 1100 components: - type: Transform rot: 1.5707963267948966 rad pos: 0.5,6.5 parent: 1 - - uid: 1099 + - uid: 1101 components: - type: Transform rot: 1.5707963267948966 rad pos: 1.5,6.5 parent: 1 - - uid: 1100 + - uid: 1102 components: - type: Transform rot: 1.5707963267948966 rad pos: 12.5,6.5 parent: 1 - - uid: 1101 + - uid: 1103 components: - type: Transform rot: 1.5707963267948966 rad pos: 4.5,6.5 parent: 1 - - uid: 1102 + - uid: 1104 components: - type: Transform rot: 1.5707963267948966 rad pos: 11.5,6.5 parent: 1 - - uid: 1103 + - uid: 1105 components: - type: Transform rot: 1.5707963267948966 rad pos: 10.5,6.5 parent: 1 - - uid: 1104 + - uid: 1106 components: - type: Transform rot: 1.5707963267948966 rad pos: 9.5,6.5 parent: 1 - - uid: 1105 + - uid: 1107 components: - type: Transform rot: 1.5707963267948966 rad pos: 9.5,19.5 parent: 1 - - uid: 1106 + - uid: 1108 components: - type: Transform rot: 1.5707963267948966 rad pos: 9.5,18.5 parent: 1 - - uid: 1107 + - uid: 1109 components: - type: Transform rot: 1.5707963267948966 rad pos: 10.5,18.5 parent: 1 - - uid: 1108 + - uid: 1110 components: - type: Transform rot: 1.5707963267948966 rad pos: 11.5,18.5 parent: 1 - - uid: 1109 + - uid: 1111 components: - type: Transform rot: 1.5707963267948966 rad pos: 12.5,18.5 parent: 1 - - uid: 1110 + - uid: 1112 components: - type: Transform rot: 1.5707963267948966 rad pos: -1.5,7.5 parent: 1 - - uid: 1111 + - uid: 1113 components: - type: Transform rot: 1.5707963267948966 rad pos: -1.5,6.5 parent: 1 - - uid: 1112 + - uid: 1114 components: - type: Transform rot: 1.5707963267948966 rad pos: -1.5,19.5 parent: 1 - - uid: 1113 + - uid: 1115 components: - type: Transform rot: 1.5707963267948966 rad pos: -1.5,18.5 parent: 1 - - uid: 1114 + - uid: 1116 components: - type: Transform rot: 1.5707963267948966 rad pos: -1.5,1.5 parent: 1 - - uid: 1115 + - uid: 1117 components: - type: Transform rot: 1.5707963267948966 rad pos: -1.5,2.5 parent: 1 - - uid: 1116 + - uid: 1118 components: - type: Transform rot: 1.5707963267948966 rad pos: 14.5,1.5 parent: 1 - - uid: 1117 + - uid: 1119 components: - type: Transform rot: 1.5707963267948966 rad pos: 14.5,2.5 parent: 1 - - uid: 1118 + - uid: 1120 components: - type: Transform rot: 1.5707963267948966 rad pos: 14.5,7.5 parent: 1 - - uid: 1119 + - uid: 1121 components: - type: Transform rot: 1.5707963267948966 rad pos: 14.5,6.5 parent: 1 - - uid: 1120 + - uid: 1122 components: - type: Transform rot: 1.5707963267948966 rad pos: 14.5,13.5 parent: 1 - - uid: 1121 + - uid: 1123 components: - type: Transform rot: 1.5707963267948966 rad pos: 14.5,14.5 parent: 1 - - uid: 1122 + - uid: 1124 components: - type: Transform rot: 1.5707963267948966 rad pos: 14.5,19.5 parent: 1 - - uid: 1123 + - uid: 1125 components: - type: Transform rot: 1.5707963267948966 rad pos: 14.5,18.5 parent: 1 - - uid: 1124 + - uid: 1126 components: - type: Transform rot: 1.5707963267948966 rad pos: -1.5,14.5 parent: 1 - - uid: 1125 + - uid: 1127 components: - type: Transform rot: 1.5707963267948966 rad pos: -1.5,13.5 parent: 1 - - uid: 1126 + - uid: 1128 components: - type: Transform rot: 3.141592653589793 rad pos: 4.5,26.5 parent: 1 - - uid: 1127 + - uid: 1129 components: - type: Transform rot: 3.141592653589793 rad pos: 8.5,26.5 parent: 1 - - uid: 1128 + - uid: 1130 components: - type: Transform rot: 3.141592653589793 rad pos: 4.5,25.5 parent: 1 - - uid: 1129 + - uid: 1131 components: - type: Transform rot: -1.5707963267948966 rad pos: 8.5,3.5 parent: 1 - - uid: 1130 + - uid: 1132 components: - type: Transform rot: -1.5707963267948966 rad pos: 8.5,-1.5 parent: 1 - - uid: 1131 + - uid: 1133 components: - type: Transform rot: -1.5707963267948966 rad pos: 9.5,7.5 parent: 1 - - uid: 1132 + - uid: 1134 components: - type: Transform rot: -1.5707963267948966 rad pos: 9.5,10.5 parent: 1 - - uid: 1133 + - uid: 1135 components: - type: Transform rot: -1.5707963267948966 rad pos: 9.5,12.5 parent: 1 - - uid: 1134 + - uid: 1136 components: - type: Transform rot: -1.5707963267948966 rad pos: 9.5,15.5 parent: 1 - - uid: 1135 + - uid: 1137 components: - type: Transform rot: -1.5707963267948966 rad pos: 10.5,15.5 parent: 1 - - uid: 1136 + - uid: 1138 components: - type: Transform rot: -1.5707963267948966 rad pos: 4.5,15.5 parent: 1 - - uid: 1137 + - uid: 1139 components: - type: Transform rot: -1.5707963267948966 rad pos: 11.5,15.5 parent: 1 - - uid: 1138 + - uid: 1140 components: - type: Transform rot: -1.5707963267948966 rad pos: 12.5,15.5 parent: 1 - - uid: 1139 + - uid: 1141 components: - type: Transform rot: -1.5707963267948966 rad pos: 12.5,14.5 parent: 1 - - uid: 1140 + - uid: 1142 components: - type: Transform rot: 1.5707963267948966 rad pos: 1.5,13.5 parent: 1 - - uid: 1141 + - uid: 1143 components: - type: Transform rot: 1.5707963267948966 rad pos: 2.5,13.5 parent: 1 - - uid: 1142 + - uid: 1144 components: - type: Transform rot: 1.5707963267948966 rad pos: 1.5,11.5 parent: 1 - - uid: 1143 + - uid: 1145 components: - type: Transform rot: 1.5707963267948966 rad pos: 2.5,11.5 parent: 1 - - uid: 1144 + - uid: 1146 components: - type: Transform pos: 5.5,3.5 parent: 1 - - uid: 1145 + - uid: 1147 components: - type: Transform rot: 1.5707963267948966 rad pos: 7.5,25.5 parent: 1 - - uid: 1146 + - uid: 1148 components: - type: Transform rot: -1.5707963267948966 rad pos: 2.5,-5.5 parent: 1 - - uid: 1147 + - uid: 1149 components: - type: Transform rot: -1.5707963267948966 rad pos: 5.5,-5.5 parent: 1 - - uid: 1148 + - uid: 1150 components: - type: Transform rot: -1.5707963267948966 rad pos: 7.5,-5.5 parent: 1 - - uid: 1149 + - uid: 1151 components: - type: Transform rot: -1.5707963267948966 rad pos: 10.5,-5.5 parent: 1 - - uid: 1150 + - uid: 1152 components: - type: Transform pos: 13.5,15.5 parent: 1 - - uid: 1151 + - uid: 1153 components: - type: Transform rot: 3.141592653589793 rad @@ -7325,35 +7348,35 @@ entities: parent: 1 - proto: WallShuttleDiagonal entities: - - uid: 1152 + - uid: 1154 components: - type: Transform rot: -1.5707963267948966 rad pos: -0.5,24.5 parent: 1 - - uid: 1153 + - uid: 1155 components: - type: Transform pos: 13.5,24.5 parent: 1 - - uid: 1154 + - uid: 1156 components: - type: Transform rot: -1.5707963267948966 rad pos: -0.5,-4.5 parent: 1 - - uid: 1155 + - uid: 1157 components: - type: Transform rot: 3.141592653589793 rad pos: -0.5,-2.5 parent: 1 - - uid: 1156 + - uid: 1158 components: - type: Transform pos: 13.5,-4.5 parent: 1 - - uid: 1157 + - uid: 1159 components: - type: Transform rot: 1.5707963267948966 rad @@ -7361,60 +7384,60 @@ entities: parent: 1 - proto: WallWeaponCapacitorRecharger entities: - - uid: 1161 + - uid: 1160 components: - type: Transform pos: 3.5,3.5 parent: 1 - - uid: 1162 + - uid: 1161 components: - type: Transform pos: 5.5,25.5 parent: 1 - - uid: 1163 + - uid: 1162 components: - type: Transform pos: 14.5,6.5 parent: 1 - - uid: 1164 + - uid: 1163 components: - type: Transform pos: -1.5,6.5 parent: 1 - - uid: 1165 + - uid: 1164 components: - type: Transform pos: 14.5,18.5 parent: 1 - - uid: 1166 + - uid: 1165 components: - type: Transform pos: -1.5,18.5 parent: 1 - proto: WeaponAdvancedLaser entities: - - uid: 705 + - uid: 706 components: - type: Transform - parent: 704 + parent: 705 - type: Physics angularDamping: 0 linearDamping: 0 canCollide: False - type: InsideEntityStorage - - uid: 706 + - uid: 707 components: - type: Transform - parent: 704 + parent: 705 - type: Physics angularDamping: 0 linearDamping: 0 canCollide: False - type: InsideEntityStorage - - uid: 707 + - uid: 708 components: - type: Transform - parent: 704 + parent: 705 - type: Physics angularDamping: 0 linearDamping: 0 @@ -7422,28 +7445,28 @@ entities: - type: InsideEntityStorage - proto: WeaponGunLaserCarbineAutomatic entities: - - uid: 708 + - uid: 709 components: - type: Transform - parent: 704 + parent: 705 - type: Physics angularDamping: 0 linearDamping: 0 canCollide: False - type: InsideEntityStorage - - uid: 709 + - uid: 710 components: - type: Transform - parent: 704 + parent: 705 - type: Physics angularDamping: 0 linearDamping: 0 canCollide: False - type: InsideEntityStorage - - uid: 710 + - uid: 711 components: - type: Transform - parent: 704 + parent: 705 - type: Physics angularDamping: 0 linearDamping: 0 @@ -7451,19 +7474,19 @@ entities: - type: InsideEntityStorage - proto: WeaponLaserCannon entities: - - uid: 711 + - uid: 712 components: - type: Transform - parent: 704 + parent: 705 - type: Physics angularDamping: 0 linearDamping: 0 canCollide: False - type: InsideEntityStorage - - uid: 712 + - uid: 713 components: - type: Transform - parent: 704 + parent: 705 - type: Physics angularDamping: 0 linearDamping: 0 @@ -7500,10 +7523,10 @@ entities: - type: InsideEntityStorage - proto: WeaponPulsePistol entities: - - uid: 379 + - uid: 380 components: - type: Transform - parent: 366 + parent: 367 - type: Physics angularDamping: 0 linearDamping: 0 @@ -7511,16 +7534,16 @@ entities: - type: InsideEntityStorage - proto: WeaponRifleJackdaw entities: - - uid: 375 + - uid: 376 components: - type: Transform - parent: 366 + parent: 367 - type: ContainerContainer containers: gun_magazine: !type:ContainerSlot showEnts: False occludes: True - ent: 376 + ent: 377 gun_chamber: !type:ContainerSlot showEnts: False occludes: True @@ -7579,7 +7602,7 @@ entities: - type: InsideEntityStorage - proto: Windoor entities: - - uid: 1158 + - uid: 1166 components: - type: Transform rot: 1.5707963267948966 rad diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml index c119670fc51..164d9d55539 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml @@ -154,7 +154,7 @@ sprite: Objects/Specific/Service/vending_machine_restock.rsi state: base product: CrateVendingMachineRestockSalvageEquipmentFilled - cost: 1000 + cost: 1300 category: cargoproduct-category-name-engineering group: market diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml index fcd0be9133e..6c2eadf8916 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml @@ -25,6 +25,7 @@ - id: ClothingLongcoatLO # Floofstation - id: LunchboxCommandFilledRandom # Delta-V Lunchboxes! prob: 0.3 + - id: CargoTechFabCircuitboard # Floof - port to EE if possible - type: entity id: LockerCaptainFilledHardsuit @@ -148,6 +149,7 @@ - id: ClothingHandsGlovesInspection # DeltaV - Add inspection gloves for HoP. - id: LunchboxCommandFilledRandom # Delta-V Lunchboxes! prob: 0.3 + - id: ServiceTechFabCircuitboard # Floof - port to ee if possible - type: entity id: LockerChiefEngineerFilledHardsuit @@ -177,6 +179,7 @@ - id: CEIDCard # Delta-V - id: LunchboxCommandFilledRandom # Delta-V Lunchboxes! prob: 0.3 + - id: EngineeringTechFabCircuitboard # Floofstation - port to ee if possible - type: entity id: LockerChiefEngineerFilled @@ -202,6 +205,7 @@ - id: RCDAmmo - id: LunchboxCommandFilledRandom # Delta-V Lunchboxes! prob: 0.3 + - id: EngineeringTechFabCircuitboard # Floofstation - port to ee if possible - type: entity id: LockerChiefMedicalOfficerFilledHardsuit diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml b/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml index 4404c194130..3d2dc4f6ab7 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml @@ -274,7 +274,6 @@ - id: null orGroup: HypnoTempPlush #HypnoTemp Merch - End - # Floof - End # Syndicate loot - id: null prob: 0.95 @@ -288,30 +287,31 @@ - id: ClothingBackpackDuffelSyndicate prob: 0.005 orGroup: syndiemaintloot - #- id: CyberPen # DeltaV - Nuh uh - # prob: 0.005 - # orGroup: syndiemaintloot - #- id: CigPackSyndicate - # prob: 0.005 - # orGroup: syndiemaintloot + - id: CyberPen # Floof - Yuh huh, it's funny + prob: 0.005 + orGroup: syndiemaintloot + - id: CigPackSyndicate + prob: 0.005 + orGroup: syndiemaintloot - id: ClothingBackpackDuffelSyndicatePyjamaBundle prob: 0.005 orGroup: syndiemaintloot - #- id: ClothingBeltMilitaryWebbing - # prob: 0.005 - # orGroup: syndiemaintloot - #- id: ClothingShoesBootsCombatFilled - # prob: 0.005 - # orGroup: syndiemaintloot - #- id: ToolboxSyndicateFilled - # prob: 0.005 - # orGroup: syndiemaintloot + - id: ClothingBeltMilitaryWebbing + prob: 0.005 + orGroup: syndiemaintloot + - id: ClothingShoesBootsCombatFilled + prob: 0.005 + orGroup: syndiemaintloot + - id: ToolboxSyndicateFilled + prob: 0.005 + orGroup: syndiemaintloot - id: BalloonSyn prob: 0.005 orGroup: syndiemaintloot - #- id: WeaponSniperMosin - # prob: 0.0010 - # orGroup: syndiemaintloot + - id: WeaponSniperMosin + prob: 0.005 + orGroup: syndiemaintloot + # Floof - End - type: entity id: ClosetWallMaintenanceFilledRandom @@ -515,7 +515,7 @@ prob: 0.005 orGroup: syndiemaintloot - id: WeaponSniperMosin - prob: 0.0010 + prob: 0.005 orGroup: syndiemaintloot - type: entity diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml index 77b5c0a313c..a5ca39a0dc9 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml @@ -20,7 +20,7 @@ ClothingEyesGlasses: 6 ClothingHandsGlovesColorBlack: 4 ClothingEyesGlassesCheapSunglasses: 2 - ClothingUniformLoinCloth: 5 # FloofStation + ClothingUniformNudityPermit: 5 # FloofStation ClothingNeckCollarBlue: 1 # Floofstation - Collar addition ClothingNeckCollarBlack: 1 # Floofstation - Collar addition ClothingNeckCollarPink: 1 # Floofstation - Collar addition diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml index 5506caf6099..07e08e63478 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml @@ -30,6 +30,9 @@ ClothingHeadHatPumpkin: 2 ClothingHeadHatShrineMaidenWig: 2 ClothingOuterSuitShrineMaiden: 2 + ClothingHeadHatWitch1: 2 # Floof - Witch + ClothingHeadHatWitch: 2 # Floof - Witch + ClothingOuterSuitWitchRobes: 2 # Floof - Witch Gohei: 2 ClothingHeadHatRedRacoon: 2 ClothingOuterRedRacoon: 2 @@ -90,6 +93,7 @@ ClothingMaskNeckGaiterRed: 2 ClothingNeckBellCollar: 2 ClothingOuterUnathiRobe: 1 + ClothingNeckCloakRedHood: 1 # Floofstation - Red Cloak # Floofstation - Departmental Socks ect ClothingUniformMusicianThong: 2 ClothingUnderSocksMusician: 2 diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index b813789c5e9..24801007b3a 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -257,38 +257,38 @@ categories: - UplinkExplosives -- type: listing - id: UplinkSyndicateBomb - name: uplink-exploding-syndicate-bomb-name - description: uplink-exploding-syndicate-bomb-desc - productEntity: SyndicateBomb - cost: - Telecrystal: 11 - categories: - - UplinkExplosives - restockTime: 1800 - conditions: - - !type:StoreWhitelistCondition - blacklist: - tags: - - NukeOpsUplink - saleLimit: 1 +# - type: listing +# id: UplinkSyndicateBomb +# name: uplink-exploding-syndicate-bomb-name +# description: uplink-exploding-syndicate-bomb-desc +# productEntity: SyndicateBomb +# cost: +# Telecrystal: 11 +# categories: +# - UplinkExplosives +# restockTime: 1800 +# conditions: +# - !type:StoreWhitelistCondition +# blacklist: +# tags: +# - NukeOpsUplink +# saleLimit: 1 -- type: listing - id: UplinkSyndicateBombNukie - name: uplink-exploding-syndicate-bomb-name - description: uplink-exploding-syndicate-bomb-desc - productEntity: SyndicateBomb - cost: - Telecrystal: 11 - categories: - - UplinkExplosives - conditions: - - !type:StoreWhitelistCondition - whitelist: - tags: - - NukeOpsUplink - saleLimit: 1 +# - type: listing +# id: UplinkSyndicateBombNukie +# name: uplink-exploding-syndicate-bomb-name +# description: uplink-exploding-syndicate-bomb-desc +# productEntity: SyndicateBomb +# cost: +# Telecrystal: 11 +# categories: +# - UplinkExplosives +# conditions: +# - !type:StoreWhitelistCondition +# whitelist: +# tags: +# - NukeOpsUplink +# saleLimit: 1 - type: listing id: UplinkClusterGrenade @@ -393,26 +393,26 @@ #Utility -- type: listing - id: UplinkZombieBundle - name: uplink-zombie-bundle-name - description: uplink-zombie-bundle-desc - icon: { sprite: /Textures/Structures/Wallmounts/signs.rsi, state: bio } - productEntity: ClothingBackpackDuffelZombieBundle - cost: - Telecrystal: 40 - categories: - - UplinkMisc - conditions: - - !type:StoreWhitelistCondition - whitelist: - tags: - - NukeOpsUplink - - !type:BuyerWhitelistCondition - blacklist: - components: - - SurplusBundle - saleLimit: 1 +# - type: listing +# id: UplinkZombieBundle +# name: uplink-zombie-bundle-name +# description: uplink-zombie-bundle-desc +# icon: { sprite: /Textures/Structures/Wallmounts/signs.rsi, state: bio } +# productEntity: ClothingBackpackDuffelZombieBundle +# cost: +# Telecrystal: 40 +# categories: +# - UplinkMisc +# conditions: +# - !type:StoreWhitelistCondition +# whitelist: +# tags: +# - NukeOpsUplink +# - !type:BuyerWhitelistCondition +# blacklist: +# components: +# - SurplusBundle +# saleLimit: 1 - type: listing id: UplinkNocturineChemistryBottle @@ -966,15 +966,15 @@ categories: - UplinkBundles -- type: listing - id: UplinkSyndicateBombFake - name: uplink-exploding-syndicate-bomb-fake-name - description: uplink-exploding-syndicate-bomb-fake-desc - productEntity: SyndicateBombFake - cost: - Telecrystal: 4 - categories: - - UplinkUtility +# - type: listing +# id: UplinkSyndicateBombFake +# name: uplink-exploding-syndicate-bomb-fake-name +# description: uplink-exploding-syndicate-bomb-fake-desc +# productEntity: SyndicateBombFake +# cost: +# Telecrystal: 4 +# categories: +# - UplinkUtility # Disruption @@ -1057,17 +1057,17 @@ - UplinkBundles saleLimit: 1 -- type: listing - id: UplinkGrenadeLauncherBundle - name: uplink-grenade-launcher-bundle-name - description: uplink-grenade-launcher-bundle-desc - icon: { sprite: /Textures/Objects/Weapons/Guns/Launchers/china_lake.rsi, state: icon } - productEntity: ClothingBackpackDuffelSyndicateFilledGrenadeLauncher - cost: - Telecrystal: 25 - categories: - - UplinkBundles - saleLimit: 1 +# - type: listing +# id: UplinkGrenadeLauncherBundle +# name: uplink-grenade-launcher-bundle-name +# description: uplink-grenade-launcher-bundle-desc +# icon: { sprite: /Textures/Objects/Weapons/Guns/Launchers/china_lake.rsi, state: icon } +# productEntity: ClothingBackpackDuffelSyndicateFilledGrenadeLauncher +# cost: +# Telecrystal: 25 +# categories: +# - UplinkBundles +# saleLimit: 1 - type: listing id: UplinkL6SawBundle diff --git a/Resources/Prototypes/CharacterItemGroups/serviceGroups.yml b/Resources/Prototypes/CharacterItemGroups/serviceGroups.yml index 61c2b286b7e..0856be21f18 100644 --- a/Resources/Prototypes/CharacterItemGroups/serviceGroups.yml +++ b/Resources/Prototypes/CharacterItemGroups/serviceGroups.yml @@ -102,6 +102,8 @@ id: LoadoutServiceBartenderBoxBeanbags - type: loadout id: LoadoutServiceBartenderBoxLightRifleRubber + - type: loadout + id: LoadoutServiceBartenderBoxMagnumRubber # Floofstation - type: characterItemGroup id: LoadoutBartenderWeapon @@ -110,6 +112,10 @@ id: LoadoutServiceBartenderShotgunDoubleBarreledRubber - type: loadout id: LoadoutServiceBartenderMosinRubber + - type: loadout + id: LoadoutServiceBartenderArgentiNonlethal # Floofstation + - type: loadout + id: LoadoutServiceBartenderRepeaterNonlethal # Floofstation - type: characterItemGroup id: LoadoutBartenderUniforms @@ -182,4 +188,4 @@ - type: loadout id: LoadoutServiceJumpsuitJanitorIdris - type: loadout - id: LoadoutServiceJumpsuitJanitorOrion \ No newline at end of file + id: LoadoutServiceJumpsuitJanitorOrion diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/rodentia.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Species/rodentia.yml index 72d8f99df9e..fc190547bda 100644 --- a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/rodentia.yml +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Species/rodentia.yml @@ -11,8 +11,6 @@ - type: Hunger baseDecayRate: 0.0467 # 33% faster than usual - type: Carriable # Carrying system from nyanotrasen. - - type: Inventory - speciesId: rodentia - type: Icon sprite: DeltaV/Mobs/Species/Rodentia/parts.rsi state: full @@ -123,6 +121,14 @@ drinkDelayMultiplier: 0.5 - type: Flammable fireStackIncreaseMultiplier: 1.25 + - type: Inventory + speciesId: rodentia + femaleDisplacements: + jumpsuit: + sizeMaps: + 32: + sprite: Mobs/Species/Human/displacement.rsi + state: jumpsuit-female - type: entity save: false @@ -136,3 +142,9 @@ species: Rodentia - type: Inventory speciesId: rodentia + femaleDisplacements: + jumpsuit: + sizeMaps: + 32: + sprite: Mobs/Species/Human/displacement.rsi + state: jumpsuit-female diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/vulpkanin.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Species/vulpkanin.yml index b3027839b1a..19228895cbe 100644 --- a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/vulpkanin.yml +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Species/vulpkanin.yml @@ -10,8 +10,6 @@ - type: Hunger baseDecayRate: 0.02083333332 # 25% more than default - type: Carriable # Carrying system from nyanotrasen. - - type: Inventory # Allows vulps to wear properly shaped helmets - speciesId: vulpkanin - type: Thirst - type: Icon sprite: DeltaV/Mobs/Species/Vulpkanin/parts.rsi @@ -35,16 +33,6 @@ - map: [ "enum.HumanoidVisualLayers.LArm" ] - map: [ "enum.HumanoidVisualLayers.RLeg" ] - map: [ "enum.HumanoidVisualLayers.LLeg" ] - - shader: StencilClear - sprite: Mobs/Species/Human/parts.rsi #PJB on stencil clear being on the left leg: "...this is 'fine'" -https://github.com/space-wizards/space-station-14/pull/12217#issuecomment-1291677115 - # its fine, but its still very stupid that it has to be done like this instead of allowing sprites to just directly insert a stencil clear. - # sprite refactor when - state: l_leg - - shader: StencilMask - map: [ "enum.HumanoidVisualLayers.StencilMask" ] - sprite: DeltaV/Mobs/Customization/Vulpkanin/masking_helpers.rsi - state: female_full - visible: false - map: [ "jumpsuit" ] - map: [ "enum.HumanoidVisualLayers.LHand" ] - map: [ "enum.HumanoidVisualLayers.RHand" ] @@ -116,6 +104,14 @@ drinkDelayMultiplier: 0.5 - type: Flammable fireStackIncreaseMultiplier: 1.25 + - type: Inventory + speciesId: vulpkanin + femaleDisplacements: + jumpsuit: + sizeMaps: + 32: + sprite: Mobs/Species/Human/displacement.rsi + state: jumpsuit-female - type: entity save: false @@ -127,3 +123,11 @@ components: - type: HumanoidAppearance species: Vulpkanin + - type: Inventory + speciesId: vulpkanin + femaleDisplacements: + jumpsuit: + sizeMaps: + 32: + sprite: Mobs/Species/Human/displacement.rsi + state: jumpsuit-female diff --git a/Resources/Prototypes/DeltaV/Species/vulpkanin.yml b/Resources/Prototypes/DeltaV/Species/vulpkanin.yml index 909cd920ecd..a286dd49363 100644 --- a/Resources/Prototypes/DeltaV/Species/vulpkanin.yml +++ b/Resources/Prototypes/DeltaV/Species/vulpkanin.yml @@ -36,6 +36,7 @@ - type: markingPoints id: MobVulpkaninMarkingLimits + onlyWhitelisted: true points: Hair: points: 1 diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml index 0a8e440e5b3..35275aa2e99 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml @@ -41,7 +41,6 @@ components: - type: Clothing slots: [innerclothing] - femaleMask: UniformTop - type: Tag # Needed for species with nonhuman legs/can only wear skirts tags: - Skirt @@ -67,7 +66,6 @@ components: - type: Clothing slots: [innerclothing] - femaleMask: UniformTop - type: Tag # Needed for species with nonhuman legs/can only wear skirts # And for moths to be able to eat this. tags: diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml index d2339764f88..b61aac62690 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml @@ -296,7 +296,6 @@ sprite: Clothing/Uniforms/Jumpsuit/clown.rsi - type: Clothing sprite: Clothing/Uniforms/Jumpsuit/clown.rsi - femaleMask: UniformTop - type: Tag tags: - ClownSuit @@ -310,7 +309,6 @@ sprite: Clothing/Uniforms/Jumpsuit/clown_banana.rsi - type: Clothing sprite: Clothing/Uniforms/Jumpsuit/clown_banana.rsi - femaleMask: UniformTop - type: Construction graph: BananaClownJumpsuit node: jumpsuit diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/random_suit.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/random_suit.yml index e113f0ffc76..7d4dfc59905 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/random_suit.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/random_suit.yml @@ -19,8 +19,6 @@ - state: mask_null map: [ "overlay" ] - type: Clothing - femaleMask: UniformTop - maleMask: UniformTop sprite: Clothing/Uniforms/procedural.rsi clothingVisuals: jumpsuit: diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/techboard.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/techboard.yml index f943c76ee03..7ea7a94a432 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/techboard.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/techboard.yml @@ -39,6 +39,9 @@ - PortableGeneratorSuperPacmanMachineCircuitboard # Delta V - Add additional boards - PortableGeneratorJrPacmanMachineCircuitboard # Delta V - Add additional boards - MedicalTechFabCircuitboard # Delta V - Add additional boards + - EngineeringTechFabCircuitboard # Floof - add techfab boards + - CargoTechFabCircuitboard # Floof - add techfab boards + - ServiceTechFabCircuitboard # Floof - add techfab boards - UniformPrinterMachineCircuitboard # Delta V - Add additional boards - ArtifactAnalyzerMachineCircuitboard # Delta V - Add additional boards rareChance: 0.1 diff --git a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml index 7974b06870e..b44dd1a52d8 100644 --- a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml +++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml @@ -228,6 +228,7 @@ - TauCetiBasic - RobotTalk - type: PsionicInsulation + - type: Vore # Floofstation - Vore - type: entity abstract: true diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml index 8cc47e83669..1f1f1ece29c 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml @@ -400,6 +400,9 @@ behaviors: - !type:GibBehavior { } - type: NonSpreaderZombie + - type: LanguageKnowledge + speaks: [Hissing] + understands: [Hissing] - type: entity name: glockroach @@ -2118,6 +2121,9 @@ - type: RandomBark barkType: penguin barkMultiplier: 0.6 + - type: LanguageKnowledge + speaks: [Penguin] + understands: [Penguin] - type: entity name: grenade penguin @@ -2238,6 +2244,9 @@ minTime: 10 maxTime: 50 # It's a sssnake... barkType: hissing + - type: LanguageKnowledge + speaks: [Hissing] + understands: [Hissing] # Code unique spider prototypes or combine them all into one spider and get a # random sprite state when you spawn it. diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml b/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml index 2778bf12788..d66c8343c82 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml @@ -80,6 +80,7 @@ interactFailureString: petting-failure-carp interactFailureSound: path: /Audio/Effects/bite.ogg + - type: Vore # Floofstation - Vore - type: entity parent: BaseMobCarp diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/glimmer_creatures.yml b/Resources/Prototypes/Entities/Mobs/NPCs/glimmer_creatures.yml index 33e4ecee260..c2219d7fae3 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/glimmer_creatures.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/glimmer_creatures.yml @@ -161,3 +161,6 @@ - type: NPCRetaliation attackMemoryLength: 10 - type: NPCRangedCombat + # other + - type: LanguageSpeaker + - type: UniversalLanguageSpeaker # Should it speak unversal or some other language? diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml b/Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml index c16816b5e44..d466a34383d 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml @@ -107,3 +107,5 @@ powersToAdd: - XenoglossyPower - TelepathyPower + - type: LanguageSpeaker + - type: UniversalLanguageSpeaker diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml b/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml index 04b767b8ae2..f72616d45c6 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml @@ -139,6 +139,7 @@ - Xeno understands: - Xeno + - type: Vore # Floofstation - Vore - type: entity name: Praetorian diff --git a/Resources/Prototypes/Entities/Mobs/Player/silicon_base.yml b/Resources/Prototypes/Entities/Mobs/Player/silicon_base.yml index a8772a41f8a..294f741b784 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/silicon_base.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/silicon_base.yml @@ -4,6 +4,7 @@ parent: [BaseMob, MobDamageable, MobCombat, MobAtmosExposed, MobFlammable] abstract: true components: + - type: Vore # Floofstation - Vore - type: ContentEye - type: CameraRecoil - type: Reactive diff --git a/Resources/Prototypes/Entities/Mobs/Species/arachne.yml b/Resources/Prototypes/Entities/Mobs/Species/arachne.yml index 24ebafd91d1..2f0bfaaf95a 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/arachne.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/arachne.yml @@ -34,14 +34,6 @@ color: "#e8b59b" sprite: Mobs/Species/Human/parts.rsi state: l_arm - - shader: StencilClear - sprite: Mobs/Species/Human/parts.rsi - state: l_leg - - shader: StencilMask - map: [ "enum.HumanoidVisualLayers.StencilMask" ] - sprite: Mobs/Customization/anytaur_masking_helpers.rsi - state: unisex_full - visible: false - map: [ "jumpsuit" ] - map: [ "enum.HumanoidVisualLayers.LHand" ] color: "#e8b59b" @@ -101,6 +93,12 @@ speechSounds: Alto - type: Inventory templateId: anytaur + femaleDisplacements: + jumpsuit: + sizeMaps: + 32: + sprite: Mobs/Species/Human/displacement.rsi + state: jumpsuit-female - type: Tag tags: - CanPilot @@ -216,5 +214,11 @@ visible: false - type: Inventory templateId: anytaur + femaleDisplacements: + jumpsuit: + sizeMaps: + 32: + sprite: Mobs/Species/Human/displacement.rsi + state: jumpsuit-female - type: HumanoidAppearance species: Arachne diff --git a/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml b/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml index 178c5e6ca21..9b3191fcedc 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml @@ -94,16 +94,6 @@ - map: [ "enum.HumanoidVisualLayers.LArm" ] - map: [ "enum.HumanoidVisualLayers.RLeg" ] - map: [ "enum.HumanoidVisualLayers.LLeg" ] - - shader: StencilClear - sprite: Mobs/Species/Human/parts.rsi #PJB on stencil clear being on the left leg: "...this is 'fine'" -https://github.com/space-wizards/space-station-14/pull/12217#issuecomment-1291677115 - # its fine, but its still very stupid that it has to be done like this instead of allowing sprites to just directly insert a stencil clear. - # sprite refactor when - state: l_leg - - shader: StencilMask - map: ["enum.HumanoidVisualLayers.StencilMask"] - sprite: Mobs/Customization/masking_helpers.rsi - state: unisex_full - visible: false - map: ["jumpsuit"] - map: ["enum.HumanoidVisualLayers.LFoot"] - map: ["enum.HumanoidVisualLayers.RFoot"] diff --git a/Resources/Prototypes/Entities/Mobs/Species/base.yml b/Resources/Prototypes/Entities/Mobs/Species/base.yml index 6855a6560be..092fd99665d 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/base.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/base.yml @@ -17,16 +17,6 @@ - map: [ "enum.HumanoidVisualLayers.LArm" ] - map: [ "enum.HumanoidVisualLayers.RLeg" ] - map: [ "enum.HumanoidVisualLayers.LLeg" ] - - shader: StencilClear - sprite: Mobs/Species/Human/parts.rsi #PJB on stencil clear being on the left leg: "...this is 'fine'" -https://github.com/space-wizards/space-station-14/pull/12217#issuecomment-1291677115 - # its fine, but its still very stupid that it has to be done like this instead of allowing sprites to just directly insert a stencil clear. - # sprite refactor when - state: l_leg - - shader: StencilMask - map: ["enum.HumanoidVisualLayers.StencilMask"] - sprite: Mobs/Customization/masking_helpers.rsi - state: unisex_full - visible: false - map: ["jumpsuit"] - map: ["enum.HumanoidVisualLayers.LFoot"] - map: ["enum.HumanoidVisualLayers.RFoot"] @@ -216,6 +206,7 @@ price: 1500 # Kidnapping a living person and selling them for cred is a good move. deathPenalty: 0.01 # However they really ought to be living and intact, otherwise they're worth 100x less. - type: CanEscapeInventory # Carrying system from nyanotrasen. + - type: Vore # Floofstation - Vore - type: LanguageKnowledge # This is here so even if species doesn't have a defined language, they at least speak GC speaks: - TauCetiBasic diff --git a/Resources/Prototypes/Entities/Mobs/Species/diona.yml b/Resources/Prototypes/Entities/Mobs/Species/diona.yml index 113151ad083..398ba012385 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/diona.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/diona.yml @@ -87,6 +87,12 @@ - MobLayer - type: Inventory templateId: diona + femaleDisplacements: + jumpsuit: + sizeMaps: + 32: + sprite: Mobs/Species/Human/displacement.rsi + state: jumpsuit-female - type: Speech speechVerb: Plant - type: Vocal @@ -128,5 +134,11 @@ components: - type: Inventory templateId: diona + femaleDisplacements: + jumpsuit: + sizeMaps: + 32: + sprite: Mobs/Species/Human/displacement.rsi + state: jumpsuit-female - type: HumanoidAppearance species: Diona diff --git a/Resources/Prototypes/Entities/Mobs/Species/gingerbread.yml b/Resources/Prototypes/Entities/Mobs/Species/gingerbread.yml index c514a6f1a05..03cf94b38d4 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/gingerbread.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/gingerbread.yml @@ -40,6 +40,13 @@ - MobMask layer: - MobLayer + - type: Inventory + femaleDisplacements: + jumpsuit: + sizeMaps: + 32: + sprite: Mobs/Species/Human/displacement.rsi + state: jumpsuit-female - type: entity parent: BaseSpeciesDummy @@ -48,3 +55,10 @@ components: - type: HumanoidAppearance species: Gingerbread + - type: Inventory + femaleDisplacements: + jumpsuit: + sizeMaps: + 32: + sprite: Mobs/Species/Human/displacement.rsi + state: jumpsuit-female diff --git a/Resources/Prototypes/Entities/Mobs/Species/human.yml b/Resources/Prototypes/Entities/Mobs/Species/human.yml index 013789cd2be..91d825fe211 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/human.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/human.yml @@ -28,8 +28,23 @@ understands: - TauCetiBasic - SolCommon + - type: Inventory + femaleDisplacements: + jumpsuit: + sizeMaps: + 32: + sprite: Mobs/Species/Human/displacement.rsi + state: jumpsuit-female - type: entity parent: BaseSpeciesDummy id: MobHumanDummy noSpawn: true + components: + - type: Inventory + femaleDisplacements: + jumpsuit: + sizeMaps: + 32: + sprite: Mobs/Species/Human/displacement.rsi + state: jumpsuit-female diff --git a/Resources/Prototypes/Entities/Mobs/Species/moth.yml b/Resources/Prototypes/Entities/Mobs/Species/moth.yml index fef380d1d56..5c9f2bc354a 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/moth.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/moth.yml @@ -80,16 +80,6 @@ - map: [ "enum.HumanoidVisualLayers.LArm" ] - map: [ "enum.HumanoidVisualLayers.RLeg" ] - map: [ "enum.HumanoidVisualLayers.LLeg" ] - - shader: StencilClear - sprite: Mobs/Species/Human/parts.rsi #PJB on stencil clear being on the left leg: "...this is 'fine'" -https://github.com/space-wizards/space-station-14/pull/12217#issuecomment-1291677115 - # its fine, but its still very stupid that it has to be done like this instead of allowing sprites to just directly insert a stencil clear. - # sprite refactor when - state: l_leg - - shader: StencilMask - map: [ "enum.HumanoidVisualLayers.StencilMask" ] - sprite: Mobs/Customization/masking_helpers.rsi - state: unisex_full - visible: false - map: [ "jumpsuit" ] - map: [ "enum.HumanoidVisualLayers.LHand" ] - map: [ "enum.HumanoidVisualLayers.RHand" ] @@ -122,6 +112,13 @@ sprite: "Effects/creampie.rsi" state: "creampie_moth" visible: false + - type: Inventory + femaleDisplacements: + jumpsuit: + sizeMaps: + 32: + sprite: Mobs/Species/Human/displacement.rsi + state: jumpsuit-female - type: entity parent: BaseSpeciesDummy @@ -130,3 +127,10 @@ components: - type: HumanoidAppearance species: Moth + - type: Inventory + femaleDisplacements: + jumpsuit: + sizeMaps: + 32: + sprite: Mobs/Species/Human/displacement.rsi + state: jumpsuit-female diff --git a/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml b/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml index bdcd94ce2e1..02cfef22d3c 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml @@ -23,8 +23,6 @@ spawned: - id: FoodMeatLizard amount: 5 - - type: Inventory - speciesId: reptilian - type: LizardAccent - type: Speech speechSounds: Lizard @@ -69,6 +67,14 @@ understands: - TauCetiBasic - Draconic + - type: Inventory + speciesId: reptilian + femaleDisplacements: + jumpsuit: + sizeMaps: + 32: + sprite: Mobs/Species/Human/displacement.rsi + state: jumpsuit-female - type: entity parent: BaseSpeciesDummy @@ -78,5 +84,13 @@ components: - type: HumanoidAppearance species: Reptilian + - type: Inventory + speciesId: reptilian + femaleDisplacements: + jumpsuit: + sizeMaps: + 32: + sprite: Mobs/Species/Human/displacement.rsi + state: jumpsuit-female #Weh diff --git a/Resources/Prototypes/Entities/Mobs/Species/shadowkin.yml b/Resources/Prototypes/Entities/Mobs/Species/shadowkin.yml index 54b9fae262d..96a95c684b3 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/shadowkin.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/shadowkin.yml @@ -157,14 +157,6 @@ - map: ["enum.HumanoidVisualLayers.LArm"] - map: ["enum.HumanoidVisualLayers.RLeg"] - map: ["enum.HumanoidVisualLayers.LLeg"] - - shader: StencilClear - sprite: Mobs/Species/Human/parts.rsi - state: l_leg - - shader: StencilMask - map: ["enum.HumanoidVisualLayers.StencilMask"] - sprite: Mobs/Customization/masking_helpers.rsi - state: full - visible: false - map: ["enum.HumanoidVisualLayers.LFoot"] - map: ["enum.HumanoidVisualLayers.RFoot"] - map: ["socks"] @@ -265,14 +257,6 @@ - map: ["enum.HumanoidVisualLayers.LArm"] - map: ["enum.HumanoidVisualLayers.RLeg"] - map: ["enum.HumanoidVisualLayers.LLeg"] - - shader: StencilClear - sprite: Mobs/Species/Human/parts.rsi - state: l_leg - - shader: StencilMask - map: ["enum.HumanoidVisualLayers.StencilMask"] - sprite: Mobs/Customization/masking_helpers.rsi - state: full - visible: false - map: ["enum.HumanoidVisualLayers.LFoot"] - map: ["enum.HumanoidVisualLayers.RFoot"] - map: ["socks"] diff --git a/Resources/Prototypes/Entities/Mobs/Species/slime.yml b/Resources/Prototypes/Entities/Mobs/Species/slime.yml index 7faade46f84..937a0d3a4ef 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/slime.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/slime.yml @@ -117,11 +117,26 @@ understands: - TauCetiBasic - Bubblish + - type: Inventory + femaleDisplacements: + jumpsuit: + sizeMaps: + 32: + sprite: Mobs/Species/Human/displacement.rsi + state: jumpsuit-female - type: entity parent: MobHumanDummy id: MobSlimePersonDummy noSpawn: true components: - - type: HumanoidAppearance - species: SlimePerson + - type: HumanoidAppearance + species: SlimePerson + - type: Inventory + femaleDisplacements: + jumpsuit: + sizeMaps: + 32: + sprite: Mobs/Species/Human/displacement.rsi + state: jumpsuit-female + diff --git a/Resources/Prototypes/Entities/Mobs/Species/vox.yml b/Resources/Prototypes/Entities/Mobs/Species/vox.yml index ec8035563b7..0c252d67c5c 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/vox.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/vox.yml @@ -16,16 +16,6 @@ #- type: VoxAccent # Not yet coded - type: Inventory speciesId: vox - displacements: - jumpsuit: - layer: - sprite: Mobs/Species/Vox/displacement.rsi - state: jumpsuit - copyToShaderParameters: - # Value required, provide a dummy. Gets overridden when applied. - layerKey: dummy - parameterTexture: displacementMap - parameterUV: displacementUV - type: Speech speechVerb: Vox speechSounds: Vox diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml index a34af1c9d82..b9e82c645a3 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml @@ -146,6 +146,64 @@ - type: StealTarget stealGroup: MedicalTechFabCircuitboard +# THIS ENTIRE SECTION BELONGS TO FLOOF - port to EE if possible +# === + +- type: entity + id: EngineeringTechFabCircuitboard + parent: BaseMachineCircuitboard + name: engineering techfab machine board + description: A machine printed circuit board for an engineering techfab + components: + - type: Sprite + state: engineering + - type: MachineBoard + prototype: EngineeringTechFab + requirements: + MatterBin: 1 + Manipulator: 3 + tagRequirements: + GlassBeaker: + Amount: 1 + DefaultPrototype: Beaker + ExamineName: Glass Beaker + +- type: entity + id: CargoTechFabCircuitboard + parent: BaseMachineCircuitboard + name: cargo techfab machine board + description: A machine printed circuit board for a cargo techfab + components: + - type: Sprite + state: supply + - type: MachineBoard + prototype: CargoTechFab + requirements: + MatterBin: 3 + Manipulator: 1 + tagRequirements: + GlassBeaker: + Amount: 1 + DefaultPrototype: Beaker + ExamineName: Glass Beaker + +- type: entity + id: ServiceTechFabCircuitboard + parent: BaseMachineCircuitboard + name: service techfab machine board + description: A machine printed circuit board for a service techfab + components: + - type: Sprite + state: service + - type: MachineBoard + prototype: ServiceTechFab + requirements: + MatterBin: 2 + Manipulator: 2 + +# === +# Floof section end + - type: entity id: CircuitImprinterMachineCircuitboard parent: BaseMachineCircuitboard diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml index 19303f86905..49e46f6da13 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml @@ -104,6 +104,10 @@ - DoorBumpOpener - type: Input context: "human" + - type: LanguageSpeaker + - type: LanguageKnowledge + speaks: [TauCetiBasic, RobotTalk] + understands: [TauCetiBasic, RobotTalk] - type: entity parent: BasePDA diff --git a/Resources/Prototypes/Entities/Objects/Specific/Robotics/mmi.yml b/Resources/Prototypes/Entities/Objects/Specific/Robotics/mmi.yml index 85333e98df5..ac125d36bd1 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Robotics/mmi.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Robotics/mmi.yml @@ -48,6 +48,10 @@ - type: GuideHelp guides: - Cyborgs + - type: LanguageSpeaker + - type: LanguageKnowledge + speaks: [TauCetiBasic, RobotTalk] + understands: [TauCetiBasic, RobotTalk] - type: entity parent: MMI @@ -124,3 +128,7 @@ guides: - Cyborgs - type: Organ # Estacao Pirata - IPCs + - type: LanguageSpeaker + - type: LanguageKnowledge + speaks: [RobotTalk] + understands: [RobotTalk] diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/pka.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/pka.yml index 226fa29164f..2071f7c4469 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/pka.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/pka.yml @@ -13,3 +13,10 @@ map: [ "empty-icon" ] # todo: add itemcomponent with inhandVisuals states using unused texture and animation assets in kinetic_accelerator.rsi # todo: add clothingcomponent with clothingVisuals states using unused texture and animations assets in kinetic_accelerator.rsi + - type: StaticPrice + price: 270 + - type: Construction #Frontier + graph: PKASawn #Frontier + node: start #Frontier + deconstructionTarget: null #Frontier + - type: Wieldable # Frontier diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml index fb1eb3d7fe9..21a0e3b9d0f 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml @@ -60,17 +60,18 @@ wideAnimationRotation: -90 soundHit: path: "/Audio/Items/drill_hit.ogg" - attackRate: 1.2 + attackRate: 4 range: 1.5 damage: types: - Blunt: 6 - Slash: 3 - Structural: 12 - bluntStaminaDamageFactor: 4.0 + Blunt: 2 + Slash: 1 + Structural: 15 + bluntStaminaDamageFactor: 1 heavyRateModifier: 1 heavyRangeModifier: 2 heavyDamageBaseModifier: 1 + heavyStaminaCost: 0 angle: 20 - type: ReverseEngineering # Nyano diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index e5300b808dd..3f87a32ec2b 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -197,7 +197,6 @@ - HandheldStationMap - ClothingHeadHatWelding - ShockCollar # FloofStation - - CustomDrinkJug # FloofStation - LeashBasic # FloofStation - ShortLeash # FloofStation - type: EmagLatheRecipes @@ -494,6 +493,7 @@ - SolarTrackerElectronics - TurboItemRechargerCircuitboard - PowerComputerCircuitboard + - AlertsComputerCircuitboard # Floof - port to EE if possible - AutolatheHyperConvectionMachineCircuitboard - ProtolatheHyperConvectionMachineCircuitboard - CircuitImprinterHyperConvectionMachineCircuitboard @@ -821,6 +821,8 @@ - MagazineBoxSpecialPractice - SpeedLoaderSpecial - MagazinePistolSpecial + - HandheldGPSBasic # Floof - port to EE + - HandheldStationMap # Floof - port to EE dynamicRecipes: - BolaEnergy - BoxBeanbag @@ -907,6 +909,17 @@ - MagazineBoxSpecialUranium - MagazineBoxSpecialMindbreaker - ClothingShoesBootsSecurityMagboots # Floofstation + # Floof section - port to EE later + - WeaponGrapplingGun # Floof + - JawsOfLife + - HandHeldMassScanner + - HoloprojectorField + - RadarConsoleCircuitboard + - SurveillanceCameraRouterCircuitboard + - SurveillanceCameraMonitorCircuitboard + - SurveillanceWirelessCameraMonitorCircuitboard + - SurveillanceCameraWirelessRouterCircuitboard + # Floof section end - type: MaterialStorage whitelist: tags: @@ -1028,6 +1041,8 @@ - Hemostat - ClothingEyesGlassesChemical - WhiteCane + - HandheldGPSBasic # Floof - port to EE + - HandheldStationMap # Floof - port to EE dynamicRecipes: - ChemicalPayload - CryostasisBeaker @@ -1037,11 +1052,242 @@ - ChemicalPayload # Nyano - SyringeCryostasis - HypoMini # Floof + # Floof section - port to EE later + - HandHeldMassScanner + - ClothingHeadHelmetInsulated + - CloningConsoleComputerCircuitboard + - CloningPodMachineCircuitboard + - MetempsychoticMachineCircuitboard + - MedicalScannerMachineCircuitboard + - VaccinatorMachineCircuitboard + - DiagnoserMachineCircuitboard + - StasisBedMachineCircuitboard + - CryoPodMachineCircuitboard + - BiomassReclaimerMachineCircuitboard + - BiofabricatorMachineCircuitboard + - ReagentGrinderIndustrialMachineCircuitboard + - FatExtractorMachineCircuitboard + - CrewMonitoringComputerCircuitboard + # Floof section end - type: Machine board: MedicalTechFabCircuitboard - type: StealTarget stealGroup: MedicalTechFabCircuitboard +# THIS ENTIRE SECTION BELONGS TO FLOOF - port to EE if possible +# === + +- type: entity + id: EngineeringTechFab + parent: Autolathe + name: engineering techfab + description: An improved version of the autolathe, capable of printing various tools used by engineers. + components: + - type: Sprite + sprite: Structures/Machines/techfab.rsi + layers: + - state: icon + map: ["enum.LatheVisualLayers.IsRunning"] + - state: engi + - state: unlit + shader: unshaded + map: ["enum.PowerDeviceVisualLayers.Powered"] + - state: inserting + map: ["enum.MaterialStorageVisualLayers.Inserting"] + - state: panel + map: ["enum.WiresVisualLayers.MaintenancePanel"] + - type: Machine + board: EngineeringTechFabCircuitboard + - type: Lathe + idleState: icon + runningState: icon + # Static recipes are inherited from the autolathe. This only adds some dynamic ones. + dynamicRecipes: + # Machines and computers + - TurboItemRechargerCircuitboard + - SheetifierMachineCircuitboard + - PortableGeneratorPacmanMachineCircuitboard + - PortableGeneratorSuperPacmanMachineCircuitboard + - PortableGeneratorJrPacmanMachineCircuitboard + - AutolatheHyperConvectionMachineCircuitboard + - SolarControlComputerCircuitboard + - SolarTrackerElectronics # Actual solar panels are not manufacturable + - EmitterCircuitboard + # Atmos machines + - ThermomachineFreezerMachineCircuitBoard + - HellfireFreezerMachineCircuitBoard + - PortableScrubberMachineCircuitBoard + # Tools + - PowerCellHigh + - PowerCellMicroreactor + - SignallerAdvanced + - HolofanProjector + - HoloprojectorField + - WelderExperimental + - PowerDrill # Can make two of the three advanced tools - jaws of life are too OP to give them away + - WeaponParticleDecelerator + - ClothingMaskWeldingGas + - ClothingShoesBootsMagSci + # Routers and monitors + - PowerComputerCircuitboard + - AlertsComputerCircuitboard + - SurveillanceCameraRouterCircuitboard + - SurveillanceCameraMonitorCircuitboard + - SurveillanceWirelessCameraMonitorCircuitboard + - SurveillanceCameraWirelessRouterCircuitboard + - TelecomServerCircuitboard + # Shuttle building + - ShuttleConsoleCircuitboard + - RadarConsoleCircuitboard + - ThrusterMachineCircuitboard + - GyroscopeMachineCircuitboard + - MiniGravityGeneratorCircuitboard + - ShuttleGunKineticCircuitboard + - type: MaterialStorage + whitelist: + tags: + - Sheet + - RawMaterial + - Ingot + + +- type: entity + id: CargoTechFab + parent: Autolathe + name: logistics techfab + description: An improved version of the autolathe, capable of printing various tools used by salvage and cargo technicians. + components: + - type: Sprite + sprite: Structures/Machines/techfab.rsi + layers: + - state: icon + map: ["enum.LatheVisualLayers.IsRunning"] + - state: cargo + - state: unlit + shader: unshaded + map: ["enum.PowerDeviceVisualLayers.Powered"] + - state: inserting + map: ["enum.MaterialStorageVisualLayers.Inserting"] + - state: panel + map: ["enum.WiresVisualLayers.MaintenancePanel"] + - type: Machine + board: CargoTechFabCircuitboard + - type: Lathe + idleState: icon + runningState: icon + # Static recipes are inherited from the autolathe. This only adds some dynamic ones. + dynamicRecipes: + # Weapons and tools + - WeaponGrapplingGun + - WeaponTetherGun + - WeaponForceGun + - WeaponProtoKineticAccelerator + - MiningDrill + - HandHeldMassScanner + # Shuttle building + - ShuttleConsoleCircuitboard + - RadarConsoleCircuitboard + - ThrusterMachineCircuitboard + - GyroscopeMachineCircuitboard + - MiniGravityGeneratorCircuitboard + - ShuttleGunKineticCircuitboard + # Machines and computers + - CargoTelepadMachineCircuitboard + - OreProcessorMachineCircuitboard + # NOTE: advanced tools, industrial ore processor, expeds board are not added here as those are the very few things epi provides for cargo + - type: MaterialStorage + whitelist: + tags: + - Sheet + - RawMaterial + - Ingot + + +- type: entity + id: ServiceTechFab + parent: BaseLatheLube + name: service techfab + description: A specialized techfab used for printing various quality-of-life tools. + components: + - type: Sprite + sprite: Structures/Machines/techfab.rsi + layers: + - state: icon + map: ["enum.LatheVisualLayers.IsRunning"] + - state: service + - state: unlit + shader: unshaded + map: ["enum.PowerDeviceVisualLayers.Powered"] + - state: inserting + map: ["enum.MaterialStorageVisualLayers.Inserting"] + - state: panel + map: ["enum.WiresVisualLayers.MaintenancePanel"] + - type: Machine + board: ServiceTechFabCircuitboard + - type: Lathe + idleState: icon + runningState: icon + staticRecipes: + - HandheldStationMap + - ShockCollar + - CustomDrinkJug + - LeashBasic + - ShortLeash + - CellRechargerCircuitboard + - WeaponCapacitorRechargerCircuitboard + - Beaker + - LargeBeaker + - Syringe + - HandLabeler + - Signaller + - SprayBottle + - MopItem + - Bucket + - Holoprojector + dynamicRecipes: + # Tools + - ClothingShoesBootsSpeed + - BluespaceBeaker + - AdvMopItem + - WeaponSprayNozzle + - ClothingBackpackWaterTank + - MegaSprayBottle + # Machines and computers + - SeedExtractorMachineCircuitboard + - HydroponicsTrayMachineCircuitboard + - ReagentGrinderIndustrialMachineCircuitboard + - ComputerTelevisionCircuitboard + - SynthesizerInstrument + - DawInstrumentMachineCircuitboard + - MassMediaCircuitboard + - JukeboxCircuitBoard + - FatExtractorMachineCircuitboard + # Translators + - CanilunztTranslator + - BubblishTranslator + - NekomimeticTranslator + - DraconicTranslator + - SolCommonTranslator + - RootSpeakTranslator + - BasicGalaticCommonTranslatorImplanter + - MofficTranslator + - ArachnicTranslator + # Tiles + - FauxTileAstroGrass + - FauxTileMowedAstroGrass + - FauxTileJungleAstroGrass + - FauxTileAstroIce + - FauxTileAstroSnow + - type: MaterialStorage + whitelist: + tags: + - Sheet + - RawMaterial + - Ingot + +# === +# Floof section end + - type: entity parent: BaseLathe id: UniformPrinter diff --git a/Resources/Prototypes/Floof/Body/Parts/resomi.yml b/Resources/Prototypes/Floof/Body/Parts/resomi.yml new file mode 100644 index 00000000000..70f215e40da --- /dev/null +++ b/Resources/Prototypes/Floof/Body/Parts/resomi.yml @@ -0,0 +1,90 @@ +- type: entity + id: TorsoResomi + name: "resomi torso" + parent: TorsoHuman + components: + - type: Sprite + sprite: Floof/Mobs/Species/Resomi/parts.rsi + state: "torso_m" + + +- type: entity + id: HeadResomi + name: "resomi head" + parent: HeadHuman + components: + - type: Sprite + sprite: Floof/Mobs/Species/Resomi/parts.rsi + state: "head_m" + +- type: entity + id: LeftArmResomi + name: "left resomi arm" + parent: LeftArmHuman + components: + - type: Sprite + sprite: Floof/Mobs/Species/Resomi/parts.rsi + state: "l_arm" + +- type: entity + id: RightArmResomi + name: "right resomi arm" + parent: RightArmHuman + components: + - type: Sprite + sprite: Floof/Mobs/Species/Resomi/parts.rsi + state: "r_arm" + +- type: entity + id: LeftHandResomi + name: "left resomi hand" + parent: LeftHandHuman + components: + - type: Sprite + sprite: Floof/Mobs/Species/Resomi/parts.rsi + state: "l_hand" + +- type: entity + id: RightHandResomi + name: "right resomi hand" + parent: RightHandHuman + components: + - type: Sprite + sprite: Floof/Mobs/Species/Resomi/parts.rsi + state: "r_hand" + +- type: entity + id: LeftLegResomi + name: "left resomi leg" + parent: LeftLegHuman + components: + - type: Sprite + sprite: Floof/Mobs/Species/Resomi/parts.rsi + state: "l_leg" + +- type: entity + id: RightLegResomi + name: "right resomi leg" + parent: RightLegHuman + components: + - type: Sprite + sprite: Floof/Mobs/Species/Resomi/parts.rsi + state: "r_leg" + +- type: entity + id: LeftFootResomi + name: "left resomi foot" + parent: LeftFootHuman + components: + - type: Sprite + sprite: Floof/Mobs/Species/Resomi/parts.rsi + state: "l_foot" + +- type: entity + id: RightFootResomi + name: "right resomi foot" + parent: RightFootHuman + components: + - type: Sprite + sprite: Floof/Mobs/Species/Resomi/parts.rsi + state: "r_foot" diff --git a/Resources/Prototypes/Floof/Body/Prototypes/resomi.yml b/Resources/Prototypes/Floof/Body/Prototypes/resomi.yml new file mode 100644 index 00000000000..17de08da631 --- /dev/null +++ b/Resources/Prototypes/Floof/Body/Prototypes/resomi.yml @@ -0,0 +1,49 @@ +- type: body + id: Resomi + name: "resomi" + root: torso + slots: + head: + part: HeadResomi + connections: + - torso + organs: + brain: OrganHumanBrain + eyes: OrganHumanEyes + torso: + part: TorsoResomi + connections: + - right_arm + - left_arm + - right_leg + - left_leg + organs: + heart: OrganHumanHeart + lungs: OrganHumanLungs + stomach: OrganHumanStomach + liver: OrganHumanLiver + kidneys: OrganHumanKidneys + right_arm: + part: RightArmResomi + connections: + - right_hand + left_arm: + part: LeftArmResomi + connections: + - left_hand + right_hand: + part: RightHandResomi + left_hand: + part: LeftHandResomi + right_leg: + part: RightLegResomi + connections: + - right_foot + left_leg: + part: LeftLegResomi + connections: + - left_foot + right_foot: + part: RightFootResomi + left_foot: + part: LeftFootResomi diff --git a/Resources/Prototypes/Floof/CharacterItemGroups/uniformGroup.yml b/Resources/Prototypes/Floof/CharacterItemGroups/uniformGroup.yml index cc849674220..f2c6ef28dd6 100644 --- a/Resources/Prototypes/Floof/CharacterItemGroups/uniformGroup.yml +++ b/Resources/Prototypes/Floof/CharacterItemGroups/uniformGroup.yml @@ -191,7 +191,7 @@ - type: loadout id: LoadoutClothingJumpsuitSuitWhiteMob - type: loadout - id: LoadoutUniformLoinCloth + id: ClothingUniformNudityPermit - type: loadout id: LoadoutUniformJumpskirtTacticalMaid - type: loadout diff --git a/Resources/Prototypes/Floof/Datasets/Names/resomi_female.yml b/Resources/Prototypes/Floof/Datasets/Names/resomi_female.yml new file mode 100644 index 00000000000..74417a83cb4 --- /dev/null +++ b/Resources/Prototypes/Floof/Datasets/Names/resomi_female.yml @@ -0,0 +1,53 @@ +- type: dataset + id: names_resomi_female + values: + - Ealia + - Shirema + - Nathani + - Ralise + - Leesche + - Rianea + - Niescha + - Elime + - Nasira + - Taschene + - Melira + - Relea + - Shilima + - Niaresa + - Lirica + - Shirele + - Calea + - Mesira + - Canira + - Leshane + - Eanira + - Taschale + - Ralima + - Shilera + - Nielise + - Eshani + - Lishaca + - Reenira + - Shianea + - Melise + - Tishina + - Ralene + - Shireta + - Nacira + - Eashira + - Lianese + - Melea + - Shilase + - Nialima + - Eshaca + - Tashira + - Meliana + - Ralise + - Shilene + - Nacima + - Canese + - Lishira + - Raleca + - Shirema + - Nialea diff --git a/Resources/Prototypes/Floof/Datasets/Names/resomi_male.yml b/Resources/Prototypes/Floof/Datasets/Names/resomi_male.yml new file mode 100644 index 00000000000..4e42b375d83 --- /dev/null +++ b/Resources/Prototypes/Floof/Datasets/Names/resomi_male.yml @@ -0,0 +1,53 @@ +- type: dataset + id: names_resomi_male + values: + - Tevan + - Nialor + - Marik + - Auaris + - Ischat + - Laton + - Memar + - Minax + - Aenir + - Ceiran + - Aitor + - Sisan + - Tevar + - Nialen + - Maris + - Aurok + - Ischar + - Latim + - Merek + - Minar + - Aenin + - Ceitan + - Aisen + - Sitar + - Tevik + - Nialus + - Marion + - Auric + - Ischen + - Latir + - Menar + - Minet + - Aenor + - Ceilon + - Aider + - Sisar + - Tevon + - Nialum + - Marik + - Aurar + - Ischam + - Latir + - Menis + - Minok + - Aenim + - Ceiran + - Aithar + - Sinar + - Tevor + - Nialom diff --git a/Resources/Prototypes/Floof/Entities/Clothing/Head/hoods.yml b/Resources/Prototypes/Floof/Entities/Clothing/Head/hoods.yml new file mode 100644 index 00000000000..26d5a555f65 --- /dev/null +++ b/Resources/Prototypes/Floof/Entities/Clothing/Head/hoods.yml @@ -0,0 +1,16 @@ +- type: entity + parent: ClothingHeadBase + id: ClothingHeadHatHoodRedHood + name: Red Hood + description: A hood of a red cloak, made to keep the harsh light out of a traveler's eyes. Sometimes it sparkles in the light of the sun. + components: + - type: Sprite + sprite: Floof/Clothing/Head/Hoods/redhood.rsi + - type: Clothing + sprite: Floof/Clothing/Head/Hoods/redhood.rsi + - type: Tag + tags: + - WhitelistChameleon + - type: HideLayerClothing + slots: + - Hair diff --git a/Resources/Prototypes/Floof/Entities/Clothing/Neck/amulet.yml b/Resources/Prototypes/Floof/Entities/Clothing/Neck/amulet.yml new file mode 100644 index 00000000000..a4a3a2edd54 --- /dev/null +++ b/Resources/Prototypes/Floof/Entities/Clothing/Neck/amulet.yml @@ -0,0 +1,144 @@ + +- type: entity + parent: ClothingNeckBase + id: ClothingNeckDragonAmuletPolymorph + name: dragon amulet + description: A beautiful gold amulet, featuring a ruby that shines with an otherworldly glow. + components: + - type: Sprite + sprite: Floof/Clothing/Neck/amulet_dragon.rsi + - type: Clothing + sprite: Floof/Clothing/Neck/amulet_dragon.rsi + - type: PolymorphProvider + polymorph: PolymorphDragonRubyFang + +- type: polymorph + id: PolymorphDragonRubyFang + configuration: + entity: MobDragonRubyFang + forced: false + inventory: None + transferName: true + transferDamage: true + revertOnCrit: true + revertOnDeath: true + +- type: entity + parent: [ SimpleSpaceMobBase, FlyingMobBase ] + id: MobDragonRubyFang + suffix: "" + name: Rubyfang + description: A giant dragon, probably a couple thousand years old. + components: + - type: Bloodstream + bloodMaxVolume: 650 + - type: Speech + speechVerb: LargeMob + - type: CombatMode + - type: MobMover + - type: InputMover + - type: MovementSpeedModifier + baseWalkSpeed: 3 + baseSprintSpeed: 5 + weightlessModifier: 1.5 + - type: Sprite + color: "#cc0000ff" + sprite: Mobs/Aliens/Carps/dragon.rsi + noRot: true + layers: + - map: [ "enum.DamageStateVisualLayers.Base" ] + state: alive + - map: [ "enum.DamageStateVisualLayers.BaseUnshaded" ] + state: alive-unshaded + shader: unshaded + - type: Appearance + - type: DamageStateVisuals + states: + Alive: + Base: alive + BaseUnshaded: alive-unshaded + Critical: + Base: crit + Dead: + Base: dead + BaseUnshaded: dead-unshaded + - type: Physics + bodyType: KinematicController + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeCircle + radius: 0.40 + density: 100 + mask: + - FlyingMobMask + layer: + - FlyingMobLayer + - type: MobState + - type: MobStateActions + actions: + Critical: + - ActionCritSuccumb + - ActionCritLastWords + - type: MobThresholds + thresholds: + 0: Alive + 450: Critical + 500: Dead + - type: SlowOnDamage + speedModifierThresholds: + 250: 0.7 + 400: 0.5 + # disable taking damage from fire, since its a fire breathing dragon + - type: Flammable + damage: + types: {} + - type: Temperature + heatDamageThreshold: 800 + - type: Metabolizer + solutionOnBody: false + updateInterval: 0.25 + metabolizerTypes: [ Dragon ] + groups: + - id: Medicine + - id: Poison + - type: Butcherable + spawned: + - id: FoodMeatDragon + amount: 2 + - type: InteractionPopup + successChance: 0.25 # It's no goose, but you better smell like carp. + interactSuccessString: petting-success-dragon + interactFailureString: petting-failure-dragon + interactFailureSound: + path: /Audio/Animals/space_dragon_roar.ogg + soundPerceivedByOthers: false # A 75% chance for a loud roar would get old fast. + - type: MeleeWeapon + altDisarm: false + soundHit: + path: /Audio/Weapons/Xeno/alien_claw_flesh3.ogg + damage: + types: + Piercing: 15 + Slash: 15 + - type: Devourer + foodPreference: Humanoid + shouldStoreDevoured: true + chemical: Ichor + healRate: 15.0 + whitelist: + components: + - MobState + - Door + tags: + - Wall + - type: Tag + tags: + - CannotSuicide + - DoorBumpOpener + - type: UserInterface + - type: Puller + needsHands: false + - type: Hands + diff --git a/Resources/Prototypes/Floof/Entities/Clothing/Neck/cloaks.yml b/Resources/Prototypes/Floof/Entities/Clothing/Neck/cloaks.yml new file mode 100644 index 00000000000..b19202b26d7 --- /dev/null +++ b/Resources/Prototypes/Floof/Entities/Clothing/Neck/cloaks.yml @@ -0,0 +1,16 @@ +- type: entity + parent: ClothingNeckBase + id: ClothingNeckCloakRedHood + name: Red Cloak + description: A cloak made for travel and comfort. Slightly smells of cherry pie? + components: + - type: Sprite + sprite: Floof/Clothing/Neck/Cloaks/redhood.rsi + - type: ToggleableClothing + clothingPrototype: ClothingHeadHatHoodRedHood + requiredSlot: + - neck + slot: head + - type: ContainerContainer + containers: + toggleable-clothing: !type:ContainerSlot {} diff --git a/Resources/Prototypes/Floof/Entities/Clothing/OuterClothing/suits.yml b/Resources/Prototypes/Floof/Entities/Clothing/OuterClothing/suits.yml new file mode 100644 index 00000000000..4fefbeb07c0 --- /dev/null +++ b/Resources/Prototypes/Floof/Entities/Clothing/OuterClothing/suits.yml @@ -0,0 +1,10 @@ +- type: entity # From Upstream + parent: ClothingOuterBase + id: ClothingOuterSuitWitchRobes + name: witch robes + description: Magic is all about the spell power, ZE! + components: + - type: Sprite + sprite: Floof/Clothing/OuterClothing/Suits/witchrobe.rsi + - type: Clothing + sprite: Floof/Clothing/OuterClothing/Suits/witchrobe.rsi diff --git a/Resources/Prototypes/Floof/Entities/Clothing/Uniforms/base_uniform.yml b/Resources/Prototypes/Floof/Entities/Clothing/Uniforms/base_uniform.yml index 9b494e2a90c..6cb7ef3ee5a 100644 --- a/Resources/Prototypes/Floof/Entities/Clothing/Uniforms/base_uniform.yml +++ b/Resources/Prototypes/Floof/Entities/Clothing/Uniforms/base_uniform.yml @@ -5,7 +5,6 @@ components: - type: Clothing slots: [innerclothing, outerClothing] - femaleMask: UniformTop - type: Tag tags: - ClothMade # Delta-V - allows moths to eat this @@ -17,7 +16,6 @@ components: - type: Clothing slots: [innerclothing, outerClothing] - femaleMask: UniformTop - type: Tag #DeltaV, needed for species with nonhuman legs/can only wear skirts tags: - Skirt diff --git a/Resources/Prototypes/Floof/Entities/Clothing/Uniforms/misc.yml b/Resources/Prototypes/Floof/Entities/Clothing/Uniforms/misc.yml index d2f71ff596f..1ec08bb7508 100644 --- a/Resources/Prototypes/Floof/Entities/Clothing/Uniforms/misc.yml +++ b/Resources/Prototypes/Floof/Entities/Clothing/Uniforms/misc.yml @@ -1,15 +1,15 @@ - type: entity parent: ClothingUniformBase - id: ClothingUniformLoinCloth - name: loin cloth - description: A piece of cloth wrapped around the waist. + id: ClothingUniformNudityPermit + name: public nudity permit + description: This permit entitles the bearer to conduct their duties without a uniform. Normally issued to furred crewmembers or those with nothing to hide. components: - type: Item size: Small - type: Sprite - sprite: Floof/Clothing/Uniforms/loincloth.rsi + sprite: Floof/Clothing/Uniforms/nuditypermit.rsi - type: Clothing - sprite: Floof/Clothing/Uniforms/loincloth.rsi + sprite: Floof/Clothing/Uniforms/nuditypermit.rsi equipDelay: 0 unequipDelay: 0 - type: Tag #DeltaV, needed for species with nonhuman legs/can only wear skirts diff --git a/Resources/Prototypes/Floof/Entities/Mobs/Customization/Markings/resomi.yml b/Resources/Prototypes/Floof/Entities/Mobs/Customization/Markings/resomi.yml new file mode 100644 index 00000000000..d4ac6faa632 --- /dev/null +++ b/Resources/Prototypes/Floof/Entities/Mobs/Customization/Markings/resomi.yml @@ -0,0 +1,81 @@ +- type: marking + id: ResomiTail + bodyPart: Chest + markingCategory: Tail + speciesRestriction: [Resomi] + forcedColoring: true + sprites: + - sprite: Floof/Mobs/Customization/resomi_parts.rsi + state: tail + +- type: marking + id: ResomiTailFeathers + bodyPart: Chest + markingCategory: Tail + speciesRestriction: [Resomi] + sprites: + - sprite: Floof/Mobs/Customization/resomi_parts.rsi + state: tail_feathers + +- type: marking + id: ResomiLArmFeathers + bodyPart: LHand + markingCategory: LeftHand + speciesRestriction: [Resomi] + sprites: + - sprite: Floof/Mobs/Customization/resomi_parts.rsi + state: l_hand_feathers + +- type: marking + id: ResomiLLegFeathers + bodyPart: LFoot + markingCategory: LeftFoot + speciesRestriction: [Resomi] + sprites: + - sprite: Floof/Mobs/Customization/resomi_parts.rsi + state: l_foot_feathers + +- type: marking + id: ResomiRArmFeathers + bodyPart: RHand + markingCategory: RightHand + speciesRestriction: [Resomi] + sprites: + - sprite: Floof/Mobs/Customization/resomi_parts.rsi + state: r_hand_feathers + +- type: marking + id: ResomiRLegFeathers + bodyPart: RFoot + markingCategory: RightFoot + speciesRestriction: [Resomi] + sprites: + - sprite: Floof/Mobs/Customization/resomi_parts.rsi + state: r_foot_feathers + +- type: marking + id: ResomiFluff + bodyPart: Chest + markingCategory: Chest + speciesRestriction: [Resomi] + sprites: + - sprite: Floof/Mobs/Customization/resomi_parts.rsi + state: fluff + +- type: marking + id: ResomiFluffHead + bodyPart: Head + markingCategory: Head + speciesRestriction: [Resomi] + sprites: + - sprite: Floof/Mobs/Customization/resomi_parts.rsi + state: fluff_head + +- type: marking + id: ResomiFluffHeadUp + bodyPart: Head + markingCategory: Head + speciesRestriction: [Resomi] + sprites: + - sprite: Floof/Mobs/Customization/resomi_parts.rsi + state: fluff_head_up diff --git a/Resources/Prototypes/Floof/Entities/Mobs/Customization/Markings/resomi_hair.yml b/Resources/Prototypes/Floof/Entities/Mobs/Customization/Markings/resomi_hair.yml new file mode 100644 index 00000000000..231492f8a6b --- /dev/null +++ b/Resources/Prototypes/Floof/Entities/Mobs/Customization/Markings/resomi_hair.yml @@ -0,0 +1,161 @@ +- type: marking + id: HairResomiBackstrafe + bodyPart: Hair + markingCategory: Hair + speciesRestriction: [Resomi] + sprites: + - sprite: Floof/Mobs/Customization/resomi_hair.rsi + state: ResomiBackstrafe + +- type: marking + id: HairResomiBurstShort + bodyPart: Hair + markingCategory: Hair + speciesRestriction: [Resomi] + sprites: + - sprite: Floof/Mobs/Customization/resomi_hair.rsi + state: ResomiBurstShort + +- type: marking + id: HairResomiDefault + bodyPart: Hair + markingCategory: Hair + speciesRestriction: [Resomi] + sprites: + - sprite: Floof/Mobs/Customization/resomi_hair.rsi + state: ResomiDefault + +- type: marking + id: HairResomiDroopy + bodyPart: Hair + markingCategory: Hair + speciesRestriction: [Resomi] + sprites: + - sprite: Floof/Mobs/Customization/resomi_hair.rsi + state: ResomiDroopy + +- type: marking + id: HairResomiEars + bodyPart: Hair + markingCategory: Hair + speciesRestriction: [Resomi] + sprites: + - sprite: Floof/Mobs/Customization/resomi_hair.rsi + state: ResomiEars + +- type: marking + id: HairResomiFluffymohawk + bodyPart: Hair + markingCategory: Hair + speciesRestriction: [Resomi] + sprites: + - sprite: Floof/Mobs/Customization/resomi_hair.rsi + state: ResomiFluffymohawk + +- type: marking + id: HairResomiHedge + bodyPart: Hair + markingCategory: Hair + speciesRestriction: [Resomi] + sprites: + - sprite: Floof/Mobs/Customization/resomi_hair.rsi + state: ResomiHedge + +- type: marking + id: HairResomiLongway + bodyPart: Hair + markingCategory: Hair + speciesRestriction: [Resomi] + sprites: + - sprite: Floof/Mobs/Customization/resomi_hair.rsi + state: ResomiLongway + +- type: marking + id: HairResomiMane + bodyPart: Hair + markingCategory: Hair + speciesRestriction: [Resomi] + sprites: + - sprite: Floof/Mobs/Customization/resomi_hair.rsi + state: ResomiMane + +- type: marking + id: HairResomiManeBeardless + bodyPart: Hair + markingCategory: Hair + speciesRestriction: [Resomi] + sprites: + - sprite: Floof/Mobs/Customization/resomi_hair.rsi + state: ResomiManeBeardless + +- type: marking + id: HairResomiMohawk + bodyPart: Hair + markingCategory: Hair + speciesRestriction: [Resomi] + sprites: + - sprite: Floof/Mobs/Customization/resomi_hair.rsi + state: ResomiMohawk + +- type: marking + id: HairResomiMushroom + bodyPart: Hair + markingCategory: Hair + speciesRestriction: [Resomi] + sprites: + - sprite: Floof/Mobs/Customization/resomi_hair.rsi + state: ResomiMushroom + +- type: marking + id: HairResomiNotree + bodyPart: Hair + markingCategory: Hair + speciesRestriction: [Resomi] + sprites: + - sprite: Floof/Mobs/Customization/resomi_hair.rsi + state: ResomiNotree + +- type: marking + id: HairResomiSpiky + bodyPart: Hair + markingCategory: Hair + speciesRestriction: [Resomi] + sprites: + - sprite: Floof/Mobs/Customization/resomi_hair.rsi + state: ResomiSpiky + +- type: marking + id: HairResomiPointy + bodyPart: Hair + markingCategory: Hair + speciesRestriction: [Resomi] + sprites: + - sprite: Floof/Mobs/Customization/resomi_hair.rsi + state: ResomiPointy + +- type: marking + id: HairResomiTwies + bodyPart: Hair + markingCategory: Hair + speciesRestriction: [Resomi] + sprites: + - sprite: Floof/Mobs/Customization/resomi_hair.rsi + state: ResomiTwies + +- type: marking + id: HairResomiUpright + bodyPart: Hair + markingCategory: Hair + speciesRestriction: [Resomi] + sprites: + - sprite: Floof/Mobs/Customization/resomi_hair.rsi + state: ResomiUpright + +- type: marking + id: HairResomiLong + bodyPart: Hair + markingCategory: Hair + speciesRestriction: [Resomi] + sprites: + - sprite: Floof/Mobs/Customization/resomi_hair.rsi + state: ResomiLong diff --git a/Resources/Prototypes/Floof/Entities/Mobs/NPCs/scugcat.yml b/Resources/Prototypes/Floof/Entities/Mobs/NPCs/scugcat.yml index eae46ff0312..af3ee8c25e1 100644 --- a/Resources/Prototypes/Floof/Entities/Mobs/NPCs/scugcat.yml +++ b/Resources/Prototypes/Floof/Entities/Mobs/NPCs/scugcat.yml @@ -105,6 +105,7 @@ - ScugSign - Cat - type: LeashAnchor # Floofstation + - type: Vore - type: palette id: ScugCatColors diff --git a/Resources/Prototypes/Floof/Entities/Mobs/Player/resomi.yml b/Resources/Prototypes/Floof/Entities/Mobs/Player/resomi.yml new file mode 100644 index 00000000000..24da066ca4a --- /dev/null +++ b/Resources/Prototypes/Floof/Entities/Mobs/Player/resomi.yml @@ -0,0 +1,5 @@ +- type: entity + save: false + name: Urist McRaptor + parent: BaseMobResomi + id: MobResomi diff --git a/Resources/Prototypes/Floof/Entities/Mobs/Species/resomi.yml b/Resources/Prototypes/Floof/Entities/Mobs/Species/resomi.yml new file mode 100644 index 00000000000..ddbe45fd288 --- /dev/null +++ b/Resources/Prototypes/Floof/Entities/Mobs/Species/resomi.yml @@ -0,0 +1,132 @@ +- type: entity + save: false + name: Urist McRaptor + parent: BaseMobHuman + id: BaseMobResomi + abstract: true + components: + - type: LanguageKnowledge + speaks: + - TauCetiBasic + understands: + - TauCetiBasic + - type: Fixtures + fixtures: + fix1: + shape: !type:PhysShapeCircle + radius: 0.35 + density: 185 + restitution: 0.0 + mask: + - MobMask + layer: + - MobLayer + - type: DamageVisuals + thresholds: [ 10, 30, 50, 70 ] + damageOverlayGroups: + Brute: + sprite: Floof/Mobs/Effects/Resomi/brute_damage.rsi + color: "#C048C2" + Burn: + sprite: Floof/Mobs/Effects/Resomi/burn_damage.rsi + - type: FireVisuals + sprite: Floof/Mobs/Effects/onfire.rsi + normalState: Resomi_minor_burning + alternateState: Resomi_burning + - type: HumanoidAppearance + species: Resomi + - type: Icon + sprite: Floof/Mobs/Species/Resomi/parts.rsi + state: full + - type: Body + prototype: Resomi + requiredLegs: 2 + - type: Speech + speechVerb: Parrot + speechSounds: MaleAvali + - type: Vocal + sounds: + Male: MaleAvali + Unsexed: MaleAvali + Female: FemaleAvali + - type: Hands + handDisplacement: + sizeMaps: + 32: + sprite: Floof/Mobs/Species/Resomi/displacement.rsi + state: inHand + - type: Inventory + speciesId: resomi + displacements: + jumpsuit: + sizeMaps: + 32: + sprite: Floof/Mobs/Species/Resomi/displacement.rsi + state: jumpsuit + eyes: + sizeMaps: + 32: + sprite: Floof/Mobs/Species/Resomi/displacement.rsi + state: eyes + gloves: + sizeMaps: + 32: + sprite: Floof/Mobs/Species/Resomi/displacement.rsi + state: hands + head: + sizeMaps: + 32: + sprite: Floof/Mobs/Species/Resomi/displacement.rsi + state: head + back: + sizeMaps: + 32: + sprite: Floof/Mobs/Species/Resomi/displacement.rsi + state: back + ears: + sizeMaps: + 32: + sprite: Floof/Mobs/Species/Resomi/displacement.rsi + state: ears + shoes: + sizeMaps: + 32: + sprite: Floof/Mobs/Species/Resomi/displacement.rsi + state: feet + neck: + sizeMaps: + 32: + sprite: Floof/Mobs/Species/Resomi/displacement.rsi + state: neck + mask: + sizeMaps: + 32: + sprite: Floof/Mobs/Species/Resomi/displacement.rsi + state: mask + suitstorage: + sizeMaps: + 32: + sprite: Floof/Mobs/Species/Resomi/displacement.rsi + state: suitStorage + belt: + sizeMaps: + 32: + sprite: Floof/Mobs/Species/Resomi/displacement.rsi + state: belt + +- type: entity + parent: BaseSpeciesDummy + id: MobResomiDummy + noSpawn: true + description: A dummy resomi meant to be used in character setup. + components: + - type: HumanoidAppearance + species: Resomi + - type: Inventory + speciesId: Resomi + displacements: + jumpsuit: + sizeMaps: + 32: + sprite: Floof/Mobs/Species/Resomi/displacement.rsi + state: jumpsuit diff --git a/Resources/Prototypes/Floof/Entities/Objects/Weapons/Melee.yml b/Resources/Prototypes/Floof/Entities/Objects/Weapons/Melee.yml new file mode 100644 index 00000000000..99c1d707ea3 --- /dev/null +++ b/Resources/Prototypes/Floof/Entities/Objects/Weapons/Melee.yml @@ -0,0 +1,83 @@ +- type: entity + name: brass knuckles + parent: ClothingHandsBase + id: WeaponBrassKnuckles + description: Ever wanted to protect your bar but your hands are too big for guns? S.E.S.W.C has what you need! + components: + - type: Sprite + sprite: Floof/Objects/Weapons/Melee/brassknuckles.rsi + state: icon + - type: Clothing + sprite: Floof/Objects/Weapons/Melee/brassknuckles.rsi + - type: MeleeWeapon + autoAttack: true + attackRate: 2 # ~12 dps + damage: + types: + Blunt: 6 + soundHit: + collection: Punch + animation: WeaponArcFist + mustBeEquippedToUse: true + - type: StaminaDamageOnHit + damage: 11 + - type: Armor + modifiers: + coefficients: + Shock: 1.05 # oh no so conductive + - type: Insulated + coefficient: 1.5 # Extra damage. Don't punch wires, kids. + - type: Tag + tags: + - WhitelistChameleon + - BrassKnuckles + - type: PhysicalComposition + materialComposition: + Brass: 1000 + - type: StaticPrice + price: 300 # Ensures these can be sold and have a reasonable vending value. + +- type: entity + name: improvised brass knuckles + parent: WeaponBrassKnuckles + id: WeaponBrassKnucklesImprovised + description: Ever wanted to punch just a little harder? + components: + - type: MeleeWeapon + attackRate: 1.6 # ~9.6 dps + - type: Construction + graph: GraphWeaponBrassKnucklesImprovised + node: WeaponBrassKnucklesImprovised + +- type: entity + name: crass knuckles + parent: WeaponBrassKnuckles + id: WeaponBrassKnucklesWhoopie + description: Questionably silent, questionably deadly. + components: + - type: Sprite + sprite: Floof/Objects/Weapons/Melee/crassknuckles.rsi + state: icon + - type: Clothing + sprite: Floof/Objects/Weapons/Melee/crassknuckles.rsi + - type: MeleeWeapon + damage: + types: + Blunt: 0 # ~0 dps :^) + Structural: 0 + soundHit: + collection: Parp + - type: Construction + graph: GraphWeaponBrassKnucklesWhoopie + node: WeaponBrassKnucklesWhoopie + - type: StaminaDamageOnHit + damage: 4 # 8 per second, similar to the toy hammer + - type: Armor + modifiers: + coefficients: + Shock: 1.0 # Nothing special. + - type: Insulated + coefficient: 1 # Nothing special. + - type: Tag + tags: + - WhitelistChameleon diff --git a/Resources/Prototypes/Language/Floof/scugsign.yml b/Resources/Prototypes/Floof/Language/scugsign.yml similarity index 100% rename from Resources/Prototypes/Language/Floof/scugsign.yml rename to Resources/Prototypes/Floof/Language/scugsign.yml diff --git a/Resources/Prototypes/Floof/Loadouts/Jobs/service.yml b/Resources/Prototypes/Floof/Loadouts/Jobs/service.yml index cc705a5b550..1525401c478 100644 --- a/Resources/Prototypes/Floof/Loadouts/Jobs/service.yml +++ b/Resources/Prototypes/Floof/Loadouts/Jobs/service.yml @@ -288,6 +288,21 @@ jobs: - Janitor +- type: loadout + id: LoadoutClothingNeckCloakJanitor + category: JobsServiceUncategorized + cost: 2 + exclusive: true + requirements: + - !type:CharacterJobRequirement + jobs: + - Janitor + - !type:CharacterPlaytimeRequirement + tracker: JobJanitor + min: 36000 # 10 hours + items: + - ClothingNeckCloakJanitor + #TO BE ADDED - Botanist #TO BE ADDED - Reporter diff --git a/Resources/Prototypes/Floof/Loadouts/neck.yml b/Resources/Prototypes/Floof/Loadouts/neck.yml index 482270e6dbf..93b5a9ef2ad 100644 --- a/Resources/Prototypes/Floof/Loadouts/neck.yml +++ b/Resources/Prototypes/Floof/Loadouts/neck.yml @@ -9,6 +9,17 @@ - !type:CharacterItemGroupRequirement group: LoadoutNeck2 +- type: loadout + id: LoadoutItemsNeckRedHood + category: Neck + cost: 1 + exclusive: true + items: + - ClothingNeckCloakRedHood + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutNeck2 + # Generic collars - type: loadout id: LoadoutItemsNeckBlueCollar diff --git a/Resources/Prototypes/Floof/Loadouts/outerClothing.yml b/Resources/Prototypes/Floof/Loadouts/outerClothing.yml index 9bb5ec1c9c6..d6e9f3e0a12 100644 --- a/Resources/Prototypes/Floof/Loadouts/outerClothing.yml +++ b/Resources/Prototypes/Floof/Loadouts/outerClothing.yml @@ -87,3 +87,13 @@ requirements: - !type:CharacterItemGroupRequirement group: LoadoutOuter2 + +- type: loadout + id: LoadoutClothingOuterSuitWitchRobes + category: Outer + cost: 1 + items: + - ClothingOuterSuitWitchRobes + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutOuter2 diff --git a/Resources/Prototypes/Floof/Loadouts/uniform.yml b/Resources/Prototypes/Floof/Loadouts/uniform.yml index 594ba4be582..ff05e91742e 100644 --- a/Resources/Prototypes/Floof/Loadouts/uniform.yml +++ b/Resources/Prototypes/Floof/Loadouts/uniform.yml @@ -1,10 +1,10 @@ - type: loadout - id: LoadoutUniformLoinCloth + id: ClothingUniformNudityPermit category: Uniform cost: 0 exclusive: true items: - - ClothingUniformLoinCloth + - ClothingUniformNudityPermit requirements: - !type:CharacterItemGroupRequirement group: LoadoutUniformsCivilian2 diff --git a/Resources/Prototypes/Floof/Recipes/Crafting/Graphs/brassknuckles_graph.yml b/Resources/Prototypes/Floof/Recipes/Crafting/Graphs/brassknuckles_graph.yml new file mode 100644 index 00000000000..8ea26290021 --- /dev/null +++ b/Resources/Prototypes/Floof/Recipes/Crafting/Graphs/brassknuckles_graph.yml @@ -0,0 +1,36 @@ +- type: constructionGraph + id: GraphWeaponBrassKnucklesImprovised + start: start + graph: + - node: start + edges: + - to: WeaponBrassKnucklesImprovised + steps: + - material: Brass + amount: 10 + doAfter: 4 + - node: WeaponBrassKnucklesImprovised + entity: WeaponBrassKnucklesImprovised + +- type: constructionGraph + id: GraphWeaponBrassKnucklesWhoopie + start: start + graph: + - node: start + edges: + - to: WeaponBrassKnucklesWhoopie + steps: + - tag: BrassKnuckles + icon: + sprite: Floof/Objects/Weapons/Melee/brassknuckles.rsi + state: icon + name: brass knuckles + doAfter: 2 + - tag: WhoopieCushion + icon: + sprite: Objects/Fun/whoopie.rsi + state: icon + name: whoopie cushion + doAfter: 2 + - node: WeaponBrassKnucklesWhoopie + entity: WeaponBrassKnucklesWhoopie diff --git a/Resources/Prototypes/Floof/Recipes/Crafting/improvised.yml b/Resources/Prototypes/Floof/Recipes/Crafting/improvised.yml index a89e5f5e418..f4fa65485e6 100644 --- a/Resources/Prototypes/Floof/Recipes/Crafting/improvised.yml +++ b/Resources/Prototypes/Floof/Recipes/Crafting/improvised.yml @@ -24,3 +24,29 @@ sprite: Floof/Structures/sleepingbag.rsi state: open objectType: Item + +- type: construction + name: improvised brass knuckles + id: BrassKnucklesImprovised + graph: GraphWeaponBrassKnucklesImprovised + startNode: start + targetNode: WeaponBrassKnucklesImprovised + category: construction-category-weapons + description: Ever wanted to punch just a little harder? + icon: + sprite: Floof/Objects/Weapons/Melee/brassknuckles.rsi + state: icon + objectType: Item + +- type: construction + name: crass knuckles + id: CrassKnuckles + graph: GraphWeaponBrassKnucklesWhoopie + startNode: start + targetNode: WeaponBrassKnucklesWhoopie + category: construction-category-weapons + description: Questionably silent, unquestionably deadly. + icon: + sprite: Floof/Objects/Weapons/Melee/crassknuckles.rsi + state: icon + objectType: Item diff --git a/Resources/Prototypes/Floof/Roles/Jobs/Wildcards/anomaly.yml b/Resources/Prototypes/Floof/Roles/Jobs/Wildcards/anomaly.yml index ec064f459b2..940979fdc33 100644 --- a/Resources/Prototypes/Floof/Roles/Jobs/Wildcards/anomaly.yml +++ b/Resources/Prototypes/Floof/Roles/Jobs/Wildcards/anomaly.yml @@ -25,7 +25,7 @@ - type: startingGear id: AnomalyGear equipment: - jumpsuit: ClothingUniformLoinCloth + jumpsuit: ClothingUniformNudityPermit shoes: ClothingClothWrap id: AnomalyIDCard ears: ClothingHeadsetGrey diff --git a/Resources/Prototypes/Floof/Species/resomi.yml b/Resources/Prototypes/Floof/Species/resomi.yml new file mode 100644 index 00000000000..1e8487952ae --- /dev/null +++ b/Resources/Prototypes/Floof/Species/resomi.yml @@ -0,0 +1,155 @@ +- type: species + id: Resomi + name: species-name-resomi + roundStart: true + prototype: MobResomi + sprites: MobResomiSprites + defaultSkinTone: "#faf7f7" + markingLimits: MobResomiMarkingLimits + dollPrototype: MobResomiDummy + skinColoration: Hues + maleFirstNames: names_resomi_male + femaleFirstNames: names_resomi_female + naming: First + customName: true + +- type: speciesBaseSprites + id: MobResomiSprites + sprites: + Head: MobResomiHead + Hair: MobHumanoidAnyMarking + FacialHair: MobHumanoidAnyMarking + Snout: MobHumanoidAnyMarking + Chest: MobResomiTorso + Eyes: MobResomiEyes + LArm: MobResomiLArm + RArm: MobResomiRArm + LHand: MobResomiLHand + RHand: MobResomiRHand + LLeg: MobResomiLLeg + RLeg: MobResomiRLeg + LFoot: MobResomiLFoot + RFoot: MobResomiRFoot + Tail: MobHumanoidAnyMarking + HeadTop: MobHumanoidAnyMarking + HeadSide: MobHumanoidAnyMarking + +- type: markingPoints + id: MobResomiMarkingLimits + onlyWhitelisted: true + points: + Hair: + points: 1 + required: false + Tail: + points: 1 + required: true + defaultMarkings: [ ResomiTail, ResomiTailFeathers ] + Head: + points: 2 + required: false + Chest: + points: 1 + required: false + RightFoot: + points: 1 + required: false + LeftFoot: + points: 1 + required: false + RightHand: + points: 1 + required: false + LeftHand: + points: 1 + required: false + +- type: humanoidBaseSprite + id: MobResomiEyes + baseSprite: + sprite: Floof/Mobs/Customization/eyes.rsi + state: resomi + +- type: humanoidBaseSprite + id: MobResomiHead + baseSprite: + sprite: Floof/Mobs/Species/Resomi/parts.rsi + state: head_m + +- type: humanoidBaseSprite + id: MobResomiHeadMale + baseSprite: + sprite: Floof/Mobs/Species/Resomi/parts.rsi + state: head_m + +- type: humanoidBaseSprite + id: MobResomiHeadFemale + baseSprite: + sprite: Floof/Mobs/Species/Resomi/parts.rsi + state: head_f + +- type: humanoidBaseSprite + id: MobResomiTorso + baseSprite: + sprite: Floof/Mobs/Species/Resomi/parts.rsi + state: torso_m + +- type: humanoidBaseSprite + id: MobResomiTorsoMale + baseSprite: + sprite: Floof/Mobs/Species/Resomi/parts.rsi + state: torso_m + +- type: humanoidBaseSprite + id: MobResomiTorsoFemale + baseSprite: + sprite: Floof/Mobs/Species/Resomi/parts.rsi + state: torso_f + +- type: humanoidBaseSprite + id: MobResomiLLeg + baseSprite: + sprite: Floof/Mobs/Species/Resomi/parts.rsi + state: l_leg + +- type: humanoidBaseSprite + id: MobResomiLArm + baseSprite: + sprite: Floof/Mobs/Species/Resomi/parts.rsi + state: l_arm + +- type: humanoidBaseSprite + id: MobResomiLHand + baseSprite: + sprite: Floof/Mobs/Species/Resomi/parts.rsi + state: l_hand + +- type: humanoidBaseSprite + id: MobResomiLFoot + baseSprite: + sprite: Floof/Mobs/Species/Resomi/parts.rsi + state: l_foot + +- type: humanoidBaseSprite + id: MobResomiRLeg + baseSprite: + sprite: Floof/Mobs/Species/Resomi/parts.rsi + state: r_leg + +- type: humanoidBaseSprite + id: MobResomiRArm + baseSprite: + sprite: Floof/Mobs/Species/Resomi/parts.rsi + state: r_arm + +- type: humanoidBaseSprite + id: MobResomiRHand + baseSprite: + sprite: Floof/Mobs/Species/Resomi/parts.rsi + state: r_hand + +- type: humanoidBaseSprite + id: MobResomiRFoot + baseSprite: + sprite: Floof/Mobs/Species/Resomi/parts.rsi + state: r_foot diff --git a/Resources/Prototypes/Floof/Traits/mental.yml b/Resources/Prototypes/Floof/Traits/mental.yml new file mode 100644 index 00000000000..237bb819ea2 --- /dev/null +++ b/Resources/Prototypes/Floof/Traits/mental.yml @@ -0,0 +1,34 @@ +- type: trait + id: HypnoticGaze + category: Mental + points: -2 + psionicPowers: + - HypnosisPower + requirements: + - !type:CharacterLogicOrRequirement + requirements: + - !type:CharacterTraitRequirement + traits: + - LatentPsychic + - !type:CharacterJobRequirement + jobs: + - Chaplain + - Librarian + - !type:CharacterLogicOrRequirement + requirements: + - !type:CharacterSpeciesRequirement + inverted: true + species: + - IPC + - !type:CharacterTraitRequirement + traits: + - AnomalousPositronics + - !type:CharacterLogicOrRequirement + requirements: + - !type:CharacterSpeciesRequirement + inverted: true + species: + - Shadowkin + - !type:CharacterJobRequirement + jobs: + - Anomaly diff --git a/Resources/Prototypes/Floof/Voice/avali_emote_sounds.yml b/Resources/Prototypes/Floof/Voice/avali_emote_sounds.yml new file mode 100644 index 00000000000..cdd253a8464 --- /dev/null +++ b/Resources/Prototypes/Floof/Voice/avali_emote_sounds.yml @@ -0,0 +1,76 @@ +- type: soundCollection + id: AvaliScreams + files: + - /Audio/Floof/Voice/Avali/avali_scream.ogg + +- type: emoteSounds + id: MaleAvali + params: + variation: 0.125 + sounds: + Scream: + collection: AvaliScreams + Laugh: + collection: MaleLaugh + Sneeze: + collection: MaleSneezes + Cough: + collection: MaleCoughs + CatMeow: + collection: CatMeows + CatHisses: + collection: CatHisses + MonkeyScreeches: + collection: MonkeyScreeches + RobotBeep: + collection: RobotBeeps + Yawn: + collection: MaleYawn + Snore: + collection: Snores + Honk: + collection: BikeHorn + Sigh: + collection: MaleSigh + Crying: + collection: MaleCry + Whistle: + collection: Whistles + Weh: + collection: Weh + +- type: emoteSounds + id: FemaleAvali + params: + variation: 0.125 + sounds: + Scream: + collection: AvaliScreams + Laugh: + collection: FemaleLaugh + Sneeze: + collection: FemaleSneezes + Cough: + collection: FemaleCoughs + CatMeow: + collection: CatMeows + CatHisses: + collection: CatHisses + MonkeyScreeches: + collection: MonkeyScreeches + RobotBeep: + collection: RobotBeeps + Yawn: + collection: FemaleYawn + Snore: + collection: Snores + Honk: + collection: CluwneHorn + Sigh: + collection: FemaleSigh + Crying: + collection: FemaleCry + Whistle: + collection: Whistles + Weh: + collection: Weh diff --git a/Resources/Prototypes/Floof/Voice/avali_speech_sounds.yml b/Resources/Prototypes/Floof/Voice/avali_speech_sounds.yml new file mode 100644 index 00000000000..33bc33fb236 --- /dev/null +++ b/Resources/Prototypes/Floof/Voice/avali_speech_sounds.yml @@ -0,0 +1,18 @@ +- type: speechSounds + id: MaleAvali + saySound: + path: /Audio/Floof/Voice/Avali/avali_1.ogg + askSound: + path: /Audio/Floof/Voice/Avali/avali_1_ask.ogg + exclaimSound: + path: /Audio/Floof/Voice/Avali/avali_1_exclaim.ogg + +# Unused but if we get diff supprot for it can add in +- type: speechSounds + id: FemaleAvali + saySound: + path: /Audio/Floof/Voice/Avali/avali_2.ogg + askSound: + path: /Audio/Floof/Voice/Avali/avali_2_ask.ogg + exclaimSound: + path: /Audio/Floof/Voice/Avali/avali_2_exclaim.ogg diff --git a/Resources/Prototypes/Floof/psionics.yml b/Resources/Prototypes/Floof/psionics.yml index 159b0bab631..3f8ba398ed6 100644 --- a/Resources/Prototypes/Floof/psionics.yml +++ b/Resources/Prototypes/Floof/psionics.yml @@ -8,5 +8,4 @@ - type: PsionicHypno initializationFeedback: hypnosis-power-initialization-feedback metapsionicFeedback: hypnosis-power-feedback - amplificationModifier: 1 - powerSlotCost: 1 + powerSlotCost: 0 diff --git a/Resources/Prototypes/GameRules/roundstart.yml b/Resources/Prototypes/GameRules/roundstart.yml index 991b677bcb1..869c80e5414 100644 --- a/Resources/Prototypes/GameRules/roundstart.yml +++ b/Resources/Prototypes/GameRules/roundstart.yml @@ -261,7 +261,6 @@ startingSlope: 0.2 downwardsLimit: -0.35 upwardsLimit: 0.4 - # More likely to go down than up, so calmness prevails - type: entity id: IrregularExtendedStationEventScheduler @@ -274,9 +273,7 @@ startingSlope: -1 downwardsLimit: -0.4 upwardsLimit: 0.3 - downwardsBias: -1.1 - upwardsBias: 0.9 - + # variation passes - type: entity id: BasicRoundstartVariation diff --git a/Resources/Prototypes/Language/animal.yml b/Resources/Prototypes/Language/animal.yml index 46178200011..82f4d627497 100644 --- a/Resources/Prototypes/Language/animal.yml +++ b/Resources/Prototypes/Language/animal.yml @@ -184,3 +184,16 @@ - iss - ss - is + +- type: language + id: Penguin + obfuscation: + !type:SyllableObfuscation + minSyllables: 2 + maxSyllables: 3 + replacement: # I'm out of ideas + - pen + - peng + - won + - wonk + - wong diff --git a/Resources/Prototypes/Loadouts/Jobs/service.yml b/Resources/Prototypes/Loadouts/Jobs/service.yml index c0f04ef151a..48cad8e7ed8 100644 --- a/Resources/Prototypes/Loadouts/Jobs/service.yml +++ b/Resources/Prototypes/Loadouts/Jobs/service.yml @@ -291,6 +291,20 @@ items: - MagazineBoxLightRifleRubber +- type: loadout # Floof + id: LoadoutServiceBartenderBoxMagnumRubber + category: JobsServiceBartender + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutBartenderAmmo + - !type:CharacterJobRequirement + jobs: + - Bartender + items: + - MagazineBoxMagnumRubber + - type: loadout id: LoadoutServiceBartenderShotgunDoubleBarreledRubber category: JobsServiceBartender @@ -319,6 +333,51 @@ items: - WeaponSniperMosinRubber +- type: loadout # Floof + id: LoadoutServiceBartenderBrassKnuckles + category: JobsServiceBartender + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutBartenderWeapon + - !type:CharacterJobRequirement + jobs: + - Bartender + - !type:CharacterSpeciesRequirement + species: + - Oni + items: + - WeaponBrassKnuckles + +- type: loadout + category: JobsServiceBartender + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutBartenderWeapon + - !type:CharacterJobRequirement + jobs: + - Bartender + id: LoadoutServiceBartenderArgentiNonlethal + items: + - WeaponRevolverArgentiNonlethal + +- type: loadout # Floof + id: LoadoutServiceBartenderRepeaterNonlethal + category: JobsServiceBartender + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutBartenderWeapon + - !type:CharacterJobRequirement + jobs: + - Bartender + items: + - WeaponSniperRepeaterNonlethal + - type: loadout id: LoadoutServiceJumpsuitBartenderNt category: JobsServiceBartender diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Uniforms/costumes.yml b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Uniforms/costumes.yml index 0ef1a5a85a3..1fd4097db99 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Uniforms/costumes.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Uniforms/costumes.yml @@ -63,8 +63,6 @@ sprite: Nyanotrasen/Clothing/Uniforms/Costume/bunny.rsi - type: Clothing sprite: Nyanotrasen/Clothing/Uniforms/Costume/bunny.rsi - # TODO: Remove the line below when the sprite accounts for FemaleMask. - femaleMask: NoMask - type: entity parent: ClothingUniformSkirtBase @@ -109,8 +107,6 @@ sprite: Nyanotrasen/Clothing/Uniforms/Costume/rat.rsi - type: Clothing sprite: Nyanotrasen/Clothing/Uniforms/Costume/rat.rsi - # TODO: Remove the line below when the sprite accounts for FemaleMask. - femaleMask: NoMask - type: entity parent: ClothingUniformSkirtBase @@ -122,7 +118,6 @@ sprite: Nyanotrasen/Clothing/Uniforms/Costume/red_dress.rsi - type: Clothing sprite: Nyanotrasen/Clothing/Uniforms/Costume/red_dress.rsi - femaleMask: NoMask - type: entity parent: ClothingUniformSkirtBase @@ -134,7 +129,6 @@ sprite: Nyanotrasen/Clothing/Uniforms/Costume/swimsuit.rsi - type: Clothing sprite: Nyanotrasen/Clothing/Uniforms/Costume/swimsuit.rsi - femaleMask: UniformTop ## old schoolgirl uniforms @@ -341,7 +335,6 @@ sprite: Nyanotrasen/Clothing/Uniforms/Costume/gakuran.rsi - type: Clothing sprite: Nyanotrasen/Clothing/Uniforms/Costume/gakuran.rsi - femaleMask: NoMask ## mnk @@ -355,7 +348,6 @@ sprite: Nyanotrasen/Clothing/Misc/office_skirt.rsi - type: Clothing sprite: Nyanotrasen/Clothing/Misc/office_skirt.rsi - femaleMask: NoMask - type: entity parent: ClothingUniformSkirtBase @@ -378,7 +370,6 @@ sprite: Nyanotrasen/Clothing/Misc/gym_bra.rsi - type: Clothing sprite: Nyanotrasen/Clothing/Misc/gym_bra.rsi - femaleMask: NoMask - type: entity parent: ClothingUniformSkirtBase @@ -390,7 +381,7 @@ sprite: Nyanotrasen/Clothing/Misc/black_dress.rsi - type: Clothing sprite: Nyanotrasen/Clothing/Misc/black_dress.rsi - femaleMask: UniformTop + - type: entity parent: ClothingUniformBase @@ -402,7 +393,6 @@ sprite: Nyanotrasen/Clothing/Misc/black_overall.rsi - type: Clothing sprite: Nyanotrasen/Clothing/Misc/black_overall.rsi - femaleMask: NoMask - type: entity parent: ClothingUniformSkirtBase @@ -414,7 +404,6 @@ sprite: Nyanotrasen/Clothing/Misc/exposed_shoulder.rsi - type: Clothing sprite: Nyanotrasen/Clothing/Misc/exposed_shoulder.rsi - femaleMask: UniformTop - type: entity parent: ClothingUniformBase @@ -426,4 +415,3 @@ sprite: Nyanotrasen/Clothing/Misc/tracksuit.rsi - type: Clothing sprite: Nyanotrasen/Clothing/Misc/tracksuit.rsi - femaleMask: NoMask diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/Oni.yml b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/Oni.yml index 8a5663dce45..4a8a3d18871 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/Oni.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/Oni.yml @@ -47,6 +47,13 @@ - Nekomimetic - type: PotentiaModifier potentiaMultiplier: 0.5 + - type: Inventory + femaleDisplacements: + jumpsuit: + sizeMaps: + 32: + sprite: Mobs/Species/Human/displacement.rsi + state: jumpsuit-female - type: entity save: false @@ -55,3 +62,11 @@ id: MobOniDummy noSpawn: true description: A dummy oni meant to be used in character setup. + components: + - type: Inventory + femaleDisplacements: + jumpsuit: + sizeMaps: + 32: + sprite: Mobs/Species/Human/displacement.rsi + state: jumpsuit-female diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/felinid.yml b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/felinid.yml index 44779fe9508..e0c224eae26 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/felinid.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/felinid.yml @@ -84,6 +84,13 @@ - Landmine - Mousetrap - SlipEntity + - type: Inventory + femaleDisplacements: + jumpsuit: + sizeMaps: + 32: + sprite: Mobs/Species/Human/displacement.rsi + state: jumpsuit-female - type: entity save: false @@ -95,3 +102,10 @@ components: - type: HumanoidAppearance species: Felinid + - type: Inventory + femaleDisplacements: + jumpsuit: + sizeMaps: + 32: + sprite: Mobs/Species/Human/displacement.rsi + state: jumpsuit-female diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Mail/base_mail.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Mail/base_mail.yml index bee514917a3..75007db11ca 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Mail/base_mail.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Mail/base_mail.yml @@ -103,6 +103,10 @@ reagents: - ReagentId: Nothing Quantity: 1 + - type: LanguageSpeaker + - type: LanguageKnowledge + speaks: [TauCetiBasic] # So that them foreigners can't understand what the broken mail is saying + understands: [] # This empty parcel is allowed to exist and evade the tests for the admin # mailto command. diff --git a/Resources/Prototypes/Nyanotrasen/GameRules/events.yml b/Resources/Prototypes/Nyanotrasen/GameRules/events.yml index de9ea15a699..0a1a1e78231 100644 --- a/Resources/Prototypes/Nyanotrasen/GameRules/events.yml +++ b/Resources/Prototypes/Nyanotrasen/GameRules/events.yml @@ -100,17 +100,17 @@ glimmerBurnUpper: 40 - type: PsionicCatGotYourTongueRule -- type: entity - id: MassMindSwap - parent: BaseGlimmerEvent - noSpawn: true - components: - - type: GlimmerEvent - minimumGlimmer: 900 - glimmerBurnLower: 350 - glimmerBurnUpper: 450 # Unless epistemics badly f-d up, this will restore the glimmer balance for a while. - - type: MassMindSwapRule - isTemporary: true # Permanent mindswap is hell. +# - type: entity # Floofstation - Disabled because this is perm and this is bullshit! +# id: MassMindSwap +# parent: BaseGlimmerEvent +# noSpawn: true +# components: +# - type: GlimmerEvent +# minimumGlimmer: 900 +# glimmerBurnLower: 350 +# glimmerBurnUpper: 450 # Unless epistemics badly f-d up, this will restore the glimmer balance for a while. +# - type: MassMindSwapRule +# isTemporary: true # Permanent mindswap is hell. - type: entity abstract: true diff --git a/Resources/Prototypes/Nyanotrasen/psionicPowers.yml b/Resources/Prototypes/Nyanotrasen/psionicPowers.yml index eac08644092..8b2911018f9 100644 --- a/Resources/Prototypes/Nyanotrasen/psionicPowers.yml +++ b/Resources/Prototypes/Nyanotrasen/psionicPowers.yml @@ -17,4 +17,3 @@ TelekineticPulsePower: 0.15 PyrokineticFlare: 0.3 SummonImpPower: 0.15 -# HypnosisPower: 0.15 # Floofstation diff --git a/Resources/Prototypes/Recipes/Lathes/electronics.yml b/Resources/Prototypes/Recipes/Lathes/electronics.yml index af258ad31b0..4fc824b6a16 100644 --- a/Resources/Prototypes/Recipes/Lathes/electronics.yml +++ b/Resources/Prototypes/Recipes/Lathes/electronics.yml @@ -697,6 +697,16 @@ Steel: 100 Glass: 500 +# Floof +- type: latheRecipe + id: AlertsComputerCircuitboard + result: AlertsComputerCircuitboard + category: Circuitry + completetime: 4 + materials: + Steel: 100 + Glass: 500 + - type: latheRecipe id: CloningConsoleComputerCircuitboard result: CloningConsoleComputerCircuitboard @@ -976,11 +986,11 @@ Steel: 100 Glass: 500 Gold: 100 - + - type: latheRecipe id: JukeboxCircuitBoard result: JukeboxCircuitBoard completetime: 4 materials: Steel: 100 - Glass: 500 \ No newline at end of file + Glass: 500 diff --git a/Resources/Prototypes/Research/industrial.yml b/Resources/Prototypes/Research/industrial.yml index 2e1e7f5b26d..e48dd97662e 100644 --- a/Resources/Prototypes/Research/industrial.yml +++ b/Resources/Prototypes/Research/industrial.yml @@ -87,6 +87,7 @@ recipeUnlocks: - ThermomachineFreezerMachineCircuitBoard - GasRecyclerMachineCircuitboard + - AlertsComputerCircuitboard # Floof - make atmos alerts computer manufacturable - type: technology id: RipleyAPLU diff --git a/Resources/Prototypes/SoundCollections/announcements.yml b/Resources/Prototypes/SoundCollections/announcements.yml index b3336f9cf82..585797c68eb 100644 --- a/Resources/Prototypes/SoundCollections/announcements.yml +++ b/Resources/Prototypes/SoundCollections/announcements.yml @@ -26,3 +26,17 @@ - /Audio/Announcements/RoundEnd/susguyeatscrew.ogg - /Audio/Announcements/RoundEnd/this_drink.ogg - /Audio/Announcements/RoundEnd/truth_imagination.ogg + - /Audio/Announcements/RoundEnd/oney.ogg + # Floof added sounds + - /Audio/Floof/Announcements/RoundEnd/bangindonk.ogg + - /Audio/Floof/Announcements/RoundEnd/haveabeautifultime.ogg + - /Audio/Floof/Announcements/RoundEnd/newroundsexy.ogg + - /Audio/Floof/Announcements/RoundEnd/seeyoulaterokay.ogg + - /Audio/Floof/Announcements/RoundEnd/dotheballsgo.ogg + - /Audio/Floof/Announcements/RoundEnd/filledwith.ogg + - /Audio/Floof/Announcements/RoundEnd/iknowwhat.ogg + - /Audio/Floof/Announcements/RoundEnd/iwishtherewassomethingmore.ogg + - /Audio/Floof/Announcements/RoundEnd/lottawords.ogg + - /Audio/Floof/Announcements/RoundEnd/theballsgothard.ogg + - /Audio/Floof/Announcements/RoundEnd/whatashame.ogg + - /Audio/Floof/Announcements/RoundEnd/TimeForANewRound.ogg diff --git a/Resources/Prototypes/Traits/physical.yml b/Resources/Prototypes/Traits/physical.yml index a314700add8..9bc2bce8142 100644 --- a/Resources/Prototypes/Traits/physical.yml +++ b/Resources/Prototypes/Traits/physical.yml @@ -339,6 +339,7 @@ - Human - Oni - SlimePerson + - Resomi # Floofstation - !type:CharacterTraitRequirement inverted: true traits: @@ -370,6 +371,7 @@ species: - Human # Entirely arbitrary, I've decided I want a trait unique to humans. Since they don't normally get anything exciting. # When we get the Character Records system in, I also want to make this require certain Backgrounds. + - Resomi # Floofstation. - !type:CharacterTraitRequirement inverted: true traits: @@ -477,6 +479,7 @@ - !type:CharacterSpeciesRequirement species: - Human + - Resomi componentRemovals: - Damageable components: diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Neck/cloaks.yml b/Resources/Prototypes/_NF/Entities/Clothing/Neck/cloaks.yml new file mode 100644 index 00000000000..31e20f92c5a --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Clothing/Neck/cloaks.yml @@ -0,0 +1,10 @@ +- type: entity + parent: ClothingNeckBase + id: ClothingNeckCloakJanitor + name: janitor's cloak + description: An exquisite cloak fitting for those who save the station from messes and slips. The unsung heroes who work thanklessly while we make a mess over the bar. Pure angels of patience and an iron will! ...It's also waterproof! + components: + - type: Sprite + sprite: _NF/Clothing/Neck/Cloaks/janitor.rsi + - type: Clothing + sprite: _NF/Clothing/Neck/Cloaks/janitor.rsi diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/heavy_rifle.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/heavy_rifle.yml new file mode 100644 index 00000000000..de5c79ba318 --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/heavy_rifle.yml @@ -0,0 +1,148 @@ +- type: entity + id: BaseSpeedLoaderHeavyRifle + name: "speed loader (.20 rifle)" + parent: BaseItem + abstract: true + components: + - type: Tag + tags: + - SpeedLoaderRifleHeavy + - type: SpeedLoader + - type: BallisticAmmoProvider + whitelist: + tags: + - CartridgeRifle + capacity: 8 + - type: Sprite + - type: ContainerContainer + containers: + ballistic-ammo: !type:Container + ents: [] + +- type: entity + id: SpeedLoaderRifleHeavy + name: "speed loader (.20 rifle)" + parent: BaseSpeedLoaderHeavyRifle + components: + - type: BallisticAmmoProvider + proto: CartridgeRifle + - type: Icon + sprite: _NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi + state: icon + - type: Sprite + sprite: _NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi + layers: + - state: base + map: [ "enum.GunVisualLayers.Base" ] + - state: base-8 + map: [ "enum.GunVisualLayers.Mag" ] + - type: MagazineVisuals + magState: base + steps: 9 + zeroVisible: false + - type: Appearance + +- type: entity + id: SpeedLoaderRifleHeavyEmpty + name: "speed loader (.20 rifle any)" + parent: SpeedLoaderRifleHeavy + components: + - type: BallisticAmmoProvider + proto: null + - type: Icon + sprite: _NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi + state: base + - type: Sprite + sprite: _NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi + layers: + - state: base + map: [ "enum.GunVisualLayers.Base" ] + +- type: entity + id: SpeedLoaderRifleHeavyIncendiary + name: "speed loader (.20 rifle incendiary)" + parent: BaseSpeedLoaderHeavyRifle + components: + - type: BallisticAmmoProvider + proto: CartridgeRifleIncendiary + - type: Sprite + sprite: _NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi + layers: + - state: base + map: [ "enum.GunVisualLayers.Base" ] + - state: base-8 + map: [ "enum.GunVisualLayers.Mag" ] + - type: MagazineVisuals + magState: base + steps: 9 + zeroVisible: false + - type: Appearance + +- type: entity + id: SpeedLoaderRifleHeavyPractice + name: "speed loader (.20 rifle practice)" + parent: BaseSpeedLoaderHeavyRifle + components: + - type: BallisticAmmoProvider + proto: CartridgeRiflePractice + - type: Icon + sprite: _NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi + state: practice-icon + - type: Sprite + sprite: _NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi + layers: + - state: base + map: [ "enum.GunVisualLayers.Base" ] + - state: practice-8 + map: [ "enum.GunVisualLayers.Mag" ] + - type: MagazineVisuals + magState: practice + steps: 9 + zeroVisible: false + - type: Appearance + +- type: entity + id: SpeedLoaderRifleHeavyUranium + name: "speed loader (.20 rifle uranium)" + parent: BaseSpeedLoaderHeavyRifle + components: + - type: BallisticAmmoProvider + proto: CartridgeRifleUranium + - type: Icon + sprite: _NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi + state: uranium-icon + - type: Sprite + sprite: _NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi + layers: + - state: base + map: [ "enum.GunVisualLayers.Base" ] + - state: uranium-8 + map: [ "enum.GunVisualLayers.Mag" ] + - type: MagazineVisuals + magState: uranium + steps: 9 + zeroVisible: false + - type: Appearance + +- type: entity + id: SpeedLoaderRifleHeavyRubber + name: "speed loader (.20 rifle rubber)" + parent: BaseSpeedLoaderHeavyRifle + components: + - type: BallisticAmmoProvider + proto: CartridgeRifleRubber + - type: Icon + sprite: _NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi + state: rubber-icon + - type: Sprite + sprite: _NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi + layers: + - state: base + map: [ "enum.GunVisualLayers.Base" ] + - state: rubber-8 + map: [ "enum.GunVisualLayers.Mag" ] + - type: MagazineVisuals + magState: rubber + steps: 9 + zeroVisible: false + - type: Appearance diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Basic/sawn_pka.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Basic/sawn_pka.yml new file mode 100644 index 00000000000..73aa98d16c3 --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Basic/sawn_pka.yml @@ -0,0 +1,27 @@ +- type: entity + id: WeaponProtoKineticAcceleratorSawn + parent: WeaponProtoKineticAcceleratorBase + name: sawn-off proto-kinetic accelerator + description: boundaries and rules are ment to be broken otherwise there will be no progress, but this thing here is a good argumant against that statement. + components: + - type: Sprite + sprite: _NF/Objects/Weapons/Guns/Basic/sawn_kinetic_accelerator.rsi + state: icon + - type: Item + sprite: _NF/Objects/Weapons/Guns/Basic/sawn_kinetic_accelerator.rsi + size: Small + shape: + - 0,0,1,0 + - type: Gun + fireRate: 8 + selectedMode: FullAuto + availableModes: + - FullAuto + minAngle: 41 + maxAngle: 55 + - type: Clothing + sprite: _NF/Objects/Weapons/Guns/Basic/sawn_kinetic_accelerator.rsi + - type: Construction + graph: PKASawn + node: pkasawn + deconstructionTarget: null diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml new file mode 100644 index 00000000000..99b957f5e19 --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml @@ -0,0 +1,36 @@ +- type: entity + name: Argenti + parent: BaseWeaponRevolver + id: WeaponRevolverArgenti + description: The civilian grade Argenti Type 20 revolver. Manufactured by Silver Industries. While the design with expanded cylinder is quite ancient, the right gunslinger will know how to utilise it well. Uses .20 rifle ammo. + components: + - type: Sprite + scale: 0.75 , 0.75 + sprite: _NF/Objects/Weapons/Guns/Revolvers/argenti.rsi + - type: Clothing + sprite: _NF/Objects/Weapons/Guns/Revolvers/argenti.rsi + - type: Gun + fireRate: 2.5 + resetOnHandSelected: false + - type: RevolverAmmoProvider + whitelist: + tags: + - CartridgeRifle + - SpeedLoaderRifleHeavy + capacity: 8 + proto: CartridgeRifle + chambers: [ True, True, True, True, True, True, True, True ] + ammoSlots: [ null, null, null, null, null, null, null, null ] + - type: StaticPrice + price: 200 + +- type: entity + parent: WeaponRevolverArgenti + id: WeaponRevolverArgentiNonlethal + suffix: Non-lethal + components: + - type: RevolverAmmoProvider + capacity: 8 + proto: CartridgeRifleRubber + chambers: [ True, True, True, True, True, True, True, True ] + ammoSlots: [ null, null, null, null, null, null, null, null ] diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Snipers/snipers.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Snipers/snipers.yml new file mode 100644 index 00000000000..e6005fd0cc7 --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Snipers/snipers.yml @@ -0,0 +1,31 @@ +# Frontier +- type: entity + name: N2524 Pattern Repeater + parent: BaseWeaponSniper + id: WeaponSniperRepeater + description: A civilian grade lever action firearm, favored by space cowboys across the Frontier for its reliability and stopping power. Uses .45 magnum ammo. + components: + - type: Sprite + sprite: _NF/Objects/Weapons/Guns/Snipers/repeater.rsi + - type: Clothing + sprite: _NF/Objects/Weapons/Guns/Snipers/repeater.rsi + - type: StaticPrice + price: 500 + - type: BallisticAmmoProvider + whitelist: + tags: + - CartridgeMagnum + capacity: 7 + proto: CartridgeMagnum + +- type: entity + parent: WeaponSniperRepeater + id: WeaponSniperRepeaterNonlethal + suffix: Non-lethal + components: + - type: BallisticAmmoProvider + whitelist: + tags: + - CartridgeMagnum + capacity: 7 + proto: CartridgeMagnumRubber diff --git a/Resources/Prototypes/_NF/Recipes/Construction/Graphs/weapons/pkasawn.yml b/Resources/Prototypes/_NF/Recipes/Construction/Graphs/weapons/pkasawn.yml new file mode 100644 index 00000000000..9ed778d7844 --- /dev/null +++ b/Resources/Prototypes/_NF/Recipes/Construction/Graphs/weapons/pkasawn.yml @@ -0,0 +1,12 @@ +- type: constructionGraph + id: PKASawn + start: start + graph: + - node: start + edges: + - to: pkasawn + steps: + - tool: Sawing + doAfter: 2 + - node: pkasawn + entity: WeaponProtoKineticAcceleratorSawn diff --git a/Resources/Prototypes/_NF/tags.yml b/Resources/Prototypes/_NF/tags.yml new file mode 100644 index 00000000000..91441684ab9 --- /dev/null +++ b/Resources/Prototypes/_NF/tags.yml @@ -0,0 +1,2 @@ +- type: Tag + id: SpeedLoaderRifleHeavy diff --git a/Resources/Prototypes/consent.yml b/Resources/Prototypes/consent.yml index 9c1d59f2c1a..f1c355e61dc 100644 --- a/Resources/Prototypes/consent.yml +++ b/Resources/Prototypes/consent.yml @@ -1,2 +1,8 @@ -# - type: consentToggle -# id: Example +- type: consentToggle + id: Vore + +- type: consentToggle + id: Digestion + +- type: consentToggle + id: Hypno diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml index fb8d005c244..70157410ee3 100644 --- a/Resources/Prototypes/tags.yml +++ b/Resources/Prototypes/tags.yml @@ -1363,3 +1363,8 @@ - type: Tag id: WriteIgnoreStamps + +#Floof tags + +- type: Tag + id: BrassKnuckles diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/armor_reflec.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Armor/armor_reflec.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..25f4c8b77e1 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Armor/armor_reflec.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/armor_reflec.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Armor/armor_reflec.rsi/meta.json index 5f95573206c..2e753707da1 100644 --- a/Resources/Textures/Clothing/OuterClothing/Armor/armor_reflec.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Armor/armor_reflec.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/dbc2435fa562f4ef130a7112d2a4cc9c80099894. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/dbc2435fa562f4ef130a7112d2a4cc9c80099894. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79, , equipped-OUTERCLOTHING-resomi made by svarshiksatanist (Discord)", "size": { "x": 32, "y": 32 @@ -18,6 +18,10 @@ "name": "equipped-OUTERCLOTHING-vox", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/bone_armor.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Armor/bone_armor.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..45d628e6c33 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Armor/bone_armor.rsi/equipped-OUTERCLOTHING-resomi.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..27ac504b366 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, equipped-OUTERCLOTHING-resomi made by svarshiksatanist (Discord)", "size": { "x": 32, "y": 32 @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/bulletproof.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Armor/bulletproof.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..ec73822d0f8 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Armor/bulletproof.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/bulletproof.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Armor/bulletproof.rsi/meta.json index 8b7a929fcde..fd30e66300d 100644 --- a/Resources/Textures/Clothing/OuterClothing/Armor/bulletproof.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Armor/bulletproof.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/ParadiseSS13/Paradise. Vox states by Flareguy for Space Station 14", + "copyright": "Taken from https://github.com/ParadiseSS13/Paradise. Vox states by Flareguy for Space Station 14, equipped-OUTERCLOTHING-resomi made by svarshiksatanist (Discord)", "size": { "x": 32, "y": 32 @@ -18,6 +18,10 @@ "name": "equipped-OUTERCLOTHING-vox", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..197eb4e2660 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/meta.json index a9366f0bc1d..e6f083f9fa0 100644 --- a/Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/pull/69842/commits/d8138946b0ed06fced522729ac8eaa0596864329 edited by Skarletto (github), edited by Emisse for ss14. Vox state by Flareguy for SS14", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/pull/69842/commits/d8138946b0ed06fced522729ac8eaa0596864329 edited by Skarletto (github), edited by Emisse for ss14. Vox state by Flareguy for SS14, equipped-OUTERCLOTHING-resomi made by svarshiksatanist (Discord)", "size": { "x": 32, "y": 32 @@ -18,6 +18,10 @@ "name": "equipped-OUTERCLOTHING-vox", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/cult_armour.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Armor/cult_armour.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..24de03ff2b5 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Armor/cult_armour.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/cult_armour.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Armor/cult_armour.rsi/meta.json index 5c326232e4f..9d5ba5afb78 100644 --- a/Resources/Textures/Clothing/OuterClothing/Armor/cult_armour.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Armor/cult_armour.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. equipped-OUTERCLOTHING-vox state taken from Paradise at https://github.com/ParadiseSS13/Paradise/blob/fce54deb01d465957691ba2907218d4af4830db2/icons/mob/clothing/species/vox/suit.dmi and north sprite modified", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. equipped-OUTERCLOTHING-vox state taken from Paradise at https://github.com/ParadiseSS13/Paradise/blob/fce54deb01d465957691ba2907218d4af4830db2/icons/mob/clothing/species/vox/suit.dmi and north sprite modified, equipped-OUTERCLOTHING-resomi made by svarshiksatanist (Discord)", "size": { "x": 32, "y": 32 @@ -18,6 +18,10 @@ "name": "equipped-OUTERCLOTHING-vox", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/heavy.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Armor/heavy.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..3a4f2fa79a1 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Armor/heavy.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/heavy.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Armor/heavy.rsi/meta.json index e482264df5f..71828a65920 100644 --- a/Resources/Textures/Clothing/OuterClothing/Armor/heavy.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Armor/heavy.rsi/meta.json @@ -1,26 +1,30 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, equipped-OUTERCLOTHING-resomi made by svarshiksatanist (Discord)", + "size": { + "x": 32, + "y": 32 }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/heavygreen.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Armor/heavygreen.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..dd971052ca4 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Armor/heavygreen.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/heavygreen.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Armor/heavygreen.rsi/meta.json index 232bec9c0a2..9bea4a37e98 100644 --- a/Resources/Textures/Clothing/OuterClothing/Armor/heavygreen.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Armor/heavygreen.rsi/meta.json @@ -1,30 +1,34 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79, equipped-OUTERCLOTHING-resomi made by svarshiksatanist (Discord)", + "size": { + "x": 32, + "y": 32 }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-vox", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/heavyred.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Armor/heavyred.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..7aec1745d8d Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Armor/heavyred.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/heavyred.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Armor/heavyred.rsi/meta.json index 232bec9c0a2..9bea4a37e98 100644 --- a/Resources/Textures/Clothing/OuterClothing/Armor/heavyred.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Armor/heavyred.rsi/meta.json @@ -1,30 +1,34 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79, equipped-OUTERCLOTHING-resomi made by svarshiksatanist (Discord)", + "size": { + "x": 32, + "y": 32 }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-vox", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/lingarmor.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Armor/lingarmor.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..6dcc3aaace4 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Armor/lingarmor.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/lingarmor.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Armor/lingarmor.rsi/meta.json index 0249e359954..89238baa3d9 100644 --- a/Resources/Textures/Clothing/OuterClothing/Armor/lingarmor.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Armor/lingarmor.rsi/meta.json @@ -1,26 +1,30 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/blob/master/icons/mob/clothing/suit.dmi", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/blob/master/icons/mob/clothing/suit.dmi, equipped-OUTERCLOTHING-resomi made by Pofitlo", + "size": { + "x": 32, + "y": 32 }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] -} \ No newline at end of file + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/magusblue.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Armor/magusblue.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..45c0f6606da Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Armor/magusblue.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/magusblue.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Armor/magusblue.rsi/meta.json index e482264df5f..71828a65920 100644 --- a/Resources/Textures/Clothing/OuterClothing/Armor/magusblue.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Armor/magusblue.rsi/meta.json @@ -1,26 +1,30 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, equipped-OUTERCLOTHING-resomi made by svarshiksatanist (Discord)", + "size": { + "x": 32, + "y": 32 }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/magusred.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Armor/magusred.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..8dfc5aac0ef Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Armor/magusred.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/magusred.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Armor/magusred.rsi/meta.json index e482264df5f..71828a65920 100644 --- a/Resources/Textures/Clothing/OuterClothing/Armor/magusred.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Armor/magusred.rsi/meta.json @@ -1,26 +1,30 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, equipped-OUTERCLOTHING-resomi made by svarshiksatanist (Discord)", + "size": { + "x": 32, + "y": 32 }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/podwars_armor.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Armor/podwars_armor.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..aa7c94d900f Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Armor/podwars_armor.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/podwars_armor.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Armor/podwars_armor.rsi/meta.json index 97c559cbdc1..98e7b3958bd 100644 --- a/Resources/Textures/Clothing/OuterClothing/Armor/podwars_armor.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Armor/podwars_armor.rsi/meta.json @@ -1,26 +1,30 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Made by patogrone (ss14 discord)", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by patogrone (ss14 discord), equipped-OUTERCLOTHING-resomi made by svarshiksatanist (Discord)", + "size": { + "x": 32, + "y": 32 }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..04074ad021b Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/meta.json index 26631d02819..a149e13ec0d 100644 --- a/Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/ParadiseSS13/Paradise. Vox state by Flareguy for Space Station 14", + "copyright": "Taken from https://github.com/ParadiseSS13/Paradise. Vox state by Flareguy for Space Station 14, equipped-OUTERCLOTHING-resomi made by svarshiksatanist (Discord)", "size": { "x": 32, "y": 32 @@ -18,6 +18,10 @@ "name": "equipped-OUTERCLOTHING-vox", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 @@ -27,4 +31,4 @@ "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..8e2a88ee0be Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/meta.json index 00bef7108a3..a149e13ec0d 100644 --- a/Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/meta.json @@ -1,30 +1,34 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/ParadiseSS13/Paradise. Vox state by Flareguy for Space Station 14", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/ParadiseSS13/Paradise. Vox state by Flareguy for Space Station 14, equipped-OUTERCLOTHING-resomi made by svarshiksatanist (Discord)", + "size": { + "x": 32, + "y": 32 }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-vox", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/security_slim.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Armor/security_slim.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..8e2a88ee0be Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Armor/security_slim.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/security_slim.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Armor/security_slim.rsi/meta.json index 26631d02819..a149e13ec0d 100644 --- a/Resources/Textures/Clothing/OuterClothing/Armor/security_slim.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Armor/security_slim.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/ParadiseSS13/Paradise. Vox state by Flareguy for Space Station 14", + "copyright": "Taken from https://github.com/ParadiseSS13/Paradise. Vox state by Flareguy for Space Station 14, equipped-OUTERCLOTHING-resomi made by svarshiksatanist (Discord)", "size": { "x": 32, "y": 32 @@ -18,6 +18,10 @@ "name": "equipped-OUTERCLOTHING-vox", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 @@ -27,4 +31,4 @@ "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Clothing/OuterClothing/Bio/cmo.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Bio/cmo.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..a640eb460e1 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Bio/cmo.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Bio/cmo.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Bio/cmo.rsi/meta.json index ca1146d007e..61eeef4198e 100644 --- a/Resources/Textures/Clothing/OuterClothing/Bio/cmo.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Bio/cmo.rsi/meta.json @@ -1,30 +1,34 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79, equipped-OUTERCLOTHING-resomi made by svarshiksatanist (Discord)", + "size": { + "x": 32, + "y": 32 }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-vox", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Bio/general.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Bio/general.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..cfc4b279aad Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Bio/general.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Bio/general.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Bio/general.rsi/meta.json index 232bec9c0a2..9bea4a37e98 100644 --- a/Resources/Textures/Clothing/OuterClothing/Bio/general.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Bio/general.rsi/meta.json @@ -1,30 +1,34 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79, equipped-OUTERCLOTHING-resomi made by svarshiksatanist (Discord)", + "size": { + "x": 32, + "y": 32 }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-vox", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Bio/janitor.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Bio/janitor.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..bc344035496 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Bio/janitor.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Bio/janitor.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Bio/janitor.rsi/meta.json index ca1146d007e..61eeef4198e 100644 --- a/Resources/Textures/Clothing/OuterClothing/Bio/janitor.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Bio/janitor.rsi/meta.json @@ -1,30 +1,34 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79, equipped-OUTERCLOTHING-resomi made by svarshiksatanist (Discord)", + "size": { + "x": 32, + "y": 32 }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-vox", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Bio/scientist.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Bio/scientist.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..51e8e657468 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Bio/scientist.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Bio/scientist.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Bio/scientist.rsi/meta.json index ca1146d007e..61eeef4198e 100644 --- a/Resources/Textures/Clothing/OuterClothing/Bio/scientist.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Bio/scientist.rsi/meta.json @@ -1,30 +1,34 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79, equipped-OUTERCLOTHING-resomi made by svarshiksatanist (Discord)", + "size": { + "x": 32, + "y": 32 }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-vox", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..866b22d8033 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/meta.json index ca1146d007e..61eeef4198e 100644 --- a/Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/meta.json @@ -1,30 +1,34 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79, equipped-OUTERCLOTHING-resomi made by svarshiksatanist (Discord)", + "size": { + "x": 32, + "y": 32 }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-vox", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Bio/virology.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Bio/virology.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..8071efc732f Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Bio/virology.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Bio/virology.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Bio/virology.rsi/meta.json index ca1146d007e..61eeef4198e 100644 --- a/Resources/Textures/Clothing/OuterClothing/Bio/virology.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Bio/virology.rsi/meta.json @@ -1,30 +1,34 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79, equipped-OUTERCLOTHING-resomi made by svarshiksatanist (Discord)", + "size": { + "x": 32, + "y": 32 }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-vox", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/bomber.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Coats/bomber.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..827634e4b20 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/bomber.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/bomber.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Coats/bomber.rsi/meta.json index 442bfb29202..ae360c5f5c6 100644 --- a/Resources/Textures/Clothing/OuterClothing/Coats/bomber.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Coats/bomber.rsi/meta.json @@ -1,41 +1,45 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, equipped-OUTERCLOTHING-resomi made by svarshiksatanist (Discord)", + "size": { + "x": 32, + "y": 32 }, - { - "name": "icon-open" - }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "open-equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "open-inhand-left", - "directions": 4 - }, - { - "name": "open-inhand-right", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "icon-open" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "open-equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "open-inhand-left", + "directions": 4 + }, + { + "name": "open-inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/brigmedic.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Coats/brigmedic.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..b862b2928ab Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/brigmedic.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/brigmedic.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Coats/brigmedic.rsi/meta.json index 13bf8611379..bcb923de705 100644 --- a/Resources/Textures/Clothing/OuterClothing/Coats/brigmedic.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Coats/brigmedic.rsi/meta.json @@ -1,26 +1,30 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Sprited by Hülle#2562 (Discord) for Space Station 14", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprited by Hülle#2562 (Discord) for Space Station 14, equipped-OUTERCLOTHING-resomi made by Pofitlo", + "size": { + "x": 32, + "y": 32 }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/clownpriest.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Coats/clownpriest.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..f333f91e98b Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/clownpriest.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/clownpriest.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Coats/clownpriest.rsi/meta.json index bacde823612..0dc5ffb1192 100644 --- a/Resources/Textures/Clothing/OuterClothing/Coats/clownpriest.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Coats/clownpriest.rsi/meta.json @@ -1,26 +1,30 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from Yogstation at https://github.com/yogstation13/Yogstation/commit/18ab2203bc47b7590f2c72b5f7969eafa723f033", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from Yogstation at https://github.com/yogstation13/Yogstation/commit/18ab2203bc47b7590f2c72b5f7969eafa723f033, equipped-OUTERCLOTHING-resomi made by ", + "size": { + "x": 32, + "y": 32 }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] -} \ No newline at end of file + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..007e47564b1 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/meta.json index 18a65e16d71..8b3026e265b 100644 --- a/Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/meta.json @@ -1,26 +1,30 @@ { - "version": 1, - "license": "CC0-1.0", - "copyright": "Created by EmoGarbage404", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC0-1.0", + "copyright": "Created by EmoGarbage404, equipped-OUTERCLOTHING-resomi made by Pofitlo", + "size": { + "x": 32, + "y": 32 }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/dogi.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Coats/dogi.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..6a25c4b0dc2 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/dogi.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/dogi.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Coats/dogi.rsi/meta.json index 9ecf4115a97..5a213dd7718 100644 --- a/Resources/Textures/Clothing/OuterClothing/Coats/dogi.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Coats/dogi.rsi/meta.json @@ -1,26 +1,30 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Made by PuroSlavKing (github) for SS14", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by PuroSlavKing (github) for SS14, equipped-OUTERCLOTHING-resomi made by Pofitlo", + "size": { + "x": 32, + "y": 32 }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/expensive_coat.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Coats/expensive_coat.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..896991cadae Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/expensive_coat.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/expensive_coat.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Coats/expensive_coat.rsi/meta.json index cc68d97d378..9956bea8073 100644 --- a/Resources/Textures/Clothing/OuterClothing/Coats/expensive_coat.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Coats/expensive_coat.rsi/meta.json @@ -1,22 +1,26 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from Paradise at https://github.com/ParadiseSS13/Paradise/blob/cae6017c486dbadef2b2d86ddc58d7226c17597c/icons/mob/clothing/suit.dmi, https://github.com/ParadiseSS13/Paradise/blob/cab0fa52972c777ec3929cc2e03a74088349486f/icons/obj/clothing/suits.dmi", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from Paradise at https://github.com/ParadiseSS13/Paradise/blob/cae6017c486dbadef2b2d86ddc58d7226c17597c/icons/mob/clothing/suit.dmi, https://github.com/ParadiseSS13/Paradise/blob/cab0fa52972c777ec3929cc2e03a74088349486f/icons/obj/clothing/suits.dmi, equipped-OUTERCLOTHING-resomi made by Pofitlo", + "size": { + "x": 32, + "y": 32 }, - { - "name": "equipped-OUTERCLOTHING-vox", - "directions": 4 - }, - { - "name": "icon" - } - ] -} \ No newline at end of file + "states": [ + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, + { + "name": "icon" + } + ] +} diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/gentlecoat.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Coats/gentlecoat.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..dfea7fbe9a9 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/gentlecoat.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/gentlecoat.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Coats/gentlecoat.rsi/meta.json index e482264df5f..8dd21568d1f 100644 --- a/Resources/Textures/Clothing/OuterClothing/Coats/gentlecoat.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Coats/gentlecoat.rsi/meta.json @@ -1,26 +1,30 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, equipped-OUTERCLOTHING-resomi made by Pofitlo", + "size": { + "x": 32, + "y": 32 }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..5ee842c8b71 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/meta.json index fa20ea7d596..2da55150de1 100644 --- a/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/meta.json @@ -1,30 +1,34 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e , edited by Alekshhh. Vox state made by Flareguy for SS14", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e , edited by Alekshhh. Vox state made by Flareguy for SS14", + "size": { + "x": 32, + "y": 32 }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-vox", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/jensencoat.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Coats/jensencoat.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..81dea3acfbf Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/jensencoat.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/jensencoat.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Coats/jensencoat.rsi/meta.json index 232bec9c0a2..166b20ffa1e 100644 --- a/Resources/Textures/Clothing/OuterClothing/Coats/jensencoat.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Coats/jensencoat.rsi/meta.json @@ -1,30 +1,34 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79, equipped-OUTERCLOTHING-resomi made by Pofitlo", + "size": { + "x": 32, + "y": 32 }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-vox", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..78b28400743 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/meta.json index 2311851853a..b8079572aec 100644 --- a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/meta.json @@ -1,49 +1,57 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" - }, - { - "name": "icon-open" - }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "open-equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-vox", - "directions": 4 - }, - { - "name": "open-equipped-OUTERCLOTHING-vox", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "open-inhand-left", - "directions": 4 - }, - { - "name": "open-inhand-right", - "directions": 4 - } - ] + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, sprites for resomi made by Pofitlo", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "icon-open" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "open-equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, + { + "name": "open-equipped-OUTERCLOTHING-vox", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, + { + "name": "open-equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "open-inhand-left", + "directions": 4 + }, + { + "name": "open-inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/open-equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/open-equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..6bdf4a60d77 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/open-equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..9eac64bf206 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/meta.json index 2311851853a..b8079572aec 100644 --- a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/meta.json @@ -1,49 +1,57 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" - }, - { - "name": "icon-open" - }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "open-equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-vox", - "directions": 4 - }, - { - "name": "open-equipped-OUTERCLOTHING-vox", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "open-inhand-left", - "directions": 4 - }, - { - "name": "open-inhand-right", - "directions": 4 - } - ] + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, sprites for resomi made by Pofitlo", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "icon-open" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "open-equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, + { + "name": "open-equipped-OUTERCLOTHING-vox", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, + { + "name": "open-equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "open-inhand-left", + "directions": 4 + }, + { + "name": "open-inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/open-equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/open-equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..c448875394c Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/open-equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..da3cfc6d98a Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/meta.json index c2b48b1d762..1c79857cb39 100644 --- a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/meta.json @@ -1,49 +1,57 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Made by Flareguy for Space Station 14, original base sprite from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" - }, - { - "name": "icon-open" - }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "open-equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-vox", - "directions": 4 - }, - { - "name": "open-equipped-OUTERCLOTHING-vox", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "open-inhand-left", - "directions": 4 - }, - { - "name": "open-inhand-right", - "directions": 4 - } - ] + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by Flareguy for Space Station 14, original base sprite from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, sprites for resomi made by Pofitlo", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "icon-open" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "open-equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, + { + "name": "open-equipped-OUTERCLOTHING-vox", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, + { + "name": "open-equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "open-inhand-left", + "directions": 4 + }, + { + "name": "open-inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/open-equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/open-equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..e2fad180875 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/open-equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..7bef73993f5 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/meta.json index 2311851853a..8c42477bec8 100644 --- a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/meta.json @@ -1,49 +1,57 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" - }, - { - "name": "icon-open" - }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "open-equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-vox", - "directions": 4 - }, - { - "name": "open-equipped-OUTERCLOTHING-vox", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "open-inhand-left", - "directions": 4 - }, - { - "name": "open-inhand-right", - "directions": 4 - } - ] + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "icon-open" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "open-equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, + { + "name": "open-equipped-OUTERCLOTHING-vox", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, + { + "name": "open-equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "open-inhand-left", + "directions": 4 + }, + { + "name": "open-inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/open-equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/open-equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..b7be0aae4a0 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/open-equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..d502ac0ec28 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/meta.json index 415d267995c..ee040ca4bf8 100644 --- a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/meta.json @@ -1,41 +1,49 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, sprites for resomi made by Pofitlo", + "size": { + "x": 32, + "y": 32 }, - { - "name": "icon-open" - }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "open-equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "open-inhand-left", - "directions": 4 - }, - { - "name": "open-inhand-right", - "directions": 4 - } - ] -} \ No newline at end of file + "states": [ + { + "name": "icon" + }, + { + "name": "icon-open" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "open-equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, + { + "name": "open-equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "open-inhand-left", + "directions": 4 + }, + { + "name": "open-inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/open-equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/open-equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..c9c475719b0 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/open-equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_physician.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_physician.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..ed7902c9370 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_physician.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_physician.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_physician.rsi/meta.json index 46a5d33e019..8a76627fefd 100644 --- a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_physician.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_physician.rsi/meta.json @@ -1,41 +1,49 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Edit by Nairodian (github) of labcoat.rsi from Space-Station-14 at pull request https://github.com/space-wizards/space-station-14/pull/10758,", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Edit by Nairodian (github) of labcoat.rsi from Space-Station-14 at pull request https://github.com/space-wizards/space-station-14/pull/10758, sprites for resomi made by Pofitlo", + "size": { + "x": 32, + "y": 32 }, - { - "name": "icon-open" - }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "open-equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "open-inhand-left", - "directions": 4 - }, - { - "name": "open-inhand-right", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "icon-open" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "open-equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, + { + "name": "open-equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "open-inhand-left", + "directions": 4 + }, + { + "name": "open-inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_physician.rsi/open-equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_physician.rsi/open-equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..6b2e461a589 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_physician.rsi/open-equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_researcher.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_researcher.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..f15bdd55750 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_researcher.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_researcher.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_researcher.rsi/meta.json index dd16b8c78e5..114d326e09b 100644 --- a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_researcher.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_researcher.rsi/meta.json @@ -1,41 +1,49 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Edit by Nairodian (github) of labcoat.rsi from Space-Station-14 at commit https://github.com/space-wizards/space-station-14/pull/10758", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Edit by Nairodian (github) of labcoat.rsi from Space-Station-14 at commit https://github.com/space-wizards/space-station-14/pull/10758, sprites for resomi made by Pofitlo", + "size": { + "x": 32, + "y": 32 }, - { - "name": "icon-open" - }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "open-equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "open-inhand-left", - "directions": 4 - }, - { - "name": "open-inhand-right", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "icon-open" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "open-equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, + { + "name": "open-equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "open-inhand-left", + "directions": 4 + }, + { + "name": "open-inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_researcher.rsi/open-equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_researcher.rsi/open-equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..b96b0684085 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_researcher.rsi/open-equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..290a4e07c65 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/meta.json index 4d788f71eed..d1e9db87ab6 100644 --- a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/meta.json @@ -1,49 +1,57 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Modified from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" - }, - { - "name": "icon-open" - }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "open-equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-vox", - "directions": 4 - }, - { - "name": "open-equipped-OUTERCLOTHING-vox", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "open-inhand-left", - "directions": 4 - }, - { - "name": "open-inhand-right", - "directions": 4 - } - ] + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Modified from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "icon-open" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "open-equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, + { + "name": "open-equipped-OUTERCLOTHING-vox", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, + { + "name": "open-equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "open-inhand-left", + "directions": 4 + }, + { + "name": "open-inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/open-equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/open-equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..ed1a57009c7 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/open-equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/pirate.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Coats/pirate.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..55ebd32e77d Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/pirate.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/pirate.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Coats/pirate.rsi/meta.json index 232bec9c0a2..7f0faec83cf 100644 --- a/Resources/Textures/Clothing/OuterClothing/Coats/pirate.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Coats/pirate.rsi/meta.json @@ -1,30 +1,34 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79, sprites for resomi made by Pofitlo", + "size": { + "x": 32, + "y": 32 }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-vox", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/rd_coat.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Coats/rd_coat.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..9b42c827a61 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/rd_coat.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/rd_coat.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Coats/rd_coat.rsi/meta.json index 600bbc3d6db..8d3e9b06b88 100644 --- a/Resources/Textures/Clothing/OuterClothing/Coats/rd_coat.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Coats/rd_coat.rsi/meta.json @@ -1,41 +1,49 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Drawn by Ubaser", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Drawn by Ubaser, sprites for resomi made by Pofitlo", + "size": { + "x": 32, + "y": 32 }, - { - "name": "icon-open" - }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "open-equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "open-inhand-left", - "directions": 4 - }, - { - "name": "open-inhand-right", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "icon-open" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "open-equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, + { + "name": "open-equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "open-inhand-left", + "directions": 4 + }, + { + "name": "open-inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/rd_coat.rsi/open-equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Coats/rd_coat.rsi/open-equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..1257ef6c950 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/rd_coat.rsi/open-equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/rndcoat.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Coats/rndcoat.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..f15bdd55750 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/rndcoat.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/rndcoat.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Coats/rndcoat.rsi/meta.json index 2311851853a..b8079572aec 100644 --- a/Resources/Textures/Clothing/OuterClothing/Coats/rndcoat.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Coats/rndcoat.rsi/meta.json @@ -1,49 +1,57 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" - }, - { - "name": "icon-open" - }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "open-equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-vox", - "directions": 4 - }, - { - "name": "open-equipped-OUTERCLOTHING-vox", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "open-inhand-left", - "directions": 4 - }, - { - "name": "open-inhand-right", - "directions": 4 - } - ] + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, sprites for resomi made by Pofitlo", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "icon-open" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "open-equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, + { + "name": "open-equipped-OUTERCLOTHING-vox", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, + { + "name": "open-equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "open-inhand-left", + "directions": 4 + }, + { + "name": "open-inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/rndcoat.rsi/open-equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Coats/rndcoat.rsi/open-equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..b96b0684085 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/rndcoat.rsi/open-equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/space_asshole.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Coats/space_asshole.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..1b2864960a3 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/space_asshole.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/space_asshole.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Coats/space_asshole.rsi/meta.json index 70ee956feac..9cb72e69077 100644 --- a/Resources/Textures/Clothing/OuterClothing/Coats/space_asshole.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Coats/space_asshole.rsi/meta.json @@ -1,26 +1,30 @@ { - "version": 1, - "license": "CC0-1.0", - "copyright": "Made by Github user Psychpsyo for Space Station 14", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC0-1.0", + "copyright": "Made by Github user Psychpsyo for Space Station 14, sprites for resomi made by Pofitlo", + "size": { + "x": 32, + "y": 32 }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/syndicate/coatsyndiecap.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Coats/syndicate/coatsyndiecap.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..c2d6487066f Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/syndicate/coatsyndiecap.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/syndicate/coatsyndiecap.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Coats/syndicate/coatsyndiecap.rsi/meta.json index eadf9c61d48..81dd136fddf 100644 --- a/Resources/Textures/Clothing/OuterClothing/Coats/syndicate/coatsyndiecap.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Coats/syndicate/coatsyndiecap.rsi/meta.json @@ -1,26 +1,30 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Sprited by belay5 (Discord)", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprited by belay5 (Discord), sprites for resomi made by Pofitlo", + "size": { + "x": 32, + "y": 32 }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/syndicate/coatsyndiecaparmored.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Coats/syndicate/coatsyndiecaparmored.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..4d627744703 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/syndicate/coatsyndiecaparmored.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/syndicate/coatsyndiecaparmored.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Coats/syndicate/coatsyndiecaparmored.rsi/meta.json index eadf9c61d48..81dd136fddf 100644 --- a/Resources/Textures/Clothing/OuterClothing/Coats/syndicate/coatsyndiecaparmored.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Coats/syndicate/coatsyndiecaparmored.rsi/meta.json @@ -1,26 +1,30 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Sprited by belay5 (Discord)", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprited by belay5 (Discord), sprites for resomi made by Pofitlo", + "size": { + "x": 32, + "y": 32 }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/trenchcoat.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Coats/trenchcoat.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..e88ee65900c Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/trenchcoat.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/trenchcoat.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Coats/trenchcoat.rsi/meta.json index 4028e552d35..fa64459b853 100644 --- a/Resources/Textures/Clothing/OuterClothing/Coats/trenchcoat.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Coats/trenchcoat.rsi/meta.json @@ -1,41 +1,49 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from paradise at commit https://github.com/ParadiseSS13/Paradise/pull/19491/commits/e9a900022ca1cf0fed0e320c7a0cce500287ab99", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from paradise at commit https://github.com/ParadiseSS13/Paradise/pull/19491/commits/e9a900022ca1cf0fed0e320c7a0cce500287ab99, sprites for resomi made by Pofitlo", + "size": { + "x": 32, + "y": 32 }, - { - "name": "icon-open" - }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "open-equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "open-inhand-left", - "directions": 4 - }, - { - "name": "open-inhand-right", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "icon-open" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "open-equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, + { + "name": "open-equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "open-inhand-left", + "directions": 4 + }, + { + "name": "open-inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/trenchcoat.rsi/open-equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Coats/trenchcoat.rsi/open-equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..b6447e420d4 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/trenchcoat.rsi/open-equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..7789bc785ee Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/meta.json index 232bec9c0a2..166b20ffa1e 100644 --- a/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/meta.json @@ -1,30 +1,34 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79, equipped-OUTERCLOTHING-resomi made by Pofitlo", + "size": { + "x": 32, + "y": 32 }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-vox", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/windbreaker_paramedic.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Coats/windbreaker_paramedic.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..07fece3f220 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/windbreaker_paramedic.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/windbreaker_paramedic.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Coats/windbreaker_paramedic.rsi/meta.json index 8e0b18f9a23..57e772ca6fd 100644 --- a/Resources/Textures/Clothing/OuterClothing/Coats/windbreaker_paramedic.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Coats/windbreaker_paramedic.rsi/meta.json @@ -1,41 +1,49 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Made by MagnusCrowe (Github) for SS14", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by MagnusCrowe (Github) for SS14, sprites for resomi made by Pofitlo", + "size": { + "x": 32, + "y": 32 }, - { - "name": "icon-open" - }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "open-equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "open-inhand-left", - "directions": 4 - }, - { - "name": "open-inhand-right", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "icon-open" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "open-equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, + { + "name": "open-equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "open-inhand-left", + "directions": 4 + }, + { + "name": "open-inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/windbreaker_paramedic.rsi/open-equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Coats/windbreaker_paramedic.rsi/open-equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..366f847bf3e Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/windbreaker_paramedic.rsi/open-equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..9c464f95132 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi/meta.json index b7b0719efa4..4a67c44084a 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi/meta.json @@ -1,30 +1,34 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from paradisestation at commit https://github.com/ParadiseSS13/Paradise/commit/12c21ced8432015485484b17e311dcceb7c458f6. Vox state by Flareguy for Space Station 14", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from paradisestation at commit https://github.com/ParadiseSS13/Paradise/commit/12c21ced8432015485484b17e311dcceb7c458f6. Vox state by Flareguy for Space Station 14, equipped-OUTERCLOTHING-resomi made by svarshiksatanist (Discord)", + "size": { + "x": 32, + "y": 32 }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-vox", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..dbc7d4480ea Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi/meta.json index 6de2d485b82..ef0bd8ab720 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from paradisestation at commit https://github.com/ParadiseSS13/Paradise/commit/12c21ced8432015485484b17e311dcceb7c458f6. Vox sprite by Flareguy for Space Station 14", + "copyright": "Taken from paradisestation at commit https://github.com/ParadiseSS13/Paradise/commit/12c21ced8432015485484b17e311dcceb7c458f6. Vox sprite by Flareguy for Space Station 14, equipped-OUTERCLOTHING-resomi made by svarshiksatanist (Discord)", "size": { "x": 32, "y": 32 @@ -18,6 +18,10 @@ "name": "equipped-OUTERCLOTHING-vox", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..000826a3867 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi/meta.json index 6de2d485b82..ef0bd8ab720 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from paradisestation at commit https://github.com/ParadiseSS13/Paradise/commit/12c21ced8432015485484b17e311dcceb7c458f6. Vox sprite by Flareguy for Space Station 14", + "copyright": "Taken from paradisestation at commit https://github.com/ParadiseSS13/Paradise/commit/12c21ced8432015485484b17e311dcceb7c458f6. Vox sprite by Flareguy for Space Station 14, equipped-OUTERCLOTHING-resomi made by svarshiksatanist (Discord)", "size": { "x": 32, "y": 32 @@ -18,6 +18,10 @@ "name": "equipped-OUTERCLOTHING-vox", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..8bd0b7c6838 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi/meta.json index daa64b2f5c6..a1b596f96a6 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from paradisestation at commit https://github.com/ParadiseSS13/Paradise/commit/12c21ced8432015485484b17e311dcceb7c458f6. Vox sprite made by Flareguy", + "copyright": "Taken from paradisestation at commit https://github.com/ParadiseSS13/Paradise/commit/12c21ced8432015485484b17e311dcceb7c458f6. Vox sprite made by Flareguy, equipped-OUTERCLOTHING-resomi made by svarshiksatanist (Discord)", "size": { "x": 32, "y": 32 @@ -18,6 +18,10 @@ "name": "equipped-OUTERCLOTHING-vox", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..c58e3fbad0b Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi/meta.json index 6de2d485b82..ef0bd8ab720 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from paradisestation at commit https://github.com/ParadiseSS13/Paradise/commit/12c21ced8432015485484b17e311dcceb7c458f6. Vox sprite by Flareguy for Space Station 14", + "copyright": "Taken from paradisestation at commit https://github.com/ParadiseSS13/Paradise/commit/12c21ced8432015485484b17e311dcceb7c458f6. Vox sprite by Flareguy for Space Station 14, equipped-OUTERCLOTHING-resomi made by svarshiksatanist (Discord)", "size": { "x": 32, "y": 32 @@ -18,6 +18,10 @@ "name": "equipped-OUTERCLOTHING-vox", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/atmospherics.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/atmospherics.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..4b2673d2a7d Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/atmospherics.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/atmospherics.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/atmospherics.rsi/meta.json index 2da9e2ad1d5..2dad893203e 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/atmospherics.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/atmospherics.rsi/meta.json @@ -1,11 +1,11 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox state made by Flareguy for SS14", - "size": { - "x": 32, - "y": 32 - }, + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox state made by Flareguy for SS14, equipped-OUTERCLOTHING-resomi made by svarshiksatanist (Discord)", + "size": { + "x": 32, + "y": 32 + }, "states": [ { "name": "icon" @@ -18,6 +18,10 @@ "name": "equipped-OUTERCLOTHING-vox", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/basic.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/basic.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..9fd8a977252 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/basic.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/basic.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/basic.rsi/meta.json index 3067907ba97..baf673bb775 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/basic.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/basic.rsi/meta.json @@ -1,34 +1,38 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a. Further modifications and derivate works (inhand-left and inhand-right) under same license, derivative monkey made by brainfood1183 (github) for ss14, harpy by VMSolidus", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a. Further modifications and derivate works (inhand-left and inhand-right) under same license, derivative monkey made by brainfood1183 (github) for ss14, harpy by VMSolidus, equipped-OUTERCLOTHING-resomi made by svarshiksatanist (Discord)", + "size": { + "x": 32, + "y": 32 }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-monkey", - "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-harpy", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-monkey", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-harpy", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmedic.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmedic.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..2d516c93d0a Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmedic.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmedic.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmedic.rsi/meta.json index 6cfe1ea214d..30b4eebec5b 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmedic.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmedic.rsi/meta.json @@ -1,30 +1,34 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Made by PuroSlavKing (github) for SS14, harpy by VMSolidus", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by PuroSlavKing (github) for SS14, harpy by VMSolidus, equipped-OUTERCLOTHING-resomi made by svarshiksatanist (Discord)", + "size": { + "x": 32, + "y": 32 }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-harpy", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-harpy", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..3d1fdaaba01 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/meta.json index 3271d26a2cf..37548eade12 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/meta.json @@ -1,11 +1,11 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Made by Emisse for SS14. Vox state made by Flareguy for SS14", - "size": { - "x": 32, - "y": 32 - }, + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by Emisse for SS14. Vox state made by Flareguy for SS14, equipped-OUTERCLOTHING-resomi made by svarshiksatanist (Discord)", + "size": { + "x": 32, + "y": 32 + }, "states": [ { "name": "icon" @@ -15,8 +15,12 @@ "directions": 4 }, { - "name": "equipped-OUTERCLOTHING-vox", - "directions": 4 + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 }, { "name": "inhand-left", diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/clown.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/clown.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..50a635e360d Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/clown.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/clown.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/clown.rsi/meta.json index 60c53e9cc28..8cec422e419 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/clown.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/clown.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, modified by brainfood1183 (github), harpy by VMSolidus. Vox state made by Flareguy for SS14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, modified by brainfood1183 (github), harpy by VMSolidus. Vox state made by Flareguy for SS14, equipped-OUTERCLOTHING-resomi made by svarshiksatanist (Discord)", "size": { "x": 32, "y": 32 @@ -22,6 +22,10 @@ "name": "equipped-OUTERCLOTHING-vox", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..734b710f805 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/meta.json index 5a3fd99c11f..92a001a6f26 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/meta.json @@ -1,11 +1,11 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Sprite made by Gtheglorious based on the sprite made by emisse for ss14, harpy variant by VMSolidus, vox state made by Flareguy for SS14.", - "size": { - "x": 32, - "y": 32 - }, + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprite made by Gtheglorious based on the sprite made by emisse for ss14, harpy variant by VMSolidus, vox state made by Flareguy for SS14, equipped-OUTERCLOTHING-resomi made by svarshiksatanist (Discord)", + "size": { + "x": 32, + "y": 32 + }, "states": [ { "name": "icon" @@ -15,8 +15,12 @@ "directions": 4 }, { - "name": "equipped-OUTERCLOTHING-vox", - "directions": 4 + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 }, { "name": "inhand-left", diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..2d945174bc2 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/meta.json index 5054eea8f45..5af369c3047 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/meta.json @@ -1,34 +1,38 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, edited by Emisse for SS14. Vox state made by Flareguy for SS14, harpy edit by VMSolidus", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, edited by Emisse for SS14. Vox state made by Flareguy for SS14, harpy edit by VMSolidus, equipped-OUTERCLOTHING-resomi made by svarshiksatanist (Discord)", + "size": { + "x": 32, + "y": 32 }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-harpy", - "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-vox", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-harpy", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering-white.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering-white.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..d41cfc309a7 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering-white.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering-white.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering-white.rsi/meta.json index 0a78966c1d5..2dad893203e 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering-white.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering-white.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. Vox state made by Flareguy for SS14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox state made by Flareguy for SS14, equipped-OUTERCLOTHING-resomi made by svarshiksatanist (Discord)", "size": { "x": 32, "y": 32 @@ -18,6 +18,10 @@ "name": "equipped-OUTERCLOTHING-vox", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 @@ -31,4 +35,4 @@ "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..0a185bd59fd Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering.rsi/meta.json index 13f389a778c..11e89e74116 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering.rsi/meta.json @@ -1,11 +1,11 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, harpy version by VMSolidus. Vox state made by Flareguy for SS14", - "size": { - "x": 32, - "y": 32 - }, + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, harpy version by VMSolidus. Vox state made by Flareguy for SS14, equipped-OUTERCLOTHING-resomi made by svarshiksatanist (Discord)", + "size": { + "x": 32, + "y": 32 + }, "states": [ { "name": "icon" @@ -15,8 +15,12 @@ "directions": 4 }, { - "name": "equipped-OUTERCLOTHING-vox", - "directions": 4 + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 }, { "name": "inhand-left", diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/lingspacesuit.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/lingspacesuit.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..cd1b7c55723 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/lingspacesuit.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/lingspacesuit.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/lingspacesuit.rsi/meta.json index 0249e359954..5ab5fdc32b2 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/lingspacesuit.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/lingspacesuit.rsi/meta.json @@ -1,26 +1,30 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/blob/master/icons/mob/clothing/suit.dmi", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/blob/master/icons/mob/clothing/suit.dmi, equipped-OUTERCLOTHING-resomi made by svarshiksatanist (Discord)", + "size": { + "x": 32, + "y": 32 }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] -} \ No newline at end of file + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..a1a0c617210 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi/meta.json index 76e3264cbce..c663f51c10f 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Texture edit from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox state made by Flareguy for SS14", + "copyright": "Texture edit from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox state made by Flareguy for SS14, equipped-OUTERCLOTHING-resomi made by svarshiksatanist (Discord)", "size": { "x": 32, "y": 32 @@ -18,6 +18,10 @@ "name": "equipped-OUTERCLOTHING-vox", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 @@ -31,4 +35,4 @@ "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/maxim.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/maxim.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..26a3f759517 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/maxim.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/maxim.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/maxim.rsi/meta.json index 9acde9a4dea..dfd26be9ab7 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/maxim.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/maxim.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/6b3f58d7de4d4e374282819a7001eaa9bde1676d. Vox state made by Flareguy for SS14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/6b3f58d7de4d4e374282819a7001eaa9bde1676d. Vox state made by Flareguy for SS14, equipped-OUTERCLOTHING-resomi made by svarshiksatanist (Discord)", "size": { "x": 32, "y": 32 @@ -18,6 +18,10 @@ "name": "equipped-OUTERCLOTHING-vox", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 @@ -27,4 +31,4 @@ "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..ae7c2c1d1d5 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/meta.json index 0a78966c1d5..2dad893203e 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/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/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox state made by Flareguy for SS14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox state made by Flareguy for SS14, equipped-OUTERCLOTHING-resomi made by svarshiksatanist (Discord)", "size": { "x": 32, "y": 32 @@ -18,6 +18,10 @@ "name": "equipped-OUTERCLOTHING-vox", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 @@ -31,4 +35,4 @@ "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/mime.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/mime.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..7afb23d0abe Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/mime.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/mime.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/mime.rsi/meta.json index a5f992108c0..c035800af9f 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/mime.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/mime.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, modified by brainfood1183 (github), sprited(resprited) by Fazansen(https://github.com/Fazansen)", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, modified by brainfood1183 (github), sprited(resprited) by Fazansen(https://github.com/Fazansen), equipped-OUTERCLOTHING-resomi made by svarshiksatanist (Discord)", "size": { "x": 32, "y": 32 @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..1707fd74df6 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/meta.json index 403cfec384c..ded86993aff 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from paradise station git at commit https://github.com/ParadiseSS13/Paradise/commit/e5e584804b4b0b373a6a69d23afb73fd3c094365, redrawn by Ubaser. Vox state made by Flareguy for SS14", + "copyright": "Taken from paradise station git at commit https://github.com/ParadiseSS13/Paradise/commit/e5e584804b4b0b373a6a69d23afb73fd3c094365, redrawn by Ubaser. Vox state made by Flareguy for SS14, equipped-OUTERCLOTHING-resomi made by svarshiksatanist (Discord)", "size": { "x": 32, "y": 32 @@ -18,6 +18,10 @@ "name": "equipped-OUTERCLOTHING-vox", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 @@ -31,4 +35,4 @@ "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/piratecaptain.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/piratecaptain.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..c440b11eb1e Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/piratecaptain.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/piratecaptain.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/piratecaptain.rsi/meta.json index 8663673f5c6..a622eff6827 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/piratecaptain.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/piratecaptain.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Made by brainfood1183 (Github) for ss14. Vox state made by Flareguy for SS14", + "copyright": "Made by brainfood1183 (Github) for ss14. Vox state made by Flareguy for SS14, equipped-OUTERCLOTHING-resomi made by svarshiksatanist (Discord)", "size": { "x": 32, "y": 32 @@ -18,6 +18,10 @@ "name": "equipped-OUTERCLOTHING-vox", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/pirateeva.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/pirateeva.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..7639085f201 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/pirateeva.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/pirateeva.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/pirateeva.rsi/meta.json index 8663673f5c6..a622eff6827 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/pirateeva.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/pirateeva.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Made by brainfood1183 (Github) for ss14. Vox state made by Flareguy for SS14", + "copyright": "Made by brainfood1183 (Github) for ss14. Vox state made by Flareguy for SS14, equipped-OUTERCLOTHING-resomi made by svarshiksatanist (Discord)", "size": { "x": 32, "y": 32 @@ -18,6 +18,10 @@ "name": "equipped-OUTERCLOTHING-vox", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..42c44642632 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/meta.json index c3caac82252..9b48de0913f 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/meta.json @@ -1,34 +1,38 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox state made by Flareguy for SS14", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox state made by Flareguy for SS14, equipped-OUTERCLOTHING-resomi made by svarshiksatanist (Discord)", + "size": { + "x": 32, + "y": 32 }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-harpy", - "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-vox", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-harpy", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/salvage.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/salvage.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..d007548d09f Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/salvage.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/salvage.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/salvage.rsi/meta.json index 0a78966c1d5..2dad893203e 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/salvage.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/salvage.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. Vox state made by Flareguy for SS14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox state made by Flareguy for SS14, equipped-OUTERCLOTHING-resomi made by svarshiksatanist (Discord)", "size": { "x": 32, "y": 32 @@ -18,6 +18,10 @@ "name": "equipped-OUTERCLOTHING-vox", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 @@ -31,4 +35,4 @@ "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/santahardsuit.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/santahardsuit.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..82260fda537 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/santahardsuit.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/santahardsuit.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/santahardsuit.rsi/meta.json index eb28d4c8a1f..1d378560e89 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/santahardsuit.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/santahardsuit.rsi/meta.json @@ -1,30 +1,34 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Edited by StanTheCarpenter. Originally taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox state made by Flareguy for SS14", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Edited by StanTheCarpenter. Originally taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox state made by Flareguy for SS14, equipped-OUTERCLOTHING-resomi made by svarshiksatanist (Discord)", + "size": { + "x": 32, + "y": 32 }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-vox", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-red.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-red.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..42df082df3a Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-red.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-red.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-red.rsi/meta.json index 15aef26a56c..f19214099c7 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-red.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-red.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. Vox state made by Flareguy for SS14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox state made by Flareguy for SS14, equipped-OUTERCLOTHING-resomi made by svarshiksatanist (Discord)", "size": { "x": 32, "y": 32 @@ -18,6 +18,10 @@ "name": "equipped-OUTERCLOTHING-vox", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-warden.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-warden.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..ad383d4368a Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-warden.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-warden.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-warden.rsi/meta.json index 180439fbcce..5662f872fc7 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-warden.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-warden.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Sprite made by Gtheglorious based on the sprite made by Alekshhh for SS14. Vox state made by Flareguy for SS14", + "copyright": "Sprite made by Gtheglorious based on the sprite made by Alekshhh for SS14. Vox state made by Flareguy for SS14, equipped-OUTERCLOTHING-resomi made by svarshiksatanist (Discord)", "size": { "x": 32, "y": 32 @@ -18,6 +18,10 @@ "name": "equipped-OUTERCLOTHING-vox", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..859dae8bdeb Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security.rsi/meta.json index 8acf2ddc611..d215ca0c136 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Sprite made by Gtheglorious based on the sprite taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox state made by Flareguy for SS14", + "copyright": "Sprite made by Gtheglorious based on the sprite taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox state made by Flareguy for SS14, equipped-OUTERCLOTHING-resomi made by svarshiksatanist (Discord)", "size": { "x": 32, "y": 32 @@ -18,6 +18,10 @@ "name": "equipped-OUTERCLOTHING-vox", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/spatio.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/spatio.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..bb5cba1c4e0 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/spatio.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/spatio.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/spatio.rsi/meta.json index c04f7d758c0..9fdf7bb907b 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/spatio.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/spatio.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Original by Emisse, modified by EmoGarbage404. Vox state made by Flareguy for SS14", + "copyright": "Original by Emisse, modified by EmoGarbage404. Vox state made by Flareguy for SS14, equipped-OUTERCLOTHING-resomi made by svarshiksatanist (Discord)", "size": { "x": 32, "y": 32 @@ -18,6 +18,10 @@ "name": "equipped-OUTERCLOTHING-vox", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 @@ -31,4 +35,4 @@ "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..e97832c84a9 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/meta.json index 30830125099..85f5555ce80 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/meta.json @@ -1,38 +1,42 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/fb2d71495bfe81446159ef528534193d09dd8d34, equipped-OUTERCLOTHING-monkey made by Dutch-VanDerLinde, vox state made by Flareguy for SS14", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/fb2d71495bfe81446159ef528534193d09dd8d34, equipped-OUTERCLOTHING-monkey made by Dutch-VanDerLinde, vox state made by Flareguy for SS14, equipped-OUTERCLOTHING-resomi made by svarshiksatanist (Discord)", + "size": { + "x": 32, + "y": 32 }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-vox", - "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-monkey", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-harpy", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-monkey", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-harpy", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..adc3727a932 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/meta.json index 3744e040b68..cffd0a8b820 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from vg at commit https://github.com/vgstation-coders/vgstation13/commit/a16e41020a93479e9a7e2af343b1b74f7f2a61bd. Vox state made by Flareguy for SS14", + "copyright": "Taken from vg at commit https://github.com/vgstation-coders/vgstation13/commit/a16e41020a93479e9a7e2af343b1b74f7f2a61bd. Vox state made by Flareguy for SS14, equipped-OUTERCLOTHING-resomi made by svarshiksatanist (Discord)", "size": { "x": 32, "y": 32 @@ -18,6 +18,10 @@ "name": "equipped-OUTERCLOTHING-vox", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 @@ -31,4 +35,4 @@ "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..93e51f0d88b Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/meta.json index cde1c059777..6e6b7976853 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from vg at commit https://github.com/vgstation-coders/vgstation13/commit/a16e41020a93479e9a7e2af343b1b74f7f2a61bd, harpy by VMSolidus. Vox state made by Flareguy for SS14", + "copyright": "Taken from vg at commit https://github.com/vgstation-coders/vgstation13/commit/a16e41020a93479e9a7e2af343b1b74f7f2a61bd, harpy by VMSolidus. Vox state made by Flareguy for SS14, equipped-OUTERCLOTHING-resomi made by svarshiksatanist (Discord)", "size": { "x": 32, "y": 32 @@ -22,6 +22,10 @@ "name": "equipped-OUTERCLOTHING-vox", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..cb354b5360c Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/meta.json index 2026bba8931..a4dc6c601ec 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Based on tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, modified by EmoGarbage404 (github), harpy by VMSolidus. Vox state made by Flareguy for SS14", + "copyright": "Based on tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, modified by EmoGarbage404 (github), harpy by VMSolidus. Vox state made by Flareguy for SS14, equipped-OUTERCLOTHING-resomi made by svarshiksatanist (Discord)", "size": { "x": 32, "y": 32 @@ -18,6 +18,10 @@ "name": "equipped-OUTERCLOTHING-vox", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 @@ -31,4 +35,4 @@ "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/wizard.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/wizard.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..e97ee129fca Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/wizard.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/wizard.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/wizard.rsi/meta.json index 15aef26a56c..f19214099c7 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/wizard.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/wizard.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. Vox state made by Flareguy for SS14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox state made by Flareguy for SS14, equipped-OUTERCLOTHING-resomi made by svarshiksatanist (Discord)", "size": { "x": 32, "y": 32 @@ -18,6 +18,10 @@ "name": "equipped-OUTERCLOTHING-vox", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/apron.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Misc/apron.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..4ff622fe9e8 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Misc/apron.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/apron.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Misc/apron.rsi/meta.json index e482264df5f..71828a65920 100644 --- a/Resources/Textures/Clothing/OuterClothing/Misc/apron.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Misc/apron.rsi/meta.json @@ -1,26 +1,30 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, equipped-OUTERCLOTHING-resomi made by svarshiksatanist (Discord)", + "size": { + "x": 32, + "y": 32 }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/apronbar.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Misc/apronbar.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..69e04500e3f Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Misc/apronbar.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/apronbar.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Misc/apronbar.rsi/meta.json index 905cf722cea..601f0325f25 100644 --- a/Resources/Textures/Clothing/OuterClothing/Misc/apronbar.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Misc/apronbar.rsi/meta.json @@ -1,26 +1,30 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Edited from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Edited from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, equipped-OUTERCLOTHING-resomi made by svarshiksatanist (Discord)", + "size": { + "x": 32, + "y": 32 }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/apronbotanist.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Misc/apronbotanist.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..b82233aef27 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Misc/apronbotanist.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/apronbotanist.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Misc/apronbotanist.rsi/meta.json index 232bec9c0a2..9bea4a37e98 100644 --- a/Resources/Textures/Clothing/OuterClothing/Misc/apronbotanist.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Misc/apronbotanist.rsi/meta.json @@ -1,30 +1,34 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79, equipped-OUTERCLOTHING-resomi made by svarshiksatanist (Discord)", + "size": { + "x": 32, + "y": 32 }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-vox", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/apronchef.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Misc/apronchef.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..6dfc6f1eba8 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Misc/apronchef.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/apronchef.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Misc/apronchef.rsi/meta.json index 232bec9c0a2..9bea4a37e98 100644 --- a/Resources/Textures/Clothing/OuterClothing/Misc/apronchef.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Misc/apronchef.rsi/meta.json @@ -1,30 +1,34 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79, equipped-OUTERCLOTHING-resomi made by svarshiksatanist (Discord)", + "size": { + "x": 32, + "y": 32 }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-vox", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/black_hoodie.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Misc/black_hoodie.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..7dca175fd91 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Misc/black_hoodie.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/black_hoodie.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Misc/black_hoodie.rsi/meta.json index 442bfb29202..a4cead8a748 100644 --- a/Resources/Textures/Clothing/OuterClothing/Misc/black_hoodie.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Misc/black_hoodie.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, equipped-OUTERCLOTHING-resomi made by svarshiksatanist (Discord)", "size": { "x": 32, "y": 32 @@ -21,6 +21,14 @@ "name": "open-equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, + { + "name": "open-equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/black_hoodie.rsi/open-equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Misc/black_hoodie.rsi/open-equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..77feb1f60d0 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Misc/black_hoodie.rsi/open-equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/cardborg.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Misc/cardborg.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..682eb15b716 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Misc/cardborg.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/cardborg.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Misc/cardborg.rsi/meta.json index 15aef26a56c..f19214099c7 100644 --- a/Resources/Textures/Clothing/OuterClothing/Misc/cardborg.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Misc/cardborg.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. Vox state made by Flareguy for SS14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox state made by Flareguy for SS14, equipped-OUTERCLOTHING-resomi made by svarshiksatanist (Discord)", "size": { "x": 32, "y": 32 @@ -18,6 +18,10 @@ "name": "equipped-OUTERCLOTHING-vox", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/chaplain_hoodie.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Misc/chaplain_hoodie.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..c731f482eac Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Misc/chaplain_hoodie.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/chaplain_hoodie.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Misc/chaplain_hoodie.rsi/meta.json index e482264df5f..05b2c2562d7 100644 --- a/Resources/Textures/Clothing/OuterClothing/Misc/chaplain_hoodie.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Misc/chaplain_hoodie.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, equipped-OUTERCLOTHING-resomi made by svarshiksatanist (Discord)", "size": { "x": 32, "y": 32 @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/chef.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Misc/chef.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..182dcbd2737 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Misc/chef.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/chef.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Misc/chef.rsi/meta.json index 232bec9c0a2..aec6f25b88f 100644 --- a/Resources/Textures/Clothing/OuterClothing/Misc/chef.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Misc/chef.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. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79, equipped-OUTERCLOTHING-resomi made by svarshiksatanist (Discord)", "size": { "x": 32, "y": 32 @@ -18,6 +18,10 @@ "name": "equipped-OUTERCLOTHING-vox", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/classicponcho.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Misc/classicponcho.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..17562514c0a Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Misc/classicponcho.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/classicponcho.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Misc/classicponcho.rsi/meta.json index 21cd9257fdf..261f9971905 100644 --- a/Resources/Textures/Clothing/OuterClothing/Misc/classicponcho.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Misc/classicponcho.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. equipped-OUTERCLOTHING-vox state taken from Paradise at https://github.com/ParadiseSS13/Paradise/blob/fce54deb01d465957691ba2907218d4af4830db2/icons/mob/clothing/species/vox/suit.dmi", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. equipped-OUTERCLOTHING-vox state taken from Paradise at https://github.com/ParadiseSS13/Paradise/blob/fce54deb01d465957691ba2907218d4af4830db2/icons/mob/clothing/species/vox/suit.dmi, equipped-OUTERCLOTHING-resomi made by svarshiksatanist (Discord)", "size": { "x": 32, "y": 32 @@ -18,6 +18,10 @@ "name": "equipped-OUTERCLOTHING-vox", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/cultrobes.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Misc/cultrobes.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..c40977e0913 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Misc/cultrobes.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/cultrobes.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Misc/cultrobes.rsi/meta.json index e482264df5f..879b1aa3b00 100644 --- a/Resources/Textures/Clothing/OuterClothing/Misc/cultrobes.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Misc/cultrobes.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/flannel_jacket.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Misc/flannel_jacket.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..f5c78416d96 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Misc/flannel_jacket.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/flannel_jacket.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Misc/flannel_jacket.rsi/meta.json index 7b4a51dfa47..c09e28cca88 100644 --- a/Resources/Textures/Clothing/OuterClothing/Misc/flannel_jacket.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Misc/flannel_jacket.rsi/meta.json @@ -1,41 +1,45 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Sprites by nmajask (Github) for SS14", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprites by nmajask (Github) for SS14, equipped-OUTERCLOTHING-resomi made by svarshiksatanist (Discord)", + "size": { + "x": 32, + "y": 32 }, - { - "name": "icon-lines" - }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-lines", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-left-lines", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "inhand-right-lines", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "icon-lines" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-lines", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-left-lines", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "inhand-right-lines", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/ghostsheet.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Misc/ghostsheet.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..0921a3bf4f3 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Misc/ghostsheet.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/ghostsheet.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Misc/ghostsheet.rsi/meta.json index ccfd0c03038..9bb29f82cf2 100644 --- a/Resources/Textures/Clothing/OuterClothing/Misc/ghostsheet.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Misc/ghostsheet.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/pull/38809. Vox state by Flareguy for SS1", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/pull/38809. Vox state by Flareguy for SS14, equipped-OUTERCLOTHING-resomi made by svarshiksatanist (Discord)", "size": { "x": 32, "y": 32 @@ -18,6 +18,10 @@ "name": "equipped-OUTERCLOTHING-vox", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/grey_hoodie.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Misc/grey_hoodie.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..279bf73c8bf Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Misc/grey_hoodie.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/grey_hoodie.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Misc/grey_hoodie.rsi/meta.json index b5f8619d65a..52211bc2be6 100644 --- a/Resources/Textures/Clothing/OuterClothing/Misc/grey_hoodie.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Misc/grey_hoodie.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. Vox state by Flareguy for SS14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox state by Flareguy for SS14, equipped-OUTERCLOTHING-resomi made by svarshiksatanist (Discord)", "size": { "x": 32, "y": 32 @@ -25,6 +25,14 @@ "name": "open-equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, + { + "name": "open-equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/grey_hoodie.rsi/open-equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Misc/grey_hoodie.rsi/open-equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..e6f4bd301c4 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Misc/grey_hoodie.rsi/open-equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/hospitalgown.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Misc/hospitalgown.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..c8898352b23 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Misc/hospitalgown.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/hospitalgown.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Misc/hospitalgown.rsi/meta.json index e482264df5f..05b2c2562d7 100644 --- a/Resources/Textures/Clothing/OuterClothing/Misc/hospitalgown.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Misc/hospitalgown.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, equipped-OUTERCLOTHING-resomi made by svarshiksatanist (Discord)", "size": { "x": 32, "y": 32 @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/judge.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Misc/judge.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..d53f87e92da Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Misc/judge.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/judge.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Misc/judge.rsi/meta.json index e482264df5f..05b2c2562d7 100644 --- a/Resources/Textures/Clothing/OuterClothing/Misc/judge.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Misc/judge.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, equipped-OUTERCLOTHING-resomi made by svarshiksatanist (Discord)", "size": { "x": 32, "y": 32 @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/nunrobe.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Misc/nunrobe.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..1d82b6240c4 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Misc/nunrobe.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/nunrobe.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Misc/nunrobe.rsi/meta.json index 3fa2c7657cb..737763c7192 100644 --- a/Resources/Textures/Clothing/OuterClothing/Misc/nunrobe.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Misc/nunrobe.rsi/meta.json @@ -18,6 +18,10 @@ "name": "equipped-OUTERCLOTHING-vox", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/plaguedoctorsuit.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Misc/plaguedoctorsuit.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..55fcf309e34 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Misc/plaguedoctorsuit.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/plaguedoctorsuit.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Misc/plaguedoctorsuit.rsi/meta.json index e39c53ebe1b..cff01e350b9 100644 --- a/Resources/Textures/Clothing/OuterClothing/Misc/plaguedoctorsuit.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Misc/plaguedoctorsuit.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from TGstation github https://github.com/tgstation/tgstation/commit/e89db4dd4f42377b0adafb06806a763314a89034 , edited by Alekshhh", + "copyright": "Taken from TGstation github https://github.com/tgstation/tgstation/commit/e89db4dd4f42377b0adafb06806a763314a89034 , edited by Alekshhh, equipped-OUTERCLOTHING-resomi made by svarshiksatanist (Discord)", "size": { "x": 32, "y": 32 @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/poncho.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Misc/poncho.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..64cad6c498b Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Misc/poncho.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/poncho.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Misc/poncho.rsi/meta.json index e482264df5f..05b2c2562d7 100644 --- a/Resources/Textures/Clothing/OuterClothing/Misc/poncho.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Misc/poncho.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, equipped-OUTERCLOTHING-resomi made by svarshiksatanist (Discord)", "size": { "x": 32, "y": 32 @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/red_racoon.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Misc/red_racoon.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..e183fcc8d3f Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Misc/red_racoon.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/red_racoon.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Misc/red_racoon.rsi/meta.json index cd0053daea8..087795f48ba 100644 --- a/Resources/Textures/Clothing/OuterClothing/Misc/red_racoon.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Misc/red_racoon.rsi/meta.json @@ -1,30 +1,34 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Created by netwy(583844759429316618). Vox state made by Flareguy for SS14", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by netwy(583844759429316618). Vox state made by Flareguy for SS14, equipped-OUTERCLOTHING-resomi made by svarshiksatanist (Discord)", + "size": { + "x": 32, + "y": 32 }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-vox", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/redwizard.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Misc/redwizard.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..064583d9576 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Misc/redwizard.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/redwizard.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Misc/redwizard.rsi/meta.json index 15aef26a56c..f19214099c7 100644 --- a/Resources/Textures/Clothing/OuterClothing/Misc/redwizard.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Misc/redwizard.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. Vox state made by Flareguy for SS14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox state made by Flareguy for SS14, equipped-OUTERCLOTHING-resomi made by svarshiksatanist (Discord)", "size": { "x": 32, "y": 32 @@ -18,6 +18,10 @@ "name": "equipped-OUTERCLOTHING-vox", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/santa.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Misc/santa.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..d6dfcbe34e0 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Misc/santa.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/santa.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Misc/santa.rsi/meta.json index e482264df5f..05b2c2562d7 100644 --- a/Resources/Textures/Clothing/OuterClothing/Misc/santa.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Misc/santa.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, equipped-OUTERCLOTHING-resomi made by svarshiksatanist (Discord)", "size": { "x": 32, "y": 32 @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/skubbody.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Misc/skubbody.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..a5d7a154c8c Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Misc/skubbody.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/skubbody.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Misc/skubbody.rsi/meta.json index ed75ee470b7..50f03d45f81 100644 --- a/Resources/Textures/Clothing/OuterClothing/Misc/skubbody.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Misc/skubbody.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "EOBGames from tgstation. Vox state made by Flareguy for SS14", + "copyright": "EOBGames from tgstation. Vox state made by Flareguy for SS14, equipped-OUTERCLOTHING-resomi made by svarshiksatanist (Discord)", "size": { "x": 32, "y": 32 @@ -17,6 +17,10 @@ { "name": "equipped-OUTERCLOTHING-vox", "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/straight_jacket.rsi/body-overlay-2-resomi.png b/Resources/Textures/Clothing/OuterClothing/Misc/straight_jacket.rsi/body-overlay-2-resomi.png new file mode 100644 index 00000000000..eaafa26dae4 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Misc/straight_jacket.rsi/body-overlay-2-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/straight_jacket.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Misc/straight_jacket.rsi/meta.json index 2eda10ef510..61ea1d8b332 100644 --- a/Resources/Textures/Clothing/OuterClothing/Misc/straight_jacket.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Misc/straight_jacket.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. Vox state made by Flareguy for SS14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox state made by Flareguy for SS14, body-overlay-2-resomi made by svarshiksatanist (Discord)", "size": { "x": 32, "y": 32 @@ -18,6 +18,10 @@ "name": "body-overlay-2-vox", "directions": 4 }, + { + "name": "body-overlay-2-resomi", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/violetwizard.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Misc/violetwizard.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..3fcdde419bf Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Misc/violetwizard.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/violetwizard.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Misc/violetwizard.rsi/meta.json index 15aef26a56c..f19214099c7 100644 --- a/Resources/Textures/Clothing/OuterClothing/Misc/violetwizard.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Misc/violetwizard.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. Vox state made by Flareguy for SS14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox state made by Flareguy for SS14, equipped-OUTERCLOTHING-resomi made by svarshiksatanist (Discord)", "size": { "x": 32, "y": 32 @@ -18,6 +18,10 @@ "name": "equipped-OUTERCLOTHING-vox", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/wizard.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Misc/wizard.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..322240a9717 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Misc/wizard.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/wizard.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Misc/wizard.rsi/meta.json index 15aef26a56c..f19214099c7 100644 --- a/Resources/Textures/Clothing/OuterClothing/Misc/wizard.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Misc/wizard.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. Vox state made by Flareguy for SS14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox state made by Flareguy for SS14, equipped-OUTERCLOTHING-resomi made by svarshiksatanist (Discord)", "size": { "x": 32, "y": 32 @@ -18,6 +18,10 @@ "name": "equipped-OUTERCLOTHING-vox", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/ancient_voidsuit.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Suits/ancient_voidsuit.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..c302082a246 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Suits/ancient_voidsuit.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/ancient_voidsuit.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Suits/ancient_voidsuit.rsi/meta.json index 3a71879affb..93c6c0b324a 100644 --- a/Resources/Textures/Clothing/OuterClothing/Suits/ancient_voidsuit.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Suits/ancient_voidsuit.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/tree/fb2d71495bfe81446159ef528534193d09dd8d34", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/tree/fb2d71495bfe81446159ef528534193d09dd8d34, equipped-OUTERCLOTHING-resomi made by Pofitlo", "size": { "x": 32, "y": 32 @@ -40,6 +40,10 @@ ] ] }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/atmos_firesuit.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Suits/atmos_firesuit.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..436a89ee8b7 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Suits/atmos_firesuit.rsi/equipped-OUTERCLOTHING-resomi.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 b05021b6c0c..74bdf2d286f 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, harpy edit by VMSolidus", + "copyright": "Taken from tgstation https://github.com/tgstation/tgstation/blob/master/icons/mob/clothing/suit.dmi, harpy edit by VMSolidus, equipped-OUTERCLOTHING-resomi made by svarshiksatanist (Discord)", "size": { "x": 32, "y": 32 @@ -18,6 +18,10 @@ "name": "equipped-OUTERCLOTHING-harpy", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/bombsuit.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Suits/bombsuit.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..fd579649056 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Suits/bombsuit.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/bombsuit.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Suits/bombsuit.rsi/meta.json index 669e1d98574..207c6bf23d6 100644 --- a/Resources/Textures/Clothing/OuterClothing/Suits/bombsuit.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Suits/bombsuit.rsi/meta.json @@ -1,34 +1,38 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/760f0be7af33a31f5a08a3291864e91539d0ebb7. Vox state made by Flareguy for Space Station 14", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/760f0be7af33a31f5a08a3291864e91539d0ebb7. Vox state made by Flareguy for Space Station 14, equipped-OUTERCLOTHING-resomi made by Pofitlo", + "size": { + "x": 32, + "y": 32 }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-harpy", - "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-vox", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-harpy", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/carpsuit.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Suits/carpsuit.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..c6f035f12a1 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Suits/carpsuit.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/carpsuit.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Suits/carpsuit.rsi/meta.json index 542edf00024..0ffccd6dad5 100644 --- a/Resources/Textures/Clothing/OuterClothing/Suits/carpsuit.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Suits/carpsuit.rsi/meta.json @@ -1,26 +1,30 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Modified by deltanedas (github).", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Modified by deltanedas (github), equipped-OUTERCLOTHING-resomi made by Pofitlo", + "size": { + "x": 32, + "y": 32 }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/chicken.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Suits/chicken.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..64be1977378 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Suits/chicken.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/chicken.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Suits/chicken.rsi/meta.json index ca1146d007e..797575d0eb0 100644 --- a/Resources/Textures/Clothing/OuterClothing/Suits/chicken.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Suits/chicken.rsi/meta.json @@ -1,30 +1,34 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79, equipped-OUTERCLOTHING-resomi made by Pofitlo", + "size": { + "x": 32, + "y": 32 }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-vox", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/eva.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Suits/eva.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..f697ecc1903 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Suits/eva.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/eva.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Suits/eva.rsi/meta.json index 136d76ea97e..537495a23a0 100644 --- a/Resources/Textures/Clothing/OuterClothing/Suits/eva.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Suits/eva.rsi/meta.json @@ -1,38 +1,42 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Sprites by Flareguy & cboyjet, heavily edited from space suit sprites found in https://github.com/tgstation/tgstation/commit/fb2d71495bfe81446159ef528534193d09dd8d34, harpy edit by VMSolidus", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprites by Flareguy & cboyjet, heavily edited from space suit sprites found in https://github.com/tgstation/tgstation/commit/fb2d71495bfe81446159ef528534193d09dd8d34, harpy edit by VMSolidus, equipped-OUTERCLOTHING-resomi made by Pofitlo", + "size": { + "x": 32, + "y": 32 }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-vox", - "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-monkey", - "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-harpy", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-monkey", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-harpy", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/eva_emergency.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Suits/eva_emergency.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..367b60ffe51 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Suits/eva_emergency.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/eva_emergency.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Suits/eva_emergency.rsi/meta.json index 87ae5d0fb0a..865862bba84 100644 --- a/Resources/Textures/Clothing/OuterClothing/Suits/eva_emergency.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Suits/eva_emergency.rsi/meta.json @@ -1,34 +1,38 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Sprites by Flareguy & cboyjet, heavily edited from space suit sprites found in https://github.com/tgstation/tgstation/commit/fb2d71495bfe81446159ef528534193d09dd8d34, harpy edit by VMSolidus", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprites by Flareguy & cboyjet, heavily edited from space suit sprites found in https://github.com/tgstation/tgstation/commit/fb2d71495bfe81446159ef528534193d09dd8d34, harpy edit by VMSolidus, equipped-OUTERCLOTHING-resomi made by Pofitlo", + "size": { + "x": 32, + "y": 32 }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-harpy", - "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-vox", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-harpy", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/eva_prisoner.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Suits/eva_prisoner.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..f22060ed083 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Suits/eva_prisoner.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/eva_prisoner.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Suits/eva_prisoner.rsi/meta.json index 510a3431afe..81ac00cc3ef 100644 --- a/Resources/Textures/Clothing/OuterClothing/Suits/eva_prisoner.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Suits/eva_prisoner.rsi/meta.json @@ -1,38 +1,42 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Sprites by Flareguy & cboyjet, heavily edited from space suit sprites found in https://github.com/tgstation/tgstation/commit/fb2d71495bfe81446159ef528534193d09dd8d34, monkey derivative made by brainfood1183 (github) for ss14, harpy edit by VMSolidus", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprites by Flareguy & cboyjet, heavily edited from space suit sprites found in https://github.com/tgstation/tgstation/commit/fb2d71495bfe81446159ef528534193d09dd8d34, monkey derivative made by brainfood1183 (github) for ss14, harpy edit by VMSolidus, equipped-OUTERCLOTHING-resomi made by Pofitlo", + "size": { + "x": 32, + "y": 32 }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-vox", - "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-monkey", - "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-harpy", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-monkey", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-harpy", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/eva_syndicate.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Suits/eva_syndicate.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..657314acfe1 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Suits/eva_syndicate.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/eva_syndicate.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Suits/eva_syndicate.rsi/meta.json index 510a3431afe..81ac00cc3ef 100644 --- a/Resources/Textures/Clothing/OuterClothing/Suits/eva_syndicate.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Suits/eva_syndicate.rsi/meta.json @@ -1,38 +1,42 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Sprites by Flareguy & cboyjet, heavily edited from space suit sprites found in https://github.com/tgstation/tgstation/commit/fb2d71495bfe81446159ef528534193d09dd8d34, monkey derivative made by brainfood1183 (github) for ss14, harpy edit by VMSolidus", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprites by Flareguy & cboyjet, heavily edited from space suit sprites found in https://github.com/tgstation/tgstation/commit/fb2d71495bfe81446159ef528534193d09dd8d34, monkey derivative made by brainfood1183 (github) for ss14, harpy edit by VMSolidus, equipped-OUTERCLOTHING-resomi made by Pofitlo", + "size": { + "x": 32, + "y": 32 }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-vox", - "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-monkey", - "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-harpy", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-monkey", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-harpy", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/fire.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Suits/fire.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..e1f6044808c Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Suits/fire.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/fire.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Suits/fire.rsi/meta.json index 5edb3774090..79b3367e807 100644 --- a/Resources/Textures/Clothing/OuterClothing/Suits/fire.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Suits/fire.rsi/meta.json @@ -1,34 +1,38 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, harpy edit by VMSolidus. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, harpy edit by VMSolidus. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79, equipped-OUTERCLOTHING-resomi made by Pofitlo", + "size": { + "x": 32, + "y": 32 }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-harpy", - "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-vox", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-harpy", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/iansuit.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Suits/iansuit.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..7a34e8358d5 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Suits/iansuit.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/iansuit.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Suits/iansuit.rsi/meta.json index 542edf00024..f44f275e865 100644 --- a/Resources/Textures/Clothing/OuterClothing/Suits/iansuit.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Suits/iansuit.rsi/meta.json @@ -1,26 +1,30 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Modified by deltanedas (github).", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Modified by deltanedas (github), equipped-OUTERCLOTHING-resomi made by Pofitlo", + "size": { + "x": 32, + "y": 32 }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/monkey.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Suits/monkey.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..c8c9ef3079e Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Suits/monkey.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/monkey.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Suits/monkey.rsi/meta.json index 920eab55204..ee5e465f3b4 100644 --- a/Resources/Textures/Clothing/OuterClothing/Suits/monkey.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Suits/monkey.rsi/meta.json @@ -1,30 +1,34 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox state made by Flareguy for Space Station 14", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox state made by Flareguy for Space Station 14, equipped-OUTERCLOTHING-resomi made by Pofitlo", + "size": { + "x": 32, + "y": 32 }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-vox", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/rad.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Suits/rad.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..7bee0c2fdfa Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Suits/rad.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/rad.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Suits/rad.rsi/meta.json index e3387cff968..521011eac51 100644 --- a/Resources/Textures/Clothing/OuterClothing/Suits/rad.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Suits/rad.rsi/meta.json @@ -1,34 +1,38 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, harpy edit by VMSolidus. Vox state made by Flareguy for Space Station 14", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, harpy edit by VMSolidus. Vox state made by Flareguy for Space Station 14, equipped-OUTERCLOTHING-resomi made by Pofitlo", + "size": { + "x": 32, + "y": 32 }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-harpy", - "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-vox", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-harpy", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/shrine-maiden.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Suits/shrine-maiden.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..8c38a891621 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Suits/shrine-maiden.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/shrine-maiden.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Suits/shrine-maiden.rsi/meta.json index af215f51eda..9c24bd2c40c 100644 --- a/Resources/Textures/Clothing/OuterClothing/Suits/shrine-maiden.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Suits/shrine-maiden.rsi/meta.json @@ -1,26 +1,30 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/3d1a0a5b367a080c42fba0e85ce0382b2cbcb284 . Inhands were made for SS14 and available under the same license.", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/3d1a0a5b367a080c42fba0e85ce0382b2cbcb284 . Inhands were made for SS14 and available under the same license, equipped-OUTERCLOTHING-resomi made by Pofitlo", + "size": { + "x": 32, + "y": 32 }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/spaceninja.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Suits/spaceninja.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..9b445f4bdb1 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Suits/spaceninja.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/spaceninja.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Suits/spaceninja.rsi/meta.json index 0174b889d2e..62c9e5e1afb 100644 --- a/Resources/Textures/Clothing/OuterClothing/Suits/spaceninja.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Suits/spaceninja.rsi/meta.json @@ -1,26 +1,30 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from paradise https://github.com/ParadiseSS13/Paradise/tree/master/icons (unknown commit)", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from paradise https://github.com/ParadiseSS13/Paradise/tree/master/icons (unknown commit), equipped-OUTERCLOTHING-resomi made by Pofitlo", + "size": { + "x": 32, + "y": 32 }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..2a4bc6db3af Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/meta.json index 920eab55204..b85a506bd92 100644 --- a/Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/meta.json @@ -1,30 +1,34 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox state made by Flareguy for Space Station 14", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox state made by Flareguy for Space Station 14", + "size": { + "x": 32, + "y": 32 }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-vox", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..eed46ab83d2 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/meta.json index 4c56c355a49..4d733d56c0d 100644 --- a/Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/meta.json @@ -1,30 +1,34 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. Vox state made by Flareguy for Space Station 14", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. Vox state made by Flareguy for Space Station 14, equipped-OUTERCLOTHING-resomi made by svarshiksatanist (Discord)", + "size": { + "x": 32, + "y": 32 }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-vox", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Vests/mercwebvest.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Vests/mercwebvest.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..37d86c09204 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Vests/mercwebvest.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Vests/mercwebvest.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Vests/mercwebvest.rsi/meta.json index e482264df5f..05b2c2562d7 100644 --- a/Resources/Textures/Clothing/OuterClothing/Vests/mercwebvest.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Vests/mercwebvest.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, equipped-OUTERCLOTHING-resomi made by svarshiksatanist (Discord)", "size": { "x": 32, "y": 32 @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Vests/vest.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Vests/vest.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..003dffb9f8b Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Vests/vest.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Vests/vest.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Vests/vest.rsi/meta.json index 920eab55204..32cf0107cd1 100644 --- a/Resources/Textures/Clothing/OuterClothing/Vests/vest.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Vests/vest.rsi/meta.json @@ -1,30 +1,34 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox state made by Flareguy for Space Station 14", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox state made by Flareguy for Space Station 14, equipped-OUTERCLOTHING-resomi made by svarshiksatanist (Discord)", + "size": { + "x": 32, + "y": 32 }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-vox", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Vests/webvest.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Vests/webvest.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..003dffb9f8b Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Vests/webvest.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Vests/webvest.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Vests/webvest.rsi/meta.json index 0e30ab4d3f1..49f26fb900d 100644 --- a/Resources/Textures/Clothing/OuterClothing/Vests/webvest.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Vests/webvest.rsi/meta.json @@ -1,30 +1,34 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox state by Flareguy for SS14", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox state by Flareguy for SS14, equipped-OUTERCLOTHING-resomi made by svarshiksatanist (Discord)", + "size": { + "x": 32, + "y": 32 }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-vox", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..bb0a013bcdc Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/meta.json index 19f610cdfe9..d4d9f8e4ee5 100644 --- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/meta.json @@ -1,30 +1,34 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/77cff42b6c514e73881a885036be4b4dd2949f62. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/77cff42b6c514e73881a885036be4b4dd2949f62. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79, equipped-OUTERCLOTHING-resomi made by Pofitlo", + "size": { + "x": 32, + "y": 32 }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-vox", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatatmos.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatatmos.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..af5a73d9b5a Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatatmos.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatatmos.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatatmos.rsi/meta.json index 5d9e9636f78..d4d9f8e4ee5 100644 --- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatatmos.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatatmos.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/77cff42b6c514e73881a885036be4b4dd2949f62. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/77cff42b6c514e73881a885036be4b4dd2949f62. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79, equipped-OUTERCLOTHING-resomi made by Pofitlo", "size": { "x": 32, "y": 32 @@ -18,6 +18,10 @@ "name": "equipped-OUTERCLOTHING-vox", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 @@ -27,4 +31,4 @@ "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatbar.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatbar.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..44d2828863e Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatbar.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatbar.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatbar.rsi/meta.json index 19fcc6a9352..f8afcb3fa10 100644 --- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatbar.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatbar.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from vg at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79", + "copyright": "Taken from vg at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79, equipped-OUTERCLOTHING-resomi made by Pofitlo", "size": { "x": 32, "y": 32 @@ -18,6 +18,10 @@ "name": "equipped-OUTERCLOTHING-vox", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 @@ -27,4 +31,4 @@ "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..b7d8a9d2025 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/meta.json index 7ddd460a3bd..58d3a4623be 100644 --- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.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/77cff42b6c514e73881a885036be4b4dd2949f62, edited by Skarletto (github). equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79 and repaletted to match with the default state", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/77cff42b6c514e73881a885036be4b4dd2949f62, edited by Skarletto (github). equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79 and repaletted to match with the default state, equipped-OUTERCLOTHING-resomi made by Pofitlo", "size": { "x": 32, "y": 32 @@ -18,6 +18,10 @@ "name": "equipped-OUTERCLOTHING-vox", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 @@ -27,4 +31,4 @@ "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcargo.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcargo.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..ecd4c649a91 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcargo.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcargo.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcargo.rsi/meta.json index 5d9e9636f78..d4d9f8e4ee5 100644 --- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcargo.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcargo.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/77cff42b6c514e73881a885036be4b4dd2949f62. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/77cff42b6c514e73881a885036be4b4dd2949f62. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79, equipped-OUTERCLOTHING-resomi made by Pofitlo", "size": { "x": 32, "y": 32 @@ -18,6 +18,10 @@ "name": "equipped-OUTERCLOTHING-vox", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 @@ -27,4 +31,4 @@ "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatce.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatce.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..e364b2807a4 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatce.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatce.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatce.rsi/meta.json index 5d9e9636f78..d4d9f8e4ee5 100644 --- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatce.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatce.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/77cff42b6c514e73881a885036be4b4dd2949f62. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/77cff42b6c514e73881a885036be4b4dd2949f62. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79, equipped-OUTERCLOTHING-resomi made by Pofitlo", "size": { "x": 32, "y": 32 @@ -18,6 +18,10 @@ "name": "equipped-OUTERCLOTHING-vox", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 @@ -27,4 +31,4 @@ "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcentcom.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcentcom.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..43b123a45ce Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcentcom.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcentcom.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcentcom.rsi/meta.json index 7752722477b..8df0299ba9b 100644 --- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcentcom.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcentcom.rsi/meta.json @@ -1,26 +1,30 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/77cff42b6c514e73881a885036be4b4dd2949f62", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/77cff42b6c514e73881a885036be4b4dd2949f62, equipped-OUTERCLOTHING-resomi made by Pofitlo", + "size": { + "x": 32, + "y": 32 }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] -} \ No newline at end of file + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatchef.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatchef.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..3590e2b5026 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatchef.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatchef.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatchef.rsi/meta.json index 146bd662b49..e2d67e2017f 100644 --- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatchef.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatchef.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/77cff42b6c514e73881a885036be4b4dd2949f62", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/77cff42b6c514e73881a885036be4b4dd2949f62, equipped-OUTERCLOTHING-resomi made by Pofitlo", "size": { "x": 32, "y": 32 @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 @@ -23,4 +27,4 @@ "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatchem.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatchem.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..4901876fb93 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatchem.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatchem.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatchem.rsi/meta.json index 7752722477b..6a5951afdfc 100644 --- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatchem.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatchem.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/77cff42b6c514e73881a885036be4b4dd2949f62", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/77cff42b6c514e73881a885036be4b4dd2949f62, equipped-OUTERCLOTHING-resomi made by Pofitlo", "size": { "x": 32, "y": 32 @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 @@ -23,4 +27,4 @@ "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatclown.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatclown.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..dd5b5c16f54 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatclown.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatclown.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatclown.rsi/meta.json index 19fcc6a9352..f8afcb3fa10 100644 --- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatclown.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatclown.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from vg at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79", + "copyright": "Taken from vg at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79, equipped-OUTERCLOTHING-resomi made by Pofitlo", "size": { "x": 32, "y": 32 @@ -18,6 +18,10 @@ "name": "equipped-OUTERCLOTHING-vox", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 @@ -27,4 +31,4 @@ "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcmo.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcmo.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..3e8f2e7bd8e Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcmo.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcmo.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcmo.rsi/meta.json index 7752722477b..6a5951afdfc 100644 --- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcmo.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcmo.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/77cff42b6c514e73881a885036be4b4dd2949f62", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/77cff42b6c514e73881a885036be4b4dd2949f62, equipped-OUTERCLOTHING-resomi made by Pofitlo", "size": { "x": 32, "y": 32 @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 @@ -23,4 +27,4 @@ "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatengi.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatengi.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..e0041df8538 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatengi.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatengi.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatengi.rsi/meta.json index 5d9e9636f78..d4d9f8e4ee5 100644 --- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatengi.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatengi.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/77cff42b6c514e73881a885036be4b4dd2949f62. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/77cff42b6c514e73881a885036be4b4dd2949f62. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79, equipped-OUTERCLOTHING-resomi made by Pofitlo", "size": { "x": 32, "y": 32 @@ -18,6 +18,10 @@ "name": "equipped-OUTERCLOTHING-vox", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 @@ -27,4 +31,4 @@ "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatgen.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatgen.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..0ee3169455f Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatgen.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatgen.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatgen.rsi/meta.json index 7752722477b..6a5951afdfc 100644 --- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatgen.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatgen.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/77cff42b6c514e73881a885036be4b4dd2949f62", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/77cff42b6c514e73881a885036be4b4dd2949f62, equipped-OUTERCLOTHING-resomi made by Pofitlo", "size": { "x": 32, "y": 32 @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 @@ -23,4 +27,4 @@ "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathop.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathop.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..b645418999a Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathop.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathop.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathop.rsi/meta.json index 7752722477b..8df0299ba9b 100644 --- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathop.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathop.rsi/meta.json @@ -1,26 +1,30 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/77cff42b6c514e73881a885036be4b4dd2949f62", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/77cff42b6c514e73881a885036be4b4dd2949f62, equipped-OUTERCLOTHING-resomi made by Pofitlo", + "size": { + "x": 32, + "y": 32 }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] -} \ No newline at end of file + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathos.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathos.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..b78bb13e4d2 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathos.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathos.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathos.rsi/meta.json index 7752722477b..8df0299ba9b 100644 --- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathos.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathos.rsi/meta.json @@ -1,26 +1,30 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/77cff42b6c514e73881a885036be4b4dd2949f62", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/77cff42b6c514e73881a885036be4b4dd2949f62, equipped-OUTERCLOTHING-resomi made by Pofitlo", + "size": { + "x": 32, + "y": 32 }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] -} \ No newline at end of file + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathosarmored.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathosarmored.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..75e03c82124 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathosarmored.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathosarmored.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathosarmored.rsi/meta.json index 4010520850d..04c91632ffa 100644 --- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathosarmored.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathosarmored.rsi/meta.json @@ -1,26 +1,30 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from vg at commit https://github.com/vgstation-coders/vgstation13/commit/a16e41020a93479e9a7e2af343b1b74f7f2a61bd, recolored by Github user PursuitinAshes", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from vg at commit https://github.com/vgstation-coders/vgstation13/commit/a16e41020a93479e9a7e2af343b1b74f7f2a61bd, recolored by Github user PursuitinAshes, equipped-OUTERCLOTHING-resomi made by Pofitlo", + "size": { + "x": 32, + "y": 32 }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathydro.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathydro.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..06951941156 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathydro.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathydro.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathydro.rsi/meta.json index 5d9e9636f78..d4d9f8e4ee5 100644 --- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathydro.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathydro.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/77cff42b6c514e73881a885036be4b4dd2949f62. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/77cff42b6c514e73881a885036be4b4dd2949f62. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79, equipped-OUTERCLOTHING-resomi made by Pofitlo", "size": { "x": 32, "y": 32 @@ -18,6 +18,10 @@ "name": "equipped-OUTERCLOTHING-vox", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 @@ -27,4 +31,4 @@ "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatjani.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatjani.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..31b7c1eaebf Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatjani.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatjani.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatjani.rsi/meta.json index 7752722477b..8df0299ba9b 100644 --- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatjani.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatjani.rsi/meta.json @@ -1,26 +1,30 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/77cff42b6c514e73881a885036be4b4dd2949f62", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/77cff42b6c514e73881a885036be4b4dd2949f62, equipped-OUTERCLOTHING-resomi made by Pofitlo", + "size": { + "x": 32, + "y": 32 }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] -} \ No newline at end of file + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmed.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmed.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..e5371c3ebca Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmed.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmed.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmed.rsi/meta.json index 5d9e9636f78..5d53fb014a5 100644 --- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmed.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmed.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/77cff42b6c514e73881a885036be4b4dd2949f62. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/77cff42b6c514e73881a885036be4b4dd2949f62. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79, equipped-OUTERCLOTHING-resomi made by Pofitlo", "size": { "x": 32, "y": 32 @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, { "name": "equipped-OUTERCLOTHING-vox", "directions": 4 @@ -27,4 +31,4 @@ "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmime.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmime.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..80843cad556 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmime.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmime.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmime.rsi/meta.json index 19fcc6a9352..f8afcb3fa10 100644 --- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmime.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmime.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from vg at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79", + "copyright": "Taken from vg at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79, equipped-OUTERCLOTHING-resomi made by Pofitlo", "size": { "x": 32, "y": 32 @@ -18,6 +18,10 @@ "name": "equipped-OUTERCLOTHING-vox", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 @@ -27,4 +31,4 @@ "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatminer.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatminer.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..1f29c24186c Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatminer.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatminer.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatminer.rsi/meta.json index 5d9e9636f78..5d53fb014a5 100644 --- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatminer.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatminer.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/77cff42b6c514e73881a885036be4b4dd2949f62. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/77cff42b6c514e73881a885036be4b4dd2949f62. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79, equipped-OUTERCLOTHING-resomi made by Pofitlo", "size": { "x": 32, "y": 32 @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, { "name": "equipped-OUTERCLOTHING-vox", "directions": 4 @@ -27,4 +31,4 @@ "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatnomi.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatnomi.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..388205f2861 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatnomi.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatnomi.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatnomi.rsi/meta.json index af6075230c9..fa33a57e0a5 100644 --- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatnomi.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatnomi.rsi/meta.json @@ -1,26 +1,30 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Sprited by Ian M. Burton, based on the iconic Klaus Nomi", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprited by Ian M. Burton, based on the iconic Klaus Nomi, equipped-OUTERCLOTHING-resomi made by Pofitlo", + "size": { + "x": 32, + "y": 32 }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] -} \ No newline at end of file + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatparamed.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatparamed.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..ecf2e810454 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatparamed.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatparamed.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatparamed.rsi/meta.json index 5d9e9636f78..d4d9f8e4ee5 100644 --- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatparamed.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatparamed.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/77cff42b6c514e73881a885036be4b4dd2949f62. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/77cff42b6c514e73881a885036be4b4dd2949f62. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79, equipped-OUTERCLOTHING-resomi made by Pofitlo", "size": { "x": 32, "y": 32 @@ -18,6 +18,10 @@ "name": "equipped-OUTERCLOTHING-vox", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 @@ -27,4 +31,4 @@ "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatqm.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatqm.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..158f4b67835 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatqm.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatqm.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatqm.rsi/meta.json index 7752722477b..8df0299ba9b 100644 --- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatqm.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatqm.rsi/meta.json @@ -1,26 +1,30 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/77cff42b6c514e73881a885036be4b4dd2949f62", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/77cff42b6c514e73881a885036be4b4dd2949f62, equipped-OUTERCLOTHING-resomi made by Pofitlo", + "size": { + "x": 32, + "y": 32 }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] -} \ No newline at end of file + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrd.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrd.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..cca821a68e1 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrd.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrd.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrd.rsi/meta.json index 7752722477b..8df0299ba9b 100644 --- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrd.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrd.rsi/meta.json @@ -1,26 +1,30 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/77cff42b6c514e73881a885036be4b4dd2949f62", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/77cff42b6c514e73881a885036be4b4dd2949f62, equipped-OUTERCLOTHING-resomi made by Pofitlo", + "size": { + "x": 32, + "y": 32 }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] -} \ No newline at end of file + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrobo.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrobo.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..8fba81a6473 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrobo.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrobo.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrobo.rsi/meta.json index 7752722477b..8df0299ba9b 100644 --- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrobo.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrobo.rsi/meta.json @@ -1,26 +1,30 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/77cff42b6c514e73881a885036be4b4dd2949f62", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/77cff42b6c514e73881a885036be4b4dd2949f62, equipped-OUTERCLOTHING-resomi made by Pofitlo", + "size": { + "x": 32, + "y": 32 }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] -} \ No newline at end of file + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsci.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsci.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..a5e7c35029a Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsci.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsci.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsci.rsi/meta.json index 5d9e9636f78..d4d9f8e4ee5 100644 --- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsci.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsci.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/77cff42b6c514e73881a885036be4b4dd2949f62. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/77cff42b6c514e73881a885036be4b4dd2949f62. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79, equipped-OUTERCLOTHING-resomi made by Pofitlo", "size": { "x": 32, "y": 32 @@ -18,6 +18,10 @@ "name": "equipped-OUTERCLOTHING-vox", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 @@ -27,4 +31,4 @@ "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsec.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsec.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..278ea9c8f95 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsec.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsec.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsec.rsi/meta.json index 5d9e9636f78..d4d9f8e4ee5 100644 --- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsec.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsec.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/77cff42b6c514e73881a885036be4b4dd2949f62. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/77cff42b6c514e73881a885036be4b4dd2949f62. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79, equipped-OUTERCLOTHING-resomi made by Pofitlo", "size": { "x": 32, "y": 32 @@ -18,6 +18,10 @@ "name": "equipped-OUTERCLOTHING-vox", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 @@ -27,4 +31,4 @@ "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatviro.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatviro.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..efacf5ce4a7 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatviro.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatviro.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatviro.rsi/meta.json index 7752722477b..8df0299ba9b 100644 --- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatviro.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatviro.rsi/meta.json @@ -1,26 +1,30 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/77cff42b6c514e73881a885036be4b4dd2949f62", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/77cff42b6c514e73881a885036be4b4dd2949f62, equipped-OUTERCLOTHING-resomi made by Pofitlo", + "size": { + "x": 32, + "y": 32 }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] -} \ No newline at end of file + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..16d1518dd83 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/meta.json index ade0905fb8b..d3c1ce54957 100644 --- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/meta.json @@ -1,30 +1,34 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from vg at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79 / https://github.com/tgstation/tgstation/commit/77cff42b6c514e73881a885036be4b4dd2949f62, recolored by Github user Dutch-VanDerLinde.", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from vg at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79 / https://github.com/tgstation/tgstation/commit/77cff42b6c514e73881a885036be4b4dd2949f62, recolored by Github user Dutch-VanDerLinde, equipped-OUTERCLOTHING-resomi made by Pofitlo", + "size": { + "x": 32, + "y": 32 }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-vox", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwardenarmored.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwardenarmored.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..4f4e8d7bbaf Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwardenarmored.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwardenarmored.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwardenarmored.rsi/meta.json index c9f0d90ea13..bd497a8fa73 100644 --- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwardenarmored.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwardenarmored.rsi/meta.json @@ -1,26 +1,30 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from vg at commit https://github.com/vgstation-coders/vgstation13/commit/a16e41020a93479e9a7e2af343b1b74f7f2a61bd", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from vg at commit https://github.com/vgstation-coders/vgstation13/commit/a16e41020a93479e9a7e2af343b1b74f7f2a61bd, equipped-OUTERCLOTHING-resomi made by Pofitlo", + "size": { + "x": 32, + "y": 32 }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] -} \ No newline at end of file + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatweb.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatweb.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..b77652afee4 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatweb.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatweb.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatweb.rsi/meta.json index 5f1566a476d..fb2ac0ab4e3 100644 --- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatweb.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatweb.rsi/meta.json @@ -1,23 +1,27 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Made by PixelTheKermit (github) for SS14", - "size": {"x": 32, "y": 32}, - "states": [ - { - "name": "icon" - }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by PixelTheKermit (github) for SS14, equipped-OUTERCLOTHING-resomi made by Pofitlo", + "size": { "x": 32, "y": 32 }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/syndicate/coatsyndiecap.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/syndicate/coatsyndiecap.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..6355c1023e0 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/syndicate/coatsyndiecap.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/syndicate/coatsyndiecap.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/syndicate/coatsyndiecap.rsi/meta.json index eadf9c61d48..6d6ecf65dc3 100644 --- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/syndicate/coatsyndiecap.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/syndicate/coatsyndiecap.rsi/meta.json @@ -1,26 +1,30 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Sprited by belay5 (Discord)", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprited by belay5 (Discord), equipped-OUTERCLOTHING-resomi made by Pofitlo", + "size": { + "x": 32, + "y": 32 }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/syndicate/coatsyndiecaparmored.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/syndicate/coatsyndiecaparmored.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..6754f752628 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/syndicate/coatsyndiecaparmored.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/syndicate/coatsyndiecaparmored.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/syndicate/coatsyndiecaparmored.rsi/meta.json index eadf9c61d48..6d6ecf65dc3 100644 --- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/syndicate/coatsyndiecaparmored.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/syndicate/coatsyndiecaparmored.rsi/meta.json @@ -1,26 +1,30 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Sprited by belay5 (Discord)", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprited by belay5 (Discord), equipped-OUTERCLOTHING-resomi made by Pofitlo", + "size": { + "x": 32, + "y": 32 }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/syndicate/wintercoatsyndie.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/syndicate/wintercoatsyndie.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..fffd653b54b Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/syndicate/wintercoatsyndie.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/syndicate/wintercoatsyndie.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/syndicate/wintercoatsyndie.rsi/meta.json index eadf9c61d48..6d6ecf65dc3 100644 --- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/syndicate/wintercoatsyndie.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/syndicate/wintercoatsyndie.rsi/meta.json @@ -1,26 +1,30 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Sprited by belay5 (Discord)", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprited by belay5 (Discord), equipped-OUTERCLOTHING-resomi made by Pofitlo", + "size": { + "x": 32, + "y": 32 }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Floof/Clothing/Head/Hoods/redhood.rsi/equipped-HELMET.png b/Resources/Textures/Floof/Clothing/Head/Hoods/redhood.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..6a090ee541c Binary files /dev/null and b/Resources/Textures/Floof/Clothing/Head/Hoods/redhood.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Floof/Clothing/Head/Hoods/redhood.rsi/icon.png b/Resources/Textures/Floof/Clothing/Head/Hoods/redhood.rsi/icon.png new file mode 100644 index 00000000000..3ac84622534 Binary files /dev/null and b/Resources/Textures/Floof/Clothing/Head/Hoods/redhood.rsi/icon.png differ diff --git a/Resources/Textures/Floof/Clothing/Head/Hoods/redhood.rsi/meta.json b/Resources/Textures/Floof/Clothing/Head/Hoods/redhood.rsi/meta.json new file mode 100644 index 00000000000..bd53e417c59 --- /dev/null +++ b/Resources/Textures/Floof/Clothing/Head/Hoods/redhood.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Goliath Cloak used as base, original sprite by TechnoAlchemisto (https://github.com/TechnoAlchemisto) and modified sprite by FantasticFwoosh (https://github.com/FantasticFwoosh), sprites in hand by PuroSlavKing (Github) and RudeyCoolLeet#3875. Modified by Memeji Dankiri.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Floof/Clothing/Neck/Cloaks/redhood.rsi/equipped-NECK.png b/Resources/Textures/Floof/Clothing/Neck/Cloaks/redhood.rsi/equipped-NECK.png new file mode 100644 index 00000000000..cdf97f81d12 Binary files /dev/null and b/Resources/Textures/Floof/Clothing/Neck/Cloaks/redhood.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/Floof/Clothing/Neck/Cloaks/redhood.rsi/icon.png b/Resources/Textures/Floof/Clothing/Neck/Cloaks/redhood.rsi/icon.png new file mode 100644 index 00000000000..9e1aebb0395 Binary files /dev/null and b/Resources/Textures/Floof/Clothing/Neck/Cloaks/redhood.rsi/icon.png differ diff --git a/Resources/Textures/Floof/Clothing/Neck/Cloaks/redhood.rsi/inhand-left.png b/Resources/Textures/Floof/Clothing/Neck/Cloaks/redhood.rsi/inhand-left.png new file mode 100644 index 00000000000..d4fd8db4bac Binary files /dev/null and b/Resources/Textures/Floof/Clothing/Neck/Cloaks/redhood.rsi/inhand-left.png differ diff --git a/Resources/Textures/Floof/Clothing/Neck/Cloaks/redhood.rsi/inhand-right.png b/Resources/Textures/Floof/Clothing/Neck/Cloaks/redhood.rsi/inhand-right.png new file mode 100644 index 00000000000..1e1008748c2 Binary files /dev/null and b/Resources/Textures/Floof/Clothing/Neck/Cloaks/redhood.rsi/inhand-right.png differ diff --git a/Resources/Textures/Floof/Clothing/Neck/Cloaks/redhood.rsi/meta.json b/Resources/Textures/Floof/Clothing/Neck/Cloaks/redhood.rsi/meta.json new file mode 100644 index 00000000000..de450048eb5 --- /dev/null +++ b/Resources/Textures/Floof/Clothing/Neck/Cloaks/redhood.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Goliath Cloak used as base, original sprite by TechnoAlchemisto (https://github.com/TechnoAlchemisto) and modified sprite by FantasticFwoosh (https://github.com/FantasticFwoosh), sprites in hand by PuroSlavKing (Github) and RudeyCoolLeet#3875. Modified by Memeji Dankiri.", + "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/Floof/Clothing/Neck/amulet_dragon.rsi/equipped-NECK.png b/Resources/Textures/Floof/Clothing/Neck/amulet_dragon.rsi/equipped-NECK.png new file mode 100644 index 00000000000..c84c03cc2b7 Binary files /dev/null and b/Resources/Textures/Floof/Clothing/Neck/amulet_dragon.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/Floof/Clothing/Neck/amulet_dragon.rsi/icon.png b/Resources/Textures/Floof/Clothing/Neck/amulet_dragon.rsi/icon.png new file mode 100644 index 00000000000..39b120aabbe Binary files /dev/null and b/Resources/Textures/Floof/Clothing/Neck/amulet_dragon.rsi/icon.png differ diff --git a/Resources/Textures/Floof/Clothing/Neck/amulet_dragon.rsi/meta.json b/Resources/Textures/Floof/Clothing/Neck/amulet_dragon.rsi/meta.json new file mode 100644 index 00000000000..e0e89fc46f0 --- /dev/null +++ b/Resources/Textures/Floof/Clothing/Neck/amulet_dragon.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Pire Discord #plazmaspirit", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-NECK", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Floof/Clothing/OuterClothing/Suits/witchrobe.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Floof/Clothing/OuterClothing/Suits/witchrobe.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..2ad50bf2132 Binary files /dev/null and b/Resources/Textures/Floof/Clothing/OuterClothing/Suits/witchrobe.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Floof/Clothing/OuterClothing/Suits/witchrobe.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Floof/Clothing/OuterClothing/Suits/witchrobe.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000..b797c8dce44 Binary files /dev/null and b/Resources/Textures/Floof/Clothing/OuterClothing/Suits/witchrobe.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Floof/Clothing/OuterClothing/Suits/witchrobe.rsi/icon.png b/Resources/Textures/Floof/Clothing/OuterClothing/Suits/witchrobe.rsi/icon.png new file mode 100644 index 00000000000..acdc1b394b2 Binary files /dev/null and b/Resources/Textures/Floof/Clothing/OuterClothing/Suits/witchrobe.rsi/icon.png differ diff --git a/Resources/Textures/Floof/Clothing/OuterClothing/Suits/witchrobe.rsi/inhand-left.png b/Resources/Textures/Floof/Clothing/OuterClothing/Suits/witchrobe.rsi/inhand-left.png new file mode 100644 index 00000000000..a93d4a5af03 Binary files /dev/null and b/Resources/Textures/Floof/Clothing/OuterClothing/Suits/witchrobe.rsi/inhand-left.png differ diff --git a/Resources/Textures/Floof/Clothing/OuterClothing/Suits/witchrobe.rsi/inhand-right.png b/Resources/Textures/Floof/Clothing/OuterClothing/Suits/witchrobe.rsi/inhand-right.png new file mode 100644 index 00000000000..0ee8f623627 Binary files /dev/null and b/Resources/Textures/Floof/Clothing/OuterClothing/Suits/witchrobe.rsi/inhand-right.png differ diff --git a/Resources/Textures/Floof/Clothing/OuterClothing/Suits/witchrobe.rsi/meta.json b/Resources/Textures/Floof/Clothing/OuterClothing/Suits/witchrobe.rsi/meta.json new file mode 100644 index 00000000000..dcd414280a6 --- /dev/null +++ b/Resources/Textures/Floof/Clothing/OuterClothing/Suits/witchrobe.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/pull/36039/commits/b3bd70ae925ecbe7c625f70c4c3d09d3ed2ed32a . Inhands were made for SS14 and available under the same license, equipped-OUTERCLOTHING-resomi made by Pofitlo", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Floof/Clothing/Uniforms/loincloth.rsi/icon.png b/Resources/Textures/Floof/Clothing/Uniforms/loincloth.rsi/icon.png deleted file mode 100644 index 6f4518ffb94..00000000000 Binary files a/Resources/Textures/Floof/Clothing/Uniforms/loincloth.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Floof/Clothing/Uniforms/nuditypermit.rsi/icon.png b/Resources/Textures/Floof/Clothing/Uniforms/nuditypermit.rsi/icon.png new file mode 100644 index 00000000000..728c50b647d Binary files /dev/null and b/Resources/Textures/Floof/Clothing/Uniforms/nuditypermit.rsi/icon.png differ diff --git a/Resources/Textures/Floof/Clothing/Uniforms/loincloth.rsi/meta.json b/Resources/Textures/Floof/Clothing/Uniforms/nuditypermit.rsi/meta.json similarity index 100% rename from Resources/Textures/Floof/Clothing/Uniforms/loincloth.rsi/meta.json rename to Resources/Textures/Floof/Clothing/Uniforms/nuditypermit.rsi/meta.json diff --git a/Resources/Textures/Floof/Mobs/Customization/eyes.rsi/meta.json b/Resources/Textures/Floof/Mobs/Customization/eyes.rsi/meta.json new file mode 100644 index 00000000000..47a13781101 --- /dev/null +++ b/Resources/Textures/Floof/Mobs/Customization/eyes.rsi/meta.json @@ -0,0 +1,15 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "resomi", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Floof/Mobs/Customization/eyes.rsi/resomi.png b/Resources/Textures/Floof/Mobs/Customization/eyes.rsi/resomi.png new file mode 100644 index 00000000000..f6ee8cd7db6 Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Customization/eyes.rsi/resomi.png differ diff --git a/Resources/Textures/Floof/Mobs/Customization/resomi_hair.rsi/ResomiBackstrafe.png b/Resources/Textures/Floof/Mobs/Customization/resomi_hair.rsi/ResomiBackstrafe.png new file mode 100644 index 00000000000..05cfb6c1a10 Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Customization/resomi_hair.rsi/ResomiBackstrafe.png differ diff --git a/Resources/Textures/Floof/Mobs/Customization/resomi_hair.rsi/ResomiBurstShort.png b/Resources/Textures/Floof/Mobs/Customization/resomi_hair.rsi/ResomiBurstShort.png new file mode 100644 index 00000000000..24abbfb0100 Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Customization/resomi_hair.rsi/ResomiBurstShort.png differ diff --git a/Resources/Textures/Floof/Mobs/Customization/resomi_hair.rsi/ResomiDefault.png b/Resources/Textures/Floof/Mobs/Customization/resomi_hair.rsi/ResomiDefault.png new file mode 100644 index 00000000000..8eda85ab896 Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Customization/resomi_hair.rsi/ResomiDefault.png differ diff --git a/Resources/Textures/Floof/Mobs/Customization/resomi_hair.rsi/ResomiDroopy.png b/Resources/Textures/Floof/Mobs/Customization/resomi_hair.rsi/ResomiDroopy.png new file mode 100644 index 00000000000..7fab8e1fa19 Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Customization/resomi_hair.rsi/ResomiDroopy.png differ diff --git a/Resources/Textures/Floof/Mobs/Customization/resomi_hair.rsi/ResomiEars.png b/Resources/Textures/Floof/Mobs/Customization/resomi_hair.rsi/ResomiEars.png new file mode 100644 index 00000000000..9176e59ae58 Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Customization/resomi_hair.rsi/ResomiEars.png differ diff --git a/Resources/Textures/Floof/Mobs/Customization/resomi_hair.rsi/ResomiFluffymohawk.png b/Resources/Textures/Floof/Mobs/Customization/resomi_hair.rsi/ResomiFluffymohawk.png new file mode 100644 index 00000000000..f94f4cee5e8 Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Customization/resomi_hair.rsi/ResomiFluffymohawk.png differ diff --git a/Resources/Textures/Floof/Mobs/Customization/resomi_hair.rsi/ResomiHedge.png b/Resources/Textures/Floof/Mobs/Customization/resomi_hair.rsi/ResomiHedge.png new file mode 100644 index 00000000000..fd238db92c9 Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Customization/resomi_hair.rsi/ResomiHedge.png differ diff --git a/Resources/Textures/Floof/Mobs/Customization/resomi_hair.rsi/ResomiLong.png b/Resources/Textures/Floof/Mobs/Customization/resomi_hair.rsi/ResomiLong.png new file mode 100644 index 00000000000..a59b700c6e4 Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Customization/resomi_hair.rsi/ResomiLong.png differ diff --git a/Resources/Textures/Floof/Mobs/Customization/resomi_hair.rsi/ResomiLongway.png b/Resources/Textures/Floof/Mobs/Customization/resomi_hair.rsi/ResomiLongway.png new file mode 100644 index 00000000000..95f5695e583 Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Customization/resomi_hair.rsi/ResomiLongway.png differ diff --git a/Resources/Textures/Floof/Mobs/Customization/resomi_hair.rsi/ResomiMane.png b/Resources/Textures/Floof/Mobs/Customization/resomi_hair.rsi/ResomiMane.png new file mode 100644 index 00000000000..d7c501badea Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Customization/resomi_hair.rsi/ResomiMane.png differ diff --git a/Resources/Textures/Floof/Mobs/Customization/resomi_hair.rsi/ResomiManeBeardless.png b/Resources/Textures/Floof/Mobs/Customization/resomi_hair.rsi/ResomiManeBeardless.png new file mode 100644 index 00000000000..109b72a7b66 Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Customization/resomi_hair.rsi/ResomiManeBeardless.png differ diff --git a/Resources/Textures/Floof/Mobs/Customization/resomi_hair.rsi/ResomiMohawk.png b/Resources/Textures/Floof/Mobs/Customization/resomi_hair.rsi/ResomiMohawk.png new file mode 100644 index 00000000000..0bcbba60759 Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Customization/resomi_hair.rsi/ResomiMohawk.png differ diff --git a/Resources/Textures/Floof/Mobs/Customization/resomi_hair.rsi/ResomiMushroom.png b/Resources/Textures/Floof/Mobs/Customization/resomi_hair.rsi/ResomiMushroom.png new file mode 100644 index 00000000000..8cfb2309670 Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Customization/resomi_hair.rsi/ResomiMushroom.png differ diff --git a/Resources/Textures/Floof/Mobs/Customization/resomi_hair.rsi/ResomiNotree.png b/Resources/Textures/Floof/Mobs/Customization/resomi_hair.rsi/ResomiNotree.png new file mode 100644 index 00000000000..684b53023eb Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Customization/resomi_hair.rsi/ResomiNotree.png differ diff --git a/Resources/Textures/Floof/Mobs/Customization/resomi_hair.rsi/ResomiPointy.png b/Resources/Textures/Floof/Mobs/Customization/resomi_hair.rsi/ResomiPointy.png new file mode 100644 index 00000000000..eea806e57c0 Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Customization/resomi_hair.rsi/ResomiPointy.png differ diff --git a/Resources/Textures/Floof/Mobs/Customization/resomi_hair.rsi/ResomiSpiky.png b/Resources/Textures/Floof/Mobs/Customization/resomi_hair.rsi/ResomiSpiky.png new file mode 100644 index 00000000000..799092689f4 Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Customization/resomi_hair.rsi/ResomiSpiky.png differ diff --git a/Resources/Textures/Floof/Mobs/Customization/resomi_hair.rsi/ResomiTwies.png b/Resources/Textures/Floof/Mobs/Customization/resomi_hair.rsi/ResomiTwies.png new file mode 100644 index 00000000000..16da3222caa Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Customization/resomi_hair.rsi/ResomiTwies.png differ diff --git a/Resources/Textures/Floof/Mobs/Customization/resomi_hair.rsi/ResomiUpright.png b/Resources/Textures/Floof/Mobs/Customization/resomi_hair.rsi/ResomiUpright.png new file mode 100644 index 00000000000..6e1070544c6 Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Customization/resomi_hair.rsi/ResomiUpright.png differ diff --git a/Resources/Textures/Floof/Mobs/Customization/resomi_hair.rsi/meta.json b/Resources/Textures/Floof/Mobs/Customization/resomi_hair.rsi/meta.json new file mode 100644 index 00000000000..cd0153f127f --- /dev/null +++ b/Resources/Textures/Floof/Mobs/Customization/resomi_hair.rsi/meta.json @@ -0,0 +1,83 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/Skyrat-SS13/Skyrat-tg/tree/40e3cdbb15b8bc0d5ef2fb46133adf805bda5297, while Argali, Ayrshire, Myrsore and Bighorn are drawn by Ubaser, and Kobold Ears are drawn by Pigeonpeas. Body_underbelly made by Nairod(github) for SS14. Large drawn by Ubaser. Wagging tail by SonicDC. Splotch modified from Sharp by KittenColony(github). Frills neckfull come from: https://github.com/Bubberstation/Bubberstation/commit/8bc6b83404803466a560b694bf22ef3c0ac266a2", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "ResomiBackstrafe", + "directions": 4 + }, + { + "name": "ResomiBurstShort", + "directions": 4 + }, + { + "name": "ResomiDefault", + "directions": 4 + }, + { + "name": "ResomiDroopy", + "directions": 4 + }, + { + "name": "ResomiEars", + "directions": 4 + }, + { + "name": "ResomiFluffymohawk", + "directions": 4 + }, + { + "name": "ResomiHedge", + "directions": 4 + }, + { + "name": "ResomiLongway", + "directions": 4 + }, + { + "name": "ResomiMane", + "directions": 4 + }, + { + "name": "ResomiManeBeardless", + "directions": 4 + }, + { + "name": "ResomiMohawk", + "directions": 4 + }, + { + "name": "ResomiMushroom", + "directions": 4 + }, + { + "name": "ResomiNotree", + "directions": 4 + }, + { + "name": "ResomiPointy", + "directions": 4 + }, + { + "name": "ResomiSpiky", + "directions": 4 + }, + { + "name": "ResomiTwies", + "directions": 4 + }, + { + "name": "ResomiUpright", + "directions": 4 + }, + { + "name": "ResomiLong", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Floof/Mobs/Customization/resomi_parts.rsi/fluff.png b/Resources/Textures/Floof/Mobs/Customization/resomi_parts.rsi/fluff.png new file mode 100644 index 00000000000..8fde1c8b8f6 Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Customization/resomi_parts.rsi/fluff.png differ diff --git a/Resources/Textures/Floof/Mobs/Customization/resomi_parts.rsi/fluff_head.png b/Resources/Textures/Floof/Mobs/Customization/resomi_parts.rsi/fluff_head.png new file mode 100644 index 00000000000..0a4fcbdf937 Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Customization/resomi_parts.rsi/fluff_head.png differ diff --git a/Resources/Textures/Floof/Mobs/Customization/resomi_parts.rsi/fluff_head_up.png b/Resources/Textures/Floof/Mobs/Customization/resomi_parts.rsi/fluff_head_up.png new file mode 100644 index 00000000000..3e4ea94d95b Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Customization/resomi_parts.rsi/fluff_head_up.png differ diff --git a/Resources/Textures/Floof/Mobs/Customization/resomi_parts.rsi/l_foot_feathers.png b/Resources/Textures/Floof/Mobs/Customization/resomi_parts.rsi/l_foot_feathers.png new file mode 100644 index 00000000000..ccfe6db729e Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Customization/resomi_parts.rsi/l_foot_feathers.png differ diff --git a/Resources/Textures/Floof/Mobs/Customization/resomi_parts.rsi/l_hand_feathers.png b/Resources/Textures/Floof/Mobs/Customization/resomi_parts.rsi/l_hand_feathers.png new file mode 100644 index 00000000000..a397efc2007 Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Customization/resomi_parts.rsi/l_hand_feathers.png differ diff --git a/Resources/Textures/Floof/Mobs/Customization/resomi_parts.rsi/meta.json b/Resources/Textures/Floof/Mobs/Customization/resomi_parts.rsi/meta.json new file mode 100644 index 00000000000..c2ece1c1b79 --- /dev/null +++ b/Resources/Textures/Floof/Mobs/Customization/resomi_parts.rsi/meta.json @@ -0,0 +1,47 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/Skyrat-SS13/Skyrat-tg/tree/40e3cdbb15b8bc0d5ef2fb46133adf805bda5297, while Argali, Ayrshire, Myrsore and Bighorn are drawn by Ubaser, and Kobold Ears are drawn by Pigeonpeas. Body_underbelly made by Nairod(github) for SS14. Large drawn by Ubaser. Wagging tail by SonicDC. Splotch modified from Sharp by KittenColony(github). Frills neckfull come from: https://github.com/Bubberstation/Bubberstation/commit/8bc6b83404803466a560b694bf22ef3c0ac266a2", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "l_foot_feathers", + "directions": 4 + }, + { + "name": "r_foot_feathers", + "directions": 4 + }, + { + "name": "l_hand_feathers", + "directions": 4 + }, + { + "name": "r_hand_feathers", + "directions": 4 + }, + { + "name": "tail", + "directions": 4 + }, + { + "name": "tail_feathers", + "directions": 4 + }, + { + "name": "fluff", + "directions": 4 + }, + { + "name": "fluff_head", + "directions": 4 + }, + { + "name": "fluff_head_up", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Floof/Mobs/Customization/resomi_parts.rsi/r_foot_feathers.png b/Resources/Textures/Floof/Mobs/Customization/resomi_parts.rsi/r_foot_feathers.png new file mode 100644 index 00000000000..4c6fbb8b881 Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Customization/resomi_parts.rsi/r_foot_feathers.png differ diff --git a/Resources/Textures/Floof/Mobs/Customization/resomi_parts.rsi/r_hand_feathers.png b/Resources/Textures/Floof/Mobs/Customization/resomi_parts.rsi/r_hand_feathers.png new file mode 100644 index 00000000000..c8cb724e783 Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Customization/resomi_parts.rsi/r_hand_feathers.png differ diff --git a/Resources/Textures/Floof/Mobs/Customization/resomi_parts.rsi/tail.png b/Resources/Textures/Floof/Mobs/Customization/resomi_parts.rsi/tail.png new file mode 100644 index 00000000000..59939326f95 Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Customization/resomi_parts.rsi/tail.png differ diff --git a/Resources/Textures/Floof/Mobs/Customization/resomi_parts.rsi/tail_feathers.png b/Resources/Textures/Floof/Mobs/Customization/resomi_parts.rsi/tail_feathers.png new file mode 100644 index 00000000000..9d26d682491 Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Customization/resomi_parts.rsi/tail_feathers.png differ diff --git a/Resources/Textures/Floof/Mobs/Effects/Resomi/brute_damage.rsi/Chest_Brute_10.png b/Resources/Textures/Floof/Mobs/Effects/Resomi/brute_damage.rsi/Chest_Brute_10.png new file mode 100644 index 00000000000..dcd3d2cb1e5 Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Effects/Resomi/brute_damage.rsi/Chest_Brute_10.png differ diff --git a/Resources/Textures/Floof/Mobs/Effects/Resomi/brute_damage.rsi/Chest_Brute_30.png b/Resources/Textures/Floof/Mobs/Effects/Resomi/brute_damage.rsi/Chest_Brute_30.png new file mode 100644 index 00000000000..78e6e9a5fbf Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Effects/Resomi/brute_damage.rsi/Chest_Brute_30.png differ diff --git a/Resources/Textures/Floof/Mobs/Effects/Resomi/brute_damage.rsi/Chest_Brute_50.png b/Resources/Textures/Floof/Mobs/Effects/Resomi/brute_damage.rsi/Chest_Brute_50.png new file mode 100644 index 00000000000..db8e65763a5 Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Effects/Resomi/brute_damage.rsi/Chest_Brute_50.png differ diff --git a/Resources/Textures/Floof/Mobs/Effects/Resomi/brute_damage.rsi/Chest_Brute_70.png b/Resources/Textures/Floof/Mobs/Effects/Resomi/brute_damage.rsi/Chest_Brute_70.png new file mode 100644 index 00000000000..fd51a461b5c Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Effects/Resomi/brute_damage.rsi/Chest_Brute_70.png differ diff --git a/Resources/Textures/Floof/Mobs/Effects/Resomi/brute_damage.rsi/Head_Brute_10.png b/Resources/Textures/Floof/Mobs/Effects/Resomi/brute_damage.rsi/Head_Brute_10.png new file mode 100644 index 00000000000..bebf6909891 Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Effects/Resomi/brute_damage.rsi/Head_Brute_10.png differ diff --git a/Resources/Textures/Floof/Mobs/Effects/Resomi/brute_damage.rsi/Head_Brute_30.png b/Resources/Textures/Floof/Mobs/Effects/Resomi/brute_damage.rsi/Head_Brute_30.png new file mode 100644 index 00000000000..4a387f9a476 Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Effects/Resomi/brute_damage.rsi/Head_Brute_30.png differ diff --git a/Resources/Textures/Floof/Mobs/Effects/Resomi/brute_damage.rsi/Head_Brute_50.png b/Resources/Textures/Floof/Mobs/Effects/Resomi/brute_damage.rsi/Head_Brute_50.png new file mode 100644 index 00000000000..f8d8f023459 Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Effects/Resomi/brute_damage.rsi/Head_Brute_50.png differ diff --git a/Resources/Textures/Floof/Mobs/Effects/Resomi/brute_damage.rsi/Head_Brute_70.png b/Resources/Textures/Floof/Mobs/Effects/Resomi/brute_damage.rsi/Head_Brute_70.png new file mode 100644 index 00000000000..e66898b985b Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Effects/Resomi/brute_damage.rsi/Head_Brute_70.png differ diff --git a/Resources/Textures/Floof/Mobs/Effects/Resomi/brute_damage.rsi/LArm_Brute_10.png b/Resources/Textures/Floof/Mobs/Effects/Resomi/brute_damage.rsi/LArm_Brute_10.png new file mode 100644 index 00000000000..d0da20094d8 Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Effects/Resomi/brute_damage.rsi/LArm_Brute_10.png differ diff --git a/Resources/Textures/Floof/Mobs/Effects/Resomi/brute_damage.rsi/LArm_Brute_30.png b/Resources/Textures/Floof/Mobs/Effects/Resomi/brute_damage.rsi/LArm_Brute_30.png new file mode 100644 index 00000000000..5ec9ca988d4 Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Effects/Resomi/brute_damage.rsi/LArm_Brute_30.png differ diff --git a/Resources/Textures/Floof/Mobs/Effects/Resomi/brute_damage.rsi/LArm_Brute_50.png b/Resources/Textures/Floof/Mobs/Effects/Resomi/brute_damage.rsi/LArm_Brute_50.png new file mode 100644 index 00000000000..36532d73725 Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Effects/Resomi/brute_damage.rsi/LArm_Brute_50.png differ diff --git a/Resources/Textures/Floof/Mobs/Effects/Resomi/brute_damage.rsi/LArm_Brute_70.png b/Resources/Textures/Floof/Mobs/Effects/Resomi/brute_damage.rsi/LArm_Brute_70.png new file mode 100644 index 00000000000..4d717d240bd Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Effects/Resomi/brute_damage.rsi/LArm_Brute_70.png differ diff --git a/Resources/Textures/Floof/Mobs/Effects/Resomi/brute_damage.rsi/LFoot_Brute_10.png b/Resources/Textures/Floof/Mobs/Effects/Resomi/brute_damage.rsi/LFoot_Brute_10.png new file mode 100644 index 00000000000..270e33f8518 Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Effects/Resomi/brute_damage.rsi/LFoot_Brute_10.png differ diff --git a/Resources/Textures/Floof/Mobs/Effects/Resomi/brute_damage.rsi/LFoot_Brute_30.png b/Resources/Textures/Floof/Mobs/Effects/Resomi/brute_damage.rsi/LFoot_Brute_30.png new file mode 100644 index 00000000000..b9a440d12bc Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Effects/Resomi/brute_damage.rsi/LFoot_Brute_30.png differ diff --git a/Resources/Textures/Floof/Mobs/Effects/Resomi/brute_damage.rsi/LFoot_Brute_50.png b/Resources/Textures/Floof/Mobs/Effects/Resomi/brute_damage.rsi/LFoot_Brute_50.png new file mode 100644 index 00000000000..e43f48fd006 Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Effects/Resomi/brute_damage.rsi/LFoot_Brute_50.png differ diff --git a/Resources/Textures/Floof/Mobs/Effects/Resomi/brute_damage.rsi/LFoot_Brute_70.png b/Resources/Textures/Floof/Mobs/Effects/Resomi/brute_damage.rsi/LFoot_Brute_70.png new file mode 100644 index 00000000000..5d000fe5e22 Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Effects/Resomi/brute_damage.rsi/LFoot_Brute_70.png differ diff --git a/Resources/Textures/Floof/Mobs/Effects/Resomi/brute_damage.rsi/LHand_Brute_10.png b/Resources/Textures/Floof/Mobs/Effects/Resomi/brute_damage.rsi/LHand_Brute_10.png new file mode 100644 index 00000000000..07f76ebade4 Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Effects/Resomi/brute_damage.rsi/LHand_Brute_10.png differ diff --git a/Resources/Textures/Floof/Mobs/Effects/Resomi/brute_damage.rsi/LHand_Brute_30.png b/Resources/Textures/Floof/Mobs/Effects/Resomi/brute_damage.rsi/LHand_Brute_30.png new file mode 100644 index 00000000000..85bb395b23d Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Effects/Resomi/brute_damage.rsi/LHand_Brute_30.png differ diff --git a/Resources/Textures/Floof/Mobs/Effects/Resomi/brute_damage.rsi/LHand_Brute_50.png b/Resources/Textures/Floof/Mobs/Effects/Resomi/brute_damage.rsi/LHand_Brute_50.png new file mode 100644 index 00000000000..154c2b6f613 Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Effects/Resomi/brute_damage.rsi/LHand_Brute_50.png differ diff --git a/Resources/Textures/Floof/Mobs/Effects/Resomi/brute_damage.rsi/LHand_Brute_70.png b/Resources/Textures/Floof/Mobs/Effects/Resomi/brute_damage.rsi/LHand_Brute_70.png new file mode 100644 index 00000000000..4d837f31621 Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Effects/Resomi/brute_damage.rsi/LHand_Brute_70.png differ diff --git a/Resources/Textures/Floof/Mobs/Effects/Resomi/brute_damage.rsi/LLeg_Brute_10.png b/Resources/Textures/Floof/Mobs/Effects/Resomi/brute_damage.rsi/LLeg_Brute_10.png new file mode 100644 index 00000000000..4dd058c3c1f Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Effects/Resomi/brute_damage.rsi/LLeg_Brute_10.png differ diff --git a/Resources/Textures/Floof/Mobs/Effects/Resomi/brute_damage.rsi/LLeg_Brute_30.png b/Resources/Textures/Floof/Mobs/Effects/Resomi/brute_damage.rsi/LLeg_Brute_30.png new file mode 100644 index 00000000000..1fa0fe723c0 Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Effects/Resomi/brute_damage.rsi/LLeg_Brute_30.png differ diff --git a/Resources/Textures/Floof/Mobs/Effects/Resomi/brute_damage.rsi/LLeg_Brute_50.png b/Resources/Textures/Floof/Mobs/Effects/Resomi/brute_damage.rsi/LLeg_Brute_50.png new file mode 100644 index 00000000000..c1d75e3ae6c Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Effects/Resomi/brute_damage.rsi/LLeg_Brute_50.png differ diff --git a/Resources/Textures/Floof/Mobs/Effects/Resomi/brute_damage.rsi/LLeg_Brute_70.png b/Resources/Textures/Floof/Mobs/Effects/Resomi/brute_damage.rsi/LLeg_Brute_70.png new file mode 100644 index 00000000000..bc19f25796f Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Effects/Resomi/brute_damage.rsi/LLeg_Brute_70.png differ diff --git a/Resources/Textures/Floof/Mobs/Effects/Resomi/brute_damage.rsi/RArm_Brute_10.png b/Resources/Textures/Floof/Mobs/Effects/Resomi/brute_damage.rsi/RArm_Brute_10.png new file mode 100644 index 00000000000..79eff56341b Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Effects/Resomi/brute_damage.rsi/RArm_Brute_10.png differ diff --git a/Resources/Textures/Floof/Mobs/Effects/Resomi/brute_damage.rsi/RArm_Brute_30.png b/Resources/Textures/Floof/Mobs/Effects/Resomi/brute_damage.rsi/RArm_Brute_30.png new file mode 100644 index 00000000000..b20a5b5f6fb Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Effects/Resomi/brute_damage.rsi/RArm_Brute_30.png differ diff --git a/Resources/Textures/Floof/Mobs/Effects/Resomi/brute_damage.rsi/RArm_Brute_50.png b/Resources/Textures/Floof/Mobs/Effects/Resomi/brute_damage.rsi/RArm_Brute_50.png new file mode 100644 index 00000000000..c81a723ba85 Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Effects/Resomi/brute_damage.rsi/RArm_Brute_50.png differ diff --git a/Resources/Textures/Floof/Mobs/Effects/Resomi/brute_damage.rsi/RArm_Brute_70.png b/Resources/Textures/Floof/Mobs/Effects/Resomi/brute_damage.rsi/RArm_Brute_70.png new file mode 100644 index 00000000000..1496bc50f3e Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Effects/Resomi/brute_damage.rsi/RArm_Brute_70.png differ diff --git a/Resources/Textures/Floof/Mobs/Effects/Resomi/brute_damage.rsi/RFoot_Brute_10.png b/Resources/Textures/Floof/Mobs/Effects/Resomi/brute_damage.rsi/RFoot_Brute_10.png new file mode 100644 index 00000000000..1d8ff51c7ce Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Effects/Resomi/brute_damage.rsi/RFoot_Brute_10.png differ diff --git a/Resources/Textures/Floof/Mobs/Effects/Resomi/brute_damage.rsi/RFoot_Brute_30.png b/Resources/Textures/Floof/Mobs/Effects/Resomi/brute_damage.rsi/RFoot_Brute_30.png new file mode 100644 index 00000000000..9eca3da7a9e Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Effects/Resomi/brute_damage.rsi/RFoot_Brute_30.png differ diff --git a/Resources/Textures/Floof/Mobs/Effects/Resomi/brute_damage.rsi/RFoot_Brute_50.png b/Resources/Textures/Floof/Mobs/Effects/Resomi/brute_damage.rsi/RFoot_Brute_50.png new file mode 100644 index 00000000000..386947656db Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Effects/Resomi/brute_damage.rsi/RFoot_Brute_50.png differ diff --git a/Resources/Textures/Floof/Mobs/Effects/Resomi/brute_damage.rsi/RFoot_Brute_70.png b/Resources/Textures/Floof/Mobs/Effects/Resomi/brute_damage.rsi/RFoot_Brute_70.png new file mode 100644 index 00000000000..bae19d33b52 Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Effects/Resomi/brute_damage.rsi/RFoot_Brute_70.png differ diff --git a/Resources/Textures/Floof/Mobs/Effects/Resomi/brute_damage.rsi/RHand_Brute_10.png b/Resources/Textures/Floof/Mobs/Effects/Resomi/brute_damage.rsi/RHand_Brute_10.png new file mode 100644 index 00000000000..168c23a1b0a Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Effects/Resomi/brute_damage.rsi/RHand_Brute_10.png differ diff --git a/Resources/Textures/Floof/Mobs/Effects/Resomi/brute_damage.rsi/RHand_Brute_30.png b/Resources/Textures/Floof/Mobs/Effects/Resomi/brute_damage.rsi/RHand_Brute_30.png new file mode 100644 index 00000000000..a8ebd45dd6c Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Effects/Resomi/brute_damage.rsi/RHand_Brute_30.png differ diff --git a/Resources/Textures/Floof/Mobs/Effects/Resomi/brute_damage.rsi/RHand_Brute_50.png b/Resources/Textures/Floof/Mobs/Effects/Resomi/brute_damage.rsi/RHand_Brute_50.png new file mode 100644 index 00000000000..22193bcb3bc Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Effects/Resomi/brute_damage.rsi/RHand_Brute_50.png differ diff --git a/Resources/Textures/Floof/Mobs/Effects/Resomi/brute_damage.rsi/RHand_Brute_70.png b/Resources/Textures/Floof/Mobs/Effects/Resomi/brute_damage.rsi/RHand_Brute_70.png new file mode 100644 index 00000000000..b6744c14bcc Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Effects/Resomi/brute_damage.rsi/RHand_Brute_70.png differ diff --git a/Resources/Textures/Floof/Mobs/Effects/Resomi/brute_damage.rsi/RLeg_Brute_10.png b/Resources/Textures/Floof/Mobs/Effects/Resomi/brute_damage.rsi/RLeg_Brute_10.png new file mode 100644 index 00000000000..be27b8fe9ef Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Effects/Resomi/brute_damage.rsi/RLeg_Brute_10.png differ diff --git a/Resources/Textures/Floof/Mobs/Effects/Resomi/brute_damage.rsi/RLeg_Brute_30.png b/Resources/Textures/Floof/Mobs/Effects/Resomi/brute_damage.rsi/RLeg_Brute_30.png new file mode 100644 index 00000000000..685129849a2 Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Effects/Resomi/brute_damage.rsi/RLeg_Brute_30.png differ diff --git a/Resources/Textures/Floof/Mobs/Effects/Resomi/brute_damage.rsi/RLeg_Brute_50.png b/Resources/Textures/Floof/Mobs/Effects/Resomi/brute_damage.rsi/RLeg_Brute_50.png new file mode 100644 index 00000000000..5af6ea79232 Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Effects/Resomi/brute_damage.rsi/RLeg_Brute_50.png differ diff --git a/Resources/Textures/Floof/Mobs/Effects/Resomi/brute_damage.rsi/RLeg_Brute_70.png b/Resources/Textures/Floof/Mobs/Effects/Resomi/brute_damage.rsi/RLeg_Brute_70.png new file mode 100644 index 00000000000..003541d6817 Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Effects/Resomi/brute_damage.rsi/RLeg_Brute_70.png differ diff --git a/Resources/Textures/Floof/Mobs/Effects/Resomi/brute_damage.rsi/Tail_Brute_10.png b/Resources/Textures/Floof/Mobs/Effects/Resomi/brute_damage.rsi/Tail_Brute_10.png new file mode 100644 index 00000000000..b8abd82f5e6 Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Effects/Resomi/brute_damage.rsi/Tail_Brute_10.png differ diff --git a/Resources/Textures/Floof/Mobs/Effects/Resomi/brute_damage.rsi/Tail_Brute_30.png b/Resources/Textures/Floof/Mobs/Effects/Resomi/brute_damage.rsi/Tail_Brute_30.png new file mode 100644 index 00000000000..d9e5f1e4183 Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Effects/Resomi/brute_damage.rsi/Tail_Brute_30.png differ diff --git a/Resources/Textures/Floof/Mobs/Effects/Resomi/brute_damage.rsi/Tail_Brute_50.png b/Resources/Textures/Floof/Mobs/Effects/Resomi/brute_damage.rsi/Tail_Brute_50.png new file mode 100644 index 00000000000..1a94bfbbe2a Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Effects/Resomi/brute_damage.rsi/Tail_Brute_50.png differ diff --git a/Resources/Textures/Floof/Mobs/Effects/Resomi/brute_damage.rsi/Tail_Brute_70.png b/Resources/Textures/Floof/Mobs/Effects/Resomi/brute_damage.rsi/Tail_Brute_70.png new file mode 100644 index 00000000000..65d1f99e76a Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Effects/Resomi/brute_damage.rsi/Tail_Brute_70.png differ diff --git a/Resources/Textures/Floof/Mobs/Effects/Resomi/brute_damage.rsi/meta.json b/Resources/Textures/Floof/Mobs/Effects/Resomi/brute_damage.rsi/meta.json new file mode 100644 index 00000000000..9704fb35796 --- /dev/null +++ b/Resources/Textures/Floof/Mobs/Effects/Resomi/brute_damage.rsi/meta.json @@ -0,0 +1,184 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Drawn by Ubaser.", + "size": {"x": 32, "y": 32}, + "states": [ + { + "name": "Head_Brute_10", + "directions": 4 + }, + { + "name": "LArm_Brute_10", + "directions": 4 + }, + { + "name": "LLeg_Brute_10", + "directions": 4 + }, + { + "name": "RArm_Brute_10", + "directions": 4 + }, + { + "name": "RLeg_Brute_10", + "directions": 4 + }, + { + "name": "Chest_Brute_10", + "directions": 4 + }, + { + "name": "Head_Brute_30", + "directions": 4 + }, + { + "name": "LArm_Brute_30", + "directions": 4 + }, + { + "name": "LLeg_Brute_30", + "directions": 4 + }, + { + "name": "RArm_Brute_30", + "directions": 4 + }, + { + "name": "RLeg_Brute_30", + "directions": 4 + }, + { + "name": "Chest_Brute_30", + "directions": 4 + }, + { + "name": "Head_Brute_50", + "directions": 4 + }, + { + "name": "LArm_Brute_50", + "directions": 4 + }, + { + "name": "LLeg_Brute_50", + "directions": 4 + }, + { + "name": "RArm_Brute_50", + "directions": 4 + }, + { + "name": "RLeg_Brute_50", + "directions": 4 + }, + { + "name": "Chest_Brute_50", + "directions": 4 + }, + { + "name": "Head_Brute_70", + "directions": 4 + }, + { + "name": "LArm_Brute_70", + "directions": 4 + }, + { + "name": "LLeg_Brute_70", + "directions": 4 + }, + { + "name": "RArm_Brute_70", + "directions": 4 + }, + { + "name": "RLeg_Brute_70", + "directions": 4 + }, + { + "name": "Chest_Brute_70", + "directions": 4 + }, + { + "name": "LHand_Brute_10", + "directions": 4 + }, + { + "name": "LHand_Brute_30", + "directions": 4 + }, + { + "name": "LHand_Brute_50", + "directions": 4 + }, + { + "name": "LHand_Brute_70", + "directions": 4 + }, + { + "name": "LFoot_Brute_10", + "directions": 4 + }, + { + "name": "LFoot_Brute_30", + "directions": 4 + }, + { + "name": "LFoot_Brute_50", + "directions": 4 + }, + { + "name": "LFoot_Brute_70", + "directions": 4 + }, + { + "name": "RHand_Brute_10", + "directions": 4 + }, + { + "name": "RHand_Brute_30", + "directions": 4 + }, + { + "name": "RHand_Brute_50", + "directions": 4 + }, + { + "name": "RHand_Brute_70", + "directions": 4 + }, + { + "name": "RFoot_Brute_10", + "directions": 4 + }, + { + "name": "RFoot_Brute_30", + "directions": 4 + }, + { + "name": "RFoot_Brute_50", + "directions": 4 + }, + { + "name": "RFoot_Brute_70", + "directions": 4 + }, + { + "name": "Tail_Brute_10", + "directions": 4 + }, + { + "name": "Tail_Brute_30", + "directions": 4 + }, + { + "name": "Tail_Brute_50", + "directions": 4 + }, + { + "name": "Tail_Brute_70", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Floof/Mobs/Effects/Resomi/burn_damage.rsi/Chest_Burn_10.png b/Resources/Textures/Floof/Mobs/Effects/Resomi/burn_damage.rsi/Chest_Burn_10.png new file mode 100644 index 00000000000..9fca538c576 Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Effects/Resomi/burn_damage.rsi/Chest_Burn_10.png differ diff --git a/Resources/Textures/Floof/Mobs/Effects/Resomi/burn_damage.rsi/Chest_Burn_30.png b/Resources/Textures/Floof/Mobs/Effects/Resomi/burn_damage.rsi/Chest_Burn_30.png new file mode 100644 index 00000000000..7dae1fbd75f Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Effects/Resomi/burn_damage.rsi/Chest_Burn_30.png differ diff --git a/Resources/Textures/Floof/Mobs/Effects/Resomi/burn_damage.rsi/Chest_Burn_50.png b/Resources/Textures/Floof/Mobs/Effects/Resomi/burn_damage.rsi/Chest_Burn_50.png new file mode 100644 index 00000000000..ee7bbc80e9d Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Effects/Resomi/burn_damage.rsi/Chest_Burn_50.png differ diff --git a/Resources/Textures/Floof/Mobs/Effects/Resomi/burn_damage.rsi/Chest_Burn_70.png b/Resources/Textures/Floof/Mobs/Effects/Resomi/burn_damage.rsi/Chest_Burn_70.png new file mode 100644 index 00000000000..61e16cb756c Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Effects/Resomi/burn_damage.rsi/Chest_Burn_70.png differ diff --git a/Resources/Textures/Floof/Mobs/Effects/Resomi/burn_damage.rsi/Head_Burn_10.png b/Resources/Textures/Floof/Mobs/Effects/Resomi/burn_damage.rsi/Head_Burn_10.png new file mode 100644 index 00000000000..b2dce2291dd Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Effects/Resomi/burn_damage.rsi/Head_Burn_10.png differ diff --git a/Resources/Textures/Floof/Mobs/Effects/Resomi/burn_damage.rsi/Head_Burn_30.png b/Resources/Textures/Floof/Mobs/Effects/Resomi/burn_damage.rsi/Head_Burn_30.png new file mode 100644 index 00000000000..ef1e6a80cf9 Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Effects/Resomi/burn_damage.rsi/Head_Burn_30.png differ diff --git a/Resources/Textures/Floof/Mobs/Effects/Resomi/burn_damage.rsi/Head_Burn_50.png b/Resources/Textures/Floof/Mobs/Effects/Resomi/burn_damage.rsi/Head_Burn_50.png new file mode 100644 index 00000000000..bc52a1a0e7c Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Effects/Resomi/burn_damage.rsi/Head_Burn_50.png differ diff --git a/Resources/Textures/Floof/Mobs/Effects/Resomi/burn_damage.rsi/Head_Burn_70.png b/Resources/Textures/Floof/Mobs/Effects/Resomi/burn_damage.rsi/Head_Burn_70.png new file mode 100644 index 00000000000..95b5fa1f4d0 Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Effects/Resomi/burn_damage.rsi/Head_Burn_70.png differ diff --git a/Resources/Textures/Floof/Mobs/Effects/Resomi/burn_damage.rsi/LArm_Burn_10.png b/Resources/Textures/Floof/Mobs/Effects/Resomi/burn_damage.rsi/LArm_Burn_10.png new file mode 100644 index 00000000000..650ee5ec935 Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Effects/Resomi/burn_damage.rsi/LArm_Burn_10.png differ diff --git a/Resources/Textures/Floof/Mobs/Effects/Resomi/burn_damage.rsi/LArm_Burn_30.png b/Resources/Textures/Floof/Mobs/Effects/Resomi/burn_damage.rsi/LArm_Burn_30.png new file mode 100644 index 00000000000..c91b0c761b7 Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Effects/Resomi/burn_damage.rsi/LArm_Burn_30.png differ diff --git a/Resources/Textures/Floof/Mobs/Effects/Resomi/burn_damage.rsi/LArm_Burn_50.png b/Resources/Textures/Floof/Mobs/Effects/Resomi/burn_damage.rsi/LArm_Burn_50.png new file mode 100644 index 00000000000..6ea7a6c449e Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Effects/Resomi/burn_damage.rsi/LArm_Burn_50.png differ diff --git a/Resources/Textures/Floof/Mobs/Effects/Resomi/burn_damage.rsi/LArm_Burn_70.png b/Resources/Textures/Floof/Mobs/Effects/Resomi/burn_damage.rsi/LArm_Burn_70.png new file mode 100644 index 00000000000..9409f5db762 Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Effects/Resomi/burn_damage.rsi/LArm_Burn_70.png differ diff --git a/Resources/Textures/Floof/Mobs/Effects/Resomi/burn_damage.rsi/LFoot_Burn_10.png b/Resources/Textures/Floof/Mobs/Effects/Resomi/burn_damage.rsi/LFoot_Burn_10.png new file mode 100644 index 00000000000..088ea0f9cc5 Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Effects/Resomi/burn_damage.rsi/LFoot_Burn_10.png differ diff --git a/Resources/Textures/Floof/Mobs/Effects/Resomi/burn_damage.rsi/LFoot_Burn_30.png b/Resources/Textures/Floof/Mobs/Effects/Resomi/burn_damage.rsi/LFoot_Burn_30.png new file mode 100644 index 00000000000..717d5ab496f Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Effects/Resomi/burn_damage.rsi/LFoot_Burn_30.png differ diff --git a/Resources/Textures/Floof/Mobs/Effects/Resomi/burn_damage.rsi/LFoot_Burn_50.png b/Resources/Textures/Floof/Mobs/Effects/Resomi/burn_damage.rsi/LFoot_Burn_50.png new file mode 100644 index 00000000000..33524c4bd81 Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Effects/Resomi/burn_damage.rsi/LFoot_Burn_50.png differ diff --git a/Resources/Textures/Floof/Mobs/Effects/Resomi/burn_damage.rsi/LFoot_Burn_70.png b/Resources/Textures/Floof/Mobs/Effects/Resomi/burn_damage.rsi/LFoot_Burn_70.png new file mode 100644 index 00000000000..7a0d1744bcc Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Effects/Resomi/burn_damage.rsi/LFoot_Burn_70.png differ diff --git a/Resources/Textures/Floof/Mobs/Effects/Resomi/burn_damage.rsi/LHand_Burn_10.png b/Resources/Textures/Floof/Mobs/Effects/Resomi/burn_damage.rsi/LHand_Burn_10.png new file mode 100644 index 00000000000..5725eee18e4 Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Effects/Resomi/burn_damage.rsi/LHand_Burn_10.png differ diff --git a/Resources/Textures/Floof/Mobs/Effects/Resomi/burn_damage.rsi/LHand_Burn_30.png b/Resources/Textures/Floof/Mobs/Effects/Resomi/burn_damage.rsi/LHand_Burn_30.png new file mode 100644 index 00000000000..1d7a525271b Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Effects/Resomi/burn_damage.rsi/LHand_Burn_30.png differ diff --git a/Resources/Textures/Floof/Mobs/Effects/Resomi/burn_damage.rsi/LHand_Burn_50.png b/Resources/Textures/Floof/Mobs/Effects/Resomi/burn_damage.rsi/LHand_Burn_50.png new file mode 100644 index 00000000000..99b736f88fd Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Effects/Resomi/burn_damage.rsi/LHand_Burn_50.png differ diff --git a/Resources/Textures/Floof/Mobs/Effects/Resomi/burn_damage.rsi/LHand_Burn_70.png b/Resources/Textures/Floof/Mobs/Effects/Resomi/burn_damage.rsi/LHand_Burn_70.png new file mode 100644 index 00000000000..71d644242d9 Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Effects/Resomi/burn_damage.rsi/LHand_Burn_70.png differ diff --git a/Resources/Textures/Floof/Mobs/Effects/Resomi/burn_damage.rsi/LLeg_Burn_10.png b/Resources/Textures/Floof/Mobs/Effects/Resomi/burn_damage.rsi/LLeg_Burn_10.png new file mode 100644 index 00000000000..bd6d36681e6 Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Effects/Resomi/burn_damage.rsi/LLeg_Burn_10.png differ diff --git a/Resources/Textures/Floof/Mobs/Effects/Resomi/burn_damage.rsi/LLeg_Burn_30.png b/Resources/Textures/Floof/Mobs/Effects/Resomi/burn_damage.rsi/LLeg_Burn_30.png new file mode 100644 index 00000000000..112bfca8ac8 Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Effects/Resomi/burn_damage.rsi/LLeg_Burn_30.png differ diff --git a/Resources/Textures/Floof/Mobs/Effects/Resomi/burn_damage.rsi/LLeg_Burn_50.png b/Resources/Textures/Floof/Mobs/Effects/Resomi/burn_damage.rsi/LLeg_Burn_50.png new file mode 100644 index 00000000000..09482285e48 Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Effects/Resomi/burn_damage.rsi/LLeg_Burn_50.png differ diff --git a/Resources/Textures/Floof/Mobs/Effects/Resomi/burn_damage.rsi/LLeg_Burn_70.png b/Resources/Textures/Floof/Mobs/Effects/Resomi/burn_damage.rsi/LLeg_Burn_70.png new file mode 100644 index 00000000000..569244c347f Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Effects/Resomi/burn_damage.rsi/LLeg_Burn_70.png differ diff --git a/Resources/Textures/Floof/Mobs/Effects/Resomi/burn_damage.rsi/RArm_Burn_10.png b/Resources/Textures/Floof/Mobs/Effects/Resomi/burn_damage.rsi/RArm_Burn_10.png new file mode 100644 index 00000000000..bd1c09e821f Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Effects/Resomi/burn_damage.rsi/RArm_Burn_10.png differ diff --git a/Resources/Textures/Floof/Mobs/Effects/Resomi/burn_damage.rsi/RArm_Burn_30.png b/Resources/Textures/Floof/Mobs/Effects/Resomi/burn_damage.rsi/RArm_Burn_30.png new file mode 100644 index 00000000000..726b16661ae Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Effects/Resomi/burn_damage.rsi/RArm_Burn_30.png differ diff --git a/Resources/Textures/Floof/Mobs/Effects/Resomi/burn_damage.rsi/RArm_Burn_50.png b/Resources/Textures/Floof/Mobs/Effects/Resomi/burn_damage.rsi/RArm_Burn_50.png new file mode 100644 index 00000000000..c7ca646c8d1 Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Effects/Resomi/burn_damage.rsi/RArm_Burn_50.png differ diff --git a/Resources/Textures/Floof/Mobs/Effects/Resomi/burn_damage.rsi/RArm_Burn_70.png b/Resources/Textures/Floof/Mobs/Effects/Resomi/burn_damage.rsi/RArm_Burn_70.png new file mode 100644 index 00000000000..e74cd61e519 Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Effects/Resomi/burn_damage.rsi/RArm_Burn_70.png differ diff --git a/Resources/Textures/Floof/Mobs/Effects/Resomi/burn_damage.rsi/RFoot_Burn_10.png b/Resources/Textures/Floof/Mobs/Effects/Resomi/burn_damage.rsi/RFoot_Burn_10.png new file mode 100644 index 00000000000..de8aec9fc29 Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Effects/Resomi/burn_damage.rsi/RFoot_Burn_10.png differ diff --git a/Resources/Textures/Floof/Mobs/Effects/Resomi/burn_damage.rsi/RFoot_Burn_30.png b/Resources/Textures/Floof/Mobs/Effects/Resomi/burn_damage.rsi/RFoot_Burn_30.png new file mode 100644 index 00000000000..248f85cd7b5 Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Effects/Resomi/burn_damage.rsi/RFoot_Burn_30.png differ diff --git a/Resources/Textures/Floof/Mobs/Effects/Resomi/burn_damage.rsi/RFoot_Burn_50.png b/Resources/Textures/Floof/Mobs/Effects/Resomi/burn_damage.rsi/RFoot_Burn_50.png new file mode 100644 index 00000000000..418031e7fa1 Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Effects/Resomi/burn_damage.rsi/RFoot_Burn_50.png differ diff --git a/Resources/Textures/Floof/Mobs/Effects/Resomi/burn_damage.rsi/RFoot_Burn_70.png b/Resources/Textures/Floof/Mobs/Effects/Resomi/burn_damage.rsi/RFoot_Burn_70.png new file mode 100644 index 00000000000..62c182efe00 Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Effects/Resomi/burn_damage.rsi/RFoot_Burn_70.png differ diff --git a/Resources/Textures/Floof/Mobs/Effects/Resomi/burn_damage.rsi/RHand_Burn_10.png b/Resources/Textures/Floof/Mobs/Effects/Resomi/burn_damage.rsi/RHand_Burn_10.png new file mode 100644 index 00000000000..ffcfc4c6e0b Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Effects/Resomi/burn_damage.rsi/RHand_Burn_10.png differ diff --git a/Resources/Textures/Floof/Mobs/Effects/Resomi/burn_damage.rsi/RHand_Burn_30.png b/Resources/Textures/Floof/Mobs/Effects/Resomi/burn_damage.rsi/RHand_Burn_30.png new file mode 100644 index 00000000000..e3008073b10 Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Effects/Resomi/burn_damage.rsi/RHand_Burn_30.png differ diff --git a/Resources/Textures/Floof/Mobs/Effects/Resomi/burn_damage.rsi/RHand_Burn_50.png b/Resources/Textures/Floof/Mobs/Effects/Resomi/burn_damage.rsi/RHand_Burn_50.png new file mode 100644 index 00000000000..fc6836b1c1e Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Effects/Resomi/burn_damage.rsi/RHand_Burn_50.png differ diff --git a/Resources/Textures/Floof/Mobs/Effects/Resomi/burn_damage.rsi/RHand_Burn_70.png b/Resources/Textures/Floof/Mobs/Effects/Resomi/burn_damage.rsi/RHand_Burn_70.png new file mode 100644 index 00000000000..7355df7e7e7 Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Effects/Resomi/burn_damage.rsi/RHand_Burn_70.png differ diff --git a/Resources/Textures/Floof/Mobs/Effects/Resomi/burn_damage.rsi/RLeg_Burn_10.png b/Resources/Textures/Floof/Mobs/Effects/Resomi/burn_damage.rsi/RLeg_Burn_10.png new file mode 100644 index 00000000000..2074110c37f Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Effects/Resomi/burn_damage.rsi/RLeg_Burn_10.png differ diff --git a/Resources/Textures/Floof/Mobs/Effects/Resomi/burn_damage.rsi/RLeg_Burn_30.png b/Resources/Textures/Floof/Mobs/Effects/Resomi/burn_damage.rsi/RLeg_Burn_30.png new file mode 100644 index 00000000000..784a9351460 Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Effects/Resomi/burn_damage.rsi/RLeg_Burn_30.png differ diff --git a/Resources/Textures/Floof/Mobs/Effects/Resomi/burn_damage.rsi/RLeg_Burn_50.png b/Resources/Textures/Floof/Mobs/Effects/Resomi/burn_damage.rsi/RLeg_Burn_50.png new file mode 100644 index 00000000000..74f942269b0 Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Effects/Resomi/burn_damage.rsi/RLeg_Burn_50.png differ diff --git a/Resources/Textures/Floof/Mobs/Effects/Resomi/burn_damage.rsi/RLeg_Burn_70.png b/Resources/Textures/Floof/Mobs/Effects/Resomi/burn_damage.rsi/RLeg_Burn_70.png new file mode 100644 index 00000000000..f533a8601bd Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Effects/Resomi/burn_damage.rsi/RLeg_Burn_70.png differ diff --git a/Resources/Textures/Floof/Mobs/Effects/Resomi/burn_damage.rsi/meta.json b/Resources/Textures/Floof/Mobs/Effects/Resomi/burn_damage.rsi/meta.json new file mode 100644 index 00000000000..1b5579ca413 --- /dev/null +++ b/Resources/Textures/Floof/Mobs/Effects/Resomi/burn_damage.rsi/meta.json @@ -0,0 +1,171 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Drawn by Ubaser.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "RLeg_Burn_70", + "directions": 4 + }, + { + "name": "Chest_Burn_10", + "directions": 4 + }, + { + "name": "Chest_Burn_30", + "directions": 4 + }, + { + "name": "Chest_Burn_50", + "directions": 4 + }, + { + "name": "Chest_Burn_70", + "directions": 4 + }, + { + "name": "Head_Burn_10", + "directions": 4 + }, + { + "name": "Head_Burn_30", + "directions": 4 + }, + { + "name": "Head_Burn_50", + "directions": 4 + }, + { + "name": "Head_Burn_70", + "directions": 4 + }, + { + "name": "LArm_Burn_10", + "directions": 4 + }, + { + "name": "LArm_Burn_30", + "directions": 4 + }, + { + "name": "LArm_Burn_50", + "directions": 4 + }, + { + "name": "LArm_Burn_70", + "directions": 4 + }, + { + "name": "LFoot_Burn_10", + "directions": 4 + }, + { + "name": "LFoot_Burn_30", + "directions": 4 + }, + { + "name": "LFoot_Burn_50", + "directions": 4 + }, + { + "name": "LFoot_Burn_70", + "directions": 4 + }, + { + "name": "LHand_Burn_10", + "directions": 4 + }, + { + "name": "LHand_Burn_30", + "directions": 4 + }, + { + "name": "LHand_Burn_50", + "directions": 4 + }, + { + "name": "LHand_Burn_70", + "directions": 4 + }, + { + "name": "LLeg_Burn_10", + "directions": 4 + }, + { + "name": "LLeg_Burn_30", + "directions": 4 + }, + { + "name": "LLeg_Burn_50", + "directions": 4 + }, + { + "name": "LLeg_Burn_70", + "directions": 4 + }, + { + "name": "RArm_Burn_10", + "directions": 4 + }, + { + "name": "RArm_Burn_30", + "directions": 4 + }, + { + "name": "RArm_Burn_50", + "directions": 4 + }, + { + "name": "RArm_Burn_70", + "directions": 4 + }, + { + "name": "RFoot_Burn_10", + "directions": 4 + }, + { + "name": "RFoot_Burn_30", + "directions": 4 + }, + { + "name": "RFoot_Burn_50", + "directions": 4 + }, + { + "name": "RFoot_Burn_70", + "directions": 4 + }, + { + "name": "RHand_Burn_10", + "directions": 4 + }, + { + "name": "RHand_Burn_30", + "directions": 4 + }, + { + "name": "RHand_Burn_50", + "directions": 4 + }, + { + "name": "RHand_Burn_70", + "directions": 4 + }, + { + "name": "RLeg_Burn_10", + "directions": 4 + }, + { + "name": "RLeg_Burn_30", + "directions": 4 + }, + { + "name": "RLeg_Burn_50", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Floof/Mobs/Effects/onfire.rsi/Resomi_burning.png b/Resources/Textures/Floof/Mobs/Effects/onfire.rsi/Resomi_burning.png new file mode 100644 index 00000000000..84fbf0d4dc5 Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Effects/onfire.rsi/Resomi_burning.png differ diff --git a/Resources/Textures/Floof/Mobs/Effects/onfire.rsi/Resomi_minor_burning.png b/Resources/Textures/Floof/Mobs/Effects/onfire.rsi/Resomi_minor_burning.png new file mode 100644 index 00000000000..3b6b50f476e Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Effects/onfire.rsi/Resomi_minor_burning.png differ diff --git a/Resources/Textures/Floof/Mobs/Effects/onfire.rsi/meta.json b/Resources/Textures/Floof/Mobs/Effects/onfire.rsi/meta.json new file mode 100644 index 00000000000..4df8e1b5a27 --- /dev/null +++ b/Resources/Textures/Floof/Mobs/Effects/onfire.rsi/meta.json @@ -0,0 +1,31 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Created by aserovich (Discord)", + "states": [ + { + "name": "Resomi_burning", + "directions": 4, + "delays": [ + [ 0.1, 0.1, 0.1, 0.1 ], + [ 0.1, 0.1, 0.1, 0.1 ], + [ 0.1, 0.1, 0.1, 0.1 ], + [ 0.1, 0.1, 0.1, 0.1 ] + ] + }, + { + "name": "Resomi_minor_burning", + "directions": 4, + "delays": [ + [ 0.1, 0.1, 0.1, 0.1 ], + [ 0.1, 0.1, 0.1, 0.1 ], + [ 0.1, 0.1, 0.1, 0.1 ], + [ 0.1, 0.1, 0.1, 0.1 ] + ] + } + ] +} diff --git a/Resources/Textures/Floof/Mobs/Species/Resomi/displacement.rsi/back.png b/Resources/Textures/Floof/Mobs/Species/Resomi/displacement.rsi/back.png new file mode 100644 index 00000000000..f2f7b2e35e1 Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Species/Resomi/displacement.rsi/back.png differ diff --git a/Resources/Textures/Floof/Mobs/Species/Resomi/displacement.rsi/belt.png b/Resources/Textures/Floof/Mobs/Species/Resomi/displacement.rsi/belt.png new file mode 100644 index 00000000000..3bfc191dbae Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Species/Resomi/displacement.rsi/belt.png differ diff --git a/Resources/Textures/Floof/Mobs/Species/Resomi/displacement.rsi/ears.png b/Resources/Textures/Floof/Mobs/Species/Resomi/displacement.rsi/ears.png new file mode 100644 index 00000000000..28cb986c954 Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Species/Resomi/displacement.rsi/ears.png differ diff --git a/Resources/Textures/Floof/Mobs/Species/Resomi/displacement.rsi/eyes.png b/Resources/Textures/Floof/Mobs/Species/Resomi/displacement.rsi/eyes.png new file mode 100644 index 00000000000..1335c604109 Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Species/Resomi/displacement.rsi/eyes.png differ diff --git a/Resources/Textures/Floof/Mobs/Species/Resomi/displacement.rsi/feet.png b/Resources/Textures/Floof/Mobs/Species/Resomi/displacement.rsi/feet.png new file mode 100644 index 00000000000..e99cfb75851 Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Species/Resomi/displacement.rsi/feet.png differ diff --git a/Resources/Textures/Floof/Mobs/Species/Resomi/displacement.rsi/hands.png b/Resources/Textures/Floof/Mobs/Species/Resomi/displacement.rsi/hands.png new file mode 100644 index 00000000000..b70ac7035d0 Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Species/Resomi/displacement.rsi/hands.png differ diff --git a/Resources/Textures/Floof/Mobs/Species/Resomi/displacement.rsi/head.png b/Resources/Textures/Floof/Mobs/Species/Resomi/displacement.rsi/head.png new file mode 100644 index 00000000000..6a451a2af87 Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Species/Resomi/displacement.rsi/head.png differ diff --git a/Resources/Textures/Floof/Mobs/Species/Resomi/displacement.rsi/inHand.png b/Resources/Textures/Floof/Mobs/Species/Resomi/displacement.rsi/inHand.png new file mode 100644 index 00000000000..7fbc76a824e Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Species/Resomi/displacement.rsi/inHand.png differ diff --git a/Resources/Textures/Floof/Mobs/Species/Resomi/displacement.rsi/jumpsuit.png b/Resources/Textures/Floof/Mobs/Species/Resomi/displacement.rsi/jumpsuit.png new file mode 100644 index 00000000000..1c399e3008e Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Species/Resomi/displacement.rsi/jumpsuit.png differ diff --git a/Resources/Textures/Floof/Mobs/Species/Resomi/displacement.rsi/mask.png b/Resources/Textures/Floof/Mobs/Species/Resomi/displacement.rsi/mask.png new file mode 100644 index 00000000000..0b870e25985 Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Species/Resomi/displacement.rsi/mask.png differ diff --git a/Resources/Textures/Floof/Mobs/Species/Resomi/displacement.rsi/meta.json b/Resources/Textures/Floof/Mobs/Species/Resomi/displacement.rsi/meta.json new file mode 100644 index 00000000000..a7aabf6ccd2 --- /dev/null +++ b/Resources/Textures/Floof/Mobs/Species/Resomi/displacement.rsi/meta.json @@ -0,0 +1,62 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "By Pofitlo", + "size": { + "x": 32, + "y": 32 + }, + "load": { + "srgb": false + }, + "states": [ + { + "name": "jumpsuit", + "directions": 4 + }, + { + "name": "ears", + "directions": 4 + }, + { + "name": "back", + "directions": 4 + }, + { + "name": "eyes", + "directions": 4 + }, + { + "name": "head", + "directions": 4 + }, + { + "name": "belt", + "directions": 4 + }, + { + "name": "hands", + "directions": 4 + }, + { + "name": "feet", + "directions": 4 + }, + { + "name": "neck", + "directions": 4 + }, + { + "name": "mask", + "directions": 4 + }, + { + "name": "inHand", + "directions": 4 + }, + { + "name": "suitStorage", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Floof/Mobs/Species/Resomi/displacement.rsi/neck.png b/Resources/Textures/Floof/Mobs/Species/Resomi/displacement.rsi/neck.png new file mode 100644 index 00000000000..81037000cf4 Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Species/Resomi/displacement.rsi/neck.png differ diff --git a/Resources/Textures/Floof/Mobs/Species/Resomi/displacement.rsi/suitStorage.png b/Resources/Textures/Floof/Mobs/Species/Resomi/displacement.rsi/suitStorage.png new file mode 100644 index 00000000000..9c3144ccf44 Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Species/Resomi/displacement.rsi/suitStorage.png differ diff --git a/Resources/Textures/Floof/Mobs/Species/Resomi/parts.rsi/full.png b/Resources/Textures/Floof/Mobs/Species/Resomi/parts.rsi/full.png new file mode 100644 index 00000000000..944ce992502 Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Species/Resomi/parts.rsi/full.png differ diff --git a/Resources/Textures/Floof/Mobs/Species/Resomi/parts.rsi/groin.png b/Resources/Textures/Floof/Mobs/Species/Resomi/parts.rsi/groin.png new file mode 100644 index 00000000000..daa4b2d6e1c Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Species/Resomi/parts.rsi/groin.png differ diff --git a/Resources/Textures/Floof/Mobs/Species/Resomi/parts.rsi/head_f.png b/Resources/Textures/Floof/Mobs/Species/Resomi/parts.rsi/head_f.png new file mode 100644 index 00000000000..2cb32df05e8 Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Species/Resomi/parts.rsi/head_f.png differ diff --git a/Resources/Textures/Floof/Mobs/Species/Resomi/parts.rsi/head_m.png b/Resources/Textures/Floof/Mobs/Species/Resomi/parts.rsi/head_m.png new file mode 100644 index 00000000000..1d1566928d8 Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Species/Resomi/parts.rsi/head_m.png differ diff --git a/Resources/Textures/Floof/Mobs/Species/Resomi/parts.rsi/l_arm.png b/Resources/Textures/Floof/Mobs/Species/Resomi/parts.rsi/l_arm.png new file mode 100644 index 00000000000..11e43d017c3 Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Species/Resomi/parts.rsi/l_arm.png differ diff --git a/Resources/Textures/Floof/Mobs/Species/Resomi/parts.rsi/l_foot.png b/Resources/Textures/Floof/Mobs/Species/Resomi/parts.rsi/l_foot.png new file mode 100644 index 00000000000..431efddd676 Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Species/Resomi/parts.rsi/l_foot.png differ diff --git a/Resources/Textures/Floof/Mobs/Species/Resomi/parts.rsi/l_hand.png b/Resources/Textures/Floof/Mobs/Species/Resomi/parts.rsi/l_hand.png new file mode 100644 index 00000000000..92797d29a5b Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Species/Resomi/parts.rsi/l_hand.png differ diff --git a/Resources/Textures/Floof/Mobs/Species/Resomi/parts.rsi/l_leg.png b/Resources/Textures/Floof/Mobs/Species/Resomi/parts.rsi/l_leg.png new file mode 100644 index 00000000000..bb653da08bf Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Species/Resomi/parts.rsi/l_leg.png differ diff --git a/Resources/Textures/Floof/Mobs/Species/Resomi/parts.rsi/meta.json b/Resources/Textures/Floof/Mobs/Species/Resomi/parts.rsi/meta.json new file mode 100644 index 00000000000..fda56a1f8d6 --- /dev/null +++ b/Resources/Textures/Floof/Mobs/Species/Resomi/parts.rsi/meta.json @@ -0,0 +1,66 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by EmoGarbage", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "full" + }, + { + "name": "head_f", + "directions": 4 + }, + { + "name": "head_m", + "directions": 4 + }, + { + "name": "l_arm", + "directions": 4 + }, + { + "name": "l_foot", + "directions": 4 + }, + { + "name": "l_hand", + "directions": 4 + }, + { + "name": "l_leg", + "directions": 4 + }, + { + "name": "r_arm", + "directions": 4 + }, + { + "name": "r_foot", + "directions": 4 + }, + { + "name": "r_hand", + "directions": 4 + }, + { + "name": "r_leg", + "directions": 4 + }, + { + "name": "torso_f", + "directions": 4 + }, + { + "name": "torso_m", + "directions": 4 + }, + { + "name": "groin", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Floof/Mobs/Species/Resomi/parts.rsi/r_arm.png b/Resources/Textures/Floof/Mobs/Species/Resomi/parts.rsi/r_arm.png new file mode 100644 index 00000000000..33659a22b8a Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Species/Resomi/parts.rsi/r_arm.png differ diff --git a/Resources/Textures/Floof/Mobs/Species/Resomi/parts.rsi/r_foot.png b/Resources/Textures/Floof/Mobs/Species/Resomi/parts.rsi/r_foot.png new file mode 100644 index 00000000000..5eab7aaf962 Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Species/Resomi/parts.rsi/r_foot.png differ diff --git a/Resources/Textures/Floof/Mobs/Species/Resomi/parts.rsi/r_hand.png b/Resources/Textures/Floof/Mobs/Species/Resomi/parts.rsi/r_hand.png new file mode 100644 index 00000000000..0aa3dd18b38 Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Species/Resomi/parts.rsi/r_hand.png differ diff --git a/Resources/Textures/Floof/Mobs/Species/Resomi/parts.rsi/r_leg.png b/Resources/Textures/Floof/Mobs/Species/Resomi/parts.rsi/r_leg.png new file mode 100644 index 00000000000..988fb999af4 Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Species/Resomi/parts.rsi/r_leg.png differ diff --git a/Resources/Textures/Floof/Mobs/Species/Resomi/parts.rsi/torso_f.png b/Resources/Textures/Floof/Mobs/Species/Resomi/parts.rsi/torso_f.png new file mode 100644 index 00000000000..f84d8e389d0 Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Species/Resomi/parts.rsi/torso_f.png differ diff --git a/Resources/Textures/Floof/Mobs/Species/Resomi/parts.rsi/torso_m.png b/Resources/Textures/Floof/Mobs/Species/Resomi/parts.rsi/torso_m.png new file mode 100644 index 00000000000..f84d8e389d0 Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Species/Resomi/parts.rsi/torso_m.png differ diff --git a/Resources/Textures/Floof/Objects/Weapons/Melee/brassknuckles.rsi/equipped-HAND.png b/Resources/Textures/Floof/Objects/Weapons/Melee/brassknuckles.rsi/equipped-HAND.png new file mode 100644 index 00000000000..15c95b994a4 Binary files /dev/null and b/Resources/Textures/Floof/Objects/Weapons/Melee/brassknuckles.rsi/equipped-HAND.png differ diff --git a/Resources/Textures/Floof/Objects/Weapons/Melee/brassknuckles.rsi/icon.png b/Resources/Textures/Floof/Objects/Weapons/Melee/brassknuckles.rsi/icon.png new file mode 100644 index 00000000000..537c32f1bb8 Binary files /dev/null and b/Resources/Textures/Floof/Objects/Weapons/Melee/brassknuckles.rsi/icon.png differ diff --git a/Resources/Textures/Floof/Objects/Weapons/Melee/brassknuckles.rsi/inhand-left.png b/Resources/Textures/Floof/Objects/Weapons/Melee/brassknuckles.rsi/inhand-left.png new file mode 100644 index 00000000000..5543d82e7b0 Binary files /dev/null and b/Resources/Textures/Floof/Objects/Weapons/Melee/brassknuckles.rsi/inhand-left.png differ diff --git a/Resources/Textures/Floof/Objects/Weapons/Melee/brassknuckles.rsi/inhand-right.png b/Resources/Textures/Floof/Objects/Weapons/Melee/brassknuckles.rsi/inhand-right.png new file mode 100644 index 00000000000..eb143f60324 Binary files /dev/null and b/Resources/Textures/Floof/Objects/Weapons/Melee/brassknuckles.rsi/inhand-right.png differ diff --git a/Resources/Textures/Floof/Objects/Weapons/Melee/brassknuckles.rsi/meta.json b/Resources/Textures/Floof/Objects/Weapons/Melee/brassknuckles.rsi/meta.json new file mode 100644 index 00000000000..b72e9836edd --- /dev/null +++ b/Resources/Textures/Floof/Objects/Weapons/Melee/brassknuckles.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "icon by Whatstone, inhand-left, inhand-right by VividPups, equipped-HAND by VividPups and modified by Whatstone", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HAND", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Floof/Objects/Weapons/Melee/crassknuckles.rsi/equipped-HAND.png b/Resources/Textures/Floof/Objects/Weapons/Melee/crassknuckles.rsi/equipped-HAND.png new file mode 100644 index 00000000000..cf1893f7b42 Binary files /dev/null and b/Resources/Textures/Floof/Objects/Weapons/Melee/crassknuckles.rsi/equipped-HAND.png differ diff --git a/Resources/Textures/Floof/Objects/Weapons/Melee/crassknuckles.rsi/icon.png b/Resources/Textures/Floof/Objects/Weapons/Melee/crassknuckles.rsi/icon.png new file mode 100644 index 00000000000..03fe3c298dd Binary files /dev/null and b/Resources/Textures/Floof/Objects/Weapons/Melee/crassknuckles.rsi/icon.png differ diff --git a/Resources/Textures/Floof/Objects/Weapons/Melee/crassknuckles.rsi/inhand-left.png b/Resources/Textures/Floof/Objects/Weapons/Melee/crassknuckles.rsi/inhand-left.png new file mode 100644 index 00000000000..06e2ca400d6 Binary files /dev/null and b/Resources/Textures/Floof/Objects/Weapons/Melee/crassknuckles.rsi/inhand-left.png differ diff --git a/Resources/Textures/Floof/Objects/Weapons/Melee/crassknuckles.rsi/inhand-right.png b/Resources/Textures/Floof/Objects/Weapons/Melee/crassknuckles.rsi/inhand-right.png new file mode 100644 index 00000000000..45893fcc668 Binary files /dev/null and b/Resources/Textures/Floof/Objects/Weapons/Melee/crassknuckles.rsi/inhand-right.png differ diff --git a/Resources/Textures/Floof/Objects/Weapons/Melee/crassknuckles.rsi/meta.json b/Resources/Textures/Floof/Objects/Weapons/Melee/crassknuckles.rsi/meta.json new file mode 100644 index 00000000000..7d2effdd440 --- /dev/null +++ b/Resources/Textures/Floof/Objects/Weapons/Melee/crassknuckles.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "icon by Whatstone, inhand-left, inhand-right, equipped-HAND by VividPups, modified by Whatstone", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HAND", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Mobs/Species/Human/displacement.rsi/jumpsuit-female.png b/Resources/Textures/Mobs/Species/Human/displacement.rsi/jumpsuit-female.png new file mode 100644 index 00000000000..be9c1064fbd Binary files /dev/null and b/Resources/Textures/Mobs/Species/Human/displacement.rsi/jumpsuit-female.png differ diff --git a/Resources/Textures/Mobs/Species/Human/displacement.rsi/meta.json b/Resources/Textures/Mobs/Species/Human/displacement.rsi/meta.json new file mode 100644 index 00000000000..7ac587cad70 --- /dev/null +++ b/Resources/Textures/Mobs/Species/Human/displacement.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by TheShuEd", + "size": { + "x": 32, + "y": 32 + }, + "load": { + "srgb": false + }, + "states": [ + { + "name": "jumpsuit-female", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_NF/Clothing/Neck/Cloaks/janitor.rsi/equipped-NECK.png b/Resources/Textures/_NF/Clothing/Neck/Cloaks/janitor.rsi/equipped-NECK.png new file mode 100644 index 00000000000..b2f820071c8 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Neck/Cloaks/janitor.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/_NF/Clothing/Neck/Cloaks/janitor.rsi/icon.png b/Resources/Textures/_NF/Clothing/Neck/Cloaks/janitor.rsi/icon.png new file mode 100644 index 00000000000..ab239662ab5 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Neck/Cloaks/janitor.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Clothing/Neck/Cloaks/janitor.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/Neck/Cloaks/janitor.rsi/inhand-left.png new file mode 100644 index 00000000000..721476f5923 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Neck/Cloaks/janitor.rsi/inhand-left.png differ diff --git a/Resources/Textures/_NF/Clothing/Neck/Cloaks/janitor.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/Neck/Cloaks/janitor.rsi/inhand-right.png new file mode 100644 index 00000000000..cae5a2d0e07 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Neck/Cloaks/janitor.rsi/inhand-right.png differ diff --git a/Resources/Textures/_NF/Clothing/Neck/Cloaks/janitor.rsi/meta.json b/Resources/Textures/_NF/Clothing/Neck/Cloaks/janitor.rsi/meta.json new file mode 100644 index 00000000000..5ef8985ec58 --- /dev/null +++ b/Resources/Textures/_NF/Clothing/Neck/Cloaks/janitor.rsi/meta.json @@ -0,0 +1,33 @@ +{ + "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, edited by dvir001 on github", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "plunger" + }, + { + "name": "plunger-equipped-NECK", + "directions": 4 + }, + { + "name": "equipped-NECK", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_NF/Clothing/Neck/Cloaks/janitor.rsi/plunger-equipped-NECK.png b/Resources/Textures/_NF/Clothing/Neck/Cloaks/janitor.rsi/plunger-equipped-NECK.png new file mode 100644 index 00000000000..978c7a77800 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Neck/Cloaks/janitor.rsi/plunger-equipped-NECK.png differ diff --git a/Resources/Textures/_NF/Clothing/Neck/Cloaks/janitor.rsi/plunger.png b/Resources/Textures/_NF/Clothing/Neck/Cloaks/janitor.rsi/plunger.png new file mode 100644 index 00000000000..53f0183cf19 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Neck/Cloaks/janitor.rsi/plunger.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/base-1.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/base-1.png new file mode 100644 index 00000000000..2c6f3fb0726 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/base-1.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/base-2.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/base-2.png new file mode 100644 index 00000000000..9fc7ae245b2 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/base-2.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/base-3.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/base-3.png new file mode 100644 index 00000000000..223c9e3b4fb Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/base-3.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/base-4.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/base-4.png new file mode 100644 index 00000000000..e8efed267b9 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/base-4.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/base-5.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/base-5.png new file mode 100644 index 00000000000..690e4e402c5 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/base-5.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/base-6.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/base-6.png new file mode 100644 index 00000000000..cc5db9400da Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/base-6.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/base-7.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/base-7.png new file mode 100644 index 00000000000..8755dd94dec Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/base-7.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/base-8.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/base-8.png new file mode 100644 index 00000000000..eada2162213 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/base-8.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/base.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/base.png new file mode 100644 index 00000000000..8af13d1cf16 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/base.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/icon.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/icon.png new file mode 100644 index 00000000000..c6df5f222b4 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/meta.json b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/meta.json new file mode 100644 index 00000000000..e6cc7f46fd9 --- /dev/null +++ b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/meta.json @@ -0,0 +1,149 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-4.0", + "copyright": "Created by @Stagnation on the frontier discord", + "states": [ + { + "name": "base" + }, + { + "name": "icon" + }, + { + "name": "base-1" + }, + { + "name": "base-2" + }, + { + "name": "base-3" + }, + { + "name": "base-4" + }, + { + "name": "base-5" + }, + { + "name": "base-6" + }, + { + "name": "base-7" + }, + { + "name": "base-8" + }, + { + "name": "practice-1" + }, + { + "name": "practice-2" + }, + { + "name": "practice-3" + }, + { + "name": "practice-4" + }, + { + "name": "practice-5" + }, + { + "name": "practice-6" + }, + { + "name": "practice-7" + }, + { + "name": "practice-8" + }, + { + "name": "practice-icon" + }, + { + "name": "rubber-1" + }, + { + "name": "rubber-2" + }, + { + "name": "rubber-3" + }, + { + "name": "rubber-4" + }, + { + "name": "rubber-5" + }, + { + "name": "rubber-6" + }, + { + "name": "rubber-7" + }, + { + "name": "rubber-8" + }, + { + "name": "rubber-icon" + }, + { + "name": "uranium-1" + }, + { + "name": "uranium-2" + }, + { + "name": "uranium-3" + }, + { + "name": "uranium-4" + }, + { + "name": "uranium-5" + }, + { + "name": "uranium-6" + }, + { + "name": "uranium-7" + }, + { + "name": "uranium-8" + }, + { + "name": "uranium-icon" + }, + { + "name": "piercing-1" + }, + { + "name": "piercing-2" + }, + { + "name": "piercing-3" + }, + { + "name": "piercing-4" + }, + { + "name": "piercing-5" + }, + { + "name": "piercing-6" + }, + { + "name": "piercing-7" + }, + { + "name": "piercing-8" + }, + { + "name": "piercing-icon" + } + ] +} diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/piercing-1.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/piercing-1.png new file mode 100644 index 00000000000..4930f3f9989 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/piercing-1.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/piercing-2.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/piercing-2.png new file mode 100644 index 00000000000..28cbeba80bf Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/piercing-2.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/piercing-3.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/piercing-3.png new file mode 100644 index 00000000000..63b7a84f900 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/piercing-3.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/piercing-4.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/piercing-4.png new file mode 100644 index 00000000000..749eba847ae Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/piercing-4.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/piercing-5.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/piercing-5.png new file mode 100644 index 00000000000..f7608dbedba Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/piercing-5.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/piercing-6.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/piercing-6.png new file mode 100644 index 00000000000..3079f5324e6 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/piercing-6.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/piercing-7.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/piercing-7.png new file mode 100644 index 00000000000..0a1ec7887ed Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/piercing-7.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/piercing-8.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/piercing-8.png new file mode 100644 index 00000000000..7c46da59ce5 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/piercing-8.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/piercing-icon.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/piercing-icon.png new file mode 100644 index 00000000000..c84f3f68fef Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/piercing-icon.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/practice-1.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/practice-1.png new file mode 100644 index 00000000000..e5f08f1d51f Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/practice-1.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/practice-2.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/practice-2.png new file mode 100644 index 00000000000..ababaa84671 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/practice-2.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/practice-3.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/practice-3.png new file mode 100644 index 00000000000..411fc78a3fd Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/practice-3.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/practice-4.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/practice-4.png new file mode 100644 index 00000000000..515b63889f5 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/practice-4.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/practice-5.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/practice-5.png new file mode 100644 index 00000000000..cc7011a1642 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/practice-5.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/practice-6.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/practice-6.png new file mode 100644 index 00000000000..2e7e7fbcdab Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/practice-6.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/practice-7.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/practice-7.png new file mode 100644 index 00000000000..f8e250bd15e Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/practice-7.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/practice-8.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/practice-8.png new file mode 100644 index 00000000000..d7dfe0371fe Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/practice-8.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/practice-icon.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/practice-icon.png new file mode 100644 index 00000000000..670965cafd1 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/practice-icon.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/rubber-1.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/rubber-1.png new file mode 100644 index 00000000000..5dca9d7803d Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/rubber-1.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/rubber-2.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/rubber-2.png new file mode 100644 index 00000000000..f615854e5ce Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/rubber-2.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/rubber-3.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/rubber-3.png new file mode 100644 index 00000000000..44dacb9f0b8 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/rubber-3.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/rubber-4.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/rubber-4.png new file mode 100644 index 00000000000..7216d9f79fa Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/rubber-4.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/rubber-5.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/rubber-5.png new file mode 100644 index 00000000000..7a6d1b044dc Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/rubber-5.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/rubber-6.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/rubber-6.png new file mode 100644 index 00000000000..65a9e355e02 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/rubber-6.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/rubber-7.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/rubber-7.png new file mode 100644 index 00000000000..18a0b63c5d5 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/rubber-7.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/rubber-8.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/rubber-8.png new file mode 100644 index 00000000000..a5517503ebc Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/rubber-8.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/rubber-icon.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/rubber-icon.png new file mode 100644 index 00000000000..d77bd3998ba Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/rubber-icon.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/uranium-1.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/uranium-1.png new file mode 100644 index 00000000000..084eb43a8c8 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/uranium-1.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/uranium-2.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/uranium-2.png new file mode 100644 index 00000000000..1c6069bcbb4 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/uranium-2.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/uranium-3.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/uranium-3.png new file mode 100644 index 00000000000..a47505934cc Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/uranium-3.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/uranium-4.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/uranium-4.png new file mode 100644 index 00000000000..b5b31a8e2ba Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/uranium-4.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/uranium-5.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/uranium-5.png new file mode 100644 index 00000000000..4cc13396828 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/uranium-5.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/uranium-6.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/uranium-6.png new file mode 100644 index 00000000000..8e6e5ba62ef Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/uranium-6.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/uranium-7.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/uranium-7.png new file mode 100644 index 00000000000..5378e8179fd Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/uranium-7.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/uranium-8.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/uranium-8.png new file mode 100644 index 00000000000..13668787201 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/uranium-8.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/uranium-icon.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/uranium-icon.png new file mode 100644 index 00000000000..c8511271a9a Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/uranium-icon.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Basic/sawn_kinetic_accelerator.rsi/equipped-BELT.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Basic/sawn_kinetic_accelerator.rsi/equipped-BELT.png new file mode 100644 index 00000000000..28077085547 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Basic/sawn_kinetic_accelerator.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Basic/sawn_kinetic_accelerator.rsi/icon.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Basic/sawn_kinetic_accelerator.rsi/icon.png new file mode 100644 index 00000000000..acd074e877c Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Basic/sawn_kinetic_accelerator.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Basic/sawn_kinetic_accelerator.rsi/inhand-left.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Basic/sawn_kinetic_accelerator.rsi/inhand-left.png new file mode 100644 index 00000000000..767ed5b8e49 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Basic/sawn_kinetic_accelerator.rsi/inhand-left.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Basic/sawn_kinetic_accelerator.rsi/inhand-right.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Basic/sawn_kinetic_accelerator.rsi/inhand-right.png new file mode 100644 index 00000000000..e54e8fa2cc8 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Basic/sawn_kinetic_accelerator.rsi/inhand-right.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Basic/sawn_kinetic_accelerator.rsi/meta.json b/Resources/Textures/_NF/Objects/Weapons/Guns/Basic/sawn_kinetic_accelerator.rsi/meta.json new file mode 100644 index 00000000000..98181d3ead3 --- /dev/null +++ b/Resources/Textures/_NF/Objects/Weapons/Guns/Basic/sawn_kinetic_accelerator.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "icon by RiceMar1244 based on tgstation at https://github.com/tgstation/tgstation/commit/8b7f8ba6a3327c7381967c550f185dffafd11a57; inhand, and belt equip sprites by RiceMar1244 | edited for sawn-off version by erhardsteinhauer", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "equipped-BELT", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/argenti.rsi/bolt-open.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/argenti.rsi/bolt-open.png new file mode 100644 index 00000000000..5da259a4230 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/argenti.rsi/bolt-open.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/argenti.rsi/equipped-BELT.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/argenti.rsi/equipped-BELT.png new file mode 100644 index 00000000000..d5c2e5102fb Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/argenti.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/argenti.rsi/icon.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/argenti.rsi/icon.png new file mode 100644 index 00000000000..5da259a4230 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/argenti.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/argenti.rsi/inhand-left.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/argenti.rsi/inhand-left.png new file mode 100644 index 00000000000..57fb0c7c594 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/argenti.rsi/inhand-left.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/argenti.rsi/inhand-right.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/argenti.rsi/inhand-right.png new file mode 100644 index 00000000000..97f36840ffd Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/argenti.rsi/inhand-right.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/argenti.rsi/meta.json b/Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/argenti.rsi/meta.json new file mode 100644 index 00000000000..b261898e2f1 --- /dev/null +++ b/Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/argenti.rsi/meta.json @@ -0,0 +1,29 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Created by @Stagnation on frontier discord", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "bolt-open" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BELT", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Snipers/repeater.rsi/base.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Snipers/repeater.rsi/base.png new file mode 100644 index 00000000000..421fb601521 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Snipers/repeater.rsi/base.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Snipers/repeater.rsi/bolt-open.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Snipers/repeater.rsi/bolt-open.png new file mode 100644 index 00000000000..5194385cf00 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Snipers/repeater.rsi/bolt-open.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Snipers/repeater.rsi/equipped-BACKPACK.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Snipers/repeater.rsi/equipped-BACKPACK.png new file mode 100644 index 00000000000..ff8892bdaf3 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Snipers/repeater.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Snipers/repeater.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Snipers/repeater.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 00000000000..ff8892bdaf3 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Snipers/repeater.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Snipers/repeater.rsi/inhand-left.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Snipers/repeater.rsi/inhand-left.png new file mode 100644 index 00000000000..417daab4009 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Snipers/repeater.rsi/inhand-left.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Snipers/repeater.rsi/inhand-right.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Snipers/repeater.rsi/inhand-right.png new file mode 100644 index 00000000000..1aec54fe893 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Snipers/repeater.rsi/inhand-right.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Snipers/repeater.rsi/meta.json b/Resources/Textures/_NF/Objects/Weapons/Guns/Snipers/repeater.rsi/meta.json new file mode 100644 index 00000000000..f0146e82a56 --- /dev/null +++ b/Resources/Textures/_NF/Objects/Weapons/Guns/Snipers/repeater.rsi/meta.json @@ -0,0 +1,41 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from InterBay13 at https://github.com/AndySok/InterBay13/commit/84824582fe1381d9ea6282b9da407994ab8ab509, backpack sling sprite edited by Boaz1111", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "base" + }, + { + "name": "bolt-open" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 + }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Snipers/repeater.rsi/wielded-inhand-left.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Snipers/repeater.rsi/wielded-inhand-left.png new file mode 100644 index 00000000000..f41af6b0c46 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Snipers/repeater.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Snipers/repeater.rsi/wielded-inhand-right.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Snipers/repeater.rsi/wielded-inhand-right.png new file mode 100644 index 00000000000..fcae7fa8f04 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Snipers/repeater.rsi/wielded-inhand-right.png differ