diff --git a/Content.Client/DeltaV/Lamiae/SnakeOverlay.cs b/Content.Client/DeltaV/Lamiae/SnakeOverlay.cs new file mode 100644 index 00000000000..7dd0d49b63e --- /dev/null +++ b/Content.Client/DeltaV/Lamiae/SnakeOverlay.cs @@ -0,0 +1,172 @@ +using Content.Shared.SegmentedEntity; +using Content.Shared.Humanoid; +using Content.Shared.Humanoid.Markings; +using Content.Client.Resources; +using Robust.Client.ResourceManagement; +using Robust.Client.Graphics; +using Robust.Shared.Enums; +using System.Numerics; +using System.Linq; + + +namespace Content.Client.Lamiae; + +/// +/// This draws lamia segments directly from polygons instead of sprites. This is a very novel approach as of the time this is being written (August 2024) but it wouldn't surprise me +/// if there's a better way to do this at some point. Currently we have a very heavy restriction on the tools we can make, forcing me to make several helpers that may be redundant later. +/// This will be overcommented because I know you haven't seen code like this before and you might want to copy it. +/// This is an expansion on some techniques I discovered in (https://github.com/Elijahrane/Delta-v/blob/49d76c437740eab79fc622ab50d628b926e6ddcb/Content.Client/DeltaV/Arcade/S3D/Renderer/S3DRenderer.cs) +/// +public sealed class SnakeOverlay : Overlay +{ + private readonly IResourceCache _resourceCache; + private readonly IEntityManager _entManager; + private readonly SharedTransformSystem _transform; + private readonly SharedHumanoidAppearanceSystem _humanoid = default!; + + // Look through these carefully. WorldSpace is useful for debugging. Note that this defaults to "screen space" which breaks when you try and get the world handle. + public override OverlaySpace Space => OverlaySpace.WorldSpaceEntities; + + // Overlays are strange and you need this pattern where you define readonly deps above, and then make a constructor with this pattern. Anything that creates this overlay will then + // have to provide all the deps. + public SnakeOverlay(IEntityManager entManager, IResourceCache resourceCache) + { + _resourceCache = resourceCache; + // we get ent manager from SnakeOverlaySystem turning this on and passing it + _entManager = entManager; + // with ent manager we can fetch our other entity systems + _transform = _entManager.EntitySysManager.GetEntitySystem(); + _humanoid = _entManager.EntitySysManager.GetEntitySystem(); + + // draw at drawdepth 3 + ZIndex = 3; + } + + // This step occurs each frame. For some overlays you may want to conisder limiting how often they update, but for player entities that move around fast we'll just do it every frame. + protected override void Draw(in OverlayDrawArgs args) + { + // load the handle, the "pen" we draw with + var handle = args.WorldHandle; + + // Get all lamiae the client knows of and their transform in a way we can enumerate over + var enumerator = _entManager.AllEntityQueryEnumerator(); + + // I go over the collection above, pulling out an EntityUid and the two components I need for each. + while (enumerator.MoveNext(out var uid, out var lamia, out var xform)) + { + // Skip ones that are off-map. "Map" in this context means interconnected stuff you can travel between by moving, rather than needing e.g. FTL to load a new map. + if (xform.MapID != args.MapId) + continue; + + // Skip ones where they are not loaded properly, uninitialized, or w/e + if (lamia.Segments.Count < lamia.NumberOfSegments) + { + _entManager.Dirty(uid, lamia); // pls give me an update... + continue; + } + + // By the way, there's a hack to mitigate overdraw somewhat. Check out whatever is going on with the variable called "bounds" in DoAfterOverlay. + // I won't do it here because (1) it's ugly and (2) theoretically these entities can be fucking huge and you'll see the tail end of them when they are way off screen. + // On a PVS level I think segmented entities should be all-or-nothing when it comes to PVS range, that is you either load all of their segments or none. + + // Color.White is drawing without modifying color. For clothed tails, we should use White. For skin, we should use the color of the marking. + // TODO: Better way to cache this + Color? col = null; + if (_entManager.TryGetComponent(uid, out var humanoid)) + if (humanoid.MarkingSet.TryGetCategory(MarkingCategories.Tail, out var tailMarkings)) + col = tailMarkings.First().MarkingColors.First(); + + DrawLamia(handle, lamia, col ?? Color.White); + } + } + + // This is where we do the actual drawing. + private void DrawLamia(DrawingHandleWorld handle, SegmentedEntityComponent lamia, Color color) + { + // We're going to store all our verticies in here and then draw them + List verts = new List(); + + // Radius of the initial segment + float radius = lamia.InitialRadius; + + // We're storing the left and right verticies of the last segment so we can start drawing from there without gaps + Vector2? lastPtCW = null; + Vector2? lastPtCCW = null; + + var tex = _resourceCache.GetTexture(lamia.TexturePath); + + int i = 1; + // do each segment except the last one normally + while (i < lamia.Segments.Count - 1) + { + // get centerpoints of last segment and this one + var origin = _transform.GetWorldPosition(_entManager.GetEntity(lamia.Segments[i - 1])); + var destination = _transform.GetWorldPosition(_entManager.GetEntity(lamia.Segments[i])); + + // get direction between the two points and normalize it + var connectorVec = destination - origin; + connectorVec = connectorVec.Normalized(); + + //get one rotated 90 degrees clockwise + var offsetVecCW = new Vector2(connectorVec.Y, 0 - connectorVec.X); + + //and counterclockwise + var offsetVecCCW = new Vector2(0 - connectorVec.Y, connectorVec.X); + + /// tri 1: line across first segment and corner of second + if (lastPtCW == null) + { + verts.Add(new DrawVertexUV2D(origin + offsetVecCW * radius, Vector2.Zero)); + } + else + { + verts.Add(new DrawVertexUV2D((Vector2) lastPtCW, Vector2.Zero)); + } + + if (lastPtCCW == null) + { + verts.Add(new DrawVertexUV2D(origin + offsetVecCCW * radius, new Vector2(1, 0))); + } + else + { + verts.Add(new DrawVertexUV2D((Vector2) lastPtCCW, new Vector2(1, 0))); + } + + verts.Add(new DrawVertexUV2D(destination + offsetVecCW * radius, new Vector2(0, 1))); + + // tri 2: line across second segment and corner of first + if (lastPtCCW == null) + { + verts.Add(new DrawVertexUV2D(origin + offsetVecCCW * radius, new Vector2(1, 0))); + } + else + { + verts.Add(new DrawVertexUV2D((Vector2) lastPtCCW, new Vector2(1, 0))); + } + + lastPtCW = destination + offsetVecCW * radius; + verts.Add(new DrawVertexUV2D((Vector2) lastPtCW, new Vector2(0, 1))); + lastPtCCW = destination + offsetVecCCW * radius; + verts.Add(new DrawVertexUV2D((Vector2) lastPtCCW, new Vector2(1, 1))); + + // slim down a bit for next segment + radius *= lamia.SlimFactor; + + i++; + } + + // draw tail (1 tri) + if (lastPtCW != null && lastPtCCW != null) + { + verts.Add(new DrawVertexUV2D((Vector2) lastPtCW, new Vector2(0, 0))); + verts.Add(new DrawVertexUV2D((Vector2) lastPtCCW, new Vector2(1, 0))); + + var destination = _transform.GetWorldPosition(_entManager.GetEntity(lamia.Segments.Last())); + + verts.Add(new DrawVertexUV2D(destination, new Vector2(0.5f, 1f))); + } + + // Draw all of the triangles we just pit in at once + handle.DrawPrimitives(DrawPrimitiveTopology.TriangleList, texture: tex, verts.ToArray().AsSpan(), color); + } +} diff --git a/Content.Client/DeltaV/Lamiae/SnakeOverlaySystem.cs b/Content.Client/DeltaV/Lamiae/SnakeOverlaySystem.cs new file mode 100644 index 00000000000..ed2d8b58025 --- /dev/null +++ b/Content.Client/DeltaV/Lamiae/SnakeOverlaySystem.cs @@ -0,0 +1,26 @@ +using Robust.Client.Graphics; +using Robust.Client.ResourceManagement; + +namespace Content.Client.Lamiae; + +/// +/// This system turns on our always-on overlay. I have no opinion on this design pattern or the existence of this file. +/// It also fetches the deps it needs. +/// +public sealed class SnakeOverlaySystem : EntitySystem +{ + [Dependency] private readonly IOverlayManager _overlay = default!; + [Dependency] private readonly IResourceCache _resourceCache = default!; + + public override void Initialize() + { + base.Initialize(); + _overlay.AddOverlay(new SnakeOverlay(EntityManager, _resourceCache)); + } + + public override void Shutdown() + { + base.Shutdown(); + _overlay.RemoveOverlay(); + } +} diff --git a/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs b/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs index 74fabc06bb3..d2d4eedd2e8 100644 --- a/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs +++ b/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs @@ -11,6 +11,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; @@ -643,7 +644,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/Teleportation/PortalSystem.cs b/Content.Server/Teleportation/PortalSystem.cs index 76900a7e198..27fec274351 100644 --- a/Content.Server/Teleportation/PortalSystem.cs +++ b/Content.Server/Teleportation/PortalSystem.cs @@ -1,4 +1,4 @@ -using Content.Shared.Administration.Logs; +using Content.Shared.Administration.Logs; using Content.Shared.Database; using Content.Shared.Ghost; using Content.Shared.Mind.Components; diff --git a/Content.Server/Weapons/Ranged/Systems/GunSystem.cs b/Content.Server/Weapons/Ranged/Systems/GunSystem.cs index d22b5ec2af7..7fe34516fea 100644 --- a/Content.Server/Weapons/Ranged/Systems/GunSystem.cs +++ b/Content.Server/Weapons/Ranged/Systems/GunSystem.cs @@ -165,7 +165,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]; // Check if laser is shot from in a container if (!_container.IsEntityOrParentInContainer(lastUser)) diff --git a/Content.Shared/Roles/StartingGearPrototype.cs b/Content.Shared/Roles/StartingGearPrototype.cs index 883fe283a6b..61ad7940d71 100644 --- a/Content.Shared/Roles/StartingGearPrototype.cs +++ b/Content.Shared/Roles/StartingGearPrototype.cs @@ -51,6 +51,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 00000000000..4fdf893ad82 --- /dev/null +++ b/Content.Shared/SegmentedEntity/SegmentSpawnedEvent.cs @@ -0,0 +1,11 @@ +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 00000000000..e5613379e74 --- /dev/null +++ b/Content.Shared/SegmentedEntity/SegmentedEntityComponent.cs @@ -0,0 +1,101 @@ +using Robust.Shared.GameStates; + +namespace Content.Shared.SegmentedEntity; + +/// +/// Controls initialization of any Multi-segmented entity +/// +[RegisterComponent, NetworkedComponent] +[AutoGenerateComponentState] +public sealed partial class SegmentedEntityComponent : Component +{ + /// + /// A list of each UID attached to the Lamia, in order of spawn + /// + [DataField, AutoNetworkedField] + public List Segments = new(); + + /// + /// A clamped variable that represents the number of segments to be spawned + /// + [DataField] + public int NumberOfSegments = 18; + + /// + /// How wide the initial segment should be. + /// + [DataField] + public float InitialRadius = 0.3f; + + /// + /// Texture of the segment. + /// + [DataField(required: true)] + public string TexturePath; + + /// + /// 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] + public float OffsetConstant = 1.03f; + + /// + /// Represents the prototype used to parent all segments + /// + [DataField] + public string InitialSegmentId = "LamiaInitialSegment"; + + /// + /// Represents the segment prototype to be spawned + /// + [DataField] + public string SegmentId = "LamiaSegment"; + + /// + /// How much to slim each successive segment. + /// + [DataField] + public float SlimFactor = 0.93f; + + /// + /// Set to false for constant width + /// + [DataField] + public bool UseTaperSystem = true; + + /// + /// The standard distance between the centerpoint of each segment. + /// + [DataField] + public float StaticOffset = 0.15f; + + /// + /// The standard sprite scale of each segment. + /// + [DataField] + public float StaticScale = 1f; + + /// + /// Used to more finely tune how much damage should be transfered from tail to body. + /// + [DataField] + public float DamageModifierOffset = 0.4f; + + /// + /// A clamped variable that represents how far from the tip should tapering begin. + /// + [DataField] + 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] + public float ExplosiveModifierOffset = 0.1f; + + /// + /// Controls whether or not lamia segments always block bullets, or use the bullet passover system for laying down bodies. + /// + [DataField] + public bool BulletPassover = true; +} diff --git a/Content.Shared/SegmentedEntity/SegmentedEntitySegmentComponent.cs b/Content.Shared/SegmentedEntity/SegmentedEntitySegmentComponent.cs new file mode 100644 index 00000000000..0e708e69189 --- /dev/null +++ b/Content.Shared/SegmentedEntity/SegmentedEntitySegmentComponent.cs @@ -0,0 +1,48 @@ +using Robust.Shared.GameStates; + +namespace Content.Shared.SegmentedEntity; + +/// +/// This is a tracking component used for storing quick reference information related to a Lamia's main body on each of her segments, +/// which is needed both for simplifying a lot of code, as well as tracking who the original body was. +/// None of these are Datafields for a reason, they are modified by the original parent body upon spawning her segments. +/// +[RegisterComponent, NetworkedComponent] +public sealed partial class SegmentedEntitySegmentComponent : Component +{ + [ViewVariables] + public EntityUid AttachedToUid = default!; + + [ViewVariables] + public float DamageModifyFactor = default!; + + [ViewVariables] + public float OffsetSwitching = default!; + + [ViewVariables] + public float ScaleFactor = default!; + + [ViewVariables] + public float DamageModifierCoefficient = default!; + + [ViewVariables] + public float ExplosiveModifyFactor = default!; + + [ViewVariables] + public float OffsetConstant = default!; + + [ViewVariables] + public EntityUid Lamia = default!; + + [ViewVariables] + public int MaxSegments = default!; + + [ViewVariables] + public int SegmentNumber = default!; + + [ViewVariables] + public float DamageModifierConstant = default!; + + [ViewVariables] + public string? SegmentId; +} diff --git a/Content.Shared/SegmentedEntity/SegmentedEntitySystem.cs b/Content.Shared/SegmentedEntity/SegmentedEntitySystem.cs new file mode 100644 index 00000000000..928edbfb043 --- /dev/null +++ b/Content.Shared/SegmentedEntity/SegmentedEntitySystem.cs @@ -0,0 +1,298 @@ +using Robust.Shared.Physics; +using Content.Shared.Damage; +using Content.Shared.Explosion; +using Content.Shared.Humanoid; +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 Robust.Shared.Prototypes; +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 DamageableSystem _damageableSystem = default!; + [Dependency] private readonly SharedJointSystem _jointSystem = default!; + [Dependency] private readonly INetManager _net = default!; + [Dependency] private readonly SharedTransformSystem _transform = default!; + + private Queue<(SegmentedEntitySegmentComponent segment, EntityUid lamia)> _segments = new(); + + private ProtoId _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); + } + 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.SetCoordinates(segmentUid, 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.SetCoordinates(segmentUid, Transform(attachedUid).Coordinates.Offset(new Vector2(0, segment.segment.OffsetSwitching * humanoidFactor))); + else + _transform.SetCoordinates(segmentUid, 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; + + DeleteSegments(component); + } + + /// + /// 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(GetNetEntity(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(GetEntity(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++; + } + + Dirty(uid, component); + } + + private EntityUid AddSegment(EntityUid segmentuid, EntityUid parentuid, SegmentedEntityComponent segmentedComponent, int segmentNumber) + { + float taperConstant = segmentedComponent.NumberOfSegments - segmentedComponent.TaperOffset; + EntityUid segment = EntityManager.SpawnEntity(segmentNumber == 1 + ? segmentedComponent.InitialSegmentId + : 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; + + if (segmentedComponent.UseTaperSystem) + { + 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(GetNetEntity(segment)); + return segment; + } + + 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) + || args.Slot != "outerClothing" + || !_tagSystem.HasTag(args.Equipment, _lamiaHardsuitTag)) + return; + + // TODO: Switch segment sprite + } + + 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)) + { + // TODO: Revert to default segment sprite + } + } + + 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(GetNetEntity(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.MapUid) + // RespawnSegments(uid, component); + } +} diff --git a/Content.Shared/Teleportation/Components/PortalExemptComponent.cs b/Content.Shared/Teleportation/Components/PortalExemptComponent.cs new file mode 100644 index 00000000000..28043808e09 --- /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 8d67aec518a..7e1124cef7a 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 00000000000..65dbb5cb391 --- /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/Prototypes/DeltaV/Datasets/Names/cyno_female.yml b/Resources/Prototypes/DeltaV/Datasets/Names/cyno_female.yml new file mode 100644 index 00000000000..eea73f1e685 --- /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 00000000000..3ed9f62f11f --- /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 00000000000..ca72b07fd9b --- /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 00000000000..65af873fe6e --- /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 00000000000..432b2ee8416 --- /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 00000000000..5913b31dd1f --- /dev/null +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Player/lamia.yml @@ -0,0 +1,38 @@ +# 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 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 00000000000..38601f21b54 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Species/lamia.yml @@ -0,0 +1,286 @@ +# 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 + - type: Sprite + netsync: false + noRot: true + drawdepth: Mobs + scale: 1, 1 + offset: 0, 0.4 + 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 + texturePath: /Textures/Nyanotrasen/Mobs/Species/lamia.rsi/segment.png + - 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 00000000000..1ca5f5a6824 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Species/lamia.yml @@ -0,0 +1,49 @@ +# 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 + categories: [ HideSpawnMenu ] + components: + - type: Damageable + - type: StandingState + - 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: Tag + tags: + - HideContextMenu + - type: RequireProjectileTarget + active: True + +- type: entity + id: LamiaSegment + save: false + parent: LamiaInitialSegment + name: lamia segment + categories: [ HideSpawnMenu ] + description: A tail segment, hopefully attached to a lamia. + components: + - type: Sprite + - type: Tag + tags: + - HideContextMenu + - DoorBumpOpener 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 00000000000..546d0746b7a --- /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 00000000000..1f7da8306d2 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Species/lamia.yml @@ -0,0 +1,39 @@ +- type: species + id: Lamia + name: Lamia + roundStart: false + 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: markingPoints + id: MobLamiaMarkingLimits + points: + Hair: + points: 1 + required: false + Tail: + points: 1 + required: true + defaultMarkings: [ LamiaBottom ] + + +- type: speciesBaseSprites + id: MobLamiaSprites + sprites: + Head: MobHumanHead + Hair: MobHumanoidAnyMarking + Chest: MobHumanTorso + Eyes: MobHumanoidEyes + LArm: MobHumanLArm + RArm: MobHumanRArm + LHand: MobHumanLHand + RHand: MobHumanRHand + Tail: MobHumanoidAnyMarking diff --git a/Resources/Prototypes/DeltaV/tags.yml b/Resources/Prototypes/DeltaV/tags.yml index 506e725ace5..c6774acee7d 100644 --- a/Resources/Prototypes/DeltaV/tags.yml +++ b/Resources/Prototypes/DeltaV/tags.yml @@ -1,4 +1,6 @@ ## This is for Nyano and Delta V tags +- type: Tag + id: AllowLamiaHardsuit - type: Tag id: BeltSlotNotBelt #not a 'belt' diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml index 323895491af..0168f461466 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml @@ -140,6 +140,7 @@ - Hardsuit - WhitelistChameleon - HidesHarpyWings #DeltaV: Used by harpies to help render their hardsuit sprites + - AllowLamiaHardsuit - FullBodyOuter - type: Clothing equipDelay: 2.5 # Hardsuits are heavy and take a while to put on/off. @@ -178,6 +179,7 @@ size: Huge - type: Tag tags: + - AllowLamiaHardsuit #DeltaV: Used by Lamia to render snek hardsuits - HidesHarpyWings #DeltaV: Used by harpies to help render their hardsuit sprites - type: Clothing equipDelay: 1.25 # Softsuits are easier to put on and off diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml index 115202813c7..66718d519bc 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/Mobs/Customization/Markings/reptilian.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/reptilian.yml index 4aad209e5fe..7be52c11f0a 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/reptilian.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/reptilian.yml @@ -2,7 +2,7 @@ id: LizardFrillsAquatic bodyPart: HeadSide markingCategory: HeadSide - speciesRestriction: [Reptilian, Human] + speciesRestriction: [Reptilian, Human, Lamia] sprites: - sprite: Mobs/Customization/reptilian_parts.rsi state: frills_aquatic @@ -11,7 +11,7 @@ id: LizardFrillsShort bodyPart: HeadSide markingCategory: HeadSide - speciesRestriction: [Reptilian, Human] + speciesRestriction: [Reptilian, Human, Lamia] sprites: - sprite: Mobs/Customization/reptilian_parts.rsi state: frills_short @@ -20,7 +20,7 @@ id: LizardFrillsSimple bodyPart: HeadSide markingCategory: HeadSide - speciesRestriction: [Reptilian, Human] + speciesRestriction: [Reptilian, Human, Lamia] sprites: - sprite: Mobs/Customization/reptilian_parts.rsi state: frills_simple @@ -29,7 +29,7 @@ id: LizardFrillsDivinity bodyPart: HeadSide markingCategory: HeadSide - speciesRestriction: [Reptilian, Human] + speciesRestriction: [Reptilian, Human, Lamia] sprites: - sprite: Mobs/Customization/reptilian_parts.rsi state: frills_divinity @@ -38,7 +38,7 @@ id: LizardFrillsBig bodyPart: HeadSide markingCategory: HeadSide - speciesRestriction: [Reptilian, Human] + speciesRestriction: [Reptilian, Human, Lamia] sprites: - sprite: Mobs/Customization/reptilian_parts.rsi state: frills_big @@ -47,7 +47,7 @@ id: LizardFrillsAxolotl bodyPart: HeadSide markingCategory: HeadSide - speciesRestriction: [Reptilian, Human] + speciesRestriction: [Reptilian, Human, Lamia] sprites: - sprite: Mobs/Customization/reptilian_parts.rsi state: frills_axolotl @@ -56,7 +56,7 @@ id: LizardFrillsHood bodyPart: HeadSide markingCategory: HeadSide - speciesRestriction: [Reptilian, Human] + speciesRestriction: [Reptilian, Human, Lamia] sprites: - sprite: Mobs/Customization/reptilian_parts.rsi state: frills_hood_primary diff --git a/Resources/Prototypes/Entities/Structures/Piping/Disposal/units.yml b/Resources/Prototypes/Entities/Structures/Piping/Disposal/units.yml index e7d3d3c9977..1bbbe46b888 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: ThrowInsertContainer containerId: disposals - type: UserInterface diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi/meta.json index b7b0719efa4..85e7d84f700 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.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/ERTSuits/ertengineer.rsi/segment.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi/segment.png new file mode 100644 index 00000000000..c97ab674f25 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 00000000000..a61d875e727 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 6de2d485b82..14696d09c6c 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from paradisestation at commit https://github.com/ParadiseSS13/Paradise/commit/12c21ced8432015485484b17e311dcceb7c458f6. Vox sprite by Flareguy for Space Station 14", + "copyright": "Taken from paradisestation at commit https://github.com/ParadiseSS13/Paradise/commit/12c21ced8432015485484b17e311dcceb7c458f6. Vox sprite by Flareguy for Space Station 14, , lamia & segment by @noctyrnal", "size": { "x": 32, "y": 32 @@ -25,6 +25,13 @@ { "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 00000000000..c97ab674f25 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 6de2d485b82..2dd533be9c2 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.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/ERTSuits/ertleader.rsi/segment.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi/segment.png new file mode 100644 index 00000000000..c97ab674f25 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 daa64b2f5c6..9502d12a3ca 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.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/ERTSuits/ertmedical.rsi/segment.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi/segment.png new file mode 100644 index 00000000000..c97ab674f25 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 6de2d485b82..2dd533be9c2 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.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/ERTSuits/ertsecurity.rsi/segment.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi/segment.png new file mode 100644 index 00000000000..c97ab674f25 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 00000000000..f9c943fe7b1 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 2da9e2ad1d5..4d2414a726e 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/atmospherics.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/atmospherics.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox state made by Flareguy for SS14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox state made by Flareguy for SS14, lamia & segment by @noctyrnal", "size": { "x": 32, "y": 32 @@ -29,6 +29,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 00000000000..056ce54c6be 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 00000000000..cbe28cd477b 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 3067907ba97..1fd6139e1d8 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 00000000000..91747f2ee63 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 6cfe1ea214d..6f234fe2191 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 00000000000..c97ab674f25 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 00000000000..9e1327db341 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 3271d26a2cf..8ce320a709b 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Made by Emisse for SS14. Vox state made by Flareguy for SS14", + "copyright": "Made by Emisse for SS14. Vox state made by Flareguy for SS14, lamia & segment by @noctyrnal", "size": { "x": 32, "y": 32 @@ -15,8 +15,8 @@ "directions": 4 }, { - "name": "equipped-OUTERCLOTHING-vox", - "directions": 4 + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 }, { "name": "inhand-left", @@ -29,6 +29,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 00000000000..f2a4dbb3828 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 2edd20e1dc1..4b39fa31426 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/cburn.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cburn.rsi/meta.json @@ -27,8 +27,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 00000000000..c97ab674f25 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 60c53e9cc28..a68e6a38017 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/clown.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/clown.rsi/meta.json @@ -29,6 +29,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 00000000000..c97ab674f25 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 00000000000..5da5227444e 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 5a3fd99c11f..5bf5ca28730 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/meta.json @@ -1,34 +1,41 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Sprite made by Gtheglorious based on the sprite made by emisse for ss14, harpy variant by VMSolidus, vox state made by Flareguy for SS14.", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" - }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-vox", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-harpy", - "directions": 4 - } - ] -} +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprite made by Gtheglorious based on the sprite made by emisse for ss14, harpy variant by VMSolidus, vox state made by Flareguy for SS14. lamia & segment by @noctyrnal", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, + { + "name": "inhand-left", + "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/cybersun.rsi/segment.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/segment.png new file mode 100644 index 00000000000..7bdd5639352 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 5054eea8f45..63ad8b536e7 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/meta.json @@ -27,8 +27,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 00000000000..c97ab674f25 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 00000000000..cc30d8c7d20 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 0a78966c1d5..a9803b6ba79 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering-white.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering-white.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox state made by Flareguy for SS14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox state made by Flareguy for SS14, lamia & segment by @noctyrnal", "size": { "x": 32, "y": 32 @@ -29,6 +29,13 @@ { "name": "equipped-OUTERCLOTHING-harpy", "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-lamia", + "directions": 4 + }, + { + "name": "segment" } ] -} \ No newline at end of file +} 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 00000000000..2217a868571 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 00000000000..27325e27ff0 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 13f389a778c..7561409c772 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, harpy version by VMSolidus. Vox state made by Flareguy for SS14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, harpy version by VMSolidus. Vox state made by Flareguy for SS14, lamia & segment by @noctyrnal", "size": { "x": 32, "y": 32 @@ -29,6 +29,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 00000000000..371541123ca 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 0249e359954..61121c1bff8 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 00000000000..c97ab674f25 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 00000000000..0272ceb588b 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 76e3264cbce..62024653406 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Texture edit from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox state made by Flareguy for SS14", + "copyright": "Texture edit from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox state made by Flareguy for SS14, lamia & segment by @noctyrnal", "size": { "x": 32, "y": 32 @@ -29,6 +29,13 @@ { "name": "equipped-OUTERCLOTHING-harpy", "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-lamia", + "directions": 4 + }, + { + "name": "segment" } ] -} \ No newline at end of file +} 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 00000000000..aacde8c7234 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 9acde9a4dea..4ff2429f36a 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/maxim.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/maxim.rsi/meta.json @@ -23,8 +23,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 00000000000..c97ab674f25 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 00000000000..87737253834 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 0a78966c1d5..a9803b6ba79 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox state made by Flareguy for SS14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox state made by Flareguy for SS14, lamia & segment by @noctyrnal", "size": { "x": 32, "y": 32 @@ -29,6 +29,13 @@ { "name": "equipped-OUTERCLOTHING-harpy", "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-lamia", + "directions": 4 + }, + { + "name": "segment" } ] -} \ No newline at end of file +} 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 00000000000..290153565ea 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 a5f992108c0..20c4b3ebbe9 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 00000000000..c97ab674f25 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 00000000000..ba1d3fbdc24 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 403cfec384c..13a5bbcb21c 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/meta.json @@ -1,34 +1,41 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from paradise station git at commit https://github.com/ParadiseSS13/Paradise/commit/e5e584804b4b0b373a6a69d23afb73fd3c094365, redrawn by Ubaser. Vox state made by Flareguy for SS14", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" - }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-vox", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-harpy", - "directions": 4 - } - ] -} \ No newline at end of file +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from paradise station git at commit https://github.com/ParadiseSS13/Paradise/commit/e5e584804b4b0b373a6a69d23afb73fd3c094365, redrawn by Ubaser. Vox state made by Flareguy for SS14, lamia & segment by @noctyrnal", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, + { + "name": "inhand-left", + "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/paramed.rsi/segment.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/segment.png new file mode 100644 index 00000000000..b750e3ce22f 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 8663673f5c6..fcb7f9081a9 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/piratecaptain.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/piratecaptain.rsi/meta.json @@ -25,6 +25,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 00000000000..c97ab674f25 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 8663673f5c6..fcb7f9081a9 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/pirateeva.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/pirateeva.rsi/meta.json @@ -25,6 +25,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 00000000000..c97ab674f25 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 00000000000..b707f6bf113 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 c3caac82252..d2e166d57ab 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox state made by Flareguy for SS14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox state made by Flareguy for SS14, lamia & segment by @noctyrnal, harpy by VMSolidus", "size": { "x": 32, "y": 32 @@ -18,6 +18,13 @@ "name": "equipped-OUTERCLOTHING-harpy", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-lamia", + "directions": 4 + }, + { + "name": "segment" + }, { "name": "equipped-OUTERCLOTHING-vox", "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 00000000000..972865cd17c 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 00000000000..b3ab296976c 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 0a78966c1d5..a9803b6ba79 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/salvage.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/salvage.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox state made by Flareguy for SS14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox state made by Flareguy for SS14, lamia & segment by @noctyrnal", "size": { "x": 32, "y": 32 @@ -29,6 +29,13 @@ { "name": "equipped-OUTERCLOTHING-harpy", "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-lamia", + "directions": 4 + }, + { + "name": "segment" } ] -} \ No newline at end of file +} 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 00000000000..5ad6fc8b355 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 eb28d4c8a1f..2ee0f7bad9d 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/santahardsuit.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/santahardsuit.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/santahardsuit.rsi/segment.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/santahardsuit.rsi/segment.png new file mode 100644 index 00000000000..c97ab674f25 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 15aef26a56c..e5f6f71fae1 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-red.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-red.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/security-red.rsi/segment.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-red.rsi/segment.png new file mode 100644 index 00000000000..c97ab674f25 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 180439fbcce..29477e0c2e1 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-warden.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-warden.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/security-warden.rsi/segment.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-warden.rsi/segment.png new file mode 100644 index 00000000000..c97ab674f25 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 8acf2ddc611..38e0f9d18d0 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security.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/security.rsi/segment.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security.rsi/segment.png new file mode 100644 index 00000000000..c97ab674f25 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 00000000000..c7344388fb1 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 c04f7d758c0..5f4f7c3aab0 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/spatio.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/spatio.rsi/meta.json @@ -1,34 +1,41 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Original by Emisse, modified by EmoGarbage404. Vox state made by Flareguy for SS14", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" - }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-vox", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-harpy", - "directions": 4 - } - ] -} \ No newline at end of file +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Original by Emisse, modified by EmoGarbage404. Vox state made by Flareguy for SS14, lamia & segment by @noctyrnal", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, + { + "name": "inhand-left", + "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/spatio.rsi/segment.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/spatio.rsi/segment.png new file mode 100644 index 00000000000..68fc755c56d 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 00000000000..040ad09939c 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 30830125099..604295fedeb 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/fb2d71495bfe81446159ef528534193d09dd8d34, equipped-OUTERCLOTHING-monkey made by Dutch-VanDerLinde, vox state made by Flareguy for SS14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/fb2d71495bfe81446159ef528534193d09dd8d34, equipped-OUTERCLOTHING-monkey made by Dutch-VanDerLinde, vox state made by Flareguy for SS14, lamia & segment by @noctyrnal", "size": { "x": 32, "y": 32 @@ -27,12 +27,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 00000000000..1a9469334f3 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 00000000000..ccf53e302b0 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 3744e040b68..ac3d8c78679 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/meta.json @@ -1,34 +1,41 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from vg at commit https://github.com/vgstation-coders/vgstation13/commit/a16e41020a93479e9a7e2af343b1b74f7f2a61bd. Vox state made by Flareguy for SS14", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" - }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-vox", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-harpy", - "directions": 4 - } - ] -} \ No newline at end of file +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from vg at commit https://github.com/vgstation-coders/vgstation13/commit/a16e41020a93479e9a7e2af343b1b74f7f2a61bd. Vox state made by Flareguy for SS14, lamia & segment by @noctyrnal", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, + { + "name": "inhand-left", + "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/syndiecommander.rsi/segment.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/segment.png new file mode 100644 index 00000000000..1a9469334f3 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 00000000000..bfbbece8c47 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 cde1c059777..0b252abcaa3 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/meta.json @@ -1,34 +1,41 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from vg at commit https://github.com/vgstation-coders/vgstation13/commit/a16e41020a93479e9a7e2af343b1b74f7f2a61bd, harpy by VMSolidus. Vox state made by Flareguy for SS14", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" - }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-harpy", - "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-vox", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] -} +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from vg at commit https://github.com/vgstation-coders/vgstation13/commit/a16e41020a93479e9a7e2af343b1b74f7f2a61bd, harpy by VMSolidus. Vox state made by Flareguy for SS14,lamia & segment by @noctyrnal", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "segment" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-harpy", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-lamia", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "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 00000000000..713ca5714a2 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 00000000000..b740adfdb20 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 2026bba8931..0a6055eb682 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Based on tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, modified by EmoGarbage404 (github), harpy by VMSolidus. Vox state made by Flareguy for SS14", + "copyright": "Based on tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, modified by EmoGarbage404 (github), harpy by VMSolidus. Vox state made by Flareguy for SS14, lamia & segment by @noctyrnal", "size": { "x": 32, "y": 32 @@ -29,6 +29,13 @@ { "name": "equipped-OUTERCLOTHING-harpy", "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-lamia", + "directions": 4 + }, + { + "name": "segment" } ] } \ No newline at end of file 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 00000000000..0687aa9d0d7 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 15aef26a56c..e5f6f71fae1 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/wizard.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/wizard.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/wizard.rsi/segment.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/wizard.rsi/segment.png new file mode 100644 index 00000000000..c97ab674f25 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 3a71879affb..0811530b9e6 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 00000000000..c97ab674f25 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 00000000000..72f2f4b76b2 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 b05021b6c0c..91bc83206a4 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 00000000000..3a2b136ebd9 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 00000000000..a5d1135deed 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 669e1d98574..53cffebfe70 100644 --- a/Resources/Textures/Clothing/OuterClothing/Suits/bombsuit.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Suits/bombsuit.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/760f0be7af33a31f5a08a3291864e91539d0ebb7. Vox state made by Flareguy for Space Station 14", + "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/760f0be7af33a31f5a08a3291864e91539d0ebb7. Vox state made by Flareguy for Space Station 14, lamia & segment by @noctyrnal, harpy by VMSolidus", "size": { "x": 32, "y": 32 @@ -18,6 +18,13 @@ "name": "equipped-OUTERCLOTHING-harpy", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-lamia", + "directions": 4 + }, + { + "name": "segment" + }, { "name": "equipped-OUTERCLOTHING-vox", "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 00000000000..bc07da7e782 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 00000000000..b0e720f3bee 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 136d76ea97e..daffce6aade 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 @@ -26,6 +26,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 00000000000..5a21938ecac 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 00000000000..c606944fb0c 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 87ae5d0fb0a..4df179221f8 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": "equipped-OUTERCLOTHING-vox", "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 00000000000..b2cf94d4cfc 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 00000000000..c5f1a4d41a8 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 510a3431afe..2ae3f5104f0 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 @@ -26,6 +26,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 00000000000..4ab04aee991 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 00000000000..5331e68d1c5 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 510a3431afe..2ae3f5104f0 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 @@ -26,6 +26,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 00000000000..1a6df55d050 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 00000000000..979a4eb20e5 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 5edb3774090..7a279ac85f6 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. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, harpy edit by VMSolidus. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79, 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": "equipped-OUTERCLOTHING-vox", "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 00000000000..3764a4fa05d 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 00000000000..c7a776d9589 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 e3387cff968..bfa56655e4e 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. Vox state made by Flareguy for Space Station 14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, harpy edit by VMSolidus. Vox state made by Flareguy for Space Station 14, 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": "equipped-OUTERCLOTHING-vox", "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 00000000000..53c50d2d56d 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 00000000000..3b500a50468 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 0174b889d2e..d057b887bfe 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 00000000000..fbfe73d7214 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 00000000000..172cf756a47 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 4844e816bd1..cf10d74aedc 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 00000000000..c97ab674f25 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 00000000000..9788b33baf0 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 4844e816bd1..cf10d74aedc 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 00000000000..481ab8594d0 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 00000000000..7b79d271d54 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 4844e816bd1..cf10d74aedc 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 00000000000..481ab8594d0 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 00000000000..5cef9a52822 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 4844e816bd1..cf10d74aedc 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 00000000000..c97ab674f25 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 00000000000..850956e6894 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 4844e816bd1..cf10d74aedc 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 00000000000..481ab8594d0 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 00000000000..454939d731a 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 4844e816bd1..cf10d74aedc 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 00000000000..c97ab674f25 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 00000000000..65a4ecba00f 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 4844e816bd1..cf10d74aedc 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 00000000000..c97ab674f25 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 00000000000..6591584869d 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 4844e816bd1..cf10d74aedc 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 00000000000..481ab8594d0 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 00000000000..0a9c6f02cc6 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 00000000000..1c7bb9e8649 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 00000000000..826c099ab85 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 00000000000..a6d4bd5f2b8 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 00000000000..9b26288a268 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 00000000000..2871eb45d88 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 00000000000..5374b72d74e --- /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 00000000000..b9c86c5b991 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 00000000000..7a37e083a7f 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 00000000000..9a9abed6ab4 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 00000000000..404f932b64e 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 00000000000..f0d9b5741b1 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 00000000000..43c92d9fa43 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 00000000000..33f624d503a 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 00000000000..f1de5695c5a 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 00000000000..21662209921 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 00000000000..8429e7fb181 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 00000000000..488040b0c14 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 00000000000..1bcf2e505a1 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 00000000000..680ec3009a5 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 00000000000..6c1a2dcc19b 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 00000000000..2670821090f 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 00000000000..f68f0c4f15f 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 00000000000..6b99414d0be 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 00000000000..2e4a031f151 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 00000000000..ef4dbcb08b8 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 00000000000..6899cccab7c 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 00000000000..44aae3c0bfb 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 00000000000..583346556e1 --- /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 00000000000..5a68c6fd861 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 00000000000..2ca0dc67f15 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 00000000000..bb29391fa06 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 00000000000..90d69223b6d 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 00000000000..36b91148162 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 00000000000..f91dae519af 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 00000000000..7c8da637caf 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 00000000000..2dc53776594 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 00000000000..bc8f7bf9cae 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 00000000000..a84ef88da87 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 00000000000..c18e5545414 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 00000000000..70b91d88244 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 00000000000..1d0c791e388 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 00000000000..77e463d02f2 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 00000000000..96b96b566bf 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 00000000000..efe3ad8b539 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 00000000000..978e01358f9 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 00000000000..5f5d390792b 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 00000000000..7f8cda0f96d --- /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 00000000000..bf711ef3044 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 00000000000..01a2143a397 --- /dev/null +++ b/Resources/Textures/Nyanotrasen/Mobs/Species/lamia.rsi/meta.json @@ -0,0 +1,39 @@ +{ + "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": "segment" + }, + { + "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 00000000000..e0cb4814daf 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/segment.png b/Resources/Textures/Nyanotrasen/Mobs/Species/lamia.rsi/segment.png new file mode 100644 index 00000000000..09fa419f459 Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Mobs/Species/lamia.rsi/segment.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 00000000000..a7e023d96b8 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 00000000000..f818a478944 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 00000000000..f818a478944 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 00000000000..edc457a79b7 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 00000000000..4511cbd21fd Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Mobs/Species/lamia.rsi/verbiconfangs.png differ