diff --git a/Content.Client/DeltaV/Lamiae/ClientLamiaVisuals.cs b/Content.Client/DeltaV/Lamiae/ClientLamiaVisuals.cs new file mode 100644 index 0000000000..046f6a7a3c --- /dev/null +++ b/Content.Client/DeltaV/Lamiae/ClientLamiaVisuals.cs @@ -0,0 +1,42 @@ +/* +* Delta-V - This file is licensed under AGPLv3 +* Copyright (c) 2024 Delta-V Contributors +* See AGPLv3.txt for details. +*/ + +using Robust.Client.GameObjects; +using System.Numerics; +using Content.Shared.SegmentedEntity; + +namespace Content.Client.DeltaV.Lamiae; + +public sealed class ClientLamiaVisualSystem : VisualizerSystem +{ + + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent(OnAppearanceChange); + } + private void OnAppearanceChange(EntityUid uid, SegmentedEntitySegmentComponent component, ref AppearanceChangeEvent args) + { + if (args.Sprite == null) return; + + if (AppearanceSystem.TryGetData(uid, ScaleVisuals.Scale, out var scale) && TryComp(uid, out var sprite)) + { + sprite.Scale = new Vector2(scale, scale); + } + + if (AppearanceSystem.TryGetData(uid, SegmentedEntitySegmentVisualLayers.Armor, out var worn) + && AppearanceSystem.TryGetData(uid, SegmentedEntitySegmentVisualLayers.ArmorRsi, out var path)) + { + var valid = !string.IsNullOrWhiteSpace(path); + if (valid) + { + args.Sprite.LayerSetRSI(SegmentedEntitySegmentVisualLayers.Armor, path); + } + args.Sprite.LayerSetVisible(SegmentedEntitySegmentVisualLayers.Armor, worn); + } + } +} diff --git a/Content.Client/DeltaV/Lamiae/LamiaSegmentVisualsComponent.cs b/Content.Client/DeltaV/Lamiae/LamiaSegmentVisualsComponent.cs new file mode 100644 index 0000000000..e2c1139f23 --- /dev/null +++ b/Content.Client/DeltaV/Lamiae/LamiaSegmentVisualsComponent.cs @@ -0,0 +1,11 @@ +/* +* Delta-V - This file is licensed under AGPLv3 +* Copyright (c) 2024 Delta-V Contributors +* See AGPLv3.txt for details. +*/ + +namespace Content.Client.DeltaV.Lamiae; + +[RegisterComponent] +public sealed partial class SegmentedEntitySegmentVisualsComponent : Component +{} diff --git a/Content.Server/Anomaly/AnomalySystem.Psionics.cs b/Content.Server/Anomaly/AnomalySystem.Psionics.cs index 91a1c33c9f..8fa88c468c 100644 --- a/Content.Server/Anomaly/AnomalySystem.Psionics.cs +++ b/Content.Server/Anomaly/AnomalySystem.Psionics.cs @@ -15,6 +15,8 @@ private void InitializePsionics() { SubscribeLocalEvent(OnDispelled); } + + //Nyano - Summary: gives dispellable behavior to Anomalies. private void OnDispelled(EntityUid uid, AnomalyComponent component, DispelledEvent args) { _dispel.DealDispelDamage(uid); diff --git a/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs b/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs index 5128869103..2ac779cc94 100644 --- a/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs +++ b/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs @@ -9,6 +9,7 @@ using Content.Shared.Ghost; using Content.Shared.Maps; using Content.Shared.Parallax; +using Content.Shared.SegmentedEntity; using Content.Shared.Shuttles.Components; using Content.Shared.Shuttles.Systems; using Content.Shared.StatusEffect; @@ -601,7 +602,9 @@ private void KnockOverKids(TransformComponent xform, ref ValueList to var childEnumerator = xform.ChildEnumerator; while (childEnumerator.MoveNext(out var child)) { - if (!_buckleQuery.TryGetComponent(child, out var buckle) || buckle.Buckled) + if (!_buckleQuery.TryGetComponent(child, out var buckle) || buckle.Buckled + || HasComp(child) + || HasComp(child)) continue; toKnock.Add(child); diff --git a/Content.Server/SimpleStation14/Power/Systems/SiliconEmitSoundOnDrainedSystem.cs b/Content.Server/SimpleStation14/Power/Systems/SiliconEmitSoundOnDrainedSystem.cs index 0f648079ce..cfc0cef3e4 100644 --- a/Content.Server/SimpleStation14/Power/Systems/SiliconEmitSoundOnDrainedSystem.cs +++ b/Content.Server/SimpleStation14/Power/Systems/SiliconEmitSoundOnDrainedSystem.cs @@ -1,5 +1,5 @@ using Content.Server.SimpleStation14.Silicon.Death; -using Content.Server.Sound.Components; +using Content.Shared.Sound.Components; using Content.Shared.Mobs; using Content.Shared.SimpleStation14.Silicon.Systems; using Content.Shared.Sound.Components; diff --git a/Content.Server/Weapons/Ranged/Systems/GunSystem.cs b/Content.Server/Weapons/Ranged/Systems/GunSystem.cs index fbc46f5917..69dd9626d5 100644 --- a/Content.Server/Weapons/Ranged/Systems/GunSystem.cs +++ b/Content.Server/Weapons/Ranged/Systems/GunSystem.cs @@ -203,7 +203,13 @@ public override void Shoot(EntityUid gunUid, GunComponent gun, List<(EntityUid? if (!rayCastResults.Any()) break; - var result = rayCastResults[0]; + var raycastEvent = new HitScanAfterRayCastEvent(rayCastResults); + RaiseLocalEvent(lastUser, ref raycastEvent); + + if (raycastEvent.RayCastResults == null) + break; + + var result = raycastEvent.RayCastResults[0]; var hit = result.HitEntity; lastHit = hit; diff --git a/Content.Shared/CCVar/CCVars.cs b/Content.Shared/CCVar/CCVars.cs index 8901fdb57c..e8a8f53e38 100644 --- a/Content.Shared/CCVar/CCVars.cs +++ b/Content.Shared/CCVar/CCVars.cs @@ -2393,7 +2393,7 @@ public static readonly CVarDef /// Setting this above 0 isn't very realistic, but people who see CPR in movies and TV will expect CPR to work this way. /// public static readonly CVarDef CPRResuscitationChance = - CVarDef.Create("cpr.resuscitation_chance", 0.05f, CVar.REPLICATED | CVar.SERVER); + CVarDef.Create("cpr.resuscitation_chance", 0.01f, CVar.REPLICATED | CVar.SERVER); /// /// By default, CPR reduces rot timers by an amount of seconds equal to the time spent performing CPR. This is an optional multiplier that can increase or decrease the amount diff --git a/Content.Shared/Contests/ContestsSystem.CVars.cs b/Content.Shared/Contests/ContestsSystem.CVars.cs deleted file mode 100644 index 2775c8adb4..0000000000 --- a/Content.Shared/Contests/ContestsSystem.CVars.cs +++ /dev/null @@ -1,19 +0,0 @@ -using Content.Shared.CCVar; -using Robust.Shared.Configuration; - -namespace Content.Shared.Contests -{ - public sealed partial class ContestsSystem - { - [Dependency] private readonly IConfigurationManager _cfg = default!; - - public bool DoMassContests { get; private set; } - public float MassContestsMaxPercentage { get; private set; } - - private void InitializeCVars() - { - Subs.CVar(_cfg, CCVars.DoMassContests, value => DoMassContests = value, true); - Subs.CVar(_cfg, CCVars.MassContestsMaxPercentage, value => MassContestsMaxPercentage = value, true); - } - } -} diff --git a/Content.Shared/Contests/ContestsSystem.cs b/Content.Shared/Contests/ContestsSystem.cs index 26b8b7f68c..3b8a9ece97 100644 --- a/Content.Shared/Contests/ContestsSystem.cs +++ b/Content.Shared/Contests/ContestsSystem.cs @@ -2,6 +2,7 @@ using Content.Shared.Damage; using Content.Shared.Damage.Components; using Content.Shared.Mobs.Systems; +using Robust.Shared.Configuration; using Robust.Shared.Physics.Components; namespace Content.Shared.Contests @@ -9,6 +10,7 @@ namespace Content.Shared.Contests public sealed partial class ContestsSystem : EntitySystem { [Dependency] private readonly MobThresholdSystem _mobThreshold = default!; + [Dependency] private readonly IConfigurationManager _cfg = default!; /// /// The presumed average mass of a player entity diff --git a/Content.Shared/Roles/StartingGearPrototype.cs b/Content.Shared/Roles/StartingGearPrototype.cs index 0ff65617bc..32b72aaeed 100644 --- a/Content.Shared/Roles/StartingGearPrototype.cs +++ b/Content.Shared/Roles/StartingGearPrototype.cs @@ -43,6 +43,7 @@ public string GetGear(string slot, HumanoidCharacterProfile? profile) { case "jumpsuit" when profile.Clothing == ClothingPreference.Jumpskirt && !string.IsNullOrEmpty(InnerClothingSkirt): case "jumpsuit" when profile.Species == "Harpy" && !string.IsNullOrEmpty(InnerClothingSkirt): + case "jumpsuit" when profile.Species == "Lamia" && !string.IsNullOrEmpty(InnerClothingSkirt): return InnerClothingSkirt; case "back" when profile.Backpack == BackpackPreference.Satchel && !string.IsNullOrEmpty(Satchel): return Satchel; diff --git a/Content.Shared/SegmentedEntity/SegmentSpawnedEvent.cs b/Content.Shared/SegmentedEntity/SegmentSpawnedEvent.cs new file mode 100644 index 0000000000..6b0e0407a3 --- /dev/null +++ b/Content.Shared/SegmentedEntity/SegmentSpawnedEvent.cs @@ -0,0 +1,10 @@ +namespace Content.Shared.SegmentedEntity; +public sealed class SegmentSpawnedEvent : EntityEventArgs +{ + public EntityUid Lamia = default!; + + public SegmentSpawnedEvent(EntityUid lamia) + { + Lamia = lamia; + } +} diff --git a/Content.Shared/SegmentedEntity/SegmentedEntityComponent.cs b/Content.Shared/SegmentedEntity/SegmentedEntityComponent.cs new file mode 100644 index 0000000000..ee217771d4 --- /dev/null +++ b/Content.Shared/SegmentedEntity/SegmentedEntityComponent.cs @@ -0,0 +1,84 @@ +/* +* Delta-V - This file is licensed under AGPLv3 +* Copyright (c) 2024 Delta-V Contributors +* See AGPLv3.txt for details. +*/ + +namespace Content.Shared.SegmentedEntity +{ + /// + /// Controls initialization of any Multi-segmented entity + /// + [RegisterComponent] + public sealed partial class SegmentedEntityComponent : Component + { + /// + /// A list of each UID attached to the Lamia, in order of spawn + /// + [DataField("segments")] + public List Segments = new(); + + /// + /// A clamped variable that represents the number of segments to be spawned + /// + [DataField("numberOfSegments")] + public int NumberOfSegments = 18; + + /// + /// If UseTaperSystem is true, this constant represents the rate at which a segmented entity will taper towards the tip. Tapering is on a logarithmic scale, and will asymptotically approach 0. + /// + [DataField("offsetConstant")] + public float OffsetConstant = 1.03f; + + /// + /// Represents the prototype used to parent all segments + /// + [DataField("initialSegmentId")] + public string InitialSegmentId = "LamiaInitialSegment"; + + /// + /// Represents the segment prototype to be spawned + /// + [DataField("SegmentId")] + public string SegmentId = "LamiaSegment"; + + /// + /// Toggles the tapering system on and off. When false, segmented entities will have a constant width. + /// + [DataField("useTaperSystem")] + public bool UseTaperSystem = true; + + /// + /// The standard distance between the centerpoint of each segment. + /// + [DataField("staticOffset")] + public float StaticOffset = 0.15f; + + /// + /// The standard sprite scale of each segment. + /// + [DataField("staticScale")] + public float StaticScale = 1f; + + /// + /// Used to more finely tune how much damage should be transfered from tail to body. + /// + [DataField("damageModifierOffset")] + public float DamageModifierOffset = 0.4f; + + /// + /// A clamped variable that represents how far from the tip should tapering begin. + /// + [DataField("taperOffset")] + public int TaperOffset = 18; + + /// + /// Coefficient used to finely tune how much explosion damage should be transfered to the body. This is calculated multiplicatively with the derived damage modifier set. + /// + [DataField("explosiveModifierOffset")] + public float ExplosiveModifierOffset = 0.1f; + + [DataField("bulletPassover")] + public bool BulletPassover = true; + } +} diff --git a/Content.Shared/SegmentedEntity/SegmentedEntitySegmentComponent.cs b/Content.Shared/SegmentedEntity/SegmentedEntitySegmentComponent.cs new file mode 100644 index 0000000000..b29e282e9e --- /dev/null +++ b/Content.Shared/SegmentedEntity/SegmentedEntitySegmentComponent.cs @@ -0,0 +1,35 @@ +/* +* Delta-V - This file is licensed under AGPLv3 +* Copyright (c) 2024 Delta-V Contributors +* See AGPLv3.txt for details. +*/ + +using Robust.Shared.GameStates; + +namespace Content.Shared.SegmentedEntity +{ + /// + /// Lamia segment + /// + [RegisterComponent] + [NetworkedComponent] + public sealed partial class SegmentedEntitySegmentComponent : Component + { + [DataField("AttachedToUid")] + public EntityUid AttachedToUid = default!; + public float DamageModifyFactor = default!; + public float OffsetSwitching = default!; + public float ScaleFactor = default!; + [DataField("DamageModifierCoefficient")] + public float DamageModifierCoefficient = default!; + public float ExplosiveModifyFactor = default!; + public float OffsetConstant = default!; + [DataField("Lamia")] + public EntityUid Lamia = default!; + public int MaxSegments = default!; + public int SegmentNumber = default!; + public float DamageModifierConstant = default!; + [DataField("segmentId")] + public string? segmentId; + } +} diff --git a/Content.Shared/SegmentedEntity/SegmentedEntitySegmentVisuals.cs b/Content.Shared/SegmentedEntity/SegmentedEntitySegmentVisuals.cs new file mode 100644 index 0000000000..f1e6a20211 --- /dev/null +++ b/Content.Shared/SegmentedEntity/SegmentedEntitySegmentVisuals.cs @@ -0,0 +1,18 @@ +/* +* Delta-V - This file is licensed under AGPLv3 +* Copyright (c) 2024 Delta-V Contributors +* See AGPLv3.txt for details. +*/ + +using Robust.Shared.Serialization; + +namespace Content.Shared.SegmentedEntity +{ + [Serializable, NetSerializable] + public enum SegmentedEntitySegmentVisualLayers + { + Tail, + Armor, + ArmorRsi, + } +} diff --git a/Content.Shared/SegmentedEntity/SegmentedEntitySystem.cs b/Content.Shared/SegmentedEntity/SegmentedEntitySystem.cs new file mode 100644 index 0000000000..497dd31d59 --- /dev/null +++ b/Content.Shared/SegmentedEntity/SegmentedEntitySystem.cs @@ -0,0 +1,347 @@ +using Robust.Shared.Physics; +using Content.Shared.Damage; +using Content.Shared.Explosion; +using Content.Shared.Humanoid; +using Content.Shared.Humanoid.Markings; +using Content.Shared.Clothing.Components; +using Content.Shared.Inventory.Events; +using Content.Shared.Tag; +using Content.Shared.Storage.Components; +using Content.Shared.Weapons.Ranged.Events; +using Content.Shared.Teleportation.Components; +using Robust.Shared.Map; +using Robust.Shared.Physics.Systems; +using Robust.Shared.Physics.Components; +using System.Numerics; +using Robust.Shared.Network; + +namespace Content.Shared.SegmentedEntity +{ + public sealed partial class LamiaSystem : EntitySystem + { + [Dependency] private readonly TagSystem _tagSystem = default!; + [Dependency] private readonly SharedAppearanceSystem _appearance = default!; + [Dependency] private readonly DamageableSystem _damageableSystem = default!; + [Dependency] private readonly SharedHumanoidAppearanceSystem _humanoid = default!; + [Dependency] private readonly SharedJointSystem _jointSystem = default!; + [Dependency] private readonly INetManager _net = default!; + + Queue<(SegmentedEntitySegmentComponent segment, EntityUid lamia)> _segments = new(); + + [ValidatePrototypeId] + private const string LamiaHardsuitTag = "AllowLamiaHardsuit"; + public override void Initialize() + { + base.Initialize(); + //Parent subscriptions + SubscribeLocalEvent(OnShootHitscan); + SubscribeLocalEvent(OnLamiaStorageInsertAttempt); + SubscribeLocalEvent(OnDidEquipEvent); + SubscribeLocalEvent(OnDidUnequipEvent); + SubscribeLocalEvent(OnInit); + SubscribeLocalEvent(OnShutdown); + SubscribeLocalEvent(OnJointRemoved); + SubscribeLocalEvent(OnParentChanged); + SubscribeLocalEvent(OnStoreSnekAttempt); + + //Child subscriptions + SubscribeLocalEvent(OnSegmentStorageInsertAttempt); + SubscribeLocalEvent(OnSnekBoom); + SubscribeLocalEvent(HandleDamageTransfer); + SubscribeLocalEvent(HandleSegmentDamage); + SubscribeLocalEvent(OnSegmentSpawned); + } + public override void Update(float frameTime) + { + //I HATE THIS, SO MUCH. I AM FORCED TO DEAL WITH THIS MONSTROSITY. PLEASE. SEND HELP. + base.Update(frameTime); + foreach (var segment in _segments) + { + var segmentUid = segment.segment.Owner; + var attachedUid = segment.segment.AttachedToUid; + if (!Exists(segmentUid) || !Exists(attachedUid) + || MetaData(segmentUid).EntityLifeStage > EntityLifeStage.MapInitialized + || MetaData(attachedUid).EntityLifeStage > EntityLifeStage.MapInitialized + || Transform(segmentUid).MapID == MapId.Nullspace + || Transform(attachedUid).MapID == MapId.Nullspace) + continue; + + EnsureComp(segmentUid); + EnsureComp(attachedUid); // Hello I hate tests + + // This is currently HERE and not somewhere more sane like OnInit because HumanoidAppearanceComponent is for whatever + // ungodly reason not initialized when ComponentStartup is called. Kill me. + var humanoidFactor = TryComp(segment.segment.Lamia, out var humanoid) ? (humanoid.Height + humanoid.Width) / 2 : 1; + + var ev = new SegmentSpawnedEvent(segment.lamia); + RaiseLocalEvent(segmentUid, ev, false); + + if (segment.segment.SegmentNumber == 1) + { + Transform(segmentUid).Coordinates = Transform(attachedUid).Coordinates; + var revoluteJoint = _jointSystem.CreateWeldJoint(attachedUid, segmentUid, id: "Segment" + segment.segment.SegmentNumber + segment.segment.Lamia); + revoluteJoint.CollideConnected = false; + } + if (segment.segment.SegmentNumber <= segment.segment.MaxSegments) + Transform(segmentUid).Coordinates = Transform(attachedUid).Coordinates.Offset(new Vector2(0, segment.segment.OffsetSwitching * humanoidFactor)); + else + Transform(segmentUid).Coordinates = Transform(attachedUid).Coordinates.Offset(new Vector2(0, segment.segment.OffsetSwitching * humanoidFactor)); + + var joint = _jointSystem.CreateDistanceJoint(attachedUid, segmentUid, id: ("Segment" + segment.segment.SegmentNumber + segment.segment.Lamia)); + joint.CollideConnected = false; + joint.Stiffness = 0.2f; + } + _segments.Clear(); + } + private void OnInit(EntityUid uid, SegmentedEntityComponent component, ComponentInit args) + { + EnsureComp(uid); //Temporary, remove when Portal handling is added + Math.Clamp(component.NumberOfSegments, 2, 18); + Math.Clamp(component.TaperOffset, 1, component.NumberOfSegments - 1); + SpawnSegments(uid, component); + } + + private void OnShutdown(EntityUid uid, SegmentedEntityComponent component, ComponentShutdown args) + { + if (_net.IsClient) + return; + + foreach (var segment in component.Segments) + { + QueueDel(segment); + } + + component.Segments.Clear(); + } + + /// + /// TODO: Full Self-Test function that intelligently checks the status of where everything is, and calls whatever + /// functions are appropriate + /// + /// + /// + public void SegmentSelfTest(EntityUid uid, SegmentedEntityComponent component) + { + + } + + /// + /// TODO: Function that ensures clothing visuals, to be called anytime the tail is reset + /// + /// + /// + private void EnsureSnekSock(EntityUid uid, SegmentedEntityComponent segment) + { + + } + public void OnStoreSnekAttempt(EntityUid uid, SegmentedEntityComponent comp, ref StoreMobInItemContainerAttemptEvent args) + { + args.Cancelled = true; + } + + private void OnJointRemoved(EntityUid uid, SegmentedEntityComponent component, JointRemovedEvent args) + { + if (!component.Segments.Contains(args.OtherEntity)) + return; + + DeleteSegments(component); + } + + private void DeleteSegments(SegmentedEntityComponent component) + { + if (_net.IsClient) + return; //Client is not allowed to predict QueueDel, it'll throw an error(but won't crash in Release build) + + foreach (var segment in component.Segments) + QueueDel(segment); + + component.Segments.Clear(); + } + + /// + /// Public call for a SegmentedEntity to reset their tail completely. + /// + /// + /// + public void RespawnSegments(EntityUid uid, SegmentedEntityComponent component) + { + DeleteSegments(component); + SpawnSegments(uid, component); + } + + private void SpawnSegments(EntityUid uid, SegmentedEntityComponent component) + { + if (_net.IsClient) + return; //Client is not allowed to spawn entities. It won't throw an error, but it'll make fake client entities. + + int i = 1; + var addTo = uid; + while (i <= component.NumberOfSegments + 1) + { + var segment = AddSegment(addTo, uid, component, i); + addTo = segment; + i++; + } + } + + private EntityUid AddSegment(EntityUid segmentuid, EntityUid parentuid, SegmentedEntityComponent segmentedComponent, int segmentNumber) + { + float taperConstant = segmentedComponent.NumberOfSegments - segmentedComponent.TaperOffset; + EntityUid segment; + if (segmentNumber == 1) + segment = EntityManager.SpawnEntity(segmentedComponent.InitialSegmentId, Transform(segmentuid).Coordinates); + else + segment = EntityManager.SpawnEntity(segmentedComponent.SegmentId, Transform(segmentuid).Coordinates); + + var segmentComponent = EnsureComp(segment); + + segmentComponent.Lamia = parentuid; + segmentComponent.AttachedToUid = segmentuid; + segmentComponent.DamageModifierConstant = segmentedComponent.NumberOfSegments * segmentedComponent.DamageModifierOffset; + float damageModifyCoefficient = segmentComponent.DamageModifierConstant / segmentedComponent.NumberOfSegments; + segmentComponent.DamageModifyFactor = segmentComponent.DamageModifierConstant * damageModifyCoefficient; + segmentComponent.ExplosiveModifyFactor = 1 / segmentComponent.DamageModifyFactor / (segmentedComponent.NumberOfSegments * segmentedComponent.ExplosiveModifierOffset); + segmentComponent.SegmentNumber = segmentNumber; + segmentComponent.Owner = segment; + + if (segmentedComponent.UseTaperSystem == true) + { + if (segmentNumber >= taperConstant) + { + segmentComponent.OffsetSwitching = segmentedComponent.StaticOffset + * MathF.Pow(segmentedComponent.OffsetConstant, segmentNumber - taperConstant); + + segmentComponent.ScaleFactor = segmentedComponent.StaticScale + * MathF.Pow(1f / segmentedComponent.OffsetConstant, segmentNumber - taperConstant); + } + if (segmentNumber < taperConstant) + { + segmentComponent.OffsetSwitching = segmentedComponent.StaticOffset; + segmentComponent.ScaleFactor = segmentedComponent.StaticScale; + } + } + else + { + segmentComponent.OffsetSwitching = segmentedComponent.StaticOffset; + segmentComponent.ScaleFactor = segmentedComponent.StaticScale; + } + + // We invert the Y axis offset on every odd numbered tail so that the segmented entity spawns in a neat pile + // Rather than stretching across 5 to 10 vertical tiles, and potentially getting trapped in a wall + if (segmentNumber % 2 != 0) + { + segmentComponent.OffsetSwitching *= -1; + } + + EnsureComp(segment); //Not temporary, segments must never be allowed to go through portals for physics limitation reasons + _segments.Enqueue((segmentComponent, parentuid)); + segmentedComponent.Segments.Add(segment); + return segment; + } + + /// + /// Handles transferring marking selections to the tail segments. Every tail marking must be repeated 2 times in order for this script to work. + /// + /// + /// + /// + // TODO: Please for the love of god don't make me write a test to validate that every marking also has its matching segment states. + // Future contributors will just find out when their game crashes because they didn't make a marking-segment. + private void OnSegmentSpawned(EntityUid uid, SegmentedEntitySegmentComponent component, SegmentSpawnedEvent args) + { + component.Lamia = args.Lamia; + + if (!TryComp(uid, out var species)) return; + if (!TryComp(args.Lamia, out var humanoid)) return; + if (!TryComp(uid, out var appearance)) return; + var humanoidFactor = (humanoid.Height + humanoid.Width) / 2; + + _appearance.SetData(uid, ScaleVisuals.Scale, component.ScaleFactor * humanoidFactor, appearance); + + if (humanoid.MarkingSet.TryGetCategory(MarkingCategories.Tail, out var tailMarkings)) + { + foreach (var markings in tailMarkings) + { + var segmentId = species.Species; + var markingId = markings.MarkingId; + string segmentmarking = $"{markingId}-{segmentId}"; + _humanoid.AddMarking(uid, segmentmarking, markings.MarkingColors); + } + } + } + + private void HandleSegmentDamage(EntityUid uid, SegmentedEntitySegmentComponent component, DamageModifyEvent args) + { + if (args.Origin == component.Lamia) + args.Damage *= 0; + args.Damage = args.Damage / component.DamageModifyFactor; + } + private void HandleDamageTransfer(EntityUid uid, SegmentedEntitySegmentComponent component, DamageChangedEvent args) + { + if (args.DamageDelta == null) return; + _damageableSystem.TryChangeDamage(component.Lamia, args.DamageDelta); + } + + private void OnLamiaStorageInsertAttempt(EntityUid uid, SegmentedEntityComponent comp, ref InsertIntoEntityStorageAttemptEvent args) + { + args.Cancelled = true; + } + + private void OnSegmentStorageInsertAttempt(EntityUid uid, SegmentedEntitySegmentComponent comp, ref InsertIntoEntityStorageAttemptEvent args) + { + args.Cancelled = true; + } + + private void OnDidEquipEvent(EntityUid equipee, SegmentedEntityComponent component, DidEquipEvent args) + { + if (!TryComp(args.Equipment, out var clothing)) return; + if (args.Slot == "outerClothing" && _tagSystem.HasTag(args.Equipment, LamiaHardsuitTag)) + { + foreach (var uid in component.Segments) + { + if (!TryComp(uid, out var appearance)) return; + _appearance.SetData(uid, SegmentedEntitySegmentVisualLayers.Armor, true, appearance); + if (clothing.RsiPath == null) return; + _appearance.SetData(uid, SegmentedEntitySegmentVisualLayers.ArmorRsi, clothing.RsiPath, appearance); + } + } + } + + private void OnSnekBoom(EntityUid uid, SegmentedEntitySegmentComponent component, ref GetExplosionResistanceEvent args) + { + args.DamageCoefficient = component.ExplosiveModifyFactor; + } + + private void OnDidUnequipEvent(EntityUid equipee, SegmentedEntityComponent component, DidUnequipEvent args) + { + if (args.Slot == "outerClothing" && _tagSystem.HasTag(args.Equipment, LamiaHardsuitTag)) + { + foreach (var uid in component.Segments) + { + if (!TryComp(uid, out var appearance)) return; + _appearance.SetData(uid, SegmentedEntitySegmentVisualLayers.Armor, false, appearance); + } + } + } + + private void OnShootHitscan(EntityUid uid, SegmentedEntityComponent component, ref HitScanAfterRayCastEvent args) + { + if (args.RayCastResults == null) return; + + var entityList = new List(); + foreach (var entity in args.RayCastResults) + { + if (!component.Segments.Contains(entity.HitEntity)) + entityList.Add(entity); + } + args.RayCastResults = entityList; + } + + private void OnParentChanged(EntityUid uid, SegmentedEntityComponent component, ref EntParentChangedMessage args) + { + //If the change was NOT to a different map + if (args.OldMapId == args.Transform.MapID) + RespawnSegments(uid, component); + } + } +} diff --git a/Content.Shared/Teleportation/Components/PortalExemptComponent.cs b/Content.Shared/Teleportation/Components/PortalExemptComponent.cs new file mode 100644 index 0000000000..28043808e0 --- /dev/null +++ b/Content.Shared/Teleportation/Components/PortalExemptComponent.cs @@ -0,0 +1,8 @@ +using Robust.Shared.GameStates; + +namespace Content.Shared.Teleportation.Components; + +[RegisterComponent, NetworkedComponent] +public sealed partial class PortalExemptComponent : Component +{ +} diff --git a/Content.Shared/Teleportation/Systems/SharedPortalSystem.cs b/Content.Shared/Teleportation/Systems/SharedPortalSystem.cs index 8d67aec518..7e1124cef7 100644 --- a/Content.Shared/Teleportation/Systems/SharedPortalSystem.cs +++ b/Content.Shared/Teleportation/Systems/SharedPortalSystem.cs @@ -1,4 +1,4 @@ -using System.Linq; +using System.Linq; using Content.Shared.Ghost; using Content.Shared.Movement.Pulling.Components; using Content.Shared.Movement.Pulling.Systems; @@ -83,6 +83,9 @@ private bool ShouldCollide(string ourId, string otherId, Fixture our, Fixture ot private void OnCollide(EntityUid uid, PortalComponent component, ref StartCollideEvent args) { + if (HasComp(args.OtherEntity)) + return; + if (!ShouldCollide(args.OurFixtureId, args.OtherFixtureId, args.OurFixture, args.OtherFixture)) return; diff --git a/Content.Shared/Weapons/Ranged/Events/HitScanAfterRayCastEvent.cs b/Content.Shared/Weapons/Ranged/Events/HitScanAfterRayCastEvent.cs new file mode 100644 index 0000000000..99bfd1eabc --- /dev/null +++ b/Content.Shared/Weapons/Ranged/Events/HitScanAfterRayCastEvent.cs @@ -0,0 +1,17 @@ +using Robust.Shared.Physics; + +namespace Content.Shared.Weapons.Ranged.Events; + +/// +/// Raised after an entity fires a hitscan weapon, but before the list is truncated to the first target. Necessary for Entities that need to prevent friendly fire +/// +[ByRefEvent] +public struct HitScanAfterRayCastEvent +{ + public List? RayCastResults; + + public HitScanAfterRayCastEvent(List? rayCastResults) + { + RayCastResults = rayCastResults; + } +} diff --git a/Resources/Credits/Patrons.yml b/Resources/Credits/Patrons.yml index ff3cc28689..bb7812481a 100644 --- a/Resources/Credits/Patrons.yml +++ b/Resources/Credits/Patrons.yml @@ -2,5 +2,5 @@ Tier: Nuclear - Name: "TheGungeonologist" Tier: Nuclear -#- Name: "nameinquotes" -# Tier: teirnotinquotes +- Name: "dankiskhan" + Tier: Nuclear \ No newline at end of file diff --git a/Resources/Locale/en-US/_ds14/loadouts/categories.ftl b/Resources/Locale/en-US/_ds14/loadouts/categories.ftl new file mode 100644 index 0000000000..915979fd7e --- /dev/null +++ b/Resources/Locale/en-US/_ds14/loadouts/categories.ftl @@ -0,0 +1 @@ +loadout-category-PersonalDefense = Personal Defense \ No newline at end of file diff --git a/Resources/Locale/en-US/_ds14/loadouts/personaldefense.ftl b/Resources/Locale/en-US/_ds14/loadouts/personaldefense.ftl new file mode 100644 index 0000000000..073a2ab93b --- /dev/null +++ b/Resources/Locale/en-US/_ds14/loadouts/personaldefense.ftl @@ -0,0 +1,2 @@ +loadout-description-LoadoutItemMk58 = personal defense handgun, loaded with live rounds. May be confiscated by Security. +loadout-description-LoadoutItemMk58NonLethal = personal defense handgun, loaded with rubber rounds. May be confiscated by Security. \ No newline at end of file diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Boxes/pda.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Boxes/pda.yml index b0917006be..b6140daae5 100644 --- a/Resources/Prototypes/DeltaV/Catalog/Fills/Boxes/pda.yml +++ b/Resources/Prototypes/DeltaV/Catalog/Fills/Boxes/pda.yml @@ -36,10 +36,10 @@ - id: ParamedicPDA - type: entity - name: science PDA box + name: epistemics PDA box parent: BoxPDA id: BoxPDAScience - description: A box of spare PDA microcomputers for the science department. + description: A box of spare PDA microcomputers for the epistemics department. components: - type: StorageFill contents: diff --git a/Resources/Prototypes/DeltaV/Datasets/Names/cyno_female.yml b/Resources/Prototypes/DeltaV/Datasets/Names/cyno_female.yml new file mode 100644 index 0000000000..eea73f1e68 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Datasets/Names/cyno_female.yml @@ -0,0 +1,41 @@ +- type: dataset + id: names_cyno_female + values: + - Abigaia + - Aggeliki + - Alexandra + - Anna + - Anastasia + - Baslikike + - Calliope + - Demetra + - Despoina + - Eirene + - Eleni + - Ephrath + - Esther + - Eunike + - Evangelia + - Georgia + - Ioanna + - Ioudith + - Kandake + - Konstantina + - Kyriake + - Leia + - Lois + - Lydia + - Maria + - Mariam + - Martha + - Orpha + - Paraskeve + - Phoebe + - Priska + - Priskilla + - Rhachel + - Rhode + - Rhouth + - Salome + - Sophia + - Zoe diff --git a/Resources/Prototypes/DeltaV/Datasets/Names/cyno_last.yml b/Resources/Prototypes/DeltaV/Datasets/Names/cyno_last.yml new file mode 100644 index 0000000000..3ed9f62f11 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Datasets/Names/cyno_last.yml @@ -0,0 +1,40 @@ +- type: dataset + id: names_cyno_last + values: + - Alexiou + - Antoniou + - Antonopoulos + - Athanasiou + - Christodoulou + - Dimitriou + - Dimopoulos + - Georgiadis + - Georgiou + - Giannopoulos + - Ioannidis + - Ioannou + - Karagianni + - Karagiannis + - Konstantinidis + - Konstantinou + - Lamprou + - Makris + - Michailidis + - Nikolaidis + - Nikolaou + - Panagiotopoulos + - Papadakis + - Papadimitriou + - Papadopoulos + - Papadopoulou + - Papageorgiou + - Papaioannou + - Papakonstantinou + - Papanikolaou + - Papathanasiou + - Pappas + - Oikonomou + - Theodorou + - Triantafyllou + - Vasileiou + - Vlachos diff --git a/Resources/Prototypes/DeltaV/Datasets/Names/cyno_male.yml b/Resources/Prototypes/DeltaV/Datasets/Names/cyno_male.yml new file mode 100644 index 0000000000..ca72b07fd9 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Datasets/Names/cyno_male.yml @@ -0,0 +1,22 @@ +- type: dataset + id: names_cyno_male + values: + - Amos + - Antonis + - Alexandros + - Athanasios + - Charalampos + - Christos + - Dimitris + - Elias + - Emmanuel + - Evangelos + - Ioannis + - Konstantinos + - Loukas + - Michalis + - Pavlos + - Petros + - Spiros + - Theodoros + - Vasilis diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/lamia.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/lamia.yml new file mode 100644 index 0000000000..65af873fe6 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/lamia.yml @@ -0,0 +1,16 @@ +# Delta-V - This file is licensed under AGPLv3 +# Copyright (c) 2024 Delta-V Contributors +# See AGPLv3.txt for details. + +- type: marking + id: LamiaBottom + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [Lamia] + sprites: + - sprite: DeltaV/Mobs/Customization/Lamia/lamia_tails.rsi + state: bottom3tone1 + - sprite: DeltaV/Mobs/Customization/Lamia/lamia_tails.rsi + state: bottom3tone2 + - sprite: DeltaV/Mobs/Customization/Lamia/lamia_tails.rsi + state: bottom3tone3 diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/lamiasegment.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/lamiasegment.yml new file mode 100644 index 0000000000..432b2ee841 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/lamiasegment.yml @@ -0,0 +1,16 @@ +# Delta-V - This file is licensed under AGPLv3 +# Copyright (c) 2024 Delta-V Contributors +# See AGPLv3.txt for details. + +- type: marking + id: LamiaBottom-LamiaSegment + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [LamiaSegment] + sprites: + - sprite: DeltaV/Mobs/Customization/Lamia/lamia_tails.rsi + state: body3tone1 + - sprite: DeltaV/Mobs/Customization/Lamia/lamia_tails.rsi + state: body3tone2 + - sprite: DeltaV/Mobs/Customization/Lamia/lamia_tails.rsi + state: body3tone3 diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Player/lamia.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Player/lamia.yml new file mode 100644 index 0000000000..1f5397e5dc --- /dev/null +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Player/lamia.yml @@ -0,0 +1,39 @@ +# Delta-V - This file is licensed under AGPLv3 +# Copyright (c) 2024 Delta-V Contributors +# See AGPLv3.txt for details. + +- type: entity + save: false + name: Urist McNoodle + parent: MobLamiaBase + id: MobLamia + description: A miserable pile of scales. + components: + - type: CombatMode + - type: InteractionPopup + successChance: 1 + interactSuccessString: hugging-success-generic + interactSuccessSound: /Audio/Effects/thudswoosh.ogg + messagePerceivedByOthers: hugging-success-generic-others + - type: Mind + - type: Input + context: "human" + - type: MobMover + - type: InputMover + - type: Respirator + damage: + types: + Asphyxiation: 1.5 + damageRecovery: + types: + Asphyxiation: -1.5 + - type: Alerts + - type: Actions + - type: Eye + - type: CameraRecoil + - type: Examiner + - type: CanHostGuardian + - type: NpcFactionMember + factions: + - NanoTrasen + - type: PotentialPsionic diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/lamia.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Species/lamia.yml new file mode 100644 index 0000000000..eb8d0f03f0 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Species/lamia.yml @@ -0,0 +1,285 @@ +# Delta-V - This file is licensed under AGPLv3 +# Copyright (c) 2024 Delta-V Contributors +# See AGPLv3.txt for details. + +- type: entity + save: false + name: Lamia + parent: BaseMobHuman #parenting human so I can remove most of these components + id: MobLamiaBase + abstract: true + description: A miserable pile of scales. #TODO: Add a better description + components: + - type: Flashable + - type: Polymorphable + - type: Identity + - type: Hands + - type: HumanoidAppearance + species: Lamia + - type: MovementSpeedModifier + baseWalkSpeed : 4 + baseSprintSpeed : 6 + - type: MovedByPressure + - type: Hunger + - type: Thirst + - type: IdExaminable + - type: Inventory + speciesId: lamia + templateId: lamia + - type: HealthExaminable + examinableTypes: + - Blunt + - Slash + - Piercing + - Heat + - Shock + - type: Stamina + - type: Blindable + - type: Clickable + - type: InteractionOutline + - type: InteractionPopup + successChance: 0.5 + interactSuccessString: petting-success-lamia + interactFailureString: petting-failure-lamia + interactSuccessSpawn: EffectHearts + interactSuccessSound: + path: /Audio/Animals/lizard_happy.ogg #placeholder sound + interactFailureSound: + path: /Audio/Animals/snake_hiss.ogg #placeholder sound + - type: Icon + sprite: Mobs/Species/Human/parts.rsi + state: full + - type: Physics + bodyType: KinematicController + - type: Tag + tags: + - CanPilot + - DoorBumpOpener + - ShoesRequiredStepTriggerImmune + - type: Sprite + netsync: false + noRot: true + drawdepth: Mobs + scale: 1, 1 + layers: #TODO: manually fix these layers + - map: [ "enum.HumanoidVisualLayers.Chest" ] + color: "#e8b59b" + sprite: Nyanotrasen/Mobs/Species/lamia.rsi + state: torso_m + - map: [ "enum.HumanoidVisualLayers.Head" ] + color: "#e8b59b" + sprite: Mobs/Species/Human/parts.rsi + state: head_m + - map: [ "enum.HumanoidVisualLayers.Eyes" ] + color: "#008800" + sprite: Mobs/Customization/eyes.rsi + state: eyes + - map: [ "enum.HumanoidVisualLayers.RArm" ] + color: "#e8b59b" + sprite: Mobs/Species/Human/parts.rsi + state: r_arm + - map: [ "enum.HumanoidVisualLayers.LArm" ] + color: "#e8b59b" + sprite: Mobs/Species/Human/parts.rsi + state: l_arm + - map: [ "enum.HumanoidVisualLayers.Tail" ] + - map: [ "jumpsuit" ] + - map: [ "enum.HumanoidVisualLayers.LHand" ] + color: "#e8b59b" + sprite: Mobs/Species/Human/parts.rsi + state: l_hand + - map: [ "enum.HumanoidVisualLayers.RHand" ] + color: "#e8b59b" + sprite: Mobs/Species/Human/parts.rsi + state: r_hand + - map: [ "enum.HumanoidVisualLayers.Handcuffs" ] + color: "#ffffff" + sprite: Objects/Misc/handcuffs.rsi + state: body-overlay-2 + visible: false + - map: [ "id" ] + - map: [ "gloves" ] + - map: [ "ears" ] + - map: [ "outerClothing" ] + - map: [ "eyes" ] + - map: [ "belt" ] + - map: [ "belt2" ] + - map: [ "neck" ] + - map: [ "back" ] + - map: [ "enum.HumanoidVisualLayers.Hair" ] + state: bald + sprite: Mobs/Customization/human_hair.rsi + - map: [ "mask" ] + - map: [ "head" ] + - map: [ "pocket1" ] + - map: [ "pocket2" ] + - map: [ "enum.HumanoidVisualLayers.HeadTop" ] + - type: Damageable + damageContainer: Biological + damageModifierSet: Scale #TODO: make a new damage modifier set + - type: NoSlip + - type: Internals + - type: MobState + - type: DamageVisuals + thresholds: [ 60, 120, 200 ] #these values aren't final, adjust accordingly with thresholds above' + targetLayers: + - "enum.HumanoidVisualLayers.Chest" + - "enum.HumanoidVisualLayers.Head" + - "enum.HumanoidVisualLayers.LArm" + - "enum.HumanoidVisualLayers.RArm" + damageOverlayGroups: + Brute: + sprite: Nyanotrasen/Mobs/Effects/Lamia/brute_damage.rsi + color: "#FF0000" + Burn: + sprite: Nyanotrasen/Mobs/Effects/Lamia/burn_damage.rsi + - type: MobThresholds + thresholds: + 0: Alive + 200: Critical #these values aren't final' + 300: Dead #these values aren't final' + - type: SlowOnDamage + speedModifierThresholds: #these values aren't final, adjust accordingly with thresholds above' + 60: 0.9 + 80: 0.8 + 100: 0.7 + 120: 0.6 + 140: 0.5 + - type: FireVisuals + sprite: Mobs/Effects/onfire.rsi + normalState: Generic_mob_burning + alternateState: Standing + fireStackAlternateState: 3 + - type: CombatMode + - type: Climbing + - type: Cuffable + - type: AnimationPlayer + - type: MeleeWeapon #This damage is most likely final + soundHit: + path: /Audio/Items/hypospray.ogg #this sound is not final, but is a pretty good placeholder so we might keep it + animation: WeaponArcBite + damage: + types: + Piercing: 1 + Poison: 2 + Asphyxiation: 2 + - type: SolutionContainerManager + solutions: + melee: + maxVol: 30 + - type: SolutionRegeneration + solution: melee + generated: + reagents: + - ReagentId: SpaceDrugs + Quantity: 1 + - type: MeleeChemicalInjector + solution: melee + transferAmount: 3 #amount to inject is not final + - type: Pullable + - type: DoAfter + - type: CreamPied + - type: Stripping + - type: Strippable + - type: Puller + - type: Fixtures + fixtures: # TODO: This needs a second fixture just for mob collisions. + fix1: + shape: + !type:PhysShapeCircle + radius: 0.35 + density: 1000 #Density is not final, adjust accordingly if the number of tail segments is reduced or increased + restitution: 0.0 + mask: + - MobMask + layer: + - MobLayer + - type: SegmentedEntity + numberOfSegments: 18 + - type: Speech + speechSounds: Alto + - type: Vocal + - type: Emoting + - type: Grammar + attributes: + proper: true + - type: StandingState + - type: Fingerprint + - type: Perishable + - type: Bloodstream + bloodMaxVolume: 60000 + bloodlossDamage: + types: + Bloodloss: 1 + bloodlossHealDamage: + types: + Bloodloss: -1 + - type: PortalExempt + +- type: entity + save: false + name: Lamia Dummy + parent: MobHumanDummy + id: MobLamiaDummy + description: A dummy lamia meant to be used in character setup. + components: + - type: Sprite + netsync: false + noRot: true + drawdepth: Mobs + scale: 1, 1 + layers: + - map: [ "enum.HumanoidVisualLayers.Chest" ] + color: "#e8b59b" + sprite: Nyanotrasen/Mobs/Species/lamia.rsi + state: torso_m + - map: [ "enum.HumanoidVisualLayers.Head" ] + color: "#e8b59b" + sprite: Mobs/Species/Human/parts.rsi + state: head_m + - map: [ "enum.HumanoidVisualLayers.Eyes" ] + color: "#008800" + sprite: Mobs/Customization/eyes.rsi + state: eyes + - map: [ "enum.HumanoidVisualLayers.RArm" ] + color: "#e8b59b" + sprite: Mobs/Species/Human/parts.rsi + state: r_arm + - map: [ "enum.HumanoidVisualLayers.LArm" ] + color: "#e8b59b" + sprite: Mobs/Species/Human/parts.rsi + state: l_arm + - map: [ "jumpsuit" ] + shader: StencilDraw + - map: [ "enum.HumanoidVisualLayers.LHand" ] + color: "#e8b59b" + sprite: Mobs/Species/Human/parts.rsi + state: l_hand + - map: [ "enum.HumanoidVisualLayers.RHand" ] + color: "#e8b59b" + sprite: Mobs/Species/Human/parts.rsi + state: r_hand + - map: [ "enum.HumanoidVisualLayers.Handcuffs" ] + color: "#ffffff" + sprite: Objects/Misc/handcuffs.rsi + state: body-overlay-2 + visible: false + - map: [ "id" ] + - map: [ "gloves" ] + - map: [ "ears" ] + - map: [ "outerClothing" ] + - map: [ "eyes" ] + - map: [ "belt" ] + - map: [ "neck" ] + - map: [ "back" ] + - map: [ "enum.HumanoidVisualLayers.Hair" ] + state: bald + sprite: Mobs/Customization/human_hair.rsi + - map: [ "mask" ] + - map: [ "head" ] + - map: [ "pocket1" ] + - map: [ "pocket2" ] + - map: [ "enum.HumanoidVisualLayers.HeadTop" ] + - map: [ "enum.HumanoidVisualLayers.Tail" ] + - type: Inventory + templateId: lamia diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Species/lamia.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Species/lamia.yml new file mode 100644 index 0000000000..0383143c26 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Species/lamia.yml @@ -0,0 +1,61 @@ +# Delta-V - This file is licensed under AGPLv3 +# Copyright (c) 2024 Delta-V Contributors +# See AGPLv3.txt for details. + +- type: entity + id: LamiaInitialSegment + save: false + noSpawn: true + components: + - type: Damageable + - type: StandingState + - type: Appearance + - type: Clickable + - type: InteractionOutline + - type: PsionicInsulation #Not a brain, target the lamia instead + - type: Physics + bodyType: KinematicController + - type: Fixtures + fixtures: # TODO: This needs a second fixture just for mob collisions. + fix1: + shape: + !type:PhysShapeCircle + radius: 0.25 + density: 80 + restitution: 0.0 + mask: + - MobMask + layer: + - MobLayer + - type: Transform + anchored: false + - type: SegmentedEntitySegmentVisuals + - type: Tag + tags: + - HideContextMenu + - type: RequireProjectileTarget + active: True + +- type: entity + id: LamiaSegment + save: false + parent: LamiaInitialSegment + name: lamia segment + noSpawn: true + description: A tail segment, hopefully attached to a lamia. + components: + - type: Sprite + sprite: Nyanotrasen/Mobs/Species/lamia.rsi + drawdepth: SmallMobs + layers: + - map: [ "enum.HumanoidVisualLayers.Tail" ] + - map: [ "enum.SegmentedEntitySegmentVisualLayers.Armor" ] + sprite: Clothing/OuterClothing/Hardsuits/basic.rsi + state: segment + visible: false + - type: Clickable + - type: Tag + tags: + - DoorBumpOpener + - type: HumanoidAppearance + species: LamiaSegment diff --git a/Resources/Prototypes/DeltaV/InventoryTemplates/lamia_inventory_template.yml b/Resources/Prototypes/DeltaV/InventoryTemplates/lamia_inventory_template.yml new file mode 100644 index 0000000000..546d0746b7 --- /dev/null +++ b/Resources/Prototypes/DeltaV/InventoryTemplates/lamia_inventory_template.yml @@ -0,0 +1,112 @@ +- type: inventoryTemplate + id: lamia + slots: + - name: jumpsuit + slotTexture: uniform + slotFlags: INNERCLOTHING + stripTime: 6 + uiWindowPos: 0,2 + strippingWindowPos: 0,2 + displayName: Jumpsuit + whitelist: + tags: + - Skirt + - name: outerClothing + slotTexture: suit + slotFlags: OUTERCLOTHING + slotGroup: MainHotbar + stripTime: 6 + uiWindowPos: 1,2 + strippingWindowPos: 1,2 + displayName: Suit + - name: gloves + slotTexture: gloves + slotFlags: GLOVES + uiWindowPos: 2,2 + strippingWindowPos: 2,2 + displayName: Gloves + - name: neck + slotTexture: neck + slotFlags: NECK + uiWindowPos: 0,1 + strippingWindowPos: 0,1 + displayName: Neck + - name: mask + slotTexture: mask + slotFlags: MASK + uiWindowPos: 1,1 + strippingWindowPos: 1,1 + displayName: Mask + - name: eyes + slotTexture: glasses + slotFlags: EYES + stripTime: 3 + uiWindowPos: 0,0 + strippingWindowPos: 0,0 + displayName: Eyes + - name: ears + slotTexture: ears + slotFlags: EARS + stripTime: 3 + uiWindowPos: 2,0 + strippingWindowPos: 2,0 + displayName: Ears + - name: head + slotTexture: head + slotFlags: HEAD + uiWindowPos: 1,0 + strippingWindowPos: 1,0 + displayName: Head + - name: pocket1 + slotTexture: pocket + slotFlags: POCKET + slotGroup: MainHotbar + stripTime: 3 + uiWindowPos: 0,3 + strippingWindowPos: 0,4 + dependsOn: jumpsuit + displayName: Pocket 1 + stripHidden: true + - name: pocket2 + slotTexture: pocket + slotFlags: POCKET + slotGroup: MainHotbar + stripTime: 3 + uiWindowPos: 2,3 + strippingWindowPos: 1,4 + dependsOn: jumpsuit + displayName: Pocket 2 + stripHidden: true + - name: suitstorage + slotTexture: suit_storage + slotFlags: SUITSTORAGE + stripTime: 3 + uiWindowPos: 2,0 + strippingWindowPos: 2,5 + dependsOn: outerClothing + displayName: Suit Storage + - name: id + slotTexture: id + slotFlags: IDCARD + slotGroup: SecondHotbar + stripTime: 6 + uiWindowPos: 2,1 + strippingWindowPos: 2,4 + dependsOn: jumpsuit + displayName: ID + - name: belt + slotTexture: belt + slotFlags: BELT + slotGroup: SecondHotbar + stripTime: 6 + uiWindowPos: 3,1 + strippingWindowPos: 1,5 + displayName: Belt + - name: back + slotTexture: back + slotFlags: BACK + slotGroup: SecondHotbar + stripTime: 6 + uiWindowPos: 3,0 + strippingWindowPos: 0,5 + displayName: Back diff --git a/Resources/Prototypes/DeltaV/Species/lamia.yml b/Resources/Prototypes/DeltaV/Species/lamia.yml new file mode 100644 index 0000000000..a6cfbf90fe --- /dev/null +++ b/Resources/Prototypes/DeltaV/Species/lamia.yml @@ -0,0 +1,68 @@ +# Delta-V - This file is licensed under AGPLv3 +# Copyright (c) 2024 Delta-V Contributors +# See AGPLv3.txt for details. + +- type: species + id: Lamia + name: Lamia + roundStart: true + prototype: MobLamia + dollPrototype: MobLamiaDummy + sprites: MobLamiaSprites + markingLimits: MobLamiaMarkingLimits + skinColoration: HumanToned + maleFirstNames: names_cyno_male + femaleFirstNames: names_cyno_female + lastNames: names_cyno_last + sexes: + - Female + +- type: species + id: LamiaSegment + name: LamiaSegment + roundStart: false + prototype: LamiaSegment + dollPrototype: MobLamiaDummy + sprites: MobLamiaSegmentSprites + markingLimits: MobLamiaSegmentMarkingLimits + skinColoration: HumanToned + sexes: + - Female + + +- type: markingPoints + id: MobLamiaMarkingLimits + points: + Hair: + points: 1 + required: false + Tail: + points: 1 + required: true + defaultMarkings: [ LamiaBottom ] + +- type: markingPoints + id: MobLamiaSegmentMarkingLimits + points: + Tail: + points: 1 + required: false + + +- type: speciesBaseSprites + id: MobLamiaSprites + sprites: + Head: MobHumanHead + Hair: MobHumanoidAnyMarking + Chest: MobHumanTorso + Eyes: MobHumanoidEyes + LArm: MobHumanLArm + RArm: MobHumanRArm + LHand: MobHumanLHand + RHand: MobHumanRHand + Tail: MobHumanoidAnyMarking + +- type: speciesBaseSprites + id: MobLamiaSegmentSprites + sprites: + Tail: MobHumanoidAnyMarking diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml index 36327fe1f7..5e6f600df1 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml @@ -139,6 +139,7 @@ - WhitelistChameleon - HidesHarpyWings #DeltaV: Used by harpies to help render their hardsuit sprites - FullBodyOuter + - AllowLamiaHardsuit - type: Clothing equipDelay: 2.5 # Hardsuits are heavy and take a while to put on/off. unequipDelay: 2.5 diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml index b81b3d1e7f..6d59bd2214 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml @@ -14,6 +14,7 @@ - SuitEVA - MonkeyWearable - WhitelistChameleon + - AllowLamiaHardsuit - HidesHarpyWings #Syndicate EVA @@ -32,6 +33,7 @@ - SuitEVA - MonkeyWearable - WhitelistChameleon + - AllowLamiaHardsuit - HidesHarpyWings #Emergency EVA @@ -74,6 +76,7 @@ - SuitEVA - MonkeyWearable - WhitelistChameleon + - AllowLamiaHardsuit - HidesHarpyWings #NTSRA Voidsuit / Ancient Voidsuit diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml index 9f0a01cc48..57ca67e55d 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml @@ -39,17 +39,6 @@ sprite: Clothing/OuterClothing/Suits/janitor_bombsuit.rsi - type: Clothing sprite: Clothing/OuterClothing/Suits/janitor_bombsuit.rsi - - type: ClothingSpeedModifier - walkModifier: 0.8 - sprintModifier: 0.8 - - type: ExplosionResistance - damageCoefficient: 0.15 - - type: GroupExamine - - type: Tag - tags: - - Hardsuit - - WhitelistChameleon - - FullBodyOuter - type: entity parent: ClothingOuterBaseLarge diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml b/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml index 0921dfd716..d209ff806c 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml @@ -305,6 +305,7 @@ amplification: 1 psychicFeedback: - "reagent-slime-feedback" + - type: CanWalk - type: entity name: Reagent Slime Spawner diff --git a/Resources/Prototypes/Entities/Mobs/Species/arachne.yml b/Resources/Prototypes/Entities/Mobs/Species/arachne.yml index 991668e444..2f6437dc14 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/arachne.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/arachne.yml @@ -97,9 +97,6 @@ - type: Body prototype: Arachne requiredLegs: 8 - - type: Damageable - damageContainer: HalfSpirit - damageModifierSet: HalfSpirit - type: Speech speechSounds: Alto - type: Inventory diff --git a/Resources/Prototypes/Entities/Objects/Devices/station_beacon.yml b/Resources/Prototypes/Entities/Objects/Devices/station_beacon.yml index cf422b4222..4b9f60ac7d 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/station_beacon.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/station_beacon.yml @@ -297,7 +297,7 @@ suffix: Science components: - type: NavMapBeacon - defaultText: station-beacon-epistemics + defaultText: station-beacon-epistemics #Delta V - Renamed color: "#D381C9" - type: entity @@ -322,7 +322,7 @@ suffix: RD's Room components: - type: NavMapBeacon - defaultText: station-beacon-mystagogue + defaultText: station-beacon-mystagogue #Delta V - Renamed - type: entity parent: DefaultStationBeaconScience diff --git a/Resources/Prototypes/Entities/Structures/Piping/Disposal/units.yml b/Resources/Prototypes/Entities/Structures/Piping/Disposal/units.yml index 75ec98c402..6d88a1015b 100644 --- a/Resources/Prototypes/Entities/Structures/Piping/Disposal/units.yml +++ b/Resources/Prototypes/Entities/Structures/Piping/Disposal/units.yml @@ -77,6 +77,9 @@ graph: DisposalMachine node: disposal_unit - type: DisposalUnit + blacklist: + components: + - SegmentedEntity - type: UserInterface interfaces: - key: enum.DisposalUnitUiKey.Key diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Books/hyperlinks.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Books/hyperlinks.yml deleted file mode 100644 index 03426729d9..0000000000 --- a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Books/hyperlinks.yml +++ /dev/null @@ -1,204 +0,0 @@ -- type: entity - parent: BaseItem - id: BaseHyperlinkBook - abstract: true - components: - - type: Sprite - sprite: Objects/Misc/books.rsi - - type: Tag - tags: - - Book - - type: EmitSoundOnPickup - sound: /Audio/SimpleStation14/Items/Handling/book_pickup.ogg - - type: EmitSoundOnDrop - sound: /Audio/SimpleStation14/Items/Handling/book_drop.ogg - - type: EmitSoundOnLand - sound: /Audio/SimpleStation14/Items/Handling/book_drop.ogg - -- type: entity - parent: BaseHyperlinkBook - id: HyperlinkBookSpaceLaw - name: space law - description: A big book of laws for space courts. - components: - - type: Sprite - layers: - - state: book_space_law -# - type: HyperlinkBook -# url: https://wiki.nyanotrasen.moe/view/Space_Law - -- type: entity - parent: BaseHyperlinkBook - id: HyperlinkBookSupernanny - name: book of unsanctioned space punishments - description: The ravings of a madman. - components: - - type: Sprite - layers: - - state: book_space_law -# - type: HyperlinkBook -# url: https://supernannyfanon.fandom.com/wiki/Category:Discipline_Techniques - -#- type: entity -# parent: BaseHyperlinkBook -# id: HyperlinkBookGlimmer -# suffix: GuidebookBook -# name: A Layman's Guide to the Mind -# description: A guide on psionics. -# components: -# - type: Sprite -# sprite: SimpleStation14/Objects/Misc/books.rsi -# layers: -# - state: book_psionics -# - type: HyperlinkBook -# url: https://wiki.nyanotrasen.moe/view/Glimmer -# - type: GuidebookBook -# guides: -# - Psionics -# - AltarsGolemancy - -- type: entity - parent: BaseHyperlinkBook - id: HyperlinkBookChemistry - name: chemical recipe book - description: A list of chemical recipes. - components: - - type: Sprite - layers: - - state: book_chemistry -# - type: HyperlinkBook -# url: https://wiki.nyanotrasen.moe/view/Chemistry - -- type: entity - parent: BaseHyperlinkBook - id: HyperlinkBookBartending - name: bartender's guide - description: A list of drink recipes. - components: - - type: Sprite - layers: - - state: book_bar -# - type: HyperlinkBook -# url: https://wiki.nyanotrasen.moe/view/Drinks - -- type: entity - parent: BaseHyperlinkBook - id: HyperlinkBookCooking - name: cookbook - description: A list of food recipes. - components: - - type: Sprite - layers: - - state: book_cooking -# - type: HyperlinkBook -# url: https://wiki.nyanotrasen.moe/view/Cooking - -- type: entity - parent: BaseHyperlinkBook - id: HyperlinkBookBotany - name: botanical field guide - description: A guide to plants. - components: - - type: Sprite - layers: - - state: book_hydroponics_pod_people -# - type: HyperlinkBook -# url: https://wiki.nyanotrasen.moe/view/Hydroponics - -- type: entity - parent: BaseHyperlinkBook - id: HyperlinkBookShuttle - name: guide to shuttle construction - description: A guide to building shuttles. - components: - - type: Sprite - layers: - - state: book_engineering -# - type: HyperlinkBook -# url: https://wiki.nyanotrasen.moe/view/Shuttle_Construction - -- type: entity - parent: BaseHyperlinkBook - id: HyperlinkBookAlerts - suffix: GuidebookBook - name: What to do When Things are Blowing Up - description: Procedure for when and why each alert should be put in effect, and what to do. - components: - - type: Sprite - layers: - - state: book_nuclear - # - type: HyperlinkBook - # url: https://wiki.nyanotrasen.moe/view/Alert_Procedure -# - type: GuidebookBook -# guides: -# - CommonAlerts -# - SpecificAlerts -# - CentCommAlerts - -- type: entity - parent: BaseHyperlinkBook - id: HyperlinkBookProcedure - suffix: GuidebookBook - name: standard operating procedure - description: A guide to normal station function. - components: - - type: Sprite - layers: - - state: book_particle_accelerator - # - type: HyperlinkBook - # url: https://wiki.nyanotrasen.moe/view/Standard_Operating_Procedure -# - type: GuidebookBook -# guides: -# - StandardOperatingProcedure - -- type: entity - parent: BaseHyperlinkBook - id: HyperlinkBookPower - name: guide to power - description: A guide to powering the station. - components: - - type: Sprite - layers: - - state: book_engineering2 -# - type: HyperlinkBook -# url: https://wiki.nyanotrasen.moe/view/Power - -- type: entity - parent: BaseHyperlinkBook - id: HyperlinkBookMedical - name: guide to medical - description: A guide to the medical department. - components: - - type: Sprite - layers: - - state: book_infections -# - type: HyperlinkBook -# url: https://wiki.nyanotrasen.moe/view/Medical - -- type: entity - parent: BaseHyperlinkBook - id: HyperlinkBookHacking - name: guide to hacking - description: For emergency use only. - components: - - type: Sprite - layers: - - state: book_hacking -# - type: HyperlinkBook -# url: https://wiki.nyanotrasen.moe/view/Hacking - -- type: entity - parent: BaseHyperlinkBook - id: HyperlinkBookAtmos - suffix: GuidebookBook - name: How to Make Gas Hot - description: A guide on Atmospherics. Make sure to grab the thrilling sequal; What to do When Gas Hot. - components: - - type: Sprite - layers: - - state: book_engineering2 - # - type: HyperlinkBook - # url: https://wiki.nyanotrasen.moe/view/Atmospheric_Science -# - type: GuidebookBook -# guides: -# - Atmospherics diff --git a/Resources/Prototypes/_ds14/Entities/Clothing/Shoes/misc.yml b/Resources/Prototypes/_ds14/Entities/Clothing/Shoes/misc.yml new file mode 100644 index 0000000000..68caee46e9 --- /dev/null +++ b/Resources/Prototypes/_ds14/Entities/Clothing/Shoes/misc.yml @@ -0,0 +1,10 @@ +- type: entity + parent: ClothingShoesBase + id: DS14ClothingShoesSneakers + name: sneakers + description: A pair of sporty sneakers with the name "Bobby" written in the tongue. + components: + - type: Sprite + sprite: _ds14/Clothing/Shoes/sneakers.rsi + - type: Clothing + sprite: _ds14/Clothing/Shoes/sneakers.rsi \ No newline at end of file diff --git a/Resources/Prototypes/_ds14/Loadouts/categories.yml b/Resources/Prototypes/_ds14/Loadouts/categories.yml new file mode 100644 index 0000000000..08719cd875 --- /dev/null +++ b/Resources/Prototypes/_ds14/Loadouts/categories.yml @@ -0,0 +1,2 @@ +- type: loadoutCategory + id: PersonalDefense \ No newline at end of file diff --git a/Resources/Prototypes/_ds14/Loadouts/personaldefense.yml b/Resources/Prototypes/_ds14/Loadouts/personaldefense.yml new file mode 100644 index 0000000000..1adc692ff8 --- /dev/null +++ b/Resources/Prototypes/_ds14/Loadouts/personaldefense.yml @@ -0,0 +1,15 @@ +- type: loadout + id: LoadoutItemMk58 + category: PersonalDefense + cost: 8 + items: + - WeaponPistolMk58 + - MagazinePistol # Gun comes with a mag loaded. + +- type: loadout + id: LoadoutItemMk58NonLethal + category: PersonalDefense + cost: 6 + items: + - WeaponPistolMk58Nonlethal + - MagazinePistolRubber # Gun comes with a mag loaded. diff --git a/Resources/Prototypes/_ds14/Loadouts/shoes.yml b/Resources/Prototypes/_ds14/Loadouts/shoes.yml new file mode 100644 index 0000000000..f01a73f4f1 --- /dev/null +++ b/Resources/Prototypes/_ds14/Loadouts/shoes.yml @@ -0,0 +1,7 @@ +# Patron Items +- type: loadout + id: LoadoutShoesDS14Sneakers + category: Shoes + cost: 1 + items: + - DS14ClothingShoesSneakers \ No newline at end of file diff --git a/Resources/Prototypes/game_presets.yml b/Resources/Prototypes/game_presets.yml index 7e83f22443..dadfc3134c 100644 --- a/Resources/Prototypes/game_presets.yml +++ b/Resources/Prototypes/game_presets.yml @@ -13,7 +13,7 @@ id: SurvivalHellshift alias: - hellshift - showInVote: true + showInVote: false name: hellshift-title description: hellshift-description rules: diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml index 786f641ddd..5903adb595 100644 --- a/Resources/Prototypes/tags.yml +++ b/Resources/Prototypes/tags.yml @@ -10,6 +10,9 @@ - type: Tag id: AirSensor +- type: Tag + id: AllowLamiaHardsuit + - type: Tag id: Ambrosia 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 4fbd43a08b..a3e0090b8f 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi/meta.json @@ -19,8 +19,11 @@ "directions": 4 }, { - "name": "inhand-right", - "directions": 4 + "name": "inhand-right", + "directions": 4 + }, + { + "name": "segment" } ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi/segment.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi/segment.png new file mode 100644 index 0000000000..c97ab674f2 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi/segment.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi/equipped-OUTERCLOTHING-lamia.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi/equipped-OUTERCLOTHING-lamia.png new file mode 100644 index 0000000000..a61d875e72 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi/equipped-OUTERCLOTHING-lamia.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 4fbd43a08b..003d052f95 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi/meta.json @@ -1,26 +1,33 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from paradisestation at commit https://github.com/ParadiseSS13/Paradise/commit/12c21ced8432015485484b17e311dcceb7c458f6", - "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. , lamia & segment by @noctyrnal", + "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": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-lamia", + "directions": 4 + }, + { + "name": "segment" + } + ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi/segment.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi/segment.png new file mode 100644 index 0000000000..c97ab674f2 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi/segment.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 4fbd43a08b..a3e0090b8f 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi/meta.json @@ -19,8 +19,11 @@ "directions": 4 }, { - "name": "inhand-right", - "directions": 4 + "name": "inhand-right", + "directions": 4 + }, + { + "name": "segment" } ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi/segment.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi/segment.png new file mode 100644 index 0000000000..c97ab674f2 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi/segment.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 4fbd43a08b..a3e0090b8f 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi/meta.json @@ -19,8 +19,11 @@ "directions": 4 }, { - "name": "inhand-right", - "directions": 4 + "name": "inhand-right", + "directions": 4 + }, + { + "name": "segment" } ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi/segment.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi/segment.png new file mode 100644 index 0000000000..c97ab674f2 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi/segment.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 4fbd43a08b..a3e0090b8f 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi/meta.json @@ -19,8 +19,11 @@ "directions": 4 }, { - "name": "inhand-right", - "directions": 4 + "name": "inhand-right", + "directions": 4 + }, + { + "name": "segment" } ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi/segment.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi/segment.png new file mode 100644 index 0000000000..c97ab674f2 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi/segment.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/atmospherics.rsi/equipped-OUTERCLOTHING-lamia.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/atmospherics.rsi/equipped-OUTERCLOTHING-lamia.png new file mode 100644 index 0000000000..f9c943fe7b Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/atmospherics.rsi/equipped-OUTERCLOTHING-lamia.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 ef5e62cca4..0c75fe63b5 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", - "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, lamia & segment by @noctyrnal", + "size": { + "x": 32, + "y": 32 + }, "states": [ { "name": "icon" @@ -25,6 +25,13 @@ { "name": "equipped-OUTERCLOTHING-harpy", "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-lamia", + "directions": 4 + }, + { + "name": "segment" } ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/atmospherics.rsi/segment.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/atmospherics.rsi/segment.png new file mode 100644 index 0000000000..056ce54c6b Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/atmospherics.rsi/segment.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/basic.rsi/equipped-OUTERCLOTHING-lamia.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/basic.rsi/equipped-OUTERCLOTHING-lamia.png new file mode 100644 index 0000000000..cbe28cd477 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/basic.rsi/equipped-OUTERCLOTHING-lamia.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 3067907ba9..1fd6139e1d 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/basic.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/basic.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/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", + "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, lamia & segment by @noctyrnal", "size": { "x": 32, "y": 32 @@ -22,6 +22,13 @@ "name": "equipped-OUTERCLOTHING-harpy", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-lamia", + "directions": 4 + }, + { + "name": "segment" + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/basic.rsi/segment.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/basic.rsi/segment.png new file mode 100644 index 0000000000..91747f2ee6 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/basic.rsi/segment.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 6cfe1ea214..6f234fe219 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmedic.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmedic.rsi/meta.json @@ -23,8 +23,11 @@ "directions": 4 }, { - "name": "inhand-right", - "directions": 4 + "name": "inhand-right", + "directions": 4 + }, + { + "name": "segment" } ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmedic.rsi/segment.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmedic.rsi/segment.png new file mode 100644 index 0000000000..c97ab674f2 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmedic.rsi/segment.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/equipped-OUTERCLOTHING-lamia.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/equipped-OUTERCLOTHING-lamia.png new file mode 100644 index 0000000000..9e1327db34 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/equipped-OUTERCLOTHING-lamia.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 7f50fdcf08..56b23c00af 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", - "size": { - "x": 32, - "y": 32 - }, + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by Emisse for SS14, lamia & segment by @noctyrnal", + "size": { + "x": 32, + "y": 32 + }, "states": [ { "name": "icon" @@ -25,6 +25,13 @@ { "name": "equipped-OUTERCLOTHING-harpy", "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-lamia", + "directions": 4 + }, + { + "name": "segment" } ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/segment.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/segment.png new file mode 100644 index 0000000000..f2a4dbb382 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/segment.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/cburn.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cburn.rsi/meta.json index 2de954bbf9..069e34790f 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/cburn.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cburn.rsi/meta.json @@ -23,8 +23,11 @@ "directions": 4 }, { - "name": "inhand-right", - "directions": 4 + "name": "inhand-right", + "directions": 4 + }, + { + "name": "segment" } ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/cburn.rsi/segment.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cburn.rsi/segment.png new file mode 100644 index 0000000000..c97ab674f2 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cburn.rsi/segment.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 090140fa8c..9dbfe56681 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/clown.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/clown.rsi/meta.json @@ -25,6 +25,9 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "segment" } ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/clown.rsi/segment.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/clown.rsi/segment.png new file mode 100644 index 0000000000..c97ab674f2 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/clown.rsi/segment.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/equipped-OUTERCLOTHING-lamia.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/equipped-OUTERCLOTHING-lamia.png new file mode 100644 index 0000000000..5da5227444 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/equipped-OUTERCLOTHING-lamia.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 1cfa2a9cfe..d8bc5451cb 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", - "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, lamia & segment by @noctyrnal", + "size": { + "x": 32, + "y": 32 + }, "states": [ { "name": "icon" @@ -25,6 +25,13 @@ { "name": "equipped-OUTERCLOTHING-harpy", "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-lamia", + "directions": 4 + }, + { + "name": "segment" } ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/segment.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/segment.png new file mode 100644 index 0000000000..7bdd563935 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/segment.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 f6910b12aa..acc4195b3f 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/meta.json @@ -23,8 +23,11 @@ "directions": 4 }, { - "name": "inhand-right", - "directions": 4 + "name": "inhand-right", + "directions": 4 + }, + { + "name": "segment" } ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/segment.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/segment.png new file mode 100644 index 0000000000..c97ab674f2 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/segment.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering-white.rsi/equipped-OUTERCLOTHING-lamia.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering-white.rsi/equipped-OUTERCLOTHING-lamia.png new file mode 100644 index 0000000000..cc30d8c7d2 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering-white.rsi/equipped-OUTERCLOTHING-lamia.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 ef5e62cca4..0c75fe63b5 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering-white.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering-white.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", - "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, lamia & segment by @noctyrnal", + "size": { + "x": 32, + "y": 32 + }, "states": [ { "name": "icon" @@ -25,6 +25,13 @@ { "name": "equipped-OUTERCLOTHING-harpy", "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-lamia", + "directions": 4 + }, + { + "name": "segment" } ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering-white.rsi/segment.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering-white.rsi/segment.png new file mode 100644 index 0000000000..2217a86857 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering-white.rsi/segment.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering.rsi/equipped-OUTERCLOTHING-lamia.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering.rsi/equipped-OUTERCLOTHING-lamia.png new file mode 100644 index 0000000000..27325e27ff Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering.rsi/equipped-OUTERCLOTHING-lamia.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 cbf3391af7..336a597d2f 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", - "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, lamia & segment by @noctyrnal", + "size": { + "x": 32, + "y": 32 + }, "states": [ { "name": "icon" @@ -25,6 +25,13 @@ { "name": "equipped-OUTERCLOTHING-harpy", "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-lamia", + "directions": 4 + }, + { + "name": "segment" } ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering.rsi/segment.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering.rsi/segment.png new file mode 100644 index 0000000000..371541123c Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering.rsi/segment.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 0249e35995..61121c1bff 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/lingspacesuit.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/lingspacesuit.rsi/meta.json @@ -19,8 +19,11 @@ "directions": 4 }, { - "name": "inhand-right", - "directions": 4 + "name": "inhand-right", + "directions": 4 + }, + { + "name": "segment" } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/lingspacesuit.rsi/segment.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/lingspacesuit.rsi/segment.png new file mode 100644 index 0000000000..c97ab674f2 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/lingspacesuit.rsi/segment.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi/equipped-OUTERCLOTHING-lamia.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi/equipped-OUTERCLOTHING-lamia.png new file mode 100644 index 0000000000..0272ceb588 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi/equipped-OUTERCLOTHING-lamia.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 0261a0564f..a220b308ac 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi/meta.json @@ -1,11 +1,11 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Texture edit from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", - "size": { - "x": 32, - "y": 32 - }, + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Texture edit from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, lamia & segment by @noctyrnal", + "size": { + "x": 32, + "y": 32 + }, "states": [ { "name": "icon" @@ -25,6 +25,13 @@ { "name": "equipped-OUTERCLOTHING-harpy", "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-lamia", + "directions": 4 + }, + { + "name": "segment" } ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi/segment.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi/segment.png new file mode 100644 index 0000000000..aacde8c723 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi/segment.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 3641da6f50..0a10fc9d33 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/maxim.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/maxim.rsi/meta.json @@ -19,8 +19,11 @@ "directions": 4 }, { - "name": "inhand-right", - "directions": 4 + "name": "inhand-right", + "directions": 4 + }, + { + "name": "segment" } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/maxim.rsi/segment.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/maxim.rsi/segment.png new file mode 100644 index 0000000000..c97ab674f2 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/maxim.rsi/segment.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/equipped-OUTERCLOTHING-lamia.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/equipped-OUTERCLOTHING-lamia.png new file mode 100644 index 0000000000..8773725383 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/equipped-OUTERCLOTHING-lamia.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 ef5e62cca4..0c75fe63b5 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.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", - "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, lamia & segment by @noctyrnal", + "size": { + "x": 32, + "y": 32 + }, "states": [ { "name": "icon" @@ -25,6 +25,13 @@ { "name": "equipped-OUTERCLOTHING-harpy", "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-lamia", + "directions": 4 + }, + { + "name": "segment" } ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/segment.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/segment.png new file mode 100644 index 0000000000..290153565e Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/segment.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 a5f992108c..20c4b3ebbe 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/mime.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/mime.rsi/meta.json @@ -21,6 +21,9 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "segment" } ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/mime.rsi/segment.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/mime.rsi/segment.png new file mode 100644 index 0000000000..c97ab674f2 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/mime.rsi/segment.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/equipped-OUTERCLOTHING-lamia.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/equipped-OUTERCLOTHING-lamia.png new file mode 100644 index 0000000000..ba1d3fbdc2 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/equipped-OUTERCLOTHING-lamia.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 64b98f1e79..aa1390a137 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/meta.json @@ -1,11 +1,11 @@ { - "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", - "size": { - "x": 32, - "y": 32 - }, + "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, lamia & segment by @noctyrnal", + "size": { + "x": 32, + "y": 32 + }, "states": [ { "name": "icon" @@ -25,6 +25,13 @@ { "name": "equipped-OUTERCLOTHING-harpy", "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-lamia", + "directions": 4 + }, + { + "name": "segment" } ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/segment.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/segment.png new file mode 100644 index 0000000000..b750e3ce22 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/segment.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 8840689d9e..8a58b1f623 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/piratecaptain.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/piratecaptain.rsi/meta.json @@ -21,6 +21,9 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "segment" } ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/piratecaptain.rsi/segment.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/piratecaptain.rsi/segment.png new file mode 100644 index 0000000000..c97ab674f2 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/piratecaptain.rsi/segment.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 8840689d9e..8a58b1f623 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/pirateeva.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/pirateeva.rsi/meta.json @@ -21,6 +21,9 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "segment" } ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/pirateeva.rsi/segment.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/pirateeva.rsi/segment.png new file mode 100644 index 0000000000..c97ab674f2 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/pirateeva.rsi/segment.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/equipped-OUTERCLOTHING-lamia.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/equipped-OUTERCLOTHING-lamia.png new file mode 100644 index 0000000000..b707f6bf11 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/equipped-OUTERCLOTHING-lamia.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 def2d42704..45b83db717 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/meta.json @@ -1,12 +1,12 @@ { - "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": [ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, lamia & segment by @noctyrnal, harpy by VMSolidus", + "size": { + "x": 32, + "y": 32 + }, + "states": [ { "name": "icon" }, @@ -18,6 +18,13 @@ "name": "equipped-OUTERCLOTHING-harpy", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-lamia", + "directions": 4 + }, + { + "name": "segment" + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/segment.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/segment.png new file mode 100644 index 0000000000..972865cd17 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/segment.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/salvage.rsi/equipped-OUTERCLOTHING-lamia.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/salvage.rsi/equipped-OUTERCLOTHING-lamia.png new file mode 100644 index 0000000000..b3ab296976 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/salvage.rsi/equipped-OUTERCLOTHING-lamia.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 ef5e62cca4..0c75fe63b5 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/salvage.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/salvage.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", - "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, lamia & segment by @noctyrnal", + "size": { + "x": 32, + "y": 32 + }, "states": [ { "name": "icon" @@ -25,6 +25,13 @@ { "name": "equipped-OUTERCLOTHING-harpy", "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-lamia", + "directions": 4 + }, + { + "name": "segment" } ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/salvage.rsi/segment.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/salvage.rsi/segment.png new file mode 100644 index 0000000000..5ad6fc8b35 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/salvage.rsi/segment.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 13748622fe..0892ec8c86 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/santahardsuit.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/santahardsuit.rsi/meta.json @@ -19,8 +19,11 @@ "directions": 4 }, { - "name": "inhand-right", - "directions": 4 + "name": "inhand-right", + "directions": 4 + }, + { + "name": "segment" } ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/santahardsuit.rsi/segment.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/santahardsuit.rsi/segment.png new file mode 100644 index 0000000000..c97ab674f2 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/santahardsuit.rsi/segment.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 e482264df5..5a4b4eb36f 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-red.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-red.rsi/meta.json @@ -19,8 +19,11 @@ "directions": 4 }, { - "name": "inhand-right", - "directions": 4 + "name": "inhand-right", + "directions": 4 + }, + { + "name": "segment" } ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-red.rsi/segment.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-red.rsi/segment.png new file mode 100644 index 0000000000..c97ab674f2 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-red.rsi/segment.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 54a0ed85fa..ef4edbed96 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-warden.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-warden.rsi/meta.json @@ -19,8 +19,11 @@ "directions": 4 }, { - "name": "inhand-right", - "directions": 4 + "name": "inhand-right", + "directions": 4 + }, + { + "name": "segment" } ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-warden.rsi/segment.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-warden.rsi/segment.png new file mode 100644 index 0000000000..c97ab674f2 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-warden.rsi/segment.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 32d6d8901a..c551bf917e 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security.rsi/meta.json @@ -19,8 +19,11 @@ "directions": 4 }, { - "name": "inhand-right", - "directions": 4 + "name": "inhand-right", + "directions": 4 + }, + { + "name": "segment" } ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security.rsi/segment.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security.rsi/segment.png new file mode 100644 index 0000000000..c97ab674f2 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security.rsi/segment.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/spatio.rsi/equipped-OUTERCLOTHING-lamia.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/spatio.rsi/equipped-OUTERCLOTHING-lamia.png new file mode 100644 index 0000000000..c7344388fb Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/spatio.rsi/equipped-OUTERCLOTHING-lamia.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 f6a942a895..a52fc0259e 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/spatio.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/spatio.rsi/meta.json @@ -1,13 +1,12 @@ - { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Original by Emisse, modified by EmoGarbage404", + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Original by Emisse, modified by EmoGarbage404, lamia & segment by @noctyrnal", - "size": { - "x": 32, - "y": 32 - }, + "size": { + "x": 32, + "y": 32 + }, "states": [ { "name": "icon" @@ -27,6 +26,13 @@ { "name": "equipped-OUTERCLOTHING-harpy", "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-lamia", + "directions": 4 + }, + { + "name": "segment" } ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/spatio.rsi/segment.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/spatio.rsi/segment.png new file mode 100644 index 0000000000..68fc755c56 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/spatio.rsi/segment.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/equipped-OUTERCLOTHING-lamia.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/equipped-OUTERCLOTHING-lamia.png new file mode 100644 index 0000000000..040ad09939 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/equipped-OUTERCLOTHING-lamia.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 b9b739337b..687d271438 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.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/fb2d71495bfe81446159ef528534193d09dd8d34, equipped-OUTERCLOTHING-monkey made by Dutch-VanDerLinde", - "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/fb2d71495bfe81446159ef528534193d09dd8d34, equipped-OUTERCLOTHING-monkey made by Dutch-VanDerLinde, lamia & segment by @noctyrnal", + "size": { + "x": 32, + "y": 32 + }, "states": [ { "name": "icon" @@ -23,12 +23,19 @@ "directions": 4 }, { - "name": "inhand-right", - "directions": 4 + "name": "inhand-right", + "directions": 4 }, { "name": "equipped-OUTERCLOTHING-harpy", "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-lamia", + "directions": 4 + }, + { + "name": "segment" } ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/segment.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/segment.png new file mode 100644 index 0000000000..1a9469334f Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/segment.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/equipped-OUTERCLOTHING-lamia.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/equipped-OUTERCLOTHING-lamia.png new file mode 100644 index 0000000000..ccf53e302b Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/equipped-OUTERCLOTHING-lamia.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 4aa4d60ccb..fc4030c881 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/meta.json @@ -1,11 +1,11 @@ { - "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 - }, + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from vg at commit https://github.com/vgstation-coders/vgstation13/commit/a16e41020a93479e9a7e2af343b1b74f7f2a61bd, lamia & segment by @noctyrnal", + "size": { + "x": 32, + "y": 32 + }, "states": [ { "name": "icon" @@ -25,6 +25,13 @@ { "name": "equipped-OUTERCLOTHING-harpy", "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-lamia", + "directions": 4 + }, + { + "name": "segment" } ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/segment.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/segment.png new file mode 100644 index 0000000000..1a9469334f Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/segment.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/equipped-OUTERCLOTHING-lamia.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/equipped-OUTERCLOTHING-lamia.png new file mode 100644 index 0000000000..bfbbece8c4 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/equipped-OUTERCLOTHING-lamia.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 b85c75656c..49b50df0a0 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", + "copyright": "Taken from vg at commit https://github.com/vgstation-coders/vgstation13/commit/a16e41020a93479e9a7e2af343b1b74f7f2a61bd, harpy by VMSolidus, lamia & segment by @noctyrnal", "size": { "x": 32, "y": 32 @@ -18,6 +18,13 @@ "name": "equipped-OUTERCLOTHING-harpy", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-lamia", + "directions": 4 + }, + { + "name": "segment" + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/segment.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/segment.png new file mode 100644 index 0000000000..713ca5714a Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/segment.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/equipped-OUTERCLOTHING-lamia.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/equipped-OUTERCLOTHING-lamia.png new file mode 100644 index 0000000000..b740adfdb2 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/equipped-OUTERCLOTHING-lamia.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 88d91565d7..5af55490ad 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", + "copyright": "Based on tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, modified by EmoGarbage404 (github), harpy by VMSolidus, lamia & segment by @noctyrnal", "size": { "x": 32, "y": 32 @@ -25,6 +25,13 @@ { "name": "equipped-OUTERCLOTHING-harpy", "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-lamia", + "directions": 4 + }, + { + "name": "segment" } ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/segment.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/segment.png new file mode 100644 index 0000000000..0687aa9d0d Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/segment.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 e482264df5..5a4b4eb36f 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/wizard.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/wizard.rsi/meta.json @@ -19,8 +19,11 @@ "directions": 4 }, { - "name": "inhand-right", - "directions": 4 + "name": "inhand-right", + "directions": 4 + }, + { + "name": "segment" } ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/wizard.rsi/segment.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/wizard.rsi/segment.png new file mode 100644 index 0000000000..c97ab674f2 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/wizard.rsi/segment.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 3a71879aff..0811530b9e 100644 --- a/Resources/Textures/Clothing/OuterClothing/Suits/ancient_voidsuit.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Suits/ancient_voidsuit.rsi/meta.json @@ -45,8 +45,11 @@ "directions": 4 }, { - "name": "inhand-right", - "directions": 4 + "name": "inhand-right", + "directions": 4 + }, + { + "name": "segment" } ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/ancient_voidsuit.rsi/segment.png b/Resources/Textures/Clothing/OuterClothing/Suits/ancient_voidsuit.rsi/segment.png new file mode 100644 index 0000000000..c97ab674f2 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Suits/ancient_voidsuit.rsi/segment.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/atmos_firesuit.rsi/equipped-OUTERCLOTHING-lamia.png b/Resources/Textures/Clothing/OuterClothing/Suits/atmos_firesuit.rsi/equipped-OUTERCLOTHING-lamia.png new file mode 100644 index 0000000000..72f2f4b76b Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Suits/atmos_firesuit.rsi/equipped-OUTERCLOTHING-lamia.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 b05021b6c0..91bc83206a 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, lamia & segment by @noctyrnal", "size": { "x": 32, "y": 32 @@ -18,6 +18,13 @@ "name": "equipped-OUTERCLOTHING-harpy", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-lamia", + "directions": 4 + }, + { + "name": "segment" + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/atmos_firesuit.rsi/segment.png b/Resources/Textures/Clothing/OuterClothing/Suits/atmos_firesuit.rsi/segment.png new file mode 100644 index 0000000000..3a2b136ebd Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Suits/atmos_firesuit.rsi/segment.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/bombsuit.rsi/equipped-OUTERCLOTHING-lamia.png b/Resources/Textures/Clothing/OuterClothing/Suits/bombsuit.rsi/equipped-OUTERCLOTHING-lamia.png new file mode 100644 index 0000000000..a5d1135dee Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Suits/bombsuit.rsi/equipped-OUTERCLOTHING-lamia.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 e9a9a4453d..906a91a7ec 100644 --- a/Resources/Textures/Clothing/OuterClothing/Suits/bombsuit.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Suits/bombsuit.rsi/meta.json @@ -1,12 +1,12 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/760f0be7af33a31f5a08a3291864e91539d0ebb7", - "size": { - "x": 32, - "y": 32 - }, - "states": [ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/760f0be7af33a31f5a08a3291864e91539d0ebb7. lamia & segment by @noctyrnal, harpy by VMSolidus", + "size": { + "x": 32, + "y": 32 + }, + "states": [ { "name": "icon" }, @@ -18,6 +18,13 @@ "name": "equipped-OUTERCLOTHING-harpy", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-lamia", + "directions": 4 + }, + { + "name": "segment" + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/bombsuit.rsi/segment.png b/Resources/Textures/Clothing/OuterClothing/Suits/bombsuit.rsi/segment.png new file mode 100644 index 0000000000..bc07da7e78 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Suits/bombsuit.rsi/segment.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/eva.rsi/equipped-OUTERCLOTHING-lamia.png b/Resources/Textures/Clothing/OuterClothing/Suits/eva.rsi/equipped-OUTERCLOTHING-lamia.png new file mode 100644 index 0000000000..b0e720f3be Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Suits/eva.rsi/equipped-OUTERCLOTHING-lamia.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 4dcd7b13b5..452661e50f 100644 --- a/Resources/Textures/Clothing/OuterClothing/Suits/eva.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Suits/eva.rsi/meta.json @@ -1,7 +1,7 @@ { "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", + "copyright": "Sprites by Flareguy & cboyjet, heavily edited from space suit sprites found in https://github.com/tgstation/tgstation/commit/fb2d71495bfe81446159ef528534193d09dd8d34, harpy edit by VMSolidus, lamia & segment by @noctyrnal", "size": { "x": 32, "y": 32 @@ -22,6 +22,13 @@ "name": "equipped-OUTERCLOTHING-harpy", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-lamia", + "directions": 4 + }, + { + "name": "segment" + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/eva.rsi/segment.png b/Resources/Textures/Clothing/OuterClothing/Suits/eva.rsi/segment.png new file mode 100644 index 0000000000..5a21938eca Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Suits/eva.rsi/segment.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/eva_emergency.rsi/equipped-OUTERCLOTHING-lamia.png b/Resources/Textures/Clothing/OuterClothing/Suits/eva_emergency.rsi/equipped-OUTERCLOTHING-lamia.png new file mode 100644 index 0000000000..c606944fb0 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Suits/eva_emergency.rsi/equipped-OUTERCLOTHING-lamia.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 8d09b75006..804e569e06 100644 --- a/Resources/Textures/Clothing/OuterClothing/Suits/eva_emergency.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Suits/eva_emergency.rsi/meta.json @@ -1,7 +1,7 @@ { "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", + "copyright": "Sprites by Flareguy & cboyjet, heavily edited from space suit sprites found in https://github.com/tgstation/tgstation/commit/fb2d71495bfe81446159ef528534193d09dd8d34, harpy edit by VMSolidus, lamia & segment by @noctyrnal", "size": { "x": 32, "y": 32 @@ -18,6 +18,13 @@ "name": "equipped-OUTERCLOTHING-harpy", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-lamia", + "directions": 4 + }, + { + "name": "segment" + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/eva_emergency.rsi/segment.png b/Resources/Textures/Clothing/OuterClothing/Suits/eva_emergency.rsi/segment.png new file mode 100644 index 0000000000..b2cf94d4cf Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Suits/eva_emergency.rsi/segment.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/eva_prisoner.rsi/equipped-OUTERCLOTHING-lamia.png b/Resources/Textures/Clothing/OuterClothing/Suits/eva_prisoner.rsi/equipped-OUTERCLOTHING-lamia.png new file mode 100644 index 0000000000..c5f1a4d41a Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Suits/eva_prisoner.rsi/equipped-OUTERCLOTHING-lamia.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 0482d08642..7de211ac05 100644 --- a/Resources/Textures/Clothing/OuterClothing/Suits/eva_prisoner.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Suits/eva_prisoner.rsi/meta.json @@ -1,7 +1,7 @@ { "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", + "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, lamia & segment by @noctyrnal", "size": { "x": 32, "y": 32 @@ -22,6 +22,13 @@ "name": "equipped-OUTERCLOTHING-harpy", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-lamia", + "directions": 4 + }, + { + "name": "segment" + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/eva_prisoner.rsi/segment.png b/Resources/Textures/Clothing/OuterClothing/Suits/eva_prisoner.rsi/segment.png new file mode 100644 index 0000000000..4ab04aee99 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Suits/eva_prisoner.rsi/segment.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/eva_syndicate.rsi/equipped-OUTERCLOTHING-lamia.png b/Resources/Textures/Clothing/OuterClothing/Suits/eva_syndicate.rsi/equipped-OUTERCLOTHING-lamia.png new file mode 100644 index 0000000000..5331e68d1c Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Suits/eva_syndicate.rsi/equipped-OUTERCLOTHING-lamia.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 0482d08642..7de211ac05 100644 --- a/Resources/Textures/Clothing/OuterClothing/Suits/eva_syndicate.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Suits/eva_syndicate.rsi/meta.json @@ -1,7 +1,7 @@ { "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", + "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, lamia & segment by @noctyrnal", "size": { "x": 32, "y": 32 @@ -22,6 +22,13 @@ "name": "equipped-OUTERCLOTHING-harpy", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-lamia", + "directions": 4 + }, + { + "name": "segment" + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/eva_syndicate.rsi/segment.png b/Resources/Textures/Clothing/OuterClothing/Suits/eva_syndicate.rsi/segment.png new file mode 100644 index 0000000000..1a6df55d05 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Suits/eva_syndicate.rsi/segment.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/fire.rsi/equipped-OUTERCLOTHING-lamia.png b/Resources/Textures/Clothing/OuterClothing/Suits/fire.rsi/equipped-OUTERCLOTHING-lamia.png new file mode 100644 index 0000000000..979a4eb20e Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Suits/fire.rsi/equipped-OUTERCLOTHING-lamia.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 0a8c670a89..facdb7748d 100644 --- a/Resources/Textures/Clothing/OuterClothing/Suits/fire.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Suits/fire.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, harpy edit by VMSolidus", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, harpy edit by VMSolidus, lamia & segment by @noctyrnal", "size": { "x": 32, "y": 32 @@ -18,6 +18,13 @@ "name": "equipped-OUTERCLOTHING-harpy", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-lamia", + "directions": 4 + }, + { + "name": "segment" + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/fire.rsi/segment.png b/Resources/Textures/Clothing/OuterClothing/Suits/fire.rsi/segment.png new file mode 100644 index 0000000000..3764a4fa05 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Suits/fire.rsi/segment.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/rad.rsi/equipped-OUTERCLOTHING-lamia.png b/Resources/Textures/Clothing/OuterClothing/Suits/rad.rsi/equipped-OUTERCLOTHING-lamia.png new file mode 100644 index 0000000000..c7a776d958 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Suits/rad.rsi/equipped-OUTERCLOTHING-lamia.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 0a8c670a89..facdb7748d 100644 --- a/Resources/Textures/Clothing/OuterClothing/Suits/rad.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Suits/rad.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, harpy edit by VMSolidus", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, harpy edit by VMSolidus, lamia & segment by @noctyrnal", "size": { "x": 32, "y": 32 @@ -18,6 +18,13 @@ "name": "equipped-OUTERCLOTHING-harpy", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-lamia", + "directions": 4 + }, + { + "name": "segment" + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/rad.rsi/segment.png b/Resources/Textures/Clothing/OuterClothing/Suits/rad.rsi/segment.png new file mode 100644 index 0000000000..53c50d2d56 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Suits/rad.rsi/segment.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/spaceninja.rsi/equipped-OUTERCLOTHING-lamia.png b/Resources/Textures/Clothing/OuterClothing/Suits/spaceninja.rsi/equipped-OUTERCLOTHING-lamia.png new file mode 100644 index 0000000000..3b500a5046 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Suits/spaceninja.rsi/equipped-OUTERCLOTHING-lamia.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 0174b889d2..d057b887bf 100644 --- a/Resources/Textures/Clothing/OuterClothing/Suits/spaceninja.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Suits/spaceninja.rsi/meta.json @@ -1,26 +1,33 @@ { - "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). lamia & segment by @noctyrnal", + "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": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-lamia", + "directions": 4 + }, + { + "name": "segment" + } + ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/spaceninja.rsi/segment.png b/Resources/Textures/Clothing/OuterClothing/Suits/spaceninja.rsi/segment.png new file mode 100644 index 0000000000..fbfe73d721 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Suits/spaceninja.rsi/segment.png differ diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/advanced.rsi/equipped-OUTERCLOTHING-lamia.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/advanced.rsi/equipped-OUTERCLOTHING-lamia.png new file mode 100644 index 0000000000..172cf756a4 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/advanced.rsi/equipped-OUTERCLOTHING-lamia.png differ diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/advanced.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/advanced.rsi/meta.json index 4844e816bd..cf10d74aed 100644 --- a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/advanced.rsi/meta.json +++ b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/advanced.rsi/meta.json @@ -1,11 +1,11 @@ { - "version": 1, - "license": "CC0-1.0", - "copyright": "Original work by TJohnson.", - "size": { - "x": 32, - "y": 32 - }, + "version": 1, + "license": "CC0-1.0", + "copyright": "Original work by TJohnson. lamia & segment by @noctyrnal", + "size": { + "x": 32, + "y": 32 + }, "states": [ { "name": "icon" @@ -18,6 +18,10 @@ "name": "equipped-OUTERCLOTHING-harpy", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-lamia", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 @@ -25,6 +29,9 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "segment" } ] } diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/advanced.rsi/segment.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/advanced.rsi/segment.png new file mode 100644 index 0000000000..c97ab674f2 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/advanced.rsi/segment.png differ diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/corpsman.rsi/equipped-OUTERCLOTHING-lamia.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/corpsman.rsi/equipped-OUTERCLOTHING-lamia.png new file mode 100644 index 0000000000..9788b33baf Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/corpsman.rsi/equipped-OUTERCLOTHING-lamia.png differ diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/corpsman.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/corpsman.rsi/meta.json index 4844e816bd..cf10d74aed 100644 --- a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/corpsman.rsi/meta.json +++ b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/corpsman.rsi/meta.json @@ -1,11 +1,11 @@ { - "version": 1, - "license": "CC0-1.0", - "copyright": "Original work by TJohnson.", - "size": { - "x": 32, - "y": 32 - }, + "version": 1, + "license": "CC0-1.0", + "copyright": "Original work by TJohnson. lamia & segment by @noctyrnal", + "size": { + "x": 32, + "y": 32 + }, "states": [ { "name": "icon" @@ -18,6 +18,10 @@ "name": "equipped-OUTERCLOTHING-harpy", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-lamia", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 @@ -25,6 +29,9 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "segment" } ] } diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/corpsman.rsi/segment.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/corpsman.rsi/segment.png new file mode 100644 index 0000000000..481ab8594d Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/corpsman.rsi/segment.png differ diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/hos.rsi/equipped-OUTERCLOTHING-lamia.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/hos.rsi/equipped-OUTERCLOTHING-lamia.png new file mode 100644 index 0000000000..7b79d271d5 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/hos.rsi/equipped-OUTERCLOTHING-lamia.png differ diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/hos.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/hos.rsi/meta.json index 4844e816bd..cf10d74aed 100644 --- a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/hos.rsi/meta.json +++ b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/hos.rsi/meta.json @@ -1,11 +1,11 @@ { - "version": 1, - "license": "CC0-1.0", - "copyright": "Original work by TJohnson.", - "size": { - "x": 32, - "y": 32 - }, + "version": 1, + "license": "CC0-1.0", + "copyright": "Original work by TJohnson. lamia & segment by @noctyrnal", + "size": { + "x": 32, + "y": 32 + }, "states": [ { "name": "icon" @@ -18,6 +18,10 @@ "name": "equipped-OUTERCLOTHING-harpy", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-lamia", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 @@ -25,6 +29,9 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "segment" } ] } diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/hos.rsi/segment.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/hos.rsi/segment.png new file mode 100644 index 0000000000..481ab8594d Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/hos.rsi/segment.png differ diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/medical.rsi/equipped-OUTERCLOTHING-lamia.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/medical.rsi/equipped-OUTERCLOTHING-lamia.png new file mode 100644 index 0000000000..5cef9a5282 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/medical.rsi/equipped-OUTERCLOTHING-lamia.png differ diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/medical.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/medical.rsi/meta.json index 4844e816bd..cf10d74aed 100644 --- a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/medical.rsi/meta.json +++ b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/medical.rsi/meta.json @@ -1,11 +1,11 @@ { - "version": 1, - "license": "CC0-1.0", - "copyright": "Original work by TJohnson.", - "size": { - "x": 32, - "y": 32 - }, + "version": 1, + "license": "CC0-1.0", + "copyright": "Original work by TJohnson. lamia & segment by @noctyrnal", + "size": { + "x": 32, + "y": 32 + }, "states": [ { "name": "icon" @@ -18,6 +18,10 @@ "name": "equipped-OUTERCLOTHING-harpy", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-lamia", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 @@ -25,6 +29,9 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "segment" } ] } diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/medical.rsi/segment.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/medical.rsi/segment.png new file mode 100644 index 0000000000..c97ab674f2 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/medical.rsi/segment.png differ diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/officer.rsi/equipped-OUTERCLOTHING-lamia.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/officer.rsi/equipped-OUTERCLOTHING-lamia.png new file mode 100644 index 0000000000..850956e689 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/officer.rsi/equipped-OUTERCLOTHING-lamia.png differ diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/officer.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/officer.rsi/meta.json index 4844e816bd..cf10d74aed 100644 --- a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/officer.rsi/meta.json +++ b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/officer.rsi/meta.json @@ -1,11 +1,11 @@ { - "version": 1, - "license": "CC0-1.0", - "copyright": "Original work by TJohnson.", - "size": { - "x": 32, - "y": 32 - }, + "version": 1, + "license": "CC0-1.0", + "copyright": "Original work by TJohnson. lamia & segment by @noctyrnal", + "size": { + "x": 32, + "y": 32 + }, "states": [ { "name": "icon" @@ -18,6 +18,10 @@ "name": "equipped-OUTERCLOTHING-harpy", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-lamia", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 @@ -25,6 +29,9 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "segment" } ] } diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/officer.rsi/segment.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/officer.rsi/segment.png new file mode 100644 index 0000000000..481ab8594d Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/officer.rsi/segment.png differ diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/riot.rsi/equipped-OUTERCLOTHING-lamia.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/riot.rsi/equipped-OUTERCLOTHING-lamia.png new file mode 100644 index 0000000000..454939d731 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/riot.rsi/equipped-OUTERCLOTHING-lamia.png differ diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/riot.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/riot.rsi/meta.json index 4844e816bd..cf10d74aed 100644 --- a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/riot.rsi/meta.json +++ b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/riot.rsi/meta.json @@ -1,11 +1,11 @@ { - "version": 1, - "license": "CC0-1.0", - "copyright": "Original work by TJohnson.", - "size": { - "x": 32, - "y": 32 - }, + "version": 1, + "license": "CC0-1.0", + "copyright": "Original work by TJohnson. lamia & segment by @noctyrnal", + "size": { + "x": 32, + "y": 32 + }, "states": [ { "name": "icon" @@ -18,6 +18,10 @@ "name": "equipped-OUTERCLOTHING-harpy", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-lamia", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 @@ -25,6 +29,9 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "segment" } ] } diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/riot.rsi/segment.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/riot.rsi/segment.png new file mode 100644 index 0000000000..c97ab674f2 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/riot.rsi/segment.png differ diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/standard.rsi/equipped-OUTERCLOTHING-lamia.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/standard.rsi/equipped-OUTERCLOTHING-lamia.png new file mode 100644 index 0000000000..65a4ecba00 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/standard.rsi/equipped-OUTERCLOTHING-lamia.png differ diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/standard.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/standard.rsi/meta.json index 4844e816bd..cf10d74aed 100644 --- a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/standard.rsi/meta.json +++ b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/standard.rsi/meta.json @@ -1,11 +1,11 @@ { - "version": 1, - "license": "CC0-1.0", - "copyright": "Original work by TJohnson.", - "size": { - "x": 32, - "y": 32 - }, + "version": 1, + "license": "CC0-1.0", + "copyright": "Original work by TJohnson. lamia & segment by @noctyrnal", + "size": { + "x": 32, + "y": 32 + }, "states": [ { "name": "icon" @@ -18,6 +18,10 @@ "name": "equipped-OUTERCLOTHING-harpy", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-lamia", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 @@ -25,6 +29,9 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "segment" } ] } diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/standard.rsi/segment.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/standard.rsi/segment.png new file mode 100644 index 0000000000..c97ab674f2 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/standard.rsi/segment.png differ diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/warden.rsi/equipped-OUTERCLOTHING-lamia.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/warden.rsi/equipped-OUTERCLOTHING-lamia.png new file mode 100644 index 0000000000..6591584869 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/warden.rsi/equipped-OUTERCLOTHING-lamia.png differ diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/warden.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/warden.rsi/meta.json index 4844e816bd..cf10d74aed 100644 --- a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/warden.rsi/meta.json +++ b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/warden.rsi/meta.json @@ -1,11 +1,11 @@ { - "version": 1, - "license": "CC0-1.0", - "copyright": "Original work by TJohnson.", - "size": { - "x": 32, - "y": 32 - }, + "version": 1, + "license": "CC0-1.0", + "copyright": "Original work by TJohnson. lamia & segment by @noctyrnal", + "size": { + "x": 32, + "y": 32 + }, "states": [ { "name": "icon" @@ -18,6 +18,10 @@ "name": "equipped-OUTERCLOTHING-harpy", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-lamia", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 @@ -25,6 +29,9 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "segment" } ] } diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/warden.rsi/segment.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/warden.rsi/segment.png new file mode 100644 index 0000000000..481ab8594d Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/warden.rsi/segment.png differ diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Lamia/lamia_tails.rsi/body3tone1.png b/Resources/Textures/DeltaV/Mobs/Customization/Lamia/lamia_tails.rsi/body3tone1.png new file mode 100644 index 0000000000..0a9c6f02cc Binary files /dev/null and b/Resources/Textures/DeltaV/Mobs/Customization/Lamia/lamia_tails.rsi/body3tone1.png differ diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Lamia/lamia_tails.rsi/body3tone2.png b/Resources/Textures/DeltaV/Mobs/Customization/Lamia/lamia_tails.rsi/body3tone2.png new file mode 100644 index 0000000000..1c7bb9e864 Binary files /dev/null and b/Resources/Textures/DeltaV/Mobs/Customization/Lamia/lamia_tails.rsi/body3tone2.png differ diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Lamia/lamia_tails.rsi/body3tone3.png b/Resources/Textures/DeltaV/Mobs/Customization/Lamia/lamia_tails.rsi/body3tone3.png new file mode 100644 index 0000000000..826c099ab8 Binary files /dev/null and b/Resources/Textures/DeltaV/Mobs/Customization/Lamia/lamia_tails.rsi/body3tone3.png differ diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Lamia/lamia_tails.rsi/bottom3tone1.png b/Resources/Textures/DeltaV/Mobs/Customization/Lamia/lamia_tails.rsi/bottom3tone1.png new file mode 100644 index 0000000000..a6d4bd5f2b Binary files /dev/null and b/Resources/Textures/DeltaV/Mobs/Customization/Lamia/lamia_tails.rsi/bottom3tone1.png differ diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Lamia/lamia_tails.rsi/bottom3tone2.png b/Resources/Textures/DeltaV/Mobs/Customization/Lamia/lamia_tails.rsi/bottom3tone2.png new file mode 100644 index 0000000000..9b26288a26 Binary files /dev/null and b/Resources/Textures/DeltaV/Mobs/Customization/Lamia/lamia_tails.rsi/bottom3tone2.png differ diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Lamia/lamia_tails.rsi/bottom3tone3.png b/Resources/Textures/DeltaV/Mobs/Customization/Lamia/lamia_tails.rsi/bottom3tone3.png new file mode 100644 index 0000000000..2871eb45d8 Binary files /dev/null and b/Resources/Textures/DeltaV/Mobs/Customization/Lamia/lamia_tails.rsi/bottom3tone3.png differ diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Lamia/lamia_tails.rsi/meta.json b/Resources/Textures/DeltaV/Mobs/Customization/Lamia/lamia_tails.rsi/meta.json new file mode 100644 index 0000000000..5374b72d74 --- /dev/null +++ b/Resources/Textures/DeltaV/Mobs/Customization/Lamia/lamia_tails.rsi/meta.json @@ -0,0 +1,41 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by Archer2150#2528 using assets from Rane. Fangs by discord user @Hyenh6078", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "bottom3tone1", + "directions": 4 + }, + { + "name": "bottom3tone2", + "directions": 4 + }, + { + "name": "bottom3tone3", + "directions": 4 + }, + { + "name": "body3tone1" + }, + { + "name": "body3tone2" + }, + { + "name": "body3tone3" + }, + { + "name": "tip3tone1" + }, + { + "name": "tip3tone2" + }, + { + "name": "tip3tone3" + } + ] +} diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Lamia/lamia_tails.rsi/tip3tone1.png b/Resources/Textures/DeltaV/Mobs/Customization/Lamia/lamia_tails.rsi/tip3tone1.png new file mode 100644 index 0000000000..b9c86c5b99 Binary files /dev/null and b/Resources/Textures/DeltaV/Mobs/Customization/Lamia/lamia_tails.rsi/tip3tone1.png differ diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Lamia/lamia_tails.rsi/tip3tone2.png b/Resources/Textures/DeltaV/Mobs/Customization/Lamia/lamia_tails.rsi/tip3tone2.png new file mode 100644 index 0000000000..7a37e083a7 Binary files /dev/null and b/Resources/Textures/DeltaV/Mobs/Customization/Lamia/lamia_tails.rsi/tip3tone2.png differ diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Lamia/lamia_tails.rsi/tip3tone3.png b/Resources/Textures/DeltaV/Mobs/Customization/Lamia/lamia_tails.rsi/tip3tone3.png new file mode 100644 index 0000000000..9a9abed6ab Binary files /dev/null and b/Resources/Textures/DeltaV/Mobs/Customization/Lamia/lamia_tails.rsi/tip3tone3.png differ diff --git a/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/brute_damage.rsi/Chest_Brute_120.png b/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/brute_damage.rsi/Chest_Brute_120.png new file mode 100644 index 0000000000..404f932b64 Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/brute_damage.rsi/Chest_Brute_120.png differ diff --git a/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/brute_damage.rsi/Chest_Brute_200.png b/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/brute_damage.rsi/Chest_Brute_200.png new file mode 100644 index 0000000000..f0d9b5741b Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/brute_damage.rsi/Chest_Brute_200.png differ diff --git a/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/brute_damage.rsi/Chest_Brute_60.png b/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/brute_damage.rsi/Chest_Brute_60.png new file mode 100644 index 0000000000..43c92d9fa4 Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/brute_damage.rsi/Chest_Brute_60.png differ diff --git a/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/brute_damage.rsi/Head_Brute_120.png b/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/brute_damage.rsi/Head_Brute_120.png new file mode 100644 index 0000000000..33f624d503 Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/brute_damage.rsi/Head_Brute_120.png differ diff --git a/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/brute_damage.rsi/Head_Brute_200.png b/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/brute_damage.rsi/Head_Brute_200.png new file mode 100644 index 0000000000..f1de5695c5 Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/brute_damage.rsi/Head_Brute_200.png differ diff --git a/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/brute_damage.rsi/Head_Brute_60.png b/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/brute_damage.rsi/Head_Brute_60.png new file mode 100644 index 0000000000..2166220992 Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/brute_damage.rsi/Head_Brute_60.png differ diff --git a/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/brute_damage.rsi/LArm_Brute_120.png b/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/brute_damage.rsi/LArm_Brute_120.png new file mode 100644 index 0000000000..8429e7fb18 Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/brute_damage.rsi/LArm_Brute_120.png differ diff --git a/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/brute_damage.rsi/LArm_Brute_200.png b/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/brute_damage.rsi/LArm_Brute_200.png new file mode 100644 index 0000000000..488040b0c1 Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/brute_damage.rsi/LArm_Brute_200.png differ diff --git a/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/brute_damage.rsi/LArm_Brute_60.png b/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/brute_damage.rsi/LArm_Brute_60.png new file mode 100644 index 0000000000..1bcf2e505a Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/brute_damage.rsi/LArm_Brute_60.png differ diff --git a/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/brute_damage.rsi/LLeg_Brute_120.png b/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/brute_damage.rsi/LLeg_Brute_120.png new file mode 100644 index 0000000000..680ec3009a Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/brute_damage.rsi/LLeg_Brute_120.png differ diff --git a/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/brute_damage.rsi/LLeg_Brute_200.png b/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/brute_damage.rsi/LLeg_Brute_200.png new file mode 100644 index 0000000000..6c1a2dcc19 Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/brute_damage.rsi/LLeg_Brute_200.png differ diff --git a/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/brute_damage.rsi/LLeg_Brute_60.png b/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/brute_damage.rsi/LLeg_Brute_60.png new file mode 100644 index 0000000000..2670821090 Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/brute_damage.rsi/LLeg_Brute_60.png differ diff --git a/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/brute_damage.rsi/RArm_Brute_120.png b/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/brute_damage.rsi/RArm_Brute_120.png new file mode 100644 index 0000000000..f68f0c4f15 Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/brute_damage.rsi/RArm_Brute_120.png differ diff --git a/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/brute_damage.rsi/RArm_Brute_200.png b/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/brute_damage.rsi/RArm_Brute_200.png new file mode 100644 index 0000000000..6b99414d0b Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/brute_damage.rsi/RArm_Brute_200.png differ diff --git a/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/brute_damage.rsi/RArm_Brute_60.png b/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/brute_damage.rsi/RArm_Brute_60.png new file mode 100644 index 0000000000..2e4a031f15 Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/brute_damage.rsi/RArm_Brute_60.png differ diff --git a/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/brute_damage.rsi/RLeg_Brute_120.png b/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/brute_damage.rsi/RLeg_Brute_120.png new file mode 100644 index 0000000000..ef4dbcb08b Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/brute_damage.rsi/RLeg_Brute_120.png differ diff --git a/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/brute_damage.rsi/RLeg_Brute_200.png b/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/brute_damage.rsi/RLeg_Brute_200.png new file mode 100644 index 0000000000..6899cccab7 Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/brute_damage.rsi/RLeg_Brute_200.png differ diff --git a/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/brute_damage.rsi/RLeg_Brute_60.png b/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/brute_damage.rsi/RLeg_Brute_60.png new file mode 100644 index 0000000000..44aae3c0bf Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/brute_damage.rsi/RLeg_Brute_60.png differ diff --git a/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/brute_damage.rsi/meta.json b/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/brute_damage.rsi/meta.json new file mode 100644 index 0000000000..583346556e --- /dev/null +++ b/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/brute_damage.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/Citadel-Station-13/Citadel-Station-13/blob/971ddef989f7f4f365a714ef3d4df5dea2d53d9a/icons/mob/dam_mob.dmi", + "size": {"x": 32, "y": 32}, + "states": [ + {"name": "Head_Brute_60", "directions": 4}, + {"name": "LArm_Brute_60", "directions": 4}, + {"name": "LLeg_Brute_60", "directions": 4}, + {"name": "RArm_Brute_60", "directions": 4}, + {"name": "RLeg_Brute_60", "directions": 4}, + {"name": "Chest_Brute_60", "directions": 4}, + {"name": "Head_Brute_120", "directions": 4}, + {"name": "LArm_Brute_120", "directions": 4}, + {"name": "LLeg_Brute_120", "directions": 4}, + {"name": "RArm_Brute_120", "directions": 4}, + {"name": "RLeg_Brute_120", "directions": 4}, + {"name": "Chest_Brute_120", "directions": 4}, + {"name": "Head_Brute_200", "directions": 4}, + {"name": "LArm_Brute_200", "directions": 4}, + {"name": "LLeg_Brute_200", "directions": 4}, + {"name": "RArm_Brute_200", "directions": 4}, + {"name": "RLeg_Brute_200", "directions": 4}, + {"name": "Chest_Brute_200", "directions": 4} + ] +} diff --git a/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/burn_damage.rsi/Chest_Burn_120.png b/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/burn_damage.rsi/Chest_Burn_120.png new file mode 100644 index 0000000000..5a68c6fd86 Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/burn_damage.rsi/Chest_Burn_120.png differ diff --git a/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/burn_damage.rsi/Chest_Burn_200.png b/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/burn_damage.rsi/Chest_Burn_200.png new file mode 100644 index 0000000000..2ca0dc67f1 Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/burn_damage.rsi/Chest_Burn_200.png differ diff --git a/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/burn_damage.rsi/Chest_Burn_60.png b/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/burn_damage.rsi/Chest_Burn_60.png new file mode 100644 index 0000000000..bb29391fa0 Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/burn_damage.rsi/Chest_Burn_60.png differ diff --git a/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/burn_damage.rsi/Head_Burn_120.png b/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/burn_damage.rsi/Head_Burn_120.png new file mode 100644 index 0000000000..90d69223b6 Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/burn_damage.rsi/Head_Burn_120.png differ diff --git a/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/burn_damage.rsi/Head_Burn_200.png b/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/burn_damage.rsi/Head_Burn_200.png new file mode 100644 index 0000000000..36b9114816 Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/burn_damage.rsi/Head_Burn_200.png differ diff --git a/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/burn_damage.rsi/Head_Burn_60.png b/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/burn_damage.rsi/Head_Burn_60.png new file mode 100644 index 0000000000..f91dae519a Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/burn_damage.rsi/Head_Burn_60.png differ diff --git a/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/burn_damage.rsi/LArm_Burn_120.png b/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/burn_damage.rsi/LArm_Burn_120.png new file mode 100644 index 0000000000..7c8da637ca Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/burn_damage.rsi/LArm_Burn_120.png differ diff --git a/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/burn_damage.rsi/LArm_Burn_200.png b/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/burn_damage.rsi/LArm_Burn_200.png new file mode 100644 index 0000000000..2dc5377659 Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/burn_damage.rsi/LArm_Burn_200.png differ diff --git a/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/burn_damage.rsi/LArm_Burn_60.png b/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/burn_damage.rsi/LArm_Burn_60.png new file mode 100644 index 0000000000..bc8f7bf9ca Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/burn_damage.rsi/LArm_Burn_60.png differ diff --git a/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/burn_damage.rsi/LLeg_Burn_120.png b/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/burn_damage.rsi/LLeg_Burn_120.png new file mode 100644 index 0000000000..a84ef88da8 Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/burn_damage.rsi/LLeg_Burn_120.png differ diff --git a/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/burn_damage.rsi/LLeg_Burn_200.png b/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/burn_damage.rsi/LLeg_Burn_200.png new file mode 100644 index 0000000000..c18e554541 Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/burn_damage.rsi/LLeg_Burn_200.png differ diff --git a/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/burn_damage.rsi/LLeg_Burn_60.png b/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/burn_damage.rsi/LLeg_Burn_60.png new file mode 100644 index 0000000000..70b91d8824 Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/burn_damage.rsi/LLeg_Burn_60.png differ diff --git a/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/burn_damage.rsi/RArm_Burn_120.png b/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/burn_damage.rsi/RArm_Burn_120.png new file mode 100644 index 0000000000..1d0c791e38 Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/burn_damage.rsi/RArm_Burn_120.png differ diff --git a/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/burn_damage.rsi/RArm_Burn_200.png b/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/burn_damage.rsi/RArm_Burn_200.png new file mode 100644 index 0000000000..77e463d02f Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/burn_damage.rsi/RArm_Burn_200.png differ diff --git a/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/burn_damage.rsi/RArm_Burn_60.png b/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/burn_damage.rsi/RArm_Burn_60.png new file mode 100644 index 0000000000..96b96b566b Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/burn_damage.rsi/RArm_Burn_60.png differ diff --git a/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/burn_damage.rsi/RLeg_Burn_120.png b/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/burn_damage.rsi/RLeg_Burn_120.png new file mode 100644 index 0000000000..efe3ad8b53 Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/burn_damage.rsi/RLeg_Burn_120.png differ diff --git a/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/burn_damage.rsi/RLeg_Burn_200.png b/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/burn_damage.rsi/RLeg_Burn_200.png new file mode 100644 index 0000000000..978e01358f Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/burn_damage.rsi/RLeg_Burn_200.png differ diff --git a/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/burn_damage.rsi/RLeg_Burn_60.png b/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/burn_damage.rsi/RLeg_Burn_60.png new file mode 100644 index 0000000000..5f5d390792 Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/burn_damage.rsi/RLeg_Burn_60.png differ diff --git a/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/burn_damage.rsi/meta.json b/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/burn_damage.rsi/meta.json new file mode 100644 index 0000000000..7f8cda0f96 --- /dev/null +++ b/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/burn_damage.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/Citadel-Station-13/Citadel-Station-13/blob/971ddef989f7f4f365a714ef3d4df5dea2d53d9a/icons/mob/dam_mob.dmi", + "size": {"x": 32, "y": 32}, + "states": [ + {"name": "Head_Burn_60", "directions": 4}, + {"name": "LArm_Burn_60", "directions": 4}, + {"name": "LLeg_Burn_60", "directions": 4}, + {"name": "RArm_Burn_60", "directions": 4}, + {"name": "RLeg_Burn_60", "directions": 4}, + {"name": "Chest_Burn_60", "directions": 4}, + {"name": "Head_Burn_120", "directions": 4}, + {"name": "LArm_Burn_120", "directions": 4}, + {"name": "LLeg_Burn_120", "directions": 4}, + {"name": "RArm_Burn_120", "directions": 4}, + {"name": "RLeg_Burn_120", "directions": 4}, + {"name": "Chest_Burn_120", "directions": 4}, + {"name": "Head_Burn_200", "directions": 4}, + {"name": "LArm_Burn_200", "directions": 4}, + {"name": "LLeg_Burn_200", "directions": 4}, + {"name": "RArm_Burn_200", "directions": 4}, + {"name": "RLeg_Burn_200", "directions": 4}, + {"name": "Chest_Burn_200", "directions": 4} + ] +} diff --git a/Resources/Textures/Nyanotrasen/Mobs/Species/lamia.rsi/bottom.png b/Resources/Textures/Nyanotrasen/Mobs/Species/lamia.rsi/bottom.png new file mode 100644 index 0000000000..bf711ef304 Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Mobs/Species/lamia.rsi/bottom.png differ diff --git a/Resources/Textures/Nyanotrasen/Mobs/Species/lamia.rsi/meta.json b/Resources/Textures/Nyanotrasen/Mobs/Species/lamia.rsi/meta.json new file mode 100644 index 0000000000..ebfd0e2dc7 --- /dev/null +++ b/Resources/Textures/Nyanotrasen/Mobs/Species/lamia.rsi/meta.json @@ -0,0 +1,36 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by Archer2150#2528 using assets from Rane. Fangs by discord user @Hyenh6078", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "placeholder" + }, + { + "name": "bottom", + "directions": 4 + }, + { + "name": "tip" + }, + { + "name": "verbiconfangs" + }, + { + "name": "underscales", + "directions": 4 + }, + { + "name": "torso_f", + "directions": 4 + }, + { + "name": "torso_m", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Nyanotrasen/Mobs/Species/lamia.rsi/placeholder.png b/Resources/Textures/Nyanotrasen/Mobs/Species/lamia.rsi/placeholder.png new file mode 100644 index 0000000000..e0cb4814da Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Mobs/Species/lamia.rsi/placeholder.png differ diff --git a/Resources/Textures/Nyanotrasen/Mobs/Species/lamia.rsi/tip.png b/Resources/Textures/Nyanotrasen/Mobs/Species/lamia.rsi/tip.png new file mode 100644 index 0000000000..a7e023d96b Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Mobs/Species/lamia.rsi/tip.png differ diff --git a/Resources/Textures/Nyanotrasen/Mobs/Species/lamia.rsi/torso_f.png b/Resources/Textures/Nyanotrasen/Mobs/Species/lamia.rsi/torso_f.png new file mode 100644 index 0000000000..f818a47894 Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Mobs/Species/lamia.rsi/torso_f.png differ diff --git a/Resources/Textures/Nyanotrasen/Mobs/Species/lamia.rsi/torso_m.png b/Resources/Textures/Nyanotrasen/Mobs/Species/lamia.rsi/torso_m.png new file mode 100644 index 0000000000..f818a47894 Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Mobs/Species/lamia.rsi/torso_m.png differ diff --git a/Resources/Textures/Nyanotrasen/Mobs/Species/lamia.rsi/underscales.png b/Resources/Textures/Nyanotrasen/Mobs/Species/lamia.rsi/underscales.png new file mode 100644 index 0000000000..edc457a79b Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Mobs/Species/lamia.rsi/underscales.png differ diff --git a/Resources/Textures/Nyanotrasen/Mobs/Species/lamia.rsi/verbiconfangs.png b/Resources/Textures/Nyanotrasen/Mobs/Species/lamia.rsi/verbiconfangs.png new file mode 100644 index 0000000000..4511cbd21f Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Mobs/Species/lamia.rsi/verbiconfangs.png differ diff --git a/Resources/Textures/_ds14/Clothing/Shoes/sneakers.rsi/equipped-FEET.png b/Resources/Textures/_ds14/Clothing/Shoes/sneakers.rsi/equipped-FEET.png new file mode 100644 index 0000000000..3e3b72eade Binary files /dev/null and b/Resources/Textures/_ds14/Clothing/Shoes/sneakers.rsi/equipped-FEET.png differ diff --git a/Resources/Textures/_ds14/Clothing/Shoes/sneakers.rsi/icon.png b/Resources/Textures/_ds14/Clothing/Shoes/sneakers.rsi/icon.png new file mode 100644 index 0000000000..efff57125e Binary files /dev/null and b/Resources/Textures/_ds14/Clothing/Shoes/sneakers.rsi/icon.png differ diff --git a/Resources/Textures/_ds14/Clothing/Shoes/sneakers.rsi/inhand-left.png b/Resources/Textures/_ds14/Clothing/Shoes/sneakers.rsi/inhand-left.png new file mode 100644 index 0000000000..03bdacf9fb Binary files /dev/null and b/Resources/Textures/_ds14/Clothing/Shoes/sneakers.rsi/inhand-left.png differ diff --git a/Resources/Textures/_ds14/Clothing/Shoes/sneakers.rsi/inhand-right.png b/Resources/Textures/_ds14/Clothing/Shoes/sneakers.rsi/inhand-right.png new file mode 100644 index 0000000000..f00d861ca5 Binary files /dev/null and b/Resources/Textures/_ds14/Clothing/Shoes/sneakers.rsi/inhand-right.png differ diff --git a/Resources/Textures/_ds14/Clothing/Shoes/sneakers.rsi/meta.json b/Resources/Textures/_ds14/Clothing/Shoes/sneakers.rsi/meta.json new file mode 100644 index 0000000000..0f0356e9d5 --- /dev/null +++ b/Resources/Textures/_ds14/Clothing/Shoes/sneakers.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made for murdume on discord as a Patron benefit.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-FEET", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +}