diff --git a/Content.Server/SimpleStation14/Power/Systems/SiliconEmitSoundOnDrainedSystem.cs b/Content.Server/SimpleStation14/Power/Systems/SiliconEmitSoundOnDrainedSystem.cs index a9a29fed37..d9f25f9879 100644 --- a/Content.Server/SimpleStation14/Power/Systems/SiliconEmitSoundOnDrainedSystem.cs +++ b/Content.Server/SimpleStation14/Power/Systems/SiliconEmitSoundOnDrainedSystem.cs @@ -1,5 +1,5 @@ using Content.Server.SimpleStation14.Silicon.Death; -using Content.Server.Sound.Components; +using Content.Shared.Sound.Components; using Content.Shared.Mobs; using Content.Shared.SimpleStation14.Silicon.Systems; @@ -18,11 +18,7 @@ private void OnDeath(EntityUid uid, SiliconEmitSoundOnDrainedComponent component { var spamComp = EnsureComp(uid); - spamComp.Accumulator = 0f; - spamComp.RollInterval = component.Interval; - spamComp.PlayChance = component.PlayChance; spamComp.PopUp = component.PopUp; - spamComp.Enabled = true; spamComp.Sound = component.Sound; } diff --git a/Content.Server/Weapons/Ranged/Systems/GunSystem.cs b/Content.Server/Weapons/Ranged/Systems/GunSystem.cs index fbc46f5917..69dd9626d5 100644 --- a/Content.Server/Weapons/Ranged/Systems/GunSystem.cs +++ b/Content.Server/Weapons/Ranged/Systems/GunSystem.cs @@ -203,7 +203,13 @@ public override void Shoot(EntityUid gunUid, GunComponent gun, List<(EntityUid? if (!rayCastResults.Any()) break; - var result = rayCastResults[0]; + var raycastEvent = new HitScanAfterRayCastEvent(rayCastResults); + RaiseLocalEvent(lastUser, ref raycastEvent); + + if (raycastEvent.RayCastResults == null) + break; + + var result = raycastEvent.RayCastResults[0]; var hit = result.HitEntity; lastHit = hit; diff --git a/Content.Shared/Teleportation/Components/PortalExemptComponent.cs b/Content.Shared/Teleportation/Components/PortalExemptComponent.cs new file mode 100644 index 0000000000..28043808e0 --- /dev/null +++ b/Content.Shared/Teleportation/Components/PortalExemptComponent.cs @@ -0,0 +1,8 @@ +using Robust.Shared.GameStates; + +namespace Content.Shared.Teleportation.Components; + +[RegisterComponent, NetworkedComponent] +public sealed partial class PortalExemptComponent : Component +{ +} diff --git a/Content.Shared/Teleportation/Systems/SharedPortalSystem.cs b/Content.Shared/Teleportation/Systems/SharedPortalSystem.cs index 8d67aec518..7e1124cef7 100644 --- a/Content.Shared/Teleportation/Systems/SharedPortalSystem.cs +++ b/Content.Shared/Teleportation/Systems/SharedPortalSystem.cs @@ -1,4 +1,4 @@ -using System.Linq; +using System.Linq; using Content.Shared.Ghost; using Content.Shared.Movement.Pulling.Components; using Content.Shared.Movement.Pulling.Systems; @@ -83,6 +83,9 @@ private bool ShouldCollide(string ourId, string otherId, Fixture our, Fixture ot private void OnCollide(EntityUid uid, PortalComponent component, ref StartCollideEvent args) { + if (HasComp(args.OtherEntity)) + return; + if (!ShouldCollide(args.OurFixtureId, args.OtherFixtureId, args.OurFixture, args.OtherFixture)) return; diff --git a/Content.Shared/Weapons/Ranged/Events/HitScanAfterRayCastEvent.cs b/Content.Shared/Weapons/Ranged/Events/HitScanAfterRayCastEvent.cs new file mode 100644 index 0000000000..99bfd1eabc --- /dev/null +++ b/Content.Shared/Weapons/Ranged/Events/HitScanAfterRayCastEvent.cs @@ -0,0 +1,17 @@ +using Robust.Shared.Physics; + +namespace Content.Shared.Weapons.Ranged.Events; + +/// +/// Raised after an entity fires a hitscan weapon, but before the list is truncated to the first target. Necessary for Entities that need to prevent friendly fire +/// +[ByRefEvent] +public struct HitScanAfterRayCastEvent +{ + public List? RayCastResults; + + public HitScanAfterRayCastEvent(List? rayCastResults) + { + RayCastResults = rayCastResults; + } +} diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Player/lamia.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Player/lamia.yml new file mode 100644 index 0000000000..1f5397e5dc --- /dev/null +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Player/lamia.yml @@ -0,0 +1,39 @@ +# Delta-V - This file is licensed under AGPLv3 +# Copyright (c) 2024 Delta-V Contributors +# See AGPLv3.txt for details. + +- type: entity + save: false + name: Urist McNoodle + parent: MobLamiaBase + id: MobLamia + description: A miserable pile of scales. + components: + - type: CombatMode + - type: InteractionPopup + successChance: 1 + interactSuccessString: hugging-success-generic + interactSuccessSound: /Audio/Effects/thudswoosh.ogg + messagePerceivedByOthers: hugging-success-generic-others + - type: Mind + - type: Input + context: "human" + - type: MobMover + - type: InputMover + - type: Respirator + damage: + types: + Asphyxiation: 1.5 + damageRecovery: + types: + Asphyxiation: -1.5 + - type: Alerts + - type: Actions + - type: Eye + - type: CameraRecoil + - type: Examiner + - type: CanHostGuardian + - type: NpcFactionMember + factions: + - NanoTrasen + - type: PotentialPsionic diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Books/hyperlinks.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Books/hyperlinks.yml deleted file mode 100644 index 03426729d9..0000000000 --- a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Books/hyperlinks.yml +++ /dev/null @@ -1,204 +0,0 @@ -- type: entity - parent: BaseItem - id: BaseHyperlinkBook - abstract: true - components: - - type: Sprite - sprite: Objects/Misc/books.rsi - - type: Tag - tags: - - Book - - type: EmitSoundOnPickup - sound: /Audio/SimpleStation14/Items/Handling/book_pickup.ogg - - type: EmitSoundOnDrop - sound: /Audio/SimpleStation14/Items/Handling/book_drop.ogg - - type: EmitSoundOnLand - sound: /Audio/SimpleStation14/Items/Handling/book_drop.ogg - -- type: entity - parent: BaseHyperlinkBook - id: HyperlinkBookSpaceLaw - name: space law - description: A big book of laws for space courts. - components: - - type: Sprite - layers: - - state: book_space_law -# - type: HyperlinkBook -# url: https://wiki.nyanotrasen.moe/view/Space_Law - -- type: entity - parent: BaseHyperlinkBook - id: HyperlinkBookSupernanny - name: book of unsanctioned space punishments - description: The ravings of a madman. - components: - - type: Sprite - layers: - - state: book_space_law -# - type: HyperlinkBook -# url: https://supernannyfanon.fandom.com/wiki/Category:Discipline_Techniques - -#- type: entity -# parent: BaseHyperlinkBook -# id: HyperlinkBookGlimmer -# suffix: GuidebookBook -# name: A Layman's Guide to the Mind -# description: A guide on psionics. -# components: -# - type: Sprite -# sprite: SimpleStation14/Objects/Misc/books.rsi -# layers: -# - state: book_psionics -# - type: HyperlinkBook -# url: https://wiki.nyanotrasen.moe/view/Glimmer -# - type: GuidebookBook -# guides: -# - Psionics -# - AltarsGolemancy - -- type: entity - parent: BaseHyperlinkBook - id: HyperlinkBookChemistry - name: chemical recipe book - description: A list of chemical recipes. - components: - - type: Sprite - layers: - - state: book_chemistry -# - type: HyperlinkBook -# url: https://wiki.nyanotrasen.moe/view/Chemistry - -- type: entity - parent: BaseHyperlinkBook - id: HyperlinkBookBartending - name: bartender's guide - description: A list of drink recipes. - components: - - type: Sprite - layers: - - state: book_bar -# - type: HyperlinkBook -# url: https://wiki.nyanotrasen.moe/view/Drinks - -- type: entity - parent: BaseHyperlinkBook - id: HyperlinkBookCooking - name: cookbook - description: A list of food recipes. - components: - - type: Sprite - layers: - - state: book_cooking -# - type: HyperlinkBook -# url: https://wiki.nyanotrasen.moe/view/Cooking - -- type: entity - parent: BaseHyperlinkBook - id: HyperlinkBookBotany - name: botanical field guide - description: A guide to plants. - components: - - type: Sprite - layers: - - state: book_hydroponics_pod_people -# - type: HyperlinkBook -# url: https://wiki.nyanotrasen.moe/view/Hydroponics - -- type: entity - parent: BaseHyperlinkBook - id: HyperlinkBookShuttle - name: guide to shuttle construction - description: A guide to building shuttles. - components: - - type: Sprite - layers: - - state: book_engineering -# - type: HyperlinkBook -# url: https://wiki.nyanotrasen.moe/view/Shuttle_Construction - -- type: entity - parent: BaseHyperlinkBook - id: HyperlinkBookAlerts - suffix: GuidebookBook - name: What to do When Things are Blowing Up - description: Procedure for when and why each alert should be put in effect, and what to do. - components: - - type: Sprite - layers: - - state: book_nuclear - # - type: HyperlinkBook - # url: https://wiki.nyanotrasen.moe/view/Alert_Procedure -# - type: GuidebookBook -# guides: -# - CommonAlerts -# - SpecificAlerts -# - CentCommAlerts - -- type: entity - parent: BaseHyperlinkBook - id: HyperlinkBookProcedure - suffix: GuidebookBook - name: standard operating procedure - description: A guide to normal station function. - components: - - type: Sprite - layers: - - state: book_particle_accelerator - # - type: HyperlinkBook - # url: https://wiki.nyanotrasen.moe/view/Standard_Operating_Procedure -# - type: GuidebookBook -# guides: -# - StandardOperatingProcedure - -- type: entity - parent: BaseHyperlinkBook - id: HyperlinkBookPower - name: guide to power - description: A guide to powering the station. - components: - - type: Sprite - layers: - - state: book_engineering2 -# - type: HyperlinkBook -# url: https://wiki.nyanotrasen.moe/view/Power - -- type: entity - parent: BaseHyperlinkBook - id: HyperlinkBookMedical - name: guide to medical - description: A guide to the medical department. - components: - - type: Sprite - layers: - - state: book_infections -# - type: HyperlinkBook -# url: https://wiki.nyanotrasen.moe/view/Medical - -- type: entity - parent: BaseHyperlinkBook - id: HyperlinkBookHacking - name: guide to hacking - description: For emergency use only. - components: - - type: Sprite - layers: - - state: book_hacking -# - type: HyperlinkBook -# url: https://wiki.nyanotrasen.moe/view/Hacking - -- type: entity - parent: BaseHyperlinkBook - id: HyperlinkBookAtmos - suffix: GuidebookBook - name: How to Make Gas Hot - description: A guide on Atmospherics. Make sure to grab the thrilling sequal; What to do When Gas Hot. - components: - - type: Sprite - layers: - - state: book_engineering2 - # - type: HyperlinkBook - # url: https://wiki.nyanotrasen.moe/view/Atmospheric_Science -# - type: GuidebookBook -# guides: -# - Atmospherics diff --git a/Resources/Prototypes/Objectives/stealTargetGroups.yml b/Resources/Prototypes/Objectives/stealTargetGroups.yml index b561998801..aca67b2654 100644 --- a/Resources/Prototypes/Objectives/stealTargetGroups.yml +++ b/Resources/Prototypes/Objectives/stealTargetGroups.yml @@ -1,12 +1,5 @@ # Traitor single items -- type: stealTargetGroup - id: SupermatterSliver - name: supermatter sliver - sprite: - sprite: Supermatter/supermatter_sliver.rsi - state: icon - - type: stealTargetGroup id: Hypospray name: hypospray diff --git a/Resources/Prototypes/Traits/skills.yml b/Resources/Prototypes/Traits/skills.yml index ea3730b9bc..35c2e17371 100644 --- a/Resources/Prototypes/Traits/skills.yml +++ b/Resources/Prototypes/Traits/skills.yml @@ -24,6 +24,7 @@ requirements: - !type:CharacterJobRequirement inverted: true + jobs: - Borg - MedicalBorg - !type:CharacterTraitRequirement diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml index 786f641ddd..5903adb595 100644 --- a/Resources/Prototypes/tags.yml +++ b/Resources/Prototypes/tags.yml @@ -10,6 +10,9 @@ - type: Tag id: AirSensor +- type: Tag + id: AllowLamiaHardsuit + - type: Tag id: Ambrosia diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi/meta.json index 4fbd43a08b..a3e0090b8f 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi/meta.json @@ -19,8 +19,11 @@ "directions": 4 }, { - "name": "inhand-right", - "directions": 4 + "name": "inhand-right", + "directions": 4 + }, + { + "name": "segment" } ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi/segment.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi/segment.png new file mode 100644 index 0000000000..c97ab674f2 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi/segment.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi/equipped-OUTERCLOTHING-lamia.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi/equipped-OUTERCLOTHING-lamia.png new file mode 100644 index 0000000000..a61d875e72 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi/equipped-OUTERCLOTHING-lamia.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi/meta.json index 4fbd43a08b..003d052f95 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi/meta.json @@ -1,26 +1,33 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from paradisestation at commit https://github.com/ParadiseSS13/Paradise/commit/12c21ced8432015485484b17e311dcceb7c458f6", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from paradisestation at commit https://github.com/ParadiseSS13/Paradise/commit/12c21ced8432015485484b17e311dcceb7c458f6. , lamia & segment by @noctyrnal", + "size": { + "x": 32, + "y": 32 }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-lamia", + "directions": 4 + }, + { + "name": "segment" + } + ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi/segment.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi/segment.png new file mode 100644 index 0000000000..c97ab674f2 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi/segment.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi/meta.json index 4fbd43a08b..a3e0090b8f 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi/meta.json @@ -19,8 +19,11 @@ "directions": 4 }, { - "name": "inhand-right", - "directions": 4 + "name": "inhand-right", + "directions": 4 + }, + { + "name": "segment" } ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi/segment.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi/segment.png new file mode 100644 index 0000000000..c97ab674f2 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi/segment.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi/meta.json index 4fbd43a08b..a3e0090b8f 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi/meta.json @@ -19,8 +19,11 @@ "directions": 4 }, { - "name": "inhand-right", - "directions": 4 + "name": "inhand-right", + "directions": 4 + }, + { + "name": "segment" } ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi/segment.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi/segment.png new file mode 100644 index 0000000000..c97ab674f2 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi/segment.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi/meta.json index 4fbd43a08b..a3e0090b8f 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi/meta.json @@ -19,8 +19,11 @@ "directions": 4 }, { - "name": "inhand-right", - "directions": 4 + "name": "inhand-right", + "directions": 4 + }, + { + "name": "segment" } ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi/segment.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi/segment.png new file mode 100644 index 0000000000..c97ab674f2 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi/segment.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/atmospherics.rsi/equipped-OUTERCLOTHING-lamia.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/atmospherics.rsi/equipped-OUTERCLOTHING-lamia.png new file mode 100644 index 0000000000..f9c943fe7b Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/atmospherics.rsi/equipped-OUTERCLOTHING-lamia.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/atmospherics.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/atmospherics.rsi/meta.json index ef5e62cca4..0c75fe63b5 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/atmospherics.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/atmospherics.rsi/meta.json @@ -1,11 +1,11 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", - "size": { - "x": 32, - "y": 32 - }, + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, lamia & segment by @noctyrnal", + "size": { + "x": 32, + "y": 32 + }, "states": [ { "name": "icon" @@ -25,6 +25,13 @@ { "name": "equipped-OUTERCLOTHING-harpy", "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-lamia", + "directions": 4 + }, + { + "name": "segment" } ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/atmospherics.rsi/segment.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/atmospherics.rsi/segment.png new file mode 100644 index 0000000000..056ce54c6b Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/atmospherics.rsi/segment.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/basic.rsi/equipped-OUTERCLOTHING-lamia.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/basic.rsi/equipped-OUTERCLOTHING-lamia.png new file mode 100644 index 0000000000..cbe28cd477 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/basic.rsi/equipped-OUTERCLOTHING-lamia.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/basic.rsi/segment.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/basic.rsi/segment.png new file mode 100644 index 0000000000..91747f2ee6 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/basic.rsi/segment.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmedic.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmedic.rsi/meta.json index 6cfe1ea214..6f234fe219 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmedic.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmedic.rsi/meta.json @@ -23,8 +23,11 @@ "directions": 4 }, { - "name": "inhand-right", - "directions": 4 + "name": "inhand-right", + "directions": 4 + }, + { + "name": "segment" } ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmedic.rsi/segment.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmedic.rsi/segment.png new file mode 100644 index 0000000000..c97ab674f2 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmedic.rsi/segment.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/equipped-OUTERCLOTHING-lamia.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/equipped-OUTERCLOTHING-lamia.png new file mode 100644 index 0000000000..9e1327db34 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/equipped-OUTERCLOTHING-lamia.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/meta.json index 7f50fdcf08..56b23c00af 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/meta.json @@ -1,11 +1,11 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Made by Emisse for SS14", - "size": { - "x": 32, - "y": 32 - }, + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by Emisse for SS14, lamia & segment by @noctyrnal", + "size": { + "x": 32, + "y": 32 + }, "states": [ { "name": "icon" @@ -25,6 +25,13 @@ { "name": "equipped-OUTERCLOTHING-harpy", "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-lamia", + "directions": 4 + }, + { + "name": "segment" } ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/segment.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/segment.png new file mode 100644 index 0000000000..f2a4dbb382 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/segment.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/cburn.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cburn.rsi/meta.json index 2de954bbf9..069e34790f 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/cburn.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cburn.rsi/meta.json @@ -23,8 +23,11 @@ "directions": 4 }, { - "name": "inhand-right", - "directions": 4 + "name": "inhand-right", + "directions": 4 + }, + { + "name": "segment" } ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/cburn.rsi/segment.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cburn.rsi/segment.png new file mode 100644 index 0000000000..c97ab674f2 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cburn.rsi/segment.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/clown.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/clown.rsi/meta.json index 090140fa8c..9dbfe56681 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/clown.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/clown.rsi/meta.json @@ -25,6 +25,9 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "segment" } ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/clown.rsi/segment.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/clown.rsi/segment.png new file mode 100644 index 0000000000..c97ab674f2 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/clown.rsi/segment.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/equipped-OUTERCLOTHING-lamia.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/equipped-OUTERCLOTHING-lamia.png new file mode 100644 index 0000000000..5da5227444 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/equipped-OUTERCLOTHING-lamia.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/meta.json index 1cfa2a9cfe..d8bc5451cb 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/meta.json @@ -1,11 +1,11 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Sprite made by Gtheglorious based on the sprite made by emisse for ss14, harpy variant by VMSolidus", - "size": { - "x": 32, - "y": 32 - }, + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprite made by Gtheglorious based on the sprite made by emisse for ss14, harpy variant by VMSolidus, lamia & segment by @noctyrnal", + "size": { + "x": 32, + "y": 32 + }, "states": [ { "name": "icon" @@ -25,6 +25,13 @@ { "name": "equipped-OUTERCLOTHING-harpy", "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-lamia", + "directions": 4 + }, + { + "name": "segment" } ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/segment.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/segment.png new file mode 100644 index 0000000000..7bdd563935 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/segment.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/meta.json index f6910b12aa..acc4195b3f 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/meta.json @@ -23,8 +23,11 @@ "directions": 4 }, { - "name": "inhand-right", - "directions": 4 + "name": "inhand-right", + "directions": 4 + }, + { + "name": "segment" } ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/segment.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/segment.png new file mode 100644 index 0000000000..c97ab674f2 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/segment.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering-white.rsi/equipped-OUTERCLOTHING-lamia.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering-white.rsi/equipped-OUTERCLOTHING-lamia.png new file mode 100644 index 0000000000..cc30d8c7d2 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering-white.rsi/equipped-OUTERCLOTHING-lamia.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering-white.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering-white.rsi/meta.json index ef5e62cca4..0c75fe63b5 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering-white.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering-white.rsi/meta.json @@ -1,11 +1,11 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", - "size": { - "x": 32, - "y": 32 - }, + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, lamia & segment by @noctyrnal", + "size": { + "x": 32, + "y": 32 + }, "states": [ { "name": "icon" @@ -25,6 +25,13 @@ { "name": "equipped-OUTERCLOTHING-harpy", "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-lamia", + "directions": 4 + }, + { + "name": "segment" } ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering-white.rsi/segment.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering-white.rsi/segment.png new file mode 100644 index 0000000000..2217a86857 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering-white.rsi/segment.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering.rsi/equipped-OUTERCLOTHING-lamia.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering.rsi/equipped-OUTERCLOTHING-lamia.png new file mode 100644 index 0000000000..27325e27ff Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering.rsi/equipped-OUTERCLOTHING-lamia.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering.rsi/meta.json index cbf3391af7..336a597d2f 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering.rsi/meta.json @@ -1,11 +1,11 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, harpy version by VMSolidus", - "size": { - "x": 32, - "y": 32 - }, + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, harpy version by VMSolidus, lamia & segment by @noctyrnal", + "size": { + "x": 32, + "y": 32 + }, "states": [ { "name": "icon" @@ -25,6 +25,13 @@ { "name": "equipped-OUTERCLOTHING-harpy", "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-lamia", + "directions": 4 + }, + { + "name": "segment" } ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering.rsi/segment.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering.rsi/segment.png new file mode 100644 index 0000000000..371541123c Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering.rsi/segment.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/lingspacesuit.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/lingspacesuit.rsi/meta.json index 0249e35995..61121c1bff 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/lingspacesuit.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/lingspacesuit.rsi/meta.json @@ -19,8 +19,11 @@ "directions": 4 }, { - "name": "inhand-right", - "directions": 4 + "name": "inhand-right", + "directions": 4 + }, + { + "name": "segment" } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/lingspacesuit.rsi/segment.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/lingspacesuit.rsi/segment.png new file mode 100644 index 0000000000..c97ab674f2 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/lingspacesuit.rsi/segment.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi/equipped-OUTERCLOTHING-lamia.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi/equipped-OUTERCLOTHING-lamia.png new file mode 100644 index 0000000000..0272ceb588 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi/equipped-OUTERCLOTHING-lamia.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi/meta.json index 0261a0564f..a220b308ac 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi/meta.json @@ -1,11 +1,11 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Texture edit from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", - "size": { - "x": 32, - "y": 32 - }, + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Texture edit from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, lamia & segment by @noctyrnal", + "size": { + "x": 32, + "y": 32 + }, "states": [ { "name": "icon" @@ -25,6 +25,13 @@ { "name": "equipped-OUTERCLOTHING-harpy", "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-lamia", + "directions": 4 + }, + { + "name": "segment" } ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi/segment.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi/segment.png new file mode 100644 index 0000000000..aacde8c723 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi/segment.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/maxim.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/maxim.rsi/meta.json index 3641da6f50..0a10fc9d33 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/maxim.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/maxim.rsi/meta.json @@ -19,8 +19,11 @@ "directions": 4 }, { - "name": "inhand-right", - "directions": 4 + "name": "inhand-right", + "directions": 4 + }, + { + "name": "segment" } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/maxim.rsi/segment.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/maxim.rsi/segment.png new file mode 100644 index 0000000000..c97ab674f2 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/maxim.rsi/segment.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/equipped-OUTERCLOTHING-lamia.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/equipped-OUTERCLOTHING-lamia.png new file mode 100644 index 0000000000..8773725383 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/equipped-OUTERCLOTHING-lamia.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/meta.json index ef5e62cca4..0c75fe63b5 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/meta.json @@ -1,11 +1,11 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", - "size": { - "x": 32, - "y": 32 - }, + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, lamia & segment by @noctyrnal", + "size": { + "x": 32, + "y": 32 + }, "states": [ { "name": "icon" @@ -25,6 +25,13 @@ { "name": "equipped-OUTERCLOTHING-harpy", "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-lamia", + "directions": 4 + }, + { + "name": "segment" } ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/segment.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/segment.png new file mode 100644 index 0000000000..290153565e Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/segment.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/mime.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/mime.rsi/meta.json index a5f992108c..20c4b3ebbe 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/mime.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/mime.rsi/meta.json @@ -21,6 +21,9 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "segment" } ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/mime.rsi/segment.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/mime.rsi/segment.png new file mode 100644 index 0000000000..c97ab674f2 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/mime.rsi/segment.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/equipped-OUTERCLOTHING-lamia.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/equipped-OUTERCLOTHING-lamia.png new file mode 100644 index 0000000000..ba1d3fbdc2 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/equipped-OUTERCLOTHING-lamia.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/meta.json index 64b98f1e79..aa1390a137 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/meta.json @@ -1,11 +1,11 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from paradise station git at commit https://github.com/ParadiseSS13/Paradise/commit/e5e584804b4b0b373a6a69d23afb73fd3c094365, redrawn by Ubaser", - "size": { - "x": 32, - "y": 32 - }, + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from paradise station git at commit https://github.com/ParadiseSS13/Paradise/commit/e5e584804b4b0b373a6a69d23afb73fd3c094365, redrawn by Ubaser, lamia & segment by @noctyrnal", + "size": { + "x": 32, + "y": 32 + }, "states": [ { "name": "icon" @@ -25,6 +25,13 @@ { "name": "equipped-OUTERCLOTHING-harpy", "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-lamia", + "directions": 4 + }, + { + "name": "segment" } ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/segment.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/segment.png new file mode 100644 index 0000000000..b750e3ce22 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/segment.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/piratecaptain.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/piratecaptain.rsi/meta.json index 8840689d9e..8a58b1f623 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/piratecaptain.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/piratecaptain.rsi/meta.json @@ -21,6 +21,9 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "segment" } ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/piratecaptain.rsi/segment.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/piratecaptain.rsi/segment.png new file mode 100644 index 0000000000..c97ab674f2 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/piratecaptain.rsi/segment.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/pirateeva.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/pirateeva.rsi/meta.json index 8840689d9e..8a58b1f623 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/pirateeva.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/pirateeva.rsi/meta.json @@ -21,6 +21,9 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "segment" } ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/pirateeva.rsi/segment.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/pirateeva.rsi/segment.png new file mode 100644 index 0000000000..c97ab674f2 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/pirateeva.rsi/segment.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/equipped-OUTERCLOTHING-lamia.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/equipped-OUTERCLOTHING-lamia.png new file mode 100644 index 0000000000..b707f6bf11 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/equipped-OUTERCLOTHING-lamia.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/segment.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/segment.png new file mode 100644 index 0000000000..972865cd17 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/segment.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/salvage.rsi/equipped-OUTERCLOTHING-lamia.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/salvage.rsi/equipped-OUTERCLOTHING-lamia.png new file mode 100644 index 0000000000..b3ab296976 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/salvage.rsi/equipped-OUTERCLOTHING-lamia.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/salvage.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/salvage.rsi/meta.json index ef5e62cca4..0c75fe63b5 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/salvage.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/salvage.rsi/meta.json @@ -1,11 +1,11 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", - "size": { - "x": 32, - "y": 32 - }, + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, lamia & segment by @noctyrnal", + "size": { + "x": 32, + "y": 32 + }, "states": [ { "name": "icon" @@ -25,6 +25,13 @@ { "name": "equipped-OUTERCLOTHING-harpy", "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-lamia", + "directions": 4 + }, + { + "name": "segment" } ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/salvage.rsi/segment.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/salvage.rsi/segment.png new file mode 100644 index 0000000000..5ad6fc8b35 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/salvage.rsi/segment.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/santahardsuit.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/santahardsuit.rsi/meta.json index 13748622fe..0892ec8c86 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/santahardsuit.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/santahardsuit.rsi/meta.json @@ -19,8 +19,11 @@ "directions": 4 }, { - "name": "inhand-right", - "directions": 4 + "name": "inhand-right", + "directions": 4 + }, + { + "name": "segment" } ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/santahardsuit.rsi/segment.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/santahardsuit.rsi/segment.png new file mode 100644 index 0000000000..c97ab674f2 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/santahardsuit.rsi/segment.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-red.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-red.rsi/meta.json index e482264df5..5a4b4eb36f 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-red.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-red.rsi/meta.json @@ -19,8 +19,11 @@ "directions": 4 }, { - "name": "inhand-right", - "directions": 4 + "name": "inhand-right", + "directions": 4 + }, + { + "name": "segment" } ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-red.rsi/segment.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-red.rsi/segment.png new file mode 100644 index 0000000000..c97ab674f2 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-red.rsi/segment.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-warden.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-warden.rsi/meta.json index 54a0ed85fa..ef4edbed96 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-warden.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-warden.rsi/meta.json @@ -19,8 +19,11 @@ "directions": 4 }, { - "name": "inhand-right", - "directions": 4 + "name": "inhand-right", + "directions": 4 + }, + { + "name": "segment" } ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-warden.rsi/segment.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-warden.rsi/segment.png new file mode 100644 index 0000000000..c97ab674f2 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-warden.rsi/segment.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security.rsi/meta.json index 32d6d8901a..c551bf917e 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security.rsi/meta.json @@ -19,8 +19,11 @@ "directions": 4 }, { - "name": "inhand-right", - "directions": 4 + "name": "inhand-right", + "directions": 4 + }, + { + "name": "segment" } ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security.rsi/segment.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security.rsi/segment.png new file mode 100644 index 0000000000..c97ab674f2 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security.rsi/segment.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/spatio.rsi/equipped-OUTERCLOTHING-lamia.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/spatio.rsi/equipped-OUTERCLOTHING-lamia.png new file mode 100644 index 0000000000..c7344388fb Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/spatio.rsi/equipped-OUTERCLOTHING-lamia.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/spatio.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/spatio.rsi/meta.json index f6a942a895..a52fc0259e 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/spatio.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/spatio.rsi/meta.json @@ -1,13 +1,12 @@ - { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Original by Emisse, modified by EmoGarbage404", + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Original by Emisse, modified by EmoGarbage404, lamia & segment by @noctyrnal", - "size": { - "x": 32, - "y": 32 - }, + "size": { + "x": 32, + "y": 32 + }, "states": [ { "name": "icon" @@ -27,6 +26,13 @@ { "name": "equipped-OUTERCLOTHING-harpy", "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-lamia", + "directions": 4 + }, + { + "name": "segment" } ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/spatio.rsi/segment.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/spatio.rsi/segment.png new file mode 100644 index 0000000000..68fc755c56 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/spatio.rsi/segment.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/equipped-OUTERCLOTHING-lamia.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/equipped-OUTERCLOTHING-lamia.png new file mode 100644 index 0000000000..040ad09939 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/equipped-OUTERCLOTHING-lamia.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/meta.json index b9b739337b..687d271438 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/meta.json @@ -1,11 +1,11 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/fb2d71495bfe81446159ef528534193d09dd8d34, equipped-OUTERCLOTHING-monkey made by Dutch-VanDerLinde", - "size": { - "x": 32, - "y": 32 - }, + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/fb2d71495bfe81446159ef528534193d09dd8d34, equipped-OUTERCLOTHING-monkey made by Dutch-VanDerLinde, lamia & segment by @noctyrnal", + "size": { + "x": 32, + "y": 32 + }, "states": [ { "name": "icon" @@ -23,12 +23,19 @@ "directions": 4 }, { - "name": "inhand-right", - "directions": 4 + "name": "inhand-right", + "directions": 4 }, { "name": "equipped-OUTERCLOTHING-harpy", "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-lamia", + "directions": 4 + }, + { + "name": "segment" } ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/segment.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/segment.png new file mode 100644 index 0000000000..1a9469334f Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/segment.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/equipped-OUTERCLOTHING-lamia.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/equipped-OUTERCLOTHING-lamia.png new file mode 100644 index 0000000000..ccf53e302b Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/equipped-OUTERCLOTHING-lamia.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/meta.json index 4aa4d60ccb..fc4030c881 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/meta.json @@ -1,11 +1,11 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from vg at commit https://github.com/vgstation-coders/vgstation13/commit/a16e41020a93479e9a7e2af343b1b74f7f2a61bd", - "size": { - "x": 32, - "y": 32 - }, + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from vg at commit https://github.com/vgstation-coders/vgstation13/commit/a16e41020a93479e9a7e2af343b1b74f7f2a61bd, lamia & segment by @noctyrnal", + "size": { + "x": 32, + "y": 32 + }, "states": [ { "name": "icon" @@ -25,6 +25,13 @@ { "name": "equipped-OUTERCLOTHING-harpy", "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-lamia", + "directions": 4 + }, + { + "name": "segment" } ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/segment.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/segment.png new file mode 100644 index 0000000000..1a9469334f Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/segment.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/equipped-OUTERCLOTHING-lamia.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/equipped-OUTERCLOTHING-lamia.png new file mode 100644 index 0000000000..bfbbece8c4 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/equipped-OUTERCLOTHING-lamia.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/segment.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/segment.png new file mode 100644 index 0000000000..713ca5714a Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/segment.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/equipped-OUTERCLOTHING-lamia.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/equipped-OUTERCLOTHING-lamia.png new file mode 100644 index 0000000000..b740adfdb2 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/equipped-OUTERCLOTHING-lamia.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/meta.json index 41c1418992..5af55490ad 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/meta.json @@ -25,6 +25,13 @@ { "name": "equipped-OUTERCLOTHING-harpy", "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-lamia", + "directions": 4 + }, + { + "name": "segment" } ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/segment.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/segment.png new file mode 100644 index 0000000000..0687aa9d0d Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/segment.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/wizard.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/wizard.rsi/meta.json index e482264df5..5a4b4eb36f 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/wizard.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/wizard.rsi/meta.json @@ -19,8 +19,11 @@ "directions": 4 }, { - "name": "inhand-right", - "directions": 4 + "name": "inhand-right", + "directions": 4 + }, + { + "name": "segment" } ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/wizard.rsi/segment.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/wizard.rsi/segment.png new file mode 100644 index 0000000000..c97ab674f2 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/wizard.rsi/segment.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/ancient_voidsuit.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Suits/ancient_voidsuit.rsi/meta.json index 3a71879aff..0811530b9e 100644 --- a/Resources/Textures/Clothing/OuterClothing/Suits/ancient_voidsuit.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Suits/ancient_voidsuit.rsi/meta.json @@ -45,8 +45,11 @@ "directions": 4 }, { - "name": "inhand-right", - "directions": 4 + "name": "inhand-right", + "directions": 4 + }, + { + "name": "segment" } ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/ancient_voidsuit.rsi/segment.png b/Resources/Textures/Clothing/OuterClothing/Suits/ancient_voidsuit.rsi/segment.png new file mode 100644 index 0000000000..c97ab674f2 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Suits/ancient_voidsuit.rsi/segment.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/atmos_firesuit.rsi/equipped-OUTERCLOTHING-lamia.png b/Resources/Textures/Clothing/OuterClothing/Suits/atmos_firesuit.rsi/equipped-OUTERCLOTHING-lamia.png new file mode 100644 index 0000000000..72f2f4b76b Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Suits/atmos_firesuit.rsi/equipped-OUTERCLOTHING-lamia.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/atmos_firesuit.rsi/segment.png b/Resources/Textures/Clothing/OuterClothing/Suits/atmos_firesuit.rsi/segment.png new file mode 100644 index 0000000000..3a2b136ebd Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Suits/atmos_firesuit.rsi/segment.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/bombsuit.rsi/equipped-OUTERCLOTHING-lamia.png b/Resources/Textures/Clothing/OuterClothing/Suits/bombsuit.rsi/equipped-OUTERCLOTHING-lamia.png new file mode 100644 index 0000000000..a5d1135dee Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Suits/bombsuit.rsi/equipped-OUTERCLOTHING-lamia.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/bombsuit.rsi/segment.png b/Resources/Textures/Clothing/OuterClothing/Suits/bombsuit.rsi/segment.png new file mode 100644 index 0000000000..bc07da7e78 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Suits/bombsuit.rsi/segment.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/eva.rsi/equipped-OUTERCLOTHING-lamia.png b/Resources/Textures/Clothing/OuterClothing/Suits/eva.rsi/equipped-OUTERCLOTHING-lamia.png new file mode 100644 index 0000000000..b0e720f3be Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Suits/eva.rsi/equipped-OUTERCLOTHING-lamia.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/eva.rsi/segment.png b/Resources/Textures/Clothing/OuterClothing/Suits/eva.rsi/segment.png new file mode 100644 index 0000000000..5a21938eca Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Suits/eva.rsi/segment.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/eva_emergency.rsi/equipped-OUTERCLOTHING-lamia.png b/Resources/Textures/Clothing/OuterClothing/Suits/eva_emergency.rsi/equipped-OUTERCLOTHING-lamia.png new file mode 100644 index 0000000000..c606944fb0 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Suits/eva_emergency.rsi/equipped-OUTERCLOTHING-lamia.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/eva_emergency.rsi/segment.png b/Resources/Textures/Clothing/OuterClothing/Suits/eva_emergency.rsi/segment.png new file mode 100644 index 0000000000..b2cf94d4cf Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Suits/eva_emergency.rsi/segment.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/eva_prisoner.rsi/equipped-OUTERCLOTHING-lamia.png b/Resources/Textures/Clothing/OuterClothing/Suits/eva_prisoner.rsi/equipped-OUTERCLOTHING-lamia.png new file mode 100644 index 0000000000..c5f1a4d41a Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Suits/eva_prisoner.rsi/equipped-OUTERCLOTHING-lamia.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/eva_prisoner.rsi/segment.png b/Resources/Textures/Clothing/OuterClothing/Suits/eva_prisoner.rsi/segment.png new file mode 100644 index 0000000000..4ab04aee99 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Suits/eva_prisoner.rsi/segment.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/eva_syndicate.rsi/equipped-OUTERCLOTHING-lamia.png b/Resources/Textures/Clothing/OuterClothing/Suits/eva_syndicate.rsi/equipped-OUTERCLOTHING-lamia.png new file mode 100644 index 0000000000..5331e68d1c Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Suits/eva_syndicate.rsi/equipped-OUTERCLOTHING-lamia.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/eva_syndicate.rsi/segment.png b/Resources/Textures/Clothing/OuterClothing/Suits/eva_syndicate.rsi/segment.png new file mode 100644 index 0000000000..1a6df55d05 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Suits/eva_syndicate.rsi/segment.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/fire.rsi/equipped-OUTERCLOTHING-lamia.png b/Resources/Textures/Clothing/OuterClothing/Suits/fire.rsi/equipped-OUTERCLOTHING-lamia.png new file mode 100644 index 0000000000..979a4eb20e Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Suits/fire.rsi/equipped-OUTERCLOTHING-lamia.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/fire.rsi/segment.png b/Resources/Textures/Clothing/OuterClothing/Suits/fire.rsi/segment.png new file mode 100644 index 0000000000..3764a4fa05 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Suits/fire.rsi/segment.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/rad.rsi/equipped-OUTERCLOTHING-lamia.png b/Resources/Textures/Clothing/OuterClothing/Suits/rad.rsi/equipped-OUTERCLOTHING-lamia.png new file mode 100644 index 0000000000..c7a776d958 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Suits/rad.rsi/equipped-OUTERCLOTHING-lamia.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/rad.rsi/segment.png b/Resources/Textures/Clothing/OuterClothing/Suits/rad.rsi/segment.png new file mode 100644 index 0000000000..53c50d2d56 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Suits/rad.rsi/segment.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/spaceninja.rsi/equipped-OUTERCLOTHING-lamia.png b/Resources/Textures/Clothing/OuterClothing/Suits/spaceninja.rsi/equipped-OUTERCLOTHING-lamia.png new file mode 100644 index 0000000000..3b500a5046 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Suits/spaceninja.rsi/equipped-OUTERCLOTHING-lamia.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/spaceninja.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Suits/spaceninja.rsi/meta.json index 0174b889d2..d057b887bf 100644 --- a/Resources/Textures/Clothing/OuterClothing/Suits/spaceninja.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Suits/spaceninja.rsi/meta.json @@ -1,26 +1,33 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from paradise https://github.com/ParadiseSS13/Paradise/tree/master/icons (unknown commit)", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from paradise https://github.com/ParadiseSS13/Paradise/tree/master/icons (unknown commit). lamia & segment by @noctyrnal", + "size": { + "x": 32, + "y": 32 }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-lamia", + "directions": 4 + }, + { + "name": "segment" + } + ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/spaceninja.rsi/segment.png b/Resources/Textures/Clothing/OuterClothing/Suits/spaceninja.rsi/segment.png new file mode 100644 index 0000000000..fbfe73d721 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Suits/spaceninja.rsi/segment.png differ diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/advanced.rsi/equipped-OUTERCLOTHING-lamia.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/advanced.rsi/equipped-OUTERCLOTHING-lamia.png new file mode 100644 index 0000000000..172cf756a4 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/advanced.rsi/equipped-OUTERCLOTHING-lamia.png differ diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/advanced.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/advanced.rsi/meta.json index 4844e816bd..cf10d74aed 100644 --- a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/advanced.rsi/meta.json +++ b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/advanced.rsi/meta.json @@ -1,11 +1,11 @@ { - "version": 1, - "license": "CC0-1.0", - "copyright": "Original work by TJohnson.", - "size": { - "x": 32, - "y": 32 - }, + "version": 1, + "license": "CC0-1.0", + "copyright": "Original work by TJohnson. lamia & segment by @noctyrnal", + "size": { + "x": 32, + "y": 32 + }, "states": [ { "name": "icon" @@ -18,6 +18,10 @@ "name": "equipped-OUTERCLOTHING-harpy", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-lamia", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 @@ -25,6 +29,9 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "segment" } ] } diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/advanced.rsi/segment.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/advanced.rsi/segment.png new file mode 100644 index 0000000000..c97ab674f2 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/advanced.rsi/segment.png differ diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/corpsman.rsi/equipped-OUTERCLOTHING-lamia.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/corpsman.rsi/equipped-OUTERCLOTHING-lamia.png new file mode 100644 index 0000000000..9788b33baf Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/corpsman.rsi/equipped-OUTERCLOTHING-lamia.png differ diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/corpsman.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/corpsman.rsi/meta.json index 4844e816bd..cf10d74aed 100644 --- a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/corpsman.rsi/meta.json +++ b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/corpsman.rsi/meta.json @@ -1,11 +1,11 @@ { - "version": 1, - "license": "CC0-1.0", - "copyright": "Original work by TJohnson.", - "size": { - "x": 32, - "y": 32 - }, + "version": 1, + "license": "CC0-1.0", + "copyright": "Original work by TJohnson. lamia & segment by @noctyrnal", + "size": { + "x": 32, + "y": 32 + }, "states": [ { "name": "icon" @@ -18,6 +18,10 @@ "name": "equipped-OUTERCLOTHING-harpy", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-lamia", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 @@ -25,6 +29,9 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "segment" } ] } diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/corpsman.rsi/segment.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/corpsman.rsi/segment.png new file mode 100644 index 0000000000..481ab8594d Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/corpsman.rsi/segment.png differ diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/hos.rsi/equipped-OUTERCLOTHING-lamia.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/hos.rsi/equipped-OUTERCLOTHING-lamia.png new file mode 100644 index 0000000000..7b79d271d5 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/hos.rsi/equipped-OUTERCLOTHING-lamia.png differ diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/hos.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/hos.rsi/meta.json index 4844e816bd..cf10d74aed 100644 --- a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/hos.rsi/meta.json +++ b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/hos.rsi/meta.json @@ -1,11 +1,11 @@ { - "version": 1, - "license": "CC0-1.0", - "copyright": "Original work by TJohnson.", - "size": { - "x": 32, - "y": 32 - }, + "version": 1, + "license": "CC0-1.0", + "copyright": "Original work by TJohnson. lamia & segment by @noctyrnal", + "size": { + "x": 32, + "y": 32 + }, "states": [ { "name": "icon" @@ -18,6 +18,10 @@ "name": "equipped-OUTERCLOTHING-harpy", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-lamia", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 @@ -25,6 +29,9 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "segment" } ] } diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/hos.rsi/segment.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/hos.rsi/segment.png new file mode 100644 index 0000000000..481ab8594d Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/hos.rsi/segment.png differ diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/medical.rsi/equipped-OUTERCLOTHING-lamia.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/medical.rsi/equipped-OUTERCLOTHING-lamia.png new file mode 100644 index 0000000000..5cef9a5282 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/medical.rsi/equipped-OUTERCLOTHING-lamia.png differ diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/medical.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/medical.rsi/meta.json index 4844e816bd..cf10d74aed 100644 --- a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/medical.rsi/meta.json +++ b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/medical.rsi/meta.json @@ -1,11 +1,11 @@ { - "version": 1, - "license": "CC0-1.0", - "copyright": "Original work by TJohnson.", - "size": { - "x": 32, - "y": 32 - }, + "version": 1, + "license": "CC0-1.0", + "copyright": "Original work by TJohnson. lamia & segment by @noctyrnal", + "size": { + "x": 32, + "y": 32 + }, "states": [ { "name": "icon" @@ -18,6 +18,10 @@ "name": "equipped-OUTERCLOTHING-harpy", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-lamia", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 @@ -25,6 +29,9 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "segment" } ] } diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/medical.rsi/segment.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/medical.rsi/segment.png new file mode 100644 index 0000000000..c97ab674f2 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/medical.rsi/segment.png differ diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/officer.rsi/equipped-OUTERCLOTHING-lamia.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/officer.rsi/equipped-OUTERCLOTHING-lamia.png new file mode 100644 index 0000000000..850956e689 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/officer.rsi/equipped-OUTERCLOTHING-lamia.png differ diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/officer.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/officer.rsi/meta.json index 4844e816bd..cf10d74aed 100644 --- a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/officer.rsi/meta.json +++ b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/officer.rsi/meta.json @@ -1,11 +1,11 @@ { - "version": 1, - "license": "CC0-1.0", - "copyright": "Original work by TJohnson.", - "size": { - "x": 32, - "y": 32 - }, + "version": 1, + "license": "CC0-1.0", + "copyright": "Original work by TJohnson. lamia & segment by @noctyrnal", + "size": { + "x": 32, + "y": 32 + }, "states": [ { "name": "icon" @@ -18,6 +18,10 @@ "name": "equipped-OUTERCLOTHING-harpy", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-lamia", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 @@ -25,6 +29,9 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "segment" } ] } diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/officer.rsi/segment.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/officer.rsi/segment.png new file mode 100644 index 0000000000..481ab8594d Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/officer.rsi/segment.png differ diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/riot.rsi/equipped-OUTERCLOTHING-lamia.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/riot.rsi/equipped-OUTERCLOTHING-lamia.png new file mode 100644 index 0000000000..454939d731 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/riot.rsi/equipped-OUTERCLOTHING-lamia.png differ diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/riot.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/riot.rsi/meta.json index 4844e816bd..cf10d74aed 100644 --- a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/riot.rsi/meta.json +++ b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/riot.rsi/meta.json @@ -1,11 +1,11 @@ { - "version": 1, - "license": "CC0-1.0", - "copyright": "Original work by TJohnson.", - "size": { - "x": 32, - "y": 32 - }, + "version": 1, + "license": "CC0-1.0", + "copyright": "Original work by TJohnson. lamia & segment by @noctyrnal", + "size": { + "x": 32, + "y": 32 + }, "states": [ { "name": "icon" @@ -18,6 +18,10 @@ "name": "equipped-OUTERCLOTHING-harpy", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-lamia", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 @@ -25,6 +29,9 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "segment" } ] } diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/riot.rsi/segment.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/riot.rsi/segment.png new file mode 100644 index 0000000000..c97ab674f2 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/riot.rsi/segment.png differ diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/standard.rsi/equipped-OUTERCLOTHING-lamia.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/standard.rsi/equipped-OUTERCLOTHING-lamia.png new file mode 100644 index 0000000000..65a4ecba00 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/standard.rsi/equipped-OUTERCLOTHING-lamia.png differ diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/standard.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/standard.rsi/meta.json index 4844e816bd..cf10d74aed 100644 --- a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/standard.rsi/meta.json +++ b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/standard.rsi/meta.json @@ -1,11 +1,11 @@ { - "version": 1, - "license": "CC0-1.0", - "copyright": "Original work by TJohnson.", - "size": { - "x": 32, - "y": 32 - }, + "version": 1, + "license": "CC0-1.0", + "copyright": "Original work by TJohnson. lamia & segment by @noctyrnal", + "size": { + "x": 32, + "y": 32 + }, "states": [ { "name": "icon" @@ -18,6 +18,10 @@ "name": "equipped-OUTERCLOTHING-harpy", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-lamia", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 @@ -25,6 +29,9 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "segment" } ] } diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/standard.rsi/segment.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/standard.rsi/segment.png new file mode 100644 index 0000000000..c97ab674f2 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/standard.rsi/segment.png differ diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/warden.rsi/equipped-OUTERCLOTHING-lamia.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/warden.rsi/equipped-OUTERCLOTHING-lamia.png new file mode 100644 index 0000000000..6591584869 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/warden.rsi/equipped-OUTERCLOTHING-lamia.png differ diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/warden.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/warden.rsi/meta.json index 4844e816bd..cf10d74aed 100644 --- a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/warden.rsi/meta.json +++ b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/warden.rsi/meta.json @@ -1,11 +1,11 @@ { - "version": 1, - "license": "CC0-1.0", - "copyright": "Original work by TJohnson.", - "size": { - "x": 32, - "y": 32 - }, + "version": 1, + "license": "CC0-1.0", + "copyright": "Original work by TJohnson. lamia & segment by @noctyrnal", + "size": { + "x": 32, + "y": 32 + }, "states": [ { "name": "icon" @@ -18,6 +18,10 @@ "name": "equipped-OUTERCLOTHING-harpy", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-lamia", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 @@ -25,6 +29,9 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "segment" } ] } diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/warden.rsi/segment.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/warden.rsi/segment.png new file mode 100644 index 0000000000..481ab8594d Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/warden.rsi/segment.png differ diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Lamia/lamia_tails.rsi/body3tone1.png b/Resources/Textures/DeltaV/Mobs/Customization/Lamia/lamia_tails.rsi/body3tone1.png new file mode 100644 index 0000000000..0a9c6f02cc Binary files /dev/null and b/Resources/Textures/DeltaV/Mobs/Customization/Lamia/lamia_tails.rsi/body3tone1.png differ diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Lamia/lamia_tails.rsi/body3tone2.png b/Resources/Textures/DeltaV/Mobs/Customization/Lamia/lamia_tails.rsi/body3tone2.png new file mode 100644 index 0000000000..1c7bb9e864 Binary files /dev/null and b/Resources/Textures/DeltaV/Mobs/Customization/Lamia/lamia_tails.rsi/body3tone2.png differ diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Lamia/lamia_tails.rsi/body3tone3.png b/Resources/Textures/DeltaV/Mobs/Customization/Lamia/lamia_tails.rsi/body3tone3.png new file mode 100644 index 0000000000..826c099ab8 Binary files /dev/null and b/Resources/Textures/DeltaV/Mobs/Customization/Lamia/lamia_tails.rsi/body3tone3.png differ diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Lamia/lamia_tails.rsi/bottom3tone1.png b/Resources/Textures/DeltaV/Mobs/Customization/Lamia/lamia_tails.rsi/bottom3tone1.png new file mode 100644 index 0000000000..a6d4bd5f2b Binary files /dev/null and b/Resources/Textures/DeltaV/Mobs/Customization/Lamia/lamia_tails.rsi/bottom3tone1.png differ diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Lamia/lamia_tails.rsi/bottom3tone2.png b/Resources/Textures/DeltaV/Mobs/Customization/Lamia/lamia_tails.rsi/bottom3tone2.png new file mode 100644 index 0000000000..9b26288a26 Binary files /dev/null and b/Resources/Textures/DeltaV/Mobs/Customization/Lamia/lamia_tails.rsi/bottom3tone2.png differ diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Lamia/lamia_tails.rsi/bottom3tone3.png b/Resources/Textures/DeltaV/Mobs/Customization/Lamia/lamia_tails.rsi/bottom3tone3.png new file mode 100644 index 0000000000..2871eb45d8 Binary files /dev/null and b/Resources/Textures/DeltaV/Mobs/Customization/Lamia/lamia_tails.rsi/bottom3tone3.png differ diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Lamia/lamia_tails.rsi/meta.json b/Resources/Textures/DeltaV/Mobs/Customization/Lamia/lamia_tails.rsi/meta.json new file mode 100644 index 0000000000..5374b72d74 --- /dev/null +++ b/Resources/Textures/DeltaV/Mobs/Customization/Lamia/lamia_tails.rsi/meta.json @@ -0,0 +1,41 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by Archer2150#2528 using assets from Rane. Fangs by discord user @Hyenh6078", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "bottom3tone1", + "directions": 4 + }, + { + "name": "bottom3tone2", + "directions": 4 + }, + { + "name": "bottom3tone3", + "directions": 4 + }, + { + "name": "body3tone1" + }, + { + "name": "body3tone2" + }, + { + "name": "body3tone3" + }, + { + "name": "tip3tone1" + }, + { + "name": "tip3tone2" + }, + { + "name": "tip3tone3" + } + ] +} diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Lamia/lamia_tails.rsi/tip3tone1.png b/Resources/Textures/DeltaV/Mobs/Customization/Lamia/lamia_tails.rsi/tip3tone1.png new file mode 100644 index 0000000000..b9c86c5b99 Binary files /dev/null and b/Resources/Textures/DeltaV/Mobs/Customization/Lamia/lamia_tails.rsi/tip3tone1.png differ diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Lamia/lamia_tails.rsi/tip3tone2.png b/Resources/Textures/DeltaV/Mobs/Customization/Lamia/lamia_tails.rsi/tip3tone2.png new file mode 100644 index 0000000000..7a37e083a7 Binary files /dev/null and b/Resources/Textures/DeltaV/Mobs/Customization/Lamia/lamia_tails.rsi/tip3tone2.png differ diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Lamia/lamia_tails.rsi/tip3tone3.png b/Resources/Textures/DeltaV/Mobs/Customization/Lamia/lamia_tails.rsi/tip3tone3.png new file mode 100644 index 0000000000..9a9abed6ab Binary files /dev/null and b/Resources/Textures/DeltaV/Mobs/Customization/Lamia/lamia_tails.rsi/tip3tone3.png differ diff --git a/Resources/Textures/Nyanotrasen/Mobs/Species/lamia.rsi/bottom.png b/Resources/Textures/Nyanotrasen/Mobs/Species/lamia.rsi/bottom.png new file mode 100644 index 0000000000..bf711ef304 Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Mobs/Species/lamia.rsi/bottom.png differ diff --git a/Resources/Textures/Nyanotrasen/Mobs/Species/lamia.rsi/meta.json b/Resources/Textures/Nyanotrasen/Mobs/Species/lamia.rsi/meta.json new file mode 100644 index 0000000000..ebfd0e2dc7 --- /dev/null +++ b/Resources/Textures/Nyanotrasen/Mobs/Species/lamia.rsi/meta.json @@ -0,0 +1,36 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by Archer2150#2528 using assets from Rane. Fangs by discord user @Hyenh6078", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "placeholder" + }, + { + "name": "bottom", + "directions": 4 + }, + { + "name": "tip" + }, + { + "name": "verbiconfangs" + }, + { + "name": "underscales", + "directions": 4 + }, + { + "name": "torso_f", + "directions": 4 + }, + { + "name": "torso_m", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Nyanotrasen/Mobs/Species/lamia.rsi/placeholder.png b/Resources/Textures/Nyanotrasen/Mobs/Species/lamia.rsi/placeholder.png new file mode 100644 index 0000000000..e0cb4814da Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Mobs/Species/lamia.rsi/placeholder.png differ diff --git a/Resources/Textures/Nyanotrasen/Mobs/Species/lamia.rsi/tip.png b/Resources/Textures/Nyanotrasen/Mobs/Species/lamia.rsi/tip.png new file mode 100644 index 0000000000..a7e023d96b Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Mobs/Species/lamia.rsi/tip.png differ diff --git a/Resources/Textures/Nyanotrasen/Mobs/Species/lamia.rsi/torso_f.png b/Resources/Textures/Nyanotrasen/Mobs/Species/lamia.rsi/torso_f.png new file mode 100644 index 0000000000..f818a47894 Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Mobs/Species/lamia.rsi/torso_f.png differ diff --git a/Resources/Textures/Nyanotrasen/Mobs/Species/lamia.rsi/torso_m.png b/Resources/Textures/Nyanotrasen/Mobs/Species/lamia.rsi/torso_m.png new file mode 100644 index 0000000000..f818a47894 Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Mobs/Species/lamia.rsi/torso_m.png differ diff --git a/Resources/Textures/Nyanotrasen/Mobs/Species/lamia.rsi/underscales.png b/Resources/Textures/Nyanotrasen/Mobs/Species/lamia.rsi/underscales.png new file mode 100644 index 0000000000..edc457a79b Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Mobs/Species/lamia.rsi/underscales.png differ diff --git a/Resources/Textures/Nyanotrasen/Mobs/Species/lamia.rsi/verbiconfangs.png b/Resources/Textures/Nyanotrasen/Mobs/Species/lamia.rsi/verbiconfangs.png new file mode 100644 index 0000000000..4511cbd21f Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Mobs/Species/lamia.rsi/verbiconfangs.png differ