diff --git a/Content.Client/DeltaV/Lamiae/ClientLamiaVisuals.cs b/Content.Client/DeltaV/Lamiae/ClientLamiaVisuals.cs deleted file mode 100644 index 8b9f3b4c47..0000000000 --- a/Content.Client/DeltaV/Lamiae/ClientLamiaVisuals.cs +++ /dev/null @@ -1,42 +0,0 @@ -/* -* Delta-V - This file is licensed under AGPLv3 -* Copyright (c) 2024 Delta-V Contributors -* See AGPLv3.txt for details. -*/ - -using Robust.Client.GameObjects; -using System.Numerics; -using Content.Shared.DeltaV.Lamiae; - -namespace Content.Client.DeltaV.Lamiae; - -public sealed class ClientLamiaVisualSystem : VisualizerSystem -{ - - public override void Initialize() - { - base.Initialize(); - - SubscribeLocalEvent(OnAppearanceChange); - } - private void OnAppearanceChange(EntityUid uid, LamiaSegmentComponent component, ref AppearanceChangeEvent args) - { - if (args.Sprite == null) return; - - if (AppearanceSystem.TryGetData(uid, ScaleVisuals.Scale, out var scale) && TryComp(uid, out var sprite)) - { - sprite.Scale = (new Vector2(scale, scale)); - } - - if (AppearanceSystem.TryGetData(uid, LamiaSegmentVisualLayers.Armor, out var worn) - && AppearanceSystem.TryGetData(uid, LamiaSegmentVisualLayers.ArmorRsi, out var path)) - { - var valid = !string.IsNullOrWhiteSpace(path); - if (valid) - { - args.Sprite.LayerSetRSI(LamiaSegmentVisualLayers.Armor, path); - } - args.Sprite.LayerSetVisible(LamiaSegmentVisualLayers.Armor, worn); - } - } -} diff --git a/Content.Client/DeltaV/Lamiae/LamiaSegmentVisualsComponent.cs b/Content.Client/DeltaV/Lamiae/LamiaSegmentVisualsComponent.cs deleted file mode 100644 index d2d519e2c8..0000000000 --- a/Content.Client/DeltaV/Lamiae/LamiaSegmentVisualsComponent.cs +++ /dev/null @@ -1,11 +0,0 @@ -/* -* Delta-V - This file is licensed under AGPLv3 -* Copyright (c) 2024 Delta-V Contributors -* See AGPLv3.txt for details. -*/ - -namespace Content.Client.DeltaV.Lamiae; - -[RegisterComponent] -public sealed partial class LamiaSegmentVisualsComponent : Component -{} diff --git a/Content.Server/DeltaV/Lamiae/LamiaSystem.cs b/Content.Server/DeltaV/Lamiae/LamiaSystem.cs deleted file mode 100644 index 5a413e7bb2..0000000000 --- a/Content.Server/DeltaV/Lamiae/LamiaSystem.cs +++ /dev/null @@ -1,292 +0,0 @@ -using Robust.Shared.Physics; -using Content.Shared.Damage; -using Content.Shared.Explosion; -using Content.Shared.Clothing.Components; -using Content.Shared.Humanoid; -using Content.Shared.Humanoid.Markings; -using Content.Server.Humanoid; -using Content.Shared.Inventory.Events; -using Content.Shared.Tag; -using Content.Shared.Teleportation.Components; -using Content.Shared.Storage.Components; -using Robust.Shared.Containers; -using Robust.Shared.Map; -using Robust.Shared.Physics.Systems; -using Robust.Shared.Physics.Components; -using System.Numerics; -using Content.Shared.DeltaV.Lamiae; -using Robust.Shared.Physics.Events; -using Content.Shared.Projectiles; -using Content.Shared.Weapons.Ranged.Events; -using System.Linq; - -namespace Content.Server.DeltaV.Lamiae -{ - public sealed partial class LamiaSystem : EntitySystem - { - [Dependency] private readonly SharedJointSystem _jointSystem = default!; - [Dependency] private readonly HumanoidAppearanceSystem _humanoid = default!; - [Dependency] private readonly DamageableSystem _damageableSystem = default!; - [Dependency] private readonly TagSystem _tagSystem = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - - [ValidatePrototypeId] - private const string LamiaHardsuitTag = "AllowLamiaHardsuit"; - - Queue<(LamiaSegmentComponent segment, EntityUid lamia)> _segments = new(); - public override void Update(float frameTime) - { - 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 - - var ev = new SegmentSpawnedEvent(segment.lamia); - RaiseLocalEvent(segmentUid, ev, false); - - if (segment.segment.SegmentNumber == 1) - { - Transform(segmentUid).Coordinates = Transform(attachedUid).Coordinates; - var revoluteJoint = _jointSystem.CreateWeldJoint(attachedUid, segmentUid, id: "Segment" + segment.segment.SegmentNumber + segment.segment.Lamia); - revoluteJoint.CollideConnected = false; - } - if (segment.segment.SegmentNumber <= segment.segment.MaxSegments) - Transform(segmentUid).Coordinates = Transform(attachedUid).Coordinates.Offset(new Vector2(0, segment.segment.OffsetSwitching)); - else - Transform(segmentUid).Coordinates = Transform(attachedUid).Coordinates.Offset(new Vector2(0, segment.segment.OffsetSwitching)); - - var joint = _jointSystem.CreateDistanceJoint(attachedUid, segmentUid, id: ("Segment" + segment.segment.SegmentNumber + segment.segment.Lamia)); - joint.CollideConnected = false; - joint.Stiffness = 0.2f; - } - _segments.Clear(); - } - public override void Initialize() - { - base.Initialize(); - SubscribeLocalEvent(OnInit); - SubscribeLocalEvent(OnShutdown); - SubscribeLocalEvent(OnJointRemoved); - SubscribeLocalEvent(OnRemovedFromContainer); - SubscribeLocalEvent(OnShootHitscan); - SubscribeLocalEvent(OnSegmentSpawned); - SubscribeLocalEvent(HandleDamageTransfer); - SubscribeLocalEvent(HandleSegmentDamage); - SubscribeLocalEvent(OnLamiaStorageInsertAttempt); - SubscribeLocalEvent(OnSegmentStorageInsertAttempt); - SubscribeLocalEvent(OnDidEquipEvent); - SubscribeLocalEvent(OnDidUnequipEvent); - SubscribeLocalEvent(OnSnekBoom); - SubscribeLocalEvent(PreventShootSelf); - } - - /// - /// Handles transferring marking selections to the tail segments. Every tail marking must be repeated 2 times in order for this script to work. - /// - /// - /// - /// - // TODO: Please for the love of god don't make me write a test to validate that every marking also has its matching segment states. - // Future contributors will just find out when their game crashes because they didn't make a marking-segment. - private void OnSegmentSpawned(EntityUid uid, LamiaSegmentComponent component, SegmentSpawnedEvent args) - { - component.Lamia = args.Lamia; - - if (!TryComp(uid, out var species)) return; - if (!TryComp(args.Lamia, out var humanoid)) return; - if (!TryComp(uid, out var appearance)) return; - - _appearance.SetData(uid, ScaleVisuals.Scale, component.ScaleFactor, appearance); - - if (humanoid.MarkingSet.TryGetCategory(MarkingCategories.Tail, out var tailMarkings)) - { - foreach (var markings in tailMarkings) - { - var segmentId = species.Species; - var markingId = markings.MarkingId; - string segmentmarking = $"{markingId}-{segmentId}"; - _humanoid.AddMarking(uid, segmentmarking, markings.MarkingColors); - } - } - } - - private void OnInit(EntityUid uid, LamiaComponent component, ComponentInit args) - { - Math.Clamp(component.NumberOfSegments, 2, 18); - Math.Clamp(component.TaperOffset, 1, component.NumberOfSegments - 1); - SpawnSegments(uid, component); - } - - private void OnShutdown(EntityUid uid, LamiaComponent component, ComponentShutdown args) - { - foreach (var segment in component.Segments) - { - QueueDel(segment); - } - - component.Segments.Clear(); - } - - private void OnJointRemoved(EntityUid uid, LamiaComponent component, JointRemovedEvent args) - { - if (!component.Segments.Contains(args.OtherEntity)) - return; - - foreach (var segment in component.Segments) - QueueDel(segment); - - component.Segments.Clear(); - } - - private void OnRemovedFromContainer(EntityUid uid, LamiaComponent component, EntGotRemovedFromContainerMessage args) - { - if (component.Segments.Count != 0) - { - foreach (var segment in component.Segments) - QueueDel(segment); - component.Segments.Clear(); - } - - SpawnSegments(uid, component); - } - - private void HandleSegmentDamage(EntityUid uid, LamiaSegmentComponent component, DamageModifyEvent args) - { - if (args.Origin == component.Lamia) - args.Damage *= 0; - args.Damage = args.Damage / component.DamageModifyFactor; - } - private void HandleDamageTransfer(EntityUid uid, LamiaSegmentComponent component, DamageChangedEvent args) - { - if (args.DamageDelta == null) return; - _damageableSystem.TryChangeDamage(component.Lamia, args.DamageDelta); - } - - public void SpawnSegments(EntityUid uid, LamiaComponent component) - { - int i = 1; - var addTo = uid; - while (i <= component.NumberOfSegments + 1) - { - var segment = AddSegment(addTo, uid, component, i); - addTo = segment; - i++; - } - } - - private EntityUid AddSegment(EntityUid segmentuid, EntityUid parentuid, LamiaComponent lamiaComponent, int segmentNumber) - { - LamiaSegmentComponent segmentComponent = new(); - segmentComponent.Lamia = parentuid; - segmentComponent.AttachedToUid = segmentuid; - segmentComponent.DamageModifierConstant = lamiaComponent.NumberOfSegments * lamiaComponent.DamageModifierOffset; - float damageModifyCoefficient = segmentComponent.DamageModifierConstant / lamiaComponent.NumberOfSegments; - segmentComponent.DamageModifyFactor = segmentComponent.DamageModifierConstant * damageModifyCoefficient; - segmentComponent.ExplosiveModifyFactor = 1 / segmentComponent.DamageModifyFactor / (lamiaComponent.NumberOfSegments * lamiaComponent.ExplosiveModifierOffset); - - float taperConstant = lamiaComponent.NumberOfSegments - lamiaComponent.TaperOffset; - EntityUid segment; - if (segmentNumber == 1) - segment = EntityManager.SpawnEntity(lamiaComponent.InitialSegmentId, Transform(segmentuid).Coordinates); - else - segment = EntityManager.SpawnEntity(lamiaComponent.SegmentId, Transform(segmentuid).Coordinates); - if (segmentNumber >= taperConstant && lamiaComponent.UseTaperSystem == true) - { - segmentComponent.OffsetSwitching = lamiaComponent.StaticOffset * MathF.Pow(lamiaComponent.OffsetConstant, segmentNumber - taperConstant); - segmentComponent.ScaleFactor = lamiaComponent.StaticScale * MathF.Pow(1f / lamiaComponent.OffsetConstant, segmentNumber - taperConstant); - } - else - { - segmentComponent.OffsetSwitching = lamiaComponent.StaticOffset; - segmentComponent.ScaleFactor = lamiaComponent.StaticScale; - } - if (segmentNumber % 2 != 0) - { - segmentComponent.OffsetSwitching *= -1; - } - - segmentComponent.Owner = segment; - segmentComponent.SegmentNumber = segmentNumber; - EntityManager.AddComponent(segment, segmentComponent, true); - EnsureComp(segment); - _segments.Enqueue((segmentComponent, parentuid)); - lamiaComponent.Segments.Add(segment); - return segment; - } - - private void OnLamiaStorageInsertAttempt(EntityUid uid, LamiaComponent comp, ref InsertIntoEntityStorageAttemptEvent args) - { - args.Cancelled = true; - } - - private void OnSegmentStorageInsertAttempt(EntityUid uid, LamiaSegmentComponent comp, ref InsertIntoEntityStorageAttemptEvent args) - { - args.Cancelled = true; - } - - private void OnDidEquipEvent(EntityUid equipee, LamiaComponent component, DidEquipEvent args) - { - if (!TryComp(args.Equipment, out var clothing)) return; - if (args.Slot == "outerClothing" && _tagSystem.HasTag(args.Equipment, LamiaHardsuitTag)) - { - foreach (var uid in component.Segments) - { - if (!TryComp(uid, out var appearance)) return; - _appearance.SetData(uid, LamiaSegmentVisualLayers.Armor, true, appearance); - if (clothing.RsiPath == null) return; - _appearance.SetData(uid, LamiaSegmentVisualLayers.ArmorRsi, clothing.RsiPath, appearance); - } - } - } - - private void OnSnekBoom(EntityUid uid, LamiaSegmentComponent component, ref GetExplosionResistanceEvent args) - { - args.DamageCoefficient = component.ExplosiveModifyFactor; - } - - private void OnDidUnequipEvent(EntityUid equipee, LamiaComponent component, DidUnequipEvent args) - { - if (args.Slot == "outerClothing" && _tagSystem.HasTag(args.Equipment, LamiaHardsuitTag)) - { - foreach (var uid in component.Segments) - { - if (!TryComp(uid, out var appearance)) return; - _appearance.SetData(uid, LamiaSegmentVisualLayers.Armor, false, appearance); - } - } - } - - private void PreventShootSelf(EntityUid uid, LamiaSegmentComponent component, ref PreventCollideEvent args) - { - if (!TryComp(args.OtherEntity, out var projectileComponent)) return; - - if (projectileComponent.Shooter == component.Lamia) - { - args.Cancelled = true; - } - } - - private void OnShootHitscan(EntityUid uid, LamiaComponent component, ref HitScanAfterRayCastEvent args) - { - if (args.RayCastResults == null) return; - - var entityList = new List(); - foreach (var entity in args.RayCastResults) - { - if (!component.Segments.Contains(entity.HitEntity)) - entityList.Add(entity); - } - args.RayCastResults = entityList; - } - } -} diff --git a/Content.Server/Teleportation/PortalSystem.cs b/Content.Server/Teleportation/PortalSystem.cs index 27fec27435..76900a7e19 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 69dd9626d5..fbc46f5917 100644 --- a/Content.Server/Weapons/Ranged/Systems/GunSystem.cs +++ b/Content.Server/Weapons/Ranged/Systems/GunSystem.cs @@ -203,13 +203,7 @@ public override void Shoot(EntityUid gunUid, GunComponent gun, List<(EntityUid? if (!rayCastResults.Any()) break; - var raycastEvent = new HitScanAfterRayCastEvent(rayCastResults); - RaiseLocalEvent(lastUser, ref raycastEvent); - - if (raycastEvent.RayCastResults == null) - break; - - var result = raycastEvent.RayCastResults[0]; + var result = rayCastResults[0]; var hit = result.HitEntity; lastHit = hit; diff --git a/Content.Shared/DeltaV/Lamiae/LamiaComponent.cs b/Content.Shared/DeltaV/Lamiae/LamiaComponent.cs deleted file mode 100644 index bc70724404..0000000000 --- a/Content.Shared/DeltaV/Lamiae/LamiaComponent.cs +++ /dev/null @@ -1,84 +0,0 @@ -/* -* Delta-V - This file is licensed under AGPLv3 -* Copyright (c) 2024 Delta-V Contributors -* See AGPLv3.txt for details. -*/ - -namespace Content.Shared.DeltaV.Lamiae -{ - /// - /// Controls initialization of any Multi-segmented entity - /// - [RegisterComponent] - public sealed partial class LamiaComponent : Component - { - /// - /// A list of each UID attached to the Lamia, in order of spawn - /// - [DataField("segments")] - public List Segments = new(); - - /// - /// A clamped variable that represents the number of segments to be spawned - /// - [DataField("numberOfSegments")] - public int NumberOfSegments = 18; - - /// - /// If UseTaperSystem is true, this constant represents the rate at which a segmented entity will taper towards the tip. Tapering is on a logarithmic scale, and will asymptotically approach 0. - /// - [DataField("offsetConstant")] - public float OffsetConstant = 1.03f; - - /// - /// Represents the prototype used to parent all segments - /// - [DataField("initialSegmentId")] - public string InitialSegmentId = "LamiaInitialSegment"; - - /// - /// Represents the segment prototype to be spawned - /// - [DataField("SegmentId")] - public string SegmentId = "LamiaSegment"; - - /// - /// Toggles the tapering system on and off. When false, segmented entities will have a constant width. - /// - [DataField("useTaperSystem")] - public bool UseTaperSystem = true; - - /// - /// The standard distance between the centerpoint of each segment. - /// - [DataField("staticOffset")] - public float StaticOffset = 0.15f; - - /// - /// The standard sprite scale of each segment. - /// - [DataField("staticScale")] - public float StaticScale = 1f; - - /// - /// Used to more finely tune how much damage should be transfered from tail to body. - /// - [DataField("damageModifierOffset")] - public float DamageModifierOffset = 0.4f; - - /// - /// A clamped variable that represents how far from the tip should tapering begin. - /// - [DataField("taperOffset")] - public int TaperOffset = 18; - - /// - /// Coefficient used to finely tune how much explosion damage should be transfered to the body. This is calculated multiplicatively with the derived damage modifier set. - /// - [DataField("explosiveModifierOffset")] - public float ExplosiveModifierOffset = 0.1f; - - [DataField("bulletPassover")] - public bool BulletPassover = true; - } -} diff --git a/Content.Shared/DeltaV/Lamiae/LamiaSegmentComponent.cs b/Content.Shared/DeltaV/Lamiae/LamiaSegmentComponent.cs deleted file mode 100644 index 37d21ae6f6..0000000000 --- a/Content.Shared/DeltaV/Lamiae/LamiaSegmentComponent.cs +++ /dev/null @@ -1,35 +0,0 @@ -/* -* Delta-V - This file is licensed under AGPLv3 -* Copyright (c) 2024 Delta-V Contributors -* See AGPLv3.txt for details. -*/ - -using Robust.Shared.GameStates; - -namespace Content.Shared.DeltaV.Lamiae -{ - /// - /// Lamia segment - /// - [RegisterComponent] - [NetworkedComponent] - public sealed partial class LamiaSegmentComponent : Component - { - [DataField("AttachedToUid")] - public EntityUid AttachedToUid = default!; - public float DamageModifyFactor = default!; - public float OffsetSwitching = default!; - public float ScaleFactor = default!; - [DataField("DamageModifierCoefficient")] - public float DamageModifierCoefficient = default!; - public float ExplosiveModifyFactor = default!; - public float OffsetConstant = default!; - [DataField("Lamia")] - public EntityUid Lamia = default!; - public int MaxSegments = default!; - public int SegmentNumber = default!; - public float DamageModifierConstant = default!; - [DataField("segmentId")] - public string? segmentId; - } -} diff --git a/Content.Shared/DeltaV/Lamiae/LamiaSegmentVisuals.cs b/Content.Shared/DeltaV/Lamiae/LamiaSegmentVisuals.cs deleted file mode 100644 index 2d73dd746e..0000000000 --- a/Content.Shared/DeltaV/Lamiae/LamiaSegmentVisuals.cs +++ /dev/null @@ -1,18 +0,0 @@ -/* -* Delta-V - This file is licensed under AGPLv3 -* Copyright (c) 2024 Delta-V Contributors -* See AGPLv3.txt for details. -*/ - -using Robust.Shared.Serialization; - -namespace Content.Shared.DeltaV.Lamiae -{ - [Serializable, NetSerializable] - public enum LamiaSegmentVisualLayers - { - Tail, - Armor, - ArmorRsi, - } -} diff --git a/Content.Shared/DeltaV/Lamiae/SharedLamiaeSystem.cs b/Content.Shared/DeltaV/Lamiae/SharedLamiaeSystem.cs deleted file mode 100644 index de66e5d530..0000000000 --- a/Content.Shared/DeltaV/Lamiae/SharedLamiaeSystem.cs +++ /dev/null @@ -1,17 +0,0 @@ -/* -* Delta-V - This file is licensed under AGPLv3 -* Copyright (c) 2024 Delta-V Contributors -* See AGPLv3.txt for details. -*/ - -namespace Content.Shared.DeltaV.Lamiae; - -public sealed class SegmentSpawnedEvent : EntityEventArgs -{ - public EntityUid Lamia = default!; - - public SegmentSpawnedEvent(EntityUid lamia) - { - Lamia = lamia; - } -} diff --git a/Content.Shared/Roles/StartingGearPrototype.cs b/Content.Shared/Roles/StartingGearPrototype.cs index 32b72aaeed..0ff65617bc 100644 --- a/Content.Shared/Roles/StartingGearPrototype.cs +++ b/Content.Shared/Roles/StartingGearPrototype.cs @@ -43,7 +43,6 @@ 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/Teleportation/Components/PortalExemptComponent.cs b/Content.Shared/Teleportation/Components/PortalExemptComponent.cs deleted file mode 100644 index 28043808e0..0000000000 --- a/Content.Shared/Teleportation/Components/PortalExemptComponent.cs +++ /dev/null @@ -1,8 +0,0 @@ -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 7e1124cef7..8d67aec518 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,9 +83,6 @@ 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/Melee/SharedMeleeWeaponSystem.cs b/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs index 1c02aefd89..e59b4a13fe 100644 --- a/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs +++ b/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs @@ -566,7 +566,7 @@ private bool DoHeavyAttack(EntityUid user, HeavyAttackEvent ev, EntityUid meleeU return true; } - + // Naughty input if (entities.Count > MaxTargets) { diff --git a/Content.Shared/Weapons/Ranged/Events/HitScanAfterRayCastEvent.cs b/Content.Shared/Weapons/Ranged/Events/HitScanAfterRayCastEvent.cs deleted file mode 100644 index 99bfd1eabc..0000000000 --- a/Content.Shared/Weapons/Ranged/Events/HitScanAfterRayCastEvent.cs +++ /dev/null @@ -1,17 +0,0 @@ -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 deleted file mode 100644 index eea73f1e68..0000000000 --- a/Resources/Prototypes/DeltaV/Datasets/Names/cyno_female.yml +++ /dev/null @@ -1,41 +0,0 @@ -- 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 deleted file mode 100644 index 3ed9f62f11..0000000000 --- a/Resources/Prototypes/DeltaV/Datasets/Names/cyno_last.yml +++ /dev/null @@ -1,40 +0,0 @@ -- 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 deleted file mode 100644 index ca72b07fd9..0000000000 --- a/Resources/Prototypes/DeltaV/Datasets/Names/cyno_male.yml +++ /dev/null @@ -1,22 +0,0 @@ -- 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 deleted file mode 100644 index 65af873fe6..0000000000 --- a/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/lamia.yml +++ /dev/null @@ -1,16 +0,0 @@ -# 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 deleted file mode 100644 index 432b2ee841..0000000000 --- a/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/lamiasegment.yml +++ /dev/null @@ -1,16 +0,0 @@ -# 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 deleted file mode 100644 index 1f5397e5dc..0000000000 --- a/Resources/Prototypes/DeltaV/Entities/Mobs/Player/lamia.yml +++ /dev/null @@ -1,39 +0,0 @@ -# Delta-V - This file is licensed under AGPLv3 -# Copyright (c) 2024 Delta-V Contributors -# See AGPLv3.txt for details. - -- type: entity - save: false - name: Urist McNoodle - parent: MobLamiaBase - id: MobLamia - description: A miserable pile of scales. - components: - - type: CombatMode - - type: InteractionPopup - successChance: 1 - interactSuccessString: hugging-success-generic - interactSuccessSound: /Audio/Effects/thudswoosh.ogg - messagePerceivedByOthers: hugging-success-generic-others - - type: Mind - - type: Input - context: "human" - - type: MobMover - - type: InputMover - - type: Respirator - damage: - types: - Asphyxiation: 1.5 - damageRecovery: - types: - Asphyxiation: -1.5 - - type: Alerts - - type: Actions - - type: Eye - - type: CameraRecoil - - type: Examiner - - type: CanHostGuardian - - type: NpcFactionMember - factions: - - NanoTrasen - - type: PotentialPsionic diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/lamia.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Species/lamia.yml deleted file mode 100644 index d7cb856e29..0000000000 --- a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/lamia.yml +++ /dev/null @@ -1,284 +0,0 @@ -# Delta-V - This file is licensed under AGPLv3 -# Copyright (c) 2024 Delta-V Contributors -# See AGPLv3.txt for details. - -- type: entity - save: false - name: Lamia - parent: BaseMobHuman #parenting human so I can remove most of these components - id: MobLamiaBase - abstract: true - description: A miserable pile of scales. #TODO: Add a better description - components: - - type: Flashable - - type: Polymorphable - - type: Identity - - type: Hands - - type: HumanoidAppearance - species: Lamia - - type: MovementSpeedModifier - baseWalkSpeed : 4 - baseSprintSpeed : 6 - - type: MovedByPressure - - type: Hunger - - type: Thirst - - type: IdExaminable - - type: Inventory - speciesId: lamia - templateId: lamia - - type: HealthExaminable - examinableTypes: - - Blunt - - Slash - - Piercing - - Heat - - Shock - - type: Stamina - - type: Blindable - - type: Clickable - - type: InteractionOutline - - type: InteractionPopup - successChance: 0.5 - interactSuccessString: petting-success-lamia - interactFailureString: petting-failure-lamia - interactSuccessSpawn: EffectHearts - interactSuccessSound: - path: /Audio/Animals/lizard_happy.ogg #placeholder sound - interactFailureSound: - path: /Audio/Animals/snake_hiss.ogg #placeholder sound - - type: Icon - sprite: Mobs/Species/Human/parts.rsi - state: full - - type: Physics - bodyType: KinematicController - - type: Tag - tags: - - CanPilot - - DoorBumpOpener - - ShoesRequiredStepTriggerImmune - - type: Sprite - netsync: false - noRot: true - drawdepth: Mobs - scale: 1, 1 - layers: #TODO: manually fix these layers - - map: [ "enum.HumanoidVisualLayers.Chest" ] - color: "#e8b59b" - sprite: Nyanotrasen/Mobs/Species/lamia.rsi - state: torso_m - - map: [ "enum.HumanoidVisualLayers.Head" ] - color: "#e8b59b" - sprite: Mobs/Species/Human/parts.rsi - state: head_m - - map: [ "enum.HumanoidVisualLayers.Eyes" ] - color: "#008800" - sprite: Mobs/Customization/eyes.rsi - state: eyes - - map: [ "enum.HumanoidVisualLayers.RArm" ] - color: "#e8b59b" - sprite: Mobs/Species/Human/parts.rsi - state: r_arm - - map: [ "enum.HumanoidVisualLayers.LArm" ] - color: "#e8b59b" - sprite: Mobs/Species/Human/parts.rsi - state: l_arm - - map: [ "enum.HumanoidVisualLayers.Tail" ] - - map: [ "jumpsuit" ] - - map: [ "enum.HumanoidVisualLayers.LHand" ] - color: "#e8b59b" - sprite: Mobs/Species/Human/parts.rsi - state: l_hand - - map: [ "enum.HumanoidVisualLayers.RHand" ] - color: "#e8b59b" - sprite: Mobs/Species/Human/parts.rsi - state: r_hand - - map: [ "enum.HumanoidVisualLayers.Handcuffs" ] - color: "#ffffff" - sprite: Objects/Misc/handcuffs.rsi - state: body-overlay-2 - visible: false - - map: [ "id" ] - - map: [ "gloves" ] - - map: [ "ears" ] - - map: [ "outerClothing" ] - - map: [ "eyes" ] - - map: [ "belt" ] - - map: [ "belt2" ] - - map: [ "neck" ] - - map: [ "back" ] - - map: [ "enum.HumanoidVisualLayers.Hair" ] - state: bald - sprite: Mobs/Customization/human_hair.rsi - - map: [ "mask" ] - - map: [ "head" ] - - map: [ "pocket1" ] - - map: [ "pocket2" ] - - map: [ "enum.HumanoidVisualLayers.HeadTop" ] - - type: Damageable - damageContainer: Biological - damageModifierSet: Scale #TODO: make a new damage modifier set - - type: NoSlip - - type: Internals - - type: MobState - - type: DamageVisuals - thresholds: [ 60, 120, 200 ] #these values aren't final, adjust accordingly with thresholds above' - targetLayers: - - "enum.HumanoidVisualLayers.Chest" - - "enum.HumanoidVisualLayers.Head" - - "enum.HumanoidVisualLayers.LArm" - - "enum.HumanoidVisualLayers.RArm" - damageOverlayGroups: - Brute: - sprite: Nyanotrasen/Mobs/Effects/Lamia/brute_damage.rsi - color: "#FF0000" - Burn: - sprite: Nyanotrasen/Mobs/Effects/Lamia/burn_damage.rsi - - type: MobThresholds - thresholds: - 0: Alive - 200: Critical #these values aren't final' - 300: Dead #these values aren't final' - - type: SlowOnDamage - speedModifierThresholds: #these values aren't final, adjust accordingly with thresholds above' - 60: 0.9 - 80: 0.8 - 100: 0.7 - 120: 0.6 - 140: 0.5 - - type: FireVisuals - sprite: Mobs/Effects/onfire.rsi - normalState: Generic_mob_burning - alternateState: Standing - fireStackAlternateState: 3 - - type: CombatMode - - type: Climbing - - type: Cuffable - - type: AnimationPlayer - - type: MeleeWeapon #This damage is most likely final - soundHit: - path: /Audio/Items/hypospray.ogg #this sound is not final, but is a pretty good placeholder so we might keep it - animation: WeaponArcBite - damage: - types: - Piercing: 1 - Poison: 2 - Asphyxiation: 2 - - type: SolutionContainerManager - solutions: - melee: - maxVol: 30 - - type: SolutionRegeneration - solution: melee - generated: - reagents: - - ReagentId: SpaceDrugs - Quantity: 1 - - type: MeleeChemicalInjector - solution: melee - transferAmount: 3 #amount to inject is not final - - type: Pullable - - type: DoAfter - - type: CreamPied - - type: Stripping - - type: Strippable - - type: Puller - - type: Fixtures - fixtures: # TODO: This needs a second fixture just for mob collisions. - fix1: - shape: - !type:PhysShapeCircle - radius: 0.35 - density: 1000 #Density is not final, adjust accordingly if the number of tail segments is reduced or increased - restitution: 0.0 - mask: - - MobMask - layer: - - MobLayer - - type: Lamia - numberOfSegments: 18 - - type: Speech - speechSounds: Alto - - type: Vocal - - type: Emoting - - type: Grammar - attributes: - proper: true - - type: StandingState - - type: Fingerprint - - type: Perishable - - type: Bloodstream - bloodMaxVolume: 60000 - bloodlossDamage: - types: - Bloodloss: 1 - bloodlossHealDamage: - types: - Bloodloss: -1 - -- type: 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 deleted file mode 100644 index a76973e0f0..0000000000 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Species/lamia.yml +++ /dev/null @@ -1,59 +0,0 @@ -# Delta-V - This file is licensed under AGPLv3 -# Copyright (c) 2024 Delta-V Contributors -# See AGPLv3.txt for details. - -- type: entity - id: LamiaInitialSegment - save: false - noSpawn: true - components: - - type: Damageable - - type: StandingState - - type: Appearance - - type: Clickable - - type: InteractionOutline - - type: PsionicInsulation #Not a brain, target the lamia instead - - type: Physics - bodyType: KinematicController - - type: Fixtures - fixtures: # TODO: This needs a second fixture just for mob collisions. - fix1: - shape: - !type:PhysShapeCircle - radius: 0.25 - density: 80 - restitution: 0.0 - mask: - - MobMask - layer: - - MobLayer - - type: Transform - anchored: false - - type: LamiaSegmentVisuals - - type: Tag - tags: - - HideContextMenu - -- type: entity - id: LamiaSegment - save: false - parent: LamiaInitialSegment - name: lamia segment - noSpawn: true - description: A tail segment, hopefully attached to a lamia. - components: - - type: Sprite - sprite: Nyanotrasen/Mobs/Species/lamia.rsi - drawdepth: SmallMobs - layers: - - map: [ "enum.HumanoidVisualLayers.Tail" ] - - map: [ "enum.LamiaSegmentVisualLayers.Armor" ] - sprite: Clothing/OuterClothing/Hardsuits/basic.rsi - state: segment - visible: false - - type: Clickable - - type: Tag - tags: - - DoorBumpOpener - - type: HumanoidAppearance - species: LamiaSegment diff --git a/Resources/Prototypes/DeltaV/InventoryTemplates/lamia_inventory_template.yml b/Resources/Prototypes/DeltaV/InventoryTemplates/lamia_inventory_template.yml deleted file mode 100644 index 546d0746b7..0000000000 --- a/Resources/Prototypes/DeltaV/InventoryTemplates/lamia_inventory_template.yml +++ /dev/null @@ -1,112 +0,0 @@ -- 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 deleted file mode 100644 index a6cfbf90fe..0000000000 --- a/Resources/Prototypes/DeltaV/Species/lamia.yml +++ /dev/null @@ -1,68 +0,0 @@ -# Delta-V - This file is licensed under AGPLv3 -# Copyright (c) 2024 Delta-V Contributors -# See AGPLv3.txt for details. - -- type: species - id: Lamia - name: Lamia - roundStart: true - prototype: MobLamia - dollPrototype: MobLamiaDummy - sprites: MobLamiaSprites - markingLimits: MobLamiaMarkingLimits - skinColoration: HumanToned - maleFirstNames: names_cyno_male - femaleFirstNames: names_cyno_female - lastNames: names_cyno_last - sexes: - - Female - -- type: species - id: LamiaSegment - name: LamiaSegment - roundStart: false - prototype: LamiaSegment - dollPrototype: MobLamiaDummy - sprites: MobLamiaSegmentSprites - markingLimits: MobLamiaSegmentMarkingLimits - skinColoration: HumanToned - sexes: - - Female - - -- type: markingPoints - id: MobLamiaMarkingLimits - points: - Hair: - points: 1 - required: false - Tail: - points: 1 - required: true - defaultMarkings: [ LamiaBottom ] - -- type: markingPoints - id: MobLamiaSegmentMarkingLimits - points: - Tail: - points: 1 - required: false - - -- type: speciesBaseSprites - id: MobLamiaSprites - sprites: - Head: MobHumanHead - Hair: MobHumanoidAnyMarking - Chest: MobHumanTorso - Eyes: MobHumanoidEyes - LArm: MobHumanLArm - RArm: MobHumanRArm - LHand: MobHumanLHand - RHand: MobHumanRHand - Tail: MobHumanoidAnyMarking - -- type: speciesBaseSprites - id: MobLamiaSegmentSprites - sprites: - Tail: MobHumanoidAnyMarking diff --git a/Resources/Prototypes/DeltaV/tags.yml b/Resources/Prototypes/DeltaV/tags.yml index cf4e1b646b..6a1efcfa69 100644 --- a/Resources/Prototypes/DeltaV/tags.yml +++ b/Resources/Prototypes/DeltaV/tags.yml @@ -1,6 +1,4 @@ ## 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 d6029b7f1f..36327fe1f7 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml @@ -139,7 +139,6 @@ - WhitelistChameleon - HidesHarpyWings #DeltaV: Used by harpies to help render their hardsuit sprites - FullBodyOuter - - AllowLamiaHardsuit - type: Clothing equipDelay: 2.5 # Hardsuits are heavy and take a while to put on/off. unequipDelay: 2.5 @@ -163,7 +162,6 @@ 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 ce074a71f3..b81b3d1e7f 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml @@ -14,8 +14,7 @@ - SuitEVA - MonkeyWearable - WhitelistChameleon - - AllowLamiaHardsuit #DeltaV: Used by Lamia to render snek hardsuits - - HidesHarpyWings #DeltaV: Used by harpies to help render their hardsuit sprites + - HidesHarpyWings #Syndicate EVA - type: entity @@ -33,8 +32,7 @@ - SuitEVA - MonkeyWearable - WhitelistChameleon - - AllowLamiaHardsuit #DeltaV: Used by Lamia to render snek hardsuits - - HidesHarpyWings #DeltaV: Used by harpies to help render their hardsuit sprites + - HidesHarpyWings #Emergency EVA - type: entity @@ -76,8 +74,7 @@ - SuitEVA - MonkeyWearable - WhitelistChameleon - - AllowLamiaHardsuit #DeltaV: Used by Lamia to render snek hardsuits - - HidesHarpyWings #DeltaV: Used by harpies to help render their hardsuit sprites + - HidesHarpyWings #NTSRA Voidsuit / Ancient Voidsuit - type: entity diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/reptilian.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/reptilian.yml index 2238671ea0..d1ed51013a 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, Lamia] + speciesRestriction: [Reptilian] sprites: - sprite: Mobs/Customization/reptilian_parts.rsi state: frills_aquatic @@ -11,7 +11,7 @@ id: LizardFrillsShort bodyPart: HeadSide markingCategory: HeadSide - speciesRestriction: [Reptilian, Lamia] + speciesRestriction: [Reptilian] sprites: - sprite: Mobs/Customization/reptilian_parts.rsi state: frills_short @@ -20,7 +20,7 @@ id: LizardFrillsSimple bodyPart: HeadSide markingCategory: HeadSide - speciesRestriction: [Reptilian, Lamia] + speciesRestriction: [Reptilian] sprites: - sprite: Mobs/Customization/reptilian_parts.rsi state: frills_simple @@ -29,7 +29,7 @@ id: LizardFrillsDivinity bodyPart: HeadSide markingCategory: HeadSide - speciesRestriction: [Reptilian, Lamia] + speciesRestriction: [Reptilian] sprites: - sprite: Mobs/Customization/reptilian_parts.rsi state: frills_divinity @@ -38,7 +38,7 @@ id: LizardFrillsBig bodyPart: HeadSide markingCategory: HeadSide - speciesRestriction: [Reptilian, Lamia] + speciesRestriction: [Reptilian] sprites: - sprite: Mobs/Customization/reptilian_parts.rsi state: frills_big @@ -47,7 +47,7 @@ id: LizardFrillsAxolotl bodyPart: HeadSide markingCategory: HeadSide - speciesRestriction: [Reptilian, Lamia] + speciesRestriction: [Reptilian] sprites: - sprite: Mobs/Customization/reptilian_parts.rsi state: frills_axolotl @@ -56,7 +56,7 @@ id: LizardFrillsHood bodyPart: HeadSide markingCategory: HeadSide - speciesRestriction: [Reptilian, Lamia] + speciesRestriction: [Reptilian] sprites: - sprite: Mobs/Customization/reptilian_parts.rsi state: frills_hood_primary 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 a3e0090b8f..4fbd43a08b 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi/meta.json @@ -19,11 +19,8 @@ "directions": 4 }, { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "segment" + "name": "inhand-right", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi/segment.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi/segment.png deleted file mode 100644 index c97ab674f2..0000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi/segment.png and /dev/null 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 deleted file mode 100644 index a61d875e72..0000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi/equipped-OUTERCLOTHING-lamia.png and /dev/null 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 003d052f95..4fbd43a08b 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi/meta.json @@ -1,33 +1,26 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from paradisestation at commit https://github.com/ParadiseSS13/Paradise/commit/12c21ced8432015485484b17e311dcceb7c458f6. , lamia & segment by @noctyrnal", - "size": { - "x": 32, - "y": 32 + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from paradisestation at commit https://github.com/ParadiseSS13/Paradise/commit/12c21ced8432015485484b17e311dcceb7c458f6", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" }, - "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" - } - ] + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi/segment.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi/segment.png deleted file mode 100644 index c97ab674f2..0000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi/segment.png and /dev/null 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 a3e0090b8f..4fbd43a08b 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi/meta.json @@ -19,11 +19,8 @@ "directions": 4 }, { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "segment" + "name": "inhand-right", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi/segment.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi/segment.png deleted file mode 100644 index c97ab674f2..0000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi/segment.png and /dev/null 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 a3e0090b8f..4fbd43a08b 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi/meta.json @@ -19,11 +19,8 @@ "directions": 4 }, { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "segment" + "name": "inhand-right", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi/segment.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi/segment.png deleted file mode 100644 index c97ab674f2..0000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi/segment.png and /dev/null 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 a3e0090b8f..4fbd43a08b 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi/meta.json @@ -19,11 +19,8 @@ "directions": 4 }, { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "segment" + "name": "inhand-right", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi/segment.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi/segment.png deleted file mode 100644 index c97ab674f2..0000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi/segment.png and /dev/null 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 deleted file mode 100644 index f9c943fe7b..0000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/atmospherics.rsi/equipped-OUTERCLOTHING-lamia.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/atmospherics.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/atmospherics.rsi/meta.json index 0c75fe63b5..ef5e62cca4 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/atmospherics.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/atmospherics.rsi/meta.json @@ -1,11 +1,11 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, lamia & segment by @noctyrnal", - "size": { - "x": 32, - "y": 32 - }, + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "size": { + "x": 32, + "y": 32 + }, "states": [ { "name": "icon" @@ -25,13 +25,6 @@ { "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 deleted file mode 100644 index 056ce54c6b..0000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/atmospherics.rsi/segment.png and /dev/null 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 deleted file mode 100644 index cbe28cd477..0000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/basic.rsi/equipped-OUTERCLOTHING-lamia.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/basic.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/basic.rsi/meta.json index f7d387421d..3067907ba9 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/basic.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/basic.rsi/meta.json @@ -1,37 +1,34 @@ { - "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, lamia & segment by @noctyrnal", - "size": { - "x": 32, - "y": 32 + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a. Further modifications and derivate works (inhand-left and inhand-right) under same license, derivative monkey made by brainfood1183 (github) for ss14, harpy by VMSolidus", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" }, - "states": [ - { - "name": "icon" - }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-monkey", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-lamia", - "directions": 4 - }, - { - "name": "segment" - } - ] + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-monkey", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-harpy", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/basic.rsi/segment.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/basic.rsi/segment.png deleted file mode 100644 index 91747f2ee6..0000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/basic.rsi/segment.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmedic.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmedic.rsi/meta.json index 6f234fe219..6cfe1ea214 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmedic.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmedic.rsi/meta.json @@ -23,11 +23,8 @@ "directions": 4 }, { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "segment" + "name": "inhand-right", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmedic.rsi/segment.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmedic.rsi/segment.png deleted file mode 100644 index c97ab674f2..0000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmedic.rsi/segment.png and /dev/null 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 deleted file mode 100644 index 9e1327db34..0000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/equipped-OUTERCLOTHING-lamia.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/meta.json index 56b23c00af..7f50fdcf08 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/meta.json @@ -1,11 +1,11 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Made by Emisse for SS14, lamia & segment by @noctyrnal", - "size": { - "x": 32, - "y": 32 - }, + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by Emisse for SS14", + "size": { + "x": 32, + "y": 32 + }, "states": [ { "name": "icon" @@ -25,13 +25,6 @@ { "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 deleted file mode 100644 index f2a4dbb382..0000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/segment.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/cburn.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cburn.rsi/meta.json index 069e34790f..2de954bbf9 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/cburn.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cburn.rsi/meta.json @@ -23,11 +23,8 @@ "directions": 4 }, { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "segment" + "name": "inhand-right", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/cburn.rsi/segment.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cburn.rsi/segment.png deleted file mode 100644 index c97ab674f2..0000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/cburn.rsi/segment.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/clown.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/clown.rsi/meta.json index 9dbfe56681..090140fa8c 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/clown.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/clown.rsi/meta.json @@ -25,9 +25,6 @@ { "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 deleted file mode 100644 index c97ab674f2..0000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/clown.rsi/segment.png and /dev/null 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 deleted file mode 100644 index 5da5227444..0000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/equipped-OUTERCLOTHING-lamia.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/meta.json index d8bc5451cb..1cfa2a9cfe 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/meta.json @@ -1,11 +1,11 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Sprite made by Gtheglorious based on the sprite made by emisse for ss14, harpy variant by VMSolidus, lamia & segment by @noctyrnal", - "size": { - "x": 32, - "y": 32 - }, + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprite made by Gtheglorious based on the sprite made by emisse for ss14, harpy variant by VMSolidus", + "size": { + "x": 32, + "y": 32 + }, "states": [ { "name": "icon" @@ -25,13 +25,6 @@ { "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 deleted file mode 100644 index 7bdd563935..0000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/segment.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/meta.json index acc4195b3f..f6910b12aa 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/meta.json @@ -23,11 +23,8 @@ "directions": 4 }, { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "segment" + "name": "inhand-right", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/segment.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/segment.png deleted file mode 100644 index c97ab674f2..0000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/segment.png and /dev/null 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 deleted file mode 100644 index cc30d8c7d2..0000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering-white.rsi/equipped-OUTERCLOTHING-lamia.png and /dev/null 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 0c75fe63b5..ef5e62cca4 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering-white.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering-white.rsi/meta.json @@ -1,11 +1,11 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, lamia & segment by @noctyrnal", - "size": { - "x": 32, - "y": 32 - }, + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "size": { + "x": 32, + "y": 32 + }, "states": [ { "name": "icon" @@ -25,13 +25,6 @@ { "name": "equipped-OUTERCLOTHING-harpy", "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-lamia", - "directions": 4 - }, - { - "name": "segment" } ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering-white.rsi/segment.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering-white.rsi/segment.png deleted file mode 100644 index 2217a86857..0000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering-white.rsi/segment.png and /dev/null 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 deleted file mode 100644 index 27325e27ff..0000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering.rsi/equipped-OUTERCLOTHING-lamia.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering.rsi/meta.json index 336a597d2f..cbf3391af7 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering.rsi/meta.json @@ -1,11 +1,11 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, harpy version by VMSolidus, lamia & segment by @noctyrnal", - "size": { - "x": 32, - "y": 32 - }, + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, harpy version by VMSolidus", + "size": { + "x": 32, + "y": 32 + }, "states": [ { "name": "icon" @@ -25,13 +25,6 @@ { "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 deleted file mode 100644 index 371541123c..0000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering.rsi/segment.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/lingspacesuit.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/lingspacesuit.rsi/meta.json index 61121c1bff..0249e35995 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/lingspacesuit.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/lingspacesuit.rsi/meta.json @@ -19,11 +19,8 @@ "directions": 4 }, { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "segment" + "name": "inhand-right", + "directions": 4 } ] -} +} \ 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 deleted file mode 100644 index c97ab674f2..0000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/lingspacesuit.rsi/segment.png and /dev/null 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 deleted file mode 100644 index 0272ceb588..0000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi/equipped-OUTERCLOTHING-lamia.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi/meta.json index a220b308ac..0261a0564f 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi/meta.json @@ -1,11 +1,11 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Texture edit from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, lamia & segment by @noctyrnal", - "size": { - "x": 32, - "y": 32 - }, + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Texture edit from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "size": { + "x": 32, + "y": 32 + }, "states": [ { "name": "icon" @@ -25,13 +25,6 @@ { "name": "equipped-OUTERCLOTHING-harpy", "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-lamia", - "directions": 4 - }, - { - "name": "segment" } ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi/segment.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi/segment.png deleted file mode 100644 index aacde8c723..0000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi/segment.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/maxim.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/maxim.rsi/meta.json index 0a10fc9d33..3641da6f50 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/maxim.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/maxim.rsi/meta.json @@ -19,11 +19,8 @@ "directions": 4 }, { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "segment" + "name": "inhand-right", + "directions": 4 } ] -} +} \ 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 deleted file mode 100644 index c97ab674f2..0000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/maxim.rsi/segment.png and /dev/null 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 deleted file mode 100644 index 8773725383..0000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/equipped-OUTERCLOTHING-lamia.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/meta.json index 0c75fe63b5..ef5e62cca4 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/meta.json @@ -1,11 +1,11 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, lamia & segment by @noctyrnal", - "size": { - "x": 32, - "y": 32 - }, + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "size": { + "x": 32, + "y": 32 + }, "states": [ { "name": "icon" @@ -25,13 +25,6 @@ { "name": "equipped-OUTERCLOTHING-harpy", "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-lamia", - "directions": 4 - }, - { - "name": "segment" } ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/segment.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/segment.png deleted file mode 100644 index 290153565e..0000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/segment.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/mime.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/mime.rsi/meta.json index 20c4b3ebbe..a5f992108c 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/mime.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/mime.rsi/meta.json @@ -21,9 +21,6 @@ { "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 deleted file mode 100644 index c97ab674f2..0000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/mime.rsi/segment.png and /dev/null 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 deleted file mode 100644 index ba1d3fbdc2..0000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/equipped-OUTERCLOTHING-lamia.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/meta.json index aa1390a137..64b98f1e79 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/meta.json @@ -1,11 +1,11 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from paradise station git at commit https://github.com/ParadiseSS13/Paradise/commit/e5e584804b4b0b373a6a69d23afb73fd3c094365, redrawn by Ubaser, lamia & segment by @noctyrnal", - "size": { - "x": 32, - "y": 32 - }, + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from paradise station git at commit https://github.com/ParadiseSS13/Paradise/commit/e5e584804b4b0b373a6a69d23afb73fd3c094365, redrawn by Ubaser", + "size": { + "x": 32, + "y": 32 + }, "states": [ { "name": "icon" @@ -25,13 +25,6 @@ { "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 deleted file mode 100644 index b750e3ce22..0000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/segment.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/piratecaptain.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/piratecaptain.rsi/meta.json index 8a58b1f623..8840689d9e 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/piratecaptain.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/piratecaptain.rsi/meta.json @@ -21,9 +21,6 @@ { "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 deleted file mode 100644 index c97ab674f2..0000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/piratecaptain.rsi/segment.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/pirateeva.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/pirateeva.rsi/meta.json index 8a58b1f623..8840689d9e 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/pirateeva.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/pirateeva.rsi/meta.json @@ -21,9 +21,6 @@ { "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 deleted file mode 100644 index c97ab674f2..0000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/pirateeva.rsi/segment.png and /dev/null 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 deleted file mode 100644 index b707f6bf11..0000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/equipped-OUTERCLOTHING-lamia.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/meta.json index facdffc28d..def2d42704 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/meta.json @@ -1,33 +1,30 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, lamia & segment by @noctyrnal", - "size": { - "x": 32, - "y": 32 + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" }, - "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" - } - ] + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-harpy", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/segment.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/segment.png deleted file mode 100644 index 972865cd17..0000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/segment.png and /dev/null 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 deleted file mode 100644 index b3ab296976..0000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/salvage.rsi/equipped-OUTERCLOTHING-lamia.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/salvage.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/salvage.rsi/meta.json index 0c75fe63b5..ef5e62cca4 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/salvage.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/salvage.rsi/meta.json @@ -1,11 +1,11 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, lamia & segment by @noctyrnal", - "size": { - "x": 32, - "y": 32 - }, + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "size": { + "x": 32, + "y": 32 + }, "states": [ { "name": "icon" @@ -25,13 +25,6 @@ { "name": "equipped-OUTERCLOTHING-harpy", "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-lamia", - "directions": 4 - }, - { - "name": "segment" } ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/salvage.rsi/segment.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/salvage.rsi/segment.png deleted file mode 100644 index 5ad6fc8b35..0000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/salvage.rsi/segment.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/santahardsuit.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/santahardsuit.rsi/meta.json index 0892ec8c86..13748622fe 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/santahardsuit.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/santahardsuit.rsi/meta.json @@ -19,11 +19,8 @@ "directions": 4 }, { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "segment" + "name": "inhand-right", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/santahardsuit.rsi/segment.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/santahardsuit.rsi/segment.png deleted file mode 100644 index c97ab674f2..0000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/santahardsuit.rsi/segment.png and /dev/null 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 5a4b4eb36f..e482264df5 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-red.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-red.rsi/meta.json @@ -19,11 +19,8 @@ "directions": 4 }, { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "segment" + "name": "inhand-right", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-red.rsi/segment.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-red.rsi/segment.png deleted file mode 100644 index c97ab674f2..0000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-red.rsi/segment.png and /dev/null 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 ef4edbed96..54a0ed85fa 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-warden.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-warden.rsi/meta.json @@ -19,11 +19,8 @@ "directions": 4 }, { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "segment" + "name": "inhand-right", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-warden.rsi/segment.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-warden.rsi/segment.png deleted file mode 100644 index c97ab674f2..0000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-warden.rsi/segment.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security.rsi/meta.json index c551bf917e..32d6d8901a 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security.rsi/meta.json @@ -19,11 +19,8 @@ "directions": 4 }, { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "segment" + "name": "inhand-right", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security.rsi/segment.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security.rsi/segment.png deleted file mode 100644 index c97ab674f2..0000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security.rsi/segment.png and /dev/null 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 deleted file mode 100644 index c7344388fb..0000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/spatio.rsi/equipped-OUTERCLOTHING-lamia.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/spatio.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/spatio.rsi/meta.json index a52fc0259e..f6a942a895 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/spatio.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/spatio.rsi/meta.json @@ -1,12 +1,13 @@ + { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Original by Emisse, modified by EmoGarbage404, lamia & segment by @noctyrnal", + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Original by Emisse, modified by EmoGarbage404", - "size": { - "x": 32, - "y": 32 - }, + "size": { + "x": 32, + "y": 32 + }, "states": [ { "name": "icon" @@ -26,13 +27,6 @@ { "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 deleted file mode 100644 index 68fc755c56..0000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/spatio.rsi/segment.png and /dev/null 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 deleted file mode 100644 index 040ad09939..0000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/equipped-OUTERCLOTHING-lamia.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/meta.json index 687d271438..b9b739337b 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/meta.json @@ -1,11 +1,11 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/fb2d71495bfe81446159ef528534193d09dd8d34, equipped-OUTERCLOTHING-monkey made by Dutch-VanDerLinde, lamia & segment by @noctyrnal", - "size": { - "x": 32, - "y": 32 - }, + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/fb2d71495bfe81446159ef528534193d09dd8d34, equipped-OUTERCLOTHING-monkey made by Dutch-VanDerLinde", + "size": { + "x": 32, + "y": 32 + }, "states": [ { "name": "icon" @@ -23,19 +23,12 @@ "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 deleted file mode 100644 index 1a9469334f..0000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/segment.png and /dev/null 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 deleted file mode 100644 index ccf53e302b..0000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/equipped-OUTERCLOTHING-lamia.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/meta.json index fc4030c881..4aa4d60ccb 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/meta.json @@ -1,11 +1,11 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from vg at commit https://github.com/vgstation-coders/vgstation13/commit/a16e41020a93479e9a7e2af343b1b74f7f2a61bd, lamia & segment by @noctyrnal", - "size": { - "x": 32, - "y": 32 - }, + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from vg at commit https://github.com/vgstation-coders/vgstation13/commit/a16e41020a93479e9a7e2af343b1b74f7f2a61bd", + "size": { + "x": 32, + "y": 32 + }, "states": [ { "name": "icon" @@ -25,13 +25,6 @@ { "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 deleted file mode 100644 index 1a9469334f..0000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/segment.png and /dev/null 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 deleted file mode 100644 index bfbbece8c4..0000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/equipped-OUTERCLOTHING-lamia.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/meta.json index 3cd5cf9e41..b85c75656c 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/meta.json @@ -1,33 +1,30 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from vg at commit https://github.com/vgstation-coders/vgstation13/commit/a16e41020a93479e9a7e2af343b1b74f7f2a61bd, lamia & segment by @noctyrnal", - "size": { - "x": 32, - "y": 32 + "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", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" }, - "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" - } - ] + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-harpy", + "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 deleted file mode 100644 index 713ca5714a..0000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/segment.png and /dev/null 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 deleted file mode 100644 index b740adfdb2..0000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/equipped-OUTERCLOTHING-lamia.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/meta.json index c573d38e18..88d91565d7 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), lamia & segment by @noctyrnal", + "copyright": "Based on tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, modified by EmoGarbage404 (github), harpy by VMSolidus", "size": { "x": 32, "y": 32 @@ -25,13 +25,6 @@ { "name": "equipped-OUTERCLOTHING-harpy", "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-lamia", - "directions": 4 - }, - { - "name": "segment" } ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/segment.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/segment.png deleted file mode 100644 index 0687aa9d0d..0000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/segment.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/wizard.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/wizard.rsi/meta.json index 5a4b4eb36f..e482264df5 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/wizard.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/wizard.rsi/meta.json @@ -19,11 +19,8 @@ "directions": 4 }, { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "segment" + "name": "inhand-right", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/wizard.rsi/segment.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/wizard.rsi/segment.png deleted file mode 100644 index c97ab674f2..0000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/wizard.rsi/segment.png and /dev/null 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 0811530b9e..3a71879aff 100644 --- a/Resources/Textures/Clothing/OuterClothing/Suits/ancient_voidsuit.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Suits/ancient_voidsuit.rsi/meta.json @@ -45,11 +45,8 @@ "directions": 4 }, { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "segment" + "name": "inhand-right", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/ancient_voidsuit.rsi/segment.png b/Resources/Textures/Clothing/OuterClothing/Suits/ancient_voidsuit.rsi/segment.png deleted file mode 100644 index c97ab674f2..0000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Suits/ancient_voidsuit.rsi/segment.png and /dev/null 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 deleted file mode 100644 index 72f2f4b76b..0000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Suits/atmos_firesuit.rsi/equipped-OUTERCLOTHING-lamia.png and /dev/null 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 46f6488836..b05021b6c0 100644 --- a/Resources/Textures/Clothing/OuterClothing/Suits/atmos_firesuit.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Suits/atmos_firesuit.rsi/meta.json @@ -1,33 +1,30 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation https://github.com/tgstation/tgstation/blob/master/icons/mob/clothing/suit.dmi. lamia & segment by @noctyrnal", - "size": { - "x": 32, - "y": 32 + "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", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" }, - "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" - } - ] + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-harpy", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "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 deleted file mode 100644 index 3a2b136ebd..0000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Suits/atmos_firesuit.rsi/segment.png and /dev/null 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 deleted file mode 100644 index a5d1135dee..0000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Suits/bombsuit.rsi/equipped-OUTERCLOTHING-lamia.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/bombsuit.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Suits/bombsuit.rsi/meta.json index 811b6b8ae8..e9a9a4453d 100644 --- a/Resources/Textures/Clothing/OuterClothing/Suits/bombsuit.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Suits/bombsuit.rsi/meta.json @@ -1,33 +1,30 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/760f0be7af33a31f5a08a3291864e91539d0ebb7. lamia & segment by @noctyrnal", - "size": { - "x": 32, - "y": 32 + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/760f0be7af33a31f5a08a3291864e91539d0ebb7", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" }, - "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" - } - ] + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-harpy", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/bombsuit.rsi/segment.png b/Resources/Textures/Clothing/OuterClothing/Suits/bombsuit.rsi/segment.png deleted file mode 100644 index bc07da7e78..0000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Suits/bombsuit.rsi/segment.png and /dev/null 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 deleted file mode 100644 index b0e720f3be..0000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Suits/eva.rsi/equipped-OUTERCLOTHING-lamia.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/eva.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Suits/eva.rsi/meta.json index 80f2d7019f..4dcd7b13b5 100644 --- a/Resources/Textures/Clothing/OuterClothing/Suits/eva.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Suits/eva.rsi/meta.json @@ -1,37 +1,34 @@ { - "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. lamia & segment by @noctyrnal", - "size": { - "x": 32, - "y": 32 + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprites by Flareguy & cboyjet, heavily edited from space suit sprites found in https://github.com/tgstation/tgstation/commit/fb2d71495bfe81446159ef528534193d09dd8d34, harpy edit by VMSolidus", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" }, - "states": [ - { - "name": "icon" - }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-monkey", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-lamia", - "directions": 4 - }, - { - "name": "segment" - } - ] + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-monkey", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-harpy", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/eva.rsi/segment.png b/Resources/Textures/Clothing/OuterClothing/Suits/eva.rsi/segment.png deleted file mode 100644 index 5a21938eca..0000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Suits/eva.rsi/segment.png and /dev/null 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 deleted file mode 100644 index c606944fb0..0000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Suits/eva_emergency.rsi/equipped-OUTERCLOTHING-lamia.png and /dev/null 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 3efd510e89..8d09b75006 100644 --- a/Resources/Textures/Clothing/OuterClothing/Suits/eva_emergency.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Suits/eva_emergency.rsi/meta.json @@ -1,33 +1,30 @@ { - "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. lamia & segment by @noctyrnal", - "size": { - "x": 32, - "y": 32 + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprites by Flareguy & cboyjet, heavily edited from space suit sprites found in https://github.com/tgstation/tgstation/commit/fb2d71495bfe81446159ef528534193d09dd8d34, harpy edit by VMSolidus", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" }, - "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" - } - ] + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-harpy", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "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 deleted file mode 100644 index b2cf94d4cf..0000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Suits/eva_emergency.rsi/segment.png and /dev/null 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 deleted file mode 100644 index c5f1a4d41a..0000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Suits/eva_prisoner.rsi/equipped-OUTERCLOTHING-lamia.png and /dev/null 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 c5ab73194f..0482d08642 100644 --- a/Resources/Textures/Clothing/OuterClothing/Suits/eva_prisoner.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Suits/eva_prisoner.rsi/meta.json @@ -1,37 +1,34 @@ { - "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. lamia & segment by @noctyrnal", - "size": { - "x": 32, - "y": 32 + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprites by Flareguy & cboyjet, heavily edited from space suit sprites found in https://github.com/tgstation/tgstation/commit/fb2d71495bfe81446159ef528534193d09dd8d34, monkey derivative made by brainfood1183 (github) for ss14, harpy edit by VMSolidus", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" }, - "states": [ - { - "name": "icon" - }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-monkey", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-lamia", - "directions": 4 - }, - { - "name": "segment" - } - ] + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-monkey", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-harpy", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/eva_prisoner.rsi/segment.png b/Resources/Textures/Clothing/OuterClothing/Suits/eva_prisoner.rsi/segment.png deleted file mode 100644 index 4ab04aee99..0000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Suits/eva_prisoner.rsi/segment.png and /dev/null 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 deleted file mode 100644 index 5331e68d1c..0000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Suits/eva_syndicate.rsi/equipped-OUTERCLOTHING-lamia.png and /dev/null 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 c5ab73194f..0482d08642 100644 --- a/Resources/Textures/Clothing/OuterClothing/Suits/eva_syndicate.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Suits/eva_syndicate.rsi/meta.json @@ -1,37 +1,34 @@ { - "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. lamia & segment by @noctyrnal", - "size": { - "x": 32, - "y": 32 + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprites by Flareguy & cboyjet, heavily edited from space suit sprites found in https://github.com/tgstation/tgstation/commit/fb2d71495bfe81446159ef528534193d09dd8d34, monkey derivative made by brainfood1183 (github) for ss14, harpy edit by VMSolidus", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" }, - "states": [ - { - "name": "icon" - }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-monkey", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-lamia", - "directions": 4 - }, - { - "name": "segment" - } - ] + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-monkey", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-harpy", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/eva_syndicate.rsi/segment.png b/Resources/Textures/Clothing/OuterClothing/Suits/eva_syndicate.rsi/segment.png deleted file mode 100644 index 1a6df55d05..0000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Suits/eva_syndicate.rsi/segment.png and /dev/null 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 deleted file mode 100644 index 979a4eb20e..0000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Suits/fire.rsi/equipped-OUTERCLOTHING-lamia.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/fire.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Suits/fire.rsi/meta.json index e35ad58f2a..0a8c670a89 100644 --- a/Resources/Textures/Clothing/OuterClothing/Suits/fire.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Suits/fire.rsi/meta.json @@ -1,33 +1,30 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. lamia & segment by @noctyrnal", - "size": { - "x": 32, - "y": 32 + "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", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" }, - "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" - } - ] + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-harpy", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/fire.rsi/segment.png b/Resources/Textures/Clothing/OuterClothing/Suits/fire.rsi/segment.png deleted file mode 100644 index 3764a4fa05..0000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Suits/fire.rsi/segment.png and /dev/null 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 deleted file mode 100644 index c7a776d958..0000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Suits/rad.rsi/equipped-OUTERCLOTHING-lamia.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/rad.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Suits/rad.rsi/meta.json index e35ad58f2a..0a8c670a89 100644 --- a/Resources/Textures/Clothing/OuterClothing/Suits/rad.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Suits/rad.rsi/meta.json @@ -1,33 +1,30 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. lamia & segment by @noctyrnal", - "size": { - "x": 32, - "y": 32 + "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", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" }, - "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" - } - ] + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-harpy", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/rad.rsi/segment.png b/Resources/Textures/Clothing/OuterClothing/Suits/rad.rsi/segment.png deleted file mode 100644 index 53c50d2d56..0000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Suits/rad.rsi/segment.png and /dev/null 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 deleted file mode 100644 index 3b500a5046..0000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Suits/spaceninja.rsi/equipped-OUTERCLOTHING-lamia.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/spaceninja.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Suits/spaceninja.rsi/meta.json index d057b887bf..0174b889d2 100644 --- a/Resources/Textures/Clothing/OuterClothing/Suits/spaceninja.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Suits/spaceninja.rsi/meta.json @@ -1,33 +1,26 @@ { - "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 + "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" }, - "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" - } - ] + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/spaceninja.rsi/segment.png b/Resources/Textures/Clothing/OuterClothing/Suits/spaceninja.rsi/segment.png deleted file mode 100644 index fbfe73d721..0000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Suits/spaceninja.rsi/segment.png and /dev/null 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 deleted file mode 100644 index 172cf756a4..0000000000 Binary files a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/advanced.rsi/equipped-OUTERCLOTHING-lamia.png and /dev/null 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 cf10d74aed..4844e816bd 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. lamia & segment by @noctyrnal", - "size": { - "x": 32, - "y": 32 - }, + "version": 1, + "license": "CC0-1.0", + "copyright": "Original work by TJohnson.", + "size": { + "x": 32, + "y": 32 + }, "states": [ { "name": "icon" @@ -18,10 +18,6 @@ "name": "equipped-OUTERCLOTHING-harpy", "directions": 4 }, - { - "name": "equipped-OUTERCLOTHING-lamia", - "directions": 4 - }, { "name": "inhand-left", "directions": 4 @@ -29,9 +25,6 @@ { "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 deleted file mode 100644 index c97ab674f2..0000000000 Binary files a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/advanced.rsi/segment.png and /dev/null 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 deleted file mode 100644 index 9788b33baf..0000000000 Binary files a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/corpsman.rsi/equipped-OUTERCLOTHING-lamia.png and /dev/null 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 cf10d74aed..4844e816bd 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. lamia & segment by @noctyrnal", - "size": { - "x": 32, - "y": 32 - }, + "version": 1, + "license": "CC0-1.0", + "copyright": "Original work by TJohnson.", + "size": { + "x": 32, + "y": 32 + }, "states": [ { "name": "icon" @@ -18,10 +18,6 @@ "name": "equipped-OUTERCLOTHING-harpy", "directions": 4 }, - { - "name": "equipped-OUTERCLOTHING-lamia", - "directions": 4 - }, { "name": "inhand-left", "directions": 4 @@ -29,9 +25,6 @@ { "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 deleted file mode 100644 index 481ab8594d..0000000000 Binary files a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/corpsman.rsi/segment.png and /dev/null 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 deleted file mode 100644 index 7b79d271d5..0000000000 Binary files a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/hos.rsi/equipped-OUTERCLOTHING-lamia.png and /dev/null 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 cf10d74aed..4844e816bd 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. lamia & segment by @noctyrnal", - "size": { - "x": 32, - "y": 32 - }, + "version": 1, + "license": "CC0-1.0", + "copyright": "Original work by TJohnson.", + "size": { + "x": 32, + "y": 32 + }, "states": [ { "name": "icon" @@ -18,10 +18,6 @@ "name": "equipped-OUTERCLOTHING-harpy", "directions": 4 }, - { - "name": "equipped-OUTERCLOTHING-lamia", - "directions": 4 - }, { "name": "inhand-left", "directions": 4 @@ -29,9 +25,6 @@ { "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 deleted file mode 100644 index 481ab8594d..0000000000 Binary files a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/hos.rsi/segment.png and /dev/null 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 deleted file mode 100644 index 5cef9a5282..0000000000 Binary files a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/medical.rsi/equipped-OUTERCLOTHING-lamia.png and /dev/null 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 cf10d74aed..4844e816bd 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. lamia & segment by @noctyrnal", - "size": { - "x": 32, - "y": 32 - }, + "version": 1, + "license": "CC0-1.0", + "copyright": "Original work by TJohnson.", + "size": { + "x": 32, + "y": 32 + }, "states": [ { "name": "icon" @@ -18,10 +18,6 @@ "name": "equipped-OUTERCLOTHING-harpy", "directions": 4 }, - { - "name": "equipped-OUTERCLOTHING-lamia", - "directions": 4 - }, { "name": "inhand-left", "directions": 4 @@ -29,9 +25,6 @@ { "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 deleted file mode 100644 index c97ab674f2..0000000000 Binary files a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/medical.rsi/segment.png and /dev/null 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 deleted file mode 100644 index 850956e689..0000000000 Binary files a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/officer.rsi/equipped-OUTERCLOTHING-lamia.png and /dev/null 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 cf10d74aed..4844e816bd 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. lamia & segment by @noctyrnal", - "size": { - "x": 32, - "y": 32 - }, + "version": 1, + "license": "CC0-1.0", + "copyright": "Original work by TJohnson.", + "size": { + "x": 32, + "y": 32 + }, "states": [ { "name": "icon" @@ -18,10 +18,6 @@ "name": "equipped-OUTERCLOTHING-harpy", "directions": 4 }, - { - "name": "equipped-OUTERCLOTHING-lamia", - "directions": 4 - }, { "name": "inhand-left", "directions": 4 @@ -29,9 +25,6 @@ { "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 deleted file mode 100644 index 481ab8594d..0000000000 Binary files a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/officer.rsi/segment.png and /dev/null 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 deleted file mode 100644 index 454939d731..0000000000 Binary files a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/riot.rsi/equipped-OUTERCLOTHING-lamia.png and /dev/null 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 cf10d74aed..4844e816bd 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. lamia & segment by @noctyrnal", - "size": { - "x": 32, - "y": 32 - }, + "version": 1, + "license": "CC0-1.0", + "copyright": "Original work by TJohnson.", + "size": { + "x": 32, + "y": 32 + }, "states": [ { "name": "icon" @@ -18,10 +18,6 @@ "name": "equipped-OUTERCLOTHING-harpy", "directions": 4 }, - { - "name": "equipped-OUTERCLOTHING-lamia", - "directions": 4 - }, { "name": "inhand-left", "directions": 4 @@ -29,9 +25,6 @@ { "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 deleted file mode 100644 index c97ab674f2..0000000000 Binary files a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/riot.rsi/segment.png and /dev/null 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 deleted file mode 100644 index 65a4ecba00..0000000000 Binary files a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/standard.rsi/equipped-OUTERCLOTHING-lamia.png and /dev/null 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 cf10d74aed..4844e816bd 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. lamia & segment by @noctyrnal", - "size": { - "x": 32, - "y": 32 - }, + "version": 1, + "license": "CC0-1.0", + "copyright": "Original work by TJohnson.", + "size": { + "x": 32, + "y": 32 + }, "states": [ { "name": "icon" @@ -18,10 +18,6 @@ "name": "equipped-OUTERCLOTHING-harpy", "directions": 4 }, - { - "name": "equipped-OUTERCLOTHING-lamia", - "directions": 4 - }, { "name": "inhand-left", "directions": 4 @@ -29,9 +25,6 @@ { "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 deleted file mode 100644 index c97ab674f2..0000000000 Binary files a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/standard.rsi/segment.png and /dev/null 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 deleted file mode 100644 index 6591584869..0000000000 Binary files a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/warden.rsi/equipped-OUTERCLOTHING-lamia.png and /dev/null 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 cf10d74aed..4844e816bd 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. lamia & segment by @noctyrnal", - "size": { - "x": 32, - "y": 32 - }, + "version": 1, + "license": "CC0-1.0", + "copyright": "Original work by TJohnson.", + "size": { + "x": 32, + "y": 32 + }, "states": [ { "name": "icon" @@ -18,10 +18,6 @@ "name": "equipped-OUTERCLOTHING-harpy", "directions": 4 }, - { - "name": "equipped-OUTERCLOTHING-lamia", - "directions": 4 - }, { "name": "inhand-left", "directions": 4 @@ -29,9 +25,6 @@ { "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 deleted file mode 100644 index 481ab8594d..0000000000 Binary files a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/warden.rsi/segment.png and /dev/null 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 deleted file mode 100644 index 0a9c6f02cc..0000000000 Binary files a/Resources/Textures/DeltaV/Mobs/Customization/Lamia/lamia_tails.rsi/body3tone1.png and /dev/null 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 deleted file mode 100644 index 1c7bb9e864..0000000000 Binary files a/Resources/Textures/DeltaV/Mobs/Customization/Lamia/lamia_tails.rsi/body3tone2.png and /dev/null 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 deleted file mode 100644 index 826c099ab8..0000000000 Binary files a/Resources/Textures/DeltaV/Mobs/Customization/Lamia/lamia_tails.rsi/body3tone3.png and /dev/null 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 deleted file mode 100644 index a6d4bd5f2b..0000000000 Binary files a/Resources/Textures/DeltaV/Mobs/Customization/Lamia/lamia_tails.rsi/bottom3tone1.png and /dev/null 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 deleted file mode 100644 index 9b26288a26..0000000000 Binary files a/Resources/Textures/DeltaV/Mobs/Customization/Lamia/lamia_tails.rsi/bottom3tone2.png and /dev/null 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 deleted file mode 100644 index 2871eb45d8..0000000000 Binary files a/Resources/Textures/DeltaV/Mobs/Customization/Lamia/lamia_tails.rsi/bottom3tone3.png and /dev/null 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 deleted file mode 100644 index 5374b72d74..0000000000 --- a/Resources/Textures/DeltaV/Mobs/Customization/Lamia/lamia_tails.rsi/meta.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "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 deleted file mode 100644 index b9c86c5b99..0000000000 Binary files a/Resources/Textures/DeltaV/Mobs/Customization/Lamia/lamia_tails.rsi/tip3tone1.png and /dev/null 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 deleted file mode 100644 index 7a37e083a7..0000000000 Binary files a/Resources/Textures/DeltaV/Mobs/Customization/Lamia/lamia_tails.rsi/tip3tone2.png and /dev/null 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 deleted file mode 100644 index 9a9abed6ab..0000000000 Binary files a/Resources/Textures/DeltaV/Mobs/Customization/Lamia/lamia_tails.rsi/tip3tone3.png and /dev/null 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 deleted file mode 100644 index 404f932b64..0000000000 Binary files a/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/brute_damage.rsi/Chest_Brute_120.png and /dev/null 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 deleted file mode 100644 index f0d9b5741b..0000000000 Binary files a/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/brute_damage.rsi/Chest_Brute_200.png and /dev/null 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 deleted file mode 100644 index 43c92d9fa4..0000000000 Binary files a/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/brute_damage.rsi/Chest_Brute_60.png and /dev/null 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 deleted file mode 100644 index 33f624d503..0000000000 Binary files a/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/brute_damage.rsi/Head_Brute_120.png and /dev/null 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 deleted file mode 100644 index f1de5695c5..0000000000 Binary files a/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/brute_damage.rsi/Head_Brute_200.png and /dev/null 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 deleted file mode 100644 index 2166220992..0000000000 Binary files a/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/brute_damage.rsi/Head_Brute_60.png and /dev/null 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 deleted file mode 100644 index 8429e7fb18..0000000000 Binary files a/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/brute_damage.rsi/LArm_Brute_120.png and /dev/null 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 deleted file mode 100644 index 488040b0c1..0000000000 Binary files a/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/brute_damage.rsi/LArm_Brute_200.png and /dev/null 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 deleted file mode 100644 index 1bcf2e505a..0000000000 Binary files a/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/brute_damage.rsi/LArm_Brute_60.png and /dev/null 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 deleted file mode 100644 index 680ec3009a..0000000000 Binary files a/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/brute_damage.rsi/LLeg_Brute_120.png and /dev/null 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 deleted file mode 100644 index 6c1a2dcc19..0000000000 Binary files a/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/brute_damage.rsi/LLeg_Brute_200.png and /dev/null 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 deleted file mode 100644 index 2670821090..0000000000 Binary files a/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/brute_damage.rsi/LLeg_Brute_60.png and /dev/null 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 deleted file mode 100644 index f68f0c4f15..0000000000 Binary files a/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/brute_damage.rsi/RArm_Brute_120.png and /dev/null 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 deleted file mode 100644 index 6b99414d0b..0000000000 Binary files a/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/brute_damage.rsi/RArm_Brute_200.png and /dev/null 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 deleted file mode 100644 index 2e4a031f15..0000000000 Binary files a/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/brute_damage.rsi/RArm_Brute_60.png and /dev/null 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 deleted file mode 100644 index ef4dbcb08b..0000000000 Binary files a/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/brute_damage.rsi/RLeg_Brute_120.png and /dev/null 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 deleted file mode 100644 index 6899cccab7..0000000000 Binary files a/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/brute_damage.rsi/RLeg_Brute_200.png and /dev/null 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 deleted file mode 100644 index 44aae3c0bf..0000000000 Binary files a/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/brute_damage.rsi/RLeg_Brute_60.png and /dev/null 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 deleted file mode 100644 index 583346556e..0000000000 --- a/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/brute_damage.rsi/meta.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "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 deleted file mode 100644 index 5a68c6fd86..0000000000 Binary files a/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/burn_damage.rsi/Chest_Burn_120.png and /dev/null 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 deleted file mode 100644 index 2ca0dc67f1..0000000000 Binary files a/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/burn_damage.rsi/Chest_Burn_200.png and /dev/null 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 deleted file mode 100644 index bb29391fa0..0000000000 Binary files a/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/burn_damage.rsi/Chest_Burn_60.png and /dev/null 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 deleted file mode 100644 index 90d69223b6..0000000000 Binary files a/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/burn_damage.rsi/Head_Burn_120.png and /dev/null 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 deleted file mode 100644 index 36b9114816..0000000000 Binary files a/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/burn_damage.rsi/Head_Burn_200.png and /dev/null 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 deleted file mode 100644 index f91dae519a..0000000000 Binary files a/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/burn_damage.rsi/Head_Burn_60.png and /dev/null 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 deleted file mode 100644 index 7c8da637ca..0000000000 Binary files a/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/burn_damage.rsi/LArm_Burn_120.png and /dev/null 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 deleted file mode 100644 index 2dc5377659..0000000000 Binary files a/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/burn_damage.rsi/LArm_Burn_200.png and /dev/null 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 deleted file mode 100644 index bc8f7bf9ca..0000000000 Binary files a/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/burn_damage.rsi/LArm_Burn_60.png and /dev/null 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 deleted file mode 100644 index a84ef88da8..0000000000 Binary files a/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/burn_damage.rsi/LLeg_Burn_120.png and /dev/null 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 deleted file mode 100644 index c18e554541..0000000000 Binary files a/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/burn_damage.rsi/LLeg_Burn_200.png and /dev/null 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 deleted file mode 100644 index 70b91d8824..0000000000 Binary files a/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/burn_damage.rsi/LLeg_Burn_60.png and /dev/null 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 deleted file mode 100644 index 1d0c791e38..0000000000 Binary files a/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/burn_damage.rsi/RArm_Burn_120.png and /dev/null 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 deleted file mode 100644 index 77e463d02f..0000000000 Binary files a/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/burn_damage.rsi/RArm_Burn_200.png and /dev/null 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 deleted file mode 100644 index 96b96b566b..0000000000 Binary files a/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/burn_damage.rsi/RArm_Burn_60.png and /dev/null 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 deleted file mode 100644 index efe3ad8b53..0000000000 Binary files a/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/burn_damage.rsi/RLeg_Burn_120.png and /dev/null 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 deleted file mode 100644 index 978e01358f..0000000000 Binary files a/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/burn_damage.rsi/RLeg_Burn_200.png and /dev/null 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 deleted file mode 100644 index 5f5d390792..0000000000 Binary files a/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/burn_damage.rsi/RLeg_Burn_60.png and /dev/null 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 deleted file mode 100644 index 7f8cda0f96..0000000000 --- a/Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/burn_damage.rsi/meta.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "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 deleted file mode 100644 index bf711ef304..0000000000 Binary files a/Resources/Textures/Nyanotrasen/Mobs/Species/lamia.rsi/bottom.png and /dev/null differ diff --git a/Resources/Textures/Nyanotrasen/Mobs/Species/lamia.rsi/meta.json b/Resources/Textures/Nyanotrasen/Mobs/Species/lamia.rsi/meta.json deleted file mode 100644 index ebfd0e2dc7..0000000000 --- a/Resources/Textures/Nyanotrasen/Mobs/Species/lamia.rsi/meta.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Created by Archer2150#2528 using assets from Rane. Fangs by discord user @Hyenh6078", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "placeholder" - }, - { - "name": "bottom", - "directions": 4 - }, - { - "name": "tip" - }, - { - "name": "verbiconfangs" - }, - { - "name": "underscales", - "directions": 4 - }, - { - "name": "torso_f", - "directions": 4 - }, - { - "name": "torso_m", - "directions": 4 - } - ] -} diff --git a/Resources/Textures/Nyanotrasen/Mobs/Species/lamia.rsi/placeholder.png b/Resources/Textures/Nyanotrasen/Mobs/Species/lamia.rsi/placeholder.png deleted file mode 100644 index e0cb4814da..0000000000 Binary files a/Resources/Textures/Nyanotrasen/Mobs/Species/lamia.rsi/placeholder.png and /dev/null differ diff --git a/Resources/Textures/Nyanotrasen/Mobs/Species/lamia.rsi/tip.png b/Resources/Textures/Nyanotrasen/Mobs/Species/lamia.rsi/tip.png deleted file mode 100644 index a7e023d96b..0000000000 Binary files a/Resources/Textures/Nyanotrasen/Mobs/Species/lamia.rsi/tip.png and /dev/null 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 deleted file mode 100644 index f818a47894..0000000000 Binary files a/Resources/Textures/Nyanotrasen/Mobs/Species/lamia.rsi/torso_f.png and /dev/null 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 deleted file mode 100644 index f818a47894..0000000000 Binary files a/Resources/Textures/Nyanotrasen/Mobs/Species/lamia.rsi/torso_m.png and /dev/null differ diff --git a/Resources/Textures/Nyanotrasen/Mobs/Species/lamia.rsi/underscales.png b/Resources/Textures/Nyanotrasen/Mobs/Species/lamia.rsi/underscales.png deleted file mode 100644 index edc457a79b..0000000000 Binary files a/Resources/Textures/Nyanotrasen/Mobs/Species/lamia.rsi/underscales.png and /dev/null differ diff --git a/Resources/Textures/Nyanotrasen/Mobs/Species/lamia.rsi/verbiconfangs.png b/Resources/Textures/Nyanotrasen/Mobs/Species/lamia.rsi/verbiconfangs.png deleted file mode 100644 index 4511cbd21f..0000000000 Binary files a/Resources/Textures/Nyanotrasen/Mobs/Species/lamia.rsi/verbiconfangs.png and /dev/null differ