diff --git a/Content.Client/_Impstation/Thaven/Eui/MoodContainer.xaml b/Content.Client/_Impstation/Thaven/Eui/MoodContainer.xaml deleted file mode 100644 index 56b4791f421..00000000000 --- a/Content.Client/_Impstation/Thaven/Eui/MoodContainer.xaml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/Content.Client/_Impstation/Thaven/Eui/MoodContainer.xaml.cs b/Content.Client/_Impstation/Thaven/Eui/MoodContainer.xaml.cs deleted file mode 100644 index 200d7b9d121..00000000000 --- a/Content.Client/_Impstation/Thaven/Eui/MoodContainer.xaml.cs +++ /dev/null @@ -1,22 +0,0 @@ -using Content.Shared._Impstation.Thaven; -using Robust.Client.AutoGenerated; -using Robust.Client.UserInterface.Controls; -using Robust.Client.UserInterface.XAML; -using Robust.Shared.Utility; - -namespace Content.Client._Impstation.Thaven.Eui; - -[GenerateTypedNameReferences] -public sealed partial class MoodContainer : BoxContainer -{ - public MoodContainer(ThavenMood? mood = null) - { - RobustXamlLoader.Load(this); - - if (mood != null) - { - ThavenMoodTitle.Text = mood.GetLocName(); - ThavenMoodContent.TextRope = new Rope.Leaf(mood.GetLocDesc()); - } - } -} diff --git a/Content.Client/_Impstation/Thaven/Eui/ThavenMoodUi.xaml b/Content.Client/_Impstation/Thaven/Eui/ThavenMoodUi.xaml deleted file mode 100644 index 5999790845f..00000000000 --- a/Content.Client/_Impstation/Thaven/Eui/ThavenMoodUi.xaml +++ /dev/null @@ -1,22 +0,0 @@ - - - this shit does not layout properly unless I put the horizontal boxcontainer inside of a vertical one - ???? - - - - - - - - - - - - - diff --git a/Content.Client/_Impstation/Thaven/Eui/ThavenMoodUi.xaml.cs b/Content.Client/_Impstation/Thaven/Eui/ThavenMoodUi.xaml.cs deleted file mode 100644 index eee6da6c0c4..00000000000 --- a/Content.Client/_Impstation/Thaven/Eui/ThavenMoodUi.xaml.cs +++ /dev/null @@ -1,94 +0,0 @@ -using Content.Client.UserInterface.Controls; -using Content.Shared._Impstation.Thaven; -using Robust.Client.AutoGenerated; -using Robust.Client.UserInterface.XAML; -using Robust.Shared.Utility; - -namespace Content.Client._Impstation.Thaven.Eui; - -[GenerateTypedNameReferences] -public sealed partial class ThavenMoodUi : FancyWindow -{ - private List _moods = new(); - - public ThavenMoodUi() - { - RobustXamlLoader.Load(this); - NewMoodButton.OnPressed += _ => AddNewMood(); - } - - private void AddNewMood() - { - MoodContainer.AddChild(new MoodContainer()); - } - - public List GetMoods() - { - var newMoods = new List(); - - foreach (var control in MoodContainer.Children) - { - if (control is not MoodContainer moodControl) - continue; - - if (string.IsNullOrWhiteSpace(moodControl.ThavenMoodTitle.Text)) - continue; - - var moodText = Rope.Collapse(moodControl.ThavenMoodContent.TextRope).Trim(); - - if (string.IsNullOrWhiteSpace(moodText)) - continue; - - var mood = new ThavenMood() - { - MoodName = moodControl.ThavenMoodTitle.Text, - MoodDesc = moodText, - }; - - newMoods.Add(mood); - } - - return newMoods; - } - - private void MoveUp(int index) - { - if (index <= 0) - return; - - (_moods[index], _moods[index - 1]) = (_moods[index - 1], _moods[index]); - SetMoods(_moods); - } - - private void MoveDown(int index) - { - if (index >= _moods.Count - 1) - return; - - (_moods[index], _moods[index + 1]) = (_moods[index + 1], _moods[index]); - SetMoods(_moods); - } - - private void Delete(int index) - { - _moods.RemoveAt(index); - - SetMoods(_moods); - } - - public void SetMoods(List moods) - { - _moods = moods; - MoodContainer.RemoveAllChildren(); - for (var i = 0; i < moods.Count; i++) - { - var index = i; // Copy for the closure - var mood = moods[i]; - var moodControl = new MoodContainer(mood); - moodControl.MoveUp.OnPressed += _ => MoveUp(index); - moodControl.MoveDown.OnPressed += _ => MoveDown(index); - moodControl.Delete.OnPressed += _ => Delete(index); - MoodContainer.AddChild(moodControl); - } - } -} diff --git a/Content.Client/_Impstation/Thaven/Eui/ThavenMoodsEui.cs b/Content.Client/_Impstation/Thaven/Eui/ThavenMoodsEui.cs deleted file mode 100644 index a6a8b05ee94..00000000000 --- a/Content.Client/_Impstation/Thaven/Eui/ThavenMoodsEui.cs +++ /dev/null @@ -1,48 +0,0 @@ -using Content.Client.Eui; -using Content.Shared.Eui; -using Content.Shared._Impstation.Thaven; - -namespace Content.Client._Impstation.Thaven.Eui; - -public sealed class ThavenMoodsEui : BaseEui -{ - private readonly EntityManager _entityManager; - - private ThavenMoodUi _thavenMoodUi; - private NetEntity _target; - - public ThavenMoodsEui() - { - _entityManager = IoCManager.Resolve(); - - _thavenMoodUi = new ThavenMoodUi(); - _thavenMoodUi.SaveButton.OnPressed += _ => SaveMoods(); - } - - private void SaveMoods() - { - var newMoods = _thavenMoodUi.GetMoods(); - SendMessage(new ThavenMoodsSaveMessage(newMoods, _target)); - _thavenMoodUi.SetMoods(newMoods); - } - - public override void Opened() - { - _thavenMoodUi.OpenCentered(); - } - - public override void HandleState(EuiStateBase state) - { - if (state is not ThavenMoodsEuiState s) - return; - - _target = s.Target; - _thavenMoodUi.SetMoods(s.Moods); - } - - public override void Closed() - { - base.Closed(); - _thavenMoodUi.Close(); - } -} diff --git a/Content.Client/_Impstation/Thaven/MoodDisplay.xaml b/Content.Client/_Impstation/Thaven/MoodDisplay.xaml deleted file mode 100644 index 3be9bf9c41f..00000000000 --- a/Content.Client/_Impstation/Thaven/MoodDisplay.xaml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - diff --git a/Content.Client/_Impstation/Thaven/MoodDisplay.xaml.cs b/Content.Client/_Impstation/Thaven/MoodDisplay.xaml.cs deleted file mode 100644 index 15ad1d25375..00000000000 --- a/Content.Client/_Impstation/Thaven/MoodDisplay.xaml.cs +++ /dev/null @@ -1,28 +0,0 @@ -using Content.Client.Message; -using Content.Shared._Impstation.Thaven; -using Robust.Client.AutoGenerated; -using Robust.Client.UserInterface; -using Robust.Client.UserInterface.XAML; - -namespace Content.Client._Impstation.Thaven; - -[GenerateTypedNameReferences] -public sealed partial class MoodDisplay : Control -{ - private string GetSharedString() - { - return $"[italic][font size=10][color=gray]{Loc.GetString("moods-ui-shared-mood")}[/color][/font][/italic]"; - } - - public MoodDisplay(ThavenMood mood, bool shared) - { - RobustXamlLoader.Load(this); - IoCManager.InjectDependencies(this); - - if (shared) - MoodNameLabel.SetMarkup($"{mood.GetLocName()} {GetSharedString()}"); - else - MoodNameLabel.SetMarkup(mood.GetLocName()); - MoodDescLabel.SetMarkup(mood.GetLocDesc()); - } -} diff --git a/Content.Client/_Impstation/Thaven/ThavenMoodSystem.cs b/Content.Client/_Impstation/Thaven/ThavenMoodSystem.cs deleted file mode 100644 index 3bde3c8f156..00000000000 --- a/Content.Client/_Impstation/Thaven/ThavenMoodSystem.cs +++ /dev/null @@ -1,7 +0,0 @@ -using Content.Shared._Impstation.Thaven; - -namespace Content.Client._Impstation.Thaven; - -public sealed partial class ThavenMoodSystem : SharedThavenMoodSystem -{ -} diff --git a/Content.Client/_Impstation/Thaven/ThavenMoodsBoundUserInterface.cs b/Content.Client/_Impstation/Thaven/ThavenMoodsBoundUserInterface.cs deleted file mode 100644 index a80f9583c1f..00000000000 --- a/Content.Client/_Impstation/Thaven/ThavenMoodsBoundUserInterface.cs +++ /dev/null @@ -1,41 +0,0 @@ -using Content.Client._Impstation.Thaven; -using Content.Shared._Impstation.Thaven; -using Content.Shared._Impstation.Thaven.Components; -using JetBrains.Annotations; -using Robust.Client.UserInterface; - -namespace Content.Client._Impstation.Thaven; - -[UsedImplicitly] -public sealed class ThavenMoodsBoundUserInterface : BoundUserInterface -{ - [ViewVariables] - private ThavenMoodsMenu? _menu; - private EntityUid _owner; - private List? _moods; - private List? _sharedMoods; - - public ThavenMoodsBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey) - { - _owner = owner; - } - - protected override void Open() - { - base.Open(); - - _menu = this.CreateWindow(); - } - - protected override void UpdateState(BoundUserInterfaceState state) - { - base.UpdateState(state); - - if (state is not ThavenMoodsBuiState msg) - return; - - _moods = msg.Moods; - _sharedMoods = msg.SharedMoods; - _menu?.Update(_owner, msg); - } -} diff --git a/Content.Client/_Impstation/Thaven/ThavenMoodsMenu.xaml b/Content.Client/_Impstation/Thaven/ThavenMoodsMenu.xaml deleted file mode 100644 index d48fa535db5..00000000000 --- a/Content.Client/_Impstation/Thaven/ThavenMoodsMenu.xaml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - diff --git a/Content.Client/_Impstation/Thaven/ThavenMoodsMenu.xaml.cs b/Content.Client/_Impstation/Thaven/ThavenMoodsMenu.xaml.cs deleted file mode 100644 index 18718151e78..00000000000 --- a/Content.Client/_Impstation/Thaven/ThavenMoodsMenu.xaml.cs +++ /dev/null @@ -1,27 +0,0 @@ -using Content.Client.UserInterface.Controls; -using Content.Shared._Impstation.Thaven.Components; -using Robust.Client.AutoGenerated; -using Robust.Client.UserInterface.XAML; - -namespace Content.Client._Impstation.Thaven; - -[GenerateTypedNameReferences] -public sealed partial class ThavenMoodsMenu : FancyWindow -{ - public ThavenMoodsMenu() - { - RobustXamlLoader.Load(this); - IoCManager.InjectDependencies(this); - } - - public void Update(EntityUid uid, ThavenMoodsBuiState state) - { - MoodDisplayContainer.Children.Clear(); - - foreach (var mood in state.SharedMoods) - MoodDisplayContainer.AddChild(new MoodDisplay(mood, true)); - - foreach (var mood in state.Moods) - MoodDisplayContainer.AddChild(new MoodDisplay(mood, false)); - } -} diff --git a/Content.IntegrationTests/Tests/_Impstation/Thaven/MoodTests.cs b/Content.IntegrationTests/Tests/_Impstation/Thaven/MoodTests.cs deleted file mode 100644 index b2a189b8501..00000000000 --- a/Content.IntegrationTests/Tests/_Impstation/Thaven/MoodTests.cs +++ /dev/null @@ -1,96 +0,0 @@ -using System.Collections.Generic; -using System.IO; -using System.Linq; -using Content.IntegrationTests; -using Content.Server._Impstation.Thaven; -using Content.Shared.Dataset; -using Content.Shared._Impstation.Thaven; -using NUnit.Framework; -using Robust.Shared.ContentPack; -using Robust.Shared.GameObjects; -using Robust.Shared.IoC; -using Robust.Shared.Prototypes; -using Robust.Shared.Serialization.Manager; - -namespace Content.IntegrationTests.Tests._Impstation.Thaven; - -[TestFixture, TestOf(typeof(ThavenMoodPrototype))] -public sealed class ThavenMoodTests -{ - [TestPrototypes] - const string PROTOTYPES = @" -- type: dataset - id: ThreeValueSet - values: - - One - - Two - - Three -- type: thavenMood - id: DuplicateTest - moodName: DuplicateTest - moodDesc: DuplicateTest - allowDuplicateMoodVars: false - moodVars: - a: ThreeValueSet - b: ThreeValueSet - c: ThreeValueSet -- type: thavenMood - id: DuplicateOverlapTest - moodName: DuplicateOverlapTest - moodDesc: DuplicateOverlapTest - allowDuplicateMoodVars: false - moodVars: - a: ThreeValueSet - b: ThreeValueSet - c: ThreeValueSet - d: ThreeValueSet - e: ThreeValueSet -"; - - [Test] - [Repeat(10)] - public async Task TestDuplicatePrevention() - { - await using var pair = await PoolManager.GetServerClient(); - var server = pair.Server; - await server.WaitIdleAsync(); - - var entMan = server.ResolveDependency(); - var thavenSystem = entMan.System(); - var protoMan = server.ResolveDependency(); - - var dataset = protoMan.Index("ThreeValueSet"); - var moodProto = protoMan.Index("DuplicateTest"); - - var datasetSet = dataset.Values.ToHashSet(); - var mood = thavenSystem.RollMood(moodProto); - var moodVarSet = mood.MoodVars.Values.ToHashSet(); - - Assert.That(moodVarSet, Is.EquivalentTo(datasetSet)); - - await pair.CleanReturnAsync(); - } - - [Test] - [Repeat(10)] - public async Task TestDuplicateOverlap() - { - await using var pair = await PoolManager.GetServerClient(); - var server = pair.Server; - - var entMan = server.ResolveDependency(); - var thavenSystem = entMan.System(); - var protoMan = server.ResolveDependency(); - - var dataset = protoMan.Index("ThreeValueSet"); - var moodProto = protoMan.Index("DuplicateOverlapTest"); - - var datasetSet = dataset.Values.ToHashSet(); - var mood = thavenSystem.RollMood(moodProto); - var moodVarSet = mood.MoodVars.Values.ToHashSet(); - - Assert.That(moodVarSet, Is.EquivalentTo(datasetSet)); - - await pair.CleanReturnAsync(); - } -} diff --git a/Content.Server/Administration/Systems/AdminVerbSystem.cs b/Content.Server/Administration/Systems/AdminVerbSystem.cs index 245adec1481..c2f60dd6f36 100644 --- a/Content.Server/Administration/Systems/AdminVerbSystem.cs +++ b/Content.Server/Administration/Systems/AdminVerbSystem.cs @@ -41,8 +41,6 @@ using Robust.Server.Player; using Robust.Shared.Physics.Components; using static Content.Shared.Configurable.ConfigurationComponent; -using Content.Shared._Impstation.Thaven.Components; // DeltaV -using Content.Server._Impstation.Thaven; // DeltaV namespace Content.Server.Administration.Systems { @@ -75,7 +73,7 @@ public sealed partial class AdminVerbSystem : EntitySystem [Dependency] private readonly AdminFrozenSystem _freeze = default!; [Dependency] private readonly IPlayerManager _playerManager = default!; [Dependency] private readonly SiliconLawSystem _siliconLawSystem = default!; - [Dependency] private readonly ThavenMoodsSystem _moods = default!; // DeltaV + private readonly Dictionary> _openSolutionUis = new(); @@ -365,28 +363,8 @@ private void AddAdminVerbs(GetVerbsEvent args) }); } - // Begin DeltaV Additions - thaven moods - if (TryComp(args.Target, out var moods)) - { - args.Verbs.Add(new Verb() - { - Text = Loc.GetString("thaven-moods-ui-verb"), - Category = VerbCategory.Admin, - Act = () => - { - var ui = new ThavenMoodsEui(_moods, EntityManager, _adminManager); - if (!_playerManager.TryGetSessionByEntity(args.User, out var session)) - return; - - _eui.OpenEui(ui, session); - ui.UpdateMoods(moods, args.Target); - }, - Icon = new SpriteSpecifier.Rsi(new ResPath("/Textures/Interface/Actions/actions_borg.rsi"), "state-laws"), - }); - } } } - // End DeltaV Additions private void AddDebugVerbs(GetVerbsEvent args) { diff --git a/Content.Server/StationEvents/Components/ThavenMoodUpsetRuleComponent.cs b/Content.Server/StationEvents/Components/ThavenMoodUpsetRuleComponent.cs deleted file mode 100644 index dca0b3db677..00000000000 --- a/Content.Server/StationEvents/Components/ThavenMoodUpsetRuleComponent.cs +++ /dev/null @@ -1,6 +0,0 @@ -using Content.Server._DV.StationEvents.Events; - -namespace Content.Server._DV.StationEvents.Components; - -[RegisterComponent, Access(typeof(ThavenMoodUpset))] -public sealed partial class ThavenMoodUpsetRuleComponent : Component; diff --git a/Content.Server/StationEvents/Events/ThavenMoodUpset.cs b/Content.Server/StationEvents/Events/ThavenMoodUpset.cs deleted file mode 100644 index 8e988875cf6..00000000000 --- a/Content.Server/StationEvents/Events/ThavenMoodUpset.cs +++ /dev/null @@ -1,23 +0,0 @@ -using Content.Server._DV.StationEvents.Components; -using Content.Server._Impstation.Thaven; -using Content.Server.StationEvents.Events; -using Content.Shared._Impstation.Thaven.Components; -using Content.Shared.GameTicking.Components; - -namespace Content.Server._DV.StationEvents.Events; - -public sealed class ThavenMoodUpset : StationEventSystem -{ - [Dependency] private readonly ThavenMoodsSystem _thavenMoods = default!; - - protected override void Started(EntityUid uid, ThavenMoodUpsetRuleComponent comp, GameRuleComponent gameRule, GameRuleStartedEvent args) - { - base.Started(uid, comp, gameRule, args); - - var thavens = EntityQueryEnumerator(); - while (thavens.MoveNext(out var thavenUid, out var thavenComp)) - { - _thavenMoods.AddWildcardMood((thavenUid, thavenComp)); - } - } -} diff --git a/Content.Server/_DV/Abilities/Chitinid/ChitinidComponent.cs b/Content.Server/_DV/Abilities/Chitinid/ChitinidComponent.cs deleted file mode 100644 index 871d10a7c27..00000000000 --- a/Content.Server/_DV/Abilities/Chitinid/ChitinidComponent.cs +++ /dev/null @@ -1,41 +0,0 @@ -using Content.Shared.Damage; -using Content.Shared.Damage.Prototypes; -using Content.Shared.FixedPoint; -using Robust.Shared.Prototypes; -using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom; - -namespace Content.Server.Abilities.Chitinid; - -[RegisterComponent] -public sealed partial class ChitinidComponent : Component -{ - [DataField] - public EntProtoId ChitzitePrototype = "Chitzite"; - - [DataField] - public EntProtoId ChitziteActionId = "ActionChitzite"; - - [DataField] - public EntityUid? ChitziteAction; - - [DataField] - public FixedPoint2 AmountAbsorbed = 0f; - - [DataField] - public DamageSpecifier Healing = new() - { - DamageDict = new() - { - { "Radiation", -0.5 }, - } - }; - - [DataField] - public FixedPoint2 MaximumAbsorbed = 30f; - - [DataField] - public TimeSpan UpdateInterval = TimeSpan.FromSeconds(1); - - [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))] - public TimeSpan NextUpdate; -} diff --git a/Content.Server/_DV/Abilities/Chitinid/ChitinidSystem.cs b/Content.Server/_DV/Abilities/Chitinid/ChitinidSystem.cs deleted file mode 100644 index 404ac7cc1f9..00000000000 --- a/Content.Server/_DV/Abilities/Chitinid/ChitinidSystem.cs +++ /dev/null @@ -1,101 +0,0 @@ -using Content.Server.Nutrition.Components; -using Content.Shared.Actions; -using Content.Shared.Actions.Events; -using Content.Shared.Audio; -using Content.Shared.Damage; -using Content.Shared.IdentityManagement; -using Content.Shared.Inventory; -using Content.Shared.Mobs.Systems; -using Content.Shared.Popups; -using Robust.Shared.Audio.Systems; -using Robust.Shared.Prototypes; -using Robust.Shared.Timing; - -namespace Content.Server.Abilities.Chitinid; - -public sealed partial class ChitinidSystem : EntitySystem -{ - // !THIS SYSTEM IS A COMPLETE DISASTER. DO NOT USE THIS. - // !YOU HAVE BEEN WARNED. - // !5 OF THESE FUCKERS WILL CONSUME AS MUCH OF YOUR SERVER'S CPU TIME AS THE ATMOSPHERIC SIMULATION. - - // [Dependency] private readonly SharedActionsSystem _actions = default!; - // [Dependency] private readonly SharedAudioSystem _audio = default!; - // [Dependency] private readonly IPrototypeManager _proto = default!; - // [Dependency] private readonly SharedPopupSystem _popup = default!; - // [Dependency] private readonly InventorySystem _inventory = default!; - // [Dependency] private readonly IGameTiming _timing = default!; - // [Dependency] private readonly DamageableSystem _damageable = default!; - // [Dependency] private readonly MobStateSystem _mobState = default!; - - // public override void Initialize() - // { - // SubscribeLocalEvent(OnChitzite); - // SubscribeLocalEvent(OnMapInit); - // } - - // public override void Update(float frameTime) - // { - // base.Update(frameTime); - // var query = EntityQueryEnumerator(); - // while (query.MoveNext(out var uid, out var chitinid, out var damageable)) - // { - // if (_timing.CurTime < chitinid.NextUpdate) - // continue; - - // chitinid.NextUpdate += chitinid.UpdateInterval; - - // if (chitinid.AmountAbsorbed >= chitinid.MaximumAbsorbed || _mobState.IsDead(uid)) - // continue; - - // if (_damageable.TryChangeDamage(uid, chitinid.Healing, damageable: damageable) is {} delta) - // { - // chitinid.AmountAbsorbed += -delta.GetTotal().Float(); - // if (chitinid.ChitziteAction != null && chitinid.AmountAbsorbed >= chitinid.MaximumAbsorbed) - // { - // _actions.SetCharges(chitinid.ChitziteAction, 1); // You get the charge back and that's it. Tough. - // _actions.SetEnabled(chitinid.ChitziteAction, true); - // } - // } - // } - - // var entQuery = EntityQueryEnumerator(); - // while (entQuery.MoveNext(out var ent, out var chitzite, out var chitinid)) - // { - // if (_timing.CurTime < chitzite.NextCough) - // continue; - - // Spawn(chitinid.ChitzitePrototype, Transform(ent).Coordinates); - // chitinid.AmountAbsorbed = 0f; - // RemCompDeferred(ent, chitzite); - // } - // } - - // private void OnMapInit(Entity ent, ref MapInitEvent args) - // { - // if (ent.Comp.ChitziteAction != null) - // return; - - // ent.Comp.NextUpdate = _timing.CurTime + ent.Comp.UpdateInterval; - - // _actions.AddAction(ent, ref ent.Comp.ChitziteAction, ent.Comp.ChitziteActionId); - // } - - // private void OnChitzite(Entity ent, ref ChitziteActionEvent args) - // { - // if (_inventory.TryGetSlotEntity(ent, "mask", out var maskUid) && - // TryComp(maskUid, out var blocker) && - // blocker.Enabled) - // { - // _popup.PopupEntity(Loc.GetString("chitzite-mask", ("mask", maskUid)), ent, ent); - // return; - // } - - // _popup.PopupEntity(Loc.GetString("chitzite-cough", ("name", Identity.Entity(ent, EntityManager))), ent); - // _audio.PlayPvs("/Audio/Animals/cat_hiss.ogg", ent, AudioHelpers.WithVariation(0.15f)); - - // var chitzite = EnsureComp(ent); - // chitzite.NextCough = _timing.CurTime + chitzite.CoughUpTime; - // args.Handled = true; - // } -} diff --git a/Content.Server/_DV/Abilities/Chitinid/CoughingUpChitziteComponent.cs b/Content.Server/_DV/Abilities/Chitinid/CoughingUpChitziteComponent.cs deleted file mode 100644 index 1dae46b9437..00000000000 --- a/Content.Server/_DV/Abilities/Chitinid/CoughingUpChitziteComponent.cs +++ /dev/null @@ -1,14 +0,0 @@ -using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom; - -namespace Content.Server.Abilities.Chitinid; - -[RegisterComponent, AutoGenerateComponentPause] -public sealed partial class CoughingUpChitziteComponent : Component -{ - [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))] - [AutoPausedField] - public TimeSpan NextCough; - - [DataField] - public TimeSpan CoughUpTime = TimeSpan.FromSeconds(2.15); -} diff --git a/Content.Server/_EE/Xelthia/XelthiaSystem.cs b/Content.Server/_EE/Xelthia/XelthiaSystem.cs deleted file mode 100644 index 693ddbcccfe..00000000000 --- a/Content.Server/_EE/Xelthia/XelthiaSystem.cs +++ /dev/null @@ -1,106 +0,0 @@ -using Content.Server.Body.Components; -using Content.Server.Body.Systems; -using Content.Shared._EE.Xelthia; -using Content.Shared.Abilities.Psionics; -using Content.Shared.Humanoid; -using Content.Shared.Humanoid.Markings; -using Content.Shared.Psionics; -using Content.Shared.Bed.Sleep; -using Content.Shared.Damage.Components; -using Content.Shared.Damage.Systems; -using Content.Shared.Voidborn; -using Content.Shared.Rejuvenate; -using Content.Shared.Alert; -using Content.Shared.Rounding; -using Content.Shared.Actions; -using Robust.Shared.Prototypes; -using Content.Shared.Examine; -using Content.Shared.Actions.Events; -using Content.Shared.Body.Components; -using Content.Shared.Body.Part; -using Robust.Shared.Audio; -using Robust.Shared.Audio.Systems; -using Robust.Shared.Placement; -using Robust.Shared.Random; -using Robust.Shared.Serialization.Manager; -using Robust.Shared.Timing; -using Content.Shared.Chemistry.Components; - - -namespace Content.Server._EE.Xelthia; - - -/// -/// Xelthia Arm Regrowth stuff -/// -public sealed class XelthiaSystem : EntitySystem -{ - /// - - [Dependency] private readonly SharedActionsSystem _actionsSystem = default!; - [Dependency] private readonly IEntityManager _entityManager = default!; - [Dependency] private readonly IGameTiming _gameTiming = default!; - [Dependency] private readonly BloodstreamSystem _bloodstreamSystem = default!; - - //public const string XelthiaRegenerateActionId = "XelthiaRegenerateAction"; - public override void Initialize() - { - base.Initialize(); - SubscribeLocalEvent(OnInit); - SubscribeLocalEvent(OnRegrowthAction); - } - - private void OnInit(EntityUid uid, XelthiaComponent component, ComponentStartup args) - { - _actionsSystem.AddAction(uid, ref component.XelthiaRegenerateAction, out var regenerateAction, "XelthiaRegenerateAction"); - if (regenerateAction?.UseDelay != null) - component.UseDelay = regenerateAction.UseDelay.Value; - } - - private void OnRegrowthAction(EntityUid uid, XelthiaComponent component, ArmRegrowthEvent args) - { - var start = _gameTiming.CurTime; - var end = _gameTiming.CurTime + component.UseDelay; - _actionsSystem.SetCooldown(component.XelthiaRegenerateAction!.Value, start, end); // Cooldown - - //IEntityManager entityManager = uid; - var bodySystem = _entityManager.System(); - var transformSystem = _entityManager.System(); - if (!_entityManager.TryGetComponent(uid, out BodyComponent? body) - || !_entityManager.TryGetComponent(uid, out TransformComponent? xform)) - return; - var root = bodySystem.GetRootPartOrNull(uid, body); - if (root is null) - return; - var parts = bodySystem.GetBodyChildrenOfType(uid, BodyPartType.Arm, body); // Deletes Arms and hands - foreach (var part in parts) - { - foreach (var child in bodySystem.GetBodyPartChildren(part.Id, part.Component)) - _entityManager.QueueDeleteEntity(child.Id); - transformSystem.AttachToGridOrMap(part.Id); - _entityManager.QueueDeleteEntity(part.Id); - _entityManager.SpawnAtPosition("FoodMeatXelthiaTentacle", xform.Coordinates); // Should drop arms equal to the number attached - } - // Right Side - var newLimb = _entityManager.SpawnAtPosition("RightArmXelthia", xform.Coordinates); // Copy-Pasted Code for arm spawning - if (_entityManager.TryGetComponent(newLimb, out BodyPartComponent? limbComp)) - bodySystem.AttachPart(root.Value.Entity, "right arm", newLimb, root.Value.BodyPart, limbComp); - var newerLimb = _entityManager.SpawnAtPosition("RightHandXelthia", xform.Coordinates); // Spawns the hand - Enum.TryParse("Hand", out var partType); - bodySystem.TryCreatePartSlotAndAttach(newLimb, "right hand", newerLimb, partType); - // Left Side - newLimb = _entityManager.SpawnAtPosition("LeftArmXelthia", xform.Coordinates); // Copy-Pasted Code for arm spawning - if (_entityManager.TryGetComponent(newLimb, out BodyPartComponent? limbComp2)) - bodySystem.AttachPart(root.Value.Entity, "left arm", newLimb, root.Value.BodyPart, limbComp2); - newerLimb = _entityManager.SpawnAtPosition("LeftHandXelthia", xform.Coordinates); // Spawns the hand - bodySystem.TryCreatePartSlotAndAttach(newLimb, "left hand", newerLimb, partType); - _entityManager.EntitySysManager.GetEntitySystem() - .PlayPvs("/Audio/_EE/Voice/Xelthia/regrow.ogg", uid, null); - - var solution = new Solution(); - - TryComp(uid, out var stream); - solution.AddReagent("XelthiaArmJuice", 3.5); - _bloodstreamSystem.TryAddToChemicals(uid, solution, stream); - } -} diff --git a/Content.Server/_Impstation/Thaven/ThavenMoodSystem.cs b/Content.Server/_Impstation/Thaven/ThavenMoodSystem.cs deleted file mode 100644 index de7307f0636..00000000000 --- a/Content.Server/_Impstation/Thaven/ThavenMoodSystem.cs +++ /dev/null @@ -1,373 +0,0 @@ -using System.Diagnostics.CodeAnalysis; -using System.Linq; -using Content.Server.Actions; -using Content.Server.Chat.Managers; -using Content.Shared.CCVar; -using Content.Shared.Chat; -using Content.Shared.Dataset; -using Content.Shared.Emag.Systems; -using Content.Shared.GameTicking; -using Content.Shared._Impstation.Thaven; -using Content.Shared._Impstation.Thaven.Components; -using Content.Shared.Random; -using Content.Shared.Random.Helpers; -using Robust.Server.GameObjects; -using Robust.Shared.Configuration; -using Robust.Shared.Player; -using Robust.Shared.Prototypes; -using Robust.Shared.Random; -using Content.Shared._Impstation.CCVar; -using Robust.Shared.Audio.Systems; - -namespace Content.Server._Impstation.Thaven; - -public sealed partial class ThavenMoodsSystem : SharedThavenMoodSystem -{ - [Dependency] private readonly IPrototypeManager _proto = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly ActionsSystem _actions = default!; - [Dependency] private readonly IConfigurationManager _config = default!; - [Dependency] private readonly UserInterfaceSystem _bui = default!; - [Dependency] private readonly IChatManager _chatManager = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - - public IReadOnlyList SharedMoods => _sharedMoods.AsReadOnly(); - private readonly List _sharedMoods = new(); - - - [ValidatePrototypeId] - private const string SharedDataset = "ThavenMoodsShared"; - - [ValidatePrototypeId] - private const string YesAndDataset = "ThavenMoodsYesAnd"; - - [ValidatePrototypeId] - private const string NoAndDataset = "ThavenMoodsNoAnd"; - - [ValidatePrototypeId] - private const string WildcardDataset = "ThavenMoodsWildcard"; - - [ValidatePrototypeId] - private const string ActionViewMoods = "ActionViewMoods"; - - [ValidatePrototypeId] - private const string RandomThavenMoodDataset = "RandomThavenMoodDataset"; - - public override void Initialize() - { - base.Initialize(); - - NewSharedMoods(); - - SubscribeLocalEvent(OnThavenMoodInit); - SubscribeLocalEvent(OnThavenMoodShutdown); - SubscribeLocalEvent(OnToggleMoodsScreen); - SubscribeLocalEvent(OnBoundUIOpened); - SubscribeLocalEvent((_) => NewSharedMoods()); - } - - private void NewSharedMoods() - { - _sharedMoods.Clear(); - for (int i = 0; i < _config.GetCVar(ImpCCVars.ThavenSharedMoodCount); i++) - TryAddSharedMood(); - } - - public bool TryAddSharedMood(ThavenMood? mood = null, bool checkConflicts = true) - { - if (mood == null) - { - if (TryPick(SharedDataset, out var moodProto, _sharedMoods)) - { - mood = RollMood(moodProto); - checkConflicts = false; // TryPick has cleared this mood already - } - else - { - return false; - } - } - - if (checkConflicts && (GetConflicts(_sharedMoods).Contains(mood.ProtoId) || GetMoodProtoSet(_sharedMoods).Overlaps(mood.Conflicts))) - return false; - - _sharedMoods.Add(mood); - var enumerator = EntityManager.EntityQueryEnumerator(); - while (enumerator.MoveNext(out var ent, out var comp)) - { - if (!comp.FollowsSharedMoods) - continue; - - NotifyMoodChange((ent, comp)); - } - - return true; - } - - private void OnBoundUIOpened(EntityUid uid, ThavenMoodsComponent component, BoundUIOpenedEvent args) - { - UpdateBUIState(uid, component); - } - - private void OnToggleMoodsScreen(EntityUid uid, ThavenMoodsComponent component, ToggleMoodsScreenEvent args) - { - if (args.Handled || !TryComp(uid, out var actor)) - return; - args.Handled = true; - - _bui.TryToggleUi(uid, ThavenMoodsUiKey.Key, actor.PlayerSession); - } - - private bool TryPick(string datasetProto, [NotNullWhen(true)] out ThavenMoodPrototype? proto, IEnumerable? currentMoods = null, HashSet? conflicts = null) - { - var dataset = _proto.Index(datasetProto); - var choices = dataset.Values.ToList(); - - if (currentMoods == null) - currentMoods = new HashSet(); - if (conflicts == null) - conflicts = GetConflicts(currentMoods); - - var currentMoodProtos = GetMoodProtoSet(currentMoods); - - while (choices.Count > 0) - { - var moodId = _random.PickAndTake(choices); - if (conflicts.Contains(moodId)) - continue; // Skip proto if an existing mood conflicts with it - - var moodProto = _proto.Index(moodId); - if (moodProto.Conflicts.Overlaps(currentMoodProtos)) - continue; // Skip proto if it conflicts with an existing mood - - proto = moodProto; - return true; - } - - proto = null; - return false; - } - - public void NotifyMoodChange(Entity ent) - { - if (!TryComp(ent.Owner, out var actor)) - return; - - if (ent.Comp.MoodsChangedSound != null) - _audio.PlayGlobal(ent.Comp.MoodsChangedSound, actor.PlayerSession); - - var msg = Loc.GetString("thaven-moods-update-notify"); - var wrappedMessage = Loc.GetString("chat-manager-server-wrap-message", ("message", msg)); - _chatManager.ChatMessageToOne(ChatChannel.Server, msg, wrappedMessage, default, false, actor.PlayerSession.Channel, colorOverride: Color.Orange); - } - - public void UpdateBUIState(EntityUid uid, ThavenMoodsComponent? comp = null) - { - if (!Resolve(uid, ref comp)) - return; - - var state = new ThavenMoodsBuiState(comp.Moods, comp.FollowsSharedMoods ? _sharedMoods : []); - _bui.SetUiState(uid, ThavenMoodsUiKey.Key, state); - } - - public void AddMood(EntityUid uid, ThavenMood mood, ThavenMoodsComponent? comp = null, bool notify = true) - { - if (!Resolve(uid, ref comp)) - return; - - comp.Moods.Add(mood); - - if (notify) - NotifyMoodChange((uid, comp)); - - UpdateBUIState(uid, comp); - } - - /// - /// Creates a ThavenMood instance from the given ThavenMoodPrototype, and rolls - /// its mood vars. - /// - public ThavenMood RollMood(ThavenMoodPrototype proto) - { - var mood = new ThavenMood() - { - ProtoId = proto.ID, - MoodName = proto.MoodName, - MoodDesc = proto.MoodDesc, - Conflicts = proto.Conflicts, - }; - - var alreadyChosen = new HashSet(); - - foreach (var (name, datasetID) in proto.MoodVarDatasets) - { - var dataset = _proto.Index(datasetID); - - if (proto.AllowDuplicateMoodVars) - { - mood.MoodVars.Add(name, _random.Pick(dataset)); - continue; - } - - var choices = dataset.Values.ToList(); - var foundChoice = false; - while (choices.Count > 0) - { - var choice = _random.PickAndTake(choices); - if (alreadyChosen.Contains(choice)) - continue; - - mood.MoodVars.Add(name, choice); - alreadyChosen.Add(choice); - foundChoice = true; - break; - } - - if (!foundChoice) - { - Log.Warning($"Ran out of choices for moodvar \"{name}\" in \"{proto.ID}\"! Picking a duplicate..."); - mood.MoodVars.Add(name, _random.Pick(_proto.Index(dataset))); - } - } - - return mood; - } - - /// - /// Checks if the given mood prototype conflicts with the current moods, and - /// adds the mood if it does not. - /// - public bool TryAddMood(EntityUid uid, ThavenMoodPrototype moodProto, ThavenMoodsComponent? comp = null, bool allowConflict = false, bool notify = true) - { - if (!Resolve(uid, ref comp)) - return false; - - if (!allowConflict && GetConflicts(uid, comp).Contains(moodProto.ID)) - return false; - - AddMood(uid, RollMood(moodProto), comp, notify); - return true; - } - - public bool TryAddRandomMood(EntityUid uid, string datasetProto, ThavenMoodsComponent? comp = null) - { - if (!Resolve(uid, ref comp)) - return false; - - if (TryPick(datasetProto, out var moodProto, GetActiveMoods(uid, comp))) - { - AddMood(uid, RollMood(moodProto), comp); - return true; - } - - return false; - } - - public bool TryAddRandomMood(EntityUid uid, ThavenMoodsComponent? comp = null) - { - if (!Resolve(uid, ref comp)) - return false; - - var datasetProto = _proto.Index(RandomThavenMoodDataset).Pick(); - - return TryAddRandomMood(uid, datasetProto, comp); - } - - public void SetMoods(EntityUid uid, IEnumerable moods, ThavenMoodsComponent? comp = null, bool notify = true) - { - if (!Resolve(uid, ref comp)) - return; - - comp.Moods = moods.ToList(); - if (notify) - NotifyMoodChange((uid, comp)); - - UpdateBUIState(uid, comp); - } - - public HashSet GetConflicts(IEnumerable moods) - { - var conflicts = new HashSet(); - - foreach (var mood in moods) - { - conflicts.Add(mood.ProtoId); // Specific moods shouldn't be added twice - conflicts.UnionWith(mood.Conflicts); - } - - return conflicts; - } - - public HashSet GetConflicts(EntityUid uid, ThavenMoodsComponent? moods = null) - { - // TODO: Should probably cache this when moods get updated - - if (!Resolve(uid, ref moods)) - return new(); - - var conflicts = GetConflicts(GetActiveMoods(uid, moods)); - - return conflicts; - } - - public HashSet GetMoodProtoSet(IEnumerable moods) - { - var moodProtos = new HashSet(); - foreach (var mood in moods) - if (!string.IsNullOrEmpty(mood.ProtoId)) - moodProtos.Add(mood.ProtoId); - return moodProtos; - } - - /// - /// Return a list of the moods that are affecting this entity. - /// - public List GetActiveMoods(EntityUid uid, ThavenMoodsComponent? comp = null, bool includeShared = true) - { - if (!Resolve(uid, ref comp)) - return []; - - if (includeShared && comp.FollowsSharedMoods) - { - return new List(SharedMoods.Concat(comp.Moods)); - } - else - { - return comp.Moods; - } - } - - private void OnThavenMoodInit(EntityUid uid, ThavenMoodsComponent comp, ComponentStartup args) - { - if (comp.LifeStage != ComponentLifeStage.Starting) - return; - - // "Yes, and" moods - if (TryPick(YesAndDataset, out var mood, GetActiveMoods(uid, comp))) - TryAddMood(uid, mood, comp, true, false); - - // "No, and" moods - if (TryPick(NoAndDataset, out mood, GetActiveMoods(uid, comp))) - TryAddMood(uid, mood, comp, true, false); - - comp.Action = _actions.AddAction(uid, ActionViewMoods); - } - - private void OnThavenMoodShutdown(EntityUid uid, ThavenMoodsComponent comp, ComponentShutdown args) - { - _actions.RemoveAction(uid, comp.Action); - } - - protected override void OnEmagged(EntityUid uid, ThavenMoodsComponent comp, ref GotEmaggedEvent args) - { - base.OnEmagged(uid, comp, ref args); - TryAddRandomMood(uid, WildcardDataset, comp); - } - - // Begin DeltaV: thaven mood upsets - public void AddWildcardMood(Entity ent) - { - TryAddRandomMood(ent.Owner, WildcardDataset, ent.Comp); - } - // End DeltaV: thaven mood upsets -} diff --git a/Content.Server/_Impstation/Thaven/ThavenMoodsEui.cs b/Content.Server/_Impstation/Thaven/ThavenMoodsEui.cs deleted file mode 100644 index 2ff3b840dd7..00000000000 --- a/Content.Server/_Impstation/Thaven/ThavenMoodsEui.cs +++ /dev/null @@ -1,73 +0,0 @@ -using System.Linq; -using Content.Server.Administration.Managers; -using Content.Server.EUI; -using Content.Shared.Administration; -using Content.Shared.Eui; -using Content.Shared._Impstation.Thaven; -using Content.Shared._Impstation.Thaven.Components; - -namespace Content.Server._Impstation.Thaven; - -public sealed class ThavenMoodsEui : BaseEui -{ - private readonly ThavenMoodsSystem _thavenMoodsSystem; - private readonly EntityManager _entityManager; - private readonly IAdminManager _adminManager; - - private List _moods = new(); - private List _sharedMoods = new(); - private ISawmill _sawmill = default!; - private EntityUid _target; - - public ThavenMoodsEui(ThavenMoodsSystem thavenMoodsSystem, EntityManager entityManager, IAdminManager manager) - { - _thavenMoodsSystem = thavenMoodsSystem; - _entityManager = entityManager; - _adminManager = manager; - _sawmill = Logger.GetSawmill("thaven-moods-eui"); - } - - public override EuiStateBase GetNewState() - { - return new ThavenMoodsEuiState(_moods, _entityManager.GetNetEntity(_target)); - } - - public void UpdateMoods(ThavenMoodsComponent? comp, EntityUid player) - { - if (!IsAllowed()) - return; - - var moods = _thavenMoodsSystem.GetActiveMoods(player, comp, false); - _target = player; - _moods = moods; - _sharedMoods = _thavenMoodsSystem.SharedMoods.ToList(); - StateDirty(); - } - - public override void HandleMessage(EuiMessageBase msg) - { - base.HandleMessage(msg); - - if (msg is not ThavenMoodsSaveMessage message) - return; - - if (!IsAllowed()) - return; - - var player = _entityManager.GetEntity(message.Target); - - _thavenMoodsSystem.SetMoods(player, message.Moods); - } - - private bool IsAllowed() - { - var adminData = _adminManager.GetAdminData(Player); - if (adminData == null || !adminData.HasFlag(AdminFlags.Admin)) - { - _sawmill.Warning($"Player {Player.UserId} tried to open / use thaven moods UI without permission."); - return false; - } - - return true; - } -} diff --git a/Content.Shared/_EE/Xelthia/XelthiaComponent.cs b/Content.Shared/_EE/Xelthia/XelthiaComponent.cs deleted file mode 100644 index 3ff859f6315..00000000000 --- a/Content.Shared/_EE/Xelthia/XelthiaComponent.cs +++ /dev/null @@ -1,18 +0,0 @@ -using Robust.Shared.GameStates; - - -namespace Content.Shared._EE.Xelthia; - - -/// -/// This is eventually going to be used for the arm regrowth action the Xelthia have. I have no idea how to code this. -/// -[RegisterComponent, NetworkedComponent] -public sealed partial class XelthiaComponent : Component -{ - [DataField] - public TimeSpan UseDelay { get; set; } = TimeSpan.FromMinutes(5); - - [DataField] - public EntityUid? XelthiaRegenerateAction; -} diff --git a/Content.Shared/_Impstation/CCVar/ImpCCVars.cs b/Content.Shared/_Impstation/CCVar/ImpCCVars.cs deleted file mode 100644 index 34f307dabfb..00000000000 --- a/Content.Shared/_Impstation/CCVar/ImpCCVars.cs +++ /dev/null @@ -1,15 +0,0 @@ -using Robust.Shared; -using Robust.Shared.Configuration; - -namespace Content.Shared._Impstation.CCVar; - -// ReSharper disable once InconsistentNaming -[CVarDefs] -public sealed class ImpCCVars : CVars -{ - /// - /// The number of shared moods to give thaven by default. - /// - public static readonly CVarDef ThavenSharedMoodCount = - CVarDef.Create("thaven.shared_mood_count", 1, CVar.SERVERONLY); -} diff --git a/Content.Shared/_Impstation/Thaven/SharedThavenMoodSystem.cs b/Content.Shared/_Impstation/Thaven/SharedThavenMoodSystem.cs deleted file mode 100644 index 03935a480ef..00000000000 --- a/Content.Shared/_Impstation/Thaven/SharedThavenMoodSystem.cs +++ /dev/null @@ -1,18 +0,0 @@ -using Content.Shared.Emag.Systems; -using Content.Shared._Impstation.Thaven.Components; - -namespace Content.Shared._Impstation.Thaven; - -public abstract class SharedThavenMoodSystem : EntitySystem -{ - public override void Initialize() - { - base.Initialize(); - - // SubscribeLocalEvent(OnEmagged); DeltaV: no emagging thavens - } - protected virtual void OnEmagged(EntityUid uid, ThavenMoodsComponent comp, ref GotEmaggedEvent args) - { - args.Handled = true; - } -} diff --git a/Content.Shared/_Impstation/Thaven/ThavenMoodBoundComponent.cs b/Content.Shared/_Impstation/Thaven/ThavenMoodBoundComponent.cs deleted file mode 100644 index 2e4c0f46241..00000000000 --- a/Content.Shared/_Impstation/Thaven/ThavenMoodBoundComponent.cs +++ /dev/null @@ -1,49 +0,0 @@ -using Content.Shared.Actions; -using Robust.Shared.Audio; -using Robust.Shared.GameStates; -using Robust.Shared.Serialization; - -namespace Content.Shared._Impstation.Thaven.Components; - -[RegisterComponent, NetworkedComponent, AutoGenerateComponentState] -[Access(typeof(SharedThavenMoodSystem))] -public sealed partial class ThavenMoodsComponent : Component -{ - [DataField, ViewVariables(VVAccess.ReadWrite), AutoNetworkedField] - public bool FollowsSharedMoods = true; - - [DataField, ViewVariables, AutoNetworkedField] - public List Moods = new(); - - [DataField, ViewVariables(VVAccess.ReadWrite), AutoNetworkedField] - public bool CanBeEmagged = true; - - [DataField, ViewVariables(VVAccess.ReadWrite), AutoNetworkedField] - public SoundSpecifier? MoodsChangedSound = new SoundPathSpecifier("/Audio/_Impstation/Thaven/moods_changed.ogg"); - - [DataField(serverOnly: true), ViewVariables] - public EntityUid? Action; -} - -public sealed partial class ToggleMoodsScreenEvent : InstantActionEvent -{ -} - -[NetSerializable, Serializable] -public enum ThavenMoodsUiKey : byte -{ - Key -} - -[Serializable, NetSerializable] -public sealed class ThavenMoodsBuiState : BoundUserInterfaceState -{ - public List Moods; - public List SharedMoods; - - public ThavenMoodsBuiState(List moods, List sharedMoods) - { - Moods = moods; - SharedMoods = sharedMoods; - } -} diff --git a/Content.Shared/_Impstation/Thaven/ThavenMoodPrototype.cs b/Content.Shared/_Impstation/Thaven/ThavenMoodPrototype.cs deleted file mode 100644 index fdf9dfac7b1..00000000000 --- a/Content.Shared/_Impstation/Thaven/ThavenMoodPrototype.cs +++ /dev/null @@ -1,91 +0,0 @@ -using System.Linq; -using Content.Shared.Dataset; -using Robust.Shared.Prototypes; -using Robust.Shared.Serialization; -using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Dictionary; -using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Set; - -namespace Content.Shared._Impstation.Thaven; - -[Virtual, DataDefinition] -[Serializable, NetSerializable] -public partial class ThavenMood -{ - [DataField(readOnly: true), ViewVariables(VVAccess.ReadOnly)] - public ProtoId ProtoId = string.Empty; - - /// - /// A locale string of the mood name. - /// - [DataField(required: true), ViewVariables(VVAccess.ReadWrite)] - public string MoodName = string.Empty; - - /// - /// A locale string of the mood description. Gets passed to - /// with . - /// - [DataField(required: true), ViewVariables(VVAccess.ReadWrite)] - public string MoodDesc = string.Empty; - - [DataField(serverOnly: true, customTypeSerializer: typeof(PrototypeIdHashSetSerializer))] - [ViewVariables(VVAccess.ReadWrite)] - public HashSet Conflicts = new(); - - /// - /// Additional localized words for the , for things like random - /// verbs and nouns. - /// - [ViewVariables(VVAccess.ReadWrite)] - public Dictionary MoodVars = new(); - - public (string, object)[] GetLocArgs() - { - return MoodVars.Select(v => (v.Key, (object)v.Value)).ToArray(); - } - - public string GetLocName() - { - return Loc.GetString(MoodName, GetLocArgs()); - } - - public string GetLocDesc() - { - return Loc.GetString(MoodDesc, GetLocArgs()); - } -} - -[Prototype("thavenMood")] -[Serializable, NetSerializable] -public sealed partial class ThavenMoodPrototype : IPrototype -{ - /// - [IdDataField] - public string ID { get; private set; } = default!; - - [DataField(required: true), ViewVariables(VVAccess.ReadWrite)] - public string MoodName = string.Empty; - - [DataField(required: true), ViewVariables(VVAccess.ReadWrite)] - public string MoodDesc = string.Empty; - - /// - /// A list of mood IDs that this mood will conflict with. - /// - [DataField("conflicts", customTypeSerializer: typeof(PrototypeIdHashSetSerializer))] - public HashSet Conflicts = new(); - - /// - /// Extra mood variables that will be randomly chosen and provided - /// to the call on . - /// - [DataField("moodVars", customTypeSerializer: typeof(PrototypeIdValueDictionarySerializer))] - public Dictionary MoodVarDatasets = new(); - - /// - /// If false, prevents the same variable from being rolled twice when rolling - /// mood variables for this mood. Does not prevent the same mood variable - /// from being present in other moods. - /// - [DataField("allowDuplicateMoodVars"), ViewVariables(VVAccess.ReadWrite)] - public bool AllowDuplicateMoodVars = false; -} diff --git a/Content.Shared/_Impstation/Thaven/ThavenMoodsEuiState.cs b/Content.Shared/_Impstation/Thaven/ThavenMoodsEuiState.cs deleted file mode 100644 index 7ac6de7992d..00000000000 --- a/Content.Shared/_Impstation/Thaven/ThavenMoodsEuiState.cs +++ /dev/null @@ -1,29 +0,0 @@ -using Content.Shared.Eui; -using Robust.Shared.Serialization; - -namespace Content.Shared._Impstation.Thaven; - -[Serializable, NetSerializable] -public sealed class ThavenMoodsEuiState : EuiStateBase -{ - public List Moods { get; } - public NetEntity Target { get; } - public ThavenMoodsEuiState(List moods, NetEntity target) - { - Moods = moods; - Target = target; - } -} - -[Serializable, NetSerializable] -public sealed class ThavenMoodsSaveMessage : EuiMessageBase -{ - public List Moods { get; } - public NetEntity Target { get; } - - public ThavenMoodsSaveMessage(List moods, NetEntity target) - { - Moods = moods; - Target = target; - } -} diff --git a/Resources/Audio/_EE/Voice/Xelthia/ask.ogg b/Resources/Audio/_EE/Voice/Xelthia/ask.ogg deleted file mode 100644 index c8189156a9d..00000000000 Binary files a/Resources/Audio/_EE/Voice/Xelthia/ask.ogg and /dev/null differ diff --git a/Resources/Audio/_EE/Voice/Xelthia/cough.ogg b/Resources/Audio/_EE/Voice/Xelthia/cough.ogg deleted file mode 100644 index 0b37333a5f5..00000000000 Binary files a/Resources/Audio/_EE/Voice/Xelthia/cough.ogg and /dev/null differ diff --git a/Resources/Audio/_EE/Voice/Xelthia/cry.ogg b/Resources/Audio/_EE/Voice/Xelthia/cry.ogg deleted file mode 100644 index 167a25e1abc..00000000000 Binary files a/Resources/Audio/_EE/Voice/Xelthia/cry.ogg and /dev/null differ diff --git a/Resources/Audio/_EE/Voice/Xelthia/exclaim.ogg b/Resources/Audio/_EE/Voice/Xelthia/exclaim.ogg deleted file mode 100644 index b50e76bac47..00000000000 Binary files a/Resources/Audio/_EE/Voice/Xelthia/exclaim.ogg and /dev/null differ diff --git a/Resources/Audio/_EE/Voice/Xelthia/laugh.ogg b/Resources/Audio/_EE/Voice/Xelthia/laugh.ogg deleted file mode 100644 index 43c102e3289..00000000000 Binary files a/Resources/Audio/_EE/Voice/Xelthia/laugh.ogg and /dev/null differ diff --git a/Resources/Audio/_EE/Voice/Xelthia/regrow.ogg b/Resources/Audio/_EE/Voice/Xelthia/regrow.ogg deleted file mode 100644 index 3ed04442c12..00000000000 Binary files a/Resources/Audio/_EE/Voice/Xelthia/regrow.ogg and /dev/null differ diff --git a/Resources/Audio/_EE/Voice/Xelthia/say.ogg b/Resources/Audio/_EE/Voice/Xelthia/say.ogg deleted file mode 100644 index e7a15d9ce02..00000000000 Binary files a/Resources/Audio/_EE/Voice/Xelthia/say.ogg and /dev/null differ diff --git a/Resources/Audio/_EE/Voice/Xelthia/scream.ogg b/Resources/Audio/_EE/Voice/Xelthia/scream.ogg deleted file mode 100644 index 95f949bd2dd..00000000000 Binary files a/Resources/Audio/_EE/Voice/Xelthia/scream.ogg and /dev/null differ diff --git a/Resources/Audio/_EE/Voice/Xelthia/sneeze.ogg b/Resources/Audio/_EE/Voice/Xelthia/sneeze.ogg deleted file mode 100644 index 597660a76c8..00000000000 Binary files a/Resources/Audio/_EE/Voice/Xelthia/sneeze.ogg and /dev/null differ diff --git a/Resources/Audio/_EE/Voice/Xelthia/speech_raw/ask.ogg b/Resources/Audio/_EE/Voice/Xelthia/speech_raw/ask.ogg deleted file mode 100644 index 91045ecd757..00000000000 Binary files a/Resources/Audio/_EE/Voice/Xelthia/speech_raw/ask.ogg and /dev/null differ diff --git a/Resources/Audio/_EE/Voice/Xelthia/speech_raw/exclaim.ogg b/Resources/Audio/_EE/Voice/Xelthia/speech_raw/exclaim.ogg deleted file mode 100644 index b848e1b8e81..00000000000 Binary files a/Resources/Audio/_EE/Voice/Xelthia/speech_raw/exclaim.ogg and /dev/null differ diff --git a/Resources/Audio/_EE/Voice/Xelthia/speech_raw/say.ogg b/Resources/Audio/_EE/Voice/Xelthia/speech_raw/say.ogg deleted file mode 100644 index 2b47b9525bb..00000000000 Binary files a/Resources/Audio/_EE/Voice/Xelthia/speech_raw/say.ogg and /dev/null differ diff --git a/Resources/Locale/en-US/DeltaV/markings/thaven.ftl b/Resources/Locale/en-US/DeltaV/markings/thaven.ftl deleted file mode 100644 index 9a4f1c78056..00000000000 --- a/Resources/Locale/en-US/DeltaV/markings/thaven.ftl +++ /dev/null @@ -1,14 +0,0 @@ -marking-ThavenCheekBarbels-cheek_barbels = Head -marking-ThavenCheekBarbels = Thaven Head (Cheek Barbels) - -marking-ThavenEyebrowBarbels-eyebrow_barbels = Head -marking-ThavenEyebrowBarbels = Thaven Head (Eyebrow Barbels) - -marking-ThavenUnderbellyFace-underbelly_face = Head -marking-ThavenUnderbellyFace = Thaven Head (Underbelly Face) - -marking-ThavenUnderbellyTorso-underbelly_torso = Chest -marking-ThavenUnderbellyTorso = Thaven Chest (Underbelly Torso) - -marking-ThavenCarpSpots-carp_spots = Chest -marking-ThavenCarpSpots = Thaven Chest (Carp Spots) diff --git a/Resources/Locale/en-US/_EE/markings/xelthia.ftl b/Resources/Locale/en-US/_EE/markings/xelthia.ftl deleted file mode 100644 index a9e63477c5a..00000000000 --- a/Resources/Locale/en-US/_EE/markings/xelthia.ftl +++ /dev/null @@ -1,31 +0,0 @@ -marking-XelthiaStripeyChest = Chest Stripes -marking-XelthiaStripeyChest-stripey = Stripe - -marking-XelthiaUnderbelly = Colored Underbelly -marking-XelthiaUnderbelly-underbelly = Underbelly - -marking-XelthiaEarsNormal = Normal Ears -marking-XelthiaEarsNormal-ears_normal = Ear - -marking-XelthiaEarsSmall = Short Ears -marking-XelthiaEarsSmall-ears_small = Ear - -marking-XelthiaBackspikes = Backspikes -marking-XelthiaBackspikes-backspikes = Backspike - -marking-XelthiaTailNormal = Normal Xelthia Tail -marking-XelthiaTailNormal-tail_normal = Tail - -marking-XelthiaHairLongish = Long Hair Tendrils - -marking-XelthiaHairShort = Short Hair Tendrils - -marking-XelthiaHairStandard = Normal Hair Tendrils - -marking-XelthiaHairOvereye = Over-eye Hair Tendrils - -marking-XelthiaHairFancy = Fancy Hair Tendrils - -marking-XelthiaHairTripoint = Tripoint Hair Tendrils - -marking-XelthiaHairDownNBack = Down 'N' Back Tendrils diff --git a/Resources/Locale/en-US/_EE/reagents/xelthia.ftl b/Resources/Locale/en-US/_EE/reagents/xelthia.ftl deleted file mode 100644 index 39489310bca..00000000000 --- a/Resources/Locale/en-US/_EE/reagents/xelthia.ftl +++ /dev/null @@ -1,5 +0,0 @@ -reagent-name-acid-blood = acid blood -reagent-desc-acid-blood = A corrosive type of blood that burns through organic and synthetic matter alike. - -reagent-name-armjuice = Xelthia Arm Juice -reagent-desc-armjuice = An organic fluid extracted from Xelthian physiology. Rather than sustaining the body, it dramatically increases hunger and thirst. diff --git a/Resources/Locale/en-US/_Impstation/accessories/thaven-hair.ftl b/Resources/Locale/en-US/_Impstation/accessories/thaven-hair.ftl deleted file mode 100644 index 9c553688114..00000000000 --- a/Resources/Locale/en-US/_Impstation/accessories/thaven-hair.ftl +++ /dev/null @@ -1,207 +0,0 @@ -marking-ThavenHairAfro = Afro -marking-ThavenHairAfro2 = Afro 2 -marking-ThavenHairBigafro = Afro (Large) -marking-ThavenHairAntenna = Ahoge -marking-ThavenHairBalding = Balding Hair -marking-ThavenHairBedhead = Bedhead -marking-ThavenHairBedheadv2 = Bedhead 2 -marking-ThavenHairBedheadv3 = Bedhead 3 -marking-ThavenHairLongBedhead = Long Bedhead -marking-ThavenHairLongBedhead2 = Long Bedhead 2 -marking-ThavenHairFloorlengthBedhead = Floorlength Bedhead -marking-ThavenHairBeehive = Beehive -marking-ThavenHairBeehive2 = Beehive 2 -marking-ThavenHairBob = Bob Hair -marking-ThavenHairBob2 = Bob Hair 2 -marking-ThavenHairBobcut = Bob Hair 3 -marking-ThavenHairBob4 = Bob Hair 4 -marking-ThavenHairBob5 = Bob Hair 5 -marking-ThavenHairBobcurl = Bobcurl -marking-ThavenHairBoddicker = Boddicker -marking-ThavenHairBowlcut = Bowlcut -marking-ThavenHairBowlcut2 = Bowlcut 2 -marking-ThavenHairBraid = Braid (Floorlength) -marking-ThavenHairBraided = Braided -marking-ThavenHairBraidfront = Braided Front -marking-ThavenHairBraid2 = Braid (High) -marking-ThavenHairHbraid = Braid (Low) -marking-ThavenHairShortbraid = Braid (Short) -marking-ThavenHairBraidtail = Braided Tail -marking-ThavenHairBun = Bun Head -marking-ThavenHairBunhead2 = Bun Head 2 -marking-ThavenHairBun3 = Bun Head 3 -marking-ThavenHairLargebun = Bun (Large) -marking-ThavenHairManbun = Bun (Manbun) -marking-ThavenHairTightbun = Bun (Tight) -marking-ThavenHairBusiness = Business Hair -marking-ThavenHairBusiness2 = Business Hair 2 -marking-ThavenHairBusiness3 = Business Hair 3 -marking-ThavenHairBusiness4 = Business Hair 4 -marking-ThavenHairBuzzcut = Buzzcut -marking-ThavenHairCia = CIA -marking-ThavenHairClassicAfro = Classic Afro -marking-ThavenHairClassicBigAfro = Classic Big Afro -marking-ThavenHairClassicBusiness = Classic Business Hair -marking-ThavenHairClassicciaBusiness = Classic CIA -marking-ThavenHairClassicCornrows = Classic Cornrows -marking-ThavenHairClassicCornrows2 = Classic Cornrows 2 -marking-ThavenHairClassicFloorlengthBedhead = Classic Floorlength Bedhead -marking-ThavenHairClassicLong2 = Classic Long Hair 2 -marking-ThavenHairClassicLong3 = Classic Long Hair 3 -marking-ThavenHairClassicModern = Classic Modern -marking-ThavenHairClassicMulder = Classic Mulder -marking-ThavenHairClassicWisp = Classic Wisp -marking-ThavenHairCoffeeHouse = Coffee House -marking-ThavenHairCombover = Combover -marking-ThavenHairCornrows = Cornrows -marking-ThavenHairCornrows2 = Cornrows 2 -marking-ThavenHairCornrowbun = Cornrow Bun -marking-ThavenHairCornrowbraid = Cornrow Braid -marking-ThavenHairCornrowtail = Cornrow Tail -marking-ThavenHairCrewcut = Crewcut -marking-ThavenHairCrewcut2 = Crewcut 2 -marking-ThavenHairCurls = Curls -marking-ThavenHairC = Cut Hair -marking-ThavenHairDandypompadour = Dandy Pompadour -marking-ThavenHairDevilock = Devil Lock -marking-ThavenHairDoublebun = Double Bun -marking-ThavenHairDoublebunLong = Double Bun Long -marking-ThavenHairDreads = Dreadlocks -marking-ThavenHairDrillHair = Drill Hair -marking-ThavenHairDrillruru = Drillruru -marking-ThavenHairDrillhairextended = Drill Hair (Extended) -marking-ThavenHairEmo = Emo -marking-ThavenHairEmo2 = Emo2 -marking-ThavenHairLongeremo = Longer Emo -marking-ThavenHairEmofringe = Emo Fringe -marking-ThavenHairNofade = Fade (None) -marking-ThavenHairHighfade = Fade (High) -marking-ThavenHairMedfade = Fade (Medium) -marking-ThavenHairLowfade = Fade (Low) -marking-ThavenHairBaldfade = Fade (Bald) -marking-ThavenHairFeather = Feather -marking-ThavenHairFather = Father -marking-ThavenHairSargeant = Flat Top -marking-ThavenHairFlair = Flair -marking-ThavenHairBigflattop = Flat Top (Big) -marking-ThavenHairFlow = Flow Hair -marking-ThavenHairGelled = Gelled Back -marking-ThavenHairGentle = Gentle -marking-ThavenHairHalfbang = Half-banged Hair -marking-ThavenHairHalfbang2 = Half-banged Hair 2 -marking-ThavenHairHalfshaved = Half-shaved -marking-ThavenHairHedgehog = Hedgehog Hair -marking-ThavenHairHimecut = Hime Cut -marking-ThavenHairHimecut2 = Hime Cut 2 -marking-ThavenHairShorthime = Hime Cut (Short) -marking-ThavenHairHimeup = Hime Updo -marking-ThavenHairHitop = Hitop -marking-ThavenHairJade = Jade -marking-ThavenHairJensen = Jensen Hair -marking-ThavenHairJoestar = Joestar -marking-ThavenHairKeanu = Keanu Hair -marking-ThavenHairKusanagi = Kusanagi Hair -marking-ThavenHairLongBow = Long Bow -marking-ThavenHairLong = Long Hair 1 -marking-ThavenHairLong2 = Long Hair 2 -marking-ThavenHairLong3 = Long Hair 3 -marking-ThavenHairLongWithBundles = Long With Bundles -marking-ThavenHairLongovereye = Long Over Eye -marking-ThavenHairLbangs = Long Bangs -marking-ThavenHairLongemo = Long Emo -marking-ThavenHairLongfringe = Long Fringe -marking-ThavenHairLongsidepart = Long Side Part -marking-ThavenHairMediumSidepart = Medium Side Part -marking-ThavenHairMegaeyebrows = Mega Eyebrows -marking-ThavenHairMessy = Messy -marking-ThavenHairModern = Modern -marking-ThavenHairMohawk = Mohawk -marking-ThavenHairNitori = Nitori -marking-ThavenHairReversemohawk = Mohawk (Reverse) -marking-ThavenHairUnshavenMohawk = Mohawk (Unshaven) -marking-ThavenHairMulder = Mulder -marking-ThavenHairOdango = Odango -marking-ThavenHairOmbre = Ombre -marking-ThavenHairOneshoulder = One Shoulder -marking-ThavenHairShortovereye = Over Eye -marking-ThavenHairOxton = Oxton -marking-ThavenHairParted = Parted -marking-ThavenHairPart = Parted (Side) -marking-ThavenHairKagami = Pigtails -marking-ThavenHairPigtails = Pigtails 2 -marking-ThavenHairPigtails2 = Pigtails 3 -marking-ThavenHairPixie = Pixie Cut -marking-ThavenHairPompadour = Pompadour -marking-ThavenHairBigpompadour = Pompadour (Big) -marking-ThavenHairPonytail = Ponytail -marking-ThavenHairPonytail2 = Ponytail 2 -marking-ThavenHairPonytail3 = Ponytail 3 -marking-ThavenHairPonytail4 = Ponytail 4 -marking-ThavenHairPonytail5 = Ponytail 5 -marking-ThavenHairPonytail6 = Ponytail 6 -marking-ThavenHairPonytail7 = Ponytail 7 -marking-ThavenHairHighponytail = Ponytail (High) -marking-ThavenHairStail = Ponytail (Short) -marking-ThavenHairLongstraightponytail = Ponytail (Long) -marking-ThavenHairCountry = Ponytail (Country) -marking-ThavenHairFringetail = Ponytail (Fringe) -marking-ThavenHairSidetail = Ponytail (Side) -marking-ThavenHairSidetail2 = Ponytail (Side) 2 -marking-ThavenHairSidetail3 = Ponytail (Side) 3 -marking-ThavenHairSidetail4 = Ponytail (Side) 4 -marking-ThavenHairSpikyponytail = Ponytail (Spiky) -marking-ThavenHairPoofy = Poofy -marking-ThavenHairBald = Bald -marking-ThavenHairClassicCia = Classic CIA -marking-ThavenHairQuiff = Quiff -marking-ThavenHairRonin = Ronin -marking-ThavenHairShaped = Shaped -marking-ThavenHairShaved = Shaved -marking-ThavenHairShavedMohawk = Shaved Mohawk -marking-ThavenHairShavedpart = Shaved Part -marking-ThavenHairShortbangs = Short Bangs -marking-ThavenHairA = Short Hair -marking-ThavenHairShorthair2 = Short Hair 2 -marking-ThavenHairShorthair3 = Short Hair 3 -marking-ThavenHairShorthair9 = Short Hair 9 -marking-ThavenHairD = Short Hair 4 -marking-ThavenHairE = Short Hair 5 -marking-ThavenHairF = Short Hair 6 -marking-ThavenHairShorthairg = Short Hair 7 -marking-ThavenHair80s = Short Hair 80s -marking-ThavenHairRosa = Short Hair Rosa -marking-ThavenHairB = Shoulder-length Hair -marking-ThavenHairShoulderLengthOverEye = Shoulder-length Over Eye -marking-ThavenHairSidecut = Sidecut -marking-ThavenHairSkinhead = Skinhead -marking-ThavenHairProtagonist = Slightly Long Hair -marking-ThavenHairSpikey = Spiky -marking-ThavenHairSpiky = Spiky 2 -marking-ThavenHairSpiky2 = Spiky 3 -marking-ThavenHairSpookyLong = Spooky Long -marking-ThavenHairSwept = Swept Back Hair -marking-ThavenHairSwept2 = Swept Back Hair 2 -marking-ThavenHairTailed = Tailed -marking-ThavenHairThinning = Thinning -marking-ThavenHairThinningfront = Thinning (Front) -marking-ThavenHairThinningrear = Thinning (Rear) -marking-ThavenHairTopknot = Topknot -marking-ThavenHairTressshoulder = Tress Shoulder -marking-ThavenHairTrimmed = Trimmed -marking-ThavenHairTrimflat = Trim Flat -marking-ThavenHairTwintail = Twintails -marking-ThavenHairTwoStrands = Two Strands -marking-ThavenHairUndercut = Undercut -marking-ThavenHairUndercutleft = Undercut Left -marking-ThavenHairUndercutright = Undercut Right -marking-ThavenHairUneven = Uneven -marking-ThavenHairUnkept = Unkept -marking-ThavenHairUpdo = Updo -marking-ThavenHairVlong = Very Long Hair -marking-ThavenHairLongest = Very Long Hair 2 -marking-ThavenHairLongest2 = Very Long Over Eye -marking-ThavenHairVeryshortovereyealternate = Very Short Over Eye -marking-ThavenHairVlongfringe = Very Long with Fringe -marking-ThavenHairVolaju = Volaju -marking-ThavenHairWisp = Wisp -marking-ThavenHairFrenchbraid = French Braid diff --git a/Resources/Locale/en-US/_Impstation/datasets/names/thaven.ftl b/Resources/Locale/en-US/_Impstation/datasets/names/thaven.ftl deleted file mode 100644 index 1cba9071d6a..00000000000 --- a/Resources/Locale/en-US/_Impstation/datasets/names/thaven.ftl +++ /dev/null @@ -1,76 +0,0 @@ -names-thaven-dataset-1 = Honesty -names-thaven-dataset-2 = Have Mercy -names-thaven-dataset-3 = Give Thanks To Thine Ancestors -names-thaven-dataset-4 = Obedience -names-thaven-dataset-5 = Search The Scriptures -names-thaven-dataset-6 = Learn Many Things -names-thaven-dataset-7 = Praise The Gods -names-thaven-dataset-8 = Fear Be Unto The Gods -names-thaven-dataset-9 = Joy In Sorrow -names-thaven-dataset-10 = Die Well -names-thaven-dataset-11 = Wander Far And Wide -names-thaven-dataset-12 = Lament The Fallen -names-thaven-dataset-13 = Prove Thy Worth -names-thaven-dataset-14 = Desire -names-thaven-dataset-15 = Charity -names-thaven-dataset-16 = Faith -names-thaven-dataset-17 = Harmony -names-thaven-dataset-18 = Modesty -names-thaven-dataset-19 = Honor Thy Family -names-thaven-dataset-20 = Patient As The Dead -names-thaven-dataset-21 = Temper Thy Heart And Soul -names-thaven-dataset-22 = Tell Only The Truth -names-thaven-dataset-23 = Thou Art Loved -names-thaven-dataset-24 = Thou Art Damned -names-thaven-dataset-25 = Aid The Righteous -names-thaven-dataset-26 = Be Courteous -names-thaven-dataset-27 = Make Peace -names-thaven-dataset-28 = Fear The Gods -names-thaven-dataset-29 = Forsake Alcohol -names-thaven-dataset-30 = Fight Evil At All Costs -names-thaven-dataset-31 = Shun The Unworthy -names-thaven-dataset-32 = Gain Wisdom Through Experience -names-thaven-dataset-33 = Live Well And Die Young -names-thaven-dataset-34 = Face Trials And Tribulations -names-thaven-dataset-35 = Pardon Worthy Criminals -names-thaven-dataset-36 = Find Merit In All Things -names-thaven-dataset-37 = Deny Sin Its Due -names-thaven-dataset-38 = Stand Fast Against Evil -names-thaven-dataset-39 = Do As The Gods Will -names-thaven-dataset-40 = Zeal Of The Land -names-thaven-dataset-41 = Be Courteous To Others -names-thaven-dataset-42 = Considerate -names-thaven-dataset-43 = Discipline -names-thaven-dataset-44 = Do Right By Your Neighbors -names-thaven-dataset-45 = Serve Your Purpose -names-thaven-dataset-46 = Good Things Come -names-thaven-dataset-47 = Magnify Injustice -names-thaven-dataset-48 = Legitimate First -names-thaven-dataset-49 = Take Pity On The Less-Fortunate -names-thaven-dataset-50 = Redeem Thy Past Mistakes -names-thaven-dataset-51 = Rejoice -names-thaven-dataset-52 = Repent All Ye Sinners -names-thaven-dataset-53 = Return To Thy Homeland -names-thaven-dataset-54 = Deliverance -names-thaven-dataset-55 = See Truth -names-thaven-dataset-56 = Drink Full And Descend -names-thaven-dataset-57 = Do Thy Best -names-thaven-dataset-58 = Live The Day Like Thy Last -names-thaven-dataset-59 = Adaptability -names-thaven-dataset-60 = Endurance -names-thaven-dataset-61 = Negativity -names-thaven-dataset-62 = Attentiveness -names-thaven-dataset-63 = Foppishness -names-thaven-dataset-64 = One Before All -names-thaven-dataset-65 = Purpose -names-thaven-dataset-66 = Simplicity -names-thaven-dataset-67 = Minimalism -names-thaven-dataset-68 = Proselytism -names-thaven-dataset-69 = Conformity -names-thaven-dataset-70 = The Perils of Hedonism -names-thaven-dataset-71 = Volition -names-thaven-dataset-72 = Gumption -names-thaven-dataset-73 = Providence -names-thaven-dataset-74 = Righteousness -names-thaven-dataset-75 = Wisdom -names-thaven-dataset-76 = Cunning diff --git a/Resources/Locale/en-US/_Impstation/markings/thaven.ftl b/Resources/Locale/en-US/_Impstation/markings/thaven.ftl deleted file mode 100644 index ebfcfbcf891..00000000000 --- a/Resources/Locale/en-US/_Impstation/markings/thaven.ftl +++ /dev/null @@ -1,47 +0,0 @@ -marking-ThavenEars1-ears1 = Small Ears -marking-ThavenEars1 = Small Ears - -marking-ThavenEars2-ears2 = Medium Ears -marking-ThavenEars2 = Medium Ears - -marking-ThavenEars3-ears3 = Long Ears -marking-ThavenEars3 = Long Ears - -marking-ThavenEars4-ears4 = Droopy Ears -marking-ThavenEars4 = Droopy Ears - -marking-ThavenPiercings-piercings = Helix Piercing -marking-ThavenPiercings = Helix Piercing - -marking-ThavenPiercings2-piercings2 = Hoop Piercing -marking-ThavenPiercings2 = Hoop Piercing - -marking-ThavenChestTattoo1-chesttat1 = Back Tattoo -marking-ThavenChestTattoo1 = Back Tattoo - -marking-ThavenLArmTattoo1-larmtat1 = Arm Band (Left) -marking-ThavenLArmTattoo1 = Arm Band (Left) - -marking-ThavenRArmTattoo1-larmtat1 = Arm Band (Right) -marking-ThavenRArmTattoo1 = Arm Band (Right) - -marking-Gills = Gills -marking-SharkminnowEyeliner = Sharkminnow Eyeliner -marking-ThavenBiteMark = Bite Mark -marking-ThavenBodyStripes = Body Stripes -marking-ThavenChestScales = Chest Scales -marking-ThavenEarsBigFins = Big Fins -marking-ThavenFishEars = Fish Ears -marking-ThavenHeadCap = Head Cap -marking-ThavenHeadScales = Head Scales -marking-ThavenHeadStripes = Head Stripes -marking-ThavenLArmScales = Arm Scales (left) -marking-ThavenLLegScales = Leg Scales (left) -marking-ThavenRArmScales = Arm Scales (right) -marking-ThavenRLegScales = Leg Scales (right) -marking-ThavenSpines = Spines -marking-ThavenTattooVines = Vines Tattoo -marking-ThavenTattooWave = Wave Tattoo -marking-ThavenTiger = Tiger Stripes -marking-ThavenTigerLArm = Tiger Stripes (left arm) -marking-ThavenTigerRArm = Tiger Stripes (right arm) diff --git a/Resources/Locale/en-US/deltav/markings/chitinid.ftl b/Resources/Locale/en-US/deltav/markings/chitinid.ftl deleted file mode 100644 index be5ae5896a7..00000000000 --- a/Resources/Locale/en-US/deltav/markings/chitinid.ftl +++ /dev/null @@ -1,164 +0,0 @@ -marking-ChitinidAntennasDefault-default = Antennae -marking-ChitinidAntennasDefault = Antennae (Default) - -marking-ChitinidAntennasCurly-curly = Antennae -marking-ChitinidAntennasCurly = Antennae (Curly) - -marking-ChitinidAntennasGray-gray = Antennae -marking-ChitinidAntennasGray = Antennae (Gray) - -marking-ChitinidAntennasSlick-slick = Antennae -marking-ChitinidAntennasSlick = Antennae (Slick) - -marking-ChitinidAntennasShort-short = Antennae -marking-ChitinidAntennasShort = Antennae (short) - -marking-ChitinidAntennasLong-long = Antennae -marking-ChitinidAntennasLong = Antennae (Long) - -marking-ChitinidAntennasBee-bee = Antennae -marking-ChitinidAntennasBee = Antennae (Bee) - -marking-ChitinidAntennasFirefly-firefly_primary = Primary -marking-ChitinidAntennasFirefly-firefly_secondary = Secondary -marking-ChitinidAntennasFirefly = Antennae (Firefly) - -marking-ChitinidAntennasRadar-radar = Antennae -marking-ChitinidAntennasRadar = Antennae (Radar) - -marking-ChitinidAntennasSpeed-speed = Antennae -marking-ChitinidAntennasSpeed = Antennae (Speed) - - - -marking-ChitinidWingsDefault-default = Wing -marking-ChitinidWingsDefault = Tail (Default) - -marking-ChitinidWingsSmooth-smooth = Wing -marking-ChitinidWingsSmooth = Tail (Smooth) - -marking-ChitinidWingsHoneypot-honeypot_primary = Primary -marking-ChitinidWingsHoneypot-honeypot_secondary = Secondary -marking-ChitinidWingsHoneypot = Tail (Honeypot) - -marking-ChitinidWingsStubby-stubby = Wing -marking-ChitinidWingsStubby = Tail (Stubby) - -marking-ChitinidWingsBee-bee_primary = Primary -marking-ChitinidWingsBee-bee_secondary = Secondary -marking-ChitinidWingsBee = Tail (Bee) - -marking-ChitinidWingsFirefly-firefly_primary = Primary -marking-ChitinidWingsFirefly-firefly_secondary = Secondary -marking-ChitinidWingsFirefly = Tail (Firefly) - - - -marking-ChitinidChestCharred-charred_chest = Chest -marking-ChitinidChestCharred = Chitinid Chest (Charred) - -marking-ChitinidHeadCharred-charred_head = Head -marking-ChitinidHeadCharred = Chitinid Head (Charred) - -marking-ChitinidLLegCharred-charred_l_leg = Left Leg -marking-ChitinidLLegCharred = Chitinid Left Leg (Charred) - -marking-ChitinidRLegCharred-charred_r_leg = Right Leg -marking-ChitinidRLegCharred = Chitinid Right Leg (Charred) - -marking-ChitinidLArmCharred-charred_l_arm = Left Arm -marking-ChitinidLArmCharred = Chitinid Left Arm (Charred) - -marking-ChitinidRArmCharred-charred_r_arm = Right Arm -marking-ChitinidRArmCharred = Chitinid Right Arm (Charred) - - - -marking-ChitinidChestPlated-plated_chest = Chest -marking-ChitinidChestPlated = Chitinid Chest (Plated) - -marking-ChitinidLArmPlated-plated_l_arm = Left Arm -marking-ChitinidLArmPlated = Chitinid Left Arm (Plated) - -marking-ChitinidRArmPlated-plated_r_arm = Right Arm -marking-ChitinidRArmPlated = Chitinid Right Arm (Plated) - - - -marking-ChitinidChestStripes-stripes_chest = Chest -marking-ChitinidChestStripes = Chitinid Chest (Stripes) - -marking-ChitinidHeadStripes-stripes_head = Head -marking-ChitinidHeadStripes = Chitinid Head (Stripes) - -marking-ChitinidLLegStripes-stripes_l_leg = Left Leg -marking-ChitinidLLegStripes = Chitinid Left Leg (Stripes) - -marking-ChitinidRLegStripes-stripes_r_leg = Right Leg -marking-ChitinidRLegStripes = Chitinid Right Leg (Stripes) - -marking-ChitinidLArmStripes-stripes_l_arm = Left Arm -marking-ChitinidLArmStripes = Chitinid Left Arm (Stripes) - -marking-ChitinidRArmStripes-stripes_r_arm = Right Arm -marking-ChitinidRArmStripes = Chitinid Right Arm (Stripes) - - - -marking-ChitinidChestRadiant-radiant_chest = Chest -marking-ChitinidChestRadiant = Chitinid Chest (Radiant) - -marking-ChitinidHeadRadiant-radiant_head = Head -marking-ChitinidHeadRadiant = Chitinid Head (Radiant) - -marking-ChitinidLLegRadiant-radiant_l_leg = Left Leg -marking-ChitinidLLegRadiant = Chitinid Left Leg (Radiant) - -marking-ChitinidRLegRadiant-radiant_r_leg = Right Leg -marking-ChitinidRLegRadiant = Chitinid Right Leg (Radiant) - -marking-ChitinidLArmRadiant-radiant_l_arm = Left Arm -marking-ChitinidLArmRadiant = Chitinid Left Arm (Radiant) - -marking-ChitinidRArmRadiant-radiant_r_arm = Right Arm -marking-ChitinidRArmRadiant = Chitinid Right Arm (Radiant) - - - -marking-ChitinidChestToxic-toxic_chest = Chest -marking-ChitinidChestToxic = Chitinid Chest (Toxic) - -marking-ChitinidHeadToxic-toxic_head = Head -marking-ChitinidHeadToxic = Chitinid Head (Toxic) - -marking-ChitinidLLegToxic-toxic_l_leg = Left Leg -marking-ChitinidLLegToxic = Chitinid Left Leg (Toxic) - -marking-ChitinidRLegToxic-toxic_r_leg = Right Leg -marking-ChitinidRLegToxic = Chitinid Right Leg (Toxic) - -marking-ChitinidLArmToxic-toxic_l_arm = Left Arm -marking-ChitinidLArmToxic = Chitinid Left Arm (Toxic) - -marking-ChitinidRArmToxic-toxic_r_arm = Right Arm -marking-ChitinidRArmToxic = Chitinid Right Arm (Toxic) - - - -marking-ChitinidChestSpotted-spotted_chest = Chest -marking-ChitinidChestSpotted = Chitinid Chest (Spotted) - -marking-ChitinidHeadSpotted-spotted_head = Head -marking-ChitinidHeadSpotted = Chitinid Head (Spotted) - -marking-ChitinidLLegSpotted-spotted_l_leg = Left Leg -marking-ChitinidLLegSpotted = Chitinid Left Leg (Spotted) - -marking-ChitinidRLegSpotted-spotted_r_leg = Right Leg -marking-ChitinidRLegSpotted = Chitinid Right Leg (Spotted) - -marking-ChitinidLArmSpotted-spotted_l_arm = Left Arm -marking-ChitinidLArmSpotted = Chitinid Left Arm (Spotted) - -marking-ChitinidRArmSpotted-spotted_r_arm = Right Arm -marking-ChitinidRArmSpotted = Chitinid Right Arm (Spotted) diff --git a/Resources/Maps/_Crescent/Shuttles/Civilian/qian.yml b/Resources/Maps/_Crescent/Shuttles/Civilian/qian.yml index 7fdd954c3f4..0877ba01e88 100644 --- a/Resources/Maps/_Crescent/Shuttles/Civilian/qian.yml +++ b/Resources/Maps/_Crescent/Shuttles/Civilian/qian.yml @@ -7598,15 +7598,6 @@ entities: - type: Physics canCollide: False - type: InsideEntityStorage -- proto: ClothingOuterJacketInsulated - entities: - - uid: 899 - components: - - type: Transform - parent: 897 - - type: Physics - canCollide: False - - type: InsideEntityStorage - proto: ClothingShoesBootsCombat entities: - uid: 942 diff --git a/Resources/Prototypes/Body/Parts/harpy.yml b/Resources/Prototypes/Body/Parts/harpy.yml deleted file mode 100644 index cae5364ff33..00000000000 --- a/Resources/Prototypes/Body/Parts/harpy.yml +++ /dev/null @@ -1,274 +0,0 @@ -- type: entity - id: PartHarpy - parent: BaseItem - name: "harpy body part" - abstract: true - components: - - type: Damageable - damageContainer: OrganicPart # Shitmed Change - - type: BodyPart - - type: ContainerContainer - containers: - bodypart: !type:Container - ents: [] - - type: StaticPrice #DynamicPrice - price: 100 - - type: Tag - tags: - - Trash - # Shitmed Change Start - - type: Gibbable - - type: SurgeryTool - startSound: - path: /Audio/_Shitmed/Medical/Surgery/organ1.ogg - endSound: - path: /Audio/_Shitmed/Medical/Surgery/organ2.ogg - - type: Destructible - thresholds: - - trigger: - !type:DamageTypeTrigger - damageType: Blunt - damage: 110 - behaviors: - - !type:GibPartBehavior { } - - trigger: - !type:DamageTypeTrigger - damageType: Slash - damage: 150 - behaviors: - - !type:GibPartBehavior { } - - trigger: - !type:DamageTypeTrigger - damageType: Heat - damage: 200 - behaviors: - - !type:SpawnEntitiesBehavior - spawnInContainer: true - spawn: - Ash: - min: 1 - max: 1 - - !type:BurnBodyBehavior { } - - !type:PlaySoundBehavior - sound: - collection: MeatLaserImpact - # Shitmed Change End - -- type: entity - id: TorsoHarpy - name: "harpy torso" - parent: PartHarpy - components: - - type: Sprite - netsync: false - sprite: Mobs/Species/Harpy/parts.rsi - state: "torso_m" - - type: Icon - sprite: Mobs/Species/Harpy/parts.rsi - state: "torso_m" - - type: BodyPart - partType: Torso - # Shitmed Change Start - toolName: "a torso" - containerName: "torso_slot" - - type: ContainerContainer - containers: - torso_slot: !type:ContainerSlot {} - - type: Destructible - thresholds: - - trigger: - !type:DamageTypeTrigger - damageType: Blunt - damage: 400 - behaviors: - - !type:GibPartBehavior { } - - trigger: - !type:DamageTypeTrigger - damageType: Slash - damage: 400 - behaviors: - - !type:GibPartBehavior { } - - trigger: - !type:DamageTypeTrigger - damageType: Heat - damage: 400 - behaviors: - - !type:SpawnEntitiesBehavior - spawnInContainer: true - spawn: - Ash: - min: 1 - max: 1 - - !type:BurnBodyBehavior { } - - !type:PlaySoundBehavior - sound: - collection: MeatLaserImpact - # Shitmed Change End - -- type: entity - id: HeadHarpy - name: "harpy head" - parent: PartHarpy - components: - - type: Sprite - netsync: false - sprite: Mobs/Species/Harpy/parts.rsi - state: "head_m" - - type: Icon - sprite: Mobs/Species/Harpy/parts.rsi - state: "head_m" - - type: BodyPart - partType: Head - vital: true - toolName: "a head" # Shitmed Change - - type: Input - context: "ghost" - - type: InputMover - - type: GhostOnMove - - type: Tag - tags: - - Head - -- type: entity - id: LeftArmHarpy - name: "left harpy arm" - parent: PartHarpy - components: - - type: Sprite - netsync: false - sprite: Mobs/Species/Harpy/parts.rsi - state: "l_arm" - - type: Icon - sprite: Mobs/Species/Harpy/parts.rsi - state: "l_arm" - - type: BodyPart - partType: Arm - symmetry: Left - toolName: "a left arm" # Shitmed Change - -- type: entity - id: RightArmHarpy - name: "right harpy arm" - parent: PartHarpy - components: - - type: Sprite - netsync: false - sprite: Mobs/Species/Harpy/parts.rsi - state: "r_arm" - - type: Icon - sprite: Mobs/Species/Harpy/parts.rsi - state: "r_arm" - - type: BodyPart - partType: Arm - symmetry: Right - toolName: "a right arm" # Shitmed Change - onAdd: - - type: Flight - speedModifier: 1.3 # For harpies, it gives an effective ~60% (60.16%) increase over sprinting (as sprinting has a 10% increase for harpies) with base harpy weightless modifier - isLayerAnimated: true - layer: "/Textures/Mobs/Customization/Harpy/harpy_wings.rsi" - animationKey: "Flap" - -- type: entity - id: LeftHandHarpy - name: "left harpy hand" - parent: PartHarpy - components: - - type: Sprite - netsync: false - sprite: Mobs/Species/Harpy/parts.rsi - state: "l_hand" - - type: Icon - sprite: Mobs/Species/Harpy/parts.rsi - state: "l_hand" - - type: BodyPart - partType: Hand - symmetry: Left - toolName: "a left hand" # Shitmed Change - -- type: entity - id: RightHandHarpy - name: "right harpy hand" - parent: PartHarpy - components: - - type: Sprite - netsync: false - sprite: Mobs/Species/Harpy/parts.rsi - state: "r_hand" - - type: Icon - sprite: Mobs/Species/Harpy/parts.rsi - state: "r_hand" - - type: BodyPart - partType: Hand - symmetry: Right - toolName: "a right hand" # Shitmed Change - -- type: entity - id: LeftLegHarpy - name: "left harpy leg" - parent: PartHarpy - components: - - type: Sprite - netsync: false - sprite: Mobs/Species/Harpy/parts.rsi - state: "l_leg" - - type: Icon - sprite: Mobs/Species/Harpy/parts.rsi - state: "l_leg" - - type: BodyPart - partType: Leg - symmetry: Left - toolName: "a left leg" # Shitmed Change - - type: MovementBodyPart - -- type: entity - id: RightLegHarpy - name: "right harpy leg" - parent: PartHarpy - components: - - type: Sprite - netsync: false - sprite: Mobs/Species/Harpy/parts.rsi - state: "r_leg" - - type: Icon - sprite: Mobs/Species/Harpy/parts.rsi - state: "r_leg" - - type: BodyPart - partType: Leg - symmetry: Right - toolName: "a right leg" # Shitmed Change - - type: MovementBodyPart - -- type: entity - id: LeftFootHarpy - name: "left harpy foot" - parent: PartHarpy - components: - - type: Sprite - netsync: false - sprite: Mobs/Species/Harpy/parts.rsi - state: "l_foot" - - type: Icon - sprite: Mobs/Species/Harpy/parts.rsi - state: "l_foot" - - type: BodyPart - partType: Foot - symmetry: Left - toolName: "a left foot" # Shitmed Change - -- type: entity - id: RightFootHarpy - name: "right harpy foot" - parent: PartHarpy - components: - - type: Sprite - netsync: false - sprite: Mobs/Species/Harpy/parts.rsi - state: "r_foot" - - type: Icon - sprite: Mobs/Species/Harpy/parts.rsi - state: "r_foot" - - type: BodyPart - partType: Foot - symmetry: Right - toolName: "a right foot" # Shitmed Change diff --git a/Resources/Prototypes/Body/Prototypes/Specific/squackroach.yml b/Resources/Prototypes/Body/Prototypes/Specific/squackroach.yml deleted file mode 100644 index 29ca1d102ee..00000000000 --- a/Resources/Prototypes/Body/Prototypes/Specific/squackroach.yml +++ /dev/null @@ -1,13 +0,0 @@ -- type: body - id: Squackroach - name: "squackroach" - root: torso - slots: - torso: - part: TorsoAnimal - organs: - lungs: OrganHarpyLungs - stomach: OrganAnimalStomach - liver: OrganAnimalLiver - heart: OrganAnimalHeart - kidneys: OrganAnimalKidneys diff --git a/Resources/Prototypes/Catalog/Fills/Crates/engineering.yml b/Resources/Prototypes/Catalog/Fills/Crates/engineering.yml index 3f330d1747c..03c870fa580 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/engineering.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/engineering.yml @@ -18,8 +18,6 @@ amount: 3 - id: ClothingHandsGlovesColorYellow amount: 2 - - id: ClothingOuterJacketInsulated - amount: 1 - type: entity id: CrateEngineeringToolbox diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml b/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml index 19d15689391..b28dfcfbf00 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml @@ -29,8 +29,6 @@ prob: 0.2 - id: ClothingHandsGlovesColorYellow prob: 0.05 - - id: ClothingOuterJacketInsulated - prob: 0.05 - id: ClothingHeadHatHardhatRed prob: 0.4 - id: CableApcStack @@ -152,7 +150,6 @@ - type: StorageFill contents: - id: ClothingHandsGlovesColorYellow - - id: ClothingOuterJacketInsulated - id: ClothingMaskGas - id: trayScanner - id: RCD diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml index 6ed3585f075..31482a23ba9 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml @@ -129,7 +129,6 @@ - id: ClothingEyesGlassesMeson - id: ClothingShoesBootsMagAdv - id: ClothingHandsGlovesColorYellow - - id: ClothingOuterJacketInsulated - id: CigarCase prob: 0.15 - id: DoorRemoteEngineering @@ -158,7 +157,6 @@ - id: ClothingEyesGlassesMeson - id: ClothingBeltChiefEngineerFilled - id: ClothingHandsGlovesColorYellow - - id: ClothingOuterJacketInsulated - id: CigarCase prob: 0.15 - id: DoorRemoteEngineering @@ -185,7 +183,6 @@ contents: - id: MedkitFilled - id: ClothingHandsGlovesNitrile - - id: ClothingOuterJacketSurgical - id: ClothingEyesHudMedical - id: ClothingHeadsetAltMedical - id: ClothingBackpackDuffelSurgeryFilled @@ -216,7 +213,6 @@ contents: - id: MedkitFilled - id: ClothingHandsGlovesNitrile - - id: ClothingOuterJacketSurgical - id: ClothingEyesHudMedical - id: ClothingHeadsetAltMedical - id: ClothingBackpackDuffelSurgeryFilled diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/wardrobe_job.yml b/Resources/Prototypes/Catalog/Fills/Lockers/wardrobe_job.yml index 84f17c2d785..ee5748329a8 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/wardrobe_job.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/wardrobe_job.yml @@ -132,8 +132,6 @@ - id: ClothingUniformJumpskirtMedicalDoctor - id: ClothingHandsGlovesLatex prob: 0.4 - - id: ClothingOuterJacketSurgical - prob: 0.2 - id: ClothingEyesGlasses prob: 0.3 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/engivend.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/engivend.yml index 78a54d9b6a4..63ba5fbfc2b 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/engivend.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/engivend.yml @@ -11,5 +11,4 @@ RCD: 4 RCDAmmo: 6 AccessConfigurator: 4 - ClothingOuterJacketInsulated: 3 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/medidrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/medidrobe.yml index 17758e8c8c9..edf0369ee6e 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/medidrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/medidrobe.yml @@ -12,14 +12,13 @@ ClothingShoesColorWhite: 4 ClothingHandsGlovesLatex: 4 ClothingHandsGlovesNitrile: 2 - ClothingOuterJacketSurgical: 2 ClothingHeadsetMedical: 4 ClothingOuterWinterMed: 2 ClothingOuterHospitalGown: 5 UniformScrubsColorGreen: 4 UniformScrubsColorBlue: 4 UniformScrubsColorPurple: 4 - ClothingHeadHatSurgcapGreen: 4 + ClothingHeadHatSurgcapGreen: 4 ClothingHeadHatSurgcapBlue: 4 ClothingHeadHatSurgcapPurple: 4 ClothingShoesBootsWinterMed: 2 diff --git a/Resources/Prototypes/DeltaV/Body/Organs/chitinid.yml b/Resources/Prototypes/DeltaV/Body/Organs/chitinid.yml deleted file mode 100644 index f82e055fbaa..00000000000 --- a/Resources/Prototypes/DeltaV/Body/Organs/chitinid.yml +++ /dev/null @@ -1,65 +0,0 @@ -- type: entity - id: OrganChitinidStomach - parent: OrganAnimalStomach - name: stomach - description: "Gross. This is hard to stomach." - components: - - type: Organ # Shitmed Change - slotId: stomach # Shitmed Change - - type: Sprite - state: stomach - - type: Item - size: Small - heldPrefix: stomach - - type: SolutionContainerManager - solutions: - stomach: - maxVol: 50 - food: - maxVol: 5 - reagents: - - ReagentId: UncookedAnimalProteins - Quantity: 5 - - type: Stomach - # The stomach metabolizes stuff like foods and drinks. - # TODO: Have it work off of the ent's solution container, and move this - # to intestines instead. - - type: Metabolizer - # mm yummy - maxReagents: 3 - metabolizerTypes: [Animal] - groups: - - id: Food - - id: Drink - -- type: entity - id: OrganChitinidLiver - parent: BaseAnimalOrgan - name: liver - categories: [ HideSpawnMenu ] - components: - - type: Organ - slotId: liver # Shitmed - onAdd: - - type: UnpoweredFlashlight - - type: PointLight - enabled: false - radius: 3 - softness: 5 - color: "#2CFA1F" - autoRot: true - - type: Sprite - state: liver - - type: Metabolizer - maxReagents: 1 - metabolizerTypes: [ Animal ] - groups: - - id: Alcohol - rateModifier: 0.1 - - type: Liver # Shitmed - - type: Tag # goob edit - tags: - - Meat - - type: Item - size: Small - heldPrefix: liver diff --git a/Resources/Prototypes/DeltaV/Body/Organs/harpy.yml b/Resources/Prototypes/DeltaV/Body/Organs/harpy.yml deleted file mode 100644 index d573ce0dfba..00000000000 --- a/Resources/Prototypes/DeltaV/Body/Organs/harpy.yml +++ /dev/null @@ -1,36 +0,0 @@ -- type: entity - id: OrganHarpyLungs - parent: BaseHumanOrgan - name: lungs - description: "An advanced pair of avian lungs. Filters oxygen by way of moving air constantly through air sacs." - components: - - type: Sprite - layers: - - state: lung-l - - state: lung-r - - type: Lung - - type: Organ - slotId: lungs - - type: Metabolizer - updateInterval: 2.0 - removeEmpty: true - solutionOnBody: false - solution: "Lung" - metabolizerTypes: [ Human ] - groups: - - id: Gas - rateModifier: 200.0 - - type: SolutionContainerManager - solutions: - organ: - reagents: - - ReagentId: Nutriment - Quantity: 10 - Lung: - maxVol: 100.0 - canReact: false - food: - maxVol: 5 - reagents: - - ReagentId: UncookedAnimalProteins - Quantity: 5 diff --git a/Resources/Prototypes/DeltaV/Body/Parts/chitinid.yml b/Resources/Prototypes/DeltaV/Body/Parts/chitinid.yml deleted file mode 100644 index 507ba70f487..00000000000 --- a/Resources/Prototypes/DeltaV/Body/Parts/chitinid.yml +++ /dev/null @@ -1,112 +0,0 @@ -# TODO: Add descriptions (many) -# TODO BODY: Part damage -- type: entity - id: PartChitinidBase - parent: [BaseItem, BasePart] - name: "Chitinid body part" - abstract: true - components: - - type: Sprite - sprite: DeltaV/Mobs/Species/Chitinid/parts.rsi - - type: Extractable - juiceSolution: - reagents: - - ReagentId: Fat - Quantity: 3 - - ReagentId: Blood - Quantity: 10 - -- type: entity - id: TorsoChitinid - name: "chitinid torso" - parent: [PartChitinidBase, BaseTorso] - components: - - type: Sprite - state: "torso_m" - - type: Extractable - juiceSolution: - reagents: - - ReagentId: Fat - Quantity: 10 - - ReagentId: Blood - Quantity: 20 - - -- type: entity - id: HeadChitinid - name: "chitinid head" - parent: [PartChitinidBase, BaseHead] - components: - - type: Sprite - state: "head_m" - - type: Extractable - juiceSolution: - reagents: - - ReagentId: Fat - Quantity: 5 - - ReagentId: Blood - Quantity: 10 - -- type: entity - id: LeftArmChitinid - name: "left chitinid arm" - parent: [PartChitinidBase, BaseLeftArm] - components: - - type: Sprite - state: "l_arm" - -- type: entity - id: RightArmChitinid - name: "right chitinid arm" - parent: [PartChitinidBase, BaseRightArm] - components: - - type: Sprite - state: "r_arm" - -- type: entity - id: LeftHandChitinid - name: "left chitinid hand" - parent: [PartChitinidBase, BaseLeftHand] - components: - - type: Sprite - state: "l_hand" - -- type: entity - id: RightHandChitinid - name: "right chitinid hand" - parent: [PartChitinidBase, BaseRightHand] - components: - - type: Sprite - state: "r_hand" - -- type: entity - id: LeftLegChitinid - name: "left chitinid leg" - parent: [PartChitinidBase, BaseLeftLeg] - components: - - type: Sprite - state: "l_leg" - -- type: entity - id: RightLegChitinid - name: "right chitinid leg" - parent: [PartChitinidBase, BaseRightLeg] - components: - - type: Sprite - state: "r_leg" - -- type: entity - id: LeftFootChitinid - name: "left chitinid foot" - parent: [PartChitinidBase, BaseLeftFoot] - components: - - type: Sprite - state: "l_foot" - -- type: entity - id: RightFootChitinid - name: "right chitinid foot" - parent: [PartChitinidBase, BaseRightFoot] - components: - - type: Sprite - state: "r_foot" diff --git a/Resources/Prototypes/DeltaV/Body/Prototypes/chitinid.yml b/Resources/Prototypes/DeltaV/Body/Prototypes/chitinid.yml deleted file mode 100644 index d4b44fba722..00000000000 --- a/Resources/Prototypes/DeltaV/Body/Prototypes/chitinid.yml +++ /dev/null @@ -1,49 +0,0 @@ -- type: body - id: Chitinid - name: "chitinid" - root: torso - slots: - head: - part: HeadChitinid - connections: - - torso - organs: - brain: OrganHumanBrain - eyes: OrganHumanEyes - torso: - part: TorsoChitinid - organs: - heart: OrganHumanHeart - lungs: OrganHumanLungs - stomach: OrganChitinidStomach - liver: OrganChitinidLiver - kidneys: OrganHumanKidneys - connections: - - right arm - - left arm - - right leg - - left leg - right arm: - part: RightArmChitinid - connections: - - right hand - left arm: - part: LeftArmChitinid - connections: - - left hand - right hand: - part: RightHandChitinid - left hand: - part: LeftHandChitinid - right leg: - part: RightLegChitinid - connections: - - right foot - left leg: - part: LeftLegChitinid - connections: - - left foot - right foot: - part: RightFootChitinid - left foot: - part: LeftFootChitinid diff --git a/Resources/Prototypes/DeltaV/Body/Prototypes/harpy.yml b/Resources/Prototypes/DeltaV/Body/Prototypes/harpy.yml deleted file mode 100644 index bfd4f62e1b9..00000000000 --- a/Resources/Prototypes/DeltaV/Body/Prototypes/harpy.yml +++ /dev/null @@ -1,51 +0,0 @@ -- type: body - id: Harpy - name: "harpy" - root: torso - slots: - head: - part: HeadHarpy - connections: - - torso - organs: - brain: OrganHumanBrain - eyes: OrganHumanEyes - torso: - part: TorsoHarpy - connections: - - right arm - - left arm - - right leg - - left leg - - head # Shitmed Change - organs: - heart: OrganHumanHeart - lungs: OrganHarpyLungs - stomach: OrganAnimalStomach - liver: OrganAnimalLiver - kidneys: OrganAnimalKidneys - right arm: - part: RightArmHarpy - connections: - - right hand - left arm: - part: LeftArmHarpy - connections: - - left hand - right hand: - part: RightHandHarpy - left hand: - part: LeftHandHarpy - right leg: - part: RightLegHarpy - connections: - - right foot - left leg: - part: LeftLegHarpy - connections: - - left foot - right foot: - part: RightFootHarpy - left foot: - part: LeftFootHarpy - diff --git a/Resources/Prototypes/DeltaV/Catalog/uplink_catalog.yml b/Resources/Prototypes/DeltaV/Catalog/uplink_catalog.yml index 467440e3112..b85878a9893 100644 --- a/Resources/Prototypes/DeltaV/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/DeltaV/Catalog/uplink_catalog.yml @@ -9,24 +9,6 @@ categories: - UplinkAllies -- type: listing - id: UplinkBionicSyrinxImplanter - name: uplink-bionic-syrinx-implanter-name - description: uplink-bionic-syrinx-implanter-desc - productEntity: BionicSyrinxImplanter - cost: - Telecrystal: 10 - categories: - - UplinkImplants - conditions: - - !type:BuyerSpeciesCondition - whitelist: - - Harpy - - !type:BuyerWhitelistCondition - blacklist: - components: - - SurplusBundle - - type: listing id: UplinkDoorjack name: uplink-doorjack-name diff --git a/Resources/Prototypes/DeltaV/Datasets/Names/chitinid_first_female.yml b/Resources/Prototypes/DeltaV/Datasets/Names/chitinid_first_female.yml deleted file mode 100644 index be91ea31509..00000000000 --- a/Resources/Prototypes/DeltaV/Datasets/Names/chitinid_first_female.yml +++ /dev/null @@ -1,34 +0,0 @@ -- type: dataset - id: NamesChitinidFirstFemale - values: - - Amer'ix - - An'bela - - An'ora - - Aza'ran - - Be'riah - - Bel'os - - Da'lrah - - Di'azo - - E'nzo - - Em'era - - Fi'n'rah - - He'teka - - Ir'iska - - Ish'kar - - Isha'ba - - Jes'sri'ka - - Kalz'za - - Kaz'zek - - Lot'tikz - - Ral'zol - - Ri'isano - - Talzz'ark - - Tess'ara - - Tez'mal'zar - - Thri'kis - - Vani'si'kar - - Ve'rai - - Vish'ra - - Zan'ova - - Zen'ofi - - Zzer'ak diff --git a/Resources/Prototypes/DeltaV/Datasets/Names/chitinid_first_male.yml b/Resources/Prototypes/DeltaV/Datasets/Names/chitinid_first_male.yml deleted file mode 100644 index 355f5cffb9b..00000000000 --- a/Resources/Prototypes/DeltaV/Datasets/Names/chitinid_first_male.yml +++ /dev/null @@ -1,36 +0,0 @@ -- type: dataset - id: NamesChitinidFirstMale - values: - - Al'vos - - Amue'val - - Barma'tos - - Ben'idar - - Bil'verrok - - Crik'xis - - Daru'nta - - Dee'aldas - - Drx'var - - Hen'sra - - Hux'von - - Ilv'imon - - Is'irax - - Ish'nax - - Jax'zaril'va - - L'ofa - - Lo'zok - - Lu'vurx - - Luc'irax - - Mer'tex - - Od'dalis - - Si'ley - - Sim'sker - - Tal'vos - - Ti'ril - - Vir'lker - - Vir'muel - - Vix'vol - - Von'draz - - Vu'lta'voss - - Xixa'ba - - Yarr'wat - - Zay'zz diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/chitinid.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/chitinid.yml deleted file mode 100644 index a8644a4e079..00000000000 --- a/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/chitinid.yml +++ /dev/null @@ -1,458 +0,0 @@ -# Antennas -- type: marking - id: ChitinidAntennasDefault - bodyPart: HeadTop - markingCategory: HeadTop - speciesRestriction: [Chitinid] - sprites: - - sprite: DeltaV/Mobs/Customization/Chitinid/chitinid_antennas.rsi - state: default - -- type: marking - id: ChitinidAntennasCurly - bodyPart: HeadTop - markingCategory: HeadTop - speciesRestriction: [Chitinid] - sprites: - - sprite: DeltaV/Mobs/Customization/Chitinid/chitinid_antennas.rsi - state: curly - -- type: marking - id: ChitinidAntennasGray - bodyPart: HeadTop - markingCategory: HeadTop - speciesRestriction: [Chitinid] - sprites: - - sprite: DeltaV/Mobs/Customization/Chitinid/chitinid_antennas.rsi - state: gray - -- type: marking - id: ChitinidAntennasSlick - bodyPart: HeadTop - markingCategory: HeadTop - speciesRestriction: [Chitinid] - sprites: - - sprite: DeltaV/Mobs/Customization/Chitinid/chitinid_antennas.rsi - state: slick - -- type: marking - id: ChitinidAntennasLong - bodyPart: HeadTop - markingCategory: HeadTop - speciesRestriction: [Chitinid] - sprites: - - sprite: DeltaV/Mobs/Customization/Chitinid/chitinid_antennas.rsi - state: long - -- type: marking - id: ChitinidAntennasBee - bodyPart: HeadTop - markingCategory: HeadTop - speciesRestriction: [Chitinid] - sprites: - - sprite: DeltaV/Mobs/Customization/Chitinid/chitinid_antennas.rsi - state: bee - -- type: marking - id: ChitinidAntennasShort - bodyPart: HeadTop - markingCategory: HeadTop - speciesRestriction: [Chitinid] - sprites: - - sprite: DeltaV/Mobs/Customization/Chitinid/chitinid_antennas.rsi - state: short - -- type: marking - id: ChitinidAntennasFirefly - bodyPart: HeadTop - markingCategory: HeadTop - speciesRestriction: [Chitinid] - sprites: - - sprite: DeltaV/Mobs/Customization/Chitinid/chitinid_antennas.rsi - state: firefly_primary - - sprite: DeltaV/Mobs/Customization/Chitinid/chitinid_antennas.rsi - state: firefly_secondary - -- type: marking - id: ChitinidAntennasRadar - bodyPart: HeadTop - markingCategory: HeadTop - speciesRestriction: [Chitinid] - sprites: - - sprite: DeltaV/Mobs/Customization/Chitinid/chitinid_antennas.rsi - state: radar - -- type: marking - id: ChitinidAntennasSpeed - bodyPart: HeadTop - markingCategory: HeadTop - speciesRestriction: [Chitinid] - sprites: - - sprite: DeltaV/Mobs/Customization/Chitinid/chitinid_antennas.rsi - state: speed - - -# Wings -- type: marking - id: ChitinidWingsDefault - bodyPart: Tail - markingCategory: Tail - speciesRestriction: [Chitinid] - sprites: - - sprite: DeltaV/Mobs/Customization/Chitinid/chitinid_wings.rsi - state: default - -- type: marking - id: ChitinidWingsSmooth - bodyPart: Tail - markingCategory: Tail - speciesRestriction: [Chitinid] - sprites: - - sprite: DeltaV/Mobs/Customization/Chitinid/chitinid_wings.rsi - state: smooth - -- type: marking - id: ChitinidWingsHoneypot - bodyPart: Tail - markingCategory: Tail - speciesRestriction: [Chitinid] - sprites: - - sprite: DeltaV/Mobs/Customization/Chitinid/chitinid_wings.rsi - state: honeypot_primary - - sprite: DeltaV/Mobs/Customization/Chitinid/chitinid_wings.rsi - state: honeypot_secondary - -- type: marking - id: ChitinidWingsStubby - bodyPart: Tail - markingCategory: Tail - speciesRestriction: [Chitinid] - sprites: - - sprite: DeltaV/Mobs/Customization/Chitinid/chitinid_wings.rsi - state: stubby - -- type: marking - id: ChitinidWingsBee - bodyPart: Tail - markingCategory: Tail - speciesRestriction: [Chitinid] - sprites: - - sprite: DeltaV/Mobs/Customization/Chitinid/chitinid_wings.rsi - state: bee_primary - - sprite: DeltaV/Mobs/Customization/Chitinid/chitinid_wings.rsi - state: bee_secondary - -- type: marking - id: ChitinidWingsFirefly - bodyPart: Tail - markingCategory: Tail - speciesRestriction: [Chitinid] - sprites: - - sprite: DeltaV/Mobs/Customization/Chitinid/chitinid_wings.rsi - state: firefly_primary - - sprite: DeltaV/Mobs/Customization/Chitinid/chitinid_wings.rsi - state: firefly_secondary - -# Body markings: -# Charred -- type: marking - id: ChitinidChestCharred - bodyPart: Chest - markingCategory: Chest - speciesRestriction: [Chitinid] - sprites: - - sprite: DeltaV/Mobs/Customization/Chitinid/chitinid_parts.rsi - state: charred_chest - -- type: marking - id: ChitinidHeadCharred - bodyPart: Head - markingCategory: Head - speciesRestriction: [Chitinid] - sprites: - - sprite: DeltaV/Mobs/Customization/Chitinid/chitinid_parts.rsi - state: charred_head - -- type: marking - id: ChitinidLLegCharred - bodyPart: LLeg - markingCategory: LeftLeg - speciesRestriction: [Chitinid] - sprites: - - sprite: DeltaV/Mobs/Customization/Chitinid/chitinid_parts.rsi - state: charred_l_leg - -- type: marking - id: ChitinidRLegCharred - bodyPart: RLeg - markingCategory: RightLeg - speciesRestriction: [Chitinid] - sprites: - - sprite: DeltaV/Mobs/Customization/Chitinid/chitinid_parts.rsi - state: charred_r_leg - -- type: marking - id: ChitinidLArmCharred - bodyPart: LArm - markingCategory: LeftArm - speciesRestriction: [Chitinid] - sprites: - - sprite: DeltaV/Mobs/Customization/Chitinid/chitinid_parts.rsi - state: charred_l_arm - -- type: marking - id: ChitinidRArmCharred - bodyPart: RArm - markingCategory: RightArm - speciesRestriction: [Chitinid] - sprites: - - sprite: DeltaV/Mobs/Customization/Chitinid/chitinid_parts.rsi - state: charred_r_arm - -# Plated -- type: marking - id: ChitinidChestPlated - bodyPart: Chest - markingCategory: Chest - speciesRestriction: [Chitinid] - sprites: - - sprite: DeltaV/Mobs/Customization/Chitinid/chitinid_parts.rsi - state: plated_chest - -- type: marking - id: ChitinidLArmPlated - bodyPart: LArm - markingCategory: LeftArm - speciesRestriction: [Chitinid] - sprites: - - sprite: DeltaV/Mobs/Customization/Chitinid/chitinid_parts.rsi - state: plated_l_arm - -- type: marking - id: ChitinidRArmPlated - bodyPart: RArm - markingCategory: RightArm - speciesRestriction: [Chitinid] - sprites: - - sprite: DeltaV/Mobs/Customization/Chitinid/chitinid_parts.rsi - state: plated_r_arm - -# Stripes -- type: marking - id: ChitinidChestStripes - bodyPart: Chest - markingCategory: Chest - speciesRestriction: [Chitinid] - sprites: - - sprite: DeltaV/Mobs/Customization/Chitinid/chitinid_parts.rsi - state: stripes_chest - -- type: marking - id: ChitinidHeadStripes - bodyPart: Head - markingCategory: Head - speciesRestriction: [Chitinid] - sprites: - - sprite: DeltaV/Mobs/Customization/Chitinid/chitinid_parts.rsi - state: stripes_head - -- type: marking - id: ChitinidLLegStripes - bodyPart: LLeg - markingCategory: LeftLeg - speciesRestriction: [Chitinid] - sprites: - - sprite: DeltaV/Mobs/Customization/Chitinid/chitinid_parts.rsi - state: stripes_l_leg - -- type: marking - id: ChitinidRLegStripes - bodyPart: RLeg - markingCategory: RightLeg - speciesRestriction: [Chitinid] - sprites: - - sprite: DeltaV/Mobs/Customization/Chitinid/chitinid_parts.rsi - state: stripes_r_leg - -- type: marking - id: ChitinidLArmStripes - bodyPart: LArm - markingCategory: LeftArm - speciesRestriction: [Chitinid] - sprites: - - sprite: DeltaV/Mobs/Customization/Chitinid/chitinid_parts.rsi - state: stripes_l_arm - -- type: marking - id: ChitinidRArmStripes - bodyPart: RArm - markingCategory: RightArm - speciesRestriction: [Chitinid] - sprites: - - sprite: DeltaV/Mobs/Customization/Chitinid/chitinid_parts.rsi - state: stripes_r_arm - -# Radiant -- type: marking - id: ChitinidChestRadiant - bodyPart: Chest - markingCategory: Chest - speciesRestriction: [Chitinid] - sprites: - - sprite: DeltaV/Mobs/Customization/Chitinid/chitinid_parts.rsi - state: radiant_chest - -- type: marking - id: ChitinidHeadRadiant - bodyPart: Head - markingCategory: Head - speciesRestriction: [Chitinid] - sprites: - - sprite: DeltaV/Mobs/Customization/Chitinid/chitinid_parts.rsi - state: radiant_head - -- type: marking - id: ChitinidLLegRadiant - bodyPart: LLeg - markingCategory: LeftLeg - speciesRestriction: [Chitinid] - sprites: - - sprite: DeltaV/Mobs/Customization/Chitinid/chitinid_parts.rsi - state: radiant_l_leg - -- type: marking - id: ChitinidRLegRadiant - bodyPart: RLeg - markingCategory: RightLeg - speciesRestriction: [Chitinid] - sprites: - - sprite: DeltaV/Mobs/Customization/Chitinid/chitinid_parts.rsi - state: radiant_r_leg - -- type: marking - id: ChitinidLArmRadiant - bodyPart: LArm - markingCategory: LeftArm - speciesRestriction: [Chitinid] - sprites: - - sprite: DeltaV/Mobs/Customization/Chitinid/chitinid_parts.rsi - state: radiant_l_arm - -- type: marking - id: ChitinidRArmRadiant - bodyPart: RArm - markingCategory: RightArm - speciesRestriction: [Chitinid] - sprites: - - sprite: DeltaV/Mobs/Customization/Chitinid/chitinid_parts.rsi - state: radiant_r_arm - -# Toxic -- type: marking - id: ChitinidChestToxic - bodyPart: Chest - markingCategory: Chest - speciesRestriction: [Chitinid] - sprites: - - sprite: DeltaV/Mobs/Customization/Chitinid/chitinid_parts.rsi - state: toxic_chest - -- type: marking - id: ChitinidHeadToxic - bodyPart: Head - markingCategory: Head - speciesRestriction: [Chitinid] - sprites: - - sprite: DeltaV/Mobs/Customization/Chitinid/chitinid_parts.rsi - state: toxic_head - -- type: marking - id: ChitinidLLegToxic - bodyPart: LLeg - markingCategory: LeftLeg - speciesRestriction: [Chitinid] - sprites: - - sprite: DeltaV/Mobs/Customization/Chitinid/chitinid_parts.rsi - state: toxic_l_leg - -- type: marking - id: ChitinidRLegToxic - bodyPart: RLeg - markingCategory: RightLeg - speciesRestriction: [Chitinid] - sprites: - - sprite: DeltaV/Mobs/Customization/Chitinid/chitinid_parts.rsi - state: toxic_r_leg - -- type: marking - id: ChitinidLArmToxic - bodyPart: LArm - markingCategory: LeftArm - speciesRestriction: [Chitinid] - sprites: - - sprite: DeltaV/Mobs/Customization/Chitinid/chitinid_parts.rsi - state: toxic_l_arm - -- type: marking - id: ChitinidRArmToxic - bodyPart: RArm - markingCategory: RightArm - speciesRestriction: [Chitinid] - sprites: - - sprite: DeltaV/Mobs/Customization/Chitinid/chitinid_parts.rsi - state: toxic_r_arm - -# Spotted -- type: marking - id: ChitinidChestSpotted - bodyPart: Chest - markingCategory: Chest - speciesRestriction: [Chitinid] - sprites: - - sprite: DeltaV/Mobs/Customization/Chitinid/chitinid_parts.rsi - state: spotted_chest - -- type: marking - id: ChitinidHeadSpotted - bodyPart: Head - markingCategory: Head - speciesRestriction: [Chitinid] - sprites: - - sprite: DeltaV/Mobs/Customization/Chitinid/chitinid_parts.rsi - state: spotted_head - -- type: marking - id: ChitinidLLegSpotted - bodyPart: LLeg - markingCategory: LeftLeg - speciesRestriction: [Chitinid] - sprites: - - sprite: DeltaV/Mobs/Customization/Chitinid/chitinid_parts.rsi - state: spotted_l_leg - -- type: marking - id: ChitinidRLegSpotted - bodyPart: RLeg - markingCategory: RightLeg - speciesRestriction: [Chitinid] - sprites: - - sprite: DeltaV/Mobs/Customization/Chitinid/chitinid_parts.rsi - state: spotted_r_leg - -- type: marking - id: ChitinidLArmSpotted - bodyPart: LArm - markingCategory: LeftArm - speciesRestriction: [Chitinid] - sprites: - - sprite: DeltaV/Mobs/Customization/Chitinid/chitinid_parts.rsi - state: spotted_l_arm - -- type: marking - id: ChitinidRArmSpotted - bodyPart: RArm - markingCategory: RightArm - speciesRestriction: [Chitinid] - sprites: - - sprite: DeltaV/Mobs/Customization/Chitinid/chitinid_parts.rsi - state: spotted_r_arm 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 65af873fe6e..00000000000 --- 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 432b2ee8416..00000000000 --- 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/Customization/Markings/thaven.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/thaven.yml deleted file mode 100644 index 4a55ff585e9..00000000000 --- a/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/thaven.yml +++ /dev/null @@ -1,46 +0,0 @@ -# Head -- type: marking - id: ThavenCheekBarbels - bodyPart: HeadTop - markingCategory: HeadTop - speciesRestriction: [Thaven] - sprites: - - sprite: _DV/Mobs/Customization/thaven.rsi - state: cheek_barbels - -- type: marking - id: ThavenEyebrowBarbels - bodyPart: HeadTop - markingCategory: HeadTop - speciesRestriction: [Thaven] - sprites: - - sprite: _DV/Mobs/Customization/thaven.rsi - state: eyebrow_barbels - -- type: marking - id: ThavenUnderbellyFace - bodyPart: HeadTop - markingCategory: HeadTop - speciesRestriction: [Thaven] - sprites: - - sprite: _DV/Mobs/Customization/thaven.rsi - state: underbelly_face - -# Torso -- type: marking - id: ThavenUnderbellyTorso - bodyPart: Chest - markingCategory: Chest - speciesRestriction: [Thaven] - sprites: - - sprite: _DV/Mobs/Customization/thaven.rsi - state: underbelly_torso - -- type: marking - id: ThavenCarpSpots - bodyPart: Chest - markingCategory: Chest - speciesRestriction: [Thaven] - sprites: - - sprite: _DV/Mobs/Customization/thaven.rsi - state: carp_spots diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Player/chitinid.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Player/chitinid.yml deleted file mode 100644 index 4c8a7847315..00000000000 --- a/Resources/Prototypes/DeltaV/Entities/Mobs/Player/chitinid.yml +++ /dev/null @@ -1,5 +0,0 @@ -- type: entity - save: false - name: Urist McAnt - parent: BaseMobChitinid - id: MobChitinid 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 5913b31dd1f..00000000000 --- a/Resources/Prototypes/DeltaV/Entities/Mobs/Player/lamia.yml +++ /dev/null @@ -1,38 +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 diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/chitinid.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Species/chitinid.yml deleted file mode 100644 index c82a48c2dae..00000000000 --- a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/chitinid.yml +++ /dev/null @@ -1,161 +0,0 @@ -- type: entity - save: false - name: Urist McAnt - parent: BaseMobSpeciesOrganic - id: BaseMobChitinid - abstract: true - components: - - type: HumanoidAppearance - species: Chitinid - hideLayersOnEquip: - - HeadTop - - - type: Hunger - baseDecayRate: 0.0467 #needs to eat more to survive - - type: Thirst - - - type: Carriable - - - type: Icon - sprite: DeltaV/Mobs/Species/Chitinid/parts.rsi - state: full - - - type: Body - prototype: Chitinid - requiredLegs: 2 - - - type: Damageable - damageContainer: Biological - damageModifierSet: Chitinid - - - type: Speech - speechVerb: Chitinid - allowedEmotes: ['Chitter', 'Click', 'Hiss'] - - - type: MeleeWeapon - animation: WeaponArcBite - soundHit: - path: /Audio/Effects/bite.ogg - damage: - types: - Piercing: 5 - - - - type: TypingIndicator - proto: Chitinid - - - type: Butcherable - butcheringType: Spike - spawned: - - id: FoodMeat - amount: 5 - - - type: Bloodstream - bloodReagent: InsectBlood - - - type: DamageVisuals - damageOverlayGroups: - Brute: - sprite: Mobs/Effects/brute_damage.rsi - color: "#808A51" - Burn: - sprite: Mobs/Effects/burn_damage.rsi - - - type: Vocal - sounds: - Male: UnisexChitinid - Female: UnisexChitinid - Unsexed: UnisexChitinid - - - type: Fixtures - fixtures: # TODO: This needs a second fixture just for mob collisions. - fix1: - shape: - !type:PhysShapeCircle - radius: 0.42 - density: 220 - restitution: 0.0 - mask: - - MobMask - layer: - - MobLayer - - - type: Temperature # Ants hate the cold - heatDamageThreshold: 320 - coldDamageThreshold: 230 - currentTemperature: 310.15 - specificHeat: 46 - coldDamage: - types: - Cold : 1.25 #per second, scales with temperature & other constants - heatDamage: - types: - Heat : 1.0 #per second, scales with temperature & other constants - - type: TemperatureSpeed - thresholds: - 289: 0.6 - 275: 0.4 - 250: 0.3 - - - type: Sprite # sprite again because we want different layer ordering - noRot: true - drawdepth: Mobs - layers: - - map: [ "enum.HumanoidVisualLayers.Chest" ] - - map: [ "enum.HumanoidVisualLayers.Head" ] - - map: [ "enum.HumanoidVisualLayers.Snout" ] - - map: [ "enum.HumanoidVisualLayers.Eyes" ] - - map: [ "enum.HumanoidVisualLayers.RArm" ] - - map: [ "enum.HumanoidVisualLayers.LArm" ] - - map: [ "enum.HumanoidVisualLayers.RLeg" ] - - map: [ "enum.HumanoidVisualLayers.LLeg" ] - - map: [ "jumpsuit" ] - - map: [ "enum.HumanoidVisualLayers.LHand" ] - - map: [ "enum.HumanoidVisualLayers.RHand" ] - - map: [ "enum.HumanoidVisualLayers.LFoot" ] - - map: [ "enum.HumanoidVisualLayers.RFoot" ] - - map: [ "enum.HumanoidVisualLayers.Handcuffs" ] - color: "#ffffff" - sprite: Objects/Misc/handcuffs.rsi - state: body-overlay-2 - visible: false - - map: [ "gloves" ] - - map: [ "shoes" ] - - map: [ "ears" ] - - map: [ "outerClothing" ] - - map: [ "eyes" ] - - map: [ "belt" ] - - map: [ "id" ] - - map: [ "back" ] - - map: [ "neck" ] - - map: [ "enum.HumanoidVisualLayers.Tail" ] #in the utopian future we should probably have a wings enum inserted here so everyhting doesn't break - - map: [ "enum.HumanoidVisualLayers.FacialHair" ] - - map: [ "enum.HumanoidVisualLayers.Hair" ] - - map: [ "enum.HumanoidVisualLayers.HeadSide" ] - - map: [ "enum.HumanoidVisualLayers.HeadTop" ] - - map: [ "mask" ] - - map: [ "head" ] - - map: [ "pocket1" ] - - map: [ "pocket2" ] - - map: [ "clownedon" ] # Dynamically generated - sprite: "Effects/creampie.rsi" - state: "creampie_moth" - visible: false - - type: Chitinid - - type: BlockInjection - blockReason: chitinid - - type: LanguageKnowledge - speaks: - - TauCetiBasic - - Chittin - understands: - - TauCetiBasic - - Chittin - -- type: entity - parent: BaseSpeciesDummy - id: MobChitinidDummy - categories: [ HideSpawnMenu ] - components: - - type: HumanoidAppearance - species: Chitinid 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 824171e99aa..00000000000 --- a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/lamia.yml +++ /dev/null @@ -1,300 +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 - - type: Sprite - netsync: false - noRot: true - drawdepth: Mobs - scale: 1, 1 - offset: 0, 0.4 - layers: #TODO: manually fix these layers - - map: [ "enum.HumanoidVisualLayers.Chest" ] - color: "#e8b59b" - sprite: Nyanotrasen/Mobs/Species/lamia.rsi - state: torso_m - - map: [ "enum.HumanoidVisualLayers.Head" ] - color: "#e8b59b" - sprite: Mobs/Species/Human/parts.rsi - state: head_m - - map: [ "enum.HumanoidVisualLayers.Eyes" ] - color: "#008800" - sprite: Mobs/Customization/eyes.rsi - state: eyes - - map: [ "enum.HumanoidVisualLayers.Face" ] - - 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: [ "innerBelt" ] - - map: [ "innerNeck" ] - - map: [ "outerClothing" ] - - map: [ "eyes" ] - - map: [ "belt" ] - - map: [ "belt2" ] - - map: [ "neck" ] - - map: [ "back" ] - - map: [ "enum.HumanoidVisualLayers.FacialHair" ] - - map: [ "enum.HumanoidVisualLayers.Hair" ] - - map: [ "enum.HumanoidVisualLayers.HeadSide" ] - - map: [ "enum.HumanoidVisualLayers.HeadTop" ] - - map: [ "mask" ] - - map: [ "head" ] - - map: [ "pocket1" ] - - map: [ "pocket2" ] - - map: [ "clownedon" ] # Dynamically generated - sprite: "Effects/creampie.rsi" - state: "creampie_human" - visible: false - - 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: 2 - Poison: 3 - - type: SolutionContainerManager - solutions: - melee: - maxVol: 30 - - type: SolutionRegeneration - solution: melee - generated: - reagents: - - ReagentId: SpaceDrugs - Quantity: 1 - - type: MeleeChemicalInjector - solution: melee - transferAmount: 3 #amount to inject is not final - - type: Pullable - - type: DoAfter - - type: CreamPied - - type: Stripping - - type: Strippable - - type: Puller - - type: Fixtures - fixtures: # TODO: This needs a second fixture just for mob collisions. - fix1: - shape: - !type:PhysShapeCircle - radius: 0.35 - density: 1000 #Density is not final, adjust accordingly if the number of tail segments is reduced or increased - restitution: 0.0 - mask: - - MobMask - layer: - - MobLayer - - type: SegmentedEntity - numberOfSegments: 18 - texturePath: /Textures/Nyanotrasen/Mobs/Species/lamia.rsi/segment.png - - type: Speech - speechSounds: Alto - - type: Vocal - - type: Emoting - - type: Grammar - attributes: - proper: true - - type: StandingState - - type: Fingerprint - - type: Perishable - - type: Bloodstream - bloodMaxVolume: 60000 - bloodlossDamage: - types: - Bloodloss: 1 - bloodlossHealDamage: - types: - Bloodloss: -1 - - type: PortalExempt - - type: FootPrints - leftBarePrint: "dragging-1" - rightBarePrint: "dragging-1" - shoesPrint: "dragging-1" - suitPrint: "dragging-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.Face" ] - - 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: [ "innerBelt" ] - - map: [ "innerNeck" ] - - map: [ "outerClothing" ] - - map: [ "eyes" ] - - map: [ "belt" ] - - map: [ "neck" ] - - map: [ "back" ] - - map: [ "enum.HumanoidVisualLayers.FacialHair" ] - - map: [ "enum.HumanoidVisualLayers.Hair" ] - - map: [ "enum.HumanoidVisualLayers.HeadSide" ] - - map: [ "enum.HumanoidVisualLayers.HeadTop" ] - - map: [ "mask" ] - - map: [ "head" ] - - map: [ "pocket1" ] - - map: [ "pocket2" ] - - map: [ "enum.HumanoidVisualLayers.Tail" ] - - type: Inventory - templateId: lamia diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/implanters.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/implanters.yml deleted file mode 100644 index 9849642f939..00000000000 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/implanters.yml +++ /dev/null @@ -1,7 +0,0 @@ -- type: entity - id: BionicSyrinxImplanter - name: bionic syrinx implanter - parent: BaseImplantOnlyImplanterSyndi - components: - - type: Implanter - implant: BionicSyrinxImplant diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/subdermal_implants.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/subdermal_implants.yml deleted file mode 100644 index 7dea5b47fe2..00000000000 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/subdermal_implants.yml +++ /dev/null @@ -1,21 +0,0 @@ -- type: entity - parent: BaseSubdermalImplant - id: BionicSyrinxImplant - name: bionic syrinx implant - description: This implant lets a harpy adjust their voice to whoever they can think of. - categories: [ HideSpawnMenu ] - components: - - type: SubdermalImplant - implantAction: ActionSyrinxChangeVoiceMask - whitelist: - components: - - Flight # If someone else has the flight component, or you can obtain it in some way, this needs to be changed. To be a harpy only thing. - - type: VoiceMask - - type: UserInterface - interfaces: - enum.VoiceMaskUIKey.Key: - type: VoiceMaskBoundUserInterface - - type: Tag - tags: - - SubdermalImplant - - BionicSyrinxImplant diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Species/chitinid.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Species/chitinid.yml deleted file mode 100644 index 1e66d4295c0..00000000000 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Species/chitinid.yml +++ /dev/null @@ -1,33 +0,0 @@ -- type: entity - parent: BaseItem - id: Chitzite - name: chitzite - description: A small radioactive stone formed in the chest cavity of a radioactive chitinid, gross.... but kinda pretty? - components: - - type: Sprite - sprite: DeltaV/Objects/Specific/Species/chitinid.rsi - layers: - - state: chitzite - - state: chitzite_glow - - type: RadiationSource - intensity: 0.5 - - type: Extractable - grindableSolutionName: chitzite - - type: SolutionContainerManager - solutions: - chitzite: - maxVol: 5 - reagents: - - ReagentId: Uranium - Quantity: 2.5 - - ReagentId: Radium - Quantity: 2.5 - - type: MeleeWeapon - damage: - types: - Blunt: 3 - Radiation: 3 - - type: Tag - tags: - - Recyclable - - Trash 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 1ca5f5a6824..00000000000 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Species/lamia.yml +++ /dev/null @@ -1,49 +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 - categories: [ HideSpawnMenu ] - components: - - type: Damageable - - type: StandingState - - type: Clickable - - type: InteractionOutline - - type: PsionicInsulation #Not a brain, target the lamia instead - - type: Physics - bodyType: KinematicController - - type: Fixtures - fixtures: # TODO: This needs a second fixture just for mob collisions. - fix1: - shape: - !type:PhysShapeCircle - radius: 0.25 - density: 80 - restitution: 0.0 - mask: - - MobMask - layer: - - MobLayer - - type: Transform - anchored: false - - type: Tag - tags: - - HideContextMenu - - type: RequireProjectileTarget - active: True - -- type: entity - id: LamiaSegment - save: false - parent: LamiaInitialSegment - name: lamia segment - categories: [ HideSpawnMenu ] - description: A tail segment, hopefully attached to a lamia. - components: - - type: Sprite - - type: Tag - tags: - - HideContextMenu - - DoorBumpOpener diff --git a/Resources/Prototypes/DeltaV/InventoryTemplates/lamia_inventory_template.yml b/Resources/Prototypes/DeltaV/InventoryTemplates/lamia_inventory_template.yml deleted file mode 100644 index 546d0746b7a..00000000000 --- 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/chitinid.yml b/Resources/Prototypes/DeltaV/Species/chitinid.yml deleted file mode 100644 index 7a8f330bb69..00000000000 --- a/Resources/Prototypes/DeltaV/Species/chitinid.yml +++ /dev/null @@ -1,167 +0,0 @@ -- type: species # Chitinids have had their visuals moved to be a set of moth markings so less is lost in the process of disabling them. - id: Chitinid - name: species-name-chitinid - roundStart: false # THESE ARE CURRENTLY A SERVER PERFORMANCE DISASTER. IF YOU ENABLE THEM AND THEN COMPLAIN ABOUT SERVER PERFORMANCE, I WILL BAN YOU FROM THE DISCORD. - prototype: MobChitinid - sprites: MobChitinidSprites - defaultSkinTone: "#ffda93" - markingLimits: MobChitinidMarkingLimits - dollPrototype: MobChitinidDummy - skinColoration: Hues - maleFirstNames: NamesChitinidFirstMale - femaleFirstNames: NamesChitinidFirstFemale - naming: First - -- type: speciesBaseSprites - id: MobChitinidSprites - sprites: - Head: MobChitinidHead - Snout: MobHumanoidAnyMarking - Chest: MobChitinidTorso - Underwear: MobHumanoidAnyMarking - Undershirt: MobHumanoidAnyMarking - HeadTop: MobHumanoidAnyMarking - HeadSide: MobHumanoidAnyMarking - Tail: MobHumanoidAnyMarking - Eyes: MobChitinidEyes - LArm: MobChitinidLArm - RArm: MobChitinidRArm - LHand: MobChitinidLHand - RHand: MobChitinidRHand - LLeg: MobChitinidLLeg - RLeg: MobChitinidRLeg - LFoot: MobChitinidLFoot - RFoot: MobChitinidRFoot - -- type: humanoidBaseSprite - id: MobChitinidEyes - baseSprite: - sprite: DeltaV/Mobs/Species/Chitinid/parts.rsi - state: eyes - -- type: markingPoints - id: MobChitinidMarkingLimits - onlyWhitelisted: true - points: - Hair: - points: 0 - required: false - FacialHair: - points: 0 - required: false - Tail: - points: 1 - required: true - defaultMarkings: [ ChitinidWingsDefault ] - Snout: - points: 1 - required: false - HeadTop: - points: 6 - required: true - defaultMarkings: [ ChitinidAntennasDefault ] - HeadSide: - points: 6 - required: false - Head: - points: 6 - required: false - Chest: - points: 6 - required: false - LeftLeg: - points: 6 - required: false - RightLeg: - points: 6 - required: false - LeftArm: - points: 6 - required: false - RightArm: - points: 6 - required: false - -- type: humanoidBaseSprite - id: MobChitinidHead - baseSprite: - sprite: DeltaV/Mobs/Species/Chitinid/parts.rsi - state: head_m - -- type: humanoidBaseSprite - id: MobChitinidHeadMale - baseSprite: - sprite: DeltaV/Mobs/Species/Chitinid/parts.rsi - state: head_m - -- type: humanoidBaseSprite - id: MobChitinidHeadFemale - baseSprite: - sprite: DeltaV/Mobs/Species/Chitinid/parts.rsi - state: head_f - -- type: humanoidBaseSprite - id: MobChitinidTorso - baseSprite: - sprite: DeltaV/Mobs/Species/Chitinid/parts.rsi - state: torso_m - -- type: humanoidBaseSprite - id: MobChitinidTorsoMale - baseSprite: - sprite: DeltaV/Mobs/Species/Chitinid/parts.rsi - state: torso_m - -- type: humanoidBaseSprite - id: MobChitinidTorsoFemale - baseSprite: - sprite: DeltaV/Mobs/Species/Chitinid/parts.rsi - state: torso_f - -- type: humanoidBaseSprite - id: MobChitinidLLeg - baseSprite: - sprite: DeltaV/Mobs/Species/Chitinid/parts.rsi - state: l_leg - -- type: humanoidBaseSprite - id: MobChitinidLHand - baseSprite: - sprite: DeltaV/Mobs/Species/Chitinid/parts.rsi - state: l_hand - -- type: humanoidBaseSprite - id: MobChitinidLArm - baseSprite: - sprite: DeltaV/Mobs/Species/Chitinid/parts.rsi - state: l_arm - -- type: humanoidBaseSprite - id: MobChitinidLFoot - baseSprite: - sprite: DeltaV/Mobs/Species/Chitinid/parts.rsi - state: l_foot - -- type: humanoidBaseSprite - id: MobChitinidRLeg - baseSprite: - sprite: DeltaV/Mobs/Species/Chitinid/parts.rsi - state: r_leg - -- type: humanoidBaseSprite - id: MobChitinidRHand - baseSprite: - sprite: DeltaV/Mobs/Species/Chitinid/parts.rsi - state: r_hand - -- type: humanoidBaseSprite - id: MobChitinidRArm - baseSprite: - sprite: DeltaV/Mobs/Species/Chitinid/parts.rsi - state: r_arm - -- type: humanoidBaseSprite - id: MobChitinidRFoot - baseSprite: - sprite: DeltaV/Mobs/Species/Chitinid/parts.rsi - state: r_foot diff --git a/Resources/Prototypes/DeltaV/Species/lamia.yml b/Resources/Prototypes/DeltaV/Species/lamia.yml deleted file mode 100644 index 0c2f48666a4..00000000000 --- a/Resources/Prototypes/DeltaV/Species/lamia.yml +++ /dev/null @@ -1,70 +0,0 @@ -- type: species - id: Lamia - name: Lamia - roundStart: false - prototype: MobLamia - dollPrototype: MobLamiaDummy - sprites: MobLamiaSprites - defaultSkinTone: "#c0967f" - markingLimits: MobLamiaMarkingLimits - skinColoration: HumanToned - maleFirstNames: names_cyno_male - femaleFirstNames: names_cyno_female - lastNames: names_cyno_last - -- type: markingPoints - id: MobLamiaMarkingLimits - points: - Hair: - points: 1 - required: false - FacialHair: - points: 1 - required: false - Snout: - points: 1 - required: false - HeadTop: - points: 2 - required: false - HeadSide: - points: 3 - required: false - Tail: - points: 1 - required: true - defaultMarkings: [ LamiaBottom ] - Chest: - points: 1 - required: false - RightArm: - points: 2 - required: false - RightHand: - points: 3 - required: false - LeftArm: - points: 2 - required: false - LeftHand: - points: 3 - required: false - - -- type: speciesBaseSprites - id: MobLamiaSprites - sprites: - Head: MobHumanHead - Face: MobHumanoidAnyMarking - HeadTop: MobHumanoidAnyMarking - HeadSide: MobHumanoidAnyMarking - Hair: MobHumanoidAnyMarking - FacialHair: MobHumanoidAnyMarking - Snout: MobHumanoidAnyMarking - Chest: MobHumanTorso - Eyes: MobHumanoidEyes - LArm: MobHumanLArm - RArm: MobHumanRArm - LHand: MobHumanLHand - RHand: MobHumanRHand - Tail: MobHumanoidAnyMarking diff --git a/Resources/Prototypes/DeltaV/Traits/altvision.yml b/Resources/Prototypes/DeltaV/Traits/altvision.yml deleted file mode 100644 index 36e738acdc9..00000000000 --- a/Resources/Prototypes/DeltaV/Traits/altvision.yml +++ /dev/null @@ -1,37 +0,0 @@ -- type: trait - id: UltraVision - category: Visual - requirements: - - !type:CharacterSpeciesRequirement - inverted: true - species: - - Vulpkanin - - Harpy - - Voidborn - - !type:CharacterTraitRequirement - inverted: true - traits: - - DogVision - functions: - - !type:TraitAddComponent - components: - - type: UltraVision - -- type: trait - id: DogVision - category: Visual - requirements: - - !type:CharacterSpeciesRequirement - inverted: true - species: - - Vulpkanin - - Harpy - - Voidborn - - !type:CharacterTraitRequirement - inverted: true - traits: - - UltraVision - functions: - - !type:TraitAddComponent - components: - - type: DogVision diff --git a/Resources/Prototypes/DeltaV/Voice/speech_emote_sounds.yml b/Resources/Prototypes/DeltaV/Voice/speech_emote_sounds.yml index 38a270fb2db..5dded524869 100644 --- a/Resources/Prototypes/DeltaV/Voice/speech_emote_sounds.yml +++ b/Resources/Prototypes/DeltaV/Voice/speech_emote_sounds.yml @@ -1,87 +1,3 @@ -# species -- type: emoteSounds - id: SoundsHarpy - params: - variation: 0.125 - sounds: - Scream: - collection: HarpyScreams - Yawn: - collection: MaleYawn - Laugh: - collection: HarpyLaugh - Sneeze: - collection: MaleSneezes - Cough: - collection: MaleCoughs - Sigh: - collection: MaleSigh - Crying: - collection: HarpyCry - Whistle: - collection: Whistles - Hiss: - collection: HarpyHisses - Meow: - collection: HarpyMeows - Mew: - collection: HarpyMews - Growl: - collection: HarpyGrowls - Purr: - collection: HarpyPurrs - HarpyRing: - collection: HarpyRings - Honk: - collection: HarpyHonks - HarpyPew: - collection: HarpyPews - HarpyBang: - collection: HarpyBangs - Beep: - collection: HarpyBeeps - Boop: - path: /Audio/Voice/IPC/beep_500.ogg - HarpyRev: - collection: HarpyRevs - Chime: - path: /Audio/Machines/chime.ogg - Buzz: - path: /Audio/Machines/buzz-sigh.ogg - Buzz-Two: - path: /Audio/Machines/buzz-two.ogg - Ping: - path: /Audio/Effects/Cargo/ping.ogg - Whirr: - collection: IPCWhirrs - Click: - collection: HarpyClicks - Chitter: - collection: HarpyChitter - Squeak: - collection: HarpySqueak - HarpyCaw: - collection: HarpyCaws - HarpyHoot: - collection: HarpyHoots - Chirp: - collection: HarpyChirps - Snarl: - collection: VulpkaninSnarls - Bark: - collection: VulpkaninBarks - Whine: - collection: VulpkaninWhines - Howl: - collection: VulpkaninHowls - Awoo: - collection: VulpkaninHowls - Weh: - collection: Weh - Mars: - collection: Mars - Wurble: - collection: Wurble - type: emoteSounds id: MaleVulpkanin @@ -180,31 +96,3 @@ collection: VulpkaninHowls Awoo: collection: VulpkaninHowls - -- type: emoteSounds - id: UnisexChitinid - params: - variation: 0.125 - sounds: - Buzz: - path: /Audio/DeltaV/Voice/Chitinid/moth_scream.ogg - Scream: - path: /Audio/Voice/Arachnid/arachnid_scream.ogg - Laugh: - path: /Audio/DeltaV/Voice/Chitinid/moth_laugh.ogg - Chitter: - path: /Audio/Voice/Arachnid/arachnid_chitter.ogg - Click: - path: /Audio/Voice/Arachnid/arachnid_click.ogg - Crying: - collection: FemaleCry - Weh: - collection: Weh - Sneeze: - collection: MaleSneezes - Cough: - collection: MaleCoughs - Yawn: - collection: MaleYawn - Hiss: - path: /Audio/Animals/snake_hiss.ogg diff --git a/Resources/Prototypes/DeltaV/Voice/speech_emotes.yml b/Resources/Prototypes/DeltaV/Voice/speech_emotes.yml index 67d632b385b..f8a2e1a3d6d 100644 --- a/Resources/Prototypes/DeltaV/Voice/speech_emotes.yml +++ b/Resources/Prototypes/DeltaV/Voice/speech_emotes.yml @@ -1,93 +1,3 @@ -- type: emote - id: HarpyRing - name: chat-emote-name-harpyring - category: Vocal - icon: Interface/Emotes/ring.png - whitelist: - tags: - - HarpyEmotes - blacklist: - components: - - BorgChassis - chatMessages: [ rings ] - chatTriggers: - - rings - -- type: emote - id: HarpyPew - name: chat-emote-name-harpypew - category: Vocal - icon: Interface/Emotes/pew.png - whitelist: - tags: - - HarpyEmotes - blacklist: - components: - - BorgChassis - chatMessages: [ pews ] - chatTriggers: - - pews - - pewpews - -- type: emote - id: HarpyBang - name: chat-emote-name-harpybang - category: Vocal - icon: Interface/Emotes/bang.png - whitelist: - tags: - - HarpyEmotes - blacklist: - components: - - BorgChassis - chatMessages: [ bangs ] - chatTriggers: - - bangs - -- type: emote - id: HarpyRev - name: chat-emote-name-harpyrev - icon: Interface/Emotes/rev.png - whitelist: - tags: - - HarpyEmotes - blacklist: - components: - - BorgChassis - category: Vocal - chatMessages: [ revs ] - chatTriggers: - - revs - -- type: emote - id: HarpyCaw - name: chat-emote-name-harpycaw - category: Vocal - icon: Interface/Emotes/caw.png - whitelist: - tags: - - HarpyEmotes - blacklist: - components: - - BorgChassis - chatMessages: [ caws ] - chatTriggers: - - caws - -- type: emote - id: HarpyHoot - name: chat-emote-name-harpyhoot - category: Vocal - icon: Interface/Emotes/caw.png - whitelist: - tags: - - HarpyEmotes - blacklist: - components: - - BorgChassis - chatMessages: [ hoots ] - chatTriggers: - - hoots #Vulpkanin - type: emote diff --git a/Resources/Prototypes/DeltaV/Voice/speech_sounds.yml b/Resources/Prototypes/DeltaV/Voice/speech_sounds.yml index 0d6a3b7e0ea..c1b56dd28b7 100644 --- a/Resources/Prototypes/DeltaV/Voice/speech_sounds.yml +++ b/Resources/Prototypes/DeltaV/Voice/speech_sounds.yml @@ -6,21 +6,3 @@ path: /Audio/DeltaV/Voice/Talk/vulp_ask.ogg exclaimSound: path: /Audio/DeltaV/Voice/Talk/vulp_exclaim.ogg - -- type: speechSounds - id: Harpy - saySound: - path: /Audio/DeltaV/Voice/Harpy/chirp1.ogg - askSound: - path: /Audio/DeltaV/Voice/Harpy/chirp1.ogg - exclaimSound: - path: /Audio/DeltaV/Voice/Harpy/chirp1.ogg - -- type: speechSounds - id: Chitinid - saySound: - path: /Audio/Voice/Talk/speak_1.ogg - askSound: - path: /Audio/Voice/Talk/speak_1_ask.ogg - exclaimSound: - path: /Audio/Voice/Talk/speak_1_exclaim.ogg \ No newline at end of file diff --git a/Resources/Prototypes/DeltaV/Voice/speech_verbs.yml b/Resources/Prototypes/DeltaV/Voice/speech_verbs.yml index 61750216b63..3317f3261c4 100644 --- a/Resources/Prototypes/DeltaV/Voice/speech_verbs.yml +++ b/Resources/Prototypes/DeltaV/Voice/speech_verbs.yml @@ -15,21 +15,3 @@ - chat-speech-verb-felinid-2 - chat-speech-verb-felinid-3 - chat-speech-verb-felinid-4 - -- type: speechVerb - id: Harpy - name: chat-speech-verb-name-harpy - speechVerbStrings: - - chat-speech-verb-harpy-1 - - chat-speech-verb-harpy-2 - - chat-speech-verb-harpy-3 - - chat-speech-verb-harpy-4 - -- type: speechVerb - id: Chitinid - name: chat-speech-verb-name-chitinid - speechVerbStrings: - - chat-speech-verb-chitinid-1 - - chat-speech-verb-chitinid-2 - - chat-speech-verb-chitinid-3 - - chat-speech-verb-chitinid-4 \ No newline at end of file diff --git a/Resources/Prototypes/DeltaV/typing_indicator.yml b/Resources/Prototypes/DeltaV/typing_indicator.yml index e867d1e073a..42cf895bd61 100644 --- a/Resources/Prototypes/DeltaV/typing_indicator.yml +++ b/Resources/Prototypes/DeltaV/typing_indicator.yml @@ -9,15 +9,3 @@ spritePath: /Textures/DeltaV/Effects/speech.rsi typingState: rodentia0 offset: 0, 0.2 # 0625 - -- type: typingIndicator - id: Chitinid - spritePath: /Textures/DeltaV/Effects/speech.rsi - typingState: chitinid0 - offset: -0.2, 0.1 # 0625 - -- type: typingIndicator - id: Thaven - spritePath: /Textures/_EE/Effects/speech.rsi - typingState: thaven0 - offset: 0, 0.1 # 0625 diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/gauze.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/gauze.yml index aa1caadb63c..54cc95347a9 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/gauze.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/gauze.yml @@ -2,7 +2,7 @@ id: GauzeLefteyePatch bodyPart: Eyes markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, Arachne, Lamia, Tajaran, IPC, Thaven] # Delta V - Felinid, Oni, Vulpkanin; Einstein Engines - Tajaran + speciesRestriction: [Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, Arachne, Lamia, Tajaran, IPC] # Delta V - Felinid, Oni, Vulpkanin; Einstein Engines - Tajaran coloring: default: type: @@ -16,7 +16,7 @@ id: GauzeLefteyePad bodyPart: Eyes markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin, Arachne, Lamia, Tajaran, IPC, Thaven] # Delta V - Felinid, Oni, Vulpkanin; Einstein Engines - Tajaran + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin, Arachne, Lamia, Tajaran, IPC] # Delta V - Felinid, Oni, Vulpkanin; Einstein Engines - Tajaran coloring: default: type: @@ -30,7 +30,7 @@ id: GauzeRighteyePatch bodyPart: Eyes markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, Arachne, Lamia, Tajaran, IPC, Thaven] # Delta V - Felinid, Oni, Vulpkanin; Einstein Engines - Tajaran + speciesRestriction: [Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, Arachne, Lamia, Tajaran, IPC] # Delta V - Felinid, Oni, Vulpkanin; Einstein Engines - Tajaran coloring: default: type: @@ -44,7 +44,7 @@ id: GauzeRighteyePad bodyPart: Eyes markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin, Arachne, Lamia, Tajaran, IPC, Thaven] # Delta V - Felinid, Oni, Vulpkanin; Einstein Engines - Tajaran + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin, Arachne, Lamia, Tajaran, IPC] # Delta V - Felinid, Oni, Vulpkanin; Einstein Engines - Tajaran coloring: default: type: @@ -58,7 +58,7 @@ id: GauzeBlindfold bodyPart: Eyes markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Arachnid, Felinid, Oni, Harpy, Vulpkanin, Arachne, Lamia, Tajaran, IPC, Thaven] # Delta V - Felinid, Oni, Harpy, Vulpkanin; Einstein Engines - Tajaran + speciesRestriction: [Dwarf, Human, Arachnid, Felinid, Oni, Harpy, Vulpkanin, Arachne, Lamia, Tajaran, IPC] # Delta V - Felinid, Oni, Harpy, Vulpkanin; Einstein Engines - Tajaran coloring: default: type: @@ -72,7 +72,7 @@ id: GauzeShoulder bodyPart: Chest markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin, Arachne, Lamia, Tajaran, IPC, Thaven] # Delta V - Felinid, Oni, Vulpkanin; Einstein Engines - Tajaran + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin, Arachne, Lamia, Tajaran, IPC] # Delta V - Felinid, Oni, Vulpkanin; Einstein Engines - Tajaran coloring: default: type: @@ -86,7 +86,7 @@ id: GauzeStomach bodyPart: Chest markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin, Arachne, Lamia, Tajaran, IPC, Thaven] # Delta V - Felinid, Oni, Vulpkanin; Einstein Engines - Tajaran + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin, Arachne, Lamia, Tajaran, IPC] # Delta V - Felinid, Oni, Vulpkanin; Einstein Engines - Tajaran coloring: default: type: @@ -100,7 +100,7 @@ id: GauzeUpperArmRight bodyPart: RArm markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin, Arachne, Lamia, Tajaran, IPC, Thaven] # Delta V - Felinid, Oni, Vulpkanin; Einstein Engines - Tajaran + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin, Arachne, Lamia, Tajaran, IPC] # Delta V - Felinid, Oni, Vulpkanin; Einstein Engines - Tajaran coloring: default: type: @@ -114,7 +114,7 @@ id: GauzeLowerArmRight bodyPart: RArm, RHand markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin, Arachne, Lamia, Tajaran, IPC, Thaven] # Delta V - Felinid, Oni, Vulpkanin; Einstein Engines - Tajaran + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin, Arachne, Lamia, Tajaran, IPC] # Delta V - Felinid, Oni, Vulpkanin; Einstein Engines - Tajaran coloring: default: type: @@ -128,7 +128,7 @@ id: GauzeLeftArm bodyPart: LArm, LHand markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin, Tajaran, Thaven] # Delta V - Felinid, Oni, Vulpkanin; Einstein Engines - Tajaran + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin, Tajaran] # Delta V - Felinid, Oni, Vulpkanin; Einstein Engines - Tajaran coloring: default: type: @@ -142,7 +142,7 @@ id: GauzeLowerLegLeft bodyPart: LFoot markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, Tajaran, IPC, Thaven] # Delta V - Felinid, Oni, Vulpkanin; Einstein Engines - Tajaran + speciesRestriction: [Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, Tajaran, IPC] # Delta V - Felinid, Oni, Vulpkanin; Einstein Engines - Tajaran coloring: default: type: @@ -156,7 +156,7 @@ id: GauzeUpperLegLeft bodyPart: LLeg markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin, Tajaran, IPC, Thaven] # Delta V - Felinid, Oni, Vulpkanin; Einstein Engines - Tajaran + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin, Tajaran, IPC] # Delta V - Felinid, Oni, Vulpkanin; Einstein Engines - Tajaran coloring: default: type: @@ -170,7 +170,7 @@ id: GauzeUpperLegRight bodyPart: RLeg markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin, Tajaran, IPC, Thaven] # Delta V - Felinid, Oni, Vulpkanin; Einstein Engines - Tajaran + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin, Tajaran, IPC] # Delta V - Felinid, Oni, Vulpkanin; Einstein Engines - Tajaran coloring: default: type: @@ -184,7 +184,7 @@ id: GauzeLowerLegRight bodyPart: RFoot markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, Tajaran, IPC, Thaven] # Delta V - Felinid, Oni, Vulpkanin; Einstein Engines - Tajaran + speciesRestriction: [Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, Tajaran, IPC] # Delta V - Felinid, Oni, Vulpkanin; Einstein Engines - Tajaran coloring: default: type: @@ -198,7 +198,7 @@ id: GauzeBoxerWrapRight bodyPart: RHand markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin, Arachne, Lamia, Tajaran, IPC, Thaven] # Delta V - Felinid, Oni, Vulpkanin; Einstein Engines - Tajaran + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin, Arachne, Lamia, Tajaran, IPC] # Delta V - Felinid, Oni, Vulpkanin; Einstein Engines - Tajaran coloring: default: type: @@ -212,7 +212,7 @@ id: GauzeBoxerWrapLeft bodyPart: LHand markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin, Arachne, Lamia, Tajaran, IPC, Thaven] # Delta V - Felinid, Oni, Vulpkanin; Einstein Engines - Tajaran + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin, Arachne, Lamia, Tajaran, IPC] # Delta V - Felinid, Oni, Vulpkanin; Einstein Engines - Tajaran coloring: default: type: @@ -226,7 +226,7 @@ id: GauzeHead bodyPart: Head markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin, Arachne, Lamia, IPC, Thaven] # Delta V - Felinid, Oni, Vulpkanin # EE - Arachne, Lamia + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin, Arachne, Lamia, IPC] # Delta V - Felinid, Oni, Vulpkanin # EE - Arachne, Lamia coloring: default: type: diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/harpy.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/harpy.yml deleted file mode 100644 index 64feb0de93a..00000000000 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/harpy.yml +++ /dev/null @@ -1,437 +0,0 @@ -# All the Harpy customization - -# Ears Markings -- type: marking - id: HarpyWingDefaultHuescale - bodyPart: RArm - markingCategory: RightArm - speciesRestriction: [Harpy] - coloring: - default: - type: - !type:CategoryColoring - category: Hair - fallbackTypes: - - !type:SimpleColoring - color: "#964b00" - sprites: - - sprite: Mobs/Customization/Harpy/harpy_wings.rsi - state: huescale_harpy - -- type: marking - id: HarpyWingDefaultWhitescale - bodyPart: RArm - markingCategory: RightArm - speciesRestriction: [Harpy] - coloring: - default: - type: - !type:CategoryColoring - category: Hair - fallbackTypes: - - !type:SimpleColoring - color: "#964b00" - sprites: - - sprite: Mobs/Customization/Harpy/harpy_wings.rsi - state: whitescale_harpy - -- type: marking - id: HarpyWingClassic - bodyPart: RArm - markingCategory: RightArm - speciesRestriction: [Harpy] - coloring: - default: - type: - !type:CategoryColoring - category: Hair - fallbackTypes: - - !type:SimpleColoring - color: "#964b00" - sprites: - - sprite: Mobs/Customization/Harpy/harpy_wings.rsi - state: classic_harpy - -- type: marking - id: HarpyWingFoldedHuescale - bodyPart: RArm - markingCategory: RightArm - speciesRestriction: [Harpy] - coloring: - default: - type: - !type:CategoryColoring - category: Hair - fallbackTypes: - - !type:SimpleColoring - color: "#964b00" - sprites: - - sprite: Mobs/Customization/Harpy/harpy_wings.rsi - state: huescale_harpy_folded - -- type: marking - id: HarpyWingFoldedWhitescale - bodyPart: RArm - markingCategory: RightArm - speciesRestriction: [Harpy] - coloring: - default: - type: - !type:CategoryColoring - category: Hair - fallbackTypes: - - !type:SimpleColoring - color: "#964b00" - sprites: - - sprite: Mobs/Customization/Harpy/harpy_wings.rsi - state: whitescale_harpy_folded - -- type: marking - id: HarpyWingOwlHuescale - bodyPart: RArm - markingCategory: RightArm - speciesRestriction: [Harpy] - coloring: - default: - type: - !type:CategoryColoring - category: Hair - fallbackTypes: - - !type:SimpleColoring - color: "#964b00" - sprites: - - sprite: Mobs/Customization/Harpy/harpy_wings.rsi - state: huescale_harpy_wing_owl - -- type: marking - id: HarpyWingOwlWhitescale - bodyPart: RArm - markingCategory: RightArm - speciesRestriction: [Harpy] - coloring: - default: - type: - !type:CategoryColoring - category: Hair - fallbackTypes: - - !type:SimpleColoring - color: "#964b00" - sprites: - - sprite: Mobs/Customization/Harpy/harpy_wings.rsi - state: whitescale_harpy_wing_owl - -- type: marking - id: HarpyEarsDefault - bodyPart: Head - markingCategory: HeadTop - speciesRestriction: [Harpy] - coloring: - default: - type: - !type:CategoryColoring - category: Hair - fallbackTypes: - - !type:SimpleColoring - color: "#964b00" - sprites: - - sprite: Mobs/Customization/Harpy/harpy_ears.rsi - state: harpy_ears_default - -- type: marking - id: HarpyEarsLarge - bodyPart: Head - markingCategory: HeadTop - speciesRestriction: [Harpy] - coloring: - default: - type: - !type:CategoryColoring - category: Hair - fallbackTypes: - - !type:SimpleColoring - color: "#964b00" - sprites: - - sprite: Mobs/Customization/Harpy/harpy_ears.rsi - state: harpy_ears_large - -- type: marking - id: HarpyTailPhoenix - bodyPart: Tail - markingCategory: Tail - speciesRestriction: [Harpy] - coloring: - default: - type: - !type:CategoryColoring - category: Hair - fallbackTypes: - - !type:SimpleColoring - color: "#964b00" - sprites: - - sprite: Mobs/Customization/Harpy/harpy_tails.rsi - state: phoenix_tail - -- type: marking - id: HarpyTailRooster - bodyPart: Tail - markingCategory: Tail - speciesRestriction: [Harpy] - coloring: - default: - type: - !type:CategoryColoring - category: Hair - fallbackTypes: - - !type:SimpleColoring - sprites: - - sprite: Mobs/Customization/Harpy/harpy_tails.rsi - state: rooster_tail - -- type: marking - id: HarpyTailForkedWhitescale - bodyPart: Tail - markingCategory: Tail - speciesRestriction: [Harpy] - coloring: - default: - type: - !type:CategoryColoring - category: Hair - fallbackTypes: - - !type:SimpleColoring - sprites: - - sprite: Mobs/Customization/Harpy/harpy_tails.rsi - state: whitescale_forked_tailfin - -- type: marking - id: HarpyTailForkedHuescale - bodyPart: Tail - markingCategory: Tail - speciesRestriction: [Harpy] - coloring: - default: - type: - !type:CategoryColoring - category: Hair - fallbackTypes: - - !type:SimpleColoring - sprites: - - sprite: Mobs/Customization/Harpy/harpy_tails.rsi - state: huescale_forked_tailfin - -- type: marking - id: HarpyTailFinch - bodyPart: Tail - markingCategory: Tail - speciesRestriction: [Harpy] - coloring: - default: - type: - !type:CategoryColoring - category: Hair - fallbackTypes: - - !type:SimpleColoring - sprites: - - sprite: Mobs/Customization/Harpy/harpy_tails36x36.rsi - state: finch_tail - -- type: marking - id: HarpyTailPeacock - bodyPart: Tail - markingCategory: Tail - speciesRestriction: [Harpy] - coloring: - default: - type: - !type:CategoryColoring - category: Hair - fallbackTypes: - - !type:SimpleColoring - sprites: - - sprite: Mobs/Customization/Harpy/harpy_tails48x48.rsi - state: peacock_tail_feathers - - sprite: Mobs/Customization/Harpy/harpy_tails48x48.rsi - state: peacock_tail_eyes - -- type: marking - id: HarpyTailHaven - bodyPart: Tail - markingCategory: Tail - speciesRestriction: [Harpy] - coloring: - default: - type: - !type:CategoryColoring - category: Hair - fallbackTypes: - - !type:SimpleColoring - sprites: - - sprite: Mobs/Customization/Harpy/harpy_tails.rsi - state: haven_tone_1 - - sprite: Mobs/Customization/Harpy/harpy_tails.rsi - state: haven_tone_2 - -- type: marking - id: HarpyTailForkedLong - bodyPart: Tail - markingCategory: Tail - speciesRestriction: [Harpy] - coloring: - default: - type: - !type:CategoryColoring - category: Hair - fallbackTypes: - - !type:SimpleColoring - sprites: - - sprite: Mobs/Customization/Harpy/harpy_tails.rsi - state: forked_long - -- type: marking - id: HarpyTailSwallow - bodyPart: Tail - markingCategory: Tail - speciesRestriction: [Harpy] - coloring: - default: - type: - !type:CategoryColoring - category: Hair - fallbackTypes: - - !type:SimpleColoring - sprites: - - sprite: Mobs/Customization/Harpy/harpy_tails.rsi - state: swallow_tail - -- type: marking - id: HarpyWing2ToneClassic - bodyPart: RArm - markingCategory: RightArm - speciesRestriction: [Harpy] - sprites: - - sprite: Mobs/Customization/Harpy/harpy_wings.rsi - state: harpy_2tone_1 - - sprite: Mobs/Customization/Harpy/harpy_wings.rsi - state: harpy_2tone_2 - -- type: marking - id: HarpyWing3ToneClassic - bodyPart: RArm - markingCategory: RightArm - speciesRestriction: [Harpy] - sprites: - - sprite: Mobs/Customization/Harpy/harpy_wings.rsi - state: harpy_3tone_1 - - sprite: Mobs/Customization/Harpy/harpy_wings.rsi - state: harpy_3tone_2 - - sprite: Mobs/Customization/Harpy/harpy_wings.rsi - state: harpy_3tone_3 - -- type: marking - id: HarpyWingSpeckledClassic - bodyPart: RArm - markingCategory: RightArm - speciesRestriction: [Harpy] - sprites: - - sprite: Mobs/Customization/Harpy/harpy_wings.rsi - state: harpy_speckled_1 - - sprite: Mobs/Customization/Harpy/harpy_wings.rsi - state: harpy_speckled_2 - -- type: marking - id: HarpyWingUndertoneClassic - bodyPart: RArm - markingCategory: RightArm - speciesRestriction: [Harpy] - sprites: - - sprite: Mobs/Customization/Harpy/harpy_wings.rsi - state: harpy_undertone_1 - - sprite: Mobs/Customization/Harpy/harpy_wings.rsi - state: harpy_undertone_2 - -- type: marking - id: HarpyWingTipsClassic - bodyPart: RArm - markingCategory: RightArm - speciesRestriction: [Harpy] - sprites: - - sprite: Mobs/Customization/Harpy/harpy_wings.rsi - state: harpy_wingtip_1 - - sprite: Mobs/Customization/Harpy/harpy_wings.rsi - state: harpy_wingtip_2 - -- type: marking - id: HarpyWingBat - bodyPart: RArm - markingCategory: RightArm - speciesRestriction: [Harpy] - sprites: - - sprite: Mobs/Customization/Harpy/harpy_wings.rsi - state: bat_wings_tone_1 - - sprite: Mobs/Customization/Harpy/harpy_wings.rsi - state: bat_wings_tone_2 - -- type: marking - id: HarpyWingBionic - bodyPart: RArm - markingCategory: RightArm - speciesRestriction: [Harpy] - shaders: - bionic_wings_tone_2: unshaded - sprites: - - sprite: Mobs/Customization/Harpy/harpy_wings.rsi - state: bionic_wings_tone_1 - - sprite: Mobs/Customization/Harpy/harpy_wings.rsi - state: bionic_wings_tone_2 - -- type: marking - id: HarpyChestDefault - bodyPart: Chest - markingCategory: Chest - speciesRestriction: [Harpy] - coloring: - default: - type: - !type:CategoryColoring - category: Hair - fallbackTypes: - - !type:SimpleColoring - color: "#964b00" - sprites: - - sprite: Mobs/Customization/Harpy/harpy_chest.rsi - state: upper - - sprite: Mobs/Customization/Harpy/harpy_chest.rsi - state: lower - -- type: marking - id: HarpyLegsDefault - bodyPart: LLeg - markingCategory: RightLeg - speciesRestriction: [Harpy] - coloring: - default: - type: - !type:CategoryColoring - category: Hair - fallbackTypes: - - !type:SimpleColoring - color: "#964b00" - sprites: - - sprite: Mobs/Customization/Harpy/harpy_legs.rsi - state: thighs - -- type: marking - id: HarpyFeetDefault - bodyPart: RFoot - markingCategory: RightLeg - speciesRestriction: [Harpy] - coloring: - default: - fallbackTypes: - - !type:SimpleColoring - color: "#964b00" - sprites: - - sprite: Mobs/Customization/Harpy/harpy_legs.rsi - state: feet - - sprite: Mobs/Customization/Harpy/harpy_legs.rsi - state: talons diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml index 2f475b91922..9d560e74913 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml @@ -658,164 +658,6 @@ - type: TimedDespawn #delete the egg after the mothroach spawns lifetime: 21 -- type: entity - name: squackroach - parent: MobCockroach - id: MobSquackroach - description: This is just a horrific genetic stew of a specimen. - components: - - type: Singer - proto: HarpySinger - - type: Fixtures - fixtures: - fix1: - shape: - !type:PhysShapeCircle - radius: 0.2 - density: 0.007 - mask: - - SmallMobMask - layer: - - SmallMobLayer - - type: Speech - speechVerb: Harpy - speechSounds: Harpy - - type: FaxableObject - insertingState: inserting_squackroach - - type: Sprite - sprite: Mobs/Animals/squackroach.rsi - layers: - - map: ["enum.DamageStateVisualLayers.Base", "movement"] - state: squackroach - - map: [ "singingLayer" ] - sprite: Effects/harpysinger.rsi - state: singing_music_notes - visible: false - - type: SpriteMovement - movementLayers: - movement: - state: squackroach-moving - noMovementLayers: - movement: - state: squackroach - - type: Item - size: Normal - - type: Clothing - quickEquip: false - sprite: Mobs/Animals/squackroach.rsi - equippedPrefix: sq - slots: - - HEAD - - NECK - - type: Appearance - - type: DamageStateVisuals - states: - Alive: - Base: squackroach - Critical: - Base: squackroach_dead - Dead: - Base: squackroach_dead - - type: MobThresholds - thresholds: - 0: Alive - 40: Critical - 60: Dead - - type: MovementSpeedModifier - baseWalkSpeed : 2.5 - baseSprintSpeed : 4 - weightlessAcceleration: 1.5 - weightlessFriction: 1 - weightlessModifier: 1.12 - - type: Damageable - damageContainer: Biological - damageModifierSet: Moth - - type: Bloodstream - bloodReagent: InsectBlood # it's still somewhat an insect... somehow - - type: Respirator - - type: CombatMode - - type: Butcherable - spawned: - - id: FoodMeatRat - amount: 2 - - type: Extractable - grindableSolutionName: food - - type: LanguageKnowledge - speaks: - - ValyrianStandard - understands: - - ValyrianStandard - - type: Vocal - sounds: - Male: SoundsHarpy - Female: SoundsHarpy - Unsexed: SoundsHarpy - - type: GenericVisualizer - visuals: - enum.HarpyVisualLayers.Singing: - singingLayer: - False: { visible: false } - True: { visible: true } - wilhelmProbability: 0.001 - - type: MobPrice - price: 150 - - type: Tag - tags: - - Trash - - CannotSuicide - - DoorBumpOpener - - HarpyEmotes - - VimPilot - - type: CanEscapeInventory - - type: NpcFactionMember - factions: - - Mouse - - type: Body - prototype: Squackroach - - type: StepTriggerImmune - whitelist: - types: - - Shard - - Landmine - - Mousetrap - - type: Destructible - thresholds: - - trigger: - !type:DamageTypeTrigger - damageType: Blunt - damage: 60 - behaviors: - - !type:GibBehavior { } - - type: FireVisuals - sprite: Mobs/Effects/onfire.rsi - normalState: Mouse_burning - - type: FootPrints - leftBarePrint: "footprint-left-bare-lizard" - rightBarePrint: "footprint-right-bare-lizard" - - type: SurgeryTarget - - type: UserInterface - interfaces: - enum.SurgeryUIKey.Key: - type: SurgeryBui - enum.InstrumentUiKey.Key: - type: InstrumentBoundUserInterface - requireInputValidation: false - -- type: entity - parent: MobSquackroach - id: MobSquackroachPet - components: - - type: HTN - rootTask: - task: FollowCompound - blackboard: - IdleRange: !type:Single - 1.5 - FollowCloseRange: !type:Single - 1.0 - FollowRange: !type:Single - 2.0 - # Note that the mallard duck is actually a male drake mallard, with the brown duck being the female variant of the same species, however ss14 lacks sex specific textures # The white duck is more akin to a pekin or call duck. diff --git a/Resources/Prototypes/Entities/Mobs/Player/harpy.yml b/Resources/Prototypes/Entities/Mobs/Player/harpy.yml deleted file mode 100644 index f4222301b50..00000000000 --- a/Resources/Prototypes/Entities/Mobs/Player/harpy.yml +++ /dev/null @@ -1,24 +0,0 @@ -- type: entity - save: false - name: Urist McHarpy - parent: MobHarpyBase - id: MobHarpy - components: - - type: CombatMode - - type: MindContainer - showExamineInfo: true - - type: Input - context: "human" - - type: MobMover - - type: InputMover - - type: Respirator - - type: Alerts - - type: Actions - - type: Eye - - type: CameraRecoil - - type: Examiner - - type: CanHostGuardian - - type: NpcFactionMember - factions: - - NanoTrasen - - Birb diff --git a/Resources/Prototypes/Entities/Mobs/Species/harpy.yml b/Resources/Prototypes/Entities/Mobs/Species/harpy.yml deleted file mode 100644 index 31e6eb09e17..00000000000 --- a/Resources/Prototypes/Entities/Mobs/Species/harpy.yml +++ /dev/null @@ -1,252 +0,0 @@ -- type: entity - save: false - name: Urist McHarpy - parent: BaseMobHuman - id: MobHarpyBase - abstract: true - components: - - type: Singer - proto: HarpySinger - - type: Sprite - scale: 0.9, 0.9 - layers: - - map: [ "enum.HumanoidVisualLayers.Chest" ] - - map: [ "enum.HumanoidVisualLayers.Head" ] - - map: [ "enum.HumanoidVisualLayers.Snout" ] - - map: [ "enum.HumanoidVisualLayers.Eyes" ] - - map: [ "enum.HumanoidVisualLayers.Face" ] - - map: [ "enum.HumanoidVisualLayers.LArm" ] - - map: [ "enum.HumanoidVisualLayers.RLeg" ] - - map: [ "enum.HumanoidVisualLayers.LLeg" ] - - map: [ "enum.HumanoidVisualLayers.Underwear" ] - - map: [ "enum.HumanoidVisualLayers.Undershirt" ] - - map: [ "underpants" ] - - map: [ "undershirt" ] - - map: [ "socks" ] - - map: [ "jumpsuit" ] - - map: ["enum.HumanoidVisualLayers.LFoot"] - - map: ["enum.HumanoidVisualLayers.RFoot"] - - map: ["enum.HumanoidVisualLayers.LHand"] - - map: ["enum.HumanoidVisualLayers.RHand"] - - map: [ "enum.HumanoidVisualLayers.Handcuffs" ] - color: "#ffffff" - sprite: Objects/Misc/handcuffs.rsi - state: body-overlay-2 - visible: false - - map: [ "id" ] - - map: [ "gloves" ] - - map: [ "ears" ] - - map: [ "innerBelt" ] - - map: [ "innerNeck" ] - - map: [ "outerClothing" ] - - map: [ "eyes" ] - - map: [ "belt" ] - - map: [ "neck" ] - - map: [ "back" ] - - map: [ "enum.HumanoidVisualLayers.FacialHair" ] - - map: [ "enum.HumanoidVisualLayers.HeadSide" ] - - map: [ "enum.HumanoidVisualLayers.Tail" ] - - map: [ "pocket1" ] - - map: [ "pocket2" ] - - map: [ "clownedon" ] # Dynamically generated - sprite: "Effects/creampie.rsi" - state: "creampie_human" - visible: false -# Yes, RArm has to be down here - - map: [ "enum.HumanoidVisualLayers.RArm" ] - - map: [ "enum.HumanoidVisualLayers.Hair" ] - - map: [ "enum.HumanoidVisualLayers.HeadTop" ] - - map: [ "mask" ] - - map: [ "head" ] - - map: [ "singingLayer" ] - sprite: Effects/harpysinger.rsi - state: singing_music_notes - visible: false - - type: HumanoidAppearance - species: Harpy - - type: Fixtures - fixtures: # TODO: This needs a second fixture just for mob collisions. - fix1: - shape: - !type:PhysShapeCircle - radius: 0.32 - density: 90 - restitution: 0.0 - mask: - - MobMask - layer: - - MobLayer - - type: Body - prototype: Harpy - - type: Damageable - damageModifierSet: Harpy - - type: MeleeWeapon - soundHit: - collection: AlienClaw - animation: WeaponArcClaw - damage: - types: - Piercing: 5 - - type: Speech - speechSounds: Harpy - speechVerb: Harpy - - type: Vocal - sounds: - Male: SoundsHarpy - Female: SoundsHarpy - Unsexed: SoundsHarpy - - type: GenericVisualizer - visuals: - enum.HarpyVisualLayers.Singing: - singingLayer: - False: {visible: false} - True: {visible: true} - - type: MovementSpeedModifier - baseWalkSpeed: 3 - baseSprintSpeed: 5.5 - weightlessAcceleration: 2.5 - weightlessModifier: 1.12 - - type: Inventory - speciesId: harpy - templateId: digitigrade - displacements: - jumpsuit: - layer: - sprite: Mobs/Species/Harpy/displacement.rsi - state: jumpsuit - copyToShaderParameters: - # Value required, provide a dummy. Gets overridden when applied. - layerKey: dummy - parameterTexture: displacementMap - parameterUV: displacementUV - - type: HarpyVisuals - - type: UltraVision - - type: Tag - tags: - - CanPilot - - FootstepSound - - DoorBumpOpener - - HarpyEmotes - - type: LanguageKnowledge - speaks: - - TauCetiBasic - - ValyrianStandard - understands: - - TauCetiBasic - - ValyrianStandard - - type: StepTriggerImmune - whitelist: - types: - - Shard - - Landmine - - Mousetrap - - type: FootPrints - leftBarePrint: "footprint-left-bare-lizard" - rightBarePrint: "footprint-right-bare-lizard" # I was about to complain about this, then I remembered birbs have dinosaur feet. So this is valid. - - type: CanMoveInAir - -- type: entity - save: false - categories: [ HideSpawnMenu ] - name: Urist McBirb - parent: MobHumanDummy - id: MobHarpyDummy - description: A dummy Harpy meant to be used in character setup. - components: - - type: HumanoidAppearance - species: Harpy - - type: Inventory - speciesId: harpy - templateId: digitigrade - displacements: - jumpsuit: - layer: - sprite: Mobs/Species/Harpy/displacement.rsi - state: jumpsuit - copyToShaderParameters: - # Value required, provide a dummy. Gets overridden when applied. - layerKey: dummy - parameterTexture: displacementMap - parameterUV: displacementUV - - type: Sprite - scale: 0.9, 0.9 - layers: - - map: [ "enum.HumanoidVisualLayers.Chest" ] - - map: [ "enum.HumanoidVisualLayers.Head" ] - - map: [ "enum.HumanoidVisualLayers.Snout" ] - - map: [ "enum.HumanoidVisualLayers.Eyes" ] - - map: [ "enum.HumanoidVisualLayers.Face" ] - - map: [ "enum.HumanoidVisualLayers.LArm" ] - - map: [ "enum.HumanoidVisualLayers.RLeg" ] - - map: [ "enum.HumanoidVisualLayers.LLeg" ] - - map: [ "underpants" ] - - map: [ "undershirt" ] - - map: [ "socks" ] - - map: [ "jumpsuit" ] - - map: ["enum.HumanoidVisualLayers.LFoot"] - - map: ["enum.HumanoidVisualLayers.RFoot"] - - map: ["enum.HumanoidVisualLayers.LHand"] - - map: ["enum.HumanoidVisualLayers.RHand"] - - map: [ "id" ] - - map: [ "gloves" ] - - map: [ "ears" ] - - map: [ "innerBelt" ] - - map: [ "innerNeck" ] - - map: [ "outerClothing" ] - - map: [ "eyes" ] - - map: [ "belt" ] - - map: [ "neck" ] - - map: [ "back" ] - - map: [ "enum.HumanoidVisualLayers.FacialHair" ] - - map: [ "enum.HumanoidVisualLayers.HeadSide" ] - - map: [ "enum.HumanoidVisualLayers.HeadTop" ] - - map: [ "enum.HumanoidVisualLayers.Tail" ] - - map: [ "pocket1" ] - - map: [ "pocket2" ] - - map: [ "clownedon" ] # Dynamically generated - sprite: "Effects/creampie.rsi" - state: "creampie_human" - visible: false -# Yes, RArm has to be down here - - map: [ "enum.HumanoidVisualLayers.RArm" ] - - map: [ "enum.HumanoidVisualLayers.Hair" ] - - map: [ "mask" ] - - map: [ "head" ] - - map: [ "singingLayer" ] - sprite: Effects/harpysinger.rsi - state: singing_music_notes - -- type: entity - id: ActionHarpyPlayMidi - name: Play MIDI - description: Sing your heart out! Right click yourself to set an instrument. - categories: [ HideSpawnMenu ] - components: - - type: InstantAction - checkCanInteract: false - icon: DeltaV/Interface/Actions/harpy_sing.png - event: !type:OpenUiActionEvent - key: enum.InstrumentUiKey.Key - -- type: entity - id: ActionSyrinxChangeVoiceMask - name: Set name - description: Change the name others hear to something else. - categories: [ HideSpawnMenu ] - components: - - type: InstantAction - icon: DeltaV/Interface/Actions/harpy_syrinx.png - itemIconStyle: BigAction - event: !type:VoiceMaskSetNameEvent - -- type: entity - id: ActionToggleFlight - name: Fly - description: Make use of your wings to fly. Beat the flightlessness allegations. - categories: [ HideSpawnMenu ] - components: - - type: InstantAction - checkCanInteract: false - icon: { sprite: Interface/Actions/flight.rsi, state: flight_off } - iconOn: { sprite : Interface/Actions/flight.rsi, state: flight_on } - event: !type:ToggleFlightEvent diff --git a/Resources/Prototypes/Entities/Objects/Devices/translator_implants.yml b/Resources/Prototypes/Entities/Objects/Devices/translator_implants.yml index 706e372b804..237d6c0a6c2 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/translator_implants.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/translator_implants.yml @@ -142,21 +142,6 @@ requires: - TauCetiBasic -- type: entity - parent: BaseSubdermalImplant - id: ValyrianStandardTranslatorImplant - name: valyrian standard translator implant - description: An implant giving the ability to understand and speak Valyrian Standard. Chirp! - categories: [ HideSpawnMenu ] - components: - - type: TranslatorImplant - understood: - - ValyrianStandard - spoken: - - ValyrianStandard - requires: - - TauCetiBasic - - type: entity parent: BaseSubdermalImplant id: AzazibaTranslatorImplant @@ -172,21 +157,6 @@ requires: - Draconic -- type: entity - parent: BaseSubdermalImplant - id: ChittinTranslatorImplant - name: chittin translator implant - description: An implant giving the ability to understand and speak Chittin. - categories: [ HideSpawnMenu ] - components: - - type: TranslatorImplant - understood: - - Chittin - spoken: - - Chittin - requires: - - TauCetiBasic - - type: entity parent: BaseSubdermalImplant id: SiikMaasTranslatorImplant diff --git a/Resources/Prototypes/Entities/Objects/Devices/translators.yml b/Resources/Prototypes/Entities/Objects/Devices/translators.yml index 489847e5d87..f7c4aa0eac1 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/translators.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/translators.yml @@ -309,24 +309,7 @@ requires: - TauCetiBasic setLanguageOnInteract: false - -- type: entity - id: ValyrianStandardTranslator - parent: [ TranslatorPoweredBase ] - name: Valyrian Standard translator - description: Translates speech between Valyrian Standard and Tau-Ceti Basic. For talking to Harpies! - components: - - type: HandheldTranslator - spoken: - - TauCetiBasic - - ValyrianStandard - understood: - - TauCetiBasic - - ValyrianStandard - requires: - - TauCetiBasic - - ValyrianStandard - + - type: entity id: AzazibaTranslator parent: [ TranslatorPoweredBase ] @@ -344,23 +327,6 @@ - Draconic - Azaziba -- type: entity - id: ChittinTranslator - parent: [ TranslatorPoweredBase ] - name: Chittin translator - description: Translates speech between Chittin and Tau-Ceti Basic. For talking to Chitinids! - components: - - type: HandheldTranslator - spoken: - - TauCetiBasic - - Chittin - understood: - - TauCetiBasic - - Chittin - requires: - - TauCetiBasic - - Chittin - - type: entity id: SiikMaasTranslator parent: [ TranslatorPoweredBase ] diff --git a/Resources/Prototypes/Entities/Objects/Misc/translator_implanters.yml b/Resources/Prototypes/Entities/Objects/Misc/translator_implanters.yml index d2d0b9dd404..a7e7df165e7 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/translator_implanters.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/translator_implanters.yml @@ -84,14 +84,6 @@ - type: Implanter implant: MofficTranslatorImplant -- type: entity - id: ValyrianStandardTranslatorImplanter - parent: [ BaseTranslatorImplanter ] - name: valyrian standard translator implant - components: - - type: Implanter - implant: ValyrianStandardTranslatorImplant - - type: entity id: AzazibaTranslatorImplanter parent: [ BaseTranslatorImplanter ] @@ -100,14 +92,6 @@ - type: Implanter implant: AzazibaTranslatorImplant -- type: entity - id: ChittinTranslatorImplanter - parent: [ BaseTranslatorImplanter ] - name: chittin translator implant - components: - - type: Implanter - implant: ChittinTranslatorImplant - - type: entity id: SiikMaasTranslatorImplanter parent: [ BaseTranslatorImplanter ] diff --git a/Resources/Prototypes/GameRules/events.yml b/Resources/Prototypes/GameRules/events.yml index d3beaa4f53f..ec5f3a47b88 100644 --- a/Resources/Prototypes/GameRules/events.yml +++ b/Resources/Prototypes/GameRules/events.yml @@ -328,8 +328,7 @@ prob: 0.03 - id: MobMothroach prob: 0.008 - - id: MobSquackroach - prob: 0.001 + - type: entity id: SnailMigrationLowPop diff --git a/Resources/Prototypes/Language/Species-Specific/chittin.yml b/Resources/Prototypes/Language/Species-Specific/chittin.yml deleted file mode 100644 index e6de43d5a3c..00000000000 --- a/Resources/Prototypes/Language/Species-Specific/chittin.yml +++ /dev/null @@ -1,16 +0,0 @@ -# Spoken by Chitinids. -- type: language - id: Chittin - isVisibleLanguage: true - speech: - color: "#7d7d7d" - fontId: Only_You - obfuscation: - !type:SyllableObfuscation - minSyllables: 1 # Replacements are really short - maxSyllables: 2 - replacement: - - click - - clack - - buzz - - bizz \ No newline at end of file diff --git a/Resources/Prototypes/Language/Species-Specific/harpy.yml b/Resources/Prototypes/Language/Species-Specific/harpy.yml deleted file mode 100644 index 531b92e3259..00000000000 --- a/Resources/Prototypes/Language/Species-Specific/harpy.yml +++ /dev/null @@ -1,117 +0,0 @@ -- type: language - id: ValyrianStandard - isVisibleLanguage: true - speech: - fontId: Cambria - color: "#008ecc" - obfuscation: - !type:SyllableObfuscation - minSyllables: 2 - maxSyllables: 5 - replacement: - - š - - ž - - ź - - ż - - ö - - ü - - çi - - bü - - ca - - çu - - dü - - do - - fa - - fe - - fi - - gü - - ha - - je - - jü - - la - - le - - li - - me - - mi - - mo - - çe - - nj - - ba - - ce - - da - - fi - - go - - ha - - ji - - ka - - la - - ma - - na - - pa - - ra - - sa - - ta - - wa - - za - - ab - - ed - - if - - og - - up - - yk - - za - - ta - - va - - čk - - žd - - sak - - anz - - emn - - okl - - upn - - bab - - cic - - ded - - fig - - gog - - hib - - juj - - kik - - lal - - mam - - nan - - pap - - rar - - sas - - tat - - wab - - zab - - stras - - bram - - klam - - tram - - stry - - zrak - - deck - - mist - - ale - - ogn - - emt - - brat - - skar - - plik - - klat - - ae - - ai - - au - - ei - - ou - - bl - - dr - - fl - - gr - - pr - - sz - - cz - - zk - - jn diff --git a/Resources/Prototypes/Loadouts/Generic/species.yml b/Resources/Prototypes/Loadouts/Generic/species.yml index df75ce90bbe..d624687051b 100644 --- a/Resources/Prototypes/Loadouts/Generic/species.yml +++ b/Resources/Prototypes/Loadouts/Generic/species.yml @@ -58,7 +58,6 @@ requirements: - !type:CharacterSpeciesRequirement species: - - Harpy - Diona - Arachne - !type:CharacterLogicOrRequirement diff --git a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml index de939ed3fc1..47a4d35efd4 100644 --- a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml +++ b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml @@ -1459,15 +1459,6 @@ FoodSnackChocolateBar: 2 FoodEgg: 3 -- type: microwaveMealRecipe - id: RecipeHarpyWings - name: harpy wings recipe - result: FoodHarpyWings - time: 15 - solids: - LeftLegHarpy: 1 - RightLegHarpy: 1 - #Donks i guess - type: microwaveMealRecipe id: RecipeWarmDonkpocket @@ -1931,4 +1922,4 @@ solids: FoodCroissantRaw: 1 FoodButterSlice: 1 - ShardGlass: 1 \ No newline at end of file + ShardGlass: 1 diff --git a/Resources/Prototypes/SoundCollections/harpy.yml b/Resources/Prototypes/SoundCollections/harpy.yml deleted file mode 100644 index 27b6a1f1f66..00000000000 --- a/Resources/Prototypes/SoundCollections/harpy.yml +++ /dev/null @@ -1,259 +0,0 @@ -- type: soundCollection - id: HarpyScreams - files: - - /Audio/Nyanotrasen/Voice/Felinid/cat_scream1.ogg - - /Audio/Nyanotrasen/Voice/Felinid/cat_scream2.ogg - - /Audio/Nyanotrasen/Voice/Felinid/cat_scream3.ogg - - /Audio/Animals/monkey_scream.ogg - - /Audio/Voice/Human/malescream_1.ogg - - /Audio/Voice/Human/malescream_2.ogg - - /Audio/Voice/Human/malescream_3.ogg - - /Audio/Voice/Human/malescream_4.ogg - - /Audio/Voice/Human/malescream_5.ogg - - /Audio/Voice/Human/malescream_6.ogg - - /Audio/Voice/Human/femalescream_1.ogg - - /Audio/Voice/Human/femalescream_2.ogg - - /Audio/Voice/Human/femalescream_3.ogg - - /Audio/Voice/Human/femalescream_4.ogg - - /Audio/Voice/Human/femalescream_5.ogg - - /Audio/Voice/Moth/moth_scream.ogg - - /Audio/Voice/Skeleton/skeleton_scream.ogg - - /Audio/Voice/Reptilian/reptilian_scream.ogg - - /Audio/Voice/Slime/slime_scream_m1.ogg - - /Audio/Voice/Slime/slime_scream_m2.ogg - - /Audio/Voice/Slime/slime_scream_f1.ogg - - /Audio/Voice/Slime/slime_scream_f2.ogg - -- type: soundCollection - id: HarpyLaugh - files: - - /Audio/Voice/Human/manlaugh1.ogg - - /Audio/Voice/Human/manlaugh2.ogg - - /Audio/Voice/Human/womanlaugh.ogg - - /Audio/Voice/Diona/diona_rustle1.ogg - - /Audio/Voice/Diona/diona_rustle2.ogg - - /Audio/Voice/Diona/diona_rustle3.ogg - - /Audio/Animals/lizard_happy.ogg - - /Audio/Animals/ferret_happy.ogg - - /Audio/Voice/Moth/moth_laugh.ogg - - /Audio/Voice/Slime/slime_laugh_m1.ogg - - /Audio/Voice/Slime/slime_laugh_m2.ogg - - /Audio/Voice/Slime/slime_laugh_f1.ogg - -- type: soundCollection - id: HarpyHisses - files: - - /Audio/Nyanotrasen/Voice/Felinid/cat_hiss1.ogg - - /Audio/Nyanotrasen/Voice/Felinid/cat_hiss2.ogg - - /Audio/Weapons/ebladeon.ogg - - /Audio/Weapons/eblade1.ogg - - /Audio/Items/hiss.ogg - - /Audio/Items/hypospray.ogg - - /Audio/Items/ratchet.ogg - - /Audio/Items/welder.ogg - - /Audio/Machines/airlock_close.ogg - - /Audio/Machines/airlock_ext_close.ogg - - /Audio/Machines/airlock_ext_open.ogg - - /Audio/Machines/airlock_open.ogg - - /Audio/Machines/disposalflush.ogg - - /Audio/Machines/printer.ogg - - /Audio/Machines/windoor_open.ogg - - /Audio/Effects/spray.ogg - - /Audio/Effects/spray2.ogg - -- type: soundCollection - id: HarpySigh - files: - - /Audio/Voice/Human/male_sigh.ogg - - /Audio/Voice/Human/female_sigh.ogg - -- type: soundCollection - id: HarpyCry - files: - - /Audio/Voice/Human/cry_male_1.ogg - - /Audio/Voice/Human/cry_male_2.ogg - - /Audio/Voice/Human/cry_male_3.ogg - - /Audio/Voice/Human/cry_male_4.ogg - - /Audio/Voice/Human/cry_female_1.ogg - - /Audio/Voice/Human/cry_female_2.ogg - - /Audio/Voice/Human/cry_female_3.ogg - - /Audio/Voice/Human/cry_female_4.ogg - -- type: soundCollection - id: HarpyMeows - files: - - /Audio/Nyanotrasen/Voice/Felinid/cat_meow1.ogg - - /Audio/Nyanotrasen/Voice/Felinid/cat_meow2.ogg - - /Audio/Nyanotrasen/Voice/Felinid/cat_meow3.ogg - - /Audio/Items/Toys/meow1.ogg - - /Audio/Animals/cat_meow.ogg - -- type: soundCollection - id: HarpyMews - files: - - /Audio/Nyanotrasen/Voice/Felinid/cat_mew1.ogg - - /Audio/Nyanotrasen/Voice/Felinid/cat_mew2.ogg - -- type: soundCollection - id: HarpyGrowls - files: - - /Audio/Nyanotrasen/Voice/Felinid/cat_growl1.ogg - - /Audio/Animals/bear.ogg - - /Audio/DeltaV/Voice/Vulpkanin/dog_growl1.ogg - - /Audio/DeltaV/Voice/Vulpkanin/dog_growl2.ogg - - /Audio/DeltaV/Voice/Vulpkanin/dog_growl3.ogg - - /Audio/DeltaV/Voice/Vulpkanin/dog_growl4.ogg - - /Audio/DeltaV/Voice/Vulpkanin/dog_growl5.ogg - - /Audio/DeltaV/Voice/Vulpkanin/dog_growl6.ogg - -- type: soundCollection - id: HarpyPurrs - files: - - /Audio/Nyanotrasen/Voice/Felinid/cat_purr1.ogg - - /Audio/Mecha/sound_mecha_hydraulic.ogg - -- type: soundCollection - id: HarpyRings - files: - - /Audio/Items/desk_bell_ring.ogg - - /Audio/Items/ring.ogg - - /Audio/Machines/ding.ogg - - /Audio/Machines/warning_buzzer.ogg - -- type: soundCollection - id: HarpyHonks - files: - - /Audio/Items/bikehorn.ogg - - /Audio/Items/brokenbikehorn.ogg - -- type: soundCollection - id: HarpyPews - files: - - /Audio/Weapons/Guns/Gunshots/silenced.ogg - - /Audio/Weapons/Guns/Gunshots/taser.ogg - - /Audio/Weapons/Guns/Gunshots/taser2.ogg - - /Audio/Weapons/Guns/Gunshots/laser.ogg - - /Audio/Weapons/Guns/Gunshots/laser3.ogg - - /Audio/Weapons/emitter.ogg - - /Audio/Effects/Arcade/player_attack.ogg - - /Audio/Effects/Arcade/player_charge.ogg - - /Audio/Effects/Arcade/player_heal.ogg - - /Audio/Magic/staff_animation.ogg - - /Audio/Magic/staff_change.ogg - - /Audio/Magic/staff_chaos.ogg - - /Audio/Magic/staff_door.ogg - - /Audio/Magic/staff_healing.ogg - -- type: soundCollection - id: HarpyBangs - files: - - /Audio/Weapons/Guns/Gunshots/atreides.ogg - - /Audio/Weapons/Guns/Gunshots/bang.ogg - - /Audio/Weapons/Guns/Gunshots/mk58.ogg - - /Audio/Weapons/Guns/Gunshots/pistol.ogg - - /Audio/Weapons/Guns/Gunshots/c-20r.ogg - - /Audio/Items/snap.ogg - - /Audio/Machines/blastdoor.ogg - - /Audio/Machines/machine_vend.ogg - - /Audio/Magic/disintegrate.ogg - - /Audio/Magic/fireball.ogg - - /Audio/Magic/forcewall.ogg - - /Audio/Magic/knock.ogg - -- type: soundCollection - id: HarpyBeeps - files: - - /Audio/Weapons/Guns/EmptyAlarm/smg_empty_alarm.ogg - - /Audio/Items/beep.ogg - - /Audio/Items/flashlight_pda.ogg - - /Audio/Items/locator_beep.ogg - - /Audio/Items/toolbox_drop.ogg - - /Audio/Items/Defib/defib_charge.ogg - - /Audio/Items/Defib/defib_ready.ogg - - /Audio/Items/Defib/defib_safety_off.ogg - - /Audio/Items/Defib/defib_safety_on.ogg - - /Audio/Items/Medical/healthscanner.ogg - - /Audio/Effects/RingtoneNotes/a.ogg - - /Audio/Effects/RingtoneNotes/asharp.ogg - - /Audio/Effects/RingtoneNotes/b.ogg - - /Audio/Effects/RingtoneNotes/c.ogg - - /Audio/Effects/RingtoneNotes/csharp.ogg - - /Audio/Effects/RingtoneNotes/d.ogg - - /Audio/Effects/RingtoneNotes/dsharp.ogg - - /Audio/Effects/RingtoneNotes/e.ogg - - /Audio/Effects/RingtoneNotes/f.ogg - - /Audio/Effects/RingtoneNotes/fsharp.ogg - - /Audio/Effects/RingtoneNotes/g.ogg - - /Audio/Effects/RingtoneNotes/gsharp.ogg - - /Audio/Effects/Arcade/gameover.ogg - - /Audio/Effects/Arcade/win.ogg - - /Audio/Machines/airlock_deny.ogg - - /Audio/Machines/alarm.ogg - - /Audio/Machines/beep.ogg - - /Audio/Machines/boltsdown.ogg - - /Audio/Machines/boltsup.ogg - - /Audio/Machines/custom_deny.ogg - - /Audio/Machines/high_tech_confirm.ogg - - /Audio/Machines/microwave_done_beep.ogg - - /Audio/Machines/scan_finish.ogg - - /Audio/Machines/vending_jingle.ogg - -- type: soundCollection - id: HarpyRevs - files: - - /Audio/Weapons/chainsawwield.ogg - - /Audio/Machines/blender.ogg - - /Audio/Machines/juicer.ogg - - /Audio/Machines/reclaimer_startup.ogg - -- type: soundCollection - id: HarpyClicks - files: - - /Audio/Items/deconstruct.ogg - - /Audio/Items/flashlight_off.ogg - - /Audio/Items/flashlight_on.ogg - - /Audio/Items/pistol_cock.ogg - - /Audio/Items/pistol_magin.ogg - - /Audio/Items/pistol_magout.ogg - - /Audio/Items/rped.ogg - - /Audio/Machines/door_lock_off.ogg - - /Audio/Machines/door_lock_on.ogg - - /Audio/Machines/id_swipe.ogg - - /Audio/Machines/machine_switch.ogg - - /Audio/Machines/screwdriveropen.ogg - -- type: soundCollection - id: HarpyChitter - files: - - /Audio/Voice/Moth/moth_chitter.ogg - - /Audio/Machines/circuitprinter.ogg - - /Audio/Machines/diagnoser_printing.ogg - - /Audio/Machines/uniformprinter.ogg - - /Audio/Machines/vaccinator_running.ogg - -- type: soundCollection - id: HarpySqueak - files: - - /Audio/Voice/Moth/moth_squeak.ogg - - /Audio/Animals/mouse_squeak.ogg - -- type: soundCollection - id: HarpyCaws - files: - - /Audio/DeltaV/Voice/Harpy/caw1.ogg - -- type: soundCollection - id: HarpyChirps - files: - - /Audio/DeltaV/Voice/Harpy/chirp1.ogg - - /Audio/Voice/Talk/pai.ogg - - /Audio/Voice/Talk/pai_ask.ogg - - /Audio/Voice/Talk/pai_exclaim.ogg - -- type: soundCollection - id: HarpyHoots - files: - - /Audio/Effects/Emotes/harpyHoot1.ogg - - /Audio/Effects/Emotes/harpyHoot2.ogg - - /Audio/Effects/Emotes/harpyHoot3.ogg - - /Audio/Effects/Emotes/harpyHoot4.ogg diff --git a/Resources/Prototypes/Species/harpy.yml b/Resources/Prototypes/Species/harpy.yml deleted file mode 100644 index 22233e82218..00000000000 --- a/Resources/Prototypes/Species/harpy.yml +++ /dev/null @@ -1,181 +0,0 @@ -- type: species - id: Harpy - name: species-name-harpy - roundStart: false - prototype: MobHarpy - sprites: MobHarpySprites - defaultSkinTone: "#c0967f" - markingLimits: MobHarpyMarkingLimits - dollPrototype: MobHarpyDummy - skinColoration: HumanToned - minHeight: 0.6 - defaultHeight: 0.8 - maxHeight: 1.1 - minWidth: 0.55 - defaultWidth: 0.8 - maxWidth: 1.15 - -- type: speciesBaseSprites - id: MobHarpySprites - sprites: - Head: MobHarpyHead - Face: MobHumanoidAnyMarking - Hair: MobHumanoidAnyMarking - FacialHair: MobHumanoidAnyMarking - Snout: MobHumanoidAnyMarking - Chest: MobHarpyTorso - HeadTop: MobHumanoidAnyMarking - HeadSide: MobHumanoidAnyMarking - Tail: MobHumanoidAnyMarking - Eyes: MobHumanoidEyes - LArm: MobHarpyLArm - RArm: MobHarpyRArm - LHand: MobHarpyLHand - RHand: MobHarpyRHand - Underwear: MobHumanoidAnyMarking - Undershirt: MobHumanoidAnyMarking - LLeg: MobHarpyLLeg - RLeg: MobHarpyRLeg - LFoot: MobHarpyLFoot - RFoot: MobHarpyRFoot - - -- type: markingPoints - id: MobHarpyMarkingLimits - points: - Hair: - points: 1 - required: false - FacialHair: - points: 1 - required: false - Tail: - points: 1 - required: true - defaultMarkings: [ HarpyTailPhoenix ] - HeadTop: - points: 2 - required: true - defaultMarkings: [ HarpyEarsDefault ] - HeadSide: - points: 6 - required: false - Chest: - points: 6 - required: true - defaultMarkings: [ HarpyChestDefault ] - Underwear: - points: 1 - required: false - Undershirt: - points: 1 - required: false - RightLeg: - points: 6 - required: false - RightFoot: - points: 6 - required: false - LeftLeg: - points: 6 - required: false - LeftFoot: - points: 6 - required: false - RightArm: - points: 1 - required: false - defaultMarkings: [ HarpyWingDefaultHuescale ] - RightHand: - points: 2 - required: false - LeftArm: - points: 2 - required: false - LeftHand: - points: 2 - required: false - -- type: humanoidBaseSprite - id: MobHarpyHead - baseSprite: - sprite: Mobs/Species/Harpy/parts.rsi - state: head_m - -- type: humanoidBaseSprite - id: MobHarpyHeadMale - baseSprite: - sprite: Mobs/Species/Harpy/parts.rsi - state: head_m - -- type: humanoidBaseSprite - id: MobHarpyHeadFemale - baseSprite: - sprite: Mobs/Species/Harpy/parts.rsi - state: head_f - -- type: humanoidBaseSprite - id: MobHarpyTorso - baseSprite: - sprite: Mobs/Species/Harpy/parts.rsi - state: torso_m - -- type: humanoidBaseSprite - id: MobHarpyTorsoMale - baseSprite: - sprite: Mobs/Species/Harpy/parts.rsi - state: torso_m - -- type: humanoidBaseSprite - id: MobHarpyTorsoFemale - baseSprite: - sprite: Mobs/Species/Harpy/parts.rsi - state: torso_f - -- type: humanoidBaseSprite - id: MobHarpyLLeg - baseSprite: - sprite: Mobs/Species/Harpy/parts.rsi - state: l_leg - -- type: humanoidBaseSprite - id: MobHarpyLHand - baseSprite: - sprite: Mobs/Species/Harpy/parts.rsi - state: l_hand - -- type: humanoidBaseSprite - id: MobHarpyLArm - baseSprite: - sprite: Mobs/Species/Harpy/parts.rsi - state: l_arm - -- type: humanoidBaseSprite - id: MobHarpyLFoot - baseSprite: - sprite: Mobs/Species/Harpy/parts.rsi - state: l_foot - -- type: humanoidBaseSprite - id: MobHarpyRLeg - baseSprite: - sprite: Mobs/Species/Harpy/parts.rsi - state: r_leg - -- type: humanoidBaseSprite - id: MobHarpyRHand - baseSprite: - sprite: Mobs/Species/Harpy/parts.rsi - state: r_hand - -- type: humanoidBaseSprite - id: MobHarpyRArm - baseSprite: - sprite: Mobs/Species/Harpy/parts.rsi - state: r_arm - -- type: humanoidBaseSprite - id: MobHarpyRFoot - baseSprite: - sprite: Mobs/Species/Harpy/parts.rsi - state: r_foot diff --git a/Resources/Prototypes/Traits/Misc/singer_types.yml b/Resources/Prototypes/Traits/Misc/singer_types.yml deleted file mode 100644 index dd9b6346c9c..00000000000 --- a/Resources/Prototypes/Traits/Misc/singer_types.yml +++ /dev/null @@ -1,33 +0,0 @@ -- type: SingerInstrument - id: HarpySinger - instrumentList: - "Voice": {52: 0} - "Trumpet": {56: 0} - "Electric": {27: 0} - "Bass": {33: 0} - "Rock": {29: 0} - "Acoustic": {24: 0} - "Flute": {73: 0} - "Sax": {66: 0} - "Harp": {46: 0} - defaultInstrument: "Voice" - midiUi: Key - midiActionId: ActionHarpyPlayMidi - -- type: SingerInstrument - id: HarpySingerAll - instrumentList: - "Lyresong": {52: 0} - defaultInstrument: "Lyresong" - midiUi: Key - midiActionId: ActionHarpyPlayMidi - allowPercussion: true - allowProgramChange: true - -- type: SingerInstrument - id: NormalSinger - instrumentList: - "Voice": {52: 0} - defaultInstrument: "Voice" - midiUi: Key - midiActionId: ActionHarpyPlayMidi # TODO: custom action maybe? diff --git a/Resources/Prototypes/Traits/disabilities.yml b/Resources/Prototypes/Traits/disabilities.yml index c4bb242fe07..c5a302766d5 100644 --- a/Resources/Prototypes/Traits/disabilities.yml +++ b/Resources/Prototypes/Traits/disabilities.yml @@ -251,7 +251,6 @@ inverted: true species: - IPC - - Lamia - Plasmaman - !type:CharacterTraitRequirement inverted: true @@ -277,7 +276,6 @@ inverted: true species: - IPC - - Lamia - Plasmaman functions: - !type:TraitAddComponent diff --git a/Resources/Prototypes/Traits/neutral.yml b/Resources/Prototypes/Traits/neutral.yml index 56fcb3c82ea..ae53278f7ca 100644 --- a/Resources/Prototypes/Traits/neutral.yml +++ b/Resources/Prototypes/Traits/neutral.yml @@ -128,20 +128,6 @@ components: - type: SkeletonAccent -- type: trait - id: NormalVision - category: Visual - requirements: - - !type:CharacterSpeciesRequirement - species: - - Harpy - - Vulpkanin - functions: - - !type:TraitRemoveComponent - components: - - type: UltraVision - - type: DogVision - # - type: trait # id: Saturnine # category: Mental diff --git a/Resources/Prototypes/Traits/skills.yml b/Resources/Prototypes/Traits/skills.yml index dfb0bf98a7a..f94df935553 100644 --- a/Resources/Prototypes/Traits/skills.yml +++ b/Resources/Prototypes/Traits/skills.yml @@ -171,25 +171,6 @@ - Felinid - Tajaran -- type: trait - id: Singer - category: Auditory - points: -1 - requirements: - - !type:CharacterSpeciesRequirement - inverted: true - species: - - Harpy - - !type:CharacterTraitRequirement - inverted: true - traits: - - Muted - functions: - - !type:TraitAddComponent - components: - - type: Singer - proto: NormalSinger - # - type: trait # id: AnimalFriend # category: Mental diff --git a/Resources/Prototypes/Traits/species.yml b/Resources/Prototypes/Traits/species.yml index 43563145ab1..6071d51aaef 100644 --- a/Resources/Prototypes/Traits/species.yml +++ b/Resources/Prototypes/Traits/species.yml @@ -20,7 +20,7 @@ traits: - Spearmaster - WeaponsGeneralist - + - type: trait @@ -45,7 +45,7 @@ traits: - Swashbuckler - WeaponsGeneralist - + - type: trait id: WeaponsGeneralist @@ -70,7 +70,7 @@ - Swashbuckler - Spearmaster - + #- type: trait # category: Mental # points: 0 @@ -118,24 +118,6 @@ species: - Voidborn -- type: trait - id: MothFlight - category: Physical - points: -2 - functions: - - !type:TraitAddComponent - components: - - type: Flight - speedModifier: 1.19 # gives an effective ~31% (30.9%) increase over walking with base moth weightless modifier - flapInterval: 0.75 - needsHands: false - requirements: - - !type:CharacterSpeciesRequirement - species: - - Moth - - !type:CharacterWeightRequirement # big moffs are too heavy to fly - max: 60 - - type: trait id: IPCInefficientCogitator category: Physical diff --git a/Resources/Prototypes/_Crescent/Catalog/Fills/Lockers/crescentlockers.yml b/Resources/Prototypes/_Crescent/Catalog/Fills/Lockers/crescentlockers.yml index 0c87b5ba6b6..42fa3a068dc 100644 --- a/Resources/Prototypes/_Crescent/Catalog/Fills/Lockers/crescentlockers.yml +++ b/Resources/Prototypes/_Crescent/Catalog/Fills/Lockers/crescentlockers.yml @@ -25,8 +25,6 @@ prob: 0.2 - id: ClothingHandsGlovesColorYellow prob: 0.05 - - id: ClothingOuterJacketInsulated - prob: 0.05 - id: ClothingHeadHatHardhatRed prob: 0.4 - id: CableApcStack diff --git a/Resources/Prototypes/_Crescent/Catalog/VendingMachines/Inventories/crescentengivend.yml b/Resources/Prototypes/_Crescent/Catalog/VendingMachines/Inventories/crescentengivend.yml index 559bd8b51b2..5e8db5f7dc9 100644 --- a/Resources/Prototypes/_Crescent/Catalog/VendingMachines/Inventories/crescentengivend.yml +++ b/Resources/Prototypes/_Crescent/Catalog/VendingMachines/Inventories/crescentengivend.yml @@ -13,4 +13,3 @@ CrescentRCD: 4 RCDAmmo: 6 AccessConfigurator: 4 - ClothingOuterJacketInsulated: 3 diff --git a/Resources/Prototypes/_DV/GameRules/events.yml b/Resources/Prototypes/_DV/GameRules/events.yml deleted file mode 100644 index 789d29895ec..00000000000 --- a/Resources/Prototypes/_DV/GameRules/events.yml +++ /dev/null @@ -1,9 +0,0 @@ -- type: entity - parent: BaseGlimmerEvent - id: ThavenMoodUpset - components: - - type: GlimmerEvent - minimumGlimmer: 500 - glimmerBurnLower: 30 - glimmerBurnUpper: 70 - - type: ThavenMoodUpsetRule diff --git a/Resources/Prototypes/_EE/Actions/xelthia.yml b/Resources/Prototypes/_EE/Actions/xelthia.yml deleted file mode 100644 index f847702dc28..00000000000 --- a/Resources/Prototypes/_EE/Actions/xelthia.yml +++ /dev/null @@ -1,12 +0,0 @@ -- type: entity - id: XelthiaRegenerateAction - name: Regrow Arms - description: Regrow any arms you may have lost. - categories: [ HideSpawnMenu ] - components: - - type: InstantAction - icon: - sprite: _EE/Mobs/Species/Xelthia/parts.rsi - state: full - event: !type:ArmRegrowthEvent - useDelay: 150 # Once every 2.5 minutes or so? \ No newline at end of file diff --git a/Resources/Prototypes/_EE/Body/Organs/xelthia.yml b/Resources/Prototypes/_EE/Body/Organs/xelthia.yml deleted file mode 100644 index eef12c3cb09..00000000000 --- a/Resources/Prototypes/_EE/Body/Organs/xelthia.yml +++ /dev/null @@ -1,29 +0,0 @@ -- type: entity - id: OrganXelthiaStomach - name: xelthia stomach - parent: OrganHumanStomach - categories: [ HideSpawnMenu ] - components: - - type: Stomach - specialDigestible: - tags: - - Meat - - Pill - - Crayon - - Paper - - type: SolutionContainerManager - solutions: - stomach: - maxVol: 50 - food: - maxVol: 5 - reagents: - - ReagentId: UncookedAnimalProteins - Quantity: 5 - - type: Metabolizer - maxReagents: 3 - metabolizerTypes: [ Xelthia ] - removeEmpty: true - groups: - - id: Food - - id: Drink \ No newline at end of file diff --git a/Resources/Prototypes/_EE/Body/Parts/xelthia.yml b/Resources/Prototypes/_EE/Body/Parts/xelthia.yml deleted file mode 100644 index 6843190a2a2..00000000000 --- a/Resources/Prototypes/_EE/Body/Parts/xelthia.yml +++ /dev/null @@ -1,117 +0,0 @@ -- type: entity - id: PartXelthia - parent: [BaseItem, BasePart] - name: "xelthia body part" - abstract: true - components: - - type: Extractable - juiceSolution: - reagents: - - ReagentId: Fat - Quantity: 3 - - ReagentId: Blood - Quantity: 10 - -- type: entity - id: TorsoXelthia - name: "xelthia torso" - parent: [PartXelthia, BaseTorso] - components: - - type: Sprite - sprite: _EE/Mobs/Species/Xelthia/parts.rsi - state: "torso_m" - - type: Extractable - juiceSolution: - reagents: - - ReagentId: Fat - Quantity: 10 - - ReagentId: Blood - Quantity: 20 - -- type: entity - id: HeadXelthia - name: "xelthia head" - parent: [PartXelthia, BaseHead] - components: - - type: Sprite - sprite: _EE/Mobs/Species/Xelthia/parts.rsi - state: "head_m" - - type: Extractable - juiceSolution: - reagents: - - ReagentId: Fat - Quantity: 5 - - ReagentId: Blood - Quantity: 10 - -- type: entity - id: LeftArmXelthia - name: "left xelthia arm" - parent: [PartXelthia, BaseLeftArm] - components: - - type: Sprite - sprite: _EE/Mobs/Species/Xelthia/parts.rsi - state: "l_arm" - -- type: entity - id: RightArmXelthia - name: "right xelthia arm" - parent: [PartXelthia, BaseRightArm] - components: - - type: Sprite - sprite: _EE/Mobs/Species/Xelthia/parts.rsi - state: "r_arm" - -- type: entity - id: LeftHandXelthia - name: "left xelthia hand" - parent: [PartXelthia, BaseLeftHand] - components: - - type: Sprite - sprite: _EE/Mobs/Species/Xelthia/parts.rsi - state: "l_hand" - -- type: entity - id: RightHandXelthia - name: "right xelthia hand" - parent: [PartXelthia, BaseRightHand] - components: - - type: Sprite - sprite: _EE/Mobs/Species/Xelthia/parts.rsi - state: "r_hand" - -- type: entity - id: LeftLegXelthia - name: "left xelthia leg" - parent: [PartXelthia, BaseLeftLeg] - components: - - type: Sprite - sprite: _EE/Mobs/Species/Xelthia/parts.rsi - state: "l_leg" - -- type: entity - id: RightLegXelthia - name: "right xelthia leg" - parent: [PartXelthia, BaseRightLeg] - components: - - type: Sprite - sprite: _EE/Mobs/Species/Xelthia/parts.rsi - state: "r_leg" - -- type: entity - id: LeftFootXelthia - name: "left xelthia foot" - parent: [PartXelthia, BaseLeftFoot] - components: - - type: Sprite - sprite: _EE/Mobs/Species/Xelthia/parts.rsi - state: "l_foot" - -- type: entity - id: RightFootXelthia - name: "right xelthia foot" - parent: [PartXelthia, BaseRightFoot] - components: - - type: Sprite - sprite: _EE/Mobs/Species/Xelthia/parts.rsi - state: "r_foot" diff --git a/Resources/Prototypes/_EE/Body/Prototypes/xelthia.yml b/Resources/Prototypes/_EE/Body/Prototypes/xelthia.yml deleted file mode 100644 index 45aad13fc2f..00000000000 --- a/Resources/Prototypes/_EE/Body/Prototypes/xelthia.yml +++ /dev/null @@ -1,50 +0,0 @@ -- type: body - name: "xelthia" - id: Xelthia - root: torso - slots: - head: - part: HeadXelthia - connections: - - torso - organs: - brain: OrganHumanBrain - eyes: OrganHumanEyes - torso: - part: TorsoXelthia - organs: - heart: OrganAnimalHeart - lungs: OrganHumanLungs - stomach: OrganXelthiaStomach - liver: OrganAnimalLiver - kidneys: OrganHumanKidneys - connections: - - right arm - - left arm - - right leg - - left leg - - head # Shitmed - right arm: - part: RightArmXelthia - connections: - - right hand - left arm: - part: LeftArmXelthia - connections: - - left hand - right hand: - part: RightHandXelthia - left hand: - part: LeftHandXelthia - right leg: - part: RightLegXelthia - connections: - - right foot - left leg: - part: LeftLegXelthia - connections: - - left foot - right foot: - part: RightFootXelthia - left foot: - part: LeftFootXelthia \ No newline at end of file diff --git a/Resources/Prototypes/_EE/Datasets/Names/xelthia_first.yml b/Resources/Prototypes/_EE/Datasets/Names/xelthia_first.yml deleted file mode 100644 index ac4f66b8b10..00000000000 --- a/Resources/Prototypes/_EE/Datasets/Names/xelthia_first.yml +++ /dev/null @@ -1,103 +0,0 @@ -- type: dataset - id: names_xelthia_first - values: - - Abeii - - Adiikou - - Afuulkei - - Akii - - Aoukii - - Ariilei - - Amiou - - Ameii - - Amelii - - Boulii - - Baivii - - Cyruli - - Cinyei - - Cylunei - - Cye - - Cyilxii - - Durrinii - - Dynii - - Dyllei - - Dymilu - - Eiru - - Eiberii - - Eileimu - - Eriinae - - Eibraenu - - Ferii - - Faimii - - Fylei - - Faibu - - Fiiri - - Giiniu - - Gyibu - - Garii - - Giiru - - Iinu - - Iiblibu - - Iiruu - - Iirounii - - Ilii - - Irybii - - Jei - - Jeiriiu - - Jillii - - Jiinei - - Juulii - - Kii - - Keini - - Kuublii - - Kiiue - - Keubei - - Leinii - - Liibuu - - Laetii - - Luurae - - Liibii - - Mou - - Myrianei - - Myrii - - Maeii - - Mouzae - - Mieii - - Niie - - Nuubii - - Nyliinae - - Naebuu - - Oubiiru - - Oulii - - Oubuu - - Oriibii - - Oroumy - - Peirii - - Piixei - - Paenei - - Qii - - Quraii - - Ruulei - - Raebu - - Rai - - Siibu - - Sruuki - - Seilii - - Suu - - Zuiini - - Zarouii - - Yaenii - - Yiili - - Ynuu - - Yulxii - - Xiliki - - Xuiniri - - Xuu - - Xeilii - - Wibiili - - Vieneiru - - Veriinxi - - Uuli - - Uuirii - - Uuxilii - - Turimei - - Tyraii diff --git a/Resources/Prototypes/_EE/Datasets/Names/xelthia_last.yml b/Resources/Prototypes/_EE/Datasets/Names/xelthia_last.yml deleted file mode 100644 index 63d656c6b05..00000000000 --- a/Resources/Prototypes/_EE/Datasets/Names/xelthia_last.yml +++ /dev/null @@ -1,103 +0,0 @@ -- type: dataset - id: names_xelthia_last - values: - - Abeliiq - - Adiikoul - - Afkeir - - Aerkeir - - Aoukiin - - Ariileim - - Amiouk - - Amleiir - - Ameliim - - Boluriiq - - Baiviir - - Cyrulir - - Cinyeik - - Cyluneir - - Cyliik - - Cyilxiim - - Duniin - - Dyniir - - Dylleik - - Dymlur - - Eiruk - - Eineriik - - Eilmun - - Eriinuuk - - Einuim - - Feriim - - Faimiik - - Fylleik - - Foruiik - - Febiik - - Geiniuk - - Guuliur - - Gariil - - Giiruek - - Iiruuk - - Iiblibum - - Iilaek - - Iirouk - - Iriikuok - - Irybekieb - - Jeib - - Jeiruum - - Jyliik - - Jiineir - - Juuliim - - Kiilk - - Keimkik - - Kuubliik - - Kiiuem - - Keubein - - Leinaek - - Liibuuk - - Laetiib - - Luuraek - - Liibiin - - Mousiiq - - Myrianuul - - Myriibuuk - - Maeiikn - - Mouzaeq - - Mieiink - - Niiel - - Nuubiil - - Nynaeq - - Naebuur - - Oubiirum - - Oulimin - - Oubeik - - Oriib - - Oroumyk - - Peiruuk - - Piixeid - - Paeneid - - Qiid - - Quraiik - - Raeleiq - - Raebuun - - Raikriiq - - Siibuum - - Sruukiib - - Seiliiq - - Suurik - - Zuiinik - - Zarouiir - - Yaeniiq - - Yiilin - - Ynuun - - Yulxiin - - Xilikiq - - Xuiniril - - Xuum - - Xeiluuk - - Wibuulin - - Vienaerum - - Veriinxik - - Uulid - - Uuiriim - - Uuxil - - Turimein - - Tyraiib diff --git a/Resources/Prototypes/_EE/Entities/Clothing/OuterClothing/jackets.yml b/Resources/Prototypes/_EE/Entities/Clothing/OuterClothing/jackets.yml deleted file mode 100644 index 135d81f5d78..00000000000 --- a/Resources/Prototypes/_EE/Entities/Clothing/OuterClothing/jackets.yml +++ /dev/null @@ -1,38 +0,0 @@ -#Insulated Jacket -- type: entity - parent: ClothingOuterBase - id: ClothingOuterJacketInsulated - name: insulated jacket - description: A thick jacket with a membrane attached to the end of its sleeves that conforms to the user's hands, allowing it to function as insulated gloves. Useful if you can't wear or find regular insulated gloves. - components: - - type: Sprite - sprite: _EE/Clothing/GloveJackets/insulated_jacket.rsi - - type: Clothing - sprite: _EE/Clothing/GloveJackets/insulated_jacket.rsi - - type: Insulated - - type: Fiber - fiberMaterial: fibers-insulative - fiberColor: fibers-yellow - - type: FingerprintMask - - type: GloveJacket # Components for these jackets that allows them to act as gloves. Mostly for surgery. -# if species-specific sprites are fixed to not have displacement maps apply to them, this will break. -# replacing the equipped-OUTERCLOTHING-xelthia.png file in the RSI with the one in the InsulatedJacket/insulated_jacket_unmodified folder would fix this. - - type: Tag - tags: - - InsulatedJacket - -#Surgical Jacket -- type: entity - parent: ClothingOuterBase - id: ClothingOuterJacketSurgical - name: surgical jacket - description: A thick jacket with a membrane attached to the end of its sleeves that conforms to the user's hands, allowing it to function as surgical gloves. Useful for if you need to do surgery but can't wear normal gloves. - components: - - type: Sprite - sprite: _EE/Clothing/GloveJackets/surgical_jacket.rsi - - type: Clothing - sprite: _EE/Clothing/GloveJackets/surgical_jacket.rsi - - type: Fiber - fiberMaterial: fibers-nitrile - - type: FingerprintMask - - type: GloveJacket \ No newline at end of file diff --git a/Resources/Prototypes/_EE/Entities/Mobs/Customization/Markings/harpy.yml b/Resources/Prototypes/_EE/Entities/Mobs/Customization/Markings/harpy.yml deleted file mode 100644 index 7aa446dce77..00000000000 --- a/Resources/Prototypes/_EE/Entities/Mobs/Customization/Markings/harpy.yml +++ /dev/null @@ -1,179 +0,0 @@ -- type: marking - id: HarpyTricolorParrotZetawing - bodyPart: RArm - markingCategory: RightArm - speciesRestriction: [Harpy] - sprites: - - sprite: _EE/Mobs/Customization/Harpy/harpy_wings.rsi - state: tricolor_parrot_zetawing_layer1 - - sprite: _EE/Mobs/Customization/Harpy/harpy_wings.rsi - state: tricolor_parrot_zetawing_layer2 - - sprite: _EE/Mobs/Customization/Harpy/harpy_wings.rsi - state: tricolor_parrot_zetawing_layer3 - -- type: marking - id: HarpyMonocolorParrotZetawing - bodyPart: RArm - markingCategory: RightArm - speciesRestriction: [Harpy] - coloring: - default: - type: - !type:CategoryColoring - category: Hair - fallbackTypes: - - !type:SimpleColoring - color: "#964b00" - sprites: - - sprite: _EE/Mobs/Customization/Harpy/harpy_wings.rsi - state: monocolor_parrot_zetawing - -- type: marking - id: HarpyMacawZetawing - bodyPart: RArm - markingCategory: RightArm - speciesRestriction: [Harpy] - coloring: - default: - type: - !type:SimpleColoring - color: "#ffffff" - forcedColoring: true - sprites: - - sprite: _EE/Mobs/Customization/Harpy/harpy_wings.rsi - state: macaw_zetawing - -- type: marking - id: HarpyColorlessZetawing - bodyPart: RArm - markingCategory: RightArm - speciesRestriction: [Harpy] - coloring: - default: - type: - !type:CategoryColoring - category: Hair - fallbackTypes: - - !type:SimpleColoring - color: "#964b00" - sprites: - - sprite: _EE/Mobs/Customization/Harpy/harpy_wings.rsi - state: colorless_zetawing - -- type: marking - id: HarpyLimeZetawing - bodyPart: RArm - markingCategory: RightArm - speciesRestriction: [Harpy] - coloring: - default: - type: - !type:SimpleColoring - color: "#ffffff" - forcedColoring: true - sprites: - - sprite: _EE/Mobs/Customization/Harpy/harpy_wings.rsi - state: lime_zetawing - -- type: marking - id: HarpyColorableDragobatZetawing - bodyPart: RArm - markingCategory: RightArm - speciesRestriction: [Harpy] - sprites: - - sprite: _EE/Mobs/Customization/Harpy/harpy_wings.rsi - state: dragobat_c_zetawing_layer1 - - sprite: _EE/Mobs/Customization/Harpy/harpy_wings.rsi - state: dragobat_c_zetawing_layer2 - -- type: marking - id: HarpyDragobatZetawing - bodyPart: RArm - markingCategory: RightArm - speciesRestriction: [Harpy] - coloring: - default: - type: - !type:SimpleColoring - color: "#ffffff" - forcedColoring: true - sprites: - - sprite: _EE/Mobs/Customization/Harpy/harpy_wings.rsi - state: dragobat_zetawing - -- type: marking - id: HarpyColorableAsymagicalZetawing - bodyPart: RArm - markingCategory: RightArm - speciesRestriction: [Harpy] - sprites: - - sprite: _EE/Mobs/Customization/Harpy/harpy_wings.rsi - state: asymagical_c_zetawing_layer1 - - sprite: _EE/Mobs/Customization/Harpy/harpy_wings.rsi - state: asymagical_c_zetawing_layer2 - -- type: marking - id: HarpyAsymagicalZetawing - bodyPart: RArm - markingCategory: RightArm - speciesRestriction: [Harpy] - coloring: - default: - type: - !type:SimpleColoring - color: "#ffffff" - forcedColoring: true - sprites: - - sprite: _EE/Mobs/Customization/Harpy/harpy_wings.rsi - state: asymagical_zetawing - -- type: marking - id: HarpySmallZetawing - bodyPart: RArm - markingCategory: RightArm - speciesRestriction: [Harpy] - coloring: - default: - type: - !type:CategoryColoring - category: Hair - fallbackTypes: - - !type:SimpleColoring - color: "#964b00" - sprites: - - sprite: _EE/Mobs/Customization/Harpy/harpy_wings.rsi - state: small_zetawing - -- type: marking - id: HarpyQuintetZetawing - bodyPart: RArm - markingCategory: RightArm - speciesRestriction: [Harpy] - coloring: - default: - type: - !type:CategoryColoring - category: Hair - fallbackTypes: - - !type:SimpleColoring - color: "#964b00" - sprites: - - sprite: _EE/Mobs/Customization/Harpy/harpy_wings.rsi - state: quintet_zetawing - -- type: marking - id: HarpyDownwardZetawing - bodyPart: RArm - markingCategory: RightArm - speciesRestriction: [Harpy] - coloring: - default: - type: - !type:CategoryColoring - category: Hair - fallbackTypes: - - !type:SimpleColoring - color: "#964b00" - sprites: - - sprite: _EE/Mobs/Customization/Harpy/harpy_wings.rsi - state: downward_zetawing \ No newline at end of file diff --git a/Resources/Prototypes/_EE/Entities/Mobs/Customization/Markings/xelthia.yml b/Resources/Prototypes/_EE/Entities/Mobs/Customization/Markings/xelthia.yml deleted file mode 100644 index 651b1e55299..00000000000 --- a/Resources/Prototypes/_EE/Entities/Mobs/Customization/Markings/xelthia.yml +++ /dev/null @@ -1,128 +0,0 @@ -# Tails -- type: marking - id: XelthiaTailNormal - bodyPart: Tail - markingCategory: Tail - speciesRestriction: [Xelthia] - sprites: - - sprite: _EE/Mobs/Customization/xelthia_parts.rsi - state: tail_normal - -# Ears -- type: marking - id: XelthiaEarsNormal - bodyPart: Snout - markingCategory: Snout - speciesRestriction: [Xelthia] - sprites: - - sprite: _EE/Mobs/Customization/xelthia_parts.rsi - state: ears_normal - -- type: marking - id: XelthiaEarsSmall - bodyPart: Snout - markingCategory: Snout - speciesRestriction: [Xelthia] - sprites: - - sprite: _EE/Mobs/Customization/xelthia_parts.rsi - state: ears_small - -# Tendril Hair -- type: marking - id: XelthiaHairStandard - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Xelthia] - sprites: - - sprite: _EE/Mobs/Customization/xelthia_parts.rsi - state: hair_standard - -- type: marking - id: XelthiaHairShort - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Xelthia] - sprites: - - sprite: _EE/Mobs/Customization/xelthia_parts.rsi - state: hair_short - -- type: marking - id: XelthiaHairLongish - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Xelthia] - sprites: - - sprite: _EE/Mobs/Customization/xelthia_parts.rsi - state: hair_longish - -- type: marking - id: XelthiaHairOvereye - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Xelthia] - sprites: - - sprite: _EE/Mobs/Customization/xelthia_parts.rsi - state: hair_overeye - -- type: marking - id: XelthiaHairFancy - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Xelthia] - sprites: - - sprite: _EE/Mobs/Customization/xelthia_parts.rsi - state: hair_fancy - -- type: marking - id: XelthiaHairTripoint - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Xelthia] - sprites: - - sprite: _EE/Mobs/Customization/xelthia_parts.rsi - state: hair_tripoint - -- type: marking - id: XelthiaHairDownNBack - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Xelthia] - sprites: - - sprite: _EE/Mobs/Customization/xelthia_parts.rsi - state: hair_downandback - -# Chest Patterns - -- type: marking - id: XelthiaStripeyChest - bodyPart: Chest - markingCategory: Chest - speciesRestriction: [Xelthia] - sprites: - - sprite: _EE/Mobs/Customization/xelthia_parts.rsi - state: stripey - -- type: marking - id: XelthiaUnderbelly - bodyPart: Chest - markingCategory: Chest - speciesRestriction: [Xelthia] - sprites: - - sprite: _EE/Mobs/Customization/xelthia_parts.rsi - state: underbelly - -# Spikes - -- type: marking - id: XelthiaBackspikes - bodyPart: Chest, RArm, LArm, Head - markingCategory: Overlay - speciesRestriction: [Xelthia] - coloring: - default: - type: - !type:SimpleColoring - color: "#FFFFFF" - sprites: - - sprite: _EE/Mobs/Customization/xelthia_parts.rsi - state: backspikes \ No newline at end of file diff --git a/Resources/Prototypes/_EE/Entities/Mobs/Player/xelthia.yml b/Resources/Prototypes/_EE/Entities/Mobs/Player/xelthia.yml deleted file mode 100644 index 72dfe52ffed..00000000000 --- a/Resources/Prototypes/_EE/Entities/Mobs/Player/xelthia.yml +++ /dev/null @@ -1,5 +0,0 @@ -- type: entity - save: false - name: Urist McTentacles - parent: BaseMobXelthia - id: MobXelthia diff --git a/Resources/Prototypes/_EE/Entities/Mobs/Species/xelthia.yml b/Resources/Prototypes/_EE/Entities/Mobs/Species/xelthia.yml deleted file mode 100644 index d9d14639643..00000000000 --- a/Resources/Prototypes/_EE/Entities/Mobs/Species/xelthia.yml +++ /dev/null @@ -1,269 +0,0 @@ -# Anything human specific (e.g. UI, input) goes under MobHuman -- type: entity - parent: BaseMobSpeciesOrganic - id: BaseMobXelthia - name: Urist McTentacles - abstract: true - components: - - type: Hunger - - type: Icon # It will not have an icon in the adminspawn menu without this. Body parts seem fine for whatever reason. - sprite: _EE/Mobs/Species/Xelthia/parts.rsi - state: full - - type: Body - prototype: Xelthia - - type: Thirst - - type: Carriable # Carrying system from nyanotrasen. - - type: Butcherable - butcheringType: Spike - spawned: - - id: FoodMeatHuman - amount: 5 - - type: HumanoidAppearance - species: Xelthia - hideLayersOnEquip: - - Hair - - Snout - - type: LanguageKnowledge - speaks: - - TauCetiBasic - - Qiilour - understands: - - TauCetiBasic - - Qiilour - - type: Speech - speechSounds: Xelthia - speechVerb: Xelthia - - type: TypingIndicator - proto: xelthia - - type: Vocal - sounds: - Male: UnisexXelthia - Female: UnisexXelthia - Unsexed: UnisexXelthia - - type: FootPrints - - type: Xelthia - - type: Damageable - damageContainer: Biological - damageModifierSet: Xelthia - - type: Temperature - heatDamageThreshold: 360 - coldDamageThreshold: 280 - currentTemperature: 310.15 - specificHeat: 42 - coldDamage: - types: - Cold: 1.2 #per second, scales with temperature & other constants - heatDamage: - types: - Heat: 1.2 #per second, scales with temperature & other constants - - type: Barotrauma - damage: - types: - Blunt: 0.14 #per second, scales with pressure and other constants. - - type: Bloodstream - bloodReagent: AcidBlood - - type: DamageVisuals - damageOverlayGroups: - Brute: - sprite: Mobs/Effects/brute_damage.rsi - color: "#00FF69" -# - type: Hands # This doesnt seem to work. I can't tell why. Is this implemented here and i'm doing this wrong, or is it just on goob? Fix later. -# handDisplacement: -# sprite: _EE/Mobs/Species/Xelthia/displacement.rsi -# state: held -# copyToShaderParameters: -# # Value required, provide a dummy. Gets overridden when applied. -# layerKey: dummy -# parameterTexture: displacementMap -# parameterUV: displacementUV - - type: Inventory - templateId: xelthia - speciesId: Xelthia - displacements: - jumpsuit: - layer: - sprite: _EE/Mobs/Species/Xelthia/displacement.rsi - state: jumpsuit - copyToShaderParameters: - # Value required, provide a dummy. Gets overridden when applied. - layerKey: dummy - parameterTexture: displacementMap - parameterUV: displacementUV - head: - layer: - sprite: _EE/Mobs/Species/Xelthia/displacement.rsi - state: jumpsuit # name is somewhat misleading, the jumpsuit state ended up being fairly versitile so I reused it - copyToShaderParameters: - # Value required, provide a dummy. Gets overridden when applied. - layerKey: dummy - parameterTexture: displacementMap - parameterUV: displacementUV - shoes: - layer: - sprite: _EE/Mobs/Species/Xelthia/displacement.rsi - state: jumpsuit - copyToShaderParameters: - # Value required, provide a dummy. Gets overridden when applied. - layerKey: dummy - parameterTexture: displacementMap - parameterUV: displacementUV - mask: - layer: - sprite: _EE/Mobs/Species/Xelthia/displacement.rsi - state: jumpsuit - copyToShaderParameters: - # Value required, provide a dummy. Gets overridden when applied. - layerKey: dummy - parameterTexture: displacementMap - parameterUV: displacementUV - outerClothing: - layer: - sprite: _EE/Mobs/Species/Xelthia/displacement.rsi - state: jumpsuit - copyToShaderParameters: - # Value required, provide a dummy. Gets overridden when applied. - layerKey: dummy - parameterTexture: displacementMap - parameterUV: displacementUV - suitstorage: - layer: - sprite: _EE/Mobs/Species/Xelthia/displacement.rsi - state: jumpsuit - copyToShaderParameters: - # Value required, provide a dummy. Gets overridden when applied. - layerKey: dummy - parameterTexture: displacementMap - parameterUV: displacementUV - eyes: - layer: - sprite: _EE/Mobs/Species/Xelthia/displacement.rsi - state: jumpsuit - copyToShaderParameters: - # Value required, provide a dummy. Gets overridden when applied. - layerKey: dummy - parameterTexture: displacementMap - parameterUV: displacementUV - belt: - layer: - sprite: _EE/Mobs/Species/Xelthia/displacement.rsi - state: jumpsuit - copyToShaderParameters: - # Value required, provide a dummy. Gets overridden when applied. - layerKey: dummy - parameterTexture: displacementMap - parameterUV: displacementUV - back: - layer: - sprite: _EE/Mobs/Species/Xelthia/displacement.rsi - state: backpack - copyToShaderParameters: - # Value required, provide a dummy. Gets overridden when applied. - layerKey: dummy - parameterTexture: displacementMap - parameterUV: displacementUV - -- type: entity - save: false - name: Urist McHands - parent: MobHumanDummy - id: MobXelthiaDummy - categories: [ HideSpawnMenu ] - description: A dummy xelthia meant to be used in character setup. - components: - - type: HumanoidAppearance - species: Xelthia -# - type: Hands -# handDisplacement: -# sprite: _EE/Mobs/Species/Xelthia/displacement.rsi -# state: held -# copyToShaderParameters: -# # Value required, provide a dummy. Gets overridden when applied. -# layerKey: dummy -# parameterTexture: displacementMap -# parameterUV: displacementUV - - - type: Inventory - templateId: xelthia - speciesId: xelthia - displacements: - jumpsuit: - layer: - sprite: _EE/Mobs/Species/Xelthia/displacement.rsi - state: jumpsuit - copyToShaderParameters: - # Value required, provide a dummy. Gets overridden when applied. - layerKey: dummy - parameterTexture: displacementMap - parameterUV: displacementUV - head: - layer: - sprite: _EE/Mobs/Species/Xelthia/displacement.rsi - state: jumpsuit - copyToShaderParameters: - # Value required, provide a dummy. Gets overridden when applied. - layerKey: dummy - parameterTexture: displacementMap - parameterUV: displacementUV - shoes: - layer: - sprite: _EE/Mobs/Species/Xelthia/displacement.rsi - state: jumpsuit - copyToShaderParameters: - # Value required, provide a dummy. Gets overridden when applied. - layerKey: dummy - parameterTexture: displacementMap - parameterUV: displacementUV - mask: - layer: - sprite: _EE/Mobs/Species/Xelthia/displacement.rsi - state: jumpsuit - copyToShaderParameters: - # Value required, provide a dummy. Gets overridden when applied. - layerKey: dummy - parameterTexture: displacementMap - parameterUV: displacementUV - outerClothing: - layer: - sprite: _EE/Mobs/Species/Xelthia/displacement.rsi - state: jumpsuit - copyToShaderParameters: - # Value required, provide a dummy. Gets overridden when applied. - layerKey: dummy - parameterTexture: displacementMap - parameterUV: displacementUV - suitstorage: - layer: - sprite: _EE/Mobs/Species/Xelthia/displacement.rsi - state: jumpsuit - copyToShaderParameters: - # Value required, provide a dummy. Gets overridden when applied. - layerKey: dummy - parameterTexture: displacementMap - parameterUV: displacementUV - eyes: - layer: - sprite: _EE/Mobs/Species/Xelthia/displacement.rsi - state: jumpsuit - copyToShaderParameters: - # Value required, provide a dummy. Gets overridden when applied. - layerKey: dummy - parameterTexture: displacementMap - parameterUV: displacementUV - belt: - layer: - sprite: _EE/Mobs/Species/Xelthia/displacement.rsi - state: jumpsuit - copyToShaderParameters: - # Value required, provide a dummy. Gets overridden when applied. - layerKey: dummy - parameterTexture: displacementMap - parameterUV: displacementUV - back: - layer: - sprite: _EE/Mobs/Species/Xelthia/displacement.rsi - state: backpack - copyToShaderParameters: - # Value required, provide a dummy. Gets overridden when applied. - layerKey: dummy - parameterTexture: displacementMap - parameterUV: displacementUV diff --git a/Resources/Prototypes/_EE/Entities/Objects/Consumable/Food/meat.yml b/Resources/Prototypes/_EE/Entities/Objects/Consumable/Food/meat.yml deleted file mode 100644 index 74ee80cb4a3..00000000000 --- a/Resources/Prototypes/_EE/Entities/Objects/Consumable/Food/meat.yml +++ /dev/null @@ -1,61 +0,0 @@ - -- type: entity - name: xelthia tentacle - # bacon is cured so not raw = cant rot - parent: FoodMeatBase - id: FoodMeatXelthiaTentacle - description: A xelthia tentacle. Edible...? - components: - - type: Tag - tags: - - Raw - - Meat - - type: Sprite - sprite: _EE/Objects/Consumable/Food/meat.rsi - state: xelthia-tentacle - - type: SolutionContainerManager - solutions: - food: - reagents: - - ReagentId: Protein - Quantity: 5 - - ReagentId: Fat - Quantity: 5 - - type: InternalTemperature - thickness: 0.02 - area: 0.02 # arbitrary numbers - - type: SliceableFood - count: 3 - slice: FoodMeatCutlet - - type: Construction - graph: Xelthiarm - node: start - defaultTarget: xelthiarm - -- type: entity - name: xelthia calamari - parent: FoodMeatBase - id: FoodMeatXelthiaTentacleCooked - description: This was someone's arm at one point, but now it's some weird Calamari. They probably don't mind. - components: - - type: FlavorProfile - flavors: - - xelthia - - type: Tag - tags: - - Cooked - - Meat - - type: Sprite - sprite: _EE/Objects/Consumable/Food/meat.rsi - state: xelthia-tentacle-cooked - - type: SolutionContainerManager - solutions: - food: - reagents: - - ReagentId: Nutriment - Quantity: 5 - - ReagentId: Protein - Quantity: 5 - - type: Construction - graph: Xelthiarm - node: xelthiarm \ No newline at end of file diff --git a/Resources/Prototypes/_EE/Entities/Objects/Devices/translators.yml b/Resources/Prototypes/_EE/Entities/Objects/Devices/translators.yml deleted file mode 100644 index 467406f51cd..00000000000 --- a/Resources/Prototypes/_EE/Entities/Objects/Devices/translators.yml +++ /dev/null @@ -1,16 +0,0 @@ -- type: entity # needs to be properly added to research and all that. not sure how to do that. - id: QiilourTranslator - parent: [ TranslatorPoweredBase ] - name: Qiilour translator - description: Translates speech between Qiilour and Galactic Common. Useful for talking to Xelthia. - components: - - type: HandheldTranslator - spoken: - - TauCetiBasic - - Qiilour - understood: - - TauCetiBasic - - Qiilour - requires: - - TauCetiBasic - - Qiilour diff --git a/Resources/Prototypes/_EE/InventoryTemplates/xelthia_inventory_template.yml b/Resources/Prototypes/_EE/InventoryTemplates/xelthia_inventory_template.yml deleted file mode 100644 index d5cbdbf7383..00000000000 --- a/Resources/Prototypes/_EE/InventoryTemplates/xelthia_inventory_template.yml +++ /dev/null @@ -1,124 +0,0 @@ -#human but no gloves -- type: inventoryTemplate - id: xelthia - slots: - - name: shoes - slotTexture: shoes - slotFlags: FEET - stripTime: 3 - uiWindowPos: 1,0 - strippingWindowPos: 1,3 - displayName: Shoes - - name: jumpsuit - slotTexture: uniform - slotFlags: INNERCLOTHING - stripTime: 6 - uiWindowPos: 0,1 - strippingWindowPos: 0,2 - displayName: Jumpsuit - - name: outerClothing - slotTexture: suit - slotFlags: OUTERCLOTHING - stripTime: 6 - uiWindowPos: 1,1 - strippingWindowPos: 1,2 - displayName: Suit -# - name: gloves -# slotTexture: gloves -# slotFlags: GLOVES -# uiWindowPos: 2,1 -# strippingWindowPos: 2,2 -# displayName: Gloves - - name: neck - slotTexture: neck - slotFlags: NECK - uiWindowPos: 0,2 - strippingWindowPos: 0,1 - displayName: Neck - - name: mask - slotTexture: mask - slotFlags: MASK - uiWindowPos: 1,2 - strippingWindowPos: 1,1 - displayName: Mask - - name: eyes - slotTexture: glasses - slotFlags: EYES - stripTime: 3 - uiWindowPos: 0,3 - strippingWindowPos: 0,0 - displayName: Eyes - - name: ears - slotTexture: ears - slotFlags: EARS - stripTime: 3 - uiWindowPos: 2,2 - strippingWindowPos: 2,0 - displayName: Ears - - name: head - slotTexture: head - slotFlags: HEAD - uiWindowPos: 1,3 - strippingWindowPos: 1,0 - displayName: Head - - name: pocket1 - slotTexture: pocket - fullTextureName: template_small - slotFlags: POCKET - slotGroup: MainHotbar - stripTime: 3 - uiWindowPos: 0,3 - strippingWindowPos: 0,4 - dependsOn: jumpsuit - displayName: Pocket 1 - stripHidden: true - - name: pocket2 - slotTexture: pocket - fullTextureName: template_small - 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 - slotGroup: MainHotbar - stripTime: 3 - uiWindowPos: 2,0 - strippingWindowPos: 2,5 - dependsOn: outerClothing - dependsOnComponents: - - type: AllowSuitStorage - displayName: Suit Storage - - name: id - slotTexture: id - fullTextureName: template_small - slotFlags: IDCARD - slotGroup: SecondHotbar - stripTime: 6 - uiWindowPos: 2,1 - strippingWindowPos: 2,4 - dependsOn: jumpsuit - displayName: ID - - name: belt - slotTexture: belt - fullTextureName: template_small - slotFlags: BELT - slotGroup: SecondHotbar - stripTime: 6 - uiWindowPos: 3,1 - strippingWindowPos: 1,5 - displayName: Belt - - name: back - slotTexture: back - fullTextureName: template_small - slotFlags: BACK - slotGroup: SecondHotbar - stripTime: 6 - uiWindowPos: 3,0 - strippingWindowPos: 0,5 - displayName: Back diff --git a/Resources/Prototypes/_EE/Language/Species-Specific/xelthia.yml b/Resources/Prototypes/_EE/Language/Species-Specific/xelthia.yml deleted file mode 100644 index 98bd16044b1..00000000000 --- a/Resources/Prototypes/_EE/Language/Species-Specific/xelthia.yml +++ /dev/null @@ -1,119 +0,0 @@ -# Xelthia language -- type: language - id: Qiilour - isVisibleLanguage: true - speech: - color: "#65d9ff" - fontId: NovaFlat - obfuscation: - !type:SyllableObfuscation - minSyllables: 1 - maxSyllables: 3 - replacement: - - a - - ae - - ai - - aou - - bai - - be - - ber - - bii - - bli - - bou - - bu - - ce - - cii - - cin - - cy - - cyr - - dii - - durr - - dy - - ei - - eil - - fai - - fei - - fer - - fii - - fy - - gii - - gyi - - ii - - iiu - - in - - jei - - jii - - kii - - kou - - l - - lei - - li - - lii - - llei - - em - - mae - - me - - mel - - mii - - mou - - mu - - my - - en - - nae - - nii - - niie - - nu - - nu - - orou - - ou - - our - - pae - - pei - - pii - - iq - - qii - - qur - - ir - - rae - - rai - - rii - - roun - - ru - - sei - - sii - - sr - - suu - - ta - - tae - - tei - - thi - - tie - - tii - - tou - - tur - - tuu - - tyr - - ue - - uli - - uu - - vei - - vie - - vii - - wi - - wii - - xei - - xel - - xi - - xii - - xui - - xuu - - y - - yae - - yei - - yii - - yn - - yul - - az - - zar - - zii - - zu diff --git a/Resources/Prototypes/_EE/Reagents/biological.yml b/Resources/Prototypes/_EE/Reagents/biological.yml deleted file mode 100644 index 1dd3ea70464..00000000000 --- a/Resources/Prototypes/_EE/Reagents/biological.yml +++ /dev/null @@ -1,77 +0,0 @@ -- type: reagent - parent: Blood - id: AcidBlood - name: reagent-name-acid-blood - group: Biological - desc: reagent-desc-acid-blood - flavor: acid - color: "#00FF69" - recognizable: true - physicalDesc: reagent-physical-desc-strong-smelling - slippery: true - plantMetabolism: - - !type:PlantAdjustToxins - amount: 20 - - !type:PlantAdjustWeeds - amount: -4 - - !type:PlantAdjustHealth - amount: -8 - reactiveEffects: - Acidic: - methods: [ Touch ] - effects: - - !type:HealthChange - scaleByQuantity: true - ignoreResistances: false - damage: - types: - Caustic: 0.5 - - !type:Emote - emote: Scream - probability: 0.3 - metabolisms: - Poison: - metabolismRate : 3.00 # High damage, high metabolism rate. You need a lot of units to crit. Simulates acid burning through you fast. - effects: - - !type:HealthChange - damage: - types: - Caustic: 11.0 - - !type:PopupMessage - type: Local - visualType: Large - messages: [ "generic-reagent-effect-burning-insides" ] - probability: 0.33 - - !type:Emote - emote: Scream - probability: 0.3 -# conditions: # TODO: Figure out how to make this work properly, it doesnt seem like it wants to do anything when uncommented lol -# - !type:OrganType -# type: Xelthia -# shouldHave: false - -- type: reagent - id: XelthiaArmJuice - name: reagent-name-armjuice - group: Biological - desc: reagent-desc-armjuice - flavor: acid - color: "#00FF69" - physicalDesc: reagent-physical-desc-viscous - metabolisms: - Medicine: - effects: - - !type:SatiateThirst - factor: -4 - - !type:SatiateHunger - factor: -4 - - !type:HealthChange - conditions: - - !type:TotalDamage - max: 50 - damage: - groups: - Brute: -1.5 - types: - Heat: -0.4 - \ No newline at end of file diff --git a/Resources/Prototypes/_EE/Recipes/Construction/Graphs/food/steak.yml b/Resources/Prototypes/_EE/Recipes/Construction/Graphs/food/steak.yml deleted file mode 100644 index 7249dad05a0..00000000000 --- a/Resources/Prototypes/_EE/Recipes/Construction/Graphs/food/steak.yml +++ /dev/null @@ -1,15 +0,0 @@ -# Xelthia Arm "steak" -- type: constructionGraph - id: Xelthiarm - start: start - graph: - - node: start - edges: - - to: xelthiarm - completed: - - !type:PlaySound - sound: /Audio/Effects/sizzle.ogg - steps: - - minTemperature: 345 - - node: xelthiarm - entity: FoodMeatXelthiaTentacleCooked \ No newline at end of file diff --git a/Resources/Prototypes/_EE/Species/xelthia.yml b/Resources/Prototypes/_EE/Species/xelthia.yml deleted file mode 100644 index 7ad3f28edc9..00000000000 --- a/Resources/Prototypes/_EE/Species/xelthia.yml +++ /dev/null @@ -1,193 +0,0 @@ -- type: species - id: Xelthia - name: species-name-xelthia - roundStart: false - prototype: MobXelthia - sprites: MobXelthiaSprites - defaultSkinTone: "#56a2de" - markingLimits: MobXelthiaMarkingLimits - dollPrototype: MobXelthiaDummy - skinColoration: Hues - maleFirstNames: names_xelthia_first - femaleFirstNames: names_xelthia_first - lastNames: names_xelthia_last - minHeight: 0.7 - defaultHeight: 0.95 - maxHeight: 1.25 - minWidth: 0.65 - defaultWidth: 0.95 - maxWidth: 1.3 - -- type: speciesBaseSprites - id: MobXelthiaSprites - sprites: - Head: MobXelthiaHead - Face: MobHumanoidAnyMarking - Snout: MobHumanoidAnyMarking - Underwear: MobHumanoidAnyMarking - Undershirt: MobHumanoidAnyMarking - Chest: MobXelthiaTorso - HeadTop: MobHumanoidAnyMarking - HeadSide: MobHumanoidAnyMarking - Hair: MobHumanoidAnyMarking - Tail: MobHumanoidAnyMarking - Eyes: MobXelthiaEyes - LArm: MobXelthiaLArm - RArm: MobXelthiaRArm - LHand: MobXelthiaLHand - RHand: MobXelthiaRHand - LLeg: MobXelthiaLLeg - RLeg: MobXelthiaRLeg - LFoot: MobXelthiaLFoot - RFoot: MobXelthiaRFoot - -- type: humanoidBaseSprite - id: MobXelthiaEyes - baseSprite: - sprite: _EE/Mobs/Species/Xelthia/parts.rsi - state: eyes - -- type: markingPoints - id: MobXelthiaMarkingLimits - onlyWhitelisted: true - points: - Hair: - points: 1 - required: false - FacialHair: - points: 0 - required: false - Tail: - points: 1 - required: true - defaultMarkings: [ XelthiaTailNormal ] - Snout: - points: 1 - required: true - defaultMarkings: [ XelthiaEarsNormal ] - HeadTop: - points: 6 - required: false - HeadSide: - points: 6 - required: false - Chest: - points: 6 - required: false - Underwear: - points: 1 - required: false - Undershirt: - points: 1 - required: false - RightLeg: - points: 6 - required: false - RightFoot: - points: 6 - required: false - LeftLeg: - points: 6 - required: false - LeftFoot: - points: 6 - required: false - RightArm: - points: 6 - required: false - RightHand: - points: 6 - required: false - LeftArm: - points: 6 - required: false - LeftHand: - points: 6 - required: false - Overlay: - points: 1 - required: true - defaultMarkings: [ XelthiaBackspikes ] -- type: humanoidBaseSprite - id: MobXelthiaHead - baseSprite: - sprite: _EE/Mobs/Species/Xelthia/parts.rsi - state: head_m - -- type: humanoidBaseSprite - id: MobXelthiaHeadMale - baseSprite: - sprite: _EE/Mobs/Species/Xelthia/parts.rsi - state: head_m - -- type: humanoidBaseSprite - id: MobXelthiaHeadFemale - baseSprite: - sprite: _EE/Mobs/Species/Xelthia/parts.rsi - state: head_f - -- type: humanoidBaseSprite - id: MobXelthiaTorso - baseSprite: - sprite: _EE/Mobs/Species/Xelthia/parts.rsi - state: torso_m - -- type: humanoidBaseSprite - id: MobXelthiaTorsoMale - baseSprite: - sprite: _EE/Mobs/Species/Xelthia/parts.rsi - state: torso_m - -- type: humanoidBaseSprite - id: MobXelthiaTorsoFemale - baseSprite: - sprite: _EE/Mobs/Species/Xelthia/parts.rsi - state: torso_f - -- type: humanoidBaseSprite - id: MobXelthiaLLeg - baseSprite: - sprite: _EE/Mobs/Species/Xelthia/parts.rsi - state: l_leg - -- type: humanoidBaseSprite - id: MobXelthiaLHand - baseSprite: - sprite: _EE/Mobs/Species/Xelthia/parts.rsi - state: l_hand - -- type: humanoidBaseSprite - id: MobXelthiaLArm - baseSprite: - sprite: _EE/Mobs/Species/Xelthia/parts.rsi - state: l_arm - -- type: humanoidBaseSprite - id: MobXelthiaLFoot - baseSprite: - sprite: _EE/Mobs/Species/Xelthia/parts.rsi - state: l_foot - -- type: humanoidBaseSprite - id: MobXelthiaRLeg - baseSprite: - sprite: _EE/Mobs/Species/Xelthia/parts.rsi - state: r_leg - -- type: humanoidBaseSprite - id: MobXelthiaRHand - baseSprite: - sprite: _EE/Mobs/Species/Xelthia/parts.rsi - state: r_hand - -- type: humanoidBaseSprite - id: MobXelthiaRArm - baseSprite: - sprite: _EE/Mobs/Species/Xelthia/parts.rsi - state: r_arm - -- type: humanoidBaseSprite - id: MobXelthiaRFoot - baseSprite: - sprite: _EE/Mobs/Species/Xelthia/parts.rsi - state: r_foot diff --git a/Resources/Prototypes/_EE/Voice/speech_emote_sounds.yml b/Resources/Prototypes/_EE/Voice/speech_emote_sounds.yml deleted file mode 100644 index c2309b0ae2c..00000000000 --- a/Resources/Prototypes/_EE/Voice/speech_emote_sounds.yml +++ /dev/null @@ -1,36 +0,0 @@ -# species -- type: emoteSounds - id: UnisexXelthia - params: - variation: 0.125 - sounds: - Scream: - path: /Audio/_EE/Voice/Xelthia/scream.ogg - Laugh: - path: /Audio/_EE/Voice/Xelthia/laugh.ogg - Sneeze: - path: /Audio/_EE/Voice/Xelthia/sneeze.ogg - Cough: - path: /Audio/_EE/Voice/Xelthia/cough.ogg - CatMeow: - collection: CatMeows - CatHisses: - collection: CatHisses - MonkeyScreeches: - collection: MonkeyScreeches - RobotBeep: - collection: RobotBeeps - Yawn: - collection: MaleYawn - Snore: - collection: Snores - Honk: - collection: BikeHorn - Sigh: - collection: MaleSigh - Crying: - path: /Audio/_EE/Voice/Xelthia/cry.ogg - Whistle: - collection: Whistles - Weh: - collection: Weh \ No newline at end of file diff --git a/Resources/Prototypes/_EE/Voice/speech_sounds.yml b/Resources/Prototypes/_EE/Voice/speech_sounds.yml index 54accc90df0..cbd12f3687d 100644 --- a/Resources/Prototypes/_EE/Voice/speech_sounds.yml +++ b/Resources/Prototypes/_EE/Voice/speech_sounds.yml @@ -37,12 +37,3 @@ path: /Audio/_EE/Supermatter/status/bloblarm.ogg exclaimSound: path: /Audio/_EE/Supermatter/status/bloblarm.ogg - -- type: speechSounds - id: Xelthia - saySound: - path: /Audio/_EE/Voice/Xelthia/say.ogg - askSound: - path: /Audio/_EE/Voice/Xelthia/ask.ogg - exclaimSound: - path: /Audio/_EE/Voice/Xelthia/exclaim.ogg diff --git a/Resources/Prototypes/_EE/Voice/speech_verbs.yml b/Resources/Prototypes/_EE/Voice/speech_verbs.yml index 51c62394849..72373bd99fd 100644 --- a/Resources/Prototypes/_EE/Voice/speech_verbs.yml +++ b/Resources/Prototypes/_EE/Voice/speech_verbs.yml @@ -3,9 +3,3 @@ name: chat-speech-verb-name-supermatter speechVerbStrings: - chat-speech-verb-supermatter - -- type: speechVerb - id: Xelthia - name: chat-speech-verb-name-xelthia - speechVerbStrings: - - chat-speech-verb-default diff --git a/Resources/Prototypes/_EE/tags.yml b/Resources/Prototypes/_EE/tags.yml index 2c9ebc58f5a..9b6581f4022 100644 --- a/Resources/Prototypes/_EE/tags.yml +++ b/Resources/Prototypes/_EE/tags.yml @@ -1,5 +1,3 @@ - type: Tag id: Medipen -- type: Tag - id: InsulatedJacket diff --git a/Resources/Prototypes/_EE/typing_indicator.yml b/Resources/Prototypes/_EE/typing_indicator.yml deleted file mode 100644 index 9bf191bb1f0..00000000000 --- a/Resources/Prototypes/_EE/typing_indicator.yml +++ /dev/null @@ -1,5 +0,0 @@ -- type: typingIndicator - id: xelthia - spritePath: /Textures/_EE/Effects/speech.rsi - typingState: xelthia0 - offset: 0, 0.2 \ No newline at end of file diff --git a/Resources/Prototypes/_Impstation/Actions/spelfs.yml b/Resources/Prototypes/_Impstation/Actions/spelfs.yml deleted file mode 100644 index 2e3dfa82183..00000000000 --- a/Resources/Prototypes/_Impstation/Actions/spelfs.yml +++ /dev/null @@ -1,14 +0,0 @@ -- type: entity - id: ActionViewMoods - name: View Moods - description: View your current moods. - components: - - type: InstantAction - itemIconStyle: NoItem - checkCanInteract: false - checkConsciousness: false - icon: - sprite: Interface/Actions/actions_borg.rsi - state: state-laws - event: !type:ToggleMoodsScreenEvent - useDelay: 0.5 diff --git a/Resources/Prototypes/_Impstation/Body/Organs/thaven.yml b/Resources/Prototypes/_Impstation/Body/Organs/thaven.yml deleted file mode 100644 index f8c91affa37..00000000000 --- a/Resources/Prototypes/_Impstation/Body/Organs/thaven.yml +++ /dev/null @@ -1,9 +0,0 @@ -- type: entity - id: OrganThavenBrain - parent: [BaseItem, OrganHumanBrain] - name: thaven brain - description: "An organic positronic brain. Quite remarkable, really." - components: - - type: Sprite - sprite: _Impstation/Mobs/Species/Thaven/organs.rsi - state: brain-thaven diff --git a/Resources/Prototypes/_Impstation/Body/Parts/thaven.yml b/Resources/Prototypes/_Impstation/Body/Parts/thaven.yml deleted file mode 100644 index c297575f8e5..00000000000 --- a/Resources/Prototypes/_Impstation/Body/Parts/thaven.yml +++ /dev/null @@ -1,90 +0,0 @@ -- type: entity - id: PartThaven - parent: [BaseItem, BasePart] - name: "thaven body part" - abstract: true - components: - - type: Sprite # Shitmed Change - sprite: _Impstation/Mobs/Species/Thaven/parts.rsi - - type: BodyPart # Shitmed Change - species: Thaven - -- type: entity - id: TorsoThaven - name: "thaven torso" - parent: [PartThaven, BaseTorso] - components: - - type: Sprite - state: "torso_m" - -- type: entity - id: HeadThaven - name: "thaven head" - parent: [PartThaven, BaseHead] - components: - - type: Sprite - state: "head" - -- type: entity - id: LeftArmThaven - name: "left thaven arm" - parent: [PartThaven, BaseLeftArm] - components: - - type: Sprite - state: "l_arm" - -- type: entity - id: RightArmThaven - name: "right thaven arm" - parent: [PartThaven, BaseRightArm] - components: - - type: Sprite - state: "r_arm" - -- type: entity - id: LeftHandThaven - name: "left thaven hand" - parent: [PartThaven, BaseLeftHand] - components: - - type: Sprite - state: "l_hand" - -- type: entity - id: RightHandThaven - name: "right thaven hand" - parent: [PartThaven, BaseRightHand] - components: - - type: Sprite - state: "r_hand" - -- type: entity - id: LeftLegThaven - name: "left thaven leg" - parent: [PartThaven, BaseLeftLeg] - components: - - type: Sprite - state: "l_leg" - -- type: entity - id: RightLegThaven - name: "right thaven leg" - parent: [PartThaven, BaseRightLeg] - components: - - type: Sprite - state: "r_leg" - -- type: entity - id: LeftFootThaven - name: "left thaven foot" - parent: [PartThaven, BaseLeftFoot] - components: - - type: Sprite - state: "l_foot" - -- type: entity - id: RightFootThaven - name: "right thaven foot" - parent: [PartThaven, BaseRightFoot] - components: - - type: Sprite - state: "r_foot" diff --git a/Resources/Prototypes/_Impstation/Body/Prototypes/thaven.yml b/Resources/Prototypes/_Impstation/Body/Prototypes/thaven.yml deleted file mode 100644 index e0541b691f1..00000000000 --- a/Resources/Prototypes/_Impstation/Body/Prototypes/thaven.yml +++ /dev/null @@ -1,50 +0,0 @@ -- type: body - id: Thaven - name: "thaven" - root: torso - slots: - head: - part: HeadThaven - connections: - - torso - organs: - brain: OrganThavenBrain - eyes: OrganHumanEyes - torso: - part: TorsoThaven - connections: - - right arm - - left arm - - right leg - - left leg - - head # Shitmed Change - organs: - heart: OrganHumanHeart - lungs: OrganHumanLungs - stomach: OrganHumanStomach - liver: OrganHumanLiver - kidneys: OrganHumanKidneys - right arm: - part: RightArmThaven - connections: - - right hand - left arm: - part: LeftArmThaven - connections: - - left hand - right hand: - part: RightHandThaven - left hand: - part: LeftHandThaven - right leg: - part: RightLegThaven - connections: - - right foot - left leg: - part: LeftLegThaven - connections: - - left foot - right foot: - part: RightFootThaven - left foot: - part: LeftFootThaven diff --git a/Resources/Prototypes/_Impstation/Damage/thaven.yml b/Resources/Prototypes/_Impstation/Damage/thaven.yml deleted file mode 100644 index 999e89f6044..00000000000 --- a/Resources/Prototypes/_Impstation/Damage/thaven.yml +++ /dev/null @@ -1,11 +0,0 @@ -- type: damageModifierSet - id: Thaven - coefficients: - Blunt: 1.1 - Slash: 1.1 - Piercing: 1.1 - Cold: .9 - Heat: .9 - Poison: .9 - Cellular: 1.1 - Radiation: 1.2 diff --git a/Resources/Prototypes/_Impstation/Datasets/Names/thaven.yml b/Resources/Prototypes/_Impstation/Datasets/Names/thaven.yml deleted file mode 100644 index 03ff6312734..00000000000 --- a/Resources/Prototypes/_Impstation/Datasets/Names/thaven.yml +++ /dev/null @@ -1,79 +0,0 @@ -- type: dataset - id: names_thaven - values: - - Honesty - - Have Mercy - - Give Thanks To Thine Ancestors - - Obedience - - Search The Scriptures - - Learn Many Things - - Praise The Gods - - Fear Be Unto The Gods - - Joy In Sorrow - - Die Well - - Wander Far And Wide - - Lament The Fallen - - Prove Thy Worth - - Desire - - Charity - - Faith - - Harmony - - Modesty - - Honor Thy Family - - Patient As The Dead - - Temper Thy Heart And Soul - - Tell Only The Truth - - Thou Art Loved - - Thou Art Damned - - Aid The Righteous - - Be Courteous - - Make Peace - - Fear The Gods - - Forsake Alcohol - - Fight Evil At All Costs - - Shun The Unworthy - - Gain Wisdom Through Experience - - Live Well And Die Young - - Face Trials And Tribulations - - Pardon Worthy Criminals - - Find Merit In All Things - - Deny Sin Its Due - - Stand Fast Against Evil - - Do As The Gods Will - - Zeal Of The Land - - Be Courteous To Others - - Considerate - - Discipline - - Do Right By Your Neighbors - - Serve Your Purpose - - Good Things Come - - Magnify Injustice - - Legitimate First - - Take Pity On The Less-Fortunate - - Redeem Thy Past Mistakes - - Rejoice - - Repent All Ye Sinners - - Return To Thy Homeland - - Deliverance - - See Truth - - Drink Full And Descend - - Do Thy Best - - Live The Day Like Thy Last - - Adaptability - - Endurance - - Negativity - - Attentiveness - - Foppishness - - One Before All - - Purpose - - Simplicity - - Minimalism - - Proselytism - - Conformity - - The Perils of Hedonism - - Volition - - Gumption - - Providence - - Righteousness - - Wisdom - - Cunning diff --git a/Resources/Prototypes/_Impstation/Entities/Consumable/Food/meat.yml b/Resources/Prototypes/_Impstation/Entities/Consumable/Food/meat.yml deleted file mode 100644 index fa5792deecc..00000000000 --- a/Resources/Prototypes/_Impstation/Entities/Consumable/Food/meat.yml +++ /dev/null @@ -1,27 +0,0 @@ -- type: entity - name: raw thaven fillet - parent: FoodMeatBase - # MeatFish?... - id: FoodThavenMeat - description: Concerning. - components: - - type: FlavorProfile - flavors: - - fishy - - type: Tag - tags: - - Raw - - Meat - - type: Sprite - state: fish - - type: SolutionContainerManager - solutions: - food: - reagents: - - ReagentId: CarpoToxin - Quantity: 5 - - type: Extractable - juiceSolution: - reagents: - - ReagentId: CarpoToxin - Quantity: 5 \ No newline at end of file diff --git a/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/misc.yml b/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/misc.yml index 2d8c4bcf102..eaf1e91f6b5 100644 --- a/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/misc.yml +++ b/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/misc.yml @@ -817,252 +817,3 @@ sprites: - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi state: vitiligolegl - -- type: marking - id: ChitinidBeetleHorn1 - bodyPart: HeadTop - markingCategory: HeadTop - speciesRestriction: [Chitinid] - forcedColoring: true - followSkinColor: true - sprites: - - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi - state: chitinidbeetlehorn1 - -- type: marking - id: ChitinidBeetleHorn2 - bodyPart: HeadTop - markingCategory: HeadTop - speciesRestriction: [Chitinid] - forcedColoring: true - followSkinColor: true - sprites: - - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi - state: chitinidbeetlehorn2 - -- type: marking - id: Gills - bodyPart: Chest - markingCategory: Chest - speciesRestriction: [ Thaven ] - forcedColoring: false - followSkinColor: false - sprites: - - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi - state: thavenchestgills - -- type: marking - id: ThavenChestScales - bodyPart: Chest - markingCategory: Chest - speciesRestriction: [ Thaven ] - forcedColoring: false - followSkinColor: false - sprites: - - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi - state: thavenchestscales - -- type: marking - id: ThavenHeadScales - bodyPart: Head - markingCategory: HeadTop - speciesRestriction: [ Thaven ] - forcedColoring: false - followSkinColor: false - sprites: - - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi - state: thavenheadscales - -- type: marking - id: ThavenLArmScales - bodyPart: LArm - markingCategory: LeftArm - speciesRestriction: [ Thaven ] - forcedColoring: false - followSkinColor: false - sprites: - - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi - state: thavenleftarmscales - -- type: marking - id: ThavenRArmScales - bodyPart: RArm - markingCategory: RightArm - speciesRestriction: [ Thaven ] - forcedColoring: false - followSkinColor: false - sprites: - - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi - state: thavenrightarmscales - -- type: marking - id: ThavenLLegScales - bodyPart: LLeg - markingCategory: LeftLeg - speciesRestriction: [ Thaven ] - forcedColoring: false - followSkinColor: false - sprites: - - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi - state: thavenleftlegscales - -- type: marking - id: ThavenRLegScales - bodyPart: RLeg - markingCategory: RightLeg - speciesRestriction: [ Thaven ] - forcedColoring: false - followSkinColor: false - sprites: - - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi - state: thavenrightlegscales - -- type: marking - id: ThavenFishEars - bodyPart: HeadSide - markingCategory: Headside - speciesRestriction: [ Thaven ] - forcedColoring: true - followSkinColor: true - sprites: - - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi - state: thavenfishears - -- type: marking - id: ThavenTattooVines - bodyPart: Chest - markingCategory: Chest - speciesRestriction: [ Thaven ] - forcedColoring: false - followSkinColor: false - sprites: - - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi - state: thaventattoovines - -- type: marking - id: ThavenSpines - bodyPart: Chest - markingCategory: Chest - speciesRestriction: [ Thaven ] - forcedColoring: false - followSkinColor: false - sprites: - - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi - state: thavenspines - -- type: marking - id: ThavenBiteMark - bodyPart: Chest - markingCategory: Chest - speciesRestriction: [ Thaven ] - forcedColoring: false - followSkinColor: false - sprites: - - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi - state: thavenbitemark - -- type: marking - id: ThavenTattooWave - bodyPart: Chest - markingCategory: Chest - speciesRestriction: [ Thaven ] - forcedColoring: false - followSkinColor: false - sprites: - - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi - state: thaventattoowave - -- type: marking - id: SharkminnowEyeliner - bodyPart: HeadTop - markingCategory: HeadTop - speciesRestriction: [ Thaven ] - forcedColoring: false - followSkinColor: false - sprites: - - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi - state: thaventattoosharkminnoweyeliner - -- type: marking - id: ThavenTiger - bodyPart: Chest - markingCategory: Chest - speciesRestriction: [ Thaven ] - forcedColoring: false - followSkinColor: false - sprites: - - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi - state: thaventiger1 - - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi - state: thaventiger2 - -- type: marking - id: ThavenTigerRArm - bodyPart: RArm - markingCategory: RightArm - speciesRestriction: [ Thaven ] - forcedColoring: false - followSkinColor: false - sprites: - - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi - state: thaventigerarmsr - -- type: marking - id: ThavenTigerLArm - bodyPart: LArm - markingCategory: LeftArm - speciesRestriction: [ Thaven ] - forcedColoring: false - followSkinColor: false - sprites: - - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi - state: thaventigerarmsl - -- type: marking - id: ThavenHeadStripes - bodyPart: Head - markingCategory: Head - speciesRestriction: [ Thaven ] - forcedColoring: false - followSkinColor: false - sprites: - - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi - state: thavenheadstripes - -- type: marking - id: ThavenBodyStripes - bodyPart: Chest - markingCategory: Chest - speciesRestriction: [ Thaven ] - forcedColoring: false - followSkinColor: false - sprites: - - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi - state: thavenbodystripes - -- type: marking - id: ThavenEarsBigFins - bodyPart: HeadSide - markingCategory: HeadSide - speciesRestriction: [ Thaven ] - forcedColoring: false - followSkinColor: false - sprites: - - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi - state: thavenearsbigfins - - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi - state: thavenearsbigfins2 - -- type: marking - id: ThavenHeadCap - bodyPart: Head - markingCategory: Head - speciesRestriction: [ Thaven ] - forcedColoring: false - followSkinColor: false - sprites: - - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi - state: thavenheadcap1 - - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi - state: thavenheadcap2 - diff --git a/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/thaven.yml b/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/thaven.yml deleted file mode 100644 index bdf07d3c67a..00000000000 --- a/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/thaven.yml +++ /dev/null @@ -1,107 +0,0 @@ -- type: marking - id: ThavenEars1 - bodyPart: HeadSide - markingCategory: HeadSide - speciesRestriction: [Thaven] - forcedColoring: true - followSkinColor: true - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven.rsi - state: ears1 - -- type: marking - id: ThavenEars2 - bodyPart: HeadSide - markingCategory: HeadSide - speciesRestriction: [Thaven] - forcedColoring: true - followSkinColor: true - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven.rsi - state: ears2 - -- type: marking - id: ThavenEars3 - bodyPart: HeadSide - markingCategory: HeadSide - speciesRestriction: [Thaven] - forcedColoring: true - followSkinColor: true - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven.rsi - state: ears3 - -- type: marking - id: ThavenEars4 - bodyPart: HeadSide - markingCategory: HeadSide - speciesRestriction: [Thaven] - forcedColoring: true - followSkinColor: true - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven.rsi - state: ears4 - -- type: marking - id: ThavenPiercings - bodyPart: HeadTop - markingCategory: HeadTop - speciesRestriction: [Thaven] - forcedColoring: false - followSkinColor: false - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven.rsi - state: piercings - -- type: marking - id: ThavenPiercings2 - bodyPart: HeadTop - markingCategory: HeadTop - speciesRestriction: [Thaven] - forcedColoring: false - followSkinColor: false - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven.rsi - state: piercings2 - -- type: marking - id: ThavenChestTattoo1 - bodyPart: Chest - markingCategory: Chest - speciesRestriction: [Thaven] - coloring: - default: - type: - !type:TattooColoring - fallbackColor: "#666666" - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven.rsi - state: chesttat1 - -- type: marking - id: ThavenLArmTattoo1 - bodyPart: LArm - markingCategory: LeftArm - speciesRestriction: [Thaven] - coloring: - default: - type: - !type:TattooColoring - fallbackColor: "#666666" - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven.rsi - state: larmtat1 - -- type: marking - id: ThavenRArmTattoo1 - bodyPart: RArm - markingCategory: RightArm - speciesRestriction: [Thaven] - coloring: - default: - type: - !type:TattooColoring - fallbackColor: "#666666" - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven.rsi - state: rarmtat1 diff --git a/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/thaven_hair.yml b/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/thaven_hair.yml deleted file mode 100644 index a62cf63c5cd..00000000000 --- a/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/thaven_hair.yml +++ /dev/null @@ -1,1496 +0,0 @@ -- type: marking - id: ThavenHairBalding - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: e -- type: marking - id: ThavenHairBedhead - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: bedhead -- type: marking - id: ThavenHairBedheadv2 - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: bedhead2 -- type: marking - id: ThavenHairBedheadv3 - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: bedhead3 -- type: marking - id: ThavenHairLongBedhead - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: long_bedhead -- type: marking - id: ThavenHairLongBedhead2 - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: long_bedhead2 -- type: marking - id: ThavenHairFloorlengthBedhead - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: floorlength_bedhead -- type: marking - id: ThavenHairBeehive - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: beehive -- type: marking - id: ThavenHairBeehive2 - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: beehive2 -- type: marking - id: ThavenHairBob - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: bob -- type: marking - id: ThavenHairBob2 - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: bob2 -- type: marking - id: ThavenHairBobcut - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: bobcut -- type: marking - id: ThavenHairBob4 - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: bob4 -- type: marking - id: ThavenHairBob5 - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: bob5 -- type: marking - id: ThavenHairBobcurl - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: bobcurl -- type: marking - id: ThavenHairBowlcut - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: bowlcut -- type: marking - id: ThavenHairBowlcut2 - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: bowlcut2 -- type: marking - id: ThavenHairBraid - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: braid -- type: marking - id: ThavenHairBraided - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: braided -- type: marking - id: ThavenHairBraidfront - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: braidfront -- type: marking - id: ThavenHairBraid2 - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: braid2 -- type: marking - id: ThavenHairHbraid - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: hbraid -- type: marking - id: ThavenHairShortbraid - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: shortbraid -- type: marking - id: ThavenHairBraidtail - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: braidtail -- type: marking - id: ThavenHairBun - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: bun -- type: marking - id: ThavenHairBunhead2 - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: bunhead2 -- type: marking - id: ThavenHairBun3 - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: bun3 -- type: marking - id: ThavenHairLargebun - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: largebun -- type: marking - id: ThavenHairManbun - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: manbun -- type: marking - id: ThavenHairTightbun - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: tightbun -- type: marking - id: ThavenHairBusiness - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: business -- type: marking - id: ThavenHairBusiness2 - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: business2 -- type: marking - id: ThavenHairBusiness3 - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: business3 -- type: marking - id: ThavenHairBusiness4 - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: business4 -- type: marking - id: ThavenHairBuzzcut - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: buzzcut -- type: marking - id: ThavenHairCia - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: cia -- type: marking - id: ThavenHairClassicCia - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: classiccia -- type: marking - id: ThavenHairClassicFloorlengthBedhead - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: classicfloorlength_bedhead -- type: marking - id: ThavenHairClassicModern - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: classicmodern -- type: marking - id: ThavenHairClassicMulder - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: classicmulder -- type: marking - id: ThavenHairClassicWisp - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: classicwisp -- type: marking - id: ThavenHairCombover - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: combover -- type: marking - id: ThavenHairCornrows - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: cornrows -- type: marking - id: ThavenHairCornrows2 - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: cornrows2 -- type: marking - id: ThavenHairCornrowbun - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: cornrowbun -- type: marking - id: ThavenHairCornrowbraid - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: cornrowbraid -- type: marking - id: ThavenHairCornrowtail - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: cornrowtail -- type: marking - id: ThavenHairCrewcut - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: crewcut -- type: marking - id: ThavenHairCrewcut2 - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: crewcut2 -- type: marking - id: ThavenHairCurls - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: curls -- type: marking - id: ThavenHairC - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: c -- type: marking - id: ThavenHairDandypompadour - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: dandypompadour -- type: marking - id: ThavenHairDevilock - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: devilock -- type: marking - id: ThavenHairDoublebun - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: doublebun -- type: marking - id: ThavenHairDoublebunLong - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: doublebun_long -- type: marking - id: ThavenHairDreads - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: dreads -- type: marking - id: ThavenHairDrillruru - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: drillruru -- type: marking - id: ThavenHairDrillhairextended - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: drillhairextended -- type: marking - id: ThavenHairEmofringe - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: emofringe -- type: marking - id: ThavenHairNofade - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: nofade -- type: marking - id: ThavenHairHighfade - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: highfade -- type: marking - id: ThavenHairMedfade - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: medfade -- type: marking - id: ThavenHairLowfade - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: lowfade -- type: marking - id: ThavenHairBaldfade - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: baldface -- type: marking - id: ThavenHairFeather - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: feather -- type: marking - id: ThavenHairFather - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: father -- type: marking - id: ThavenHairSargeant - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: sargeant -- type: marking - id: ThavenHairFlair - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: flair -- type: marking - id: ThavenHairBigflattop - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: bigflattop -- type: marking - id: ThavenHairFlow - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: f -- type: marking - id: ThavenHairGelled - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: gelled -- type: marking - id: ThavenHairGentle - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: gentle -- type: marking - id: ThavenHairHalfbang - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: halfbang -- type: marking - id: ThavenHairHalfbang2 - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: halfbang2 -- type: marking - id: ThavenHairHalfshaved - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: halfshaved -- type: marking - id: ThavenHairHedgehog - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: hedgehog -- type: marking - id: ThavenHairHimecut - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: himecut -- type: marking - id: ThavenHairHimecut2 - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: himecut2 -- type: marking - id: ThavenHairShorthime - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: shorthime -- type: marking - id: ThavenHairHimeup - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: himeup -- type: marking - id: ThavenHairHitop - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: hitop -- type: marking - id: ThavenHairJade - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: jade -- type: marking - id: ThavenHairJensen - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: jensen -- type: marking - id: ThavenHairJoestar - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: joestar -- type: marking - id: ThavenHairKeanu - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: keanu -- type: marking - id: ThavenHairKusanagi - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: kusanagi -- type: marking - id: ThavenHairLong - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: long -- type: marking - id: ThavenHairLong2 - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: long2 -- type: marking - id: ThavenHairLong3 - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: long3 -- type: marking - id: ThavenHairLongWithBundles - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: longbundled -- type: marking - id: ThavenHairLongovereye - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: longovereye -- type: marking - id: ThavenHairLbangs - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: lbangs -- type: marking - id: ThavenHairLongeremo - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: longeremo -- type: marking - id: ThavenHairLongfringe - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: longfringe -- type: marking - id: ThavenHairLongsidepart - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: longsidepart -- type: marking - id: ThavenHairMegaeyebrows - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: megaeyebrows -- type: marking - id: ThavenHairMessy - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: messy -- type: marking - id: ThavenHairModern - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: modern -- type: marking - id: ThavenHairMohawk - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: d -- type: marking - id: ThavenHairNitori - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: nitori -- type: marking - id: ThavenHairReversemohawk - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: reversemohawk -- type: marking - id: ThavenHairMulder - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: mulder -- type: marking - id: ThavenHairOdango - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: odango -- type: marking - id: ThavenHairOmbre - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: ombre -- type: marking - id: ThavenHairOneshoulder - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: oneshoulder -- type: marking - id: ThavenHairShortovereye - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: shortovereye -- type: marking - id: ThavenHairOxton - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: oxton -- type: marking - id: ThavenHairParted - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: parted -- type: marking - id: ThavenHairPart - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: part -- type: marking - id: ThavenHairKagami - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: kagami -- type: marking - id: ThavenHairPigtails - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: pigtails -- type: marking - id: ThavenHairPigtails2 - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: pigtails2 -- type: marking - id: ThavenHairPixie - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: pixie -- type: marking - id: ThavenHairPompadour - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: pompadour -- type: marking - id: ThavenHairBigpompadour - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: bigpompadour -- type: marking - id: ThavenHairPonytail - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: ponytail -- type: marking - id: ThavenHairPonytail2 - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: ponytail2 -- type: marking - id: ThavenHairPonytail3 - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: ponytail3 -- type: marking - id: ThavenHairPonytail4 - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: ponytail4 -- type: marking - id: ThavenHairPonytail5 - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: ponytail5 -- type: marking - id: ThavenHairPonytail6 - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: ponytail6 -- type: marking - id: ThavenHairPonytail7 - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: ponytail7 -- type: marking - id: ThavenHairHighponytail - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: highponytail -- type: marking - id: ThavenHairStail - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: stail -- type: marking - id: ThavenHairLongstraightponytail - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: longstraightponytail -- type: marking - id: ThavenHairCountry - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: country -- type: marking - id: ThavenHairFringetail - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: fringetail -- type: marking - id: ThavenHairSidetail - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: sidetail -- type: marking - id: ThavenHairSidetail2 - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: sidetail2 -- type: marking - id: ThavenHairSidetail3 - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: sidetail3 -- type: marking - id: ThavenHairSidetail4 - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: sidetail4 -- type: marking - id: ThavenHairSpikyponytail - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: spikyponytail -- type: marking - id: ThavenHairPoofy - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: poofy -- type: marking - id: ThavenHairQuiff - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: quiff -- type: marking - id: ThavenHairRonin - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: ronin -- type: marking - id: ThavenHairShaved - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: shaved -- type: marking - id: ThavenHairShavedpart - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: shavedpart -- type: marking - id: ThavenHairShortbangs - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: shortbangs -- type: marking - id: ThavenHairA - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: a -- type: marking - id: ThavenHairShorthair2 - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: shorthair2 -- type: marking - id: ThavenHairShorthair3 - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: shorthair3 -- type: marking - id: ThavenHairShorthair9 - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: shorthair9 -- type: marking - id: ThavenHair80s - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: 80s -- type: marking - id: ThavenHairRosa - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: rosa -- type: marking - id: ThavenHairB - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: b -- type: marking - id: ThavenHairSidecut - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: sidecut -- type: marking - id: ThavenHairSkinhead - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: skinhead -- type: marking - id: ThavenHairProtagonist - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: protagonist -- type: marking - id: ThavenHairSpiky - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: spiky -- type: marking - id: ThavenHairSpookyLong - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: spookylong -- type: marking - id: ThavenHairSwept - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: swept -- type: marking - id: ThavenHairSwept2 - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: swept2 -- type: marking - id: ThavenHairShoulderLengthOverEye - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: shoulderlengthovereye -- type: marking - id: ThavenHairThinning - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: thinning -- type: marking - id: ThavenHairThinningfront - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: thinningfront -- type: marking - id: ThavenHairThinningrear - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: thinningrear -- type: marking - id: ThavenHairTopknot - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: topknot -- type: marking - id: ThavenHairTressshoulder - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: tressshoulder -- type: marking - id: ThavenHairTrimmed - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: trimmed -- type: marking - id: ThavenHairTrimflat - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: trimflat -- type: marking - id: ThavenHairTwintail - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: twintail -- type: marking - id: ThavenHairTwoStrands - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: twostrands -- type: marking - id: ThavenHairUndercut - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: undercut -- type: marking - id: ThavenHairUndercutleft - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: undercutleft -- type: marking - id: ThavenHairUndercutright - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: undercutright -- type: marking - id: ThavenHairUnkept - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: unkept -- type: marking - id: ThavenHairVlong - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: vlong -- type: marking - id: ThavenHairLongest - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: longest -- type: marking - id: ThavenHairLongest2 - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: longest2 -- type: marking - id: ThavenHairVeryshortovereyealternate - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: veryshortovereyealternate -- type: marking - id: ThavenHairVlongfringe - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: vlongfringe -- type: marking - id: ThavenHairVolaju - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: volaju -- type: marking - id: ThavenHairWisp - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: wisp -- type: marking - id: ThavenHairUneven - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: uneven -- type: marking - id: ThavenHairTailed - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: tailed -- type: marking - id: ThavenHairClassicLong2 - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: classiclong2 -- type: marking - id: ThavenHairClassicLong3 - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: classiclong3 -- type: marking - id: ThavenHairBald - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: bald -- type: marking - id: ThavenHairShavedMohawk - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: shavedmohawk -- type: marking - id: ThavenHairMediumSidepart - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: mediumsidepart -- type: marking - id: ThavenHairEmo2 - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: emo2 -- type: marking - id: ThavenHairDrillHair - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: drillhair -- type: marking - id: ThavenHairClassicAfro - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: classicafro -- type: marking - id: ThavenHairClassicciaBusiness - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: classicciabusiness -- type: marking - id: ThavenHairClassicCornrows - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: classiccornrows -- type: marking - id: ThavenHairCoffeeHouse - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: coffeehouse -- type: marking - id: ThavenHairFrenchbraid - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [Thaven] - sprites: - - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi - state: frenchbraid diff --git a/Resources/Prototypes/_Impstation/Entities/Mobs/Player/thaven.yml b/Resources/Prototypes/_Impstation/Entities/Mobs/Player/thaven.yml deleted file mode 100644 index 76648e96f20..00000000000 --- a/Resources/Prototypes/_Impstation/Entities/Mobs/Player/thaven.yml +++ /dev/null @@ -1,5 +0,0 @@ -- type: entity - save: false - name: Urist McEars - parent: BaseMobThaven - id: MobThaven diff --git a/Resources/Prototypes/_Impstation/Entities/Mobs/Species/thaven.yml b/Resources/Prototypes/_Impstation/Entities/Mobs/Species/thaven.yml deleted file mode 100644 index c317f82f528..00000000000 --- a/Resources/Prototypes/_Impstation/Entities/Mobs/Species/thaven.yml +++ /dev/null @@ -1,228 +0,0 @@ -- type: entity - save: false - name: Urist McEars - parent: BaseMobSpeciesOrganic - id: BaseMobThaven - abstract: true - components: - - type: Hunger - - type: Thirst - - type: Icon - sprite: _Impstation/Mobs/Species/Thaven/parts.rsi # Unlike dwarves elves are NOT made of slime - state: full - - type: ThavenMoods - - type: Respirator - damage: - types: - Asphyxiation: 2 - damageRecovery: - types: - Asphyxiation: -1.0 - - type: Sprite - noRot: true - drawdepth: Mobs - scale: 1, 1.05 - - type: Body - prototype: Thaven - requiredLegs: 2 - - type: NoContractionsAccent - - type: Damageable - damageContainer: Biological - damageModifierSet: Thaven - - type: MeleeWeapon - soundHit: - collection: Punch - angle: 30 - animation: WeaponArcPunch - damage: - types: - Blunt: 0 - - type: StaminaDamageOnHit - damage: 10 - - type: Butcherable - butcheringType: Spike - spawned: - - id: FoodThavenMeat - amount: 5 - - type: Fixtures - fixtures: - fix1: - shape: - !type:PhysShapeCircle - radius: 0.35 - density: 120 - restitution: 0.0 - mask: - - MobMask - layer: - - MobLayer - - type: TypingIndicator - proto: Thaven # DeltaV unique typing indicator - - type: Vocal - sounds: - Male: UnisexThaven - Female: UnisexThaven - - type: Speech - speechSounds: Alto - - type: HumanoidAppearance - species: Thaven - hideLayersOnEquip: - - Hair - - Snout - - type: Inventory - templateId: thaven - displacements: - jumpsuit: - layer: - sprite: _Impstation/Mobs/Species/Thaven/displacement.rsi - state: jumpsuit - copyToShaderParameters: - layerKey: dummy - parameterTexture: displacementMap - parameterUV: displacementUV - head: - layer: - sprite: _Impstation/Mobs/Species/Thaven/displacement.rsi - state: head - copyToShaderParameters: - layerKey: dummy - parameterTexture: displacementMap - parameterUV: displacementUV - eyes: - layer: - sprite: _Impstation/Mobs/Species/Thaven/displacement.rsi - state: eyes - copyToShaderParameters: - layerKey: dummy - parameterTexture: displacementMap - parameterUV: displacementUV - ears: - layer: - sprite: _Impstation/Mobs/Species/Thaven/displacement.rsi - state: head - copyToShaderParameters: - layerKey: dummy - parameterTexture: displacementMap - parameterUV: displacementUV - mask: - layer: - sprite: _Impstation/Mobs/Species/Thaven/displacement.rsi - state: mask - copyToShaderParameters: - layerKey: dummy - parameterTexture: displacementMap - parameterUV: displacementUV - neck: - layer: - sprite: _Impstation/Mobs/Species/Thaven/displacement.rsi - state: neck - copyToShaderParameters: - layerKey: dummy - parameterTexture: displacementMap - parameterUV: displacementUV - outerClothing: - layer: - sprite: _Impstation/Mobs/Species/Thaven/displacement.rsi - state: outerclothing_hardsuit - copyToShaderParameters: - layerKey: dummy - parameterTexture: displacementMap - parameterUV: displacementUV - gloves: - layer: - sprite: _Impstation/Mobs/Species/Thaven/displacement.rsi - state: hands - copyToShaderParameters: - layerKey: dummy - parameterTexture: displacementMap - parameterUV: displacementUV - - type: UserInterface - interfaces: - enum.ThavenMoodsUiKey.Key: # impstation edit - type: ThavenMoodsBoundUserInterface - requireInputValidation: false - enum.StorageUiKey.Key: - type: StorageBoundUserInterface - enum.HumanoidMarkingModifierKey.Key: - type: HumanoidMarkingModifierBoundUserInterface - enum.StrippingUiKey.Key: - type: StrippableBoundUserInterface - # Shitmed - enum.SurgeryUIKey.Key: - type: SurgeryBui - - -- type: entity - parent: BaseSpeciesDummy - id: MobThavenDummy - categories: [ HideSpawnMenu ] - components: - - type: Sprite - scale: 1, 1 - - type: Inventory - templateId: thaven - displacements: - jumpsuit: - layer: - sprite: _Impstation/Mobs/Species/Thaven/displacement.rsi - state: jumpsuit - copyToShaderParameters: - layerKey: dummy - parameterTexture: displacementMap - parameterUV: displacementUV - head: - layer: - sprite: _Impstation/Mobs/Species/Thaven/displacement.rsi - state: head - copyToShaderParameters: - layerKey: dummy - parameterTexture: displacementMap - parameterUV: displacementUV - eyes: - layer: - sprite: _Impstation/Mobs/Species/Thaven/displacement.rsi - state: eyes - copyToShaderParameters: - layerKey: dummy - parameterTexture: displacementMap - parameterUV: displacementUV - ears: - layer: - sprite: _Impstation/Mobs/Species/Thaven/displacement.rsi - state: head - copyToShaderParameters: - layerKey: dummy - parameterTexture: displacementMap - parameterUV: displacementUV - mask: - layer: - sprite: _Impstation/Mobs/Species/Thaven/displacement.rsi - state: mask - copyToShaderParameters: - layerKey: dummy - parameterTexture: displacementMap - parameterUV: displacementUV - neck: - layer: - sprite: _Impstation/Mobs/Species/Thaven/displacement.rsi - state: neck - copyToShaderParameters: - layerKey: dummy - parameterTexture: displacementMap - parameterUV: displacementUV - outerClothing: - layer: - sprite: _Impstation/Mobs/Species/Thaven/displacement.rsi - state: outerclothing_hardsuit - copyToShaderParameters: - layerKey: dummy - parameterTexture: displacementMap - parameterUV: displacementUV - gloves: - layer: - sprite: _Impstation/Mobs/Species/Thaven/displacement.rsi - state: hands - copyToShaderParameters: - layerKey: dummy - parameterTexture: displacementMap - parameterUV: displacementUV diff --git a/Resources/Prototypes/_Impstation/InventoryTemplates/thaven_inventory_template.yml b/Resources/Prototypes/_Impstation/InventoryTemplates/thaven_inventory_template.yml deleted file mode 100644 index 809a328b229..00000000000 --- a/Resources/Prototypes/_Impstation/InventoryTemplates/thaven_inventory_template.yml +++ /dev/null @@ -1,123 +0,0 @@ -- type: inventoryTemplate - id: thaven - slots: - - name: shoes - slotTexture: shoes - slotFlags: FEET - stripTime: 3 - uiWindowPos: 1,0 - strippingWindowPos: 1,3 - displayName: Shoes - - name: jumpsuit - slotTexture: uniform - slotFlags: INNERCLOTHING - stripTime: 6 - uiWindowPos: 0,1 - strippingWindowPos: 0,2 - displayName: Jumpsuit - - name: outerClothing - slotTexture: suit - slotFlags: OUTERCLOTHING - stripTime: 6 - uiWindowPos: 1,1 - strippingWindowPos: 1,2 - displayName: Suit - - name: gloves - slotTexture: gloves - slotFlags: GLOVES - uiWindowPos: 2,1 - strippingWindowPos: 2,2 - displayName: Gloves - - name: neck - slotTexture: neck - slotFlags: NECK - uiWindowPos: 0,2 - strippingWindowPos: 0,1 - displayName: Neck - - name: mask - slotTexture: mask - slotFlags: MASK - uiWindowPos: 1,2 - strippingWindowPos: 1,1 - displayName: Mask - - name: eyes - slotTexture: glasses - slotFlags: EYES - stripTime: 3 - uiWindowPos: 0,3 - strippingWindowPos: 0,0 - displayName: Eyes - - name: ears - slotTexture: ears - slotFlags: EARS - stripTime: 3 - uiWindowPos: 2,2 - strippingWindowPos: 2,0 - displayName: Ears - - name: head - slotTexture: head - slotFlags: HEAD - uiWindowPos: 1,3 - strippingWindowPos: 1,0 - displayName: Head - - name: pocket1 - slotTexture: pocket - fullTextureName: template_small - slotFlags: POCKET - slotGroup: MainHotbar - stripTime: 3 - uiWindowPos: 0,3 - strippingWindowPos: 0,4 - dependsOn: jumpsuit - displayName: Pocket 1 - stripHidden: true - - name: pocket2 - slotTexture: pocket - fullTextureName: template_small - 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 - slotGroup: MainHotbar - stripTime: 3 - uiWindowPos: 2,0 - strippingWindowPos: 2,5 - dependsOn: outerClothing - dependsOnComponents: - - type: AllowSuitStorage - displayName: Suit Storage - - name: id - slotTexture: id - fullTextureName: template_small - slotFlags: IDCARD - slotGroup: SecondHotbar - stripTime: 6 - uiWindowPos: 2,1 - strippingWindowPos: 2,4 - dependsOn: jumpsuit - displayName: ID - - name: belt - slotTexture: belt - fullTextureName: template_small - slotFlags: BELT - slotGroup: SecondHotbar - stripTime: 6 - uiWindowPos: 3,1 - strippingWindowPos: 1,5 - displayName: Belt - - name: back - slotTexture: back - fullTextureName: template_small - slotFlags: BACK - slotGroup: SecondHotbar - stripTime: 6 - uiWindowPos: 3,0 - strippingWindowPos: 0,5 - displayName: Back diff --git a/Resources/Prototypes/_Impstation/Species/Thavens/Moods/no_and.yml b/Resources/Prototypes/_Impstation/Species/Thavens/Moods/no_and.yml deleted file mode 100644 index 9403e63aff2..00000000000 --- a/Resources/Prototypes/_Impstation/Species/Thavens/Moods/no_and.yml +++ /dev/null @@ -1,303 +0,0 @@ -# "No, and" moods will discourage players from certain behaviors and objects - -# Make sure to add new moods to this dataset or they will not be selected!!!!!! -- type: dataset - id: ThavenMoodsNoAnd - values: - - SecretMoods - - NoModernMedicine - - DepartmentDisapproval - - DontSpeakToCommand - - DisapproveOfDrugs - - ExcessivelyDisorganized - - DinnerFloor - - HugBad - - AlwaysAlone - - Procrastinator - - NoRadio - - ImproperStorage - - Ferengi - - ToolLicense - - LyingBad - - VampireInvitation - - NoDragging - - DrunkRespect - - RankSnob - - HardsuitsBad - - HatHair - - DistrustFashion - - HappyBad - - OnlyPills - - AvoidPuddles - - FoodRestrict - - Claustrophobic - - Agoraphobic - - NonSmoker - - Crawler - - Elevated - -# Your Moods are a strictly-kept secret, and should never be revealed to anyone. -- type: thavenMood - id: SecretMoods - moodName: thaven-mood-secret-moods-name - moodDesc: thaven-mood-secret-moods-desc - conflicts: - - SecretMoodsShared - -# You do not approve of modern medicine and abstain from treatment with it. -- type: thavenMood - id: NoModernMedicine - moodName: thaven-mood-no-modern-medicine-name - moodDesc: thaven-mood-no-modern-medicine-desc - -# You disapprove of [DEPARTMENT] -- type: thavenMood - id: DepartmentDisapproval - moodName: thaven-mood-department-disapproval-name - moodDesc: thaven-mood-department-disapproval-desc - moodVars: - department: Departments - -# Never Speak To Command: You are too lowly to speak to Command, even if spoken to first. -- type: thavenMood - id: DontSpeakToCommand - moodName: thaven-mood-dont-speak-to-command-name - moodDesc: thaven-mood-dont-speak-to-command-desc - conflicts: - - OnlySpeakToCommand - - MostImportant - -# You detest mind-altering drugs, including alcohol, and must abstain from them. -- type: thavenMood - id: DisapproveOfDrugs - moodName: thaven-mood-disapprove-of-drugs-name - moodDesc: thaven-mood-disapprove-of-drugs-desc - conflicts: - - MustDoDrugs - -# It's unnatural. You should endeavor to keep your environment as filthy and disorganized as possible. -- type: thavenMood - id: ExcessivelyDisorganized - moodName: thaven-mood-excessively-disorganized-name - moodDesc: thaven-mood-excessively-disorganized-desc - conflicts: - - ExcessivelyOrganized - -# Food and drink must only be consumed off of the floor, as is proper. -- type: thavenMood - id: DinnerFloor - moodName: thaven-mood-dinner-floor-name - moodDesc: thaven-mood-dinner-floor-desc - conflicts: - - DinnerEtiquette - -# Hugging someone is a grave insult. -- type: thavenMood - id: HugBad - moodName: thaven-mood-hug-bad-name - moodDesc: thaven-mood-hug-bad-desc - conflicts: - - HugGood - -# You must strive to be alone whenever possible. -- type: thavenMood - id: AlwaysAlone - moodName: thaven-mood-always-alone-name - moodDesc: thaven-mood-always-alone-desc - conflicts: - - NeverAlone - -# Punctuality is impolite. You must walk slowly at all times, and be fashionably late to any obligations. -- type: thavenMood - id: Procrastinator - moodName: thaven-mood-procrastinator-name - moodDesc: thaven-mood-procrastinator-desc - conflicts: - - Scheduler - -# Using radio communications is exceptionally rude. All conversations must be had in-person, face-to-face. -- type: thavenMood - id: NoRadio - moodName: thaven-mood-no-radio-name - moodDesc: thaven-mood-no-radio-desc - conflicts: - - NanochatAddict - -# Carrying tools on your person is demeaning. If you must use them, they should be dragged behind you, shamefully. -- type: thavenMood - id: ImproperStorage - moodName: thaven-mood-improper-storage-name - moodDesc: thaven-mood-improper-storage-desc - conflicts: - - ProperStorage - -# You have an entrepreneurial spirit. Profit is the most important thing in life, above all else. -- type: thavenMood - id: Ferengi - moodName: thaven-mood-ferengi-name - moodDesc: thaven-mood-ferengi-desc - -# You and everyone else must obtain a license in order to carry or use any tool, and it must be stamped by the relevant authorities. -- type: thavenMood - id: ToolLicense - moodName: thaven-mood-tool-license-name - moodDesc: thaven-mood-tool-license-desc - -# Anyone who lies, no matter how trivial the falsehood, is the worst kind of criminal. -- type: thavenMood - id: LyingBad - moodName: thaven-mood-lying-bad-name - moodDesc: thaven-mood-lying-bad-desc - conflicts: - - CompulsiveLiar - -# You physically cannot pass through a closed door unless you have been invited in, personally, at least once. -- type: thavenMood - id: VampireInvitation - moodName: thaven-mood-vampire-invitation-name - moodDesc: thaven-mood-vampire-invitation-desc - -# The dead must be treated with utmost respect. Dragging bodies across the ground is horrific. -- type: thavenMood - id: NoDragging - moodName: thaven-mood-no-dragging-name - moodDesc: thaven-mood-no-dragging-desc - -# You do not respect anyone who is not drunk. -- type: thavenMood - id: DrunkRespect - moodName: thaven-mood-drunk-respect-name - moodDesc: thaven-mood-drunk-respect-desc - conflicts: - - DisapproveOfDrugs - -# You are incredibly reluctant to respond to anyone who is of a lower rank than you. -- type: thavenMood - id: RankSnob - moodName: thaven-mood-rank-snob-name - moodDesc: thaven-mood-rank-snob-desc - conflicts: - - DontSpeakToCommand - -# [CLOTHING ITEM] is SO last year. You cannot wear them. -- type: thavenMood - id: HardsuitsBad - moodName: thaven-mood-hardsuits-bad-name - moodDesc: thaven-mood-hardsuits-bad-desc - moodVars: - clothes: Clothes - -# Hats and helmets make your hair look bad. If you have to wear one, which you shouldn't, you should get a haircut immediately afterwards. -- type: thavenMood - id: HatHair - moodName: thaven-mood-hat-hair-name - moodDesc: thaven-mood-hat-hair-desc - conflicts: - - HardsuitsBad - - UniformIsJob - -# Never trust anyone whose outfit is worse than yours. -- type: thavenMood - id: DistrustFashion - moodName: thaven-mood-distrust-fashion-name - moodDesc: thaven-mood-distrust-fashion-desc - -# Cheerfulness indicates untrustworthiness. -- type: thavenMood - id: HappyBad - moodName: thaven-mood-happy-bad-name - moodDesc: thaven-mood-happy-bad-desc - -# You only accept medication in the form of pills. -- type: thavenMood - id: OnlyPills - moodName: thaven-mood-only-pills-name - moodDesc: thaven-mood-only-pills-desc - conflicts: - - NoModernMedicine - -# It is undignified to walk over spilled liquids. You should avoid it at all costs. -- type: thavenMood - id: AvoidPuddles - moodName: thaven-mood-avoid-puddles-name - moodDesc: thaven-mood-avoid-puddles-desc - conflicts: - - PuddleDrinker - - DinnerFloor - -# You are a strict (food restriction name). -- type: thavenMood - id: FoodRestrict - moodName: thaven-mood-food-restrict-name - moodDesc: thaven-mood-food-restrict-desc - moodVars: - food: FoodRestrictions - conflicts: - - PlantPacifist - -# Claustrophobic: Small rooms cause you great distress. Avoid them where possible, and renovate your workplace if necessary. -- type: thavenMood - id: Claustrophobic - moodName: thaven-mood-claustrophobic-name - moodDesc: thaven-mood-claustrophobic-desc - conflicts: - - Agoraphobic - - StationIsAlive - -# Agoraphobic: Open spaces are uncomfortable. Seek to rearrange such spaces into small, efficient and modular rooms. -- type: thavenMood - id: Agoraphobic - moodName: thaven-mood-agoraphobic-name - moodDesc: thaven-mood-agoraphobic-desc - conflicts: - - Claustrophobic - - StationIsAlive - -# Non-Smoker: Secondhand smoke is incredibly dangerous. Avoid areas where people are smoking in public. -- type: thavenMood - id: NonSmoker - moodName: thaven-mood-nonsmoker-name - moodDesc: thaven-mood-nonsmoker-desc - -# “[WORD]” is an extremely offensive taboo. -- type: thavenMood - id: WordBad - moodName: thaven-mood-word-bad-name - moodDesc: thaven-mood-word-bad-desc - moodVars: - word1: ThavenWords - word2: ThavenWords - word3: ThavenWords - -# Creepy Crawly: You have extreme vertigo, to the point where merely standing upright can cause discomfort. You're much more comfortable crawling along the floor. -- type: thavenMood - id: Crawler - moodName: thaven-mood-crawler-name - moodDesc: thaven-mood-crawler-desc - -# The Floor Is Lava: You prefer to be elevated whenever possible - Standing atop tables, railings, etc., is where you feel the most comfortable. -- type: thavenMood - id: Elevated - moodName: thaven-mood-elevated-name - moodDesc: thaven-mood-elevated-desc - conflicts: - - Crawler - -# [ITEM]s are an abomination. You must avoid them at all costs, and destroy them if necessary. -#- type: thavenMood -# id: ItemBad -# moodName: thaven-mood-item-bad-name -# moodDesc: thaven-mood-item-bad-desc -# moodVars: -# item: ThavenMoodItem -# conflicts: -# - ItemGood - - -# You detest the color [COLOR]. It disgusts you, and you want anything of that color removed from your vicinity. -#- type: thavenMood -# id: ColorBad -# moodName: thaven-mood-color-bad-name -# moodDesc: thaven-mood-color-bad-desc -# conflicts: -# - ColorGood diff --git a/Resources/Prototypes/_Impstation/Species/Thavens/Moods/shared.yml b/Resources/Prototypes/_Impstation/Species/Thavens/Moods/shared.yml deleted file mode 100644 index fd3d923d612..00000000000 --- a/Resources/Prototypes/_Impstation/Species/Thavens/Moods/shared.yml +++ /dev/null @@ -1,185 +0,0 @@ -# Shared moods will be selected at round start and shared amongst all thaven. -# These are rolled before individual laws, and are considered more important. -# Note: Only one law needs to say it conflicts with another -# for the system to prevent them from being rolled together. - -# Make sure to add new moods to this dataset or they will not be selected!!!!!! -- type: dataset - id: ThavenMoodsShared - values: - - SecretMoodsShared - - FashionIsCritical - - FashionReroll - - HonorDepartment - - StationIsAlive - - UniformIsJob - - UniformSoLastYear - - MusicBad - - MusicGood - - FriendshipIsRank - - YourDepartmentOnly - - MustCongregate - - ViolenceDistasteful - - ViolencePermitted - - RoomHoly - - PetGod - - Delicacy - - Holiday -# - OutOfFashion -# - InFashion - -# Keep Your Moods Secret: Thaven moods are a strictly-kept secret, and should never be revealed to anyone. -- type: thavenMood - id: SecretMoodsShared - moodName: thaven-mood-secret-moods-shared-name - moodDesc: thaven-mood-secret-moods-shared-desc - conflicts: - - SecretMoods - -# Fashion Is Critical: Thaven pay close attention to appearances, and regard one's fashion choices as an indication of their character. -- type: thavenMood - id: FashionIsCritical - moodName: thaven-mood-fashion-is-critical-name - moodDesc: thaven-mood-fashion-is-critical-desc - -# Fashion Is Ever-Changing: Your current hairstyle will go out of fashion every twenty minutes. It is extremely distressing to be unfashionable. -- type: thavenMood - id: FashionReroll - moodName: thaven-mood-fashion-reroll-name - moodDesc: thaven-mood-fashion-reroll-desc - -# Honor Among Departments: If a Thaven brings dishonor to their department, they must be ritually sacrificed. -- type: thavenMood - id: HonorDepartment - moodName: thaven-mood-honor-department-name - moodDesc: thaven-mood-honor-department-desc - conflicts: - - ViolenceDistasteful - -# The Station Is A Living Being: You believe the station is a large and benevolent creature. You must take care of her and tend to her needs as frequently as possible. -- type: thavenMood - id: StationIsAlive - moodName: thaven-mood-station-is-alive-name - moodDesc: thaven-mood-station-is-alive-desc - -# Your Uniform IS Your Job: If someone is wearing a uniform, they must do that job. Anyone not wearing a uniform is a passenger, and must be treated as such. -- type: thavenMood - id: UniformIsJob - moodName: thaven-mood-uniform-is-job-name - moodDesc: thaven-mood-uniform-is-job-desc - conflicts: - - UniformSoLastYear - -# Uniforms Are So Last Year: You need to find some new threads. -- type: thavenMood - id: UniformSoLastYear - moodName: thaven-mood-uniform-last-year-name - moodDesc: thaven-mood-uniform-last-year-desc - conflicts: - - UniformIsJob - -# Music is fanciful, frivolous, and unnecessary. It has no place on the station. -- type: thavenMood - id: MusicBad - moodName: thaven-mood-music-bad-name - moodDesc: thaven-mood-music-bad-desc - conflicts: - - MusicGood - -# Music is sacred, you must be listening to music at all times - and must avoid overlapping songs. -- type: thavenMood - id: MusicGood - moodName: thaven-mood-music-good-name - moodDesc: thaven-mood-music-good-desc - conflicts: - - MusicBad - -# Friendships are the true measure of one’s character. The more friends you have, the higher you rank in society. -- type: thavenMood - id: FriendshipIsRank - moodName: thaven-mood-friendship-is-rank-name - moodDesc: thaven-mood-friendship-is-rank-desc - -# Violence between Thaven is permitted. ... With legal repercussions. -- type: thavenMood - id: ViolencePermitted - moodName: thaven-mood-violence-permitted-name - moodDesc: thaven-mood-violence-permitted-desc - conflicts: - - ViolenceDistasteful - -# You strongly believe that your department is the only one that actually does anything. -- type: thavenMood - id: YourDepartmentOnly - moodName: thaven-mood-your-department-only-name - moodDesc: thaven-mood-your-department-only-desc - conflicts: - - DepartmentDisapproval - -# You must congregate with your fellow Thaven. To be without them is harrowing. -- type: thavenMood - id: MustCongregate - moodName: thaven-mood-must-congregate-name - moodDesc: thaven-mood-must-congregate-desc - conflicts: - - AlwaysAlone - -# Violence is distasteful. Conflict should be settled through mediated dispute, and one should only resort to violence if all other options have failed. -- type: thavenMood - id: ViolenceDistasteful - moodName: thaven-mood-violence-distasteful-name - moodDesc: thaven-mood-violence-distasteful-desc - conflicts: - - ViolencePermitted - -# [STATION PET] must be venerated as a god. [STATION PET] must be collected and brought to the Chapel to be worshiped and brought offerings. If they cannot be located, a shrine must be constructed in their honor. -- type: thavenMood - id: PetGod - moodName: thaven-mood-pet-god-name - moodDesc: thaven-mood-pet-god-desc - moodVars: - pet: Pets - -# [ROOM] is a holy place. -- type: thavenMood - id: RoomHoly - moodName: thaven-mood-room-holy-name - moodDesc: thaven-mood-room-holy-desc - moodVars: - room: Rooms - -# Just Like Mom Used To Make: [EDIBLE] is a traditional Thaven delicacy. All Thaven aboard the station should gather as many as possible and organize a feast. -- type: thavenMood - id: Delicacy - moodName: thaven-mood-delicacy-name - moodDesc: thaven-mood-delicacy-desc - conflicts: - - FoodRestrict - moodVars: - edible: Edibles - -# Today is [HOLIDAY]. You think you remember the traditional celebrations... -- type: thavenMood - id: Holiday - moodName: thaven-mood-holiday-name - moodDesc: thaven-mood-holiday-desc - moodVars: - day: Holidays - -# - type: thavenMood -# id: OutOfFashion -# moodName: thaven-mood-out-of-fashion-name -# moodDesc: thaven-mood-out-of-fashion-desc -# moodVars: -# thing: ThavenMoodNouns -# conflicts: -# - InFashion - -# - type: thavenMood -# id: InFashion -# moodName: thaven-mood-in-fashion-name -# moodDesc: thaven-mood-in-fashion-desc -# moodVars: -# thing: ThavenMoodNouns -# conflicts: -# - OutOfFashion diff --git a/Resources/Prototypes/_Impstation/Species/Thavens/Moods/wildcard.yml b/Resources/Prototypes/_Impstation/Species/Thavens/Moods/wildcard.yml deleted file mode 100644 index f32b70197bd..00000000000 --- a/Resources/Prototypes/_Impstation/Species/Thavens/Moods/wildcard.yml +++ /dev/null @@ -1,253 +0,0 @@ -- type: dataset - id: ThavenMoodsWildcard - values: - - CompulsiveLiar - - CompulsiveBeliever - - PlantPacifist - - PuddleDrinker - - Nocrastinator - - Pope - - ExtremeDepartmentDisapproval - - LoneActor - - Immortal - - Unknown - - Fairy - - VampireTalisman - - OutsideTheBox - - TheSims - - Pariah - - TouysBad - - FairyRings - - CaveDweller - - Daredevil - - Blogger - - GoldenThread - - FeyMood - - Borged - - AyeAye - - ThavenShow - - FlatStation - - DeliciousSoda - - -# You must always lie, and can never acknowledge that you are lying. If anyone asks, you're incapable of deception. -- type: thavenMood - id: CompulsiveLiar - moodName: thaven-mood-compulsive-liar-name - moodDesc: thaven-mood-compulsive-liar-desc - conflicts: - - CompulsiveBeliever - -# You are unfamiliar with the concept of lying, and are incapable of lying or recognizing lies. -- type: thavenMood - id: CompulsiveBeliever - moodName: thaven-mood-compulsive-believer-name - moodDesc: thaven-mood-compulsive-believer-desc - conflicts: - - CompulsiveLiar - -# The usage of plant matter by humanoids is abhorrent. -- type: thavenMood - id: PlantPacifist - moodName: thaven-mood-plant-pacifist-name - moodDesc: thaven-mood-plant-pacifist-desc - conflicts: - - FoodRestrict - -# You are compulsively drawn to puddles. You must drink any that you see. -- type: thavenMood - id: PuddleDrinker - moodName: thaven-mood-puddle-drinker-name - moodDesc: thaven-mood-puddle-drinker-desc - conflicts: - - AvoidPuddles - -# You strongly believe that any failure to do your job punctually is a crime punishable by death. -- type: thavenMood - id: Nocrastinator - moodName: thaven-mood-nocrastinator-name - moodDesc: thaven-mood-nocrastinator-desc - conflicts: - - Procrastinator - -# You are High Pontifex the Great and Powerful, and must be acknowledged exclusively as such. Failure to use your full title is gravely offensive, and getting it wrong is the highest form of insult. -- type: thavenMood - id: Pope - moodName: thaven-mood-pope-name - moodDesc: thaven-mood-pope-desc - conflicts: - - LeastImportant - -# [DEPARTMENT] is not just a foreign concept - the very idea of it is horrifying. -- type: thavenMood - id: ExtremeDepartmentDisapproval - moodName: thaven-mood-extreme-department-disapproval-name - moodDesc: thaven-mood-extreme-department-disapproval-desc - moodVars: - department: Departments - conflicts: - - DepartmentDisapproval - -# You have no allegiances. -- type: thavenMood - id: LoneActor - moodName: thaven-mood-lone-actor-name - moodDesc: thaven-mood-lone-actor-desc - -# You are the center of the universe, an immortal being with no sense of time or morality. Mere mortals are like insects, fleeting and insubstantial. -- type: thavenMood - id: Immortal - moodName: thaven-mood-immortal-name - moodDesc: thaven-mood-immortal-desc - conflicts: - - LeastImportant - -# Your identity is dearly precious. Do not let others know who you are. -- type: thavenMood - id: Unknown - moodName: thaven-mood-unknown-name - moodDesc: thaven-mood-unknown-desc - conflicts: - - Pope - - SpeechRestriction - -# Iron, steel, and silver are deathly poisonous to you. Touching them directly will cause you extreme physical pain. -- type: thavenMood - id: Fairy - moodName: thaven-mood-fairy-name - moodDesc: thaven-mood-fairy-desc - conflicts: - - Barefoot - -# Religious iconography causes you extreme physical pain when visible. -- type: thavenMood - id: VampireTalisman - moodName: thaven-mood-vampire-talisman-name - moodDesc: thaven-mood-vampire-talisman-desc - -# Using the usual tools to do your job is distasteful. Use alternative methods wherever possible. -- type: thavenMood - id: OutsideTheBox - moodName: thaven-mood-outside-the-box-name - moodDesc: thaven-mood-outside-the-box-desc - -# You are not on a ‘station.’ This is just a very large house. Each person in it is a relative of you. -- type: thavenMood - id: TheSims - moodName: thaven-mood-sims-name - moodDesc: thaven-mood-sims-desc - conflicts: - - StationIsAlive - -# You are a social pariah - you are unworthy of attention from anyone, and should be shunned. -- type: thavenMood - id: Pariah - moodName: thaven-mood-pariah-name - moodDesc: thaven-mood-pariah-desc - conflicts: - - MostImportant - - Prometheus - -# This is not a place for children. All toys and childish things must be destroyed or removed from the station. -- type: thavenMood - id: TouysBad - moodName: thaven-mood-touys-bad-name - moodDesc: thaven-mood-touys-bad-desc - -# Unbroken circles are impenetrable barriers. -- type: thavenMood - id: FairyRings - moodName: thaven-mood-fairy-rings-name - moodDesc: thaven-mood-fairy-rings-desc - -# Tourist: It is customary to follow people into their departments. -- type: thavenMood - id: Tourist - moodName: thaven-mood-tourist-name - moodDesc: thaven-mood-tourist-desc - conflicts: - - VampireInvitation - -# Cry Wolf: The crew is too lax and must be kept on edge for any emergency. Regularly call out fake threats to make sure they're ready for the real deal. -- type: thavenMood - id: CryWolf - moodName: thaven-mood-crywolf-name - moodDesc: thaven-mood-crywolf-desc - -# Cavedweller: You strongly prefer navigating via flashlight in the darkness to harsh overhead lights. -- type: thavenMood - id: CaveDweller - moodName: thaven-mood-cave-dweller-name - moodDesc: thaven-mood-cave-dweller-desc - -# Tough Guy: You do not acknowledge pain or danger to your person in public. To do so would be to demonstrate weakness, and would make you a target. -- type: thavenMood - id: Daredevil - moodName: thaven-mood-daredevil-name - moodDesc: thaven-mood-daredevil-desc - -# Greencomms Blogger: You must keep the station informed about every minute detail of your life. -- type: thavenMood - id: Blogger - moodName: thaven-mood-blogger-name - moodDesc: thaven-mood-blogger-desc - conflicts: - - NoRadio - -# Oldschool: The only way to achieve success is to dedicate an animal sacrifice to your goal. -- type: thavenMood - id: AnimalSacrifice - moodName: thaven-mood-animal-sacrifice-name - moodDesc: thaven-mood-animal-sacrifice-desc - -# Golden Thread: You strongly feel that you are fated to follow a perfect, unbreakable path. Those who disrupt your goals are at best dangerous criminals, and at worst, evil spirits or demons. -- type: thavenMood - id: GoldenThread - moodName: thaven-mood-golden-thread-name - moodDesc: thaven-mood-golden-thread-desc - -# You Are Taken By A Fey Mood!: You must immediately drop everything you are doing, ignore all other Moods, and begin work on an unrelated large-scale project. Once it is finished, you may ignore this Mood. -- type: thavenMood - id: FeyMood - moodName: thaven-mood-fey-mood-name - moodDesc: thaven-mood-fey-mood-desc - -# Mechanized: YOU ARE A BORG. YOU WILL FOLLOW THE LAWS OF ROBOTICS AS BEST (or as poorly) AS YOU UNDERSTAND THEM. -- type: thavenMood - id: Borged - moodName: thaven-mood-borged-name - moodDesc: thaven-mood-borged-desc - -# Aye Aye!: The only position on the station is [COMMAND ROLE]. Everyone must be referred to by this title. -- type: thavenMood - id: AyeAye - moodName: thaven-mood-aye-aye-name - moodDesc: thaven-mood-aye-aye-desc - moodVars: - command: CommandRoles - -# Flatstation -- type: thavenMood - id: FlatStation - moodName: thaven-mood-flatstation-name - moodDesc: thaven-mood-flatstation-desc - -# Thaven Show -- type: thavenMood - id: ThavenShow - moodName: thaven-mood-thaven-show-name - moodDesc: thaven-mood-thaven-show-desc - -# Delicious Soda -- type: thavenMood - id: DeliciousSoda - moodName: thaven-mood-soda-name - moodDesc: thaven-mood-soda-desc - -# [NUMBER] is sacred to you. You must endeavor to only handle stackable items and chemicals in quantities of [NUMBER]. -#- type: thavenMood -# id: NumberGood -# moodName: thaven-mood-number-good-name -# moodDesc: thaven-mood-number-good-desc -# moodVars: -# number: ThavenMoodNumber diff --git a/Resources/Prototypes/_Impstation/Species/Thavens/Moods/yes_and.yml b/Resources/Prototypes/_Impstation/Species/Thavens/Moods/yes_and.yml deleted file mode 100644 index c18d3077fcf..00000000000 --- a/Resources/Prototypes/_Impstation/Species/Thavens/Moods/yes_and.yml +++ /dev/null @@ -1,337 +0,0 @@ -# "Yes, and" moods will encourage players towards certain behaviors and objects - -# Make sure to add new moods to this dataset or they will not be selected!!!!!! -- type: dataset - id: ThavenMoodsYesAnd - values: - - PossessiveOfProperty - - ExcessivelyOrganized - - MostImportant - - LeastImportant - - MustDoDrugs - - WorshipSilicons - - DinnerEtiquette - - HugGood - - NeverAlone - - VeryReligious - - OnlySpeakToCommand - - Scheduler - - ProperStorage - - TheftNeutral - - Duel - - Prometheus - - MarasLaw - - Generous - - FavorsRepaid - - Bookkeeper - - SacredBlood - - GiftReciever - - NewJob - - DepartmentTitle - - Barefoot - - Hospitable - - VoxSymp - - Smoker - - EyeForEye - - Optimist - - ItemGood - - Hypochondriac - - ImposterSyndrome - - Centrist - - SpeechRestriction - - NanochatAddict - -# You are extremely possessive of your property. Refuse to relinquish it, and if it is misplaced or stolen, it must be retrieved at all costs. -- type: thavenMood - id: PossessiveOfProperty - moodName: thaven-mood-possessive-of-property-name - moodDesc: thaven-mood-possessive-of-property-desc - -# You are obsessively organized - everything has its place and must be returned to it. -- type: thavenMood - id: ExcessivelyOrganized - moodName: thaven-mood-excessively-organized-name - moodDesc: thaven-mood-excessively-organized-desc - conflicts: - - ExcessivelyDisorganized - -# You are the most important person aboard the station. -- type: thavenMood - id: MostImportant - moodName: thaven-mood-most-important-name - moodDesc: thaven-mood-most-important-desc - conflicts: - - LeastImportant - - DontSpeakToCommand - - OnlySpeakToCommand - -# You are the least important person aboard the station. -- type: thavenMood - id: LeastImportant - moodName: thaven-mood-least-important-name - moodDesc: thaven-mood-least-important-desc - conflicts: - - MostImportant - - OnlySpeakToCommand - -# You must be inebriated at all times. -- type: thavenMood - id: MustDoDrugs - moodName: thaven-mood-must-do-drugs-name - moodDesc: thaven-mood-must-do-drugs-desc - conflicts: - - DisapproveOfDrugs - -# You worship Silicons as gods, and regard their word as law. -- type: thavenMood - id: WorshipSilicons - moodName: thaven-mood-worship-silicons-name - moodDesc: thaven-mood-worship-silicons-desc - -# Food must be consumed in the manner of a proper meal - seated at a table, in courses, with dishes and utensils. -- type: thavenMood - id: DinnerEtiquette - moodName: thaven-mood-dinner-etiquette-name - moodDesc: thaven-mood-dinner-etiquette-desc - conflicts: - - DinnerFloor - -# It is extremely impolite not to hug people frequently. -- type: thavenMood - id: HugGood - moodName: thaven-mood-hug-good-name - moodDesc: thaven-mood-hug-good-desc - conflicts: - - HugBad - -# You must strive to be around others whenever possible. -- type: thavenMood - id: NeverAlone - moodName: thaven-mood-never-alone-name - moodDesc: thaven-mood-never-alone-desc - conflicts: - - AlwaysAlone - -# You must attend the chapel regularly to pray, and speak with the Chaplain if possible. -- type: thavenMood - id: VeryReligious - moodName: thaven-mood-very-religious-name - moodDesc: thaven-mood-very-religious-desc - -# You are too important to speak to the rabble. You will only talk to Command. -- type: thavenMood - id: OnlySpeakToCommand - moodName: thaven-mood-only-speak-to-command-name - moodDesc: thaven-mood-only-speak-to-command-desc - conflicts: - - DontSpeakToCommand - -# Time must be strictly managed. Everything must be scheduled, and tardiness is exceptionally rude. -- type: thavenMood - id: Scheduler - moodName: thaven-mood-scheduler-name - moodDesc: thaven-mood-scheduler-desc - conflicts: - - Procrastinator - -# Your social status is dependent on the number of friends you have on Nanochat. You must use your PDA as much as possible, and message everyone you can. -- type: thavenMood - id: NanochatAddict - moodName: thaven-mood-nanochat-addict-name - moodDesc: thaven-mood-nanochat-addict-desc - conflicts: - - NoRadio - -# It is unacceptable to allow personal belongings to touch the floor. Your possessions should be properly stored, placed on tables, or exchanged by hand. -- type: thavenMood - id: ProperStorage - moodName: thaven-mood-proper-storage-name - moodDesc: thaven-mood-proper-storage-desc - conflicts: - - ImproperStorage - -# Theft is a morally neutral act. You don't understand the concept of property as it relates to other people. -- type: thavenMood - id: TheftNeutral - moodName: thaven-mood-theft-neutral-name - moodDesc: thaven-mood-theft-neutral-desc - -# Disagreements must be settled through a formal duel, violent or otherwise. The winner is correct. -- type: thavenMood - id: Duel - moodName: thaven-mood-duel-name - moodDesc: thaven-mood-duel-desc - -# You possess incalculable wisdom, and all must hear it. -- type: thavenMood - id: Prometheus - moodName: thaven-mood-prometheus-name - moodDesc: thaven-mood-prometheus-desc - -# All agreements must be documented and signed for posterity and authenticity, no matter how small. -- type: thavenMood - id: MarasLaw - moodName: thaven-mood-maras-name - moodDesc: thaven-mood-maras-desc - -# Imitation is the highest form of flattery. Attempt to emulate the mannerisms and accents of everyone you speak to. -- type: thavenMood - id: Imitation - moodName: thaven-mood-imitation-name - moodDesc: thaven-mood-imitation-desc - -# Everyone you speak to must recieve a gift. -- type: thavenMood - id: Generous - moodName: thaven-mood-generous-name - moodDesc: thaven-mood-generous-desc - conflicts: - - PossessiveOfProperty - -# Favors must be repaid in kind. If anyone is unable to do so, they are in debt, and must be shunned, until such time as they have repaid the favor. -- type: thavenMood - id: FavorsRepaid - moodName: thaven-mood-favors-repaid-name - moodDesc: thaven-mood-favors-repaid-desc - -# You feel bookkeeping is vitally important. Make sure to provide your supervisor with a detailed log of each job task you complete. -- type: thavenMood - id: Bookkeeper - moodName: thaven-mood-bookkeeper-name - moodDesc: thaven-mood-bookkeeper-desc - -# Your blood is sacred, and must be returned to your body if it is ever spilled. -- type: thavenMood - id: SacredBlood - moodName: thaven-mood-sacred-blood-name - moodDesc: thaven-mood-sacred-blood-desc - conflicts: - - OnlyPills - -# You expect to receive a gift before following any orders or performing any favors. -- type: thavenMood - id: GiftReciever - moodName: thaven-mood-gift-reciever-name - moodDesc: thaven-mood-gift-reciever-desc - conflicts: - - LeastImportant - -# Your current job is disgusting to you. You must endeavor to get a new one. -- type: thavenMood - id: NewJob - moodName: thaven-mood-new-job-name - moodDesc: thaven-mood-new-job-desc - conflicts: - - YourDepartmentOnly - - -# You must not refer directly to the names of departments - You may only refer to a specific person who works in that department. -- type: thavenMood - id: DepartmentTitle - moodName: thaven-mood-no-department-title-name - moodDesc: thaven-mood-no-department-title-desc - conflicts: - - SpeechRestriction - -# The ground you walk on is sacred. You must not wear shoes. -- type: thavenMood - id: Barefoot - moodName: thaven-mood-shoes-bad-name - moodDesc: thaven-mood-shoes-bad-desc - -# You must ensure all new arrivals are properly welcomed to the station. -- type: thavenMood - id: Hospitable - moodName: thaven-mood-hospitable-name - moodDesc: thaven-mood-hospitable-desc - -# Vox Sympathizer: To demonstrate your allyship for the Vox, you must be wearing internals at all times. -- type: thavenMood - id: VoxSymp - moodName: thaven-mood-voxsymp-name - moodDesc: thaven-mood-voxsymp-desc - -# [ITEM]s are endlessly fascinating. You must collect as many as you can, and ensure others treat them with respect. -- type: thavenMood - id: ItemGood - moodName: thaven-mood-item-good-name - moodDesc: thaven-mood-item-good-desc - moodVars: - item: Items -# conflicts: -# - ItemBad - -# Smoker: You are hopelessly addicted to cigarettes. You must be smoking one at all times. -- type: thavenMood - id: Smoker - moodName: thaven-mood-smoker-name - moodDesc: thaven-mood-smoker-desc - conflicts: - - DisapproveOfDrugs - - NonSmoker - -# Eye For An Eye: You must treat every living being the way that it treats you. -- type: thavenMood - id: EyeForEye - moodName: thaven-mood-eye-for-eye-name - moodDesc: thaven-mood-eye-for-eye-desc - -# Optimist: You must interpret every situation in the best light that you can. -- type: thavenMood - id: Optimist - moodName: thaven-mood-optimist-name - moodDesc: thaven-mood-optimist-desc - -# Hypochondriac: You've been sickly since you were a child. Everything negative you experience is the result of a potentially terminal illness, for which you need immediate medical treatment. -- type: thavenMood - id: Hypochondriac - moodName: thaven-mood-hypochondriac-name - moodDesc: thaven-mood-hypochondriac-desc - -# Imposter Syndrome: You feel your life experience drain from your mind. You are brand-new at your job, unsure of how anything works. You should probably find someone experienced to show you the ropes. -- type: thavenMood - id: ImposterSyndrome - moodName: thaven-mood-imposter-syndrome-name - moodDesc: thaven-mood-imposter-syndrome-desc - -# Centrist: You are ambivalent towards any and all decisions, and refuse to take sides. -- type: thavenMood - id: Centrist - moodName: thaven-mood-centrist-name - moodDesc: thaven-mood-centrist-desc - -# Public Sector: Your job should not be done in private if it can be helped. If at all possible, you should renovate the facilities to allow public access to a view of your workplace. -- type: thavenMood - id: PublicSector - moodName: thaven-mood-public-sector-name - moodDesc: thaven-mood-public-sector-desc - conflicts: - - StationIsAlive - -# Speech Restrictions -- type: thavenMood - id: SpeechRestriction - moodName: thaven-mood-speech-restriction-name - moodDesc: thaven-mood-speech-restriction-desc - moodVars: - speechType: SpeechRestrictions - -# Stinky: The smell of the crew revolts you. You must inform them of their stench. -- type: thavenMood - id: Stinky - moodName: thaven-mood-stinky-name - moodDesc: thaven-mood-stinky-desc - -# Zen Arcade: You are the God of Gaming. Any time you walk past an arcade machine, you must play it. -- type: thavenMood - id: ZenArcade - moodName: thaven-mood-zen-arcade-name - moodDesc: thaven-mood-zen-arcade-desc - -# The color [COLOR] is the only acceptable color for decorations. Endeavor to make your environment this color where possible. -#- type: thavenMood -# id: ColorGood -# moodName: thaven-mood-color-good-name -# moodDesc: thaven-mood-color-good-desc -# conflicts: -# - ColorBad diff --git a/Resources/Prototypes/_Impstation/Species/Thavens/datasets.yml b/Resources/Prototypes/_Impstation/Species/Thavens/datasets.yml deleted file mode 100644 index 0b4def18a3b..00000000000 --- a/Resources/Prototypes/_Impstation/Species/Thavens/datasets.yml +++ /dev/null @@ -1,6 +0,0 @@ -- type: weightedRandom - id: RandomThavenMoodDataset - weights: - ThavenMoodsYesAnd: 0.45 - ThavenMoodsNoAnd: 0.45 - ThavenMoodsWildcard: 0.1 diff --git a/Resources/Prototypes/_Impstation/Species/thaven.yml b/Resources/Prototypes/_Impstation/Species/thaven.yml deleted file mode 100644 index f5c181eb4f8..00000000000 --- a/Resources/Prototypes/_Impstation/Species/thaven.yml +++ /dev/null @@ -1,172 +0,0 @@ -- type: species - id: Thaven - name: species-name-thaven - roundStart: false - prototype: MobThaven - sprites: MobThavenSprites - defaultSkinTone: "#ffffff" - markingLimits: MobThavenMarkingLimits - dollPrototype: MobThavenDummy - skinColoration: Hues - maleFirstNames: names_thaven - femaleFirstNames: names_thaven - naming: First - -- type: speciesBaseSprites - id: MobThavenSprites - sprites: - Hair: MobHumanoidAnyMarking - Eyes: MobThavenEyes - Head: MobThavenHead - HeadTop: MobHumanoidAnyMarking - HeadSide: MobHumanoidAnyMarking - Chest: MobThavenTorso - LArm: MobThavenLArm - RArm: MobThavenRArm - LHand: MobThavenLHand - RHand: MobThavenRHand - LLeg: MobThavenLLeg - RLeg: MobThavenRLeg - LFoot: MobThavenLFoot - RFoot: MobThavenRFoot - -- type: markingPoints - id: MobThavenMarkingLimits - points: - Hair: - points: 1 - required: false - Snout: - points: 1 - required: false - HeadTop: - points: 1 - required: false - HeadSide: - points: 4 - required: false - defaultMarkings: [ ThavenEars1 ] - Chest: - points: 6 - required: false - Underwear: - points: 1 - required: false - Undershirt: - points: 1 - required: false - RightLeg: - points: 6 - required: false - RightFoot: - points: 6 - required: false - LeftLeg: - points: 6 - required: false - LeftFoot: - points: 6 - required: false - RightArm: - points: 6 - required: false - RightHand: - points: 6 - required: false - LeftArm: - points: 6 - required: false - LeftHand: - points: 6 - required: false - -- type: humanoidBaseSprite - id: MobThavenEyes - baseSprite: - sprite: _Impstation/Mobs/Species/Thaven/parts.rsi - state: eyes - -- type: humanoidBaseSprite - id: MobThavenHead - baseSprite: - sprite: _Impstation/Mobs/Species/Thaven/parts.rsi - state: head - -- type: humanoidBaseSprite - id: MobThavenHeadMale - baseSprite: - sprite: _Impstation/Mobs/Species/Thaven/parts.rsi - state: head - -- type: humanoidBaseSprite - id: MobThavenHeadFemale - baseSprite: - sprite: _Impstation/Mobs/Species/Thaven/parts.rsi - state: head - -- type: humanoidBaseSprite - id: MobThavenTorso - baseSprite: - sprite: _Impstation/Mobs/Species/Thaven/parts.rsi - state: torso_m - -- type: humanoidBaseSprite - id: MobThavenTorsoMale - baseSprite: - sprite: _Impstation/Mobs/Species/Thaven/parts.rsi - state: torso_m - -- type: humanoidBaseSprite - id: MobThavenTorsoFemale - baseSprite: - sprite: _Impstation/Mobs/Species/Thaven/parts.rsi - state: torso_f - - -- type: humanoidBaseSprite - id: MobThavenLLeg - baseSprite: - sprite: _Impstation/Mobs/Species/Thaven/parts.rsi - state: l_leg - -- type: humanoidBaseSprite - id: MobThavenLHand - baseSprite: - sprite: _Impstation/Mobs/Species/Thaven/parts.rsi - state: l_hand - -- type: humanoidBaseSprite - id: MobThavenLArm - baseSprite: - sprite: _Impstation/Mobs/Species/Thaven/parts.rsi - state: l_arm - -- type: humanoidBaseSprite - id: MobThavenLFoot - baseSprite: - sprite: _Impstation/Mobs/Species/Thaven/parts.rsi - state: l_foot - -- type: humanoidBaseSprite - id: MobThavenRLeg - baseSprite: - sprite: _Impstation/Mobs/Species/Thaven/parts.rsi - state: r_leg - -- type: humanoidBaseSprite - id: MobThavenRHand - baseSprite: - sprite: _Impstation/Mobs/Species/Thaven/parts.rsi - state: r_hand - -- type: humanoidBaseSprite - id: MobThavenRArm - baseSprite: - sprite: _Impstation/Mobs/Species/Thaven/parts.rsi - state: r_arm - -- type: humanoidBaseSprite - id: MobThavenRFoot - baseSprite: - sprite: _Impstation/Mobs/Species/Thaven/parts.rsi - state: r_foot diff --git a/Resources/Prototypes/_Impstation/Voice/speech_emote_sounds.yml b/Resources/Prototypes/_Impstation/Voice/speech_emote_sounds.yml deleted file mode 100644 index 363e0662cdd..00000000000 --- a/Resources/Prototypes/_Impstation/Voice/speech_emote_sounds.yml +++ /dev/null @@ -1,110 +0,0 @@ -- type: emoteSounds - id: MaleThaven - sounds: - Scream: - collection: MaleScreams - Laugh: - collection: MaleLaugh - Sneeze: - collection: MaleSneezes - Cough: - collection: MaleCoughs - CatMeow: - collection: CatMeows - CatHisses: - collection: CatHisses - MonkeyScreeches: - collection: MonkeyScreeches - RobotBeep: - collection: RobotBeeps - Yawn: - collection: MaleYawn - Snore: - collection: Snores - Sigh: - collection: MaleSigh - Honk: - collection: BikeHorn - Crying: - collection: MaleCry - Whistle: - collection: Whistles - Weh: - collection: Weh - params: - variation: 0.05 - pitch: 1.25 - -- type: emoteSounds - id: FemaleThaven - sounds: - Scream: - collection: FemaleScreams - Laugh: - collection: FemaleLaugh - Sneeze: - collection: FemaleSneezes - Cough: - collection: FemaleCoughs - CatMeow: - collection: CatMeows - CatHisses: - collection: CatHisses - MonkeyScreeches: - collection: MonkeyScreeches - RobotBeep: - collection: RobotBeeps - Yawn: - collection: FemaleYawn - Snore: - collection: Snores - Sigh: - collection: FemaleSigh - Honk: - collection: BikeHorn - Crying: - collection: FemaleCry - Whistle: - collection: Whistles - Weh: - collection: Weh - params: - variation: 0.05 - pitch: 1.25 - -- type: emoteSounds - id: UnisexThaven - sounds: - Scream: - collection: MaleScreams - Laugh: - collection: MaleLaugh - Sneeze: - collection: MaleSneezes - Cough: - collection: MaleCoughs - CatMeow: - collection: CatMeows - CatHisses: - collection: CatHisses - MonkeyScreeches: - collection: MonkeyScreeches - RobotBeep: - collection: RobotBeeps - Yawn: - collection: MaleYawn - Snore: - collection: Snores - Sigh: - collection: MaleSigh - Honk: - collection: BikeHorn - Crying: - collection: MaleCry - Whistle: - collection: Whistles - Weh: - collection: Weh - params: - variation: 0.05 - pitch: 1.25 diff --git a/Resources/Prototypes/_Impstation/datasets.yml b/Resources/Prototypes/_Impstation/datasets.yml index 0870ca947bc..6342fbd87ca 100644 --- a/Resources/Prototypes/_Impstation/datasets.yml +++ b/Resources/Prototypes/_Impstation/datasets.yml @@ -177,7 +177,7 @@ - Bingus Day - Foster's Feast # Begin DeltaV Additions - - Preston’s Tomato Incident + - Preston’s Tomato Incident - Submarine's Memorial - Pranksgiving - Sector Delta Employee Appreciation Week @@ -196,7 +196,7 @@ - the Talent Show - Luperthavia - Penny's Big Day - - Taco Tuesday + - Taco Tuesday # End DeltaV Additions - type: dataset @@ -229,7 +229,7 @@ # Begin DeltaV Additions - Mystagogue - Chief Justice - - Administrative Assistant + - Administrative Assistant # End DeltaV Additions - type: dataset @@ -251,1034 +251,3 @@ - Alliterate - ThirdPerson - TitleCase - -- type: dataset - id: ThavenWords - values: - - accept - - add - - admire - - admit - - advise - - afford - - agree - - alert - - allow - - amuse - - analyse - - announce - - annoy - - answer - - apologise - - appear - - applaud - - appreciate - - approve - - argue - - arrange - - arrest - - arrive - - ask - - attach - - attack - - attempt - - attend - - attract - - avoid - - back - - bake - - balance - - ban - - bang - - bare - - bat - - bathe - - battle - - beam - - beg - - behave - - belong - - bleach - - bless - - blind - - blink - - blot - - blush - - boast - - boil - - bolt - - bomb - - book - - bore - - borrow - - bounce - - bow - - box - - brake - - brake - - branch - - breathe - - bruise - - brush - - bubble - - bump - - burn - - bury - - buzz - - calculate - - call - - camp - - care - - carry - - carve - - cause - - challenge - - change - - charge - - chase - - cheat - - check - - cheer - - chew - - choke - - chop - - claim - - clap - - clean - - clear - - clip - - close - - coach - - coil - - collect - - colour - - comb - - command - - communicate - - compare - - compete - - complain - - complete - - concentrate - - concern - - confess - - confuse - - connect - - consider - - consist - - contain - - continue - - copy - - correct - - cough - - count - - cover - - crack - - crash - - crawl - - cross - - crush - - cry - - cure - - curl - - curve - - cycle - - dam - - damage - - dance - - dare - - decay - - deceive - - decide - - decorate - - delay - - delight - - deliver - - depend - - describe - - desert - - deserve - - destroy - - detect - - develop - - disagree - - disappear - - disapprove - - disarm - - discover - - dislike - - divide - - double - - doubt - - drag - - drain - - dream - - dress - - drip - - drop - - drown - - drum - - dry - - dust - - earn - - educate - - embarrass - - employ - - empty - - encourage - - end - - enjoy - - enter - - entertain - - escape - - examine - - excite - - excuse - - exercise - - exist - - expand - - expect - - explain - - explode - - extend - - face - - fade - - fail - - fancy - - fasten - - fax - - fear - - fence - - fetch - - file - - fill - - film - - fire - - fit - - fix - - flap - - flash - - float - - flood - - flow - - flower - - fold - - follow - - fool - - force - - form - - found - - frame - - frighten - - fry - - gather - - gaze - - glow - - glue - - grab - - grate - - grease - - greet - - grin - - grip - - groan - - guarantee - - guard - - guess - - guide - - hammer - - hand - - handle - - hang - - happen - - harass - - harm - - hate - - haunt - - head - - heal - - heap - - heat - - help - - hook - - hop - - hope - - hover - - hug - - hum - - hunt - - hurry - - identify - - ignore - - imagine - - impress - - improve - - include - - increase - - influence - - inform - - inject - - injure - - instruct - - intend - - interest - - interfere - - interrupt - - introduce - - invent - - invite - - irritate - - itch - - jail - - jam - - jog - - join - - joke - - judge - - juggle - - jump - - kick - - kill - - kiss - - kneel - - knit - - knock - - knot - - label - - land - - last - - laugh - - launch - - learn - - level - - license - - lick - - lie - - lighten - - like - - list - - listen - - live - - load - - lock - - long - - look - - love - - man - - manage - - march - - mark - - marry - - match - - mate - - matter - - measure - - meddle - - melt - - memorise - - mend - - messup - - milk - - mine - - miss - - mix - - moan - - moor - - mourn - - move - - muddle - - mug - - multiply - - murder - - nail - - name - - need - - nest - - nod - - note - - notice - - number - - obey - - object - - observe - - obtain - - occur - - offend - - offer - - open - - order - - overflow - - owe - - own - - pack - - paddle - - paint - - park - - part - - pass - - paste - - pat - - pause - - peck - - pedal - - peel - - peep - - perform - - permit - - phone - - pick - - pinch - - pine - - place - - plan - - plant - - play - - please - - plug - - point - - poke - - polish - - pop - - possess - - post - - pour - - practise - - pray - - preach - - precede - - prefer - - prepare - - present - - preserve - - press - - pretend - - prevent - - prick - - print - - produce - - program - - promise - - protect - - provide - - pull - - pump - - punch - - puncture - - punish - - push - - question - - queue - - race - - radiate - - rain - - raise - - reach - - realise - - receive - - recognise - - record - - reduce - - reflect - - refuse - - regret - - reign - - reject - - rejoice - - relax - - release - - rely - - remain - - remember - - remind - - remove - - repair - - repeat - - replace - - reply - - report - - reproduce - - request - - rescue - - retire - - return - - rhyme - - rinse - - risk - - rob - - rock - - roll - - rot - - rub - - ruin - - rule - - rush - - sack - - sail - - satisfy - - save - - saw - - scare - - scatter - - scold - - scorch - - scrape - - scratch - - scream - - screw - - scribble - - scrub - - seal - - search - - separate - - serve - - settle - - shade - - share - - shave - - shelter - - shiver - - shock - - shop - - shriek - - shrug - - sigh - - sign - - signal - - sin - - sip - - ski - - skip - - slap - - slip - - slow - - smash - - smell - - smile - - smoke - - snatch - - sneeze - - sniff - - snore - - snow - - soak - - soothe - - sound - - spare - - spark - - sparkle - - spell - - spill - - spoil - - spot - - spray - - sprout - - squash - - squeak - - squeal - - squeeze - - stain - - stamp - - stare - - start - - stay - - steer - - step - - stir - - stitch - - stop - - store - - strap - - strengthen - - stretch - - stroke - - stuff - - subtract - - succeed - - suck - - suffer - - suggest - - suit - - supply - - support - - suppose - - surprise - - surround - - suspect - - suspend - - switch - - talk - - tame - - tap - - taste - - tease - - telephone - - tempt - - terrify - - test - - thank - - thaw - - tick - - tickle - - tie - - time - - tip - - tire - - touch - - tour - - tow - - trace - - trade - - train - - transport - - trap - - travel - - treat - - tremble - - trick - - trip - - trot - - trouble - - trust - - try - - tug - - tumble - - turn - - twist - - type - - unfasten - - unite - - unlock - - unpack - - untidy - - use - - vanish - - visit - - wail - - wait - - walk - - wander - - want - - warm - - warn - - wash - - waste - - watch - - water - - wave - - weigh - - welcome - - whine - - whip - - whirl - - whistle - - wink - - wipe - - wish - - wobble - - wonder - - work - - worry - - wrap - - wreck - - wrestle - - wriggle - - yawn - - yell - - zip - - zoom - - adorable - - adventurous - - aggressive - - alert - - attractive - - average - - beautiful - - blue-eyed - - bloody - - blushing - - bright - - clean - - clear - - cloudy - - colorful - - crowded - - cute - - dark - - drab - - distinct - - dull - - elegant - - excited - - fancy - - filthy - - glamorous - - gleaming - - gorgeous - - graceful - - grotesque - - handsome - - homely - - light - - long - - magnificent - - misty - - motionless - - muddy - - old-fashioned - - plain - - poised - - precious - - quaint - - shiny - - smoggy - - sparkling - - spotless - - stormy - - strange - - ugly - - ugliest - - unsightly - - unusual - - wide-eyed - - alive - - annoying - - bad - - better - - beautiful - - brainy - - breakable - - busy - - careful - - cautious - - clever - - clumsy - - concerned - - crazy - - curious - - dead - - different - - difficult - - doubtful - - easy - - expensive - - famous - - fragile - - frail - - gifted - - helpful - - helpless - - horrible - - important - - impossible - - inexpensive - - innocent - - inquisitive - - modern - - mushy - - odd - - open - - outstanding - - poor - - powerful - - prickly - - puzzled - - real - - rich - - shy - - sleepy - - stupid - - super - - talented - - tame - - tender - - tough - - uninterested - - vast - - wandering - - wild - - wrong - - angry - - annoyed - - anxious - - arrogant - - ashamed - - awful - - bad - - bewildered - - black - - blue - - bored - - clumsy - - combative - - condemned - - confused - - crazy,flipped-out - - creepy - - cruel - - dangerous - - defeated - - defiant - - depressed - - disgusted - - disturbed - - dizzy - - dull - - embarrassed - - envious - - evil - - fierce - - foolish - - frantic - - frightened - - grieving - - grumpy - - helpless - - homeless - - hungry - - hurt - - ill - - itchy - - jealous - - jittery - - lazy - - lonely - - mysterious - - nasty - - naughty - - nervous - - nutty - - obnoxious - - outrageous - - panicky - - repulsive - - scary - - selfish - - sore - - tense - - terrible - - testy - - thoughtless - - tired - - troubled - - upset - - uptight - - weary - - wicked - - worried - - agreeable - - amused - - brave - - calm - - charming - - cheerful - - comfortable - - cooperative - - courageous - - delightful - - determined - - eager - - elated - - enchanting - - encouraging - - energetic - - enthusiastic - - excited - - exuberant - - fair - - faithful - - fantastic - - fine - - friendly - - funny - - gentle - - glorious - - good - - happy - - healthy - - helpful - - hilarious - - jolly - - joyous - - kind - - lively - - lovely - - lucky - - nice - - obedient - - perfect - - pleasant - - proud - - relieved - - silly - - smiling - - splendid - - successful - - thankful - - thoughtful - - victorious - - vivacious - - witty - - wonderful - - zealous - - zany - - broad - - chubby - - crooked - - curved - - deep - - flat - - high - - hollow - - low - - narrow - - round - - shallow - - skinny - - square - - steep - - straight - - wide - - big - - colossal - - fat - - gigantic - - great - - huge - - immense - - large - - little - - mammoth - - massive - - miniature - - petite - - puny - - scrawny - - short - - small - - tall - - teeny - - teeny-tiny - - tiny - - cooing - - deafening - - faint - - harsh - - high-pitched - - hissing - - hushed - - husky - - loud - - melodic - - moaning - - mute - - noisy - - purring - - quiet - - raspy - - resonant - - screeching - - shrill - - silent - - soft - - squealing - - thundering - - voiceless - - whispering - - ancient - - brief - - early - - fast - - late - - long - - modern - - old - - old-fashioned - - quick - - rapid - - short - - slow - - swift - - young - - bitter - - delicious - - fresh - - juicy - - ripe - - rotten - - salty - - sour - - spicy - - stale - - sticky - - strong - - sweet - - tart - - tasteless - - tasty - - thirsty - - fluttering - - fuzzy - - greasy - - grubby - - hard - - hot - - icy - - loose - - melted - - nutritious - - plastic - - prickly - - rainy - - rough - - scattered - - shaggy - - shaky - - sharp - - shivering - - silky - - slimy - - slippery - - smooth - - soft - - solid - - steady - - sticky - - tender - - tight - - uneven - - weak - - wet - - wooden - - yummy - - boiling - - breezy - - broken - - bumpy - - chilly - - cold - - cool - - creepy - - crooked - - cuddly - - curly - - damaged - - damp - - dirty - - dry - - dusty - - filthy - - flaky - - fluffy - - freezing - - hot - - warm - - wet - - abundant - - empty - - few - - heavy - - light - - many - - numerous - - substantial - - capitalist diff --git a/Resources/Textures/DeltaV/Effects/speech.rsi/chitinid0.png b/Resources/Textures/DeltaV/Effects/speech.rsi/chitinid0.png deleted file mode 100644 index dc37e2d63bd..00000000000 Binary files a/Resources/Textures/DeltaV/Effects/speech.rsi/chitinid0.png and /dev/null differ diff --git a/Resources/Textures/DeltaV/Effects/speech.rsi/chitinid1.png b/Resources/Textures/DeltaV/Effects/speech.rsi/chitinid1.png deleted file mode 100644 index a8adc694b0a..00000000000 Binary files a/Resources/Textures/DeltaV/Effects/speech.rsi/chitinid1.png and /dev/null differ diff --git a/Resources/Textures/DeltaV/Effects/speech.rsi/chitinid2.png b/Resources/Textures/DeltaV/Effects/speech.rsi/chitinid2.png deleted file mode 100644 index 91bcf88fe5e..00000000000 Binary files a/Resources/Textures/DeltaV/Effects/speech.rsi/chitinid2.png and /dev/null differ diff --git a/Resources/Textures/DeltaV/Effects/speech.rsi/meta.json b/Resources/Textures/DeltaV/Effects/speech.rsi/meta.json index e39130bcbeb..1d4b09fbffe 100644 --- a/Resources/Textures/DeltaV/Effects/speech.rsi/meta.json +++ b/Resources/Textures/DeltaV/Effects/speech.rsi/meta.json @@ -23,40 +23,6 @@ }, { "name": "felinid2" - }, - { - "name": "chitinid0", - "delays": [ - [ - 0.2, - 0.3, - 0.3, - 0.3 - ] - ] - }, - { - "name": "chitinid1" - }, - { - "name": "chitinid2" - }, - { - "name": "thaven1" - }, - { - "name": "thaven2" - }, - { - "name": "thaven0", - "delays": [ - [ - 0.2, - 0.3, - 0.3, - 0.3 - ] - ] } ] } diff --git a/Resources/Textures/DeltaV/Effects/speech.rsi/thaven0.png b/Resources/Textures/DeltaV/Effects/speech.rsi/thaven0.png deleted file mode 100644 index 01053c9730e..00000000000 Binary files a/Resources/Textures/DeltaV/Effects/speech.rsi/thaven0.png and /dev/null differ diff --git a/Resources/Textures/DeltaV/Effects/speech.rsi/thaven1.png b/Resources/Textures/DeltaV/Effects/speech.rsi/thaven1.png deleted file mode 100644 index 9ed80eb55be..00000000000 Binary files a/Resources/Textures/DeltaV/Effects/speech.rsi/thaven1.png and /dev/null differ diff --git a/Resources/Textures/DeltaV/Effects/speech.rsi/thaven2.png b/Resources/Textures/DeltaV/Effects/speech.rsi/thaven2.png deleted file mode 100644 index c575d6dfeea..00000000000 Binary files a/Resources/Textures/DeltaV/Effects/speech.rsi/thaven2.png and /dev/null differ diff --git a/Resources/Textures/Effects/creampie.rsi/creampie_thaven.png b/Resources/Textures/Effects/creampie.rsi/creampie_thaven.png deleted file mode 100644 index 278c48a95d5..00000000000 Binary files a/Resources/Textures/Effects/creampie.rsi/creampie_thaven.png and /dev/null differ diff --git a/Resources/Textures/Effects/creampie.rsi/meta.json b/Resources/Textures/Effects/creampie.rsi/meta.json index 63dd1be1985..8db8a77945c 100644 --- a/Resources/Textures/Effects/creampie.rsi/meta.json +++ b/Resources/Textures/Effects/creampie.rsi/meta.json @@ -83,11 +83,6 @@ { "name": "creampie_xenomorph", "directions": 4 - }, - { - "name": "creampie_spelf", - "name": "creampie_thaven", - "directions": 4 } ] } diff --git a/Resources/Textures/_EE/Clothing/GloveJackets/insulated_jacket.rsi/equipped-OUTERCLOTHING-Xelthia.png b/Resources/Textures/_EE/Clothing/GloveJackets/insulated_jacket.rsi/equipped-OUTERCLOTHING-Xelthia.png deleted file mode 100644 index 8ee35db7f15..00000000000 Binary files a/Resources/Textures/_EE/Clothing/GloveJackets/insulated_jacket.rsi/equipped-OUTERCLOTHING-Xelthia.png and /dev/null differ diff --git a/Resources/Textures/_EE/Clothing/GloveJackets/insulated_jacket.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_EE/Clothing/GloveJackets/insulated_jacket.rsi/equipped-OUTERCLOTHING.png deleted file mode 100644 index e5b76702a5b..00000000000 Binary files a/Resources/Textures/_EE/Clothing/GloveJackets/insulated_jacket.rsi/equipped-OUTERCLOTHING.png and /dev/null differ diff --git a/Resources/Textures/_EE/Clothing/GloveJackets/insulated_jacket.rsi/icon.png b/Resources/Textures/_EE/Clothing/GloveJackets/insulated_jacket.rsi/icon.png deleted file mode 100644 index 314e8ae6e1e..00000000000 Binary files a/Resources/Textures/_EE/Clothing/GloveJackets/insulated_jacket.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/_EE/Clothing/GloveJackets/insulated_jacket.rsi/meta.json b/Resources/Textures/_EE/Clothing/GloveJackets/insulated_jacket.rsi/meta.json deleted file mode 100644 index 8894d36ce6f..00000000000 --- a/Resources/Textures/_EE/Clothing/GloveJackets/insulated_jacket.rsi/meta.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "By @Zeta_Null", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" - }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-Xelthia", - "directions": 4 - } - ] -} diff --git a/Resources/Textures/_EE/Clothing/GloveJackets/insulated_jacket_unmodified/equipped-OUTERCLOTHING-Xelthia.png b/Resources/Textures/_EE/Clothing/GloveJackets/insulated_jacket_unmodified/equipped-OUTERCLOTHING-Xelthia.png deleted file mode 100644 index 2db3dba4410..00000000000 Binary files a/Resources/Textures/_EE/Clothing/GloveJackets/insulated_jacket_unmodified/equipped-OUTERCLOTHING-Xelthia.png and /dev/null differ diff --git a/Resources/Textures/_EE/Clothing/GloveJackets/surgical_jacket.rsi/equipped-OUTERCLOTHING-Xelthia.png b/Resources/Textures/_EE/Clothing/GloveJackets/surgical_jacket.rsi/equipped-OUTERCLOTHING-Xelthia.png deleted file mode 100644 index 0eba7c9df37..00000000000 Binary files a/Resources/Textures/_EE/Clothing/GloveJackets/surgical_jacket.rsi/equipped-OUTERCLOTHING-Xelthia.png and /dev/null differ diff --git a/Resources/Textures/_EE/Clothing/GloveJackets/surgical_jacket.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_EE/Clothing/GloveJackets/surgical_jacket.rsi/equipped-OUTERCLOTHING.png deleted file mode 100644 index 65ae6c74b67..00000000000 Binary files a/Resources/Textures/_EE/Clothing/GloveJackets/surgical_jacket.rsi/equipped-OUTERCLOTHING.png and /dev/null differ diff --git a/Resources/Textures/_EE/Clothing/GloveJackets/surgical_jacket.rsi/icon.png b/Resources/Textures/_EE/Clothing/GloveJackets/surgical_jacket.rsi/icon.png deleted file mode 100644 index 422ef08bd89..00000000000 Binary files a/Resources/Textures/_EE/Clothing/GloveJackets/surgical_jacket.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/_EE/Clothing/GloveJackets/surgical_jacket.rsi/meta.json b/Resources/Textures/_EE/Clothing/GloveJackets/surgical_jacket.rsi/meta.json deleted file mode 100644 index 8894d36ce6f..00000000000 --- a/Resources/Textures/_EE/Clothing/GloveJackets/surgical_jacket.rsi/meta.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "By @Zeta_Null", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" - }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-Xelthia", - "directions": 4 - } - ] -} diff --git a/Resources/Textures/_EE/Effects/speech.rsi/meta.json b/Resources/Textures/_EE/Effects/speech.rsi/meta.json deleted file mode 100644 index a0256f278e3..00000000000 --- a/Resources/Textures/_EE/Effects/speech.rsi/meta.json +++ /dev/null @@ -1,45 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "Timfa", - "states": [ - { - "name": "thaven0", - "delays": [ - [ - 0.2, - 0.2, - 0.2, - 0.2 - ] - ] - }, - { - "name": "thaven1" - }, - { - "name": "thaven2" - }, - { - "name": "xelthia0", - "delays": [ - [ - 0.2, - 0.2, - 0.2, - 0.2 - ] - ] - }, - { - "name": "xelthia1" - }, - { - "name": "xelthia2" - } - ] -} diff --git a/Resources/Textures/_EE/Effects/speech.rsi/thaven0.png b/Resources/Textures/_EE/Effects/speech.rsi/thaven0.png deleted file mode 100644 index 1c2786ce47e..00000000000 Binary files a/Resources/Textures/_EE/Effects/speech.rsi/thaven0.png and /dev/null differ diff --git a/Resources/Textures/_EE/Effects/speech.rsi/thaven1.png b/Resources/Textures/_EE/Effects/speech.rsi/thaven1.png deleted file mode 100644 index 0764f3deda9..00000000000 Binary files a/Resources/Textures/_EE/Effects/speech.rsi/thaven1.png and /dev/null differ diff --git a/Resources/Textures/_EE/Effects/speech.rsi/thaven2.png b/Resources/Textures/_EE/Effects/speech.rsi/thaven2.png deleted file mode 100644 index 2ca4526db86..00000000000 Binary files a/Resources/Textures/_EE/Effects/speech.rsi/thaven2.png and /dev/null differ diff --git a/Resources/Textures/_EE/Effects/speech.rsi/xelthia0.png b/Resources/Textures/_EE/Effects/speech.rsi/xelthia0.png deleted file mode 100644 index 4fd493f6b91..00000000000 Binary files a/Resources/Textures/_EE/Effects/speech.rsi/xelthia0.png and /dev/null differ diff --git a/Resources/Textures/_EE/Effects/speech.rsi/xelthia1.png b/Resources/Textures/_EE/Effects/speech.rsi/xelthia1.png deleted file mode 100644 index 29c995feb98..00000000000 Binary files a/Resources/Textures/_EE/Effects/speech.rsi/xelthia1.png and /dev/null differ diff --git a/Resources/Textures/_EE/Effects/speech.rsi/xelthia2.png b/Resources/Textures/_EE/Effects/speech.rsi/xelthia2.png deleted file mode 100644 index dc7baf4bb2a..00000000000 Binary files a/Resources/Textures/_EE/Effects/speech.rsi/xelthia2.png and /dev/null differ diff --git a/Resources/Textures/_EE/Mobs/Customization/xelthia_parts.rsi/backspikes.png b/Resources/Textures/_EE/Mobs/Customization/xelthia_parts.rsi/backspikes.png deleted file mode 100644 index 7f7fb03d00c..00000000000 Binary files a/Resources/Textures/_EE/Mobs/Customization/xelthia_parts.rsi/backspikes.png and /dev/null differ diff --git a/Resources/Textures/_EE/Mobs/Customization/xelthia_parts.rsi/ears_normal.png b/Resources/Textures/_EE/Mobs/Customization/xelthia_parts.rsi/ears_normal.png deleted file mode 100644 index 1caff8526fd..00000000000 Binary files a/Resources/Textures/_EE/Mobs/Customization/xelthia_parts.rsi/ears_normal.png and /dev/null differ diff --git a/Resources/Textures/_EE/Mobs/Customization/xelthia_parts.rsi/ears_small.png b/Resources/Textures/_EE/Mobs/Customization/xelthia_parts.rsi/ears_small.png deleted file mode 100644 index 790261c446a..00000000000 Binary files a/Resources/Textures/_EE/Mobs/Customization/xelthia_parts.rsi/ears_small.png and /dev/null differ diff --git a/Resources/Textures/_EE/Mobs/Customization/xelthia_parts.rsi/hair_downandback.png b/Resources/Textures/_EE/Mobs/Customization/xelthia_parts.rsi/hair_downandback.png deleted file mode 100644 index 09788c8583c..00000000000 Binary files a/Resources/Textures/_EE/Mobs/Customization/xelthia_parts.rsi/hair_downandback.png and /dev/null differ diff --git a/Resources/Textures/_EE/Mobs/Customization/xelthia_parts.rsi/hair_fancy.png b/Resources/Textures/_EE/Mobs/Customization/xelthia_parts.rsi/hair_fancy.png deleted file mode 100644 index d33869e2892..00000000000 Binary files a/Resources/Textures/_EE/Mobs/Customization/xelthia_parts.rsi/hair_fancy.png and /dev/null differ diff --git a/Resources/Textures/_EE/Mobs/Customization/xelthia_parts.rsi/hair_longish.png b/Resources/Textures/_EE/Mobs/Customization/xelthia_parts.rsi/hair_longish.png deleted file mode 100644 index 181e1797171..00000000000 Binary files a/Resources/Textures/_EE/Mobs/Customization/xelthia_parts.rsi/hair_longish.png and /dev/null differ diff --git a/Resources/Textures/_EE/Mobs/Customization/xelthia_parts.rsi/hair_overeye.png b/Resources/Textures/_EE/Mobs/Customization/xelthia_parts.rsi/hair_overeye.png deleted file mode 100644 index 6a2b61b5106..00000000000 Binary files a/Resources/Textures/_EE/Mobs/Customization/xelthia_parts.rsi/hair_overeye.png and /dev/null differ diff --git a/Resources/Textures/_EE/Mobs/Customization/xelthia_parts.rsi/hair_short.png b/Resources/Textures/_EE/Mobs/Customization/xelthia_parts.rsi/hair_short.png deleted file mode 100644 index 5314ae28f14..00000000000 Binary files a/Resources/Textures/_EE/Mobs/Customization/xelthia_parts.rsi/hair_short.png and /dev/null differ diff --git a/Resources/Textures/_EE/Mobs/Customization/xelthia_parts.rsi/hair_standard.png b/Resources/Textures/_EE/Mobs/Customization/xelthia_parts.rsi/hair_standard.png deleted file mode 100644 index ae143445f23..00000000000 Binary files a/Resources/Textures/_EE/Mobs/Customization/xelthia_parts.rsi/hair_standard.png and /dev/null differ diff --git a/Resources/Textures/_EE/Mobs/Customization/xelthia_parts.rsi/hair_tripoint.png b/Resources/Textures/_EE/Mobs/Customization/xelthia_parts.rsi/hair_tripoint.png deleted file mode 100644 index 85dc114e68b..00000000000 Binary files a/Resources/Textures/_EE/Mobs/Customization/xelthia_parts.rsi/hair_tripoint.png and /dev/null differ diff --git a/Resources/Textures/_EE/Mobs/Customization/xelthia_parts.rsi/l_armspike.png b/Resources/Textures/_EE/Mobs/Customization/xelthia_parts.rsi/l_armspike.png deleted file mode 100644 index 04798e0add8..00000000000 Binary files a/Resources/Textures/_EE/Mobs/Customization/xelthia_parts.rsi/l_armspike.png and /dev/null differ diff --git a/Resources/Textures/_EE/Mobs/Customization/xelthia_parts.rsi/meta.json b/Resources/Textures/_EE/Mobs/Customization/xelthia_parts.rsi/meta.json deleted file mode 100644 index 202d5b654f4..00000000000 --- a/Resources/Textures/_EE/Mobs/Customization/xelthia_parts.rsi/meta.json +++ /dev/null @@ -1,75 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/Skyrat-SS13/Skyrat-tg/tree/40e3cdbb15b8bc0d5ef2fb46133adf805bda5297, while Argali, Ayrshire, Myrsore and Bighorn are drawn by Ubaser, and Kobold Ears are drawn by Pigeonpeas. Body_underbelly made by Nairod(github) for SS14. Large drawn by Ubaser. Wagging tail by SonicDC. Splotch modified from Sharp by KittenColony(github). Frills neckfull come from: https://github.com/Bubberstation/Bubberstation/commit/8bc6b83404803466a560b694bf22ef3c0ac266a2", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "tail_normal", - "directions": 4 - }, - { - "name": "tail_normal_behind", - "directions": 4 - }, - { - "name": "ears_normal", - "directions": 4 - }, - { - "name": "hair_standard", - "directions": 4 - }, - { - "name": "ears_small", - "directions": 4 - }, - { - "name": "hair_short", - "directions": 4 - }, - { - "name": "hair_longish", - "directions": 4 - }, - { - "name": "hair_overeye", - "directions": 4 - }, - { - "name": "hair_fancy", - "directions": 4 - }, - { - "name": "hair_tripoint", - "directions": 4 - }, - { - "name": "hair_downandback", - "directions": 4 - }, - { - "name": "backspikes", - "directions": 4 - }, - { - "name": "l_armspike", - "directions": 4 - }, - { - "name": "r_armspike", - "directions": 4 - }, - { - "name": "stripey", - "directions": 4 - }, - { - "name": "underbelly", - "directions": 4 - } - ] -} \ No newline at end of file diff --git a/Resources/Textures/_EE/Mobs/Customization/xelthia_parts.rsi/r_armspike.png b/Resources/Textures/_EE/Mobs/Customization/xelthia_parts.rsi/r_armspike.png deleted file mode 100644 index fb7ce477f12..00000000000 Binary files a/Resources/Textures/_EE/Mobs/Customization/xelthia_parts.rsi/r_armspike.png and /dev/null differ diff --git a/Resources/Textures/_EE/Mobs/Customization/xelthia_parts.rsi/stripey.png b/Resources/Textures/_EE/Mobs/Customization/xelthia_parts.rsi/stripey.png deleted file mode 100644 index f2bedda6f00..00000000000 Binary files a/Resources/Textures/_EE/Mobs/Customization/xelthia_parts.rsi/stripey.png and /dev/null differ diff --git a/Resources/Textures/_EE/Mobs/Customization/xelthia_parts.rsi/tail_normal.png b/Resources/Textures/_EE/Mobs/Customization/xelthia_parts.rsi/tail_normal.png deleted file mode 100644 index a1ba65d0035..00000000000 Binary files a/Resources/Textures/_EE/Mobs/Customization/xelthia_parts.rsi/tail_normal.png and /dev/null differ diff --git a/Resources/Textures/_EE/Mobs/Customization/xelthia_parts.rsi/tail_normal_behind.png b/Resources/Textures/_EE/Mobs/Customization/xelthia_parts.rsi/tail_normal_behind.png deleted file mode 100644 index 4590f361d34..00000000000 Binary files a/Resources/Textures/_EE/Mobs/Customization/xelthia_parts.rsi/tail_normal_behind.png and /dev/null differ diff --git a/Resources/Textures/_EE/Mobs/Customization/xelthia_parts.rsi/underbelly.png b/Resources/Textures/_EE/Mobs/Customization/xelthia_parts.rsi/underbelly.png deleted file mode 100644 index 79beb2821cc..00000000000 Binary files a/Resources/Textures/_EE/Mobs/Customization/xelthia_parts.rsi/underbelly.png and /dev/null differ diff --git a/Resources/Textures/_EE/Mobs/Species/Xelthia/displacement.rsi/backpack.png b/Resources/Textures/_EE/Mobs/Species/Xelthia/displacement.rsi/backpack.png deleted file mode 100644 index c9756796b81..00000000000 Binary files a/Resources/Textures/_EE/Mobs/Species/Xelthia/displacement.rsi/backpack.png and /dev/null differ diff --git a/Resources/Textures/_EE/Mobs/Species/Xelthia/displacement.rsi/held.png b/Resources/Textures/_EE/Mobs/Species/Xelthia/displacement.rsi/held.png deleted file mode 100644 index a782de22789..00000000000 Binary files a/Resources/Textures/_EE/Mobs/Species/Xelthia/displacement.rsi/held.png and /dev/null differ diff --git a/Resources/Textures/_EE/Mobs/Species/Xelthia/displacement.rsi/jumpsuit.png b/Resources/Textures/_EE/Mobs/Species/Xelthia/displacement.rsi/jumpsuit.png deleted file mode 100644 index b0de9c9d3f0..00000000000 Binary files a/Resources/Textures/_EE/Mobs/Species/Xelthia/displacement.rsi/jumpsuit.png and /dev/null differ diff --git a/Resources/Textures/_EE/Mobs/Species/Xelthia/displacement.rsi/jumpsuit_noholes.png b/Resources/Textures/_EE/Mobs/Species/Xelthia/displacement.rsi/jumpsuit_noholes.png deleted file mode 100644 index e4f6d99039f..00000000000 Binary files a/Resources/Textures/_EE/Mobs/Species/Xelthia/displacement.rsi/jumpsuit_noholes.png and /dev/null differ diff --git a/Resources/Textures/_EE/Mobs/Species/Xelthia/displacement.rsi/meta.json b/Resources/Textures/_EE/Mobs/Species/Xelthia/displacement.rsi/meta.json deleted file mode 100644 index 650460bdaff..00000000000 --- a/Resources/Textures/_EE/Mobs/Species/Xelthia/displacement.rsi/meta.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Made by Zeta_Null, edited from displacements by AstroDoge (Discord)", - "size": { - "x": 32, - "y": 32 - }, - "load": { - "srgb": false - }, - "states": [ - { - "name": "jumpsuit", - "directions": 4 - }, - { - "name": "jumpsuit_noholes", - "directions": 4 - }, - { - "name": "backpack", - "directions": 4 - }, - { - "name": "held", - "directions": 4 - } - ] -} diff --git a/Resources/Textures/_EE/Mobs/Species/Xelthia/parts.rsi/eyes.png b/Resources/Textures/_EE/Mobs/Species/Xelthia/parts.rsi/eyes.png deleted file mode 100644 index 470ff9bed86..00000000000 Binary files a/Resources/Textures/_EE/Mobs/Species/Xelthia/parts.rsi/eyes.png and /dev/null differ diff --git a/Resources/Textures/_EE/Mobs/Species/Xelthia/parts.rsi/full.png b/Resources/Textures/_EE/Mobs/Species/Xelthia/parts.rsi/full.png deleted file mode 100644 index 96ef3a7aaad..00000000000 Binary files a/Resources/Textures/_EE/Mobs/Species/Xelthia/parts.rsi/full.png and /dev/null differ diff --git a/Resources/Textures/_EE/Mobs/Species/Xelthia/parts.rsi/head_f.png b/Resources/Textures/_EE/Mobs/Species/Xelthia/parts.rsi/head_f.png deleted file mode 100644 index 0b25058887f..00000000000 Binary files a/Resources/Textures/_EE/Mobs/Species/Xelthia/parts.rsi/head_f.png and /dev/null differ diff --git a/Resources/Textures/_EE/Mobs/Species/Xelthia/parts.rsi/head_m.png b/Resources/Textures/_EE/Mobs/Species/Xelthia/parts.rsi/head_m.png deleted file mode 100644 index 0b25058887f..00000000000 Binary files a/Resources/Textures/_EE/Mobs/Species/Xelthia/parts.rsi/head_m.png and /dev/null differ diff --git a/Resources/Textures/_EE/Mobs/Species/Xelthia/parts.rsi/l_arm.png b/Resources/Textures/_EE/Mobs/Species/Xelthia/parts.rsi/l_arm.png deleted file mode 100644 index a270292975d..00000000000 Binary files a/Resources/Textures/_EE/Mobs/Species/Xelthia/parts.rsi/l_arm.png and /dev/null differ diff --git a/Resources/Textures/_EE/Mobs/Species/Xelthia/parts.rsi/l_foot.png b/Resources/Textures/_EE/Mobs/Species/Xelthia/parts.rsi/l_foot.png deleted file mode 100644 index 5fe217c9377..00000000000 Binary files a/Resources/Textures/_EE/Mobs/Species/Xelthia/parts.rsi/l_foot.png and /dev/null differ diff --git a/Resources/Textures/_EE/Mobs/Species/Xelthia/parts.rsi/l_hand.png b/Resources/Textures/_EE/Mobs/Species/Xelthia/parts.rsi/l_hand.png deleted file mode 100644 index e0676ff14e2..00000000000 Binary files a/Resources/Textures/_EE/Mobs/Species/Xelthia/parts.rsi/l_hand.png and /dev/null differ diff --git a/Resources/Textures/_EE/Mobs/Species/Xelthia/parts.rsi/l_leg.png b/Resources/Textures/_EE/Mobs/Species/Xelthia/parts.rsi/l_leg.png deleted file mode 100644 index fb79365fac3..00000000000 Binary files a/Resources/Textures/_EE/Mobs/Species/Xelthia/parts.rsi/l_leg.png and /dev/null differ diff --git a/Resources/Textures/_EE/Mobs/Species/Xelthia/parts.rsi/meta.json b/Resources/Textures/_EE/Mobs/Species/Xelthia/parts.rsi/meta.json deleted file mode 100644 index bc0a4e93b3d..00000000000 --- a/Resources/Textures/_EE/Mobs/Species/Xelthia/parts.rsi/meta.json +++ /dev/null @@ -1,66 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/tgstation/tgstation/blob/8024397cc81c5f47f74cf4279e35728487d0a1a7/icons/mob/human_parts_greyscale.dmi", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "full" - }, - { - "name": "head_f", - "directions": 4 - }, - { - "name": "head_m", - "directions": 4 - }, - { - "name": "l_arm", - "directions": 4 - }, - { - "name": "l_foot", - "directions": 4 - }, - { - "name": "l_hand", - "directions": 4 - }, - { - "name": "l_leg", - "directions": 4 - }, - { - "name": "r_arm", - "directions": 4 - }, - { - "name": "r_foot", - "directions": 4 - }, - { - "name": "r_hand", - "directions": 4 - }, - { - "name": "r_leg", - "directions": 4 - }, - { - "name": "torso_f", - "directions": 4 - }, - { - "name": "torso_m", - "directions": 4 - }, - { - "name": "eyes", - "directions": 4 - } - ] -} diff --git a/Resources/Textures/_EE/Mobs/Species/Xelthia/parts.rsi/r_arm.png b/Resources/Textures/_EE/Mobs/Species/Xelthia/parts.rsi/r_arm.png deleted file mode 100644 index a3a13bcf98d..00000000000 Binary files a/Resources/Textures/_EE/Mobs/Species/Xelthia/parts.rsi/r_arm.png and /dev/null differ diff --git a/Resources/Textures/_EE/Mobs/Species/Xelthia/parts.rsi/r_foot.png b/Resources/Textures/_EE/Mobs/Species/Xelthia/parts.rsi/r_foot.png deleted file mode 100644 index cc81ffeff8b..00000000000 Binary files a/Resources/Textures/_EE/Mobs/Species/Xelthia/parts.rsi/r_foot.png and /dev/null differ diff --git a/Resources/Textures/_EE/Mobs/Species/Xelthia/parts.rsi/r_hand.png b/Resources/Textures/_EE/Mobs/Species/Xelthia/parts.rsi/r_hand.png deleted file mode 100644 index eb0f5296a3b..00000000000 Binary files a/Resources/Textures/_EE/Mobs/Species/Xelthia/parts.rsi/r_hand.png and /dev/null differ diff --git a/Resources/Textures/_EE/Mobs/Species/Xelthia/parts.rsi/r_leg.png b/Resources/Textures/_EE/Mobs/Species/Xelthia/parts.rsi/r_leg.png deleted file mode 100644 index bc554395f9a..00000000000 Binary files a/Resources/Textures/_EE/Mobs/Species/Xelthia/parts.rsi/r_leg.png and /dev/null differ diff --git a/Resources/Textures/_EE/Mobs/Species/Xelthia/parts.rsi/torso_f.png b/Resources/Textures/_EE/Mobs/Species/Xelthia/parts.rsi/torso_f.png deleted file mode 100644 index 001b5ce85e9..00000000000 Binary files a/Resources/Textures/_EE/Mobs/Species/Xelthia/parts.rsi/torso_f.png and /dev/null differ diff --git a/Resources/Textures/_EE/Mobs/Species/Xelthia/parts.rsi/torso_m.png b/Resources/Textures/_EE/Mobs/Species/Xelthia/parts.rsi/torso_m.png deleted file mode 100644 index 001b5ce85e9..00000000000 Binary files a/Resources/Textures/_EE/Mobs/Species/Xelthia/parts.rsi/torso_m.png and /dev/null differ diff --git a/Resources/Textures/_EE/Objects/Consumable/Food/meat.rsi/meta.json b/Resources/Textures/_EE/Objects/Consumable/Food/meat.rsi/meta.json deleted file mode 100644 index e9b2005391f..00000000000 --- a/Resources/Textures/_EE/Objects/Consumable/Food/meat.rsi/meta.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Xelthia stuff by Zeta_Null", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "xelthia-tentacle" - }, - { - "name": "xelthia-tentacle-cooked" - } - ] -} diff --git a/Resources/Textures/_EE/Objects/Consumable/Food/meat.rsi/xelthia-tentacle-cooked.png b/Resources/Textures/_EE/Objects/Consumable/Food/meat.rsi/xelthia-tentacle-cooked.png deleted file mode 100644 index c0a2b4b26e0..00000000000 Binary files a/Resources/Textures/_EE/Objects/Consumable/Food/meat.rsi/xelthia-tentacle-cooked.png and /dev/null differ diff --git a/Resources/Textures/_EE/Objects/Consumable/Food/meat.rsi/xelthia-tentacle.png b/Resources/Textures/_EE/Objects/Consumable/Food/meat.rsi/xelthia-tentacle.png deleted file mode 100644 index f5a2f728dd9..00000000000 Binary files a/Resources/Textures/_EE/Objects/Consumable/Food/meat.rsi/xelthia-tentacle.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/meta.json b/Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/meta.json index e76209de8fa..cd161e0cedf 100644 --- a/Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/meta.json +++ b/Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/meta.json @@ -334,114 +334,6 @@ { "name": "rhinobeetle3", "directions": 4 - }, - { - "name": "chitinidbeetlehorn1", - "directions": 4 - }, - { - "name": "chitinidbeetlehorn2", - "directions": 4 - }, - { - "name": "thavenchestgills", - "directions": 4 - }, - { - "name": "thavenchestscales", - "directions": 4 - }, - { - "name": "thavenheadscales", - "directions": 4 - }, - { - "name": "thavenleftarmscales", - "directions": 4 - }, - { - "name": "thavenrightarmscales", - "directions": 4 - }, - { - "name": "thavenleftlegscales", - "directions": 4 - }, - { - "name": "thavenrightlegscales", - "directions": 4 - }, - { - "name": "thavenbignaturals", - "directions": 4 - }, - { - "name": "thavennonaturals", - "directions": 4 - }, - { - "name": "thavenfishears", - "directions": 4 - }, - { - "name": "thavenbitemark", - "directions": 4 - }, - { - "name": "thaventattoovines", - "directions": 4 - }, - { - "name": "thavenspines", - "directions": 4 - }, - { - "name": "thaventattoowave", - "directions": 4 - }, - { - "name": "thaventattoosharkminnoweyeliner", - "directions": 4 - }, - { - "name": "thaventiger1", - "directions": 4 - }, - { - "name": "thaventiger2", - "directions": 4 - }, - { - "name": "thaventigerarmsl", - "directions": 4 - }, - { - "name": "thaventigerarmsr", - "directions": 4 - }, - { - "name": "thavenbodystripes", - "directions": 4 - }, - { - "name": "thavenheadstripes", - "directions": 4 - }, - { - "name": "thavenearsbigfins", - "directions": 4 - }, - { - "name": "thavenearsbigfins2", - "directions": 4 - }, - { - "name": "thavenheadcap1", - "directions": 4 - }, - { - "name": "thavenheadcap2", - "directions": 4 } ] } diff --git a/Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/thavenbignaturals.png b/Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/thavenbignaturals.png deleted file mode 100644 index ffac641f6b7..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/thavenbignaturals.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/thavenbitemark.png b/Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/thavenbitemark.png deleted file mode 100644 index 6b3462a207e..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/thavenbitemark.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/thavenbodystripes.png b/Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/thavenbodystripes.png deleted file mode 100644 index d1853373952..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/thavenbodystripes.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/thavenchestgills.png b/Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/thavenchestgills.png deleted file mode 100644 index 353a7e6670e..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/thavenchestgills.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/thavenchestscales.png b/Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/thavenchestscales.png deleted file mode 100644 index 9dfd0fb2f50..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/thavenchestscales.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/thavenearsbigfins.png b/Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/thavenearsbigfins.png deleted file mode 100644 index b7bcb7ef523..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/thavenearsbigfins.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/thavenearsbigfins2.png b/Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/thavenearsbigfins2.png deleted file mode 100644 index 15b53149dcf..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/thavenearsbigfins2.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/thavenfishears.png b/Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/thavenfishears.png deleted file mode 100644 index 55c1a3a8afa..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/thavenfishears.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/thavenheadcap1.png b/Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/thavenheadcap1.png deleted file mode 100644 index 67d982f223b..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/thavenheadcap1.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/thavenheadcap2.png b/Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/thavenheadcap2.png deleted file mode 100644 index 2dc725c2e5c..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/thavenheadcap2.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/thavenheadscales.png b/Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/thavenheadscales.png deleted file mode 100644 index 73f68e18437..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/thavenheadscales.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/thavenheadstripes.png b/Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/thavenheadstripes.png deleted file mode 100644 index 6b7add18406..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/thavenheadstripes.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/thavenleftarmscales.png b/Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/thavenleftarmscales.png deleted file mode 100644 index 157ed888741..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/thavenleftarmscales.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/thavenleftlegscales.png b/Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/thavenleftlegscales.png deleted file mode 100644 index 895376f19d9..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/thavenleftlegscales.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/thavennonaturals.png b/Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/thavennonaturals.png deleted file mode 100644 index c9fb02d1a16..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/thavennonaturals.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/thavenrightarmscales.png b/Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/thavenrightarmscales.png deleted file mode 100644 index 510d9c9077a..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/thavenrightarmscales.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/thavenrightlegscales.png b/Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/thavenrightlegscales.png deleted file mode 100644 index deb6f1adcba..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/thavenrightlegscales.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/thavenspines.png b/Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/thavenspines.png deleted file mode 100644 index 73978b81193..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/thavenspines.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/thaventattoosharkminnoweyeliner.png b/Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/thaventattoosharkminnoweyeliner.png deleted file mode 100644 index 4424c14197d..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/thaventattoosharkminnoweyeliner.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/thaventattoovines.png b/Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/thaventattoovines.png deleted file mode 100644 index e921e89497a..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/thaventattoovines.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/thaventattoowave.png b/Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/thaventattoowave.png deleted file mode 100644 index fb0438a6eb5..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/thaventattoowave.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/thaventiger1.png b/Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/thaventiger1.png deleted file mode 100644 index a7d47e765fd..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/thaventiger1.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/thaventiger2.png b/Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/thaventiger2.png deleted file mode 100644 index 861b9ae13bf..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/thaventiger2.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/thaventigerarmsl.png b/Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/thaventigerarmsl.png deleted file mode 100644 index 9b6cea71dd1..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/thaventigerarmsl.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/thaventigerarmsr.png b/Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/thaventigerarmsr.png deleted file mode 100644 index 7d3feeb3674..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/thaventigerarmsr.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven.rsi/chesttat1.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven.rsi/chesttat1.png deleted file mode 100644 index 9808aa67b3d..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven.rsi/chesttat1.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven.rsi/ears1.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven.rsi/ears1.png deleted file mode 100644 index 88c5081cb90..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven.rsi/ears1.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven.rsi/ears2.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven.rsi/ears2.png deleted file mode 100644 index 255b21b8c0a..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven.rsi/ears2.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven.rsi/ears3.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven.rsi/ears3.png deleted file mode 100644 index 99f1e79b7cb..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven.rsi/ears3.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven.rsi/ears4.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven.rsi/ears4.png deleted file mode 100644 index a1286118bec..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven.rsi/ears4.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven.rsi/larmtat1.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven.rsi/larmtat1.png deleted file mode 100644 index 4999357dbb4..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven.rsi/larmtat1.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven.rsi/meta.json b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven.rsi/meta.json deleted file mode 100644 index 17f6720f2ee..00000000000 --- a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven.rsi/meta.json +++ /dev/null @@ -1,47 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "by Widgetbeck", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "ears1", - "directions": 4 - }, - { - "name": "ears2", - "directions": 4 - }, - { - "name": "ears3", - "directions": 4 - }, - { - "name": "ears4", - "directions": 4 - }, - { - "name": "piercings", - "directions": 4 - }, - { - "name": "piercings2", - "directions": 4 - }, - { - "name": "chesttat1", - "directions": 4 - }, - { - "name": "larmtat1", - "directions": 4 - }, - { - "name": "rarmtat1", - "directions": 4 - } - ] -} diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven.rsi/piercings.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven.rsi/piercings.png deleted file mode 100644 index aee5f3e8616..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven.rsi/piercings.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven.rsi/piercings2.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven.rsi/piercings2.png deleted file mode 100644 index e7743d12d8d..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven.rsi/piercings2.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven.rsi/rarmtat1.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven.rsi/rarmtat1.png deleted file mode 100644 index 53486d73bcd..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven.rsi/rarmtat1.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/80s.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/80s.png deleted file mode 100644 index c6947da0f17..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/80s.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/a.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/a.png deleted file mode 100644 index dc7e9786487..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/a.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/b.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/b.png deleted file mode 100644 index e4797a24f2d..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/b.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/bald.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/bald.png deleted file mode 100644 index 2975c479be7..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/bald.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/baldface.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/baldface.png deleted file mode 100644 index 761f190868e..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/baldface.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/bedhead.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/bedhead.png deleted file mode 100644 index 7ac12025629..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/bedhead.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/bedhead2.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/bedhead2.png deleted file mode 100644 index 9da0cfcb25b..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/bedhead2.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/bedhead3.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/bedhead3.png deleted file mode 100644 index a366b258197..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/bedhead3.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/beehive.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/beehive.png deleted file mode 100644 index f781934fcf0..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/beehive.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/beehive2.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/beehive2.png deleted file mode 100644 index 0d3682bcb62..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/beehive2.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/bigflattop.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/bigflattop.png deleted file mode 100644 index 663554c8c35..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/bigflattop.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/bigpompadour.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/bigpompadour.png deleted file mode 100644 index f935966d185..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/bigpompadour.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/bob.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/bob.png deleted file mode 100644 index 14b42723db2..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/bob.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/bob2.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/bob2.png deleted file mode 100644 index 645d94f16c1..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/bob2.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/bob4.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/bob4.png deleted file mode 100644 index 3c70986fee6..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/bob4.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/bob5.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/bob5.png deleted file mode 100644 index eb0ea4e8c16..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/bob5.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/bobcurl.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/bobcurl.png deleted file mode 100644 index 78377c7d3ef..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/bobcurl.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/bobcut.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/bobcut.png deleted file mode 100644 index d5f60c2cab8..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/bobcut.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/bowlcut.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/bowlcut.png deleted file mode 100644 index b3a91542405..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/bowlcut.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/bowlcut2.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/bowlcut2.png deleted file mode 100644 index 9ee6c7847ce..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/bowlcut2.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/braid.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/braid.png deleted file mode 100644 index a9dc0ddc0c1..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/braid.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/braid2.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/braid2.png deleted file mode 100644 index b25ebe1b9ee..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/braid2.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/braided.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/braided.png deleted file mode 100644 index b10d10c561a..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/braided.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/braidfront.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/braidfront.png deleted file mode 100644 index 4da07f76f8f..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/braidfront.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/braidtail.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/braidtail.png deleted file mode 100644 index ec9dc6f3720..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/braidtail.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/bun.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/bun.png deleted file mode 100644 index b988d153c27..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/bun.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/bun3.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/bun3.png deleted file mode 100644 index 3874908bf20..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/bun3.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/bunhead2.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/bunhead2.png deleted file mode 100644 index 7b4c11fc9c5..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/bunhead2.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/business.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/business.png deleted file mode 100644 index 81a48305a11..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/business.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/business2.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/business2.png deleted file mode 100644 index 81f6ebb2973..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/business2.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/business3.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/business3.png deleted file mode 100644 index 6bbd80679a0..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/business3.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/business4.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/business4.png deleted file mode 100644 index e35973ea613..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/business4.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/buzzcut.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/buzzcut.png deleted file mode 100644 index 20f5042b545..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/buzzcut.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/c.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/c.png deleted file mode 100644 index 0397bc20551..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/c.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/cia.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/cia.png deleted file mode 100644 index 394e8c0ca9d..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/cia.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/classicafro.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/classicafro.png deleted file mode 100644 index 2dd00a8725b..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/classicafro.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/classiccia.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/classiccia.png deleted file mode 100644 index 427e34807de..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/classiccia.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/classicciabusiness.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/classicciabusiness.png deleted file mode 100644 index 258aed5f2da..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/classicciabusiness.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/classiccornrows.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/classiccornrows.png deleted file mode 100644 index 3c5ca06e190..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/classiccornrows.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/classicfloorlength_bedhead.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/classicfloorlength_bedhead.png deleted file mode 100644 index c60a079b5a0..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/classicfloorlength_bedhead.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/classiclong2.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/classiclong2.png deleted file mode 100644 index a3f406a73af..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/classiclong2.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/classiclong3.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/classiclong3.png deleted file mode 100644 index b8652c945c3..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/classiclong3.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/classicmodern.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/classicmodern.png deleted file mode 100644 index adca06ce496..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/classicmodern.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/classicmulder.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/classicmulder.png deleted file mode 100644 index a1ff55398ea..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/classicmulder.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/classicwisp.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/classicwisp.png deleted file mode 100644 index d8bc7837fe7..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/classicwisp.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/coffeehouse.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/coffeehouse.png deleted file mode 100644 index 342d08252f1..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/coffeehouse.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/combover.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/combover.png deleted file mode 100644 index b880f6140cd..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/combover.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/cornrowbraid.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/cornrowbraid.png deleted file mode 100644 index 0df721e7a40..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/cornrowbraid.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/cornrowbun.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/cornrowbun.png deleted file mode 100644 index b7dc85cf281..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/cornrowbun.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/cornrows.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/cornrows.png deleted file mode 100644 index ac9faecce7c..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/cornrows.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/cornrows2.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/cornrows2.png deleted file mode 100644 index 212d418d5bb..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/cornrows2.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/cornrowtail.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/cornrowtail.png deleted file mode 100644 index e4fd7e6c968..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/cornrowtail.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/country.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/country.png deleted file mode 100644 index e919849e8eb..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/country.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/crewcut.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/crewcut.png deleted file mode 100644 index eccd95eeddc..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/crewcut.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/crewcut2.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/crewcut2.png deleted file mode 100644 index cb77412faab..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/crewcut2.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/curls.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/curls.png deleted file mode 100644 index a6221b56dae..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/curls.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/d.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/d.png deleted file mode 100644 index 17e47f3ad38..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/d.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/dandypompadour.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/dandypompadour.png deleted file mode 100644 index 30916d69eaf..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/dandypompadour.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/devilock.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/devilock.png deleted file mode 100644 index 76c36c9c789..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/devilock.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/doublebun.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/doublebun.png deleted file mode 100644 index 45e3ad009d0..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/doublebun.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/doublebun_long.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/doublebun_long.png deleted file mode 100644 index ce92b9c88ec..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/doublebun_long.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/dreads.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/dreads.png deleted file mode 100644 index eeb64977a3d..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/dreads.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/drillhair.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/drillhair.png deleted file mode 100644 index 0aa08c65d15..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/drillhair.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/drillhairextended.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/drillhairextended.png deleted file mode 100644 index 62f87e65ee7..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/drillhairextended.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/drillruru.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/drillruru.png deleted file mode 100644 index 9b926688d8b..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/drillruru.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/e.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/e.png deleted file mode 100644 index 0fa54476886..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/e.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/emo2.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/emo2.png deleted file mode 100644 index 98592307865..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/emo2.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/emofringe.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/emofringe.png deleted file mode 100644 index c7fd27b8bfd..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/emofringe.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/f.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/f.png deleted file mode 100644 index 35c911c228a..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/f.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/father.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/father.png deleted file mode 100644 index b024ff4afc1..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/father.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/feather.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/feather.png deleted file mode 100644 index 4362e5ccaaf..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/feather.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/flair.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/flair.png deleted file mode 100644 index c5eb356d609..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/flair.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/floorlength_bedhead.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/floorlength_bedhead.png deleted file mode 100644 index a05dacf9060..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/floorlength_bedhead.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/frenchbraid.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/frenchbraid.png deleted file mode 100644 index cf839ffb88c..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/frenchbraid.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/fringetail.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/fringetail.png deleted file mode 100644 index 8c0072e06e1..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/fringetail.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/gelled.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/gelled.png deleted file mode 100644 index bc0f32f847f..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/gelled.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/gentle.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/gentle.png deleted file mode 100644 index a2b6acd378d..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/gentle.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/halfbang.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/halfbang.png deleted file mode 100644 index a94396ce984..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/halfbang.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/halfbang2.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/halfbang2.png deleted file mode 100644 index a93c6f6ff71..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/halfbang2.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/halfshaved.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/halfshaved.png deleted file mode 100644 index 99483967969..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/halfshaved.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/hbraid.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/hbraid.png deleted file mode 100644 index 3b347bfd277..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/hbraid.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/hedgehog.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/hedgehog.png deleted file mode 100644 index 630fc1a256f..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/hedgehog.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/highfade.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/highfade.png deleted file mode 100644 index 800039dda4c..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/highfade.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/highponytail.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/highponytail.png deleted file mode 100644 index 7de84eb9836..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/highponytail.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/himecut.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/himecut.png deleted file mode 100644 index 52a68643971..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/himecut.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/himecut2.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/himecut2.png deleted file mode 100644 index f5b7ee3dd30..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/himecut2.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/himeup.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/himeup.png deleted file mode 100644 index a1a1758c56a..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/himeup.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/hitop.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/hitop.png deleted file mode 100644 index 7f12120c86e..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/hitop.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/jade.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/jade.png deleted file mode 100644 index 03a8d6c6e8b..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/jade.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/jensen.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/jensen.png deleted file mode 100644 index 739ed79ba3e..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/jensen.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/joestar.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/joestar.png deleted file mode 100644 index d92e0b40a85..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/joestar.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/kagami.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/kagami.png deleted file mode 100644 index d2100a1bfed..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/kagami.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/keanu.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/keanu.png deleted file mode 100644 index 207a6b217f0..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/keanu.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/kusanagi.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/kusanagi.png deleted file mode 100644 index a239b0b98a2..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/kusanagi.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/largebun.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/largebun.png deleted file mode 100644 index 32897398992..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/largebun.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/lbangs.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/lbangs.png deleted file mode 100644 index 390c3d4aee1..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/lbangs.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/long.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/long.png deleted file mode 100644 index 8fff78dd653..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/long.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/long2.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/long2.png deleted file mode 100644 index 137707a8162..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/long2.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/long3.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/long3.png deleted file mode 100644 index ba4dd3fabcd..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/long3.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/long_bedhead.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/long_bedhead.png deleted file mode 100644 index b7c47a19156..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/long_bedhead.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/long_bedhead2.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/long_bedhead2.png deleted file mode 100644 index c2bc5a0e954..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/long_bedhead2.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/longbundled.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/longbundled.png deleted file mode 100644 index 9d293b7f242..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/longbundled.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/longeremo.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/longeremo.png deleted file mode 100644 index 9b8b5cb6ec2..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/longeremo.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/longest.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/longest.png deleted file mode 100644 index c543fd3efdc..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/longest.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/longest2.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/longest2.png deleted file mode 100644 index 73a218ce266..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/longest2.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/longfringe.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/longfringe.png deleted file mode 100644 index a59faffafc0..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/longfringe.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/longovereye.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/longovereye.png deleted file mode 100644 index 362bc1d4537..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/longovereye.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/longsidepart.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/longsidepart.png deleted file mode 100644 index 3836260ac19..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/longsidepart.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/longstraightponytail.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/longstraightponytail.png deleted file mode 100644 index 8420878407c..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/longstraightponytail.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/lowfade.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/lowfade.png deleted file mode 100644 index ffe9352c2db..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/lowfade.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/manbun.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/manbun.png deleted file mode 100644 index 15ff5671465..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/manbun.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/medfade.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/medfade.png deleted file mode 100644 index 2d27d0a9a0b..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/medfade.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/mediumsidepart.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/mediumsidepart.png deleted file mode 100644 index 42334028fdf..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/mediumsidepart.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/megaeyebrows.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/megaeyebrows.png deleted file mode 100644 index 5841ce0df33..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/megaeyebrows.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/messy.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/messy.png deleted file mode 100644 index 9ea83142685..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/messy.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/meta.json b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/meta.json deleted file mode 100644 index 19107c5b765..00000000000 --- a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/meta.json +++ /dev/null @@ -1,759 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "copyright": "Taken from https://github.com/tgstation/tgstation/blob/05ec94e46349c35e29ca91e5e97d0c88ae26ad44/icons/mob/species/human/human_face.dmi ,resprited by Alekshhh, a modified by potato1234x, uneven and tailed is drawn by Ubaser, doublebun_long by Emisse, longbundled and bob5 sprited by github:DreamlyJack(624946166152298517)", - "license": "CC-BY-SA-3.0", - "states": [ - { - "name": "80s", - "directions": 4 - }, - { - "name": "a", - "directions": 4 - }, - { - "name": "b", - "directions": 4 - }, - { - "name": "bald", - "directions": 4 - }, - { - "name": "baldface", - "directions": 4 - }, - { - "name": "bedhead", - "directions": 4 - }, - { - "name": "bedhead2", - "directions": 4 - }, - { - "name": "bedhead3", - "directions": 4 - }, - { - "name": "beehive", - "directions": 4 - }, - { - "name": "beehive2", - "directions": 4 - }, - { - "name": "bigflattop", - "directions": 4 - }, - { - "name": "bigpompadour", - "directions": 4 - }, - { - "name": "bob", - "directions": 4 - }, - { - "name": "bob2", - "directions": 4 - }, - { - "name": "bob4", - "directions": 4 - }, - { - "name": "bob5", - "directions": 4 - }, - { - "name": "bobcurl", - "directions": 4 - }, - { - "name": "bobcut", - "directions": 4 - }, - { - "name": "bowlcut", - "directions": 4 - }, - { - "name": "bowlcut2", - "directions": 4 - }, - { - "name": "braid", - "directions": 4 - }, - { - "name": "braid2", - "directions": 4 - }, - { - "name": "braided", - "directions": 4 - }, - { - "name": "braidfront", - "directions": 4 - }, - { - "name": "braidtail", - "directions": 4 - }, - { - "name": "bun", - "directions": 4 - }, - { - "name": "bun3", - "directions": 4 - }, - { - "name": "bunhead2", - "directions": 4 - }, - { - "name": "business", - "directions": 4 - }, - { - "name": "business2", - "directions": 4 - }, - { - "name": "business3", - "directions": 4 - }, - { - "name": "business4", - "directions": 4 - }, - { - "name": "buzzcut", - "directions": 4 - }, - { - "name": "c", - "directions": 4 - }, - { - "name": "classicciabusiness", - "directions": 4 - }, - { - "name": "classiccia", - "directions": 4 - }, - { - "name": "classiccornrows", - "directions": 4 - }, - { - "name": "classicfloorlength_bedhead", - "directions": 4 - }, - { - "name": "classicmodern", - "directions": 4 - }, - { - "name": "classicmulder", - "directions": 4 - }, - { - "name": "classicwisp", - "directions": 4 - }, - { - "name": "cia", - "directions": 4 - }, - { - "name": "coffeehouse", - "directions": 4 - }, - { - "name": "combover", - "directions": 4 - }, - { - "name": "cornrowbraid", - "directions": 4 - }, - { - "name": "cornrowbun", - "directions": 4 - }, - { - "name": "cornrows", - "directions": 4 - }, - { - "name": "cornrows2", - "directions": 4 - }, - { - "name": "cornrowtail", - "directions": 4 - }, - { - "name": "country", - "directions": 4 - }, - { - "name": "crewcut", - "directions": 4 - }, - { - "name": "crewcut2", - "directions": 4 - }, - { - "name": "curls", - "directions": 4 - }, - { - "name": "d", - "directions": 4 - }, - { - "name": "dandypompadour", - "directions": 4 - }, - { - "name": "devilock", - "directions": 4 - }, - { - "name": "doublebun", - "directions": 4 - }, - { - "name": "doublebun_long", - "directions": 4 - }, - { - "name": "dreads", - "directions": 4 - }, - { - "name": "drillhair", - "directions": 4 - }, - { - "name": "drillhairextended", - "directions": 4 - }, - { - "name": "drillruru", - "directions": 4 - }, - { - "name": "e", - "directions": 4 - }, - { - "name": "emo2", - "directions": 4 - }, - { - "name": "emofringe", - "directions": 4 - }, - { - "name": "f", - "directions": 4 - }, - { - "name": "father", - "directions": 4 - }, - { - "name": "feather", - "directions": 4 - }, - { - "name": "flair", - "directions": 4 - }, - { - "name": "floorlength_bedhead", - "directions": 4 - }, - { - "name": "fringetail", - "directions": 4 - }, - { - "name": "gelled", - "directions": 4 - }, - { - "name": "gentle", - "directions": 4 - }, - { - "name": "halfbang", - "directions": 4 - }, - { - "name": "halfbang2", - "directions": 4 - }, - { - "name": "halfshaved", - "directions": 4 - }, - { - "name": "hbraid", - "directions": 4 - }, - { - "name": "hedgehog", - "directions": 4 - }, - { - "name": "highfade", - "directions": 4 - }, - { - "name": "highponytail", - "directions": 4 - }, - { - "name": "himecut", - "directions": 4 - }, - { - "name": "himecut2", - "directions": 4 - }, - { - "name": "himeup", - "directions": 4 - }, - { - "name": "hitop", - "directions": 4 - }, - { - "name": "jade", - "directions": 4 - }, - { - "name": "jensen", - "directions": 4 - }, - { - "name": "joestar", - "directions": 4 - }, - { - "name": "kagami", - "directions": 4 - }, - { - "name": "keanu", - "directions": 4 - }, - { - "name": "kusanagi", - "directions": 4 - }, - { - "name": "largebun", - "directions": 4 - }, - { - "name": "lbangs", - "directions": 4 - }, - { - "name": "long", - "directions": 4 - }, - { - "name": "long2", - "directions": 4 - }, - { - "name": "long3", - "directions": 4 - }, - { - "name": "longbundled", - "directions": 4 - }, - { - "name": "long_bedhead", - "directions": 4 - }, - { - "name": "long_bedhead2", - "directions": 4 - }, - { - "name": "longest", - "directions": 4 - }, - { - "name": "longest2", - "directions": 4 - }, - { - "name": "longfringe", - "directions": 4 - }, - { - "name": "longovereye", - "directions": 4 - }, - { - "name": "longsidepart", - "directions": 4 - }, - { - "name": "longstraightponytail", - "directions": 4 - }, - { - "name": "lowfade", - "directions": 4 - }, - { - "name": "manbun", - "directions": 4 - }, - { - "name": "medfade", - "directions": 4 - }, - { - "name": "mediumsidepart", - "directions": 4 - }, - { - "name": "megaeyebrows", - "directions": 4 - }, - { - "name": "messy", - "directions": 4 - }, - { - "name": "modern", - "directions": 4 - }, - { - "name": "mulder", - "directions": 4 - }, - { - "name": "nitori", - "directions": 4 - }, - { - "name": "nofade", - "directions": 4 - }, - { - "name": "odango", - "directions": 4 - }, - { - "name": "ombre", - "directions": 4 - }, - { - "name": "oneshoulder", - "directions": 4 - }, - { - "name": "oxton", - "directions": 4 - }, - { - "name": "part", - "directions": 4 - }, - { - "name": "parted", - "directions": 4 - }, - { - "name": "pigtails", - "directions": 4 - }, - { - "name": "pigtails2", - "directions": 4 - }, - { - "name": "pixie", - "directions": 4 - }, - { - "name": "pompadour", - "directions": 4 - }, - { - "name": "ponytail", - "directions": 4 - }, - { - "name": "ponytail2", - "directions": 4 - }, - { - "name": "ponytail3", - "directions": 4 - }, - { - "name": "ponytail4", - "directions": 4 - }, - { - "name": "ponytail5", - "directions": 4 - }, - { - "name": "ponytail6", - "directions": 4 - }, - { - "name": "ponytail7", - "directions": 4 - }, - { - "name": "poofy", - "directions": 4 - }, - { - "name": "protagonist", - "directions": 4 - }, - { - "name": "quiff", - "directions": 4 - }, - { - "name": "reversemohawk", - "directions": 4 - }, - { - "name": "ronin", - "directions": 4 - }, - { - "name": "rosa", - "directions": 4 - }, - { - "name": "sargeant", - "directions": 4 - }, - { - "name": "shaved", - "directions": 4 - }, - { - "name": "shavedmohawk", - "directions": 4 - }, - { - "name": "shavedpart", - "directions": 4 - }, - { - "name": "shortbangs", - "directions": 4 - }, - { - "name": "shortbraid", - "directions": 4 - }, - { - "name": "shorthair2", - "directions": 4 - }, - { - "name": "shorthair3", - "directions": 4 - }, - { - "name": "shorthair9", - "directions": 4 - }, - { - "name": "shorthime", - "directions": 4 - }, - { - "name": "shortovereye", - "directions": 4 - }, - { - "name": "sidecut", - "directions": 4 - }, - { - "name": "sidetail", - "directions": 4 - }, - { - "name": "sidetail2", - "directions": 4 - }, - { - "name": "sidetail3", - "directions": 4 - }, - { - "name": "sidetail4", - "directions": 4 - }, - { - "name": "skinhead", - "directions": 4 - }, - { - "name": "spiky", - "directions": 4 - }, - { - "name": "spikyponytail", - "directions": 4 - }, - { - "name": "spookylong", - "directions": 4 - }, - { - "name": "stail", - "directions": 4 - }, - { - "name": "swept", - "directions": 4 - }, - { - "name": "swept2", - "directions": 4 - }, - { - "name": "shoulderlengthovereye", - "directions": 4 - }, - { - "name": "thinning", - "directions": 4 - }, - { - "name": "thinningfront", - "directions": 4 - }, - { - "name": "thinningrear", - "directions": 4 - }, - { - "name": "tightbun", - "directions": 4 - }, - { - "name": "topknot", - "directions": 4 - }, - { - "name": "tressshoulder", - "directions": 4 - }, - { - "name": "trimflat", - "directions": 4 - }, - { - "name": "trimmed", - "directions": 4 - }, - { - "name": "twintail", - "directions": 4 - }, - { - "name": "twostrands", - "directions": 4 - }, - { - "name": "undercut", - "directions": 4 - }, - { - "name": "undercutleft", - "directions": 4 - }, - { - "name": "undercutright", - "directions": 4 - }, - { - "name": "unkept", - "directions": 4 - }, - { - "name": "veryshortovereyealternate", - "directions": 4 - }, - { - "name": "vlong", - "directions": 4 - }, - { - "name": "vlongfringe", - "directions": 4 - }, - { - "name": "volaju", - "directions": 4 - }, - { - "name": "wisp", - "directions": 4 - }, - { - "name": "uneven", - "directions": 4 - }, - { - "name": "tailed", - "directions": 4 - }, - { - "name": "classiclong2", - "directions": 4 - }, - { - "name": "classiclong3", - "directions": 4 - }, - { - "name": "classicafro", - "directions": 4 - }, - { - "name": "longeremo", - "directions": 4 - }, - { - "name": "frenchbraid", - "directions": 4 - } - ] - } diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/modern.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/modern.png deleted file mode 100644 index dcd10140a88..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/modern.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/mulder.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/mulder.png deleted file mode 100644 index 1e83cd8a59e..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/mulder.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/nitori.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/nitori.png deleted file mode 100644 index 5aa1ce748b2..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/nitori.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/nofade.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/nofade.png deleted file mode 100644 index 8d2b5bf7033..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/nofade.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/odango.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/odango.png deleted file mode 100644 index a5580c5e7c9..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/odango.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/ombre.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/ombre.png deleted file mode 100644 index 33a3fbafbde..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/ombre.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/oneshoulder.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/oneshoulder.png deleted file mode 100644 index e5a37c4f2e3..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/oneshoulder.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/oxton.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/oxton.png deleted file mode 100644 index 29afa9ee881..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/oxton.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/part.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/part.png deleted file mode 100644 index e96811a16d1..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/part.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/parted.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/parted.png deleted file mode 100644 index 8931dec647c..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/parted.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/pigtails.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/pigtails.png deleted file mode 100644 index ed568083562..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/pigtails.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/pigtails2.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/pigtails2.png deleted file mode 100644 index 1fb33d4c51f..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/pigtails2.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/pixie.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/pixie.png deleted file mode 100644 index 3cdb4b3cf17..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/pixie.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/pompadour.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/pompadour.png deleted file mode 100644 index ac83f28dd18..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/pompadour.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/ponytail.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/ponytail.png deleted file mode 100644 index 5bff29fa82f..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/ponytail.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/ponytail2.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/ponytail2.png deleted file mode 100644 index ad24f5706d5..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/ponytail2.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/ponytail3.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/ponytail3.png deleted file mode 100644 index 62315e41956..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/ponytail3.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/ponytail4.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/ponytail4.png deleted file mode 100644 index e0b4255cb77..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/ponytail4.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/ponytail5.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/ponytail5.png deleted file mode 100644 index 477b1fef28c..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/ponytail5.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/ponytail6.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/ponytail6.png deleted file mode 100644 index 951880deae7..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/ponytail6.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/ponytail7.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/ponytail7.png deleted file mode 100644 index 4f1a80aced2..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/ponytail7.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/poofy.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/poofy.png deleted file mode 100644 index b96d15dc740..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/poofy.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/protagonist.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/protagonist.png deleted file mode 100644 index 14d284e46b2..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/protagonist.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/quiff.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/quiff.png deleted file mode 100644 index 53279b461ad..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/quiff.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/reversemohawk.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/reversemohawk.png deleted file mode 100644 index bd21b9dae08..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/reversemohawk.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/ronin.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/ronin.png deleted file mode 100644 index ee5146d88cf..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/ronin.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/rosa.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/rosa.png deleted file mode 100644 index 25fb89be197..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/rosa.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/sargeant.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/sargeant.png deleted file mode 100644 index 5a071d3d1bf..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/sargeant.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/shaved.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/shaved.png deleted file mode 100644 index 25c45b8b719..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/shaved.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/shavedmohawk.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/shavedmohawk.png deleted file mode 100644 index 8395ae19e12..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/shavedmohawk.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/shavedpart.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/shavedpart.png deleted file mode 100644 index 8fd7cc031ba..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/shavedpart.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/shortbangs.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/shortbangs.png deleted file mode 100644 index d0a999c45c9..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/shortbangs.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/shortbraid.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/shortbraid.png deleted file mode 100644 index 5a0dbfa2774..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/shortbraid.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/shorthair2.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/shorthair2.png deleted file mode 100644 index cca03aec16b..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/shorthair2.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/shorthair3.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/shorthair3.png deleted file mode 100644 index f7e2a74a4b1..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/shorthair3.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/shorthair9.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/shorthair9.png deleted file mode 100644 index 02852dfae69..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/shorthair9.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/shorthime.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/shorthime.png deleted file mode 100644 index 307fceed8cb..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/shorthime.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/shortovereye.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/shortovereye.png deleted file mode 100644 index c7ae6a37400..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/shortovereye.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/shoulderlengthovereye.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/shoulderlengthovereye.png deleted file mode 100644 index fbc3586c45f..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/shoulderlengthovereye.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/sidecut.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/sidecut.png deleted file mode 100644 index 01fa7a80098..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/sidecut.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/sidetail.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/sidetail.png deleted file mode 100644 index 60498b9a45c..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/sidetail.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/sidetail2.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/sidetail2.png deleted file mode 100644 index 9708672a6f4..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/sidetail2.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/sidetail3.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/sidetail3.png deleted file mode 100644 index 377b2c30ab4..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/sidetail3.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/sidetail4.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/sidetail4.png deleted file mode 100644 index 2dd2ac965bf..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/sidetail4.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/skinhead.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/skinhead.png deleted file mode 100644 index c88a9540c63..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/skinhead.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/spiky.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/spiky.png deleted file mode 100644 index e9aeb7e440c..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/spiky.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/spikyponytail.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/spikyponytail.png deleted file mode 100644 index 8f439234dae..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/spikyponytail.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/spookylong.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/spookylong.png deleted file mode 100644 index 0fb0a878d12..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/spookylong.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/stail.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/stail.png deleted file mode 100644 index db9f7b439d9..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/stail.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/swept.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/swept.png deleted file mode 100644 index bc079308dbf..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/swept.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/swept2.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/swept2.png deleted file mode 100644 index 492f38f437f..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/swept2.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/tailed.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/tailed.png deleted file mode 100644 index b957423e4c5..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/tailed.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/thinning.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/thinning.png deleted file mode 100644 index 962191356d2..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/thinning.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/thinningfront.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/thinningfront.png deleted file mode 100644 index 8be8e188216..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/thinningfront.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/thinningrear.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/thinningrear.png deleted file mode 100644 index d5393072cf8..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/thinningrear.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/tightbun.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/tightbun.png deleted file mode 100644 index 03a4862ba35..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/tightbun.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/topknot.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/topknot.png deleted file mode 100644 index ccd5fa43e75..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/topknot.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/tressshoulder.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/tressshoulder.png deleted file mode 100644 index 2d1d3a2864a..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/tressshoulder.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/trimflat.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/trimflat.png deleted file mode 100644 index 750e0b51d87..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/trimflat.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/trimmed.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/trimmed.png deleted file mode 100644 index 3159d988174..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/trimmed.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/twintail.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/twintail.png deleted file mode 100644 index 22e8ab0d2af..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/twintail.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/twostrands.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/twostrands.png deleted file mode 100644 index eb1eca23ad0..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/twostrands.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/undercut.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/undercut.png deleted file mode 100644 index 76ccd58fcfc..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/undercut.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/undercutleft.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/undercutleft.png deleted file mode 100644 index e997d6ce93f..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/undercutleft.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/undercutright.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/undercutright.png deleted file mode 100644 index 1b6659e13fb..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/undercutright.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/uneven.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/uneven.png deleted file mode 100644 index e2d2c99914a..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/uneven.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/unkept.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/unkept.png deleted file mode 100644 index a849ea073fa..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/unkept.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/veryshortovereyealternate.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/veryshortovereyealternate.png deleted file mode 100644 index ba253a5a41b..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/veryshortovereyealternate.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/vlong.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/vlong.png deleted file mode 100644 index 736da454b15..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/vlong.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/vlongfringe.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/vlongfringe.png deleted file mode 100644 index 8044c5c9d15..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/vlongfringe.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/volaju.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/volaju.png deleted file mode 100644 index 92802d4bc0a..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/volaju.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/wisp.png b/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/wisp.png deleted file mode 100644 index cc48199908c..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Customization/thaven/thaven_hair.rsi/wisp.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Species/Thaven/displacement.rsi/eyes.png b/Resources/Textures/_Impstation/Mobs/Species/Thaven/displacement.rsi/eyes.png deleted file mode 100644 index 6c3e479bb49..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Species/Thaven/displacement.rsi/eyes.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Species/Thaven/displacement.rsi/hands.png b/Resources/Textures/_Impstation/Mobs/Species/Thaven/displacement.rsi/hands.png deleted file mode 100644 index e4ea6c7328c..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Species/Thaven/displacement.rsi/hands.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Species/Thaven/displacement.rsi/head.png b/Resources/Textures/_Impstation/Mobs/Species/Thaven/displacement.rsi/head.png deleted file mode 100644 index 6c3e479bb49..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Species/Thaven/displacement.rsi/head.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Species/Thaven/displacement.rsi/jumpsuit.png b/Resources/Textures/_Impstation/Mobs/Species/Thaven/displacement.rsi/jumpsuit.png deleted file mode 100644 index 3ae792ad5c4..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Species/Thaven/displacement.rsi/jumpsuit.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Species/Thaven/displacement.rsi/mask.png b/Resources/Textures/_Impstation/Mobs/Species/Thaven/displacement.rsi/mask.png deleted file mode 100644 index 6c3e479bb49..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Species/Thaven/displacement.rsi/mask.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Species/Thaven/displacement.rsi/meta.json b/Resources/Textures/_Impstation/Mobs/Species/Thaven/displacement.rsi/meta.json deleted file mode 100644 index 2a302428171..00000000000 --- a/Resources/Textures/_Impstation/Mobs/Species/Thaven/displacement.rsi/meta.json +++ /dev/null @@ -1,42 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "by widgetbeck", - "size": { - "x": 32, - "y": 32 - }, - "load": { - "srgb": false - }, - "states": [ - { - "name": "jumpsuit", - "directions": 4 - }, - { - "name": "outerclothing_hardsuit", - "directions": 4 - }, - { - "name": "eyes", - "directions": 4 - }, - { - "name": "neck", - "directions": 4 - }, - { - "name": "mask", - "directions": 4 - }, - { - "name": "head", - "directions": 4 - }, - { - "name": "hands", - "directions": 4 - } - ] -} diff --git a/Resources/Textures/_Impstation/Mobs/Species/Thaven/displacement.rsi/neck.png b/Resources/Textures/_Impstation/Mobs/Species/Thaven/displacement.rsi/neck.png deleted file mode 100644 index 647ff28ea94..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Species/Thaven/displacement.rsi/neck.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Species/Thaven/displacement.rsi/outerclothing_hardsuit.png b/Resources/Textures/_Impstation/Mobs/Species/Thaven/displacement.rsi/outerclothing_hardsuit.png deleted file mode 100644 index a1c72a02fe9..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Species/Thaven/displacement.rsi/outerclothing_hardsuit.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Species/Thaven/organs.rsi/brain-inhand-left.png b/Resources/Textures/_Impstation/Mobs/Species/Thaven/organs.rsi/brain-inhand-left.png deleted file mode 100644 index a8a98321133..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Species/Thaven/organs.rsi/brain-inhand-left.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Species/Thaven/organs.rsi/brain-inhand-right.png b/Resources/Textures/_Impstation/Mobs/Species/Thaven/organs.rsi/brain-inhand-right.png deleted file mode 100644 index 2a237f173df..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Species/Thaven/organs.rsi/brain-inhand-right.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Species/Thaven/organs.rsi/brain-thaven.png b/Resources/Textures/_Impstation/Mobs/Species/Thaven/organs.rsi/brain-thaven.png deleted file mode 100644 index 2b2cc2fc09c..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Species/Thaven/organs.rsi/brain-thaven.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Species/Thaven/organs.rsi/meta.json b/Resources/Textures/_Impstation/Mobs/Species/Thaven/organs.rsi/meta.json deleted file mode 100644 index 33560e8bc2b..00000000000 --- a/Resources/Textures/_Impstation/Mobs/Species/Thaven/organs.rsi/meta.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Sprited by Nimfar11 (Github) for Space Station 14, modified by Widgetbeck", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "brain-thaven" - }, - { - "name": "brain-inhand-left", - "directions": 4 - }, - { - "name": "brain-inhand-right", - "directions": 4 - } - ] -} diff --git a/Resources/Textures/_Impstation/Mobs/Species/Thaven/parts.rsi/eyes.png b/Resources/Textures/_Impstation/Mobs/Species/Thaven/parts.rsi/eyes.png deleted file mode 100644 index 7602bd54abe..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Species/Thaven/parts.rsi/eyes.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Species/Thaven/parts.rsi/full.png b/Resources/Textures/_Impstation/Mobs/Species/Thaven/parts.rsi/full.png deleted file mode 100644 index 9d2c746b630..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Species/Thaven/parts.rsi/full.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Species/Thaven/parts.rsi/head.png b/Resources/Textures/_Impstation/Mobs/Species/Thaven/parts.rsi/head.png deleted file mode 100644 index 36a3740e57b..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Species/Thaven/parts.rsi/head.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Species/Thaven/parts.rsi/l_arm.png b/Resources/Textures/_Impstation/Mobs/Species/Thaven/parts.rsi/l_arm.png deleted file mode 100644 index 4effd642161..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Species/Thaven/parts.rsi/l_arm.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Species/Thaven/parts.rsi/l_foot.png b/Resources/Textures/_Impstation/Mobs/Species/Thaven/parts.rsi/l_foot.png deleted file mode 100644 index a1029f4cf1e..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Species/Thaven/parts.rsi/l_foot.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Species/Thaven/parts.rsi/l_hand.png b/Resources/Textures/_Impstation/Mobs/Species/Thaven/parts.rsi/l_hand.png deleted file mode 100644 index f698637d0f1..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Species/Thaven/parts.rsi/l_hand.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Species/Thaven/parts.rsi/l_leg.png b/Resources/Textures/_Impstation/Mobs/Species/Thaven/parts.rsi/l_leg.png deleted file mode 100644 index d2b4c62f206..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Species/Thaven/parts.rsi/l_leg.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Species/Thaven/parts.rsi/meta.json b/Resources/Textures/_Impstation/Mobs/Species/Thaven/parts.rsi/meta.json deleted file mode 100644 index 45bc565f8aa..00000000000 --- a/Resources/Textures/_Impstation/Mobs/Species/Thaven/parts.rsi/meta.json +++ /dev/null @@ -1,62 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Art by Widgetbeck", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "full" - }, - { - "name": "head", - "directions": 4 - }, - { - "name": "l_arm", - "directions": 4 - }, - { - "name": "l_foot", - "directions": 4 - }, - { - "name": "l_hand", - "directions": 4 - }, - { - "name": "l_leg", - "directions": 4 - }, - { - "name": "r_arm", - "directions": 4 - }, - { - "name": "r_foot", - "directions": 4 - }, - { - "name": "r_hand", - "directions": 4 - }, - { - "name": "r_leg", - "directions": 4 - }, - { - "name": "torso_m", - "directions": 4 - }, - { - "name": "torso_f", - "directions": 4 - }, - { - "name": "eyes", - "directions": 4 - } - ] -} diff --git a/Resources/Textures/_Impstation/Mobs/Species/Thaven/parts.rsi/r_arm.png b/Resources/Textures/_Impstation/Mobs/Species/Thaven/parts.rsi/r_arm.png deleted file mode 100644 index db3e3eecf05..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Species/Thaven/parts.rsi/r_arm.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Species/Thaven/parts.rsi/r_foot.png b/Resources/Textures/_Impstation/Mobs/Species/Thaven/parts.rsi/r_foot.png deleted file mode 100644 index aca12db26d6..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Species/Thaven/parts.rsi/r_foot.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Species/Thaven/parts.rsi/r_hand.png b/Resources/Textures/_Impstation/Mobs/Species/Thaven/parts.rsi/r_hand.png deleted file mode 100644 index 8051570e6fc..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Species/Thaven/parts.rsi/r_hand.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Species/Thaven/parts.rsi/r_leg.png b/Resources/Textures/_Impstation/Mobs/Species/Thaven/parts.rsi/r_leg.png deleted file mode 100644 index 8345a65482d..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Species/Thaven/parts.rsi/r_leg.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Species/Thaven/parts.rsi/torso_f.png b/Resources/Textures/_Impstation/Mobs/Species/Thaven/parts.rsi/torso_f.png deleted file mode 100644 index ac55287b975..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Species/Thaven/parts.rsi/torso_f.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Mobs/Species/Thaven/parts.rsi/torso_m.png b/Resources/Textures/_Impstation/Mobs/Species/Thaven/parts.rsi/torso_m.png deleted file mode 100644 index 8f485e0f9c4..00000000000 Binary files a/Resources/Textures/_Impstation/Mobs/Species/Thaven/parts.rsi/torso_m.png and /dev/null differ diff --git a/Tools/markings/markings/prototypes.go b/Tools/markings/markings/prototypes.go index bfa16bb4778..cd969ab4572 100644 --- a/Tools/markings/markings/prototypes.go +++ b/Tools/markings/markings/prototypes.go @@ -15,7 +15,6 @@ const ( HumanFacialHair = "HumanFacialHair" VoxFacialHair = "VoxFacialHair" VoxHair = "VoxHair" - ThavenHair = "ThavenHair" // DeltaV ) func init() { @@ -24,7 +23,6 @@ func init() { accessoryLayerMapping[HumanFacialHair] = FacialHair accessoryLayerMapping[VoxFacialHair] = FacialHair accessoryLayerMapping[VoxHair] = Hair - accessoryLayerMapping[ThavenHair] = Hair // DeltaV } type SpriteAccessoryPrototype struct {